diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/build/mozconfig.automation thunderbird-trunk-39.0~a1~hg20150226r17577.231190/build/mozconfig.automation
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/build/mozconfig.automation	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/build/mozconfig.automation	2015-02-28 15:02:40.000000000 +0000
@@ -17,6 +17,7 @@
 mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
+mk_add_options "export MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-0}"
 
 # If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
 # stages.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/agenda-listbox.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/agenda-listbox.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/agenda-listbox.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/agenda-listbox.js	2015-02-28 15:02:41.000000000 +0000
@@ -14,7 +14,8 @@
     agendaListboxControl: null,
     mPendingRefreshJobs: null,
     kDefaultTimezone: null,
-    showsToday: false
+    showsToday: false,
+    soonDays: 5
 };
 
 /**
@@ -30,15 +31,28 @@
     this.today = new Synthetic(showTodayHeader, 1);
     this.addPeriodListItem(this.today, "today-header");
     this.tomorrow = new Synthetic(showTomorrowHeader, 1);
-    var soondays = Preferences.get("calendar.agendaListbox.soondays", 5);
-    this.soon = new Synthetic(showSoonHeader, soondays);
+    this.soonDays = getSoondaysPreference();
+    this.soon = new Synthetic(showSoonHeader, this.soonDays);
     this.periods = [this.today, this.tomorrow, this.soon];
     this.mPendingRefreshJobs = new Map();
 
+    var prefObserver = {
+        observe: function aL_observe(aSubject, aTopic, aPrefName) {
+            switch (aPrefName) {
+                case "calendar.agendaListbox.soondays":
+                    agendaListbox.soonDays = getSoondaysPreference();
+                    agendaListbox.updateSoonSection();
+                    break;
+            }
+        }
+    }
+    Services.prefs.addObserver("calendar.agendaListbox", prefObserver, false);
+
     // Make sure the agenda listbox is unloaded
     var self = this;
     window.addEventListener("unload",
                             function unload_agendaListbox() {
+                                Services.prefs.removeObserver("calendar.agendaListbox", prefObserver);
                                 self.uninit();
                             },
                             false);
@@ -393,7 +407,7 @@
 }
 
 /**
- * Returns the a start or end date of an item according to which of them
+ * Returns the start or end date of an item according to which of them
  * must be displayed in a given period of the agenda
  *
  * @param aItem         The item to compare.
@@ -1020,6 +1034,18 @@
 };
 
 /**
+ * Updates the "Soon" section of today pane when preference soondays changes
+ **/
+agendaListbox.updateSoonSection =
+function updateSoonSection() {
+    let soonHeader = document.getElementById("nextweek-header");
+    this.soon.duration = this.soonDays;
+    this.soon.open = true;
+    soonHeader.setItem(this.soon, true);
+    agendaListbox.refreshPeriodDates(now());
+}
+
+/**
  * Updates the event considered "current". This goes through all "today" items
  * and sets the "current" attribute on all list items that are currently
  * occurring.
@@ -1126,3 +1152,24 @@
     }
     gEventTimer.initWithCallback(udCallback, aMsUntil, gEventTimer.TYPE_ONE_SHOT);
 }
+
+/**
+ * Gets a right value for calendar.agendaListbox.soondays preference, avoid
+ * erroneus values edited in the lightning.js preference file
+ **/
+function getSoondaysPreference() {
+    let prefName = "calendar.agendaListbox.soondays";
+    let soonpref = Preferences.get(prefName, 5);
+
+    if (soonpref > 0 && soonpref <= 28) {
+        if (soonpref % 7 != 0) {
+            let intSoonpref = Math.floor(soonpref / 7) * 7;
+            soonpref = (intSoonpref == 0 ? soonpref : intSoonpref);
+            Preferences.set(prefName, soonpref, "INT");
+        }
+    } else {
+        soonpref = soonpref > 28 ? 28 : 1;
+        Preferences.set(prefName, soonpref, "INT");
+    }
+    return soonpref;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/agenda-listbox.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/agenda-listbox.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/agenda-listbox.xml	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/agenda-listbox.xml	2015-02-28 15:02:41.000000000 +0000
@@ -52,6 +52,7 @@
       <constructor><![CDATA[
           this.kCheckbox = document.getAnonymousElementByAttribute(this, "anonid", "agenda-checkbox-widget");
       ]]></constructor>
+
       <method name="getItem">
         <body><![CDATA[
             return this.mItem;
@@ -62,8 +63,16 @@
         <parameter name="showsToday"/>
         <body><![CDATA[
             this.mItem = synthetic;
+            let duration = synthetic.duration;
             if (showsToday) {
                 this.kCheckbox.label = this.getAttribute("title");
+                if (this.id == "nextweek-header") {
+                    if (duration > 7) {
+                        this.kCheckbox.label += " (" + unitPluralForm(duration / 7, "weeks") + ")";
+                    } else {
+                        this.kCheckbox.label += " (" + unitPluralForm(duration, "days") + ")";
+                    }
+                }
             } else {
                 if (synthetic.duration == 1) {
                     this.kCheckbox.label = getDateFormatter().formatDate(synthetic.start);
@@ -121,7 +130,9 @@
                               .getInTimezone(calendarDefaultTimezone());
             let endPreviousDay = endDate.clone();
             endPreviousDay.day--;
-            let longPeriod = aPeriod.duration > 1;
+            let now = cal.now();
+            now.isDate = true;
+            let longPeriod = periodStartDate.subtractDate(now).days > 1;
 
             let date = "";
             let iconType = "";
@@ -211,7 +222,9 @@
             if (endAtMidnight) {
                 endDate.day--;
             }
-            let longFormat = aPeriod.duration > 1;
+            let now = cal.now();
+            now.isDate = true;
+            let longFormat = periodStartDate.subtractDate(now).days > 1;
 
             let duration = "";
             let iconType = "";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-calendars-list.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-calendars-list.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-calendars-list.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-calendars-list.xul	2015-02-28 15:02:41.000000000 +0000
@@ -34,8 +34,12 @@
                 accesskey="&calendar.context.findcalendar.accesskey;"
                 oncommand="openCalendarSubscriptionsDialog();"/>
       <menuitem id="list-calendars-context-delete"
-                label="&calendar.context.deleteserver.label;"
-                accesskey="&calendar.context.deleteserver.accesskey;"
+                labeldelete="&calendar.context.deleteserver2.label;"
+                labelremove="&calendar.context.removeserver.label;"
+                labelunsubscribe="&calendar.context.unsubscribeserver.label;"
+                accesskeydelete="&calendar.context.deleteserver2.accesskey;"
+                accesskeyremove="&calendar.context.removeserver.accesskey;"
+                accesskeyunsubscribe="&calendar.context.unsubscribeserver.accesskey;"
                 observes="calendar_delete_calendar_command"/>
       <menuseparator id="list-calendars-context-itemops-menuseparator"/>
       <menuitem id="list-calendars-context-export"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-common-sets.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-common-sets.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-common-sets.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-common-sets.js	2015-02-28 15:02:41.000000000 +0000
@@ -278,9 +278,9 @@
                     let focusedRichListbox = getParentNodeOrThis(focusedElement, "richlistbox");
                     if (focusedRichListbox && focusedRichListbox.id == "agenda-listbox") {
                         agendaListbox.editSelectedItem();
-                    } else if (focusedElement.className == "calendar-task-tree") {
+                    } else if (focusedElement && focusedElement.className == "calendar-task-tree") {
                         modifyTaskFromContext();
-                    } else {
+                    } else if (this.isInMode("calendar")) {
                         editSelectedEvents();
                     }
                 }
@@ -297,11 +297,9 @@
                     let focusedRichListbox = getParentNodeOrThis(focusedElement, "richlistbox");
                     if (focusedRichListbox && focusedRichListbox.id == "agenda-listbox") {
                         agendaListbox.deleteSelectedItem(false);
-                    } else if (focusedElement.className == "calendar-task-tree") {
+                    } else if (focusedElement && focusedElement.className == "calendar-task-tree") {
                         deleteToDoCommand(null, false);
-                    } else if (this.defaultController && !this.isCalendarInForeground()) {
-                        this.defaultController.doCommand(aCommand);
-                    } else {
+                    } else if (this.isInMode("calendar")) {
                         deleteSelectedEvents();
                     }
                 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-management.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-management.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-management.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-management.js	2015-02-28 15:02:41.000000000 +0000
@@ -24,22 +24,53 @@
  * @param aCalendar     The calendar to delete.
  */
 function promptDeleteCalendar(aCalendar) {
-    let calendars = cal.getCalendarManager().getCalendars({});
+    const nIPS = Components.interfaces.nsIPromptService;
+    const cICM = Components.interfaces.calICalendarManager;
+
+    let calMgr = cal.getCalendarManager();
+    let calendars = calMgr.getCalendars({});
     if (calendars.length <= 1) {
         // If this is the last calendar, don't delete it.
         return;
     }
 
-    let ok = Services.prompt.confirm(window,
-                                     calGetString("calendar", "unsubscribeCalendarTitle"),
-                                     calGetString("calendar", "unsubscribeCalendarMessage",
-                                                  [aCalendar.name]),
-                                     {});
-
-    if (ok) {
-        let calMgr = cal.getCalendarManager();
-        calMgr.unregisterCalendar(aCalendar);
-        calMgr.deleteCalendar(aCalendar);
+    let modes = new Set(aCalendar.getProperty("capabilities.removeModes") || ["unsubscribe"]);
+    let title = cal.calGetString("calendar", "removeCalendarTitle");
+
+    let textKey, b0text, b2text;
+    let removeFlags = 0;
+    let promptFlags = (nIPS.BUTTON_POS_0 * nIPS.BUTTON_TITLE_IS_STRING) +
+                      (nIPS.BUTTON_POS_1 * nIPS.BUTTON_TITLE_CANCEL);
+
+    if (modes.has("delete") && !modes.has("unsubscribe")) {
+        textKey = "removeCalendarMessageDelete";
+        promptFlags += nIPS.BUTTON_DELAY_ENABLE;
+        b0text = cal.calGetString("calendar", "removeCalendarButtonDelete");
+    } else if (modes.has("delete")) {
+        textKey = "removeCalendarMessageDeleteOrUnsubscribe";
+        promptFlags += (nIPS.BUTTON_POS_2 * nIPS.BUTTON_TITLE_IS_STRING);
+        b0text = cal.calGetString("calendar", "removeCalendarButtonUnsubscribe");
+        b2text = cal.calGetString("calendar", "removeCalendarButtonDelete");
+    } else if (modes.has("unsubscribe")) {
+        textKey = "removeCalendarMessageUnsubscribe";
+        removeFlags |= cICM.REMOVE_NO_DELETE;
+        b0text = cal.calGetString("calendar", "removeCalendarButtonUnsubscribe");
+    } else {
+        return;
+    }
+
+    let text = cal.calGetString("calendar", textKey, [aCalendar.name]);
+    let res = Services.prompt.confirmEx(window, title, text, promptFlags,
+                                        b0text, null, b2text, null, {});
+
+    if (res != 1) { // Not canceled
+        if (textKey == "removeCalendarMessageDeleteOrUnsubscribe" && res == 0) {
+            // Both unsubscribing and deleting is possible, but unsubscribing was
+            // requested. Make sure no delete is executed.
+            removeFlags |= cICM.REMOVE_NO_DELETE;
+        }
+
+        calMgr.removeCalendar(aCalendar, removeFlags);
     }
 }
 
@@ -173,11 +204,6 @@
     if (calendar) {
         enableElement("list-calendars-context-edit");
         enableElement("list-calendars-context-publish");
-        // Only enable the delete calendars item if there is more than one
-        // calendar. We don't want to have the last calendar deleted.
-        if (calendars.length > 1) {
-            enableElement("list-calendars-context-delete");
-        }
 
         enableElement("list-calendars-context-togglevisible");
         setElementValue("list-calendars-context-togglevisible", false, "collapsed");
@@ -190,6 +216,11 @@
         setElementValue("list-calendars-context-showonly",
                         cal.calGetString("calendar", "showOnlyCalendar", [calendar.name]),
                         "label");
+
+        setupDeleteMenuitem("list-calendars-context-delete", calendar);
+        // Only enable the delete calendars item if there is more than one
+        // calendar. We don't want to have the last calendar deleted.
+        setElementValue("list-calendars-context-delete", calendars.length < 2 && "true", "disabled");
     } else {
         disableElement("list-calendars-context-edit");
         disableElement("list-calendars-context-publish");
@@ -198,11 +229,36 @@
         setElementValue("list-calendars-context-togglevisible", true, "collapsed");
         disableElement("list-calendars-context-showonly");
         setElementValue("list-calendars-context-showonly", true, "collapsed");
+        setupDeleteMenuitem("list-calendars-context-delete", null);
     }
     return true;
 }
 
 /**
+ * Changes the "delete calendar" menuitem to have the right label based on the
+ * removeModes. The menuitem must have the attributes "labelremove",
+ * "labeldelete" and "labelunsubscribe".
+ *
+ * @param aDeleteId     The id of the menuitem to delete the calendar
+ */
+function setupDeleteMenuitem(aDeleteId, aCalendar) {
+    let calendar = (aCalendar === undefined ?  getSelectedCalendar() : aCalendar);
+    let modes = new Set(calendar ? calendar.getProperty("capabilities.removeModes") || ["unsubscribe"] : []);
+
+    let type = "remove";
+    if (modes.has("delete") && !modes.has("unsubscribe")) {
+        type = "delete";
+    } else if (modes.has("unsubscribe") && !modes.has("delete")) {
+        type = "unsubscribe";
+    }
+
+    let deleteItem = document.getElementById(aDeleteId);
+    setElementValue(deleteItem, deleteItem.getAttribute("label" + type), "label");
+    setElementValue(deleteItem, deleteItem.getAttribute("accesskey" + type), "accesskey");
+    setElementValue(deleteItem, modes.size == 0 && "true", "disabled");
+}
+
+/**
  * Makes sure the passed calendar is visible to the user
  *
  * @param aCalendar   The calendar to make visible.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-ui-utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-ui-utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/calendar-ui-utils.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/calendar-ui-utils.js	2015-02-28 15:02:41.000000000 +0000
@@ -428,7 +428,8 @@
 function unitPluralForm(aLength, aUnit, aIncludeLength=true) {
     let unitProp = {"minutes": "unitMinutes",
                     "hours": "unitHours",
-                    "days": "unitDays"}[aUnit] || "unitMinutes";
+                    "days": "unitDays",
+                    "weeks": "unitWeeks"}[aUnit] || "unitMinutes";
 
     return PluralForm.get(aLength, cal.calGetString("calendar", unitProp))
                      .replace("#1", aIncludeLength ? aLength : "").trim();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-event-dialog-attendees.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-event-dialog-attendees.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-event-dialog-attendees.xml	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-event-dialog-attendees.xml	2015-02-28 15:02:41.000000000 +0000
@@ -1052,7 +1052,7 @@
           }
 
           let arrowLength = 1;
-          if (element.value.contains(",")) {
+          if (element.value.contains(",") || element.value.match(/^[^"].*[<>@,].*[^"] <.+@.+>$/)) {
               let strippedAddresses = element.value.replace(/.* >> /, "");
               let addresses = MailServices.headerParser.makeFromDisplayAddress(strippedAddresses);
               element.value = parseHeaderValue(addresses[0]);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul	2015-02-28 15:02:41.000000000 +0000
@@ -101,73 +101,58 @@
     </vbox>
   </hbox>
   <hbox>
-    <vbox>
-      <hbox>
-        <grid>
-          <columns>
-            <column/><!-- role icon -->
-            <column/><!-- role description -->
-            <column/><!-- status color -->
-            <column/><!-- status description -->
-            <column/><!-- status color -->
-            <column/><!-- status description -->
-          </columns>
-          <rows>
-            <row align="center">
-              <image class="role-icon" role="REQ-PARTICIPANT"/>
-              <label value="&event.attendee.role.required;"/>
-              <image class="usertype-icon" cutype="INDIVIDUAL"/>
-              <label value="&event.attendee.usertype.individual;"/>
-              <box class="legend" status="FREE"/>
-              <label value="&event.freebusy.legend.free;"/>
-            </row>
-            <row align="center">
-              <image class="role-icon" role="OPT-PARTICIPANT"/>
-              <label value="&event.attendee.role.optional;"/>
-              <image class="usertype-icon" cutype="GROUP"/>
-              <label value="&event.attendee.usertype.group;"/>
-              <box class="legend" status="BUSY_TENTATIVE"/>
-              <label value="&event.freebusy.legend.busy_tentative;"/>
-            </row>
-            <row align="center">
-              <image class="role-icon" role="CHAIR"/>
-              <label value="&event.attendee.role.chair;"/>
-              <image class="usertype-icon" cutype="RESOURCE"/>
-              <label value="&event.attendee.usertype.resource;"/>
-              <box class="legend" status="BUSY"/>
-              <label value="&event.freebusy.legend.busy;"/>
-            </row>
-            <row align="center">
-              <image class="role-icon" role="NON-PARTICIPANT"/>
-              <label value="&event.attendee.role.nonparticipant;"/>
-              <image class="usertype-icon" cutype="ROOM"/>
-              <label value="&event.attendee.usertype.room;"/>
-              <box class="legend" status="BUSY_UNAVAILABLE"/>
-              <label value="&event.freebusy.legend.busy_unavailable;"/>
-            </row>
-            <row align="center">
-              <spacer/>
-              <spacer/>
-              <spacer/>
-              <spacer/>
-              <box class="legend" status="UNKNOWN"/>
-              <label value="&event.freebusy.legend.unknown;"/>
-            </row>
-          </rows>
-        </grid>
-      </hbox>
-      <hbox align="center">
-          <label value="&event.organizer.label;"
-                 collapsed="true"
-                 disabled="true"
-                 control="event-organizer"/>
-          <textbox id="event-organizer"
-                   collapsed="true"
-                   disabled="true"
-                   flex="true"/>
-      </hbox>
-    </vbox>
-    <spacer flex="1"/>
+    <grid flex="1">
+      <columns>
+        <column/>         <!-- role icon -->
+        <column flex="1"/><!-- role description -->
+        <column/>         <!-- status color -->
+        <column flex="1"/><!-- status description -->
+        <column/>         <!-- status color -->
+        <column flex="1"/><!-- status description -->
+      </columns>
+      <rows>
+        <row align="center">
+          <image class="role-icon" role="REQ-PARTICIPANT"/>
+          <label value="&event.attendee.role.required;"/>
+          <image class="usertype-icon" cutype="INDIVIDUAL"/>
+          <label value="&event.attendee.usertype.individual;"/>
+          <box class="legend" status="FREE"/>
+          <label value="&event.freebusy.legend.free;"/>
+        </row>
+        <row align="center">
+          <image class="role-icon" role="OPT-PARTICIPANT"/>
+          <label value="&event.attendee.role.optional;"/>
+          <image class="usertype-icon" cutype="GROUP"/>
+          <label value="&event.attendee.usertype.group;"/>
+          <box class="legend" status="BUSY_TENTATIVE"/>
+          <label value="&event.freebusy.legend.busy_tentative;"/>
+        </row>
+        <row align="center">
+          <image class="role-icon" role="CHAIR"/>
+          <label value="&event.attendee.role.chair;"/>
+          <image class="usertype-icon" cutype="RESOURCE"/>
+          <label value="&event.attendee.usertype.resource;"/>
+          <box class="legend" status="BUSY"/>
+          <label value="&event.freebusy.legend.busy;"/>
+        </row>
+        <row align="center">
+          <image class="role-icon" role="NON-PARTICIPANT"/>
+          <label value="&event.attendee.role.nonparticipant;"/>
+          <image class="usertype-icon" cutype="ROOM"/>
+          <label value="&event.attendee.usertype.room;"/>
+          <box class="legend" status="BUSY_UNAVAILABLE"/>
+          <label value="&event.freebusy.legend.busy_unavailable;"/>
+        </row>
+        <row align="center">
+          <spacer/>
+          <spacer/>
+          <spacer/>
+          <spacer/>
+          <box class="legend" status="UNKNOWN"/>
+          <label value="&event.freebusy.legend.unknown;"/>
+        </row>
+      </rows>
+    </grid>
     <vbox>
       <grid>
         <columns>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-event-dialog.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-event-dialog.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-event-dialog.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-event-dialog.js	2015-02-28 15:02:41.000000000 +0000
@@ -36,7 +36,6 @@
 var gShowTimeAs = null;
 var gWarning = false;
 var gPreviousCalendarId = null;
-var gIsModifyingItem = false;
 
 var eventDialogQuitObserver = {
   observe: function(aSubject, aTopic, aData) {
@@ -50,11 +49,12 @@
 };
 
 var eventDialogCalendarObserver = {
+    target: null,
+    isObserving: false,
+
     onModifyItem: function(aNewItem, aOldItem) {
-        if (gIsModifyingItem) {
-            // the modification was triggered from this dialog, no need to prompt
-            gIsModifyingItem = false;
-        } else if (window.calendarItem && window.calendarItem.id == aOldItem.id) {
+        if (this.isObserving && "calendarItem" in window &&
+            window.calendarItem && window.calendarItem.id == aOldItem.id) {
             let doUpdate = true;
 
             // The item has been modified outside the dialog. We only need to
@@ -91,10 +91,8 @@
     },
 
     onDeleteItem: function(aDeletedItem) {
-        if (gIsModifyingItem) {
-            // the deletion was triggered from this dialog, no need to prompt
-            gIsModifyingItem = false;
-        } else if (window.calendarItem && window.calendarItem.id == aDeletedItem.id) {
+        if (this.isObserving && "calendarItem" in window &&
+            window.calendarItem && window.calendarItem.id == aDeletedItem.id) {
             gConfirmCancel = false;
             document.documentElement.cancelDialog();
         }
@@ -106,7 +104,24 @@
     onAddItem: function() {},
     onError: function() {},
     onPropertyChanged: function() {},
-    onPropertyDeleting: function() {}
+    onPropertyDeleting: function() {},
+
+    observe: function(aCalendar) {
+        // use the new calendar if one was passed, otherwise use the last one
+        this.target = aCalendar || this.target;
+        if (this.target) {
+            this.cancel();
+            this.target.addObserver(this);
+            this.isObserving = true;
+        }
+    },
+
+    cancel: function() {
+        if (this.isObserving && this.target) {
+            this.target.removeObserver(this);
+            this.isObserving = false;
+        }
+    }
 };
 
 /**
@@ -297,14 +312,13 @@
     document.documentElement._hitEnter = function() {};
 
     // set up our calendar event observer
-    if (item.calendar) {
-        item.calendar.addObserver(eventDialogCalendarObserver);
-    }
+    eventDialogCalendarObserver.observe(item.calendar);
 }
 
 function onEventDialogUnload() {
-  Services.obs.removeObserver(eventDialogQuitObserver,
-                              "quit-application-requested");
+    Services.obs.removeObserver(eventDialogQuitObserver,
+                                "quit-application-requested");
+    eventDialogCalendarObserver.cancel();
 }
 
 /**
@@ -405,8 +419,9 @@
     loadDateTime(item);
 
     // add calendars to the calendar menulist
-    var calendarList = document.getElementById("item-calendar");
-    var indexToSelect = appendCalendarItems(item, calendarList, window.arguments[0].calendar);
+    let calendarList = document.getElementById("item-calendar");
+    removeChildren(calendarList);
+    let indexToSelect = appendCalendarItems(item, calendarList, item.calendar || window.arguments[0].calendar);
     if (indexToSelect > -1) {
         calendarList.selectedIndex = indexToSelect;
     }
@@ -2849,10 +2864,7 @@
         return;
     }
 
-    // set flag so the calendar observer expects a modify event
-    if (window.mode == "modify") {
-        gIsModifyingItem = true;
-    }
+    eventDialogCalendarObserver.cancel();
 
     let originalItem = window.calendarItem;
     let item = saveItem();
@@ -2895,6 +2907,7 @@
                     // We now have an item, so we must change to an edit.
                     window.mode = "modify";
                     updateTitle();
+                    eventDialogCalendarObserver.observe(window.calendarItem.calendar);
                 }
             }
         }
@@ -2945,12 +2958,14 @@
                     if (aId == window.calendarItem.id && Components.isSuccessCode(aStatus)) {
                         gConfirmCancel = false;
                         document.documentElement.cancelDialog();
+                    } else {
+                        eventDialogCalendarObserver.observe(window.calendarItem.calendar);
                     }
                 }
             }
         };
 
-        gIsModifyingItem = true;
+        eventDialogCalendarObserver.cancel();
         if (window.calendarItem.parentItem.recurrenceInfo && window.calendarItem.recurrenceId) {
             // if this is a single occurrence of a recurring item
             let newItem = window.calendarItem.parentItem.clone();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-properties-dialog.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-properties-dialog.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-properties-dialog.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-properties-dialog.js	2015-02-28 15:02:41.000000000 +0000
@@ -17,12 +17,10 @@
  */
 function onLoad() {
     gCalendar = window.arguments[0].calendar;
+    let calColor = gCalendar.getProperty('color');
 
     document.getElementById("calendar-name").value = gCalendar.name;
-    let calColor = gCalendar.getProperty('color');
-    if (calColor) {
-       document.getElementById("calendar-color").color = calColor;
-    }
+    document.getElementById("calendar-color").value = calColor || "#A8C2E1";
     document.getElementById("calendar-uri").value = gCalendar.uri.spec;
     document.getElementById("read-only").checked = gCalendar.readOnly;
 
@@ -78,7 +76,7 @@
     gCalendar.name = document.getElementById("calendar-name").value;
 
     // Save calendar color
-    gCalendar.setProperty("color", document.getElementById("calendar-color").color);
+    gCalendar.setProperty("color", document.getElementById("calendar-color").value);
 
     // Save readonly state
     gCalendar.readOnly = document.getElementById("read-only").checked;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-properties-dialog.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-properties-dialog.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/dialogs/calendar-properties-dialog.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/dialogs/calendar-properties-dialog.xul	2015-02-28 15:02:41.000000000 +0000
@@ -25,6 +25,7 @@
     onload="onLoad()"
     persist="screenX screenY"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns:html="http://www.w3.org/1999/xhtml"
     width="500">
 
   <script type="application/javascript" src="chrome://calendar/content/calendar-properties-dialog.js"/>
@@ -58,11 +59,10 @@
                disable-with-calendar="true"
                control="calendar-color"/>
           <hbox align="center">
-            <colorpicker id="calendar-color"
-                         class="small-margin"
-                         type="button"
-                         palettename="standard"
-                         disable-with-calendar="true"/>
+            <html:input id="calendar-color"
+                        class="small-margin"
+                        type="color"
+                        disable-with-calendar="true"/>
           </hbox>
       </row>
       <row id="calendar-uri-row" align="center">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/editCategory.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/editCategory.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/editCategory.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/editCategory.js	2015-02-28 15:02:41.000000000 +0000
@@ -2,7 +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/. */
 
-
 Components.utils.import("resource://calendar/modules/calUtils.jsm");
 
 // Global variable, set to true if the user has picked a custom color.
@@ -12,13 +11,15 @@
  * Load Handler, called when the edit category dialog is loaded
  */
 function editCategoryLoad() {
+    let color = window.arguments[1] || cal.hashColor(window.arguments[0]);
+    let hasColor = (window.arguments[1] != null);
     document.getElementById("categoryName").value = window.arguments[0];
+    document.getElementById("categoryColor").value = color;
+    document.getElementById("useColor").checked = hasColor;
+    customColorSelected = hasColor;
     document.title = window.arguments[2];
-    if (window.arguments[1]) {
-        document.getElementById("useColor").checked = true;
-        document.getElementById("categoryColor").color = window.arguments[1];
-        customColorSelected = true;
-    }
+
+    toggleColor();
 }
 
 /**
@@ -27,7 +28,7 @@
  */
 function doOK() {
     let color = document.getElementById("useColor").checked ?
-                document.getElementById("categoryColor").color :
+                document.getElementById("categoryColor").value :
                 null;
 
     let categoryName = document.getElementById("categoryName").value;
@@ -46,30 +47,62 @@
         customColorSelected = false;
     }
 
-    if (!customColorSelected && document.getElementById("useColor").checked) {
+    if (!customColorSelected && document.getElementById('useColor').checked) {
         // Color is wanted, choose the color based on the category name's hash.
-        document.getElementById("categoryColor").color = cal.hashColor(newValue);
+        document.getElementById("categoryColor").value = cal.hashColor(newValue);
     }
 }
 
 /**
- * Handler function to be called when the checkbox to use a category color was
- * changed. Toggles the color checkbox and recomputes the color, if needed.
+ * Handler function to be called when the color picker's color has been changed.
+ */
+function colorPickerChanged() {
+    document.getElementById('useColor').checked = true;
+    customColorSelected = true;
+}
+
+/**
+ * Handler called when the use color checkbox is toggled.
  */
 function toggleColor() {
-    if (document.getElementById("useColor").checked) {
-        // Pretend the category name changed, this selects the color
-        categoryNameChanged();
+    let useColor = document.getElementById('useColor').checked;
+    let categoryColor = document.getElementById('categoryColor');
+
+    if (useColor) {
+        categoryColor.setAttribute("type", "color");
+        if (toggleColor.lastColor) {
+            categoryColor.value = toggleColor.lastColor;
+        }
     } else {
-        document.getElementById("categoryColor").color = "transparent";
-        customColorSelected = false;
+        categoryColor.setAttribute("type", "button");
+        toggleColor.lastColor = categoryColor.value;
+        categoryColor.value = "";
     }
 }
 
 /**
- * Handler function to be called when the color picker's color has been changed.
+ * Click handler for the color picker. Turns the button back into a colorpicker
+ * when clicked.
  */
-function colorPickerChanged() {
-    document.getElementById('useColor').checked = true;
-    customColorSelected = true;
+function clickColor() {
+    let categoryColor = document.getElementById('categoryColor');
+    if (categoryColor.getAttribute("type") == "button") {
+        colorPickerChanged();
+        toggleColor();
+        categoryColor.click();
+    }
+}
+
+/**
+ * Call the function after the given timeout, resetting the timer if delay is
+ * called again with the same function.
+ *
+ * @param timeout   The timeout interval.
+ * @param func      The function to call after the timeout.
+ */
+function delay(timeout, func) {
+    if (func.timer) {
+      clearTimeout(func.timer);
+    }
+    func.timer = setTimeout(func, timeout);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/editCategory.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/editCategory.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/editCategory.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/editCategory.xul	2015-02-28 15:02:41.000000000 +0000
@@ -15,6 +15,7 @@
 
 <dialog id="editCategory"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept,cancel"
         onload="editCategoryLoad();"
         ondialogaccept="return doOK();">
@@ -22,17 +23,19 @@
 
   <!-- dialog-box: from dialogOverlay.xul -->
   <vbox id="dialog-box">
-    <hbox>
+    <hbox align="center">
       <label value="&pref.categories.name.label;" control="categoryName"/>
-      <textbox id="categoryName"/>
+      <textbox id="categoryName" onchange="categoryNameChanged()" oninput="delay(500, categoryNameChanged)"/>
     </hbox>
-    <hbox id="row2" pack="center">
+    <hbox id="row2">
       <checkbox id="useColor"
                 label="&pref.categories.usecolor.label;"
-                oncommand="toggleColor()"/>
-      <colorpicker id="categoryColor"
-                   type="button"
-                   onchange="colorPickerChanged()"/>
+                oncommand="toggleColor(); categoryNameChanged()"/>
+      <html:input id="categoryColor"
+                  type="color"
+                  style="width: 64px; height: 23px"
+                  onclick="clickColor()"
+                  onchange="colorPickerChanged()"/>
     </hbox>
   </vbox>
 </dialog>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/general.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/general.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/general.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/general.js	2015-02-28 15:02:41.000000000 +0000
@@ -59,6 +59,9 @@
             prefValue = calendarDefaultTimezone().tzid;
         }
         tzMenuList.value = prefValue;
+
+        // Set the soondays menulist preference
+        this.initializeTodaypaneMenu();
     },
 
     updateDefaultTodoDates: function gCGP_updateDefaultTodoDates() {
@@ -79,5 +82,41 @@
         let panelId = document.getElementById("defaults-itemtype-menulist").value;
         let panel = document.getElementById(panelId);
         document.getElementById("defaults-itemtype-deck").selectedPanel = panel;
+    },
+
+    initializeTodaypaneMenu: function gCGP_initializeTodaypaneMenu() {
+        // Assign the labels for the menuitem
+        let soondaysMenu = document.getElementById("soondays-menulist");
+        let items = soondaysMenu.getElementsByTagName("menuitem");
+        for (let menuItem of items) {
+            let menuitemValue = Number(menuItem.value);
+            if (menuitemValue > 7) {
+                menuItem.label = unitPluralForm(menuitemValue / 7, "weeks");
+            } else {
+                menuItem.label = unitPluralForm(menuitemValue, "days");
+            }
+        }
+
+        let prefName = "calendar.agendaListbox.soondays";
+        let soonpref = Preferences.get(prefName, 5);
+
+        // Check if soonDays preference has been edited with a wrong value.
+        if (soonpref > 0 && soonpref <= 28) {
+            if (soonpref % 7 != 0) {
+                let intSoonpref = Math.floor(soonpref / 7) * 7;
+                soonpref = (intSoonpref == 0 ? soonpref : intSoonpref);
+                Preferences.set(prefName, soonpref, "INT");
+            }
+        } else {
+            soonpref = soonpref > 28 ? 28 : 1;
+            Preferences.set(prefName, soonpref, "INT");
+        }
+
+        document.getElementById("soondays-menulist").value = soonpref;
+    },
+
+    updateTodaypaneMenu: function gCGP_updateTodaypaneMenu() {
+        let soonpref = Number(document.getElementById("soondays-menulist").value);
+        Preferences.set("calendar.agendaListbox.soondays", soonpref);
     }
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/general.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/general.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/preferences/general.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/preferences/general.xul	2015-02-28 15:02:41.000000000 +0000
@@ -62,6 +62,9 @@
             <preference id="calendar.view.useSystemColors"
                         name="calendar.view.useSystemColors"
                         type="bool"/>
+            <preference id="calendar.agendaListbox.soondays"
+                        name="calendar.agendaListbox.soondays"
+                        type="int"/>
         </preferences>
 
         <groupbox>
@@ -257,6 +260,31 @@
             </hbox>
         </groupbox>
 
+        <groupbox>
+            <caption label="&pref.calendar.todaypane.agenda.caption;"/>
+            <hbox align="center">
+                <label value="&pref.soondays.label;"
+                       accesskey="&pref.soondays.accesskey;"
+                       control="soondays-menulist"/>
+                <menulist id="soondays-menulist"
+                          preference="calendar.agendaListbox.soondays"
+                          oncommand="gCalendarGeneralPane.updateTodaypaneMenu()">
+                    <menupopup id="soondaysdurationpopup">
+                        <menuitem value="1"/>
+                        <menuitem value="2"/>
+                        <menuitem value="3"/>
+                        <menuitem value="4"/>
+                        <menuitem value="5"/>
+                        <menuitem value="6"/>
+                        <menuitem value="7"/>
+                        <menuitem value="14"/>
+                        <menuitem value="21"/>
+                        <menuitem value="28"/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+        </groupbox>
+
 #ifndef XP_MACOSX
         <groupbox>
             <caption label="&pref.accessibility.label;"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/today-pane.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/today-pane.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/content/today-pane.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/content/today-pane.xul	2015-02-28 15:02:41.000000000 +0000
@@ -180,7 +180,7 @@
                                                checked="false"
                                                persist="checked"/>
                 <agenda-checkbox-richlist-item id="nextweek-header-hidden"
-                                               title="&calendar.soon.button.label;"
+                                               title="&calendar.upcoming.button.label;"
                                                checked="false"
                                                persist="checked"/>
               </vbox>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/modules/ical.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/modules/ical.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/modules/ical.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/modules/ical.js	2015-02-28 15:02:41.000000000 +0000
@@ -4647,33 +4647,43 @@
       }
 
       if (this.rule.freq == "MONTHLY" && this.has_by_data("BYDAY")) {
+        var tempLast = null;
+        var initLast = this.last.clone();
+        var daysInMonth = ICAL.Time.daysInMonth(this.last.month, this.last.year);
 
-        var coded_day = this.by_data.BYDAY[this.by_indices.BYDAY];
-        var parts = this.ruleDayOfWeek(coded_day);
-        var pos = parts[0];
-        var dow = parts[1];
+        // Check every weekday in BYDAY with relative dow and pos.
+        for (var i in this.by_data.BYDAY) {
+          this.last = initLast.clone();
+          var parts = this.ruleDayOfWeek(this.by_data.BYDAY[i]);
+          var pos = parts[0];
+          var dow = parts[1];
+          var dayOfMonth = this.last.nthWeekDay(dow, pos);
 
-        var daysInMonth = ICAL.Time.daysInMonth(this.last.month, this.last.year);
-        var poscount = 0;
+          // If |pos| >= 6, the byday is invalid for a monthly rule.
+          if (pos >= 6 || pos <= -6) {
+            throw new Error("Malformed values in BYDAY part");
+          }
 
-        if (pos >= 0) {
-          for (this.last.day = 1; this.last.day <= daysInMonth; this.last.day++) {
-            if (this.last.dayOfWeek() == dow) {
-              if (++poscount == pos || pos == 0) {
-                break;
-              }
+          // If a Byday with pos=+/-5 is not in the current month it
+          // must be searched in the next months.
+          if (dayOfMonth > daysInMonth || dayOfMonth <= 0) {
+            // Skip if we have already found a "last" in this month.
+            if (tempLast && tempLast.month == initLast.month) {
+              continue;
             }
-          }
-        } else {
-          pos = -pos;
-          for (this.last.day = daysInMonth; this.last.day != 0; this.last.day--) {
-            if (this.last.dayOfWeek() == dow) {
-              if (++poscount == pos) {
-                break;
-              }
+            while (dayOfMonth > daysInMonth || dayOfMonth <= 0) {
+              this.increment_month();
+              daysInMonth = ICAL.Time.daysInMonth(this.last.month, this.last.year);
+              dayOfMonth = this.last.nthWeekDay(dow, pos);
             }
           }
+
+          this.last.day = dayOfMonth;
+          if (!tempLast || this.last.compare(tempLast) < 0) {
+            tempLast = this.last.clone();
+          }
         }
+        this.last = tempLast.clone();
 
         //XXX: This feels like a hack, but we need to initialize
         //     the BYMONTHDAY case correctly and byDayAndMonthDay handles
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/public/calICalendar.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/public/calICalendar.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/public/calICalendar.idl	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/public/calICalendar.idl	2015-02-28 15:02:41.000000000 +0000
@@ -187,6 +187,13 @@
    *
    *   capabilities.realmrewrite.disabled = false
    *
+   * The following capability describes if the calendar can be permanently
+   * deleted, or just unsubscribed. If this property is not specified, then
+   * only unsubscribing is allowed. If an empty array is specified, neither
+   * deleting nor unsubscribing is presented in the UI.
+   *
+   *   capabilities.removeModes = ["delete", "unsubscribe"]
+   *
    * @param aName property name
    * @return value (string, integer and boolean values are supported),
    *               else null
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/public/calICalendarManager.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/public/calICalendarManager.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/public/calICalendarManager.idl	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/public/calICalendarManager.idl	2015-02-28 15:02:41.000000000 +0000
@@ -11,7 +11,7 @@
 
 interface calICalendarManagerObserver;
 
-[scriptable, uuid(613fb99f-359c-4a12-9c87-10b2b968f8cd)]
+[scriptable, uuid(fd8a2565-cb0f-4ecc-945d-760d75ab16d8)]
 interface calICalendarManager : nsISupports
 {
   /**
@@ -40,9 +40,31 @@
   /* unregister a calendar */
   void unregisterCalendar(in calICalendar aCalendar);
 
-  /* delete a calendar for good */
+  /** @deprecated This method has been replaced by ::removeCalendar */
   void deleteCalendar(in calICalendar aCalendar);
 
+  /** Remove the calendar following the calendar's capabilities.removeModes. */
+  const unsigned short REMOVE_AUTO = 0;
+
+  /** Just unsubscribe from the calendar, do not delete it. */
+  const unsigned short REMOVE_NO_DELETE = 1;
+
+  /** Passing this flag will cause the call to fail if the calendar is registered */
+  const unsigned short REMOVE_NO_UNREGISTER = 2;
+
+  /**
+   * Unregister and delete the calendar from the calendar manager. By default
+   * the calendar will be removed based on the capabilities.removeModes
+   * property of the calendar.
+   *
+   * WARNING: If the calendar supports deletion, the calendar will be
+   * permanently deleted. You can prevent this with the REMOVE_NO_DELETE flag.
+   *
+   * @param aCalendar       The calendar to remove.
+   * @param aMode           A combination of the above mode flags.
+   */
+  void removeCalendar(in calICalendar aCalendar, [optional] in uint8_t aMode);
+
   /* get a calendar by its id */
   calICalendar getCalendarById(in AUTF8String aId);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/src/calCalendarManager.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/src/calCalendarManager.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/base/src/calCalendarManager.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/base/src/calCalendarManager.js	2015-02-28 15:02:41.000000000 +0000
@@ -589,29 +589,47 @@
         this.clearRefreshTimer(calendar);
     },
 
+    // Delete this method for Lightning 4.7 at latest
     deleteCalendar: function(calendar) {
-        /* check to see if calendar is unregistered first... */
-        /* delete the calendar for good */
-        if (this.mCache && (calendar.id in this.mCache)) {
-            throw "Can't delete a registered calendar";
+        if (!this.deleteCalendar.warningIssued) {
+            cal.WARN("Use of calICalendarManager::deleteCalendar is deprecated" +
+                     " and will be removed with the next release. Use" +
+                     " ::removeCalendar instead.\n" + cal.STACK(10));
+            this.deleteCalendar.warningIssued = true;
         }
+
+        const cICM = Components.interfaces.calICalendarManager;
+        this.removeCalendar(calendar, cICM.REMOVE_NO_UNREGISTER);
+    },
+
+    removeCalendar: function(calendar, mode=0) {
+        const cICM = Components.interfaces.calICalendarManager;
+
+        let removeModes = new Set(calendar.getProperty("capabilities.removeModes") || ["unsubscribe"]);
+        if (!removeModes.has("unsubscribe") && !removeModes.has("delete")) {
+            // Removing is not allowed
+            return;
+        }
+
+        if ((mode & cICM.REMOVE_NO_UNREGISTER) && this.mCache &&
+            (calendar.id in this.mCache)) {
+            throw new Components.Exception("Can't remove a registered calendar");
+        } else if (!(mode & cICM.REMOVE_NO_UNREGISTER)) {
+            this.unregisterCalendar(calendar);
+        }
+
+        // This observer notification needs to be fired for both unsubscribe
+        // and delete, we don't differ this at the moment.
         this.notifyObservers("onCalendarDeleting", [calendar]);
 
-        // XXX This is a workaround for bug 351499. We should remove it once
-        // we sort out the whole "delete" vs. "unsubscribe" UI thing.
-        //
-        // We only want to delete the contents of calendars from local
-        // providers (storage and memory). Otherwise we may nuke someone's
-        // calendar stored on a server when all they really wanted to do was
-        // unsubscribe.
-        let wrappedCalendar = cal.wrapInstance(calendar, Components.interfaces.calICalendarProvider);
-        if (wrappedCalendar &&
-            (wrappedCalendar.type == "storage" || wrappedCalendar.type == "memory")) {
-            try {
-                wrappedCalendar.deleteCalendar(calendar, null);
-            } catch (e) {
-                Components.utils.reportError("error purging calendar: " + e);
+        // For deleting, we also call the deleteCalendar method from the provider.
+        if (removeModes.has("delete") && (mode & cICM.REMOVE_NO_DELETE) == 0) {
+            let wrappedCalendar = cal.wrapInstance(calendar, Components.interfaces.calICalendarProvider);
+            if (!wrappedCalendar) {
+                throw new Components.Exception("Calendar is missing a provider implementation for delete");
             }
+
+            wrappedCalendar.deleteCalendar(calendar, null);
         }
     },
 
@@ -813,6 +831,7 @@
     },
 
     changeCalendarCache: function(aCalendar, aName, aValue, aOldValue) {
+        const cICM = Components.interfaces.calICalendarManager;
         aOldValue = aOldValue || false;
         aValue = aValue || false;
 
@@ -829,8 +848,7 @@
             // it so the registerCalendar call can wrap/unwrap the
             // calCachedCalendar facade saving the user the need to
             // restart Thunderbird and making sure a new Id is used.
-            this.calMgr.unregisterCalendar(aCalendar);
-            this.calMgr.deleteCalendar(aCalendar);
+            this.calMgr.removeCalendar(aCalendar, cICM.REMOVE_UNSUBSCRIBE);
             var newCal = this.calMgr.createCalendar(aCalendar.type,aCalendar.uri);
             newCal.name = aCalendar.name;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/itip/calItipEmailTransport.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/itip/calItipEmailTransport.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/itip/calItipEmailTransport.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/itip/calItipEmailTransport.js	2015-02-28 15:02:41.000000000 +0000
@@ -227,15 +227,20 @@
                     // Add this recipient id to the list.
                     toList += rId;
                 }
-                let mailFile = this._createTempImipFile(compatMode, toList, aSubject, aBody, aItem, identity);
+                let messageId = composeUtils.msgGenerateMessageId(identity);
+                let mailFile = this._createTempImipFile(compatMode, toList, aSubject, aBody, aItem, identity, messageId);
                 if (mailFile) {
                     // compose fields for message: from/to etc need to be specified both here and in the file
                     let composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"]
                                                   .createInstance(Components.interfaces.nsIMsgCompFields);
                     composeFields.characterSet = "UTF-8";
                     composeFields.to = toList;
-                    composeFields.from = identity.email;
+                    let mailfrom = (!identity.fullName.length) ? identity.mail : identity.fullName + " <" + identity.mail + ">";
+                    composeFields.from = (cal.validateRecipientList(mailfrom) == mailfrom)
+                                         ? mailfrom : identity.email;
                     composeFields.replyTo = identity.replyTo;
+                    composeFields.organization = identity.organization;
+                    composeFields.messageId = messageId;
                     let validRecipients;
                     if (identity.doCc) {
                         validRecipients = cal.validateRecipientList(identity.doCcList);
@@ -286,7 +291,7 @@
         return false;
     },
 
-    _createTempImipFile: function cietCTIF(compatMode, aToList, aSubject, aBody, aItem, aIdentity) {
+    _createTempImipFile: function cietCTIF(compatMode, aToList, aSubject, aBody, aItem, aIdentity, aMessageId) {
         try {
             function encodeUTF8(text) {
                 return convertFromUnicode("UTF-8", text).replace(/(\r\n)|\n/g, "\r\n");
@@ -311,13 +316,22 @@
             let calText = serializer.serializeToString();
             let utf8CalText = encodeUTF8(calText);
 
+            let fullFrom = !aIdentity.fullName.length ? null :
+                           cal.validateRecipientList(aIdentity.fullName + "<" + aIdentity.email + ">");
+
+            let composeUtils = Components.classes["@mozilla.org/messengercompose/computils;1"]
+                                         .createInstance(Components.interfaces.nsIMsgCompUtils);
+
             // Home-grown mail composition; I'd love to use nsIMimeEmitter, but it's not clear to me whether
             // it can cope with nested attachments,
             // like multipart/alternative with enclosed text/calendar and text/plain.
             let mailText = ("MIME-version: 1.0\r\n" +
                             (aIdentity.replyTo
                              ? "Return-path: " + aIdentity.replyTo + "\r\n" : "") +
-                            "From: " + aIdentity.email + "\r\n" +
+                            "From: " + (fullFrom || aIdentity.email) + "\r\n" +
+                            (aIdentity.organization
+                             ? "Organization: " + aIdentity.organization + "\r\n" : "") +
+                            "Message-ID: " + aMessageId + "\r\n" +
                             "To: " + aToList + "\r\n" +
                             "Date: " + (new Date()).toUTCString() + "\r\n" +
                             "Subject: " + encodeMimeHeader(aSubject.replace(/(\n|\r\n)/, "|")) + "\r\n");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/libical/src/libical/icalrecur.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/libical/src/libical/icalrecur.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/libical/src/libical/icalrecur.c	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/libical/src/libical/icalrecur.c	2015-02-28 15:02:41.000000000 +0000
@@ -812,6 +812,8 @@
 
 
 static int expand_year_days(icalrecur_iterator* impl, int year);
+static int nth_weekday(int dow, int pos, struct icaltimetype t);
+static void increment_month(icalrecur_iterator* impl);
 
 
 icalrecur_iterator* icalrecur_iterator_new(struct icalrecurrencetype rule, 
@@ -1025,52 +1027,58 @@
     if(impl->rule.freq == ICAL_MONTHLY_RECURRENCE &&
        has_by_data(impl,BY_DAY)) {
 
-	int dow = icalrecurrencetype_day_day_of_week(
-	    impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-	int pos =  icalrecurrencetype_day_position(
-	    impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-	
-	int poscount = 0;
-	int days_in_month = 
-            icaltime_days_in_month(impl->last.month, impl->last.year); 
-	
-        if(pos >= 0){
-            /* Count up from the first day pf the month to find the
-               pos'th weekday of dow ( like the second monday. ) */
-
-            for(impl->last.day = 1;
-                impl->last.day <= days_in_month;
-                impl->last.day++){
-                
-                if(icaltime_day_of_week(impl->last) == dow){
-                    if(++poscount == pos || pos == 0){
-                        break;
-                    }
-                }
+        struct icaltimetype tmp_last = icaltime_null_time();
+        struct icaltimetype init_last = impl->last;
+        int days_in_month =
+            icaltime_days_in_month(impl->last.month, impl->last.year);
+        int i, dow, pos, day_of_month;
+
+        /* Check every weekday in BYDAY with relative dow and pos. */
+        for (i = 0; impl->by_ptrs[BY_DAY][i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
+            impl->last = init_last;
+            dow = icalrecurrencetype_day_day_of_week(impl->by_ptrs[BY_DAY][i]);
+            pos = icalrecurrencetype_day_position(impl->by_ptrs[BY_DAY][i]);
+            day_of_month = nth_weekday(dow, pos, impl->last);
+
+            /* If |pos| >= 6, the byday is invalid for a monthly rule */
+            if (pos >= 6 || pos <= -6) {
+                icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
+                free(impl);
+                return 0;
             }
-        } else {
-            /* Count down from the last day pf the month to find the
-               pos'th weekday of dow ( like the second to last monday. ) */
-            pos = -pos;
-            for(impl->last.day = days_in_month;
-                impl->last.day != 0;
-                impl->last.day--){
-                
-                if(icaltime_day_of_week(impl->last) == dow){
-                    if(++poscount == pos ){
-                        break;
-                    }
+
+            /* If a Byday with pos=+/-5 is not in the current month it
+               must be searched in the next months. */
+            if (day_of_month > days_in_month || day_of_month <= 0) {
+                /* Skip if we have already found a "last" in this month. */
+                if (!icaltime_is_null_time(tmp_last) && tmp_last.month == init_last.month) {
+                    continue;
+                }
+                while (day_of_month > days_in_month || day_of_month <= 0) {
+                    impl->last.day = 1;
+                    increment_month(impl);
+                    days_in_month =
+                        icaltime_days_in_month(impl->last.month, impl->last.year);
+                    day_of_month = nth_weekday(dow, pos, impl->last);
                 }
             }
+
+            impl->last.day = day_of_month;
+            if (icaltime_is_null_time(tmp_last) ||
+                icaltime_compare(impl->last, tmp_last) < 0) {
+                tmp_last = impl->last;
+            }
         }
 
+        impl->last = tmp_last;
 
-	if(impl->last.day > days_in_month || impl->last.day == 0){
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
+
+        if (impl->last.day > days_in_month || impl->last.day == 0) {
+            icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
             free(impl);
             return 0;
-	}
-	
+        }
+
     } else if (has_by_data(impl,BY_MONTH_DAY)) {
         // setup_defaults sets the day to -1 for negative BYMONTHDAY values,
         // so make sure to re-calculate with days_in_month
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/lightning/content/lightning-menus.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/lightning/content/lightning-menus.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/lightning/content/lightning-menus.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/lightning/content/lightning-menus.xul	2015-02-28 15:02:41.000000000 +0000
@@ -319,7 +319,7 @@
           label="&lightning.menu.eventtask.label;"
           accesskey="&lightning.menu.eventtask.accesskey;"
           insertafter="messageMenu">
-      <menupopup id="menu_Event_Task_Popup" onpopupshowing="changeMenuForTask(event)">
+      <menupopup id="menu_Event_Task_Popup" onpopupshowing="changeMenuForTask(event); setupDeleteMenuitem('ltnDeleteSelectedCalendar')">
         <menuitem id="ltnNewEvent2"
                   label="&event.new.event;"
                   accesskey="&event.new.event.accesskey;"
@@ -373,8 +373,12 @@
                   commmand="calendar_publish_calendar_command"
                   observes="calendar_publish_calendar_command"/>
         <menuitem id="ltnDeleteSelectedCalendar"
-                  label="&calendar.deletecalendar.label;"
-                  accesskey="&calendar.deletecalendar.accesskey;"
+                  labeldelete="&calendar.deletecalendar.label;"
+                  labelremove="&calendar.removecalendar.label;"
+                  labelunsubscribe="&calendar.unsubscribecalendar.label;"
+                  accesskeydelete="&calendar.deletecalendar.accesskey;"
+                  accesskeyremove="&calendar.removecalendar.accesskey;"
+                  accesskeyunsubscribe="&calendar.unsubscribecalendar.accesskey;"
                   command="calendar_delete_calendar_command"
                   observes="calendar_delete_calendar_command"/>
         <menuseparator id="ltnBeforeTaskActions"/>
@@ -701,7 +705,7 @@
     <menu id="appmenu_Event_Task"
           label="&lightning.menu.eventtask.label;"
           insertafter="appmenu_messageMenu">
-      <menupopup id="appmenu_Event_Task_Popup" onpopupshowing="changeMenuForTask(event)">
+      <menupopup id="appmenu_Event_Task_Popup" onpopupshowing="changeMenuForTask(event); setupDeleteMenuitem('appmenu_ltnDeleteSelectedCalendar')">
         <menuitem id="appmenu_ltnMenuSwitchToCalendar"
                   type="checkbox"
                   label="&lightning.toolbar.calendar.label;"
@@ -735,7 +739,12 @@
                   commmand="calendar_publish_calendar_command"
                   observes="calendar_publish_calendar_command"/>
         <menuitem id="appmenu_ltnDeleteSelectedCalendar"
-                  label="&calendar.deletecalendar.label;"
+                  labeldelete="&calendar.deletecalendar.label;"
+                  labelremove="&calendar.removecalendar.label;"
+                  labelunsubscribe="&calendar.unsubscribecalendar.label;"
+                  accesskeydelete="&calendar.deletecalendar.accesskey;"
+                  accesskeyremove="&calendar.removecalendar.accesskey;"
+                  accesskeyunsubscribe="&calendar.unsubscribecalendar.accesskey;"
                   command="calendar_delete_calendar_command"
                   observes="calendar_delete_calendar_command"/>
         <menuseparator id="ltnBeforeTaskActions"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/lightning/content/messenger-overlay-sidebar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/lightning/content/messenger-overlay-sidebar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/lightning/content/messenger-overlay-sidebar.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/lightning/content/messenger-overlay-sidebar.js	2015-02-28 15:02:41.000000000 +0000
@@ -4,6 +4,9 @@
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Promise.jsm");
+Components.utils.import("resource://gre/modules/Task.jsm");
+Components.utils.import("resource://gre/modules/AddonManager.jsm");
 
 var gLastShownCalendarView = null;
 
@@ -149,6 +152,9 @@
     // any load that occurs
     window.removeEventListener("load", ltnOnLoad, false);
 
+    // Check if the binary component was loaded
+    checkCalendarBinaryComponent();
+
     document.getElementById("calendarDisplayDeck").
       addEventListener("select", LtnObserveDisplayDeckChange, true);
 
@@ -485,3 +491,53 @@
                             !calSidebar.getAttribute("collapsed"));
     }
 }
+
+/**
+ * Checks if Lightning's binary component was successfully loaded.
+ */
+function checkCalendarBinaryComponent() {
+    // Don't even get started if we are running ical.js or the binary component
+    // was successfully loaded.
+    if ("@mozilla.org/calendar/datetime;1" in Components.classes ||
+        Preferences.get("calendar.icaljs", false)) {
+        return;
+    }
+
+    const THUNDERBIRD_GUID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
+    const SEAMONKEY_GUID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
+    const LIGHTNING_GUID = "{e2fda1a4-762b-4020-b5ad-a41df1933103}";
+
+    AddonManager.getAddonByID(LIGHTNING_GUID, (ext) => {
+        if (!ext) {
+            return;
+        }
+
+        let version;
+        let appversion = Services.appinfo.version;
+        let versionparts = appversion.split(".");
+        let extbrand = ltnGetString("lightning", "brandShortName");
+
+        switch (Services.appinfo.ID) {
+            case THUNDERBIRD_GUID: // e.g. 31.4.0 -> 3.3
+                version = ((parseInt(versionparts[0], 10) + 2) / 10).toFixed(1);
+                break;
+            case SEAMONKEY_GUID: // e.g. 2.28.4 -> 3.3
+                version = ((parseInt(versionparts[1], 10) + 5) / 10).toFixed(1);
+                break;
+        }
+
+        let text;
+        if (version && version != ext.version) {
+            let args = [extbrand, ext.version, version];
+            text = ltnGetString("lightning", "binaryComponentKnown", args);
+        } else {
+            let brand = cal.calGetString("brand", "brandShortName", null, "branding");
+            let args = [extbrand, brand, appversion, ext.version];
+            text = ltnGetString("lightning", "binaryComponentUnknown", args);
+        }
+
+        let title = ltnGetString("lightning", "binaryComponentTitle", [extbrand]);
+        openAddonsMgr("addons://detail/" + encodeURIComponent(LIGHTNING_GUID));
+        Services.prompt.alert(window, title, text);
+    });
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/calendar.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/calendar.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/calendar.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/calendar.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -12,9 +12,9 @@
 <!ENTITY calendar.unifinder.todoitems.label       "Tasks" >
 <!ENTITY calendar.unifinder.showcompletedtodos.label "Show completed Tasks">
 
-<!ENTITY calendar.today.button.label       "Today">
+<!ENTITY calendar.today.button.label          "Today">
 <!ENTITY calendar.tomorrow.button.label       "Tomorrow">
-<!ENTITY calendar.soon.button.label           "Soon">
+<!ENTITY calendar.upcoming.button.label       "Upcoming">
 
 <!ENTITY calendar.events.filter.all.label "All Events">
 <!ENTITY calendar.events.filter.today.label "Today's Events">
@@ -232,8 +232,17 @@
 <!ENTITY calendar.context.newserver.accesskey          "N">
 <!ENTITY calendar.context.findcalendar.label           "Find Calendar…" >
 <!ENTITY calendar.context.findcalendar.accesskey       "F" >
-<!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
-<!ENTITY calendar.context.deleteserver.accesskey       "D">
+<!ENTITY calendar.context.deleteserver2.label          "Delete Calendar…">
+<!ENTITY calendar.context.deleteserver2.accesskey      "D">
+
+<!-- LOCALIZATION NOTE (calendar.context.removeserver.label): Removing the
+      calendar is the general action of removing it, while deleting means to
+      clear the data and unsubscribing means just taking it out of the calendar
+      list. -->
+<!ENTITY calendar.context.removeserver.label           "Remove Calendar…">
+<!ENTITY calendar.context.removeserver.accesskey       "R">
+<!ENTITY calendar.context.unsubscribeserver.label      "Unsubscribe Calendar…">
+<!ENTITY calendar.context.unsubscribeserver.accesskey  "U">
 <!ENTITY calendar.context.synccalendars.label          "Synchronize Calendars">
 <!ENTITY calendar.context.synccalendars.accesskey      "S">
 <!ENTITY calendar.context.publish.label                "Publish Calendar…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/calendar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/calendar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/calendar.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/calendar.properties	2015-02-28 15:02:41.000000000 +0000
@@ -85,12 +85,25 @@
 TimezoneErrorsAlertTitle=Timezone Errors
 TimezoneErrorsSeeConsole=See Error Console: Unknown timezones are treated as the 'floating' local timezone.
 
-unsubscribeCalendarTitle=Unsubscribe from Calendar
-
-# LOCALIZATION NOTE (unsubscribeCalendarMessage):
-# used for an message like 'Are you sure you want to unsubscribe from calendar "Home"?'
-#    %1$S will be replaced with the name of a calendar
-unsubscribeCalendarMessage=Are you sure you want to unsubscribe from calendar "%1$S"?
+# The following strings are for the prompt to delete/unsubscribe from the calendar
+removeCalendarTitle=Remove Calendar
+removeCalendarButtonDelete=Delete Calendar
+removeCalendarButtonUnsubscribe=Unsubscribe
+
+# LOCALIZATION NOTE (removeCalendarMessageDeleteOrUnsubscribe): Shown for
+# calendar where both deleting and unsubscribing is possible.
+# %1$S:  The name of a calendar
+removeCalendarMessageDeleteOrUnsubscribe=Do you want to remove the calendar "%1$S"? Unsubscribing will remove the calendar from the list, deleting will also permanently purge its data.
+
+# LOCALIZATION NOTE (removeCalendarMessageDelete): Shown for calendar where
+# deleting is the only option.
+# %1$S:  The name of a calendar
+removeCalendarMessageDelete=Do you want to permanently delete the calendar "%1$S"?
+
+# LOCALIZATION NOTE (removeCalendarMessageUnsubscribe): Shown for calendar
+# where unsubscribing is the only option.
+# %1$S:  The name of a calendar
+removeCalendarMessageUnsubscribe=Do you want to unsubscribe from the calendar "%1$S"?
 
 WeekTitle=Week %1$S
 # Used to format the Multiweek's labels, ie Weeks 2 - 7
@@ -618,6 +631,7 @@
 unitMinutes=#1 minute;#1 minutes
 unitHours=#1 hour;#1 hours
 unitDays=#1 day;#1 days
+unitWeeks=#1 week;#1 weeks
 
 # LOCALIZATION NOTE (showCalendar)
 # Used in calendar list context menu
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -20,6 +20,15 @@
 
 <!ENTITY calendar.deletecalendar.label          "Delete Selected Calendar…">
 <!ENTITY calendar.deletecalendar.accesskey      "D">
+<!ENTITY calendar.unsubscribecalendar.label     "Unsubscribe Selected Calendar…">
+<!ENTITY calendar.unsubscribecalendar.accesskey "U">
+
+<!-- LOCALIZATION NOTE (calendar.removecalendar.label): Removing the calendar
+      is the general action of removing it, while deleting means to clear the
+      data and unsubscribing means just taking it out of the calendar list. -->
+<!ENTITY calendar.removecalendar.label          "Remove Selected Calendar…">
+<!ENTITY calendar.removecalendar.accesskey      "R">
+
 
 <!ENTITY calendar.menu.customize.label          "Customize…">
 <!ENTITY calendar.menu.customize.accesskey      "C">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/preferences/general.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/preferences/general.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/calendar/preferences/general.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/calendar/preferences/general.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -33,6 +33,10 @@
 <!ENTITY pref.default_task_offset_start.label "Relative to Start">
 <!ENTITY pref.default_task_offset_next_hour.label "Relative to Next Hour">
 
+<!ENTITY pref.calendar.todaypane.agenda.caption "Today Pane">
+<!ENTITY pref.soondays.label "The upcoming section shows:">
+<!ENTITY pref.soondays.accesskey "u">
+
 <!ENTITY pref.accessibility.label "Accessibility" >
 <!ENTITY pref.systemcolors.label "Optimize colors for accessibility" >
 <!ENTITY pref.systemcolors.accesskey "c">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/lightning/lightning.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/lightning/lightning.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/locales/en-US/chrome/lightning/lightning.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/locales/en-US/chrome/lightning/lightning.properties	2015-02-28 15:02:41.000000000 +0000
@@ -67,3 +67,52 @@
 confirmProcessInvitationTitle=Process Invitation?
 
 invitationsLink.label=Invitations: %1$S
+
+# LOCALIZATION_NOTE(binaryComponentKnown): This is shown when Lightning is
+# missing the binary component and knows how to calculate the expected version
+# number. To test, remove the binary component from the components/
+# subdirectory and start Lightning, or force install into a different
+# Thunderbird version. In the last part of the sentence it should be made clear
+# that the user can install e.g. 3.7, 3.7.1 or anything other 3.7.x version
+# %1$S - The Lightning brand name, from the brandShortName string above.
+# %2$S - The current Lightning version
+# %3$S - The expected Lightning version
+binaryComponentKnown=The binary component required for %1$S could not be loaded, likely because the wrong version combination is being used. You currently have %1$S %2$S installed, but should be using a version from the %3$S series.
+
+# LOCALIZATION_NOTE(binaryComponentUnknown): This is shown when Lightning is
+# missing the binary component but can't calculate the expected version. This
+# happens in the rare case that Lightning is installed into something other
+# than Thunderbird or Seamonkey. You may link to a different page if you can
+# commit to keeping it up to date, I'd recommend staying with the English page.
+# %1$S - The Lightning brand name, from the brandShortName string above.
+# %2$S - The application brand name, e.g. Postbox
+# %3$S - The application version
+# %3$S - The current Lightning version
+binaryComponentUnknown=The binary component required for %1$S could not be loaded, likely because the wrong version combination is being used. You are using %2$S %3$S together with %1$S %4$S. Please check https://developer.mozilla.org/en/Calendar/Calendar_Versions for details.
+
+# LOCALIZATION_NOTE(binaryComponentTitle): The title for the dialog that
+# notifies about a version mismatch.
+# %1$S - The Lightning brand name, from the brandShortName string above.
+binaryComponentTitle=Mismatching %1$S Version
+
+# LOCALIZATION_NOTE(integrationLabel): Used by the notification bar shown when
+# Lightning is installed from the distribution folder. To trigger it, start a
+# new profile without Lightning in a previous Thunderbird version, then upgrade
+# to a Thunderbird that has Lightning packaged. See bug 1130852 for details.
+integrationLabel=%1$S now contains calendaring functionality by integrating the %2$S extension.
+integrationLearnMoreButton=Learn more
+integrationLearnMoreAccessKey=m
+integrationOptOutButton=Disable
+integrationOptOutAccessKey=D
+integrationKeepItButton=Keep
+integrationKeepItAccessKey=K
+
+# LOCALIZATION_NOTE(integrationRestartLabel): At the current time its not yet
+# clear if we will be completely uninstalling Lightning or disabling it. Please
+# translate this string in a general manner, so that it makes sense for both
+# options.
+integrationRestartLabel=%1$S will be removed the next time you restart %2$S. You can add it again at any time using the Add-ons Manager.
+integrationRestartButton=Restart now
+integrationRestartAccessKey=R
+integrationUndoButton=Undo
+integrationUndoAccessKey=U
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/moz.build	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/moz.build	2015-02-28 15:02:41.000000000 +0000
@@ -6,7 +6,10 @@
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 if CONFIG['MOZ_CALENDAR']:
-    DIRS += ['lightning']
+    DIRS += [
+        'lightning',
+        'timezones'
+    ]
 
 TEST_DIRS += ['test']
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/gdata/content/gdata-migration.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/gdata/content/gdata-migration.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/gdata/content/gdata-migration.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/gdata/content/gdata-migration.js	2015-02-28 15:02:41.000000000 +0000
@@ -19,8 +19,13 @@
         if (item.checked) {
             // Migrate the calendar to a gdata calendar
             let newCal = calmgr.createCalendar("gdata", item.calendar.uri);
-            calmgr.unregisterCalendar(item.calendar);
-            calmgr.deleteCalendar(item.calendar);
+            if (calmgr.removeCalendar) {
+                // Lightning 4.0+
+                calmgr.removeCalendar(item.calendar);
+            } else {
+                calmgr.unregisterCalendar(item.calendar);
+                calmgr.deleteCalendar(item.calendar);
+            }
 
             // Copy some properties to the new calendar
             newCal.name = item.calendar.name;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/gdata/modules/gdataSession.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/gdata/modules/gdataSession.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/gdata/modules/gdataSession.jsm	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/gdata/modules/gdataSession.jsm	2015-02-28 15:02:41.000000000 +0000
@@ -510,7 +510,7 @@
 this["\x65\x76\x61\x6C"]([String["\x66\x72\x6F\x6D\x43\x68\x61\x72\x43\x6F"+
 "\x64\x65"](("dpotu!PBVUI`CBTF`VSJ>#iuuqt;00bddpvout/hpphmf/dpn0p0#<dpotu!"+
 "PBVUI`TDPQF>#iuuqt;00xxx/hpphmfbqjt/dpn0bvui0dbmfoebs!iuuqt;00xxx/hpphmfb"+
-"qjt/dpn0bvui0ubtlt#<dpotu!PBVUI`DMJFOU`JE>#758881386533.nrvnr8u9gw9:fdcmf"+
-"h8g:bc5s1eflb:l/bqqt/hpphmfvtfsdpoufou/dpn#<dpotu!PBVUI`DMJFOU`TFDSFU>#uY"+
-"JZpUr:b5JBhJSeys18uYbN#<")["\x63\x68\x61\x72\x43\x6F\x64\x65\x41\x74"](i)-1)
+"qjt/dpn0bvui0ubtlt#<dpotu!PBVUI`DMJFOU`JE>#758881386533.o8m3pwsucmb9kh3ru"+
+"qd4cpw2opkdukrq/bqqt/hpphmfvtfsdpoufou/dpn#<dpotu!PBVUI`DMJFOU`TFDSFU>#f1"+
+"Un{fzChWpEMPSUB8TsDFJV#<")["\x63\x68\x61\x72\x43\x6F\x64\x65\x41\x74"](i)-1)
 for(i in (function(){let x=303; while (x--) yield x})())].reverse().join(""));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/memory/calMemoryCalendar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/memory/calMemoryCalendar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/memory/calMemoryCalendar.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/memory/calMemoryCalendar.js	2015-02-28 15:02:41.000000000 +0000
@@ -94,6 +94,8 @@
             case "cache.supported":
             case "requiresNetwork":
                 return false;
+            case "removemodes":
+                return ["delete"];
         }
         return this.__proto__.__proto__.getProperty.apply(this, arguments);
     },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/storage/calStorageCalendar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/storage/calStorageCalendar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/providers/storage/calStorageCalendar.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/providers/storage/calStorageCalendar.js	2015-02-28 15:02:41.000000000 +0000
@@ -138,6 +138,8 @@
                 return false;
             case "requiresNetwork":
                 return false;
+            case "capabilities.removeModes":
+                return ["delete"];
         }
         return this.__proto__.__proto__.getProperty.apply(this, arguments);
     },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/resources/content/calendarCreation.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/resources/content/calendarCreation.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/resources/content/calendarCreation.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/resources/content/calendarCreation.js	2015-02-28 15:02:41.000000000 +0000
@@ -35,6 +35,7 @@
     let suppressAlarmsRow = document.getElementById("customize-suppressAlarms-row");
     suppressAlarmsRow.hidden =
         (gCalendar && gCalendar.getProperty("capabilities.alarms.popup.supported") === false);
+    document.getElementById("calendar-color").value = "#A8C2E1";
 }
 
 /**
@@ -166,7 +167,7 @@
  */
 function doCreateCalendar() {
     let cal_name = document.getElementById("calendar-name").value;
-    let cal_color = document.getElementById('calendar-color').color;
+    let cal_color = document.getElementById("calendar-color").value;
 
     gCalendar.name = cal_name;
     gCalendar.setProperty('color', cal_color);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/resources/content/calendarCreation.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/resources/content/calendarCreation.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/resources/content/calendarCreation.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/resources/content/calendarCreation.xul	2015-02-28 15:02:41.000000000 +0000
@@ -15,6 +15,7 @@
         title="&wizard.title;"
         windowtype="Calendar:NewCalendarWizard"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
         onwizardfinish=""
         persist="screenX screenY">
 
@@ -109,10 +110,10 @@
                 <row id="customize-color-row" align="center">
                     <label value="&calendarproperties.color.label;" control="calendar-color"/>
                     <hbox align="center">
-                        <colorpicker id="calendar-color"
-                                     class="small-margin"
-                                     type="button"
-                                     palettename="standard"/>
+                        <html:input id="calendar-color"
+                                    class="small-margin"
+                                    type="color"
+                                    palettename="standard"/>
                     </hbox>
                 </row>
                 <row id="customize-suppressAlarms-row" align="center">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/mozmill/shared-modules/calendar-utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/mozmill/shared-modules/calendar-utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/mozmill/shared-modules/calendar-utils.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/mozmill/shared-modules/calendar-utils.js	2015-02-28 15:02:41.000000000 +0000
@@ -303,9 +303,8 @@
   let cals = manager.getCalendars({});
 
   for (let i = 0; i < cals.length; i++)
-    if (cals[i].name == name){
-      manager.unregisterCalendar(cals[i]);
-      manager.deleteCalendar(cals[i]);
+    if (cals[i].name == name) {
+        manager.removeCalendar(cals[i]);
     }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/head_consts.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/head_consts.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/head_consts.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/head_consts.js	2015-02-28 15:02:41.000000000 +0000
@@ -64,18 +64,8 @@
 }
 
 function getMemoryCal() {
-    // create memory calendar
-    var memoryCalendar = Cc["@mozilla.org/calendar/calendar;1?type=memory"]
-                         .createInstance(Ci.calISyncWriteCalendar);
-
-    // remove existing items
-    var calendar = memoryCalendar.QueryInterface(Ci.calICalendarProvider);
-    try {
-        calendar.deleteCalendar(calendar, null);
-    } catch (e) {
-        print("*** error purging calendar: " + e);
-    }
-    return memoryCalendar;
+    return Cc["@mozilla.org/calendar/calendar;1?type=memory"]
+             .createInstance(Ci.calISyncWriteCalendar);
 }
 
 function getStorageCal() {
@@ -98,14 +88,6 @@
               .createInstance(Ci.calISyncWriteCalendar);
     stor.uri = uri;
     stor.id = cal.getUUID();
-
-    // remove existing items
-    var calendar = stor.QueryInterface(Ci.calICalendarProvider);
-    try {
-        calendar.deleteCalendar(calendar, null);
-    } catch (e) {
-        print("*** error purging calendar: " + e);
-    }
     return stor;
 }
 
@@ -187,45 +169,12 @@
                       "recurrenceStartDate"];
     }
     for (var i = 0; i < aPropArray.length; i++) {
-        do_check_eq(getProps(aLeftItem, aPropArray[i]),
-                    getProps(aRightItem,aPropArray[i]),
-                    Components.stack.caller);
+        equal(getProps(aLeftItem, aPropArray[i]),
+              getProps(aRightItem, aPropArray[i]),
+              Components.stack.caller);
     }
 }
 
-/**
- * Test whether specified function throws exception with expected
- * result.
- *
- * @param func
- *        Function to be tested.
- * @param result
- *        Expected result. <code>null</code> for no throws.
- * @param stack
- *        Optional stack object to be printed. <code>null</code> for
- *        Components#stack#caller.
- */
-function do_check_throws(func, result, stack)
-{
-  if (!stack)
-    stack = Components.stack.caller;
-
-  try {
-    func();
-  } catch (exc) {
-    if (exc.result == result || exc == result) {
-      let msg = stack.filename + " | [" + stack.name + " : " +
-           stack.lineNumber + "] " + exc.result + " == " + result + "\n";
-      do_report_result(true, msg, stack);
-      return;
-    }
-    do_throw("expected result " + result + ", caught " + (exc.result || exc), stack);
-  }
-
-  if (result) {
-    do_throw("expected result " + result + ", none thrown", stack);
-  }
-}
 
 /**
  * Unfold ics lines by removing any \r\n or \n followed by a linear whitespace
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_alarm.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_alarm.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_alarm.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_alarm.js	2015-02-28 15:02:41.000000000 +0000
@@ -45,29 +45,29 @@
     let alarm = cal.createAlarm();
     // Set ACTION to DISPLAY, make sure this was not rejected
     alarm.action = "DISPLAY";
-    do_check_eq(alarm.action, "DISPLAY");
+    equal(alarm.action, "DISPLAY");
 
     // Set a Description, REQUIRED for ACTION:DISPLAY
     alarm.description = "test";
-    do_check_eq(alarm.description, "test");
+    equal(alarm.description, "test");
 
     // SUMMARY is not valid for ACTION:DISPLAY
     alarm.summary = "test";
-    do_check_eq(alarm.summary, null);
+    equal(alarm.summary, null);
 
     // No attendees allowed
     let attendee = cal.createAttendee();
     attendee.id = "mailto:horst";
 
-    do_check_throws(function() {
+    throws(function() {
         // DISPLAY alarm should not be able to save attendees
         alarm.addAttendee(attendee);
-    }, Components.results.NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS);
+    }, /Alarm type AUDIO\/DISPLAY may not have attendees/);
 
-    do_check_throws(function() {
+    throws(function() {
         // DISPLAY alarm should not be able to save attachment
         alarm.addAttachment(cal.createAttachment());
-    }, Components.results.NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS);
+    }, /Alarm type DISPLAY may not have attachments/);
 
     dump("Done\n");
 }
@@ -77,15 +77,15 @@
     let alarm = cal.createAlarm();
     // Set ACTION to DISPLAY, make sure this was not rejected
     alarm.action = "EMAIL";
-    do_check_eq(alarm.action, "EMAIL");
+    equal(alarm.action, "EMAIL");
 
     // Set a Description, REQUIRED for ACTION:EMAIL
     alarm.description = "description";
-    do_check_eq(alarm.description, "description");
+    equal(alarm.description, "description");
 
     // Set a Summary, REQUIRED for ACTION:EMAIL
     alarm.summary = "summary";
-    do_check_eq(alarm.summary, "summary");
+    equal(alarm.summary, "summary");
 
     // Set an offset of some sort
     alarm.related = Components.interfaces.calIAlarm.ALARM_RELATED_START;
@@ -97,25 +97,25 @@
     let attendee2 = cal.createAttendee();
     attendee2.id = "mailto:gustav";
 
-    do_check_eq(alarm.getAttendees({}).length, 0);
+    equal(alarm.getAttendees({}).length, 0);
     alarm.addAttendee(attendee1);
-    do_check_eq(alarm.getAttendees({}).length, 1);
+    equal(alarm.getAttendees({}).length, 1);
     alarm.addAttendee(attendee2);
-    do_check_eq(alarm.getAttendees({}).length, 2);
+    equal(alarm.getAttendees({}).length, 2);
     alarm.addAttendee(attendee1);
     let addedAttendees = alarm.getAttendees({});
-    do_check_eq(addedAttendees.length, 2);
-    do_check_eq(addedAttendees[0], attendee2);
-    do_check_eq(addedAttendees[1], attendee1);
+    equal(addedAttendees.length, 2);
+    equal(addedAttendees[0], attendee2);
+    equal(addedAttendees[1], attendee1);
 
-    do_check_true(!!alarm.icalComponent.serializeToICS().match(/mailto:horst/));
-    do_check_true(!!alarm.icalComponent.serializeToICS().match(/mailto:gustav/));
+    ok(!!alarm.icalComponent.serializeToICS().match(/mailto:horst/));
+    ok(!!alarm.icalComponent.serializeToICS().match(/mailto:gustav/));
 
     alarm.deleteAttendee(attendee1);
-    do_check_eq(alarm.getAttendees({}).length, 1);
+    equal(alarm.getAttendees({}).length, 1);
 
     alarm.clearAttendees();
-    do_check_eq(alarm.getAttendees({}).length, 0);
+    equal(alarm.getAttendees({}).length, 0);
 
     // TODO test attachments
     dump("Done\n");
@@ -128,15 +128,15 @@
     alarm.alarmDate = cal.createDateTime();
     // Set ACTION to AUDIO, make sure this was not rejected
     alarm.action = "AUDIO";
-    do_check_eq(alarm.action, "AUDIO");
+    equal(alarm.action, "AUDIO");
 
     // No Description for ACTION:AUDIO
     alarm.description = "description";
-    do_check_eq(alarm.description, null);
+    equal(alarm.description, null);
 
     // No Summary, for ACTION:AUDIO
     alarm.summary = "summary";
-    do_check_eq(alarm.summary, null);
+    equal(alarm.summary, null);
 
     // No attendees allowed
     let attendee = cal.createAttendee();
@@ -148,9 +148,9 @@
     } catch (e) {}
 
     // No attendee yet, should not be initialized
-    do_check_throws(function() {
+    throws(function() {
         alarm.icalComponent;
-    }, Components.results.NS_ERROR_NOT_INITIALIZED);
+    }, /Component not initialized/);
 
     // Test attachments
     let sound = cal.createAttachment();
@@ -161,15 +161,15 @@
     // Adding an attachment should work
     alarm.addAttachment(sound);
     let addedAttachments = alarm.getAttachments({});
-    do_check_eq(addedAttachments.length, 1);
-    do_check_eq(addedAttachments[0], sound);
-    do_check_true(alarm.icalString.indexOf("ATTACH:file:///sound.wav") > -1);
+    equal(addedAttachments.length, 1);
+    equal(addedAttachments[0], sound);
+    ok(alarm.icalString.indexOf("ATTACH:file:///sound.wav") > -1);
 
     // Adding twice shouldn't change anything
     alarm.addAttachment(sound);
     addedAttachments = alarm.getAttachments({});
-    do_check_eq(addedAttachments.length, 1);
-    do_check_eq(addedAttachments[0], sound);
+    equal(addedAttachments.length, 1);
+    equal(addedAttachments[0], sound);
 
     try {
         alarm.addAttachment(sound2);
@@ -179,13 +179,13 @@
     // Deleting should work
     alarm.deleteAttachment(sound);
     addedAttachments = alarm.getAttachments({});
-    do_check_eq(addedAttachments.length, 0);
+    equal(addedAttachments.length, 0);
 
     // As well as clearing
     alarm.addAttachment(sound);
     alarm.clearAttachments();
     addedAttachments = alarm.getAttachments({});
-    do_check_eq(addedAttachments.length, 0);
+    equal(addedAttachments.length, 0);
 
     dump("Done\n");
 }
@@ -195,15 +195,15 @@
     let alarm = cal.createAlarm();
     // Set ACTION to a custom value, make sure this was not rejected
     alarm.action = "X-SMS"
-    do_check_eq(alarm.action, "X-SMS");
+    equal(alarm.action, "X-SMS");
 
     // There is no restriction on DESCRIPTION for custom alarms
     alarm.description = "description";
-    do_check_eq(alarm.description, "description");
+    equal(alarm.description, "description");
 
     // There is no restriction on SUMMARY for custom alarms
     alarm.summary = "summary";
-    do_check_eq(alarm.summary, "summary");
+    equal(alarm.summary, "summary");
 
     // Test for attendees
     let attendee1 = cal.createAttendee();
@@ -211,19 +211,19 @@
     let attendee2 = cal.createAttendee();
     attendee2.id = "mailto:gustav";
 
-    do_check_eq(alarm.getAttendees({}).length, 0);
+    equal(alarm.getAttendees({}).length, 0);
     alarm.addAttendee(attendee1);
-    do_check_eq(alarm.getAttendees({}).length, 1);
+    equal(alarm.getAttendees({}).length, 1);
     alarm.addAttendee(attendee2);
-    do_check_eq(alarm.getAttendees({}).length, 2);
+    equal(alarm.getAttendees({}).length, 2);
     alarm.addAttendee(attendee1);
-    do_check_eq(alarm.getAttendees({}).length, 2);
+    equal(alarm.getAttendees({}).length, 2);
 
     alarm.deleteAttendee(attendee1);
-    do_check_eq(alarm.getAttendees({}).length, 1);
+    equal(alarm.getAttendees({}).length, 1);
 
     alarm.clearAttendees();
-    do_check_eq(alarm.getAttendees({}).length, 0);
+    equal(alarm.getAttendees({}).length, 0);
 
     // Test for attachments
     let attach1 = cal.createAttachment();
@@ -235,17 +235,17 @@
     alarm.addAttachment(attach2);
 
     let addedAttachments = alarm.getAttachments({});
-    do_check_eq(addedAttachments.length, 2);
-    do_check_eq(addedAttachments[0], attach1);
-    do_check_eq(addedAttachments[1], attach2);
+    equal(addedAttachments.length, 2);
+    equal(addedAttachments[0], attach1);
+    equal(addedAttachments[1], attach2);
 
     alarm.deleteAttachment(attach1);
     addedAttachments = alarm.getAttachments({});
-    do_check_eq(addedAttachments.length, 1);
+    equal(addedAttachments.length, 1);
 
     alarm.clearAttachments();
     addedAttachments = alarm.getAttachments({});
-    do_check_eq(addedAttachments.length, 0);
+    equal(addedAttachments.length, 0);
 }
 
 // Check if any combination of REPEAT and DURATION work as expected.
@@ -255,22 +255,22 @@
     let alarm = cal.createAlarm();
 
     // Check initial value
-    do_check_eq(alarm.repeat, 0);
-    do_check_eq(alarm.repeatOffset, null);
-    do_check_eq(alarm.repeatDate, null);
+    equal(alarm.repeat, 0);
+    equal(alarm.repeatOffset, null);
+    equal(alarm.repeatDate, null);
 
     // Should not be able to get REPEAT when DURATION is not set
     alarm.repeat = 1;
-    do_check_eq(alarm.repeat, 0);
+    equal(alarm.repeat, 0);
 
     // Both REPEAT and DURATION should be accessible, when the two are set.
     alarm.repeatOffset = createDuration();
-    do_check_neq(alarm.repeatOffset, null);
-    do_check_neq(alarm.repeat, 0);
+    notEqual(alarm.repeatOffset, null);
+    notEqual(alarm.repeat, 0);
 
     // Should not be able to get DURATION when REPEAT is not set
     alarm.repeat = null;
-    do_check_eq(alarm.repeatOffset, null);
+    equal(alarm.repeatOffset, null);
 
     // Should be able to unset alarm DURATION attribute. (REPEAT already tested above)
     try {
@@ -280,8 +280,8 @@
     }
 
     // Check unset value
-    do_check_eq(alarm.repeat, 0);
-    do_check_eq(alarm.repeatOffset, null);
+    equal(alarm.repeat, 0);
+    equal(alarm.repeatOffset, null);
 
     // Check repeatDate
     alarm = cal.createAlarm();
@@ -293,7 +293,7 @@
 
     let dt = alarm.alarmDate.clone();
     dt.second += 3600;
-    do_check_eq(alarm.repeatDate.icalString, dt.icalString);
+    equal(alarm.repeatDate.icalString, dt.icalString);
 
     dump("Done\n");
 }
@@ -302,11 +302,11 @@
     dump("Testing X-Props...");
     let alarm = cal.createAlarm();
     alarm.setProperty("X-PROP", "X-VALUE");
-    do_check_true(alarm.hasProperty("X-PROP"));
-    do_check_eq(alarm.getProperty("X-PROP"), "X-VALUE");
+    ok(alarm.hasProperty("X-PROP"));
+    equal(alarm.getProperty("X-PROP"), "X-VALUE");
     alarm.deleteProperty("X-PROP");
-    do_check_false(alarm.hasProperty("X-PROP"));
-    do_check_eq(alarm.getProperty("X-PROP"), null);
+    ok(!alarm.hasProperty("X-PROP"));
+    equal(alarm.getProperty("X-PROP"), null);
 
     // also check X-MOZ-LASTACK prop
     let dt = cal.createDateTime();
@@ -315,10 +315,10 @@
     alarm.description = "test";
     alarm.related = Ci.calIAlarm.ALARM_RELATED_START
     alarm.offset = createDuration("-PT5M");
-    do_check_true(alarm.icalComponent.serializeToICS().indexOf(dt.icalString) > -1);
+    ok(alarm.icalComponent.serializeToICS().indexOf(dt.icalString) > -1);
 
     alarm.deleteProperty("X-MOZ-LASTACK");
-    do_check_false(alarm.icalComponent.serializeToICS().indexOf(dt.icalString) > -1);
+    ok(!alarm.icalComponent.serializeToICS().indexOf(dt.icalString) > -1);
     dump("Done\n");
 }
 
@@ -327,15 +327,15 @@
     let passed;
     // Initial value
     let alarm = cal.createAlarm();
-    do_check_eq(alarm.alarmDate, null);
-    do_check_eq(alarm.offset, null);
+    equal(alarm.alarmDate, null);
+    equal(alarm.offset, null);
 
     // Set an offset and check it
     alarm.related = Ci.calIAlarm.ALARM_RELATED_START
     let offset = createDuration("-PT5M");
     alarm.offset = offset;
-    do_check_eq(alarm.alarmDate, null);
-    do_check_eq(alarm.offset, offset);
+    equal(alarm.alarmDate, null);
+    equal(alarm.offset, offset);
     try {
         alarm.alarmDate = createDateTime();
         passed = false;
@@ -350,8 +350,8 @@
     alarm.related = Ci.calIAlarm.ALARM_RELATED_ABSOLUTE;
     let alarmDate = createDate(2007, 0, 1, true, 2, 0, 0);
     alarm.alarmDate = alarmDate;
-    do_check_eq(alarm.alarmDate, alarmDate);
-    do_check_eq(alarm.offset, null);
+    equal(alarm.alarmDate, alarmDate);
+    equal(alarm.offset, null);
     try {
         alarm.offset = createDuration();
         passed = false;
@@ -397,33 +397,33 @@
 
     let passed = false;
     // Initial checks
-    do_check_true(alarm.isMutable);
+    ok(alarm.isMutable);
     alarm.makeImmutable();
-    do_check_false(alarm.isMutable);
+    ok(!alarm.isMutable);
     alarm.makeImmutable();
-    do_check_false(alarm.isMutable);
+    ok(!alarm.isMutable);
 
     // Check each attribute
     for (let prop in propMap) {
         try {
             alarm[prop] = propMap[prop];
         } catch (e) {
-            do_check_eq(e.result, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
+            equal(e.result, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
             continue;
         }
         do_throw("Attribute " + prop + " was writable while item was immutable");
     }
 
     // Functions
-    do_check_throws(function() {
+    throws(function() {
         alarm.setProperty("X-FOO", "changed");
-    }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
+    }, /Can not modify immutable data container/);
 
-    do_check_throws(function() {
+    throws(function() {
         alarm.deleteProperty("X-FOO");
-    }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
+    }, /Can not modify immutable data container/);
 
-    do_check_false(alarm.getProperty("X-DATEPROP").isMutable);
+    ok(!alarm.getProperty("X-DATEPROP").isMutable);
 
     dump("Done\n");
 }
@@ -445,14 +445,14 @@
     let newAlarm = alarm.clone();
     newAlarm.makeImmutable();
     newAlarm = newAlarm.clone();
-    do_check_true(newAlarm.isMutable);
+    ok(newAlarm.isMutable);
 
     // Check if item is still the same
     // TODO This is not quite optimal, maybe someone can find a better way to do
     // the comparisons.
     for (let prop in propMap) {
         if (prop == "item") {
-            do_check_eq(alarm.item.icalString, newAlarm.item.icalString)
+            equal(alarm.item.icalString, newAlarm.item.icalString)
         } else {
             if ((alarm[prop] instanceof Ci.nsISupports &&
                  alarm[prop].icalString != newAlarm[prop].icalString) ||
@@ -467,16 +467,16 @@
     for (let prop in clonePropMap) {
         newAlarm[prop] = clonePropMap[prop];
         dump("Checking " + prop + "...");
-        do_check_neq(alarm[prop], newAlarm[prop]);
+        notEqual(alarm[prop], newAlarm[prop]);
         dump("OK!\n");
         break;
     }
 
     // Check x props
     alarm.setProperty("X-FOO", "BAR");
-    do_check_eq(alarm.getProperty("X-FOO"), "BAR");
+    equal(alarm.getProperty("X-FOO"), "BAR");
     let dt = alarm.getProperty("X-DATEPROP");
-    do_check_eq(dt.isMutable, true);
+    equal(dt.isMutable, true);
 
     // Test xprop params
     alarm.icalString =
@@ -488,7 +488,7 @@
         "END:VALARM";
 
     newAlarm = alarm.clone();
-    do_check_eq(alarm.icalString, newAlarm.icalString);
+    equal(alarm.icalString, newAlarm.icalString);
 
     dump("Done\n");
 }
@@ -498,9 +498,9 @@
     let alarm = cal.createAlarm();
     let srv = cal.getIcsService();
 
-    do_check_throws(function() {
+    throws(function() {
         alarm.icalComponent = srv.createIcalComponent("BARF");
-    }, Components.results.NS_ERROR_INVALID_ARG);
+    }, /0x80070057/ , "Invalid Argument");
 
     function addProp(k,v) { let p = srv.createIcalProperty(k); p.value = v; comp.addProperty(p) }
     function addActionDisplay() addProp("ACTION", "DISPLAY");
@@ -526,34 +526,34 @@
     alarm.toString();
 
     // Missing action
-    do_check_throws(function() {
+    throws(function() {
         comp = srv.createIcalComponent("VALARM");
         addTrigger(); addDescr();
         alarm.icalComponent = comp;
-    }, Components.results.NS_ERROR_INVALID_ARG);
+    }, /Illegal value/, "Invalid Argument");
 
     // Missing trigger
-    do_check_throws(function() {
+    throws(function() {
         comp = srv.createIcalComponent("VALARM");
         addActionDisplay(); addDescr();
         alarm.icalComponent = comp;
-    }, Components.results.NS_ERROR_INVALID_ARG);
+    }, /Illegal value/, "Invalid Argument");
 
     // Missing duration with repeat
-    do_check_throws(function() {
+    throws(function() {
         comp = srv.createIcalComponent("VALARM");
         addActionDisplay(); addTrigger(); addDescr();
         addRepeat();
         alarm.icalComponent = comp;
-    }, Components.results.NS_ERROR_INVALID_ARG);
+    }, /Illegal value/, "Invalid Argument");
 
     // Missing repeat with duration
-    do_check_throws(function() {
+    throws(function() {
         comp = srv.createIcalComponent("VALARM");
         addActionDisplay(); addTrigger(); addDescr();
         addDuration();
         alarm.icalComponent = comp;
-    }, Components.results.NS_ERROR_INVALID_ARG);
+    }, /Illegal value/, "Invalid Argument");
 
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_alarmservice.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_alarmservice.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_alarmservice.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_alarmservice.js	2015-02-28 15:02:41.000000000 +0000
@@ -9,7 +9,7 @@
 const EXPECT_FIRED = 1;
 const EXPECT_TIMER = 2;
 
-function do_check_xor(a, b) do_check_true((a && !b) || (!a && b));
+function do_check_xor(a, b) ok((a && !b) || (!a && b));
 
 let alarmObserver = {
     service: null,
@@ -111,10 +111,10 @@
     alarmObserver.service = Components.classes["@mozilla.org/calendar/alarm-service;1"]
                                        .getService(Components.interfaces.calIAlarmService)
                                        .wrappedJSObject;
-    do_check_false(alarmObserver.service.mStarted);
+    ok(!alarmObserver.service.mStarted);
 
     alarmObserver.service.startup();
-    do_check_true(alarmObserver.service.mStarted);
+    ok(alarmObserver.service.mStarted);
 
     // we need to replace the existing observers with our observer
     for each (let obs in alarmObserver.service.mObservers.mInterfaces) {
@@ -291,7 +291,7 @@
 
     // the snoozed alarm timer delay should be close to an hour
     let tmr = alarmObserver.getTimer(aCalendar.id, item.hashId, alarm.icalString);
-    do_check_true(Math.abs(tmr.delay - 3600000) <= 1000);
+    ok(Math.abs(tmr.delay - 3600000) <= 1000);
 
     // test dismiss alarm
     alarmObserver.service.dismissAlarm(item2, alarm2);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_attachment.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_attachment.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_attachment.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_attachment.js	2015-02-28 15:02:41.000000000 +0000
@@ -18,18 +18,18 @@
     let hash1 = attach.hashId;
 
     attach.rawData = "world";
-    do_check_neq(hash1, attach.hashId);
+    notEqual(hash1, attach.hashId);
 
     attach.rawData = "hello";
-    do_check_eq(hash1, attach.hashId);
+    equal(hash1, attach.hashId);
 
     // Setting raw data should give us a BINARY attachment
-    do_check_eq(attach.getParameter("VALUE"), "BINARY");
+    equal(attach.getParameter("VALUE"), "BINARY");
 
     attach.uri = makeURL("http://hello");
 
     // Setting an uri should delete the value parameter
-    do_check_eq(attach.getParameter("VALUE"), null);
+    equal(attach.getParameter("VALUE"), null);
 }
 
 function test_uriattach() {
@@ -43,11 +43,11 @@
     let prop = e.icalComponent.getFirstProperty("ATTACH");
     attach.icalProperty = prop;
 
-    do_check_neq(attach.getParameter("VALUE"), "BINARY");
-    do_check_eq(attach.formatType, "x-moz/test");
-    do_check_eq(attach.getParameter("FMTTYPE"), "x-moz/test");
-    do_check_eq(attach.uri.spec, makeURL("http://hello").spec);
-    do_check_eq(attach.rawData, "http://hello");
+    notEqual(attach.getParameter("VALUE"), "BINARY");
+    equal(attach.formatType, "x-moz/test");
+    equal(attach.getParameter("FMTTYPE"), "x-moz/test");
+    equal(attach.uri.spec, makeURL("http://hello").spec);
+    equal(attach.rawData, "http://hello");
 }
 
 function test_binaryattach() {
@@ -64,47 +64,47 @@
     let prop = e.icalComponent.getFirstProperty("ATTACH");
     attach.icalProperty = prop;
 
-    do_check_eq(attach.formatType, "x-moz/test2");
-    do_check_eq(attach.getParameter("FMTTYPE"), "x-moz/test2");
-    do_check_eq(attach.encoding, "BASE64");
-    do_check_eq(attach.getParameter("ENCODING"), "BASE64");
-    do_check_eq(attach.uri, null);
-    do_check_eq(attach.rawData, "aHR0cDovL2hlbGxvMg==");
-    do_check_eq(attach.getParameter("VALUE"), "BINARY");
+    equal(attach.formatType, "x-moz/test2");
+    equal(attach.getParameter("FMTTYPE"), "x-moz/test2");
+    equal(attach.encoding, "BASE64");
+    equal(attach.getParameter("ENCODING"), "BASE64");
+    equal(attach.uri, null);
+    equal(attach.rawData, "aHR0cDovL2hlbGxvMg==");
+    equal(attach.getParameter("VALUE"), "BINARY");
 
     let propIcalString = attach.icalProperty.icalString;
-    do_check_true(!!propIcalString.match(/ENCODING=BASE64/));
-    do_check_true(!!propIcalString.match(/FMTTYPE=x-moz\/test2/));
-    do_check_true(!!propIcalString.match(/VALUE=BINARY/));
-    do_check_true(!!propIcalString.replace("\r\n ", "").match(/:aHR0cDovL2hlbGxvMg==/));
+    ok(!!propIcalString.match(/ENCODING=BASE64/));
+    ok(!!propIcalString.match(/FMTTYPE=x-moz\/test2/));
+    ok(!!propIcalString.match(/VALUE=BINARY/));
+    ok(!!propIcalString.replace("\r\n ", "").match(/:aHR0cDovL2hlbGxvMg==/));
 
     propIcalString = attach.clone().icalProperty.icalString;
 
-    do_check_true(!!propIcalString.match(/ENCODING=BASE64/));
-    do_check_true(!!propIcalString.match(/FMTTYPE=x-moz\/test2/));
-    do_check_true(!!propIcalString.match(/VALUE=BINARY/));
-    do_check_true(!!propIcalString.replace("\r\n ", "").match(/:aHR0cDovL2hlbGxvMg==/));
+    ok(!!propIcalString.match(/ENCODING=BASE64/));
+    ok(!!propIcalString.match(/FMTTYPE=x-moz\/test2/));
+    ok(!!propIcalString.match(/VALUE=BINARY/));
+    ok(!!propIcalString.replace("\r\n ", "").match(/:aHR0cDovL2hlbGxvMg==/));
 }
 
 function test_serialize() {
     let attach = cal.createAttachment();
     attach.formatType = "x-moz/test2";
     attach.uri = Services.io.newURI("data:text/plain,", null, null);
-    do_check_eq(attach.icalString, "ATTACH;FMTTYPE=x-moz/test2:data:text/plain,\r\n");
+    equal(attach.icalString, "ATTACH;FMTTYPE=x-moz/test2:data:text/plain,\r\n");
 
     attach = cal.createAttachment();
     attach.encoding = "BASE64";
     attach.uri = Services.io.newURI("data:text/plain,", null, null);
-    do_check_eq(attach.icalString, "ATTACH;ENCODING=BASE64:data:text/plain,\r\n");
+    equal(attach.icalString, "ATTACH;ENCODING=BASE64:data:text/plain,\r\n");
 
-    do_check_throws(function() {
+    throws(function() {
         attach.icalString = "X-STICKER:smiley";
-    }, Components.results.NS_ERROR_ILLEGAL_VALUE);
+    }, /Illegal value/);
 
     attach = cal.createAttachment();
     attach.uri = Services.io.newURI("data:text/plain,", null, null);
     attach.setParameter("X-PROP", "VAL");
-    do_check_eq(attach.icalString, "ATTACH;X-PROP=VAL:data:text/plain,\r\n");
+    equal(attach.icalString, "ATTACH;X-PROP=VAL:data:text/plain,\r\n");
     attach.setParameter("X-PROP", null);
-    do_check_eq(attach.icalString, "ATTACH:data:text/plain,\r\n");
+    equal(attach.icalString, "ATTACH:data:text/plain,\r\n");
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_attendee.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_attendee.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_attendee.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_attendee.js	2015-02-28 15:02:41.000000000 +0000
@@ -15,34 +15,34 @@
         let countObj = {};
         // Getting all attendees
         let allAttendees = event.getAttendees(countObj);
-        do_check_eq(countObj.value, allAttendees.length);
+        equal(countObj.value, allAttendees.length);
 
-        do_check_eq(allAttendees.length, expectedAttendees.length);
+        equal(allAttendees.length, expectedAttendees.length);
 
         // Check if all expected attendees are found
         for (let i = 0; i < expectedAttendees.length; i++) {
-            do_check_neq(allAttendees.indexOf(expectedAttendees[i]), -1);
+            notEqual(allAttendees.indexOf(expectedAttendees[i]), -1);
         }
 
         // Check if all found attendees are expected
         for (let i = 0; i < allAttendees.length; i++) {
-            do_check_neq(expectedAttendees.indexOf(allAttendees[i]), -1);
+            notEqual(expectedAttendees.indexOf(allAttendees[i]), -1);
         }
     }
     function findById(event, id, a) {
         let foundAttendee = event.getAttendeeById(id);
-        do_check_eq(foundAttendee, a);
+        equal(foundAttendee, a);
     }
     function testImmutability(a, properties) {
-        do_check_false(a.isMutable);
+         ok(!a.isMutable);
         // Check if setting a property throws. It should.
         for (let i = 0; i < properties.length; i++) {
             let old = a[properties[i]];
-            do_check_throws(function() {
+            throws(function() {
                 a[properties[i]] = old + 1;
-            }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
+            }, /Can not modify immutable data container/);
 
-            do_check_eq(a[properties[i]], old);
+            equal(a[properties[i]], old);
         }
     }
 
@@ -55,11 +55,11 @@
                       "userType"];
     var values = ["myid", "mycn", "TRUE", "CHAIR", "DECLINED", "RESOURCE"];
     // Make sure test is valid
-    do_check_eq(properties.length, values.length);
+    equal(properties.length, values.length);
 
     for (var i = 0; i < properties.length; i++) {
         a1[properties[i]] = values[i];
-        do_check_eq(a1[properties[i]], values[i]);
+        equal(a1[properties[i]], values[i]);
     }
 
     // Create event
@@ -90,13 +90,13 @@
     var ec = event.clone();
     var clonedatts = ec.getAttendees({});
     var atts = event.getAttendees({});
-    do_check_eq(atts.length, clonedatts.length)
+    equal(atts.length, clonedatts.length)
 
     for (i = 0; i < clonedatts.length; i++) {
         // The attributes should not be equal
-        do_check_neq(atts[i], clonedatts[i]);
+        notEqual(atts[i], clonedatts[i]);
         // But the ids should
-        do_check_eq(atts[i].id, clonedatts[i].id)
+        equal(atts[i].id, clonedatts[i].id)
     }
 
     // Make sure organizers are also cloned correctly
@@ -105,17 +105,17 @@
     a3.isOrganizer = true;
     let a4 = a3.clone();
 
-    do_check_true(a4.isOrganizer)
+    ok(a4.isOrganizer)
     a3.isOrganizer = false;
-    do_check_true(a4.isOrganizer)
+    ok(a4.isOrganizer)
 }
 
 function test_serialize() {
     let a = cal.createAttendee();
 
-    do_check_throws(function() {
+    throws(function() {
         a.icalProperty;
-    }, Components.results.NS_ERROR_NOT_INITIALIZED);
+    }, /Component not initialized/);
 
     a.id = "horst";
     a.commonName = "Horst";
@@ -131,34 +131,34 @@
 
     let prop = a.icalProperty;
     dump(prop.icalString);
-    do_check_eq(prop.value, "horst");
-    do_check_eq(prop.propertyName, "ATTENDEE");
-    do_check_eq(prop.getParameter("CN"), "Horst");
-    do_check_eq(prop.getParameter("RSVP"), "TRUE");
-    do_check_eq(prop.getParameter("ROLE"), "CHAIR");
-    do_check_eq(prop.getParameter("PARTSTAT"), "DECLINED");
-    do_check_eq(prop.getParameter("CUTYPE"), "RESOURCE");
-    do_check_eq(prop.getParameter("X-NAME"), "X-VALUE");
+    equal(prop.value, "horst");
+    equal(prop.propertyName, "ATTENDEE");
+    equal(prop.getParameter("CN"), "Horst");
+    equal(prop.getParameter("RSVP"), "TRUE");
+    equal(prop.getParameter("ROLE"), "CHAIR");
+    equal(prop.getParameter("PARTSTAT"), "DECLINED");
+    equal(prop.getParameter("CUTYPE"), "RESOURCE");
+    equal(prop.getParameter("X-NAME"), "X-VALUE");
 
     a.isOrganizer = true;
     prop = a.icalProperty;
-    do_check_eq(prop.value, "horst");
-    do_check_eq(prop.propertyName, "ORGANIZER");
-    do_check_eq(prop.getParameter("CN"), "Horst");
-    do_check_eq(prop.getParameter("RSVP"), "TRUE");
-    do_check_eq(prop.getParameter("ROLE"), "CHAIR");
-    do_check_eq(prop.getParameter("PARTSTAT"), "DECLINED");
-    do_check_eq(prop.getParameter("CUTYPE"), "RESOURCE");
-    do_check_eq(prop.getParameter("X-NAME"), "X-VALUE");
+    equal(prop.value, "horst");
+    equal(prop.propertyName, "ORGANIZER");
+    equal(prop.getParameter("CN"), "Horst");
+    equal(prop.getParameter("RSVP"), "TRUE");
+    equal(prop.getParameter("ROLE"), "CHAIR");
+    equal(prop.getParameter("PARTSTAT"), "DECLINED");
+    equal(prop.getParameter("CUTYPE"), "RESOURCE");
+    equal(prop.getParameter("X-NAME"), "X-VALUE");
 
 }
 
 function test_properties() {
     let a = cal.createAttendee();
 
-    do_check_throws(function() {
+    throws(function() {
         a.icalProperty;
-    }, Components.results.NS_ERROR_NOT_INITIALIZED);
+    }, /Component not initialized/);
 
     a.id = "horst";
     a.commonName = "Horst";
@@ -173,8 +173,8 @@
     // Only X-Props should show up in the enumerator
     a.setProperty("X-NAME", "X-VALUE");
     for (let x in fixIterator(a.propertyEnumerator, Components.interfaces.nsIProperty)) {
-        do_check_eq(x.name, "X-NAME");
-        do_check_eq(x.value, "X-VALUE");
+        equal(x.name, "X-NAME");
+        equal(x.value, "X-VALUE");
     }
 
     a.deleteProperty("X-NAME");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug272411.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug272411.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug272411.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug272411.js	2015-02-28 15:02:41.000000000 +0000
@@ -11,5 +11,5 @@
 
     // calIDateTime is only accurate to the second, milliseconds need to be
     // stripped.
-    do_check_eq(cdtTime, jsdTime);
+    equal(cdtTime, jsdTime);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug343792.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug343792.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug343792.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug343792.js	2015-02-28 15:02:41.000000000 +0000
@@ -54,9 +54,9 @@
 
     // the following call caused a never ending loop:
     let occurrenceDates = event.recurrenceInfo.getOccurrenceDates(start, end, 0, {});
-    do_check_eq(occurrenceDates.length, 4);
+    equal(occurrenceDates.length, 4);
 
     // the following call caused a never ending loop:
     let occurrences = event.recurrenceInfo.getOccurrences(start, end, 0, {});
-    do_check_eq(occurrences.length, 4);
+    equal(occurrences.length, 4);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug350845.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug350845.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug350845.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug350845.js	2015-02-28 15:02:41.000000000 +0000
@@ -10,38 +10,38 @@
         "END:VEVENT");
 
     // Test getters for imported event
-    do_check_eq(event.getProperty("X-FOO"), "QUUX");
-    do_check_true(event.hasProperty("X-FOO"));
-    do_check_eq(event.getPropertyParameter("X-FOO", "X-BAR"), "BAZ");
-    do_check_true(event.hasPropertyParameter("X-FOO", "X-BAR"));
+    equal(event.getProperty("X-FOO"), "QUUX");
+    ok(event.hasProperty("X-FOO"));
+    equal(event.getPropertyParameter("X-FOO", "X-BAR"), "BAZ");
+    ok(event.hasPropertyParameter("X-FOO", "X-BAR"));
 
     // Test setters
-    do_check_throws(function() {
+    throws(function() {
       event.setPropertyParameter("X-UNKNOWN", "UNKNOWN", "VALUE");
-    }, Components.results.NS_ERROR_XPC_JS_THREW_STRING);
+    }, /Property X-UNKNOWN not set/);
 
     // More setters
     event.setPropertyParameter("X-FOO", "X-BAR", "FNORD");
-    do_check_eq(event.getPropertyParameter("X-FOO", "X-BAR"), "FNORD");
-    do_check_neq(event.icalString.match(/^X-FOO;X-BAR=FNORD:QUUX$/m), null);
+    equal(event.getPropertyParameter("X-FOO", "X-BAR"), "FNORD");
+    notEqual(event.icalString.match(/^X-FOO;X-BAR=FNORD:QUUX$/m), null);
 
     // Enumerator
-    do_check_throws(function() {
+    throws(function() {
       event.getParameterEnumerator("X-UNKNOWN");
-    }, Components.results.NS_ERROR_XPC_JS_THREW_STRING);
+    }, /Property X-UNKNOWN not set/);
 
     // More enumerator
     let enume = event.getParameterEnumerator("X-FOO");
-    do_check_true(enume.hasMoreElements());
+    ok(enume.hasMoreElements());
     let xbar = enume.getNext().QueryInterface(Components.interfaces.nsIProperty);
-    do_check_eq(xbar.name, "X-BAR");
-    do_check_eq(xbar.value, "FNORD");
-    do_check_false(enume.hasMoreElements());
+    equal(xbar.name, "X-BAR");
+    equal(xbar.value, "FNORD");
+    ok(!enume.hasMoreElements());
 
     // Deletion of parameters when deleting properties
     event.deleteProperty("X-FOO");
-    do_check_false(event.hasProperty("X-FOO"));
+    ok(!event.hasProperty("X-FOO"));
     event.setProperty("X-FOO", "SNORK");
-    do_check_eq(event.getProperty("X-FOO"), "SNORK");
-    do_check_eq(event.getPropertyParameter("X-FOO", "X-BAR"), null);
+    equal(event.getProperty("X-FOO"), "SNORK");
+    equal(event.getPropertyParameter("X-FOO", "X-BAR"), null);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug356207.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug356207.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug356207.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug356207.js	2015-02-28 15:02:41.000000000 +0000
@@ -35,9 +35,9 @@
 
     // the following call caused a never ending loop:
     let occurrenceDates = event.recurrenceInfo.getOccurrenceDates(start, end, 0, {});
-    do_check_eq(occurrenceDates.length, 2);
+    equal(occurrenceDates.length, 2);
 
     // the following call caused a never ending loop:
     let occurrences = event.recurrenceInfo.getOccurrences(start, end, 0, {});
-    do_check_eq(occurrences.length, 2);
+    equal(occurrences.length, 2);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug485571.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug485571.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug485571.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug485571.js	2015-02-28 15:02:41.000000000 +0000
@@ -65,15 +65,15 @@
 function check_relative(aIcalString, aRelated) {
     let alarm = cal.createAlarm();
     alarm.icalString = aIcalString;
-    do_check_eq(alarm.related, aRelated);
-    do_check_eq(alarm.alarmDate, null);
-    do_check_neq(alarm.offset, null);
+    equal(alarm.related, aRelated);
+    equal(alarm.alarmDate, null);
+    notEqual(alarm.offset, null);
 }
 
 function check_absolute(aIcalString) {
     let alarm = cal.createAlarm();
     alarm.icalString = aIcalString;
-    do_check_eq(alarm.related, Ci.calIAlarm.ALARM_RELATED_ABSOLUTE);
-    do_check_neq(alarm.alarmDate, null);
-    do_check_eq(alarm.offset, null);
+    equal(alarm.related, Ci.calIAlarm.ALARM_RELATED_ABSOLUTE);
+    notEqual(alarm.alarmDate, null);
+    equal(alarm.offset, null);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug494140.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug494140.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug494140.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug494140.js	2015-02-28 15:02:41.000000000 +0000
@@ -29,9 +29,9 @@
                                          "END:VEVENT");
 
     // There should be one alarm, one relation and one attachment
-    do_check_eq(item.getAlarms({}).length, 1);
-    do_check_eq(item.getRelations({}).length, 1);
-    do_check_eq(item.getAttachments({}).length, 1);
+    equal(item.getAlarms({}).length, 1);
+    equal(item.getRelations({}).length, 1);
+    equal(item.getAttachments({}).length, 1);
 
     // Change the occurrence to another day
     let occ = item.recurrenceInfo.getOccurrenceFor(cal.createDateTime("20090604T073000Z"));
@@ -39,9 +39,9 @@
     item.recurrenceInfo.modifyException(occ, true);
 
     // There should still be one alarm, one relation and one attachment
-    do_check_eq(item.getAlarms({}).length, 1);
-    do_check_eq(item.getRelations({}).length, 1);
-    do_check_eq(item.getAttachments({}).length, 1);
+    equal(item.getAlarms({}).length, 1);
+    equal(item.getRelations({}).length, 1);
+    equal(item.getAttachments({}).length, 1);
 
     // Add the item to the storage calendar and retrieve it again
     storageCal.adoptItem(item, null);
@@ -54,7 +54,7 @@
     });
 
     // There should still be one alarm, one relation and one attachment
-    do_check_eq(item.getAlarms({}).length, 1);
-    do_check_eq(item.getRelations({}).length, 1);
-    do_check_eq(item.getAttachments({}).length, 1);
+    equal(item.getAlarms({}).length, 1);
+    equal(item.getRelations({}).length, 1);
+    equal(item.getAttachments({}).length, 1);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug523860.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug523860.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug523860.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug523860.js	2015-02-28 15:02:41.000000000 +0000
@@ -11,5 +11,5 @@
     let expected = "A String with \"quotes\" and 'other quotes'";
 
     prop.value = expected;
-    do_check_eq(prop.icalString, "DESCRIPTION:" + expected + "\r\n");
+    equal(prop.icalString, "DESCRIPTION:" + expected + "\r\n");
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug653924.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug653924.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug653924.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug653924.js	2015-02-28 15:02:41.000000000 +0000
@@ -7,7 +7,7 @@
     let rel = cal.createRelation();
     evt.addRelation(rel);
 
-    do_check_eq(1, evt.icalString.match(/RELATED-TO/g).length);
+    equal(1, evt.icalString.match(/RELATED-TO/g).length);
     evt.icalString = evt.icalString;
-    do_check_eq(1, evt.icalString.match(/RELATED-TO/g).length);
+    equal(1, evt.icalString.match(/RELATED-TO/g).length);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug668222.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug668222.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug668222.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug668222.js	2015-02-28 15:02:41.000000000 +0000
@@ -8,15 +8,15 @@
 
     // Set the property and make sure its there
     attendee.setProperty("SCHEDULE-AGENT", "CLIENT");
-    do_check_eq(attendee.getProperty("SCHEDULE-AGENT"), "CLIENT");
+    equal(attendee.getProperty("SCHEDULE-AGENT"), "CLIENT");
 
     // Reserialize the property, this has caused the property to go away
     // in the past.
     attendee.icalProperty = attendee.icalProperty;
-    do_check_eq(attendee.getProperty("SCHEDULE-AGENT"), "CLIENT");
+    equal(attendee.getProperty("SCHEDULE-AGENT"), "CLIENT");
 
     // Also make sure there are no promoted properties set. This does not
     // technically belong to this bug, but I almost caused this error while
     // writing the patch.
-    do_check_true(attendee.icalProperty.icalString.indexOf("RSVP") < 0);
+    ok(attendee.icalProperty.icalString.indexOf("RSVP") < 0);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug759324.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug759324.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_bug759324.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_bug759324.js	2015-02-28 15:02:41.000000000 +0000
@@ -32,8 +32,8 @@
         let seq = addedItem.getProperty("SEQUENCE");
         let rec = addedItem.recurrenceInfo.getOccurrenceFor(rid);
 
-        do_check_eq(seq, 3);
-        do_check_eq(rec.getProperty("SEQUENCE"), seq);
+        equal(seq, 3);
+        equal(rec.getProperty("SEQUENCE"), seq);
 
         let changedItem = addedItem.clone();
         changedItem.setProperty("SEQUENCE", parseInt(seq, 10) + 1);
@@ -45,8 +45,8 @@
         let seq = changedItem.getProperty("SEQUENCE");
         let rec = changedItem.recurrenceInfo.getOccurrenceFor(rid);
 
-        do_check_eq(seq, 4);
-        do_check_eq(rec.getProperty("SEQUENCE"), seq);
+        equal(seq, 4);
+        equal(rec.getProperty("SEQUENCE"), seq);
 
         // Now check with the pref off
         storage.deleteProperty("capabilities.propagate-sequence");
@@ -62,8 +62,8 @@
         let seq = changedItem.getProperty("SEQUENCE");
         let rec = changedItem.recurrenceInfo.getOccurrenceFor(rid);
 
-        do_check_eq(seq, 5);
-        do_check_eq(rec.getProperty("SEQUENCE"), 4);
+        equal(seq, 5);
+        equal(rec.getProperty("SEQUENCE"), 4);
         completeTest();
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_calmgr.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_calmgr.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_calmgr.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_calmgr.js	2015-02-28 15:02:41.000000000 +0000
@@ -15,6 +15,7 @@
     add_test(test_registration);
     add_test(test_calobserver);
     add_test(test_calprefs);
+    add_test(test_removeModes);
     cal.getCalendarManager().startup({ onResult: function() {
         run_next_test();
     }});
@@ -22,12 +23,12 @@
 
 function test_calobserver() {
     function checkCounters(add, modify, del, alladd, allmodify, alldel) {
-        do_check_eq(calcounter.addItem, add);
-        do_check_eq(calcounter.modifyItem, modify);
-        do_check_eq(calcounter.deleteItem, del);
-        do_check_eq(allcounter.addItem, alladd === undefined ? add : alladd);
-        do_check_eq(allcounter.modifyItem, allmodify === undefined ? modify : allmodify);
-        do_check_eq(allcounter.deleteItem, alldel === undefined ? del : alldel);
+        equal(calcounter.addItem, add);
+        equal(calcounter.modifyItem, modify);
+        equal(calcounter.deleteItem, del);
+        equal(allcounter.addItem, alladd === undefined ? add : alladd);
+        equal(allcounter.modifyItem, allmodify === undefined ? modify : allmodify);
+        equal(allcounter.deleteItem, alldel === undefined ? del : alldel);
         resetCounters();
     }
     function resetCounters() {
@@ -103,14 +104,14 @@
 
 function test_registration() {
     function checkCalendarCount(net, rdonly, all) {
-        do_check_eq(calmgr.networkCalendarCount, net);
-        do_check_eq(calmgr.readOnlyCalendarCount , rdonly);
-        do_check_eq(calmgr.calendarCount, all);
+        equal(calmgr.networkCalendarCount, net);
+        equal(calmgr.readOnlyCalendarCount , rdonly);
+        equal(calmgr.calendarCount, all);
     }
     function checkRegistration(reg, unreg, del) {
-        do_check_eq(registered, reg);
-        do_check_eq(unregistered, unreg);
-        do_check_eq(deleted, del);
+        equal(registered, reg);
+        equal(unregistered, unreg);
+        equal(deleted, del);
         registered = false;
         unregistered = false;
         deleted = false;
@@ -139,8 +140,8 @@
     });
     let calobs = cal.createAdapter(Components.interfaces.calIObserver, {
         onPropertyChanged: function onPropertyChanging(aCalendar, aName, aValue, aOldValue) {
-            do_check_eq(aCalendar.id, memory.id);
-            do_check_eq(aName, "readOnly");
+            equal(aCalendar.id, memory.id);
+            equal(aName, "readOnly");
             readOnly = aValue;
         }
     });
@@ -153,15 +154,15 @@
     checkCalendarCount(0, 0, 1);
 
     // The calendar should now have an id
-    do_check_neq(memory.id, null);
+    notEqual(memory.id, null);
 
     // And be in the list of calendars
-    do_check_true(memory == calmgr.getCalendarById(memory.id));
-    do_check_true(calmgr.getCalendars({}).some(function(x) x.id == memory.id));
+    equal(memory, calmgr.getCalendarById(memory.id));
+    ok(calmgr.getCalendars({}).some(function(x) x.id == memory.id));
 
     // Make it readonly and check if the observer caught it
     memory.setProperty("readOnly", true);
-    do_check_eq(readOnly, true);
+    equal(readOnly, true);
 
     // Now unregister it
     calmgr.unregisterCalendar(memory);
@@ -169,11 +170,11 @@
     checkCalendarCount(0, 0, 0);
 
     // The calendar shouldn't be in the list of ids
-    do_check_eq(calmgr.getCalendarById(memory.id), null);
-    do_check_true(calmgr.getCalendars({}).every(function(x) x.id != memory.id));
+    equal(calmgr.getCalendarById(memory.id), null);
+    ok(calmgr.getCalendars({}).every(function(x) x.id != memory.id));
 
     // And finally delete it
-    calmgr.deleteCalendar(memory);
+    calmgr.removeCalendar(memory, Ci.calICalendarManager.REMOVE_NO_UNREGISTER);
     checkRegistration(false, false, true);
     checkCalendarCount(0, 0, 0);
 
@@ -183,17 +184,67 @@
 
     // Check if removing it actually worked
     calmgr.registerCalendar(memory);
-    calmgr.unregisterCalendar(memory);
-    calmgr.deleteCalendar(memory);
+    calmgr.removeCalendar(memory);
     memory.setProperty("readOnly", false);
     checkRegistration(false, false, false);
-    do_check_eq(readOnly, true);
+    equal(readOnly, true);
     checkCalendarCount(0, 0, 0);
 
     // We are done now, start the next test
     run_next_test();
 }
 
+function test_removeModes() {
+    function checkCounts(modes, shouldDelete, expectCount, extraFlags=0) {
+        if (calmgr.calendarCount == baseCalendarCount) {
+            calmgr.registerCalendar(memory);
+            equal(calmgr.calendarCount, baseCalendarCount + 1);
+        }
+        deleteCalled = false;
+        removeModes = modes;
+
+        calmgr.removeCalendar(memory, extraFlags);
+        equal(calmgr.calendarCount, baseCalendarCount + expectCount);
+        equal(deleteCalled, shouldDelete);
+    }
+    function mockCalendar(memory) {
+        let oldGetProperty = memory.wrappedJSObject.getProperty;
+        memory.wrappedJSObject.getProperty = function(name) {
+            if (name == "capabilities.removeModes") {
+                return removeModes;
+            } else {
+                return oldGetProperty.apply(this, arguments);
+            }
+        };
+
+        let oldDeleteCalendar = memory.wrappedJSObject.deleteCalendar;
+        memory.wrappedJSObject.deleteCalendar = function(calendar, listener) {
+            deleteCalled = true;
+            return oldDeleteCalendar.apply(this, arguments);
+        };
+    }
+
+    // For better readability
+    const SHOULD_DELETE = true, SHOULD_NOT_DELETE = false;
+    const cICM = Components.interfaces.calICalendarManager;
+
+    let calmgr = cal.getCalendarManager();
+    let memory = calmgr.createCalendar("memory", Services.io.newURI("moz-memory-calendar://", null, null));
+    let baseCalendarCount = calmgr.calendarCount;
+    let removeModes = null;
+    let deleteCalled = false;
+
+    mockCalendar(memory);
+
+    checkCounts([], SHOULD_NOT_DELETE, 1);
+    checkCounts(["unsubscribe"], SHOULD_NOT_DELETE, 0);
+    checkCounts(["unsubscribe", "delete"], SHOULD_DELETE, 0);
+    checkCounts(["unsubscribe", "delete"], SHOULD_NOT_DELETE, 0, cICM.REMOVE_NO_DELETE);
+    checkCounts(["delete"], SHOULD_DELETE, 0);
+
+    run_next_test();
+}
+
 function test_calprefs() {
     let prop;
     let calmgr = cal.getCalendarManager();
@@ -215,25 +266,25 @@
 
     // First test the standard types
     prop = memory.getProperty("stringpref");
-    do_check_eq(typeof prop, "string");
-    do_check_eq(prop, "abc")
+    equal(typeof prop, "string");
+    equal(prop, "abc")
 
     prop = memory.getProperty("boolpref");
-    do_check_eq(typeof prop, "boolean");
-    do_check_eq(prop, true);
+    equal(typeof prop, "boolean");
+    equal(prop, true);
 
     prop = memory.getProperty("intpref");
-    do_check_eq(typeof prop, "number");
-    do_check_eq(prop, 123);
+    equal(typeof prop, "number");
+    equal(prop, 123);
 
     // These two are a special case test for bug 979262
     prop = memory.getProperty("bigintpref");
-    do_check_eq(typeof prop, "number");
-    do_check_eq(prop, 1394548721296);
+    equal(typeof prop, "number");
+    equal(prop, 1394548721296);
 
     prop = memory.getProperty("floatpref");
-    do_check_eq(typeof prop, "number");
-    do_check_eq(prop, 0.5);
+    equal(typeof prop, "number");
+    equal(prop, 0.5);
 
     // Check if changing pref types works. We need to reset the calendar again
     // because retrieving the value just cached it again.
@@ -242,15 +293,15 @@
 
     calmgr.setCalendarPref_(memory, "boolpref", "kinda true");
     prop = memory.getProperty("boolpref");
-    do_check_eq(typeof prop, "string");
-    do_check_eq(prop, "kinda true")
+    equal(typeof prop, "string");
+    equal(prop, "kinda true")
 
     // Check if unsetting a pref works
     memory.setProperty("intpref", null);
     memory = calmgr.createCalendar("memory", Services.io.newURI("moz-memory-calendar://", null, null));
     memory.id = memid;
     prop = memory.getProperty("intpref");
-    do_check_true(prop === null);
+    ok(prop === null);
 
 
     // We are done now, start the next test
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_datetime_before_1970.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_datetime_before_1970.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_datetime_before_1970.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_datetime_before_1970.js	2015-02-28 15:02:41.000000000 +0000
@@ -9,15 +9,15 @@
 
     let dateTime1950 = cal.createDateTime();
     dateTime1950.year = 1950;
-    do_check_eq(dateTime1950.year, 1950);
+    equal(dateTime1950.year, 1950);
 
     let dateTime1955 = cal.jsDateToDateTime(new Date(1955, 06, 15));
-    do_check_eq(dateTime1955.year, 1955);
+    equal(dateTime1955.year, 1955);
     
     let dateTime1965 = cal.createDateTime();
     dateTime1965.nativeTime = -150000000000000;
-    do_check_eq(dateTime1965.year, 1965);
-    do_check_eq(dateTime1965.nativeTime, -150000000000000);
+    equal(dateTime1965.year, 1965);
+    equal(dateTime1965.nativeTime, -150000000000000);
 
     let dateTime1990 = cal.createDateTime();
     dateTime1990.year = 1990;
@@ -25,8 +25,8 @@
     let dateTime2050 = cal.createDateTime();
     dateTime2050.year = 2050;
 
-    do_check_true(dateTime1950.nativeTime < dateTime1955.nativeTime);
-    do_check_true(dateTime1955.nativeTime < dateTime1965.nativeTime);
-    do_check_true(dateTime1965.nativeTime < dateTime1990.nativeTime);
-    do_check_true(dateTime1990.nativeTime < dateTime2050.nativeTime);
+    ok(dateTime1950.nativeTime < dateTime1955.nativeTime);
+    ok(dateTime1955.nativeTime < dateTime1965.nativeTime);
+    ok(dateTime1965.nativeTime < dateTime1990.nativeTime);
+    ok(dateTime1990.nativeTime < dateTime2050.nativeTime);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_datetime.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_datetime.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_datetime.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_datetime.js	2015-02-28 15:02:41.000000000 +0000
@@ -22,20 +22,20 @@
                10, 0, 0,
                getMozTimezone("/mozilla.org/20050126_1/America/Bogota"));
 
-    do_check_eq(cd.hour, 10);
-    do_check_eq(cd.icalString, "20051113T100000");
+    equal(cd.hour, 10);
+    equal(cd.icalString, "20051113T100000");
 
     let cd_floating = cd.getInTimezone(cal.floating());
-    do_check_eq(cd_floating.hour, 10);
+    equal(cd_floating.hour, 10);
 
 
     let cd_utc = cd.getInTimezone(cal.UTC());
-    do_check_eq(cd_utc.hour, 15);
-    do_check_eq(cd_utc.icalString, "20051113T150000Z");
+    equal(cd_utc.hour, 15);
+    equal(cd_utc.icalString, "20051113T150000Z");
 
     cd.hour = 25;
-    do_check_eq(cd.hour, 1);
-    do_check_eq(cd.day, 14);
+    equal(cd.hour, 1);
+    equal(cd.day, 14);
 
 
     // Test nativeTime on dates
@@ -44,23 +44,23 @@
     cd.hour = 0;
     let cd_allday = cd.clone();
     cd_allday.isDate = true;
-    do_check_eq(cd.nativeTime, cd_allday.nativeTime);
+    equal(cd.nativeTime, cd_allday.nativeTime);
 
     // Daylight savings test
     cd.resetTo(2006, 2, 26,
                1, 0, 0,
                getMozTimezone("/mozilla.org/20050126_1/Europe/Amsterdam"));
 
-    do_check_eq(cd.weekday, 0);
-    do_check_eq(cd.timezoneOffset, 1*3600);
+    equal(cd.weekday, 0);
+    equal(cd.timezoneOffset, 1*3600);
 
     cd.day += 1;
-    do_check_eq(cd.timezoneOffset, 2*3600);
+    equal(cd.timezoneOffset, 2*3600);
 
     // Bug 398724 - Problems with floating all-day items
     let event = cal.createEvent("BEGIN:VEVENT\nUID:45674d53-229f-48c6-9f3b-f2b601e7ae4d\nSUMMARY:New Event\nDTSTART;VALUE=DATE:20071003\nDTEND;VALUE=DATE:20071004\nEND:VEVENT");
-    do_check_true(event.startDate.timezone.isFloating);
-    do_check_true(event.endDate.timezone.isFloating);
+    ok(event.startDate.timezone.isFloating);
+    ok(event.endDate.timezone.isFloating);
 
     // Bug 392853 - Same times, different timezones, but subtractDate says times are PT0S apart
     const zeroLength = cal.createDuration();
@@ -71,37 +71,37 @@
     b.timezone = getMozTimezone("/mozilla.org/20071231_1/America/New_York");
 
     let duration = a.subtractDate(b);
-    do_check_neq(duration.compare(zeroLength), 0);
-    do_check_neq(a.compare(b), 0);
+    notEqual(duration.compare(zeroLength), 0);
+    notEqual(a.compare(b), 0);
 
     // Should lead to zero length duration
     b = a.getInTimezone(getMozTimezone("/mozilla.org/20071231_1/America/New_York"));
     duration = a.subtractDate(b);
-    do_check_eq(duration.compare(zeroLength), 0);
-    do_check_eq(a.compare(b), 0);
+    equal(duration.compare(zeroLength), 0);
+    equal(a.compare(b), 0);
 
-    do_check_eq(b.timezone.displayName, "America/New York");
-    do_check_eq(b.timezone.latitude, "+0404251");
-    do_check_eq(b.timezone.longitude, "-0740023");
+    equal(b.timezone.displayName, "America/New York");
+    equal(b.timezone.latitude, "+0404251");
+    equal(b.timezone.longitude, "-0740023");
 
     // check aliases
-    do_check_eq(getMozTimezone("/mozilla.org/xyz/Asia/Calcutta").tzid, "Asia/Kolkata");
-    do_check_eq(getMozTimezone("Asia/Calcutta").tzid, "Asia/Kolkata");
+    equal(getMozTimezone("/mozilla.org/xyz/Asia/Calcutta").tzid, "Asia/Kolkata");
+    equal(getMozTimezone("Asia/Calcutta").tzid, "Asia/Kolkata");
 
     // A newly created date should be in UTC, as should its clone
     let utc = cal.createDateTime();
-    do_check_eq(utc.timezone.tzid, "UTC");
-    do_check_eq(utc.clone().timezone.tzid, "UTC");
-    do_check_eq(utc.timezoneOffset, 0);
+    equal(utc.timezone.tzid, "UTC");
+    equal(utc.clone().timezone.tzid, "UTC");
+    equal(utc.timezoneOffset, 0);
 
     // Bug 794477 - setting jsdate across compartments needs to work
     let someDate = new Date();
     let createdDate = cal.jsDateToDateTime(someDate).getInTimezone(cal.calendarDefaultTimezone());
     someDate.setMilliseconds(0);
-    do_check_eq(someDate.getTime(), cal.dateTimeToJsDate(createdDate).getTime());
+    equal(someDate.getTime(), cal.dateTimeToJsDate(createdDate).getTime());
 
     // Comparing a date-time with a date of the same day should be 0
-    do_check_eq(cal.createDateTime("20120101T120000").compare(cal.createDateTime("20120101")), 0);
-    do_check_eq(cal.createDateTime("20120101").compare(cal.createDateTime("20120101T120000")), 0);
+    equal(cal.createDateTime("20120101T120000").compare(cal.createDateTime("20120101")), 0);
+    equal(cal.createDateTime("20120101").compare(cal.createDateTime("20120101T120000")), 0);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_deleted_items.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_deleted_items.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_deleted_items.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_deleted_items.js	2015-02-28 15:02:41.000000000 +0000
@@ -38,8 +38,8 @@
     let delmgr = Components.classes["@mozilla.org/calendar/deleted-items-manager;1"]
                            .getService(Components.interfaces.calIDeletedItems);
     // No items have been deleted, retrieving one should return null.
-    do_check_null(delmgr.getDeletedDate("random"));
-    do_check_null(delmgr.getDeletedDate("random", "random"));
+    equal(delmgr.getDeletedDate("random"), null);
+    equal(delmgr.getDeletedDate("random", "random"), null);
 
     // Make sure the cache is initially flushed and that this doesn't throw an
     // error.
@@ -55,8 +55,8 @@
 
     // Add the item, it still shouldn't be in the deleted database.
     yield check_delmgr_call(function() memory.addItem(item, null));
-    do_check_null(delmgr.getDeletedDate(item.id));
-    do_check_null(delmgr.getDeletedDate(item.id, memory.id));
+    equal(delmgr.getDeletedDate(item.id), null);
+    equal(delmgr.getDeletedDate(item.id, memory.id), null);
 
     // We need to stop time so we have something to compare with.
     let referenceDate = cal.createDateTime("20120726T112045"); referenceDate.timezone = cal.calendarDefaultTimezone();
@@ -72,33 +72,33 @@
 
     // Now check if it was deleted at our reference date.
     let deltime = delmgr.getDeletedDate(item.id);
-    do_check_neq(deltime, null);
-    do_check_eq(deltime.compare(referenceDate), 0);
+    notEqual(deltime, null);
+    equal(deltime.compare(referenceDate), 0);
 
     // The same with the calendar.
     deltime = delmgr.getDeletedDate(item.id, memory.id);
-    do_check_neq(deltime, null);
-    do_check_eq(deltime.compare(referenceDate), 0);
+    notEqual(deltime, null);
+    equal(deltime.compare(referenceDate), 0);
 
     // Item should not be found in other calendars.
-    do_check_null(delmgr.getDeletedDate(item.id, "random"));
+    equal(delmgr.getDeletedDate(item.id, "random"), null);
 
     // Check if flushing works, we need to travel time for that.
     useFutureDate = true;
     yield check_delmgr_call(function() delmgr.flush());
-    do_check_null(delmgr.getDeletedDate(item.id));
-    do_check_null(delmgr.getDeletedDate(item.id, memory.id));
+    equal(delmgr.getDeletedDate(item.id), null);
+    equal(delmgr.getDeletedDate(item.id, memory.id), null);
 
     // Start over with our past time.
     useFutureDate = false;
 
     // Add, delete, add. Item should no longer be deleted.
     yield check_delmgr_call(function() memory.addItem(item, null));
-    do_check_null(delmgr.getDeletedDate(item.id));
+    equal(delmgr.getDeletedDate(item.id), null);
     yield check_delmgr_call(function() memory.deleteItem(item, null));
-    do_check_eq(delmgr.getDeletedDate(item.id).compare(referenceDate), 0);
+    equal(delmgr.getDeletedDate(item.id).compare(referenceDate), 0);
     yield check_delmgr_call(function() memory.addItem(item, null));
-    do_check_null(delmgr.getDeletedDate(item.id));
+    equal(delmgr.getDeletedDate(item.id), null);
 
     // Revert now function, in case more tests are written.
     cal.now = oldNowFunction;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_duration.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_duration.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_duration.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_duration.js	2015-02-28 15:02:41.000000000 +0000
@@ -6,5 +6,5 @@
     let a = cal.createDuration("PT1S");
     let b = cal.createDuration("PT3S");
     a.addDuration(b);
-    do_check_eq(a.icalString, "PT4S");
+    equal(a.icalString, "PT4S");
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_extract.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_extract.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_extract.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_extract.js	2015-02-28 15:02:41.000000000 +0000
@@ -28,17 +28,17 @@
     let guessed = extractor.guessStart();
     let endGuess = extractor.guessEnd(guessed);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 3);
-    do_check_eq(guessed.hour, 14);
-    do_check_eq(guessed.minute, 0);
-
-    do_check_eq(endGuess.year, 2012);
-    do_check_eq(endGuess.month, 10);
-    do_check_eq(endGuess.day, 3);
-    do_check_eq(endGuess.hour, 15);
-    do_check_eq(endGuess.minute, 0);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 3);
+    equal(guessed.hour, 14);
+    equal(guessed.minute, 0);
+
+    equal(endGuess.year, 2012);
+    equal(endGuess.month, 10);
+    equal(endGuess.day, 3);
+    equal(endGuess.hour, 15);
+    equal(endGuess.minute, 0);
 }
 
 function test_event_start_duration() {
@@ -50,17 +50,17 @@
     let guessed = extractor.guessStart();
     let endGuess = extractor.guessEnd(guessed);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 3);
-    do_check_eq(guessed.hour, 14);
-    do_check_eq(guessed.minute, 0);
-
-    do_check_eq(endGuess.year, 2012);
-    do_check_eq(endGuess.month, 10);
-    do_check_eq(endGuess.day, 3);
-    do_check_eq(endGuess.hour, 14);
-    do_check_eq(endGuess.minute, 30);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 3);
+    equal(guessed.hour, 14);
+    equal(guessed.minute, 0);
+
+    equal(endGuess.year, 2012);
+    equal(endGuess.month, 10);
+    equal(endGuess.day, 3);
+    equal(endGuess.hour, 14);
+    equal(endGuess.minute, 30);
 }
 
 function test_event_start_end_whitespace() {
@@ -72,17 +72,17 @@
     let guessed = extractor.guessStart();
     let endGuess = extractor.guessEnd(guessed);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 3);
-    do_check_eq(guessed.hour, 14);
-    do_check_eq(guessed.minute, 0);
-
-    do_check_eq(endGuess.year, 2012);
-    do_check_eq(endGuess.month, 10);
-    do_check_eq(endGuess.day, 3);
-    do_check_eq(endGuess.hour, 15);
-    do_check_eq(endGuess.minute, 0);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 3);
+    equal(guessed.hour, 14);
+    equal(guessed.minute, 0);
+
+    equal(endGuess.year, 2012);
+    equal(endGuess.month, 10);
+    equal(endGuess.day, 3);
+    equal(endGuess.hour, 15);
+    equal(endGuess.minute, 0);
 }
 
 function test_event_without_date() {
@@ -94,17 +94,17 @@
     let guessed = extractor.guessStart();
     let endGuess = extractor.guessEnd(guessed);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 1);
-    do_check_eq(guessed.hour, 14);
-    do_check_eq(guessed.minute, 0);
-
-    do_check_eq(endGuess.year, 2012);
-    do_check_eq(endGuess.month, 10);
-    do_check_eq(endGuess.day, 1);
-    do_check_eq(endGuess.hour, 15);
-    do_check_eq(endGuess.minute, 0);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 1);
+    equal(guessed.hour, 14);
+    equal(guessed.minute, 0);
+
+    equal(endGuess.year, 2012);
+    equal(endGuess.month, 10);
+    equal(endGuess.day, 1);
+    equal(endGuess.hour, 15);
+    equal(endGuess.minute, 0);
 }
 
 function test_event_next_year() {
@@ -116,17 +116,17 @@
     let guessed = extractor.guessStart();
     let endGuess = extractor.guessEnd(guessed);
 
-    do_check_eq(guessed.year, 2013);
-    do_check_eq(guessed.month, 2);
-    do_check_eq(guessed.day, 5);
-    do_check_eq(guessed.hour, undefined);
-    do_check_eq(guessed.minute, undefined);
-
-    do_check_eq(endGuess.year, undefined);
-    do_check_eq(endGuess.month, undefined);
-    do_check_eq(endGuess.day, undefined);
-    do_check_eq(endGuess.hour, undefined);
-    do_check_eq(endGuess.minute, undefined);
+    equal(guessed.year, 2013);
+    equal(guessed.month, 2);
+    equal(guessed.day, 5);
+    equal(guessed.hour, undefined);
+    equal(guessed.minute, undefined);
+
+    equal(endGuess.year, undefined);
+    equal(endGuess.month, undefined);
+    equal(endGuess.day, undefined);
+    equal(endGuess.hour, undefined);
+    equal(endGuess.minute, undefined);
 }
 
 function test_task_due() {
@@ -138,17 +138,17 @@
     let guessed = extractor.guessStart(true);
     let endGuess = extractor.guessEnd(guessed, true);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 1);
-    do_check_eq(guessed.hour, 9);
-    do_check_eq(guessed.minute, 0);
-
-    do_check_eq(endGuess.year, 2012);
-    do_check_eq(endGuess.month, 10);
-    do_check_eq(endGuess.day, 5);
-    do_check_eq(endGuess.hour, 0);
-    do_check_eq(endGuess.minute, 0);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 1);
+    equal(guessed.hour, 9);
+    equal(guessed.minute, 0);
+
+    equal(endGuess.year, 2012);
+    equal(endGuess.month, 10);
+    equal(endGuess.day, 5);
+    equal(endGuess.hour, 0);
+    equal(endGuess.minute, 0);
 }
 
 function test_overrides() {
@@ -160,17 +160,17 @@
     let guessed = extractor.guessStart(false);
     let endGuess = extractor.guessEnd(guessed, true);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 1);
-    do_check_eq(guessed.hour, 10);
-    do_check_eq(guessed.minute, 11);
-
-    do_check_eq(endGuess.year, undefined);
-    do_check_eq(endGuess.month, undefined);
-    do_check_eq(endGuess.day, undefined);
-    do_check_eq(endGuess.hour, undefined);
-    do_check_eq(endGuess.minute, undefined);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 1);
+    equal(guessed.hour, 10);
+    equal(guessed.minute, 11);
+
+    equal(endGuess.year, undefined);
+    equal(endGuess.month, undefined);
+    equal(endGuess.day, undefined);
+    equal(endGuess.hour, undefined);
+    equal(endGuess.minute, undefined);
 
     // recognize a custom "tomorrow" and hour.minutes pattern
     let overrides = {"from.hour.minutes":
@@ -183,17 +183,17 @@
     guessed = extractor.guessStart(false);
     endGuess = extractor.guessEnd(guessed, true);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 2);
-    do_check_eq(guessed.hour, 11);
-    do_check_eq(guessed.minute, 10);
-
-    do_check_eq(endGuess.year, undefined);
-    do_check_eq(endGuess.month, undefined);
-    do_check_eq(endGuess.day, undefined);
-    do_check_eq(endGuess.hour, undefined);
-    do_check_eq(endGuess.minute, undefined);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 2);
+    equal(guessed.hour, 11);
+    equal(guessed.minute, 10);
+
+    equal(endGuess.year, undefined);
+    equal(endGuess.month, undefined);
+    equal(endGuess.day, undefined);
+    equal(endGuess.hour, undefined);
+    equal(endGuess.minute, undefined);
 }
 
 function test_event_start_dollar_sign() {
@@ -205,9 +205,9 @@
     let guessed = extractor.guessStart();
     let endGuess = extractor.guessEnd(guessed);
 
-    do_check_eq(guessed.year, 2012);
-    do_check_eq(guessed.month, 10);
-    do_check_eq(guessed.day, 3);
-    do_check_eq(guessed.hour, 15);
-    do_check_eq(guessed.minute, 0);
+    equal(guessed.year, 2012);
+    equal(guessed.month, 10);
+    equal(guessed.day, 3);
+    equal(guessed.hour, 15);
+    equal(guessed.minute, 0);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_freebusy.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_freebusy.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_freebusy.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_freebusy.js	2015-02-28 15:02:41.000000000 +0000
@@ -23,9 +23,9 @@
         "END:VFREEBUSY\n" +
         "END:VCALENDAR\n";
     var fbComp = icsService.parseICS(data, null).getFirstSubcomponent("VFREEBUSY");
-    do_check_eq(fbComp.getFirstProperty("FREEBUSY").value, fbVal1);
-    do_check_eq(fbComp.getNextProperty("FREEBUSY").value, fbVal2);
-    do_check_eq(fbComp.getNextProperty("FREEBUSY").value, fbVal3);
+    equal(fbComp.getFirstProperty("FREEBUSY").value, fbVal1);
+    equal(fbComp.getNextProperty("FREEBUSY").value, fbVal2);
+    equal(fbComp.getNextProperty("FREEBUSY").value, fbVal3);
 }
 
 function test_period() {
@@ -35,40 +35,40 @@
     period.start = cal.createDateTime("20120101T010101");
     period.end = cal.createDateTime("20120101T010102");
 
-    do_check_eq(period.icalString, "20120101T010101/20120101T010102");
-    do_check_eq(period.duration.icalString, "PT1S");
+    equal(period.icalString, "20120101T010101/20120101T010102");
+    equal(period.duration.icalString, "PT1S");
 
     period.icalString = "20120101T010103/20120101T010104";
 
-    do_check_eq(period.start.icalString, "20120101T010103");
-    do_check_eq(period.end.icalString, "20120101T010104");
-    do_check_eq(period.duration.icalString, "PT1S");
+    equal(period.start.icalString, "20120101T010103");
+    equal(period.end.icalString, "20120101T010104");
+    equal(period.duration.icalString, "PT1S");
 
     period.icalString = "20120101T010105/PT1S";
-    do_check_eq(period.start.icalString, "20120101T010105");
-    do_check_eq(period.end.icalString, "20120101T010106");
-    do_check_eq(period.duration.icalString, "PT1S");
+    equal(period.start.icalString, "20120101T010105");
+    equal(period.end.icalString, "20120101T010106");
+    equal(period.duration.icalString, "PT1S");
 
     period.makeImmutable();
     if (!Preferences.get("calendar.icaljs", false)) {
         // ical.js doesn't support immutability yet
-        do_check_throws(function() {
+        throws(function() {
             period.start = cal.createDateTime("20120202T020202");
-        }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
-        do_check_throws(function() {
+        }, /0x80460002/,"Object is Immutable");
+        throws(function() {
             period.end = cal.createDateTime("20120202T020202");
-        }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
+        }, /0x80460002/,"Object is Immutable");
     }
 
     let copy = period.clone();
-    do_check_eq(copy.start.icalString, "20120101T010105");
-    do_check_eq(copy.end.icalString, "20120101T010106");
-    do_check_eq(copy.duration.icalString, "PT1S");
+    equal(copy.start.icalString, "20120101T010105");
+    equal(copy.end.icalString, "20120101T010106");
+    equal(copy.duration.icalString, "PT1S");
 
     copy.start.icalString = "20120101T010106";
     copy.end = cal.createDateTime("20120101T010107");
 
-    do_check_eq(period.start.icalString, "20120101T010105");
-    do_check_eq(period.end.icalString, "20120101T010106");
-    do_check_eq(period.duration.icalString, "PT1S");
+    equal(period.start.icalString, "20120101T010105");
+    equal(period.end.icalString, "20120101T010106");
+    equal(period.duration.icalString, "PT1S");
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_freebusy_service.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_freebusy_service.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_freebusy_service.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_freebusy_service.js	2015-02-28 15:02:41.000000000 +0000
@@ -18,7 +18,7 @@
 function test_found() {
     _clearProviders();
 
-    do_check_eq(_countProviders(), 0);
+    equal(_countProviders(), 0);
 
     let provider1 = {
         id: 1,
@@ -31,7 +31,7 @@
         id: 2,
         called: false,
         getFreeBusyIntervals: function(aCalId, aStart, aEnd, aTypes, aListener) {
-            do_check_false(this.called)
+            ok(!this.called)
             this.called = true;
 
             let interval = new cal.FreeBusyInterval(aCalId, cIFI.BUSY, aStart, aEnd);
@@ -41,23 +41,23 @@
     provider2.wrappedJSObject = provider2;
 
     freebusy.addProvider(provider1);
-    do_check_eq(_countProviders(), 1);
+    equal(_countProviders(), 1);
     freebusy.addProvider(provider2);
-    do_check_eq(_countProviders(), 2);
+    equal(_countProviders(), 2);
     freebusy.removeProvider(provider1);
-    do_check_eq(_countProviders(), 1);
-    do_check_eq(_getFirstProvider().id, 2);
+    equal(_countProviders(), 1);
+    equal(_getFirstProvider().id, 2);
 
     let listener = {
         called: false,
         onResult: function(request, result) {
-            do_check_eq(result.length, 1);
-            do_check_eq(result[0].interval.start.icalString, "20120101T010101");
-            do_check_eq(result[0].interval.end.icalString, "20120102T010101");
-            do_check_eq(result[0].freeBusyType, cIFI.BUSY);
+            equal(result.length, 1);
+            equal(result[0].interval.start.icalString, "20120101T010101");
+            equal(result[0].interval.end.icalString, "20120102T010101");
+            equal(result[0].freeBusyType, cIFI.BUSY);
 
-            do_check_eq(result.length, 1);
-            do_check_true(provider2.called);
+            equal(result.length, 1);
+            ok(provider2.called);
             do_test_finished();
         }
     };
@@ -75,7 +75,7 @@
     let provider = {
         called: false,
         getFreeBusyIntervals: function(aCalId, aStart, aEnd, aTypes, aListener) {
-            do_check_false(this.called);
+            ok(!this.called);
             this.called = true;
             aListener.onResult({ status: Components.results.NS_ERROR_FAILURE }, "notFound");
         }
@@ -83,10 +83,10 @@
 
     let listener = {
         onResult: function(request, result) {
-            do_check_false(this.called);
-            do_check_eq(result.length, 0);
-            do_check_eq(request.status, 0);
-            do_check_true(provider.called);
+            ok(!this.called);
+            equal(result.length, 0);
+            equal(request.status, 0);
+            ok(provider.called);
             do_test_finished();
         }
     };
@@ -129,10 +129,10 @@
     let listener = {
         called: false,
         onResult: function(request, result) {
-            do_check_eq(result, null);
+            equal(result, null);
 
             // If an exception occurs, the operation is not added to the opgroup
-            do_check_false(provider.cancelCalled);
+            ok(!provider.cancelCalled);
             do_test_finished();
         }
     };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_gdata_provider.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_gdata_provider.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_gdata_provider.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_gdata_provider.js	2015-02-28 15:02:41.000000000 +0000
@@ -444,9 +444,9 @@
             let target = ("googleapi://" + session + "/?" +
                          (calendarId ? "&calendar=" + encodeURIComponent(calendarId) : "") +
                          (tasksId ? "&tasks=" + encodeURIComponent(tasksId) : "")).replace("?&", "?");
-            do_check_eq(client.getProperty("uri"), target);
+            equal(client.getProperty("uri"), target);
         } else {
-            do_check_eq(client.getProperty("uri"), null);
+            equal(client.getProperty("uri"), null);
         }
     }
 
@@ -469,7 +469,7 @@
 add_task(function* test_organizerCN() {
     gServer.events = [];
     let client = yield gServer.getClient();
-    do_check_eq(client.getProperty("organizerCN"), null);
+    equal(client.getProperty("organizerCN"), null);
     gServer.resetClient(client);
 
     gServer.events = [{
@@ -486,7 +486,7 @@
        "iCalUID": "go6ijb0b46hlpbu4eeu92njevo@google.com"
     }];
     client = yield gServer.getClient();
-    do_check_eq(client.getProperty("organizerCN"), gServer.creator.displayName);
+    equal(client.getProperty("organizerCN"), gServer.creator.displayName);
     gServer.resetClient(client);
 });
 
@@ -507,20 +507,20 @@
     gServer.calendarListData.accessRole = "freeBusyReader";
     let client = yield gServer.getClient();
     let pclient = cal.async.promisifyCalendar(client);
-    do_check_true(client.readOnly)
+    ok(client.readOnly)
     client.readOnly = false;
-    do_check_true(client.readOnly)
+    ok(client.readOnly)
 
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
-    do_check_neq(items[0].title, "New Event");
+    equal(items.length, 1);
+    notEqual(items[0].title, "New Event");
     gServer.resetClient(client);
 
     gServer.calendarListData.accessRole = "reader";
     client = yield gServer.getClient();
-    do_check_true(client.readOnly)
+    ok(client.readOnly)
     client.readOnly = false;
-    do_check_true(client.readOnly)
+    ok(client.readOnly)
     gServer.resetClient(client);
 });
 
@@ -576,17 +576,17 @@
     let pclient = cal.async.promisifyCalendar(client);
 
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 4);
+    equal(items.length, 4);
 
-    do_check_neq(client.getProperty("syncToken.events"), "");
-    do_check_neq(client.getProperty("lastUpdated.tasks"), "");
+    notEqual(client.getProperty("syncToken.events"), "");
+    notEqual(client.getProperty("lastUpdated.tasks"), "");
 
     yield uncached.resetSync();
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 0);
+    equal(items.length, 0);
 
-    do_check_eq(client.getProperty("syncToken.events"), "");
-    do_check_eq(client.getProperty("lastUpdated.tasks"), "");
+    equal(client.getProperty("syncToken.events"), "");
+    equal(client.getProperty("lastUpdated.tasks"), "");
 
     gServer.resetClient(client);
 });
@@ -665,60 +665,60 @@
     let pclient = cal.async.promisifyCalendar(client);
 
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 2);
+    equal(items.length, 2);
 
     let event = cal.isEvent(items[0]) ? items[0]: items[1];
-    do_check_eq(event.id, "go6ijb0b46hlpbu4eeu92njevo@google.com");
-    do_check_eq(event.getProperty("STATUS"), "CONFIRMED");
-    do_check_eq(event.getProperty("URL"), gServer.baseUri + "/calendar/event?eid=eventhash");
-    do_check_eq(event.getProperty("CREATED").icalString, "20060608T210452Z");
-    do_check_eq(event.getProperty("LAST-MODIFIED").icalString, "20060608T210549Z");
-    do_check_eq(event.title, "New Event");
-    do_check_eq(event.getProperty("DESCRIPTION"), "description");
-    do_check_eq(event.getProperty("LOCATION"), "Hard Drive");
-    do_check_eq(event.organizer.id, "mailto:xpcshell@example.com");
-    do_check_eq(event.organizer.commonName, "Eggs P. Seashell");
-    do_check_true(event.organizer.isOrganizer);
-    do_check_eq(event.startDate.icalString, "20060610T180000");
-    do_check_eq(event.startDate.timezone.tzid, "Europe/Berlin");
-    do_check_eq(event.endDate.icalString, "20060610T200000");
-    do_check_eq(event.getProperty("TRANSP"), "TRANSPARENT");
-    do_check_eq(event.privacy, "PRIVATE");
-    do_check_eq(event.getProperty("SEQUENCE"), 1);
+    equal(event.id, "go6ijb0b46hlpbu4eeu92njevo@google.com");
+    equal(event.getProperty("STATUS"), "CONFIRMED");
+    equal(event.getProperty("URL"), gServer.baseUri + "/calendar/event?eid=eventhash");
+    equal(event.getProperty("CREATED").icalString, "20060608T210452Z");
+    equal(event.getProperty("LAST-MODIFIED").icalString, "20060608T210549Z");
+    equal(event.title, "New Event");
+    equal(event.getProperty("DESCRIPTION"), "description");
+    equal(event.getProperty("LOCATION"), "Hard Drive");
+    equal(event.organizer.id, "mailto:xpcshell@example.com");
+    equal(event.organizer.commonName, "Eggs P. Seashell");
+    ok(event.organizer.isOrganizer);
+    equal(event.startDate.icalString, "20060610T180000");
+    equal(event.startDate.timezone.tzid, "Europe/Berlin");
+    equal(event.endDate.icalString, "20060610T200000");
+    equal(event.getProperty("TRANSP"), "TRANSPARENT");
+    equal(event.privacy, "PRIVATE");
+    equal(event.getProperty("SEQUENCE"), 1);
     let alarms = event.getAlarms({});
-    do_check_eq(alarms.length, 1);
-    do_check_eq(alarms[0].action, "EMAIL");
-    do_check_eq(alarms[0].related, alarms[0].ALARM_RELATED_START);
-    do_check_eq(alarms[0].offset.icalString, "-PT20M");
-    do_check_null(alarms[0].getProperty("X-DEFAULT-ALARM"));
+    equal(alarms.length, 1);
+    equal(alarms[0].action, "EMAIL");
+    equal(alarms[0].related, alarms[0].ALARM_RELATED_START);
+    equal(alarms[0].offset.icalString, "-PT20M");
+    equal(alarms[0].getProperty("X-DEFAULT-ALARM"), null);
     let attendees = event.getAttendees({});
-    do_check_eq(attendees.length, 1);
-    do_check_eq(attendees[0].id, "mailto:attendee@example.com");
-    do_check_eq(attendees[0].commonName, "attendee name");
-    do_check_eq(attendees[0].role, "OPT-PARTICIPANT");
-    do_check_eq(attendees[0].participationStatus, "TENTATIVE");
-    do_check_eq(event.getCategories({}), "foo,bar");
-    do_check_eq(event.alarmLastAck.icalString, "20140101T010101Z");
-    do_check_eq(event.getProperty("X-MOZ-SNOOZE-TIME"), "20140101T020202Z");
+    equal(attendees.length, 1);
+    equal(attendees[0].id, "mailto:attendee@example.com");
+    equal(attendees[0].commonName, "attendee name");
+    equal(attendees[0].role, "OPT-PARTICIPANT");
+    equal(attendees[0].participationStatus, "TENTATIVE");
+    equal(event.getCategories({}), "foo,bar");
+    equal(event.alarmLastAck.icalString, "20140101T010101Z");
+    equal(event.getProperty("X-MOZ-SNOOZE-TIME"), "20140101T020202Z");
 
     let task = cal.isToDo(items[0]) ? items[0] : items[1];
-    do_check_eq(task.id, "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU");
-    do_check_eq(task.title, "New Task");
-    do_check_eq(task.getProperty("LAST-MODIFIED").icalString, "20140908T163027Z");
-    do_check_eq(task.getProperty("X-GOOGLE-SORTKEY"), "00000000000000130998");
-    do_check_true(task.isCompleted);
-    do_check_eq(task.dueDate.icalString, "20140904");
-    do_check_eq(task.completedDate.icalString, "20140901T170000Z");
-    do_check_eq(task.getProperty("DESCRIPTION"), "description");
+    equal(task.id, "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU");
+    equal(task.title, "New Task");
+    equal(task.getProperty("LAST-MODIFIED").icalString, "20140908T163027Z");
+    equal(task.getProperty("X-GOOGLE-SORTKEY"), "00000000000000130998");
+    ok(task.isCompleted);
+    equal(task.dueDate.icalString, "20140904");
+    equal(task.completedDate.icalString, "20140901T170000Z");
+    equal(task.getProperty("DESCRIPTION"), "description");
     let relations = task.getRelations({});
-    do_check_eq(relations.length, 1);
-    do_check_eq(relations[0].relType, "PARENT");
-    do_check_eq(relations[0].relId, "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo4MDIzOTU2NDc");
+    equal(relations.length, 1);
+    equal(relations[0].relType, "PARENT");
+    equal(relations[0].relId, "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo4MDIzOTU2NDc");
     let attachments = task.getAttachments({});
-    do_check_eq(attachments.length, 1);
-    do_check_eq(attachments[0].uri.spec, "mailto:something@example.com");
-    do_check_eq(attachments[0].getParameter("X-GOOGLE-TYPE"), "email");
-    do_check_eq(attachments[0].getParameter("FILENAME"), "link description");
+    equal(attachments.length, 1);
+    equal(attachments[0].uri.spec, "mailto:something@example.com");
+    equal(attachments[0].getParameter("X-GOOGLE-TYPE"), "email");
+    equal(attachments[0].getParameter("FILENAME"), "link description");
 
     gServer.resetClient(client);
 });
@@ -726,8 +726,8 @@
 add_task(function* test_addModifyDeleteItem() {
     let client = yield gServer.getClient();
     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-    do_check_eq(gServer.events.length, 0);
-    do_check_eq(gServer.tasks.length, 0);
+    equal(gServer.events.length, 0);
+    equal(gServer.tasks.length, 0);
 
     let event = cal.createEvent([
         "BEGIN:VEVENT",
@@ -775,71 +775,71 @@
 
     // Add an event
     let addedEvent = yield pclient.adoptItem(event);
-    do_check_neq(addedEvent.id, null);
-    do_check_eq(addedEvent.organizer.id, "mailto:xpcshell@example.com");
+    notEqual(addedEvent.id, null);
+    equal(addedEvent.organizer.id, "mailto:xpcshell@example.com");
 
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
-    do_check_eq(items[0].id, addedEvent.id);
-    do_check_eq(items[0].organizer.id, "mailto:xpcshell@example.com");
+    equal(items.length, 1);
+    equal(items[0].id, addedEvent.id);
+    equal(items[0].organizer.id, "mailto:xpcshell@example.com");
 
-    do_check_eq(gServer.events.length, 1)
-    do_check_eq(gServer.tasks.length, 0);
+    equal(gServer.events.length, 1)
+    equal(gServer.tasks.length, 0);
 
     // Add a task
     let addedTask = yield pclient.adoptItem(task);
-    do_check_neq(addedTask.id, null);
+    notEqual(addedTask.id, null);
 
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 2);
-    do_check_eq(items[1].id, addedTask.id);
+    equal(items.length, 2);
+    equal(items[1].id, addedTask.id);
 
-    do_check_eq(gServer.events.length, 1)
-    do_check_eq(gServer.tasks.length, 1);
+    equal(gServer.events.length, 1)
+    equal(gServer.tasks.length, 1);
 
     // Modify an event
     let newEvent = items[0].clone();
     newEvent.title = "changed";
 
     let modifiedEvent = yield pclient.modifyItem(newEvent, items[0]);
-    do_check_eq(modifiedEvent.title, "changed");
-    do_check_neq(modifiedEvent.getProperty("LAST-MODIFIED"), addedEvent.getProperty("LAST-MODIFIED"));
+    equal(modifiedEvent.title, "changed");
+    notEqual(modifiedEvent.getProperty("LAST-MODIFIED"), addedEvent.getProperty("LAST-MODIFIED"));
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 2);
-    do_check_eq(items[0].title, "changed");
-    do_check_eq(items[0].id, addedEvent.id);
-    do_check_eq(items[0].getProperty("LAST-MODIFIED"), modifiedEvent.getProperty("LAST-MODIFIED"));
-    do_check_eq(gServer.events.length, 1);
-    do_check_eq(gServer.tasks.length, 1);
+    equal(items.length, 2);
+    equal(items[0].title, "changed");
+    equal(items[0].id, addedEvent.id);
+    equal(items[0].getProperty("LAST-MODIFIED"), modifiedEvent.getProperty("LAST-MODIFIED"));
+    equal(gServer.events.length, 1);
+    equal(gServer.tasks.length, 1);
 
     // Modify a task
     let newTask = items[1].clone();
     newTask.title = "changed";
 
     let modifiedTask = yield pclient.modifyItem(newTask, items[1]);
-    do_check_eq(modifiedTask.title, "changed");
-    do_check_neq(modifiedTask.getProperty("LAST-MODIFIED"), addedTask.getProperty("LAST-MODIFIED"));
+    equal(modifiedTask.title, "changed");
+    notEqual(modifiedTask.getProperty("LAST-MODIFIED"), addedTask.getProperty("LAST-MODIFIED"));
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 2);
-    do_check_eq(items[1].title, "changed");
-    do_check_eq(items[1].id, addedTask.id);
-    do_check_eq(items[1].getProperty("LAST-MODIFIED"), modifiedTask.getProperty("LAST-MODIFIED"));
-    do_check_eq(gServer.events.length, 1);
-    do_check_eq(gServer.tasks.length, 1);
+    equal(items.length, 2);
+    equal(items[1].title, "changed");
+    equal(items[1].id, addedTask.id);
+    equal(items[1].getProperty("LAST-MODIFIED"), modifiedTask.getProperty("LAST-MODIFIED"));
+    equal(gServer.events.length, 1);
+    equal(gServer.tasks.length, 1);
 
     // Delete an event
     yield pclient.deleteItem(modifiedEvent);
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
-    do_check_eq(gServer.events.length, 0);
-    do_check_eq(gServer.tasks.length, 1);
+    equal(items.length, 1);
+    equal(gServer.events.length, 0);
+    equal(gServer.tasks.length, 1);
 
     // Delete a task
     yield pclient.deleteItem(modifiedTask);
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 0);
-    do_check_eq(gServer.events.length, 0);
-    do_check_eq(gServer.tasks.length, 0);
+    equal(items.length, 0);
+    equal(gServer.events.length, 0);
+    equal(gServer.tasks.length, 0);
 
     gServer.resetClient(client);
 });
@@ -858,9 +858,9 @@
     ].join("\r\n"));
 
     event = yield pclient.addItem(event);
-    do_check_eq(gServer.events.length, 1);
-    do_check_eq(gServer.events[0].recurrence.length, 1);
-    do_check_eq(gServer.events[0].recurrence[0], "RRULE:FREQ=WEEKLY");
+    equal(gServer.events.length, 1);
+    equal(gServer.events[0].recurrence.length, 1);
+    equal(gServer.events[0].recurrence[0], "RRULE:FREQ=WEEKLY");
 
     let occ = event.recurrenceInfo.getNextOccurrence(event.startDate);
     let changedOcc = occ.clone();
@@ -869,8 +869,8 @@
 
     event = yield pclient.modifyItem(changedOcc, occ);
     occ = event.recurrenceInfo.getNextOccurrence(event.startDate);
-    do_check_eq(occ.title, "changed");
-    do_check_eq(gServer.events.length, 2);
+    equal(occ.title, "changed");
+    equal(gServer.events.length, 2);
 
     gServer.resetClient(client);
 });
@@ -899,8 +899,8 @@
     ].join("\r\n"));
 
     let addedItem = yield pclient.adoptItem(event);
-    do_check_eq(gServer.events.length, 1);
-    do_check_eq(addedItem.icalString, event.icalString);
+    equal(gServer.events.length, 1);
+    equal(addedItem.icalString, event.icalString);
     gServer.resetClient(client);
     Preferences.set("calendar.google.enableAttendees", false);
 });
@@ -946,15 +946,15 @@
     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
 
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
+    equal(items.length, 1);
 
     let item = items[0];
     let att = cal.getInvitedAttendee(item);
     let newItem = item.clone();
 
-    do_check_neq(att, null);
-    do_check_eq(att.id, "mailto:" + attendee.email);
-    do_check_eq(att.participationStatus, "NEEDS-ACTION");
+    notEqual(att, null);
+    equal(att.id, "mailto:" + attendee.email);
+    equal(att.participationStatus, "NEEDS-ACTION");
 
     newItem.removeAttendee(att);
     att = att.clone();
@@ -962,7 +962,7 @@
     newItem.addAttendee(att);
 
     let modifiedItem = yield pclient.modifyItem(newItem, items[0]);
-    do_check_eq(gServer.lastMethod, "PATCH");
+    equal(gServer.lastMethod, "PATCH");
 
     // Case #2: User is organizer
     let events = gServer.events;
@@ -986,15 +986,15 @@
     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
 
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
+    equal(items.length, 1);
 
     item = items[0];
     let org = item.getAttendeeById("mailto:" + organizer.email);
     newItem = item.clone();
 
-    do_check_neq(org, null);
-    do_check_eq(org.id, "mailto:" + organizer.email);
-    do_check_eq(org.participationStatus, "ACCEPTED");
+    notEqual(org, null);
+    equal(org.id, "mailto:" + organizer.email);
+    equal(org.participationStatus, "ACCEPTED");
 
     newItem.removeAttendee(org);
     org = org.clone();
@@ -1002,7 +1002,7 @@
     newItem.addAttendee(org);
 
     modifiedItem = yield pclient.modifyItem(newItem, items[0]);
-    do_check_eq(gServer.lastMethod, "PUT");
+    equal(gServer.lastMethod, "PUT");
 
     gServer.resetClient(client);
 });
@@ -1044,11 +1044,11 @@
     let items = yield pclient.getAllItems();
     let meta = getAllMeta(offline);
     let [event, task] = items;
-    do_check_true(cal.isEvent(event));
-    do_check_true(cal.isToDo(task));
-    do_check_eq(meta.size, 2);
-    do_check_eq(meta.get(event.hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
-    do_check_eq(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+    ok(cal.isEvent(event));
+    ok(cal.isToDo(task));
+    equal(meta.size, 2);
+    equal(meta.get(event.hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+    equal(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
 
     // Modify an event
     gServer.nextEtag = '"3"';
@@ -1059,11 +1059,11 @@
     items = yield pclient.getAllItems();
     meta = getAllMeta(offline);
     [event, task] = items;
-    do_check_true(cal.isEvent(event));
-    do_check_true(cal.isToDo(task));
-    do_check_eq(meta.size, 2);
-    do_check_eq(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
-    do_check_eq(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+    ok(cal.isEvent(event));
+    ok(cal.isToDo(task));
+    equal(meta.size, 2);
+    equal(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+    equal(meta.get(task.hashId), ['"2"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
 
     // Modify a task
     gServer.nextEtag = '"4"';
@@ -1074,38 +1074,38 @@
     items = yield pclient.getAllItems();
     meta = getAllMeta(offline);
     [event, task] = items;
-    do_check_eq(meta.size, 2);
-    do_check_eq(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
-    do_check_eq(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+    equal(meta.size, 2);
+    equal(meta.get(event.hashId), ['"3"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+    equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
 
     // Delete an event
     yield pclient.deleteItem(event);
     meta = getAllMeta(offline);
-    do_check_eq(meta.size, 1);
-    do_check_eq(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
+    equal(meta.size, 1);
+    equal(meta.get(task.hashId), ['"4"', "MTEyMDE2MDE5NzE0NjYzMDk4ODI6MDo0MDI1NDg2NjU", false].join("\u001A"));
 
     // Delete a task
     yield pclient.deleteItem(task);
     meta = getAllMeta(offline);
-    do_check_eq(meta.size, 0);
+    equal(meta.size, 0);
 
     // Add an event
     gServer.nextEtag = '"6"';
     newEvent = yield pclient.addItem(event);
     meta = getAllMeta(offline);
-    do_check_eq(meta.size, 1);
-    do_check_eq(gServer.events.length, 1);
-    do_check_eq(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
+    equal(meta.size, 1);
+    equal(gServer.events.length, 1);
+    equal(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
 
     // Add a task
     gServer.nextEtag = '"7"';
     newTask = yield pclient.addItem(task);
     meta = getAllMeta(offline);
-    do_check_eq(meta.size, 2);
-    do_check_eq(gServer.events.length, 1);
-    do_check_eq(gServer.tasks.length, 1);
-    do_check_eq(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
-    do_check_eq(meta.get(newTask.hashId), ['"7"', gServer.tasks[0].id, false].join("\u001A"));
+    equal(meta.size, 2);
+    equal(gServer.events.length, 1);
+    equal(gServer.tasks.length, 1);
+    equal(meta.get(newEvent.hashId), ['"6"', gServer.events[0].id, false].join("\u001A"));
+    equal(meta.get(newTask.hashId), ['"7"', gServer.tasks[0].id, false].join("\u001A"));
 
     gServer.resetClient(client);
 });
@@ -1152,14 +1152,14 @@
     let items = yield pclient.getAllItems();
 
     let meta = getAllMeta(offline);
-    do_check_eq(meta.size, 3);
-    do_check_eq(meta.get(items[0].hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
+    equal(meta.size, 3);
+    equal(meta.get(items[0].hashId), ['"1"', "go6ijb0b46hlpbu4eeu92njevo", false].join("\u001A"));
 
     // The exception metadata should also exist
     let exIds = items[0].recurrenceInfo.getExceptionIds({});
-    do_check_eq(exIds.length, 2);
+    equal(exIds.length, 2);
     let ex = items[0].recurrenceInfo.getExceptionFor(exIds[0]);
-    do_check_eq(meta.get(ex.hashId), ['"2"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
+    equal(meta.get(ex.hashId), ['"2"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
 
     // Changing an exception should retain the metadata entries
     let newEx = ex.clone();
@@ -1167,8 +1167,8 @@
     gServer.nextEtag = '"4"';
     yield pclient.modifyItem(newEx, ex);
     meta = getAllMeta(offline);
-    do_check_eq(meta.size, 3);
-    do_check_eq(meta.get(newEx.hashId), ['"4"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
+    equal(meta.size, 3);
+    equal(meta.get(newEx.hashId), ['"4"', "go6ijb0b46hlpbu4eeu92njevo_20060610T160000Z", false].join("\u001A"));
 
     // Deleting an exception should delete the metadata, as it turns into an EXDATE
     let newItem = items[0].clone();
@@ -1176,12 +1176,12 @@
     yield pclient.modifyItem(newItem, items[0]);
 
     meta = getAllMeta(offline);
-    do_check_eq(meta.size, 2);
+    equal(meta.size, 2);
 
     // Deleting the master item should remove all metadata entries
     yield pclient.deleteItem(items[0]);
     meta = getAllMeta(offline);
-    do_check_eq(meta.size, 0);
+    equal(meta.size, 0);
 
     gServer.resetClient(client);
 });
@@ -1215,11 +1215,11 @@
     gServer.events[0].summary = "remote change";
     let modifiedItem = yield pclient.modifyItem(newItem, item);
     item = (yield pclient.getAllItems())[0];
-    do_check_eq(gServer.events[0].summary, "local change");
-    do_check_neq(gServer.events[0].etag, '"2"')
-    do_check_eq(item.title, "local change");
-    do_check_eq(modifiedItem.title, "local change");
-    do_check_eq(gServer.events.length, 1);
+    equal(gServer.events[0].summary, "local change");
+    notEqual(gServer.events[0].etag, '"2"')
+    equal(item.title, "local change");
+    equal(modifiedItem.title, "local change");
+    equal(gServer.events.length, 1);
 
     // Case #2: Modified on server, modify locally, don't overwrite conflict
     MockConflictPrompt.overwrite = false;
@@ -1235,9 +1235,9 @@
     yield gServer.waitForLoad(client);
 
     item = (yield pclient.getAllItems())[0];
-    do_check_eq(gServer.events[0].summary, "remote change");
-    do_check_eq(gServer.events[0].etag, '"3"')
-    do_check_eq(item.title, "remote change");
+    equal(gServer.events[0].summary, "remote change");
+    equal(gServer.events[0].etag, '"3"')
+    equal(item.title, "remote change");
 
     // Case #3: Modified on server, delete locally, don't overwrite conflict
     MockConflictPrompt.overwrite = false;
@@ -1253,9 +1253,9 @@
     yield gServer.waitForLoad(client);
 
     item = (yield pclient.getAllItems())[0];
-    do_check_eq(gServer.events[0].summary, "remote change");
-    do_check_eq(gServer.events[0].etag, '"4"')
-    do_check_eq(item.title, "remote change");
+    equal(gServer.events[0].summary, "remote change");
+    equal(gServer.events[0].etag, '"4"')
+    equal(item.title, "remote change");
 
     // Case #4: Modified on server, delete locally, overwrite conflict
     MockConflictPrompt.overwrite = true;
@@ -1263,7 +1263,7 @@
     gServer.events[0].summary = "remote change";
     yield pclient.deleteItem(item);
     item = (yield pclient.getAllItems())[0];
-    do_check_eq(gServer.events.length, 0);
+    equal(gServer.events.length, 0);
 
     gServer.resetClient(client);
 });
@@ -1299,11 +1299,11 @@
     newItem.title = "local change";
     let modifiedItem = yield pclient.modifyItem(newItem, item);
     item = (yield pclient.getAllItems())[0];
-    do_check_eq(gServer.events[0].summary, "local change");
-    do_check_neq(gServer.events[0].etag, '"2"')
-    do_check_eq(item.title, "local change");
-    do_check_eq(modifiedItem.title, "local change");
-    do_check_eq(gServer.events.length, 1);
+    equal(gServer.events[0].summary, "local change");
+    notEqual(gServer.events[0].etag, '"2"')
+    equal(item.title, "local change");
+    equal(modifiedItem.title, "local change");
+    equal(gServer.events.length, 1);
 
     // Case #2: Deleted on server, modify locally, don't overwrite conflict
     MockConflictPrompt.overwrite = false;
@@ -1321,15 +1321,15 @@
     yield gServer.waitForLoad(client);
 
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 0);
-    do_check_eq(gServer.events.length, 1);
+    equal(items.length, 0);
+    equal(gServer.events.length, 1);
 
     // Put the event back in the calendar for the next run
     delete gServer.events[0].status;
     client.refresh();
     yield gServer.waitForLoad(client);
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
+    equal(items.length, 1);
 
     // Case #3: Deleted on server, delete locally, don't overwrite conflict
     MockConflictPrompt.overwrite = false;
@@ -1346,21 +1346,21 @@
     yield gServer.waitForLoad(client);
 
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 0);
+    equal(items.length, 0);
 
     // Put the event back in the calendar for the next run
     delete gServer.events[0].status;
     client.refresh();
     yield gServer.waitForLoad(client);
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
+    equal(items.length, 1);
 
     // Case #4: Deleted on server, delete locally, overwrite conflict
     MockConflictPrompt.overwrite = true;
     gServer.events = [];
     yield pclient.deleteItem(item);
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 0);
+    equal(items.length, 0);
 
     gServer.resetClient(client);
 });
@@ -1390,17 +1390,17 @@
     // Case #1: read default alarms from event stream
     let client = yield gServer.getClient();
     let pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
-    do_check_eq(client.getProperty("settings.defaultReminders"), JSON.stringify(defaultReminders));
+    equal(client.getProperty("settings.defaultReminders"), JSON.stringify(defaultReminders));
 
     let item = (yield pclient.getAllItems())[0];
     let alarms = item.getAlarms({});
 
-    do_check_eq(alarms.length, 2);
-    do_check_true(alarms.every(x => x.getProperty("X-DEFAULT-ALARM") == "TRUE"));
-    do_check_eq(alarms[0].action, "DISPLAY");
-    do_check_eq(alarms[0].offset.icalString, "-PT10M");
-    do_check_eq(alarms[1].action, "EMAIL");
-    do_check_eq(alarms[1].offset.icalString, "-PT20M");
+    equal(alarms.length, 2);
+    ok(alarms.every(x => x.getProperty("X-DEFAULT-ALARM") == "TRUE"));
+    equal(alarms[0].action, "DISPLAY");
+    equal(alarms[0].offset.icalString, "-PT10M");
+    equal(alarms[1].action, "EMAIL");
+    equal(alarms[1].offset.icalString, "-PT20M");
 
     // Case #2: add an item with only default alarms
     let event = cal.createEvent([
@@ -1418,8 +1418,8 @@
     ].join("\r\n"));
 
     yield pclient.addItem(event);
-    do_check_true(gServer.events[1].reminders.useDefault);
-    do_check_eq(gServer.events[1].reminders.overrides.length, 0);
+    ok(gServer.events[1].reminders.useDefault);
+    equal(gServer.events[1].reminders.overrides.length, 0);
 
     // Case #3: Mixed default/non-default alarms. Not sure this will happen
     event = cal.createEvent([
@@ -1442,9 +1442,9 @@
     ].join("\r\n"));
 
     yield pclient.addItem(event);
-    do_check_true(gServer.events[2].reminders.useDefault);
-    do_check_eq(gServer.events[2].reminders.overrides.length, 1);
-    do_check_eq(gServer.events[2].reminders.overrides[0].minutes, 5);
+    ok(gServer.events[2].reminders.useDefault);
+    equal(gServer.events[2].reminders.overrides.length, 1);
+    equal(gServer.events[2].reminders.overrides[0].minutes, 5);
 
     gServer.resetClient(client);
 
@@ -1464,8 +1464,8 @@
     ].join("\r\n"));
 
     yield pclient.addItem(event);
-    do_check_true(gServer.events[0].reminders.useDefault);
-    do_check_eq(gServer.events[0].reminders.overrides, undefined);
+    ok(gServer.events[0].reminders.useDefault);
+    equal(gServer.events[0].reminders.overrides, undefined);
 
     let events = gServer.events;
     gServer.resetClient(client);
@@ -1476,7 +1476,7 @@
     pclient = cal.async.promisifyCalendar(client.wrappedJSObject);
 
     item = (yield pclient.getAllItems())[0];
-    do_check_eq(item.getProperty("X-DEFAULT-ALARM"), "TRUE");
+    equal(item.getProperty("X-DEFAULT-ALARM"), "TRUE");
 
     gServer.resetClient(client);
 });
@@ -1536,15 +1536,15 @@
     let pclient = cal.async.promisifyCalendar(client);
 
     // Make sure all pages were requested
-    do_check_eq(gServer.eventsData.nextPageToken, null);
-    do_check_eq(gServer.tasksData.nextPageToken, null);
+    equal(gServer.eventsData.nextPageToken, null);
+    equal(gServer.tasksData.nextPageToken, null);
 
     // ...and we have all items. Not checking props
     // because the other tests do this sufficiently.
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 4);
+    equal(items.length, 4);
 
-    do_check_eq(client.getProperty("syncToken.events"), "next-sync-token");
+    equal(client.getProperty("syncToken.events"), "next-sync-token");
 
     Preferences.reset("calendar.google.maxResultsPerRequest");
     gServer.resetClient(client);
@@ -1589,18 +1589,18 @@
     let pclient = cal.async.promisifyCalendar(client);
 
     let items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
-    do_check_eq(items[0].title, "New Event");
+    equal(items.length, 1);
+    equal(items[0].title, "New Event");
 
     client.refresh();
     yield gServer.waitForLoad(client);
 
     items = yield pclient.getAllItems();
-    do_check_eq(items.length, 1);
-    do_check_eq(items[0].title, "New Event 2");
+    equal(items.length, 1);
+    equal(items[0].title, "New Event 2");
 
-    do_check_eq(gServer.syncs.length, 0);
-    do_check_eq(client.getProperty("syncToken.events"), "last");
+    equal(gServer.syncs.length, 0);
+    equal(client.getProperty("syncToken.events"), "last");
 
     gServer.resetClient(client);
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_hashedarray.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_hashedarray.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_hashedarray.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_hashedarray.js	2015-02-28 15:02:41.000000000 +0000
@@ -55,11 +55,11 @@
     itemAccessor = itemAccessor || function(o) { return o; }
     for (let idx in testItems) {
         let ti = itemAccessor(testItems[idx]);
-        do_check_eq(itemAccessor(har.itemByIndex(idx)).title,
+        equal(itemAccessor(har.itemByIndex(idx)).title,
                     ti.title);
-        do_check_eq(itemAccessor(har.itemById(ti.hashId)).title,
+        equal(itemAccessor(har.itemById(ti.hashId)).title,
                     ti.title);
-        do_check_eq(har.indexOf(testItems[idx]), idx);
+        equal(har.indexOf(testItems[idx]), idx);
     }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_ics.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_ics.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_ics.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_ics.js	2015-02-28 15:02:41.000000000 +0000
@@ -130,7 +130,7 @@
         icssrv.parseICSAsync(data.ics, null, {
             onParsingComplete: function onParsingComplete(rc, rootComp) {
                 try {
-                    do_check_true(Components.isSuccessCode(rc));
+                    ok(Components.isSuccessCode(rc));
                     let event2 = cal.createEvent();
                     event2.icalComponent = rootComp;
                     checkEvent(thisdata, event2);
@@ -150,8 +150,8 @@
     let todo = cal.createTodo(), todo_ = cal.createTodo();
     todo.id = id;
     todo_.icalString = todo.icalString;
-    do_check_eq(todo.id, todo_.id);
-    do_check_eq(todo_.icalComponent.getFirstProperty("UID").value, id);
+    equal(todo.id, todo_.id);
+    equal(todo_.icalComponent.getFirstProperty("UID").value, id);
 }
 
 function test_icalProps() {
@@ -174,20 +174,20 @@
 
     if (aObj.setParameter) {
         aObj.icalProperty = prop1;
-        do_check_eq(aObj.getParameter("X-FOO"), "BAR");
+        equal(aObj.getParameter("X-FOO"), "BAR");
         aObj.icalProperty = prop2;
-        do_check_eq(aObj.getParameter("X-FOO"), null);
+        equal(aObj.getParameter("X-FOO"), null);
     } else if (aObj.setProperty) {
         aObj.icalProperty = prop1;
-        do_check_eq(aObj.getProperty("X-FOO"), "BAR");
+        equal(aObj.getProperty("X-FOO"), "BAR");
         aObj.icalProperty = prop2;
-        do_check_eq(aObj.getProperty("X-FOO"), null);
+        equal(aObj.getProperty("X-FOO"), null);
     }
 }
 
 function checkProps(expectedProps, obj) {
     for (let key in expectedProps) {
-        do_check_eq(obj[key], expectedProps[key]);
+        equal(obj[key], expectedProps[key]);
     }
 }
 
@@ -204,8 +204,8 @@
                 icskey = "summary";
                 break;
         }
-        do_check_true(icsdata.indexOf(icskey.toUpperCase()) > 0);
-        do_check_true(icsdata.indexOf(expectedProps[key]) > 0);
+        ok(icsdata.indexOf(icskey.toUpperCase()) > 0);
+        ok(icsdata.indexOf(expectedProps[key]) > 0);
     }
 }
 
@@ -213,14 +213,14 @@
     let e = cal.createEvent();
     e.startDate = cal.createDateTime();
     e.endDate = null;
-    do_check_eq(e.duration.icalString, "PT0S");
+    equal(e.duration.icalString, "PT0S");
 }
 
 function test_serialize() {
     let e = cal.createEvent();
     let prop = cal.getIcsService().createIcalComponent("VTODO");
 
-    do_check_throws(function() {
+    throws(function() {
         e.icalComponent = prop;
-    }, Components.results.NS_ERROR_INVALID_ARG);
+    }, /Illegal value/);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_ics_parser.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_ics_parser.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_ics_parser.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_ics_parser.js	2015-02-28 15:02:41.000000000 +0000
@@ -27,14 +27,14 @@
     parser.parseString(str);
 
     let props = parser.getProperties({});
-    do_check_eq(props.length, 1);
-    do_check_eq(props[0].propertyName, "X-WR-CALNAME");
-    do_check_eq(props[0].value, "CALNAME");
+    equal(props.length, 1);
+    equal(props[0].propertyName, "X-WR-CALNAME");
+    equal(props[0].value, "CALNAME");
 
     let comps = parser.getComponents({});
-    do_check_eq(comps.length, 1);
-    do_check_eq(comps[0].componentType, "VJOURNAL");
-    do_check_eq(comps[0].location, "BEFORE TIME");
+    equal(comps.length, 1);
+    equal(comps[0].componentType, "VJOURNAL");
+    equal(comps[0].location, "BEFORE TIME");
 }
 
 function test_failures() {
@@ -45,7 +45,7 @@
     parser.parseString("BOGUS", null, {
         onParsingComplete: function(rc, parser) {
             dump("Note: The previous error message is expected ^^\n");
-            do_check_eq(rc, Components.results.NS_ERROR_FAILURE);
+            equal(rc, Components.results.NS_ERROR_FAILURE);
             do_test_finished();
         }
     });
@@ -61,8 +61,8 @@
         "END:VWORLD"].join("\r\n");
     dump("Note: The following error message is expected:\n");
     parser.parseString(str);
-    do_check_eq(parser.getComponents({}).length, 0);
-    do_check_eq(parser.getItems({}).length, 0);
+    equal(parser.getComponents({}).length, 0);
+    equal(parser.getItems({}).length, 0);
 
 }
 
@@ -83,23 +83,23 @@
     parser.parseString(str);
 
     let items = parser.getItems({});
-    do_check_eq(items.length, 1);
+    equal(items.length, 1);
     let item = items[0];
 
-    do_check_eq(item.id, "123");
-    do_check_true(!!item.recurrenceInfo);
-    do_check_eq(item.startDate.icalString, "20120101T010101");
-    do_check_eq(item.getProperty("X-MOZ-FAKED-MASTER"), "1");
+    equal(item.id, "123");
+    ok(!!item.recurrenceInfo);
+    equal(item.startDate.icalString, "20120101T010101");
+    equal(item.getProperty("X-MOZ-FAKED-MASTER"), "1");
 
     let rinfo = item.recurrenceInfo;
 
-    do_check_eq(rinfo.countRecurrenceItems(), 1);
+    equal(rinfo.countRecurrenceItems(), 1);
     let excs = rinfo.getOccurrences(cal.createDateTime("20120101T010101"), null, 0, {});
-    do_check_eq(excs.length, 1);
+    equal(excs.length, 1);
     let exc = excs[0];
-    do_check_eq(exc.startDate.icalString, "20120101T010102");
+    equal(exc.startDate.icalString, "20120101T010102");
 
-    do_check_eq(parser.getParentlessItems({})[0], exc);
+    equal(parser.getParentlessItems({})[0], exc);
 }
 
 function test_async() {
@@ -123,18 +123,18 @@
     parser.parseString(str, null, {
         onParsingComplete: function(rc, parser) {
             let items = parser.getItems({});
-            do_check_eq(items.length, 2);
+            equal(items.length, 2);
             let item = items[0];
-            do_check_true(cal.isToDo(item));
+            ok(cal.isToDo(item));
 
-            do_check_eq(item.entryDate.icalString, "20120101T010101");
-            do_check_eq(item.dueDate.icalString, "20120101T010102");
+            equal(item.entryDate.icalString, "20120101T010101");
+            equal(item.dueDate.icalString, "20120101T010102");
 
             item = items[1];
-            do_check_true(cal.isToDo(item));
+            ok(cal.isToDo(item));
 
-            do_check_eq(item.entryDate.icalString, "20120101T010103");
-            do_check_eq(item.dueDate.icalString, "20120101T010104");
+            equal(item.entryDate.icalString, "20120101T010103");
+            equal(item.dueDate.icalString, "20120101T010104");
 
             do_test_finished();
         }
@@ -174,7 +174,7 @@
     parser.getProperties({}).forEach(serializer.addProperty, serializer);
     parser.getComponents({}).forEach(serializer.addComponent, serializer);
 
-    do_check_eq(serializer.serializeToString().split("\r\n").sort().join("\r\n"),
+    equal(serializer.serializeToString().split("\r\n").sort().join("\r\n"),
                 str.split("\r\n").sort().join("\r\n"));
 
     // Test parseFromStream
@@ -187,15 +187,15 @@
     items = parser.getItems({});
     let comps = parser.getComponents({});
     let props = parser.getProperties({});
-    do_check_eq(items.length, 1);
-    do_check_eq(comps.length, 1);
-    do_check_eq(props.length, 1);
+    equal(items.length, 1);
+    equal(comps.length, 1);
+    equal(props.length, 1);
 
     let everything = items[0].icalString.split("\r\n").concat(comps[0].serializeToICS().split("\r\n"))
     everything.push((props[0].icalString.split("\r\n"))[0]);
     everything.sort();
 
-    do_check_eq(everything.join("\r\n"), str.split("\r\n").concat([""]).sort().join("\r\n"));
+    equal(everything.join("\r\n"), str.split("\r\n").concat([""]).sort().join("\r\n"));
 
     // Test serializeToStream/parseFromStream
     parser = Components.classes["@mozilla.org/calendar/ics-parser;1"]
@@ -210,13 +210,13 @@
     items = parser.getItems({});
     comps = parser.getComponents({});
     props = parser.getProperties({});
-    do_check_eq(items.length, 1);
-    do_check_eq(comps.length, 1);
-    do_check_eq(props.length, 1);
+    equal(items.length, 1);
+    equal(comps.length, 1);
+    equal(props.length, 1);
 
     everything = items[0].icalString.split("\r\n").concat(comps[0].serializeToICS().split("\r\n"));
     everything.push((props[0].icalString.split("\r\n"))[0]);
     everything.sort();
 
-    do_check_eq(everything.join("\r\n"), str.split("\r\n").concat([""]).sort().join("\r\n"));
+    equal(everything.join("\r\n"), str.split("\r\n").concat([""]).sort().join("\r\n"));
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_ics_service.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_ics_service.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_ics_service.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_ics_service.js	2015-02-28 15:02:41.000000000 +0000
@@ -16,20 +16,20 @@
 function test_icalstring() {
     function checkComp(createFunc, icalString, members, properties) {
         let thing = createFunc(icalString);
-        do_check_eq(ics_unfoldline(thing.icalString), icalString + "\r\n");
+        equal(ics_unfoldline(thing.icalString), icalString + "\r\n");
 
         if (members) {
             for (let k in members) {
-                do_check_eq(thing[k], members[k]);
+                equal(thing[k], members[k]);
             }
         }
 
         if (properties) {
             for (let k in properties) {
                 if ("getParameter" in thing) {
-                    do_check_eq(thing.getParameter(k), properties[k]);
+                    equal(thing.getParameter(k), properties[k]);
                 } else if ("getProperty" in thing) {
-                    do_check_eq(thing.getProperty(k), properties[k]);
+                    equal(thing.getProperty(k), properties[k]);
                 }
             }
         }
@@ -40,7 +40,7 @@
                            "ATTACH;ENCODING=BASE64;FMTTYPE=text/calendar;FILENAME=test.ics:http://example.com/test.ics",
                            { formatType: "text/calendar", encoding: "BASE64" },
                            { FILENAME: "test.ics" });
-    do_check_eq(attach.uri.spec, "http://example.com/test.ics");
+    equal(attach.uri.spec, "http://example.com/test.ics");
 
     checkComp(cal.createAttendee.bind(cal),
               "ATTENDEE;RSVP=TRUE;CN=Name;PARTSTAT=ACCEPTED;CUTYPE=RESOURCE;ROLE=REQ-PARTICIPANT;X-THING=BAR:mailto:test@example.com",
@@ -57,30 +57,30 @@
     let rrule = checkComp(cal.createRecurrenceRule.bind(cal),
                           "RRULE:FREQ=WEEKLY;COUNT=5;INTERVAL=2;BYDAY=MO",
                           { count: 5, isByCount: true, type: "WEEKLY", interval: 2 });
-    do_check_eq(rrule.getComponent("BYDAY", {}).toString(), [2].toString());
+    equal(rrule.getComponent("BYDAY", {}).toString(), [2].toString());
 
     if (Preferences.get("calendar.icaljs", false)) {
         let rdate = checkComp(cal.createRecurrenceDate.bind(cal),
                               "RDATE:20120101T000000",
                               { isNegative: false });
-        do_check_eq(rdate.date.compare(cal.createDateTime("20120101T000000")), 0);
+        equal(rdate.date.compare(cal.createDateTime("20120101T000000")), 0);
     } else {
         let rdate = checkComp(cal.createRecurrenceDate.bind(cal),
                               "RDATE;VALUE=DATE-TIME:20120101T000000",
                               { isNegative: false });
-        do_check_eq(rdate.date.compare(cal.createDateTime("20120101T000000")), 0);
+        equal(rdate.date.compare(cal.createDateTime("20120101T000000")), 0);
     }
 
     /* TODO consider removing period support, ics throws badarg
     let rdateperiod = checkComp(cal.createRecurrenceDate.bind(cal),
                                 "RDATE;VALUE=PERIOD;20120101T000000Z/20120102T000000Z");
-    do_check_eq(rdate.date.compare(cal.createDateTime("20120101T000000Z")), 0);
+    equal(rdate.date.compare(cal.createDateTime("20120101T000000Z")), 0);
     */
 
     let exdate = checkComp(cal.createRecurrenceDate.bind(cal),
                            "EXDATE:20120101T000000",
                            { isNegative: true });
-    do_check_eq(exdate.date.compare(cal.createDateTime("20120101T000000")), 0);
+    equal(exdate.date.compare(cal.createDateTime("20120101T000000")), 0);
 }
 
 function test_icsservice() {
@@ -88,14 +88,14 @@
 
     function checkProp(createFunc, icalString, members, parameters) {
         let thing = createFunc(icalString);
-        do_check_eq(ics_unfoldline(thing.icalString), icalString + "\r\n");
+        equal(ics_unfoldline(thing.icalString), icalString + "\r\n");
 
         for (let k in members) {
-            do_check_eq(thing[k], members[k]);
+            equal(thing[k], members[k]);
         }
 
         for (let k in parameters) {
-            do_check_eq(thing.getParameter(k), parameters[k]);
+            equal(thing.getParameter(k), parameters[k]);
         }
         return thing;
     }
@@ -113,9 +113,9 @@
 
     // Test ::createIcalProperty
     let attach2 = svc.createIcalProperty("ATTACH");
-    do_check_eq(attach2.propertyName, "ATTACH");
+    equal(attach2.propertyName, "ATTACH");
     attach2.value = "http://example.com/";
-    do_check_eq(attach2.icalString, "ATTACH:http://example.com/\r\n");
+    equal(attach2.icalString, "ATTACH:http://example.com/\r\n");
 }
 
 function test_icalproperty() {
@@ -125,26 +125,26 @@
     prop.value = "VAL";
 
     comp.addProperty(prop);
-    do_check_eq(prop.parent.toString(), comp.toString());
-    do_check_eq(prop.valueAsDatetime, null);
+    equal(prop.parent.toString(), comp.toString());
+    equal(prop.valueAsDatetime, null);
 
     prop = svc.createIcalProperty("PROP");
     prop.value = "A\nB";
-    do_check_eq(prop.value, "A\nB");
-    do_check_eq(prop.valueAsIcalString, "A\\nB");
-    do_check_eq(prop.valueAsDatetime, null);
+    equal(prop.value, "A\nB");
+    equal(prop.valueAsIcalString, "A\\nB");
+    equal(prop.valueAsDatetime, null);
 
     prop = svc.createIcalProperty("PROP");
     prop.valueAsIcalString = "A\\nB";
-    do_check_eq(prop.value, "A\nB");
-    do_check_eq(prop.valueAsIcalString, "A\\nB");
-    do_check_eq(prop.valueAsDatetime, null);
+    equal(prop.value, "A\nB");
+    equal(prop.valueAsIcalString, "A\\nB");
+    equal(prop.valueAsDatetime, null);
 
     prop = svc.createIcalProperty("PROP");
     prop.value = "A\\nB";
-    do_check_eq(prop.value, "A\\nB");
-    do_check_eq(prop.valueAsIcalString, "A\\\\nB");
-    do_check_eq(prop.valueAsDatetime, null);
+    equal(prop.value, "A\\nB");
+    equal(prop.valueAsIcalString, "A\\\\nB");
+    equal(prop.valueAsDatetime, null);
 }
 
 function test_icalcomponent() {
@@ -156,17 +156,17 @@
 
     // Check that the parent works and does not appear on cloned instances
     let alarm2 = alarm.clone();
-    do_check_eq(alarm.parent.toString(), event.toString());
-    do_check_eq(alarm2.parent, null);
+    equal(alarm.parent.toString(), event.toString());
+    equal(alarm2.parent, null);
 
     function check_getset(k, v) {
         dump("Checking " + k + " = " + v + "\n");
         event[k] = v;
         vstring = v.icalString || v;
-        do_check_eq(event[k].icalString || event[k], vstring);
-        do_check_eq(event.serializeToICS().match(new RegExp(vstring, "g")).length, 1);
+        equal(event[k].icalString || event[k], vstring);
+        equal(event.serializeToICS().match(new RegExp(vstring, "g")).length, 1);
         event[k] = v;
-        do_check_eq(event.serializeToICS().match(new RegExp(vstring, "g")).length, 1);
+        equal(event.serializeToICS().match(new RegExp(vstring, "g")).length, 1);
     }
 
     let props = [
@@ -201,16 +201,16 @@
     let svc = cal.getIcsService();
     let prop = svc.createIcalProperty("DTSTART");
     prop.value = "20120101T010101";
-    do_check_eq(prop.icalString, "DTSTART:20120101T010101\r\n");
+    equal(prop.icalString, "DTSTART:20120101T010101\r\n");
     prop.setParameter("VALUE", "TEXT");
-    do_check_eq(prop.icalString, "DTSTART;VALUE=TEXT:20120101T010101\r\n");
+    equal(prop.icalString, "DTSTART;VALUE=TEXT:20120101T010101\r\n");
     prop.removeParameter("VALUE");
-    do_check_eq(prop.icalString, "DTSTART:20120101T010101\r\n");
+    equal(prop.icalString, "DTSTART:20120101T010101\r\n");
 
     prop.setParameter("X-FOO", "BAR");
-    do_check_eq(prop.icalString, "DTSTART;X-FOO=BAR:20120101T010101\r\n");
+    equal(prop.icalString, "DTSTART;X-FOO=BAR:20120101T010101\r\n");
     prop.removeParameter("X-FOO", "BAR");
-    do_check_eq(prop.icalString, "DTSTART:20120101T010101\r\n");
+    equal(prop.icalString, "DTSTART:20120101T010101\r\n");
 
 }
 
@@ -229,15 +229,15 @@
     for (let p = comp.getFirstProperty("ANY");
          p;
          p = comp.getNextProperty("ANY")) {
-        do_check_eq(p.propertyName, propNames.shift());
-        do_check_eq(p.parent.toString(), comp.toString());
+        equal(p.propertyName, propNames.shift());
+        equal(p.parent.toString(), comp.toString());
     }
     propNames = ["X-ONE", "X-TWO"];
     for (let p = comp.getNextProperty("ANY");
          p;
          p = comp.getNextProperty("ANY")) {
-        do_check_eq(p.propertyName, propNames.shift());
-        do_check_eq(p.parent.toString(), comp.toString());
+        equal(p.propertyName, propNames.shift());
+        equal(p.parent.toString(), comp.toString());
     }
 
     // Property iterator with multiple values
@@ -248,9 +248,9 @@
     for (let p = comp.getFirstProperty("CATEGORIES");
          p;
          p = comp.getNextProperty("CATEGORIES")) {
-        do_check_eq(p.propertyName, "CATEGORIES");
-        do_check_eq(p.value, propValues.shift());
-        do_check_eq(p.parent.toString(), comp.toString());
+        equal(p.propertyName, "CATEGORIES");
+        equal(p.value, propValues.shift());
+        equal(p.parent.toString(), comp.toString());
     }
 
     // Param iterator
@@ -263,7 +263,7 @@
     for (let p = prop.getFirstParameterName();
          p;
          p = prop.getNextParameterName()) {
-        do_check_eq(p, params.shift());
+        equal(p, params.shift());
     }
 
     // Now try again, but start with next. Should act like first
@@ -271,6 +271,6 @@
     for (let p = prop.getNextParameterName();
          p;
          p = prop.getNextParameterName()) {
-        do_check_eq(p, params.shift());
+        equal(p, params.shift());
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_items.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_items.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_items.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_items.js	2015-02-28 15:02:41.000000000 +0000
@@ -47,25 +47,25 @@
     e.id = "withentry";
     e.calendar = mockCalendar;
 
-    do_check_eq(e.aclEntry.userCanModify, itemEntry.userCanModify);
-    do_check_eq(e.aclEntry.userCanRespond, itemEntry.userCanRespond);
-    do_check_eq(e.aclEntry.userCanViewAll, itemEntry.userCanViewAll);
-    do_check_eq(e.aclEntry.userCanViewDateAndTime, itemEntry.userCanViewDateAndTime);
+    equal(e.aclEntry.userCanModify, itemEntry.userCanModify);
+    equal(e.aclEntry.userCanRespond, itemEntry.userCanRespond);
+    equal(e.aclEntry.userCanViewAll, itemEntry.userCanViewAll);
+    equal(e.aclEntry.userCanViewDateAndTime, itemEntry.userCanViewDateAndTime);
 
     let pe = cal.createEvent();
     pe.id = "parententry";
     pe.calendar = mockCalendar;
     pe.parentItem = e;
 
-    do_check_eq(pe.aclEntry.userCanModify, itemEntry.userCanModify);
-    do_check_eq(pe.aclEntry.userCanRespond, itemEntry.userCanRespond);
-    do_check_eq(pe.aclEntry.userCanViewAll, itemEntry.userCanViewAll);
-    do_check_eq(pe.aclEntry.userCanViewDateAndTime, itemEntry.userCanViewDateAndTime);
+    equal(pe.aclEntry.userCanModify, itemEntry.userCanModify);
+    equal(pe.aclEntry.userCanRespond, itemEntry.userCanRespond);
+    equal(pe.aclEntry.userCanViewAll, itemEntry.userCanViewAll);
+    equal(pe.aclEntry.userCanViewDateAndTime, itemEntry.userCanViewDateAndTime);
 
     e = cal.createEvent();
     e.id = "noentry";
     e.calendar = mockCalendar;
-    do_check_eq(e.aclEntry, null);
+    equal(e.aclEntry, null);
 
 }
 
@@ -81,8 +81,8 @@
     pe.calendar = mockCalendar;
     e.parentItem = pe;
 
-    do_check_neq(e.calendar, null);
-    do_check_eq(e.calendar.id, "one");
+    notEqual(e.calendar, null);
+    equal(e.calendar.id, "one");
 }
 
 function test_attachment() {
@@ -95,23 +95,23 @@
     b.rawData = "bruno";
 
     e.addAttachment(a);
-    do_check_eq(e.getAttachments({}).length, 1);
+    equal(e.getAttachments({}).length, 1);
 
     e.addAttachment(b);
-    do_check_eq(e.getAttachments({}).length, 2);
+    equal(e.getAttachments({}).length, 2);
 
     e.removeAttachment(a);
-    do_check_eq(e.getAttachments({}).length, 1);
+    equal(e.getAttachments({}).length, 1);
 
     e.removeAllAttachments();
-    do_check_eq(e.getAttachments({}).length, 0);
+    equal(e.getAttachments({}).length, 0);
 }
 
 function test_attendee() {
 
     let e = cal.createEvent();
-    do_check_eq(e.getAttendeeById("unknown"), null);
-    do_check_eq(e.getAttendees({}).length, 0);
+    equal(e.getAttendeeById("unknown"), null);
+    equal(e.getAttendees({}).length, 0);
 
     let a = cal.createAttendee();
     a.id = "mailto:horst";
@@ -120,45 +120,45 @@
     b.id = "mailto:bruno";
 
     e.addAttendee(a);
-    do_check_eq(e.getAttendees({}).length, 1);
-    do_check_eq(e.getAttendeeById("mailto:horst"), a);
+    equal(e.getAttendees({}).length, 1);
+    equal(e.getAttendeeById("mailto:horst"), a);
 
     e.addAttendee(b);
-    do_check_eq(e.getAttendees({}).length, 2);
+    equal(e.getAttendees({}).length, 2);
 
     let comp = e.icalComponent;
     let aprop = comp.getFirstProperty("ATTENDEE");
-    do_check_eq(aprop.value, "mailto:horst");
+    equal(aprop.value, "mailto:horst");
     aprop = comp.getNextProperty("ATTENDEE");
-    do_check_eq(aprop.value, "mailto:bruno");
-    do_check_eq(comp.getNextProperty("ATTENDEE"), null);
+    equal(aprop.value, "mailto:bruno");
+    equal(comp.getNextProperty("ATTENDEE"), null);
 
     e.removeAttendee(a);
-    do_check_eq(e.getAttendees({}).length, 1);
-    do_check_eq(e.getAttendeeById("mailto:horst"), null);
+    equal(e.getAttendees({}).length, 1);
+    equal(e.getAttendeeById("mailto:horst"), null);
 
     e.removeAllAttendees();
-    do_check_eq(e.getAttendees({}).length, 0);
+    equal(e.getAttendees({}).length, 0);
 }
 
 function test_categories() {
 
     let e = cal.createEvent();
 
-    do_check_eq(e.getCategories({}).length, 0);
+    equal(e.getCategories({}).length, 0);
 
     let cat = ["a", "b", "c"];
     e.setCategories(3, cat);
 
     cat[0] = "err";
-    do_check_eq(e.getCategories({}).join(","), "a,b,c");
+    equal(e.getCategories({}).join(","), "a,b,c");
 
     let comp = e.icalComponent;
     let getter = comp.getFirstProperty.bind(comp);
 
     cat[0] = "a";
     while (cat.length) {
-        do_check_eq(cat.shift(), getter("CATEGORIES").value);
+        equal(cat.shift(), getter("CATEGORIES").value);
         getter = comp.getNextProperty.bind(comp);
     }
 }
@@ -174,19 +174,19 @@
     e.addAlarm(alarm);
     let ecomp = e.icalComponent;
     let vcomp = ecomp.getFirstSubcomponent("VALARM");
-    do_check_eq(vcomp.serializeToICS(), alarm.icalString);
+    equal(vcomp.serializeToICS(), alarm.icalString);
 
     let alarm2 = alarm.clone();
 
     e.addAlarm(alarm2);
 
-    do_check_eq(e.getAlarms({}).length, 2);
+    equal(e.getAlarms({}).length, 2);
     e.deleteAlarm(alarm);
-    do_check_eq(e.getAlarms({}).length, 1);
-    do_check_eq(e.getAlarms({})[0], alarm2);
+    equal(e.getAlarms({}).length, 1);
+    equal(e.getAlarms({})[0], alarm2);
 
     e.clearAlarms();
-    do_check_eq(e.getAlarms({}).length, 0);
+    equal(e.getAlarms({}).length, 0);
 }
 
 function test_immutable() {
@@ -213,41 +213,41 @@
 
     e.setCategories(3, ["a", "b", "c"]);
 
-    do_check_eq(e.alarmLastAck.timezone.tzid, cal.UTC().tzid);
+    equal(e.alarmLastAck.timezone.tzid, cal.UTC().tzid);
 
     e.makeImmutable();
 
     // call again, should not throw
     e.makeImmutable();
 
-    do_check_false(e.alarmLastAck.isMutable);
-    do_check_false(org.isMutable);
-    do_check_false(alarm.isMutable);
+    ok(!e.alarmLastAck.isMutable);
+    ok(!org.isMutable);
+    ok(!alarm.isMutable);
 
-    do_check_throws(function() {
+    throws(function() {
         e.alarmLastAck = cal.createDateTime();
-    }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
-    do_check_throws(function() {
+    }, /Can not modify immutable data container/);
+    throws(function() {
         e.calendar = null;
-    }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
-    do_check_throws(function() {
+    }, /Can not modify immutable data container/);
+    throws(function() {
         e.parentItem = null;
-    }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
-    do_check_throws(function() {
+    }, /Can not modify immutable data container/);
+    throws(function() {
         e.setCategories(3, ["d", "e", "f"]);
-    }, Components.results.NS_ERROR_OBJECT_IS_IMMUTABLE);
+    }, /Can not modify immutable data container/);
 
     let e2 = e.clone();
     e2.organizer.id = "two";
 
-    do_check_eq(org.id, "one");
-    do_check_eq(e2.organizer.id, "two");
+    equal(org.id, "one");
+    equal(e2.organizer.id, "two");
 
-    do_check_eq(e2.getProperty("X-NAME"), "X-VALUE");
-    do_check_eq(e2.getPropertyParameter("X-NAME", "X-PARAM"), "X-PARAMVAL");
+    equal(e2.getProperty("X-NAME"), "X-VALUE");
+    equal(e2.getPropertyParameter("X-NAME", "X-PARAM"), "X-PARAMVAL");
 
     e2.setPropertyParameter("X-NAME", "X-PARAM", null);
-    do_check_eq(e2.getPropertyParameter("X-NAME", "X-PARAM"), null);
+    equal(e2.getPropertyParameter("X-NAME", "X-PARAM"), null);
 
     // TODO more clone checks
 }
@@ -259,16 +259,16 @@
     e.alarmLastAck = cal.createDateTime("20120101T010101");
 
     // Our items don't support this yet
-    //do_check_eq(e.getProperty("X-MOZ-LASTACK"), "20120101T010101");
+    //equal(e.getProperty("X-MOZ-LASTACK"), "20120101T010101");
 
     let comp = e.icalComponent;
     let prop = comp.getFirstProperty("X-MOZ-LASTACK");
 
-    do_check_eq(prop.value, "20120101T010101Z");
+    equal(prop.value, "20120101T010101Z");
 
     prop.value = "20120101T010102Z";
 
     e.icalComponent = comp;
 
-    do_check_eq(e.alarmLastAck.icalString, "20120101T010102Z");
+    equal(e.alarmLastAck.icalString, "20120101T010102Z");
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_providers.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_providers.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_providers.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_providers.js	2015-02-28 15:02:41.000000000 +0000
@@ -279,12 +279,12 @@
                                           aOperationType,
                                           aId,
                                           aDetail) {
-                do_check_eq(aStatus, 0);
+                equal(aStatus, 0);
                 if (aOperationType == Ci.calIOperationListener.ADD) {
                     // perform getItems() on calendar
                     aCalendar.getItems(filter, 0, rangeStart, rangeEnd, listener);
                 } else if (aOperationType == Ci.calIOperationListener.GET) {
-                    do_check_eq(count, aResult);
+                    equal(count, aResult);
                     do_test_finished();
                 }
             },
@@ -329,13 +329,13 @@
                                               aOperationType,
                                               aId,
                                               aDetail) {
-                    do_check_eq(aStatus, 0);
+                    equal(aStatus, 0);
                     if (aOperationType == Ci.calIOperationListener.ADD) {
                         compareItemsSpecific(aDetail, aItem);
                         // perform getItem() on calendar
                         aCalendar.getItem(aId, listener);
                     } else if (aOperationType == Ci.calIOperationListener.GET) {
-                        do_check_eq(count, 1);
+                        equal(count, 1);
                         compareItemsSpecific(returnedItem, aItem);
                     }
                 },
@@ -369,46 +369,46 @@
         event1.id = "item1";
         aCalendar.addItem(event1, null);
         aCalendar.setMetaData("item1", "meta1");
-        do_check_eq(aCalendar.getMetaData("item1"), "meta1");
-        do_check_eq(aCalendar.getMetaData("unknown"), null);
+        equal(aCalendar.getMetaData("item1"), "meta1");
+        equal(aCalendar.getMetaData("unknown"), null);
 
         var event2 = event1.clone();
         event2.id = "item2";
         aCalendar.addItem(event2, null);
         aCalendar.setMetaData("item2", "meta2-");
-        do_check_eq(aCalendar.getMetaData("item2"), "meta2-");
+        equal(aCalendar.getMetaData("item2"), "meta2-");
 
         aCalendar.setMetaData("item2", "meta2");
-        do_check_eq(aCalendar.getMetaData("item2"), "meta2");
+        equal(aCalendar.getMetaData("item2"), "meta2");
 
         var count = {};
         var ids = {};
         var values = {};
         aCalendar.getAllMetaData(count, ids, values);
-        do_check_eq(count.value, 2);
-        do_check_true(ids.value[0] ==  "item1" || ids.value[1] == "item1");
-        do_check_true(ids.value[0] ==  "item2" || ids.value[1] == "item2");
-        do_check_true(values.value[0] ==  "meta1" || values.value[1] == "meta1");
-        do_check_true(values.value[0] ==  "meta2" || values.value[1] == "meta2");
+        equal(count.value, 2);
+        ok(ids.value[0] ==  "item1" || ids.value[1] == "item1");
+        ok(ids.value[0] ==  "item2" || ids.value[1] == "item2");
+        ok(values.value[0] ==  "meta1" || values.value[1] == "meta1");
+        ok(values.value[0] ==  "meta2" || values.value[1] == "meta2");
 
         aCalendar.deleteItem(event1, null);
-        do_check_eq(aCalendar.getMetaData("item1"), null);
+        equal(aCalendar.getMetaData("item1"), null);
         aCalendar.getAllMetaData(count, ids, values);
-        do_check_eq(count.value, 1);
-        do_check_true(ids.value[0] ==  "item2");
-        do_check_true(values.value[0] ==  "meta2");
+        equal(count.value, 1);
+        ok(ids.value[0] ==  "item2");
+        ok(values.value[0] ==  "meta2");
 
         aCalendar.deleteMetaData("item2");
-        do_check_eq(aCalendar.getMetaData("item2"), null);
+        equal(aCalendar.getMetaData("item2"), null);
         aCalendar.getAllMetaData(count, ids, values);
-        do_check_eq(count.value, 0);
+        equal(count.value, 0);
 
         aCalendar.setMetaData("item2", "meta2");
-        do_check_eq(aCalendar.getMetaData("item2"), "meta2");
+        equal(aCalendar.getMetaData("item2"), "meta2");
         aCalendar.QueryInterface(Ci.calICalendarProvider).deleteCalendar(aCalendar, null);
-        do_check_eq(aCalendar.getMetaData("item2"), null);
+        equal(aCalendar.getMetaData("item2"), null);
         aCalendar.getAllMetaData(count, ids, values);
-        do_check_eq(count.value, 0);
+        equal(count.value, 0);
 
         aCalendar.deleteMetaData("unknown"); // check graceful return
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_recur.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_recur.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_recur.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_recur.js	2015-02-28 15:02:41.000000000 +0000
@@ -39,7 +39,7 @@
         // Check number of items
         dump("Expected " + expected.length + " occurrences\n");
         dump("Got: " + recdates.map(function(x) x.toString()) + "\n");
-        //do_check_eq(recdates.length, expected.length);
+        //equal(recdates.length, expected.length);
         let fmt = cal.getDateFormatter();
 
         for (let i = 0; i < expected.length; i++) {
@@ -47,11 +47,11 @@
             let ed = cal.createDateTime(expected[i]);
             dump("Expecting instance at " + ed + "(" + fmt.dayName(ed.weekday) + ")\n");
             dump("Recdate:");
-            do_check_eq(recdates[i].icalString, expected[i]);
+            equal(recdates[i].icalString, expected[i]);
 
             // Make sure occurrences are correct
             dump("Occurrence:");
-            do_check_eq(occurrences[i].startDate.icalString, expected[i]);
+            equal(occurrences[i].startDate.icalString, expected[i]);
 
             if (ignoreNextOccCheck) {
                 continue;
@@ -60,25 +60,25 @@
             // Make sure getNextOccurrence works correctly
             let nextOcc = event.recurrenceInfo.getNextOccurrence(recdates[i]);
             if (expected.length > i + 1) {
-                do_check_neq(nextOcc, null);
+                notEqual(nextOcc, null);
                 dump("Checking next occurrence: " + expected[i+1]+"\n");
-                do_check_eq(nextOcc.startDate.icalString, expected[i + 1]);
+                equal(nextOcc.startDate.icalString, expected[i + 1]);
             } else {
                 dump("Expecting no more occurrences, found " +
                         (nextOcc ? nextOcc.startDate : null) + "\n");
-                do_check_eq(nextOcc, null);
+                equal(nextOcc, null);
             }
 
             // Make sure getPreviousOccurrence works correctly
             let prevOcc = event.recurrenceInfo.getPreviousOccurrence(recdates[i]);
             if (i > 0) {
                 dump("Checking previous occurrence: " + expected[i-1]+", found " + (prevOcc ? prevOcc.startDate : prevOcc) + "\n");
-                do_check_neq(prevOcc, null);
-                do_check_eq(prevOcc.startDate.icalString, expected[i - 1]);
+                notEqual(prevOcc, null);
+                equal(prevOcc.startDate.icalString, expected[i - 1]);
             } else {
                 dump("Expecting no previous occurrences, found " +
                         (prevOcc ? prevOcc.startDate : prevOcc) + "\n");
-                do_check_eq(prevOcc, null);
+                equal(prevOcc, null);
             }
         }
 
@@ -268,6 +268,61 @@
                 expectedDates,
                 false);
 
+    // Bug 958974 - Monthly recurrence every WE, FR and the third MO (monthly with more bydays).
+    // Check the occurrences in the first month until the week with the first monday of the rule.
+    check_recur(createEventFromIcalString("BEGIN:VCALENDAR\nBEGIN:VEVENT\n" +
+                                         "DESCRIPTION:Repeat Monthly every Wednesday, Friday and the third Monday\n" +
+                                         "RRULE:FREQ=MONTHLY;COUNT=8;BYDAY=3MO,WE,FR\n" +
+                                         "DTSTART:20150102T080000Z\n" +
+                                         "DTEND:20150102T090000Z\n" +
+                                         "END:VEVENT\nEND:VCALENDAR\n"),
+               ["20150102T080000Z", "20150107T080000Z", "20150109T080000Z",
+                "20150114T080000Z", "20150116T080000Z", "20150119T080000Z",
+                "20150121T080000Z", "20150123T080000Z"],
+               false);
+
+    // Bug 419490 - Monthly recurrence, the fifth Saturday starting from February.
+    // Check a monthly rule that specifies a day that is not part of the month
+    // the events starts in.
+    check_recur(createEventFromIcalString("BEGIN:VCALENDAR\nBEGIN:VEVENT\n" +
+                                         "DESCRIPTION:Repeat Monthly the fifth Saturday\n" +
+                                         "RRULE:FREQ=MONTHLY;COUNT=6;BYDAY=5SA\n" +
+                                         "DTSTART:20150202T080000Z\n" +
+                                         "DTEND:20150202T090000Z\n" +
+                                         "END:VEVENT\nEND:VCALENDAR\n"),
+               ["20150202T080000Z",
+                "20150530T080000Z", "20150829T080000Z", "20151031T080000Z",
+                "20160130T080000Z", "20160430T080000Z", "20160730T080000Z"],
+               false);
+
+    // Bug 419490 - Monthly recurrence, the fifth Wednesday every two months starting from February.
+    // Check a monthly rule that specifies a day that is not part of the month
+    // the events starts in.
+    check_recur(createEventFromIcalString("BEGIN:VCALENDAR\nBEGIN:VEVENT\n" +
+                                         "DESCRIPTION:Repeat Monthly the fifth Friday every two months\n" +
+                                         "RRULE:FREQ=MONTHLY;INTERVAL=2;COUNT=6;BYDAY=5FR\n" +
+                                         "DTSTART:20150202T080000Z\n" +
+                                         "DTEND:20150202T090000Z\n" +
+                                         "END:VEVENT\nEND:VCALENDAR\n"),
+               ["20150202T080000Z",
+                "20151030T080000Z", "20160429T080000Z", "20161230T080000Z",
+                "20170630T080000Z", "20171229T080000Z", "20180629T080000Z"],
+               false);
+
+    // Bugs 419490, 958974 - Monthly recurrence, the 2nd Monday, 5th Wednesday and the 5th to last Saturday every month starting from February.
+    // Check a monthly rule that specifies a day that is not part of the month
+    // the events starts in with positive and negative position along with other byday.
+    check_recur(createEventFromIcalString("BEGIN:VCALENDAR\nBEGIN:VEVENT\n" +
+                                         "DESCRIPTION:Repeat Monthly the 2nd Monday, 5th Wednesday and the 5th to last Saturday every month\n" +
+                                         "RRULE:FREQ=MONTHLY;COUNT=7;BYDAY=2MO,-5WE,5SA\n" +
+                                         "DTSTART:20150401T080000Z\n" +
+                                         "DTEND:20150401T090000Z\n" +
+                                         "END:VEVENT\nEND:VCALENDAR\n"),
+               ["20150401T080000Z",
+                "20150413T080000Z", "20150511T080000Z", "20150530T080000Z",
+                "20150608T080000Z", "20150701T080000Z", "20150713T080000Z"],
+               false);
+
     let item, occ1;
     item = makeEvent("DESCRIPTION:occurrence on day 1 moved between the occurrences " +
                                      "on days 2 and 3\n" +
@@ -335,20 +390,20 @@
     let recdates = item.recurrenceInfo.getOccurrenceDates(start, end, 0, {});
     let occurrences = item.recurrenceInfo.getOccurrences(start, end, 0, {});
 
-    do_check_eq(recdates.length, 3);
-    do_check_eq(occurrences.length, 3);
+    equal(recdates.length, 3);
+    equal(occurrences.length, 3);
 
     recdates = item.recurrenceInfo.getOccurrenceDates(start, end, 2, {});
     occurrences = item.recurrenceInfo.getOccurrences(start, end, 2, {});
 
-    do_check_eq(recdates.length, 2);
-    do_check_eq(occurrences.length, 2);
+    equal(recdates.length, 2);
+    equal(occurrences.length, 2);
 
     recdates = item.recurrenceInfo.getOccurrenceDates(start, end, 9, {});
     occurrences = item.recurrenceInfo.getOccurrences(start, end, 9, {});
 
-    do_check_eq(recdates.length, 3);
-    do_check_eq(occurrences.length, 3);
+    equal(recdates.length, 3);
+    equal(occurrences.length, 3);
 }
 
 function test_clone(event) {
@@ -357,11 +412,11 @@
     let newRecurItems = cloned.getRecurrenceItems({});
 
     // Check number of recurrence items
-    do_check_eq(oldRecurItems.length, newRecurItems.length);
+    equal(oldRecurItems.length, newRecurItems.length);
 
     for (let i = 0; i < oldRecurItems.length; i++) {
         // Check if recurrence item cloned correctly
-        do_check_eq(oldRecurItems[i].icalProperty.icalString,
+        equal(oldRecurItems[i].icalProperty.icalString,
                     newRecurItems[i].icalProperty.icalString);
     }
 }
@@ -374,20 +429,20 @@
                          "RDATE:20020401T114500Z\r\n");
 
     let rinfo = item.recurrenceInfo;
-    do_check_true(compareObjects(rinfo.item, item, Components.interfaces.calIEvent));
+    ok(compareObjects(rinfo.item, item, Components.interfaces.calIEvent));
 
     // getRecurrenceItems
     let ritems = rinfo.getRecurrenceItems({});
-    do_check_eq(ritems.length, 3);
+    equal(ritems.length, 3);
 
     let checkritems = new Map([ [ritem.icalProperty.propertyName, ritem.icalProperty] for (ritem of ritems)]);
     let rparts = new Map([ v.split("=", 2) for (v of checkritems.get("RRULE").value.split(";")) ])
-    do_check_eq(rparts.size, 3);
-    do_check_eq(rparts.get("FREQ"), "WEEKLY");
-    do_check_eq(rparts.get("COUNT"), "6");
-    do_check_eq(rparts.get("BYDAY"), "TU,WE");
-    do_check_eq(checkritems.get("EXDATE").value, "20020403T114500Z");
-    do_check_eq(checkritems.get("RDATE").value, "20020401T114500Z");
+    equal(rparts.size, 3);
+    equal(rparts.get("FREQ"), "WEEKLY");
+    equal(rparts.get("COUNT"), "6");
+    equal(rparts.get("BYDAY"), "TU,WE");
+    equal(checkritems.get("EXDATE").value, "20020403T114500Z");
+    equal(checkritems.get("RDATE").value, "20020401T114500Z");
 
     // setRecurrenceItems
     let newRItems = [cal.createRecurrenceRule(), cal.createRecurrenceDate()];
@@ -401,98 +456,98 @@
     rinfo.setRecurrenceItems(2, newRItems);
     let itemString = item.icalString;
 
-    do_check_eq(itemString.match(/RRULE:[A-Z=,]*FREQ=WEEKLY/), null);
-    do_check_eq(itemString.match(/EXDATE[A-Z;=-]*:20020403T114500Z/, null));
-    do_check_eq(itemString.match(/RDATE[A-Z;=-]*:20020401T114500Z/, null));
-    do_check_neq(itemString.match(/RRULE:[A-Z=,]*FREQ=DAILY/), null)
-    do_check_neq(itemString.match(/EXDATE[A-Z;=-]*:20020404T114500Z/, null));
+    equal(itemString.match(/RRULE:[A-Z=,]*FREQ=WEEKLY/), null);
+    equal(itemString.match(/EXDATE[A-Z;=-]*:20020403T114500Z/, null));
+    equal(itemString.match(/RDATE[A-Z;=-]*:20020401T114500Z/, null));
+    notEqual(itemString.match(/RRULE:[A-Z=,]*FREQ=DAILY/), null)
+    notEqual(itemString.match(/EXDATE[A-Z;=-]*:20020404T114500Z/, null));
 
     // This may be an implementation detail, but we don't want this breaking
     rinfo.wrappedJSObject.ensureSortedRecurrenceRules();
-    do_check_eq(rinfo.wrappedJSObject.mNegativeRules[0].icalProperty.icalString, newRItems[1].icalProperty.icalString);
-    do_check_eq(rinfo.wrappedJSObject.mPositiveRules[0].icalProperty.icalString, newRItems[0].icalProperty.icalString);
+    equal(rinfo.wrappedJSObject.mNegativeRules[0].icalProperty.icalString, newRItems[1].icalProperty.icalString);
+    equal(rinfo.wrappedJSObject.mPositiveRules[0].icalProperty.icalString, newRItems[0].icalProperty.icalString);
 
     // countRecurrenceItems
-    do_check_eq(2, rinfo.countRecurrenceItems());
+    equal(2, rinfo.countRecurrenceItems());
 
     // clearRecurrenceItems
     rinfo.clearRecurrenceItems();
-    do_check_eq(0, rinfo.countRecurrenceItems());
+    equal(0, rinfo.countRecurrenceItems());
 
     // appendRecurrenceItems / getRecurrenceItemAt / insertRecurrenceItemAt
     rinfo.appendRecurrenceItem(ritems[0]);
     rinfo.appendRecurrenceItem(ritems[1]);
     rinfo.insertRecurrenceItemAt(ritems[2], 0);
 
-    do_check_true(compareObjects(ritems[2],
+    ok(compareObjects(ritems[2],
                                  rinfo.getRecurrenceItemAt(0),
                                  Components.interfaces.calIRecurrenceItem));
-    do_check_true(compareObjects(ritems[0],
+    ok(compareObjects(ritems[0],
                                  rinfo.getRecurrenceItemAt(1),
                                  Components.interfaces.calIRecurrenceItem));
-    do_check_true(compareObjects(ritems[1],
+    ok(compareObjects(ritems[1],
                                  rinfo.getRecurrenceItemAt(2),
                                  Components.interfaces.calIRecurrenceItem));
 
 
     // deleteRecurrenceItem
     rinfo.deleteRecurrenceItem(ritems[0]);
-    do_check_true(item.icalString.indexOf("RRULE") < 0);
+    ok(item.icalString.indexOf("RRULE") < 0);
 
     // deleteRecurrenceItemAt
     rinfo.deleteRecurrenceItemAt(1);
     itemString = item.icalString;
-    do_check_true(itemString.indexOf("EXDATE") < 0);
-    do_check_false(itemString.indexOf("RDATE") < 0);
+    ok(itemString.indexOf("EXDATE") < 0);
+    ok(!(itemString.indexOf("RDATE") < 0));
 
     // insertRecurrenceItemAt with exdate
     rinfo.insertRecurrenceItemAt(ritems[1], 1);
-    do_check_true(compareObjects(ritems[1],
+    ok(compareObjects(ritems[1],
                                  rinfo.getRecurrenceItemAt(1),
                                  Components.interfaces.calIRecurrenceItem));
     rinfo.deleteRecurrenceItem(ritems[1]);
 
     // isFinite = true
-    do_check_true(rinfo.isFinite);
+    ok(rinfo.isFinite);
     rinfo.appendRecurrenceItem(ritems[0]);
-    do_check_true(rinfo.isFinite);
+    ok(rinfo.isFinite);
 
     // isFinite = false
     let item2 = makeEvent("DTSTART:20020402T114500Z\n" +
                           "DTEND:20020402T124500Z\n" +
                           "RRULE:FREQ=WEEKLY;BYDAY=TU,WE\n");
-    do_check_false(item2.recurrenceInfo.isFinite);
+    ok(!item2.recurrenceInfo.isFinite);
 
     // removeOccurrenceAt/restoreOccurreceAt
     let occDate1 = cal.createDateTime("20020403T114500Z");
     let occDate2 = cal.createDateTime("20020404T114500Z");
     rinfo.removeOccurrenceAt(occDate1);
-    do_check_false(item.icalString.indexOf("EXDATE") < 0);
+    ok(!(item.icalString.indexOf("EXDATE") < 0));
     rinfo.restoreOccurrenceAt(occDate1)
-    do_check_true(item.icalString.indexOf("EXDATE") < 0);
+    ok(item.icalString.indexOf("EXDATE") < 0);
 
     // modifyException / getExceptionFor
     let occ1 = rinfo.getOccurrenceFor(occDate1);
     occ1.startDate = cal.createDateTime("20020401T114500");
     rinfo.modifyException(occ1, true);
-    do_check_true(rinfo.getExceptionFor(occDate1) != null);
+    ok(rinfo.getExceptionFor(occDate1) != null);
 
     // modifyException immutable
     let occ2 = rinfo.getOccurrenceFor(occDate2);
     occ2.makeImmutable();
     rinfo.modifyException(occ2, true);
-    do_check_true(rinfo.getExceptionFor(occDate2) != null);
+    ok(rinfo.getExceptionFor(occDate2) != null);
 
     // getExceptionIds
     let ids = rinfo.getExceptionIds({});
-    do_check_eq(ids.length, 2);
-    do_check_true(ids[0].compare(occDate1) == 0);
-    do_check_true(ids[1].compare(occDate2) == 0);
+    equal(ids.length, 2);
+    ok(ids[0].compare(occDate1) == 0);
+    ok(ids[1].compare(occDate2) == 0);
 
     // removeExceptionFor
     rinfo.removeExceptionFor(occDate1);
-    do_check_true(rinfo.getExceptionFor(occDate1) == null);
-    do_check_eq(rinfo.getExceptionIds({}).length, 1);
+    ok(rinfo.getExceptionFor(occDate1) == null);
+    equal(rinfo.getExceptionIds({}).length, 1);
 }
 
 function test_rrule_interface() {
@@ -501,37 +556,37 @@
                          "RRULE:INTERVAL=2;FREQ=WEEKLY;COUNT=6;BYDAY=TU,WE\r\n");
 
     let rrule = item.recurrenceInfo.getRecurrenceItemAt(0);
-    do_check_eq(rrule.type, "WEEKLY");
-    do_check_eq(rrule.interval, 2);
-    do_check_eq(rrule.count, 6);
-    do_check_true(rrule.isByCount);
-    do_check_false(rrule.isNegative);
-    do_check_true(rrule.isFinite);
-    do_check_eq(rrule.getComponent("BYDAY", {}).toString(), [3,4].toString());
+    equal(rrule.type, "WEEKLY");
+    equal(rrule.interval, 2);
+    equal(rrule.count, 6);
+    ok(rrule.isByCount);
+    ok(!rrule.isNegative);
+    ok(rrule.isFinite);
+    equal(rrule.getComponent("BYDAY", {}).toString(), [3,4].toString());
 
     // Now start changing things
     rrule.setComponent("BYDAY", 2, [4,5]);
-    do_check_eq(rrule.icalString.match(/BYDAY=WE,TH/), "BYDAY=WE,TH");
+    equal(rrule.icalString.match(/BYDAY=WE,TH/), "BYDAY=WE,TH");
 
     rrule.count = -1;
-    do_check_false(rrule.isByCount);
-    do_check_false(rrule.isFinite);
-    do_check_eq(rrule.icalString.match(/COUNT=/), null);
-    do_check_throws(function() {
+    ok(!rrule.isByCount);
+    ok(!rrule.isFinite);
+    equal(rrule.icalString.match(/COUNT=/), null);
+    throws(function() {
         rrule.count;
-    }, Components.results.NS_ERROR_FAILURE);
+    }, /0x80004005/);
 
     rrule.interval = 1;
-    do_check_eq(rrule.interval, 1);
-    do_check_eq(rrule.icalString.match(/INTERVAL=/), null);
+    equal(rrule.interval, 1);
+    equal(rrule.icalString.match(/INTERVAL=/), null);
 
     rrule.interval = 3;
-    do_check_eq(rrule.interval, 3);
-    do_check_eq(rrule.icalString.match(/INTERVAL=3/), "INTERVAL=3");
+    equal(rrule.interval, 3);
+    equal(rrule.icalString.match(/INTERVAL=3/), "INTERVAL=3");
 
     rrule.type = "MONTHLY";
-    do_check_eq(rrule.type, "MONTHLY");
-    do_check_eq(rrule.icalString.match(/FREQ=MONTHLY/), "FREQ=MONTHLY");
+    equal(rrule.type, "MONTHLY");
+    equal(rrule.icalString.match(/FREQ=MONTHLY/), "FREQ=MONTHLY");
 }
 
 function test_startdate_change() {
@@ -563,19 +618,19 @@
     item = makeRecEvent("RDATE:20020403T114500Z\r\n");
     changeBy(item, "PT1H");
     ritem = item.recurrenceInfo.getRecurrenceItemAt(0);
-    do_check_eq(ritem.date.icalString, "20020403T124500Z");
+    equal(ritem.date.icalString, "20020403T124500Z");
 
     // Event with an exdate
     item = makeRecEvent("EXDATE:20020403T114500Z\r\n");
     changeBy(item, "PT1H");
     ritem = item.recurrenceInfo.getRecurrenceItemAt(0);
-    do_check_eq(ritem.date.icalString, "20020403T124500Z");
+    equal(ritem.date.icalString, "20020403T124500Z");
 
     // Event with an rrule with until date
     item = makeRecEvent("RRULE:FREQ=WEEKLY;UNTIL=20020406T114500Z\r\n");
     changeBy(item, "PT1H");
     ritem = item.recurrenceInfo.getRecurrenceItemAt(0);
-    do_check_eq(ritem.untilDate.icalString, "20020406T124500Z");
+    equal(ritem.untilDate.icalString, "20020406T124500Z");
 
     // Event with an exception item
     item = makeRecEvent("RRULE:FREQ=DAILY\r\n");
@@ -583,9 +638,9 @@
     occ.startDate = cal.createDateTime("20020406T124500Z");
     item.recurrenceInfo.modifyException(occ, true);
     changeBy(item, "PT1H");
-    do_check_eq(item.startDate.icalString, "20020402T124500Z");
+    equal(item.startDate.icalString, "20020402T124500Z");
     occ = item.recurrenceInfo.getExceptionFor(cal.createDateTime("20020406T124500Z"));
-    do_check_eq(occ.startDate.icalString, "20020406T134500Z");
+    equal(occ.startDate.icalString, "20020406T134500Z");
 }
 
 function test_idchange() {
@@ -596,12 +651,12 @@
     let occ = item.recurrenceInfo.getOccurrenceFor(cal.createDateTime("20020406T114500Z"));
     occ.startDate = cal.createDateTime("20020406T124500Z");
     item.recurrenceInfo.modifyException(occ, true);
-    do_check_eq(occ.id, "unchanged");
+    equal(occ.id, "unchanged");
 
     item.id = "changed";
 
     occ = item.recurrenceInfo.getExceptionFor(cal.createDateTime("20020406T114500Z"));
-    do_check_eq(occ.id , "changed");
+    equal(occ.id , "changed");
 }
 
 function test_failures() {
@@ -611,26 +666,26 @@
     let rinfo = item.recurrenceInfo;
     let ritem = cal.createRecurrenceDate();
 
-    do_check_throws(function() rinfo.getRecurrenceItemAt(-1), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() rinfo.getRecurrenceItemAt(1), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() rinfo.deleteRecurrenceItemAt(-1), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() rinfo.deleteRecurrenceItemAt(1), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() rinfo.deleteRecurrenceItem(ritem), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() rinfo.insertRecurrenceItemAt(ritem, -1), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() rinfo.insertRecurrenceItemAt(ritem, 2), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() rinfo.restoreOccurrenceAt(cal.createDateTime("20080101T010101")), Cr.NS_ERROR_INVALID_ARG);
-    do_check_throws(function() cal.createRecurrenceInfo().isFinite, Cr.NS_ERROR_NOT_INITIALIZED);
+    throws(function() rinfo.getRecurrenceItemAt(-1), /Illegal value/, "Invalid Argument");
+    throws(function() rinfo.getRecurrenceItemAt(1), /Illegal value/, "Invalid Argument");
+    throws(function() rinfo.deleteRecurrenceItemAt(-1), /Illegal value/, "Invalid Argument");
+    throws(function() rinfo.deleteRecurrenceItemAt(1), /Illegal value/, "Invalid Argument");
+    throws(function() rinfo.deleteRecurrenceItem(ritem), /Illegal value/, "Invalid Argument");
+    throws(function() rinfo.insertRecurrenceItemAt(ritem, -1), /Illegal value/, "Invalid Argument");
+    throws(function() rinfo.insertRecurrenceItemAt(ritem, 2), /Illegal value/, "Invalid Argument");
+    throws(function() rinfo.restoreOccurrenceAt(cal.createDateTime("20080101T010101")), /Illegal value/, "Invalid Argument");
+    throws(function() cal.createRecurrenceInfo().isFinite, /Component not initialized/);
 
     // modifyException with a different parent item
     let occ = rinfo.getOccurrenceFor(cal.createDateTime("20120102T114500Z"));
     occ.calendar = {}
     occ.id = "1234";
     occ.parentItem = occ;
-    do_check_throws(function() rinfo.modifyException(occ, true), Cr.NS_ERROR_INVALID_ARG);
+    throws(function() rinfo.modifyException(occ, true), /Illegal value/, "Invalid Argument");
 
     occ = rinfo.getOccurrenceFor(cal.createDateTime("20120102T114500Z"));
     occ.recurrenceId = null;
-    do_check_throws(function() rinfo.modifyException(occ, true), Cr.NS_ERROR_INVALID_ARG);
+    throws(function() rinfo.modifyException(occ, true), /Illegal value/, "Invalid Argument");
 
     // Missing DTSTART/DUE but RRULE
     item = createEventFromIcalString("BEGIN:VCALENDAR\r\n" +
@@ -640,7 +695,7 @@
         "END:VCALENDAR\r\n"
     );
     rinfo = item.recurrenceInfo;
-    do_check_eq(rinfo.getOccurrenceDates(cal.createDateTime("20120101T010101"),
+    equal(rinfo.getOccurrenceDates(cal.createDateTime("20120101T010101"),
                                          cal.createDateTime("20120203T010101"),
                                          0, {}).length, 0);
 }
@@ -652,12 +707,12 @@
         "END:VTODO\r\n" +
         "END:VCALENDAR\r\n"
     );
-    do_check_true(item.recurrenceInfo.isMutable);
+    ok(item.recurrenceInfo.isMutable);
     let rinfo2 = item.recurrenceInfo.clone();
     rinfo2.makeImmutable();
     rinfo2.makeImmutable(); // Doing so twice shouldn't throw
-    do_check_throws(function() rinfo2.appendRecurrenceItem(ritem), Cr.NS_ERROR_OBJECT_IS_IMMUTABLE);
-    do_check_false(rinfo2.isMutable);
+    throws(function() rinfo2.appendRecurrenceItem(ritem), /Can not modify immutable data container/);
+    ok(!rinfo2.isMutable);
 
     let ritem = cal.createRecurrenceDate();
     rinfo.appenRecurrenceItem(ritem);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_relation.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_relation.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_relation.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_relation.js	2015-02-28 15:02:41.000000000 +0000
@@ -18,7 +18,7 @@
 
     for (let [property, value] in Iterator(properties)) {
         r1[property] = value;
-        do_check_eq(r1[property], value);
+        equal(r1[property], value);
     }
 
     // Add relation to event
@@ -44,17 +44,17 @@
 function checkRelations(event, expRel) {
     let countObj = {};
     let allRel = event.getRelations(countObj);
-    do_check_eq(countObj.value, allRel.length);
-    do_check_eq(allRel.length, expRel.length);
+    equal(countObj.value, allRel.length);
+    equal(allRel.length, expRel.length);
 
     // check if all expacted relations are found
     for (let i = 0; i < expRel.length; i++) {
-        do_check_neq(allRel.indexOf(expRel[i]), -1);
+        notEqual(allRel.indexOf(expRel[i]), -1);
     }
 
     // Check if all found relations are expected
     for (let i = 0; i < allRel.length; i++) {
-        do_check_neq(expRel.indexOf(allRel[i]), -1);
+        notEqual(expRel.indexOf(allRel[i]), -1);
     }
 }
 
@@ -64,17 +64,17 @@
 
     // modify the properties
     rel.relType = "SIBLING";
-    do_check_eq(rel.relType, "SIBLING");
-    do_check_eq(rel.relType, allRel[0].relType);
+    equal(rel.relType, "SIBLING");
+    equal(rel.relType, allRel[0].relType);
 
     // remove one relation
     event.removeRelation(rel);
-    do_check_eq(event.getRelations({}).length, oldRel.length - 1);
+    equal(event.getRelations({}).length, oldRel.length - 1);
 
     // add one relation and remove all relations
     event.addRelation(oldRel[0]);
     event.removeAllRelations();
-    do_check_eq(event.getRelations({}), 0);
+    equal(event.getRelations({}), 0);
 }
 
 function test_icalprop() {
@@ -87,41 +87,41 @@
     let prop = rel.icalProperty;
     let propOrig = rel.icalProperty;
 
-    do_check_eq(rel.icalString, prop.icalString);
+    equal(rel.icalString, prop.icalString);
 
-    do_check_eq(prop.value, "value");
-    do_check_eq(prop.getParameter("X-PROP"), "VAL");
-    do_check_eq(prop.getParameter("RELTYPE"), "SIBLING");
+    equal(prop.value, "value");
+    equal(prop.getParameter("X-PROP"), "VAL");
+    equal(prop.getParameter("RELTYPE"), "SIBLING");
 
     prop.value = "changed";
     prop.setParameter("RELTYPE", "changedtype");
     prop.setParameter("X-PROP", "changedxprop");
 
-    do_check_eq(rel.relId, "value");
-    do_check_eq(rel.getParameter("X-PROP"), "VAL");
-    do_check_eq(rel.relType, "SIBLING");
+    equal(rel.relId, "value");
+    equal(rel.getParameter("X-PROP"), "VAL");
+    equal(rel.relType, "SIBLING");
 
     rel.icalProperty = prop;
 
-    do_check_eq(rel.relId, "changed");
-    do_check_eq(rel.getParameter("X-PROP"), "changedxprop");
-    do_check_eq(rel.relType, "changedtype");
+    equal(rel.relId, "changed");
+    equal(rel.getParameter("X-PROP"), "changedxprop");
+    equal(rel.relType, "changedtype");
 
     rel.icalString = propOrig.icalString;
 
-    do_check_eq(rel.relId, "value");
-    do_check_eq(rel.getParameter("X-PROP"), "VAL");
-    do_check_eq(rel.relType, "SIBLING");
+    equal(rel.relId, "value");
+    equal(rel.getParameter("X-PROP"), "VAL");
+    equal(rel.relType, "SIBLING");
 
     let rel2 = rel.clone();
     rel.icalProperty = prop;
 
-    do_check_neq(rel.icalString, rel2.icalString);
+    notEqual(rel.icalString, rel2.icalString);
 
     rel.deleteParameter("X-PROP");
-    do_check_eq(rel.icalProperty.getParameter("X-PROP"), null);
+    equal(rel.icalProperty.getParameter("X-PROP"), null);
 
-    do_check_throws(function() {
+    throws(function() {
         rel.icalString = "X-UNKNOWN:value";
-    }, Components.results.NS_ERROR_ILLEGAL_VALUE);
+    }, /Illegal value/);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_rfc3339_parser.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_rfc3339_parser.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_rfc3339_parser.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_rfc3339_parser.js	2015-02-28 15:02:41.000000000 +0000
@@ -39,9 +39,9 @@
             // Object comparison fails with ical.js, and we only want to check
             // that we have the right timezone.
             if (prop == "timezone")
-                do_check_eq(dateTime[prop].tzid, expectedDateProps[prop].tzid)
+                equal(dateTime[prop].tzid, expectedDateProps[prop].tzid)
             else
-                do_check_eq(dateTime[prop], expectedDateProps[prop]);
+                equal(dateTime[prop], expectedDateProps[prop]);
         }
 
         // Test round tripping that dateTime object back to an RFC 3339 string.
@@ -50,7 +50,7 @@
         // In theory this should just match the input RFC 3339 date, but there are
         // multiple ways of generating the same time, e.g. 2006-03-14Z is
         // equivalent to 2006-03-14.
-        do_check_eq(rfc3339Date, aExpectedRfc3339Date);
+        equal(rfc3339Date, aExpectedRfc3339Date);
     }
 
     /*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_search_service.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_search_service.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_search_service.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_search_service.js	2015-02-28 15:02:41.000000000 +0000
@@ -17,7 +17,7 @@
 function test_found() {
     search.getProviders({}).forEach(search.removeProvider, search);
 
-    do_check_eq(search.getProviders({}).length, 0);
+    equal(search.getProviders({}).length, 0);
 
     let provider1 = {
         id: 1,
@@ -28,12 +28,12 @@
         id: 2,
         called: false,
         searchForCalendars: function(aStr, aHint, aMax, aListener) {
-            do_check_false(this.called)
+            ok(!this.called)
             this.called = true;
 
-            do_check_eq(aStr, "str");
-            do_check_eq(aHint, HINT_EXACT_MATCH);
-            do_check_eq(aMax, 0);
+            equal(aStr, "str");
+            equal(aHint, HINT_EXACT_MATCH);
+            equal(aMax, 0);
 
             let mockCalendar = {
                 id: "test"
@@ -45,28 +45,28 @@
     provider2.wrappedJSObject = provider2;
 
     search.addProvider(provider1);
-    do_check_eq(search.getProviders({}).length, 1);
+    equal(search.getProviders({}).length, 1);
     search.addProvider(provider2);
-    do_check_eq(search.getProviders({}).length, 2);
+    equal(search.getProviders({}).length, 2);
     search.removeProvider(provider1);
-    do_check_eq(search.getProviders({}).length, 1);
-    do_check_eq(search.getProviders({})[0].wrappedJSObject.id, 2);
+    equal(search.getProviders({}).length, 1);
+    equal(search.getProviders({})[0].wrappedJSObject.id, 2);
 
     let listener = {
         called: false,
         onResult: function(request, result) {
-            do_check_false(this.called);
+            ok(!this.called);
             this.called = true;
 
-            do_check_eq(result.length, 1);
-            do_check_eq(result[0].id, "test");
+            equal(result.length, 1);
+            equal(result[0].id, "test");
 
         }
     };
 
     let op = search.searchForCalendars("str", HINT_EXACT_MATCH, 0, listener);
-    do_check_true(listener.called);
-    do_check_true(provider2.called);
+    ok(listener.called);
+    ok(provider2.called);
 }
 
 function test_failure() {
@@ -81,16 +81,16 @@
     let listener = {
         called: false,
         onResult: function(request, result) {
-            do_check_false(this.called);
+            ok(!this.called);
             this.called = true;
-            do_check_eq(result.length, 0);
+            equal(result.length, 0);
         }
     };
 
     search.addProvider(provider);
 
     let op = search.searchForCalendars("str", HINT_EXACT_MATCH, 0, listener);
-    do_check_true(listener.called);
+    ok(listener.called);
 }
 
 function test_cancel() {
@@ -121,10 +121,10 @@
     let listener = {
         called: false,
         onResult: function(request, result) {
-            do_check_eq(result, null);
+            equal(result, null);
 
             // If an exception occurs, the operation is not added to the opgroup
-            do_check_false(provider.cancelCalled);
+            ok(!provider.cancelCalled);
             do_test_finished();
         }
     };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_startup_service.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_startup_service.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_startup_service.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_startup_service.js	2015-02-28 15:02:41.000000000 +0000
@@ -12,14 +12,14 @@
             aListener.onResult(null, Cr.NS_OK);
         },
         shutdown: function(aListener) {
-            do_check_true(this.canStop);
+            ok(this.canStop);
             aListener.onResult(null, Cr.NS_OK);
         }
     };
 
     let second = {
         startup: function(aListener) {
-            do_check_true(this.canStart);
+            ok(this.canStart);
             aListener.onResult(null, Cr.NS_OK);
         },
         shutdown: function(aListener) {
@@ -39,9 +39,9 @@
 
     // Pretend a startup run
     ssvc.observe(null, "profile-after-change", null);
-    do_check_true(second.canStart);
+    ok(second.canStart);
 
     // Pretend a stop run
     ssvc.observe(null, "profile-before-change", null);
-    do_check_true(first.canStop);
+    ok(first.canStop);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_storage.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_storage.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_storage.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_storage.js	2015-02-28 15:02:41.000000000 +0000
@@ -38,52 +38,52 @@
             let item = items[0];
 
             // Check start date
-            do_check_eq(item.startDate.compare(cal.createDateTime("20120101T010101Z")), 0);
+            equal(item.startDate.compare(cal.createDateTime("20120101T010101Z")), 0);
 
             // Check attachment
             let attaches = item.getAttachments({});
             let attach = attaches[0];
-            do_check_eq(attaches.length, 1);
-            do_check_eq(attach.uri.spec, "http://example.com/test.ics");
-            do_check_eq(attach.formatType, "text/calendar");
-            do_check_eq(attach.encoding, "BASE64");
-            do_check_eq(attach.getParameter("FILENAME"), "test.ics");
+            equal(attaches.length, 1);
+            equal(attach.uri.spec, "http://example.com/test.ics");
+            equal(attach.formatType, "text/calendar");
+            equal(attach.encoding, "BASE64");
+            equal(attach.getParameter("FILENAME"), "test.ics");
 
             // Check attendee
             let attendees = item.getAttendees({});
             let attendee = attendees[0];
-            do_check_eq(attendees.length, 1);
-            do_check_eq(attendee.id, "mailto:test@example.com");
-            do_check_eq(attendee.commonName, "Name");
-            do_check_eq(attendee.rsvp, "TRUE");
-            do_check_eq(attendee.isOrganizer, false);
-            do_check_eq(attendee.role, "REQ-PARTICIPANT");
-            do_check_eq(attendee.participationStatus, "ACCEPTED");
-            do_check_eq(attendee.userType, "INDIVIDUAL");
-            do_check_eq(attendee.getProperty("X-THING"), "BAR");
+            equal(attendees.length, 1);
+            equal(attendee.id, "mailto:test@example.com");
+            equal(attendee.commonName, "Name");
+            equal(attendee.rsvp, "TRUE");
+            equal(attendee.isOrganizer, false);
+            equal(attendee.role, "REQ-PARTICIPANT");
+            equal(attendee.participationStatus, "ACCEPTED");
+            equal(attendee.userType, "INDIVIDUAL");
+            equal(attendee.getProperty("X-THING"), "BAR");
 
             // Check relation
             let relations = item.getRelations({});
             let rel = relations[0];
-            do_check_eq(relations.length, 1);
-            do_check_eq(rel.relType, "SIBLING");
-            do_check_eq(rel.relId, "VALUE");
-            do_check_eq(rel.getParameter("FOO"), "BAR");
+            equal(relations.length, 1);
+            equal(rel.relType, "SIBLING");
+            equal(rel.relId, "VALUE");
+            equal(rel.getParameter("FOO"), "BAR");
 
             // Check recurrence item
             for each (let ritem in item.recurrenceInfo.getRecurrenceItems({})) {
                 if (ritem instanceof Components.interfaces.calIRecurrenceRule) {
-                    do_check_eq(ritem.type, "MONTHLY");
-                    do_check_eq(ritem.interval, 2);
-                    do_check_eq(ritem.count, 5);
-                    do_check_eq(ritem.isByCount, true);
-                    do_check_eq(ritem.getComponent("BYDAY", {}).toString(), [2].toString());
-                    do_check_eq(ritem.isNegative, false);
+                    equal(ritem.type, "MONTHLY");
+                    equal(ritem.interval, 2);
+                    equal(ritem.count, 5);
+                    equal(ritem.isByCount, true);
+                    equal(ritem.getComponent("BYDAY", {}).toString(), [2].toString());
+                    equal(ritem.isNegative, false);
                 } else if (ritem instanceof Components.interfaces.calIRecurrenceDate) {
                     if (ritem.isNegative) {
-                        do_check_eq(ritem.date.compare(cal.createDateTime("20120301T010101Z")), 0);
+                        equal(ritem.date.compare(cal.createDateTime("20120301T010101Z")), 0);
                     } else {
-                        do_check_eq(ritem.date.compare(cal.createDateTime("20120201T010101Z")), 0);
+                        equal(ritem.date.compare(cal.createDateTime("20120201T010101Z")), 0);
                     }
                 } else {
                     do_throw("Found unknown recurrence item " + ritem);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_timezone.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_timezone.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_timezone.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_timezone.js	2015-02-28 15:02:41.000000000 +0000
@@ -67,6 +67,6 @@
 
     g.timezone = tzs.getTimezone(g.timezone.tzid);
     h.timezone = tzs.getTimezone(h.timezone.tzid);
-    do_check_neq(strTz,g.timezone.toString());
+    notEqual(strTz,g.timezone.toString());
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_utils.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_utils.js	2015-02-28 15:02:41.000000000 +0000
@@ -27,53 +27,53 @@
     let oldDefaultTz = Preferences.get("calendar.timezone.local", "");
     Preferences.set("calendar.timezone.local", "floating");
 
-    do_check_eq(cal.getRecentTimezones().length, 0);
-    do_check_eq(cal.getRecentTimezones(true).length, 0);
+    equal(cal.getRecentTimezones().length, 0);
+    equal(cal.getRecentTimezones(true).length, 0);
 
     cal.saveRecentTimezone("Europe/Berlin");
 
     let zones = cal.getRecentTimezones();
-    do_check_eq(zones.length, 1);
-    do_check_eq(zones[0], "Europe/Berlin");
+    equal(zones.length, 1);
+    equal(zones[0], "Europe/Berlin");
     zones = cal.getRecentTimezones(true);
-    do_check_eq(zones.length, 1);
-    do_check_eq(zones[0].tzid, "Europe/Berlin");
+    equal(zones.length, 1);
+    equal(zones[0].tzid, "Europe/Berlin");
 
     cal.saveRecentTimezone(cal.calendarDefaultTimezone().tzid);
-    do_check_eq(cal.getRecentTimezones().length, 1);
-    do_check_eq(cal.getRecentTimezones(true).length, 1);
+    equal(cal.getRecentTimezones().length, 1);
+    equal(cal.getRecentTimezones(true).length, 1);
 
     cal.saveRecentTimezone("Europe/Berlin");
-    do_check_eq(cal.getRecentTimezones().length, 1);
-    do_check_eq(cal.getRecentTimezones(true).length, 1);
+    equal(cal.getRecentTimezones().length, 1);
+    equal(cal.getRecentTimezones(true).length, 1);
 
     cal.saveRecentTimezone("America/New_York");
-    do_check_eq(cal.getRecentTimezones().length, 2);
-    do_check_eq(cal.getRecentTimezones(true).length, 2);
+    equal(cal.getRecentTimezones().length, 2);
+    equal(cal.getRecentTimezones(true).length, 2);
 
     cal.saveRecentTimezone("Unknown");
-    do_check_eq(cal.getRecentTimezones().length, 3);
-    do_check_eq(cal.getRecentTimezones(true).length, 2);
+    equal(cal.getRecentTimezones().length, 3);
+    equal(cal.getRecentTimezones(true).length, 2);
 
     Preferences.set("calendar.timezone.local", oldDefaultTz);
 }
 
 function test_formatcss() {
-    do_check_eq(cal.formatStringForCSSRule(" "), "_");
-    do_check_eq(cal.formatStringForCSSRule("ü"), "-uxfc-");
-    do_check_eq(cal.formatStringForCSSRule("a"), "a");
+    equal(cal.formatStringForCSSRule(" "), "_");
+    equal(cal.formatStringForCSSRule("ü"), "-uxfc-");
+    equal(cal.formatStringForCSSRule("a"), "a");
 }
 
 function test_attendeeMatchesAddresses() {
     let a = cal.createAttendee("ATTENDEE:mailto:horst");
-    do_check_true(cal.attendeeMatchesAddresses(a, ["HORST", "peter"]));
-    do_check_false(cal.attendeeMatchesAddresses(a, ["HORSTpeter", "peter"]));
-    do_check_false(cal.attendeeMatchesAddresses(a, ["peter"]));
+    ok(cal.attendeeMatchesAddresses(a, ["HORST", "peter"]));
+    ok(!cal.attendeeMatchesAddresses(a, ["HORSTpeter", "peter"]));
+    ok(!cal.attendeeMatchesAddresses(a, ["peter"]));
 
     a = cal.createAttendee("ATTENDEE;EMAIL=\"horst\":urn:uuid:horst");
-    do_check_true(cal.attendeeMatchesAddresses(a, ["HORST", "peter"]));
-    do_check_false(cal.attendeeMatchesAddresses(a, ["HORSTpeter", "peter"]));
-    do_check_false(cal.attendeeMatchesAddresses(a, ["peter"]));
+    ok(cal.attendeeMatchesAddresses(a, ["HORST", "peter"]));
+    ok(!cal.attendeeMatchesAddresses(a, ["HORSTpeter", "peter"]));
+    ok(!cal.attendeeMatchesAddresses(a, ["peter"]));
 }
 
 function test_getDefaultStartDate() {
@@ -91,40 +91,40 @@
     dump("TT: " + cal.createDateTime("20120101T000000") + "\n");
     dump("TT: " + cal.getDefaultStartDate(cal.createDateTime("20120101T000000")) + "\n");
 
-    do_check_eq(tt("20120101T000000").icalString, "20120101T010000");
-    do_check_eq(tt("20120101T015959").icalString, "20120101T020000");
-    do_check_eq(tt("20120101T230000").icalString, "20120101T230000");
-    do_check_eq(tt("20120101T235959").icalString, "20120101T230000");
-
-    do_check_eq(tt("20120101T000000", "20120202").icalString, "20120202T010000");
-    do_check_eq(tt("20120101T015959", "20120202").icalString, "20120202T020000");
-    do_check_eq(tt("20120101T230000", "20120202").icalString, "20120202T230000");
-    do_check_eq(tt("20120101T235959", "20120202").icalString, "20120202T230000");
+    equal(tt("20120101T000000").icalString, "20120101T010000");
+    equal(tt("20120101T015959").icalString, "20120101T020000");
+    equal(tt("20120101T230000").icalString, "20120101T230000");
+    equal(tt("20120101T235959").icalString, "20120101T230000");
+
+    equal(tt("20120101T000000", "20120202").icalString, "20120202T010000");
+    equal(tt("20120101T015959", "20120202").icalString, "20120202T020000");
+    equal(tt("20120101T230000", "20120202").icalString, "20120202T230000");
+    equal(tt("20120101T235959", "20120202").icalString, "20120202T230000");
 
     let event = cal.createEvent();
     now = cal.createDateTime("20120101T015959");
     cal.setDefaultStartEndHour(event, cal.createDateTime("20120202"));
-    do_check_eq(event.startDate.icalString, "20120202T020000");
-    do_check_eq(event.endDate.icalString, "20120202T030000");
+    equal(event.startDate.icalString, "20120202T020000");
+    equal(event.endDate.icalString, "20120202T030000");
 
     let todo = cal.createTodo();
     now = cal.createDateTime("20120101T000000");
     cal.setDefaultStartEndHour(todo, cal.createDateTime("20120202"));
-    do_check_eq(todo.entryDate.icalString, "20120202T010000");
+    equal(todo.entryDate.icalString, "20120202T010000");
 
     cal.now = oldNow;
 }
 
 function test_getStartEndProps() {
-    do_check_eq(cal.calGetStartDateProp(cal.createEvent()), "startDate");
-    do_check_eq(cal.calGetEndDateProp(cal.createEvent()), "endDate");
-    do_check_eq(cal.calGetStartDateProp(cal.createTodo()), "entryDate");
-    do_check_eq(cal.calGetEndDateProp(cal.createTodo()), "dueDate");
-
-    do_check_throws(function() cal.calGetStartDateProp(null),
-                    Components.results.NS_ERROR_NOT_IMPLEMENTED);
-    do_check_throws(function() cal.calGetEndDateProp(null),
-                    Components.results.NS_ERROR_NOT_IMPLEMENTED);
+    equal(cal.calGetStartDateProp(cal.createEvent()), "startDate");
+    equal(cal.calGetEndDateProp(cal.createEvent()), "endDate");
+    equal(cal.calGetStartDateProp(cal.createTodo()), "entryDate");
+    equal(cal.calGetEndDateProp(cal.createTodo()), "dueDate");
+
+    throws(function() cal.calGetStartDateProp(null),
+                    /2147500033/);
+   throws(function() cal.calGetEndDateProp(null),
+                    /2147500033/);
 }
 
 function test_calOperationGroup() {
@@ -133,18 +133,18 @@
 
     let group = new cal.calOperationGroup(cancelFunc);
 
-    do_check_true(group.isEmpty);
-    do_check_eq(group.id, cal.calOperationGroup.mOpGroupPrefix + "0");
-    do_check_eq(group.status, Components.results.NS_OK);
-    do_check_eq(group.isPending, true);
+    ok(group.isEmpty);
+    equal(group.id, cal.calOperationGroup.mOpGroupPrefix + "0");
+    equal(group.status, Components.results.NS_OK);
+    equal(group.isPending, true);
 
     let completedOp = {
         isPending: false
     };
 
     group.add(completedOp);
-    do_check_true(group.isEmpty);
-    do_check_eq(group.isPending, true);
+    ok(group.isEmpty);
+    equal(group.isPending, true);
 
     let pendingOp1 = {
         id: 1,
@@ -153,8 +153,8 @@
     };
 
     group.add(pendingOp1);
-    do_check_false(group.isEmpty);
-    do_check_eq(group.isPending, true);
+    ok(!group.isEmpty);
+    equal(group.isPending, true);
 
     let pendingOp2 = {
         id: 2,
@@ -164,33 +164,33 @@
 
     group.add(pendingOp2);
     group.remove(pendingOp1);
-    do_check_false(group.isEmpty);
-    do_check_eq(group.isPending, true);
+    ok(!group.isEmpty);
+    equal(group.isPending, true);
 
     group.cancel();
 
-    do_check_eq(group.status, Components.interfaces.calIErrors.OPERATION_CANCELLED);
-    do_check_false(group.isPending);
-    do_check_true(cancelCalled);
-    do_check_true(pendingOp2.cancelCalled);
+    equal(group.status, Components.interfaces.calIErrors.OPERATION_CANCELLED);
+    ok(!group.isPending);
+    ok(cancelCalled);
+    ok(pendingOp2.cancelCalled);
 }
 
 function test_sameDay() {
     let dt = cal.createDateTime;
 
-    do_check_true(cal.sameDay(dt("20120101"), dt("20120101T120000")));
-    do_check_true(cal.sameDay(dt("20120101"), dt("20120101")));
-    do_check_false(cal.sameDay(dt("20120101"), dt("20120102")));
-    do_check_false(cal.sameDay(dt("20120101T120000"), dt("20120102T120000")));
+    ok(cal.sameDay(dt("20120101"), dt("20120101T120000")));
+    ok(cal.sameDay(dt("20120101"), dt("20120101")));
+    ok(!cal.sameDay(dt("20120101"), dt("20120102")));
+    ok(!cal.sameDay(dt("20120101T120000"), dt("20120102T120000")));
 }
 
 function test_binarySearch() {
     let arr = [2, 5, 7, 9, 20, 27, 34, 39, 41, 53, 62];
-    do_check_eq(binarySearch(arr, 27), 5); // Center
-    do_check_eq(binarySearch(arr, 2), 0); // Left most
-    do_check_eq(binarySearch(arr, 62), 11); // Right most
-
-    do_check_eq(binarySearch([5], 5), 1) // One element found
-    do_check_eq(binarySearch([1], 0), 0) // One element insert left
-    do_check_eq(binarySearch([1], 2), 1) // One element insert right
+    equal(binarySearch(arr, 27), 5); // Center
+    equal(binarySearch(arr, 2), 0); // Left most
+    equal(binarySearch(arr, 62), 11); // Right most
+
+    equal(binarySearch([5], 5), 1) // One element found
+    equal(binarySearch([1], 0), 0) // One element insert left
+    equal(binarySearch([1], 2), 1) // One element insert right
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_webcal.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_webcal.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/test/unit/test_webcal.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/test/unit/test_webcal.js	2015-02-28 15:02:41.000000000 +0000
@@ -11,7 +11,7 @@
     httpserv.registerPrefixHandler("/", {
         handle: function(request, response) {
           response.setStatusLine(request.httpVersion, 200, "OK");
-          do_check_eq(request.path, "/test_webcal");
+          equal(request.path, "/test_webcal");
         }
     });
     httpserv.start(-1);
@@ -29,7 +29,7 @@
 function check_webcal_uri(uri) {
     let chan = Services.io.newChannel(uri, null, null);
     NetUtil.asyncFetch(chan, function(data, status, request) {
-        do_check_true(Components.isSuccessCode(status));
+        ok(Components.isSuccessCode(status));
         run_next_test();
     });
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/config/version.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/config/version.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/config/version.txt	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/config/version.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-1.2014b
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/install.rdf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/install.rdf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/install.rdf	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/install.rdf	2015-02-28 15:02:41.000000000 +0000
@@ -17,7 +17,7 @@
       <Description>
         <!-- Thunderbird -->
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>2.0</em:minVersion>
+        <em:minVersion>38.0a1</em:minVersion>
         <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -25,7 +25,7 @@
       <Description>
         <!-- Seamonkey -->
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.0</em:minVersion>
+        <em:minVersion>2.35a1</em:minVersion>
         <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
        </Description>
      </em:targetApplication>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/Makefile.in	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/Makefile.in	2015-02-28 15:02:41.000000000 +0000
@@ -4,17 +4,12 @@
 
 USE_EXTENSION_MANIFEST = 1
 DIST_FILES = install.rdf
-XPI_PKGNAME = calendar-timezones
-
-ifndef DISABLE_LIGHTNING_INSTALL
-# install as a global extension in dist/bin/extensions/
-INSTALL_EXTENSION_ID = calendar-timezones@mozilla.org
-endif
+XPI_PKGNAME = calendar-timezones-$(TIMEZONES_VERSION)
 
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 CALENDAR_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
-TIMEZONES_VERSION := $(shell cat $(srcdir)/config/version.txt)
+TIMEZONES_VERSION := $(shell $(PYTHON) $(srcdir)/version.py)
 
 DEFINES += -DAB_CD=$(AB_CD) \
            -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
@@ -23,9 +18,6 @@
            -DTIMEZONES_VERSION=$(TIMEZONES_VERSION) \
            $(NULL)
 
-libs::
-	$(NSINSTALL) -m 0644 zones.json $(FINAL_TARGET)/timezones
-
 libs-%:
 	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=calendar-timezones USE_EXTENSION_MANIFEST=1
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/moz.build	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/moz.build	2015-02-28 15:02:41.000000000 +0000
@@ -14,3 +14,6 @@
     'defaults/preferences.js',
 ]
 
+FINAL_TARGET_FILES.timezones += [
+    'zones.json'
+]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/version.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/version.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/calendar/timezones/version.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/calendar/timezones/version.py	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/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/.
+import json, os.path
+
+json_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "zones.json")
+
+with open(json_file, "r") as fp:
+    data = json.load(fp)
+    print data["version"]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/components/public/prplIConversation.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/components/public/prplIConversation.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/components/public/prplIConversation.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/components/public/prplIConversation.idl	2015-02-28 15:02:41.000000000 +0000
@@ -19,7 +19,7 @@
  * This is the XPCOM purple conversation component, a proxy for PurpleConversation.
  */
 
-[scriptable, uuid(e40dc3e5-c9ff-457b-a6cc-655cce81042c)]
+[scriptable, uuid(f71c58d6-2c47-4468-934b-b1c61462c01a)]
 interface prplIConversation: nsISupports {
 
   /* Indicate if this conversation implements prplIConvIM or prplIConvChat */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/content/convbrowser.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/content/convbrowser.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/content/convbrowser.xml	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/content/convbrowser.xml	2015-02-28 15:02:41.000000000 +0000
@@ -426,7 +426,6 @@
             }
             let event = document.createEvent("UIEvents");
             event.initUIEvent("MessagesDisplayed", false, false, window, 0);
-            this.dispatchEvent(event);
             if (this._pendingMessagesDisplayed < max) {
               if (this.progressBar) {
                 // Show progress bar if after the third call (ca. 120ms)
@@ -439,6 +438,7 @@
               }
               Services.tm.mainThread.dispatch(this.displayPendingMessages.bind(this),
                                               Ci.nsIEventTarget.DISPATCH_NORMAL);
+              this.dispatchEvent(event);
               return;
             }
             this.contentWindow.messageInsertPending = false;
@@ -447,6 +447,7 @@
             this._displayPendingMessagesCalls = 0;
             if (this.progressBar)
               this.progressBar.hidden = true;
+            this.dispatchEvent(event);
           ]]>
         </body>
       </method>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/modules/jsProtoHelper.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/modules/jsProtoHelper.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/modules/jsProtoHelper.jsm	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/modules/jsProtoHelper.jsm	2015-02-28 15:02:41.000000000 +0000
@@ -820,6 +820,8 @@
     this.commands.forEach(function(command) {
       if (!command.hasOwnProperty("name") || !command.hasOwnProperty("run"))
         throw "Every command must have a name and a run function.";
+      if (!("QueryInterface" in command))
+        command.QueryInterface = XPCOMUtils.generateQI([Ci.imICommand]);
       if (!command.hasOwnProperty("usageContext"))
         command.usageContext = Ci.imICommand.CMD_CONTEXT_ALL;
       if (!command.hasOwnProperty("priority"))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/protocols/xmpp/xmpp.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/protocols/xmpp/xmpp.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/chat/protocols/xmpp/xmpp.jsm	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/chat/protocols/xmpp/xmpp.jsm	2015-02-28 15:02:42.000000000 +0000
@@ -511,6 +511,12 @@
       this._account._parseJID(aStanza.attributes["from"]).resource || "";
 
     let type = aStanza.attributes["type"];
+
+    // Reset typing status if the buddy is in a conversation and becomes unavailable.
+    let conv = this._account._conv.get(this.normalizedName);
+    if (type == "unavailable" && conv)
+      conv.updateTyping(Ci.prplIConvIM.NOT_TYPING);
+
     if (type == "unavailable" || type == "error") {
       if (!this._resources || !(resource in this._resources))
         return; // ignore for already offline resources.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/changelog thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/changelog
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/changelog	2015-02-19 01:06:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/changelog	2015-02-28 15:18:57.000000000 +0000
@@ -1,4 +1,10 @@
-thunderbird-trunk (38.0~a1~hg20150218r17506.229588-0ubuntu1~umd1) utopic; urgency=medium
+thunderbird-trunk (39.0~a1~hg20150226r17577.231190-0ubuntu1~umd1) utopic; urgency=medium
+
+  * New upstream snapshot
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Sat, 28 Feb 2015 15:18:22 +0000
+
+thunderbird-trunk (38.0~a1~hg20150218r17506.229588-0ubuntu1) utopic; urgency=medium
 
   * Don't hardcode -mfloat-abi=softfp in libvpx
     - add debian/patches/dont-hardcode-softfp-on-armhf.patch
@@ -17,6 +23,11 @@
   * Refresh patches
     - update debian/patches/dont-include-hyphenation-patterns.patch
     - update debian/patches/unity-menubar.patch
+  * Add patch from Bugzilla to implement non-Skia fallback for unaccelerated
+    rendering of 3D transforms to fix a build failure on platforms where Skia
+    is not supported
+    - add debian/patches/add-non-skia-fallback.patch
+    - update debian/patches/series
 
  -- Chris Coulson <chris.coulson@canonical.com>  Wed, 14 Jan 2015 22:43:11 +0000
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/patches/add-non-skia-fallback.patch thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/patches/add-non-skia-fallback.patch
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/patches/add-non-skia-fallback.patch	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/patches/add-non-skia-fallback.patch	2015-02-28 15:18:57.000000000 +0000
@@ -0,0 +1,351 @@
+# Description: Add non-Skia fallback for unaccelerated rendering of 3D transforms
+# From: https://bug1105087.bugzilla.mozilla.org/attachment.cgi?id=8543177
+# Bug-Mozilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1105087
+
+diff --git a/mozilla/gfx/layers/basic/BasicCompositor.cpp b/mozilla/gfx/layers/basic/BasicCompositor.cpp
+--- a/mozilla/gfx/layers/basic/BasicCompositor.cpp
++++ b/mozilla/gfx/layers/basic/BasicCompositor.cpp
+@@ -12,18 +12,23 @@
+ #include "gfx2DGlue.h"
+ #include "mozilla/gfx/2D.h"
+ #include "mozilla/gfx/Helpers.h"
+ #include "gfxUtils.h"
+ #include "YCbCrUtils.h"
+ #include <algorithm>
+ #include "ImageContainer.h"
+ #include "gfxPrefs.h"
++#if MOZ_ENABLE_SKIA
+ #include "skia/SkCanvas.h"              // for SkCanvas
+ #include "skia/SkBitmapDevice.h"        // for SkBitmapDevice
++#else
++#define PIXMAN_DONT_DEFINE_STDINT
++#include "pixman.h"                     // for pixman_f_transform, etc
++#endif
+ 
+ namespace mozilla {
+ using namespace mozilla::gfx;
+ 
+ namespace layers {
+ 
+ class DataTextureSourceBasic : public DataTextureSource
+                              , public TextureSourceBasic
+@@ -163,16 +168,17 @@ DrawSurfaceWithTextureCoords(DrawTarget 
+   // Only use REPEAT if aTextureCoords is outside (0, 0, 1, 1).
+   gfx::Rect unitRect(0, 0, 1, 1);
+   ExtendMode mode = unitRect.Contains(aTextureCoords) ? ExtendMode::CLAMP : ExtendMode::REPEAT;
+ 
+   FillRectWithMask(aDest, aDestRect, aSource, aFilter, DrawOptions(aOpacity),
+                    mode, aMask, aMaskTransform, &matrix);
+ }
+ 
++#if MOZ_ENABLE_SKIA
+ static SkMatrix
+ Matrix3DToSkia(const gfx3DMatrix& aMatrix)
+ {
+   SkMatrix transform;
+   transform.setAll(aMatrix._11,
+                    aMatrix._21,
+                    aMatrix._41,
+                    aMatrix._12,
+@@ -181,17 +187,17 @@ Matrix3DToSkia(const gfx3DMatrix& aMatri
+                    aMatrix._14,
+                    aMatrix._24,
+                    aMatrix._44);
+ 
+   return transform;
+ }
+ 
+ static void
+-SkiaTransform(DataSourceSurface* aDest,
++DrawTransform(DataSourceSurface* aDest,
+               DataSourceSurface* aSource,
+               const gfx3DMatrix& aTransform,
+               const Point& aDestOffset)
+ {
+   if (aTransform.IsSingular()) {
+     return;
+   }
+ 
+@@ -220,16 +226,90 @@ SkiaTransform(DataSourceSurface* aDest,
+ 
+   SkPaint paint;
+   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+   paint.setAntiAlias(true);
+   paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+   SkRect destRect = SkRect::MakeXYWH(0, 0, srcSize.width, srcSize.height);
+   destCanvas.drawBitmapRectToRect(src, nullptr, destRect, &paint);
+ }
++#else
++// Cairo must rely on a less precise method if Skia is not available.
++// See bugs 1105087 and 1097776.
++static pixman_transform
++Matrix3DToPixman(const gfx3DMatrix& aMatrix)
++{
++  pixman_f_transform transform;
++
++  transform.m[0][0] = aMatrix._11;
++  transform.m[0][1] = aMatrix._21;
++  transform.m[0][2] = aMatrix._41;
++  transform.m[1][0] = aMatrix._12;
++  transform.m[1][1] = aMatrix._22;
++  transform.m[1][2] = aMatrix._42;
++  transform.m[2][0] = aMatrix._14;
++  transform.m[2][1] = aMatrix._24;
++  transform.m[2][2] = aMatrix._44;
++
++  pixman_transform result;
++  pixman_transform_from_pixman_f_transform(&result, &transform);
++
++  return result;
++}
++
++static void
++DrawTransform(DataSourceSurface* aDest,
++              DataSourceSurface* aSource,
++              const gfx3DMatrix& aTransform,
++              const Point& aDestOffset)
++{
++  IntSize destSize = aDest->GetSize();
++  pixman_image_t* dest = pixman_image_create_bits(PIXMAN_a8r8g8b8,
++                                                  destSize.width,
++                                                  destSize.height,
++                                                  (uint32_t*)aDest->GetData(),
++                                                  aDest->Stride());
++
++  IntSize srcSize = aSource->GetSize();
++  pixman_image_t* src = pixman_image_create_bits(PIXMAN_a8r8g8b8,
++                                                 srcSize.width,
++                                                 srcSize.height,
++                                                 (uint32_t*)aSource->GetData(),
++                                                 aSource->Stride());
++
++  NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
++
++  pixman_transform pixTransform = Matrix3DToPixman(aTransform);
++  pixman_transform pixTransformInverted;
++
++  // If the transform is singular then nothing would be drawn anyway, return here
++  if (!pixman_transform_invert(&pixTransformInverted, &pixTransform)) {
++    pixman_image_unref(dest);
++    pixman_image_unref(src);
++    return;
++  }
++  pixman_image_set_transform(src, &pixTransformInverted);
++
++  pixman_image_composite32(PIXMAN_OP_SRC,
++                           src,
++                           nullptr,
++                           dest,
++                           aDestOffset.x,
++                           aDestOffset.y,
++                           0,
++                           0,
++                           0,
++                           0,
++                           destSize.width,
++                           destSize.height);
++
++  pixman_image_unref(dest);
++  pixman_image_unref(src);
++}
++#endif
+ 
+ static inline IntRect
+ RoundOut(Rect r)
+ {
+   r.RoundOut();
+   return IntRect(r.x, r.y, r.width, r.height);
+ }
+ 
+@@ -364,17 +444,17 @@ BasicCompositor::DrawQuad(const gfx::Rec
+     RefPtr<SourceSurface> snapshot = dest->Snapshot();
+     RefPtr<DataSourceSurface> source = snapshot->GetDataSurface();
+     RefPtr<DataSourceSurface> temp =
+       Factory::CreateDataSourceSurface(RoundOut(transformBounds).Size(), SurfaceFormat::B8G8R8A8, true);
+     if (NS_WARN_IF(!temp)) {
+       return;
+     }
+ 
+-    SkiaTransform(temp, source, new3DTransform, transformBounds.TopLeft());
++    DrawTransform(temp, source, new3DTransform, transformBounds.TopLeft());
+ 
+     transformBounds.MoveTo(0, 0);
+     buffer->DrawSurface(temp, transformBounds, transformBounds);
+   }
+ 
+   buffer->PopClip();
+ }
+ 
+diff --git a/mozilla/gfx/layers/basic/BasicLayerManager.cpp b/mozilla/gfx/layers/basic/BasicLayerManager.cpp
+--- a/mozilla/gfx/layers/basic/BasicLayerManager.cpp
++++ b/mozilla/gfx/layers/basic/BasicLayerManager.cpp
+@@ -41,18 +41,23 @@
+ #include "nsAutoPtr.h"                  // for nsRefPtr
+ #include "nsCOMPtr.h"                   // for already_AddRefed
+ #include "nsDebug.h"                    // for NS_ASSERTION, etc
+ #include "nsISupportsImpl.h"            // for gfxContext::Release, etc
+ #include "nsPoint.h"                    // for nsIntPoint
+ #include "nsRect.h"                     // for nsIntRect
+ #include "nsRegion.h"                   // for nsIntRegion, etc
+ #include "nsTArray.h"                   // for nsAutoTArray
++#if MOZ_ENABLE_SKIA
+ #include "skia/SkCanvas.h"              // for SkCanvas
+ #include "skia/SkBitmapDevice.h"        // for SkBitmapDevice
++#else
++#define PIXMAN_DONT_DEFINE_STDINT
++#include "pixman.h"                     // for pixman_f_transform, etc
++#endif
+ class nsIWidget;
+ 
+ namespace mozilla {
+ namespace layers {
+ 
+ using namespace mozilla::gfx;
+ 
+ /**
+@@ -596,16 +601,17 @@ void
+ BasicLayerManager::SetRoot(Layer* aLayer)
+ {
+   NS_ASSERTION(aLayer, "Root can't be null");
+   NS_ASSERTION(aLayer->Manager() == this, "Wrong manager");
+   NS_ASSERTION(InConstruction(), "Only allowed in construction phase");
+   mRoot = aLayer;
+ }
+ 
++#if MOZ_ENABLE_SKIA
+ static SkMatrix
+ BasicLayerManager_Matrix3DToSkia(const gfx3DMatrix& aMatrix)
+ {
+   SkMatrix transform;
+   transform.setAll(aMatrix._11,
+                    aMatrix._21,
+                    aMatrix._41,
+                    aMatrix._12,
+@@ -614,17 +620,17 @@ BasicLayerManager_Matrix3DToSkia(const g
+                    aMatrix._14,
+                    aMatrix._24,
+                    aMatrix._44);
+ 
+   return transform;
+ }
+ 
+ static void
+-SkiaTransform(const gfxImageSurface* aDest,
++DrawTransform(const gfxImageSurface* aDest,
+               RefPtr<DataSourceSurface> aSrc,
+               const gfx3DMatrix& aTransform,
+               gfxPoint aDestOffset)
+ {
+   if (aTransform.IsSingular()) {
+     return;
+   }
+ 
+@@ -653,16 +659,89 @@ SkiaTransform(const gfxImageSurface* aDe
+ 
+   SkPaint paint;
+   paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+   paint.setAntiAlias(true);
+   paint.setFilterLevel(SkPaint::kLow_FilterLevel);
+   SkRect destRect = SkRect::MakeXYWH(0, 0, srcSize.width, srcSize.height);
+   destCanvas.drawBitmapRectToRect(src, nullptr, destRect, &paint);
+ }
++#else
++// See bugs 1097776 and 1105087.
++static pixman_transform
++BasicLayerManager_Matrix3DToPixman(const gfx3DMatrix& aMatrix)
++{
++  pixman_f_transform transform;
++
++  transform.m[0][0] = aMatrix._11;
++  transform.m[0][1] = aMatrix._21;
++  transform.m[0][2] = aMatrix._41;
++  transform.m[1][0] = aMatrix._12;
++  transform.m[1][1] = aMatrix._22;
++  transform.m[1][2] = aMatrix._42;
++  transform.m[2][0] = aMatrix._14;
++  transform.m[2][1] = aMatrix._24;
++  transform.m[2][2] = aMatrix._44;
++
++  pixman_transform result;
++  pixman_transform_from_pixman_f_transform(&result, &transform);
++
++  return result;
++}
++
++static void
++PixmanTransform(const gfxImageSurface* aDest,
++                RefPtr<DataSourceSurface> aSrc,
++                const gfx3DMatrix& aTransform,
++                gfxPoint aDestOffset)
++{
++  IntSize destSize = ToIntSize(aDest->GetSize());
++  pixman_image_t* dest = pixman_image_create_bits(aDest->Format() == gfxImageFormat::ARGB32 ? PIXMAN_a8r8g8b8 : PIXMAN_x8r8g8b8,
++                                                  destSize.width,
++                                                  destSize.height,
++                                                  (uint32_t*)aDest->Data(),
++                                                  aDest->Stride());
++
++  IntSize srcSize = aSrc->GetSize();
++  pixman_image_t* src = pixman_image_create_bits(aSrc->GetFormat() == SurfaceFormat::B8G8R8A8 ? PIXMAN_a8r8g8b8 : PIXMAN_x8r8g8b8,
++                                                 srcSize.width,
++                                                 srcSize.height,
++                                                 (uint32_t*)aSrc->GetData(),
++                                                 aSrc->Stride());
++
++  NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
++
++  pixman_transform pixTransform = BasicLayerManager_Matrix3DToPixman(aTransform);
++  pixman_transform pixTransformInverted;
++
++  // If the transform is singular then nothing would be drawn anyway, return here
++  if (!pixman_transform_invert(&pixTransformInverted, &pixTransform)) {
++    pixman_image_unref(dest);
++    pixman_image_unref(src);
++    return;
++  }
++  pixman_image_set_transform(src, &pixTransformInverted);
++
++  pixman_image_composite32(PIXMAN_OP_SRC,
++                           src,
++                           nullptr,
++                           dest,
++                           aDestOffset.x,
++                           aDestOffset.y,
++                           0,
++                           0,
++                           0,
++                           0,
++                           destSize.width,
++                           destSize.height);
++
++  pixman_image_unref(dest);
++  pixman_image_unref(src);
++}
++#endif
+ 
+ /**
+  * Transform a surface using a gfx3DMatrix and blit to the destination if
+  * it is efficient to do so.
+  *
+  * @param aSource       Source surface.
+  * @param aDest         Desintation context.
+  * @param aBounds       Area represented by aSource.
+@@ -694,17 +773,17 @@ Transform3D(RefPtr<SourceSurface> aSourc
+                                                                        aDestRect.height),
+                                                             gfxImageFormat::ARGB32);
+   gfxPoint offset = aDestRect.TopLeft();
+ 
+   // Include a translation to the correct origin.
+   gfx3DMatrix translation = gfx3DMatrix::Translation(aBounds.x, aBounds.y, 0);
+ 
+   // Transform the content and offset it such that the content begins at the origin.
+-  SkiaTransform(destImage, aSource->GetDataSurface(), translation * aTransform, offset);
++  DrawTransform(destImage, aSource->GetDataSurface(), translation * aTransform, offset);
+ 
+   // If we haven't actually drawn to aDest then return our temporary image so
+   // that the caller can do this.
+   return destImage.forget();
+ }
+ 
+ void
+ BasicLayerManager::PaintSelfOrChildren(PaintLayerContext& aPaintContext,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/patches/series thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/patches/series
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/patches/series	2015-02-19 01:06:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/patches/series	2015-02-28 15:18:57.000000000 +0000
@@ -18,3 +18,4 @@
 support-coinstallable-trunk-build.patch
 set-prgname-to-remoting-name.patch
 dont-hardcode-softfp-on-armhf.patch
+add-non-skia-fallback.patch
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/patches/unity-menubar.patch thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/patches/unity-menubar.patch
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/debian/patches/unity-menubar.patch	2015-02-19 01:06:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/debian/patches/unity-menubar.patch	2015-02-28 15:18:57.000000000 +0000
@@ -1,7 +1,7 @@
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/browser/base/content/browser-menubar.inc
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/browser/base/content/browser-menubar.inc
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/browser/base/content/browser-menubar.inc	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/browser/base/content/browser-menubar.inc	2015-02-19 00:23:57.262790526 +0000
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/browser/base/content/browser-menubar.inc	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/browser/base/content/browser-menubar.inc	2015-02-23 11:00:06.327486661 +0000
 @@ -5,7 +5,11 @@
  
         <menubar id="main-menubar"
@@ -14,10 +14,10 @@
                                    this.setAttribute('openedwithkey',
                                                      event.target.parentNode.openedWithKey);"
                  style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/browser/components/places/content/places.xul
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/browser/components/places/content/places.xul
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/browser/components/places/content/places.xul	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/browser/components/places/content/places.xul	2015-02-19 00:23:57.262790526 +0000
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/browser/components/places/content/places.xul	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/browser/components/places/content/places.xul	2015-02-23 11:00:06.327486661 +0000
 @@ -157,7 +157,7 @@
          <toolbarbutton type="menu" class="tabbable"
                onpopupshowing="document.getElementById('placeContent').focus()"
@@ -27,10 +27,10 @@
          <menu accesskey="&organize.accesskey;" class="menu-iconic"
  #endif
                id="organizeButton" label="&organize.label;"
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/toolkit/content/widgets/popup.xml
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/toolkit/content/widgets/popup.xml
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/toolkit/content/widgets/popup.xml	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/toolkit/content/widgets/popup.xml	2015-02-19 00:23:57.266790529 +0000
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/toolkit/content/widgets/popup.xml	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/toolkit/content/widgets/popup.xml	2015-02-23 11:00:06.327486661 +0000
 @@ -25,8 +25,14 @@
          </getter>
        </property>
@@ -48,10 +48,10 @@
  
        <property name="triggerNode" readonly="true"
                  onget="return this.popupBoxObject.triggerNode"/>
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/toolkit/content/xul.css
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/toolkit/content/xul.css
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/toolkit/content/xul.css	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/toolkit/content/xul.css	2015-02-19 00:23:57.266790529 +0000
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/toolkit/content/xul.css	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/toolkit/content/xul.css	2015-02-23 11:00:06.327486661 +0000
 @@ -306,6 +306,18 @@
  }
  %endif
@@ -71,10 +71,10 @@
  toolbarseparator {
    -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
  }
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsDbusmenu.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsDbusmenu.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsDbusmenu.cpp	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsDbusmenu.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -135,10 +135,10 @@
 +
 +    return NS_OK;
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsDbusmenu.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsDbusmenu.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsDbusmenu.h	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsDbusmenu.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,99 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -239,10 +239,10 @@
 +#define dbusmenu_menuitem_property_set_shortcut nsDbusmenuFunctions::s_dbusmenu_menuitem_property_set_shortcut
 +
 +#endif /* __nsDbusmenu_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenu.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenu.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenu.cpp	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenu.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,866 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1110,10 +1110,10 @@
 +
 +    MaybeAddPlaceholderItem();
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenu.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenu.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenu.h	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenu.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,166 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1281,10 +1281,10 @@
 +};
 +
 +#endif /* __nsMenu_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuBar.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuBar.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuBar.cpp	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuBar.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,545 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1831,10 +1831,10 @@
 +    DebugOnly<nsresult> rv = RemoveChild(aChild);
 +    NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to remove item from menubar");
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuBar.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuBar.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuBar.h	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuBar.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,112 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -1948,10 +1948,10 @@
 +};
 +
 +#endif /* __nsMenuBar_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuContainer.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuContainer.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuContainer.cpp	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuContainer.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,179 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2132,10 +2132,10 @@
 +
 +    return aContent;
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuContainer.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuContainer.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuContainer.h	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuContainer.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,66 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2203,10 +2203,10 @@
 +};
 +
 +#endif /* __nsMenuContainer_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuItem.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuItem.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuItem.cpp	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuItem.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,739 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -2947,10 +2947,10 @@
 +        UpdateIcon(sc);
 +    }
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuItem.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuItem.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuItem.h	2015-02-19 00:23:57.266790529 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuItem.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,107 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -3059,10 +3059,10 @@
 +};
 +
 +#endif /* __nsMenuItem_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuObject.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuObject.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuObject.cpp	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuObject.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,707 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -3771,10 +3771,10 @@
 +        weak = weak->GetPrevious();
 +    }
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuObject.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuObject.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuObject.h	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuObject.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,242 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4018,10 +4018,10 @@
 +};
 +
 +#endif /* __nsMenuObject_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuSeparator.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuSeparator.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuSeparator.cpp	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuSeparator.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,90 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4113,10 +4113,10 @@
 +        UpdateVisibility(sc);
 +    }
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuSeparator.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuSeparator.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsMenuSeparator.h	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsMenuSeparator.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,41 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4159,10 +4159,10 @@
 +};
 +
 +#endif /* __nsMenuSeparator_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuAtomList.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuAtomList.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuAtomList.h	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuAtomList.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,11 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4175,10 +4175,10 @@
 +WIDGET_ATOM2(_moz_menupopupstate, "_moz-menupopupstate")
 +WIDGET_ATOM(openedwithkey)
 +WIDGET_ATOM(shellshowingmenubar)
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuAtoms.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuAtoms.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuAtoms.cpp	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuAtoms.cpp	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,39 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4219,10 +4219,10 @@
 +{
 +    NS_RegisterStaticAtoms(gAtoms);
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuAtoms.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuAtoms.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuAtoms.h	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuAtoms.h	2015-02-23 11:00:06.331486661 +0000
 @@ -0,0 +1,25 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4249,10 +4249,10 @@
 +};
 +
 +#endif /* __nsNativeMenuAtoms_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuDocListener.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuDocListener.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuDocListener.cpp	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuDocListener.cpp	2015-02-23 11:00:06.335486663 +0000
 @@ -0,0 +1,369 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4623,10 +4623,10 @@
 +    CancelFlush(this);
 +    mPendingMutations.Clear();
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuDocListener.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuDocListener.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuDocListener.h	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuDocListener.h	2015-02-23 11:00:06.335486663 +0000
 @@ -0,0 +1,152 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -4780,10 +4780,10 @@
 +};
 +
 +#endif /* __nsNativeMenuDocListener_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuService.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuService.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuService.cpp	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuService.cpp	2015-02-23 11:00:06.335486663 +0000
 @@ -0,0 +1,506 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5291,10 +5291,10 @@
 +
 +    return NS_OK;
 +}
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuService.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuService.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuService.h	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuService.h	2015-02-23 11:00:06.335486663 +0000
 @@ -0,0 +1,88 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5384,10 +5384,10 @@
 +};
 +
 +#endif /* __nsNativeMenuService_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuUtils.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuUtils.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsNativeMenuUtils.h	2015-02-19 00:23:57.270790531 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsNativeMenuUtils.h	2015-02-23 11:00:06.335486663 +0000
 @@ -0,0 +1,59 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -5448,11 +5448,11 @@
 +};
 +
 +#endif /* __nsNativeMenuUtils_h__ */
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsWidgetFactory.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsWidgetFactory.cpp
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/widget/gtk/nsWidgetFactory.cpp	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsWidgetFactory.cpp	2015-02-19 00:23:57.270790531 +0000
-@@ -44,6 +44,9 @@
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/widget/gtk/nsWidgetFactory.cpp	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsWidgetFactory.cpp	2015-02-23 11:00:06.335486663 +0000
+@@ -45,6 +45,9 @@
  #include "GfxInfoX11.h"
  #endif
  
@@ -5462,7 +5462,7 @@
  #include "nsNativeThemeGTK.h"
  
  #include "nsIComponentRegistrar.h"
-@@ -117,6 +120,9 @@
+@@ -118,6 +121,9 @@
  }
  #endif
  
@@ -5472,7 +5472,7 @@
  #ifdef NS_PRINTING
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK)
  NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintOptionsGTK, Init)
-@@ -197,6 +203,7 @@
+@@ -198,6 +204,7 @@
  NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
  NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
  #endif
@@ -5480,7 +5480,7 @@
  
  
  static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
-@@ -229,6 +236,7 @@
+@@ -230,6 +237,7 @@
      { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceGTKConstructor },
      { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor },
  #endif
@@ -5488,7 +5488,7 @@
      { nullptr }
  };
  
-@@ -262,6 +270,7 @@
+@@ -263,6 +271,7 @@
      { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
      { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
  #endif
@@ -5496,7 +5496,7 @@
      { nullptr }
  };
  
-@@ -280,13 +289,22 @@
+@@ -284,13 +293,22 @@
  #endif
  }
  
@@ -5520,11 +5520,11 @@
      nsWidgetGtk2ModuleDtor
  };
  
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsWindow.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsWindow.cpp
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/widget/gtk/nsWindow.cpp	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsWindow.cpp	2015-02-19 00:23:57.274790533 +0000
-@@ -4893,6 +4893,11 @@
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/widget/gtk/nsWindow.cpp	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsWindow.cpp	2015-02-23 11:00:06.335486663 +0000
+@@ -4892,6 +4892,11 @@
      return NS_OK;
  }
  
@@ -5536,11 +5536,11 @@
  bool
  nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY,
                           bool aIsWheel, bool aAlwaysRollup)
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsWindow.h
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsWindow.h
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/widget/gtk/nsWindow.h	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/nsWindow.h	2015-02-19 00:23:57.274790533 +0000
-@@ -34,6 +34,8 @@
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/widget/gtk/nsWindow.h	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/nsWindow.h	2015-02-23 11:00:06.335486663 +0000
+@@ -33,6 +33,8 @@
  
  #include "nsGtkIMModule.h"
  
@@ -5549,7 +5549,7 @@
  #undef LOG
  #ifdef MOZ_LOGGING
  
-@@ -151,6 +153,8 @@
+@@ -150,6 +152,8 @@
                                        nsIScreen* aTargetScreen = nullptr) MOZ_OVERRIDE;
      NS_IMETHOD         HideWindowChrome(bool aShouldHide) MOZ_OVERRIDE;
  
@@ -5558,7 +5558,7 @@
      /**
       * GetLastUserInputTime returns a timestamp for the most recent user input
       * event.  This is intended for pointer grab requests (including drags).
-@@ -499,6 +503,8 @@
+@@ -498,6 +502,8 @@
      int GdkCoordToDevicePixels(gint coord);
      mozilla::LayoutDeviceIntPoint GdkPointToDevicePixels(GdkPoint point);
      nsIntRect GdkRectToDevicePixels(GdkRectangle rect);
@@ -5567,10 +5567,10 @@
  };
  
  class nsChildWindow : public nsWindow {
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/xpfe/appshell/nsWebShellWindow.cpp
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/xpfe/appshell/nsWebShellWindow.cpp
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2015-02-19 00:24:37.534815784 +0000
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2015-02-23 11:22:40.737311348 +0000
 @@ -58,6 +58,7 @@
  #include "nsIScreen.h"
  
@@ -5588,25 +5588,22 @@
  #include "nsINativeMenuService.h"
  #define USE_NATIVE_MENUS
  #endif
-@@ -431,8 +432,13 @@
-   if (!menubarNode)
-     return;
+@@ -436,6 +437,11 @@
  
--  nsCOMPtr<nsINativeMenuService> nms = do_GetService("@mozilla.org/widget/nativemenuservice;1");
-   nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));
+   if (menubarNode) {
+     nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));
 +#ifdef MOZ_WIDGET_GTK
-+  nsCOMPtr<nsIAtom> atom = do_GetAtom(NS_LITERAL_CSTRING("_moz-menubarkeeplocal"));
-+  if (menubarContent->AttrValueIs(kNameSpaceID_None, atom, nsGkAtoms::_true, eCaseMatters))
-+    return;
++    nsCOMPtr<nsIAtom> atom = do_GetAtom(NS_LITERAL_CSTRING("_moz-menubarkeeplocal"));
++    if (menubarContent->AttrValueIs(kNameSpaceID_None, atom, nsGkAtoms::_true, eCaseMatters))
++      return;
 +#endif
-+  nsCOMPtr<nsINativeMenuService> nms = do_GetService("@mozilla.org/widget/nativemenuservice;1");
-   if (nms && menubarContent)
      nms->CreateNativeMenuBar(aParentWindow, menubarContent);
- }
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/moz.build
+   } else {
+     nms->CreateNativeMenuBar(aParentWindow, nullptr);
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/moz.build
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/widget/gtk/moz.build	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/gtk/moz.build	2015-02-19 00:23:57.274790533 +0000
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/widget/gtk/moz.build	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/gtk/moz.build	2015-02-23 11:00:06.335486663 +0000
 @@ -19,11 +19,20 @@
      'nsAppShell.cpp',
      'nsBidiKeyboard.cpp',
@@ -5644,11 +5641,11 @@
      '/layout/xul',
      '/other-licenses/atk-1.0',
      '/widget',
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/browser/base/content/browser.js
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/browser/base/content/browser.js
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/browser/base/content/browser.js	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/browser/base/content/browser.js	2015-02-19 00:23:57.274790533 +0000
-@@ -4773,6 +4773,8 @@
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/browser/base/content/browser.js	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/browser/base/content/browser.js	2015-02-23 11:00:06.335486663 +0000
+@@ -4715,6 +4715,8 @@
    let toolbarNodes = Array.slice(gNavToolbox.childNodes);
    toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
    toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
@@ -5657,10 +5654,10 @@
    return toolbarNodes;
  }
  
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/moz.build
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/moz.build
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/widget/moz.build	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/widget/moz.build	2015-02-19 00:23:57.274790533 +0000
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/widget/moz.build	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/widget/moz.build	2015-02-23 11:00:06.339486664 +0000
 @@ -38,10 +38,12 @@
          'nsITaskbarProgress.idl',
      ]
@@ -5675,11 +5672,11 @@
  TEST_DIRS += ['tests']
  
  # Don't build the DSO under the 'build' directory as windows does.
-Index: firefox-trunk-38.0~a1~hg20150218r229562/mozilla/modules/libpref/init/all.js
+Index: firefox-trunk-38.0~a1~hg20150223r230246/mozilla/modules/libpref/init/all.js
 ===================================================================
---- firefox-trunk-38.0~a1~hg20150218r229562.orig/mozilla/modules/libpref/init/all.js	2015-02-19 00:23:57.278790536 +0000
-+++ firefox-trunk-38.0~a1~hg20150218r229562/mozilla/modules/libpref/init/all.js	2015-02-19 00:23:57.274790533 +0000
-@@ -185,6 +185,9 @@
+--- firefox-trunk-38.0~a1~hg20150223r230246.orig/mozilla/modules/libpref/init/all.js	2015-02-23 11:00:06.339486664 +0000
++++ firefox-trunk-38.0~a1~hg20150223r230246/mozilla/modules/libpref/init/all.js	2015-02-23 11:00:06.339486664 +0000
+@@ -190,6 +190,9 @@
  pref("browser.sessionhistory.max_total_viewers", -1);
  
  pref("ui.use_native_colors", true);
@@ -5687,5 +5684,5 @@
 +pref("ui.use_unity_menubar", true);
 +#endif
  pref("ui.click_hold_context_menus", false);
- pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
- // 0 = default: always, except in high contrast mode
+ // Duration of timeout of incremental search in menus (ms).  0 means infinite.
+ pref("ui.menu.incremental_search.timeout", 1000);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/im/content/conversation.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/im/content/conversation.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/im/content/conversation.xml	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/im/content/conversation.xml	2015-02-28 15:02:42.000000000 +0000
@@ -690,9 +690,9 @@
             // Be case insensitive only if |word| is entirely lower case.
             let condition;
             if (word.toLocaleLowerCase() == word)
-              condition = function(c) c.toLocaleLowerCase().indexOf(word) == 0;
+              condition = c => c.toLocaleLowerCase().startsWith(word);
             else
-              condition = function(c) c.indexOf(word) == 0;
+              condition = c => c.startsWith(word);
             let matchingCompletions = completions.filter(condition);
             if (!matchingCompletions.length && words[1]) {
               word = words[1];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/changesets thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/changesets
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/changesets	2015-02-19 00:44:29.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/changesets	2015-02-28 15:05:23.000000000 +0000
@@ -5,26 +5,26 @@
 bn-BD 106:770ac0af49cd
 br 247:b2a174c5dec1
 ca 671:0427dac6c811
-cs 1983:6f17045aa7ac
+cs 1984:c6274be58b2e
 da 735:3da200622aa9
 de 3030:fce3d490dc0e
 el 356:6b23a751385f
 en-GB 444:876cf60b4ae5
-es-AR 946:1b00d55b8836
-es-ES 2355:09492fcb9f38
+es-AR 948:addda0ea594e
+es-ES 2370:d9922ff4a234
 et 530:54f9fbfcd622
 eu 379:d7df5b30dd48
 fi 557:9fa360eef979
-fr 5261:8bc1cb875d64
+fr 5286:92439e7fefe9
 fy-NL 1157:453401a56b04
 ga-IE 465:f841e9037f9e
 gd 519:1c2db3f5f73c
 gl 1440:91a359ce0c91
 he 505:6c592b9d28a8
 hu 794:b45f6b60407e
-id 548:1e9b1248eadb
+id 566:0b6a19b1eb5d
 is 297:33af74865c25
-it 3690:e7329408b446
+it 3731:0bf52b5d7e68
 ja 633:608df4a0c172
 ja-JP-mac 634:aba6f4f0ee5e
 ka 56:2ee9bc162267
@@ -34,14 +34,14 @@
 nl 3828:a1a46f64e7f6
 nn-NO 636:2032d95af2a7
 pa-IN 589:b51530b15a00
-pl 5218:fcd23fa98a33
+pl 5272:a2f51dab8f66
 pt-BR 664:723658175bdd
-pt-PT 2081:87f0eeeca266
+pt-PT 2088:cabda2f75133
 rm 388:945a12b3635b
 ro 419:ad3a5fe2543b
-ru 2291:c8438508e7ff
+ru 2300:c70af902c711
 si 414:fb01300c5c4a
-sk 1315:3701d62d27e0
+sk 1400:af7a080427ff
 sl 820:a5e5e63844e9
 sq 774:4e1d2dc5d752
 sr 254:e6fa777ae177
@@ -50,5 +50,5 @@
 tr 574:72ab8cc561e2
 uk 1162:a5cf4538556c
 vi 126:57cb46a94324
-zh-CN 730:7cfa6880c1c3
+zh-CN 736:5bd025fd1a75
 zh-TW 1088:e3fb41abf001
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/dom/chrome/appstrings.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/dom/chrome/appstrings.properties	2015-02-28 15:04:02.000000000 +0000
@@ -33,4 +33,4 @@
 cspBlocked=Esta página tiene una política de seguridad de contenido que evita sea cargada de esta forma.
 corruptedContentError=La página que está tratando de ver no puede mostrarse porque se detectó un error en la transmisión de los datos.
 remoteXUL=Esta página usa una tecnología no soportada que ya no está disponible por defecto.
-
+sslv3Used=La seguridad de sus datos en %S no puede ser garantizada porque usa SSLv3, un protocolo de seguridad roto.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/dom/chrome/plugins.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/dom/chrome/plugins.properties	2015-02-28 15:04:02.000000000 +0000
@@ -20,6 +20,11 @@
 description_label=Descripción
 suffixes_label=Sufijos
 
+# GMP Plugins
+gmp_license_info=Información de licencia
+
 openH264_name=Codec de video OpenH264 provisto por Cisco Systems, Inc.
 openH264_description=Reproducción de video web y uso de video chats.
 
+eme-adobe_name=Primetime Content Decryption Module provisto por Adobe Systems, Incorporated
+eme-adobe_description=Reproducción de video web protegido.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/aboutDialog.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/aboutDialog.dtd	2015-02-28 15:04:01.000000000 +0000
@@ -36,10 +36,13 @@
 <!ENTITY community.creditsLink      "comunidad mundial">
 <!ENTITY community.end3             " que trabaja junta para mantener la web abierta, pública y accesible para todos.">
 
-<!ENTITY contribute.start           "¿Suena interesante? ">
-<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
-<!ENTITY contribute.getInvolvedLink "¡Involúcrese!">
-<!ENTITY contribute.end             "">
+<!ENTITY helpus.start               "¿Quiere ayudar? ">
+<!-- LOCALIZATION NOTE (helpus.donateLink): This is a link title that links to the thunderbird donation page -->
+<!ENTITY helpus.donateLink          "¡Haga una donación">
+<!ENTITY helpus.middle              " o ">
+<!-- LOCALIZATION NOTE (helpus.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY helpus.getInvolvedLink     "involúcrese!">
+<!ENTITY helpus.end                 "">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Información de licencia">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/aboutDownloads.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/aboutDownloads.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/aboutDownloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/aboutDownloads.dtd	2015-02-28 15:04:01.000000000 +0000
@@ -0,0 +1,21 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 aboutDownloads.title                      "Archivos guardados">
+<!ENTITY aboutDownloads.empty                      "No hay archivos guardados">
+<!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
+     cmd.showMac.accesskey):
+     The show and showMac commands are never shown together, thus they can share
+     the same access key (though the two access keys can also be different).
+     -->
+<!ENTITY cmd.show.label                            "Abrir carpeta contenedora">
+<!ENTITY cmd.show.accesskey                        "A">
+<!ENTITY cmd.showMac.label                         "Mostrar en Finder">
+<!ENTITY cmd.showMac.accesskey                     "F">
+<!ENTITY cmd.open.label                            "Abrir">
+<!ENTITY cmd.open.accesskey                        "b">
+<!ENTITY cmd.removeFromHistory.label               "Eliminar del historial">
+<!ENTITY cmd.removeFromHistory.accesskey           "E">
+<!ENTITY cmd.clearDownloads.label                  "Limpiar descargas">
+<!ENTITY cmd.clearDownloads.accesskey              "d">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-28 15:04:01.000000000 +0000
@@ -3,7 +3,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY addressbookWindow.title "Libreta de direcciones">
-
+<!ENTITY blankResultsPaneMessage.label                  "Esta libreta de direcciones muestra contactos solamente después de una búsqueda">
+<!ENTITY localResultsOnlyMessage.label                  "Los contactos de libretas de direcciones remotas no se muestran hasta que los busque">
 <!-- File Menu -->
 <!ENTITY fileMenu.label "Archivo">
 <!ENTITY fileMenu.accesskey "A">
@@ -160,6 +161,8 @@
 <!ENTITY searchItem.title "Búsqueda rápida">
 
 <!-- Results Pane -->
+<!ENTITY Addrbook.label                                 "Libreta de direcciones">
+<!ENTITY Addrbook.accesskey                             "b">
 <!ENTITY GeneratedName.label "Nombre">
 <!ENTITY GeneratedName.accesskey "N">
 <!ENTITY PrimaryEmail.label "Correo electrónico">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-28 15:04:01.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/. -->
 
+<!ENTITY Addrbook.label                        "Libreta de direcciones">
+<!ENTITY Addrbook.accesskey                    "b">
 <!ENTITY GeneratedName.label "Nombre">
 <!ENTITY GeneratedName.accesskey "N">
 <!ENTITY PrimaryEmail.label "Correo electrónico">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-28 15:04:01.000000000 +0000
@@ -9,6 +9,8 @@
 lastFirstFormat=%S, %S
 firstLastFormat=%S %S
 
+allAddressBooks=Todas las libretas de direcciones
+
 newContactTitle=Nuevo contacto
 # %S will be the contact's display name
 newContactTitleWithDisplayName=Nuevo contacto para %S
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/am-server-top.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/am-server-top.dtd	2015-02-28 15:04:01.000000000 +0000
@@ -84,4 +84,7 @@
 
 <!ENTITY accountTitle.label "Configuración de cuenta">
 <!ENTITY accountSettingsDesc.label "La siguiente cuenta es especial. No tiene identidades asociadas.">
-
+<!ENTITY storeType.label "Tipo de almacenamiento de mensajes:">
+<!ENTITY storeType.accesskey "T">
+<!ENTITY mboxStore.label "Un archivo grande (mbox)">
+<!ENTITY maildirStore.label "Un archivo por mensaje (maildir)">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/chat.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/chat.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/chat.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/chat.properties	2015-02-28 15:04:01.000000000 +0000
@@ -90,3 +90,12 @@
 log.previousWeek=La semana pasada
 
 messagePreview=Nuevo mensaje de chat
+
+#LOCALIZATION NOTE (bundledMessagePreview):  Semi-colon list of plural forms.
+# Used when multiple incoming messages from the same sender are bundled
+# into a single notification.
+# #1 is the number of incoming messages the user is being notified about. When #1
+# is greater than one, the plural form after the semicolon is used.
+# Do not translate %1$S, it is the message preview to be shown in the
+# notification, i.e. the first incoming message.
+bundledMessagePreview=%1$S… (y #1 mensaje más);%1$S… (y #1 mensajes más)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/localMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/localMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/localMsgs.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/localMsgs.properties	2015-02-28 15:04:01.000000000 +0000
@@ -40,8 +40,6 @@
 # %2$S will receive the total number of messages
 receivedMsgs=%1$S de %2$S mensajes recibidos
 
-pop3OutOfDiskSpace=No hay suficiente espacio en disco para descargar nuevos mensajes. Pruebe a borrar el correo antiguo, vaciar la papelera de reciclaje y compactar sus carpetas de correo, y luego vuelva a intentarlo.
-
 # Status - parsing folder
 #LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
 # Place the word %S where the name of the mailbox should appear
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/messenger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/messenger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/messenger.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/messenger.dtd	2015-02-28 15:04:01.000000000 +0000
@@ -147,7 +147,9 @@
 <!ENTITY messagePaneVertical.accesskey "V">
 <!ENTITY showFolderPaneCmd.label "Vista de carpetas">
 <!ENTITY showFolderPaneCmd.accesskey "s">
-<!ENTITY showMessageCmd.label "Mensaje">
+<!ENTITY showFolderPaneColsCmd.label "Columnas de vista de carpetas">
+<!ENTITY showFolderPaneColsCmd.accesskey "p">
+<!ENTITY showMessageCmd.label "Vista de mensaje">
 <!ENTITY showMessageCmd.accesskey "e">
 
 <!ENTITY folderView.label "Carpetas">
@@ -593,7 +595,9 @@
 <!ENTITY manageTags.accesskey "m">
 
 <!-- Folder Pane -->
-<!ENTITY folderColumn.label "Nombre">
+<!ENTITY folderNameColumn.label "Nombre">
+<!ENTITY folderUnreadColumn.label "Sin leer">
+<!ENTITY folderTotalColumn.label "Total">
 <!ENTITY folderSizeColumn.label "Tamaño">
 
 <!-- Folder Pane Context Menu -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/messenger.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/messenger.properties	2015-02-28 15:04:01.000000000 +0000
@@ -83,6 +83,7 @@
 alertFilterCheckbox=No volver a avisarme.
 compactFolderDeniedLock=La carpeta '%S' no puede ser compactada porque hay otra operación en curso. Por favor, inténtelo más tarde.
 compactFolderWriteFailed=La carpeta '%S' no se pudo compactar porque falló la escritura en la carpeta. Compruebe que tiene suficiente espacio en disco y privilegios de escritura en el directorio, y vuelva a intentar.
+compactFolderInsufficientSpace=Algunas carpetas (ej. '%S') no pueden compactarse porque no hay suficiente espacio libre en disco. Borre algunos archivo e intente nuevamente.
 filterFolderHdrAddFailed=Los mensajes no pudieron ser filtrados a la carpeta '%S' porque agregar un mensaje falló. Verifique que la carpeta se está mostrano correctamente o trate de repararla desde las propiedades de carpeta.
 filterFolderWriteFailed=Los mensajes no pudieron ser filtrados a la carpeta '%S' porque falló la escritura a esa carpeta. Compruebe que tiene suficiente espacio en disco y permiso de escritura en el directorio, e inténtelo de nuevo.
 copyMsgWriteFailed=Los mensajes no han podido ser movidos o copiados a la carpeta '%S' porque falló la escritura en esa carpeta. Para conseguir más espacio, desde el menú Archivo, escoja primero Vaciar papelera, y luego escoja Compactar carpetas, y vuelva a intentar.
@@ -95,6 +96,7 @@
 filterFolderTruncateFailed=Ha sucedido un error al truncar la bandeja de entrada tras filtrar un mensaje a la carpeta '%1$S'. You may need to shutdown %2$S and delete INBOX.msf.
 
 mailboxTooLarge=La carpeta %S está llena y no puede contener ningún mensaje más. Para hacer lugar para más mensajes, borre los correos viejos o no deseados y compacte la carpeta.
+outOfDiskSpace=No hay espacio suficiente en disco para descargar nuevos mensajes. Intente borrar correos viejos, vaciar la Papelera y compactar sus carpetas de correo e intente nuevamente.
 errorGettingDB=No se puede abrir el archivo resumen de %S. Quizás hubo un error en disco o la ruta completa es demasiado larga.
 defaultServerTag=(Predeterminado)
 
@@ -480,6 +482,22 @@
 megaByteAbbreviation2=%.*f MB
 gigaByteAbbreviation2=%.*f GB
 
+## LOCALIZATION NOTE(folderWithAccount):
+## This is used to show folder name together with an account name.
+## %1$S = folder name
+## %2$S = account name
+folderWithAccount=%1$S - %2$S
+## LOCALIZATION NOTE(folderWithUnreadMsgs):
+## This is a concatenation of two strings to compose a folder label with unread messages.
+## %1$S = folder name
+## %2$S = count of unread messages
+folderWithUnreadMsgs=%1$S (%2$S)
+## LOCALIZATION NOTE(summarizedValue):
+## This string shows an indication that the value shown is actually a summary
+## accumulated from all subfolders.
+## %S = summarized value from all subfolders
+folderSummarizedValue=*%S
+
 # Error message if message for a message id wasn't found
 errorOpenMessageForMessageIdTitle=Error abriendo message-id
 errorOpenMessageForMessageIdMessage=Mensaje para message-id %S no encontrado
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:04:02.000000000 +0000
@@ -10,11 +10,14 @@
 <!ENTITY itemCertificates.label  "Certificados">
 
 <!-- General Settings -->
-
 <!ENTITY enableGlodaSearch.label       "Habilitar indexado y búsqueda global">
 <!ENTITY enableGlodaSearch.accesskey   "i">
 <!ENTITY allowHWAccel.label            "Usar aceleración por hardware cuando esté disponible">
 <!ENTITY allowHWAccel.accesskey        "h">
+<!ENTITY storeType.label               "Tipo de almacenamiento de mensajes para nuevas cuentas:">
+<!ENTITY storeType.accesskey           "T">
+<!ENTITY mboxStore.label               "Un archivo grande (mbox)">
+<!ENTITY maildirStore.label            "Un archivo por mensaje (maildir)">
 
 <!ENTITY scrolling.label               "Desplazamiento">
 <!ENTITY useAutoScroll.label           "Usar autodesplazamiento">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/compose.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/compose.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/compose.dtd	2015-02-28 15:04:02.000000000 +0000
@@ -6,6 +6,8 @@
 <!ENTITY itemAutoComplete.label              "Direcciones">
 <!ENTITY itemSpellCheck.label                "Ortografía">
 
+<!ENTITY dialogCompose.title                 "Composición">
+
 <!ENTITY forwardMsg.label                     "Reenviar mensajes:">
 <!ENTITY forwardMsg.accesskey                 "m">
 <!ENTITY inline.label                         "Incorporado">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/offline.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/offline.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/offline.dtd	2015-02-28 15:04:02.000000000 +0000
@@ -11,8 +11,8 @@
 <!ENTITY radioRememberPrevState.accesskey "R">
 <!ENTITY radioAskState.label "Perguntarme el estado de conexión">
 <!ENTITY radioAskState.accesskey "x">
-<!ENTITY radioAlwaysOnline.label "Siempre iniciar conectado">
-<!ENTITY radioAlwaysOnline.accesskey "c">
+<!ENTITY radioAlwaysOnlineState.label "En línea">
+<!ENTITY radioAlwaysOnlineState.accesskey "l">
 <!ENTITY radioAlwaysOffline.label "Fuera de línea">
 <!ENTITY radioAlwaysOffline.accesskey "F">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/preferences.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/mail/chrome/messenger/preferences/preferences.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/mail/chrome/messenger/preferences/preferences.dtd	2015-02-28 15:04:02.000000000 +0000
@@ -17,4 +17,8 @@
 <!ENTITY panePrivacy.title        "Privacidad">
 <!ENTITY paneSecurity.title       "Seguridad">
 <!ENTITY paneAdvanced.title       "Avanzadas">
+<!ENTITY paneAccount.title        "Cuentas">
+
+<!ENTITY okButton.title           "Aceptar">
+<!ENTITY okButton.accesskey       "A">
  
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:04:01.000000000 +0000
@@ -15,11 +15,6 @@
 aboutReader.fontType.serif=Serif
 aboutReader.fontType.sans-serif=Sans-serif
 
-# LOCALIZATION NOTE (aboutReader.fontType.charis-sil, aboutReader.fontType.clear-sans):
-# These are the names of the fonts that are used on Android
-aboutReader.fontType.charis-sil=Charis SIL Compact
-aboutReader.fontType.clear-sans=Clear Sans
-
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
 aboutReader.fontTypeSample=Aa
 
@@ -27,4 +22,12 @@
 # for the font size setting. Tapping different samples will change the font size.
 aboutReader.fontSizeSample=A
 
-aboutReader.toolbarTip=Tocá la pantalla para mostrar opciones del lector
+aboutReader.toolbar.close=Cerrar vista de lector
+aboutReader.toolbar.typeControls=Controles de tipo
+aboutReader.toolbar.addToReadingList=Agregar a lista de lectura
+aboutReader.toolbar.removeFromReadingList=Eliminar de lista de lectura
+aboutReader.toolbar.openReadingList=Abrir lista de lectura
+aboutReader.toolbar.closeReadingList=Cerrar lista de lectura
+aboutReader.toolbar.share=Compartir
+
+aboutReader.footer.deleteThisArticle=Borrar este artículo
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:04:01.000000000 +0000
@@ -98,3 +98,6 @@
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copiar datos en bruto al portapapeles">
 
 <!ENTITY aboutSupport.sandboxTitle "Sandbox">
+
+<!ENTITY aboutSupport.safeModeTitle "Intentar modo seguro">
+<!ENTITY aboutSupport.restartInSafeMode.label "Reiniciar con complementos deshabilitados…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:04:01.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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Salir
+quitMenuitem.key=S
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:04:02.000000000 +0000
@@ -232,3 +232,4 @@
 <!ENTITY experiment.info.changetelemetry "Opciones de Telemetry">
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
 
+<!ENTITY setting.learnmore "Conocer más…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:04:02.000000000 +0000
@@ -56,8 +56,8 @@
 notification.installError=Hubo un error al instalar %1$S.
 notification.installError.retry=Intentar nuevamente
 notification.installError.retry.tooltip=Intentar descargar e instalar este complemento nuevamente
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Será instalado en breve.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S será instalado en breve.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Contribución sugerida: %S
@@ -99,8 +99,8 @@
 details.notification.uninstall=%1$S será desinstalado después de reiniciar %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S será actualizado después de reiniciar %2$S.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Será instalado en breve.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S será instalado en breve.
 
 #LOCALIZATION NOTE (details.experiment.time.daysRemaining) #1 is the number of days from now that the experiment will remain active (detail view).
 details.experiment.time.daysRemaining=#1 día restante;#1 días restantes
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:04:02.000000000 +0000
@@ -39,3 +39,4 @@
 
 <!ENTITY plugin.file                                         "Archivo">
 <!ENTITY plugin.mimeTypes                                    "Tipos MIME">
+<!ENTITY plugin.flashProtectedMode.label                     "Habilitar el modo protegido de Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:43:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-AR/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:04:02.000000000 +0000
@@ -31,5 +31,6 @@
 malwareBlocked=El sitio %S ha sido informado como un sitio de ataque y ha sido bloqueado basado en sus preferencias de seguridad.
 phishingBlocked=El sitio web %S ha sido reportado como un sitio falso diseñado para engañar usuarios para que compartan información personal o financiera.
 cspBlocked=Esta aplicación trata de acceder a un recurso que tiene una política de seguridad de contenido que evita sea cargada de esta forma.
-corruptedContentError=The application cannot continue loading because an error in the data transmission was detected.
-remoteXUL=This application tried to use an unsupported technology that is no longer available.
+corruptedContentError=La aplicación no puede continuar la carga porque se detectó un error en la transmisión de datos.
+remoteXUL=Esta aplicación trató de usar una tecnología no soportada que ya no está disponible.
+sslv3Used=Esta aplicación no puede garantizar la seguridad de sus datos en %S porque usa SSLv3, un protocolo de seguridad roto.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/b2g/chrome/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/b2g/chrome/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/b2g/chrome/overrides/appstrings.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/b2g/chrome/overrides/appstrings.properties	2015-02-28 15:04:04.000000000 +0000
@@ -32,3 +32,4 @@
 cspBlocked = Esta página tiene una política de seguridad de contenido que impide que pueda ser cargada de esta forma.
 corruptedContentError = La página que está intentando ver no puede ser mostrada porque se detectó un error en la transmisión de los datos.
 remoteXUL = Esta página usa una tecnología no admitida que ya no está disponible por defecto en Firefox.
+sslv3Used = Firefox no puede garantizar la seguridad de sus datos en %S porque usa SSLv3, un protocolo de seguridad que ya no es efectivo.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/dom/chrome/appstrings.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/dom/chrome/appstrings.properties	2015-02-28 15:04:04.000000000 +0000
@@ -32,3 +32,4 @@
 cspBlocked = Esta página tiene una política de seguridad de contenido que impide que se cargue de esta forma.
 corruptedContentError = La página que está intentando ver no puede mostrarse porque se ha detectado un error en la transmisión de datos.
 remoteXUL = Esta página usa una tecnología no admitida que ya no está disponible por defecto.
+sslv3Used = La seguridad de sus datos en %S no se puede garantizar porque usa SSLv3, un protocolo de seguridad que ya no es efectivo.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/dom/chrome/plugins.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/dom/chrome/plugins.properties	2015-02-28 15:04:04.000000000 +0000
@@ -15,5 +15,8 @@
 mimetype_label = Tipo MIME
 description_label = Descripción
 suffixes_label = Sufijos
+gmp_license_info = Información de licencia
 openH264_name = OpenH264 Video Codec proporcionado por Cisco Systems, Inc.
 openH264_description = Reproducir vídeo web y usar videochats.
+eme-adobe_name = Módulo de descifrado de contenido Primetime proporcionado por Adobe Systems, Incorporated
+eme-adobe_description = Reproducir vídeo web protegido.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/aboutDialog.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/aboutDialog.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -5,20 +5,30 @@
 <!ENTITY update.updateButton.accesskey "R">
 <!ENTITY update.applyButtonBillboard.label "Aplicar actualización…">
 <!ENTITY update.applyButtonBillboard.accesskey "A">
+<!ENTITY warningDesc.version "&brandShortName; es experimental y puede ser inestable.">
+<!ENTITY warningDesc.telemetryDesc "Envía información automáticamente sobre el rendimiento, hardware, uso y personalizaciones a &vendorShortName; para ayudar a mejorar &brandShortName;.">
+<!ENTITY community.exp.start "">
+<!ENTITY community.exp.mozillaLink "&vendorShortName;">
+<!ENTITY community.exp.middle " es una ">
+<!ENTITY community.exp.creditsLink "comunidad global">
+<!ENTITY community.exp.end " trabajando juntos para mantener la web abierta, pública y accesible a todos.">
 <!ENTITY community.start2 "&brandShortName; está diseñado por ">
 <!ENTITY community.mozillaLink "&vendorShortName;">
 <!ENTITY community.middle2 ", una ">
 <!ENTITY community.creditsLink "comunidad global">
-<!ENTITY community.end2 " que trabaja unida para hacer Internet mejor. Creemos que Internet debería ser abierta, pública y accesible a todo el mundo sin restricción alguna.">
-<!ENTITY contribute.start "¿Suena interesante? ">
-<!ENTITY contribute.getInvolvedLink "¡Involúcrese!">
-<!ENTITY contribute.end "">
+<!ENTITY community.end3 " trabajando juntos para mantener la web abierta, pública y accesible a todos.">
+<!ENTITY helpus.start "¿Quiere ayudar? ">
+<!ENTITY helpus.donateLink "Haga una donación">
+<!ENTITY helpus.middle " o ">
+<!ENTITY helpus.getInvolvedLink "¡involúcrese!">
+<!ENTITY helpus.end "">
 <!ENTITY bottomLinks.license "Información de licencia">
 <!ENTITY bottomLinks.rights "Derechos del usuario final">
 <!ENTITY bottomLinks.privacy "Política de privacidad">
 <!ENTITY update.checkingForUpdates "Buscando actualizaciones…">
 <!ENTITY update.noUpdatesFound "&brandShortName; está actualizado">
 <!ENTITY update.adminDisabled "Actualizaciones desactivada por el administrador de su sistema">
+<!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; está siendo actualizado por otra instancia">
 <!ENTITY update.failed.start "Actualización fallida. ">
 <!ENTITY update.failed.linkText "Descargar la última versión">
 <!ENTITY update.failed.end "">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/aboutDownloads.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/aboutDownloads.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/aboutDownloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/aboutDownloads.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -0,0 +1,16 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 aboutDownloads.title "Archivos guardados">
+<!ENTITY aboutDownloads.empty "No hay archivos guardados">
+<!ENTITY cmd.show.label "Abrir carpeta contenedora">
+<!ENTITY cmd.show.accesskey "A">
+<!ENTITY cmd.showMac.label "Mostrar en Finder">
+<!ENTITY cmd.showMac.accesskey "F">
+<!ENTITY cmd.open.label "Abrir">
+<!ENTITY cmd.open.accesskey "b">
+<!ENTITY cmd.removeFromHistory.label "Eliminar del historial">
+<!ENTITY cmd.removeFromHistory.accesskey "E">
+<!ENTITY cmd.clearDownloads.label "Limpiar descargas">
+<!ENTITY cmd.clearDownloads.accesskey "L">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -3,6 +3,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY addressbookWindow.title "Libreta de direcciones">
+<!ENTITY blankResultsPaneMessage.label "Esta libreta de direcciones muestra contactos solo tras una búsqueda">
+<!ENTITY localResultsOnlyMessage.label "Los contactos de las libretas de direcciones remotas no se muestran hasta que busca">
 <!ENTITY fileMenu.label "Archivo">
 <!ENTITY fileMenu.accesskey "a">
 <!ENTITY newMenu.label "Nuevo">
@@ -137,6 +139,8 @@
 <!ENTITY advancedButton.tooltip "Búsqueda avanzada de direcciones">
 <!ENTITY quickSearchCmd.key "k">
 <!ENTITY searchItem.title "Búsqueda rápida">
+<!ENTITY Addrbook.label "Libreta de direcciones">
+<!ENTITY Addrbook.accesskey "L">
 <!ENTITY GeneratedName.label "Nombre">
 <!ENTITY GeneratedName.accesskey "N">
 <!ENTITY PrimaryEmail.label "Correo electrónico">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-28 15:04:04.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/. -->
 
+<!ENTITY Addrbook.label "Libreta de direcciones">
+<!ENTITY Addrbook.accesskey "L">
 <!ENTITY GeneratedName.label "Nombre">
 <!ENTITY GeneratedName.accesskey "N">
 <!ENTITY PrimaryEmail.label "Correo electrónico">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-28 15:04:04.000000000 +0000
@@ -5,6 +5,7 @@
 emptyListName = Debe introducir un nombre de lista.
 lastFirstFormat = %S, %S
 firstLastFormat = %S %S\u0020\u0020
+allAddressBooks = Todas las libretas de direcciones
 newContactTitle = Nuevo contacto
 newContactTitleWithDisplayName = Nuevo contacto de %S
 editContactTitle = Editar contacto
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/am-server-top.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/am-server-top.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -70,3 +70,7 @@
 <!ENTITY browseNewsrc.accesskey "e">
 <!ENTITY accountTitle.label "Configuración de cuenta">
 <!ENTITY accountSettingsDesc.label "La siguiente cuenta es especial. No tiene identidades asociadas con ella.">
+<!ENTITY storeType.label "Tipo de almacenamiento de mensajes:">
+<!ENTITY storeType.accesskey "T">
+<!ENTITY mboxStore.label "Un archivo grande (mbox)">
+<!ENTITY maildirStore.label "Archivo por mensaje (maildir)">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/chat.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/chat.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/chat.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/chat.properties	2015-02-28 15:04:04.000000000 +0000
@@ -30,3 +30,4 @@
 log.currentWeek = Esta semana
 log.previousWeek = Última semana
 messagePreview = Nuevo mensaje de chat
+bundledMessagePreview = %1$S… (y #1 mensaje más);%1$S… (y #1 más mensajes)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/filter.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/filter.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/filter.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/filter.properties	2015-02-28 15:04:04.000000000 +0000
@@ -24,6 +24,7 @@
 continueButtonLabel = Continuar
 cannotEnableFilter = Este filtro probablemente ha sido creado por versiones más modernas de Mozilla/Netscape. No puede habilitar este filtro porque esta versión de la aplicación no sabe cómo aplicarlo.
 dontWarnAboutDeleteCheckbox = No volver a preguntarme
+filterFailureWarningPrefix = Acción del filtro fallida: "%1$S" con código de error=%2$S al intentar:
 searchTermsInvalidTitle = Términos de búsqueda no válidos
 searchTermsInvalidRule = Este filtro no puede guardarse porque el término de búsqueda "%1$S %2$S" no es válido en el contexto actual.
 filterActionOrderExplanation = Cuando un mensaje cumpla este filtro las acciones se ejecutarán en este orden:\n\n
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/glodaComplete.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/glodaComplete.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/glodaComplete.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/glodaComplete.properties	2015-02-28 15:04:04.000000000 +0000
@@ -5,5 +5,3 @@
 glodaComplete.messagesTagged.label = Mensajes etiquetados con: #1
 glodaComplete.messagesMentioning.label = Mensajes que mencionan: #1
 glodaComplete.messagesMentioningMany.label = Mensajes que mencionan: #1
-glodaComplete.webSearch1.label = Buscar #2 en #1
-glodaComplete.webSearch1.label.truncated = Buscar #2 en #1…
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/localMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/localMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/localMsgs.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/localMsgs.properties	2015-02-28 15:04:04.000000000 +0000
@@ -10,7 +10,6 @@
 hostContact = Servidor contactado, enviando credenciales de sesión…
 noNewMessages = No hay mensajes nuevos.
 receivedMsgs = Recibidos %1$S de %2$S mensajes
-pop3OutOfDiskSpace = No hay suficiente espacio en disco para descargar nuevos mensajes. Pruebe a borrar el correo antiguo, vaciar la papelera de reciclaje y compactar sus carpetas de correo, y luego vuelva a intentarlo.
 buildingSummary = Construyendo archivo de resumen de %S…
 localStatusDocumentDone = Hecho
 pop3ServerError = Se ha producido un error en la conexión el servidor de correo POP3.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-28 15:04:04.000000000 +0000
@@ -4,57 +4,57 @@
 
 unableToOpenFile = No se puede abrir el archivo %S.
 unableToOpenTmpFile = No se puede abrir el archivo temporal %S. Compruebe la configuración de su 'directorio temporal'.
-12502 = No es posible guardar su mensaje como plantilla.
-12503 = No es posible guardar su mensaje como un borrador.
-12506 = No se pudo abrir la carpeta de mensajes enviados. Compruebe que sus preferencias de correo son correctas.
-12510 = No se especificó remitente. Rellene su dirección de correo electrónico en las preferencias de Correo y Noticias.
-12511 = No se especificaron destinatarios. Introduzca un destinatario o grupo de noticias en el área de dirección.
-12512 = Error al escribir el archivo temporal.
-12514 = Ocurrió un error mientras se enviaba el correo. El servidor de correo respondió: %s. Verifique que su dirección de correo electrónico es correcta en las preferencias de Mail y vuelva a intentarlo.
-12516 = Ocurrió un error (SMTP) al enviar el correo. El servidor respondió: %s.
-12517 = Ocurrió un error al enviar el correo. El servidor de correo respondió: %s. Compruebe el mensaje y vuelva a intentarlo.
-12518 = Este mensaje no pudo ser publicado porque falló el intento de conexión con el servidor de noticias. El servidor puede no estar disponible o no acepta conexiones. Verifique que la configuración de su servidor de noticias es correcta y vuelva a intentarlo, o contacte con el administrador de su red.
-12519 = Ocurrió un error al procesar sus mensajes no enviados.
-12520 = Falló el envío del mensaje.
-12524 = Ocurrió un error al enviar el correo: error del servidor SMTP. El servidor respondió: %s Contacte con su administrador de correo para obtener ayuda.
-12525 = No es posible guardar su mensaje para poder enviarlo más tarde.
-12526 = Ocurrió un error de comunicación: %d. Vuelva a intentarlo.
-12527 = THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
-12528 = Ocurrió un error de red mientras se recibían los datos. (Error de red: %s) Pruebe a conectarse otra vez.
-12529 = Ocurrió un error al enviar el correo: la dirección de correo de respuesta no era válida. Asegúrese de que su dirección de correo electrónico es correcta en sus preferencias de correo y vuelva a intentarlo.
-12531 = Error en adjunto.
-12532 = El mensaje se envió con éxito, pero la copia a la carpeta Enviados falló.
-12554 = Sólo puede enviar un mensaje a un servidor de noticias a la vez.
-12555 = Cancelando…
-12560 = Su mensaje ha sido enviado al grupo de noticias pero no ha sido enviado a otros destinatarios.
-12563 = Error leyendo archivo.
+unableToSaveTemplate = No es posible guardar su mensaje como plantilla.
+unableToSaveDraft = No es posible guardar su mensaje como un borrador.
+couldntOpenFccFolder = No se puede abrir la carpeta Enviados. Verifique que la configuración de su cuenta es correcta.
+noSender = No se ha indicado remitente. Añada su dirección de correo en la configuración de la cuenta.
+noRecipients = No se especificaron destinatarios. Introduzca un destinatario o grupo de noticias en el área de dirección.
+errorWritingFile = Error al escribir el archivo temporal.
+errorSendingFromCommand = Ocurrió un error mientras se enviaba el correo. El servidor de correo respondió: %s. Verifique que su dirección de correo electrónico es correcta en las preferencias de su cuenta y vuelva a intentarlo.
+errorSendingDataCommand = Ocurrió un error en el servidor de salida (SMTP) al enviar el correo. El servidor respondió: %s.
+errorSendingMessage = Ocurrió un error al enviar el correo. El servidor de correo respondió: %s. Compruebe el mensaje y vuelva a intentarlo.
+postFailed = No se ha podido publicar el mensaje porque ha fallado la conexión al servidor de noticias. El servidor puede no estar disponible o está rechazando conexiones. Verifique que la configuración de su servidor de noticias es correcta y vuelva a intentarlo.
+errorQueuedDeliveryFailed = Ocurrió un error al procesar sus mensajes no enviados.
+sendFailed = Falló el envío del mensaje.
+smtpServerError = Ha sucedido un error al enviar el correo: error en el servidor de salida (SMTP). El servidor respondió: %s.
+unableToSendLater = Lo sentimos, no hemos podido guardar su mensaje para enviarlo más tarde.
+communicationsError = Ocurrió un error de comunicación: %d. Vuelva a intentarlo.
+dontShowAlert = ESTO ES SOLO UNA RESERVA DE ESPACIO. NUNCA DEBERÍA VER ESTE TEXTO.
+tcpReadError = Ocurrió un error de red mientras se recibían los datos (error de red: %s). Pruebe a conectarse otra vez.
+couldNotGetUsersMailAddress = Ocurrió un error al enviar el correo: la dirección de correo de respuesta no era válida. Asegúrese de que su dirección de correo electrónico es correcta en sus preferencias de correo y vuelva a intentarlo.
+mimeMpartAttachmentError = Error en adjunto.
+failedCopyOperation = El mensaje se envió con éxito, pero la copia a la carpeta Enviados falló.
+nntpNoCrossPosting = Sólo puede enviar un mensaje a un servidor de noticias a la vez.
+msgCancelling = Cancelando…
+sendFailedButNntpOk = Su mensaje ha sido enviado al grupo de noticias pero no ha sido enviado al otro destinatario.
+errorReadingFile = Error leyendo el archivo.
 followupToSenderMessage = El autor de este mensaje ha pedido que las respuestas sean enviadas únicamente al autor. Si también quiere responder al grupo de noticias, añada una nueva fila en el area de direcciones, elija Grupo de la lista de cabeceras, e introduzca el nombre del grupo de noticias.
-12570 = Ha habido un problema al adjuntar %S. Compruebe si tiene acceso al archivo.
-12572 = Ocurrió un error al enviar correo: el servidor de correo envió un saludo incorrecto: %s.
-12575 = Ocurrió un error al enviar el mensaje. El servidor de correo respondió: %1$s. Compruebe el destinatario del mensaje %2$s y vuelva a intentarlo.
-12582 = Ocurrió un error al enviar el correo: no es posible establecer un enlace seguro con el servidor SMTP %S usando STARTTLS ya que él no dice tener esa característica. Intente desactivar STARTTLS para ese servidor o contacte con su proveedor de servicios.
-12584 = Ocurrió un error al enviar el correo: no se ha podido obtener la contraseña para %S. El mensaje no ha sido enviado.
-12586 = El tamaño del mensaje que está intentando enviar excede un límite temporal de tamaño del servidor. El mensaje no se ha enviado; intente reducir el tamaño del mensaje o espere algún tiempo y vuelva a intentarlo. El servidor ha respondido: %s.
-12587 = El tamaño del mensaje que está intentando enviar excede el límite global de tamaño (%d bytes) del servidor. El mensaje no se ha enviado; reduzca el tamaño del mensaje y vuelva a intentarlo.
-12588 = El tamaño del mensaje que está intentando enviar excede el límite global de tamaño del servidor. El mensaje no se ha enviado; reduzca el tamaño del mensaje y vuelva a intentarlo. El servidor ha respondido: %s.
-12589 = Ocurrió un error al enviar el correo: el servidor SMTP %S es desconocido. El servidor puede estar configurado incorrectamente. Verifique que la configuración de su servidor SMTP es correcta y vuelva a intentarlo.
-12590 = El mensaje no se ha podido enviar porque ha fallado la conexión al servidor SMTP %S. El servidor puede no estar disponible o está rechazando las conexiones SMTP. Verifique que la configuración de su servidor SMTP es correcta y vuelva a intentarlo, o contacte con el administrador del servidor.
-12591 = El mensaje no se ha podido enviar porque se ha perdido la conexión al servidor SMTP %S en mitad de la transacción. Vuelva a intentarlo o contacte con su administrador de red.
-12592 = El mensaje no se ha podido enviar porque ha caducado la conexión al servidor SMTP %S. Vuelva a intentarlo o contacte con su administrador de red.
-12593 = El mensaje no se ha podido enviar usando el servidor SMTP %S por alguna razón desconocida. Verifique que la configuración de su servidor SMTP es correcta y vuelva a intentarlo, o contacte con su administrador de red.
-12594 = El servidor SMTP %S no parece admitir contraseñas cifradas. Si acaba de configurar la cuenta, pruebe a cambiar el 'Método de identificación' a 'Contraseña, transmitida de forma insegura' en la 'Configuración de cuentas | Configuración del servidor'. Si solía funcionar y ahora de pronto falla, es un indicio de que alguien podría estar robándole la contraseña.
-12595 = El servidor SMTP %S no parece admitir contraseñas cifradas. Si acaba de configurar esta cuenta, pruebe a cambiar el 'Método de identificación' a 'Contraseña normal' en 'Configuración de cuentas | Configuración del servidor'. Si solía funcionar y ahora de pronto falla, contacte con su proveedor o administrador de correo.
-12596 = El servidor SMTP %S no admite contraseñas sin cifrar. Intente cambiar el 'Método de identificación' a 'Contraseña cifrada' en la 'Configuración de cuentas | Configuración del servidor'.
-12597 = No se puede identificar al servidor SMTP %S. Compruebe la contraseña y verifique el 'Método de identificación' en 'Configuración de cuentas | Servidor de salida (SMTP)'.
-12598 = El tique Kerberos/GSSAPI no ha sido aceptado por el servidor SMTP %S. Compruebe que ha iniciado sesión en el dominio Kerberos/GSSAPI.
-12599 = El servidor SMTP %S no admite el mecanismo de identificación seleccionado. Cambie el 'Método de identificación' en la 'Configuración de cuentas | Servidor de salida (SMTP)'.
-12600 = No es posible identificarse ante el servidor SMTP %S. No admite identificación (SMTP-AUTH) pero se ha elegido utilizar identificación. Cambie el 'Método de identificación' a 'Ninguno' en la 'Configuración de cuentas | Servidor de salida (SMTP)' o contacte con su proveedor del servicio.
+errorAttachingFile = Ha habido un problema al adjuntar %S. Compruebe si tiene acceso al archivo.
+incorrectSmtpGreeting = Ocurrió un error al enviar el correo: el servidor de correo envió un saludo incorrecto: %s.
+errorSendingRcptCommand = Ha ocurrido un error al enviar el mensaje. El servidor de correo respondió: \n%1$S.\n Verifique el destinatario "%2$S" y vuelva a intentarlo.
+startTlsFailed = Ha ocurrido un error al enviar el mensaje: no es posible establecer un enlace seguro con el servidor de salida (SMTP) %S usando STARTTLS ya que no anuncia ese mecanismo. Desactive STARTTLS para ese servidor o contacte con su proveedor del servicio.
+smtpPasswordUndefined = Ha ocurrido un error al enviar el mensaje: no se ha podido obtener la contraseña para %S. El mensaje no se ha enviado.
+smtpTempSizeExceeded = El tamaño del mensaje que está intentando enviar excede un límite temporal de tamaño del servidor. El mensaje no se ha enviado; intente reducir el tamaño del mensaje o espere un rato y vuelva a intentarlo. El servidor respondió: %s.
+smtpPermSizeExceeded1 = El tamaño del mensaje que está intentando enviar excede el límite global de tamaño (%d bytes) del servidor. El mensaje no se ha enviado; reduzca el tamaño del mensaje y vuelva a intentarlo.
+smtpPermSizeExceeded2 = El tamaño del mensaje que está intentando enviar excede el límite global de tamaño del servidor. El mensaje no se ha enviado; reduzca el tamaño del mensaje y vuelva a intentarlo. El servidor respondió: %s.
+smtpSendFailedUnknownServer = Ha ocurrido un error al enviar el mensaje: el servidor de salida (SMTP) %S es desconocido. El servidor puede estar mal configurado. Verifique que la configuración de su servidor de salida (SMTP) es correcta y vuelva a intentarlo.
+smtpSendRefused = El mensaje no se ha podido enviar por ha fallado la conexión al servidor de salida (SMTP) %S. El servidor puede no estar disponible o está rechazando conexiones al servidor de salida (SMTP). Verifique que los ajustes de su servidor de salida (SMTP) son correctos y vuelva a intentarlo.
+smtpSendInterrupted = El mensaje no se ha podido enviar porque la conexión al servidor de salida (SMTP) %S se perdió en mitad de la transacción. Vuelva a intentarlo.
+smtpSendTimeout = El mensaje no se ha podido enviar porque ha caducado la conexión al servidor de salida (SMTP) %S. Vuelva a intentarlo.
+smtpSendFailedUnknownReason = El mensaje no se ha podido enviar usando el servidor de salida (SMTP) %S por una razón desconocida. Verifique que los ajustes de su servidor de salida (SMTP) son correctos y vuelva a intentarlo.
+smtpAuthChangeEncryptToPlainNoSsl = El servidor de salida (SMTP) %S no parece admitir contraseñas cifradas. Si acaba de configurar la cuenta, pruebe a cambiar el 'Método de identificación' en la 'Configuración de cuentas | Configuración del servidor' a 'Contraseña, transmitida de forma insegura'. Si antes funcionaba pero ya no, puede que se le haya sustraído su contraseña.
+smtpAuthChangeEncryptToPlainSsl = El servidor de salida (SMTP) %S no parece admitir contraseñas cifradas. Si acaba de configurar la cuenta, pruebe a cambiar el 'Método de identificación' en la 'Configuración de cuentas | Configuración del servidor' a 'Contraseña normal'.
+smtpAuthChangePlainToEncrypt = El servidor de salida (SMTP) %S no admite contraseñas no cifradas. Pruebe a cambiar el 'Método de identificación' en la 'Configuración de cuentas | Configuración del servidor' a 'Contraseña cifrada'.
+smtpAuthFailure = No se puede identificar al servidor de salida (SMTP) %S. Compruebe la contraseña y verifique el 'Método de identificación' en 'Configuración de cuentas | Servidor de salida (SMTP)'.
+smtpAuthGssapi = El tique Kerberos/GSSAPI no ha sido aceptado por el servidor de salida (SMTP) %S. Compruebe que ha iniciado sesión en el dominio Kerberos/GSSAPI.
+smtpAuthMechNotSupported = El servidor de salida (SMTP) %S no admite el mecanismo de identificación seleccionado. Cambie el 'Método de identificación' en la 'Configuración de cuentas | Servidor de salida (SMTP)'.
+smtpAuthNotSupported = No es posible identificarse ante el servidor de salida (SMTP) %S. No admite identificación (SMTP-AUTH) pero se ha elegido utilizar identificación. Cambie el 'Método de identificación' a 'Ninguno' en la 'Configuración de cuentas | Servidor de salida (SMTP)' o contacte con su proveedor del servicio para obtener indicaciones.
 errorIllegalLocalPart = Hay caracteres no-ASCII en la parte local de la dirección de destino %s. Este formato no se admite aún. Cambie esta dirección y vuelva a intentarlo.
 saveDlogTitle = Guardar mensaje
 saveDlogMessages = El mensaje no se ha enviado. ¿Quiere guardar el mensaje en su carpeta Borradores (%1$S)?
 defaultSubject = (sin asunto)
 chooseFileToAttach = Adjuntar archivo(s)
-genericFailureExplanation = Verifique que sus configuraciones de correo y noticias son correctas y vuelva a intentarlo.
+genericFailureExplanation = Verifique que la configuración de su cuenta es correcta y vuelva a intentarlo.
 undisclosedRecipients = destinatarios-no-revelados
 chooseFileToAttachViaCloud = Adjuntar archivo(s) a través de %1$S
 windowTitlePrefix = Redacción:
@@ -99,7 +99,7 @@
 copyMessageFailed = Falló la copia.
 filterMessageComplete = Filtro completo.
 filterMessageFailed = Filtro fallido.
-largeMessageSendWarning = ¡Advertencia! Está a punto de enviar un mensaje de tamaño %S que podría exceder el límite permitido del servidor de correo. ¿Está seguro de que quiere hacerlo?
+largeMessageSendWarning = ¡Advertencia! Está a punto de enviar un mensaje de tamaño %S. ¿Está seguro de que quiere hacerlo?
 sendingMessage = Enviando el mensaje…
 sendMessageErrorTitle = Error de envío de mensaje
 postingMessage = Publicando el mensaje…
@@ -147,7 +147,7 @@
 cloudFilePrivacyNotification = Enlazado completado. Tenga en cuenta que los adjuntos enlazados pueden ser accesibles a las personas que puedan ver o adivinar los enlaces.
 smtpEnterPasswordPrompt = Introduzca su contraseña para %S:
 smtpEnterPasswordPromptWithUsername = Introduzca la contraseña para %2$S en %1$S:
-smtpEnterPasswordPromptTitle = Se requiere contraseña para el servidor SMTP
+smtpEnterPasswordPromptTitle = Se requiere contraseña para el servidor de salida (SMTP)
 removeAttachmentMsgs = Eliminar adjunto;Eliminar adjuntos
 errorSavingMsg = Ha habido un error mientras se guardaba el mensaje en %S. ¿Reintentar?
 errorFilteringMsg = Su mensaje ha sido enviado y guardado, pero ha sucedido un error al aplicarle los filtros de mensajes.
@@ -158,7 +158,7 @@
 errorCloudFileQuota.title = Error de cuota
 errorCloudFileQuota.message = Subir %2$S a %1$S excedería su cuota de espacio.
 errorCloudFileNameLimit.title = Error en el nombre del archivo
-errorCloudFileNameLimit.message = La subida de %2$S a %1$S contiene más de 120 caracteres en su nombre. Renombre el archivo para que su nombre tenga 120 caracteres o menos y súbalo de nuevo.
+errorCloudFileNameLimit.message = %2$S contiene más de 120 caracteres en su nombre, lo que supera la longitud máxima de nombre de archivo para %1$S. Renombre el archivo para que su nombre tenga 120 caracteres o menos y súbalo de nuevo.
 errorCloudFileLimit.title = Error en el tamaño del archivo
 errorCloudFileLimit.message = %2$S excede el tamaño máximo para %1$S.
 errorCloudFileOther.title = Error desconocido\u0020
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/messenger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/messenger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/messenger.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/messenger.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -133,6 +133,8 @@
 <!ENTITY messagePaneVertical.accesskey "v">
 <!ENTITY showFolderPaneCmd.label "Panel de carpetas">
 <!ENTITY showFolderPaneCmd.accesskey "c">
+<!ENTITY showFolderPaneColsCmd.label "Columnas del panel de carpetas">
+<!ENTITY showFolderPaneColsCmd.accesskey "C">
 <!ENTITY showMessageCmd.label "Mensaje">
 <!ENTITY showMessageCmd.accesskey "e">
 <!ENTITY folderView.label "Carpetas">
@@ -546,7 +548,9 @@
 <!ENTITY addNewTag.accesskey "N">
 <!ENTITY manageTags.label "Administrar etiquetas…">
 <!ENTITY manageTags.accesskey "M">
-<!ENTITY folderColumn.label "Nombre">
+<!ENTITY folderNameColumn.label "Nombre">
+<!ENTITY folderUnreadColumn.label "No leídos">
+<!ENTITY folderTotalColumn.label "Total">
 <!ENTITY folderSizeColumn.label "Tamaño">
 <!ENTITY folderContextGetMessages.label "Recibir mensajes">
 <!ENTITY folderContextGetMessages.accesskey "R">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/messenger.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/messenger.properties	2015-02-28 15:04:04.000000000 +0000
@@ -62,6 +62,7 @@
 alertFilterCheckbox = No volver a avisarme.
 compactFolderDeniedLock = La carpeta '%S' no puede ser compactada porque hay otra operación en curso. Inténtelo más tarde.
 compactFolderWriteFailed = La carpeta '%S' no se pudo compactar porque falló la escritura en la carpeta. Compruebe que tiene suficiente espacio en disco y privilegios de escritura en el directorio, y vuelva a intentarlo.
+compactFolderInsufficientSpace = Algunas carpetas (p.e. '%S') no se pueden compactar porque no hay suficiente espacio libre en disco. Elimine algunos archivos y vuelva a intentarlo.
 filterFolderHdrAddFailed = Los mensajes no se han podido filtrar a la carpeta '%S' porque no se pudo añadir un mensaje en ella. Verifique que la carpeta se está mostrando correctamente o intente repararla desde las propiedades de la carpeta.
 filterFolderWriteFailed = Los mensajes no pudieron ser filtrados a la carpeta '%S' porque falló la escritura a esa carpeta. Compruebe que tiene suficiente espacio en disco y permiso de escritura en el directorio, e inténtelo de nuevo.
 copyMsgWriteFailed = Los mensajes no han podido ser movidos o copiados a la carpeta '%S' porque falló la escritura en esa carpeta. Para conseguir más espacio, desde el menú Archivo, escoja primero Vaciar Papelera, y luego escoja Compactar carpetas, y vuelva a intentarlo.
@@ -71,6 +72,7 @@
 verboseFolderFormat = %1$S en %2$S
 filterFolderTruncateFailed = Ha sucedido un error al truncar la bandeja de entrada tras filtrar un mensaje a la carpeta '%1$S'. Puede que necesite cerrar %2$S y eliminar INBOX.msf.
 mailboxTooLarge = La carpeta %S está llena, y no puede retener más mensajes. Para hacer sitio para más mensajes, borre cualquier correo antiguo o no deseado y compacte la carpeta.
+outOfDiskSpace = No hay suficiente espacio en disco para descargar nuevos mensajes. Pruebe a borrar el correo antiguo, vaciar la papelera de reciclaje y compactar sus carpetas de correo, y luego vuelva a intentarlo.
 errorGettingDB = No se puede abrir el archivo resumen de %S. Quizá hay un error en el disco, o la ruta completa es demasiado larga.
 defaultServerTag = (Predeterminado)
 messageUnread = No leído
@@ -94,8 +96,10 @@
 authKerberos = Kerberos / GSSAPI
 authExternal = Certificado TLS
 authNTLM = NTLM
+authOAuth2 = OAuth2
 authAnySecure = Cualquier método seguro (obsoleto)
 authAny = Cualquier método (inseguro)
+oauth2WindowTitle = Escriba las credenciales para %1$S en %2$S
 serverType-nntp = Servidor de noticias (NNTP)
 serverType-pop3 = Servidor de correo POP
 serverType-imap = Servidor de correo IMAP
@@ -261,6 +265,9 @@
 kiloByteAbbreviation2 = %.*f KB
 megaByteAbbreviation2 = %.*f MB
 gigaByteAbbreviation2 = %.*f GB
+folderWithAccount = %1$S - %2$S
+folderWithUnreadMsgs = %1$S (%2$S)
+folderSummarizedValue = *%S
 errorOpenMessageForMessageIdTitle = Error al abrir el message-id
 errorOpenMessageForMessageIdMessage = Mensaje correspondiente al message-id %S no encontrado
 confirmPhishingTitle = Alerta de correo fraudulento
@@ -366,8 +373,6 @@
 safeModeRestartButton = Reiniciar
 update.downloadAndInstallButton.label = Actualizar a %S
 update.downloadAndInstallButton.accesskey = U
-websearch.setDefault = Configurar este buscador como el predeterminado
-websearch.isDefault = Este buscador es actualmente el predeterminado
 outdatedpluginsMessage.title = Algunos plugins usados por esta página están obsoletos.
 outdatedpluginsMessage.updateButton.label = Actualizar plugins…
 outdatedpluginsMessage.updateButton.accesskey = U
@@ -400,3 +405,5 @@
 ignoredThreadsFeedback = Las respuestas a la conversación que estaba seleccionada no se mostrarán.;Las respuestas a las #1 conversaciones que estaban seleccionadas no se mostrarán.
 ignoredSubthreadsFeedback = Las respuestas a la subconversación que estaba seleccionada no se mostrarán.;Las respuestas a las #1 subconversaciones que estaban seleccionadas no se mostrarán.
 saveAsType = archivo %S
+openSearch.label = Buscar "%2$S" en %1$S
+openSearch.label.truncated = Buscar "%2$S…" en %1$S
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -3,17 +3,19 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY itemGeneral.label "General">
+<!ENTITY dataChoicesTab.label "Elección de datos">
 <!ENTITY itemDisplay.label "Lectura y visualización">
 <!ENTITY itemUpdate.label "Actualización">
 <!ENTITY itemNetworking.label "Red y espacio en disco">
 <!ENTITY itemCertificates.label "Certificados">
-<!ENTITY submitTelemetry.label "Enviar datos de rendimiento">
-<!ENTITY submitTelemetry.accesskey "n">
-<!ENTITY telemetryInfoLink.label "Más información sobre Telemetry">
 <!ENTITY enableGlodaSearch.label "Activar indexador y búsqueda global">
 <!ENTITY enableGlodaSearch.accesskey "A">
 <!ENTITY allowHWAccel.label "Usar aceleración hardware cuando esté disponible">
 <!ENTITY allowHWAccel.accesskey "h">
+<!ENTITY storeType.label "Tipo de almacenamiento de mensajes para las nuevas cuentas:">
+<!ENTITY storeType.accesskey "T">
+<!ENTITY mboxStore.label "Un archivo grande (mbox)">
+<!ENTITY maildirStore.label "Archivo por mensaje (maildir)">
 <!ENTITY scrolling.label "Desplazamiento">
 <!ENTITY useAutoScroll.label "Usar desplazamiento automático">
 <!ENTITY useAutoScroll.accesskey "U">
@@ -32,6 +34,16 @@
 <!ENTITY returnReceiptsInfo.label "Determinar cómo gestiona &brandShortName; los acuses de recibo">
 <!ENTITY showReturnReceipts.label "Acuses de recibo…">
 <!ENTITY showReturnReceipts.accesskey "r">
+<!ENTITY telemetrySection.label "Telemetry">
+<!ENTITY telemetryDesc.label "Comparte datos de rendimiento, uso, hardware y personalización sobre su cliente de correo con &vendorShortName; para ayudarnos a mejorar &brandShortName;">
+<!ENTITY enableTelemetry.label "Activar Telemetry">
+<!ENTITY enableTelemetry.accesskey "T">
+<!ENTITY telemetryLearnMore.label "Saber más">
+<!ENTITY crashReporterSection.label "Agente de informe de fallos">
+<!ENTITY crashReporterDesc.label "&brandShortName; envía informes de fallo para ayudar a &vendorShortName; a hacer su cliente de correo más estable y seguro">
+<!ENTITY enableCrashReporter.label "Activar agente de informe de fallos">
+<!ENTITY enableCrashReporter.accesskey "c">
+<!ENTITY crashReporterLearnMore.label "Saber más">
 <!ENTITY reading.caption "Lectura">
 <!ENTITY display.caption "Visualización">
 <!ENTITY showCondensedAddresses.label "Mostrar sólo el atributo 'nombre mostrado' para las personas de mi libreta de direcciones">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/compose.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/compose.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/compose.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -5,6 +5,7 @@
 <!ENTITY itemGeneral.label "General">
 <!ENTITY itemAutoComplete.label "Destinatario">
 <!ENTITY itemSpellCheck.label "Ortografía">
+<!ENTITY dialogCompose.title "Redactando">
 <!ENTITY forwardMsg.label "Reenviar mensajes:">
 <!ENTITY forwardMsg.accesskey "m">
 <!ENTITY inline.label "Incorporados">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/general.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/general.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/general.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/general.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -31,3 +31,4 @@
 <!ENTITY customsound.accesskey "U">
 <!ENTITY browse.label "Examinar…">
 <!ENTITY browse.accesskey "E">
+<!ENTITY defaultSearchEngine.label "Buscador predeterminado">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/offline.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/offline.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/offline.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -10,8 +10,8 @@
 <!ENTITY radioRememberPrevState.accesskey "R">
 <!ENTITY radioAskState.label "Preguntarme el estado de conexión">
 <!ENTITY radioAskState.accesskey "d">
-<!ENTITY radioAlwaysOnline.label "Con conexión">
-<!ENTITY radioAlwaysOnline.accesskey "I">
+<!ENTITY radioAlwaysOnlineState.label "Con conexión">
+<!ENTITY radioAlwaysOnlineState.accesskey "x">
 <!ENTITY radioAlwaysOffline.label "Sin conexión">
 <!ENTITY radioAlwaysOffline.accesskey "o">
 <!ENTITY textGoingOnline "¿Enviar mensajes pendientes al pasar a modo con conexión?">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/preferences.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/mail/chrome/messenger/preferences/preferences.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/mail/chrome/messenger/preferences/preferences.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -16,3 +16,6 @@
 <!ENTITY panePrivacy.title "Privacidad">
 <!ENTITY paneSecurity.title "Seguridad">
 <!ENTITY paneAdvanced.title "Avanzado">
+<!ENTITY paneAccount.title "Cuentas">
+<!ENTITY okButton.title "Aceptar">
+<!ENTITY okButton.accesskey "A">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pipnss/security.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pipnss/security.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pipnss/security.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pipnss/security.properties	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/.
-
-Title = Aviso de seguridad
-PostToInsecureFromSecureMessage = Aunque esta página está cifrada, la información que ha introducido va a enviarse por una conexión sin cifrar, y podría ser leída fácilmente por terceras personas.##¿Seguro que desea enviar esta información?##
-Continue = Continuar
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/certManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/certManager.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/certManager.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -8,8 +8,6 @@
 <!ENTITY certmgr.tab.websites3 "Servidores">
 <!ENTITY certmgr.tab.ca "Autoridades">
 <!ENTITY certmgr.tab.orphan2 "Otros">
-<!ENTITY certmgr.ca.builtins "CAs integradas">
-<!ENTITY certmgr.ca.mycas "CAs gestionadas por usted">
 <!ENTITY certmgr.mine "Tiene certificados de estas organizaciones que le identifican:">
 <!ENTITY certmgr.others "Tiene certificados en archivo que identifican estas personas:">
 <!ENTITY certmgr.websites2 "Tiene certificados en archivo que identifican estos servidores:">
@@ -31,7 +29,6 @@
 <!ENTITY certmgr.certdetail.serialnumber "Número de serie">
 <!ENTITY certmgr.certdetail.sha256fingerprint "Huella digital SHA-256">
 <!ENTITY certmgr.certdetail.sha1fingerprint "Huella digital SHA1">
-<!ENTITY certmgr.editcert.title "Editar la configuración de los certificados de seguridad">
 <!ENTITY certmgr.editcacert.title "Editar configuración de confianza de la CA">
 <!ENTITY certmgr.editcert.edittrust "Editar configuraciones de confianza:">
 <!ENTITY certmgr.editcert.trustssl "Este certificado puede identificar sitios web.">
@@ -42,11 +39,6 @@
 <!ENTITY certmgr.editemailcert.dotrust "Confiar en la autenticidad de este certificado.">
 <!ENTITY certmgr.editemailcert.donttrust "No confiar en la autenticidad de este certificado.">
 <!ENTITY certmgr.deletecert.title "Eliminar certificado">
-<!ENTITY certmgr.deletecert.beforename "Ha pedido que se elimine este certificado:">
-<!ENTITY certmgr.deletecert.aftername "¿Seguro que quiere eliminar este certificado?">
-<!ENTITY certmgr.deleteusercert.title "Eliminar su certificado">
-<!ENTITY certmgr.deleteusercert.beforename "Ha pedido la eliminación de este certificado:">
-<!ENTITY certmgr.deleteusercert.aftername "Una vez haya eliminado este certificado, no podrá leer el correo que haya sido cifrado con él.">
 <!ENTITY certmgr.certname "Nombre del certificado">
 <!ENTITY certmgr.certserver "Servidor">
 <!ENTITY certmgr.override_lifetime "Vida útil">
@@ -63,8 +55,6 @@
 <!ENTITY certmgr.edit3.accesskey "E">
 <!ENTITY certmgr.editca.label "Editar confianza de la CA">
 <!ENTITY certmgr.editca.accesskey "d">
-<!ENTITY certmgr.add.label "Añadir">
-<!ENTITY certmgr.add.accesskey "A">
 <!ENTITY certmgr.export.label "Exportar…">
 <!ENTITY certmgr.export.accesskey "x">
 <!ENTITY certmgr.delete2.label "Eliminar…">
@@ -82,7 +72,7 @@
 <!ENTITY certmgr.fields.label "Valor del campo">
 <!ENTITY certmgr.fields.accesskey "V">
 <!ENTITY certmgr.hierarchy.label "Jerarquía de certificados">
-<!ENTITY certmgr.hierarchy.accesskey "C">
+<!ENTITY certmgr.hierarchy.accesskey2 "J">
 <!ENTITY certmgr.addException.label "Añadir excepción…">
 <!ENTITY certmgr.addException.accesskey "x">
 <!ENTITY exceptionMgr.title "Añadir excepción de seguridad">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/deviceManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/deviceManager.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/deviceManager.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -7,10 +7,6 @@
 <!ENTITY devmgr.devlist.label "Módulos de seguridad y dispositivos">
 <!ENTITY devmgr.details.title "Detalles">
 <!ENTITY devmgr.details.title2 "Valor">
-<!ENTITY devmgr.status.label "Estado">
-<!ENTITY devmgr.version.label "Versión">
-<!ENTITY devmgr.button.changeslotname.label "Cambiar nombre de la ranura">
-<!ENTITY devmgr.button.changeslotname.accesskey "C">
 <!ENTITY devmgr.button.login.label "Iniciar sesión">
 <!ENTITY devmgr.button.login.accesskey "n">
 <!ENTITY devmgr.button.logout.label "Terminar sesión">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/pippki.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/pippki.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/pippki.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -8,22 +8,12 @@
 <!ENTITY setPassword.newPassword.label "Nueva contraseña:">
 <!ENTITY setPassword.reenterPassword.label "Nueva contraseña (confirmar):">
 <!ENTITY setPassword.meter.label "Medidor de calidad de la contraseña">
-<!ENTITY setPassword.meter.loading "Cargando">
 <!ENTITY resetPasswordButtonLabel "Restablecer">
 <!ENTITY resetPassword.title "Restablecer la contraseña maestra">
 <!ENTITY resetPassword.text "Si restablece su contraseña maestra, todas las contraseñas web y de correo electrónico almacenados, los datos de los formularios, certificados personales y claves privadas serán olvidados. ¿Seguro que quiere restablecer su contraseña maestra?">
 <!ENTITY getPassword.title "Introduzca la contraseña maestra">
 <!ENTITY getPassword.tokenName2.label "Disp. seguridad:">
 <!ENTITY getPassword.password.label "Contraseña:">
-<!ENTITY piperror.title "Error">
-<!ENTITY pipalert.title "Error no recuperable">
-<!ENTITY pref.security.general.lHeader "Seguridad">
-<!ENTITY pref.security.general.rHeader "Configuraciones para la seguridad general">
-<!ENTITY pref.security.general.header "Configuraciones para la seguridad general">
-<!ENTITY pref.security.general.level.title "Nivel de seguridad">
-<!ENTITY pref.security.general.paranoid.label "Usar configuraciones de seguridad paranoicas">
-<!ENTITY pref.security.general.certificates.title "Certificados">
-<!ENTITY pref.security.general.manageCert.label "Administrar certificados">
 <!ENTITY downloadCert.title "Descargando certificado">
 <!ENTITY downloadCert.message1 "Se le ha pedido que confíe en una nueva Autoridad Certificadora (CA).">
 <!ENTITY downloadCert.trustSSL "Confiar en esta CA para identificar sitios web.">
@@ -31,9 +21,7 @@
 <!ENTITY downloadCert.trustObjSign "Confiar en esta CA para identificar desarrolladores de software.">
 <!ENTITY downloadCert.message3 "Antes de confiar en esta CA para cualquier propósito, debe examinar el certificado, política y procedimientos de la CA (si están disponibles).">
 <!ENTITY downloadCert.viewCert.label "Ver">
-<!ENTITY downloadCert.viewPolicy.label "Política">
 <!ENTITY downloadCert.viewCert.text "Examinar certificado de CA">
-<!ENTITY downloadCert.viewPolicy.text "Examinar políticas y procedimientos de la CA">
 <!ENTITY clientAuthAsk.title "Petición de identificación de usuario">
 <!ENTITY clientAuthAsk.message1 "El siguiente sitio ha pedido que usted se identifique con un certificado:">
 <!ENTITY clientAuthAsk.message2 "Elija un certificado para presentarlo como identificación:">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/security/manager/chrome/pippki/pippki.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/security/manager/chrome/pippki/pippki.properties	2015-02-28 15:04:04.000000000 +0000
@@ -5,7 +5,6 @@
 CertPassPrompt = Introduzca la contraseña de seguridad personal para las claves privadas PSM del dispositivo de seguridad.
 newCAMessage1 = ¿Quiere confiar en "%S" para los siguientes propósitos?
 unnamedCA = Autoridad certificadora (sin nombre)
-editTrustWindowTitle = Editar confianza en el certificado
 editTrustCA = El certificado "%S" representa a una autoridad certificadora.
 editTrustEmail = El certificado "%S" fue emitido por:
 issuerNotTrusted = Dado que no confía en la autoridad certificadora que emitió este certificado, tampoco confía en la autenticidad de este certificado a no ser que aquí esté especificado lo contrario.
@@ -30,7 +29,6 @@
 chooseP12BackupFileDialog = Nombre del archivo a salvaguardar
 file_browse_PKCS12_spec = Archivos PKCS12
 getPKCS12FilePasswordMessage = Introduzca la contraseña que se usó para cifrar esta copia de respaldo del certificado:
-resetPreferences = Utilice este botón para reiniciar las preferencias de seguridad de %S a sus valores originales.
 certVerified = Este certificado ha sido verificado para los siguientes usos:
 certNotVerified_CertRevoked = No se pudo verificar este certificado porque ha sido revocado.
 certNotVerified_CertExpired = No se pudo verificar este certificado porque ha caducado.
@@ -42,10 +40,6 @@
 certNotVerified_Unknown = No se pudo verificar este certificado por razones desconocidas.
 clientAuthMessage1 = Organización: "%S"
 clientAuthMessage2 = Emitido bajo: "%S"
-pageInfo_SiteNotVerified = Identidad del sitio web no verificada
-pageInfo_WebSiteVerified = Identidad del sitio web verificada
-pageInfo_Identity_Verified = El sitio web %S admite identificación para la página que está viendo. La identidad de este sitio web ha sido verificada por %S, una autoridad certificadora en la que confía para este propósito.
-pageInfo_ViewCertificate = Ver el certificado de seguridad que verifica la identidad de este sitio web.
 pageInfo_NoEncryption = Conexión sin cifrar
 pageInfo_Privacy_None1 = El sitio web %S no admite cifrado para la página que está viendo.
 pageInfo_Privacy_None2 = La información enviada por Internet sin cifrar puede ser vista por otras personas.\u0020
@@ -58,7 +52,6 @@
 pageInfo_Privacy_Broken1 = Parte de la página que está viendo no han sido cifradas antes de ser transmitidas por Internet, o el cifrado no es suficientemente fuerte.
 certDetails = Visor de certificados:
 notPresent = <No es parte de un certificado>
-unknownIssuer = <Emisor desconocido>
 escrowFinalMessage = Debería pulsar Aceptar únicamente si confía en "%S" para proteger su clave privada de cifrado.
 password_not_set = (sin definir)
 failed_pw_change = No fue posible cambiar la contraseña maestra.
@@ -121,6 +114,5 @@
 addExceptionCheckingLong2 = Intentando identificar este sitio…
 addExceptionNoCertShort = No hay información disponible
 addExceptionNoCertLong2 = No es posible obtener el estado de identificación de este sitio.
-addExceptionConnectionFailed = Conexión fallida
 caCertExistsTitle = El certificado existe
 caCertExistsMessage = El certificado ya existe.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:04:04.000000000 +0000
@@ -4,12 +4,19 @@
 
 aboutReader.loading = Cargando…
 aboutReader.loadError = Fallo al cargar el artículo de la página
-aboutReader.colorSchemeLight = Claro
-aboutReader.colorSchemeDark = Oscuro
-aboutReader.colorSchemeSepia = Sepia
-aboutReader.colorSchemeAuto = Auto
-aboutReader.fontTypeSerif = Charis SIL Compact
-aboutReader.fontTypeSansSerif = Clear Sans
+aboutReader.colorScheme.light = Claro
+aboutReader.colorScheme.dark = Oscuro
+aboutReader.colorScheme.sepia = Sepia
+aboutReader.colorScheme.auto = Auto
+aboutReader.fontType.serif = Serif
+aboutReader.fontType.sans-serif = Sans-serif
 aboutReader.fontTypeSample = Aa
 aboutReader.fontSizeSample = A
-aboutReader.toolbarTip = Toque la pantalla para mostrar opciones del lector
+aboutReader.toolbar.close = Cerrar vista de lectura
+aboutReader.toolbar.typeControls = Controles de tipografía
+aboutReader.toolbar.addToReadingList = Añadir a la lista de lectura
+aboutReader.toolbar.removeFromReadingList = Eliminar de la lista de lectura
+aboutReader.toolbar.openReadingList = Abrir lista de lectura
+aboutReader.toolbar.closeReadingList = Cerrar lista de lectura
+aboutReader.toolbar.share = Compartir
+aboutReader.footer.deleteThisArticle = Eliminar este artículo
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -58,3 +58,5 @@
 <!ENTITY aboutSupport.copyTextToClipboard.label "Copiar el texto al portapapeles">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copiar datos en crudo al portapapeles">
 <!ENTITY aboutSupport.sandboxTitle "Entorno de pruebas">
+<!ENTITY aboutSupport.safeModeTitle "Probar modo seguro">
+<!ENTITY aboutSupport.restartInSafeMode.label "Reiniciar con complementos desactivados…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:04:04.000000000 +0000
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+quitMenuitem.label = Salir
+quitMenuitem.key = q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -166,3 +166,4 @@
 <!ENTITY experiment.info.learnmore.accesskey "S">
 <!ENTITY experiment.info.changetelemetry "Configuración de Telemetry">
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
+<!ENTITY setting.learnmore "Saber más…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:04:04.000000000 +0000
@@ -31,7 +31,7 @@
 notification.installError = Ha sucedido un error al instalar %1$S.
 notification.installError.retry = Vuelva a intentarlo
 notification.installError.retry.tooltip = Intente descargar e instalar este complemento de nuevo
-notification.openH264Pending = Se instalará en breve.
+notification.gmpPending = %1$S se instalará en breves momentos.
 contributionAmount2 = Donación sugerida: %S
 installDownloading = Descargando
 installDownloaded = Descargado
@@ -58,7 +58,7 @@
 details.notification.install = %1$S se instalará cuando reinicie %2$S.
 details.notification.uninstall = %1$S se desinstalará cuando reinicie %2$S.
 details.notification.upgrade = %1$S se actualizará cuando reinicie %2$S.
-details.notification.openH264Pending = Se instalará en breve.
+details.notification.gmpPending = %1$S se instalará en breves momentos.
 details.experiment.time.daysRemaining = queda #1 día;quedan #1 días
 details.experiment.time.endsToday = Queda menos de un día
 details.experiment.time.daysPassed = hace #1 día;hace #1 días
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:04:04.000000000 +0000
@@ -26,3 +26,4 @@
 <!ENTITY report.pageURL "Incluya la URL de la página">
 <!ENTITY plugin.file "Archivo">
 <!ENTITY plugin.mimeTypes "Tipos MIME">
+<!ENTITY plugin.flashProtectedMode.label "Activar el modo protegido de Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:43:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/es-ES/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:04:04.000000000 +0000
@@ -32,3 +32,4 @@
 cspBlocked = Esta aplicación ha intentado acceder a un recurso que tiene una políticia de seguridad de contenido que impide que se cargue de esta forma.
 corruptedContentError = La aplicación no puede continuar cargándose porque se ha detectado un error en la transmisión de datos.
 remoteXUL = Esta aplicación ha intentado usar una tecnología no admitida que ya no está disponible.
+sslv3Used = Esta aplicación no puede garantizar la seguridad de sus datos en %S porque usa SSLv3, un protocolo de seguridad que ya no es efectivo.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/dom/chrome/appstrings.properties	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/dom/chrome/appstrings.properties	2015-02-28 15:04:14.000000000 +0000
@@ -33,3 +33,5 @@
 cspBlocked=Cette page a une stratégie de sécurité de contenu qui l'empêche d'être chargée de cette façon.
 corruptedContentError=La page que vous essayez de voir ne peut pas être affichée car une erreur dans la transmission de données a été détectée.
 remoteXUL=Cette page utilise une ancienne technologie qui n'est plus disponible par défaut.
+## LOCALIZATION NOTE (oldSecurityProtocol) - Do not translate "%S".
+sslv3Used=Firefox ne peut garantir la sécurité de vos données sur le site %S car il utilise SSLv3, un protocole de sécurité non fiable.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/dom/chrome/plugins.properties	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/dom/chrome/plugins.properties	2015-02-28 15:04:14.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (plugins.properties):
-#    Those strings are inserted into an HTML page, so you all HTML characters
+#    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label = À propos des plugins
@@ -20,5 +20,11 @@
 description_label = Description
 suffixes_label = Suffixes
 
+# GMP Plugins
+gmp_license_info=Informations de licence
+
 openH264_name=Codec vidéo OpenH264 fourni par Cisco Systems, Inc.
 openH264_description=Utilisé pour la lecture de vidéos web et les discussions vidéo.
+
+eme-adobe_name=Module de déchiffrement de contenu Primetime fourni par Adobe Systems, Incorporated
+eme-adobe_description=Utilisé pour la lecture de vidéos web protégées.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:04:14.000000000 +0000
@@ -15,11 +15,6 @@
 aboutReader.fontType.serif=Serif
 aboutReader.fontType.sans-serif=Sans serif
 
-# LOCALIZATION NOTE (aboutReader.fontType.charis-sil, aboutReader.fontType.clear-sans):
-# These are the names of the fonts that are used on Android
-aboutReader.fontType.charis-sil=Charis SIL Compact
-aboutReader.fontType.clear-sans=Clear Sans
-
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
 aboutReader.fontTypeSample=Aa
 
@@ -27,4 +22,12 @@
 # for the font size setting. Tapping different samples will change the font size.
 aboutReader.fontSizeSample=A
 
-aboutReader.toolbarTip=Toucher l'écran pour afficher les options du lecteur
+aboutReader.toolbar.close=Quitter le mode lecture
+aboutReader.toolbar.typeControls=Modifier la police
+aboutReader.toolbar.addToReadingList=Ajouter à la liste de lecture
+aboutReader.toolbar.removeFromReadingList=Retirer de la liste de lecture
+aboutReader.toolbar.openReadingList=Ouvrir la liste de lecture
+aboutReader.toolbar.closeReadingList=Fermer la liste de lecture
+aboutReader.toolbar.share=Partager
+
+aboutReader.footer.deleteThisArticle=Supprimer cet article
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:04:14.000000000 +0000
@@ -100,3 +100,6 @@
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copier les informations brutes dans le presse-papiers">
 
 <!ENTITY aboutSupport.sandboxTitle "Bac à sable">
+
+<!ENTITY aboutSupport.safeModeTitle "Essayer en mode sans échec">
+<!ENTITY aboutSupport.restartInSafeMode.label "Redémarrer avec les modules désactivés…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:04:14.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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Quitter
+quitMenuitem.key=q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:04:14.000000000 +0000
@@ -216,3 +216,5 @@
 <!ENTITY experiment.info.learnmore.accesskey "E">
 <!ENTITY experiment.info.changetelemetry "Paramètres de la télémétrie">
 <!ENTITY experiment.info.changetelemetry.accesskey "P">
+
+<!ENTITY setting.learnmore "En savoir plus…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:04:14.000000000 +0000
@@ -50,8 +50,8 @@
 notification.installError=Une erreur s'est produite lors de l'installation de %1$S.
 notification.installError.retry=Réessayer
 notification.installError.retry.tooltip=Essayer à nouveau de télécharger et installer ce module complémentaire
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Sera bientôt installé.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S sera bientôt installé.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Contribution suggérée : %S
@@ -93,8 +93,9 @@
 details.notification.uninstall=%1$S sera désinstallé après le redémarrage de %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S sera mis à jour après le redémarrage de %2$S.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Sera bientôt installé.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S sera bientôt installé.
+
 
 # LOCALIZATION NOTE (details.experiment.time.daysRemaining):
 # Semicolon-separated list of plural forms.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:04:14.000000000 +0000
@@ -36,3 +36,4 @@
 
 <!ENTITY plugin.file                                         "Fichier">
 <!ENTITY plugin.mimeTypes                                    "Types MIME">
+<!ENTITY plugin.flashProtectedMode.label                     "Activer le mode protégé d'Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/fr/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:43:18.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/fr/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:04:14.000000000 +0000
@@ -33,3 +33,5 @@
 cspBlocked=Cette application a essayé d'accéder à une ressource qui possède une stratégie de sécurité de contenu qui l'empêche d'être chargée de cette façon.
 corruptedContentError=L'application s'est arrêtée car une erreur dans la transmission de données a été détectée.
 remoteXUL=Cette application utilise une ancienne technologie qui n'est plus disponible.
+## LOCALIZATION NOTE (oldSecurityProtocol) - Do not translate "%S".
+sslv3Used=Cette application ne peut garantir la sécurité de vos données sur le site %S car il utilise SSLv3, un protocole de sécurité non fiable.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/chat/conversations.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/chat/conversations.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/chat/conversations.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/chat/conversations.properties	2015-02-28 15:04:28.000000000 +0000
@@ -45,12 +45,16 @@
 
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.
+topicSet=Topik untuk %1$S adalah %2$S.
 # LOCALIZATION NOTE (topicNotSet):
 #  %S is the conversation name.
+topicNotSet=Tidak ada topik untuk %S.
 # LOCALIZATION NOTE (topicChanged):
 #  %1$S is the user who changed the topic, %2$S is the new topic.
+topicChanged=%1$S telah mengubah topik menjadi: %2$S.
 # LOCALIZATION NOTE (topicCleared):
 #  %1$S is the user who cleared the topic.
+topicCleared=%1$S telah menghapus topik.
 
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message was cut
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/chat/irc.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/chat/irc.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/chat/irc.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/chat/irc.properties	2015-02-28 15:04:28.000000000 +0000
@@ -6,12 +6,16 @@
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring an IRC account.
+irc.usernameHint=nick
 
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
 connection.error.lost=Sambungan ke server terputus
 connection.error.timeOut=Tenggang waktu sambungan habis
+connection.error.invalidUsername=%S bukan nama pengguna yang diizinkan
+connection.error.invalidPassword=Sandi server tidak valid
+connection.error.passwordRequired=Sandi dibutuhkan
 
 # LOCALIZATION NOTE (joinChat.*):
 #   These show up on the join chat menu. An underscore is for the access key.
@@ -28,6 +32,7 @@
 options.quitMessage=Pesan keluar
 options.partMessage=Pesan perpisahan
 options.showServerTab=Tampilkan pesan dari server
+options.alternateNicks=Nick alternatif
 
 # LOCALIZATION NOTE (ctcp.version):
 #   %1$S is the nickname of the user whose version was requested.
@@ -47,6 +52,7 @@
 command.chanserv=%S &lt;perintah&gt;: Kirimkan perintah ke ChanServ.
 command.deop=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Menghapus operator kamar dari seseorang. Anda harus memiliki hak sebagai operator kamar untuk melakukan ini.
 command.devoice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Menghapus status suara kamar dari seseorang, untuk mencegah orang tersebut dapat berbicara jika kamar sedang dimoderasi (+m). Anda harus memiliki hak sebagai operator kamar untuk melakukan ini.
+command.invite2=%S &lt;nick&gt;[ &lt;nick&gt;]* [&lt;channel&gt;]: Mengundang satu atau lebih nick untuk bergabung dengan Anda pada kamar saat ini, atau bergabung ke kamar tertentu.
 command.join=%S &lt;kamar1&gt;[,&lt;kamar2&gt;]* [&lt;key1&gt;[,&lt;key2&gt;]*]: Masuk sebuah atau lebih kamar, dengan kunci kamar opsional jika dibutuhkan.
 command.kick=%S &lt;nick&gt; [&lt;pesan&gt;]: Menghapus seseorang dari  Anda harus memiliki hak sebagai operator kamar untuk melakukan ini.
 command.list=%S: Menampilkan daftar kamar ngobrol pada jaringan. Peringatan: beberapa server dapat memutuskan sambungan jika Anda melakukan perintah ini.
@@ -121,7 +127,7 @@
 
 
 # LOCALIZATION NOTE (error.*):
-#    These are shown as error messages in the server tab.
+#    These are shown as error messages in the conversation or server tab.
 #    %S is the channel name.
 error.noChannel=Tidak ada kamar: %S.
 error.tooManyChannels=Tidak dapat bergabung ke %S; Anda telah bergabung ke terlalu banyak kamar.
@@ -132,6 +138,8 @@
 error.mode.wrongUser=Anda tidak dapat mengubah mode pengguna lain.
 #    %S is the nickname or channel name that isn't available.
 #    %S is the channel name.
+#    %1$S is the channel the user tried to join, %2$S is the channel
+#    he was forwarded to.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/accessibility/AccessFu.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/accessibility/AccessFu.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/accessibility/AccessFu.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/accessibility/AccessFu.properties	2015-02-28 15:04:28.000000000 +0000
@@ -4,7 +4,7 @@
 
 # Screen reader started/stopped
 screenReaderStarted = Pembaca layar dimulai
-screenReaderStopped = Pembaca layar berhenti
+screenReaderStopped = Pembaca layar dihentikan
 
 # Roles
 menubar        =       bilah menu
@@ -119,8 +119,8 @@
 # table or grid cell information
 columnInfo = Kolom ke-%S
 rowInfo = Baris ke-%S
-spansColumns = mencakup %S kolom
-spansRows = mencakup %S baris
+spansColumns = membentang %S kolom
+spansRows = membentang %S baris
 
 # Invoked actions
 jumpAction     =      diloncat
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/appstrings.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/appstrings.properties	2015-02-28 15:04:28.000000000 +0000
@@ -33,3 +33,4 @@
 cspBlocked=Laman mengandung kebijakan keamanan konten yang mencegahnya untuk dimuat dengan cara ini.
 corruptedContentError=Laman yang akan dibuka tidak dapat ditampilkan karena ada terdeteksi galat pada pengiriman data.
 remoteXUL=Laman ini menggunakan teknologi yang tidak lagi didukung dan tersedia secara baku.
+sslv3Used=Keselamatan data Anda di %S tidak dapat dijamin karena menggunakan protokol SSLv3 yang merupakan protokol bermasalah.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/dom/dom.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/dom/dom.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/dom/dom.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/dom/dom.properties	2015-02-28 15:04:28.000000000 +0000
@@ -40,7 +40,7 @@
 # LOCALIZATION NOTE (FormValidationTimeRangeOverflow): %S is a time.
 FormValidationTimeRangeOverflow=Pilih waktu sebelum %S.
 # LOCALIZATION NOTE (FormValidationNumberRangeUnderflow): %S is a number.
-FormValidationNumberRangeUnderflow=Pilih nilai yang lebih besari dari %S.
+FormValidationNumberRangeUnderflow=Pilih nilai yang lebih besar dari %S.
 # LOCALIZATION NOTE (FormValidationDateRangeUnderflow): %S is a date.
 FormValidationDateRangeUnderflow=Pilih tanggal setelah %S.
 # LOCALIZATION NOTE (FormValidationTimeRangeUnderflow): %S is a time.
@@ -149,7 +149,7 @@
 # LOCALIZATION NOTE: Do not translate "window._content" or "window.content"
 Window_ContentWarning=Penggunaan window._content tidak disarankan lagi. Gunakan window.content.
 # LOCALIZATION NOTE: Do not translate "XMLHttpRequest"
-SyncXMLHttpRequestWarning=XMLHttpRequest sinkronus pada utas utama tidak disarankan lagi karena berdampak negatif pada pengalaman pengguna akhir. Untuk bantuan lebih lanjut kunjungi http://xhr.spec.whatwg.org/
+SyncXMLHttpRequestWarning=XMLHttpRequest sinkron pada utas utama tidak disarankan lagi karena berdampak negatif pada pengalaman pengguna akhir. Untuk bantuan lebih lanjut kunjungi http://xhr.spec.whatwg.org/
 ImplicitMetaViewportTagFallback=Tidak ada tag meta-viewport ditemukan. Tetapkan salah satu secara eksplisit untuk mencegah perilaku yang tidak diharapkan pada versi yang akan datang. Untuk bantuan lebih lanjut, kunjungi https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
 DataContainerEventWarning=Penggunaan DataContainerEvent tidak disarankan lagi. Gunakan CustomEvent.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/layout/css.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/layout/css.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/layout/css.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/layout/css.properties	2015-02-28 15:04:28.000000000 +0000
@@ -20,7 +20,7 @@
 PEGatherMediaEOF=akhir dari daftar media pada @import atau rule @media
 PEGatherMediaNotComma=Diharapkan ',' pada daftar media tetapi ditemukan '%1$S'.
 PEGatherMediaNotIdent=Diharapkan identifier pada daftar media, tetapi ditemukan '%1$S'.
-PEGatherMediaReservedMediaType=Diharapkan kata kunci bawaan '%1$S' saat mencari jenis media.
+PEGatherMediaReservedMediaType=Ditemukan kata kunci bawaan '%1$S' saat mencari jenis media.
 PEParseSourceSizeListEOF=nilai panjang untuk kondisi media yang cocok
 PEParseSourceSizeListNotComma=Diharapkan ',' setelah nilai tetapi ditemukan '%1$S'
 PEImportNotURI=Diharapkan teks URI pada rule @import tetapi ditemukan '%1$S'.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/netError.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/netError.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/netError.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/netError.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -64,10 +64,7 @@
 <!ENTITY unknownSocketType.longDesc "<p>Situs menjawab permintaan lewat jaringan dengan cara yang tidak diharapkan dan program peramban tidak dapat melanjutkan.</p>">
 
 <!ENTITY nssFailure2.title "Sambungan Aman Gagal">
-<!ENTITY nssFailure2.longDesc2 "<ul> 
-<li>Laman yang ingin dibuka tidak dapat ditampilkan karena keaslian data yang diterima tidak bisa diverifikasi.</li> 
-<li>Mohon hubungi pemilik situs web mengenai masalah ini.</li> 
-</ul>">
+<!ENTITY nssFailure2.longDesc2 "<p>Laman yang ingin dibuka tidak dapat ditampilkan karena keaslian data yang diterima tidak bisa diverifikasi.</p><ul><li>Mohon hubungi pemilik situs web mengenai masalah ini.</li></ul>">
 
 <!ENTITY nssBadCert.title "Sambungan Aman Gagal">
 <!ENTITY nssBadCert.longDesc2 "<ul> 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/plugins.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/plugins.properties	2015-02-28 15:04:28.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (plugins.properties):
-#    Those strings are inserted into an HTML page, so you all HTML characters
+#    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=Tentang Plugin
@@ -20,5 +20,11 @@
 description_label=Deskripsi
 suffixes_label=Awalan
 
+# GMP Plugins
+gmp_license_info=Informasi lisensi
+
 openH264_name=Codec Video OpenH264 disediakan oleh Cisco Systems, Inc.
 openH264_description=Putar video web dan gunakan ngobrol lewat video.
+
+eme-adobe_name=Modul Dekripsi Konten Primetime disediakan oleh Adobe Systems, Incorporated
+eme-adobe_description=Putar video web terlindungi.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/security/security.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/security/security.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/dom/chrome/security/security.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/dom/chrome/security/security.properties	2015-02-28 15:04:28.000000000 +0000
@@ -4,7 +4,18 @@
 BlockMixedActiveContent = Pemuatan konten aktif campuran "%1$S" dicekal
 
 # CORS
-CrossSiteRequestBlocked=Permintaan Cross-Origin (CORS) diblokir: Penggunaan Same Origin Policy tidak mengizinkan pembacaan sumber daya daring di %1$S. Hal ini dapat diperbaiki dengan memindahkan sumber daya ke domain yang sama atau mengaktifkan CORS.
+# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
+CORSDisabled=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: CORS dinonaktifkan).
+CORSRequestFailed=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: permintaan CORS gagal).
+CORSRequestNotHttp=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: permintaan CORS bukan http).
+CORSMissingAllowOrigin=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: header CORS 'Access-Control-Allow-Origin' tidak ada).
+CORSAllowOriginNotMatchingOrigin=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: header CORS 'Access-Control-Allow-Origin' tidak cocok dengan '%2$S').
+CORSMethodNotFound=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: Tidak menemukan metode dalam header CORS 'Access-Control-Allow-Methods').
+CORSMissingAllowCredentials=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: Diharapkan nilai 'true' dalam header CORS 'Access-Control-Allow-Credentials').
+CORSPreflightDidNotSucceed=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: kanal praluncur CORS gagal).
+CORSInvalidAllowMethod=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: token '%2$S' tidak valid dalam header CORS 'Access-Control-Allow-Methods').
+CORSInvalidAllowHeader=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: token '%2$S' tidak valid dalam header CORS 'Access-Control-Allow-Headers').
+CORSMissingAllowHeaderFromPreflight=Permintaan Cross-Origin Diblokir: Kebijakan Same Origin tidak mengizinkan pembacaan sumber daya daring di %1$S. (Alasan: token '%2$S' tidak ada dalam header CORS 'Access-Control-Allow-Headers' dari kanal praluncur CORS).
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=Situs ini menentukan header Strict-Transport-Security yang tidak valid.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/aboutDialog.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/aboutDialog.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -9,19 +9,26 @@
 
 
 
+<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
+<!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
+<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
+
+<!ENTITY community.exp.start        "">
+<!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+
+<!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
+
 
 <!ENTITY community.start2           "&brandShortName; didesain oleh ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
-<!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", sebuah ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
-<!ENTITY community.creditsLink      "komunitas global">
-<!ENTITY community.end2             " yang bekerja sama untuk Internet yang lebih baik. Kami percaya bahwa Internet harus bersifat terbuka, untuk publik, dan dapat diakses oleh semua orang tanpa batasan.">
 
-<!ENTITY contribute.start           "Tertarik? ">
-<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
-<!ENTITY contribute.getInvolvedLink "Ikutan Yuk!">
-<!ENTITY contribute.end             "">
+
+<!-- LOCALIZATION NOTE (helpus.donateLink): This is a link title that links to the thunderbird donation page -->
+
+<!-- LOCALIZATION NOTE (helpus.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY helpus.end                 "">
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 
 <!ENTITY bottomLinks.license        "Informasi Lisensi">
@@ -38,6 +45,7 @@
 <!ENTITY update.noUpdatesFound      "&brandShortName; sudah dalam versi terbaru">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Pemutakhiran dinonaktifkan oleh administrator sistem">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
 <!-- 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
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -3,8 +3,9 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY addressbookWindow.title                        "Buku Alamat">
-<!-- File Menu -->
 
+
+<!-- File Menu -->
 <!ENTITY fileMenu.label                                 "Berkas">
 <!ENTITY fileMenu.accesskey                             "B">
 <!ENTITY newMenu.label                                  "Baru">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-28 15:04:28.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/. -->
 
+<!ENTITY Addrbook.label                        "Buku Alamat">
+<!ENTITY Addrbook.accesskey                    "A">
 <!ENTITY GeneratedName.label                   "Nama">
 <!ENTITY GeneratedName.accesskey               "N">
 <!ENTITY PrimaryEmail.label                    "Email">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-28 15:04:28.000000000 +0000
@@ -9,6 +9,7 @@
 lastFirstFormat=%S, %S
 firstLastFormat=%S %S \u0020
 
+
 newContactTitle=Data Kenalan Baru
 # %S will be the contact's display name
 newContactTitleWithDisplayName=Data Kenalan Baru untuk %S
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/am-server-top.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/am-server-top.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -84,3 +84,7 @@
 
 <!ENTITY accountTitle.label "Setelan Akun">
 <!ENTITY accountSettingsDesc.label "Akun berikut merupakan akun khusus. Tidak ada identitas yang terkait dengan akun ini.">
+
+
+
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/chat.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/chat.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/chat.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/chat.properties	2015-02-28 15:04:28.000000000 +0000
@@ -90,3 +90,15 @@
 # the last 8-14 days.
 log.previousWeek=Minggu Kemarin
 
+# LOCALIZATION NOTE (messagePreview):
+# This is the default message preview to be shown
+# when the user has chosen not to show any info in the notification about the
+# incoming message being notified.
+
+#LOCALIZATION NOTE (bundledMessagePreview):  Semi-colon list of plural forms.
+# Used when multiple incoming messages from the same sender are bundled
+# into a single notification.
+# #1 is the number of incoming messages the user is being notified about. When #1
+# is greater than one, the plural form after the semicolon is used.
+# Do not translate %1$S, it is the message preview to be shown in the
+# notification, i.e. the first incoming message.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/FilterEditor.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/FilterEditor.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/FilterEditor.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/FilterEditor.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -26,6 +26,8 @@
 
 
 
+
+
 <!ENTITY filterActionDesc.label "Lakukan aksi berikut:">
 <!ENTITY filterActionDesc.accesskey "L">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/filter.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/filter.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/filter.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/filter.properties	2015-02-28 15:04:28.000000000 +0000
@@ -22,6 +22,11 @@
 continueButtonLabel=Lanjutkan
 cannotEnableFilter=Filter ini mungkin dibuat oleh versi mozilla/netscape yang akan datang. Anda tidak dapat mengaktifkan filter ini karena program tidak mengetahui cara menerapkannya.
 dontWarnAboutDeleteCheckbox=Jangan tanya lagi
+
+# LOCALIZATION NOTE(filterFAilureWarningPrefix)
+# %1$S=filter error action
+# %2$S=error code as hexadecimal string.
+
 searchTermsInvalidTitle=Kata Kunci Pencarian Tidak Sah
 # LOCALIZATION NOTE(searchTermsInvalidRule)
 # %1$S=search attribute name from the invalid rule
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/glodaComplete.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/glodaComplete.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/glodaComplete.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/glodaComplete.properties	2015-02-28 15:04:28.000000000 +0000
@@ -17,15 +17,3 @@
 #  a set of words, or a phrase containing multiple words (e.g. "red pepper")
 #  We use the same words in en-US, but maybe that's not always true.
 glodaComplete.messagesMentioningMany.label=Pesan yang menyebutkan: #1
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
-#  autocomplete widget to refer to a search on the web for a short string
-#  containing at most 15 characters. #1 is the search provider to use. #2 is
-#  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label=Cari di #1: #2
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
-#  the autocomplete widget to refer to a search on the web for a short string
-#  containing more than 15 characters. #1 is the search provider to use. #2 is
-#  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label.truncated=Cari di #1: #2…
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/imapMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/imapMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/imapMsgs.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/imapMsgs.properties	2015-02-28 15:04:28.000000000 +0000
@@ -55,15 +55,13 @@
 
 
 
-# LOCALIZATION NOTE (imapReceivingMessageHeaders): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the header currently being downloaded should appear.
-# Place the word %3$lu where the number of headers should appear.
-
-# LOCALIZATION NOTE (imapReceivingMessageFlags): Do not translate the word "%1$S", "%2$lu" or "%3$lu" below.
-# Place the word %1$S in your translation where the name of the server should appear.
-# Place the word %2$lu where the number of the flag currently being downloaded should appear.
-# Place the word %3$lu where the number of flags should appear.
+# LOCALIZATION NOTE (imapReceivingMessageHeaders2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of headers should appear.
+
+# LOCALIZATION NOTE (imapReceivingMessageFlags2): Do not translate the word "%S" or "%lu" below.
+# Place the word %S in your translation where the name of the server should appear.
+# Place the word %lu where the number of flags should appear.
 
 
 
@@ -79,7 +77,7 @@
 # LOCALIZATION NOTE (imapCopyingMessage): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
 
-# LOCALIZATION NOTE (imapFolderReceivingMessageOf): Do not translate the word "%S" or "%lu" below.
+# LOCALIZATION NOTE (imapFolderReceivingMessageOf2): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the folder should appear.
 # Place the word %lu where the number of headers should appear.
 
@@ -138,7 +136,7 @@
 
 # Out of memory
 
-# LOCALIZATION NOTE (imapCopyingMessageOf): Do not translate the word "%S" below.
+# LOCALIZATION NOTE (imapCopyingMessageOf2): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # Place the word %2$S where the total number of messages should appear.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/localMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/localMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/localMsgs.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/localMsgs.properties	2015-02-28 15:04:28.000000000 +0000
@@ -35,7 +35,6 @@
 # %1$S will receive the number of messages received
 # %2$S will receive the total number of messages
 
-
 # Status - parsing folder
 #LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
 # Place the word %S where the name of the mailbox should appear
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-28 15:04:28.000000000 +0000
@@ -9,159 +9,84 @@
 ## %S will be replaced with the name of file that could not be opened
 unableToOpenFile=Gagal membuka berkas %S.
 unableToOpenTmpFile=Gagal membuka berkas sementara %S. Periksa pengaturan 'Temporary Directory' Anda.
+noRecipients=Tidak ada penerima yang disebutkan. Masukkan penerima atau newsgroup pada kotak alamat.
+errorWritingFile=Kesalahan saat menulis ke berkas sementara.
 
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Gagal menyimpan pesan Anda sebagai templat.
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
 
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Gagal menyimpan pesan Anda sebagai konsep.
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
 
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Tidak dapat membuka folder Email Terkirim. Periksa pengaturan Email Anda benar.
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=Kesalahan terjadi saat mengirim email. Server mail menjawab: %s. Periksa kembali pesan dan coba lagi.
 
-## @name NS_MSG_NO_SENDER
-12510=Tidak ada pengirim yang disebutkan. Masukkan alamat email Anda pada pengaturan Email & Newsgroup.
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
 
-## @name NS_MSG_NO_RECIPIENTS
-12511=Tidak ada penerima yang disebutkan. Masukkan penerima atau newsgroup pada kotak alamat.
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=Kesalahan komunikasi terjadi: %d. Silakan coba lagi.
+dontShowAlert=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
 
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Kesalahan saat menulis ke berkas sementara.
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=Kesalahan jaringan terjadi saat menerima data. (Kesalahan Jaringan: %s) Coba sambung lagi.
+mimeMpartAttachmentError=Kesalahan pada lampiran.
+failedCopyOperation=Pesan sukses dikirim tetapi tidak dapat disalin ke folder Email Dikirim.
+nntpNoCrossPosting=Anda hanya dapat mengirim sebuah pesan pada sebuah server news dalam waktu yang bersamaan.
+msgCancelling=Membatalkan…
+errorReadingFile=Kesalahan membaca berkas.
 
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=Kesalahan terjadi saat mengirim email. Server mail menjawab: %s. Periksa kembali apakah alamat email Anda sudah benar pada pengaturan Email dan coba lagi.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of the object to be attached
 
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=Kesalahan (SMTP) terjadi saat mengirim email. Server menjawab: %s.
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
 
-## @name NS_ERROR_SENDING_MESSAGE
-12517=Kesalahan terjadi saat mengirim email. Server mail menjawab: %s. Periksa kembali pesan dan coba lagi.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
 
-## @name NS_ERROR_POST_FAILED
-12518=Pesan tidak dapat dikirimkan karena kegagalan sambungan ke server news. Server mungkin sedang tidak dapat diakses atau menolak sambungan. Periksa kembali pengaturan server news Anda atau hubungi administrator jaringan Anda.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
 
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=Kesalahan terjadi saat mengirim pesan yang belum terkirim.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
 
-## @name NS_ERROR_SEND_FAILED
-12520=Gagal mengirim pesan.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=Ukuran pesan yang ingin Anda kirim melebihi batas maksimum ukuran temporer server. Pesan tidak dikirim; coba kurangi ukuran pesan atau tunggu beberapa saat dan coba lagi. Balasan dari server: %s.
 
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=Kesalahan terjadi saat mengirim email: kesalahan server SMTP. Server menjawab %s Hubungi administrator mail untuk bantuan.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=Ukuran pesan yang ingin Anda kirim melebihi batas maksimum ukuran global server (%d byte). Pesan tidak dikirim; coba kurangi ukuran pesan dan coba lagi.
 
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Gagal menyimpan pesan untuk dikirim nanti.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the Outgoing server (SMTP) response
+smtpPermSizeExceeded2=Ukuran pesan yang ingin Anda kirim melebihi batas maksimum ukuran global server. Pesan tidak dikirim; coba kurangi ukuran pesan atau tunggu beberapa saat dan coba lagi. Balasan dari server: %s.
 
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=Kesalahan komunikasi terjadi: %d. Silakan coba lagi.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
 
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
 
-## @name NS_ERROR_TCP_READ_ERROR
-12528=Kesalahan jaringan terjadi saat menerima data. (Kesalahan Jaringan: %s) Coba sambung lagi.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
 
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=Kesalahan terjadi saat mengirim email: alamat email balasan tidak sah. Periksa kembali alamat email Anda pada pengaturan Email dan coba lagi.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
 
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Kesalahan pada lampiran.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
 
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=Pesan sukses dikirim tetapi tidak dapat disalin ke folder Email Dikirim.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
 
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=Anda hanya dapat mengirim sebuah pesan pada sebuah server news dalam waktu yang bersamaan.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
 
-## @name NS_MSG_CANCELLING
-12555=Membatalkan…
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
 
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Pesan Anda telah terkirim ke newsgroup tapi masih belum dikirim ke penerima lainnya.
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
 
-## @name NS_MSG_ERROR_READING_FILE
-12563=Kesalahan membaca berkas.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
 
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
 
-## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=Kesalahan saat melampirkan %S. Periksa apakah Anda memiliki hak akses baca ke berkas tersebut.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
 
-## @name NS_ERROR_SMTP_GREETING
-12572=Terjadi kesalahan saat mengirim email: Server mail mengirim pesan yang tidak sesuai: %s.
-
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=Kesalahan saat mengirim email. Server mail menjawab: %1$s. Periksa kembali penerima pesan %2$s dan coba lagi.
-
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=Kesalahan terjadi saat mengirim email: Gagal membuat sambungan aman dengan server SMTP %S menggunakan fitur STARTTLS karena fitur tersebut tidak didukung server. Matikan pilihan STARTTLS untuk server tersebut atau hubungi penyedia layanan Anda.
-
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=Kesalahan terjadi saat mengirim email: Gagal mendapatkan sandi untuk %S. Pesan tidak dikirim.
-
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=Ukuran pesan yang ingin Anda kirim melebihi batas maksimum ukuran temporer server. Pesan tidak dikirim; coba kurangi ukuran pesan atau tunggu beberapa saat dan coba lagi. Balasan dari server: %s.
-
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=Ukuran pesan yang ingin Anda kirim melebihi batas maksimum ukuran global server (%d byte). Pesan tidak dikirim; coba kurangi ukuran pesan dan coba lagi.
-
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=Ukuran pesan yang ingin Anda kirim melebihi batas maksimum ukuran global server. Pesan tidak dikirim; coba kurangi ukuran pesan atau tunggu beberapa saat dan coba lagi. Balasan dari server: %s.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=Kesalahan terjadi saat mengirim email: server SMTP %S tidak dikenali. Mungkin server tidak dikonfigurasi dengan benar. Pastikan pengaturan server SMTP Anda dan coba lagi.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=Pesan tidak dapat dikirim karena sambungan ke server SMTP %S gagal. Server mungkin tidak tersedia atau menolak sambungan SMTP. Pastikan pengaturan server SMTP Anda dan coba lagi, atau hubungi administrator server.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=Pesan tidak dapat dikirim karena sambungan ke server SMTP %S putus di tengah transaksi. Coba lagi atau hubungi administrator jaringan Anda.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=Pesan tidak dapat dikirim karena sambungan ke server SMTP %S kehabisan waktu. Coba lagi atau hubungi administrator jaringan Anda.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=Pesan tidak dapat dikirim menggunakan server SMTP %S dengan alasan yang tidak dikenali. Pastikan pengaturan server SMTP Anda dan coba lagi, atau hubungi administrator jaringan Anda.
-
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=Server SMTP %S tampaknya tidak mendukung sandi yang dienkripsi. Jika Anda baru saja menyetel akun, coba ganti 'Metode autentikasi' menjadi 'Sandi, pengiriman tidak aman' 'Pengaturan Akun | Pengaturan Server'. Jika memang biasanya bekerja tetapi tiba-tiba tidak dapat berjalan, hal ini menandakan kasus yang umum ketika seseorang berusaha mencuri sandi Anda.
-
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12595): $S is server hostname
-12595=Server SMTP %S tampaknya tidak mendukung sandi yang dienkripsi. Jika Anda baru saja menyetel akun, coba ganti 'Metode autentikasi' menjadi 'Sandi biasa' pada 'Pengaturan Akun | Pengaturan Server'. Jika memang biasanya bekerja tetapi tiba-tiba tidak dapat berjalan, silakan hubungi administrator atau penyedia layanan email Anda.
-
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12596): $S is server hostname
-12596=Server SMTP %S tidak mendukung sandi teks polos. Coba ganti 'Metode autentikasi' menjadi 'Sandi dienkripsi' pada 'Pengaturan Akun | Pengaturan Server'.
-
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Gagal melakukan autentikasi pada server SMTP %S. Silakan periksa sandi dan 'Metode autentikasi' pada 'Pengaturan Akun | Server Pengirim (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=Tiket Kerberos/GSSAPI tidak diterima oleh server SMTP %S. Silakan periksa lagi bahwa Anda telah masuk log lewat realm Kerberos/GSSAPI.
-
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=Server SMTP %S tidak mendukung metode autentikasi yang dipilih. Silakan ganti 'Metode autentikasi' pada 'Pengaturan Akun | Server Pengirim (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=Gagal melakukan autentikasi pada server SMTP %S. Server tersebut tidak mendukung autentikasi (SMTP-AUTH) yang telah Anda pilih sebagai metode autentikasi. Silakan ganti 'Metode autentikasi' menjadi 'Tidak ada' pada 'Pengaturan Akun | Server Pengirim (SMTP)' atau hubungi penyedia layanan email untuk petunjuknya.
-
-## @name NS_ERROR_ILLEGAL_LOCALPART
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
 saveDlogTitle=Simpan Pesan
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
 
 ## generics string
 defaultSubject=(belum ada subjek)
 chooseFileToAttach=Lampirkan Berkas
 
-
 ## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
 
 # LOCALIZATION NOTE (chooseFileToAttachViaCloud): %1$S is the cloud
@@ -177,21 +102,22 @@
 sendWithEmptySubjectButton=&Kirim Tanpa Judul
 cancelSendingButton=&Batal Kirim
 
-## Strings used by the dialog that informs about lack of newsgroup support.
+## Strings used by the dialog that informs about the lack of newsgroup support.
 noNewsgroupSupportTitle=Newsgroups Tidak Didukung Supported
 recipientDlogMessage=Akun ini hanya mendukung penerima jenis email. Jika dilanjutkan maka penerima jenis newsgroup akan diabaikan.
 
-## Strings used by the alert that tells the user an e-mail address is invalid.
+## Strings used by the alert that tells the user that an e-mail address is invalid.
 addressInvalidTitle=Alamat Penerima Tidak Sah
 addressInvalid=%1$S bukan alamat email yang sah karena tidak dalam format user@host. Anda harus mengoreksi alamat tersebut sebelum mengirim email.
 
-## String used by the dialog that ask the user to attach a web page
+## String used by the dialog that asks the user to attach a web page
 attachPageDlogTitle=Tentukan lokasi untuk dilampirkan
 attachPageDlogMessage=Laman Web (URL):
 
-## String used for attachment pretty name, when attachment is a message
+## String used for attachment pretty name, when the attachment is a message
 messageAttachmentSafeName=Pesan Terlampir
-## String used for attachment pretty name, when attachment is message part
+
+## String used for attachment pretty name, when the attachment is a message part
 partAttachmentSafeName=Bagian Pesan Terlampir
 
 # LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
@@ -206,47 +132,49 @@
 ## String used if a file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=Lampiran Berkas
+
 ## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
 errorFileAttachMessage=Berkas %1$S tidak ada sehingga tidak dapat dilampirkan pada pesan.
 
-## Strings used by Save as Draft/Template dialog
+## Strings used by the Save as Draft/Template dialog
 SaveDialogTitle=Simpan Pesan
-## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
+
+## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
 SaveDialogMsg=Pesan Anda telah disimpan dalam folder %1$S di bawah %2$S.
 CheckMsg=Jangan tampilkan kotak dialog ini lagi.
 
-## Strings used by prompt when Quitting while in progress
+## Strings used by the prompt when Quitting while in progress
 quitComposeWindowTitle=Mengirim Pesan
+
 ## LOCALIZATION NOTE (quitComposeWindowMessage2): don't translate \n
 quitComposeWindowMessage2=%1$S sedang dalam proses mengirim pesan.\nApakah Anda ingin menunggu hingga pesan terkirim sebelum keluar atau keluar sekarang juga?
 quitComposeWindowQuitButtonLabel2=&Keluar
 quitComposeWindowWaitButtonLabel2=&Tunggu
+
 ## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
 
-## Strings used by prompt for Ctrl-Enter check before sending message
+## Strings used by the prompt for Ctrl-Enter check before sending message
 sendMessageCheckWindowTitle=Kirim Pesan
 sendMessageCheckLabel=Yakin siap mengirim pesan ini?
 sendMessageCheckSendButtonLabel=Kirim
 
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is the file name/URI of attachment
 
-
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
-
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
-
+## LOCALIZATION NOTE (copyMessageStart): argument %S is the folder name
 
 ## LOCALIZATION NOTE (largeMessageSendWarning):
 ## Do not translate %S. It is the size of the message in user-friendly notation.
 
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is the file name/URI of object to be embedded
 
-
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is the file name/URI of object to be embedded
 
 ## reply header in composeMsg
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
-## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
-## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is the author (name of the person replying to)
+
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is the author, #2 is the date, #3 is the time
+
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is the author, #2 is the date, #3 is the time
 
 ## reply header in composeMsg
 ## user specified
@@ -261,7 +189,7 @@
 
 ## Attachment Reminder
 ## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
-##   words that that should trigger an attachment reminder.
+## words that should trigger an attachment reminder.
 mail.compose.attachment_reminder_keywords=.doc,.pdf,attachment,attach,attached,attaching,enclosed,CV,cover letter, resume, lampiran, terlampir, lampirkan
 
 addAttachmentButton=Sertakan Lampiran…
@@ -269,6 +197,7 @@
 
 attachmentReminderTitle=Pengingat Lampiran
 attachmentReminderMsg=Anda lupa melampirkan berkas lampiran?
+
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of keywords
@@ -278,16 +207,15 @@
 attachmentReminderFalseAlarm=Tidak, Kirim Sekarang
 
 # Strings used by the Filelink offer notification bar.
+
 # LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of big attached files
 bigFileDescription=Berkas ini berukuran besar. Mungkin lebih baik menggunakan fitur FileLink.;TBerkas ini berukuran besar. Mungkin lebih baik menggunakan fitur FileLink.
 bigFileAttach.label=Abaikan
 bigFileAttach.accesskey=A
-
 bigFileChooseAccount.title=Pilih Akun
 bigFileChooseAccount.text=Pilih akun komputawan tempat tujuan mengunggah berkas
-
 bigFileHideNotification.title=Jangan Unggah Berkas Saya
 bigFileHideNotification.text=Anda tidak akan diperingatkan kembali saat melampirkan berkas berukuran besar pada pesan.
 bigFileHideNotification.check=Jangan peringatkan saya lagi.
@@ -296,20 +224,20 @@
 # %S. %S is the display name for the cloud account the attachment is being
 # uploaded to.
 cloudFileUploadingTooltip=Menunggah ke %S…
+
 # LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
 # %S. %S is the display name for the cloud account the attachment was uploaded
 # to.
 cloudFileUploadedTooltip=Diunggah ke %S
-cloudFileUploadingNotification=Berkas Anda telah ditautkan. Tautan ini akan tampil pada isi pesan jika selesai.;Berkas Anda telah ditautkan. Tautan ini akan tampil pada isi pesan jika selesai.
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
-## word $S. Place the word $S where the host name should appear.
+## word %S. Place the word %S where the host name should appear.
 smtpEnterPasswordPrompt=Masukkan sandi Anda untuk %S:
+
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Masukkan sandi Anda untuk %2$S pada %1$S:
-smtpEnterPasswordPromptTitle=Server SMTP Mewajibkan Sandi
 
 # LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
@@ -318,40 +246,44 @@
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg=Terjadi kesalahan saat menyimpan pesan ke %S. Coba lagi?
-
-
 errorCloudFileAuth.title=Galat Autentikasi
+
 ## LOCALIZATION NOTE(errorCloudFileAuth.message):
-## %1$S is the name of the online storage service that authentication failed against.
+## %1$S is the name of the online storage service against which the authentication failed.
 errorCloudFileAuth.message=Gagal mengautentikasi pada %1$S.
 errorCloudFileUpload.title=Galat Pengunggahan
+
 ## LOCALIZATION NOTE(errorCloudFileUpload.message):
-## %1$S is the name of the online storage service that uploading failed against.
+## %1$S is the name of the online storage service against which the uploading failed.
 ## %2$S is the name of the file that failed to upload.
 errorCloudFileUpload.message=Gagal menunggah %2$S ke %1$S.
 errorCloudFileQuota.title=Galat Kuota
+
 ## LOCALIZATION NOTE(errorCloudFileQuota.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
 errorCloudFileQuota.message=Pengunggahan %2$S ke %1$S akan melampaui kuota ruang Anda.
+
 ## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to the excess file name length
 errorCloudFileLimit.title=Galat Ukuran Berkas
+
 ## LOCALIZATION NOTE(errorCloudFileLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to size restrictions.
 errorCloudFileLimit.message=%2$S melampaui batas ukuran maksimum pada %1$S.
 errorCloudFileOther.title=Galat Tak Dikenal
+
 ## LOCALIZATION NOTE(errorCloudFileOther.message):
 ## %1$S is the name of the online storage service that cannot be communicated with.
 errorCloudFileOther.message=Galat tak dikenal terjadi saat berhubungan dengan %1$S.
 errorCloudFileDeletion.title=Galat Penghapusan
+
 ## LOCALIZATION NOTE(errorCloudFileDeletion.message):
 ## %1$S is the name of the online storage service that the file is to be deleted from.
 ## %2$S is the name of the file that failed to be deleted.
 errorCloudFileDeletion.message=Ada masalah saat menghapus %2$S dari %1$S.
-
 errorCloudFileUpgrade.label=Peningkatan
 
 ## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
@@ -366,7 +298,7 @@
 cloudAttachmentListFooter=%1$S mempermudah pengiriman berkas raksasa lewat email.
 
 ## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
-## attachment, to be inserted into the message body. Do not translate the words
+## attachment to be inserted into the message body. Do not translate the words
 ## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
 ## %3$S is the name of the cloud storage service, and %4$S is the link to the
 ## attachment.
@@ -374,4 +306,3 @@
 
 ## LOCALIZATION NOTE(stopShowingUploadingNotification): This string is used in the Filelink
 ## upload notification bar to allow the user to dismiss the notification permanently.
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/messenger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/messenger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/messenger.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/messenger.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -145,6 +145,8 @@
 <!ENTITY messagePaneVertical.accesskey "T">
 <!ENTITY showFolderPaneCmd.label "Panel Folder">
 <!ENTITY showFolderPaneCmd.accesskey "F">
+
+
 <!ENTITY showMessageCmd.label "Panel Pesan">
 <!ENTITY showMessageCmd.accesskey "P">
 
@@ -582,7 +584,9 @@
 
 <!-- Folder Pane -->
 
-<!ENTITY folderColumn.label "Nama">
+<!ENTITY folderNameColumn.label "Nama">
+
+
 <!ENTITY folderSizeColumn.label "Ukuran">
 <!-- Folder Pane Context Menu -->
 
@@ -651,8 +655,8 @@
 <!ENTITY statusColumn.label "Status">
 <!ENTITY sizeColumn.label "Ukuran">
 <!ENTITY junkStatusColumn.label "Status Junk">
-<!ENTITY unreadColumn.label "Belum Dibaca">
-<!ENTITY totalColumn.label "Total">
+
+
 <!ENTITY readColumn.label "Sudah Dibaca">
 <!ENTITY receivedColumn.label "Diterima">
 <!ENTITY starredColumn.label "Bintang">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/messenger.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/messenger.properties	2015-02-28 15:04:28.000000000 +0000
@@ -120,6 +120,11 @@
 authAnySecure=Metode aman apa pun (tidak lagi dipakai)
 authAny=Metode apa pun (tidak aman)
 
+# OAuth2 window title
+# LOCALIZATION NOTE(oauth2WindowTitle):
+# %1$S is the username (or full email address) used for authentication.
+# %2$S is the hostname of the account being authenticated.
+
 # LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
 serverType-nntp=Server News (NNTP)
 # LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
@@ -439,6 +444,19 @@
 megaByteAbbreviation2=%.*f MB
 gigaByteAbbreviation2=%.*f GB
 
+## LOCALIZATION NOTE(folderWithAccount):
+## This is used to show folder name together with an account name.
+## %1$S = folder name
+## %2$S = account name
+## LOCALIZATION NOTE(folderWithUnreadMsgs):
+## This is a concatenation of two strings to compose a folder label with unread messages.
+## %1$S = folder name
+## %2$S = count of unread messages
+## LOCALIZATION NOTE(summarizedValue):
+## This string shows an indication that the value shown is actually a summary
+## accumulated from all subfolders.
+## %S = summarized value from all subfolders
+
 # Error message if message for a message id wasn't found
 errorOpenMessageForMessageIdTitle=Kesalahan saat membuka id-pesan
 errorOpenMessageForMessageIdMessage=Pesan milik id-pesan %S tidak ditemukan
@@ -665,9 +683,6 @@
 # LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
 # version of the update: "Update to 28.0".
 
-websearch.setDefault=Setel mesin pencari ini sebagai mesin pencari baku
-websearch.isDefault=Mesin pencari ini adalah mesin pencari baku
-
 outdatedpluginsMessage.title=Beberapa plugin yang digunakan pada laman ini telah usang.
 blockedpluginsMessage.title=Plugin yang dibutuhkan laman ini telah diblokir untuk perlindungan Anda.
 crashedpluginsMessage.title=Plugin %S berhenti bekerja tiba-tiba.
@@ -693,3 +708,13 @@
 # #1 is number of subthreads
 # LOCALIZATION NOTE (saveAsType): replace %S with the extension of the file to be saved.
 saveAsType=berkas %S
+
+# LOCALIZATION NOTE (openSearch.label): The label used in the autocomplete
+# widget to refer to a search on the web for a short string containing at most
+# 15 characters. %1$S is the search provider to use. %2$S is the string to
+# search for.
+
+# LOCALIZATION NOTE (openSearch.label.truncated): The label used in the
+# autocomplete widget to refer to a search on the web for a short string
+# containing more than 15 characters. %1$S is the search provider to use. %2$S
+# is the string to search for, truncated to 15 characters.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -3,16 +3,13 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY itemGeneral.label       "Utama">
+
 <!ENTITY itemDisplay.label       "Baca &amp; Tampilan">
 <!ENTITY itemUpdate.label        "Pemutakhiran">
 <!ENTITY itemNetworking.label    "Jaringan &amp; Ruang Disk">
 <!ENTITY itemCertificates.label  "Sertifikat">
 <!-- General Settings -->
 
-
-<!ENTITY submitTelemetry.label         "Kirim Data Kinerja">
-<!ENTITY submitTelemetry.accesskey     "K">
-<!ENTITY telemetryInfoLink.label       "Informasi selengkapnya tentang Telemetri">
 <!ENTITY enableGlodaSearch.label       "Aktifkan Sistem Pencarian Global dan Pengindeksan Pesan">
 <!ENTITY enableGlodaSearch.accesskey   "i">
 
@@ -23,6 +20,10 @@
 
 
 
+
+
+
+
 <!ENTITY systemIntegration.label       "Integrasi dengan Sistem">
 <!ENTITY alwaysCheckDefault.label      "Periksa apakah &brandShortName; adalah pembaca email default ketika memulai">
 <!ENTITY alwaysCheckDefault.accesskey  "l">
@@ -36,6 +37,16 @@
 <!ENTITY returnReceiptsInfo.label      "Mengatur penanganan tanda konfirmasi diterima (return receipt) oleh &brandShortName;">
 <!ENTITY showReturnReceipts.label      "Tanda Konfirmasi Diterima…">
 <!ENTITY showReturnReceipts.accesskey  "r">
+<!-- Data Choices -->
+
+
+
+
+
+
+
+
+
 <!-- Display and Reading Settings -->
 
 <!ENTITY reading.caption               "Baca">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/compose.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/compose.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/compose.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -6,6 +6,7 @@
 <!ENTITY itemAutoComplete.label              "Alamat">
 <!ENTITY itemSpellCheck.label                "Pemeriksa Ejaan">
 
+
 <!ENTITY forwardMsg.label                     "Teruskan pesan:">
 <!ENTITY forwardMsg.accesskey                 "T">
 <!ENTITY inline.label                         "Tidak Terpisah">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/general.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/general.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/general.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/general.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -33,3 +33,4 @@
 <!ENTITY customsound.accesskey            "u">
 <!ENTITY browse.label                     "Telusuri…">
 <!ENTITY browse.accesskey                 "T">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/offline.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/offline.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/offline.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -10,8 +10,8 @@
 <!ENTITY radioRememberPrevState.accesskey "I">
 
 
-<!ENTITY radioAlwaysOnline.label "Selalu mulai dalam mode daring">
-<!ENTITY radioAlwaysOnline.accesskey "l">
+<!ENTITY radioAlwaysOnlineState.label "Selalu mulai dalam mode daring">
+<!ENTITY radioAlwaysOnlineState.accesskey "l">
 
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/preferences.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/mail/chrome/messenger/preferences/preferences.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/mail/chrome/messenger/preferences/preferences.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -17,3 +17,6 @@
 
 <!ENTITY paneSecurity.title       "Keamanan">
 <!ENTITY paneAdvanced.title       "Canggih">
+<!ENTITY paneAccount.title        "Akun">
+
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pipnss/nsserrors.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pipnss/nsserrors.properties	2015-02-28 15:04:28.000000000 +0000
@@ -315,3 +315,5 @@
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Server menggunakan sertifikat dengan ekstensi kendala dasar yang mengidentifikasi sebagai otoritas sertifikat. Hal ini salah untuk sertifikat yang diterbitkan dengan benar.
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=Server menggunakan sertifikat dengan ukuran kunci yang terlalu kecil untuk membuat sambungan aman.
 MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Sebuah sertifikat X.509 versi 1 yang bukan merupakan jangkar kepercayaan telah digunakan untuk menerbitkan sertifikat server. Sertifikat X.509 versi 1 sudah usang dan seharusnya tidak digunakan untuk menandatangani sertifikat lainnya.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Server memberikan sertifikat yang masih belum valid.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Sertifikat yang belum valid telah digunakan untuk menerbitkan sertifikat server.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pipnss/pipnss.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pipnss/pipnss.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pipnss/pipnss.properties	2015-02-28 15:04:28.000000000 +0000
@@ -40,16 +40,12 @@
 # End of size restriction.
 VerifySSLClient=Sertifikat SSL Klien
 VerifySSLServer=Sertifikat SSL Server
-VerifySSLStepUp=SSL Server dengan Step-up
 VerifySSLCA=Otoritas Sertifikat SSL
 VerifyEmailSigner=Yang Mengesahkan Sertifikat Email
 VerifyEmailRecip=Penerima Sertifikat Email
-VerifyProtectObjSign=Penandatangan Objek Terlindungi
 VerifyObjSign=Penandatangan Objek
-VerifyUserImport=Sertifikat yang Diimpor Pengguna
 VerifyCAVerifier=Pengesah CA
 VerifyStatusResponder=Sertifikat Penjawab Status
-VerifyAnyCA=Otoritas Sertifikat Apa Saja
 HighGrade=2048 (Tingkat Tinggi)
 MediumGrade=1024 (Tingkat Menengah)
 # LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
@@ -61,7 +57,6 @@
 CertDumpVersion2=Versi 2
 CertDumpVersion3=Versi 3
 CertDumpSerialNo=Nomor Seri
-CertDumpOID=Pengenal Objek
 CertDumpMD2WithRSA=PKCS #1 MD2 dengan Enkripsi RSA
 CertDumpMD5WithRSA=PKCS #1 MD5 dengan Enkripsi RSA
 CertDumpSHA1WithRSA=SHA-1 dengan Enkripsi RSA PKCS #1
@@ -69,11 +64,8 @@
 CertDumpSHA384WithRSA=SHA-384 dengan Enkripsi RSA PKCS #1
 CertDumpSHA512WithRSA=SHA-512 dengan Enkripsi RSA PKCS #1
 CertDumpDefOID=Pengidentifikasi Objek (%S)
-CertDumpNULL=NULL
 CertDumpIssuer=Penerbit
 CertDumpSubject=Subjek
-CertDumpRDN=Nama Distinguished Relatif
-CertDumpATV=Jenis dan Nilai Atribut
 CertDumpAVACountry=C
 CertDumpAVAState=ST
 CertDumpAVALocality=L
@@ -245,44 +237,25 @@
 CertDumpRawBytesHeader=Besar: %S Byte / %S Bit
 VerifySSLClient_p=Klien
 VerifySSLServer_p=Server
-VerifySSLStepUp_p=Step-up
 VerifySSLCA_p=CA SSL
 VerifyEmailSigner_p=Tandatangan
 VerifyEmailRecip_p=Enkripsi
-VerifyProtectObjSign_p=Penandatangan Objek Terlindungi
 VerifyObjSign_p=Penandatangan Objek
-VerifyUserImport_p=Yang Diimpor Pengguna
 VerifyCAVerifier_p=Pengesah CA
 VerifyStatusResponder_p=Penjawab Status
-VerifyAnyCA_p=CA
-VerifiedTrue=benar
-VerifiedFalse=salah
 PK11BadPassword=Sandi yang dimasukkan salah.
 SuccessfulP12Backup=Sukses membuat cadangan sertifikat keamanan dan kunci pribadi.
 SuccessfulP12Restore=Sukses mengembalikan sertifikat keamanan dan kunci pribadi dari cadangan.
-PKCS12PasswordInvalid=Tidak dapat mendekode berkas PKCS #12. Mungkinkah sandi yang dimasukkan salah?
 PKCS12DecodeErr=Gagal mendekode berkas. Format PKCS #12 salah, terkorupsi, atau sandi yang dimasukkan salah.
 PKCS12UnknownErrRestore=Gagal mengembalikan berkas PKCS #12 karena alasan yang tidak diketahui.
 PKCS12UnknownErrBackup=Gagal membuat berkas cadangan PKCS #12 karena alasan yang tidak diketahui.
 PKCS12UnknownErr=Operasi PKCS #12 gagal karena alasan yang tidak diketahui.
 PKCS12InfoNoSmartcardBackup=Tidak dimungkinkan untuk membuat cadangan sertifikat dari perangkat keras peralatan keamanan seperti halnya smart card.
 PKCS12DupData=Sertifikat dan kunci pribadi telah ada pada peralatan keamanan.
-AddModulePrompt=Yakin akan memasang modul keamanan berikut?
-AddModuleName=Nama Modul: %S
-AddModulePath=Lokasi: %S
-AddModuleSuccess=Modul keamanan baru telah dipasang
 AddModuleFailure=Gagal menambah modul
 AddModuleDup=Modul Keamanan sudah ada
-DelModuleBadName=Nama modul tidak sah.
 DelModuleWarning=Yakin akan menghapus modul keamanan ini?
 DelModuleError=Gagal menghapus modul.
-DelModuleIntSuccess=Modul keamanan internal sukses dihapus
-DelModuleExtSuccess=Modul keamanan eksternal sukses dihapus
-ForcedBackup1=Anda sebaiknya membuat salinan cadangan sertifikat keamanan dan kunci pribadi terkait yang dilindungi sandi.
-ForcedBackup2=Jika Anda pernah kehilangan akses ke kunci pribadi karena lupa sandi Anda, atau karena berkas terkorupsi, Anda dapat mengembalikan kunci pribadi dan sertifikat dari salinan cadangan ini.
-ForcedBackup3=Untuk membuat salinan, klik OK. Jika memungkinkan, Anda harus menyimpan salinan cadangan ini ke disket yang disimpan di tempat yang aman.
-UnknownCertIssuer=(Penerbit Tidak Dikenali)
-UnknownCertOrg=(Organisasi Tidak Dikenali)
 AVATemplate=%S = %S
 
 PSMERR_SSL_Disabled=Tidak dapat tersambung dengan aman karena protokol SSL telah dinonaktifkan.
@@ -295,7 +268,6 @@
 
 certErrorTrust_SelfSigned=Sertifikat tidak dapat dipercaya karena hanya ditandatangani sendiri.
 certErrorTrust_UnknownIssuer=Sertifikat tidak dapat dipercaya karena sertifikat penerbit tidak dikenali.
-certErrorTrust_MissingChain=Sertifikat tidak dapat dipercaya karena chain penerbit tidak tersedia.
 certErrorTrust_CaInvalid=Sertifikat tidak dapat dipercaya karena dikeluarkan oleh sertifikat CA yang tidak valid.
 certErrorTrust_Issuer=Sertifikat tidak dapat dipercaya karena sertifikat penerbit tidak dipercaya.
 certErrorTrust_SignatureAlgorithmDisabled=Sertifikat tidak dapat dipercaya karena ditandatangani menggunakan algoritma tanda tangan yang dinonaktifkan dengan alasan algoritmanya tidak aman.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pipnss/security.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pipnss/security.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pipnss/security.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pipnss/security.properties	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/.
-
-Title=Peringatan Keamanan
-PostToInsecureFromSecureMessage=Walaupun laman ini terenkripsi, informasi yang dimasukkan akan dikirim melalui sambungan yang tidak terenkripsi dan mudah dibaca oleh pihak lainnya.##Yakin akan melanjutkan pengiriman informasi?##
-Continue=Lanjutkan
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/certManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/certManager.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/certManager.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -10,9 +10,6 @@
 <!ENTITY certmgr.tab.ca                       "Otoritas">
 <!ENTITY certmgr.tab.orphan2                  "Lainnya">
 
-<!ENTITY certmgr.ca.builtins                  "CA Built-in">
-<!ENTITY certmgr.ca.mycas                     "CA Dikelola Anda">
-
 <!ENTITY certmgr.mine                         "Anda memiliki sertifikat dari organisasi berikut ini yang mengidentifikasikan Anda:">
 <!ENTITY certmgr.others                       "Anda memiliki sertifikat di berkas yang mengidentifikasikan orang ini:">
 <!ENTITY certmgr.websites2                    "Anda memiliki sertifikat pada berkas yang bisa mengidentifikasi server berikut:">
@@ -37,7 +34,6 @@
 <!ENTITY certmgr.certdetail.sha256fingerprint "Sidik jari SHA-256">
 <!ENTITY certmgr.certdetail.sha1fingerprint   "Sidik jari SHA1">
 
-<!ENTITY certmgr.editcert.title               "Ubah Pengaturan Sertifikat Keamanan">
 <!ENTITY certmgr.editcacert.title             "Ubah pengaturan kepercayaan sertifikat CA">
 <!ENTITY certmgr.editcert.edittrust           "Ubah pengaturan kepercayaan:">
 <!ENTITY certmgr.editcert.trustssl            "Sertifikat ini dapat mengidentifikasi situs web.">
@@ -49,11 +45,6 @@
 <!ENTITY certmgr.editemailcert.donttrust      "Jangan percaya keaslian sertifikat ini.">
 
 <!ENTITY certmgr.deletecert.title             "Hapus Sertifikat">
-<!ENTITY certmgr.deletecert.beforename        "Anda meminta penghapusan sertifikat ini:">
-<!ENTITY certmgr.deletecert.aftername         "Yakin ingin menghapus sertifikat ini?">
-<!ENTITY certmgr.deleteusercert.title         "Hapus Sertifikat Anda">
-<!ENTITY certmgr.deleteusercert.beforename    "Anda meminta penghapusan sertifikat:">
-<!ENTITY certmgr.deleteusercert.aftername     "Begitu Anda menghapus sertifikat ini, Anda tidak lagi bisa membaca email yang terenkripsi dengannya.">
 
 <!ENTITY certmgr.certname                     "Nama Sertifikat">
 <!ENTITY certmgr.certserver                   "Server">
@@ -72,8 +63,6 @@
 <!ENTITY certmgr.edit3.accesskey              "K">
 <!ENTITY certmgr.editca.label                 "Ubah Kepercayaan CA">
 <!ENTITY certmgr.editca.accesskey             "U">
-<!ENTITY certmgr.add.label                    "Tambah">
-<!ENTITY certmgr.add.accesskey                "a">
 <!ENTITY certmgr.export.label                 "Ekspor…">
 <!ENTITY certmgr.export.accesskey             "k">
 <!ENTITY certmgr.delete2.label                "Hapus…">
@@ -91,7 +80,7 @@
 <!ENTITY certmgr.fields.label                 "Nilai Field">
 <!ENTITY certmgr.fields.accesskey             "N">
 <!ENTITY certmgr.hierarchy.label              "Hierarki Sertifikat">
-<!ENTITY certmgr.hierarchy.accesskey          "H">
+<!ENTITY certmgr.hierarchy.accesskey2         "H">
 <!ENTITY certmgr.addException.label           "Tambah Pengecualian…">
 <!ENTITY certmgr.addException.accesskey       "P">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/deviceManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/deviceManager.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/deviceManager.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -11,11 +11,7 @@
 <!ENTITY devmgr.devlist.label                   "Modul dan Perangkat Keamanan">
 <!ENTITY devmgr.details.title                   "Detail">
 <!ENTITY devmgr.details.title2                  "Nilai">
-<!ENTITY devmgr.status.label                    "Status">
-<!ENTITY devmgr.version.label                   "Versi">
 
-<!ENTITY devmgr.button.changeslotname.label     "Ubah Nama Slot">
-<!ENTITY devmgr.button.changeslotname.accesskey "S">
 <!ENTITY devmgr.button.login.label              "Log-Masuk">
 <!ENTITY devmgr.button.login.accesskey          "u">
 <!ENTITY devmgr.button.logout.label             "Log-Keluar">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/pippki.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/pippki.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/pippki.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -9,7 +9,6 @@
 <!ENTITY setPassword.newPassword.label "Sandi baru:">
 <!ENTITY setPassword.reenterPassword.label "Sandi baru (ulangi):">
 <!ENTITY setPassword.meter.label "Ukuran kualitas sandi">
-<!ENTITY setPassword.meter.loading "Memuat">
 <!-- Values for resetpassword.xul -->
 
 <!ENTITY resetPasswordButtonLabel "Setel Ulang">
@@ -20,19 +19,6 @@
 <!ENTITY getPassword.title  "Ketikkan Sandi Utama">
 <!ENTITY getPassword.tokenName2.label "Perangkat Keamanan:">
 <!ENTITY getPassword.password.label "Sandi:">
-<!-- These should be common -->
-
-<!ENTITY piperror.title "Kesalahan">
-<!ENTITY pipalert.title "Kesalahan - tidak bisa ditanggulangi">
-<!-- Prefs panel strings -->
-
-<!ENTITY pref.security.general.lHeader "Keamanan">
-<!ENTITY pref.security.general.rHeader "Pengaturan untuk keamanan umum">
-<!ENTITY pref.security.general.header "Pengaturan untuk keamanan umum">
-<!ENTITY pref.security.general.level.title "Tingkat Keamanan">
-<!ENTITY pref.security.general.paranoid.label "Gunakan pengaturan yang paling hati-hati">
-<!ENTITY pref.security.general.certificates.title "Sertifikat">
-<!ENTITY pref.security.general.manageCert.label "Kelola Sertifikat">
 <!-- Downloading a cert -->
 
 <!ENTITY downloadCert.title "Mengunduh Sertifikat">
@@ -42,9 +28,7 @@
 <!ENTITY downloadCert.trustObjSign "Percayai CA ini untuk mengidentifikasi pengembang perangkat lunak.">
 <!ENTITY downloadCert.message3 "Sebelum mempercayai CA ini untuk kegunaan apa pun, sebaiknya Anda memeriksa sertifikat ini serta kebijakan dan prosedurnya jika ada.">
 <!ENTITY downloadCert.viewCert.label "Tampilkan">
-<!ENTITY downloadCert.viewPolicy.label "Kebijakan">
 <!ENTITY downloadCert.viewCert.text "Periksa sertifikat CA">
-<!ENTITY downloadCert.viewPolicy.text "Periksa prosedur dan kebijakan CA">
 <!-- Strings for the SSL client auth ask dialog -->
 
 <!ENTITY clientAuthAsk.title "Permintaan Identifikasi Pengguna">
@@ -63,9 +47,6 @@
 <!ENTITY pkcs12.setpassword.label2 "Sandi cadangan sertifikat (ulangi):">
 <!ENTITY pkcs12.setpassword.reminder "Penting: Jika Anda lupa sandi cadangan sertifikat, Anda tidak akan dapat mengembalikan cadangan ini nantinya. Mohon disimpan di lokasi yang aman.">
 
-<!ENTITY pkcs12.getpassword.title  "Dialog Sandi">
-<!ENTITY pkcs12.getpassword.message "Masukkan sandi yang digunakan untuk mengenkripsi cadangan sertifikat.">
-
 <!ENTITY chooseToken.title  "Silakan pilih Dialog Token">
 <!ENTITY chooseToken.message1 "Silakan pilih token.">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/security/manager/chrome/pippki/pippki.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/security/manager/chrome/pippki/pippki.properties	2015-02-28 15:04:28.000000000 +0000
@@ -11,7 +11,6 @@
 unnamedCA=Otoritas Sertifikat (tanpa nama)
 
 #For editing cert trust
-editTrustWindowTitle=Ubah kepercayaan sertifikat
 editTrustCA=Sertifikat "%S" mewakili Otoritas Sertifikat.
 editTrustEmail=Sertifikat "%S" diterbitkan oleh:
 issuerNotTrusted=Oleh karena Anda tidak mempercayai otoritas sertifikat mana yang mengeluarkan sertifikat ini, Anda dianggap tidak mempercayai keaslian sertifikat ini, kecuali sebagai berikut.
@@ -44,10 +43,7 @@
 chooseP12RestoreFileDialog2=Berkas Sertifikat untuk dikembalikan ke semula
 chooseP12BackupFileDialog=Nama Berkas untuk Cadangan
 file_browse_PKCS12_spec=Berkas PKCS12
-
-
-#Preferences
-resetPreferences=Gunakan tombol ini untuk menyetel ulang pengaturan keamanan %S menjadi pengaturan awal lagi.
+getPKCS12FilePasswordMessage=Masukkan sandi yang digunakan untuk mengenkripsi cadangan sertifikat:
 
 #Cert verification
 certVerified=Sertifikat ini telah diperiksa untuk penggunaan berikut:
@@ -65,18 +61,16 @@
 clientAuthMessage2=Diterbitkan oleh: "%S"
 
 #Page Info
-pageInfo_SiteNotVerified=Identitas Situs Web Gagal Diverifikasi
-pageInfo_WebSiteVerified=Identitas Situs Web Sukses Diverifikasi
-pageInfo_Identity_Verified=Situs web %S mendukung autentikasi laman yang Anda lihat. Identitas situs web telah diperiksa oleh %S, salah satu otoritas sertifikat yang Anda percaya untuk kegunaan ini.
-pageInfo_ViewCertificate=Tampilkan sertifikat keamanan yang memeriksa identitas situs web ini.
 pageInfo_NoEncryption=Sambungan Tak Terenkripsi
 pageInfo_Privacy_None1=Situs web %S tidak mendukung enkripsi untuk laman yang Anda lihat.
 pageInfo_Privacy_None2=Informasi tanpa enkripsi yang dikirim lewat Internet dapat dilihat oleh pihak lain dalam perjalanan.\u0020
 pageInfo_Privacy_None3=Laman yang ditampilkan tidak dienkripsi.
-# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
+# %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
 # %3$S is protocol version like "SSL 3" or "TLS 1.2"
 pageInfo_EncryptionWithBitsAndProtocol=Sambungan Terenkripsi (%1$S, kunci %2$S bita, %3$S)
+pageInfo_BrokenEncryption=Enkripsi Rusakk (%1$S, kunci %2$S bita, %3$S)
 pageInfo_Privacy_Encrypted1=Laman yang dilihat telah dienkripsi sebelum dikirim melalui Internet.
 pageInfo_Privacy_Encrypted2=Enkripsi membuat informasi yang disampaikan antar komputer lebih sulit dilihat oleh pihak yang tidak diizinkan. Oleh karenanya, sangat tidak umum seseorang mampu membaca laman ini saat ditransfer melalui jaringan.
 pageInfo_MixedContent=Sambungan Terenkripsi Sebagian
@@ -85,7 +79,6 @@
 #Cert Viewer
 certDetails=Penampil Sertifikat:
 notPresent=<Bukan Bagian dari Sertifikat>
-unknownIssuer=<Penerbit Tidak Dikenali>
 
 escrowFinalMessage=Anda sebaiknya mengklik OK hanya jika Anda mempercayai "%S" untuk melindungi enkripsi kunci pribadi Anda.
 
@@ -158,7 +151,6 @@
 addExceptionCheckingLong2=Mencoba mengidentifikasi situs ini…
 addExceptionNoCertShort=Tidak ada informasi tersedia
 addExceptionNoCertLong2=Gagal mendapatkan status identifikasi situs ini.
-addExceptionConnectionFailed=Sambungan Gagal
 
 #Certificate Exists in database
 caCertExistsTitle=Sertifikat Sudah Ada
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:04:28.000000000 +0000
@@ -5,15 +5,15 @@
 aboutReader.loading=Memuat...
 aboutReader.loadError=Gagal memuat artikel dari laman
 
-aboutReader.colorSchemeLight=Terang
-aboutReader.colorSchemeDark=Gelap
-aboutReader.colorSchemeSepia=Sepia
-aboutReader.colorSchemeAuto=Otomatis
-
-# LOCALIZATION NOTE (aboutReader.fontTypeSerif, aboutReader.fontTypeSansSerif):
-# These are the names of the fonts that are used.
-aboutReader.fontTypeSerif=Charis SIL Compact
-aboutReader.fontTypeSansSerif=Clear Sans
+aboutReader.colorScheme.light=Terang
+aboutReader.colorScheme.dark=Gelap
+aboutReader.colorScheme.sepia=Sepia
+aboutReader.colorScheme.auto=Otomatis
+
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Serif
+aboutReader.fontType.sans-serif=Tanpa-serif
 
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
 aboutReader.fontTypeSample=Aa
@@ -22,4 +22,12 @@
 # for the font size setting. Tapping different samples will change the font size.
 aboutReader.fontSizeSample=A
 
-aboutReader.toolbarTip=Ketuk layar untuk menampilkan opsi pembaca
+aboutReader.toolbar.close=Tutup Tampilan Pembaca
+aboutReader.toolbar.typeControls=Kontrol Jenis
+aboutReader.toolbar.addToReadingList=Tambahkan ke Daftar Bacaan
+aboutReader.toolbar.removeFromReadingList=Hapus dari Daftar Baca
+aboutReader.toolbar.openReadingList=Buka Daftar Baca
+aboutReader.toolbar.closeReadingList=Tutup Daftar Baca
+aboutReader.toolbar.share=Bagikan
+
+aboutReader.footer.deleteThisArticle=Hapus artikel ini
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -36,9 +36,11 @@
 <!ENTITY aboutSupport.appBasicsTitle "Informasi Dasar Aplikasi">
 <!ENTITY aboutSupport.appBasicsName "Nama">
 <!ENTITY aboutSupport.appBasicsVersion "Versi">
-<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
+<!ENTITY aboutSupport.appBasicsBuildID "ID Build">
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateChannel, aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
 "Update" is a noun here, not a verb. -->
 
+<!ENTITY aboutSupport.appBasicsUpdateChannel "Kanal Pembaruan">
 <!ENTITY aboutSupport.appBasicsUpdateHistory "Riwayat Pemutakhiran">
 <!ENTITY aboutSupport.appBasicsShowUpdateHistory "Tampilkan Riwayat Pemutakhiran">
 
@@ -94,3 +96,6 @@
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Salin data mentah ke papan klip">
 
 <!ENTITY aboutSupport.sandboxTitle "Kotak pasir">
+
+<!ENTITY aboutSupport.safeModeTitle "Coba Mode Aman">
+<!ENTITY aboutSupport.restartInSafeMode.label "Mulai Ulang dengan Pengaya Dinonaktifkan…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutSupport.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutSupport.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutSupport.properties	2015-02-28 15:04:28.000000000 +0000
@@ -86,3 +86,8 @@
 hasSeccompBPF = Seccomp-BPF (Pemfilteran Pemanggilan Sistem - System Call Filtering)
 canSandboxContent = Pengotakpasiran Proses Konten
 canSandboxMedia = Pengotakpasiran Plugin Media
+
+# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
+# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
+# or 'false')
+multiProcessStatus = %1$S/%2$S (baku: %3$S)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutTelemetry.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/aboutTelemetry.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/aboutTelemetry.properties	2015-02-28 15:04:28.000000000 +0000
@@ -7,6 +7,8 @@
 # - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
 pageSubtitle = Laman ini berisi informasi tentang kinerja, perangkat keras, penggunaan, dan pengubahsuaian yang dikumpulkan oleh Telemetri. Informasi ini dikirimkan ke %1$S untuk membantu menyempurnakan %2$S.
 
+generalDataTitle = Data Umum
+
 generalDataHeadingName = Nama
 
 generalDataHeadingValue = Nilai
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/browser.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/browser.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/browser.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/browser.properties	2015-02-28 15:04:28.000000000 +0000
@@ -8,3 +8,7 @@
 browsewithcaret.checkButtonLabel=Ya
 
 plainText.wordWrap=Potong Baris Panjang
+
+formPostSecureToInsecureWarning.title = Peringatan Keamanan
+formPostSecureToInsecureWarning.message = Informasi yang Anda masukkan pada laman ini akan dikirim lewat sambungan tidak aman dan mungkin dapat dibaca oleh pihak ketiga.\n\nYakin ingin mengirimkan informasi ini?
+formPostSecureToInsecureWarning.continue = Lanjutkan
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/charsetMenu.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/charsetMenu.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/charsetMenu.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/charsetMenu.properties	2015-02-28 15:04:28.000000000 +0000
@@ -41,7 +41,7 @@
 # Globally-relevant
 UTF-8.key        = U
 UTF-8            = Unicode
-windows-1252.key = W
+windows-1252.key = B
 windows-1252     = Barat
 
 # Arabic
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/devtools/debugger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/devtools/debugger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/devtools/debugger.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/devtools/debugger.properties	2015-02-28 15:04:28.000000000 +0000
@@ -14,11 +14,46 @@
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=Sambungan Masuk
 
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# LOCALIZATION NOTE (remoteIncomingPromptHeader): Header displayed on the
 # dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=Sebuah permintaan yang masuk untuk mengizinkan sambungan pendebugan daring terdeteksi. Sebuah klien daring dapat mengontrol browser Anda secara keseluruhan! Izinkan sambungan?
+remoteIncomingPromptHeader=Sebuah permintaan yang masuk untuk mengizinkan sambungan pendebugan daring terdeteksi. Sebuah klien daring dapat mengontrol browser Anda secara keseluruhan!
+# LOCALIZATION NOTE (remoteIncomingPromptClientEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the client such as "127.0.0.1:6000"
+remoteIncomingPromptClientEndpoint=Titik Akhir Klien: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptServerEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the server such as "127.0.0.1:6000"
+remoteIncomingPromptServerEndpoint=Titik Akhir Server: %1$S
+# LOCALIZATION NOTE (remoteIncomingPromptFooter): Footer displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptFooter=Izinkan sambungan?
 
 # LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
 # third button in the incoming connection dialog that lets the user disable the
 # remote debugger server.
 remoteIncomingPromptDisable=Nonaktifkan
+
+# LOCALIZATION NOTE (clientSendOOBTitle): The title displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBTitle=Identifikasi Klien
+# LOCALIZATION NOTE (clientSendOOBHeader): Header displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBHeader=Titik akhir yang sedang tersambung dengan Anda membutuhkan informasi lebih lanjut untuk mengautentikasi sambungan ini.  Masukkan token di bawah ini pada pertanyaan yang tampil di sisi lain.
+# LOCALIZATION NOTE (clientSendOOBHash): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The client's cert fingerprint
+clientSendOOBHash=Sertifikat Saya: %1$S
+# LOCALIZATION NOTE (clientSendOOBToken): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The authentication token that the user will transfer.
+clientSendOOBToken=Token: %1$S
+
+# LOCALIZATION NOTE (serverReceiveOOBTitle): The title displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBTitle=Masukkan Token Klien
+# LOCALIZATION NOTE (serverReceiveOOBBody): Main text displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBBody=Klien seharusnya akan menampilkan nilai token.  Masukkan nilai token tersebut di sini untuk menyelesaikan autentikasi dengan klien ini.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:04:28.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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Keluar
+quitMenuitem.key=q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/textcontext.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/textcontext.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/global/textcontext.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/global/textcontext.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -24,3 +24,5 @@
 <!ENTITY spellNoSuggestions.label "(Tidak ada saran pengejaan)">
 <!ENTITY spellDictionaries.label "Bahasa">
 <!ENTITY spellDictionaries.accesskey "B">
+
+<!ENTITY searchTextBox.clear.label "Bersihkan">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/downloads/downloads.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/downloads/downloads.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/downloads/downloads.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/downloads/downloads.properties	2015-02-28 15:04:28.000000000 +0000
@@ -32,15 +32,14 @@
 offlineCancelDownloadsAlertMsg=Apabila Anda keluar sekarang, sebuah unduhan akan dibatalkan. Yakin ingin keluar?
 offlineCancelDownloadsAlertMsgMultiple=Apabila Anda keluar sekarang, %S unduhan akan dibatalkan. Yakin ingin keluar?
 leavePrivateBrowsingCancelDownloadsAlertTitle=Batalkan Semua Unduhan?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=Jika Anda menutup semua jendela pada Mode Penjelajahan Pribadi sekarang, 1 unduhan akan dibatalkan. Yakin akan meninggalkan Mode Penjelajahan Pribadi?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=Jika Anda menutup semua jendela pada Mode Penjelajahan Pribadi sekarang, %S unduhan akan dibatalkan. Yakin akan meninggalkan Mode Penjelajahan Pribadi?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=Jika Anda menutup semua jendela pada Mode Penjelajahan Pribadi sekarang, 1 unduhan akan dibatalkan. Yakin akan meninggalkan Mode Penjelajahan Pribadi?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=Jika Anda menutup semua jendela pada Mode Penjelajahan Pribadi sekarang, %S unduhan akan dibatalkan. Yakin akan meninggalkan Mode Penjelajahan Pribadi?
 cancelDownloadsOKText=Batalkan 1 Unduhan
 cancelDownloadsOKTextMultiple=Batalkan %S Unduhan
 dontQuitButtonWin=Jangan Keluar
 dontQuitButtonMac=Jangan Keluar
 dontGoOfflineButton=Tetap Daring
-dontEnterPrivateBrowsingButton=Jangan Masuk ke Mode Penjelajahan Pribadi
-dontLeavePrivateBrowsingButton=Tetap dalam Mode Penjelajahan Pribadi
+dontLeavePrivateBrowsingButton2=Tetap dalam Mode Penjelajahan Pribadi
 downloadsCompleteTitle=Unduhan Selesai
 downloadsCompleteMsg=Semua berkas telah selesai diunduh.\u0020
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -4,6 +4,7 @@
 <!ENTITY addons.windowTitle                   "Pengelola Pengaya">
 
 <!ENTITY search.placeholder                   "Cari pengaya">
+<!ENTITY search.buttonlabel                   "Cari">
 <!-- LOCALIZATION NOTE (search.commandKey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
@@ -227,3 +228,5 @@
 <!ENTITY experiment.info.learnmore.accesskey "L">
 <!ENTITY experiment.info.changetelemetry "Setelan Telemetri">
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
+
+<!ENTITY setting.learnmore "Pelajari Lebih Lanjut…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:04:28.000000000 +0000
@@ -56,8 +56,8 @@
 notification.installError=Galat terjadi saat memasang %1$S.
 notification.installError.retry=Coba lagi
 notification.installError.retry.tooltip=Coba unduh dan pasang pengaya ini lagi
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Akan dipasang sebentar lagi.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S akan diinstal sebentar lagi.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Saran Kontribusi: %S
@@ -99,8 +99,8 @@
 details.notification.uninstall=%1$S akan dihapus setelah %2$S dimulai ulang.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S akan diperbarui setelah %2$S dimulai ulang.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Akan dipasang sebentar lagi.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S akan diinstal sebentar lagi.
 
 # LOCALIZATION NOTE (details.experiment.time.daysRemaining):
 # Semicolon-separated list of plural forms.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:04:28.000000000 +0000
@@ -39,3 +39,4 @@
 
 <!ENTITY plugin.file                                         "Berkas">
 <!ENTITY plugin.mimeTypes                                    "Jenis MIME">
+<!ENTITY plugin.flashProtectedMode.label                     "Aktifkan mode perlindungan Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/id/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:43:31.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/id/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:04:28.000000000 +0000
@@ -33,3 +33,4 @@
 cspBlocked=Aplikasi mencoba mengakses sumber daya yang memiliki kebijakan keamanan konten, yang mencegahnya untuk dimuat dengan cara ini.
 corruptedContentError=Aplikasi tidak dapat dimuat karena terdeteksi galat pada pengiriman data.
 remoteXUL=Aplikasi mencoba untuk menggunakan teknologi yang tidak lagi tersedia.
+sslv3Used=Aplikasi ini tidak dapat menjamin keselamatan data Anda di %S karena menggunakan protokol SSLv3 yang merupakan protokol bermasalah.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/dom/chrome/appstrings.properties	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/dom/chrome/appstrings.properties	2015-02-28 15:04:32.000000000 +0000
@@ -32,3 +32,4 @@
 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.
 remoteXUL = Questa pagina utilizza una tecnologia non supportata che non è più disponibile per impostazione predefinita.
+sslv3Used = La sicurezza dei dati su %S non può essere garantita in quanto utilizza SSLv3, un protocollo di sicurezza non affidabile.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/dom/chrome/dom/dom.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/dom/chrome/dom/dom.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/dom/chrome/dom/dom.properties	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/dom/chrome/dom/dom.properties	2015-02-28 15:04:32.000000000 +0000
@@ -114,7 +114,6 @@
 SyncXMLHttpRequestWarning = Una richiesta XMLHttpRequest sincrona sul thread principale è deprecata a causa degli effetti negativi sull’esperienza utente. Per ulteriori informazioni consultare http://xhr.spec.whatwg.org/
 ImplicitMetaViewportTagFallback = Non è stato trovato alcun tag meta-viewport. È consigliato specificarne uno per evitare comportamenti inattesi nelle prossime versioni. Per ulteriori informazioni consultare https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag
 DataContainerEventWarning = L’utilizzo di DataContainerEvent è deprecato. Al suo posto utilizzare CustomEvent.
-SendAsBinaryWarning = Il metodo non standard sendAsBinary è deprecato e verrà presto rimosso. Al suo posto utilizzare il metodo standard send(Blob data).
 Window_ControllersWarning = window.controllers è deprecato. Non utilizzarlo per rilevare l’User Agent del browser.
 ImportXULIntoContentWarning = L’importazione di nodi XUL nel contenuto di un documento è deprecata. Questa funzione potrebbe essere rimossa a breve.
 XMLDocumentLoadPrincipalMismatch = L’utilizzo di document.load è proibito su documenti provenienti da altre finestre. Solo la finestra in cui il documento è stato creato può chiamare .load sul documento stesso. Al suo posto è preferibile utilizzare XMLHttpRequest.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/dom/chrome/plugins.properties	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/dom/chrome/plugins.properties	2015-02-28 15:04:32.000000000 +0000
@@ -15,5 +15,8 @@
 mimetype_label = Tipo MIME
 description_label = Descrizione
 suffixes_label = Estensione
+gmp_license_info = Informazioni sulla licenza
 openH264_name = Codec video OpenH264 realizzato da Cisco Systems, Inc.
-openH264_description = Utilizzato per la riproduzione di video sul Web e per chat video.
\ No newline at end of file
+openH264_description = Utilizzato per la riproduzione di video sul Web e per chat video.
+eme-adobe_name = Modulo Primetime Content Decryption fornito da Adobe Systems, Incorporated
+eme-adobe_description = Riproduzione di video web con contenuto protetto.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/security/manager/chrome/pipnss/nsserrors.properties	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/security/manager/chrome/pipnss/nsserrors.properties	2015-02-28 15:04:32.000000000 +0000
@@ -169,10 +169,10 @@
 SEC_ERROR_CRL_BAD_SIGNATURE = Il CRL per l’autorità emittente del certificato ha una firma non valida.
 SEC_ERROR_CRL_INVALID = Il nuovo CRL ha un formato non valido.
 SEC_ERROR_EXTENSION_VALUE_INVALID = Il valore extension del certificato non è valido.
-SEC_ERROR_EXTENSION_NOT_FOUND = Campo extension del certificato non trovato.
+SEC_ERROR_EXTENSION_NOT_FOUND = Campo “extension” del certificato non trovato.
 SEC_ERROR_CA_CERT_INVALID = Il certificato dell’autorità emittente non è valido.
-SEC_ERROR_PATH_LEN_CONSTRAINT_INVALID = Il campo path length constraint del certificato non è valido.
-SEC_ERROR_CERT_USAGES_INVALID = Il campo usages field del certificato non è valido.
+SEC_ERROR_PATH_LEN_CONSTRAINT_INVALID = Il campo “path length constraint” del certificato non è valido.
+SEC_ERROR_CERT_USAGES_INVALID = Il campo “usages field” del certificato non è valido.
 SEC_INTERNAL_ONLY = **Modulo ESCLUSIVAMENTE interno**
 SEC_ERROR_INVALID_KEY = La chiave non supporta l’operazione richiesta.
 SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION = Il certificato contiene un’estensione critica sconosciuta.
@@ -317,3 +317,4 @@
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE = Per emettere il certificato del server è stato utilizzato un certificato non ancora valido.
 MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE = Il server utilizza il meccanismo di “key pinning” ma non è possibile creare una catena di certificati affidabili che corrisponda al pinset. Non è possibile ignorare violazioni relative al “key pinning”.
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY = Il server utilizza un certificato con un’estensione limitazioni di base che lo identifica come autorità di certificazione. Questo non dovrebbe accadere per un certificato emesso correttamente.
+MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH = L’algoritmo di firma specificato nel campo “signature” del certificato non corrisponde a quello specificato nel campo “signatureAlgorithm”.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:04:32.000000000 +0000
@@ -10,8 +10,12 @@
 aboutReader.colorScheme.auto = Automatico
 aboutReader.fontType.serif = Con grazie
 aboutReader.fontType.sans-serif = Senza grazie
-aboutReader.fontType.charis-sil = Charis SIL Compact
-aboutReader.fontType.clear-sans = Clear Sans
 aboutReader.fontTypeSample = Aa
-aboutReader.fontSizeSample = A
-aboutReader.toolbarTip = Tocca lo schermo per le opzioni del lettore
+aboutReader.toolbar.close = Chiudi Vista lettore
+aboutReader.toolbar.typeControls = Controlli carattere
+aboutReader.toolbar.addToReadingList = Aggiungi a Elenco lettura
+aboutReader.toolbar.removeFromReadingList = Rimuovi da Elenco lettura
+aboutReader.toolbar.openReadingList = Apri Elenco lettura
+aboutReader.toolbar.closeReadingList = Chiudi Elenco lettura
+aboutReader.toolbar.share = Condividi
+aboutReader.footer.deleteThisArticle = Elimina questo articolo
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:04:32.000000000 +0000
@@ -58,3 +58,5 @@
 <!ENTITY aboutSupport.copyTextToClipboard.label "Copia testo negli appunti">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copia dati non elaborati negli appunti">
 <!ENTITY aboutSupport.sandboxTitle "Sandbox">
+<!ENTITY aboutSupport.safeModeTitle "Prova la modalità provvisoria">
+<!ENTITY aboutSupport.restartInSafeMode.label "Riavvia disattivando i componenti aggiuntivi…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:04:32.000000000 +0000
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+quitMenuitem.label = Esci
+quitMenuitem.key = q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:04:32.000000000 +0000
@@ -166,3 +166,4 @@
 <!ENTITY experiment.info.learnmore.accesskey "U">
 <!ENTITY experiment.info.changetelemetry "Impostazioni telemetria">
 <!ENTITY experiment.info.changetelemetry.accesskey "t">
+<!ENTITY setting.learnmore "Ulteriori informazioni…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:04:32.000000000 +0000
@@ -31,7 +31,7 @@
 notification.installError = Si è verificato un errore durante l’installazione di %1$S.
 notification.installError.retry = Riprova
 notification.installError.retry.tooltip = Riprova a scaricare e installare questo componente aggiuntivo
-notification.openH264Pending = Verrà installato tra qualche istante.
+notification.gmpPending = %1$S verrà installato tra qualche istante.
 contributionAmount2 = Donazione consigliata: %S
 installDownloading = Download in corso
 installDownloaded = Scaricato
@@ -58,7 +58,7 @@
 details.notification.install = %1$S verrà installato dopo il riavvio di %2$S.
 details.notification.uninstall = %1$S verrà disinstallato dopo il riavvio di %2$S.
 details.notification.upgrade = %1$S verrà aggiornato dopo il riavvio di %2$S.
-details.notification.openH264Pending = Verrà installato tra qualche istante.
+details.notification.gmpPending = %1$S verrà installato tra qualche istante.
 details.experiment.time.daysRemaining = #1 giorno rimanente;#1 giorni rimanenti
 details.experiment.time.endsToday = Meno di un giorno rimanente
 details.experiment.time.daysPassed = #1 giorno fa;#1 giorni fa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:04:32.000000000 +0000
@@ -26,3 +26,4 @@
 <!ENTITY report.pageURL "Includi URL della pagina">
 <!ENTITY plugin.file "File">
 <!ENTITY plugin.mimeTypes "Tipi MIME">
+<!ENTITY plugin.flashProtectedMode.label "Attiva modalità protetta in Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/it/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:43:35.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/it/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:04:32.000000000 +0000
@@ -32,3 +32,4 @@
 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.
 remoteXUL = Questa applicazione ha cercato di utilizzare una tecnologia non supportata e non è più disponibile.
+sslv3Used = Non è possibile garantire la sicurezza dei dati trasmessi a %S in quanto viene utilizzato SSLv3, un protocollo di sicurezza non affidabile.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/b2g/chrome/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/b2g/chrome/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/b2g/chrome/overrides/appstrings.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/b2g/chrome/overrides/appstrings.properties	2015-02-28 15:04:51.000000000 +0000
@@ -5,12 +5,11 @@
 malformedURI=Adres URL jest nieprawidłowy i nie może zostać wczytany.
 fileNotFound=Firefox nie może odnaleźć pliku %S.
 dnsNotFound=Firefox nie może odnaleźć serwera %S.
-unknownProtocolFound=Firefox nie jest w stanie otworzyć tego adresu, ponieważ jeden z protokołów (%S) nie jest przypisany do żadnego programu ani nie jest dozwolony w tym kontekście.
+unknownProtocolFound=Firefox nie jest w stanie otworzyć tego adresu, ponieważ protokół „%S” nie jest przypisany do żadnego programu ani nie jest dozwolony w tym kontekście.
 connectionFailure=Firefox nie może nawiązać połączenia z serwerem %S.
 netInterrupt=Połączenie z %S zostało przerwane podczas wczytywania strony.
 netTimeout=Serwer %S zbyt długo nie odpowiada.
 redirectLoop=Firefox wykrył, że serwer przekierowuje żądanie tego zasobu w sposób uniemożliwiający jego ukończenie.
-# LOCALIZATION NOTE (confirmRepost): In this item, don't translate "%S"
 confirmRepostPrompt=Aby wyświetlić tę stronę, %S musi ponownie przesłać dane, które spowodują powtórzenie zadań wykonanych wcześniej (takich jak przeszukiwanie czy potwierdzenie zlecenia).
 resendButton.label=Prześlij ponownie
 unknownSocketType=Firefox nie jest w stanie skomunikować się z tym serwerem.
@@ -24,13 +23,13 @@
 contentEncodingError=Otwierana strona nie może zostać wyświetlona, ponieważ używa nieprawidłowych lub nieobsługiwanych metod kompresji.
 unsafeContentType=Otwierana strona nie może zostać wyświetlona, ponieważ umieszczona jest w pliku, którego otwarcie może nie być bezpieczne. Prosimy poinformować właścicieli witryny o tym problemie.
 externalProtocolTitle=Żądanie zewnętrznego protokołu
-externalProtocolPrompt=Aby obsłużyć odnośnik %1$S: musi zostać uruchomiona zewnętrzna aplikacja.\n\n\nZażądany odnośnik:\n\n%2$S\n\nAplikacja: %3$S\n\n\nJeśli to żądanie pojawiło się niespodziewanie, może to być próba wykorzystania błędu w aplikacji zewnętrznej. W razie jakichkolwiek wątpliwości anuluj to żądanie.\n
-#LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
+externalProtocolPrompt=Aby obsłużyć odnośnik „%1$S:” musi zostać uruchomiona zewnętrzna aplikacja.\n\n\nZażądany odnośnik:\n\n%2$S\n\nAplikacja: %3$S\n\n\nJeśli to żądanie pojawiło się niespodziewanie, może to być próba wykorzystania błędu w aplikacji zewnętrznej. W razie jakichkolwiek wątpliwości anuluj to żądanie.\n
 externalProtocolUnknown=<Nieznana>
-externalProtocolChkMsg=Zapamiętaj mój wybór dla wszystkich odnośników tego rodzaju.
+externalProtocolChkMsg=Zapamiętaj wybór dla wszystkich odnośników tego rodzaju.
 externalProtocolLaunchBtn=Uruchom aplikację
-malwareBlocked=Witryna %S została zgłoszona jako witryna stanowiąca zagrożenie i została zablokowana zgodnie z ustawieniami bezpieczeństwa.
-phishingBlocked=Witryna %S została zgłoszona jako przypadek oszustwa mającego na celu wyłudzenie danych osobowych i informacji finansowych.
+malwareBlocked=Witryna „%S” została zgłoszona jako witryna stanowiąca zagrożenie i została zablokowana zgodnie z ustawieniami bezpieczeństwa.
+phishingBlocked=Witryna „%S” została zgłoszona jako przypadek oszustwa mającego na celu wyłudzenie danych osobowych i informacji finansowych.
 cspBlocked=Ta strona posiada politykę bezpieczeństwa treści, która nie pozwala na wczytanie jej w taki sposób.
 corruptedContentError=Strona, którą próbujesz obejrzeć, nie może być wyświetlona, ponieważ wykryto błąd w transmisji danych.
 remoteXUL=Ta strona wykorzystuje niewspieraną technologię, która nie jest już dostępna domyślnie w Firefoksie.
+sslv3Used=Bezpieczeństwo danych wymienianych z „%S” nie jest gwarantowane ponieważ serwer używa SSLv3, wadliwego protokołu bezpieczeństwa.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/dom/chrome/appstrings.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/dom/chrome/appstrings.properties	2015-02-28 15:04:51.000000000 +0000
@@ -5,7 +5,7 @@
 malformedURI=Adres URL jest nieprawidłowy i nie może zostać wczytany.
 fileNotFound=Odnalezienie pliku „%S” było niemożliwe. Sprawdź ścieżkę dostępu do pliku, a następnie spróbuj ponownie.
 dnsNotFound=Odnalezienie „%S” było niemożliwe. Sprawdź poprawność nazwy, a następnie spróbuj ponownie.
-unknownProtocolFound=Jeden z protokołów (%S) nie jest zarejestrowany lub nie jest dozwolony w tym kontekście.
+unknownProtocolFound=Protokół „%S” nie jest zarejestrowany lub nie jest dozwolony w tym kontekście.
 connectionFailure=Połączenie zostało odrzucone podczas próby kontaktu z serwerem „%S”.
 netInterrupt=Połączenie z serwerem „%S” zostało nieoczekiwanie zakończone. Część danych mogła zostać przesłana.
 netTimeout=Przekroczono limit czasu podczas próby połączenia z „%S”.
@@ -32,3 +32,4 @@
 cspBlocked=Ta strona posiada politykę bezpieczeństwa treści, która nie pozwala na wczytanie jej w taki sposób.
 corruptedContentError=Strona, którą próbujesz obejrzeć, nie może być wyświetlona, ponieważ wykryto błąd w transmisji danych.
 remoteXUL=Ta strona wykorzystuje niewspieraną technologię, która nie jest już dostępna domyślnie.
+sslv3Used=Bezpieczeństwo danych wymienianych z „%S” nie jest gwarantowane ponieważ serwer używa SSLv3, wadliwego protokołu bezpieczeństwa.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/dom/chrome/plugins.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/dom/chrome/plugins.properties	2015-02-28 15:04:51.000000000 +0000
@@ -16,5 +16,10 @@
 description_label=Opis
 suffixes_label=Rozszerzenia
 
-openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc.
+gmp_license_info=Informacje o licencji
+
+openH264_name=OpenH264 Video Codec dostarczony przez Cisco Systems, Inc.
 openH264_description=Pozwala odtwarzać wideo na stronach oraz prowadzić rozmowy wideo.
+
+eme-adobe_name=Primetime Content Decryption Module dostarczony przez Adobe Systems, Incorporated
+eme-adobe_description=Odtwarzanie chronionego wideo w sieci.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/aboutDialog.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/aboutDialog.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -1,29 +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/. -->
+
 <!ENTITY aboutDialog.title "O programie &brandFullName;">
 
 <!ENTITY update.checkForUpdatesButton.label "Sprawdź dostępność aktualizacji">
 <!ENTITY update.checkForUpdatesButton.accesskey "S">
-<!ENTITY update.updateButton.label2 "Uruchom ponownie program &brandShortName;, by zaktualizować">
+<!ENTITY update.updateButton.label2 "Uruchom ponownie, aby uaktualnić">
 <!ENTITY update.updateButton.accesskey "U">
-<!ENTITY update.applyButtonBillboard.label "Zaktualizuj…">
-<!ENTITY update.applyButtonBillboard.accesskey "Z">
+<!ENTITY update.applyButtonBillboard.label "Uaktualnij…">
+<!ENTITY update.applyButtonBillboard.accesskey "U">
+
+<!ENTITY warningDesc.version "Program &brandShortName; jest wersją rozwojową i może być niestabilny.">
+<!ENTITY warningDesc.telemetryDesc "Dane o wydajności, wykorzystaniu, modyfikacjach oraz o sprzęcie, na którym działa, są wysyłane do organizacji &vendorShortName;, aby ulepszać program &brandShortName;.">
 
-<!ENTITY community.start2      "">
-<!ENTITY community.mozillaLink "&vendorShortName;">
-<!ENTITY community.middle2     ", ">
-<!ENTITY community.creditsLink "globalna społeczność">
-<!ENTITY community.end2        ", chcąca uczynić Internet lepszym, stworzyła program &brandShortName;. Wierzymy, że Internet powinien być otwarty, publiczny i dostępny dla wszystkich bez żadnych ograniczeń.">
-
-<!ENTITY contribute.start           "Brzmi ciekawie? ">
-<!ENTITY contribute.getInvolvedLink "Dołącz do nas!">
-<!ENTITY contribute.end             "">
+<!ENTITY community.exp.start "">
+<!ENTITY community.exp.mozillaLink "&vendorShortName;">
+<!ENTITY community.exp.middle " jest ">
+<!ENTITY community.exp.creditsLink "globalną społecznością">
+<!ENTITY community.exp.end ", starającą się zapewnić, by Internet pozostał otwarty, publiczny i dostępny dla wszystkich.">
+
+<!ENTITY community.start2 "Program &brandShortName; został opracowany przez ">
+<!ENTITY community.mozillaLink "organizację &vendorShortName;">
+<!ENTITY community.middle2 ", która jest ">
+<!ENTITY community.creditsLink "globalną społecznością">
+<!ENTITY community.end3 ", starającą się zapewnić, by Internet pozostał otwarty, publiczny i dostępny dla wszystkich.">
+
+<!ENTITY helpus.start "Chcesz pomóc? ">
+<!ENTITY helpus.donateLink "Przekaż datek">
+<!ENTITY helpus.middle " lub ">
+<!ENTITY helpus.getInvolvedLink "dołącz do nas">
+<!ENTITY helpus.end "!">
 
 <!ENTITY bottomLinks.license "Informacje licencyjne">
 <!ENTITY bottomLinks.rights  "Prawa użytkownika">
 <!ENTITY bottomLinks.privacy "Polityka prywatności">
 
-<!ENTITY update.checkingForUpdates  "Poszukiwanie aktualizacji…">
-<!ENTITY update.noUpdatesFound      "Program &brandShortName; jest aktualny">
-<!ENTITY update.adminDisabled       "Aktualizacje zablokowane przez administratora">
+<!ENTITY update.checkingForUpdates "Poszukiwanie aktualizacji…">
+<!ENTITY update.noUpdatesFound "Program &brandShortName; jest aktualny">
+<!ENTITY update.adminDisabled "Aktualizacje zablokowane przez administratora">
+<!ENTITY update.otherInstanceHandlingUpdates "Inna instancja właśnie aktualizuje program &brandShortName;">
 
 <!ENTITY update.failed.start    "Aktualizacja się nie powiodła. ">
 <!ENTITY update.failed.linkText "Pobierz najnowszą wersję">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/aboutDownloads.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/aboutDownloads.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/aboutDownloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/aboutDownloads.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -0,0 +1,17 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 aboutDownloads.title "Zapisane pliki">
+<!ENTITY aboutDownloads.empty "Brak zapisanych plików">
+
+<!ENTITY cmd.show.label "Otwórz folder nadrzędny">
+<!ENTITY cmd.show.accesskey "f">
+<!ENTITY cmd.showMac.label "Pokaż w Finderze">
+<!ENTITY cmd.showMac.accesskey "F">
+<!ENTITY cmd.open.label "Otwórz">
+<!ENTITY cmd.open.accesskey "O">
+<!ENTITY cmd.removeFromHistory.label "Usuń z historii">
+<!ENTITY cmd.removeFromHistory.accesskey "U">
+<!ENTITY cmd.clearDownloads.label "Wyczyść pobrane">
+<!ENTITY cmd.clearDownloads.accesskey "e">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -4,7 +4,9 @@
 
 <!ENTITY addressbookWindow.title "Książka adresowa">
 
-<!-- File Menu -->
+<!ENTITY blankResultsPaneMessage.label "Ta książka adresowa wyświetla kontakty wyłącznie po wyszukiwaniu">
+<!ENTITY localResultsOnlyMessage.label "Kontakty ze zdalnych książek adresowcyh nie są wyświetlane zanim nie zostaną wyszukane">
+
 <!ENTITY fileMenu.label                 "Plik">
 <!ENTITY fileMenu.accesskey             "P">
 <!ENTITY newMenu.label                  "Utwórz">
@@ -38,7 +40,6 @@
 <!ENTITY printAddressBook.label         "Drukuj książkę adresową…">
 <!ENTITY printAddressBook.accesskey     "a">
 
-<!-- Edit Menu -->
 <!ENTITY editMenu.label         "Edycja">
 <!ENTITY editMenu.accesskey     "E">
 <!ENTITY undoCmd.label          "Cofnij">
@@ -76,7 +77,8 @@
 <!ENTITY propertiesCmd2.accesskey "i">
 <!ENTITY propertiesCmd.key       "i">
 
-<!-- View Menu -->
+<!ENTITY Addrbook.label "Książka adresowa">
+<!ENTITY Addrbook.accesskey "a">
 <!ENTITY viewMenu.label             "Widok">
 <!ENTITY viewMenu.accesskey         "W">
 <!ENTITY viewToolbarsMenu.label     "Paski narzędzi">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-28 15:04:51.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/. -->
 
+<!ENTITY Addrbook.label "Książka adresowa">
+<!ENTITY Addrbook.accesskey "a">
 <!ENTITY GeneratedName.label      "Imię i nazwisko">
 <!ENTITY GeneratedName.accesskey  "n">
 <!ENTITY PrimaryEmail.label       "E-mail">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-28 15:04:51.000000000 +0000
@@ -5,6 +5,7 @@
 emptyListName                   = Musisz podać nazwę listy dystrybucyjnej.
 lastFirstFormat                 = %S, %S
 firstLastFormat                 = %S %S
+allAddressBooks=Wszystkie książki adresowe
 newContactTitle                 = Nowa wizytówka
 newContactTitleWithDisplayName  = Nowa wizytówka: %S
 editContactTitle                = Edytuj wizytówkę
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/am-server-top.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/am-server-top.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -71,3 +71,7 @@
 
 <!ENTITY accountTitle.label "Ustawienia konta">
 <!ENTITY accountSettingsDesc.label "To jest specjalne konto, któremu nie są przypisane żadne tożsamości.">
+<!ENTITY storeType.label "Sposób przechowywania wiadomości:">
+<!ENTITY storeType.accesskey "S">
+<!ENTITY mboxStore.label "jeden duży plik (mbox)">
+<!ENTITY maildirStore.label "osobne pliki (maildir)">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/chat.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/chat.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/chat.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/chat.properties	2015-02-28 15:04:51.000000000 +0000
@@ -45,3 +45,5 @@
 log.previousWeek=W zeszłym tygodniu
 
 messagePreview=Nowa wiadomość na czacie
+
+bundledMessagePreview=%1$S… (i #1 wiadomość więcej);%1$S… (i #1 wiadomości więcej);%1$S… (i #1 wiadomości więcej)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/localMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/localMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/localMsgs.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/localMsgs.properties	2015-02-28 15:04:51.000000000 +0000
@@ -13,7 +13,6 @@
 noNewMessages=Brak nowych wiadomości.
 receivedMsgs=Odebrano %1$S z %2$S wiadomości
 
-pop3OutOfDiskSpace=Za mało miejsca na dysku, aby pobrać nowe wiadomości. Spróbuj usunąć starą pocztę, opróżniając Kosz, a następnie uporządkuj foldery poczty i spróbuj jeszcze raz pobrać nowe wiadomości.
 buildingSummary=Tworzenie pliku podsumowania dla %S…
 localStatusDocumentDone=Zakończono
 pop3ServerError=Wystąpił błąd związany z serwerem pocztowym POP3.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-28 15:04:51.000000000 +0000
@@ -4,57 +4,56 @@
 
 unableToOpenFile    = Nie można otworzyć pliku %S.
 unableToOpenTmpFile = Nie można otworzyć pliku tymczasowego: %S. Sprawdź ustawienia katalogu roboczego i ponów próbę.
-
-12502=Nie można zapisać wiadomości jako szablonu.
-12503=Nie można zapisać wiadomości jako szkicu.
-12506=Nie można otworzyć folderu wysłanej poczty. Sprawdź, czy ustawienia programu są poprawne.
-12510=Nie określono nadawcy. Wprowadź swój adres e-mail w Konfiguracji kont programu.
-12511=Nie określono żadnego adresata. W wierszu Do: wprowadź adresata lub w wierszu Grupa dyskusyjna: wprowadź nazwę grupy dyskusyjnej.
-12512=Błąd zapisu pliku tymczasowego.
-12514=Podczas wysyłania poczty wystąpił błąd. Odpowiedź serwera: %s. Sprawdź poprawność wprowadzonego adresu e-mail w Konfiguracji kont, a następnie ponów próbę.
-12516=Podczas wysyłania wiadomości wystąpił błąd serwera poczty wychodzącej SMTP. Otrzymana odpowiedź serwera: %s.
-12517=Podczas wysyłania poczty wystąpił błąd. Odpowiedź serwera: %s. Sprawdź wiadomość, a następnie ponów próbę.
-12518=Wiadomość nie może zostać wysłana, ponieważ nie można się połączyć z serwerem grup dyskusyjnych. Serwer może być niedostępny lub odmawia połączenia. Sprawdź ustawienia serwera grup dyskusyjnych i spróbuj ponownie lub skontaktuj się ze swoim administratorem.
-12519=Podczas dostarczania niewysłanych wiadomości wystąpił błąd.
-12520=Wysyłanie wiadomości nie powiodło się.
-12524=Podczas wysyłania poczty wystąpił błąd: Błąd serwera SMTP. Odpowiedź serwera: %s. Skontaktuj się z administratorem poczty.
-12525=Nie można zapisać wiadomości do późniejszego jej wysłania.
-12526=Wystąpił błąd podczas komunikacji: %d. Ponów próbę później.
-12527=Ta wiadomość nigdy nie powinna zostać wyświetlona.
-12528=Podczas pobierania danych wystąpił błąd sieciowy. (Błąd sieciowy: %s). Spróbuj ponownie nawiązać połączenie.
-12529=Podczas wysyłania poczty wystąpił błąd: wprowadzony zwrotny adres e-mail jest nieprawidłowy. Sprawdź w Konfiguracji kont poprawność zwrotnego adresu e-mail, a następnie ponów próbę.
-12531=Błąd załącznika.
-12532=Wiadomość została wysłana pomyślnie, jednakże nie można skopiować jej do folderu Wysłane.
-
-12554=Wysłanie wiadomości do więcej niż jednego serwera grup dyskusyjnych jest niemożliwe.
-12555=Wycofywanie…
-12560=Operacja wysyłania wiadomości do grupy dyskusyjnej zakończyła się pomyślnie, jednakże wiadomość nie została wysłana do innych adresatów.
-12563=Błąd odczytu pliku.
-
+unableToSaveTemplate=Nie można zapisać wiadomości jako szablonu.
+unableToSaveDraft=Nie można zapisać wiadomości jako szkicu.
+couldntOpenFccFolder=Nie można otworzyć folderu wysłanej poczty. Sprawdź, czy ustawienia programu są poprawne.
+noSender=Nie określono nadawcy. Wprowadź swój adres e-mail w konfiguracji kont programu.
+noRecipients=Nie określono żadnego adresata. W polu Do: wprowadź adresata lub w polu Grupa dyskusyjna: wprowadź nazwę grupy dyskusyjnej.
+errorWritingFile=Błąd zapisu pliku tymczasowego.
+
+errorSendingFromCommand=Wystąpił błąd podczas wysyłania wiadomości. Odpowiedź serwera poczty: %s. Proszę zweryfikować poprawność adresu e-mail w konfiguracji kont i spróbować ponownie.
+errorSendingDataCommand=Wystąpił błąd serwera „%S” poczty wychodzącej (SMTP). Odpowiedź serwera: %s.
+errorSendingMessage=Wystąpił błąd podczas wysyłania wiadomości. Odpowiedź serwera: %s. Proszę sprawdzić wiadomość i spróbować ponownie.
+postFailed=Wiadomość nie mogła zostać wysłana ponieważ zawiodło połączenie z serwerem news. Serwer może być niedostępny lub odrzuca połączenia. Proszę zweryfikować poprawność ustawień serwera news i spróbować ponownie.
+errorQueuedDeliveryFailed=Wystąpił błąd podczas dostarczania zaległych wiadomości.
+sendFailed=Wysyłanie wiadomości nie powiodło się.
+
+smtpServerError=Wystąpił błąd podczas wysyłania wiadomości: błąd serwera „%S” poczty wychodzącej (SMTP). Odpowiedź serwera: %s
+unableToSendLater=Niestety nie udało się zachować wiadomości w celu późniejszego jej wysłania.
+
+communicationsError=Wystąpił błąd podczas komunikacji: %d. Ponów próbę później.
+dontShowAlert=Ten komunikat nigdy nie powinien zostać wyświetlony.
+
+tcpReadError=Podczas pobierania danych wystąpił błąd sieciowy. (Błąd sieciowy: %s). Spróbuj ponownie nawiązać połączenie.
+couldNotGetUsersMailAddress=Podczas wysyłania poczty wystąpił błąd: wprowadzony zwrotny adres e-mail jest nieprawidłowy. Sprawdź w konfiguracji kont poprawność zwrotnego adresu e-mail, a następnie ponów próbę.
+mimeMpartAttachmentError=Błąd załącznika.
+failedCopyOperation=Wiadomość została wysłana pomyślnie, jednakże nie można skopiować jej do folderu Wysłane.
+nntpNoCrossPosting=Wysłanie wiadomości do więcej niż jednego serwera grup dyskusyjnych jest niemożliwe.
+msgCancelling=Wycofywanie…
+sendFailedButNntpOk=Operacja wysyłania wiadomości do grupy dyskusyjnej zakończyła się pomyślnie, jednakże wiadomość nie została wysłana do innych adresatów.
+errorReadingFile=Błąd odczytu pliku.
 followupToSenderMessage=Zgodnie z życzeniem autora, odpowiedzi na tę wiadomość zostaną przesłane tylko do autora. Jeżeli wysyłana odpowiedź ma zostać wysłana również do grupy dyskusyjnej, należy dodać nowy wiersz w polu adresowym, wybrać „Grupa dyskusyjna” jako typ adresata, a następnie wpisać adres grupy w pole po prawej stronie.
 
-12570=Wystąpił błąd podczas dołączania %S. Należy upewnić się, czy użytkownik posiada dostęp do pliku.
-
-12572=Wystąpił błąd podczas wysyłania wiadomości: Serwer pocztowy wysłał nieprawidłowe powitanie: %s.
-12575=Wystąpił błąd podczas wysyłania wiadomości. Odpowiedź serwera: %1$s. Sprawdź adresata wiadomości (%2$s), a następnie ponów próbę.
-12597=Wystąpił błąd podczas wysyłania wiadomości: nie udało się uwierzytelnić z serwerem SMTP %S. Proszę sprawdzić hasło oraz metodę uwierzytelniania w Poczcie wychodzącej w Konfiguracji kont.
-12598=Uwierzytelnianie przy pomocy Kerberos/GSSAPI nie zostało zaakceptowane przez serwer SMPT %S. Proszę sprawdzić stan zalogowania do domeny Kerberos/GSSAPI.
-12599=Serwer SMTP %S nie obsługuje wybranej metody uwierzytelniania. Proszę zmienić metodę uwierzytelniania w Poczcie wychodzącej w Konfiguracji kont.
-12600=Nie udało się uwierzytelnić na serwerze SMTP %S. Serwer nie wspiera uwierzytelniania (SMTP-AUTH) które zostało wybrane. Proszę wyłączyć uwierzytelnianie w Poczcie wychodzącej w Konfiguracji kont lub skontaktować się z dostawcą usługi pocztowej.
-12582=Wystąpił błąd podczas wysyłania wiadomości: nie udało się nawiązać bezpiecznego połączenia z serwerem SMTP %S przy użyciu STARTTLS, jako że nie ogłasza on jego stosowania. Należy wyłączyć STARTTLS w opcjach tego serwera lub skontaktować się z dostawcą usługi.
-12584=Wystąpił błąd podczas wysyłania wiadomości: nie udało się uzyskać hasła dla konta %S. Wiadomość nie została wysłana.
-
-12586=Rozmiar wysyłanej wiadomości przekracza tymczasowy limit rozmiaru wiadomości na serwerze. Wiadomość nie została wysłana; należy spróbować zmniejszyć jej rozmiar lub odczekać trochę i spróbować ponownie. Odpowiedź serwera: %s.
-12587=Rozmiar wysyłanej wiadomości przekracza globalny limit rozmiaru wiadomości na serwerze (%d bajtów). Wiadomość nie została wysłana; należy zmniejszyć jej rozmiar i spróbować ponownie.
-12588=Rozmiar wysyłanej wiadomości przekracza globalny limit rozmiaru wiadomości na serwerze. Wiadomość nie została wysłana; należy zmniejszyć jej rozmiar i spróbować ponownie. Odpowiedź serwera: %s.
-12589=Wystąpił błąd podczas wysyłania wiadomości: serwer SMTP %S jest nieznany. Serwer może być niewłaściwie skonfigurowany. Należy sprawdzić poprawność ustawień serwera poczty wychodzącej, a następnie spróbować ponownie.
-12590=Wysyłanie wiadomości nie powiodło się, ponieważ nie udało się połączyć z serwerem SMTP %S. Serwer może być nieosiągalny albo nie przyjmować połączeń SMTP. Należy sprawdzić poprawność ustawień serwera poczty wychodzącej, a następnie spróbować ponownie, albo skontaktować się z administratorem serwera.
-12591=Wysyłanie wiadomości nie powiodło się, ponieważ połączenie z serwerem SMTP %S zostało przerwane w trakcie transakcji. Należy spróbować ponownie lub skontaktować się z administratorem sieci.
-12592=Wysyłanie wiadomości nie powiodło się, ponieważ upłynął limit czasu połączenia z serwerem SMTP %S. Należy spróbować ponownie lub skontaktować się z administratorem sieci.
-12593=Z nieznanych przyczyn nie udało się wysłać wiadomości przy użyciu serwera SMTP %S. Należy sprawdzić poprawność ustawień serwera poczty wychodzącej, a następnie spróbować ponownie, albo skontaktować się z administratorem sieci.
-12594=Serwer SMTP %S wydaje się nie obsługiwać uwierzytelniania przy pomocy szyfrowanych haseł. Proszę spróbować zmienić metodę uwierzytelniania na Hasło przesyłane otwartym tekstem w Konfiguracji serwera w konfiguracji kont jeżeli jest to nowo utworzone konto. Jeżeli wybrana metoda uwierzytelniania działa wcześniej dla tego konta i nagle przestaje może to być oznaką próby wykradzenia hasła.
-12595=Serwer SMTP %S wydaje się nie obsługiwać uwierzytelniania przy pomocy szyfrowanych haseł. Proszę spróbować zmienić metodę uwierzytelniania na Normalne hasło w Konfiguracji serwera w konfiguracji tego konta jeżeli jest to nowo utworzone konto. Jeżeli wybrana metoda uwierzytelniania działała wcześniej dla tego konta i nagle przestała, proszę skontaktować się z dostawcą usługi pocztowej.
-12596=Serwer SMTP %S nie zezwala na uwierzytelnianie przy pomocy haseł przesyłanych otwartym tekstem. Proszę spróbować zmienić metodę uwierzytelniania na Szyfrowane hasło w Konfiguracji serwera w konfiguracji kont.
+errorAttachingFile=Wystąpił błąd podczas dołączania %S. Należy upewnić się, czy użytkownik posiada dostęp do pliku.
+incorrectSmtpGreeting=Wystąpił błąd podczas wysyłania wiadomości: Serwer pocztowy wysłał nieprawidłowe powitanie: %s.
+errorSendingRcptCommand=Wystąpił błąd podczas wysyłania wiadomości. Odpowiedź serwera: %1$s. Sprawdź adresata wiadomości (%2$s), a następnie ponów próbę.
+startTlsFailed=Wystąpił błąd podczas wysyłania wiadomości: nie udało się nawiązać bezpiecznego połączenia z serwerem „%S” poczty wychodzącej (SMTP) przy użyciu STARTTLS, jako że nie ogłasza on jego stosowania. Należy wyłączyć STARTTLS w opcjach tego serwera lub skontaktować się z dostawcą usługi.
+smtpPasswordUndefined=Wystąpił błąd podczas wysyłania wiadomości: nie udało się uzyskać hasła dla konta %S. Wiadomość nie została wysłana.
+smtpTempSizeExceeded=Rozmiar wysyłanej wiadomości przekracza tymczasowy limit rozmiaru wiadomości na serwerze. Wiadomość nie została wysłana; należy spróbować zmniejszyć jej rozmiar lub odczekać trochę i spróbować ponownie. Odpowiedź serwera: %s.
+smtpPermSizeExceeded1=Rozmiar wysyłanej wiadomości przekracza globalny limit rozmiaru wiadomości na serwerze (%d bajtów). Wiadomość nie została wysłana; należy zmniejszyć jej rozmiar i spróbować ponownie.
+smtpPermSizeExceeded2=Rozmiar wysyłanej wiadomości przekracza globalny limit rozmiaru wiadomości na serwerze. Wiadomość nie została wysłana; należy zmniejszyć jej rozmiar i spróbować ponownie. Odpowiedź serwera: %s.
+smtpSendFailedUnknownServer=Wystąpił błąd podczas wysyłania wiadomości: serwer „%S” poczty wychodzącej (SMTP) jest nieznany. Serwer może być niewłaściwie skonfigurowany. Należy sprawdzić poprawność ustawień serwera poczty wychodzącej, a następnie spróbować ponownie.
+smtpSendRefused=Wysyłanie wiadomości nie powiodło się, ponieważ nie udało się połączyć z serwerem „%S” poczty wychodzącej (SMTP). Serwer może być nieosiągalny albo nie przyjmować połączeń SMTP. Należy sprawdzić poprawność ustawień serwera poczty wychodzącej, a następnie spróbować ponownie, albo skontaktować się z administratorem serwera.
+smtpSendInterrupted=Wysyłanie wiadomości nie powiodło się, ponieważ połączenie z serwerem „%S” poczty wychodzącej (SMTP) zostało przerwane w trakcie transakcji. Należy spróbować ponownie lub skontaktować się z administratorem sieci.
+smtpSendTimeout=Wysyłanie wiadomości nie powiodło się, ponieważ upłynął limit czasu połączenia z serwerem %S poczty wychodzącej (SMTP). Należy spróbować ponownie lub skontaktować się z administratorem sieci.
+smtpSendFailedUnknownReason=Z nieznanych przyczyn nie udało się wysłać wiadomości przy użyciu serwera „%S” poczty wychodzącej (SMTP). Należy sprawdzić poprawność ustawień serwera poczty wychodzącej, a następnie spróbować ponownie, albo skontaktować się z administratorem sieci.
+smtpAuthChangeEncryptToPlainNoSsl=Serwer „%S” poczty wychodzącej (SMTP) wydaje się nie obsługiwać uwierzytelniania przy pomocy szyfrowanych haseł. Proszę spróbować zmienić metodę uwierzytelniania na Hasło przesyłane otwartym tekstem w Konfiguracji serwera w konfiguracji kont jeżeli jest to nowo utworzone konto. Jeżeli wybrana metoda uwierzytelniania działa wcześniej dla tego konta i nagle przestaje może to być oznaką próby wykradzenia hasła.
+smtpAuthChangeEncryptToPlainSsl=Serwer „%S” poczty wychodzącej (SMTP) wydaje się nie obsługiwać uwierzytelniania przy pomocy szyfrowanych haseł. Proszę spróbować zmienić metodę uwierzytelniania na Normalne hasło w Konfiguracji serwera w konfiguracji tego konta jeżeli jest to nowo utworzone konto. Jeżeli wybrana metoda uwierzytelniania działała wcześniej dla tego konta i nagle przestała, proszę skontaktować się z dostawcą usługi pocztowej.
+smtpAuthChangePlainToEncrypt=Serwer „%S” poczty wychodzącej (SMTP) nie zezwala na uwierzytelnianie przy pomocy haseł przesyłanych otwartym tekstem. Proszę spróbować zmienić metodę uwierzytelniania na Szyfrowane hasło w Konfiguracji serwera w konfiguracji kont.
+smtpAuthFailure=Wystąpił błąd podczas wysyłania wiadomości: nie udało się uwierzytelnić z serwerem „%S” poczty wychodzącej (SMTP). Proszę sprawdzić hasło oraz metodę uwierzytelniania w Poczcie wychodzącej w Konfiguracji kont.
+smtpAuthGssapi=Uwierzytelnianie przy pomocy Kerberos/GSSAPI nie zostało zaakceptowane przez serwer SMPT %S. Proszę sprawdzić stan zalogowania do domeny Kerberos/GSSAPI.
+smtpAuthMechNotSupported=Serwer „%S” poczty wychodzącej (SMTP) nie obsługuje wybranej metody uwierzytelniania. Proszę zmienić metodę uwierzytelniania w Poczcie wychodzącej w Konfiguracji kont.
+smtpAuthNotSupported=Nie udało się uwierzytelnić na serwerze „%S” poczty wychodzącej (SMTP). Serwer nie wspiera uwierzytelniania (SMTP-AUTH) które zostało wybrane. Proszę wyłączyć uwierzytelnianie w Poczcie wychodzącej w Konfiguracji kont lub skontaktować się z dostawcą usługi pocztowej.
 
 errorIllegalLocalPart=W części adresu odbiorcy („%s”) opisującej użytkownika, znajdują się znaki spoza zakresu ASCII. Tego typu adresy nie są jeszcze obsługiwane przez program. Proszę zmienić adres i spróbować ponownie.
 
@@ -98,7 +97,6 @@
 quitComposeWindowSaveTitle=Zapisywanie wiadomości
 quitComposeWindowSaveMessage=%1$S zapisuje wiadomość.\nZaczekać z kończeniem programu aż wiadomość zostanie zapisana, czy zakończyć natychmiast?
 
-# Strings used by prompt for Ctrl-Enter check before sending message
 sendMessageCheckWindowTitle     = Wyślij wiadomość
 sendMessageCheckLabel           = Czy na pewno ta wiadomość jest gotowa do wysłania?
 sendMessageCheckSendButtonLabel = Wyślij
@@ -108,6 +106,7 @@
 
 smtpDeliveringMail=Dostarczanie poczty…
 smtpMailSent=Poczta została wysłana
+assemblingMailInformation=Zbieranie informacji o wiadomości…
 
 assemblingMailInformation=Przygotowywanie informacji o wiadomości…
 
@@ -121,7 +120,7 @@
 filterMessageComplete=Filtrowanie zakończone.
 filterMessageFailed=Filtrowanie nie powiodło się.
 
-largeMessageSendWarning=Ostrzeżenie! Próbujesz wysłać wiadomość o rozmiarze %S, co może wykroczyć poza dozwolone limity serwera poczty. Czy na pewno kontynuować wysyłanie wiadomości?
+largeMessageSendWarning=Ostrzeżenie! Próbujesz wysłać wiadomość o rozmiarze %S. Czy kontynuować wysyłanie wiadomości?
 
 sendingMessage=Wysyłanie wiadomości…
 sendMessageErrorTitle=Błąd wysyłania wiadomości
@@ -181,12 +180,11 @@
 
 smtpEnterPasswordPrompt             = Wprowadź hasło dla %S:
 smtpEnterPasswordPromptWithUsername = Wprowadź hasło dla użytkownika %2$S na serwerze %1$S:
-smtpEnterPasswordPromptTitle        = Wymagane hasło serwera SMTP
+smtpEnterPasswordPromptTitle=Wymagane hasło serwera poczty wychodzącej (SMTP)
 
 removeAttachmentMsgs = Usuń załącznik; Usuń załączniki; Usuń załączniki
 
-errorSavingMsg = Wystąpił błąd podczas zapisywania wiadomości do folderu %S. Czy ponowić próbę?
-
+errorSavingMsg=Wystąpił błąd podczas zapisywania wiadomości do folderu %S. Czy ponowić próbę?
 errorFilteringMsg=Wiadomość została wysłana i zapisana, ale wystąpił błąd podczas stosowania do niej filtrów.
 
 errorCloudFileAuth.title=Błąd uwierzytelniania
@@ -203,14 +201,10 @@
 errorCloudFileOther.message=Wystąpił nieznany błąd podczas komunikacji z serwisem %1$S.
 errorCloudFileDeletion.title=Błąd usuwania
 errorCloudFileDeletion.message=Wystąpił problem podczas usuwania pliku „%2$S” z serwisu %1$S.
-
 errorCloudFileUpgrade.label=Uaktualnij
 
-# FIXME cloudAttachmentCountHeader=I've linked #1 file to this email:;I've linked #1 files to this email:
 cloudAttachmentCountHeader=Dodatkowy załącznik dla tej wiadomości:;#1 dodatkowe załączniki dla tej wiadomości:;#1 dodatkowych załączników dla tej wiadomości:
-
 cloudAttachmentListFooter=Program %1$S ułatwia przesyłanie dużych plików pocztą.
-
 cloudAttachmentListItem=* „%1$S” (%2$S) w serwisie %3$S: %4$S
 
 stopShowingUploadingNotification.label=Nie pytaj ponownie o wgrywanie plików
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/messenger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/messenger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/messenger.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/messenger.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -150,6 +150,8 @@
 <!ENTITY messagePaneVertical.accesskey     "P">
 <!ENTITY showFolderPaneCmd.label           "Panel folderów">
 <!ENTITY showFolderPaneCmd.accesskey       "f">
+<!ENTITY showFolderPaneColsCmd.label "Kolumny panelu folderów">
+<!ENTITY showFolderPaneColsCmd.accesskey "K">
 <!ENTITY showMessageCmd.label              "Panel wiadomości">
 <!ENTITY showMessageCmd.accesskey          "m">
 
@@ -588,8 +590,9 @@
 <!ENTITY manageTags.label "Zarządzaj etykietami…">
 <!ENTITY manageTags.accesskey "Z">
 
-<!-- Folder Pane -->
-<!ENTITY folderColumn.label     "Nazwa">
+<!ENTITY folderNameColumn.label "Nazwa">
+<!ENTITY folderUnreadColumn.label "Nieczytane">
+<!ENTITY folderTotalColumn.label "Razem">
 <!ENTITY folderSizeColumn.label "Rozmiar">
 
 <!-- Folder Pane Context Menu -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/messenger.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/messenger.properties	2015-02-28 15:04:51.000000000 +0000
@@ -64,6 +64,7 @@
 compactFolderDeniedLock         = Uporządkowanie folderu „%S” było niemożliwe, ponieważ wykonywana jest inna operacja. Spróbuj ponownie później.
 filterFolderHdrAddFailed        = Uporządkowanie folderu „%S” było niemożliwe, ponieważ nie powiodło się dodanie wiadomości. Należy upewnić się,że folder wyświetla się poprawnie lub spróbować go naprawić w ustawieniach folderu.
 compactFolderWriteFailed        = Uporządkowanie folderu „%S” było niemożliwe, ponieważ operacja zapisywania danych w folderze nie powiodła się. Należy upewnić się, że dostępna jest wystarczająca ilość miejsca na dysku oraz, że posiadane są wymagane prawa zapisu do systemu plików, a następnie spróbować ponownie.
+compactFolderInsufficientSpace=Niektóre foldery (np. „%S”) nie mogą zostać uporządkowane ze względu na zbyt małą ilość miejsca na dysku. Proszę zwolnić miejsce i spróbować ponownie.
 filterFolderWriteFailed         = Pasujące do filtru wiadomości nie mogą zostać zapisane do folderu „%S” ponieważ operacja zapisu w folderze nie powiodła się. Sprawdź, czy jest dostępna wystarczająca ilość miejsca na dysku oraz, czy posiadane są wymagane prawa zapisu do systemu plików, a następnie spróbuj ponownie.
 copyMsgWriteFailed              = Wiadomości nie zostały przeniesione lub skopiowane do folderu „%S” ponieważ operacja zapisywania danych w folderze nie powiodła się. Aby zwolnić więcej miejsca na dysku, należy z menu Plik wybrać Opróżnij kosz, a następnie Porządkuj foldery. Po wykonaniu tych czynności można spróbować ponownie.
 cantMoveMsgWOBodyOffline        = Podczas pracy w trybie offline przenoszenie lub kopiowanie wiadomości, które nie zostały uprzednio pobrane jest niedostępne. Aby przejść do trybu online, należy w oknie głównym programu otworzyć menu Plik, wybrać Tryb offline, a następnie odznaczyć Pracuj w trybie offline.
@@ -73,6 +74,7 @@
 filterFolderTruncateFailed      = Podczas przenoszenia wiadomości za pomocą filtru z foldera Otrzymane do foldera „%1$S” wystąpił błąd porządkowania pliku wiadomości. W celu poprawnego wyświetlania wiadomości może być konieczne zamknięcie programu %2$S i usunięcie pliku Inbox.msf.
 
 mailboxTooLarge  = Folder %S jest zapełniony i nie pomieści już więcej wiadomości. Aby zrobić miejsce na kolejne wiadomości, należy usunąć starą lub niepożądaną pocztę, a następnie wykonać porządkowanie folderu.
+outOfDiskSpace=Na dysku jest zbyt mało miejsca, aby pobrać nowe wiadomości. Spróbuj usunąć stare wiadomości, opróżnić kosz po czym uporządkować foldery poczty i pobrać pocztę raz jeszcze.
 errorGettingDB   = Nie można otworzyć pliku podsumowania dla %S. Prawdopodobnie wystąpił błąd dysku lub pełna ścieżka jest zbyt długa.
 defaultServerTag = (Domyślny)
 
@@ -321,6 +323,10 @@
 megaByteAbbreviation2=%.*f MB
 gigaByteAbbreviation2=%.*f GB
 
+folderWithAccount=%1$S - %2$S
+folderWithUnreadMsgs=%1$S (%2$S)
+folderSummarizedValue=%S
+
 errorOpenMessageForMessageIdTitle   = Błąd podczas otwierania wiadomości o danym ID
 errorOpenMessageForMessageIdMessage = Nie odnaleziono wiadomości o ID: %S
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -3,19 +3,20 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY itemGeneral.label      "Ogólne">
+<!ENTITY dataChoicesTab.label "Udostępnianie danych">
 <!ENTITY itemDisplay.label      "Treść">
 <!ENTITY itemUpdate.label       "Aktualizacja">
 <!ENTITY itemNetworking.label   "Sieć i miejsce na dysku">
 <!ENTITY itemCertificates.label "Certyfikaty">
 
-<!-- General Settings -->
-<!ENTITY submitTelemetry.label        "Przesyłaj dane o wydajności">
-<!ENTITY submitTelemetry.accesskey    "d">
-<!ENTITY telemetryInfoLink.label      "Więcej informacji o prywatności przesyłanych raportów.">
 <!ENTITY enableGlodaSearch.label      "Indeksowanie wiadomości i wyszukiwanie">
 <!ENTITY enableGlodaSearch.accesskey  "n">
 <!ENTITY allowHWAccel.label "Korzystaj z akceleracji sprzętowej, jeśli jest dostępna">
 <!ENTITY allowHWAccel.accesskey "K">
+<!ENTITY storeType.label "Sposób przechowywania wiadomości:">
+<!ENTITY storeType.accesskey "S">
+<!ENTITY mboxStore.label "jeden duży plik (mbox)">
+<!ENTITY maildirStore.label "osobne pliki (maildir)">
 <!ENTITY scrolling.label "Przewijanie">
 <!ENTITY useAutoScroll.label "Używaj automatycznego przewijania">
 <!ENTITY useAutoScroll.accesskey "U">
@@ -35,7 +36,18 @@
 <!ENTITY showReturnReceipts.label     "Opcje potwierdzeń…">
 <!ENTITY showReturnReceipts.accesskey "O">
 
-<!-- Display and Reading Settings -->
+<!ENTITY telemetrySection.label "Telemetria">
+<!ENTITY telemetryDesc.label "Udostępnianie organizacji &vendorShortName; danych o wydajności, wykorzystaniu, modyfikacjach programu pocztowego oraz o sprzęcie, na którym działa, ułatwia ulepszanie programu &brandShortName;.">
+<!ENTITY enableTelemetry.label "Telemetria">
+<!ENTITY enableTelemetry.accesskey "T">
+<!ENTITY telemetryLearnMore.label "Więcej informacji">
+
+<!ENTITY crashReporterSection.label "Awarie">
+<!ENTITY crashReporterDesc.label "&brandShortName; może przesyłać zgłoszenia awarii, aby ułatwić organizacji &vendorShortName; poprawianie stabilności i bezpieczeństwa programu pocztowego.">
+<!ENTITY enableCrashReporter.label "Zgłaszanie awarii">
+<!ENTITY enableCrashReporter.accesskey "Z">
+<!ENTITY crashReporterLearnMore.label "Więcej informacji">
+
 <!ENTITY reading.caption                    "Czytanie">
 <!ENTITY display.caption                    "Wyświetlanie">
 <!ENTITY showCondensedAddresses.label       "Pokazuj tylko nazwy kontaktów dla nadawców z mojej książki adresowej">
@@ -57,7 +69,6 @@
 <!ENTITY closeMsgOnMoveOrDelete.label       "Zamykaj okno/kartę wiadomości przy przenoszeniu lub usuwaniu">
 <!ENTITY closeMsgOnMoveOrDelete.accesskey   "Z">
 
-<!-- Update -->
 <!ENTITY updateApp.label "Aktualizacje programu &brandShortName;">
 <!ENTITY updateAuto.label "Instaluj aktualizacje automatycznie (zalecane: większe bezpieczeństwo)">
 <!ENTITY updateAuto.accesskey "I">
@@ -72,7 +83,6 @@
 <!ENTITY useService.label "Używaj usługi instalowania aktualizacji działającej w tle">
 <!ENTITY useService.accesskey "U">
 
-<!-- Networking and Disk Space -->
 <!ENTITY showSettings.label      "Ustawienia…">
 <!ENTITY showSettings.accesskey  "U">
 <!ENTITY proxiesConfigure.label  "Określ, w jaki sposób &brandShortName; ma się łączyć z Internetem">
@@ -93,7 +103,6 @@
 <!ENTITY clearCacheNow.label      "Wyczyść teraz">
 <!ENTITY clearCacheNow.accesskey  "W">
 
-<!-- Certificates -->
 <!ENTITY certSelection.description "Kiedy serwer żąda osobistego certyfikatu użytkownika:">
 <!ENTITY certs.auto                "wybierz certyfikat automatycznie">
 <!ENTITY certs.auto.accesskey      "c">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/compose.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/compose.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/compose.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -6,6 +6,8 @@
 <!ENTITY itemAutoComplete.label "Adresowanie">
 <!ENTITY itemSpellCheck.label   "Pisownia">
 
+<!ENTITY dialogCompose.title "Tworzenie">
+
 <!ENTITY forwardMsg.label       "Przekazuj wiadomości:">
 <!ENTITY forwardMsg.accesskey   "P">
 <!ENTITY inline.label           "bezpośrednio">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/offline.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/offline.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/offline.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -4,29 +4,29 @@
 
 <!ENTITY offlineDialog.title "Ustawienia trybu offline">
 
-<!ENTITY checkAutoDetect.label "Automatycznie używaj wykrytego stanu online">
+<!ENTITY checkAutoDetect.label "Automatycznie wykrywanie stanu połączenia">
 <!ENTITY checkAutoDetect.accesskey "A">
-<!ENTITY titleStartUp "Przy uruchamianiu:">
-<!ENTITY radioRememberPrevState.label "Powracaj do poprzedniego stanu online">
-<!ENTITY radioRememberPrevState.accesskey "P">
-<!ENTITY radioAskState.label "Pytaj o tryb online">
-<!ENTITY radioAskState.accesskey "o">
-<!ENTITY radioAlwaysOnline.label "Używaj trybu online">
-<!ENTITY radioAlwaysOnline.accesskey "U">
-<!ENTITY radioAlwaysOffline.label "Używaj trybu offline">
-<!ENTITY radioAlwaysOffline.accesskey "e">
+<!ENTITY titleStartUp "Podczas uruchamiania:">
+<!ENTITY radioRememberPrevState.label "powracaj do wcześniejszego stanu połączenia">
+<!ENTITY radioRememberPrevState.accesskey "w">
+<!ENTITY radioAskState.label "pytaj, czy łączyć">
+<!ENTITY radioAskState.accesskey "c">
+<!ENTITY radioAlwaysOnlineState.label "zawsze próbuj połączyć">
+<!ENTITY radioAlwaysOnlineState.accesskey "z">
+<!ENTITY radioAlwaysOffline.label "nie łącz">
+<!ENTITY radioAlwaysOffline.accesskey "n">
 
-<!ENTITY textGoingOnline             "Czy wysyłać niewysłane wiadomości przy przechodzeniu do trybu online?">
+<!ENTITY textGoingOnline "Czy wysyłać niewysłane wiadomości przy łączeniu?">
 <!ENTITY radioAutoSend.label         "Tak">
 <!ENTITY radioAutoSend.accesskey     "T">
 <!ENTITY radioNotSend.label          "Nie">
 <!ENTITY radioNotSend.accesskey      "N">
-<!ENTITY radioAskUnsent.label        "Zapytaj">
-<!ENTITY radioAskUnsent.accesskey    "a">
-<!ENTITY textGoingOffline            "Czy pobierać wiadomości do wykorzystania w trybie offline przed przechodzeniem do niego?">
+<!ENTITY radioAskUnsent.label "Pytaj">
+<!ENTITY radioAskUnsent.accesskey "P">
+<!ENTITY textGoingOffline "Czy pobierać wiadomości do późniejszego wykorzystania przed rozłączeniem?">
 <!ENTITY radioAutoDownload.label     "Tak">
 <!ENTITY radioAutoDownload.accesskey "k">
 <!ENTITY radioNotDownload.label      "Nie">
 <!ENTITY radioNotDownload.accesskey  "e">
-<!ENTITY radioAskDownload.label      "Zapytaj">
+<!ENTITY radioAskDownload.label "Pytaj">
 <!ENTITY radioAskDownload.accesskey  "j">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/preferences.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/mail/chrome/messenger/preferences/preferences.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/mail/chrome/messenger/preferences/preferences.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -17,3 +17,7 @@
 <!ENTITY panePrivacy.title "Prywatność">
 <!ENTITY paneSecurity.title    "Bezpieczeństwo">
 <!ENTITY paneAdvanced.title    "Zaawansowane">
+<!ENTITY paneAccount.title "Konta">
+
+<!ENTITY okButton.title "OK">
+<!ENTITY okButton.accesskey "O">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:04:51.000000000 +0000
@@ -12,9 +12,15 @@
 
 aboutReader.fontType.serif=Szeryfowa
 aboutReader.fontType.sans-serif=Bezszeryfowa
-aboutReader.fontType.charis-sil=Charis SIL Compact
-aboutReader.fontType.clear-sans=Clear Sans
 aboutReader.fontTypeSample=Aa
 aboutReader.fontSizeSample=A
 
-aboutReader.toolbarTip=Dotknij ekranu, aby wyświetlić ustawienia czytnika
+aboutReader.toolbar.close=Opuść widok ułatwionego czytania
+aboutReader.toolbar.typeControls=Czcionki
+aboutReader.toolbar.addToReadingList=Dodaj do listy czytelnia
+aboutReader.toolbar.removeFromReadingList=Usuń z listy czytelnia
+aboutReader.toolbar.openReadingList=Otwórz listę czytelnia
+aboutReader.toolbar.closeReadingList=Zamknij listę czytelnia
+aboutReader.toolbar.share=Udostępnij
+
+aboutReader.footer.deleteThisArticle=Usuń artykuł
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -93,3 +93,6 @@
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Skopiuj nieprzetworzone dane do schowka">
 
 <!ENTITY aboutSupport.sandboxTitle "Piaskownica">
+
+<!ENTITY aboutSupport.safeModeTitle "Tryb awaryjny">
+<!ENTITY aboutSupport.restartInSafeMode.label "Uruchom ponownie z wyłączonymi dodatkami…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/devtools/debugger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/devtools/debugger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/devtools/debugger.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/devtools/debugger.properties	2015-02-28 15:04:51.000000000 +0000
@@ -15,7 +15,7 @@
 remoteIncomingPromptDisable=Zablokuj
 
 clientSendOOBTitle=Identyfikacja klienta
-clientSendOOBHeader=Urządzenie z którym się łączysz potrzebuje więcej informacji, aby uwierzytelnić to połączenie. Proszę wprowadzić poniższy token w formularzu wyświetlanym na drugim urządzeniu.
+clientSendOOBHeader=Urządzenie, z którym się łączysz, potrzebuje więcej informacji, aby uwierzytelnić to połączenie. Proszę wprowadzić poniższy token w formularzu wyświetlanym na drugim urządzeniu.
 clientSendOOBHash=Certyfikat: %1$S
 clientSendOOBToken=Token: %1$S
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:04:51.000000000 +0000
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+quitMenuitem.label=Zakończ
+quitMenuitem.key=Q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -224,3 +224,5 @@
 <!ENTITY experiment.info.learnmore.accesskey "W">
 <!ENTITY experiment.info.changetelemetry "Ustawienia telemetrii">
 <!ENTITY experiment.info.changetelemetry.accesskey "U">
+
+<!ENTITY setting.learnmore "Więcej informacji…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:04:51.000000000 +0000
@@ -87,7 +87,7 @@
 details.notification.uninstall=Dodatek %1$S zostanie odinstalowany po ponownym uruchomieniu programu %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=Dodatek %1$S zostanie zaktualizowany po ponownym uruchomieniu programu %2$S.
-details.notification.openH264Pending=Zostanie wkrótce zainstalowany.
+details.notification.gmpPending=Dodatek „%1$S” zostanie wkrótce zainstalowany.
 
 details.experiment.time.daysRemaining=Pozostał #1 dzień;Pozostały #1 dni;Pozostało #1 dni
 details.experiment.time.endsToday=Pozostał niecały dzień
@@ -110,7 +110,7 @@
 notification.installError=Podczas instalacji dodatku %1$S wystąpił błąd.
 notification.installError.retry=Spróbuj ponownie
 notification.installError.retry.tooltip=Spróbuj ponownie pobrać i zainstalować ten dodatek
-notification.openH264Pending=Zostanie wkrótce zainstalowany.
+notification.gmpPending=Dodatek „%1$S” zostanie wkrótce zainstalowany.
 
 installFromFile.dialogTitle=Wybierz dodatek do zainstalowania
 installFromFile.filterName=Dodatki
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:04:51.000000000 +0000
@@ -39,3 +39,4 @@
 
 <!ENTITY plugin.file                                         "Plik">
 <!ENTITY plugin.mimeTypes                                    "Typy MIME">
+<!ENTITY plugin.flashProtectedMode.label "Tryb chroniony">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pl/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:43:54.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pl/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:04:51.000000000 +0000
@@ -5,7 +5,7 @@
 malformedURI=Adres URL jest nieprawidłowy i nie może zostać wczytany.
 fileNotFound=Odnalezienie pliku „%S” było niemożliwe. Sprawdź ścieżkę dostępu do pliku, a następnie spróbuj ponownie.
 dnsNotFound=Odnalezienie „%S” było niemożliwe. Sprawdź poprawność nazwy, a następnie spróbuj ponownie.
-unknownProtocolFound=Jeden z protokołów (%S) nie jest zarejestrowany lub nie jest dozwolony w tym kontekście.
+unknownProtocolFound=Protokół „%S” nie jest zarejestrowany lub nie jest dozwolony w tym kontekście.
 connectionFailure=Połączenie zostało odrzucone podczas próby kontaktu z serwerem „%S”.
 netInterrupt=Połączenie z serwerem „%S” zostało nieoczekiwanie zakończone. Część danych mogła zostać przesłana.
 netTimeout=Przekroczono limit czasu podczas próby połączenia z „%S”.
@@ -32,3 +32,4 @@
 cspBlocked=Aplikacja próbowała uzyskać dostęp do zasobu posiadającego politykę bezpieczeństwa treści, która nie pozwala na wczytywanie go w ten sposób.
 corruptedContentError=Aplikacja nie może kontynuować wczytywania, ponieważ wykryto błąd w transmisji danych.
 remoteXUL=Aplikacja wykorzystuje nieobsługiwaną technologię, która nie jest dłużej dostępna.
+sslv3Used=Bezpieczeństwo danych wymienianych z „%S” nie jest gwarantowane ponieważ serwer używa SSLv3, wadliwego protokołu bezpieczeństwa.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/dom/chrome/appstrings.properties	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/dom/chrome/appstrings.properties	2015-02-28 15:04:55.000000000 +0000
@@ -2,20 +2,20 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-malformedURI=A URL não é válida e não pode ser carregada.
+malformedURI=O URL não é válido e não pode ser carregado.
 fileNotFound=O ficheiro %S não foi encontrado. Verifique a localização e tente novamente.
 dnsNotFound=%S não foi encontrado. Verifique o nome e tente novamente.
 unknownProtocolFound=Um dos seguintes %S não é um protocolo registado ou não é permitido neste contexto.
 connectionFailure=A ligação a %S foi recusada.
-netInterrupt=A ligação %S foi interrompida. Podem ter sisod transferidos alguns dados.
+netInterrupt=A ligação %S foi interrompida. Podem ter sido transferidos alguns dados.
 netTimeout=A operaçao expirou ao tentar contactar %S.
 redirectLoop=Atingido o limite de encaminhamentos deste URL. Não é possível carregar a página. É possível que os cookies estejam bloqueados.
 confirmRepostPrompt=Para mostrar esta página, a aplicação tem de enviar informações que repetem uma ação (como uma procura ou a confirmação) efetuada anteriormente.
 resendButton.label=Reenviar
-unknownSocketType=Este documento não pode ser exibido sem que instale o Personal Security Manager (PSM). Transfira e instale o Personal Security Manager (PSM) e tente novamente ou contacte o administrador de sistemas.
+unknownSocketType=Este documento não pode ser mostrado sem que instale o Personal Security Manager (PSM). Transfira e instale o Personal Security Manager (PSM) e tente novamente ou contacte o administrador de sistemas.
 netReset=O documento não possui dados.
 notCached=Este documento já não está disponível.
-netOffline=Este documento não pode ser exibido no modo desligado. Ative o modo ligado através do menu Ficheiro.
+netOffline=Este documento não pode ser mostrado no modo desligado. Ative o modo ligado através do menu Ficheiro.
 isprinting=O documento não pode ser alterado durante a impressão ou pré-visualização.
 deniedPortAccess=O acesso a este número de porta foi desativado para sua segurança.
 proxyResolveFailure=O servidor proxy não foi encontrado. Verifique as definições do proxy e tente novamente.
@@ -33,4 +33,4 @@
 cspBlocked=Esta página tem uma política de conteúdo que previne que seja carregada desta forma.
 corruptedContentError=A página que está a tentar ver não pode ser mostrada porque foi detetado um erro na transmissão de dados.
 remoteXUL=Esta página utiliza uma tecnologia que já não é suportada.
-
+sslv3Used=Não é possível garantir a segurança dos seus dados em %S porque está a ser utilizado o protocolo SSLv3, um protocolo danificado.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/dom/chrome/plugins.properties	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/dom/chrome/plugins.properties	2015-02-28 15:04:55.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (plugins.properties):
-#    Those strings are inserted into an HTML page, so you all HTML characters
+#    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=Sobre os plugins
@@ -20,5 +20,11 @@
 description_label=Descrição
 suffixes_label=Sufixos
 
-openH264_name=Codec de vídeo OpenH264 fornecido por Cisco Systems, Inc.
-openH264_description=Reproduzir vídeos web e usar conversas de vídeo.
+# GMP Plugins
+gmp_license_info=Informações da licença
+
+openH264_name=Codificador de vídeo OpenH264 disponibilizado por Cisco Systems, Inc.
+openH264_description=Reproduzir vídeos web e conversação por vídeo.
+
+eme-adobe_name=Módulo Primetime Content Decryption disponibilizado por Adobe Systems, Incorporated
+eme-adobe_description=Reproduzir vídeos web protegidos.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/aboutDialog.dtd	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/aboutDialog.dtd	2015-02-28 15:04:55.000000000 +0000
@@ -13,13 +13,28 @@
 <!ENTITY update.applyButtonBillboard.label        "Aplicar atualização...">
 <!ENTITY update.applyButtonBillboard.accesskey    "A">
 
+
+<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
+<!ENTITY warningDesc.version        "O &brandShortName; é experimental e pode ficar instável.">
+<!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
+<!ENTITY warningDesc.telemetryDesc  "Ele envia informação sobre o desempenho, hardware, utilização e personalizações para a &vendorShortName; para ajudar o &brandShortName; a ficar melhor.">
+
+<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
+<!ENTITY community.exp.start        "">
+<!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.exp.mozillaLink  "A &vendorShortName;">
+<!ENTITY community.exp.middle       " é uma ">
+<!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
+<!ENTITY community.exp.creditsLink  "comunidade global">
+<!ENTITY community.exp.end          " que trabalha para manter a web aberta, pública e acessível a todos.">
+
 <!ENTITY community.start2           "O &brandShortName; é desenvolvido pela ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", uma ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "comunidade global">
-<!ENTITY community.end2             " que trabalha para tornar a Internet melhor. Acreditamos que a Internet deve ser aberta, pública e acessível a todos sem quaisquer restrições.">
+<!ENTITY community.end3             " que trabalha para tornar a Internet melhor. Acreditamos que a Internet deve ser aberta, pública e acessível a todos.">
 
 <!ENTITY contribute.start           "Parece-lhe interessante? ">
 <!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
@@ -37,12 +52,12 @@
 
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "Procurar atualizações...">
-
-
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "O &brandShortName; está atualizado">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "As atualizações foram desativadas pelo administrador">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates "O &brandShortName; está a ser atualizado por outra operação">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
@@ -61,7 +76,6 @@
 <!ENTITY update.manual.linkText     "última versão">
 <!ENTITY update.manual.end          "">
 
-
 <!-- LOCALIZATION NOTE (update.unsupported.start,update.unsupported.linkText,update.unsupported.end):
      update.unsupported.start, update.unsupported.linkText, and
      update.unsupported.end all go into one line with linkText being wrapped in
@@ -71,6 +85,7 @@
 <!ENTITY update.unsupported.start    "Não pode efetuar mais atualizações neste sistema. ">
 <!ENTITY update.unsupported.linkText "Saber mais">
 <!ENTITY update.unsupported.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
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/aboutDownloads.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/aboutDownloads.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/aboutDownloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/aboutDownloads.dtd	2015-02-28 15:04:55.000000000 +0000
@@ -0,0 +1,21 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 aboutDownloads.title                      "Ficheiros guardados">
+<!ENTITY aboutDownloads.empty                      "Sem ficheiros guardados">
+<!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
+     cmd.showMac.accesskey):
+     The show and showMac commands are never shown together, thus they can share
+     the same access key (though the two access keys can also be different).
+     -->
+<!ENTITY cmd.show.label                            "Abrir pasta">
+<!ENTITY cmd.show.accesskey                        "F">
+<!ENTITY cmd.showMac.label                         "Mostrar no finder">
+<!ENTITY cmd.showMac.accesskey                     "F">
+<!ENTITY cmd.open.label                            "Abrir">
+<!ENTITY cmd.open.accesskey                        "A">
+<!ENTITY cmd.removeFromHistory.label               "Remover do histórico">
+<!ENTITY cmd.removeFromHistory.accesskey           "e">
+<!ENTITY cmd.clearDownloads.label                  "Limpar transferências">
+<!ENTITY cmd.clearDownloads.accesskey              "L">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/localMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/localMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/localMsgs.properties	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/localMsgs.properties	2015-02-28 15:04:55.000000000 +0000
@@ -39,8 +39,6 @@
 # %2$S will receive the total number of messages
 receivedMsgs=Recebidas %1$S de %2$S mensagens
 
-pop3OutOfDiskSpace=Não existe espaço livre para transferir as novas mensagens. Elimine algum correio antigo, limpe a pasta Lixo, compacte as pastas e tente novamente.
-
 # Status - parsing folder
 #LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
 # Place the word %S where the name of the mailbox should appear
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-28 15:04:55.000000000 +0000
@@ -9,161 +9,116 @@
 ## %S will be replaced with the name of file that could not be opened
 unableToOpenFile=Não foi possível abrir o ficheiro %S.
 unableToOpenTmpFile=Não foi possível abrir o ficheiro %S. Verifique as definições da sua 'Pasta temporária'.
-
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Não foi possível guardar a sua mensagem como modelo.
-
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Não foi possível guardar a sua mensagem como rascunho.
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Não foi possível abrir a pasta correio enviado. Por favor verifique se as preferências de correio estão corretas.
-
-## @name NS_MSG_NO_SENDER
-12510=Não especificou o remetente. Por favor introduza o seu endereço eletrónico nas definições de correio e grupos de notícias.
-
-## @name NS_MSG_NO_RECIPIENTS
-12511=Não especificou qualquer destinatário. Por favor introduza um destinatário ou grupo como destinatário.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Erro ao escrever ficheiro temporário.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=Ocorreu um erro ao enviar o correio. O servidor respondeu: %s. Por favor verifique se o seu endereço eletrónico está correto nas preferências de correio e tente novamente.
-
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=Ocorreu um erro (SMTP) ao enviar o correio. O servidor respondeu: %s.
-
-## @name NS_ERROR_SENDING_MESSAGE
-12517=Ocorreu um erro ao enviar o correio. O servidor respondeu:  %s. Por favor verifique a mensagem e tente novamente.
-
-## @name NS_ERROR_POST_FAILED
-12518=A mensagem não pode ser enviada porque a ligação ao servidor de notícias falhou. O servidor pode estar indisponível ou a recusar ligações. Por favor verifique se as definições do servidor de notícias estão corretas e tente novamente ou contacte o administrador de rede.
-
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=Ocorreu um erro ao entregar as mensagens.
-
-## @name NS_ERROR_SEND_FAILED
-12520=O envio da mensagem falhou.
-
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=Ocorreu um erro ao enviar o correio. Erro de servidor SMTP. O servidor respondeu: %s Contacte o administrador de correio para assistência.
-
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Não foi possível guardar a sua mensagem para envio posterior.
-
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=Ocorreu um erro de comunicação: %d. Por favor, tente de novo.
-
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
-
-## @name NS_ERROR_TCP_READ_ERROR
-12528=Ocorreu um erro de rede ao receber dados. (Erro de rede: %s). Tente ligar-se novamente.
-
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=Ocorreu um erro ao enviar o correio. O endereço do correio de retorno é inválido. Por favor verifique se o seu endereço eletrónico está correto nas preferências de correio e tente novamente.
-
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Erro de anexo.
-
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=A mensagem foi enviada com sucesso, mas não foi copiada para a pasta Enviadas.
-
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=Para os servidores de notícias, só pode enviar uma mensagem de cada vez.
-
-## @name NS_MSG_CANCELLING
-12555=A cancelar...
-
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=A sua mensagem foi publicada no grupo de notícias mas não foi enviada para os outros destinatários.
-
-## @name NS_MSG_ERROR_READING_FILE
-12563=Erro ao ler ficheiro.
-
+unableToSaveTemplate=Não foi possível guardar a sua mensagem como modelo.
+unableToSaveDraft=Não foi possível guardar a sua mensagem como rascunho.
+couldntOpenFccFolder=Não foi possível abrir a pasta correio enviado. Por favor verifique se as preferências de correio estão corretas.
+noSender=Não especificou o remetente. Por favor introduza o seu endereço eletrónico nas definições de correio.
+noRecipients=Não especificou qualquer destinatário. Por favor introduza um destinatário ou grupo como destinatário.
+errorWritingFile=Erro ao escrever ficheiro temporário.
+
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingFromCommand=Ocorreu um erro ao enviar o correio. O servidor respondeu: %s. Por favor verifique se o seu endereço eletrónico está correto nas preferências de correio e tente novamente.
+
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingDataCommand=Ocorreu um erro (SMTP) ao enviar o correio. O servidor respondeu: %s.
+
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=Ocorreu um erro ao enviar o correio. O servidor respondeu:  %s. Por favor verifique a mensagem e tente novamente.
+postFailed=A mensagem não pode ser enviada porque a ligação ao servidor de notícias falhou. O servidor pode estar indisponível ou a recusar ligações. Por favor verifique se as definições do servidor de notícias estão corretas e tente de novo ou contacte o administrador de rede.
+errorQueuedDeliveryFailed=AOcorreu um erro ao entregar as mensagens.
+sendFailed=O envio da mensagem falhou.
+
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
+smtpServerError=An error occurred while sending mail: Outgoing server (SMTP) error. The server responded:  %s.
+unableToSendLater=Ocorreu um erro de comunicação: %d. Por favor, tente de novo.
+
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=A communications error occurred: %d.  Please try again.
+dontShowAlert=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=Ocorreu um erro de rede ao receber os dados.  (Erro de rede: %s)  Tente ligar de novo.
+couldNotGetUsersMailAddress=Ocorreu um erro ao enviar o correio:  o endereço de correio de retorno é inválido.  Verifique se o seu endereço de correio está correto nas definições de conta e tente de novo.
+mimeMpartAttachmentError=Erro no anexo.
+failedCopyOperation=A mensagem foi enviada com sucesso, mas não foi copiada para a sua pasta Enviados.
+nntpNoCrossPosting=Apenas pode enviar uma mensagem a um servidor de notícias de cada vez.
+msgCancelling=A cancelar…
+sendFailedButNntpOk=A sua mensagem foi publicada no grupo de discussão, mas não foi enviada a outros destinatários.
+errorReadingFile=Erro ao ler ficheiro.
 followupToSenderMessage=O autor desta mensagem pediu que a resposta seja enviada apenas para o autor. Se também desejar responder ao grupo, adicione uma nova linha na área do endereço, escolha o grupo da lista de destinatários e introduza o nome do grupo de notícias.
 
-## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=Ocorreu um erro ao anexar %S. Por favor verifique se tem acesso ao ficheiro.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of the object to be attached
+errorAttachingFile=Houve um erro ao anexar %S. Verifique se tem acesso ao ficheiro.
 
-## @name NS_ERROR_SMTP_GREETING
-12572=Ocorreu um erro ao enviar o correio. O servidor de correio enviou uma saudação incorreta:  %s.
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
+incorrectSmtpGreeting=Ocorreu um erro ao enviar o correio: O servidor de correio envio um cumprimento incorreto:  %s.
 
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=Ocorreu um erro ao enviar o correio. O servidor de correio respondeu: %1$s. Verifique o destinatário da mensagem (%2$s) e tente novamente.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
+errorSendingRcptCommand=Ocorreu um erro ao enviar o correio. O servidor de correio respondeu:  \n%1$S.\n Verifique o destinatário da mensagem "%2$S" e tente de novo.
 
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=Ocorreu um erro ao enviar o correio. Não foi possível estabelecer a ligação segura ao servidor SMTP %S utilizando STARTTLS uma vez que ele não anuncia essa funcionalidade. Desligue o STARTTLS para este servidor ou contacte o administrador do serviço.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
+startTlsFailed=Ocorreu um erro ao enviar o correio: Não foi possível estabelecer uma ligação segura com o servidor de envio (SMTP) %S usando STARTTLS uma vez que ele não anúncia esta funcionalidade. Desligue o STARTTLS para esse servidor ou contate o fornecedor de serviço.
 
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=Ocorreu um erro ao enviar o correio. Não foi possível obter a senha para %S. A mensagem não foi enviada.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
+smtpPasswordUndefined=Ocorreu um erro ao enviar o correio: Não foi possívelobter a senha %S. A mensagem não foi enviada.
 
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=O tamanho da mensagem que está a tentar enviar excede o limite de tamanho temporário do servidor. A mensagem não foi enviada. Tente reduzir o tamanho da mensagem ou aguarde um pouco e tente novamente. O servidor respondeu: %s.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=O tamanho da mensagem que está a tentar enviar excede o limite de tamanho temporário do servidor. A mensagem não foi enviada. Tente reduzir o tamanho da mensagem ou aguarde um pouco e tente de novo. O servidor respondeu: %s.
 
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=O tamanho da mensagem que está a tentar enviar excede o limite global do servidor (%d bytes). A mensagem não foi enviada. Reduza o tamanho da mensagem e tente novamente.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=O tamanho da mensagem que está a tentar enviar excede o limite global do servidor (%d bytes). A mensagem não foi enviada. Reduza o tamanho da mensagem e tente de novo.
 
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=O tamanho da mensagem que está a tentar enviar excede o limite global do servidor. A mensagem não foi enviada. Reduza o tamanho da mensagem e tente novamente. O servidor respondeu: %s.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the Outgoing server (SMTP) response
+smtpPermSizeExceeded2=O tamanho da mensagem que está a tentar enviar excede o limite global do servidor. A mensagem não foi enviada. Reduza o tamanho da mensagem e tente de novo. O servidor respondeu: %s.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=Ocorreu um erro ao enviar o correio. O servidor SMTP %S não é conhecido. Pode ser qu o servidor esteja mal configurado. Por favor verifique se as definições SMTO estão corretas e tente novamente.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownServer=Ocorreu um erro ao enviar o correio. O servidor SMTP %S não é conhecido. Pode ser qu o servidor esteja mal configurado. Por favor verifique se as definições SMTP estão corretas e tente de novo.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=A mensagem não foi enviada porque a ligação ao servidor SMTP %S falhou. O servidor pode estar indisponível ou a recusar ligações SMTP. Verifique se as definições do servidor SMTP estão corretas e tente novamente ou contacte o administrador do servidor.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRefused=A mensagem não foi enviada porque a ligação ao servidor SMTP %S falhou. O servidor pode estar indisponível ou a recusar ligações SMTP. Verifique se as definições do servidor SMTP estão corretas e tente de novo ou contacte o administrador do servidor.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=A mensagem não foi enviada porque a ligação ao servidor SMTP %S foi perdida no meio da transação. Tente novamente ou contacte o administrador de rede.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
+smtpSendInterrupted=A mensagem não foi enviada porque a ligação ao servidor SMTP %S foi perdida no meio da transação. Tente de novo.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=A mensagem não foi enviada porque a ligação ao servidor SMTP %S expirou. Tente novamente ou contacte o administrador de rede.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
+smtpSendTimeout=A mensagem não foi enviada porque a ligação ao servidor SMTP %S expirou. Tente de novo.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=Não foi possível enviar a mensagem através do servidor SMTP %S por uma razão desconhecida. Verifique se as definições do servidor SMTP estão corretas e tente novamente ou contacte o administrador de rede.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownReason=Não foi possível enviar a mensagem através do servidor SMTP %S por uma razão desconhecida. Verifique se as definições do servidor SMTP estão corretas e tente de novo
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=Parece que o servidor SMTP %S não tem uporte a senhas cifradas. Se acabou de configurar a conta, tente mudar para 'Senha, envio sem segurança' como 'Método de autenticação' nas definições da conta -> Definições do servidor. Se a aplicação funcionava e subitamente deixou de funcionar, este é um cenário normal de como alguém pode roubar a sua senha.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainNoSsl=Parece que o servidor SMTP %S não tem suporte a senhas cifradas. Se acabou de configurar a conta, tente mudar para 'Senha, envio sem segurança' como 'Método de autenticação' nas 'Definições da conta | Definições do servidor'. Se a aplicação funcionava e subitamente deixou de funcionar, este é um cenário normal de como alguém pode roubar a sua senha.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12595): $S is server hostname
-12595=Parece que o servidor SMTP %S não tem suporte a senhas cifradas. Se acabou de configurar a conta, tente mudar para 'Senha normal' como 'Método de autenticação' nas definições da conta -> Definições do servidor. Se a aplicação funcionava e subitamente deixou de funcionar, contacte o administrador do correio.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainSsl=Parece que o servidor SMTP %S não tem suporte a senhas cifradas. Se acabou de configurar a conta, tente mudar para 'Senha normal' como 'Método de autenticação' nas 'Definições da conta | Definições do servidor'.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12596): $S is server hostname
-12596=O servidor SMTP %S não permite senhas apenas de texto. Por favor tente alterar para 'Senha cifrada' como 'Método de autenticação' nas definições da conta -> Definições do servidor.
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
+smtpAuthChangePlainToEncrypt=O servidor SMTP %S não permite senhas apenas de texto. Por favor tente alterar para 'Senha cifrada' como 'Método de autenticação' nas 'Definições da conta | Definições do servidor'.
 
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Não foi possível a autenticação no servidor SMTP %S. Por favor verifique a senha e o 'Método de autenticação' nas definições da conta -> Servidor de envio (SMTP).
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
+smtpAuthFailure=Não foi possível a autenticação no servidor SMTP %S. Por favor verifique a senha e o 'Método de autenticação' nas 'efinições da conta | Servidor de envio (SMTP)'.
 
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=Os dados Kerberos/GSSAPI não foram aceites pelo servidor SMTP %S. Por favor verifique se tem acesso aos dados Kerberos/GSSAPI.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
+smtpAuthGssapi=Os dados Kerberos/GSSAPI não foram aceites pelo servidor SMTP %S. Por favor verifique se tem acesso aos dados Kerberos/GSSAPI.
 
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=O servidor SMTP %S não tem suporte ao método de autenticação selecionado. Por favor mude o 'Método de autenticação' nas definições da conta -> Servidor de envio (SMTP).
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
+smtpAuthMechNotSupported=O servidor SMTP %S não tem suporte ao método de autenticação selecionado. Por favor mude o 'Método de autenticação' nas 'Definições da conta | Servidor de envio (SMTP)'.
 
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=O servidor SMTP %S não tem suporte ao método de autenticação selecionado. Por favor mude o 'Método de autenticação' para 'Nenhum' nas definições da conta -> Servidor de envio (SMTP) ou contacte o administrador do servoço de correio.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
+smtpAuthNotSupported=O servidor SMTP %S não tem suporte ao método de autenticação selecionado. Por favor mude o 'Método de autenticação' para 'Nenhum' nas 'Definições da conta | Servidor de envio (SMTP)'ou contacte o administrador do serviço de correio.
 
-## @name NS_ERROR_ILLEGAL_LOCALPART
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
-errorIllegalLocalPart=Existem caracteres não ASCII no endereço de destinatário %s. Esta função ainda não é suportada. Por favor altere o endereço e tente novamente.
+errorIllegalLocalPart=Existem caracteres não ASCII no endereço de destinatário %s. Esta função ainda não é suportada. Por favor altere o endereço e tente de novo.
 
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
 saveDlogTitle=Guardar mensagem
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
 saveDlogMessages=Mensagem não enviada. Deseja guardar na sua pasta de rascunhos (%1$S)?
 
 ## generics string
 defaultSubject=(sem assunto)
 chooseFileToAttach=Anexar ficheiro(s)
-
 genericFailureExplanation=Verifique se as suas definições de correio e grupos de discussão estão corretas e tente de novo.
 
 ## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
@@ -182,21 +137,22 @@
 sendWithEmptySubjectButton=&Enviar sem assunto
 cancelSendingButton=&Cancelar envio
 
-## Strings used by the dialog that informs about lack of newsgroup support.
+## Strings used by the dialog that informs about the lack of newsgroup support.
 noNewsgroupSupportTitle=Grupos de notícias não suportados
 recipientDlogMessage=Esta conta só tem suporte a endereços eletrónicos. Se continuar, os grupos de notícias serão ignorados.
 
-## Strings used by the alert that tells the user an e-mail address is invalid.
+## Strings used by the alert that tells the user that an e-mail address is invalid.
 addressInvalidTitle=Endereço de destinatário inválido
 addressInvalid=%1$S não é um endereço eletrónico válido pois não está no formato utilizador@servidor. Tem de o corrigir antes de enviar a mensagem.
 
-## String used by the dialog that ask the user to attach a web page
+## String used by the dialog that asks the user to attach a web page
 attachPageDlogTitle=Por favor especifique a localização para anexar
 attachPageDlogMessage=Página web (URL):
 
-## String used for attachment pretty name, when attachment is a message
+## String used for attachment pretty name, when the attachment is a message
 messageAttachmentSafeName=Mensagem anexa
-## String used for attachment pretty name, when attachment is message part
+
+## String used for attachment pretty name, when the attachment is a message part
 partAttachmentSafeName=Parte da mensagem anexa
 
 # LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
@@ -211,73 +167,75 @@
 ## String used if a file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=Ficheiro anexo
+
 ## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
 errorFileAttachMessage=O ficheiro %1$S não existe e, como tal, não foi anexado à mensagem.
 
-## Strings used by Save as Draft/Template dialog
+## Strings used by the Save as Draft/Template dialog
 SaveDialogTitle=Guardar mensagem
-## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
+
+## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
 SaveDialogMsg=A sua mensagem foi guardada na pasta %1$S em %2$S.
 CheckMsg=Não mostrar esta janela novamente.
 
-## Strings used by prompt when Quitting while in progress
+## Strings used by the prompt when Quitting while in progress
 quitComposeWindowTitle=A enviar mensagem
-## LOCALIZATION NOTE (quitComposeWindowMessage): don't translate \n
+
+## LOCALIZATION NOTE (quitComposeWindowMessage2): don't translate \n
 quitComposeWindowMessage2=O %1$S está a enviar uma mensagem.\nDeseja esperar até que a mensagem seja enviada antes de sair ou quer sair já?
 quitComposeWindowQuitButtonLabel2=&Sair
 quitComposeWindowWaitButtonLabel2=&Esperar
 quitComposeWindowSaveTitle=A guardar mensagem
+
 ## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
 quitComposeWindowSaveMessage=O %1$S está a guardar uma mensagem.\nDeseja esperar até que a mensagem seja guardada ou quer sair agora?
 
-## Strings used by prompt for Ctrl-Enter check before sending message
+## Strings used by the prompt for Ctrl-Enter check before sending message
 sendMessageCheckWindowTitle=Enviar mensagem
 sendMessageCheckLabel=Tem a certeza que está pronto para enviar esta mensagem?
 sendMessageCheckSendButtonLabel=Enviar
-
 assemblingMessageDone=A juntar correio...Feito
 assemblingMessage=A juntar correio...
-
 smtpDeliveringMail=A entregar correio...
 smtpMailSent=Correio enviado com sucesso
-
 assemblingMailInformation=A juntar a informação de correio...
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
+
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is the file name/URI of attachment
 gatheringAttachment=A anexar %S...
 creatingMailMessage=A criar mensagem de correio...
 
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
+## LOCALIZATION NOTE (copyMessageStart): argument %S is the folder name
 copyMessageStart=A copiar a mensagem para a pasta %S...
 copyMessageComplete=Cópia terminada.
 copyMessageFailed=A cópia falhou.
-
 filterMessageComplete=Filtro terminado.
 filterMessageFailed=O filtro falhou.
 
 ## LOCALIZATION NOTE (largeMessageSendWarning):
 ## Do not translate %S. It is the size of the message in user-friendly notation.
 largeMessageSendWarning=Aviso! Está prestes a enviar uma mensagem com %S o que pode exceder o limite permitido no servidor de correio. Tem a certeza que deseja continuar?
-
 sendingMessage=A enviar mensagem...
 sendMessageErrorTitle=Erro ao enviar mensagem
 postingMessage=A publicar mensagem...
-
 sendLaterErrorTitle=Erro ao guardar para enviar mais tarde
 saveDraftErrorTitle=Erro ao guardar rascunho
 saveTemplateErrorTitle=Erro ao guardar modelo
 
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSaving=Ocorreu um problema ao incluir o ficheiro %.200S na mensagem. Deseja continuar a guardar a mensagem sem este ficheiro?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSending=Ocorreu um problema ao incluir o ficheiro %.200S na mensagem. Deseja continuar a guardar a mensagem sem este ficheiro?
 returnToComposeWindowQuestion=Deseja voltar à janela de composição?
 
 ## reply header in composeMsg
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is the author (name of the person replying to)
 mailnews.reply_header_authorwrotesingle=#1 escreveu:
-## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_ondateauthorwrote=Às #3 de #2, #1 escreveu:
-## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_authorwroteondate=#1 escreveu às #3 de #2:
 
 ## reply header in composeMsg
@@ -294,7 +252,7 @@
 
 ## Attachment Reminder
 ## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
-##   words that that should trigger an attachment reminder.
+## words that should trigger an attachment reminder.
 mail.compose.attachment_reminder_keywords=.doc,.pdf,.xls,.ppt,.rtf,.pps,anexo,anexar,anexado,cv
 
 addAttachmentButton=Adicionar anexo
@@ -304,6 +262,7 @@
 
 attachmentReminderTitle=Lembrete de anexos
 attachmentReminderMsg=Esqueceu-se de adicionar o anexo?
+
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of keywords
@@ -315,6 +274,7 @@
 # Strings used by the Filelink offer notification bar.
 learnMore.label=Saber mais
 learnMore.accesskey=m
+
 # LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of big attached files
@@ -323,10 +283,8 @@
 bigFileShare.accesskey=l
 bigFileAttach.label=Ignorar
 bigFileAttach.accesskey=i
-
 bigFileChooseAccount.title=Escolher conta
 bigFileChooseAccount.text=Escolha a conta na nuvem para envio do anexo
-
 bigFileHideNotification.title=Não enviar os meus ficheiros
 bigFileHideNotification.text=Não será novamente notificado se anexar outros ficheiros grandes a esta mensagem.
 bigFileHideNotification.check=Nunca mais voltar a notificar-me.
@@ -334,7 +292,8 @@
 # LOCALIZATION NOTE(cloudFileUploadingTooltip): Do not translate the string
 # %S. %S is the display name for the cloud account the attachment is being
 # uploaded to.
-cloudFileUploadingTooltip=A enviar para %S
+cloudFileUploadingTooltip=A carregar para %S...
+
 # LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
 # %S. %S is the display name for the cloud account the attachment was uploaded
 # to.
@@ -345,8 +304,9 @@
 cloudFilePrivacyNotification=A ligação foi concluída. Tenha em atenção que os anexos vinculados poderão estar acessíveis a terceiros que adivinhem ou vejam estas ligações.
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
-## word $S. Place the word $S where the host name should appear.
+## word %S. Place the word %S where the host name should appear.
 smtpEnterPasswordPrompt=Introduza a senha para %S:
+
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
@@ -354,49 +314,53 @@
 smtpEnterPasswordPromptTitle=Requer a senha do servidor SMTP
 
 # LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
 removeAttachmentMsgs=Remover anexo;Remover anexos
 
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg=Ocorreu um erro ao guardar a mensagem em %S. Tentar novamente?
-
 errorFilteringMsg=A sua mensagem foi enviada e guardada, mas ocorreu um erro ao executar os filtros de mensagens nela.
-
 errorCloudFileAuth.title=Erro de autenticação
+
 ## LOCALIZATION NOTE(errorCloudFileAuth.message):
-## %1$S is the name of the online storage service that authentication failed against.
+## %1$S is the name of the online storage service against which the authentication failed.
 errorCloudFileAuth.message=Não foi possível autenticar com %1$S.
 errorCloudFileUpload.title=Erro ao enviar
+
 ## LOCALIZATION NOTE(errorCloudFileUpload.message):
-## %1$S is the name of the online storage service that uploading failed against.
+## %1$S is the name of the online storage service against which the uploading failed.
 ## %2$S is the name of the file that failed to upload.
 errorCloudFileUpload.message=Não foi possível enviar %2$S para %1$S.
 errorCloudFileQuota.title=Erro de quota
+
 ## LOCALIZATION NOTE(errorCloudFileQuota.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
 errorCloudFileQuota.message=Se enviar %2$S para %1$S irá exceder a sua quota de espaço.
 errorCloudFileNameLimit.title=Erro no nome do ficheiro
+
 ## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to the excess file name length
 errorCloudFileNameLimit.message=O envio de %2$S para %1$S contém mais de 120 caracteres no nome. Por favor altere o nome do ficheiro para que tenha 120 caracteres ou menos no nome tente novamente.
 errorCloudFileLimit.title=Erro no tamanho do ficheiro
+
 ## LOCALIZATION NOTE(errorCloudFileLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to size restrictions.
 errorCloudFileLimit.message=%2$S excede o tamanho máximo de %1$S.
 errorCloudFileOther.title=Erro desconhecido
+
 ## LOCALIZATION NOTE(errorCloudFileOther.message):
 ## %1$S is the name of the online storage service that cannot be communicated with.
 errorCloudFileOther.message=Ocorreu um erro desconhecido ao comunicar com %1$S.
 errorCloudFileDeletion.title=Erro ao eliminar
+
 ## LOCALIZATION NOTE(errorCloudFileDeletion.message):
 ## %1$S is the name of the online storage service that the file is to be deleted from.
 ## %2$S is the name of the file that failed to be deleted.
 errorCloudFileDeletion.message=Ocorreu um problema ao eliminar %2$S de %1$S.
-
 errorCloudFileUpgrade.label=Atualizar
 
 ## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
@@ -421,7 +385,6 @@
 ## upload notification bar to allow the user to dismiss the notification permanently.
 stopShowingUploadingNotification.accesskey=N
 stopShowingUploadingNotification.label=Não voltar a mostrar
-
 replaceButton.label=Substituir
 replaceButton.accesskey=b
 replaceButton.tooltip=Mostrar o diálogo Localizar e substituir
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/mail/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/mail/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:04:55.000000000 +0000
@@ -3,20 +3,21 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY itemGeneral.label "Geral">
+<!ENTITY dataChoicesTab.label    "Escolhas de dados">
 <!ENTITY itemDisplay.label "Leitura e exibição">
 <!ENTITY itemUpdate.label "Atualização">
 <!ENTITY itemNetworking.label "Rede e espaço em disco">
 <!ENTITY itemCertificates.label "Certificados">
 
 <!-- General Settings -->
-
-<!ENTITY submitTelemetry.label "Enviar dados de desempenho">
-<!ENTITY submitTelemetry.accesskey "p">
-<!ENTITY telemetryInfoLink.label "Mais informações sobre telemetria">
 <!ENTITY enableGlodaSearch.label "Ativar procura global e indexador">
 <!ENTITY enableGlodaSearch.accesskey "i">
 <!ENTITY allowHWAccel.label            "Usar aceleração por hardware se possível">
 <!ENTITY allowHWAccel.accesskey        "h">
+<!ENTITY storeType.label               "Tipo de armazenamento de mensagem para novas constas:">
+<!ENTITY storeType.accesskey           "T">
+<!ENTITY mboxStore.label               "Um ficheiro grande (mbox)">
+<!ENTITY maildirStore.label            "Ficheiro por mensagem (maildir)">
 
 <!ENTITY scrolling.label "Deslocamento">
 <!ENTITY useAutoScroll.label "Utilizar deslocação automática">
@@ -38,6 +39,19 @@
 <!ENTITY showReturnReceipts.label "Recibos de leitura…">
 <!ENTITY showReturnReceipts.accesskey "R">
 
+<!-- Data Choices -->
+<!ENTITY telemetrySection.label          "Telemetria">
+<!ENTITY telemetryDesc.label             "Partilha o desempenho, a utilização, o hardware e os dados de personalização sobre o cliente de correio com a &vendorShortName; para ajudar o &brandShortName; a ficar melhor">
+<!ENTITY enableTelemetry.label           "Ativar telemetria">
+<!ENTITY enableTelemetry.accesskey       "T">
+<!ENTITY telemetryLearnMore.label        "Saber mais">
+
+<!ENTITY crashReporterSection.label      "Relatório de erros">
+<!ENTITY crashReporterDesc.label         "O &brandShortName; envia relatório de erros para ajudar a &vendorShortName; a tornar o cliente de correio mais estável e seguro">
+<!ENTITY enableCrashReporter.label       "Ativar relatório de erros">
+<!ENTITY enableCrashReporter.accesskey   "C">
+<!ENTITY crashReporterLearnMore.label    "Saber mais">
+
 <!-- Display and Reading Settings -->
 <!ENTITY reading.caption "Leitura">
 <!ENTITY display.caption "Exibição">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:04:55.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/.
 
-aboutReader.loading=Carregamento...
+aboutReader.loading=A carregar...
 aboutReader.loadError=Falha ao carregar o artigo da página
 
 aboutReader.colorScheme.light=Claro
@@ -11,14 +11,9 @@
 aboutReader.colorScheme.auto=Automático
 
 # LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
-# These are the styles of typeface that are used on desktop.
-aboutReader.fontType.serif=Serif
-aboutReader.fontType.sans-serif=Sans-serif
-
-# LOCALIZATION NOTE (aboutReader.fontType.charis-sil, aboutReader.fontType.clear-sans):
-# These are the names of the fonts that are used on Android
-aboutReader.fontType.charis-sil=Charis SIL Compact
-aboutReader.fontType.clear-sans=Clear Sans
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Serifa
+aboutReader.fontType.sans-serif=Sem serifa
 
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
 aboutReader.fontTypeSample=Aa
@@ -27,4 +22,12 @@
 # for the font size setting. Tapping different samples will change the font size.
 aboutReader.fontSizeSample=A
 
-aboutReader.toolbarTip=Clique no ecrã para mostrar as opções
+aboutReader.toolbar.close=Fechar vista do leitor
+aboutReader.toolbar.typeControls=Controlos de escrita
+aboutReader.toolbar.addToReadingList=Adicionar à lista de leitura
+aboutReader.toolbar.removeFromReadingList=Remover da lista de leitura
+aboutReader.toolbar.openReadingList=Abrir lista de leitura
+aboutReader.toolbar.closeReadingList=Fechar lista de leitura
+aboutReader.toolbar.share=Partilhar
+
+aboutReader.footer.deleteThisArticle=Eliminar este artigo
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:04:55.000000000 +0000
@@ -39,7 +39,7 @@
 <!ENTITY aboutSupport.appBasicsVersion "Versão">
 <!ENTITY aboutSupport.appBasicsBuildID "ID da compilação">
 
-<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateChannel, aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
 "Update" is a noun here, not a verb. -->
 <!ENTITY aboutSupport.appBasicsUpdateChannel "Canal de atualização">
 <!ENTITY aboutSupport.appBasicsUpdateHistory "Histórico de atualizações">
@@ -97,3 +97,6 @@
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copiar dados para a área de transferência">
 
 <!ENTITY aboutSupport.sandboxTitle "Sandbox">
+
+<!ENTITY aboutSupport.safeModeTitle "Tentar o modo de segurança">
+<!ENTITY aboutSupport.restartInSafeMode.label "Reiniciar com os extras desativados…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:04: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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Quit
+quitMenuitem.key=q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:04:55.000000000 +0000
@@ -102,14 +102,14 @@
 <!ENTITY cmd.installAddon.accesskey           "I">
 <!ENTITY cmd.uninstallAddon.label             "Remover">
 <!ENTITY cmd.uninstallAddon.accesskey         "R">
-<!ENTITY cmd.debugAddon.label                 "Depurar">
+<!ENTITY cmd.debugAddon.label                 "Depuração">
 <!ENTITY cmd.showPreferencesWin.label         "Opções">
 <!ENTITY cmd.showPreferencesWin.tooltip       "Mudar opções deste extra">
 <!ENTITY cmd.showPreferencesUnix.label        "Preferências">
-<!ENTITY cmd.showPreferencesUnix.tooltip      "Alterar preferências deste extra">
+<!ENTITY cmd.showPreferencesUnix.tooltip      "Mudar preferências deste extra">
 <!ENTITY cmd.contribute.label                 "Colaborar">
 <!ENTITY cmd.contribute.accesskey             "C">
-<!ENTITY cmd.contribute.tooltip               "Contribuir para o desenvolvimento deste extra">
+<!ENTITY cmd.contribute.tooltip               "Participar no desenvolvimento deste extra">
 
 <!ENTITY cmd.showReleaseNotes.label           "Mostrar notas da versão">
 <!ENTITY cmd.showReleaseNotes.tooltip         "Mostra as notas de versão desta atualização">
@@ -120,7 +120,7 @@
 <!-- LOCALIZATION NOTE (discover.title,discover.description,discover.footer):
      Displayed in the center of the Get Add-ons view, see bug 601143 for mockups. -->
 <!ENTITY discover.title                       "O que são extras?">
-<!ENTITY discover.description2                "Os extras são aplicações que lhe permitem personalizar o &brandShortName; com
+<!ENTITY discover.description2                "Os extras são aplicações que permitem personalizar o &brandShortName; com
   funcionalidades ou estilos. Experimente uma barra lateral, um notificador meteorológico ou um tema para ajustar o &brandShortName;
   ao seu gosto.">
 <!ENTITY discover.footer                      "Quando estiver ligado à Internet, este painel mostrará alguns dos melhores e
@@ -147,15 +147,14 @@
 <!ENTITY detail.size                          "Tamanho">
 
 <!ENTITY detail.checkForUpdates.label         "Procurar atualizações">
-<!ENTITY detail.checkForUpdates.accesskey     "P">
+<!ENTITY detail.checkForUpdates.accesskey     "c">
 <!ENTITY detail.checkForUpdates.tooltip       "Procurar atualizações para este extra">
 <!ENTITY detail.showPreferencesWin.label      "Opções">
 <!ENTITY detail.showPreferencesWin.accesskey  "O">
-<!ENTITY detail.showPreferencesWin.tooltip    "Alterar preferências deste extra">
+<!ENTITY detail.showPreferencesWin.tooltip    "Mudar opções deste extra">
 <!ENTITY detail.showPreferencesUnix.label     "Preferências">
 <!ENTITY detail.showPreferencesUnix.accesskey "P">
-<!ENTITY detail.showPreferencesUnix.tooltip   "Altera as preferências deste extra">
-
+<!ENTITY detail.showPreferencesUnix.tooltip   "Mudar preferências deste extra">
 
 <!-- ratings -->
 <!ENTITY rating2.label                        "Avaliação:">
@@ -164,7 +163,6 @@
 <!ENTITY progress.pause.tooltip               "Pausa">
 <!ENTITY progress.cancel.tooltip              "Cancelar">
 
-
 <!-- list sorting -->
 <!ENTITY sort.name.label                      "Nome">
 <!ENTITY sort.name.tooltip                    "Ordenar por nome">
@@ -229,3 +227,5 @@
 <!ENTITY experiment.info.learnmore.accesskey "m">
 <!ENTITY experiment.info.changetelemetry "Definições de telemetria">
 <!ENTITY experiment.info.changetelemetry.accesskey "t">
+
+<!ENTITY setting.learnmore "Saber mais...">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:04:55.000000000 +0000
@@ -56,8 +56,8 @@
 notification.installError=Houve um erro ao instalar %1$S.
 notification.installError.retry=Tente novamente
 notification.installError.retry.tooltip=Tente transferir e instalar este extra de novo
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Será instalado brevemente.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=%1$S será instalado brevemente.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Sugerir doação: %S
@@ -99,8 +99,8 @@
 details.notification.uninstall=%1$S será desinstalado depois de reiniciar o %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=%1$S será atualizado depois de reiniciar o %2$S.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Será instalado dentro de momentos.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=%1$S será instalado dentro de momentos.
 
 # LOCALIZATION NOTE (details.experiment.time.daysRemaining):
 # Semicolon-separated list of plural forms.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/pt-PT/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:43:58.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/pt-PT/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:04:55.000000000 +0000
@@ -7,7 +7,7 @@
 <!ENTITY unsupportedPlatform.pre                             "Pedimos desculpa mas o &brandShortName; não pode reproduzir flash neste dispositivo. ">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.learnMore): Mobile only. This text is used to link to a SUMO page explaining why Flash is not
      supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -->
-<!ENTITY unsupportedPlatform.learnMore                       "Saber mais">
+<!ENTITY unsupportedPlatform.learnMore                       "Saber mais...">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
 <!ENTITY unsupportedPlatform.post                            "">
 
@@ -26,7 +26,7 @@
 <!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
 <!ENTITY reloadPlugin.pre                                    "">
 <!ENTITY reloadPlugin.middle                                 "Recarregue a página">
-<!ENTITY reloadPlugin.post                                   " para tentar de novo.">
+<!ENTITY reloadPlugin.post                                   " para tentar novamente.">
 <!-- LOCALIZATION NOTE (report.please): This and the other report.* strings should be as short as possible, ideally 2-3 words. -->
 <!ENTITY report.please                                       "Enviar relatório de erro">
 <!ENTITY report.submitting                                   "A enviar relatório...">
@@ -39,4 +39,4 @@
 
 <!ENTITY plugin.file                                         "Ficheiro">
 <!ENTITY plugin.mimeTypes                                    "Tipos MIME">
-
+<!ENTITY plugin.flashProtectedMode.label                     "Ativar modo protegido para Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/dom/chrome/appstrings.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/dom/chrome/appstrings.properties	2015-02-28 15:05:01.000000000 +0000
@@ -32,3 +32,4 @@
 cspBlocked = Эта страница имеет политику защиты содержимого, блокирующую данный способ её загрузки.
 corruptedContentError = Страница, которую вы пытаетесь просмотреть, не может быть показана, так как была обнаружена ошибка при передаче данных.
 remoteXUL = Эта страница использует неподдерживаемую технологию, которая по умолчанию более недоступна.
+sslv3Used = Безопасность ваших данных на %S не может гарантирована, так как он использует уязвимый протокол защиты SSLv3.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/dom/chrome/plugins.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/dom/chrome/plugins.properties	2015-02-28 15:05:01.000000000 +0000
@@ -15,5 +15,8 @@
 mimetype_label = Тип MIME
 description_label = Описание
 suffixes_label = Суффиксы
+gmp_license_info = Информация о лицензии
 openH264_name = Видеокодек OpenH264, предоставленный Cisco Systems, Inc.
-openH264_description = Используется для воспроизведения веб-видео и видеочатов.
+openH264_description = Воспроизведение веб-видео и поддержка работы видеочатов
+eme-adobe_name = Плагин расшифровки контента Primetime, предоставленный Adobe Systems, Incorporated
+eme-adobe_description = Воспроизведение защищённого веб-видео
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/aboutDialog.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/aboutDialog.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -5,20 +5,30 @@
 <!ENTITY update.updateButton.accesskey "е">
 <!ENTITY update.applyButtonBillboard.label "Применить обновление…">
 <!ENTITY update.applyButtonBillboard.accesskey "и">
+<!ENTITY warningDesc.version "&brandShortName; является экспериментальным и может быть нестабилен.">
+<!ENTITY warningDesc.telemetryDesc "Он автоматически отправляет информацию о производительности, аппаратном обеспечении, использовании и настройках в &vendorShortName;, чтобы помочь сделать &brandShortName; лучше.">
+<!ENTITY community.exp.start "">
+<!ENTITY community.exp.mozillaLink "&vendorShortName;">
+<!ENTITY community.exp.middle " является ">
+<!ENTITY community.exp.creditsLink "глобальным сообществом">
+<!ENTITY community.exp.end ", работающим над тем, чтобы Интернет оставался открытым, публичным и доступным для всех и каждого.">
 <!ENTITY community.start2 "&brandShortName; создан ">
 <!ENTITY community.mozillaLink "&vendorShortName;">
 <!ENTITY community.middle2 " — ">
 <!ENTITY community.creditsLink "глобальным сообществом">
-<!ENTITY community.end2 ", работающим над тем, чтобы сделать Интернет лучше. Мы верим, что Интернет должен быть общественным ресурсом, открытым и доступным для всех и каждого без каких-либо ограничений.">
-<!ENTITY contribute.start "Звучит интересно? ">
-<!ENTITY contribute.getInvolvedLink "Присоединяйтесь!">
-<!ENTITY contribute.end "">
+<!ENTITY community.end3 ", работающим над тем, чтобы Интернет оставался открытым, публичным и доступным для всех и каждого.">
+<!ENTITY helpus.start "Хотите помочь? ">
+<!ENTITY helpus.donateLink "Сделайте пожертвование">
+<!ENTITY helpus.middle " или ">
+<!ENTITY helpus.getInvolvedLink "присоединяйтесь!">
+<!ENTITY helpus.end "">
 <!ENTITY bottomLinks.license "Информация о лицензии">
 <!ENTITY bottomLinks.rights "Права конечного пользователя">
 <!ENTITY bottomLinks.privacy "Политика приватности">
 <!ENTITY update.checkingForUpdates "Проверка наличия обновлений…">
 <!ENTITY update.noUpdatesFound "Установлена последняя версия &brandShortName;">
 <!ENTITY update.adminDisabled "Обновления отключены вашим системным администратором">
+<!ENTITY update.otherInstanceHandlingUpdates "Обновление производится другим процессом &brandShortName;">
 <!ENTITY update.failed.start "Обновление не удалось. ">
 <!ENTITY update.failed.linkText "Загрузите последнюю версию">
 <!ENTITY update.failed.end "">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/aboutDownloads.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/aboutDownloads.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/aboutDownloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/aboutDownloads.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -0,0 +1,16 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 aboutDownloads.title "Сохранённые файлы">
+<!ENTITY aboutDownloads.empty "Нет сохранённых файлов">
+<!ENTITY cmd.show.label "Открыть папку с файлом">
+<!ENTITY cmd.show.accesskey "к">
+<!ENTITY cmd.showMac.label "Показать в Finder">
+<!ENTITY cmd.showMac.accesskey "к">
+<!ENTITY cmd.open.label "Открыть">
+<!ENTITY cmd.open.accesskey "ы">
+<!ENTITY cmd.removeFromHistory.label "Удалить из истории">
+<!ENTITY cmd.removeFromHistory.accesskey "а">
+<!ENTITY cmd.clearDownloads.label "Очистить загрузки">
+<!ENTITY cmd.clearDownloads.accesskey "и">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -3,6 +3,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY addressbookWindow.title "Адресная книга">
+<!ENTITY blankResultsPaneMessage.label "Это адресная книга покажет контакты только после поиска">
+<!ENTITY localResultsOnlyMessage.label "Контакты из удаленных адресных книг не будут показаны, пока вы не выполните поиск">
 <!ENTITY fileMenu.label "Файл">
 <!ENTITY fileMenu.accesskey "Ф">
 <!ENTITY newMenu.label "Создать">
@@ -137,6 +139,8 @@
 <!ENTITY advancedButton.tooltip "Расширенный режим поиска адресов">
 <!ENTITY quickSearchCmd.key "k">
 <!ENTITY searchItem.title "Быстрый поиск">
+<!ENTITY Addrbook.label "Адресная книга">
+<!ENTITY Addrbook.accesskey "н">
 <!ENTITY GeneratedName.label "Имя">
 <!ENTITY GeneratedName.accesskey "И">
 <!ENTITY PrimaryEmail.label "Электронная почта">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-28 15:05:01.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/. -->
 
+<!ENTITY Addrbook.label "Адресная книга">
+<!ENTITY Addrbook.accesskey "н">
 <!ENTITY GeneratedName.label "Имя">
 <!ENTITY GeneratedName.accesskey "И">
 <!ENTITY PrimaryEmail.label "Электронная почта">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-28 15:05:01.000000000 +0000
@@ -5,6 +5,7 @@
 emptyListName = Введите имя списка.
 lastFirstFormat = %S %S
 firstLastFormat = %S %S\u0020\u0020
+allAddressBooks = Все адресные книги
 newContactTitle = Новый контакт
 newContactTitleWithDisplayName = Новый контакт для %S
 editContactTitle = Редактирование контакта
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/am-server-top.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/am-server-top.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -70,3 +70,7 @@
 <!ENTITY browseNewsrc.accesskey "з">
 <!ENTITY accountTitle.label "Параметры учётной записи">
 <!ENTITY accountSettingsDesc.label "Эта учётная запись особенная. С ней не связаны никакие персональные данные.">
+<!ENTITY storeType.label "Тип хранилища сообщений:">
+<!ENTITY storeType.accesskey "п">
+<!ENTITY mboxStore.label "Один большой файл (mbox)">
+<!ENTITY maildirStore.label "По файлу на сообщение (maildir)">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/chat.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/chat.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/chat.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/chat.properties	2015-02-28 15:05:01.000000000 +0000
@@ -30,3 +30,4 @@
 log.currentWeek = Эта неделя
 log.previousWeek = Прошлая неделя
 messagePreview = Новое сообщение чата
+bundledMessagePreview = %1$S… (и ещё #1 сообщение);%1$S… (и ещё #1 сообщения);%1$S… (и ещё #1 сообщений)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/filter.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/filter.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/filter.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/filter.properties	2015-02-28 15:05:01.000000000 +0000
@@ -24,6 +24,7 @@
 continueButtonLabel = Продолжить
 cannotEnableFilter = Возможно, фильтр был создан более поздней версией данного ПО. Вы не можете использовать этот фильтр, так как мы не знаем, как его применить.
 dontWarnAboutDeleteCheckbox = Не спрашивать в следующий раз
+filterFailureWarningPrefix = Не удалось применить фильтр: "%1$S" с кодом ошибки=%2$S при попытке:
 searchTermsInvalidTitle = Поисковые запросы некорректны
 searchTermsInvalidRule = Этот фильтр не может быть сохранён, так как поисковый запрос "%1$S %2$S" в текущем контексте некорректен.
 filterActionOrderExplanation = Когда сообщение подходит под этот фильтр, действия будут произведены в следующем порядке:\n\n
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/glodaComplete.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/glodaComplete.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/glodaComplete.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/glodaComplete.properties	2015-02-28 15:05:01.000000000 +0000
@@ -5,5 +5,3 @@
 glodaComplete.messagesTagged.label = Сообщения отмеченные: #1
 glodaComplete.messagesMentioning.label = Сообщения упоминающие: #1
 glodaComplete.messagesMentioningMany.label = Сообщения упоминающие: #1
-glodaComplete.webSearch1.label = Поиск в #1: #2
-glodaComplete.webSearch1.label.truncated = Поиск в #1: #2…
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/localMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/localMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/localMsgs.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/localMsgs.properties	2015-02-28 15:05:01.000000000 +0000
@@ -10,7 +10,6 @@
 hostContact = Соединение установлено, отсылается регистрационная информация…
 noNewMessages = Нет новых сообщений.
 receivedMsgs = Получено %1$S из %2$S сообщений
-pop3OutOfDiskSpace = Недостаточно места на диске для загрузки новых сообщений. Удалите старую почту, очистите папку «Удалённые» и сожмите папки почты, затем попробуйте снова.
 buildingSummary = Создание общего файла для «%S»…
 localStatusDocumentDone = Готово
 pop3ServerError = Произошла ошибка почтового сервера POP3.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-28 15:05:01.000000000 +0000
@@ -4,57 +4,57 @@
 
 unableToOpenFile = Не удалось открыть файл «%S».
 unableToOpenTmpFile = Не удалось открыть временный файл «%S». Проверьте параметры вашего каталога временных файлов.
-12502 = Не удалось сохранить сообщение как шаблон.
-12503 = Не удалось сохранить сообщение как черновик.
-12506 = Не удалось открыть папку «Отправленные». Убедитесь в правильности своих почтовых настроек.
-12510 = Не был указан отправитель. Введите свой адрес электронной почты в настройках учётной записи.
-12511 = Не был указан адресат. Укажите адресата или группу новостей в строке адреса.
-12512 = Ошибка записи временного файла.
-12514 = Ошибка отправления почты. Почтовый сервер ответил: %s. Убедитесь, что указанный вами в настройках адрес электронной почты верен, и попробуйте снова.
-12516 = Ошибка (SMTP) отправления почты. Сервер ответил: %s.
-12517 = Ошибка отправления почты. Почтовый сервер ответил: %s. Проверьте сообщение и попробуйте снова.
-12518 = Сообщение не может быть доставлено, потому что не удалось установить соединение с сервером новостей. Сервер может быть недоступен или отказывать в соединении. Убедитесь, что указали корректные параметры сервера новостей и попробуйте снова или обратитесь к сетевому администратору.
-12519 = Ошибка доставки неотправленных сообщений.
-12520 = Ошибка отправления сообщения.
-12524 = Ошибка отправления почты: ошибка SMTP-сервера. Сервер ответил: %s. Обратитесь за помощью к администратору сервера.
-12525 = Не удалось сохранить сообщение для последующей отправки.
-12526 = Ошибка соединения: %d. Попробуйте соединиться снова.
-12527 = THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
-12528 = Ошибка в сети при получении данных. (Ошибка сети: %s) Попробуйте соединиться снова.
-12529 = Ошибка отправления почты: обратный адрес электронной почты некорректен. Убедитесь, что вы указали корректный адрес в настройках, и попробуйте снова.
-12531 = Ошибка вложения.
-12532 = Сообщение отправлено, но оно не было скопировано в папку «Отправленные».
-12554 = За раз вы можете отправить сообщение только на один сервер новостей.
-12555 = Отмена…
-12560 = Ваше сообщение было отправлено в группу новостей, но не было отправлено другому адресату.
-12563 = Ошибка чтения файла.
+unableToSaveTemplate = Не удалось сохранить сообщение как шаблон.
+unableToSaveDraft = Не удалось сохранить сообщение как черновик.
+couldntOpenFccFolder = Не удалось открыть папку «Отправленные». Убедитесь в правильности своих параметров учётной записи.
+noSender = Не был указан отправитель. Введите свой адрес электронной почты в параметрах учётной записи.
+noRecipients = Не был указан адресат. Укажите адресата или группу новостей в строке адреса.
+errorWritingFile = Ошибка записи временного файла.
+errorSendingFromCommand = Ошибка отправления почты. Почтовый сервер ответил: %s. Убедитесь, что указанный вами в параметрах учётной записи адрес электронной почты верен, и попробуйте снова.
+errorSendingDataCommand = Ошибка сервера исходящей почты (SMTP) при отправлении почты. Сервер ответил: %s.
+errorSendingMessage = Ошибка отправления почты. Почтовый сервер ответил: %s. Проверьте сообщение и попробуйте снова.
+postFailed = Сообщение не может быть доставлено, потому что не удалось установить соединение с сервером новостей. Сервер может быть недоступен или отказывать в соединении. Убедитесь, что указали корректные параметры сервера новостей и попробуйте снова.
+errorQueuedDeliveryFailed = Ошибка при доставке неотправленных сообщений.
+sendFailed = Ошибка отправления сообщения.
+smtpServerError = Ошибка при отправлении почты: Ошибка сервера исходящей почты (SMTP). Сервер ответил:  %s.
+unableToSendLater = Извините, но нам не удалось сохранить сообщение для последующей отправки.
+communicationsError = Ошибка соединения: %d. Пожалуйста, попробуйте снова.
+dontShowAlert = THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+tcpReadError = Ошибка в сети при получении данных. (Ошибка сети: %s) Попробуйте соединиться снова.
+couldNotGetUsersMailAddress = Ошибка отправления почты: обратный адрес электронной почты некорректен. Убедитесь, что вы указали корректный адрес в ваших параметрах учётной записи, и попробуйте снова.
+mimeMpartAttachmentError = Ошибка вложения.
+failedCopyOperation = Сообщение было успешно отправлено, но его не удалось скопировать в папку «Отправленные».
+nntpNoCrossPosting = За раз вы можете отправить сообщение только на один сервер новостей.
+msgCancelling = Отмена…
+sendFailedButNntpOk = Ваше сообщение было отправлено в группу новостей, но не было отправлено другому адресату.
+errorReadingFile = Ошибка чтения файла.
 followupToSenderMessage = Автор этого сообщения запросил, чтобы ответы были присланы только ему. Если вы хотите ответить также в группу новостей, добавьте новую строку в панель адреса, выберите пункт «Группы новостей» из списка адресатов и введите её имя.
-12570 = Ошибка при вложении «%S». Проверьте имеете ли вы доступ к файлу.
-12572 = Ошибка отправления почты: Сервер отправил некорректное приветствие: %s.
-12575 = Ошибка отправления почты. Почтовый сервер ответил: %1$s. Проверьте правильность написания адреса %2$s и попробуйте снова.
-12582 = Ошибка отправления почты: Не удалось установить защищённое соединение с SMTP-сервером %S с использованием STARTTLS, так как он не заявил о поддержке этой возможности. Отключите использование STARTTLS для этого сервера или свяжитесь с вашим сервис-провайдером.
-12584 = Ошибка отправления почты: Не удалось получить пароль для %S. Сообщение отправлено не было.
-12586 = Размер сообщения, которое вы пытаетесь отправить, превышает временный предел размера, допустимый сервером. Сообщение не было отправлено; попробуйте уменьшить его размер или подождать некоторое время и попробовать снова. Сервер ответил: %s.
-12587 = Размер сообщения, которое вы пытаетесь отправить, превышает глобальный предел размера (%d байт), допустимый сервером. Сообщение не было отправлено; уменьшите его размер и попробуйте снова.
-12588 = Размер сообщения, которое вы пытаетесь отправить, превышает глобальный предел размера, допустимый сервером. Сообщение не было отправлено; уменьшите его размер и попробуйте снова. Сервер ответил:  %s.
-12589 = Ошибка отправления почты: SMTP-сервер «%S» неизвестен. Возможно, сервер неверно сконфигурирован. Убедитесь, что настройки вашего SMTP-сервера правильны, и попробуйте снова.
-12590 = Сообщение не может быть отправлено, так как не удалось установить соединение с SMTP-сервером «%S». Сервер может быть недоступен или отказывать в соединении по SMTP. Убедитесь, что указали корректные параметры SMTP-сервера и попробуйте снова или свяжитесь с администратором сервера.
-12591 = Сообщение не может быть отправлено, так как соединение с SMTP-сервером «%S» было утеряно в середине транзакции. Попробуйте снова или свяжитесь с администратором сети.
-12592 = Сообщение не может быть отправлено, так как время ожидания соединения с SMTP-сервером «%S» истекло. Попробуйте снова или свяжитесь с администратором сети.
-12593 = Отправка сообщения с использованием SMTP-сервера «%S» не удалась по неизвестной причине. Убедитесь, что указали корректные параметры SMTP-сервера и попробуйте снова или свяжитесь с администратором сети.
-12594 = Похоже, что SMTP-сервер «%S» не поддерживает использование зашифрованных паролей. Если вы только что создали учётную запись, пожалуйста, попробуйте сменить «Метод аутентификации» на «Пароль, без защиты передачи» в «Параметрах учётной записи | Параметры сервера». Если это работало раньше, а теперь внезапно перестало работать, обычно это означает, что кто-то мог украсть ваш пароль.
-12595 = Похоже, что SMTP-сервер «%S» не поддерживает использование зашифрованных паролей. Если вы только что создали учётную запись, пожалуйста, попробуйте сменить «Метод аутентификации» на «Обычный пароль» в «Параметрах учётной записи | Параметры сервера». Если это работало раньше, а теперь внезапно перестало работать, пожалуйста, свяжитесь в вашим администратором электронной почты или провайдером.
-12596 = SMTP-сервер «%S» не разрешает использование обычных текстовых паролей. Пожалуйста, попробуйте сменить «Метод аутентификации» на «Зашифрованный пароль» в «Параметрах учётной записи | Параметры сервера».
-12597 = Не удалось аутентифицироваться на SMTP-сервере «%S». Пожалуйста, проверьте пароль или проверьте «Метод аутентификации» в «Параметрах учётной записи | Сервер исходящей почты (SMTP)».
-12598 = Билет Kerberos/GSSAPI не был принят SMTP-сервером «%S». Пожалуйста, проверьте, что вы вошли в Kerberos/GSSAPI realm.
-12599 = SMTP-сервер «%S» не поддерживает выбранный метод аутентификации. Пожалуйста, измените «Метод аутентификации» в «Параметрах учётной записи | Сервер исходящей почты (SMTP)».
-12600 = Не удалось аутентифицироваться на SMTP-сервере «%S». Он не поддерживает аутентификацию (SMTP-AUTH), а вы выбрали использование аутентификации. Пожалуйста, измените «Метод аутентификации» на «Нет» в «Параметрах учётной записи | Сервер исходящей почты (SMTP)» или свяжитесь с вашим провайдером электронной почты для получения инструкций.
+errorAttachingFile = Ошибка при вложении «%S». Проверьте, имеете ли вы доступ к файлу.
+incorrectSmtpGreeting = Ошибка отправления почты: Почтовый сервер отправил некорректное приветствие: %s.
+errorSendingRcptCommand = Ошибка отправления почты. Почтовый сервер ответил:  \n%1$S.\n Проверьте правильность написания адреса получателя «%2$S» и попробуйте снова.
+startTlsFailed = Ошибка отправления почты: Не удалось установить защищённое соединение с сервером исходящей почты (SMTP) «%S» с использованием STARTTLS, так как он не заявил о поддержке этой возможности. Отключите использование STARTTLS для этого сервера или свяжитесь с вашим сервис-провайдером.
+smtpPasswordUndefined = Ошибка отправления почты: Не удалось получить пароль для %S. Сообщение отправлено не было.
+smtpTempSizeExceeded = Размер сообщения, которое вы пытаетесь отправить, превышает временный предел размера, допустимый сервером. Сообщение не было отправлено; попробуйте уменьшить его размер или подождать некоторое время и попробовать снова. Сервер ответил: %s.
+smtpPermSizeExceeded1 = Размер сообщения, которое вы пытаетесь отправить, превышает глобальный предел размера (%d байт), допустимый сервером. Сообщение не было отправлено; уменьшите его размер и попробуйте снова.
+smtpPermSizeExceeded2 = Размер сообщения, которое вы пытаетесь отправить, превышает глобальный предел размера, допустимый сервером. Сообщение не было отправлено; уменьшите его размер и попробуйте снова. Сервер ответил:  %s.
+smtpSendFailedUnknownServer = Ошибка отправления почты: Сервер исходящей почты (SMTP) «%S» неизвестен. Возможно, сервер неверно сконфигурирован. Убедитесь, что параметры вашего Сервера исходящей почты (SMTP) правильны, и попробуйте снова.
+smtpSendRefused = Сообщение не может быть отправлено, так как не удалось установить соединение с Сервером исходящей почты (SMTP) «%S». Сервер может быть недоступен или отказывать в соединении для отправки исходящей почты (SMTP). Убедитесь, что указали корректные параметры Сервера исходящей почты (SMTP) и попробуйте снова.
+smtpSendInterrupted = Сообщение не может быть отправлено, так как соединение с Сервером исходящей почты (SMTP) «%S» было утеряно в середине транзакции. Попробуйте снова.
+smtpSendTimeout = Сообщение не может быть отправлено, так как время ожидания соединения с Сервером исходящей почты (SMTP) «%S» истекло. Попробуйте снова.
+smtpSendFailedUnknownReason = Отправка сообщения с использованием Сервера исходящей почты (SMTP) «%S» не удалась по неизвестной причине. Убедитесь, что указали корректные параметры Сервера исходящей почты (SMTP) и попробуйте снова.
+smtpAuthChangeEncryptToPlainNoSsl = Похоже, что Сервер исходящей почты (SMTP) «%S» не поддерживает использование зашифрованных паролей. Если вы только что создали учётную запись, попробуйте сменить «Метод аутентификации» в «Параметры учётной записи | Параметры сервера» на «Пароль, без защиты передачи». Если это работало раньше, а теперь внезапно перестало, возможно, что ваш пароль был украден.
+smtpAuthChangeEncryptToPlainSsl = Похоже, что Сервер исходящей почты (SMTP) «%S» не поддерживает использование зашифрованных паролей. Если вы только что создали учётную запись, попробуйте сменить «Метод аутентификации» в «Параметры учётной записи | Параметры сервера» на «Обычный пароль».
+smtpAuthChangePlainToEncrypt = Сервер исходящей почты (SMTP) «%S» не разрешает использование обычных текстовых паролей. Пожалуйста, попробуйте сменить «Метод аутентификации» в «Параметры учётной записи | Параметры сервера» на «Зашифрованный пароль».
+smtpAuthFailure = Не удалось аутентифицироваться на Сервере исходящей почты (SMTP) «%S». Пожалуйста, проверьте пароль, и проверьте «Метод аутентификации» в «Параметры учётной записи | Сервер исходящей почты (SMTP)».
+smtpAuthGssapi = Билет Kerberos/GSSAPI не был принят Сервером исходящей почты (SMTP) «%S». Пожалуйста, проверьте, что вы вошли в Kerberos/GSSAPI realm.
+smtpAuthMechNotSupported = Сервер исходящей почты (SMTP) «%S» не поддерживает выбранный метод аутентификации. Пожалуйста, измените «Метод аутентификации» в «Параметры учётной записи | Сервер исходящей почты (SMTP)».
+smtpAuthNotSupported = Не удалось аутентифицироваться на Сервере исходящей почты (SMTP) «%S». Он не поддерживает аутентификацию (SMTP-AUTH), а вы выбрали использование аутентификации. Пожалуйста, измените «Метод аутентификации» на «Нет» в «Параметры учётной записи | Сервер исходящей почты (SMTP)» или свяжитесь с вашим провайдером электронной почты для получения инструкций.
 errorIllegalLocalPart = В имени почтового ящика в адресе получателя %s имеются не-ASCII символы. Это пока не поддерживается. Пожалуйста, замените этот адрес и попробуйте снова.
 saveDlogTitle = Сохранение сообщения
 saveDlogMessages = Сообщение не было отправлено. Хотите сохранить его в папке черновиков (%1$S)?
 defaultSubject = (без темы)
 chooseFileToAttach = Вложить файл(ы)
-genericFailureExplanation = Пожалуйста, убедитесь, что параметры учётной записи корректны, и попробуйте снова.
+genericFailureExplanation = Пожалуйста, убедитесь, что ваши параметры учётной записи корректны, и попробуйте снова.
 undisclosedRecipients = undisclosed-recipients
 chooseFileToAttachViaCloud = Вложить файл через %1$S
 windowTitlePrefix = Создание сообщения:
@@ -99,7 +99,7 @@
 copyMessageFailed = Ошибка при копировании.
 filterMessageComplete = Применение фильтра завершено.
 filterMessageFailed = Не удалось применить фильтр.
-largeMessageSendWarning = Внимание! Вы собираетесь отправить сообщение размером %S, который может превысить допустимый предел на почтовом сервере. Вы уверены, что хотите это сделать?
+largeMessageSendWarning = Внимание! Вы собираетесь отправить сообщение размером %S. Вы уверены, что хотите это сделать?
 sendingMessage = Отправка сообщения…
 sendMessageErrorTitle = Ошибка отправки сообщения
 postingMessage = Регистрация сообщения…
@@ -147,7 +147,7 @@
 cloudFilePrivacyNotification = Создание ссылки завершено. Примите во внимание, что размещенные по ссылке вложения могут быть доступны людям, которые могут увидеть или угадать ссылки.
 smtpEnterPasswordPrompt = Введите пароль для %S:
 smtpEnterPasswordPromptWithUsername = Введите пароль для %2$S на %1$S:
-smtpEnterPasswordPromptTitle = Требуется пароль для входа на SMTP-сервер
+smtpEnterPasswordPromptTitle = Требуется пароль для входа на Сервер исходящей почты (SMTP)
 removeAttachmentMsgs = Удалить вложение;Удалить вложения;Удалить вложения
 errorSavingMsg = При сохранении сообщения в папку «%S» произошла ошибка. Попытаться снова?
 errorFilteringMsg = Ваше сообщение было отправлено и сохранено, но при применении к нему фильтров сообщений произошла ошибка.
@@ -158,7 +158,7 @@
 errorCloudFileQuota.title = Ошибка квоты
 errorCloudFileQuota.message = Выгрузка %2$S на %1$S приведёт к превышению вашей квоты на место.
 errorCloudFileNameLimit.title = Ошибка имени файла
-errorCloudFileNameLimit.message = Длина имени файла %2$S, выгружаемого на %1$S, превышает 120 символов. Пожалуйста, переименуйте файл, чтобы длина его имени не превышала 120 символов, и выгрузьте его снова.
+errorCloudFileNameLimit.message = Длина имени файла %2$S превышает 120 символов, что превышает максимальную длину файла для %1$S. Пожалуйста, переименуйте файл, чтобы длина его имени не превышала 120 символов, и выгрузьте его снова.
 errorCloudFileLimit.title = Ошибка размера файла
 errorCloudFileLimit.message = Размер %2$S превышает максимальный размер для %1$S.
 errorCloudFileOther.title = Неизвестная ошибка
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/messenger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/messenger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/messenger.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/messenger.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -133,6 +133,8 @@
 <!ENTITY messagePaneVertical.accesskey "В">
 <!ENTITY showFolderPaneCmd.label "Панель папок">
 <!ENTITY showFolderPaneCmd.accesskey "а">
+<!ENTITY showFolderPaneColsCmd.label "Колонки панели папок">
+<!ENTITY showFolderPaneColsCmd.accesskey "о">
 <!ENTITY showMessageCmd.label "Область просмотра сообщений">
 <!ENTITY showMessageCmd.accesskey "О">
 <!ENTITY folderView.label "Папки">
@@ -546,7 +548,9 @@
 <!ENTITY addNewTag.accesskey "Н">
 <!ENTITY manageTags.label "Управление метками…">
 <!ENTITY manageTags.accesskey "п">
-<!ENTITY folderColumn.label "Имя">
+<!ENTITY folderNameColumn.label "Имя">
+<!ENTITY folderUnreadColumn.label "Непрочитанные">
+<!ENTITY folderTotalColumn.label "Всего">
 <!ENTITY folderSizeColumn.label "Размер">
 <!ENTITY folderContextGetMessages.label "Получить сообщения">
 <!ENTITY folderContextGetMessages.accesskey "л">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/messenger.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/messenger.properties	2015-02-28 15:05:01.000000000 +0000
@@ -62,6 +62,7 @@
 alertFilterCheckbox = Не показывать больше.
 compactFolderDeniedLock = Папка «%S» не может быть сжата, потому что сейчас над ней совершается другая операция. Подождите некоторое время и попробуйте снова.
 compactFolderWriteFailed = Папка «%S» не может быть сжата из-за ошибки записи в неё. Убедитесь в достаточном количестве свободного дискового пространства и в наличии прав на запись в файловую систему и попробуйте снова.
+compactFolderInsufficientSpace = Некоторые папки (например, «%S») не могут быть сжаты, так как на диске недостаточно свободного места. Пожалуйста, удалите некоторые файлы и повторите попытку.
 filterFolderHdrAddFailed = Сообщение не может быть отфильтровано в папку «%S», так как в неё не удалось добавить сообщение. Убедитесь, что папка отображается правильно, или попытайтесь починить её из свойств папки.
 filterFolderWriteFailed = Сообщение не может быть отфильтровано в папку «%S» из-за ошибки записи в папку. Убедитесь в достаточном количестве свободного дискового пространства и наличии прав на запись в файловую систему и попробуйте снова.
 copyMsgWriteFailed = Сообщения не могут быть перемещены или скопированы в папку «%S» из-за ошибки записи. Чтобы освободить место на диске, перейдите в меню «Файл», выберите «Очистить „Удалённые”», затем — «Сжать папки» и попробуйте снова.
@@ -71,6 +72,7 @@
 verboseFolderFormat = %1$S на %2$S
 filterFolderTruncateFailed = Не удалось уменьшить папку «Входящие» после отсортировки сообщения в папку «%1$S». Возможно, стоит закрыть «%2$S» и удалить файл «INBOX.msf».
 mailboxTooLarge = Размер папки «%S» достиг своего предела и в неё не могут быть помещены новые сообщения. Чтобы освободить место для новых сообщений, удалите старые или ненужные сообщения и сожмите папку.
+outOfDiskSpace = Недостаточно места на диске для загрузки новых сообщений. Попробуйте удалить старую почту, очистить папку «Удалённые» и сжать папки вашей почты, затем попробуйте снова.
 errorGettingDB = Не удалось открыть индексный файл для «%S». Возможно, произошла ошибка на диске или полный путь превышает допустимую длину.
 defaultServerTag = (По умолчанию)
 messageUnread = Не прочитано
@@ -94,8 +96,10 @@
 authKerberos = Kerberos / GSSAPI
 authExternal = Сертификат TLS
 authNTLM = NTLM
+authOAuth2 = OAuth2
 authAnySecure = Любой защищённый метод (устарело)
 authAny = Любой метод (незащищённо)
+oauth2WindowTitle = Введите учётные данные для %1$S на %2$S
 serverType-nntp = Сервер новостей (NNTP)
 serverType-pop3 = Почтовый сервер POP3
 serverType-imap = Почтовый сервер IMAP
@@ -256,6 +260,9 @@
 kiloByteAbbreviation2 = %.*f КБ
 megaByteAbbreviation2 = %.*f МБ
 gigaByteAbbreviation2 = %.*f ГБ
+folderWithAccount = %1$S - %2$S
+folderWithUnreadMsgs = %1$S (%2$S)
+folderSummarizedValue = *%S
 errorOpenMessageForMessageIdTitle = Ошибка при открытии идентификатора
 errorOpenMessageForMessageIdMessage = Сообщение с идентификатором %S не найдено
 confirmPhishingTitle = Предупреждение о попытке мошенничества
@@ -361,8 +368,6 @@
 safeModeRestartButton = Перезапуститься
 update.downloadAndInstallButton.label = Обновить до %S
 update.downloadAndInstallButton.accesskey = н
-websearch.setDefault = Установить по умолчанию эту поисковую машину
-websearch.isDefault = Сейчас по умолчанию используется эта поисковая машина
 outdatedpluginsMessage.title = Некоторые плагины, используемые на этой странице, устарели.
 outdatedpluginsMessage.updateButton.label = Обновить плагины…
 outdatedpluginsMessage.updateButton.accesskey = б
@@ -395,3 +400,5 @@
 ignoredThreadsFeedback = Ответы в «#1» выбранное обсуждение показаны не будут.;Ответы в «#1» выбранных обсуждения показаны не будут.;Ответы в «#1» выбранных обсуждений показаны не будут.
 ignoredSubthreadsFeedback = Ответы в «#1» выбранную ветку обсуждения показаны не будут.;Ответы в «#1» выбранных ветки обсуждения показаны не будут.;Ответы в «#1» выбранных веток обсуждений показаны не будут.
 saveAsType = %S файл
+openSearch.label = Искать «%2$S» в %1$S
+openSearch.label.truncated = Искать «%2$S…» в %1$S
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -3,17 +3,19 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY itemGeneral.label "Основные">
+<!ENTITY dataChoicesTab.label "Выбор данных">
 <!ENTITY itemDisplay.label "Чтение и отображение">
 <!ENTITY itemUpdate.label "Обновления">
 <!ENTITY itemNetworking.label "Сеть и дисковое пространство">
 <!ENTITY itemCertificates.label "Сертификаты">
-<!ENTITY submitTelemetry.label "Отправлять данные о производительности">
-<!ENTITY submitTelemetry.accesskey "я">
-<!ENTITY telemetryInfoLink.label "Подробнее о телеметрии">
 <!ENTITY enableGlodaSearch.label "Включить глобальный поиск и индексацию сообщений">
 <!ENTITY enableGlodaSearch.accesskey "и">
 <!ENTITY allowHWAccel.label "По возможности использовать аппаратное ускорение">
 <!ENTITY allowHWAccel.accesskey "м">
+<!ENTITY storeType.label "Тип хранилища сообщений для новых учётных записей:">
+<!ENTITY storeType.accesskey "п">
+<!ENTITY mboxStore.label "Один большой файл (mbox)">
+<!ENTITY maildirStore.label "По файлу на сообщение (maildir)">
 <!ENTITY scrolling.label "Прокрутка">
 <!ENTITY useAutoScroll.label "Использовать автоматическую прокрутку">
 <!ENTITY useAutoScroll.accesskey "в">
@@ -32,6 +34,16 @@
 <!ENTITY returnReceiptsInfo.label "Определите, как &brandShortName; должен обрабатывать уведомления о прочтении">
 <!ENTITY showReturnReceipts.label "Уведомления о прочтении…">
 <!ENTITY showReturnReceipts.accesskey "ч">
+<!ENTITY telemetrySection.label "Телеметрия">
+<!ENTITY telemetryDesc.label "Поделиться сведениями о производительности, использовании, аппаратном обеспечении и настройках вашего почтового клиента с &vendorShortName;, чтобы помочь нам сделать &brandShortName; ещё лучше">
+<!ENTITY enableTelemetry.label "Включить телеметрию">
+<!ENTITY enableTelemetry.accesskey "ю">
+<!ENTITY telemetryLearnMore.label "Подробнее">
+<!ENTITY crashReporterSection.label "Сообщения о падениях">
+<!ENTITY crashReporterDesc.label "&brandShortName; отправляет сообщения о падении, чтобы помочь &vendorShortName; сделать ваш почтовый клиент более стабильным и безопасным">
+<!ENTITY enableCrashReporter.label "Включить отправку сообщений о падении">
+<!ENTITY enableCrashReporter.accesskey "л">
+<!ENTITY crashReporterLearnMore.label "Подробнее">
 <!ENTITY reading.caption "Чтение">
 <!ENTITY display.caption "Отображение">
 <!ENTITY showCondensedAddresses.label "Показывать только имя для людей, находящихся в моей адресной книге">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/compose.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/compose.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/compose.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -5,6 +5,7 @@
 <!ENTITY itemGeneral.label "Основные">
 <!ENTITY itemAutoComplete.label "Адресация">
 <!ENTITY itemSpellCheck.label "Орфография">
+<!ENTITY dialogCompose.title "Составление">
 <!ENTITY forwardMsg.label "Пересылать сообщения:">
 <!ENTITY forwardMsg.accesskey "с">
 <!ENTITY inline.label "Внутри сообщения">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/general.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/general.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/general.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/general.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -31,3 +31,4 @@
 <!ENTITY customsound.accesskey "з">
 <!ENTITY browse.label "Обзор…">
 <!ENTITY browse.accesskey "б">
+<!ENTITY defaultSearchEngine.label "Поисковая система по умолчанию">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/offline.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/offline.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/offline.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -10,8 +10,8 @@
 <!ENTITY radioRememberPrevState.accesskey "ы">
 <!ENTITY radioAskState.label "Запросить состояние подключения">
 <!ENTITY radioAskState.accesskey "о">
-<!ENTITY radioAlwaysOnline.label "Подключён к сети">
-<!ENTITY radioAlwaysOnline.accesskey "ю">
+<!ENTITY radioAlwaysOnlineState.label "Подключён к сети">
+<!ENTITY radioAlwaysOnlineState.accesskey "ю">
 <!ENTITY radioAlwaysOffline.label "Автономная работа">
 <!ENTITY radioAlwaysOffline.accesskey "в">
 <!ENTITY textGoingOnline "Отправить неотправленные сообщения при подключении?">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/preferences.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/mail/chrome/messenger/preferences/preferences.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/mail/chrome/messenger/preferences/preferences.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -16,3 +16,6 @@
 <!ENTITY panePrivacy.title "Приватность">
 <!ENTITY paneSecurity.title "Защита">
 <!ENTITY paneAdvanced.title "Дополнительные">
+<!ENTITY paneAccount.title "Учётные записи">
+<!ENTITY okButton.title "OK">
+<!ENTITY okButton.accesskey "O">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:05:01.000000000 +0000
@@ -10,8 +10,13 @@
 aboutReader.colorScheme.auto = Авто
 aboutReader.fontType.serif = С засечками
 aboutReader.fontType.sans-serif = Без засечек
-aboutReader.fontType.charis-sil = Charis SIL Compact
-aboutReader.fontType.clear-sans = Clear Sans
 aboutReader.fontTypeSample = Aa
 aboutReader.fontSizeSample = A
-aboutReader.toolbarTip = Нажмите на экран для показа настроек чтения
+aboutReader.toolbar.close = Закрыть Вид для чтения
+aboutReader.toolbar.typeControls = Настройка шрифтов
+aboutReader.toolbar.addToReadingList = Добавить в Список для чтения
+aboutReader.toolbar.removeFromReadingList = Удалить из Списка для чтения
+aboutReader.toolbar.openReadingList = Открыть Список для чтения
+aboutReader.toolbar.closeReadingList = Закрыть Список для чтения
+aboutReader.toolbar.share = Поделиться
+aboutReader.footer.deleteThisArticle = Удалить эту статью
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -59,3 +59,5 @@
 <!ENTITY aboutSupport.copyTextToClipboard.label "Копировать текст в буфер обмена">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Копировать необработанные данные в буфер обмена">
 <!ENTITY aboutSupport.sandboxTitle "Песочница">
+<!ENTITY aboutSupport.safeModeTitle "Попробовать безопасный режим">
+<!ENTITY aboutSupport.restartInSafeMode.label "Перезапустить с отключёнными дополнениями…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:05:01.000000000 +0000
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+quitMenuitem.label = Выход
+quitMenuitem.key = q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -166,3 +166,4 @@
 <!ENTITY experiment.info.learnmore.accesskey "о">
 <!ENTITY experiment.info.changetelemetry "Параметры телеметрии">
 <!ENTITY experiment.info.changetelemetry.accesskey "а">
+<!ENTITY setting.learnmore "Подробнее…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:05:01.000000000 +0000
@@ -31,7 +31,7 @@
 notification.installError = При установке %1$S произошла ошибка.
 notification.installError.retry = Попробовать снова
 notification.installError.retry.tooltip = Попробовать снова загрузить и установить это дополнение
-notification.openH264Pending = Будет скоро установлен.
+notification.gmpPending = %1$S будет скоро установлено.
 contributionAmount2 = Предложенная сумма взноса: %S
 installDownloading = Загружается
 installDownloaded = Загружено
@@ -58,7 +58,7 @@
 details.notification.install = %1$S будет установлено после перезапуска вами %2$S.
 details.notification.uninstall = %1$S будет удалено после перезапуска вами %2$S.
 details.notification.upgrade = %1$S будет обновлено после перезапуска вами %2$S.
-details.notification.openH264Pending = Будет скоро установлен.
+details.notification.gmpPending = %1$S будет скоро установлено.
 details.experiment.time.daysRemaining = Остался #1 день;Осталось #1 дня;Осталось #1 дней
 details.experiment.time.endsToday = Осталось менее суток
 details.experiment.time.daysPassed = #1 день назад;#1 дня назад;#1 дней назад
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:05:01.000000000 +0000
@@ -26,3 +26,4 @@
 <!ENTITY report.pageURL "Включить URL страницы">
 <!ENTITY plugin.file "Файл">
 <!ENTITY plugin.mimeTypes "Типы MIME">
+<!ENTITY plugin.flashProtectedMode.label "Включить защищённый режим Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/ru/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:44:04.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/ru/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:05:01.000000000 +0000
@@ -32,3 +32,4 @@
 cspBlocked = Приложение попыталось получить доступ к ресурсу, который имеет политику защиты содержимого, блокирующую данный способ его загрузки.
 corruptedContentError = Приложение не может продолжить загрузку, так как была обнаружена ошибка при передаче данных.
 remoteXUL = Приложение попыталось использовать неподдерживаемую технологию, которая более недоступна.
+sslv3Used = Это приложение не может гарантировать безопасность ваших данных на %S, так как он использует уязвимый протокол защиты SSLv3.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/b2g/chrome/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/b2g/chrome/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/b2g/chrome/overrides/appstrings.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/b2g/chrome/overrides/appstrings.properties	2015-02-28 15:05:05.000000000 +0000
@@ -34,3 +34,4 @@
 cspBlocked=Táto stránka obsahuje zásady ochrany obsahu, ktoré nepovoľujú tento spôsob jej načítania.
 corruptedContentError=Táto stránka nemohla byť zobrazená kvôli chybe pri prenose údajov.
 remoteXUL=Táto stránka používa nepodporovanú technológiu, ktorá nie je v predvolenom nastavení Firefoxu zapnutá.
+sslv3Used=Firefox nemôže garantovať bezpečnosť vašich údajov na stránke %S, pretože táto používa SSLv3, čo je prelomený bezpečnostný protokol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/appstrings.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/appstrings.properties	2015-02-28 15:05:05.000000000 +0000
@@ -33,3 +33,4 @@
 cspBlocked=Táto stránka obsahuje zásady ochrany obsahu, ktoré nepovoľujú tento spôsob jej načítania.
 corruptedContentError=Táto stránka nemohla byť zobrazená kvôli chybe pri prenose údajov.
 remoteXUL=Táto stránka používa nepodporovanú technológiu, ktorá nie je predvolene zapnutá.
+sslv3Used=Bezpečnosť vašich údajov na stránke %S nemôže byť garantovaná, pretože táto používa SSLv3, čo je prelomený bezpečnostný protokol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/dom/dom.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/dom/dom.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/dom/dom.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/dom/dom.properties	2015-02-28 15:05:05.000000000 +0000
@@ -153,8 +153,6 @@
 ImplicitMetaViewportTagFallback=Nebola nájdená značka meta-viewport. Túto značku je potrebné explicitne špecifikovať, aby sa zabránilo neočakávaným zmenám správania v budúcich verziách. Ďalšie informácie na https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
 DataContainerEventWarning=Používanie DataContainerEvent je zavrhnuté. Používajte radšej CustomEvent.
-# LOCALIZATION NOTE: Do not translate "sendAsBinary" or "send(Blob data)"
-SendAsBinaryWarning=Neštandardná metóda sendAsBinary je zavrhnutá a čoskoro bude odstránená. Používajte radšej metódu send(Blob data).
 # LOCALIZATION NOTE: Do not translate "window.controllers"
 Window_ControllersWarning=Používanie window.controllers je zavrhnuté. Nepoužívajte ju na detekciu UA.
 ImportXULIntoContentWarning=Importovanie uzlov XUL do obsahu dokumentu je zavrhnuté. Táto funkcionalita bude čoskoro odstránená.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/plugins.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/plugins.properties	2015-02-28 15:05:05.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (plugins.properties):
-#    Those strings are inserted into an HTML page, so you all HTML characters
+#    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=Zásuvné moduly
@@ -20,5 +20,11 @@
 description_label=Popis
 suffixes_label=Prípony
 
-openH264_name=Kodek OpenH264 Video poskytuje Cisco Systems, Inc.
-openH264_description=Prehráva webové video a používa sa pri video konverzáciách.
+# GMP Plugins
+gmp_license_info=Informácie o licencii
+
+openH264_name=Kodek OpenH264 Video od Cisco Systems, Inc.
+openH264_description=Prehráva webové video a využíva sa pri video konverzáciách
+
+eme-adobe_name=Modul na dekódovanie obsahu Primetime od Adobe Systems, Incorporated
+eme-adobe_description=Prehráva chránené webové video
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/security/csp.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/security/csp.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/dom/chrome/security/csp.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/dom/chrome/security/csp.properties	2015-02-28 15:05:05.000000000 +0000
@@ -50,9 +50,6 @@
 # LOCALIZATION NOTE (hostNameMightBeKeyword):
 # %1$S is the hostname in question and %2$S is the keyword
 hostNameMightBeKeyword = %1$S je interpretované ako názov servera, nie ako kľúčové slovo. Ak je to kľúčové slovo, použite '%2$S' (tj. v jednoduchých úvodzovkách).
-# LOCALIZATION NOTE (ignoringReportOnlyDirective):
-# %1$S is the directive that is ignore in report-only mode.
-ignoringReportOnlyDirective = Direktíva sandboxu '%1$S' sa ignoruje, ak je doručená v politike report-only.
 # LOCALIZATION NOTE (notSupportingDirective):
 # directive is not supported (e.g. 'reflected-xss')
 notSupportingDirective = Nepodporovaná direktíva '%1$S'. Direktíva a jej hodnoty budú ignorované.
@@ -73,6 +70,3 @@
 # LOCALIZATION NOTE (duplicateDirective):
 # %1$S is the name of the duplicate directive
 duplicateDirective = Bola zistená duplicitná direktíva %1$S. Všetky inštancie mimo prvej budú ignorované.
-# LOCALIZATION NOTE (couldntParseInvalidSandboxFlag):
-# %1$S is the option that could not be understood
-couldntParseInvalidSandboxFlag = Nebolo možné spracovať '%1$S', pretože je to neplatný príznak sandboxu
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/aboutDialog.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/aboutDialog.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -16,18 +16,35 @@
 <!ENTITY update.applyButtonBillboard.label        "Nainštalovať aktualizáciu…">
 <!ENTITY update.applyButtonBillboard.accesskey    "N">
 
+<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
+<!ENTITY warningDesc.version        "Zostavenie &brandShortName; je experimentálne a môže byť nestabilné.">
+<!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
+<!ENTITY warningDesc.telemetryDesc  "Zároveň spoločnosti &vendorShortName; automaticky odosiela údaje o výkonnosti, hardvérovej konfigurácii, využívaní funkcií a nastaveniach s cieľom vylepšiť budúce verzie klienta &brandShortName;.">
+
+<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
+<!ENTITY community.exp.start        "">
+<!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
+<!ENTITY community.exp.mozillaLink  "&vendorShortName;">
+<!ENTITY community.exp.middle       " je ">
+<!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
+<!ENTITY community.exp.creditsLink  "globálna komunita">
+<!ENTITY community.exp.end          " pracujúca s cieľom zachovať internet otvoreným, verejným a dostupným zdrojom pre všetkých.">
+
 <!ENTITY community.start2           "&brandShortName; vytvára ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "globálna komunita">
-<!ENTITY community.end2             " pracujúca s cieľom urobiť internet lepším. Veríme, že internet by mal byť otvorený, verejný a dostupný každému bez akýchkoľvek obmedzení.">
+<!ENTITY community.end3             " pracujúca s cieľom zachovať internet otvoreným, verejným a dostupným zdrojom pre všetkých.">
 
-<!ENTITY contribute.start           "Znie to zaujímavo? ">
-<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
-<!ENTITY contribute.getInvolvedLink "Zapojte sa!">
-<!ENTITY contribute.end             "">
+<!ENTITY helpus.start               "Chcete nám pomôcť? ">
+<!-- LOCALIZATION NOTE (helpus.donateLink): This is a link title that links to https://sendto.mozilla.org/page/contribute/Give-Now?source=mozillaorg_default_footer&ref=firefox_about&utm_campaign=firefox_about&utm_source=firefox&utm_medium=referral&utm_content=20140929_FireFoxAbout. -->
+<!ENTITY helpus.donateLink          "Zašlite svoj príspevok">
+<!ENTITY helpus.middle              " alebo ">
+<!-- LOCALIZATION NOTE (helpus.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY helpus.getInvolvedLink     "sa zapojte">
+<!ENTITY helpus.end                 ".">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Informácie o licenciách">
@@ -44,6 +61,8 @@
 <!ENTITY update.noUpdatesFound      "Používate najnovšiu verziu programu &brandShortName;">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Aktualizácie boli vypnuté správcom systému">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; sa práve aktualizuje v inej inštancii">
 
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/aboutDownloads.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/aboutDownloads.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/aboutDownloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/aboutDownloads.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -0,0 +1,21 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 aboutDownloads.title                      "Uložené súbory">
+<!ENTITY aboutDownloads.empty                      "Žiadne uložené súbory">
+<!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
+     cmd.showMac.accesskey):
+     The show and showMac commands are never shown together, thus they can share
+     the same access key (though the two access keys can also be different).
+     -->
+<!ENTITY cmd.show.label                            "Otvoriť priečinok so súborom">
+<!ENTITY cmd.show.accesskey                        "t">
+<!ENTITY cmd.showMac.label                         "Zobraziť vo Finderi">
+<!ENTITY cmd.showMac.accesskey                     "F">
+<!ENTITY cmd.open.label                            "Otvoriť">
+<!ENTITY cmd.open.accesskey                        "O">
+<!ENTITY cmd.removeFromHistory.label               "Odstrániť z histórie">
+<!ENTITY cmd.removeFromHistory.accesskey           "d">
+<!ENTITY cmd.clearDownloads.label                  "Vymazať zoznam prevzatých súborov">
+<!ENTITY cmd.clearDownloads.accesskey              "V">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -3,7 +3,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY addressbookWindow.title                        "Adresár">
-
+<!ENTITY blankResultsPaneMessage.label                  "Tento adresár zobrazuje kontakty až po vyhľadávaní">
+<!ENTITY localResultsOnlyMessage.label                  "Kontakty zo vzdialených adresárov nie sú zobrazené až pokiaľ nevykonáte hľadanie">
 <!-- File Menu -->
 <!ENTITY fileMenu.label                                 "Súbor">
 <!ENTITY fileMenu.accesskey                             "S">
@@ -160,6 +161,8 @@
 <!ENTITY searchItem.title                               "Rýchle vyhľadávanie">
 
 <!-- Results Pane -->
+<!ENTITY Addrbook.label                                 "Adresár">
+<!ENTITY Addrbook.accesskey                             "s">
 <!ENTITY GeneratedName.label                            "Meno">
 <!ENTITY GeneratedName.accesskey                        "M">
 <!ENTITY PrimaryEmail.label                             "E-mailová adresa">
@@ -185,7 +188,7 @@
 <!ENTITY HomePhone.label                                "Telefón domov">
 <!ENTITY HomePhone.accesskey                            "f">
 <!ENTITY WorkPhone.label                                "Telefón do zamestnania">
-<!ENTITY WorkPhone.accesskey                            "s">
+<!ENTITY WorkPhone.accesskey                            "i">
 <!ENTITY sortAscending.label                            "Vzostupne">
 <!ENTITY sortAscending.accesskey                        "V">
 <!ENTITY sortDescending.label                           "Zostupne">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-28 15:05:05.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/. -->
 
+<!ENTITY Addrbook.label                        "Adresár">
+<!ENTITY Addrbook.accesskey                    "s">
 <!ENTITY GeneratedName.label                   "Meno">
 <!ENTITY GeneratedName.accesskey               "M">
 <!ENTITY PrimaryEmail.label                    "E-mailová adresa">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/addressbook/addressBook.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/addressbook/addressBook.properties	2015-02-28 15:05:05.000000000 +0000
@@ -9,6 +9,8 @@
 lastFirstFormat=%S %S
 firstLastFormat=%S %S
 
+allAddressBooks=Všetky adresáre kontaktov
+
 newContactTitle=Nový kontakt
 # %S will be the contact's display name
 newContactTitleWithDisplayName=Nový kontakt %S
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/am-server-top.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/am-server-top.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -84,3 +84,7 @@
 
 <!ENTITY accountTitle.label "Nastavenia účtu">
 <!ENTITY accountSettingsDesc.label "Toto je špeciálny účet, s ktorým nie sú asociované žiadne identity.">
+<!ENTITY storeType.label "Spôsob ukladania správ:">
+<!ENTITY storeType.accesskey "S">
+<!ENTITY mboxStore.label "Jeden veľký súbor (mbox)">
+<!ENTITY maildirStore.label "Samostatný súbor pre každú správu (maildir)">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/chat.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/chat.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/chat.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/chat.properties	2015-02-28 15:05:05.000000000 +0000
@@ -92,4 +92,17 @@
 log.currentWeek=Tento týždeň
 log.previousWeek=Minulý týždeň
 
+# LOCALIZATION NOTE (messagePreview):
+# This is the default message preview to be shown
+# when the user has chosen not to show any info in the notification about the
+# incoming message being notified.
 messagePreview=Nová správa v konverzácii
+
+#LOCALIZATION NOTE (bundledMessagePreview):  Semi-colon list of plural forms.
+# Used when multiple incoming messages from the same sender are bundled
+# into a single notification.
+# #1 is the number of incoming messages the user is being notified about. When #1
+# is greater than one, the plural form after the semicolon is used.
+# Do not translate %1$S, it is the message preview to be shown in the
+# notification, i.e. the first incoming message.
+bundledMessagePreview=%1$S… (a #1 ďalšia správa);%1$S… (a #1 ďalšie správy);%1$S… (a #1 ďalších správ)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/filter.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/filter.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/filter.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/filter.properties	2015-02-28 15:05:05.000000000 +0000
@@ -24,6 +24,12 @@
 continueButtonLabel=Pokračovať
 cannotEnableFilter=Tento filter bol pravdepodobne vytvorený v novšej verzii programu. Nemožno ho povoliť, pretože táto verzia programu ho nevie použiť.
 dontWarnAboutDeleteCheckbox=Nabudúce sa už nepýtať
+
+# LOCALIZATION NOTE(filterFAilureWarningPrefix)
+# %1$S=filter error action
+# %2$S=error code as hexadecimal string.
+filterFailureWarningPrefix=Chybový kód=%2$S, akcia filtra "%1$S" zlyhala pri pokuse o:
+
 searchTermsInvalidTitle=Neplatné výrazy vyhľadávania
 # LOCALIZATION NOTE(searchTermsInvalidRule)
 # %1$S=search attribute name from the invalid rule
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/glodaComplete.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/glodaComplete.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/glodaComplete.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/glodaComplete.properties	2015-02-28 15:05:05.000000000 +0000
@@ -17,15 +17,3 @@
 #  a set of words, or a phrase containing multiple words (e.g. "red pepper")
 #  We use the same words in en-US, but maybe that's not always true.
 glodaComplete.messagesMentioningMany.label=Správy obsahujúce: #1
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
-#  autocomplete widget to refer to a search on the web for a short string
-#  containing at most 15 characters. #1 is the search provider to use. #2 is
-#  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label=Vyhľadať "#2" pomocou #1
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
-#  the autocomplete widget to refer to a search on the web for a short string
-#  containing more than 15 characters. #1 is the search provider to use. #2 is
-#  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label.truncated=Vyhľadať "#2" pomocou #1…
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/localMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/localMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/localMsgs.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/localMsgs.properties	2015-02-28 15:05:05.000000000 +0000
@@ -40,8 +40,6 @@
 # %2$S will receive the total number of messages
 receivedMsgs=Prijatých %1$S z %2$S správ
 
-pop3OutOfDiskSpace=Na disku nie je dostatok miesta na prevzatie nových správ. Vymažte starú poštu, vyprázdnite odpadkový kôš, vykonajte údržbu priečinkov a potom to skúste znova.
-
 # Status - parsing folder
 #LOCALIZATION NOTE (buildingSummary): Do not translate %s in the following line.
 # Place the word %s where the name of the mailbox should appear
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-28 15:05:05.000000000 +0000
@@ -9,162 +9,117 @@
 ## %S will be replaced with the name of file that could not be opened
 unableToOpenFile=Súbor %S nie je možné otvoriť.
 unableToOpenTmpFile=Dočasný súbor %S nie je možné otvoriť. Overte nastavenie priečinka pre dočasné súbory.
-
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Správa sa nedá uložiť ako šablóna.
-
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Správa sa nedá uložiť ako návrh.
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Priečinok Odoslaná pošta sa nedá otvoriť. Overte správnosť nastavení.
-
-## @name NS_MSG_NO_SENDER
-12510=Nie je uvedený odosielateľ. Vyplňte svoju e-mailovú adresu v nastaveniach účtu.
-
-## @name NS_MSG_NO_RECIPIENTS
-12511=Neuvedení adresáti. Zadajte adresáta do riadku Komu alebo diskusnú skupinu do riadku Diskusná skupina.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Chyba pri zápise dočasného súboru.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=Chyba pri odosielaní e-mailovej správy. Server odpovedal: %s.  Overte nastavenie vašej e-mailovej adresy v nastaveniach účtu a skúste to znova.
-
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=Chyba (SMTP) počas odosielania e-mailovej správy. Server odpovedal: %s
-
-## @name NS_ERROR_SENDING_MESSAGE
-12517=Chyba počas odosielania e-mailovej správy. Server odpovedal: %s. Skontrolujte správu a skúste znovu.
-
-## @name NS_ERROR_POST_FAILED
-12518=Správu sa nepodarilo odoslať, pretože sa nepodarilo spojiť s diskusným serverom. Server môže byť neprístupný alebo odmieta spojenie. Overte si, že vaše nastavenie diskusného servera je správne a skúste správu odoslať znova, alebo kontaktujte vášho správcu siete.
-
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=Chyba pri doručovaní neodoslanej pošty.
-
-## @name NS_ERROR_SEND_FAILED
-12520=Odoslanie správy zlyhalo.
-
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=Chyba pri odosielaní pošty: chyba SMTP servera. Server odpovedal: %s. Kontaktujte správcu e-mailového servera.
-
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Nepodarilo sa uložiť správu pre neskoršie odoslanie.
-
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=Nastala komunikačná chyba: %d. Skúste to znova.
-
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
-
-## @name NS_ERROR_TCP_READ_ERROR
-12528=Počas prenosu dát nastala chyba v sieti. (Chyba siete: %s). Skúste sa znova pripojiť.
-
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=Chyba pri odosielaní pošty: návratová adresa nie je správna. Overte, či je vaša e-mailová adresa správne zadaná v nastaveniach účtu a skúste to znova.
-
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Chyba prílohy.
-
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=Správa bola úspešne odoslaná, ale kopírovanie do priečinka Odoslaná pošta zlyhalo.
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=Naraz môžete odoslať správu len na jeden server diskusných skupín.
-
-## @name NS_MSG_CANCELLING
-12555=Ruší sa…
-
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Vaša správa bola odoslaná do diskusnej skupiny, ale nie ostatným adresátom.
-
-## @name NS_MSG_ERROR_READING_FILE
-12563=Chyba počas čítania súboru.
-
-## @name NS_FOLLOWUPTO_SENDER
+unableToSaveTemplate=Správa sa nedá uložiť ako šablóna.
+unableToSaveDraft=Správa sa nedá uložiť ako návrh.
+couldntOpenFccFolder=Priečinok Odoslaná pošta sa nedá otvoriť. Overte správnosť nastavení.
+noSender=Nie je uvedený odosielateľ. Vyplňte svoju e-mailovú adresu v nastaveniach účtu.
+noRecipients=Neuvedení adresáti. Zadajte adresáta do riadku Komu alebo diskusnú skupinu do riadku Diskusná skupina.
+errorWritingFile=Chyba pri zápise dočasného súboru.
+
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingFromCommand=Chyba pri odosielaní e-mailovej správy. Server odpovedal: %s.  Overte nastavenie vašej e-mailovej adresy v nastaveniach účtu a skúste to znova.
+
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingDataCommand=Chyba servera pre odosielanie pošty (SMTP) počas odosielania e-mailovej správy. Server odpovedal: %s
+
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=Chyba počas odosielania e-mailovej správy. Server odpovedal: %s. Skontrolujte správu a skúste znovu.
+postFailed=Správu sa nepodarilo odoslať, pretože sa nepodarilo spojiť s diskusným serverom. Server môže byť neprístupný alebo odmieta spojenie. Overte si, že vaše nastavenie diskusného servera je správne a skúste správu odoslať znova.
+errorQueuedDeliveryFailed=Chyba pri doručovaní neodoslanej pošty.
+sendFailed=Odoslanie správy zlyhalo.
+
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
+smtpServerError=Chyba pri odosielaní pošty: chyba servera pre odosielanie pošty (SMTP). Server odpovedal: %s\n.
+unableToSendLater=Ospravedlňujeme sa, vašu správu nebolo možné uložiť na jej neskoršie odoslanie.
+
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=Nastala komunikačná chyba: %d. Skúste to znova
+dontShowAlert=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=Počas prenosu dát nastala chyba v sieti. (Chyba siete: %s). Skúste sa znova pripojiť.
+couldNotGetUsersMailAddress=Chyba pri odosielaní pošty: návratová adresa nie je správna. Overte, či je vaša e-mailová adresa správne zadaná v nastaveniach účtu a skúste to znova.
+mimeMpartAttachmentError=Chyba prílohy.
+failedCopyOperation=Správa bola úspešne odoslaná, ale jej kopírovanie do priečinka Odoslaná pošta zlyhalo.
+nntpNoCrossPosting=Naraz môžete odoslať správu len na jeden server diskusných skupín.
+msgCancelling=Ruší sa…
+sendFailedButNntpOk=Vaša správa bola odoslaná do diskusnej skupiny, ale nie ostatným adresátom.
+errorReadingFile=Chyba počas čítania súboru.
 followupToSenderMessage=Autor tejto správy žiada, aby sa odpovede posielali iba jemu. Ak chcete odoslať odpoveď aj diskusnej skupine, zvoľte na novom riadku v paneli adries typ adresáta "Diskusná skupina" a zadajte adresu diskusnej skupiny.
 
-## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=Pri pokuse o pripojenie súboru %S sa vyskytla chyba. Skontrolujte, či máte k súboru prístup.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of the object to be attached
+errorAttachingFile=Pri pokuse o pripojenie súboru %S sa vyskytla chyba. Skontrolujte, či máte k súboru prístup.
 
-## @name NS_ERROR_SMTP_GREETING
-12572=Pri odosielaní správy sa vyskytla chyba: Poštový server zaslal chybnú hlavičku s pozdravom:  %s.
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
+incorrectSmtpGreeting=Pri odosielaní správy sa vyskytla chyba: Poštový server zaslal chybnú hlavičku s pozdravom: %s.
 
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=Pri odosielaní správy sa vyskytla chyba. Odpoveď poštového servera:  %1$s. Skontrolujte príjemcu správy %2$s a skúste to znova.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
+errorSendingRcptCommand=Pri odosielaní správy sa vyskytla chyba. Odpoveď poštového servera:\n%1$S.\nSkontrolujte príjemcu správy "%2$S" a skúste to znova.
 
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=Pri odosielaní správy sa vyskytla chyba: Nepodarilo sa nadviazať zabezpečené spojenie so serverom SMTP %S použitím STARTTLS, pretože túto funkciu nepodporuje. Vypnite STARTTLS pre tento server alebo kontaktujte poskytovateľa služby.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
+startTlsFailed=Pri odosielaní správy sa vyskytla chyba: Nepodarilo sa nadviazať zabezpečené spojenie so serverom pre odosielanie pošty (SMTP) %S použitím STARTTLS, pretože túto funkciu nepodporuje. Vypnite STARTTLS pre tento server alebo kontaktujte poskytovateľa služby.
 
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=Pri odosielaní správy sa vyskytla chyba: Nie je možné získať heslo pre %S. Správa nebola odoslaná.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
+smtpPasswordUndefined=Pri odosielaní správy sa vyskytla chyba: Nie je možné získať heslo pre %S. Správa nebola odoslaná.
 
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=Veľkosť správy, ktorú sa pokúšate odoslať, presiahla dočasný limit servera. Správa nebola odoslaná. Zmenšite veľkosť správy alebo chvíľu počkajte a skúste to znova. Server odpovedal:  %s.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=Veľkosť správy, ktorú sa pokúšate odoslať, presiahla dočasný limit servera. Správa nebola odoslaná. Zmenšite veľkosť správy alebo chvíľu počkajte a skúste to znova. Server odpovedal:  %s.
 
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=Veľkosť správy, ktorú sa pokúšate odoslať, presahuje globálny limit servera (%d bajtov). Správa nebola odoslaná. Zmenšite veľkosť správy a skúste to znova.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=Veľkosť správy, ktorú sa pokúšate odoslať, presahuje globálny limit servera (%d bajtov). Správa nebola odoslaná. Zmenšite veľkosť správy a skúste to znova.
 
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=Veľkosť správy, ktorú sa pokúšate odoslať, presiahla globálny limit servera. Správa nebola odoslaná. Zmenšite veľkosť správy a skúste to znova. Server odpovedal:  %s.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the Outgoing server (SMTP) response
+smtpPermSizeExceeded2=Veľkosť správy, ktorú sa pokúšate odoslať, presiahla globálny limit servera. Správa nebola odoslaná. Zmenšite veľkosť správy a skúste to znova. Server odpovedal:  %s.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=Počas odosielania správy sa vyskytla chyba: server SMTP %S je neznámy. Server môže byť nesprávne nakonfigurovaný. Overte správnosť nastavení servera SMTP a skúste to znova.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownServer=Počas odosielania správy sa vyskytla chyba: server pre odosielanie pošty (SMTP) %S je neznámy. Server môže byť nesprávne nakonfigurovaný. Overte správnosť nastavení servera pre odosielanie pošty (SMTP) a skúste to znova.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=Správa nemohla byť odoslaná, pretože pripojenie k serveru SMTP %S zlyhalo. Server môže byť nedostupný alebo odmieta pripojenia typu SMTP. Overte správnosť nastavení servera SMTP a skúste to znova, alebo kontaktujte správcu servera.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRefused=Správa nemohla byť odoslaná, pretože pripojenie k serveru pre odosielanie pošty (SMTP) %S zlyhalo. Server môže byť nedostupný alebo odmieta pripojenia typu SMTP. Overte správnosť nastavení servera pre odosielanie pošty (SMTP) a skúste to znova.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=Správa nemohla byť odoslaná, pretože pripojenie k serveru SMTP %S bolo počas prenosu prerušené. Skúste to znova alebo kontaktujte vášho správcu siete.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
+smtpSendInterrupted=Správa nemohla byť odoslaná, pretože pripojenie k serveru pre odosielanie pošty (SMTP) %S bolo počas prenosu prerušené. Skúste to znova.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=Správa nemohla byť odoslaná, pretože časový limit pripojenia k serveru SMTP %S vypršal. Skúste to znova alebo kontaktujte vášho správcu siete.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
+smtpSendTimeout=Správa nemohla byť odoslaná, pretože časový limit pripojenia k serveru pre odosielanie pošty (SMTP) %S vypršal. Skúste to znova.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=Správa nemohla byť z neznámeho dôvodu odoslaná použitím servera SMTP %S. Overte správnosť nastavení servera SMTP a skúste to znova, alebo kontaktujte vášho správcu siete.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownReason=Správa nemohla byť z neznámeho dôvodu odoslaná použitím servera pre odosielanie pošty (SMTP) %S. Overte správnosť nastavení servera pre odosielanie pošty (SMTP) a skúste to znova.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=Server SMTP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Heslo odosielané nezabezpečene'. Ak toto predtým fungovalo a teraz náhle prestalo, je možné, že sa niekto pokúša získať vaše heslo.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainNoSsl=Server pre odosielanie pošty (SMTP) %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Heslo odosielané nezabezpečene'. Ak toto predtým fungovalo a teraz náhle prestalo, je možné, že sa niekto získal vaše heslo.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12595): $S is server hostname
-12595=Server SMTP %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Normálne heslo'. Ak toto predtým fungovalo a teraz náhle prestalo, kontaktujte správcu e-mailového servera alebo poskytovateľa e-mailovej služby.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainSsl=Server pre odosielanie pošty (SMTP) %S zdá sa nepodporuje šifrované heslá. Ak ste si práve nastavili tento účet, skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Normálne heslo'.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12596): $S is server hostname
-12596=Server SMTP %S nepovoľuje nezašifrované heslá. Skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Zašifrované heslo'.
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
+smtpAuthChangePlainToEncrypt=Server pre odosielanie pošty (SMTP) %S nepovoľuje nezašifrované heslá. Skúste zmeniť nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Nastavenie servera' na 'Zašifrované heslo'.
 
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Nebolo možné overenie na serveri SMTP %S. Skontrolujte heslo a overte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Server pre odosielanie pošty (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
+smtpAuthFailure=Nebolo možné overenie na serveri pre odosielanie pošty (SMTP) %S. Skontrolujte heslo a overte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Server pre odosielanie pošty (SMTP)'.
 
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=Tiket Kerberos/GSSAPI nebol serverom SMTP %S akceptovaný. Skontrolujte, či ste prihlásený k doméne Kerberos/GSSAPI realm.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
+smtpAuthGssapi=Tiket Kerberos/GSSAPI nebol serverom pre odosielanie pošty (SMTP) %S akceptovaný. Skontrolujte, či ste prihlásený k doméne Kerberos/GSSAPI realm.
 
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=Server SMTP %S nepodporuje zvolenú metódu overenia. Zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Server pre odosielanie pošty (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
+smtpAuthMechNotSupported=Server pre odosielanie pošty (SMTP) %S nepodporuje zvolenú metódu overenia. Zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Server pre odosielanie pošty (SMTP)'.
 
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=Nebolo možné overenie na serveri SMTP %S. Server nepodporuje žiadnu metódu overenia (SMTP-AUTH), ale vy ste zvolili jej použitie. Zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Server pre odosielanie pošty (SMTP)' na 'Žiadne' alebo kontaktujte poskytovateľa e-mailovej služby.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
+smtpAuthNotSupported=Nebolo možné overenie na serveri pre odosielanie pošty (SMTP) %S. Server nepodporuje žiadnu metódu overenia (SMTP-AUTH), ale vy ste zvolili jej použitie. Zmeňte nastavenie 'Metóda overenia' v okne 'Nastavenia účtov | Server pre odosielanie pošty (SMTP)' na 'Žiadne' alebo kontaktujte poskytovateľa e-mailovej služby.
 
-## @name NS_ERROR_ILLEGAL_LOCALPART
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=V časti adresy príjemcu %s sa nachádzajú nepodporované znaky mimo sady ASCII. Upravte adresu a skúste to znova.
 
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
 saveDlogTitle=Uloženie správy
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
 saveDlogMessages=Správa nebola odoslaná. Chcete ju uložiť do priečinka s návrhmi (%1$S)?
 
 ## generics string
 defaultSubject=(bez predmetu)
 chooseFileToAttach=Priložiť súbor
-
-genericFailureExplanation=Overte správnosť nastavení svojho účtu pre poštu a diskusie a skúste znova.
+genericFailureExplanation=Overte správnosť nastavení svojho účtu a skúste znova.
 
 ## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
 undisclosedRecipients=utajeni adresati
@@ -182,21 +137,22 @@
 sendWithEmptySubjectButton=&Odoslať bez predmetu
 cancelSendingButton=&Zrušiť odoslanie
 
-## Strings used by the dialog that informs about lack of newsgroup support.
+## Strings used by the dialog that informs about the lack of newsgroup support.
 noNewsgroupSupportTitle=Diskusné skupiny nie sú podporované
 recipientDlogMessage=Tento účet podporuje iba príjemcov e-mailov. Pri pokračovaní budú diskusné skupiny ignorované.
 
-## Strings used by the alert that tells the user an e-mail address is invalid.
+## Strings used by the alert that tells the user that an e-mail address is invalid.
 addressInvalidTitle=Neplatná adresa príjemcu
 addressInvalid=%1$S nie je platná e-mailová adresa, pretože nemá správny formát (používateľ@server). Pred odoslaním ju musíte opraviť.
 
-## String used by the dialog that ask the user to attach a web page
+## String used by the dialog that asks the user to attach a web page
 attachPageDlogTitle=Zadajte adresu, ktorá sa má priložiť
 attachPageDlogMessage=Webová stránka (URL):
 
-## String used for attachment pretty name, when attachment is a message
+## String used for attachment pretty name, when the attachment is a message
 messageAttachmentSafeName=Priložená správa
-## String used for attachment pretty name, when attachment is message part
+
+## String used for attachment pretty name, when the attachment is a message part
 partAttachmentSafeName=Časť priloženej správy
 
 # LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
@@ -211,73 +167,75 @@
 ## String used if a file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=Pripojenie súboru
+
 ## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
 errorFileAttachMessage=Súbor %1$S neexistuje a preto nemohol byť pripojený k správe.
 
-## Strings used by Save as Draft/Template dialog
+## Strings used by the Save as Draft/Template dialog
 SaveDialogTitle=Uloženie správy
-## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
+
+## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
 SaveDialogMsg=Vaša správa bola uložená do priečinka %1$S servera %2$S.
 CheckMsg=Nabudúce toto okno nezobrazovať
 
-## Strings used by prompt when Quitting while in progress
+## Strings used by the prompt when Quitting while in progress
 quitComposeWindowTitle=Odoslanie správy
+
 ## LOCALIZATION NOTE (quitComposeWindowMessage2): don't translate \n
 quitComposeWindowMessage2=%1$S práve odosiela správu.\nChcete pred ukončením počkať, kým bude správa korektne odoslaná?
 quitComposeWindowQuitButtonLabel2=S&končiť
 quitComposeWindowWaitButtonLabel2=&Počkať
 quitComposeWindowSaveTitle=Ukladanie správy
+
 ## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
 quitComposeWindowSaveMessage=%1$S práve ukladá správu.\nChcete pred ukončením počkať, kým bude správa korektne uložená?
 
-## Strings used by prompt for Ctrl-Enter check before sending message
+## Strings used by the prompt for Ctrl-Enter check before sending message
 sendMessageCheckWindowTitle=Odoslanie správy
 sendMessageCheckLabel=Naozaj chcete odoslať túto správu?
 sendMessageCheckSendButtonLabel=Odoslať
-
 assemblingMessageDone=Správa sa zostavuje… Hotovo
 assemblingMessage=Správa sa zostavuje…
-
 smtpDeliveringMail=Správa sa odosiela…
 smtpMailSent=Správa bola úspešne odoslaná
-
 assemblingMailInformation=Zostavujú sa informácie o pošte…
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
+
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is the file name/URI of attachment
 gatheringAttachment=Prikladá sa %S…
 creatingMailMessage=Vytvára sa e-mailová správa…
 
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
+## LOCALIZATION NOTE (copyMessageStart): argument %S is the folder name
 copyMessageStart=Správa sa kopíruje do priečinka %S…
 copyMessageComplete=Kopírovanie dokončené
 copyMessageFailed=Kopírovanie zlyhalo
-
 filterMessageComplete=Filtrovanie dokončené.
 filterMessageFailed=Filtrovanie zlyhalo.
 
 ## LOCALIZATION NOTE (largeMessageSendWarning):
 ## Do not translate %S. It is the size of the message in user-friendly notation.
 largeMessageSendWarning=Pozor! Chystáte sa odoslať správu s veľkosťou %S, ktorá môže prekročiť povolený limit poštového servera. Naozaj chcete pokračovať?
-
 sendingMessage=Správa sa odosiela…
 sendMessageErrorTitle=Chyba pri odosielaní správy
 postingMessage=Správa sa uverejňuje…
-
 sendLaterErrorTitle=Chyba pri odložení odoslania
 saveDraftErrorTitle=Chyba pri ukladaní návrhu
 saveTemplateErrorTitle=Chyba pri ukladaní šablóny
 
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSaving=Nastal problém pri pripájaní súboru %.200S k e-mailovej správe. Chcete pokračovať a uložiť správu bez tohto súboru?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSending=Nastal problém pri pripájaní súboru %.200S k e-mailovej správe. Chcete pokračovať a odoslať správu bez tohto súboru?
 returnToComposeWindowQuestion=Chcete sa vrátiť do okna na úpravu správy?
 
 ## reply header in composeMsg
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is the author (name of the person replying to)
 mailnews.reply_header_authorwrotesingle=#1 napísal(a):
-## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_ondateauthorwrote=Dňa #2 o #3 #1 napísal(a):
-## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_authorwroteondate=#1 napísal(a) dňa #2 o #3:
 
 ## reply header in composeMsg
@@ -294,7 +252,7 @@
 
 ## Attachment Reminder
 ## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
-##   words that that should trigger an attachment reminder.
+## words that should trigger an attachment reminder.
 mail.compose.attachment_reminder_keywords=príloha,prílohu,prílohe,priloha,prilohu,prilohe,.doc,.pdf,.xls,.ppt,.rtf,.pps,zivotopis,životopis
 
 addAttachmentButton=Pridať prílohu…
@@ -304,6 +262,7 @@
 
 attachmentReminderTitle=Upozornenie na prílohu
 attachmentReminderMsg=Nezabudli ste priložiť prílohu?
+
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of keywords
@@ -315,6 +274,7 @@
 # Strings used by the Filelink offer notification bar.
 learnMore.label=Ďalšie informácie…
 learnMore.accesskey=m
+
 # LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of big attached files
@@ -323,10 +283,8 @@
 bigFileShare.accesskey=V
 bigFileAttach.label=Ignorovať
 bigFileAttach.accesskey=i
-
 bigFileChooseAccount.title=Výber služby
 bigFileChooseAccount.text=Zvoľte službu, kam vložíte prílohu
-
 bigFileHideNotification.title=Neodosielať moje súbory
 bigFileHideNotification.text=Ak k tejto správe priložíte ďalšie veľké súbory, program už na to nebude upozorňovať.
 bigFileHideNotification.check=Túto správu už viac nezobrazovať.
@@ -335,6 +293,7 @@
 # %S. %S is the display name for the cloud account the attachment is being
 # uploaded to.
 cloudFileUploadingTooltip=Prebieha odosielanie do služby %S…
+
 # LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
 # %S. %S is the display name for the cloud account the attachment was uploaded
 # to.
@@ -347,11 +306,12 @@
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word %S. Place the word %S where the host name should appear.
 smtpEnterPasswordPrompt=Zadajte heslo pre %S:
+
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Zadajte heslo pre %2$S na %1$S:
-smtpEnterPasswordPromptTitle=Vyžadované heslo k serveru SMTP
+smtpEnterPasswordPromptTitle=Vyžadované heslo k serveru pre odosielanie pošty (SMTP)
 
 # LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
@@ -360,16 +320,15 @@
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg=Pri ukladaní správy do priečinka %S sa vyskytla chyba. Skúsiť znova?
-
 errorFilteringMsg=Vaša správa bola odoslaná a uložená, ale pri spúšťaní filtrov na tejto správe sa vyskytla chyba.
-
 errorCloudFileAuth.title=Chyba overenia
+
 ## LOCALIZATION NOTE(errorCloudFileAuth.message):
-## %1$S is the name of the online storage service that authentication failed against.
+## %1$S is the name of the online storage service against which the authentication failed.
 errorCloudFileAuth.message=Nebolo možné overenie na službe %1$S.
 errorCloudFileUpload.title=Chyba odoslania
 ## LOCALIZATION NOTE(errorCloudFileUpload.message):
-## %1$S is the name of the online storage service that uploading failed against.
+## %1$S is the name of the online storage service against which the uploading failed.
 ## %2$S is the name of the file that failed to upload.
 errorCloudFileUpload.message=Nebolo možné odoslať súbor %2$S do služby %1$S.
 errorCloudFileQuota.title=Chyba kvóty
@@ -378,25 +337,28 @@
 ## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
 errorCloudFileQuota.message=Odoslanie súboru %2$S do služby %1$S by vyčerpalo voľné miesto pre váš účet.
 errorCloudFileNameLimit.title=Chyba názvu súboru
+
 ## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to the excess file name length
 errorCloudFileNameLimit.message=Súbor %2$S, ktorý chcete odoslať do úložiska služby %1$S, obsahuje vo svojom názve viac ako 120 znakov. Premenujte súbor tak, aby mal menej ako 120 znakov a skúste to znova.
 errorCloudFileLimit.title=Chyba veľkosti súboru
+
 ## LOCALIZATION NOTE(errorCloudFileLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to size restrictions.
 errorCloudFileLimit.message=Súbor %2$S presahuje maximálnu povolené veľkosť súboru pre službu %1$S.
 errorCloudFileOther.title=Neznáma chyba
+
 ## LOCALIZATION NOTE(errorCloudFileOther.message):
 ## %1$S is the name of the online storage service that cannot be communicated with.
 errorCloudFileOther.message=Pri komunikácii so službou %1$S sa vyskytla neznáma chyba.
 errorCloudFileDeletion.title=Chyba pri odstraňovaní
+
 ## LOCALIZATION NOTE(errorCloudFileDeletion.message):
 ## %1$S is the name of the online storage service that the file is to be deleted from.
 ## %2$S is the name of the file that failed to be deleted.
 errorCloudFileDeletion.message=Pri odstraňovaní súboru %2$S zo služby %1$S sa vyskytla chyba.
-
 errorCloudFileUpgrade.label=Aktualizovať
 
 ## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
@@ -411,7 +373,7 @@
 cloudAttachmentListFooter=%1$S umožňuje jednoduché zdieľanie veľkých súborov prostredníctvom e-mailu.
 
 ## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
-## attachment, to be inserted into the message body. Do not translate the words
+## attachment to be inserted into the message body. Do not translate the words
 ## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
 ## %3$S is the name of the cloud storage service, and %4$S is the link to the
 ## attachment.
@@ -421,7 +383,6 @@
 ## upload notification bar to allow the user to dismiss the notification permanently.
 stopShowingUploadingNotification.accesskey=V
 stopShowingUploadingNotification.label=Viac nezobrazovať
-
 replaceButton.label=Nahradiť…
 replaceButton.accesskey=N
 replaceButton.tooltip=Zobraziť okno Hľadať a nahradiť
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/messenger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/messenger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/messenger.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/messenger.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -145,6 +145,8 @@
 <!ENTITY messagePaneVertical.accesskey "Z">
 <!ENTITY showFolderPaneCmd.label "Panel priečinkov">
 <!ENTITY showFolderPaneCmd.accesskey "a">
+<!ENTITY showFolderPaneColsCmd.label "Stĺpce panela priečinkov">
+<!ENTITY showFolderPaneColsCmd.accesskey "S">
 <!ENTITY showMessageCmd.label "Panel správy">
 <!ENTITY showMessageCmd.accesskey "P">
 
@@ -593,7 +595,9 @@
 <!ENTITY manageTags.accesskey "S">
 
 <!-- Folder Pane -->
-<!ENTITY folderColumn.label "Názov:">
+<!ENTITY folderNameColumn.label "Názov">
+<!ENTITY folderUnreadColumn.label "Neprečítané">
+<!ENTITY folderTotalColumn.label "Celkom">
 <!ENTITY folderSizeColumn.label "Veľkosť">
 
 <!-- Folder Pane Context Menu -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/messenger.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/messenger.properties	2015-02-28 15:05:05.000000000 +0000
@@ -83,6 +83,7 @@
 alertFilterCheckbox=Toto upozornenie nabudúce nezobrazovať
 compactFolderDeniedLock=Nie je možné vykonať údržbu priečinka '%S', pretože práve prebieha iná operácia. Skúste neskôr.
 compactFolderWriteFailed=Nie je možné vykonať údržbu priečinka '%S', pretože do priečinka sa nedá zapisovať. Overte, či je na disku dostatok voľného miesta a máte právo na zápis, potom to skúste znova.
+compactFolderInsufficientSpace=Pre niektoré priečinky (napr. '%S') nebolo možné vykonať údržbu, pretože nie je dostatok voľného miesta. Odstráňte niektoré súbory a skúste to znova.
 filterFolderHdrAddFailed=Správy sa nedajú filtrovať do priečinka '%S', pretože pridanie správy do tohto priečinka zlyhalo. Overte, že priečinok sa zobrazuje korektne, prípadne sa ho pokúste opraviť pomocou funkcie vo vlastnostiach priečinka.
 filterFolderWriteFailed=Správy sa nedajú filtrovať do priečinka '%S', pretože do priečinka sa nedá zapisovať. Overte, či je na disku dostatok voľného miesta a máte právo na zápis, potom to skúste znova.
 copyMsgWriteFailed=Správy sa nepodarilo presunúť alebo skopírovať do priečinka '%S', pretože zapisovanie do priečinka zlyhalo. Ak chcete zvýšiť voľné miesto na disku, najprv zvoľte z ponuky Súbor položku Vyprázdniť kôš a následne Vykonať údržbu priečinkov. Potom to skúste znova.
@@ -95,6 +96,7 @@
 filterFolderTruncateFailed=Po presunutí správy do priečinka '%1$S' nastala chyba spracovania priečinka Doručená pošta. Pravdepodobne bude potrebné ukončiť aplikáciu %2$S a odstrániť súbor INBOX.msf.
 
 mailboxTooLarge=Priečinok %S je plný a nie je možné, aby obsahoval viac správ. Na vytvorenie priestoru pre ďalšie správy odstráňte niektoré staré alebo nevyžiadané správy a vykonajte údržbu priečinka.
+outOfDiskSpace=Na disku nie je dostatok miesta na prevzatie nových správ. Vymažte starú poštu, vyprázdnite odpadkový kôš, vykonajte údržbu priečinkov a potom to skúste znova.
 errorGettingDB=Nemožno otvoriť súbor súhrnu pre %S. Možno ide o chybu na disku alebo cesta k súboru je príliš dlhá.
 defaultServerTag=(predvolené)
 
@@ -124,9 +126,16 @@
 authKerberos=Kerberos / GSSAPI
 authExternal=Certifikát TLS
 authNTLM=NTLM
+authOAuth2=OAuth2
 authAnySecure=ktorákoľvek zabezpečená metóda (zavrhnuté)
 authAny=ktorákoľvek metóda (nebezpečné)
 
+# OAuth2 window title
+# LOCALIZATION NOTE(oauth2WindowTitle):
+# %1$S is the username (or full email address) used for authentication.
+# %2$S is the hostname of the account being authenticated.
+oauth2WindowTitle=Zadajte prihlasovacie údaje pre %1$S na serveri %2$S
+
 # LOCALIZATION NOTES(serverType-nntp): Do not translate "NNTP" in the line below
 serverType-nntp=Server diskusných skupín (NNTP)
 # LOCALIZATION NOTES(serverType-pop3): Do not translate "POP" in the line below
@@ -481,6 +490,22 @@
 megaByteAbbreviation2=%.*f MB
 gigaByteAbbreviation2=%.*f GB
 
+## LOCALIZATION NOTE(folderWithAccount):
+## This is used to show folder name together with an account name.
+## %1$S = folder name
+## %2$S = account name
+folderWithAccount=%1$S - %2$S
+## LOCALIZATION NOTE(folderWithUnreadMsgs):
+## This is a concatenation of two strings to compose a folder label with unread messages.
+## %1$S = folder name
+## %2$S = count of unread messages
+folderWithUnreadMsgs=%1$S (%2$S)
+## LOCALIZATION NOTE(summarizedValue):
+## This string shows an indication that the value shown is actually a summary
+## accumulated from all subfolders.
+## %S = summarized value from all subfolders
+folderSummarizedValue=*%S
+
 # Error message if message for a message id wasn't found
 errorOpenMessageForMessageIdTitle=Chyba pri otváraní message-id
 errorOpenMessageForMessageIdMessage=Správa pre message-id %S nebola nájdená
@@ -719,9 +744,6 @@
 update.downloadAndInstallButton.label=Aktualizovať na v.%S
 update.downloadAndInstallButton.accesskey=A
 
-websearch.setDefault=Nastaviť tento vyhľadávací modul ako predvolený
-websearch.isDefault=Tento vyhľadávací modul je aktuálne nastavený ako predvolený.
-
 outdatedpluginsMessage.title=Niektoré zásuvné moduly používané touto stránkou sú zastarané.
 outdatedpluginsMessage.updateButton.label=Aktualizovať zásuvné moduly…
 outdatedpluginsMessage.updateButton.accesskey=A
@@ -773,3 +795,15 @@
 ignoredSubthreadsFeedback=Príspevky do zvoleného podvlákna nebudú zobrazované.;Príspevky do #1 zvolených podvlákien nebudú zobrazované.;Príspevky do #1 zvolených podvlákien nebudú zobrazované.
 # LOCALIZATION NOTE (saveAsType): replace %S with the extension of the file to be saved.
 saveAsType=Súbor %S
+
+# LOCALIZATION NOTE (openSearch.label): The label used in the autocomplete
+# widget to refer to a search on the web for a short string containing at most
+# 15 characters. %1$S is the search provider to use. %2$S is the string to
+# search for.
+openSearch.label=Vyhľadať "%2$S" pomocou %1$S
+
+# LOCALIZATION NOTE (openSearch.label.truncated): The label used in the
+# autocomplete widget to refer to a search on the web for a short string
+# containing more than 15 characters. %1$S is the search provider to use. %2$S
+# is the string to search for, truncated to 15 characters.
+openSearch.label.truncated=Vyhľadať "%2$S…" pomocou %1$S…
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -3,6 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY itemGeneral.label              "Všeobecné">
+<!ENTITY dataChoicesTab.label           "Odosielanie údajov">
 <!ENTITY itemDisplay.label              "Čítanie a zobrazenie">
 <!ENTITY itemUpdate.label               "Aktualizácie">
 <!ENTITY itemNetworking.label           "Sieť a miesto na disku">
@@ -10,13 +11,14 @@
 
 <!-- General Settings -->
 
-<!ENTITY submitTelemetry.label         "Odosielať údaje o výkonnosti">
-<!ENTITY submitTelemetry.accesskey     "d">
-<!ENTITY telemetryInfoLink.label       "Ďalšie informácie o údajoch výkonnosti">
 <!ENTITY enableGlodaSearch.label       "Povoliť globálne vyhľadávanie a indexovanie správ">
 <!ENTITY enableGlodaSearch.accesskey   "o">
 <!ENTITY allowHWAccel.label            "Použiť hardvérové urýchľovanie (ak je dostupné)">
 <!ENTITY allowHWAccel.accesskey        "h">
+<!ENTITY storeType.label               "Spôsob ukladania správ pre nové účty:">
+<!ENTITY storeType.accesskey           "b">
+<!ENTITY mboxStore.label               "Jeden veľký súbor (mbox)">
+<!ENTITY maildirStore.label            "Samostný súbor pre každú správu (maildir)">
 
 <!ENTITY scrolling.label               "Posúvanie obsahu">
 <!ENTITY useAutoScroll.label           "Použiť automatický posun">
@@ -38,6 +40,19 @@
 <!ENTITY showReturnReceipts.label       "Potvrdenia o prečítaní…">
 <!ENTITY showReturnReceipts.accesskey   "P">
 
+<!-- Data Choices -->
+<!ENTITY telemetrySection.label          "Telemetria">
+<!ENTITY telemetryDesc.label             "Zdieľa údaje o výkonnosti, využívaní funkcií, hardvérovej konfigurácii a prispôsobení e-mailového klienta so spoločnosťou &vendorShortName; s cieľom urobiť &brandShortName; lepším.">
+<!ENTITY enableTelemetry.label           "Povoliť telemetriu">
+<!ENTITY enableTelemetry.accesskey       "t">
+<!ENTITY telemetryLearnMore.label        "Ďalšie informácie">
+
+<!ENTITY crashReporterSection.label      "Správy o zlyhaní">
+<!ENTITY crashReporterDesc.label         "&brandShortName; odosiela správy o zlyhaní s cieľom pomôcť spoločnosti &vendorShortName; urobiť e-mailový klient stabilnejším a bezpečnejším.">
+<!ENTITY enableCrashReporter.label       "Povoliť správy o zlyhaní">
+<!ENTITY enableCrashReporter.accesskey   "z">
+<!ENTITY crashReporterLearnMore.label    "Ďalšie informácie">
+
 <!-- Display and Reading Settings -->
 <!ENTITY reading.caption                "Čítanie">
 <!ENTITY display.caption                "Zobrazenie">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/compose.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/compose.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/compose.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/compose.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -6,6 +6,8 @@
 <!ENTITY itemAutoComplete.label              "Adresovanie">
 <!ENTITY itemSpellCheck.label                "Pravopis">
 
+<!ENTITY dialogCompose.title                 "Písanie správ">
+
 <!ENTITY forwardMsg.label                    "Správy odosielať ďalej:">
 <!ENTITY forwardMsg.accesskey                "S">
 <!ENTITY inline.label                        "V texte">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/general.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/general.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/general.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/general.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -35,3 +35,5 @@
 <!ENTITY customsound.accesskey            "n">
 <!ENTITY browse.label                     "Prehľadávať…">
 <!ENTITY browse.accesskey                 "P">
+
+<!ENTITY defaultSearchEngine.label        "Predvolený vyhľadávací modul">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/offline.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/offline.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/offline.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/offline.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -11,8 +11,8 @@
 <!ENTITY radioRememberPrevState.accesskey "P">
 <!ENTITY radioAskState.label "Opýtať sa na stav online/offline">
 <!ENTITY radioAskState.accesskey "O">
-<!ENTITY radioAlwaysOnline.label "Online">
-<!ENTITY radioAlwaysOnline.accesskey "l">
+<!ENTITY radioAlwaysOnlineState.label "Online">
+<!ENTITY radioAlwaysOnlineState.accesskey "l">
 <!ENTITY radioAlwaysOffline.label "Offline">
 <!ENTITY radioAlwaysOffline.accesskey "f">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/preferences.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/preferences.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/mail/chrome/messenger/preferences/preferences.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/mail/chrome/messenger/preferences/preferences.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -17,3 +17,7 @@
 <!ENTITY panePrivacy.title        "Súkromie">
 <!ENTITY paneSecurity.title       "Bezpečnosť">
 <!ENTITY paneAdvanced.title       "Spresnenie">
+<!ENTITY paneAccount.title        "Účty">
+
+<!ENTITY okButton.title           "OK">
+<!ENTITY okButton.accesskey       "O">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pipnss/nsserrors.properties	2015-02-28 15:05:05.000000000 +0000
@@ -317,3 +317,4 @@
 MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=Pri vydávaní certifikátu servera bol použitý certifikát X.509 verzia 1, ktorý nie je dôveryhodným certifikátom. Certifikáty X.509 verzia 1 sú zavrhnuté a nemali by byť používané na podpisovanie iných certifikátov.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=Server poskytol certifikát, ktorý ešte nie je platný.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=Na vydanie certifikátu servera bol použitý certifikát, ktorý ešte nie je platný.
+MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=Algoritmus podpisu sa v podpisovom poli certifikátu nezhoduje s algoritmom v poli signatureAlgorithm.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pipnss/pipnss.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pipnss/pipnss.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pipnss/pipnss.properties	2015-02-28 15:05:05.000000000 +0000
@@ -267,7 +267,6 @@
 
 certErrorTrust_SelfSigned=Certifikát nie je dôveryhodný, pretože je podpísaný vlastným podpisom.
 certErrorTrust_UnknownIssuer=Certifikát nie je dôveryhodný, pretože vydavateľ certifikátu je neznámy.
-certErrorTrust_MissingChain=Certifikát nie je dôveryhodný, pretože nebol poskytnutý reťazec vydavateľa.
 certErrorTrust_CaInvalid=Certifikát nie je dôveryhodný, pretože bol vydaný neplatnou certifikačnou autoritou.
 certErrorTrust_Issuer=Certifikát nie je dôveryhodný, pretože vydavateľ certifikátu nie je dôveryhodný.
 certErrorTrust_SignatureAlgorithmDisabled=Certifikát nie je dôveryhodný, pretože bol podpísaný použitím algoritmu, ktorý nie je bezpečný.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/certManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/certManager.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/certManager.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -10,9 +10,6 @@
 <!ENTITY certmgr.tab.ca "Autority">
 <!ENTITY certmgr.tab.orphan2 "Iné">
 
-<!ENTITY certmgr.ca.builtins "Vstavané bezp. autority">
-<!ENTITY certmgr.ca.mycas "Bezp. autority spravované vami">
-
 <!ENTITY certmgr.mine "Máte certifikáty od týchto organizácií, ktoré vás identifikujú:">
 <!ENTITY certmgr.others "Máte uložené certifikáty, ktoré identifikujú týchto ľudí:">
 <!ENTITY certmgr.websites2 "Máte uložené certifikáty, ktoré identifikujú tieto servery:">
@@ -37,7 +34,6 @@
 <!ENTITY certmgr.certdetail.sha256fingerprint "Odtlačok prsta SHA-256">
 <!ENTITY certmgr.certdetail.sha1fingerprint "Odtlačok prsta SHA1">
 
-<!ENTITY certmgr.editcert.title "Úprava nastavení bezpečnostného certifikátu">
 <!ENTITY certmgr.editcacert.title "Úprava nastavenia dôvery pre certifikát od certifikačnej autority">
 <!ENTITY certmgr.editcert.edittrust "Upraviť nastavenie dôvery:">
 <!ENTITY certmgr.editcert.trustssl "Tento certifikát môže identifikovať internetové stránky">
@@ -49,11 +45,6 @@
 <!ENTITY certmgr.editemailcert.donttrust "Neveriť pravosti tohto certifikátu.">
 
 <!ENTITY certmgr.deletecert.title "Odstránenie certifikátu">
-<!ENTITY certmgr.deletecert.beforename "Požiadali ste o odstránenie tohto certifikátu:">
-<!ENTITY certmgr.deletecert.aftername "Naozaj chcete odstrániť tento certifikát?">
-<!ENTITY certmgr.deleteusercert.title "Odstránenie vášho certifikátu">
-<!ENTITY certmgr.deleteusercert.beforename "Požiadali ste o odstránenie tohto certifikátu:">
-<!ENTITY certmgr.deleteusercert.aftername "Ak odstránite tento certifikát, nebudete môcť prečítať správy, ktoré ním boli zašifrované.">
 
 <!ENTITY certmgr.certname "Názov certifikátu">
 <!ENTITY certmgr.certserver                   "Server">
@@ -72,8 +63,6 @@
 <!ENTITY certmgr.edit3.accesskey              "U">
 <!ENTITY certmgr.editca.label "Upraviť dôveryhodnosť CA">
 <!ENTITY certmgr.editca.accesskey             "d">
-<!ENTITY certmgr.add.label "Pridať">
-<!ENTITY certmgr.add.accesskey                "P">
 <!ENTITY certmgr.export.label                 "Exportovať…">
 <!ENTITY certmgr.export.accesskey             "x">
 <!ENTITY certmgr.delete2.label "Odstrániť…">
@@ -91,7 +80,7 @@
 <!ENTITY certmgr.fields.label "Hodnota poľa">
 <!ENTITY certmgr.fields.accesskey             "H">
 <!ENTITY certmgr.hierarchy.label "Hierarchia certifikátu">
-<!ENTITY certmgr.hierarchy.accesskey          "c">
+<!ENTITY certmgr.hierarchy.accesskey2         "c">
 <!ENTITY certmgr.addException.label           "Pridať výnimku…">
 <!ENTITY certmgr.addException.accesskey       "n">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/deviceManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/deviceManager.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/deviceManager.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -11,11 +11,7 @@
 <!ENTITY devmgr.devlist.label      "Bezpečnostné moduly a zariadenia">
 <!ENTITY devmgr.details.title      "Podrobnosti">
 <!ENTITY devmgr.details.title2     "Hodnota">
-<!ENTITY devmgr.status.label       "Stav">
-<!ENTITY devmgr.version.label      "Verzia">
 
-<!ENTITY devmgr.button.changeslotname.label         "Zmeniť názov zásuvky">
-<!ENTITY devmgr.button.changeslotname.accesskey     "Z">
 <!ENTITY devmgr.button.login.label                  "Prihlásiť">
 <!ENTITY devmgr.button.login.accesskey              "P">
 <!ENTITY devmgr.button.logout.label                 "Odhlásiť">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/pippki.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/pippki.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/pippki.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -9,7 +9,6 @@
 <!ENTITY setPassword.newPassword.label "Nové heslo:">
 <!ENTITY setPassword.reenterPassword.label "Nové heslo (znova):">
 <!ENTITY setPassword.meter.label "Ukazovateľ kvality hesla:">
-<!ENTITY setPassword.meter.loading "Načítava sa">
 
 <!-- Values for resetpassword.xul -->
 <!ENTITY resetPasswordButtonLabel "Vymazať">
@@ -21,19 +20,6 @@
 <!ENTITY getPassword.tokenName2.label "Bezpečnostné zariadenie:">
 <!ENTITY getPassword.password.label "Heslo:">
 
-<!-- These should be common -->
-<!ENTITY piperror.title "Chyba">
-<!ENTITY pipalert.title "Chyba – nemožno pokračovať">
-
-<!-- Prefs panel strings -->
-<!ENTITY pref.security.general.lHeader "Zabezpečenie">
-<!ENTITY pref.security.general.rHeader "Všeobecné nastavenie zabezpečenia">
-<!ENTITY pref.security.general.header "Všeobecné nastavenie zabezpečenia">
-<!ENTITY pref.security.general.level.title "Úroveň zabezpečenia">
-<!ENTITY pref.security.general.paranoid.label "Použiť paranoidné nastavenie zabezpečenia">
-<!ENTITY pref.security.general.certificates.title "Certifikáty">
-<!ENTITY pref.security.general.manageCert.label "Správa certifikátov">
-
 <!-- Downloading a cert -->
 <!ENTITY downloadCert.title "Preberá sa certifikát">
 <!ENTITY downloadCert.message1 "Vyžaduje sa dôverovať novej certifikačnej autorite.">
@@ -42,9 +28,7 @@
 <!ENTITY downloadCert.trustObjSign "Dôverovať tejto certifikačnej autorite pri identifikácii vývojárov softvéru.">
 <!ENTITY downloadCert.message3 "Predtým, než sa rozhodnete dôverovať tejto CA pre akýkoľvek účel, mali by ste preskúmať jej certifikát, politiku a procedúry (ak sú k dispozícii).">
 <!ENTITY downloadCert.viewCert.label "Zobraziť">
-<!ENTITY downloadCert.viewPolicy.label "Politika">
 <!ENTITY downloadCert.viewCert.text "Preskúmať certifikát certifikačnej agentúry">
-<!ENTITY downloadCert.viewPolicy.text "Preskúmať politiku a procedúry certifikačnej agentúry">
 
 <!-- Strings for the SSL client auth ask dialog -->
 <!ENTITY clientAuthAsk.title "Požiadavka na identifikáciu používateľa">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/security/manager/chrome/pippki/pippki.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/security/manager/chrome/pippki/pippki.properties	2015-02-28 15:05:05.000000000 +0000
@@ -10,7 +10,6 @@
 unnamedCA=Certifikačná autorita (bez názvu)
 
 #For editing cert trust
-editTrustWindowTitle=Upraviť nastavenie dôvery pre certifikát
 editTrustCA=Certifikát "%S" reprezentuje certifikačnú autoritu.
 editTrustEmail=Certifikát "%S" vydal:
 issuerNotTrusted=Pretože nedôverujete certifikačnej autorite, ktorá vydala tento certifikát, neveríte jeho pravosti, pokiaľ sa tu neurčí inak.
@@ -44,10 +43,6 @@
 chooseP12BackupFileDialog=Názov súboru, ktorý sa má zálohovať
 file_browse_PKCS12_spec=Súbory PKCS12
 getPKCS12FilePasswordMessage=Zadajte heslo, ktorým bola zašifrovaná táto záloha certifikátov:
-
-#Preferences
-resetPreferences=Týmto tlačidlom môžete vrátiť nastavenie zabezpečenia %S na ich pôvodné hodnoty.
-
 #Cert verification
 certVerified=Tento certifikát bol overený pre nasledujúce použitie:
 certNotVerified_CertRevoked=Tento certifikát sa nedá overiť, pretože je zrušený.
@@ -64,18 +59,16 @@
 clientAuthMessage2=Vydané pod: "%S"
 
 #Page Info
-pageInfo_SiteNotVerified=Identita servera nie je overená
-pageInfo_WebSiteVerified=Identita servera je overená
-pageInfo_Identity_Verified=Server %S podporuje autentifikáciu stránky, ktorú práve čítate. Identita servera bola overená certifikačnou autoritou %S, ktorej dôverujete pri overovaní serverov.
-pageInfo_ViewCertificate=Zobraziť bezpečnostný certifikát, ktorý overil identitu tejto stránky.
 pageInfo_NoEncryption=Pripojenie nie je šifrované
 pageInfo_Privacy_None1=Server %S nepodporuje šifrovanie pre stránku, ktorú práve čítate.
 pageInfo_Privacy_None2=Informácie odoslané cez internet bez zašifrovania môžu byť počas cesty pozorované inými ľuďmi.
 pageInfo_Privacy_None3=Stránka, ktorú čítate, nie je zašifrovaná.
-# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
+# %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
 # %3$S is protocol version like "SSL 3" or "TLS 1.2"
 pageInfo_EncryptionWithBitsAndProtocol=Pripojenie je šifrované (%1$S, %2$S bitové kľúče, %3$S)
+pageInfo_BrokenEncryption=Prelomené šifrovanie (%1$S, %2$S bitové kľúče, %3$S)
 pageInfo_Privacy_Encrypted1=Stránka, ktorú čítate, bola zašifrovaná predtým, ako bola odoslaná cez internet.
 pageInfo_Privacy_Encrypted2=Vďaka zašifrovaniu je pre neautorizovaných ľudí ťažké vidieť informácie, putujúce medzi dvoma počítačmi. Je preto nepravdepodobné, že by niekto prečítal túto stránku počas jej cesty po internete.
 pageInfo_MixedContent=Pripojenie je čiastočne šifrované
@@ -84,7 +77,6 @@
 #Cert Viewer
 certDetails=Zobrazenie certifikátu:
 notPresent=<nie je súčasťou certifikátu>
-unknownIssuer=<Neznámy vydavateľ>
 
 escrowFinalMessage=Kvôli bezpečnosti súkromného kľúča by ste mali kliknúť na tlačidlo OK len vtedy, ak dôverujete "%S"..
 
@@ -157,7 +149,6 @@
 addExceptionCheckingLong2=Pokus o identifikovanie tejto stránky…
 addExceptionNoCertShort=Informácie nie sú dostupné
 addExceptionNoCertLong2=Nie je možné získať stav identifikácie pre túto stránku.
-addExceptionConnectionFailed=Pripojenie zlyhalo
 
 #Certificate Exists in database
 caCertExistsTitle=Certifikát existuje
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:05:05.000000000 +0000
@@ -5,21 +5,25 @@
 aboutReader.loading=Načítava sa…
 aboutReader.loadError=Článok sa zo stránky nepodarilo načítať
 
-aboutReader.colorSchemeLight=Svetlá
-aboutReader.colorSchemeDark=Tmavá
-aboutReader.colorSchemeSepia=Sépia
-aboutReader.colorSchemeAuto=Automatická
+aboutReader.colorScheme.light=Svetlá
+aboutReader.colorScheme.dark=Tmavá
+aboutReader.colorScheme.sepia=Sépia
+aboutReader.colorScheme.auto=Automatická
 
-# LOCALIZATION NOTE (aboutReader.fontTypeSerif, aboutReader.fontTypeSansSerif):
-# These are the names of the fonts that are used.
-aboutReader.fontTypeSerif=Charis SIL Compact
-aboutReader.fontTypeSansSerif=Clear Sans
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=Pätkové
+aboutReader.fontType.sans-serif=Bezpätkové
 
 # 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=Zavrieť zobrazenie Čítačka
+aboutReader.toolbar.typeControls=Nastavenie vzhľadu
+aboutReader.toolbar.addToReadingList=Pridať do Zoznamu na prečítanie
+aboutReader.toolbar.removeFromReadingList=Odstrániť zo Zoznamu na prečítanie
+aboutReader.toolbar.openReadingList=Otvoriť Zoznam na prečítanie
+aboutReader.toolbar.closeReadingList=Zavrieť Zoznam na prečítanie
+aboutReader.toolbar.share=Zdieťať
 
-aboutReader.toolbarTip=Ťuknutím na obrazovku zobrazíte možnosti čítačky
+aboutReader.footer.deleteThisArticle=Odstrániť tento článok
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -98,3 +98,5 @@
 
 <!ENTITY aboutSupport.sandboxTitle "Sandbox">
 
+<!ENTITY aboutSupport.safeModeTitle "Vyskúšajte núdzový režim">
+<!ENTITY aboutSupport.restartInSafeMode.label "Reštartovať a zakázať doplnky…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:05:05.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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Ukončiť
+quitMenuitem.key=k
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/textcontext.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/textcontext.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/global/textcontext.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/global/textcontext.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -24,3 +24,5 @@
 <!ENTITY spellNoSuggestions.label "(Žiadne pravopisné návrhy)">
 <!ENTITY spellDictionaries.label "Jazyky">
 <!ENTITY spellDictionaries.accesskey "J">
+
+<!ENTITY searchTextBox.clear.label "Vymazať">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -5,6 +5,7 @@
 <!ENTITY addons.windowTitle                   "Správca doplnkov">
 
 <!ENTITY search.placeholder                   "Hľadať v doplnkoch">
+<!ENTITY search.buttonlabel                   "Hľadať">
 <!-- LOCALIZATION NOTE (search.commandKey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
@@ -229,3 +230,6 @@
 <!ENTITY experiment.info.learnmore.accesskey "a">
 <!ENTITY experiment.info.changetelemetry "Nastavenie telemetrie">
 <!ENTITY experiment.info.changetelemetry.accesskey "N">
+
+<!ENTITY setting.learnmore "Ďalšie informácie…">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/mozapps/extensions/extensions.properties	2015-02-28 15:05:05.000000000 +0000
@@ -56,8 +56,8 @@
 notification.installError=Pri inštalácii doplnku %1$S sa vyskytla chyba.
 notification.installError.retry=Skúsiť znova
 notification.installError.retry.tooltip=Skúsiť znova prevziať a nainštalovať tento doplnok
-#LOCALIZATION NOTE (notification.openH264Pending) OpenH264 will be automatically installed later.
-notification.openH264Pending=Bude čoskoro nainštalovaný.
+#LOCALIZATION NOTE (notification.gmpPending) %1$S is the add-on name.
+notification.gmpPending=Doplnok %1$S bude čoskoro nainštalovaný.
 
 #LOCALIZATION NOTE (contributionAmount2) %S is the currency amount recommended for contributions
 contributionAmount2=Navrhovaný príspevok: %S
@@ -99,8 +99,8 @@
 details.notification.uninstall=Doplnok %1$S bude odinštalovaný po reštartovaní aplikácie %2$S.
 #LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
 details.notification.upgrade=Doplnok %1$S bude aktualizovaný po reštartovaní aplikácie %2$S.
-#LOCALIZATION NOTE (details.notification.openH264Pending) OpenH264 will be automatically installed later.
-details.notification.openH264Pending=Bude čoskoro nainštalovaný.
+#LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
+details.notification.gmpPending=Doplnok %1$S bude čoskoro nainštalovaný.
 
 # LOCALIZATION NOTE (details.experiment.time.daysRemaining):
 # Semicolon-separated list of plural forms.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:05:05.000000000 +0000
@@ -39,3 +39,4 @@
 
 <!ENTITY plugin.file                                         "Súbor">
 <!ENTITY plugin.mimeTypes                                    "Typy MIME">
+<!ENTITY plugin.flashProtectedMode.label                     "Povoliť chránený režim Adobe Flash">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/sk/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:44:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/sk/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:05:05.000000000 +0000
@@ -33,3 +33,4 @@
 cspBlocked=Táto aplikácia sa pokúsila pristúpiť k zdroju, ktorý obsahuje zásady ochrany obsahu, ktoré nepovoľujú tento spôsob jeho načítania.
 corruptedContentError=Táto aplikácia nemohla byť spustená kvôli chybe pri prenose údajov.
 remoteXUL=Aplikácia používa technológiu, ktorá už viac nie je podporovaná.
+sslv3Used=Táto aplikácia nemôže garantovať bezpečnosť vašich údajov na stránke %S, pretože táto používa SSLv3, čo je prelomený bezpečnostný protokol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/dom/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/dom/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/dom/chrome/appstrings.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/dom/chrome/appstrings.properties	2015-02-28 15:05:21.000000000 +0000
@@ -33,3 +33,4 @@
 cspBlocked=这个页面包含了内容安全政策以至于无法以这种方式载入。
 corruptedContentError=您尝试查看的页面无法显示，因为检测到一个数据传输错误。
 remoteXUL=该网站使用了不支持的技术，该技术已经默认不再启用。
+sslv3Used=无法保证您在 %S 上的数据安全性，因为它使用 SSLv3，一个目前安全性欠佳的安全协议。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/dom/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/dom/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/dom/chrome/plugins.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/dom/chrome/plugins.properties	2015-02-28 15:05:21.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (plugins.properties):
-#    Those strings are inserted into an HTML page, so you all HTML characters
+#    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=关于插件
@@ -20,5 +20,11 @@
 description_label=描述
 suffixes_label=后缀
 
+# GMP Plugins
+gmp_license_info=许可协议信息
+
 openH264_name=OpenH264 视频编码器，思科系统公司提供。
 openH264_description=播放网络视频和使用视频聊天。
+
+eme-adobe_name=Adobe 公司提供的 Primetime 内容加密模块
+eme-adobe_description=播放受保护的网络视频。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/dom/chrome/security/security.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/dom/chrome/security/security.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/dom/chrome/security/security.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/dom/chrome/security/security.properties	2015-02-28 15:05:21.000000000 +0000
@@ -4,7 +4,18 @@
 BlockMixedActiveContent = 已阻止载入混合活动内容“%1$S”
 
 # CORS
-CrossSiteRequestBlocked=已阻止交叉源请求：同源策略不允许读取 %1$S 上的远程资源。可以将资源移动到相同的域名上或者启用 CORS 来解决这个问题。
+# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
+CORSDisabled=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 未启用）。
+CORSRequestFailed=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 请求失败）。
+CORSRequestNotHttp=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 请求不是 http）。
+CORSMissingAllowOrigin=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 头缺少 'Access-Control-Allow-Origin'）。
+CORSAllowOriginNotMatchingOrigin=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 头 'Access-Control-Allow-Origin' 不匹配 '%2$S'）。
+CORSMethodNotFound=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：没有办法找到 CORS 头中的 'Access-Control-Allow-Methods'）。
+CORSMissingAllowCredentials=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 头中的 'Access-Control-Allow-Credentials' 预期为 'true'）。
+CORSPreflightDidNotSucceed=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 预检通道未成功）。
+CORSInvalidAllowMethod=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 头 'Access-Control-Allow-Methods' 中的令牌 '%2$S' 无效）。
+CORSInvalidAllowHeader=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：CORS 头 'Access-Control-Allow-Headers' 中的令牌 '%2$S' 无效）。\u0020
+CORSMissingAllowHeaderFromPreflight=已阻止跨源请求：同源策略禁止读取位于 %1$S 的远程资源。（原因：来自 CORS 预检通道的 CORS 头 'Access-Control-Allow-Headers' 的令牌 '%2$S' 无效）。\u0020
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=网站指定了一个无效的 Strict-Transport-Security 头。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/netwerk/necko.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/netwerk/necko.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/netwerk/necko.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/netwerk/necko.properties	2015-02-28 15:05:21.000000000 +0000
@@ -38,4 +38,4 @@
 SuperfluousAuth=您将要使用用户名“%2$S”登录到站点“%1$S”，但是该站点并未请求验证。这可能是在尝试欺骗您。\n\n请问“%1$S”是您真正要访问的站点吗？
 AutomaticAuth=您即将使用用户名“%2$S”登录到站点“%1$S”。
 
-TrackingUriBlocked=位于“%1$S”的资源已被跟踪保护功能屏蔽。
+TrackingUriBlocked=位于“%1$S”的资源已被跟踪保护功能阻止。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pipnss/nsserrors.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pipnss/nsserrors.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pipnss/nsserrors.properties	2015-02-28 15:05:21.000000000 +0000
@@ -315,3 +315,5 @@
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=该服务器使用了一个使用“基本约束扩展”标识它为一个证书颁发机构的证书。对于一个正常颁发的证书，不应该是这样。
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=该服务器提供的证书密钥位数太小，不足以建立安全连接。
 MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=服务器的证书由非信任源（Trust Anchor）的X.509 版本 1 证书签发。X.509 版本 1 证书已不赞成使用，不应再用来签发其他证书。
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=服务器出示的证书尚未生效。
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=用来签发此服务器证书的一个证书尚未生效。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pipnss/pipnss.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pipnss/pipnss.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pipnss/pipnss.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pipnss/pipnss.properties	2015-02-28 15:05:21.000000000 +0000
@@ -40,16 +40,12 @@
 # End of size restriction.
 VerifySSLClient=SSL 客户端证书
 VerifySSLServer=SSL 服务器证书
-VerifySSLStepUp=使用 Step-up 的 SSL 服务器
 VerifySSLCA=SSL 证书权威机构
 VerifyEmailSigner=电子邮件签署者证书
 VerifyEmailRecip=邮件接受者证书
-VerifyProtectObjSign=被保护的对象签署者
 VerifyObjSign=对象签署者
-VerifyUserImport=用户导入证书
 VerifyCAVerifier=CA 证明者
 VerifyStatusResponder=状态回应者证书
-VerifyAnyCA=任何数字证书认证机构
 HighGrade=高级
 MediumGrade=中级
 # LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
@@ -61,7 +57,6 @@
 CertDumpVersion2=版本 2
 CertDumpVersion3=版本 3
 CertDumpSerialNo=序列号
-CertDumpOID=对象标识符
 CertDumpMD2WithRSA=PKCS #1 MD2 RSA 加密
 CertDumpMD5WithRSA=PKCS #1 MD5  RSA 加密
 CertDumpSHA1WithRSA=PKCS #1 SHA-1 RSA 加密
@@ -69,11 +64,8 @@
 CertDumpSHA384WithRSA=PKCS #1 SHA-384 RSA 加密
 CertDumpSHA512WithRSA=PKCS #1 SHA- 512 RSA 加密
 CertDumpDefOID=对象标识符 (%S)
-CertDumpNULL=NULL
 CertDumpIssuer=颁发者
 CertDumpSubject=用者
-CertDumpRDN=相对可分辨名称
-CertDumpATV=属性类型和值
 CertDumpAVACountry=C
 CertDumpAVAState=ST
 CertDumpAVALocality=L
@@ -245,44 +237,25 @@
 CertDumpRawBytesHeader=大小: %S 字节 / %S 位
 VerifySSLClient_p=客户端
 VerifySSLServer_p=服务器
-VerifySSLStepUp_p=步进
 VerifySSLCA_p=SSL CA
 VerifyEmailSigner_p=签署
 VerifyEmailRecip_p=加密
-VerifyProtectObjSign_p=被保护的对象签署者
 VerifyObjSign_p=对象签署者
-VerifyUserImport_p=用户导入
 VerifyCAVerifier_p=CA 证明者
 VerifyStatusResponder_p=状态回应者
-VerifyAnyCA_p=CA
-VerifiedTrue=true
-VerifiedFalse=false
 PK11BadPassword=输入的密码不正确。
 SuccessfulP12Backup=已经成功备份您的安全证书和私钥。
 SuccessfulP12Restore=已成功恢复您的安全证书和私钥。
-PKCS12PasswordInvalid=无法解码 PKCS #12 文件。可能是您输入的密码不正确。
 PKCS12DecodeErr=解码该文件失败。它可能不是 PKCS #12 格式，或已经损坏，或您输入的密码不正确。
 PKCS12UnknownErrRestore=恢复 PKCS #12 文件失败，原因未知。
 PKCS12UnknownErrBackup=创建 PKCS #12 备份文件失败，原因未知。
 PKCS12UnknownErr=PKCS #12 操作失败，原因未知。
 PKCS12InfoNoSmartcardBackup=备份硬件安全设备（如智能卡）中的证书是不可能的。
 PKCS12DupData=证书和私钥已经存在于此安全设备中了。
-AddModulePrompt=您确定要安装此安全模块吗？
-AddModuleName=模块名: %S
-AddModulePath=路径: %S
-AddModuleSuccess=一个新的安全模块已被安装
 AddModuleFailure=无法添加模块
 AddModuleDup=安全模块已经存在
-DelModuleBadName=无效的模块名。
 DelModuleWarning=您确定要删除此安全模块吗？
 DelModuleError=无法删除模块
-DelModuleIntSuccess=内部安全模块已成功删除
-DelModuleExtSuccess=外部安全模块已成功删除
-ForcedBackup1=您应该对您的新安全证书和相关联的私钥创建一个有密码保护的备份。
-ForcedBackup2=如果您因为忘记了您的个人安全密码，或者遭遇了文件损坏而无法获取您的私钥，您可以根据此备份来恢复该私钥和证书。
-ForcedBackup3=要做一份备份的话，点击确定。如果可能，您应该将您的备份复制到一张软盘，然后保存到一个安全的地方。
-UnknownCertIssuer=（未知颁发者）
-UnknownCertOrg=（未知组织）
 AVATemplate=%S = %S
 
 PSMERR_SSL_Disabled=由于 SSL 协议已被禁用，无法安全地连接。
@@ -295,7 +268,6 @@
 
 certErrorTrust_SelfSigned=该证书因为其自签名而不被信任。
 certErrorTrust_UnknownIssuer=该证书因为其颁发者证书未知而不被信任。
-certErrorTrust_MissingChain=该证书因为未提供证书颁发链而不被信任。
 certErrorTrust_CaInvalid=该证书因其为无效的 CA 证书颁发者而不被信任。
 certErrorTrust_Issuer=该证书因为其颁发者证书不受信任而不被信任。
 certErrorTrust_SignatureAlgorithmDisabled=该证书不被信任，因为证书签名所使用的签名算法因不安全已被禁用。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pipnss/security.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pipnss/security.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pipnss/security.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pipnss/security.properties	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/.
-
-Title=安全性警告
-PostToInsecureFromSecureMessage=虽然此页面已采用加密传输，但您输入的信息即将被以未加密的连接发送，这很容易被第三方所窥探。##您要继续发送此信息吗？##
-Continue=继续
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/certManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/certManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/certManager.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/certManager.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -10,9 +10,6 @@
 <!ENTITY certmgr.tab.ca                       "证书机构">
 <!ENTITY certmgr.tab.orphan2                  "其他">
 
-<!ENTITY certmgr.ca.builtins                  "内建CA">
-<!ENTITY certmgr.ca.mycas                     "您管理的CA">
-
 <!ENTITY certmgr.mine                         "您有这些组织用来识别您的证书：">
 <!ENTITY certmgr.others                       "您用来识别这些人的证书文件：">
 <!ENTITY certmgr.websites2                    "您用来识别这些服务器的证书：">
@@ -37,7 +34,6 @@
 <!ENTITY certmgr.certdetail.sha256fingerprint "SHA-256 指纹">
 <!ENTITY certmgr.certdetail.sha1fingerprint   "SHA1指纹">
 
-<!ENTITY certmgr.editcert.title               "编辑安全证书设置">
 <!ENTITY certmgr.editcacert.title             "编辑CA证书信任设置">
 <!ENTITY certmgr.editcert.edittrust           "编辑信任设置：">
 <!ENTITY certmgr.editcert.trustssl            "此证书可以标识网站。">
@@ -49,11 +45,6 @@
 <!ENTITY certmgr.editemailcert.donttrust      "不要信任此证书的真实性。">
 
 <!ENTITY certmgr.deletecert.title             "删除证书">
-<!ENTITY certmgr.deletecert.beforename        "您已请求删除此证书: ">
-<!ENTITY certmgr.deletecert.aftername         "确定要删除此证书吗？">
-<!ENTITY certmgr.deleteusercert.title         "删除您的证书">
-<!ENTITY certmgr.deleteusercert.beforename    "您已请求删除此证书:">
-<!ENTITY certmgr.deleteusercert.aftername     "一旦您删除了此证书，您将无法阅读用它加密的邮件了。">
 
 <!ENTITY certmgr.certname                     "证书名称">
 <!ENTITY certmgr.certserver                   "服务器">
@@ -72,8 +63,6 @@
 <!ENTITY certmgr.edit3.accesskey              "E">
 <!ENTITY certmgr.editca.label                 "编辑CA信任">
 <!ENTITY certmgr.editca.accesskey             "d">
-<!ENTITY certmgr.add.label                    "添加">
-<!ENTITY certmgr.add.accesskey                "A">
 <!ENTITY certmgr.export.label                 "导出…">
 <!ENTITY certmgr.export.accesskey             "x">
 <!ENTITY certmgr.delete2.label                "删除…">
@@ -91,7 +80,7 @@
 <!ENTITY certmgr.fields.label                 "字段值">
 <!ENTITY certmgr.fields.accesskey             "V">
 <!ENTITY certmgr.hierarchy.label              "证书结构">
-<!ENTITY certmgr.hierarchy.accesskey          "C">
+<!ENTITY certmgr.hierarchy.accesskey2         "H">
 <!ENTITY certmgr.addException.label           "添加例外…">
 <!ENTITY certmgr.addException.accesskey       "x">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/deviceManager.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/deviceManager.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/deviceManager.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/deviceManager.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -11,11 +11,7 @@
 <!ENTITY devmgr.devlist.label                   "安全模块和设备">
 <!ENTITY devmgr.details.title                   "细节">
 <!ENTITY devmgr.details.title2                  "值">
-<!ENTITY devmgr.status.label                    "状态">
-<!ENTITY devmgr.version.label                   "版本">
 
-<!ENTITY devmgr.button.changeslotname.label     "修改插槽名">
-<!ENTITY devmgr.button.changeslotname.accesskey "C">
 <!ENTITY devmgr.button.login.label              "登录">
 <!ENTITY devmgr.button.login.accesskey          "n">
 <!ENTITY devmgr.button.logout.label             "注销">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/pippki.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/pippki.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/pippki.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/pippki.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -9,7 +9,6 @@
 <!ENTITY setPassword.newPassword.label "新密码:">
 <!ENTITY setPassword.reenterPassword.label "新密码(重复):">
 <!ENTITY setPassword.meter.label "密码质量标尺">
-<!ENTITY setPassword.meter.loading "正在载入">
 <!-- Values for resetpassword.xul -->
 
 <!ENTITY resetPasswordButtonLabel "重置">
@@ -20,19 +19,6 @@
 <!ENTITY getPassword.title  "输入主密码">
 <!ENTITY getPassword.tokenName2.label "安全设备：">
 <!ENTITY getPassword.password.label "密码:">
-<!-- These should be common -->
-
-<!ENTITY piperror.title "错误">
-<!ENTITY pipalert.title "错误 - 无法恢复">
-<!-- Prefs panel strings -->
-
-<!ENTITY pref.security.general.lHeader "安全">
-<!ENTITY pref.security.general.rHeader "常规安全设置">
-<!ENTITY pref.security.general.header "常规安全设置">
-<!ENTITY pref.security.general.level.title "安全级别">
-<!ENTITY pref.security.general.paranoid.label "使用极其严格的安全设置">
-<!ENTITY pref.security.general.certificates.title "证书">
-<!ENTITY pref.security.general.manageCert.label "管理证书">
 <!-- Downloading a cert -->
 
 <!ENTITY downloadCert.title "下载证书">
@@ -42,9 +28,7 @@
 <!ENTITY downloadCert.trustObjSign "信任使用此CA标识的软件开发者。">
 <!ENTITY downloadCert.message3 "在信任此CA之前，您应该检查它的证书、策略和它的手续（如果有的话）。">
 <!ENTITY downloadCert.viewCert.label "查看">
-<!ENTITY downloadCert.viewPolicy.label "策略">
 <!ENTITY downloadCert.viewCert.text "检查CA证书">
-<!ENTITY downloadCert.viewPolicy.text "检查CA策略和手续">
 <!-- Strings for the SSL client auth ask dialog -->
 
 <!ENTITY clientAuthAsk.title "使用确认请求">
@@ -63,9 +47,6 @@
 <!ENTITY pkcs12.setpassword.label2 "证书备份密码（重复）：">
 <!ENTITY pkcs12.setpassword.reminder "重要：如果您忘记了您的证书备份密码，您此后将无法恢复此备份。请将它记在一个安全的地方。">
 
-<!ENTITY pkcs12.getpassword.title  "密码输入对话框">
-<!ENTITY pkcs12.getpassword.message "请输入密码以便将此证书加密备份。">
-
 <!ENTITY chooseToken.title  "选择令牌对话框">
 <!ENTITY chooseToken.message1 "请选择一个令牌。">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/pippki.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/pippki.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/security/manager/chrome/pippki/pippki.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/security/manager/chrome/pippki/pippki.properties	2015-02-28 15:05:21.000000000 +0000
@@ -11,7 +11,6 @@
 unnamedCA=证书机构（未命名）
 
 #For editing cert trust
-editTrustWindowTitle=编辑证书信任
 editTrustCA=证书“%S”描绘了一个数字证书颁发机构（CA）。
 editTrustEmail=证书“%S”的颁发者是：
 issuerNotTrusted=因为您不信任颁发此证书的证书授权机构，您不会信任此证书的真实性，除非您再次在此指定其他选择。
@@ -44,10 +43,7 @@
 chooseP12RestoreFileDialog2=要导入的证书文件
 chooseP12BackupFileDialog=要备份的文件名
 file_browse_PKCS12_spec=PKCS12 文件
-
-
-#Preferences
-resetPreferences=使用此按钮将 %S 的安全首选项重置为其初始设置。
+getPKCS12FilePasswordMessage=请输入被用来加密此证书备份的密码：
 
 #Cert verification
 certVerified=此证书已经过认证，可用于下列用途：
@@ -65,18 +61,16 @@
 clientAuthMessage2=颁发于：“%S”
 
 #Page Info
-pageInfo_SiteNotVerified=Web 站点标识未验证
-pageInfo_WebSiteVerified=Web 站点标识已验证
-pageInfo_Identity_Verified=网站 %S 支持加密您当前浏览的页面。此网站的标识已被您在该情况下信任的数字证书颁发机构 %S 认证。
-pageInfo_ViewCertificate=查看验证此站点标识的安全证书。
 pageInfo_NoEncryption=连接未加密
 pageInfo_Privacy_None1=此网站 %S 不支持加密您正在查看的页面。
 pageInfo_Privacy_None2=未经加密的信息在互联网的传输过程中可能被他人窥探其内容。
 pageInfo_Privacy_None3=您当前查看的页面未被加密。
-# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol): %1$S is the name of the encryption standard,
+# LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
+# %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
 # %3$S is protocol version like "SSL 3" or "TLS 1.2"
 pageInfo_EncryptionWithBitsAndProtocol=连接已加密（%1$S、%2$S 位密钥，%3$S）
+pageInfo_BrokenEncryption=脆弱的加密（%1$S、%2$S 位密钥，%3$S）
 pageInfo_Privacy_Encrypted1=您正在查看的网页在传送到互联网之前已加密。
 pageInfo_Privacy_Encrypted2=加密措施使得未授权的人难于查看计算机之间的通信。因此，别人不太可能从此网页传送的过程中拦截并读取此页面。
 pageInfo_MixedContent=连接已部分加密
@@ -85,7 +79,6 @@
 #Cert Viewer
 certDetails=证书查看器：
 notPresent=<无此部分>
-unknownIssuer=<未知颁发者>
 
 escrowFinalMessage=如果您信任用“%S”来保护您的加密私钥，请单击确定。
 
@@ -158,7 +151,6 @@
 addExceptionCheckingLong2=正在尝试识别此站点…
 addExceptionNoCertShort=无可用信息
 addExceptionNoCertLong2=无法获取所给站点的标识信息。
-addExceptionConnectionFailed=连接失败
 
 #Certificate Exists in database
 caCertExistsTitle=证书已存在
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutNetworking.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutNetworking.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutNetworking.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutNetworking.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -11,7 +11,7 @@
 <!ENTITY aboutNetworking.dns                   "DNS">
 <!ENTITY aboutNetworking.websockets            "WebSocket">
 <!ENTITY aboutNetworking.refresh               "刷新">
-<!ENTITY aboutNetworking.autoRefresh           "每3秒自动刷新">
+<!ENTITY aboutNetworking.autoRefresh           "每3秒自动刷新一次">
 <!ENTITY aboutNetworking.hostname              "主机名">
 <!ENTITY aboutNetworking.port                  "端口">
 <!ENTITY aboutNetworking.spdy                  "SPDY">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutReader.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutReader.properties	2015-02-28 15:05:21.000000000 +0000
@@ -5,15 +5,15 @@
 aboutReader.loading=正在载入...
 aboutReader.loadError=从页面加载文章失败
 
-aboutReader.colorSchemeLight=亮色
-aboutReader.colorSchemeDark=暗色
-aboutReader.colorSchemeSepia=深褐色
-aboutReader.colorSchemeAuto=自动
-
-# LOCALIZATION NOTE (aboutReader.fontTypeSerif, aboutReader.fontTypeSansSerif):
-# These are the names of the fonts that are used.
-aboutReader.fontTypeSerif=Charis SIL Compact
-aboutReader.fontTypeSansSerif=Clear Sans
+aboutReader.colorScheme.light=亮色
+aboutReader.colorScheme.dark=暗色
+aboutReader.colorScheme.sepia=深褐色
+aboutReader.colorScheme.auto=自动
+
+# LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
+# These are the styles of typeface that are options in the reader view controls.
+aboutReader.fontType.serif=衬线
+aboutReader.fontType.sans-serif=无衬线
 
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
 aboutReader.fontTypeSample=Aa
@@ -22,4 +22,12 @@
 # for the font size setting. Tapping different samples will change the font size.
 aboutReader.fontSizeSample=A 字样
 
-aboutReader.toolbarTip=点按屏幕显示阅读器选项
+aboutReader.toolbar.close=关闭阅读模式
+aboutReader.toolbar.typeControls=类型控制
+aboutReader.toolbar.addToReadingList=添加到阅读列表
+aboutReader.toolbar.removeFromReadingList=从阅读列表移除
+aboutReader.toolbar.openReadingList=打开阅读列表
+aboutReader.toolbar.closeReadingList=关闭阅读列表
+aboutReader.toolbar.share=分享
+
+aboutReader.footer.deleteThisArticle=删除此文章
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutSupport.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutSupport.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -33,9 +33,11 @@
 <!ENTITY aboutSupport.appBasicsTitle "应用程序概要">
 <!ENTITY aboutSupport.appBasicsName "名称">
 <!ENTITY aboutSupport.appBasicsVersion "版本">
-<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
+<!ENTITY aboutSupport.appBasicsBuildID "版本 ID">
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateChannel, aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
 "Update" is a noun here, not a verb. -->
 
+<!ENTITY aboutSupport.appBasicsUpdateChannel "更新通道">
 <!ENTITY aboutSupport.appBasicsUpdateHistory "更新历史">
 <!ENTITY aboutSupport.appBasicsShowUpdateHistory "显示更新历史">
 
@@ -91,3 +93,6 @@
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "复制原始数据到剪贴板">
 
 <!ENTITY aboutSupport.sandboxTitle "沙盒">
+
+<!ENTITY aboutSupport.safeModeTitle "尝试安全模式">
+<!ENTITY aboutSupport.restartInSafeMode.label "以安全模式重新启动…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutSupport.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutSupport.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutSupport.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutSupport.properties	2015-02-28 15:05:21.000000000 +0000
@@ -46,16 +46,16 @@
 textCopied=文本已复制到剪贴板
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedDriver = 因您的显卡驱动版本已屏蔽。
+blockedDriver = 已因您的显卡驱动版本而屏蔽。
 
 # LOCALIZATION NOTE The %S here is a placeholder, leave unchanged, it will get replaced by the driver version string.
-tryNewerDriver = 因您的显卡驱动版本已屏蔽。尝试更新您的显卡驱动至版本 %S 或更新的版本。
+tryNewerDriver = 已因您的显卡驱动版本而屏蔽。请尝试更新您的显卡驱动程序至版本 %S 或更新的版本。
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedGfxCard = 因您显卡驱动的未解决的问题已屏蔽。
+blockedGfxCard = 已因您显卡驱动的未解决的问题而屏蔽。
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedOSVersion = 因您的操作系统版本已屏蔽。
+blockedOSVersion = 已因您的操作系统版本而屏蔽。
 
 direct2DEnabled = Direct2D 已启用
 directWriteEnabled = DirectWrite 已启用
@@ -86,3 +86,8 @@
 hasSeccompBPF = Seccomp-BPF（系统调用过滤）
 canSandboxContent = 内容进程沙盒化
 canSandboxMedia = 媒体插件沙盒化
+
+# LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
+# of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
+# or 'false')
+multiProcessStatus = %1$S/%2$S (默认：%3$S)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutTelemetry.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutTelemetry.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/aboutTelemetry.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/aboutTelemetry.properties	2015-02-28 15:05:21.000000000 +0000
@@ -7,6 +7,8 @@
 # - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
 pageSubtitle = 本页显示“遥测”收集的有关性能、硬件、使用和定制情况的信息，这些信息被提交到 %1$S 以帮助改进 %2$S 。
 
+generalDataTitle = 常规数据
+
 generalDataHeadingName = 名称
 
 generalDataHeadingValue = 值
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/browser.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/browser.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/browser.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/browser.properties	2015-02-28 15:05:21.000000000 +0000
@@ -8,3 +8,7 @@
 browsewithcaret.checkButtonLabel=是
 
 plainText.wordWrap=将较长的行自动换行
+
+formPostSecureToInsecureWarning.title = 安全警告
+formPostSecureToInsecureWarning.message = 您在此页面上输入的信息将通过一个不安全的连接发送，并可能被第三方所窥探。\n\n您确定要继续发送此信息吗？
+formPostSecureToInsecureWarning.continue = 继续
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/devtools/debugger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/devtools/debugger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/devtools/debugger.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/devtools/debugger.properties	2015-02-28 15:05:21.000000000 +0000
@@ -14,11 +14,46 @@
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=传入连接
 
-# LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
+# LOCALIZATION NOTE (remoteIncomingPromptHeader): Header displayed on the
 # dialog that prompts the user to allow the incoming connection.
-remoteIncomingPromptMessage=检测到一个远程调试连接请求，远程客户端将能够彻底控制你的浏览器！允许连接？
+remoteIncomingPromptHeader=检测到一个要求进行远程调试连接的传入请求。远程客户端可能通过您的浏览器进行完全控制！
+# LOCALIZATION NOTE (remoteIncomingPromptClientEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the client such as "127.0.0.1:6000"
+remoteIncomingPromptClientEndpoint=客户端端点：%1$S
+# LOCALIZATION NOTE (remoteIncomingPromptServerEndpoint): Part of the prompt
+# dialog for the user to choose whether an incoming connection should be
+# allowed.
+# %1$S: The host and port of the server such as "127.0.0.1:6000"
+remoteIncomingPromptServerEndpoint=服务器端点：%1$S
+# LOCALIZATION NOTE (remoteIncomingPromptFooter): Footer displayed on the
+# dialog that prompts the user to allow the incoming connection.
+remoteIncomingPromptFooter=允许连接？
 
 # LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
 # third button in the incoming connection dialog that lets the user disable the
 # remote debugger server.
 remoteIncomingPromptDisable=禁用
+
+# LOCALIZATION NOTE (clientSendOOBTitle): The title displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBTitle=客户端身份标识
+# LOCALIZATION NOTE (clientSendOOBHeader): Header displayed on the dialog that
+# instructs the user to transfer an authentication token to the server.
+clientSendOOBHeader=您连接的端点需要更多信息来验证此连接。请在下面提供将显示在远端弹出框的令牌。
+# LOCALIZATION NOTE (clientSendOOBHash): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The client's cert fingerprint
+clientSendOOBHash=我的证书：%1$S
+# LOCALIZATION NOTE (clientSendOOBToken): Part of the dialog that instructs the
+# user to transfer an authentication token to the server.
+# %1$S: The authentication token that the user will transfer.
+clientSendOOBToken=令牌：%1$S
+
+# LOCALIZATION NOTE (serverReceiveOOBTitle): The title displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBTitle=提供客户端令牌
+# LOCALIZATION NOTE (serverReceiveOOBBody): Main text displayed on the dialog
+# that instructs the user to provide an authentication token from the client.
+serverReceiveOOBBody=客户端应该被显示的一个令牌值。请在这里输入要完成的此客户端的身份验证。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/fallbackMenubar.properties	2015-02-28 15:05:21.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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=退出
+quitMenuitem.key=q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/resetProfile.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/resetProfile.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/resetProfile.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/resetProfile.properties	2015-02-28 15:05:21.000000000 +0000
@@ -5,7 +5,7 @@
 # LOCALIZATION NOTE: These strings are used for profile reset.
 
 # LOCALIZATION NOTE (resetUnusedProfile.message): %S is brandShortName.
-resetUnusedProfile.message=看起来你有一段时间没有打开 %S 了，是否需要清除结果以获得全新的体验？顺便说一句，欢迎回来！
+resetUnusedProfile.message=看起来你有一段时间没有打开 %S 了。是否要清理一下配置文件以获得近乎全新的体验？顺便说一句，欢迎回来！
 
 # LOCALIZATION NOTE (refreshProfile.resetButton.label): %S is brandShortName.
 refreshProfile.resetButton.label=刷新 %S…
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/textcontext.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/textcontext.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/global/textcontext.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/global/textcontext.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -24,3 +24,5 @@
 <!ENTITY spellNoSuggestions.label "（无拼写建议）">
 <!ENTITY spellDictionaries.label "语言">
 <!ENTITY spellDictionaries.accesskey "L">
+
+<!ENTITY searchTextBox.clear.label "清空">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties	2015-02-28 15:05:21.000000000 +0000
@@ -32,15 +32,14 @@
 offlineCancelDownloadsAlertMsg=如果您现在脱机，将有一个下载项被迫取消。您确定要脱机吗？
 offlineCancelDownloadsAlertMsgMultiple=如果您现在脱机，将有 %S 个下载项被迫取消。您确定要脱机吗？
 leavePrivateBrowsingCancelDownloadsAlertTitle=取消所有下载项吗？
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg=你现在如果你关闭全部隐私浏览窗口，将会取消一个下载。你确定要离开隐私浏览模式？
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple=现在如果你关闭全部隐私浏览窗口，将会取消 %S 个下载。你确定要离开隐私浏览模式？
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=如果您现在关闭所有的隐私浏览窗口，一个下载项将被取消。您仍确定要离开隐私浏览模式吗？
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=如果您现在关闭所有的隐私浏览窗口，%S 个下载项将被取消。您仍确定要离开隐私浏览模式吗？
 cancelDownloadsOKText=取消一个下载项
 cancelDownloadsOKTextMultiple=取消 %S 个下载项
 dontQuitButtonWin=不要退出
 dontQuitButtonMac=不要退出
 dontGoOfflineButton=保持在线
-dontEnterPrivateBrowsingButton=不要进入隐私浏览模式
-dontLeavePrivateBrowsingButton=停留在隐私浏览模式
+dontLeavePrivateBrowsingButton2=停留在隐私浏览模式
 downloadsCompleteTitle=下载完成
 downloadsCompleteMsg=文件全部下载完成。\u0020
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -4,6 +4,7 @@
 <!ENTITY addons.windowTitle                   "附加组件管理器">
 
 <!ENTITY search.placeholder                   "搜索所有附加组件">
+<!ENTITY search.buttonlabel                   "搜索">
 <!-- LOCALIZATION NOTE (search.commandKey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
@@ -225,3 +226,5 @@
 <!ENTITY experiment.info.learnmore.accesskey "L">
 <!ENTITY experiment.info.changetelemetry "遥测设置">
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
+
+<!ENTITY setting.learnmore "详细了解…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/toolkit/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:05:21.000000000 +0000
@@ -39,3 +39,4 @@
 
 <!ENTITY plugin.file                                         "文件">
 <!ENTITY plugin.mimeTypes                                    "MIME 类型">
+<!ENTITY plugin.flashProtectedMode.label                     "启用 Adobe Flash 保护模式">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/webapprt/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/webapprt/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/l10n/zh-CN/webapprt/webapprt/overrides/appstrings.properties	2015-02-19 00:44:27.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/l10n/zh-CN/webapprt/webapprt/overrides/appstrings.properties	2015-02-28 15:05:21.000000000 +0000
@@ -33,3 +33,4 @@
 cspBlocked=此应用程序尝试访问包含了内容安全政策的资源，以至于无法以这种方式载入。
 corruptedContentError=此应用程序无法继续加载，检测到数据传输错误。
 remoteXUL=此应用程序试图使用一项不支持的技术，它已不再可用。
+sslv3Used=本应用程序无法保证您在 %S 上的数据安全性，因为它使用 SSLv3，一个目前安全性欠佳的安全协议。
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/ldap/xpcom/src/nsLDAPOperation.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/ldap/xpcom/src/nsLDAPOperation.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/ldap/xpcom/src/nsLDAPOperation.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/ldap/xpcom/src/nsLDAPOperation.cpp	2015-02-28 15:02:42.000000000 +0000
@@ -283,6 +283,10 @@
            ("nsLDAPOperation::SimpleBind(): called; bindName = '%s'; ",
             bindName.get()));
 
+    // this (nsLDAPOperation) may be released by RemovePendingOperation()
+    // See https://bugzilla.mozilla.org/show_bug.cgi?id=1063829.
+    nsRefPtr<nsLDAPOperation> kungFuDeathGrip = this;
+
     // If this is a second try at binding, remove the operation from pending ops
     // because msg id has changed...
     if (originalMsgID)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/app/profile/all-thunderbird.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/app/profile/all-thunderbird.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/app/profile/all-thunderbird.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/app/profile/all-thunderbird.js	2015-02-28 15:02:42.000000000 +0000
@@ -225,6 +225,14 @@
 
 pref("mail.folder.views.version", 0);
 
+pref("mail.folderpane.showColumns", false);
+// Force the unit shown for the size of all folders. If empty, the unit
+// is determined automatically for each folder. Allowed values: KB/MB/<empty string>
+pref("mail.folderpane.sizeUnits", "");
+// Summarize messages count and size of subfolders into a collapsed parent?
+// Allowed values: true/false
+pref("mail.folderpane.sumSubfolders", true);
+
 // target folder URI used for the last move or copy
 pref("mail.last_msg_movecopy_target_uri", "");
 // last move or copy operation was a move
@@ -458,7 +466,7 @@
 pref("mail.tabs.closeButtons", 1);
 
 // Allow the tabs to be in the titlebar on supported systems
-#ifdef XP_MACOSX
+#ifdef UNIX_BUT_NOT_MAC
 pref("mail.tabs.drawInTitlebar", false);
 #else
 pref("mail.tabs.drawInTitlebar", true);
@@ -790,8 +798,6 @@
 pref("mail.provider.suggestFromName", "https://broker-live.mozillamessaging.com/provider/suggest");
 pref("mail.provider.enabled", true);
 
-pref("mail.websearch.open_externally", false);
-
 // Pointer to the default engine name.
 pref("browser.search.defaultenginename", "chrome://messenger-region/locale/region.properties");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/app.mozbuild thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/app.mozbuild
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/app.mozbuild	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/app.mozbuild	2015-02-28 15:02:42.000000000 +0000
@@ -19,7 +19,10 @@
     DIRS += ['/editor/ui']
 
 if CONFIG['MOZ_CALENDAR']:
-    DIRS += ['/calendar/lightning']
+    DIRS += [
+        '/calendar/lightning',
+        '/calendar/timezones'
+    ]
 
 DIRS += [
     '/chat',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/aboutDialog.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/aboutDialog.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/aboutDialog.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/aboutDialog.js	2015-02-28 15:02:42.000000000 +0000
@@ -90,9 +90,10 @@
 function openUILink(url, event)
 {
   if (!event.button) {
-    Cc["@mozilla.org/uriloader/external-protocol-service;1"]
-      .getService(Ci.nsIExternalProtocolService)
-      .loadUri(Services.io.newURI(url, null, null));
+    let m = ("messenger" in window) ? messenger :
+      Components.classes["@mozilla.org/messenger;1"]
+                .createInstance(Components.interfaces.nsIMessenger);
+    m.launchExternalURL(url);
     event.preventDefault();
   }
 }
@@ -521,7 +522,7 @@
       return;
     }
 
-    this.selectPanel("apply");
+    this.selectPanel("applyBillboard");
   },
 
   /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/aboutDialog.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/aboutDialog.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/aboutDialog.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/aboutDialog.xul	2015-02-28 15:02:42.000000000 +0000
@@ -127,7 +127,7 @@
             &community.start2;<label class="text-link" onclick="openURL('http://www.mozilla.org/');" oncommand="openUILink(this.getAttribute('href'), event);">&community.mozillaLink;</label>&community.middle2;<label class="text-link" onclick="openAboutTab('about:credits');">&community.creditsLink;</label>&community.end3;
           </description>
           <description class="text-blurb" id="contributeDesc">
-            &contribute.start;<label class="text-link" onclick="openURL('http://www.mozilla.org/contribute/');">&contribute.getInvolvedLink;</label>&contribute.end;
+            &helpus.start;<label class="text-link" onclick="openUILink(this.getAttribute('href'), event)" href="https://sendto.mozilla.org/page/contribute/givenow-seq?source=thunderbird_about">&helpus.donateLink;</label>&helpus.middle;<label class="text-link" onclick="openUILink(this.getAttribute('href'), event)" href="http://www.mozilla.org/contribute/" >&helpus.getInvolvedLink;</label>&helpus.end;
           </description>
        </vbox>
      </vbox>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/folderPane.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/folderPane.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/folderPane.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/folderPane.js	2015-02-28 15:02:40.000000000 +0000
@@ -117,6 +117,8 @@
  * implementation, as well as other control functions.
  */
 let gFolderTreeView = {
+  messengerBundle: null,
+
   /**
    * Called when the window is initially loaded.  This function initializes the
    * folder-pane to the view last shown before the application was closed.
@@ -125,6 +127,7 @@
     const Cc = Components.classes;
     const Ci = Components.interfaces;
     this._treeElement = aTree;
+    this.messengerBundle = document.getElementById("bundle_messenger");
 
     // the folder pane can be used for other trees which may not have these elements.
     if (document.getElementById("folderpane_splitter"))
@@ -149,7 +152,7 @@
           string = this._modeDisplayNames[this.mode];
         else {
           let key = "folderPaneModeHeader_" + this.mode;
-          string = document.getElementById("bundle_messenger").getString(key);
+          string = this.messengerBundle.getString(key);
         }
       document.getElementById('folderpane-title').value = string;
     }
@@ -177,8 +180,8 @@
           this._persistOpenMap = JSON.parse(data);
         } catch (x) {
           Components.utils.reportError(
-            document.getElementById("bundle_messenger")
-                    .getFormattedString("failedToReadFile", [aJSONFile, x]));
+            gFolderTreeView.messengerBundle
+                           .getFormattedString("failedToReadFile", [aJSONFile, x]));
         }
       }
     }
@@ -189,6 +192,9 @@
     // And actually draw the tree
     aTree.view = this;
 
+    this.toggleCols(true);
+    gFolderStatsHelpers.init();
+
     // Add this listener so that we can update the tree when things change
     MailServices.mailSession.AddFolderListener(this, Ci.nsIFolderListener.all);
   },
@@ -301,6 +307,35 @@
   },
 
   /**
+   * Toggle displaying the headers of columns in the folder pane.
+   * @param aSetup  Set to true if the columns should be set up according
+   *                to the pref, not toggle them.
+   */
+  toggleCols: function(aSetup = false) {
+    let hide = Services.prefs.getBoolPref("mail.folderpane.showColumns");
+    if (aSetup)
+      hide = !hide;
+    this._treeElement.setAttribute("hidecolumnpicker", hide ? "true" : "false");
+    for (let columnName of ["folderNameCol", "folderUnreadCol",
+                            "folderTotalCol", "folderSizeCol"])
+    {
+      let column = document.getElementById(columnName);
+      if (hide) {
+        column.setAttribute("hideheader", "true");
+        column.removeAttribute("label");
+        if (columnName != "folderNameCol")
+          column.setAttribute("hidden", "true");
+      } else {
+        column.setAttribute("label", column.getAttribute("label2"));
+        column.setAttribute("hideheader", "false");
+      }
+    }
+
+    if (!aSetup)
+      Services.prefs.setBoolPref("mail.folderpane.showColumns", !hide);
+  },
+
+  /**
    * Toggles the compact view of the current mode.
    *
    * @param aCompact  Boolean telling whether compact view should be enabled.
@@ -392,7 +427,7 @@
       string = this._modeDisplayNames[this._mode];
     else {
       let key = "folderPaneModeHeader_" + this._mode;
-      string = document.getElementById("bundle_messenger").getString(key);
+      string = gFolderTreeView.messengerBundle.getString(key);
     }
     document.getElementById('folderpane-title').value = string;
 
@@ -832,8 +867,11 @@
    * The actual text to display in the tree
    */
   getCellText: function ftv_getCellText(aRow, aCol) {
-    if (aCol.id == "folderNameCol")
-      return this._rowMap[aRow].text;
+    if ((aCol.id == "folderNameCol") ||
+        (aCol.id == "folderUnreadCol") ||
+        (aCol.id == "folderTotalCol") ||
+        (aCol.id == "folderSizeCol"))
+      return this._rowMap[aRow].getText(aCol.id);
     return "";
   },
 
@@ -1764,8 +1802,8 @@
         let map = [];
         let accounts = gFolderTreeView._sortedAccounts();
         let smartServer = this._smartServer;
-        smartServer.prettyName = document.getElementById("bundle_messenger")
-                                         .getString("unifiedAccountName");
+        smartServer.prettyName = gFolderTreeView.messengerBundle
+                                                .getString("unifiedAccountName");
         smartServer.canHaveFilters = false;
 
         let smartRoot = smartServer.rootFolder;
@@ -2163,27 +2201,83 @@
     return this._folder.URI;
   },
   get text() {
-    let text;
-    if (this.useServerNameOnly) {
-      text = this._folder.server.prettyName;
+    return this.getText("folderNameCol");
+  },
+
+  getText(aColName) {
+    // Only show counts / total size of subtree if the pref is set,
+    // we are in "All folders" mode and this folder row is not expanded.
+    gFolderStatsHelpers.sumSubfolders = gFolderStatsHelpers.sumSubfoldersPref &&
+                          (gFolderTreeView.mode == kDefaultMode) &&
+                          this._folder.hasSubFolders && !this.open;
+
+    switch (aColName) {
+      case "folderNameCol":
+        let text;
+        if (this.useServerNameOnly)
+          text = this._folder.server.prettyName;
+        else {
+          text = this._folder.abbreviatedName;
+          if (this.addServerName)
+            text = gFolderTreeView.messengerBundle.getFormattedString(
+              "folderWithAccount", [text, this._folder.server.prettyName]);
+        }
+
+        // If the unread column is shown, we don't need to add the count
+        // to the name.
+        if (!document.getElementById("folderUnreadCol").hidden)
+          return text;
+
+        let unread = this._folder.getNumUnread(gFolderStatsHelpers.sumSubfolders);
+        if (unread > 0)
+          text = gFolderTreeView.messengerBundle
+            .getFormattedString("folderWithUnreadMsgs",
+                                [text, gFolderStatsHelpers.addSummarizedPrefix(unread)]);
+        return text;
+
+      case "folderUnreadCol":
+        return gFolderStatsHelpers
+                 .fixNum(this._folder.getNumUnread(gFolderStatsHelpers.sumSubfolders));
+
+      case "folderTotalCol":
+        return gFolderStatsHelpers
+                 .fixNum(this._folder.getTotalMessages(gFolderStatsHelpers.sumSubfolders));
+
+      case "folderSizeCol":
+        let size = gFolderStatsHelpers.getFolderSize(this._folder);
+        if (size == 0)
+          return "";
+        if (size == gFolderStatsHelpers.kUnknownSize)
+          return size;
+
+        // If size is non-zero try to show it in a unit that fits in 3 digits,
+        // but if user specified a fixed unit, use that.
+        size = Math.round(size / 1024);
+        let units = gFolderStatsHelpers.kiloUnit;
+        if (gFolderStatsHelpers.sizeUnits != "KB" &&
+            (size > 999 || gFolderStatsHelpers.sizeUnits == "MB")) {
+          size = Math.round(size / 1024);
+          units = gFolderStatsHelpers.megaUnit;
+        }
+
+        // This needs to be updated if the "%.*f" placeholder string
+        // in "*ByteAbbreviation2" in messenger.properties changes.
+        return gFolderStatsHelpers
+                 .addSummarizedPrefix(units.replace("%.*f", size).replace(" ",""));
+
+        default:
+        return "";
     }
-    else {
-      text = this._folder.abbreviatedName;
-      if (this.addServerName)
-        text += " - " + this._folder.server.prettyName;
-    }
-    // Yeah, we hard-code this, but so did the old code...
-    let unread = this._folder.getNumUnread(!this.open);
-    if (unread > 0)
-      text += " (" + unread + ")";
-    return text;
   },
 
   get level() {
     return this._level;
   },
 
-  getProperties: function ftvItem_getProperties() {
+  getProperties: function (aColumn) {
+    if (aColumn && aColumn.id != "folderNameCol")
+      return "";
+
     // From folderUtils.jsm
     let properties = getFolderProperties(this._folder, this.open);
     if (this._folder.getFlag(nsMsgFolderFlags.Virtual)) {
@@ -2305,8 +2399,8 @@
       return;
     }
 
-    let title = document.getElementById("bundle_messenger")
-                        .getString("folderProperties");
+    let title = gFolderTreeView.messengerBundle
+                               .getString("folderProperties");
 
     //xxx useless param
     function editFolderCallback(aNewName, aOldName, aUri) {
@@ -2410,10 +2504,10 @@
       throw new Error("Can't delete folder: " + folder.name);
 
     if (folder.flags & nsMsgFolderFlags.Virtual) {
-      let confirmation = document.getElementById("bundle_messenger")
-                                 .getString("confirmSavedSearchDeleteMessage");
-      let title = document.getElementById("bundle_messenger")
-                          .getString("confirmSavedSearchTitle");
+      let confirmation = gFolderTreeView.messengerBundle
+                                        .getString("confirmSavedSearchDeleteMessage");
+      let title = gFolderTreeView.messengerBundle
+                                 .getString("confirmSavedSearchTitle");
       if (Services.prompt
             .confirmEx(window, title, confirmation,
                        Services.prompt.STD_YES_NO_BUTTONS + Services.prompt.BUTTON_POS_1_DEFAULT,
@@ -2589,15 +2683,15 @@
 
     if (showPrompt) {
       let checkbox = {value:false};
-      let bundle = document.getElementById("bundle_messenger");
-      let title = bundle.getFormattedString(aCommand + "FolderTitle", [aFolder.prettyName]);
-      let msg = bundle.getString(aCommand + "FolderMessage");
+      let title = gFolderTreeView.messengerBundle
+        .getFormattedString(aCommand + "FolderTitle", [aFolder.prettyName]);
+      let msg = gFolderTreeView.messengerBundle.getString(aCommand + "FolderMessage");
       let ok = Services.prompt.confirmEx(window,
                                          title,
                                          msg,
                                          Services.prompt.STD_YES_NO_BUTTONS,
                                          null, null, null,
-                                         bundle.getString(aCommand + "DontAsk"),
+                                         gFolderTreeView.messengerBundle.getString(aCommand + "DontAsk"),
                                          checkbox) == 0;
       if (checkbox.value)
         Services.prefs.setBoolPref("mailnews." + aCommand + ".dontAskAgain", true);
@@ -2678,3 +2772,74 @@
   }
 }
 
+var gFolderStatsHelpers = {
+    kUnknownSize: "-",
+    sumSubfoldersPref: false,
+    sumSubfolders: false,
+    sizeUnits: "",
+    kiloUnit: "KB",
+    megaUnit: "MB",
+
+    init: function() {
+      // We cache these values because the cells in the folder pane columns
+      // using these helpers can be redrawn often.
+      this.sumSubfoldersPref = Services.prefs.getBoolPref("mail.folderpane.sumSubfolders");
+      this.sizeUnits = Services.prefs.getCharPref("mail.folderpane.sizeUnits");
+      this.kiloUnit = gFolderTreeView.messengerBundle.getString("kiloByteAbbreviation2");
+      this.megaUnit = gFolderTreeView.messengerBundle.getString("megaByteAbbreviation2");
+    },
+
+    /**
+     * Add a prefix to denote the value is actually a sum of all the subfolders.
+     * The prefix is useful as this sum may not always be the exact sum of individual
+     * folders when they are shown expanded (due to rounding to a unit).
+     * E.g. folder1 600bytes -> 1KB, folder2 700bytes -> 1KB
+     * summarized at parent folder: 1300bytes -> 1KB
+     */
+    addSummarizedPrefix: function(aValue) {
+      if (!this.sumSubfolders)
+        return aValue;
+
+      return gFolderTreeView.messengerBundle
+        .getFormattedString("folderSummarizedValue", [aValue]);
+    },
+
+    /**
+     * nsIMsgFolder uses -1 as a magic number to mean "I don't know". In those
+     * cases we indicate it to the user. The user has to open the folder
+     * so that the property is initialized from the DB.
+     */
+    fixNum: function(aNumber) {
+      if (aNumber < 0)
+        return this.kUnknownSize;
+
+      return (aNumber == 0 ? "" : this.addSummarizedPrefix(aNumber));
+    },
+
+    /**
+     * Recursively get the size of specified folder and all its subfolders.
+     */
+    getFolderSize: function(aFolder) {
+      let size = 0;
+      try {
+        size = aFolder.sizeOnDisk;
+        if (size < 0)
+          return this.kUnknownSize;
+      } catch(ex) {
+        return this.kUnknownSize;
+      }
+      if (this.sumSubfolders && aFolder.hasSubFolders) {
+        let subFolders = aFolder.subFolders;
+        while (subFolders.hasMoreElements()) {
+          let subFolder = subFolders.getNext()
+            .QueryInterface(Components.interfaces.nsIMsgFolder);
+          let subSize = this.getFolderSize(subFolder);
+          if (subSize == this.kUnknownSize)
+            return subSize;
+
+          size += subSize;
+        }
+      }
+      return size;
+    }
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mail3PaneWindowCommands.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mail3PaneWindowCommands.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mail3PaneWindowCommands.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mail3PaneWindowCommands.js	2015-02-28 15:02:40.000000000 +0000
@@ -163,6 +163,7 @@
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
       case "cmd_toggleFolderPane":
+      case "cmd_toggleFolderPaneCols":
       case "cmd_toggleMessagePane":
       case "cmd_viewAllMsgs":
       case "cmd_viewUnreadMsgs":
@@ -469,6 +470,7 @@
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
       case "cmd_toggleFolderPane":
+      case "cmd_toggleFolderPaneCols":
       case "cmd_toggleMessagePane":
         // this is overridden per-mail tab
         return true;
@@ -731,6 +733,9 @@
       case "cmd_toggleFolderPane":
         MsgToggleFolderPane();
         break;
+      case "cmd_toggleFolderPaneCols":
+        gFolderTreeView.toggleCols();
+        break;
       case "cmd_toggleMessagePane":
         MsgToggleMessagePane();
         break;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailContextMenus.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailContextMenus.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailContextMenus.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailContextMenus.js	2015-02-28 15:02:40.000000000 +0000
@@ -289,8 +289,29 @@
   RestoreSelectionWithoutContentLoad(document.getElementById("folderTree"));
 }
 
-function fillFolderPaneContextMenu()
+function fillFolderPaneContextMenu(aEvent)
 {
+  let target = document.popupNode;
+  // If a column header was clicked, show the column picker.
+  if (target.localName == "treecol") {
+    let treecols = target.parentNode;
+    let nodeList = document.getAnonymousNodes(treecols);
+    let treeColPicker = null;
+    for (let i = 0; i < nodeList.length; i++) {
+      if (nodeList.item(i).localName == "treecolpicker") {
+        treeColPicker = nodeList.item(i);
+        break;
+      }
+    }
+    if (treeColPicker) {
+      let popup = document.getAnonymousElementByAttribute(treeColPicker, "anonid", "popup");
+      treeColPicker.buildPopup(popup);
+      popup.openPopup(target, "after_start", 0, 0, true);
+    }
+    return false;
+  }
+
+  // Do not show menu if rows are selected.
   var bundle = document.getElementById("bundle_messenger");
   var folders = gFolderTreeView.getSelectedFolders();
   if (!folders.length)
@@ -506,7 +527,7 @@
   hideIfAppropriate("folderPaneContext-sep2");
   hideIfAppropriate("folderPaneContext-sep3");
 
-  return(true);
+  return true;
 }
 
 function ShowMenuItem(id, showItem)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailCore.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailCore.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailCore.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailCore.js	2015-02-28 15:02:40.000000000 +0000
@@ -508,9 +508,10 @@
 
 function openSavedFilesWnd()
 {
-  Components.classes['@mozilla.org/download-manager-ui;1']
-            .getService(Components.interfaces.nsIDownloadManagerUI)
-            .show(window);
+  let tabmail = document.getElementById("tabmail");
+  tabmail.openTab("chromeTab",
+                  { chromePage: "about:downloads",
+                    clickHandler: "specialTabs.aboutClickHandler(event);" });
 }
 
 function SetBusyCursor(window, enable)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailTabs.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailTabs.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailTabs.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailTabs.js	2015-02-28 15:02:40.000000000 +0000
@@ -751,6 +751,7 @@
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
       case "cmd_toggleFolderPane":
+      case "cmd_toggleFolderPaneCols":
       case "cmd_toggleMessagePane":
         return true;
 
@@ -766,6 +767,7 @@
       case "cmd_viewWideMailLayout":
       case "cmd_viewVerticalMailLayout":
       case "cmd_toggleFolderPane":
+      case "cmd_toggleFolderPaneCols":
       case "cmd_toggleMessagePane":
         // If the thread pane is illegal, these are all disabled
         if (!aTab.mode.legalPanes.thread)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailWindow.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailWindow.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailWindow.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailWindow.js	2015-02-28 15:02:40.000000000 +0000
@@ -10,7 +10,6 @@
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource:///modules/gloda/log4moz.js");
 Components.utils.import("resource:///modules/gloda/public.js");
-Components.utils.import("resource:///modules/glodaWebSearch.js");
 
 //This file stores variables common to mail windows
 var messenger;
@@ -109,8 +108,6 @@
   msgWindow.rootDocShell.appType = Components.interfaces.nsIDocShell.APP_TYPE_MAIL;
   // Ensure we don't load xul error pages into the main window
   msgWindow.rootDocShell.useErrorPages = false;
-
-  GlodaWebSearch.onLoad();
 }
 
 // We're going to implement our status feedback for the mail window in JS now.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailWindowOverlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailWindowOverlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailWindowOverlay.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailWindowOverlay.js	2015-02-28 15:02:40.000000000 +0000
@@ -193,6 +193,17 @@
     folderPaneAppMenuItem.setAttribute("checked", gFolderDisplay.folderPaneVisible);
   }
 
+  let colsEnabled = Services.prefs.getBoolPref("mail.folderpane.showColumns");
+  let folderPaneColsMenuItem = document.getElementById("menu_showFolderPaneCols");
+  if (!folderPaneColsMenuItem.hidden) { // Hidden in the standalone msg window.
+    folderPaneColsMenuItem.setAttribute("checked", colsEnabled);
+  }
+
+  folderPaneColsMenuItem = document.getElementById("appmenu_showFolderPaneCols");
+  if (!folderPaneColsMenuItem.hidden) { // Hidden in the standalone msg window.
+    folderPaneColsMenuItem.setAttribute("checked", colsEnabled);
+  }
+
   // Disable some menus if account manager is showing
   document.getElementById("viewSortMenu").disabled = accountCentralDisplayed;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailWindowOverlay.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailWindowOverlay.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/mailWindowOverlay.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/mailWindowOverlay.xul	2015-02-28 15:02:40.000000000 +0000
@@ -132,6 +132,7 @@
    <command id="cmd_viewWideMailLayout" oncommand="goDoCommand('cmd_viewWideMailLayout')" disabled="true"/>
    <command id="cmd_viewVerticalMailLayout" oncommand="goDoCommand('cmd_viewVerticalMailLayout')" disabled="true"/>
    <command id="cmd_toggleFolderPane" oncommand="goDoCommand('cmd_toggleFolderPane')" disabled="true"/>
+   <command id="cmd_toggleFolderPaneCols" oncommand="goDoCommand('cmd_toggleFolderPaneCols')" disabled="true"/>
    <command id="cmd_toggleMessagePane" oncommand="goDoCommand('cmd_toggleMessagePane')" disabled="true"/>
    <command id="cmd_viewAllMsgs" oncommand="goDoCommand('cmd_viewAllMsgs')" disabled="true"/>
    <command id="cmd_viewUnreadMsgs" oncommand="goDoCommand('cmd_viewUnreadMsgs')" disabled="true"/>
@@ -625,7 +626,7 @@
 
     <menuitem id="mailContext-searchTheWeb"
               label="[glodaComplete.webSearch1.label]"
-              oncommand="openSearchTab(event.target.value)"/>
+              oncommand="openWebSearch(event.target.value)"/>
 
     <!-- Spellchecking general menu items (enable, add dictionaries...) -->
     <menuseparator id="mailContext-spell-separator"/>
@@ -901,7 +902,7 @@
   </menupopup>
 
   <menupopup id="folderPaneContext"
-             onpopupshowing="return fillFolderPaneContextMenu();"
+             onpopupshowing="return fillFolderPaneContextMenu(event);"
              onpopuphiding="if (event.target == this) folderPaneOnPopupHiding();">
     <menuitem id="folderPaneContext-getMessages"
               label="&folderContextGetMessages.label;"
@@ -1346,6 +1347,10 @@
                           type="checkbox"
                           label="&showFolderPaneCmd.label;"
                           command="cmd_toggleFolderPane"/>
+                <menuitem id="appmenu_showFolderPaneCols"
+                          type="checkbox"
+                          label="&showFolderPaneColsCmd.label;"
+                          command="cmd_toggleFolderPaneCols"/>
                 <menuitem id="appmenu_showMessage"
                           type="checkbox"
                           label="&showMessageCmd.label;"
@@ -2368,6 +2373,8 @@
             <menuseparator id="viewMenuAfterPaneVerticalSeparator"/>
             <menuitem id="menu_showFolderPane" type="checkbox" label="&showFolderPaneCmd.label;"
                       accesskey="&showFolderPaneCmd.accesskey;" command="cmd_toggleFolderPane"/>
+            <menuitem id="menu_showFolderPaneCols" type="checkbox" label="&showFolderPaneColsCmd.label;"
+                      accesskey="&showFolderPaneColsCmd.accesskey;" command="cmd_toggleFolderPaneCols"/>
             <menuitem id="menu_showMessage" type="checkbox" label="&showMessageCmd.label;" key="key_toggleMessagePane"
                       accesskey="&showMessageCmd.accesskey;" command="cmd_toggleMessagePane"/>
           </menupopup>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/messageWindow.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/messageWindow.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/messageWindow.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/messageWindow.js	2015-02-28 15:02:40.000000000 +0000
@@ -547,6 +547,14 @@
   if (folderPane_menuitem)
     folderPane_menuitem.setAttribute("hidden", "true");
 
+  let folderPaneCols_menuitem = document.getElementById("menu_showFolderPaneCols");
+  if (folderPaneCols_menuitem)
+    folderPaneCols_menuitem.setAttribute("hidden", "true");
+
+  folderPaneCols_menuitem = document.getElementById("appmenu_showFolderPaneCols");
+  if (folderPaneCols_menuitem)
+    folderPaneCols_menuitem.setAttribute("hidden", "true");
+
   var showSearch_showMessage_Separator = document.getElementById('menu_showSearch_showMessage_Separator');
   if (showSearch_showMessage_Separator)
     showSearch_showMessage_Separator.setAttribute("hidden", "true");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/messenger.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/messenger.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/messenger.css	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/messenger.css	2015-02-28 15:02:40.000000000 +0000
@@ -8,12 +8,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: mail xbl bindings ::::: */
-
-.autocomplete-richlistitem[type="websearch"] {
-  -moz-binding: url("chrome://messenger/content/webSearch.xml#websearch");
-}
-
 /* attachment list styles */
 
 attachmentlist {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/messenger.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/messenger.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/messenger.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/messenger.xul	2015-02-28 15:02:40.000000000 +0000
@@ -19,7 +19,6 @@
 <?xul-overlay href="chrome://messenger/content/editContactOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/specialTabs.xul"?>
 <?xul-overlay href="chrome://messenger/content/preferences/preferencesTab.xul"?>
-<?xul-overlay href="chrome://messenger/content/webSearchTab.xul"?>
 <?xul-overlay href="chrome://messenger/content/quickFilterBar.xul"?>
 #ifdef XP_MACOSX
 <?xul-overlay href="chrome://messenger/content/macMessengerOverlay.xul"?>
@@ -362,7 +361,7 @@
 
           <box id="messengerBox" orient="horizontal" flex="1" minheight="100" height="100" persist="height">
             <vbox id="folderPaneBox" minwidth="125" width="200" persist="width">
-              <label id="folderColumnLabel" hidden="true" value="&folderColumn.label;"/>
+              <label id="folderColumnLabel" hidden="true" value="&folderNameColumn.label;"/>
               <sidebarheader id="folderPaneHeader" hidden="true" align="center">
                 <label id="folderpane-title" crop="end" flex="1"/>
                 <toolbarbutton id="folderview-cycler-prev"
@@ -386,14 +385,40 @@
                     onselect="FolderPaneSelectionChange();">
                 <treecols id="folderPaneCols">
                   <treecol id="folderNameCol"
+                           label2="&folderNameColumn.label;"
                            flex="5"
                            crop="center"
                            persist="width"
                            hideheader="true"
                            ignoreincolumnpicker="true"
-                           primary="true"
-                           sortActive="true"
-                           sortDirection="ascending"/>
+                           primary="true"/>
+                  <splitter class="tree-splitter"/>
+                  <treecol id="folderUnreadCol"
+                           label2="&folderUnreadColumn.label;"
+                           tooltiptext="&folderUnreadColumn.label;"
+                           hideheader="true"
+                           hidden="true"
+                           persist="width hidden"
+                           width="50"
+                           selectable="false"/>
+                  <splitter class="tree-splitter"/>
+                  <treecol id="folderTotalCol"
+                           label2="&folderTotalColumn.label;"
+                           tooltiptext="&folderTotalColumn.label;"
+                           hideheader="true"
+                           hidden="true"
+                           persist="width hidden"
+                           width="50"
+                           selectable="false"/>
+                  <splitter class="tree-splitter"/>
+                  <treecol id="folderSizeCol"
+                           label2="&folderSizeColumn.label;"
+                           tooltiptext="&folderSizeColumn.label;"
+                           hideheader="true"
+                           hidden="true"
+                           persist="width hidden"
+                           width="50"
+                           selectable="false"/>
                 </treecols>
                 <treechildren tooltip="folderpopup"
                               onoverflow="document.getElementById('folderPaneHeader').setAttribute('overflowing', 'true');"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/msgMail3PaneWindow.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/msgMail3PaneWindow.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/msgMail3PaneWindow.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/msgMail3PaneWindow.js	2015-02-28 15:02:40.000000000 +0000
@@ -469,6 +469,7 @@
   CreateMailWindowGlobals();
   GetMessagePaneWrapper().collapsed = true;
   msgDBCacheManager.init();
+  Services.search.init();
 
   // This needs to be before we throw up the account wizard on first run.
   try {
@@ -510,7 +511,6 @@
   // This also registers the contentTabType ("contentTab")
   specialTabs.openSpecialTabsOnStartup();
   preferencesTabType.initialize();
-  webSearchTabType.initialize();
   tabmail.registerTabType(accountProvisionerTabType);
 
   // verifyAccounts returns true if the callback won't be called
@@ -712,8 +712,6 @@
   let tabmail = document.getElementById("tabmail");
   tabmail._teardown();
 
-  webSearchTabType.shutdown();
-
   MailServices.mailSession.RemoveFolderListener(folderListener);
 
   gPhishingDetector.shutdown();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/nsContextMenu.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/nsContextMenu.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/nsContextMenu.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/nsContextMenu.js	2015-02-28 15:02:40.000000000 +0000
@@ -15,7 +15,6 @@
 });
 
 var gSpellChecker = new InlineSpellChecker();
-var gGlodaBundle = null;
 
 function nsContextMenu(aXulMenu, aIsShift) {
   this.target         = null;
@@ -181,22 +180,23 @@
                   this.isContentSelected);
 
     if (!searchTheWeb.hidden) {
-      let selection = document.commandDispatcher.focusedWindow.getSelection();
-      if (gGlodaBundle === null)
-        gGlodaBundle = Services.strings.createBundle(
-          "chrome://messenger/locale/glodaComplete.properties");
-
-      let key = "glodaComplete.webSearch1.label";
-      let selString = selection.toString();
-      if (selString.length > 15) {
+      let selection = document.commandDispatcher.focusedWindow.getSelection()
+                              .toString();
+
+      let bundle = document.getElementById("bundle_messenger");
+      let key = "openSearch.label";
+      let abbrSelection;
+      if (selection.length > 15) {
         key += ".truncated";
-        selString = selString.slice(0, 15);
+        abbrSelection = selection.slice(0, 15);
+      } else {
+        abbrSelection = selection;
       }
 
-      searchTheWeb.label = gGlodaBundle.GetStringFromName(key)
-                                      .replace("#1", Services.search.currentEngine.name)
-                                      .replace("#2", selString);
-      searchTheWeb.value = selection.toString();
+      searchTheWeb.label = bundle.getFormattedString(key, [
+        Services.search.currentEngine.name, abbrSelection
+      ]);
+      searchTheWeb.value = selection;
     }
   },
   initMediaPlayerItems: function CM_initMediaPlayerItems() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/utilityOverlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/utilityOverlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/utilityOverlay.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/utilityOverlay.js	2015-02-28 15:02:41.000000000 +0000
@@ -1,4 +1,3 @@
-/* -*- Mode: Java; 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/. */
@@ -190,6 +189,23 @@
 }
 
 /**
+ * Open a web search in the default browser for a given query.
+ *
+ * @param query the string to search for
+ * @param engine (optional) the search engine to use
+ */
+function openWebSearch(query, engine)
+{
+  Services.search.init({
+    onInitComplete: function() {
+      if (!engine)
+        engine = Services.search.currentEngine;
+      openLinkExternally(engine.getSubmission(query).uri.spec);
+    }
+  });
+}
+
+/**
  * Open the specified tab type (possibly in a new window)
  *
  * @param tabType the tab type to open (e.g. "contentTab")
@@ -243,36 +259,6 @@
 }
 
 /**
- * Open a search page for the specified query in a new tab, window, or
- * externally. If mail.websearch.open_externally is true, always open
- * externally.
- *
- * @param query the term to search for
- * @param where 'tab' to open in a new tab (default), 'window' to open in a
- *        new window, or 'external' to open in the default browser
- */
-function openSearchTab(query, where) {
-  let currentEngine = Services.search.currentEngine;
-  let submission = currentEngine.getSubmission(query);
-
-  if (where == "external" ||
-      Services.prefs.getBoolPref("mail.websearch.open_externally")) {
-    openLinkExternally(submission.uri.spec);
-    return;
-  }
-
-  let params = {
-    background: false,
-    contentPage: submission.uri.spec,
-    postData: submission.postData,
-    query: query,
-    engine: currentEngine,
-    clickHandler: "webSearchTabType.siteClickHandler(event)",
-  };
-  openTab("webSearchTab", params, where);
-}
-
-/**
  * Open the preferences page for the specified query in a new tab.
  *
  * @param paneID     ID of prefpane to select automatically.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/webSearchTab.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/webSearchTab.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/webSearchTab.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/webSearchTab.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,355 +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/. */
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource:///modules/errUtils.js");
-
-/**
- * A tab to show search results.
- */
-let webSearchTabType = {
-  __proto__: contentTabBaseType,
-  name: "webSearchTab",
-  perTabPanel: "vbox",
-  lastBrowserId: 0,
-  bundle: Services.strings.createBundle(
-    "chrome://messenger/locale/messenger.properties"),
-  protoSvc: Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
-                      .getService(Components.interfaces.nsIExternalProtocolService),
-
-  get loadingTabString() {
-    delete this.loadingTabString;
-    return this.loadingTabString = document.getElementById("bundle_messenger")
-                                           .getString("loadingTab");
-  },
-
-  modes: {
-    webSearchTab: {
-      type: "webSearchTab",
-      maxTabs: 10
-    }
-  },
-
-  initialize: function() {
-    let browser = document.getElementById("dummywebsearchbrowser");
-
-    // Manually hook up session and global history for the first browser
-    // so that we don't have to load global history before bringing up a
-    // window.
-    // Wire up session and global history before any possible
-    // progress notifications for back/forward button updating
-    browser.webNavigation.sessionHistory =
-      Components.classes["@mozilla.org/browser/shistory;1"]
-                .createInstance(Components.interfaces.nsISHistory);
-    Services.obs.addObserver(browser, "browser:purge-session-history", false);
-
-    // remove the disablehistory attribute so the browser cleans up, as
-    // though it had done this work itself
-    browser.removeAttribute("disablehistory");
-
-    let tabmail = document.getElementById("tabmail");
-    tabmail.registerTabType(this);
-    Services.obs.addObserver(this, "browser-search-engine-modified", false);
-  },
-
-  shutdown: function webSearchTabType_shutdown() {
-    try {
-      Services.obs.removeObserver(this, "browser-search-engine-modified");
-    }
-    catch (e) {
-      dump("webSearchTabType: failed to remove search-engine-modified observer: " +
-           e.toString() + "\n");
-    }
-    let browser = document.getElementById("dummywebsearchbrowser");
-    try {
-      Services.obs.removeObserver(browser, "browser:purge-session-history");
-    }
-    catch (e) {
-      dump("webSearchTabType: failed to remove browser:purge-session-history observer: " +
-           e.toString() + "\n");
-    }
-  },
-
-  openTab: function onTabOpened(aTab, aArgs) {
-    if (!"contentPane" in aArgs || !"engine" in aArgs || !"query" in aArgs)
-      throw("contentPage, engine, and query must be specified");
-
-    // First clone the page and set up the basics.
-    let clone = document.getElementById("webSearchTab").firstChild
-                        .cloneNode(true);
-
-    clone.setAttribute("id", "webSearchTab" + this.lastBrowserId);
-    clone.setAttribute("collapsed", false);
-
-    aTab.panel.appendChild(clone);
-
-    aTab.engines = clone.querySelector(".engines");
-    aTab.defaultButton = clone.querySelector(".defaultButton");
-
-    // Start setting up the browser.
-    aTab.browser = aTab.panel.querySelector("browser");
-
-    // As we're opening this tab, showTab may not get called, so set
-    // the type according to if we're opening in background or not.
-    let background = ("background" in aArgs) && aArgs.background;
-    aTab.browser.setAttribute("type", background ? "content-targetable" :
-                                                   "content-primary");
-
-    aTab.browser.setAttribute("id", "webSearchTabBrowser" + this.lastBrowserId);
-
-    aTab.clickHandler = "clickHandler" in aArgs && aArgs.clickHandler ?
-                        aArgs.clickHandler :
-                        "specialTabs.defaultClickHandler(event);";
-    aTab.browser.setAttribute("onclick", aTab.clickHandler);
-
-    aTab.browser.addEventListener("DOMLinkAdded", DOMLinkHandler, false);
-    gPluginHandler.addEventListeners(aTab.browser);
-
-    // Now initialise the find bar.
-    aTab.findbar = aTab.panel.querySelector("findbar");
-    aTab.findbar.setAttribute("browserid",
-                              "webSearchTabBrowser" + this.lastBrowserId);
-
-    // Default to reload being disabled.
-    aTab.reloadEnabled = false;
-
-    aTab.currentEngine = aArgs.engine;
-    aTab.query = aArgs.query;
-
-    this._setEngineButtons(aTab, aArgs.engine.name);
-
-    // Now set up the listeners.
-    this._setUpTitleListener(aTab);
-    this._setUpCloseWindowListener(aTab);
-    this._setUpBrowserListener(aTab);
-
-    // Now start loading the content.
-    aTab.title = this.loadingTabString;
-
-    this._setDefaultButtonState(aTab, aTab.currentEngine ==
-                                      Services.search.currentEngine);
-
-    // Set up onclick/oncommand listeners.
-    let self = this;
-    aTab.engines.addEventListener("command", function(event) {
-      if (event.target.localName != "toolbarbutton")
-        return;
-      self._doSearch(aTab, event.target.engine);
-      self._setDefaultButtonState(aTab, aTab.currentEngine ==
-                                        Services.search.currentEngine);
-    }, true);
-    aTab.defaultButton.addEventListener("click", function () {
-      Services.search.currentEngine = aTab.currentEngine;
-      self._setDefaultButtonState(aTab, true);
-    }, true);
-
-    aTab.browser.loadURIWithFlags(aArgs.contentPage, null, null, null,
-                                  (aArgs.postData || null));
-
-    goUpdateCommand("cmd_goBackSearch");
-    goUpdateCommand("cmd_goForwardSearch");
-
-    this.lastBrowserId++;
-  },
-
-  _setEngineButtons: function webSearchTab_setEngineButtons(aTab, currentEngineName) {
-    // Default to the passed-in default for current engine, will be overridden
-    // if an existing engine is checked
-    let checkedEngine = currentEngineName;
-
-    // Clear out any existing search engine buttons
-    let ch = null;
-    while ((ch = aTab.engines.lastChild)) {
-      if (ch.getAttribute("checked")) {
-        checkedEngine = ch.getAttribute("tooltiptext");
-      }
-      ch.remove();
-    }
-
-    // Register new buttons for all the search engines
-    for each (let engine in Services.search.getVisibleEngines()) {
-      let button = document.createElement("toolbarbutton");
-      button.setAttribute("type", "radio");
-      button.setAttribute("group", "engines");
-      button.setAttribute("image",
-          engine.iconURI ? engine.iconURI.spec : "resource://gre-resources/broken-image.png");
-      button.setAttribute("tooltiptext", engine.name);
-      button.engine = engine;
-      if (checkedEngine == engine.name)
-        button.setAttribute("checked", true);
-      aTab.engines.appendChild(button);
-    }
-  },
-
-  // receive updates when the list of search engines changes
-  observe: function webSearchTab_observe(aEngine, aTopic, aVerb) {
-    if (aTopic == "browser-search-engine-modified") {
-      let tabmail = document.getElementById("tabmail");
-      let searchTabs = tabmail.tabModes["webSearchTab"].tabs;
-      for (let i = 0 ; i < searchTabs.length ; i++) {
-        this._setEngineButtons(searchTabs[i], null);
-      }
-    }
-  },
-
-  persistTab: function onPersistTab(aTab) {
-    if (aTab.browser.currentURI.spec == "about:blank")
-      return null;
-
-    let onClick = aTab.clickHandler;
-
-    return { tabURI: aTab.browser.currentURI.spec,
-             query: aTab.query,
-             engine: aTab.currentEngine.name,
-             clickHandler: onClick ? onClick : null,
-           };
-  },
-
-  restoreTab: function onRestoreTab(aTabmail, aPersistedState) {
-    let engine = Services.search.getEngineByName(aPersistedState.engine);
-    aTabmail.openTab("webSearchTab",
-                     { contentPage: aPersistedState.tabURI,
-                       clickHandler: aPersistedState.clickHandler,
-                       query: aPersistedState.query,
-                       engine: engine,
-                       background: true,
-                     });
-  },
-
-  siteClickHandler: function(aEvent) {
-    // Don't handle events that: a) aren't trusted, b) have already been
-    // handled or c) aren't left-click.
-    if (!aEvent.isTrusted || aEvent.defaultPrevented || aEvent.button)
-      return true;
-
-    let href = hRefForClickEvent(aEvent, true);
-    if (href) {
-      let tab = document.getElementById("tabmail").selectedTab;
-      let preUri = tab.browser.currentURI;
-      let postUri = makeURI(href);
-
-      if (!this.protoSvc.isExposedProtocol(postUri.scheme) ||
-          postUri.schemeIs("http") || postUri.schemeIs("https")) {
-        if (!this._isInEngine(tab.currentEngine, preUri, postUri)) {
-          aEvent.preventDefault();
-          openLinkExternally(href);
-        }
-      }
-    }
-    return false;
-  },
-
-  commands: {
-    cmd_goBackSearch: {
-      isEnabled: function(aTab) {
-        return aTab.browser.canGoBack;
-      },
-      doCommand: function(aTab) {
-        aTab.browser.goBack();
-      }
-    },
-
-    cmd_goForwardSearch: {
-      isEnabled: function(aTab) {
-        return aTab.browser.canGoForward;
-      },
-      doCommand: function(aTab) {
-        aTab.browser.goForward();
-      }
-    },
-  },
-
-  supportsCommand: function supportsCommand(aCommand, aTab) {
-    return (aCommand in this.commands) ||
-           this.__proto__.supportsCommand(aCommand, aTab);
-  },
-
-  isCommandEnabled: function isCommandEnabled(aCommand, aTab) {
-    if (!this.supportsCommand(aCommand))
-      return false;
-
-    if (aCommand in this.commands)
-      return this.commands[aCommand].isEnabled(aTab);
-    else
-      return this.__proto__.isCommandEnabled(aCommand, aTab);
-  },
-
-  doCommand: function doCommand(aCommand, aTab) {
-    if (!this.supportsCommand(aCommand))
-      return;
-
-    if (aCommand in this.commands) {
-      var cmd = this.commands[aCommand];
-      if (!cmd.isEnabled(aTab))
-        return;
-      cmd.doCommand(aTab);
-    } else {
-      this.__proto__.doCommand(aCommand, aTab);
-    }
-  },
-
-  _doSearch: function(aTab, engine) {
-    aTab.currentEngine = engine;
-    let submission = aTab.currentEngine.getSubmission(aTab.query);
-
-    aTab.browser.loadURIWithFlags(submission.uri.spec, null, null, null,
-                                  submission.postData);
-  },
-
-  _isInEngine: function(aEngine, aPreUri, aPostUri) {
-    switch (aEngine.name) {
-      case "Google":
-        return aPreUri.host == aPostUri.host &&
-               aPostUri.path.startsWith("/search?");
-      case "Yahoo":
-        return aPostUri.host.endsWith("search.yahoo.com") &&
-               !aPostUri.path.startsWith("/r/");
-    }
-
-    return aPreUri.host == aPostUri.host;
-  },
-
-  _setDefaultButtonState: function setDefaultButtonState(aTab, isDefault) {
-    aTab.defaultButton.checked = isDefault;
-    let key = "websearch." + (isDefault ? "isDefault" : "setDefault");
-    aTab.defaultButton.tooltipText = this.bundle.GetStringFromName(key);
-  },
-
-  _setUpBrowserListener: function setUpBrowserListener(aTab) {
-    // Browser navigation (front/back) does not cause onDOMContentLoaded,
-    // so we have to use nsIWebProgressListener
-    this.progressListener = {
-      QueryInterface: XPCOMUtils.generateQI([
-        Components.interfaces.nsIWebProgressListener,
-        Components.interfaces.nsISupportsWeakReference,
-      ]),
-
-      onLocationChange: function(aProgress, aRequest, aURI) {
-        goUpdateCommand("cmd_goBackSearch");
-        goUpdateCommand("cmd_goForwardSearch");
-      },
-
-      onStateChange: function(aWebProgress, aRequest, aFlag, aStatus) {},
-      onProgressChange: function(aWebProgress, aRequest, curSelf, maxSelf,
-                                 curTot, maxTot) {},
-      onStatusChange: function(aWebProgress, aRequest, aStatus, aMessage) {},
-      onSecurityChange: function(aWebProgress, aRequest, aState) {},
-    };
-
-    aTab.browser.addProgressListener(this.progressListener);
-
-    // Create a filter and hook it up to our browser
-    aTab.filter = Components.classes["@mozilla.org/appshell/component/browser-status-filter;1"]
-                            .createInstance(Components.interfaces.nsIWebProgress);
-
-    // Wire up a progress listener to the filter for this browser
-    aTab.progressListener = new tabProgressListener(aTab, false);
-
-    aTab.filter.addProgressListener(aTab.progressListener,
-                                    Components.interfaces.nsIWebProgress.NOTIFY_ALL);
-    aTab.browser.webProgress.addProgressListener(aTab.filter,
-                                                 Components.interfaces.nsIWebProgress.NOTIFY_ALL);
-  },
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/webSearchTab.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/webSearchTab.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/webSearchTab.xul	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/webSearchTab.xul	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-<?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/. -->
-
-<?xml-stylesheet href="chrome://messenger/skin/webSearch.css" type="text/css"?>
-
-<overlay id="websearch-overlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript"
-          src="chrome://messenger/content/webSearchTab.js"/>
-
-  <commandset id="webSearchItems" commandupdater="true">
-    <command id="cmd_goBackSearch" oncommand="goDoCommand('cmd_goBackSearch')"/>
-    <command id="cmd_goForwardSearch" oncommand="goDoCommand('cmd_goForwardSearch')"/>
-  </commandset>
-
-
-  <hbox id="tabmail-container">
-    <vbox id="webSearchTab" collapsed="true">
-      <vbox flex="1">
-        <toolbox id="dummywebsearchtoolbox" class="contentTabToolbox">
-          <toolbar id="dummywebsearchtoolbar" class="contentTabToolbar"/>
-        </toolbox>
-        <hbox flex="1">
-          <vbox class="navbar">
-            <vbox class="navbuttons">
-              <toolbarbutton class="back" command="cmd_goBackSearch"/>
-              <toolbarbutton class="forward" command="cmd_goForwardSearch"/>
-            </vbox>
-            <arrowscrollbox class="engines" orient="vertical"
-                            flex="1"/>
-            <button class="defaultButton" type="checkbox"/>
-          </vbox>
-          <browser id="dummywebsearchbrowser" type="content-targetable" flex="1"
-                   disablehistory="true" autocompletepopup="PopupAutoComplete"
-                   context="mailContext"/>
-        </hbox>
-        <findbar browserid="dummywebsearchbrowser"/>
-      </vbox>
-    </vbox>
-  </hbox>
-</overlay>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/webSearch.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/webSearch.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/content/webSearch.xml	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/content/webSearch.xml	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/. -->
-
-<bindings id="autocompleteBindings"
-          xmlns="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"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-  <binding id="websearch" extends="chrome://gloda/content/glodacomplete.xml#glodacomplete-base-richlistitem">
-    <content orient="horizontal">
-      <xul:image anonid="icon"/>
-      <xul:description anonid="explanation" class="explanation websearch"/>
-    </content>
-    <implementation implements="nsIDOMXULSelectControlItemElement">
-      <constructor>
-        <![CDATA[
-          this._explanation = document.getAnonymousElementByAttribute(
-            this, "anonid", "explanation");
-          this.bundle = Services.strings.createBundle(
-            "chrome://messenger/locale/glodaComplete.properties");
-          this._adjustAcItem();
-          ]]>
-      </constructor>
-
-      <property name="label" readonly="true">
-        <getter>
-          <![CDATA[
-            return this.bundle
-                       .GetStringFromName("glodaComplete.webSearch1.label")
-                       .replace("#1", Services.search.currentEngine.name)
-                       .replace("#2", this.row.item.tag);
-          ]]>
-        </getter>
-      </property>
-
-      <method name="_adjustAcItem">
-        <body>
-          <![CDATA[
-            this._explanation.value =
-              this.bundle.GetStringFromName("glodaComplete.webSearch1.label")
-                         .replace("#1", Services.search.currentEngine.name)
-                         .replace("#2", this.row.term);
-          ]]>
-        </body>
-      </method>
-    </implementation>
-  </binding>
-</bindings>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/jar.mn	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/jar.mn	2015-02-28 15:02:41.000000000 +0000
@@ -48,9 +48,6 @@
 *   content/messenger/plugins.js                    (content/plugins.js)
     content/messenger/specialTabs.js                (content/specialTabs.js)
     content/messenger/specialTabs.xul               (content/specialTabs.xul)
-    content/messenger/webSearch.xml                 (content/webSearch.xml)
-    content/messenger/webSearchTab.xul              (content/webSearchTab.xul)
-    content/messenger/webSearchTab.js               (content/webSearchTab.js)
     content/messenger/subscribe.xul                 (content/subscribe.xul)
     content/messenger/subscribe.js                  (content/subscribe.js)
 *   content/messenger/aboutDialog.xul               (content/aboutDialog.xul)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/displayNameUtils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/displayNameUtils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/displayNameUtils.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/displayNameUtils.js	2015-02-28 15:02:41.000000000 +0000
@@ -107,19 +107,15 @@
  * FormatDisplayName, then fall back to the header's display name or the
  * address.
  *
- * @param aHeaderValue  The raw header value.
+ * @param aHeaderValue  The decoded header value (e.g. mime2DecodedAuthor).
  * @param aContext      The context of the header field (e.g. "to", "from").
  * @return The formatted display name.
  */
 function FormatDisplayNameList(aHeaderValue, aContext) {
-  let addresses = {}, fullNames = {}, names = {};
-  let numAddresses = MailServices.headerParser.parseHeadersWithArray(
-    aHeaderValue, addresses, names, fullNames
-  );
-
-  if (numAddresses > 0) {
-    return FormatDisplayName(addresses.value[0], names.value[0], aContext) ||
-      names.value[0] || addresses.value[0];
+  let addresses = MailServices.headerParser.parseDecodedHeader(aHeaderValue);
+  if (addresses.length > 0) {
+    return FormatDisplayName(addresses[0].email, addresses[0].name, aContext) ||
+      addresses[0].name || addresses[0].email;
   }
   else {
     // Something strange happened, just return the raw header value.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/glodaWebSearch.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/glodaWebSearch.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/glodaWebSearch.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/glodaWebSearch.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/. */
-
-const EXPORTED_SYMBOLS = ["GlodaWebSearch"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-function ResultRowSingle(term) {
-  this.term = term;
-  this.typeForStyle = "websearch";
-  this.nounDef = null;
-}
-
-ResultRowSingle.prototype = {
-  multi: false,
-  fullText: false,
-};
-
-function GlodaWebSearchCompleter() { }
-
-GlodaWebSearchCompleter.prototype = {
-  complete: function GlodaWebSearchCompleter_complete(aResult, aString) {
-    aResult.addRows([new ResultRowSingle(aString)]);
-    // We have nothing pending.
-    return false;
-  },
-  onItemsAdded: function(aItems, aCollection) {
-  },
-  onItemsModified: function(aItems, aCollection) {
-  },
-  onItemsRemoved: function(aItems, aCollection) {
-  },
-  onQueryCompleted: function(aCollection) {
-  }
-};
-
-var GlodaWebSearch = {
-  bundle: Services.strings.createBundle(
-    "chrome://messenger/locale/glodaComplete.properties"),
-
-  _initialized: false,
-
-  onLoad: function() {
-    if (this._initialized)
-      return;
-    this._initialized = true;
-
-    Services.obs.addObserver(this, "autocomplete-did-enter-text", false);
-    this.glodaCompleter = Cc["@mozilla.org/autocomplete/search;1?name=gloda"]
-                            .getService().wrappedJSObject;
-
-    // Add us as the second completer.
-    this.glodaCompleter.completers.splice(1, 0, new GlodaWebSearchCompleter());
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    if (aTopic == "autocomplete-did-enter-text") {
-      let curResult = this.glodaCompleter.curResult;
-      if (!curResult)
-        return; // autocomplete didn't even finish.
-
-      let row = curResult.getObjectAt(aSubject.popup.selectedIndex);
-      if (!row || (row.typeForStyle != "websearch"))
-        return; // It's not our row.
-
-      let ownerWindow = aSubject.ownerDocument.defaultView;
-      ownerWindow.openSearchTab(aSubject.state.string);
-    }
-  },
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/mailMigrator.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/mailMigrator.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/mailMigrator.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/mailMigrator.js	2015-02-28 15:02:41.000000000 +0000
@@ -98,7 +98,7 @@
   _migrateUI: function() {
     // The code for this was ported from
     // mozilla/browser/components/nsBrowserGlue.js
-    const UI_VERSION = 9;
+    const UI_VERSION = 10;
     const MESSENGER_DOCURL = "chrome://messenger/content/messenger.xul";
     const UI_VERSION_PREF = "mail.ui-rdf.version";
     let currentUIVersion = 0;
@@ -269,6 +269,48 @@
         }
       }
 
+      // Add an expanded entry for All Address Books.
+      if (currentUIVersion < 10) {
+        let PERMS_FILE = parseInt("0644", 8);
+        let file = Services.dirsvc.get("ProfD", Ci.nsIFile);
+        file.append("directoryTree.json");
+        let data = "";
+
+        // If the file exists, read its contents, prepend the "All ABs" URI
+        // and save it, else, just write the "All ABs" URI to the file.
+        if (file.exists()) {
+          let fstream = Cc["@mozilla.org/network/file-input-stream;1"]
+                        .createInstance(Ci.nsIFileInputStream);
+          let sstream = Cc["@mozilla.org/scriptableinputstream;1"]
+                        .createInstance(Ci.nsIScriptableInputStream);
+          fstream.init(file, -1, 0, 0);
+          sstream.init(fstream);
+          while (sstream.available()) {
+            data += sstream.read(4096);
+          }
+
+          sstream.close();
+          fstream.close();
+        }
+
+        if (data == "[]") {
+          data = "";
+        } else if (data.length > 0) {
+          data = data.substring(1, data.length - 1);
+        }
+
+        data = "[" + "\"moz-abdirectory://?\"" +
+               ((data.length > 0) ? ("," + data) : "") + "]";
+
+        let foStream = Cc["@mozilla.org/network/safe-file-output-stream;1"]
+                       .createInstance(Ci.nsIFileOutputStream);
+
+        foStream.init(file, 0x02 | 0x08 | 0x20, PERMS_FILE, 0);
+        foStream.write(data, data.length);
+        foStream.QueryInterface(Ci.nsISafeOutputStream).finish();
+        foStream.close();
+      }
+
       // Update the migration version.
       Services.prefs.setIntPref(UI_VERSION_PREF, UI_VERSION);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/base/modules/moz.build	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/base/modules/moz.build	2015-02-28 15:02:41.000000000 +0000
@@ -8,7 +8,6 @@
     'dbViewWrapper.js',
     'displayNameUtils.js',
     'distribution.js',
-    'glodaWebSearch.js',
     'MailConsts.js',
     'mailInstrumentation.js',
     'mailMigrator.js',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/aboutRedirector.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/aboutRedirector.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/aboutRedirector.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/aboutRedirector.js	2015-02-28 15:02:41.000000000 +0000
@@ -24,6 +24,8 @@
                 flags: Ci.nsIAboutModule.ALLOW_SCRIPT},
     "preferences": {url: "chrome://messenger/content/preferences/aboutPreferences.xul",
                     flags: Ci.nsIAboutModule.ALLOW_SCRIPT},
+    "downloads": {url: "chrome://messenger/content/downloads/aboutDownloads.xul",
+                  flags: Ci.nsIAboutModule.ALLOW_SCRIPT},
   },
 
   /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/about-support/content/gfx.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/about-support/content/gfx.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/about-support/content/gfx.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/about-support/content/gfx.js	2015-02-28 15:02:41.000000000 +0000
@@ -5,6 +5,33 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 function populateGraphicsSection() {
+  function assembleFromGraphicsFailure(i, data)
+  {
+    // Only cover the cases we have today; for example, we do not have
+    // log failures that assert and we assume the log level is 1/error.
+    let message = data.failures[i];
+    let index = data.indices[i];
+    let what = "";
+    if (message.search(/\[GFX1-\]: \(LF\)/) == 0) {
+      // Non-asserting log failure - the message is substring(14)
+      what = "LogFailure";
+      message = message.substring(14);
+    } else if (message.search(/\[GFX1-\]: /) == 0) {
+      // Non-asserting - the message is substring(9)
+      what = "Error";
+      message = message.substring(9);
+    } else if (message.search(/\[GFX1\]: /) == 0) {
+      // Asserting - the message is substring(8)
+      what = "Assert";
+      message = message.substring(8);
+    }
+    let assembled = {"index" : index,
+                    "header" : ("(#" + index + ") " + what),
+                    "message" : message};
+    return assembled;
+  }
+  
+
   function createHeader(name)
   {
     let elem = createElement("th", name);
@@ -146,8 +173,8 @@
     // If ANGLE is not available but OpenGL is, we want to report on the OpenGL feature, because that's what's going to get used.
     // In all other cases we want to report on the ANGLE feature.
     var webglfeature = gfxInfo.FEATURE_WEBGL_ANGLE;
-    if (gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_ANGLE)  != gfxInfo.FEATURE_NO_INFO &&
-        gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_OPENGL) == gfxInfo.FEATURE_NO_INFO)
+    if (gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_ANGLE)  != gfxInfo.FEATURE_STATUS_OK &&
+        gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_OPENGL) == gfxInfo.FEATURE_STATUS_OK)
       webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
 #else
     var webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
@@ -167,11 +194,46 @@
 
     // display any failures that have occurred
     let graphics_failures_tbody = document.getElementById("graphics-failures-tbody");
-    let trGraphicsFailures = gfxInfo.getFailures().map(function (value)
-        createParentElement("tr", [
-            createElement("td", value)
-        ])
-    );
+
+    let data = {failures: [], indices: []};
+
+    let failureCount = {};
+    let failureIndices = {};
+
+    let failures = gfxInfo.getFailures(failureCount, failureIndices);
+    if (failures.length) {
+      data.failures = failures;
+      if (failureIndices.value.length == failures.length) {
+        data.indices = failureIndices.value;
+      }
+    }
+    let trGraphicFailures;
+    // If indices is there, it should be the same length as failures,
+    // (see Troubleshoot.jsm) but we check anyway:
+    if ("indices" in data && data.failures.length == data.indices.length) {
+      let combined = [];
+      for (let i = 0; i < data.failures.length; i++) {
+        let assembled = assembleFromGraphicsFailure(i, data);
+        combined.push(assembled);
+      }
+      combined.sort(function(a,b) {
+          if (a.index < b.index) return -1;
+          if (a.index > b.index) return 1;
+          return 0;});
+      trGraphicsFailures = combined.map(function(val) {
+                               createParentElement("tr", [
+                                   createElement("th", val.header, {class: "column"}),
+                                   createElement("td", val.message),
+                               ]);
+                           });
+    } else {
+      trGraphicsFailures = createParentElement("tr", [
+                               createElement("th", "LogFailure", {class: "column"}),
+                               createParentElement("td", data.failures.map(val =>
+                                   createElement("p", val)
+                           ))]);
+    }
+
     appendChildren(graphics_failures_tbody, trGraphicsFailures);
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abCardOverlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abCardOverlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abCardOverlay.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abCardOverlay.js	2015-02-28 15:02:41.000000000 +0000
@@ -204,6 +204,15 @@
 
   CheckAndSetCardValues(gEditCard.card, document, false);
 
+  // If the source directory is "All Address Books", find the parent
+  // address book of the card being edited and reflect the changes in it.
+  if (directory.URI == kAllDirectoryRoot + "?") {
+    let dirId =
+      gEditCard.card.directoryId
+                    .substring(0, gEditCard.card.directoryId.indexOf("&"));
+    directory = MailServices.ab.getDirectoryFromId(dirId);
+  }
+
   directory.modifyCard(gEditCard.card);
 
   while (foundDirectories.length) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abCommon.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abCommon.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abCommon.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abCommon.js	2015-02-28 15:02:41.000000000 +0000
@@ -12,10 +12,14 @@
 var gAbResultsTree = null;
 var gAbView = null;
 var gAddressBookBundle;
+// A boolean variable determining whether AB column should be shown in AB
+// sidebar in compose window.
+var gAbColumnInComposeSidebar = false;
 
 const kDefaultSortColumn = "GeneratedName";
 const kDefaultAscending = "ascending";
 const kDefaultDescending = "descending";
+const kAllDirectoryRoot = "moz-abdirectory://";
 const kLdapUrlPrefix = "moz-abldapdirectory://";
 const kPersonalAddressbookURI = "moz-abmdbdirectory://abook.mab";
 const kCollectedAddressbookURI = "moz-abmdbdirectory://history.mab";
@@ -39,6 +43,7 @@
       case "cmd_printcard":
       case "cmd_printcardpreview":
       case "cmd_newlist":
+      case "cmd_newCard":
         return true;
       default:
         return false;
@@ -65,8 +70,9 @@
                                   "valueList" : "valueAddressBook");
 
         if (selectedDir &&
-	    (selectedDir != kPersonalAddressbookURI) &&
-	    (selectedDir != kCollectedAddressbookURI)) {
+            (selectedDir != kPersonalAddressbookURI) &&
+            (selectedDir != kCollectedAddressbookURI) &&
+            (selectedDir != (kAllDirectoryRoot + "?"))) {
           // If the directory is a mailing list, and it is read-only, return
           // false.
           var abDir = GetDirectoryFromURI(selectedDir);
@@ -100,13 +106,16 @@
         return (GetSelectedDirectory() != null);
       case "cmd_newlist":
         selectedDir = GetSelectedDirectory();
-        if (selectedDir) {
+        if (selectedDir && selectedDir != (kAllDirectoryRoot + "?")) {
           var abDir = GetDirectoryFromURI(selectedDir);
           if (abDir) {
             return abDir.supportsMailingLists;
           }
         }
         return false;
+      case "cmd_newCard":
+        selectedDir = GetSelectedDirectory();
+        return (selectedDir && selectedDir != (kAllDirectoryRoot + "?"));
       default:
         return false;
     }
@@ -131,6 +140,9 @@
       case "cmd_newlist":
         AbNewList();
         break;
+      case "cmd_newCard":
+        AbNewCard();
+        break;
     }
   },
 
@@ -255,6 +267,14 @@
   gDirTree = document.getElementById("dirTree");
   abList = document.getElementById("addressbookList");
   gAddressBookBundle = document.getElementById("bundle_addressBook");
+
+  // Make an entry for "All Address Books".
+  if (abList) {
+    abList.insertItemAt(0, gAddressBookBundle.getString("allAddressBooks"),
+                        kAllDirectoryRoot + "?");
+    // Select the newly added entry.
+    abList.selectedIndex = 0;
+  }
 }
 
 function AbDelete()
@@ -279,8 +299,28 @@
       confirmDeleteMessage = gAddressBookBundle.getString("confirmDeleteContacts");
   }
 
-  if (confirmDeleteMessage && Services.prompt.confirm(window, null, confirmDeleteMessage))
-    gAbView.deleteSelectedCards();
+  if (confirmDeleteMessage &&
+      Services.prompt.confirm(window, null, confirmDeleteMessage)) {
+    if (GetSelectedDirectory() != (kAllDirectoryRoot + "?")) {
+      gAbView.deleteSelectedCards();
+    } else {
+      let cards = GetSelectedAbCards();
+      for (let i = 0; i < cards.length; i++) {
+        let dirId = cards[i].directoryId
+                            .substring(0, cards[i].directoryId.indexOf("&"));
+        let directory = MailServices.ab.getDirectoryFromId(dirId);
+
+        let cardArray =
+          Components.classes["@mozilla.org/array;1"]
+                    .createInstance(Components.interfaces.nsIMutableArray);
+        cardArray.appendElement(cards[i], false);
+        if (directory)
+          directory.deleteCards(cardArray);
+      }
+
+      SetAbView(kAllDirectoryRoot + "?");
+    }
+  }
 }
 
 function AbNewCard()
@@ -449,13 +489,20 @@
 
 function DirPaneSelectionChange()
 {
+  let uri = GetSelectedDirectory();
   // clear out the search box when changing folders...
   onAbClearSearch();
   if (gDirTree && gDirTree.view.selection && gDirTree.view.selection.count == 1) {
     gPreviousDirTreeIndex = gDirTree.currentIndex;
-    ChangeDirectoryByURI(GetSelectedDirectory());
+    ChangeDirectoryByURI(uri);
+    document.getElementById("localResultsOnlyMessage")
+            .setAttribute("hidden",
+                          !gDirectoryTreeView.hasRemoteAB ||
+                          uri != kAllDirectoryRoot + "?");
   }
+
   goUpdateCommand('cmd_newlist');
+  goUpdateCommand('cmd_newCard');
 }
 
 function ChangeDirectoryByURI(uri = kPersonalAddressbookURI)
@@ -680,6 +727,7 @@
   var searchInput = document.getElementById("peopleSearchInput");
   if (searchInput)
     searchInput.value = "";
+
   onEnterInSearchBar();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abContactsPanel.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abContactsPanel.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abContactsPanel.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abContactsPanel.js	2015-02-28 15:02:41.000000000 +0000
@@ -60,6 +60,18 @@
   else
     ChangeDirectoryByURI(document.getElementById('addressbookList').value);
 
+  // Hide the addressbook column if the selected addressbook isn't
+  // all address books. Since, the value of the column is redundant in all
+  // other cases.
+  let addrbookColumn = document.getElementById("addrbook");
+  if (abList.selectedIndex == 0) {
+    addrbookColumn.setAttribute("hidden", gShowAbColumnInComposeSidebar);
+    addrbookColumn.removeAttribute("ignoreincolumnpicker");
+  } else {
+    addrbookColumn.setAttribute("hidden", "true");
+    addrbookColumn.setAttribute("ignoreincolumnpicker", "true");
+  }
+
   CommandUpdate_AddressBook();
 }
 
@@ -74,6 +86,8 @@
   SetAbView(GetSelectedDirectory());
 }
 
+let mutationObs = null;
+
 function AbPanelLoad()
 {
   InitCommonJS();
@@ -94,12 +108,32 @@
 
   parent.addEventListener("compose-window-close", AbPanelOnComposerClose, true);
   parent.addEventListener("compose-window-reopen", AbPanelOnComposerReOpen, true);
+
+  mutationObs = new MutationObserver(function(aMutations) {
+    aMutations.forEach(function(mutation) {
+      if (GetSelectedDirectory() == (kAllDirectoryRoot + "?") &&
+          mutation.type == "attributes" &&
+          mutation.attributeName == "hidden") {
+        let curState = document.getElementById("addrbook").getAttribute("hidden");
+        if (curState == "false")
+          gShowAbColumnInComposeSidebar = true;
+        else if (curState == "true")
+          gShowAbColumnInComposeSidebar = false;
+      }
+    });
+  });
+
+  document.getElementById("addrbook").setAttribute("hidden", gShowAbColumnInComposeSidbar);
+
+  mutationObs.observe(document.getElementById("addrbook"),
+                      { attributes: true, childList: true });
 }
 
 function AbPanelUnload()
 {
   parent.removeEventListener("compose-window-close", AbPanelOnComposerClose, true);
   parent.removeEventListener("compose-window-reopen", AbPanelOnComposerReOpen, true);
+  mutationObs.disconnect();
 
   CloseAbView();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abContactsPanel.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abContactsPanel.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abContactsPanel.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abContactsPanel.xul	2015-02-28 15:02:41.000000000 +0000
@@ -95,6 +95,10 @@
         <treecol id="GeneratedName"
                  persist="hidden ordinal width sortDirection" flex="1" label="&GeneratedName.label;" primary="true"/>
         <splitter class="tree-splitter"/>
+        <treecol id="addrbook"
+                 persist="hidden ordinal width sortDirection" hidden="true"
+                 flex="1" label="&Addrbook.label;"/>
+        <splitter class="tree-splitter"/>
         <treecol id="PrimaryEmail"
                  persist="hidden ordinal width sortDirection" hidden="true"
                  flex="1" label="&PrimaryEmail.label;"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abTrees.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abTrees.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/abTrees.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/abTrees.js	2015-02-28 15:02:41.000000000 +0000
@@ -10,6 +10,67 @@
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource:///modules/mailServices.js");
 
+// Tree Sort helper methods.
+const AB_ORDER = ["aab", "pab", "mork", "ldap", "mapi+other", "anyab", "cab"];
+
+function getDirectoryValue(aDir, aKey) {
+  const Ci = Components.interfaces;
+
+  if (aKey == "ab_type") {
+    if (aDir._directory.URI == kAllDirectoryRoot + "?")
+      return "aab";
+    if (aDir._directory.URI == kPersonalAddressbookURI)
+      return "pab";
+    if (aDir._directory.URI == kCollectedAddressbookURI)
+      return "cab";
+    if (aDir._directory instanceof Ci.nsIAbMDBDirectory)
+      return "mork";
+    if (aDir._directory instanceof Ci.nsIAbLDAPDirectory)
+      return "ldap";
+
+    // If there is any other AB type.
+    return "mapi+other";
+  } else if (aKey == "ab_name") {
+    return aDir._directory.dirName;
+  }
+
+  // This should never happen.
+  return null;
+}
+
+function abNameCompare(a, b) {
+  return a.localeCompare(b);
+}
+
+function abTypeCompare(a, b) {
+  return (AB_ORDER.indexOf(a) - AB_ORDER.indexOf(b));
+}
+
+const SORT_PRIORITY = ["ab_type", "ab_name"];
+const SORT_FUNCS = [abTypeCompare, abNameCompare];
+
+function abSort(a, b) {
+  for (let i = 0; i < SORT_FUNCS.length; i++) {
+    let sortBy = SORT_PRIORITY[i];
+    let aValue = getDirectoryValue(a, sortBy);
+    let bValue = getDirectoryValue(b, sortBy);
+
+    if (!aValue && !bValue)
+      return 0;
+    if (!aValue)
+      return -1;
+    if (!bValue)
+      return 1;
+    if (aValue != bValue) {
+      let result = SORT_FUNCS[i](aValue, bValue);
+
+      if (result != 0)
+        return result;
+    }
+  }
+  return 0;
+}
+
 /**
  * Each abDirTreeItem corresponds to one row in the tree view.
  */
@@ -38,22 +99,29 @@
 
   _children: null,
   get children() {
+    const Ci = Components.interfaces;
     if (!this._children) {
       this._children = [];
-      const Ci = Components.interfaces;
-      var myEnum = this._directory.childNodes;
+      let myEnum;
+      if (this._directory.URI == (kAllDirectoryRoot + "?"))
+        myEnum = MailServices.ab.directories;
+      else
+        myEnum = this._directory.childNodes;
+
       while (myEnum.hasMoreElements()) {
         var abItem = new abDirTreeItem(myEnum.getNext()
-                                      .QueryInterface(Ci.nsIAbDirectory));
+                                       .QueryInterface(Ci.nsIAbDirectory));
+        if (gDirectoryTreeView&&
+            this.id == kAllDirectoryRoot + "?" &&
+            getDirectoryValue(abItem, "ab_type") == "ldap")
+          gDirectoryTreeView.hasRemoteAB = true;
+
         this._children.push(abItem);
         this._children[this._children.length - 1]._level = this._level + 1;
         this._children[this._children.length - 1]._parent = this;
       }
 
-      // We sort children based on their names
-      this._children.sort(function nameSort(a, b) {
-        return a._directory.dirName.localeCompare(b._directory.dirName);
-      });
+      this._children.sort(abSort);
     }
     return this._children;
   },
@@ -79,7 +147,10 @@
 
   PERMS_FILE: parseInt("0644", 8),
 
+  hasRemoteAB: false,
+
   init: function dtv_init(aTree, aJSONFile) {
+
     const Cc = Components.classes;
     const Ci = Components.interfaces;
 
@@ -97,8 +168,9 @@
         fstream.init(file, -1, 0, 0);
         sstream.init(fstream);
 
-        while (sstream.available())
+        while (sstream.available()) {
           data += sstream.read(4096);
+        }
 
         sstream.close();
         fstream.close();
@@ -164,65 +236,12 @@
 
     var dirEnum = MailServices.ab.directories;
 
-    while (dirEnum.hasMoreElements()) {
-      this._rowMap.push(new abDirTreeItem(dirEnum.getNext().QueryInterface(Ci.nsIAbDirectory)));
-    }
+    // Make an entry for All Address Books.
+    let rootAB = MailServices.ab.getDirectory(kAllDirectoryRoot + "?");
+    rootAB.dirName = gAddressBookBundle.getString("allAddressBooks");
+    this._rowMap.push(new abDirTreeItem(rootAB));
 
     // Sort our addressbooks now
-
-    const AB_ORDER = ["pab", "mork", "ldap", "mapi+other", "cab"];
-
-    function getDirectoryValue(aDir, aKey) {
-      if (aKey == "ab_type") {
-        if (aDir._directory.URI == kPersonalAddressbookURI)
-          return "pab";
-        if (aDir._directory.URI == kCollectedAddressbookURI)
-          return "cab";
-        if (aDir._directory instanceof Ci.nsIAbMDBDirectory)
-          return "mork";
-        if (aDir._directory instanceof Ci.nsIAbLDAPDirectory)
-          return "ldap";
-        return "mapi+other";
-      } else if (aKey == "ab_name") {
-        return aDir._directory.dirName;
-      }
-      // This should never happen.
-      return null;
-    }
-
-    function abNameCompare(a, b) {
-      return a.localeCompare(b);
-    }
-
-    function abTypeCompare(a, b) {
-      return (AB_ORDER.indexOf(a) - AB_ORDER.indexOf(b));
-    }
-
-    const SORT_PRIORITY = ["ab_type", "ab_name"];
-    const SORT_FUNCS = [abTypeCompare, abNameCompare];
-
-    function abSort(a, b) {
-      for (let i = 0; i < SORT_FUNCS.length; i++) {
-        let sortBy = SORT_PRIORITY[i];
-        let aValue = getDirectoryValue(a, sortBy);
-        let bValue = getDirectoryValue(b, sortBy);
-
-        if (!aValue && !bValue)
-          return 0;
-        if (!aValue)
-          return -1;
-        if (!bValue)
-          return 1;
-        if (aValue != bValue) {
-          let result = SORT_FUNCS[i](aValue, bValue);
-
-          if (result != 0)
-            return result;
-        }
-      }
-      return 0;
-    }
-
     this._rowMap.sort(abSort);
 
     if (this._tree)
@@ -231,6 +250,15 @@
     this._restoreOpenStates();
   },
 
+  getIndexForId: function(aId) {
+    for (let i = 0; i < this._rowMap.length; i++) {
+      if (this._rowMap[i].id == aId)
+        return i;
+    }
+
+    return -1;
+  },
+
   // nsIAbListener interfaces
   onItemAdded: function dtv_onItemAdded(aParent, aItem) {
     if (!(aItem instanceof Components.interfaces.nsIAbDirectory))
@@ -260,7 +288,8 @@
       return;
 
     // If we're deleting a top-level address-book, just select the first book
-    if (aParent.URI == "moz-abdirectory://") {
+    if (aParent.URI == kAllDirectoryRoot ||
+        aParent.URI == kAllDirectoryRoot + "?") {
       this.selection.select(0);
       return;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/addressbook.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/addressbook.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/addressbook.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/addressbook.js	2015-02-28 15:02:41.000000000 +0000
@@ -250,7 +250,6 @@
 
 }
 
-
 function SetNameColumn(cmd)
 {
   var prefValue;
@@ -463,7 +462,10 @@
       }
     }
     else
-      statusText = gAddressBookBundle.getFormattedString("totalContactStatus", [gAbView.directory.dirName, total]);
+      statusText =
+        gAddressBookBundle.getFormattedString(
+          "totalContactStatus",
+          [GetDirectoryFromURI(GetSelectedDirectory()).dirName, total]);
 
     gStatusText.setAttribute("label", statusText);
   }
@@ -500,7 +502,6 @@
 function onEnterInSearchBar()
 {
   ClearCardViewPane();
-
   if (!gQueryURIFormat) {
     gQueryURIFormat = Services.prefs
       .getComplexValue("mail.addr_book.quicksearchquery.format",
@@ -526,6 +527,14 @@
     searchURI += generateQueryURI(gQueryURIFormat, searchWords);
   }
 
+  if (searchURI == kAllDirectoryRoot)
+    searchURI += "?";
+
+  document.getElementById("localResultsOnlyMessage")
+            .setAttribute("hidden",
+                          !gDirectoryTreeView.hasRemoteAB ||
+                          searchURI != kAllDirectoryRoot + "?");
+
   SetAbView(searchURI);
 
   // XXX todo
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/addressbook.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/addressbook.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/addrbook/content/addressbook.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/addrbook/content/addressbook.xul	2015-02-28 15:02:41.000000000 +0000
@@ -78,6 +78,7 @@
               events="focus"
               oncommandupdate="goUpdateGlobalEditMenuItems()"/>
     <command id="cmd_newlist" oncommand="goDoCommand('cmd_newlist');"/>
+    <command id="cmd_newCard" oncommand="goDoCommand('cmd_newCard');"/>
     <command id="cmd_printcardpreview" oncommand="AbPrintPreviewCard();"/>
     <command id="cmd_printcard" oncommand="AbPrintCard();"/>
     <command id="cmd_properties" oncommand="goDoCommand('cmd_properties');" disabled="true"/>
@@ -121,7 +122,7 @@
   <key id="key_newMessage" key="&newMessageCmd.key;" modifiers="accel" oncommand="AbNewMessage()"/>
 #endif
   <key id="key_newCard" key="&newContact.key;" modifiers="accel"
-       oncommand="AbNewCard();"/>
+       command="cmd_newCard"/>
 
   <key id="key_printCard" key="&printContactCmd.key;" command="cmd_printcard"
        modifiers="accel"/>
@@ -180,7 +181,7 @@
             command="cmd_properties"/>
   <menuseparator/>
   <menuitem id="dirTreeContext-newcard" label="&newContactButton.label;"
-            accesskey="&newContactButton.accesskey;" oncommand="AbNewCard();"/>
+            accesskey="&newContactButton.accesskey;" command="cmd_newCard"/>
   <menuitem id="dirTreeContext-newlist"
             label="&newlistButton.label;"
             accesskey="&newlistButton.accesskey;"
@@ -259,7 +260,7 @@
                       <menuitem id="menu_newContact"
                                 label="&newContact.label;"
                                 accesskey="&newContact.accesskey;"
-                                key="key_newCard" oncommand="AbNewCard();"/>
+                                key="key_newCard" command="cmd_newCard"/>
                       <menuitem id="menu_newList"
                                 label="&newListCmd.label;"
                                 accesskey="&newListCmd.accesskey;"
@@ -506,6 +507,10 @@
                                   id="cmd_SortByWorkPhone"
                                   accesskey="&WorkPhone.accesskey;"
                                   oncommand="SortResultPane('WorkPhone');" name="sortas" type="radio" checked="true"/>
+                        <menuitem label="&Addrbook.label;"
+                                  id="cmd_SortByaddrbook"
+                                  accesskey="&Addrbook.accesskey;"
+                                  oncommand="SortResultPane('addrbook');" name="sortas" type="radio" checked="true"/>
                         <menuseparator/>
                         <menuitem id="sortAscending" type="radio" name="sortdirection" label="&sortAscending.label;" accesskey="&sortAscending.accesskey;" oncommand="AbSortAscending()"/>
                         <menuitem id="sortDescending" type="radio" name="sortdirection" label="&sortDescending.label;" accesskey="&sortDescending.accesskey;" oncommand="AbSortDescending()"/>
@@ -558,7 +563,7 @@
 
   <toolbarpalette id="AddressBookToolbarPalette">
       <toolbarbutton class="toolbarbutton-1" id="button-newcard"
-                     label="&newContactButton.label;" oncommand="AbNewCard();"
+                     label="&newContactButton.label;" command="cmd_newCard"
                      tooltiptext="&newContactButton.tooltip;"/>
       <toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltiptext="&newlistButton.tooltip;" command="cmd_newlist"/>
       <toolbarbutton class="toolbarbutton-1" id="button-editcard"
@@ -571,7 +576,6 @@
                      observes="button_delete" label="&deleteButton2.label;"
                      tooltiptext="&deleteButton2.tooltip;"
                      oncommand="goDoCommand('button_delete');"/>
-
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" flex="1"
                    class="chromeclass-toolbar-additional">
@@ -625,7 +629,13 @@
     <splitter id="dirTree-splitter" collapse="before" persist="state"/>
 
     <vbox flex="1" minwidth="100">
-
+      <description id="localResultsOnlyMessage"
+                   value="&localResultsOnlyMessage.label;"/>
+      <vbox id="blankResultsPaneMessageBox"
+            flex="1" pack="center" align="center">
+        <description id="blankResultsPaneMessage"
+                     value="&blankResultsPaneMessage.label;"/>
+      </vbox>
       <!-- results pane -->
       <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain"
             context="abResultsTreeContext"
@@ -689,7 +699,11 @@
           <treecol id="WorkPhone"
                    persist="hidden ordinal width sortDirection" flex="1"
                    label="&WorkPhone.label;"/>
-
+          <splitter class="tree-splitter"/>
+          <treecol id="addrbook"
+                   persist="hidden ordinal width sortDirection" flex="1"
+                   hidden="true"
+                   label="&Addrbook.label;"/>
           <!-- LOCALIZATION NOTE: _PhoneticName may be enabled for Japanese builds. -->
           <!--
           <treecol id="_PhoneticName"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/compose/content/MsgComposeCommands.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/compose/content/MsgComposeCommands.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/compose/content/MsgComposeCommands.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/compose/content/MsgComposeCommands.js	2015-02-28 15:02:41.000000000 +0000
@@ -2718,12 +2718,11 @@
  *
  * @param aMsgCompFields  A nsIMsgCompFields object containing the fields to check.
  */
-const NS_MSG_NO_RECIPIENTS = "12511"; // from composeMsgs.properties
 function CheckValidEmailAddress(aMsgCompFields)
 {
   if (!aMsgCompFields.hasRecipients) {
     Services.prompt.alert(window, getComposeBundle().getString("addressInvalidTitle"),
-                          getComposeBundle().getString(NS_MSG_NO_RECIPIENTS));
+                          getComposeBundle().getString("noRecipients"));
 
     return false;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/aboutDownloads.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/aboutDownloads.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/aboutDownloads.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/aboutDownloads.css	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+richlistitem.download {
+  -moz-binding: url('chrome://messenger/content/downloads/download.xml#download');
+}
+
+#msgDownloadsRichListBox {
+  /** The default listbox appearance comes with an unwanted margin. **/
+  margin: 0;
+  display: -moz-box;
+}
+
+#msgDownloadsRichListBox > richlistitem.download {
+  height: 5em;
+  padding: 5px 8px;
+}
+
+#msgDownloadsListEmptyDescription {
+  display: none;
+}
+
+#msgDownloadsRichListBox:empty + #msgDownloadsListEmptyDescription {
+  display: -moz-box;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/aboutDownloads.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/aboutDownloads.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/aboutDownloads.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/aboutDownloads.js	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,325 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+
+XPCOMUtils.defineLazyModuleGetter(this, "Downloads", "resource://gre/modules/Downloads.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils", "resource://gre/modules/DownloadUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
+
+const DownloadsView = {
+  init() {
+    window.controllers.insertControllerAt(0, this);
+    this.listElement = document.getElementById("msgDownloadsRichListBox");
+
+    this.items = new Map();
+
+    Downloads.getList(Downloads.ALL)
+             .then(list => list.addView(this))
+             .then(null, Cu.reportError);
+
+    window.addEventListener("unload", aEvent => {
+      Downloads.getList(Downloads.ALL)
+               .then(list => list.removeView(this))
+               .then(null, Cu.reportError);
+      window.controllers.removeController(this);
+    });
+  },
+
+  insertOrMoveItem(aItem) {
+    let compare = (a, b) => {
+      // active downloads always before stopped downloads
+      if (a.stopped != b.stopped) {
+        return b.stopped ? -1 : 1
+      }
+      // most recent downloads first
+      return b.startTime - a.startTime;
+    };
+
+    let at = this.listElement.firstChild;
+    while (at && compare(aItem.download, at.download) > 0) {
+      at = at.nextElementSibling;
+    }
+    this.listElement.insertBefore(aItem.element, at);
+  },
+
+  onDownloadAdded(aDownload) {
+    let isPurgedFromDisk = download => {
+      if (!download.succeeded) {
+        return false;
+      }
+      let targetFile = Cc["@mozilla.org/file/local;1"]
+                        .createInstance(Ci.nsIFile);
+      targetFile.initWithPath(download.target.path);
+      return !targetFile.exists();
+    }
+    if (isPurgedFromDisk(aDownload)) {
+      Downloads.getList(Downloads.ALL)
+               .then(list => list.remove(aDownload))
+      return;
+    }
+
+    let item = new DownloadItem(aDownload);
+    this.items.set(aDownload, item);
+    this.insertOrMoveItem(item);
+  },
+
+  onDownloadChanged(aDownload) {
+    let item = this.items.get(aDownload);
+    if (!item) {
+      Cu.reportError("No DownloadItem found for download");
+      return;
+    }
+
+    if (item.stateChanged) {
+      this.insertOrMoveItem(item);
+    }
+
+    item.onDownloadChanged();
+  },
+
+  onDownloadRemoved(aDownload) {
+    let item = this.items.get(aDownload);
+    if (!item) {
+      Cu.reportError("No DownloadItem found for download");
+      return;
+    }
+
+    this.items.delete(aDownload);
+    this.listElement.removeChild(item.element);
+  },
+
+  onDownloadContextMenu(aEvent) {
+    let element = this.listElement.selectedItem;
+    if (!element) {
+      return;
+    }
+
+    this.updateCommands();
+  },
+
+  clearDownloads() {
+    Downloads.getList(Downloads.ALL)
+             .then(list => list.removeFinished())
+             .then(null, Cu.reportError);
+  },
+
+  supportsCommand(aCommand) {
+    if (!(this.commands.some(command => command == aCommand)) &&
+        !(DownloadItem.prototype.supportsCommand(aCommand))) {
+      return false;
+    }
+    return true;
+  },
+
+  isCommandEnabled(aCommand) {
+    if (aCommand == "msgDownloadsCmd_clearDownloads") {
+        return true;
+    }
+
+    let element = this.listElement.selectedItem;
+    if (element) {
+      return element.downloadItem.isCommandEnabled(aCommand);
+    }
+
+    return false;
+  },
+
+  doCommand(aCommand) {
+    if (aCommand == "msgDownloadsCmd_clearDownloads") {
+        this.clearDownloads();
+        return;
+    }
+
+    if (this.listElement.selectedItems.length == 0) {
+      return;
+    }
+
+    for (let [, element] in Iterator(this.listElement.selectedItems)) {
+      element.downloadItem.doCommand(aCommand);
+    }
+  },
+
+  onEvent() { },
+
+  updateCommands() {
+    this.commands.forEach(goUpdateCommand);
+    DownloadItem.prototype.commands.forEach(goUpdateCommand);
+  },
+
+  commands: [
+    "msgDownloadsCmd_clearDownloads",
+  ]
+};
+
+function DownloadItem(aDownload) {
+  this._download = aDownload;
+  this._updateFromDownload();
+
+  if (aDownload._unknownProperties && aDownload._unknownProperties.sender) {
+    this._sender = aDownload._unknownProperties.sender;
+  } else {
+    this._sender = "";
+  }
+  this._fileName = this._htmlEscape(OS.Path.basename(aDownload.target.path));
+  this._iconUrl = "moz-icon://" + this._fileName + "?size=32";
+  this._startDate = this._htmlEscape(DownloadUtils.getReadableDates(aDownload.startTime)[0]);
+  this._filePath = aDownload.target.path;
+}
+
+const kDownloadStatePropertyNames = [
+  "stopped",
+  "succeeded",
+  "canceled",
+  "error",
+  "startTime"
+];
+
+DownloadItem.prototype = {
+  _htmlEscape(s) {
+    s = s.replace(/&/g, "&amp;");
+    s = s.replace(/>/g, "&gt;");
+    s = s.replace(/</g, "&lt;");
+    s = s.replace(/"/g, "&quot;");
+    s = s.replace(/'/g, "&apos;");
+    return s;
+  },
+
+  _updateFromDownload() {
+    this._state = {};
+    for (let name of kDownloadStatePropertyNames) {
+      this._state[name] = this._download[name];
+    }
+  },
+
+  get stateChanged() {
+    for (let name of kDownloadStatePropertyNames) {
+      if (this._state[name] != this._download[name]) {
+        return true;
+      }
+    }
+    return false;
+  },
+
+  get download() this._download,
+
+  get element() {
+    if (!this._element) {
+      this._element = this.createElement();
+    }
+
+    return this._element;
+  },
+
+  createElement() {
+    let element = document.createElement("richlistitem");
+    element.classList.add("download");
+
+    // launch the download if double clicked
+    element.addEventListener("dblclick", aEvent => this.launch());
+
+    // set download as an expando property for the context menu
+    element.download = this.download;
+    element.downloadItem = this;
+
+    this.updateElement(element);
+
+    return element;
+  },
+
+  updateElement(aElement) {
+    aElement.setAttribute("image", this.iconUrl);
+    aElement.setAttribute("size", this.size);
+    aElement.setAttribute("displayName", this.fileName);
+    aElement.setAttribute("sender", this.sender);
+    aElement.setAttribute("startDate", this.startDate);
+  },
+
+  launch() {
+    if (this.download.succeeded) {
+      this.download.launch().then(null, Cu.reportError);
+    }
+  },
+
+  remove() {
+    Downloads.getList(Downloads.ALL)
+             .then(list => list.remove(this.download))
+             .then(() => this.download.finalize(true))
+             .then(null, Cu.reportError);
+  },
+
+  show() {
+    if (this.download.succeeded) {
+      let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+      file.initWithPath(this._filePath);
+      file.reveal();
+    }
+  },
+
+  onDownloadChanged() {
+    this._updateFromDownload();
+    this.updateElement(this.element);
+  },
+
+  get fileName() this._fileName,
+
+  get iconUrl() this._iconUrl,
+
+  get sender() this._sender,
+
+  get size() {
+    let bytes;
+    if (this.download.succeeded || this.download.hasProgress) {
+      bytes = this.download.target.size;
+    } else {
+      bytes = this.download.currentBytes;
+    }
+    return DownloadUtils.convertByteUnits(bytes).join("");
+  },
+
+  get startDate() this._startDate,
+
+  supportsCommand(aCommand) {
+    return this.commands.some(command => command == aCommand);
+  },
+
+  isCommandEnabled(aCommand) {
+    switch (aCommand) {
+      case "msgDownloadsCmd_open":
+      case "msgDownloadsCmd_show":
+        return this.download.succeeded;
+      case "msgDownloadsCmd_remove":
+        return true;
+    }
+    return false;
+  },
+
+  doCommand(aCommand) {
+    switch (aCommand) {
+      case "msgDownloadsCmd_open":
+        this.launch();
+        break;
+      case "msgDownloadsCmd_show":
+        this.show();
+        break;
+      case "msgDownloadsCmd_remove":
+        this.remove();
+        break;
+    }
+  },
+
+  commands: [
+    "msgDownloadsCmd_remove",
+    "msgDownloadsCmd_open",
+    "msgDownloadsCmd_show",
+  ]
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/aboutDownloads.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/aboutDownloads.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/aboutDownloads.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/aboutDownloads.xul	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="chrome://global/skin/"?>
+<?xml-stylesheet href="chrome://messenger/content/downloads/aboutDownloads.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 % aboutDownloadsDTD SYSTEM "chrome://messenger/locale/aboutDownloads.dtd">
+%aboutDownloadsDTD;
+]>
+
+<window id="aboutDownloads"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&aboutDownloads.title;"
+        onload="DownloadsView.init();">
+  <script type="application/javascript"
+          src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/downloads/aboutDownloads.js"/>
+
+  <stack flex="1">
+    <richlistbox id="msgDownloadsRichListBox"
+                 flex="1"
+                 seltype="multiple"
+                 context="msgDownloadsContextMenu"
+                 oncontextmenu="DownloadsView.onDownloadContextMenu(event);"/>
+    <description id="msgDownloadsListEmptyDescription"
+                 value="&aboutDownloads.empty;"
+                 mousethrough="always"/>
+  </stack>
+
+  <commandset id="msgDownloadCommands"
+              commandupdater="true"
+              events="focus,select,contextmenu">
+    <command id="msgDownloadsCmd_open"
+             oncommand="goDoCommand('msgDownloadsCmd_open')"/>
+    <command id="msgDownloadsCmd_show"
+             oncommand="goDoCommand('msgDownloadsCmd_show')"/>
+    <command id="msgDownloadsCmd_remove"
+             oncommand="goDoCommand('msgDownloadsCmd_remove')"/>
+    <command id="msgDownloadsCmd_clearDownloads"
+             oncommand="goDoCommand('msgDownloadsCmd_clearDownloads')"/>
+  </commandset>
+
+  <menupopup id="msgDownloadsContextMenu">
+    <menuitem command="msgDownloadsCmd_remove"
+              class="msgDownloadRemoveFromHistoryMenuItem"
+              label="&cmd.removeFromHistory.label;"
+              accesskey="&cmd.removeFromHistory.accesskey;"/>
+    <menuitem command="msgDownloadsCmd_open"
+              label="&cmd.open.label;"
+              accesskey="&cmd.open.accesskey;"/>
+    <menuitem command="msgDownloadsCmd_show"
+              class="msgDownloadShowMenuItem"
+#ifdef XP_MACOSX
+              label="&cmd.showMac.label;"
+              accesskey="&cmd.showMac.accesskey;"
+#else
+              label="&cmd.show.label;"
+              accesskey="&cmd.show.accesskey;"
+#endif
+              />
+    <menuitem command="msgDownloadsCmd_clearDownloads"
+              label="&cmd.clearDownloads.label;"
+              accesskey="&cmd.clearDownloads.accesskey;"/>
+  </menupopup>
+</window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/download.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/download.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/content/download.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/content/download.xml	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!-- -*- Mode: HTML; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- -->
+<!-- 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/. -->
+
+<bindings id="downloadBindings"
+          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="download"
+           extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
+
+    <content orient="horizontal" align="center">
+      <xul:image class="fileTypeIcon"
+                 validate="always"
+                 xbl:inherits="src=image"/>
+      <xul:vbox pack="center" flex="1">
+        <xul:description class="fileName"
+                         crop="center"
+                         xbl:inherits="value=displayName,tooltiptext=displayName"/>
+        <xul:description class="size"
+                         xbl:inherits="value=size,tooltiptext=size"/>
+        <xul:description class="startDate"
+                         crop="end"
+                         xbl:inherits="value=startDate,tooltiptext=startDate"/>
+      </xul:vbox>
+    <xul:description class="sender"
+                     xbl:inherits="value=sender,tooltiptext=sender"/>
+    </content>
+  </binding>
+
+</bindings>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/jar.mn	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/jar.mn	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+messenger.jar:
+    content/messenger/downloads/download.xml           (content/download.xml)
+    content/messenger/downloads/aboutDownloads.js      (content/aboutDownloads.js)
+*   content/messenger/downloads/aboutDownloads.xul     (content/aboutDownloads.xul)
+    content/messenger/downloads/aboutDownloads.css     (content/aboutDownloads.css)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/downloads/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/downloads/moz.build	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,5 @@
+# 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']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/DownloadsStartup.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/DownloadsStartup.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/DownloadsStartup.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/DownloadsStartup.js	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,73 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80 filetype=javascript: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 component enables the JavaScript API for downloads at startup.  This
+ * will eventually be removed when nsIDownloadManager will not be available
+ * anymore (bug 851471).
+ */
+
+"use strict";
+
+////////////////////////////////////////////////////////////////////////////////
+//// Globals
+
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "DownloadIntegration",
+                                  "resource://gre/modules/DownloadIntegration.jsm");
+
+/**
+ * CID and Contract ID of the JavaScript implementation of nsITransfer.
+ */
+const kTransferCid = Components.ID("{1b4c85df-cbdd-4bb6-b04e-613caece083c}");
+const kTransferContractId = "@mozilla.org/transfer;1";
+
+////////////////////////////////////////////////////////////////////////////////
+//// DownloadsStartup
+
+function DownloadsStartup() { }
+
+DownloadsStartup.prototype = {
+  classID: Components.ID("{a93f0d6f-02a3-4486-a662-8f49b8c1de48}"),
+
+  _xpcom_factory: XPCOMUtils.generateSingletonFactory(DownloadsStartup),
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsISupports
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIObserver
+
+  observe: function DS_observe(aSubject, aTopic, aData)
+  {
+    if (aTopic != "profile-after-change") {
+      Cu.reportError("Unexpected observer notification.");
+      return;
+    }
+
+    // Override Toolkit's nsITransfer implementation with the one from the
+    // JavaScript API for downloads.
+    Components.manager.QueryInterface(Ci.nsIComponentRegistrar)
+                      .registerFactory(kTransferCid, "",
+                                       kTransferContractId, null);
+
+    // To preserve download list across sessions.
+    DownloadIntegration.shouldPersistDownload = function(aDownload) {
+      return true;
+    };
+
+  },
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Module
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([DownloadsStartup]);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/content/chat-messenger-overlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/content/chat-messenger-overlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/content/chat-messenger-overlay.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/content/chat-messenger-overlay.js	2015-02-28 15:02:41.000000000 +0000
@@ -389,13 +389,10 @@
     document.getElementById("logDisplayDeck").selectedPanel =
       document.getElementById("logDisplayBrowserBox");
   },
-  _showLog: function(aConversation, aPath, aSearchTerm) {
+  _showLog: function(aConversation, aSearchTerm) {
     if (!aConversation)
       return;
     this._showLogPanel();
-    if (this._displayedLog == aPath)
-      return;
-    this._displayedLog = aPath;
     let browser = document.getElementById("conv-log-browser");
     browser._autoScrollEnabled = false;
     if (this._pendingLogBrowserLoad) {
@@ -407,6 +404,9 @@
     if (aSearchTerm)
       this._pendingSearchTerm = aSearchTerm;
     Services.obs.addObserver(this, "conversation-loaded", false);
+    // Conversation title may not be set yet if this is a search result.
+    let cti = document.getElementById("conv-top-info");
+    cti.setAttribute("displayName", aConversation.title);
   },
   _makeFriendlyDate: function(aDate) {
     let dts = Components.classes["@mozilla.org/intl/scriptabledateformat;1"]
@@ -447,35 +447,42 @@
     let treeView = this._treeView = new chatLogTreeView(logTree, aLogs);
     if (!treeView._rowMap.length)
       return false;
-    if (aShouldSelect) {
-      if (aShouldSelect === true) {
-        // Select the first line.
-        let selectIndex = 0;
-        if (treeView.isContainer(selectIndex)) {
-          // If the first line is a group, open it and select the
-          // next line instead.
-          treeView.toggleOpenState(selectIndex++);
-        }
-        logTree.view.selection.select(selectIndex);
+    if (!aShouldSelect)
+      return true;
+    if (aShouldSelect === true) {
+      // Select the first line.
+      let selectIndex = 0;
+      if (treeView.isContainer(selectIndex)) {
+        // If the first line is a group, open it and select the
+        // next line instead.
+        treeView.toggleOpenState(selectIndex++);
       }
-      else {
-        let logTime = aShouldSelect.time;
-        for (let index = 0; index < treeView._rowMap.length; ++index) {
-          if (!treeView._rowMap[index].children.some(function (i) i.log.time == logTime))
-            continue;
-          treeView.toggleOpenState(index);
-          ++index;
-          while (index < treeView._rowMap.length && treeView._rowMap[index].log.time != logTime)
-            ++index;
-          if (treeView._rowMap[index].log.time == logTime) {
-            logTree.view.selection.select(index);
-            logTree.treeBoxObject.ensureRowIsVisible(index);
-          }
-          return true;
-        }
+      logTree.view.selection.select(selectIndex);
+      return true;
+    }
+    // Find the aShouldSelect log and select it.
+    let logTime = aShouldSelect.time;
+    for (let index = 0; index < treeView._rowMap.length; ++index) {
+      if (!treeView.isContainer(index) &&
+          treeView._rowMap[index].log.time == logTime) {
+        logTree.view.selection.select(index);
+        logTree.treeBoxObject.ensureRowIsVisible(index);
+        return true;
+      }
+      if (!treeView._rowMap[index].children.some(i => i.log.time == logTime))
+        continue;
+      treeView.toggleOpenState(index);
+      ++index;
+      while (index < treeView._rowMap.length &&
+             treeView._rowMap[index].log.time != logTime)
+        ++index;
+      if (treeView._rowMap[index].log.time == logTime) {
+        logTree.view.selection.select(index);
+        logTree.treeBoxObject.ensureRowIsVisible(index);
       }
+      return true;
     }
-    return true;
+    throw("Couldn't find the log to select among the set of logs passed.");
   },
 
   onLogSelect: function() {
@@ -493,7 +500,7 @@
     if (list.selectedItem.getAttribute("id") != "searchResultConv")
       document.getElementById("goToConversation").hidden = false;
     log.getConversation().then(aLogConv => {
-      this._showLog(aLogConv, log.path);
+      this._showLog(aLogConv);
     });
   },
 
@@ -605,14 +612,11 @@
       this.observedContact = null;
 
       let path = "logs/" + item.log.path;
-      path = OS.Path.join(OS.Constants.Path.profileDir, path.split("/"));
+      path = OS.Path.join(OS.Constants.Path.profileDir, ...path.split("/"));
       imServices.logs.getLogFromFile(path, true).then(aLog => {
-        aLog.getConversation().then(aConv => {
-          this._showLog(aConv, path, item.searchTerm || undefined);
-          cti.setAttribute("displayName", aConv.title);
-          imServices.logs.getSimilarLogs(aLog, true).then(aSimilarLogs => {
-            this._showLogList(aSimilarLogs, aLog);
-          });
+        imServices.logs.getSimilarLogs(aLog, true).then(aSimilarLogs => {
+          this._pendingSearchTerm = item.searchTerm || undefined;
+          this._showLogList(aSimilarLogs, aLog);
         });
       });
     }
@@ -668,7 +672,7 @@
 
       document.getElementById("contextPane").removeAttribute("chat");
 
-      imServices.logs.getLogsForContact(contact).then(aLogs => {
+      imServices.logs.getLogsForContact(contact, true).then(aLogs => {
         if (!this._showLogList(aLogs, true)) {
           document.getElementById("conversationsDeck").selectedPanel =
             document.getElementById("logDisplay");
@@ -901,20 +905,20 @@
 
       if (this._pendingSearchTerm) {
         let findbar = document.getElementById("log-findbar");
-        let findField = findbar._findField;
-        findField.value = this._pendingSearchTerm;
+        findbar._findField.value = this._pendingSearchTerm;
         findbar.open();
-        findField.focus();
+        browser.focus();
         delete this._pendingSearchTerm;
         let eventListener = function() {
           findbar.onFindAgainCommand();
-          if (findbar._findField.getAttribute("status") != "notfound" ||
-              !browser._messageDisplayPending)
-            browser.removeEventListener("MessagesDisplayed", eventListener);
+          if (findbar._findFailedString && browser._messageDisplayPending)
+            return;
+          // Search result found or all messages added, we're done.
+          browser.removeEventListener("MessagesDisplayed", eventListener);
         };
         browser.addEventListener("MessagesDisplayed", eventListener);
       }
-      delete this._pendingLogBrowserLoad;
+      this._pendingLogBrowserLoad = false;
       Services.obs.removeObserver(this, "conversation-loaded");
       return;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/content/imconversation.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/content/imconversation.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/content/imconversation.xml	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/content/imconversation.xml	2015-02-28 15:02:41.000000000 +0000
@@ -45,6 +45,7 @@
       <![CDATA[
        let textbox = this.editor;
        textbox.addEventListener("keypress", this.inputKeyPress.bind(this));
+       textbox.addEventListener("input", this.inputValueChanged.bind(this));
        textbox.addEventListener("overflow", this.inputExpand.bind(this), true);
        textbox.addEventListener("underflow", this._onTextboxUnderflow, true);
 
@@ -204,12 +205,14 @@
           return;
         }
 
-/*
         if (isUnreadMessage && (!aMsg.conversation.isChat || aMsg.containsNick)) {
+          this._lastPing = aMsg.who;
+          this._lastPingTime = aMsg.time;
+/*
           if (Services.prefs.getBoolPref("messenger.options.getAttentionOnNewMessages"))
             window.getAttention();
-        }
 */
+        }
 
         if (isTabFocused) {
           // Porting note: This will mark the conv as read, but also update
@@ -461,21 +464,98 @@
           return;
         }
 
+        // Undo tab complete.
+        if (this._completions && event.keyCode == KeyEvent.DOM_VK_BACK_SPACE &&
+            !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey) {
+          if (text == this._beforeTabComplete) {
+            // Nothing to undo, so let backspace act normally.
+            delete this._completions;
+          }
+          else {
+            event.preventDefault();
+
+            // First undo the comma separating multiple nicks or the suffix.
+            // More than one nick:
+            //   "nick1, nick2: " -> "nick1: nick2"
+            // Single nick: remove the suffix
+            //   "nick1: " -> "nick1"
+            let pos = inputBox.selectionStart;
+            const suffix = ": ";
+            if (pos > suffix.length &&
+                text.substring(pos - suffix.length, pos) == suffix) {
+              let completions = [b for (b of this.buddies.keys())];
+              // Check if the preceding words are a sequence of nick completions.
+              let preceding = text.substring(0, pos - suffix.length).split(", ");
+              if (preceding.every(function(n) completions.indexOf(n) != -1)) {
+                let s = preceding.pop();
+                if (preceding.length)
+                  s = suffix + s;
+                inputBox.selectionStart -= s.length + suffix.length;
+                this.addString(s);
+                if (this._completions[0].slice(-suffix.length) == suffix) {
+                  this._completions =
+                    this._completions.map(function(c) c.slice(0, -suffix.length));
+                }
+                if (this._completions.length == 1 &&
+                    inputBox.value == this._beforeTabComplete) {
+                  // Nothing left to undo or to cycle through.
+                  delete this._completions;
+                }
+                return;
+              }
+            }
+
+            // Full undo.
+            inputBox.selectionStart = 0;
+            this.addString(this._beforeTabComplete);
+            delete this._completions;
+            return;
+          }
+        }
+
+        // Tab complete.
         // Keep the default behavior of the tab key if the input box
         // is empty or a modifier is used.
         if (event.keyCode == KeyEvent.DOM_VK_TAB && text.length != 0 &&
-            !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey) {
+            !event.altKey && !event.ctrlKey && !event.metaKey &&
+            (!event.shiftKey || this._completions)) {
           event.preventDefault();
 
+          if (this._completions) {
+            // Tab has been pressed more than once.
+            if (this._completions.length == 1)
+              return;
+            if (this._shouldListCompletionsLater) {
+              this._conv.systemMessage(this._shouldListCompletionsLater);
+              delete this._shouldListCompletionsLater;
+            }
+
+            inputBox.selectionStart = this._completionsStart;
+            if (event.shiftKey) {
+              // Reverse cycle completions.
+              this._completionsIndex -= 2;
+              if (this._completionsIndex < 0)
+                this._completionsIndex += this._completions.length;
+            }
+            this.addString(this._completions[this._completionsIndex++]);
+            this._completionsIndex %= this._completions.length;
+            return;
+          }
+
           let completions = [];
           let firstWordSuffix = " ";
-          let word = text.substring(0, inputBox.selectionStart).match(/\S*$/)[0];
+          let secondNick = false;
+
+          // Second regex result will contain word without leading special characters.
+          this._beforeTabComplete = text.substring(0, inputBox.selectionStart);
+          let words = this._beforeTabComplete.match(/\S*?([\w-]+)?$/);
+          let word = words[0];
           if (!word)
             return;
-
           let isFirstWord = inputBox.selectionStart == word.length;
-          // check if we are completing a command.
-          let completingCommand = isFirstWord && word.startsWith("/");
+
+          // Check if we are completing a command.
+          let completingCommand = isFirstWord && word[0] == "/";
           if (completingCommand) {
             for each (let cmd in Services.cmd.listCommandsForConversation(this._conv)) {
               // It's possible to have a global and a protocol specific command
@@ -490,118 +570,175 @@
             if (!this._conv.isChat)
               return;
 
-            // Twitter username mentions start with "@".
-            // TODO: find a less prpl-specific way to handle username prefixes.
-            if (this._conv.account.protocol.id == "prpl-twitter") {
-              if (word[0] != "@")
-                return;
-              word = word.substring(1);
-            }
-            else
-              firstWordSuffix = ": ";
+            firstWordSuffix = ": ";
 
             completions = [b for (b of this.buddies.keys())];
+
+/*
+            // Add recently parted nicks.
+            const kIncludeNickTimespan = 300000;
+            let cutoffTime = Date.now() - kIncludeNickTimespan;
+            let partedNicks = Object.keys(this.partedBuddies);
+            let j = partedNicks.length - 1;
+            while (j >= 0 &&
+                   this.partedBuddies[partedNicks[j]].partTime > cutoffTime)
+              --j;
+            ++j; // Index of the first nick we want to keep.
+            if (partedNicks.length > j)
+              completions = completions.concat(partedNicks.slice(j));
+*/
+
             let outgoingNick = this._conv.nick;
             completions = completions.filter(function(c) c != outgoingNick);
+
+            // Check if the preceding words are a sequence of nick completions.
+            let wordStart = inputBox.selectionStart - word.length;
+            if (wordStart > 2) {
+              let separator = text.substring(wordStart - 2, wordStart);
+              if (separator == ": " || separator == ", ") {
+                let preceding = text.substring(0, wordStart - 2).split(", ");
+                if (preceding.every(function(n) completions.indexOf(n) != -1)) {
+                  secondNick = true;
+                  isFirstWord = true;
+                  // Remove preceding completions from possible completions.
+                  completions = completions.filter(function(c)
+                    preceding.indexOf(c) == -1);
+                }
+              }
+            }
           }
 
           // Keep only the completions that share |word| as a prefix.
           // Be case insensitive only if |word| is entirely lower case.
           let condition;
           if (word.toLocaleLowerCase() == word)
-            condition = function(c) c.toLocaleLowerCase().startsWith(word);
+            condition = c => c.toLocaleLowerCase().startsWith(word);
           else
-            condition = function(c) c.startsWith(word);
-          completions = completions.filter(condition);
-          if (completions.length == 0)
+            condition = c => c.startsWith(word);
+          let matchingCompletions = completions.filter(condition);
+          if (!matchingCompletions.length && words[1]) {
+            word = words[1];
+            firstWordSuffix = " ";
+            matchingCompletions = completions.filter(condition);
+          }
+          if (!matchingCompletions.length)
             return;
 
-          if (this._conv.isChat && !completingCommand) {
-            // If only one of the possible completions is an active nick, take it.
-            let activeNick = null;
-            for each (let c in completions) {
-              if (this.buddies.has(c) &&
-                  !this.buddies.get(c).hasAttribute("inactive")) {
-                if (!activeNick)
-                  activeNick = c;
-                else {
-                  activeNick = null;
-                  break;
-                }
+          // If the cursor is in the middle of a word, and the word is a nick,
+          // there is no need to complete - just jump to the end of the nick.
+          let wholeWord = text.substring(inputBox.selectionStart - word.length);
+          for each (let completion in matchingCompletions) {
+            if (wholeWord.lastIndexOf(completion, 0) == 0) {
+              let moveCursor = completion.length - word.length;
+              inputBox.selectionStart += moveCursor;
+              let separator = text.substring(inputBox.selectionStart,
+                                             inputBox.selectionStart + 2);
+              if (separator == ": " || separator == ", ")
+                inputBox.selectionStart += 2;
+              else if (!moveCursor) {
+                // If we're already at the end of a nick, carry on to display
+                // a list of possible alternatives and/or apply punctuation.
+                break;
               }
+              return;
             }
-            if (activeNick)
-              completions = [activeNick];
           }
 
-          // Only one possible completion? Apply it! :-)
-          // Replace what the user typed as its upper/lowercase may not be correct.
-          if (completions.length == 1) {
-            inputBox.selectionStart -= word.length;
-            this.addString(completions[0] + (isFirstWord ? firstWordSuffix : " "));
-            return;
+          // We have possible completions!
+          this._completions = matchingCompletions.sort();
+          this._completionsIndex = 0;
+          // Save now the first and last completions in alphabetical order,
+          // as we will need them to find a common prefix. However they may
+          // not be the first and last completions in the list of completions
+          // actually exposed to the user, as if there are active nicks
+          // they will be moved to the beginning of the list.
+          let firstCompletion = this._completions[0];
+          let lastCompletion = this._completions.slice(-1)[0];
+
+          let preferredNick = false;
+          if (this._conv.isChat && !completingCommand) {
+            // If there are active nicks, prefer those.
+            let activeCompletions = this._completions.filter(function(c)
+              this.buddies.has(c) &&
+              !this.buddies.get(c).hasAttribute("inactive"), this);
+            if (activeCompletions.length == 1)
+              preferredNick = true;
+            if (activeCompletions.length) {
+              // Move active nicks to the front of the queue.
+              activeCompletions.reverse();
+              activeCompletions.forEach(function(c) {
+                this._completions.splice(this._completions.indexOf(c), 1);
+                this._completions.unshift(c);
+              }, this);
+            }
+
+            // If one of the completions is the sender of the last ping,
+            // take it, if it was less than an hour ago.
+            if (this._lastPing && this.buddies.has(this._lastPing) &&
+                this._completions.indexOf(this._lastPing) != -1 &&
+                (Date.now() / 1000 - this._lastPingTime) < 3600) {
+              preferredNick = true;
+              this._completionsIndex = this._completions.indexOf(this._lastPing);
+            }
           }
 
-          // We have several possible completions, attempt to find a common prefix.
-          completions.sort();
-          let i = 0;
-          let maxLength = Math.min(completions[0].length,
-                                   completions[completions.length - 1].length);
-          while (i < maxLength &&
-                 completions[0][i] == completions[completions.length - 1][i])
-            ++i;
-
-          // Apply the common prefix, if any.
-          if (i > 0) {
-            inputBox.selectionStart -= word.length;
-            this.addString(completions[0].substring(0, i));
-          }
-
-          // Finally, display the possible completions in a system message.
-          this._conv.systemMessage(completions.join(" "));
-          return;
-        }
+          // Display the possible completions in a system message.
+          delete this._shouldListCompletionsLater;
+          if (this._completions.length > 1) {
+            let completionsList = this._completions.join(" ");
+            if (preferredNick) {
+              // If we have a preferred nick (which is completed as a whole
+              // even if there are alternatives), only show the list of
+              // completions on the next <tab> press.
+              this._shouldListCompletionsLater = completionsList;
+            }
+            else
+              this._conv.systemMessage(completionsList);
+          }
 
-        // Handle typing notifications / character count.
-        if (event.keyCode != 13) {
-          setTimeout((function () {
-            // By the time the timeout is executed, the conversation may have
-            // been closed.
-            if (!this._conv)
-              return;
+          let suffix = (isFirstWord ? firstWordSuffix : "");
+          this._completions = this._completions.map(function(c) c + suffix);
 
-            let text = inputBox.value;
+          let completion;
+          if (this._completions.length == 1 || preferredNick) {
+            // Only one possible completion? Apply it! :-)
+            completion = this._completions[this._completionsIndex++];
+            this._completionsIndex %= this._completions.length;
+          }
+          else {
+            // We have several possible completions, attempt to find a common prefix.
+            let maxLength = Math.min(firstCompletion.length, lastCompletion.length);
+            let i = 0;
+            while (i < maxLength && firstCompletion[i] == lastCompletion[i])
+              ++i;
 
-            // try to avoid sending typing notifications when the user is
-            // typing a command in the conversation.
-            // These checks are not perfect (especially if non-existing
-            // commands are sent as regular messages on the in-use prpl).
-            let left = Ci.prplIConversation.NO_TYPING_LIMIT;
-            if (!text.startsWith("/"))
-              left = this._conv.sendTyping(text);
-            else if (/^\/me /.test(text))
-              left = this._conv.sendTyping(text.slice(4));
-
-            let charCounter = this.getElt("charCounter");
-
-            // When the input box is cleared or there is no character limit,
-            // don't show the character limit.
-            if (left == Ci.prplIConversation.NO_TYPING_LIMIT || !text.length) {
-              charCounter.setAttribute("value", "");
-              inputBox.removeAttribute("invalidInput");
-            }
+            if (i)
+              completion = firstCompletion.substring(0, i);
             else {
-              // 200 is a 'magic' constant to avoid showing big numbers.
-              charCounter.setAttribute("value", (left < 200 ? left : ""));
-
-              if (left >= 0)
-                inputBox.removeAttribute("invalidInput");
-              else if (left < 0)
-                inputBox.setAttribute("invalidInput", "true");
+              // Include this case so that secondNick is applied anyway,
+              // in case a completion is added by another tab press.
+              completion = word;
             }
-          }).bind(this), 0);
-          return;
+          }
+
+          // Always replace what the user typed as its upper/lowercase may
+          // not be correct.
+          inputBox.selectionStart -= word.length;
+          this._completionsStart = inputBox.selectionStart;
+
+          if (secondNick) {
+            // Replace the trailing colon with a comma before the completed nick.
+            inputBox.selectionStart -= 2;
+            completion = ", " + completion;
+          }
+
+          this.addString(completion);
         }
+        else if (this._completions)
+          delete this._completions;
+
+        if (event.keyCode != 13)
+          return;
 
         if (!event.ctrlKey && !event.shiftKey && !event.altKey) {
           // Prevent the default action before calling sendMsg to avoid having
@@ -615,6 +752,67 @@
       </body>
      </method>
 
+     <field name="_pendingValueChangedCall">false</field>
+     <method name="inputValueChanged">
+       <body>
+       <![CDATA[
+         // Delaying typing notifications will avoid sending several updates in
+         // a row if the user is on a slow or overloaded machine that has
+         // trouble to handle keystrokes in a timely fashion.
+         // Make sure only one typing notification call can be pending.
+         if (this._pendingValueChangedCall)
+           return;
+
+         this._pendingValueChangedCall = true;
+         Services.tm.mainThread.dispatch(this.delayedInputValueChanged.bind(this),
+                                         Ci.nsIEventTarget.DISPATCH_NORMAL);
+       ]]>
+       </body>
+     </method>
+
+     <method name="delayedInputValueChanged">
+       <body>
+       <![CDATA[
+         this._pendingValueChangedCall = false;
+
+         // By the time this function is executed, the conversation may have
+         // been closed.
+         if (!this._conv)
+           return;
+
+         let inputBox = this.editor;
+         let text = inputBox.value;
+
+         // Try to avoid sending typing notifications when the user is
+         // typing a command in the conversation.
+         // These checks are not perfect (especially if non-existing
+         // commands are sent as regular messages on the in-use prpl).
+         let left = Ci.prplIConversation.NO_TYPING_LIMIT;
+         if (!text.startsWith("/"))
+           left = this._conv.sendTyping(text);
+         else if (/^\/me /.test(text))
+           left = this._conv.sendTyping(text.slice(4));
+
+         // When the input box is cleared or there is no character limit,
+         // don't show the character limit.
+         let charCounter = this.getElt("charCounter");
+         if (left == Ci.prplIConversation.NO_TYPING_LIMIT || !text.length) {
+           charCounter.setAttribute("value", "");
+           inputBox.removeAttribute("invalidInput");
+         }
+         else {
+           // 200 is a 'magic' constant to avoid showing big numbers.
+           charCounter.setAttribute("value", (left < 200 ? left : ""));
+
+           if (left >= 0)
+             inputBox.removeAttribute("invalidInput");
+           else if (left < 0)
+             inputBox.setAttribute("invalidInput", "true");
+         }
+       ]]>
+       </body>
+     </method>
+
      <method name="resetInput">
       <body>
       <![CDATA[
@@ -816,6 +1014,7 @@
          editor.value = editor.value.substr(0, editor.selectionStart) + aString +
                         editor.value.substr(editor.selectionEnd);
          editor.selectionStart = editor.selectionEnd = cursorPosition;
+         this.inputValueChanged();
        ]]>
        </body>
      </method>
@@ -829,6 +1028,7 @@
          if (!currentEditorValue.startsWith(aPrompt))
            editor.value = aPrompt + currentEditorValue;
          editor.focus();
+         this.inputValueChanged();
        ]]>
        </body>
      </method>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/modules/chatNotifications.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/modules/chatNotifications.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/modules/chatNotifications.jsm	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/modules/chatNotifications.jsm	2015-02-28 15:02:41.000000000 +0000
@@ -8,6 +8,12 @@
 Cu.import("resource:///modules/imServices.jsm");
 Cu.import("resource:///modules/hiddenWindow.jsm");
 Cu.import("resource:///modules/StringBundle.js");
+Cu.import("resource://gre/modules/PluralForm.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
+
+// Time in seconds: it is the minimum time of inactivity
+// needed to show the bundled notification.
+const kTimeToWaitForMoreMsgs = 3;
 
 var Notifications = {
   get ellipsis () {
@@ -21,9 +27,39 @@
     return ellipsis;
   },
 
-  _showMessageNotification: function (aMessage) {
+  // Holds the first direct message of a bundle while we wait for further
+  // messages from the same sender to arrive.
+  _heldMessage: null,
+  // Number of messages to be bundled in the notification (excluding
+  // _heldMessage).
+  _msgCounter: 0,
+  // Time the last message was received.
+  _lastMessageTime: 0,
+  // Sender of the last message.
+  _lastMessageSender: null,
+  // timeout Id for the set timeout for showing notification.
+  _timeoutId: null,
+
+  _showMessageNotification: function(aMessage, aCounter = 0) {
+    // We are about to show the notification, so let's play the notification sound.
+    // We play the sound if the user is away from TB window or even away from chat tab.
+    if (Services.wm.getMostRecentWindow("mail:3pane").document
+                .getElementById("tabmail").currentTabInfo.mode.name != "chat")
+      Services.obs.notifyObservers(aMessage, "play-chat-notification-sound", false);
+
+    // If TB window has focus, there's no need to show the notification..
+    if (Services.wm.getMostRecentWindow("mail:3pane").document.hasFocus()) {
+      this._heldMessage = null;
+      this._msgCounter = 0;
+      return;
+    }
+
+    let bundle = new StringBundle("chrome://messenger/locale/chat.properties");
     let messageText, icon, name;
     let notificationContent = Services.prefs.getIntPref("mail.chat.notification_info");
+    // 0 - show all the info,
+    // 1 - show only the sender not the message,
+    // 2 - show no details about the message being notified.
     switch (notificationContent) {
       case 0:
         let parser = Cc["@mozilla.org/xmlextras/domparser;1"].createInstance(Ci.nsIDOMParser);
@@ -37,8 +73,18 @@
         messageText = encoder.encodeToString().replace(/\s+/g, " ");
 
         // Crop the end of the text if needed.
-        if (messageText.length > 50)
-          messageText = messageText.substr(0, 50) + this.ellipsis;
+        if (messageText.length > 50) {
+          messageText = messageText.substr(0, 50);
+          if (aCounter == 0)
+            messageText = messageText + this.ellipsis;
+        }
+
+        // If there are more messages being bundled, add the count string.
+        // ellipsis is a part of bundledMessagePreview so we don't include it here.
+        if (aCounter > 0) {
+          let bundledMessage = bundle.getFormattedString("bundledMessagePreview", [messageText], 1);
+          messageText = PluralForm.get(aCounter, bundledMessage).replace("#1", aCounter);
+        }
       case 1:
         // Use the buddy icon if available for the icon of the notification.
         let conv = aMessage.conversation;
@@ -62,11 +108,12 @@
         }
     }
 
-    // If the TB window doesn't have the focus, show the notification!
-    if (!Services.wm.getMostRecentWindow("mail:3pane").document.hasFocus()) {
-      Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService)
-        .showAlertNotification(icon, name, messageText, true, "", this);
-    }
+    // Show the notification!
+    Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService)
+      .showAlertNotification(icon, name, messageText, true, "", this);
+
+    this._heldMessage = null;
+    this._msgCounter = 0;
   },
 
   init: function() {
@@ -76,10 +123,54 @@
 
   _notificationPrefName: "mail.chat.show_desktop_notifications",
   observe: function(aSubject, aTopic, aData) {
-    if (aTopic == "new-directed-incoming-message") {
-      if (Services.prefs.getBoolPref(this._notificationPrefName))
+    if (aTopic == "new-directed-incoming-message" &&
+        Services.prefs.getBoolPref(this._notificationPrefName)) {
+      // If this is the first message, we show the notification and
+      // store the sender's name.
+      let sender = aSubject.who || aSubject.alias;
+      if (this._lastMessageSender == null) {
+        this._lastMessageSender = sender;
+        this._lastMessageTime = aSubject.time;
+        this._showMessageNotification(aSubject);
+      } else if ((this._lastMessageSender != sender) ||
+                 (aSubject.time > this._lastMessageTime + kTimeToWaitForMoreMsgs)) {
+        // If the sender is not the same as the previous sender or the
+        // time elapsed since the last message is greater than kTimeToWaitForMoreMsgs,
+        // we show the held notification and set timeout for the message just arrived.
+        if (this._heldMessage) {
+          // if the time for the current message is greater than _lastMessageTime by
+          // more than kTimeToWaitForMoreMsgs, this will not happen since the notification will
+          // have already been dispatched.
+          clearTimeout(this._timeoutId);
+          this._showMessageNotification(this._heldMessage, this._msgCounter);
+        }
+        this._lastMessageSender = sender;
+        this._lastMessageTime = aSubject.time;
         this._showMessageNotification(aSubject);
+      } else if (this._lastMessageSender == sender &&
+                 this._lastMessageTime + kTimeToWaitForMoreMsgs >= aSubject.time) {
+        // If the sender is same as the previous sender and the time elapsed since the
+        // last held message is less than kTimeToWaitForMoreMsgs, we increase the held messages
+        // counter and update the last message's arrival time.
+        this._lastMessageTime = aSubject.time;
+        if (!this._heldMessage)
+          this._heldMessage = aSubject;
+        else
+          this._msgCounter++;
+
+        clearTimeout(this._timeoutId);
+        this._timeoutId = setTimeout(function() {
+            Notifications._showMessageNotification(Notifications._heldMessage,
+                                                   Notifications._msgCounter)
+          }, kTimeToWaitForMoreMsgs * 1000);
+      }
     } else if (aTopic == "alertclickcallback") {
+      // If there is a timeout set, clear it.
+      clearTimeout(this._timeoutId);
+      this._heldMessage = null;
+      this._msgCounter = 0;
+      this._lastMessageTime = 0;
+      this._lastMessageSender = null;
       // Focus the conversation if the notification is clicked.
       let mainWindow = Services.wm.getMostRecentWindow("mail:3pane");
       if (mainWindow) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/modules/index_im.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/modules/index_im.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/im/modules/index_im.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/im/modules/index_im.js	2015-02-28 15:02:41.000000000 +0000
@@ -245,6 +245,18 @@
     Services.obs.removeObserver(this, "ui-conversation-closed");
   },
 
+  /* _knownFiles is a tree whose leaves are the last modified times of
+   * log files when they were last indexed.
+   * Each level of the tree is stored as an object. The root node is an
+   * object that maps a protocol name to an object representing the subtree
+   * for that protocol. The structure is:
+   * _knownFiles    -> protoObj      -> accountObj  -> convObj
+   * The corresponding keys of the above objects are:
+   * protocol names -> account names -> conv names  -> file names -> last modified time
+   * convObj maps ALL previously indexed log files of a chat buddy or MUC to
+   * their last modified times. Note that gloda knows nothing about log grouping
+   * done by logger.js.
+   */
   _knownFiles: {},
   _cacheSaveTimer: null,
   _scheduleCacheSave: function() {
@@ -315,14 +327,19 @@
     if (!(convId in this._knownConversations))
       this._knownConversations[convId] = {id: convId};
 
+    let conv = this._knownConversations[convId];
+
     Task.spawn(function* () {
-      if (!this._knownConversations[convId].logFile) {
+      if (!conv.logFile) {
         let logFile =
           yield Services.logs.getLogPathForConversation(aConversation);
         if (!logFile) {
           // Log file doesn't exist yet, nothing to do!
           return;
         }
+
+        // We initialize the _knownFiles tree path for the current file below in
+        // case it doesn't already exist.
         let folder = OS.Path.dirname(logFile);
         let convName = OS.Path.basename(folder);
         folder = OS.Path.dirname(folder);
@@ -338,32 +355,30 @@
         if (!Object.prototype.hasOwnProperty.call(accountObj, convName))
           accountObj[convName] = {};
 
-        this._knownConversations[convId].logFile = logFile;
-        this._knownConversations[convId].convObj = accountObj[convName];
+        conv.logFile = logFile;
+        // convObj is the penultimate level of the tree,
+        // maps file name -> last modified time
+        conv.convObj = accountObj[convName];
       }
 
-      let conv = this._knownConversations[convId];
-      let cache = conv.convObj;
-      let fileName = OS.Path.basename(conv.logFile);
-      let fileInfo = yield OS.File.stat(conv.logFile);
-      let lastModifiedTime = fileInfo.lastModificationDate.valueOf();
-      if (Object.prototype.hasOwnProperty.call(cache, fileName) &&
-          cache[fileName] == lastModifiedTime)
+      let logPath = conv.logFile;
+      let fileName = OS.Path.basename(logPath);
+      let lastModifiedTime =
+        (yield OS.File.stat(logPath)).lastModificationDate.valueOf();
+      if (Object.prototype.hasOwnProperty.call(conv.convObj, fileName) &&
+          conv.convObj[fileName] == lastModifiedTime) {
+        // The file hasn't changed since we last indexed it, so we're done.
         return;
+      }
       if (this._indexingJobPromise)
         yield this._indexingJobPromise;
       this._indexingJobPromise = new Promise(aResolve => {
         this._indexingJobCallbacks.set(convId, aResolve);
       });
-      let log = yield Services.logs.getLogFromFile(conv.logFile);
-      let logConv = yield log.getConversation();
       let job = new IndexingJob("indexIMConversation", null);
       job.conversation = conv;
-      job.log = log;
-      job.path = conv.logFile;
-      job.logConv = logConv;
+      job.path = logPath;
       GlodaIndexer.indexJob(job);
-      cache[fileName] = lastModifiedTime;
     }.bind(this)).catch(Components.utils.reportError);
 
     // Now clear the job, so we can index in the future.
@@ -436,51 +451,67 @@
    * the conversation in the database. This id is required to later update the
    * conversation in the database, so the caller dealing with ongoing
    * conversation has to provide the aGlodaConv parameter, while the caller
-   * dealing with old conversations doesn't care. */
-  indexIMConversation: function(aCallbackHandle, aLog, aLogConv, aCache, aGlodaConv) {
-    let fileName =  OS.Path.basename(aLog.path);
-    let isNew = !Object.prototype.hasOwnProperty.call(aCache, fileName);
+   * dealing with old conversations doesn't care.
+   * The aCache parameter is an object mapping file names to their last
+   * modified times at the time they were last indexed. The value for the file
+   * currently being indexed is updated to the aLastModifiedTime parameter's
+   * value once indexing is complete.
+   * */
+  indexIMConversation: Task.async(function* (aCallbackHandle, aLogPath, aLastModifiedTime, aCache, aGlodaConv) {
+    let log = yield Services.logs.getLogFromFile(aLogPath);
+    let logConv = yield log.getConversation();
 
     // Ignore corrupted log files.
-    if (!aLogConv)
+    if (!logConv)
       return Gloda.kWorkDone;
 
-    let content = aLogConv.getMessages()
-                          // Some messages returned, e.g. sessionstart messages,
-                          // may have the noLog flag set. Ignore these.
-                          .filter(m => !m.noLog)
-                          .map(m => {
-                            let who = m.alias || m.who;
-                            // Some messages like topic change notifications may
-                            // not have a source.
-                            let prefix = who ? who + ": " : "";
-                            return prefix + MailFolder.convertMsgSnippetToPlainText(m.message);
-                          })
-                          .join("\n\n");
+    let fileName = OS.Path.basename(aLogPath);
+
+    let content = logConv.getMessages()
+                         // Some messages returned, e.g. sessionstart messages,
+                         // may have the noLog flag set. Ignore these.
+                         .filter(m => !m.noLog)
+                         .map(m => {
+                           let who = m.alias || m.who;
+                           // Some messages like topic change notifications may
+                           // not have a source.
+                           let prefix = who ? who + ": " : "";
+                           return prefix + MailFolder.convertMsgSnippetToPlainText(m.message);
+                         })
+                         .join("\n\n");
     let glodaConv;
     if (aGlodaConv && aGlodaConv.value) {
       glodaConv = aGlodaConv.value;
       glodaConv._content = content;
     }
     else {
-      glodaConv = new GlodaIMConversation(aLogConv.title, aLog.time, aLog.path, content);
+      // Get the path of the file relative to the logs directory - the last 4
+      // components of the path.
+      let relativePath = OS.Path.split(aLogPath).components.slice(-4).join("/");
+      glodaConv = new GlodaIMConversation(logConv.title, log.time, relativePath, content);
       if (aGlodaConv)
         aGlodaConv.value = glodaConv;
     }
 
+    let isNew = !Object.prototype.hasOwnProperty.call(aCache, fileName);
     let rv = aCallbackHandle.pushAndGo(
       Gloda.grokNounItem(glodaConv, {}, true, isNew, aCallbackHandle));
+    aCache[fileName] = aLastModifiedTime;
     this._scheduleCacheSave();
     return rv;
-  },
+  }),
 
   _worker_indexIMConversation: function(aJob, aCallbackHandle) {
     let glodaConv = {};
     if (aJob.conversation.glodaConv)
       glodaConv.value = aJob.conversation.glodaConv;
     // indexIMConversation may initiate an async grokNounItem sub-job.
-    yield this.indexIMConversation(aCallbackHandle, aJob.log, aJob.logConv,
-                                   aJob.conversation.convObj, glodaConv);
+    this.indexIMConversation(aCallbackHandle, aJob.path, aJob.lastModifiedTime,
+                             aJob.conversation.convObj, glodaConv)
+        .then(() => GlodaIndexer.callbackDriver());
+    // Tell the Indexer that we're doing async indexing. We'll be left alone
+    // until callbackDriver() is called above.
+    yield Gloda.kWorkAsync;
     // Resolve the promise for this job.
     this._indexingJobCallbacks.get(aJob.conversation.id)();
     this._indexingJobCallbacks.delete(aJob.conversation.id);
@@ -521,6 +552,8 @@
       }
     }
 
+    // Sweep the logs directory for log files, adding any new entries to the
+    // _knownFiles tree as we traverse.
     let children = dir.directoryEntries;
     while (children.hasMoreElements()) {
       let proto = children.getNext().QueryInterface(Ci.nsIFile);
@@ -563,10 +596,17 @@
     while (sessions.hasMoreElements()) {
       let file = sessions.getNext().QueryInterface(Ci.nsIFile);
       let fileName = file.leafName;
-      if (!file.isFile() || !file.isReadable() || !fileName.endsWith(".json"))
+      if (!file.isFile() || !file.isReadable() || !fileName.endsWith(".json") ||
+          (Object.prototype.hasOwnProperty.call(aJob.convObj, fileName) &&
+           aJob.convObj[fileName] == file.lastModifiedTime))
         continue;
       // indexIMConversation may initiate an async grokNounItem sub-job.
-      yield this.indexIMConversation(aCallbackHandle, file, aJob.convObj);
+      this.indexIMConversation(aCallbackHandle, file.path,
+                               file.lastModifiedTime, aJob.convObj)
+          .then(() => GlodaIndexer.callbackDriver());
+      // Tell the Indexer that we're doing async indexing. We'll be left alone
+      // until callbackDriver() is called above.
+      yield Gloda.kWorkAsync;
     }
     yield Gloda.kWorkDone;
   },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/mailComponents.manifest thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/mailComponents.manifest
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/mailComponents.manifest	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/mailComponents.manifest	2015-02-28 15:02:41.000000000 +0000
@@ -4,6 +4,7 @@
 contract @mozilla.org/network/protocol/about;1?what=rights {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 contract @mozilla.org/network/protocol/about;1?what=support {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 contract @mozilla.org/network/protocol/about;1?what=preferences {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
+contract @mozilla.org/network/protocol/about;1?what=downloads {8cc51368-6aa0-43e8-b762-bde9b9fd828c}
 
 component {44346520-c5d2-44e5-a1ec-034e04d7fac4} nsMailDefaultHandler.js
 contract @mozilla.org/mail/clh;1 {44346520-c5d2-44e5-a1ec-034e04d7fac4}
@@ -17,3 +18,7 @@
 component {eb239c82-fac9-431e-98d7-11cacd0f71b8} mailGlue.js
 contract @mozilla.org/mail/mailglue;1 {eb239c82-fac9-431e-98d7-11cacd0f71b8}
 category app-startup MailGlue service,@mozilla.org/mail/mailglue;1
+
+component {a93f0d6f-02a3-4486-a662-8f49b8c1de48} DownloadsStartup.js
+contract @mozilla.org/mail/downloadsstartup;1 {a93f0d6f-02a3-4486-a662-8f49b8c1de48}
+category profile-after-change DownloadsStartup @mozilla.org/mail/downloadsstartup;1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/moz.build	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/moz.build	2015-02-28 15:02:41.000000000 +0000
@@ -9,6 +9,7 @@
     'compose',
     'cloudfile',
     'devtools',
+    'downloads',
     'preferences',
     'addrbook',
     'migration',
@@ -35,6 +36,7 @@
 
 EXTRA_COMPONENTS += [
     'aboutRedirector.js',
+    'DownloadsStartup.js',
     'mailComponents.manifest',
     'mailContentHandler.js',
     'mailGlue.js',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/advanced.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/advanced.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/advanced.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/advanced.js	2015-02-28 15:02:41.000000000 +0000
@@ -27,6 +27,13 @@
     this.updateReadPrefs();
 #endif
 
+    // Default store type initialization.
+    let storeTypeElement = document.getElementById("storeTypeMenulist");
+    // set the menuitem to match the account
+    let defaultStoreID = Services.prefs.getCharPref("mail.serverDefaultStoreContractID");
+    let targetItem = storeTypeElement.getElementsByAttribute("value", defaultStoreID);
+    storeTypeElement.selectedItem = targetItem[0];
+
 #ifdef MOZ_CRASHREPORTER
     this.initSubmitCrashes();
 #endif
@@ -126,6 +133,14 @@
     }
   },
 
+  /**
+   * Set the default store contract ID.
+   */
+  updateDefaultStore: function(storeID)
+  {
+    Services.prefs.setCharPref("mail.serverDefaultStoreContractID", storeID);
+  },
+
   // NETWORK TAB
 
   /*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/advanced.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/advanced.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/advanced.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/advanced.xul	2015-02-28 15:02:41.000000000 +0000
@@ -217,6 +217,22 @@
                           label="&enableGlodaSearch.label;"
                           accesskey="&enableGlodaSearch.accesskey;"/>
               </hbox>
+              <hbox align="center">
+                <label value="&storeType.label;"
+                       accesskey="&storeType.accesskey;"
+                       control="storeTypeMenulist"/>
+                <menulist id="storeTypeMenulist"
+                          oncommand="gAdvancedPane.updateDefaultStore(this.selectedItem.value)">
+                  <menupopup id="storeTypeMenupopup">
+                    <menuitem id="mboxStore"
+                              label="&mboxStore.label;"
+                              value="@mozilla.org/msgstore/berkeleystore;1"/>
+                    <menuitem id="maildirStore"
+                              label="&maildirStore.label;"
+                              value="@mozilla.org/msgstore/maildirstore;1"/>
+                  </menupopup>
+                </menulist>
+              </hbox>
               <hbox>
                 <checkbox id="allowHWAccel"
                           label="&allowHWAccel.label;"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/general.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/general.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/general.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/general.js	2015-02-28 15:02:41.000000000 +0000
@@ -14,10 +14,9 @@
     this.mPane = document.getElementById("paneGeneral");
 
     this.updateStartPage();
-
     this.updatePlaySound();
-
     this.updateCustomizeAlert();
+    this.updateWebSearch();
 
     if (this._loadInContent) {
       gSubDialog.init();
@@ -178,5 +177,28 @@
       customizeAlertButton.disabled =
         !document.getElementById("newMailNotificationAlert").checked;
     }
-  }
+  },
+
+  updateWebSearch: function() {
+    Services.search.init({
+      onInitComplete: function() {
+        let engineList = document.getElementById("defaultWebSearch");
+        for (let engine of Services.search.getVisibleEngines()) {
+          let item = engineList.appendItem(engine.name);
+          item.engine = engine;
+          item.className = "menuitem-iconic";
+          item.setAttribute(
+            "image", engine.iconURI ? engine.iconURI.spec :
+                     "resource://gre-resources/broken-image.png"
+          );
+          if (engine == Services.search.currentEngine)
+            engineList.selectedItem = item;
+        }
+
+        engineList.addEventListener("command", function() {
+          Services.search.currentEngine = engineList.selectedItem.engine;
+        });
+      }
+    });
+  },
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/general.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/general.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/general.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/general.xul	2015-02-28 15:02:41.000000000 +0000
@@ -54,6 +54,15 @@
     </groupbox>
 
     <groupbox>
+      <caption label="&defaultSearchEngine.label;"/>
+      <hbox>
+        <menulist id="defaultWebSearch">
+          <menupopup id="defaultWebSearchPopup"/>
+        </menulist>
+      </hbox>
+    </groupbox>
+
+    <groupbox>
       <caption label="&newMessagesArrive.label;"/>
       <hbox align="center">
 #ifdef XP_MACOSX
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/offline.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/offline.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/components/preferences/offline.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/components/preferences/offline.xul	2015-02-28 15:02:41.000000000 +0000
@@ -50,8 +50,8 @@
              accesskey="&radioRememberPrevState.accesskey;"/>
       <radio value="1" label="&radioAskState.label;"
              accesskey="&radioAskState.accesskey;"/>
-      <radio value="2" label="&radioAlwaysOnline.label;"
-             accesskey="&radioAlwaysOnline.accesskey;"/>
+      <radio value="2" label="&radioAlwaysOnlineState.label;"
+             accesskey="&radioAlwaysOnlineState.accesskey;"/>
       <radio value="3" label="&radioAlwaysOffline.label;"
              accesskey="&radioAlwaysOffline.accesskey;"/>
       <radio value="4" hidden="true"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/config/version.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/config/version.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/config/version.txt	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/config/version.txt	2015-02-28 15:02:41.000000000 +0000
@@ -1 +1 @@
-38.0a1
+39.0a1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/confvars.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/confvars.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/confvars.sh	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/confvars.sh	2015-02-28 15:02:41.000000000 +0000
@@ -43,3 +43,4 @@
 # Enable generational GC on desktop.
 JSGC_GENERATIONAL=1
 MOZ_PROFILE_MIGRATOR=1
+MOZ_JSDOWNLOADS=1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/installer/package-manifest.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/installer/package-manifest.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/installer/package-manifest.in	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/installer/package-manifest.in	2015-02-28 15:02:41.000000000 +0000
@@ -371,11 +371,12 @@
 @RESPATH@/components/storage-json.js
 @RESPATH@/components/crypto-SDR.js
 
+; download progress for jsdownloads
+@RESPATH@/components/DownloadsStartup.js
+
 ; download progress
 @RESPATH@/components/nsHelperAppDlg.js
 @RESPATH@/components/nsHelperAppDlg.manifest
-@RESPATH@/components/nsDownloadManagerUI.js
-@RESPATH@/components/nsDownloadManagerUI.manifest
 @RESPATH@/components/downloads.xpt
 
 ; Protocol/Content handling
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/aboutDialog.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/aboutDialog.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/aboutDialog.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -36,10 +36,13 @@
 <!ENTITY community.creditsLink      "global community">
 <!ENTITY community.end3             " working together to keep the Web open, public and accessible to all.">
 
-<!ENTITY contribute.start           "Sound interesting? ">
-<!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
-<!ENTITY contribute.getInvolvedLink "Get involved!">
-<!ENTITY contribute.end             "">
+<!ENTITY helpus.start               "Want to help? ">
+<!-- LOCALIZATION NOTE (helpus.donateLink): This is a link title that links to the thunderbird donation page -->
+<!ENTITY helpus.donateLink          "Make a donation">
+<!ENTITY helpus.middle              " or ">
+<!-- LOCALIZATION NOTE (helpus.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
+<!ENTITY helpus.getInvolvedLink     "get involved!">
+<!ENTITY helpus.end                 "">
 
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Licensing Information">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/aboutDownloads.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/aboutDownloads.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/aboutDownloads.dtd	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/aboutDownloads.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,21 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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 aboutDownloads.title                      "Saved Files">
+<!ENTITY aboutDownloads.empty                      "No Saved Files">
+<!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
+     cmd.showMac.accesskey):
+     The show and showMac commands are never shown together, thus they can share
+     the same access key (though the two access keys can also be different).
+     -->
+<!ENTITY cmd.show.label                            "Open Containing Folder">
+<!ENTITY cmd.show.accesskey                        "F">
+<!ENTITY cmd.showMac.label                         "Show In Finder">
+<!ENTITY cmd.showMac.accesskey                     "F">
+<!ENTITY cmd.open.label                            "Open">
+<!ENTITY cmd.open.accesskey                        "O">
+<!ENTITY cmd.removeFromHistory.label               "Remove From History">
+<!ENTITY cmd.removeFromHistory.accesskey           "e">
+<!ENTITY cmd.clearDownloads.label                  "Clear Downloads">
+<!ENTITY cmd.clearDownloads.accesskey              "D">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -3,7 +3,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY addressbookWindow.title                        "Address Book">
-
+<!ENTITY blankResultsPaneMessage.label                  "This address book shows contacts only after a search">
+<!ENTITY localResultsOnlyMessage.label                  "Contacts from remote address books are not shown until you search">
 <!-- File Menu -->
 <!ENTITY fileMenu.label                                 "File">
 <!ENTITY fileMenu.accesskey                             "f">
@@ -160,6 +161,8 @@
 <!ENTITY searchItem.title "Quick Search">
 
 <!-- Results Pane -->
+<!ENTITY Addrbook.label                                 "Address Book">
+<!ENTITY Addrbook.accesskey                             "B">
 <!ENTITY GeneratedName.label                            "Name">
 <!ENTITY GeneratedName.accesskey                        "N">
 <!ENTITY PrimaryEmail.label                             "Email">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/addressbook/abResultsPaneOverlay.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/addressbook/abResultsPaneOverlay.dtd	2015-02-28 15:02:41.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/. -->
 
+<!ENTITY Addrbook.label                        "Address Book">
+<!ENTITY Addrbook.accesskey                    "B">
 <!ENTITY GeneratedName.label                   "Name">
 <!ENTITY GeneratedName.accesskey               "N">
 <!ENTITY PrimaryEmail.label                    "Email">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/addressbook/addressBook.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/addressbook/addressBook.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/addressbook/addressBook.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/addressbook/addressBook.properties	2015-02-28 15:02:41.000000000 +0000
@@ -9,6 +9,8 @@
 lastFirstFormat=%S, %S
 firstLastFormat=%S %S  
 
+allAddressBooks=All Address Books
+
 newContactTitle=New Contact
 # %S will be the contact's display name
 newContactTitleWithDisplayName=New Contact for %S
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/am-server-top.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/am-server-top.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -84,3 +84,7 @@
 
 <!ENTITY accountTitle.label "Account Settings">
 <!ENTITY accountSettingsDesc.label "The following is a special account.  There are no identities associated with it.">
+<!ENTITY storeType.label "Message Store Type:">
+<!ENTITY storeType.accesskey "T">
+<!ENTITY mboxStore.label "One large file (mbox)">
+<!ENTITY maildirStore.label "File per message (maildir)">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/chat.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/chat.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/chat.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/chat.properties	2015-02-28 15:02:41.000000000 +0000
@@ -92,4 +92,17 @@
 log.currentWeek=This Week
 log.previousWeek=Last Week
 
+# LOCALIZATION NOTE (messagePreview):
+# This is the default message preview to be shown
+# when the user has chosen not to show any info in the notification about the
+# incoming message being notified.
 messagePreview=New Chat Message
+
+#LOCALIZATION NOTE (bundledMessagePreview):  Semi-colon list of plural forms.
+# Used when multiple incoming messages from the same sender are bundled
+# into a single notification.
+# #1 is the number of incoming messages the user is being notified about. When #1
+# is greater than one, the plural form after the semicolon is used.
+# Do not translate %1$S, it is the message preview to be shown in the
+# notification, i.e. the first incoming message.
+bundledMessagePreview=%1$S… (and #1 more message);%1$S… (and #1 more messages)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/filter.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/filter.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/filter.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/filter.properties	2015-02-28 15:02:41.000000000 +0000
@@ -24,6 +24,12 @@
 continueButtonLabel=Continue
 cannotEnableFilter=This filter was probably created by future version of mozilla/netscape. You cannot enable this filter because we don't know how to apply it.
 dontWarnAboutDeleteCheckbox=Don't ask me again
+
+# LOCALIZATION NOTE(filterFAilureWarningPrefix)
+# %1$S=filter error action
+# %2$S=error code as hexadecimal string.
+filterFailureWarningPrefix=Filter Action Failed: "%1$S" with error code=%2$S while attempting:
+
 searchTermsInvalidTitle=Search Terms Invalid
 # LOCALIZATION NOTE(searchTermsInvalidRule)
 # %1$S=search attribute name from the invalid rule
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/glodaComplete.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/glodaComplete.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/glodaComplete.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/glodaComplete.properties	2015-02-28 15:02:41.000000000 +0000
@@ -17,15 +17,3 @@
 #  a set of words, or a phrase containing multiple words (e.g. "red pepper")
 #  We use the same words in en-US, but maybe that's not always true.
 glodaComplete.messagesMentioningMany.label=Messages mentioning: #1
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
-#  autocomplete widget to refer to a search on the web for a short string
-#  containing at most 15 characters. #1 is the search provider to use. #2 is
-#  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label=Search #1 for: #2
-
-# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
-#  the autocomplete widget to refer to a search on the web for a short string
-#  containing more than 15 characters. #1 is the search provider to use. #2 is
-#  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label.truncated=Search #1 for: #2…
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties	2015-02-28 15:02:41.000000000 +0000
@@ -9,162 +9,117 @@
 ## %S will be replaced with the name of file that could not be opened
 unableToOpenFile=Unable to open the file %S.
 unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary Directory' setting.
-
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Unable to save your message as template.
-
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Unable to save your message as draft.
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Couldn't open Sent Mail folder. Please verify that your Mail preferences are correct.
-
-## @name NS_MSG_NO_SENDER
-12510=No sender was specified. Please fill in your email address in the Mail & Newsgroups account settings.
-
-## @name NS_MSG_NO_RECIPIENTS
-12511=No recipients were specified. Please enter a recipient or newsgroup in the addressing area.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Error writing temporary file.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
-
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
-
-## @name NS_ERROR_SENDING_MESSAGE
-12517=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
-
-## @name NS_ERROR_POST_FAILED
-12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again, or else contact your network administrator.
-
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=An error occurred delivering unsent messages.
-
-## @name NS_ERROR_SEND_FAILED
-12520=Sending of message failed.
-
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=An error occurred sending mail: SMTP server error. The server responded:  %s Contact your mail administrator for assistance.
-
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Unable to save your message in order to send it later.
-
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=A communications error occurred: %d.  Please try again.
-
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
-
-## @name NS_ERROR_TCP_READ_ERROR
-12528=A network error occurred while receiving data.  (Network Error: %s)  Try connecting again.
-
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=An error occurred sending mail:  the return mail address was invalid.  Please verify that your email address is correct in your Mail preferences and try again.
-
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Attachment error.
-
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=The message was sent successfully, but could not be copied to your Sent folder.
-
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=You can only send a message to one news server at a time.
-
-## @name NS_MSG_CANCELLING
-12555=Cancelling…
-
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Your message has been posted to the newsgroup but has not been sent to other recipient.
-
-## @name NS_MSG_ERROR_READING_FILE
-12563=Error reading file.
-
+unableToSaveTemplate=Unable to save your message as a template.
+unableToSaveDraft=Unable to save your message as a draft.
+couldntOpenFccFolder=Couldn't open the Sent Mail folder. Please verify that your account settings are correct.
+noSender=No sender was specified. Please add your email address in the account settings.
+noRecipients=No recipients were specified. Please enter a recipient or newsgroup in the addressing area.
+errorWritingFile=Error writing temporary file.
+
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingFromCommand=An error occurred while sending mail. The mail server responded: %s. Please verify that your email address is correct in your account settings and try again.
+
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingDataCommand=An Outgoing server (SMTP) error occurred while sending mail. The server responded:  %s.
+
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
+postFailed=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again.
+errorQueuedDeliveryFailed=An error occurred while delivering the unsent messages.
+sendFailed=Sending of the message failed.
+
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
+smtpServerError=An error occurred while sending mail: Outgoing server (SMTP) error. The server responded:  %s.
+unableToSendLater=Sorry, we were unable to save your message for sending later.
+
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=A communications error occurred: %d.  Please try again.
+dontShowAlert=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=A network error occurred while receiving data.  (Network Error: %s)  Try connecting again.
+couldNotGetUsersMailAddress=An error occurred while sending mail:  the return mail address was invalid.  Please verify that your email address is correct in your account settings and try again.
+mimeMpartAttachmentError=Attachment error.
+failedCopyOperation=The message was sent successfully, but could not be copied to your Sent folder.
+nntpNoCrossPosting=You can only send a message to one news server at a time.
+msgCancelling=Cancelling…
+sendFailedButNntpOk=Your message has been posted to the newsgroup but has not been sent to the other recipient.
+errorReadingFile=Error reading file.
 followupToSenderMessage=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
 
-## @name NS_MSG_ERROR_ATTACHING_FILE
-12570=There was an error attaching %S. Please check if you have access to the file.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of the object to be attached
+errorAttachingFile=There was an error attaching %S. Please check that you have access to the file.
 
-## @name NS_ERROR_SMTP_GREETING
-12572=An error occurred sending mail: The mail server sent an incorrect greeting:  %s.
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
+incorrectSmtpGreeting=An error occurred while sending mail: The mail server sent an incorrect greeting:  %s.
 
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
+errorSendingRcptCommand=An error occurred while sending mail. The mail server responded:  \n%1$S.\n Please check the message recipient "%2$S" and try again.
 
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
+startTlsFailed=An error occurred while sending mail: Unable to establish a secure link with Outgoing server (SMTP) %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
 
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
+smtpPasswordUndefined=An error occurred while sending mail: Could not get password for %S. The message was not sent.
 
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
 
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12587=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
 
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12588=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the Outgoing server (SMTP) response
+smtpPermSizeExceeded2=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-12589=An error occurred sending mail: SMTP server %S is unknown. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownServer=An error occurred while sending mail: Outgoing server (SMTP) %S is unknown. The server may be incorrectly configured. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-12590=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server settings are correct and try again, or contact the server administrator.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRefused=The message could not be sent because connecting to Outgoing server (SMTP) %S failed. The server may be unavailable or is refusing Outgoing server (SMTP) connections. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-12591=The message could not be sent because the connection to SMTP server %S was lost in the middle of the transaction. Try again or contact your network administrator.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
+smtpSendInterrupted=The message could not be sent because the connection to Outgoing server (SMTP) %S was lost in the middle of the transaction. Try again.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
+smtpSendTimeout=The message could not be sent because the connection to Outgoing server (SMTP) %S timed out. Try again.
 
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-12593=The message could not be sent using SMTP server %S for an unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownReason=The message could not be sent using Outgoing server (SMTP) %S for an unknown reason. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=The SMTP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainNoSsl=The Outgoing server (SMTP) %S does not seem to support encrypted passwords. If you just set up the account, try changing the 'Authentication method' in 'Account Settings | Server settings' to 'Password, transmitted insecurely'. If it used to work but now doesn't, you may be susceptible to getting your password stolen.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12595): $S is server hostname
-12595=The SMTP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainSsl=The Outgoing server (SMTP) %S does not seem to support encrypted passwords. If you just set up the account, try changing to the 'Authentication method' in 'Account settings | Server settings' to 'Normal password'.
 
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12596): $S is server hostname
-12596=The SMTP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
+smtpAuthChangePlainToEncrypt=The Outgoing server (SMTP) %S does not allow plaintext passwords. Please try changing the 'Authentication method' in 'Account Settings | Server settings' to 'Encrypted password'.
 
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Unable to authenticate to SMTP server %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
+smtpAuthFailure=Unable to authenticate to Outgoing server (SMTP) %S. Please check the password and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
 
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=The Kerberos/GSSAPI ticket was not accepted by the SMTP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
+smtpAuthGssapi=The Kerberos/GSSAPI ticket was not accepted by the Outgoing server (SMTP) %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
 
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=The SMTP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Outgoing Server (SMTP)'.
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
+smtpAuthMechNotSupported=The Outgoing server (SMTP) %S does not support the selected authentication method. Please change the 'Authentication method' in 'Account Settings | Outgoing Server (SMTP)'.
 
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=Unable to authenticate to SMTP server %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in the 'Account Settings | Outgoing Server (SMTP)' or contact your email service provider for instructions.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
+smtpAuthNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (Outgoing server (SMTP)-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in the 'Account Settings | Outgoing Server (SMTP)' or contact your email service provider for instructions.
 
-## @name NS_ERROR_ILLEGAL_LOCALPART
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=There are non-ASCII characters in the local part of the recipient address %s. This is not yet supported. Please change this address and try again.
 
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
 saveDlogTitle=Save Message
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
 saveDlogMessages=Message has not been sent. Do you want to save the message in your drafts folder (%1$S)?
 
 ## generics string
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
-
-genericFailureExplanation=Please verify that your Mail & Newsgroups account settings are correct and try again.
+genericFailureExplanation=Please verify that your account settings are correct and try again.
 
 ## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
 undisclosedRecipients=undisclosed-recipients
@@ -182,21 +137,22 @@
 sendWithEmptySubjectButton=&Send Without Subject
 cancelSendingButton=&Cancel Sending
 
-## Strings used by the dialog that informs about lack of newsgroup support.
+## Strings used by the dialog that informs about the lack of newsgroup support.
 noNewsgroupSupportTitle=Newsgroups Not Supported
 recipientDlogMessage=This account only supports email recipients. Continuing will ignore newsgroups.
 
-## Strings used by the alert that tells the user an e-mail address is invalid.
+## Strings used by the alert that tells the user that an e-mail address is invalid.
 addressInvalidTitle=Invalid Recipient Address
 addressInvalid=%1$S is not a valid e-mail address because it is not of the form user@host. You must correct it before sending the e-mail.
 
-## String used by the dialog that ask the user to attach a web page
+## String used by the dialog that asks the user to attach a web page
 attachPageDlogTitle=Please specify a location to attach
 attachPageDlogMessage=Web Page (URL):
 
-## String used for attachment pretty name, when attachment is a message
+## String used for attachment pretty name, when the attachment is a message
 messageAttachmentSafeName=Attached Message
-## String used for attachment pretty name, when attachment is message part
+
+## String used for attachment pretty name, when the attachment is a message part
 partAttachmentSafeName=Attached Message Part
 
 # LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
@@ -211,73 +167,75 @@
 ## String used if a file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=File Attach
+
 ## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
 errorFileAttachMessage=The file %1$S does not exist so could not be attached to the message.
 
-## Strings used by Save as Draft/Template dialog
+## Strings used by the Save as Draft/Template dialog
 SaveDialogTitle=Save Message
-## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
+
+## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
 SaveDialogMsg=Your message has been saved to the folder %1$S under %2$S.
 CheckMsg=Do not show me this dialog box again.
 
-## Strings used by prompt when Quitting while in progress
+## Strings used by the prompt when Quitting while in progress
 quitComposeWindowTitle=Sending Message
+
 ## LOCALIZATION NOTE (quitComposeWindowMessage2): don't translate \n
 quitComposeWindowMessage2=%1$S is currently in the process of sending a message.\nWould you like to wait until the message has been sent before quitting or quit now?
 quitComposeWindowQuitButtonLabel2=&Quit
 quitComposeWindowWaitButtonLabel2=&Wait
 quitComposeWindowSaveTitle=Saving Message
+
 ## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
 quitComposeWindowSaveMessage=%1$S is currently in the process of saving a message.\nWould you like to wait until the message has been saved before quitting or quit now?
 
-## Strings used by prompt for Ctrl-Enter check before sending message
+## Strings used by the prompt for Ctrl-Enter check before sending message
 sendMessageCheckWindowTitle=Send Message
 sendMessageCheckLabel=Are you sure you are ready to send this message?
 sendMessageCheckSendButtonLabel=Send
-
 assemblingMessageDone=Assembling message…Done
 assemblingMessage=Assembling message…
-
 smtpDeliveringMail=Delivering mail…
 smtpMailSent=Mail sent successfully
-
 assemblingMailInformation=Assembling mail information…
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
+
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is the file name/URI of attachment
 gatheringAttachment=Attaching %S…
 creatingMailMessage=Creating mail message…
 
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
+## LOCALIZATION NOTE (copyMessageStart): argument %S is the folder name
 copyMessageStart=Copying message to %S folder…
 copyMessageComplete=Copy complete.
 copyMessageFailed=Copy failed.
-
 filterMessageComplete=Filter complete.
 filterMessageFailed=Filter failed.
 
 ## LOCALIZATION NOTE (largeMessageSendWarning):
 ## Do not translate %S. It is the size of the message in user-friendly notation.
-largeMessageSendWarning=Warning! You are about to send a message of size %S which may exceed the allowed limit on the mail server. Are you sure that you want to do this?
-
+largeMessageSendWarning=Warning! You are about to send a message of size %S. Are you sure you want to do this?
 sendingMessage=Sending message…
 sendMessageErrorTitle=Send Message Error
 postingMessage=Posting message…
-
 sendLaterErrorTitle=Send Later Error
 saveDraftErrorTitle=Save Draft Error
 saveTemplateErrorTitle=Save Template Error
 
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSaving=There was a problem including the file %.200S in the message. Would you like to continue saving the message without this file?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSending=There was a problem including the file %.200S in the message. Would you like to continue sending the message without this file?
 returnToComposeWindowQuestion=Would you like to return to the compose window?
 
 ## reply header in composeMsg
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is the author (name of the person replying to)
 mailnews.reply_header_authorwrotesingle=#1 wrote:
-## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_ondateauthorwrote=On #2 #3, #1 wrote:
-## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_authorwroteondate=#1 wrote on #2 #3:
 
 ## reply header in composeMsg
@@ -294,7 +252,7 @@
 
 ## Attachment Reminder
 ## LOCALIZATION NOTE (mail.compose.attachment_reminder_keywords): comma separated
-##   words that that should trigger an attachment reminder.
+## words that should trigger an attachment reminder.
 mail.compose.attachment_reminder_keywords=.doc,.pdf,.xls,.ppt,.rtf,.pps,attachment,attach,attached,attaching,enclosed,CV,cover letter
 
 addAttachmentButton=Add Attachment…
@@ -304,6 +262,7 @@
 
 attachmentReminderTitle=Attachment Reminder
 attachmentReminderMsg=Did you forget to add an attachment?
+
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of keywords
@@ -315,6 +274,7 @@
 # Strings used by the Filelink offer notification bar.
 learnMore.label=Learn More…
 learnMore.accesskey=m
+
 # LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of big attached files
@@ -323,10 +283,8 @@
 bigFileShare.accesskey=l
 bigFileAttach.label=Ignore
 bigFileAttach.accesskey=i
-
 bigFileChooseAccount.title=Choose Account
 bigFileChooseAccount.text=Choose a cloud account to upload the attachment to
-
 bigFileHideNotification.title=Don't Upload My Files
 bigFileHideNotification.text=You won't be notified if you attach more big files to this message.
 bigFileHideNotification.check=Never notify me of this again.
@@ -335,23 +293,25 @@
 # %S. %S is the display name for the cloud account the attachment is being
 # uploaded to.
 cloudFileUploadingTooltip=Uploading to %S…
+
 # LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
 # %S. %S is the display name for the cloud account the attachment was uploaded
 # to.
 cloudFileUploadedTooltip=Uploaded to %S
-cloudFileUploadingNotification=Your file is being linked. It will appear in the body of the message when it's done.;Your files are being linked. They will appear in the body of the message when they're done.
+cloudFileUploadingNotification=Your file is being linked. It will appear in the body of the message when it's done.;Your files are being linked. They will appear in the body of the message when it's done.
 cloudFileUploadingCancel.label=Cancel
 cloudFileUploadingCancel.accesskey=c
 cloudFilePrivacyNotification=Linking is complete. Please note that linked attachments may be accessible to people who can see or guess the links.
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
-## word $S. Place the word $S where the host name should appear.
+## word %S. Place the word %S where the host name should appear.
 smtpEnterPasswordPrompt=Enter your password for %S:
+
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
-smtpEnterPasswordPromptTitle=SMTP Server Password Required
+smtpEnterPasswordPromptTitle=Outgoing server (SMTP) Password Required
 
 # LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
@@ -360,43 +320,47 @@
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg=There was an error saving the message to %S. Retry?
-
 errorFilteringMsg=Your message has been sent and saved, but there was an error while running message filters on it.
-
 errorCloudFileAuth.title=Authentication Error
+
 ## LOCALIZATION NOTE(errorCloudFileAuth.message):
-## %1$S is the name of the online storage service that authentication failed against.
+## %1$S is the name of the online storage service against which the authentication failed.
 errorCloudFileAuth.message=Unable to authenticate to %1$S.
 errorCloudFileUpload.title=Upload Error
+
 ## LOCALIZATION NOTE(errorCloudFileUpload.message):
-## %1$S is the name of the online storage service that uploading failed against.
+## %1$S is the name of the online storage service against which the uploading failed.
 ## %2$S is the name of the file that failed to upload.
 errorCloudFileUpload.message=Unable to upload %2$S to %1$S.
 errorCloudFileQuota.title=Quota Error
+
 ## LOCALIZATION NOTE(errorCloudFileQuota.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
 errorCloudFileQuota.message=Uploading %2$S to %1$S would exceed your space quota.
 errorCloudFileNameLimit.title=File Name Error
+
 ## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to the excess file name length
-errorCloudFileNameLimit.message=Uploading %2$S to %1$S contains has more than 120 characters in its name. Please rename the file to have 120 characters or less in its name and upload again.
+errorCloudFileNameLimit.message=%2$S contains has more than 120 characters in its name which is more than the maximum file name length for %1$S. Please rename the file to have 120 characters or less in its name and upload again.
 errorCloudFileLimit.title=File Size Error
+
 ## LOCALIZATION NOTE(errorCloudFileLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to size restrictions.
 errorCloudFileLimit.message=%2$S exceeds the maximum size for %1$S.
 errorCloudFileOther.title=Unknown Error
+
 ## LOCALIZATION NOTE(errorCloudFileOther.message):
 ## %1$S is the name of the online storage service that cannot be communicated with.
 errorCloudFileOther.message=An unknown error occurred when communicating with %1$S.
 errorCloudFileDeletion.title=Deletion Error
+
 ## LOCALIZATION NOTE(errorCloudFileDeletion.message):
 ## %1$S is the name of the online storage service that the file is to be deleted from.
 ## %2$S is the name of the file that failed to be deleted.
 errorCloudFileDeletion.message=There was a problem deleting %2$S from %1$S.
-
 errorCloudFileUpgrade.label=Upgrade
 
 ## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
@@ -411,7 +375,7 @@
 cloudAttachmentListFooter=%1$S makes it easy to share large files over email.
 
 ## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
-## attachment, to be inserted into the message body. Do not translate the words
+## attachment to be inserted into the message body. Do not translate the words
 ## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
 ## %3$S is the name of the cloud storage service, and %4$S is the link to the
 ## attachment.
@@ -421,7 +385,6 @@
 ## upload notification bar to allow the user to dismiss the notification permanently.
 stopShowingUploadingNotification.accesskey=N
 stopShowingUploadingNotification.label=Never show this again
-
 replaceButton.label=Replace…
 replaceButton.accesskey=l
 replaceButton.tooltip=Show the Find and Replace dialog
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/messenger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/messenger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/messenger.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/messenger.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -145,6 +145,8 @@
 <!ENTITY messagePaneVertical.accesskey "V">
 <!ENTITY showFolderPaneCmd.label "Folder Pane">
 <!ENTITY showFolderPaneCmd.accesskey "F">
+<!ENTITY showFolderPaneColsCmd.label "Folder Pane Columns">
+<!ENTITY showFolderPaneColsCmd.accesskey "P">
 <!ENTITY showMessageCmd.label "Message Pane">
 <!ENTITY showMessageCmd.accesskey "M">
 
@@ -593,7 +595,9 @@
 <!ENTITY manageTags.accesskey "M">
 
 <!-- Folder Pane -->
-<!ENTITY folderColumn.label "Name">
+<!ENTITY folderNameColumn.label "Name">
+<!ENTITY folderUnreadColumn.label "Unread">
+<!ENTITY folderTotalColumn.label "Total">
 <!ENTITY folderSizeColumn.label "Size">
 
 <!-- Folder Pane Context Menu -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/messenger.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/messenger.properties	2015-02-28 15:02:41.000000000 +0000
@@ -126,9 +126,16 @@
 authKerberos=Kerberos / GSSAPI
 authExternal=TLS Certificate
 authNTLM=NTLM
+authOAuth2=OAuth2
 authAnySecure=Any secure method (deprecated)
 authAny=Any method (insecure)
 
+# OAuth2 window title
+# LOCALIZATION NOTE(oauth2WindowTitle):
+# %1$S is the username (or full email address) used for authentication.
+# %2$S is the hostname of the account being authenticated.
+oauth2WindowTitle=Enter credentials for %1$S on %2$S
+
 # LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
 serverType-nntp=News Server (NNTP)
 # LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
@@ -482,6 +489,22 @@
 megaByteAbbreviation2=%.*f MB
 gigaByteAbbreviation2=%.*f GB
 
+## LOCALIZATION NOTE(folderWithAccount):
+## This is used to show folder name together with an account name.
+## %1$S = folder name
+## %2$S = account name
+folderWithAccount=%1$S - %2$S
+## LOCALIZATION NOTE(folderWithUnreadMsgs):
+## This is a concatenation of two strings to compose a folder label with unread messages.
+## %1$S = folder name
+## %2$S = count of unread messages
+folderWithUnreadMsgs=%1$S (%2$S)
+## LOCALIZATION NOTE(summarizedValue):
+## This string shows an indication that the value shown is actually a summary
+## accumulated from all subfolders.
+## %S = summarized value from all subfolders
+folderSummarizedValue=*%S
+
 # Error message if message for a message id wasn't found
 errorOpenMessageForMessageIdTitle=Error opening message-id
 errorOpenMessageForMessageIdMessage=Message for message-id %S not found
@@ -724,9 +747,6 @@
 update.downloadAndInstallButton.label=Update to %S
 update.downloadAndInstallButton.accesskey=U
 
-websearch.setDefault=Set this search engine as the default
-websearch.isDefault=This search engine is currently the default
-
 outdatedpluginsMessage.title=Some plugins used by this page are out of date.
 outdatedpluginsMessage.updateButton.label=Update Plugins…
 outdatedpluginsMessage.updateButton.accesskey=U
@@ -778,3 +798,15 @@
 ignoredSubthreadsFeedback=Replies to the subthread that was selected will not be shown.;Replies to the #1 subthreads that were selected will not be shown.
 # LOCALIZATION NOTE (saveAsType): replace %S with the extension of the file to be saved.
 saveAsType=%S file
+
+# LOCALIZATION NOTE (openSearch.label): The label used in the autocomplete
+# widget to refer to a search on the web for a short string containing at most
+# 15 characters. %1$S is the search provider to use. %2$S is the string to
+# search for.
+openSearch.label=Search %1$S for "%2$S"
+
+# LOCALIZATION NOTE (openSearch.label.truncated): The label used in the
+# autocomplete widget to refer to a search on the web for a short string
+# containing more than 15 characters. %1$S is the search provider to use. %2$S
+# is the string to search for, truncated to 15 characters.
+openSearch.label.truncated=Search %1$S for "%2$S…"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/advanced.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -14,6 +14,10 @@
 <!ENTITY enableGlodaSearch.accesskey   "E">
 <!ENTITY allowHWAccel.label            "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey        "h">
+<!ENTITY storeType.label               "Message Store Type for new accounts:">
+<!ENTITY storeType.accesskey           "T">
+<!ENTITY mboxStore.label               "One large file (mbox)">
+<!ENTITY maildirStore.label            "File per message (maildir)">
 
 <!ENTITY scrolling.label               "Scrolling">
 <!ENTITY useAutoScroll.label           "Use autoscrolling">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/compose.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/compose.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/compose.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/compose.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -6,6 +6,8 @@
 <!ENTITY itemAutoComplete.label              "Addressing">
 <!ENTITY itemSpellCheck.label                "Spelling">
 
+<!ENTITY dialogCompose.title                 "Composing">
+
 <!ENTITY forwardMsg.label                     "Forward messages:">
 <!ENTITY forwardMsg.accesskey                 "F">
 <!ENTITY inline.label                         "Inline">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/general.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/general.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/general.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/general.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -35,3 +35,5 @@
 <!ENTITY customsound.accesskey            "U">
 <!ENTITY browse.label                     "Browse…">
 <!ENTITY browse.accesskey                 "B">
+
+<!ENTITY defaultSearchEngine.label        "Default Search Engine">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/offline.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/offline.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/offline.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/offline.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -11,8 +11,8 @@
 <!ENTITY radioRememberPrevState.accesskey "R">
 <!ENTITY radioAskState.label "Ask me for online state">
 <!ENTITY radioAskState.accesskey "k">
-<!ENTITY radioAlwaysOnline.label "Online">
-<!ENTITY radioAlwaysOnline.accesskey "l">
+<!ENTITY radioAlwaysOnlineState.label "Online">
+<!ENTITY radioAlwaysOnlineState.accesskey "l">
 <!ENTITY radioAlwaysOffline.label "Offline">
 <!ENTITY radioAlwaysOffline.accesskey "f">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -17,3 +17,7 @@
 <!ENTITY panePrivacy.title        "Privacy">
 <!ENTITY paneSecurity.title       "Security">
 <!ENTITY paneAdvanced.title       "Advanced">
+<!ENTITY paneAccount.title        "Accounts">
+
+<!ENTITY okButton.title           "OK">
+<!ENTITY okButton.accesskey       "O">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/locales/jar.mn	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/locales/jar.mn	2015-02-28 15:02:41.000000000 +0000
@@ -10,6 +10,7 @@
 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://messenger/locale/downloads/settingsChange.dtd
 % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd
   locale/@AB_CD@/messenger/aboutDialog.dtd                              (%chrome/messenger/aboutDialog.dtd)
+  locale/@AB_CD@/messenger/aboutDownloads.dtd                           (%chrome/messenger/aboutDownloads.dtd)
   locale/@AB_CD@/messenger/aboutRights.dtd                              (%chrome/messenger/aboutRights.dtd)
   locale/@AB_CD@/messenger/aboutRights.properties                       (%chrome/messenger/aboutRights.properties)
   locale/@AB_CD@/messenger/aboutSupportMail.dtd                         (%chrome/messenger/aboutSupportMail.dtd)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/test/mozmill/addrbook/test-address-book.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/test/mozmill/addrbook/test-address-book.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/test/mozmill/addrbook/test-address-book.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/test/mozmill/addrbook/test-address-book.js	2015-02-28 15:02:41.000000000 +0000
@@ -62,12 +62,12 @@
   mListD = create_mailing_list("ML D");
   addrBook3.addMailList(mListD);
 
-  // There are 7 address books (Personal, AB 1, AB 2, AB 3, AB 4, LDAP Book
+  // There are 8 address book lists (All, Personal, AB 1, AB 2, AB 3, AB 4, LDAP Book
   // and Collected Address Book.  So let's ensure that those address books
   // exist in the tree view before executing our tests.
   abController.waitFor(
-    function () (abController.window.gDirectoryTreeView.rowCount == 7),
-    "Timeout waiting for all 7 address books to show up in the tree view",
+    function () (abController.window.gDirectoryTreeView.rowCount == 8),
+    "Timeout waiting for all 8 rows in address books list to show up in the tree view",
     1000, 10);
 }
 
@@ -75,14 +75,16 @@
  * address books.
  *
  * Currently, we sort address books as follows:
- * 1. Personal Address Book
- * 2. Mork Address Books
- * 3. LDAP / Other Address Books
- * 4. Collected Address Book
+ * 1. All Address Books
+ * 2. Personal Address Book
+ * 3. Mork Address Books
+ * 4. LDAP / Other Address Books
+ * 5. Collected Address Book
  *
- * With the Personal and Collapsed address books existing
+ * With the All, Personal and Collapsed address books existing
  * automatically, our address books *should* be in this order:
  *
+ * All Address Books
  * Personal Address Book
  * AB 1
  *    ML A
@@ -97,7 +99,8 @@
  **/
 function test_order_of_address_books()
 {
-  const EXPECTED_AB_ORDER = ["Personal Address Book", "AB 1", "AB 2",
+  const EXPECTED_AB_ORDER = ["All Address Books",
+                             "Personal Address Book", "AB 1", "AB 2",
                              "AB 3", "AB 4", "LDAP Book",
                              "Collected Addresses"];
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/test/mozmill/downloads/test-about-downloads.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/test/mozmill/downloads/test-about-downloads.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/test/mozmill/downloads/test-about-downloads.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/test/mozmill/downloads/test-about-downloads.js	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,296 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Test about:downloads.
+ */
+
+var MODULE_NAME = 'test-about-download';
+
+var RELATIVE_ROOT = "../shared-modules";
+var MODULE_REQUIRES = [ 'attachment-helpers',
+                        'content-tab-helpers',
+                        'dom-helpers',
+                        'folder-display-helpers',
+                        'prompt-helpers',
+                        'window-helpers' ];
+
+var mozmill = {}; Components.utils.import('resource://mozmill/modules/mozmill.js', mozmill);
+var elementslib = {}; Components.utils.import('resource://mozmill/modules/elementslib.js', elementslib);
+var downloads = {}; Components.utils.import("resource://gre/modules/Downloads.jsm", downloads);
+
+var ah;
+
+var downloadsTab;
+
+var attachmentFileNames = [
+  "Attachment#1.txt",
+  "Attachment#2.txt",
+  "Attachment#3.txt",
+];
+
+const downloadsView = {
+  init() {
+    this.items = new Map();
+    this.removedItems = [];
+  },
+
+  get count() {
+    return this.items.size;
+  },
+
+  onDownloadAdded(aDownload) {
+    this.items.set(aDownload, aDownload.target.path);
+  },
+
+  onDownloadChanged(aDownload) {
+  },
+
+  onDownloadRemoved(aDownload) {
+    this.removedItems.push(aDownload.target.path);
+    this.items.delete(aDownload);
+  },
+
+  waitForFinish() {
+    for (let download of this.items.keys()) {
+      let succeededPromise = download.whenSucceeded();
+      yield succeededPromise;
+    }
+  }
+};
+
+function prepare_messages() {
+  let folder = create_folder("about:downloads");
+  let msgSet = make_new_sets_in_folder(folder, [
+    {
+      count: 1,
+      attachments: [{
+        filename: attachmentFileNames[0],
+        body: "Body"
+      }]
+    },
+    {
+      count: 1,
+      attachments: [{
+        filename: attachmentFileNames[1],
+        body: "Body"
+      }]
+    },
+    {
+      count: 1,
+      attachments: [{
+        filename: attachmentFileNames[2],
+        body: "Body"
+      }]
+    }
+  ]);
+  be_in_folder(folder);
+}
+
+function prepare_downloads_view() {
+  let success = false;
+  downloads.Downloads.getList(downloads.Downloads.ALL)
+                     .then(list => list.addView(downloadsView))
+                     .then(() => success = true, Cu.reportError);
+  mc.waitFor(() => success, "Timeout waiting for attaching our download view.");
+}
+
+function setupModule(module) {
+  let fdh = collector.getModule("folder-display-helpers");
+  fdh.installInto(module);
+  let wh = collector.getModule('window-helpers');
+  wh.installInto(module);
+  let cth = collector.getModule("content-tab-helpers");
+  cth.installInto(module);
+  let dh = collector.getModule('dom-helpers');
+  dh.installInto(module);
+  ah = collector.getModule('attachment-helpers');
+  ah.installInto(module);
+  ah.gMockFilePickReg.register();
+
+  prepare_messages();
+  prepare_downloads_view();
+}
+
+function setupTest(test) {
+  downloadsView.init();
+}
+
+function open_about_downloads() {
+  let preCount = mc.tabmail.tabContainer.childNodes.length;
+  let newTab = mc.tabmail.openTab("chromeTab", { chromePage: "about:downloads",
+                                                 clickHandler: "specialTabs.aboutClickHandler(event);" });
+  mc.waitFor(() => mc.tabmail.tabContainer.childNodes.length == preCount + 1,
+             "Timeout waiting for about:downloads tab");
+
+  wait_for_browser_load(newTab.browser, "about:downloads");
+  // We append new tabs at the end, so check the last one.
+  let expectedNewTab = mc.tabmail.tabInfo[preCount];
+  return expectedNewTab;
+}
+
+/**
+ * Test that there is no file in the list at first.
+ */
+function test_empty_list() {
+  downloadsTab = open_about_downloads();
+
+  switch_tab(downloadsTab);
+
+  let empty = content_tab_e(downloadsTab, "msgDownloadsListEmptyDescription");
+  assert_false(empty.hidden, "msgDownloadsListEmptyDescription is not visible");
+}
+
+function save_attachment_files() {
+  switch_tab(0);
+
+  let profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+
+  let length = attachmentFileNames.length;
+  for (let i = 0; i < length; i++) {
+    let file = profileDir.clone();
+    file.append(attachmentFileNames[i]);
+    select_click_row(i);
+    gMockFilePicker.returnFiles = [ file ];
+    mc.click(mc.eid("attachmentSaveAllSingle",
+                    {"class": "toolbarbutton-menubutton-button"}));
+  }
+}
+
+/**
+ * Test that all downloaded files are showed up in the list.
+ */
+function test_save_attachment_files_in_list() {
+  save_attachment_files();
+
+  mc.tabmail.switchToTab(downloadsTab);
+  let list = content_tab_e(downloadsTab, "msgDownloadsRichListBox");
+
+  let length = attachmentFileNames.length;
+  mc.waitFor(() => downloadsView.count == length,
+             "Timeout waiting for saving three attachment files.");
+
+  assert_equals(length, list.childNodes.length);
+  assert_equals(downloadsView.count, list.childNodes.length);
+
+  let actualNames = [];
+  let child = list.firstChild;
+  while (child) {
+    actualNames.push(child.getAttribute("displayName"));
+    child = child.nextSibling;
+  }
+  actualNames.sort();
+
+  for (let i = 0; i < length; i++) {
+    assert_equals(attachmentFileNames[i], actualNames[i]);
+  }
+}
+
+/**
+ * Test that 'remove' in context menu removes surely the target file from
+ * the list.
+ */
+function test_remove_file() {
+  test_save_attachment_files_in_list();
+
+  let list = content_tab_e(downloadsTab, "msgDownloadsRichListBox");
+  let firstElement = list.firstChild;
+  let removingFileName = firstElement.getAttribute("displayName");
+
+  // select first element
+  mc.click(new elementslib.Elem(firstElement));
+  mc.rightClick(new elementslib.Elem(firstElement));
+
+  let contextMenu = content_tab_e(downloadsTab, "msgDownloadsContextMenu");
+  wait_for_popup_to_open(contextMenu);
+  mc.click_menus_in_sequence(contextMenu, [
+                               { command: "msgDownloadsCmd_remove" }
+                             ]);
+  mc.waitFor(() => downloadsView.count == 2,
+             "Timeout waiting for removing a saved attachment file.");
+
+  child = list.firstChild;
+  while (child) {
+    assert_not_equals(removingFileName, child.getAttribute("displayName"));
+    child = child.nextSibling;
+  }
+}
+
+/**
+ * Test that removing multiple files surely removes the files.
+ */
+function test_remove_multiple_files() {
+  test_save_attachment_files_in_list();
+
+  let list = content_tab_e(downloadsTab, "msgDownloadsRichListBox");
+  let firstElement = list.firstChild;
+  let secondElement = firstElement.nextSibling;
+  let removingFileNames = [];
+
+  removingFileNames.push(firstElement.getAttribute("displayName"));
+  removingFileNames.push(secondElement.getAttribute("displayName"));
+
+  // select two elements
+  mc.click(new elementslib.Elem(firstElement));
+  list.selectItemRange(firstElement, secondElement);
+  mc.rightClick(new elementslib.Elem(firstElement));
+
+  let contextMenu = content_tab_e(downloadsTab, "msgDownloadsContextMenu");
+  wait_for_popup_to_open(contextMenu);
+  mc.click_menus_in_sequence(contextMenu, [
+                               { command: "msgDownloadsCmd_remove" }
+                             ]);
+  mc.waitFor(() => downloadsView.count == 1,
+             "Timeout waiting for removing two saved attachment files.");
+
+  child = list.firstChild;
+  while (child) {
+    for (let [, name] in Iterator(removingFileNames)) {
+      assert_not_equals(name, child.getAttribute("displayName"));
+    }
+    child = child.nextSibling;
+  }
+}
+
+/**
+ * Test that 'clearDownloads" in context menu purges all files in the list.
+ */
+function test_clear_all_files() {
+  test_save_attachment_files_in_list();
+  downloadsView.waitForFinish();
+
+  mc.click(content_tab_eid(downloadsTab, "msgDownloadsRichListBox"));
+  mc.rightClick(content_tab_eid(downloadsTab, "msgDownloadsRichListBox"));
+
+  let contextMenu = content_tab_e(downloadsTab, "msgDownloadsContextMenu");
+  wait_for_popup_to_open(contextMenu);
+  mc.click_menus_in_sequence(contextMenu, [
+                               { command: "msgDownloadsCmd_clearDownloads" }
+                             ]);
+  mc.waitFor(() => downloadsView.count == 0,
+             "Timeout waiting for clearing all saved attachment files.");
+
+  let empty = content_tab_e(downloadsTab, "msgDownloadsListEmptyDescription");
+  assert_false(empty.hidden, "msgDownloadsListEmptyDescription is not visible");
+}
+
+function teardownTest() {
+  downloads.Downloads.getList(downloads.Downloads.ALL)
+                     .then(function(list) {
+                       for (let download of downloadsView.items.keys()) {
+                         list.remove(download);
+                       }
+                     })
+                     .then(null, Cu.reportError);
+  mc.waitFor(() => downloadsView.count == 0,
+             "Timeout waiting for clearing all saved attachment files.");
+  let empty = content_tab_e(downloadsTab, "msgDownloadsListEmptyDescription");
+  mc.waitFor(() => empty.hidden == false,
+             "Timeout waiting for msgDownloadsListEmptyDescription is visible.");
+}
+
+function teardownModule(module) {
+  close_tab(downloadsTab);
+  ah.gMockFilePickReg.unregister();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/test/mozmill/mozmilltests.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/test/mozmill/mozmilltests.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/test/mozmill/mozmilltests.list	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/test/mozmill/mozmilltests.list	2015-02-28 15:02:42.000000000 +0000
@@ -7,6 +7,7 @@
 content-tabs
 cookies
 crypto
+downloads
 folder-display
 folder-pane
 folder-tree-modes
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/linux/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/linux/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/linux/jar.mn	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/linux/jar.mn	2015-02-28 15:02:42.000000000 +0000
@@ -27,7 +27,6 @@
   skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
-  skin/classic/messenger/webSearch.css                        (mail/webSearch.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
   skin/classic/messenger/messenger.css                        (mail/messenger.css)
 * skin/classic/messenger/messengerLWTheme.css                 (mail/messengerLWTheme.css)
@@ -252,7 +251,6 @@
   skin/classic/messenger/icons/arrow/arrow-down-dim.png       (mail/icons/arrow/arrow-down-dim.png)
   skin/classic/messenger/icons/arrow/foldercycler-arrow-left.png        (mail/icons/arrow/foldercycler-arrow-left.png)
   skin/classic/messenger/icons/arrow/foldercycler-arrow-right.png       (mail/icons/arrow/foldercycler-arrow-right.png)
-  skin/classic/messenger/icons/search-favorite.png            (mail/icons/search-favorite.png)
   skin/classic/messenger/icons/connecting.png                 (mail/icons/connecting.png)
   skin/classic/messenger/icons/loading.png                    (mail/icons/loading.png)
   skin/classic/messenger/tagbg.png                            (mail/tagbg.png)
@@ -281,4 +279,4 @@
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/accountProvisioner.css         (../shared/mail/accountProvisioner.css)
-
+  skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/linux/mail/addrbook/addressbook.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/linux/mail/addrbook/addressbook.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/linux/mail/addrbook/addressbook.css	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/linux/mail/addrbook/addressbook.css	2015-02-28 15:02:42.000000000 +0000
@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/shared/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/linux/mail/icons/search-favorite.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/linux/mail/icons/search-favorite.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/linux/mail/webSearch.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/linux/mail/webSearch.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/linux/mail/webSearch.css	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/linux/mail/webSearch.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +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 {
-  -moz-border-end: 2px solid;
-  -moz-border-left-colors: threeDShadow threeDHighlight;
-  -moz-border-right-colors: threeDShadow threeDHighlight;
-  padding: 2px 0;
-  -moz-box-align: center;
-  background-color: -moz-dialog;
-}
-
-.navbuttons {
-  border-bottom: 1px solid #bbb;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-}
-
-.navbuttons .toolbarbutton-text {
-  display: none;
-}
-
-.back {
-  list-style-image: url("moz-icon://stock/gtk-go-back?size=menu");
-}
-
-.back[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-go-back?size=menu&state=disabled");
-}
-
-.forward {
-  list-style-image: url("moz-icon://stock/gtk-go-forward?size=menu");
-}
-
-.forward[disabled="true"] {
-  list-style-image: url("moz-icon://stock/gtk-go-forward?size=menu&state=disabled");
-}
-
-.engines .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.defaultButton {
-  -moz-appearance: none;
-  list-style-image: url("chrome://messenger/skin/icons/search-favorite.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-width: 0;
-  background: transparent;
-}
-
-.defaultButton[checked="true"] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/osx/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/osx/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/osx/jar.mn	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/osx/jar.mn	2015-02-28 15:02:42.000000000 +0000
@@ -33,7 +33,6 @@
   skin/classic/messenger/messageQuotes.css                       (mail/messageQuotes.css)
   skin/classic/messenger/messageWindow.css                       (mail/messageWindow.css)
   skin/classic/messenger/messageBody.css                         (mail/messageBody.css)
-  skin/classic/messenger/webSearch.css                           (mail/webSearch.css)
   skin/classic/messenger/attachmentList.css                      (mail/attachmentList.css)
   skin/classic/messenger/msgSelectOffline.css                    (mail/msgSelectOffline.css)
   skin/classic/messenger/mailWindow1.css                         (mail/mailWindow1.css)
@@ -324,7 +323,6 @@
   skin/classic/messenger/icons/arrow/arrow-right-dim.png         (mail/icons/arrow/arrow-right-dim.png)
   skin/classic/messenger/icons/arrow/arrow-up-dim.png            (mail/icons/arrow/arrow-up-dim.png)
   skin/classic/messenger/icons/arrow/arrow-down-dim.png          (mail/icons/arrow/arrow-down-dim.png)
-  skin/classic/messenger/icons/search-favorite.png               (mail/icons/search-favorite.png)
   skin/classic/messenger/tagbg.png                               (mail/tagbg.png)
   skin/classic/messenger/icons/download.png                      (mail/icons/download.png)
 % skin editor classic/1.0 %skin/classic/editor/
@@ -351,4 +349,5 @@
   skin/classic/messenger/shared/messenger.css                    (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css                (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                      (../shared/mail/tabmail.css)
+  skin/classic/messenger/shared/addressbook.css                  (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/accountProvisioner.css           (../shared/mail/accountProvisioner.css)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/osx/mail/addrbook/addressbook.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/osx/mail/addrbook/addressbook.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/osx/mail/addrbook/addressbook.css	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/osx/mail/addrbook/addressbook.css	2015-02-28 15:02:42.000000000 +0000
@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/shared/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/osx/mail/icons/search-favorite.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/osx/mail/icons/search-favorite.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/osx/mail/webSearch.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/osx/mail/webSearch.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/osx/mail/webSearch.css	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/osx/mail/webSearch.css	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/. */
-
-.navbar {
-  -moz-border-end: 2px solid;
-  -moz-border-left-colors: threeDShadow threeDHighlight;
-  -moz-border-right-colors: threeDShadow threeDHighlight;
-  padding: 2px 0;
-  -moz-box-align: center;
-  background-color: -moz-dialog;
-}
-
-.navbuttons {
-  border-bottom: 1px solid #bbb;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-}
-
-.navbuttons .toolbarbutton-text {
-  display: none;
-}
-
-.back {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 306px 18px 288px);
-}
-
-.back:hover:active {
-  -moz-image-region: rect(18px 306px 36px 288px);
-}
-
-@media (min-resolution: 2dppx) {
-  .back {
-    width: 18px;
-    height: 18px;
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 612px 36px 576px);
-  }
-
-  .back:hover:active {
-    -moz-image-region: rect(36px 612px 72px 576px);
-  }
-}
-
-.back[disabled] {
-  opacity: .5;
-}
-
-.forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 324px 18px 306px);
-}
-
-.forward:hover:active {
-  -moz-image-region: rect(18px 324px 36px 306px);
-}
-
-@media (min-resolution: 2dppx) {
-  .forward {
-    width: 18px;
-    height: 18px;
-    list-style-image: url("chrome://messenger/skin/icons/mail-toolbar@2x.png");
-    -moz-image-region: rect(0px 648px 36px 612px);
-  }
-
-  .forward:hover:active {
-    -moz-image-region: rect(36px 648px 72px 612px);
-  }
-}
-
-.forward[disabled="true"] {
-  opacity: .5;
-}
-
-.engines .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.defaultButton {
-  -moz-appearance: none;
-  list-style-image: url("chrome://messenger/skin/icons/search-favorite.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-width: 0;
-  background: transparent;
-}
-
-.defaultButton[checked="true"] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/shared/mail/addressbook.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/shared/mail/addressbook.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/shared/mail/addressbook.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/shared/mail/addressbook.css	2015-02-28 15:02:42.000000000 +0000
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ *  * License, v. 2.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");
+
+#blankResultsPaneMessage {
+  font-style: italic;
+}
+
+#localResultsOnlyMessage {
+  font-style: italic;
+  text-align: center;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/jar.mn	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/jar.mn	2015-02-28 15:02:42.000000000 +0000
@@ -61,7 +61,6 @@
   skin/classic/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/messenger/messageHeader.css                    (mail/messageHeader.css)
   skin/classic/messenger/messageBody.css                      (mail/messageBody.css)
-  skin/classic/messenger/webSearch.css                        (mail/webSearch.css)
   skin/classic/messenger/messageQuotes.css                    (mail/messageQuotes.css)
 * skin/classic/messenger/messenger.css                        (mail/messenger.css)
 * skin/classic/messenger/messengerLWTheme.css                 (mail/messengerLWTheme.css)
@@ -272,7 +271,6 @@
   skin/classic/messenger/icons/empty-search-results.png       (mail/icons/empty-search-results.png)
   skin/classic/messenger/icons/arrow/foldercycler-arrow-left.png        (mail/icons/arrow/foldercycler-arrow-left.png)
   skin/classic/messenger/icons/arrow/foldercycler-arrow-right.png       (mail/icons/arrow/foldercycler-arrow-right.png)
-  skin/classic/messenger/icons/search-favorite.png            (mail/icons/search-favorite.png)
   skin/classic/messenger/icons/xp-pin-grey.png                (mail/icons/xp-pin-grey.png)
   skin/classic/messenger/icons/xp-pin-red.png                 (mail/icons/xp-pin-red.png)
   skin/classic/messenger/tagbg.png                            (mail/tagbg.png)
@@ -297,6 +295,7 @@
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
+  skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
 #ifdef XP_WIN
 % skin communicator classic/1.0 %skin/classic/aero/communicator/ os=WINNT osversion>=6
@@ -341,7 +340,6 @@
   skin/classic/aero/messenger/section_expanded.png                 (mail/section_expanded.png)
   skin/classic/aero/messenger/messageHeader.css                    (mail/messageHeader-aero.css)
   skin/classic/aero/messenger/messageBody.css                      (mail/messageBody.css)
-  skin/classic/aero/messenger/webSearch.css                        (mail/webSearch-aero.css)
   skin/classic/aero/messenger/messageQuotes.css                    (mail/messageQuotes.css)
 * skin/classic/aero/messenger/messenger.css                        (mail/messenger-aero.css)
 * skin/classic/aero/messenger/messengerLWTheme.css                 (mail/messengerLWTheme.css)
@@ -551,7 +549,6 @@
   skin/classic/aero/messenger/icons/arrow/arrow-down-dim.png       (mail/icons/arrow/arrow-down-dim.png)
   skin/classic/aero/messenger/icons/arrow/foldercycler-arrow-left.png        (mail/icons/arrow/foldercycler-arrow-left.png)
   skin/classic/aero/messenger/icons/arrow/foldercycler-arrow-right.png       (mail/icons/arrow/foldercycler-arrow-right.png)
-  skin/classic/aero/messenger/icons/search-favorite.png            (mail/icons/search-favorite.png)
   skin/classic/aero/messenger/icons/xp-pin-grey.png                (mail/icons/xp-pin-grey.png)
   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)
@@ -583,5 +580,6 @@
   skin/classic/aero/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/aero/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/aero/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
+  skin/classic/aero/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/aero/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/addrbook/addressbook-aero.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/addrbook/addressbook-aero.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/addrbook/addressbook-aero.css	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/addrbook/addressbook-aero.css	2015-02-28 15:02:42.000000000 +0000
@@ -7,6 +7,7 @@
    ====================================================================== */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/shared/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/addrbook/addressbook.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/addrbook/addressbook.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/addrbook/addressbook.css	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/addrbook/addressbook.css	2015-02-28 15:02:42.000000000 +0000
@@ -7,6 +7,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/shared/addressbook.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/icons/search-favorite.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/icons/search-favorite.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/webSearch-aero.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/webSearch-aero.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/webSearch-aero.css	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/webSearch-aero.css	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/. */
-
-.navbar {
-  -moz-border-end: 2px solid;
-  -moz-border-left-colors: threeDShadow threeDHighlight;
-  -moz-border-right-colors: threeDShadow threeDHighlight;
-  padding: 2px 0;
-  -moz-box-align: center;
-  background-color: -moz-dialog;
-}
-
-.navbuttons {
-  border-bottom: 1px solid #bbb;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-}
-
-.navbuttons .toolbarbutton-text {
-  display: none;
-}
-
-.back {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px, 306px, 18px, 288px);
-}
-
-.forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px, 324px, 18px, 306px);
-}
-
-.engines .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.defaultButton {
-  -moz-appearance: none;
-  list-style-image: url("chrome://messenger/skin/icons/search-favorite.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-width: 0;
-  background: transparent;
-}
-
-.defaultButton[checked="true"] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/webSearch.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/webSearch.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mail/themes/windows/mail/webSearch.css	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mail/themes/windows/mail/webSearch.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +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 {
-  -moz-border-end: 2px solid;
-  -moz-border-left-colors: threeDShadow threeDHighlight;
-  -moz-border-right-colors: threeDShadow threeDHighlight;
-  padding: 2px 0;
-  -moz-box-align: center;
-  background-color: -moz-dialog;
-}
-
-.navbuttons {
-  border-bottom: 1px solid #bbb;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-}
-
-.navbuttons .toolbarbutton-text {
-  display: none;
-}
-
-.back {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 272px 16px 256px);
-}
-
-.back:hover {
-  -moz-image-region: rect(16px 272px 32px 256px);
-}
-
-.back[disabled="true"] {
-  -moz-image-region: rect(32px 272px 48px 256px) !important;
-}
-
-.forward {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 288px 16px 272px);
-}
-
-.forward:hover {
-  -moz-image-region: rect(16px 288px 32px 272px);
-}
-
-.forward[disabled="true"] {
-  -moz-image-region: rect(32px 288px 48px 272px) !important;
-}
-
-.engines .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.defaultButton {
-  -moz-appearance: none;
-  list-style-image: url("chrome://messenger/skin/icons/search-favorite.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-
-  border: none;
-  padding: 0;
-  margin: 0;
-  min-width: 0;
-  background: transparent;
-}
-
-.defaultButton[checked="true"] {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/content/abAddressBookNameDialog.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/content/abAddressBookNameDialog.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/content/abAddressBookNameDialog.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/content/abAddressBookNameDialog.js	2015-02-28 15:02:40.000000000 +0000
@@ -10,6 +10,7 @@
 
 const kPersonalAddressbookURI = "moz-abmdbdirectory://abook.mab";
 const kCollectedAddressbookURI = "moz-abmdbdirectory://history.mab";
+const kAllDirectoryRoot = "moz-abdirectory://";
 const kPABDirectory = 2; // defined in nsDirPrefs.h
 
 function abNameOnLoad()
@@ -34,7 +35,8 @@
 
   if (gDirectory &&
      (gDirectory.URI == kCollectedAddressbookURI ||
-       gDirectory.URI == kPersonalAddressbookURI)) {
+       gDirectory.URI == kPersonalAddressbookURI ||
+       gDirectory.URI == kAllDirectoryRoot + "?")) {
     // Address book name is not editable, therefore disable the field and
     // only have an ok button that doesn't do anything.
     gNameInput.readOnly = true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/content/abDragDrop.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/content/abDragDrop.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/content/abDragDrop.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/content/abDragDrop.js	2015-02-28 15:02:40.000000000 +0000
@@ -99,6 +99,10 @@
 
     var srcURI = GetSelectedDirectory();
 
+    // We cannot allow copy/move to "All Address Books".
+    if (targetURI == kAllDirectoryRoot + "?")
+      return false;
+
     // The same place case
     if (targetURI == srcURI)
       return false;
@@ -269,7 +273,22 @@
             directory.addMailList(GetDirectoryFromURI(card.mailListURI));
           }
         } else {
+          let srcDirectory = null;
+          if (srcURI == (kAllDirectoryRoot + "?") && actionIsMoving) {
+            let dirId = card.directoryId.substring(0, card.directoryId.indexOf("&"));
+            srcDirectory = MailServices.ab.getDirectoryFromId(dirId);
+          }
+
           directory.dropCard(card, needToCopyCard);
+
+          // This is true only if srcURI is "All ABs" and action is moving.
+          if (srcDirectory) {
+            let cardArray =
+              Components.classes["@mozilla.org/array;1"]
+                        .createInstance(Components.interfaces.nsIMutableArray);
+            cardArray.appendElement(card, false);
+            srcDirectory.deleteCards(cardArray);
+          }
         }
       }
 
@@ -277,10 +296,12 @@
 
       // If we are moving, but not moving to a directory, then delete the
       // selected cards and display the appropriate text
-      if (actionIsMoving) {
+      if (actionIsMoving && srcURI != (kAllDirectoryRoot + "?")) {
         // If we have moved the cards, then delete them as well.
         gAbView.deleteSelectedCards();
+      }
 
+      if (actionIsMoving) {
         cardsTransferredText = PluralForm.get(numrows,
           gAddressBookBundle.getFormattedString("contactsMoved", [numrows]));
       } else {
@@ -288,6 +309,10 @@
           gAddressBookBundle.getFormattedString("contactsCopied", [numrows]));
       }
 
+      if (srcURI == kAllDirectoryRoot + "?") {
+        SetAbView(srcURI);
+      }
+
       document.getElementById("statusText").label = cardsTransferredText;
     }
   },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/content/abResultsPane.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/content/abResultsPane.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/content/abResultsPane.js	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/content/abResultsPane.js	2015-02-28 15:02:40.000000000 +0000
@@ -80,6 +80,27 @@
     gAbView.QueryInterface(Components.interfaces.nsITreeView);
 
   UpdateSortIndicators(actualSortColumn, sortDirection);
+
+  // If the selected address book is LDAP and the search box is empty,
+  // inform the user of the empty results pane.
+  if (aURI.indexOf("moz-abldapdirectory") != -1 &&
+      aURI.indexOf("?") == -1) {
+    let element = null;
+    if (element = document.getElementById("abResultsTree"))
+      element.setAttribute("hidden", "true");
+    if (element = document.getElementById("CardViewOuterBox"))
+      element.setAttribute("hidden", "true");
+    if (element = document.getElementById("blankResultsPaneMessageBox"))
+      element.setAttribute("hidden", "false");
+  } else {
+    let element = null;
+    if (element = document.getElementById("abResultsTree"))
+      element.removeAttribute("hidden");
+    if (element = document.getElementById("CardViewOuterBox"))
+      element.removeAttribute("hidden");
+    if (element = document.getElementById("blankResultsPaneMessageBox"))
+      element.setAttribute("hidden", "true");
+  }
 }
 
 function CloseAbView()
@@ -398,7 +419,7 @@
         return (GetNumSelectedCards() == 1);
       case "cmd_newlist":
         var selectedDir = GetSelectedDirectory();
-        if (selectedDir) {
+        if (selectedDir && (selectedDir != kAllDirectoryRoot + "?")) {
           var abDir = GetDirectoryFromURI(selectedDir);
           if (abDir) {
             return abDir.supportsMailingLists;
@@ -440,6 +461,6 @@
 
 function SelectFirstCard()
 {
-  if (gAbView && gAbView.selection)
+  if (gAbView && gAbView.selection && (gAbView.selection.count > 0))
     gAbView.selection.select(0);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/public/nsIAbManager.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/public/nsIAbManager.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/public/nsIAbManager.idl	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/public/nsIAbManager.idl	2015-02-28 15:02:41.000000000 +0000
@@ -21,7 +21,7 @@
  * It contains the main functions to create and delete address books as well
  * as some helper functions.
  */
-[scriptable, uuid(c3b33078-0b9c-4b56-83ed-3c5e84de82c8)]
+[scriptable, uuid(4271daa0-de0b-48ed-9c2b-934dc895383d)]
 interface nsIAbManager : nsISupports 
 {
   /**
@@ -39,6 +39,14 @@
   nsIAbDirectory getDirectory(in ACString aURI);
 
   /**
+   * Returns the directory that has the supplied dirPrefId.
+   *
+   * @param aDirPrefId  The dirPrefId of the directory.
+   * @return            The found AB directory.
+   */
+  nsIAbDirectory getDirectoryFromId(in ACString aDirPrefId);
+
+  /**
    * Creates a new address book.
    *
    * @param  aDirName   The description of the address book.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/src/nsAbManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/src/nsAbManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/src/nsAbManager.cpp	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/src/nsAbManager.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -222,6 +222,38 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP nsAbManager::GetDirectoryFromId(const nsACString &aDirPrefId,
+                                              nsIAbDirectory **aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  nsCOMPtr<nsISimpleEnumerator> enumerator;
+  nsresult rv = GetDirectories(getter_AddRefs(enumerator));
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsISupports> support;
+  nsCOMPtr<nsIAbDirectory> directory;
+
+  bool hasMore = false;
+  while (NS_SUCCEEDED(enumerator->HasMoreElements(&hasMore)) && hasMore) {
+    rv = enumerator->GetNext(getter_AddRefs(support));
+    NS_ENSURE_SUCCESS(rv, rv);
+    directory = do_QueryInterface(support, &rv);
+    if (NS_FAILED(rv)) {
+      NS_WARNING("Unable to select Address book nsAbManager::GetDirectoryFromId()");
+      continue;
+    }
+
+    nsCString dirPrefId;
+    directory->GetDirPrefId(dirPrefId);
+    if (dirPrefId.Equals(aDirPrefId)) {
+      *aResult = directory;
+      return NS_OK;
+    }
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsAbManager::GetDirectory(const nsACString &aURI,
                                         nsIAbDirectory **aResult)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/src/nsAbView.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/src/nsAbView.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/src/nsAbView.cpp	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/src/nsAbView.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -45,6 +45,7 @@
 NS_IMPL_ISUPPORTS(nsAbView, nsIAbView, nsITreeView, nsIAbListener, nsIObserver)
 
 nsAbView::nsAbView() : mInitialized(false),
+                       mIsAllDirectoryRootView(false),
                        mSuppressSelectionChange(false),
                        mSuppressCountChange(false),
                        mGeneratedNameFormat(0)
@@ -189,10 +190,57 @@
   mSortColumn.AssignLiteral("");
   mSortDirection.AssignLiteral("");
 
-  mDirectory = aAddressBook;
+  nsCString uri;
+  aAddressBook->GetURI(uri);
+  int32_t searchBegin = uri.FindChar('?');
+  nsCString searchQuery(Substring(uri, searchBegin));
+  // This is a special case, a workaround basically, to just have all ABs.
+  if (searchQuery.EqualsLiteral("?")) {
+    searchQuery.AssignLiteral("");
+  }
+
+  if (Substring(uri, 0, searchBegin).EqualsLiteral(kAllDirectoryRoot)) {
+    mIsAllDirectoryRootView = true;
+    // We have special request case to search all addressbooks, so we need
+    // to iterate over all addressbooks.
+    // Since the request is for all addressbooks, the URI must have been
+    // passed with an extra '?'. We still check it for sanity and trim it here.
+    if (searchQuery.Find("??") != kNotFound)
+      searchQuery = Substring(searchQuery, 1);
 
-  rv = EnumerateCards();
-  NS_ENSURE_SUCCESS(rv, rv);
+    nsCOMPtr<nsIAbManager> abManager(do_GetService(NS_ABMANAGER_CONTRACTID,
+                                                   &rv));
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsCOMPtr<nsISimpleEnumerator> enumerator;
+    rv = abManager->GetDirectories(getter_AddRefs(enumerator));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    bool hasMore = false;
+    nsCOMPtr<nsISupports> support;
+    nsCOMPtr<nsIAbDirectory> directory;
+    while (NS_SUCCEEDED(enumerator->HasMoreElements(&hasMore)) && hasMore) {
+      rv = enumerator->GetNext(getter_AddRefs(support));
+      NS_ENSURE_SUCCESS(rv, rv);
+      directory = do_QueryInterface(support, &rv);
+
+      // If, for some reason, we are unable to get a directory, we continue.
+      if (NS_FAILED(rv))
+        continue;
+
+      // Get appropriate directory with search query.
+      nsCString uri;
+      directory->GetURI(uri);
+      rv = abManager->GetDirectory(uri + searchQuery, getter_AddRefs(directory));
+      mDirectory = directory;
+      rv = EnumerateCards();
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  } else {
+    mIsAllDirectoryRootView = false;
+    mDirectory = aAddressBook;
+    rv = EnumerateCards();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   NS_NAMED_LITERAL_STRING(generatedNameColumnId, GENERATED_NAME_COLUMN_ID);
 
@@ -409,6 +457,15 @@
 nsresult nsAbView::GetCardValue(nsIAbCard *card, const char16_t *colID,
                                 nsAString &_retval)
 {
+  if (nsString(colID).EqualsLiteral("addrbook")) {
+    nsCString dirID;
+    nsresult rv = card->GetDirectoryId(dirID);
+    if (NS_SUCCEEDED(rv))
+      CopyUTF8toUTF16(Substring(dirID, dirID.FindChar('&') + 1), _retval);
+
+    return rv;
+  }
+
   // "G" == "GeneratedName", "_P" == "_PhoneticName"
   // else, standard column (like PrimaryEmail and _AimScreenName)
   if (colID[0] == char16_t('G'))
@@ -762,13 +819,28 @@
   return rv;
 }
 
+// A helper method currently returns true if the directory is an LDAP.
+// We can tweak this to return true for all Remote Address Books where the
+// search is asynchronous.
+bool isDirectoryRemote(nsCOMPtr<nsIAbDirectory> aDir)
+{
+  nsCString uri;
+  aDir->GetURI(uri);
+  return (uri.Find("moz-abldapdirectory") != kNotFound);
+}
+
 NS_IMETHODIMP nsAbView::OnItemAdded(nsISupports *parentDir, nsISupports *item)
 {
   nsresult rv;
-  nsCOMPtr <nsIAbDirectory> directory = do_QueryInterface(parentDir,&rv);
+  nsCOMPtr <nsIAbDirectory> directory = do_QueryInterface(parentDir, &rv);
   NS_ENSURE_SUCCESS(rv,rv);
 
-  if (directory.get() == mDirectory.get()) {
+  bool isRemote = isDirectoryRemote(directory);
+  // If the search is performed on All Address books, its possible that the LDAP
+  // results start coming when mDirectory has changed (LDAP search works in an
+  // asynchronous manner).
+  if ((mIsAllDirectoryRootView && isRemote) ||
+      directory.get() == mDirectory.get()) {
     nsCOMPtr <nsIAbCard> addedCard = do_QueryInterface(item);
     if (addedCard) {
       // Malloc these from an arena
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/src/nsAbView.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/src/nsAbView.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/addrbook/src/nsAbView.h	2015-02-19 00:41:43.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/addrbook/src/nsAbView.h	2015-02-28 15:02:41.000000000 +0000
@@ -74,6 +74,7 @@
   nsCOMPtr<nsIStringBundle> mABBundle;
 
   bool mInitialized;
+  bool mIsAllDirectoryRootView;
   bool mSuppressSelectionChange;
   bool mSuppressCountChange;
   int32_t mGeneratedNameFormat;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/accountcreation/emailWizard.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/accountcreation/emailWizard.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/accountcreation/emailWizard.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/accountcreation/emailWizard.js	2015-02-28 15:02:41.000000000 +0000
@@ -1259,6 +1259,11 @@
   onOpenOutgoingDropdown : function()
   {
     var menulist = e("outgoing_hostname");
+    // If the menulist is not editable, there is nothing to update
+    // and menulist.inputField does not even exist.
+    if (!menulist.editable)
+      return;
+
     var menuitem = menulist.getItemAtIndex(0);
     assert(!menuitem.serverKey, "I wanted the special item for the new host");
     menuitem.label = menulist.inputField.value;
@@ -1651,6 +1656,11 @@
    */
   _acknowledged : null,
 
+  _inSecurityBad:  0x0001,
+  _inCertBad:      0x0010,
+  _outSecurityBad: 0x0100,
+  _outCertBad:     0x1000,
+
   /**
    * Checks whether we need to warn about this config.
    *
@@ -1678,24 +1688,30 @@
     assert(configSchema.isComplete());
     assert(configFilledIn.isComplete());
 
-    var incomingOK = configFilledIn.incoming.socketType > 1 &&
-        !configFilledIn.incoming.badCert;
-    var outgoingOK = configFilledIn.outgoing.socketType > 1 &&
-        !configFilledIn.outgoing.badCert;
+    var incomingBad = ((configFilledIn.incoming.socketType > 1) ? 0 : this._inSecurityBad) |
+                      ((configFilledIn.incoming.badCert) ? this._inCertBad : 0);
+    var outgoingBad = 0;
+    if (!configFilledIn.outgoing.existingServerKey) {
+      outgoingBad = ((configFilledIn.outgoing.socketType > 1) ? 0 : this._outSecurityBad) |
+                    ((configFilledIn.outgoing.badCert) ? this._outCertBad : 0);
+    }
 
-    if (!incomingOK) {
-      incomingOK = this._acknowledged.some(
+    if (incomingBad > 0) {
+      if (this._acknowledged.some(
           function(ackServer) {
             return serverMatches(ackServer, configFilledIn.incoming);
-          });
+          }))
+        incomingBad = 0;
     }
-    if (!outgoingOK) {
-      outgoingOK = this._acknowledged.some(
+    if (outgoingBad > 0) {
+      if (this._acknowledged.some(
           function(ackServer) {
             return serverMatches(ackServer, configFilledIn.outgoing);
-          });
+          }))
+        outgoingBad = 0;
     }
-    return !incomingOK || !outgoingOK;
+
+    return incomingBad | outgoingBad;
   },
 
   /**
@@ -1724,11 +1740,12 @@
     assert(typeof(cancelCallback) == "function");
     // needed() also checks the parameters
     var needed = this.needed(configSchema, configFilledIn);
-    if (!needed && onlyIfNeeded) {
+    if ((needed == 0) && onlyIfNeeded) {
       okCallback();
       return;
     }
-    assert(needed, "security dialog opened needlessly");
+
+    assert(needed > 0 , "security dialog opened needlessly");
     this._currentConfigFilledIn = configFilledIn;
     this._okCallback = okCallback;
     this._cancelCallback = cancelCallback;
@@ -1745,42 +1762,41 @@
     e("outgoing_technical").removeAttribute("expanded");
     e("outgoing_details").setAttribute("collapsed", true);
 
-    if (incoming.socketType == 1) {
+    if (needed & this._inSecurityBad) {
       setText("warning_incoming", gStringsBundle.getFormattedString(
           "cleartext_warning", [incoming.hostname]));
       setText("incoming_details", gStringsBundle.getString(
           "cleartext_details"));
       _show("incoming_box");
-      _show("acknowledge_warning");
-    } else if (incoming.badCert) {
+    } else if (needed & this._inCertBad) {
       setText("warning_incoming", gStringsBundle.getFormattedString(
           "selfsigned_warning", [incoming.hostname]));
       setText("incoming_details", gStringsBundle.getString(
           "selfsigned_details"));
       _show("incoming_box");
-      _show("acknowledge_warning");
     } else {
       _hide("incoming_box");
-      _hide("acknowledge_warning");
     }
 
-    if (outgoing.socketType == 1) {
+    if (needed & this._outSecurityBad) {
       setText("warning_outgoing", gStringsBundle.getFormattedString(
           "cleartext_warning", [outgoing.hostname]));
       setText("outgoing_details", gStringsBundle.getString(
           "cleartext_details"));
       _show("outgoing_box");
-      _show("acknowledge_warning");
-    } else if (outgoing.badCert) {
+    } else if (needed & this._outCertBad) {
       setText("warning_outgoing", gStringsBundle.getFormattedString(
           "selfsigned_warning", [outgoing.hostname]));
       setText("outgoing_details", gStringsBundle.getString(
           "selfsigned_details"));
       _show("outgoing_box");
-      _show("acknowledge_warning");
     } else {
       _hide("outgoing_box");
     }
+    _show("acknowledge_warning");
+    assert(!e("incoming_box").hidden || !e("outgoing_box").hidden,
+           "warning dialog shown for unknown reason");
+
     window.sizeToContent();
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-server.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-server.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-server.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-server.js	2015-02-28 15:02:41.000000000 +0000
@@ -9,6 +9,15 @@
 
 var gServer;
 
+function onSave()
+{
+  let storeContractID = document.getElementById("server.storeTypeMenulist")
+                                .selectedItem
+                                .value;
+  document.getElementById("server.storeContractID")
+          .setAttribute("value", storeContractID);
+}
+
 function onInit(aPageId, aServerId)
 {
   initServerType();
@@ -24,6 +33,17 @@
   // allow users to choose it anymore. Hide the option unless the user already
   // has it set.
   hideUnlessSelected(document.getElementById("connectionSecurityType-1"));
+
+  // UI for account store type.
+  let storeTypeElement = document.getElementById("server.storeTypeMenulist");
+  // set the menuitem to match the account
+  let currentStoreID = document.getElementById("server.storeContractID")
+                               .getAttribute("value");
+  let targetItem = storeTypeElement.getElementsByAttribute("value", currentStoreID);
+  storeTypeElement.selectedItem = targetItem[0];
+  // disable store type change if store has already been used
+  storeTypeElement.setAttribute("disabled",
+    gServer.getBoolValue("canChangeStoreType") ? "false" : "true");
 }
 
 function onPreInit(account, accountValues)
@@ -58,6 +78,7 @@
   setLabelFromStringBundle("authMethod-kerberos", "authKerberos");
   setLabelFromStringBundle("authMethod-external", "authExternal");
   setLabelFromStringBundle("authMethod-ntlm", "authNTLM");
+  setLabelFromStringBundle("authMethod-oauth2", "authOAuth2");
   setLabelFromStringBundle("authMethod-anysecure", "authAnySecure");
   setLabelFromStringBundle("authMethod-any", "authAny");
   setLabelFromStringBundle("authMethod-password-encrypted",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-serverwithnoidentities.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-serverwithnoidentities.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-serverwithnoidentities.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-serverwithnoidentities.js	2015-02-28 15:02:41.000000000 +0000
@@ -3,8 +3,32 @@
  * License, v. 2.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 gServer;
+
 function onInit(aPageId, aServerId) {
+
+  // UI for account store type
+  let storeTypeElement = document.getElementById("server.storeTypeMenulist");
+  // set the menuitem to match the account
+  let currentStoreID = document.getElementById("server.storeContractID")
+                               .getAttribute("value");
+  let targetItem = storeTypeElement.getElementsByAttribute("value", currentStoreID);
+  storeTypeElement.selectedItem = targetItem[0];
+  // disable store type change if store has already been used
+  storeTypeElement.setAttribute("disabled",
+    gServer.getBoolValue("canChangeStoreType") ? "false" : "true");
 }
 
 function onPreInit(account, accountValues) {
+  gServer = account.incomingServer;
 }
+
+function onSave()
+{
+  let storeContractID = document.getElementById("server.storeTypeMenulist")
+                                .selectedItem
+                                .value;
+  document.getElementById("server.storeContractID")
+          .setAttribute("value", storeContractID);
+}
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-serverwithnoidentities.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-serverwithnoidentities.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-serverwithnoidentities.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-serverwithnoidentities.xul	2015-02-28 15:02:41.000000000 +0000
@@ -20,6 +20,14 @@
 
   <dialogheader title="&accountTitle.label;"/>
 
+  <label hidden="true"
+         wsm_persist="true"
+         preftype="string"
+         prefattribute="value"
+         prefstring="mail.server.%serverkey%.storeContractID"
+         genericattr="true"
+         id="server.storeContractID"/>
+
   <description class="secDesc">&accountSettingsDesc.label;</description>
   <hbox align="center">
     <label value="&accountName.label;" control="server.prettyName"
@@ -39,6 +47,21 @@
                 accesskey="&emptyTrashOnExit.accesskey;"
                 prefattribute="value"
                 prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
+      <hbox align="center">
+        <label value="&storeType.label;"
+               accesskey="&storeType.accesskey;"
+               control="server.storeTypeMenulist"/>
+        <menulist id="server.storeTypeMenulist">
+          <menupopup id="server.storeTypeMenupopup">
+            <menuitem id="server.mboxStore"
+                      value="@mozilla.org/msgstore/berkeleystore;1"
+                      label="&mboxStore.label;"/>
+            <menuitem id="server.maildirStore"
+                      value="@mozilla.org/msgstore/maildirstore;1"
+                      label="&maildirStore.label;"/>
+          </menupopup>
+        </menulist>
+      </hbox>
     </vbox>
 
     <separator class="thin"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-server.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-server.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-server.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-server.xul	2015-02-28 15:02:41.000000000 +0000
@@ -28,6 +28,13 @@
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
     <label hidden="true" wsm_persist="true" id="server.type"/>
+    <label hidden="true"
+           wsm_persist="true"
+           preftype="string"
+           prefattribute="value"
+           prefstring="mail.server.%serverkey%.storeContractID"
+           genericattr="true"
+           id="server.storeContractID"/>
 
     <dialogheader title="&serverSettings.label;"/>
 
@@ -132,6 +139,7 @@
                 <menuitem id="authMethod-kerberos" value="5"/>
                 <menuitem id="authMethod-ntlm" value="6"/>
                 <menuitem id="authMethod-external" value="7"/>
+                <menuitem id="authMethod-oauth2" value="10"/>
                 <menuitem id="authMethod-anysecure" value="8"/>
                 <menuitem id="authMethod-any" value="9"/>
               </menupopup>
@@ -373,6 +381,21 @@
                 prefstring="mail.server.%serverkey%.advanced.disable"
                 hidefor="imap,nntp,movemail"/>
       </hbox>
+      <hbox align="center">
+        <label value="&storeType.label;"
+               accesskey="&storeType.accesskey;"
+               control="server.storeTypeMenulist"/>
+        <menulist id="server.storeTypeMenulist">
+          <menupopup id="server.storeTypeMenupopup">
+            <menuitem id="server.mboxStore"
+                      value="@mozilla.org/msgstore/berkeleystore;1"
+                      label="&mboxStore.label;"/>
+            <menuitem id="server.maildirStore"
+                      value="@mozilla.org/msgstore/maildirstore;1"
+                      label="&maildirStore.label;"/>
+          </menupopup>
+        </menulist>
+      </hbox>
 
       <vbox hidefor="imap,pop3,movemail">
         <label value="&newsrcFilePath.label;" control="nntp.newsrcFilePath"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-smtp.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-smtp.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/am-smtp.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/am-smtp.js	2015-02-28 15:02:41.000000000 +0000
@@ -140,6 +140,9 @@
                   ? "authPasswordCleartextViaSSL"
                   : "authPasswordCleartextInsecurely";
         break;
+      case AuthMethod.OAuth2:
+        authStr = "authOAuth2";
+        break;
       default:
         // leave empty
         Components.utils.reportError("Warning: unknown value for smtpserver... authMethod: " +
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/smtpEditOverlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/smtpEditOverlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/smtpEditOverlay.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/smtpEditOverlay.js	2015-02-28 15:02:41.000000000 +0000
@@ -53,6 +53,7 @@
         "authPasswordCleartextInsecurely");
     setLabelFromStringBundle("authMethod-kerberos", "authKerberos");
     setLabelFromStringBundle("authMethod-ntlm", "authNTLM");
+    setLabelFromStringBundle("authMethod-oauth2", "authOAuth2");
     setLabelFromStringBundle("authMethod-anysecure", "authAnySecure");
     setLabelFromStringBundle("authMethod-any", "authAny");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/smtpEditOverlay.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/smtpEditOverlay.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/prefs/content/smtpEditOverlay.xul	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/prefs/content/smtpEditOverlay.xul	2015-02-28 15:02:41.000000000 +0000
@@ -103,6 +103,7 @@
                 <menuitem id="authMethod-password-encrypted" value="4"/>
                 <menuitem id="authMethod-kerberos" value="5"/>
                 <menuitem id="authMethod-ntlm" value="6"/>
+                <menuitem id="authMethod-oauth2" value="10"/>
                 <menuitem id="authMethod-anysecure" value="8"/>
                 <menuitem id="authMethod-any" value="9"/>
               </menupopup>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/MailNewsTypes2.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/MailNewsTypes2.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/MailNewsTypes2.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/MailNewsTypes2.idl	2015-02-28 15:02:41.000000000 +0000
@@ -80,6 +80,9 @@
     /// Let us pick any of the auth types supported by the server.
     /// Discouraged, because vulnerable to MITM attacks, even if server offers secure auth.
     const nsMsgAuthMethodValue anything = 9;
+
+    /// Use OAuth2 to authenticate.
+    const nsMsgAuthMethodValue OAuth2 = 10;
 };
 
 typedef unsigned long nsMsgLabelValue;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/moz.build	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/moz.build	2015-02-28 15:02:41.000000000 +0000
@@ -7,6 +7,7 @@
     'MailNewsTypes2.idl',
     'mozINewMailListener.idl',
     'mozINewMailNotificationService.idl',
+    'msgIOAuth2Module.idl',
     'nsICopyMessageListener.idl',
     'nsICopyMsgStreamListener.idl',
     'nsIFolderListener.idl',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/msgIOAuth2Module.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/msgIOAuth2Module.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/msgIOAuth2Module.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/msgIOAuth2Module.idl	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,59 @@
+/* -*- Mode: IDL; 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"
+
+interface nsIMsgIncomingServer;
+interface nsISmtpServer;
+
+/**
+ * A listener callback for OAuth2 SASL authentication. This would be represented
+ * as a promise, but this needs to be consumed by C++ code.
+ */
+[scriptable, uuid(9a088b49-bc13-4f99-9478-053a6a43e370)]
+interface msgIOAuth2ModuleListener : nsISupports {
+  /// Called on successful OAuth2 authentication with the bearer token to use.
+  void onSuccess(in ACString aBearerToken);
+
+  /// Called on failed OAuth2 authentication.
+  void onFailure(in nsresult aError);
+};
+
+/**
+ * An interface for managing the responsibilities of using OAuth2 to produce a
+ * bearer token, for use in SASL steps.
+ */
+[scriptable, uuid(68c275f8-cfa7-4622-b279-af290616cae6)]
+interface msgIOAuth2Module : nsISupports {
+  /**
+   * Initialize the OAuth2 parameters from an SMTP server, and return whether or
+   * not we can authenticate with OAuth2.
+   */
+  bool initFromSmtp(in nsISmtpServer aSmtpServer);
+
+  /**
+   * Initialize the OAuth2 parameters from an incoming server, and return
+   * whether or not we can authenticate with OAuth2.
+   */
+  bool initFromMail(in nsIMsgIncomingServer aServer);
+
+  /**
+   * Connect to the OAuth2 server to get an access token.
+   * @param aWithUI   If false, do not allow a dialog to be popped up to query
+   *                  for a password.
+   * @param aCallback Listener that handles the async response.
+   */
+  void connect(in boolean aWithUI, in msgIOAuth2ModuleListener aCallback);
+
+  /**
+   * Return the base64-encoded string to send as the client initial response for
+   * SASL XOAUTH2.
+   */
+  ACString buildXOAuth2String();
+};
+
+%{C++
+#define MSGIOAUTH2MODULE_CONTRACTID "@mozilla.org/mail/oauth2-module;1"
+%}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/nsIMsgCopyServiceListener.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/nsIMsgCopyServiceListener.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/public/nsIMsgCopyServiceListener.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/public/nsIMsgCopyServiceListener.idl	2015-02-28 15:02:41.000000000 +0000
@@ -7,7 +7,7 @@
 #include "nsISupports.idl"
 #include "MailNewsTypes2.idl"
 
-[scriptable, uuid(CA620E0E-927F-4fbe-A108-9ECF31A7ECC7)]
+[scriptable, uuid(da6b9843-5464-4630-b121-c5970aa3d6ed)]
 interface nsIMsgCopyServiceListener : nsISupports {
 
     /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsIMsgFilter.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsIMsgFilter.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsIMsgFilter.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsIMsgFilter.idl	2015-02-28 15:02:41.000000000 +0000
@@ -30,7 +30,7 @@
   // target label. throws an exception if the action is not label
   attribute nsMsgLabelValue label;
 
-  attribute long junkScore; 
+  attribute long junkScore;
 
   attribute AUTF8String strValue;
 
@@ -40,10 +40,10 @@
   // custom action associated with customId
   // (which must be set prior to reading this attribute)
   readonly attribute nsIMsgFilterCustomAction customAction;
-  
+
 };
 
-[scriptable, uuid(ed4b7a8e-3190-4b0b-b842-d4f1ca652170)]
+[scriptable, uuid(d304fcfc-b588-11e4-981c-770e1e5d46b0)]
 interface nsIMsgFilter : nsISupports {
     attribute nsMsgFilterTypeType filterType;
     /**
@@ -90,7 +90,29 @@
                   //                  [array, size_is(headerSize)] in string headers,
                   in unsigned long headerSize, out boolean result);
 
-    void logRuleHit(in nsIMsgRuleAction aFilterAction, in nsIMsgDBHdr aHeader);
+
+    /*
+     * Report that Rule was matched and executed when filter logging is enabled.
+     *
+     * @param aFilterAction  The filter rule that was invoked.
+     * @param aHeader        The header information of the message acted on by
+     *                       the filter.
+     */
+    void logRuleHit(in nsIMsgRuleAction aFilterAction,
+                    in nsIMsgDBHdr aHeader);
+
+    /* Report that filtering failed for some reason when filter logging is enabled.
+     *
+     * @param aFilterAction Filter rule that was invoked.
+     * @param aHeader Header of the message acted on by the filter.
+     * @param aRcode  Error code returned by low-level routine that
+     *                led to the filter failure.
+     * @param aErrmsg Error message
+     */
+    void logRuleHitFail(in nsIMsgRuleAction aFilterAction,
+                        in nsIMsgDBHdr aHeader,
+                        in nsresult aRcode,
+                        in string aErrmsg );
 
     nsIMsgRuleAction createAction();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsIMsgFilterService.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsIMsgFilterService.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsIMsgFilterService.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsIMsgFilterService.idl	2015-02-28 15:02:41.000000000 +0000
@@ -16,7 +16,7 @@
 interface nsIArray;
 interface nsIMsgOperationListener;
 
-[scriptable, uuid(f2cd5e30-ac60-46c0-ad29-54321efd4128)]
+[scriptable, uuid(78a74023-1692-4567-8d72-9ca58fbbd427)]
 interface nsIMsgFilterService : nsISupports {
 
     nsIMsgFilterList OpenFilterList(in nsIFile filterFile, in nsIMsgFolder rootFolder, in nsIMsgWindow msgWindow);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsMsgFilterCore.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsMsgFilterCore.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsMsgFilterCore.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsMsgFilterCore.idl	2015-02-28 15:02:41.000000000 +0000
@@ -7,7 +7,7 @@
 
 typedef long nsMsgFilterTypeType;
 
-[scriptable,uuid(7d368017-e7b4-446c-98ee-e3e256741947)]
+[scriptable,uuid(b963a9c6-3a75-4d91-9f79-7186418d4d2d)]
 interface nsMsgFilterType {
     /* these longs are all actually of type nsMsgFilterTypeType */
   const long None             = 0x00;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsMsgSearchCore.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsMsgSearchCore.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsMsgSearchCore.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsMsgSearchCore.idl	2015-02-28 15:02:41.000000000 +0000
@@ -180,6 +180,8 @@
 [ptr] native nsMsgSearchValue(nsMsgSearchValue);
 
 %{C++
+#include "nsStringGlue.h"
+
 typedef struct nsMsgSearchValue
 {
     nsMsgSearchAttribValue attribute;
@@ -197,6 +199,7 @@
       uint32_t junkPercent;
     } u;
     char *string;
+    nsString utf16String;
 } nsMsgSearchValue;
 %}
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsMsgSearchTerm.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsMsgSearchTerm.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/public/nsMsgSearchTerm.h	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/public/nsMsgSearchTerm.h	2015-02-28 15:02:41.000000000 +0000
@@ -61,6 +61,7 @@
 
   nsresult MatchString(const nsACString &stringToMatch, const char *charset,
                        bool *pResult);
+  nsresult MatchString(const nsAString &stringToMatch, bool *pResult);
   nsresult OutputValue(nsCString &outputStr);
   nsresult ParseAttribute(char *inStream, nsMsgSearchAttribValue *attrib);
   nsresult ParseOperator(char *inStream, nsMsgSearchOpValue *value);
@@ -73,7 +74,7 @@
    */
   void ToLowerCaseExceptSpecials(nsACString &aValue);
     nsresult InitializeAddressBook();
-  nsresult MatchInAddressBook(const nsACString &aAddress, bool *pResult);
+  nsresult MatchInAddressBook(const nsAString &aAddress, bool *pResult);
     // fields used by search in address book
     nsCOMPtr <nsIAbDirectory> mDirectory;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgFilter.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgFilter.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgFilter.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgFilter.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -425,13 +425,13 @@
                                            (void **)getter_AddRefs(term));
   if (NS_SUCCEEDED(rv) && term)
   {
-    if(attrib)
+    if (attrib)
       term->GetAttrib(attrib);
-    if(op)
+    if (op)
       term->GetOp(op);
-    if(value)
+    if (value)
       term->GetValue(value);
-    if(booleanAnd)
+    if (booleanAnd)
       term->GetBooleanAnd(booleanAnd);
     if (attrib && *attrib > nsMsgSearchAttrib::OtherHeader
         && *attrib < nsMsgSearchAttrib::kNumMsgSearchAttributes)
@@ -476,7 +476,35 @@
 #define LOG_ENTRY_END_TAG "</p>\n"
 #define LOG_ENTRY_END_TAG_LEN (strlen(LOG_ENTRY_END_TAG))
 
-NS_IMETHODIMP nsMsgFilter::LogRuleHit(nsIMsgRuleAction *aFilterAction, nsIMsgDBHdr *aMsgHdr)
+// This function handles the logging both for success of filtering
+// (NS_SUCCEEDED(aRcode)), and for error reporting (NS_FAILED(aRcode)
+// when the filter action (such as file move/copy) failed.
+//
+// @param aRcode  NS_OK for successful filtering
+//                operation, otherwise, an error code for filtering failure.
+// @param aErrmsg Not used for success case (ignored), and a non-null
+//                error message for failure case.
+//
+// CAUTION: Unless logging is enabled, no error/warning is shown.
+// So enable logging if you would like to see the error/warning.
+//
+// XXX The current code in this file does not report errors of minor
+// operations such as adding labels and so forth which may fail when
+// underlying file system for the message store experiences
+// failure. For now, most visible major errors such as message
+// move/copy failures are taken care of.
+//
+// XXX Possible Improvement: For error case reporting, someone might
+// want to implement a transient message that appears and stick until
+// the user clears in the message status bar, etc. For now, we log an
+// error in a similar form as a conventional successful filter event
+// with additional error information at the beginning.
+//
+nsresult
+nsMsgFilter::LogRuleHitGeneric(nsIMsgRuleAction *aFilterAction,
+                               nsIMsgDBHdr *aMsgHdr,
+                               nsresult aRcode,
+                               const char *aErrmsg)
 {
     NS_ENSURE_ARG_POINTER(aFilterAction);
     NS_ENSURE_ARG_POINTER(aMsgHdr);
@@ -532,6 +560,38 @@
       getter_AddRefs(bundle));
     NS_ENSURE_SUCCESS(rv, rv);
 
+    // If error, prefix with the error code and error message.
+    // A desired wording (without NEWLINEs):
+    // Filter Action Failed "Move failed" with error code=0x80004005
+    // while attempting: Applied filter "test" to message from
+    // Some Test <test@example.com> - send test 3 at 2/13/2015 11:32:53 AM
+    // moved message id = 54DE5165.7000907@example.com to
+    // mailbox://nobody@Local%20Folders/test
+
+    if (NS_FAILED(aRcode))
+    {
+
+      // Let us put "Filter Action Failed: "%s" with error code=%s while attempting: " inside bundle.
+      // Convert aErrmsg to UTF16 string, and
+      // convert aRcode to UTF16 string in advance.
+
+      char tcode[20];
+      PR_snprintf(tcode, sizeof(tcode), "0x%08x", aRcode);
+
+      NS_ConvertASCIItoUTF16 tcode16(tcode) ;
+      NS_ConvertASCIItoUTF16 tErrmsg16(aErrmsg) ;
+
+      const char16_t *logErrorFormatStrings[2] = { tErrmsg16.get(),  tcode16.get()};
+      nsString filterFailureWarningPrefix;
+      rv = bundle->FormatStringFromName(
+                      MOZ_UTF16("filterFailureWarningPrefix"),
+                      logErrorFormatStrings, 2,
+                      getter_Copies(filterFailureWarningPrefix));
+      NS_ENSURE_SUCCESS(rv, rv);
+      buffer += NS_ConvertUTF16toUTF8(filterFailureWarningPrefix);
+      buffer += "\n";
+    }
+
     const char16_t *filterLogDetectFormatStrings[4] = { filterName.get(), authorValue.get(), subjectValue.get(), dateValue.get() };
     nsString filterLogDetectStr;
     rv = bundle->FormatStringFromName(
@@ -591,6 +651,10 @@
     }
     buffer += "\n";
 
+    // XXX: Finally, here we have enough context and buffer
+    // (string) to display the filtering error if we want: for
+    // example, a sticky error message in status bar, etc.
+
     uint32_t writeCount;
 
     rv = logStream->Write(LOG_ENTRY_START_TAG, LOG_ENTRY_START_TAG_LEN, &writeCount);
@@ -616,6 +680,20 @@
     return NS_OK;
 }
 
+NS_IMETHODIMP nsMsgFilter::LogRuleHit(nsIMsgRuleAction *aFilterAction,
+                                      nsIMsgDBHdr *aMsgHdr)
+{
+  return nsMsgFilter::LogRuleHitGeneric(aFilterAction, aMsgHdr, NS_OK, nullptr);
+}
+
+NS_IMETHODIMP nsMsgFilter::LogRuleHitFail(nsIMsgRuleAction *aFilterAction,
+                                          nsIMsgDBHdr *aMsgHdr,
+                                          nsresult aRcode,
+                                          const char *aErrMsg)
+{
+  return nsMsgFilter::LogRuleHitGeneric(aFilterAction, aMsgHdr, aRcode, aErrMsg);
+}
+
 NS_IMETHODIMP
 nsMsgFilter::MatchHdr(nsIMsgDBHdr *msgHdr, nsIMsgFolder *folder,
                       nsIMsgDatabase *db, const char *headers,
@@ -960,4 +1038,3 @@
   printf("filter %s type = %c desc = %s\n", s.get(), m_type + '0', m_description.get());
 }
 #endif
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgFilter.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgFilter.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgFilter.h	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgFilter.h	2015-02-28 15:02:41.000000000 +0000
@@ -70,6 +70,16 @@
   static nsresult GetActionFilingStr(nsMsgRuleActionType action, nsCString &actionStr);
   static nsMsgRuleActionType GetActionForFilingStr(nsCString &actionStr);
 protected:
+
+  /*
+   * Reporting function for filtering success/failure.
+   * Logging has to be enabled for the message to appear.
+   */
+  nsresult LogRuleHitGeneric(nsIMsgRuleAction *aFilterAction,
+                             nsIMsgDBHdr *aMsgHdr,
+                             nsresult aRcode,
+                             const char *aErrmsg);
+
   virtual ~nsMsgFilter();
 
   nsMsgFilterTypeType m_type;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgFilterService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgFilterService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgFilterService.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgFilterService.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -425,6 +425,14 @@
     m_nextAction = 0;
     rv = m_folders->QueryElementAt(m_curFolderIndex++, NS_GET_IID(nsIMsgFolder), getter_AddRefs(m_curFolder));
     CONTINUE_IF_FAILURE(rv, "Could not get next folder");
+
+    // Note: I got rv = NS_OK but null m_curFolder after deleting a folder
+    // outside of TB, when I select a single message and "run filter on message"
+    // and the filter is to move the message to the deleted folder.
+
+     // m_curFolder may be null when the folder is deleted externally.
+    CONTINUE_IF_FALSE(m_curFolder, "Next folder returned null");
+
     rv = m_curFolder->GetMsgDatabase(getter_AddRefs(m_curFolderDB));
     if (rv == NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE)
     {
@@ -1068,6 +1076,9 @@
   }
   m_curFilter = nullptr;
   NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Failed to run filters");
+  // We expect the failure is already recorded through one of the macro
+  // expressions, that will have console logging added to them.
+  // So an additional console warning is not needed here.
   return AdvanceToNextFolder();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgSearchTerm.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgSearchTerm.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgSearchTerm.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgSearchTerm.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -607,6 +607,7 @@
     m_value.string = (char *) PR_Malloc(valueLen + 1);
     PL_strncpy(m_value.string, inStream, valueLen + 1);
     m_value.string[valueLen] = '\0';
+    CopyUTF8toUTF16(m_value.string, m_value.utf16String);
   }
   else
   {
@@ -733,6 +734,7 @@
     m_value.attribute = m_attribute = nsMsgSearchAttrib::Keywords;
     keyword.Append('0' + m_value.u.label);
     m_value.string = PL_strdup(keyword.get());
+    CopyUTF8toUTF16(m_value.string, m_value.utf16String);
   }
   return NS_OK;
 }
@@ -1030,7 +1032,7 @@
   return NS_OK;
 }
 
-nsresult nsMsgSearchTerm::MatchInAddressBook(const nsACString &aAddress,
+nsresult nsMsgSearchTerm::MatchInAddressBook(const nsAString &aAddress,
                                              bool *pResult)
 {
   nsresult rv = InitializeAddressBook();
@@ -1043,7 +1045,7 @@
   if (mDirectory)
   {
     nsCOMPtr<nsIAbCard> cardForAddress = nullptr;
-    rv = mDirectory->CardForEmailAddress(aAddress,
+    rv = mDirectory->CardForEmailAddress(NS_ConvertUTF16toUTF8(aAddress),
                                          getter_AddRefs(cardForAddress));
     if (NS_FAILED(rv) && rv != NS_ERROR_NOT_IMPLEMENTED)
       return rv;
@@ -1075,17 +1077,16 @@
   NS_ENSURE_ARG_POINTER(pResult);
 
   nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID);
-  nsAutoCString stringToMatch;
-  nsresult rv = mimeConverter->DecodeMimeHeaderToUTF8(
-    rfc2047string, charset, charsetOverride, false, stringToMatch);
+  nsAutoString stringToMatch;
+  nsresult rv = mimeConverter->DecodeMimeHeader(
+    PromiseFlatCString(rfc2047string).get(), charset, charsetOverride, false,
+    stringToMatch);
   NS_ENSURE_SUCCESS(rv, rv);
   if (m_operator == nsMsgSearchOp::IsInAB ||
       m_operator == nsMsgSearchOp::IsntInAB)
-    return MatchInAddressBook(
-      stringToMatch.IsEmpty() ? rfc2047string : stringToMatch, pResult);
+    return MatchInAddressBook(stringToMatch, pResult);
 
-  return MatchString(stringToMatch.IsEmpty() ? rfc2047string : stringToMatch,
-      nullptr, pResult);
+  return MatchString(stringToMatch, pResult);
 }
 
 // *pResult is false when strings don't match, true if they do.
@@ -1098,16 +1099,21 @@
   bool result = false;
 
   nsresult rv = NS_OK;
-  nsAutoString utf16StrToMatch;
-  nsAutoString needle;
 
   // Save some performance for opIsEmpty / opIsntEmpty
-  if(nsMsgSearchOp::IsEmpty != m_operator && nsMsgSearchOp::IsntEmpty != m_operator)
+  if (nsMsgSearchOp::IsEmpty == m_operator)
   {
-    NS_ASSERTION(MsgIsUTF8(nsDependentCString(m_value.string)),
-                 "m_value.string is not UTF-8");
-    CopyUTF8toUTF16(nsDependentCString(m_value.string), needle);
-
+    if (stringToMatch.IsEmpty())
+      result = true;
+  }
+  else if (nsMsgSearchOp::IsntEmpty == m_operator)
+  {
+    if (!stringToMatch.IsEmpty())
+      result = true;
+  }
+  else
+  {
+    nsAutoString utf16StrToMatch;
     if (charset != nullptr)
     {
       ConvertToUnicode(charset, nsCString(stringToMatch), utf16StrToMatch);
@@ -1116,8 +1122,24 @@
       NS_ASSERTION(MsgIsUTF8(stringToMatch), "stringToMatch is not UTF-8");
       CopyUTF8toUTF16(stringToMatch, utf16StrToMatch);
     }
+    rv = MatchString(utf16StrToMatch, &result);
   }
 
+  *pResult = result;
+  return rv;
+}
+
+// *pResult is false when strings don't match, true if they do.
+nsresult nsMsgSearchTerm::MatchString(const nsAString &utf16StrToMatch,
+                                      bool *pResult)
+{
+  NS_ENSURE_ARG_POINTER(pResult);
+
+  bool result = false;
+
+  nsresult rv = NS_OK;
+  auto needle = m_value.utf16String;
+
   switch (m_operator)
   {
   case nsMsgSearchOp::Contains:
@@ -1137,13 +1159,11 @@
       result = true;
     break;
   case nsMsgSearchOp::IsEmpty:
-    // For IsEmpty, we didn't copy stringToMatch to utf16StrToMatch.
-    if (stringToMatch.IsEmpty())
+    if (utf16StrToMatch.IsEmpty())
       result = true;
     break;
   case nsMsgSearchOp::IsntEmpty:
-    // For IsntEmpty, we didn't copy stringToMatch to utf16StrToMatch.
-    if (!stringToMatch.IsEmpty())
+    if (!utf16StrToMatch.IsEmpty())
       result = true;
     break;
   case nsMsgSearchOp::BeginsWith:
@@ -1186,9 +1206,16 @@
   GetMatchAllBeforeDeciding(&boolContinueLoop);
   result = boolContinueLoop;
 
-  nsTArray<nsCString> names, addresses;
-  ExtractAllAddresses(EncodedHeader(string, charset),
-    UTF16ArrayAdapter<>(names), UTF16ArrayAdapter<>(addresses));
+  // If the operator is Contains, then we can cheat and avoid having to parse
+  // addresses. This does open up potential spurious matches for punctuation
+  // (e.g., ; or <), but the likelihood of users intending to search for these
+  // and also being able to match them is rather low. This optimization is not
+  // applicable to any other search type.
+  if (m_operator == nsMsgSearchOp::Contains)
+    return MatchRfc2047String(string, charset, false, pResult);
+
+  nsTArray<nsString> names, addresses;
+  ExtractAllAddresses(EncodedHeader(string, charset), names, addresses);
   uint32_t count = names.Length();
 
   nsresult rv = NS_OK;
@@ -1201,9 +1228,9 @@
     }
     else
     {
-      rv = MatchString(names[i], nullptr, &result);
+      rv = MatchString(names[i], &result);
       if (boolContinueLoop == result)
-        rv = MatchString(addresses[i], nullptr, &result);
+        rv = MatchString(addresses[i], &result);
     }
   }
   *pResult = result;
@@ -2008,6 +2035,7 @@
       nsString unicodeString;
       rv = src->GetStr(unicodeString);
       dst->string = ToNewUTF8String(unicodeString);
+      dst->utf16String = unicodeString;
     }
     else
       rv = NS_ERROR_INVALID_ARG;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgSearchValue.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgSearchValue.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/search/src/nsMsgSearchValue.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/search/src/nsMsgSearchValue.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -13,7 +13,10 @@
 {
     mValue = *aInitialValue;
     if (IS_STRING_ATTRIBUTE(aInitialValue->attribute) && aInitialValue->string)
+    {
         mValue.string = NS_strdup(aInitialValue->string);
+        CopyUTF8toUTF16(mValue.string, mValue.utf16String);
+    }
     else
         mValue.string = 0;
 }
@@ -59,10 +62,7 @@
 nsMsgSearchValueImpl::GetStr(nsAString &aResult)
 {
     NS_ENSURE_TRUE(IS_STRING_ATTRIBUTE(mValue.attribute), NS_ERROR_ILLEGAL_VALUE);
-    if (mValue.string)
-        CopyUTF8toUTF16(nsDependentCString(mValue.string), aResult);
-    else
-        aResult.Truncate();
+    aResult = mValue.utf16String;
     return NS_OK;
 }
 
@@ -73,6 +73,7 @@
     if (mValue.string)
         NS_Free(mValue.string);
     mValue.string = ToNewUTF8String(aValue);
+    mValue.utf16String = aValue;
     return NS_OK;
 }
 
@@ -81,7 +82,7 @@
 {
     aResult.AssignLiteral("[nsIMsgSearchValue: ");
     if (IS_STRING_ATTRIBUTE(mValue.attribute)) {
-        aResult.Append(NS_ConvertUTF8toUTF16(mValue.string));
+        aResult.Append(mValue.utf16String);
         return NS_OK;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/MailNewsDLF.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/MailNewsDLF.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/MailNewsDLF.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/MailNewsDLF.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -31,7 +31,7 @@
 MailNewsDLF::CreateInstance(const char* aCommand,
                             nsIChannel* aChannel,
                             nsILoadGroup* aLoadGroup,
-                            const char* aContentType, 
+                            const nsACString& aContentType,
                             nsIDocShell* aContainer,
                             nsISupports* aExtraInfo,
                             nsIStreamListener** aDocListener,
@@ -39,7 +39,8 @@
 {
   nsresult rv;
 
-  bool viewSource = (PL_strstr(aContentType,"view-source") != 0);
+  bool viewSource = (PL_strstr(PromiseFlatCString(aContentType).get(),
+                               "view-source") != 0);
 
   aChannel->SetContentType(NS_LITERAL_CSTRING(TEXT_HTML));
 
@@ -61,11 +62,11 @@
 
   if (viewSource) {
     rv = factory->CreateInstance("view-source", aChannel, aLoadGroup,
-                                 TEXT_HTML "; x-view-type=view-source",
+                                 NS_LITERAL_CSTRING(TEXT_HTML "; x-view-type=view-source"),
                                  aContainer, aExtraInfo, getter_AddRefs(listener),
                                  aDocViewer);
   } else {
-    rv = factory->CreateInstance("view", aChannel, aLoadGroup, TEXT_HTML,
+    rv = factory->CreateInstance("view", aChannel, aLoadGroup, NS_LITERAL_CSTRING(TEXT_HTML),
                                  aContainer, aExtraInfo, getter_AddRefs(listener),
                                  aDocViewer);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/moz.build	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/moz.build	2015-02-28 15:02:41.000000000 +0000
@@ -68,6 +68,7 @@
     'folderLookupService.js',
     'msgAsyncPrompter.js',
     'msgBase.manifest',
+    'msgOAuth2Module.js',
     'newMailNotificationService.js',
     'nsMailNewsCommandLineHandler.js',
 ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/msgBase.manifest thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/msgBase.manifest
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/msgBase.manifest	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/msgBase.manifest	2015-02-28 15:02:41.000000000 +0000
@@ -8,3 +8,5 @@
 category profile-after-change NewMailNotificationService @mozilla.org/newMailNotificationService;1 
 component {a30be08c-afc8-4fed-9af7-79778a23db23} folderLookupService.js
 contract @mozilla.org/mail/folder-lookup;1 {a30be08c-afc8-4fed-9af7-79778a23db23}
+component {b63d8e4c-bf60-439b-be0e-7c9f67291042} msgOAuth2Module.js
+contract @mozilla.org/mail/oauth2-module;1 {b63d8e4c-bf60-439b-be0e-7c9f67291042}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/msgOAuth2Module.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/msgOAuth2Module.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/msgOAuth2Module.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/msgOAuth2Module.js	2015-02-28 15:02:41.000000000 +0000
@@ -0,0 +1,139 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 Cr = Components.results;
+
+Components.utils.import("resource://gre/modules/OAuth2.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");
+
+function OAuth2Module() {
+  this._refreshToken = '';
+}
+OAuth2Module.prototype = {
+  // XPCOM registration stuff
+  QueryInterface: XPCOMUtils.generateQI([Ci.msgIOAuth2Module]),
+  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 = '572172754692-vfo2oqvu2oju9be729s915glghp1vpfj.apps.googleusercontent.com';
+      this._appSecret = 'YpeuM0eYPQe_r98HZ7p16zUm';
+      this._authURI = "https://accounts.google.com/o/oauth2/auth";
+      this._tokenURI = "https://www.googleapis.com/oauth2/v3/token";
+    } else {
+      throw Cr.NS_ERROR_INVALID_ARGUMENT;
+    }
+  },
+  initFromSmtp(aServer) {
+    return this._initPrefs("mail.smtpserver." + aServer.key + ".",
+      aServer.username, aServer.hostname);
+  },
+  initFromMail(aServer) {
+    return this._initPrefs("mail.server." + aServer.key + ".",
+      aServer.username, aServer.realHostName);
+  },
+  _initPrefs(root, aUsername, aHostname) {
+    // Load all of the parameters from preferences.
+    let issuer = Preferences.get(root + "oauth2.issuer", "");
+    let scope = Preferences.get(root + "oauth2.scope", "");
+
+    // These properties are absolutely essential to OAuth2 support. If we don't
+    // have them, we don't support OAuth2.
+    if (!issuer || !scope)
+      return false;
+
+    // Find the app key we need for the OAuth2 string. Eventually, this should
+    // be using dynamic client registration, but there are no current
+    // implementations that we can test this with.
+    this._loadOAuthClientDetails(issuer);
+
+    // Username is needed to generate the XOAUTH2 string.
+    this._username = aUsername;
+    // LoginURL is needed to save the refresh token in the password manager.
+    this._loginUrl = "oauth://" + issuer;
+    // We use the scope to indicate the realm.
+    this._scope = scope;
+
+    // Define the OAuth property and store it.
+    this._oauth = new OAuth2(this._authURI, scope, this._appKey,
+      this._appSecret);
+    this._oauth.authURI = this._authURI;
+    this._oauth.tokenURI = this._tokenURI;
+
+    // Try hinting the username...
+    this._oauth.extraAuthParams = [
+      ["login_hint", aUsername]
+    ];
+
+    // Set the window title to something more useful than "Unnamed"
+    this._oauth.requestWindowTitle =
+      Services.strings.createBundle("chrome://messenger/locale/messenger.properties")
+                      .formatStringFromName("oauth2WindowTitle",
+                                            [aUsername, aHostname], 2);
+
+    // This stores the refresh token in the login manager.
+    Object.defineProperty(this._oauth, "refreshToken", {
+      get: () => this.refreshToken,
+      set: (token) => this.refreshToken = token
+    });
+
+    return true;
+  },
+
+  get refreshToken() {
+    let loginMgr = Cc["@mozilla.org/login-manager;1"]
+                     .getService(Ci.nsILoginManager);
+    let logins = loginMgr.findLogins({}, this._loginUrl, null, this._scope);
+    for (let login of logins) {
+      if (login.username == this._username)
+        return login.password;
+    }
+    return '';
+  },
+  set refreshToken(token) {
+    let loginMgr = Cc["@mozilla.org/login-manager;1"]
+                     .getService(Ci.nsILoginManager);
+
+    // Check if we already have a login with this username, and modify the
+    // password on that, if we do.
+    let logins = loginMgr.findLogins({}, this._loginUrl, null, this._scope);
+    for (let login of logins) {
+      if (login.username == this._username)
+        loginMgr.modifyLogin(login, {password: token});
+      return token;
+    }
+
+    // Otherwise, we need a new login, so create one and fill it in.
+    let login = Cc["@mozilla.org/login-manager/loginInfo;1"]
+                  .createInstance(Ci.nsILoginInfo);
+    login.init(this._loginUrl, null, this._scope, this._username, token,
+      '', '');
+    loginMgr.addLogin(login);
+    return token;
+  },
+
+  connect(aWithUI, aListener) {
+    this._oauth.connect(() => aListener.onSuccess(this._oauth.accessToken),
+                        x => aListener.onFailure(x),
+                        aWithUI, false);
+  },
+
+  buildXOAuth2String() {
+    return btoa("user=" + this._username + "\x01auth=Bearer " +
+      this._oauth.accessToken + "\x01\x01");
+  },
+};
+
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([OAuth2Module]);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsMessenger.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsMessenger.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsMessenger.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsMessenger.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -1777,6 +1777,10 @@
     // so make an arbitrary decision based on the content length of the
     // attachment -- show it if less than half of the download has completed
 
+    // Set saveToDisk explicitly to avoid launching the saved file.
+    // See http://hg.mozilla.org/mozilla-central/file/814a6f071472/toolkit/components/jsdownloads/src/DownloadLegacy.js#l164
+    mimeinfo->SetPreferredAction(nsIHandlerInfo::saveToDisk);
+
     // When we don't allow warnings, also don't show progress, as this
     //  is an environment (typically filters) where we don't want
     //  interruption.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsMsgAccountManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsMsgAccountManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsMsgAccountManager.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsMsgAccountManager.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -464,6 +464,10 @@
     nsCString defaultStore;
     m_prefs->GetCharPref("mail.serverDefaultStoreContractID", getter_Copies(defaultStore));
     (*_retval)->SetCharValue("storeContractID", defaultStore);
+
+    // From when we first create the account until we have created some folders,
+    // we can change the store type.
+    (*_retval)->SetBoolValue("canChangeStoreType", true);
   }
   return rv;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsMsgWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsMsgWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsMsgWindow.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsMsgWindow.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -370,10 +370,10 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP nsMsgWindow::DoContent(const char *aContentType, bool aIsContentPreferred,
+NS_IMETHODIMP nsMsgWindow::DoContent(const nsACString& aContentType, bool aIsContentPreferred,
                                      nsIRequest *request, nsIStreamListener **aContentHandler, bool *aAbortProcess)
 {
-  if (aContentType)
+  if (!aContentType.IsEmpty())
   {
     // forward the DoContent call to our docshell
     nsCOMPtr<nsIDocShell> messageWindowDocShell;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsStatusBarBiffManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsStatusBarBiffManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/src/nsStatusBarBiffManager.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/src/nsStatusBarBiffManager.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -48,7 +48,7 @@
 #define SYSTEM_SOUND_TYPE 0
 #define CUSTOM_SOUND_TYPE 1
 #define PREF_CHAT_ENABLED                "mail.chat.enabled"
-#define NEW_CHAT_MESSAGE_TOPIC           "new-directed-incoming-message"
+#define PLAY_CHAT_NOTIFICATION_SOUND     "play-chat-notification-sound"
 
 nsresult nsStatusBarBiffManager::Init()
 {
@@ -74,7 +74,7 @@
     nsCOMPtr<nsIObserverService> observerService =
       mozilla::services::GetObserverService();
     if (observerService)
-      observerService->AddObserver(this, NEW_CHAT_MESSAGE_TOPIC, false);
+      observerService->AddObserver(this, PLAY_CHAT_NOTIFICATION_SOUND, false);
   }
 
   mInitialized = true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/test/unit/test_iteratorUtils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/test/unit/test_iteratorUtils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/test/unit/test_iteratorUtils.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/test/unit/test_iteratorUtils.js	2015-02-28 15:02:41.000000000 +0000
@@ -84,6 +84,38 @@
     do_check_eq(val, JSArray[i++]);
   }
   do_check_true(i > 0);
+
+  // Bug 1126509, test that fixIterator rejects unknown objects.
+  let thrown = false;
+  let tryIterate = { item: "An object, that is not supported by fixIterator." };
+  try {
+    for (let val in iteratorUtils.fixIterator(tryIterate)) { dump(val); }
+  } catch (e) {
+    // A specific exception is the correct behaviour here.
+    if (e.message == "An unsupported object sent to fixIterator: [object Object]")
+      thrown = true;
+  }
+  do_check_true(thrown);
+
+  thrown = false;
+  try {
+    for (let val of iteratorUtils.fixIterator(tryIterate)) { dump(val); }
+  } catch (e) {
+    // A specific exception is the correct behaviour here.
+    if (e.message == "An unsupported object sent to fixIterator: [object Object]")
+      thrown = true;
+  }
+  do_check_true(thrown);
+
+  thrown = false;
+  try {
+    let result = iteratorUtils.toXPCOMArray(tryIterate, Ci.nsIArray);
+  } catch (e) {
+    // A specific exception is the correct behaviour here.
+    if (e.message == "An unsupported interface requested from toXPCOMArray: nsIArray")
+      thrown = true;
+  }
+  do_check_true(thrown);
 }
 
 /**
@@ -119,6 +151,18 @@
     do_check_eq(i, iteratorArray[i][0]);
     do_check_eq(val, iteratorArray[i][1]);
   }
+
+  // Bug 1126509, test that toArray rejects unknown objects.
+  let thrown = false;
+  let tryIterate = { item: "An object, that is not supported by toArray." };
+  try {
+    let result = iteratorUtils.toArray(tryIterate);
+  } catch (e) {
+    // A specific exception is the correct behaviour here.
+    if (e.message == "An unsupported object sent to toArray: [object Object]")
+      thrown = true;
+  }
+  do_check_true(thrown);
 }
 
 const Symbol_iterator = typeof Symbol === "function" && Symbol.iterator ?
@@ -151,6 +195,6 @@
 ];
 
 function run_test() {
-  for (let [, test] in Iterator(gTests))
+  for (let test of gTests)
     test();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/util/iteratorUtils.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/util/iteratorUtils.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/util/iteratorUtils.jsm	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/util/iteratorUtils.jsm	2015-02-28 15:02:41.000000000 +0000
@@ -20,20 +20,20 @@
  * This function will take a number of objects and convert them to an array.
  *
  * Currently, we support the following objects:
- *   NodeList     (i.e. element.childNodes)
  *   Anything you can for (let x of aObj) on
- *                (e.g. toArray(fixIterator(enum))[4])
+ *                (e.g. toArray(fixIterator(enum))[4],
+ *                 also a NodeList from element.childNodes)
  *
  * @param aObj        The object to convert
  */
 function toArray(aObj) {
   if (ITERATOR_SYMBOL in aObj) {
     return Array.from(aObj);
-  } else if (aObj.constructor.contains("NodeList")) {
-    return Array.slice(aObj);
   }
 
-  return null;
+  // We got something unexpected, notify the caller loudly.
+  throw new Error("An unsupported object sent to toArray: " +
+                  (("toString" in aObj) ? aObj.toString() : aObj));
 }
 
 /**
@@ -123,7 +123,9 @@
     })());
   }
 
-  return null;
+  // We got something unexpected, notify the caller loudly.
+  throw new Error("An unsupported object sent to fixIterator: " +
+                  (("toString" in aEnum) ? aEnum.toString() : aEnum));
 }
 
 /**
@@ -148,6 +150,7 @@
     }
     return supportsArray;
   }
+
   if (aInterface.equals(Ci.nsIMutableArray)) {
     let mutableArray = Components.classes["@mozilla.org/array;1"]
                                  .createInstance(Ci.nsIMutableArray);
@@ -157,5 +160,7 @@
     return mutableArray;
   }
 
-  throw "no supports for interface conversion";
+  // We got something unexpected, notify the caller loudly.
+  throw new Error("An unsupported interface requested from toXPCOMArray: " +
+                  aInterface);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/util/nsMsgDBFolder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/util/nsMsgDBFolder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/util/nsMsgDBFolder.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/util/nsMsgDBFolder.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -4192,7 +4192,11 @@
 {
   NS_ENSURE_ARG_POINTER(numUnread);
 
-  int32_t total = mNumUnreadMessages + mNumPendingUnreadMessages;
+  bool isServer = false;
+  nsresult rv = GetIsServer(&isServer);
+  NS_ENSURE_SUCCESS(rv, rv);
+  int32_t total = isServer ? 0 : mNumUnreadMessages + mNumPendingUnreadMessages;
+
   if (deep)
   {
     if (total < 0) // deep search never returns negative counts
@@ -4219,7 +4223,11 @@
 {
   NS_ENSURE_ARG_POINTER(totalMessages);
 
-  int32_t total = mNumTotalMessages + mNumPendingTotalMessages;
+  bool isServer = false;
+  nsresult rv = GetIsServer(&isServer);
+  NS_ENSURE_SUCCESS(rv, rv);
+  int32_t total = isServer ? 0 : mNumTotalMessages + mNumPendingTotalMessages;
+
   if (deep)
   {
     if (total < 0) // deep search never returns negative counts
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/util/nsMsgIncomingServer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/util/nsMsgIncomingServer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/base/util/nsMsgIncomingServer.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/base/util/nsMsgIncomingServer.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -943,6 +943,11 @@
       storeContractID.Assign("@mozilla.org/msgstore/berkeleystore;1");
       SetCharValue("storeContractID", storeContractID);
     }
+
+    // After someone starts using the pluggable store, we can no longer
+    // change the value.
+    SetBoolValue("canChangeStoreType", false);
+
     // Right now, we just have one pluggable store per server. If we want
     // to support multiple, this pref could be a list of pluggable store
     // contract id's.
@@ -953,7 +958,6 @@
   return NS_OK;
 }
 
-
 NS_IMETHODIMP
 nsMsgIncomingServer::SetLocalPath(nsIFile *aLocalPath)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/public/nsIMsgSendReport.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/public/nsIMsgSendReport.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/public/nsIMsgSendReport.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/public/nsIMsgSendReport.idl	2015-02-28 15:02:41.000000000 +0000
@@ -17,7 +17,7 @@
   void reset();
 };
 
-[scriptable, uuid(2247c281-7f7f-11d5-9daa-994d49414e7c)]
+[scriptable, uuid(428c5bde-29f5-4bfe-830a-ec795a1c2975)]
 interface nsIMsgSendReport : nsISupports {
 
   const long process_Current = -1;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsComposeStrings.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsComposeStrings.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsComposeStrings.h	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsComposeStrings.h	2015-02-28 15:02:41.000000000 +0000
@@ -70,4 +70,107 @@
 
 #define NS_ERROR_ILLEGAL_LOCALPART                  NS_MSG_GENERATE_FAILURE(12601)
 
+static const char16_t* errorStringNameForErrorCode(nsresult aCode)
+{
+  switch(aCode)
+  {
+    case NS_MSG_UNABLE_TO_OPEN_FILE:
+      return MOZ_UTF16("unableToOpenFile");
+    case NS_MSG_UNABLE_TO_OPEN_TMP_FILE:
+      return MOZ_UTF16("unableToOpenTmpFile");
+    case NS_MSG_UNABLE_TO_SAVE_TEMPLATE:
+      return MOZ_UTF16("unableToSaveTemplate");
+    case NS_MSG_UNABLE_TO_SAVE_DRAFT:
+      return MOZ_UTF16("unableToSaveDraft");
+    case NS_MSG_COULDNT_OPEN_FCC_FOLDER:
+      return MOZ_UTF16("couldntOpenFccFolder");
+    case NS_MSG_NO_SENDER:
+      return MOZ_UTF16("noSender");
+    case NS_MSG_NO_RECIPIENTS:
+      return MOZ_UTF16("noRecipients");
+    case NS_MSG_ERROR_WRITING_FILE:
+      return MOZ_UTF16("errorWritingFile");
+    case NS_ERROR_SENDING_FROM_COMMAND:
+      return MOZ_UTF16("errorSendingFromCommand");
+    case NS_ERROR_SENDING_DATA_COMMAND:
+      return MOZ_UTF16("errorSendingDataCommand");
+    case NS_ERROR_SENDING_MESSAGE:
+      return MOZ_UTF16("errorSendingMessage");
+    case NS_ERROR_POST_FAILED:
+      return MOZ_UTF16("postFailed");
+    case NS_ERROR_QUEUED_DELIVERY_FAILED:
+      return MOZ_UTF16("errorQueuedDeliveryFailed");
+    case NS_ERROR_SEND_FAILED:
+      return MOZ_UTF16("sendFailed");
+    case NS_ERROR_SMTP_SERVER_ERROR:
+      return MOZ_UTF16("smtpServerError");
+    case NS_MSG_UNABLE_TO_SEND_LATER:
+      return MOZ_UTF16("unableToSendLater");
+    case NS_ERROR_COMMUNICATIONS_ERROR:
+      return MOZ_UTF16("communicationsError");
+    case NS_ERROR_BUT_DONT_SHOW_ALERT:
+      return MOZ_UTF16("dontShowAlert");
+    case NS_ERROR_TCP_READ_ERROR:
+      return MOZ_UTF16("tcpReadError");
+    case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS:
+      return MOZ_UTF16("couldNotGetUsersMailAddress");
+    case NS_ERROR_MIME_MPART_ATTACHMENT_ERROR:
+      return MOZ_UTF16("mimeMpartAttachmentError");
+    case NS_MSG_FAILED_COPY_OPERATION:
+      return MOZ_UTF16("failedCopyOperation");
+    case NS_ERROR_NNTP_NO_CROSS_POSTING:
+      return MOZ_UTF16("nntpNoCrossPosting");
+    case NS_MSG_CANCELLING:
+      return MOZ_UTF16("msgCancelling");
+    case NS_ERROR_SEND_FAILED_BUT_NNTP_OK:
+      return MOZ_UTF16("sendFailedButNntpOk");
+    case NS_MSG_ERROR_READING_FILE:
+      return MOZ_UTF16("errorReadingFile");
+    case NS_MSG_ERROR_ATTACHING_FILE:
+      return MOZ_UTF16("errorAttachingFile");
+    case NS_ERROR_SMTP_GREETING:
+      return MOZ_UTF16("incorrectSmtpGreeting");
+    case NS_ERROR_SENDING_RCPT_COMMAND:
+      return MOZ_UTF16("errorSendingRcptCommand");
+    case NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS:
+      return MOZ_UTF16("startTlsFailed");
+    case NS_ERROR_SMTP_PASSWORD_UNDEFINED:
+      return MOZ_UTF16("smtpPasswordUndefined");
+    case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
+      return MOZ_UTF16("smtpTempSizeExceeded");
+    case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
+      return MOZ_UTF16("smtpPermSizeExceeded1");
+    case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
+      return MOZ_UTF16("smtpPermSizeExceeded2");
+    case NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER:
+      return MOZ_UTF16("smtpSendFailedUnknownServer");
+    case NS_ERROR_SMTP_SEND_FAILED_REFUSED:
+      return MOZ_UTF16("smtpSendRefused");
+    case NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED:
+      return MOZ_UTF16("smtpSendInterrupted");
+    case NS_ERROR_SMTP_SEND_FAILED_TIMEOUT:
+      return MOZ_UTF16("smtpSendTimeout");
+    case NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON:
+      return MOZ_UTF16("smtpSendFailedUnknownReason");
+    case NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL:
+      return MOZ_UTF16("smtpAuthChangeEncryptToPlainNoSsl");
+    case NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL:
+      return MOZ_UTF16("smtpAuthChangeEncryptToPlainSsl");
+    case NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT:
+      return MOZ_UTF16("smtpAuthChangePlainToEncrypt");
+    case NS_ERROR_SMTP_AUTH_FAILURE:
+      return MOZ_UTF16("smtpAuthFailure");
+    case NS_ERROR_SMTP_AUTH_GSSAPI:
+      return MOZ_UTF16("smtpAuthGssapi");
+    case NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED:
+      return MOZ_UTF16("smtpAuthMechNotSupported");
+    case NS_ERROR_SMTP_AUTH_NOT_SUPPORTED:
+      return MOZ_UTF16("smtpAuthNotSupported");
+    case NS_ERROR_ILLEGAL_LOCALPART:
+      return MOZ_UTF16("illegalLocalPart");
+    default:
+      return MOZ_UTF16("smtpSendFailedUnknownReason");
+  }
+}
+
 #endif /* _nsComposeStrings_H__ */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgCompose.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgCompose.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgCompose.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgCompose.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -1333,18 +1333,18 @@
       switch (deliverMode)
       {
         case nsIMsgCompDeliverMode::Later:
-          nsMsgDisplayMessageByID(prompt, NS_MSG_UNABLE_TO_SEND_LATER);
+          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("unableToSendLater"));
           break;
         case nsIMsgCompDeliverMode::AutoSaveAsDraft:
         case nsIMsgCompDeliverMode::SaveAsDraft:
-          nsMsgDisplayMessageByID(prompt, NS_MSG_UNABLE_TO_SAVE_DRAFT);
+          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("unableToSaveDraft"));
           break;
         case nsIMsgCompDeliverMode::SaveAsTemplate:
-          nsMsgDisplayMessageByID(prompt, NS_MSG_UNABLE_TO_SAVE_TEMPLATE);
+          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("unableToSaveTemplate"));
           break;
 
         default:
-          nsMsgDisplayMessageByID(prompt, NS_ERROR_SEND_FAILED);
+          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("sendFailed"));
           break;
       }
     }
@@ -2660,7 +2660,7 @@
           compose->GetDomWindow(getter_AddRefs(composeWindow));
           if (composeWindow)
             composeWindow->GetPrompter(getter_AddRefs(prompt));
-          nsMsgDisplayMessageByName(prompt, NS_LITERAL_STRING("followupToSenderMessage"));
+          nsMsgDisplayMessageByName(prompt, MOZ_UTF16("followupToSenderMessage"));
 
           if (!replyTo.IsEmpty())
           {
@@ -3908,10 +3908,12 @@
             mozilla::services::GetStringBundleService();
           NS_ENSURE_TRUE(bundleService, NS_ERROR_UNEXPECTED);
           nsCOMPtr<nsIStringBundle> bundle;
-          rv = bundleService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties", getter_AddRefs(bundle));
+          rv = bundleService->CreateBundle(
+            "chrome://messenger/locale/messengercompose/composeMsgs.properties",
+            getter_AddRefs(bundle));
           NS_ENSURE_SUCCESS(rv, rv);
           nsString msg;
-          bundle->GetStringFromID(NS_ERROR_GET_CODE(NS_MSG_CANCELLING), getter_Copies(msg));
+          bundle->GetStringFromName(MOZ_UTF16("msgCancelling"), getter_Copies(msg));
           progress->OnStatusChange(nullptr, nullptr, NS_OK, msg.get());
         }
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgPrompts.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgPrompts.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgPrompts.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgPrompts.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -15,7 +15,7 @@
 #include "mozilla/Services.h"
 
 nsresult
-nsMsgGetMessageByID(nsresult aMsgID, nsString& aResult)
+nsMsgGetMessageByName(const char16_t* aName, nsString& aResult)
 {
   nsresult rv;
   nsCOMPtr<nsIStringBundleService> bundleService =
@@ -23,27 +23,12 @@
   NS_ENSURE_TRUE(bundleService, NS_ERROR_UNEXPECTED);
 
   nsCOMPtr<nsIStringBundle> bundle;
-  rv = bundleService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties", getter_AddRefs(bundle));
+  rv = bundleService->CreateBundle(
+    "chrome://messenger/locale/messengercompose/composeMsgs.properties",
+    getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  return bundle->GetStringFromID(NS_ERROR_GET_CODE(aMsgID),
-                                 getter_Copies(aResult));
-}
-
-nsresult
-nsMsgGetMessageByName(const nsString &aName, nsString& aResult)
-{
-  nsresult rv;
-  nsCOMPtr<nsIStringBundleService> bundleService =
-    mozilla::services::GetStringBundleService();
-  NS_ENSURE_TRUE(bundleService, NS_ERROR_UNEXPECTED);
-
-  nsCOMPtr<nsIStringBundle> bundle;
-  rv = bundleService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties", getter_AddRefs(bundle));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return bundle->GetStringFromName(aName.get(),
-                                   getter_Copies(aResult));
+  return bundle->GetStringFromName(aName, getter_Copies(aResult));
 }
 
 static nsresult
@@ -79,15 +64,7 @@
 }
 
 nsresult
-nsMsgDisplayMessageByID(nsIPrompt * aPrompt, nsresult msgID, const char16_t * windowTitle)
-{
-  nsString msg;
-  nsMsgGetMessageByID(msgID, msg);
-  return nsMsgDisplayMessageByString(aPrompt, msg.get(), windowTitle);
-}
-
-nsresult
-nsMsgDisplayMessageByName(nsIPrompt *aPrompt, const nsString &aName, const char16_t *windowTitle)
+nsMsgDisplayMessageByName(nsIPrompt *aPrompt, const char16_t* aName, const char16_t *windowTitle)
 {
   nsString msg;
   nsMsgGetMessageByName(aName, msg);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgPrompts.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgPrompts.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgPrompts.h	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgPrompts.h	2015-02-28 15:02:41.000000000 +0000
@@ -12,12 +12,10 @@
 
 class nsIPrompt;
 
-nsresult      nsMsgGetMessageByID(nsresult aMsgID, nsString& aResult);
-nsresult      nsMsgGetMessageByName(const nsString &aName, nsString& aResult);
+nsresult      nsMsgGetMessageByName(const char16_t* aName, nsString& aResult);
 nsresult      nsMsgBuildMessageWithFile(nsIFile * aFile, nsString& aResult);
 nsresult      nsMsgBuildMessageWithTmpFile(nsIFile * aFile, nsString& aResult);
-nsresult      nsMsgDisplayMessageByID(nsIPrompt * aPrompt, nsresult msgID, const char16_t * windowTitle = nullptr);
-nsresult      nsMsgDisplayMessageByName(nsIPrompt *aPrompt, const nsString &aName, const char16_t *windowTitle = nullptr);
+nsresult      nsMsgDisplayMessageByName(nsIPrompt *aPrompt, const char16_t *aName, const char16_t *windowTitle = nullptr);
 nsresult      nsMsgDisplayMessageByString(nsIPrompt * aPrompt, const char16_t * msg, const char16_t * windowTitle = nullptr);
 nsresult      nsMsgAskBooleanQuestionByString(nsIPrompt * aPrompt, const char16_t * msg, bool *answer, const char16_t * windowTitle = nullptr);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSend.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSend.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSend.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSend.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -2579,7 +2579,9 @@
         {
           nsCOMPtr<nsIStringBundle> bundle;
           const char16_t *params[] = { attachmentFileName.get() };
-          mComposeBundle->FormatStringFromID(NS_ERROR_GET_CODE(NS_MSG_ERROR_ATTACHING_FILE), params, 1, getter_Copies(errorMsg));
+          mComposeBundle->FormatStringFromName(MOZ_UTF16("errorAttachingFile"),
+                                               params, 1,
+                                               getter_Copies(errorMsg));
           mSendReport->SetMessage(nsIMsgSendReport::process_Current, errorMsg.get(), false);
           mSendReport->SetError(nsIMsgSendReport::process_Current,
                                 NS_MSG_ERROR_ATTACHING_FILE,
@@ -3517,7 +3519,7 @@
     else
     {
       if (aFailureCode != NS_ERROR_BUT_DONT_SHOW_ALERT)
-        nsMsgDisplayMessageByID(prompt, NS_ERROR_SEND_FAILED);
+        nsMsgDisplayMessageByName(prompt, MOZ_UTF16("sendFailed"));
     }
   }
 
@@ -3531,7 +3533,7 @@
 }
 
 nsresult
-nsMsgComposeAndSend::FormatStringWithSMTPHostNameByID(nsresult aMsgId, char16_t **aString)
+nsMsgComposeAndSend::FormatStringWithSMTPHostNameByName(const char16_t* aMsgName, char16_t **aString)
 {
   NS_ENSURE_ARG(aString);
 
@@ -3550,7 +3552,7 @@
   CopyASCIItoUTF16(smtpHostName, hostStr);
   const char16_t *params[] = { hostStr.get() };
   if (NS_SUCCEEDED(rv))
-    mComposeBundle->FormatStringFromID(NS_ERROR_GET_CODE(aMsgId), params, 1, aString);
+    mComposeBundle->FormatStringFromName(aMsgName, params, 1, aString);
   return rv;
 }
 
@@ -3561,7 +3563,7 @@
   // the user and exit.
   if (NS_FAILED(aExitCode))
   {
-
+    const char16_t* exitString = errorStringNameForErrorCode(aExitCode);
     nsString eMsg;
     if (aExitCode == NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER ||
         aExitCode == NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON ||
@@ -3576,10 +3578,11 @@
         aExitCode == NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL ||
         aExitCode == NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL ||
         aExitCode == NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT ||
-        aExitCode == NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS)
-      FormatStringWithSMTPHostNameByID(aExitCode, getter_Copies(eMsg));
-    else
-      mComposeBundle->GetStringFromID(NS_ERROR_GET_CODE(aExitCode), getter_Copies(eMsg));
+        aExitCode == NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS) {
+      FormatStringWithSMTPHostNameByName(exitString, getter_Copies(eMsg));
+    } else {
+      mComposeBundle->GetStringFromName(exitString, getter_Copies(eMsg));
+    }
 
     Fail(aExitCode, eMsg.get(), &aExitCode);
     NotifyListenerOnStopSending(nullptr, aExitCode, nullptr, nullptr);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSend.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSend.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSend.h	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSend.h	2015-02-28 15:02:41.000000000 +0000
@@ -184,7 +184,7 @@
   NS_IMETHOD  DeliverFileAsMail();
   NS_IMETHOD  DeliverFileAsNews();
   void        DoDeliveryExitProcessing(nsIURI * aUrl, nsresult aExitCode, bool aCheckForMail);
-  nsresult    FormatStringWithSMTPHostNameByID(nsresult aMsgId, char16_t **aString);
+  nsresult    FormatStringWithSMTPHostNameByName(const char16_t* aMsgName, char16_t **aString);
 
   nsresult    DoFcc();
   nsresult    StartMessageCopyOperation(nsIFile          *aFileSpec,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSendLater.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSendLater.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSendLater.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSendLater.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -248,9 +248,9 @@
       nsCOMPtr<nsISmtpUrl> smtpUrl (do_QueryInterface(uri));
       if (smtpUrl)
         smtpUrl->GetPrompt(getter_AddRefs(promptObject));
-    } 
-    nsMsgDisplayMessageByID(promptObject, NS_ERROR_QUEUED_DELIVERY_FAILED);
-    
+    }
+    nsMsgDisplayMessageByName(promptObject, MOZ_UTF16("errorQueuedDeliveryFailed"));
+
     // Getting the data failed, but we will still keep trying to send the rest...
     rv = StartNextMailFileSend(status);
     if (NS_FAILED(rv))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSendReport.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSendReport.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsMsgSendReport.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsMsgSendReport.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -286,7 +286,8 @@
         //Ignore, don't need to repeat ourself.
         break;
       default:
-        nsMsgGetMessageByID(currError, currMessage);
+        const char16_t* errorString = errorStringNameForErrorCode(currError);
+        nsMsgGetMessageByName(errorString, currMessage);
         break;
     }
   }
@@ -304,37 +305,37 @@
     bundle->GetStringFromName(MOZ_UTF16("sendMessageErrorTitle"),
                               getter_Copies(dialogTitle));
 
-    nsresult preStrId = NS_ERROR_SEND_FAILED;
+    const char16_t* preStrName = MOZ_UTF16("sendFailed");
     bool askToGoBackToCompose = false;
     switch (mCurrentProcess)
     {
       case process_BuildMessage :
-        preStrId = NS_ERROR_SEND_FAILED;
+        preStrName = MOZ_UTF16("sendFailed");
         askToGoBackToCompose = false;
         break;
       case process_NNTP :
-        preStrId = NS_ERROR_SEND_FAILED;
+        preStrName = MOZ_UTF16("sendFailed");
         askToGoBackToCompose = false;
         break;
       case process_SMTP :
         bool nntpProceeded;
         mProcessReport[process_NNTP]->GetProceeded(&nntpProceeded);
         if (nntpProceeded)
-          preStrId = NS_ERROR_SEND_FAILED_BUT_NNTP_OK;
+          preStrName = MOZ_UTF16("sendFailedButNntpOk");
         else
-          preStrId = NS_ERROR_SEND_FAILED;
+          preStrName = MOZ_UTF16("sendFailed");
         askToGoBackToCompose = false;
         break;
       case process_Copy:
-        preStrId = NS_MSG_FAILED_COPY_OPERATION;
+        preStrName = MOZ_UTF16("failedCopyOperation");
         askToGoBackToCompose = (mDeliveryMode == nsIMsgCompDeliverMode::Now);
         break;
       case process_FCC:
-        preStrId = NS_MSG_FAILED_COPY_OPERATION;
+        preStrName = MOZ_UTF16("failedCopyOperation");
         askToGoBackToCompose = (mDeliveryMode == nsIMsgCompDeliverMode::Now);
         break;
     }
-    bundle->GetStringFromID(NS_ERROR_GET_CODE(preStrId), getter_Copies(dialogMessage));
+    bundle->GetStringFromName(preStrName, getter_Copies(dialogMessage));
 
     //Do we already have an error message?
     if (!askToGoBackToCompose && currMessage.IsEmpty())
@@ -374,36 +375,36 @@
   else
   {
     const char16_t* title;
-    nsresult preStrId;
+    const char16_t* messageName;
 
     switch (mDeliveryMode)
     {
       case nsIMsgCompDeliverMode::Later:
         title = MOZ_UTF16("sendLaterErrorTitle");
-        preStrId = NS_MSG_UNABLE_TO_SEND_LATER;
+        messageName = MOZ_UTF16("unableToSendLater");
         break;
 
       case nsIMsgCompDeliverMode::AutoSaveAsDraft:
       case nsIMsgCompDeliverMode::SaveAsDraft:
         title = MOZ_UTF16("saveDraftErrorTitle");
-        preStrId = NS_MSG_UNABLE_TO_SAVE_DRAFT;
+        messageName = MOZ_UTF16("unableToSaveDraft");
         break;
 
       case nsIMsgCompDeliverMode::SaveAsTemplate:
         title = MOZ_UTF16("saveTemplateErrorTitle");
-        preStrId = NS_MSG_UNABLE_TO_SAVE_TEMPLATE;
+        messageName = MOZ_UTF16("unableToSaveTemplate");
         break;
 
       default:
         /* This should never happen! */
         title = MOZ_UTF16("sendMessageErrorTitle");
-        preStrId = NS_ERROR_SEND_FAILED;
+        messageName = MOZ_UTF16("sendFailed");
         break;
     }
 
     bundle->GetStringFromName(title, getter_Copies(dialogTitle));
-    bundle->GetStringFromID(NS_ERROR_GET_CODE(preStrId),
-                            getter_Copies(dialogMessage));
+    bundle->GetStringFromName(messageName,
+                              getter_Copies(dialogMessage));
 
     //Do we have an error message...
     if (currMessage.IsEmpty())
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsSmtpProtocol.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsSmtpProtocol.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsSmtpProtocol.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsSmtpProtocol.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -68,7 +68,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /* based on in NET_ExplainErrorDetails in mkmessag.c */
-nsresult nsExplainErrorDetails(nsISmtpUrl * aSmtpUrl, nsresult code, ...)
+nsresult nsExplainErrorDetails(nsISmtpUrl * aSmtpUrl, nsresult aCode, ...)
 {
   NS_ENSURE_ARG(aSmtpUrl);
 
@@ -84,37 +84,40 @@
     mozilla::services::GetStringBundleService();
   NS_ENSURE_TRUE(bundleService, NS_ERROR_UNEXPECTED);
   nsCOMPtr<nsIStringBundle> bundle;
-  nsresult rv = bundleService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties", getter_AddRefs(bundle));
+  nsresult rv = bundleService->CreateBundle(
+    "chrome://messenger/locale/messengercompose/composeMsgs.properties",
+    getter_AddRefs(bundle));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  va_start (args, code);
+  va_start (args, aCode);
 
-  switch (code)
+  const char16_t* exitString;
+  switch (aCode)
   {
     case NS_ERROR_ILLEGAL_LOCALPART:
-      bundle->GetStringFromName(
-        MOZ_UTF16("errorIllegalLocalPart"),
-        getter_Copies(eMsg));
+      bundle->GetStringFromName(MOZ_UTF16("errorIllegalLocalPart"),
+                                getter_Copies(eMsg));
       msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
       break;
-
-      case NS_ERROR_SMTP_SERVER_ERROR:
-      case NS_ERROR_TCP_READ_ERROR:
-      case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
-      case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
-      case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
-      case NS_ERROR_SENDING_FROM_COMMAND:
-      case NS_ERROR_SENDING_RCPT_COMMAND:
-      case NS_ERROR_SENDING_DATA_COMMAND:
-      case NS_ERROR_SENDING_MESSAGE:
-      case NS_ERROR_SMTP_GREETING:
-         bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
-         msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
-         break;
-      default:
-         bundle->GetStringFromID(NS_ERROR_GET_CODE(NS_ERROR_COMMUNICATIONS_ERROR), getter_Copies(eMsg));
-         msg = nsTextFormatter::smprintf(eMsg.get(), code);
-         break;
+    case NS_ERROR_SMTP_SERVER_ERROR:
+    case NS_ERROR_TCP_READ_ERROR:
+    case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
+    case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
+    case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
+    case NS_ERROR_SENDING_FROM_COMMAND:
+    case NS_ERROR_SENDING_RCPT_COMMAND:
+    case NS_ERROR_SENDING_DATA_COMMAND:
+    case NS_ERROR_SENDING_MESSAGE:
+    case NS_ERROR_SMTP_GREETING:
+      exitString = errorStringNameForErrorCode(aCode);
+      bundle->GetStringFromName(exitString, getter_Copies(eMsg));
+      msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
+      break;
+    default:
+      NS_WARNING("falling to default error code");
+      bundle->GetStringFromName(MOZ_UTF16("communicationsError"), getter_Copies(eMsg));
+      msg = nsTextFormatter::smprintf(eMsg.get(), aCode);
+      break;
   }
 
   if (msg)
@@ -780,7 +783,7 @@
         nsresult rv =
 #endif
         nsExplainErrorDetails(m_runningURL,
-                      NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1, m_sizelimit);
+                              NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1, m_sizelimit);
         NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
 
         m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
@@ -1597,7 +1600,9 @@
 
   if (m_responseCode != 354)
   {
-    nsresult rv = nsExplainErrorDetails(m_runningURL, NS_ERROR_SENDING_DATA_COMMAND, m_responseText.get());
+    nsresult rv = nsExplainErrorDetails(m_runningURL,
+                                        NS_ERROR_SENDING_DATA_COMMAND,
+                                        m_responseText.get());
     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
 
     m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
@@ -1668,7 +1673,9 @@
 {
   if((m_responseCode/10 != 25))
   {
-    nsresult rv = nsExplainErrorDetails(m_runningURL, NS_ERROR_SENDING_MESSAGE, m_responseText.get());
+    nsresult rv = nsExplainErrorDetails(m_runningURL,
+                                        NS_ERROR_SENDING_MESSAGE,
+                                        m_responseText.get());
     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain SMTP error");
 
     m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
@@ -1788,8 +1795,8 @@
           // the mailnews main window, because we don't necessarily get
           // passed down a compose window - we might be sending in the
           // background!
-          rv = nsExplainErrorDetails(m_runningURL, NS_ERROR_ILLEGAL_LOCALPART,
-            start);
+          rv = nsExplainErrorDetails(m_runningURL,
+                                     NS_ERROR_ILLEGAL_LOCALPART, start);
           NS_ASSERTION(NS_SUCCEEDED(rv), "failed to explain illegal localpart");
           m_urlErrorState = NS_ERROR_BUT_DONT_SHOW_ALERT;
           return NS_ERROR_BUT_DONT_SHOW_ALERT;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsURLFetcher.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsURLFetcher.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/compose/src/nsURLFetcher.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/compose/src/nsURLFetcher.cpp	2015-02-28 15:02:41.000000000 +0000
@@ -110,7 +110,7 @@
 } 
 
 NS_IMETHODIMP 
-nsURLFetcher::DoContent(const char * aContentType,
+nsURLFetcher::DoContent(const nsACString& aContentType,
                       bool aIsContentPreferred,
                       nsIRequest *request,
                       nsIStreamListener ** aContentHandler,
@@ -125,14 +125,14 @@
   /*
     Check the content-type to see if we need to insert a converter
   */
-  if (PL_strcasecmp(aContentType, UNKNOWN_CONTENT_TYPE) == 0 ||
-      PL_strcasecmp(aContentType, MULTIPART_MIXED_REPLACE) == 0 ||
-      PL_strcasecmp(aContentType, MULTIPART_MIXED) == 0 ||
-      PL_strcasecmp(aContentType, MULTIPART_BYTERANGES) == 0)
+  if (PL_strcasecmp(PromiseFlatCString(aContentType).get(), UNKNOWN_CONTENT_TYPE) == 0 ||
+      PL_strcasecmp(PromiseFlatCString(aContentType).get(), MULTIPART_MIXED_REPLACE) == 0 ||
+      PL_strcasecmp(PromiseFlatCString(aContentType).get(), MULTIPART_MIXED) == 0 ||
+      PL_strcasecmp(PromiseFlatCString(aContentType).get(), MULTIPART_BYTERANGES) == 0)
   {
-    rv = InsertConverter(aContentType);
+    rv = InsertConverter(PromiseFlatCString(aContentType).get());
     if (NS_SUCCEEDED(rv))
-      mConverterContentType = aContentType;
+      mConverterContentType = PromiseFlatCString(aContentType).get();
   }
 
   return rv;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/db/gloda/modules/index_msg.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/db/gloda/modules/index_msg.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/db/gloda/modules/index_msg.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/db/gloda/modules/index_msg.js	2015-02-28 15:02:41.000000000 +0000
@@ -2787,6 +2787,10 @@
         return;
       if (!GlodaMsgIndexer.shouldIndexFolder(aFolderItem))
         return;
+      // Only reset priority if folder Special Use changes.
+      if ((aOldValue & Ci.nsMsgFolderFlags.SpecialUse) ==
+          (aNewValue & Ci.nsMsgFolderFlags.SpecialUse))
+        return;
       GlodaMsgIndexer.resetFolderIndexingPriority(aFolderItem);
     },
     OnItemBoolPropertyChanged: function gloda_indexer_OnItemBoolPropertyChanged(
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/db/msgdb/public/nsIDBFolderInfo.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/db/msgdb/public/nsIDBFolderInfo.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/db/msgdb/public/nsIDBFolderInfo.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/db/msgdb/public/nsIDBFolderInfo.idl	2015-02-28 15:02:41.000000000 +0000
@@ -6,7 +6,7 @@
 #include "nsISupports.idl"
 #include "MailNewsTypes2.idl"
 
-[scriptable, uuid(538577e4-80e9-4567-8de1-3578efaef62d)]
+[scriptable, uuid(6e49d723-cefe-4dd0-bc98-f62c2f8f7f0f)]
 interface  nsIDBFolderInfo : nsISupports {
   attribute long flags;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/extensions/mdn/src/nsMsgMdnGenerator.cpp	2015-02-28 15:02:42.000000000 +0000
@@ -1076,31 +1076,33 @@
     if (NS_SUCCEEDED(aExitCode))
       return NS_OK;
 
+    const char16_t* exitString;
+
     switch (aExitCode)
-    {    
+    {
       case NS_ERROR_UNKNOWN_HOST:
       case NS_ERROR_UNKNOWN_PROXY_HOST:
-        aExitCode = NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER;
+        exitString = MOZ_UTF16("smtpSendFailedUnknownServer");
         break;
       case NS_ERROR_CONNECTION_REFUSED:
-      case NS_ERROR_PROXY_CONNECTION_REFUSED: 
-        aExitCode = NS_ERROR_SMTP_SEND_FAILED_REFUSED;
+      case NS_ERROR_PROXY_CONNECTION_REFUSED:
+        exitString = MOZ_UTF16("smtpSendRefused");
         break;
       case NS_ERROR_NET_INTERRUPT:
-        aExitCode = NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED;
-        break; 
+        exitString = MOZ_UTF16("smtpSendInterrupted");
+        break;
       case NS_ERROR_NET_TIMEOUT:
       case NS_ERROR_NET_RESET:
-        aExitCode = NS_ERROR_SMTP_SEND_FAILED_TIMEOUT;
+        exitString = MOZ_UTF16("smtpSendTimeout");
         break;
       case NS_ERROR_SMTP_PASSWORD_UNDEFINED:
-        // nothing to do, just keep the code
+        exitString = MOZ_UTF16("smtpPasswordUndefined");
         break;
       default:
         if (aExitCode != NS_ERROR_ABORT && !NS_IS_MSG_ERROR(aExitCode))
-          aExitCode = NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON;
+          exitString = MOZ_UTF16("smtpSendFailedUnknownReason");
       break;
-    }    
+    }
 
     nsCOMPtr<nsISmtpService> smtpService(do_GetService(NS_SMTPSERVICE_CONTRACTID, &rv));
     NS_ENSURE_SUCCESS(rv,rv);
@@ -1109,9 +1111,9 @@
     nsCString smtpHostName;
     nsCOMPtr<nsISmtpServer> smtpServer;
     rv = smtpService->GetServerByIdentity(m_identity, getter_AddRefs(smtpServer));
-    if (NS_SUCCEEDED(rv)) 
+    if (NS_SUCCEEDED(rv))
       smtpServer->GetHostname(smtpHostName);
-     
+
     nsAutoString hostStr;
     CopyASCIItoUTF16(smtpHostName, hostStr);
     const char16_t *params[] = { hostStr.get() };
@@ -1121,12 +1123,14 @@
       mozilla::services::GetStringBundleService();
     NS_ENSURE_TRUE(bundleService, NS_ERROR_UNEXPECTED);
 
-    rv = bundleService->CreateBundle("chrome://messenger/locale/messengercompose/composeMsgs.properties", getter_AddRefs(bundle));
+    rv = bundleService->CreateBundle(
+      "chrome://messenger/locale/messengercompose/composeMsgs.properties",
+      getter_AddRefs(bundle));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsString failed_msg, dialogTitle;
 
-    bundle->FormatStringFromID(NS_ERROR_GET_CODE(aExitCode), params, 1, getter_Copies(failed_msg));
+    bundle->FormatStringFromName(exitString, params, 1, getter_Copies(failed_msg));
     bundle->GetStringFromName(MOZ_UTF16("sendMessageErrorTitle"), getter_Copies(dialogTitle));
 
     nsCOMPtr<nsIPrompt> dialog;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/imap/src/nsImapMailFolder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/imap/src/nsImapMailFolder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/imap/src/nsImapMailFolder.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/imap/src/nsImapMailFolder.cpp	2015-02-28 15:02:42.000000000 +0000
@@ -1766,6 +1766,13 @@
 NS_IMETHODIMP nsImapMailFolder::GetSizeOnDisk(int64_t *size)
 {
   NS_ENSURE_ARG_POINTER(size);
+
+  bool isServer = false;
+  nsresult rv = GetIsServer(&isServer);
+  // If this is the rootFolder, return 0 as a safe value.
+  if (NS_FAILED(rv) || isServer)
+    mFolderSize = 0;
+
   *size = mFolderSize;
   return NS_OK;
 }
@@ -8325,9 +8332,36 @@
   nsresult rv = GetDatabase();
   NS_ENSURE_SUCCESS(rv, rv);
 
+  bool storeOffline = (mFlags & nsMsgFolderFlags::Offline) && !WeAreOffline();
+
   if (msgKey == nsMsgKey_None)
+  {
+    // To support send filters, we need to store the message in the database when
+    // it is copied to the FCC folder. In that case, we know the UID of the
+    // message and therefore have the correct msgKey. In other cases, where
+    // we don't need the offline message copied, don't add to db.
+    if (!storeOffline)
+      return NS_OK;
+
     mDatabase->GetNextFakeOfflineMsgKey(&msgKey);
+  }
+
+  nsCOMPtr<nsIMsgDBHdr> fakeHdr;
+  rv = mDatabase->CreateNewHdr(msgKey, getter_AddRefs(fakeHdr));
+  NS_ENSURE_SUCCESS(rv, rv);
+  fakeHdr->SetUint32Property("pseudoHdr", 1);
 
+  // Should we add this to the offline store?
+  nsCOMPtr<nsIOutputStream> offlineStore;
+  if (storeOffline)
+  {
+    rv = GetOfflineStoreOutputStream(fakeHdr, getter_AddRefs(offlineStore));
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  // We set an offline kMoveResult because in any case we want to update this
+  // msgHdr with one downloaded from the server, with possible additional
+  // headers added.
   nsCOMPtr<nsIMsgOfflineImapOperation> op;
   rv = mDatabase->GetOfflineOpForKey(msgKey, true, getter_AddRefs(op));
   if (NS_SUCCEEDED(rv) && op)
@@ -8336,100 +8370,99 @@
     GetURI(destFolderUri);
     op->SetOperation(nsIMsgOfflineImapOperation::kMoveResult);
     op->SetDestinationFolderURI(destFolderUri.get());
-    nsCOMPtr<nsIMsgDBHdr> fakeHdr;
-    nsCOMPtr<nsIOutputStream> offlineStore;
-    rv = mDatabase->CreateNewHdr(msgKey, getter_AddRefs(fakeHdr));
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = GetOfflineStoreOutputStream(fakeHdr, getter_AddRefs(offlineStore));
     SetFlag(nsMsgFolderFlags::OfflineEvents);
+  }
 
-    if (NS_SUCCEEDED(rv) && offlineStore)
+  nsCOMPtr<nsIInputStream> inputStream;
+  nsCOMPtr<nsIMsgParseMailMsgState> msgParser =
+    do_CreateInstance(NS_PARSEMAILMSGSTATE_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+  msgParser->SetMailDB(mDatabase);
+
+  uint64_t offset = 0;
+  if (offlineStore)
+  {
+    // Tell the parser to use the offset that will be in the dest stream,
+    //   not the temp file.
+    fakeHdr->GetMessageOffset(&offset);
+  }
+  // This will fail for > 4GB mbox folders, see bug 793865
+  msgParser->SetEnvelopePos((uint32_t) offset);
+
+  rv = NS_NewLocalFileInputStream(getter_AddRefs(inputStream), srcFile);
+  if (NS_SUCCEEDED(rv) && inputStream)
+  {
+    // Now, parse the temp file to (optionally) copy to
+    // the offline store for the cur folder.
+    int32_t inputBufferSize = 10240;
+    nsMsgLineStreamBuffer *inputStreamBuffer =
+      new nsMsgLineStreamBuffer(inputBufferSize, true, false);
+    int64_t fileSize;
+    srcFile->GetFileSize(&fileSize);
+    uint32_t bytesWritten;
+    rv = NS_OK;
+    msgParser->SetState(nsIMsgParseMailMsgState::ParseHeadersState);
+    msgParser->SetNewMsgHdr(fakeHdr);
+    bool needMoreData = false;
+    char * newLine = nullptr;
+    uint32_t numBytesInLine = 0;
+    if (offlineStore)
     {
-      int64_t curOfflineStorePos = 0;
-      nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(offlineStore);
-      if (seekable)
-        seekable->Tell(&curOfflineStorePos);
-      else
+      const char *envelope = "From " CRLF;
+      offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
+      fileSize += bytesWritten;
+    }
+    do
+    {
+      newLine = inputStreamBuffer->ReadNextLine(inputStream, numBytesInLine, needMoreData);
+      if (newLine)
       {
-        NS_ERROR("needs to be a random store!");
-        return NS_ERROR_FAILURE;
-      }
-
-      nsCOMPtr<nsIInputStream> inputStream;
-      nsCOMPtr<nsIMsgParseMailMsgState> msgParser =
-        do_CreateInstance(NS_PARSEMAILMSGSTATE_CONTRACTID, &rv);
-      msgParser->SetMailDB(mDatabase);
-
-      // Tell the parser to use the offset that will be in the dest stream, not the
-      //  temp file.
-      uint64_t offset;
-      fakeHdr->GetMessageOffset(&offset);
-      // This will fail for > 4GB mbox folders, see bug 793865
-      msgParser->SetEnvelopePos((uint32_t) offset);
-
-      rv = NS_NewLocalFileInputStream(getter_AddRefs(inputStream), srcFile);
-      if (NS_SUCCEEDED(rv) && inputStream)
-      {
-        // now, copy the temp file to the offline store for the cur folder.
-        int32_t inputBufferSize = 10240;
-        nsMsgLineStreamBuffer *inputStreamBuffer =
-          new nsMsgLineStreamBuffer(inputBufferSize, true, false);
-        int64_t fileSize;
-        srcFile->GetFileSize(&fileSize);
-        uint32_t bytesWritten;
-        rv = NS_OK;
-        msgParser->SetState(nsIMsgParseMailMsgState::ParseHeadersState);
-        msgParser->SetNewMsgHdr(fakeHdr);
-        bool needMoreData = false;
-        char * newLine = nullptr;
-        uint32_t numBytesInLine = 0;
-        const char *envelope = "From " CRLF;
-        offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
-        fileSize += bytesWritten;
-        do
-        {
-          newLine = inputStreamBuffer->ReadNextLine(inputStream, numBytesInLine, needMoreData);
-          if (newLine)
-          {
-            msgParser->ParseAFolderLine(newLine, numBytesInLine);
-            rv = offlineStore->Write(newLine, numBytesInLine, &bytesWritten);
-            NS_Free(newLine);
-          }
-        } while (newLine);
-
-        msgParser->FinishHeader();
-        uint32_t resultFlags;
-        fakeHdr->OrFlags(nsMsgMessageFlags::Offline | nsMsgMessageFlags::Read, &resultFlags);
-        fakeHdr->SetOfflineMessageSize(fileSize);
-        fakeHdr->SetUint32Property("pseudoHdr", 1);
-        mDatabase->AddNewHdrToDB(fakeHdr, true /* notify */);
-        SetFlag(nsMsgFolderFlags::OfflineEvents);
-
-        // Call FinishNewMessage before setting pending attributes, as in
-        //   maildir it copies from tmp to cur and may change the storeToken
-        //   to get a unique filename.
-        nsCOMPtr<nsIMsgPluggableStore> msgStore;
-        GetMsgStore(getter_AddRefs(msgStore));
-        if (msgStore)
-          msgStore->FinishNewMessage(offlineStore, fakeHdr);
+        msgParser->ParseAFolderLine(newLine, numBytesInLine);
+        if (offlineStore)
+          rv = offlineStore->Write(newLine, numBytesInLine, &bytesWritten);
 
-        nsCOMPtr<nsIMutableArray> messages(do_CreateInstance(NS_ARRAY_CONTRACTID, &rv));
+        NS_Free(newLine);
         NS_ENSURE_SUCCESS(rv, rv);
-        messages->AppendElement(fakeHdr, false);
-
-        SetPendingAttributes(messages, false);
-        // Gloda needs this notification to index the fake message.
-        nsCOMPtr<nsIMsgFolderNotificationService>
-          notifier(do_GetService(NS_MSGNOTIFICATIONSERVICE_CONTRACTID));
-        if (notifier)
-          notifier->NotifyMsgsClassified(messages, false, false);
-        inputStream->Close();
-        inputStream = nullptr;
-        delete inputStreamBuffer;
       }
-      offlineStore->Close();
+    } while (newLine);
+
+    msgParser->FinishHeader();
+    uint32_t resultFlags;
+    if (offlineStore)
+      fakeHdr->OrFlags(nsMsgMessageFlags::Offline | nsMsgMessageFlags::Read, &resultFlags);
+    else
+      fakeHdr->OrFlags(nsMsgMessageFlags::Read, &resultFlags);
+    if (offlineStore)          
+      fakeHdr->SetOfflineMessageSize(fileSize);
+    mDatabase->AddNewHdrToDB(fakeHdr, true /* notify */);
+
+    // Call FinishNewMessage before setting pending attributes, as in
+    //   maildir it copies from tmp to cur and may change the storeToken
+    //   to get a unique filename.
+    if (offlineStore)
+    {
+      nsCOMPtr<nsIMsgPluggableStore> msgStore;
+      GetMsgStore(getter_AddRefs(msgStore));
+      if (msgStore)
+        msgStore->FinishNewMessage(offlineStore, fakeHdr);
     }
+
+    nsCOMPtr<nsIMutableArray> messages(do_CreateInstance(NS_ARRAY_CONTRACTID, &rv));
+    NS_ENSURE_SUCCESS(rv, rv);
+    messages->AppendElement(fakeHdr, false);
+
+    SetPendingAttributes(messages, false);
+    // Gloda needs this notification to index the fake message.
+    nsCOMPtr<nsIMsgFolderNotificationService>
+      notifier(do_GetService(NS_MSGNOTIFICATIONSERVICE_CONTRACTID));
+    if (notifier)
+      notifier->NotifyMsgsClassified(messages, false, false);
+    inputStream->Close();
+    inputStream = nullptr;
+    delete inputStreamBuffer;
   }
+  if (offlineStore)
+    offlineStore->Close();
   return rv;
 }
 
@@ -8441,7 +8474,7 @@
   if (NS_SUCCEEDED(rv) && m_copyState)
   {
     nsCOMPtr<nsIFile> srcFile(do_QueryInterface(srcSupport));
-    if (srcFile && (mFlags & nsMsgFolderFlags::Offline) && !WeAreOffline())
+    if (srcFile)
       (void) CopyFileToOfflineStore(srcFile, m_copyState->m_appendUID);
   }
   m_copyState = nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/imap/src/nsImapMailFolder.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/imap/src/nsImapMailFolder.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/imap/src/nsImapMailFolder.h	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/imap/src/nsImapMailFolder.h	2015-02-28 15:02:42.000000000 +0000
@@ -365,6 +365,14 @@
   nsresult  NormalEndHeaderParseStream(nsIImapProtocol *aProtocol, nsIImapUrl *imapUrl);
 
   void EndOfflineDownload();
+
+  /**
+   * At the end of a file-to-folder copy operation, copy the file to the
+   * offline store and/or add to the message database, (if needed).
+   *
+   * @param srcFile       file containing the message key
+   * @param msgKey        key to use for the new messages
+   */   
   nsresult CopyFileToOfflineStore(nsIFile *srcFile, nsMsgKey msgKey);
 
   nsresult MarkMessagesImapDeleted(nsTArray<nsMsgKey> *keyArray, bool deleted, nsIMsgDatabase *db);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/intl/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/intl/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/intl/Makefile.in	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/intl/Makefile.in	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/.
-
-include $(topsrcdir)/config/rules.mk
-
-PROPS2ARRAYS := $(MOZILLA_DIR)/intl/locale/props2arrays.py
-charsetalias.properties.h: $(PROPS2ARRAYS) charsetalias.properties
-	$(PYTHON) $^ $@
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/intl/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/intl/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/intl/moz.build	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/intl/moz.build	2015-02-28 15:02:42.000000000 +0000
@@ -26,6 +26,9 @@
 GENERATED_FILES += [
     'charsetalias.properties.h',
 ]
+charsetalias = GENERATED_FILES['charsetalias.properties.h']
+charsetalias.script = TOPSRCDIR + '/mozilla/intl/locale/props2arrays.py'
+charsetalias.inputs = ['charsetalias.properties']
 
 MSVC_ENABLE_PGO = True
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/local/src/nsLocalMailFolder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/local/src/nsLocalMailFolder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/local/src/nsLocalMailFolder.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/local/src/nsLocalMailFolder.cpp	2015-02-28 15:02:42.000000000 +0000
@@ -1114,7 +1114,13 @@
 NS_IMETHODIMP nsMsgLocalMailFolder::GetSizeOnDisk(int64_t *aSize)
 {
   NS_ENSURE_ARG_POINTER(aSize);
-  nsresult rv = NS_OK;
+
+  bool isServer = false;
+  nsresult rv = GetIsServer(&isServer);
+  // If this is the rootFolder, return 0 as a safe value.
+  if (NS_FAILED(rv) || isServer)
+    mFolderSize = 0;
+
   if (mFolderSize == kSizeUnknown)
   {
     nsCOMPtr<nsIFile> file;
@@ -1129,7 +1135,7 @@
     mFolderSize = folderSize;
   }
   *aSize = mFolderSize;
-  return rv;
+  return NS_OK;
 }
 
 nsresult
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/local/src/nsParseMailbox.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/local/src/nsParseMailbox.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/local/src/nsParseMailbox.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/local/src/nsParseMailbox.cpp	2015-02-28 15:02:42.000000000 +0000
@@ -937,7 +937,7 @@
     struct message_header *header = 0;
     struct message_header receivedBy;
 
-    if (! colon)
+    if (!colon)
       break;
 
     end = colon;
@@ -1477,7 +1477,7 @@
       rv = InternSubject (subject);
       if (NS_SUCCEEDED(rv))
       {
-        if (! id)
+        if (!id)
         {
           // what to do about this? we used to do a hash of all the headers...
           nsAutoCString hash;
@@ -1827,6 +1827,7 @@
                 m_mailDB->RemoveHeaderMdbRow(m_newMsgHdr);
               }
               break;
+
             case nsIMsgIncomingServer::moveDupsToTrash:
               {
                 nsCOMPtr <nsIMsgFolder> trash;
@@ -1840,10 +1841,13 @@
                   if (NS_SUCCEEDED(rv))
                     rv = msgStore->MoveNewlyDownloadedMessage(m_newMsgHdr, trash, &msgMoved);
                   if (NS_SUCCEEDED(rv) && !msgMoved) {
-                    MoveIncorporatedMessage(m_newMsgHdr, m_mailDB, trash,
+                    rv = MoveIncorporatedMessage(m_newMsgHdr, m_mailDB, trash,
                                             nullptr, msgWindow);
-                    m_mailDB->RemoveHeaderMdbRow(m_newMsgHdr);
+                    if (NS_SUCCEEDED(rv))
+                      rv = m_mailDB->RemoveHeaderMdbRow(m_newMsgHdr);
                   }
+                  if (NS_FAILED(rv))
+                    NS_WARNING("moveDupsToTrash failed for some reason.");
                 }
               }
               break;
@@ -2017,6 +2021,9 @@
           msgHdr->OrFlags(nsMsgMessageFlags::Read, &newFlags); // mark read in trash.
           msgIsNew = false;
         }
+
+        // FALLTHROUGH
+
       case nsMsgFilterAction::MoveToFolder:
         // if moving to a different file, do it.
         if (actionTargetFolderUri.get() && !m_inboxUri.Equals(actionTargetFolderUri,
@@ -2034,7 +2041,7 @@
           if (NS_FAILED(err))
             return err;
           bool msgMoved = false;
-          // if we're moving to an imap folder, or this message has already 
+          // If we're moving to an imap folder, or this message has already
           // has a pending copy action, use the imap coalescer so that
           // we won't truncate the inbox before the copy fires.
           if (m_msgCopiedByFilter ||
@@ -2059,10 +2066,17 @@
               err = MoveIncorporatedMessage(msgHdr, m_mailDB, destIFolder,
                                             filter, msgWindow);
             m_msgMovedByFilter = NS_SUCCEEDED(err);
+            if (!m_msgMovedByFilter /* == NS_FAILED(err) */)
+            {
+              // XXX: Invoke MSG_LOG_TO_CONSOLE once bug 1135265 lands.
+              if (loggingEnabled)
+                (void) filter->LogRuleHitFail(filterAction, msgHdr, err, "Move failed");
+            }
           }
         }
         *applyMore = false;
         break;
+
         case nsMsgFilterAction::CopyToFolder:
         {
           nsCString uri;
@@ -2074,17 +2088,28 @@
             messageArray->AppendElement(msgHdr, false);
 
             nsCOMPtr<nsIMsgFolder> dstFolder;
+            nsCOMPtr<nsIMsgCopyService> copyService;
             rv = GetExistingFolder(actionTargetFolderUri,
                                    getter_AddRefs(dstFolder));
-            NS_ENSURE_SUCCESS(rv, rv);
-
-            nsCOMPtr<nsIMsgCopyService> copyService =
-              do_GetService(NS_MSGCOPYSERVICE_CONTRACTID, &rv);
-            NS_ENSURE_SUCCESS(rv, rv);
-            rv = copyService->CopyMessages(m_downloadFolder, messageArray, dstFolder,
-                                           false, nullptr, msgWindow, false);
-            NS_ENSURE_SUCCESS(rv, rv);
-            m_msgCopiedByFilter = true;
+            if (NS_SUCCEEDED(rv)) {
+              copyService = do_GetService(NS_MSGCOPYSERVICE_CONTRACTID, &rv);
+            }
+            else {
+              // Let's show a more specific warning.
+              NS_WARNING("Target Folder does not exist.");
+              return rv;
+            }
+            if (NS_SUCCEEDED(rv))
+              rv = copyService->CopyMessages(m_downloadFolder, messageArray, dstFolder,
+                                             false, nullptr, msgWindow, false);
+
+            if (NS_FAILED(rv)) {
+              // XXX: Invoke MSG_LOG_TO_CONSOLE once bug 1135265 lands.
+              if (loggingEnabled)
+                (void) filter->LogRuleHitFail(filterAction, msgHdr, rv, "Copy failed");
+            }
+            else
+              m_msgCopiedByFilter = true;
           }
         }
         break;
@@ -2231,15 +2256,25 @@
         nsCOMPtr<nsIMutableArray> messageArray(
             do_CreateInstance(NS_ARRAY_CONTRACTID, &rv));
         NS_ENSURE_TRUE(messageArray, rv);
-        messageArray->AppendElement(msgHdr, false);
+        if (NS_SUCCEEDED(rv))
+          rv = messageArray->AppendElement(msgHdr, false);
+
 
-        customAction->Apply(messageArray, value, nullptr,
-                            nsMsgFilterType::InboxRule, msgWindow);
+        if (NS_SUCCEEDED(rv))
+          rv = customAction->Apply(messageArray, value, nullptr,
+                                   nsMsgFilterType::InboxRule, msgWindow);
+        if (NS_FAILED(rv)) {
+            // XXX: Invoke MSG_LOG_TO_CONSOLE once bug 1135265 lands.
+            if (loggingEnabled)
+              (void) filter->LogRuleHitFail(filterAction, msgHdr, rv, "Copy failed");
+        }
       }
       break;
 
 
       default:
+        // XXX should not be reached. Check in debug build.
+        NS_ERROR("This default should not be reached.");
         break;
       }
     }
@@ -2570,4 +2605,3 @@
   destMailDB->Commit(nsMsgDBCommitType::kLargeCommit);
   return rv;
 }
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/mailnews.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/mailnews.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/mailnews.js	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/mailnews.js	2015-02-28 15:02:42.000000000 +0000
@@ -370,7 +370,6 @@
 pref("mail.collect_email_address_newsgroup", false);
 #endif
 pref("mail.collect_email_address_outgoing", true);
-
 // by default, use the Collected Addressbook for collection
 pref("mail.collect_addressbook", "moz-abmdbdirectory://history.mab");
 
@@ -460,6 +459,9 @@
 // -1 means no limit, no purging of offline stores.
 pref("mail.server.default.autosync_max_age_days", -1);
 
+// can we change the store type?
+pref("mail.server.default.canChangeStoreType", false);
+
 // This is the default store contractID for newly created servers.
 // We don't use mail.server.default because we want to ensure that the
 // store contract id is always written out to prefs.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/news/public/nsINNTPArticleList.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/news/public/nsINNTPArticleList.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/news/public/nsINNTPArticleList.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/news/public/nsINNTPArticleList.idl	2015-02-28 15:02:42.000000000 +0000
@@ -8,7 +8,7 @@
 
 interface nsIMsgNewsFolder;
 
-[scriptable, uuid(921AC214-96B5-11d2-B7EB-00805F05FFA5)]
+[scriptable, uuid(043d9dd4-b133-4eb4-a1a8-71abff69b613)]
 interface nsINNTPArticleList : nsISupports {
     void initialize(in nsIMsgNewsFolder newsFolder);
     void addArticleKey(in nsMsgKey key);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/news/public/nsINntpUrl.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/news/public/nsINntpUrl.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/news/public/nsINntpUrl.idl	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/news/public/nsINntpUrl.idl	2015-02-28 15:02:42.000000000 +0000
@@ -33,7 +33,7 @@
  * * Some actions require either a group or a message id. Since actions can be
  *   set after the fact, these conditions are not verified.
  */
-[scriptable, uuid(5f250c8c-d6b7-48b7-8ff4-7ff51dba19ae)]
+[scriptable, uuid(ef920ca3-9c46-48b8-9fa3-cb430d3681ea)]
 interface nsINntpUrl : nsISupports {
   /// For ActionPostArticle URIs, the message to be posted.
   attribute nsINNTPNewsgroupPost messageToPost;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/news/src/nsNewsFolder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/news/src/nsNewsFolder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mailnews/news/src/nsNewsFolder.cpp	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mailnews/news/src/nsNewsFolder.cpp	2015-02-28 15:02:42.000000000 +0000
@@ -761,8 +761,14 @@
 {
   NS_ENSURE_ARG_POINTER(size);
 
+  bool isServer = false;
+  nsresult rv = GetIsServer(&isServer);
+  // If this is the rootFolder, return 0 as a safe value.
+  if (NS_FAILED(rv) || isServer)
+    mFolderSize = 0;
+
   // 0 is a valid folder size (meaning empty file with no offline messages),
-  // but 1 is not. So use 1 as a special value meaning no file size was fetched
+  // but 1 is not. So use -1 as a special value meaning no file size was fetched
   // from disk yet.
   if (mFolderSize == kSizeUnknown)
   {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/atk/nsMaiInterfaceText.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/atk/nsMaiInterfaceText.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/atk/nsMaiInterfaceText.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/atk/nsMaiInterfaceText.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -330,12 +330,17 @@
 getCharacterCountCB(AtkText *aText)
 {
   AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aText));
-  if (!accWrap)
-    return 0;
+  if (accWrap) {
+    HyperTextAccessible* textAcc = accWrap->AsHyperText();
+    return
+      textAcc->IsDefunct() ? 0 : static_cast<gint>(textAcc->CharacterCount());
+  }
+
+  if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aText))) {
+    return proxy->CharacterCount();
+  }
 
-  HyperTextAccessible* textAcc = accWrap->AsHyperText();
-  return textAcc->IsDefunct() ?
-    0 : static_cast<gint>(textAcc->CharacterCount());
+  return 0;
 }
 
 static gint
@@ -362,14 +367,20 @@
 getTextSelectionCountCB(AtkText *aText)
 {
   AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aText));
-  if (!accWrap)
-    return 0;
-
-  HyperTextAccessible* text = accWrap->AsHyperText();
-  if (!text || !text->IsTextRole())
-    return 0;
+  if (accWrap) {
+    HyperTextAccessible* text = accWrap->AsHyperText();
+    if (!text || !text->IsTextRole()) {
+      return 0;
+    }
+
+    return text->SelectionCount();
+  }
+
+  if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aText))) {
+    return proxy->SelectionCount();
+  }
 
-  return text->SelectionCount();
+  return 0;
 }
 
 static gchar*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/AccEvent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/AccEvent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/AccEvent.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/AccEvent.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -139,7 +139,7 @@
 bool
 AccTextSelChangeEvent::IsCaretMoveOnly() const
 {
-  return mSel->GetRangeCount() == 1 && mSel->IsCollapsed() &&
+  return mSel->RangeCount() == 1 && mSel->IsCollapsed() &&
     ((mReason & (nsISelectionListener::COLLAPSETOSTART_REASON |
                  nsISelectionListener::COLLAPSETOEND_REASON)) == 0);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/ARIAMap.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/ARIAMap.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/ARIAMap.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/ARIAMap.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -366,6 +366,16 @@
     kNoReqStates,
     eARIACheckableBool
   },
+  { // none
+    &nsGkAtoms::none,
+    roles::NOTHING,
+    kUseMapRole,
+    eNoValue,
+    eNoAction,
+    eNoLiveAttr,
+    kGenericAccType,
+    kNoReqStates
+  },
   { // note
     &nsGkAtoms::note_,
     roles::NOTE,
@@ -530,6 +540,17 @@
     kGenericAccType,
     kNoReqStates
   },
+  { // switch
+    &nsGkAtoms::_switch,
+    roles::SWITCH,
+    kUseMapRole,
+    eNoValue,
+    eCheckUncheckAction,
+    eNoLiveAttr,
+    kGenericAccType,
+    kNoReqStates,
+    eARIACheckableBool
+  },
   { // tab
     &nsGkAtoms::tab,
     roles::PAGETAB,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/nsAccCache.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/nsAccCache.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/nsAccCache.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/nsAccCache.h	2015-02-28 15:03:00.000000000 +0000
@@ -20,11 +20,22 @@
 ClearCacheEntry(const void* aKey, nsRefPtr<T>& aAccessible, void* aUserArg)
 {
   NS_ASSERTION(aAccessible, "Calling ClearCacheEntry with a nullptr pointer!");
-  if (aAccessible)
+  if (aAccessible && !aAccessible->IsDefunct())
     aAccessible->Shutdown();
 
   return PL_DHASH_REMOVE;
 }
+
+template <class T>
+static PLDHashOperator
+UnbindCacheEntryFromDocument(const void* aKey, nsRefPtr<T>& aAccessible,
+                             void* aUserArg)
+{
+  MOZ_ASSERT(aAccessible && !aAccessible->IsDefunct());
+  aAccessible->Document()->UnbindFromDocument(aAccessible);
+
+  return PL_DHASH_REMOVE;
+}
 
 /**
  * Clear the cache and shutdown the accessibles.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/nsAccessibilityService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/nsAccessibilityService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/nsAccessibilityService.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/nsAccessibilityService.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -962,7 +962,9 @@
   // If the element is focusable or global ARIA attribute is applied to it or
   // it is referenced by ARIA relationship then treat role="presentation" on
   // the element as the role is not there.
-  if (roleMapEntry && roleMapEntry->Is(nsGkAtoms::presentation)) {
+  if (roleMapEntry &&
+      (roleMapEntry->Is(nsGkAtoms::presentation) ||
+       roleMapEntry->Is(nsGkAtoms::none))) {
     if (!MustBeAccessible(content, document))
       return nullptr;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/Role.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/Role.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/Role.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/Role.h	2015-02-28 15:03:00.000000000 +0000
@@ -785,7 +785,12 @@
    */
   KEY = 129,
 
-  LAST_ROLE = KEY
+  /**
+   * Represent a switch control widget (ARIA role "switch").
+   */
+  SWITCH = 130,
+
+  LAST_ROLE = SWITCH
 };
 
 } // namespace role
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/RoleMap.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/RoleMap.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/base/RoleMap.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/base/RoleMap.h	2015-02-28 15:03:00.000000000 +0000
@@ -1055,3 +1055,11 @@
      ROLE_SYSTEM_PUSHBUTTON,
      ROLE_SYSTEM_PUSHBUTTON,
      eNameFromSubtreeRule)
+
+ROLE(SWITCH,
+     "switch",
+     ATK_ROLE_TOGGLE_BUTTON,
+     NSAccessibilityCheckBoxRole,
+     ROLE_SYSTEM_CHECKBUTTON,
+     IA2_ROLE_TOGGLE_BUTTON,
+     eNameFromSubtreeRule)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/generic/HyperTextAccessible.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/generic/HyperTextAccessible.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/generic/HyperTextAccessible.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/generic/HyperTextAccessible.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -1169,7 +1169,7 @@
   NS_ENSURE_STATE(domSel);
 
   // Set up the selection.
-  for (int32_t idx = domSel->GetRangeCount() - 1; idx > 0; idx--)
+  for (int32_t idx = domSel->RangeCount() - 1; idx > 0; idx--)
     domSel->RemoveRange(domSel->GetRangeAt(idx));
   SetSelectionBoundsAt(0, aStartPos, aEndPos);
 
@@ -1474,7 +1474,7 @@
     return false;
 
   nsRefPtr<nsRange> range;
-  uint32_t rangeCount = domSel->GetRangeCount();
+  uint32_t rangeCount = domSel->RangeCount();
   if (aSelectionNum == static_cast<int32_t>(rangeCount))
     range = new nsRange(mContent);
   else
@@ -1502,7 +1502,7 @@
   if (!domSel)
     return false;
 
-  if (aSelectionNum < 0 || aSelectionNum >= domSel->GetRangeCount())
+  if (aSelectionNum < 0 || aSelectionNum >= static_cast<int32_t>(domSel->RangeCount()))
     return false;
 
   domSel->RemoveRange(domSel->GetRangeAt(aSelectionNum));
@@ -1948,7 +1948,7 @@
   if (!domSel)
     return;
 
-  int32_t rangeCount = domSel->GetRangeCount();
+  int32_t rangeCount = domSel->RangeCount();
   if (rangeCount <= 0)
     return;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/generic/HyperTextAccessible-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/generic/HyperTextAccessible-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/generic/HyperTextAccessible-inl.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/generic/HyperTextAccessible-inl.h	2015-02-28 15:03:00.000000000 +0000
@@ -49,7 +49,7 @@
 {
   dom::Selection* domSel = DOMSelection();
   return domSel &&
-    SetSelectionBoundsAt(domSel->GetRangeCount(), aStartOffset, aEndOffset);
+    SetSelectionBoundsAt(domSel->RangeCount(), aStartOffset, aEndOffset);
 }
 
 inline void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/html/HTMLSelectAccessible.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/html/HTMLSelectAccessible.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/html/HTMLSelectAccessible.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/html/HTMLSelectAccessible.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -381,6 +381,17 @@
     mListAccessible->InvalidateChildren();
 }
 
+bool
+HTMLComboboxAccessible::RemoveChild(Accessible* aChild)
+{
+  MOZ_ASSERT(aChild == mListAccessible);
+  if (AccessibleWrap::RemoveChild(aChild)) {
+    mListAccessible = nullptr;
+    return true;
+  }
+  return false;
+}
+
 void
 HTMLComboboxAccessible::CacheChildren()
 {
@@ -409,12 +420,10 @@
 void
 HTMLComboboxAccessible::Shutdown()
 {
-  AccessibleWrap::Shutdown();
+  MOZ_ASSERT(mDoc->IsDefunct() || !mListAccessible);
+  mListAccessible = nullptr;
 
-  if (mListAccessible) {
-    mListAccessible->Shutdown();
-    mListAccessible = nullptr;
-  }
+  AccessibleWrap::Shutdown();
 }
 
 uint64_t
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/html/HTMLSelectAccessible.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/html/HTMLSelectAccessible.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/html/HTMLSelectAccessible.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/html/HTMLSelectAccessible.h	2015-02-28 15:03:00.000000000 +0000
@@ -174,6 +174,7 @@
   virtual a11y::role NativeRole() MOZ_OVERRIDE;
   virtual uint64_t NativeState() MOZ_OVERRIDE;
   virtual void InvalidateChildren() MOZ_OVERRIDE;
+  virtual bool RemoveChild(Accessible* aChild) MOZ_OVERRIDE;
 
   // ActionAccessible
   virtual uint8_t ActionCount() MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/interfaces/nsIAccessibleRole.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/interfaces/nsIAccessibleRole.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/interfaces/nsIAccessibleRole.idl	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/interfaces/nsIAccessibleRole.idl	2015-02-28 15:03:00.000000000 +0000
@@ -8,7 +8,7 @@
 /**
  * Defines cross platform (Gecko) roles.
  */
-[scriptable, uuid(50db5e86-9a45-4637-a5c3-4ff148c33270)]
+[scriptable, uuid(76ce835f-ef86-47c0-ac7b-e871417f1b6e)]
 interface nsIAccessibleRole : nsISupports
 {
   /**
@@ -778,4 +778,9 @@
    * A keyboard or keypad key.
    */
   const unsigned long ROLE_KEY = 129;
+
+  /**
+   * A switch control widget.
+   */
+  const unsigned long ROLE_SWITCH = 130;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/DocAccessibleChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/DocAccessibleChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/DocAccessibleChild.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/DocAccessibleChild.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -208,6 +208,22 @@
 }
 
 bool
+DocAccessibleChild::RecvCharacterCount(const uint64_t& aID, int32_t* aCount)
+{
+  HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
+  *aCount = acc ? acc->CharacterCount() : 0;
+  return true;
+}
+
+bool
+DocAccessibleChild::RecvSelectionCount(const uint64_t& aID, int32_t* aCount)
+{
+  HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
+  *aCount = acc ? acc->SelectionCount() : 0;
+  return true;
+}
+
+bool
 DocAccessibleChild::RecvTextSubstring(const uint64_t& aID,
                                       const int32_t& aStartOffset,
                                       const int32_t& aEndOffset,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/DocAccessibleChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/DocAccessibleChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/DocAccessibleChild.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/DocAccessibleChild.h	2015-02-28 15:03:00.000000000 +0000
@@ -63,6 +63,12 @@
 
   virtual bool RecvAttributes(const uint64_t& aID,
                               nsTArray<Attribute> *aAttributes) MOZ_OVERRIDE;
+
+  virtual bool RecvCharacterCount(const uint64_t& aID, int32_t* aCount)
+     MOZ_OVERRIDE;
+  virtual bool RecvSelectionCount(const uint64_t& aID, int32_t* aCount)
+     MOZ_OVERRIDE;
+
   virtual bool RecvTextSubstring(const uint64_t& aID,
                                  const int32_t& aStartOffset,
                                  const int32_t& aEndOffset, nsString* aText)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/PDocAccessible.ipdl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/PDocAccessible.ipdl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/PDocAccessible.ipdl	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/PDocAccessible.ipdl	2015-02-28 15:03:00.000000000 +0000
@@ -65,6 +65,8 @@
   // AccessibleText
 
   // TextSubstring is getText in IDL.
+  prio(high) sync CharacterCount(uint64_t aID) returns(int32_t aCount);
+  prio(high) sync SelectionCount(uint64_t aID) returns(int32_t aCount);
   prio(high) sync TextSubstring(uint64_t aID, int32_t aStartOffset, int32_t
                                 aEndOffset) returns(nsString aText);
   prio(high) sync GetTextAfterOffset(uint64_t aID, int32_t aOffset, int32_t aBoundaryType)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/ProxyAccessible.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/ProxyAccessible.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/ProxyAccessible.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/ProxyAccessible.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -149,6 +149,22 @@
   }
 }
 
+int32_t
+ProxyAccessible::CharacterCount()
+{
+  int32_t count = 0;
+  unused << mDoc->SendCharacterCount(mID, &count);
+  return count;
+}
+
+int32_t
+ProxyAccessible::SelectionCount()
+{
+  int32_t count = 0;
+  unused << mDoc->SendSelectionCount(mID, &count);
+  return count;
+}
+
 void
 ProxyAccessible::TextSubstring(int32_t aStartOffset, int32_t aEndOfset,
                                nsString& aText) const
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/ProxyAccessible.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/ProxyAccessible.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/ipc/ProxyAccessible.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/ipc/ProxyAccessible.h	2015-02-28 15:03:00.000000000 +0000
@@ -99,6 +99,9 @@
   void Relations(nsTArray<RelationType>* aTypes,
                  nsTArray<nsTArray<ProxyAccessible*>>* aTargetSets) const;
 
+  int32_t CharacterCount();
+  int32_t SelectionCount();
+
   /**
    * Get the text between the given offsets.
    */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/jsat/OutputGenerator.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/jsat/OutputGenerator.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/jsat/OutputGenerator.jsm	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/jsat/OutputGenerator.jsm	2015-02-28 15:03:00.000000000 +0000
@@ -223,7 +223,7 @@
   },
 
   _getOutputName: function _getOutputName(aName) {
-    return aName.replace(' ', '');
+    return aName.replace(/\s/g, '');
   },
 
   roleRuleMap: {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/jsat/Presentation.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/jsat/Presentation.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/jsat/Presentation.jsm	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/jsat/Presentation.jsm	2015-02-28 15:03:00.000000000 +0000
@@ -320,17 +320,19 @@
   function AndroidPresenter_actionInvoked(aObject, aActionName) {
     let state = Utils.getState(aObject);
 
-    // Checkable objects will have a state changed event we will use instead.
-    if (state.contains(States.CHECKABLE)) {
-      return null;
+    // Checkable objects use TalkBack's text derived from the event state,
+    // so we don't populate the text here.
+    let text = '';
+    if (!state.contains(States.CHECKABLE)) {
+      text = Utils.localize(UtteranceGenerator.genForAction(aObject,
+        aActionName));
     }
 
     return {
       type: this.type,
       details: [{
         eventType: this.ANDROID_VIEW_CLICKED,
-        text: Utils.localize(UtteranceGenerator.genForAction(aObject,
-          aActionName)),
+        text: text,
         checked: state.contains(States.CHECKED)
       }]
     };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/jsat/Utils.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/jsat/Utils.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/jsat/Utils.jsm	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/jsat/Utils.jsm	2015-02-28 15:03:00.000000000 +0000
@@ -848,7 +848,8 @@
         hints.push(hint);
       } else if (aAccessible.actionCount > 0) {
         hints.push({
-          string: Utils.AccRetrieval.getStringRole(aAccessible.role) + '-hint'
+          string: Utils.AccRetrieval.getStringRole(
+            aAccessible.role).replace(/\s/g, '') + '-hint'
         });
       }
     });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/mac/mozAccessible.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/mac/mozAccessible.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/mac/mozAccessible.mm	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/mac/mozAccessible.mm	2015-02-28 15:03:00.000000000 +0000
@@ -475,6 +475,9 @@
     case roles::DEFINITION:
       return @"AXDefinition";
 
+    case roles::SWITCH:
+      return @"AXSwitch";
+
     default:
       break;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/actions/test_aria.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/actions/test_aria.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/actions/test_aria.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/actions/test_aria.html	2015-02-28 15:03:00.000000000 +0000
@@ -86,6 +86,16 @@
           events: CLICK_EVENTS
         },
         {
+          ID: "switch_unchecked",
+          actionName: "check",
+          events: CLICK_EVENTS
+        },
+        {
+          ID: "switch_checked",
+          actionName: "uncheck",
+          events: CLICK_EVENTS
+        },
+        {
           ID: "tab",
           actionName: "switch",
           events: CLICK_EVENTS
@@ -166,6 +176,10 @@
     <div id="radio" role="radio">Radio</div>
   </div>
 
+  <div id="switch_unchecked" role="switch">Switch</div>
+
+  <div id="switch_checked" role="switch" aria-checked="true">Switch</div>
+
   <div role="tablist">
     <div id="tab" role="tab">Tab</div>
   </div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/common.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/common.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/common.js	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/common.js	2015-02-28 15:03:00.000000000 +0000
@@ -213,7 +213,7 @@
   var elm = null;
 
   if (aAccOrElmOrID instanceof nsIAccessible) {
-    elm = aAccOrElmOrID.DOMNode;
+    try { elm = aAccOrElmOrID.DOMNode; } catch(e) { }
 
   } else if (aAccOrElmOrID instanceof nsIDOMNode) {
     elm = aAccOrElmOrID;
@@ -700,8 +700,9 @@
 
   if (aIdentifier instanceof nsIAccessible) {
     var acc = getAccessible(aIdentifier);
-    var msg = "[" + getNodePrettyName(acc.DOMNode);
+    var msg = "[";
     try {
+      msg += getNodePrettyName(acc.DOMNode);
       msg += ", role: " + roleToString(acc.role);
       if (acc.name)
         msg += ", name: '" + shortenString(acc.name) + "'";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/elm/test_canvas.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/elm/test_canvas.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/elm/test_canvas.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/elm/test_canvas.html	2015-02-28 15:03:00.000000000 +0000
@@ -18,8 +18,6 @@
           src="../layout.js"></script>
 
   <script type="application/javascript">
-  SpecialPowers.setBoolPref("canvas.hitregions.enabled", true);
-
     function doTest()
     {
       var canv = document.getElementById("c");
@@ -36,14 +34,15 @@
       is(accY, cnvY + 10, "accY should be 10 and not " + accY);
       is(accWidth, 150, "accWidth should be 150 and not " + accWidth);
       is(accHeight, 100, "accHeight should be 100 and not " + accHeight);
-
-      SpecialPowers.setBoolPref("canvas.hitregions.enabled", false);
       SimpleTest.finish();
     }
 
     SimpleTest.waitForExplicitFinish();
-    addA11yLoadEvent(doTest);
-  </script>
+    addA11yLoadEvent(function() {
+      SpecialPowers.pushPrefEnv({"set": [['canvas.hitregions.enabled', true]]}, doTest);
+    });
+
+    </script>
 </head>
 <body>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/events/test_aria_statechange.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/events/test_aria_statechange.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/events/test_aria_statechange.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/events/test_aria_statechange.html	2015-02-28 15:03:00.000000000 +0000
@@ -107,19 +107,30 @@
         new setAttrOfMixedType(aID, "aria-checked", STATE_CHECKED, aValue);
     }
 
-    function buildQueueForAttrOfMixedType(aQueue, aID, aInvokerFunc)
+    function buildQueueForAttr(aList, aQueue, aID, aInvokerFunc)
     {
-      var list = [ "", "undefined", "false", "true", "mixed" ];
-      for (var i = 0; i < list.length; i++) {
-        for (var j = i + 1; j < list.length; j++) {
+      for (var i = 0; i < aList.length; i++) {
+        for (var j = i + 1; j < aList.length; j++) {
           // XXX: changes from/to "undefined"/"" shouldn't fire state change
           // events, bug 472142.
-          aQueue.push(new aInvokerFunc(aID, list[i]));
-          aQueue.push(new aInvokerFunc(aID, list[j]));
+          aQueue.push(new aInvokerFunc(aID, aList[i]));
+          aQueue.push(new aInvokerFunc(aID, aList[j]));
         }
       }
     }
 
+    function buildQueueForAttrOfMixedType(aQueue, aID, aInvokerFunc)
+    {
+      var list = [ "", "undefined", "false", "true", "mixed" ];
+      buildQueueForAttr(list, aQueue, aID, aInvokerFunc);
+    }
+
+    function buildQueueForAttrOfBoolType(aQueue, aID, aInvokerFunc)
+    {
+      var list = [ "", "undefined", "false", "true" ];
+      buildQueueForAttr(list, aQueue, aID, aInvokerFunc);
+    }
+
     function doTests()
     {
       gQueue = new eventQueue();
@@ -135,6 +146,7 @@
       buildQueueForAttrOfMixedType(gQueue, "pressable", setPressed);
       buildQueueForAttrOfMixedType(gQueue, "pressable_native", setPressed);
       buildQueueForAttrOfMixedType(gQueue, "checkable", setChecked);
+      buildQueueForAttrOfBoolType(gQueue, "checkableBool", setChecked);
 
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
@@ -166,6 +178,11 @@
      title="Pressed state is not exposed on a button element with aria-pressed attribute"
     Mozilla Bug 989958
   </a>
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=1136563"
+     title="Support ARIA 1.1 switch role"
+    Mozilla Bug 1136563
+  </a>
 
   <p id="display"></p>
   <div id="content" style="display: none"></div>
@@ -186,5 +203,6 @@
 
   <!-- aria-checked -->
   <div id="checkable" role="checkbox"></div>
+  <div id="checkableBool" role="switch"></div>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/events/test_docload.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/events/test_docload.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/events/test_docload.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/events/test_docload.html	2015-02-28 15:03:00.000000000 +0000
@@ -15,6 +15,25 @@
           src="../role.js"></script>
   <script type="application/javascript"
           src="../states.js"></script>
+
+  <script type="application/javascript">
+    // Front end stuff sometimes likes to stuff things in the hidden window(s)
+    // in which case there's accessibles for that content.
+    Components.utils.import("resource://gre/modules/Services.jsm");
+
+    // Force the creation of an accessible for the hidden window's document.
+    var doc = Services.appShell.hiddenDOMWindow.document;
+    gAccRetrieval.getAccessibleFor(doc);
+
+    // The private hidden window will be lazily created that's why we need to do
+    // it here *before* loading '../events.js' or else we'll have a duplicate
+    // reorder event.
+    var privateDoc = Services.appShell.hiddenPrivateDOMWindow.document;
+
+    // Force the creation of an accessible for the private hidden window's doc.
+    gAccRetrieval.getAccessibleFor(privateDoc);
+  </script>
+
   <script type="application/javascript"
           src="../events.js"></script>
 
@@ -177,6 +196,12 @@
             {
               role: ROLE_CHROME_WINDOW
             },
+            {
+              role: ROLE_CHROME_WINDOW
+            },
+            {
+              role: ROLE_CHROME_WINDOW
+            },
             {
               role: ROLE_CHROME_WINDOW
             }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/hittest/test_canvas_hitregion.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/hittest/test_canvas_hitregion.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/hittest/test_canvas_hitregion.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/hittest/test_canvas_hitregion.html	2015-02-28 15:03:00.000000000 +0000
@@ -13,8 +13,6 @@
           src="../layout.js"></script>
 
   <script type="application/javascript">
-    SpecialPowers.setBoolPref("canvas.hitregions.enabled", true);
-
     function redrawCheckbox(context, element, x, y)
     {
       context.save();
@@ -67,13 +65,13 @@
       is(hitAcc, hitcanvas, "Hit match at " + tgtX + "," + tgtY +
                           ". Found: " + prettyName(hitAcc));
 
-      SpecialPowers.setBoolPref("canvas.hitregions.enabled", false);
       SimpleTest.finish();
     }
-
     SimpleTest.waitForExplicitFinish();
-    addA11yLoadEvent(doTest);
-  </script>
+    addA11yLoadEvent(function() {
+      SpecialPowers.pushPrefEnv({"set": [['canvas.hitregions.enabled', true]]}, doTest);
+    });
+ </script>
 </head>
 <body>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/jsat/test_content_integration.html	2015-02-28 15:03:00.000000000 +0000
@@ -48,7 +48,7 @@
           // check checkbox
           [ContentMessages.activateCurrent(),
            new ExpectedClickAction({ no_android: true }),
-           new ExpectedCheckAction(true, { android_todo: true })],
+           new ExpectedCheckAction(true)],
           [ContentMessages.simpleMoveNext,
            new ExpectedCursorChange(['much range', {'string': 'label'}])],
           [ContentMessages.simpleMoveNext,
@@ -74,7 +74,7 @@
           // uncheck checkbox
           [ContentMessages.activateCurrent(),
            new ExpectedClickAction({ no_android: true }),
-           new ExpectedCheckAction(false, { android_todo: true })],
+           new ExpectedCheckAction(false)],
           [ContentMessages.simpleMovePrevious,
            new ExpectedCursorChange(['wow', {'string': 'headingLevel', 'args': [1]}])],
           [ContentMessages.simpleMovePrevious,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/jsat/test_hints.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/jsat/test_hints.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/jsat/test_hints.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/jsat/test_hints.html	2015-02-28 15:03:00.000000000 +0000
@@ -43,6 +43,9 @@
         accOrElmOrID: 'nested_link3',
         expectedHints: [{string: 'link-hint'}, {string: 'pushbutton-hint'},
           "Double tap and hold to activate"]
+      }, {
+        accOrElmOrID: 'menuitemradio',
+        expectedHints: [{string: 'radiomenuitem-hint'}]
       }];
 
       // Test hints.
@@ -80,6 +83,7 @@
       <a href="#" id="link_with_hint_override" aria-moz-hint="Tap and hold to get to menu">I am a special link</a>
       <button id="button_with_default_hint">Toggle</button>
       <button id="button_with_hint_override" aria-moz-hint="Tap and hold to activate">Special</button>
+      <span id="menuitemradio" role="menuitemradio">Item 1</span>
   </div>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/role/test_aria.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/role/test_aria.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/role/test_aria.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/role/test_aria.html	2015-02-28 15:03:00.000000000 +0000
@@ -60,6 +60,7 @@
       testRole("aria_slider", ROLE_SLIDER);
       testRole("aria_spinbutton", ROLE_SPINBUTTON);
       testRole("aria_status", ROLE_STATUSBAR);
+      testRole("aria_switch", ROLE_SWITCH);
       testRole("aria_tab", ROLE_PAGETAB);
       testRole("aria_tablist", ROLE_PAGETABLIST);
       testRole("aria_tabpanel", ROLE_PROPERTYPAGE);
@@ -178,6 +179,11 @@
      href="https://bugzilla.mozilla.org/show_bug.cgi?id=735645">
     Bug 735645
   </a>
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=1136563"
+     title="Support ARIA 1.1 switch role"
+    Bug 1136563
+  </a>
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test">
@@ -225,6 +231,7 @@
   <span id="aria_slider" role="slider"/>
   <span id="aria_spinbutton" role="spinbutton"/>
   <span id="aria_status" role="status"/>
+  <span id="aria_switch" role="switch"/>
   <span id="aria_tab" role="tab"/>
   <span id="aria_tablist" role="tablist"/>
   <span id="aria_tabpanel" role="tabpanel"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/role.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/role.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/role.js	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/role.js	2015-02-28 15:03:00.000000000 +0000
@@ -70,6 +70,7 @@
 const ROLE_SPINBUTTON = nsIAccessibleRole.ROLE_SPINBUTTON;
 const ROLE_STATICTEXT = nsIAccessibleRole.ROLE_STATICTEXT;
 const ROLE_STATUSBAR = nsIAccessibleRole.ROLE_STATUSBAR;
+const ROLE_SWITCH = nsIAccessibleRole.ROLE_SWITCH;
 const ROLE_TABLE = nsIAccessibleRole.ROLE_TABLE;
 const ROLE_TERM = nsIAccessibleRole.ROLE_TERM;
 const ROLE_TEXT_CONTAINER = nsIAccessibleRole.ROLE_TEXT_CONTAINER;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/states/test_aria.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/states/test_aria.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/states/test_aria.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/states/test_aria.html	2015-02-28 15:03:00.000000000 +0000
@@ -92,6 +92,8 @@
       // aria-checked
       testStates("aria_checked_checkbox", STATE_CHECKED);
       testStates("aria_mixed_checkbox", STATE_MIXED);
+      testStates("aria_checked_switch", STATE_CHECKED);
+      testStates("aria_mixed_switch", 0, 0, STATE_MIXED); // unsupported
 
       // test disabled group and all its descendants to see if they are
       // disabled, too. See bug 429285.
@@ -350,6 +352,11 @@
      title="Pressed state is not exposed on a button element with aria-pressed attribute"
     Mozilla Bug 989958
   </a>
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=1136563"
+     title="Support ARIA 1.1 switch role"
+    Mozilla Bug 1136563
+  </a>
 
   <p id="display"></p>
   <div id="content" style="display: none"></div>
@@ -383,6 +390,15 @@
   <div id="aria_mixed_checkbox" role="checkbox" aria-checked="mixed">
     I might agree
   </div>
+
+  <div id="aria_checked_switch" role="switch" aria-checked="true">
+    I am switched on
+  </div>
+
+  <div id="aria_mixed_switch" role="switch" aria-checked="mixed">
+    I am unsupported
+  </div>
+
   <div id="aria_modal" aria-modal="true">modal stuff</div>
   <div id="aria_modal_false" aria-modal="false">non modal stuff</div>div>
   <div id="aria_multiline_textbox" role="textbox" aria-multiline="true"></div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/states.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/states.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/states.js	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/states.js	2015-02-28 15:03:00.000000000 +0000
@@ -198,6 +198,17 @@
   }
 }
 
+/**
+ * Fails if no defunct state on the accessible.
+ */
+function testIsDefunct(aAccessible, aTestName)
+{
+  var id = prettyName(aAccessible) + (aTestName ? " [" + aTestName + "]" : "");
+  var [state, extraState] = getStates(aAccessible);
+  isState(extraState & EXT_STATE_DEFUNCT, EXT_STATE_DEFUNCT, true,
+          "no defuct state for " + id + "!");
+}
+
 function getStringStates(aAccOrElmOrID)
 {
   var [state, extraState] = getStates(aAccOrElmOrID);
@@ -209,7 +220,7 @@
   var acc = getAccessible(aAccOrElmOrID);
   if (!acc)
     return [0, 0];
-  
+
   var state = {}, extraState = {};
   acc.getState(state, extraState);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/tree/test_aria_presentation.html	2015-02-28 15:03:00.000000000 +0000
@@ -21,14 +21,18 @@
     // Presentation role don't allow accessible.
     var tree =
       { SECTION: [ // container
-        { TEXT_LEAF: [ ] } // child text of presentation node
+        { TEXT_LEAF: [ ] }, // child text of 'presentation' node
+        { TEXT_LEAF: [ ] } // child text of 'none' node
       ] };
     testAccessibleTree("div_cnt", tree);
 
-    // Focusable element, presentation role is ignored.
+    // Focusable element, 'presentation' and 'none' roles are ignored.
     tree =
       { SECTION: [ // container
-        { PUSHBUTTON: [ // button
+        { PUSHBUTTON: [ // button having 'presentation' role
+          { TEXT_LEAF: [ ] }
+        ] },
+        { PUSHBUTTON: [ // button having 'none' role
           { TEXT_LEAF: [ ] }
         ] }
       ] };
@@ -37,18 +41,28 @@
     // Presentation table, no table structure is exposed.
     tree =
       { SECTION: [ // container
-        { TEXT_CONTAINER: [ // td generic accessible
+        { TEXT_CONTAINER: [ // td generic accessible inside 'presentation' table
+          { TEXT_LEAF: [ ] } // cell text
+        ] },
+        { TEXT_CONTAINER: [ // td generic accessible inside 'none' table
           { TEXT_LEAF: [ ] } // cell text
         ] }
       ] };
     testAccessibleTree("tbl_cnt", tree);
 
-    // Focusable table, presentation role is ignored.
+    // Focusable table, 'presentation' and 'none' roles are ignored.
     tree =
       { SECTION: [ // container
-        { TABLE: [ // table
+        { TABLE: [ // table having 'presentation' role
+          { ROW: [ // tr
+            { CELL: [ // td
+              { TEXT_LEAF: [ ] }
+            ] }
+          ] }
+        ] },
+        { TABLE: [ // table having 'none' role
           { ROW: [ // tr
-            { CELL: [ //td
+            { CELL: [ // td
               { TEXT_LEAF: [ ] }
             ] }
           ] }
@@ -59,13 +73,17 @@
     // Presentation list, expose generic accesisble for list items.
     tree =
       { SECTION: [ // container
-        { PARAGRAPH: [ // li generic accessible
+        { PARAGRAPH: [ // li generic accessible inside 'presentation' role
+          { TEXT_LEAF: [ ] } // li text
+        ] },
+        { PARAGRAPH: [ // li generic accessible inside 'none' role
           { TEXT_LEAF: [ ] } // li text
         ] }
       ] };
     testAccessibleTree("list_cnt", tree);
 
-    // Has ARIA globals or referred by ARIA relationship.
+    // Has ARIA globals or referred by ARIA relationship, role='presentation'
+    // and role='none' are ignored.
     tree =
       { SECTION: [ // container
         { LABEL: [ // label, has aria-owns
@@ -74,6 +92,14 @@
         { TEXT_LEAF: [ ] },
         { LABEL: [ // label, referenced by aria-owns
           { TEXT_LEAF: [ ] }
+        ] },
+        { TEXT_LEAF: [ ] },
+        { LABEL: [ // label, has aria-owns
+          { TEXT_LEAF: [ ] }
+        ] },
+        { TEXT_LEAF: [ ] },
+        { LABEL: [ // label, referenced by aria-owns
+          { TEXT_LEAF: [ ] }
         ] }
       ] };
     testAccessibleTree("airaglobalprop_cnt", tree);
@@ -90,21 +116,26 @@
   <a target="_blank"
      href="https://bugzilla.mozilla.org/show_bug.cgi?id=548291"
      title="Accessible tree of ARIA image maps">
-    Mozilla Bug 548291
+    Bug 548291
   </a>
   <a target="_blank"
      href="https://bugzilla.mozilla.org/show_bug.cgi?id=666504"
      title="Ignore role presentation on focusable elements">
-    Mozilla Bug 666504
+    Bug 666504
+  </a>
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=971212"
+     title="Implement ARIA role=none">
+    Bug 971212
   </a>
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test">
   </pre>
 
-  <div id="div_cnt"><div role="presentation">text</div></div>
+  <div id="div_cnt"><div role="presentation">t</div><div role="none">t</div></div>
 
-  <div id="btn_cnt"><button role="presentation">btn</button></div>
+  <div id="btn_cnt"><button role="presentation">btn</button><button role="none">btn</button></div>
 
   <div id="tbl_cnt">
     <table role="presentation">
@@ -112,6 +143,11 @@
         <td>cell</td>
       </tr>
     </table>
+    <table role="none">
+      <tr>
+        <td>cell</td>
+      </tr>
+    </table>
   </div>
 
   <div id="tblfocusable_cnt">
@@ -120,17 +156,27 @@
         <td>cell</td>
       </tr>
     </table>
+    <table role="none" tabindex="0">
+      <tr>
+        <td>cell</td>
+      </tr>
+    </table>
   </div>
 
   <div id="list_cnt">
     <ul role="presentation">
       <li>item</li>
     </ul>
+    <ul role="none">
+      <li>item</li>
+    </ul>
   </div>
 
   <div id="airaglobalprop_cnt">
     <label role="presentation" aria-owns="ariaowned">has aria-owns</label>
     <label role="presentation" id="ariaowned">referred by aria-owns</label>
+    <label role="none" aria-owns="ariaowned2">has aria-owns</label>
+    <label role="none" id="ariaowned2">referred by aria-owns</label>
   </div>
 
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/treeupdate/a11y.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/treeupdate/a11y.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/treeupdate/a11y.ini	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/treeupdate/a11y.ini	2015-02-28 15:03:00.000000000 +0000
@@ -24,6 +24,7 @@
 [test_optgroup.html]
 [test_recreation.html]
 [test_select.html]
+[test_shutdown.xul]
 [test_textleaf.html]
 [test_visibility.html]
 [test_whitespace.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/treeupdate/test_shutdown.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/treeupdate/test_shutdown.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/treeupdate/test_shutdown.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/treeupdate/test_shutdown.xul	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="Accessible XUL tree hierarchy tests">
+
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+
+  <script type="application/javascript"
+          src="../treeview.js" />
+
+  <script type="application/javascript"
+          src="../common.js" />
+  <script type="application/javascript"
+          src="../role.js" />
+  <script type="application/javascript"
+          src="../states.js" />
+  <script type="application/javascript"
+          src="../events.js" />
+
+  <script type="application/javascript">
+  <![CDATA[
+    function setXULTreeView(aTreeID, aTreeView)
+    {
+      this.treeNode = getNode(aTreeID);
+
+      this.eventSeq = [
+        new invokerChecker(EVENT_REORDER, this.treeNode)
+      ];
+
+      this.invoke = function loadXULTree_invoke()
+      {
+        this.treeNode.view = aTreeView;
+      };
+
+      this.getID = function loadXULTree_getID()
+      {
+        return "Load XUL tree " + prettyName(aTreeID);
+      };
+    }
+
+    function removeTree(aID)
+    {
+      this.tree = getAccessible(aID);
+      this.lastItem = null;
+
+      this.eventSeq = [
+        new invokerChecker(EVENT_REORDER, document)
+      ];
+
+      this.invoke = function invoke()
+      {
+        this.lastItem = getAccessible(aID).lastChild;
+        this.lastCell = this.lastItem.lastChild;
+        getNode(aID).parentNode.removeChild(getNode(aID));
+      };
+
+      this.check = function check(aEvent)
+      {
+        testIsDefunct(this.tree, aID);
+        testIsDefunct(this.lastItem, "last item of " + aID);
+        if (this.lastCell) {
+          testIsDefunct(this.lastCell, "last item cell of " + aID);
+        }
+      };
+
+      this.getID = function getID()
+      {
+        return "Remove tree from DOM";
+      };
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Test
+
+    // gA11yEventDumpID = "debug";
+    var gQueue = null;
+
+    function doTest()
+    {
+      gQueue = new eventQueue();
+
+      gQueue.push(new setXULTreeView("tree", new nsTreeTreeView()));
+      gQueue.push(new removeTree("tree"));
+
+      gQueue.push(new setXULTreeView("treetable", new nsTreeTreeView()));
+      gQueue.push(new removeTree("treetable"));
+
+      gQueue.invoke(); // Will call SimpleTest.finish()
+    }
+
+    SimpleTest.waitForExplicitFinish();
+    addA11yLoadEvent(doTest);
+  ]]>
+  </script>
+
+  <hbox flex="1" style="overflow: auto;">
+    <body xmlns="http://www.w3.org/1999/xhtml">
+      <a target="_blank"
+         href="https://bugzilla.mozilla.org/show_bug.cgi?id=503727"
+         title="Reorganize implementation of XUL tree accessibility">
+        Bug 503727
+      </a><br/>
+      <p id="display"></p>
+      <div id="content" style="display: none">
+      </div>
+      <pre id="test">
+      </pre>
+    </body>
+
+    <vbox flex="1">
+      <tree id="tree" flex="1">
+        <treecols>
+          <treecol id="col" flex="1" primary="true" label="column"/>
+        </treecols>
+        <treechildren/>
+      </tree>
+
+      <tree id="treetable" flex="1">
+        <treecols>
+          <treecol id="col1" flex="1" primary="true" label="column"/>
+          <treecol id="col2" flex="1" label="column 2"/>
+        </treecols>
+        <treechildren/>
+      </tree>
+    </vbox>
+  </hbox>
+
+</window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/treeview.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/treeview.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/tests/mochitest/treeview.js	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/tests/mochitest/treeview.js	2015-02-28 15:03:00.000000000 +0000
@@ -60,7 +60,7 @@
 function nsTreeTreeView()
 {
   this.__proto__ = new nsTreeView();
-  
+
   this.mData = [
     new treeItem("row1"),
     new treeItem("row2_", true, [new treeItem("row2.1_"), new treeItem("row2.2_")]),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/xul/XULTreeAccessible.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/xul/XULTreeAccessible.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/xul/XULTreeAccessible.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/xul/XULTreeAccessible.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -144,11 +144,8 @@
 void
 XULTreeAccessible::Shutdown()
 {
-  // XXX: we don't remove accessible from document cache if shutdown wasn't
-  // initiated by document destroying. Note, we can't remove accessible from
-  // document cache here while document is going to be shutdown. Note, this is
-  // not unique place where we have similar problem.
-  ClearCache(mAccessibleCache);
+  if (!mDoc->IsDefunct())
+    mAccessibleCache.Enumerate(UnbindCacheEntryFromDocument<Accessible>, nullptr);
 
   mTree = nullptr;
   mTreeView = nullptr;
@@ -552,7 +549,8 @@
     return;
 
   if (!mTreeView) {
-    ClearCache(mAccessibleCache);
+    mAccessibleCache.Enumerate(UnbindCacheEntryFromDocument<Accessible>,
+                               nullptr);
     return;
   }
 
@@ -610,7 +608,8 @@
     return;
 
   if (!mTreeView) {
-    ClearCache(mAccessibleCache);
+    mAccessibleCache.Enumerate(UnbindCacheEntryFromDocument<Accessible>,
+                               nullptr);
     return;
   }
 
@@ -669,7 +668,9 @@
   Document()->FireDelayedEvent(reorderEvent);
 
   // Clear cache.
-  ClearCache(mAccessibleCache);
+  mAccessibleCache.Enumerate(UnbindCacheEntryFromDocument<Accessible>,
+                             nullptr);
+
   mTreeView = aView;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/xul/XULTreeGridAccessible.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/xul/XULTreeGridAccessible.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/accessible/xul/XULTreeGridAccessible.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/accessible/xul/XULTreeGridAccessible.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -275,7 +275,11 @@
 void
 XULTreeGridRowAccessible::Shutdown()
 {
-  ClearCache(mAccessibleCache);
+  if (!mDoc->IsDefunct()) {
+    mAccessibleCache.Enumerate(UnbindCacheEntryFromDocument<XULTreeGridCellAccessible>,
+                               nullptr);
+  }
+
   XULTreeItemAccessibleBase::Shutdown();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/CONTRIBUTING.md thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/CONTRIBUTING.md
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/CONTRIBUTING.md	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/CONTRIBUTING.md	2015-02-28 15:03:00.000000000 +0000
@@ -17,12 +17,14 @@
 3. Make your changes, per the Overview
 4. Write a test ([intro][test intro], [API][test API])
 5. Submit pull request with changes and a title in a form of `Bug XXX - description`
-6. Copy the pull request link from GitHub and paste it in as an attachment to the bug
-7. Each pull request should idealy contain only one commit, so squash the commits if necessary.
-8. Flag the attachment for code review from one of the Jetpack reviewers listed below.
+6. Make sure that [Travis CI](https://travis-ci.org/mozilla/addon-sdk/branches) tests are passing for your branch.
+7. Copy the pull request link from GitHub and paste it in as an attachment to the bug
+8. Each pull request should idealy contain only one commit, so squash the commits if necessary.
+9. Flag the attachment for code review from one of the Jetpack reviewers listed below.
    This step is optional, but could speed things up.
-9. Address any nits (ie style changes), or other issues mentioned in the review.
-10. Finally, once review is approved, a team member will do the merging
+10. Address any nits (ie style changes), or other issues mentioned in the review.
+
+Finally, once review is approved, a team member will do the merging
 
 ## Good First Bugs
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/addon/runner.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/addon/runner.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/addon/runner.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/addon/runner.js	2015-02-28 15:03:00.000000000 +0000
@@ -81,14 +81,12 @@
       // Exports data to a pseudo module so that api-utils/l10n/core
       // can get access to it
       definePseudo(options.loader, '@l10n/data', data ? data : null);
-      return ready;
-    }).then(function() {
-      run(options);
+      return ready.then(() => run(options, !!data));
     }).then(null, console.exception);
     return void 0; // otherwise we raise a warning, see bug 910304
 });
 
-function run(options) {
+function run(options, hasL10n) {
   try {
     // Try initializing HTML localization before running main module. Just print
     // an exception in case of error, instead of preventing addon to be run.
@@ -96,7 +94,7 @@
       // Do not enable HTML localization while running test as it is hard to
       // disable. Because unit tests are evaluated in a another Loader who
       // doesn't have access to this current loader.
-      if (options.main !== 'sdk/test/runner') {
+      if (hasL10n && options.main !== 'sdk/test/runner') {
         require('../l10n/html').enable();
       }
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/core/observer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/core/observer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/core/observer.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/core/observer.js	2015-02-28 15:03:00.000000000 +0000
@@ -41,10 +41,9 @@
     this.delegate = delegate;
   },
   QueryInterface: function(iid) {
-    const isObserver = iid.equals(Ci.nsIObserver);
-    const isWeakReference = iid.equals(Ci.nsISupportsWeakReference);
-
-    if (!isObserver && !isWeakReference)
+    if (!iid.equals(Ci.nsIObserver) &&
+        !iid.equals(Ci.nsISupportsWeakReference) &&
+        !iid.equals(Ci.nsISupports))
       throw Cr.NS_ERROR_NO_INTERFACE;
 
     return this;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/panel.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/panel.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/panel.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/panel.js	2015-02-28 15:03:00.000000000 +0000
@@ -295,6 +295,9 @@
 let ready = filter(panelEvents, ({type, target}) =>
   getAttachEventType(modelFor(panelFor(target))) === type);
 
+// Panel event emitted when the contents of the panel has been loaded.
+let readyToShow = filter(panelEvents, ({type}) => type === "DOMContentLoaded");
+
 // Styles should be always added as soon as possible, and doesn't makes them
 // depends on `contentScriptWhen`
 let start = filter(panelEvents, ({type}) => type === "document-element-inserted");
@@ -317,6 +320,10 @@
   let window = domPanel.getContentDocument(target).defaultView;
 
   workerFor(panel).attach(window);
+});
+
+on(readyToShow, "data", ({target}) => {
+  let panel = panelFor(target);
 
   if (!modelFor(panel).ready) {
     modelFor(panel).ready = true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/test/harness.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/test/harness.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/test/harness.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/test/harness.js	2015-02-28 15:03:00.000000000 +0000
@@ -340,7 +340,7 @@
       let item = {
         path: matches[1],
         principal: details[1],
-        location: details[2] ? details[2].replace("\\", "/", "g") : undefined,
+        location: details[2] ? details[2].replace(/\\/g, "/") : undefined,
         source: details[3] ? details[3].split(" -> ").reverse() : undefined,
         toString: function() this.location
       };
@@ -364,8 +364,8 @@
 
       let item = {
         path: matches[1],
-        location: details[1].replace("\\", "/", "g"),
-        source: [details[1].replace("\\", "/", "g")],
+        location: details[1].replace(/\\/g, "/"),
+        source: [details[1].replace(/\\/g, "/")],
         toString: function() this.location
       };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/windows/observer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/windows/observer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/sdk/windows/observer.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/sdk/windows/observer.js	2015-02-28 15:03:00.000000000 +0000
@@ -12,6 +12,7 @@
 const { WindowTracker, windowIterator } = require("../deprecated/window-utils");
 const { DOMEventAssembler } = require("../deprecated/events/assembler");
 const { Class } = require("../core/heritage");
+const { Cu } = require("chrome");
 
 // Event emitter objects used to register listeners and emit events on them
 // when they occur.
@@ -42,6 +43,9 @@
    *    Keyboard event being emitted.
    */
   handleEvent(event) {
+    // Ignore events from windows in the child process as they can't be top-level
+    if (Cu.isCrossProcessWrapper(event.target))
+      return;
     emit(this, event.type, event.target, event);
   }
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/toolkit/loader.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/toolkit/loader.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/lib/toolkit/loader.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/lib/toolkit/loader.js	2015-02-28 15:03:00.000000000 +0000
@@ -703,7 +703,8 @@
 const Module = iced(function Module(id, uri) {
   return create(null, {
     id: { enumerable: true, value: id },
-    exports: { enumerable: true, writable: true, value: create(null) },
+    exports: { enumerable: true, writable: true, value: create(null),
+               configurable: true },
     uri: { value: uri }
   });
 });
@@ -784,6 +785,7 @@
     }
   }, modules);
 
+  const builtinModuleExports = modules;
   modules = keys(modules).reduce(function(result, id) {
     // We resolve `uri` from `id` since modules are cached by `uri`.
     let uri = resolveURI(id, mapping);
@@ -792,7 +794,16 @@
     if (isNative && !uri)
       uri = id;
     let module = Module(id, uri);
-    module.exports = freeze(modules[id]);
+
+    // Lazily expose built-in modules in order to
+    // allow them to be loaded lazily.
+    Object.defineProperty(module, "exports", {
+      enumerable: true,
+      get: function() {
+        return builtinModuleExports[id];
+      }
+    });
+
     result[uri] = freeze(module);
     return result;
   }, {});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/python-lib/cuddlefish/prefs.py	2015-02-28 15:03:00.000000000 +0000
@@ -60,6 +60,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.trackingprotection.gethashURL': 'http://localhost/safebrowsing-dummy/gethash',
     'browser.trackingprotection.updateURL': 'http://localhost/safebrowsing-dummy/update',
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/addons/private-browsing-supported/sidebar/utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/addons/private-browsing-supported/sidebar/utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/addons/private-browsing-supported/sidebar/utils.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/addons/private-browsing-supported/sidebar/utils.js	2015-02-28 15:03:00.000000000 +0000
@@ -10,7 +10,8 @@
 const BUILTIN_SIDEBAR_MENUITEMS = exports.BUILTIN_SIDEBAR_MENUITEMS = [
   'menu_socialSidebar',
   'menu_historySidebar',
-  'menu_bookmarksSidebar'
+  'menu_bookmarksSidebar',
+  'menu_readingListSidebar'
 ];
 
 function isSidebarShowing(window) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/addons/private-browsing-supported/test-sidebar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/addons/private-browsing-supported/test-sidebar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/addons/private-browsing-supported/test-sidebar.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/addons/private-browsing-supported/test-sidebar.js	2015-02-28 15:03:00.000000000 +0000
@@ -129,8 +129,7 @@
           assert.pass('onShow works for Sidebar');
           loader.unload();
 
-          let sidebarMI = getSidebarMenuitems();
-          for (let mi of sidebarMI) {
+          for (let mi of getSidebarMenuitems()) {
             assert.ok(BUILTIN_SIDEBAR_MENUITEMS.indexOf(mi.getAttribute('id')) >= 0, 'the menuitem is for a built-in sidebar')
             assert.ok(!isChecked(mi), 'no sidebar menuitem is checked');
           }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/addons/unsafe-content-script/main.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/addons/unsafe-content-script/main.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/addons/unsafe-content-script/main.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/addons/unsafe-content-script/main.js	2015-02-28 15:03:00.000000000 +0000
@@ -6,10 +6,10 @@
 const { create: makeFrame } = require("sdk/frame/utils");
 const { window } = require("sdk/addon/window");
 const { Loader } = require('sdk/test/loader');
-const loader = Loader(module);
-const Worker = loader.require("sdk/content/worker").Worker;
 
 exports.testMembranelessMode = function(assert, done) {
+  const loader = Loader(module);
+  const Worker = loader.require("sdk/content/worker").Worker;
 
   let url = "data:text/html;charset=utf-8," + encodeURIComponent(
     '<script>' +
@@ -48,13 +48,20 @@
           done();
         }
     });
-    worker.port.on("done", function () {
+
+    worker.port.on("done", () => {
+      // cleanup
       element.parentNode.removeChild(element);
+      worker.destroy();
+      loader.unload();
+
       done();
     });
+
     worker.port.on("assert", function (data) {
       assert.ok(data.assertion, data.msg);
     });
+
   }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/fixtures/loader/lazy/main.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/fixtures/loader/lazy/main.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/fixtures/loader/lazy/main.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/fixtures/loader/lazy/main.js	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+exports.useFoo= function () {
+  return require('foo');
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/preferences/no-connections.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/preferences/no-connections.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/preferences/no-connections.json	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/preferences/no-connections.json	2015-02-28 15:03:00.000000000 +0000
@@ -17,6 +17,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.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-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/sidebar/utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/sidebar/utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/sidebar/utils.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/sidebar/utils.js	2015-02-28 15:03:00.000000000 +0000
@@ -16,7 +16,8 @@
 const BUILTIN_SIDEBAR_MENUITEMS = exports.BUILTIN_SIDEBAR_MENUITEMS = [
   'menu_socialSidebar',
   'menu_historySidebar',
-  'menu_bookmarksSidebar'
+  'menu_bookmarksSidebar',
+  'menu_readingListSidebar'
 ];
 
 function isSidebarShowing(window) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-buffer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-buffer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-buffer.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-buffer.js	2015-02-28 15:03:00.000000000 +0000
@@ -60,7 +60,7 @@
   // invalid encoding for Buffer.toString
   assert.throws(() => {
     b.toString('invalid');
-  }, TypeError, 'invalid encoding for Buffer.toString');
+  }, RangeError, 'invalid encoding for Buffer.toString');
 
   // try to toString() a 0-length slice of a buffer, both within and without the
   // valid buffer range
@@ -248,7 +248,7 @@
 
   assert.throws(() => {
     b.write('test string', 0, 5, 'invalid');
-  }, TypeError, 'invalid encoding with buffer write throws');
+  }, RangeError, 'invalid encoding with buffer write throws');
   // try to write a 0-length string beyond the end of b
   assert.throws(function() {
     b.write('', 2048);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-context-menu@2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-context-menu@2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-context-menu@2.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-context-menu@2.js	2015-02-28 15:03:00.000000000 +0000
@@ -10,6 +10,7 @@
 const {when} = require("sdk/dom/events");
 const {Item, Menu, Separator, Contexts, Readers } = require("sdk/context-menu@2");
 const prefs = require("sdk/preferences/service");
+const { before, after } = require('sdk/test/utils');
 
 const testPageURI = require.resolve("./test-context-menu").replace(".js", ".html");
 
@@ -1337,4 +1338,13 @@
   };
 }
 
+before(exports, (name, assert) => {
+  // Make sure Java doesn't activate
+  prefs.set("plugin.state.java", 0);
+});
+
+after(exports, (name, assert) => {
+  prefs.reset("plugin.state.java");
+});
+
 require("sdk/test").run(module.exports);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-dev-panel.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-dev-panel.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-dev-panel.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-dev-panel.js	2015-02-28 15:03:00.000000000 +0000
@@ -86,8 +86,9 @@
   yield closeToolbox();
 
   assert.equal(panel.readyState, "destroyed", "panel is destroyed");
-});
 
+  myTool.destroy();
+});
 
 exports["test Panel communication"] = test(function*(assert) {
   const MyPanel = Class({
@@ -150,6 +151,7 @@
   yield closeToolbox();
 
   assert.equal(panel.readyState, "destroyed", "panel is destroyed");
+  myTool.destroy();
 });
 
 exports["test communication with debuggee"] = test(function*(assert) {
@@ -233,6 +235,8 @@
   yield closeToolbox();
 
   assert.equal(panel.readyState, "destroyed", "panel is destroyed");
+
+  myTool.destroy();
 });
 
 
@@ -267,6 +271,8 @@
   assert.equal(frame.contentDocument.URL, url, "is expected iframe");
 
   yield closeToolbox();
+
+  myTool.destroy();
 });
 
 
@@ -314,6 +320,8 @@
   assert.equal(frame.contentDocument.URL, url, "is expected iframe");
 
   yield closeToolbox();
+
+  myTool.destroy();
 });
 
 require("sdk/test").run(exports);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-loader.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-loader.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-loader.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-loader.js	2015-02-28 15:03:00.000000000 +0000
@@ -506,4 +506,22 @@
                "Loader.Loader is a funciton");
 };
 
+exports['test lazy globals'] = function (assert) {
+  let uri = root + '/fixtures/loader/lazy/';
+  let gotFoo = false;
+  let foo = {};
+  let modules = {
+    get foo() {
+      gotFoo = true;
+      return foo;
+    }
+  };
+  let loader = Loader({ paths: { '': uri }, modules: modules});
+  assert.ok(!gotFoo, "foo hasn't been accessed during loader instanciation");
+  let program = main(loader, 'main');
+  assert.ok(!gotFoo, "foo hasn't been accessed during module loading");
+  assert.equal(program.useFoo(), foo, "foo mock works");
+  assert.ok(gotFoo, "foo has been accessed only when we first try to use it");
+};
+
 require('sdk/test').run(exports);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-observers.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-observers.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-observers.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-observers.js	2015-02-28 15:03:00.000000000 +0000
@@ -12,6 +12,7 @@
 const { Cc, Ci, Cu } = require("chrome");
 const { notifyObservers } = Cc["@mozilla.org/observer-service;1"].
                               getService(Ci.nsIObserverService);
+const { defer } = require("sdk/core/promise");
 
 const message = x => ({wrappedJSObject: x});
 
@@ -120,4 +121,63 @@
   });
 };
 
-require("sdk/test").run(exports);
\ No newline at end of file
+exports["test weak observer unsubscribe"] = function*(assert) {
+  const loader = Loader(module);
+  const { Observer, observe, subscribe, unsubscribe } = loader.require("sdk/core/observer");
+  const { WeakReference } = loader.require("sdk/core/reference");
+
+  let sawNotification = false;
+  let firstWait = defer();
+  let secondWait = defer();
+
+  const WeakObserver = Class({
+    extends: Observer,
+    implements: [WeakReference],
+    observe: function() {
+      sawNotification = true;
+      firstWait.resolve();
+    }
+  });
+
+  const StrongObserver = Class({
+    extends: Observer,
+    observe: function() {
+      secondWait.resolve();
+    }
+  });
+
+  observe.define(Observer, (x, ...rest) => x.observe(...rest));
+
+  let weakObserver = new WeakObserver;
+  let strongObserver = new StrongObserver();
+  subscribe(weakObserver, "test-topic");
+  subscribe(strongObserver, "test-wait");
+
+  notifyObservers(null, "test-topic", null);
+  yield firstWait.promise;
+
+  assert.ok(sawNotification, "Should have seen notification before GC");
+  sawNotification = false;
+
+  yield loader.require("sdk/test/memory").gc();
+
+  notifyObservers(null, "test-topic", null);
+  notifyObservers(null, "test-wait", null);
+  yield secondWait.promise;
+
+  assert.ok(sawNotification, "Should have seen notification after GC");
+  sawNotification = false;
+
+  try {
+    unsubscribe(weakObserver, "test-topic");
+    unsubscribe(strongObserver, "test-wait");
+    assert.pass("Should not have seen an exception");
+  }
+  catch (e) {
+    assert.fail("Should not have seen an exception");
+  }
+
+  loader.unload();
+};
+
+require("sdk/test").run(exports);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-panel.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-panel.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-panel.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-panel.js	2015-02-28 15:03:00.000000000 +0000
@@ -1297,7 +1297,6 @@
 exports["test panel load doesn't show"] = function*(assert) {
   let loader = Loader(module);
 
-  let showCount = 0;
   let panel = loader.require("sdk/panel").Panel({
     contentScript: "addEventListener('load', function(event) { self.postMessage('load'); });",
     contentScriptWhen: "start",
@@ -1335,6 +1334,24 @@
   loader.unload();
 }
 
+exports["test Panel without contentURL and contentScriptWhen=start should show"] = function*(assert) {
+  let loader = Loader(module);
+
+  let panel = loader.require("sdk/panel").Panel({
+    contentScriptWhen: "start",
+    // No contentURL, the bug only shows up when contentURL is not explicitly set.
+  });
+
+  yield new Promise(resolve => {
+    panel.once("show", resolve);
+    panel.show();
+  });
+
+  assert.pass("Received show event");
+
+  loader.unload();
+}
+
 if (packaging.isNative) {
   module.exports = {
     "test skip on jpm": (assert) => assert.pass("skipping this file with jpm")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-preferences-service.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-preferences-service.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-preferences-service.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-preferences-service.js	2015-02-28 15:03:00.000000000 +0000
@@ -29,6 +29,17 @@
                    "preferences-service should read from " +
                    "application-wide preferences service");
 
+  // test getting a pref that does not exist,
+  // and where we provide no default
+  assert.equal(
+      prefs.get("test_dne_get_pref", "default"),
+      "default",
+      "default was used for a pref that does not exist");
+  assert.equal(
+      prefs.get("test_dne_get_pref"),
+      undefined,
+      "undefined was returned for a pref that does not exist with no default");
+
   prefs.set("test_set_get_pref.integer", 1);
   assert.equal(prefs.get("test_set_get_pref.integer"), 1,
                    "set/get integer preference should work");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-ui-sidebar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-ui-sidebar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-ui-sidebar.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-ui-sidebar.js	2015-02-28 15:03:00.000000000 +0000
@@ -96,9 +96,12 @@
   sidebar.destroy();
   sidebar.destroy();
 
-  let sidebarMI = getSidebarMenuitems();
-  for (let mi of sidebarMI) {
-    assert.ok(BUILTIN_SIDEBAR_MENUITEMS.indexOf(mi.getAttribute('id')) >= 0, 'the menuitem is for a built-in sidebar')
+  for (let mi of getSidebarMenuitems()) {
+    let id = mi.getAttribute('id');
+
+    if (BUILTIN_SIDEBAR_MENUITEMS.indexOf(id) < 0) {
+      assert.fail('the menuitem "' + id + '" is not a built-in sidebar');
+    }
     assert.ok(!isChecked(mi), 'no sidebar menuitem is checked');
   }
 
@@ -360,8 +363,7 @@
 
   loader.unload();
 
-  let sidebarMI = getSidebarMenuitems();
-  for (let mi of sidebarMI) {
+  for (let mi of getSidebarMenuitems()) {
     assert.ok(BUILTIN_SIDEBAR_MENUITEMS.indexOf(mi.getAttribute('id')) >= 0, 'the menuitem is for a built-in sidebar')
     assert.ok(!isChecked(mi), 'no sidebar menuitem is checked');
   }
@@ -598,9 +600,12 @@
   yield sidebar.show();
   loader.unload();
 
-  let sidebarMI = getSidebarMenuitems();
-  for (let mi of sidebarMI) {
-    assert.ok(BUILTIN_SIDEBAR_MENUITEMS.indexOf(mi.getAttribute('id')) >= 0, 'the menuitem is for a built-in sidebar')
+  for (let mi of getSidebarMenuitems()) {
+    let id = mi.getAttribute('id');
+
+    if (BUILTIN_SIDEBAR_MENUITEMS.indexOf(id) < 0) {
+      assert.fail('the menuitem "' + id + '" is not a built-in sidebar');
+    }
     assert.ok(!isChecked(mi), 'no sidebar menuitem is checked');
   }
   assert.ok(!window.document.getElementById(makeID(testName)), 'sidebar id DNE');
@@ -762,6 +767,9 @@
   document = window.document;
   assert.pass('new window was opened');
 
+  yield focus(window);
+  assert.pass('new window was focused');
+
   yield sidebar1.show();
 
   assert.equal(isShowing(sidebar1), true, 'the sidebar is showing');
@@ -1490,23 +1498,29 @@
   });
 
   let mainWindow = getMostRecentBrowserWindow();
-  let newWindow = yield open().then(focus);
+  let newWindow = yield windowPromise(mainWindow.OpenBrowserWindow(), 'load');
+  assert.pass("Created the new window");
+
+  yield focus(newWindow);
+  assert.pass("Focused the new window");
 
   yield focus(mainWindow);
+  assert.pass("Focused the old window");
 
   yield sidebar.show(newWindow);
 
   assert.pass('the sidebar was shown');
-  assert.ok(!isSidebarShowing(mainWindow), 'sidebar is not showing in main window');
-  assert.ok(isSidebarShowing(newWindow), 'sidebar is showing in new window');
+  assert.equal(isSidebarShowing(mainWindow), false, 'sidebar is not showing in main window');
+  assert.equal(isSidebarShowing(newWindow), true, 'sidebar is showing in new window');
 
   assert.ok(isFocused(mainWindow), 'main window is still focused');
 
   yield sidebar.hide(newWindow);
 
-  assert.ok(isFocused(mainWindow), 'main window is still focused');
-  assert.ok(!isSidebarShowing(mainWindow), 'sidebar is not showing in main window');
-  assert.ok(!isSidebarShowing(newWindow), 'sidebar is not showing in new window');
+  assert.equal(isFocused(mainWindow), true, 'main window is still focused');
+  assert.equal(isSidebarShowing(mainWindow), false, 'sidebar is not showing in main window');
+  assert.equal(isSidebarShowing(newWindow), false, 'sidebar is not showing in new window');
+
   sidebar.destroy();
 }
 
@@ -1547,6 +1561,7 @@
 });
 
 after(exports, function*(name, assert) {
+  assert.pass("Cleaning new windows and tabs");
   yield cleanUI();
   assert.equal(isSidebarShowing(), false, 'no sidebar is showing');
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-weak-set.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-weak-set.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/test/test-weak-set.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/test/test-weak-set.js	2015-02-28 15:03:00.000000000 +0000
@@ -5,10 +5,7 @@
 
 const { Cu } = require('chrome');
 const { Loader } = require('sdk/test/loader');
-
-function gc() {
-  return new Promise(resolve => Cu.schedulePreciseGC(resolve));
-};
+const { gc } = require("sdk/test/memory");
 
 exports['test adding item'] = function*(assert) {
   let loader = Loader(module);
@@ -121,31 +118,31 @@
   assert.throws(() => {
     add(items, 'foo');
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(items, 0);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(items, undefined);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(items, null);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(items, true);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 };
 
@@ -158,31 +155,31 @@
   assert.throws(() => {
     add('foo', item);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(0, item);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(undefined, item);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(null, item);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 
   assert.throws(() => {
     add(true, item);
   },
-  /^value is not a non-null object/,
+  /^\w+ is not a non-null object/,
   'only non-null object are allowed');
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/.travis.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/.travis.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/addon-sdk/source/.travis.yml	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/addon-sdk/source/.travis.yml	2015-02-28 15:03:00.000000000 +0000
@@ -1,6 +1,7 @@
 sudo: false
 language: node_js
 node_js:
+  - "iojs"
   - "0.10"
 
 notifications:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/app/b2g.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/app/b2g.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/app/b2g.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/app/b2g.js	2015-02-28 15:03:00.000000000 +0000
@@ -34,6 +34,9 @@
 // Bug 945235: Prevent all bars to be considered visible:
 pref("toolkit.defaultChromeFeatures", "chrome,dialog=no,close,resizable,scrollbars,extrachrome");
 
+// Disable focus rings
+pref("browser.display.focus_ring_width", 0);
+
 // Device pixel to CSS px ratio, in percent. Set to -1 to calculate based on display density.
 pref("browser.viewport.scaleRatio", -1);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/blank.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/blank.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/blank.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/blank.css	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+body {
+  background: black;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/blank.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/blank.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/blank.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/blank.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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>
+  <head>
+    <link rel="stylesheet" href="blank.css" type="text/css" media="all" />
+  </head>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/devtools/debugger.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/devtools/debugger.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/devtools/debugger.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/devtools/debugger.js	2015-02-28 15:03:00.000000000 +0000
@@ -196,6 +196,7 @@
         globalActorFactories: restrictPrivileges ? {
           webappsActor: DebuggerServer.globalActorFactories.webappsActor,
           deviceActor: DebuggerServer.globalActorFactories.deviceActor,
+          settingsActor: DebuggerServer.globalActorFactories.settingsActor
         } : DebuggerServer.globalActorFactories
       };
       let { RootActor } = devtools.require("devtools/server/actors/root");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/settings.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/settings.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/settings.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/settings.js	2015-02-28 15:03:00.000000000 +0000
@@ -123,6 +123,11 @@
       }
     });
   });
+
+  // Debug flag
+  SettingsListener.observe('ril.debugging.enabled', false, function(value) {
+    Services.prefs.setBoolPref('ril.debugging.enabled', value);
+  });
 })();
 
 //=================== DeviceInfo ====================
@@ -617,4 +622,3 @@
     setPref(prefName, value);
   });
 };
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/shell.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/shell.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/shell.css	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/shell.css	2015-02-28 15:03:00.000000000 +0000
@@ -9,10 +9,20 @@
   height: 100%;
   padding: 0 !important;
 }
-
 body {
   margin: 0;
   width: 100%;
   height: 100%;
   overflow: hidden;
 }
+iframe {
+  overflow: hidden;
+  height: 100%;
+  width: 100%;
+  border: none;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/shell.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/shell.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/content/shell.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/content/shell.js	2015-02-28 15:03:00.000000000 +0000
@@ -311,8 +311,7 @@
     systemAppFrame.setAttribute('mozbrowser', 'true');
     systemAppFrame.setAttribute('mozapp', manifestURL);
     systemAppFrame.setAttribute('allowfullscreen', 'true');
-    systemAppFrame.setAttribute('style', "overflow: hidden; height: 100%; width: 100%; border: none; position: absolute; left: 0; top: 0; right: 0; bottom: 0;");
-    systemAppFrame.setAttribute('src', "data:text/html;charset=utf-8,%3C!DOCTYPE html>%3Cbody style='background:black;");
+    systemAppFrame.setAttribute('src', 'blank.html');
     let container = document.getElementById('container');
 #ifdef MOZ_WIDGET_COCOA
     // See shell.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/chrome/jar.mn	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/chrome/jar.mn	2015-02-28 15:03:00.000000000 +0000
@@ -13,6 +13,8 @@
 * content/shell.html                    (content/shell.html)
 * content/shell.js                      (content/shell.js)
   content/shell.css                     (content/shell.css)
+  content/blank.html                    (content/blank.html)
+  content/blank.css                     (content/blank.css)
 #ifdef MOZ_WIDGET_GONK
   content/devtools/adb.js               (content/devtools/adb.js)
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/dolphin/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/dolphin/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/dolphin/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/dolphin/sources.xml	2015-02-28 15:03:00.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="cdaa0a4ac28c781709df8c318ed079e9e475503a">
+  <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="620aecfde85a8b093247837c55de2708e22be1e1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
   <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="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <!-- 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"/>
@@ -115,10 +115,10 @@
   <project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="f7d9bf71cf6693474f3f2a81a4ba62c0fc5646aa"/>
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="cfcef469537869947abb9aa1d656774cc2678d4c"/>
   <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5a48c04c4bb5f079bc757e29864a42427378e051"/>
-  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="9d83b3a8e72c773820ada75e5a2cd128a743cf35"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="e0fc03e0a3062063c3c85996dcc881c0a49ed98d"/>
   <project name="platform/system/extras" path="system/extras" revision="10e78a05252b3de785f88c2d0b9ea8a428009c50"/>
   <project name="platform/system/media" path="system/media" revision="7ff72c2ea2496fa50b5e8a915e56e901c3ccd240"/>
-  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="85df9b5036010d9aa057c72cdfc7c86fc51f7c10"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="8f7d94ac711af4678169805137c6c42def39b3ed"/>
   <project name="platform/system/netd" path="system/netd" revision="3ae56364946d4a5bf5a5f83f12f9a45a30398e33"/>
   <project name="platform/system/security" path="system/security" revision="ee8068b9e7bfb2770635062fc9c2035be2142bd8"/>
   <project name="platform/system/vold" path="system/vold" revision="2e43efe1b30d0b98574d293059556aebd2f46454"/>
@@ -134,11 +134,11 @@
   <project name="platform/hardware/akm" path="hardware/akm" revision="6d3be412647b0eab0adff8a2768736cf4eb68039"/>
   <project groups="invensense" name="platform/hardware/invensense" path="hardware/invensense" revision="e6d9ab28b4f4e7684f6c07874ee819c9ea0002a2"/>
   <project name="platform/hardware/ril" path="hardware/ril" revision="865ce3b4a2ba0b3a31421ca671f4d6c5595f8690"/>
-  <project name="kernel/common" path="kernel" revision="0b4249f88cb8faadfbf80be207af14198dec08e3"/>
+  <project name="kernel/common" path="kernel" revision="1ef12a094a59d966a2576d0991a3618b591a7da9"/>
   <project name="platform/system/core" path="system/core" revision="53d584d4a4b4316e4de9ee5f210d662f89b44e7e"/>
-  <project name="u-boot" path="u-boot" revision="6980cf8f8cf9c1d43ff92b7af13425a5ed531d12"/>
+  <project name="u-boot" path="u-boot" revision="f1502910977ac88f43da7bf9277c3523ad4b0b2f"/>
   <project name="vendor/sprd/gps" path="vendor/sprd/gps" revision="6974f8e771d4d8e910357a6739ab124768891e8f"/>
-  <project name="vendor/sprd/open-source" path="vendor/sprd/open-source" revision="f56ab768cb9f1ad42fb0809ffec1424b1e693369"/>
+  <project name="vendor/sprd/open-source" path="vendor/sprd/open-source" revision="c985699a5140b6dd5c7a43295e4d4397ce9b1267"/>
   <project name="vendor/sprd/partner" path="vendor/sprd/partner" revision="8649c7145972251af11b0639997edfecabfc7c2e"/>
   <project name="vendor/sprd/proprietories" path="vendor/sprd/proprietories" revision="d2466593022f7078aaaf69026adf3367c2adb7bb"/>
 </manifest>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator/sources.xml	2015-02-28 15:03:00.000000000 +0000
@@ -15,17 +15,17 @@
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
-  <project name="platform_build" path="build" remote="b2g" revision="6295c4eb38de793159368aa7f745ef3faf7208aa">
+  <project name="platform_build" path="build" remote="b2g" revision="173b3104bfcbd23fc9dccd4b0035fc49aae3d444">
     <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="620aecfde85a8b093247837c55de2708e22be1e1"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eb1795a9002eb142ac58c8d68f8f4ba094af07ca"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="2c31ac3a31a340b40ecd9c291df9b9613d3afa72"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="97c3d9b8b87774ca7a08c89145e95b55652459ef"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
   <project name="platform_bionic" path="bionic" remote="b2g" revision="e2b3733ba3fa5e3f404e983d2e4142b1f6b1b846"/>
@@ -82,7 +82,7 @@
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="7a182ff25e44f2bc66448a9b9738a97ab43aaaaf"/>
   <project name="platform/external/zlib" path="external/zlib" revision="d381d56e7dd4572a47935b353c8893727f5f50cb"/>
   <project name="platform/external/yaffs2" path="external/yaffs2" revision="ccb649c33105a3f537dd4e71111d7afe0dd5e95c"/>
-  <project name="platform/frameworks/base" path="frameworks/base" revision="612ca9c6a55bd932c45f5b85ae932a1b712dd914"/>
+  <project name="platform_frameworks_base" path="frameworks/base" remote="b2g" revision="6afc63abe52776ae6a1d32a2d927e630a743a86a"/>
   <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="7f2253709fc8ec200997a684b44ad946ba813f16"/>
   <project name="platform/frameworks/support" path="frameworks/support" revision="b0d785331d7dc80ac06daa12434830ddcea7cc52"/>
   <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="8d951a39a693d00e90e3d8c4d64fe619d0a1e72f"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-ics/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-ics/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-ics/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-ics/sources.xml	2015-02-28 15:03:00.000000000 +0000
@@ -15,17 +15,17 @@
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
-  <project name="platform_build" path="build" remote="b2g" revision="6295c4eb38de793159368aa7f745ef3faf7208aa">
+  <project name="platform_build" path="build" remote="b2g" revision="173b3104bfcbd23fc9dccd4b0035fc49aae3d444">
     <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="620aecfde85a8b093247837c55de2708e22be1e1"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eb1795a9002eb142ac58c8d68f8f4ba094af07ca"/>
-  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="2c31ac3a31a340b40ecd9c291df9b9613d3afa72"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="97c3d9b8b87774ca7a08c89145e95b55652459ef"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
   <project name="platform_bionic" path="bionic" remote="b2g" revision="e2b3733ba3fa5e3f404e983d2e4142b1f6b1b846"/>
@@ -82,7 +82,7 @@
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="7a182ff25e44f2bc66448a9b9738a97ab43aaaaf"/>
   <project name="platform/external/zlib" path="external/zlib" revision="d381d56e7dd4572a47935b353c8893727f5f50cb"/>
   <project name="platform/external/yaffs2" path="external/yaffs2" revision="ccb649c33105a3f537dd4e71111d7afe0dd5e95c"/>
-  <project name="platform/frameworks/base" path="frameworks/base" revision="612ca9c6a55bd932c45f5b85ae932a1b712dd914"/>
+  <project name="platform_frameworks_base" path="frameworks/base" remote="b2g" revision="6afc63abe52776ae6a1d32a2d927e630a743a86a"/>
   <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="7f2253709fc8ec200997a684b44ad946ba813f16"/>
   <project name="platform/frameworks/support" path="frameworks/support" revision="b0d785331d7dc80ac06daa12434830ddcea7cc52"/>
   <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="8d951a39a693d00e90e3d8c4d64fe619d0a1e72f"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-jb/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-jb/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-jb/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-jb/sources.xml	2015-02-28 15:03:00.000000000 +0000
@@ -12,15 +12,15 @@
   <!--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="ac778ae59be38aea284a04c89640b1a11c26a5de">
+  <project name="platform_build" path="build" remote="b2g" revision="4efd19d199ae52656604f794c5a77518400220fd">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </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="620aecfde85a8b093247837c55de2708e22be1e1"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
@@ -117,10 +117,10 @@
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="842e33e43a55ea44833b9e23e4d180fa17c843af"/>
   <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5db24726f0f42124304195a6bdea129039eeeaeb"/>
   <project name="platform/system/bluetooth" path="system/bluetooth" revision="930ae098543881f47eac054677726ee4b998b2f8"/>
-  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="9d83b3a8e72c773820ada75e5a2cd128a743cf35"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="e0fc03e0a3062063c3c85996dcc881c0a49ed98d"/>
   <project name="platform_system_core" path="system/core" remote="b2g" revision="542d1f59dc331b472307e5bd043101d14d5a3a3e"/>
   <project name="platform/system/extras" path="system/extras" revision="18c1180e848e7ab8691940481f5c1c8d22c37b3e"/>
-  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="85df9b5036010d9aa057c72cdfc7c86fc51f7c10"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="8f7d94ac711af4678169805137c6c42def39b3ed"/>
   <project name="platform/system/media" path="system/media" revision="d90b836f66bf1d9627886c96f3a2d9c3007fbb80"/>
   <project name="platform/system/netd" path="system/netd" revision="56112dd7b811301b718d0643a82fd5cac9522073"/>
   <project name="platform/system/security" path="system/security" revision="f48ff68fedbcdc12b570b7699745abb6e7574907"/>
@@ -135,7 +135,7 @@
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="c5f8d282efe4a4e8b1e31a37300944e338e60e4f"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="9f28c4faea3b2f01db227b2467b08aeba96d9bec"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d19dad5844e8803d5e88d1577a2742b4f5cbc467"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="84395037a7a04546e8ef7cb81572eb516b85562b"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="8b1365af38c9a653df97349ee53a3f5d64fd590a"/>
   <project name="darwinstreamingserver" path="system/darwinstreamingserver" remote="b2g" revision="cf85968c7f85e0ec36e72c87ceb4837a943b8af6"/>
 </manifest>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-kk/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-kk/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-kk/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-kk/sources.xml	2015-02-28 15:03:00.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="cdaa0a4ac28c781709df8c318ed079e9e475503a">
+  <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="620aecfde85a8b093247837c55de2708e22be1e1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
   <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="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <!-- 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"/>
@@ -115,10 +115,10 @@
   <project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="f7d9bf71cf6693474f3f2a81a4ba62c0fc5646aa"/>
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="b562b01c93de9578d5db537b6a602a38e1aaa0ce"/>
   <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="387f03e815f57d536dd922706db1622bddba8d81"/>
-  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="9d83b3a8e72c773820ada75e5a2cd128a743cf35"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="e0fc03e0a3062063c3c85996dcc881c0a49ed98d"/>
   <project name="platform/system/extras" path="system/extras" revision="5356165f67f4a81c2ef28671c13697f1657590df"/>
   <project name="platform/system/media" path="system/media" revision="be0e2fe59a8043fa5200f75697df9220a99abe9d"/>
-  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="85df9b5036010d9aa057c72cdfc7c86fc51f7c10"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="8f7d94ac711af4678169805137c6c42def39b3ed"/>
   <project name="platform/system/netd" path="system/netd" revision="36704b0da24debcab8090156568ac236315036bb"/>
   <project name="platform/system/security" path="system/security" revision="583374f69f531ba68fc3dcbff1f74893d2a96406"/>
   <project name="platform/system/vold" path="system/vold" revision="d4455b8cf361f8353e8aebac15ffd64b4aedd2b9"/>
@@ -131,7 +131,7 @@
   <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="f5f7fa2fc26b96d2cbd0af4569c0036fe034bb43"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="fbd2becab3825c49e756db5149552f85049c66e2"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="694cecf256122d0cb3b6a1a4efb4b5c7401db223"/>
-  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="c3971822a2b6ddddf92be818083717959af10304"/>
+  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="f810abaa47932079396ea3815df65fbdd83b1f94"/>
   <project name="platform/development" path="development" revision="5968ff4e13e0d696ad8d972281fc27ae5a12829b"/>
   <project name="android-sdk" path="sdk" remote="b2g" revision="0951179277915335251c5e11d242e4e1a8c2236f"/>
   <project name="darwinstreamingserver" path="system/darwinstreamingserver" remote="b2g" revision="cf85968c7f85e0ec36e72c87ceb4837a943b8af6"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-l/config.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-l/config.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-l/config.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-l/config.json	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "config_version": 2,
+    "tooltool_manifest": "releng-emulator-l.tt",
+    "mock_target": "mozilla-centos6-x86_64",
+    "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
+    "mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
+    "build_targets": ["droid", "package-emulator", "package-tests"],
+    "upload_files": [
+        "{workdir}/out/target/product/generic/*.tar.bz2",
+        "{workdir}/out/target/product/generic/tests/*.zip",
+        "{workdir}/out/emulator.tar.gz",
+        "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
+        "{workdir}/sources.xml"
+    ],
+    "public_upload_files": [
+        "{workdir}/out/target/product/generic/*.tar.bz2",
+        "{workdir}/out/target/product/generic/tests/*.zip",
+        "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
+        "{objdir}/dist/b2g-*.tar.gz",
+        "{workdir}/sources.xml"
+    ],
+    "upload_platform": "emulator-l",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
+    "gaia": {
+        "l10n": {
+            "vcs": "hgtool",
+            "root": "https://hg.mozilla.org/gaia-l10n"
+        }
+    },
+    "b2g_manifest": "emulator-l.xml",
+    "b2g_manifest_intree": true
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-l/releng-emulator-l.tt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-l/releng-emulator-l.tt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-l/releng-emulator-l.tt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-l/releng-emulator-l.tt	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,9 @@
+[
+{
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512",
+"filename": "gcc.tar.xz",
+"unpack": "True"
+}
+]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-l/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-l/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/emulator-l/sources.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/emulator-l/sources.xml	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,151 @@
+<?xml version="1.0" ?><manifest>
+  <!--original fetch url was https://android.googlesource.com/-->
+  <remote fetch="https://git.mozilla.org/external/aosp" name="aosp"/>
+  <!--original fetch url was git://github.com/mozilla-b2g/-->
+  <remote fetch="https://git.mozilla.org/b2g" name="b2g"/>
+  <!--original fetch url was git://github.com/mozilla/-->
+  <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
+  <!--original fetch url was git://github.com/apitrace/-->
+  <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
+  <!--original fetch url was git://codeaurora.org/-->
+  <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
+  <!--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="52775e03a2d8532429dff579cb2cd56718e488c3">
+    <copyfile dest="Makefile" src="core/root.mk"/>
+  </project>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
+  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
+  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
+  <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
+  <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="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
+  <!-- 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="50d1ca4ab8add54523b7bc692860d57e8ee4c0d1"/>
+  <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="fb3845864573857677f9b500040a8f011eaf5078"/>
+  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="354496e8eddd28c743d8e02c02eeab02958367e6"/>
+  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" revision="b37c91354272b7413a0dc058b7445e677921d39e"/>
+  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" revision="a227c92e0170bcf2296a63386956946b0dd78ca7"/>
+  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="884626610186b6dbea52cec5194b1c4bcfe1cb98"/>
+  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" revision="29f9b82faa1af9730f52e933dca848546cbea84c"/>
+  <project groups="linux" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="0c2ee5a39ca67d5fceeeee4b55baa3e9c01f0dca"/>
+  <project name="device/common" path="device/common" revision="20de8dac0204c1a15ba305d0913749d8736455e6"/>
+  <project name="device/sample" path="device/sample" revision="e6dc0e5648eeab3c1f7b7bccf2d277ba89cc5dd4"/>
+  <project name="platform/abi/cpp" path="abi/cpp" revision="811d1ba9b99353d3d88378fd6d944d33f935a735"/>
+  <project name="platform/bionic" path="bionic" revision="68e8555eea90ce70eabdaa8c9b2f00ddda103c4e"/>
+  <project name="platform/bootable/recovery" path="bootable/recovery" revision="7ae254886b35f13b338b3c48bdc484e76329ba17"/>
+  <project name="platform/external/aac" path="external/aac" revision="c5c637158b23360310d330905e354a1dcd1220a7"/>
+  <project name="platform/external/bison" path="external/bison" revision="27b034c868a896f78154132910ebf279c14a7aea"/>
+  <project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="3c0b9cd51d643e0bf6f01c6d8b07fce25e3b2778"/>
+  <project name="platform/external/bsdiff" path="external/bsdiff" revision="7f634b9ed876d9d9b9a7e58c3e671b7a01ec411d"/>
+  <project name="platform/external/bzip2" path="external/bzip2" revision="997e320d341281512b1b1c3a1087f87328c74453"/>
+  <project name="platform/external/checkpolicy" path="external/checkpolicy" revision="f819e420440e14418927366148373537796173b7"/>
+  <project name="platform/external/clang" path="external/clang" revision="5692adcdd1dec21baf7aef57249cc9a32de05314"/>
+  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="e2565ddc676409d3cbf6b6a46c9fca6dfe953d5d"/>
+  <project name="platform/external/dhcpcd" path="external/dhcpcd" revision="84e2cbce82c0e7374f75771c708336fcdf1ecefa"/>
+  <project name="platform/external/dnsmasq" path="external/dnsmasq" revision="38895f25447b72f2749564fa4444616347d335e3"/>
+  <project name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="6bf16cd4eefe67583db6efd8ecf72571f5d8d249"/>
+  <project name="platform/external/elfutils" path="external/elfutils" revision="17541cad868bfd18e6148d4fa3dc3a7d20a25732"/>
+  <project name="platform/external/expat" path="external/expat" revision="f49624e0fef9915a3a8326b46e91cb4c464555e4"/>
+  <project name="platform/external/f2fs-tools" path="external/f2fs-tools" revision="fc24ac8347630a14d62ffafa93a27ec3b81cc44b"/>
+  <project name="platform/external/fdlibm" path="external/fdlibm" revision="de3b2c981c66345b51fbf0822e4058c36eecb9ac"/>
+  <project name="platform/external/flac" path="external/flac" revision="4477379717f7b0fa20a8f0614f970c70d373cb7b"/>
+  <project name="platform/external/freetype" path="external/freetype" revision="33a0a0c5b597e7b5ab2cada25ae411d9bb42ff26"/>
+  <project name="platform/external/gcc-demangle" path="external/gcc-demangle" revision="2be5e099459d0deaee9f2f779870fdf003a105dc"/>
+  <project name="platform/external/genext2fs" path="external/genext2fs" revision="30158c8359ddab07867c01a472b2a0afec3bd87b"/>
+  <project name="platform/external/giflib" path="external/giflib" revision="81d8b32f20d35036f0ffd3f8388122a449252d28"/>
+  <project name="platform/external/gtest" path="external/gtest" revision="f86535d49037cb8ba5fc65202a9d3ad7614e4647"/>
+  <project name="platform/external/harfbuzz_ng" path="external/harfbuzz_ng" revision="37dfd64c0134cb4473b2750d1a54e29abeab0290"/>
+  <project name="platform/external/icu" path="external/icu" revision="7a2a040f28d700f0f1538b442bef816b665214c9"/>
+  <project name="platform/external/iproute2" path="external/iproute2" revision="3c143dd332acaaea50af2e9a3a0ea47cd235a807"/>
+  <project name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="003a6d9b6f990bfbf0e4f04dfdb2084eb52f2f05"/>
+  <project name="platform/external/iptables" path="external/iptables" revision="33890e955960f8ac8f88c28beb779346b57e0c15"/>
+  <project name="platform/external/jack" path="external/jack" revision="f416b56a51c2b47bdaa72b542973846b7b3d5cea"/>
+  <project name="platform/external/jemalloc" path="external/jemalloc" revision="2dc8e0401cea426ec2524da2dacf6070b98d9bf7"/>
+  <project name="platform/external/jhead" path="external/jhead" revision="cab94ace65c4ebb0ba466e2f884078454f5e14d8"/>
+  <project name="platform/external/jpeg" path="external/jpeg" revision="c78f0d394e6a65cdf679a5c437a4092482a42972"/>
+  <project name="platform/external/jsmn" path="external/jsmn" revision="b38b4fe9a246bf36b821c542d0712d8c38699ac0"/>
+  <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="d2c5c6cdb5e8315b8ad02f0f3259e67c89f82a21"/>
+  <project name="platform/external/junit" path="external/junit" revision="ea4284c223ecedb4094af8fb1e44b8d7a453ad95"/>
+  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="bb937c1004a8705f22422f8b96176e135471215c"/>
+  <project name="platform/external/libcxx" path="external/libcxx" revision="4242ca3e7c035aebc9895d18c22fa3394577cbdf"/>
+  <project name="platform/external/libgsm" path="external/libgsm" revision="e9d878fc0e5485544e54919a32d621d4281f8cc0"/>
+  <project name="platform/external/liblzf" path="external/liblzf" revision="b61d5b6275ddb9688777dda6b3196fa6b671811e"/>
+  <project name="platform/external/libnfc-nxp" path="external/libnfc-nxp" revision="84022905ba12dc0a71a38f652d4325447559ac0d"/>
+  <project name="platform/external/libnl" path="external/libnl" revision="77a22ce82e6aca58206321558e5ef283c673e8c3"/>
+  <project name="platform/external/libogg" path="external/libogg" revision="ce31af3deb35cfa7801907ab47dd567f7342f728"/>
+  <project name="platform/external/libopus" path="external/libopus" revision="48641b8569f2e4706d0745b5392a1ea51959a7d2"/>
+  <project name="platform/external/libpcap" path="external/libpcap" revision="2e6cfa7b97a305d36c9d7305e17bff1e89430c00"/>
+  <project name="platform/external/libpng" path="external/libpng" revision="1ee9d65ed400cdd1865140e34ceac503c47f5697"/>
+  <project name="platform/external/libselinux" path="external/libselinux" revision="5c3fe1dec7cd818dcd7af8742b7d9349359109dc"/>
+  <project name="platform/external/libsepol" path="external/libsepol" revision="ebb551cc7b2db5af523758a5bae6b4336885f274"/>
+  <project name="platform/external/libunwind" path="external/libunwind" revision="9a5b400cc8b62a8df95a22307b4ad9470e5699d2"/>
+  <project name="platform/external/libvpx" path="external/libvpx" revision="ae97799c21f85b0b16e4c9720a45d5d10fccb552"/>
+  <project name="platform/external/llvm" path="external/llvm" revision="4c69c3c662cf672e89f827aaab6bbb2eee4d3cea"/>
+  <project name="platform/external/mdnsresponder" path="external/mdnsresponder" revision="c2361f084d4d2ef3ff5f89cd2b73122f6a729612"/>
+  <project name="platform/external/mksh" path="external/mksh" revision="8b9324223df9b4e4754f9b13c1229f7e8c92fd5a"/>
+  <project name="platform/external/netcat" path="external/netcat" revision="e81a29a522fe7df9c1803478de07d050dd82a71e"/>
+  <project name="platform/external/openssl" path="external/openssl" revision="49e31f1f0e48744f3113bc36dee5182186251238"/>
+  <project name="platform/external/pcre" path="external/pcre" revision="24cc1690dbc0525d42184db5781954414802413d"/>
+  <project name="platform/external/protobuf" path="external/protobuf" revision="766926b875dac06bde2b96b0c3f8d28c8647a4c4"/>
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="990aa0668849d1d88c4a12f9e0039a7981cf4c7a"/>
+  <project name="platform/external/scrypt" path="external/scrypt" revision="4593ce16971f9704e7810052567aecf803f812b0"/>
+  <project name="platform/external/sepolicy" path="external/sepolicy" revision="c105aabfdd2f3efe02ed8c5b51025b55e54b632d"/>
+  <project name="platform/external/sfntly" path="external/sfntly" revision="3ab9ff62deba8ec0b6de91c675cac39e0b17fbd3"/>
+  <project name="platform/external/skia" path="external/skia" revision="72b56c79228338ddd5ec5b70bf5d42154f592705"/>
+  <project name="platform/external/sonivox" path="external/sonivox" revision="425b4dd3a2994e262f7c1f0e1ed5ebe3ece41eea"/>
+  <project name="platform/external/speex" path="external/speex" revision="fc41a0b3eda8aba60d213288ac845ad7610144c9"/>
+  <project name="platform/external/sqlite" path="external/sqlite" revision="933fe9d087995054be1a90c969bb2ae538f52a0f"/>
+  <project name="platform/external/stlport" path="external/stlport" revision="d2c2e9e77ff8af17dbd8bafb10b6882d16f877fb"/>
+  <project name="platform/external/strace" path="external/strace" revision="13aaaead6e65b6dcb55c4d6b16588577804f0d1a"/>
+  <project name="platform/external/svox" path="external/svox" revision="04dc7d54a9f6c4a9c943cf6440ad45823fbc4e3f"/>
+  <project name="platform/external/tagsoup" path="external/tagsoup" revision="ae474049a3f8129316266bc6aac3337c9a135a29"/>
+  <project name="platform/external/tcpdump" path="external/tcpdump" revision="9f6a22df2778388d8992b6c3bbaef412b35d583b"/>
+  <project name="platform/external/tinyalsa" path="external/tinyalsa" revision="c9c11a4e003f1ded33fbfde0a4bae032b0538235"/>
+  <project name="platform/external/tinycompress" path="external/tinycompress" revision="cfc3e36e320bcb46da2dda9f94b2852cb76c61c5"/>
+  <project name="platform/external/tinyxml2" path="external/tinyxml2" revision="cb31036a6e8213d59646dcee369e63dd4023b732"/>
+  <project name="platform/external/tinyxml" path="external/tinyxml" revision="c758d7fa7252c2690838b18eb92c796dd1698a8e"/>
+  <project name="platform/external/tremolo" path="external/tremolo" revision="2e50b37fd997644ebb1b769f6963977a129a0578"/>
+  <project name="platform/external/webp" path="external/webp" revision="f6fc76c4baeeacfc933e75ad14e721b742c0c99b"/>
+  <project name="platform/external/webrtc" path="external/webrtc" revision="701d8ae1fe80514e8be0bb8e481e309bed8baf92"/>
+  <project name="platform/external/yaffs2" path="external/yaffs2" revision="2da1900eb304796e96c1b7575163b0489fc2eb80"/>
+  <project name="platform/external/zlib" path="external/zlib" revision="78dd4cb86e1c4e6a644c2222abe0f53e739bf868"/>
+  <project name="platform/external/zopfli" path="external/zopfli" revision="139e51d6095b5f89dfdd9bc5d33b35500cd7869a"/>
+  <project name="platform/frameworks/native" path="frameworks/native" revision="a0c1c949e35a44aa9018d1b4803cb2d833c16d59"/>
+  <project name="platform/frameworks/opt/emoji" path="frameworks/opt/emoji" revision="4af3e0b694fa015b2fed61f4508cf01fab2f58b9"/>
+  <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="7ed97eeed061e95b466f24693c2f0120f40e2bf5"/>
+  <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="a9a2f3f3f17b4e1ab0d3b00a67b4c5250e26194f"/>
+  <project name="platform/libcore" path="libcore" revision="1a07f00d8163f497a785a3285ec55fe551ba95c1"/>
+  <project name="platform/libnativehelper" path="libnativehelper" revision="4834b58ed7af3ee69523177e00e55603ac90ed50"/>
+  <project name="platform/ndk" path="ndk" revision="869c05cab7b4315c2bc607493db3f5b18ead2580"/>
+  <project name="platform_prebuilts_misc" path="prebuilts/misc" remote="b2g" revision="da8b660db117e2a69a7624bfdca2f02cad397f2e"/>
+  <project name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="5fd638a4a0ff3677fc3c970fab038d6db1bb7665"/>
+  <project name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="530cad9b205442d2db29361e796299dc323ef9ce"/>
+  <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="a982f43b7f2d5916dc3a859667a8ba78e50b6202"/>
+  <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="6e18b61ee446bdd9880c07ae84197a087490c2e5"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="e0fc03e0a3062063c3c85996dcc881c0a49ed98d"/>
+  <project name="platform/system/extras" path="system/extras" revision="18f7c51415917eb0e21b30f220db7bd0be4130a7"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="8f7d94ac711af4678169805137c6c42def39b3ed"/>
+  <project name="platform/system/media" path="system/media" revision="adf8fbacf7395858884690df5e3ce46bc75fa683"/>
+  <project name="platform/system/netd" path="system/netd" revision="655392625db084a7122d65a15acf74db7f1da7f7"/>
+  <project name="platform/system/security" path="system/security" revision="e6b3fdd892ad994ec3fd0b8959d630e31881801b"/>
+  <project name="platform/system/vold" path="system/vold" revision="eb59d2afd5f6e1cbab2ef985a8dd1c7105b499e8"/>
+  <project name="platform_frameworks_av" path="frameworks/av" remote="b2g" revision="ea531874885eed7f68802048218ed86dde927f58"/>
+  <project name="platform_frameworks_base" path="frameworks/base" remote="b2g" revision="df7e0cfbbc7e954ed26c73ac17832a5ff035f046"/>
+  <project name="platform_frameworks_wilhelm" path="frameworks/wilhelm" remote="b2g" revision="73f7e7f12c8c5459f7a39e2fa343f083c942864d"/>
+  <project name="platform_system_core" path="system/core" remote="b2g" revision="4df51d9abf6cc9a6ec49b965e621699e0e6dc4fb"/>
+  <default remote="caf" revision="refs/tags/android-5.0.0_r6" sync-j="4"/>
+  <!-- Emulator specific things -->
+  <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="ba62cc8b78c30d36181b8060a2016cc8da166236"/>
+  <project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="1b9f134d62536c5727575d1f0a5bd4eeb4747d66"/>
+  <!-- external/qemu for emulator-l need to be updated in bug-1121378 -->
+  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="7639c5c496ffd207bb627f2a59b2c5203ae6fefc"/>
+  <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="16abda2258c9aa1ed78f00bb0a9b2b43b4cb919e"/>
+  <project name="android-sdk" path="sdk" remote="b2g" revision="94704df982a90d2ab74bd620d54155d148c415b2"/>
+  <!-- hardware-ril for emulator-l need to be updated in bug-1113054 -->
+  <project name="platform/hardware/ril" path="hardware/ril" revision="71dfa8228ad0d6cdf6bac0426ac59404ab74b7f3"/>
+</manifest>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/flame/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/flame/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/flame/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/flame/sources.xml	2015-02-28 15:03:00.000000000 +0000
@@ -12,15 +12,15 @@
   <!--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="ac778ae59be38aea284a04c89640b1a11c26a5de">
+  <project name="platform_build" path="build" remote="b2g" revision="4efd19d199ae52656604f794c5a77518400220fd">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </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="620aecfde85a8b093247837c55de2708e22be1e1"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
@@ -145,7 +145,7 @@
   <project name="platform/hardware/ril" path="hardware/ril" revision="c4e2ac95907a5519a0e09f01a0d8e27fec101af0"/>
   <project name="platform/system/bluetooth" path="system/bluetooth" revision="e1eb226fa3ad3874ea7b63c56a9dc7012d7ff3c2"/>
   <project name="platform/system/core" path="system/core" revision="adc485d8755af6a61641d197de7cfef667722580"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d19dad5844e8803d5e88d1577a2742b4f5cbc467"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="84395037a7a04546e8ef7cb81572eb516b85562b"/>
   <project name="platform/system/qcom" path="system/qcom" revision="1cdab258b15258b7f9657da70e6f06ebd5a2fc25"/>
   <project name="platform/vendor/qcom/msm8610" path="device/qcom/msm8610" revision="4ae5df252123591d5b941191790e7abed1bce5a4"/>
   <project name="platform/vendor/qcom-opensource/wlan/prima" path="vendor/qcom/opensource/wlan/prima" revision="ce18b47b4a4f93a581d672bbd5cb6d12fe796ca9"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/flame-kk/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/flame-kk/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/flame-kk/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/flame-kk/sources.xml	2015-02-28 15:03:00.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="cdaa0a4ac28c781709df8c318ed079e9e475503a">
+  <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="620aecfde85a8b093247837c55de2708e22be1e1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
   <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="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <!-- 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"/>
@@ -109,9 +109,9 @@
   <project name="platform_prebuilts_qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="f7d9bf71cf6693474f3f2a81a4ba62c0fc5646aa"/>
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="69d524e80cdf3981006627c65ac85f3a871238a3"/>
   <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5a48c04c4bb5f079bc757e29864a42427378e051"/>
-  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="9d83b3a8e72c773820ada75e5a2cd128a743cf35"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="e0fc03e0a3062063c3c85996dcc881c0a49ed98d"/>
   <project name="platform/system/extras" path="system/extras" revision="576f57b6510de59c08568b53c0fb60588be8689e"/>
-  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="85df9b5036010d9aa057c72cdfc7c86fc51f7c10"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="8f7d94ac711af4678169805137c6c42def39b3ed"/>
   <project name="platform/system/netd" path="system/netd" revision="a6531f7befb49b1c81bc0de7e51c5482b308e1c5"/>
   <project name="platform/system/security" path="system/security" revision="ee8068b9e7bfb2770635062fc9c2035be2142bd8"/>
   <project name="platform/system/vold" path="system/vold" revision="42fa2a0f14f965970a4b629a176bbd2666edf017"/>
@@ -146,7 +146,7 @@
   <project name="platform/hardware/ril" path="hardware/ril" revision="12b1977cc704b35f2e9db2bb423fa405348bc2f3"/>
   <project name="platform/system/bluetooth" path="system/bluetooth" revision="985bf15264d865fe7b9c5b45f61c451cbaafa43d"/>
   <project name="platform/system/core" path="system/core" revision="42839aedcf70bf6bc92a3b7ea4a5cc9bf9aef3f9"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d19dad5844e8803d5e88d1577a2742b4f5cbc467"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="84395037a7a04546e8ef7cb81572eb516b85562b"/>
   <project name="platform/system/qcom" path="system/qcom" revision="63e3f6f176caad587d42bba4c16b66d953fb23c2"/>
   <project name="platform/vendor/qcom-opensource/wlan/prima" path="vendor/qcom/opensource/wlan/prima" revision="d8952a42771045fca73ec600e2b42a4c7129d723"/>
   <project name="platform/vendor/qcom/msm8610" path="device/qcom/msm8610" revision="4c187c1f3a0dffd8e51a961735474ea703535b99"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/gaia.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/gaia.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/gaia.json	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/gaia.json	2015-02-28 15:03:00.000000000 +0000
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "620aecfde85a8b093247837c55de2708e22be1e1", 
+        "git_revision": "f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "42da22fe3d59646d07bad417e194969dd2cc891d", 
+    "revision": "c00390d70e15726ba3e4c50bd2353fbf991f25c9", 
     "repo_path": "integration/gaia-central"
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/nexus-4/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/nexus-4/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/nexus-4/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/nexus-4/sources.xml	2015-02-28 15:03:00.000000000 +0000
@@ -12,15 +12,15 @@
   <!--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="ac778ae59be38aea284a04c89640b1a11c26a5de">
+  <project name="platform_build" path="build" remote="b2g" revision="4efd19d199ae52656604f794c5a77518400220fd">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </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="620aecfde85a8b093247837c55de2708e22be1e1"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
@@ -117,10 +117,10 @@
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="842e33e43a55ea44833b9e23e4d180fa17c843af"/>
   <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="5db24726f0f42124304195a6bdea129039eeeaeb"/>
   <project name="platform/system/bluetooth" path="system/bluetooth" revision="930ae098543881f47eac054677726ee4b998b2f8"/>
-  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="9d83b3a8e72c773820ada75e5a2cd128a743cf35"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="e0fc03e0a3062063c3c85996dcc881c0a49ed98d"/>
   <project name="platform_system_core" path="system/core" remote="b2g" revision="542d1f59dc331b472307e5bd043101d14d5a3a3e"/>
   <project name="platform/system/extras" path="system/extras" revision="18c1180e848e7ab8691940481f5c1c8d22c37b3e"/>
-  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="85df9b5036010d9aa057c72cdfc7c86fc51f7c10"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="8f7d94ac711af4678169805137c6c42def39b3ed"/>
   <project name="platform/system/media" path="system/media" revision="d90b836f66bf1d9627886c96f3a2d9c3007fbb80"/>
   <project name="platform/system/netd" path="system/netd" revision="56112dd7b811301b718d0643a82fd5cac9522073"/>
   <project name="platform/system/security" path="system/security" revision="f48ff68fedbcdc12b570b7699745abb6e7574907"/>
@@ -130,7 +130,7 @@
   <project name="device-mako" path="device/lge/mako" remote="b2g" revision="78d17f0c117f0c66dd55ee8d5c5dde8ccc93ecba"/>
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="3a9a17613cc685aa232432566ad6cc607eab4ec1"/>
   <project name="device/lge/mako-kernel" path="device/lge/mako-kernel" revision="d1729e53d71d711c8fde25eab8728ff2b9b4df0e"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d19dad5844e8803d5e88d1577a2742b4f5cbc467"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="84395037a7a04546e8ef7cb81572eb516b85562b"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="7d33aaf740bbf6c7c6e9c34a92b371eda311b66b"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
   <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="0e1929fa3aa38bf9d40e9e953d619fab8164c82e"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/nexus-5-l/config.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/nexus-5-l/config.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/nexus-5-l/config.json	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/nexus-5-l/config.json	2015-02-28 15:03:00.000000000 +0000
@@ -29,7 +29,7 @@
         ["{workdir}/gecko/tools/rb/fix_stack_using_bpsyms.py", "gecko/tools/rb/"]
     ],
     "env": {
-        "VARIANT": "user",
+        "VARIANT": "userdebug",
         "MOZILLA_OFFICIAL": "1",
         "MOZ_TELEMETRY_REPORTING": "1",
         "B2G_UPDATE_CHANNEL": "nightly"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/nexus-5-l/sources.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/nexus-5-l/sources.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/config/nexus-5-l/sources.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/config/nexus-5-l/sources.xml	2015-02-28 15:03:00.000000000 +0000
@@ -12,24 +12,25 @@
   <!--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="7f2ee9f4cb926684883fc2a2e407045fd9db2199">
+  <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="620aecfde85a8b093247837c55de2708e22be1e1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f34ce82a840ad3c0aed3bfff18517b3f6a0eb37f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
+  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2e85143db5d5f6edc4c2b97263c02b558fee757e"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="c42985975f2bbc42859b9136ed348186d989b93d"/>
   <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="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="a1ddea3133e0807350326cee5dcf0d06fad00c08"/>
   <!-- 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="50d1ca4ab8add54523b7bc692860d57e8ee4c0d1"/>
   <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="fb3845864573857677f9b500040a8f011eaf5078"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="354496e8eddd28c743d8e02c02eeab02958367e6"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" revision="b37c91354272b7413a0dc058b7445e677921d39e"/>
   <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" revision="a227c92e0170bcf2296a63386956946b0dd78ca7"/>
+  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="884626610186b6dbea52cec5194b1c4bcfe1cb98"/>
   <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" revision="29f9b82faa1af9730f52e933dca848546cbea84c"/>
   <project groups="linux" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="0c2ee5a39ca67d5fceeeee4b55baa3e9c01f0dca"/>
   <project name="device/common" path="device/common" revision="20de8dac0204c1a15ba305d0913749d8736455e6"/>
@@ -126,9 +127,9 @@
   <project name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="530cad9b205442d2db29361e796299dc323ef9ce"/>
   <project name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="a982f43b7f2d5916dc3a859667a8ba78e50b6202"/>
   <project name="platform/prebuilts/tools" path="prebuilts/tools" revision="6e18b61ee446bdd9880c07ae84197a087490c2e5"/>
-  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="9d83b3a8e72c773820ada75e5a2cd128a743cf35"/>
+  <project name="platform_system_bluetoothd" path="system/bluetoothd" remote="b2g" revision="e0fc03e0a3062063c3c85996dcc881c0a49ed98d"/>
   <project name="platform/system/extras" path="system/extras" revision="18f7c51415917eb0e21b30f220db7bd0be4130a7"/>
-  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="85df9b5036010d9aa057c72cdfc7c86fc51f7c10"/>
+  <project name="platform_system_libfdio" path="system/libfdio" remote="b2g" revision="8f7d94ac711af4678169805137c6c42def39b3ed"/>
   <project name="platform/system/media" path="system/media" revision="adf8fbacf7395858884690df5e3ce46bc75fa683"/>
   <project name="platform/system/netd" path="system/netd" revision="655392625db084a7122d65a15acf74db7f1da7f7"/>
   <project name="platform/system/security" path="system/security" revision="e6b3fdd892ad994ec3fd0b8959d630e31881801b"/>
@@ -140,7 +141,7 @@
   <default remote="caf" revision="refs/tags/android-5.0.0_r6" sync-j="4"/>
   <!-- Nexus 5 specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="ba62cc8b78c30d36181b8060a2016cc8da166236"/>
-  <project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="b765862a60e0063fc2451f5e3e137247dd9838c3"/>
+  <project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="a6f00b0d7519168329ca4a3f66d3be30d66e0c9e"/>
   <project name="device/qcom/common" path="device/qcom/common" remote="caf" revision="3697e5acf25629b82658334e3f8ee3b6df5becab"/>
   <project name="device_lge_hammerhead-kernel" path="device/lge/hammerhead-kernel" remote="b2g" revision="1268f640184df5ef759ada669f101a613451673a"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="0cb8574d338bf9f15b45ace7c08ad6deae9673ee"/>
@@ -156,5 +157,5 @@
   <project name="platform/hardware/qcom/sensors" path="hardware/qcom/sensors" revision="3724fd91ef5183684d97e2bf1d7ff948faabe090"/>
   <project name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="2e54754cc0529d26ccac37ed291600048adbf6c0"/>
   <project name="platform/hardware/ril" path="hardware/ril" revision="71dfa8228ad0d6cdf6bac0426ac59404ab74b7f3"/>
-  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d19dad5844e8803d5e88d1577a2742b4f5cbc467"/>
+  <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="84395037a7a04546e8ef7cb81572eb516b85562b"/>
 </manifest>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/confvars.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/confvars.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/confvars.sh	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/confvars.sh	2015-02-28 15:03:00.000000000 +0000
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=38.0a1
+MOZ_APP_VERSION=39.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_UA_OS_AGNOSTIC=1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/installer/package-manifest.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/installer/package-manifest.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/installer/package-manifest.in	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/installer/package-manifest.in	2015-02-28 15:03:00.000000000 +0000
@@ -537,6 +537,8 @@
 @BINPATH@/components/formautofill.manifest
 @BINPATH@/components/FormAutofillContentService.js
 @BINPATH@/components/FormAutofillStartup.js
+@BINPATH@/components/CSSUnprefixingService.js
+@BINPATH@/components/CSSUnprefixingService.manifest
 @BINPATH@/components/contentAreaDropListener.manifest
 @BINPATH@/components/contentAreaDropListener.js
 @BINPATH@/components/messageWakeupService.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/b2g/locales/en-US/chrome/overrides/appstrings.properties	2015-02-28 15:03:00.000000000 +0000
@@ -34,3 +34,4 @@
 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.
+sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/app/blocklist.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/app/blocklist.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/app/blocklist.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/app/blocklist.xml	2015-02-28 15:03:00.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1423697587000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1424991539000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
@@ -73,6 +73,14 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i862" id="{CA8C84C6-3918-41b1-BE77-049B2BDD887C}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                    <prefs>
+                  <pref>browser.startup.homepage</pref>
+                  <pref>browser.search.defaultenginename</pref>
+              </prefs>
+    </emItem>
       <emItem  blockID="i430" id="1chtw@facebook.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
@@ -121,8 +129,8 @@
                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i810" id="{41339ee8-61ed-489d-b049-01e41fd5d7e0}">
-                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+      <emItem  blockID="i364" id="{FE1DEEEA-DB6D-44b8-83F0-34FC0F9D1052}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                     <prefs>
               </prefs>
@@ -387,7 +395,7 @@
                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i404" id="{a9bb9fa0-4122-4c75-bd9a-bc27db3f9155}">
+      <emItem  blockID="i860" id="PrivDog@AdTrustMedia.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                     <prefs>
@@ -742,6 +750,12 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i340" id="chiang@programmer.net">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i99" id="pfzPXmnzQRXX6@2iABkVe.com">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
@@ -1020,6 +1034,12 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i91" id="crossriderapp4926@crossrider.com">
+                        <versionRange  minVersion="0" maxVersion="0.81.43" severity="1">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i700" id="2bbadf1f-a5af-499f-9642-9942fcdb7c76@f05a14cc-8842-4eee-be17-744677a917ed.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
@@ -1960,8 +1980,8 @@
                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i364" id="{FE1DEEEA-DB6D-44b8-83F0-34FC0F9D1052}">
-                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+      <emItem  blockID="i810" id="{41339ee8-61ed-489d-b049-01e41fd5d7e0}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
                     <prefs>
               </prefs>
@@ -2084,8 +2104,8 @@
                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i340" id="chiang@programmer.net">
-                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+      <emItem  blockID="i866" id="faststartff@gmail.com">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                     <prefs>
               </prefs>
@@ -2157,12 +2177,26 @@
                     <prefs>
               </prefs>
     </emItem>
-      <emItem  blockID="i91" id="crossriderapp4926@crossrider.com">
-                        <versionRange  minVersion="0" maxVersion="0.81.43" severity="1">
+      <emItem  blockID="i404" id="{a9bb9fa0-4122-4c75-bd9a-bc27db3f9155}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i868" id="{6e7f6f9f-8ce6-4611-add2-05f0f7049ee6}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
+      <emItem  blockID="i864" id="{0A92F062-6AC6-8180-5881-B6E0C0DC2CC5}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                    <prefs>
+                  <pref>browser.startup.homepage</pref>
+                  <pref>browser.search.defaultenginename</pref>
+              </prefs>
+    </emItem>
       <emItem  blockID="i814" id="liiros@facebook.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/app/permissions thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/app/permissions
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/app/permissions	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/app/permissions	2015-02-28 15:03:00.000000000 +0000
@@ -8,6 +8,7 @@
 
 # UITour
 host	uitour	1	www.mozilla.org
+host	uitour	1	self-repair.mozilla.org
 host	uitour	1	support.mozilla.org
 host	uitour	1	about:home
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/app/profile/firefox.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/app/profile/firefox.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/app/profile/firefox.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/app/profile/firefox.js	2015-02-28 15:03:00.000000000 +0000
@@ -860,11 +860,7 @@
 #endif
 
 // Toggles between the two Preferences implementations, pop-up window and in-content
-#ifdef EARLY_BETA_OR_EARLIER
 pref("browser.preferences.inContent", true);
-#else
-pref("browser.preferences.inContent", false);
-#endif
 
 pref("browser.download.show_plugins_in_list", true);
 pref("browser.download.hide_plugins_without_extensions", true);
@@ -1032,6 +1028,8 @@
 pref("browser.rights.override", true);
 #endif
 
+pref("browser.selfsupport.url", "http://self-repair.mozilla.org/%LOCALE%/repair");
+
 pref("browser.sessionstore.resume_from_crash", true);
 pref("browser.sessionstore.resume_session_once", false);
 
@@ -1168,6 +1166,12 @@
 // Disable Flash protected mode to reduce hang/crash rates.
 pref("dom.ipc.plugins.flash.disable-protected-mode", true);
 
+// Feature-disable the protected-mode auto-flip
+pref("browser.flash-protected-mode-flip.enable", true);
+
+// Whether we've already flipped protected mode automatically
+pref("browser.flash-protected-mode-flip.done", false);
+
 #ifdef XP_MACOSX
 // On mac, the default pref is per-architecture
 pref("dom.ipc.plugins.enabled.i386", true);
@@ -1214,6 +1218,18 @@
 #endif
 #endif
 
+#if defined(XP_MACOSX) && defined(MOZ_SANDBOX) && defined(MOZ_CONTENT_SANDBOX)
+// This pref is discussed in bug 1083344, the naming is inspired from its Windows
+// counterpart, but on Mac it's an integer which means:
+// 0 -> "no sandbox"
+// 1 -> "an imperfect sandbox designed to allow firefox to run reasonably well"
+// 2 -> "an ideal sandbox which may break many things"
+// This setting is read when the content process is started. On Mac the content
+// process is killed when all windows are closed, so a change will take effect
+// when the 1st window is opened.
+pref("security.sandbox.macos.content.level", 0);
+#endif
+
 // This pref governs whether we attempt to work around problems caused by
 // plugins using OS calls to manipulate the cursor while running out-of-
 // process.  These workarounds all involve intercepting (hooking) certain
@@ -1320,7 +1336,7 @@
 
 // Developer edition promo preferences
 pref("devtools.devedition.promo.shown", false);
-pref("devtools.devedition.promo.url", "https://mozilla.org/firefox/developer");
+pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/?utm_source=firefox-dev-tools&utm_medium=firefox-browser&utm_content=betadoorhanger");
 
 // Only potentially show in beta release
 #if MOZ_UPDATE_CHANNEL == beta
@@ -1422,6 +1438,9 @@
 #else
 pref("devtools.timeline.enabled", false);
 #endif
+
+// TODO remove `devtools.timeline.hiddenMarkers.` branches when performance
+// tool lands (bug 1075567)
 pref("devtools.timeline.hiddenMarkers", "[]");
 
 // Enable perftools via build command
@@ -1439,6 +1458,7 @@
 pref("devtools.profiler.ui.show-idle-blocks", true);
 
 // The default Performance UI settings
+pref("devtools.performance.timeline.hidden-markers", "[]");
 pref("devtools.performance.ui.invert-call-tree", true);
 pref("devtools.performance.ui.invert-flame-graph", false);
 pref("devtools.performance.ui.flatten-tree-recursion", true);
@@ -1497,6 +1517,9 @@
 // Enable the Web Audio Editor
 pref("devtools.webaudioeditor.enabled", false);
 
+// Web Audio Editor Inspector Width should be a preference
+pref("devtools.webaudioeditor.inspectorWidth", 300);
+
 // Default theme ("dark" or "light")
 #ifdef MOZ_DEV_EDITION
 pref("devtools.theme", "dark");
@@ -1554,6 +1577,9 @@
 // Text size in the Web Console. Use 0 for the system default size.
 pref("devtools.webconsole.fontSize", 0);
 
+// Max number of inputs to store in web console history.
+pref("devtools.webconsole.inputHistoryCount", 50);
+
 // Persistent logging: |true| if you want the Web Console to keep all of the
 // logged messages after reloading the page, |false| if you want the output to
 // be cleared each time page navigation happens.
@@ -1660,7 +1686,7 @@
 pref("shumway.disabled", true);
 #else
 pref("shumway.disabled", false);
-pref("shumway.swf.whitelist", "http://g-ecx.images-amazon.com/*/AiryBasicRenderer*.swf");
+pref("shumway.swf.whitelist", "http://g-ecx.images-amazon.com/*/AiryBasicRenderer*.swf,http://z-ecx.images-amazon.com/*/AiryFlashlsRenderer._TTW_.swf,http://ia.media-imdb.com/*/AiryFlashlsRenderer._TTW_.swf");
 #endif
 #endif
 
@@ -1692,15 +1718,17 @@
 pref("loop.debug.websocket", false);
 pref("loop.debug.sdk", false);
 #ifdef DEBUG
-pref("loop.CSP", "default-src 'self' about: file: chrome: http://localhost:*; img-src 'self' data: http://www.gravatar.com/ about: file: chrome:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net http://localhost:* ws://localhost:*; media-src blob:");
+pref("loop.CSP", "default-src 'self' about: file: chrome: http://localhost:*; img-src 'self' data: https://www.gravatar.com/ about: file: chrome:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net http://localhost:* ws://localhost:*; media-src blob:");
 #else
-pref("loop.CSP", "default-src 'self' about: file: chrome:; img-src 'self' data: http://www.gravatar.com/ about: file: chrome:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net; media-src blob:");
+pref("loop.CSP", "default-src 'self' about: file: chrome:; img-src 'self' data: https://www.gravatar.com/ about: file: chrome:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net; media-src blob:");
 #endif
 pref("loop.oauth.google.redirect_uri", "urn:ietf:wg:oauth:2.0:oob:auto");
 pref("loop.oauth.google.scope", "https://www.google.com/m8/feeds");
 pref("loop.fxa_oauth.tokendata", "");
 pref("loop.fxa_oauth.profile", "");
 pref("loop.support_url", "https://support.mozilla.org/kb/group-conversations-firefox-hello-webrtc");
+pref("loop.contacts.gravatars.show", false);
+pref("loop.contacts.gravatars.promo", true);
 
 // serverURL to be assigned by services team
 pref("services.push.serverURL", "wss://push.services.mozilla.com/");
@@ -1856,3 +1884,6 @@
 
 // Disable reader mode by default.
 pref("reader.parse-on-load.enabled", false);
+
+// Disable ReadingList by default.
+pref("browser.readinglist.enabled", false);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/abouthome/aboutHome.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/abouthome/aboutHome.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/abouthome/aboutHome.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/abouthome/aboutHome.js	2015-02-28 15:03:00.000000000 +0000
@@ -307,10 +307,11 @@
   if (engineName && searchTerms.length > 0) {
     // Send an event that will perform a search and Firefox Health Report will
     // record that a search from about:home has occurred.
-
+    let useNewTab = aEvent && aEvent.button == 1;
     let eventData = {
       engineName: engineName,
-      searchTerms: searchTerms
+      searchTerms: searchTerms,
+      useNewTab: useNewTab,
     };
 
     if (searchText.hasAttribute("selection-index")) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/aboutNetError.xhtml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/aboutNetError.xhtml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/aboutNetError.xhtml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/aboutNetError.xhtml	2015-02-28 15:03:00.000000000 +0000
@@ -156,24 +156,10 @@
           errDesc.id = "errorLongDesc";
         }
 
-        if (err == "nssFailure2" &&
-            sd.textContent.contains("ssl_error_unsupported_version")) {
-          var ssl3ErrorTitle = document.getElementById("et_ssl3");
-          var ssl3ErrorDesc = document.getElementById("ed_ssl3");
-          var ssl3ShortDesc = document.getElementById("esd_ssl3");
+        if (err == "sslv3Used") {
           var learnMoreText = document.getElementById("learn_more_ssl3");
 
-          errTitle.parentNode.replaceChild(ssl3ErrorTitle, errTitle);
-          ssl3ErrorTitle.id = "errorTitleText";
-          ssl3ErrorTitle.setAttribute("sslv3", "true");
-          errTitle = ssl3ErrorTitle;
-
-          sd.innerHTML = ssl3ShortDesc.innerHTML;
-          sd.querySelector('span').textContent = location.hostname;
-
-          errDesc.parentNode.replaceChild(ssl3ErrorDesc, errDesc);
-          ssl3ErrorDesc.id = "errorLongDesc";
-          ssl3ErrorDesc.querySelector('span').textContent = "ssl_error_unsupported_version";
+          errTitle.setAttribute("sslv3", "true");
 
           var retryBtn = document.getElementById("errorTryAgain");
           retryBtn.textContent = learnMoreText.textContent;
@@ -218,7 +204,7 @@
 
         window.addEventListener("AboutNetErrorOptions", function(evt) {
         // Pinning errors are of type nssFailure2
-          if (getErrorCode() == "nssFailure2" && !errTitle.hasAttribute("sslv3")) {
+          if (getErrorCode() == "nssFailure2") {
             var learnMoreLink = document.getElementById("learnMoreLink");
             // nssFailure2 also gets us other non-overrideable errors. Choose
             // a "learn more" link based on description:
@@ -391,7 +377,7 @@
         <h1 id="et_cspBlocked">&cspBlocked.title;</h1>
         <h1 id="et_remoteXUL">&remoteXUL.title;</h1>
         <h1 id="et_corruptedContentError">&corruptedContentError.title;</h1>
-        <h1 id="et_ssl3">&oldSecurityProtocol.title;</h1>
+        <h1 id="et_sslv3Used">&sslv3Used.title;</h1>
       </div>
       <div id="errorDescriptionsContainer">
         <div id="ed_generic">&generic.longDesc;</div>
@@ -418,9 +404,8 @@
         <div id="ed_cspBlocked">&cspBlocked.longDesc;</div>
         <div id="ed_remoteXUL">&remoteXUL.longDesc;</div>
         <div id="ed_corruptedContentError">&corruptedContentError.longDesc;</div>
-        <div id="esd_ssl3">&oldSecurityProtocol.longDesc2;</div>
-        <div id="ed_ssl3">&oldSecurityProtocol.advancedInfo;</div>
-        <div id="learn_more_ssl3">&oldSecurityProtocol.learnMore;</div>
+        <div id="ed_sslv3Used">&sslv3Used.longDesc;</div>
+        <div id="learn_more_ssl3">&sslv3Used.learnMore;</div>
       </div>
     </div>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-context.inc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-context.inc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-context.inc	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-context.inc	2015-02-28 15:03:00.000000000 +0000
@@ -156,7 +156,7 @@
       <menuitem id="context-video-fullscreen"
                 accesskey="&videoFullScreen.accesskey;"
                 label="&videoFullScreen.label;"
-                oncommand="gContextMenu.fullScreenVideo();"/>
+                oncommand="gContextMenu.mediaCommand('fullscreen');"/>
       <menuitem id="context-leave-dom-fullscreen"
                 accesskey="&leaveDOMFullScreen.accesskey;"
                 label="&leaveDOMFullScreen.label;"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser.css	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser.css	2015-02-28 15:03:00.000000000 +0000
@@ -908,6 +908,11 @@
   width: 260px; /* CHAT_WIDTH_OPEN in socialchat.xml */
 }
 
+chatbox[large="true"] {
+  width: 300px;
+  heigth: 272px;
+}
+
 chatbox[minimized="true"] {
   width: 160px;
   height: 20px; /* CHAT_WIDTH_MINIMIZED in socialchat.xml */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-eme.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-eme.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-eme.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-eme.js	2015-02-28 15:03:00.000000000 +0000
@@ -3,34 +3,191 @@
 # License, v. 2.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 gEMEListener(msg /*{target: browser, data: data} */) {
-  let browser = msg.target;
-  let notificationId = "drmContentPlaying";
-  // Don't need to show if disabled, nor reshow if it's already there
-  if (!Services.prefs.getBoolPref("browser.eme.ui.enabled") ||
-      PopupNotifications.getNotification(notificationId, browser)) {
-    return;
-  }
-
-  let msgId = "emeNotifications.drmContentPlaying.message";
-  let brandName = document.getElementById("bundle_brand").getString("brandShortName");
-  let message = gNavigatorBundle.getFormattedString(msgId, [msg.data.drmProvider, brandName]);
-  let anchorId = "eme-notification-icon";
-
-  let mainAction = {
-    label: gNavigatorBundle.getString("emeNotifications.drmContentPlaying.button.label"),
-    accessKey: gNavigatorBundle.getString("emeNotifications.drmContentPlaying.button.accesskey"),
-    callback: function() { openPreferences("paneContent"); },
-    dismiss: true
-  };
-  let options = {
-    dismissed: true,
-    eventCallback: aTopic => aTopic == "swapping",
-  };
-  PopupNotifications.show(browser, notificationId, message, anchorId, mainAction, null, options);
+let gEMEHandler = {
+  ensureEMEEnabled: function(browser, keySystem) {
+    Services.prefs.setBoolPref("media.eme.enabled", true);
+    if (keySystem) {
+      if (keySystem.startsWith("com.adobe") &&
+          Services.prefs.getPrefType("media.gmp-eme-adobe.enabled") &&
+          !Services.prefs.getBoolPref("media.gmp-eme-adobe.enabled")) {
+        Services.prefs.setBoolPref("media.gmp-eme-adobe.enabled", true);
+      } else if (keySystem == "org.w3.clearkey" &&
+                 Services.prefs.getPrefType("media.eme.clearkey.enabled") &&
+                 !Services.prefs.getBoolPref("media.eme.clearkey.enabled")) {
+        Services.prefs.setBoolPref("media.eme.clearkey.enabled", true);
+      }
+    }
+    browser.reload();
+  },
+  getLearnMoreLink: function(msgId) {
+    let text = gNavigatorBundle.getString("emeNotifications." + msgId + ".learnMoreLabel");
+    let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
+    return "<label class='text-link' href='" + baseURL + "drm-content'>" +
+           text + "</label>";
+  },
+  onDontAskAgain: function(menuPopupItem) {
+    let button = menuPopupItem.parentNode.anchorNode;
+    let bar = button.parentNode;
+    Services.prefs.setBoolPref("browser.eme.ui." + bar.value + ".disabled", true);
+    bar.close();
+  },
+  onNotNow: function(menuPopupItem) {
+    let button = menuPopupItem.parentNode.anchorNode;
+    button.parentNode.close();
+  },
+  receiveMessage: function({target: browser, data: data}) {
+    let parsedData;
+    try {
+      parsedData = JSON.parse(data);
+    } catch (ex) {
+      Cu.reportError("Malformed EME video message with data: " + data);
+      return;
+    }
+    let {status: status, keySystem: keySystem} = parsedData;
+    // Don't need to show if disabled
+    if (!Services.prefs.getBoolPref("browser.eme.ui.enabled")) {
+      return;
+    }
+
+    let notificationId;
+    let buttonCallback;
+    let params = [];
+    switch (status) {
+      case "available":
+      case "cdm-created":
+        this.showPopupNotificationForSuccess(browser, keySystem);
+        // ... and bail!
+        return;
+
+      case "api-disabled":
+      case "cdm-disabled":
+        notificationId = "drmContentDisabled";
+        buttonCallback = gEMEHandler.ensureEMEEnabled.bind(gEMEHandler, browser, keySystem)
+        params = [this.getLearnMoreLink(notificationId)];
+        break;
+
+      case "cdm-not-supported":
+        notificationId = "drmContentCDMNotSupported";
+        params = [this._brandShortName, this.getLearnMoreLink(notificationId)];
+        break;
+
+      case "cdm-insufficient-version":
+        notificationId = "drmContentCDMInsufficientVersion";
+        params = [this._brandShortName];
+        break;
+
+      case "cdm-not-installed":
+        notificationId = "drmContentCDMInstalling";
+        params = [this._brandShortName];
+        break;
+
+      case "error":
+        // Fall through and do the same for unknown messages:
+      default:
+        let typeOfIssue = status == "error" ? "error" : "message ('" + status + "')";
+        Cu.reportError("Unknown " + typeOfIssue + " dealing with EME key request: " + data);
+        return;
+    }
+
+    this.showNotificationBar(browser, notificationId, keySystem, params, buttonCallback);
+  },
+  showNotificationBar: function(browser, notificationId, keySystem, labelParams, callback) {
+    let box = gBrowser.getNotificationBox(browser);
+    if (box.getNotificationWithValue(notificationId)) {
+      return;
+    }
+
+    // If the user turned these off, bail out:
+    try {
+      if (Services.prefs.getBoolPref("browser.eme.ui." + notificationId + ".disabled")) {
+        return;
+      }
+    } catch (ex) { /* Don't care if the pref doesn't exist */ }
+
+    let msgPrefix = "emeNotifications." + notificationId + ".";
+    let msgId = msgPrefix + "message";
+
+    // Specialcase Adobe's CDM on unsupported platforms to be more informative:
+    if (notificationId == "drmContentCDMNotSupported" &&
+        keySystem.startsWith("com.adobe")) {
+      let os = Services.appinfo.OS.toLowerCase();
+      if (os.startsWith("win") && Services.appinfo.XPCOMABI.startsWith("x86_64")) {
+        msgId = msgPrefix + "64bit.message";
+      } else if (os.startsWith("linux") || os.startsWith("darwin")) {
+        msgId = msgPrefix + "unsupportedOS.message";
+        labelParams.splice(1, 0, os.startsWith("linux") ? "Linux" : "Mac OS X");
+      }
+    }
+
+    let message = labelParams.length ?
+                  gNavigatorBundle.getFormattedString(msgId, labelParams) :
+                  gNavigatorBundle.getString(msgId);
+
+    let buttons = [];
+    if (callback) {
+      let btnLabelId = msgPrefix + "button.label";
+      let btnAccessKeyId = msgPrefix + "button.accesskey";
+      buttons.push({
+        label: gNavigatorBundle.getString(btnLabelId),
+        accesskey: gNavigatorBundle.getString(btnAccessKeyId),
+        callback: callback
+      });
+
+      let optionsId = "emeNotifications.optionsButton";
+      buttons.push({
+        label: gNavigatorBundle.getString(optionsId + ".label"),
+        accesskey: gNavigatorBundle.getString(optionsId + ".accesskey"),
+        popup: "emeNotificationsPopup"
+      });
+    }
+
+    let iconURL = "chrome://browser/skin/drm-icon.svg#chains-black";
+
+    // Do a little dance to get rich content into the notification:
+    let fragment = document.createDocumentFragment();
+    let descriptionContainer = document.createElement("description");
+    descriptionContainer.innerHTML = message;
+    while (descriptionContainer.childNodes.length) {
+      fragment.appendChild(descriptionContainer.childNodes[0]);
+    }
+
+    box.appendNotification(fragment, notificationId, iconURL, box.PRIORITY_WARNING_MEDIUM,
+                           buttons);
+  },
+  showPopupNotificationForSuccess: function(browser, keySystem) {
+    // Don't bother creating it if it's already there:
+    if (PopupNotifications.getNotification("drmContentPlaying", browser)) {
+      return;
+    }
+
+    let msgPrefix = "emeNotifications.drmContentPlaying.";
+    let msgId = msgPrefix + "message2";
+    let btnLabelId = msgPrefix + "button.label";
+    let btnAccessKeyId = msgPrefix + "button.accesskey";
+
+    let message = gNavigatorBundle.getFormattedString(msgId, [this._brandShortName]);
+    let anchorId = "eme-notification-icon";
+
+    let mainAction = {
+      label: gNavigatorBundle.getString(btnLabelId),
+      accessKey: gNavigatorBundle.getString(btnAccessKeyId),
+      callback: function() { openPreferences("paneContent"); },
+      dismiss: true
+    };
+    let options = {
+      dismissed: true,
+      eventCallback: aTopic => aTopic == "swapping",
+    };
+    PopupNotifications.show(browser, "drmContentPlaying", message, anchorId, mainAction, null, options);
+  },
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIMessageListener])
 };
 
-window.messageManager.addMessageListener("EMEVideo:MetadataLoaded", gEMEListener);
+XPCOMUtils.defineLazyGetter(gEMEHandler, "_brandShortName", function() {
+  return document.getElementById("bundle_brand").getString("brandShortName");
+});
+
+window.messageManager.addMessageListener("EMEVideo:ContentMediaKeysRequest", gEMEHandler);
 window.addEventListener("unload", function() {
-  window.messageManager.removeMessageListener("EMEVideo:MetadataLoaded", gEMEListener);
+  window.messageManager.removeMessageListener("EMEVideo:ContentMediaKeysRequest", gEMEHandler);
 }, false);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser.js	2015-02-28 15:03:00.000000000 +0000
@@ -12,6 +12,11 @@
 Cu.import("resource:///modules/RecentWindow.jsm");
 Cu.import("resource://gre/modules/WindowsPrefSync.jsm");
 
+
+XPCOMUtils.defineLazyModuleGetter(this, "Preferences",
+                                  "resource://gre/modules/Preferences.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Deprecated",
+                                  "resource://gre/modules/Deprecated.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
                                   "resource:///modules/BrowserUITelemetry.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "E10SUtils",
@@ -32,6 +37,11 @@
                                   "resource:///modules/ContentSearch.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AboutHome",
                                   "resource:///modules/AboutHome.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Log",
+                                  "resource://gre/modules/Log.jsm");
+XPCOMUtils.defineLazyServiceGetter(this, "Favicons",
+                                   "@mozilla.org/browser/favicon-service;1",
+                                   "mozIAsyncFavicons");
 XPCOMUtils.defineLazyServiceGetter(this, "gDNSService",
                                    "@mozilla.org/network/dns-service;1",
                                    "nsIDNSService");
@@ -222,7 +232,9 @@
 #include browser-loop.js
 #include browser-places.js
 #include browser-plugins.js
+#include browser-readinglist.js
 #include browser-safebrowsing.js
+#include browser-sidebar.js
 #include browser-social.js
 #include browser-tabview.js
 #include browser-thumbnails.js
@@ -899,8 +911,6 @@
   delayedStartupFinished: false,
 
   onLoad: function() {
-    var mustLoadSidebar = false;
-
     gBrowser.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver, false);
 
     Services.obs.addObserver(gPluginHandler.pluginCrashed, "plugin-crashed", false);
@@ -952,61 +962,7 @@
     // setup history swipe animation
     gHistorySwipeAnimation.init();
 
-    if (window.opener && !window.opener.closed &&
-        window.opener.document.documentURIObject.schemeIs("chrome") &&
-        PrivateBrowsingUtils.isWindowPrivate(window) == PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
-      let openerSidebarBox = window.opener.document.getElementById("sidebar-box");
-      // If the opener had a sidebar, open the same sidebar in our window.
-      // The opener can be the hidden window too, if we're coming from the state
-      // where no windows are open, and the hidden window has no sidebar box.
-      if (openerSidebarBox && !openerSidebarBox.hidden) {
-        let sidebarCmd = openerSidebarBox.getAttribute("sidebarcommand");
-        let sidebarCmdElem = document.getElementById(sidebarCmd);
-
-        // dynamically generated sidebars will fail this check.
-        if (sidebarCmdElem) {
-          let sidebarBox = document.getElementById("sidebar-box");
-          let sidebarTitle = document.getElementById("sidebar-title");
-
-          sidebarTitle.setAttribute(
-            "value", window.opener.document.getElementById("sidebar-title").getAttribute("value"));
-          sidebarBox.setAttribute("width", openerSidebarBox.boxObject.width);
-
-          sidebarBox.setAttribute("sidebarcommand", sidebarCmd);
-          // Note: we're setting 'src' on sidebarBox, which is a <vbox>, not on
-          // the <browser id="sidebar">. This lets us delay the actual load until
-          // delayedStartup().
-          sidebarBox.setAttribute(
-            "src", window.opener.document.getElementById("sidebar").getAttribute("src"));
-          mustLoadSidebar = true;
-
-          sidebarBox.hidden = false;
-          document.getElementById("sidebar-splitter").hidden = false;
-          sidebarCmdElem.setAttribute("checked", "true");
-        }
-      }
-    }
-    else {
-      let box = document.getElementById("sidebar-box");
-      if (box.hasAttribute("sidebarcommand")) {
-        let commandID = box.getAttribute("sidebarcommand");
-        if (commandID) {
-          let command = document.getElementById(commandID);
-          if (command) {
-            mustLoadSidebar = true;
-            box.hidden = false;
-            document.getElementById("sidebar-splitter").hidden = false;
-            command.setAttribute("checked", "true");
-          }
-          else {
-            // Remove the |sidebarcommand| attribute, because the element it
-            // refers to no longer exists, so we should assume this sidebar
-            // panel has been uninstalled. (249883)
-            box.removeAttribute("sidebarcommand");
-          }
-        }
-      }
-    }
+    SidebarUI.init();
 
     // Certain kinds of automigration rely on this notification to complete
     // their tasks BEFORE the browser window is shown. SessionStore uses it to
@@ -1095,7 +1051,7 @@
     ToolbarIconColor.init();
 
     // Wait until chrome is painted before executing code not critical to making the window visible
-    this._boundDelayedStartup = this._delayedStartup.bind(this, mustLoadSidebar);
+    this._boundDelayedStartup = this._delayedStartup.bind(this);
     window.addEventListener("MozAfterPaint", this._boundDelayedStartup);
 
     this._loadHandled = true;
@@ -1106,7 +1062,7 @@
     this._boundDelayedStartup = null;
   },
 
-  _delayedStartup: function(mustLoadSidebar) {
+  _delayedStartup: function() {
     let tmp = {};
     Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
     let TelemetryTimestamps = tmp.TelemetryTimestamps;
@@ -1269,11 +1225,7 @@
 
     Services.telemetry.getHistogramById("E10S_WINDOW").add(gMultiProcessBrowser);
 
-    if (mustLoadSidebar) {
-      let sidebar = document.getElementById("sidebar");
-      let sidebarBox = document.getElementById("sidebar-box");
-      sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
-    }
+    SidebarUI.startDelayedLoad();
 
     UpdateUrlbarSearchSplitterState();
 
@@ -1427,6 +1379,7 @@
 
       SocialUI.init();
       TabView.init();
+      ReadingListUI.init();
 
       // Telemetry for master-password - we do this after 5 seconds as it
       // can cause IO if NSS/PSM has not already initialized.
@@ -1535,14 +1488,9 @@
 
     gMenuButtonUpdateBadge.uninit();
 
-    var enumerator = Services.wm.getEnumerator(null);
-    enumerator.getNext();
-    if (!enumerator.hasMoreElements()) {
-      document.persist("sidebar-box", "sidebarcommand");
-      document.persist("sidebar-box", "width");
-      document.persist("sidebar-box", "src");
-      document.persist("sidebar-title", "value");
-    }
+    ReadingListUI.uninit();
+
+    SidebarUI.uninit();
 
     // Now either cancel delayedStartup, or clean up the services initialized from
     // it.
@@ -1769,7 +1717,7 @@
     BrowserSearch.webSearch();
     break;
   case "Bookmarks":
-    toggleSidebar('viewBookmarksSidebar');
+    SidebarUI.toggle("viewBookmarksSidebar");
     break;
   case "Home":
     BrowserHome();
@@ -3139,23 +3087,19 @@
     else
       this._showChrome();
 
-    if (this._chromeState.sidebarOpen)
-      toggleSidebar(this._sidebarCommand);
-
     TabsInTitlebar.allowedBy("print-preview", !gInPrintPreviewMode);
   },
   _hideChrome: function () {
     this._chromeState = {};
 
-    var sidebar = document.getElementById("sidebar-box");
-    this._chromeState.sidebarOpen = !sidebar.hidden;
-    this._sidebarCommand = sidebar.getAttribute("sidebarcommand");
+    this._chromeState.sidebarOpen = SidebarUI.isOpen;
+    this._sidebarCommand = SidebarUI.currentID;
+    SidebarUI.hide();
 
     var notificationBox = gBrowser.getNotificationBox();
     this._chromeState.notificationsOpen = !notificationBox.notificationsHidden;
     notificationBox.notificationsHidden = true;
 
-    document.getElementById("sidebar").setAttribute("src", "about:blank");
     gBrowser.updateWindowResizers();
 
     this._chromeState.findOpen = gFindBarInitialized && !gFindBar.hidden;
@@ -3185,6 +3129,9 @@
 
     if (this._chromeState.syncNotificationsOpen)
       document.getElementById("sync-notifications").notificationsHidden = false;
+
+    if (this._chromeState.sidebarOpen)
+      SidebarUI.show(this._sidebarCommand);
   }
 }
 
@@ -5213,121 +5160,6 @@
   BrowserPageInfo(null, "securityTab");
 }
 
-/**
- * Opens or closes the sidebar identified by commandID.
- *
- * @param commandID a string identifying the sidebar to toggle; see the
- *                  note below. (Optional if a sidebar is already open.)
- * @param forceOpen boolean indicating whether the sidebar should be
- *                  opened regardless of its current state (optional).
- * @note
- * We expect to find a xul:broadcaster element with the specified ID.
- * The following attributes on that element may be used and/or modified:
- *  - id           (required) the string to match commandID. The convention
- *                 is to use this naming scheme: 'view<sidebar-name>Sidebar'.
- *  - sidebarurl   (required) specifies the URL to load in this sidebar.
- *  - sidebartitle or label (in that order) specify the title to
- *                 display on the sidebar.
- *  - checked      indicates whether the sidebar is currently displayed.
- *                 Note that toggleSidebar updates this attribute when
- *                 it changes the sidebar's visibility.
- *  - group        this attribute must be set to "sidebar".
- */
-function toggleSidebar(commandID, forceOpen) {
-
-  var sidebarBox = document.getElementById("sidebar-box");
-  if (!commandID)
-    commandID = sidebarBox.getAttribute("sidebarcommand");
-
-  var sidebarBroadcaster = document.getElementById(commandID);
-  var sidebar = document.getElementById("sidebar"); // xul:browser
-  var sidebarTitle = document.getElementById("sidebar-title");
-  var sidebarSplitter = document.getElementById("sidebar-splitter");
-
-  if (sidebarBroadcaster.getAttribute("checked") == "true") {
-    if (!forceOpen) {
-      // Replace the document currently displayed in the sidebar with about:blank
-      // so that we can free memory by unloading the page. We need to explicitly
-      // create a new content viewer because the old one doesn't get destroyed
-      // until about:blank has loaded (which does not happen as long as the
-      // element is hidden).
-      sidebar.setAttribute("src", "about:blank");
-      sidebar.docShell.createAboutBlankContentViewer(null);
-
-      sidebarBroadcaster.removeAttribute("checked");
-      sidebarBox.setAttribute("sidebarcommand", "");
-      sidebarTitle.value = "";
-      sidebarBox.hidden = true;
-      sidebarSplitter.hidden = true;
-      gBrowser.selectedBrowser.focus();
-    } else {
-      fireSidebarFocusedEvent();
-    }
-    return;
-  }
-
-  // now we need to show the specified sidebar
-
-  // ..but first update the 'checked' state of all sidebar broadcasters
-  var broadcasters = document.getElementsByAttribute("group", "sidebar");
-  for (let broadcaster of broadcasters) {
-    // skip elements that observe sidebar broadcasters and random
-    // other elements
-    if (broadcaster.localName != "broadcaster")
-      continue;
-
-    if (broadcaster != sidebarBroadcaster)
-      broadcaster.removeAttribute("checked");
-    else
-      sidebarBroadcaster.setAttribute("checked", "true");
-  }
-
-  sidebarBox.hidden = false;
-  sidebarSplitter.hidden = false;
-
-  var url = sidebarBroadcaster.getAttribute("sidebarurl");
-  var title = sidebarBroadcaster.getAttribute("sidebartitle");
-  if (!title)
-    title = sidebarBroadcaster.getAttribute("label");
-  sidebar.setAttribute("src", url); // kick off async load
-  sidebarBox.setAttribute("sidebarcommand", sidebarBroadcaster.id);
-  sidebarTitle.value = title;
-
-  // We set this attribute here in addition to setting it on the <browser>
-  // element itself, because the code in gBrowserInit.onUnload persists this
-  // attribute, not the "src" of the <browser id="sidebar">. The reason it
-  // does that is that we want to delay sidebar load a bit when a browser
-  // window opens. See delayedStartup().
-  sidebarBox.setAttribute("src", url);
-
-  if (sidebar.contentDocument.location.href != url)
-    sidebar.addEventListener("load", sidebarOnLoad, true);
-  else // older code handled this case, so we do it too
-    fireSidebarFocusedEvent();
-}
-
-function sidebarOnLoad(event) {
-  var sidebar = document.getElementById("sidebar");
-  sidebar.removeEventListener("load", sidebarOnLoad, true);
-  // We're handling the 'load' event before it bubbles up to the usual
-  // (non-capturing) event handlers. Let it bubble up before firing the
-  // SidebarFocused event.
-  setTimeout(fireSidebarFocusedEvent, 0);
-}
-
-/**
- * Fire a "SidebarFocused" event on the sidebar's |window| to give the sidebar
- * a chance to adjust focus as needed. An additional event is needed, because
- * we don't want to focus the sidebar when it's opened on startup or in a new
- * window, only when the user opens the sidebar.
- */
-function fireSidebarFocusedEvent() {
-  var sidebar = document.getElementById("sidebar");
-  var event = document.createEvent("Events");
-  event.initEvent("SidebarFocused", true, false);
-  sidebar.contentWindow.dispatchEvent(event);
-}
-
 
 var gHomeButton = {
   prefDomain: "browser.startup.homepage",
@@ -5474,38 +5306,37 @@
 }
 
 var gWebPanelURI;
-function openWebPanel(aTitle, aURI)
-{
-    // Ensure that the web panels sidebar is open.
-    toggleSidebar('viewWebPanelsSidebar', true);
-
-    // Set the title of the panel.
-    document.getElementById("sidebar-title").value = aTitle;
-
-    // Tell the Web Panels sidebar to load the bookmark.
-    var sidebar = document.getElementById("sidebar");
-    if (sidebar.docShell && sidebar.contentDocument && sidebar.contentDocument.getElementById('web-panels-browser')) {
-        sidebar.contentWindow.loadWebPanel(aURI);
-        if (gWebPanelURI) {
-            gWebPanelURI = "";
-            sidebar.removeEventListener("load", asyncOpenWebPanel, true);
-        }
+function openWebPanel(title, uri) {
+  // Ensure that the web panels sidebar is open.
+  SidebarUI.show("viewWebPanelsSidebar");
+
+  // Set the title of the panel.
+  SidebarUI.title = title;
+
+  // Tell the Web Panels sidebar to load the bookmark.
+  if (SidebarUI.browser.docShell && SidebarUI.browser.contentDocument &&
+      SidebarUI.browser.contentDocument.getElementById("web-panels-browser")) {
+    SidebarUI.browser.contentWindow.loadWebPanel(uri);
+    if (gWebPanelURI) {
+      gWebPanelURI = "";
+      SidebarUI.browser.removeEventListener("load", asyncOpenWebPanel, true);
     }
-    else {
-        // The panel is still being constructed.  Attach an onload handler.
-        if (!gWebPanelURI)
-            sidebar.addEventListener("load", asyncOpenWebPanel, true);
-        gWebPanelURI = aURI;
+  } else {
+    // The panel is still being constructed.  Attach an onload handler.
+    if (!gWebPanelURI) {
+      SidebarUI.browser.addEventListener("load", asyncOpenWebPanel, true);
     }
+    gWebPanelURI = uri;
+  }
 }
 
-function asyncOpenWebPanel(event)
-{
-    var sidebar = document.getElementById("sidebar");
-    if (gWebPanelURI && sidebar.contentDocument && sidebar.contentDocument.getElementById('web-panels-browser'))
-        sidebar.contentWindow.loadWebPanel(gWebPanelURI);
-    gWebPanelURI = "";
-    sidebar.removeEventListener("load", asyncOpenWebPanel, true);
+function asyncOpenWebPanel(event) {
+  if (gWebPanelURI && SidebarUI.browser.contentDocument &&
+      SidebarUI.browser.contentDocument.getElementById("web-panels-browser")) {
+    SidebarUI.browser.contentWindow.loadWebPanel(gWebPanelURI);
+  }
+  gWebPanelURI = "";
+  SidebarUI.browser.removeEventListener("load", asyncOpenWebPanel, true);
 }
 
 /*
@@ -7419,6 +7250,11 @@
       return;
     }
 
+    if (Services.appinfo.inSafeMode) {
+      // e10s isn't supported in safe mode, so don't show the menu items for it
+      return;
+    }
+
     let newRemoteWindow = document.getElementById("menu_newRemoteWindow");
     let newNonRemoteWindow = document.getElementById("menu_newNonRemoteWindow");
     let autostart = Services.appinfo.browserTabsRemoteAutostart;
@@ -7637,32 +7473,8 @@
 });
 
 // Prompt user to restart the browser in safe mode
-function safeModeRestart()
-{
-  // prompt the user to confirm
-  let promptTitle = gNavigatorBundle.getString("safeModeRestartPromptTitle");
-  let promptMessage =
-    gNavigatorBundle.getString("safeModeRestartPromptMessage");
-  let restartText = gNavigatorBundle.getString("safeModeRestartButton");
-  let buttonFlags = (Services.prompt.BUTTON_POS_0 *
-                     Services.prompt.BUTTON_TITLE_IS_STRING) +
-                    (Services.prompt.BUTTON_POS_1 *
-                     Services.prompt.BUTTON_TITLE_CANCEL) +
-                    Services.prompt.BUTTON_POS_0_DEFAULT;
-
-  let rv = Services.prompt.confirmEx(window, promptTitle, promptMessage,
-                                     buttonFlags, restartText, null, null,
-                                     null, {});
-  if (rv != 0)
-    return;
-
-  let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
-                     .createInstance(Ci.nsISupportsPRBool);
-  Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
-
-  if (!cancelQuit.data) {
-    Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit);
-  }
+function safeModeRestart() {
+  Services.obs.notifyObservers(null, "restart-in-safe-mode", "");
 }
 
 /* duplicateTabIn duplicates tab in a place specified by the parameter |where|.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-menubar.inc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-menubar.inc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-menubar.inc	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-menubar.inc	2015-02-28 15:03:00.000000000 +0000
@@ -223,6 +223,11 @@
                               key="key_gotoHistory"
                               observes="viewHistorySidebar"
                               label="&historyButton.label;"/>
+                    <menuitem id="menu_readingListSidebar"
+                              key="key_readingListSidebar"
+                              observes="readingListSidebar"
+                              label="&readingList.label;"/>
+
                     <!-- Service providers with sidebars are inserted between these two menuseperators -->
                     <menuseparator hidden="true"/>
                     <menuseparator class="social-provider-menu" hidden="true"/>
@@ -439,6 +444,30 @@
                    onpopupshowing="if (!this.parentNode._placesView)
                                      new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
       </menu>
+#ifndef XP_MACOSX
+# Disabled on Mac because we can't fill native menupopups asynchronously
+      <menuseparator id="menu_readingListSeparator">
+        <observes element="readingListSidebar" attribute="hidden"/>
+      </menuseparator>
+      <menu id="menu_readingList"
+            class="menu-iconic bookmark-item"
+            label="&readingList.label;"
+            container="true">
+        <observes element="readingListSidebar" attribute="hidden"/>
+        <menupopup id="readingListPopup"
+#ifndef XP_MACOSX
+                   placespopup="true"
+#endif
+                   onpopupshowing="ReadingListUI.onReadingListPopupShowing(this);">
+          <menuseparator id="viewReadingListSidebarSeparator"/>
+          <menuitem id="viewReadingListSidebar" class="subviewbutton"
+                    oncommand="SidebarUI.toggle('readingListSidebar');"
+                    label="&readingList.showSidebar.label;">
+            <observes element="readingListSidebar" attribute="checked"/>
+          </menuitem>
+        </menupopup>
+      </menu>
+#endif
       <menuseparator id="bookmarksMenuItemsSeparator"/>
       <!-- Bookmarks menu items -->
       <menuseparator builder="end"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-readinglist.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-readinglist.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-readinglist.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-readinglist.js	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,137 @@
+/*
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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, "ReadingList",
+  "resource:///modules/readinglist/ReadingList.jsm");
+
+let ReadingListUI = {
+  /**
+   * Initialize the ReadingList UI.
+   */
+  init() {
+    Preferences.observe("browser.readinglist.enabled", this.updateUI, this);
+    this.updateUI();
+  },
+
+  /**
+   * Un-initialize the ReadingList UI.
+   */
+  uninit() {
+    Preferences.ignore("browser.readinglist.enabled", this.updateUI, this);
+  },
+
+  /**
+   * Whether the ReadingList feature is enabled or not.
+   * @type {boolean}
+   */
+  get enabled() {
+    return Preferences.get("browser.readinglist.enabled", false);
+  },
+
+  /**
+   * Whether the ReadingList sidebar is currently open or not.
+   * @type {boolean}
+   */
+  get isSidebarOpen() {
+    return SidebarUI.isOpen && SidebarUI.currentID == "readingListSidebar";
+  },
+
+  /**
+   * Update the UI status, ensuring the UI is shown or hidden depending on
+   * whether the feature is enabled or not.
+   */
+  updateUI() {
+    let enabled = this.enabled;
+    if (!enabled) {
+      this.hideSidebar();
+    }
+
+    document.getElementById("readingListSidebar").setAttribute("hidden", !enabled);
+  },
+
+  /**
+   * Show the ReadingList sidebar.
+   * @return {Promise}
+   */
+  showSidebar() {
+    return SidebarUI.show("readingListSidebar");
+  },
+
+  /**
+   * Hide the ReadingList sidebar, if it is currently shown.
+   */
+  hideSidebar() {
+    if (this.isSidebarOpen) {
+      SidebarUI.hide();
+    }
+  },
+
+  onReadingListPopupShowing(target) {
+    if (target.id == "BMB_readingListPopup") {
+      // Setting this class in the .xul file messes with the way
+      // browser-places.js inserts bookmarks in the menu.
+      document.getElementById("BMB_viewReadingListSidebar")
+              .classList.add("panel-subview-footer");
+    }
+
+    while (!target.firstChild.id)
+      target.firstChild.remove();
+
+    let classList = "menuitem-iconic bookmark-item menuitem-with-favicon";
+    let insertPoint = target.firstChild;
+    if (insertPoint.classList.contains("subviewbutton"))
+      classList += " subviewbutton";
+
+    ReadingList.getItems().then(items => {
+      for (let item of items) {
+        let menuitem = document.createElement("menuitem");
+        menuitem.setAttribute("label", item.title || item.url.spec);
+        menuitem.setAttribute("class", classList);
+
+        let node = menuitem._placesNode = {
+          // Passing the PlacesUtils.nodeIsURI check is required for the
+          // onCommand handler to load our URI.
+          type: Ci.nsINavHistoryResultNode.RESULT_TYPE_URI,
+
+          // makes PlacesUIUtils.canUserRemove return false.
+          // The context menu is broken without this.
+          parent: {type: Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER},
+
+          // A -1 id makes this item a non-bookmark, which avoids calling
+          // PlacesUtils.annotations.itemHasAnnotation to check if the
+          // bookmark should be opened in the sidebar (this call fails for
+          // readinglist item, and breaks loading our URI).
+          itemId: -1,
+
+          // Used by the tooltip and onCommand handlers.
+          uri: item.url.spec,
+
+          // Used by the tooltip.
+          title: item.title
+        };
+
+        Favicons.getFaviconURLForPage(item.url, uri => {
+          if (uri) {
+            menuitem.setAttribute("image",
+                                  Favicons.getFaviconLinkForIcon(uri).spec);
+          }
+        });
+
+        target.insertBefore(menuitem, insertPoint);
+      }
+
+      if (!items.length) {
+        let menuitem = document.createElement("menuitem");
+        let bundle =
+          Services.strings.createBundle("chrome://browser/locale/places/places.properties");
+        menuitem.setAttribute("label", bundle.GetStringFromName("bookmarksMenuEmptyFolder"));
+        menuitem.setAttribute("class", "bookmark-item");
+        menuitem.setAttribute("disabled", true);
+        target.insertBefore(menuitem, insertPoint);
+      }
+    });
+  }
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-sets.inc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-sets.inc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-sets.inc	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-sets.inc	2015-02-28 15:03:00.000000000 +0000
@@ -101,7 +101,7 @@
     <command id="Tools:WebIDE" oncommand="gDevToolsBrowser.openWebIDE();" disabled="true" hidden="true"/>
     <command id="Tools:BrowserToolbox" oncommand="BrowserToolboxProcess.init();" disabled="true" hidden="true"/>
     <command id="Tools:BrowserContentToolbox" oncommand="gDevToolsBrowser.openContentProcessToolbox();" disabled="true" hidden="true"/>
-    <command id="Tools:BrowserConsole" oncommand="HUDService.toggleBrowserConsole();"/>
+    <command id="Tools:BrowserConsole" oncommand="HUDService.openBrowserConsoleOrFocus();"/>
     <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();"/>
     <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();"/>
     <command id="Tools:Eyedropper" oncommand="openEyedropper();"/>
@@ -138,7 +138,7 @@
     <broadcaster id="Social:PageShareOrMark" disabled="true"/>
     <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
-                 oncommand="toggleSidebar('viewBookmarksSidebar');"/>
+                 oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/>
 
     <!-- for both places and non-places, the sidebar lives at
          chrome://browser/content/history/history-panel.xul so there are no
@@ -146,11 +146,16 @@
     <broadcaster id="viewHistorySidebar" autoCheck="false" sidebartitle="&historyButton.label;"
                  type="checkbox" group="sidebar"
                  sidebarurl="chrome://browser/content/history/history-panel.xul"
-                 oncommand="toggleSidebar('viewHistorySidebar');"/>
+                 oncommand="SidebarUI.toggle('viewHistorySidebar');"/>
+
+    <broadcaster id="readingListSidebar" hidden="true" autoCheck="false"
+                 sidebartitle="&readingList.label;" type="checkbox" group="sidebar"
+                 sidebarurl="chrome://browser/content/readinglist/sidebar.xhtml"
+                 oncommand="SidebarUI.toggle('readingListSidebar');"/>
 
     <broadcaster id="viewWebPanelsSidebar" autoCheck="false"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
-                 oncommand="toggleSidebar('viewWebPanelsSidebar');"/>
+                 oncommand="SidebarUI.toggle('viewWebPanelsSidebar');"/>
 
     <broadcaster id="bookmarkThisPageBroadcaster"
                  label="&bookmarkThisPageCmd.label;"
@@ -418,6 +423,11 @@
 #endif
          command="viewHistorySidebar"/>
 
+    <key id="key_readingListSidebar"
+         key="&readingList.sidebar.commandKey;"
+         modifiers="accel,alt"
+         command="readingListSidebar"/>
+
     <key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key                          key="&fullZoomReduceCmd.commandkey2;"  command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"  command="cmd_fullZoomEnlarge" modifiers="accel"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-sidebar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-sidebar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-sidebar.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-sidebar.js	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,322 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+/**
+ * SidebarUI controls showing and hiding the browser sidebar.
+ *
+ * @note
+ * Some of these methods take a commandID argument - we expect to find a
+ * xul:broadcaster element with the specified ID.
+ * The following attributes on that element may be used and/or modified:
+ *  - id           (required) the string to match commandID. The convention
+ *                 is to use this naming scheme: 'view<sidebar-name>Sidebar'.
+ *  - sidebarurl   (required) specifies the URL to load in this sidebar.
+ *  - sidebartitle or label (in that order) specify the title to
+ *                 display on the sidebar.
+ *  - checked      indicates whether the sidebar is currently displayed.
+ *                 Note that toggleSidebar updates this attribute when
+ *                 it changes the sidebar's visibility.
+ *  - group        this attribute must be set to "sidebar".
+ */
+let SidebarUI = {
+  browser: null,
+
+  _box: null,
+  _title: null,
+  _splitter: null,
+
+  init() {
+    this._box = document.getElementById("sidebar-box");
+    this.browser = document.getElementById("sidebar");
+    this._title = document.getElementById("sidebar-title");
+    this._splitter = document.getElementById("sidebar-splitter");
+
+    if (!this.adoptFromWindow(window.opener)) {
+      let commandID = this._box.getAttribute("sidebarcommand");
+      if (commandID) {
+        let command = document.getElementById(commandID);
+        if (command) {
+          this._delayedLoad = true;
+          this._box.hidden = false;
+          this._splitter.hidden = false;
+          command.setAttribute("checked", "true");
+        } else {
+          // Remove the |sidebarcommand| attribute, because the element it
+          // refers to no longer exists, so we should assume this sidebar
+          // panel has been uninstalled. (249883)
+          this._box.removeAttribute("sidebarcommand");
+        }
+      }
+    }
+  },
+
+  uninit() {
+    let enumerator = Services.wm.getEnumerator(null);
+    enumerator.getNext();
+    if (!enumerator.hasMoreElements()) {
+      document.persist("sidebar-box", "sidebarcommand");
+      document.persist("sidebar-box", "width");
+      document.persist("sidebar-box", "src");
+      document.persist("sidebar-title", "value");
+    }
+  },
+
+  /**
+   * Try and adopt the status of the sidebar from another window.
+   * @param {Window} sourceWindow - Window to use as a source for sidebar status.
+   * @return true if we adopted the state, or false if the caller should
+   * initialize the state itself.
+   */
+  adoptFromWindow(sourceWindow) {
+    // No source window, or it being closed, or not chrome, or in a different
+    // private-browsing context means we can't adopt.
+    if (!sourceWindow || sourceWindow.closed ||
+        !sourceWindow.document.documentURIObject.schemeIs("chrome") ||
+        PrivateBrowsingUtils.isWindowPrivate(window) != PrivateBrowsingUtils.isWindowPrivate(sourceWindow)) {
+      return false;
+    }
+
+    // If the opener had a sidebar, open the same sidebar in our window.
+    // The opener can be the hidden window too, if we're coming from the state
+    // where no windows are open, and the hidden window has no sidebar box.
+    let sourceUI = sourceWindow.SidebarUI;
+    if (!sourceUI || !sourceUI._box) {
+      // no source UI or no _box means we also can't adopt the state.
+      return false;
+    }
+    if (sourceUI._box.hidden) {
+      // just hidden means we have adopted the hidden state.
+      return true;
+    }
+
+    let commandID = sourceUI._box.getAttribute("sidebarcommand");
+    let commandElem = document.getElementById(commandID);
+
+    // dynamically generated sidebars will fail this check, but we still
+    // consider it adopted.
+    if (!commandElem) {
+      return true;
+    }
+
+    this._title.setAttribute("value",
+                             sourceUI._title.getAttribute("value"));
+    this._box.setAttribute("width", sourceUI._box.boxObject.width);
+
+    this._box.setAttribute("sidebarcommand", commandID);
+    // Note: we're setting 'src' on this._box, which is a <vbox>, not on
+    // the <browser id="sidebar">. This lets us delay the actual load until
+    // delayedStartup().
+    this._box.setAttribute("src", sourceUI.browser.getAttribute("src"));
+    this._delayedLoad = true;
+
+    this._box.hidden = false;
+    this._splitter.hidden = false;
+    commandElem.setAttribute("checked", "true");
+    return true;
+  },
+
+  /**
+   * If loading a sidebar was delayed on startup, start the load now.
+   */
+  startDelayedLoad() {
+    if (!this._delayedLoad) {
+      return;
+    }
+
+    this.browser.setAttribute("src", this._box.getAttribute("src"));
+  },
+
+  /**
+   * Fire a "SidebarFocused" event on the sidebar's |window| to give the sidebar
+   * a chance to adjust focus as needed. An additional event is needed, because
+   * we don't want to focus the sidebar when it's opened on startup or in a new
+   * window, only when the user opens the sidebar.
+   */
+  _fireFocusedEvent() {
+    let event = new CustomEvent("SidebarFocused", {bubbles: true});
+    this.browser.contentWindow.dispatchEvent(event);
+
+    // Run the original function for backwards compatibility.
+    fireSidebarFocusedEvent();
+  },
+
+  /**
+   * True if the sidebar is currently open.
+   */
+  get isOpen() {
+    return !this._box.hidden;
+  },
+
+  /**
+   * The ID of the current sidebar (ie, the ID of the broadcaster being used).
+   * This can be set even if the sidebar is hidden.
+   */
+  get currentID() {
+    return this._box.getAttribute("sidebarcommand");
+  },
+
+  get title() {
+    return this._title.value;
+  },
+
+  set title(value) {
+    this._title.value = value;
+  },
+
+  /**
+   * Toggle the visibility of the sidebar. If the sidebar is hidden or is open
+   * with a different commandID, then the sidebar will be opened using the
+   * specified commandID. Otherwise the sidebar will be hidden.
+   *
+   * @param {string} commandID ID of the xul:broadcaster element to use.
+   * @return {Promise}
+   */
+  toggle(commandID = this.currentID) {
+    if (this.isOpen && commandID == this.currentID) {
+      this.hide();
+      return Promise.resolve();
+    } else {
+      return this.show(commandID);
+    }
+  },
+
+  /**
+   * Show the sidebar, using the parameters from the specified broadcaster.
+   * @see SidebarUI note.
+   *
+   * @param {string} commandID ID of the xul:broadcaster element to use.
+   */
+  show(commandID) {
+    return new Promise((resolve, reject) => {
+      let sidebarBroadcaster = document.getElementById(commandID);
+      if (!sidebarBroadcaster || sidebarBroadcaster.localName != "broadcaster") {
+        reject(new Error("Invalid sidebar broadcaster specified"));
+        return;
+      }
+
+      let broadcasters = document.getElementsByAttribute("group", "sidebar");
+      for (let broadcaster of broadcasters) {
+        // skip elements that observe sidebar broadcasters and random
+        // other elements
+        if (broadcaster.localName != "broadcaster") {
+          continue;
+        }
+
+        if (broadcaster != sidebarBroadcaster) {
+          broadcaster.removeAttribute("checked");
+        } else {
+          sidebarBroadcaster.setAttribute("checked", "true");
+        }
+      }
+
+      this._box.hidden = false;
+      this._splitter.hidden = false;
+
+      this._box.setAttribute("sidebarcommand", sidebarBroadcaster.id);
+
+      let title = sidebarBroadcaster.getAttribute("sidebartitle");
+      if (!title) {
+        title = sidebarBroadcaster.getAttribute("label");
+      }
+      this._title.value = title;
+
+      let url = sidebarBroadcaster.getAttribute("sidebarurl");
+      this.browser.setAttribute("src", url); // kick off async load
+
+      // We set this attribute here in addition to setting it on the <browser>
+      // element itself, because the code in SidebarUI.uninit() persists this
+      // attribute, not the "src" of the <browser id="sidebar">. The reason it
+      // does that is that we want to delay sidebar load a bit when a browser
+      // window opens. See delayedStartup() and SidebarUI.startDelayedLoad().
+      this._box.setAttribute("src", url);
+
+      if (this.browser.contentDocument.location.href != url) {
+        let onLoad = event => {
+          this.browser.removeEventListener("load", onLoad, true);
+
+          // We're handling the 'load' event before it bubbles up to the usual
+          // (non-capturing) event handlers. Let it bubble up before firing the
+          // SidebarFocused event.
+          setTimeout(() => this._fireFocusedEvent(), 0);
+
+          // Run the original function for backwards compatibility.
+          sidebarOnLoad(event);
+
+          resolve();
+        };
+
+        this.browser.addEventListener("load", onLoad, true);
+      } else {
+        // Older code handled this case, so we do it too.
+        this._fireFocusedEvent();
+        resolve();
+      }
+    });
+  },
+
+  /**
+   * Hide the sidebar.
+   */
+  hide() {
+    if (!this.isOpen) {
+      return;
+    }
+
+    let commandID = this._box.getAttribute("sidebarcommand");
+    let sidebarBroadcaster = document.getElementById(commandID);
+
+    if (sidebarBroadcaster.getAttribute("checked") != "true") {
+      return;
+    }
+
+    // Replace the document currently displayed in the sidebar with about:blank
+    // so that we can free memory by unloading the page. We need to explicitly
+    // create a new content viewer because the old one doesn't get destroyed
+    // until about:blank has loaded (which does not happen as long as the
+    // element is hidden).
+    this.browser.setAttribute("src", "about:blank");
+    this.browser.docShell.createAboutBlankContentViewer(null);
+
+    sidebarBroadcaster.removeAttribute("checked");
+    this._box.setAttribute("sidebarcommand", "");
+    this._title.value = "";
+    this._box.hidden = true;
+    this._splitter.hidden = true;
+    gBrowser.selectedBrowser.focus();
+  },
+};
+
+/**
+ * This exists for backards compatibility - it will be called once a sidebar is
+ * ready, following any request to show it.
+ *
+ * @deprecated
+ */
+function fireSidebarFocusedEvent() {}
+
+/**
+ * This exists for backards compatibility - it gets called when a sidebar has
+ * been loaded.
+ *
+ * @deprecated
+ */
+function sidebarOnLoad(event) {}
+
+/**
+ * This exists for backards compatibility, and is equivilent to
+ * SidebarUI.toggle() without the forceOpen param. With forceOpen set to true,
+ * it is equalivent to SidebarUI.show().
+ *
+ * @deprecated
+ */
+function toggleSidebar(commandID, forceOpen = false) {
+  Deprecated.warning("toggleSidebar() is deprecated, please use SidebarUI.toggle() or SidebarUI.show() instead",
+                     "https://developer.mozilla.org/en-US/Add-ons/Code_snippets/Sidebar");
+
+  if (forceOpen) {
+    SidebarUI.show(commandID);
+  } else {
+    SidebarUI.toggle(commandID);
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-syncui.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-syncui.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser-syncui.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser-syncui.js	2015-02-28 15:03:00.000000000 +0000
@@ -11,13 +11,19 @@
 let CloudSync = null;
 #endif
 
+XPCOMUtils.defineLazyModuleGetter(this, "ReadingListScheduler",
+                                  "resource:///modules/readinglist/Scheduler.jsm");
+
 // gSyncUI handles updating the tools menu and displaying notifications.
 let gSyncUI = {
   _obs: ["weave:service:sync:start",
+         "weave:service:sync:finish",
+         "weave:service:sync:error",
          "weave:service:quota:remaining",
          "weave:service:setup-complete",
          "weave:service:login:start",
          "weave:service:login:finish",
+         "weave:service:login:error",
          "weave:service:logout:finish",
          "weave:service:start-over",
          "weave:service:start-over:finish",
@@ -25,9 +31,15 @@
          "weave:ui:sync:error",
          "weave:ui:sync:finish",
          "weave:ui:clear-error",
+
+         "readinglist:sync:start",
+         "readinglist:sync:finish",
+         "readinglist:sync:error",
   ],
 
   _unloaded: false,
+  // The number of "active" syncs - while this is non-zero, our button will spin
+  _numActiveSyncTasks: 0,
 
   init: function () {
     Cu.import("resource://services-common/stringbundle.js");
@@ -95,21 +107,25 @@
     }
   },
 
-  _needsSetup: function SUI__needsSetup() {
+  _needsSetup() {
     // We want to treat "account needs verification" as "needs setup". So
     // "reach in" to Weave.Status._authManager to check whether we the signed-in
     // user is verified.
     // Referencing Weave.Status spins a nested event loop to initialize the
     // authManager, so this should always return a value directly.
     // This only applies to fxAccounts-based Sync.
-    if (Weave.Status._authManager._signedInUser) {
-      // If we have a signed in user already, and that user is not verified,
-      // revert to the "needs setup" state.
-      if (!Weave.Status._authManager._signedInUser.verified) {
-        return true;
-      }
+    if (Weave.Status._authManager._signedInUser !== undefined) {
+      // So we are using Firefox accounts - in this world, checking Sync isn't
+      // enough as reading list may be configured but not Sync.
+      // We consider ourselves setup if we have a verified user.
+      // XXX - later we should consider checking preferences to ensure at least
+      // one engine is enabled?
+      return !Weave.Status._authManager._signedInUser ||
+             !Weave.Status._authManager._signedInUser.verified;
     }
 
+    // So we are using legacy sync, and reading-list isn't supported for such
+    // users, so check sync itself.
     let firstSync = "";
     try {
       firstSync = Services.prefs.getCharPref("services.sync.firstSync");
@@ -120,7 +136,8 @@
   },
 
   _loginFailed: function () {
-    return Weave.Status.login == Weave.LOGIN_FAILED_LOGIN_REJECTED;
+    return Weave.Status.login == Weave.LOGIN_FAILED_LOGIN_REJECTED ||
+           ReadingListScheduler.state == ReadingListScheduler.STATE_ERROR_AUTHENTICATION;
   },
 
   updateUI: function SUI_updateUI() {
@@ -136,6 +153,7 @@
       document.getElementById("sync-syncnow-state").hidden = false;
     } else if (loginFailed) {
       document.getElementById("sync-reauth-state").hidden = false;
+      this.showLoginError();
     } else if (needsSetup) {
       document.getElementById("sync-setup-state").hidden = false;
     } else {
@@ -146,14 +164,6 @@
       return;
 
     let syncButton = document.getElementById("sync-button");
-    if (syncButton) {
-      syncButton.removeAttribute("status");
-    }
-    let panelHorizontalButton = document.getElementById("PanelUI-fxa-status");
-    if (panelHorizontalButton) {
-      panelHorizontalButton.removeAttribute("syncstatus");
-    }
-
     if (needsSetup && syncButton)
       syncButton.removeAttribute("tooltiptext");
 
@@ -162,17 +172,45 @@
 
 
   // Functions called by observers
-  onActivityStart: function SUI_onActivityStart() {
+  onActivityStart() {
     if (!gBrowser)
       return;
 
-    let button = document.getElementById("sync-button");
-    if (button) {
-      button.setAttribute("status", "active");
-    }
-    button = document.getElementById("PanelUI-fxa-status");
-    if (button) {
-      button.setAttribute("syncstatus", "active");
+    this.log.debug("onActivityStart with numActive", this._numActiveSyncTasks);
+    if (++this._numActiveSyncTasks == 1) {
+      let button = document.getElementById("sync-button");
+      if (button) {
+        button.setAttribute("status", "active");
+      }
+      button = document.getElementById("PanelUI-fxa-status");
+      if (button) {
+        button.setAttribute("syncstatus", "active");
+      }
+    }
+  },
+
+  onActivityStop() {
+    if (!gBrowser)
+      return;
+    this.log.debug("onActivityStop with numActive", this._numActiveSyncTasks);
+    if (--this._numActiveSyncTasks) {
+      if (this._numActiveSyncTasks < 0) {
+        // This isn't particularly useful (it seems more likely we'll set a
+        // "start" without a "stop" meaning it forever remains > 0) but it
+        // might offer some value...
+        this.log.error("mismatched onActivityStart/Stop calls",
+                       new Error("active=" + this._numActiveSyncTasks));
+      }
+      return; // active tasks are still ongoing...
+    }
+
+    let syncButton = document.getElementById("sync-button");
+    if (syncButton) {
+      syncButton.removeAttribute("status");
+    }
+    let panelHorizontalButton = document.getElementById("PanelUI-fxa-status");
+    if (panelHorizontalButton) {
+      panelHorizontalButton.removeAttribute("syncstatus");
     }
   },
 
@@ -187,6 +225,7 @@
   },
 
   onLoginError: function SUI_onLoginError() {
+    // Note: This is used for *both* Sync and ReadingList login errors.
     // if login fails, any other notifications are essentially moot
     Weave.Notifications.removeAll();
 
@@ -200,11 +239,18 @@
       this.updateUI();
       return;
     }
+    this.showLoginError();
+    this.updateUI();
+  },
 
+  showLoginError() {
+    // Note: This is used for *both* Sync and ReadingList login errors.
     let title = this._stringBundle.GetStringFromName("error.login.title");
 
     let description;
-    if (Weave.Status.sync == Weave.PROLONGED_SYNC_FAILURE) {
+    if (Weave.Status.sync == Weave.PROLONGED_SYNC_FAILURE ||
+        this.isProlongedReadingListError()) {
+      this.log.debug("showLoginError has a prolonged login error");
       // Convert to days
       let lastSync =
         Services.prefs.getIntPref("services.sync.errorhandler.networkFailureReportTimeout") / 86400;
@@ -214,6 +260,7 @@
       let reason = Weave.Utils.getErrorString(Weave.Status.login);
       description =
         this._stringBundle.formatStringFromName("error.sync.description", [reason], 1);
+      this.log.debug("showLoginError has a non-prolonged error", reason);
     }
 
     let buttons = [];
@@ -226,7 +273,6 @@
     let notification = new Weave.Notification(title, description, null,
                                               Weave.Notifications.PRIORITY_WARNING, buttons);
     Weave.Notifications.replaceTitle(notification);
-    this.updateUI();
   },
 
   onLogout: function SUI_onLogout() {
@@ -271,6 +317,7 @@
     }
 
     Services.obs.notifyObservers(null, "cloudsync:user-sync", null);
+    Services.obs.notifyObservers(null, "readinglist:user-sync", null);
   },
 
   handleToolbarButton: function SUI_handleStatusbarButton() {
@@ -367,7 +414,15 @@
 
     let lastSync;
     try {
-      lastSync = Services.prefs.getCharPref("services.sync.lastSync");
+      lastSync = new Date(Services.prefs.getCharPref("services.sync.lastSync"));
+    }
+    catch (e) { };
+    // and reading-list time - we want whatever one is the most recent.
+    try {
+      let lastRLSync = new Date(Services.prefs.getCharPref("readinglist.scheduler.lastSync"));
+      if (!lastSync || lastRLSync > lastSync) {
+        lastSync = lastRLSync;
+      }
     }
     catch (e) { };
     if (!lastSync || this._needsSetup()) {
@@ -376,9 +431,9 @@
     }
 
     // Show the day-of-week and time (HH:MM) of last sync
-    let lastSyncDate = new Date(lastSync).toLocaleFormat("%a %H:%M");
+    let lastSyncDateString = lastSync.toLocaleFormat("%a %H:%M");
     let lastSyncLabel =
-      this._stringBundle.formatStringFromName("lastSync2.label", [lastSyncDate], 1);
+      this._stringBundle.formatStringFromName("lastSync2.label", [lastSyncDateString], 1);
 
     syncButton.setAttribute("tooltiptext", lastSyncLabel);
   },
@@ -395,7 +450,69 @@
     this.clearError(title);
   },
 
+  // Return true if the reading-list is in a "prolonged" error state. That
+  // engine doesn't impose what that means, so calculate it here. For
+  // consistency, we just use the sync prefs.
+  isProlongedReadingListError() {
+    let lastSync, threshold, prolonged;
+    try {
+      lastSync = new Date(Services.prefs.getCharPref("readinglist.scheduler.lastSync"));
+      threshold = new Date(Date.now() - Services.prefs.getIntPref("services.sync.errorhandler.networkFailureReportTimeout"));
+      prolonged = lastSync <= threshold;
+    } catch (ex) {
+      // no pref, assume not prolonged.
+      prolonged = false;
+    }
+    this.log.debug("isProlongedReadingListError has last successful sync at ${lastSync}, threshold is ${threshold}, prolonged=${prolonged}",
+                   {lastSync, threshold, prolonged});
+    return prolonged;
+  },
+
+  onRLSyncError() {
+    // Like onSyncError, but from the reading-list engine.
+    // However, the current UX around Sync is that error notifications should
+    // generally *not* be seen as they typically aren't actionable - so only
+    // authentication errors (which require user action) and "prolonged" errors
+    // (which technically aren't actionable, but user really should know anyway)
+    // are shown.
+    this.log.debug("onRLSyncError with readingList state", ReadingListScheduler.state);
+    if (ReadingListScheduler.state == ReadingListScheduler.STATE_ERROR_AUTHENTICATION) {
+      this.onLoginError();
+      return;
+    }
+    // If it's not prolonged there's nothing to do.
+    if (!this.isProlongedReadingListError()) {
+      this.log.debug("onRLSyncError has a non-authentication, non-prolonged error, so not showing any error UI");
+      return;
+    }
+    // So it's a prolonged error.
+    // Unfortunate duplication from below...
+    this.log.debug("onRLSyncError has a prolonged error");
+    let title = this._stringBundle.GetStringFromName("error.sync.title");
+    // XXX - this is somewhat wrong - we are reporting the threshold we consider
+    // to be prolonged, not how long it actually has been. (ie, lastSync below
+    // is effectively constant) - bit it too is copied from below.
+    let lastSync =
+      Services.prefs.getIntPref("services.sync.errorhandler.networkFailureReportTimeout") / 86400;
+    let description =
+      this._stringBundle.formatStringFromName("error.sync.prolonged_failure", [lastSync], 1);
+    let priority = Weave.Notifications.PRIORITY_INFO;
+    let buttons = [
+      new Weave.NotificationButton(
+        this._stringBundle.GetStringFromName("error.sync.tryAgainButton.label"),
+        this._stringBundle.GetStringFromName("error.sync.tryAgainButton.accesskey"),
+        function() { gSyncUI.doSync(); return true; }
+      ),
+    ];
+    let notification =
+      new Weave.Notification(title, description, null, priority, buttons);
+    Weave.Notifications.replaceTitle(notification);
+
+    this.updateUI();
+  },
+
   onSyncError: function SUI_onSyncError() {
+    this.log.debug("onSyncError");
     let title = this._stringBundle.GetStringFromName("error.sync.title");
 
     if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
@@ -418,7 +535,9 @@
     let priority = Weave.Notifications.PRIORITY_WARNING;
     let buttons = [];
 
-    // Check if the client is outdated in some way
+    // Check if the client is outdated in some way (but note: we've never in the
+    // past, and probably never will, bump the relevent version numbers, so
+    // this is effectively dead code!)
     let outdated = Weave.Status.sync == Weave.VERSION_OUT_OF_DATE;
     for (let [engine, reason] in Iterator(Weave.Status.engines))
       outdated = outdated || reason == Weave.VERSION_OUT_OF_DATE;
@@ -468,6 +587,7 @@
   },
 
   observe: function SUI_observe(subject, topic, data) {
+    this.log.debug("observed", topic);
     if (this._unloaded) {
       Cu.reportError("SyncUI observer called after unload: " + topic);
       return;
@@ -480,10 +600,26 @@
       subject = subject.wrappedJSObject.object;
     }
 
+    // First handle "activity" only.
     switch (topic) {
       case "weave:service:sync:start":
+      case "weave:service:login:start":
+      case "readinglist:sync:start":
         this.onActivityStart();
         break;
+      case "weave:service:sync:finish":
+      case "weave:service:sync:error":
+      case "weave:service:login:finish":
+      case "weave:service:login:error":
+      case "readinglist:sync:finish":
+      case "readinglist:sync:error":
+        this.onActivityStop();
+        break;
+    }
+    // Now non-activity state (eg, enabled, errors, etc)
+    // Note that sync uses the ":ui:" notifications for errors because sync.
+    // ReadingList has no such concept (yet?; hopefully the :error is enough!)
+    switch (topic) {
       case "weave:ui:sync:finish":
         this.onSyncFinish();
         break;
@@ -496,9 +632,6 @@
       case "weave:service:setup-complete":
         this.onSetupComplete();
         break;
-      case "weave:service:login:start":
-        this.onActivityStart();
-        break;
       case "weave:service:login:finish":
         this.onLoginFinish();
         break;
@@ -523,6 +656,13 @@
       case "weave:ui:clear-error":
         this.clearError();
         break;
+
+      case "readinglist:sync:error":
+        this.onRLSyncError();
+        break;
+      case "readinglist:sync:finish":
+        this.clearError();
+        break;
     }
   },
 
@@ -540,3 +680,6 @@
          createBundle("chrome://weave/locale/services/sync.properties");
 });
 
+XPCOMUtils.defineLazyGetter(gSyncUI, "log", function() {
+  return Log.repository.getLogger("browserwindow.syncui");
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/browser.xul	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/browser.xul	2015-02-28 15:03:00.000000000 +0000
@@ -567,6 +567,17 @@
 
     <tooltip id="dynamic-shortcut-tooltip"
              onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
+
+    <menupopup id="emeNotificationsPopup">
+      <menuitem id="emeNotificationsNotNow"
+                label="&emeNotificationsNotNow.label;"
+                acceskey="&emeNotificationsNotNow.accesskey;"
+                oncommand="gEMEHandler.onNotNow(this);"/>
+      <menuitem id="emeNotificationsDontAskAgain"
+                label="&emeNotificationsDontAskAgain.label;"
+                acceskey="&emeNotificationsDontAskAgain.accesskey;"
+                oncommand="gEMEHandler.onDontAskAgain(this);"/>
+    </menupopup>
   </popupset>
 
 #ifdef CAN_DRAW_IN_TITLEBAR
@@ -874,7 +885,7 @@
                       class="subviewbutton"
                       label="&viewBookmarksSidebar2.label;"
                       type="checkbox"
-                      oncommand="toggleSidebar('viewBookmarksSidebar');">
+                      oncommand="SidebarUI.toggle('viewBookmarksSidebar');">
               <observes element="viewBookmarksSidebar" attribute="checked"/>
             </menuitem>
             <!-- NB: temporary solution for bug 985024, this should go away soon. -->
@@ -939,6 +950,22 @@
                                            new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
                                                           PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
             </menu>
+            <menuseparator>
+              <observes element="readingListSidebar" attribute="hidden"/>
+            </menuseparator>
+            <menu id="BMB_readingList"
+                  class="menu-iconic bookmark-item subviewbutton"
+                  label="&readingList.label;"
+                  container="true">
+              <observes element="readingListSidebar" attribute="hidden"/>
+              <menupopup id="BMB_readingListPopup"
+                         placespopup="true"
+                         onpopupshowing="ReadingListUI.onReadingListPopupShowing(this);">
+                <menuitem id="BMB_viewReadingListSidebar" class="subviewbutton"
+                          oncommand="SidebarUI.show('readingListSidebar');"
+                          label="&readingList.showSidebar.label;"/>
+              </menupopup>
+            </menu>
             <menuseparator/>
             <!-- Bookmarks menu items will go here -->
             <menuitem id="BMB_bookmarksShowAll"
@@ -1127,10 +1154,10 @@
         <sidebarheader id="sidebar-header" align="center">
           <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
           <image id="sidebar-throbber"/>
-          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
+          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
         </sidebarheader>
         <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
-                  style="min-width: 14em; width: 18em; max-width: 36em;"/>
+                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
       </vbox>
 
       <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/content.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/content.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/content.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/content.js	2015-02-28 15:03:00.000000000 +0000
@@ -501,8 +501,6 @@
         break;
 
       case "pagehide":
-        // Reader mode is disabled until proven enabled.
-        this._savedArticle = null;
         sendAsyncMessage("Reader:UpdateReaderButton", { isArticle: false });
         break;
 
@@ -511,6 +509,9 @@
           return;
         }
 
+        // Reader mode is disabled until proven enabled.
+        this._savedArticle = null;
+
         ReaderMode.parseDocument(content.document).then(article => {
           // Do nothing if there is no article, or if the content window has been destroyed.
           if (article === null || content === null) {
@@ -671,8 +672,8 @@
             event.preventDefault(); // Need to prevent the pageload.
           }
         }
-        json.noReferrer = BrowserUtils.linkHasNoReferrer(node)
       }
+      json.noReferrer = BrowserUtils.linkHasNoReferrer(node)
 
       sendAsyncMessage("Content:Click", json);
       return;
@@ -930,6 +931,13 @@
 addMessageListener("webrtc:Allow", ContentWebRTC);
 addMessageListener("webrtc:Deny", ContentWebRTC);
 addMessageListener("webrtc:StopSharing", ContentWebRTC);
+addMessageListener("webrtc:StartBrowserSharing", () => {
+  let windowID = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                        .getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
+  sendAsyncMessage("webrtc:response:StartBrowserSharing", {
+    windowID: windowID
+  });
+});
 
 function gKeywordURIFixup(fixupInfo) {
   fixupInfo.QueryInterface(Ci.nsIURIFixupInfo);
@@ -1064,3 +1072,42 @@
     dataURL: canvas.toDataURL("image/jpeg", ""),
   });
 });
+
+addMessageListener("ContextMenu:MediaCommand", (message) => {
+  let media = message.objects.element;
+
+  switch (message.data.command) {
+    case "play":
+      media.play();
+      break;
+    case "pause":
+      media.pause();
+      break;
+    case "mute":
+      media.muted = true;
+      break;
+    case "unmute":
+      media.muted = false;
+      break;
+    case "playbackRate":
+      media.playbackRate = message.data.data;
+      break;
+    case "hidecontrols":
+      media.removeAttribute("controls");
+      break;
+    case "showcontrols":
+      media.setAttribute("controls", "true");
+      break;
+    case "hidestats":
+    case "showstats":
+      let event = media.ownerDocument.createEvent("CustomEvent");
+      event.initCustomEvent("media-showStatistics", false, true,
+                            message.data.command == "showstats");
+      media.dispatchEvent(event);
+      break;
+    case "fullscreen":
+      if (content.document.mozFullScreenEnabled)
+        media.mozRequestFullScreen();
+      break;
+  }
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/newtab/search.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/newtab/search.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/newtab/search.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/newtab/search.js	2015-02-28 15:03:00.000000000 +0000
@@ -49,11 +49,12 @@
     let searchText = this._nodes.text;
     let searchStr = searchText.value;
     if (this.currentEngineName && searchStr.length) {
-
+      let useNewTab = event && event.button == 1;
       let eventData = {
         engineName: this.currentEngineName,
         searchString: searchStr,
         whence: "newtab",
+        useNewTab: useNewTab,
       }
 
       if (searchText.hasAttribute("selection-index")) {
@@ -244,7 +245,7 @@
       let parent = document.getElementById("newtab-scrollbox");
       this._suggestionController =
         new SearchSuggestionUIController(this._nodes.text, parent,
-                                         () => this.search());
+                                         event => this.search(event));
     }
     this._suggestionController.engineName = engine.name;
   },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/nsContextMenu.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/nsContextMenu.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/nsContextMenu.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/nsContextMenu.js	2015-02-28 15:03:00.000000000 +0000
@@ -1078,12 +1078,6 @@
     mm.addMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage);
   },
 
-  fullScreenVideo: function () {
-    let video = this.target;
-    if (document.mozFullScreenEnabled)
-      video.mozRequestFullScreen();
-  },
-
   leaveDOMFullScreen: function() {
     document.mozCancelFullScreen();
   },
@@ -1668,37 +1662,10 @@
   },
 
   mediaCommand : function CM_mediaCommand(command, data) {
-    var media = this.target;
-
-    switch (command) {
-      case "play":
-        media.play();
-        break;
-      case "pause":
-        media.pause();
-        break;
-      case "mute":
-        media.muted = true;
-        break;
-      case "unmute":
-        media.muted = false;
-        break;
-      case "playbackRate":
-        media.playbackRate = data;
-        break;
-      case "hidecontrols":
-        media.removeAttribute("controls");
-        break;
-      case "showcontrols":
-        media.setAttribute("controls", "true");
-        break;
-      case "hidestats":
-      case "showstats":
-        var event = media.ownerDocument.createEvent("CustomEvent");
-        event.initCustomEvent("media-showStatistics", false, true, command == "showstats");
-        media.dispatchEvent(event);
-        break;
-    }
+    let mm = this.browser.messageManager;
+    mm.sendAsyncMessage("ContextMenu:MediaCommand",
+                        {command: command, data: data},
+                        {element: this.target});
   },
 
   copyMediaLocation : function () {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/searchSuggestionUI.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/searchSuggestionUI.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/searchSuggestionUI.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/searchSuggestionUI.js	2015-02-28 15:03:00.000000000 +0000
@@ -32,7 +32,8 @@
  * @param onClick
  *        A function that's called when a search suggestion is clicked.  Ideally
  *        we could call submit() on inputElement's ancestor form, but that
- *        doesn't trigger submit listeners.
+ *        doesn't trigger submit listeners. The function is passed one argument,
+ *        the click event.
  * @param idPrefix
  *        The IDs of elements created by the object will be prefixed with this
  *        string.
@@ -234,6 +235,9 @@
   },
 
   _onMousedown: function (event) {
+    if (event.button == 2) {
+      return;
+    }
     let idx = this._indexOfTableRowOrDescendent(event.target);
     let suggestion = this.suggestionAtIndex(idx);
     this._stickyInputValue = suggestion;
@@ -251,7 +255,7 @@
     this.input.setAttribute("selection-kind", "mouse");
     this._hideSuggestions();
     if (this.onClick) {
-      this.onClick.call(null);
+      this.onClick.call(null, event);
     }
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/socialchat.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/socialchat.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/socialchat.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/socialchat.xml	2015-02-28 15:03:00.000000000 +0000
@@ -463,7 +463,9 @@
           // We can't use calcTotalWidthOf due to the transitions...
           const CHAT_WIDTH_OPEN = 260;
           const CHAT_WIDTH_MINIMIZED = 160;
-          return aChatbox.minimized ? CHAT_WIDTH_MINIMIZED : CHAT_WIDTH_OPEN;
+          let openWidth = aChatbox.hasAttribute("large") ? 300 : CHAT_WIDTH_OPEN;
+
+          return aChatbox.minimized ? CHAT_WIDTH_MINIMIZED : openWidth;
         ]]></body>
       </method>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/tabbrowser.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/tabbrowser.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/tabbrowser.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/tabbrowser.xml	2015-02-28 15:03:00.000000000 +0000
@@ -116,6 +116,9 @@
       <field name="mIsBusy">
         false
       </field>
+      <field name="_outerWindowIDBrowserMap">
+        new Map();
+      </field>
       <field name="arrowKeysShouldWrap" readonly="true">
 #ifdef XP_MACOSX
         true
@@ -381,6 +384,15 @@
         </body>
       </method>
 
+      <method name="getBrowserForOuterWindowID">
+        <parameter name="aID"/>
+        <body>
+          <![CDATA[
+            return this._outerWindowIDBrowserMap.get(aID);
+          ]]>
+        </body>
+      </method>
+
       <method name="_getTabForContentWindow">
         <parameter name="aWindow"/>
         <body>
@@ -1758,6 +1770,13 @@
               b = this._createBrowser({remote, uriIsAboutBlank});
             }
 
+            // A remote browser doesn't initially have the outerWindowID
+            // set. Once a remote browser initializes, it sends the Browser:Init
+            // message, and we map the browser at that point.
+            if (!remote) {
+              this._outerWindowIDBrowserMap.set(b.outerWindowID, b);
+            }
+
             let notificationbox = this.getNotificationBox(b);
             var position = this.tabs.length - 1;
             var uniqueId = this._generateUniquePanelID();
@@ -2225,6 +2244,7 @@
             this.mTabListeners.splice(aTab._tPos, 1);
 
             var browser = this.getBrowserForTab(aTab);
+            this._outerWindowIDBrowserMap.delete(browser.outerWindowID);
 
             // Because of the way XBL works (fields just set JS
             // properties on the element) and the code we have in place
@@ -3225,6 +3245,8 @@
               let tab = this.getTabForBrowser(browser);
               if (!tab)
                 return;
+
+              this._outerWindowIDBrowserMap.set(browser.outerWindowID, browser);
               browser.messageManager.sendAsyncMessage("Browser:AppTab", { isAppTab: tab.pinned })
               break;
             }
@@ -3291,6 +3313,9 @@
             // If this window has remote tabs, switch to our tabpanels fork
             // which does asynchronous tab switching.
             this.mPanelContainer.classList.add("tabbrowser-tabpanels");
+          } else {
+            this._outerWindowIDBrowserMap.set(this.mCurrentBrowser.outerWindowID,
+                                              this.mCurrentBrowser);
           }
           messageManager.addMessageListener("DOMWebNotificationClicked", this);
         ]]>
@@ -5480,29 +5505,29 @@
             var event = document.createEvent("Events");
             event.initEvent("select", true, true);
             this.dispatchEvent(event);
-          }
 
-          this._selectedIndex = val;
+            this._selectedIndex = val;
 
-          switchPromise.then(() => {
-            // If we cannot find the tabpanel that we were trying to switch to, then
-            // it must have been removed before our Promise could be resolved. In
-            // that case, we just cancel the tab switch.
-            var updatedTabIndex = Array.indexOf(this.childNodes, newPanel);
-            if (updatedTabIndex == -1) {
-              gBrowser._cancelTabSwitch(toTab);
-            } else {
-              this.setAttribute("selectedIndex", updatedTabIndex);
-              gBrowser._finalizeTabSwitch(toTab, fromTab);
-            }
-          }, () => {
-            // If the promise rejected, that means we don't want to actually
-            // flip the deck, so we cancel the tab switch.
-            // We need to nullcheck the method we're about to call because
-            // the binding might be dead at this point.
-            if (gBrowser._cancelTabSwitch)
-              gBrowser._cancelTabSwitch(toTab);
-          });
+            switchPromise.then(() => {
+              // If we cannot find the tabpanel that we were trying to switch to, then
+              // it must have been removed before our Promise could be resolved. In
+              // that case, we just cancel the tab switch.
+              var updatedTabIndex = Array.indexOf(this.childNodes, newPanel);
+              if (updatedTabIndex == -1) {
+                gBrowser._cancelTabSwitch(toTab);
+              } else {
+                this.setAttribute("selectedIndex", updatedTabIndex);
+                gBrowser._finalizeTabSwitch(toTab, fromTab);
+              }
+            }, () => {
+              // If the promise rejected, that means we don't want to actually
+              // flip the deck, so we cancel the tab switch.
+              // We need to nullcheck the method we're about to call because
+              // the binding might be dead at this point.
+              if (gBrowser._cancelTabSwitch)
+                gBrowser._cancelTabSwitch(toTab);
+            });
+          }
 
           return val;
         ]]>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/BrowserUITestUtils.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/BrowserUITestUtils.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/BrowserUITestUtils.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/BrowserUITestUtils.jsm	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,70 @@
+"use strict";
+
+this.EXPORTED_SYMBOLS = [
+  "BrowserUITestUtils",
+];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/Timer.jsm");
+
+
+/**
+ * Default wait period in millseconds, when waiting for the expected event to occur.
+ * @type {number}
+ */
+const DEFAULT_WAIT = 2000;
+
+
+/**
+ * Test utility functions for dealing with the browser UI DOM.
+ */
+this.BrowserUITestUtils = {
+
+  /**
+   * Waits a specified number of miliseconds for a specified event to be
+   * fired on a specified element.
+   *
+   * Usage:
+   *    let receivedEvent = BrowserUITestUtils.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 {Element} subject - The element that should receive the event.
+   * @param {string} eventName - The event to wait for.
+   * @param {number} timeoutMs - The number of miliseconds to wait before giving up.
+   * @param {Element} target - Expected target of the event.
+   * @returns {Promise} A Promise that resolves to the received event, or
+   *                    rejects with an Error.
+   */
+  waitForEvent(subject, eventName, timeoutMs, target) {
+    return new Promise((resolve, reject) => {
+      function listener(event) {
+        if (target && target !== event.target) {
+          return;
+        }
+
+        subject.removeEventListener(eventName, listener);
+        clearTimeout(timerID);
+        resolve(event);
+      }
+
+      timeoutMs = timeoutMs || DEFAULT_WAIT;
+      let stack = new Error().stack;
+
+      let timerID = setTimeout(() => {
+        subject.removeEventListener(eventName, listener);
+        reject(new Error(`${eventName} event timeout at ${stack}`));
+      }, timeoutMs);
+
+
+      subject.addEventListener(eventName, listener);
+    });
+  },
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_autocomplete_enter_race.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_autocomplete_enter_race.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_autocomplete_enter_race.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_autocomplete_enter_race.js	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,28 @@
+add_task(function*() {
+  // This test is only relevant if UnifiedComplete is enabled.
+  Services.prefs.setBoolPref("browser.urlbar.unifiedcomplete", true);
+
+  registerCleanupFunction(() => {
+    PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
+    Services.prefs.clearUserPref("browser.urlbar.unifiedcomplete");
+  });
+
+  let itemId =
+    PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                         NetUtil.newURI("http://example.com/?q=%s"),
+                                         PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                         "test");
+  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword");
+
+  yield new Promise(resolve => waitForFocus(resolve, window));
+
+  yield promiseAutocompleteResultPopup("keyword bear");
+  gURLBar.focus();
+  EventUtils.synthesizeKey("d", {});
+  EventUtils.synthesizeKey("VK_RETURN", {});
+
+  yield promiseTabLoadEvent(gBrowser.selectedTab);
+  is(gBrowser.selectedTab.linkedBrowser.currentURI.spec,
+     "http://example.com/?q=beard",
+     "Latest typed characters should have been used");
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug1124271_readerModePinnedTab.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug1124271_readerModePinnedTab.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug1124271_readerModePinnedTab.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug1124271_readerModePinnedTab.js	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,47 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Test that the reader mode button won't open in a new tab when clicked from a pinned tab
+
+const PREF = "reader.parse-on-load.enabled";
+
+const TEST_PATH = "http://example.com/browser/browser/base/content/test/general/";
+
+let readerButton = document.getElementById("reader-mode-button");
+
+add_task(function* () {
+  registerCleanupFunction(function() {
+    Services.prefs.clearUserPref(PREF);
+    while (gBrowser.tabs.length > 1) {
+      gBrowser.removeCurrentTab();
+    }
+  });
+
+  // Enable the reader mode button.
+  Services.prefs.setBoolPref(PREF, true);
+
+  let tab = gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.pinTab(tab);
+
+  let initialTabsCount = gBrowser.tabs.length;
+
+  // Point tab to a test page that is reader-able.
+  let url = TEST_PATH + "readerModeArticle.html";
+  yield promiseTabLoadEvent(tab, url);
+  yield promiseWaitForCondition(() => !readerButton.hidden);
+
+  readerButton.click();
+  yield promiseTabLoadEvent(tab);
+
+  // Ensure no new tabs are opened when exiting reader mode in a pinned tab
+  is(gBrowser.tabs.length, initialTabsCount, "No additional tabs were opened.");
+
+  readerButton.click();
+  yield promiseTabLoadEvent(tab);
+
+  // Ensure no new tabs are opened when exiting reader mode in a pinned tab
+  is(gBrowser.tabs.length, initialTabsCount, "No additional tabs were opened.");
+
+  gBrowser.removeCurrentTab();
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug409481.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug409481.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug409481.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug409481.js	2015-02-28 15:03:00.000000000 +0000
@@ -4,7 +4,7 @@
   // XXX This looks a bit odd, but is needed to avoid throwing when removing the
   // event listeners below. See bug 310955.
   document.getElementById("sidebar").addEventListener("load", delayedOpenUrl, true);
-  toggleSidebar("viewWebPanelsSidebar", true);
+  SidebarUI.show("viewWebPanelsSidebar");
 }
 
 function delayedOpenUrl() {
@@ -75,7 +75,7 @@
   var sidebar = document.getElementById("sidebar");
   sidebar.contentDocument.removeEventListener("popuphidden", contextMenuClosed, false);
 
-  toggleSidebar("viewWebPanelsSidebar");
+  SidebarUI.hide();
 
   ok(document.getElementById("sidebar-box").hidden, "Sidebar successfully hidden");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug427559.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug427559.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug427559.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug427559.js	2015-02-28 15:03:01.000000000 +0000
@@ -15,25 +15,34 @@
   waitForExplicitFinish();
 
   gBrowser.selectedTab = gBrowser.addTab();
+  var browser = gBrowser.selectedBrowser;
 
-  gBrowser.selectedBrowser.addEventListener("load", function () {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-    setTimeout(function () {
+  browser.addEventListener("load", function () {
+    browser.removeEventListener("load", arguments.callee, true);
+    executeSoon(function () {
       var testPageWin = content;
 
+      is(browser.contentDocumentAsCPOW.activeElement.localName, "button", "button is focused");
+
+      addEventListener("focus", function focusedWindow(event) {
+        if (!String(event.target.location).startsWith("data:"))
+          return;
+
+        removeEventListener("focus", focusedWindow, true);
+
+        // Make sure focus is given to the window because the element is now gone
+        is(browser.contentDocumentAsCPOW.activeElement.localName, "body", "body is focused");
+
+        gBrowser.removeCurrentTab();
+        finish();
+      }, true);
+
       // The test page loaded, so open an empty tab, select it, then restore
       // the test tab. This causes the test page's focused element to be removed
       // from its document.
       gBrowser.selectedTab = gBrowser.addTab();
       gBrowser.removeCurrentTab();
-
-      // Make sure focus is given to the window because the element is now gone
-      is(document.commandDispatcher.focusedWindow, testPageWin,
-         "content window is focused");
-
-      gBrowser.removeCurrentTab();
-      finish();
-    }, 0);
+    });
   }, true);
 
   content.location = testPage;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug477014.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug477014.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_bug477014.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_bug477014.js	2015-02-28 15:03:01.000000000 +0000
@@ -6,50 +6,19 @@
 const iconURLSpec = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==";
 var testPage="data:text/plain,test bug 477014";
 
-function test() {
-  waitForExplicitFinish();
+add_task(function*() {
+  let tabToDetach = gBrowser.addTab(testPage);
+  yield waitForDocLoadComplete(tabToDetach.linkedBrowser);
+
+  gBrowser.setIcon(tabToDetach, iconURLSpec);
+  tabToDetach.setAttribute("busy", "true");
+
+  // detach and set the listener on the new window
+  let newWindow = gBrowser.replaceTabWithWindow(tabToDetach);
+  yield promiseWaitForEvent(tabToDetach.linkedBrowser, "SwapDocShells");
 
-  var newWindow;
-  var tabToDetach;
-  var documentToDetach;
+  is(newWindow.gBrowser.selectedTab.hasAttribute("busy"), true, "Busy attribute should be correct");
+  is(newWindow.gBrowser.getIcon(), iconURLSpec, "Icon should be correct");
 
-  function onPageShow(event) {
-    // we get here if the test is executed before the pageshow
-    // event for the window's first tab
-    if (!tabToDetach || documentToDetach != event.target)
-      return;
-
-    event.currentTarget.removeEventListener("pageshow", onPageShow, false);
-
-    if (!newWindow) {
-      // prepare the tab (set icon and busy state)
-      // we have to set these only after onState* notification, otherwise
-      // they're overriden
-      setTimeout(function() {
-        gBrowser.setIcon(tabToDetach, iconURLSpec);
-        tabToDetach.setAttribute("busy", "true");
-
-        // detach and set the listener on the new window
-        newWindow = gBrowser.replaceTabWithWindow(tabToDetach);
-        // wait for gBrowser to come along
-        newWindow.addEventListener("load", function () {
-          newWindow.removeEventListener("load", arguments.callee, false);
-          newWindow.gBrowser.addEventListener("pageshow", onPageShow, false);
-        }, false);
-      }, 0);
-      return;
-    }
-
-    is(newWindow.gBrowser.selectedTab.hasAttribute("busy"), true);
-    is(newWindow.gBrowser.getIcon(), iconURLSpec);
-    newWindow.close();
-    finish();
-  }
-
-  tabToDetach = gBrowser.addTab(testPage);
-  tabToDetach.linkedBrowser.addEventListener("load", function onLoad() {
-    tabToDetach.linkedBrowser.removeEventListener("load", onLoad, true);
-    documentToDetach = tabToDetach.linkedBrowser.contentDocument;
-    gBrowser.addEventListener("pageshow", onPageShow, false);
-  }, true);
-}
+  newWindow.close();
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_e10s_javascript.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_e10s_javascript.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_e10s_javascript.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_e10s_javascript.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,11 @@
+const CHROME_PROCESS = Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
+const CONTENT_PROCESS = Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT;
+
+add_task(function*() {
+  let url = "javascript:dosomething()";
+
+  ok(E10SUtils.canLoadURIInProcess(url, CHROME_PROCESS),
+     "Check URL in chrome process.");
+  ok(E10SUtils.canLoadURIInProcess(url, CONTENT_PROCESS),
+     "Check URL in content process.");
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser.ini	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser.ini	2015-02-28 15:03:00.000000000 +0000
@@ -124,6 +124,7 @@
 [browser_alltabslistener.js]
 [browser_autocomplete_a11y_label.js]
 skip-if = e10s # Bug 1101993 - times out for unknown reasons when run in the dir (works on its own)
+[browser_autocomplete_enter_race.js]
 [browser_autocomplete_no_title.js]
 [browser_autocomplete_autoselect.js]
 [browser_autocomplete_oldschool_wrap.js]
@@ -165,7 +166,6 @@
 [browser_bug424101.js]
 skip-if = e10s # Bug 1093155 - tries to use context menu from browser-chrome and gets in a mess when in e10s mode
 [browser_bug427559.js]
-skip-if = e10s # Bug 1102015 - "content window is focused - Got [object ChromeWindow], expected [object CPOW [object Window]]"
 [browser_bug431826.js]
 [browser_bug432599.js]
 [browser_bug435035.js]
@@ -182,7 +182,6 @@
 [browser_bug462673.js]
 skip-if = e10s # Bug 1093404 - test expects sync window opening from content and is disappointed in that expectation
 [browser_bug477014.js]
-skip-if = e10s # Bug 1093206 - need to re-enable tests relying on swapFrameLoaders et al for e10s
 [browser_bug479408.js]
 skip-if = buildapp == 'mulet'
 [browser_bug481560.js]
@@ -191,7 +190,6 @@
 [browser_bug491431.js]
 skip-if = buildapp == 'mulet'
 [browser_bug495058.js]
-skip-if = e10s # Bug 1093206 - need to re-enable tests relying on swapFrameLoaders et al (and thus replaceTabWithWindow) for e10s
 [browser_bug517902.js]
 skip-if = e10s # Bug 866413 - PageInfo doesn't work in e10s
 [browser_bug519216.js]
@@ -199,7 +197,7 @@
 [browser_bug521216.js]
 [browser_bug533232.js]
 [browser_bug537013.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1093206 - need to re-enable tests relying on swapFrameLoaders et al for e10s (test calls replaceTabWithWindow)
+skip-if = buildapp == 'mulet' || e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
 [browser_bug537474.js]
 skip-if = e10s # Bug 1102020 - test tries to use browserDOMWindow.openURI to open a link, and gets a null rv where it expects a window
 [browser_bug550565.js]
@@ -405,18 +403,19 @@
 [browser_ssl_error_reports.js]
 [browser_star_hsts.js]
 [browser_subframe_favicons_not_used.js]
+[browser_syncui.js]
+skip-if = e10s # Bug 1137087 - browser_tabopen_reflows.js fails if this was previously run with e10s
 [browser_tabDrop.js]
 skip-if = buildapp == 'mulet' || e10s
 [browser_tabMatchesInAwesomebar.js]
-skip-if = e10s # Bug 1093206 - need to re-enable tests relying on swapFrameLoaders et al for e10s (test calls gBrowser.swapBrowsersAndCloseOther)
 [browser_tabMatchesInAwesomebar_perwindowpb.js]
 skip-if = e10s || os == 'linux' # Bug 1093373, bug 1104755
 [browser_tab_drag_drop_perwindow.js]
 skip-if = buildapp == 'mulet'
 [browser_tab_dragdrop.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1093206 - need to re-enable tests relying on swapFrameLoaders et al for e10s (test calls gBrowser.swapBrowsersAndCloseOther)
+skip-if = buildapp == 'mulet'
 [browser_tab_dragdrop2.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1093206 - need to re-enable tests relying on swapFrameLoaders et al for e10s (test calls gBrowser.swapBrowsersAndCloseOther)
+skip-if = buildapp == 'mulet'
 [browser_tabbar_big_widgets.js]
 skip-if = os == "linux" || os == "mac" # No tabs in titlebar on linux
                                        # Disabled on OS X because of bug 967917
@@ -429,13 +428,14 @@
 skip-if = e10s # Bug 1100664 - test relies on linkedBrowser.docShell
 [browser_tabs_owner.js]
 [browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js]
-skip-if = !e10s && os == "linux" # Bug 994541 - Need OMTC enabled by default on Linux, or else we get blocked by an alert dialog when opening e10s window.
+run-if = e10s
 [browser_trackingUI.js]
 support-files =
   trackingPage.html
   benignPage.html
 [browser_typeAheadFind.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 921935 - focusmanager issues with e10s (test calls waitForFocus)
+[browser_unknownContentType_title.js]
 [browser_unloaddialogs.js]
 skip-if = e10s # Bug 1100700 - test relies on unload event firing on closed tabs, which it doesn't
 [browser_urlHighlight.js]
@@ -485,13 +485,16 @@
 [browser_e10s_switchbrowser.js]
 [browser_e10s_about_process.js]
 [browser_e10s_chrome_process.js]
+[browser_e10s_javascript.js]
 [browser_blockHPKP.js]
 skip-if = e10s # bug 1100687 - test directly manipulates content (content.document.getElementById)
 [browser_mcb_redirect.js]
-skip-if = e10s # bug 1084504 - [e10s] Mixed content detection does not take redirection into account
 [browser_windowactivation.js]
 [browser_contextmenu_childprocess.js]
 [browser_bug963945.js]
 [browser_readerMode.js]
 support-files =
   readerModeArticle.html
+[browser_bug1124271_readerModePinnedTab.js]
+support-files =
+  readerModeArticle.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_readerMode.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_readerMode.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_readerMode.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_readerMode.js	2015-02-28 15:03:01.000000000 +0000
@@ -33,9 +33,13 @@
   readerButton.click();
   yield promiseTabLoadEvent(tab);
 
-  ok(gBrowser.selectedBrowser.currentURI.spec.startsWith("about:reader"), "about:reader loaded after clicking reader mode button");
+  let readerUrl = gBrowser.selectedBrowser.currentURI.spec;
+  ok(readerUrl.startsWith("about:reader"), "about:reader loaded after clicking reader mode button");
   is_element_visible(readerButton, "Reader mode button is present on about:reader");
 
+  is(gURLBar.value, readerUrl, "gURLBar value is about:reader URL");
+  is(gURLBar.textValue, url.substring("http://".length), "gURLBar is displaying original article URL");
+
   readerButton.click();
   yield promiseTabLoadEvent(tab);
   is(gBrowser.selectedBrowser.currentURI.spec, url, "Original page loaded after clicking active reader mode button");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_syncui.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_syncui.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_syncui.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_syncui.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,244 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let {Log} = Cu.import("resource://gre/modules/Log.jsm", {});
+let {Weave} = Cu.import("resource://services-sync/main.js", {});
+let {Notifications} = Cu.import("resource://services-sync/notifications.js", {});
+// The BackStagePass allows us to get this test-only non-exported function.
+let {getInternalScheduler} = Cu.import("resource:///modules/readinglist/Scheduler.jsm", {});
+
+let stringBundle = Cc["@mozilla.org/intl/stringbundle;1"]
+                   .getService(Ci.nsIStringBundleService)
+                   .createBundle("chrome://weave/locale/services/sync.properties");
+
+// ensure test output sees log messages.
+Log.repository.getLogger("browserwindow.syncui").addAppender(new Log.DumpAppender());
+
+function promiseObserver(topic) {
+  return new Promise(resolve => {
+    let obs = (subject, topic, data) => {
+      Services.obs.removeObserver(obs, topic);
+      resolve(subject);
+    }
+    Services.obs.addObserver(obs, topic, false);
+  });
+}
+
+add_task(function* prepare() {
+  let xps = Components.classes["@mozilla.org/weave/service;1"]
+                              .getService(Components.interfaces.nsISupports)
+                              .wrappedJSObject;
+  yield xps.whenLoaded();
+  // mock out the "_needsSetup()" function so we don't short-circuit.
+  let oldNeedsSetup = window.gSyncUI._needsSetup;
+  window.gSyncUI._needsSetup = () => false;
+  registerCleanupFunction(() => {
+    window.gSyncUI._needsSetup = oldNeedsSetup;
+  });
+});
+
+add_task(function* testProlongedSyncError() {
+  let promiseNotificationAdded = promiseObserver("weave:notification:added");
+  Assert.equal(Notifications.notifications.length, 0, "start with no notifications");
+
+  // Pretend we are in the "prolonged error" state.
+  Weave.Status.sync = Weave.PROLONGED_SYNC_FAILURE;
+  Weave.Status.login = Weave.LOGIN_SUCCEEDED;
+  Services.obs.notifyObservers(null, "weave:ui:sync:error", null);
+
+  let subject = yield promiseNotificationAdded;
+  let notification = subject.wrappedJSObject.object; // sync's observer abstraction is abstract!
+  Assert.equal(notification.title, stringBundle.GetStringFromName("error.sync.title"));
+  Assert.equal(Notifications.notifications.length, 1, "exactly 1 notification");
+
+  // Now pretend we just had a successful sync - the error notification should go away.
+  let promiseNotificationRemoved = promiseObserver("weave:notification:removed");
+  Weave.Status.sync = Weave.STATUS_OK;
+  Services.obs.notifyObservers(null, "weave:ui:sync:finish", null);
+  yield promiseNotificationRemoved;
+  Assert.equal(Notifications.notifications.length, 0, "no notifications left");
+});
+
+add_task(function* testProlongedRLError() {
+  let promiseNotificationAdded = promiseObserver("weave:notification:added");
+  Assert.equal(Notifications.notifications.length, 0, "start with no notifications");
+
+  // Pretend the reading-list is in the "prolonged error" state.
+  let longAgo = new Date(Date.now() - 100 * 24 * 60 * 60 * 1000); // 100 days ago.
+  Services.prefs.setCharPref("readinglist.scheduler.lastSync", longAgo.toString());
+  getInternalScheduler().state = ReadingListScheduler.STATE_ERROR_OTHER;
+  Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+  Services.obs.notifyObservers(null, "readinglist:sync:error", null);
+
+  let subject = yield promiseNotificationAdded;
+  let notification = subject.wrappedJSObject.object; // sync's observer abstraction is abstract!
+  Assert.equal(notification.title, stringBundle.GetStringFromName("error.sync.title"));
+  Assert.equal(Notifications.notifications.length, 1, "exactly 1 notification");
+
+  // Now pretend we just had a successful sync - the error notification should go away.
+  let promiseNotificationRemoved = promiseObserver("weave:notification:removed");
+  Services.prefs.setCharPref("readinglist.scheduler.lastSync", Date.now().toString());
+  Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+  Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
+  yield promiseNotificationRemoved;
+  Assert.equal(Notifications.notifications.length, 0, "no notifications left");
+});
+
+add_task(function* testSyncLoginError() {
+  let promiseNotificationAdded = promiseObserver("weave:notification:added");
+  Assert.equal(Notifications.notifications.length, 0, "start with no notifications");
+
+  // Pretend we are in the "prolonged error" state.
+  Weave.Status.sync = Weave.LOGIN_FAILED;
+  Weave.Status.login = Weave.LOGIN_FAILED_LOGIN_REJECTED;
+  Services.obs.notifyObservers(null, "weave:ui:sync:error", null);
+
+  let subject = yield promiseNotificationAdded;
+  let notification = subject.wrappedJSObject.object; // sync's observer abstraction is abstract!
+  Assert.equal(notification.title, stringBundle.GetStringFromName("error.login.title"));
+  Assert.equal(Notifications.notifications.length, 1, "exactly 1 notification");
+
+  // Now pretend we just had a successful login - the error notification should go away.
+  Weave.Status.sync = Weave.STATUS_OK;
+  Weave.Status.login = Weave.LOGIN_SUCCEEDED;
+  let promiseNotificationRemoved = promiseObserver("weave:notification:removed");
+  Services.obs.notifyObservers(null, "weave:service:login:start", null);
+  Services.obs.notifyObservers(null, "weave:service:login:finish", null);
+  yield promiseNotificationRemoved;
+  Assert.equal(Notifications.notifications.length, 0, "no notifications left");
+});
+
+add_task(function* testRLLoginError() {
+  let promiseNotificationAdded = promiseObserver("weave:notification:added");
+  Assert.equal(Notifications.notifications.length, 0, "start with no notifications");
+
+  // Pretend RL is in an auth error state
+  getInternalScheduler().state = ReadingListScheduler.STATE_ERROR_AUTHENTICATION;
+  Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+  Services.obs.notifyObservers(null, "readinglist:sync:error", null);
+
+  let subject = yield promiseNotificationAdded;
+  let notification = subject.wrappedJSObject.object; // sync's observer abstraction is abstract!
+  Assert.equal(notification.title, stringBundle.GetStringFromName("error.login.title"));
+  Assert.equal(Notifications.notifications.length, 1, "exactly 1 notification");
+
+  // Now pretend we just had a successful sync - the error notification should go away.
+  getInternalScheduler().state = ReadingListScheduler.STATE_OK;
+  let promiseNotificationRemoved = promiseObserver("weave:notification:removed");
+  Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+  Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
+  yield promiseNotificationRemoved;
+  Assert.equal(Notifications.notifications.length, 0, "no notifications left");
+});
+
+// Here we put readinglist into an "authentication error" state (should see
+// the error bar reflecting this), then report a prolonged error from Sync (an
+// infobar to reflect the sync error should replace it), then resolve the sync
+// error - the authentication error from readinglist should remain.
+add_task(function* testRLLoginErrorRemains() {
+  let promiseNotificationAdded = promiseObserver("weave:notification:added");
+  Assert.equal(Notifications.notifications.length, 0, "start with no notifications");
+
+  // Pretend RL is in an auth error state
+  getInternalScheduler().state = ReadingListScheduler.STATE_ERROR_AUTHENTICATION;
+  Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+  Services.obs.notifyObservers(null, "readinglist:sync:error", null);
+
+  let subject = yield promiseNotificationAdded;
+  let notification = subject.wrappedJSObject.object; // sync's observer abstraction is abstract!
+  Assert.equal(notification.title, stringBundle.GetStringFromName("error.login.title"));
+  Assert.equal(Notifications.notifications.length, 1, "exactly 1 notification");
+
+  // Now Sync into a prolonged auth error state.
+  promiseNotificationAdded = promiseObserver("weave:notification:added");
+  Weave.Status.sync = Weave.PROLONGED_SYNC_FAILURE;
+  Weave.Status.login = Weave.LOGIN_FAILED_LOGIN_REJECTED;
+  Services.obs.notifyObservers(null, "weave:ui:sync:error", null);
+  subject = yield promiseNotificationAdded;
+  // still exactly 1 notification with the "login" title.
+  notification = subject.wrappedJSObject.object;
+  Assert.equal(notification.title, stringBundle.GetStringFromName("error.login.title"));
+  Assert.equal(Notifications.notifications.length, 1, "exactly 1 notification");
+
+  // Resolve the sync problem.
+  promiseNotificationAdded = promiseObserver("weave:notification:added");
+  Weave.Status.sync = Weave.STATUS_OK;
+  Weave.Status.login = Weave.LOGIN_SUCCEEDED;
+  Services.obs.notifyObservers(null, "weave:ui:sync:finish", null);
+
+  // Expect one notification - the RL login problem.
+  subject = yield promiseNotificationAdded;
+  // still exactly 1 notification with the "login" title.
+  notification = subject.wrappedJSObject.object;
+  Assert.equal(notification.title, stringBundle.GetStringFromName("error.login.title"));
+  Assert.equal(Notifications.notifications.length, 1, "exactly 1 notification");
+
+  // and cleanup - resolve the readinglist error.
+  getInternalScheduler().state = ReadingListScheduler.STATE_OK;
+  let promiseNotificationRemoved = promiseObserver("weave:notification:removed");
+  Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+  Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
+  yield promiseNotificationRemoved;
+  Assert.equal(Notifications.notifications.length, 0, "no notifications left");
+});
+
+function checkButtonsStatus(shouldBeActive) {
+  let button = document.getElementById("sync-button");
+  let panelbutton = document.getElementById("PanelUI-fxa-status");
+  if (shouldBeActive) {
+    Assert.equal(button.getAttribute("status"), "active");
+    Assert.equal(panelbutton.getAttribute("syncstatus"), "active");
+  } else {
+    Assert.ok(!button.hasAttribute("status"));
+    Assert.ok(!panelbutton.hasAttribute("syncstatus"));
+  }
+}
+
+function testButtonActions(startNotification, endNotification) {
+  checkButtonsStatus(false);
+  // pretend a sync is starting.
+  Services.obs.notifyObservers(null, startNotification, null);
+  checkButtonsStatus(true);
+  // and has stopped
+  Services.obs.notifyObservers(null, endNotification, null);
+  checkButtonsStatus(false);
+}
+
+add_task(function* testButtonActivities() {
+  // add the Sync button to the panel so we can get it!
+  CustomizableUI.addWidgetToArea("sync-button", CustomizableUI.AREA_PANEL);
+  // check the button's functionality
+  yield PanelUI.show();
+  try {
+    testButtonActions("weave:service:login:start", "weave:service:login:finish");
+    testButtonActions("weave:service:login:start", "weave:service:login:error");
+
+    testButtonActions("weave:service:sync:start", "weave:service:sync:finish");
+    testButtonActions("weave:service:sync:start", "weave:service:sync:error");
+
+    testButtonActions("readinglist:sync:start", "readinglist:sync:finish");
+    testButtonActions("readinglist:sync:start", "readinglist:sync:error");
+
+    // and ensure the counters correctly handle multiple in-flight syncs
+    Services.obs.notifyObservers(null, "weave:service:sync:start", null);
+    checkButtonsStatus(true);
+    Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+    checkButtonsStatus(true);
+    Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
+    // sync is still going...
+    checkButtonsStatus(true);
+    // another reading list starts
+    Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+    checkButtonsStatus(true);
+    // The initial sync stops.
+    Services.obs.notifyObservers(null, "weave:service:sync:finish", null);
+    // RL is still going...
+    checkButtonsStatus(true);
+    // RL finishes with an error, so no longer active.
+    Services.obs.notifyObservers(null, "readinglist:sync:error", null);
+    checkButtonsStatus(false);
+  } finally {
+    PanelUI.hide();
+    CustomizableUI.removeWidgetFromArea("sync-button");
+  }
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_tab_dragdrop.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_tab_dragdrop.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_tab_dragdrop.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_tab_dragdrop.js	2015-02-28 15:03:01.000000000 +0000
@@ -15,14 +15,26 @@
   ];
 
   function setLocation(i, url) {
-    gBrowser.getBrowserForTab(tabs[i]).contentWindow.location = url;
+    tabs[i].linkedBrowser.contentWindow.location = url;
   }
   function moveTabTo(a, b) {
     gBrowser.swapBrowsersAndCloseOther(gBrowser.tabs[b], gBrowser.tabs[a]);
   }
-  function clickTest(doc, win) {
+  function clickTest(tab, doc, win) {
     var clicks = doc.defaultView.clicks;
-    EventUtils.synthesizeMouseAtCenter(doc.body, {}, win);
+
+    yield ContentTask.spawn(tab.linkedBrowser, {}, function() {
+      let target = content.document.body;
+      let rect = target.getBoundingClientRect();
+      let left = (rect.left + rect.right) / 2;
+      let top = (rect.top + rect.bottom) / 2;
+
+      let utils = content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                         .getInterface(Components.interfaces.nsIDOMWindowUtils);
+      utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
+      utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
+    });
+
     is(doc.defaultView.clicks, clicks+1, "adding 1 more click on BODY");
   }
   function test1() {
@@ -30,32 +42,32 @@
     is(gBrowser.tabs[1], tabs[1], "tab1");
     is(gBrowser.tabs[2], tabs[3], "tab3");
 
-    var plugin = gBrowser.getBrowserForTab(tabs[4]).docShell.contentViewer.DOMDocument.wrappedJSObject.body.firstChild;
+    var plugin = tabs[4].linkedBrowser.contentDocument.wrappedJSObject.body.firstChild;
     var tab4_plugin_object = plugin.getObjectValue();
 
     gBrowser.selectedTab = gBrowser.tabs[2];
     moveTabTo(3, 2); // now: 0 1 4
     gBrowser.selectedTab = tabs[4];
-    var doc = gBrowser.getBrowserForTab(gBrowser.tabs[2]).docShell.contentViewer.DOMDocument.wrappedJSObject;
+    var doc = gBrowser.tabs[2].linkedBrowser.contentDocument.wrappedJSObject;
     plugin = doc.body.firstChild;
     ok(plugin && plugin.checkObjectValue(tab4_plugin_object), "same plugin instance");
     is(gBrowser.tabs[1], tabs[1], "tab1");
     is(gBrowser.tabs[2], tabs[3], "tab4");
     is(doc.defaultView.clicks, 0, "no click on BODY so far");
-    clickTest(doc, window);
+    clickTest(gBrowser.tabs[2], doc, window);
 
     moveTabTo(2, 1); // now: 0 4
     is(gBrowser.tabs[1], tabs[1], "tab1");
-    doc = gBrowser.getBrowserForTab(gBrowser.tabs[1]).docShell.contentViewer.DOMDocument.wrappedJSObject;
+    doc = gBrowser.tabs[1].linkedBrowser.contentDocument.wrappedJSObject;
     plugin = doc.body.firstChild;
     ok(plugin && plugin.checkObjectValue(tab4_plugin_object), "same plugin instance");
-    clickTest(doc, window);
+    clickTest(gBrowser.tabs[1], doc, window);
 
     // Load a new document (about:blank) in tab4, then detach that tab into a new window.
     // In the new window, navigate back to the original document and click on its <body>,
     // verify that its onclick was called.
     var t = tabs[1];
-    var b = gBrowser.getBrowserForTab(t);
+    var b = t.linkedBrowser;
     gBrowser.selectedTab = t;
     b.addEventListener("load", function() {
       b.removeEventListener("load", arguments.callee, true);
@@ -65,16 +77,16 @@
         whenDelayedStartupFinished(win, function () {
           // Verify that the original window now only has the initial tab left in it.
           is(gBrowser.tabs[0], tabs[0], "tab0");
-          is(gBrowser.getBrowserForTab(gBrowser.tabs[0]).contentWindow.location, "about:blank", "tab0 uri");
+          is(gBrowser.tabs[0].linkedBrowser.contentWindow.location, "about:blank", "tab0 uri");
 
           executeSoon(function () {
             win.gBrowser.addEventListener("pageshow", function () {
               win.gBrowser.removeEventListener("pageshow", arguments.callee, false);
               executeSoon(function () {
                 t = win.gBrowser.tabs[0];
-                b = win.gBrowser.getBrowserForTab(t);
-                var doc = b.docShell.contentViewer.DOMDocument.wrappedJSObject;
-                clickTest(doc, win);
+                b = t.linkedBrowser;
+                var doc = b.contentDocument.wrappedJSObject;
+                clickTest(t, doc, win);
                 win.close();
                 finish();
               });
@@ -90,11 +102,11 @@
 
   var loads = 0;
   function waitForLoad(event, tab, listenerContainer) {
-    var b = gBrowser.getBrowserForTab(gBrowser.tabs[tab]);
+    var b = tabs[tab].linkedBrowser;
     if (b.contentDocument != event.target) {
       return;
     }
-    gBrowser.getBrowserForTab(gBrowser.tabs[tab]).removeEventListener("load", listenerContainer.listener, true);
+    gBrowser.tabs[tab].linkedBrowser.removeEventListener("load", listenerContainer.listener, true);
     ++loads;
     if (loads == tabs.length - 1) {
       executeSoon(test1);
@@ -107,7 +119,7 @@
     return listenerContainer.listener;
   }
   for (var i = 1; i < tabs.length; ++i) {
-    gBrowser.getBrowserForTab(tabs[i]).addEventListener("load", fn(waitForLoad,i), true);
+    tabs[i].linkedBrowser.addEventListener("load", fn(waitForLoad,i), true);
   }
 
   setLocation(1, "data:text/html;charset=utf-8,<title>tab1</title><body>tab1<iframe>");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_tabMatchesInAwesomebar.js	2015-02-28 15:03:01.000000000 +0000
@@ -65,6 +65,7 @@
     let tab = gBrowser.addTab();
     tab.linkedBrowser.addEventListener("load", function () {
       tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+      gBrowser.updateBrowserRemoteness(tabToKeep.linkedBrowser, tab.linkedBrowser.isRemoteBrowser);
       gBrowser.swapBrowsersAndCloseOther(tabToKeep, tab);
       ensure_opentabs_match_db(function () {
         gBrowser.removeTab(tabToKeep);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_unknownContentType_title.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_unknownContentType_title.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/test/general/browser_unknownContentType_title.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/test/general/browser_unknownContentType_title.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,33 @@
+const url = "data:text/html;charset=utf-8,%3C%21DOCTYPE%20html%3E%3Chtml%3E%3Chead%3E%3Ctitle%3ETest%20Page%3C%2Ftitle%3E%3C%2Fhead%3E%3C%2Fhtml%3E";
+const unknown_url = "http://example.com/browser/browser/base/content/test/general/unknownContentType_file.pif";
+
+function waitForNewWindow() {
+  return new Promise(resolve => {
+    let listener = (win) => {
+      Services.obs.removeObserver(listener, "toplevel-window-ready");
+      win.addEventListener("load", () => {
+        resolve(win);
+      });
+    };
+
+    Services.obs.addObserver(listener, "toplevel-window-ready", false)
+  });
+}
+
+add_task(function*() {
+  let tab = gBrowser.selectedTab = gBrowser.addTab(url);
+  let browser = tab.linkedBrowser;
+  yield promiseTabLoaded(gBrowser.selectedTab);
+
+  is(gBrowser.contentTitle, "Test Page", "Should have the right title.")
+
+  browser.loadURI(unknown_url);
+  let win = yield waitForNewWindow();
+  is(win.location, "chrome://mozapps/content/downloads/unknownContentType.xul",
+     "Should have seen the unknown content dialog.");
+  is(gBrowser.contentTitle, "Test Page", "Should still have the right title.")
+
+  win.close();
+  yield promiseWaitForFocus(window);
+  gBrowser.removeCurrentTab();
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/urlbarBindings.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/urlbarBindings.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/urlbarBindings.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/urlbarBindings.xml	2015-02-28 15:03:01.000000000 +0000
@@ -124,6 +124,8 @@
       ]]></destructor>
 
       <field name="_value">""</field>
+      <field name="gotResultForCurrentQuery">false</field>
+      <field name="handleEnterWhenGotResult">false</field>
 
       <!--
         onBeforeValueGet is called by the base-binding's .value getter.
@@ -160,6 +162,11 @@
                 break;
               }
             }
+          } else {
+            let originalUrl = ReaderParent.parseReaderUrl(aValue);
+            if (originalUrl) {
+              returnValue = originalUrl;
+            }
           }
 
           // Set the actiontype only if the user is not overriding actions.
@@ -801,11 +808,48 @@
             this._value = this.inputField.value;
             gBrowser.userTypedValue = this.value;
             this.valueIsTyped = true;
+            this.gotResultForCurrentQuery = false;
             this.mController.handleText();
           }
           this.resetActionType();
         ]]></body>
       </method>
+
+      <method name="handleEnter">
+        <body><![CDATA[
+          // When UnifiedComplete is enabled, we need to ensure we're using
+          // a selected autocomplete result. A result should automatically be
+          // selected by default (UnifiedComplete guarantees at least one
+          // result), however autocomplete is async and therefore we may not
+          // have a result set relating to the current input yet. If that
+          // happens, we need to mark that when the first result does get added,
+          // it needs to be handled as if enter was pressed with that first
+          // result selected.
+          // With UnifiedComplete disabled we don't have this problem, as the
+          // default is to use the value directly from the input field (without
+          // relying on autocomplete).
+
+          if (!Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete")) {
+            return this.mController.handleEnter(false);
+          }
+
+          // If anything other than the default (first) result is selected, then
+          // it must have been manually selected by the human. We let this
+          // explicit choice be used, even if it may be related to a previous
+          // input.
+          // However, if the default result is automatically selected, we
+          // ensure that it corresponds to the current input.
+
+          if (this.popup.selectedIndex != 0 || this.gotResultForCurrentQuery) {
+            return this.mController.handleEnter(false);
+          }
+
+          this.handleEnterWhenGotResult = true;
+
+          return true;
+        ]]></body>
+      </method>
+
     </implementation>
 
     <handlers>
@@ -979,7 +1023,7 @@
       <stylesheet src="chrome://browser/skin/searchbar.css"/>
     </resources>
     <content ignorekeys="true" level="top" consumeoutsideclicks="never">
-      <xul:hbox xbl:inherits="collapsed=showonlysettings" anonid="searchbar-engine"
+      <xul:hbox anonid="searchbar-engine" xbl:inherits="showonlysettings"
                 class="search-panel-header search-panel-current-engine">
         <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
         <xul:label anonid="searchbar-engine-name" flex="1" crop="end"
@@ -995,8 +1039,7 @@
       </xul:tree>
       <xul:deck anonid="search-panel-one-offs-header"
                 selectedIndex="0"
-                class="search-panel-header search-panel-current-input"
-                xbl:inherits="hidden=showonlysettings">
+                class="search-panel-header search-panel-current-input">
         <xul:label anonid="searchbar-oneoffheader-search" value="&searchWithHeader.label;"/>
         <xul:hbox anonid="search-panel-searchforwith"
                   class="search-panel-current-input">
@@ -1006,11 +1049,10 @@
         </xul:hbox>
       </xul:deck>
       <xul:description anonid="search-panel-one-offs"
-                       class="search-panel-one-offs"
-                       xbl:inherits="hidden=showonlysettings"/>
+                       role="group"
+                       class="search-panel-one-offs"/>
       <xul:vbox anonid="add-engines"/>
       <xul:button anonid="search-settings"
-                  xbl:inherits="showonlysettings"
                   oncommand="BrowserUITelemetry.countSearchSettingsEvent('searchbar');openPreferences('paneSearch')"
                   class="search-setting-button search-panel-header"
                   label="&changeSearchSettings.button;"/>
@@ -1021,6 +1063,18 @@
            false after the mousedown event has been triggered to detect what
            caused rollup. -->
       <field name="_isHiding">false</field>
+      <field name="_bundle">null</field>
+      <property name="bundle" readonly="true">
+        <getter>
+          <![CDATA[
+            if (!this._bundle) {
+              const kBundleURI = "chrome://browser/locale/search.properties";
+              this._bundle = Services.strings.createBundle(kBundleURI);
+            }
+            return this._bundle;
+          ]]>
+        </getter>
+      </property>
 
       <method name="updateHeader">
         <body><![CDATA[
@@ -1036,10 +1090,8 @@
             this.removeAttribute("src");
           }
 
-          const kBundleURI = "chrome://browser/locale/search.properties";
-          let bundle = Services.strings.createBundle(kBundleURI);
-          let headerText = bundle.formatStringFromName("searchHeader",
-                                                       [currentEngine.name], 1);
+          let headerText = this.bundle.formatStringFromName("searchHeader",
+                                                            [currentEngine.name], 1);
           document.getAnonymousElementByAttribute(this, "anonid", "searchbar-engine-name")
                   .setAttribute("value", headerText);
           document.getAnonymousElementByAttribute(this, "anonid", "searchbar-engine")
@@ -1084,17 +1136,28 @@
         let headerPanel =
           document.getAnonymousElementByAttribute(this, "anonid",
                                                   "search-panel-one-offs-header");
+        let list = document.getAnonymousElementByAttribute(this, "anonid",
+                                                           "search-panel-one-offs");
         let textbox = searchbar.textbox;
         let self = this;
         let inputHandler = function() {
           headerSearchText.setAttribute("value", textbox.value);
+          let groupText;
           if (textbox.value) {
             self.removeAttribute("showonlysettings");
+            groupText = headerSearchText.previousSibling.value +
+                        '"' + headerSearchText.value + '"' +
+                        headerSearchText.nextSibling.value;
             headerPanel.selectedIndex = 1;
           }
           else {
+            let noSearchHeader =
+              document.getAnonymousElementByAttribute(self, "anonid",
+                                                      "searchbar-oneoffheader-search");
+            groupText = noSearchHeader.value;
             headerPanel.selectedIndex = 0;
           }
+          list.setAttribute("aria-label", groupText);
         };
         textbox.addEventListener("input", inputHandler);
         this.addEventListener("popuphiding", function hiding() {
@@ -1116,12 +1179,11 @@
 
         let addEngines = gBrowser.selectedBrowser.engines;
         if (addEngines && addEngines.length > 0) {
-          const kBundleURI = "chrome://browser/locale/search.properties";
-          let bundle = Services.strings.createBundle(kBundleURI);
           for (let engine of addEngines) {
             let button = document.createElementNS(kXULNS, "button");
-            let label = bundle.formatStringFromName("cmd_addFoundEngine",
-                                                    [engine.title], 1);
+            let label = this.bundle.formatStringFromName("cmd_addFoundEngine",
+                                                         [engine.title], 1);
+            button.id = "searchbar-add-engine-" + engine.title.replace(/ /g, '-');
             button.setAttribute("class", "addengine-item");
             button.setAttribute("label", label);
             button.setAttribute("pack", "start");
@@ -1139,8 +1201,6 @@
         }
 
         // Finally, build the list of one-off buttons.
-        let list = document.getAnonymousElementByAttribute(this, "anonid",
-                                                           "search-panel-one-offs")
         while (list.firstChild)
           list.firstChild.remove();
 
@@ -1199,11 +1259,15 @@
         let height = rowCount * 33; // 32px per row, 1px border.
         list.setAttribute("height", height + "px");
 
+        // Ensure we can refer to the settings button by ID:
+        let settingsEl = document.getAnonymousElementByAttribute(this, "anonid", "search-settings");
+        settingsEl.id = this.id + "-anon-search-settings";
+
         let dummyItems = enginesPerRow - (engines.length % enginesPerRow || enginesPerRow);
         for (let i = 0; i < engines.length; ++i) {
           let engine = engines[i];
           let button = document.createElementNS(kXULNS, "button");
-          button.setAttribute("label", engine.name);
+          button.id = "searchbar-engine-one-off-item-" + engine.name.replace(/ /g, '-');
           let uri = "chrome://browser/skin/search-engine-placeholder.png";
           if (engine.iconURI) {
             uri = PlacesUtils.getImageURLForResolution(window, engine.iconURI.spec);
@@ -1481,6 +1545,12 @@
 
             if (this._matchCount > 0 && this.selectedIndex == -1)
               this.selectedIndex = 0;
+
+            this.input.gotResultForCurrentQuery = true;
+            if (this.input.handleEnterWhenGotResult) {
+              this.input.handleEnterWhenGotResult = false;
+              this.input.mController.handleEnter(false);
+            }
           ]]>
         </body>
       </method>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/utilityOverlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/utilityOverlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/content/utilityOverlay.js	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/content/utilityOverlay.js	2015-02-28 15:03:01.000000000 +0000
@@ -231,7 +231,7 @@
         "where == 'save' but without initiatingDoc.  See bug 814264.");
       return;
     }
-    saveURL(url, null, null, true, null, aReferrerURI, aInitiatingDoc);
+    saveURL(url, null, null, true, null, aNoReferrer ? null : aReferrerURI, aInitiatingDoc);
     return;
   }
   const Cc = Components.classes;
@@ -265,7 +265,7 @@
 
     sa.AppendElement(wuri);
     sa.AppendElement(charset);
-    sa.AppendElement(aReferrerURI);
+    sa.AppendElement(aNoReferrer ? null : aReferrerURI);
     sa.AppendElement(aPostData);
     sa.AppendElement(allowThirdPartyFixupSupports);
 
@@ -327,7 +327,7 @@
     if (aDisallowInheritPrincipal && !(uriObj && uriObj.schemeIs("javascript")))
       flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
 
-    w.gBrowser.loadURIWithFlags(url, flags, aReferrerURI, null, aPostData);
+    w.gBrowser.loadURIWithFlags(url, flags, aNoReferrer ? null : aReferrerURI, null, aPostData);
     break;
   case "tabshifted":
     loadInBackground = !loadInBackground;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/base/moz.build	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/base/moz.build	2015-02-28 15:03:01.000000000 +0000
@@ -6,6 +6,10 @@
 
 SPHINX_TREES['sslerrorreport'] = 'content/docs/sslerrorreport'
 
+TESTING_JS_MODULES += [
+    'content/test/BrowserUITestUtils.jsm',
+]
+
 MOCHITEST_MANIFESTS += [
     'content/test/general/mochitest.ini',
 ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/about/AboutRedirector.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/about/AboutRedirector.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/about/AboutRedirector.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/about/AboutRedirector.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -120,6 +120,7 @@
   { "reader", "chrome://global/content/reader/aboutReader.html",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT |
+    nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
     nsIAboutModule::HIDE_FROM_ABOUTABOUT },
 };
 static const int kRedirTotal = ArrayLength(kRedirMap);
@@ -163,18 +164,9 @@
       rv = NS_NewURI(getter_AddRefs(tempURI),
                      nsDependentCString(kRedirMap[i].url));
       NS_ENSURE_SUCCESS(rv, rv);
-      // Bug 1087720 (and Bug 1099296):
-      // Once all callsites have been updated to call NewChannel2()
-      // instead of NewChannel() we should have a non-null loadInfo
-      // consistently. Until then we have to branch on the loadInfo.
-      if (aLoadInfo) {
-        rv = NS_NewChannelInternal(getter_AddRefs(tempChannel),
-                                   tempURI,
-                                   aLoadInfo);
-      }
-      else {
-        rv = ioService->NewChannelFromURI(tempURI, getter_AddRefs(tempChannel));
-      }
+      rv = NS_NewChannelInternal(getter_AddRefs(tempChannel),
+                                 tempURI,
+                                 aLoadInfo);
       NS_ENSURE_SUCCESS(rv, rv);
 
       tempChannel->SetOriginalURI(aURI);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/customizableui/content/panelUI.inc.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/customizableui/content/panelUI.inc.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/customizableui/content/panelUI.inc.xul	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/customizableui/content/panelUI.inc.xul	2015-02-28 15:03:01.000000000 +0000
@@ -64,7 +64,7 @@
                        type="checkbox"
                        class="subviewbutton"
                        key="key_gotoHistory"
-                       oncommand="toggleSidebar('viewHistorySidebar'); PanelUI.hide();">
+                       oncommand="SidebarUI.toggle('viewHistorySidebar'); PanelUI.hide();">
           <observes element="viewHistorySidebar" attribute="checked"/>
         </toolbarbutton>
         <toolbarbutton id="appMenuClearRecentHistory"
@@ -108,7 +108,7 @@
                        label="&viewBookmarksSidebar2.label;"
                        class="subviewbutton"
                        key="viewBookmarksSidebarKb"
-                       oncommand="toggleSidebar('viewBookmarksSidebar'); PanelUI.hide();">
+                       oncommand="SidebarUI.toggle('viewBookmarksSidebar'); PanelUI.hide();">
           <observes element="viewBookmarksSidebar" attribute="checked"/>
         </toolbarbutton>
         <toolbarbutton id="panelMenu_viewBookmarksToolbar"
@@ -126,6 +126,17 @@
                        label="&unsortedBookmarksCmd.label;"
                        class="subviewbutton cui-withicon"
                        oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks'); PanelUI.hide();"/>
+        <toolbarseparator>
+          <observes element="readingListSidebar" attribute="hidden"/>
+        </toolbarseparator>
+        <toolbarbutton id="panelMenu_viewReadingListSidebar"
+                       label="&readingList.showSidebar.label;"
+                       class="subviewbutton"
+                       key="key_readingListSidebar"
+                       oncommand="SidebarUI.toggle('readingListSidebar'); PanelUI.hide();">
+          <observes element="readingListSidebar" attribute="checked"/>
+          <observes element="readingListSidebar" attribute="hidden"/>
+        </toolbarbutton>
         <toolbarseparator class="small-separator"/>
         <toolbaritem id="panelMenu_bookmarksMenu"
                      orient="vertical"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/customizableui/CustomizableWidgets.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/customizableui/CustomizableWidgets.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/customizableui/CustomizableWidgets.jsm	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/customizableui/CustomizableWidgets.jsm	2015-02-28 15:03:01.000000000 +0000
@@ -10,6 +10,8 @@
 Cu.import("resource:///modules/CustomizableUI.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITelemetry",
+  "resource:///modules/BrowserUITelemetry.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
   "resource://gre/modules/PlacesUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PlacesUIUtils",
@@ -1012,6 +1014,7 @@
       this._ensureSanitizer();
       this._sanitizer.range = this._getSanitizeRange(doc);
       let group = doc.getElementById("PanelUI-panic-timeSpan");
+      BrowserUITelemetry.countPanicEvent(group.selectedItem.id);
       group.selectedItem = doc.getElementById("PanelUI-panic-5min");
       let itemsToClear = [
         "cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads"
@@ -1076,6 +1079,7 @@
   id: "e10s-button",
   label: buttonLabel,
   tooltiptext: buttonLabel,
+  disabled: Services.appinfo.inSafeMode,
   defaultArea: CustomizableUI.AREA_PANEL,
   onCommand: getCommandFunction(openRemote),
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/customizableui/test/browser_988072_sidebar_events.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/customizableui/test/browser_988072_sidebar_events.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/customizableui/test/browser_988072_sidebar_events.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/customizableui/test/browser_988072_sidebar_events.js	2015-02-28 15:03:01.000000000 +0000
@@ -22,7 +22,7 @@
 
   // Ensure sidebar is hidden after each test:
   if (!document.getElementById("sidebar-box").hidden) {
-    toggleSidebar("", false);
+    SidebarUI.hide();
   }
 });
 
@@ -53,9 +53,13 @@
 
 // Filters out the trailing menuseparators from the sidebar list
 function getSidebarList() {
-  let sidebars = [...gSidebarMenu.children];
-  while (sidebars[sidebars.length - 1].localName == "menuseparator")
-    sidebars.pop();
+  let sidebars = [...gSidebarMenu.children].filter(sidebar => {
+    if (sidebar.localName == "menuseparator")
+      return false;
+    if (sidebar.getAttribute("hidden") == "true")
+      return false;
+    return true;
+  });
   return sidebars;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/downloads/content/allDownloadsViewOverlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/downloads/content/allDownloadsViewOverlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/downloads/content/allDownloadsViewOverlay.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/downloads/content/allDownloadsViewOverlay.js	2015-02-28 15:03:01.000000000 +0000
@@ -4,6 +4,8 @@
 
 let { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadUtils",
                                   "resource://gre/modules/DownloadUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadsCommon",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/downloads/content/downloads.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/downloads/content/downloads.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/downloads/content/downloads.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/downloads/content/downloads.js	2015-02-28 15:03:01.000000000 +0000
@@ -66,6 +66,8 @@
 
 let { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadsCommon",
                                   "resource:///modules/DownloadsCommon.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "DownloadsViewUI",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/feeds/FeedConverter.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/feeds/FeedConverter.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/feeds/FeedConverter.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/feeds/FeedConverter.js	2015-02-28 15:03:01.000000000 +0000
@@ -548,15 +548,12 @@
     return uri;
   },
   
-  newChannel: function GPH_newChannel(aUri) {
+  newChannel2: function GPH_newChannel(aUri, aLoadInfo) {
     var inner = aUri.QueryInterface(Ci.nsINestedURI).innerURI;
     var channel = Cc["@mozilla.org/network/io-service;1"].
-                  getService(Ci.nsIIOService).newChannelFromURI2(inner,
-                                                                 null,      // aLoadingNode
-                                                                 Services.scriptSecurityManager.getSystemPrincipal(),
-                                                                 null,      // aTriggeringPrincipal
-                                                                 Ci.nsILoadInfo.SEC_NORMAL,
-                                                                 Ci.nsIContentPolicy.TYPE_OTHER);
+                  getService(Ci.nsIIOService).
+                  newChannelFromURIWithLoadInfo(inner, aLoadInfo);
+
     if (channel instanceof Components.interfaces.nsIHttpChannel)
       // Set this so we know this is supposed to be a feed
       channel.setRequestHeader("X-Moz-Is-Feed", "1", false);
@@ -564,6 +561,7 @@
     return channel;
   },
   
+
   QueryInterface: function GPH_QueryInterface(iid) {
     if (iid.equals(Ci.nsIProtocolHandler) ||
         iid.equals(Ci.nsISupports))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/css/contacts.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/css/contacts.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/css/contacts.css	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/css/contacts.css	2015-02-28 15:03:01.000000000 +0000
@@ -229,3 +229,44 @@
 .contact-form > .button-group {
   margin-top: 1rem;
 }
+
+.contacts-gravatar-promo {
+  position: relative;
+  border: 1px dashed #c1c1c1;
+  border-radius: 2px;
+  background-color: #fbfbfb;
+  padding: 10px;
+  margin-top: 10px;
+}
+
+.contacts-gravatar-promo > p {
+  margin-top: 2px;
+  margin-bottom: 8px;
+  margin-right: 4px;
+  word-wrap: break-word;
+}
+
+body[dir=rtl] .contacts-gravatar-promo > p {
+  margin-right: 0;
+  margin-left: 4px;
+}
+
+.contacts-gravatar-promo > p > a {
+  color: #0295df;
+  text-decoration: none;
+}
+
+.contacts-gravatar-promo > p > a:hover {
+  text-decoration: underline;
+}
+
+.contacts-gravatar-promo > .button-close {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+}
+
+body[dir=rtl] .contacts-gravatar-promo > .button-close {
+  right: auto;
+  left: 8px;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/css/panel.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/css/panel.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/css/panel.css	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/css/panel.css	2015-02-28 15:03:01.000000000 +0000
@@ -390,6 +390,23 @@
   color: #fff;
 }
 
+.button-close {
+  background-color: transparent;
+  background-image: url(../shared/img/icons-10x10.svg#close);
+  background-repeat: no-repeat;
+  background-size: 8px 8px;
+  border: none;
+  padding: 0;
+  height: 8px;
+  width: 8px;
+}
+
+.button-close:hover,
+.button-close:hover:active {
+  background-color: transparent;
+  border: none;
+}
+
 /* Dropdown menu */
 
 .dropdown {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/contacts.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/contacts.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/contacts.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/contacts.js	2015-02-28 15:03:01.000000000 +0000
@@ -81,6 +81,59 @@
     contact[field][0].value = value;
   };
 
+  const GravatarPromo = React.createClass({displayName: "GravatarPromo",
+    propTypes: {
+      handleUse: React.PropTypes.func.isRequired
+    },
+
+    getInitialState: function() {
+      return {
+        showMe: navigator.mozLoop.getLoopPref("contacts.gravatars.promo") &&
+          !navigator.mozLoop.getLoopPref("contacts.gravatars.show")
+      };
+    },
+
+    handleCloseButtonClick: function() {
+      navigator.mozLoop.setLoopPref("contacts.gravatars.promo", false);
+      this.setState({ showMe: false });
+    },
+
+    handleUseButtonClick: function() {
+      navigator.mozLoop.setLoopPref("contacts.gravatars.promo", false);
+      navigator.mozLoop.setLoopPref("contacts.gravatars.show", true);
+      this.setState({ showMe: false });
+      this.props.handleUse();
+    },
+
+    render: function() {
+      if (!this.state.showMe) {
+        return null;
+      }
+
+      let privacyUrl = navigator.mozLoop.getLoopPref("legal.privacy_url");
+      let message = mozL10n.get("gravatars_promo_message", {
+        "learn_more": React.renderToStaticMarkup(
+          React.createElement("a", {href: privacyUrl, target: "_blank"}, 
+            mozL10n.get("gravatars_promo_message_learnmore")
+          )
+        )
+      });
+      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(ButtonGroup, null, 
+            React.createElement(Button, {caption: mozL10n.get("gravatars_promo_button_nothanks"), 
+                    onClick: this.handleCloseButtonClick}), 
+            React.createElement(Button, {caption: mozL10n.get("gravatars_promo_button_use"), 
+                    additionalClass: "button-accept", 
+                    onClick: this.handleUseButtonClick})
+          )
+        )
+      );
+    }
+  });
+
   const ContactDropdown = React.createClass({displayName: "ContactDropdown",
     propTypes: {
       handleAction: React.PropTypes.func.isRequired,
@@ -232,7 +285,9 @@
 
       return (
         React.createElement("li", {className: contactCSSClass, onMouseLeave: this.hideDropdownMenu}, 
-          React.createElement("div", {className: "avatar"}), 
+          React.createElement("div", {className: "avatar"}, 
+            React.createElement("img", {src: navigator.mozLoop.getUserAvatar(email.value)})
+          ), 
           React.createElement("div", {className: "details"}, 
             React.createElement("div", {className: "username"}, React.createElement("strong", null, names.firstName), " ", names.lastName, 
               React.createElement("i", {className: cx({"icon icon-google": this.props.contact.category[0] == "google"})}), 
@@ -462,6 +517,12 @@
       }
     },
 
+    handleUseGravatar: function() {
+      // We got permission to use Gravatar icons now, so we need to redraw the
+      // list entirely to show them.
+      this.refresh();
+    },
+
     sortContacts: function(contact1, contact2) {
       let comp = contact1.name[0].localeCompare(contact2.name[0]);
       if (comp !== 0) {
@@ -522,7 +583,8 @@
             React.createElement("input", {className: "contact-filter", 
                    placeholder: mozL10n.get("contacts_search_placesholder"), 
                    valueLink: this.linkState("filter")})
-            : null
+            : null, 
+            React.createElement(GravatarPromo, {handleUse: this.handleUseGravatar})
           ), 
           React.createElement("ul", {className: "contact-list"}, 
             shownContacts.available ?
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/contacts.jsx thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/contacts.jsx
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/contacts.jsx	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/contacts.jsx	2015-02-28 15:03:01.000000000 +0000
@@ -81,6 +81,59 @@
     contact[field][0].value = value;
   };
 
+  const GravatarPromo = React.createClass({
+    propTypes: {
+      handleUse: React.PropTypes.func.isRequired
+    },
+
+    getInitialState: function() {
+      return {
+        showMe: navigator.mozLoop.getLoopPref("contacts.gravatars.promo") &&
+          !navigator.mozLoop.getLoopPref("contacts.gravatars.show")
+      };
+    },
+
+    handleCloseButtonClick: function() {
+      navigator.mozLoop.setLoopPref("contacts.gravatars.promo", false);
+      this.setState({ showMe: false });
+    },
+
+    handleUseButtonClick: function() {
+      navigator.mozLoop.setLoopPref("contacts.gravatars.promo", false);
+      navigator.mozLoop.setLoopPref("contacts.gravatars.show", true);
+      this.setState({ showMe: false });
+      this.props.handleUse();
+    },
+
+    render: function() {
+      if (!this.state.showMe) {
+        return null;
+      }
+
+      let privacyUrl = navigator.mozLoop.getLoopPref("legal.privacy_url");
+      let message = mozL10n.get("gravatars_promo_message", {
+        "learn_more": React.renderToStaticMarkup(
+          <a href={privacyUrl} target="_blank">
+            {mozL10n.get("gravatars_promo_message_learnmore")}
+          </a>
+        )
+      });
+      return (
+        <div className="contacts-gravatar-promo">
+          <Button additionalClass="button-close" onClick={this.handleCloseButtonClick}/>
+          <p dangerouslySetInnerHTML={{__html: message}}></p>
+          <ButtonGroup>
+            <Button caption={mozL10n.get("gravatars_promo_button_nothanks")}
+                    onClick={this.handleCloseButtonClick}/>
+            <Button caption={mozL10n.get("gravatars_promo_button_use")}
+                    additionalClass="button-accept"
+                    onClick={this.handleUseButtonClick}/>
+          </ButtonGroup>
+        </div>
+      );
+    }
+  });
+
   const ContactDropdown = React.createClass({
     propTypes: {
       handleAction: React.PropTypes.func.isRequired,
@@ -232,7 +285,9 @@
 
       return (
         <li className={contactCSSClass} onMouseLeave={this.hideDropdownMenu}>
-          <div className="avatar" />
+          <div className="avatar">
+            <img src={navigator.mozLoop.getUserAvatar(email.value)} />
+          </div>
           <div className="details">
             <div className="username"><strong>{names.firstName}</strong> {names.lastName}
               <i className={cx({"icon icon-google": this.props.contact.category[0] == "google"})} />
@@ -462,6 +517,12 @@
       }
     },
 
+    handleUseGravatar: function() {
+      // We got permission to use Gravatar icons now, so we need to redraw the
+      // list entirely to show them.
+      this.refresh();
+    },
+
     sortContacts: function(contact1, contact2) {
       let comp = contact1.name[0].localeCompare(contact2.name[0]);
       if (comp !== 0) {
@@ -523,6 +584,7 @@
                    placeholder={mozL10n.get("contacts_search_placesholder")}
                    valueLink={this.linkState("filter")} />
             : null }
+            <GravatarPromo handleUse={this.handleUseGravatar}/>
           </div>
           <ul className="contact-list">
             {shownContacts.available ?
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/panel.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/panel.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/panel.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/panel.js	2015-02-28 15:03:01.000000000 +0000
@@ -40,6 +40,18 @@
       if (tabChange) {
         this.props.mozLoop.notifyUITour("Loop:PanelTabChanged", nextState.selectedTab);
       }
+
+      if (!tabChange && nextProps.buttonsHidden) {
+        if (nextProps.buttonsHidden.length !== this.props.buttonsHidden.length) {
+          tabChange = true;
+        } else {
+          for (var i = 0, l = nextProps.buttonsHidden.length; i < l && !tabChange; ++i) {
+            if (this.props.buttonsHidden.indexOf(nextProps.buttonsHidden[i]) === -1) {
+              tabChange = true;
+            }
+          }
+        }
+      }
       return tabChange;
     },
 
@@ -329,11 +341,6 @@
     render: function() {
       var cx = React.addons.classSet;
 
-      // For now all of the menu entries require FxA so hide the whole gear if FxA is disabled.
-      if (!navigator.mozLoop.fxAEnabled) {
-        return null;
-      }
-
       return (
         React.createElement("div", {className: "settings-menu dropdown"}, 
           React.createElement("a", {className: "button-settings", onClick: this.showDropdownMenu, 
@@ -347,7 +354,7 @@
             React.createElement(SettingsDropdownEntry, {label: mozL10n.get("settings_menu_item_account"), 
                                    onClick: this.handleClickAccountEntry, 
                                    icon: "account", 
-                                   displayed: this._isSignedIn()}), 
+                                   displayed: this._isSignedIn() && navigator.mozLoop.fxAEnabled}), 
             React.createElement(SettingsDropdownEntry, {icon: "tour", 
                                    label: mozL10n.get("tour_label"), 
                                    onClick: this.openGettingStartedTour}), 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/panel.jsx thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/panel.jsx
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/js/panel.jsx	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/js/panel.jsx	2015-02-28 15:03:01.000000000 +0000
@@ -40,6 +40,18 @@
       if (tabChange) {
         this.props.mozLoop.notifyUITour("Loop:PanelTabChanged", nextState.selectedTab);
       }
+
+      if (!tabChange && nextProps.buttonsHidden) {
+        if (nextProps.buttonsHidden.length !== this.props.buttonsHidden.length) {
+          tabChange = true;
+        } else {
+          for (var i = 0, l = nextProps.buttonsHidden.length; i < l && !tabChange; ++i) {
+            if (this.props.buttonsHidden.indexOf(nextProps.buttonsHidden[i]) === -1) {
+              tabChange = true;
+            }
+          }
+        }
+      }
       return tabChange;
     },
 
@@ -329,11 +341,6 @@
     render: function() {
       var cx = React.addons.classSet;
 
-      // For now all of the menu entries require FxA so hide the whole gear if FxA is disabled.
-      if (!navigator.mozLoop.fxAEnabled) {
-        return null;
-      }
-
       return (
         <div className="settings-menu dropdown">
           <a className="button-settings" onClick={this.showDropdownMenu}
@@ -347,7 +354,7 @@
             <SettingsDropdownEntry label={mozL10n.get("settings_menu_item_account")}
                                    onClick={this.handleClickAccountEntry}
                                    icon="account"
-                                   displayed={this._isSignedIn()} />
+                                   displayed={this._isSignedIn() && navigator.mozLoop.fxAEnabled} />
             <SettingsDropdownEntry icon="tour"
                                    label={mozL10n.get("tour_label")}
                                    onClick={this.openGettingStartedTour} />
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/css/conversation.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/css/conversation.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/css/conversation.css	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/css/conversation.css	2015-02-28 15:03:01.000000000 +0000
@@ -915,16 +915,46 @@
 
 .standalone .room-conversation-wrapper .room-inner-info-area {
   position: absolute;
-  top: calc(50% - 1em);
-  left: 0;
-  right: 25%;
+  /* `top` is chosen to vertically position the area near the center
+     of the media element. */
+  top: calc(50% - 140px);
+  left: 25%;
   z-index: 1000;
-  margin: 0 auto;
-  padding: 0 1rem;
-  width: 50%;
+  /* `width` here is specified by the design spec. */
+  width: 250px;
   color: #fff;
-  font-weight: bold;
-  font-size: 1.1em;
+  box-sizing: content-box;
+}
+
+.standalone .prompt-media-message {
+  padding-top: 136px; /* Fallback for browsers that don't support calc() */
+  /* 122px is 2x the intrinsic height of the background-image, and
+     1rem puts one line of margin between the background-image and
+     supporting text. */
+  padding-top: calc(122px + 1rem);
+  color: #000;
+  background-color: #fff;
+  background-image: url("../../img/gum-others.svg");
+  background-position: top center;
+  /* The background-image is scaled up at 2x the instrinsic size
+     (witdh & height) to make it easier to see. */
+  background-size: 202px 122px;
+  background-repeat: no-repeat;
+  border: 1rem #fff solid;
+  box-shadow: 0 0 5px #000;
+  margin: 0;
+}
+
+.standalone .prompt-media-message.chrome {
+  background-image: url("../../img/gum-chrome.svg");
+}
+
+.standalone .prompt-media-message.firefox {
+  background-image: url("../../img/gum-firefox.svg");
+}
+
+.standalone .prompt-media-message.opera {
+  background-image: url("../../img/gum-opera.svg");
 }
 
 .standalone .room-conversation-wrapper .room-inner-info-area button {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/actions.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/actions.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/actions.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/actions.js	2015-02-28 15:03:01.000000000 +0000
@@ -202,6 +202,8 @@
      * Used to start a screen share.
      */
     StartScreenShare: Action.define("startScreenShare", {
+      // The part of the screen to share, e.g. "window" or "browser".
+      type: String
     }),
 
     /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/activeRoomStore.js	2015-02-28 15:03:01.000000000 +0000
@@ -128,7 +128,9 @@
         "windowUnload",
         "leaveRoom",
         "feedbackComplete",
-        "videoDimensionsChanged"
+        "videoDimensionsChanged",
+        "startScreenShare",
+        "endScreenShare"
       ]);
     },
 
@@ -394,6 +396,49 @@
     },
 
     /**
+     * Initiates a screen sharing publisher.
+     *
+     * @param {sharedActions.StartScreenShare} actionData
+     */
+    startScreenShare: function(actionData) {
+      this.dispatchAction(new sharedActions.ScreenSharingState({
+        state: SCREEN_SHARE_STATES.PENDING
+      }));
+
+      var options = {
+        videoSource: actionData.type
+      };
+      if (options.videoSource === "browser") {
+        this._mozLoop.getActiveTabWindowId(function(err, windowId) {
+          if (err || !windowId) {
+            this.dispatchAction(new sharedActions.ScreenSharingState({
+              state: SCREEN_SHARE_STATES.INACTIVE
+            }));
+            return;
+          }
+          options.constraints = {
+            browserWindow: windowId,
+            scrollWithPage: true
+          };
+          this._sdkDriver.startScreenShare(options);
+        }.bind(this));
+      } else {
+        this._sdkDriver.startScreenShare(options);
+      }
+    },
+
+    /**
+     * Ends an active screenshare session.
+     */
+    endScreenShare: function() {
+      if (this._sdkDriver.endScreenShare()) {
+        this.dispatchAction(new sharedActions.ScreenSharingState({
+          state: SCREEN_SHARE_STATES.INACTIVE
+        }));
+      }
+    },
+
+    /**
      * Handles recording when a remote peer has connected to the servers.
      */
     remotePeerConnected: function() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/dispatcher.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/dispatcher.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/dispatcher.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/dispatcher.js	2015-02-28 15:03:01.000000000 +0000
@@ -72,7 +72,11 @@
       }
 
       registeredStores.forEach(function(store) {
-        store[type](action);
+        try {
+          store[type](action);
+        } catch (x) {
+          console.error("[Dispatcher] Dispatching action caused an exception: ", x);
+        }
       });
 
       this._active = false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/otSdkDriver.js	2015-02-28 15:03:01.000000000 +0000
@@ -31,9 +31,7 @@
 
       this.dispatcher.register(this, [
         "setupStreamElements",
-        "setMute",
-        "startScreenShare",
-        "endScreenShare"
+        "setMute"
       ]);
   };
 
@@ -88,15 +86,21 @@
 
     /**
      * Initiates a screen sharing publisher.
+     *
+     * options items:
+     *  - {String}  videoSource    The type of screen to share. Values of 'screen',
+     *                             'window', 'application' and 'browser' are
+     *                             currently supported.
+     *  - {mixed}   browserWindow  The unique identifier of a browser window. May
+     *                             be passed when `videoSource` is 'browser'.
+     *  - {Boolean} scrollWithPage Flag to signal that scrolling a page should
+     *                             update the stream. May be passed when
+     *                             `videoSource` is 'browser'.
+     *
+     * @param {Object} options Hash containing options for the SDK
      */
-    startScreenShare: function() {
-      this.dispatcher.dispatch(new sharedActions.ScreenSharingState({
-        state: SCREEN_SHARE_STATES.PENDING
-      }));
-
-      var config = this._getCopyPublisherConfig();
-      // This is temporary until we get a sharing type selector
-      config.videoSource = "window";
+    startScreenShare: function(options) {
+      var config = _.extend(this._getCopyPublisherConfig(), options);
 
       this.screenshare = this.sdk.initPublisher(this.getScreenShareElementFunc(),
         config);
@@ -105,20 +109,21 @@
     },
 
     /**
-     * Ends an active screenshare session.
+     * Ends an active screenshare session. Return `true` when an active screen-
+     * sharing session was ended or `false` when no session is active.
+     *
+     * @type {Boolean}
      */
     endScreenShare: function() {
       if (!this.screenshare) {
-        return;
+        return false;
       }
 
       this.session.unpublish(this.screenshare);
       this.screenshare.off("accessAllowed accessDenied");
       this.screenshare.destroy();
       delete this.screenshare;
-      this.dispatcher.dispatch(new sharedActions.ScreenSharingState({
-        state: SCREEN_SHARE_STATES.INACTIVE
-      }));
+      return true;
     },
 
     /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/utils.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/utils.js	2015-02-28 15:03:01.000000000 +0000
@@ -84,8 +84,13 @@
     return !!localStorage.getItem(prefName);
   }
 
+  function isChrome(platform) {
+    return platform.toLowerCase().indexOf('chrome') > -1 ||
+           platform.toLowerCase().indexOf('chromium') > -1;
+  }
+
   function isFirefox(platform) {
-    return platform.indexOf("Firefox") !== -1;
+    return platform.toLowerCase().indexOf("firefox") !== -1;
   }
 
   function isFirefoxOS(platform) {
@@ -97,6 +102,11 @@
     return !!window.MozActivity && /mobi/i.test(platform);
   }
 
+  function isOpera(platform) {
+    return platform.toLowerCase().indexOf('opera') > -1 ||
+           platform.toLowerCase().indexOf('opr') > -1;
+  }
+
   /**
    * Helper to get the platform if it is unsupported.
    *
@@ -143,14 +153,16 @@
       return;
     }
     navigator.mozLoop.composeEmail(
-      mozL10n.get("share_email_subject4", {
-        clientShortname: mozL10n.get("clientShortname2")
+      mozL10n.get("share_email_subject5", {
+        clientShortname2: mozL10n.get("clientShortname2")
       }),
-      mozL10n.get("share_email_body4", {
+      mozL10n.get("share_email_body5", {
         callUrl: callUrl,
-        clientShortname: mozL10n.get("clientShortname2"),
+        brandShortname: mozL10n.get("brandShortname"),
+        clientShortname2: mozL10n.get("clientShortname2"),
+        clientSuperShortname: mozL10n.get("clientSuperShortname"),
         learnMoreUrl: navigator.mozLoop.getLoopPref("learnMoreUrl")
-      }),
+      }).replace(/\r\n/g, "\n").replace(/\n/g, "\r\n"),
       recipient
     );
   }
@@ -165,8 +177,10 @@
     composeCallUrlEmail: composeCallUrlEmail,
     formatDate: formatDate,
     getBoolPreference: getBoolPreference,
+    isChrome: isChrome,
     isFirefox: isFirefox,
     isFirefoxOS: isFirefoxOS,
+    isOpera: isOpera,
     getUnsupportedPlatform: getUnsupportedPlatform,
     locationData: locationData
   };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/views.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/views.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/views.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/views.js	2015-02-28 15:03:01.000000000 +0000
@@ -102,8 +102,18 @@
       }
     },
 
+    _startScreenShare: function(type) {
+      this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({
+        type: type
+      }));
+    },
+
+    _handleShareTabs: function() {
+      this._startScreenShare("browser");
+    },
+
     _handleShareWindows: function() {
-      this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({}));
+      this._startScreenShare("window");
     },
 
     _getTitle: function() {
@@ -143,6 +153,9 @@
             isActive ? null : React.createElement("span", {className: "chevron"})
           ), 
           React.createElement("ul", {ref: "menu", className: dropdownMenuClasses}, 
+            React.createElement("li", {onClick: this._handleShareTabs, className: "disabled"}, 
+              l10n.get("share_tabs_button_title")
+            ), 
             React.createElement("li", {onClick: this._handleShareWindows}, 
               l10n.get("share_windows_button_title")
             )
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/views.jsx thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/views.jsx
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/content/shared/js/views.jsx	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/content/shared/js/views.jsx	2015-02-28 15:03:01.000000000 +0000
@@ -102,8 +102,18 @@
       }
     },
 
+    _startScreenShare: function(type) {
+      this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({
+        type: type
+      }));
+    },
+
+    _handleShareTabs: function() {
+      this._startScreenShare("browser");
+    },
+
     _handleShareWindows: function() {
-      this.props.dispatcher.dispatch(new sharedActions.StartScreenShare({}));
+      this._startScreenShare("window");
     },
 
     _getTitle: function() {
@@ -143,6 +153,9 @@
             {isActive ? null : <span className="chevron"/>}
           </button>
           <ul ref="menu" className={dropdownMenuClasses}>
+            <li onClick={this._handleShareTabs} className="disabled">
+              {l10n.get("share_tabs_button_title")}
+            </li>
             <li onClick={this._handleShareWindows}>
               {l10n.get("share_windows_button_title")}
             </li>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/MozLoopAPI.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/MozLoopAPI.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/MozLoopAPI.jsm	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/MozLoopAPI.jsm	2015-02-28 15:03:01.000000000 +0000
@@ -118,6 +118,15 @@
 };
 
 /**
+ * Get the two-digit hexadecimal code for a byte
+ *
+ * @param {byte} charCode
+ */
+const toHexString = function(charCode) {
+  return ("0" + charCode.toString(16)).slice(-2);
+};
+
+/**
  * Inject any API containing _only_ function properties into the given window.
  *
  * @param {Object}       api          Object containing functions that need to
@@ -257,6 +266,30 @@
       }
     },
 
+    getActiveTabWindowId: {
+      enumerable: true,
+      writable: true,
+      value: function(callback) {
+        let win = Services.wm.getMostRecentWindow("navigator:browser");
+        let browser = win && win.gBrowser.selectedTab.linkedBrowser;
+        if (!win || !browser) {
+          // This may happen when an undocked conversation window is the only
+          // window left.
+          let err = new Error("No tabs available to share.");
+          MozLoopService.log.error(err);
+          callback(cloneValueInto(err, targetWindow));
+          return;
+        }
+
+        let mm = browser.messageManager;
+        mm.addMessageListener("webrtc:response:StartBrowserSharing", function listener(message) {
+          mm.removeMessageListener("webrtc:response:StartBrowserSharing", listener);
+          callback(null, message.data.windowID);
+        });
+        mm.sendAsyncMessage("webrtc:StartBrowserSharing");
+      }
+    },
+
     /**
      * Returns the window data for a specific conversation window id.
      *
@@ -716,6 +749,43 @@
       }
     },
 
+    /**
+     * Compose a URL pointing to the location of an avatar by email address.
+     * At the moment we use the Gravatar service to match email addresses with
+     * avatars. This might change in the future as avatars might come from another
+     * source.
+     *
+     * @param {String} emailAddress Users' email address
+     * @param {Number} size         Size of the avatar image to return in pixels.
+     *                              Optional. Default value: 40.
+     * @return the URL pointing to an avatar matching the provided email address.
+     */
+    getUserAvatar: {
+      enumerable: true,
+      writable: true,
+      value: function(emailAddress, size = 40) {
+        const kEmptyGif = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";
+        if (!emailAddress || !MozLoopService.getLoopPref("contacts.gravatars.show")) {
+          return kEmptyGif;
+        }
+
+        // Do the MD5 dance.
+        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 = emailAddress.trim().toLowerCase();
+        hasher.updateFromStream(stringStream, -1);
+        let hash = hasher.finish(false);
+        // Convert the binary hash data to a hex string.
+        let md5Email = [toHexString(hash.charCodeAt(i)) for (i in hash)].join("");
+
+        // Compose the Gravatar URL.
+        return "https://www.gravatar.com/avatar/" + md5Email + ".jpg?default=blank&s=" + size;
+      }
+    },
+
     /**
      * Associates a session-id and a call-id with a window for debugging.
      *
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/MozLoopService.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/MozLoopService.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/MozLoopService.jsm	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/MozLoopService.jsm	2015-02-28 15:03:01.000000000 +0000
@@ -730,6 +730,11 @@
       let string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
       gLocalizedStrings.set(string.key, string.value);
     }
+    // Supply the strings from the branding bundle on a per-need basis.
+    let brandBundle =
+      Services.strings.createBundle("chrome://branding/locale/brand.properties");
+    // Unfortunately the `brandShortName` string is used by Loop with a lowercase 'N'.
+    gLocalizedStrings.set("brandShortname", brandBundle.GetStringFromName("brandShortName"));
 
     return gLocalizedStrings;
   },
@@ -843,6 +848,7 @@
       }
 
       chatbox.setAttribute("dark", true);
+      chatbox.setAttribute("large", true);
 
       chatbox.addEventListener("DOMContentLoaded", function loaded(event) {
         if (event.target != chatbox.contentDocument) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-chrome.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-chrome.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-chrome.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-chrome.svg	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="102px" height="62px" viewBox="0 0 102 62" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.500000, 0.000000)">
+      <rect stroke="#ABE6F8" fill="#FFFFFF" x="0.5" y="1" width="100" height="60"/>
+      <path d="M36.4003,3 L39.02,9.66666667 L34.8325,9.66666667 L5.6875,9.66666667 L1.5,9.66666667 L4.1197,3 L36.4003,3 Z" fill="#AAE5F9"/>
+      <rect fill="#AAE5F9" x="0.5" y="9" width="100" height="10"/>
+      <path d="M21.004515,11.3333333 C19.6213095,11.3333333 18.5,12.4429954 18.5,13.8333333 L18.5,13.8333333 C18.5,15.2140452 19.6250227,16.3333333 21.0055946,16.3333333 L40.8816964,16.3333333 L90.002759,16.3333333 C91.3819471,16.3333333 92.5,15.2236713 92.5,13.8333333 L92.5,13.8333333 C92.5,12.4526215 91.3819191,11.3333333 89.995485,11.3333333 L21.004515,11.3333333 Z" fill="#FFFFFF"/>
+      <rect stroke="#ABE6F8" x="0" y="0" width="101" height="62"/>
+      <g transform="translate(0.000000, 18.000000)">
+        <rect stroke="#92CB3E" stroke-width="2" fill="#FFFFFF" x="0.5" y="0" width="100" height="10"/>
+        <path d="M89.5096131,3 C88.3997344,3 87.5,3.88772964 87.5,5 L87.5,5 C87.5,6.1045695 88.3933569,7 89.4971942,7 L88.5360952,7 C89.6426425,7 91.4357226,7 92.5331547,7 L95.5533191,7 C96.6560555,7 97.55,6.11227036 97.55,5 L97.55,5 C97.55,3.8954305 96.6581295,3 95.5403869,3 L89.5096131,3 Z" stroke="#92CB3E" fill="#FFFFFF"/>
+        <path d="M78.5096131,3 C77.3997344,3 76.5,3.88772964 76.5,5 L76.5,5 C76.5,6.1045695 77.3933569,7 78.4971942,7 L77.5360952,7 C78.6426425,7 80.4357226,7 81.5331547,7 L84.5533191,7 C85.6560555,7 86.55,6.11227036 86.55,5 L86.55,5 C86.55,3.8954305 85.6581295,3 84.5403869,3 L78.5096131,3 Z" stroke="#92CB3E" fill="#FFFFFF"/>
+        <path d="M8.5,3.69642857 L8.5,6.73214286 C8.5,6.81026825 8.46372804,6.86514121 8.39118304,6.89676339 C8.36700137,6.90606403 8.34375011,6.91071429 8.32142857,6.91071429 C8.27120511,6.91071429 8.22935285,6.89304333 8.19587054,6.85770089 L7.07142857,5.73325893 L7.07142857,6.19642857 C7.07142857,6.41778384 6.99283933,6.60704907 6.83565848,6.76422991 C6.67847764,6.92141076 6.48921242,7 6.26785714,7 L4.30357143,7 C4.08221616,7 3.89295093,6.92141076 3.73577009,6.76422991 C3.57858924,6.60704907 3.5,6.41778384 3.5,6.19642857 L3.5,4.23214286 C3.5,4.01078758 3.57858924,3.82152236 3.73577009,3.66434152 C3.89295093,3.50716067 4.08221616,3.42857143 4.30357143,3.42857143 L6.26785714,3.42857143 C6.48921242,3.42857143 6.67847764,3.50716067 6.83565848,3.66434152 C6.99283933,3.82152236 7.07142857,4.01078758 7.07142857,4.23214286 L7.07142857,4.69252232 L8.19587054,3.57087054 C8.22935285,3.5355281 8.27120511,3.51785714 8.32142857,3.51785714 C8.34375011,3.51785714 8.36700137,3.52250739 8.39118304,3.53180804 C8.46372804,3.56343022 8.5,3.61830318 8.5,3.69642857 L8.5,3.69642857 Z" fill="#00AF84"/>
+      </g>
+      <path d="M97.9285714,14.5714286 L97.9285714,14.8571429 C97.9285714,14.8958335 97.9144347,14.9293153 97.8861607,14.9575893 C97.8578868,14.9858632 97.824405,15 97.7857143,15 L94.6428571,15 C94.6041665,15 94.5706847,14.9858632 94.5424107,14.9575893 C94.5141368,14.9293153 94.5,14.8958335 94.5,14.8571429 L94.5,14.5714286 C94.5,14.5327379 94.5141368,14.4992561 94.5424107,14.4709821 C94.5706847,14.4427082 94.6041665,14.4285714 94.6428571,14.4285714 L97.7857143,14.4285714 C97.824405,14.4285714 97.8578868,14.4427082 97.8861607,14.4709821 C97.9144347,14.4992561 97.9285714,14.5327379 97.9285714,14.5714286 L97.9285714,14.5714286 Z M97.9285714,13.4285714 L97.9285714,13.7142857 C97.9285714,13.7529764 97.9144347,13.7864582 97.8861607,13.8147321 C97.8578868,13.8430061 97.824405,13.8571429 97.7857143,13.8571429 L94.6428571,13.8571429 C94.6041665,13.8571429 94.5706847,13.8430061 94.5424107,13.8147321 C94.5141368,13.7864582 94.5,13.7529764 94.5,13.7142857 L94.5,13.4285714 C94.5,13.3898808 94.5141368,13.356399 94.5424107,13.328125 C94.5706847,13.299851 94.6041665,13.2857143 94.6428571,13.2857143 L97.7857143,13.2857143 C97.824405,13.2857143 97.8578868,13.299851 97.8861607,13.328125 C97.9144347,13.356399 97.9285714,13.3898808 97.9285714,13.4285714 L97.9285714,13.4285714 Z M97.9285714,12.2857143 L97.9285714,12.5714286 C97.9285714,12.6101192 97.9144347,12.643601 97.8861607,12.671875 C97.8578868,12.700149 97.824405,12.7142857 97.7857143,12.7142857 L94.6428571,12.7142857 C94.6041665,12.7142857 94.5706847,12.700149 94.5424107,12.671875 C94.5141368,12.643601 94.5,12.6101192 94.5,12.5714286 L94.5,12.2857143 C94.5,12.2470236 94.5141368,12.2135418 94.5424107,12.1852679 C94.5706847,12.1569939 94.6041665,12.1428571 94.6428571,12.1428571 L97.7857143,12.1428571 C97.824405,12.1428571 97.8578868,12.1569939 97.8861607,12.1852679 C97.9144347,12.2135418 97.9285714,12.2470236 97.9285714,12.2857143 L97.9285714,12.2857143 Z" fill="#FFFFFF"/>
+      <path d="M5.92857143,13.5714286 L5.92857143,13.8571429 C5.92857143,13.9360123 5.90439012,14.0033479 5.85602679,14.0591518 C5.80766345,14.1149556 5.74479205,14.1428571 5.66741071,14.1428571 L4.09598214,14.1428571 L4.75,14.7991071 C4.8065479,14.8526788 4.83482143,14.9196425 4.83482143,15 C4.83482143,15.0803575 4.8065479,15.1473212 4.75,15.2008929 L4.58258929,15.3705357 C4.52752949,15.4255955 4.46056587,15.453125 4.38169643,15.453125 C4.30431509,15.453125 4.23660743,15.4255955 4.17857143,15.3705357 L2.72544643,13.9151786 C2.67038663,13.8601188 2.64285714,13.7931552 2.64285714,13.7142857 C2.64285714,13.6369044 2.67038663,13.5691967 2.72544643,13.5111607 L4.17857143,12.0602679 C4.23511933,12.00372 4.30282699,11.9754464 4.38169643,11.9754464 C4.45907777,11.9754464 4.52604138,12.00372 4.58258929,12.0602679 L4.75,12.2254464 C4.8065479,12.2819943 4.83482143,12.349702 4.83482143,12.4285714 C4.83482143,12.5074409 4.8065479,12.5751485 4.75,12.6316964 L4.09598214,13.2857143 L5.66741071,13.2857143 C5.74479205,13.2857143 5.80766345,13.3136158 5.85602679,13.3694196 C5.90439012,13.4252235 5.92857143,13.4925591 5.92857143,13.5714286 L5.92857143,13.5714286 Z" fill="#FFFFFF"/>
+      <path d="M10.9285714,13.5714286 L10.9285714,13.8571429 C10.9285714,13.9360123 10.9043901,14.0033479 10.8560268,14.0591518 C10.8076634,14.1149556 10.7447921,14.1428571 10.6674107,14.1428571 L9.09598214,14.1428571 L9.75,14.7991071 C9.8065479,14.8526788 9.83482143,14.9196425 9.83482143,15 C9.83482143,15.0803575 9.8065479,15.1473212 9.75,15.2008929 L9.58258929,15.3705357 C9.52752949,15.4255955 9.46056587,15.453125 9.38169643,15.453125 C9.30431509,15.453125 9.23660743,15.4255955 9.17857143,15.3705357 L7.72544643,13.9151786 C7.67038663,13.8601188 7.64285714,13.7931552 7.64285714,13.7142857 C7.64285714,13.6369044 7.67038663,13.5691967 7.72544643,13.5111607 L9.17857143,12.0602679 C9.23511933,12.00372 9.30282699,11.9754464 9.38169643,11.9754464 C9.45907777,11.9754464 9.52604138,12.00372 9.58258929,12.0602679 L9.75,12.2254464 C9.8065479,12.2819943 9.83482143,12.349702 9.83482143,12.4285714 C9.83482143,12.5074409 9.8065479,12.5751485 9.75,12.6316964 L9.09598214,13.2857143 L10.6674107,13.2857143 C10.7447921,13.2857143 10.8076634,13.3136158 10.8560268,13.3694196 C10.9043901,13.4252235 10.9285714,13.4925591 10.9285714,13.5714286 L10.9285714,13.5714286 Z" fill="#FFFFFF" transform="translate(9.285714, 13.714286) scale(-1, 1) translate(-9.285714, -13.714286) "/>
+      <path d="M16.9285714,12.1428571 L16.9285714,13.1428571 C16.9285714,13.1815478 16.9144347,13.2150296 16.8861607,13.2433036 C16.8578868,13.2715775 16.824405,13.2857143 16.7857143,13.2857143 L15.7857143,13.2857143 C15.723214,13.2857143 15.6793156,13.2559527 15.6540179,13.1964286 C15.6287201,13.1383926 15.6391367,13.0870538 15.6852679,13.0424107 L15.9933036,12.734375 C15.7730644,12.5305049 15.5133944,12.4285714 15.2142857,12.4285714 C15.059523,12.4285714 14.9118311,12.4587051 14.7712054,12.5189732 C14.6305797,12.5792414 14.5089291,12.6607138 14.40625,12.7633929 C14.3035709,12.8660719 14.2220985,12.9877225 14.1618304,13.1283482 C14.1015622,13.2689739 14.0714286,13.4166659 14.0714286,13.5714286 C14.0714286,13.7261912 14.1015622,13.8738832 14.1618304,14.0145089 C14.2220985,14.1551346 14.3035709,14.2767852 14.40625,14.3794643 C14.5089291,14.4821434 14.6305797,14.5636158 14.7712054,14.6238839 C14.9118311,14.6841521 15.059523,14.7142857 15.2142857,14.7142857 C15.3913699,14.7142857 15.558779,14.6755956 15.7165179,14.5982143 C15.8742567,14.5208329 16.0074399,14.411459 16.1160714,14.2700893 C16.1264881,14.2552083 16.1436011,14.2462798 16.1674107,14.2433036 C16.1882442,14.2433036 16.2068452,14.2499999 16.2232143,14.2633929 L16.5290179,14.5714286 C16.5424108,14.5833334 16.5494792,14.5985862 16.5502232,14.6171875 C16.5509673,14.6357888 16.545387,14.6525297 16.5334821,14.6674107 C16.371279,14.8638403 16.1748523,15.0159965 15.9441964,15.1238839 C15.7135405,15.2317714 15.4702394,15.2857143 15.2142857,15.2857143 C14.9821417,15.2857143 14.7604177,15.2403278 14.5491071,15.1495536 C14.3377966,15.0587793 14.1555067,14.9367567 14.0022321,14.7834821 C13.8489576,14.6302076 13.726935,14.4479177 13.6361607,14.2366071 C13.5453865,14.0252966 13.5,13.8035726 13.5,13.5714286 C13.5,13.3392846 13.5453865,13.1175606 13.6361607,12.90625 C13.726935,12.6949394 13.8489576,12.5126496 14.0022321,12.359375 C14.1555067,12.2061004 14.3377966,12.0840778 14.5491071,11.9933036 C14.7604177,11.9025293 14.9821417,11.8571429 15.2142857,11.8571429 C15.4330368,11.8571429 15.6447162,11.8984371 15.8493304,11.9810268 C16.0539445,12.0636165 16.2358623,12.1800588 16.3950893,12.3303571 L16.6852679,12.0424107 C16.7284228,11.9962795 16.7805056,11.985863 16.8415179,12.0111607 C16.8995539,12.0364585 16.9285714,12.0803568 16.9285714,12.1428571 L16.9285714,12.1428571 Z" fill="#FFFFFF"/>
+    </g>
+  </g>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-firefox.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-firefox.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-firefox.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-firefox.svg	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="102px" height="62px" viewBox="0 0 102 62" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <path d="M39.565,8.00739557 C39.4896406,8.00249919 39.4115419,8 39.3306224,8 C35.3657519,8 37.8823812,2 33.0112546,2 L7.18295591,2 C2.59740823,2 4.61972552,7.31710024 1.565,7.94055011 L1.565,7.94055011 L1.565,14 L15.5658248,14 L39.565,14 L39.565,8.00739557 Z" id="path-1"/>
+  </defs>
+  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.500000, 0.000000)">
+      <g transform="translate(0.000000, 1.000000)">
+        <rect stroke="#ABE6F8" fill="#FFFFFF" x="0.565" y="0" width="100" height="60"/>
+        <g>
+          <use fill="#AAE5F9" fill-rule="evenodd" xlink:href="#path-1"/>
+          <use fill="none" xlink:href="#path-1"/>
+          <use fill="none" xlink:href="#path-1"/>
+        </g>
+        <rect fill="#ABE6F8" x="0.565" y="7" width="99.685" height="10"/>
+        <path d="M8.07491535,9.33333333 C6.68872738,9.33333333 5.565,10.4429954 5.565,11.8333333 L5.565,11.8333333 C5.565,13.2140452 6.68484687,14.3333333 8.05891597,14.3333333 L31.8786161,14.3333333 L90.0705787,14.3333333 C91.4482095,14.3333333 92.565,13.2236713 92.565,11.8333333 L92.565,11.8333333 C92.565,10.4526215 91.4491428,9.33333333 90.0550846,9.33333333 L8.07491535,9.33333333 Z" fill="#FFFFFF"/>
+        <ellipse stroke="#FFFFFF" fill="#AAE5F9" cx="5.565" cy="12" rx="3" ry="3"/>
+        <path d="M16.2240909,16.6938776 L44.5630004,16.6938776 C45.6668839,16.6938776 46.565,17.5893929 46.565,18.6940672 L46.565,44.9998104 C46.565,46.1094081 45.6686743,47 44.5630004,47 L5.56699958,47 C4.46311611,47 3.565,46.1044846 3.565,44.9998104 L3.565,18.6940672 C3.565,17.5844694 4.46132574,16.6938776 5.56699958,16.6938776 L8.40590909,16.6938776 L12.315,14 L16.2240909,16.6938776 Z" stroke="#92CB3E" stroke-width="2" fill="#FFFFFF"/>
+        <path d="M25.0575753,38 C23.680964,38 22.565,39.1096621 22.565,40.5 L22.565,40.5 C22.565,41.8807119 23.6941328,43 25.0722854,43 L26.115167,43 C27.4952935,43 29.7367265,43 31.1231981,43 L40.0643408,43 C41.4454167,43 42.565,41.8903379 42.565,40.5 L42.565,40.5 C42.565,39.1192881 41.4468578,38 40.0724247,38 L25.0575753,38 Z" stroke="#92CB3E" fill="#FFFFFF"/>
+        <path d="M17.565,22.3928571 L17.565,28.4642857 C17.565,28.6205365 17.4924561,28.7302824 17.3473661,28.7935268 C17.2990027,28.8121281 17.2525002,28.8214286 17.2078571,28.8214286 C17.1074102,28.8214286 17.0237057,28.7860867 16.9567411,28.7154018 L14.7078571,26.4665179 L14.7078571,27.3928571 C14.7078571,27.8355677 14.5506787,28.2140981 14.236317,28.5284598 C13.9219553,28.8428215 13.5434248,29 13.1007143,29 L9.17214286,29 C8.72943231,29 8.35090187,28.8428215 8.03654018,28.5284598 C7.72217849,28.2140981 7.565,27.8355677 7.565,27.3928571 L7.565,23.4642857 C7.565,23.0215752 7.72217849,22.6430447 8.03654018,22.328683 C8.35090187,22.0143213 8.72943231,21.8571429 9.17214286,21.8571429 L13.1007143,21.8571429 C13.5434248,21.8571429 13.9219553,22.0143213 14.236317,22.328683 C14.5506787,22.6430447 14.7078571,23.0215752 14.7078571,23.4642857 L14.7078571,24.3850446 L16.9567411,22.1417411 C17.0237057,22.0710562 17.1074102,22.0357143 17.2078571,22.0357143 C17.2525002,22.0357143 17.2990027,22.0450148 17.3473661,22.0636161 C17.4924561,22.1268604 17.565,22.2366064 17.565,22.3928571 L17.565,22.3928571 Z" fill="#00AF84"/>
+        <path d="M13.565,11.0178571 L13.565,12.8392857 C13.565,12.8861609 13.5432368,12.9190847 13.4997098,12.938058 C13.4852008,12.9436384 13.4712501,12.9464286 13.4578571,12.9464286 C13.4277231,12.9464286 13.4026117,12.935826 13.3825223,12.9146205 L12.7078571,12.2399554 L12.7078571,12.5178571 C12.7078571,12.6506703 12.6607036,12.7642294 12.5663951,12.8585379 C12.4720866,12.9528465 12.3585274,13 12.2257143,13 L11.0471429,13 C10.9143297,13 10.8007706,12.9528465 10.7064621,12.8585379 C10.6121535,12.7642294 10.565,12.6506703 10.565,12.5178571 L10.565,11.3392857 C10.565,11.2064726 10.6121535,11.0929134 10.7064621,10.9986049 C10.8007706,10.9042964 10.9143297,10.8571429 11.0471429,10.8571429 L12.2257143,10.8571429 C12.3585274,10.8571429 12.4720866,10.9042964 12.5663951,10.9986049 C12.6607036,11.0929134 12.7078571,11.2064726 12.7078571,11.3392857 L12.7078571,11.6155134 L13.3825223,10.9425223 C13.4026117,10.9213169 13.4277231,10.9107143 13.4578571,10.9107143 C13.4712501,10.9107143 13.4852008,10.9135044 13.4997098,10.9190848 C13.5432368,10.9380581 13.565,10.9709819 13.565,11.0178571 L13.565,11.0178571 Z" fill="#00AF84"/>
+        <path d="M6.86418806,12.1429618 C6.86418806,12.2021139 6.84605208,12.2526156 6.80977958,12.2944685 C6.77350707,12.3363214 6.72635353,12.3572475 6.66831752,12.3572475 L5.48974609,12.3572475 L5.98025949,12.849435 C6.02267041,12.8896138 6.04387556,12.9398365 6.04387556,13.0001046 C6.04387556,13.0603728 6.02267041,13.1105955 5.98025949,13.1507743 L5.85470145,13.2780064 C5.8134066,13.3193013 5.76318389,13.3399484 5.70403181,13.3399484 C5.6459958,13.3399484 5.59521506,13.3193013 5.55168806,13.2780064 L4.46184431,12.1864886 C4.42054946,12.1451937 4.39990234,12.094971 4.39990234,12.0358189 C4.39990234,11.9777829 4.42054946,11.9270022 4.46184431,11.8834752 L5.55168806,10.7953055 C5.59409898,10.7528946 5.64487973,10.7316895 5.70403181,10.7316895 C5.76206781,10.7316895 5.81229052,10.7528946 5.85470145,10.7953055 L5.98025949,10.9191895 C6.02267041,10.9616004 6.04387556,11.0123811 6.04387556,11.0715332 C6.04387556,11.1306853 6.02267041,11.181466 5.98025949,11.223877 L5.48974609,11.7143903 L6.66831752,11.7143903 C6.72635353,11.7143903 6.77350707,11.7353165 6.80977958,11.7771694 C6.84605208,11.8190223 6.86418806,11.869524 6.86418806,11.9286761 L6.86418806,12.1429618 Z" fill="#FFFFFF"/>
+        <path d="M97.1364286,12.6785714 L97.1364286,12.8928571 C97.1364286,12.9218751 97.125826,12.9469865 97.1046205,12.968192 C97.0834151,12.9893974 97.0583037,13 97.0292857,13 L94.6721429,13 C94.6431249,13 94.6180135,12.9893974 94.596808,12.968192 C94.5756026,12.9469865 94.565,12.9218751 94.565,12.8928571 L94.565,12.6785714 C94.565,12.6495534 94.5756026,12.6244421 94.596808,12.6032366 C94.6180135,12.5820311 94.6431249,12.5714286 94.6721429,12.5714286 L97.0292857,12.5714286 C97.0583037,12.5714286 97.0834151,12.5820311 97.1046205,12.6032366 C97.125826,12.6244421 97.1364286,12.6495534 97.1364286,12.6785714 L97.1364286,12.6785714 Z M97.1364286,11.8214286 L97.1364286,12.0357143 C97.1364286,12.0647323 97.125826,12.0898436 97.1046205,12.1110491 C97.0834151,12.1322546 97.0583037,12.1428571 97.0292857,12.1428571 L94.6721429,12.1428571 C94.6431249,12.1428571 94.6180135,12.1322546 94.596808,12.1110491 C94.5756026,12.0898436 94.565,12.0647323 94.565,12.0357143 L94.565,11.8214286 C94.565,11.7924106 94.5756026,11.7672992 94.596808,11.7460937 C94.6180135,11.7248883 94.6431249,11.7142857 94.6721429,11.7142857 L97.0292857,11.7142857 C97.0583037,11.7142857 97.0834151,11.7248883 97.1046205,11.7460937 C97.125826,11.7672992 97.1364286,11.7924106 97.1364286,11.8214286 L97.1364286,11.8214286 Z M97.1364286,10.9642857 L97.1364286,11.1785714 C97.1364286,11.2075894 97.125826,11.2327008 97.1046205,11.2539062 C97.0834151,11.2751117 97.0583037,11.2857143 97.0292857,11.2857143 L94.6721429,11.2857143 C94.6431249,11.2857143 94.6180135,11.2751117 94.596808,11.2539062 C94.5756026,11.2327008 94.565,11.2075894 94.565,11.1785714 L94.565,10.9642857 C94.565,10.9352677 94.5756026,10.9101564 94.596808,10.8889509 C94.6180135,10.8677454 94.6431249,10.8571429 94.6721429,10.8571429 L97.0292857,10.8571429 C97.0583037,10.8571429 97.0834151,10.8677454 97.1046205,10.8889509 C97.125826,10.9101564 97.1364286,10.9352677 97.1364286,10.9642857 L97.1364286,10.9642857 Z" fill="#FFFFFF"/>
+      </g>
+      <rect stroke="#ABE6F8" x="0" y="0" width="101" height="62"/>
+    </g>
+  </g>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-opera.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-opera.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-opera.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-opera.svg	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="102px" height="62px" viewBox="0 0 102 62" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.500000, 0.000000)">
+      <rect stroke="#AAE5F9" fill="#FFFFFF" x="0.990196078" y="1" width="99.0196078" height="60"/>
+      <rect fill="#AAE5F9" x="2.97058824" y="3" width="33.6666667" height="13"/>
+      <rect fill="#AAE5F9" x="0.990196078" y="8" width="99.0196078" height="10"/>
+      <path d="M27.2559789,11 C25.8746722,11 24.754902,12.1096621 24.754902,13.5 L24.754902,13.5 C24.754902,14.8807119 25.8688951,16 27.2538514,16 L46.91717,16 L95.5280221,16 C96.9095015,16 98.0294118,14.8903379 98.0294118,13.5 L98.0294118,13.5 C98.0294118,12.1192881 96.9077658,11 95.5283349,11 L27.2559789,11 Z" fill="#FFFFFF"/>
+      <rect stroke="#92CB3E" stroke-width="2" fill="#FFFFFF" x="28.7156863" y="15" width="42.5784314" height="22" rx="2"/>
+      <path d="M51.5228862,29 C50.1376565,29 49.0147059,30.1096621 49.0147059,31.5 L49.0147059,31.5 C49.0147059,32.8807119 50.1327688,34 51.5124335,34 L55.0045081,34 L66.3156937,34 C67.6980258,34 68.8186275,32.8903379 68.8186275,31.5 L68.8186275,31.5 C68.8186275,30.1192881 67.6971405,29 66.3104471,29 L51.5228862,29 Z" stroke="#92CB3E" fill="#FFFFFF"/>
+      <rect stroke="#ABE6F8" x="0" y="0" width="101" height="62"/>
+      <path d="M40.6764706,19.7142857 L40.6764706,24.5714286 C40.6764706,24.6964292 40.6184355,24.7842259 40.5023634,24.8348214 C40.4636728,24.8497025 40.4264708,24.8571429 40.3907563,24.8571429 C40.3103988,24.8571429 40.2434351,24.8288693 40.1898634,24.7723214 L38.3907563,22.9732143 L38.3907563,23.7142857 C38.3907563,24.0684542 38.2650135,24.3712785 38.0135242,24.6227679 C37.7620348,24.8742572 37.4592105,25 37.105042,25 L33.9621849,25 C33.6080164,25 33.3051921,24.8742572 33.0537027,24.6227679 C32.8022134,24.3712785 32.6764706,24.0684542 32.6764706,23.7142857 L32.6764706,20.5714286 C32.6764706,20.2172601 32.8022134,19.9144358 33.0537027,19.6629464 C33.3051921,19.4114571 33.6080164,19.2857143 33.9621849,19.2857143 L37.105042,19.2857143 C37.4592105,19.2857143 37.7620348,19.4114571 38.0135242,19.6629464 C38.2650135,19.9144358 38.3907563,20.2172601 38.3907563,20.5714286 L38.3907563,21.3080357 L40.1898634,19.5133929 C40.2434351,19.456845 40.3103988,19.4285714 40.3907563,19.4285714 C40.4264708,19.4285714 40.4636728,19.4360118 40.5023634,19.4508929 C40.6184355,19.5014883 40.6764706,19.5892851 40.6764706,19.7142857 L40.6764706,19.7142857 Z" fill="#00AF84"/>
+      <path d="M22.2422969,14.5714286 L22.2422969,14.8571429 C22.2422969,14.8958335 22.2281602,14.9293153 22.1998862,14.9575893 C22.1716123,14.9858632 22.1381304,15 22.0994398,15 L18.9565826,15 C18.917892,15 18.8844102,14.9858632 18.8561362,14.9575893 C18.8278623,14.9293153 18.8137255,14.8958335 18.8137255,14.8571429 L18.8137255,14.5714286 C18.8137255,14.5327379 18.8278623,14.4992561 18.8561362,14.4709821 C18.8844102,14.4427082 18.917892,14.4285714 18.9565826,14.4285714 L22.0994398,14.4285714 C22.1381304,14.4285714 22.1716123,14.4427082 22.1998862,14.4709821 C22.2281602,14.4992561 22.2422969,14.5327379 22.2422969,14.5714286 L22.2422969,14.5714286 Z M22.2422969,13.4285714 L22.2422969,13.7142857 C22.2422969,13.7529764 22.2281602,13.7864582 22.1998862,13.8147321 C22.1716123,13.8430061 22.1381304,13.8571429 22.0994398,13.8571429 L18.9565826,13.8571429 C18.917892,13.8571429 18.8844102,13.8430061 18.8561362,13.8147321 C18.8278623,13.7864582 18.8137255,13.7529764 18.8137255,13.7142857 L18.8137255,13.4285714 C18.8137255,13.3898808 18.8278623,13.356399 18.8561362,13.328125 C18.8844102,13.299851 18.917892,13.2857143 18.9565826,13.2857143 L22.0994398,13.2857143 C22.1381304,13.2857143 22.1716123,13.299851 22.1998862,13.328125 C22.2281602,13.356399 22.2422969,13.3898808 22.2422969,13.4285714 L22.2422969,13.4285714 Z M22.2422969,12.2857143 L22.2422969,12.5714286 C22.2422969,12.6101192 22.2281602,12.643601 22.1998862,12.671875 C22.1716123,12.700149 22.1381304,12.7142857 22.0994398,12.7142857 L18.9565826,12.7142857 C18.917892,12.7142857 18.8844102,12.700149 18.8561362,12.671875 C18.8278623,12.643601 18.8137255,12.6101192 18.8137255,12.5714286 L18.8137255,12.2857143 C18.8137255,12.2470236 18.8278623,12.2135418 18.8561362,12.1852679 C18.8844102,12.1569939 18.917892,12.1428571 18.9565826,12.1428571 L22.0994398,12.1428571 C22.1381304,12.1428571 22.1716123,12.1569939 22.1998862,12.1852679 C22.2281602,12.2135418 22.2422969,12.2470236 22.2422969,12.2857143 L22.2422969,12.2857143 Z" fill="#FFFFFF"/>
+      <path d="M7.38935574,13.5714286 L7.38935574,13.8571429 C7.38935574,13.9360123 7.36517444,14.0033479 7.3168111,14.0591518 C7.26844776,14.1149556 7.20557637,14.1428571 7.12819503,14.1428571 L5.55676646,14.1428571 L6.21078431,14.7991071 C6.26733222,14.8526788 6.29560574,14.9196425 6.29560574,15 C6.29560574,15.0803575 6.26733222,15.1473212 6.21078431,15.2008929 L6.0433736,15.3705357 C5.9883138,15.4255955 5.92135018,15.453125 5.84248074,15.453125 C5.7650994,15.453125 5.69739175,15.4255955 5.63935574,15.3705357 L4.18623074,13.9151786 C4.13117094,13.8601188 4.10364146,13.7931552 4.10364146,13.7142857 C4.10364146,13.6369044 4.13117094,13.5691967 4.18623074,13.5111607 L5.63935574,12.0602679 C5.69590364,12.00372 5.7636113,11.9754464 5.84248074,11.9754464 C5.91986208,11.9754464 5.9868257,12.00372 6.0433736,12.0602679 L6.21078431,12.2254464 C6.26733222,12.2819943 6.29560574,12.349702 6.29560574,12.4285714 C6.29560574,12.5074409 6.26733222,12.5751485 6.21078431,12.6316964 L5.55676646,13.2857143 L7.12819503,13.2857143 C7.20557637,13.2857143 7.26844776,13.3136158 7.3168111,13.3694196 C7.36517444,13.4252235 7.38935574,13.4925591 7.38935574,13.5714286 L7.38935574,13.5714286 Z" fill="#FFFFFF"/>
+      <path d="M12.3403361,13.5714286 L12.3403361,13.8571429 C12.3403361,13.9360123 12.3161548,14.0033479 12.2677915,14.0591518 C12.2194282,14.1149556 12.1565568,14.1428571 12.0791754,14.1428571 L10.5077468,14.1428571 L11.1617647,14.7991071 C11.2183126,14.8526788 11.2465861,14.9196425 11.2465861,15 C11.2465861,15.0803575 11.2183126,15.1473212 11.1617647,15.2008929 L10.994354,15.3705357 C10.9392942,15.4255955 10.8723306,15.453125 10.7934611,15.453125 C10.7160798,15.453125 10.6483721,15.4255955 10.5903361,15.3705357 L9.13721113,13.9151786 C9.08215134,13.8601188 9.05462185,13.7931552 9.05462185,13.7142857 C9.05462185,13.6369044 9.08215134,13.5691967 9.13721113,13.5111607 L10.5903361,12.0602679 C10.646884,12.00372 10.7145917,11.9754464 10.7934611,11.9754464 C10.8708425,11.9754464 10.9378061,12.00372 10.994354,12.0602679 L11.1617647,12.2254464 C11.2183126,12.2819943 11.2465861,12.349702 11.2465861,12.4285714 C11.2465861,12.5074409 11.2183126,12.5751485 11.1617647,12.6316964 L10.5077468,13.2857143 L12.0791754,13.2857143 C12.1565568,13.2857143 12.2194282,13.3136158 12.2677915,13.3694196 C12.3161548,13.4252235 12.3403361,13.4925591 12.3403361,13.5714286 L12.3403361,13.5714286 Z" fill="#FFFFFF" transform="translate(10.697479, 13.714286) scale(-1, 1) translate(-10.697479, -13.714286) "/>
+      <path d="M17.2913165,12.1428571 L17.2913165,13.1428571 C17.2913165,13.1815478 17.2771798,13.2150296 17.2489058,13.2433036 C17.2206319,13.2715775 17.1871501,13.2857143 17.1484594,13.2857143 L16.1484594,13.2857143 C16.0859591,13.2857143 16.0420607,13.2559527 16.016763,13.1964286 C15.9914652,13.1383926 16.0018818,13.0870538 16.048013,13.0424107 L16.3560487,12.734375 C16.1358095,12.5305049 15.8761395,12.4285714 15.5770308,12.4285714 C15.4222681,12.4285714 15.2745762,12.4587051 15.1339505,12.5189732 C14.9933248,12.5792414 14.8716742,12.6607138 14.7689951,12.7633929 C14.666316,12.8660719 14.5848436,12.9877225 14.5245755,13.1283482 C14.4643073,13.2689739 14.4341737,13.4166659 14.4341737,13.5714286 C14.4341737,13.7261912 14.4643073,13.8738832 14.5245755,14.0145089 C14.5848436,14.1551346 14.666316,14.2767852 14.7689951,14.3794643 C14.8716742,14.4821434 14.9933248,14.5636158 15.1339505,14.6238839 C15.2745762,14.6841521 15.4222681,14.7142857 15.5770308,14.7142857 C15.754115,14.7142857 15.9215241,14.6755956 16.079263,14.5982143 C16.2370018,14.5208329 16.370185,14.411459 16.4788165,14.2700893 C16.4892332,14.2552083 16.5063462,14.2462798 16.5301558,14.2433036 C16.5509892,14.2433036 16.5695903,14.2499999 16.5859594,14.2633929 L16.891763,14.5714286 C16.9051559,14.5833334 16.9122243,14.5985862 16.9129683,14.6171875 C16.9137124,14.6357888 16.9081321,14.6525297 16.8962272,14.6674107 C16.734024,14.8638403 16.5375974,15.0159965 16.3069415,15.1238839 C16.0762856,15.2317714 15.8329845,15.2857143 15.5770308,15.2857143 C15.3448868,15.2857143 15.1231628,15.2403278 14.9118522,15.1495536 C14.7005417,15.0587793 14.5182518,14.9367567 14.3649772,14.7834821 C14.2117027,14.6302076 14.0896801,14.4479177 13.9989058,14.2366071 C13.9081315,14.0252966 13.8627451,13.8035726 13.8627451,13.5714286 C13.8627451,13.3392846 13.9081315,13.1175606 13.9989058,12.90625 C14.0896801,12.6949394 14.2117027,12.5126496 14.3649772,12.359375 C14.5182518,12.2061004 14.7005417,12.0840778 14.9118522,11.9933036 C15.1231628,11.9025293 15.3448868,11.8571429 15.5770308,11.8571429 C15.7957819,11.8571429 16.0074613,11.8984371 16.2120755,11.9810268 C16.4166896,12.0636165 16.5986074,12.1800588 16.7578344,12.3303571 L17.048013,12.0424107 C17.0911679,11.9962795 17.1432507,11.985863 17.204263,12.0111607 C17.262299,12.0364585 17.2913165,12.0803568 17.2913165,12.1428571 L17.2913165,12.1428571 Z" fill="#FFFFFF"/>
+    </g>
+  </g>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-others.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-others.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/img/gum-others.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/img/gum-others.svg	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="51px" height="36px" viewBox="0 0 51 36" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g transform="translate(0.500000, 0.000000)">
+      <path d="M50,2.96428571 L50,33.3214286 C50,34.1026825 49.6372804,34.6514121 48.9118304,34.9676339 C48.6700137,35.0606403 48.4375011,35.1071429 48.2142857,35.1071429 C47.7120511,35.1071429 47.2935285,34.9304333 46.9587054,34.5770089 L35.7142857,23.3325893 L35.7142857,27.9642857 C35.7142857,30.1778384 34.9283933,32.0704907 33.3565848,33.6422991 C31.7847764,35.2141076 29.8921242,36 27.6785714,36 L8.03571429,36 C5.82216155,36 3.92950935,35.2141076 2.35770089,33.6422991 C0.785892439,32.0704907 0,30.1778384 0,27.9642857 L0,8.32142857 C0,6.10787584 0.785892439,4.21522363 2.35770089,2.64341518 C3.92950935,1.07160672 5.82216155,0.285714286 8.03571429,0.285714286 L27.6785714,0.285714286 C29.8921242,0.285714286 31.7847764,1.07160672 33.3565848,2.64341518 C34.9283933,4.21522363 35.7142857,6.10787584 35.7142857,8.32142857 L35.7142857,12.9252232 L46.9587054,1.70870536 C47.2935285,1.35528097 47.7120511,1.17857143 48.2142857,1.17857143 C48.4375011,1.17857143 48.6700137,1.22507394 48.9118304,1.31808036 C49.6372804,1.63430218 50,2.18303181 50,2.96428571 L50,2.96428571 Z" fill="#00AF84"/>
+      <path d="M19.8214286,22.09375 L19.8214286,25.4419643 C19.8214286,25.5907746 19.7656256,25.7209816 19.6540179,25.8325893 C19.5424102,25.944197 19.4122031,26 19.2633929,26 L15.9151786,26 C15.7663683,26 15.6361613,25.944197 15.5245536,25.8325893 C15.4129459,25.7209816 15.3571429,25.5907746 15.3571429,25.4419643 L15.3571429,22.09375 C15.3571429,21.9449397 15.4129459,21.8147327 15.5245536,21.703125 C15.6361613,21.5915173 15.7663683,21.5357143 15.9151786,21.5357143 L19.2633929,21.5357143 C19.4122031,21.5357143 19.5424102,21.5915173 19.6540179,21.703125 C19.7656256,21.8147327 19.8214286,21.9449397 19.8214286,22.09375 L19.8214286,22.09375 Z M24.2299107,13.7232143 C24.2299107,14.2254489 24.1578318,14.6951243 24.0136719,15.1322545 C23.8695119,15.5693846 23.7067531,15.9251288 23.5253906,16.1994978 C23.3440281,16.4738667 23.0882643,16.7505566 22.7580915,17.0295759 C22.4279187,17.3085951 22.1605293,17.5108811 21.9559152,17.6364397 C21.7513011,17.7619984 21.4676357,17.9270823 21.1049107,18.1316964 C20.7235844,18.3456112 20.4050422,18.6478775 20.1492746,19.0385045 C19.8935069,19.4291314 19.765625,19.7406982 19.765625,19.9732143 C19.765625,20.1313252 19.709822,20.2824584 19.5982143,20.4266183 C19.4866066,20.5707783 19.3563996,20.6428571 19.2075893,20.6428571 L15.859375,20.6428571 C15.7198654,20.6428571 15.601284,20.5568275 15.5036272,20.3847656 C15.4059705,20.2127038 15.3571429,20.0383193 15.3571429,19.8616071 L15.3571429,19.233817 C15.3571429,18.4618637 15.6594092,17.7340994 16.2639509,17.0505022 C16.8684926,16.3669051 17.5334785,15.8623528 18.2589286,15.5368304 C18.8076664,15.285713 19.1982875,15.025299 19.4308036,14.7555804 C19.6633196,14.4858617 19.7795759,14.1324427 19.7795759,13.6953125 C19.7795759,13.3046855 19.5633392,12.960567 19.1308594,12.6629464 C18.6983795,12.3653259 18.1984775,12.2165179 17.6311384,12.2165179 C17.0265967,12.2165179 16.5243696,12.3513751 16.124442,12.6210938 C15.7989195,12.8536098 15.3013426,13.3883887 14.6316964,14.2254464 C14.5107881,14.3742567 14.3666303,14.4486607 14.1992188,14.4486607 C14.087611,14.4486607 13.9713548,14.4114587 13.8504464,14.3370536 L11.5625,12.593192 C11.4415917,12.5001855 11.3695128,12.3839293 11.3462612,12.2444196 C11.3230096,12.10491 11.3485859,11.974703 11.4229911,11.8537946 C12.9110938,9.37982394 15.0688103,8.14285714 17.8962054,8.14285714 C18.6402567,8.14285714 19.3889471,8.28701493 20.1422991,8.57533482 C20.8956511,8.86365472 21.5745878,9.24962556 22.1791295,9.73325893 C22.7836712,10.2168923 23.2765978,10.8097993 23.6579241,11.5119978 C24.0392504,12.2141962 24.2299107,12.951261 24.2299107,13.7232143 L24.2299107,13.7232143 Z" fill="#FFFFFF"/>
+    </g>
+  </g>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.js	2015-02-28 15:03:01.000000000 +0000
@@ -83,10 +83,20 @@
         case ROOM_STATES.MEDIA_WAIT: {
           var msg = mozL10n.get("call_progress_getting_media_description",
                                 {clientShortname: mozL10n.get("clientShortname2")});
-          // XXX Bug 1047040 will add images to help prompt the user.
+          var utils = loop.shared.utils;
+          var isChrome = utils.isChrome(navigator.userAgent);
+          var isFirefox = utils.isFirefox(navigator.userAgent);
+          var isOpera = utils.isOpera(navigator.userAgent);
+          var promptMediaMessageClasses = React.addons.classSet({
+            "prompt-media-message": true,
+            "chrome": isChrome,
+            "firefox": isFirefox,
+            "opera": isOpera,
+            "other": !isChrome && !isFirefox && !isOpera
+          });
           return (
             React.createElement("div", {className: "room-inner-info-area"}, 
-              React.createElement("p", {className: "prompt-media-message"}, 
+              React.createElement("p", {className: promptMediaMessageClasses}, 
                 msg
               )
             )
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx	2015-02-28 15:03:01.000000000 +0000
@@ -83,10 +83,20 @@
         case ROOM_STATES.MEDIA_WAIT: {
           var msg = mozL10n.get("call_progress_getting_media_description",
                                 {clientShortname: mozL10n.get("clientShortname2")});
-          // XXX Bug 1047040 will add images to help prompt the user.
+          var utils = loop.shared.utils;
+          var isChrome = utils.isChrome(navigator.userAgent);
+          var isFirefox = utils.isFirefox(navigator.userAgent);
+          var isOpera = utils.isOpera(navigator.userAgent);
+          var promptMediaMessageClasses = React.addons.classSet({
+            "prompt-media-message": true,
+            "chrome": isChrome,
+            "firefox": isFirefox,
+            "opera": isOpera,
+            "other": !isChrome && !isFirefox && !isOpera
+          });
           return (
             <div className="room-inner-info-area">
-              <p className="prompt-media-message">
+              <p className={promptMediaMessageClasses}>
                 {msg}
               </p>
             </div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/desktop-local/contacts_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/desktop-local/contacts_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/desktop-local/contacts_test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/desktop-local/contacts_test.js	2015-02-28 15:03:01.000000000 +0000
@@ -14,11 +14,73 @@
   var fakeAddContactButtonText = "Fake Add Contact";
   var fakeEditContactButtonText = "Fake Edit Contact";
   var fakeDoneButtonText = "Fake Done";
+  // The fake contacts array is copied each time mozLoop.contacts.getAll() is called.
+  var fakeContacts = [{
+    id: 1,
+    _guid: 1,
+    name: ["Ally Avocado"],
+    email: [{
+      "pref": true,
+      "type": ["work"],
+      "value": "ally@mail.com"
+    }],
+    tel: [{
+      "pref": true,
+      "type": ["mobile"],
+      "value": "+31-6-12345678"
+    }],
+    category: ["google"],
+    published: 1406798311748,
+    updated: 1406798311748
+  },{
+    id: 2,
+    _guid: 2,
+    name: ["Bob Banana"],
+    email: [{
+      "pref": true,
+      "type": ["work"],
+      "value": "bob@gmail.com"
+    }],
+    tel: [{
+      "pref": true,
+      "type": ["mobile"],
+      "value": "+1-214-5551234"
+    }],
+    category: ["local"],
+    published: 1406798311748,
+    updated: 1406798311748
+  }, {
+    id: 3,
+    _guid: 3,
+    name: ["Caitlin Cantaloupe"],
+    email: [{
+      "pref": true,
+      "type": ["work"],
+      "value": "caitlin.cant@hotmail.com"
+    }],
+    category: ["local"],
+    published: 1406798311748,
+    updated: 1406798311748
+  }, {
+    id: 4,
+    _guid: 4,
+    name: ["Dave Dragonfruit"],
+    email: [{
+      "pref": true,
+      "type": ["work"],
+      "value": "dd@dragons.net"
+    }],
+    category: ["google"],
+    published: 1406798311748,
+    updated: 1406798311748
+  }];
   var sandbox;
   var fakeWindow;
   var notifications;
+  var listView;
+  var oldMozLoop = navigator.mozLoop;
 
-  beforeEach(function(done) {
+  beforeEach(function() {
     sandbox = sinon.sandbox.create();
     navigator.mozLoop = {
       getStrings: function(entityName) {
@@ -32,6 +94,27 @@
         }
         return JSON.stringify({textContent: textContentValue});
       },
+      getLoopPref: function(pref) {
+        if (pref == "contacts.gravatars.promo") {
+          return true;
+        } else if (pref == "contacts.gravatars.show") {
+          return false;
+        }
+        return "";
+      },
+      setLoopPref: sandbox.stub(),
+      getUserAvatar: function() {
+        if (navigator.mozLoop.getLoopPref("contacts.gravatars.show")) {
+          return "gravatarsEnabled";
+        }
+        return "gravatarsDisabled";
+      },
+      contacts: {
+        getAll: function(callback) {
+          callback(null, [].concat(fakeContacts));
+        },
+        on: sandbox.stub()
+      }
     };
 
     fakeWindow = {
@@ -39,20 +122,120 @@
     };
     loop.shared.mixins.setRootObject(fakeWindow);
 
+    notifications = new loop.shared.models.NotificationCollection();
+
     document.mozL10n.initialize(navigator.mozLoop);
-    // XXX prevent a race whenever mozL10n hasn't been initialized yet
-    setTimeout(done, 0);
   });
 
   afterEach(function() {
+    listView = null;
     loop.shared.mixins.setRootObject(window);
+    navigator.mozLoop = oldMozLoop;
     sandbox.restore();
   });
 
+  describe("GravatarsPromo", function() {
+    function checkGravatarContacts(enabled) {
+      var node = listView.getDOMNode();
+
+      // When gravatars are enabled, contacts should be rendered with gravatars.
+      var gravatars = node.querySelectorAll(".contact img[src=gravatarsEnabled]");
+      expect(gravatars.length).to.equal(enabled ? fakeContacts.length : 0);
+      // Sanity check the reverse:
+      gravatars = node.querySelectorAll(".contact img[src=gravatarsDisabled]");
+      expect(gravatars.length).to.equal(enabled ? 0 : fakeContacts.length);
+    }
 
-  describe("ContactsList", function () {
-    var listView;
+    it("should show the gravatars promo box", function() {
+      listView = TestUtils.renderIntoDocument(
+        React.createElement(loop.contacts.ContactsList, {
+          notifications: notifications
+        }));
+
+      var promo = listView.getDOMNode().querySelector(".contacts-gravatar-promo");
+      expect(promo).to.not.equal(null);
+
+      checkGravatarContacts(false);
+    });
+
+    it("should not show the gravatars promo box when the 'contacts.gravatars.promo' pref is set", function() {
+      navigator.mozLoop.getLoopPref = function(pref) {
+        if (pref == "contacts.gravatars.promo") {
+          return false;
+        } else if (pref == "contacts.gravatars.show") {
+          return true;
+        }
+        return "";
+      };
+      listView = TestUtils.renderIntoDocument(
+        React.createElement(loop.contacts.ContactsList, {
+          notifications: notifications
+        }));
+
+      var promo = listView.getDOMNode().querySelector(".contacts-gravatar-promo");
+      expect(promo).to.equal(null);
+
+      checkGravatarContacts(true);
+    });
+
+    it("should hide the gravatars promo box when the 'use' button is clicked", function() {
+      listView = TestUtils.renderIntoDocument(
+        React.createElement(loop.contacts.ContactsList, {
+          notifications: notifications
+        }));
+
+      React.addons.TestUtils.Simulate.click(listView.getDOMNode().querySelector(
+        ".contacts-gravatar-promo .button-accept"));
+
+      sinon.assert.calledTwice(navigator.mozLoop.setLoopPref);
 
+      var promo = listView.getDOMNode().querySelector(".contacts-gravatar-promo");
+      expect(promo).to.equal(null);
+    });
+
+    it("should should set the prefs correctly when the 'use' button is clicked", function() {
+      listView = TestUtils.renderIntoDocument(
+        React.createElement(loop.contacts.ContactsList, {
+          notifications: notifications
+        }));
+
+      React.addons.TestUtils.Simulate.click(listView.getDOMNode().querySelector(
+        ".contacts-gravatar-promo .button-accept"));
+
+      sinon.assert.calledTwice(navigator.mozLoop.setLoopPref);
+      sinon.assert.calledWithExactly(navigator.mozLoop.setLoopPref, "contacts.gravatars.promo", false);
+      sinon.assert.calledWithExactly(navigator.mozLoop.setLoopPref, "contacts.gravatars.show", true);
+    });
+
+    it("should hide the gravatars promo box when the 'close' button is clicked", function() {
+      listView = TestUtils.renderIntoDocument(
+        React.createElement(loop.contacts.ContactsList, {
+          notifications: notifications
+        }));
+
+      React.addons.TestUtils.Simulate.click(listView.getDOMNode().querySelector(
+        ".contacts-gravatar-promo .button-close"));
+
+      var promo = listView.getDOMNode().querySelector(".contacts-gravatar-promo");
+      expect(promo).to.equal(null);
+    });
+
+    it("should set prefs correctly when the 'close' button is clicked", function() {
+      listView = TestUtils.renderIntoDocument(
+        React.createElement(loop.contacts.ContactsList, {
+          notifications: notifications
+        }));
+
+      React.addons.TestUtils.Simulate.click(listView.getDOMNode().querySelector(
+        ".contacts-gravatar-promo .button-close"));
+
+      sinon.assert.calledOnce(navigator.mozLoop.setLoopPref);
+      sinon.assert.calledWithExactly(navigator.mozLoop.setLoopPref,
+        "contacts.gravatars.promo", false);
+    });
+  });
+
+  describe("ContactsList", function () {
     beforeEach(function() {
       navigator.mozLoop.calls = {
         startDirectCall: sandbox.stub(),
@@ -60,19 +243,12 @@
       };
       navigator.mozLoop.contacts = {getAll: sandbox.stub()};
 
-      notifications = new loop.shared.models.NotificationCollection();
       listView = TestUtils.renderIntoDocument(
         React.createElement(loop.contacts.ContactsList, {
           notifications: notifications
         }));
     });
 
-    afterEach(function() {
-      listView = null;
-      delete navigator.mozLoop.calls;
-      delete navigator.mozLoop.contacts;
-    });
-
     describe("#handleContactAction", function() {
       it("should call window.close when called with 'video-call' action",
         function() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/desktop-local/panel_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/desktop-local/panel_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/desktop-local/panel_test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/desktop-local/panel_test.js	2015-02-28 15:03:01.000000000 +0000
@@ -17,7 +17,7 @@
   var fakeXHR, fakeWindow, fakeMozLoop;
   var requests = [];
 
-  beforeEach(function(done) {
+  beforeEach(function() {
     sandbox = sinon.sandbox.create();
     fakeXHR = sandbox.useFakeXMLHttpRequest();
     requests = [];
@@ -65,8 +65,6 @@
     };
 
     document.mozL10n.initialize(navigator.mozLoop);
-    // XXX prevent a race whenever mozL10n hasn't been initialized yet
-    setTimeout(done, 0);
   });
 
   afterEach(function() {
@@ -260,6 +258,17 @@
       });
     });
 
+    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() {
       beforeEach(function() {
         navigator.mozLoop.logInToFxA = sandbox.stub();
@@ -271,14 +280,6 @@
         navigator.mozLoop.fxAEnabled = true;
       });
 
-      it("should be hidden if FxA is not enabled",
-        function() {
-          navigator.mozLoop.fxAEnabled = false;
-          var view = TestUtils.renderIntoDocument(
-            React.createElement(loop.panel.SettingsDropdown));
-          expect(view.getDOMNode()).to.be.null;
-      });
-
       it("should show a signin entry when user is not authenticated",
         function() {
           navigator.mozLoop.loggedInToFxA = false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/functional/config.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/functional/config.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/functional/config.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/functional/config.py	2015-02-28 15:03:01.000000000 +0000
@@ -16,5 +16,7 @@
     "loop.seenToS": "seen",
 
     # this dialog is fragile, and likely to introduce intermittent failures
-    "media.navigator.permission.disabled": True
+    "media.navigator.permission.disabled": True,
+    # Use fake streams only
+    "media.navigator.streams.fake": True
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/functional/test_1_browser_call.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/functional/test_1_browser_call.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/functional/test_1_browser_call.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/functional/test_1_browser_call.py	2015-02-28 15:03:01.000000000 +0000
@@ -1,12 +1,18 @@
 from marionette_test import MarionetteTestCase
-from by import By
-import urlparse
-from errors import NoSuchElementException, StaleElementException
-# noinspection PyUnresolvedReferences
-from wait import Wait
+try:
+    from by import By
+    from errors import NoSuchElementException, StaleElementException
+    # noinspection PyUnresolvedReferences
+    from wait import Wait
+except ImportError:
+    from marionette_driver.by import By
+    from marionette_driver.errors import NoSuchElementException, StaleElementException
+    # noinspection PyUnresolvedReferences
+    from marionette_driver import Wait
 
 import os
 import sys
+import urlparse
 sys.path.insert(1, os.path.dirname(os.path.abspath(__file__)))
 
 import pyperclip
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/browser.ini	2015-02-28 15:03:01.000000000 +0000
@@ -21,5 +21,6 @@
 skip-if = buildapp == 'mulet'
 [browser_toolbarbutton.js]
 [browser_mozLoop_pluralStrings.js]
+[browser_mozLoop_tabSharing.js]
 [browser_mozLoop_telemetry.js]
 skip-if = e10s
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_tabSharing.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_tabSharing.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_tabSharing.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/browser_mozLoop_tabSharing.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,41 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This is an integration test to make sure that passing window IDs is working as
+ * expected, with or without e10s enabled - rather than just testing MozLoopAPI
+ * alone.
+ */
+
+const {injectLoopAPI} = Cu.import("resource:///modules/loop/MozLoopAPI.jsm");
+gMozLoopAPI = injectLoopAPI({});
+
+let promiseTabWindowId = function() {
+  return new Promise(resolve => {
+    gMozLoopAPI.getActiveTabWindowId((err, windowId) => {
+      Assert.equal(null, err, "No error should've occurred.");
+      Assert.equal(typeof windowId, "number", "We should have a window ID");
+      resolve(windowId);
+    });
+  });
+};
+
+add_task(function* test_windowIdFetch_simple() {
+  Assert.ok(gMozLoopAPI, "mozLoop should exist");
+
+  yield promiseTabWindowId();
+});
+
+add_task(function* test_windowIdFetch_multipleTabs() {
+  let previousTab = gBrowser.selectedTab;
+  let previousTabId = yield promiseTabWindowId();
+
+  let tab = gBrowser.selectedTab = gBrowser.addTab();
+  yield promiseTabLoadEvent(tab, "about:mozilla");
+  let tabId = yield promiseTabWindowId();
+  Assert.ok(tabId !== previousTabId, "Tab contentWindow IDs shouldn't be the same");
+  gBrowser.removeTab(tab);
+
+  tabId = yield promiseTabWindowId();
+  Assert.equal(previousTabId, tabId, "Window IDs should be back to what they were");
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/browser_toolbarbutton.js	2015-02-28 15:03:01.000000000 +0000
@@ -38,6 +38,8 @@
   yield loadLoopPanel();
   Assert.ok(LoopUI.browser, "Browser element should be there");
   Assert.strictEqual(LoopUI.selectedTab, "rooms", "Initially the rooms tab should be selected");
+  let panelTabs = LoopUI.browser.contentDocument.querySelectorAll(".tab-view > li");
+  Assert.strictEqual(panelTabs.length, 1, "Only one tab, 'rooms', should be visible");
 
   // Hide the panel.
   yield LoopUI.togglePanel();
@@ -48,6 +50,12 @@
   MozLoopServiceInternal.fxAOAuthProfile = fxASampleProfile;
   yield MozLoopServiceInternal.notifyStatusChanged("login");
 
+  yield LoopUI.togglePanel();
+  Assert.strictEqual(LoopUI.selectedTab, "rooms", "Rooms tab should still be selected");
+  panelTabs = LoopUI.browser.contentDocument.querySelectorAll(".tab-view > li");
+  Assert.strictEqual(panelTabs.length, 2, "Two tabs should be visible");
+  yield LoopUI.togglePanel();
+
   // Programmatically select the contacts tab.
   yield LoopUI.togglePanel(null, "contacts");
   Assert.strictEqual(LoopUI.selectedTab, "contacts", "Contacts tab should be selected now");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/mochitest/head.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/mochitest/head.js	2015-02-28 15:03:01.000000000 +0000
@@ -176,6 +176,50 @@
   });
 }
 
+/**
+ * Waits for a load (or custom) event to finish in a given tab. If provided
+ * load an uri into the tab.
+ *
+ * @param tab
+ *        The tab to load into.
+ * @param [optional] url
+ *        The url to load, or the current url.
+ * @param [optional] event
+ *        The load event type to wait for.  Defaults to "load".
+ * @return {Promise} resolved when the event is handled.
+ * @resolves to the received event
+ * @rejects if a valid load event is not received within a meaningful interval
+ */
+function promiseTabLoadEvent(tab, url, eventType="load") {
+  return new Promise((resolve, reject) => {
+    info("Wait tab event: " + eventType);
+
+    function handle(event) {
+      if (event.originalTarget != tab.linkedBrowser.contentDocument ||
+          event.target.location.href == "about:blank" ||
+          (url && event.target.location.href != url)) {
+        info("Skipping spurious '" + eventType + "'' event" +
+             " for " + event.target.location.href);
+        return;
+      }
+      clearTimeout(timeout);
+      tab.linkedBrowser.removeEventListener(eventType, handle, true);
+      info("Tab event received: " + eventType);
+      resolve(event);
+    }
+
+    let timeout = setTimeout(() => {
+      if (tab.linkedBrowser)
+        tab.linkedBrowser.removeEventListener(eventType, handle, true);
+      reject(new Error("Timed out while waiting for a '" + eventType + "'' event"));
+    }, 30000);
+
+    tab.linkedBrowser.addEventListener(eventType, handle, true, true);
+    if (url)
+      tab.linkedBrowser.loadURI(url);
+  });
+}
+
 function getLoopString(stringID) {
   return MozLoopServiceInternal.localizedStrings.get(stringID);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/activeRoomStore_test.js	2015-02-28 15:03:01.000000000 +0000
@@ -31,13 +31,16 @@
         on: sinon.stub(),
         off: sinon.stub()
       },
-      setScreenShareState: sinon.stub()
+      setScreenShareState: sinon.stub(),
+      getActiveTabWindowId: sandbox.stub().callsArgWith(0, null, 42)
     };
 
     fakeSdkDriver = {
       connectSession: sandbox.stub(),
       disconnectSession: sandbox.stub(),
-      forceDisconnectAll: sandbox.stub().callsArg(0)
+      forceDisconnectAll: sandbox.stub().callsArg(0),
+      startScreenShare: sandbox.stub(),
+      endScreenShare: sandbox.stub().returns(true)
     };
 
     fakeMultiplexGum = {
@@ -690,6 +693,60 @@
     });
   });
 
+  describe("#startScreenShare", function() {
+    it("should set the state to 'pending'", function() {
+      store.startScreenShare(new sharedActions.StartScreenShare({
+        type: "window"
+      }));
+
+      sinon.assert.calledOnce(dispatcher.dispatch);
+      sinon.assert.calledWith(dispatcher.dispatch,
+        new sharedActions.ScreenSharingState({
+          state: SCREEN_SHARE_STATES.PENDING
+        }));
+    });
+
+    it("should invoke the SDK driver with the correct options for window sharing", function() {
+      store.startScreenShare(new sharedActions.StartScreenShare({
+        type: "window"
+      }));
+
+      sinon.assert.calledOnce(fakeSdkDriver.startScreenShare);
+      sinon.assert.calledWith(fakeSdkDriver.startScreenShare, {
+        videoSource: "window"
+      });
+    });
+
+    it("should invoke the SDK driver with the correct options for tab sharing", function() {
+      store.startScreenShare(new sharedActions.StartScreenShare({
+        type: "browser"
+      }));
+
+      sinon.assert.calledOnce(fakeMozLoop.getActiveTabWindowId);
+
+      sinon.assert.calledOnce(fakeSdkDriver.startScreenShare);
+      sinon.assert.calledWith(fakeSdkDriver.startScreenShare, {
+        videoSource: "browser",
+        constraints: {
+          browserWindow: 42,
+          scrollWithPage: true
+        }
+      });
+    })
+  });
+
+  describe("#endScreenShare", function() {
+    it("should set the state to 'inactive'", function() {
+      store.endScreenShare();
+
+      sinon.assert.calledOnce(dispatcher.dispatch);
+      sinon.assert.calledWith(dispatcher.dispatch,
+        new sharedActions.ScreenSharingState({
+          state: SCREEN_SHARE_STATES.INACTIVE
+        }));
+    });
+  });
+
   describe("#remotePeerConnected", function() {
     it("should set the state to `HAS_PARTICIPANTS`", function() {
       store.remotePeerConnected();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/dispatcher_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/dispatcher_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/dispatcher_test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/dispatcher_test.js	2015-02-28 15:03:01.000000000 +0000
@@ -104,6 +104,31 @@
       sinon.assert.calledOnce(getDataStore2.getWindowData);
     });
 
+    describe("Error handling", function() {
+      beforeEach(function() {
+        sandbox.stub(console, "error");
+      });
+
+      it("should handle uncaught exceptions", function() {
+        getDataStore1.getWindowData.throws("Uncaught Error");
+
+        dispatcher.dispatch(getDataAction);
+        dispatcher.dispatch(cancelAction);
+
+        sinon.assert.calledOnce(getDataStore1.getWindowData);
+        sinon.assert.calledOnce(getDataStore2.getWindowData);
+        sinon.assert.calledOnce(cancelStore1.cancelCall);
+      });
+
+      it("should log uncaught exceptions", function() {
+        getDataStore1.getWindowData.throws("Uncaught Error");
+
+        dispatcher.dispatch(getDataAction);
+
+        sinon.assert.calledOnce(console.error);
+      });
+    });
+
     describe("Queued actions", function() {
       beforeEach(function() {
         // Restore the stub, so that we can easily add a function to be
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/frontend_tester.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/frontend_tester.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/frontend_tester.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/frontend_tester.py	2015-02-28 15:03:01.000000000 +0000
@@ -1,5 +1,5 @@
 from marionette_test import MarionetteTestCase
-from errors import NoSuchElementException
+from marionette_driver.errors import NoSuchElementException
 import threading
 import SimpleHTTPServer
 import SocketServer
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/otSdkDriver_test.js	2015-02-28 15:03:01.000000000 +0000
@@ -138,22 +138,18 @@
       };
     });
 
-    it("should dispatch a `ScreenSharingState` action", function() {
-      driver.startScreenShare(new sharedActions.StartScreenShare());
-
-      sinon.assert.calledOnce(dispatcher.dispatch);
-      sinon.assert.calledWithExactly(dispatcher.dispatch,
-        new sharedActions.ScreenSharingState({
-          state: SCREEN_SHARE_STATES.PENDING
-        }));
-    });
-
     it("should initialize a publisher", function() {
-      driver.startScreenShare(new sharedActions.StartScreenShare());
+      // We're testing with `videoSource` set to 'browser', not 'window', as it
+      // has multiple options.
+      var options = {
+        videoSource: "browser",
+        browserWindow: 42,
+        scrollWithPage: true
+      };
+      driver.startScreenShare(options);
 
       sinon.assert.calledOnce(sdk.initPublisher);
-      sinon.assert.calledWithMatch(sdk.initPublisher,
-        fakeElement, {videoSource: "window"});
+      sinon.assert.calledWithMatch(sdk.initPublisher, fakeElement, options);
     });
   });
 
@@ -161,7 +157,9 @@
     beforeEach(function() {
       driver.getScreenShareElementFunc = function() {};
 
-      driver.startScreenShare(new sharedActions.StartScreenShare());
+      driver.startScreenShare({
+        videoSource: "window"
+      });
 
       sandbox.stub(dispatcher, "dispatch");
 
@@ -175,20 +173,10 @@
     });
 
     it("should destroy the share", function() {
-      driver.endScreenShare(new sharedActions.EndScreenShare());
+      expect(driver.endScreenShare()).to.equal(true);
 
       sinon.assert.calledOnce(publisher.destroy);
     });
-
-    it("should dispatch a `ScreenSharingState` action", function() {
-      driver.endScreenShare(new sharedActions.EndScreenShare());
-
-      sinon.assert.calledOnce(dispatcher.dispatch);
-      sinon.assert.calledWithExactly(dispatcher.dispatch,
-        new sharedActions.ScreenSharingState({
-          state: SCREEN_SHARE_STATES.INACTIVE
-        }));
-    });
   });
 
   describe("#connectSession", function() {
@@ -611,7 +599,9 @@
 
       driver.getScreenShareElementFunc = function() {};
 
-      driver.startScreenShare(new sharedActions.StartScreenShare());
+      driver.startScreenShare({
+        videoSource: "window"
+      });
 
       sandbox.stub(dispatcher, "dispatch");
     });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/utils_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/utils_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/utils_test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/utils_test.js	2015-02-28 15:03:01.000000000 +0000
@@ -152,8 +152,8 @@
       // fake mozL10n
       sandbox.stub(navigator.mozL10n, "get", function(id) {
         switch(id) {
-          case "share_email_subject4": return "subject";
-          case "share_email_body4":    return "body";
+          case "share_email_subject5": return "subject";
+          case "share_email_body5":    return "body";
         }
       });
       composeEmail = sandbox.spy();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/views_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/views_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/shared/views_test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/shared/views_test.js	2015-02-28 15:03:01.000000000 +0000
@@ -152,7 +152,7 @@
         expect(comp.state.showMenu).eql(true);
       });
 
-    it("should dispatch a StartScreenShare action on option click in screenshare dropdown",
+    it("should dispatch a 'browser' StartScreenShare action on option click",
       function() {
         var comp = TestUtils.renderIntoDocument(
           React.createElement(sharedViews.ScreenShareControlButton, {
@@ -166,7 +166,24 @@
 
         sinon.assert.calledOnce(dispatcher.dispatch);
         sinon.assert.calledWithExactly(dispatcher.dispatch,
-          new sharedActions.StartScreenShare({}));
+          new sharedActions.StartScreenShare({ type: "browser" }));
+      });
+
+    it("should dispatch a 'window' StartScreenShare action on option click",
+      function() {
+        var comp = TestUtils.renderIntoDocument(
+          React.createElement(sharedViews.ScreenShareControlButton, {
+            dispatcher: dispatcher,
+            visible: true,
+            state: SCREEN_SHARE_STATES.INACTIVE
+          }));
+
+        TestUtils.Simulate.click(comp.getDOMNode().querySelector(
+          ".conversation-window-dropdown > li:last-child"));
+
+        sinon.assert.calledOnce(dispatcher.dispatch);
+        sinon.assert.calledWithExactly(dispatcher.dispatch,
+          new sharedActions.StartScreenShare({ type: "window" }));
       });
 
     it("should dispatch a EndScreenShare action on click when the state is active",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/test/xpcshell/test_loopservice_hawk_errors.js	2015-02-28 15:03:01.000000000 +0000
@@ -37,6 +37,7 @@
 
 add_task(function* error_offline() {
   Services.io.offline = true;
+  Services.prefs.setBoolPref("network.dns.offline-localhost", false);
   yield MozLoopServiceInternal.hawkRequestInternal(LOOP_SESSION_TYPE.GUEST, "/offline", "GET").then(
     () => Assert.ok(false, "Should have rejected"),
     (error) => {
@@ -179,6 +180,7 @@
     Services.prefs.clearUserPref("loop.hawk-session-token");
     Services.prefs.clearUserPref("loop.hawk-session-token.fxa");
     Services.prefs.clearUserPref("loop.urlsExpiryTimeSeconds");
+    Services.prefs.clearUserPref("network.dns.offline-localhost");
     MozLoopService.errors.clear();
   });
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/ui/fake-mozLoop.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/ui/fake-mozLoop.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/ui/fake-mozLoop.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/ui/fake-mozLoop.js	2015-02-28 15:03:01.000000000 +0000
@@ -43,6 +43,66 @@
   }
 ];
 
+var fakeContacts = [{
+  id: 1,
+  _guid: 1,
+  name: ["Ally Avocado"],
+  email: [{
+    "pref": true,
+    "type": ["work"],
+    "value": "ally@mail.com"
+  }],
+  tel: [{
+    "pref": true,
+    "type": ["mobile"],
+    "value": "+31-6-12345678"
+  }],
+  category: ["google"],
+  published: 1406798311748,
+  updated: 1406798311748
+},{
+  id: 2,
+  _guid: 2,
+  name: ["Bob Banana"],
+  email: [{
+    "pref": true,
+    "type": ["work"],
+    "value": "bob@gmail.com"
+  }],
+  tel: [{
+    "pref": true,
+    "type": ["mobile"],
+    "value": "+1-214-5551234"
+  }],
+  category: ["local"],
+  published: 1406798311748,
+  updated: 1406798311748
+}, {
+  id: 3,
+  _guid: 3,
+  name: ["Caitlin Cantaloupe"],
+  email: [{
+    "pref": true,
+    "type": ["work"],
+    "value": "caitlin.cant@hotmail.com"
+  }],
+  category: ["local"],
+  published: 1406798311748,
+  updated: 1406798311748
+}, {
+  id: 4,
+  _guid: 4,
+  name: ["Dave Dragonfruit"],
+  email: [{
+    "pref": true,
+    "type": ["work"],
+    "value": "dd@dragons.net"
+  }],
+  category: ["google"],
+  published: 1406798311748,
+  updated: 1406798311748
+}];
+
 /**
  * Faking the mozLoop object which doesn't exist in regular web pages.
  * @type {Object}
@@ -54,21 +114,28 @@
     switch(pref) {
       // Ensure we skip FTE completely.
       case "gettingStarted.seen":
+      case "contacts.gravatars.promo":
         return true;
+      case "contacts.gravatars.show":
+        return false;
     }
   },
   setLoopPref: function(){},
   releaseCallData: function() {},
   copyString: function() {},
+  getUserAvatar: function(emailAddress) {
+    return "http://www.gravatar.com/avatar/" + (Math.ceil(Math.random() * 3) === 2 ?
+      "0a996f0fe2727ef1668bdb11897e4459" : "foo") + ".jpg?default=blank&s=40";
+  },
   contacts: {
     getAll: function(callback) {
-      callback(null, []);
+      callback(null, [].concat(fakeContacts));
     },
     on: function() {}
   },
   rooms: {
     getAll: function(version, callback) {
-      callback(null, fakeRooms);
+      callback(null, [].concat(fakeRooms));
     },
     on: function() {}
   },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/ui/ui-showcase.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/ui/ui-showcase.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/ui/ui-showcase.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/ui/ui-showcase.js	2015-02-28 15:03:01.000000000 +0000
@@ -287,14 +287,14 @@
           ), 
 
           React.createElement(Section, {name: "IncomingCallView"}, 
-            React.createElement(Example, {summary: "Default / incoming video call", dashed: "true", style: {width: "260px", height: "254px"}}, 
+            React.createElement(Example, {summary: "Default / incoming video call", dashed: "true", style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(IncomingCallView, {model: mockConversationModel, 
                                   video: true})
               )
             ), 
 
-            React.createElement(Example, {summary: "Default / incoming audio only call", dashed: "true", style: {width: "260px", height: "254px"}}, 
+            React.createElement(Example, {summary: "Default / incoming audio only call", dashed: "true", style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(IncomingCallView, {model: mockConversationModel, 
                                   video: false})
@@ -303,7 +303,7 @@
           ), 
 
           React.createElement(Section, {name: "IncomingCallView-ActiveState"}, 
-            React.createElement(Example, {summary: "Default", dashed: "true", style: {width: "260px", height: "254px"}}, 
+            React.createElement(Example, {summary: "Default", dashed: "true", style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(IncomingCallView, {model: mockConversationModel, 
                                    showMenu: true})
@@ -314,19 +314,19 @@
           React.createElement(Section, {name: "ConversationToolbar"}, 
             React.createElement("h2", null, "Desktop Conversation Window"), 
             React.createElement("div", {className: "fx-embedded override-position"}, 
-              React.createElement(Example, {summary: "Default (260x265)", dashed: "true"}, 
+              React.createElement(Example, {summary: "Default", dashed: "true", style: {width: "300px", height: "272px"}}, 
                 React.createElement(ConversationToolbar, {video: {enabled: true}, 
                                      audio: {enabled: true}, 
                                      hangup: noop, 
                                      publishStream: noop})
               ), 
-              React.createElement(Example, {summary: "Video muted"}, 
+              React.createElement(Example, {summary: "Video muted", style: {width: "300px", height: "272px"}}, 
                 React.createElement(ConversationToolbar, {video: {enabled: false}, 
                                      audio: {enabled: true}, 
                                      hangup: noop, 
                                      publishStream: noop})
               ), 
-              React.createElement(Example, {summary: "Audio muted"}, 
+              React.createElement(Example, {summary: "Audio muted", style: {width: "300px", height: "272px"}}, 
                 React.createElement(ConversationToolbar, {video: {enabled: true}, 
                                      audio: {enabled: false}, 
                                      hangup: noop, 
@@ -383,7 +383,7 @@
 
           React.createElement(Section, {name: "PendingConversationView (Desktop)"}, 
             React.createElement(Example, {summary: "Connecting", dashed: "true", 
-                     style: {width: "260px", height: "265px"}}, 
+                     style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(DesktopPendingConversationView, {callState: "gather", 
                                                 contact: mockContact, 
@@ -394,13 +394,13 @@
 
           React.createElement(Section, {name: "CallFailedView"}, 
             React.createElement(Example, {summary: "Call Failed", dashed: "true", 
-                     style: {width: "260px", height: "265px"}}, 
+                     style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(CallFailedView, {dispatcher: dispatcher, store: conversationStore})
               )
             ), 
             React.createElement(Example, {summary: "Call Failed — with call URL error", dashed: "true", 
-                     style: {width: "260px", height: "265px"}}, 
+                     style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(CallFailedView, {dispatcher: dispatcher, emailLinkError: true, 
                                 store: conversationStore})
@@ -430,7 +430,7 @@
 
           React.createElement(Section, {name: "ConversationView"}, 
             React.createElement(Example, {summary: "Desktop conversation window", dashed: "true", 
-                     style: {width: "260px", height: "265px"}}, 
+                     style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(ConversationView, {sdk: mockSDK, 
                                   model: mockConversationModel, 
@@ -452,7 +452,7 @@
             ), 
 
             React.createElement(Example, {summary: "Desktop conversation window local audio stream", 
-                     dashed: "true", style: {width: "260px", height: "265px"}}, 
+                     dashed: "true", style: {width: "300px", height: "272px"}}, 
               React.createElement("div", {className: "fx-embedded"}, 
                 React.createElement(ConversationView, {sdk: mockSDK, 
                                   video: {enabled: false}, 
@@ -503,13 +503,13 @@
               React.createElement("strong", null, "Note:"), " For the useable demo, you can access submitted data at ", 
               React.createElement("a", {href: "https://input.allizom.org/"}, "input.allizom.org"), "."
             ), 
-            React.createElement(Example, {summary: "Default (useable demo)", dashed: "true", style: {width: "260px"}}, 
+            React.createElement(Example, {summary: "Default (useable demo)", dashed: "true", style: {width: "300px", height: "272px"}}, 
               React.createElement(FeedbackView, {feedbackStore: feedbackStore})
             ), 
-            React.createElement(Example, {summary: "Detailed form", dashed: "true", style: {width: "260px"}}, 
+            React.createElement(Example, {summary: "Detailed form", dashed: "true", style: {width: "300px", height: "272px"}}, 
               React.createElement(FeedbackView, {feedbackStore: feedbackStore, feedbackState: FEEDBACK_STATES.DETAILS})
             ), 
-            React.createElement(Example, {summary: "Thank you!", dashed: "true", style: {width: "260px"}}, 
+            React.createElement(Example, {summary: "Thank you!", dashed: "true", style: {width: "300px", height: "272px"}}, 
               React.createElement(FeedbackView, {feedbackStore: feedbackStore, feedbackState: FEEDBACK_STATES.SENT})
             )
           ), 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/ui/ui-showcase.jsx thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/ui/ui-showcase.jsx
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/loop/ui/ui-showcase.jsx	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/loop/ui/ui-showcase.jsx	2015-02-28 15:03:01.000000000 +0000
@@ -287,14 +287,14 @@
           </Section>
 
           <Section name="IncomingCallView">
-            <Example summary="Default / incoming video call" dashed="true" style={{width: "260px", height: "254px"}}>
+            <Example summary="Default / incoming video call" dashed="true" style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded">
                 <IncomingCallView model={mockConversationModel}
                                   video={true} />
               </div>
             </Example>
 
-            <Example summary="Default / incoming audio only call" dashed="true" style={{width: "260px", height: "254px"}}>
+            <Example summary="Default / incoming audio only call" dashed="true" style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded">
                 <IncomingCallView model={mockConversationModel}
                                   video={false} />
@@ -303,7 +303,7 @@
           </Section>
 
           <Section name="IncomingCallView-ActiveState">
-            <Example summary="Default" dashed="true" style={{width: "260px", height: "254px"}}>
+            <Example summary="Default" dashed="true" style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded" >
                 <IncomingCallView  model={mockConversationModel}
                                    showMenu={true} />
@@ -314,19 +314,19 @@
           <Section name="ConversationToolbar">
             <h2>Desktop Conversation Window</h2>
             <div className="fx-embedded override-position">
-              <Example summary="Default (260x265)" dashed="true">
+              <Example summary="Default" dashed="true" style={{width: "300px", height: "272px"}}>
                 <ConversationToolbar video={{enabled: true}}
                                      audio={{enabled: true}}
                                      hangup={noop}
                                      publishStream={noop} />
               </Example>
-              <Example summary="Video muted">
+              <Example summary="Video muted" style={{width: "300px", height: "272px"}}>
                 <ConversationToolbar video={{enabled: false}}
                                      audio={{enabled: true}}
                                      hangup={noop}
                                      publishStream={noop} />
               </Example>
-              <Example summary="Audio muted">
+              <Example summary="Audio muted" style={{width: "300px", height: "272px"}}>
                 <ConversationToolbar video={{enabled: true}}
                                      audio={{enabled: false}}
                                      hangup={noop}
@@ -383,7 +383,7 @@
 
           <Section name="PendingConversationView (Desktop)">
             <Example summary="Connecting" dashed="true"
-                     style={{width: "260px", height: "265px"}}>
+                     style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded">
                 <DesktopPendingConversationView callState={"gather"}
                                                 contact={mockContact}
@@ -394,13 +394,13 @@
 
           <Section name="CallFailedView">
             <Example summary="Call Failed" dashed="true"
-                     style={{width: "260px", height: "265px"}}>
+                     style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded">
                 <CallFailedView dispatcher={dispatcher} store={conversationStore} />
               </div>
             </Example>
             <Example summary="Call Failed — with call URL error" dashed="true"
-                     style={{width: "260px", height: "265px"}}>
+                     style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded">
                 <CallFailedView dispatcher={dispatcher} emailLinkError={true}
                                 store={conversationStore} />
@@ -430,7 +430,7 @@
 
           <Section name="ConversationView">
             <Example summary="Desktop conversation window" dashed="true"
-                     style={{width: "260px", height: "265px"}}>
+                     style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded">
                 <ConversationView sdk={mockSDK}
                                   model={mockConversationModel}
@@ -452,7 +452,7 @@
             </Example>
 
             <Example summary="Desktop conversation window local audio stream"
-                     dashed="true" style={{width: "260px", height: "265px"}}>
+                     dashed="true" style={{width: "300px", height: "272px"}}>
               <div className="fx-embedded">
                 <ConversationView sdk={mockSDK}
                                   video={{enabled: false}}
@@ -503,13 +503,13 @@
               <strong>Note:</strong> For the useable demo, you can access submitted data at&nbsp;
               <a href="https://input.allizom.org/">input.allizom.org</a>.
             </p>
-            <Example summary="Default (useable demo)" dashed="true" style={{width: "260px"}}>
+            <Example summary="Default (useable demo)" dashed="true" style={{width: "300px", height: "272px"}}>
               <FeedbackView feedbackStore={feedbackStore} />
             </Example>
-            <Example summary="Detailed form" dashed="true" style={{width: "260px"}}>
+            <Example summary="Detailed form" dashed="true" style={{width: "300px", height: "272px"}}>
               <FeedbackView feedbackStore={feedbackStore} feedbackState={FEEDBACK_STATES.DETAILS} />
             </Example>
-            <Example summary="Thank you!" dashed="true" style={{width: "260px"}}>
+            <Example summary="Thank you!" dashed="true" style={{width: "300px", height: "272px"}}>
               <FeedbackView feedbackStore={feedbackStore} feedbackState={FEEDBACK_STATES.SENT} />
             </Example>
           </Section>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/moz.build	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/moz.build	2015-02-28 15:03:01.000000000 +0000
@@ -15,6 +15,7 @@
     'places',
     'preferences',
     'privatebrowsing',
+    'readinglist',
     'search',
     'sessionstore',
     'shell',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/nsBrowserGlue.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/nsBrowserGlue.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/nsBrowserGlue.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/nsBrowserGlue.js	2015-02-28 15:03:01.000000000 +0000
@@ -91,6 +91,9 @@
 XPCOMUtils.defineLazyModuleGetter(this, "ContentPrefServiceParent",
                                   "resource://gre/modules/ContentPrefServiceParent.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "SelfSupportBackend",
+                                  "resource:///modules/SelfSupportBackend.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "SessionStore",
                                   "resource:///modules/sessionstore/SessionStore.jsm");
 
@@ -119,6 +122,13 @@
                                   "resource://gre/modules/UpdateChannel.jsm");
 #endif
 
+
+#if defined(MOZ_UPDATE_CHANNEL) && MOZ_UPDATE_CHANNEL != release
+#define MOZ_DEBUG_UA // Shorthand define for subsequent conditional sections.
+XPCOMUtils.defineLazyModuleGetter(this, "UserAgentOverrides",
+                                  "resource://gre/modules/UserAgentOverrides.jsm");
+#endif
+
 XPCOMUtils.defineLazyGetter(this, "ShellService", function() {
   try {
     return Cc["@mozilla.org/browser/shell-service;1"].
@@ -279,6 +289,9 @@
         Services.console.logStringMessage(null); // clear the console (in case it's open)
         Services.console.reset();
         break;
+      case "restart-in-safe-mode":
+        this._onSafeModeRestart();
+        break;
       case "quit-application-requested":
         this._onQuitRequest(subject, data);
         break;
@@ -469,7 +482,11 @@
             Services.prefs.clearUserPref("privacy.trackingprotection.ui.enabled");
           }
         }
+        break;
 #endif
+      case "flash-plugin-hang":
+        this._handleFlashHang();
+        break;
     }
   },
 
@@ -516,6 +533,10 @@
 #endif
     os.addObserver(this, "browser-search-engine-modified", false);
     os.addObserver(this, "browser-search-service", false);
+    os.addObserver(this, "restart-in-safe-mode", false);
+    os.addObserver(this, "flash-plugin-hang", false);
+
+    this._flashHangCount = 0;
   },
 
   // cleanup (called on application shutdown)
@@ -527,6 +548,7 @@
     os.removeObserver(this, "browser:purge-session-history");
     os.removeObserver(this, "quit-application-requested");
     os.removeObserver(this, "quit-application-granted");
+    os.removeObserver(this, "restart-in-safe-mode");
 #ifdef OBSERVE_LASTWINDOW_CLOSE_TOPICS
     os.removeObserver(this, "browser-lastwindow-close-requested");
     os.removeObserver(this, "browser-lastwindow-close-granted");
@@ -559,6 +581,7 @@
 #ifdef NIGHTLY_BUILD
     Services.prefs.removeObserver(POLARIS_ENABLED, this);
 #endif
+    os.removeObserver(this, "flash-plugin-hang");
   },
 
   _onAppDefaults: function BG__onAppDefaults() {
@@ -680,10 +703,17 @@
     LoginManagerParent.init();
     ReaderParent.init();
 
+    SelfSupportBackend.init();
+
 #ifdef NIGHTLY_BUILD
     Services.prefs.addObserver(POLARIS_ENABLED, this, false);
 #endif
 
+#ifdef MOZ_DEBUG_UA
+    UserAgentOverrides.init();
+    DebugUserAgent.init();
+#endif
+
     Services.obs.notifyObservers(null, "browser-ui-startup-complete", "");
 
     AddonWatcher.init(this._notifySlowAddon);
@@ -713,6 +743,33 @@
     }
   },
 
+  _onSafeModeRestart: function BG_onSafeModeRestart() {
+    // prompt the user to confirm
+    let strings = Services.strings.createBundle("chrome://browser/locale/browser.properties");
+    let promptTitle = strings.GetStringFromName("safeModeRestartPromptTitle");
+    let promptMessage = strings.GetStringFromName("safeModeRestartPromptMessage");
+    let restartText = strings.GetStringFromName("safeModeRestartButton");
+    let buttonFlags = (Services.prompt.BUTTON_POS_0 *
+                       Services.prompt.BUTTON_TITLE_IS_STRING) +
+                      (Services.prompt.BUTTON_POS_1 *
+                       Services.prompt.BUTTON_TITLE_CANCEL) +
+                      Services.prompt.BUTTON_POS_0_DEFAULT;
+
+    let rv = Services.prompt.confirmEx(null, promptTitle, promptMessage,
+                                       buttonFlags, restartText, null, null,
+                                       null, {});
+    if (rv != 0)
+      return;
+
+    let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
+                       .createInstance(Ci.nsISupportsPRBool);
+    Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
+
+    if (!cancelQuit.data) {
+      Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit);
+    }
+  },
+
   _trackSlowStartup: function () {
     if (Services.startup.interrupted ||
         Services.prefs.getBoolPref("browser.slowStartup.notificationDisabled"))
@@ -911,6 +968,8 @@
       Cu.reportError("Could not end startup crash tracking in quit-application-granted: " + e);
     }
 
+    SelfSupportBackend.uninit();
+
     CustomizationTabPreloader.uninit();
     WebappManager.uninit();
 #ifdef NIGHTLY_BUILD
@@ -918,8 +977,12 @@
       SignInToWebsiteUX.uninit();
     }
 #endif
+#ifdef MOZ_DEBUG_UA
+    UserAgentOverrides.uninit();
+#endif
     webrtcUI.uninit();
     FormValidationHandler.uninit();
+    AddonWatcher.uninit();
   },
 
   _initServiceDiscovery: function () {
@@ -2114,6 +2177,49 @@
   },
 #endif
 
+  _handleFlashHang: function() {
+    ++this._flashHangCount;
+    if (this._flashHangCount < 2) {
+      return;
+    }
+    // protected mode only applies to win32
+    if (Services.appinfo.XPCOMABI != "x86-msvc") {
+      return;
+    }
+
+    if (Services.prefs.getBoolPref("dom.ipc.plugins.flash.disable-protected-mode")) {
+      return;
+    }
+    if (!Services.prefs.getBoolPref("browser.flash-protected-mode-flip.enable")) {
+      return;
+    }
+    if (Services.prefs.getBoolPref("browser.flash-protected-mode-flip.done")) {
+      return;
+    }
+    Services.prefs.setBoolPref("dom.ipc.plugins.flash.disable-protected-mode", true);
+    Services.prefs.setBoolPref("browser.flash-protected-mode-flip.done", true);
+
+    let win = this.getMostRecentBrowserWindow();
+    if (!win) {
+      return;
+    }
+    let productName = Services.strings
+      .createBundle("chrome://branding/locale/brand.properties")
+      .GetStringFromName("brandShortName");
+    let message = win.gNavigatorBundle.
+      getFormattedString("flashHang.message", [productName]);
+    let buttons = [{
+      label: win.gNavigatorBundle.getString("flashHang.helpButton.label"),
+      accessKey: win.gNavigatorBundle.getString("flashHang.helpButton.accesskey"),
+      callback: function() {
+        win.openUILinkIn("https://support.mozilla.org/kb/flash-protected-mode-autodisabled", "tab");
+      }
+    }];
+    let nb = win.document.getElementById("global-notificationbox");
+    nb.appendNotification(message, "flash-hang", null,
+                          nb.PRIORITY_INFO_MEDIUM, buttons);
+  },
+
   // for XPCOM
   classID:          Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"),
 
@@ -2835,3 +2941,36 @@
 globalMM.addMessageListener("UITour:onPageEvent", function(aMessage) {
   UITour.onPageEvent(aMessage, aMessage.data);
 });
+
+#ifdef MOZ_DEBUG_UA
+// Modify the user agent string for specific domains
+// to route debug information through their logging.
+var DebugUserAgent = {
+  DEBUG_UA: null,
+  DOMAINS: [
+    'youtube.com',
+    'www.youtube.com',
+    'youtube-nocookie.com',
+    'www.youtube-nocookie.com',
+  ],
+
+  init: function() {
+    // Only run if the MediaSource Extension API is available.
+    if (!Services.prefs.getBoolPref("media.mediasource.enabled")) {
+      return;
+    }
+    // Install our override filter.
+    UserAgentOverrides.addComplexOverride(this.onRequest.bind(this));
+    let ua = Cc["@mozilla.org/network/protocol;1?name=http"]
+                .getService(Ci.nsIHttpProtocolHandler).userAgent;
+    this.DEBUG_UA = ua + " Build/" + Services.appinfo.appBuildID;
+  },
+
+  onRequest: function(channel, defaultUA) {
+    if (this.DOMAINS.indexOf(channel.URI.host) != -1) {
+      return this.DEBUG_UA;
+    }
+    return null;
+  },
+};
+#endif // MOZ_DEBUG_UA
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_0_library_left_pane_migration.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_0_library_left_pane_migration.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_0_library_left_pane_migration.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_0_library_left_pane_migration.js	2015-02-28 15:03:01.000000000 +0000
@@ -4,6 +4,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/. */
 
+"use strict";
+
 /**
  *  Test we correctly migrate Library left pane to the latest version.
  *  Note: this test MUST be the first between browser chrome tests, or results
@@ -12,39 +14,7 @@
 
 const TEST_URI = "http://www.mozilla.org/";
 
-function onLibraryReady(organizer) {
-      // Check left pane.
-      ok(PlacesUIUtils.leftPaneFolderId > 0,
-         "Left pane folder correctly created");
-      var leftPaneItems =
-        PlacesUtils.annotations
-                   .getItemsWithAnnotation(PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
-      is(leftPaneItems.length, 1,
-         "We correctly have only 1 left pane folder");
-      var leftPaneRoot = leftPaneItems[0];
-      is(leftPaneRoot, PlacesUIUtils.leftPaneFolderId,
-         "leftPaneFolderId getter has correct value");
-      // Check version has been upgraded.
-      var version =
-        PlacesUtils.annotations.getItemAnnotation(leftPaneRoot,
-                                                  PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
-      is(version, PlacesUIUtils.ORGANIZER_LEFTPANE_VERSION,
-         "Left pane version has been correctly upgraded");
-
-      // Check left pane is populated.
-      organizer.PlacesOrganizer.selectLeftPaneQuery('History');
-      is(organizer.PlacesOrganizer._places.selectedNode.itemId,
-         PlacesUIUtils.leftPaneQueries["History"],
-         "Library left pane is populated and working");
-
-      // Close Library window.
-      organizer.close();
-      // No need to cleanup anything, we have a correct left pane now.
-      finish();
-}
-
-function test() {
-  waitForExplicitFinish();
+add_task(function* () {
   // Sanity checks.
   ok(PlacesUtils, "PlacesUtils is running in chrome context");
   ok(PlacesUIUtils, "PlacesUIUtils is running in chrome context");
@@ -52,42 +22,69 @@
      "Left pane version in chrome context, current version is: " + PlacesUIUtils.ORGANIZER_LEFTPANE_VERSION );
 
   // Check if we have any left pane folder already set, remove it eventually.
-  var leftPaneItems = PlacesUtils.annotations
+  let leftPaneItems = PlacesUtils.annotations
                                  .getItemsWithAnnotation(PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
   if (leftPaneItems.length > 0) {
     // The left pane has already been created, touching it now would cause
     // next tests to rely on wrong values (and possibly crash)
     is(leftPaneItems.length, 1, "We correctly have only 1 left pane folder");
     // Check version.
-    var version = PlacesUtils.annotations.getItemAnnotation(leftPaneItems[0],
+    let version = PlacesUtils.annotations.getItemAnnotation(leftPaneItems[0],
                                                             PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
     is(version, PlacesUIUtils.ORGANIZER_LEFTPANE_VERSION, "Left pane version is actual");
     ok(true, "left pane has already been created, skipping test");
-    finish();
     return;
   }
 
   // Create a fake left pane folder with an old version (current version - 1).
-  var fakeLeftPaneRoot =
-    PlacesUtils.bookmarks.createFolder(PlacesUtils.placesRootId, "",
-                                       PlacesUtils.bookmarks.DEFAULT_INDEX);
-  PlacesUtils.annotations.setItemAnnotation(fakeLeftPaneRoot,
+  let folder = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.rootGuid,
+    index: PlacesUtils.bookmarks.DEFAULT_INDEX,
+    type: PlacesUtils.bookmarks.TYPE_FOLDER,
+    title: ""
+  });
+
+  let folderId = yield PlacesUtils.promiseItemId(folder.guid);
+  PlacesUtils.annotations.setItemAnnotation(folderId,
                                             PlacesUIUtils.ORGANIZER_FOLDER_ANNO,
                                             PlacesUIUtils.ORGANIZER_LEFTPANE_VERSION - 1,
                                             0,
                                             PlacesUtils.annotations.EXPIRE_NEVER);
 
   // Check fake left pane root has been correctly created.
-  var leftPaneItems =
+  leftPaneItems =
     PlacesUtils.annotations.getItemsWithAnnotation(PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
   is(leftPaneItems.length, 1, "We correctly have only 1 left pane folder");
-  is(leftPaneItems[0], fakeLeftPaneRoot, "left pane root itemId is correct");
+  is(leftPaneItems[0], folderId, "left pane root itemId is correct");
 
   // Check version.
-  var version = PlacesUtils.annotations.getItemAnnotation(fakeLeftPaneRoot,
+  let version = PlacesUtils.annotations.getItemAnnotation(folderId,
                                                           PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
   is(version, PlacesUIUtils.ORGANIZER_LEFTPANE_VERSION - 1, "Left pane version correctly set");
 
   // Open Library, this will upgrade our left pane version.
-  openLibrary(onLibraryReady);
-}
+  let organizer = yield promiseLibrary();
+
+  // Check left pane.
+  ok(PlacesUIUtils.leftPaneFolderId > 0, "Left pane folder correctly created");
+  leftPaneItems =
+    PlacesUtils.annotations.getItemsWithAnnotation(PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
+  is(leftPaneItems.length, 1, "We correctly have only 1 left pane folder");
+  let leftPaneRoot = leftPaneItems[0];
+  is(leftPaneRoot, PlacesUIUtils.leftPaneFolderId,
+     "leftPaneFolderId getter has correct value");
+
+  // Check version has been upgraded.
+  version = PlacesUtils.annotations.getItemAnnotation(leftPaneRoot,
+                                                      PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
+  is(version, PlacesUIUtils.ORGANIZER_LEFTPANE_VERSION,
+     "Left pane version has been correctly upgraded");
+
+  // Check left pane is populated.
+  organizer.PlacesOrganizer.selectLeftPaneQuery("History");
+  is(organizer.PlacesOrganizer._places.selectedNode.itemId,
+     PlacesUIUtils.leftPaneQueries["History"],
+     "Library left pane is populated and working");
+
+  yield promiseLibraryClosed(organizer);
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_410196_paste_into_tags.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_410196_paste_into_tags.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_410196_paste_into_tags.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_410196_paste_into_tags.js	2015-02-28 15:03:01.000000000 +0000
@@ -2,139 +2,113 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-function add_bookmark(aURI) {
-  return PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                              aURI, PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                              "bookmark/" + aURI.spec);
-}
-
-Components.utils.import("resource://gre/modules/NetUtil.jsm");
+"use strict";
 
-const TEST_URL = "http://example.com/";
-const MOZURISPEC = "http://mozilla.com/";
+const TEST_URL = Services.io.newURI("http://example.com/", null, null);
+const MOZURISPEC = Services.io.newURI("http://mozilla.com/", null, null);
 
-let gLibrary;
-let PlacesOrganizer;
-let ContentTree;
-
-function test() {
-  waitForExplicitFinish();
-  gLibrary = openLibrary(onLibraryReady);
-}
+add_task(function* () {
+  let organizer = yield promiseLibrary();
 
-function onLibraryReady() {
   ok(PlacesUtils, "PlacesUtils in scope");
   ok(PlacesUIUtils, "PlacesUIUtils in scope");
 
-  PlacesOrganizer = gLibrary.PlacesOrganizer;
+  let PlacesOrganizer = organizer.PlacesOrganizer;
   ok(PlacesOrganizer, "Places organizer in scope");
 
-  ContentTree = gLibrary.ContentTree;
+  let ContentTree = organizer.ContentTree;
   ok(ContentTree, "ContentTree is in scope");
 
-  tests.makeHistVisit(function() {
-    tests.makeTag();
-    tests.focusTag();
-    waitForClipboard(function(aData) !!aData,
-                     tests.copyHistNode,
-                     onClipboardReady,
-                     PlacesUtils.TYPE_X_MOZ_PLACE);
+  let visits = {uri: MOZURISPEC, transition: PlacesUtils.history.TRANSITION_TYPED};
+  yield PlacesTestUtils.addVisits(visits);
+
+  // create an initial tag to work with
+  let bm = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    index: PlacesUtils.bookmarks.DEFAULT_INDEX,
+    type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+    title: "bookmark/" + TEST_URL.spec,
+    url: TEST_URL
   });
-}
 
-function onClipboardReady() {
-  tests.focusTag();
+  ok(bm, "A bookmark was added");
+  PlacesUtils.tagging.tagURI(TEST_URL, ["foo"]);
+  let tags = PlacesUtils.tagging.getTagsForURI(TEST_URL);
+  is(tags[0], "foo", "tag is foo");
+
+  // focus the new tag
+  focusTag(PlacesOrganizer);
+
+  let populate = () => copyHistNode(PlacesOrganizer, ContentTree);
+  yield promiseClipboard(populate, PlacesUtils.TYPE_X_MOZ_PLACE);
+
+  focusTag(PlacesOrganizer);
   PlacesOrganizer._places.controller.paste();
-  tests.historyNode();
-  tests.checkForBookmarkInUI();
 
-  gLibrary.close();
+  // re-focus the history again
+  PlacesOrganizer.selectLeftPaneQuery("History");
+  let histContainer = PlacesOrganizer._places.selectedNode;
+  PlacesUtils.asContainer(histContainer);
+  histContainer.containerOpen = true;
+  PlacesOrganizer._places.selectNode(histContainer.getChild(0));
+  let histNode = ContentTree.view.view.nodeForTreeIndex(0);
+  ok(histNode, "histNode exists: " + histNode.title);
+
+  // check to see if the history node is tagged!
+  tags = PlacesUtils.tagging.getTagsForURI(MOZURISPEC);
+  ok(tags.length == 1, "history node is tagged: " + tags.length);
+
+  // check if a bookmark was created
+  let bookmarks = [];
+  yield PlacesUtils.bookmarks.fetch({url: MOZURISPEC}, bm => {
+    bookmarks.push(bm);
+  });
+  ok(bookmarks.length > 0, "bookmark exists for the tagged history item");
+
+  // is the bookmark visible in the UI?
+  // get the Unsorted Bookmarks node
+  PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+
+  // now we can see what is in the ContentTree tree
+  let unsortedNode = ContentTree.view.view.nodeForTreeIndex(1);
+  ok(unsortedNode, "unsortedNode is not null: " + unsortedNode.uri);
+  is(unsortedNode.uri, MOZURISPEC.spec, "node uri's are the same");
+
+  yield promiseLibraryClosed(organizer);
 
   // Remove new Places data we created.
-  PlacesUtils.tagging.untagURI(NetUtil.newURI(MOZURISPEC), ["foo"]);
-  PlacesUtils.tagging.untagURI(NetUtil.newURI(TEST_URL), ["foo"]);
-  let tags = PlacesUtils.tagging.getTagsForURI(NetUtil.newURI(TEST_URL));
+  PlacesUtils.tagging.untagURI(MOZURISPEC, ["foo"]);
+  PlacesUtils.tagging.untagURI(TEST_URL, ["foo"]);
+  tags = PlacesUtils.tagging.getTagsForURI(TEST_URL);
   is(tags.length, 0, "tags are gone");
-  PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
 
-  PlacesTestUtils.clearHistory().then(finish);
+  yield PlacesUtils.bookmarks.eraseEverything();
+  yield PlacesTestUtils.clearHistory();
+});
+
+function focusTag(PlacesOrganizer) {
+  PlacesOrganizer.selectLeftPaneQuery("Tags");
+  let tags = PlacesOrganizer._places.selectedNode;
+  tags.containerOpen = true;
+  let fooTag = tags.getChild(0);
+  let tagNode = fooTag;
+  PlacesOrganizer._places.selectNode(fooTag);
+  is(tagNode.title, 'foo', "tagNode title is foo");
+  let ip = PlacesOrganizer._places.insertionPoint;
+  ok(ip.isTag, "IP is a tag");
 }
 
-let tests = {
-
-  makeHistVisit: function(aCallback) {
-    // need to add a history object
-    let testURI1 = NetUtil.newURI(MOZURISPEC);
-    isnot(testURI1, null, "testURI is not null");
-    PlacesTestUtils.addVisits(
-      {uri: testURI1, transition: PlacesUtils.history.TRANSITION_TYPED}
-      ).then(aCallback);
-  },
-
-  makeTag: function() {
-    // create an initial tag to work with
-    let bmId = add_bookmark(NetUtil.newURI(TEST_URL));
-    ok(bmId > 0, "A bookmark was added");
-    PlacesUtils.tagging.tagURI(NetUtil.newURI(TEST_URL), ["foo"]);
-    let tags = PlacesUtils.tagging.getTagsForURI(NetUtil.newURI(TEST_URL));
-    is(tags[0], 'foo', "tag is foo");
-  },
-
-  focusTag: function (){
-    // focus the new tag
-    PlacesOrganizer.selectLeftPaneQuery("Tags");
-    let tags = PlacesOrganizer._places.selectedNode;
-    tags.containerOpen = true;
-    let fooTag = tags.getChild(0);
-    let tagNode = fooTag;
-    PlacesOrganizer._places.selectNode(fooTag);
-    is(tagNode.title, 'foo', "tagNode title is foo");
-    let ip = PlacesOrganizer._places.insertionPoint;
-    ok(ip.isTag, "IP is a tag");
-  },
-
-  copyHistNode: function (){
-    // focus the history object
-    PlacesOrganizer.selectLeftPaneQuery("History");
-    let histContainer = PlacesOrganizer._places.selectedNode;
-    PlacesUtils.asContainer(histContainer);
-    histContainer.containerOpen = true;
-    PlacesOrganizer._places.selectNode(histContainer.getChild(0));
-    let histNode = ContentTree.view.view.nodeForTreeIndex(0);
-    ContentTree.view.selectNode(histNode);
-    is(histNode.uri, MOZURISPEC,
-       "historyNode exists: " + histNode.uri);
-    // copy the history node
-    ContentTree.view.controller.copy();
-  },
-
-  historyNode: function (){
-    // re-focus the history again
-    PlacesOrganizer.selectLeftPaneQuery("History");
-    let histContainer = PlacesOrganizer._places.selectedNode;
-    PlacesUtils.asContainer(histContainer);
-    histContainer.containerOpen = true;
-    PlacesOrganizer._places.selectNode(histContainer.getChild(0));
-    let histNode = ContentTree.view.view.nodeForTreeIndex(0);
-    ok(histNode, "histNode exists: " + histNode.title);
-    // check to see if the history node is tagged!
-    let tags = PlacesUtils.tagging.getTagsForURI(NetUtil.newURI(MOZURISPEC));
-    ok(tags.length == 1, "history node is tagged: " + tags.length);
-    // check if a bookmark was created
-    let isBookmarked = PlacesUtils.bookmarks.isBookmarked(NetUtil.newURI(MOZURISPEC));
-    is(isBookmarked, true, MOZURISPEC + " is bookmarked");
-    let bookmarkIds = PlacesUtils.bookmarks.getBookmarkIdsForURI(
-                        NetUtil.newURI(histNode.uri));
-    ok(bookmarkIds.length > 0, "bookmark exists for the tagged history item: " + bookmarkIds);
-  },
-
-  checkForBookmarkInUI: function(){
-    // is the bookmark visible in the UI?
-    // get the Unsorted Bookmarks node
-    PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
-    // now we can see what is in the ContentTree tree
-    let unsortedNode = ContentTree.view.view.nodeForTreeIndex(1);
-    ok(unsortedNode, "unsortedNode is not null: " + unsortedNode.uri);
-    is(unsortedNode.uri, MOZURISPEC, "node uri's are the same");
-  },
-};
+function copyHistNode(PlacesOrganizer, ContentTree) {
+  // focus the history object
+  PlacesOrganizer.selectLeftPaneQuery("History");
+  let histContainer = PlacesOrganizer._places.selectedNode;
+  PlacesUtils.asContainer(histContainer);
+  histContainer.containerOpen = true;
+  PlacesOrganizer._places.selectNode(histContainer.getChild(0));
+  let histNode = ContentTree.view.view.nodeForTreeIndex(0);
+  ContentTree.view.selectNode(histNode);
+  is(histNode.uri, MOZURISPEC.spec,
+     "historyNode exists: " + histNode.uri);
+  // copy the history node
+  ContentTree.view.controller.copy();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_416459_cut.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_416459_cut.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_416459_cut.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_416459_cut.js	2015-02-28 15:03:01.000000000 +0000
@@ -1,22 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
 
 const TEST_URL = "http://example.com/";
 
-let gLibrary;
-let gItemId;
-let PlacesOrganizer;
-let ContentTree;
-
-function test() {
-  waitForExplicitFinish();
-  gLibrary = openLibrary(onLibraryReady);
-}
-
-function onLibraryReady() {
-  PlacesOrganizer = gLibrary.PlacesOrganizer;
-  ContentTree = gLibrary.ContentTree;
+add_task(function* () {
+  let organizer = yield promiseLibrary();
+  let PlacesOrganizer = organizer.PlacesOrganizer;
+  let ContentTree = organizer.ContentTree;
 
   // Sanity checks.
   ok(PlacesUtils, "PlacesUtils in scope");
@@ -24,49 +16,44 @@
   ok(PlacesOrganizer, "PlacesOrganizer in scope");
   ok(ContentTree, "ContentTree is in scope");
 
-  gItemId = PlacesUtils.bookmarks.insertBookmark(
-    PlacesUtils.toolbarFolderId, NetUtil.newURI(TEST_URL),
-    PlacesUtils.bookmarks.DEFAULT_INDEX, "test"
-  );
-
-  selectBookmarkIn("BookmarksToolbar");
-
-  waitForClipboard(function(aData) !!aData,
-                   cutSelection,
-                   onClipboardReady,
-                   PlacesUtils.TYPE_X_MOZ_PLACE);
-}
+  let bm = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+    type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+    url: TEST_URL
+  });
+
+  yield selectBookmarkIn(organizer, bm, "BookmarksToolbar");
+
+  yield promiseClipboard(() => {
+    info("Cutting selection");
+    ContentTree.view.controller.cut();
+  }, PlacesUtils.TYPE_X_MOZ_PLACE);
+
+  info("Selecting UnfiledBookmarks in the left pane");
+  PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  info("Pasting clipboard");
+  ContentTree.view.controller.paste();
+
+  yield selectBookmarkIn(organizer, bm, "UnfiledBookmarks");
+
+  yield promiseLibraryClosed(organizer);
+  yield PlacesUtils.bookmarks.eraseEverything();
+});
+
+let selectBookmarkIn = Task.async(function* (organizer, bm, aLeftPaneQuery) {
+  let PlacesOrganizer = organizer.PlacesOrganizer;
+  let ContentTree = organizer.ContentTree;
 
-function selectBookmarkIn(aLeftPaneQuery) {
   info("Selecting " + aLeftPaneQuery + " in the left pane");
   PlacesOrganizer.selectLeftPaneQuery(aLeftPaneQuery);
   let rootId = PlacesUtils.getConcreteItemId(PlacesOrganizer._places.selectedNode);
-  is(PlacesUtils.bookmarks.getFolderIdForItem(gItemId), rootId,
+
+  bm = yield PlacesUtils.bookmarks.fetch(bm.guid);
+  is((yield PlacesUtils.promiseItemId(bm.parentGuid)), rootId,
      "Bookmark has the right parent");
+
   info("Selecting the bookmark in the right pane");
-  ContentTree.view.selectItems([gItemId]);
+  ContentTree.view.selectItems([yield PlacesUtils.promiseItemId(bm.guid)]);
   let bookmarkNode = ContentTree.view.selectedNode;
   is(bookmarkNode.uri, TEST_URL, "Found the expected bookmark");
-}
-
-function cutSelection() {
-  info("Cutting selection");
-  ContentTree.view.controller.cut();
-}
-
-function pasteClipboard(aLeftPaneQuery) {
-  info("Selecting " + aLeftPaneQuery + " in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery(aLeftPaneQuery);
-  info("Pasting clipboard");
-  ContentTree.view.controller.paste();
-}
-
-function onClipboardReady() {
-  pasteClipboard("UnfiledBookmarks");
-  selectBookmarkIn("UnfiledBookmarks");
-
-  // Cleanup.
-  gLibrary.close();
-  PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
-  finish();
-}
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_425884.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_425884.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_425884.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_425884.js	2015-02-28 15:03:01.000000000 +0000
@@ -1,54 +1,66 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-function test() {
-  // sanity check
-  ok(PlacesUtils, "checking PlacesUtils, running in chrome context?");
-  ok(PlacesUIUtils, "checking PlacesUIUtils, running in chrome context?");
+"use strict";
 
-  /*
-   Deep copy of bookmark data, using the front-end codepath:
+/*
+ Deep copy of bookmark data, using the front-end codepath:
 
-   - create test folder A
-   - add a subfolder to folder A, and add items to it
-   - validate folder A (sanity check)
-   - copy folder A, creating new folder B, using the front-end path
-   - validate folder B
-   - undo copy transaction
-   - validate folder B (empty)
-   - redo copy transaction
-   - validate folder B's contents
+ - create test folder A
+ - add a subfolder to folder A, and add items to it
+ - validate folder A (sanity check)
+ - copy folder A, creating new folder B, using the front-end path
+ - validate folder B
+ - undo copy transaction
+ - validate folder B (empty)
+ - redo copy transaction
+ - validate folder B's contents
+*/
 
-  */
+add_task(function* () {
+  // sanity check
+  ok(PlacesUtils, "checking PlacesUtils, running in chrome context?");
+  ok(PlacesUIUtils, "checking PlacesUIUtils, running in chrome context?");
 
-  var toolbarId = PlacesUtils.toolbarFolderId;
-  var toolbarNode = PlacesUtils.getFolderContents(toolbarId).root;
+  let toolbarId = PlacesUtils.toolbarFolderId;
+  let toolbarNode = PlacesUtils.getFolderContents(toolbarId).root;
 
-  var oldCount = toolbarNode.childCount;
-  var testRootId = PlacesUtils.bookmarks.createFolder(toolbarId, "test root", -1);
+  let oldCount = toolbarNode.childCount;
+  let testRoot = yield PlacesUtils.bookmarks.insert({
+    parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+    type: PlacesUtils.bookmarks.TYPE_FOLDER,
+    title: "test root"
+  });
   is(toolbarNode.childCount, oldCount+1, "confirm test root node is a container, and is empty");
-  var testRootNode = toolbarNode.getChild(toolbarNode.childCount-1);
+
+  let testRootNode = toolbarNode.getChild(toolbarNode.childCount-1);
   testRootNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
   testRootNode.containerOpen = true;
   is(testRootNode.childCount, 0, "confirm test root node is a container, and is empty");
 
   // create folder A, fill it, validate its contents
-  var folderAId = PlacesUtils.bookmarks.createFolder(testRootId, "A", -1);
-  populate(folderAId);
-  var folderANode = PlacesUtils.getFolderContents(folderAId).root;
+  let folderA = yield PlacesUtils.bookmarks.insert({
+    type: PlacesUtils.bookmarks.TYPE_FOLDER,
+    parentGuid: testRoot.guid,
+    title: "A"
+  });
+
+  yield populate(folderA);
+
+  let folderAId = yield PlacesUtils.promiseItemId(folderA.guid);
+  let folderANode = PlacesUtils.getFolderContents(folderAId).root;
   validate(folderANode);
   is(testRootNode.childCount, 1, "create test folder");
 
   // copy it, using the front-end helper functions
-  var serializedNode = PlacesUtils.wrapNode(folderANode, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER);
-  var rawNode = PlacesUtils.unwrapNodes(serializedNode, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER).shift();
+  let serializedNode = PlacesUtils.wrapNode(folderANode, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER);
+  let rawNode = PlacesUtils.unwrapNodes(serializedNode, PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER).shift();
   // confirm serialization
   ok(rawNode.type, "confirm json node");
   folderANode.containerOpen = false;
 
-  var transaction = PlacesUIUtils.makeTransaction(rawNode,
+  let testRootId = yield PlacesUtils.promiseItemId(testRoot.guid);
+  let transaction = PlacesUIUtils.makeTransaction(rawNode,
                                                   PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER,
                                                   testRootId,
                                                   -1,
@@ -59,7 +71,7 @@
   is(testRootNode.childCount, 2, "create test folder via copy");
 
   // validate the copy
-  var folderBNode = testRootNode.getChild(1);
+  let folderBNode = testRootNode.getChild(1);
   validate(folderBNode);
 
   // undo the transaction, confirm the removal
@@ -78,14 +90,28 @@
 
   // clean up
   PlacesUtils.transactionManager.undoTransaction();
-  PlacesUtils.bookmarks.removeItem(folderAId);
-}
+  yield PlacesUtils.bookmarks.remove(folderA.guid);
+});
 
-function populate(aFolderId) {
-  var folderId = PlacesUtils.bookmarks.createFolder(aFolderId, "test folder", -1);
-  PlacesUtils.bookmarks.insertBookmark(folderId, PlacesUtils._uri("http://foo"), -1, "test bookmark");
-  PlacesUtils.bookmarks.insertSeparator(folderId, -1);
-}
+let populate = Task.async(function* (parentFolder) {
+  let folder = yield PlacesUtils.bookmarks.insert({
+    type: PlacesUtils.bookmarks.TYPE_FOLDER,
+    parentGuid: parentFolder.guid,
+    title: "test folder"
+  });
+
+  yield PlacesUtils.bookmarks.insert({
+    type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+    parentGuid: folder.guid,
+    title: "test bookmark",
+    url: "http://foo"
+  });
+
+  yield PlacesUtils.bookmarks.insert({
+    type: PlacesUtils.bookmarks.TYPE_SEPARATOR,
+    parentGuid: folder.guid
+  });
+});
 
 function validate(aNode) {
   PlacesUtils.asContainer(aNode);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_555547.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_555547.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_555547.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_555547.js	2015-02-28 15:03:01.000000000 +0000
@@ -16,7 +16,9 @@
   }
 
   let sidebar = yield promiseLoadedSidebar("viewBookmarksSidebar");
-  registerCleanupFunction(toggleSidebar);
+  registerCleanupFunction(() => {
+    SidebarUI.hide();
+  });
 
   // Focus the tree and check if its controller is returned.
   let tree = sidebar.contentDocument.getElementById("bookmarks-view");
@@ -59,6 +61,6 @@
       resolve(sidebar);
     }, true);
 
-    toggleSidebar(cmd, true);
+    SidebarUI.show(cmd);
   });
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_bookmarksProperties.js	2015-02-28 15:03:01.000000000 +0000
@@ -79,7 +79,7 @@
   finish: function() {
     // Close window, toggle sidebar and goto next test.
     this.window.document.documentElement.cancelDialog();
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -138,7 +138,7 @@
 
   finish: function() {
     this.window.document.documentElement.cancelDialog();
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -232,7 +232,7 @@
   },
 
   finish: function() {
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -291,7 +291,7 @@
 
   finish: function() {
     // Window is already closed.
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -390,7 +390,7 @@
   },
 
   finish: function() {
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -468,7 +468,7 @@
   },
 
   finish: function() {
-    toggleSidebar(this.sidebar, false);
+    SidebarUI.hide();
     runNextTest();
   },
 
@@ -529,7 +529,7 @@
       // Need to executeSoon since the tree is initialized on sidebar load.
       executeSoon(open_properties_dialog);
     }, true);
-    toggleSidebar(gCurrentTest.sidebar, true);
+    SidebarUI.show(gCurrentTest.sidebar);
 }
 
 function open_properties_dialog() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_forgetthissite_single.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_forgetthissite_single.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_forgetthissite_single.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_forgetthissite_single.js	2015-02-28 15:03:01.000000000 +0000
@@ -2,69 +2,77 @@
  * License, v. 2.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 TEST_URIs = [
+  "http://www.mozilla.org/test1",
+  "http://www.mozilla.org/test2"
+];
+
 // This test makes sure that the Forget This Site command is hidden for multiple
 // selections.
-function test() {
-  // initialization
-  waitForExplicitFinish();
-
+add_task(function* () {
   // Add a history entry.
-  let TEST_URIs = ["http://www.mozilla.org/test1", "http://www.mozilla.org/test2"];
   ok(PlacesUtils, "checking PlacesUtils, running in chrome context?");
+
   let places = [];
-  TEST_URIs.forEach(function(TEST_URI) {
-    places.push({uri: PlacesUtils._uri(TEST_URI),
-                 transition: PlacesUtils.history.TRANSITION_TYPED});
-  });
-  PlacesTestUtils.addVisits(places).then(() => {
-    testForgetThisSiteVisibility(1, function() {
-      testForgetThisSiteVisibility(2, function() {
-        // Cleanup
-        PlacesTestUtils.clearHistory().then(finish);
-      });
-    });
-  });
+  let transition = PlacesUtils.history.TRANSITION_TYPED;
+  TEST_URIs.forEach(uri => places.push({uri: PlacesUtils._uri(uri), transition}));
+
+  yield PlacesTestUtils.addVisits(places);
+  yield testForgetThisSiteVisibility(1);
+  yield testForgetThisSiteVisibility(2);
+
+  // Cleanup.
+  yield PlacesTestUtils.clearHistory();
+});
+
+let testForgetThisSiteVisibility = Task.async(function* (selectionCount) {
+  let organizer = yield promiseLibrary();
 
-  function testForgetThisSiteVisibility(selectionCount, funcNext) {
-    openLibrary(function (organizer) {
-          // Select History in the left pane.
-          organizer.PlacesOrganizer.selectLeftPaneQuery('History');
-          let PO = organizer.PlacesOrganizer;
-          let histContainer = PO._places.selectedNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
-          histContainer.containerOpen = true;
-          PO._places.selectNode(histContainer.getChild(0));
-          // Select the first history entry.
-          let doc = organizer.document;
-          let tree = PO._content;
-          let selection = tree.view.selection;
-          selection.clearSelection();
-          selection.rangedSelect(0, selectionCount - 1, true);
-          is(selection.count, selectionCount,
-            "The selected range is as big as expected");
-          // Open the context menu
-          let contextmenu = doc.getElementById("placesContext");
-          contextmenu.addEventListener("popupshown", function() {
-            contextmenu.removeEventListener("popupshown", arguments.callee, true);
-            let forgetThisSite = doc.getElementById("placesContext_deleteHost");
-            let hideForgetThisSite = (selectionCount != 1);
-            is(forgetThisSite.hidden, hideForgetThisSite,
-              "The Forget this site menu item should " + (hideForgetThisSite ? "" : "not ") +
-              "be hidden with " + selectionCount + " items selected");
-            // Close the context menu
-            contextmenu.hidePopup();
-            // Wait for the Organizer window to actually be closed
-            organizer.addEventListener("unload", function () {
-              organizer.removeEventListener("unload", arguments.callee, false);
-              // Proceed
-              funcNext();
-            }, false);
-            // Close Library window.
-            organizer.close();
-          }, true);
-          // Get cell coordinates
-          var rect = tree.treeBoxObject.getCoordsForCellItem(0, tree.columns[0], "text");
-          // Initiate a context menu for the selected cell
-          EventUtils.synthesizeMouse(tree.body, rect.x + rect.width / 2, rect.y + rect.height / 2, {type: "contextmenu"}, organizer);
-    });
-  }
+  // Select History in the left pane.
+  organizer.PlacesOrganizer.selectLeftPaneQuery("History");
+  let PO = organizer.PlacesOrganizer;
+  let histContainer = PO._places.selectedNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
+  histContainer.containerOpen = true;
+  PO._places.selectNode(histContainer.getChild(0));
+
+  // Select the first history entry.
+  let doc = organizer.document;
+  let tree = doc.getElementById("placeContent");
+  let selection = tree.view.selection;
+  selection.clearSelection();
+  selection.rangedSelect(0, selectionCount - 1, true);
+  is(selection.count, selectionCount, "The selected range is as big as expected");
+
+  // Open the context menu.
+  let contextmenu = doc.getElementById("placesContext");
+  let popupShown = promisePopupShown(contextmenu);
+
+  // Get cell coordinates.
+  let rect = tree.treeBoxObject.getCoordsForCellItem(0, tree.columns[0], "text");
+  // Initiate a context menu for the selected cell.
+  EventUtils.synthesizeMouse(tree.body, rect.x + rect.width / 2, rect.y + rect.height / 2, {type: "contextmenu", button: 2}, organizer);
+  yield popupShown;
+
+  let forgetThisSite = doc.getElementById("placesContext_deleteHost");
+  let hideForgetThisSite = (selectionCount != 1);
+  is(forgetThisSite.hidden, hideForgetThisSite,
+    `The Forget this site menu item should ${hideForgetThisSite ? "" : "not "}` +
+    ` be hidden with ${selectionCount} items selected`);
+
+  // Close the context menu.
+  contextmenu.hidePopup();
+
+  // Close the library window.
+  yield promiseLibraryClosed(organizer);
+});
+
+function promisePopupShown(popup) {
+  return new Promise(resolve => {
+    popup.addEventListener("popupshown", function onShown() {
+      popup.removeEventListener("popupshown", onShown, true);
+      resolve();
+    }, true);
+  });
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_history_sidebar_search.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_history_sidebar_search.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_history_sidebar_search.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_history_sidebar_search.js	2015-02-28 15:03:01.000000000 +0000
@@ -44,7 +44,7 @@
                  transition: hs.TRANSITION_TYPED});
   }
   PlacesTestUtils.addVisits(places).then(() => {
-    toggleSidebar("viewHistorySidebar", true);
+    SidebarUI.show("viewHistorySidebar");
   });
 
   sidebar.addEventListener("load", function() {
@@ -63,7 +63,7 @@
       check_sidebar_tree_order(pages.length);
 
       // Cleanup.
-      toggleSidebar("viewHistorySidebar", false);
+      SidebarUI.hide();
       PlacesTestUtils.clearHistory().then(finish);
     });
   }, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser.ini	2015-02-28 15:03:01.000000000 +0000
@@ -29,9 +29,6 @@
 skip-if = e10s
 
 [browser_forgetthissite_single.js]
-# disabled for very frequent oranges - bug 551540
-skip-if = true
-
 [browser_library_commands.js]
 [browser_drag_bookmarks_on_toolbar.js]
 skip-if = e10s # Bug ?????? - test fails - "Number of dragged items should be the same. - Got 0, expected 1"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_sidebarpanels_click.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_sidebarpanels_click.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_sidebarpanels_click.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_sidebarpanels_click.js	2015-02-28 15:03:01.000000000 +0000
@@ -18,7 +18,7 @@
   // If a sidebar is already open, close it.
   if (!document.getElementById("sidebar-box").hidden) {
     info("Unexpected sidebar found - a previous test failed to cleanup correctly");
-    toggleSidebar();
+    SidebarUI.hide();
   }
 
   let sidebar = document.getElementById("sidebar");
@@ -76,7 +76,7 @@
 
   function testPlacesPanel(preFunc, postFunc) {
     currentTest.init(function() {
-      toggleSidebar(currentTest.sidebarName);
+      SidebarUI.show(currentTest.sidebarName);
     });
 
     sidebar.addEventListener("load", function() {
@@ -95,7 +95,7 @@
           aSubject.Dialog.ui.button0.click();
 
           executeSoon(function () {
-              toggleSidebar(currentTest.sidebarName);
+              SidebarUI.hide();
               currentTest.cleanup(postFunc);
             });
         }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_views_liveupdate.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_views_liveupdate.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/browser_views_liveupdate.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/browser_views_liveupdate.js	2015-02-28 15:03:01.000000000 +0000
@@ -37,7 +37,7 @@
     // Need to executeSoon since the tree is initialized on sidebar load.
     executeSoon(startTest);
   }, true);
-  toggleSidebar("viewBookmarksSidebar", true);
+  SidebarUI.show("viewBookmarksSidebar");
 }
 
 /**
@@ -171,7 +171,7 @@
  */
 function finishTest() {
   // Close bookmarks sidebar.
-  toggleSidebar("viewBookmarksSidebar", false);
+  SidebarUI.hide();
 
   // Collapse the personal toolbar if needed.
   if (wasCollapsed) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/places/tests/browser/head.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/places/tests/browser/head.js	2015-02-28 15:03:01.000000000 +0000
@@ -43,17 +43,31 @@
  *        Hierarchy to open and select in the left pane.
  */
 function promiseLibrary(aLeftPaneRoot) {
-  let deferred = Promise.defer();
-  let library = Services.wm.getMostRecentWindow("Places:Organizer");
-  if (library && !library.closed) {
-    if (aLeftPaneRoot)
-      library.PlacesOrganizer.selectLeftPaneContainerByHierarchy(aLeftPaneRoot);
-    deferred.resolve(library);
-  }
-  else {
-    openLibrary(aLibrary => deferred.resolve(aLibrary), aLeftPaneRoot);
-  }
-  return deferred.promise;
+  return new Promise(resolve => {
+    let library = Services.wm.getMostRecentWindow("Places:Organizer");
+    if (library && !library.closed) {
+      if (aLeftPaneRoot) {
+        library.PlacesOrganizer.selectLeftPaneContainerByHierarchy(aLeftPaneRoot);
+      }
+      resolve(library);
+    }
+    else {
+      openLibrary(resolve, aLeftPaneRoot);
+    }
+  });
+}
+
+function promiseLibraryClosed(organizer) {
+  return new Promise(resolve => {
+    // Wait for the Organizer window to actually be closed
+    organizer.addEventListener("unload", function onUnload() {
+      organizer.removeEventListener("unload", onUnload);
+      resolve();
+    });
+
+    // Close Library window.
+    organizer.close();
+  });
 }
 
 /**
@@ -67,12 +81,9 @@
  *        Data flavor to expect.
  */
 function promiseClipboard(aPopulateClipboardFn, aFlavor) {
-  let deferred = Promise.defer();
-  waitForClipboard(function (aData) !!aData,
-                   aPopulateClipboardFn,
-                   function () { deferred.resolve(); },
-                   aFlavor);
-  return deferred.promise;
+  return new Promise(resolve => {
+    waitForClipboard(data => !!data, aPopulateClipboardFn, resolve, aFlavor);
+  });
 }
 
 /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/advanced.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/advanced.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/advanced.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/advanced.js	2015-02-28 15:03:01.000000000 +0000
@@ -234,6 +234,24 @@
 #endif
   },
 
+  /**
+   * Set the status of the telemetry controls based on the input argument.
+   * @param {Boolean} aEnabled False disables the controls, true enables them.
+   */
+  setTelemetrySectionEnabled: function (aEnabled)
+  {
+#ifdef MOZ_TELEMETRY_REPORTING
+    // If FHR is disabled, additional data sharing should be disabled as well.
+    let disabled = !aEnabled;
+    document.getElementById("submitTelemetryBox").disabled = disabled;
+    if (disabled) {
+      // If we disable FHR, untick the telemetry checkbox.
+      document.getElementById("submitTelemetryBox").checked = false;
+    }
+    document.getElementById("telemetryDataDesc").disabled = disabled;
+#endif
+  },
+
 #ifdef MOZ_SERVICES_HEALTHREPORT
   /**
    * Initialize the health report service reference and checkbox.
@@ -254,6 +272,7 @@
     }
 
     checkbox.checked = policy.healthReportUploadEnabled;
+    this.setTelemetrySectionEnabled(checkbox.checked);
   },
 
   /**
@@ -272,6 +291,7 @@
     let checkbox = document.getElementById("submitHealthReportBox");
     policy.recordHealthReportUploadEnabled(checkbox.checked,
                                            "Checkbox from preferences pane");
+    this.setTelemetrySectionEnabled(checkbox.checked);
   },
 #endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/advanced.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/advanced.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/advanced.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/advanced.xul	2015-02-28 15:03:01.000000000 +0000
@@ -167,51 +167,50 @@
 #ifdef MOZ_DATA_REPORTING
         <!-- Data Choices -->
         <tabpanel id="dataChoicesPanel" orient="vertical">
-#ifdef MOZ_TELEMETRY_REPORTING
-          <groupbox>
-            <caption label="&telemetrySection.label;"/>
-            <description>&telemetryDesc.label;</description>
-            <hbox>
-              <checkbox id="submitTelemetryBox"
-                        preference="toolkit.telemetry.enabled"
-                        label="&enableTelemetry.label;"
-                        accesskey="&enableTelemetry.accesskey;"/>
-              <spacer flex="1"/>
-              <label id="telemetryLearnMore"
-                     class="text-link"
-                     value="&telemetryLearnMore.label;"
-                     onclick="gAdvancedPane.openTextLink(event)"/>
-            </hbox>
-          </groupbox>
-#endif
 #ifdef MOZ_SERVICES_HEALTHREPORT
           <groupbox>
-            <caption label="&healthReportSection.label;"/>
-            <description>&healthReportDesc.label;</description>
-            <hbox>
-              <checkbox id="submitHealthReportBox"
+            <caption>
+              <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
                         oncommand="gAdvancedPane.updateSubmitHealthReport();"
-                        label="&enableHealthReport.label;"
                         accesskey="&enableHealthReport.accesskey;"/>
-              <spacer flex="1"/>
-              <label id="FHRLearnMore"
-                     class="text-link"
-                     value="&healthReportLearnMore.label;"
-                     onclick="gAdvancedPane.openTextLink(event)"/>
-            </hbox>
+            </caption>
+            <vbox>
+              <hbox class="indent">
+                <label flex="1">&healthReportDesc.label;</label>
+                <spacer flex="10"/>
+                <label id="FHRLearnMore" class="text-link"
+                       value="&healthReportLearnMore.label;"
+                       onclick="gAdvancedPane.openTextLink(event)"/>
+              </hbox>
+#ifdef MOZ_TELEMETRY_REPORTING
+              <hbox class="indent">
+                <vbox flex="1">
+                  <checkbox id="submitTelemetryBox" label="&enableTelemetryData.label;"
+                            preference="toolkit.telemetry.enabled"
+                            accesskey="&enableTelemetryData.accesskey;"/>
+                  <hbox class="indent">
+                    <label id="telemetryDataDesc" flex="1">&telemetryDesc.label;</label>
+                    <spacer flex="10"/>
+                    <label id="telemetryLearnMore" class="text-link"
+                           value="&telemetryLearnMore.label;"
+                           onclick="gAdvancedPane.openTextLink(event)"/>
+                  </hbox>
+                </vbox>
+              </hbox>
+#endif
+            </vbox>
           </groupbox>
 #endif
 #ifdef MOZ_CRASHREPORTER
           <groupbox>
-            <caption label="&crashReporterSection.label;"/>
-            <description>&crashReporterDesc.label;</description>
-            <hbox>
-              <checkbox id="submitCrashesBox"
+            <caption>
+              <checkbox id="submitCrashesBox" label="&enableCrashReporter.label;"
                         oncommand="gAdvancedPane.updateSubmitCrashes();"
-                        label="&enableCrashReporter.label;"
                         accesskey="&enableCrashReporter.accesskey;"/>
-
-              <spacer flex="1"/>
+            </caption>
+            <hbox class="indent">
+              <label flex="1">&crashReporterDesc.label;</label>
+              <spacer flex="10"/>
               <label id="crashReporterLearnMore"
                      class="text-link"
                      value="&crashReporterLearnMore.label;"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/fonts.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/fonts.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/fonts.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/fonts.js	2015-02-28 15:03:01.000000000 +0000
@@ -108,6 +108,37 @@
   {
     var useDocumentFonts = document.getElementById("useDocumentFonts");
     return useDocumentFonts.checked ? 1 : 0;
-  }
+  },
+
+  onBeforeAccept: function ()
+  {
+    // Only care in in-content prefs
+    if (!window.frameElement) {
+      return true;
+    }
+
+    let preferences = document.querySelectorAll("preference[id*='font.minimum-size']");
+    // It would be good if we could avoid touching languages the pref pages won't use, but
+    // unfortunately the language group APIs (deducing language groups from language codes)
+    // are C++ - only. So we just check all the things the user touched:
+    // Don't care about anything up to 24px, or if this value is the same as set previously:
+    preferences = Array.filter(preferences, prefEl => {
+      return prefEl.value > 24 && prefEl.value != prefEl.valueFromPreferences;
+    });
+    if (!preferences.length) {
+      return;
+    }
+
+    let strings = document.getElementById("bundlePreferences");
+    let title = strings.getString("veryLargeMinimumFontTitle");
+    let confirmLabel = strings.getString("acceptVeryLargeMinimumFont");
+    let warningMessage = strings.getString("veryLargeMinimumFontWarning");
+    let {Services} = Components.utils.import("resource://gre/modules/Services.jsm", {});
+    let flags = Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL |
+                Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING |
+                Services.prompt.BUTTON_POS_1_DEFAULT;
+    let buttonChosen = Services.prompt.confirmEx(window, title, warningMessage, flags, confirmLabel, null, "", "", {});
+    return buttonChosen == 0;
+  },
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/fonts.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/fonts.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/fonts.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/fonts.xul	2015-02-28 15:03:01.000000000 +0000
@@ -17,6 +17,7 @@
             title="&fontsDialog.title;"
             dlgbuttons="accept,cancel,help"
             ondialoghelp="openPrefsHelp()"
+            onbeforeaccept="return gFontsDialog.onBeforeAccept();"
             style="">
 
   <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/advanced.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/advanced.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/advanced.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/advanced.js	2015-02-28 15:03:01.000000000 +0000
@@ -263,6 +263,24 @@
 #endif
   },
 
+  /**
+   * Set the status of the telemetry controls based on the input argument.
+   * @param {Boolean} aEnabled False disables the controls, true enables them.
+   */
+  setTelemetrySectionEnabled: function (aEnabled)
+  {
+#ifdef MOZ_TELEMETRY_REPORTING
+    // If FHR is disabled, additional data sharing should be disabled as well.
+    let disabled = !aEnabled;
+    document.getElementById("submitTelemetryBox").disabled = disabled;
+    if (disabled) {
+      // If we disable FHR, untick the telemetry checkbox.
+      document.getElementById("submitTelemetryBox").checked = false;
+    }
+    document.getElementById("telemetryDataDesc").disabled = disabled;
+#endif
+  },
+
 #ifdef MOZ_SERVICES_HEALTHREPORT
   /**
    * Initialize the health report service reference and checkbox.
@@ -283,6 +301,7 @@
     }
 
     checkbox.checked = policy.healthReportUploadEnabled;
+    this.setTelemetrySectionEnabled(checkbox.checked);
   },
 
   /**
@@ -301,6 +320,7 @@
     let checkbox = document.getElementById("submitHealthReportBox");
     policy.recordHealthReportUploadEnabled(checkbox.checked,
                                            "Checkbox from preferences pane");
+    this.setTelemetrySectionEnabled(checkbox.checked);
   },
 #endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/advanced.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/advanced.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/advanced.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/advanced.xul	2015-02-28 15:03:01.000000000 +0000
@@ -192,45 +192,48 @@
 #ifdef MOZ_DATA_REPORTING
     <!-- Data Choices -->
     <tabpanel id="dataChoicesPanel" orient="vertical">
-#ifdef MOZ_TELEMETRY_REPORTING
-      <groupbox>
-        <caption><label>&telemetrySection.label;</label></caption>
-        <description>&telemetryDesc.label;</description>
-        <hbox>
-          <checkbox id="submitTelemetryBox"
-                    preference="toolkit.telemetry.enabled"
-                    label="&enableTelemetry.label;"
-                    accesskey="&enableTelemetry.accesskey;"/>
-          <spacer flex="1"/>
-          <label id="telemetryLearnMore"
-                 class="text-link">&telemetryLearnMore.label;</label>
-        </hbox>
-      </groupbox>
-#endif
 #ifdef MOZ_SERVICES_HEALTHREPORT
       <groupbox>
-        <caption><label>&healthReportSection.label;</label></caption>
-        <description>&healthReportDesc.label;</description>
-        <hbox>
-          <checkbox id="submitHealthReportBox"
-                    label="&enableHealthReport.label;"
+        <caption>
+          <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
                     accesskey="&enableHealthReport.accesskey;"/>
-          <spacer flex="1"/>
-          <label id="FHRLearnMore"
-                 class="text-link">&healthReportLearnMore.label;</label>
-        </hbox>
+        </caption>
+        <vbox>
+          <hbox class="indent">
+            <label flex="1">&healthReportDesc.label;</label>
+            <spacer flex="10"/>
+            <label id="FHRLearnMore"
+                   class="text-link">&healthReportLearnMore.label;</label>
+          </hbox>
+#ifdef MOZ_TELEMETRY_REPORTING
+          <hbox class="indent">
+            <groupbox flex="1">
+              <caption>
+                <checkbox id="submitTelemetryBox" preference="toolkit.telemetry.enabled"
+                          label="&enableTelemetryData.label;"
+                          accesskey="&enableTelemetryData.accesskey;"/>
+              </caption>
+              <hbox class="indent">
+                <label id="telemetryDataDesc" flex="1">&telemetryDesc.label;</label>
+                <spacer flex="10"/>
+                <label id="telemetryLearnMore"
+                       class="text-link">&telemetryLearnMore.label;</label>
+              </hbox>
+            </groupbox>
+          </hbox>
+#endif
+        </vbox>
       </groupbox>
 #endif
 #ifdef MOZ_CRASHREPORTER
       <groupbox>
-        <caption><label>&crashReporterSection.label;</label></caption>
-        <description>&crashReporterDesc.label;</description>
-        <hbox>
-          <checkbox id="submitCrashesBox"
-                    label="&enableCrashReporter.label;"
+        <caption>
+          <checkbox id="submitCrashesBox" label="&enableCrashReporter.label;"
                     accesskey="&enableCrashReporter.accesskey;"/>
-
-          <spacer flex="1"/>
+        </caption>
+        <hbox class="indent">
+          <label flex="1">&crashReporterDesc.label;</label>
+          <spacer flex="10"/>
           <label id="crashReporterLearnMore"
                  class="text-link">&crashReporterLearnMore.label;</label>
         </hbox>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/search.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/search.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/search.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/search.js	2015-02-28 15:03:01.000000000 +0000
@@ -29,6 +29,7 @@
     window.addEventListener("dragstart", this, false);
     window.addEventListener("keypress", this, false);
     window.addEventListener("select", this, false);
+    window.addEventListener("blur", this, true);
 
     Services.obs.addObserver(this, "browser-search-engine-modified", false);
     window.addEventListener("unload", () => {
@@ -109,6 +110,12 @@
           gSearchPane.onTreeSelect();
         }
         break;
+      case "blur":
+        if (aEvent.target.id == "engineList" &&
+            aEvent.target.inputField == document.getBindingParent(aEvent.originalTarget)) {
+          gSearchPane.onInputBlur();
+        }
+        break;
     }
   },
 
@@ -134,6 +141,11 @@
     }
   },
 
+  onInputBlur: function() {
+    let tree = document.getElementById("engineList");
+    tree.stopEditing(false);
+  },
+
   onTreeSelect: function() {
     document.getElementById("removeEngineButton").disabled =
       gEngineView.selectedIndex == -1 || gEngineView.lastIndex == 0;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/subdialogs.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/subdialogs.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/subdialogs.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/subdialogs.js	2015-02-28 15:03:01.000000000 +0000
@@ -37,12 +37,6 @@
     // Wait for the stylesheets injected during DOMContentLoaded to load before showing the dialog
     // otherwise there is a flicker of the stylesheet applying.
     this._frame.addEventListener("load", this._onLoad.bind(this));
-
-    chromeBrowser.addEventListener("unload", function(aEvent) {
-      if (aEvent.target.location.href != "about:blank") {
-        this.close();
-      }
-    }.bind(this), true);
   },
 
   uninit: function() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser_change_app_handler.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser_change_app_handler.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser_change_app_handler.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser_change_app_handler.js	2015-02-28 15:03:01.000000000 +0000
@@ -1,6 +1,8 @@
 let gMimeSvc = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);
 let gHandlerSvc = Cc["@mozilla.org/uriloader/handler-service;1"].getService(Ci.nsIHandlerService);
 
+Services.prefs.setBoolPref("browser.preferences.inContent", true);
+
 function setupFakeHandler() {
   let info = gMimeSvc.getFromTypeAndExtension("text/plain", "foo.txt");
   ok(info.possibleLocalHandlers.length, "Should have at least one known handler");
@@ -92,5 +94,6 @@
 registerCleanupFunction(function() {
   let infoToModify = gMimeSvc.getFromTypeAndExtension("text/x-test-handler", null);
   gHandlerSvc.remove(infoToModify);
+  Services.prefs.clearUserPref("browser.preferences.inContent");
 });
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser.ini	2015-02-28 15:03:01.000000000 +0000
@@ -26,3 +26,6 @@
 [browser_subdialogs.js]
 skip-if = e10s # Bug 1087114
 support-files = subdialog.xul
+[browser_telemetry.js]
+# Skip this test on Android and B2G as FHR and Telemetry are separate systems there.
+skip-if = !healthreport || !telemetry || (os == 'linux' && debug) || (os == 'android') || (os == 'b2g')
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser_subdialogs.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser_subdialogs.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser_subdialogs.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser_subdialogs.js	2015-02-28 15:03:01.000000000 +0000
@@ -76,7 +76,7 @@
     dialog.document.documentElement.cancelDialog();
 
     let closingEvent = yield closingPromise;
-    ise(closingEvent.detail.button, "cancel", "closing event should indicate button was 'cancel'");
+    ise(closingEvent.detail.button, "cancel", "closing event should indicate button was 'accept'");
 
     yield deferredClose.promise;
     ise(rv.acceptCount, 0, "return value should NOT have been updated");
@@ -116,26 +116,6 @@
 
     yield deferredClose.promise;
     ise(rv.acceptCount, 0, "return value should NOT have been updated");
-  },
-},
-{
-  desc: "Check that 'back' navigation will close the dialog",
-  run: function* () {
-    let rv = { acceptCount: 0 };
-    let deferredClose = Promise.defer();
-    let dialogPromise = openAndLoadSubDialog(gDialogURL, null, rv,
-                                             (aEvent) => dialogClosingCallback(deferredClose, aEvent));
-    let dialog = yield dialogPromise;
-
-    // XXX Without the call to promiseDialogClosing the test causes
-    //     intermittent failures in browser_change_app_handler.js.
-    let unusedClosingPromise = promiseDialogClosing(dialog);
-
-    info("cancelling the dialog");
-    content.gSubDialog._frame.goBack();
-
-    yield deferredClose.promise;
-    ise(rv.acceptCount, 0, "return value should NOT have been updated");
   },
 },
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/in-content/tests/browser_telemetry.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,45 @@
+/* Any copyright is dedicated to the Public Domain.
+* http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+function runPaneTest(fn) {
+  open_preferences((win) => {
+    let doc = win.document;
+    win.gotoPref("paneAdvanced");
+    let advancedPrefs = doc.getElementById("advancedPrefs");
+    let tab = doc.getElementById("dataChoicesTab");
+    advancedPrefs.selectedTab = tab;
+    fn(win, doc);
+  });
+}
+
+function test() {
+  waitForExplicitFinish();
+  resetPreferences();
+  registerCleanupFunction(resetPreferences);
+  runPaneTest(testTelemetryState);
+}
+
+function testTelemetryState(win, doc) {
+  let fhrCheckbox = doc.getElementById("submitHealthReportBox");
+  Assert.ok(fhrCheckbox.checked, "Health Report checkbox is checked on app first run.");
+
+  let telmetryCheckbox = doc.getElementById("submitTelemetryBox");
+  Assert.ok(!telmetryCheckbox.disabled,
+            "Telemetry checkbox must be enabled if FHR is checked.");
+
+  // Uncheck the FHR checkbox and make sure that Telemetry checkbox gets disabled.
+  fhrCheckbox.click();
+
+  Assert.ok(telmetryCheckbox.disabled,
+            "Telemetry checkbox must be disabled if FHR is unchecked.");
+
+  win.close();
+  finish();
+}
+
+function resetPreferences() {
+  Services.prefs.clearUserPref("datareporting.healthreport.uploadEnabled");
+}
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/permissions.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/permissions.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/permissions.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/permissions.js	2015-02-28 15:03:01.000000000 +0000
@@ -3,12 +3,14 @@
  * License, v. 2.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/Services.jsm");
+
 const nsIPermissionManager = Components.interfaces.nsIPermissionManager;
 const nsICookiePermission = Components.interfaces.nsICookiePermission;
 
 const NOTIFICATION_FLUSH_PERMISSIONS = "flush-pending-permissions";
 
-function Permission(host, rawHost, type, capability) 
+function Permission(host, rawHost, type, capability)
 {
   this.host = host;
   this.rawHost = rawHost;
@@ -17,18 +19,19 @@
 }
 
 var gPermissionManager = {
-  _type         : "",
-  _permissions  : [],
-  _pm           : Components.classes["@mozilla.org/permissionmanager;1"]
-                            .getService(Components.interfaces.nsIPermissionManager),
-  _bundle       : null,
-  _tree         : null,
-  
+  _type                 : "",
+  _permissions          : [],
+  _permissionsToAdd     : new Map(),
+  _permissionsToDelete  : new Map(),
+  _bundle               : null,
+  _tree                 : null,
+  _observerRemoved      : false,
+
   _view: {
     _rowCount: 0,
-    get rowCount() 
-    { 
-      return this._rowCount; 
+    get rowCount()
+    {
+      return this._rowCount;
     },
     getCellText: function (aRow, aColumn)
     {
@@ -56,7 +59,7 @@
       return "";
     }
   },
-  
+
   _getCapabilityString: function (aCapability)
   {
     var stringKey = null;
@@ -76,44 +79,47 @@
     }
     return this._bundle.getString(stringKey);
   },
-  
+
   addPermission: function (aCapability)
   {
     var textbox = document.getElementById("url");
     var host = textbox.value.replace(/^\s*([-\w]*:\/+)?/, ""); // trim any leading space and scheme
     try {
-      var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                                .getService(Components.interfaces.nsIIOService);
-      var uri = ioService.newURI("http://"+host, null, null);
+      var uri = Services.io.newURI("http://"+host, null, null);
       host = uri.host;
     } catch(ex) {
-      var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                                    .getService(Components.interfaces.nsIPromptService);
       var message = this._bundle.getString("invalidURI");
       var title = this._bundle.getString("invalidURITitle");
-      promptService.alert(window, title, message);
+      Services.prompt.alert(window, title, message);
       return;
     }
 
     var capabilityString = this._getCapabilityString(aCapability);
 
     // check whether the permission already exists, if not, add it
-    var exists = false;
+    let hostExists = false;
+    let capabilityExists = false;
     for (var i = 0; i < this._permissions.length; ++i) {
       if (this._permissions[i].rawHost == host) {
-        // Avoid calling the permission manager if the capability settings are
-        // the same. Otherwise allow the call to the permissions manager to
-        // update the listbox for us.
-        exists = this._permissions[i].capability == capabilityString;
+        hostExists = true;
+        capabilityExists = this._permissions[i].capability == capabilityString;
+        if (!capabilityExists) {
+          this._permissions[i].capability = capabilityString;
+        }
         break;
       }
     }
-    
-    if (!exists) {
-      host = (host.charAt(0) == ".") ? host.substring(1,host.length) : host;
-      var uri = ioService.newURI("http://" + host, null, null);
-      this._pm.add(uri, this._type, aCapability);
+
+    let permissionParams = {host: host, type: this._type, capability: aCapability};
+    if (!hostExists) {
+      this._permissionsToAdd.set(host, permissionParams);
+      this._addPermission(permissionParams);
+    }
+    else if (!capabilityExists) {
+        this._permissionsToAdd.set(host, permissionParams);
+        this._handleCapabilityChange();
     }
+
     textbox.value = "";
     textbox.focus();
 
@@ -123,14 +129,57 @@
     // enable "remove all" button as needed
     document.getElementById("removeAllPermissions").disabled = this._permissions.length == 0;
   },
-  
+
+  _removePermission: function(aPermission)
+  {
+    this._removePermissionFromList(aPermission.host);
+
+    // If this permission was added during this session, let's remove
+    // it from the pending adds list to prevent calls to the
+    // permission manager.
+    let isNewPermission = this._permissionsToAdd.delete(aPermission.host);
+
+    if (!isNewPermission) {
+      this._permissionsToDelete.set(aPermission.host, aPermission);
+    }
+
+  },
+
+  _handleCapabilityChange: function ()
+  {
+    // Re-do the sort, if the status changed from Block to Allow
+    // or vice versa, since if we're sorted on status, we may no
+    // longer be in order.
+    if (this._lastPermissionSortColumn.id == "statusCol") {
+      this._resortPermissions();
+    }
+    this._tree.treeBoxObject.invalidate();
+  },
+
+  _addPermission: function(aPermission)
+  {
+    this._addPermissionToList(aPermission);
+    ++this._view._rowCount;
+    this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, 1);
+    // Re-do the sort, since we inserted this new item at the end.
+    this._resortPermissions();
+  },
+
+  _resortPermissions: function()
+  {
+    gTreeUtils.sort(this._tree, this._view, this._permissions,
+                    this._permissionsComparator,
+                    this._lastPermissionSortColumn,
+                    this._lastPermissionSortAscending);
+  },
+
   onHostInput: function (aSiteField)
   {
     document.getElementById("btnSession").disabled = !aSiteField.value;
     document.getElementById("btnBlock").disabled = !aSiteField.value;
     document.getElementById("btnAllow").disabled = !aSiteField.value;
   },
-  
+
   onWindowKeyPress: function (aEvent)
   {
     if (aEvent.keyCode == KeyEvent.DOM_VK_ESCAPE)
@@ -142,14 +191,14 @@
     if (aEvent.keyCode == KeyEvent.DOM_VK_RETURN)
       document.getElementById("btnAllow").click();
   },
-  
+
   onLoad: function ()
   {
     this._bundle = document.getElementById("bundlePreferences");
     var params = window.arguments[0];
     this.init(params);
   },
-  
+
   init: function (aParams)
   {
     if (this._type) {
@@ -159,14 +208,14 @@
 
     this._type = aParams.permissionType;
     this._manageCapability = aParams.manageCapability;
-    
+
     var permissionsText = document.getElementById("permissionsText");
     while (permissionsText.hasChildNodes())
       permissionsText.removeChild(permissionsText.firstChild);
     permissionsText.appendChild(document.createTextNode(aParams.introText));
 
     document.title = aParams.windowTitle;
-    
+
     document.getElementById("btnBlock").hidden    = !aParams.blockVisible;
     document.getElementById("btnSession").hidden  = !aParams.sessionVisible;
     document.getElementById("btnAllow").hidden    = !aParams.allowVisible;
@@ -182,23 +231,23 @@
     var urlLabel = document.getElementById("urlLabel");
     urlLabel.hidden = !urlFieldVisible;
 
-    var os = Components.classes["@mozilla.org/observer-service;1"]
-                       .getService(Components.interfaces.nsIObserverService);
-    os.notifyObservers(null, NOTIFICATION_FLUSH_PERMISSIONS, this._type);
-    os.addObserver(this, "perm-changed", false);
+    Services.obs.notifyObservers(null, NOTIFICATION_FLUSH_PERMISSIONS, this._type);
+    Services.obs.addObserver(this, "perm-changed", false);
 
     this._loadPermissions();
-    
+
     urlField.focus();
   },
-  
+
   uninit: function ()
   {
-    var os = Components.classes["@mozilla.org/observer-service;1"]
-                       .getService(Components.interfaces.nsIObserverService);
-    os.removeObserver(this, "perm-changed");
+    if (!this._observerRemoved) {
+      Services.obs.removeObserver(this, "perm-changed");
+
+      this._observerRemoved = true;
+    }
   },
-  
+
   observe: function (aSubject, aTopic, aData)
   {
     if (aTopic == "perm-changed") {
@@ -209,14 +258,7 @@
         return;
 
       if (aData == "added") {
-        this._addPermissionToList(permission);
-        ++this._view._rowCount;
-        this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, 1);        
-        // Re-do the sort, since we inserted this new item at the end. 
-        gTreeUtils.sort(this._tree, this._view, this._permissions,
-                        this._permissionsComparator,
-                        this._lastPermissionSortColumn, 
-                        this._lastPermissionSortAscending);        
+        this._addPermission(permission);
       }
       else if (aData == "changed") {
         for (var i = 0; i < this._permissions.length; ++i) {
@@ -225,31 +267,14 @@
             break;
           }
         }
-        // Re-do the sort, if the status changed from Block to Allow
-        // or vice versa, since if we're sorted on status, we may no
-        // longer be in order. 
-        if (this._lastPermissionSortColumn.id == "statusCol") {
-          gTreeUtils.sort(this._tree, this._view, this._permissions,
-                          this._permissionsComparator,
-                          this._lastPermissionSortColumn, 
-                          this._lastPermissionSortAscending);
-        }
-        this._tree.treeBoxObject.invalidate();
+        this._handleCapabilityChange();
       }
       else if (aData == "deleted") {
-        for (var i = 0; i < this._permissions.length; i++) {
-          if (this._permissions[i].host == permission.host) {
-            this._permissions.splice(i, 1);
-            this._view._rowCount--;
-            this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, -1);
-            this._tree.treeBoxObject.invalidate();
-            break;
-          }
-        }
+        this._removePermissionFromList(permission);
       }
     }
   },
-  
+
   onPermissionSelected: function ()
   {
     var hasSelection = this._tree.view.selection.count > 0;
@@ -257,7 +282,7 @@
     document.getElementById("removePermission").disabled = !hasRows || !hasSelection;
     document.getElementById("removeAllPermissions").disabled = !hasRows;
   },
-  
+
   onPermissionDeleted: function ()
   {
     if (!this._view.rowCount)
@@ -266,12 +291,12 @@
     gTreeUtils.deleteSelectedItems(this._tree, this._view, this._permissions, removedPermissions);
     for (var i = 0; i < removedPermissions.length; ++i) {
       var p = removedPermissions[i];
-      this._pm.remove(p.host, p.type);
-    }    
+      this._removePermission(p);
+    }
     document.getElementById("removePermission").disabled = !this._permissions.length;
     document.getElementById("removeAllPermissions").disabled = !this._permissions.length;
   },
-  
+
   onAllPermissionsDeleted: function ()
   {
     if (!this._view.rowCount)
@@ -280,12 +305,12 @@
     gTreeUtils.deleteAll(this._tree, this._view, this._permissions, removedPermissions);
     for (var i = 0; i < removedPermissions.length; ++i) {
       var p = removedPermissions[i];
-      this._pm.remove(p.host, p.type);
-    }    
+      this._removePermission(p);
+    }
     document.getElementById("removePermission").disabled = true;
     document.getElementById("removeAllPermissions").disabled = true;
   },
-  
+
   onPermissionKeyPress: function (aEvent)
   {
     if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE
@@ -295,7 +320,7 @@
        )
       this.onPermissionDeleted();
   },
-  
+
   _lastPermissionSortColumn: "",
   _lastPermissionSortAscending: false,
   _permissionsComparator : function (a, b)
@@ -303,19 +328,38 @@
     return a.toLowerCase().localeCompare(b.toLowerCase());
   },
 
-  
+
   onPermissionSort: function (aColumn)
   {
-    this._lastPermissionSortAscending = gTreeUtils.sort(this._tree, 
-                                                        this._view, 
+    this._lastPermissionSortAscending = gTreeUtils.sort(this._tree,
+                                                        this._view,
                                                         this._permissions,
                                                         aColumn,
                                                         this._permissionsComparator,
-                                                        this._lastPermissionSortColumn, 
+                                                        this._lastPermissionSortColumn,
                                                         this._lastPermissionSortAscending);
     this._lastPermissionSortColumn = aColumn;
   },
-  
+
+  onApplyChanges: function()
+  {
+    // Stop observing permission changes since we are about
+    // to write out the pending adds/deletes and don't need
+    // to update the UI
+    this.uninit();
+
+    for (let permissionParams of this._permissionsToAdd.values()) {
+      let uri = Services.io.newURI("http://" + permissionParams.host, null, null);
+      Services.perms.add(uri, permissionParams.type, permissionParams.capability);
+    }
+
+    for (let p of this._permissionsToDelete.values()) {
+      Services.perms.remove(p.host, p.type);
+    }
+
+    window.close();
+  },
+
   _loadPermissions: function ()
   {
     this._tree = document.getElementById("permissionsTree");
@@ -323,12 +367,12 @@
 
     // load permissions into a table
     var count = 0;
-    var enumerator = this._pm.enumerator;
+    var enumerator = Services.perms.enumerator;
     while (enumerator.hasMoreElements()) {
       var nextPermission = enumerator.getNext().QueryInterface(Components.interfaces.nsIPermission);
       this._addPermissionToList(nextPermission);
     }
-   
+
     this._view._rowCount = this._permissions.length;
 
     // sort and display the table
@@ -338,7 +382,7 @@
     // disable "remove all" button if there are none
     document.getElementById("removeAllPermissions").disabled = this._permissions.length == 0;
   },
-  
+
   _addPermissionToList: function (aPermission)
   {
     if (aPermission.type == this._type &&
@@ -352,9 +396,22 @@
                              aPermission.type,
                              capabilityString);
       this._permissions.push(p);
-    }  
+    }
   },
-  
+
+  _removePermissionFromList: function (aHost)
+  {
+    for (let i = 0; i < this._permissions.length; ++i) {
+      if (this._permissions[i].host == aHost) {
+        this._permissions.splice(i, 1);
+        this._view._rowCount--;
+        this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, -1);
+        this._tree.treeBoxObject.invalidate();
+        break;
+      }
+    }
+  },
+
   setHost: function (aHost)
   {
     document.getElementById("url").value = aHost;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/permissions.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/permissions.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/permissions.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/permissions.xul	2015-02-28 15:03:01.000000000 +0000
@@ -61,8 +61,8 @@
       <treechildren/>
     </tree>
   </vbox>
-  <hbox align="end">
-    <hbox class="actionButtons" flex="1">
+  <vbox>
+    <hbox class="actionButtons" align="left" flex="1">
       <button id="removePermission" disabled="true"
               accesskey="&removepermission.accesskey;"
               icon="remove" label="&removepermission.label;"
@@ -71,9 +71,13 @@
               icon="clear" label="&removeallpermissions.label;"
               accesskey="&removeallpermissions.accesskey;" 
               oncommand="gPermissionManager.onAllPermissionsDeleted();"/>
-      <spacer flex="1"/>
+    </hbox>
+    <spacer flex="1"/>
+    <hbox class="actionButtons" align="right" flex="1">
       <button oncommand="close();" icon="close"
-              label="&button.close.label;" accesskey="&button.close.accesskey;"/>
+              label="&button.cancel.label;" accesskey="&button.cancel.accesskey;" />
+      <button id="btnApplyChanges" oncommand="gPermissionManager.onApplyChanges();" icon="save"
+              label="&button.ok.label;" accesskey="&button.ok.accesskey;"/>
     </hbox>
-  </hbox>
+  </vbox>
 </window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/tests/browser_cookies_exceptions.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/tests/browser_cookies_exceptions.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/tests/browser_cookies_exceptions.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/tests/browser_cookies_exceptions.js	2015-02-28 15:03:01.000000000 +0000
@@ -4,182 +4,197 @@
 function test() {
   waitForExplicitFinish();
 
-  function prefWindowObserver(subject, topic, data) {
-    if (topic != "domwindowopened")
-      return;
-
-    Services.ww.unregisterNotification(this);
-
-    let win = subject.QueryInterface(Ci.nsIDOMEventTarget);
-
-    win.addEventListener("load", function(event) {
-      let historyMode = event.target.getElementById("historyMode");
-      historyMode.value = "custom";
-      historyMode.doCommand();
-      Services.ww.registerNotification(cookiesWindowObserver);
-      event.target.getElementById("cookieExceptions").doCommand();
-    }, false);
-  }
-
-  function cookiesWindowObserver(subject, topic, data) {
-    if (topic != "domwindowopened")
-      return;
-
-    Services.ww.unregisterNotification(this);
-
-    let win = subject.QueryInterface(Ci.nsIDOMEventTarget);
-
-    win.addEventListener("load", function(event) {
-      SimpleTest.executeSoon(function() windowLoad(event, win, dialog));
-    }, false);
-  }
-
-  Services.ww.registerNotification(prefWindowObserver);
-
-  let dialog = openDialog("chrome://browser/content/preferences/preferences.xul",
-                 "Preferences", "chrome,titlebar,toolbar,centerscreen,dialog=no",
-                 "panePrivacy");
+  testRunner.runTests();
 }
 
-function windowLoad(event, win, dialog) {
-  let doc = event.target;
-  let tree = doc.getElementById("permissionsTree");
-  let statusCol = tree.treeBoxObject.columns.getColumnAt(1);
-  let url = doc.getElementById("url");
-  let btnAllow = doc.getElementById("btnAllow");
-  let btnBlock = doc.getElementById("btnBlock");
-  let btnRemove = doc.getElementById("removePermission");
-  let pm = Cc["@mozilla.org/permissionmanager;1"]
-             .getService(Ci.nsIPermissionManager);
-  let ioService = Cc["@mozilla.org/network/io-service;1"]
-                    .getService(Ci.nsIIOService);
-  const allowText = win.gPermissionManager._getCapabilityString(
-    Ci.nsIPermissionManager.ALLOW_ACTION);
-  const denyText = win.gPermissionManager._getCapabilityString(
-    Ci.nsIPermissionManager.DENY_ACTION);
-  const allow = Ci.nsIPermissionManager.ALLOW_ACTION;
-  const deny = Ci.nsIPermissionManager.DENY_ACTION;
-
-  is(tree.view.rowCount, 0, "no cookie exceptions");
-
-  let tests = [
-    {
-      test: function() {
-        url.value = "test.com";
-        btnAllow.doCommand();
-        is(tree.view.rowCount, 1, "added exception shows up in treeview");
-        is(tree.view.getCellText(0, statusCol), allowText,
-           "permission text should be set correctly");
-      },
-      observances: [{ type: "cookie", host: "test.com", data: "added",
-                      capability: allow }]
-    },
-    {
-      test: function() {
-        url.value = "test.com";
-        btnBlock.doCommand();
-        is(tree.view.getCellText(0, statusCol), denyText,
-           "permission should change to deny in UI");
-      },
-      observances: [{ type: "cookie", host: "test.com", data: "changed",
-                      capability: deny }],
-    },
-    {
-      test: function() {
-        url.value = "test.com";
-        btnAllow.doCommand();
-        is(tree.view.getCellText(0, statusCol), allowText,
-           "permission should revert back to allow");
-      },
-      observances: [{ type: "cookie", host: "test.com", data: "changed",
-                      capability: allow }],
-    },
-    {
-      test: function() {
-        url.value = "test.com";
-        btnRemove.doCommand();
-        is(tree.view.rowCount, 0, "exception should be removed");
-      },
-      observances: [{ type: "cookie", host: "test.com", data: "deleted" }],
-    },
-    {
-      test: function() {
-        let uri = ioService.newURI("http://test.com", null, null);
-        pm.add(uri, "popup", Ci.nsIPermissionManager.DENY_ACTION);
-        is(tree.view.rowCount, 0, "adding unrelated permission should not change display");
-      },
-      observances: [{ type: "popup", host: "test.com", data: "added",
-                      capability: deny }],
-      cleanUp: function() {
-        pm.remove("test.com", "popup");
-      },
-    },
-    {
-      test: function() {
-        url.value = "test.com";
-        btnAllow.doCommand();
-        pm.remove("test.com", "cookie");
-        is(tree.view.rowCount, 0, "display should update when cookie permission is deleted");
-      },
-      observances: [{ type: "cookie", host: "test.com", data: "added",
-                      capability: allow },
-                    { type: "cookie", host: "test.com", data: "deleted" }]
-    },
-  ];
-
-  let permObserver = {
-    observe: function(aSubject, aTopic, aData) {
-      if (aTopic != "perm-changed")
-        return;
-
-      if (tests[currentTest].observances.length == 0) {
-        // Should fail here as we are not expecting a notification, but we don't.
-        // See bug 1063410.
-        return;
-      }
-
-      let permission = aSubject.QueryInterface(Ci.nsIPermission);
-      let expected = tests[currentTest].observances.shift();
+var testRunner = {
 
-      is(aData, expected.data, "type of message should be the same");
-      for each (let prop in ["type", "host", "capability"]) {
-        if (expected[prop])
-          is(permission[prop], expected[prop],
-             "property: \"" + prop  + "\" should be equal");
+  tests:
+    [
+      {
+        test: function(params) {
+          params.url.value = "test.com";
+          params.btnAllow.doCommand();
+          is(params.tree.view.rowCount, 1, "added exception shows up in treeview");
+          is(params.tree.view.getCellText(0, params.statusCol), params.allowText,
+                                          "permission text should be set correctly");
+          params.btnApplyChanges.doCommand();
+        },
+        observances: [{ type: "cookie", host: "test.com", data: "added",
+                        capability: Ci.nsIPermissionManager.ALLOW_ACTION }],
+      },
+      {
+        test: function(params) {
+          params.url.value = "test.com";
+          params.btnBlock.doCommand();
+          is(params.tree.view.getCellText(0, params.statusCol), params.denyText,
+                                          "permission should change to deny in UI");
+          params.btnApplyChanges.doCommand();
+        },
+        observances: [{ type: "cookie", host: "test.com", data: "changed",
+                        capability: Ci.nsIPermissionManager.DENY_ACTION  }],
+      },
+      {
+        test: function(params) {
+          params.url.value = "test.com";
+          params.btnAllow.doCommand();
+          is(params.tree.view.getCellText(0, params.statusCol), params.allowText,
+                                          "permission should revert back to allow");
+          params.btnApplyChanges.doCommand();
+        },
+        observances: [{ type: "cookie", host: "test.com", data: "changed",
+                        capability: Ci.nsIPermissionManager.ALLOW_ACTION }],
+      },
+      {
+        test: function(params) {
+          params.url.value = "test.com";
+          params.btnRemove.doCommand();
+          is(params.tree.view.rowCount, 0, "exception should be removed");
+          params.btnApplyChanges.doCommand();
+        },
+        observances: [{ type: "cookie", host: "test.com", data: "deleted" }],
+      },
+      {
+        test: function(params) {
+          let uri = params.ioService.newURI("http://test.com", null, null);
+          params.pm.add(uri, "popup", Ci.nsIPermissionManager.DENY_ACTION);
+          is(params.tree.view.rowCount, 0, "adding unrelated permission should not change display");
+          params.btnApplyChanges.doCommand();
+        },
+        observances: [{ type: "popup", host: "test.com", data: "added",
+                        capability: Ci.nsIPermissionManager.DENY_ACTION }],
+        cleanUp: function(params) {
+          params.pm.remove("test.com", "popup");
+        },
+      },
+    ],
+
+  _currentTest: -1,
+
+  runTests: function() {
+    this._currentTest++;
+
+    info("Running test #" + (this._currentTest + 1) + "\n");
+    let that = this;
+    let p = this.runCurrentTest();
+    p.then(function() {
+      if (that._currentTest == that.tests.length - 1) {
+        finish();
       }
-
-      if (tests[currentTest].observances.length == 0) {
-        SimpleTest.executeSoon(function() {
-          if (tests[currentTest].cleanUp)
-            tests[currentTest].cleanUp();
-
-          runNextTest();
-        });
+      else {
+        that.runTests();
       }
-    },
-  };
+    });
+  },
 
-  let os = Cc["@mozilla.org/observer-service;1"]
-             .getService(Ci.nsIObserverService);
+  runCurrentTest: function() {
+    return new Promise(function(resolve, reject) {
 
-  os.addObserver(permObserver, "perm-changed", false);
+      let helperFunctions = {
 
-  var currentTest = -1;
-  function runNextTest() {
-    currentTest++;
-    if (currentTest == tests.length) {
-      os.removeObserver(permObserver, "perm-changed");
-      win.close();
-      dialog.close();
-      finish();
-      return;
-    }
-
-    info("Running test #" + (currentTest + 1) + "\n");
-    tests[currentTest].test();
-    if (!tests[currentTest].observances)
-      runNextTest();
-  }
-
-  runNextTest();
-}
+        prefWindowObserver: function(subject, topic, data) {
+          if (topic != "domwindowopened")
+            return;
+
+          Services.ww.unregisterNotification(helperFunctions.prefWindowObserver);
+
+          let win = subject.QueryInterface(Ci.nsIDOMEventTarget);
+
+          win.addEventListener("load", function(event) {
+            let historyMode = event.target.getElementById("historyMode");
+            historyMode.value = "custom";
+            historyMode.doCommand();
+            Services.ww.registerNotification(helperFunctions.cookiesWindowObserver);
+            event.target.getElementById("cookieExceptions").doCommand();
+          }, false);
+        },
+
+        cookiesWindowObserver: function(subject, topic, data) {
+          if (topic != "domwindowopened")
+            return;
+
+          Services.ww.unregisterNotification(helperFunctions.cookiesWindowObserver);
+
+          let win = subject.QueryInterface(Ci.nsIDOMEventTarget);
+
+          win.addEventListener("load", function(event) {
+            SimpleTest.executeSoon(function() helperFunctions.windowLoad(event, win));
+          }, false);
+        },
+
+        windowLoad: function(event, win) {
+          let params = {
+            doc: event.target,
+            tree: event.target.getElementById("permissionsTree"),
+            statusCol: event.target.getElementById("permissionsTree").treeBoxObject.columns.getColumnAt(1),
+            url: event.target.getElementById("url"),
+            btnAllow: event.target.getElementById("btnAllow"),
+            btnBlock: event.target.getElementById("btnBlock"),
+            btnApplyChanges: event.target.getElementById("btnApplyChanges"),
+            btnRemove: event.target.getElementById("removePermission"),
+            pm: Cc["@mozilla.org/permissionmanager;1"]
+                       .getService(Ci.nsIPermissionManager),
+            ioService: Cc["@mozilla.org/network/io-service;1"]
+                              .getService(Ci.nsIIOService),
+            allowText: win.gPermissionManager._getCapabilityString(
+                                Ci.nsIPermissionManager.ALLOW_ACTION),
+            denyText: win.gPermissionManager._getCapabilityString(
+                               Ci.nsIPermissionManager.DENY_ACTION),
+            allow: Ci.nsIPermissionManager.ALLOW_ACTION,
+            deny: Ci.nsIPermissionManager.DENY_ACTION,
+          };
+
+          let permObserver = {
+            observe: function(aSubject, aTopic, aData) {
+              if (aTopic != "perm-changed")
+                return;
+
+              if (testRunner.tests[testRunner._currentTest].observances.length == 0) {
+                // Should fail here as we are not expecting a notification, but we don't.
+                // See bug 1063410.
+                return;
+              }
+
+              let permission = aSubject.QueryInterface(Ci.nsIPermission);
+              let expected = testRunner.tests[testRunner._currentTest].observances.shift();
+
+              is(aData, expected.data, "type of message should be the same");
+              for each (let prop in ["type", "host", "capability"]) {
+                if (expected[prop])
+                  is(permission[prop], expected[prop],
+                    "property: \"" + prop  + "\" should be equal");
+              }
+
+              os.removeObserver(permObserver, "perm-changed");
+
+              if (testRunner.tests[testRunner._currentTest].cleanup) {
+                testRunner.tests[testRunner._currentTest].cleanup();
+              }
+
+              testRunner.dialog.close(params);
+              win.close();
+              resolve();
+            },
+          };
+
+          let os = Cc["@mozilla.org/observer-service;1"]
+                     .getService(Ci.nsIObserverService);
+
+          os.addObserver(permObserver, "perm-changed", false);
+
+          if (testRunner._currentTest == 0) {
+            is(params.tree.view.rowCount, 0, "no cookie exceptions");
+          }
+
+          testRunner.tests[testRunner._currentTest].test(params);
+        },
+      };
+
+      Services.ww.registerNotification(helperFunctions.prefWindowObserver);
+
+      testRunner.dialog = openDialog("chrome://browser/content/preferences/preferences.xul",
+                                     "Preferences", "chrome,titlebar,toolbar,centerscreen,dialog=no",
+                                     "panePrivacy");
+    });
+  },
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/tests/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/tests/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/tests/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/tests/browser.ini	2015-02-28 15:03:01.000000000 +0000
@@ -20,3 +20,6 @@
 skip-if = e10s # leaks windows
 [browser_privacypane_5.js]
 [browser_privacypane_8.js]
+[browser_telemetry.js]
+# Skip this test on Android and B2G as FHR and Telemetry are separate systems there.
+skip-if = !healthreport || !telemetry || (os == 'linux' && debug) || (os == 'android') || (os == 'b2g')
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/tests/browser_telemetry.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/tests/browser_telemetry.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/preferences/tests/browser_telemetry.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/preferences/tests/browser_telemetry.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+* http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+function runPaneTest(fn) {
+  function observer(win, topic, data) {
+    Services.obs.removeObserver(observer, "advanced-pane-loaded");
+
+    let policy = Components.classes["@mozilla.org/datareporting/service;1"]
+                                   .getService(Components.interfaces.nsISupports)
+                                   .wrappedJSObject
+                                   .policy;
+    Assert.ok(policy, "Policy object defined.");
+
+    resetPreferences();
+
+    fn(win);
+  }
+
+  Services.obs.addObserver(observer, "advanced-pane-loaded", false);
+  openDialog("chrome://browser/content/preferences/preferences.xul", "Preferences",
+             "chrome,titlebar,toolbar,centerscreen,dialog=no", "paneAdvanced");
+}
+
+function test() {
+  waitForExplicitFinish();
+  resetPreferences();
+  registerCleanupFunction(resetPreferences);
+
+  runPaneTest(testTelemetryState);
+}
+
+function testTelemetryState(win) {
+  let doc = win.document;
+
+  let fhrCheckbox = doc.getElementById("submitHealthReportBox");
+  Assert.ok(fhrCheckbox.checked, "Health Report checkbox is checked on app first run.");
+
+  let telmetryCheckbox = doc.getElementById("submitTelemetryBox");
+  Assert.ok(!telmetryCheckbox.disabled,
+            "Telemetry checkbox must be enabled if FHR is checked.");
+
+  // Uncheck the FHR checkbox and make sure that Telemetry checkbox gets disabled.
+  fhrCheckbox.click();
+
+  Assert.ok(telmetryCheckbox.disabled,
+            "Telemetry checkbox must be disabled if FHR is unchecked.");
+
+  win.close();
+  finish();
+}
+
+function resetPreferences() {
+  let service = Cc["@mozilla.org/datareporting/service;1"]
+                  .getService(Ci.nsISupports)
+                  .wrappedJSObject;
+  service.policy._prefs.resetBranch("datareporting.policy.");
+  service.policy.dataSubmissionPolicyBypassNotification = true;
+}
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_sidebar.js	2015-02-28 15:03:01.000000000 +0000
@@ -33,7 +33,7 @@
       resolve(win);
     }, true);
 
-    win.toggleSidebar(sidebarID, true);
+    win.SidebarUI.show(sidebarID);
 
     return promise;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/jar.mn	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/jar.mn	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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.jar:
+  content/browser/readinglist/sidebar.xhtml
+  content/browser/readinglist/sidebar.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/moz.build	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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']
+
+EXTRA_JS_MODULES.readinglist += [
+    'ReadingList.jsm',
+]
+
+TESTING_JS_MODULES += [
+    'test/ReadingListTestUtils.jsm',
+]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
+
+EXTRA_JS_MODULES.readinglist += [
+    'Scheduler.jsm',
+]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/ReadingList.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/ReadingList.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/ReadingList.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/ReadingList.jsm	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,356 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 = ["ReadingList"];
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Log.jsm");
+
+
+(function() {
+  let parentLog = Log.repository.getLogger("readinglist");
+  parentLog.level = Preferences.get("browser.readinglist.logLevel", Log.Level.Warn);
+  Preferences.observe("browser.readinglist.logLevel", value => {
+    parentLog.level = value;
+  });
+  let formatter = new Log.BasicFormatter();
+  parentLog.addAppender(new Log.ConsoleAppender(formatter));
+  parentLog.addAppender(new Log.DumpAppender(formatter));
+})();
+
+let log = Log.repository.getLogger("readinglist.api");
+
+/**
+ * Represents an item in the Reading List.
+ * @constructor
+ * @see https://github.com/mozilla-services/readinglist/wiki/API-Design-proposal#data-model
+ */
+function Item(data) {
+  this._data = data;
+}
+
+Item.prototype = {
+  /**
+   * UUID
+   * @type {string}
+   */
+  get id() {
+    return this._data.id;
+  },
+
+  /**
+   * Server timestamp
+   * @type {string}
+   */
+  get lastModified() {
+    return this._data.last_modified;
+  },
+
+  /**
+   * @type {nsIURL}
+   */
+  get originalUrl() {
+    return Services.io.newURI(this._data.url, null, null);
+  },
+
+  /**
+   * @type {string}
+   */
+  get originalTitle() {
+    return this._data.title || "";
+  },
+
+  /**
+   * @type {nsIURL}
+   */
+  get resolvedUrl() {
+    return Services.io.newURI(this._data.resolved_url || this._data.url, null, null);
+  },
+
+  /**
+   * @type {string}
+   */
+  get resolvedTitle() {
+    return this._data.resolved_title || this.originalTitle;
+  },
+
+  /**
+   * @type {string}
+   */
+  get excerpt() {
+    return this._data.excerpt || "";
+  },
+
+  /**
+   * @type {ItemStates}
+   */
+  get state() {
+    return ReadingList.ItemStates[this._data.state] || ReadingList.ItemStates.OK;
+  },
+
+  /**
+   * @type {boolean}
+   */
+  get isFavorite() {
+    return !!this._data.favorite;
+  },
+
+  /**
+   * @type {boolean}
+   */
+  get isArticle() {
+    return !!this._data.is_article;
+  },
+
+  /**
+   * @type {number}
+   */
+  get wordCount() {
+    return this._data.word_count || 0;
+  },
+
+  /**
+   * @type {boolean}
+   */
+  get isUnread() {
+    return !!this._data.unread;
+  },
+
+  /**
+   * Device name
+   * @type {string}
+   */
+  get addedBy() {
+    return this._data.added_by;
+  },
+
+  /**
+   * @type {Date}
+   */
+  get addedOn() {
+    return new Date(this._data.added_on);
+  },
+
+  /**
+   * @type {Date}
+   */
+  get storedOn() {
+    return new Date(this._data.stored_on);
+  },
+
+  /**
+   * Device name
+   * @type {string}
+   */
+  get markedReadBy() {
+    return this._data.marked_read_by;
+  },
+
+  /**
+   * @type {Date}
+   */
+  get markedReadOn() {
+    return new date(this._data.marked_read_on);
+  },
+
+  /**
+   * @type {number}
+   */
+  get readPosition() {
+    return this._data.read_position;
+  },
+
+  // Data not specified by the current server API
+
+  /**
+   * Array of scraped or captured summary images for this page.
+   * TODO: Implement this.
+   * @type {[nsIURL]}
+   */
+  get images() {
+    return [];
+  },
+
+  /**
+   * Favicon for this site.
+   * @type {nsIURL}
+   * TODO: Generate moz-anno: URI for favicon.
+   */
+  get favicon() {
+    return null;
+  },
+
+  // Helpers
+
+  /**
+   * Alias for resolvedUrl.
+   * TODO: This url/resolvedUrl alias makes it feel like the server API hasn't got this right.
+   */
+  get url() {
+    return this.resolvedUrl;
+  },
+  /**
+   * Alias for resolvedTitle
+   */
+  get title() {
+    return this.resolvedTitle;
+  },
+
+  /**
+   * Domain portion of the URL, with prefixes stripped. For display purposes.
+   * @type {string}
+   */
+  get domain() {
+    let host = this.resolvedUrl.host;
+    if (host.startsWith("www.")) {
+      host = host.slice(4);
+    }
+    return host;
+  },
+
+  /**
+   * Convert this Item to a string representation.
+   */
+  toString() {
+    return `[Item url=${this.url.spec}]`;
+  },
+
+  /**
+   * Get the value that should be used for a JSON representation of this Item.
+   */
+  toJSON() {
+    return this._data;
+  },
+};
+
+
+let ItemStates = {
+  OK: Symbol("ok"),
+  ARCHIVED: Symbol("archived"),
+  DELETED: Symbol("deleted"),
+};
+
+
+this.ReadingList = {
+  Item: Item,
+  ItemStates: ItemStates,
+
+  _listeners: new Set(),
+  _items: [],
+
+  /**
+   * Initialize the ReadingList component.
+   */
+  _init() {
+    log.debug("Init");
+
+    // Initialize mock data
+    let mockData = JSON.parse(Preferences.get("browser.readinglist.mockData", "[]"));
+    for (let itemData of mockData) {
+      this._items.push(new Item(itemData));
+    }
+  },
+
+  /**
+   * Add an event listener.
+   * @param {object} listener - Listener object to start notifying.
+   */
+  addListener(listener) {
+    this._listeners.add(listener);
+  },
+
+  /**
+   * Remove a specified event listener.
+   * @param {object} listener - Listener object to stop notifying.
+   */
+  removeListener(listener) {
+    this._listeners.delete(listener);
+  },
+
+  /**
+   * Notify all registered event listeners of an event.
+   * @param {string} eventName - Event name, which will be used as a method name
+   *                             on listeners to call.
+   */
+  _notifyListeners(eventName, ...args) {
+    for (let listener of this._listeners) {
+      if (typeof listener[eventName] != "function") {
+        continue;
+      }
+
+      try {
+        listener[eventName](...args);
+      } catch (e) {
+        log.error(`Error calling listener.${eventName}`, e);
+      }
+    }
+  },
+
+  /**
+   * Fetch the number of items that match a set of given conditions.
+   * TODO: Implement filtering, sorting, etc. Needs backend storage work.
+   *
+   * @param {Object} conditions Object specifying a set of conditions for
+   *                            filtering items.
+   * @return {Promise}
+   * @resolves {number}
+   */
+  getNumItems(conditions = {unread: false}) {
+    return new Promise((resolve, reject) => {
+      resolve(this._items.length);
+    });
+  },
+
+  /**
+   * Fetch items matching a set of conditions, in a sorted list.
+   * TODO: Implement filtering, sorting, etc. Needs backend storage work.
+   *
+   * @return {Promise}
+   * @resolves {[Item]}
+   */
+  getItems(options = {sort: "addedOn", conditions: {unread: false}}) {
+    return new Promise((resolve, reject) => {
+      resolve([...this._items]);
+    });
+  },
+
+  /**
+   * Find an item based on its ID.
+   * TODO: Implement. Needs backend storage work.
+   *
+   * @return {Promise}
+   * @resolves {Item}
+   */
+  getItemByID(url) {
+    return new Promise((resolve, reject) => {
+      resolve(null);
+    });
+  },
+
+  /**
+   * Find an item based on its URL.
+   *
+   * TODO: Implement. Needs backend storage work.
+   * TODO: Does this match original or resolved URL, or both?
+   * TODO: Should this just be a generic findItem API?
+   *
+   * @return {Promise}
+   * @resolves {Item}
+   */
+  getItemByURL(url) {
+    return new Promise((resolve, reject) => {
+      resolve(null);
+    });
+  },
+};
+
+
+ReadingList._init();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/Scheduler.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/Scheduler.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/Scheduler.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/Scheduler.jsm	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,338 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+
+XPCOMUtils.defineLazyModuleGetter(this, 'LogManager',
+  'resource://services-common/logmanager.js');
+
+XPCOMUtils.defineLazyModuleGetter(this, 'Log',
+  'resource://gre/modules/Log.jsm');
+
+XPCOMUtils.defineLazyModuleGetter(this, 'Preferences',
+  'resource://gre/modules/Preferences.jsm');
+
+XPCOMUtils.defineLazyModuleGetter(this, 'setTimeout',
+  'resource://gre/modules/Timer.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'clearTimeout',
+  'resource://gre/modules/Timer.jsm');
+
+Cu.import('resource://gre/modules/Task.jsm');
+
+this.EXPORTED_SYMBOLS = ["ReadingListScheduler"];
+
+// A list of "external" observer topics that may cause us to change when we
+// sync.
+const OBSERVERS = [
+  // We don't sync when offline and restart when online.
+  "network:offline-status-changed",
+  // FxA notifications also cause us to check if we should sync.
+  "fxaccounts:onverified",
+  // When something notices a local change to an item.
+  "readinglist:item-changed",
+  // some notifications the engine might send if we have been requested to backoff.
+  "readinglist:backoff-requested",
+  // request to sync now
+  "readinglist:user-sync",
+
+];
+
+///////// A temp object until we get our "engine"
+let engine = {
+  ERROR_AUTHENTICATION: "authentication error",
+  sync: Task.async(function* () {
+  }),
+}
+
+let prefs = new Preferences("readinglist.scheduler.");
+
+// A helper to manage our interval values.
+let intervals = {
+  // Getters for our intervals.
+  _fixupIntervalPref(prefName, def) {
+    // All pref values are seconds, but we return ms.
+    return prefs.get(prefName, def) * 1000;
+  },
+
+  // How long after startup do we do an initial sync?
+  get initial() this._fixupIntervalPref("initial", 20), // 20 seconds.
+  // Every interval after the first.
+  get schedule() this._fixupIntervalPref("schedule", 2 * 60 * 60), // 2 hours
+  // After we've been told an item has changed
+  get dirty() this._fixupIntervalPref("dirty", 2 * 60), // 2 mins
+  // After an error
+  get retry() this._fixupIntervalPref("retry", 2 * 60), // 2 mins
+};
+
+// This is the implementation, but it's not exposed directly.
+function InternalScheduler() {
+  // oh, I don't know what logs yet - let's guess!
+  let logs = ["readinglist", "FirefoxAccounts", "browserwindow.syncui"];
+  this._logManager = new LogManager("readinglist.", logs, "readinglist");
+  this.log = Log.repository.getLogger("readinglist.scheduler");
+  this.log.info("readinglist scheduler created.")
+  this.state = this.STATE_OK;
+
+  // don't this.init() here, but instead at the module level - tests want to
+  // add hooks before it is called.
+}
+
+InternalScheduler.prototype = {
+  // When the next scheduled sync should happen.  If we can sync, there will
+  // be a timer set to fire then. If we can't sync there will not be a timer,
+  // but it will be set to fire then as soon as we can.
+  _nextScheduledSync: null,
+  // The time when the most-recent "backoff request" expires - we will never
+  // schedule a new timer before this.
+  _backoffUntil: 0,
+  // Our current timer.
+  _timer: null,
+  // Our timer fires a promise - _timerRunning is true until it resolves or
+  // rejects.
+  _timerRunning: false,
+  // Our sync engine - XXX - maybe just a callback?
+  _engine: engine,
+
+  // Our state variable and constants.
+  state: null,
+  STATE_OK: "ok",
+  STATE_ERROR_AUTHENTICATION: "authentication error",
+  STATE_ERROR_OTHER: "other error",
+
+  init() {
+    this.log.info("scheduler initialzing");
+    this._observe = this.observe.bind(this);
+    for (let notification of OBSERVERS) {
+      Services.obs.addObserver(this._observe, notification, false);
+    }
+    this._nextScheduledSync = Date.now() + intervals.initial;
+    this._setupTimer();
+  },
+
+  // Note: only called by tests.
+  finalize() {
+    this.log.info("scheduler finalizing");
+    this._clearTimer();
+    for (let notification of OBSERVERS) {
+      Services.obs.removeObserver(this._observe, notification);
+    }
+    this._observe = null;
+  },
+
+  observe(subject, topic, data) {
+    this.log.debug("observed ${}", topic);
+    switch (topic) {
+      case "readinglist:backoff-requested": {
+        // The subject comes in as a string, a number of seconds.
+        let interval = parseInt(data, 10);
+        if (isNaN(interval)) {
+          this.log.warn("Backoff request had non-numeric value", data);
+          return;
+        }
+        this.log.info("Received a request to backoff for ${} seconds", interval);
+        this._backoffUntil = Date.now() + interval * 1000;
+        this._maybeReschedule(0);
+        break;
+      }
+      case "readinglist:local:dirty":
+        this._maybeReschedule(intervals.dirty);
+        break;
+      case "readinglist:user-sync":
+        this._syncNow();
+        break;
+      case "fxaccounts:onverified":
+        // If we were in an authentication error state, reset that now.
+        if (this.state == this.STATE_ERROR_AUTHENTICATION) {
+          this.state = this.STATE_OK;
+        }
+        break;
+
+      // The rest just indicate that now is probably a good time to check if
+      // we can sync as normal using whatever schedule was previously set.
+      default:
+        break;
+    }
+    // When observers fire we ignore the current sync error state as the
+    // notification may indicate it's been resolved.
+    this._setupTimer(true);
+  },
+
+  // Is the current error state such that we shouldn't schedule a new sync.
+  _isBlockedOnError() {
+    // this needs more thought...
+    return this.state == this.STATE_ERROR_AUTHENTICATION;
+  },
+
+  // canSync indicates if we can currently sync.
+  _canSync(ignoreBlockingErrors = false) {
+    if (Services.io.offline) {
+      this.log.info("canSync=false - we are offline");
+      return false;
+    }
+    if (!ignoreBlockingErrors && this._isBlockedOnError()) {
+      this.log.info("canSync=false - we are in a blocked error state", this.state);
+      return false;
+    }
+    this.log.info("canSync=true");
+    return true;
+  },
+
+  // _setupTimer checks the current state and the environment to see when
+  // we should next sync and creates the timer with the appropriate delay.
+  _setupTimer(ignoreBlockingErrors = false) {
+    if (!this._canSync(ignoreBlockingErrors)) {
+      this._clearTimer();
+      return;
+    }
+    if (this._timer) {
+      let when = new Date(this._nextScheduledSync);
+      let delay = this._nextScheduledSync - Date.now();
+      this.log.info("checkStatus - already have a timer - will fire in ${delay}ms at ${when}",
+                    {delay, when});
+      return;
+    }
+    if (this._timerRunning) {
+      this.log.info("checkStatus - currently syncing");
+      return;
+    }
+    // no timer and we can sync, so start a new one.
+    let now = Date.now();
+    let delay = Math.max(0, this._nextScheduledSync - now);
+    let when = new Date(now + delay);
+    this.log.info("next scheduled sync is in ${delay}ms (at ${when})", {delay, when})
+    this._timer = this._setTimeout(delay);
+  },
+
+  // Something (possibly naively) thinks the next sync should happen in
+  // delay-ms. If there's a backoff in progress, ignore the requested delay
+  // and use the back-off. If there's already a timer scheduled for earlier
+  // than delay, let the earlier timer remain. Otherwise, use the requested
+  // delay.
+  _maybeReschedule(delay) {
+    // If there's no delay specified and there's nothing currently scheduled,
+    // it means a backoff request while the sync is actually running - there's
+    // no need to do anything here - the next reschedule after the sync
+    // completes will take the backoff into account.
+    if (!delay && !this._nextScheduledSync) {
+      this.log.debug("_maybeReschedule ignoring a backoff request while running");
+      return;
+    }
+    let now = Date.now();
+    if (!this._nextScheduledSync) {
+      this._nextScheduledSync = now + delay;
+    }
+    // If there is something currently scheduled before the requested delay,
+    // keep the existing value (eg, if we have a timer firing in 1 second, and
+    // get a "dirty" notification that says we should sync in 2 seconds, we
+    // keep the 1 second value)
+    this._nextScheduledSync = Math.min(this._nextScheduledSync, now + delay);
+    // But we still need to honor a backoff.
+    this._nextScheduledSync = Math.max(this._nextScheduledSync, this._backoffUntil);
+    // And always create a new timer next time _setupTimer is called.
+    this._clearTimer();
+  },
+
+  // callback for when the timer fires.
+  _doSync() {
+    this.log.debug("starting sync");
+    this._timer = null;
+    this._timerRunning = true;
+    // flag that there's no new schedule yet, so a request coming in while
+    // we are running does the right thing.
+    this._nextScheduledSync = 0;
+    Services.obs.notifyObservers(null, "readinglist:sync:start", null);
+    this._engine.sync().then(() => {
+      this.log.info("Sync completed successfully");
+      // Write a pref in the same format used to services/sync to indicate
+      // the last success.
+      prefs.set("lastSync", new Date().toString());
+      this.state = this.STATE_OK;
+      this._logManager.resetFileLog(this._logManager.REASON_SUCCESS);
+      Services.obs.notifyObservers(null, "readinglist:sync:finish", null);
+      return intervals.schedule;
+    }).catch(err => {
+      this.log.error("Sync failed", err);
+      // XXX - how to detect an auth error?
+      this.state = err == this._engine.ERROR_AUTHENTICATION ?
+                   this.STATE_ERROR_AUTHENTICATION : this.STATE_ERROR_OTHER;
+      this._logManager.resetFileLog(this._logManager.REASON_ERROR);
+      Services.obs.notifyObservers(null, "readinglist:sync:error", null);
+      return intervals.retry;
+    }).then(nextDelay => {
+      this._timerRunning = false;
+      // ensure a new timer is setup for the appropriate next time.
+      this._maybeReschedule(nextDelay);
+      this._setupTimer();
+      this._onAutoReschedule(); // just for tests...
+    }).catch(err => {
+      // We should never get here, but better safe than sorry...
+      this.log.error("Failed to reschedule after sync completed", err);
+    });
+  },
+
+  _clearTimer() {
+    if (this._timer) {
+      clearTimeout(this._timer);
+      this._timer = null;
+    }
+  },
+
+  // A function to "sync now", but not allowing it to start if one is
+  // already running, and rescheduling the timer.
+  // To call this, just send a "readinglist:user-sync" notification.
+  _syncNow() {
+    if (this._timerRunning) {
+      this.log.info("syncNow() but a sync is already in progress - ignoring");
+      return;
+    }
+    this._clearTimer();
+    this._doSync();
+  },
+
+  // A couple of hook-points for testing.
+  // xpcshell tests hook this so (a) it can check the expected delay is set
+  // and (b) to ignore the delay and set a timeout of 0 so the test is fast.
+  _setTimeout(delay) {
+    return setTimeout(() => this._doSync(), delay);
+  },
+  // xpcshell tests hook this to make sure that the correct state etc exist
+  // after a sync has been completed and a new timer created (or not).
+  _onAutoReschedule() {},
+};
+
+let internalScheduler = new InternalScheduler();
+internalScheduler.init();
+
+// The public interface into this module is tiny, so a simple object that
+// delegates to the implementation.
+let ReadingListScheduler = {
+  get STATE_OK() internalScheduler.STATE_OK,
+  get STATE_ERROR_AUTHENTICATION() internalScheduler.STATE_ERROR_AUTHENTICATION,
+  get STATE_ERROR_OTHER() internalScheduler.STATE_ERROR_OTHER,
+
+  get state() internalScheduler.state,
+};
+
+// These functions are exposed purely for tests, which manage to grab them
+// via a BackstagePass.
+function createTestableScheduler() {
+  // kill the "real" scheduler as we don't want it listening to notifications etc.
+  if (internalScheduler) {
+    internalScheduler.finalize();
+    internalScheduler = null;
+  }
+  // No .init() call - that's up to the tests after hooking.
+  return new InternalScheduler();
+}
+
+// mochitests want the internal state of the real scheduler for various things.
+function getInternalScheduler() {
+  return internalScheduler;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/sidebar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/sidebar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/sidebar.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/sidebar.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,403 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource:///modules/readinglist/ReadingList.jsm");
+
+let log = Cu.import("resource://gre/modules/Log.jsm", {})
+            .Log.repository.getLogger("readinglist.sidebar");
+
+
+let RLSidebar = {
+  /**
+   * Container element for all list item elements.
+   * @type {Element}
+   */
+  list: null,
+
+  /**
+   * <template> element used for constructing list item elements.
+   * @type {Element}
+   */
+  itemTemplate: null,
+
+  /**
+   * Map of ReadingList Item objects, keyed by their ID.
+   * @type {Map}
+   */
+  itemsById: new Map(),
+  /**
+   * Map of list item elements, keyed by their corresponding Item's ID.
+   * @type {Map}
+   */
+  itemNodesById: new Map(),
+
+  /**
+   * Initialize the sidebar UI.
+   */
+  init() {
+    log.debug("Initializing");
+
+    addEventListener("unload", () => this.uninit());
+
+    this.list = document.getElementById("list");
+    this.itemTemplate = document.getElementById("item-template");
+
+    this.list.addEventListener("click", event => this.onListClick(event));
+    this.list.addEventListener("mousemove", event => this.onListMouseMove(event));
+    this.list.addEventListener("keydown", event => this.onListKeyDown(event), true);
+
+    this.ensureListItems();
+    ReadingList.addListener(this);
+
+    let initEvent = new CustomEvent("Initialized", {bubbles: true});
+    document.documentElement.dispatchEvent(initEvent);
+  },
+
+  /**
+   * Un-initialize the sidebar UI.
+   */
+  uninit() {
+    log.debug("Shutting down");
+
+    ReadingList.removeListener(this);
+  },
+
+  /**
+   * Handle an item being added to the ReadingList.
+   * TODO: We may not want to show this new item right now.
+   * TODO: We should guard against the list growing here.
+   *
+   * @param {Readinglist.Item} item - Item that was added.
+   */
+  onItemAdded(item) {
+    log.trace(`onItemAdded: ${item}`);
+
+    let itemNode = document.importNode(this.itemTemplate.content, true).firstElementChild;
+    this.updateItem(item, itemNode);
+    this.list.appendChild(itemNode);
+    this.itemNodesById.set(item.id, itemNode);
+    this.itemsById.set(item.id, item);
+  },
+
+  /**
+   * Handle an item being deleted from the ReadingList.
+   * @param {ReadingList.Item} item - Item that was deleted.
+   */
+  onItemDeleted(item) {
+    log.trace(`onItemDeleted: ${item}`);
+
+    let itemNode = this.itemNodesById.get(item.id);
+    itemNode.remove();
+    this.itemNodesById.delete(item.id);
+    this.itemsById.delete(item.id);
+    // TODO: ensureListItems doesn't yet cope with needing to add one item.
+    //this.ensureListItems();
+  },
+
+  /**
+   * Handle an item in the ReadingList having any of its properties changed.
+   * @param {ReadingList.Item} item - Item that was updated.
+   */
+  onItemUpdated(item) {
+    log.trace(`onItemUpdated: ${item}`);
+
+    let itemNode = this.itemNodesById.get(item.id);
+    if (!itemNode)
+      return;
+
+    this.updateItem(item, itemNode);
+  },
+
+  /**
+   * Update the element representing an item, ensuring it's in sync with the
+   * underlying data.
+   * @param {ReadingList.Item} item - Item to use as a source.
+   * @param {Element} itemNode - Element to update.
+   */
+  updateItem(item, itemNode) {
+    itemNode.setAttribute("id", "item-" + item.id);
+    itemNode.setAttribute("title", `${item.title}\n${item.url.spec}`);
+
+    itemNode.querySelector(".item-title").textContent = item.title;
+    itemNode.querySelector(".item-domain").textContent = item.domain;
+  },
+
+  /**
+   * Ensure that the list is populated with the correct items.
+   */
+  ensureListItems() {
+    ReadingList.getItems().then(items => {
+      for (let item of items) {
+        // TODO: Should be batch inserting via DocumentFragment
+        try {
+          this.onItemAdded(item);
+        } catch (e) {
+          log.warn("Error adding item", e);
+        }
+      }
+    });
+  },
+
+  /**
+   * Get the number of items currently displayed in the list.
+   * @type {number}
+   */
+  get numItems() {
+    return this.list.childElementCount;
+  },
+
+  /**
+   * The currently active element in the list.
+   * @type {Element}
+   */
+  get activeItem() {
+    return document.querySelector("#list > .item.active");
+  },
+
+  set activeItem(node) {
+    if (node && node.parentNode != this.list) {
+      log.error(`Unable to set activeItem to invalid node ${node}`);
+      return;
+    }
+
+    log.debug(`Setting activeItem: ${node ? node.id : null}`);
+
+    if (node) {
+      if (!node.classList.contains("selected")) {
+        this.selectedItem = node;
+      }
+
+      if (node.classList.contains("active")) {
+        return;
+      }
+    }
+
+    let prevItem = document.querySelector("#list > .item.active");
+    if (prevItem) {
+      prevItem.classList.remove("active");
+    }
+
+    if (node) {
+      node.classList.add("active");
+    }
+
+    let event = new CustomEvent("ActiveItemChanged", {bubbles: true});
+    this.list.dispatchEvent(event);
+  },
+
+  /**
+   * The currently selected item in the list.
+   * @type {Element}
+   */
+  get selectedItem() {
+    return document.querySelector("#list > .item.selected");
+  },
+
+  set selectedItem(node) {
+    if (node && node.parentNode != this.list) {
+      log.error(`Unable to set selectedItem to invalid node ${node}`);
+      return;
+    }
+
+    log.debug(`Setting activeItem: ${node ? node.id : null}`);
+
+    let prevItem = document.querySelector("#list > .item.selected");
+    if (prevItem) {
+      prevItem.classList.remove("selected");
+    }
+
+    if (node) {
+      node.classList.add("selected");
+      let itemId = this.getItemIdFromNode(node);
+      this.list.setAttribute("aria-activedescendant", "item-" + itemId);
+    } else {
+      this.list.removeAttribute("aria-activedescendant");
+    }
+
+    let event = new CustomEvent("SelectedItemChanged", {bubbles: true});
+    this.list.dispatchEvent(event);
+  },
+
+  /**
+   * The index of the currently selected item in the list.
+   * @type {number}
+   */
+  get selectedIndex() {
+    for (let i = 0; i < this.numItems; i++) {
+      let item = this.list.children.item(i);
+      if (!item) {
+        break;
+      }
+      if (item.classList.contains("selected")) {
+        return i;
+      }
+    }
+    return -1;
+  },
+
+  set selectedIndex(index) {
+    log.debug(`Setting selectedIndex: ${index}`);
+
+    if (index == -1) {
+      this.selectedItem = null;
+      return;
+    }
+
+    let item = this.list.children.item(index);
+    if (!item) {
+      log.warn(`Unable to set selectedIndex to invalid index ${index}`);
+      return;
+    }
+    this.selectedItem = item;
+  },
+
+  /**
+   * Open a given URL. The event is used to determine where it should be opened
+   * (current tab, new tab, new window).
+   * @param {string} url - URL to open.
+   * @param {Event} event - KeyEvent or MouseEvent that triggered this action.
+   */
+  openURL(url, event) {
+    // TODO: Disabled while working on the listbox mechanics.
+    log.debug(`Opening page ${url}`);
+    return;
+
+    let mainWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                           .getInterface(Ci.nsIWebNavigation)
+                           .QueryInterface(Ci.nsIDocShellTreeItem)
+                           .rootTreeItem
+                           .QueryInterface(Ci.nsIInterfaceRequestor)
+                           .getInterface(Ci.nsIDOMWindow);
+    mainWindow.openUILink(url, event);
+  },
+
+  /**
+   * Get the ID of the Item associated with a given list item element.
+   * @param {element} node - List item element to get an ID for.
+   * @return {string} Assocated Item ID.
+   */
+  getItemIdFromNode(node) {
+    let id = node.getAttribute("id");
+    if (id && id.startsWith("item-")) {
+      return id.slice(5);
+    }
+
+    return null;
+  },
+
+  /**
+   * Get the Item associated with a given list item element.
+   * @param {element} node - List item element to get an Item for.
+   * @return {string} Associated Item.
+   */
+  getItemFromNode(node) {
+    let itemId = this.getItemIdFromNode(node);
+    if (!itemId) {
+      return null;
+    }
+
+    return this.itemsById.get(itemId);
+  },
+
+  /**
+   * Open the active item in the list.
+   * @param {Event} event - Event triggering this.
+   */
+  openActiveItem(event) {
+    let itemNode = this.activeItem;
+    if (!itemNode) {
+      return;
+    }
+
+    let item = this.getItemFromNode(itemNode);
+    this.openURL(item.url.spec, event);
+  },
+
+  /**
+   * Find the parent item element, from a given child element.
+   * @param {Element} node - Child element.
+   * @return {Element} Element for the item, or null if not found.
+   */
+  findParentItemNode(node) {
+    while (node && node != this.list && node != document.documentElement &&
+           !node.classList.contains("item")) {
+      node = node.parentNode;
+    }
+
+    if (node != this.list && node != document.documentElement) {
+      return node;
+    }
+
+    return null;
+  },
+
+  /**
+   * Handle a click event on the list box.
+   * @param {Event} event - Triggering event.
+   */
+  onListClick(event) {
+    let itemNode = this.findParentItemNode(event.target);
+    if (!itemNode)
+      return;
+
+    this.activeItem = itemNode;
+    this.openActiveItem(event);
+  },
+
+  /**
+   * Handle a mousemove event over the list box.
+   * @param {Event} event - Triggering event.
+   */
+  onListMouseMove(event) {
+    let itemNode = this.findParentItemNode(event.target);
+    if (!itemNode)
+      return;
+
+    this.selectedItem = itemNode;
+  },
+
+  /**
+   * Handle a keydown event on the list box.
+   * @param {Event} event - Triggering event.
+   */
+  onListKeyDown(event) {
+    if (event.keyCode == KeyEvent.DOM_VK_DOWN) {
+      // TODO: Refactor this so we pass a direction to a generic method.
+      // See autocomplete.xml's getNextIndex
+      event.preventDefault();
+      let index = this.selectedIndex + 1;
+      if (index >= this.numItems) {
+        index = 0;
+      }
+
+      this.selectedIndex = index;
+      this.selectedItem.focus();
+    } else if (event.keyCode == KeyEvent.DOM_VK_UP) {
+      event.preventDefault();
+
+      let index = this.selectedIndex - 1;
+      if (index < 0) {
+        index = this.numItems - 1;
+      }
+
+      this.selectedIndex = index;
+      this.selectedItem.focus();
+    } else if (event.keyCode == KeyEvent.DOM_VK_RETURN) {
+      let selectedItem = this.selectedItem;
+      if (selectedItem) {
+        this.activeItem = this.selectedItem;
+        this.openActiveItem(event);
+      }
+    }
+  },
+};
+
+
+addEventListener("DOMContentLoaded", () => RLSidebar.init());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/sidebar.xhtml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/sidebar.xhtml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/sidebar.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/sidebar.xhtml	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,30 @@
+<?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/. -->
+
+<!DOCTYPE html [
+  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
+  %browserDTD;
+]>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <script src="chrome://browser/content/readinglist/sidebar.js" type="application/javascript;version=1.8"></script>
+    <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/readinglist/sidebar.css"/>
+    <!-- <title>&readingList.label;</title> -->
+  </head>
+
+  <body role="application">
+    <template id="item-template">
+      <div class="item" role="option" tabindex="-1">
+        <div class="item-thumb-container"></div>
+        <div class="item-summary-container">
+          <div class="item-title"></div>
+          <div class="item-domain"></div>
+        </div>
+      </div>
+    </template>
+
+    <div id="list" role="listbox" tabindex="1"></div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser.ini	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+  head.js
+
+[browser_ui_enable_disable.js]
+[browser_sidebar_list.js]
+;[browser_sidebar_mouse_nav.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser_sidebar_list.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser_sidebar_list.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser_sidebar_list.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser_sidebar_list.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,53 @@
+/**
+ * This tests the basic functionality of the sidebar to list items.
+ */
+
+add_task(function*() {
+  registerCleanupFunction(function*() {
+    ReadingListUI.hideSidebar();
+    yield RLUtils.cleanup();
+  });
+
+  RLUtils.enabled = true;
+
+  yield ReadingListUI.showSidebar();
+  let RLSidebar = RLSidebarUtils.RLSidebar;
+  let sidebarDoc = SidebarUI.browser.contentDocument;
+  Assert.equal(RLSidebar.numItems, 0, "Should start with no items");
+  Assert.equal(RLSidebar.activeItem, null, "Should start with no active item");
+  Assert.equal(RLSidebar.activeItem, null, "Should start with no selected item");
+
+  info("Adding first item");
+  yield RLUtils.addItem({
+    id: "c3502a49-bcef-4a94-b222-d4834463de33",
+    url: "http://example.com/article1",
+    title: "Article 1",
+  });
+  RLSidebarUtils.expectNumItems(1);
+
+  info("Adding more items");
+  yield RLUtils.addItem([{
+    id: "e054f5b7-1f4f-463f-bb96-d64c02448c31",
+    url: "http://example.com/article2",
+    title: "Article 2",
+  }, {
+    id: "4207230b-2364-4e97-9587-01312b0ce4e6",
+    url: "http://example.com/article3",
+    title: "Article 3",
+  }]);
+  RLSidebarUtils.expectNumItems(3);
+
+  info("Closing sidebar");
+  ReadingListUI.hideSidebar();
+
+  info("Adding another item");
+  yield RLUtils.addItem({
+    id: "dae0e855-607e-4df3-b27f-73a5e35c94fe",
+    url: "http://example.com/article4",
+    title: "Article 4",
+  });
+
+  info("Re-eopning sidebar");
+  yield ReadingListUI.showSidebar();
+  RLSidebarUtils.expectNumItems(4);
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser_sidebar_mouse_nav.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,84 @@
+/**
+ * Test mouse navigation for selecting items in the sidebar.
+ */
+
+
+function mouseInteraction(mouseEvent, responseEvent, itemNode) {
+  let eventPromise = BrowserUITestUtils.waitForEvent(RLSidebarUtils.list, responseEvent);
+  let details = {};
+  if (mouseEvent != "click") {
+    details.type = mouseEvent;
+  }
+
+  EventUtils.synthesizeMouseAtCenter(itemNode, details, itemNode.ownerDocument.defaultView);
+  return eventPromise;
+}
+
+add_task(function*() {
+  registerCleanupFunction(function*() {
+    ReadingListUI.hideSidebar();
+    yield RLUtils.cleanup();
+  });
+
+  RLUtils.enabled = true;
+
+  let itemData = [{
+    id: "00bd24c7-3629-40b0-acde-37aa81768735",
+    url: "http://example.com/article1",
+    title: "Article 1",
+  }, {
+    id: "28bf7f19-cf94-4ceb-876a-ac1878342e0d",
+    url: "http://example.com/article2",
+    title: "Article 2",
+  }, {
+    id: "7e5064ea-f45d-4fc7-8d8c-c067b7781e78",
+    url: "http://example.com/article3",
+    title: "Article 3",
+  }, {
+    id: "8e72a472-8db8-4904-ba39-9672f029e2d0",
+    url: "http://example.com/article4",
+    title: "Article 4",
+  }, {
+    id: "8d332744-37bc-4a1a-a26b-e9953b9f7d91",
+    url: "http://example.com/article5",
+    title: "Article 5",
+  }];
+  info("Adding initial mock data");
+  yield RLUtils.addItem(itemData);
+
+  info("Opening sidebar");
+  yield ReadingListUI.showSidebar();
+  RLSidebarUtils.expectNumItems(5);
+  RLSidebarUtils.expectSelectedId(null);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 1");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[0]);
+  RLSidebarUtils.expectSelectedId(itemData[0].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 2");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[1]);
+  RLSidebarUtils.expectSelectedId(itemData[1].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 5");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[4]);
+  RLSidebarUtils.expectSelectedId(itemData[4].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse move over item 1 again");
+  yield mouseInteraction("mousemove", "SelectedItemChanged", RLSidebarUtils.list.children[0]);
+  RLSidebarUtils.expectSelectedId(itemData[0].id);
+  RLSidebarUtils.expectActiveId(null);
+
+  info("Mouse click on item 1");
+  yield mouseInteraction("click", "ActiveItemChanged", RLSidebarUtils.list.children[0]);
+  RLSidebarUtils.expectSelectedId(itemData[0].id);
+  RLSidebarUtils.expectActiveId(itemData[0].id);
+
+  info("Mouse click on item 3");
+  yield mouseInteraction("click", "ActiveItemChanged", RLSidebarUtils.list.children[2]);
+  RLSidebarUtils.expectSelectedId(itemData[2].id);
+  RLSidebarUtils.expectActiveId(itemData[2].id);
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser_ui_enable_disable.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser_ui_enable_disable.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/browser_ui_enable_disable.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/browser_ui_enable_disable.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,68 @@
+/**
+ * Test enabling/disabling the entire ReadingList feature via the
+ * browser.readinglist.enabled preference.
+ */
+
+function checkRLState() {
+  let enabled = RLUtils.enabled;
+  info("Checking ReadingList UI is " + (enabled ? "enabled" : "disabled"));
+
+  let sidebarBroadcaster = document.getElementById("readingListSidebar");
+  let sidebarMenuitem = document.getElementById("menu_readingListSidebar");
+
+  let bookmarksMenubarItem = document.getElementById("menu_readingList");
+  let bookmarksMenubarSeparator = document.getElementById("menu_readingListSeparator");
+
+  if (enabled) {
+    Assert.notEqual(sidebarBroadcaster.getAttribute("hidden"), "true",
+                    "Sidebar broadcaster should not be hidden");
+    Assert.notEqual(sidebarMenuitem.getAttribute("hidden"), "true",
+                    "Sidebar menuitem should be visible");
+
+    // Currently disabled on OSX.
+    if (bookmarksMenubarItem) {
+      Assert.notEqual(bookmarksMenubarItem.getAttribute("hidden"), "true",
+                      "RL bookmarks submenu in menubar should not be hidden");
+      Assert.notEqual(sidebarMenuitem.getAttribute("hidden"), "true",
+                      "RL bookmarks separator in menubar should be visible");
+    }
+  } else {
+    Assert.equal(sidebarBroadcaster.getAttribute("hidden"), "true",
+                 "Sidebar broadcaster should be hidden");
+    Assert.equal(sidebarMenuitem.getAttribute("hidden"), "true",
+                 "Sidebar menuitem should be hidden");
+    Assert.equal(ReadingListUI.isSidebarOpen, false,
+                 "ReadingListUI should not think sidebar is open");
+
+    // Currently disabled on OSX.
+    if (bookmarksMenubarItem) {
+      Assert.equal(bookmarksMenubarItem.getAttribute("hidden"), "true",
+                      "RL bookmarks submenu in menubar should not be hidden");
+      Assert.equal(sidebarMenuitem.getAttribute("hidden"), "true",
+                      "RL bookmarks separator in menubar should be visible");
+    }
+  }
+
+  if (!enabled) {
+    Assert.equal(SidebarUI.isOpen, false, "Sidebar should not be open");
+  }
+}
+
+add_task(function*() {
+  info("Start with ReadingList disabled");
+  RLUtils.enabled = false;
+  checkRLState();
+  info("Enabling ReadingList");
+  RLUtils.enabled = true;
+  checkRLState();
+
+  info("Opening ReadingList sidebar");
+  yield ReadingListUI.showSidebar();
+  Assert.ok(SidebarUI.isOpen, "Sidebar should be open");
+  Assert.equal(SidebarUI.currentID, "readingListSidebar", "Sidebar should have ReadingList loaded");
+
+  info("Disabling ReadingList");
+  RLUtils.enabled = false;
+  Assert.ok(!SidebarUI.isOpen, "Sidebar should be closed");
+  checkRLState();
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/browser/head.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/browser/head.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,15 @@
+XPCOMUtils.defineLazyModuleGetter(this, "ReadingList",
+                                  "resource:///modules/readinglist/ReadingList.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ReadingListTestUtils",
+                                  "resource://testing-common/ReadingListTestUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "BrowserUITestUtils",
+                                  "resource://testing-common/BrowserUITestUtils.jsm");
+
+
+XPCOMUtils.defineLazyGetter(this, "RLUtils", () => {
+  return ReadingListTestUtils;
+});
+
+XPCOMUtils.defineLazyGetter(this, "RLSidebarUtils", () => {
+  return new RLUtils.SidebarUtils(window, Assert);
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/ReadingListTestUtils.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/ReadingListTestUtils.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/ReadingListTestUtils.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/ReadingListTestUtils.jsm	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,159 @@
+"use strict";
+
+this.EXPORTED_SYMBOLS = [
+  "ReadingListTestUtils",
+];
+
+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/Preferences.jsm");
+Cu.import("resource:///modules/readinglist/ReadingList.jsm");
+
+
+/** Preference name controlling whether the ReadingList feature is enabled/disabled. */
+const PREF_RL_ENABLED = "browser.readinglist.enabled";
+
+
+/**
+ * Utilities for testing the ReadingList sidebar.
+ */
+function SidebarUtils(window, assert) {
+  this.window = window;
+  this.Assert = assert;
+}
+
+SidebarUtils.prototype = {
+  /**
+   * Reference to the RLSidebar object controlling the ReadingList sidebar UI.
+   * @type {object}
+   */
+  get RLSidebar() {
+    return this.window.SidebarUI.browser.contentWindow.RLSidebar;
+  },
+
+  /**
+   * Reference to the list container element in the sidebar.
+   * @type {Element}
+   */
+  get list() {
+    return this.RLSidebar.list;
+  },
+
+  /**
+   * Check that the number of elements in the list matches the expected count.
+   * @param {number} count - Expected number of items.
+   */
+  expectNumItems(count) {
+    this.Assert.equal(this.list.childElementCount, count,
+                      "Should have expected number of items in the sidebar list");
+  },
+
+  /**
+   * Check all items in the sidebar list, ensuring the DOM matches the data.
+   */
+  checkAllItems() {
+    for (let itemNode of this.list.children) {
+      this.checkSidebarItem(itemNode);
+    }
+  },
+
+  /**
+   * Run a series of sanity checks for an element in the list associated with
+   * an Item, ensuring the DOM matches the data.
+   */
+  checkItem(node) {
+    let item = this.RLSidebar.getItemFromNode(node);
+
+    this.Assert.ok(node.classList.contains("item"),
+                   "Node should have .item class");
+    this.Assert.equal(node.id, "item-" + item.id,
+                      "Node should have correct ID");
+    this.Assert.equal(node.getAttribute("title"), item.title + "\n" + item.url.spec,
+                      "Node should have correct title attribute");
+    this.Assert.equal(node.querySelector(".item-title").textContent, item.title,
+                      "Node's title element's text should match item title");
+    this.Assert.equal(node.querySelector(".item-domain").textContent, item.domain,
+                      "Node's domain element's text should match item title");
+  },
+
+  expectSelectedId(itemId) {
+    let selectedItem = this.RLSidebar.selectedItem;
+    if (itemId == null) {
+      this.Assert.equal(selectedItem, null, "Should have no selected item");
+    } else {
+      this.Assert.notEqual(selectedItem, null, "selectedItem should not be null");
+      let selectedId = this.RLSidebar.getItemIdFromNode(selectedItem);
+      this.Assert.equal(itemId, selectedId, "Should have currect item selected");
+    }
+  },
+
+  expectActiveId(itemId) {
+    let activeItem = this.RLSidebar.activeItem;
+    if (itemId == null) {
+      this.Assert.equal(activeItem, null, "Should have no active item");
+    } else {
+      this.Assert.notEqual(activeItem, null, "activeItem should not be null");
+      let activeId = this.RLSidebar.getItemIdFromNode(activeItem);
+      this.Assert.equal(itemId, activeId, "Should have correct item active");
+    }
+  },
+};
+
+
+/**
+ * Utilities for testing the ReadingList.
+ */
+this.ReadingListTestUtils = {
+  /**
+   * Whether the ReadingList feature is enabled or not.
+   * @type {boolean}
+   */
+  get enabled() {
+    return Preferences.get(PREF_RL_ENABLED, false);
+  },
+  set enabled(value) {
+    Preferences.set(PREF_RL_ENABLED, !!value);
+  },
+
+  /**
+   * Utilities for testing the ReadingList sidebar.
+   */
+  SidebarUtils: SidebarUtils,
+
+  /**
+   * Synthetically add an item to the ReadingList.
+   * @param {object|[object]} data - Object or array of objects to pass to the
+   *                                 Item constructor.
+   * @return {Promise} Promise that gets fulfilled with the item or items added.
+   */
+  addItem(data) {
+    if (Array.isArray(data)) {
+      let promises = [];
+      for (let itemData of data) {
+        promises.push(this.addItem(itemData));
+      }
+      return Promise.all(promises);
+    }
+
+    return new Promise(resolve => {
+      let item = new ReadingList.Item(data);
+      ReadingList._items.push(item);
+      ReadingList._notifyListeners("onItemAdded", item);
+      resolve(item);
+    });
+  },
+
+  /**
+   * Cleanup all data, resetting to a blank state.
+   */
+  cleanup() {
+    return new Promise(resolve => {
+      ReadingList._items = [];
+      ReadingList._listeners.clear();
+      Preferences.reset(PREF_RL_ENABLED);
+      resolve();
+    });
+  },
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/xpcshell/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/xpcshell/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/xpcshell/head.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/xpcshell/head.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,7 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/xpcshell/test_scheduler.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/xpcshell/test_scheduler.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/xpcshell/test_scheduler.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/xpcshell/test_scheduler.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,146 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+XPCOMUtils.defineLazyModuleGetter(this, 'setTimeout',
+  'resource://gre/modules/Timer.jsm');
+
+// Setup logging prefs before importing the scheduler module.
+Services.prefs.setCharPref("readinglist.log.appender.dump", "Trace");
+
+let {createTestableScheduler} = Cu.import("resource:///modules/readinglist/Scheduler.jsm", {});
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
+
+// Log rotation needs a profile dir.
+do_get_profile();
+
+let prefs = new Preferences("readinglist.scheduler.");
+
+function promiseObserver(topic) {
+  return new Promise(resolve => {
+    let obs = (subject, topic, data) => {
+      Services.obs.removeObserver(obs, topic);
+      resolve(data);
+    }
+    Services.obs.addObserver(obs, topic, false);
+  });
+}
+
+function createScheduler(options) {
+  // avoid typos in the test and other footguns in the options.
+  let allowedOptions = ["expectedDelay", "expectNewTimer", "syncFunction"];
+  for (let key of Object.keys(options)) {
+    if (!allowedOptions.includes(key)) {
+      throw new Error("Invalid option " + key);
+    }
+  }
+  let scheduler = createTestableScheduler();
+  // make our hooks
+  let syncFunction = options.syncFunction || Promise.resolve;
+  scheduler._engine.sync = syncFunction;
+  // we expect _setTimeout to be called *twice* - first is the initial sync,
+  // and there's no need to test the delay used for that. options.expectedDelay
+  // is to check the *subsequent* timer.
+  let numCalls = 0;
+  scheduler._setTimeout = function(delay) {
+    ++numCalls;
+    print("Test scheduler _setTimeout call number " + numCalls + " with delay=" + delay);
+    switch (numCalls) {
+      case 1:
+        // this is the first and boring schedule as it initializes - do nothing
+        // other than return a timer that fires immediately.
+        return setTimeout(() => scheduler._doSync(), 0);
+        break;
+      case 2:
+        // This is the one we are interested in, so check things.
+        if (options.expectedDelay) {
+          // a little slop is OK as it takes a few ms to actually set the timer
+          ok(Math.abs(options.expectedDelay * 1000 - delay) < 500, [options.expectedDelay * 1000, delay]);
+        }
+        // and return a timeout that "never" fires
+        return setTimeout(() => scheduler._doSync(), 10000000);
+        break;
+      default:
+        // This is unexpected!
+        ok(false, numCalls);
+    }
+  };
+  // And a callback made once we've determined the next delay. This is always
+  // called even if _setTimeout isn't (due to no timer being created)
+  scheduler._onAutoReschedule = () => {
+    // Most tests expect a new timer, so this is "opt out"
+    let expectNewTimer = options.expectNewTimer === undefined ? true : options.expectNewTimer;
+    ok(expectNewTimer ? scheduler._timer : !scheduler._timer);
+  }
+  // calling .init fires things off...
+  scheduler.init();
+  return scheduler;
+}
+
+add_task(function* testSuccess() {
+  // promises which resolve once we've got all the expected notifications.
+  let allNotifications = [
+    promiseObserver("readinglist:sync:start"),
+    promiseObserver("readinglist:sync:finish"),
+  ];
+  // New delay should be "as regularly scheduled".
+  prefs.set("schedule", 100);
+  let scheduler = createScheduler({expectedDelay: 100});
+  yield Promise.all(allNotifications);
+  scheduler.finalize();
+});
+
+add_task(function* testOffline() {
+  let scheduler = createScheduler({expectNewTimer: false});
+  Services.io.offline = true;
+  ok(!scheduler._canSync(), "_canSync is false when offline.")
+  ok(!scheduler._timer, "there is no current timer while offline.")
+  Services.io.offline = false;
+  ok(scheduler._canSync(), "_canSync is true when online.")
+  ok(scheduler._timer, "there is a new timer when back online.")
+  scheduler.finalize();
+});
+
+add_task(function* testRetryableError() {
+  let allNotifications = [
+    promiseObserver("readinglist:sync:start"),
+    promiseObserver("readinglist:sync:error"),
+  ];
+  prefs.set("retry", 10);
+  let scheduler = createScheduler({
+    expectedDelay: 10,
+    syncFunction: () => Promise.reject("transient"),
+  });
+  yield Promise.all(allNotifications);
+  scheduler.finalize();
+});
+
+add_task(function* testAuthError() {
+  prefs.set("retry", 10);
+  // We expect an auth error to result in no new timer (as it's waiting for
+  // some indication it can proceed), but with the next delay being a normal
+  // "retry" interval (so when we can proceed it is probably already stale, so
+  // is effectively "immediate")
+  let scheduler = createScheduler({
+    expectedDelay: 10,
+    syncFunction:  () => {
+      return Promise.reject(ReadingListScheduler._engine.ERROR_AUTHENTICATION);
+    },
+    expectNewTimer: false
+  });
+  // XXX - TODO - send an observer that "unblocks" us and ensure we actually
+  // do unblock.
+  scheduler.finalize();
+});
+
+add_task(function* testBackoff() {
+  let scheduler = createScheduler({expectedDelay: 1000});
+  Services.obs.notifyObservers(null, "readinglist:backoff-requested", 1000);
+  // XXX - this needs a little love as nothing checks createScheduler actually
+  // made the checks we think it does.
+  scheduler.finalize();
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/xpcshell/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/xpcshell/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/readinglist/test/xpcshell/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/readinglist/test/xpcshell/xpcshell.ini	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,5 @@
+[DEFAULT]
+head = head.js
+firefox-appdir = browser
+
+[test_scheduler.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/content/search.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/content/search.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/content/search.xml	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/content/search.xml	2015-02-28 15:03:01.000000000 +0000
@@ -826,6 +826,8 @@
         element = document.createElementNS(kXULNS, "menuseparator");
         cxmenu.appendChild(element);
 
+        this.setAttribute("aria-owns", this.popup.id);
+
         var insertLocation = cxmenu.firstChild;
         while (insertLocation.nextSibling &&
                insertLocation.getAttribute("cmd") != "cmd_paste")
@@ -1019,9 +1021,11 @@
           if (val && !val.classList.contains("dummy")) {
             val.setAttribute("selected", "true");
             this._selectedButton = val;
+            this.setAttribute("aria-activedescendant", val.id);
             return;
           }
 
+          this.removeAttribute("aria-activedescendant");
           this._selectedButton = null;
         ]]></setter>
       </property>
@@ -1063,6 +1067,12 @@
           let selectedButton = this.selectedButton;
           let buttons = this.getSelectableButtons(aCycleEngines);
 
+          let suggestionsHidden;
+          if (!aSkipSuggestions && popup.hasAttribute("showonlysettings")) {
+            aSkipSuggestions = true;
+            suggestionsHidden = true;
+          }
+
           // If the last suggestion is selected, DOWN selects the first button.
           if (!aSkipSuggestions && aForward &&
               popup.selectedIndex + 1 == popup.view.rowCount) {
@@ -1083,7 +1093,7 @@
             else
               this.selectedButton = null;
 
-            if (this.selectedButton || aCycleEngines)
+            if (this.selectedButton || aCycleEngines || suggestionsHidden)
               return true;
 
             // Set the selectedIndex to something that will make
@@ -1104,7 +1114,7 @@
               return true;
             }
 
-            if (!aForward && (aCycleEngines ||
+            if (!aForward && (aCycleEngines || suggestionsHidden ||
                               (!aSkipSuggestions && popup.selectedIndex == -1))) {
               // the last button.
               this.selectedButton = buttons[buttons.length - 1];
@@ -1123,15 +1133,6 @@
           if (!popup.popupOpen)
             return;
 
-          if (aEvent.keyCode == KeyEvent.DOM_VK_DOWN &&
-              popup.hasAttribute("showonlysettings")) {
-            // If the suggestion tree is collapsed, don't let the down arrow
-            // key event reach the tree.
-            aEvent.preventDefault();
-            aEvent.stopPropagation();
-            return;
-          }
-
           let list = document.getAnonymousElementByAttribute(popup, "anonid",
                                                              "search-panel-one-offs");
           if (!list) // remove this check when removing the old search UI.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/test/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/test/browser.ini	2015-02-28 15:03:01.000000000 +0000
@@ -44,4 +44,5 @@
 [browser_searchbar_openpopup.js]
 skip-if = os == "linux" || e10s # Linux has different focus behaviours and e10s seems to have timing issues.
 [browser_searchbar_keyboard_navigation.js]
+[browser_searchbar_smallpanel_keyboard_navigation.js]
 [browser_webapi.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/test/browser_searchbar_openpopup.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/test/browser_searchbar_openpopup.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/test/browser_searchbar_openpopup.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/test/browser_searchbar_openpopup.js	2015-02-28 15:03:01.000000000 +0000
@@ -191,6 +191,27 @@
   textbox.value = "";
 });
 
+// Moving focus away from the search box should close the small popup
+add_task(function* focus_change_closes_small_popup() {
+  gURLBar.focus();
+
+  let promise = promiseEvent(searchPopup, "popupshown");
+  // For some reason sending the mouse event immediately doesn't open the popup.
+  SimpleTest.executeSoon(() => {
+    EventUtils.synthesizeMouseAtCenter(searchIcon, {});
+  });
+  yield promise;
+  is(searchPopup.getAttribute("showonlysettings"), "true", "Should show the small popup");
+
+  is(Services.focus.focusedElement, textbox.inputField, "Should have focused the search bar");
+
+  promise = promiseEvent(searchPopup, "popuphidden");
+  let promise2 = promiseEvent(searchbar, "blur");
+  EventUtils.synthesizeKey("VK_TAB", { shiftKey: true });
+  yield promise;
+  yield promise2;
+});
+
 // Pressing escape should close the popup.
 add_task(function* escape_closes_popup() {
   gURLBar.focus();
@@ -431,6 +452,28 @@
   is(textbox.selectionEnd, 9, "Should have moved the caret (selectionEnd after right)");
   is(searchPopup.state, "open", "Popup should still be open");
 
+  // Ensure caret movement works while a suggestion is selected.
+  is(textbox.popup.selectedIndex, -1, "No selected item in list");
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  is(textbox.popup.selectedIndex, 0, "Selected item in list");
+  is(textbox.selectionStart, 9, "Should have moved the caret to the end (selectionStart after selection)");
+  is(textbox.selectionEnd, 9, "Should have moved the caret to the end (selectionEnd after selection)");
+
+  EventUtils.synthesizeKey("VK_LEFT", {});
+  is(textbox.selectionStart, 8, "Should have moved the caret again (selectionStart after left)");
+  is(textbox.selectionEnd, 8, "Should have moved the caret again (selectionEnd after left)");
+  is(searchPopup.state, "open", "Popup should still be open");
+
+  EventUtils.synthesizeKey("VK_LEFT", {});
+  is(textbox.selectionStart, 7, "Should have moved the caret (selectionStart after left)");
+  is(textbox.selectionEnd, 7, "Should have moved the caret (selectionEnd after left)");
+  is(searchPopup.state, "open", "Popup should still be open");
+
+  EventUtils.synthesizeKey("VK_RIGHT", {});
+  is(textbox.selectionStart, 8, "Should have moved the caret (selectionStart after right)");
+  is(textbox.selectionEnd, 8, "Should have moved the caret (selectionEnd after right)");
+  is(searchPopup.state, "open", "Popup should still be open");
+
   if (navigator.platform.indexOf("Mac") == -1) {
     EventUtils.synthesizeKey("VK_HOME", {});
     is(textbox.selectionStart, 0, "Should have moved the caret (selectionStart after home)");
@@ -442,4 +485,6 @@
   promise = promiseEvent(searchPopup, "popuphidden");
   EventUtils.synthesizeKey("VK_ESCAPE", {});
   yield promise;
+
+  textbox.value = "";
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/test/browser_searchbar_smallpanel_keyboard_navigation.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/test/browser_searchbar_smallpanel_keyboard_navigation.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/search/test/browser_searchbar_smallpanel_keyboard_navigation.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/search/test/browser_searchbar_smallpanel_keyboard_navigation.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,377 @@
+// Tests that keyboard navigation in the search panel works as designed.
+
+const searchbar = document.getElementById("searchbar");
+const textbox = searchbar._textbox;
+const searchPopup = document.getElementById("PopupSearchAutoComplete");
+const searchIcon = document.getAnonymousElementByAttribute(searchbar, "anonid",
+                                                           "searchbar-search-button");
+
+const kValues = ["foo1", "foo2", "foo3"];
+
+// Get an array of the one-off buttons.
+function getOneOffs() {
+  let oneOffs = [];
+  let oneOff = document.getAnonymousElementByAttribute(searchPopup, "anonid",
+                                                       "search-panel-one-offs");
+  for (oneOff = oneOff.firstChild; oneOff; oneOff = oneOff.nextSibling) {
+    if (oneOff.classList.contains("dummy"))
+      break;
+    oneOffs.push(oneOff);
+  }
+
+  return oneOffs;
+}
+
+function getOpenSearchItems() {
+  let os = [];
+
+  let addEngineList =
+    document.getAnonymousElementByAttribute(searchPopup, "anonid",
+                                            "add-engines");
+  for (let item = addEngineList.firstChild; item; item = item.nextSibling)
+    os.push(item);
+
+  return os;
+}
+
+add_task(function* init() {
+  yield promiseNewEngine("testEngine.xml");
+
+  // First cleanup the form history in case other tests left things there.
+  yield new Promise((resolve, reject) => {
+    info("cleanup the search history");
+    searchbar.FormHistory.update({op: "remove", fieldname: "searchbar-history"},
+                                 {handleCompletion: resolve,
+                                  handleError: reject});
+  });
+
+  yield new Promise((resolve, reject) => {
+    info("adding search history values: " + kValues);
+    let ops = kValues.map(value => { return {op: "add",
+                                             fieldname: "searchbar-history",
+                                             value: value}
+                                   });
+    searchbar.FormHistory.update(ops, {
+      handleCompletion: function() {
+        registerCleanupFunction(() => {
+          info("removing search history values: " + kValues);
+          let ops =
+            kValues.map(value => { return {op: "remove",
+                                           fieldname: "searchbar-history",
+                                           value: value}
+                                 });
+          searchbar.FormHistory.update(ops);
+        });
+        resolve();
+      },
+      handleError: reject
+    });
+  });
+});
+
+
+add_task(function* test_arrows() {
+  let promise = promiseEvent(searchPopup, "popupshown");
+  info("Opening search panel");
+  EventUtils.synthesizeMouseAtCenter(searchIcon, {});
+  yield promise;
+info("textbox.mController.searchString = " + textbox.mController.searchString);
+  is(textbox.mController.searchString, "", "The search string should be empty");
+
+  // Check the initial state of the panel before sending keyboard events.
+  is(searchPopup.getAttribute("showonlysettings"), "true", "Should show the small popup");
+  // Having suggestions populated (but hidden) is important, because if there
+  // are none we can't ensure the keyboard events don't reach them.
+  is(searchPopup.view.rowCount, kValues.length, "There should be 3 suggestions");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+
+  // The tests will be less meaningful if the first, second, last, and
+  // before-last one-off buttons aren't different. We should always have more
+  // than 4 default engines, but it's safer to check this assumption.
+  let oneOffs = getOneOffs();
+  ok(oneOffs.length >= 4, "we have at least 4 one-off buttons displayed")
+
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+
+  // Pressing should select the first one-off.
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  is(textbox.value, "", "the textfield value should be unmodified");
+
+  // now cycle through the one-off items, the first one is already selected.
+  for (let i = 0; i < oneOffs.length; ++i) {
+    is(textbox.selectedButton, oneOffs[i],
+       "the one-off button #" + (i + 1) + " should be selected");
+    EventUtils.synthesizeKey("VK_DOWN", {});
+  }
+
+  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
+     "the settings item should be selected");
+  EventUtils.synthesizeKey("VK_DOWN", {});
+
+  // We should now be back to the initial situation.
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+
+  info("now test the up arrow key");
+  EventUtils.synthesizeKey("VK_UP", {});
+  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
+     "the settings item should be selected");
+
+  // cycle through the one-off items, the first one is already selected.
+  for (let i = oneOffs.length; i; --i) {
+    EventUtils.synthesizeKey("VK_UP", {});
+    is(textbox.selectedButton, oneOffs[i - 1],
+       "the one-off button #" + i + " should be selected");
+  }
+
+  // Another press on up should clear the one-off selection.
+  EventUtils.synthesizeKey("VK_UP", {});
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  is(textbox.value, "", "the textfield value should be unmodified");
+});
+
+add_task(function* test_tab() {
+  is(Services.focus.focusedElement, textbox.inputField,
+     "the search bar should be focused"); // from the previous test.
+
+  let oneOffs = getOneOffs();
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+
+  // Pressing tab should select the first one-off without selecting suggestions.
+  // now cycle through the one-off items, the first one is already selected.
+  for (let i = 0; i < oneOffs.length; ++i) {
+    EventUtils.synthesizeKey("VK_TAB", {});
+    is(textbox.selectedButton, oneOffs[i],
+       "the one-off button #" + (i + 1) + " should be selected");
+  }
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  is(textbox.value, "", "the textfield value should be unmodified");
+
+  // One more <tab> selects the settings button.
+  EventUtils.synthesizeKey("VK_TAB", {});
+  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
+     "the settings item should be selected");
+
+  // Pressing tab again should close the panel...
+  let promise = promiseEvent(searchPopup, "popuphidden");
+  EventUtils.synthesizeKey("VK_TAB", {});
+  yield promise;
+
+  // ... and move the focus out of the searchbox.
+  isnot(Services.focus.focusedElement, textbox.inputField,
+        "the search bar no longer be focused");
+});
+
+add_task(function* test_shift_tab() {
+  // First reopen the panel.
+  let promise = promiseEvent(searchPopup, "popupshown");
+  info("Opening search panel");
+  SimpleTest.executeSoon(() => {
+    EventUtils.synthesizeMouseAtCenter(searchIcon, {});
+  });
+  yield promise;
+
+  let oneOffs = getOneOffs();
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+  is(searchPopup.getAttribute("showonlysettings"), "true", "Should show the small popup");
+
+  // Press up once to select the last button.
+  EventUtils.synthesizeKey("VK_UP", {});
+  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
+     "the settings item should be selected");
+
+  // Press up again to select the last one-off button.
+  EventUtils.synthesizeKey("VK_UP", {});
+
+  // Pressing shift+tab should cycle through the one-off items.
+  for (let i = oneOffs.length - 1; i >= 0; --i) {
+    is(textbox.selectedButton, oneOffs[i],
+       "the one-off button #" + (i + 1) + " should be selected");
+    if (i)
+      EventUtils.synthesizeKey("VK_TAB", {shiftKey: true});
+  }
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  is(textbox.value, "", "the textfield value should be unmodified");
+
+  // Pressing shift+tab again should close the panel...
+  promise = promiseEvent(searchPopup, "popuphidden");
+  EventUtils.synthesizeKey("VK_TAB", {shiftKey: true});
+  yield promise;
+
+  // ... and move the focus out of the searchbox.
+  isnot(Services.focus.focusedElement, textbox.inputField,
+        "the search bar no longer be focused");
+});
+
+add_task(function* test_alt_down() {
+  // First reopen the panel.
+  let promise = promiseEvent(searchPopup, "popupshown");
+  info("Opening search panel");
+  SimpleTest.executeSoon(() => {
+    EventUtils.synthesizeMouseAtCenter(searchIcon, {});
+  });
+  yield promise;
+
+  // and check it's in a correct initial state.
+  is(searchPopup.getAttribute("showonlysettings"), "true", "Should show the small popup");
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  is(textbox.value, "", "the textfield value should be unmodified");
+
+  // Pressing alt+down should select the first one-off without selecting suggestions
+  // and cycle through the one-off items.
+  let oneOffs = getOneOffs();
+  for (let i = 0; i < oneOffs.length; ++i) {
+    EventUtils.synthesizeKey("VK_DOWN", {altKey: true});
+    is(textbox.selectedButton, oneOffs[i],
+       "the one-off button #" + (i + 1) + " should be selected");
+    is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  }
+
+  // One more alt+down keypress and nothing should be selected.
+  EventUtils.synthesizeKey("VK_DOWN", {altKey: true});
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+
+  // another one and the first one-off should be selected.
+  EventUtils.synthesizeKey("VK_DOWN", {altKey: true});
+  is(textbox.selectedButton, oneOffs[0],
+     "the first one-off button should be selected");
+
+  // Clear the selection with an alt+up keypress
+  EventUtils.synthesizeKey("VK_UP", {altKey: true});
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+});
+
+add_task(function* test_alt_up() {
+  // Check the initial state of the panel
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  is(textbox.value, "", "the textfield value should be unmodified");
+
+  // Pressing alt+up should select the last one-off without selecting suggestions
+  // and cycle up through the one-off items.
+  let oneOffs = getOneOffs();
+  for (let i = oneOffs.length - 1; i >= 0; --i) {
+    EventUtils.synthesizeKey("VK_UP", {altKey: true});
+    is(textbox.selectedButton, oneOffs[i],
+       "the one-off button #" + (i + 1) + " should be selected");
+    is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  }
+
+  // One more alt+down keypress and nothing should be selected.
+  EventUtils.synthesizeKey("VK_UP", {altKey: true});
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+
+  // another one and the last one-off should be selected.
+  EventUtils.synthesizeKey("VK_UP", {altKey: true});
+  is(textbox.selectedButton, oneOffs[oneOffs.length - 1],
+     "the last one-off button should be selected");
+
+  // Cleanup for the next test.
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
+     "the settings item should be selected");
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  ok(!textbox.selectedButton, "no one-off should be selected anymore");
+});
+
+add_task(function* test_tab_and_arrows() {
+  // Check the initial state is as expected.
+  ok(!textbox.selectedButton, "no one-off button should be selected");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  is(textbox.value, "", "the textfield value should be unmodified");
+
+  // After pressing down, the first one-off should be selected.
+  let oneOffs = getOneOffs();
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  is(textbox.selectedButton, oneOffs[0],
+     "the first one-off button should be selected");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+
+  // After pressing tab, the second one-off should be selected.
+  EventUtils.synthesizeKey("VK_TAB", {});
+  is(textbox.selectedButton, oneOffs[1],
+     "the second one-off button should be selected");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+
+  // After pressing up, the first one-off should be selected again.
+  EventUtils.synthesizeKey("VK_UP", {});
+  is(textbox.selectedButton, oneOffs[0],
+     "the first one-off button should be selected");
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+
+  // Finally close the panel.
+  let promise = promiseEvent(searchPopup, "popuphidden");
+  searchPopup.hidePopup();
+  yield promise;
+});
+
+add_task(function* test_open_search() {
+  let tab = gBrowser.addTab();
+  gBrowser.selectedTab = tab;
+
+  let deferred = Promise.defer();
+  let browser = gBrowser.selectedBrowser;
+  browser.addEventListener("load", function onload() {
+    browser.removeEventListener("load", onload, true);
+    deferred.resolve();
+  }, true);
+
+  let rootDir = getRootDirectory(gTestPath);
+  content.location = rootDir + "opensearch.html";
+
+  yield deferred.promise;
+
+  let promise = promiseEvent(searchPopup, "popupshown");
+  info("Opening search panel");
+  EventUtils.synthesizeMouseAtCenter(searchIcon, {});
+  yield promise;
+  is(searchPopup.getAttribute("showonlysettings"), "true", "Should show the small popup");
+
+  let engines = getOpenSearchItems();
+  is(engines.length, 2, "the opensearch.html page exposes 2 engines")
+
+  // Check that there's initially no selection.
+  is(searchPopup.selectedIndex, -1, "no suggestion should be selected");
+  ok(!textbox.selectedButton, "no button should be selected");
+
+  // Pressing up once selects the setting button...
+  EventUtils.synthesizeKey("VK_UP", {});
+  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
+     "the settings item should be selected");
+
+  // ...and then pressing up selects open search engines.
+  for (let i = engines.length; i; --i) {
+    EventUtils.synthesizeKey("VK_UP", {});
+    let selectedButton = textbox.selectedButton;
+    is(selectedButton, engines[i - 1],
+       "the engine #" + i + " should be selected");
+    ok(selectedButton.classList.contains("addengine-item"),
+       "the button is themed as an engine item");
+  }
+
+  // Pressing up again should select the last one-off button.
+  EventUtils.synthesizeKey("VK_UP", {});
+  is(textbox.selectedButton, getOneOffs().pop(),
+     "the last one-off button should be selected");
+
+  info("now check that the down key navigates open search items as expected");
+  for (let i = 0; i < engines.length; ++i) {
+    EventUtils.synthesizeKey("VK_DOWN", {});
+    is(textbox.selectedButton, engines[i],
+       "the engine #" + (i + 1) + " should be selected");
+  }
+
+  // Pressing down on the last engine item selects the settings button.
+  EventUtils.synthesizeKey("VK_DOWN", {});
+  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
+     "the settings item should be selected");
+
+  promise = promiseEvent(searchPopup, "popuphidden");
+  searchPopup.hidePopup();
+  yield promise;
+
+  gBrowser.removeCurrentTab();
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/sessionstore/SessionStore.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/sessionstore/SessionStore.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/sessionstore/SessionStore.jsm	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/sessionstore/SessionStore.jsm	2015-02-28 15:03:01.000000000 +0000
@@ -688,7 +688,6 @@
             Services.obs.notifyObservers(browser, NOTIFY_TAB_RESTORED, null);
           }
 
-          delete browser.__SS_restore_data;
           delete browser.__SS_data;
 
           SessionStoreInternal._resetLocalTabRestoringState(tab);
@@ -2683,26 +2682,16 @@
   },
 
   /**
-   * Restores the specified tab. If the tab can't be restored (eg, no history or
-   * calling gotoIndex fails), then state changes will be rolled back.
-   * This method will check if gTabsProgressListener is attached to the tab's
-   * window, ensuring that we don't get caught without one.
-   * This method removes the session history listener right before starting to
-   * attempt a load. This will prevent cases of "stuck" listeners.
-   * If this method returns false, then it is up to the caller to decide what to
-   * do. In the common case (restoreNextTab), we will want to then attempt to
-   * restore the next tab. In the other case (selecting the tab, reloading the
-   * tab), the caller doesn't actually want to do anything if no page is loaded.
+   * Kicks off restoring the given tab.
    *
    * @param aTab
    *        the tab to restore
-   *
-   * @returns true/false indicating whether or not a load actually happened
+   * @param aLoadArguments
+   *        optional load arguments used for loadURI()
    */
   restoreTabContent: function (aTab, aLoadArguments = null) {
     let window = aTab.ownerDocument.defaultView;
     let browser = aTab.linkedBrowser;
-    let tabData = browser.__SS_data;
 
     // Make sure that this tab is removed from the priority queue.
     TabRestoreQueue.remove(aTab);
@@ -2715,17 +2704,6 @@
     browser.removeAttribute("pending");
     aTab.removeAttribute("pending");
 
-    let activeIndex = tabData.index - 1;
-
-    // Attach data that will be restored on "load" event, after tab is restored.
-    if (tabData.entries.length) {
-      // restore those aspects of the currently active documents which are not
-      // preserved in the plain history entries (mainly scroll state and text data)
-      browser.__SS_restore_data = tabData.entries[activeIndex] || {};
-    } else {
-      browser.__SS_restore_data = {};
-    }
-
     browser.messageManager.sendAsyncMessage("SessionStore:restoreTabContent",
       {loadArguments: aLoadArguments});
   },
@@ -2865,7 +2843,7 @@
     }
     var sidebar = aWindow.document.getElementById("sidebar-box");
     if (sidebar.getAttribute("sidebarcommand") != aSidebar) {
-      aWindow.toggleSidebar(aSidebar);
+      aWindow.SidebarUI.show(aSidebar);
     }
     // since resizing/moving a window brings it to the foreground,
     // we might want to re-focus the last focused window
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/tabview/test/browser_tabview_bug595191.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/tabview/test/browser_tabview_bug595191.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/tabview/test/browser_tabview_bug595191.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/tabview/test/browser_tabview_bug595191.js	2015-02-28 15:03:01.000000000 +0000
@@ -45,7 +45,7 @@
   }
   contentWindow.addEventListener("tabviewsearchdisabled", onSearchDisabled, 
     false);
-  EventUtils.synthesizeKey("VK_ESCAPE", { }, contentWindow);
+  EventUtils.synthesizeKey("KEY_Escape", { code: "Escape" }, contentWindow);
 }
 
 function toggleTabViewTest(contentWindow) {
@@ -57,5 +57,6 @@
   }
   contentWindow.addEventListener("tabviewhidden", onTabViewHidden, false);
   // Use keyboard shortcut to toggle back to browser view
-  EventUtils.synthesizeKey("e", { accelKey: true, shiftKey: true });
+  EventUtils.synthesizeKey("e", { accelKey: true, shiftKey: true,
+                                  code: "KeyE", keyCode: KeyboardEvent.DOM_VK_E }, contentWindow);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/tabview/test/browser_tabview_bug595518.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/tabview/test/browser_tabview_bug595518.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/tabview/test/browser_tabview_bug595518.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/tabview/test/browser_tabview_bug595518.js	2015-02-28 15:03:01.000000000 +0000
@@ -28,7 +28,7 @@
     // verify that the keyboard combo works (this is the crux of bug 595518)
     // Prepare the key combo
     window.addEventListener("tabviewshown", onTabViewShown, false);
-    EventUtils.synthesizeKey("e", { accelKey: true, shiftKey: true }, contentWindow);
+    EventUtils.synthesizeKey("e", { accelKey: true, shiftKey: true, code: "KeyE", keyCode: KeyboardEvent.DOM_VK_E }, contentWindow);
   }
   
   let onTabViewShown = function() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/uitour/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/uitour/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/uitour/test/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/uitour/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -5,6 +5,7 @@
   uitour.html
   ../UITour-lib.js
 
+[browser_no_tabs.js]
 [browser_UITour.js]
 skip-if = os == "linux" || e10s # Intermittent failures, bug 951965
 [browser_UITour2.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/uitour/test/browser_no_tabs.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/uitour/test/browser_no_tabs.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/uitour/test/browser_no_tabs.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/uitour/test/browser_no_tabs.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,110 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const HTML_NS = "http://www.w3.org/1999/xhtml";
+const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/**
+ * Create a frame in the |hiddenDOMWindow| to host a |browser|, then load the URL in the
+ * latter.
+ *
+ * @param aURL
+ *        The URL to open in the browser.
+ **/
+function createHiddenBrowser(aURL) {
+  let deferred = Promise.defer();
+  let hiddenDoc = Services.appShell.hiddenDOMWindow.document;
+
+  // Create a HTML iframe with a chrome URL, then this can host the browser.
+  let iframe = hiddenDoc.createElementNS(HTML_NS, "iframe");
+  iframe.setAttribute("src", "chrome://global/content/mozilla.xhtml");
+  iframe.addEventListener("load", function onLoad() {
+    iframe.removeEventListener("load", onLoad, true);
+
+    let browser = iframe.contentDocument.createElementNS(XUL_NS, "browser");
+    browser.setAttribute("type", "content");
+    browser.setAttribute("disableglobalhistory", "true");
+    browser.setAttribute("src", aURL);
+
+    iframe.contentDocument.documentElement.appendChild(browser);
+    deferred.resolve({frame: iframe, browser: browser});
+  }, true);
+
+  hiddenDoc.documentElement.appendChild(iframe);
+  return deferred.promise;
+};
+
+/**
+ * Remove the browser and the iframe.
+ *
+ * @param aFrame
+ *        The iframe to dismiss.
+ * @param aBrowser
+ *        The browser to dismiss.
+ */
+function destroyHiddenBrowser(aFrame, aBrowser) {
+  // Dispose of the hidden browser.
+  aBrowser.remove();
+
+  // Take care of the frame holding our invisible browser.
+  if (!Cu.isDeadWrapper(aFrame)) {
+    aFrame.remove();
+  }
+};
+
+/**
+ * Test that UITour works when called when no tabs are available (e.g., when using windowless
+ * browsers).
+ */
+add_task(function* test_windowless_UITour(){
+  // Get the URL for the test page.
+  let pageURL = getRootDirectory(gTestPath) + "uitour.html";
+
+  // Allow the URL to use the UITour.
+  info("Adding UITour permission to the test page.");
+  let pageURI = Services.io.newURI(pageURL, null, null);
+  Services.perms.add(pageURI, "uitour", Services.perms.ALLOW_ACTION);
+
+  // UITour's ping will resolve this promise.
+  let deferredPing = Promise.defer();
+
+  // Create a windowless browser and test that UITour works in it.
+  let browserPromise = createHiddenBrowser(pageURL);
+  browserPromise.then(frameInfo => {
+    isnot(frameInfo.browser, null, "The browser must exist and not be null.");
+
+    // Load UITour frame script.
+    frameInfo.browser.messageManager.loadFrameScript(
+      "chrome://browser/content/content-UITour.js", false);
+
+    // When the page loads, try to use UITour API.
+    frameInfo.browser.addEventListener("load", function loadListener() {
+      info("The test page was correctly loaded.");
+
+      frameInfo.browser.removeEventListener("load", loadListener, true);
+
+      // Get a reference to the UITour API.
+      info("Testing access to the UITour API.");
+      let contentWindow = Cu.waiveXrays(frameInfo.browser.contentDocument.defaultView);
+      isnot(contentWindow, null, "The content window must exist and not be null.");
+
+      let uitourAPI = contentWindow.Mozilla.UITour;
+
+      // Test the UITour API with a ping.
+      uitourAPI.ping(function() {
+        info("Ping response received from the UITour API.");
+
+        // Make sure to clean up.
+        destroyHiddenBrowser(frameInfo.frame, frameInfo.browser);
+
+        // Resolve our promise.
+        deferredPing.resolve();
+      });
+    }, true);
+  });
+
+  // Wait for the UITour ping to complete.
+  yield deferredPing.promise;
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/uitour/UITour.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/uitour/UITour.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/components/uitour/UITour.jsm	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/components/uitour/UITour.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -344,6 +344,15 @@
   onPageEvent: function(aMessage, aEvent) {
     let browser = aMessage.target;
     let window = browser.ownerDocument.defaultView;
+
+    // Does the window have tabs? We need to make sure since windowless browsers do
+    // not have tabs.
+    if (!window.gBrowser) {
+      // When using windowless browsers we don't have a valid |window|. If that's the case,
+      // use the most recent window as a target for UITour functions (see Bug 1111022).
+      window = Services.wm.getMostRecentWindow("navigator:browser");
+    }
+
     let tab = window.gBrowser.getTabForBrowser(browser);
     let messageManager = browser.messageManager;
 
@@ -676,10 +685,7 @@
     }
     this.tourBrowsersByWindow.get(window).add(browser);
 
-    // We don't have a tab if we're in a <browser> without a tab.
-    if (tab) {
-      tab.addEventListener("TabClose", this);
-    }
+    Services.obs.addObserver(this, "message-manager-disconnect", false);
 
     window.addEventListener("SSWindowClosing", this);
 
@@ -695,13 +701,6 @@
         break;
       }
 
-      case "TabClose": {
-        let tab = aEvent.target;
-        let window = tab.ownerDocument.defaultView;
-        this.teardownTourForBrowser(window, tab.linkedBrowser, true);
-        break;
-      }
-
       case "TabSelect": {
         let window = aEvent.target.ownerDocument.defaultView;
 
@@ -733,6 +732,37 @@
     }
   },
 
+  observe: function(aSubject, aTopic, aData) {
+    log.debug("observe: aTopic =", aTopic);
+    switch (aTopic) {
+      // The browser message manager is disconnected when the <browser> is
+      // destroyed and we want to teardown at that point.
+      case "message-manager-disconnect": {
+        let winEnum = Services.wm.getEnumerator("navigator:browser");
+        while (winEnum.hasMoreElements()) {
+          let window = winEnum.getNext();
+          if (window.closed)
+            continue;
+
+          let tourBrowsers = this.tourBrowsersByWindow.get(window);
+          if (!tourBrowsers)
+            continue;
+
+          for (let browser of tourBrowsers) {
+            let messageManager = browser.messageManager;
+            if (aSubject != messageManager) {
+              continue;
+            }
+
+            this.teardownTourForBrowser(window, browser, true);
+            return;
+          }
+        }
+        break;
+      }
+    }
+  },
+
   setTelemetryBucket: function(aPageID) {
     let bucket = BUCKET_NAME + BrowserUITelemetry.BUCKET_SEPARATOR + aPageID;
     BrowserUITelemetry.setBucket(bucket);
@@ -766,14 +796,8 @@
     }
 
     let openTourBrowsers = this.tourBrowsersByWindow.get(aWindow);
-    if (aTourPageClosing) {
-      let tab = aWindow.gBrowser.getTabForBrowser(aBrowser);
-      if (tab) { // Handle standalone <browser>
-        tab.removeEventListener("TabClose", this);
-        if (openTourBrowsers) {
-          openTourBrowsers.delete(aBrowser);
-        }
-      }
+    if (aTourPageClosing && openTourBrowsers) {
+      openTourBrowsers.delete(aBrowser);
     }
 
     this.hideHighlight(aWindow);
@@ -814,9 +838,6 @@
           let pageID = this.pageIDSourceBrowsers.get(browser);
           this.setExpiringTelemetryBucket(pageID, "closed");
         }
-
-        let tab = aWindow.gBrowser.getTabForBrowser(browser);
-        tab.removeEventListener("TabClose", this);
       }
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/config/version.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/config/version.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/config/version.txt	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/config/version.txt	2015-02-28 15:03:02.000000000 +0000
@@ -1 +1 @@
-38.0a1
+39.0a1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/app-manager/app-validator.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/app-manager/app-validator.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/app-manager/app-validator.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/app-manager/app-validator.js	2015-02-28 15:03:02.000000000 +0000
@@ -12,8 +12,9 @@
 let XMLHttpRequest = CC("@mozilla.org/xmlextras/xmlhttprequest;1");
 let strings = Services.strings.createBundle("chrome://browser/locale/devtools/app-manager.properties");
 
-function AppValidator(project) {
-  this.project = project;
+function AppValidator({ type, location }) {
+  this.type = type;
+  this.location = location;
   this.errors = [];
   this.warnings = [];
 }
@@ -27,7 +28,7 @@
 };
 
 AppValidator.prototype._getPackagedManifestFile = function () {
-  let manifestFile = FileUtils.File(this.project.location);
+  let manifestFile = FileUtils.File(this.location);
   if (!manifestFile.exists()) {
     this.error(strings.GetStringFromName("validator.nonExistingFolder"));
     return null;
@@ -149,12 +150,12 @@
 
 AppValidator.prototype._getManifest = function () {
   let manifestURL;
-  if (this.project.type == "packaged") {
+  if (this.type == "packaged") {
     manifestURL = this._getPackagedManifestURL();
     if (!manifestURL)
       return promise.resolve(null);
-  } else if (this.project.type == "hosted") {
-    manifestURL = this.project.location;
+  } else if (this.type == "hosted") {
+    manifestURL = this.location;
     try {
       Services.io.newURI(manifestURL, null, null);
     } catch(e) {
@@ -162,7 +163,7 @@
       return promise.resolve(null);
     }
   } else {
-    this.error(strings.formatStringFromName("validator.invalidProjectType", [this.project.type], 1));
+    this.error(strings.formatStringFromName("validator.invalidProjectType", [this.type], 1));
     return promise.resolve(null);
   }
   return this._fetchManifest(manifestURL);
@@ -181,11 +182,11 @@
 };
 
 AppValidator.prototype._getOriginURL = function () {
-  if (this.project.type == "packaged") {
+  if (this.type == "packaged") {
     let manifestURL = Services.io.newURI(this.manifestURL, null, null);
     return Services.io.newURI(".", null, manifestURL).spec;
-  } else if (this.project.type == "hosted") {
-    return Services.io.newURI(this.project.location, null, null).prePath;
+  } else if (this.type == "hosted") {
+    return Services.io.newURI(this.location, null, null).prePath;
   }
 };
 
@@ -203,9 +204,9 @@
   }
   let origin = this._getOriginURL();
   let path;
-  if (this.project.type == "packaged") {
+  if (this.type == "packaged") {
     path = "." + ( manifest.launch_path || "/index.html" );
-  } else if (this.project.type == "hosted") {
+  } else if (this.type == "hosted") {
     path = manifest.launch_path || "/";
   }
   let indexURL;
@@ -251,7 +252,7 @@
   let appType = manifest.type || "web";
   if (["web", "trusted", "privileged", "certified"].indexOf(appType) === -1) {
     this.error(strings.formatStringFromName("validator.invalidAppType", [appType], 1));
-  } else if (this.project.type == "hosted" &&
+  } else if (this.type == "hosted" &&
              ["certified", "privileged"].indexOf(appType) !== -1) {
     this.error(strings.formatStringFromName("validator.invalidHostedPriviledges", [appType], 1));
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/app-manager/test/test_app_validator.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/app-manager/test/test_app_validator.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/app-manager/test/test_app_validator.html	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/app-manager/test/test_app_validator.html	2015-02-28 15:03:02.000000000 +0000
@@ -109,7 +109,7 @@
         let validator = createPackaged("wrong-launch-path");
         validator.validate().then(() => {
             is(validator.errors.length, 1, "app with wrong path got an error");
-            let file = nsFile(validator.project.location);
+            let file = nsFile(validator.location);
             file.append("wrong-path.html");
             let url = Services.io.newFileURI(file);
             is(validator.errors[0], strings.formatStringFromName("validator.accessFailedLaunchPath", [url.spec], 1),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/callslist.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/callslist.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/callslist.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/callslist.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,513 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+/**
+ * Functions handling details about a single recorded animation frame snapshot
+ * (the calls list, rendering preview, thumbnails filmstrip etc.).
+ */
+let CallsListView = Heritage.extend(WidgetMethods, {
+  /**
+   * Initialization function, called when the tool is started.
+   */
+  initialize: function() {
+    this.widget = new SideMenuWidget($("#calls-list"));
+    this._slider = $("#calls-slider");
+    this._searchbox = $("#calls-searchbox");
+    this._filmstrip = $("#snapshot-filmstrip");
+
+    this._onSelect = this._onSelect.bind(this);
+    this._onSlideMouseDown = this._onSlideMouseDown.bind(this);
+    this._onSlideMouseUp = this._onSlideMouseUp.bind(this);
+    this._onSlide = this._onSlide.bind(this);
+    this._onSearch = this._onSearch.bind(this);
+    this._onScroll = this._onScroll.bind(this);
+    this._onExpand = this._onExpand.bind(this);
+    this._onStackFileClick = this._onStackFileClick.bind(this);
+    this._onThumbnailClick = this._onThumbnailClick.bind(this);
+
+    this.widget.addEventListener("select", this._onSelect, false);
+    this._slider.addEventListener("mousedown", this._onSlideMouseDown, false);
+    this._slider.addEventListener("mouseup", this._onSlideMouseUp, false);
+    this._slider.addEventListener("change", this._onSlide, false);
+    this._searchbox.addEventListener("input", this._onSearch, false);
+    this._filmstrip.addEventListener("wheel", this._onScroll, false);
+  },
+
+  /**
+   * Destruction function, called when the tool is closed.
+   */
+  destroy: function() {
+    this.widget.removeEventListener("select", this._onSelect, false);
+    this._slider.removeEventListener("mousedown", this._onSlideMouseDown, false);
+    this._slider.removeEventListener("mouseup", this._onSlideMouseUp, false);
+    this._slider.removeEventListener("change", this._onSlide, false);
+    this._searchbox.removeEventListener("input", this._onSearch, false);
+    this._filmstrip.removeEventListener("wheel", this._onScroll, false);
+  },
+
+  /**
+   * Populates this container with a list of function calls.
+   *
+   * @param array functionCalls
+   *        A list of function call actors received from the backend.
+   */
+  showCalls: function(functionCalls) {
+    this.empty();
+
+    for (let i = 0, len = functionCalls.length; i < len; i++) {
+      let call = functionCalls[i];
+
+      let view = document.createElement("vbox");
+      view.className = "call-item-view devtools-monospace";
+      view.setAttribute("flex", "1");
+
+      let contents = document.createElement("hbox");
+      contents.className = "call-item-contents";
+      contents.setAttribute("align", "center");
+      contents.addEventListener("dblclick", this._onExpand);
+      view.appendChild(contents);
+
+      let index = document.createElement("label");
+      index.className = "plain call-item-index";
+      index.setAttribute("flex", "1");
+      index.setAttribute("value", i + 1);
+
+      let gutter = document.createElement("hbox");
+      gutter.className = "call-item-gutter";
+      gutter.appendChild(index);
+      contents.appendChild(gutter);
+
+      // Not all function calls have a caller that was stringified (e.g.
+      // context calls have a "gl" or "ctx" caller preview).
+      if (call.callerPreview) {
+        let context = document.createElement("label");
+        context.className = "plain call-item-context";
+        context.setAttribute("value", call.callerPreview);
+        contents.appendChild(context);
+
+        let separator = document.createElement("label");
+        separator.className = "plain call-item-separator";
+        separator.setAttribute("value", ".");
+        contents.appendChild(separator);
+      }
+
+      let name = document.createElement("label");
+      name.className = "plain call-item-name";
+      name.setAttribute("value", call.name);
+      contents.appendChild(name);
+
+      let argsPreview = document.createElement("label");
+      argsPreview.className = "plain call-item-args";
+      argsPreview.setAttribute("crop", "end");
+      argsPreview.setAttribute("flex", "100");
+      // Getters and setters are displayed differently from regular methods.
+      if (call.type == CallWatcherFront.METHOD_FUNCTION) {
+        argsPreview.setAttribute("value", "(" + call.argsPreview + ")");
+      } else {
+        argsPreview.setAttribute("value", " = " + call.argsPreview);
+      }
+      contents.appendChild(argsPreview);
+
+      let location = document.createElement("label");
+      location.className = "plain call-item-location";
+      location.setAttribute("value", getFileName(call.file) + ":" + call.line);
+      location.setAttribute("crop", "start");
+      location.setAttribute("flex", "1");
+      location.addEventListener("mousedown", this._onExpand);
+      contents.appendChild(location);
+
+      // Append a function call item to this container.
+      this.push([view], {
+        staged: true,
+        attachment: {
+          actor: call
+        }
+      });
+
+      // Highlight certain calls that are probably more interesting than
+      // everything else, making it easier to quickly glance over them.
+      if (CanvasFront.DRAW_CALLS.has(call.name)) {
+        view.setAttribute("draw-call", "");
+      }
+      if (CanvasFront.INTERESTING_CALLS.has(call.name)) {
+        view.setAttribute("interesting-call", "");
+      }
+    }
+
+    // Flushes all the prepared function call items into this container.
+    this.commit();
+    window.emit(EVENTS.CALL_LIST_POPULATED);
+
+    // Resetting the function selection slider's value (shown in this
+    // container's toolbar) would trigger a selection event, which should be
+    // ignored in this case.
+    this._ignoreSliderChanges = true;
+    this._slider.value = 0;
+    this._slider.max = functionCalls.length - 1;
+    this._ignoreSliderChanges = false;
+  },
+
+  /**
+   * Displays an image in the rendering preview of this container, generated
+   * for the specified draw call in the recorded animation frame snapshot.
+   *
+   * @param array screenshot
+   *        A single "snapshot-image" instance received from the backend.
+   */
+  showScreenshot: function(screenshot) {
+    let { index, width, height, scaling, flipped, pixels } = screenshot;
+
+    let screenshotNode = $("#screenshot-image");
+    screenshotNode.setAttribute("flipped", flipped);
+    drawBackground("screenshot-rendering", width, height, pixels);
+
+    let dimensionsNode = $("#screenshot-dimensions");
+    let actualWidth = (width / scaling) | 0;
+    let actualHeight = (height / scaling) | 0;
+    dimensionsNode.setAttribute("value",
+      SHARED_L10N.getFormatStr("dimensions", actualWidth, actualHeight));
+
+    window.emit(EVENTS.CALL_SCREENSHOT_DISPLAYED);
+  },
+
+  /**
+   * Populates this container's footer with a list of thumbnails, one generated
+   * for each draw call in the recorded animation frame snapshot.
+   *
+   * @param array thumbnails
+   *        An array of "snapshot-image" instances received from the backend.
+   */
+  showThumbnails: function(thumbnails) {
+    while (this._filmstrip.hasChildNodes()) {
+      this._filmstrip.firstChild.remove();
+    }
+    for (let thumbnail of thumbnails) {
+      this.appendThumbnail(thumbnail);
+    }
+
+    window.emit(EVENTS.THUMBNAILS_DISPLAYED);
+  },
+
+  /**
+   * Displays an image in the thumbnails list of this container, generated
+   * for the specified draw call in the recorded animation frame snapshot.
+   *
+   * @param array thumbnail
+   *        A single "snapshot-image" instance received from the backend.
+   */
+  appendThumbnail: function(thumbnail) {
+    let { index, width, height, flipped, pixels } = thumbnail;
+
+    let thumbnailNode = document.createElementNS(HTML_NS, "canvas");
+    thumbnailNode.setAttribute("flipped", flipped);
+    thumbnailNode.width = Math.max(CanvasFront.THUMBNAIL_SIZE, width);
+    thumbnailNode.height = Math.max(CanvasFront.THUMBNAIL_SIZE, height);
+    drawImage(thumbnailNode, width, height, pixels, { centered: true });
+
+    thumbnailNode.className = "filmstrip-thumbnail";
+    thumbnailNode.onmousedown = e => this._onThumbnailClick(e, index);
+    thumbnailNode.setAttribute("index", index);
+    this._filmstrip.appendChild(thumbnailNode);
+  },
+
+  /**
+   * Sets the currently highlighted thumbnail in this container.
+   * A screenshot will always correlate to a thumbnail in the filmstrip,
+   * both being identified by the same 'index' of the context function call.
+   *
+   * @param number index
+   *        The context function call's index.
+   */
+  set highlightedThumbnail(index) {
+    let currHighlightedThumbnail = $(".filmstrip-thumbnail[index='" + index + "']");
+    if (currHighlightedThumbnail == null) {
+      return;
+    }
+
+    let prevIndex = this._highlightedThumbnailIndex
+    let prevHighlightedThumbnail = $(".filmstrip-thumbnail[index='" + prevIndex + "']");
+    if (prevHighlightedThumbnail) {
+      prevHighlightedThumbnail.removeAttribute("highlighted");
+    }
+
+    currHighlightedThumbnail.setAttribute("highlighted", "");
+    currHighlightedThumbnail.scrollIntoView();
+    this._highlightedThumbnailIndex = index;
+  },
+
+  /**
+   * Gets the currently highlighted thumbnail in this container.
+   * @return number
+   */
+  get highlightedThumbnail() {
+    return this._highlightedThumbnailIndex;
+  },
+
+  /**
+   * The select listener for this container.
+   */
+  _onSelect: function({ detail: callItem }) {
+    if (!callItem) {
+      return;
+    }
+
+    // Some of the stepping buttons don't make sense specifically while the
+    // last function call is selected.
+    if (this.selectedIndex == this.itemCount - 1) {
+      $("#resume").setAttribute("disabled", "true");
+      $("#step-over").setAttribute("disabled", "true");
+      $("#step-out").setAttribute("disabled", "true");
+    } else {
+      $("#resume").removeAttribute("disabled");
+      $("#step-over").removeAttribute("disabled");
+      $("#step-out").removeAttribute("disabled");
+    }
+
+    // Correlate the currently selected item with the function selection
+    // slider's value. Avoid triggering a redundant selection event.
+    this._ignoreSliderChanges = true;
+    this._slider.value = this.selectedIndex;
+    this._ignoreSliderChanges = false;
+
+    // Can't generate screenshots for function call actors loaded from disk.
+    // XXX: Bug 984844.
+    if (callItem.attachment.actor.isLoadedFromDisk) {
+      return;
+    }
+
+    // To keep continuous selection buttery smooth (for example, while pressing
+    // the DOWN key or moving the slider), only display the screenshot after
+    // any kind of user input stops.
+    setConditionalTimeout("screenshot-display", SCREENSHOT_DISPLAY_DELAY, () => {
+      return !this._isSliding;
+    }, () => {
+      let frameSnapshot = SnapshotsListView.selectedItem.attachment.actor
+      let functionCall = callItem.attachment.actor;
+      frameSnapshot.generateScreenshotFor(functionCall).then(screenshot => {
+        this.showScreenshot(screenshot);
+        this.highlightedThumbnail = screenshot.index;
+      }).catch(Cu.reportError);
+    });
+  },
+
+  /**
+   * The mousedown listener for the call selection slider.
+   */
+  _onSlideMouseDown: function() {
+    this._isSliding = true;
+  },
+
+  /**
+   * The mouseup listener for the call selection slider.
+   */
+  _onSlideMouseUp: function() {
+    this._isSliding = false;
+  },
+
+  /**
+   * The change listener for the call selection slider.
+   */
+  _onSlide: function() {
+    // Avoid performing any operations when programatically changing the value.
+    if (this._ignoreSliderChanges) {
+      return;
+    }
+    let selectedFunctionCallIndex = this.selectedIndex = this._slider.value;
+
+    // While sliding, immediately show the most relevant thumbnail for a
+    // function call, for a nice diff-like animation effect between draws.
+    let thumbnails = SnapshotsListView.selectedItem.attachment.thumbnails;
+    let thumbnail = getThumbnailForCall(thumbnails, selectedFunctionCallIndex);
+
+    // Avoid drawing and highlighting if the selected function call has the
+    // same thumbnail as the last one.
+    if (thumbnail.index == this.highlightedThumbnail) {
+      return;
+    }
+    // If a thumbnail wasn't found (e.g. the backend avoids creating thumbnails
+    // when rendering offscreen), simply defer to the first available one.
+    if (thumbnail.index == -1) {
+      thumbnail = thumbnails[0];
+    }
+
+    let { index, width, height, flipped, pixels } = thumbnail;
+    this.highlightedThumbnail = index;
+
+    let screenshotNode = $("#screenshot-image");
+    screenshotNode.setAttribute("flipped", flipped);
+    drawBackground("screenshot-rendering", width, height, pixels);
+  },
+
+  /**
+   * The input listener for the calls searchbox.
+   */
+  _onSearch: function(e) {
+    let lowerCaseSearchToken = this._searchbox.value.toLowerCase();
+
+    this.filterContents(e => {
+      let call = e.attachment.actor;
+      let name = call.name.toLowerCase();
+      let file = call.file.toLowerCase();
+      let line = call.line.toString().toLowerCase();
+      let args = call.argsPreview.toLowerCase();
+
+      return name.contains(lowerCaseSearchToken) ||
+             file.contains(lowerCaseSearchToken) ||
+             line.contains(lowerCaseSearchToken) ||
+             args.contains(lowerCaseSearchToken);
+    });
+  },
+
+  /**
+   * The wheel listener for the filmstrip that contains all the thumbnails.
+   */
+  _onScroll: function(e) {
+    this._filmstrip.scrollLeft += e.deltaX;
+  },
+
+  /**
+   * The click/dblclick listener for an item or location url in this container.
+   * When expanding an item, it's corresponding call stack will be displayed.
+   */
+  _onExpand: function(e) {
+    let callItem = this.getItemForElement(e.target);
+    let view = $(".call-item-view", callItem.target);
+
+    // If the call stack nodes were already created, simply re-show them
+    // or jump to the corresponding file and line in the Debugger if a
+    // location link was clicked.
+    if (view.hasAttribute("call-stack-populated")) {
+      let isExpanded = view.getAttribute("call-stack-expanded") == "true";
+
+      // If clicking on the location, jump to the Debugger.
+      if (e.target.classList.contains("call-item-location")) {
+        let { file, line } = callItem.attachment.actor;
+        viewSourceInDebugger(file, line);
+        return;
+      }
+      // Otherwise hide the call stack.
+      else {
+        view.setAttribute("call-stack-expanded", !isExpanded);
+        $(".call-item-stack", view).hidden = isExpanded;
+        return;
+      }
+    }
+
+    let list = document.createElement("vbox");
+    list.className = "call-item-stack";
+    view.setAttribute("call-stack-populated", "");
+    view.setAttribute("call-stack-expanded", "true");
+    view.appendChild(list);
+
+    /**
+     * Creates a function call nodes in this container for a stack.
+     */
+    let display = stack => {
+      for (let i = 1; i < stack.length; i++) {
+        let call = stack[i];
+
+        let contents = document.createElement("hbox");
+        contents.className = "call-item-stack-fn";
+        contents.style.MozPaddingStart = (i * STACK_FUNC_INDENTATION) + "px";
+
+        let name = document.createElement("label");
+        name.className = "plain call-item-stack-fn-name";
+        name.setAttribute("value", "↳ " + call.name + "()");
+        contents.appendChild(name);
+
+        let spacer = document.createElement("spacer");
+        spacer.setAttribute("flex", "100");
+        contents.appendChild(spacer);
+
+        let location = document.createElement("label");
+        location.className = "plain call-item-stack-fn-location";
+        location.setAttribute("value", getFileName(call.file) + ":" + call.line);
+        location.setAttribute("crop", "start");
+        location.setAttribute("flex", "1");
+        location.addEventListener("mousedown", e => this._onStackFileClick(e, call));
+        contents.appendChild(location);
+
+        list.appendChild(contents);
+      }
+
+      window.emit(EVENTS.CALL_STACK_DISPLAYED);
+    };
+
+    // If this animation snapshot is loaded from disk, there are no corresponding
+    // backend actors available and the data is immediately available.
+    let functionCall = callItem.attachment.actor;
+    if (functionCall.isLoadedFromDisk) {
+      display(functionCall.stack);
+    }
+    // ..otherwise we need to request the function call stack from the backend.
+    else {
+      callItem.attachment.actor.getDetails().then(fn => display(fn.stack));
+    }
+  },
+
+  /**
+   * The click listener for a location link in the call stack.
+   *
+   * @param string file
+   *        The url of the source owning the function.
+   * @param number line
+   *        The line of the respective function.
+   */
+  _onStackFileClick: function(e, { file, line }) {
+    viewSourceInDebugger(file, line);
+  },
+
+  /**
+   * The click listener for a thumbnail in the filmstrip.
+   *
+   * @param number index
+   *        The function index in the recorded animation frame snapshot.
+   */
+  _onThumbnailClick: function(e, index) {
+    this.selectedIndex = index;
+  },
+
+  /**
+   * The click listener for the "resume" button in this container's toolbar.
+   */
+  _onResume: function() {
+    // Jump to the next draw call in the recorded animation frame snapshot.
+    let drawCall = getNextDrawCall(this.items, this.selectedItem);
+    if (drawCall) {
+      this.selectedItem = drawCall;
+      return;
+    }
+
+    // If there are no more draw calls, just jump to the last context call.
+    this._onStepOut();
+  },
+
+  /**
+   * The click listener for the "step over" button in this container's toolbar.
+   */
+  _onStepOver: function() {
+    this.selectedIndex++;
+  },
+
+  /**
+   * The click listener for the "step in" button in this container's toolbar.
+   */
+  _onStepIn: function() {
+    if (this.selectedIndex == -1) {
+      this._onResume();
+      return;
+    }
+    let callItem = this.selectedItem;
+    let { file, line } = callItem.attachment.actor;
+    viewSourceInDebugger(file, line);
+  },
+
+  /**
+   * The click listener for the "step out" button in this container's toolbar.
+   */
+  _onStepOut: function() {
+    this.selectedIndex = this.itemCount - 1;
+  }
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/canvasdebugger.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/canvasdebugger.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/canvasdebugger.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/canvasdebugger.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,6 +9,8 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/SideMenuWidget.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
+Cu.import("resource://gre/modules/devtools/Console.jsm");
+Cu.import("resource:///modules/devtools/gDevTools.jsm");
 
 const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
 const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
@@ -18,6 +20,8 @@
 const Telemetry = require("devtools/shared/telemetry");
 const telemetry = new Telemetry();
 
+const CANVAS_ACTOR_RECORDING_ATTEMPT = gDevTools.testing ? 500 : 5000;
+
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
   "resource://gre/modules/Task.jsm");
 
@@ -41,9 +45,12 @@
   // When all the animation frame snapshots are removed by the user.
   SNAPSHOTS_LIST_CLEARED: "CanvasDebugger:SnapshotsListCleared",
 
-  // When an animation frame snapshot starts/finishes being recorded.
+  // When an animation frame snapshot starts/finishes being recorded, and
+  // whether it was completed succesfully or cancelled.
   SNAPSHOT_RECORDING_STARTED: "CanvasDebugger:SnapshotRecordingStarted",
   SNAPSHOT_RECORDING_FINISHED: "CanvasDebugger:SnapshotRecordingFinished",
+  SNAPSHOT_RECORDING_COMPLETED: "CanvasDebugger:SnapshotRecordingCompleted",
+  SNAPSHOT_RECORDING_CANCELLED: "CanvasDebugger:SnapshotRecordingCancelled",
 
   // When an animation frame snapshot was selected and all its data displayed.
   SNAPSHOT_RECORDING_SELECTED: "CanvasDebugger:SnapshotRecordingSelected",
@@ -157,7 +164,7 @@
 
     $("#reload-notice").hidden = true;
     $("#empty-notice").hidden = false;
-    $("#import-notice").hidden = true;
+    $("#waiting-notice").hidden = true;
 
     $("#debugging-pane-contents").hidden = true;
     $("#screenshot-container").hidden = true;
@@ -168,894 +175,6 @@
 };
 
 /**
- * Functions handling the recorded animation frame snapshots UI.
- */
-let SnapshotsListView = Heritage.extend(WidgetMethods, {
-  /**
-   * Initialization function, called when the tool is started.
-   */
-  initialize: function() {
-    this.widget = new SideMenuWidget($("#snapshots-list"), {
-      showArrows: true
-    });
-
-    this._onSelect = this._onSelect.bind(this);
-    this._onClearButtonClick = this._onClearButtonClick.bind(this);
-    this._onRecordButtonClick = this._onRecordButtonClick.bind(this);
-    this._onImportButtonClick = this._onImportButtonClick.bind(this);
-    this._onSaveButtonClick = this._onSaveButtonClick.bind(this);
-
-    this.emptyText = L10N.getStr("noSnapshotsText");
-    this.widget.addEventListener("select", this._onSelect, false);
-  },
-
-  /**
-   * Destruction function, called when the tool is closed.
-   */
-  destroy: function() {
-    this.widget.removeEventListener("select", this._onSelect, false);
-  },
-
-  /**
-   * Adds a snapshot entry to this container.
-   *
-   * @return object
-   *         The newly inserted item.
-   */
-  addSnapshot: function() {
-    let contents = document.createElement("hbox");
-    contents.className = "snapshot-item";
-
-    let thumbnail = document.createElementNS(HTML_NS, "canvas");
-    thumbnail.className = "snapshot-item-thumbnail";
-    thumbnail.width = CanvasFront.THUMBNAIL_SIZE;
-    thumbnail.height = CanvasFront.THUMBNAIL_SIZE;
-
-    let title = document.createElement("label");
-    title.className = "plain snapshot-item-title";
-    title.setAttribute("value",
-      L10N.getFormatStr("snapshotsList.itemLabel", this.itemCount + 1));
-
-    let calls = document.createElement("label");
-    calls.className = "plain snapshot-item-calls";
-    calls.setAttribute("value",
-      L10N.getStr("snapshotsList.loadingLabel"));
-
-    let save = document.createElement("label");
-    save.className = "plain snapshot-item-save";
-    save.addEventListener("click", this._onSaveButtonClick, false);
-
-    let spacer = document.createElement("spacer");
-    spacer.setAttribute("flex", "1");
-
-    let footer = document.createElement("hbox");
-    footer.className = "snapshot-item-footer";
-    footer.appendChild(save);
-
-    let details = document.createElement("vbox");
-    details.className = "snapshot-item-details";
-    details.appendChild(title);
-    details.appendChild(calls);
-    details.appendChild(spacer);
-    details.appendChild(footer);
-
-    contents.appendChild(thumbnail);
-    contents.appendChild(details);
-
-    // Append a recorded snapshot item to this container.
-    return this.push([contents], {
-      attachment: {
-        // The snapshot and function call actors, along with the thumbnails
-        // will be available as soon as recording finishes.
-        actor: null,
-        calls: null,
-        thumbnails: null,
-        screenshot: null
-      }
-    });
-  },
-
-  /**
-   * Customizes a shapshot in this container.
-   *
-   * @param Item snapshotItem
-   *        An item inserted via `SnapshotsListView.addSnapshot`.
-   * @param object snapshotActor
-   *        The frame snapshot actor received from the backend.
-   * @param object snapshotOverview
-   *        Additional data about the snapshot received from the backend.
-   */
-  customizeSnapshot: function(snapshotItem, snapshotActor, snapshotOverview) {
-    // Make sure the function call actors are stored on the item,
-    // to be used when populating the CallsListView.
-    snapshotItem.attachment.actor = snapshotActor;
-    let functionCalls = snapshotItem.attachment.calls = snapshotOverview.calls;
-    let thumbnails = snapshotItem.attachment.thumbnails = snapshotOverview.thumbnails;
-    let screenshot = snapshotItem.attachment.screenshot = snapshotOverview.screenshot;
-
-    let lastThumbnail = thumbnails[thumbnails.length - 1];
-    let { width, height, flipped, pixels } = lastThumbnail;
-
-    let thumbnailNode = $(".snapshot-item-thumbnail", snapshotItem.target);
-    thumbnailNode.setAttribute("flipped", flipped);
-    drawImage(thumbnailNode, width, height, pixels, { centered: true });
-
-    let callsNode = $(".snapshot-item-calls", snapshotItem.target);
-    let drawCalls = functionCalls.filter(e => CanvasFront.DRAW_CALLS.has(e.name));
-
-    let drawCallsStr = PluralForm.get(drawCalls.length,
-      L10N.getStr("snapshotsList.drawCallsLabel"));
-    let funcCallsStr = PluralForm.get(functionCalls.length,
-      L10N.getStr("snapshotsList.functionCallsLabel"));
-
-    callsNode.setAttribute("value",
-      drawCallsStr.replace("#1", drawCalls.length) + ", " +
-      funcCallsStr.replace("#1", functionCalls.length));
-
-    let saveNode = $(".snapshot-item-save", snapshotItem.target);
-    saveNode.setAttribute("disabled", !!snapshotItem.isLoadedFromDisk);
-    saveNode.setAttribute("value", snapshotItem.isLoadedFromDisk
-      ? L10N.getStr("snapshotsList.loadedLabel")
-      : L10N.getStr("snapshotsList.saveLabel"));
-
-    // Make sure there's always a selected item available.
-    if (!this.selectedItem) {
-      this.selectedIndex = 0;
-    }
-  },
-
-  /**
-   * The select listener for this container.
-   */
-  _onSelect: function({ detail: snapshotItem }) {
-    if (!snapshotItem) {
-      return;
-    }
-    let { calls, thumbnails, screenshot } = snapshotItem.attachment;
-
-    $("#reload-notice").hidden = true;
-    $("#empty-notice").hidden = true;
-    $("#import-notice").hidden = false;
-
-    $("#debugging-pane-contents").hidden = true;
-    $("#screenshot-container").hidden = true;
-    $("#snapshot-filmstrip").hidden = true;
-
-    Task.spawn(function*() {
-      // Wait for a few milliseconds between presenting the function calls,
-      // screenshot and thumbnails, to allow each component being
-      // sequentially drawn. This gives the illusion of snappiness.
-
-      yield DevToolsUtils.waitForTime(SNAPSHOT_DATA_DISPLAY_DELAY);
-      CallsListView.showCalls(calls);
-      $("#debugging-pane-contents").hidden = false;
-      $("#import-notice").hidden = true;
-
-      yield DevToolsUtils.waitForTime(SNAPSHOT_DATA_DISPLAY_DELAY);
-      CallsListView.showThumbnails(thumbnails);
-      $("#snapshot-filmstrip").hidden = false;
-
-      yield DevToolsUtils.waitForTime(SNAPSHOT_DATA_DISPLAY_DELAY);
-      CallsListView.showScreenshot(screenshot);
-      $("#screenshot-container").hidden = false;
-
-      window.emit(EVENTS.SNAPSHOT_RECORDING_SELECTED);
-    });
-  },
-
-  /**
-   * The click listener for the "clear" button in this container.
-   */
-  _onClearButtonClick: function() {
-    Task.spawn(function*() {
-      SnapshotsListView.empty();
-      CallsListView.empty();
-
-      $("#reload-notice").hidden = true;
-      $("#empty-notice").hidden = true;
-      $("#import-notice").hidden = true;
-
-      if (yield gFront.isInitialized()) {
-        $("#empty-notice").hidden = false;
-      } else {
-        $("#reload-notice").hidden = false;
-      }
-
-      $("#debugging-pane-contents").hidden = true;
-      $("#screenshot-container").hidden = true;
-      $("#snapshot-filmstrip").hidden = true;
-
-      window.emit(EVENTS.SNAPSHOTS_LIST_CLEARED);
-    });
-  },
-
-  /**
-   * The click listener for the "record" button in this container.
-   */
-  _onRecordButtonClick: function() {
-    Task.spawn(function*() {
-      $("#record-snapshot").setAttribute("checked", "true");
-      $("#record-snapshot").setAttribute("disabled", "true");
-
-      // Insert a "dummy" snapshot item in the view, to hint that recording
-      // has now started. However, wait for a few milliseconds before actually
-      // starting the recording, since that might block rendering and prevent
-      // the dummy snapshot item from being drawn.
-      let snapshotItem = this.addSnapshot();
-
-      // If this is the first item, immediately show the "Loading…" notice.
-      if (this.itemCount == 1) {
-        $("#empty-notice").hidden = true;
-        $("#import-notice").hidden = false;
-      }
-
-      yield DevToolsUtils.waitForTime(SNAPSHOT_START_RECORDING_DELAY);
-      window.emit(EVENTS.SNAPSHOT_RECORDING_STARTED);
-
-      let snapshotActor = yield gFront.recordAnimationFrame();
-      let snapshotOverview = yield snapshotActor.getOverview();
-      this.customizeSnapshot(snapshotItem, snapshotActor, snapshotOverview);
-
-      $("#record-snapshot").removeAttribute("checked");
-      $("#record-snapshot").removeAttribute("disabled");
-
-      window.emit(EVENTS.SNAPSHOT_RECORDING_FINISHED);
-    }.bind(this));
-  },
-
-  /**
-   * The click listener for the "import" button in this container.
-   */
-  _onImportButtonClick: function() {
-    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(window, L10N.getStr("snapshotsList.saveDialogTitle"), Ci.nsIFilePicker.modeOpen);
-    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogJSONFilter"), "*.json");
-    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogAllFilter"), "*.*");
-
-    if (fp.show() != Ci.nsIFilePicker.returnOK) {
-      return;
-    }
-
-    let channel = NetUtil.newChannel2(fp.file,
-                                      null,
-                                      null,
-                                      window.document,
-                                      null, // aLoadingPrincipal
-                                      null, // aTriggeringPrincipal
-                                      Ci.nsILoadInfo.SEC_NORMAL,
-                                      Ci.nsIContentPolicy.TYPE_OTHER);
-    channel.contentType = "text/plain";
-
-    NetUtil.asyncFetch2(channel, (inputStream, status) => {
-      if (!Components.isSuccessCode(status)) {
-        console.error("Could not import recorded animation frame snapshot file.");
-        return;
-      }
-      try {
-        let string = NetUtil.readInputStreamToString(inputStream, inputStream.available());
-        var data = JSON.parse(string);
-      } catch (e) {
-        console.error("Could not read animation frame snapshot file.");
-        return;
-      }
-      if (data.fileType != CALLS_LIST_SERIALIZER_IDENTIFIER) {
-        console.error("Unrecognized animation frame snapshot file.");
-        return;
-      }
-
-      // Add a `isLoadedFromDisk` flag on everything to avoid sending invalid
-      // requests to the backend, since we're not dealing with actors anymore.
-      let snapshotItem = this.addSnapshot();
-      snapshotItem.isLoadedFromDisk = true;
-      data.calls.forEach(e => e.isLoadedFromDisk = true);
-
-      this.customizeSnapshot(snapshotItem, data.calls, data);
-    });
-  },
-
-  /**
-   * The click listener for the "save" button of each item in this container.
-   */
-  _onSaveButtonClick: function(e) {
-    let snapshotItem = this.getItemForElement(e.target);
-
-    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(window, L10N.getStr("snapshotsList.saveDialogTitle"), Ci.nsIFilePicker.modeSave);
-    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogJSONFilter"), "*.json");
-    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogAllFilter"), "*.*");
-    fp.defaultString = "snapshot.json";
-
-    // Start serializing all the function call actors for the specified snapshot,
-    // while the nsIFilePicker dialog is being opened. Snappy.
-    let serialized = Task.spawn(function*() {
-      let data = {
-        fileType: CALLS_LIST_SERIALIZER_IDENTIFIER,
-        version: CALLS_LIST_SERIALIZER_VERSION,
-        calls: [],
-        thumbnails: [],
-        screenshot: null
-      };
-      let functionCalls = snapshotItem.attachment.calls;
-      let thumbnails = snapshotItem.attachment.thumbnails;
-      let screenshot = snapshotItem.attachment.screenshot;
-
-      // Prepare all the function calls for serialization.
-      yield DevToolsUtils.yieldingEach(functionCalls, (call, i) => {
-        let { type, name, file, line, argsPreview, callerPreview } = call;
-        return call.getDetails().then(({ stack }) => {
-          data.calls[i] = {
-            type: type,
-            name: name,
-            file: file,
-            line: line,
-            stack: stack,
-            argsPreview: argsPreview,
-            callerPreview: callerPreview
-          };
-        });
-      });
-
-      // Prepare all the thumbnails for serialization.
-      yield DevToolsUtils.yieldingEach(thumbnails, (thumbnail, i) => {
-        let { index, width, height, flipped, pixels } = thumbnail;
-        data.thumbnails.push({ index, width, height, flipped, pixels });
-      });
-
-      // Prepare the screenshot for serialization.
-      let { index, width, height, flipped, pixels } = screenshot;
-      data.screenshot = { index, width, height, flipped, pixels };
-
-      let string = JSON.stringify(data);
-      let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
-        createInstance(Ci.nsIScriptableUnicodeConverter);
-
-      converter.charset = "UTF-8";
-      return converter.convertToInputStream(string);
-    });
-
-    // Open the nsIFilePicker and wait for the function call actors to finish
-    // being serialized, in order to save the generated JSON data to disk.
-    fp.open({ done: result => {
-      if (result == Ci.nsIFilePicker.returnCancel) {
-        return;
-      }
-      let footer = $(".snapshot-item-footer", snapshotItem.target);
-      let save = $(".snapshot-item-save", snapshotItem.target);
-
-      // Show a throbber and a "Saving…" label if serializing isn't immediate.
-      setNamedTimeout("call-list-save", CALLS_LIST_SLOW_SAVE_DELAY, () => {
-        footer.classList.add("devtools-throbber");
-        save.setAttribute("disabled", "true");
-        save.setAttribute("value", L10N.getStr("snapshotsList.savingLabel"));
-      });
-
-      serialized.then(inputStream => {
-        let outputStream = FileUtils.openSafeFileOutputStream(fp.file);
-
-        NetUtil.asyncCopy(inputStream, outputStream, status => {
-          if (!Components.isSuccessCode(status)) {
-            console.error("Could not save recorded animation frame snapshot file.");
-          }
-          clearNamedTimeout("call-list-save");
-          footer.classList.remove("devtools-throbber");
-          save.removeAttribute("disabled");
-          save.setAttribute("value", L10N.getStr("snapshotsList.saveLabel"));
-        });
-      });
-    }});
-  }
-});
-
-/**
- * Functions handling details about a single recorded animation frame snapshot
- * (the calls list, rendering preview, thumbnails filmstrip etc.).
- */
-let CallsListView = Heritage.extend(WidgetMethods, {
-  /**
-   * Initialization function, called when the tool is started.
-   */
-  initialize: function() {
-    this.widget = new SideMenuWidget($("#calls-list"));
-    this._slider = $("#calls-slider");
-    this._searchbox = $("#calls-searchbox");
-    this._filmstrip = $("#snapshot-filmstrip");
-
-    this._onSelect = this._onSelect.bind(this);
-    this._onSlideMouseDown = this._onSlideMouseDown.bind(this);
-    this._onSlideMouseUp = this._onSlideMouseUp.bind(this);
-    this._onSlide = this._onSlide.bind(this);
-    this._onSearch = this._onSearch.bind(this);
-    this._onScroll = this._onScroll.bind(this);
-    this._onExpand = this._onExpand.bind(this);
-    this._onStackFileClick = this._onStackFileClick.bind(this);
-    this._onThumbnailClick = this._onThumbnailClick.bind(this);
-
-    this.widget.addEventListener("select", this._onSelect, false);
-    this._slider.addEventListener("mousedown", this._onSlideMouseDown, false);
-    this._slider.addEventListener("mouseup", this._onSlideMouseUp, false);
-    this._slider.addEventListener("change", this._onSlide, false);
-    this._searchbox.addEventListener("input", this._onSearch, false);
-    this._filmstrip.addEventListener("wheel", this._onScroll, false);
-  },
-
-  /**
-   * Destruction function, called when the tool is closed.
-   */
-  destroy: function() {
-    this.widget.removeEventListener("select", this._onSelect, false);
-    this._slider.removeEventListener("mousedown", this._onSlideMouseDown, false);
-    this._slider.removeEventListener("mouseup", this._onSlideMouseUp, false);
-    this._slider.removeEventListener("change", this._onSlide, false);
-    this._searchbox.removeEventListener("input", this._onSearch, false);
-    this._filmstrip.removeEventListener("wheel", this._onScroll, false);
-  },
-
-  /**
-   * Populates this container with a list of function calls.
-   *
-   * @param array functionCalls
-   *        A list of function call actors received from the backend.
-   */
-  showCalls: function(functionCalls) {
-    this.empty();
-
-    for (let i = 0, len = functionCalls.length; i < len; i++) {
-      let call = functionCalls[i];
-
-      let view = document.createElement("vbox");
-      view.className = "call-item-view devtools-monospace";
-      view.setAttribute("flex", "1");
-
-      let contents = document.createElement("hbox");
-      contents.className = "call-item-contents";
-      contents.setAttribute("align", "center");
-      contents.addEventListener("dblclick", this._onExpand);
-      view.appendChild(contents);
-
-      let index = document.createElement("label");
-      index.className = "plain call-item-index";
-      index.setAttribute("flex", "1");
-      index.setAttribute("value", i + 1);
-
-      let gutter = document.createElement("hbox");
-      gutter.className = "call-item-gutter";
-      gutter.appendChild(index);
-      contents.appendChild(gutter);
-
-      // Not all function calls have a caller that was stringified (e.g.
-      // context calls have a "gl" or "ctx" caller preview).
-      if (call.callerPreview) {
-        let context = document.createElement("label");
-        context.className = "plain call-item-context";
-        context.setAttribute("value", call.callerPreview);
-        contents.appendChild(context);
-
-        let separator = document.createElement("label");
-        separator.className = "plain call-item-separator";
-        separator.setAttribute("value", ".");
-        contents.appendChild(separator);
-      }
-
-      let name = document.createElement("label");
-      name.className = "plain call-item-name";
-      name.setAttribute("value", call.name);
-      contents.appendChild(name);
-
-      let argsPreview = document.createElement("label");
-      argsPreview.className = "plain call-item-args";
-      argsPreview.setAttribute("crop", "end");
-      argsPreview.setAttribute("flex", "100");
-      // Getters and setters are displayed differently from regular methods.
-      if (call.type == CallWatcherFront.METHOD_FUNCTION) {
-        argsPreview.setAttribute("value", "(" + call.argsPreview + ")");
-      } else {
-        argsPreview.setAttribute("value", " = " + call.argsPreview);
-      }
-      contents.appendChild(argsPreview);
-
-      let location = document.createElement("label");
-      location.className = "plain call-item-location";
-      location.setAttribute("value", getFileName(call.file) + ":" + call.line);
-      location.setAttribute("crop", "start");
-      location.setAttribute("flex", "1");
-      location.addEventListener("mousedown", this._onExpand);
-      contents.appendChild(location);
-
-      // Append a function call item to this container.
-      this.push([view], {
-        staged: true,
-        attachment: {
-          actor: call
-        }
-      });
-
-      // Highlight certain calls that are probably more interesting than
-      // everything else, making it easier to quickly glance over them.
-      if (CanvasFront.DRAW_CALLS.has(call.name)) {
-        view.setAttribute("draw-call", "");
-      }
-      if (CanvasFront.INTERESTING_CALLS.has(call.name)) {
-        view.setAttribute("interesting-call", "");
-      }
-    }
-
-    // Flushes all the prepared function call items into this container.
-    this.commit();
-    window.emit(EVENTS.CALL_LIST_POPULATED);
-
-    // Resetting the function selection slider's value (shown in this
-    // container's toolbar) would trigger a selection event, which should be
-    // ignored in this case.
-    this._ignoreSliderChanges = true;
-    this._slider.value = 0;
-    this._slider.max = functionCalls.length - 1;
-    this._ignoreSliderChanges = false;
-  },
-
-  /**
-   * Displays an image in the rendering preview of this container, generated
-   * for the specified draw call in the recorded animation frame snapshot.
-   *
-   * @param array screenshot
-   *        A single "snapshot-image" instance received from the backend.
-   */
-  showScreenshot: function(screenshot) {
-    let { index, width, height, scaling, flipped, pixels } = screenshot;
-
-    let screenshotNode = $("#screenshot-image");
-    screenshotNode.setAttribute("flipped", flipped);
-    drawBackground("screenshot-rendering", width, height, pixels);
-
-    let dimensionsNode = $("#screenshot-dimensions");
-    let actualWidth = (width / scaling) | 0;
-    let actualHeight = (height / scaling) | 0;
-    dimensionsNode.setAttribute("value",
-      SHARED_L10N.getFormatStr("dimensions", actualWidth, actualHeight));
-
-    window.emit(EVENTS.CALL_SCREENSHOT_DISPLAYED);
-  },
-
-  /**
-   * Populates this container's footer with a list of thumbnails, one generated
-   * for each draw call in the recorded animation frame snapshot.
-   *
-   * @param array thumbnails
-   *        An array of "snapshot-image" instances received from the backend.
-   */
-  showThumbnails: function(thumbnails) {
-    while (this._filmstrip.hasChildNodes()) {
-      this._filmstrip.firstChild.remove();
-    }
-    for (let thumbnail of thumbnails) {
-      this.appendThumbnail(thumbnail);
-    }
-
-    window.emit(EVENTS.THUMBNAILS_DISPLAYED);
-  },
-
-  /**
-   * Displays an image in the thumbnails list of this container, generated
-   * for the specified draw call in the recorded animation frame snapshot.
-   *
-   * @param array thumbnail
-   *        A single "snapshot-image" instance received from the backend.
-   */
-  appendThumbnail: function(thumbnail) {
-    let { index, width, height, flipped, pixels } = thumbnail;
-
-    let thumbnailNode = document.createElementNS(HTML_NS, "canvas");
-    thumbnailNode.setAttribute("flipped", flipped);
-    thumbnailNode.width = Math.max(CanvasFront.THUMBNAIL_SIZE, width);
-    thumbnailNode.height = Math.max(CanvasFront.THUMBNAIL_SIZE, height);
-    drawImage(thumbnailNode, width, height, pixels, { centered: true });
-
-    thumbnailNode.className = "filmstrip-thumbnail";
-    thumbnailNode.onmousedown = e => this._onThumbnailClick(e, index);
-    thumbnailNode.setAttribute("index", index);
-    this._filmstrip.appendChild(thumbnailNode);
-  },
-
-  /**
-   * Sets the currently highlighted thumbnail in this container.
-   * A screenshot will always correlate to a thumbnail in the filmstrip,
-   * both being identified by the same 'index' of the context function call.
-   *
-   * @param number index
-   *        The context function call's index.
-   */
-  set highlightedThumbnail(index) {
-    let currHighlightedThumbnail = $(".filmstrip-thumbnail[index='" + index + "']");
-    if (currHighlightedThumbnail == null) {
-      return;
-    }
-
-    let prevIndex = this._highlightedThumbnailIndex
-    let prevHighlightedThumbnail = $(".filmstrip-thumbnail[index='" + prevIndex + "']");
-    if (prevHighlightedThumbnail) {
-      prevHighlightedThumbnail.removeAttribute("highlighted");
-    }
-
-    currHighlightedThumbnail.setAttribute("highlighted", "");
-    currHighlightedThumbnail.scrollIntoView();
-    this._highlightedThumbnailIndex = index;
-  },
-
-  /**
-   * Gets the currently highlighted thumbnail in this container.
-   * @return number
-   */
-  get highlightedThumbnail() {
-    return this._highlightedThumbnailIndex;
-  },
-
-  /**
-   * The select listener for this container.
-   */
-  _onSelect: function({ detail: callItem }) {
-    if (!callItem) {
-      return;
-    }
-
-    // Some of the stepping buttons don't make sense specifically while the
-    // last function call is selected.
-    if (this.selectedIndex == this.itemCount - 1) {
-      $("#resume").setAttribute("disabled", "true");
-      $("#step-over").setAttribute("disabled", "true");
-      $("#step-out").setAttribute("disabled", "true");
-    } else {
-      $("#resume").removeAttribute("disabled");
-      $("#step-over").removeAttribute("disabled");
-      $("#step-out").removeAttribute("disabled");
-    }
-
-    // Correlate the currently selected item with the function selection
-    // slider's value. Avoid triggering a redundant selection event.
-    this._ignoreSliderChanges = true;
-    this._slider.value = this.selectedIndex;
-    this._ignoreSliderChanges = false;
-
-    // Can't generate screenshots for function call actors loaded from disk.
-    // XXX: Bug 984844.
-    if (callItem.attachment.actor.isLoadedFromDisk) {
-      return;
-    }
-
-    // To keep continuous selection buttery smooth (for example, while pressing
-    // the DOWN key or moving the slider), only display the screenshot after
-    // any kind of user input stops.
-    setConditionalTimeout("screenshot-display", SCREENSHOT_DISPLAY_DELAY, () => {
-      return !this._isSliding;
-    }, () => {
-      let frameSnapshot = SnapshotsListView.selectedItem.attachment.actor
-      let functionCall = callItem.attachment.actor;
-      frameSnapshot.generateScreenshotFor(functionCall).then(screenshot => {
-        this.showScreenshot(screenshot);
-        this.highlightedThumbnail = screenshot.index;
-      }).catch(Cu.reportError);
-    });
-  },
-
-  /**
-   * The mousedown listener for the call selection slider.
-   */
-  _onSlideMouseDown: function() {
-    this._isSliding = true;
-  },
-
-  /**
-   * The mouseup listener for the call selection slider.
-   */
-  _onSlideMouseUp: function() {
-    this._isSliding = false;
-  },
-
-  /**
-   * The change listener for the call selection slider.
-   */
-  _onSlide: function() {
-    // Avoid performing any operations when programatically changing the value.
-    if (this._ignoreSliderChanges) {
-      return;
-    }
-    let selectedFunctionCallIndex = this.selectedIndex = this._slider.value;
-
-    // While sliding, immediately show the most relevant thumbnail for a
-    // function call, for a nice diff-like animation effect between draws.
-    let thumbnails = SnapshotsListView.selectedItem.attachment.thumbnails;
-    let thumbnail = getThumbnailForCall(thumbnails, selectedFunctionCallIndex);
-
-    // Avoid drawing and highlighting if the selected function call has the
-    // same thumbnail as the last one.
-    if (thumbnail.index == this.highlightedThumbnail) {
-      return;
-    }
-    // If a thumbnail wasn't found (e.g. the backend avoids creating thumbnails
-    // when rendering offscreen), simply defer to the first available one.
-    if (thumbnail.index == -1) {
-      thumbnail = thumbnails[0];
-    }
-
-    let { index, width, height, flipped, pixels } = thumbnail;
-    this.highlightedThumbnail = index;
-
-    let screenshotNode = $("#screenshot-image");
-    screenshotNode.setAttribute("flipped", flipped);
-    drawBackground("screenshot-rendering", width, height, pixels);
-  },
-
-  /**
-   * The input listener for the calls searchbox.
-   */
-  _onSearch: function(e) {
-    let lowerCaseSearchToken = this._searchbox.value.toLowerCase();
-
-    this.filterContents(e => {
-      let call = e.attachment.actor;
-      let name = call.name.toLowerCase();
-      let file = call.file.toLowerCase();
-      let line = call.line.toString().toLowerCase();
-      let args = call.argsPreview.toLowerCase();
-
-      return name.contains(lowerCaseSearchToken) ||
-             file.contains(lowerCaseSearchToken) ||
-             line.contains(lowerCaseSearchToken) ||
-             args.contains(lowerCaseSearchToken);
-    });
-  },
-
-  /**
-   * The wheel listener for the filmstrip that contains all the thumbnails.
-   */
-  _onScroll: function(e) {
-    this._filmstrip.scrollLeft += e.deltaX;
-  },
-
-  /**
-   * The click/dblclick listener for an item or location url in this container.
-   * When expanding an item, it's corresponding call stack will be displayed.
-   */
-  _onExpand: function(e) {
-    let callItem = this.getItemForElement(e.target);
-    let view = $(".call-item-view", callItem.target);
-
-    // If the call stack nodes were already created, simply re-show them
-    // or jump to the corresponding file and line in the Debugger if a
-    // location link was clicked.
-    if (view.hasAttribute("call-stack-populated")) {
-      let isExpanded = view.getAttribute("call-stack-expanded") == "true";
-
-      // If clicking on the location, jump to the Debugger.
-      if (e.target.classList.contains("call-item-location")) {
-        let { file, line } = callItem.attachment.actor;
-        viewSourceInDebugger(file, line);
-        return;
-      }
-      // Otherwise hide the call stack.
-      else {
-        view.setAttribute("call-stack-expanded", !isExpanded);
-        $(".call-item-stack", view).hidden = isExpanded;
-        return;
-      }
-    }
-
-    let list = document.createElement("vbox");
-    list.className = "call-item-stack";
-    view.setAttribute("call-stack-populated", "");
-    view.setAttribute("call-stack-expanded", "true");
-    view.appendChild(list);
-
-    /**
-     * Creates a function call nodes in this container for a stack.
-     */
-    let display = stack => {
-      for (let i = 1; i < stack.length; i++) {
-        let call = stack[i];
-
-        let contents = document.createElement("hbox");
-        contents.className = "call-item-stack-fn";
-        contents.style.MozPaddingStart = (i * STACK_FUNC_INDENTATION) + "px";
-
-        let name = document.createElement("label");
-        name.className = "plain call-item-stack-fn-name";
-        name.setAttribute("value", "↳ " + call.name + "()");
-        contents.appendChild(name);
-
-        let spacer = document.createElement("spacer");
-        spacer.setAttribute("flex", "100");
-        contents.appendChild(spacer);
-
-        let location = document.createElement("label");
-        location.className = "plain call-item-stack-fn-location";
-        location.setAttribute("value", getFileName(call.file) + ":" + call.line);
-        location.setAttribute("crop", "start");
-        location.setAttribute("flex", "1");
-        location.addEventListener("mousedown", e => this._onStackFileClick(e, call));
-        contents.appendChild(location);
-
-        list.appendChild(contents);
-      }
-
-      window.emit(EVENTS.CALL_STACK_DISPLAYED);
-    };
-
-    // If this animation snapshot is loaded from disk, there are no corresponding
-    // backend actors available and the data is immediately available.
-    let functionCall = callItem.attachment.actor;
-    if (functionCall.isLoadedFromDisk) {
-      display(functionCall.stack);
-    }
-    // ..otherwise we need to request the function call stack from the backend.
-    else {
-      callItem.attachment.actor.getDetails().then(fn => display(fn.stack));
-    }
-  },
-
-  /**
-   * The click listener for a location link in the call stack.
-   *
-   * @param string file
-   *        The url of the source owning the function.
-   * @param number line
-   *        The line of the respective function.
-   */
-  _onStackFileClick: function(e, { file, line }) {
-    viewSourceInDebugger(file, line);
-  },
-
-  /**
-   * The click listener for a thumbnail in the filmstrip.
-   *
-   * @param number index
-   *        The function index in the recorded animation frame snapshot.
-   */
-  _onThumbnailClick: function(e, index) {
-    this.selectedIndex = index;
-  },
-
-  /**
-   * The click listener for the "resume" button in this container's toolbar.
-   */
-  _onResume: function() {
-    // Jump to the next draw call in the recorded animation frame snapshot.
-    let drawCall = getNextDrawCall(this.items, this.selectedItem);
-    if (drawCall) {
-      this.selectedItem = drawCall;
-      return;
-    }
-
-    // If there are no more draw calls, just jump to the last context call.
-    this._onStepOut();
-  },
-
-  /**
-   * The click listener for the "step over" button in this container's toolbar.
-   */
-  _onStepOver: function() {
-    this.selectedIndex++;
-  },
-
-  /**
-   * The click listener for the "step in" button in this container's toolbar.
-   */
-  _onStepIn: function() {
-    if (this.selectedIndex == -1) {
-      this._onResume();
-      return;
-    }
-    let callItem = this.selectedItem;
-    let { file, line } = callItem.attachment.actor;
-    viewSourceInDebugger(file, line);
-  },
-
-  /**
-   * The click listener for the "step out" button in this container's toolbar.
-   */
-  _onStepOut: function() {
-    this.selectedIndex = this.itemCount - 1;
-  }
-});
-
-/**
  * Localization convenience methods.
  */
 let L10N = new ViewHelpers.L10N(STRINGS_URI);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/canvasdebugger.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/canvasdebugger.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/canvasdebugger.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/canvasdebugger.xul	2015-02-28 15:03:02.000000000 +0000
@@ -15,6 +15,8 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script src="chrome://browser/content/devtools/theme-switching.js"/>
   <script type="application/javascript" src="canvasdebugger.js"/>
+  <script type="application/javascript" src="canvasdebugger/callslist.js"/>
+  <script type="application/javascript" src="canvasdebugger/snapshotslist.js"/>
 
   <hbox class="theme-body" flex="1">
     <vbox id="snapshots-pane">
@@ -71,13 +73,15 @@
         <label value="&canvasDebuggerUI.emptyNotice2;"/>
       </hbox>
 
-      <hbox id="import-notice"
-            class="notice-container"
+      <hbox id="waiting-notice"
+            class="notice-container devtools-throbber"
             align="center"
             pack="center"
             flex="1"
             hidden="true">
-        <label value="&canvasDebuggerUI.importNotice;"/>
+        <label id="requests-menu-waiting-notice-label"
+               class="plain"
+               value="&canvasDebuggerUI.waitingNotice;"/>
       </hbox>
 
       <box id="debugging-pane-contents"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/snapshotslist.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/snapshotslist.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/snapshotslist.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/snapshotslist.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,498 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+/**
+ * Functions handling the recorded animation frame snapshots UI.
+ */
+let SnapshotsListView = Heritage.extend(WidgetMethods, {
+  /**
+   * Initialization function, called when the tool is started.
+   */
+  initialize: function() {
+    this.widget = new SideMenuWidget($("#snapshots-list"), {
+      showArrows: true
+    });
+
+    this._onSelect = this._onSelect.bind(this);
+    this._onClearButtonClick = this._onClearButtonClick.bind(this);
+    this._onRecordButtonClick = this._onRecordButtonClick.bind(this);
+    this._onImportButtonClick = this._onImportButtonClick.bind(this);
+    this._onSaveButtonClick = this._onSaveButtonClick.bind(this);
+    this._onRecordSuccess = this._onRecordSuccess.bind(this);
+    this._onRecordFailure = this._onRecordFailure.bind(this);
+    this._stopRecordingAnimation = this._stopRecordingAnimation.bind(this);
+
+    window.on(EVENTS.SNAPSHOT_RECORDING_FINISHED, this._enableRecordButton);
+    this.emptyText = L10N.getStr("noSnapshotsText");
+    this.widget.addEventListener("select", this._onSelect, false);
+  },
+
+  /**
+   * Destruction function, called when the tool is closed.
+   */
+  destroy: function() {
+    clearNamedTimeout("canvas-actor-recording");
+    window.off(EVENTS.SNAPSHOT_RECORDING_FINISHED, this._enableRecordButton);
+    this.widget.removeEventListener("select", this._onSelect, false);
+  },
+
+  /**
+   * Adds a snapshot entry to this container.
+   *
+   * @return object
+   *         The newly inserted item.
+   */
+  addSnapshot: function() {
+    let contents = document.createElement("hbox");
+    contents.className = "snapshot-item";
+
+    let thumbnail = document.createElementNS(HTML_NS, "canvas");
+    thumbnail.className = "snapshot-item-thumbnail";
+    thumbnail.width = CanvasFront.THUMBNAIL_SIZE;
+    thumbnail.height = CanvasFront.THUMBNAIL_SIZE;
+
+    let title = document.createElement("label");
+    title.className = "plain snapshot-item-title";
+    title.setAttribute("value",
+      L10N.getFormatStr("snapshotsList.itemLabel", this.itemCount + 1));
+
+    let calls = document.createElement("label");
+    calls.className = "plain snapshot-item-calls";
+    calls.setAttribute("value",
+      L10N.getStr("snapshotsList.loadingLabel"));
+
+    let save = document.createElement("label");
+    save.className = "plain snapshot-item-save";
+    save.addEventListener("click", this._onSaveButtonClick, false);
+
+    let spacer = document.createElement("spacer");
+    spacer.setAttribute("flex", "1");
+
+    let footer = document.createElement("hbox");
+    footer.className = "snapshot-item-footer";
+    footer.appendChild(save);
+
+    let details = document.createElement("vbox");
+    details.className = "snapshot-item-details";
+    details.appendChild(title);
+    details.appendChild(calls);
+    details.appendChild(spacer);
+    details.appendChild(footer);
+
+    contents.appendChild(thumbnail);
+    contents.appendChild(details);
+
+    // Append a recorded snapshot item to this container.
+    return this.push([contents], {
+      attachment: {
+        // The snapshot and function call actors, along with the thumbnails
+        // will be available as soon as recording finishes.
+        actor: null,
+        calls: null,
+        thumbnails: null,
+        screenshot: null
+      }
+    });
+  },
+
+  /**
+   * Removes the last snapshot added, in the event no requestAnimationFrame loop was found.
+   */
+  removeLastSnapshot: function () {
+    this.removeAt(this.itemCount - 1);
+    // If this is the only item, revert back to the empty notice
+    if (this.itemCount === 0) {
+      $("#empty-notice").hidden = false;
+      $("#waiting-notice").hidden = true;
+    }
+  },
+
+  /**
+   * Customizes a shapshot in this container.
+   *
+   * @param Item snapshotItem
+   *        An item inserted via `SnapshotsListView.addSnapshot`.
+   * @param object snapshotActor
+   *        The frame snapshot actor received from the backend.
+   * @param object snapshotOverview
+   *        Additional data about the snapshot received from the backend.
+   */
+  customizeSnapshot: function(snapshotItem, snapshotActor, snapshotOverview) {
+    // Make sure the function call actors are stored on the item,
+    // to be used when populating the CallsListView.
+    snapshotItem.attachment.actor = snapshotActor;
+    let functionCalls = snapshotItem.attachment.calls = snapshotOverview.calls;
+    let thumbnails = snapshotItem.attachment.thumbnails = snapshotOverview.thumbnails;
+    let screenshot = snapshotItem.attachment.screenshot = snapshotOverview.screenshot;
+
+    let lastThumbnail = thumbnails[thumbnails.length - 1];
+    let { width, height, flipped, pixels } = lastThumbnail;
+
+    let thumbnailNode = $(".snapshot-item-thumbnail", snapshotItem.target);
+    thumbnailNode.setAttribute("flipped", flipped);
+    drawImage(thumbnailNode, width, height, pixels, { centered: true });
+
+    let callsNode = $(".snapshot-item-calls", snapshotItem.target);
+    let drawCalls = functionCalls.filter(e => CanvasFront.DRAW_CALLS.has(e.name));
+
+    let drawCallsStr = PluralForm.get(drawCalls.length,
+      L10N.getStr("snapshotsList.drawCallsLabel"));
+    let funcCallsStr = PluralForm.get(functionCalls.length,
+      L10N.getStr("snapshotsList.functionCallsLabel"));
+
+    callsNode.setAttribute("value",
+      drawCallsStr.replace("#1", drawCalls.length) + ", " +
+      funcCallsStr.replace("#1", functionCalls.length));
+
+    let saveNode = $(".snapshot-item-save", snapshotItem.target);
+    saveNode.setAttribute("disabled", !!snapshotItem.isLoadedFromDisk);
+    saveNode.setAttribute("value", snapshotItem.isLoadedFromDisk
+      ? L10N.getStr("snapshotsList.loadedLabel")
+      : L10N.getStr("snapshotsList.saveLabel"));
+
+    // Make sure there's always a selected item available.
+    if (!this.selectedItem) {
+      this.selectedIndex = 0;
+    }
+  },
+
+  /**
+   * The select listener for this container.
+   */
+  _onSelect: function({ detail: snapshotItem }) {
+    // Check to ensure the attachment has an actor, like
+    // an in-progress recording.
+    if (!snapshotItem || !snapshotItem.attachment.actor) {
+      return;
+    }
+    let { calls, thumbnails, screenshot } = snapshotItem.attachment;
+
+    $("#reload-notice").hidden = true;
+    $("#empty-notice").hidden = true;
+    $("#waiting-notice").hidden = false;
+
+    $("#debugging-pane-contents").hidden = true;
+    $("#screenshot-container").hidden = true;
+    $("#snapshot-filmstrip").hidden = true;
+
+    Task.spawn(function*() {
+      // Wait for a few milliseconds between presenting the function calls,
+      // screenshot and thumbnails, to allow each component being
+      // sequentially drawn. This gives the illusion of snappiness.
+
+      yield DevToolsUtils.waitForTime(SNAPSHOT_DATA_DISPLAY_DELAY);
+      CallsListView.showCalls(calls);
+      $("#debugging-pane-contents").hidden = false;
+      $("#waiting-notice").hidden = true;
+
+      yield DevToolsUtils.waitForTime(SNAPSHOT_DATA_DISPLAY_DELAY);
+      CallsListView.showThumbnails(thumbnails);
+      $("#snapshot-filmstrip").hidden = false;
+
+      yield DevToolsUtils.waitForTime(SNAPSHOT_DATA_DISPLAY_DELAY);
+      CallsListView.showScreenshot(screenshot);
+      $("#screenshot-container").hidden = false;
+
+      window.emit(EVENTS.SNAPSHOT_RECORDING_SELECTED);
+    });
+  },
+
+  /**
+   * The click listener for the "clear" button in this container.
+   */
+  _onClearButtonClick: function() {
+    Task.spawn(function*() {
+      SnapshotsListView.empty();
+      CallsListView.empty();
+
+      $("#reload-notice").hidden = true;
+      $("#empty-notice").hidden = true;
+      $("#waiting-notice").hidden = true;
+
+      if (yield gFront.isInitialized()) {
+        $("#empty-notice").hidden = false;
+      } else {
+        $("#reload-notice").hidden = false;
+      }
+
+      $("#debugging-pane-contents").hidden = true;
+      $("#screenshot-container").hidden = true;
+      $("#snapshot-filmstrip").hidden = true;
+
+      window.emit(EVENTS.SNAPSHOTS_LIST_CLEARED);
+    });
+  },
+
+  /**
+   * The click listener for the "record" button in this container.
+   */
+  _onRecordButtonClick: function () {
+    this._disableRecordButton();
+
+    if (this._recording) {
+      this._stopRecordingAnimation();
+      return;
+    }
+
+    // Insert a "dummy" snapshot item in the view, to hint that recording
+    // has now started. However, wait for a few milliseconds before actually
+    // starting the recording, since that might block rendering and prevent
+    // the dummy snapshot item from being drawn.
+    this.addSnapshot();
+
+    // If this is the first item, immediately show the "Loading…" notice.
+    if (this.itemCount == 1) {
+      $("#empty-notice").hidden = true;
+      $("#waiting-notice").hidden = false;
+    }
+
+    this._recordAnimation();
+  },
+
+  /**
+   * Makes the record button able to be clicked again.
+   */
+  _enableRecordButton: function () {
+    $("#record-snapshot").removeAttribute("disabled");
+  },
+
+  /**
+   * Makes the record button unable to be clicked.
+   */
+  _disableRecordButton: function () {
+    $("#record-snapshot").setAttribute("disabled", true);
+  },
+
+  /**
+   * Begins recording an animation.
+   */
+  _recordAnimation: Task.async(function *() {
+    if (this._recording) {
+      return;
+    }
+    this._recording = true;
+    $("#record-snapshot").setAttribute("checked", "true");
+
+    setNamedTimeout("canvas-actor-recording", CANVAS_ACTOR_RECORDING_ATTEMPT, this._stopRecordingAnimation);
+
+    yield DevToolsUtils.waitForTime(SNAPSHOT_START_RECORDING_DELAY);
+    window.emit(EVENTS.SNAPSHOT_RECORDING_STARTED);
+
+    gFront.recordAnimationFrame().then(snapshot => {
+      if (snapshot) {
+        this._onRecordSuccess(snapshot);
+      } else {
+        this._onRecordFailure();
+      }
+    });
+
+    // Wait another delay before reenabling the button to stop the recording
+    // if a recording is not found.
+    yield DevToolsUtils.waitForTime(SNAPSHOT_START_RECORDING_DELAY);
+    this._enableRecordButton();
+  }),
+
+  /**
+   * Stops recording animation. Called when a click on the stopwatch occurs during a recording,
+   * or if a recording times out.
+   */
+  _stopRecordingAnimation: Task.async(function *() {
+    clearNamedTimeout("canvas-actor-recording");
+    let actorCanStop = yield gTarget.actorHasMethod("canvas", "stopRecordingAnimationFrame");
+
+    if (actorCanStop) {
+      yield gFront.stopRecordingAnimationFrame();
+    }
+    // If actor does not have the method to stop recording (Fx39+),
+    // manually call the record failure method. This will call a connection failure
+    // on disconnect as a result of `gFront.recordAnimationFrame()` never resolving,
+    // but this is better than it hanging when there is no requestAnimationFrame anyway.
+    else {
+      this._onRecordFailure();
+    }
+
+    this._recording = false;
+    $("#record-snapshot").removeAttribute("checked");
+    this._enableRecordButton();
+  }),
+
+  /**
+   * Resolves from the front's recordAnimationFrame to setup the interface with the screenshots.
+   */
+  _onRecordSuccess: Task.async(function *(snapshotActor) {
+    // Clear bail-out case if frame found in CANVAS_ACTOR_RECORDING_ATTEMPT milliseconds
+    clearNamedTimeout("canvas-actor-recording");
+    let snapshotItem = this.getItemAtIndex(this.itemCount - 1);
+    let snapshotOverview = yield snapshotActor.getOverview();
+    this.customizeSnapshot(snapshotItem, snapshotActor, snapshotOverview);
+
+    this._recording = false;
+    $("#record-snapshot").removeAttribute("checked");
+
+    window.emit(EVENTS.SNAPSHOT_RECORDING_COMPLETED);
+    window.emit(EVENTS.SNAPSHOT_RECORDING_FINISHED);
+  }),
+
+  /**
+   * Called as a reject from the front's recordAnimationFrame.
+   */
+  _onRecordFailure: function () {
+    clearNamedTimeout("canvas-actor-recording");
+    showNotification(gToolbox, "canvas-debugger-timeout", L10N.getStr("recordingTimeoutFailure"));
+    window.emit(EVENTS.SNAPSHOT_RECORDING_CANCELLED);
+    window.emit(EVENTS.SNAPSHOT_RECORDING_FINISHED);
+    this.removeLastSnapshot();
+  },
+
+  /**
+   * The click listener for the "import" button in this container.
+   */
+  _onImportButtonClick: function() {
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    fp.init(window, L10N.getStr("snapshotsList.saveDialogTitle"), Ci.nsIFilePicker.modeOpen);
+    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogJSONFilter"), "*.json");
+    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogAllFilter"), "*.*");
+
+    if (fp.show() != Ci.nsIFilePicker.returnOK) {
+      return;
+    }
+
+    let channel = NetUtil.newChannel2(fp.file,
+                                      null,
+                                      null,
+                                      window.document,
+                                      null, // aLoadingPrincipal
+                                      null, // aTriggeringPrincipal
+                                      Ci.nsILoadInfo.SEC_NORMAL,
+                                      Ci.nsIContentPolicy.TYPE_OTHER);
+    channel.contentType = "text/plain";
+
+    NetUtil.asyncFetch2(channel, (inputStream, status) => {
+      if (!Components.isSuccessCode(status)) {
+        console.error("Could not import recorded animation frame snapshot file.");
+        return;
+      }
+      try {
+        let string = NetUtil.readInputStreamToString(inputStream, inputStream.available());
+        var data = JSON.parse(string);
+      } catch (e) {
+        console.error("Could not read animation frame snapshot file.");
+        return;
+      }
+      if (data.fileType != CALLS_LIST_SERIALIZER_IDENTIFIER) {
+        console.error("Unrecognized animation frame snapshot file.");
+        return;
+      }
+
+      // Add a `isLoadedFromDisk` flag on everything to avoid sending invalid
+      // requests to the backend, since we're not dealing with actors anymore.
+      let snapshotItem = this.addSnapshot();
+      snapshotItem.isLoadedFromDisk = true;
+      data.calls.forEach(e => e.isLoadedFromDisk = true);
+
+      this.customizeSnapshot(snapshotItem, data.calls, data);
+    });
+  },
+
+  /**
+   * The click listener for the "save" button of each item in this container.
+   */
+  _onSaveButtonClick: function(e) {
+    let snapshotItem = this.getItemForElement(e.target);
+
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    fp.init(window, L10N.getStr("snapshotsList.saveDialogTitle"), Ci.nsIFilePicker.modeSave);
+    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogJSONFilter"), "*.json");
+    fp.appendFilter(L10N.getStr("snapshotsList.saveDialogAllFilter"), "*.*");
+    fp.defaultString = "snapshot.json";
+
+    // Start serializing all the function call actors for the specified snapshot,
+    // while the nsIFilePicker dialog is being opened. Snappy.
+    let serialized = Task.spawn(function*() {
+      let data = {
+        fileType: CALLS_LIST_SERIALIZER_IDENTIFIER,
+        version: CALLS_LIST_SERIALIZER_VERSION,
+        calls: [],
+        thumbnails: [],
+        screenshot: null
+      };
+      let functionCalls = snapshotItem.attachment.calls;
+      let thumbnails = snapshotItem.attachment.thumbnails;
+      let screenshot = snapshotItem.attachment.screenshot;
+
+      // Prepare all the function calls for serialization.
+      yield DevToolsUtils.yieldingEach(functionCalls, (call, i) => {
+        let { type, name, file, line, argsPreview, callerPreview } = call;
+        return call.getDetails().then(({ stack }) => {
+          data.calls[i] = {
+            type: type,
+            name: name,
+            file: file,
+            line: line,
+            stack: stack,
+            argsPreview: argsPreview,
+            callerPreview: callerPreview
+          };
+        });
+      });
+
+      // Prepare all the thumbnails for serialization.
+      yield DevToolsUtils.yieldingEach(thumbnails, (thumbnail, i) => {
+        let { index, width, height, flipped, pixels } = thumbnail;
+        data.thumbnails.push({ index, width, height, flipped, pixels });
+      });
+
+      // Prepare the screenshot for serialization.
+      let { index, width, height, flipped, pixels } = screenshot;
+      data.screenshot = { index, width, height, flipped, pixels };
+
+      let string = JSON.stringify(data);
+      let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+        createInstance(Ci.nsIScriptableUnicodeConverter);
+
+      converter.charset = "UTF-8";
+      return converter.convertToInputStream(string);
+    });
+
+    // Open the nsIFilePicker and wait for the function call actors to finish
+    // being serialized, in order to save the generated JSON data to disk.
+    fp.open({ done: result => {
+      if (result == Ci.nsIFilePicker.returnCancel) {
+        return;
+      }
+      let footer = $(".snapshot-item-footer", snapshotItem.target);
+      let save = $(".snapshot-item-save", snapshotItem.target);
+
+      // Show a throbber and a "Saving…" label if serializing isn't immediate.
+      setNamedTimeout("call-list-save", CALLS_LIST_SLOW_SAVE_DELAY, () => {
+        footer.classList.add("devtools-throbber");
+        save.setAttribute("disabled", "true");
+        save.setAttribute("value", L10N.getStr("snapshotsList.savingLabel"));
+      });
+
+      serialized.then(inputStream => {
+        let outputStream = FileUtils.openSafeFileOutputStream(fp.file);
+
+        NetUtil.asyncCopy(inputStream, outputStream, status => {
+          if (!Components.isSuccessCode(status)) {
+            console.error("Could not save recorded animation frame snapshot file.");
+          }
+          clearNamedTimeout("call-list-save");
+          footer.classList.remove("devtools-throbber");
+          save.removeAttribute("disabled");
+          save.setAttribute("value", L10N.getStr("snapshotsList.saveLabel"));
+        });
+      });
+    }});
+  }
+});
+
+function showNotification (toolbox, name, message) {
+  let notificationBox = toolbox.getNotificationBox();
+  let notification = notificationBox.getNotificationWithValue(name);
+  if (!notification) {
+    notificationBox.appendNotification(message, name, "", notificationBox.PRIORITY_WARNING_HIGH);
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-04.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-04.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-04.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-04.js	2015-02-28 15:03:02.000000000 +0000
@@ -22,7 +22,7 @@
     "A snapshot actor was sent after recording.");
 
   let animationOverview = yield snapshotActor.getOverview();
-  ok(snapshotActor,
+  ok(animationOverview,
     "An animation overview could be retrieved after recording.");
 
   let thumbnails = animationOverview.thumbnails;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-11.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-11.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-11.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-11.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,138 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that loops using setTimeout are recorded and stored
+ * for a canvas context, and that the generated screenshots are correct.
+ */
+
+function ifTestingSupported() {
+  let { target, front } = yield initCanvasDebuggerBackend(SET_TIMEOUT_URL);
+
+  let navigated = once(target, "navigate");
+
+  yield front.setup({ reload: true });
+  ok(true, "The front was setup up successfully.");
+
+  yield navigated;
+  ok(true, "Target automatically navigated when the front was set up.");
+
+  let snapshotActor = yield front.recordAnimationFrame();
+  ok(snapshotActor,
+    "A snapshot actor was sent after recording.");
+
+  let animationOverview = yield snapshotActor.getOverview();
+  ok(snapshotActor,
+    "An animation overview could be retrieved after recording.");
+
+  let functionCalls = animationOverview.calls;
+  ok(functionCalls,
+    "An array of function call actors was sent after recording.");
+  is(functionCalls.length, 8,
+    "The number of function call actors is correct.");
+
+  is(functionCalls[0].type, CallWatcherFront.METHOD_FUNCTION,
+    "The first called function is correctly identified as a method.");
+  is(functionCalls[0].name, "clearRect",
+    "The first called function's name is correct.");
+  is(functionCalls[0].file, SET_TIMEOUT_URL,
+    "The first called function's file is correct.");
+  is(functionCalls[0].line, 25,
+    "The first called function's line is correct.");
+  is(functionCalls[0].argsPreview, "0, 0, 128, 128",
+    "The first called function's args preview is correct.");
+  is(functionCalls[0].callerPreview, "ctx",
+    "The first called function's caller preview is correct.");
+
+  is(functionCalls[6].type, CallWatcherFront.METHOD_FUNCTION,
+    "The penultimate called function is correctly identified as a method.");
+  is(functionCalls[6].name, "fillRect",
+    "The penultimate called function's name is correct.");
+  is(functionCalls[6].file, SET_TIMEOUT_URL,
+    "The penultimate called function's file is correct.");
+  is(functionCalls[6].line, 21,
+    "The penultimate called function's line is correct.");
+  is(functionCalls[6].argsPreview, "10, 10, 55, 50",
+    "The penultimate called function's args preview is correct.");
+  is(functionCalls[6].callerPreview, "ctx",
+    "The penultimate called function's caller preview is correct.");
+
+  is(functionCalls[7].type, CallWatcherFront.METHOD_FUNCTION,
+    "The last called function is correctly identified as a method.");
+  is(functionCalls[7].name, "setTimeout",
+    "The last called function's name is correct.");
+  is(functionCalls[7].file, SET_TIMEOUT_URL,
+    "The last called function's file is correct.");
+  is(functionCalls[7].line, 30,
+    "The last called function's line is correct.");
+  ok(functionCalls[7].argsPreview.contains("Function"),
+    "The last called function's args preview is correct.");
+  is(functionCalls[7].callerPreview, "",
+    "The last called function's caller preview is correct.");
+
+  let firstNonDrawCall = yield functionCalls[1].getDetails();
+  let secondNonDrawCall = yield functionCalls[3].getDetails();
+  let lastNonDrawCall = yield functionCalls[7].getDetails();
+
+  is(firstNonDrawCall.name, "fillStyle",
+    "The first non-draw function's name is correct.");
+  is(secondNonDrawCall.name, "fillStyle",
+    "The second non-draw function's name is correct.");
+  is(lastNonDrawCall.name, "setTimeout",
+    "The last non-draw function's name is correct.");
+
+  let firstScreenshot = yield snapshotActor.generateScreenshotFor(functionCalls[1]);
+  let secondScreenshot = yield snapshotActor.generateScreenshotFor(functionCalls[3]);
+  let lastScreenshot = yield snapshotActor.generateScreenshotFor(functionCalls[7]);
+
+  ok(firstScreenshot,
+    "A screenshot was successfully retrieved for the first non-draw function.");
+  ok(secondScreenshot,
+    "A screenshot was successfully retrieved for the second non-draw function.");
+  ok(lastScreenshot,
+    "A screenshot was successfully retrieved for the last non-draw function.");
+
+  let firstActualScreenshot = yield snapshotActor.generateScreenshotFor(functionCalls[0]);
+  ok(sameArray(firstScreenshot.pixels, firstActualScreenshot.pixels),
+    "The screenshot for the first non-draw function is correct.");
+  is(firstScreenshot.width, 128,
+    "The screenshot for the first non-draw function has the correct width.");
+  is(firstScreenshot.height, 128,
+    "The screenshot for the first non-draw function has the correct height.");
+
+  let secondActualScreenshot =  yield snapshotActor.generateScreenshotFor(functionCalls[2]);
+  ok(sameArray(secondScreenshot.pixels, secondActualScreenshot.pixels),
+    "The screenshot for the second non-draw function is correct.");
+  is(secondScreenshot.width, 128,
+    "The screenshot for the second non-draw function has the correct width.");
+  is(secondScreenshot.height, 128,
+    "The screenshot for the second non-draw function has the correct height.");
+
+  let lastActualScreenshot = yield snapshotActor.generateScreenshotFor(functionCalls[6]);
+  ok(sameArray(lastScreenshot.pixels, lastActualScreenshot.pixels),
+    "The screenshot for the last non-draw function is correct.");
+  is(lastScreenshot.width, 128,
+    "The screenshot for the last non-draw function has the correct width.");
+  is(lastScreenshot.height, 128,
+    "The screenshot for the last non-draw function has the correct height.");
+
+  ok(!sameArray(firstScreenshot.pixels, secondScreenshot.pixels),
+    "The screenshots taken on consecutive draw calls are different (1).");
+  ok(!sameArray(secondScreenshot.pixels, lastScreenshot.pixels),
+    "The screenshots taken on consecutive draw calls are different (2).");
+
+  yield removeTab(target.tab);
+  finish();
+}
+
+function sameArray(a, b) {
+  if (a.length != b.length) {
+    return false;
+  }
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) {
+      return false;
+    }
+  }
+  return true;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-12.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-12.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-12.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-actor-test-12.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,29 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the recording can be disabled via stopRecordingAnimationFrame
+ * in the event no rAF loop is found.
+ */
+
+function ifTestingSupported() {
+  let { target, front } = yield initCanvasDebuggerBackend(NO_CANVAS_URL);
+  loadFrameScripts();
+
+  let navigated = once(target, "navigate");
+
+  yield front.setup({ reload: true });
+  ok(true, "The front was setup up successfully.");
+
+  yield navigated;
+  ok(true, "Target automatically navigated when the front was set up.");
+
+  let startRecording = front.recordAnimationFrame();
+  yield front.stopRecordingAnimationFrame();
+
+  ok(!(yield startRecording),
+    "recordAnimationFrame() does not return a SnapshotActor when cancelled.");
+
+  yield removeTab(target.tab);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-open.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-open.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-open.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-open.js	2015-02-28 15:03:02.000000000 +0000
@@ -25,8 +25,8 @@
     "The reload notice should initially be visible.");
   is($("#empty-notice").getAttribute("hidden"), "true",
     "The empty notice should initially be hidden.");
-  is($("#import-notice").getAttribute("hidden"), "true",
-    "The import notice should initially be hidden.");
+  is($("#waiting-notice").getAttribute("hidden"), "true",
+    "The waiting notice should initially be hidden.");
 
   is($("#screenshot-container").getAttribute("hidden"), "true",
     "The screenshot container should initially be hidden.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-01.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -32,8 +32,6 @@
 
   is($("#record-snapshot").getAttribute("checked"), "true",
     "The 'record snapshot' button should now be checked.");
-  is($("#record-snapshot").getAttribute("disabled"), "true",
-    "The 'record snapshot' button should now be disabled.");
   is($("#record-snapshot").hasAttribute("hidden"), false,
     "The 'record snapshot' button should still be visible.");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-02.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -36,8 +36,8 @@
     "The reload notice should now be hidden.");
   is($("#empty-notice").getAttribute("hidden"), "true",
     "The empty notice should now be hidden.");
-  is($("#import-notice").hasAttribute("hidden"), false,
-    "The import notice should now be visible.");
+  is($("#waiting-notice").hasAttribute("hidden"), false,
+    "The waiting notice should now be visible.");
 
   is($("#screenshot-container").getAttribute("hidden"), "true",
     "The screenshot container should still be hidden.");
@@ -57,8 +57,8 @@
     "The reload notice should now be hidden.");
   is($("#empty-notice").getAttribute("hidden"), "true",
     "The empty notice should now be hidden.");
-  is($("#import-notice").getAttribute("hidden"), "true",
-    "The import notice should now be hidden.");
+  is($("#waiting-notice").getAttribute("hidden"), "true",
+    "The waiting notice should now be hidden.");
 
   is($("#screenshot-container").hasAttribute("hidden"), false,
     "The screenshot container should now be visible.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-04.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-04.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-04.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-record-04.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,34 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Bug 1122766
+ * Tests that the canvas actor correctly returns from recordAnimationFrame
+ * in the scenario where a loop starts with rAF and has rAF in the beginning
+ * of its loop, when the recording starts before the rAFs start.
+ */
+
+function ifTestingSupported() {
+  let { target, panel } = yield initCanvasDebuggerFrontend(RAF_BEGIN_URL);
+  let { window, EVENTS, gFront, SnapshotsListView } = panel.panelWin;
+  loadFrameScripts();
+
+  yield reload(target);
+
+  let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
+  SnapshotsListView._onRecordButtonClick();
+
+  // Wait until after the recording started to trigger the content.
+  // Use the gFront method rather than the SNAPSHOT_RECORDING_STARTED event
+  // which triggers before the underlying actor call
+  yield waitUntil(function*() { return !(yield gFront.isRecording()); });
+
+  // Start animation in content
+  evalInDebuggee("start();");
+
+  yield recordingFinished;
+  ok(true, "Finished recording a snapshot of the animation loop.");
+
+  yield removeTab(target.tab);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-01.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-reload-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -39,8 +39,8 @@
     "The reload notice should now be hidden.");
   is($("#empty-notice").hasAttribute("hidden"), false,
     "The empty notice should now be visible.");
-  is($("#import-notice").getAttribute("hidden"), "true",
-    "The import notice should now be hidden.");
+  is($("#waiting-notice").getAttribute("hidden"), "true",
+    "The waiting notice should now be hidden.");
 
   is($("#snapshot-filmstrip").getAttribute("hidden"), "true",
     "The snapshot filmstrip should still be hidden.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,93 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests if selecting snapshots in the frontend displays the appropriate data
+ * respective to their recorded animation frame.
+ */
+
+function ifTestingSupported() {
+  let { target, panel } = yield initCanvasDebuggerFrontend(SIMPLE_CANVAS_URL);
+  let { window, $, EVENTS, SnapshotsListView, CallsListView } = panel.panelWin;
+
+  yield reload(target);
+
+  yield recordAndWaitForFirstSnapshot();
+  info("First snapshot recorded.")
+
+  is(SnapshotsListView.selectedIndex, 0,
+    "A snapshot should be automatically selected after first recording.");
+  is(CallsListView.selectedIndex, -1,
+    "There should be no call item automatically selected in the snapshot.");
+
+  yield recordAndWaitForAnotherSnapshot();
+  info("Second snapshot recorded.")
+
+  is(SnapshotsListView.selectedIndex, 0,
+    "A snapshot should not be automatically selected after another recording.");
+  is(CallsListView.selectedIndex, -1,
+    "There should still be no call item automatically selected in the snapshot.");
+
+  let secondSnapshotTarget = SnapshotsListView.getItemAtIndex(1).target;
+  let snapshotSelected = waitForSnapshotSelection();
+  EventUtils.sendMouseEvent({ type: "mousedown" }, secondSnapshotTarget, window);
+
+  yield snapshotSelected;
+  info("Second snapshot selected.");
+
+  is(SnapshotsListView.selectedIndex, 1,
+    "The second snapshot should now be selected.");
+  is(CallsListView.selectedIndex, -1,
+    "There should still be no call item automatically selected in the snapshot.");
+
+  let firstDrawCallContents = $(".call-item-contents", CallsListView.getItemAtIndex(2).target);
+  let screenshotDisplayed = once(window, EVENTS.CALL_SCREENSHOT_DISPLAYED);
+  EventUtils.sendMouseEvent({ type: "mousedown" }, firstDrawCallContents, window);
+
+  yield screenshotDisplayed;
+  info("First draw call in the second snapshot selected.");
+
+  is(SnapshotsListView.selectedIndex, 1,
+    "The second snapshot should still be selected.");
+  is(CallsListView.selectedIndex, 2,
+    "The first draw call should now be selected in the snapshot.");
+
+  let firstSnapshotTarget = SnapshotsListView.getItemAtIndex(0).target;
+  snapshotSelected = waitForSnapshotSelection();
+  EventUtils.sendMouseEvent({ type: "mousedown" }, firstSnapshotTarget, window);
+
+  yield snapshotSelected;
+  info("First snapshot re-selected.");
+
+  is(SnapshotsListView.selectedIndex, 0,
+    "The first snapshot should now be re-selected.");
+  is(CallsListView.selectedIndex, -1,
+    "There should still be no call item automatically selected in the snapshot.");
+
+  function recordAndWaitForFirstSnapshot() {
+    let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
+    let snapshotSelected = waitForSnapshotSelection();
+    SnapshotsListView._onRecordButtonClick();
+    return promise.all([recordingFinished, snapshotSelected]);
+  }
+
+  function recordAndWaitForAnotherSnapshot() {
+    let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
+    SnapshotsListView._onRecordButtonClick();
+    return recordingFinished;
+  }
+
+  function waitForSnapshotSelection() {
+    let callListPopulated = once(window, EVENTS.CALL_LIST_POPULATED);
+    let thumbnailsDisplayed = once(window, EVENTS.THUMBNAILS_DISPLAYED);
+    let screenshotDisplayed = once(window, EVENTS.CALL_SCREENSHOT_DISPLAYED);
+    return promise.all([
+      callListPopulated,
+      thumbnailsDisplayed,
+      screenshotDisplayed
+    ]);
+  }
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,30 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests if selecting snapshots in the frontend displays the appropriate data
+ * respective to their recorded animation frame.
+ */
+
+function ifTestingSupported() {
+  let { target, panel } = yield initCanvasDebuggerFrontend(SIMPLE_CANVAS_URL);
+  let { window, $, EVENTS, SnapshotsListView, CallsListView } = panel.panelWin;
+
+  yield reload(target);
+
+  SnapshotsListView._onRecordButtonClick();
+  let snapshotTarget = SnapshotsListView.getItemAtIndex(0).target;
+
+  EventUtils.sendMouseEvent({ type: "mousedown" }, snapshotTarget, window);
+  EventUtils.sendMouseEvent({ type: "mousedown" }, snapshotTarget, window);
+  EventUtils.sendMouseEvent({ type: "mousedown" }, snapshotTarget, window);
+
+  ok(true, "clicking in-progress snapshot does not fail");
+
+  let finished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
+  SnapshotsListView._onRecordButtonClick();
+  yield finished;
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-snapshot-select.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests if selecting snapshots in the frontend displays the appropriate data
- * respective to their recorded animation frame.
- */
-
-function ifTestingSupported() {
-  let { target, panel } = yield initCanvasDebuggerFrontend(SIMPLE_CANVAS_URL);
-  let { window, $, EVENTS, SnapshotsListView, CallsListView } = panel.panelWin;
-
-  yield reload(target);
-
-  yield recordAndWaitForFirstSnapshot();
-  info("First snapshot recorded.")
-
-  is(SnapshotsListView.selectedIndex, 0,
-    "A snapshot should be automatically selected after first recording.");
-  is(CallsListView.selectedIndex, -1,
-    "There should be no call item automatically selected in the snapshot.");
-
-  yield recordAndWaitForAnotherSnapshot();
-  info("Second snapshot recorded.")
-
-  is(SnapshotsListView.selectedIndex, 0,
-    "A snapshot should not be automatically selected after another recording.");
-  is(CallsListView.selectedIndex, -1,
-    "There should still be no call item automatically selected in the snapshot.");
-
-  let secondSnapshotTarget = SnapshotsListView.getItemAtIndex(1).target;
-  let snapshotSelected = waitForSnapshotSelection();
-  EventUtils.sendMouseEvent({ type: "mousedown" }, secondSnapshotTarget, window);
-
-  yield snapshotSelected;
-  info("Second snapshot selected.");
-
-  is(SnapshotsListView.selectedIndex, 1,
-    "The second snapshot should now be selected.");
-  is(CallsListView.selectedIndex, -1,
-    "There should still be no call item automatically selected in the snapshot.");
-
-  let firstDrawCallContents = $(".call-item-contents", CallsListView.getItemAtIndex(2).target);
-  let screenshotDisplayed = once(window, EVENTS.CALL_SCREENSHOT_DISPLAYED);
-  EventUtils.sendMouseEvent({ type: "mousedown" }, firstDrawCallContents, window);
-
-  yield screenshotDisplayed;
-  info("First draw call in the second snapshot selected.");
-
-  is(SnapshotsListView.selectedIndex, 1,
-    "The second snapshot should still be selected.");
-  is(CallsListView.selectedIndex, 2,
-    "The first draw call should now be selected in the snapshot.");
-
-  let firstSnapshotTarget = SnapshotsListView.getItemAtIndex(0).target;
-  snapshotSelected = waitForSnapshotSelection();
-  EventUtils.sendMouseEvent({ type: "mousedown" }, firstSnapshotTarget, window);
-
-  yield snapshotSelected;
-  info("First snapshot re-selected.");
-
-  is(SnapshotsListView.selectedIndex, 0,
-    "The first snapshot should now be re-selected.");
-  is(CallsListView.selectedIndex, -1,
-    "There should still be no call item automatically selected in the snapshot.");
-
-  function recordAndWaitForFirstSnapshot() {
-    let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
-    let snapshotSelected = waitForSnapshotSelection();
-    SnapshotsListView._onRecordButtonClick();
-    return promise.all([recordingFinished, snapshotSelected]);
-  }
-
-  function recordAndWaitForAnotherSnapshot() {
-    let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
-    SnapshotsListView._onRecordButtonClick();
-    return recordingFinished;
-  }
-
-  function waitForSnapshotSelection() {
-    let callListPopulated = once(window, EVENTS.CALL_LIST_POPULATED);
-    let thumbnailsDisplayed = once(window, EVENTS.THUMBNAILS_DISPLAYED);
-    let screenshotDisplayed = once(window, EVENTS.CALL_SCREENSHOT_DISPLAYED);
-    return promise.all([
-      callListPopulated,
-      thumbnailsDisplayed,
-      screenshotDisplayed
-    ]);
-  }
-
-  yield teardown(panel);
-  finish();
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-01.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that you can stop a recording that does not have a rAF cycle.
+ */
+
+function ifTestingSupported() {
+  let { target, panel } = yield initCanvasDebuggerFrontend(NO_CANVAS_URL);
+  let { window, EVENTS, $, SnapshotsListView } = panel.panelWin;
+
+  yield reload(target);
+
+  let recordingStarted = once(window, EVENTS.SNAPSHOT_RECORDING_STARTED);
+  SnapshotsListView._onRecordButtonClick();
+
+  yield recordingStarted;
+
+  is($("#empty-notice").hidden, true, "Empty notice not shown");
+  is($("#waiting-notice").hidden, false, "Waiting notice shown");
+
+  let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
+  let recordingCancelled = once(window, EVENTS.SNAPSHOT_RECORDING_CANCELLED);
+  SnapshotsListView._onRecordButtonClick();
+
+  yield promise.all([recordingFinished, recordingCancelled]);
+
+  ok(true, "Recording stopped and was considered failed.");
+
+  is(SnapshotsListView.itemCount, 0, "No snapshots in the list.");
+  is($("#empty-notice").hidden, false, "Empty notice shown");
+  is($("#waiting-notice").hidden, true, "Waiting notice not shown");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,35 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that a recording that does not have a rAF cycle fails after timeout.
+ */
+
+function ifTestingSupported() {
+  let { target, panel } = yield initCanvasDebuggerFrontend(NO_CANVAS_URL);
+  let { window, EVENTS, $, SnapshotsListView } = panel.panelWin;
+
+  yield reload(target);
+
+  let recordingStarted = once(window, EVENTS.SNAPSHOT_RECORDING_STARTED);
+  SnapshotsListView._onRecordButtonClick();
+
+  yield recordingStarted;
+
+  is($("#empty-notice").hidden, true, "Empty notice not shown");
+  is($("#waiting-notice").hidden, false, "Waiting notice shown");
+
+  let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
+  let recordingCancelled = once(window, EVENTS.SNAPSHOT_RECORDING_CANCELLED);
+
+  yield promise.all([recordingFinished, recordingCancelled]);
+
+  ok(true, "Recording stopped and was considered failed.");
+
+  is(SnapshotsListView.itemCount, 0, "No snapshots in the list.");
+  is($("#empty-notice").hidden, false, "Empty notice shown");
+  is($("#waiting-notice").hidden, true, "Waiting notice not shown");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-03.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-03.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-03.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser_canvas-frontend-stop-03.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that a recording that has a rAF cycle, but no draw calls, fails
+ * after timeout.
+ */
+
+function ifTestingSupported() {
+  let { target, panel } = yield initCanvasDebuggerFrontend(RAF_NO_CANVAS_URL);
+  let { window, EVENTS, $, SnapshotsListView } = panel.panelWin;
+
+  yield reload(target);
+
+  let recordingStarted = once(window, EVENTS.SNAPSHOT_RECORDING_STARTED);
+  SnapshotsListView._onRecordButtonClick();
+
+  yield recordingStarted;
+
+  is($("#empty-notice").hidden, true, "Empty notice not shown");
+  is($("#waiting-notice").hidden, false, "Waiting notice shown");
+
+  let recordingFinished = once(window, EVENTS.SNAPSHOT_RECORDING_FINISHED);
+  let recordingCancelled = once(window, EVENTS.SNAPSHOT_RECORDING_CANCELLED);
+
+  yield promise.all([recordingFinished, recordingCancelled]);
+
+  ok(true, "Recording stopped and was considered failed.");
+
+  is(SnapshotsListView.itemCount, 0, "No snapshots in the list.");
+  is($("#empty-notice").hidden, false, "Empty notice shown");
+  is($("#waiting-notice").hidden, true, "Waiting notice not shown");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -1,6 +1,10 @@
 [DEFAULT]
 subsuite = devtools
 support-files =
+  doc_raf-begin.html
+  doc_settimeout.html
+  doc_no-canvas.html
+  doc_raf-no-canvas.html
   doc_simple-canvas.html
   doc_simple-canvas-bitmasks.html
   doc_simple-canvas-deep-stack.html
@@ -19,6 +23,8 @@
 [browser_canvas-actor-test-08.js]
 [browser_canvas-actor-test-09.js]
 [browser_canvas-actor-test-10.js]
+[browser_canvas-actor-test-11.js]
+[browser_canvas-actor-test-12.js]
 [browser_canvas-frontend-call-highlight.js]
 [browser_canvas-frontend-call-list.js]
 [browser_canvas-frontend-call-search.js]
@@ -34,9 +40,14 @@
 [browser_canvas-frontend-record-01.js]
 [browser_canvas-frontend-record-02.js]
 [browser_canvas-frontend-record-03.js]
+[browser_canvas-frontend-record-04.js]
 [browser_canvas-frontend-reload-01.js]
 [browser_canvas-frontend-reload-02.js]
 [browser_canvas-frontend-slider-01.js]
 [browser_canvas-frontend-slider-02.js]
-[browser_canvas-frontend-snapshot-select.js]
+[browser_canvas-frontend-snapshot-select-01.js]
+[browser_canvas-frontend-snapshot-select-02.js]
 [browser_canvas-frontend-stepping.js]
+[browser_canvas-frontend-stop-01.js]
+[browser_canvas-frontend-stop-02.js]
+[browser_canvas-frontend-stop-03.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_no-canvas.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_no-canvas.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_no-canvas.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_no-canvas.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,14 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Canvas inspector test page</title>
+  </head>
+
+  <body>
+  </body>
+
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_raf-begin.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_raf-begin.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_raf-begin.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_raf-begin.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Canvas inspector test page</title>
+  </head>
+
+  <body>
+    <canvas width="128" height="128"></canvas>
+
+    <script type="text/javascript;version=1.8">
+      "use strict";
+
+      var ctx = document.querySelector("canvas").getContext("2d");
+
+      function drawRect(fill, size) {
+        ctx.fillStyle = fill;
+        ctx.fillRect(size[0], size[1], size[2], size[3]);
+      }
+
+      function drawScene() {
+        window.requestAnimationFrame(drawScene);
+        ctx.clearRect(0, 0, 128, 128);
+        drawRect("rgb(192, 192, 192)", [0, 0, 128, 128]);
+        drawRect("rgba(0, 0, 192, 0.5)", [30, 30, 55, 50]);
+        drawRect("rgba(192, 0, 0, 0.5)", [10, 10, 55, 50]);
+      }
+
+      function start () { window.requestAnimationFrame(drawScene); }
+    </script>
+  </body>
+
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_raf-no-canvas.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_raf-no-canvas.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_raf-no-canvas.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_raf-no-canvas.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,18 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Canvas inspector test page</title>
+  </head>
+
+  <body>
+    <script>
+      function render () { window.requestAnimationFrame(render); }
+      window.requestAnimationFrame(render);
+    </script>
+  </body>
+
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_settimeout.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_settimeout.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/doc_settimeout.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/doc_settimeout.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,37 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Canvas inspector test page</title>
+  </head>
+
+  <body>
+    <canvas width="128" height="128"></canvas>
+
+    <script type="text/javascript;version=1.8">
+      "use strict";
+
+      var ctx = document.querySelector("canvas").getContext("2d");
+
+      function drawRect(fill, size) {
+        ctx.fillStyle = fill;
+        ctx.fillRect(size[0], size[1], size[2], size[3]);
+      }
+
+      function drawScene() {
+        ctx.clearRect(0, 0, 128, 128);
+        drawRect("rgb(192, 192, 192)", [0, 0, 128, 128]);
+        drawRect("rgba(0, 0, 192, 0.5)", [30, 30, 55, 50]);
+        drawRect("rgba(192, 0, 0, 0.5)", [10, 10, 55, 50]);
+
+        window.setTimeout(drawScene, 50);
+      }
+
+      drawScene();
+    </script>
+  </body>
+
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/canvasdebugger/test/head.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/canvasdebugger/test/head.js	2015-02-28 15:03:02.000000000 +0000
@@ -20,6 +20,7 @@
 let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
 let { CallWatcherFront } = devtools.require("devtools/server/actors/call-watcher");
 let { CanvasFront } = devtools.require("devtools/server/actors/canvas");
+let { setTimeout } = devtools.require("sdk/timers");
 let TiltGL = devtools.require("devtools/tilt/tilt-gl");
 let TargetFactory = devtools.TargetFactory;
 let Toolbox = devtools.Toolbox;
@@ -27,18 +28,24 @@
 
 const FRAME_SCRIPT_UTILS_URL = "chrome://browser/content/devtools/frame-script-utils.js";
 const EXAMPLE_URL = "http://example.com/browser/browser/devtools/canvasdebugger/test/";
+const SET_TIMEOUT_URL = EXAMPLE_URL + "doc_settimeout.html";
+const NO_CANVAS_URL = EXAMPLE_URL + "doc_no-canvas.html";
+const RAF_NO_CANVAS_URL = EXAMPLE_URL + "doc_raf-no-canvas.html";
 const SIMPLE_CANVAS_URL = EXAMPLE_URL + "doc_simple-canvas.html";
 const SIMPLE_BITMASKS_URL = EXAMPLE_URL + "doc_simple-canvas-bitmasks.html";
 const SIMPLE_CANVAS_TRANSPARENT_URL = EXAMPLE_URL + "doc_simple-canvas-transparent.html";
 const SIMPLE_CANVAS_DEEP_STACK_URL = EXAMPLE_URL + "doc_simple-canvas-deep-stack.html";
 const WEBGL_ENUM_URL = EXAMPLE_URL + "doc_webgl-enum.html";
 const WEBGL_BINDINGS_URL = EXAMPLE_URL + "doc_webgl-bindings.html";
+const RAF_BEGIN_URL = EXAMPLE_URL + "doc_raf-begin.html";
 
 // All tests are asynchronous.
 waitForExplicitFinish();
 
 let gToolEnabled = Services.prefs.getBoolPref("devtools.canvasdebugger.enabled");
 
+gDevTools.testing = true;
+
 registerCleanupFunction(() => {
   info("finish() was called, cleaning up...");
   Services.prefs.setBoolPref("devtools.debugger.log", gEnableLogging);
@@ -275,3 +282,22 @@
   let item = aSources.getItemForAttachment(a => a.source.url === aURL);
   return item ? item.value : null;
 }
+
+/**
+ * Waits until a predicate returns true.
+ *
+ * @param function predicate
+ *        Invoked once in a while until it returns true.
+ * @param number interval [optional]
+ *        How often the predicate is invoked, in milliseconds.
+ */
+function *waitUntil (predicate, interval = 10) {
+  if (yield predicate()) {
+    return Promise.resolve(true);
+  }
+  let deferred = Promise.defer();
+  setTimeout(function() {
+    waitUntil(predicate).then(() => deferred.resolve(true));
+  }, interval);
+  return deferred.promise;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/debugger-panes.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/debugger-panes.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/debugger-panes.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/debugger-panes.js	2015-02-28 15:03:02.000000000 +0000
@@ -136,9 +136,8 @@
    *        - staged: true to stage the item to be appended later
    */
   addSource: function(aSource, aOptions = {}) {
-    if (!(aSource.url || aSource.introductionUrl)) {
-      // These would be most likely eval scripts introduced in inline
-      // JavaScript in HTML, and we don't show those yet (bug 1097873)
+    if (!aSource.url) {
+      // We don't show any unnamed eval scripts yet (see bug 1124106)
       return;
     }
 
@@ -170,21 +169,10 @@
   },
 
   _parseUrl: function(aSource) {
-    let fullUrl = aSource.url || aSource.introductionUrl;
+    let fullUrl = aSource.url;
     let url = fullUrl.split(" -> ").pop();
     let label = aSource.addonPath ? aSource.addonPath : SourceUtils.getSourceLabel(url);
-    let group;
-
-    if (!aSource.url && aSource.introductionUrl) {
-      label += ' > ' + aSource.introductionType;
-      group = L10N.getStr("evalGroupLabel");
-    }
-    else if(aSource.addonID) {
-      group = aSource.addonID;
-    }
-    else {
-      group = SourceUtils.getSourceGroup(url);
-    }
+    let group = aSource.addonID ? aSource.addonID : SourceUtils.getSourceGroup(url);
 
     return {
       label: label,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-eval.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-eval.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-eval.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser_dbg_breakpoints-eval.js	2015-02-28 15:03:02.000000000 +0000
@@ -28,16 +28,16 @@
   function run() {
     return Task.spawn(function*() {
       let newSource = waitForDebuggerEvents(gPanel, gDebugger.EVENTS.NEW_SOURCE);
-      callInTab(gTab, "evalSource");
+      callInTab(gTab, "evalSourceWithSourceURL");
       yield newSource;
 
-      yield gPanel.addBreakpoint({ actor: gSources.values[1], line: 2 });
+      yield gPanel.addBreakpoint({ actor: gSources.values[0], line: 2 });
       yield ensureThreadClientState(gPanel, "resumed");
 
       const paused = waitForThreadEvents(gPanel, "paused");
       callInTab(gTab, "bar");
       let frame = (yield paused).frame;
-      is(frame.where.source.actor, gSources.values[1], "Should have broken on the eval'ed source");
+      is(frame.where.source.actor, gSources.values[0], "Should have broken on the eval'ed source");
       is(frame.where.line, 2, "Should break on line 2");
 
       yield resumeDebuggerThenCloseAndFinish(gPanel);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser_dbg_sources-bookmarklet.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser_dbg_sources-bookmarklet.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser_dbg_sources-bookmarklet.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser_dbg_sources-bookmarklet.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,50 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Make sure javascript bookmarklet scripts appear and load correctly in the source list
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_script-bookmarklet.html";
+
+const BOOKMARKLET_SCRIPT_CODE = "console.log('bookmarklet executed');";
+
+function test() {
+  let gTab, gPanel, gDebugger;
+  let gSources, gBreakpoints;
+
+  initDebugger(TAB_URL).then(([aTab,, aPanel]) => {
+    gTab = aTab;
+    gPanel = aPanel;
+    gDebugger = gPanel.panelWin;
+    gSources = gDebugger.DebuggerView.Sources;
+    gBreakpoints = gDebugger.DebuggerController.Breakpoints;
+
+    return Task.spawn(function*() {
+      let waitForSource =  waitForDebuggerEvents(gPanel, gPanel.panelWin.EVENTS.NEW_SOURCE, 1);
+
+      // NOTE: devtools debugger panel needs to be already open,
+      // or the bookmarklet script will not be shown in the sources panel
+      callInTab(gTab, "injectBookmarklet", BOOKMARKLET_SCRIPT_CODE);
+
+      yield waitForSource;
+
+      is(gSources.values.length, 2, "Should have 2 source");
+
+      let item = gSources.getItemForAttachment(e => {
+        return e.label.indexOf("javascript:") === 0;
+      });
+      ok(item, "Source label is incorrect.");
+
+      let res = yield promiseInvoke(gDebugger.DebuggerController.client,
+                                gDebugger.DebuggerController.client.request,
+                                { to: item.value, type: "source"});
+
+      ok(res && res.source == BOOKMARKLET_SCRIPT_CODE, "SourceActor reply received");
+      is(res.source, BOOKMARKLET_SCRIPT_CODE, "source is correct");
+      is(res.contentType, "text/javascript", "contentType is correct");
+
+      yield closeDebuggerAndFinish(gPanel);
+    });
+  });
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser_dbg_variables-view-large-array-buffer.js	2015-02-28 15:03:02.000000000 +0000
@@ -58,7 +58,7 @@
 
   is(objectVar.target.querySelector(".name").getAttribute("value"), "largeObject",
     "Should have the right property name for 'largeObject'.");
-  is(objectVar.target.querySelector(".value").getAttribute("value"), "Object",
+  is(objectVar.target.querySelector(".value").getAttribute("value"), "Object[10000]",
     "Should have the right property value for 'largeObject'.");
   ok(objectVar.target.querySelector(".value").className.contains("token-other"),
     "Should have the right token class for 'largeObject'.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -86,6 +86,7 @@
   doc_scope-variable-3.html
   doc_scope-variable-4.html
   doc_script-eval.html
+  doc_script-bookmarklet.html
   doc_script-switching-01.html
   doc_script-switching-02.html
   doc_split-console-paused-reload.html
@@ -102,71 +103,45 @@
 [browser_dbg_aaa_run_first_leaktest.js]
 skip-if = e10s && debug
 [browser_dbg_addonactor.js]
-skip-if = e10s && debug
 [browser_dbg_addon-sources.js]
-skip-if = e10s && debug
 [browser_dbg_addon-modules.js]
 skip-if = e10s # TODO
 [browser_dbg_addon-modules-unpacked.js]
 skip-if = e10s # TODO
 [browser_dbg_addon-panels.js]
-skip-if = e10s && debug
 [browser_dbg_addon-console.js]
 skip-if = e10s && debug || os == 'win' # bug 1005274
 [browser_dbg_auto-pretty-print-01.js]
-skip-if = e10s && debug
 [browser_dbg_auto-pretty-print-02.js]
-skip-if = e10s && debug
 [browser_dbg_bfcache.js]
 skip-if = e10s || true # bug 1113935
 [browser_dbg_blackboxing-01.js]
-skip-if = e10s && debug
 [browser_dbg_blackboxing-02.js]
-skip-if = e10s && debug
 [browser_dbg_blackboxing-03.js]
-skip-if = e10s && debug
 [browser_dbg_blackboxing-04.js]
-skip-if = e10s && debug
 [browser_dbg_blackboxing-05.js]
-skip-if = e10s && debug
 [browser_dbg_blackboxing-06.js]
-skip-if = e10s && debug
 [browser_dbg_breadcrumbs-access.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-01.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-02.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-03.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-04.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-05.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-06.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-07.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-08.js]
-skip-if = e10s && debug
 [browser_dbg_break-on-dom-event-01.js]
 skip-if = e10s || os == "mac" || e10s # Bug 895426
 [browser_dbg_break-on-dom-event-02.js]
 skip-if = e10s # TODO
 [browser_dbg_breakpoints-actual-location.js]
-skip-if = e10s && debug
 [browser_dbg_breakpoints-actual-location2.js]
-skip-if = e10s && debug
 [browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js]
 skip-if = e10s # Bug 1093535
 [browser_dbg_breakpoints-button-01.js]
-skip-if = e10s && debug
 [browser_dbg_breakpoints-button-02.js]
-skip-if = e10s && debug
 [browser_dbg_breakpoints-contextmenu-add.js]
-skip-if = e10s && debug
 [browser_dbg_breakpoints-contextmenu.js]
-skip-if = e10s && debug
 [browser_dbg_breakpoints-disabled-reload.js]
 skip-if = e10s # Bug 1093535
 [browser_dbg_breakpoints-editor.js]
@@ -406,13 +381,15 @@
 [browser_dbg_sources-cache.js]
 skip-if = e10s && debug
 [browser_dbg_sources-eval-01.js]
-skip-if = e10s && debug
+skip-if = true # non-named eval sources turned off for now, bug 1124106
 [browser_dbg_sources-eval-02.js]
 skip-if = e10s && debug
 [browser_dbg_sources-labels.js]
 skip-if = e10s && debug
 [browser_dbg_sources-sorting.js]
 skip-if = e10s && debug
+[browser_dbg_sources-bookmarklet.js]
+skip-if = e10s && debug
 [browser_dbg_split-console-paused-reload.js]
 skip-if = e10s && debug
 [browser_dbg_stack-01.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/doc_script-bookmarklet.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/doc_script-bookmarklet.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/debugger/test/doc_script-bookmarklet.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/debugger/test/doc_script-bookmarklet.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,14 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger test page</title>
+  </head>
+
+  <body>
+    <script>function injectBookmarklet(bookmarklet) { setTimeout(function() { window.location = "javascript:" + bookmarklet; }, 0); }</script>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/framework/target.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/framework/target.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/framework/target.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/framework/target.js	2015-02-28 15:03:02.000000000 +0000
@@ -184,7 +184,13 @@
    * Returns a promise for the protocol description from the root actor.
    * Used internally with `target.actorHasMethod`. Takes advantage of
    * caching if definition was fetched previously with the corresponding
-   * actor information. Must be a remote target.
+   * actor information. Actors are lazily loaded, so not only must the tool using
+   * a specific actor be in use, the actors are only registered after invoking
+   * a method (for performance reasons, added in bug 988237), so to use these actor
+   * detection methods, one must already be communicating with a specific actor of
+   * that type.
+   *
+   * Must be a remote target.
    *
    * @return {Promise}
    * {
@@ -250,7 +256,8 @@
 
   /**
    * Queries the protocol description to see if an actor has
-   * an available method. The actor must already be lazily-loaded,
+   * an available method. The actor must already be lazily-loaded (read
+   * the restrictions in the `getActorDescription` comments),
    * so this is for use inside of tool. Returns a promise that
    * resolves to a boolean. Must be a remote target.
    *
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/framework/toolbox-options.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/framework/toolbox-options.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/framework/toolbox-options.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/framework/toolbox-options.xul	2015-02-28 15:03:02.000000000 +0000
@@ -149,8 +149,8 @@
                     label="&options.disableJavaScript.label;"
                     tooltiptext="&options.disableJavaScript.tooltip;"/>
           <hbox class="hidden-labels-box">
-            <checkbox label="&options.enableChrome.label4;"
-                      tooltiptext="&options.enableChrome.tooltip2;"
+            <checkbox label="&options.enableChrome.label5;"
+                      tooltiptext="&options.enableChrome.tooltip3;"
                       data-pref="devtools.chrome.enabled"/>
           </hbox>
           <hbox class="hidden-labels-box">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/jar.mn	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/jar.mn	2015-02-28 15:03:02.000000000 +0000
@@ -76,6 +76,8 @@
     content/browser/devtools/shadereditor.js                           (shadereditor/shadereditor.js)
     content/browser/devtools/canvasdebugger.xul                        (canvasdebugger/canvasdebugger.xul)
     content/browser/devtools/canvasdebugger.js                         (canvasdebugger/canvasdebugger.js)
+    content/browser/devtools/canvasdebugger/snapshotslist.js           (canvasdebugger/snapshotslist.js)
+    content/browser/devtools/canvasdebugger/callslist.js               (canvasdebugger/callslist.js)
     content/browser/devtools/d3.js                                     (shared/d3.js)
     content/browser/devtools/webaudioeditor.xul                        (webaudioeditor/webaudioeditor.xul)
     content/browser/devtools/dagre-d3.js                               (webaudioeditor/lib/dagre-d3.js)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/layoutview/test/browser_layoutview.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/layoutview/test/browser_layoutview.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/layoutview/test/browser_layoutview.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/layoutview/test/browser_layoutview.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,8 +9,8 @@
 
 // Expected values:
 let res1 = [
-      {selector: "#element-size",              value: "160" + "\u00D7" + "160"},
-      {selector: ".size > span",               value: "100" + "\u00D7" + "100"},
+      {selector: "#element-size",              value: "160" + "\u00D7" + "160.117"},
+      {selector: ".size > span",               value: "100" + "\u00D7" + "100.117"},
       {selector: ".margin.top > span",         value: 30},
       {selector: ".margin.left > span",        value: "auto"},
       {selector: ".margin.bottom > span",      value: 30},
@@ -43,7 +43,7 @@
 ];
 
 add_task(function*() {
-  let style = "div { position: absolute; top: 42px; left: 42px; height: 100px; width: 100px; border: 10px solid black; padding: 20px; margin: 30px auto;}";
+  let style = "div { position: absolute; top: 42px; left: 42px; height: 100.111px; width: 100px; border: 10px solid black; padding: 20px; margin: 30px auto;}";
   let html = "<style>" + style + "</style><div></div>"
 
   yield addTab("data:text/html," + encodeURIComponent(html));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/layoutview/view.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/layoutview/view.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/layoutview/view.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/layoutview/view.js	2015-02-28 15:03:02.000000000 +0000
@@ -422,7 +422,7 @@
           // might be missing.
           continue;
         }
-        let parsedValue = parseInt(layout[property]);
+        let parsedValue = parseFloat(layout[property]);
         if (Number.isNaN(parsedValue)) {
           // Not a number. We use the raw string.
           // Useful for "position" for example.
@@ -451,9 +451,10 @@
 
       width -= this.map.borderLeft.value + this.map.borderRight.value +
                this.map.paddingLeft.value + this.map.paddingRight.value;
-
+      width = parseFloat(width.toPrecision(6));
       height -= this.map.borderTop.value + this.map.borderBottom.value +
                 this.map.paddingTop.value + this.map.paddingBottom.value;
+      height = parseFloat(height.toPrecision(6));
 
       let newValue = width + "\u00D7" + height;
       if (this.sizeLabel.textContent != newValue) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/main.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/main.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/main.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/main.js	2015-02-28 15:03:02.000000000 +0000
@@ -219,7 +219,7 @@
   tooltip: l10n("ToolboxShaderEditor.tooltip", shaderEditorStrings),
 
   isTargetSupported: function(target) {
-    return target.hasActor("webgl");
+    return target.hasActor("webgl") && !target.chrome;
   },
 
   build: function(iframeWindow, toolbox) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/markup-view.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/markup-view.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/markup-view.css	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/markup-view.css	2015-02-28 15:03:02.000000000 +0000
@@ -14,6 +14,11 @@
   min-width: 100%;
 }
 
+body.dragging .tag-line {
+  cursor: grabbing;
+  -moz-user-select: none;
+}
+
 #root-wrapper:after {
    content: "";
    display: block;
@@ -63,6 +68,40 @@
   padding-left: 1001em;
 }
 
+/* Normally this element takes space in the layout even if it's position: relative
+ * by adding height: 0 we let surrounding elements to fill the blank space */
+.child.dragging {
+  position: relative;
+  pointer-events: none;
+  opacity: 0.7;
+  height: 0;
+}
+
+/* Indicates a tag-line in the markup-view as being an active drop target by
+ * drawing a horizontal line where the dragged element would be inserted if
+ * dropped here */
+.tag-line.drop-target::before, .tag-line.drag-target::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+}
+
+.tag-line.drag-target::before {
+  border-top: 2px dashed var(--theme-contrast-background);
+}
+
+.tag-line.drop-target::before {
+  border-top: 2px dashed var(--theme-content-color1);
+}
+
+/* In case the indicator is put on the closing .tag-line, the indentation level
+ * will become misleading, so we push it forward to match the indentation level */
+ul.children + .tag-line::before {
+  margin-left: 14px;
+}
+
 .tag-line {
   min-height: 1.4em;
   line-height: 1.4em;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/markup-view.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/markup-view.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/markup-view.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/markup-view.js	2015-02-28 15:03:02.000000000 +0000
@@ -14,6 +14,10 @@
 const COLLAPSE_DATA_URL_REGEX = /^data.+base64/;
 const COLLAPSE_DATA_URL_LENGTH = 60;
 const NEW_SELECTION_HIGHLIGHTER_TIMER = 1000;
+const GRAB_DELAY = 400;
+const DRAG_DROP_AUTOSCROLL_EDGE_DISTANCE = 50;
+const DRAG_DROP_MIN_AUTOSCROLL_SPEED = 5;
+const DRAG_DROP_MAX_AUTOSCROLL_SPEED = 15;
 
 const {UndoStack} = require("devtools/shared/undo");
 const {editableField, InplaceEditor} = require("devtools/shared/inplace-editor");
@@ -62,6 +66,7 @@
   this._inspector = aInspector;
   this.walker = this._inspector.walker;
   this._frame = aFrame;
+  this.win = this._frame.contentWindow;
   this.doc = this._frame.contentDocument;
   this._elt = this.doc.querySelector("#root");
   this.htmlEditor = new HTMLEditor(this.doc);
@@ -94,6 +99,9 @@
 
   this._onMouseClick = this._onMouseClick.bind(this);
 
+  this._onMouseUp = this._onMouseUp.bind(this);
+  this.doc.body.addEventListener("mouseup", this._onMouseUp);
+
   this._boundOnNewSelection = this._onNewSelection.bind(this);
   this._inspector.selection.on("new-node-front", this._boundOnNewSelection);
   this._onNewSelection();
@@ -156,7 +164,49 @@
     }
   },
 
+  isDragging: false,
+
   _onMouseMove: function(event) {
+    if (this.isDragging) {
+      event.preventDefault();
+      this._dragStartEl = event.target;
+
+      let docEl = this.doc.documentElement;
+
+      if (this._scrollInterval) {
+        this.win.clearInterval(this._scrollInterval);
+      }
+
+      // Auto-scroll when the mouse approaches top/bottom edge
+      let distanceFromBottom = docEl.clientHeight - event.pageY + this.win.scrollY,
+          distanceFromTop = event.pageY - this.win.scrollY;
+
+      if (distanceFromBottom <= DRAG_DROP_AUTOSCROLL_EDGE_DISTANCE) {
+        // Map our distance from 0-50 to 5-15 range so the speed is kept
+        // in a range not too fast, not too slow
+        let speed = map(distanceFromBottom, 0, DRAG_DROP_AUTOSCROLL_EDGE_DISTANCE,
+                        DRAG_DROP_MIN_AUTOSCROLL_SPEED, DRAG_DROP_MAX_AUTOSCROLL_SPEED);
+        // Here, we use minus because the value of speed - 15 is always negative
+        // and it makes the speed relative to the distance between mouse and edge
+        // the closer to the edge, the faster
+        this._scrollInterval = this.win.setInterval(() => {
+          docEl.scrollTop -= speed - DRAG_DROP_MAX_AUTOSCROLL_SPEED;
+        }, 0);
+      }
+
+      if (distanceFromTop <= DRAG_DROP_AUTOSCROLL_EDGE_DISTANCE) {
+        // refer to bottom edge's comments for more info
+        let speed = map(distanceFromTop, 0, DRAG_DROP_AUTOSCROLL_EDGE_DISTANCE,
+                        DRAG_DROP_MIN_AUTOSCROLL_SPEED, DRAG_DROP_MAX_AUTOSCROLL_SPEED);
+
+        this._scrollInterval = this.win.setInterval(() => {
+          docEl.scrollTop += speed - DRAG_DROP_MAX_AUTOSCROLL_SPEED;
+        }, 0);
+      }
+
+      return;
+    };
+
     let target = event.target;
 
     // Search target for a markupContainer reference, if not found, walk up
@@ -198,6 +248,18 @@
     }
   },
 
+  _onMouseUp: function() {
+    if (this._lastDropTarget) {
+      this.indicateDropTarget(null);
+    }
+    if (this._lastDragTarget) {
+      this.indicateDragTarget(null);
+    }
+    if (this._scrollInterval) {
+      this.win.clearInterval(this._scrollInterval);
+    }
+  },
+
   _hoveredNode: null,
 
   /**
@@ -218,6 +280,11 @@
   },
 
   _onMouseLeave: function() {
+    if (this._scrollInterval) {
+      this.win.clearInterval(this._scrollInterval);
+    }
+    if (this.isDragging) return;
+
     this._hideBoxModel(true);
     if (this._hoveredNode) {
       this.getContainer(this._hoveredNode).hovered = false;
@@ -790,6 +857,10 @@
    */
   _expandContainer: function(aContainer) {
     return this._updateChildren(aContainer, {expand: true}).then(() => {
+      if (this._destroyer) {
+        console.warn("Could not expand the node, the markup-view was destroyed");
+        return;
+      } 
       aContainer.expanded = true;
     });
   },
@@ -1361,6 +1432,12 @@
     this.tooltip.destroy();
     this.tooltip = null;
 
+    this.win = null;
+    this.doc = null;
+
+    this._lastDropTarget = null;
+    this._lastDragTarget = null;
+
     return this._destroyer;
   },
 
@@ -1448,6 +1525,80 @@
       this._updatePreview();
       this._previewBar.classList.remove("hide");
     }, 1000);
+  },
+
+  /**
+   * Takes an element as it's only argument and marks the element
+   * as the drop target
+   */
+  indicateDropTarget: function(el) {
+    if (this._lastDropTarget) {
+      this._lastDropTarget.classList.remove("drop-target");
+    }
+
+    if (!el) return;
+
+    let target = el.classList.contains("tag-line") ?
+                 el : el.querySelector(".tag-line") || el.closest(".tag-line");
+    if (!target) return;
+
+    target.classList.add("drop-target");
+    this._lastDropTarget = target;
+  },
+
+  /**
+   * Takes an element to mark it as indicator of dragging target's initial place
+   */
+  indicateDragTarget: function(el) {
+    if (this._lastDragTarget) {
+      this._lastDragTarget.classList.remove("drag-target");
+    }
+
+    if (!el) return;
+
+    let target = el.classList.contains("tag-line") ?
+                 el : el.querySelector(".tag-line") || el.closest(".tag-line");
+
+    if (!target) return;
+
+    target.classList.add("drag-target");
+    this._lastDragTarget = target;
+  },
+
+  /**
+   * Used to get the nodes required to modify the markup after dragging the element (parent/nextSibling)
+   */
+  get dropTargetNodes() {
+    let target = this._lastDropTarget;
+
+    if (!target) {
+      return null;
+    }
+
+    let parent, nextSibling;
+
+    if (this._lastDropTarget.previousElementSibling &&
+        this._lastDropTarget.previousElementSibling.nodeName.toLowerCase() === "ul") {
+      parent = target.parentNode.container.node;
+      nextSibling = null;
+    } else {
+      parent = target.parentNode.container.node.parentNode();
+      nextSibling = target.parentNode.container.node;
+    }
+
+    if (nextSibling && nextSibling.isBeforePseudoElement) {
+      nextSibling = target.parentNode.parentNode.children[1].container.node;
+    }
+    if (nextSibling && nextSibling.isAfterPseudoElement) {
+      parent = target.parentNode.container.node.parentNode();
+      nextSibling = null;
+    }
+
+    if (parent.nodeType !== Ci.nsIDOMNode.ELEMENT_NODE) {
+      return null;
+    }
+
+    return {parent, nextSibling};
   }
 };
 
@@ -1481,6 +1632,7 @@
     this.markup = markupView;
     this.node = node;
     this.undo = this.markup.undo;
+    this.win = this.markup._frame.contentWindow;
 
     // The template will fill the following properties
     this.elt = null;
@@ -1491,15 +1643,16 @@
     this.markup.template(templateID, this);
     this.elt.container = this;
 
-    // Binding event listeners
     this._onMouseDown = this._onMouseDown.bind(this);
-    this.elt.addEventListener("mousedown", this._onMouseDown, false);
-
     this._onToggle = this._onToggle.bind(this);
+    this._onMouseUp = this._onMouseUp.bind(this);
+    this._onMouseMove = this._onMouseMove.bind(this);
 
-    // Expanding/collapsing the node on dblclick of the whole tag-line element
+    // Binding event listeners
+    this.elt.addEventListener("mousedown", this._onMouseDown, false);
+    this.markup.doc.body.addEventListener("mouseup", this._onMouseUp, true);
+    this.markup.doc.body.addEventListener("mousemove", this._onMouseMove, true);
     this.elt.addEventListener("dblclick", this._onToggle, false);
-
     if (this.expander) {
       this.expander.addEventListener("click", this._onToggle, false);
     }
@@ -1618,24 +1771,109 @@
     return this.elt.parentNode ? this.elt.parentNode.container : null;
   },
 
+  _isMouseDown: false,
+  _isDragging: false,
+  _dragStartY: 0,
+
+  set isDragging(isDragging) {
+    this._isDragging = isDragging;
+    this.markup.isDragging = isDragging;
+
+    if (isDragging) {
+      this.elt.classList.add("dragging");
+      this.markup.doc.body.classList.add("dragging");
+    } else {
+      this.elt.classList.remove("dragging");
+      this.markup.doc.body.classList.remove("dragging");
+    }
+  },
+
+  get isDragging() {
+    return this._isDragging;
+  },
+
   _onMouseDown: function(event) {
     let target = event.target;
 
-    // Target may be a resource link (generated by the output-parser)
+    // The "show more nodes" button (already has its onclick).
+    if (target.nodeName === "button") {
+      return;
+    }
+
+    // output-parser generated links handling.
     if (target.nodeName === "a") {
       event.stopPropagation();
       event.preventDefault();
       let browserWin = this.markup._inspector.target
                            .tab.ownerDocument.defaultView;
       browserWin.openUILinkIn(target.href, "tab");
+      return;
     }
-    // Or it may be the "show more nodes" button (which already has its onclick)
-    // Else, it's the container itself
-    else if (target.nodeName !== "button") {
-      this.hovered = false;
-      this.markup.navigate(this);
-      event.stopPropagation();
+
+    // target is the MarkupContainer itself.
+    this._isMouseDown = true;
+    this.hovered = false;
+    this.markup.navigate(this);
+    event.stopPropagation();
+
+    // Start dragging the container after a delay.
+    this.markup._dragStartEl = target;
+    this.win.setTimeout(() => {
+      // Make sure the mouse is still down and on target.
+      if (!this._isMouseDown || this.markup._dragStartEl !== target ||
+          this.node.isPseudoElement || this.node.isAnonymous ||
+          !this.win.getSelection().isCollapsed) {
+        return;
+      }
+      this.isDragging = true;
+
+      this._dragStartY = event.pageY;
+      this.markup.indicateDropTarget(this.elt);
+
+      // If this is the last child, use the closing <div.tag-line> of parent as indicator
+      this.markup.indicateDragTarget(this.elt.nextElementSibling ||
+                                     this.markup.getContainer(this.node.parentNode()).closeTagLine);
+    }, GRAB_DELAY);
+  },
+
+  /**
+   * On mouse up, stop dragging.
+   */
+  _onMouseUp: function(event) {
+    this._isMouseDown = false;
+
+    if (!this.isDragging) {
+      return;
+    }
+
+    this.isDragging = false;
+    this.elt.style.removeProperty("top");
+
+    let dropTargetNodes = this.markup.dropTargetNodes;
+
+    if(!dropTargetNodes) {
+      return;
+    }
+
+    this.markup.walker.insertBefore(this.node, dropTargetNodes.parent,
+                                    dropTargetNodes.nextSibling);
+  },
+
+  /**
+   * On mouse move, move the dragged element if any and indicate the drop target.
+   */
+  _onMouseMove: function(event) {
+    if (!this.isDragging) {
+      return;
     }
+
+    let diff = event.pageY - this._dragStartY;
+    this.elt.style.top = diff + "px";
+
+    let el = this.markup.doc.elementFromPoint(event.pageX - this.win.scrollX,
+                                              event.pageY - this.win.scrollY);
+
+    this.markup.indicateDropTarget(el);
   },
 
   /**
@@ -1644,7 +1882,7 @@
    */
   flashMutation: function() {
     if (!this.selected) {
-      let contentWin = this.markup._frame.contentWindow;
+      let contentWin = this.win;
       this.flashed = true;
       if (this._flashMutationTimer) {
         contentWin.clearTimeout(this._flashMutationTimer);
@@ -1777,6 +2015,10 @@
     // Remove event listeners
     this.elt.removeEventListener("mousedown", this._onMouseDown, false);
     this.elt.removeEventListener("dblclick", this._onToggle, false);
+    this.markup.doc.body.removeEventListener("mouseup", this._onMouseUp, true);
+    this.markup.doc.body.removeEventListener("mousemove", this._onMouseMove, true);
+
+    this.win = null;
 
     if (this.expander) {
       this.expander.removeEventListener("click", this._onToggle, false);
@@ -2515,6 +2757,17 @@
   return attributes.reverse();
 }
 
+/**
+ * Map a number from one range to another.
+ */
+function map(value, oldMin, oldMax, newMin, newMax) {
+  let ratio = oldMax - oldMin;
+  if (ratio == 0) {
+    return value;
+  }
+  return newMin + (newMax - newMin) * ((value - oldMin) / ratio);
+}
+
 loader.lazyGetter(MarkupView.prototype, "strings", () => Services.strings.createBundle(
   "chrome://browser/locale/devtools/inspector.properties"
 ));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -2,6 +2,8 @@
 subsuite = devtools
 support-files =
   doc_markup_anonymous.html
+  doc_markup_dragdrop.html
+  doc_markup_dragdrop_autoscroll.html
   doc_markup_edit.html
   doc_markup_events.html
   doc_markup_events_jquery.html
@@ -37,6 +39,11 @@
 [browser_markupview_anonymous_04.js]
 [browser_markupview_copy_image_data.js]
 [browser_markupview_css_completion_style_attribute.js]
+[browser_markupview_dragdrop_autoscroll.js]
+[browser_markupview_dragdrop_invalidNodes.js]
+[browser_markupview_dragdrop_isDragging.js]
+[browser_markupview_dragdrop_reorder.js]
+[browser_markupview_dragdrop_textSelection.js]
 [browser_markupview_events.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
 [browser_markupview_events-overflow.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_autoscroll.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,61 @@
+/* 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: Dragging nodes near top/bottom edges of inspector
+// should auto-scroll
+
+const TEST_URL = TEST_URL_ROOT + "doc_markup_dragdrop_autoscroll.html";
+const GRAB_DELAY = 400;
+
+add_task(function*() {
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  let markup = inspector.markup;
+
+  let container = yield getContainerForSelector("#first", inspector);
+  let rect = container.elt.getBoundingClientRect();
+
+  info("Simulating mouseDown on #first");
+  container._onMouseDown({
+    target: container.tagLine,
+    pageX: 10,
+    pageY: rect.top,
+    stopPropagation: function() {},
+    preventDefault: function() {}
+  });
+
+  yield wait(GRAB_DELAY + 1);
+
+  let clientHeight = markup.doc.documentElement.clientHeight;
+  info("Simulating mouseMove on #first with pageY: " + clientHeight);
+
+  let ev = {
+    target: container.tagLine,
+    pageX: 10,
+    pageY: clientHeight,
+    preventDefault: function() {}
+  };
+
+  info("Listening on scroll event");
+  let scroll = onScroll(markup.win);
+
+  markup._onMouseMove(ev);
+
+  yield scroll;
+
+  container._onMouseUp(ev);
+  markup._onMouseUp(ev);
+
+  ok("Scroll event fired");
+});
+
+function onScroll(win) {
+  return new Promise((resolve, reject) => {
+    win.onscroll = function(e) {
+      resolve(e);
+    }
+  });
+};
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_invalidNodes.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,58 @@
+/* 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: pseudo-elements and anonymous nodes should not be draggable
+
+const TEST_URL = TEST_URL_ROOT + "doc_markup_dragdrop.html";
+const GRAB_DELAY = 400;
+
+add_task(function*() {
+  Services.prefs.setBoolPref("devtools.inspector.showAllAnonymousContent", true);
+
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  info("Expanding #test");
+  let parentFront = yield getNodeFront("#test", inspector);
+  yield inspector.markup.expandNode(parentFront);
+  yield waitForMultipleChildrenUpdates(inspector);
+
+  let parentContainer = yield getContainerForNodeFront(parentFront, inspector);
+  let beforePseudo = parentContainer.elt.children[1].firstChild.container;
+
+  parentContainer.elt.scrollIntoView(true);
+
+  info("Simulating mouseDown on #test::before");
+  beforePseudo._onMouseDown({
+    target: beforePseudo.tagLine,
+    stopPropagation: function() {},
+    preventDefault: function() {}
+  });
+
+  info("Waiting " + (GRAB_DELAY + 1) + "ms")
+  yield wait(GRAB_DELAY + 1);
+  is(beforePseudo.isDragging, false, "[pseudo-element] isDragging is false after GRAB_DELAY has passed");
+
+  let inputFront = yield getNodeFront("#anonymousParent", inspector);
+
+  yield inspector.markup.expandNode(inputFront);
+  yield waitForMultipleChildrenUpdates(inspector);
+
+  let inputContainer = yield getContainerForNodeFront(inputFront, inspector);
+  let anonymousDiv = inputContainer.elt.children[1].firstChild.container;
+
+  inputContainer.elt.scrollIntoView(true);
+
+  info("Simulating mouseDown on input#anonymousParent div");
+  anonymousDiv._onMouseDown({
+    target: anonymousDiv.tagLine,
+    stopPropagation: function() {},
+    preventDefault: function() {}
+  });
+
+  info("Waiting " + (GRAB_DELAY + 1) + "ms")
+  yield wait(GRAB_DELAY + 1);
+  is(anonymousDiv.isDragging, false, "[anonymous element] isDragging is false after GRAB_DELAY has passed");
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_isDragging.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,41 @@
+/* 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 drag mode's delay, it shouldn't enable dragging before
+// GRAB_DELAY = 400 has passed
+
+const TEST_URL = TEST_URL_ROOT + "doc_markup_dragdrop.html";
+const GRAB_DELAY = 400;
+
+add_task(function*() {
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  let el = yield getContainerForSelector("#test", inspector);
+  let rect = el.tagLine.getBoundingClientRect();
+
+  info("Simulating mouseDown on #test");
+  el._onMouseDown({
+    target: el.tagLine,
+    pageX: rect.x,
+    pageY: rect.y,
+    stopPropagation: function() {}
+  });
+
+  is(el.isDragging, false, "isDragging should not be set to true immedietly");
+
+  info("Waiting " + (GRAB_DELAY + 1) + "ms");
+  yield wait(GRAB_DELAY + 1);
+  ok(el.isDragging, "isDragging true after GRAB_DELAY has passed");
+
+  info("Simulating mouseUp on #test");
+  el._onMouseUp({
+    target: el.tagLine,
+    pageX: rect.x,
+    pageY: rect.y
+  });
+
+  is(el.isDragging, false, "isDragging false after mouseUp");
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_reorder.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,109 @@
+/* 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 different kinds of drag and drop node re-ordering
+
+const TEST_URL = TEST_URL_ROOT + "doc_markup_dragdrop.html";
+const GRAB_DELAY = 400;
+
+add_task(function*() {
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  info("Expanding #test");
+  let parentFront = yield getNodeFront("#test", inspector);
+  let parent = yield getNode("#test");
+  let parentContainer = yield getContainerForNodeFront(parentFront, inspector);
+
+  yield inspector.markup.expandNode(parentFront);
+  yield waitForMultipleChildrenUpdates(inspector);
+
+  parentContainer.elt.scrollIntoView(true);
+
+  info("Testing switching elements inside their parent");
+  yield moveElementDown("#firstChild", "#middleChild", inspector);
+
+  is(parent.children[0].id, "middleChild", "#firstChild is now the second child of #test");
+  is(parent.children[1].id, "firstChild", "#middleChild is now the first child of #test");
+
+  info("Testing switching elements with a last child");
+  yield moveElementDown("#firstChild", "#lastChild", inspector);
+
+  is(parent.children[1].id, "lastChild", "#lastChild is now the second child of #test");
+  is(parent.children[2].id, "firstChild", "#firstChild is now the last child of #test");
+
+  info("Testing appending element to a parent");
+  yield moveElementDown("#before", "#test", inspector);
+
+  is(parent.children.length, 4, "New element appended to #test");
+  is(parent.children[0].id, "before", "New element is appended at the right place (currently first child)");
+
+  info("Testing moving element to after it's parent");
+  yield moveElementDown("#firstChild", "#test", inspector);
+
+  is(parent.children.length, 3, "#firstChild is no longer #test's child");
+  is(parent.nextElementSibling.id, "firstChild", "#firstChild is now #test's nextElementSibling");
+});
+
+function* dragContainer(selector, targetOffset, inspector) {
+  info("Dragging the markup-container for node " + selector);
+
+  let container = yield getContainerForSelector(selector, inspector);
+
+  let updated = inspector.once("inspector-updated");
+
+  let rect = {
+    x: container.tagLine.offsetLeft,
+    y: container.tagLine.offsetTop
+  };
+
+  info("Simulating mouseDown on " + selector);
+  container._onMouseDown({
+    target: container.tagLine,
+    pageX: rect.x,
+    pageY: rect.y,
+    stopPropagation: function() {}
+  });
+
+  let targetX = rect.x + targetOffset.x,
+      targetY = rect.y + targetOffset.y;
+
+  setTimeout(() => {
+    info("Simulating mouseMove on " + selector +
+         " with pageX: " + targetX + " pageY: " + targetY);
+    container._onMouseMove({
+      target: container.tagLine,
+      pageX: targetX,
+      pageY: targetY
+    });
+
+    info("Simulating mouseUp on " + selector +
+         " with pageX: " + targetX + " pageY: " + targetY);
+    container._onMouseUp({
+      target: container.tagLine,
+      pageX: targetX,
+      pageY: targetY
+    });
+
+    container.markup._onMouseUp();
+  }, GRAB_DELAY+1);
+
+  return updated;
+};
+
+function* moveElementDown(selector, next, inspector) {
+  let onMutated = inspector.once("markupmutation");
+  let uiUpdate = inspector.once("inspector-updated");
+
+  let el = yield getContainerForSelector(next, inspector);
+  let height = el.tagLine.getBoundingClientRect().height;
+
+  info("Switching " + selector + ' with ' + next);
+
+  yield dragContainer(selector, {x: 0, y: Math.round(height) + 2}, inspector);
+
+  yield onMutated;
+  yield uiUpdate;
+};
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_dragdrop_textSelection.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,48 @@
+/* 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: Nodes should not be draggable if there is a text selected
+// (trying to move selected text around shouldn't trigger node drag and drop)
+
+const TEST_URL = TEST_URL_ROOT + "doc_markup_dragdrop.html";
+const GRAB_DELAY = 400;
+
+add_task(function*() {
+  let {inspector} = yield addTab(TEST_URL).then(openInspector);
+  let markup = inspector.markup;
+
+  info("Expanding span#before");
+  let spanFront = yield getNodeFront("#before", inspector);
+  let spanContainer = yield getContainerForNodeFront(spanFront, inspector);
+  let span = yield getNode("#before");
+
+  yield inspector.markup.expandNode(spanFront);
+  yield waitForMultipleChildrenUpdates(inspector);
+
+  spanContainer.elt.scrollIntoView(true);
+
+  info("Selecting #before's text content");
+
+  let textContent = spanContainer.elt.children[1].firstChild.container;
+
+  let selectRange = markup.doc.createRange();
+  selectRange.selectNode(textContent.editor.elt.querySelector('[tabindex]'));
+  markup.doc.getSelection().addRange(selectRange);
+
+  info("Simulating mouseDown on #before");
+
+  spanContainer._onMouseDown({
+    pageX: 0,
+    pageY: 0,
+    target: spanContainer.tagLine,
+    stopPropagation: function() {},
+    preventDefault: function() {}
+  });
+
+  yield wait(GRAB_DELAY + 1);
+
+  is(spanContainer.isDragging, false, "isDragging should be false if there is a text selected");
+});
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_textcontent_edit_01.js	2015-02-28 15:03:02.000000000 +0000
@@ -31,15 +31,3 @@
 
   yield inspector.once("inspector-updated");
 });
-
-// The expand all operation of the markup-view calls itself recursively and
-// there's not one event we can wait for to know when it's done
-function* waitForMultipleChildrenUpdates(inspector) {
-  // As long as child updates are queued up while we wait for an update already
-  // wait again
-  if (inspector.markup._queuedChildUpdates &&
-      inspector.markup._queuedChildUpdates.size) {
-    yield waitForChildrenUpdated(inspector);
-    return yield waitForMultipleChildrenUpdates(inspector);
-  }
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_toggle_03.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_toggle_03.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/browser_markupview_toggle_03.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/browser_markupview_toggle_03.js	2015-02-28 15:03:02.000000000 +0000
@@ -33,15 +33,3 @@
       "Container for node " + nodeFront.tagName + " is expanded");
   }
 });
-
-// The expand all operation of the markup-view calls itself recursively and
-// there's not one event we can wait for to know when it's done
-function* waitForMultipleChildrenUpdates(inspector) {
-  // As long as child updates are queued up while we wait for an update already
-  // wait again
-  if (inspector.markup._queuedChildUpdates &&
-      inspector.markup._queuedChildUpdates.size) {
-    yield waitForChildrenUpdated(inspector);
-    return yield waitForMultipleChildrenUpdates(inspector);
-  }
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop_autoscroll.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop_autoscroll.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop_autoscroll.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop_autoscroll.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=858038
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 858038 - Autoscroll</title>
+</head>
+<body>
+  <div id="first"></div>
+  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=858038">Mozilla Bug 858038</a>
+  <p id="display">Test</p>
+  <div id="content" style="display: none">
+
+  </div>
+
+  <!-- Make sure the markup-view has enough nodes shown by default that it has a scrollbar -->
+
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+  <div></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/doc_markup_dragdrop.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=858038
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 858038</title>
+  <style>
+    #test::before {
+      content: 'This should not be draggable';
+    }
+  </style>
+</head>
+<body>
+  <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=858038">Mozilla Bug 858038</a>
+  <p id="display"></p>
+  <div id="content" style="display: none">
+
+  </div>
+  <input id="anonymousParent" />
+
+  <span id="before">Before</span>
+  <pre id="test">
+    <span id="firstChild">First</span>
+    <span id="middleChild">Middle</span>
+    <span id="lastChild">Last</span>
+  </pre>
+  <span id="after">After</span>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/markupview/test/head.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/markupview/test/head.js	2015-02-28 15:03:02.000000000 +0000
@@ -561,3 +561,16 @@
     editMode ? "input": "span",
     editMode ? attrName + " is in edit mode" : attrName + " is not in edit mode");
 }
+
+// The expand all operation of the markup-view calls itself recursively and
+// there's not one event we can wait for to know when it's done
+// so use this helper function to wait until all recursive children updates are done.
+function* waitForMultipleChildrenUpdates(inspector) {
+  // As long as child updates are queued up while we wait for an update already
+  // wait again
+  if (inspector.markup._queuedChildUpdates &&
+      inspector.markup._queuedChildUpdates.size) {
+    yield waitForChildrenUpdated(inspector);
+    return yield waitForMultipleChildrenUpdates(inspector);
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/netmonitor.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/netmonitor.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/netmonitor.css	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/netmonitor.css	2015-02-28 15:03:02.000000000 +0000
@@ -28,7 +28,7 @@
   overflow: auto;
 }
 
-#headers-summary-url-value .textbox-input {
+.cropped-textbox .textbox-input {
   /* workaround for textbox not supporting the @crop attribute */
   text-overflow: ellipsis;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/netmonitor-view.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/netmonitor-view.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/netmonitor-view.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/netmonitor-view.js	2015-02-28 15:03:02.000000000 +0000
@@ -2743,21 +2743,22 @@
     }
 
     /**
-     * A helper that sets label text to specified value.
+     * A helper that sets value and tooltiptext attributes of an element to
+     * specified value.
      *
      * @param string selector
-     *        A selector for the label.
+     *        A selector for the element.
      * @param string value
-     *        The value label should have. If this evaluates to false a
-     *        placeholder string <Not Available> is used instead.
+     *        The value to set. If this evaluates to false a placeholder string
+     *        <Not Available> is used instead.
      */
-    function setLabel(selector, value) {
+    function setValue(selector, value) {
       let label = $(selector);
       if (!value) {
-        label.value = L10N.getStr("netmonitor.security.notAvailable");
-        label.setAttribute("tooltiptext", label.value);
+        label.setAttribute("value", L10N.getStr("netmonitor.security.notAvailable"));
+        label.setAttribute("tooltiptext", label.getAttribute("value"));
       } else {
-        label.value = value;
+        label.setAttribute("value", value);
         label.setAttribute("tooltiptext", value);
       }
     }
@@ -2785,43 +2786,43 @@
       let disabledLabel = L10N.getStr("netmonitor.security.disabled");
 
       // Connection parameters
-      setLabel("#security-protocol-version-value", securityInfo.protocolVersion);
-      setLabel("#security-ciphersuite-value", securityInfo.cipherSuite);
+      setValue("#security-protocol-version-value", securityInfo.protocolVersion);
+      setValue("#security-ciphersuite-value", securityInfo.cipherSuite);
 
       // Host header
       let domain = NetMonitorView.RequestsMenu._getUriHostPort(url);
       let hostHeader = L10N.getFormatStr("netmonitor.security.hostHeader", domain);
-      setLabel("#security-info-host-header", hostHeader);
+      setValue("#security-info-host-header", hostHeader);
 
       // Parameters related to the domain
-      setLabel("#security-http-strict-transport-security-value",
+      setValue("#security-http-strict-transport-security-value",
                 securityInfo.hsts ? enabledLabel : disabledLabel);
 
-      setLabel("#security-public-key-pinning-value",
+      setValue("#security-public-key-pinning-value",
                 securityInfo.hpkp ? enabledLabel : disabledLabel);
 
       // Certificate parameters
       let cert = securityInfo.cert;
-      setLabel("#security-cert-subject-cn", cert.subject.commonName);
-      setLabel("#security-cert-subject-o", cert.subject.organization);
-      setLabel("#security-cert-subject-ou", cert.subject.organizationalUnit);
-
-      setLabel("#security-cert-issuer-cn", cert.issuer.commonName);
-      setLabel("#security-cert-issuer-o", cert.issuer.organization);
-      setLabel("#security-cert-issuer-ou", cert.issuer.organizationalUnit);
+      setValue("#security-cert-subject-cn", cert.subject.commonName);
+      setValue("#security-cert-subject-o", cert.subject.organization);
+      setValue("#security-cert-subject-ou", cert.subject.organizationalUnit);
+
+      setValue("#security-cert-issuer-cn", cert.issuer.commonName);
+      setValue("#security-cert-issuer-o", cert.issuer.organization);
+      setValue("#security-cert-issuer-ou", cert.issuer.organizationalUnit);
 
-      setLabel("#security-cert-validity-begins", cert.validity.start);
-      setLabel("#security-cert-validity-expires", cert.validity.end);
+      setValue("#security-cert-validity-begins", cert.validity.start);
+      setValue("#security-cert-validity-expires", cert.validity.end);
 
-      setLabel("#security-cert-sha1-fingerprint", cert.fingerprint.sha1);
-      setLabel("#security-cert-sha256-fingerprint", cert.fingerprint.sha256);
+      setValue("#security-cert-sha1-fingerprint", cert.fingerprint.sha1);
+      setValue("#security-cert-sha256-fingerprint", cert.fingerprint.sha256);
     } else {
       infobox.hidden = true;
       errorbox.hidden = false;
 
       // Strip any HTML from the message.
       let plain = DOMParser.parseFromString(securityInfo.errorMessage, "text/html");
-      $("#security-error-message").textContent = plain.body.textContent;
+      setValue("#security-error-message", plain.body.textContent);
     }
   }),
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/netmonitor.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/netmonitor.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/netmonitor.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/netmonitor.xul	2015-02-28 15:03:02.000000000 +0000
@@ -300,7 +300,7 @@
                     <label class="plain tabpanel-summary-label"
                            value="&netmonitorUI.summary.url;"/>
                     <textbox id="headers-summary-url-value"
-                             class="plain tabpanel-summary-value devtools-monospace"
+                             class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
                              flex="1"
                              readonly="true"/>
                   </hbox>
@@ -488,7 +488,14 @@
                         flex="1">
                     <label class="plain tabpanel-summary-label"
                            value="&netmonitorUI.security.error;"/>
-                    <description id="security-error-message" flex="1"/>
+                    <hbox class="security-info-section"
+                          flex="1">
+                      <textbox id="security-error-message"
+                               class="plain"
+                               flex="1"
+                               multiline="true"
+                               readonly="true"/>
+                    </hbox>
                   </vbox>
                   <vbox id="security-information"
                         flex="1">
@@ -502,10 +509,10 @@
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
                                  value="&netmonitorUI.security.protocolVersion;"/>
-                          <label id="security-protocol-version-value"
-                                 class="plain tabpanel-summary-value devtools-monospace"
-                                 crop="end"
-                                 flex="1"/>
+                          <textbox id="security-protocol-version-value"
+                                   class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                   flex="1"
+                                   readonly="true"/>
                           <image class="security-warning-icon"
                                  id="security-warning-sslv3"
                                  tooltiptext="&netmonitorUI.security.warning.sslv3;" />
@@ -515,10 +522,10 @@
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
                                  value="&netmonitorUI.security.cipherSuite;"/>
-                          <label id="security-ciphersuite-value"
-                                 class="plain tabpanel-summary-value devtools-monospace"
-                                 crop="end"
-                                 flex="1"/>
+                          <textbox id="security-ciphersuite-value"
+                                   class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                   flex="1"
+                                   readonly="true"/>
                           <image class="security-warning-icon"
                                  id="security-warning-cipher"
                                  tooltiptext="&netmonitorUI.security.warning.cipher;" />
@@ -535,20 +542,20 @@
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
                                  value="&netmonitorUI.security.hsts;"/>
-                          <label id="security-http-strict-transport-security-value"
-                                 class="plain tabpanel-summary-value devtools-monospace"
-                                 crop="end"
-                                 flex="1"/>
+                          <textbox id="security-http-strict-transport-security-value"
+                                   class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                   flex="1"
+                                   readonly="true"/>
                         </hbox>
                         <hbox id="security-public-key-pinning"
                               class="tabpanel-summary-container"
                               align="baseline">
                           <label class="plain tabpanel-summary-label"
                                  value="&netmonitorUI.security.hpkp;"/>
-                          <label id="security-public-key-pinning-value"
-                                 class="plain tabpanel-summary-value devtools-monospace"
-                                 crop="end"
-                                 flex="1"/>
+                          <textbox id="security-public-key-pinning-value"
+                                   class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                   flex="1"
+                                   readonly="true"/>
                         </hbox>
                       </vbox>
                     </vbox>
@@ -566,28 +573,28 @@
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.cn;:"/>
-                            <label id="security-cert-subject-cn"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-subject-cn"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                           <hbox class="tabpanel-summary-container"
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.o;:"/>
-                            <label id="security-cert-subject-o"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-subject-o"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                           <hbox class="tabpanel-summary-container"
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.ou;:"/>
-                            <label id="security-cert-subject-ou"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-subject-ou"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                         </vbox>
                         <vbox class="tabpanel-summary-container">
@@ -599,28 +606,28 @@
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.cn;:"/>
-                            <label id="security-cert-issuer-cn"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-issuer-cn"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                           <hbox class="tabpanel-summary-container"
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.o;:"/>
-                            <label id="security-cert-issuer-o"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-issuer-o"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                           <hbox class="tabpanel-summary-container"
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.ou;:"/>
-                            <label id="security-cert-issuer-ou"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-issuer-ou"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                         </vbox>
                         <vbox class="tabpanel-summary-container">
@@ -632,19 +639,19 @@
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.begins;:"/>
-                            <label id="security-cert-validity-begins"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-validity-begins"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                           <hbox class="tabpanel-summary-container"
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.expires;:"/>
-                            <label id="security-cert-validity-expires"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-validity-expires"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                         </vbox>
                         <vbox class="tabpanel-summary-container">
@@ -656,19 +663,19 @@
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.sha256fingerprint;:"/>
-                            <label id="security-cert-sha256-fingerprint"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-sha256-fingerprint"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                           <hbox class="tabpanel-summary-container"
                                 align="baseline">
                             <label class="plain tabpanel-summary-label"
                                    value="&certmgr.certdetail.sha1fingerprint;:"/>
-                            <label id="security-cert-sha1-fingerprint"
-                                   class="plain tabpanel-summary-value devtools-monospace"
-                                   crop="end"
-                                   flex="1"/>
+                            <textbox id="security-cert-sha1-fingerprint"
+                                     class="plain tabpanel-summary-value devtools-monospace cropped-textbox"
+                                     flex="1"
+                                     readonly="true"/>
                           </hbox>
                         </vbox>
                       </vbox>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -100,6 +100,7 @@
 [browser_net_sort-01.js]
 [browser_net_sort-02.js]
 [browser_net_sort-03.js]
+skip-if = (os == 'linux' && e10s && !debug) # bug 1137694
 [browser_net_statistics-01.js]
 [browser_net_statistics-02.js]
 [browser_net_statistics-03.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_content-type.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_content-type.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_content-type.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_content-type.js	2015-02-28 15:03:02.000000000 +0000
@@ -48,7 +48,7 @@
           statusText: "OK",
           type: "json",
           fullMimeType: "application/json; charset=utf-8",
-          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
+          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
           time: true
         });
       verifyRequestItemTarget(RequestsMenu.getItemAtIndex(4),
@@ -67,7 +67,7 @@
           statusText: "OK",
           type: "png",
           fullMimeType: "image/png",
-          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.75),
+          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.76),
           time: true
         });
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_prefs-and-l10n.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_prefs-and-l10n.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_prefs-and-l10n.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_prefs-and-l10n.js	2015-02-28 15:03:02.000000000 +0000
@@ -35,9 +35,6 @@
     function testPrefs() {
       let { Prefs } = aMonitor.panelWin;
 
-      is(Prefs._root, "devtools.netmonitor",
-        "The preferences object should have a correct root path.");
-
       is(Prefs.networkDetailsWidth,
         Services.prefs.getIntPref("devtools.netmonitor.panes-network-details-width"),
         "Getting a pref should work correctly.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_security-error.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_security-error.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_security-error.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_security-error.js	2015-02-28 15:03:02.000000000 +0000
@@ -37,7 +37,7 @@
   is(errorbox.hidden, false, "Error box is visble.");
   is(infobox.hidden, true, "Information box is hidden.");
 
-  isnot(errormsg.textContent, "", "Error message is not empty.");
+  isnot(errormsg.value, "", "Error message is not empty.");
 
   yield teardown(monitor);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_security-state.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_security-state.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_security-state.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_security-state.js	2015-02-28 15:03:02.000000000 +0000
@@ -16,6 +16,12 @@
     "rc4.example.com": "security-state-weak",
   };
 
+  yield new promise(resolve => {
+    SpecialPowers.pushPrefEnv({"set": [
+      ["security.tls.insecure_fallback_hosts", "rc4.example.com"]
+    ]}, resolve);
+  });
+
   let [tab, debuggee, monitor] = yield initNetMonitor(CUSTOM_GET_URL);
   let { $, EVENTS, NetMonitorView } = monitor.panelWin;
   let { RequestsMenu } = NetMonitorView;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_security-warnings.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_security-warnings.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_security-warnings.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_security-warnings.js	2015-02-28 15:03:02.000000000 +0000
@@ -40,9 +40,12 @@
   let { RequestsMenu, NetworkDetails } = NetMonitorView;
   RequestsMenu.lazyUpdate = false;
 
-  info("Enabling SSLv3 for the test.");
+  info("Enabling SSLv3 and RC4 for the test.");
   yield new promise(resolve => {
-    SpecialPowers.pushPrefEnv({"set": [["security.tls.version.min", 0]]}, resolve);
+    SpecialPowers.pushPrefEnv({"set": [
+      ["security.tls.version.min", 0],
+      ["security.tls.insecure_fallback_hosts", "rc4.example.com,ssl3rc4.example.com"]
+    ]}, resolve);
   });
 
   let cipher = $("#security-warning-cipher");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_sort-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_sort-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_sort-02.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_sort-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -228,8 +228,8 @@
           statusText: "Meh",
           type: "2",
           fullMimeType: "text/2",
-          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.01),
-          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.01),
+          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
+          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
           time: true
         });
       verifyRequestItemTarget(RequestsMenu.getItemAtIndex(c),
@@ -239,8 +239,8 @@
           statusText: "Meh",
           type: "3",
           fullMimeType: "text/3",
-          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
-          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
+          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
+          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
           time: true
         });
       verifyRequestItemTarget(RequestsMenu.getItemAtIndex(d),
@@ -250,8 +250,8 @@
           statusText: "Meh",
           type: "4",
           fullMimeType: "text/4",
-          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
-          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
+          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
+          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
           time: true
         });
       verifyRequestItemTarget(RequestsMenu.getItemAtIndex(e),
@@ -261,8 +261,8 @@
           statusText: "Meh",
           type: "5",
           fullMimeType: "text/5",
-          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
-          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
+          transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.05),
+          size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.05),
           time: true
         });
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_sort-03.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_sort-03.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/netmonitor/test/browser_net_sort-03.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/netmonitor/test/browser_net_sort-03.js	2015-02-28 15:03:02.000000000 +0000
@@ -143,8 +143,8 @@
             statusText: "Meh",
             type: "2",
             fullMimeType: "text/2",
-            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.01),
-            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.01),
+            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
+            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
             time: true
           });
       }
@@ -156,8 +156,8 @@
             statusText: "Meh",
             type: "3",
             fullMimeType: "text/3",
-            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
-            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.02),
+            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
+            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
             time: true
           });
       }
@@ -169,8 +169,8 @@
             statusText: "Meh",
             type: "4",
             fullMimeType: "text/4",
-            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
-            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.03),
+            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
+            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
             time: true
           });
       }
@@ -182,8 +182,8 @@
             statusText: "Meh",
             type: "5",
             fullMimeType: "text/5",
-            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
-            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.04),
+            transferred: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.05),
+            size: L10N.getFormatStrWithNumbers("networkMenu.sizeKB", 0.05),
             time: true
           });
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/modules/recording-utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/modules/recording-utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/modules/recording-utils.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/modules/recording-utils.js	2015-02-28 15:03:02.000000000 +0000
@@ -3,6 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
+const { Cc, Ci, Cu, Cr } = require("chrome");
+
 /**
  * Utility functions for managing recording models and their internal data,
  * such as filtering profile samples or offsetting timestamps.
@@ -130,3 +132,50 @@
   gSamplesFromAllocationCache.set(allocations, samples);
   return samples;
 }
+
+/**
+ * Gets the current timeline blueprint without the hidden markers.
+ *
+ * @param blueprint
+ *        The default timeline blueprint.
+ * @param array hiddenMarkers
+ *        A list of hidden markers' names.
+ * @return object
+ *         The filtered timeline blueprint.
+ */
+exports.RecordingUtils.getFilteredBlueprint = function({ blueprint, hiddenMarkers }) {
+  let filteredBlueprint = Cu.cloneInto(blueprint, {});
+  let maybeRemovedGroups = new Set();
+  let removedGroups = new Set();
+
+  // 1. Remove hidden markers from the blueprint.
+
+  for (let hiddenMarkerName of hiddenMarkers) {
+    maybeRemovedGroups.add(filteredBlueprint[hiddenMarkerName].group);
+    delete filteredBlueprint[hiddenMarkerName];
+  }
+
+  // 2. Get a list of all the groups that will be removed.
+
+  for (let maybeRemovedGroup of maybeRemovedGroups) {
+    let markerNames = Object.keys(filteredBlueprint);
+    let isGroupRemoved = markerNames.every(e => filteredBlueprint[e].group != maybeRemovedGroup);
+    if (isGroupRemoved) {
+      removedGroups.add(maybeRemovedGroup);
+    }
+  }
+
+  // 3. Offset groups so that their indices are consecutive.
+
+  for (let removedGroup of removedGroups) {
+    let markerNames = Object.keys(filteredBlueprint);
+    for (let markerName of markerNames) {
+      let markerDetails = filteredBlueprint[markerName];
+      if (markerDetails.group > removedGroup) {
+        markerDetails.group--;
+      }
+    }
+  }
+
+  return filteredBlueprint;
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/performance-controller.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/performance-controller.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/performance-controller.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/performance-controller.js	2015-02-28 15:03:02.000000000 +0000
@@ -57,10 +57,12 @@
 
 // Events emitted by various objects in the panel.
 const EVENTS = {
-  // Fired by the OptionsView when a preference changes.
+  // Fired by the PerformanceController and OptionsView when a pref changes.
   PREF_CHANGED: "Performance:PrefChanged",
 
-  // Emitted by the PerformanceView when the state (display mode) changes.
+  // Emitted by the PerformanceView when the state (display mode) changes,
+  // for example when switching between "empty", "recording" or "recorded".
+  // This causes certain panels to be hidden or visible.
   UI_STATE_CHANGED: "Performance:UI:StateChanged",
 
   // Emitted by the PerformanceView on clear button click
@@ -176,6 +178,16 @@
     this._onRecordingSelectFromView = this._onRecordingSelectFromView.bind(this);
     this._onPrefChanged = this._onPrefChanged.bind(this);
 
+    // All boolean prefs should be handled via the OptionsView in the
+    // ToolbarView, so that they may be accessible via the "gear" menu.
+    // Every other pref should be registered here.
+    this._nonBooleanPrefs = new ViewHelpers.Prefs("devtools.performance", {
+      "hidden-markers": ["Json", "timeline.hidden-markers"]
+    });
+
+    this._nonBooleanPrefs.registerObserver();
+    this._nonBooleanPrefs.on("pref-changed", this._onPrefChanged);
+
     ToolbarView.on(EVENTS.PREF_CHANGED, this._onPrefChanged);
     PerformanceView.on(EVENTS.UI_START_RECORDING, this.startRecording);
     PerformanceView.on(EVENTS.UI_STOP_RECORDING, this.stopRecording);
@@ -195,6 +207,9 @@
    * Remove events handled by the PerformanceController
    */
   destroy: function() {
+    this._nonBooleanPrefs.unregisterObserver();
+    this._nonBooleanPrefs.off("pref-changed", this._onPrefChanged);
+
     ToolbarView.off(EVENTS.PREF_CHANGED, this._onPrefChanged);
     PerformanceView.off(EVENTS.UI_START_RECORDING, this.startRecording);
     PerformanceView.off(EVENTS.UI_STOP_RECORDING, this.stopRecording);
@@ -211,21 +226,42 @@
   },
 
   /**
-   * Get a preference setting from `prefName` via the underlying
+   * Get a boolean preference setting from `prefName` via the underlying
    * OptionsView in the ToolbarView.
+   *
+   * @param string prefName
+   * @return boolean
    */
-  getPref: function (prefName) {
+  getOption: function (prefName) {
     return ToolbarView.optionsView.getPref(prefName);
   },
 
   /**
+   * Get a preference setting from `prefName`.
+   * @param string prefName
+   * @return object
+   */
+  getPref: function (prefName) {
+    return this._nonBooleanPrefs[prefName];
+  },
+
+  /**
+   * Set a preference setting from `prefName`.
+   * @param string prefName
+   * @param object prefValue
+   */
+  setPref: function (prefName, prefValue) {
+    this._nonBooleanPrefs[prefName] = prefValue;
+  },
+
+  /**
    * Starts recording with the PerformanceFront. Emits `EVENTS.RECORDING_STARTED`
    * when the front has started to record.
    */
   startRecording: Task.async(function *() {
-    let withMemory = this.getPref("enable-memory");
-    let withTicks = this.getPref("enable-framerate");
-    let withAllocations = this.getPref("enable-memory");
+    let withMemory = this.getOption("enable-memory");
+    let withTicks = this.getOption("enable-framerate");
+    let withAllocations = this.getOption("enable-memory");
 
     let recording = this._createRecording({ withMemory, withTicks, withAllocations });
 
@@ -241,7 +277,7 @@
    * when the front has stopped recording.
    */
   stopRecording: Task.async(function *() {
-    let recording = this._getLatestRecording();
+    let recording = this.getLatestRecording();
 
     this.emit(EVENTS.RECORDING_WILL_STOP, recording);
     yield recording.stopRecording();
@@ -267,7 +303,7 @@
    * Emits `EVENTS.RECORDINGS_CLEARED` when complete so other components can clean up.
    */
   clearRecordings: Task.async(function* () {
-    let latest = this._getLatestRecording();
+    let latest = this.getLatestRecording();
 
     if (latest && latest.isRecording()) {
       yield this.stopRecording();
@@ -335,7 +371,7 @@
    * Get most recently added recording that was triggered manually (via UI).
    * @return RecordingModel
    */
-  _getLatestRecording: function () {
+  getLatestRecording: function () {
     for (let i = this._recordings.length - 1; i >= 0; i--) {
       return this._recordings[i];
     }
@@ -343,6 +379,16 @@
   },
 
   /**
+   * Gets the current timeline blueprint without the hidden markers.
+   * @return object
+   */
+  getTimelineBlueprint: function() {
+    let blueprint = TIMELINE_BLUEPRINT;
+    let hiddenMarkers = this.getPref("hidden-markers");
+    return RecordingUtils.getFilteredBlueprint({ blueprint, hiddenMarkers });
+  },
+
+  /**
    * Fired whenever the PerformanceFront emits markers, memory or ticks.
    */
   _onTimelineData: function (...data) {
@@ -362,8 +408,8 @@
    * Fired when the ToolbarView fires a PREF_CHANGED event.
    * with the value.
    */
-  _onPrefChanged: function (_, prefName, value) {
-    this.emit(EVENTS.PREF_CHANGED, prefName, value);
+  _onPrefChanged: function (_, prefName, prefValue) {
+    this.emit(EVENTS.PREF_CHANGED, prefName, prefValue);
   },
 
   toString: () => "[object PerformanceController]"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/performance.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/performance.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/performance.xul	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/performance.xul	2015-02-28 15:03:02.000000000 +0000
@@ -29,6 +29,7 @@
   <script type="application/javascript" src="performance/views/recordings.js"/>
 
   <popupset id="performance-options-popupset">
+    <menupopup id="performance-filter-menupopup"/>
     <menupopup id="performance-options-menupopup">
       <menuitem id="option-show-platform-data"
                 type="checkbox"
@@ -85,6 +86,12 @@
 
     <vbox id="performance-pane" flex="1">
       <toolbar id="performance-toolbar" class="devtools-toolbar">
+        <hbox id="performance-toolbar-control-other" class="devtools-toolbarbutton-group">
+          <toolbarbutton id="filter-button"
+                         popup="performance-filter-menupopup"
+                         class="devtools-toolbarbutton"
+                         tooltiptext="&profilerUI.options.filter.tooltiptext;"/>
+        </hbox>
         <hbox id="performance-toolbar-controls-detail-views" class="devtools-toolbarbutton-group">
           <toolbarbutton id="select-waterfall-view"
                          class="devtools-toolbarbutton devtools-button"
@@ -112,7 +119,7 @@
           <toolbarbutton id="performance-options-button"
                          class="devtools-toolbarbutton devtools-option-toolbarbutton"
                          popup="performance-options-menupopup"
-                         tooltiptext="&profilerUI.options.tooltiptext;"/>
+                         tooltiptext="&profilerUI.options.gear.tooltiptext;"/>
         </hbox>
       </toolbar>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -97,3 +97,4 @@
 [browser_profiler_tree-view-06.js]
 [browser_profiler_tree-view-07.js]
 [browser_timeline_blueprint.js]
+[browser_timeline_filters.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_profiler_tree-frame-node.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_profiler_tree-frame-node.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_profiler_tree-frame-node.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_profiler_tree-frame-node.js	2015-02-28 15:03:02.000000000 +0000
@@ -7,6 +7,7 @@
 
 function test() {
   let { FrameNode } = devtools.require("devtools/shared/profiler/tree-model");
+  let { CATEGORY_OTHER } = devtools.require("devtools/shared/profiler/global");
 
   let frame1 = new FrameNode({
     location: "hello/<.world (http://foo/bar.js:123:987)",
@@ -132,7 +133,7 @@
     location: "Foo::Bar::Baz",
     line: 456,
     column: 123,
-    category: 8
+    category: CATEGORY_OTHER
   });
 
   is(frame6.getInfo().nodeType, "Frame",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-02.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -6,6 +6,8 @@
  * creates the correct column structure after expanding some of the nodes.
  */
 
+let { CATEGORY_MASK } = devtools.require("devtools/shared/profiler/global");
+
 function test() {
   let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
   let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
@@ -126,33 +128,33 @@
 let gSamples = [{
   time: 5,
   frames: [
-    { category: 8,  location: "(root)" },
-    { category: 8,  location: "A (http://foo/bar/baz:12)" },
-    { category: 16, location: "B (http://foo/bar/baz:34)" },
-    { category: 32, location: "C (http://foo/bar/baz:56)" }
+    { category: CATEGORY_MASK('other'),  location: "(root)" },
+    { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
+    { category: CATEGORY_MASK('js'),     location: "C (http://foo/bar/baz:56)" }
   ]
 }, {
   time: 5 + 1,
   frames: [
-    { category: 8,  location: "(root)" },
-    { category: 8,  location: "A (http://foo/bar/baz:12)" },
-    { category: 16, location: "B (http://foo/bar/baz:34)" },
-    { category: 64, location: "D (http://foo/bar/baz:78)" }
+    { category: CATEGORY_MASK('other'),  location: "(root)" },
+    { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
+    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78)" }
   ]
 }, {
   time: 5 + 1 + 2,
   frames: [
-    { category: 8,  location: "(root)" },
-    { category: 8,  location: "A (http://foo/bar/baz:12)" },
-    { category: 16, location: "B (http://foo/bar/baz:34)" },
-    { category: 64, location: "D (http://foo/bar/baz:78)" }
+    { category: CATEGORY_MASK('other'),  location: "(root)" },
+    { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
+    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78)" }
   ]
 }, {
   time: 5 + 1 + 2 + 7,
   frames: [
-    { category: 8,   location: "(root)" },
-    { category: 8,   location: "A (http://foo/bar/baz:12)" },
-    { category: 128, location: "E (http://foo/bar/baz:90)" },
-    { category: 256, location: "F (http://foo/bar/baz:99)" }
+    { category: CATEGORY_MASK('other'),   location: "(root)" },
+    { category: CATEGORY_MASK('other'),   location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('gc', 2),   location: "E (http://foo/bar/baz:90)" },
+    { category: CATEGORY_MASK('network'), location: "F (http://foo/bar/baz:99)" }
   ]
 }];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-04.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-04.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-04.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_profiler_tree-view-04.js	2015-02-28 15:03:02.000000000 +0000
@@ -6,6 +6,8 @@
  * creates the correct DOM nodes in the correct order.
  */
 
+let { CATEGORY_MASK } = devtools.require("devtools/shared/profiler/global");
+
 function test() {
   let { ThreadNode } = devtools.require("devtools/shared/profiler/tree-model");
   let { CallView } = devtools.require("devtools/shared/profiler/tree-view");
@@ -90,34 +92,33 @@
 let gSamples = [{
   time: 5,
   frames: [
-    { category: 8,  location: "(root)" },
-    { category: 8,  location: "A (http://foo/bar/baz:12)" },
-    { category: 16, location: "B (http://foo/bar/baz:34)" },
-    { category: 32, location: "C (http://foo/bar/baz:56)" }
+    { category: CATEGORY_MASK('other'),  location: "(root)" },
+    { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
+    { category: CATEGORY_MASK('js'),     location: "C (http://foo/bar/baz:56)" }
   ]
 }, {
   time: 5 + 1,
   frames: [
-    { category: 8,  location: "(root)" },
-    { category: 8,  location: "A (http://foo/bar/baz:12)" },
-    { category: 16, location: "B (http://foo/bar/baz:34)" },
-    { category: 64, location: "D (http://foo/bar/baz:78)" }
+    { category: CATEGORY_MASK('other'),  location: "(root)" },
+    { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
+    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78)" }
   ]
 }, {
   time: 5 + 1 + 2,
   frames: [
-    { category: 8,  location: "(root)" },
-    { category: 8,  location: "A (http://foo/bar/baz:12)" },
-    { category: 16, location: "B (http://foo/bar/baz:34)" },
-    { category: 64, location: "D (http://foo/bar/baz:78)" }
+    { category: CATEGORY_MASK('other'),  location: "(root)" },
+    { category: CATEGORY_MASK('other'),  location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('css'),    location: "B (http://foo/bar/baz:34)" },
+    { category: CATEGORY_MASK('gc', 1),  location: "D (http://foo/bar/baz:78)" }
   ]
 }, {
   time: 5 + 1 + 2 + 7,
   frames: [
-    { category: 8,   location: "(root)" },
-    { category: 8,   location: "A (http://foo/bar/baz:12)" },
-    { category: 128, location: "E (http://foo/bar/baz:90)" },
-    { category: 256, location: "F (http://foo/bar/baz:99)" }
+    { category: CATEGORY_MASK('other'),   location: "(root)" },
+    { category: CATEGORY_MASK('other'),   location: "A (http://foo/bar/baz:12)" },
+    { category: CATEGORY_MASK('gc', 2),   location: "E (http://foo/bar/baz:90)" },
+    { category: CATEGORY_MASK('network'), location: "F (http://foo/bar/baz:99)" }
   ]
 }];
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_timeline_filters.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_timeline_filters.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/browser_timeline_filters.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/browser_timeline_filters.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,94 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests markers filtering mechanism.
+ */
+
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { $, $$, PerformanceController, OverviewView, WaterfallView } = panel.panelWin;
+  let { MARKERS_GRAPH_ROW_HEIGHT } = panel.panelWin;
+
+  yield startRecording(panel);
+  ok(true, "Recording has started.");
+
+  yield waitUntil(() => {
+    // Wait until we get 3 different markers.
+    let markers = PerformanceController.getCurrentRecording().getMarkers();
+    return markers.some(m => m.name == "Styles") &&
+           markers.some(m => m.name == "Reflow") &&
+           markers.some(m => m.name == "Paint");
+  });
+
+  yield stopRecording(panel);
+
+  let overview = OverviewView.markersOverview;
+  let waterfall = WaterfallView.waterfall;
+
+  // Select everything
+  OverviewView.setTimeInterval({ startTime: 0, endTime: Number.MAX_VALUE })
+
+  $("#filter-button").click();
+
+  yield waitUntil(() => !waterfall._outstandingMarkers.length);
+
+  let menuItem1 = $("menuitem[marker-type=Styles]");
+  let menuItem2 = $("menuitem[marker-type=Reflow]");
+  let menuItem3 = $("menuitem[marker-type=Paint]");
+
+  let originalHeight = overview.fixedHeight;
+
+  ok($(".waterfall-marker-bar[type=Styles]"), "Found at least one 'Styles' marker (1)");
+  ok($(".waterfall-marker-bar[type=Reflow]"), "Found at least one 'Reflow' marker (1)");
+  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (1)");
+
+  let heightBefore = overview.fixedHeight;
+  EventUtils.synthesizeMouseAtCenter(menuItem1, {type: "mouseup"}, panel.panelWin);
+  yield once(menuItem1, "command");
+
+  yield waitUntil(() => !waterfall._outstandingMarkers.length);
+
+  is(overview.fixedHeight, heightBefore, "Overview height hasn't changed");
+  ok(!$(".waterfall-marker-bar[type=Styles]"), "No 'Styles' marker (2)");
+  ok($(".waterfall-marker-bar[type=Reflow]"), "Found at least one 'Reflow' marker (2)");
+  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (2)");
+
+  heightBefore = overview.fixedHeight;
+  EventUtils.synthesizeMouseAtCenter(menuItem2, {type: "mouseup"}, panel.panelWin);
+  yield once(menuItem2, "command");
+
+  yield waitUntil(() => !waterfall._outstandingMarkers.length);
+
+  is(overview.fixedHeight, heightBefore, "Overview height hasn't changed");
+  ok(!$(".waterfall-marker-bar[type=Styles]"), "No 'Styles' marker (3)");
+  ok(!$(".waterfall-marker-bar[type=Reflow]"), "No 'Reflow' marker (3)");
+  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (3)");
+
+  heightBefore = overview.fixedHeight;
+  EventUtils.synthesizeMouseAtCenter(menuItem3, {type: "mouseup"}, panel.panelWin);
+  yield once(menuItem3, "command");
+
+  yield waitUntil(() => !waterfall._outstandingMarkers.length);
+
+  is(overview.fixedHeight, heightBefore - MARKERS_GRAPH_ROW_HEIGHT, "Overview is smaller");
+  ok(!$(".waterfall-marker-bar[type=Styles]"), "No 'Styles' marker (4)");
+  ok(!$(".waterfall-marker-bar[type=Reflow]"), "No 'Reflow' marker (4)");
+  ok(!$(".waterfall-marker-bar[type=Paint]"), "No 'Paint' marker (4)");
+
+  for (let item of [menuItem1, menuItem2, menuItem3]) {
+    EventUtils.synthesizeMouseAtCenter(item, {type: "mouseup"}, panel.panelWin);
+    yield once(item, "command");
+  }
+
+  yield waitUntil(() => !waterfall._outstandingMarkers.length);
+
+  ok($(".waterfall-marker-bar[type=Styles]"), "Found at least one 'Styles' marker (5)");
+  ok($(".waterfall-marker-bar[type=Reflow]"), "Found at least one 'Reflow' marker (5)");
+  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (5)");
+
+  is(overview.fixedHeight, originalHeight, "Overview restored");
+
+  yield teardown(panel);
+  finish();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/doc_simple-test.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/doc_simple-test.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/doc_simple-test.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/doc_simple-test.html	2015-02-28 15:03:02.000000000 +0000
@@ -5,13 +5,16 @@
 <html>
   <head>
     <meta charset="utf-8"/>
-    <title>Profiler test page</title>
+    <title>Performance test page</title>
   </head>
 
   <body>
     <script type="text/javascript">
+      var x = 1;
       function test() {
-        var a = "Hello world!";
+        document.body.style.borderTop = x + "px solid red";
+        x = 1^x;
+        document.body.innerHeight; // flush pending reflows
       }
 
       // Prevent this script from being garbage collected.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/test/head.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/test/head.js	2015-02-28 15:03:02.000000000 +0000
@@ -266,7 +266,10 @@
   EventUtils.sendMouseEvent({ type: "mousedown" }, button, win);
 }
 
-function* startRecording(panel, options={}) {
+function* startRecording(panel, options = {
+  waitForOverview: true,
+  waitForStateChanged: true
+}) {
   let win = panel.panelWin;
   let clicked = panel.panelWin.PerformanceView.once(win.EVENTS.UI_START_RECORDING);
   let willStart = panel.panelWin.PerformanceController.once(win.EVENTS.RECORDING_WILL_START);
@@ -287,10 +290,14 @@
     "The record button should be locked.");
 
   yield willStart;
-  let stateChanged = once(win.PerformanceView, win.EVENTS.UI_STATE_CHANGED);
+  let stateChanged = options.waitForStateChanged
+    ? once(win.PerformanceView, win.EVENTS.UI_STATE_CHANGED)
+    : Promise.resolve();
 
   yield hasStarted;
-  let overviewRendered = options.waitForOverview ? once(win.OverviewView, win.EVENTS.OVERVIEW_RENDERED) : Promise.resolve();
+  let overviewRendered = options.waitForOverview
+    ? once(win.OverviewView, win.EVENTS.OVERVIEW_RENDERED)
+    : Promise.resolve();
 
   yield stateChanged;
   yield overviewRendered;
@@ -304,7 +311,10 @@
     "The record button should not be locked.");
 }
 
-function* stopRecording(panel, options={}) {
+function* stopRecording(panel, options = {
+  waitForOverview: true,
+  waitForStateChanged: true
+}) {
   let win = panel.panelWin;
   let clicked = panel.panelWin.PerformanceView.once(win.EVENTS.UI_STOP_RECORDING);
   let willStop = panel.panelWin.PerformanceController.once(win.EVENTS.RECORDING_WILL_STOP);
@@ -325,10 +335,14 @@
     "The record button should be locked.");
 
   yield willStop;
-  let stateChanged = once(win.PerformanceView, win.EVENTS.UI_STATE_CHANGED);
+  let stateChanged = options.waitForStateChanged
+    ? once(win.PerformanceView, win.EVENTS.UI_STATE_CHANGED)
+    : Promise.resolve();
 
   yield hasStopped;
-  let overviewRendered = options.waitForOverview ? once(win.OverviewView, win.EVENTS.OVERVIEW_RENDERED) : Promise.resolve();
+  let overviewRendered = options.waitForOverview
+    ? once(win.OverviewView, win.EVENTS.OVERVIEW_RENDERED)
+    : Promise.resolve();
 
   yield stateChanged;
   yield overviewRendered;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-abstract-subview.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-abstract-subview.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-abstract-subview.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-abstract-subview.js	2015-02-28 15:03:02.000000000 +0000
@@ -59,11 +59,17 @@
 
   /**
    * An array of preferences under `devtools.performance.ui.` that the view should
-   * rerender upon change.
+   * rerender and callback `this._onRerenderPrefChanged` upon change.
    */
   rerenderPrefs: [],
 
   /**
+   * An array of preferences under `devtools.performance.` that the view should
+   * observe and callback `this._onObservedPrefChange` upon change.
+   */
+  observedPrefs: [],
+
+  /**
    * Called when recording stops or is selected.
    */
   _onRecordingStoppedOrSelected: function(_, recording) {
@@ -103,6 +109,10 @@
    * Fired when a preference in `devtools.performance.ui.` is changed.
    */
   _onPrefChanged: function (_, prefName) {
+    if (~this.observedPrefs.indexOf(prefName) && this._onObservedPrefChange) {
+      this._onObservedPrefChange(_, prefName);
+    }
+
     // All detail views require a recording to be complete, so do not
     // attempt to render if recording is in progress or does not exist.
     let recording = PerformanceController.getCurrentRecording();
@@ -115,7 +125,7 @@
     }
 
     if (this._onRerenderPrefChanged) {
-      this._onRerenderPrefChanged();
+      this._onRerenderPrefChanged(_, prefName);
     }
 
     if (DetailsView.isViewSelected(this) || this.canUpdateWhileHidden) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details.js	2015-02-28 15:03:02.000000000 +0000
@@ -4,19 +4,41 @@
 "use strict";
 
 /**
- * Details view containing profiler call tree and markers waterfall. Manages
- * subviews and toggles visibility between them.
+ * Details view containing call trees, flamegraphs and markers waterfall.
+ * Manages subviews and toggles visibility between them.
  */
 let DetailsView = {
   /**
-   * Name to node+object mapping of subviews.
+   * Name to (node id, view object, actor requirements, pref killswitch)
+   * mapping of subviews.
    */
   components: {
-    "waterfall": { id: "waterfall-view", view: WaterfallView, requires: ["timeline"] },
-    "js-calltree": { id: "js-calltree-view", view: JsCallTreeView },
-    "js-flamegraph": { id: "js-flamegraph-view", view: JsFlameGraphView, requires: ["timeline"] },
-    "memory-calltree": { id: "memory-calltree-view", view: MemoryCallTreeView, requires: ["memory"], pref: "enable-memory" },
-    "memory-flamegraph": { id: "memory-flamegraph-view", view: MemoryFlameGraphView, requires: ["memory", "timeline"], pref: "enable-memory" }
+    "waterfall": {
+      id: "waterfall-view",
+      view: WaterfallView,
+      requires: ["timeline"]
+    },
+    "js-calltree": {
+      id: "js-calltree-view",
+      view: JsCallTreeView
+    },
+    "js-flamegraph": {
+      id: "js-flamegraph-view",
+      view: JsFlameGraphView,
+      requires: ["timeline"]
+    },
+    "memory-calltree": {
+      id: "memory-calltree-view",
+      view: MemoryCallTreeView,
+      requires: ["memory"],
+      pref: "enable-memory"
+    },
+    "memory-flamegraph": {
+      id: "memory-flamegraph-view",
+      view: MemoryFlameGraphView,
+      requires: ["memory", "timeline"],
+      pref: "enable-memory"
+    }
   },
 
   /**
@@ -66,12 +88,13 @@
    */
   setAvailableViews: Task.async(function* () {
     let mocks = gFront.getMocksInUse();
+
     for (let [name, { view, pref, requires }] of Iterator(this.components)) {
       let recording = PerformanceController.getCurrentRecording();
 
       let isRecorded = recording && !recording.isRecording();
-      // View is enabled view prefs
-      let isEnabled = !pref || PerformanceController.getPref(pref);
+      // View is enabled by its corresponding pref
+      let isEnabled = !pref || PerformanceController.getOption(pref);
       // View is supported by the server actor, and the requried actor is not being mocked
       let isSupported = !requires || requires.every(r => !mocks[r]);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-js-call-tree.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-js-call-tree.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-js-call-tree.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-js-call-tree.js	2015-02-28 15:03:02.000000000 +0000
@@ -64,8 +64,8 @@
    */
   _prepareCallTree: function (profile, { startTime, endTime }, options) {
     let threadSamples = profile.threads[0].samples;
-    let contentOnly = !PerformanceController.getPref("show-platform-data");
-    let invertTree = PerformanceController.getPref("invert-call-tree");
+    let contentOnly = !PerformanceController.getOption("show-platform-data");
+    let invertTree = PerformanceController.getOption("invert-call-tree");
 
     let threadNode = new ThreadNode(threadSamples,
       { startTime, endTime, contentOnly, invertTree });
@@ -108,7 +108,7 @@
 
     // When platform data isn't shown, hide the cateogry labels, since they're
     // only available for C++ frames.
-    let contentOnly = !PerformanceController.getPref("show-platform-data");
+    let contentOnly = !PerformanceController.getOption("show-platform-data");
     root.toggleCategories(!contentOnly);
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-js-flamegraph.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-js-flamegraph.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-js-flamegraph.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-js-flamegraph.js	2015-02-28 15:03:02.000000000 +0000
@@ -34,11 +34,13 @@
   /**
    * Unbinds events.
    */
-  destroy: function () {
+  destroy: Task.async(function* () {
     DetailsSubview.destroy.call(this);
 
     this.graph.off("selecting", this._onRangeChangeInGraph);
-  },
+
+    yield this.graph.destroy();
+  }),
 
   /**
    * Method for handling all the set up for rendering a new flamegraph.
@@ -53,10 +55,10 @@
     let samples = profile.threads[0].samples;
 
     let data = FlameGraphUtils.createFlameGraphDataFromSamples(samples, {
-      invertStack: PerformanceController.getPref("invert-flame-graph"),
-      flattenRecursion: PerformanceController.getPref("flatten-tree-recursion"),
-      filterFrames: !PerformanceController.getPref("show-platform-data") && FrameNode.isContent,
-      showIdleBlocks: PerformanceController.getPref("show-idle-blocks") && L10N.getStr("table.idle")
+      invertStack: PerformanceController.getOption("invert-flame-graph"),
+      flattenRecursion: PerformanceController.getOption("flatten-tree-recursion"),
+      filterFrames: !PerformanceController.getOption("show-platform-data") && FrameNode.isContent,
+      showIdleBlocks: PerformanceController.getOption("show-idle-blocks") && L10N.getStr("table.idle")
     });
 
     this.graph.setData({ data,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-memory-call-tree.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-memory-call-tree.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-memory-call-tree.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-memory-call-tree.js	2015-02-28 15:03:02.000000000 +0000
@@ -62,7 +62,7 @@
    */
   _prepareCallTree: function (allocations, { startTime, endTime }, options) {
     let samples = RecordingUtils.getSamplesFromAllocations(allocations);
-    let invertTree = PerformanceController.getPref("invert-call-tree");
+    let invertTree = PerformanceController.getOption("invert-call-tree");
 
     let threadNode = new ThreadNode(samples,
       { startTime, endTime, invertTree });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-memory-flamegraph.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-memory-flamegraph.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-memory-flamegraph.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-memory-flamegraph.js	2015-02-28 15:03:02.000000000 +0000
@@ -33,11 +33,13 @@
   /**
    * Unbinds events.
    */
-  destroy: function () {
+  destroy: Task.async(function* () {
     DetailsSubview.destroy.call(this);
 
     this.graph.off("selecting", this._onRangeChangeInGraph);
-  },
+
+    yield this.graph.destroy();
+  }),
 
   /**
    * Method for handling all the set up for rendering a new flamegraph.
@@ -52,9 +54,9 @@
 
     let samples = RecordingUtils.getSamplesFromAllocations(allocations);
     let data = FlameGraphUtils.createFlameGraphDataFromSamples(samples, {
-      invertStack: PerformanceController.getPref("invert-flame-graph"),
-      flattenRecursion: PerformanceController.getPref("flatten-tree-recursion"),
-      showIdleBlocks: PerformanceController.getPref("show-idle-blocks") && L10N.getStr("table.idle")
+      invertStack: PerformanceController.getOption("invert-flame-graph"),
+      flattenRecursion: PerformanceController.getOption("flatten-tree-recursion"),
+      showIdleBlocks: PerformanceController.getOption("show-idle-blocks") && L10N.getStr("table.idle")
     });
 
     this.graph.setData({ data,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-waterfall.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-waterfall.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/details-waterfall.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/details-waterfall.js	2015-02-28 15:03:02.000000000 +0000
@@ -8,6 +8,14 @@
  */
 let WaterfallView = Heritage.extend(DetailsSubview, {
 
+  observedPrefs: [
+    "hidden-markers"
+  ],
+
+  rerenderPrefs: [
+    "hidden-markers"
+  ],
+
   rangeChangeDebounceTime: 10, // ms
 
   /**
@@ -16,7 +24,7 @@
   initialize: function () {
     DetailsSubview.initialize.call(this);
 
-    this.waterfall = new Waterfall($("#waterfall-breakdown"), $("#waterfall-view"), TIMELINE_BLUEPRINT);
+    this.waterfall = new Waterfall($("#waterfall-breakdown"), $("#waterfall-view"));
     this.details = new MarkerDetails($("#waterfall-details"), $("#waterfall-view > splitter"));
 
     this._onMarkerSelected = this._onMarkerSelected.bind(this);
@@ -26,6 +34,8 @@
     this.waterfall.on("unselected", this._onMarkerSelected);
     this.details.on("resize", this._onResize);
 
+    let blueprint = PerformanceController.getTimelineBlueprint();
+    this.waterfall.setBlueprint(blueprint);
     this.waterfall.recalculateBounds();
   },
 
@@ -79,5 +89,13 @@
     this.render();
   },
 
+  /**
+   * Called whenever an observed pref is changed.
+   */
+  _onObservedPrefChange: function(_, prefName) {
+    let blueprint = PerformanceController.getTimelineBlueprint();
+    this.waterfall.setBlueprint(blueprint);
+  },
+
   toString: () => "[object WaterfallView]"
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/overview.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/overview.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/overview.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/overview.js	2015-02-28 15:03:02.000000000 +0000
@@ -40,8 +40,8 @@
 
     // Toggle the initial visibility of memory and framerate graph containers
     // based off of prefs.
-    $("#memory-overview").hidden = !PerformanceController.getPref("enable-memory");
-    $("#time-framerate").hidden = !PerformanceController.getPref("enable-framerate");
+    $("#memory-overview").hidden = !PerformanceController.getOption("enable-memory");
+    $("#time-framerate").hidden = !PerformanceController.getOption("enable-framerate");
 
     PerformanceController.on(EVENTS.PREF_CHANGED, this._onPrefChanged);
     PerformanceController.on(EVENTS.RECORDING_WILL_START, this._onRecordingWillStart);
@@ -54,14 +54,24 @@
   /**
    * Unbinds events.
    */
-  destroy: function () {
+  destroy: Task.async(function*() {
+    if (this.markersOverview) {
+      yield this.markersOverview.destroy();
+    }
+    if (this.memoryOverview) {
+      yield this.memoryOverview.destroy();
+    }
+    if (this.framerateGraph) {
+      yield this.framerateGraph.destroy();
+    }
+
     PerformanceController.off(EVENTS.PREF_CHANGED, this._onPrefChanged);
     PerformanceController.off(EVENTS.RECORDING_WILL_START, this._onRecordingWillStart);
     PerformanceController.off(EVENTS.RECORDING_STARTED, this._onRecordingStarted);
     PerformanceController.off(EVENTS.RECORDING_WILL_STOP, this._onRecordingWillStop);
     PerformanceController.off(EVENTS.RECORDING_STOPPED, this._onRecordingStopped);
     PerformanceController.off(EVENTS.RECORDING_SELECTED, this._onRecordingSelected);
-  },
+  }),
 
   /**
    * Disabled in the event we're using a Timeline mock, so we'll have no
@@ -86,7 +96,7 @@
    * Sets the time interval selection for all graphs in this overview.
    *
    * @param object interval
-   *        The { starTime, endTime }, in milliseconds.
+   *        The { startTime, endTime }, in milliseconds.
    */
   setTimeInterval: function(interval, options = {}) {
     if (this.isDisabled()) {
@@ -138,7 +148,8 @@
       yield this.markersOverview.ready();
       return true;
     }
-    this.markersOverview = new MarkersOverview($("#markers-overview"), TIMELINE_BLUEPRINT);
+    let blueprint = PerformanceController.getTimelineBlueprint();
+    this.markersOverview = new MarkersOverview($("#markers-overview"), blueprint);
     this.markersOverview.headerHeight = MARKERS_GRAPH_HEADER_HEIGHT;
     this.markersOverview.rowHeight = MARKERS_GRAPH_ROW_HEIGHT;
     this.markersOverview.groupPadding = MARKERS_GROUP_VERTICAL_PADDING;
@@ -155,7 +166,7 @@
    *         ready to use, `false` if the graph is disabled.
    */
   _memoryGraphAvailable: Task.async(function *() {
-    if (!PerformanceController.getPref("enable-memory")) {
+    if (!PerformanceController.getOption("enable-memory")) {
       return false;
     }
     if (this.memoryOverview) {
@@ -179,7 +190,7 @@
    *         ready to use, `false` if the graph is disabled.
    */
   _framerateGraphAvailable: Task.async(function *() {
-    if (!PerformanceController.getPref("enable-framerate")) {
+    if (!PerformanceController.getOption("enable-framerate")) {
       return false;
     }
     if (this.framerateGraph) {
@@ -340,14 +351,26 @@
    * Called whenever a preference in `devtools.performance.ui.` changes. Used
    * to toggle the visibility of memory and framerate graphs.
    */
-  _onPrefChanged: function (_, prefName) {
-    if (prefName === "enable-memory") {
-      $("#memory-overview").hidden = !PerformanceController.getPref("enable-memory");
+  _onPrefChanged: Task.async(function* (_, prefName, prefValue) {
+    switch (prefName) {
+      case "enable-memory": {
+        $("#memory-overview").hidden = !prefValue;
+        break;
+      }
+      case "enable-framerate": {
+        $("#time-framerate").hidden = !prefValue;
+        break;
+      }
+      case "hidden-markers": {
+        if (yield this._markersGraphAvailable()) {
+          let blueprint = PerformanceController.getTimelineBlueprint();
+          this.markersOverview.setBlueprint(blueprint);
+          this.markersOverview.refresh({ force: true });
+        }
+        break;
+      }
     }
-    if (prefName === "enable-framerate") {
-      $("#time-framerate").hidden = !PerformanceController.getPref("enable-framerate");
-    }
-  },
+  }),
 
   toString: () => "[object OverviewView]"
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/toolbar.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/toolbar.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/performance/views/toolbar.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/performance/views/toolbar.js	2015-02-28 15:03:02.000000000 +0000
@@ -11,6 +11,9 @@
    * Sets up the view with event binding.
    */
   initialize: Task.async(function *() {
+    this._onFilterPopupShowing = this._onFilterPopupShowing.bind(this);
+    this._onFilterPopupHiding = this._onFilterPopupHiding.bind(this);
+    this._onHiddenMarkersChanged = this._onHiddenMarkersChanged.bind(this);
     this._onPrefChanged = this._onPrefChanged.bind(this);
 
     this.optionsView = new OptionsView({
@@ -20,17 +23,88 @@
 
     yield this.optionsView.initialize();
     this.optionsView.on("pref-changed", this._onPrefChanged);
+
+    this._buildMarkersFilterPopup();
+    this._updateHiddenMarkersPopup();
+    $("#performance-filter-menupopup").addEventListener("popupshowing", this._onFilterPopupShowing);
+    $("#performance-filter-menupopup").addEventListener("popuphiding",  this._onFilterPopupHiding);
   }),
 
   /**
    * Unbinds events and cleans up view.
    */
   destroy: function () {
+    $("#performance-filter-menupopup").removeEventListener("popupshowing", this._onFilterPopupShowing);
+    $("#performance-filter-menupopup").removeEventListener("popuphiding",  this._onFilterPopupHiding);
+
     this.optionsView.off("pref-changed", this._onPrefChanged);
     this.optionsView.destroy();
   },
 
   /**
+   * Creates the timeline markers filter popup.
+   */
+  _buildMarkersFilterPopup: function() {
+    for (let [markerName, markerDetails] of Iterator(TIMELINE_BLUEPRINT)) {
+      let menuitem = document.createElement("menuitem");
+      menuitem.setAttribute("closemenu", "none");
+      menuitem.setAttribute("type", "checkbox");
+      menuitem.setAttribute("align", "center");
+      menuitem.setAttribute("flex", "1");
+      menuitem.setAttribute("label", markerDetails.label);
+      menuitem.setAttribute("marker-type", markerName);
+
+      menuitem.addEventListener("command", this._onHiddenMarkersChanged);
+
+      // Style used by pseudo element ::before in performance.inc.css
+      let bulletStyle = `--bullet-bg: ${markerDetails.fill};`
+      bulletStyle += `--bullet-border: ${markerDetails.stroke}`;
+      menuitem.setAttribute("style", bulletStyle);
+
+      $("#performance-filter-menupopup").appendChild(menuitem);
+    }
+  },
+
+  /**
+   * Updates the menu items checked state in the timeline markers filter popup.
+   */
+  _updateHiddenMarkersPopup: function() {
+    let menuItems = $$("#performance-filter-menupopup menuitem[marker-type]");
+    let hiddenMarkers = PerformanceController.getPref("hidden-markers");
+
+    for (let menuitem of menuItems) {
+      if (~hiddenMarkers.indexOf(menuitem.getAttribute("marker-type"))) {
+        menuitem.removeAttribute("checked");
+      } else {
+        menuitem.setAttribute("checked", "true");
+      }
+    }
+  },
+
+  /**
+   * Fired when the markers filter popup starts to show.
+   */
+  _onFilterPopupShowing: function() {
+    $("#filter-button").setAttribute("open", "true");
+  },
+
+  /**
+   * Fired when the markers filter popup starts to hide.
+   */
+  _onFilterPopupHiding: function() {
+    $("#filter-button").removeAttribute("open");
+  },
+
+  /**
+   * Fired when a menu item in the markers filter popup is checked or unchecked.
+   */
+  _onHiddenMarkersChanged: function() {
+    let checkedMenuItems = $$("#performance-filter-menupopup menuitem[marker-type]:not([checked])");
+    let hiddenMarkers = Array.map(checkedMenuItems, e => e.getAttribute("marker-type"));
+    PerformanceController.setPref("hidden-markers", hiddenMarkers);
+  },
+
+  /**
    * Fired when a preference changes in the underlying OptionsView.
    * Propogated by the PerformanceController.
    */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/profiler/profiler.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/profiler/profiler.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/profiler/profiler.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/profiler/profiler.js	2015-02-28 15:03:02.000000000 +0000
@@ -148,8 +148,6 @@
     this.branch.removeObserver("", this);
   },
   observe: function(subject, topic, pref) {
-    Prefs.refresh();
-
     if (pref == "ui.show-platform-data") {
       RecordingsListView.forceSelect(RecordingsListView.selectedItem);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/projecteditor/lib/stores/resource.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/projecteditor/lib/stores/resource.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/projecteditor/lib/stores/resource.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/projecteditor/lib/stores/resource.js	2015-02-28 15:03:02.000000000 +0000
@@ -48,11 +48,6 @@
   },
 
   /**
-   * Return the trailing name component of this.uri.
-   */
-  get basename() { return this.uri.path.replace(/\/+$/, '').replace(/\\/g,'/').replace( /.*\//, '' ); },
-
-  /**
    * Is there more than 1 child Resource?
    */
   get hasChildren() { return this.children && this.children.size > 0; },
@@ -239,6 +234,13 @@
   },
 
   /**
+   * Return the trailing name component of this Resource
+   */
+  get basename() {
+    return this.path.replace(/\/+$/, '').replace(/\\/g,'/').replace( /.*\//, '' );
+  },
+
+  /**
    * A string to be used when displaying this Resource in views
    */
   get displayName() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/projecteditor/test/browser_projecteditor_rename_file.js	2015-02-28 15:03:02.000000000 +0000
@@ -13,7 +13,29 @@
   let root = [...projecteditor.project.allStores()][0].root;
   is(root.path, TEMP_PATH, "The root store is set to the correct temp path.");
   for (let child of root.children) {
-    yield renameWithContextMenu(projecteditor, projecteditor.projectTree.getViewContainer(child));
+    yield renameWithContextMenu(projecteditor,
+                                projecteditor.projectTree.getViewContainer(child),
+                                ".renamed");
+  }
+});
+
+add_task(function*() {
+  let projecteditor = yield addProjectEditorTabForTempDirectory();
+  ok(true, "ProjectEditor has loaded");
+
+  let root = [...projecteditor.project.allStores()][0].root;
+  is(root.path, TEMP_PATH, "The root store is set to the correct temp path.");
+
+  let childrenList = new Array();
+  for (let child of root.children) {
+    yield renameWithContextMenu(projecteditor,
+                                projecteditor.projectTree.getViewContainer(child),
+                                ".ren\u0061\u0308med");
+    childrenList.push(child.basename + ".ren\u0061\u0308med");
+  }
+  for (let child of root.children) {
+    is (childrenList.indexOf(child.basename) == -1, false,
+        "Failed to update tree with non-ascii character");
   }
 });
 
@@ -25,7 +47,7 @@
   );
 }
 
-function renameWithContextMenu(projecteditor, container) {
+function renameWithContextMenu(projecteditor, container, newName) {
   let defer = promise.defer();
   let popup = projecteditor.contextMenuPopup;
   let resource = container.resource;
@@ -39,7 +61,7 @@
 
     projecteditor.project.on("refresh-complete", function refreshComplete() {
       projecteditor.project.off("refresh-complete", refreshComplete);
-      OS.File.stat(resource.path + ".renamed").then(() => {
+      OS.File.stat(resource.path + newName).then(() => {
         ok (true, "File is renamed");
         defer.resolve();
       }, (ex) => {
@@ -50,7 +72,8 @@
 
     renameCommand.click();
     popup.hidePopup();
-    EventUtils.sendString(resource.basename + ".renamed", projecteditor.window);
+    let input = container.elt.previousElementSibling;
+    input.value = resource.basename + newName;
     EventUtils.synthesizeKey("VK_RETURN", {}, projecteditor.window);
   });
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/shadereditor.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/shadereditor.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/shadereditor.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/shadereditor.js	2015-02-28 15:03:02.000000000 +0000
@@ -10,6 +10,7 @@
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource:///modules/devtools/SideMenuWidget.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
+Cu.import("resource://gre/modules/devtools/Console.jsm");
 
 const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
 const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
@@ -123,26 +124,26 @@
   _onTabNavigated: function(event, {isFrameSwitching}) {
     switch (event) {
       case "will-navigate": {
-        Task.spawn(function*() {
-          // Make sure the backend is prepared to handle WebGL contexts.
-          if (!isFrameSwitching) {
-            gFront.setup({ reload: false });
-          }
-
-          // Reset UI.
-          ShadersListView.empty();
-          // When switching to an iframe, ensure displaying the reload button.
-          // As the document has already been loaded without being hooked.
-          if (isFrameSwitching) {
-            $("#reload-notice").hidden = false;
-            $("#waiting-notice").hidden = true;
-          } else {
-            $("#reload-notice").hidden = true;
-            $("#waiting-notice").hidden = false;
-          }
-          yield ShadersEditorsView.setText({ vs: "", fs: "" });
-          $("#content").hidden = true;
-        }).then(() => window.emit(EVENTS.UI_RESET));
+        // Make sure the backend is prepared to handle WebGL contexts.
+        if (!isFrameSwitching) {
+          gFront.setup({ reload: false });
+        }
+
+        // Reset UI.
+        ShadersListView.empty();
+        // When switching to an iframe, ensure displaying the reload button.
+        // As the document has already been loaded without being hooked.
+        if (isFrameSwitching) {
+          $("#reload-notice").hidden = false;
+          $("#waiting-notice").hidden = true;
+        } else {
+          $("#reload-notice").hidden = true;
+          $("#waiting-notice").hidden = false;
+        }
+
+        $("#content").hidden = true;
+        window.emit(EVENTS.UI_RESET);
+
         break;
       }
       case "navigate": {
@@ -370,7 +371,7 @@
    */
   destroy: Task.async(function*() {
     this._destroyed = true;
-    this._toggleListeners("off");
+    yield this._toggleListeners("off");
     for (let p of this._editorPromises.values()) {
       let editor = yield p;
       editor.destroy();
@@ -414,9 +415,6 @@
    *        Returns a promise that resolves to an editor instance
    */
   _getEditor: function(type) {
-    if ($("#content").hidden) {
-      return promise.reject(new Error("Shader Editor is still waiting for a WebGL context to be created."));
-    }
     if (this._editorPromises.has(type)) {
       return this._editorPromises.get(type);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_aaa_run_first_leaktest.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_aaa_run_first_leaktest.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_aaa_run_first_leaktest.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_aaa_run_first_leaktest.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if the shader editor leaks on initialization and sudden destruction.
  * You can also use this initialization format as a template for other tests.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-contents.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-contents.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-contents.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-contents.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if the editors contain the correct text when a program
  * becomes available.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-gutter.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-gutter.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-gutter.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-gutter.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if error indicators are shown in the editor's gutter and text area
  * when there's a shader compilation error.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-tooltip.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-tooltip.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-tooltip.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-error-tooltip.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if error tooltips can be opened from the editor's gutter when there's
  * a shader compilation error.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-lazy-init.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-lazy-init.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_editors-lazy-init.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_editors-lazy-init.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if source editors are lazily initialized.
  */
@@ -16,20 +9,6 @@
   let { target, panel } = yield initShaderEditor(SIMPLE_CANVAS_URL);
   let { gFront, ShadersEditorsView } = panel.panelWin;
 
-  try {
-    yield ShadersEditorsView._getEditor("vs");
-    ok(false, "The promise for a vertex shader editor should be rejected.");
-  } catch (e) {
-    ok(true, "The vertex shader editors wasn't initialized.");
-  }
-
-  try {
-    yield ShadersEditorsView._getEditor("fs");
-    ok(false, "The promise for a fragment shader editor should be rejected.");
-  } catch (e) {
-    ok(true, "The fragment shader editors wasn't initialized.");
-  }
-
   reload(target);
   yield once(gFront, "program-linked");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_first-run.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_first-run.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_first-run.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_first-run.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if the shader editor shows the appropriate UI when opened.
  */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_navigation.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_navigation.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_navigation.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_navigation.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests target navigations are handled correctly in the UI.
  */
@@ -48,8 +41,7 @@
   let navigated = once(target, "will-navigate");
   navigate(target, "about:blank");
 
-  yield navigating;
-  yield once(panel.panelWin, EVENTS.UI_RESET);
+  yield promise.all([navigating, once(panel.panelWin, EVENTS.UI_RESET) ]);
 
   is($("#reload-notice").hidden, true,
     "The 'reload this page' notice should be hidden while navigating.");
@@ -65,18 +57,6 @@
   is(ShadersListView.selectedIndex, -1,
     "The shaders list has a negative index.");
 
-  yield ShadersEditorsView._getEditor("vs").then(() => {
-    ok(false, "The promise for a vertex shader editor should be rejected.");
-  }, () => {
-    ok(true, "The vertex shader editors wasn't initialized.");
-  });
-
-  yield ShadersEditorsView._getEditor("fs").then(() => {
-    ok(false, "The promise for a fragment shader editor should be rejected.");
-  }, () => {
-    ok(true, "The fragment shader editors wasn't initialized.");
-  });
-
   yield navigated;
 
   is($("#reload-notice").hidden, true,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-01.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if blackboxing a program works properly.
  */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-02.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_programs-blackbox-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if blackboxing a program works properly in tandem with blended
  * overlapping geometry.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_programs-list.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_programs-list.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_programs-list.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_programs-list.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if the programs list contains an entry after vertex and fragment
  * shaders are linked.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-01.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if editing a vertex and a fragment shader works properly.
  */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-02.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed.
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if compile or linkage errors are emitted when a shader source
  * gets malformed after being edited.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-03.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-03.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-03.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shadereditor/test/browser_se_shaders-edit-03.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
-
 /**
  * Tests if editing a vertex and a fragment shader would permanently store
  * their new source on the backend and reshow it in the frontend when required.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/devices.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/devices.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/devices.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/devices.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,603 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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, Cc } = require("chrome");
+const { Services } = require("resource://gre/modules/Services.jsm");
+const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/device.properties");
+
+/* `Devices` is a catalog of existing devices and their properties, intended
+ * for (mobile) device emulation tools and features.
+ *
+ * The properties of a device are:
+ * - name: Device brand and model(s).
+ * - width: Viewport width.
+ * - height: Viewport height.
+ * - pixelRatio: Screen pixel ratio to viewport.
+ * - userAgent: Device UserAgent string.
+ * - touch: Whether the screen is touch-enabled.
+ *
+ * To add more devices to this catalog, either patch this file, or push new
+ * device descriptions from your own code (e.g. an addon) like so:
+ *
+ *   var myPhone = { name: "My Phone", ... };
+ *   require("devtools/shared/devices").Devices.Others.phones.push(myPhone);
+ */
+
+let Devices = {
+  Types: ["phones", "tablets", "notebooks", "televisions", "watches"],
+
+  // Get the localized string of a device type.
+  GetString(deviceType) {
+    return Strings.GetStringFromName("device." + deviceType);
+  },
+};
+exports.Devices = Devices;
+
+
+// The `Devices.FirefoxOS` list was put together from various sources online.
+Devices.FirefoxOS = {
+  phones: [
+    {
+      name: "Firefox OS Flame",
+      width: 320,
+      height: 570,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Alcatel One Touch Fire, Fire C",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; ALCATELOneTouch4012X; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Alcatel Fire E",
+      width: 320,
+      height: 480,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Mobile; ALCATELOneTouch4012X; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Geeksphone Keon",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Geeksphone Peak, Revolution",
+      width: 360,
+      height: 640,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Intex Cloud Fx",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "LG Fireweb",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; LG-D300; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Spice Fire One Mi-FX1",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Symphony GoFox F15",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "Zen Fire 105",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "ZTE Open",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; ZTEOPEN; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "ZTE Open C",
+      width: 320,
+      height: 450,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Mobile; OPENC; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+  ],
+  tablets: [
+    {
+      name: "Foxconn InFocus",
+      width: 1280,
+      height: 800,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+    {
+      name: "VIA Vixen",
+      width: 1024,
+      height: 600,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Mobile; rv:28.0) Gecko/28.0 Firefox/28.0",
+      touch: true,
+    },
+  ],
+  notebooks: [
+  ],
+  televisions: [
+    {
+      name: "720p HD Television",
+      width: 1280,
+      height: 720,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: false,
+    },
+    {
+      name: "1080p Full HD Television",
+      width: 1920,
+      height: 1080,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: false,
+    },
+    {
+      name: "4K Ultra HD Television",
+      width: 3840,
+      height: 2160,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: false,
+    },
+  ],
+  watches: [
+    {
+      name: "LG G Watch",
+      width: 280,
+      height: 280,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: true,
+    },
+    {
+      name: "LG G Watch R",
+      width: 320,
+      height: 320,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: true,
+    },
+    {
+      name: "Moto 360",
+      width: 320,
+      height: 290,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: true,
+    },
+    {
+      name: "Samsung Gear Live",
+      width: 320,
+      height: 320,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: true,
+    },
+  ],
+};
+
+// `Devices.Others` was derived from the Chromium source code:
+// - chromium/src/third_party/WebKit/Source/devtools/front_end/toolbox/OverridesUI.js
+Devices.Others = {
+  phones: [
+    {
+      name: "Apple iPhone 3GS",
+      width: 320,
+      height: 480,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5",
+      touch: true,
+    },
+    {
+      name: "Apple iPhone 4",
+      width: 320,
+      height: 480,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8C148 Safari/6533.18.5",
+      touch: true,
+    },
+    {
+      name: "Apple iPhone 5",
+      width: 320,
+      height: 568,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
+      touch: true,
+    },
+    {
+      name: "Apple iPhone 6",
+      width: 375,
+      height: 667,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4",
+      touch: true,
+    },
+    {
+      name: "Apple iPhone 6 Plus",
+      width: 414,
+      height: 736,
+      pixelRatio: 3,
+      userAgent: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4",
+      touch: true,
+    },
+    {
+      name: "BlackBerry Z10",
+      width: 384,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.2372 Mobile Safari/537.10+",
+      touch: true,
+    },
+    {
+      name: "BlackBerry Z30",
+      width: 360,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.2372 Mobile Safari/537.10+",
+      touch: true,
+    },
+    {
+      name: "Google Nexus 4",
+      width: 384,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 4 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
+      touch: true,
+    },
+    {
+      name: "Google Nexus 5",
+      width: 360,
+      height: 640,
+      pixelRatio: 3,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 5 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
+      touch: true,
+    },
+    {
+      name: "Google Nexus S",
+      width: 320,
+      height: 533,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Nexus S Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "HTC Evo, Touch HD, Desire HD, Desire",
+      width: 320,
+      height: 533,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Sprint APA9292KT Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "HTC One X, EVO LTE",
+      width: 360,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.0.3; HTC One X Build/IML74K) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
+      touch: true,
+    },
+    {
+      name: "HTC Sensation, Evo 3D",
+      width: 360,
+      height: 640,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; HTC Sensation Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+      touch: true,
+    },
+    {
+      name: "LG Optimus 2X, Optimus 3D, Optimus Black",
+      width: 320,
+      height: 533,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.2; en-us; LG-P990/V08c Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 MMS/LG-Android-MMS-V1.0/1.2",
+      touch: true,
+    },
+    {
+      name: "LG Optimus G",
+      width: 384,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.0; LG-E975 Build/IMM76L) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
+      touch: true,
+    },
+    {
+      name: "LG Optimus LTE, Optimus 4X HD",
+      width: 424,
+      height: 753,
+      pixelRatio: 1.7,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.3; en-us; LG-P930 Build/GRJ90) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "LG Optimus One",
+      width: 213,
+      height: 320,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; LG-MS690 Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "Motorola Defy, Droid, Droid X, Milestone",
+      width: 320,
+      height: 569,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.0; en-us; Milestone Build/ SHOLS_U2_01.03.1) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17",
+      touch: true,
+    },
+    {
+      name: "Motorola Droid 3, Droid 4, Droid Razr, Atrix 4G, Atrix 2",
+      width: 540,
+      height: 960,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Droid Build/FRG22D) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "Motorola Droid Razr HD",
+      width: 720,
+      height: 1280,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.3; en-us; DROID RAZR 4G Build/6.5.1-73_DHD-11_M1-29) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "Nokia C5, C6, C7, N97, N8, X7",
+      width: 360,
+      height: 640,
+      pixelRatio: 1,
+      userAgent: "NokiaN97/21.1.107 (SymbianOS/9.4; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1) AppleWebkit/525 (KHTML, like Gecko) BrowserNG/7.1.4",
+      touch: true,
+    },
+    {
+      name: "Nokia Lumia 7X0, Lumia 8XX, Lumia 900, N800, N810, N900",
+      width: 320,
+      height: 533,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 820)",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy Note 3",
+      width: 360,
+      height: 640,
+      pixelRatio: 3,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy Note II",
+      width: 360,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy Note",
+      width: 400,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.3; en-us; SAMSUNG-SGH-I717 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy S III, Galaxy Nexus",
+      width: 360,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy S, S II, W",
+      width: 320,
+      height: 533,
+      pixelRatio: 1.5,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.1; en-us; GT-I9000 Build/ECLAIR) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy S4",
+      width: 360,
+      height: 640,
+      pixelRatio: 3,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.2.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36",
+      touch: true,
+    },
+    {
+      name: "Sony Xperia S, Ion",
+      width: 360,
+      height: 640,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 4.0; en-us; LT28at Build/6.1.C.1.111) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+      touch: true,
+    },
+    {
+      name: "Sony Xperia Sola, U",
+      width: 480,
+      height: 854,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.3; en-us; SonyEricssonST25i Build/6.0.B.1.564) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "Sony Xperia Z, Z1",
+      width: 360,
+      height: 640,
+      pixelRatio: 3,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 4.2; en-us; SonyC6903 Build/14.1.G.1.518) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+      touch: true,
+    },
+  ],
+  tablets: [
+    {
+      name: "Amazon Kindle Fire HDX 7″",
+      width: 1920,
+      height: 1200,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; U; en-us; KFTHWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true",
+      touch: true,
+    },
+    {
+      name: "Amazon Kindle Fire HDX 8.9″",
+      width: 2560,
+      height: 1600,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true",
+      touch: true,
+    },
+    {
+      name: "Amazon Kindle Fire (First Generation)",
+      width: 1024,
+      height: 600,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.141.16-Gen4_11004310) AppleWebkit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true",
+      touch: true,
+    },
+    {
+      name: "Apple iPad 1 / 2 / iPad Mini",
+      width: 1024,
+      height: 768,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (iPad; CPU OS 4_3_5 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8L1 Safari/6533.18.5",
+      touch: true,
+    },
+    {
+      name: "Apple iPad 3 / 4",
+      width: 1024,
+      height: 768,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53",
+      touch: true,
+    },
+    {
+      name: "BlackBerry PlayBook",
+      width: 1024,
+      height: 600,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/7.2.1.0 Safari/536.2+",
+      touch: true,
+    },
+    {
+      name: "Google Nexus 10",
+      width: 1280,
+      height: 800,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36",
+      touch: true,
+    },
+    {
+      name: "Google Nexus 7 2",
+      width: 960,
+      height: 600,
+      pixelRatio: 2,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36",
+      touch: true,
+    },
+    {
+      name: "Google Nexus 7",
+      width: 966,
+      height: 604,
+      pixelRatio: 1.325,
+      userAgent: "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.72 Safari/537.36",
+      touch: true,
+    },
+    {
+      name: "Motorola Xoom, Xyboard",
+      width: 1280,
+      height: 800,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/525.10 (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy Tab 7.7, 8.9, 10.1",
+      width: 1280,
+      height: 800,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.2; en-us; SCH-I800 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+    {
+      name: "Samsung Galaxy Tab",
+      width: 1024,
+      height: 600,
+      pixelRatio: 1,
+      userAgent: "Mozilla/5.0 (Linux; U; Android 2.2; en-us; SCH-I800 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      touch: true,
+    },
+  ],
+  notebooks: [
+    {
+      name: "Notebook with touch",
+      width: 1280,
+      height: 950,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: true,
+    },
+    {
+      name: "Notebook with HiDPI screen",
+      width: 1440,
+      height: 900,
+      pixelRatio: 2,
+      userAgent: "",
+      touch: false,
+    },
+    {
+      name: "Generic notebook",
+      width: 1280,
+      height: 800,
+      pixelRatio: 1,
+      userAgent: "",
+      touch: false,
+    },
+  ],
+  televisions: [
+  ],
+  watches: [
+  ],
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/moz.build	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/moz.build	2015-02-28 15:03:02.000000000 +0000
@@ -48,6 +48,7 @@
 EXTRA_JS_MODULES.devtools.shared += [
     'autocomplete-popup.js',
     'd3.js',
+    'devices.js',
     'doorhanger.js',
     'frame-script-utils.js',
     'inplace-editor.js',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/options-view.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/options-view.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/options-view.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/options-view.js	2015-02-28 15:03:02.000000000 +0000
@@ -21,6 +21,9 @@
   let { document } = this.window;
   this.$ = document.querySelector.bind(document);
   this.$$ = document.querySelectorAll.bind(document);
+  // Get the corresponding button that opens the popup by looking
+  // for an element with a `popup` attribute matching the menu's ID
+  this.button = this.$(`[popup=${this.menupopup.getAttribute("id")}]`);
 
   this.prefObserver = new PrefObserver(this.branchName);
 
@@ -126,6 +129,7 @@
    * Fires an event used in tests.
    */
   _onPopupShown: function () {
+    this.button.setAttribute("open", true);
     this.emit(OPTIONS_SHOWN_EVENT);
   },
 
@@ -134,6 +138,7 @@
    * Fires an event used in tests.
    */
   _onPopupHidden: function () {
+    this.button.removeAttribute("open");
     this.emit(OPTIONS_HIDDEN_EVENT);
   }
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/profiler/global.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/profiler/global.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/profiler/global.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/profiler/global.js	2015-02-28 15:03:02.000000000 +0000
@@ -33,25 +33,70 @@
  * To be kept in sync with the js::ProfileEntry::Category in ProfilingStack.h
  */
 const CATEGORY_MAPPINGS = {
-  "8": CATEGORIES[0],    // js::ProfileEntry::Category::OTHER
-  "16": CATEGORIES[1],   // js::ProfileEntry::Category::CSS
-  "32": CATEGORIES[2],   // js::ProfileEntry::Category::JS
-  "64": CATEGORIES[3],   // js::ProfileEntry::Category::GC
-  "128": CATEGORIES[3],  // js::ProfileEntry::Category::CC
-  "256": CATEGORIES[4],  // js::ProfileEntry::Category::NETWORK
-  "512": CATEGORIES[5],  // js::ProfileEntry::Category::GRAPHICS
-  "1024": CATEGORIES[6], // js::ProfileEntry::Category::STORAGE
-  "2048": CATEGORIES[7], // js::ProfileEntry::Category::EVENTS
+  "16": CATEGORIES[0],      // js::ProfileEntry::Category::OTHER
+  "32": CATEGORIES[1],      // js::ProfileEntry::Category::CSS
+  "64": CATEGORIES[2],      // js::ProfileEntry::Category::JS
+  "128": CATEGORIES[3],     // js::ProfileEntry::Category::GC
+  "256": CATEGORIES[3],     // js::ProfileEntry::Category::CC
+  "512": CATEGORIES[4],     // js::ProfileEntry::Category::NETWORK
+  "1024": CATEGORIES[5],    // js::ProfileEntry::Category::GRAPHICS
+  "2048": CATEGORIES[6],    // js::ProfileEntry::Category::STORAGE
+  "4096": CATEGORIES[7],    // js::ProfileEntry::Category::EVENTS
 };
 
+/**
+ * Get the numeric bitmask (or set of masks) for the given category
+ * abbreviation. See CATEGORIES and CATEGORY_MAPPINGS above.
+ *
+ * CATEGORY_MASK can be called with just a name if it is expected that the
+ * category is mapped to by exactly one bitmask.  If the category is mapped
+ * to by multiple masks, CATEGORY_MASK for that name must be called with
+ * an additional argument specifying the desired id (in ascending order).
+ */
+const [CATEGORY_MASK, CATEGORY_MASK_LIST] = (function () {
+  let mappings = {};
+  for (let category of CATEGORIES) {
+    let numList = Object.keys(CATEGORY_MAPPINGS)
+          .filter(k => CATEGORY_MAPPINGS[k] == category)
+          .map(k => +k);
+    numList.sort();
+    mappings[category.abbrev] = numList;
+  }
+
+  return [
+    function (name, num) {
+      if (!(name in mappings)) {
+        throw new Error(`Category abbreviation '${name}' does not exist.`);
+      }
+      if (arguments.length == 1) {
+        if (mappings[name].length != 1) {
+          throw new Error(`Expected exactly one category number for '${name}'.`);
+        }
+        return mappings[name][0];
+      }
+      if (num > mappings[name].length) {
+        throw new Error(`Num '${num}' too high for category '${name}'.`);
+      }
+      return mappings[name][num - 1];
+    },
+
+    function (name) {
+      if (!(name in mappings)) {
+        throw new Error(`Category abbreviation '${name}' does not exist.`);
+      }
+      return mappings[name];
+    }
+  ];
+})();
+
 // Human-readable "other" category bitmask. Older Geckos don't have all the
 // necessary instrumentation in the sampling profiler backend for creating
 // a categories graph, in which case we default to the "other" category.
-const CATEGORY_OTHER = 8;
+const CATEGORY_OTHER = CATEGORY_MASK('other');
 
 // Human-readable JIT category bitmask. Certain pseudo-frames in a sample,
 // like "EnterJIT", don't have any associated `cateogry` information.
-const CATEGORY_JIT = 32;
+const CATEGORY_JIT = CATEGORY_MASK('js');
 
 // Exported symbols.
 exports.L10N = L10N;
@@ -59,3 +104,5 @@
 exports.CATEGORY_MAPPINGS = CATEGORY_MAPPINGS;
 exports.CATEGORY_OTHER = CATEGORY_OTHER;
 exports.CATEGORY_JIT = CATEGORY_JIT;
+exports.CATEGORY_MASK = CATEGORY_MASK;
+exports.CATEGORY_MASK_LIST = CATEGORY_MASK_LIST;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-01.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -26,7 +26,7 @@
 
   testGraph(host, graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-02.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -23,7 +23,7 @@
   yield graph.ready();
   testGraph(host, graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-03a.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-03a.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-03a.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-03a.js	2015-02-28 15:03:02.000000000 +0000
@@ -29,7 +29,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-03b.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-03b.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-03b.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-03b.js	2015-02-28 15:03:02.000000000 +0000
@@ -30,7 +30,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-04.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-04.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_flame-graph-04.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_flame-graph-04.js	2015-02-28 15:03:02.000000000 +0000
@@ -25,7 +25,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-01.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -27,7 +27,7 @@
 
   testGraph(host, graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-02.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -22,7 +22,7 @@
   testDataAndRegions(graph);
   testHighlights(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-03.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-03.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-03.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-03.js	2015-02-28 15:03:02.000000000 +0000
@@ -21,7 +21,7 @@
   yield testSelection(graph);
   yield testCursor(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-04.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-04.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-04.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-04.js	2015-02-28 15:03:02.000000000 +0000
@@ -19,7 +19,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-05.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-05.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-05.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-05.js	2015-02-28 15:03:02.000000000 +0000
@@ -21,7 +21,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-06.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-06.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-06.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-06.js	2015-02-28 15:03:02.000000000 +0000
@@ -21,7 +21,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-07a.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-07a.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-07a.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-07a.js	2015-02-28 15:03:02.000000000 +0000
@@ -20,7 +20,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-07b.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-07b.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-07b.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-07b.js	2015-02-28 15:03:02.000000000 +0000
@@ -20,7 +20,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-08.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-08.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-08.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-08.js	2015-02-28 15:03:02.000000000 +0000
@@ -20,7 +20,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09a.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09a.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09a.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09a.js	2015-02-28 15:03:02.000000000 +0000
@@ -19,7 +19,7 @@
 
   yield testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
@@ -54,7 +54,7 @@
 
   is(graph._maxTooltip.querySelector("[text=value]").textContent, "60",
     "The maximum tooltip displays the correct value.");
-  is(graph._avgTooltip.querySelector("[text=value]").textContent, "41.71",
+  is(graph._avgTooltip.querySelector("[text=value]").textContent, "41.72",
     "The average tooltip displays the correct value.");
   is(graph._minTooltip.querySelector("[text=value]").textContent, "10",
     "The minimum tooltip displays the correct value.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09b.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09b.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09b.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09b.js	2015-02-28 15:03:02.000000000 +0000
@@ -21,7 +21,7 @@
 
   yield testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09c.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09c.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09c.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09c.js	2015-02-28 15:03:02.000000000 +0000
@@ -19,7 +19,7 @@
 
   yield testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09d.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09d.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09d.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09d.js	2015-02-28 15:03:02.000000000 +0000
@@ -20,7 +20,7 @@
 
   yield testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09e.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09e.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09e.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09e.js	2015-02-28 15:03:02.000000000 +0000
@@ -22,7 +22,7 @@
 
   yield testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09f.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09f.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-09f.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-09f.js	2015-02-28 15:03:02.000000000 +0000
@@ -48,5 +48,5 @@
   is(graph._avgGutterLine.hidden, options.avg === false,
     `The avg gutter should ${options.avg === false ? "not " : ""}be shown`);
 
-  graph.destroy();
+  yield graph.destroy();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-10a.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-10a.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-10a.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-10a.js	2015-02-28 15:03:02.000000000 +0000
@@ -27,7 +27,7 @@
 
   is(refreshCount, 2, "The graph should've been refreshed 2 times.");
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-10b.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-10b.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-10b.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-10b.js	2015-02-28 15:03:02.000000000 +0000
@@ -33,7 +33,7 @@
   is(refreshCount, 0, "The graph shouldn't have been refreshed at all.");
   is(refreshCancelledCount, 2, "The graph should've had 2 refresh attempts.");
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-11a.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-11a.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-11a.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-11a.js	2015-02-28 15:03:02.000000000 +0000
@@ -25,7 +25,7 @@
 
   testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-11b.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-11b.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-11b.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-11b.js	2015-02-28 15:03:02.000000000 +0000
@@ -29,7 +29,7 @@
   yield graph.once("ready");
   yield testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-12.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-12.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-12.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-12.js	2015-02-28 15:03:02.000000000 +0000
@@ -35,8 +35,8 @@
 
   testGraphs(graph1, graph2);
 
-  graph1.destroy();
-  graph2.destroy();
+  yield graph1.destroy();
+  yield graph2.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-13.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-13.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-13.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-13.js	2015-02-28 15:03:02.000000000 +0000
@@ -23,7 +23,7 @@
   yield graph.ready();
   testGraph(host, graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-14.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-14.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_graphs-14.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_graphs-14.js	2015-02-28 15:03:02.000000000 +0000
@@ -19,7 +19,7 @@
 
   yield testGraph(graph);
 
-  graph.destroy();
+  yield graph.destroy();
   host.destroy();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_num-l10n.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_num-l10n.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_num-l10n.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_num-l10n.js	2015-02-28 15:03:02.000000000 +0000
@@ -8,7 +8,7 @@
 function test() {
   let l10n = new ViewHelpers.L10N();
 
-  is(l10n.numberWithDecimals(1234.56789, 2), "1,234.56",
+  is(l10n.numberWithDecimals(1234.56789, 2), "1,234.57",
     "The first number was properly localized.");
   is(l10n.numberWithDecimals(0.0001, 2), "0",
     "The second number was properly localized.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_options-view-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_options-view-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_options-view-01.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_options-view-01.js	2015-02-28 15:03:02.000000000 +0000
@@ -95,7 +95,9 @@
   let button = win.document.querySelector("#options-button");
   EventUtils.synthesizeMouseAtCenter(button, {}, win);
   yield opened;
+  is(button.getAttribute("open"), "true", "button has `open` attribute");
 
   EventUtils.synthesizeMouseAtCenter(menuitem, {}, win);
   yield closed;
+  ok(!button.hasAttribute("open"), "button does not have `open` attribute");
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_prefs.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_prefs.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/test/browser_prefs.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/test/browser_prefs.js	2015-02-28 15:03:02.000000000 +0000
@@ -20,14 +20,23 @@
     "The pref was was correctly changed (2).");
 
   Services.prefs.setBoolPref("devtools.debugger.enabled", originalPrefValue);
-  info("The pref value was reset.");
+  info("The pref value was reset (1).");
+  is(Prefs.foo, !originalPrefValue,
+    "The cached pref value hasn't changed yet (1).");
 
+  Services.prefs.setBoolPref("devtools.debugger.enabled", !originalPrefValue);
+  info("The pref value was reset (2).");
   is(Prefs.foo, !originalPrefValue,
-    "The cached pref value hasn't changed yet.");
+    "The cached pref value hasn't changed yet (2).");
+
+  Prefs.registerObserver();
 
-  Prefs.refresh();
+  Services.prefs.setBoolPref("devtools.debugger.enabled", originalPrefValue);
+  info("The pref value was reset (3).");
   is(Prefs.foo, originalPrefValue,
     "The cached pref value has changed now.");
 
+  Prefs.unregisterObserver();
+
   finish();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/timeline/markers-overview.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/timeline/markers-overview.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/timeline/markers-overview.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/timeline/markers-overview.js	2015-02-28 15:03:02.000000000 +0000
@@ -26,6 +26,7 @@
 const OVERVIEW_SELECTION_LINE_COLOR = "#666";
 const OVERVIEW_CLIPHEAD_LINE_COLOR = "#555";
 
+const FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS = 100;
 const OVERVIEW_HEADER_TICKS_MULTIPLE = 100; // ms
 const OVERVIEW_HEADER_TICKS_SPACING_MIN = 75; // px
 const OVERVIEW_HEADER_TEXT_FONT_SIZE = 9; // px
@@ -199,9 +200,18 @@
   _findOptimalTickInterval: function(dataScale) {
     let timingStep = OVERVIEW_HEADER_TICKS_MULTIPLE;
     let spacingMin = OVERVIEW_HEADER_TICKS_SPACING_MIN * this._pixelRatio;
+    let maxIters = FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS;
+    let numIters = 0;
+
+    if (dataScale > spacingMin) {
+      return dataScale;
+    }
 
     while (true) {
       let scaledStep = dataScale * timingStep;
+      if (++numIters > maxIters) {
+        return scaledStep;
+      }
       if (scaledStep < spacingMin) {
         timingStep <<= 1;
         continue;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/timeline/waterfall.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/timeline/waterfall.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/timeline/waterfall.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/timeline/waterfall.js	2015-02-28 15:03:02.000000000 +0000
@@ -27,6 +27,7 @@
 const WATERFALL_IMMEDIATE_DRAW_MARKERS_COUNT = 30;
 const WATERFALL_FLUSH_OUTSTANDING_MARKERS_DELAY = 75; // ms
 
+const FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS = 100;
 const WATERFALL_HEADER_TICKS_MULTIPLE = 5; // ms
 const WATERFALL_HEADER_TICKS_SPACING_MIN = 50; // px
 const WATERFALL_HEADER_TEXT_PADDING = 3; // px
@@ -575,9 +576,18 @@
    */
   _findOptimalTickInterval: function({ ticksMultiple, ticksSpacingMin, dataScale }) {
     let timingStep = ticksMultiple;
+    let maxIters = FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS;
+    let numIters = 0;
+
+    if (dataScale > ticksSpacingMin) {
+      return dataScale;
+    }
 
     while (true) {
       let scaledStep = dataScale * timingStep;
+      if (++numIters > maxIters) {
+        return scaledStep;
+      }
       if (scaledStep < ticksSpacingMin) {
         timingStep <<= 1;
         continue;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/widgets/FlameGraph.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/widgets/FlameGraph.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/widgets/FlameGraph.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/widgets/FlameGraph.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -26,6 +26,7 @@
 const GRAPH_WHEEL_SCROLL_SENSITIVITY = 0.5;
 const GRAPH_MIN_SELECTION_WIDTH = 0.001; // ms
 
+const FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS = 100;
 const TIMELINE_TICKS_MULTIPLE = 5; // ms
 const TIMELINE_TICKS_SPACING_MIN = 75; // px
 
@@ -180,7 +181,9 @@
   /**
    * Destroys this graph.
    */
-  destroy: function() {
+  destroy: Task.async(function*() {
+    yield this.ready();
+
     this._window.removeEventListener("mousemove", this._onMouseMove);
     this._window.removeEventListener("mousedown", this._onMouseDown);
     this._window.removeEventListener("mouseup", this._onMouseUp);
@@ -200,7 +203,7 @@
     this._data = null;
 
     this.emit("destroyed");
-  },
+  }),
 
   /**
    * Rendering options. Subclasses should override these.
@@ -789,12 +792,17 @@
   _findOptimalTickInterval: function(dataScale) {
     let timingStep = TIMELINE_TICKS_MULTIPLE;
     let spacingMin = TIMELINE_TICKS_SPACING_MIN * this._pixelRatio;
+    let maxIters = FIND_OPTIMAL_TICK_INTERVAL_MAX_ITERS;
+    let numIters = 0;
 
     if (dataScale > spacingMin) {
       return dataScale;
     }
 
     while (true) {
+      if (++numIters > maxIters) {
+        return scaledStep;
+      }
       let scaledStep = dataScale * timingStep;
       if (scaledStep < spacingMin) {
         timingStep <<= 1;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/widgets/Graphs.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/widgets/Graphs.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/widgets/Graphs.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/widgets/Graphs.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -229,7 +229,9 @@
   /**
    * Destroys this graph.
    */
-  destroy: function() {
+  destroy: Task.async(function *() {
+    yield this.ready();
+
     this._window.removeEventListener("mousemove", this._onMouseMove);
     this._window.removeEventListener("mousedown", this._onMouseDown);
     this._window.removeEventListener("mouseup", this._onMouseUp);
@@ -259,7 +261,7 @@
     gCachedStripePattern.clear();
 
     this.emit("destroyed");
-  },
+  }),
 
   /**
    * Rendering options. Subclasses should override these.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/widgets/ViewHelpers.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/widgets/ViewHelpers.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/shared/widgets/ViewHelpers.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/shared/widgets/ViewHelpers.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -17,6 +17,7 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+Cu.import("resource://gre/modules/devtools/event-emitter.js");
 
 this.EXPORTED_SYMBOLS = [
   "Heritage", "ViewHelpers", "WidgetMethods",
@@ -368,10 +369,6 @@
     if (isNaN(aNumber) || aNumber == null) {
       return "0";
     }
-    // Remove {n} trailing decimals. Can't use toFixed(n) because
-    // toLocaleString converts the number to a string. Also can't use
-    // toLocaleString(, { maximumFractionDigits: n }) because it's not
-    // implemented on OS X (bug 368838). Gross.
     let localized = aNumber.toLocaleString(); // localize
 
     // If no grouping or decimal separators are available, bail out, because
@@ -380,9 +377,10 @@
       return localized;
     }
 
-    let padded = localized + new Array(aDecimals).join("0"); // pad with zeros
-    let match = padded.match("([^]*?\\d{" + aDecimals + "})\\d*$");
-    return match.pop();
+    return aNumber.toLocaleString(undefined, {
+      maximumFractionDigits: aDecimals,
+      minimumFractionDigits: aDecimals
+    });
   }
 };
 
@@ -392,25 +390,57 @@
  *   let prefs = new ViewHelpers.Prefs("root.path.to.branch", {
  *     myIntPref: ["Int", "leaf.path.to.my-int-pref"],
  *     myCharPref: ["Char", "leaf.path.to.my-char-pref"],
+ *     myJsonPref: ["Json", "leaf.path.to.my-json-pref"]
  *     ...
  *   });
  *
+ * Get/set:
  *   prefs.myCharPref = "foo";
  *   let aux = prefs.myCharPref;
  *
+ * Observe:
+ *   prefs.registerObserver();
+ *   prefs.on("pref-changed", (prefName, prefValue) => {
+ *     ...
+ *   });
+ *
  * @param string aPrefsRoot
  *        The root path to the required preferences branch.
- * @param object aPrefsObject
+ * @param object aPrefsBlueprint
  *        An object containing { accessorName: [prefType, prefName] } keys.
  */
-ViewHelpers.Prefs = function(aPrefsRoot = "", aPrefsObject = {}) {
-  this._root = aPrefsRoot;
+ViewHelpers.Prefs = function(aPrefsRoot = "", aPrefsBlueprint = {}) {
+  EventEmitter.decorate(this);
+
   this._cache = new Map();
+  let self = this;
 
-  for (let accessorName in aPrefsObject) {
-    let [prefType, prefName] = aPrefsObject[accessorName];
-    this.map(accessorName, prefType, prefName);
+  for (let [accessorName, [prefType, prefName]] of Iterator(aPrefsBlueprint)) {
+    this._map(accessorName, prefType, aPrefsRoot, prefName);
   }
+
+  let observer = {
+    register: function() {
+      this.branch = Services.prefs.getBranch(aPrefsRoot + ".");
+      this.branch.addObserver("", this, false);
+    },
+    unregister: function() {
+      this.branch.removeObserver("", this);
+    },
+    observe: function(_, __, aPrefName) {
+      // If this particular pref isn't handled by the blueprint object,
+      // even though it's in the specified branch, ignore it.
+      let accessor = self._accessor(aPrefsBlueprint, aPrefName);
+      if (!(accessor in self)) {
+        return;
+      }
+      self._cache.delete(aPrefName);
+      self.emit("pref-changed", accessor, self[accessor]);
+    }
+  };
+
+  this.registerObserver = () => observer.register();
+  this.unregisterObserver = () => observer.unregister();
 };
 
 ViewHelpers.Prefs.prototype = {
@@ -418,15 +448,16 @@
    * Helper method for getting a pref value.
    *
    * @param string aType
+   * @param string aPrefsRoot
    * @param string aPrefName
    * @return any
    */
-  _get: function(aType, aPrefName) {
+  _get: function(aType, aPrefsRoot, aPrefName) {
     let cachedPref = this._cache.get(aPrefName);
     if (cachedPref !== undefined) {
       return cachedPref;
     }
-    let value = Services.prefs["get" + aType + "Pref"](aPrefName);
+    let value = Services.prefs["get" + aType + "Pref"]([aPrefsRoot, aPrefName].join("."));
     this._cache.set(aPrefName, value);
     return value;
   },
@@ -435,11 +466,12 @@
    * Helper method for setting a pref value.
    *
    * @param string aType
+   * @param string aPrefsRoot
    * @param string aPrefName
    * @param any aValue
    */
-  _set: function(aType, aPrefName, aValue) {
-    Services.prefs["set" + aType + "Pref"](aPrefName, aValue);
+  _set: function(aType, aPrefsRoot, aPrefName, aValue) {
+    Services.prefs["set" + aType + "Pref"]([aPrefsRoot, aPrefName].join("."), aValue);
     this._cache.set(aPrefName, aValue);
   },
 
@@ -450,26 +482,36 @@
    *
    * @param string aAccessorName
    * @param string aType
+   * @param string aPrefsRoot
    * @param string aPrefName
    * @param array aSerializer
    */
-  map: function(aAccessorName, aType, aPrefName, aSerializer = { in: e => e, out: e => e }) {
+  _map: function(aAccessorName, aType, aPrefsRoot, aPrefName, aSerializer = { in: e => e, out: e => e }) {
+    if (aPrefName in this) {
+      throw new Error(`Can't use ${aPrefName} because it's already a property.`);
+    }
     if (aType == "Json") {
-      this.map(aAccessorName, "Char", aPrefName, { in: JSON.parse, out: JSON.stringify });
+      this._map(aAccessorName, "Char", aPrefsRoot, aPrefName, { in: JSON.parse, out: JSON.stringify });
       return;
     }
 
     Object.defineProperty(this, aAccessorName, {
-      get: () => aSerializer.in(this._get(aType, [this._root, aPrefName].join("."))),
-      set: (e) => this._set(aType, [this._root, aPrefName].join("."), aSerializer.out(e))
+      get: () => aSerializer.in(this._get(aType, aPrefsRoot, aPrefName)),
+      set: (e) => this._set(aType, aPrefsRoot, aPrefName, aSerializer.out(e))
     });
   },
 
   /**
-   * Clears all the cached preferences' values.
+   * Finds the accessor in this object for the provided property name,
+   * based on the blueprint object used in the constructor.
    */
-  refresh: function() {
-    this._cache.clear();
+  _accessor: function(aPrefsBlueprint, aPrefName) {
+    for (let [accessorName, [, prefName]] of Iterator(aPrefsBlueprint)) {
+      if (prefName == aPrefName) {
+        return accessorName;
+      }
+    }
+    return null;
   }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/sourceeditor/test/browser_css_autocompletion.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/sourceeditor/test/browser_css_autocompletion.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/sourceeditor/test/browser_css_autocompletion.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/sourceeditor/test/browser_css_autocompletion.js	2015-02-28 15:03:02.000000000 +0000
@@ -138,9 +138,9 @@
     inspector.destroy();
     inspector = null;
     completer = null;
+    gBrowser.removeCurrentTab();
+    finish();
   });
   progress = null;
   progressDiv = null;
-  gBrowser.removeCurrentTab();
-  finish();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/StyleEditorUI.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -447,13 +447,15 @@
    *         Editor to create UI for.
    */
   _sourceLoaded: function(editor) {
+    let ordinal = editor.styleSheet.styleSheetIndex;
+    ordinal = ordinal == -1 ? Number.MAX_SAFE_INTEGER : ordinal;
     // add new sidebar item and editor to the UI
     this._view.appendTemplatedItem(STYLE_EDITOR_TEMPLATE, {
       data: {
         editor: editor
       },
       disableAnimations: this._alwaysDisableAnimations,
-      ordinal: editor.styleSheet.styleSheetIndex,
+      ordinal: ordinal,
       onCreate: function(summary, details, data) {
         let editor = data.editor;
         editor.summary = summary;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/StyleSheetEditor.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/StyleSheetEditor.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/StyleSheetEditor.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/StyleSheetEditor.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -15,6 +15,7 @@
 const Editor  = require("devtools/sourceeditor/editor");
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 const {CssLogic} = require("devtools/styleinspector/css-logic");
+const {console} = require("resource://gre/modules/devtools/Console.jsm");
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
@@ -251,11 +252,27 @@
           callback(source);
         }
         return source;
+      }, e => {
+        if (this._isDestroyed) {
+          console.warn("Could not fetch the source for " +
+                       this.styleSheet.href +
+                       ", the editor was destroyed");
+          Cu.reportError(e);
+        } else {
+          throw e;
+        }
       });
     }, e => {
-      this.emit("error", { key: LOAD_ERROR, append: this.styleSheet.href });
-      throw e;
-    })
+      if (this._isDestroyed) {
+        console.warn("Could not fetch the source for " +
+                     this.styleSheet.href +
+                     ", the editor was destroyed");
+        Cu.reportError(e);
+      } else {
+        this.emit("error", { key: LOAD_ERROR, append: this.styleSheet.href });
+        throw e;
+      }
+    });
   },
 
   /**
@@ -712,6 +729,7 @@
     this.cssSheet.off("property-change", this._onPropertyChange);
     this.cssSheet.off("media-rules-changed", this._onMediaRulesChanged);
     this.styleSheet.off("error", this._onError);
+    this._isDestroyed = true;
   }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_autocomplete.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,7 +9,7 @@
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Unknown sheet source");
 
-const TESTCASE_URI = TEST_BASE + "autocomplete.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "autocomplete.html";
 const MAX_SUGGESTIONS = 15;
 
 // Pref which decides if CSS autocompletion is enabled in Style Editor or not.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_bug_851132_middle_click.js	2015-02-28 15:03:02.000000000 +0000
@@ -8,7 +8,7 @@
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Unknown sheet source");
 
-const TESTCASE_URI = TEST_BASE + "four.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "four.html";
 
 let gUI;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_filesave.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_filesave.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_filesave.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_filesave.js	2015-02-28 15:03:02.000000000 +0000
@@ -2,8 +2,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const TESTCASE_URI_HTML = TEST_BASE + "simple.html";
-const TESTCASE_URI_CSS = TEST_BASE + "simple.css";
+const TESTCASE_URI_HTML = TEST_BASE_HTTP + "simple.html";
+const TESTCASE_URI_CSS = TEST_BASE_HTTP + "simple.css";
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_init.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_init.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_init.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_init.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,7 +9,7 @@
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("TypeError: summary is undefined");
 
-const TESTCASE_URI = TEST_BASE + "simple.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "simple.html";
 
 let gUI;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_inline_friendly_names.js	2015-02-28 15:03:02.000000000 +0000
@@ -11,8 +11,8 @@
 
 let gUI;
 
-const FIRST_TEST_PAGE = TEST_BASE + "inline-1.html"
-const SECOND_TEST_PAGE = TEST_BASE + "inline-2.html"
+const FIRST_TEST_PAGE = TEST_BASE_HTTP + "inline-1.html"
+const SECOND_TEST_PAGE = TEST_BASE_HTTP + "inline-2.html"
 const SAVE_PATH = "test.css";
 
 function test()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_new.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_new.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_new.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_new.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,7 +9,7 @@
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Unknown sheet source");
 
-const TESTCASE_URI = TEST_BASE + "simple.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "simple.html";
 
 let TESTCASE_CSS_SOURCE = "body{background-color:red;";
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_nostyle.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_nostyle.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_nostyle.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_nostyle.js	2015-02-28 15:03:02.000000000 +0000
@@ -2,7 +2,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const TESTCASE_URI = TEST_BASE + "nostyle.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "nostyle.html";
 
 
 function test()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_pretty.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,7 +9,7 @@
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Unknown sheet source");
 
-const TESTCASE_URI = TEST_BASE + "minified.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "minified.html";
 
 let gUI;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sourcemap_watching.js	2015-02-28 15:03:02.000000000 +0000
@@ -6,11 +6,11 @@
 let {devtools} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 
-const TESTCASE_URI_HTML = TEST_BASE + "sourcemaps-watching.html";
-const TESTCASE_URI_CSS = TEST_BASE + "sourcemap-css/sourcemaps.css";
-const TESTCASE_URI_REG_CSS = TEST_BASE + "simple.css";
-const TESTCASE_URI_SCSS = TEST_BASE + "sourcemap-sass/sourcemaps.scss";
-const TESTCASE_URI_MAP = TEST_BASE + "sourcemap-css/sourcemaps.css.map";
+const TESTCASE_URI_HTML = TEST_BASE_HTTP + "sourcemaps-watching.html";
+const TESTCASE_URI_CSS = TEST_BASE_HTTP + "sourcemap-css/sourcemaps.css";
+const TESTCASE_URI_REG_CSS = TEST_BASE_HTTP + "simple.css";
+const TESTCASE_URI_SCSS = TEST_BASE_HTTP + "sourcemap-sass/sourcemaps.scss";
+const TESTCASE_URI_MAP = TEST_BASE_HTTP + "sourcemap-css/sourcemaps.css.map";
 const TESTCASE_SCSS_NAME = "sourcemaps.scss";
 
 const TRANSITIONS_PREF = "devtools.styleeditor.transitions";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_keynav.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_keynav.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_keynav.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_keynav.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,7 +9,7 @@
 //
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Unknown sheet source");
 
-const TESTCASE_URI = TEST_BASE + "four.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "four.html";
 
 let gUI;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_resize.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_resize.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_resize.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleeditor/test/browser_styleeditor_sv_resize.js	2015-02-28 15:03:02.000000000 +0000
@@ -2,7 +2,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const TESTCASE_URI = TEST_BASE + "simple.html";
+const TESTCASE_URI = TEST_BASE_HTTP + "simple.html";
 
 let gOriginalWidth; // these are set by runTests()
 let gOriginalHeight;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -45,6 +45,7 @@
 [browser_ruleview_add-property-cancel_03.js]
 [browser_ruleview_add-property_01.js]
 [browser_ruleview_add-property_02.js]
+[browser_ruleview_add-property-svg.js]
 [browser_ruleview_add-rule_01.js]
 [browser_ruleview_add-rule_02.js]
 [browser_ruleview_add-rule_03.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser_ruleview_add-property-svg.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,62 @@
+/* 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";
+
+// Tests editing SVG styles using the rules view
+
+let TEST_URL = "chrome://global/skin/icons/warning.svg";
+let TEST_SELECTOR = "path";
+
+add_task(function*() {
+  yield addTab(TEST_URL);
+
+  info("Opening the rule-view");
+  let {toolbox, inspector, view} = yield openRuleView();
+
+  info("Selecting the test element");
+  yield selectNode(TEST_SELECTOR, inspector);
+
+  yield testCreateNew(view);
+});
+
+function* testCreateNew(ruleView) {
+  info("Test creating a new property");
+
+  let elementRuleEditor = getRuleViewRuleEditor(ruleView, 0);
+
+  info("Focusing a new property name in the rule-view");
+  let editor = yield focusEditableField(elementRuleEditor.closeBrace);
+
+  is(inplaceEditor(elementRuleEditor.newPropSpan), editor,
+    "Next focused editor should be the new property editor.");
+
+  let input = editor.input;
+
+  info("Entering the property name");
+  input.value = "fill";
+
+  info("Pressing RETURN and waiting for the value field focus");
+  let onFocus = once(elementRuleEditor.element, "focus", true);
+  EventUtils.sendKey("return", ruleView.doc.defaultView);
+  yield onFocus;
+  yield elementRuleEditor.rule._applyingModifications;
+
+  editor = inplaceEditor(ruleView.doc.activeElement);
+
+  is(elementRuleEditor.rule.textProps.length,  1, "Should have created a new text property.");
+  is(elementRuleEditor.propertyList.children.length, 1, "Should have created a property editor.");
+  let textProp = elementRuleEditor.rule.textProps[0];
+  is(editor, inplaceEditor(textProp.editor.valueSpan), "Should be editing the value span now.");
+
+  editor.input.value = "red";
+  let onBlur = once(editor.input, "blur");
+  EventUtils.sendKey("return", ruleView.doc.defaultView);
+  yield onBlur;
+  yield elementRuleEditor.rule._applyingModifications;
+
+  is(textProp.value, "red", "Text prop should have been changed.");
+
+  is((yield getComputedStyleProperty(TEST_SELECTOR, null, "fill")), "rgb(255, 0, 0)", "The fill was changed to red");
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser_ruleview_livepreview.js	2015-02-28 15:03:02.000000000 +0000
@@ -37,7 +37,6 @@
   }
 });
 
-
 function* testLivePreviewData(data, ruleView, selector) {
   let testElement = getNode(selector);
   let idRuleEditor = getRuleViewRuleEditor(ruleView, 1);
@@ -57,10 +56,13 @@
     EventUtils.synthesizeKey("VK_RETURN", {});
   }
 
-  // This wait is an orange waiting to happen, but it might take a few event
-  // loop spins in either the client or parent process before we see the
-  // updated value.
-  yield wait(1);
+  // Wait for the modifyproperties request to complete before
+  // checking the computed style.
+  for (let rule of ruleView._elementStyle.rules) {
+    if (rule._applyingModifications) {
+      yield rule._applyingModifications;
+    }
+  }
 
   // While the editor is still focused in, the display should have changed already
   is((yield getComputedStyleProperty(selector, null, "display")),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/styleinspector/test/browser_styleinspector_context-menu-copy-color_01.js	2015-02-28 15:03:02.000000000 +0000
@@ -9,6 +9,9 @@
 const COLOR_SELECTOR = "span[data-color]";
 
 add_task(function* () {
+  // Test is slow on Linux EC2 instances - Bug 1137765
+  requestLongerTimeout(2);
+
   const TEST_DOC = '<html>                                              \
                       <body>                                            \
                         <div style="color: ' + TEST_COLOR + ';          \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/tilt/test/browser_tilt_controller.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/tilt/test/browser_tilt_controller.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/tilt/test/browser_tilt_controller.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/tilt/test/browser_tilt_controller.js	2015-02-28 15:03:02.000000000 +0000
@@ -42,19 +42,22 @@
         ok(isEqualVec(rot(), prev_rot),
           "At init, the rotation should be zero.");
 
-
-        function testEventCancel(cancellingEvent) {
+        function testEventCancel(cancellingEvent, cancellingDescription) {
+          let description = "testEventCancel, cancellingEvent is " + cancellingDescription + ": ";
           is(document.activeElement, canvas,
-            "The visualizer canvas should be focused when performing this test.");
+             description + "The visualizer canvas should be focused when performing this test.");
 
-          EventUtils.synthesizeKey("VK_A", { type: "keydown" });
-          EventUtils.synthesizeKey("VK_LEFT", { type: "keydown" });
+          EventUtils.synthesizeKey("a", { type: "keydown", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
           instance.controller._update();
+          ok(!isEqualVec(rot(), prev_rot),
+             description + "After a rotation key is pressed, the quaternion should change.");
+          EventUtils.synthesizeKey("a", { type: "keyup", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
 
+          EventUtils.synthesizeKey("ArrowLeft", { type: "keydown", code: "ArrowLeft", keyCode: KeyboardEvent.DOM_VK_LEFT });
+          instance.controller._update();
           ok(!isEqualVec(tran(), prev_tran),
-            "After a translation key is pressed, the vector should change.");
-          ok(!isEqualVec(rot(), prev_rot),
-            "After a rotation key is pressed, the quaternion should change.");
+             description + "After a translation key is pressed, the vector should change.");
+          EventUtils.synthesizeKey("ArrowLeft", { type: "keyup", code: "ArrowLeft", keyCode: KeyboardEvent.DOM_VK_LEFT });
 
           save();
 
@@ -63,9 +66,9 @@
           instance.controller._update();
 
           ok(!isEqualVec(tran(), prev_tran),
-            "Even if the canvas lost focus, the vector has some inertia.");
+             description + "Even if the canvas lost focus, the vector has some inertia.");
           ok(!isEqualVec(rot(), prev_rot),
-            "Even if the canvas lost focus, the quaternion has some inertia.");
+             description + "Even if the canvas lost focus, the quaternion has some inertia.");
 
           save();
 
@@ -82,41 +85,40 @@
 
         info("Setting typeaheadfind to true.");
 
-        Services.prefs.setBoolPref("accessibility.typeaheadfind", true);
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("T", { type: "keydown", altKey: 1 });
-        });
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("I", { type: "keydown", ctrlKey: 1 });
-        });
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("L", { type: "keydown", metaKey: 1 });
-        });
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("T", { type: "keydown", shiftKey: 1 });
-        });
+        let typeaheadfindEnabled = true;
+        Services.prefs.setBoolPref("accessibility.typeaheadfind", typeaheadfindEnabled);
+        for (var i = 0; i < 2; i++) {
+          testEventCancel(function() {
+            // XXX Don't use a character which is registered as a mnemonic in the menubar.
+            EventUtils.synthesizeKey("A", { altKey: true, code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+          }, "Alt + A");
+          testEventCancel(function() {
+            // XXX Don't use a character which is registered as a shortcut key.
+            EventUtils.synthesizeKey(";", { ctrlKey: true, code: "Semicolon", keyCode: KeyboardEvent.DOM_VK_SEMICONLON });
+          }, "Ctrl + ;");
+          testEventCancel(function() {
+            // XXX Don't use a character which is registered as a shortcut key.
+            EventUtils.synthesizeKey("\\", { metaKey: true, code: "Backslash", keyCode: KeyboardEvent.DOM_VK_BACK_SLASH });
+          }, "Meta + \\");
+          // If typeahead is enabled, Shift + T causes moving focus to the findbar because it inputs "T".
+          if (!typeaheadfindEnabled) {
+            testEventCancel(function() {
+              EventUtils.synthesizeKey("T", { shiftKey: true, code: "KeyT", keyCode: KeyboardEvent.DOM_VK_T });
+            }, "Shift + T");
+          }
 
-        info("Setting typeaheadfind to false.");
+          // Retry after disabling typeaheadfind.
+          info("Setting typeaheadfind to false.");
 
-        Services.prefs.setBoolPref("accessibility.typeaheadfind", false);
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("T", { type: "keydown", altKey: 1 });
-        });
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("I", { type: "keydown", ctrlKey: 1 });
-        });
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("L", { type: "keydown", metaKey: 1 });
-        });
-        testEventCancel(function() {
-          EventUtils.synthesizeKey("T", { type: "keydown", shiftKey: 1 });
-        });
+          typeaheadfindEnabled = false;
+          Services.prefs.setBoolPref("accessibility.typeaheadfind", typeaheadfindEnabled);
+        }
 
         info("Testing if loosing focus halts any stacked arcball animations.");
 
         testEventCancel(function() {
           gBrowser.selectedBrowser.contentWindow.focus();
-        });
+        }, "setting focus to the content window");
       },
       onEnd: function()
       {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/timeline/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/timeline/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/timeline/test/browser.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/timeline/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -5,7 +5,6 @@
   head.js
 
 [browser_timeline_aaa_run_first_leaktest.js]
-[browser_timeline_filters.js]
 [browser_timeline_overview-initial-selection-01.js]
 [browser_timeline_overview-initial-selection-02.js]
 [browser_timeline_overview-update.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/timeline/test/browser_timeline_filters.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/timeline/test/browser_timeline_filters.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/timeline/test/browser_timeline_filters.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/timeline/test/browser_timeline_filters.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests markers filtering mechanism.
- */
-
-add_task(function*() {
-  let { target, panel } = yield initTimelinePanel(SIMPLE_URL);
-  let { $, $$, TimelineController, TimelineView } = panel.panelWin;
-
-  yield TimelineController.toggleRecording();
-  ok(true, "Recording has started.");
-
-  yield waitUntil(() => {
-    // Wait until we get 3 different markers.
-    let markers = TimelineController.getMarkers();
-    return markers.some(m => m.name == "Styles") &&
-           markers.some(m => m.name == "Reflow") &&
-           markers.some(m => m.name == "Paint");
-  });
-
-  yield TimelineController.toggleRecording();
-
-  let overview = TimelineView.markersOverview;
-  let waterfall = TimelineView.waterfall;
-
-  // Select everything
-  overview.setSelection({ start: 0, end: overview.width })
-
-  $("#filter-button").click();
-
-  yield waitUntil(() => !waterfall._outstandingMarkers.length);
-
-  let menuItem1 = $("menuitem[marker-type=Styles]");
-  let menuItem2 = $("menuitem[marker-type=Reflow]");
-  let menuItem3 = $("menuitem[marker-type=Paint]");
-
-  let originalHeight = overview.fixedHeight;
-
-  ok($(".waterfall-marker-bar[type=Styles]"), "Found at least one 'Styles' marker (1)");
-  ok($(".waterfall-marker-bar[type=Reflow]"), "Found at least one 'Reflow' marker (1)");
-  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (1)");
-
-  let heightBefore = overview.fixedHeight;
-  EventUtils.synthesizeMouseAtCenter(menuItem1, {type: "mouseup"}, panel.panelWin);
-  yield once(menuItem1, "command");
-
-  yield waitUntil(() => !waterfall._outstandingMarkers.length);
-
-  is(overview.fixedHeight, heightBefore, "Overview height hasn't changed");
-  ok(!$(".waterfall-marker-bar[type=Styles]"), "No 'Styles' marker (2)");
-  ok($(".waterfall-marker-bar[type=Reflow]"), "Found at least one 'Reflow' marker (2)");
-  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (2)");
-
-  heightBefore = overview.fixedHeight;
-  EventUtils.synthesizeMouseAtCenter(menuItem2, {type: "mouseup"}, panel.panelWin);
-  yield once(menuItem2, "command");
-
-  yield waitUntil(() => !waterfall._outstandingMarkers.length);
-
-  is(overview.fixedHeight, heightBefore, "Overview height hasn't changed");
-  ok(!$(".waterfall-marker-bar[type=Styles]"), "No 'Styles' marker (3)");
-  ok(!$(".waterfall-marker-bar[type=Reflow]"), "No 'Reflow' marker (3)");
-  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (3)");
-
-  heightBefore = overview.fixedHeight;
-  EventUtils.synthesizeMouseAtCenter(menuItem3, {type: "mouseup"}, panel.panelWin);
-  yield once(menuItem3, "command");
-
-  yield waitUntil(() => !waterfall._outstandingMarkers.length);
-
-  // A row is 11px. See markers-overview.js
-  is(overview.fixedHeight, heightBefore - 11, "Overview is smaller");
-  ok(!$(".waterfall-marker-bar[type=Styles]"), "No 'Styles' marker (4)");
-  ok(!$(".waterfall-marker-bar[type=Reflow]"), "No 'Reflow' marker (4)");
-  ok(!$(".waterfall-marker-bar[type=Paint]"), "No 'Paint' marker (4)");
-
-  for (let item of [menuItem1, menuItem2, menuItem3]) {
-    EventUtils.synthesizeMouseAtCenter(item, {type: "mouseup"}, panel.panelWin);
-    yield once(item, "command");
-  }
-
-  yield waitUntil(() => !waterfall._outstandingMarkers.length);
-
-  ok($(".waterfall-marker-bar[type=Styles]"), "Found at least one 'Styles' marker (5)");
-  ok($(".waterfall-marker-bar[type=Reflow]"), "Found at least one 'Reflow' marker (5)");
-  ok($(".waterfall-marker-bar[type=Paint]"), "Found at least one 'Paint' marker (5)");
-
-  is(overview.fixedHeight, originalHeight, "Overview restored");
-
-  $(".waterfall-marker-bar[type=Styles]");
-});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/controller.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/controller.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/controller.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/controller.js	2015-02-28 15:03:02.000000000 +0000
@@ -61,8 +61,15 @@
     // with CSS
     gDevTools.on("pref-changed", this._onThemeChange);
 
-    // Store the AudioNode definitions from the WebAudioFront
-    AUDIO_NODE_DEFINITION = yield gFront.getDefinition();
+    // Store the AudioNode definitions from the WebAudioFront, if the method exists.
+    // If not, get the JSON directly. Using the actor method is preferable so the client
+    // knows exactly what methods are supported on the server.
+    let actorHasDefinition = yield gTarget.actorHasMethod("webaudio", "getDefinition");
+    if (actorHasDefinition) {
+      AUDIO_NODE_DEFINITION = yield gFront.getDefinition();
+    } else {
+      AUDIO_NODE_DEFINITION = require("devtools/server/actors/utils/audionodes.json");
+    }
   }),
 
   /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_callwatcher-02.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,44 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Bug 1112378
+ * Tests to ensure that errors called on wrapped functions via call-watcher
+ * correctly looks like the error comes from the content, not from within the devtools.
+ */
+
+const BUG_1112378_URL = EXAMPLE_URL + "doc_bug_1112378.html";
+
+add_task(function*() {
+  let { target, panel } = yield initWebAudioEditor(BUG_1112378_URL);
+  let { panelWin } = panel;
+  let { gFront, $, $$, EVENTS, gAudioNodes } = panelWin;
+
+  loadFrameScripts();
+
+  reload(target);
+
+  yield waitForGraphRendered(panelWin, 2, 0);
+
+  let error = yield evalInDebuggee("throwError()");
+  is(error.lineNumber, 21, "error has correct lineNumber");
+  is(error.columnNumber, 11, "error has correct columnNumber");
+  is(error.name, "TypeError", "error has correct name");
+  is(error.message, "Argument 1 is not valid for any of the 2-argument overloads of AudioNode.connect.", "error has correct message");
+  is(error.stringified, "TypeError: Argument 1 is not valid for any of the 2-argument overloads of AudioNode.connect.", "error is stringified correctly");
+  ise(error.instanceof, true, "error is correctly an instanceof TypeError");
+  is(error.fileName, "http://example.com/browser/browser/devtools/webaudioeditor/test/doc_bug_1112378.html", "error has correct fileName");
+
+  error = yield evalInDebuggee("throwDOMException()");
+  is(error.lineNumber, 37, "exception has correct lineNumber");
+  is(error.columnNumber, 0, "exception has correct columnNumber");
+  is(error.code, 9, "exception has correct code");
+  is(error.result, 2152923145, "exception has correct result");
+  is(error.name, "NotSupportedError", "exception has correct name");
+  is(error.message, "Operation is not supported", "exception has correct message");
+  is(error.stringified, "NotSupportedError: Operation is not supported", "exception is stringified correctly");
+  ise(error.instanceof, true, "exception is correctly an instance of DOMException");
+  is(error.filename, "http://example.com/browser/browser/devtools/webaudioeditor/test/doc_bug_1112378.html", "exception has correct filename");
+
+  yield teardown(target);
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -13,6 +13,7 @@
   doc_automation.html
   doc_bug_1125817.html
   doc_bug_1130901.html
+  doc_bug_1112378.html
   440hz_sine.ogg
   head.js
 
@@ -26,18 +27,19 @@
 [browser_audionode-actor-connectnode-disconnect.js]
 [browser_audionode-actor-connectparam.js]
 skip-if = true # bug 1092571
-[browser_audionode-actor-add-automation-event.js]
-[browser_audionode-actor-get-automation-data-01.js]
-[browser_audionode-actor-get-automation-data-02.js]
-[browser_audionode-actor-get-automation-data-03.js]
+# [browser_audionode-actor-add-automation-event.js] bug 1134036
+# [browser_audionode-actor-get-automation-data-01.js] bug 1134036
+# [browser_audionode-actor-get-automation-data-02.js] bug 1134036
+# [browser_audionode-actor-get-automation-data-03.js] bug 1134036
 [browser_callwatcher-01.js]
+[browser_callwatcher-02.js]
 [browser_webaudio-actor-simple.js]
 [browser_webaudio-actor-destroy-node.js]
 [browser_webaudio-actor-connect-param.js]
-[browser_webaudio-actor-automation-event.js]
+# [browser_webaudio-actor-automation-event.js] bug 1134036
 
-[browser_wa_automation-view-01.js]
-[browser_wa_automation-view-02.js]
+# [browser_wa_automation-view-01.js] bug 1134036
+# [browser_wa_automation-view-02.js] bug 1134036
 [browser_wa_controller-01.js]
 [browser_wa_destroy-node-01.js]
 [browser_wa_first-run.js]
@@ -53,6 +55,7 @@
 [browser_wa_graph-zoom.js]
 [browser_wa_inspector.js]
 [browser_wa_inspector-toggle.js]
+[browser_wa_inspector-width.js]
 [browser_wa_inspector-bypass-01.js]
 [browser_wa_navigate.js]
 [browser_wa_properties-view.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector.js	2015-02-28 15:03:02.000000000 +0000
@@ -29,12 +29,7 @@
     "InspectorView tabs view should be hidden when no node's selected.");
 
   // Wait for the node to be set as well as the inspector to come fully into the view
-  let nodeSet = Promise.all([
-    once(panelWin, EVENTS.UI_INSPECTOR_NODE_SET),
-    once(panelWin, EVENTS.UI_INSPECTOR_TOGGLED)
-  ]);
-  click(panelWin, findGraphNode(panelWin, nodeIds[1]));
-  yield nodeSet;
+  yield clickGraphNode(panelWin, findGraphNode(panelWin, nodeIds[1]), true);
 
   ok(InspectorView.isVisible(), "InspectorView shown once node selected.");
   ok(!isVisible($("#web-audio-editor-details-pane-empty")),
@@ -45,9 +40,7 @@
   is($("#web-audio-editor-tabs").selectedIndex, 0,
     "default tab selected should be the parameters tab.");
 
-  nodeSet = once(panelWin, EVENTS.UI_INSPECTOR_NODE_SET);
-  click(panelWin, findGraphNode(panelWin, nodeIds[2]));
-  yield nodeSet;
+  yield clickGraphNode(panelWin, findGraphNode(panelWin, nodeIds[2]));
 
   yield teardown(target);
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-toggle.js	2015-02-28 15:03:02.000000000 +0000
@@ -49,9 +49,7 @@
   ok(!isVisible($("#web-audio-editor-tabs")),
     "InspectorView tabs are still hidden.");
 
-  let nodeSet = once(panelWin, EVENTS.UI_INSPECTOR_NODE_SET);
-  click(panelWin, findGraphNode(panelWin, nodeIds[1]));
-  yield nodeSet;
+  yield clickGraphNode(panelWin, findGraphNode(panelWin, nodeIds[1]));
 
   ok(!isVisible($("#web-audio-editor-details-pane-empty")),
     "Empty message hides even when loading node while open.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/browser_wa_inspector-width.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,56 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that the WebAudioInspector's Width is saved as
+ * a preference
+ */
+
+add_task(function*() {
+  let { target, panel } = yield initWebAudioEditor(SIMPLE_CONTEXT_URL);
+  let { panelWin } = panel;
+  let { gFront, $, $$, EVENTS, InspectorView } = panelWin;
+  let gVars = InspectorView._propsView;
+
+  let started = once(gFront, "start-context");
+
+  reload(target);
+
+  let [actors] = yield Promise.all([
+    get3(gFront, "create-node"),
+    waitForGraphRendered(panelWin, 3, 2)
+  ]);
+  let nodeIds = actors.map(actor => actor.actorID);
+
+  ok(!InspectorView.isVisible(), "InspectorView hidden on start.");
+
+  // Open inspector pane
+  $("#inspector-pane-toggle").click();
+  yield once(panelWin, EVENTS.UI_INSPECTOR_TOGGLED);
+
+  let newInspectorWidth = 500;
+
+  // Setting width to new_inspector_width
+  $("#web-audio-inspector").setAttribute("width", newInspectorWidth);
+  reload(target);
+
+  //Width should be 500 after reloading
+  [actors] = yield Promise.all([
+    get3(gFront, "create-node"),
+    waitForGraphRendered(panelWin, 3, 2)
+  ]);
+  nodeIds = actors.map(actor => actor.actorID);
+
+  // Open inspector pane
+  $("#inspector-pane-toggle").click();
+  yield once(panelWin, EVENTS.UI_INSPECTOR_TOGGLED);
+
+  yield clickGraphNode(panelWin, findGraphNode(panelWin, nodeIds[1]));
+ 
+  // Getting the width of the audio inspector
+  let width = $("#web-audio-inspector").getAttribute("width");
+
+  is(width, newInspectorWidth, "WebAudioEditor's Inspector width should be saved as a preference");
+
+  yield teardown(target);
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/doc_bug_1112378.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/doc_bug_1112378.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/doc_bug_1112378.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/doc_bug_1112378.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,57 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Web Audio Editor test page</title>
+  </head>
+
+  <body>
+
+    <script type="text/javascript;version=1.8">
+      "use strict";
+
+      let ctx = new AudioContext();
+      let osc = ctx.createOscillator();
+
+      function throwError () {
+        try {
+          osc.connect({});
+        } catch (e) {
+          return {
+            lineNumber: e.lineNumber,
+            fileName: e.fileName,
+            columnNumber: e.columnNumber,
+            message: e.message,
+            instanceof: e instanceof TypeError,
+            stringified: e.toString(),
+            name: e.name
+          }
+        }
+      }
+
+      function throwDOMException () {
+        try {
+          osc.frequency.setValueAtTime(0, -1);
+        } catch (e) {
+          return {
+            lineNumber: e.lineNumber,
+            columnNumber: e.columnNumber,
+            filename: e.filename,
+            message: e.message,
+            code: e.code,
+            result: e.result,
+            instanceof: e instanceof DOMException,
+            stringified: e.toString(),
+            name: e.name
+          }
+        }
+      }
+
+
+    </script>
+  </body>
+
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/test/head.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/test/head.js	2015-02-28 15:03:02.000000000 +0000
@@ -16,10 +16,13 @@
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
+let { generateUUID } = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
 
 let { WebAudioFront } = devtools.require("devtools/server/actors/webaudio");
 let TargetFactory = devtools.TargetFactory;
+let mm = null;
 
+const FRAME_SCRIPT_UTILS_URL = "chrome://browser/content/devtools/frame-script-utils.js";
 const EXAMPLE_URL = "http://example.com/browser/browser/devtools/webaudioeditor/test/";
 const SIMPLE_CONTEXT_URL = EXAMPLE_URL + "doc_simple-context.html";
 const COMPLEX_CONTEXT_URL = EXAMPLE_URL + "doc_complex-context.html";
@@ -47,6 +50,15 @@
   Cu.forceGC();
 });
 
+/**
+ * Call manually in tests that use frame script utils after initializing
+ * the web audio editor. Call after init but before navigating to a different page.
+ */
+function loadFrameScripts () {
+  mm = gBrowser.selectedBrowser.messageManager;
+  mm.loadFrameScript(FRAME_SCRIPT_UTILS_URL, false);
+}
+
 function addTab(aUrl, aWindow) {
   info("Adding tab: " + aUrl);
 
@@ -98,6 +110,7 @@
     if ((add in aTarget) && (remove in aTarget)) {
       aTarget[add](aEventName, function onEvent(...aArgs) {
         aTarget[remove](aEventName, onEvent, aUseCapture);
+        info("Got event: '" + aEventName + "' on " + aTarget + ".");
         deferred.resolve(...aArgs);
       }, aUseCapture);
       break;
@@ -340,13 +353,15 @@
 
 /**
  * Clicks a graph node based on actorID or passing in an element.
- * Returns a promise that resolves once
- * UI_INSPECTOR_NODE_SET is fired.
+ * Returns a promise that resolves once UI_INSPECTOR_NODE_SET is fired and
+ * the tabs have rendered, completing all RDP requests for the node.
  */
 function clickGraphNode (panelWin, el, waitForToggle = false) {
   let { promise, resolve } = Promise.defer();
   let promises = [
-   once(panelWin, panelWin.EVENTS.UI_INSPECTOR_NODE_SET)
+   once(panelWin, panelWin.EVENTS.UI_INSPECTOR_NODE_SET),
+   once(panelWin, panelWin.EVENTS.UI_PROPERTIES_TAB_RENDERED),
+   once(panelWin, panelWin.EVENTS.UI_AUTOMATION_TAB_RENDERED)
   ];
 
   if (waitForToggle) {
@@ -441,6 +456,33 @@
 }
 
 /**
+ * Takes a string `script` and evaluates it directly in the content
+ * in potentially a different process.
+ */
+function evalInDebuggee (script) {
+  let deferred = Promise.defer();
+
+  if (!mm) {
+    throw new Error("`loadFrameScripts()` must be called when using MessageManager.");
+  }
+
+  let id = generateUUID().toString();
+  mm.sendAsyncMessage("devtools:test:eval", { script: script, id: id });
+  mm.addMessageListener("devtools:test:eval:response", handler);
+
+  function handler ({ data }) {
+    if (id !== data.id) {
+      return;
+    }
+
+    mm.removeMessageListener("devtools:test:eval:response", handler);
+    deferred.resolve(data.value);
+  }
+
+  return deferred.promise;
+}
+
+/**
  * List of audio node properties to test against expectations of the AudioNode actor
  */
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/views/inspector.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/views/inspector.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/views/inspector.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/views/inspector.js	2015-02-28 15:03:02.000000000 +0000
@@ -3,9 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-// Store width as a preference rather than hardcode
-// TODO bug 1009056
-const INSPECTOR_WIDTH = 300;
+const MIN_INSPECTOR_WIDTH = 300;
 
 // Strings for rendering
 const EXPAND_INSPECTOR_STRING = L10N.getStr("expandInspector");
@@ -32,7 +30,7 @@
     // Set up view controller
     this.el = $("#web-audio-inspector");
     this.splitter = $("#inspector-splitter");
-    this.el.setAttribute("width", INSPECTOR_WIDTH);
+    this.el.setAttribute("width", Services.prefs.getIntPref("devtools.webaudioeditor.inspectorWidth"));
     this.button = $("#inspector-pane-toggle");
     mixin(this, ToggleMixin);
     this.bindToggle();
@@ -149,6 +147,10 @@
   },
 
   _onResize: function () {
+    if (this.el.getAttribute("width") < MIN_INSPECTOR_WIDTH) {
+      this.el.setAttribute("width", MIN_INSPECTOR_WIDTH);
+    }
+    Services.prefs.setIntPref("devtools.webaudioeditor.inspectorWidth", this.el.getAttribute("width"));
     window.emit(EVENTS.UI_INSPECTOR_RESIZE);
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/webaudioeditor.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/webaudioeditor.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webaudioeditor/webaudioeditor.xul	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webaudioeditor/webaudioeditor.xul	2015-02-28 15:03:02.000000000 +0000
@@ -96,8 +96,10 @@
               <tabs>
                 <tab id="properties-tab"
                      label="&webAudioEditorUI.tab.properties2;"/>
+                <!-- bug 1134036
                 <tab id="automation-tab"
                      label="&webAudioEditorUI.tab.automation;"/>
+                -->
               </tabs>
               <tabpanels flex="1">
                 <!-- Properties Panel -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/hudservice.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/hudservice.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/hudservice.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/hudservice.js	2015-02-28 15:03:02.000000000 +0000
@@ -252,6 +252,21 @@
   },
 
   /**
+   * Opens or focuses the Browser Console.
+   */
+  openBrowserConsoleOrFocus: function HS_openBrowserConsoleOrFocus()
+  {
+    let hud = this.getBrowserConsole();
+    if (hud) {
+      hud.iframeWindow.focus();
+      return promise.resolve(hud);
+    }
+    else {
+      return this.toggleBrowserConsole();
+    }
+  },
+
+  /**
    * Get the Browser Console instance, if open.
    *
    * @return object|null
@@ -763,7 +778,8 @@
 (() => {
   let methods = ["openWebConsole", "openBrowserConsole",
                  "toggleBrowserConsole", "getOpenWebConsole",
-                 "getBrowserConsole", "getHudByWindow", "getHudReferenceById"];
+                 "getBrowserConsole", "getHudByWindow",
+                 "openBrowserConsoleOrFocus", "getHudReferenceById"];
   for (let method of methods) {
     exports[method] = HUDService[method].bind(HUDService);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_console_history_persist.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_console_history_persist.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_console_history_persist.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_console_history_persist.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,96 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Test that console command input is persisted across toolbox loads.
+// See Bug 943306.
+
+"use strict";
+
+const TEST_URI = "data:text/html;charset=utf-8,Web Console test for persisting history - bug 943306";
+const INPUT_HISTORY_COUNT = 10;
+
+let test = asyncTest(function* () {
+  info ("Setting custom input history pref to " + INPUT_HISTORY_COUNT);
+  Services.prefs.setIntPref("devtools.webconsole.inputHistoryCount", INPUT_HISTORY_COUNT);
+
+  // First tab: run a bunch of commands and then make sure that you can
+  // navigate through their history.
+  yield loadTab(TEST_URI);
+  let hud1 = yield openConsole();
+  is (JSON.stringify(hud1.jsterm.history), "[]", "No history on first tab initially");
+  yield populateInputHistory(hud1);
+  is (JSON.stringify(hud1.jsterm.history), '["0","1","2","3","4","5","6","7","8","9"]',
+    "First tab has populated history");
+
+  // Second tab: Just make sure that you can navigate through the history
+  // generated by the first tab.
+  yield loadTab(TEST_URI);
+  let hud2 = yield openConsole();
+  is (JSON.stringify(hud2.jsterm.history), '["0","1","2","3","4","5","6","7","8","9"]',
+    "Second tab has populated history");
+  yield testNaviatingHistoryInUI(hud2);
+  is (JSON.stringify(hud2.jsterm.history), '["0","1","2","3","4","5","6","7","8","9",""]',
+    "An empty entry has been added in the second tab due to history perusal");
+
+  // Third tab: Should have the same history as first tab, but if we run a
+  // command, then the history of the first and second shouldn't be affected
+  yield loadTab(TEST_URI);
+  let hud3 = yield openConsole();
+  is (JSON.stringify(hud3.jsterm.history), '["0","1","2","3","4","5","6","7","8","9"]',
+    "Third tab has populated history");
+
+  // Set input value separately from execute so UP arrow accurately navigates history.
+  hud3.jsterm.setInputValue('"hello from third tab"');
+  hud3.jsterm.execute();
+
+  is (JSON.stringify(hud1.jsterm.history), '["0","1","2","3","4","5","6","7","8","9"]',
+    "First tab history hasn't changed due to command in third tab");
+  is (JSON.stringify(hud2.jsterm.history), '["0","1","2","3","4","5","6","7","8","9",""]',
+    "Second tab history hasn't changed due to command in third tab");
+  is (JSON.stringify(hud3.jsterm.history), '["1","2","3","4","5","6","7","8","9","\\"hello from third tab\\""]',
+    "Third tab has updated history (and purged the first result) after running a command");
+
+  // Fourth tab: Should have the latest command from the third tab, followed
+  // by the rest of the history from the first tab.
+  yield loadTab(TEST_URI);
+  let hud4 = yield openConsole();
+  is (JSON.stringify(hud4.jsterm.history), '["1","2","3","4","5","6","7","8","9","\\"hello from third tab\\""]',
+    "Fourth tab has most recent history");
+
+  info ("Clearing custom input history pref");
+  Services.prefs.clearUserPref("devtools.webconsole.inputHistoryCount");
+});
+
+/**
+ * Populate the history by running the following commands:
+ *  [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+ */
+function* populateInputHistory(hud) {
+  let jsterm = hud.jsterm;
+  let {inputNode} = jsterm;
+
+  for (let i = 0; i < INPUT_HISTORY_COUNT; i++) {
+    // Set input value separately from execute so UP arrow accurately navigates history.
+    jsterm.setInputValue(i);
+    jsterm.execute();
+  }
+}
+
+/**
+ * Check pressing up results in history traversal like:
+ *  [9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
+ */
+function* testNaviatingHistoryInUI(hud) {
+  let jsterm = hud.jsterm;
+  let {inputNode} = jsterm;
+  inputNode.focus();
+
+  // Count backwards from original input and make sure that pressing up
+  // restores this.
+  for (let i = INPUT_HISTORY_COUNT - 1; i >= 0; i--) {
+    EventUtils.synthesizeKey("VK_UP", {});
+    is(inputNode.value, i, "Pressing up restores last input");
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_console_open_or_focus.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_console_open_or_focus.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_console_open_or_focus.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_console_open_or_focus.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Test that the "browser console" menu item opens or focuses (if already open)
+// the console window instead of toggling it open/close.
+
+
+"use strict";
+
+let test = asyncTest(function* () {
+  let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                   .getService(Components.interfaces.nsIWindowMediator);
+  let currWindow, hud, mainWindow;
+
+  mainWindow = Services.wm.getMostRecentWindow(null);
+
+  yield HUDService.openBrowserConsoleOrFocus();
+
+  hud = HUDService.getBrowserConsole();
+
+  console.log("testmessage");
+  yield waitForMessages({
+    webconsole: hud,
+    messages: [{
+      text: "testmessage"
+    }],
+  });
+
+  currWindow = Services.wm.getMostRecentWindow(null);
+  is(currWindow.document.documentURI, devtools.Tools.webConsole.url,
+     "The Browser Console is open and has focus");
+
+  mainWindow.focus();
+
+  yield HUDService.openBrowserConsoleOrFocus();
+
+  currWindow = Services.wm.getMostRecentWindow(null);
+  is(currWindow.document.documentURI, devtools.Tools.webConsole.url,
+     "The Browser Console is open and has focus");
+
+  yield HUDService.toggleBrowserConsole();
+
+  hud = HUDService.getBrowserConsole();
+  ok(!hud, "Browser Console has been closed");
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser.ini	2015-02-28 15:03:02.000000000 +0000
@@ -354,6 +354,7 @@
 skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s
 [browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js]
 [browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js]
+[browser_console_history_persist.js]
 [browser_webconsole_output_01.js]
 skip-if = e10s # Bug 1042253 - webconsole e10s tests
 [browser_webconsole_output_02.js]
@@ -377,3 +378,4 @@
 [browser_webconsole_console_custom_styles.js]
 [browser_webconsole_console_api_stackframe.js]
 [browser_webconsole_column_numbers.js]
+[browser_console_open_or_focus.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_allow_mixedcontent_securityerrors.js	2015-02-28 15:03:02.000000000 +0000
@@ -39,7 +39,7 @@
     ],
   });
 
-  testClickOpenNewTab(hud, results);
+  yield testClickOpenNewTab(hud, results);
 });
 
 function pushPrefEnv()
@@ -57,18 +57,5 @@
   let warningNode = results[0].clickableElements[0];
   ok(warningNode, "link element");
   ok(warningNode.classList.contains("learn-more-link"), "link class name");
-
-  // Invoke the click event and check if a new tab would open to the correct page.
-  let linkOpened = false;
-  let oldOpenUILinkIn = window.openUILinkIn;
-  window.openUILinkIn = function(aLink) {
-    if (aLink == LEARN_MORE_URI) {
-      linkOpened = true;
-    }
-  }
-
-  EventUtils.synthesizeMouse(warningNode, 2, 2, {},
-                             warningNode.ownerDocument.defaultView);
-  ok(linkOpened, "Clicking the Learn More Warning node opens the desired page");
-  window.openUILinkIn = oldOpenUILinkIn;
+  return simulateMessageLinkClick(warningNode, LEARN_MORE_URI);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js	2015-02-28 15:03:02.000000000 +0000
@@ -43,11 +43,11 @@
     ],
   });
 
-  testClickOpenNewTab(hud, results[0]);
+  yield testClickOpenNewTab(hud, results[0]);
 
   let results2 = yield mixedContentOverrideTest2(hud, browser);
 
-  testClickOpenNewTab(hud, results2[0]);
+  yield testClickOpenNewTab(hud, results2[0]);
 });
 
 function pushPrefEnv()
@@ -118,19 +118,5 @@
   let warningNode = match.clickableElements[0];
   ok(warningNode, "link element");
   ok(warningNode.classList.contains("learn-more-link"), "link class name");
-
-  // Invoke the click event and check if a new tab would
-  // open to the correct page.
-  let linkOpened = false;
-  let oldOpenUILinkIn = window.openUILinkIn;
-  window.openUILinkIn = function(aLink) {
-    if (aLink == LEARN_MORE_URI) {
-      linkOpened = true;
-    }
-  }
-
-  EventUtils.synthesizeMouse(warningNode, 2, 2, {},
-                             warningNode.ownerDocument.defaultView);
-  ok(linkOpened, "Clicking the Learn More Warning node opens the desired page");
-  window.openUILinkIn = oldOpenUILinkIn;
+  return simulateMessageLinkClick(warningNode, LEARN_MORE_URI);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_597136_network_requests_from_chrome.js	2015-02-28 15:03:02.000000000 +0000
@@ -11,7 +11,8 @@
     QueryInterface: XPCOMUtils.generateQI([ Ci.nsIObserver ]),
     observe: function(aSubject, aTopic, aData) {
         if (aSubject instanceof Ci.nsIScriptError &&
-                aSubject.category === "XPConnect JavaScript") {
+            aSubject.category === "XPConnect JavaScript" &&
+            aSubject.sourceName.contains("webconsole")) {
             good = false;
         }
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js	2015-02-28 15:03:02.000000000 +0000
@@ -1,13 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-///////////////////
-//
-// Whitelisting this test.
-// As part of bug 1077403, the leaking uncaught rejection should be fixed. 
-//
-thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Connection closed");
-
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-bug-632275-getters.html";
 
 let getterValue = null;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js	2015-02-28 15:03:02.000000000 +0000
@@ -12,6 +12,7 @@
 
 const TEST_URI = "data:text/html;charset=utf8,Web Console mixed content test";
 const TEST_HTTPS_URI = "https://example.com/browser/browser/devtools/webconsole/test/test-bug-737873-mixedcontent.html";
+const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Security/MixedContent";
 
 let test = asyncTest(function* () {
   Services.prefs.setBoolPref("security.mixed_content.block_display_content", false);
@@ -27,45 +28,33 @@
   Services.prefs.clearUserPref("security.mixed_content.block_active_content");
 });
 
-function testMixedContent(hud) {
+let testMixedContent = Task.async(function*(hud) {
   content.location = TEST_HTTPS_URI;
 
-  return waitForMessages({
+  let results = yield waitForMessages({
     webconsole: hud,
     messages: [{
       text: "example.com",
       category: CATEGORY_NETWORK,
       severity: SEVERITY_WARNING,
     }],
-  }).then((results) => {
-    let msg = [...results[0].matched][0];
-    ok(msg, "page load logged");
-    ok(msg.classList.contains("mixed-content"), ".mixed-content element");
-
-    let link = msg.querySelector(".learn-more-link");
-    ok(link, "mixed content link element");
-    is(link.textContent, "[Mixed Content]", "link text is accurate");
-
-    let oldOpenLink = hud.openLink;
-    let linkOpened = false;
-    hud.openLink = (url) => {
-      is(url, "https://developer.mozilla.org/docs/Security/MixedContent",
-         "url opened");
-      linkOpened = true;
-    };
+  });
 
-    EventUtils.synthesizeMouse(link, 2, 2, {}, link.ownerDocument.defaultView);
+  let msg = [...results[0].matched][0];
+  ok(msg, "page load logged");
+  ok(msg.classList.contains("mixed-content"), ".mixed-content element");
 
-    ok(linkOpened, "clicking the Mixed Content link opened a page");
+  let link = msg.querySelector(".learn-more-link");
+  ok(link, "mixed content link element");
+  is(link.textContent, "[Mixed Content]", "link text is accurate");
 
-    hud.openLink = oldOpenLink;
+  yield simulateMessageLinkClick(link, LEARN_MORE_URI);
 
-    ok(!msg.classList.contains("filtered-by-type"), "message is not filtered");
+  ok(!msg.classList.contains("filtered-by-type"), "message is not filtered");
 
-    hud.setFilterState("netwarn", false);
+  hud.setFilterState("netwarn", false);
 
-    ok(msg.classList.contains("filtered-by-type"), "message is filtered");
+  ok(msg.classList.contains("filtered-by-type"), "message is filtered");
 
-    hud.setFilterState("netwarn", true);
-  });
-}
+  hud.setFilterState("netwarn", true);
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js	2015-02-28 15:03:02.000000000 +0000
@@ -40,26 +40,12 @@
     ],
   });
 
-  testClickOpenNewTab(hud, result);
+  yield testClickOpenNewTab(hud, result);
 });
 
 function testClickOpenNewTab(hud, [result]) {
   let msg = [...result.matched][0];
   let warningNode = msg.querySelector(".learn-more-link");
   ok(warningNode, "learn more link");
-
-  // Invoke the click event and check if a new tab would open to the correct
-  // page
-  let linkOpened = false;
-  let oldOpenUILinkIn = window.openUILinkIn;
-  window.openUILinkIn = function(aLink) {
-    if (aLink == INSECURE_PASSWORDS_URI) {
-      linkOpened = true;
-    }
-  }
-
-  EventUtils.synthesizeMouse(warningNode, 2, 2, {},
-                             warningNode.ownerDocument.defaultView);
-  ok(linkOpened, "Clicking the Insecure Passwords Warning node opens the desired page");
-  window.openUILinkIn = oldOpenUILinkIn;
+  return simulateMessageLinkClick(warningNode, INSECURE_PASSWORDS_URI);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_846918_hsts_invalid-headers.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_846918_hsts_invalid-headers.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_846918_hsts_invalid-headers.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_bug_846918_hsts_invalid-headers.js	2015-02-28 15:03:02.000000000 +0000
@@ -6,45 +6,30 @@
 const HSTS_INVALID_HEADER_MSG = "The site specified an invalid Strict-Transport-Security header.";
 const LEARN_MORE_URI = "https://developer.mozilla.org/docs/Security/HTTP_Strict_Transport_Security";
 
-function test()
-{
-  loadTab(TEST_URI).then(() => {
-    openConsole().then((hud) => {
-      waitForMessages({
-        webconsole: hud,
-        messages: [
-          {
-            name: "Invalid HSTS header error displayed successfully",
-            text: HSTS_INVALID_HEADER_MSG,
-            category: CATEGORY_SECURITY,
-            severity: SEVERITY_WARNING,
-            objects: true,
-          },
-        ],
-      }).then((results) => testClickOpenNewTab(hud, results));
-    })
+let test = asyncTest(function* () {
+  yield loadTab(TEST_URI);
+
+  let hud = yield openConsole();
+
+  let results = yield waitForMessages({
+    webconsole: hud,
+    messages: [
+      {
+        name: "Invalid HSTS header error displayed successfully",
+        text: HSTS_INVALID_HEADER_MSG,
+        category: CATEGORY_SECURITY,
+        severity: SEVERITY_WARNING,
+        objects: true,
+      },
+    ],
   });
-}
+
+  yield testClickOpenNewTab(hud, results);
+});
 
 function testClickOpenNewTab(hud, results) {
   let warningNode = results[0].clickableElements[0];
   ok(warningNode, "link element");
   ok(warningNode.classList.contains("learn-more-link"), "link class name");
-
-  // Invoke the click event and check if a new tab would
-  // open to the correct page.
-  let linkOpened = false;
-  let oldOpenUILinkIn = window.openUILinkIn;
-  window.openUILinkIn = function(aLink) {
-    if (aLink == LEARN_MORE_URI) {
-      linkOpened = true;
-    }
-  }
-
-  EventUtils.synthesizeMouse(warningNode, 2, 2, {},
-                             warningNode.ownerDocument.defaultView);
-  ok(linkOpened, "Clicking the Learn More Warning node opens the desired page");
-  window.openUILinkIn = oldOpenUILinkIn;
-
-  finishTest();
+  return simulateMessageLinkClick(warningNode, LEARN_MORE_URI);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_01.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_01.js	2015-02-28 15:03:02.000000000 +0000
@@ -82,28 +82,25 @@
     output: "/foobar/",
     inspectable: true,
   },
-];
 
-if (typeof Symbol !== "undefined") {
-  inputTests.push(
-    // 9
-    {
-      input: "Symbol()",
-      output: "Symbol()"
-    },
+  // 9
+  {
+    input: "Symbol()",
+    output: "Symbol()"
+  },
 
-    // 10
-    {
-      input: "Symbol('foo')",
-      output: "Symbol(foo)"
-    },
+  // 10
+  {
+    input: "Symbol('foo')",
+    output: "Symbol(foo)"
+  },
 
-    // 11
-    {
-      input: "Symbol.iterator",
-      output: "Symbol(Symbol.iterator)"
-    });
-}
+  // 11
+  {
+    input: "Symbol.iterator",
+    output: "Symbol(Symbol.iterator)"
+  },
+];
 
 longString = initialString = null;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_06.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_06.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_06.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/browser_webconsole_output_06.js	2015-02-28 15:03:02.000000000 +0000
@@ -109,7 +109,41 @@
     inspectable: false,
     printOutput: "SHOW\nALL\nOF\nTHIS\nON\nA\nSINGLE\nLINE ONLY. ESCAPE ALL NEWLINE,SHOW\nALL\nOF\nTHIS\nON\nA\nSINGLE\nLINE ONLY. ESCAPE ALL NEWLINE,SHOW\nALL\nOF\nTHIS\nON\nA\nSINGLE\nLINE ONLY. ESCAPE ALL NEWLINE",
     variablesViewLabel: "Array[3]"
-  }
+  },
+
+  // 13
+  {
+    input: '({0: "a", 1: "b"})',
+    output: 'Object [ "a", "b" ]',
+    printOutput: "[object Object]",
+    inspectable: false,
+  },
+
+  // 14
+  {
+    input: '({0: "a", 42: "b"})',
+    output: 'Object { 0: "a", 42: "b" }',
+    printOutput: "[object Object]",
+    inspectable: false,
+  },
+
+  // 15
+  {
+    input: '({0: "a", 1: "b", 2: "c", 3: "d", 4: "e", 5: "f", 6: "g", 7: "h", 8: "i", 9: "j", 10: "k", 11: "l"})',
+    output: 'Object [ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", 2 more\u2026 ]',
+    printOutput: "[object Object]",
+    inspectable: true,
+    variablesViewLabel: "Object[12]",
+  },
+
+  // 16
+  {
+    input: '({0: "a", 1: "b", 2: "c", 3: "d", 4: "e", 5: "f", 6: "g", 7: "h", 8: "i", 9: "j", 10: "k", 11: "l", m: "n"})',
+    output: 'Object { 0: "a", 1: "b", 2: "c", 3: "d", 4: "e", 5: "f", 6: "g", 7: "h", 8: "i", 9: "j", 3 more\u2026 }',
+    printOutput: "[object Object]",
+    inspectable: true,
+    variablesViewLabel: "Object",
+  },
 ];
 
 function test() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/test/head.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/test/head.js	2015-02-28 15:03:02.000000000 +0000
@@ -13,6 +13,7 @@
 let {require, TargetFactory} = devtools;
 let {Utils: WebConsoleUtils} = require("devtools/toolkit/webconsole/utils");
 let {Messages} = require("devtools/webconsole/console-output");
+const asyncStorage = require("devtools/toolkit/shared/async-storage");
 
 // promise._reportErrors = true; // please never leave me.
 //Services.prefs.setBoolPref("devtools.debugger.log", true);
@@ -322,6 +323,9 @@
 registerCleanupFunction(function*() {
   gDevTools.testing = false;
 
+  // Remove stored console commands in between tests
+  yield asyncStorage.removeItem("webConsoleHistory");
+
   dumpConsoles();
 
   if (HUDService.getBrowserConsole()) {
@@ -1646,3 +1650,32 @@
   let item = aSources.getItemForAttachment(a => a.source.url === aURL);
   return item && item.value;
 }
+
+/**
+ * Verify that clicking on a link from a popup notification message tries to
+ * open the expected URL.
+ */
+function simulateMessageLinkClick(element, expectedLink) {
+  let deferred = promise.defer();
+
+  // Invoke the click event and check if a new tab would
+  // open to the correct page.
+  let oldOpenUILinkIn = window.openUILinkIn;
+  window.openUILinkIn = function(link) {
+    if (link == expectedLink) {
+      ok(true, "Clicking the message link opens the desired page");
+      window.openUILinkIn = oldOpenUILinkIn;
+      deferred.resolve();
+    }
+  };
+
+  let event = new MouseEvent("click", {
+    detail: 1,
+    button: 0,
+    bubbles: true,
+    cancelable: true
+  });
+  element.dispatchEvent(event);
+
+  return deferred.promise;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/webconsole.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/webconsole.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webconsole/webconsole.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webconsole/webconsole.js	2015-02-28 15:03:02.000000000 +0000
@@ -26,6 +26,8 @@
                   () => require("devtools/webconsole/console-output").ConsoleOutput);
 loader.lazyGetter(this, "Messages",
                   () => require("devtools/webconsole/console-output").Messages);
+loader.lazyGetter(this, "asyncStorage",
+                  () => require("devtools/toolkit/shared/async-storage"));
 loader.lazyImporter(this, "EnvironmentClient", "resource://gre/modules/devtools/dbg-client.jsm");
 loader.lazyImporter(this, "ObjectClient", "resource://gre/modules/devtools/dbg-client.jsm");
 loader.lazyImporter(this, "VariablesView", "resource:///modules/devtools/VariablesView.jsm");
@@ -176,6 +178,7 @@
 const PREF_CONNECTION_TIMEOUT = "devtools.debugger.remote-timeout";
 const PREF_PERSISTLOG = "devtools.webconsole.persistlog";
 const PREF_MESSAGE_TIMESTAMP = "devtools.webconsole.timestampMessages";
+const PREF_INPUT_HISTORY_COUNT = "devtools.webconsole.inputHistoryCount";
 
 /**
  * A WebConsoleFrame instance is an interactive console initialized *per target*
@@ -443,12 +446,29 @@
   /**
    * Initialize the WebConsoleFrame instance.
    * @return object
-   *         A promise object for the initialization.
+   *         A promise object that resolves once the frame is ready to use.
    */
-  init: function WCF_init()
+  init: function()
   {
     this._initUI();
-    return this._initConnection();
+    let connectionInited = this._initConnection();
+
+    // Don't reject if the history fails to load for some reason.
+    // This would be fine, the panel will just start with empty history.
+    let allReady = this.jsterm.historyLoaded.catch(() => {}).then(() => {
+      return connectionInited;
+    });
+
+    // This notification is only used in tests. Don't chain it onto
+    // the returned promise because the console panel needs to be attached
+    // to the toolbox before the web-console-created event is receieved.
+    let notifyObservers = () => {
+      let id = WebConsoleUtils.supportsString(this.hudId);
+      Services.obs.notifyObservers(id, "web-console-created", null);
+    };
+    allReady.then(notifyObservers, notifyObservers);
+
+    return allReady;
   },
 
   /**
@@ -475,9 +495,6 @@
                                         aReason.error + ": " + aReason.message);
       this.outputMessage(CATEGORY_JS, node, [aReason]);
       this._initDefer.reject(aReason);
-    }).then(() => {
-      let id = WebConsoleUtils.supportsString(this.hudId);
-      Services.obs.notifyObservers(id, "web-console-created", null);
     });
 
     return this._initDefer.promise;
@@ -3054,17 +3071,11 @@
 {
   this.hud = aWebConsoleFrame;
   this.hudId = this.hud.hudId;
+  this.inputHistoryCount = Services.prefs.getIntPref(PREF_INPUT_HISTORY_COUNT);
 
   this.lastCompletion = { value: null };
-  this.history = [];
+  this._loadHistory();
 
-  // Holds the number of entries in history. This value is incremented in
-  // this.execute().
-  this.historyIndex = 0; // incremented on this.execute()
-
-  // Holds the index of the history entry that the user is currently viewing.
-  // This is reset to this.history.length when this.execute() is invoked.
-  this.historyPlaceHolder = 0;
   this._objectActorsInVariablesViews = new Map();
 
   this._keyPress = this._keyPress.bind(this);
@@ -3080,6 +3091,38 @@
   SELECTED_FRAME: -1,
 
   /**
+   * Load the console history from previous sessions.
+   * @private
+   */
+  _loadHistory: function() {
+    this.history = [];
+    this.historyIndex = this.historyPlaceHolder = 0;
+
+    this.historyLoaded = asyncStorage.getItem("webConsoleHistory").then(value => {
+      if (Array.isArray(value)) {
+        // Since it was gotten asynchronously, there could be items already in
+        // the history.  It's not likely but stick them onto the end anyway.
+        this.history = value.concat(this.history);
+
+        // Holds the number of entries in history. This value is incremented in
+        // this.execute().
+        this.historyIndex = this.history.length;
+
+        // Holds the index of the history entry that the user is currently viewing.
+        // This is reset to this.history.length when this.execute() is invoked.
+        this.historyPlaceHolder = this.history.length;
+      }
+    }, console.error);
+  },
+
+  /**
+   * Stores the console history for future sessions.
+   */
+  storeHistory: function() {
+    asyncStorage.setItem("webConsoleHistory", this.history);
+  },
+
+  /**
    * Stores the data for the last completion.
    * @type object
    */
@@ -3388,6 +3431,12 @@
     // value that was not evaluated yet.
     this.history[this.historyIndex++] = aExecuteString;
     this.historyPlaceHolder = this.history.length;
+
+    if (this.history.length > this.inputHistoryCount) {
+      this.history.splice(0, this.history.length - this.inputHistoryCount);
+      this.historyIndex = this.historyPlaceHolder = this.history.length;
+    }
+    this.storeHistory();
     WebConsoleUtils.usageCount++;
     this.setInputValue("");
     this.clearCompletion();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/details.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/details.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/details.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/details.js	2015-02-28 15:03:02.000000000 +0000
@@ -129,6 +129,8 @@
       warningsNode.appendChild(li);
     }
   }
+
+  AppManager.update("details");
 }
 
 function showPrepackageLog() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/newapp.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/newapp.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/newapp.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/newapp.js	2015-02-28 15:03:02.000000000 +0000
@@ -153,11 +153,11 @@
     target.remove(false);
     AppProjects.addPackaged(folder).then((project) => {
       window.arguments[0].location = project.location;
-      AppManager.validateProject(project).then(() => {
+      AppManager.validateAndUpdateProject(project).then(() => {
         if (project.manifest) {
           project.manifest.name = projectName;
           AppManager.writeManifest(project).then(() => {
-            AppManager.validateProject(project).then(
+            AppManager.validateAndUpdateProject(project).then(
               () => {window.close()}, bail)
           }, bail)
         } else {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/webide.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/webide.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/webide.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/webide.js	2015-02-28 15:03:02.000000000 +0000
@@ -134,7 +134,7 @@
         AppManager.selectedProject.type != "mainProcess" &&
         AppManager.selectedProject.type != "runtimeApp" &&
         AppManager.selectedProject.type != "tab") {
-      AppManager.validateProject(AppManager.selectedProject);
+      AppManager.validateAndUpdateProject(AppManager.selectedProject);
     }
 
     // Hook to display promotional Developer Edition doorhanger. Only displayed once.
@@ -567,7 +567,7 @@
       menuindex: 1
     });
     this.projecteditor.on("onEditorSave", (editor, resource) => {
-      AppManager.validateProject(AppManager.selectedProject);
+      AppManager.validateAndUpdateProject(AppManager.selectedProject);
     });
     return this.projecteditor.loaded;
   },
@@ -667,9 +667,6 @@
       }
     }
 
-    // Validate project
-    yield AppManager.validateProject(project);
-
     // Select project
     AppManager.selectedProject = project;
   }),
@@ -1045,9 +1042,6 @@
       // Retrieve added project
       let project = AppProjects.get(ret.location);
 
-      // Validate project
-      yield AppManager.validateProject(project);
-
       // Select project
       AppManager.selectedProject = project;
 
@@ -1106,7 +1100,7 @@
           // The result of the validation process (storing names, icons, …) is not stored in
           // the IndexedDB database when App Manager v1 is used.
           // We need to run the validation again and update the name and icon of the app.
-          AppManager.validateProject(project).then(() => {
+          AppManager.validateAndUpdateProject(project).then(() => {
             panelItemNode.setAttribute("label", project.name);
             panelItemNode.setAttribute("image", project.icon);
           });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/webide.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/webide.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/content/webide.xul	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/content/webide.xul	2015-02-28 15:03:02.000000000 +0000
@@ -23,7 +23,7 @@
         fullscreenbutton="true"
         screenX="4" screenY="4"
         width="640" height="480"
-        persist="screenX screenY width height">
+        persist="screenX screenY width height sizemode">
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"></script>
   <script type="application/javascript" src="webide.js"></script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/modules/app-manager.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/modules/app-manager.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/modules/app-manager.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/modules/app-manager.js	2015-02-28 15:03:02.000000000 +0000
@@ -278,36 +278,36 @@
   },
 
   _selectedProject: null,
-  set selectedProject(value) {
+  set selectedProject(project) {
     // A regular comparison still sees a difference when equal in some cases
-    if (JSON.stringify(this._selectedProject) !==
-        JSON.stringify(value)) {
+    if (JSON.stringify(this._selectedProject) ===
+        JSON.stringify(project)) {
+      return;
+    }
 
-      let cancelled = false;
-      this.update("before-project", { cancel: () => { cancelled = true; } });
-      if (cancelled)  {
-        return;
-      }
+    let cancelled = false;
+    this.update("before-project", { cancel: () => { cancelled = true; } });
+    if (cancelled)  {
+      return;
+    }
 
-      this._selectedProject = value;
+    this._selectedProject = project;
 
-      // Clear out tab store's selected state, if any
-      this.tabStore.selectedTab = null;
+    // Clear out tab store's selected state, if any
+    this.tabStore.selectedTab = null;
 
-      if (this.selectedProject) {
-        if (this.selectedProject.type == "packaged" ||
-            this.selectedProject.type == "hosted") {
-          this.validateProject(this.selectedProject);
-        }
-        if (this.selectedProject.type == "tab") {
-          this.tabStore.selectedTab = this.selectedProject.app;
-        }
+    if (project) {
+      if (project.type == "packaged" ||
+          project.type == "hosted") {
+        this.validateAndUpdateProject(project);
+      }
+      if (project.type == "tab") {
+        this.tabStore.selectedTab = project.app;
       }
-
-      this.update("project");
-
-      this.checkIfProjectIsRunning();
     }
+
+    this.update("project");
+    this.checkIfProjectIsRunning();
   },
   get selectedProject() {
     return this._selectedProject;
@@ -323,6 +323,19 @@
     return AppProjects.remove(location);
   },
 
+  packageProject: Task.async(function*(project) {
+    if (!project) {
+      return;
+    }
+    if (project.type == "packaged" ||
+        project.type == "hosted") {
+      yield ProjectBuilding.build({
+        project: project,
+        logger: this.update.bind(this, "pre-package")
+      });
+    }
+  }),
+
   _selectedRuntime: null,
   set selectedRuntime(value) {
     this._selectedRuntime = value;
@@ -481,12 +494,9 @@
     return Task.spawn(function* () {
       let self = AppManager;
 
-      let packageDir = yield ProjectBuilding.build({
-        project: project,
-        logger: self.update.bind(self, "pre-package")
-      });
-
-      yield self.validateProject(project);
+      // Package and validate project
+      yield self.packageProject(project);
+      yield self.validateAndUpdateProject(project);
 
       if (project.errorsCount > 0) {
         self.reportError("error_cantInstallValidationErrors");
@@ -501,7 +511,7 @@
 
       let response;
       if (project.type == "packaged") {
-        packageDir = packageDir || project.location;
+        let packageDir = yield ProjectBuilding.getPackageDir(project);
         console.log("Installing app from " + packageDir);
 
         response = yield self._appsFront.installPackaged(packageDir,
@@ -557,14 +567,20 @@
 
   /* PROJECT VALIDATION */
 
-  validateProject: function(project) {
+  validateAndUpdateProject: function(project) {
     if (!project) {
       return promise.reject();
     }
 
     return Task.spawn(function* () {
 
-      let validation = new AppValidator(project);
+      let packageDir = yield ProjectBuilding.getPackageDir(project);
+      let validation = new AppValidator({
+        type: project.type,
+        // Build process may place the manifest in a non-root directory
+        location: packageDir
+      });
+
       yield validation.validate();
 
       if (validation.manifest) {
@@ -584,7 +600,7 @@
             let origin = Services.io.newURI(manifestURL.prePath, null, null);
             project.icon = Services.io.newURI(iconPath, null, origin).spec;
           } else if (project.type == "packaged") {
-            let projectFolder = FileUtils.File(project.location);
+            let projectFolder = FileUtils.File(packageDir);
             let folderURI = Services.io.newFileURI(projectFolder).spec;
             project.icon = folderURI + iconPath.replace(/^\/|\\/, "");
           }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/modules/build.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/modules/build.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/modules/build.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/modules/build.js	2015-02-28 15:03:02.000000000 +0000
@@ -14,10 +14,10 @@
     let manifestPath = OS.Path.join(project.location, "package.json");
     let exists = yield OS.File.exists(manifestPath);
     if (!exists) {
-      return;
+      // No explicit manifest, try to generate one if possible
+      return this.generatePackageManifest(project);
     }
 
-    let Decoder = new TextDecoder();
     let data = yield OS.File.read(manifestPath);
     data = new TextDecoder().decode(data);
     let manifest;
@@ -30,6 +30,31 @@
     return manifest;
   }),
 
+  /**
+   * For common frameworks in the community, attempt to detect the build
+   * settings if none are defined.  This makes it much easier to get started
+   * with WebIDE.  Later on, perhaps an add-on could define such things for
+   * different frameworks.
+   */
+  generatePackageManifest: Task.async(function*(project) {
+    // Cordova
+    let cordovaConfigPath = OS.Path.join(project.location, "config.xml");
+    let exists = yield OS.File.exists(cordovaConfigPath);
+    if (!exists) {
+      return;
+    }
+    let data = yield OS.File.read(cordovaConfigPath);
+    data = new TextDecoder().decode(data);
+    if (data.contains("cordova.apache.org")) {
+      return {
+        "webide": {
+          "prepackage": "cordova prepare",
+          "packageDir": "./platforms/firefoxos/www"
+        }
+      };
+    }
+  }),
+
   hasPrepackage: Task.async(function* (project) {
     let manifest = yield ProjectBuilding.fetchPackageManifest(project);
     return manifest && manifest.webide && "prepackage" in manifest.webide;
@@ -37,22 +62,19 @@
 
   // If the app depends on some build step, run it before pushing the app
   build: Task.async(function* ({ project, logger }) {
-    if (!this.hasPrepackage(project)) {
+    if (!(yield this.hasPrepackage(project))) {
       return;
     }
 
     let manifest = yield ProjectBuilding.fetchPackageManifest(project);
 
     logger("start");
-    let packageDir;
     try {
-      packageDir = yield this._build(project, manifest, logger);
+      yield this._build(project, manifest, logger);
       logger("succeed");
     } catch(e) {
       logger("failed", e);
     }
-
-    return packageDir;
   }),
 
   _build: Task.async(function* (project, manifest, logger) {
@@ -61,6 +83,15 @@
 
     let command, cwd, args = [], env = [];
 
+    // Copy frequently used env vars
+    let envService = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
+    ["HOME", "PATH"].forEach(key => {
+      let value = envService.get(key);
+      if (value) {
+        env.push(key + "=" + value);
+      }
+    });
+
     if (typeof(manifest.prepackage) === "string") {
       command = manifest.prepackage.replace(/%project%/g, project.location);
     } else if (manifest.prepackage.command) {
@@ -69,16 +100,9 @@
       args = manifest.prepackage.args || [];
       args = args.map(a => a.replace(/%project%/g, project.location));
 
-      env = manifest.prepackage.env || [];
+      env = env.concat(manifest.prepackage.env || []);
       env = env.map(a => a.replace(/%project%/g, project.location));
 
-      // Gaia build system crashes if HOME env variable isn't set...
-      let envService = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-      let home = envService.get("HOME");
-      if (home) {
-        env.push("HOME=" + home);
-      }
-
       if (manifest.prepackage.cwd) {
         // Normalize path for Windows support (converts / to \)
         let path = OS.Path.normalize(manifest.prepackage.cwd);
@@ -110,7 +134,6 @@
     // Otherwise, on Linux and Mac, SHELL env variable should refer to
     // the user chosen shell program.
     // (We do not check for OS, as on windows, with cygwin, ComSpec isn't set)
-    let envService = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
     let shell = envService.get("ComSpec") || envService.get("SHELL");
     args.unshift(command);
 
@@ -155,17 +178,22 @@
       throw new Error("Unable to run pre-package command '" + command + "' " +
                       args.join(" ") + ":\n" + (e.message || e));
     }
+  }),
 
-    if (manifest.packageDir) {
-      let packageDir = OS.Path.join(project.location, manifest.packageDir);
-      // On Windows, replace / by \\
-      packageDir = OS.Path.normalize(packageDir);
-      let exists = yield OS.File.exists(packageDir);
-      if (exists) {
-        return packageDir;
-      }
-      throw new Error("Unable to resolve application package directory: '" + manifest.packageDir + "'");
+  getPackageDir: Task.async(function*(project) {
+    let manifest = yield ProjectBuilding.fetchPackageManifest(project);
+    if (!manifest || !manifest.webide || !manifest.webide.packageDir) {
+      return project.location;
     }
-  }),
-};
+    manifest = manifest.webide;
 
+    let packageDir = OS.Path.join(project.location, manifest.packageDir);
+    // On Windows, replace / by \\
+    packageDir = OS.Path.normalize(packageDir);
+    let exists = yield OS.File.exists(packageDir);
+    if (exists) {
+      return packageDir;
+    }
+    throw new Error("Unable to resolve application package directory: '" + manifest.packageDir + "'");
+  })
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/head.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/head.js	2015-02-28 15:03:02.000000000 +0000
@@ -103,8 +103,10 @@
 }
 
 function waitForUpdate(win, update) {
+  info("Wait: " + update);
   let deferred = promise.defer();
   win.AppManager.on("app-manager-update", function onUpdate(e, what) {
+    info("Got: " + what);
     if (what !== update) {
       return;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_build.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_build.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_build.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_build.html	2015-02-28 15:03:02.000000000 +0000
@@ -26,7 +26,7 @@
             let AppManager = win.AppManager;
 
             function isProjectMarkedAsValid() {
-              let details = win.UI.projecteditor.window.frames[0];
+              let details = win.frames[0];
               return !details.document.body.classList.contains("error");
             }
 
@@ -40,13 +40,10 @@
             let packagedAppLocation = getTestFilePath("build_app" + testSuffix + "1");
 
             yield win.Cmds.importPackagedApp(packagedAppLocation);
+            yield waitForUpdate(win, "details");
 
             let project = win.AppManager.selectedProject;
 
-            let deferred = promise.defer();
-            win.UI.projecteditor.once("onEditorCreated", deferred.resolve);
-            yield deferred.promise;
-
             ok(!project.manifest, "manifest includes name");
             is(project.name, "--", "Display name uses manifest name");
 
@@ -55,18 +52,19 @@
               loggedMessages.push(msg);
             }
 
-            let packageDir = yield ProjectBuilding.build({
+            yield ProjectBuilding.build({
               project,
               logger
             });
-            ok(!packageDir, "no custom packagedir");
+            let packageDir = yield ProjectBuilding.getPackageDir(project);
+            is(packageDir, packagedAppLocation, "no custom packagedir");
             is(loggedMessages[0], "start", "log messages are correct");
             ok(loggedMessages[1].indexOf("Running pre-package hook") != -1, "log messages are correct");
             is(loggedMessages[2], "Terminated with error code: 0", "log messages are correct");
             is(loggedMessages[3], "succeed", "log messages are correct");
 
             // Trigger validation
-            yield AppManager.validateProject(AppManager.selectedProject);
+            yield AppManager.validateAndUpdateProject(AppManager.selectedProject);
             yield nextTick();
 
             ok("name" in project.manifest, "manifest includes name");
@@ -79,14 +77,16 @@
             packagedAppLocation = getTestFilePath("build_app" + testSuffix + "2");
 
             yield win.Cmds.importPackagedApp(packagedAppLocation);
+            yield waitForUpdate(win, "project-validated");
 
             project = win.AppManager.selectedProject;
 
             loggedMessages = [];
-            packageDir = yield ProjectBuilding.build({
+            yield ProjectBuilding.build({
               project,
               logger
             });
+            packageDir = yield ProjectBuilding.getPackageDir(project);
             is(OS.Path.normalize(packageDir),
                OS.Path.join(packagedAppLocation, "stage"), "custom packagedir");
             is(loggedMessages[0], "start", "log messages are correct");
@@ -96,6 +96,7 @@
 
             // Switch to the package dir in order to verify the generated webapp.manifest
             yield win.Cmds.importPackagedApp(packageDir);
+            yield waitForUpdate(win, "project-validated");
 
             project = win.AppManager.selectedProject;
 
@@ -115,5 +116,3 @@
     </script>
   </body>
 </html>
-
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_duplicate_import.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_duplicate_import.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_duplicate_import.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_duplicate_import.html	2015-02-28 15:03:02.000000000 +0000
@@ -28,14 +28,17 @@
 
           info("to call importPackagedApp(" + packagedAppLocation + ")");
           yield win.Cmds.importPackagedApp(packagedAppLocation);
+          yield waitForUpdate(win, "project-validated");
           yield nextTick();
 
           info("to call importHostedApp(" + hostedAppManifest + ")");
           yield win.Cmds.importHostedApp(hostedAppManifest);
+          yield waitForUpdate(win, "project-validated");
           yield nextTick();
 
           info("to call importPackagedApp(" + packagedAppLocation + ") again");
           yield win.Cmds.importPackagedApp(packagedAppLocation);
+          yield waitForUpdate(win, "project-validated");
 
           let project = win.AppManager.selectedProject;
           is(project.location, packagedAppLocation, "Correctly reselected existing packaged app.");
@@ -43,6 +46,7 @@
 
           info("to call importHostedApp(" + hostedAppManifest + ") again");
           yield win.Cmds.importHostedApp(hostedAppManifest);
+          yield waitForUpdate(win, "project-validated");
           project = win.AppManager.selectedProject;
           is(project.location, hostedAppManifest, "Correctly reselected existing hosted app.");
           yield nextTick();
@@ -71,4 +75,3 @@
     </script>
   </body>
 </html>
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_import.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_import.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_import.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_import.html	2015-02-28 15:03:02.000000000 +0000
@@ -29,6 +29,7 @@
             ok(!win.UI._busyPromise, "UI is not busy");
 
             yield win.Cmds.importPackagedApp(packagedAppLocation);
+            yield waitForUpdate(win, "project-validated");
 
             let project = win.AppManager.selectedProject;
             is(project.location, packagedAppLocation, "Location is valid");
@@ -40,6 +41,7 @@
 
             let hostedAppManifest = TEST_BASE + "hosted_app.manifest";
             yield win.Cmds.importHostedApp(hostedAppManifest);
+            yield waitForUpdate(win, "project-validated");
 
             project = win.AppManager.selectedProject;
             is(project.location, hostedAppManifest, "Location is valid");
@@ -49,6 +51,7 @@
 
             hostedAppManifest = TEST_BASE + "/app";
             yield win.Cmds.importHostedApp(hostedAppManifest);
+            yield waitForUpdate(win, "project-validated");
 
             project = win.AppManager.selectedProject;
             ok(project.location.endsWith('manifest.webapp'), "The manifest was found and the project was updated");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_manifestUpdate.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_manifestUpdate.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_manifestUpdate.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_manifestUpdate.html	2015-02-28 15:03:02.000000000 +0000
@@ -25,20 +25,17 @@
             let AppManager = win.AppManager;
 
             function isProjectMarkedAsValid() {
-              let details = win.UI.projecteditor.window.frames[0];
+              let details = win.frames[0];
               return !details.document.body.classList.contains("error");
             }
 
             let packagedAppLocation = getTestFilePath("app");
 
             yield win.Cmds.importPackagedApp(packagedAppLocation);
+            yield waitForUpdate(win, "details");
 
             let project = win.AppManager.selectedProject;
 
-            let deferred = promise.defer();
-            win.UI.projecteditor.once("onEditorCreated", deferred.resolve);
-            yield deferred.promise;
-
             ok("name" in project.manifest, "manifest includes name");
             is(project.name, project.manifest.name, "Display name uses manifest name");
             ok(isProjectMarkedAsValid(), "project is marked as valid");
@@ -66,7 +63,7 @@
             yield OS.File.writeAtomic(manifestPath, data , {tmpPath: manifestPath + ".tmp"});
 
             // Trigger validation
-            yield AppManager.validateProject(AppManager.selectedProject);
+            yield AppManager.validateAndUpdateProject(AppManager.selectedProject);
             yield nextTick();
 
             ok(!("name" in project.manifest), "manifest has been updated");
@@ -78,7 +75,7 @@
             yield AppManager.writeManifest(project);
 
             // Trigger validation
-            yield AppManager.validateProject(AppManager.selectedProject);
+            yield AppManager.validateAndUpdateProject(AppManager.selectedProject);
             yield nextTick();
 
             ok("name" in project.manifest, "manifest includes name");
@@ -97,5 +94,3 @@
     </script>
   </body>
 </html>
-
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_runtime.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_runtime.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_runtime.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_runtime.html	2015-02-28 15:03:02.000000000 +0000
@@ -67,6 +67,7 @@
           let packagedAppLocation = getTestFilePath("app");
 
           yield win.Cmds.importPackagedApp(packagedAppLocation);
+          yield waitForUpdate(win, "project-validated");
 
           let panelNode = win.document.querySelector("#runtime-panel");
           let items = panelNode.querySelectorAll(".runtime-panel-item-usb");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_telemetry.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_telemetry.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/devtools/webide/test/test_telemetry.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/devtools/webide/test/test_telemetry.html	2015-02-28 15:03:02.000000000 +0000
@@ -113,6 +113,7 @@
         return Task.spawn(function*() {
           let packagedAppLocation = getTestFilePath("app");
           yield win.Cmds.importPackagedApp(packagedAppLocation);
+          yield waitForUpdate(win, "project-validated");
         });
       }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/experiments/test/xpcshell/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/experiments/test/xpcshell/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/experiments/test/xpcshell/head.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/experiments/test/xpcshell/head.js	2015-02-28 15:03:02.000000000 +0000
@@ -153,6 +153,15 @@
   startupManager();
 }
 
+// Starts the addon manager without creating app info. We can't directly use
+// |loadAddonManager| defined above in test_conditions.js as it would make the test fail.
+function startAddonManagerOnly() {
+  let addonManager = Cc["@mozilla.org/addons/integration;1"]
+                       .getService(Ci.nsIObserver)
+                       .QueryInterface(Ci.nsITimerCallback);
+  addonManager.observe(null, "addons-startup", null);
+}
+
 function getExperimentAddons(previous=false) {
   let deferred = Promise.defer();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/experiments/test/xpcshell/test_conditions.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/experiments/test/xpcshell/test_conditions.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/experiments/test/xpcshell/test_conditions.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/experiments/test/xpcshell/test_conditions.js	2015-02-28 15:03:02.000000000 +0000
@@ -5,8 +5,14 @@
 
 
 Cu.import("resource:///modules/experiments/Experiments.jsm");
+Cu.import("resource://gre/modules/TelemetryPing.jsm", this);
 Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
 
+XPCOMUtils.defineLazyGetter(this, "gDatareportingService",
+  () => Cc["@mozilla.org/datareporting/service;1"]
+          .getService(Ci.nsISupports)
+          .wrappedJSObject);
+
 const FILE_MANIFEST            = "experiments.manifest";
 const SEC_IN_ONE_DAY = 24 * 60 * 60;
 const MS_IN_ONE_DAY  = SEC_IN_ONE_DAY * 1000;
@@ -45,6 +51,17 @@
   return entry.isApplicable();
 }
 
+function initialiseTelemetry() {
+  // Send the needed startup notifications to the datareporting service
+  // to ensure that it has been initialized.
+  if ("@mozilla.org/datareporting/service;1" in Cc) {
+    gDatareportingService.observe(null, "app-startup", null);
+    gDatareportingService.observe(null, "profile-after-change", null);
+  }
+
+  return TelemetryPing.setup().then(TelemetrySession.setup);
+}
+
 function run_test() {
   run_next_test();
 }
@@ -52,7 +69,8 @@
 add_task(function* test_setup() {
   createAppInfo();
   gProfileDir = do_get_profile();
-  yield TelemetrySession.setup();
+  startAddonManagerOnly();
+  yield initialiseTelemetry();
   gPolicy = new Experiments.Policy();
 
   gReporter = yield getReporter("json_payload_simple");
@@ -312,5 +330,5 @@
 });
 
 add_task(function* test_shutdown() {
-  yield TelemetrySession.shutdown();
+  yield TelemetrySession.shutdown(false);
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/content/build/pdf.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/content/build/pdf.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/content/build/pdf.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/content/build/pdf.js	2015-02-28 15:03:02.000000000 +0000
@@ -22,8 +22,8 @@
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.1130';
-PDFJS.build = 'e4f0ae2';
+PDFJS.version = '1.0.1149';
+PDFJS.build = 'bc7a110';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -356,6 +356,7 @@
                                      writable: false });
   return value;
 }
+PDFJS.shadow = shadow;
 
 var PasswordResponses = PDFJS.PasswordResponses = {
   NEED_PASSWORD: 1,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/content/build/pdf.worker.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/content/build/pdf.worker.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/content/build/pdf.worker.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/content/build/pdf.worker.js	2015-02-28 15:03:02.000000000 +0000
@@ -22,8 +22,8 @@
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.1130';
-PDFJS.build = 'e4f0ae2';
+PDFJS.version = '1.0.1149';
+PDFJS.build = 'bc7a110';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -356,6 +356,7 @@
                                      writable: false });
   return value;
 }
+PDFJS.shadow = shadow;
 
 var PasswordResponses = PDFJS.PasswordResponses = {
   NEED_PASSWORD: 1,
@@ -4800,7 +4801,7 @@
     data.annotationType = AnnotationType.LINK;
 
     var action = dict.get('A');
-    if (action) {
+    if (action && isDict(action)) {
       var linkType = action.get('S').name;
       if (linkType === 'URI') {
         var url = action.get('URI');
@@ -15743,6 +15744,10 @@
       }
     },
 
+    has: function(i) {
+      return this._map[i] !== undefined;
+    },
+
     get: function(i) {
       return this._map[i];
     },
@@ -15772,6 +15777,10 @@
       }
     },
 
+    has: function (i) {
+      return this.firstChar <= i && i <= this.lastChar;
+    },
+
     get: function (i) {
       if (this.firstChar <= i && i <= this.lastChar) {
         return String.fromCharCode(i);
@@ -16204,7 +16213,6 @@
     var isSymbolic = !!(properties.flags & FontFlags.Symbolic);
     var isIdentityUnicode =
       properties.toUnicode instanceof IdentityToUnicodeMap;
-    var isCidFontType2 = (properties.type === 'CIDFontType2');
     var newMap = Object.create(null);
     var toFontChar = [];
     var usedFontCharCodes = [];
@@ -16215,17 +16223,11 @@
       var fontCharCode = originalCharCode;
       // First try to map the value to a unicode position if a non identity map
       // was created.
-      if (!isIdentityUnicode) {
-        if (toUnicode.get(originalCharCode) !== undefined) {
-          var unicode = toUnicode.get(fontCharCode);
-          // TODO: Try to map ligatures to the correct spot.
-          if (unicode.length === 1) {
-            fontCharCode = unicode.charCodeAt(0);
-          }
-        } else if (isCidFontType2) {
-          // For CIDFontType2, move characters not present in toUnicode
-          // to the private use area (fixes bug 1028735 and issue 4881).
-          fontCharCode = nextAvailableFontCharCode;
+      if (!isIdentityUnicode && toUnicode.has(originalCharCode)) {
+        var unicode = toUnicode.get(fontCharCode);
+        // TODO: Try to map ligatures to the correct spot.
+        if (unicode.length === 1) {
+          fontCharCode = unicode.charCodeAt(0);
         }
       }
       // Try to move control characters, special characters and already mapped
@@ -16715,13 +16717,20 @@
           var offset = font.getInt32() >>> 0;
           var useTable = false;
 
-          if (platformId === 1 && encodingId === 0) {
+          if (platformId === 0 && encodingId === 0) {
             useTable = true;
             // Continue the loop since there still may be a higher priority
             // table.
-          } else if (!isSymbolicFont && platformId === 3 && encodingId === 1) {
+          } else if (platformId === 1 && encodingId === 0) {
             useTable = true;
-            canBreak = true;
+            // Continue the loop since there still may be a higher priority
+            // table.
+          } else if (platformId === 3 && encodingId === 1 &&
+                     (!isSymbolicFont || !potentialTable)) {
+            useTable = true;
+            if (!isSymbolicFont) {
+              canBreak = true;
+            }
           } else if (isSymbolicFont && platformId === 3 && encodingId === 0) {
             useTable = true;
             canBreak = true;
@@ -17066,6 +17075,7 @@
         var newGlyfData = new Uint8Array(oldGlyfDataLength);
         var startOffset = itemDecode(locaData, 0);
         var writeOffset = 0;
+        var missingGlyphData = {};
         itemEncode(locaData, 0, writeOffset);
         var i, j;
         for (i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
@@ -17083,6 +17093,10 @@
             continue;
           }
 
+          if (startOffset === endOffset) {
+            missingGlyphData[i] = true;
+          }
+
           var newLength = sanitizeGlyph(oldGlyfData, startOffset, endOffset,
                                         newGlyfData, writeOffset, hintsValid);
           writeOffset += newLength;
@@ -17099,7 +17113,7 @@
             itemEncode(locaData, j, simpleGlyph.length);
           }
           glyf.data = simpleGlyph;
-          return;
+          return missingGlyphData;
         }
 
         if (dupFirstEntry) {
@@ -17116,6 +17130,7 @@
         } else {
           glyf.data = newGlyfData.subarray(0, writeOffset);
         }
+        return missingGlyphData;
       }
 
       function readPostScriptTable(post, properties, maxpNumGlyphs) {
@@ -17575,11 +17590,13 @@
 
       sanitizeHead(tables.head, numGlyphs, isTrueType ? tables.loca.length : 0);
 
+      var missingGlyphs = {};
       if (isTrueType) {
         var isGlyphLocationsLong = int16(tables.head.data[50],
                                          tables.head.data[51]);
-        sanitizeGlyphLocations(tables.loca, tables.glyf, numGlyphs,
-                               isGlyphLocationsLong, hintsValid, dupFirstEntry);
+        missingGlyphs = sanitizeGlyphLocations(tables.loca, tables.glyf,
+                                               numGlyphs, isGlyphLocationsLong,
+                                               hintsValid, dupFirstEntry);
       }
 
       if (!tables.hhea) {
@@ -17601,19 +17618,33 @@
         }
       }
 
-      var charCodeToGlyphId = [], charCode;
+      var charCodeToGlyphId = [], charCode, toUnicode = properties.toUnicode;
+
+      function hasGlyph(glyphId, charCode) {
+        if (!missingGlyphs[glyphId]) {
+          return true;
+        }
+        if (charCode >= 0 && toUnicode.has(charCode)) {
+          return true;
+        }
+        return false;
+      }
+
       if (properties.type === 'CIDFontType2') {
         var cidToGidMap = properties.cidToGidMap || [];
-        var cidToGidMapLength = cidToGidMap.length;
+        var isCidToGidMapEmpty = cidToGidMap.length === 0;
+
         properties.cMap.forEach(function(charCode, cid) {
           assert(cid <= 0xffff, 'Max size of CID is 65,535');
           var glyphId = -1;
-          if (cidToGidMapLength === 0) {
+          if (isCidToGidMapEmpty) {
             glyphId = charCode;
           } else if (cidToGidMap[cid] !== undefined) {
             glyphId = cidToGidMap[cid];
           }
-          if (glyphId >= 0 && glyphId < numGlyphs) {
+
+          if (glyphId >= 0 && glyphId < numGlyphs &&
+              hasGlyph(glyphId, charCode)) {
             charCodeToGlyphId[charCode] = glyphId;
           }
         });
@@ -17673,7 +17704,8 @@
 
             var found = false;
             for (i = 0; i < cmapMappingsLength; ++i) {
-              if (cmapMappings[i].charCode === unicodeOrCharCode) {
+              if (cmapMappings[i].charCode === unicodeOrCharCode &&
+                  hasGlyph(cmapMappings[i].glyphId, unicodeOrCharCode)) {
                 charCodeToGlyphId[charCode] = cmapMappings[i].glyphId;
                 found = true;
                 break;
@@ -17683,11 +17715,17 @@
               // Try to map using the post table. There are currently no known
               // pdfs that this fixes.
               var glyphId = properties.glyphNames.indexOf(glyphName);
-              if (glyphId > 0) {
+              if (glyphId > 0 && hasGlyph(glyphId, -1)) {
                 charCodeToGlyphId[charCode] = glyphId;
               }
             }
           }
+        } else if (cmapPlatformId === 0 && cmapEncodingId === 0) {
+          // Default Unicode semantics, use the charcodes as is.
+          for (i = 0; i < cmapMappingsLength; ++i) {
+            charCodeToGlyphId[cmapMappings[i].charCode] =
+              cmapMappings[i].glyphId;
+          }
         } else {
           // For (3, 0) cmap tables:
           // The charcode key being stored in charCodeToGlyphId is the lower
@@ -32715,6 +32753,10 @@
 
       var gotEOL = false;
 
+      if (this.byteAlign) {
+        this.inputBits &= ~7;
+      }
+
       if (!this.eoblock && this.row === this.rows - 1) {
         this.eof = true;
       } else {
@@ -32738,10 +32780,6 @@
         }
       }
 
-      if (this.byteAlign && !gotEOL) {
-        this.inputBits &= ~7;
-      }
-
       if (!this.eof && this.encoding > 0) {
         this.nextLine2D = !this.lookBits(1);
         this.eatBits(1);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/content/web/viewer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/content/web/viewer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/content/web/viewer.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/content/web/viewer.js	2015-02-28 15:03:02.000000000 +0000
@@ -5481,12 +5481,8 @@
   get supportsPrinting() {
     var canvas = document.createElement('canvas');
     var value = 'mozPrintCallback' in canvas;
-    // shadow
-    Object.defineProperty(this, 'supportsPrinting', { value: value,
-                                                      enumerable: true,
-                                                      configurable: true,
-                                                      writable: false });
-    return value;
+
+    return PDFJS.shadow(this, 'supportsPrinting', value);
   },
 
   get supportsFullscreen() {
@@ -5501,50 +5497,34 @@
       support = false;
     }
 
-    Object.defineProperty(this, 'supportsFullscreen', { value: support,
-                                                        enumerable: true,
-                                                        configurable: true,
-                                                        writable: false });
-    return support;
+    return PDFJS.shadow(this, 'supportsFullscreen', support);
   },
 
   get supportsIntegratedFind() {
     var support = false;
     support = FirefoxCom.requestSync('supportsIntegratedFind');
-    Object.defineProperty(this, 'supportsIntegratedFind', { value: support,
-                                                            enumerable: true,
-                                                            configurable: true,
-                                                            writable: false });
-    return support;
+
+    return PDFJS.shadow(this, 'supportsIntegratedFind', support);
   },
 
   get supportsDocumentFonts() {
     var support = true;
     support = FirefoxCom.requestSync('supportsDocumentFonts');
-    Object.defineProperty(this, 'supportsDocumentFonts', { value: support,
-                                                           enumerable: true,
-                                                           configurable: true,
-                                                           writable: false });
-    return support;
+
+    return PDFJS.shadow(this, 'supportsDocumentFonts', support);
   },
 
   get supportsDocumentColors() {
     var support = true;
     support = FirefoxCom.requestSync('supportsDocumentColors');
-    Object.defineProperty(this, 'supportsDocumentColors', { value: support,
-                                                            enumerable: true,
-                                                            configurable: true,
-                                                            writable: false });
-    return support;
+
+    return PDFJS.shadow(this, 'supportsDocumentColors', support);
   },
 
   get loadingBar() {
     var bar = new ProgressBar('#loadingBar', {});
-    Object.defineProperty(this, 'loadingBar', { value: bar,
-                                                enumerable: true,
-                                                configurable: true,
-                                                writable: false });
-    return bar;
+
+    return PDFJS.shadow(this, 'loadingBar', bar);
   },
 
   initPassiveLoading: function pdfViewInitPassiveLoading() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/README.mozilla thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/README.mozilla
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/pdfjs/README.mozilla	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/pdfjs/README.mozilla	2015-02-28 15:03:02.000000000 +0000
@@ -1,4 +1,4 @@
 This is the pdf.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 1.0.1130
+Current extension version is: 1.0.1149
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/content.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/content.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/content.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/content.js	2015-02-28 15:03:02.000000000 +0000
@@ -46,6 +46,10 @@
   return Components.utils.cloneInto(result, content);
 }
 
+function enableDebug() {
+  sendAsyncMessage('Shumway:enableDebug', null);
+}
+
 addMessageListener('Shumway:init', function (message) {
   sendAsyncMessage('Shumway:running', {}, {
     externalInterface: externalInterfaceWrapper
@@ -55,6 +59,7 @@
   // up Xray wrappers.
   shumwayComAdapter = Components.utils.createObjectIn(content, {defineAs: 'ShumwayCom'});
   Components.utils.exportFunction(sendMessage, shumwayComAdapter, {defineAs: 'sendMessage'});
+  Components.utils.exportFunction(enableDebug, shumwayComAdapter, {defineAs: 'enableDebug'});
   Object.defineProperties(shumwayComAdapter, {
     onLoadFileCallback: { value: null, writable: true },
     onExternalCallback: { value: null, writable: true },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/pingpong.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/pingpong.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/pingpong.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/pingpong.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2015 Mozilla Foundation
+ *
+ * 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.
+ */
+
+// Simple class for synchronous XHR communication.
+// See also examples/inspector/debug/server.js.
+
+var PingPongConnection = (function () {
+  function PingPongConnection(url, onlySend) {
+    this.url = url;
+    this.onData = null;
+    this.onError = null;
+    this.currentXhr = null;
+    this.closed = false;
+
+    if (!onlySend) {
+      this.idle();
+    }
+  }
+
+  PingPongConnection.prototype = {
+    idle: function () {
+      function requestIncoming(connection) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', connection.url + '?idle', true);
+        xhr.onload = function () {
+          if (xhr.status === 204 &&
+              xhr.getResponseHeader('X-PingPong-Error') === 'timeout') {
+            requestIncoming(connection);
+            return;
+          }
+          if (xhr.status === 200) {
+            var result;
+            if (connection.onData) {
+              var response = xhr.responseText;
+              result = connection.onData(response ? JSON.parse(response) : undefined);
+            }
+            if (xhr.getResponseHeader('X-PingPong-Async') === '1') {
+              requestIncoming(connection);
+            } else {
+              sendResponse(connection, result);
+            }
+            return;
+          }
+
+          if (connection.onError) {
+            connection.onError(xhr.statusText);
+          }
+        };
+        xhr.onerror = function () {
+          if (connection.onError) {
+            connection.onError(xhr.error);
+          }
+        };
+        xhr.send();
+        connection.currentXhr = xhr;
+      }
+      function sendResponse(connection, result) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', connection.url + '?response', false);
+        xhr.onload = function () {
+          if (xhr.status !== 204) {
+            if (connection.onError) {
+              connection.onError(xhr.statusText);
+            }
+          }
+          requestIncoming(connection);
+        };
+        xhr.onerror = function () {
+          if (connection.onError) {
+            connection.onError(xhr.error);
+          }
+        };
+        xhr.send(result === undefined ? '' : JSON.stringify(result));
+        connection.currentXhr = xhr;
+      }
+      requestIncoming(this);
+    },
+    send: function (data, async, timeout) {
+      if (this.closed) {
+        throw new Error('connection closed');
+      }
+
+      async = !!async;
+      timeout |= 0;
+
+      var encoded = data === undefined ? '' : JSON.stringify(data);
+      if (async) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', this.url + '?async', true);
+        xhr.send(encoded);
+        return;
+      } else {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', this.url, false);
+        if (timeout > 0) {
+          xhr.setRequestHeader('X-PingPong-Timeout', timeout);
+        }
+        xhr.send(encoded);
+        if (xhr.status === 204 &&
+          xhr.getResponseHeader('X-PingPong-Error') === 'timeout') {
+          throw new Error('sync request timeout');
+        }
+        var response = xhr.responseText;
+        return response ? JSON.parse(response) : undefined;
+      }
+    },
+    close: function () {
+      if (this.currentXhr) {
+        this.currentXhr.abort();
+        this.currentXhr = null;
+      }
+      this.closed = true;
+    }
+  };
+
+  return PingPongConnection;
+})();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/viewerDebugger.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/viewerDebugger.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/viewerDebugger.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/viewerDebugger.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2015 Mozilla Foundation
+ *
+ * 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.
+ */
+
+Components.utils.import('resource://gre/modules/Services.jsm');
+
+var DebugUtils = (function () {
+  var baseUrl = null;
+
+  function getBaseUrl() {
+    if (baseUrl === null) {
+      try {
+        baseUrl = Services.prefs.getCharPref('shumway.debug.url');
+      } catch (e) {
+        baseUrl = 'http://localhost:8010';
+      }
+    }
+    return baseUrl;
+  }
+
+  var uniqueId = (Date.now() % 888888) * 2 + 1;
+
+  function getEnabledDebuggerId(swfUrl) {
+    return new Promise(function (resolve) {
+      var url = getBaseUrl() + '/debugController/' + uniqueId;
+      var connection = new PingPongConnection(url);
+      connection.onData = function (data) {
+        if (data.action === 'setDebugger' && data.swfUrl === swfUrl) {
+          resolve(data.debuggerId);
+        }
+      };
+      try {
+        connection.send({action: 'getDebugger', swfUrl: swfUrl, swfId: uniqueId}, true);
+      } catch (e) {
+        // ignoring failed send request
+      }
+      setTimeout(function () {
+        resolve(0);
+        connection.close();
+      }, 500);
+    });
+  }
+
+  function enableDebug(swfUrl) {
+    var url = getBaseUrl() + '/debugController/' + uniqueId;
+    var connection = new PingPongConnection(url, true);
+    try {
+      connection.send({action: 'enableDebugging', swfUrl: swfUrl}, true);
+    } catch (e) {
+      // ignoring failed send request
+    }
+    connection.close();
+  }
+
+  function createDebuggerConnection(swfUrl) {
+    return getEnabledDebuggerId(swfUrl).then(function (debuggerId) {
+      if (!debuggerId) {
+        return null;
+      }
+
+      var url = getBaseUrl() + '/debug/' + uniqueId + '/' + debuggerId;
+      console.log('Starting remote debugger with ' + url);
+      return new PingPongConnection(url);
+    });
+  }
+
+  return {
+    get isEnabled() {
+      try {
+        return Services.prefs.getBoolPref('shumway.debug.enabled');
+      } catch (e) {
+        return false;
+      }
+    },
+    enableDebug: enableDebug,
+    createDebuggerConnection: createDebuggerConnection
+  };
+})();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/viewer.wrapper.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/viewer.wrapper.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/viewer.wrapper.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/viewer.wrapper.html	2015-02-28 15:03:02.000000000 +0000
@@ -36,11 +36,23 @@
       line-height: 0;
       border: 0px none;
     }
+
+    body.remoteStopped {
+      background-color: red;
+    }
+    body.remoteDebug {
+      background-color: green;
+    }
+    body.remoteReload {
+      background-color: yellow;
+    }
   </style>
 </head>
 
 <body>
   <iframe id="viewer" src="resource://shumway/web/viewer.html" width="100%" height="100%" mozbrowser remote="true"></iframe>
+  <script src="chrome://shumway/content/pingpong.js"></script>
+  <script src="chrome://shumway/content/viewerDebugger.js"></script>
   <script src="chrome://shumway/content/viewerWrapper.js"></script>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/viewerWrapper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/viewerWrapper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/chrome/viewerWrapper.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/chrome/viewerWrapper.js	2015-02-28 15:03:02.000000000 +0000
@@ -53,6 +53,7 @@
     // ShumwayStreamConverter.
     var shumwayComAdapter = Components.utils.createObjectIn(childWindow, {defineAs: 'ShumwayCom'});
     Components.utils.exportFunction(sendMessage, shumwayComAdapter, {defineAs: 'sendMessage'});
+    Components.utils.exportFunction(enableDebug, shumwayComAdapter, {defineAs: 'enableDebug'});
     Object.defineProperties(shumwayComAdapter, {
       onLoadFileCallback: { value: null, writable: true },
       onExternalCallback: { value: null, writable: true },
@@ -117,6 +118,10 @@
       return window.notifyShumwayMessage(detail);
     });
 
+    messageManager.addMessageListener('Shumway:enableDebug', function (message) {
+      enableDebug();
+    });
+
     window.onExternalCallback = function (call) {
       return externalInterface.callback(JSON.stringify(call));
     };
@@ -135,7 +140,76 @@
     messageManager.sendAsyncMessage('Shumway:init', {});
   }
 
+
+  function handleDebug(connection) {
+    viewer.parentNode.removeChild(viewer); // we don't need viewer anymore
+    document.body.className = 'remoteDebug';
+
+    function sendMessage(data) {
+      var detail = {
+        action: data.action,
+        data: data.data,
+        sync: data.sync
+      };
+      if (data.callback) {
+        detail.callback = true;
+        detail.cookie = data.cookie;
+      }
+      return window.notifyShumwayMessage(detail);
+    }
+
+    connection.onData = function (data) {
+      switch (data.action) {
+        case 'sendMessage':
+          return sendMessage(data.detail);
+        case 'reload':
+          document.body.className = 'remoteReload';
+          setTimeout(function () {
+            window.top.location.reload();
+          }, 1000);
+          return;
+      }
+    };
+
+    window.onExternalCallback = function (call) {
+      return connection.send({action: 'onExternalCallback', detail: call});
+    };
+
+    window.onMessageCallback = function (response) {
+      return connection.send({action: 'onMessageCallback', detail: response});
+    };
+
+    window.onLoadFileCallback = function (args) {
+      if (args.array) {
+        args.array = Array.prototype.slice.call(args.array, 0);
+      }
+      return connection.send({action: 'onLoadFileCallback', detail: args}, true);
+    };
+
+    connection.send({action: 'runViewer'}, true);
+  }
+
+  function enableDebug() {
+    DebugUtils.enableDebug(window.swfUrlLoading);
+    setTimeout(function () {
+      window.top.location.reload();
+    }, 1000);
+  }
+
   promise.then(function (oop) {
+    if (DebugUtils.isEnabled) {
+      DebugUtils.createDebuggerConnection(window.swfUrlLoading).then(function (debuggerConnection) {
+        if (debuggerConnection) {
+          handleDebug(debuggerConnection);
+        } else if (oop) {
+          handlerOOP();
+        } else {
+          handler();
+        }
+      });
+      return;
+    }
+
     if (oop) {
       handlerOOP();
     } else {
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/avm2/generated/builtin/builtin.abc and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/avm2/generated/builtin/builtin.abc differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/libs/builtin.abc and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/libs/builtin.abc differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/shumway.gfx.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/shumway.gfx.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/shumway.gfx.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/shumway.gfx.js	2015-02-28 15:03:02.000000000 +0000
@@ -16,2065 +16,2069 @@
 */
 console.time("Load Shared Dependencies");
 var Shumway, Shumway$$inline_0 = Shumway || (Shumway = {});
-Shumway$$inline_0.version = "0.9.3775";
-Shumway$$inline_0.build = "a82ac47";
+Shumway$$inline_0.version = "0.10.182";
+Shumway$$inline_0.build = "0195a96";
 var jsGlobal = function() {
   return this || (0,eval)("this//# sourceURL=jsGlobal-getter");
 }(), inBrowser = "undefined" !== typeof window && "document" in window && "plugins" in window.document, inFirefox = "undefined" !== typeof navigator && 0 <= navigator.userAgent.indexOf("Firefox");
-function dumpLine(l) {
+function dumpLine(k) {
 }
 jsGlobal.performance || (jsGlobal.performance = {});
 jsGlobal.performance.now || (jsGlobal.performance.now = "undefined" !== typeof dateNow ? dateNow : Date.now);
-function lazyInitializer(l, r, g) {
-  Object.defineProperty(l, r, {get:function() {
-    var c = g();
-    Object.defineProperty(l, r, {value:c, configurable:!0, enumerable:!0});
-    return c;
+function lazyInitializer(k, p, g) {
+  Object.defineProperty(k, p, {get:function() {
+    var b = g();
+    Object.defineProperty(k, p, {value:b, configurable:!0, enumerable:!0});
+    return b;
   }, configurable:!0, enumerable:!0});
 }
 var START_TIME = performance.now();
-(function(l) {
-  function r(d) {
-    return(d | 0) === d;
+(function(k) {
+  function p(a) {
+    return(a | 0) === a;
   }
-  function g(d) {
-    return "object" === typeof d || "function" === typeof d;
+  function g(a) {
+    return "object" === typeof a || "function" === typeof a;
   }
-  function c(d) {
-    return String(Number(d)) === d;
+  function b(a) {
+    return String(Number(a)) === a;
   }
-  function t(d) {
-    var e = 0;
-    if ("number" === typeof d) {
-      return e = d | 0, d === e && 0 <= e ? !0 : d >>> 0 === d;
+  function u(a) {
+    var l = 0;
+    if ("number" === typeof a) {
+      return l = a | 0, a === l && 0 <= l ? !0 : a >>> 0 === a;
     }
-    if ("string" !== typeof d) {
+    if ("string" !== typeof a) {
       return!1;
     }
-    var b = d.length;
-    if (0 === b) {
+    var c = a.length;
+    if (0 === c) {
       return!1;
     }
-    if ("0" === d) {
+    if ("0" === a) {
       return!0;
     }
-    if (b > l.UINT32_CHAR_BUFFER_LENGTH) {
+    if (c > k.UINT32_CHAR_BUFFER_LENGTH) {
       return!1;
     }
-    var f = 0, e = d.charCodeAt(f++) - 48;
-    if (1 > e || 9 < e) {
+    var e = 0, l = a.charCodeAt(e++) - 48;
+    if (1 > l || 9 < l) {
       return!1;
     }
-    for (var q = 0, w = 0;f < b;) {
-      w = d.charCodeAt(f++) - 48;
-      if (0 > w || 9 < w) {
+    for (var q = 0, s = 0;e < c;) {
+      s = a.charCodeAt(e++) - 48;
+      if (0 > s || 9 < s) {
         return!1;
       }
-      q = e;
-      e = 10 * e + w;
+      q = l;
+      l = 10 * l + s;
     }
-    return q < l.UINT32_MAX_DIV_10 || q === l.UINT32_MAX_DIV_10 && w <= l.UINT32_MAX_MOD_10 ? !0 : !1;
+    return q < k.UINT32_MAX_DIV_10 || q === k.UINT32_MAX_DIV_10 && s <= k.UINT32_MAX_MOD_10 ? !0 : !1;
   }
-  (function(d) {
-    d[d._0 = 48] = "_0";
-    d[d._1 = 49] = "_1";
-    d[d._2 = 50] = "_2";
-    d[d._3 = 51] = "_3";
-    d[d._4 = 52] = "_4";
-    d[d._5 = 53] = "_5";
-    d[d._6 = 54] = "_6";
-    d[d._7 = 55] = "_7";
-    d[d._8 = 56] = "_8";
-    d[d._9 = 57] = "_9";
-  })(l.CharacterCodes || (l.CharacterCodes = {}));
-  l.UINT32_CHAR_BUFFER_LENGTH = 10;
-  l.UINT32_MAX = 4294967295;
-  l.UINT32_MAX_DIV_10 = 429496729;
-  l.UINT32_MAX_MOD_10 = 5;
-  l.isString = function(d) {
-    return "string" === typeof d;
+  (function(a) {
+    a[a._0 = 48] = "_0";
+    a[a._1 = 49] = "_1";
+    a[a._2 = 50] = "_2";
+    a[a._3 = 51] = "_3";
+    a[a._4 = 52] = "_4";
+    a[a._5 = 53] = "_5";
+    a[a._6 = 54] = "_6";
+    a[a._7 = 55] = "_7";
+    a[a._8 = 56] = "_8";
+    a[a._9 = 57] = "_9";
+  })(k.CharacterCodes || (k.CharacterCodes = {}));
+  k.UINT32_CHAR_BUFFER_LENGTH = 10;
+  k.UINT32_MAX = 4294967295;
+  k.UINT32_MAX_DIV_10 = 429496729;
+  k.UINT32_MAX_MOD_10 = 5;
+  k.isString = function(a) {
+    return "string" === typeof a;
   };
-  l.isFunction = function(d) {
-    return "function" === typeof d;
+  k.isFunction = function(a) {
+    return "function" === typeof a;
   };
-  l.isNumber = function(d) {
-    return "number" === typeof d;
+  k.isNumber = function(a) {
+    return "number" === typeof a;
   };
-  l.isInteger = r;
-  l.isArray = function(d) {
-    return d instanceof Array;
+  k.isInteger = p;
+  k.isArray = function(a) {
+    return a instanceof Array;
   };
-  l.isNumberOrString = function(d) {
-    return "number" === typeof d || "string" === typeof d;
+  k.isNumberOrString = function(a) {
+    return "number" === typeof a || "string" === typeof a;
   };
-  l.isObject = g;
-  l.toNumber = function(d) {
-    return+d;
+  k.isObject = g;
+  k.toNumber = function(a) {
+    return+a;
   };
-  l.isNumericString = c;
-  l.isNumeric = function(d) {
-    if ("number" === typeof d) {
+  k.isNumericString = b;
+  k.isNumeric = function(a) {
+    if ("number" === typeof a) {
       return!0;
     }
-    if ("string" === typeof d) {
-      var e = d.charCodeAt(0);
-      return 65 <= e && 90 >= e || 97 <= e && 122 >= e || 36 === e || 95 === e ? !1 : t(d) || c(d);
+    if ("string" === typeof a) {
+      var l = a.charCodeAt(0);
+      return 65 <= l && 90 >= l || 97 <= l && 122 >= l || 36 === l || 95 === l ? !1 : u(a) || b(a);
     }
     return!1;
   };
-  l.isIndex = t;
-  l.isNullOrUndefined = function(d) {
-    return void 0 == d;
+  k.isIndex = u;
+  k.isNullOrUndefined = function(a) {
+    return void 0 == a;
   };
-  var m;
-  (function(d) {
-    d.error = function(b) {
-      console.error(b);
-      throw Error(b);
-    };
-    d.assert = function(b, f) {
-      void 0 === f && (f = "assertion failed");
-      "" === b && (b = !0);
-      if (!b) {
+  var h;
+  (function(a) {
+    a.error = function(c) {
+      console.error(c);
+      throw Error(c);
+    };
+    a.assert = function(c, e) {
+      void 0 === e && (e = "assertion failed");
+      "" === c && (c = !0);
+      if (!c) {
         if ("undefined" !== typeof console && "assert" in console) {
-          throw console.assert(!1, f), Error(f);
+          throw console.assert(!1, e), Error(e);
         }
-        d.error(f.toString());
+        a.error(e.toString());
       }
     };
-    d.assertUnreachable = function(b) {
-      throw Error("Reached unreachable location " + Error().stack.split("\n")[1] + b);
+    a.assertUnreachable = function(c) {
+      throw Error("Reached unreachable location " + Error().stack.split("\n")[1] + c);
     };
-    d.assertNotImplemented = function(b, f) {
-      b || d.error("notImplemented: " + f);
+    a.assertNotImplemented = function(c, e) {
+      c || a.error("notImplemented: " + e);
     };
-    d.warning = function(b, f, q) {
+    a.warning = function(c, e, q) {
     };
-    d.notUsed = function(b) {
+    a.notUsed = function(c) {
     };
-    d.notImplemented = function(b) {
+    a.notImplemented = function(c) {
     };
-    d.dummyConstructor = function(b) {
+    a.dummyConstructor = function(c) {
     };
-    d.abstractMethod = function(b) {
+    a.abstractMethod = function(c) {
     };
-    var e = {};
-    d.somewhatImplemented = function(b) {
-      e[b] || (e[b] = !0);
+    var l = {};
+    a.somewhatImplemented = function(c) {
+      l[c] || (l[c] = !0);
     };
-    d.unexpected = function(b) {
-      d.assert(!1, "Unexpected: " + b);
+    a.unexpected = function(c) {
+      a.assert(!1, "Unexpected: " + c);
     };
-    d.unexpectedCase = function(b) {
-      d.assert(!1, "Unexpected Case: " + b);
+    a.unexpectedCase = function(c) {
+      a.assert(!1, "Unexpected Case: " + c);
     };
-  })(m = l.Debug || (l.Debug = {}));
-  l.getTicks = function() {
+  })(h = k.Debug || (k.Debug = {}));
+  k.getTicks = function() {
     return performance.now();
   };
-  (function(d) {
-    function e(f, q) {
-      for (var b = 0, e = f.length;b < e;b++) {
-        if (f[b] === q) {
-          return b;
+  (function(a) {
+    function l(e, q) {
+      for (var c = 0, a = e.length;c < a;c++) {
+        if (e[c] === q) {
+          return c;
         }
       }
-      f.push(q);
-      return f.length - 1;
+      e.push(q);
+      return e.length - 1;
     }
-    d.popManyInto = function(f, q, b) {
-      for (var e = q - 1;0 <= e;e--) {
-        b[e] = f.pop();
-      }
-      b.length = q;
-    };
-    d.popMany = function(f, q) {
-      var b = f.length - q, e = f.slice(b, this.length);
-      f.length = b;
-      return e;
+    a.popManyInto = function(e, q, c) {
+      for (var a = q - 1;0 <= a;a--) {
+        c[a] = e.pop();
+      }
+      c.length = q;
+    };
+    a.popMany = function(e, q) {
+      var c = e.length - q, a = e.slice(c, this.length);
+      e.length = c;
+      return a;
     };
-    d.popManyIntoVoid = function(f, q) {
-      f.length -= q;
+    a.popManyIntoVoid = function(e, q) {
+      e.length -= q;
     };
-    d.pushMany = function(f, q) {
-      for (var b = 0;b < q.length;b++) {
-        f.push(q[b]);
+    a.pushMany = function(e, q) {
+      for (var c = 0;c < q.length;c++) {
+        e.push(q[c]);
       }
     };
-    d.top = function(f) {
-      return f.length && f[f.length - 1];
+    a.top = function(e) {
+      return e.length && e[e.length - 1];
     };
-    d.last = function(f) {
-      return f.length && f[f.length - 1];
+    a.last = function(e) {
+      return e.length && e[e.length - 1];
     };
-    d.peek = function(f) {
-      return f[f.length - 1];
+    a.peek = function(e) {
+      return e[e.length - 1];
     };
-    d.indexOf = function(f, q) {
-      for (var b = 0, e = f.length;b < e;b++) {
-        if (f[b] === q) {
-          return b;
+    a.indexOf = function(e, q) {
+      for (var c = 0, a = e.length;c < a;c++) {
+        if (e[c] === q) {
+          return c;
         }
       }
       return-1;
     };
-    d.equals = function(f, q) {
-      if (f.length !== q.length) {
+    a.equals = function(e, c) {
+      if (e.length !== c.length) {
         return!1;
       }
-      for (var b = 0;b < f.length;b++) {
-        if (f[b] !== q[b]) {
+      for (var s = 0;s < e.length;s++) {
+        if (e[s] !== c[s]) {
           return!1;
         }
       }
       return!0;
     };
-    d.pushUnique = e;
-    d.unique = function(f) {
-      for (var q = [], b = 0;b < f.length;b++) {
-        e(q, f[b]);
+    a.pushUnique = l;
+    a.unique = function(e) {
+      for (var c = [], s = 0;s < e.length;s++) {
+        l(c, e[s]);
       }
-      return q;
+      return c;
     };
-    d.copyFrom = function(f, b) {
-      f.length = 0;
-      d.pushMany(f, b);
-    };
-    d.ensureTypedArrayCapacity = function(f, b) {
-      if (f.length < b) {
-        var w = f;
-        f = new f.constructor(l.IntegerUtilities.nearestPowerOfTwo(b));
-        f.set(w, 0);
+    a.copyFrom = function(e, c) {
+      e.length = 0;
+      a.pushMany(e, c);
+    };
+    a.ensureTypedArrayCapacity = function(e, c) {
+      if (e.length < c) {
+        var s = e;
+        e = new e.constructor(k.IntegerUtilities.nearestPowerOfTwo(c));
+        e.set(s, 0);
       }
-      return f;
+      return e;
     };
-    var b = function() {
-      function f(f) {
-        void 0 === f && (f = 16);
+    var c = function() {
+      function e(e) {
+        void 0 === e && (e = 16);
         this._f32 = this._i32 = this._u16 = this._u8 = null;
         this._offset = 0;
-        this.ensureCapacity(f);
+        this.ensureCapacity(e);
       }
-      f.prototype.reset = function() {
+      e.prototype.reset = function() {
         this._offset = 0;
       };
-      Object.defineProperty(f.prototype, "offset", {get:function() {
+      Object.defineProperty(e.prototype, "offset", {get:function() {
         return this._offset;
       }, enumerable:!0, configurable:!0});
-      f.prototype.getIndex = function(f) {
-        return this._offset / f;
+      e.prototype.getIndex = function(e) {
+        return this._offset / e;
       };
-      f.prototype.ensureAdditionalCapacity = function() {
+      e.prototype.ensureAdditionalCapacity = function() {
         this.ensureCapacity(this._offset + 68);
       };
-      f.prototype.ensureCapacity = function(f) {
+      e.prototype.ensureCapacity = function(e) {
         if (!this._u8) {
-          this._u8 = new Uint8Array(f);
+          this._u8 = new Uint8Array(e);
         } else {
-          if (this._u8.length > f) {
+          if (this._u8.length > e) {
             return;
           }
         }
-        var b = 2 * this._u8.length;
-        b < f && (b = f);
-        f = new Uint8Array(b);
-        f.set(this._u8, 0);
-        this._u8 = f;
-        this._u16 = new Uint16Array(f.buffer);
-        this._i32 = new Int32Array(f.buffer);
-        this._f32 = new Float32Array(f.buffer);
+        var c = 2 * this._u8.length;
+        c < e && (c = e);
+        e = new Uint8Array(c);
+        e.set(this._u8, 0);
+        this._u8 = e;
+        this._u16 = new Uint16Array(e.buffer);
+        this._i32 = new Int32Array(e.buffer);
+        this._f32 = new Float32Array(e.buffer);
       };
-      f.prototype.writeInt = function(f) {
+      e.prototype.writeInt = function(e) {
         this.ensureCapacity(this._offset + 4);
-        this.writeIntUnsafe(f);
+        this.writeIntUnsafe(e);
       };
-      f.prototype.writeIntAt = function(f, b) {
-        this.ensureCapacity(b + 4);
-        this._i32[b >> 2] = f;
+      e.prototype.writeIntAt = function(e, c) {
+        this.ensureCapacity(c + 4);
+        this._i32[c >> 2] = e;
       };
-      f.prototype.writeIntUnsafe = function(f) {
-        this._i32[this._offset >> 2] = f;
+      e.prototype.writeIntUnsafe = function(e) {
+        this._i32[this._offset >> 2] = e;
         this._offset += 4;
       };
-      f.prototype.writeFloat = function(f) {
+      e.prototype.writeFloat = function(e) {
         this.ensureCapacity(this._offset + 4);
-        this.writeFloatUnsafe(f);
+        this.writeFloatUnsafe(e);
       };
-      f.prototype.writeFloatUnsafe = function(f) {
-        this._f32[this._offset >> 2] = f;
+      e.prototype.writeFloatUnsafe = function(e) {
+        this._f32[this._offset >> 2] = e;
         this._offset += 4;
       };
-      f.prototype.write4Floats = function(f, b, e, d) {
+      e.prototype.write4Floats = function(e, c, a, l) {
         this.ensureCapacity(this._offset + 16);
-        this.write4FloatsUnsafe(f, b, e, d);
+        this.write4FloatsUnsafe(e, c, a, l);
       };
-      f.prototype.write4FloatsUnsafe = function(f, b, e, d) {
-        var a = this._offset >> 2;
-        this._f32[a + 0] = f;
-        this._f32[a + 1] = b;
-        this._f32[a + 2] = e;
-        this._f32[a + 3] = d;
+      e.prototype.write4FloatsUnsafe = function(e, c, a, l) {
+        var d = this._offset >> 2;
+        this._f32[d + 0] = e;
+        this._f32[d + 1] = c;
+        this._f32[d + 2] = a;
+        this._f32[d + 3] = l;
         this._offset += 16;
       };
-      f.prototype.write6Floats = function(f, b, e, d, a, h) {
+      e.prototype.write6Floats = function(e, c, a, l, d, t) {
         this.ensureCapacity(this._offset + 24);
-        this.write6FloatsUnsafe(f, b, e, d, a, h);
+        this.write6FloatsUnsafe(e, c, a, l, d, t);
       };
-      f.prototype.write6FloatsUnsafe = function(f, b, e, d, a, h) {
-        var p = this._offset >> 2;
-        this._f32[p + 0] = f;
-        this._f32[p + 1] = b;
-        this._f32[p + 2] = e;
-        this._f32[p + 3] = d;
-        this._f32[p + 4] = a;
-        this._f32[p + 5] = h;
+      e.prototype.write6FloatsUnsafe = function(e, c, a, l, d, t) {
+        var n = this._offset >> 2;
+        this._f32[n + 0] = e;
+        this._f32[n + 1] = c;
+        this._f32[n + 2] = a;
+        this._f32[n + 3] = l;
+        this._f32[n + 4] = d;
+        this._f32[n + 5] = t;
         this._offset += 24;
       };
-      f.prototype.subF32View = function() {
+      e.prototype.subF32View = function() {
         return this._f32.subarray(0, this._offset >> 2);
       };
-      f.prototype.subI32View = function() {
+      e.prototype.subI32View = function() {
         return this._i32.subarray(0, this._offset >> 2);
       };
-      f.prototype.subU16View = function() {
+      e.prototype.subU16View = function() {
         return this._u16.subarray(0, this._offset >> 1);
       };
-      f.prototype.subU8View = function() {
+      e.prototype.subU8View = function() {
         return this._u8.subarray(0, this._offset);
       };
-      f.prototype.hashWords = function(f, b, e) {
-        b = this._i32;
-        for (var d = 0;d < e;d++) {
-          f = (31 * f | 0) + b[d] | 0;
+      e.prototype.hashWords = function(e, c, a) {
+        c = this._i32;
+        for (var l = 0;l < a;l++) {
+          e = (31 * e | 0) + c[l] | 0;
         }
-        return f;
+        return e;
       };
-      f.prototype.reserve = function(f) {
-        f = f + 3 & -4;
-        this.ensureCapacity(this._offset + f);
-        this._offset += f;
+      e.prototype.reserve = function(e) {
+        e = e + 3 & -4;
+        this.ensureCapacity(this._offset + e);
+        this._offset += e;
       };
-      return f;
+      return e;
     }();
-    d.ArrayWriter = b;
-  })(l.ArrayUtilities || (l.ArrayUtilities = {}));
+    a.ArrayWriter = c;
+  })(k.ArrayUtilities || (k.ArrayUtilities = {}));
   var a = function() {
-    function d(e) {
-      this._u8 = new Uint8Array(e);
-      this._u16 = new Uint16Array(e);
-      this._i32 = new Int32Array(e);
-      this._f32 = new Float32Array(e);
+    function a(l) {
+      this._u8 = new Uint8Array(l);
+      this._u16 = new Uint16Array(l);
+      this._i32 = new Int32Array(l);
+      this._f32 = new Float32Array(l);
       this._offset = 0;
     }
-    Object.defineProperty(d.prototype, "offset", {get:function() {
+    Object.defineProperty(a.prototype, "offset", {get:function() {
       return this._offset;
     }, enumerable:!0, configurable:!0});
-    d.prototype.isEmpty = function() {
+    a.prototype.isEmpty = function() {
       return this._offset === this._u8.length;
     };
-    d.prototype.readInt = function() {
-      var e = this._i32[this._offset >> 2];
+    a.prototype.readInt = function() {
+      var a = this._i32[this._offset >> 2];
       this._offset += 4;
-      return e;
+      return a;
     };
-    d.prototype.readFloat = function() {
-      var e = this._f32[this._offset >> 2];
+    a.prototype.readFloat = function() {
+      var a = this._f32[this._offset >> 2];
       this._offset += 4;
-      return e;
+      return a;
     };
-    return d;
+    return a;
   }();
-  l.ArrayReader = a;
-  (function(d) {
-    function e(f, b) {
-      return Object.prototype.hasOwnProperty.call(f, b);
-    }
-    function b(f, b) {
-      for (var w in b) {
-        e(b, w) && (f[w] = b[w]);
-      }
-    }
-    d.boxValue = function(f) {
-      return void 0 == f || g(f) ? f : Object(f);
-    };
-    d.toKeyValueArray = function(f) {
-      var b = Object.prototype.hasOwnProperty, e = [], d;
-      for (d in f) {
-        b.call(f, d) && e.push([d, f[d]]);
+  k.ArrayReader = a;
+  (function(a) {
+    function l(e, c) {
+      return Object.prototype.hasOwnProperty.call(e, c);
+    }
+    function c(e, c) {
+      for (var a in c) {
+        l(c, a) && (e[a] = c[a]);
+      }
+    }
+    a.boxValue = function(e) {
+      return void 0 == e || g(e) ? e : Object(e);
+    };
+    a.toKeyValueArray = function(e) {
+      var c = Object.prototype.hasOwnProperty, a = [], l;
+      for (l in e) {
+        c.call(e, l) && a.push([l, e[l]]);
       }
-      return e;
+      return a;
     };
-    d.isPrototypeWriteable = function(f) {
-      return Object.getOwnPropertyDescriptor(f, "prototype").writable;
+    a.isPrototypeWriteable = function(e) {
+      return Object.getOwnPropertyDescriptor(e, "prototype").writable;
     };
-    d.hasOwnProperty = e;
-    d.propertyIsEnumerable = function(f, b) {
-      return Object.prototype.propertyIsEnumerable.call(f, b);
+    a.hasOwnProperty = l;
+    a.propertyIsEnumerable = function(e, c) {
+      return Object.prototype.propertyIsEnumerable.call(e, c);
     };
-    d.getOwnPropertyDescriptor = function(f, b) {
-      return Object.getOwnPropertyDescriptor(f, b);
+    a.getOwnPropertyDescriptor = function(e, c) {
+      return Object.getOwnPropertyDescriptor(e, c);
     };
-    d.hasOwnGetter = function(f, b) {
-      var e = Object.getOwnPropertyDescriptor(f, b);
-      return!(!e || !e.get);
+    a.hasOwnGetter = function(e, c) {
+      var a = Object.getOwnPropertyDescriptor(e, c);
+      return!(!a || !a.get);
     };
-    d.getOwnGetter = function(f, b) {
-      var e = Object.getOwnPropertyDescriptor(f, b);
-      return e ? e.get : null;
+    a.getOwnGetter = function(e, c) {
+      var a = Object.getOwnPropertyDescriptor(e, c);
+      return a ? a.get : null;
     };
-    d.hasOwnSetter = function(f, b) {
-      var e = Object.getOwnPropertyDescriptor(f, b);
-      return!(!e || !e.set);
+    a.hasOwnSetter = function(e, c) {
+      var a = Object.getOwnPropertyDescriptor(e, c);
+      return!(!a || !a.set);
     };
-    d.createMap = function() {
+    a.createMap = function() {
       return Object.create(null);
     };
-    d.createArrayMap = function() {
+    a.createArrayMap = function() {
       return[];
     };
-    d.defineReadOnlyProperty = function(f, b, e) {
-      Object.defineProperty(f, b, {value:e, writable:!1, configurable:!0, enumerable:!1});
+    a.defineReadOnlyProperty = function(e, c, a) {
+      Object.defineProperty(e, c, {value:a, writable:!1, configurable:!0, enumerable:!1});
     };
-    d.getOwnPropertyDescriptors = function(f) {
-      for (var b = d.createMap(), e = Object.getOwnPropertyNames(f), a = 0;a < e.length;a++) {
-        b[e[a]] = Object.getOwnPropertyDescriptor(f, e[a]);
+    a.getOwnPropertyDescriptors = function(e) {
+      for (var c = a.createMap(), s = Object.getOwnPropertyNames(e), l = 0;l < s.length;l++) {
+        c[s[l]] = Object.getOwnPropertyDescriptor(e, s[l]);
       }
-      return b;
+      return c;
     };
-    d.cloneObject = function(f) {
-      var q = Object.create(Object.getPrototypeOf(f));
-      b(q, f);
+    a.cloneObject = function(e) {
+      var q = Object.create(Object.getPrototypeOf(e));
+      c(q, e);
       return q;
     };
-    d.copyProperties = function(f, b) {
-      for (var e in b) {
-        f[e] = b[e];
+    a.copyProperties = function(e, c) {
+      for (var a in c) {
+        e[a] = c[a];
       }
     };
-    d.copyOwnProperties = b;
-    d.copyOwnPropertyDescriptors = function(f, b, w) {
-      void 0 === w && (w = !0);
-      for (var d in b) {
-        if (e(b, d)) {
-          var a = Object.getOwnPropertyDescriptor(b, d);
-          if (w || !e(f, d)) {
+    a.copyOwnProperties = c;
+    a.copyOwnPropertyDescriptors = function(e, c, a) {
+      void 0 === a && (a = !0);
+      for (var y in c) {
+        if (l(c, y)) {
+          var d = Object.getOwnPropertyDescriptor(c, y);
+          if (a || !l(e, y)) {
             try {
-              Object.defineProperty(f, d, a);
-            } catch (h) {
+              Object.defineProperty(e, y, d);
+            } catch (t) {
             }
           }
         }
       }
     };
-    d.getLatestGetterOrSetterPropertyDescriptor = function(f, b) {
-      for (var e = {};f;) {
-        var d = Object.getOwnPropertyDescriptor(f, b);
-        d && (e.get = e.get || d.get, e.set = e.set || d.set);
-        if (e.get && e.set) {
+    a.getLatestGetterOrSetterPropertyDescriptor = function(e, c) {
+      for (var a = {};e;) {
+        var l = Object.getOwnPropertyDescriptor(e, c);
+        l && (a.get = a.get || l.get, a.set = a.set || l.set);
+        if (a.get && a.set) {
           break;
         }
-        f = Object.getPrototypeOf(f);
+        e = Object.getPrototypeOf(e);
       }
-      return e;
+      return a;
     };
-    d.defineNonEnumerableGetterOrSetter = function(f, b, e, a) {
-      var h = d.getLatestGetterOrSetterPropertyDescriptor(f, b);
-      h.configurable = !0;
-      h.enumerable = !1;
-      a ? h.get = e : h.set = e;
-      Object.defineProperty(f, b, h);
+    a.defineNonEnumerableGetterOrSetter = function(e, c, l, y) {
+      var d = a.getLatestGetterOrSetterPropertyDescriptor(e, c);
+      d.configurable = !0;
+      d.enumerable = !1;
+      y ? d.get = l : d.set = l;
+      Object.defineProperty(e, c, d);
     };
-    d.defineNonEnumerableGetter = function(f, b, e) {
-      Object.defineProperty(f, b, {get:e, configurable:!0, enumerable:!1});
+    a.defineNonEnumerableGetter = function(c, q, a) {
+      Object.defineProperty(c, q, {get:a, configurable:!0, enumerable:!1});
     };
-    d.defineNonEnumerableSetter = function(f, b, e) {
-      Object.defineProperty(f, b, {set:e, configurable:!0, enumerable:!1});
+    a.defineNonEnumerableSetter = function(c, q, a) {
+      Object.defineProperty(c, q, {set:a, configurable:!0, enumerable:!1});
     };
-    d.defineNonEnumerableProperty = function(f, b, e) {
-      Object.defineProperty(f, b, {value:e, writable:!0, configurable:!0, enumerable:!1});
+    a.defineNonEnumerableProperty = function(c, q, a) {
+      Object.defineProperty(c, q, {value:a, writable:!0, configurable:!0, enumerable:!1});
     };
-    d.defineNonEnumerableForwardingProperty = function(f, b, e) {
-      Object.defineProperty(f, b, {get:h.makeForwardingGetter(e), set:h.makeForwardingSetter(e), writable:!0, configurable:!0, enumerable:!1});
+    a.defineNonEnumerableForwardingProperty = function(c, q, a) {
+      Object.defineProperty(c, q, {get:d.makeForwardingGetter(a), set:d.makeForwardingSetter(a), writable:!0, configurable:!0, enumerable:!1});
     };
-    d.defineNewNonEnumerableProperty = function(b, q, e) {
-      d.defineNonEnumerableProperty(b, q, e);
+    a.defineNewNonEnumerableProperty = function(c, q, l) {
+      a.defineNonEnumerableProperty(c, q, l);
     };
-    d.createPublicAliases = function(b, q) {
-      for (var e = {value:null, writable:!0, configurable:!0, enumerable:!1}, d = 0;d < q.length;d++) {
-        var a = q[d];
-        e.value = b[a];
-        Object.defineProperty(b, "$Bg" + a, e);
+    a.createPublicAliases = function(c, q) {
+      for (var a = {value:null, writable:!0, configurable:!0, enumerable:!1}, l = 0;l < q.length;l++) {
+        var d = q[l];
+        a.value = c[d];
+        Object.defineProperty(c, "$Bg" + d, a);
       }
     };
-  })(l.ObjectUtilities || (l.ObjectUtilities = {}));
-  var h;
-  (function(d) {
-    d.makeForwardingGetter = function(e) {
-      return new Function('return this["' + e + '"]//# sourceURL=fwd-get-' + e + ".as");
-    };
-    d.makeForwardingSetter = function(e) {
-      return new Function("value", 'this["' + e + '"] = value;//# sourceURL=fwd-set-' + e + ".as");
-    };
-    d.bindSafely = function(e, b) {
-      function f() {
-        return e.apply(b, arguments);
+  })(k.ObjectUtilities || (k.ObjectUtilities = {}));
+  var d;
+  (function(a) {
+    a.makeForwardingGetter = function(a) {
+      return new Function('return this["' + a + '"]//# sourceURL=fwd-get-' + a + ".as");
+    };
+    a.makeForwardingSetter = function(a) {
+      return new Function("value", 'this["' + a + '"] = value;//# sourceURL=fwd-set-' + a + ".as");
+    };
+    a.bindSafely = function(a, c) {
+      function e() {
+        return a.apply(c, arguments);
       }
-      f.boundTo = b;
-      return f;
+      e.boundTo = c;
+      return e;
     };
-  })(h = l.FunctionUtilities || (l.FunctionUtilities = {}));
-  (function(d) {
-    function e(b) {
-      return "string" === typeof b ? '"' + b + '"' : "number" === typeof b || "boolean" === typeof b ? String(b) : b instanceof Array ? "[] " + b.length : typeof b;
-    }
-    d.repeatString = function(b, f) {
-      for (var q = "", e = 0;e < f;e++) {
-        q += b;
+  })(d = k.FunctionUtilities || (k.FunctionUtilities = {}));
+  (function(a) {
+    function l(c) {
+      return "string" === typeof c ? '"' + c + '"' : "number" === typeof c || "boolean" === typeof c ? String(c) : c instanceof Array ? "[] " + c.length : typeof c;
+    }
+    a.repeatString = function(c, e) {
+      for (var q = "", a = 0;a < e;a++) {
+        q += c;
       }
       return q;
     };
-    d.memorySizeToString = function(b) {
-      b |= 0;
-      return 1024 > b ? b + " B" : 1048576 > b ? (b / 1024).toFixed(2) + "KB" : (b / 1048576).toFixed(2) + "MB";
-    };
-    d.toSafeString = e;
-    d.toSafeArrayString = function(b) {
-      for (var f = [], q = 0;q < b.length;q++) {
-        f.push(e(b[q]));
-      }
-      return f.join(", ");
-    };
-    d.utf8decode = function(b) {
-      for (var f = new Uint8Array(4 * b.length), q = 0, e = 0, w = b.length;e < w;e++) {
-        var d = b.charCodeAt(e);
-        if (127 >= d) {
-          f[q++] = d;
+    a.memorySizeToString = function(c) {
+      c |= 0;
+      return 1024 > c ? c + " B" : 1048576 > c ? (c / 1024).toFixed(2) + "KB" : (c / 1048576).toFixed(2) + "MB";
+    };
+    a.toSafeString = l;
+    a.toSafeArrayString = function(c) {
+      for (var e = [], q = 0;q < c.length;q++) {
+        e.push(l(c[q]));
+      }
+      return e.join(", ");
+    };
+    a.utf8decode = function(c) {
+      for (var e = new Uint8Array(4 * c.length), q = 0, a = 0, l = c.length;a < l;a++) {
+        var s = c.charCodeAt(a);
+        if (127 >= s) {
+          e[q++] = s;
         } else {
-          if (55296 <= d && 56319 >= d) {
-            var a = b.charCodeAt(e + 1);
-            56320 <= a && 57343 >= a && (d = ((d & 1023) << 10) + (a & 1023) + 65536, ++e);
+          if (55296 <= s && 56319 >= s) {
+            var y = c.charCodeAt(a + 1);
+            56320 <= y && 57343 >= y && (s = ((s & 1023) << 10) + (y & 1023) + 65536, ++a);
           }
-          0 !== (d & 4292870144) ? (f[q++] = 248 | d >>> 24 & 3, f[q++] = 128 | d >>> 18 & 63, f[q++] = 128 | d >>> 12 & 63, f[q++] = 128 | d >>> 6 & 63) : 0 !== (d & 4294901760) ? (f[q++] = 240 | d >>> 18 & 7, f[q++] = 128 | d >>> 12 & 63, f[q++] = 128 | d >>> 6 & 63) : 0 !== (d & 4294965248) ? (f[q++] = 224 | d >>> 12 & 15, f[q++] = 128 | d >>> 6 & 63) : f[q++] = 192 | d >>> 6 & 31;
-          f[q++] = 128 | d & 63;
+          0 !== (s & 4292870144) ? (e[q++] = 248 | s >>> 24 & 3, e[q++] = 128 | s >>> 18 & 63, e[q++] = 128 | s >>> 12 & 63, e[q++] = 128 | s >>> 6 & 63) : 0 !== (s & 4294901760) ? (e[q++] = 240 | s >>> 18 & 7, e[q++] = 128 | s >>> 12 & 63, e[q++] = 128 | s >>> 6 & 63) : 0 !== (s & 4294965248) ? (e[q++] = 224 | s >>> 12 & 15, e[q++] = 128 | s >>> 6 & 63) : e[q++] = 192 | s >>> 6 & 31;
+          e[q++] = 128 | s & 63;
         }
       }
-      return f.subarray(0, q);
+      return e.subarray(0, q);
     };
-    d.utf8encode = function(b) {
-      for (var f = 0, q = "";f < b.length;) {
-        var e = b[f++] & 255;
-        if (127 >= e) {
-          q += String.fromCharCode(e);
+    a.utf8encode = function(c) {
+      for (var e = 0, q = "";e < c.length;) {
+        var a = c[e++] & 255;
+        if (127 >= a) {
+          q += String.fromCharCode(a);
         } else {
-          var d = 192, w = 5;
+          var l = 192, s = 5;
           do {
-            if ((e & (d >> 1 | 128)) === d) {
+            if ((a & (l >> 1 | 128)) === l) {
               break;
             }
-            d = d >> 1 | 128;
-            --w;
-          } while (0 <= w);
-          if (0 >= w) {
-            q += String.fromCharCode(e);
+            l = l >> 1 | 128;
+            --s;
+          } while (0 <= s);
+          if (0 >= s) {
+            q += String.fromCharCode(a);
           } else {
-            for (var e = e & (1 << w) - 1, d = !1, a = 5;a >= w;--a) {
-              var h = b[f++];
-              if (128 != (h & 192)) {
-                d = !0;
+            for (var a = a & (1 << s) - 1, l = !1, y = 5;y >= s;--y) {
+              var d = c[e++];
+              if (128 != (d & 192)) {
+                l = !0;
                 break;
               }
-              e = e << 6 | h & 63;
+              a = a << 6 | d & 63;
             }
-            if (d) {
-              for (w = f - (7 - a);w < f;++w) {
-                q += String.fromCharCode(b[w] & 255);
+            if (l) {
+              for (s = e - (7 - y);s < e;++s) {
+                q += String.fromCharCode(c[s] & 255);
               }
             } else {
-              q = 65536 <= e ? q + String.fromCharCode(e - 65536 >> 10 & 1023 | 55296, e & 1023 | 56320) : q + String.fromCharCode(e);
+              q = 65536 <= a ? q + String.fromCharCode(a - 65536 >> 10 & 1023 | 55296, a & 1023 | 56320) : q + String.fromCharCode(a);
             }
           }
         }
       }
       return q;
     };
-    d.base64ArrayBuffer = function(b) {
-      var f = "";
-      b = new Uint8Array(b);
-      for (var q = b.byteLength, e = q % 3, q = q - e, d, w, a, h, G = 0;G < q;G += 3) {
-        h = b[G] << 16 | b[G + 1] << 8 | b[G + 2], d = (h & 16515072) >> 18, w = (h & 258048) >> 12, a = (h & 4032) >> 6, h &= 63, f += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[d] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[w] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[a] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[h];
+    a.base64ArrayBuffer = function(c) {
+      var e = "";
+      c = new Uint8Array(c);
+      for (var q = c.byteLength, a = q % 3, q = q - a, l, s, y, d, t = 0;t < q;t += 3) {
+        d = c[t] << 16 | c[t + 1] << 8 | c[t + 2], l = (d & 16515072) >> 18, s = (d & 258048) >> 12, y = (d & 4032) >> 6, d &= 63, e += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[l] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[s] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[y] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[d];
       }
-      1 == e ? (h = b[q], f += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(h & 252) >> 2] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(h & 3) << 4] + "==") : 2 == e && (h = b[q] << 8 | b[q + 1], f += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(h & 64512) >> 10] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(h & 1008) >> 4] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(h & 15) << 
+      1 == a ? (d = c[q], e += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(d & 252) >> 2] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(d & 3) << 4] + "==") : 2 == a && (d = c[q] << 8 | c[q + 1], e += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(d & 64512) >> 10] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(d & 1008) >> 4] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(d & 15) << 
       2] + "=");
-      return f;
+      return e;
     };
-    d.escapeString = function(b) {
-      void 0 !== b && (b = b.replace(/[^\w$]/gi, "$"), /^\d/.test(b) && (b = "$" + b));
-      return b;
+    a.escapeString = function(c) {
+      void 0 !== c && (c = c.replace(/[^\w$]/gi, "$"), /^\d/.test(c) && (c = "$" + c));
+      return c;
     };
-    d.fromCharCodeArray = function(b) {
-      for (var f = "", q = 0;q < b.length;q += 16384) {
-        var e = Math.min(b.length - q, 16384), f = f + String.fromCharCode.apply(null, b.subarray(q, q + e))
+    a.fromCharCodeArray = function(c) {
+      for (var e = "", q = 0;q < c.length;q += 16384) {
+        var a = Math.min(c.length - q, 16384), e = e + String.fromCharCode.apply(null, c.subarray(q, q + a))
       }
-      return f;
+      return e;
     };
-    d.variableLengthEncodeInt32 = function(b) {
-      for (var f = 32 - Math.clz32(b), q = Math.ceil(f / 6), f = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[q], q = q - 1;0 <= q;q--) {
-        f += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[b >> 6 * q & 63];
+    a.variableLengthEncodeInt32 = function(c) {
+      for (var e = 32 - Math.clz32(c), q = Math.ceil(e / 6), e = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[q], q = q - 1;0 <= q;q--) {
+        e += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[c >> 6 * q & 63];
       }
-      return f;
+      return e;
     };
-    d.toEncoding = function(b) {
-      return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[b];
+    a.toEncoding = function(c) {
+      return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[c];
     };
-    d.fromEncoding = function(b) {
-      b = b.charCodeAt(0);
-      if (65 <= b && 90 >= b) {
-        return b - 65;
+    a.fromEncoding = function(c) {
+      if (65 <= c && 90 >= c) {
+        return c - 65;
       }
-      if (97 <= b && 122 >= b) {
-        return b - 71;
+      if (97 <= c && 122 >= c) {
+        return c - 71;
       }
-      if (48 <= b && 57 >= b) {
-        return b + 4;
+      if (48 <= c && 57 >= c) {
+        return c + 4;
       }
-      if (36 === b) {
+      if (36 === c) {
         return 62;
       }
-      if (95 === b) {
+      if (95 === c) {
         return 63;
       }
     };
-    d.variableLengthDecodeInt32 = function(b) {
-      for (var f = d.fromEncoding(b[0]), q = 0, e = 0;e < f;e++) {
-        var w = 6 * (f - e - 1), q = q | d.fromEncoding(b[1 + e]) << w
+    a.variableLengthDecodeInt32 = function(c) {
+      for (var e = a.fromEncoding(c.charCodeAt(0)), q = 0, l = 0;l < e;l++) {
+        var s = 6 * (e - l - 1), q = q | a.fromEncoding(c.charCodeAt(1 + l)) << s
       }
       return q;
     };
-    d.trimMiddle = function(b, f) {
-      if (b.length <= f) {
-        return b;
+    a.trimMiddle = function(c, e) {
+      if (c.length <= e) {
+        return c;
       }
-      var q = f >> 1, e = f - q - 1;
-      return b.substr(0, q) + "\u2026" + b.substr(b.length - e, e);
+      var q = e >> 1, a = e - q - 1;
+      return c.substr(0, q) + "\u2026" + c.substr(c.length - a, a);
     };
-    d.multiple = function(b, f) {
-      for (var q = "", e = 0;e < f;e++) {
-        q += b;
+    a.multiple = function(c, e) {
+      for (var q = "", a = 0;a < e;a++) {
+        q += c;
       }
       return q;
     };
-    d.indexOfAny = function(b, f, q) {
-      for (var e = b.length, d = 0;d < f.length;d++) {
-        var w = b.indexOf(f[d], q);
-        0 <= w && (e = Math.min(e, w));
-      }
-      return e === b.length ? -1 : e;
-    };
-    var b = Array(3), f = Array(4), q = Array(5), w = Array(6), a = Array(7), h = Array(8), p = Array(9);
-    d.concat3 = function(f, q, e) {
-      b[0] = f;
-      b[1] = q;
-      b[2] = e;
-      return b.join("");
-    };
-    d.concat4 = function(b, q, e, d) {
-      f[0] = b;
-      f[1] = q;
-      f[2] = e;
-      f[3] = d;
-      return f.join("");
-    };
-    d.concat5 = function(b, f, e, d, w) {
-      q[0] = b;
-      q[1] = f;
-      q[2] = e;
-      q[3] = d;
-      q[4] = w;
+    a.indexOfAny = function(c, e, q) {
+      for (var a = c.length, l = 0;l < e.length;l++) {
+        var s = c.indexOf(e[l], q);
+        0 <= s && (a = Math.min(a, s));
+      }
+      return a === c.length ? -1 : a;
+    };
+    var c = Array(3), e = Array(4), q = Array(5), s = Array(6), y = Array(7), d = Array(8), n = Array(9);
+    a.concat3 = function(e, q, a) {
+      c[0] = e;
+      c[1] = q;
+      c[2] = a;
+      return c.join("");
+    };
+    a.concat4 = function(c, q, a, l) {
+      e[0] = c;
+      e[1] = q;
+      e[2] = a;
+      e[3] = l;
+      return e.join("");
+    };
+    a.concat5 = function(c, e, a, l, s) {
+      q[0] = c;
+      q[1] = e;
+      q[2] = a;
+      q[3] = l;
+      q[4] = s;
       return q.join("");
     };
-    d.concat6 = function(b, f, q, e, d, a) {
-      w[0] = b;
-      w[1] = f;
-      w[2] = q;
-      w[3] = e;
-      w[4] = d;
-      w[5] = a;
-      return w.join("");
-    };
-    d.concat7 = function(b, f, q, e, d, w, h) {
-      a[0] = b;
-      a[1] = f;
-      a[2] = q;
-      a[3] = e;
-      a[4] = d;
-      a[5] = w;
-      a[6] = h;
-      return a.join("");
-    };
-    d.concat8 = function(b, f, q, e, d, w, a, G) {
-      h[0] = b;
-      h[1] = f;
-      h[2] = q;
-      h[3] = e;
-      h[4] = d;
-      h[5] = w;
-      h[6] = a;
-      h[7] = G;
-      return h.join("");
-    };
-    d.concat9 = function(b, f, q, e, d, w, a, h, G) {
-      p[0] = b;
-      p[1] = f;
-      p[2] = q;
-      p[3] = e;
-      p[4] = d;
-      p[5] = w;
-      p[6] = a;
-      p[7] = h;
-      p[8] = G;
-      return p.join("");
-    };
-  })(l.StringUtilities || (l.StringUtilities = {}));
-  (function(d) {
-    var e = new Uint8Array([7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]), b = new Int32Array([-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426, -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162, 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632, 
+    a.concat6 = function(c, e, q, a, l, y) {
+      s[0] = c;
+      s[1] = e;
+      s[2] = q;
+      s[3] = a;
+      s[4] = l;
+      s[5] = y;
+      return s.join("");
+    };
+    a.concat7 = function(c, e, q, a, l, s, d) {
+      y[0] = c;
+      y[1] = e;
+      y[2] = q;
+      y[3] = a;
+      y[4] = l;
+      y[5] = s;
+      y[6] = d;
+      return y.join("");
+    };
+    a.concat8 = function(c, e, q, a, l, s, y, t) {
+      d[0] = c;
+      d[1] = e;
+      d[2] = q;
+      d[3] = a;
+      d[4] = l;
+      d[5] = s;
+      d[6] = y;
+      d[7] = t;
+      return d.join("");
+    };
+    a.concat9 = function(c, e, q, a, l, s, y, d, t) {
+      n[0] = c;
+      n[1] = e;
+      n[2] = q;
+      n[3] = a;
+      n[4] = l;
+      n[5] = s;
+      n[6] = y;
+      n[7] = d;
+      n[8] = t;
+      return n.join("");
+    };
+  })(k.StringUtilities || (k.StringUtilities = {}));
+  (function(a) {
+    var l = new Uint8Array([7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]), c = new Int32Array([-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426, -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162, 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632, 
     643717713, -373897302, -701558691, 38016083, -660478335, -405537848, 568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784, 1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556, -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222, -722521979, 76029189, -640364487, -421815835, 530742520, -995338651, -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606, -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649, 
     -145523070, -1120210379, 718787259, -343485551]);
-    d.hashBytesTo32BitsMD5 = function(f, q, d) {
-      var a = 1732584193, h = -271733879, p = -1732584194, c = 271733878, k = d + 72 & -64, m = new Uint8Array(k), n;
-      for (n = 0;n < d;++n) {
-        m[n] = f[q++];
-      }
-      m[n++] = 128;
-      for (f = k - 8;n < f;) {
-        m[n++] = 0;
-      }
-      m[n++] = d << 3 & 255;
-      m[n++] = d >> 5 & 255;
-      m[n++] = d >> 13 & 255;
-      m[n++] = d >> 21 & 255;
-      m[n++] = d >>> 29 & 255;
-      m[n++] = 0;
-      m[n++] = 0;
-      m[n++] = 0;
-      f = new Int32Array(16);
-      for (n = 0;n < k;) {
-        for (d = 0;16 > d;++d, n += 4) {
-          f[d] = m[n] | m[n + 1] << 8 | m[n + 2] << 16 | m[n + 3] << 24;
-        }
-        var u = a;
-        q = h;
-        var s = p, g = c, v, l;
-        for (d = 0;64 > d;++d) {
-          16 > d ? (v = q & s | ~q & g, l = d) : 32 > d ? (v = g & q | ~g & s, l = 5 * d + 1 & 15) : 48 > d ? (v = q ^ s ^ g, l = 3 * d + 5 & 15) : (v = s ^ (q | ~g), l = 7 * d & 15);
-          var r = g, u = u + v + b[d] + f[l] | 0;
-          v = e[d];
-          g = s;
-          s = q;
-          q = q + (u << v | u >>> 32 - v) | 0;
-          u = r;
-        }
-        a = a + u | 0;
-        h = h + q | 0;
-        p = p + s | 0;
-        c = c + g | 0;
+    a.hashBytesTo32BitsMD5 = function(e, q, a) {
+      var y = 1732584193, d = -271733879, t = -1732584194, n = 271733878, b = a + 72 & -64, f = new Uint8Array(b), h;
+      for (h = 0;h < a;++h) {
+        f[h] = e[q++];
+      }
+      f[h++] = 128;
+      for (e = b - 8;h < e;) {
+        f[h++] = 0;
+      }
+      f[h++] = a << 3 & 255;
+      f[h++] = a >> 5 & 255;
+      f[h++] = a >> 13 & 255;
+      f[h++] = a >> 21 & 255;
+      f[h++] = a >>> 29 & 255;
+      f[h++] = 0;
+      f[h++] = 0;
+      f[h++] = 0;
+      e = new Int32Array(16);
+      for (h = 0;h < b;) {
+        for (a = 0;16 > a;++a, h += 4) {
+          e[a] = f[h] | f[h + 1] << 8 | f[h + 2] << 16 | f[h + 3] << 24;
+        }
+        var m = y;
+        q = d;
+        var v = t, r = n, g, w;
+        for (a = 0;64 > a;++a) {
+          16 > a ? (g = q & v | ~q & r, w = a) : 32 > a ? (g = r & q | ~r & v, w = 5 * a + 1 & 15) : 48 > a ? (g = q ^ v ^ r, w = 3 * a + 5 & 15) : (g = v ^ (q | ~r), w = 7 * a & 15);
+          var k = r, m = m + g + c[a] + e[w] | 0;
+          g = l[a];
+          r = v;
+          v = q;
+          q = q + (m << g | m >>> 32 - g) | 0;
+          m = k;
+        }
+        y = y + m | 0;
+        d = d + q | 0;
+        t = t + v | 0;
+        n = n + r | 0;
+      }
+      return y;
+    };
+    a.hashBytesTo32BitsAdler = function(c, q, a) {
+      var l = 1, d = 0;
+      for (a = q + a;q < a;++q) {
+        l = (l + (c[q] & 255)) % 65521, d = (d + l) % 65521;
       }
-      return a;
-    };
-    d.hashBytesTo32BitsAdler = function(b, q, e) {
-      var d = 1, a = 0;
-      for (e = q + e;q < e;++q) {
-        d = (d + (b[q] & 255)) % 65521, a = (a + d) % 65521;
-      }
-      return a << 16 | d;
+      return d << 16 | l;
     };
-  })(l.HashUtilities || (l.HashUtilities = {}));
-  var p = function() {
-    function d() {
+  })(k.HashUtilities || (k.HashUtilities = {}));
+  var n = function() {
+    function a() {
     }
-    d.seed = function(e) {
-      d._state[0] = e;
-      d._state[1] = e;
-    };
-    d.next = function() {
-      var e = this._state, b = Math.imul(18273, e[0] & 65535) + (e[0] >>> 16) | 0;
-      e[0] = b;
-      var f = Math.imul(36969, e[1] & 65535) + (e[1] >>> 16) | 0;
-      e[1] = f;
-      e = (b << 16) + (f & 65535) | 0;
-      return 2.3283064365386963E-10 * (0 > e ? e + 4294967296 : e);
+    a.seed = function(l) {
+      a._state[0] = l;
+      a._state[1] = l;
+    };
+    a.next = function() {
+      var a = this._state, c = Math.imul(18273, a[0] & 65535) + (a[0] >>> 16) | 0;
+      a[0] = c;
+      var e = Math.imul(36969, a[1] & 65535) + (a[1] >>> 16) | 0;
+      a[1] = e;
+      a = (c << 16) + (e & 65535) | 0;
+      return 2.3283064365386963E-10 * (0 > a ? a + 4294967296 : a);
     };
-    d._state = new Uint32Array([57005, 48879]);
-    return d;
+    a._state = new Uint32Array([57005, 48879]);
+    return a;
   }();
-  l.Random = p;
+  k.Random = n;
   Math.random = function() {
-    return p.next();
+    return n.next();
   };
   (function() {
-    function d() {
-      this.id = "$weakmap" + e++;
+    function a() {
+      this.id = "$weakmap" + l++;
     }
     if ("function" !== typeof jsGlobal.WeakMap) {
-      var e = 0;
-      d.prototype = {has:function(b) {
-        return b.hasOwnProperty(this.id);
-      }, get:function(b, f) {
-        return b.hasOwnProperty(this.id) ? b[this.id] : f;
-      }, set:function(b, f) {
-        Object.defineProperty(b, this.id, {value:f, enumerable:!1, configurable:!0});
+      var l = 0;
+      a.prototype = {has:function(c) {
+        return c.hasOwnProperty(this.id);
+      }, get:function(c, e) {
+        return c.hasOwnProperty(this.id) ? c[this.id] : e;
+      }, set:function(c, e) {
+        Object.defineProperty(c, this.id, {value:e, enumerable:!1, configurable:!0});
+      }, delete:function(c) {
+        delete c[this.id];
       }};
-      jsGlobal.WeakMap = d;
+      jsGlobal.WeakMap = a;
     }
   })();
   a = function() {
-    function d() {
+    function a() {
       "undefined" !== typeof netscape && netscape.security.PrivilegeManager ? this._map = new WeakMap : this._list = [];
     }
-    d.prototype.clear = function() {
+    a.prototype.clear = function() {
       this._map ? this._map.clear() : this._list.length = 0;
     };
-    d.prototype.push = function(e) {
-      this._map ? this._map.set(e, null) : this._list.push(e);
+    a.prototype.push = function(a) {
+      this._map ? this._map.set(a, null) : this._list.push(a);
     };
-    d.prototype.remove = function(e) {
-      this._map ? this._map.delete(e) : this._list[this._list.indexOf(e)] = null;
+    a.prototype.remove = function(a) {
+      this._map ? this._map.delete(a) : this._list[this._list.indexOf(a)] = null;
     };
-    d.prototype.forEach = function(e) {
+    a.prototype.forEach = function(a) {
       if (this._map) {
-        "undefined" !== typeof netscape && netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"), Components.utils.nondeterministicGetWeakMapKeys(this._map).forEach(function(b) {
-          0 !== b._referenceCount && e(b);
+        "undefined" !== typeof netscape && netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"), Components.utils.nondeterministicGetWeakMapKeys(this._map).forEach(function(c) {
+          0 !== c._referenceCount && a(c);
         });
       } else {
-        for (var b = this._list, f = 0, q = 0;q < b.length;q++) {
-          var d = b[q];
-          d && (0 === d._referenceCount ? (b[q] = null, f++) : e(d));
+        for (var c = this._list, e = 0, q = 0;q < c.length;q++) {
+          var s = c[q];
+          s && (0 === s._referenceCount ? (c[q] = null, e++) : a(s));
         }
-        if (16 < f && f > b.length >> 2) {
-          f = [];
-          for (q = 0;q < b.length;q++) {
-            (d = b[q]) && 0 < d._referenceCount && f.push(d);
+        if (16 < e && e > c.length >> 2) {
+          e = [];
+          for (q = 0;q < c.length;q++) {
+            (s = c[q]) && 0 < s._referenceCount && e.push(s);
           }
-          this._list = f;
+          this._list = e;
         }
       }
     };
-    Object.defineProperty(d.prototype, "length", {get:function() {
+    Object.defineProperty(a.prototype, "length", {get:function() {
       return this._map ? -1 : this._list.length;
     }, enumerable:!0, configurable:!0});
-    return d;
+    return a;
   }();
-  l.WeakList = a;
-  var k;
-  (function(d) {
-    d.pow2 = function(e) {
-      return e === (e | 0) ? 0 > e ? 1 / (1 << -e) : 1 << e : Math.pow(2, e);
-    };
-    d.clamp = function(e, b, f) {
-      return Math.max(b, Math.min(f, e));
-    };
-    d.roundHalfEven = function(e) {
-      if (.5 === Math.abs(e % 1)) {
-        var b = Math.floor(e);
-        return 0 === b % 2 ? b : Math.ceil(e);
-      }
-      return Math.round(e);
-    };
-    d.epsilonEquals = function(e, b) {
-      return 1E-7 > Math.abs(e - b);
-    };
-  })(k = l.NumberUtilities || (l.NumberUtilities = {}));
-  (function(d) {
-    d[d.MaxU16 = 65535] = "MaxU16";
-    d[d.MaxI16 = 32767] = "MaxI16";
-    d[d.MinI16 = -32768] = "MinI16";
-  })(l.Numbers || (l.Numbers = {}));
-  var u;
-  (function(d) {
-    function e(b) {
-      return 256 * b << 16 >> 16;
-    }
-    var b = new ArrayBuffer(8);
-    d.i8 = new Int8Array(b);
-    d.u8 = new Uint8Array(b);
-    d.i32 = new Int32Array(b);
-    d.f32 = new Float32Array(b);
-    d.f64 = new Float64Array(b);
-    d.nativeLittleEndian = 1 === (new Int8Array((new Int32Array([1])).buffer))[0];
-    d.floatToInt32 = function(b) {
-      d.f32[0] = b;
-      return d.i32[0];
-    };
-    d.int32ToFloat = function(b) {
-      d.i32[0] = b;
-      return d.f32[0];
-    };
-    d.swap16 = function(b) {
-      return(b & 255) << 8 | b >> 8 & 255;
-    };
-    d.swap32 = function(b) {
-      return(b & 255) << 24 | (b & 65280) << 8 | b >> 8 & 65280 | b >> 24 & 255;
-    };
-    d.toS8U8 = e;
-    d.fromS8U8 = function(b) {
-      return b / 256;
-    };
-    d.clampS8U8 = function(b) {
-      return e(b) / 256;
-    };
-    d.toS16 = function(b) {
-      return b << 16 >> 16;
-    };
-    d.bitCount = function(b) {
-      b -= b >> 1 & 1431655765;
-      b = (b & 858993459) + (b >> 2 & 858993459);
-      return 16843009 * (b + (b >> 4) & 252645135) >> 24;
-    };
-    d.ones = function(b) {
-      b -= b >> 1 & 1431655765;
-      b = (b & 858993459) + (b >> 2 & 858993459);
-      return 16843009 * (b + (b >> 4) & 252645135) >> 24;
-    };
-    d.trailingZeros = function(b) {
-      return d.ones((b & -b) - 1);
-    };
-    d.getFlags = function(b, q) {
-      var e = "";
-      for (b = 0;b < q.length;b++) {
-        b & 1 << b && (e += q[b] + " ");
-      }
-      return 0 === e.length ? "" : e.trim();
-    };
-    d.isPowerOfTwo = function(b) {
-      return b && 0 === (b & b - 1);
-    };
-    d.roundToMultipleOfFour = function(b) {
-      return b + 3 & -4;
-    };
-    d.nearestPowerOfTwo = function(b) {
-      b--;
-      b |= b >> 1;
-      b |= b >> 2;
-      b |= b >> 4;
-      b |= b >> 8;
-      b |= b >> 16;
-      b++;
-      return b;
+  k.WeakList = a;
+  var f;
+  (function(a) {
+    a.pow2 = function(a) {
+      return a === (a | 0) ? 0 > a ? 1 / (1 << -a) : 1 << a : Math.pow(2, a);
+    };
+    a.clamp = function(a, c, e) {
+      return Math.max(c, Math.min(e, a));
+    };
+    a.roundHalfEven = function(a) {
+      if (.5 === Math.abs(a % 1)) {
+        var c = Math.floor(a);
+        return 0 === c % 2 ? c : Math.ceil(a);
+      }
+      return Math.round(a);
+    };
+    a.altTieBreakRound = function(a, c) {
+      return.5 !== Math.abs(a % 1) || c ? Math.round(a) : a | 0;
+    };
+    a.epsilonEquals = function(a, c) {
+      return 1E-7 > Math.abs(a - c);
+    };
+  })(f = k.NumberUtilities || (k.NumberUtilities = {}));
+  (function(a) {
+    a[a.MaxU16 = 65535] = "MaxU16";
+    a[a.MaxI16 = 32767] = "MaxI16";
+    a[a.MinI16 = -32768] = "MinI16";
+  })(k.Numbers || (k.Numbers = {}));
+  var v;
+  (function(a) {
+    function l(c) {
+      return 256 * c << 16 >> 16;
+    }
+    var c = new ArrayBuffer(8);
+    a.i8 = new Int8Array(c);
+    a.u8 = new Uint8Array(c);
+    a.i32 = new Int32Array(c);
+    a.f32 = new Float32Array(c);
+    a.f64 = new Float64Array(c);
+    a.nativeLittleEndian = 1 === (new Int8Array((new Int32Array([1])).buffer))[0];
+    a.floatToInt32 = function(c) {
+      a.f32[0] = c;
+      return a.i32[0];
+    };
+    a.int32ToFloat = function(c) {
+      a.i32[0] = c;
+      return a.f32[0];
+    };
+    a.swap16 = function(c) {
+      return(c & 255) << 8 | c >> 8 & 255;
+    };
+    a.swap32 = function(c) {
+      return(c & 255) << 24 | (c & 65280) << 8 | c >> 8 & 65280 | c >> 24 & 255;
+    };
+    a.toS8U8 = l;
+    a.fromS8U8 = function(c) {
+      return c / 256;
+    };
+    a.clampS8U8 = function(c) {
+      return l(c) / 256;
+    };
+    a.toS16 = function(c) {
+      return c << 16 >> 16;
+    };
+    a.bitCount = function(c) {
+      c -= c >> 1 & 1431655765;
+      c = (c & 858993459) + (c >> 2 & 858993459);
+      return 16843009 * (c + (c >> 4) & 252645135) >> 24;
+    };
+    a.ones = function(c) {
+      c -= c >> 1 & 1431655765;
+      c = (c & 858993459) + (c >> 2 & 858993459);
+      return 16843009 * (c + (c >> 4) & 252645135) >> 24;
+    };
+    a.trailingZeros = function(c) {
+      return a.ones((c & -c) - 1);
+    };
+    a.getFlags = function(c, q) {
+      var a = "";
+      for (c = 0;c < q.length;c++) {
+        c & 1 << c && (a += q[c] + " ");
+      }
+      return 0 === a.length ? "" : a.trim();
+    };
+    a.isPowerOfTwo = function(c) {
+      return c && 0 === (c & c - 1);
+    };
+    a.roundToMultipleOfFour = function(c) {
+      return c + 3 & -4;
+    };
+    a.nearestPowerOfTwo = function(c) {
+      c--;
+      c |= c >> 1;
+      c |= c >> 2;
+      c |= c >> 4;
+      c |= c >> 8;
+      c |= c >> 16;
+      c++;
+      return c;
     };
-    d.roundToMultipleOfPowerOfTwo = function(b, q) {
-      var e = (1 << q) - 1;
-      return b + e & ~e;
-    };
-    Math.imul || (Math.imul = function(b, q) {
-      var e = b & 65535, d = q & 65535;
-      return e * d + ((b >>> 16 & 65535) * d + e * (q >>> 16 & 65535) << 16 >>> 0) | 0;
+    a.roundToMultipleOfPowerOfTwo = function(c, q) {
+      var a = (1 << q) - 1;
+      return c + a & ~a;
+    };
+    Math.imul || (Math.imul = function(c, q) {
+      var a = c & 65535, l = q & 65535;
+      return a * l + ((c >>> 16 & 65535) * l + a * (q >>> 16 & 65535) << 16 >>> 0) | 0;
     });
-    Math.clz32 || (Math.clz32 = function(b) {
-      b |= b >> 1;
-      b |= b >> 2;
-      b |= b >> 4;
-      b |= b >> 8;
-      return 32 - d.ones(b | b >> 16);
+    Math.clz32 || (Math.clz32 = function(c) {
+      c |= c >> 1;
+      c |= c >> 2;
+      c |= c >> 4;
+      c |= c >> 8;
+      return 32 - a.ones(c | c >> 16);
     });
-  })(u = l.IntegerUtilities || (l.IntegerUtilities = {}));
-  (function(d) {
-    function e(b, f, q, e, d, a) {
-      return(q - b) * (a - f) - (e - f) * (d - b);
-    }
-    d.pointInPolygon = function(b, f, q) {
-      for (var e = 0, d = q.length - 2, a = 0;a < d;a += 2) {
-        var h = q[a + 0], p = q[a + 1], c = q[a + 2], k = q[a + 3];
-        (p <= f && k > f || p > f && k <= f) && b < h + (f - p) / (k - p) * (c - h) && e++;
-      }
-      return 1 === (e & 1);
-    };
-    d.signedArea = e;
-    d.counterClockwise = function(b, f, q, d, a, h) {
-      return 0 < e(b, f, q, d, a, h);
-    };
-    d.clockwise = function(b, f, q, d, a, h) {
-      return 0 > e(b, f, q, d, a, h);
-    };
-    d.pointInPolygonInt32 = function(b, f, q) {
-      b |= 0;
-      f |= 0;
-      for (var e = 0, d = q.length - 2, a = 0;a < d;a += 2) {
-        var h = q[a + 0], p = q[a + 1], c = q[a + 2], k = q[a + 3];
-        (p <= f && k > f || p > f && k <= f) && b < h + (f - p) / (k - p) * (c - h) && e++;
-      }
-      return 1 === (e & 1);
-    };
-  })(l.GeometricUtilities || (l.GeometricUtilities = {}));
-  (function(d) {
-    d[d.Error = 1] = "Error";
-    d[d.Warn = 2] = "Warn";
-    d[d.Debug = 4] = "Debug";
-    d[d.Log = 8] = "Log";
-    d[d.Info = 16] = "Info";
-    d[d.All = 31] = "All";
-  })(l.LogLevel || (l.LogLevel = {}));
+  })(v = k.IntegerUtilities || (k.IntegerUtilities = {}));
+  (function(a) {
+    function l(c, e, q, a, l, d) {
+      return(q - c) * (d - e) - (a - e) * (l - c);
+    }
+    a.pointInPolygon = function(c, e, q) {
+      for (var a = 0, l = q.length - 2, d = 0;d < l;d += 2) {
+        var t = q[d + 0], n = q[d + 1], f = q[d + 2], b = q[d + 3];
+        (n <= e && b > e || n > e && b <= e) && c < t + (e - n) / (b - n) * (f - t) && a++;
+      }
+      return 1 === (a & 1);
+    };
+    a.signedArea = l;
+    a.counterClockwise = function(c, e, q, a, d, I) {
+      return 0 < l(c, e, q, a, d, I);
+    };
+    a.clockwise = function(c, e, q, a, d, I) {
+      return 0 > l(c, e, q, a, d, I);
+    };
+    a.pointInPolygonInt32 = function(c, e, q) {
+      c |= 0;
+      e |= 0;
+      for (var a = 0, l = q.length - 2, d = 0;d < l;d += 2) {
+        var t = q[d + 0], n = q[d + 1], f = q[d + 2], b = q[d + 3];
+        (n <= e && b > e || n > e && b <= e) && c < t + (e - n) / (b - n) * (f - t) && a++;
+      }
+      return 1 === (a & 1);
+    };
+  })(k.GeometricUtilities || (k.GeometricUtilities = {}));
+  (function(a) {
+    a[a.Error = 1] = "Error";
+    a[a.Warn = 2] = "Warn";
+    a[a.Debug = 4] = "Debug";
+    a[a.Log = 8] = "Log";
+    a[a.Info = 16] = "Info";
+    a[a.All = 31] = "All";
+  })(k.LogLevel || (k.LogLevel = {}));
   a = function() {
-    function d(e, b) {
-      void 0 === e && (e = !1);
+    function a(l, c) {
+      void 0 === l && (l = !1);
       this._tab = "  ";
       this._padding = "";
-      this._suppressOutput = e;
-      this._out = b || d._consoleOut;
-      this._outNoNewline = b || d._consoleOutNoNewline;
-    }
-    d.prototype.write = function(e, b) {
-      void 0 === e && (e = "");
-      void 0 === b && (b = !1);
-      this._suppressOutput || this._outNoNewline((b ? this._padding : "") + e);
-    };
-    d.prototype.writeLn = function(e) {
-      void 0 === e && (e = "");
-      this._suppressOutput || this._out(this._padding + e);
-    };
-    d.prototype.writeObject = function(e, b) {
-      void 0 === e && (e = "");
-      this._suppressOutput || this._out(this._padding + e, b);
-    };
-    d.prototype.writeTimeLn = function(e) {
-      void 0 === e && (e = "");
-      this._suppressOutput || this._out(this._padding + performance.now().toFixed(2) + " " + e);
-    };
-    d.prototype.writeComment = function(e) {
-      e = e.split("\n");
-      if (1 === e.length) {
-        this.writeLn("// " + e[0]);
+      this._suppressOutput = l;
+      this._out = c || a._consoleOut;
+      this._outNoNewline = c || a._consoleOutNoNewline;
+    }
+    a.prototype.write = function(a, c) {
+      void 0 === a && (a = "");
+      void 0 === c && (c = !1);
+      this._suppressOutput || this._outNoNewline((c ? this._padding : "") + a);
+    };
+    a.prototype.writeLn = function(a) {
+      void 0 === a && (a = "");
+      this._suppressOutput || this._out(this._padding + a);
+    };
+    a.prototype.writeObject = function(a, c) {
+      void 0 === a && (a = "");
+      this._suppressOutput || this._out(this._padding + a, c);
+    };
+    a.prototype.writeTimeLn = function(a) {
+      void 0 === a && (a = "");
+      this._suppressOutput || this._out(this._padding + performance.now().toFixed(2) + " " + a);
+    };
+    a.prototype.writeComment = function(a) {
+      a = a.split("\n");
+      if (1 === a.length) {
+        this.writeLn("// " + a[0]);
       } else {
         this.writeLn("/**");
-        for (var b = 0;b < e.length;b++) {
-          this.writeLn(" * " + e[b]);
+        for (var c = 0;c < a.length;c++) {
+          this.writeLn(" * " + a[c]);
         }
         this.writeLn(" */");
       }
     };
-    d.prototype.writeLns = function(e) {
-      e = e.split("\n");
-      for (var b = 0;b < e.length;b++) {
-        this.writeLn(e[b]);
+    a.prototype.writeLns = function(a) {
+      a = a.split("\n");
+      for (var c = 0;c < a.length;c++) {
+        this.writeLn(a[c]);
       }
     };
-    d.prototype.errorLn = function(e) {
-      d.logLevel & 1 && this.boldRedLn(e);
+    a.prototype.errorLn = function(l) {
+      a.logLevel & 1 && this.boldRedLn(l);
     };
-    d.prototype.warnLn = function(e) {
-      d.logLevel & 2 && this.yellowLn(e);
+    a.prototype.warnLn = function(l) {
+      a.logLevel & 2 && this.yellowLn(l);
     };
-    d.prototype.debugLn = function(e) {
-      d.logLevel & 4 && this.purpleLn(e);
+    a.prototype.debugLn = function(l) {
+      a.logLevel & 4 && this.purpleLn(l);
     };
-    d.prototype.logLn = function(e) {
-      d.logLevel & 8 && this.writeLn(e);
+    a.prototype.logLn = function(l) {
+      a.logLevel & 8 && this.writeLn(l);
     };
-    d.prototype.infoLn = function(e) {
-      d.logLevel & 16 && this.writeLn(e);
+    a.prototype.infoLn = function(l) {
+      a.logLevel & 16 && this.writeLn(l);
     };
-    d.prototype.yellowLn = function(e) {
-      this.colorLn(d.YELLOW, e);
+    a.prototype.yellowLn = function(l) {
+      this.colorLn(a.YELLOW, l);
     };
-    d.prototype.greenLn = function(e) {
-      this.colorLn(d.GREEN, e);
+    a.prototype.greenLn = function(l) {
+      this.colorLn(a.GREEN, l);
     };
-    d.prototype.boldRedLn = function(e) {
-      this.colorLn(d.BOLD_RED, e);
+    a.prototype.boldRedLn = function(l) {
+      this.colorLn(a.BOLD_RED, l);
     };
-    d.prototype.redLn = function(e) {
-      this.colorLn(d.RED, e);
+    a.prototype.redLn = function(l) {
+      this.colorLn(a.RED, l);
     };
-    d.prototype.purpleLn = function(e) {
-      this.colorLn(d.PURPLE, e);
+    a.prototype.purpleLn = function(l) {
+      this.colorLn(a.PURPLE, l);
     };
-    d.prototype.colorLn = function(e, b) {
-      this._suppressOutput || (inBrowser ? this._out(this._padding + b) : this._out(this._padding + e + b + d.ENDC));
+    a.prototype.colorLn = function(l, c) {
+      this._suppressOutput || (inBrowser ? this._out(this._padding + c) : this._out(this._padding + l + c + a.ENDC));
     };
-    d.prototype.redLns = function(e) {
-      this.colorLns(d.RED, e);
+    a.prototype.redLns = function(l) {
+      this.colorLns(a.RED, l);
     };
-    d.prototype.colorLns = function(e, b) {
-      for (var f = b.split("\n"), q = 0;q < f.length;q++) {
-        this.colorLn(e, f[q]);
+    a.prototype.colorLns = function(a, c) {
+      for (var e = c.split("\n"), q = 0;q < e.length;q++) {
+        this.colorLn(a, e[q]);
       }
     };
-    d.prototype.enter = function(e) {
-      this._suppressOutput || this._out(this._padding + e);
+    a.prototype.enter = function(a) {
+      this._suppressOutput || this._out(this._padding + a);
       this.indent();
     };
-    d.prototype.leaveAndEnter = function(e) {
-      this.leave(e);
+    a.prototype.leaveAndEnter = function(a) {
+      this.leave(a);
       this.indent();
     };
-    d.prototype.leave = function(e) {
+    a.prototype.leave = function(a) {
       this.outdent();
-      !this._suppressOutput && e && this._out(this._padding + e);
+      !this._suppressOutput && a && this._out(this._padding + a);
     };
-    d.prototype.indent = function() {
+    a.prototype.indent = function() {
       this._padding += this._tab;
     };
-    d.prototype.outdent = function() {
+    a.prototype.outdent = function() {
       0 < this._padding.length && (this._padding = this._padding.substring(0, this._padding.length - this._tab.length));
     };
-    d.prototype.writeArray = function(e, b, f) {
-      void 0 === b && (b = !1);
-      void 0 === f && (f = !1);
-      b = b || !1;
-      for (var q = 0, d = e.length;q < d;q++) {
-        var a = "";
-        b && (a = null === e[q] ? "null" : void 0 === e[q] ? "undefined" : e[q].constructor.name, a += " ");
-        var h = f ? "" : ("" + q).padRight(" ", 4);
-        this.writeLn(h + a + e[q]);
-      }
-    };
-    d.PURPLE = "\u001b[94m";
-    d.YELLOW = "\u001b[93m";
-    d.GREEN = "\u001b[92m";
-    d.RED = "\u001b[91m";
-    d.BOLD_RED = "\u001b[1;91m";
-    d.ENDC = "\u001b[0m";
-    d.logLevel = 31;
-    d._consoleOut = console.info.bind(console);
-    d._consoleOutNoNewline = console.info.bind(console);
-    return d;
+    a.prototype.writeArray = function(a, c, e) {
+      void 0 === c && (c = !1);
+      void 0 === e && (e = !1);
+      c = c || !1;
+      for (var q = 0, s = a.length;q < s;q++) {
+        var d = "";
+        c && (d = null === a[q] ? "null" : void 0 === a[q] ? "undefined" : a[q].constructor.name, d += " ");
+        var I = e ? "" : ("" + q).padRight(" ", 4);
+        this.writeLn(I + d + a[q]);
+      }
+    };
+    a.PURPLE = "\u001b[94m";
+    a.YELLOW = "\u001b[93m";
+    a.GREEN = "\u001b[92m";
+    a.RED = "\u001b[91m";
+    a.BOLD_RED = "\u001b[1;91m";
+    a.ENDC = "\u001b[0m";
+    a.logLevel = 31;
+    a._consoleOut = console.info.bind(console);
+    a._consoleOutNoNewline = console.info.bind(console);
+    return a;
   }();
-  l.IndentingWriter = a;
-  var n = function() {
-    return function(d, e) {
-      this.value = d;
-      this.next = e;
+  k.IndentingWriter = a;
+  var m = function() {
+    return function(a, l) {
+      this.value = a;
+      this.next = l;
     };
   }(), a = function() {
-    function d(e) {
-      this._compare = e;
+    function a(l) {
+      this._compare = l;
       this._head = null;
       this._length = 0;
     }
-    d.prototype.push = function(e) {
+    a.prototype.push = function(a) {
       this._length++;
       if (this._head) {
-        var b = this._head, f = null;
-        e = new n(e, null);
-        for (var q = this._compare;b;) {
-          if (0 < q(b.value, e.value)) {
-            f ? (e.next = b, f.next = e) : (e.next = this._head, this._head = e);
+        var c = this._head, e = null;
+        a = new m(a, null);
+        for (var q = this._compare;c;) {
+          if (0 < q(c.value, a.value)) {
+            e ? (a.next = c, e.next = a) : (a.next = this._head, this._head = a);
             return;
           }
-          f = b;
-          b = b.next;
+          e = c;
+          c = c.next;
         }
-        f.next = e;
+        e.next = a;
       } else {
-        this._head = new n(e, null);
+        this._head = new m(a, null);
       }
     };
-    d.prototype.forEach = function(e) {
-      for (var b = this._head, f = null;b;) {
-        var q = e(b.value);
-        if (q === d.RETURN) {
+    a.prototype.forEach = function(l) {
+      for (var c = this._head, e = null;c;) {
+        var q = l(c.value);
+        if (q === a.RETURN) {
           break;
         } else {
-          q === d.DELETE ? b = f ? f.next = b.next : this._head = this._head.next : (f = b, b = b.next);
+          q === a.DELETE ? c = e ? e.next = c.next : this._head = this._head.next : (e = c, c = c.next);
         }
       }
     };
-    d.prototype.isEmpty = function() {
+    a.prototype.isEmpty = function() {
       return!this._head;
     };
-    d.prototype.pop = function() {
+    a.prototype.pop = function() {
       if (this._head) {
         this._length--;
-        var e = this._head;
+        var a = this._head;
         this._head = this._head.next;
-        return e.value;
+        return a.value;
       }
     };
-    d.prototype.contains = function(e) {
-      for (var b = this._head;b;) {
-        if (b.value === e) {
+    a.prototype.contains = function(a) {
+      for (var c = this._head;c;) {
+        if (c.value === a) {
           return!0;
         }
-        b = b.next;
+        c = c.next;
       }
       return!1;
     };
-    d.prototype.toString = function() {
-      for (var e = "[", b = this._head;b;) {
-        e += b.value.toString(), (b = b.next) && (e += ",");
-      }
-      return e + "]";
-    };
-    d.RETURN = 1;
-    d.DELETE = 2;
-    return d;
+    a.prototype.toString = function() {
+      for (var a = "[", c = this._head;c;) {
+        a += c.value.toString(), (c = c.next) && (a += ",");
+      }
+      return a + "]";
+    };
+    a.RETURN = 1;
+    a.DELETE = 2;
+    return a;
   }();
-  l.SortedList = a;
+  k.SortedList = a;
   a = function() {
-    function d(e, b) {
-      void 0 === b && (b = 12);
+    function a(l, c) {
+      void 0 === c && (c = 12);
       this.start = this.index = 0;
-      this._size = 1 << b;
+      this._size = 1 << c;
       this._mask = this._size - 1;
-      this.array = new e(this._size);
+      this.array = new l(this._size);
     }
-    d.prototype.get = function(e) {
-      return this.array[e];
+    a.prototype.get = function(a) {
+      return this.array[a];
     };
-    d.prototype.forEachInReverse = function(e) {
+    a.prototype.forEachInReverse = function(a) {
       if (!this.isEmpty()) {
-        for (var b = 0 === this.index ? this._size - 1 : this.index - 1, f = this.start - 1 & this._mask;b !== f && !e(this.array[b], b);) {
-          b = 0 === b ? this._size - 1 : b - 1;
+        for (var c = 0 === this.index ? this._size - 1 : this.index - 1, e = this.start - 1 & this._mask;c !== e && !a(this.array[c], c);) {
+          c = 0 === c ? this._size - 1 : c - 1;
         }
       }
     };
-    d.prototype.write = function(e) {
-      this.array[this.index] = e;
+    a.prototype.write = function(a) {
+      this.array[this.index] = a;
       this.index = this.index + 1 & this._mask;
       this.index === this.start && (this.start = this.start + 1 & this._mask);
     };
-    d.prototype.isFull = function() {
+    a.prototype.isFull = function() {
       return(this.index + 1 & this._mask) === this.start;
     };
-    d.prototype.isEmpty = function() {
+    a.prototype.isEmpty = function() {
       return this.index === this.start;
     };
-    d.prototype.reset = function() {
+    a.prototype.reset = function() {
       this.start = this.index = 0;
     };
-    return d;
+    return a;
   }();
-  l.CircularBuffer = a;
-  (function(d) {
-    function e(b) {
-      return b + (d.BITS_PER_WORD - 1) >> d.ADDRESS_BITS_PER_WORD << d.ADDRESS_BITS_PER_WORD;
-    }
-    function b(b, f) {
-      b = b || "1";
-      f = f || "0";
-      for (var q = "", e = 0;e < length;e++) {
-        q += this.get(e) ? b : f;
+  k.CircularBuffer = a;
+  (function(a) {
+    function l(c) {
+      return c + (a.BITS_PER_WORD - 1) >> a.ADDRESS_BITS_PER_WORD << a.ADDRESS_BITS_PER_WORD;
+    }
+    function c(c, a) {
+      c = c || "1";
+      a = a || "0";
+      for (var e = "", q = 0;q < length;q++) {
+        e += this.get(q) ? c : a;
       }
-      return q;
+      return e;
     }
-    function f(b) {
-      for (var f = [], q = 0;q < length;q++) {
-        this.get(q) && f.push(b ? b[q] : q);
-      }
-      return f.join(", ");
-    }
-    d.ADDRESS_BITS_PER_WORD = 5;
-    d.BITS_PER_WORD = 1 << d.ADDRESS_BITS_PER_WORD;
-    d.BIT_INDEX_MASK = d.BITS_PER_WORD - 1;
+    function e(c) {
+      for (var a = [], e = 0;e < length;e++) {
+        this.get(e) && a.push(c ? c[e] : e);
+      }
+      return a.join(", ");
+    }
+    a.ADDRESS_BITS_PER_WORD = 5;
+    a.BITS_PER_WORD = 1 << a.ADDRESS_BITS_PER_WORD;
+    a.BIT_INDEX_MASK = a.BITS_PER_WORD - 1;
     var q = function() {
-      function b(f) {
-        this.size = e(f);
+      function c(e) {
+        this.size = l(e);
         this.dirty = this.count = 0;
-        this.length = f;
-        this.bits = new Uint32Array(this.size >> d.ADDRESS_BITS_PER_WORD);
+        this.length = e;
+        this.bits = new Uint32Array(this.size >> a.ADDRESS_BITS_PER_WORD);
       }
-      b.prototype.recount = function() {
+      c.prototype.recount = function() {
         if (this.dirty) {
-          for (var b = this.bits, f = 0, q = 0, e = b.length;q < e;q++) {
-            var d = b[q], d = d - (d >> 1 & 1431655765), d = (d & 858993459) + (d >> 2 & 858993459), f = f + (16843009 * (d + (d >> 4) & 252645135) >> 24)
+          for (var c = this.bits, a = 0, e = 0, q = c.length;e < q;e++) {
+            var s = c[e], s = s - (s >> 1 & 1431655765), s = (s & 858993459) + (s >> 2 & 858993459), a = a + (16843009 * (s + (s >> 4) & 252645135) >> 24)
           }
-          this.count = f;
+          this.count = a;
           this.dirty = 0;
         }
       };
-      b.prototype.set = function(b) {
-        var f = b >> d.ADDRESS_BITS_PER_WORD, q = this.bits[f];
-        b = q | 1 << (b & d.BIT_INDEX_MASK);
-        this.bits[f] = b;
-        this.dirty |= q ^ b;
-      };
-      b.prototype.setAll = function() {
-        for (var b = this.bits, f = 0, q = b.length;f < q;f++) {
-          b[f] = 4294967295;
+      c.prototype.set = function(c) {
+        var e = c >> a.ADDRESS_BITS_PER_WORD, q = this.bits[e];
+        c = q | 1 << (c & a.BIT_INDEX_MASK);
+        this.bits[e] = c;
+        this.dirty |= q ^ c;
+      };
+      c.prototype.setAll = function() {
+        for (var c = this.bits, a = 0, e = c.length;a < e;a++) {
+          c[a] = 4294967295;
         }
         this.count = this.size;
         this.dirty = 0;
       };
-      b.prototype.assign = function(b) {
-        this.count = b.count;
-        this.dirty = b.dirty;
-        this.size = b.size;
-        for (var f = 0, q = this.bits.length;f < q;f++) {
-          this.bits[f] = b.bits[f];
-        }
-      };
-      b.prototype.clear = function(b) {
-        var f = b >> d.ADDRESS_BITS_PER_WORD, q = this.bits[f];
-        b = q & ~(1 << (b & d.BIT_INDEX_MASK));
-        this.bits[f] = b;
-        this.dirty |= q ^ b;
-      };
-      b.prototype.get = function(b) {
-        return 0 !== (this.bits[b >> d.ADDRESS_BITS_PER_WORD] & 1 << (b & d.BIT_INDEX_MASK));
-      };
-      b.prototype.clearAll = function() {
-        for (var b = this.bits, f = 0, q = b.length;f < q;f++) {
-          b[f] = 0;
+      c.prototype.assign = function(c) {
+        this.count = c.count;
+        this.dirty = c.dirty;
+        this.size = c.size;
+        for (var a = 0, e = this.bits.length;a < e;a++) {
+          this.bits[a] = c.bits[a];
+        }
+      };
+      c.prototype.clear = function(c) {
+        var e = c >> a.ADDRESS_BITS_PER_WORD, q = this.bits[e];
+        c = q & ~(1 << (c & a.BIT_INDEX_MASK));
+        this.bits[e] = c;
+        this.dirty |= q ^ c;
+      };
+      c.prototype.get = function(c) {
+        return 0 !== (this.bits[c >> a.ADDRESS_BITS_PER_WORD] & 1 << (c & a.BIT_INDEX_MASK));
+      };
+      c.prototype.clearAll = function() {
+        for (var c = this.bits, a = 0, e = c.length;a < e;a++) {
+          c[a] = 0;
         }
         this.dirty = this.count = 0;
       };
-      b.prototype._union = function(b) {
-        var f = this.dirty, q = this.bits;
-        b = b.bits;
-        for (var e = 0, d = q.length;e < d;e++) {
-          var a = q[e], w = a | b[e];
-          q[e] = w;
-          f |= a ^ w;
-        }
-        this.dirty = f;
-      };
-      b.prototype.intersect = function(b) {
-        var f = this.dirty, q = this.bits;
-        b = b.bits;
-        for (var e = 0, d = q.length;e < d;e++) {
-          var a = q[e], w = a & b[e];
-          q[e] = w;
-          f |= a ^ w;
-        }
-        this.dirty = f;
-      };
-      b.prototype.subtract = function(b) {
-        var f = this.dirty, q = this.bits;
-        b = b.bits;
-        for (var e = 0, d = q.length;e < d;e++) {
-          var a = q[e], w = a & ~b[e];
-          q[e] = w;
-          f |= a ^ w;
-        }
-        this.dirty = f;
-      };
-      b.prototype.negate = function() {
-        for (var b = this.dirty, f = this.bits, q = 0, e = f.length;q < e;q++) {
-          var d = f[q], a = ~d;
-          f[q] = a;
-          b |= d ^ a;
-        }
-        this.dirty = b;
-      };
-      b.prototype.forEach = function(b) {
-        for (var f = this.bits, q = 0, e = f.length;q < e;q++) {
-          var a = f[q];
-          if (a) {
-            for (var w = 0;w < d.BITS_PER_WORD;w++) {
-              a & 1 << w && b(q * d.BITS_PER_WORD + w);
+      c.prototype._union = function(c) {
+        var a = this.dirty, e = this.bits;
+        c = c.bits;
+        for (var q = 0, s = e.length;q < s;q++) {
+          var l = e[q], d = l | c[q];
+          e[q] = d;
+          a |= l ^ d;
+        }
+        this.dirty = a;
+      };
+      c.prototype.intersect = function(c) {
+        var a = this.dirty, e = this.bits;
+        c = c.bits;
+        for (var q = 0, s = e.length;q < s;q++) {
+          var l = e[q], d = l & c[q];
+          e[q] = d;
+          a |= l ^ d;
+        }
+        this.dirty = a;
+      };
+      c.prototype.subtract = function(c) {
+        var a = this.dirty, e = this.bits;
+        c = c.bits;
+        for (var q = 0, s = e.length;q < s;q++) {
+          var l = e[q], d = l & ~c[q];
+          e[q] = d;
+          a |= l ^ d;
+        }
+        this.dirty = a;
+      };
+      c.prototype.negate = function() {
+        for (var c = this.dirty, a = this.bits, e = 0, q = a.length;e < q;e++) {
+          var s = a[e], l = ~s;
+          a[e] = l;
+          c |= s ^ l;
+        }
+        this.dirty = c;
+      };
+      c.prototype.forEach = function(c) {
+        for (var e = this.bits, q = 0, s = e.length;q < s;q++) {
+          var l = e[q];
+          if (l) {
+            for (var d = 0;d < a.BITS_PER_WORD;d++) {
+              l & 1 << d && c(q * a.BITS_PER_WORD + d);
             }
           }
         }
       };
-      b.prototype.toArray = function() {
-        for (var b = [], f = this.bits, q = 0, e = f.length;q < e;q++) {
-          var a = f[q];
-          if (a) {
-            for (var w = 0;w < d.BITS_PER_WORD;w++) {
-              a & 1 << w && b.push(q * d.BITS_PER_WORD + w);
+      c.prototype.toArray = function() {
+        for (var c = [], e = this.bits, q = 0, s = e.length;q < s;q++) {
+          var l = e[q];
+          if (l) {
+            for (var d = 0;d < a.BITS_PER_WORD;d++) {
+              l & 1 << d && c.push(q * a.BITS_PER_WORD + d);
             }
           }
         }
-        return b;
+        return c;
       };
-      b.prototype.equals = function(b) {
-        if (this.size !== b.size) {
+      c.prototype.equals = function(c) {
+        if (this.size !== c.size) {
           return!1;
         }
-        var f = this.bits;
-        b = b.bits;
-        for (var q = 0, e = f.length;q < e;q++) {
-          if (f[q] !== b[q]) {
+        var a = this.bits;
+        c = c.bits;
+        for (var e = 0, q = a.length;e < q;e++) {
+          if (a[e] !== c[e]) {
             return!1;
           }
         }
         return!0;
       };
-      b.prototype.contains = function(b) {
-        if (this.size !== b.size) {
+      c.prototype.contains = function(c) {
+        if (this.size !== c.size) {
           return!1;
         }
-        var f = this.bits;
-        b = b.bits;
-        for (var q = 0, e = f.length;q < e;q++) {
-          if ((f[q] | b[q]) !== f[q]) {
+        var a = this.bits;
+        c = c.bits;
+        for (var e = 0, q = a.length;e < q;e++) {
+          if ((a[e] | c[e]) !== a[e]) {
             return!1;
           }
         }
         return!0;
       };
-      b.prototype.isEmpty = function() {
+      c.prototype.isEmpty = function() {
         this.recount();
         return 0 === this.count;
       };
-      b.prototype.clone = function() {
-        var f = new b(this.length);
-        f._union(this);
-        return f;
+      c.prototype.clone = function() {
+        var a = new c(this.length);
+        a._union(this);
+        return a;
       };
-      return b;
+      return c;
     }();
-    d.Uint32ArrayBitSet = q;
-    var a = function() {
-      function b(f) {
+    a.Uint32ArrayBitSet = q;
+    var s = function() {
+      function c(a) {
         this.dirty = this.count = 0;
-        this.size = e(f);
+        this.size = l(a);
         this.bits = 0;
         this.singleWord = !0;
-        this.length = f;
+        this.length = a;
       }
-      b.prototype.recount = function() {
+      c.prototype.recount = function() {
         if (this.dirty) {
-          var b = this.bits, b = b - (b >> 1 & 1431655765), b = (b & 858993459) + (b >> 2 & 858993459);
-          this.count = 0 + (16843009 * (b + (b >> 4) & 252645135) >> 24);
+          var c = this.bits, c = c - (c >> 1 & 1431655765), c = (c & 858993459) + (c >> 2 & 858993459);
+          this.count = 0 + (16843009 * (c + (c >> 4) & 252645135) >> 24);
           this.dirty = 0;
         }
       };
-      b.prototype.set = function(b) {
-        var f = this.bits;
-        this.bits = b = f | 1 << (b & d.BIT_INDEX_MASK);
-        this.dirty |= f ^ b;
+      c.prototype.set = function(c) {
+        var e = this.bits;
+        this.bits = c = e | 1 << (c & a.BIT_INDEX_MASK);
+        this.dirty |= e ^ c;
       };
-      b.prototype.setAll = function() {
+      c.prototype.setAll = function() {
         this.bits = 4294967295;
         this.count = this.size;
         this.dirty = 0;
       };
-      b.prototype.assign = function(b) {
-        this.count = b.count;
-        this.dirty = b.dirty;
-        this.size = b.size;
-        this.bits = b.bits;
-      };
-      b.prototype.clear = function(b) {
-        var f = this.bits;
-        this.bits = b = f & ~(1 << (b & d.BIT_INDEX_MASK));
-        this.dirty |= f ^ b;
+      c.prototype.assign = function(c) {
+        this.count = c.count;
+        this.dirty = c.dirty;
+        this.size = c.size;
+        this.bits = c.bits;
+      };
+      c.prototype.clear = function(c) {
+        var e = this.bits;
+        this.bits = c = e & ~(1 << (c & a.BIT_INDEX_MASK));
+        this.dirty |= e ^ c;
       };
-      b.prototype.get = function(b) {
-        return 0 !== (this.bits & 1 << (b & d.BIT_INDEX_MASK));
+      c.prototype.get = function(c) {
+        return 0 !== (this.bits & 1 << (c & a.BIT_INDEX_MASK));
       };
-      b.prototype.clearAll = function() {
+      c.prototype.clearAll = function() {
         this.dirty = this.count = this.bits = 0;
       };
-      b.prototype._union = function(b) {
-        var f = this.bits;
-        this.bits = b = f | b.bits;
-        this.dirty = f ^ b;
-      };
-      b.prototype.intersect = function(b) {
-        var f = this.bits;
-        this.bits = b = f & b.bits;
-        this.dirty = f ^ b;
-      };
-      b.prototype.subtract = function(b) {
-        var f = this.bits;
-        this.bits = b = f & ~b.bits;
-        this.dirty = f ^ b;
-      };
-      b.prototype.negate = function() {
-        var b = this.bits, f = ~b;
-        this.bits = f;
-        this.dirty = b ^ f;
-      };
-      b.prototype.forEach = function(b) {
-        var f = this.bits;
-        if (f) {
-          for (var q = 0;q < d.BITS_PER_WORD;q++) {
-            f & 1 << q && b(q);
+      c.prototype._union = function(c) {
+        var a = this.bits;
+        this.bits = c = a | c.bits;
+        this.dirty = a ^ c;
+      };
+      c.prototype.intersect = function(c) {
+        var a = this.bits;
+        this.bits = c = a & c.bits;
+        this.dirty = a ^ c;
+      };
+      c.prototype.subtract = function(c) {
+        var a = this.bits;
+        this.bits = c = a & ~c.bits;
+        this.dirty = a ^ c;
+      };
+      c.prototype.negate = function() {
+        var c = this.bits, a = ~c;
+        this.bits = a;
+        this.dirty = c ^ a;
+      };
+      c.prototype.forEach = function(c) {
+        var e = this.bits;
+        if (e) {
+          for (var q = 0;q < a.BITS_PER_WORD;q++) {
+            e & 1 << q && c(q);
           }
         }
       };
-      b.prototype.toArray = function() {
-        var b = [], f = this.bits;
-        if (f) {
-          for (var q = 0;q < d.BITS_PER_WORD;q++) {
-            f & 1 << q && b.push(q);
+      c.prototype.toArray = function() {
+        var c = [], e = this.bits;
+        if (e) {
+          for (var q = 0;q < a.BITS_PER_WORD;q++) {
+            e & 1 << q && c.push(q);
           }
         }
-        return b;
+        return c;
       };
-      b.prototype.equals = function(b) {
-        return this.bits === b.bits;
+      c.prototype.equals = function(c) {
+        return this.bits === c.bits;
       };
-      b.prototype.contains = function(b) {
-        var f = this.bits;
-        return(f | b.bits) === f;
+      c.prototype.contains = function(c) {
+        var a = this.bits;
+        return(a | c.bits) === a;
       };
-      b.prototype.isEmpty = function() {
+      c.prototype.isEmpty = function() {
         this.recount();
         return 0 === this.count;
       };
-      b.prototype.clone = function() {
-        var f = new b(this.length);
-        f._union(this);
-        return f;
+      c.prototype.clone = function() {
+        var a = new c(this.length);
+        a._union(this);
+        return a;
       };
-      return b;
+      return c;
     }();
-    d.Uint32BitSet = a;
-    a.prototype.toString = f;
-    a.prototype.toBitString = b;
-    q.prototype.toString = f;
-    q.prototype.toBitString = b;
-    d.BitSetFunctor = function(b) {
-      var f = 1 === e(b) >> d.ADDRESS_BITS_PER_WORD ? a : q;
+    a.Uint32BitSet = s;
+    s.prototype.toString = e;
+    s.prototype.toBitString = c;
+    q.prototype.toString = e;
+    q.prototype.toBitString = c;
+    a.BitSetFunctor = function(c) {
+      var e = 1 === l(c) >> a.ADDRESS_BITS_PER_WORD ? s : q;
       return function() {
-        return new f(b);
+        return new e(c);
       };
     };
-  })(l.BitSets || (l.BitSets = {}));
+  })(k.BitSets || (k.BitSets = {}));
   a = function() {
-    function d() {
+    function a() {
     }
-    d.randomStyle = function() {
-      d._randomStyleCache || (d._randomStyleCache = "#ff5e3a #ff9500 #ffdb4c #87fc70 #52edc7 #1ad6fd #c644fc #ef4db6 #4a4a4a #dbddde #ff3b30 #ff9500 #ffcc00 #4cd964 #34aadc #007aff #5856d6 #ff2d55 #8e8e93 #c7c7cc #5ad427 #c86edf #d1eefc #e0f8d8 #fb2b69 #f7f7f7 #1d77ef #d6cec3 #55efcb #ff4981 #ffd3e0 #f7f7f7 #ff1300 #1f1f21 #bdbec2 #ff3a2d".split(" "));
-      return d._randomStyleCache[d._nextStyle++ % d._randomStyleCache.length];
-    };
-    d.gradientColor = function(e) {
-      return d._gradient[d._gradient.length * k.clamp(e, 0, 1) | 0];
-    };
-    d.contrastStyle = function(e) {
-      e = parseInt(e.substr(1), 16);
-      return 128 <= (299 * (e >> 16) + 587 * (e >> 8 & 255) + 114 * (e & 255)) / 1E3 ? "#000000" : "#ffffff";
-    };
-    d.reset = function() {
-      d._nextStyle = 0;
-    };
-    d.TabToolbar = "#252c33";
-    d.Toolbars = "#343c45";
-    d.HighlightBlue = "#1d4f73";
-    d.LightText = "#f5f7fa";
-    d.ForegroundText = "#b6babf";
-    d.Black = "#000000";
-    d.VeryDark = "#14171a";
-    d.Dark = "#181d20";
-    d.Light = "#a9bacb";
-    d.Grey = "#8fa1b2";
-    d.DarkGrey = "#5f7387";
-    d.Blue = "#46afe3";
-    d.Purple = "#6b7abb";
-    d.Pink = "#df80ff";
-    d.Red = "#eb5368";
-    d.Orange = "#d96629";
-    d.LightOrange = "#d99b28";
-    d.Green = "#70bf53";
-    d.BlueGrey = "#5e88b0";
-    d._nextStyle = 0;
-    d._gradient = "#FF0000 #FF1100 #FF2300 #FF3400 #FF4600 #FF5700 #FF6900 #FF7B00 #FF8C00 #FF9E00 #FFAF00 #FFC100 #FFD300 #FFE400 #FFF600 #F7FF00 #E5FF00 #D4FF00 #C2FF00 #B0FF00 #9FFF00 #8DFF00 #7CFF00 #6AFF00 #58FF00 #47FF00 #35FF00 #24FF00 #12FF00 #00FF00".split(" ");
-    return d;
+    a.randomStyle = function() {
+      a._randomStyleCache || (a._randomStyleCache = "#ff5e3a #ff9500 #ffdb4c #87fc70 #52edc7 #1ad6fd #c644fc #ef4db6 #4a4a4a #dbddde #ff3b30 #ff9500 #ffcc00 #4cd964 #34aadc #007aff #5856d6 #ff2d55 #8e8e93 #c7c7cc #5ad427 #c86edf #d1eefc #e0f8d8 #fb2b69 #f7f7f7 #1d77ef #d6cec3 #55efcb #ff4981 #ffd3e0 #f7f7f7 #ff1300 #1f1f21 #bdbec2 #ff3a2d".split(" "));
+      return a._randomStyleCache[a._nextStyle++ % a._randomStyleCache.length];
+    };
+    a.gradientColor = function(l) {
+      return a._gradient[a._gradient.length * f.clamp(l, 0, 1) | 0];
+    };
+    a.contrastStyle = function(a) {
+      a = parseInt(a.substr(1), 16);
+      return 128 <= (299 * (a >> 16) + 587 * (a >> 8 & 255) + 114 * (a & 255)) / 1E3 ? "#000000" : "#ffffff";
+    };
+    a.reset = function() {
+      a._nextStyle = 0;
+    };
+    a.TabToolbar = "#252c33";
+    a.Toolbars = "#343c45";
+    a.HighlightBlue = "#1d4f73";
+    a.LightText = "#f5f7fa";
+    a.ForegroundText = "#b6babf";
+    a.Black = "#000000";
+    a.VeryDark = "#14171a";
+    a.Dark = "#181d20";
+    a.Light = "#a9bacb";
+    a.Grey = "#8fa1b2";
+    a.DarkGrey = "#5f7387";
+    a.Blue = "#46afe3";
+    a.Purple = "#6b7abb";
+    a.Pink = "#df80ff";
+    a.Red = "#eb5368";
+    a.Orange = "#d96629";
+    a.LightOrange = "#d99b28";
+    a.Green = "#70bf53";
+    a.BlueGrey = "#5e88b0";
+    a._nextStyle = 0;
+    a._gradient = "#FF0000 #FF1100 #FF2300 #FF3400 #FF4600 #FF5700 #FF6900 #FF7B00 #FF8C00 #FF9E00 #FFAF00 #FFC100 #FFD300 #FFE400 #FFF600 #F7FF00 #E5FF00 #D4FF00 #C2FF00 #B0FF00 #9FFF00 #8DFF00 #7CFF00 #6AFF00 #58FF00 #47FF00 #35FF00 #24FF00 #12FF00 #00FF00".split(" ");
+    return a;
   }();
-  l.ColorStyle = a;
+  k.ColorStyle = a;
   a = function() {
-    function d(e, b, f, q) {
-      this.xMin = e | 0;
-      this.yMin = b | 0;
-      this.xMax = f | 0;
+    function a(l, c, e, q) {
+      this.xMin = l | 0;
+      this.yMin = c | 0;
+      this.xMax = e | 0;
       this.yMax = q | 0;
     }
-    d.FromUntyped = function(e) {
-      return new d(e.xMin, e.yMin, e.xMax, e.yMax);
+    a.FromUntyped = function(l) {
+      return new a(l.xMin, l.yMin, l.xMax, l.yMax);
     };
-    d.FromRectangle = function(e) {
-      return new d(20 * e.x | 0, 20 * e.y | 0, 20 * (e.x + e.width) | 0, 20 * (e.y + e.height) | 0);
+    a.FromRectangle = function(l) {
+      return new a(20 * l.x | 0, 20 * l.y | 0, 20 * (l.x + l.width) | 0, 20 * (l.y + l.height) | 0);
     };
-    d.prototype.setElements = function(e, b, f, q) {
-      this.xMin = e;
-      this.yMin = b;
-      this.xMax = f;
+    a.prototype.setElements = function(a, c, e, q) {
+      this.xMin = a;
+      this.yMin = c;
+      this.xMax = e;
       this.yMax = q;
     };
-    d.prototype.copyFrom = function(e) {
-      this.setElements(e.xMin, e.yMin, e.xMax, e.yMax);
+    a.prototype.copyFrom = function(a) {
+      this.setElements(a.xMin, a.yMin, a.xMax, a.yMax);
     };
-    d.prototype.contains = function(e, b) {
-      return e < this.xMin !== e < this.xMax && b < this.yMin !== b < this.yMax;
+    a.prototype.contains = function(a, c) {
+      return a < this.xMin !== a < this.xMax && c < this.yMin !== c < this.yMax;
     };
-    d.prototype.unionInPlace = function(e) {
-      e.isEmpty() || (this.extendByPoint(e.xMin, e.yMin), this.extendByPoint(e.xMax, e.yMax));
+    a.prototype.unionInPlace = function(a) {
+      a.isEmpty() || (this.extendByPoint(a.xMin, a.yMin), this.extendByPoint(a.xMax, a.yMax));
     };
-    d.prototype.extendByPoint = function(e, b) {
-      this.extendByX(e);
-      this.extendByY(b);
+    a.prototype.extendByPoint = function(a, c) {
+      this.extendByX(a);
+      this.extendByY(c);
     };
-    d.prototype.extendByX = function(e) {
-      134217728 === this.xMin ? this.xMin = this.xMax = e : (this.xMin = Math.min(this.xMin, e), this.xMax = Math.max(this.xMax, e));
+    a.prototype.extendByX = function(a) {
+      134217728 === this.xMin ? this.xMin = this.xMax = a : (this.xMin = Math.min(this.xMin, a), this.xMax = Math.max(this.xMax, a));
     };
-    d.prototype.extendByY = function(e) {
-      134217728 === this.yMin ? this.yMin = this.yMax = e : (this.yMin = Math.min(this.yMin, e), this.yMax = Math.max(this.yMax, e));
+    a.prototype.extendByY = function(a) {
+      134217728 === this.yMin ? this.yMin = this.yMax = a : (this.yMin = Math.min(this.yMin, a), this.yMax = Math.max(this.yMax, a));
     };
-    d.prototype.intersects = function(e) {
-      return this.contains(e.xMin, e.yMin) || this.contains(e.xMax, e.yMax);
+    a.prototype.intersects = function(a) {
+      return this.contains(a.xMin, a.yMin) || this.contains(a.xMax, a.yMax);
     };
-    d.prototype.isEmpty = function() {
+    a.prototype.isEmpty = function() {
       return this.xMax <= this.xMin || this.yMax <= this.yMin;
     };
-    Object.defineProperty(d.prototype, "width", {get:function() {
+    Object.defineProperty(a.prototype, "width", {get:function() {
       return this.xMax - this.xMin;
-    }, set:function(e) {
-      this.xMax = this.xMin + e;
+    }, set:function(a) {
+      this.xMax = this.xMin + a;
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(d.prototype, "height", {get:function() {
+    Object.defineProperty(a.prototype, "height", {get:function() {
       return this.yMax - this.yMin;
-    }, set:function(e) {
-      this.yMax = this.yMin + e;
+    }, set:function(a) {
+      this.yMax = this.yMin + a;
     }, enumerable:!0, configurable:!0});
-    d.prototype.getBaseWidth = function(e) {
-      return Math.abs(Math.cos(e)) * (this.xMax - this.xMin) + Math.abs(Math.sin(e)) * (this.yMax - this.yMin);
+    a.prototype.getBaseWidth = function(a) {
+      return Math.abs(Math.cos(a)) * (this.xMax - this.xMin) + Math.abs(Math.sin(a)) * (this.yMax - this.yMin);
     };
-    d.prototype.getBaseHeight = function(e) {
-      return Math.abs(Math.sin(e)) * (this.xMax - this.xMin) + Math.abs(Math.cos(e)) * (this.yMax - this.yMin);
+    a.prototype.getBaseHeight = function(a) {
+      return Math.abs(Math.sin(a)) * (this.xMax - this.xMin) + Math.abs(Math.cos(a)) * (this.yMax - this.yMin);
     };
-    d.prototype.setEmpty = function() {
+    a.prototype.setEmpty = function() {
       this.xMin = this.yMin = this.xMax = this.yMax = 0;
     };
-    d.prototype.setToSentinels = function() {
+    a.prototype.setToSentinels = function() {
       this.xMin = this.yMin = this.xMax = this.yMax = 134217728;
     };
-    d.prototype.clone = function() {
-      return new d(this.xMin, this.yMin, this.xMax, this.yMax);
+    a.prototype.clone = function() {
+      return new a(this.xMin, this.yMin, this.xMax, this.yMax);
     };
-    d.prototype.toString = function() {
+    a.prototype.toString = function() {
       return "{ xMin: " + this.xMin + ", xMin: " + this.yMin + ", xMax: " + this.xMax + ", xMax: " + this.yMax + " }";
     };
-    return d;
+    return a;
   }();
-  l.Bounds = a;
+  k.Bounds = a;
   a = function() {
-    function d(e, b, f, q) {
-      m.assert(r(e));
-      m.assert(r(b));
-      m.assert(r(f));
-      m.assert(r(q));
-      this._xMin = e | 0;
-      this._yMin = b | 0;
-      this._xMax = f | 0;
+    function a(l, c, e, q) {
+      h.assert(p(l));
+      h.assert(p(c));
+      h.assert(p(e));
+      h.assert(p(q));
+      this._xMin = l | 0;
+      this._yMin = c | 0;
+      this._xMax = e | 0;
       this._yMax = q | 0;
     }
-    d.FromUntyped = function(e) {
-      return new d(e.xMin, e.yMin, e.xMax, e.yMax);
+    a.FromUntyped = function(l) {
+      return new a(l.xMin, l.yMin, l.xMax, l.yMax);
     };
-    d.FromRectangle = function(e) {
-      return new d(20 * e.x | 0, 20 * e.y | 0, 20 * (e.x + e.width) | 0, 20 * (e.y + e.height) | 0);
+    a.FromRectangle = function(l) {
+      return new a(20 * l.x | 0, 20 * l.y | 0, 20 * (l.x + l.width) | 0, 20 * (l.y + l.height) | 0);
     };
-    d.prototype.setElements = function(e, b, f, q) {
-      this.xMin = e;
-      this.yMin = b;
-      this.xMax = f;
+    a.prototype.setElements = function(a, c, e, q) {
+      this.xMin = a;
+      this.yMin = c;
+      this.xMax = e;
       this.yMax = q;
     };
-    d.prototype.copyFrom = function(e) {
-      this.setElements(e.xMin, e.yMin, e.xMax, e.yMax);
+    a.prototype.copyFrom = function(a) {
+      this.setElements(a.xMin, a.yMin, a.xMax, a.yMax);
     };
-    d.prototype.contains = function(e, b) {
-      return e < this.xMin !== e < this.xMax && b < this.yMin !== b < this.yMax;
+    a.prototype.contains = function(a, c) {
+      return a < this.xMin !== a < this.xMax && c < this.yMin !== c < this.yMax;
     };
-    d.prototype.unionInPlace = function(e) {
-      e.isEmpty() || (this.extendByPoint(e.xMin, e.yMin), this.extendByPoint(e.xMax, e.yMax));
+    a.prototype.unionInPlace = function(a) {
+      a.isEmpty() || (this.extendByPoint(a.xMin, a.yMin), this.extendByPoint(a.xMax, a.yMax));
     };
-    d.prototype.extendByPoint = function(e, b) {
-      this.extendByX(e);
-      this.extendByY(b);
+    a.prototype.extendByPoint = function(a, c) {
+      this.extendByX(a);
+      this.extendByY(c);
     };
-    d.prototype.extendByX = function(e) {
-      134217728 === this.xMin ? this.xMin = this.xMax = e : (this.xMin = Math.min(this.xMin, e), this.xMax = Math.max(this.xMax, e));
+    a.prototype.extendByX = function(a) {
+      134217728 === this.xMin ? this.xMin = this.xMax = a : (this.xMin = Math.min(this.xMin, a), this.xMax = Math.max(this.xMax, a));
     };
-    d.prototype.extendByY = function(e) {
-      134217728 === this.yMin ? this.yMin = this.yMax = e : (this.yMin = Math.min(this.yMin, e), this.yMax = Math.max(this.yMax, e));
+    a.prototype.extendByY = function(a) {
+      134217728 === this.yMin ? this.yMin = this.yMax = a : (this.yMin = Math.min(this.yMin, a), this.yMax = Math.max(this.yMax, a));
     };
-    d.prototype.intersects = function(e) {
-      return this.contains(e._xMin, e._yMin) || this.contains(e._xMax, e._yMax);
+    a.prototype.intersects = function(a) {
+      return this.contains(a._xMin, a._yMin) || this.contains(a._xMax, a._yMax);
     };
-    d.prototype.isEmpty = function() {
+    a.prototype.isEmpty = function() {
       return this._xMax <= this._xMin || this._yMax <= this._yMin;
     };
-    Object.defineProperty(d.prototype, "xMin", {get:function() {
+    Object.defineProperty(a.prototype, "xMin", {get:function() {
       return this._xMin;
-    }, set:function(e) {
-      m.assert(r(e));
-      this._xMin = e;
+    }, set:function(a) {
+      h.assert(p(a));
+      this._xMin = a;
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(d.prototype, "yMin", {get:function() {
+    Object.defineProperty(a.prototype, "yMin", {get:function() {
       return this._yMin;
-    }, set:function(e) {
-      m.assert(r(e));
-      this._yMin = e | 0;
+    }, set:function(a) {
+      h.assert(p(a));
+      this._yMin = a | 0;
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(d.prototype, "xMax", {get:function() {
+    Object.defineProperty(a.prototype, "xMax", {get:function() {
       return this._xMax;
-    }, set:function(e) {
-      m.assert(r(e));
-      this._xMax = e | 0;
+    }, set:function(a) {
+      h.assert(p(a));
+      this._xMax = a | 0;
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(d.prototype, "width", {get:function() {
+    Object.defineProperty(a.prototype, "width", {get:function() {
       return this._xMax - this._xMin;
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(d.prototype, "yMax", {get:function() {
+    Object.defineProperty(a.prototype, "yMax", {get:function() {
       return this._yMax;
-    }, set:function(e) {
-      m.assert(r(e));
-      this._yMax = e | 0;
+    }, set:function(a) {
+      h.assert(p(a));
+      this._yMax = a | 0;
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(d.prototype, "height", {get:function() {
+    Object.defineProperty(a.prototype, "height", {get:function() {
       return this._yMax - this._yMin;
     }, enumerable:!0, configurable:!0});
-    d.prototype.getBaseWidth = function(e) {
-      return Math.abs(Math.cos(e)) * (this._xMax - this._xMin) + Math.abs(Math.sin(e)) * (this._yMax - this._yMin);
+    a.prototype.getBaseWidth = function(a) {
+      return Math.abs(Math.cos(a)) * (this._xMax - this._xMin) + Math.abs(Math.sin(a)) * (this._yMax - this._yMin);
     };
-    d.prototype.getBaseHeight = function(e) {
-      return Math.abs(Math.sin(e)) * (this._xMax - this._xMin) + Math.abs(Math.cos(e)) * (this._yMax - this._yMin);
+    a.prototype.getBaseHeight = function(a) {
+      return Math.abs(Math.sin(a)) * (this._xMax - this._xMin) + Math.abs(Math.cos(a)) * (this._yMax - this._yMin);
     };
-    d.prototype.setEmpty = function() {
+    a.prototype.setEmpty = function() {
       this._xMin = this._yMin = this._xMax = this._yMax = 0;
     };
-    d.prototype.clone = function() {
-      return new d(this.xMin, this.yMin, this.xMax, this.yMax);
+    a.prototype.clone = function() {
+      return new a(this.xMin, this.yMin, this.xMax, this.yMax);
     };
-    d.prototype.toString = function() {
+    a.prototype.toString = function() {
       return "{ xMin: " + this._xMin + ", xMin: " + this._yMin + ", xMax: " + this._xMax + ", yMax: " + this._yMax + " }";
     };
-    d.prototype.assertValid = function() {
+    a.prototype.assertValid = function() {
     };
-    return d;
+    return a;
   }();
-  l.DebugBounds = a;
+  k.DebugBounds = a;
   a = function() {
-    function d(e, b, f, q) {
-      this.r = e;
-      this.g = b;
-      this.b = f;
+    function a(d, c, e, q) {
+      this.r = d;
+      this.g = c;
+      this.b = e;
       this.a = q;
     }
-    d.FromARGB = function(e) {
-      return new d((e >> 16 & 255) / 255, (e >> 8 & 255) / 255, (e >> 0 & 255) / 255, (e >> 24 & 255) / 255);
+    a.FromARGB = function(d) {
+      return new a((d >> 16 & 255) / 255, (d >> 8 & 255) / 255, (d >> 0 & 255) / 255, (d >> 24 & 255) / 255);
     };
-    d.FromRGBA = function(e) {
-      return d.FromARGB(s.RGBAToARGB(e));
+    a.FromRGBA = function(d) {
+      return a.FromARGB(r.RGBAToARGB(d));
     };
-    d.prototype.toRGBA = function() {
+    a.prototype.toRGBA = function() {
       return 255 * this.r << 24 | 255 * this.g << 16 | 255 * this.b << 8 | 255 * this.a;
     };
-    d.prototype.toCSSStyle = function() {
-      return s.rgbaToCSSStyle(this.toRGBA());
+    a.prototype.toCSSStyle = function() {
+      return r.rgbaToCSSStyle(this.toRGBA());
     };
-    d.prototype.set = function(e) {
-      this.r = e.r;
-      this.g = e.g;
-      this.b = e.b;
-      this.a = e.a;
-    };
-    d.randomColor = function() {
-      var e = .4;
-      void 0 === e && (e = 1);
-      return new d(Math.random(), Math.random(), Math.random(), e);
-    };
-    d.parseColor = function(e) {
-      d.colorCache || (d.colorCache = Object.create(null));
-      if (d.colorCache[e]) {
-        return d.colorCache[e];
-      }
-      var b = document.createElement("span");
-      document.body.appendChild(b);
-      b.style.backgroundColor = e;
-      var f = getComputedStyle(b).backgroundColor;
-      document.body.removeChild(b);
-      (b = /^rgb\((\d+), (\d+), (\d+)\)$/.exec(f)) || (b = /^rgba\((\d+), (\d+), (\d+), ([\d.]+)\)$/.exec(f));
-      f = new d(0, 0, 0, 0);
-      f.r = parseFloat(b[1]) / 255;
-      f.g = parseFloat(b[2]) / 255;
-      f.b = parseFloat(b[3]) / 255;
-      f.a = b[4] ? parseFloat(b[4]) / 255 : 1;
-      return d.colorCache[e] = f;
-    };
-    d.Red = new d(1, 0, 0, 1);
-    d.Green = new d(0, 1, 0, 1);
-    d.Blue = new d(0, 0, 1, 1);
-    d.None = new d(0, 0, 0, 0);
-    d.White = new d(1, 1, 1, 1);
-    d.Black = new d(0, 0, 0, 1);
-    d.colorCache = {};
-    return d;
+    a.prototype.set = function(a) {
+      this.r = a.r;
+      this.g = a.g;
+      this.b = a.b;
+      this.a = a.a;
+    };
+    a.randomColor = function() {
+      var d = .4;
+      void 0 === d && (d = 1);
+      return new a(Math.random(), Math.random(), Math.random(), d);
+    };
+    a.parseColor = function(d) {
+      a.colorCache || (a.colorCache = Object.create(null));
+      if (a.colorCache[d]) {
+        return a.colorCache[d];
+      }
+      var c = document.createElement("span");
+      document.body.appendChild(c);
+      c.style.backgroundColor = d;
+      var e = getComputedStyle(c).backgroundColor;
+      document.body.removeChild(c);
+      (c = /^rgb\((\d+), (\d+), (\d+)\)$/.exec(e)) || (c = /^rgba\((\d+), (\d+), (\d+), ([\d.]+)\)$/.exec(e));
+      e = new a(0, 0, 0, 0);
+      e.r = parseFloat(c[1]) / 255;
+      e.g = parseFloat(c[2]) / 255;
+      e.b = parseFloat(c[3]) / 255;
+      e.a = c[4] ? parseFloat(c[4]) / 255 : 1;
+      return a.colorCache[d] = e;
+    };
+    a.Red = new a(1, 0, 0, 1);
+    a.Green = new a(0, 1, 0, 1);
+    a.Blue = new a(0, 0, 1, 1);
+    a.None = new a(0, 0, 0, 0);
+    a.White = new a(1, 1, 1, 1);
+    a.Black = new a(0, 0, 0, 1);
+    a.colorCache = {};
+    return a;
   }();
-  l.Color = a;
-  var s;
-  (function(d) {
-    function e(b) {
-      var f, e, d = b >> 24 & 255;
-      e = (Math.imul(b >> 16 & 255, d) + 127) / 255 | 0;
-      f = (Math.imul(b >> 8 & 255, d) + 127) / 255 | 0;
-      b = (Math.imul(b >> 0 & 255, d) + 127) / 255 | 0;
-      return d << 24 | e << 16 | f << 8 | b;
-    }
-    d.RGBAToARGB = function(b) {
-      return b >> 8 & 16777215 | (b & 255) << 24;
-    };
-    d.ARGBToRGBA = function(b) {
-      return b << 8 | b >> 24 & 255;
-    };
-    d.rgbaToCSSStyle = function(b) {
-      return l.StringUtilities.concat9("rgba(", b >> 24 & 255, ",", b >> 16 & 255, ",", b >> 8 & 255, ",", (b & 255) / 255, ")");
-    };
-    d.cssStyleToRGBA = function(b) {
-      if ("#" === b[0]) {
-        if (7 === b.length) {
-          return parseInt(b.substring(1), 16) << 8 | 255;
+  k.Color = a;
+  var r;
+  (function(a) {
+    function d(c) {
+      var a, e, l = c >> 24 & 255;
+      e = (Math.imul(c >> 16 & 255, l) + 127) / 255 | 0;
+      a = (Math.imul(c >> 8 & 255, l) + 127) / 255 | 0;
+      c = (Math.imul(c >> 0 & 255, l) + 127) / 255 | 0;
+      return l << 24 | e << 16 | a << 8 | c;
+    }
+    a.RGBAToARGB = function(c) {
+      return c >> 8 & 16777215 | (c & 255) << 24;
+    };
+    a.ARGBToRGBA = function(c) {
+      return c << 8 | c >> 24 & 255;
+    };
+    a.rgbaToCSSStyle = function(c) {
+      return k.StringUtilities.concat9("rgba(", c >> 24 & 255, ",", c >> 16 & 255, ",", c >> 8 & 255, ",", (c & 255) / 255, ")");
+    };
+    a.cssStyleToRGBA = function(c) {
+      if ("#" === c[0]) {
+        if (7 === c.length) {
+          return parseInt(c.substring(1), 16) << 8 | 255;
         }
       } else {
-        if ("r" === b[0]) {
-          return b = b.substring(5, b.length - 1).split(","), (parseInt(b[0]) & 255) << 24 | (parseInt(b[1]) & 255) << 16 | (parseInt(b[2]) & 255) << 8 | 255 * parseFloat(b[3]) & 255;
+        if ("r" === c[0]) {
+          return c = c.substring(5, c.length - 1).split(","), (parseInt(c[0]) & 255) << 24 | (parseInt(c[1]) & 255) << 16 | (parseInt(c[2]) & 255) << 8 | 255 * parseFloat(c[3]) & 255;
         }
       }
       return 4278190335;
     };
-    d.hexToRGB = function(b) {
-      return parseInt(b.slice(1), 16);
+    a.hexToRGB = function(c) {
+      return parseInt(c.slice(1), 16);
     };
-    d.rgbToHex = function(b) {
-      return "#" + ("000000" + (b >>> 0).toString(16)).slice(-6);
+    a.rgbToHex = function(c) {
+      return "#" + ("000000" + (c >>> 0).toString(16)).slice(-6);
     };
-    d.isValidHexColor = function(b) {
-      return/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(b);
+    a.isValidHexColor = function(c) {
+      return/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(c);
     };
-    d.clampByte = function(b) {
-      return Math.max(0, Math.min(255, b));
-    };
-    d.unpremultiplyARGB = function(b) {
-      var f, e, d = b >> 24 & 255;
-      e = Math.imul(255, b >> 16 & 255) / d & 255;
-      f = Math.imul(255, b >> 8 & 255) / d & 255;
-      b = Math.imul(255, b >> 0 & 255) / d & 255;
-      return d << 24 | e << 16 | f << 8 | b;
+    a.clampByte = function(c) {
+      return Math.max(0, Math.min(255, c));
+    };
+    a.unpremultiplyARGB = function(c) {
+      var a, e, d = c >> 24 & 255;
+      e = Math.imul(255, c >> 16 & 255) / d & 255;
+      a = Math.imul(255, c >> 8 & 255) / d & 255;
+      c = Math.imul(255, c >> 0 & 255) / d & 255;
+      return d << 24 | e << 16 | a << 8 | c;
     };
-    d.premultiplyARGB = e;
-    var b;
-    d.ensureUnpremultiplyTable = function() {
-      if (!b) {
-        b = new Uint8Array(65536);
-        for (var f = 0;256 > f;f++) {
+    a.premultiplyARGB = d;
+    var c;
+    a.ensureUnpremultiplyTable = function() {
+      if (!c) {
+        c = new Uint8Array(65536);
+        for (var a = 0;256 > a;a++) {
           for (var e = 0;256 > e;e++) {
-            b[(e << 8) + f] = Math.imul(255, f) / e;
+            c[(e << 8) + a] = Math.imul(255, a) / e;
           }
         }
       }
     };
-    d.tableLookupUnpremultiplyARGB = function(f) {
-      f |= 0;
-      var e = f >> 24 & 255;
+    a.tableLookupUnpremultiplyARGB = function(a) {
+      a |= 0;
+      var e = a >> 24 & 255;
       if (0 === e) {
         return 0;
       }
       if (255 === e) {
-        return f;
+        return a;
       }
-      var d, a, h = e << 8, p = b;
-      a = p[h + (f >> 16 & 255)];
-      d = p[h + (f >> 8 & 255)];
-      f = p[h + (f >> 0 & 255)];
-      return e << 24 | a << 16 | d << 8 | f;
+      var d, l, n = e << 8, f = c;
+      l = f[n + (a >> 16 & 255)];
+      d = f[n + (a >> 8 & 255)];
+      a = f[n + (a >> 0 & 255)];
+      return e << 24 | l << 16 | d << 8 | a;
     };
-    d.blendPremultipliedBGRA = function(b, f) {
+    a.blendPremultipliedBGRA = function(c, a) {
       var e, d;
-      d = 256 - (f & 255);
-      e = Math.imul(b & 16711935, d) >> 8;
-      d = Math.imul(b >> 8 & 16711935, d) >> 8;
-      return((f >> 8 & 16711935) + d & 16711935) << 8 | (f & 16711935) + e & 16711935;
-    };
-    var f = u.swap32;
-    d.convertImage = function(q, d, a, h) {
-      var p = a.length;
-      if (q === d) {
-        if (a !== h) {
-          for (q = 0;q < p;q++) {
-            h[q] = a[q];
+      d = 256 - (a & 255);
+      e = Math.imul(c & 16711935, d) >> 8;
+      d = Math.imul(c >> 8 & 16711935, d) >> 8;
+      return((a >> 8 & 16711935) + d & 16711935) << 8 | (a & 16711935) + e & 16711935;
+    };
+    var e = v.swap32;
+    a.convertImage = function(a, s, y, n) {
+      var f = y.length;
+      if (a === s) {
+        if (y !== n) {
+          for (a = 0;a < f;a++) {
+            n[a] = y[a];
           }
         }
       } else {
-        if (1 === q && 3 === d) {
-          for (l.ColorUtilities.ensureUnpremultiplyTable(), q = 0;q < p;q++) {
-            var c = a[q];
-            d = c & 255;
-            if (0 === d) {
-              h[q] = 0;
+        if (1 === a && 3 === s) {
+          for (k.ColorUtilities.ensureUnpremultiplyTable(), a = 0;a < f;a++) {
+            var b = y[a];
+            s = b & 255;
+            if (0 === s) {
+              n[a] = 0;
             } else {
-              if (255 === d) {
-                h[q] = 4278190080 | c >> 8 & 16777215;
+              if (255 === s) {
+                n[a] = 4278190080 | b >> 8 & 16777215;
               } else {
-                var k = c >> 24 & 255, n = c >> 16 & 255, c = c >> 8 & 255, u = d << 8, s = b, c = s[u + c], n = s[u + n], k = s[u + k];
-                h[q] = d << 24 | k << 16 | n << 8 | c;
+                var t = b >> 24 & 255, m = b >> 16 & 255, b = b >> 8 & 255, v = s << 8, r = c, b = r[v + b], m = r[v + m], t = r[v + t];
+                n[a] = s << 24 | t << 16 | m << 8 | b;
               }
             }
           }
         } else {
-          if (2 === q && 3 === d) {
-            for (q = 0;q < p;q++) {
-              h[q] = f(a[q]);
+          if (2 === a && 3 === s) {
+            for (a = 0;a < f;a++) {
+              n[a] = e(y[a]);
             }
           } else {
-            if (3 === q && 1 === d) {
-              for (q = 0;q < p;q++) {
-                d = a[q], h[q] = f(e(d & 4278255360 | d >> 16 & 255 | (d & 255) << 16));
+            if (3 === a && 1 === s) {
+              for (a = 0;a < f;a++) {
+                s = y[a], n[a] = e(d(s & 4278255360 | s >> 16 & 255 | (s & 255) << 16));
               }
             } else {
-              for (m.somewhatImplemented("Image Format Conversion: " + v[q] + " -> " + v[d]), q = 0;q < p;q++) {
-                h[q] = a[q];
+              for (h.somewhatImplemented("Image Format Conversion: " + w[a] + " -> " + w[s]), a = 0;a < f;a++) {
+                n[a] = y[a];
               }
             }
           }
         }
       }
     };
-  })(s = l.ColorUtilities || (l.ColorUtilities = {}));
+  })(r = k.ColorUtilities || (k.ColorUtilities = {}));
   a = function() {
-    function d(e) {
-      void 0 === e && (e = 32);
+    function a(d) {
+      void 0 === d && (d = 32);
       this._list = [];
-      this._maxSize = e;
+      this._maxSize = d;
     }
-    d.prototype.acquire = function(e) {
-      if (d._enabled) {
-        for (var b = this._list, f = 0;f < b.length;f++) {
-          var q = b[f];
-          if (q.byteLength >= e) {
-            return b.splice(f, 1), q;
+    a.prototype.acquire = function(d) {
+      if (a._enabled) {
+        for (var c = this._list, e = 0;e < c.length;e++) {
+          var q = c[e];
+          if (q.byteLength >= d) {
+            return c.splice(e, 1), q;
           }
         }
       }
-      return new ArrayBuffer(e);
+      return new ArrayBuffer(d);
     };
-    d.prototype.release = function(e) {
-      if (d._enabled) {
-        var b = this._list;
-        b.length === this._maxSize && b.shift();
-        b.push(e);
+    a.prototype.release = function(d) {
+      if (a._enabled) {
+        var c = this._list;
+        c.length === this._maxSize && c.shift();
+        c.push(d);
       }
     };
-    d.prototype.ensureUint8ArrayLength = function(e, b) {
-      if (e.length >= b) {
-        return e;
+    a.prototype.ensureUint8ArrayLength = function(a, c) {
+      if (a.length >= c) {
+        return a;
       }
-      var f = Math.max(e.length + b, (3 * e.length >> 1) + 1), f = new Uint8Array(this.acquire(f), 0, f);
-      f.set(e);
-      this.release(e.buffer);
-      return f;
+      var e = Math.max(a.length + c, (3 * a.length >> 1) + 1), e = new Uint8Array(this.acquire(e), 0, e);
+      e.set(a);
+      this.release(a.buffer);
+      return e;
     };
-    d.prototype.ensureFloat64ArrayLength = function(e, b) {
-      if (e.length >= b) {
-        return e;
+    a.prototype.ensureFloat64ArrayLength = function(a, c) {
+      if (a.length >= c) {
+        return a;
       }
-      var f = Math.max(e.length + b, (3 * e.length >> 1) + 1), f = new Float64Array(this.acquire(f * Float64Array.BYTES_PER_ELEMENT), 0, f);
-      f.set(e);
-      this.release(e.buffer);
-      return f;
+      var e = Math.max(a.length + c, (3 * a.length >> 1) + 1), e = new Float64Array(this.acquire(e * Float64Array.BYTES_PER_ELEMENT), 0, e);
+      e.set(a);
+      this.release(a.buffer);
+      return e;
     };
-    d._enabled = !0;
-    return d;
+    a._enabled = !0;
+    return a;
   }();
-  l.ArrayBufferPool = a;
-  (function(d) {
-    (function(e) {
-      e[e.EXTERNAL_INTERFACE_FEATURE = 1] = "EXTERNAL_INTERFACE_FEATURE";
-      e[e.CLIPBOARD_FEATURE = 2] = "CLIPBOARD_FEATURE";
-      e[e.SHAREDOBJECT_FEATURE = 3] = "SHAREDOBJECT_FEATURE";
-      e[e.VIDEO_FEATURE = 4] = "VIDEO_FEATURE";
-      e[e.SOUND_FEATURE = 5] = "SOUND_FEATURE";
-      e[e.NETCONNECTION_FEATURE = 6] = "NETCONNECTION_FEATURE";
-    })(d.Feature || (d.Feature = {}));
-    (function(e) {
-      e[e.AVM1_ERROR = 1] = "AVM1_ERROR";
-      e[e.AVM2_ERROR = 2] = "AVM2_ERROR";
-    })(d.ErrorTypes || (d.ErrorTypes = {}));
-    d.instance;
-  })(l.Telemetry || (l.Telemetry = {}));
-  (function(d) {
-    d.instance;
-  })(l.FileLoadingService || (l.FileLoadingService = {}));
-  l.registerCSSFont = function(d, e, b) {
+  k.ArrayBufferPool = a;
+  (function(a) {
+    (function(a) {
+      a[a.EXTERNAL_INTERFACE_FEATURE = 1] = "EXTERNAL_INTERFACE_FEATURE";
+      a[a.CLIPBOARD_FEATURE = 2] = "CLIPBOARD_FEATURE";
+      a[a.SHAREDOBJECT_FEATURE = 3] = "SHAREDOBJECT_FEATURE";
+      a[a.VIDEO_FEATURE = 4] = "VIDEO_FEATURE";
+      a[a.SOUND_FEATURE = 5] = "SOUND_FEATURE";
+      a[a.NETCONNECTION_FEATURE = 6] = "NETCONNECTION_FEATURE";
+    })(a.Feature || (a.Feature = {}));
+    (function(a) {
+      a[a.AVM1_ERROR = 1] = "AVM1_ERROR";
+      a[a.AVM2_ERROR = 2] = "AVM2_ERROR";
+    })(a.ErrorTypes || (a.ErrorTypes = {}));
+    a.instance;
+  })(k.Telemetry || (k.Telemetry = {}));
+  (function(a) {
+    a.instance;
+  })(k.FileLoadingService || (k.FileLoadingService = {}));
+  k.registerCSSFont = function(a, d, c) {
     if (inBrowser) {
-      var f = document.head;
-      f.insertBefore(document.createElement("style"), f.firstChild);
-      f = document.styleSheets[0];
-      e = "@font-face{font-family:swffont" + d + ";src:url(data:font/opentype;base64," + l.StringUtilities.base64ArrayBuffer(e) + ")}";
-      f.insertRule(e, f.cssRules.length);
-      b && (b = document.createElement("div"), b.style.fontFamily = "swffont" + d, b.innerHTML = "hello", document.body.appendChild(b), document.body.removeChild(b));
+      var e = document.head;
+      e.insertBefore(document.createElement("style"), e.firstChild);
+      e = document.styleSheets[0];
+      d = "@font-face{font-family:swffont" + a + ";src:url(data:font/opentype;base64," + k.StringUtilities.base64ArrayBuffer(d) + ")}";
+      e.insertRule(d, e.cssRules.length);
+      c && (c = document.createElement("div"), c.style.fontFamily = "swffont" + a, c.innerHTML = "hello", document.body.appendChild(c), document.body.removeChild(c));
     }
   };
-  (function(d) {
-    d.instance = {enabled:!1, initJS:function(e) {
-    }, registerCallback:function(e) {
-    }, unregisterCallback:function(e) {
-    }, eval:function(e) {
-    }, call:function(e) {
+  (function(a) {
+    a.instance = {enabled:!1, initJS:function(a) {
+    }, registerCallback:function(a) {
+    }, unregisterCallback:function(a) {
+    }, eval:function(a) {
+    }, call:function(a) {
     }, getId:function() {
       return null;
     }};
-  })(l.ExternalInterfaceService || (l.ExternalInterfaceService = {}));
+  })(k.ExternalInterfaceService || (k.ExternalInterfaceService = {}));
   a = function() {
-    function d() {
+    function a() {
     }
-    d.prototype.setClipboard = function(e) {
+    a.prototype.setClipboard = function(a) {
     };
-    d.instance = null;
-    return d;
+    a.instance = null;
+    return a;
   }();
-  l.ClipboardService = a;
+  k.ClipboardService = a;
   a = function() {
-    function d() {
+    function a() {
       this._queues = {};
     }
-    d.prototype.register = function(e, b) {
-      m.assert(e);
-      m.assert(b);
-      var f = this._queues[e];
-      if (f) {
-        if (-1 < f.indexOf(b)) {
+    a.prototype.register = function(a, c) {
+      h.assert(a);
+      h.assert(c);
+      var e = this._queues[a];
+      if (e) {
+        if (-1 < e.indexOf(c)) {
           return;
         }
       } else {
-        f = this._queues[e] = [];
+        e = this._queues[a] = [];
       }
-      f.push(b);
+      e.push(c);
     };
-    d.prototype.unregister = function(e, b) {
-      m.assert(e);
-      m.assert(b);
-      var f = this._queues[e];
-      if (f) {
-        var q = f.indexOf(b);
-        -1 !== q && f.splice(q, 1);
-        0 === f.length && (this._queues[e] = null);
+    a.prototype.unregister = function(a, c) {
+      h.assert(a);
+      h.assert(c);
+      var e = this._queues[a];
+      if (e) {
+        var q = e.indexOf(c);
+        -1 !== q && e.splice(q, 1);
+        0 === e.length && (this._queues[a] = null);
       }
     };
-    d.prototype.notify = function(e, b) {
-      var f = this._queues[e];
-      if (f) {
-        f = f.slice();
-        b = Array.prototype.slice.call(arguments, 0);
-        for (var q = 0;q < f.length;q++) {
-          f[q].apply(null, b);
+    a.prototype.notify = function(a, c) {
+      var e = this._queues[a];
+      if (e) {
+        e = e.slice();
+        c = Array.prototype.slice.call(arguments, 0);
+        for (var q = 0;q < e.length;q++) {
+          e[q].apply(null, c);
         }
       }
     };
-    d.prototype.notify1 = function(e, b) {
-      var f = this._queues[e];
-      if (f) {
-        for (var f = f.slice(), q = 0;q < f.length;q++) {
-          (0,f[q])(e, b);
+    a.prototype.notify1 = function(a, c) {
+      var e = this._queues[a];
+      if (e) {
+        for (var e = e.slice(), q = 0;q < e.length;q++) {
+          (0,e[q])(a, c);
         }
       }
     };
-    return d;
+    return a;
   }();
-  l.Callback = a;
-  (function(d) {
-    d[d.None = 0] = "None";
-    d[d.PremultipliedAlphaARGB = 1] = "PremultipliedAlphaARGB";
-    d[d.StraightAlphaARGB = 2] = "StraightAlphaARGB";
-    d[d.StraightAlphaRGBA = 3] = "StraightAlphaRGBA";
-    d[d.JPEG = 4] = "JPEG";
-    d[d.PNG = 5] = "PNG";
-    d[d.GIF = 6] = "GIF";
-  })(l.ImageType || (l.ImageType = {}));
-  var v = l.ImageType;
-  l.getMIMETypeForImageType = function(d) {
-    switch(d) {
+  k.Callback = a;
+  (function(a) {
+    a[a.None = 0] = "None";
+    a[a.PremultipliedAlphaARGB = 1] = "PremultipliedAlphaARGB";
+    a[a.StraightAlphaARGB = 2] = "StraightAlphaARGB";
+    a[a.StraightAlphaRGBA = 3] = "StraightAlphaRGBA";
+    a[a.JPEG = 4] = "JPEG";
+    a[a.PNG = 5] = "PNG";
+    a[a.GIF = 6] = "GIF";
+  })(k.ImageType || (k.ImageType = {}));
+  var w = k.ImageType;
+  k.getMIMETypeForImageType = function(a) {
+    switch(a) {
       case 4:
         return "image/jpeg";
       case 5:
@@ -2085,9 +2089,9 @@
         return "text/plain";
     }
   };
-  (function(d) {
-    d.toCSSCursor = function(e) {
-      switch(e) {
+  (function(a) {
+    a.toCSSCursor = function(a) {
+      switch(a) {
         case 0:
           return "auto";
         case 2:
@@ -2100,159 +2104,159 @@
           return "default";
       }
     };
-  })(l.UI || (l.UI = {}));
+  })(k.UI || (k.UI = {}));
   a = function() {
-    function d() {
-      this.promise = new Promise(function(e, b) {
-        this.resolve = e;
-        this.reject = b;
+    function a() {
+      this.promise = new Promise(function(a, c) {
+        this.resolve = a;
+        this.reject = c;
       }.bind(this));
     }
-    d.prototype.then = function(e, b) {
-      return this.promise.then(e, b);
+    a.prototype.then = function(a, c) {
+      return this.promise.then(a, c);
     };
-    return d;
+    return a;
   }();
-  l.PromiseWrapper = a;
+  k.PromiseWrapper = a;
 })(Shumway || (Shumway = {}));
 (function() {
-  function l(b) {
-    if ("function" !== typeof b) {
+  function k(a) {
+    if ("function" !== typeof a) {
       throw new TypeError("Invalid deferred constructor");
     }
-    var f = s();
-    b = new b(f);
-    var e = f.resolve;
+    var c = r();
+    a = new a(c);
+    var e = c.resolve;
     if ("function" !== typeof e) {
       throw new TypeError("Invalid resolve construction function");
     }
-    f = f.reject;
-    if ("function" !== typeof f) {
+    c = c.reject;
+    if ("function" !== typeof c) {
       throw new TypeError("Invalid reject construction function");
     }
-    return{promise:b, resolve:e, reject:f};
+    return{promise:a, resolve:e, reject:c};
   }
-  function r(b, f) {
-    if ("object" !== typeof b || null === b) {
+  function p(a, c) {
+    if ("object" !== typeof a || null === a) {
       return!1;
     }
     try {
-      var e = b.then;
+      var e = a.then;
       if ("function" !== typeof e) {
         return!1;
       }
-      e.call(b, f.resolve, f.reject);
+      e.call(a, c.resolve, c.reject);
     } catch (d) {
-      e = f.reject, e(d);
+      e = c.reject, e(d);
     }
     return!0;
   }
-  function g(b) {
-    return "object" === typeof b && null !== b && "undefined" !== typeof b.promiseStatus;
+  function g(a) {
+    return "object" === typeof a && null !== a && "undefined" !== typeof a.promiseStatus;
   }
-  function c(b, f) {
-    if ("unresolved" === b.promiseStatus) {
-      var e = b.rejectReactions;
-      b.result = f;
-      b.resolveReactions = void 0;
-      b.rejectReactions = void 0;
-      b.promiseStatus = "has-rejection";
-      t(e, f);
+  function b(a, c) {
+    if ("unresolved" === a.promiseStatus) {
+      var e = a.rejectReactions;
+      a.result = c;
+      a.resolveReactions = void 0;
+      a.rejectReactions = void 0;
+      a.promiseStatus = "has-rejection";
+      u(e, c);
     }
   }
-  function t(b, f) {
-    for (var e = 0;e < b.length;e++) {
-      m({reaction:b[e], argument:f});
+  function u(a, c) {
+    for (var e = 0;e < a.length;e++) {
+      h({reaction:a[e], argument:c});
     }
   }
-  function m(b) {
-    0 === f.length && setTimeout(h, 0);
-    f.push(b);
+  function h(a) {
+    0 === e.length && setTimeout(d, 0);
+    e.push(a);
   }
-  function a(b, f) {
-    var e = b.deferred, d = b.handler, a, h;
+  function a(a, c) {
+    var e = a.deferred, d = a.handler, l, n;
     try {
-      a = d(f);
-    } catch (p) {
-      return e = e.reject, e(p);
+      l = d(c);
+    } catch (f) {
+      return e = e.reject, e(f);
     }
-    if (a === e.promise) {
+    if (l === e.promise) {
       return e = e.reject, e(new TypeError("Self resolution"));
     }
     try {
-      if (h = r(a, e), !h) {
-        var c = e.resolve;
-        return c(a);
+      if (n = p(l, e), !n) {
+        var b = e.resolve;
+        return b(l);
       }
-    } catch (k) {
-      return e = e.reject, e(k);
+    } catch (h) {
+      return e = e.reject, e(h);
     }
   }
-  function h() {
-    for (;0 < f.length;) {
-      var b = f[0];
+  function d() {
+    for (;0 < e.length;) {
+      var c = e[0];
       try {
-        a(b.reaction, b.argument);
+        a(c.reaction, c.argument);
       } catch (d) {
-        if ("function" === typeof e.onerror) {
-          e.onerror(d);
+        if ("function" === typeof l.onerror) {
+          l.onerror(d);
         }
       }
-      f.shift();
+      e.shift();
     }
   }
-  function p(b) {
-    throw b;
+  function n(a) {
+    throw a;
   }
-  function k(b) {
-    return b;
+  function f(a) {
+    return a;
   }
-  function u(b) {
-    return function(f) {
-      c(b, f);
+  function v(a) {
+    return function(c) {
+      b(a, c);
     };
   }
-  function n(b) {
-    return function(f) {
-      if ("unresolved" === b.promiseStatus) {
-        var e = b.resolveReactions;
-        b.result = f;
-        b.resolveReactions = void 0;
-        b.rejectReactions = void 0;
-        b.promiseStatus = "has-resolution";
-        t(e, f);
+  function m(a) {
+    return function(c) {
+      if ("unresolved" === a.promiseStatus) {
+        var e = a.resolveReactions;
+        a.result = c;
+        a.resolveReactions = void 0;
+        a.rejectReactions = void 0;
+        a.promiseStatus = "has-resolution";
+        u(e, c);
       }
     };
   }
-  function s() {
-    function b(f, e) {
-      b.resolve = f;
-      b.reject = e;
+  function r() {
+    function a(c, e) {
+      a.resolve = c;
+      a.reject = e;
     }
-    return b;
+    return a;
   }
-  function v(b, f, e) {
+  function w(a, c, e) {
     return function(d) {
-      if (d === b) {
+      if (d === a) {
         return e(new TypeError("Self resolution"));
       }
-      var a = b.promiseConstructor;
-      if (g(d) && d.promiseConstructor === a) {
-        return d.then(f, e);
+      var l = a.promiseConstructor;
+      if (g(d) && d.promiseConstructor === l) {
+        return d.then(c, e);
       }
-      a = l(a);
-      return r(d, a) ? a.promise.then(f, e) : f(d);
+      l = k(l);
+      return p(d, l) ? l.promise.then(c, e) : c(d);
     };
   }
-  function d(b, f, e, d) {
-    return function(a) {
-      f[b] = a;
+  function t(a, c, e, d) {
+    return function(l) {
+      c[a] = l;
       d.countdown--;
-      0 === d.countdown && e.resolve(f);
+      0 === d.countdown && e.resolve(c);
     };
   }
-  function e(b) {
-    if ("function" !== typeof b) {
+  function l(a) {
+    if ("function" !== typeof a) {
       throw new TypeError("resolver is not a function");
     }
     if ("object" !== typeof this) {
@@ -2262,142 +2266,142 @@
     this.resolveReactions = [];
     this.rejectReactions = [];
     this.result = void 0;
-    var f = n(this), d = u(this);
+    var c = m(this), e = v(this);
     try {
-      b(f, d);
-    } catch (a) {
-      c(this, a);
+      a(c, e);
+    } catch (d) {
+      b(this, d);
     }
-    this.promiseConstructor = e;
+    this.promiseConstructor = l;
     return this;
   }
-  var b = Function("return this")();
-  if (b.Promise) {
-    "function" !== typeof b.Promise.all && (b.Promise.all = function(f) {
-      var e = 0, d = [], a, h, p = new b.Promise(function(b, f) {
-        a = b;
-        h = f;
+  var c = Function("return this")();
+  if (c.Promise) {
+    "function" !== typeof c.Promise.all && (c.Promise.all = function(a) {
+      var e = 0, d = [], l, n, f = new c.Promise(function(a, c) {
+        l = a;
+        n = c;
       });
-      f.forEach(function(b, f) {
+      a.forEach(function(a, c) {
         e++;
-        b.then(function(b) {
-          d[f] = b;
+        a.then(function(a) {
+          d[c] = a;
           e--;
-          0 === e && a(d);
-        }, h);
+          0 === e && l(d);
+        }, n);
       });
-      0 === e && a(d);
-      return p;
-    }), "function" !== typeof b.Promise.resolve && (b.Promise.resolve = function(f) {
-      return new b.Promise(function(b) {
-        b(f);
+      0 === e && l(d);
+      return f;
+    }), "function" !== typeof c.Promise.resolve && (c.Promise.resolve = function(a) {
+      return new c.Promise(function(c) {
+        c(a);
       });
     });
   } else {
-    var f = [];
-    e.all = function(b) {
-      var f = l(this), e = [], a = {countdown:0}, h = 0;
-      b.forEach(function(b) {
-        this.cast(b).then(d(h, e, f, a), f.reject);
-        h++;
-        a.countdown++;
+    var e = [];
+    l.all = function(a) {
+      var c = k(this), e = [], d = {countdown:0}, l = 0;
+      a.forEach(function(a) {
+        this.cast(a).then(t(l, e, c, d), c.reject);
+        l++;
+        d.countdown++;
       }, this);
-      0 === h && f.resolve(e);
-      return f.promise;
+      0 === l && c.resolve(e);
+      return c.promise;
     };
-    e.cast = function(b) {
-      if (g(b)) {
-        return b;
+    l.cast = function(a) {
+      if (g(a)) {
+        return a;
       }
-      var f = l(this);
-      f.resolve(b);
-      return f.promise;
-    };
-    e.reject = function(b) {
-      var f = l(this);
-      f.reject(b);
-      return f.promise;
-    };
-    e.resolve = function(b) {
-      var f = l(this);
-      f.resolve(b);
-      return f.promise;
-    };
-    e.prototype = {"catch":function(b) {
-      this.then(void 0, b);
-    }, then:function(b, f) {
+      var c = k(this);
+      c.resolve(a);
+      return c.promise;
+    };
+    l.reject = function(a) {
+      var c = k(this);
+      c.reject(a);
+      return c.promise;
+    };
+    l.resolve = function(a) {
+      var c = k(this);
+      c.resolve(a);
+      return c.promise;
+    };
+    l.prototype = {"catch":function(a) {
+      this.then(void 0, a);
+    }, then:function(a, c) {
       if (!g(this)) {
         throw new TypeError("this is not a Promises");
       }
-      var e = l(this.promiseConstructor), d = "function" === typeof f ? f : p, a = {deferred:e, handler:v(this, "function" === typeof b ? b : k, d)}, d = {deferred:e, handler:d};
+      var e = k(this.promiseConstructor), d = "function" === typeof c ? c : n, l = {deferred:e, handler:w(this, "function" === typeof a ? a : f, d)}, d = {deferred:e, handler:d};
       switch(this.promiseStatus) {
         case "unresolved":
-          this.resolveReactions.push(a);
+          this.resolveReactions.push(l);
           this.rejectReactions.push(d);
           break;
         case "has-resolution":
-          m({reaction:a, argument:this.result});
+          h({reaction:l, argument:this.result});
           break;
         case "has-rejection":
-          m({reaction:d, argument:this.result});
+          h({reaction:d, argument:this.result});
       }
       return e.promise;
     }};
-    b.Promise = e;
+    c.Promise = l;
   }
 })();
 "undefined" !== typeof exports && (exports.Shumway = Shumway);
 (function() {
-  function l(l, g, c) {
-    l[g] || Object.defineProperty(l, g, {value:c, writable:!0, configurable:!0, enumerable:!1});
+  function k(k, g, b) {
+    k[g] || Object.defineProperty(k, g, {value:b, writable:!0, configurable:!0, enumerable:!1});
   }
-  l(String.prototype, "padRight", function(l, g) {
-    var c = this, t = c.replace(/\033\[[0-9]*m/g, "").length;
-    if (!l || t >= g) {
-      return c;
+  k(String.prototype, "padRight", function(k, g) {
+    var b = this, u = b.replace(/\033\[[0-9]*m/g, "").length;
+    if (!k || u >= g) {
+      return b;
     }
-    for (var t = (g - t) / l.length, m = 0;m < t;m++) {
-      c += l;
+    for (var u = (g - u) / k.length, h = 0;h < u;h++) {
+      b += k;
     }
-    return c;
+    return b;
   });
-  l(String.prototype, "padLeft", function(l, g) {
-    var c = this, t = c.length;
-    if (!l || t >= g) {
-      return c;
+  k(String.prototype, "padLeft", function(k, g) {
+    var b = this, u = b.length;
+    if (!k || u >= g) {
+      return b;
     }
-    for (var t = (g - t) / l.length, m = 0;m < t;m++) {
-      c = l + c;
+    for (var u = (g - u) / k.length, h = 0;h < u;h++) {
+      b = k + b;
     }
-    return c;
+    return b;
   });
-  l(String.prototype, "trim", function() {
+  k(String.prototype, "trim", function() {
     return this.replace(/^\s+|\s+$/g, "");
   });
-  l(String.prototype, "endsWith", function(l) {
-    return-1 !== this.indexOf(l, this.length - l.length);
+  k(String.prototype, "endsWith", function(k) {
+    return-1 !== this.indexOf(k, this.length - k.length);
   });
-  l(Array.prototype, "replace", function(l, g) {
-    if (l === g) {
+  k(Array.prototype, "replace", function(k, g) {
+    if (k === g) {
       return 0;
     }
-    for (var c = 0, t = 0;t < this.length;t++) {
-      this[t] === l && (this[t] = g, c++);
+    for (var b = 0, u = 0;u < this.length;u++) {
+      this[u] === k && (this[u] = g, b++);
     }
-    return c;
+    return b;
   });
 })();
-(function(l) {
-  (function(r) {
-    var g = l.isObject, c = function() {
-      function a(a, p, c, m) {
+(function(k) {
+  (function(p) {
+    var g = k.isObject, b = function() {
+      function a(a, n, f, b) {
         this.shortName = a;
-        this.longName = p;
-        this.type = c;
-        m = m || {};
-        this.positional = m.positional;
-        this.parseFn = m.parse;
-        this.value = m.defaultValue;
+        this.longName = n;
+        this.type = f;
+        b = b || {};
+        this.positional = b.positional;
+        this.parseFn = b.parse;
+        this.value = b.defaultValue;
       }
       a.prototype.parse = function(a) {
         this.value = "boolean" === this.type ? a : "number" === this.type ? parseInt(a, 10) : a;
@@ -2405,132 +2409,132 @@
       };
       return a;
     }();
-    r.Argument = c;
-    var t = function() {
+    p.Argument = b;
+    var u = function() {
       function a() {
         this.args = [];
       }
-      a.prototype.addArgument = function(a, p, k, m) {
-        a = new c(a, p, k, m);
+      a.prototype.addArgument = function(a, n, f, h) {
+        a = new b(a, n, f, h);
         this.args.push(a);
         return a;
       };
       a.prototype.addBoundOption = function(a) {
-        this.args.push(new c(a.shortName, a.longName, a.type, {parse:function(p) {
-          a.value = p;
+        this.args.push(new b(a.shortName, a.longName, a.type, {parse:function(n) {
+          a.value = n;
         }}));
       };
       a.prototype.addBoundOptionSet = function(a) {
-        var p = this;
+        var n = this;
         a.options.forEach(function(a) {
-          a instanceof m ? p.addBoundOptionSet(a) : p.addBoundOption(a);
+          a instanceof h ? n.addBoundOptionSet(a) : n.addBoundOption(a);
         });
       };
       a.prototype.getUsage = function() {
         var a = "";
-        this.args.forEach(function(p) {
-          a = p.positional ? a + p.longName : a + ("[-" + p.shortName + "|--" + p.longName + ("boolean" === p.type ? "" : " " + p.type[0].toUpperCase()) + "]");
+        this.args.forEach(function(n) {
+          a = n.positional ? a + n.longName : a + ("[-" + n.shortName + "|--" + n.longName + ("boolean" === n.type ? "" : " " + n.type[0].toUpperCase()) + "]");
           a += " ";
         });
         return a;
       };
       a.prototype.parse = function(a) {
-        var p = {}, c = [];
-        this.args.forEach(function(d) {
-          d.positional ? c.push(d) : (p["-" + d.shortName] = d, p["--" + d.longName] = d);
+        var n = {}, b = [];
+        this.args.forEach(function(a) {
+          a.positional ? b.push(a) : (n["-" + a.shortName] = a, n["--" + a.longName] = a);
         });
-        for (var m = [];a.length;) {
-          var n = a.shift(), s = null, g = n;
-          if ("--" == n) {
-            m = m.concat(a);
+        for (var h = [];a.length;) {
+          var m = a.shift(), r = null, g = m;
+          if ("--" == m) {
+            h = h.concat(a);
             break;
           } else {
-            if ("-" == n.slice(0, 1) || "--" == n.slice(0, 2)) {
-              s = p[n];
-              if (!s) {
+            if ("-" == m.slice(0, 1) || "--" == m.slice(0, 2)) {
+              r = n[m];
+              if (!r) {
                 continue;
               }
-              g = "boolean" !== s.type ? a.shift() : !0;
+              g = "boolean" !== r.type ? a.shift() : !0;
             } else {
-              c.length ? s = c.shift() : m.push(g);
+              b.length ? r = b.shift() : h.push(g);
             }
           }
-          s && s.parse(g);
+          r && r.parse(g);
         }
-        return m;
+        return h;
       };
       return a;
     }();
-    r.ArgumentParser = t;
-    var m = function() {
-      function a(a, p) {
-        void 0 === p && (p = null);
+    p.ArgumentParser = u;
+    var h = function() {
+      function a(a, n) {
+        void 0 === n && (n = null);
         this.open = !1;
         this.name = a;
-        this.settings = p || {};
+        this.settings = n || {};
         this.options = [];
       }
-      a.prototype.register = function(h) {
-        if (h instanceof a) {
-          for (var p = 0;p < this.options.length;p++) {
-            var c = this.options[p];
-            if (c instanceof a && c.name === h.name) {
-              return c;
+      a.prototype.register = function(d) {
+        if (d instanceof a) {
+          for (var n = 0;n < this.options.length;n++) {
+            var b = this.options[n];
+            if (b instanceof a && b.name === d.name) {
+              return b;
             }
           }
         }
-        this.options.push(h);
+        this.options.push(d);
         if (this.settings) {
-          if (h instanceof a) {
-            p = this.settings[h.name], g(p) && (h.settings = p.settings, h.open = p.open);
+          if (d instanceof a) {
+            n = this.settings[d.name], g(n) && (d.settings = n.settings, d.open = n.open);
           } else {
-            if ("undefined" !== typeof this.settings[h.longName]) {
-              switch(h.type) {
+            if ("undefined" !== typeof this.settings[d.longName]) {
+              switch(d.type) {
                 case "boolean":
-                  h.value = !!this.settings[h.longName];
+                  d.value = !!this.settings[d.longName];
                   break;
                 case "number":
-                  h.value = +this.settings[h.longName];
+                  d.value = +this.settings[d.longName];
                   break;
                 default:
-                  h.value = this.settings[h.longName];
+                  d.value = this.settings[d.longName];
               }
             }
           }
         }
-        return h;
+        return d;
       };
       a.prototype.trace = function(a) {
         a.enter(this.name + " {");
-        this.options.forEach(function(p) {
-          p.trace(a);
+        this.options.forEach(function(n) {
+          n.trace(a);
         });
         a.leave("}");
       };
       a.prototype.getSettings = function() {
-        var h = {};
-        this.options.forEach(function(p) {
-          p instanceof a ? h[p.name] = {settings:p.getSettings(), open:p.open} : h[p.longName] = p.value;
+        var d = {};
+        this.options.forEach(function(n) {
+          n instanceof a ? d[n.name] = {settings:n.getSettings(), open:n.open} : d[n.longName] = n.value;
         });
-        return h;
+        return d;
       };
-      a.prototype.setSettings = function(h) {
-        h && this.options.forEach(function(p) {
-          p instanceof a ? p.name in h && p.setSettings(h[p.name].settings) : p.longName in h && (p.value = h[p.longName]);
+      a.prototype.setSettings = function(d) {
+        d && this.options.forEach(function(n) {
+          n instanceof a ? n.name in d && n.setSettings(d[n.name].settings) : n.longName in d && (n.value = d[n.longName]);
         });
       };
       return a;
     }();
-    r.OptionSet = m;
-    t = function() {
-      function a(a, p, c, m, n, s) {
-        void 0 === s && (s = null);
-        this.longName = p;
+    p.OptionSet = h;
+    u = function() {
+      function a(a, n, b, h, m, r) {
+        void 0 === r && (r = null);
+        this.longName = n;
         this.shortName = a;
-        this.type = c;
-        this.value = this.defaultValue = m;
-        this.description = n;
-        this.config = s;
+        this.type = b;
+        this.value = this.defaultValue = h;
+        this.description = m;
+        this.config = r;
       }
       a.prototype.parse = function(a) {
         this.value = a;
@@ -2540,345 +2544,345 @@
       };
       return a;
     }();
-    r.Option = t;
-  })(l.Options || (l.Options = {}));
+    p.Option = u;
+  })(k.Options || (k.Options = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     function g() {
       try {
         return "undefined" !== typeof window && "localStorage" in window && null !== window.localStorage;
-      } catch (c) {
+      } catch (b) {
         return!1;
       }
     }
-    function c(c) {
-      void 0 === c && (c = r.ROOT);
-      var m = {};
-      if (g() && (c = window.localStorage[c])) {
+    function b(b) {
+      void 0 === b && (b = p.ROOT);
+      var h = {};
+      if (g() && (b = window.localStorage[b])) {
         try {
-          m = JSON.parse(c);
+          h = JSON.parse(b);
         } catch (a) {
         }
       }
-      return m;
+      return h;
     }
-    r.ROOT = "Shumway Options";
-    r.shumwayOptions = new l.Options.OptionSet(r.ROOT, c());
-    r.isStorageSupported = g;
-    r.load = c;
-    r.save = function(c, m) {
-      void 0 === c && (c = null);
-      void 0 === m && (m = r.ROOT);
+    p.ROOT = "Shumway Options";
+    p.shumwayOptions = new k.Options.OptionSet(p.ROOT, b());
+    p.isStorageSupported = g;
+    p.load = b;
+    p.save = function(b, h) {
+      void 0 === b && (b = null);
+      void 0 === h && (h = p.ROOT);
       if (g()) {
         try {
-          window.localStorage[m] = JSON.stringify(c ? c : r.shumwayOptions.getSettings());
+          window.localStorage[h] = JSON.stringify(b ? b : p.shumwayOptions.getSettings());
         } catch (a) {
         }
       }
     };
-    r.setSettings = function(c) {
-      r.shumwayOptions.setSettings(c);
+    p.setSettings = function(b) {
+      p.shumwayOptions.setSettings(b);
     };
-    r.getSettings = function(c) {
-      return r.shumwayOptions.getSettings();
+    p.getSettings = function(b) {
+      return p.shumwayOptions.getSettings();
     };
-  })(l.Settings || (l.Settings = {}));
+  })(k.Settings || (k.Settings = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     var g = function() {
-      function c(c, m) {
-        this._parent = c;
-        this._timers = l.ObjectUtilities.createMap();
-        this._name = m;
+      function b(b, h) {
+        this._parent = b;
+        this._timers = k.ObjectUtilities.createMap();
+        this._name = h;
         this._count = this._total = this._last = this._begin = 0;
       }
-      c.time = function(g, m) {
-        c.start(g);
-        m();
-        c.stop();
-      };
-      c.start = function(g) {
-        c._top = c._top._timers[g] || (c._top._timers[g] = new c(c._top, g));
-        c._top.start();
-        g = c._flat._timers[g] || (c._flat._timers[g] = new c(c._flat, g));
+      b.time = function(g, h) {
+        b.start(g);
+        h();
+        b.stop();
+      };
+      b.start = function(g) {
+        b._top = b._top._timers[g] || (b._top._timers[g] = new b(b._top, g));
+        b._top.start();
+        g = b._flat._timers[g] || (b._flat._timers[g] = new b(b._flat, g));
         g.start();
-        c._flatStack.push(g);
+        b._flatStack.push(g);
       };
-      c.stop = function() {
-        c._top.stop();
-        c._top = c._top._parent;
-        c._flatStack.pop().stop();
-      };
-      c.stopStart = function(g) {
-        c.stop();
-        c.start(g);
+      b.stop = function() {
+        b._top.stop();
+        b._top = b._top._parent;
+        b._flatStack.pop().stop();
+      };
+      b.stopStart = function(g) {
+        b.stop();
+        b.start(g);
       };
-      c.prototype.start = function() {
-        this._begin = l.getTicks();
+      b.prototype.start = function() {
+        this._begin = k.getTicks();
       };
-      c.prototype.stop = function() {
-        this._last = l.getTicks() - this._begin;
+      b.prototype.stop = function() {
+        this._last = k.getTicks() - this._begin;
         this._total += this._last;
         this._count += 1;
       };
-      c.prototype.toJSON = function() {
+      b.prototype.toJSON = function() {
         return{name:this._name, total:this._total, timers:this._timers};
       };
-      c.prototype.trace = function(c) {
-        c.enter(this._name + ": " + this._total.toFixed(2) + " ms, count: " + this._count + ", average: " + (this._total / this._count).toFixed(2) + " ms");
-        for (var m in this._timers) {
-          this._timers[m].trace(c);
-        }
-        c.outdent();
-      };
-      c.trace = function(g) {
-        c._base.trace(g);
-        c._flat.trace(g);
-      };
-      c._base = new c(null, "Total");
-      c._top = c._base;
-      c._flat = new c(null, "Flat");
-      c._flatStack = [];
-      return c;
+      b.prototype.trace = function(b) {
+        b.enter(this._name + ": " + this._total.toFixed(2) + " ms, count: " + this._count + ", average: " + (this._total / this._count).toFixed(2) + " ms");
+        for (var h in this._timers) {
+          this._timers[h].trace(b);
+        }
+        b.outdent();
+      };
+      b.trace = function(g) {
+        b._base.trace(g);
+        b._flat.trace(g);
+      };
+      b._base = new b(null, "Total");
+      b._top = b._base;
+      b._flat = new b(null, "Flat");
+      b._flatStack = [];
+      return b;
     }();
-    r.Timer = g;
+    p.Timer = g;
     g = function() {
-      function c(c) {
-        this._enabled = c;
+      function b(b) {
+        this._enabled = b;
         this.clear();
       }
-      Object.defineProperty(c.prototype, "counts", {get:function() {
+      Object.defineProperty(b.prototype, "counts", {get:function() {
         return this._counts;
       }, enumerable:!0, configurable:!0});
-      c.prototype.setEnabled = function(c) {
-        this._enabled = c;
+      b.prototype.setEnabled = function(b) {
+        this._enabled = b;
       };
-      c.prototype.clear = function() {
-        this._counts = l.ObjectUtilities.createMap();
-        this._times = l.ObjectUtilities.createMap();
+      b.prototype.clear = function() {
+        this._counts = k.ObjectUtilities.createMap();
+        this._times = k.ObjectUtilities.createMap();
       };
-      c.prototype.toJSON = function() {
+      b.prototype.toJSON = function() {
         return{counts:this._counts, times:this._times};
       };
-      c.prototype.count = function(c, m, a) {
-        void 0 === m && (m = 1);
+      b.prototype.count = function(b, h, a) {
+        void 0 === h && (h = 1);
         void 0 === a && (a = 0);
         if (this._enabled) {
-          return void 0 === this._counts[c] && (this._counts[c] = 0, this._times[c] = 0), this._counts[c] += m, this._times[c] += a, this._counts[c];
+          return void 0 === this._counts[b] && (this._counts[b] = 0, this._times[b] = 0), this._counts[b] += h, this._times[b] += a, this._counts[b];
         }
       };
-      c.prototype.trace = function(c) {
-        for (var m in this._counts) {
-          c.writeLn(m + ": " + this._counts[m]);
+      b.prototype.trace = function(b) {
+        for (var h in this._counts) {
+          b.writeLn(h + ": " + this._counts[h]);
         }
       };
-      c.prototype._pairToString = function(c, m) {
-        var a = m[0], h = m[1], p = c[a], a = a + ": " + h;
-        p && (a += ", " + p.toFixed(4), 1 < h && (a += " (" + (p / h).toFixed(4) + ")"));
+      b.prototype._pairToString = function(b, h) {
+        var a = h[0], d = h[1], n = b[a], a = a + ": " + d;
+        n && (a += ", " + n.toFixed(4), 1 < d && (a += " (" + (n / d).toFixed(4) + ")"));
         return a;
       };
-      c.prototype.toStringSorted = function() {
-        var c = this, m = this._times, a = [], h;
-        for (h in this._counts) {
-          a.push([h, this._counts[h]]);
+      b.prototype.toStringSorted = function() {
+        var b = this, h = this._times, a = [], d;
+        for (d in this._counts) {
+          a.push([d, this._counts[d]]);
         }
-        a.sort(function(a, h) {
-          return h[1] - a[1];
+        a.sort(function(a, d) {
+          return d[1] - a[1];
         });
         return a.map(function(a) {
-          return c._pairToString(m, a);
+          return b._pairToString(h, a);
         }).join(", ");
       };
-      c.prototype.traceSorted = function(c, m) {
-        void 0 === m && (m = !1);
-        var a = this, h = this._times, p = [], k;
-        for (k in this._counts) {
-          p.push([k, this._counts[k]]);
+      b.prototype.traceSorted = function(b, h) {
+        void 0 === h && (h = !1);
+        var a = this, d = this._times, n = [], f;
+        for (f in this._counts) {
+          n.push([f, this._counts[f]]);
         }
-        p.sort(function(a, h) {
-          return h[1] - a[1];
+        n.sort(function(a, d) {
+          return d[1] - a[1];
         });
-        m ? c.writeLn(p.map(function(p) {
-          return a._pairToString(h, p);
-        }).join(", ")) : p.forEach(function(p) {
-          c.writeLn(a._pairToString(h, p));
+        h ? b.writeLn(n.map(function(n) {
+          return a._pairToString(d, n);
+        }).join(", ")) : n.forEach(function(n) {
+          b.writeLn(a._pairToString(d, n));
         });
       };
-      c.instance = new c(!0);
-      return c;
+      b.instance = new b(!0);
+      return b;
     }();
-    r.Counter = g;
+    p.Counter = g;
     g = function() {
-      function c(c) {
-        this._samples = new Float64Array(c);
+      function b(b) {
+        this._samples = new Float64Array(b);
         this._index = this._count = 0;
       }
-      c.prototype.push = function(c) {
+      b.prototype.push = function(b) {
         this._count < this._samples.length && this._count++;
         this._index++;
-        this._samples[this._index % this._samples.length] = c;
+        this._samples[this._index % this._samples.length] = b;
       };
-      c.prototype.average = function() {
-        for (var c = 0, m = 0;m < this._count;m++) {
-          c += this._samples[m];
+      b.prototype.average = function() {
+        for (var b = 0, h = 0;h < this._count;h++) {
+          b += this._samples[h];
         }
-        return c / this._count;
+        return b / this._count;
       };
-      return c;
+      return b;
     }();
-    r.Average = g;
-  })(l.Metrics || (l.Metrics = {}));
+    p.Average = g;
+  })(k.Metrics || (k.Metrics = {}));
 })(Shumway || (Shumway = {}));
-var __extends = this.__extends || function(l, r) {
+var __extends = this.__extends || function(k, p) {
   function g() {
-    this.constructor = l;
+    this.constructor = k;
   }
-  for (var c in r) {
-    r.hasOwnProperty(c) && (l[c] = r[c]);
+  for (var b in p) {
+    p.hasOwnProperty(b) && (k[b] = p[b]);
   }
-  g.prototype = r.prototype;
-  l.prototype = new g;
+  g.prototype = p.prototype;
+  k.prototype = new g;
 };
-(function(l) {
-  (function(l) {
-    function g(b) {
-      for (var f = Math.max.apply(null, b), q = b.length, e = 1 << f, d = new Uint32Array(e), a = f << 16 | 65535, h = 0;h < e;h++) {
-        d[h] = a;
+(function(k) {
+  (function(k) {
+    function g(a) {
+      for (var e = Math.max.apply(null, a), q = a.length, d = 1 << e, l = new Uint32Array(d), n = e << 16 | 65535, b = 0;b < d;b++) {
+        l[b] = n;
       }
-      for (var a = 0, h = 1, p = 2;h <= f;a <<= 1, ++h, p <<= 1) {
-        for (var c = 0;c < q;++c) {
-          if (b[c] === h) {
-            for (var m = 0, k = 0;k < h;++k) {
-              m = 2 * m + (a >> k & 1);
+      for (var n = 0, b = 1, f = 2;b <= e;n <<= 1, ++b, f <<= 1) {
+        for (var h = 0;h < q;++h) {
+          if (a[h] === b) {
+            for (var m = 0, t = 0;t < b;++t) {
+              m = 2 * m + (n >> t & 1);
             }
-            for (k = m;k < e;k += p) {
-              d[k] = h << 16 | c;
+            for (t = m;t < d;t += f) {
+              l[t] = b << 16 | h;
             }
-            ++a;
+            ++n;
           }
         }
       }
-      return{codes:d, maxBits:f};
+      return{codes:l, maxBits:e};
     }
-    var c;
-    (function(b) {
-      b[b.INIT = 0] = "INIT";
-      b[b.BLOCK_0 = 1] = "BLOCK_0";
-      b[b.BLOCK_1 = 2] = "BLOCK_1";
-      b[b.BLOCK_2_PRE = 3] = "BLOCK_2_PRE";
-      b[b.BLOCK_2 = 4] = "BLOCK_2";
-      b[b.DONE = 5] = "DONE";
-      b[b.ERROR = 6] = "ERROR";
-      b[b.VERIFY_HEADER = 7] = "VERIFY_HEADER";
-    })(c || (c = {}));
-    c = function() {
-      function b(b) {
+    var b;
+    (function(a) {
+      a[a.INIT = 0] = "INIT";
+      a[a.BLOCK_0 = 1] = "BLOCK_0";
+      a[a.BLOCK_1 = 2] = "BLOCK_1";
+      a[a.BLOCK_2_PRE = 3] = "BLOCK_2_PRE";
+      a[a.BLOCK_2 = 4] = "BLOCK_2";
+      a[a.DONE = 5] = "DONE";
+      a[a.ERROR = 6] = "ERROR";
+      a[a.VERIFY_HEADER = 7] = "VERIFY_HEADER";
+    })(b || (b = {}));
+    b = function() {
+      function a(c) {
       }
-      b.prototype.push = function(b) {
+      a.prototype.push = function(a) {
       };
-      b.prototype.close = function() {
+      a.prototype.close = function() {
       };
-      b.create = function(b) {
-        return "undefined" !== typeof SpecialInflate ? new v(b) : new t(b);
+      a.create = function(a) {
+        return "undefined" !== typeof SpecialInflate ? new w(a) : new u(a);
       };
-      b.prototype._processZLibHeader = function(b, q, e) {
-        if (q + 2 > e) {
+      a.prototype._processZLibHeader = function(a, c, d) {
+        if (c + 2 > d) {
           return 0;
         }
-        b = b[q] << 8 | b[q + 1];
-        q = null;
-        2048 !== (b & 3840) ? q = "inflate: unknown compression method" : 0 !== b % 31 ? q = "inflate: bad FCHECK" : 0 !== (b & 32) && (q = "inflate: FDICT bit set");
-        if (q) {
+        a = a[c] << 8 | a[c + 1];
+        c = null;
+        2048 !== (a & 3840) ? c = "inflate: unknown compression method" : 0 !== a % 31 ? c = "inflate: bad FCHECK" : 0 !== (a & 32) && (c = "inflate: FDICT bit set");
+        if (c) {
           if (this.onError) {
-            this.onError(q);
+            this.onError(c);
           }
           return-1;
         }
         return 2;
       };
-      b.inflate = function(f, q, e) {
-        var d = new Uint8Array(q), a = 0;
-        q = b.create(e);
-        q.onData = function(b) {
-          d.set(b, a);
-          a += b.length;
+      a.inflate = function(e, q, d) {
+        var l = new Uint8Array(q), n = 0;
+        q = a.create(d);
+        q.onData = function(a) {
+          l.set(a, n);
+          n += a.length;
         };
-        q.push(f);
+        q.push(e);
         q.close();
-        return d;
+        return l;
       };
-      return b;
+      return a;
     }();
-    l.Inflate = c;
-    var t = function(b) {
-      function f(f) {
-        b.call(this, f);
+    k.Inflate = b;
+    var u = function(c) {
+      function e(e) {
+        c.call(this, e);
         this._buffer = null;
         this._bitLength = this._bitBuffer = this._bufferPosition = this._bufferSize = 0;
         this._window = new Uint8Array(65794);
         this._windowPosition = 0;
-        this._state = f ? 7 : 0;
+        this._state = e ? 7 : 0;
         this._isFinalBlock = !1;
         this._distanceTable = this._literalTable = null;
         this._block0Read = 0;
         this._block2State = null;
         this._copyState = {state:0, len:0, lenBits:0, dist:0, distBits:0};
-        if (!s) {
-          m = new Uint8Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
+        if (!r) {
+          h = new Uint8Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
           a = new Uint16Array(30);
-          h = new Uint8Array(30);
-          for (var e = f = 0, d = 1;30 > f;++f) {
-            a[f] = d, d += 1 << (h[f] = ~~((e += 2 < f ? 1 : 0) / 2));
-          }
-          var c = new Uint8Array(288);
-          for (f = 0;32 > f;++f) {
-            c[f] = 5;
-          }
-          p = g(c.subarray(0, 32));
-          k = new Uint16Array(29);
-          u = new Uint8Array(29);
-          e = f = 0;
-          for (d = 3;29 > f;++f) {
-            k[f] = d - (28 == f ? 1 : 0), d += 1 << (u[f] = ~~((e += 4 < f ? 1 : 0) / 4 % 6));
-          }
-          for (f = 0;288 > f;++f) {
-            c[f] = 144 > f || 279 < f ? 8 : 256 > f ? 9 : 7;
-          }
-          n = g(c);
-          s = !0;
-        }
-      }
-      __extends(f, b);
-      f.prototype.push = function(b) {
-        if (!this._buffer || this._buffer.length < this._bufferSize + b.length) {
-          var f = new Uint8Array(this._bufferSize + b.length);
-          this._buffer && f.set(this._buffer);
-          this._buffer = f;
+          d = new Uint8Array(30);
+          for (var s = e = 0, l = 1;30 > e;++e) {
+            a[e] = l, l += 1 << (d[e] = ~~((s += 2 < e ? 1 : 0) / 2));
+          }
+          var b = new Uint8Array(288);
+          for (e = 0;32 > e;++e) {
+            b[e] = 5;
+          }
+          n = g(b.subarray(0, 32));
+          f = new Uint16Array(29);
+          v = new Uint8Array(29);
+          s = e = 0;
+          for (l = 3;29 > e;++e) {
+            f[e] = l - (28 == e ? 1 : 0), l += 1 << (v[e] = ~~((s += 4 < e ? 1 : 0) / 4 % 6));
+          }
+          for (e = 0;288 > e;++e) {
+            b[e] = 144 > e || 279 < e ? 8 : 256 > e ? 9 : 7;
+          }
+          m = g(b);
+          r = !0;
+        }
+      }
+      __extends(e, c);
+      e.prototype.push = function(a) {
+        if (!this._buffer || this._buffer.length < this._bufferSize + a.length) {
+          var c = new Uint8Array(this._bufferSize + a.length);
+          this._buffer && c.set(this._buffer);
+          this._buffer = c;
         }
-        this._buffer.set(b, this._bufferSize);
-        this._bufferSize += b.length;
+        this._buffer.set(a, this._bufferSize);
+        this._bufferSize += a.length;
         this._bufferPosition = 0;
-        b = !1;
+        a = !1;
         do {
-          f = this._windowPosition;
-          if (0 === this._state && (b = this._decodeInitState())) {
+          c = this._windowPosition;
+          if (0 === this._state && (a = this._decodeInitState())) {
             break;
           }
           switch(this._state) {
             case 1:
-              b = this._decodeBlock0();
+              a = this._decodeBlock0();
               break;
             case 3:
-              if (b = this._decodeBlock2Pre()) {
+              if (a = this._decodeBlock2Pre()) {
                 break;
               }
             ;
             case 2:
             ;
             case 4:
-              b = this._decodeBlock();
+              a = this._decodeBlock();
               break;
             case 6:
             ;
@@ -2887,366 +2891,366 @@
               break;
             case 7:
               var e = this._processZLibHeader(this._buffer, this._bufferPosition, this._bufferSize);
-              0 < e ? (this._bufferPosition += e, this._state = 0) : 0 === e ? b = !0 : this._state = 6;
+              0 < e ? (this._bufferPosition += e, this._state = 0) : 0 === e ? a = !0 : this._state = 6;
           }
-          if (0 < this._windowPosition - f) {
-            this.onData(this._window.subarray(f, this._windowPosition));
+          if (0 < this._windowPosition - c) {
+            this.onData(this._window.subarray(c, this._windowPosition));
           }
           65536 <= this._windowPosition && ("copyWithin" in this._buffer ? this._window.copyWithin(0, this._windowPosition - 32768, this._windowPosition) : this._window.set(this._window.subarray(this._windowPosition - 32768, this._windowPosition)), this._windowPosition = 32768);
-        } while (!b && this._bufferPosition < this._bufferSize);
+        } while (!a && this._bufferPosition < this._bufferSize);
         this._bufferPosition < this._bufferSize ? ("copyWithin" in this._buffer ? this._buffer.copyWithin(0, this._bufferPosition, this._bufferSize) : this._buffer.set(this._buffer.subarray(this._bufferPosition, this._bufferSize)), this._bufferSize -= this._bufferPosition) : this._bufferSize = 0;
       };
-      f.prototype._decodeInitState = function() {
+      e.prototype._decodeInitState = function() {
         if (this._isFinalBlock) {
           return this._state = 5, !1;
         }
-        var b = this._buffer, f = this._bufferSize, e = this._bitBuffer, d = this._bitLength, a = this._bufferPosition;
-        if (3 > (f - a << 3) + d) {
+        var a = this._buffer, c = this._bufferSize, e = this._bitBuffer, d = this._bitLength, l = this._bufferPosition;
+        if (3 > (c - l << 3) + d) {
           return!0;
         }
-        3 > d && (e |= b[a++] << d, d += 8);
-        var h = e & 7, e = e >> 3, d = d - 3;
-        switch(h >> 1) {
+        3 > d && (e |= a[l++] << d, d += 8);
+        var b = e & 7, e = e >> 3, d = d - 3;
+        switch(b >> 1) {
           case 0:
             d = e = 0;
-            if (4 > f - a) {
+            if (4 > c - l) {
               return!0;
             }
-            var c = b[a] | b[a + 1] << 8, b = b[a + 2] | b[a + 3] << 8, a = a + 4;
-            if (65535 !== (c ^ b)) {
+            var f = a[l] | a[l + 1] << 8, a = a[l + 2] | a[l + 3] << 8, l = l + 4;
+            if (65535 !== (f ^ a)) {
               this._error("inflate: invalid block 0 length");
-              b = 6;
+              a = 6;
               break;
             }
-            0 === c ? b = 0 : (this._block0Read = c, b = 1);
+            0 === f ? a = 0 : (this._block0Read = f, a = 1);
             break;
           case 1:
-            b = 2;
-            this._literalTable = n;
-            this._distanceTable = p;
+            a = 2;
+            this._literalTable = m;
+            this._distanceTable = n;
             break;
           case 2:
-            if (26 > (f - a << 3) + d) {
+            if (26 > (c - l << 3) + d) {
               return!0;
             }
             for (;14 > d;) {
-              e |= b[a++] << d, d += 8;
+              e |= a[l++] << d, d += 8;
             }
-            c = (e >> 10 & 15) + 4;
-            if ((f - a << 3) + d < 14 + 3 * c) {
+            f = (e >> 10 & 15) + 4;
+            if ((c - l << 3) + d < 14 + 3 * f) {
               return!0;
             }
-            for (var f = {numLiteralCodes:(e & 31) + 257, numDistanceCodes:(e >> 5 & 31) + 1, codeLengthTable:void 0, bitLengths:void 0, codesRead:0, dupBits:0}, e = e >> 14, d = d - 14, k = new Uint8Array(19), u = 0;u < c;++u) {
-              3 > d && (e |= b[a++] << d, d += 8), k[m[u]] = e & 7, e >>= 3, d -= 3;
+            for (var c = {numLiteralCodes:(e & 31) + 257, numDistanceCodes:(e >> 5 & 31) + 1, codeLengthTable:void 0, bitLengths:void 0, codesRead:0, dupBits:0}, e = e >> 14, d = d - 14, t = new Uint8Array(19), v = 0;v < f;++v) {
+              3 > d && (e |= a[l++] << d, d += 8), t[h[v]] = e & 7, e >>= 3, d -= 3;
             }
-            for (;19 > u;u++) {
-              k[m[u]] = 0;
+            for (;19 > v;v++) {
+              t[h[v]] = 0;
             }
-            f.bitLengths = new Uint8Array(f.numLiteralCodes + f.numDistanceCodes);
-            f.codeLengthTable = g(k);
-            this._block2State = f;
-            b = 3;
+            c.bitLengths = new Uint8Array(c.numLiteralCodes + c.numDistanceCodes);
+            c.codeLengthTable = g(t);
+            this._block2State = c;
+            a = 3;
             break;
           default:
             return this._error("inflate: unsupported block type"), !1;
         }
-        this._isFinalBlock = !!(h & 1);
-        this._state = b;
-        this._bufferPosition = a;
+        this._isFinalBlock = !!(b & 1);
+        this._state = a;
+        this._bufferPosition = l;
         this._bitBuffer = e;
         this._bitLength = d;
         return!1;
       };
-      f.prototype._error = function(b) {
+      e.prototype._error = function(a) {
         if (this.onError) {
-          this.onError(b);
+          this.onError(a);
         }
       };
-      f.prototype._decodeBlock0 = function() {
-        var b = this._bufferPosition, f = this._windowPosition, e = this._block0Read, d = 65794 - f, a = this._bufferSize - b, h = a < e, p = Math.min(d, a, e);
-        this._window.set(this._buffer.subarray(b, b + p), f);
-        this._windowPosition = f + p;
-        this._bufferPosition = b + p;
-        this._block0Read = e - p;
-        return e === p ? (this._state = 0, !1) : h && d < a;
-      };
-      f.prototype._readBits = function(b) {
-        var f = this._bitBuffer, e = this._bitLength;
-        if (b > e) {
-          var d = this._bufferPosition, a = this._bufferSize;
+      e.prototype._decodeBlock0 = function() {
+        var a = this._bufferPosition, c = this._windowPosition, e = this._block0Read, d = 65794 - c, l = this._bufferSize - a, n = l < e, b = Math.min(d, l, e);
+        this._window.set(this._buffer.subarray(a, a + b), c);
+        this._windowPosition = c + b;
+        this._bufferPosition = a + b;
+        this._block0Read = e - b;
+        return e === b ? (this._state = 0, !1) : n && d < l;
+      };
+      e.prototype._readBits = function(a) {
+        var c = this._bitBuffer, e = this._bitLength;
+        if (a > e) {
+          var d = this._bufferPosition, l = this._bufferSize;
           do {
-            if (d >= a) {
-              return this._bufferPosition = d, this._bitBuffer = f, this._bitLength = e, -1;
+            if (d >= l) {
+              return this._bufferPosition = d, this._bitBuffer = c, this._bitLength = e, -1;
             }
-            f |= this._buffer[d++] << e;
+            c |= this._buffer[d++] << e;
             e += 8;
-          } while (b > e);
+          } while (a > e);
           this._bufferPosition = d;
         }
-        this._bitBuffer = f >> b;
-        this._bitLength = e - b;
-        return f & (1 << b) - 1;
+        this._bitBuffer = c >> a;
+        this._bitLength = e - a;
+        return c & (1 << a) - 1;
       };
-      f.prototype._readCode = function(b) {
-        var f = this._bitBuffer, e = this._bitLength, d = b.maxBits;
+      e.prototype._readCode = function(a) {
+        var c = this._bitBuffer, e = this._bitLength, d = a.maxBits;
         if (d > e) {
-          var a = this._bufferPosition, h = this._bufferSize;
+          var l = this._bufferPosition, n = this._bufferSize;
           do {
-            if (a >= h) {
-              return this._bufferPosition = a, this._bitBuffer = f, this._bitLength = e, -1;
+            if (l >= n) {
+              return this._bufferPosition = l, this._bitBuffer = c, this._bitLength = e, -1;
             }
-            f |= this._buffer[a++] << e;
+            c |= this._buffer[l++] << e;
             e += 8;
           } while (d > e);
-          this._bufferPosition = a;
+          this._bufferPosition = l;
         }
-        b = b.codes[f & (1 << d) - 1];
-        d = b >> 16;
-        if (b & 32768) {
+        a = a.codes[c & (1 << d) - 1];
+        d = a >> 16;
+        if (a & 32768) {
           return this._error("inflate: invalid encoding"), this._state = 6, -1;
         }
-        this._bitBuffer = f >> d;
+        this._bitBuffer = c >> d;
         this._bitLength = e - d;
-        return b & 65535;
+        return a & 65535;
       };
-      f.prototype._decodeBlock2Pre = function() {
-        var b = this._block2State, f = b.numLiteralCodes + b.numDistanceCodes, e = b.bitLengths, d = b.codesRead, a = 0 < d ? e[d - 1] : 0, h = b.codeLengthTable, p;
-        if (0 < b.dupBits) {
-          p = this._readBits(b.dupBits);
-          if (0 > p) {
+      e.prototype._decodeBlock2Pre = function() {
+        var a = this._block2State, c = a.numLiteralCodes + a.numDistanceCodes, e = a.bitLengths, d = a.codesRead, l = 0 < d ? e[d - 1] : 0, n = a.codeLengthTable, b;
+        if (0 < a.dupBits) {
+          b = this._readBits(a.dupBits);
+          if (0 > b) {
             return!0;
           }
-          for (;p--;) {
-            e[d++] = a;
+          for (;b--;) {
+            e[d++] = l;
           }
-          b.dupBits = 0;
+          a.dupBits = 0;
         }
-        for (;d < f;) {
-          var c = this._readCode(h);
-          if (0 > c) {
-            return b.codesRead = d, !0;
+        for (;d < c;) {
+          var f = this._readCode(n);
+          if (0 > f) {
+            return a.codesRead = d, !0;
           }
-          if (16 > c) {
-            e[d++] = a = c;
+          if (16 > f) {
+            e[d++] = l = f;
           } else {
-            var m;
-            switch(c) {
+            var h;
+            switch(f) {
               case 16:
-                m = 2;
-                p = 3;
-                c = a;
+                h = 2;
+                b = 3;
+                f = l;
                 break;
               case 17:
-                p = m = 3;
-                c = 0;
+                b = h = 3;
+                f = 0;
                 break;
               case 18:
-                m = 7, p = 11, c = 0;
+                h = 7, b = 11, f = 0;
             }
-            for (;p--;) {
-              e[d++] = c;
+            for (;b--;) {
+              e[d++] = f;
             }
-            p = this._readBits(m);
-            if (0 > p) {
-              return b.codesRead = d, b.dupBits = m, !0;
+            b = this._readBits(h);
+            if (0 > b) {
+              return a.codesRead = d, a.dupBits = h, !0;
             }
-            for (;p--;) {
-              e[d++] = c;
+            for (;b--;) {
+              e[d++] = f;
             }
-            a = c;
+            l = f;
           }
         }
-        this._literalTable = g(e.subarray(0, b.numLiteralCodes));
-        this._distanceTable = g(e.subarray(b.numLiteralCodes));
+        this._literalTable = g(e.subarray(0, a.numLiteralCodes));
+        this._distanceTable = g(e.subarray(a.numLiteralCodes));
         this._state = 4;
         this._block2State = null;
         return!1;
       };
-      f.prototype._decodeBlock = function() {
-        var b = this._literalTable, f = this._distanceTable, e = this._window, d = this._windowPosition, p = this._copyState, c, m, n, s;
-        if (0 !== p.state) {
-          switch(p.state) {
+      e.prototype._decodeBlock = function() {
+        var c = this._literalTable, e = this._distanceTable, l = this._window, n = this._windowPosition, b = this._copyState, h, m, t, r;
+        if (0 !== b.state) {
+          switch(b.state) {
             case 1:
-              if (0 > (c = this._readBits(p.lenBits))) {
+              if (0 > (h = this._readBits(b.lenBits))) {
                 return!0;
               }
-              p.len += c;
-              p.state = 2;
+              b.len += h;
+              b.state = 2;
             case 2:
-              if (0 > (c = this._readCode(f))) {
+              if (0 > (h = this._readCode(e))) {
                 return!0;
               }
-              p.distBits = h[c];
-              p.dist = a[c];
-              p.state = 3;
+              b.distBits = d[h];
+              b.dist = a[h];
+              b.state = 3;
             case 3:
-              c = 0;
-              if (0 < p.distBits && 0 > (c = this._readBits(p.distBits))) {
+              h = 0;
+              if (0 < b.distBits && 0 > (h = this._readBits(b.distBits))) {
                 return!0;
               }
-              s = p.dist + c;
-              m = p.len;
-              for (c = d - s;m--;) {
-                e[d++] = e[c++];
-              }
-              p.state = 0;
-              if (65536 <= d) {
-                return this._windowPosition = d, !1;
+              r = b.dist + h;
+              m = b.len;
+              for (h = n - r;m--;) {
+                l[n++] = l[h++];
+              }
+              b.state = 0;
+              if (65536 <= n) {
+                return this._windowPosition = n, !1;
               }
               break;
           }
         }
         do {
-          c = this._readCode(b);
-          if (0 > c) {
-            return this._windowPosition = d, !0;
+          h = this._readCode(c);
+          if (0 > h) {
+            return this._windowPosition = n, !0;
           }
-          if (256 > c) {
-            e[d++] = c;
+          if (256 > h) {
+            l[n++] = h;
           } else {
-            if (256 < c) {
-              this._windowPosition = d;
-              c -= 257;
-              n = u[c];
-              m = k[c];
-              c = 0 === n ? 0 : this._readBits(n);
-              if (0 > c) {
-                return p.state = 1, p.len = m, p.lenBits = n, !0;
-              }
-              m += c;
-              c = this._readCode(f);
-              if (0 > c) {
-                return p.state = 2, p.len = m, !0;
-              }
-              n = h[c];
-              s = a[c];
-              c = 0 === n ? 0 : this._readBits(n);
-              if (0 > c) {
-                return p.state = 3, p.len = m, p.dist = s, p.distBits = n, !0;
-              }
-              s += c;
-              for (c = d - s;m--;) {
-                e[d++] = e[c++];
+            if (256 < h) {
+              this._windowPosition = n;
+              h -= 257;
+              t = v[h];
+              m = f[h];
+              h = 0 === t ? 0 : this._readBits(t);
+              if (0 > h) {
+                return b.state = 1, b.len = m, b.lenBits = t, !0;
+              }
+              m += h;
+              h = this._readCode(e);
+              if (0 > h) {
+                return b.state = 2, b.len = m, !0;
+              }
+              t = d[h];
+              r = a[h];
+              h = 0 === t ? 0 : this._readBits(t);
+              if (0 > h) {
+                return b.state = 3, b.len = m, b.dist = r, b.distBits = t, !0;
+              }
+              r += h;
+              for (h = n - r;m--;) {
+                l[n++] = l[h++];
               }
             } else {
               this._state = 0;
               break;
             }
           }
-        } while (65536 > d);
-        this._windowPosition = d;
+        } while (65536 > n);
+        this._windowPosition = n;
         return!1;
       };
-      return f;
-    }(c), m, a, h, p, k, u, n, s = !1, v = function(b) {
-      function f(f) {
-        b.call(this, f);
-        this._verifyHeader = f;
+      return e;
+    }(b), h, a, d, n, f, v, m, r = !1, w = function(a) {
+      function e(e) {
+        a.call(this, e);
+        this._verifyHeader = e;
         this._specialInflate = new SpecialInflate;
-        this._specialInflate.onData = function(b) {
-          this.onData(b);
+        this._specialInflate.onData = function(a) {
+          this.onData(a);
         }.bind(this);
       }
-      __extends(f, b);
-      f.prototype.push = function(b) {
+      __extends(e, a);
+      e.prototype.push = function(a) {
         if (this._verifyHeader) {
-          var f;
-          this._buffer ? (f = new Uint8Array(this._buffer.length + b.length), f.set(this._buffer), f.set(b, this._buffer.length), this._buffer = null) : f = new Uint8Array(b);
-          var e = this._processZLibHeader(f, 0, f.length);
+          var c;
+          this._buffer ? (c = new Uint8Array(this._buffer.length + a.length), c.set(this._buffer), c.set(a, this._buffer.length), this._buffer = null) : c = new Uint8Array(a);
+          var e = this._processZLibHeader(c, 0, c.length);
           if (0 === e) {
-            this._buffer = f;
+            this._buffer = c;
             return;
           }
           this._verifyHeader = !0;
-          0 < e && (b = f.subarray(e));
+          0 < e && (a = c.subarray(e));
         }
-        this._specialInflate.push(b);
+        this._specialInflate.push(a);
       };
-      f.prototype.close = function() {
+      e.prototype.close = function() {
         this._specialInflate && (this._specialInflate.close(), this._specialInflate = null);
       };
-      return f;
-    }(c), d;
-    (function(b) {
-      b[b.WRITE = 0] = "WRITE";
-      b[b.DONE = 1] = "DONE";
-      b[b.ZLIB_HEADER = 2] = "ZLIB_HEADER";
-    })(d || (d = {}));
-    var e = function() {
-      function b() {
+      return e;
+    }(b), t;
+    (function(a) {
+      a[a.WRITE = 0] = "WRITE";
+      a[a.DONE = 1] = "DONE";
+      a[a.ZLIB_HEADER = 2] = "ZLIB_HEADER";
+    })(t || (t = {}));
+    var l = function() {
+      function a() {
         this.a = 1;
         this.b = 0;
       }
-      b.prototype.update = function(b, e, d) {
-        for (var a = this.a, h = this.b;e < d;++e) {
-          a = (a + (b[e] & 255)) % 65521, h = (h + a) % 65521;
+      a.prototype.update = function(a, c, d) {
+        for (var l = this.a, n = this.b;c < d;++c) {
+          l = (l + (a[c] & 255)) % 65521, n = (n + l) % 65521;
         }
-        this.a = a;
-        this.b = h;
+        this.a = l;
+        this.b = n;
       };
-      b.prototype.getChecksum = function() {
+      a.prototype.getChecksum = function() {
         return this.b << 16 | this.a;
       };
-      return b;
+      return a;
     }();
-    l.Adler32 = e;
-    d = function() {
-      function b(b) {
-        this._state = (this._writeZlibHeader = b) ? 2 : 0;
-        this._adler32 = b ? new e : null;
+    k.Adler32 = l;
+    t = function() {
+      function a(c) {
+        this._state = (this._writeZlibHeader = c) ? 2 : 0;
+        this._adler32 = c ? new l : null;
       }
-      b.prototype.push = function(b) {
+      a.prototype.push = function(a) {
         2 === this._state && (this.onData(new Uint8Array([120, 156])), this._state = 0);
-        for (var e = b.length, d = new Uint8Array(e + 5 * Math.ceil(e / 65535)), a = 0, h = 0;65535 < e;) {
-          d.set(new Uint8Array([0, 255, 255, 0, 0]), a), a += 5, d.set(b.subarray(h, h + 65535), a), h += 65535, a += 65535, e -= 65535;
+        for (var c = a.length, d = new Uint8Array(c + 5 * Math.ceil(c / 65535)), l = 0, n = 0;65535 < c;) {
+          d.set(new Uint8Array([0, 255, 255, 0, 0]), l), l += 5, d.set(a.subarray(n, n + 65535), l), n += 65535, l += 65535, c -= 65535;
         }
-        d.set(new Uint8Array([0, e & 255, e >> 8 & 255, ~e & 255, ~e >> 8 & 255]), a);
-        d.set(b.subarray(h, e), a + 5);
+        d.set(new Uint8Array([0, c & 255, c >> 8 & 255, ~c & 255, ~c >> 8 & 255]), l);
+        d.set(a.subarray(n, c), l + 5);
         this.onData(d);
-        this._adler32 && this._adler32.update(b, 0, e);
+        this._adler32 && this._adler32.update(a, 0, c);
       };
-      b.prototype.close = function() {
+      a.prototype.close = function() {
         this._state = 1;
         this.onData(new Uint8Array([1, 0, 0, 255, 255]));
         if (this._adler32) {
-          var b = this._adler32.getChecksum();
-          this.onData(new Uint8Array([b & 255, b >> 8 & 255, b >> 16 & 255, b >>> 24 & 255]));
+          var a = this._adler32.getChecksum();
+          this.onData(new Uint8Array([a & 255, a >> 8 & 255, a >> 16 & 255, a >>> 24 & 255]));
         }
       };
-      return b;
+      return a;
     }();
-    l.Deflate = d;
-  })(l.ArrayUtilities || (l.ArrayUtilities = {}));
+    k.Deflate = t;
+  })(k.ArrayUtilities || (k.ArrayUtilities = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
-    function g(b) {
-      for (var e = new Uint16Array(b), d = 0;d < b;d++) {
-        e[d] = 1024;
+(function(k) {
+  (function(k) {
+    function g(a) {
+      for (var c = new Uint16Array(a), d = 0;d < a;d++) {
+        c[d] = 1024;
       }
-      return e;
+      return c;
     }
-    function c(b, e, d, a) {
-      for (var h = 1, p = 0, c = 0;c < d;c++) {
-        var m = a.decodeBit(b, h + e), h = (h << 1) + m, p = p | m << c
+    function b(a, c, d, l) {
+      for (var n = 1, b = 0, h = 0;h < d;h++) {
+        var f = l.decodeBit(a, n + c), n = (n << 1) + f, b = b | f << h
       }
-      return p;
+      return b;
     }
-    function t(b, e) {
+    function u(a, c) {
       var d = [];
-      d.length = e;
-      for (var a = 0;a < e;a++) {
-        d[a] = new k(b);
+      d.length = c;
+      for (var l = 0;l < c;l++) {
+        d[l] = new f(a);
       }
       return d;
     }
-    var m = function() {
-      function b() {
+    var h = function() {
+      function a() {
         this.pos = this.available = 0;
         this.buffer = new Uint8Array(2E3);
       }
-      b.prototype.append = function(b) {
-        var f = this.pos + this.available, e = f + b.length;
+      a.prototype.append = function(a) {
+        var c = this.pos + this.available, e = c + a.length;
         if (e > this.buffer.length) {
           for (var d = 2 * this.buffer.length;d < e;) {
             d *= 2;
@@ -3255,168 +3259,168 @@
           e.set(this.buffer);
           this.buffer = e;
         }
-        this.buffer.set(b, f);
-        this.available += b.length;
+        this.buffer.set(a, c);
+        this.available += a.length;
       };
-      b.prototype.compact = function() {
+      a.prototype.compact = function() {
         0 !== this.available && (this.buffer.set(this.buffer.subarray(this.pos, this.pos + this.available), 0), this.pos = 0);
       };
-      b.prototype.readByte = function() {
+      a.prototype.readByte = function() {
         if (0 >= this.available) {
           throw Error("Unexpected end of file");
         }
         this.available--;
         return this.buffer[this.pos++];
       };
-      return b;
+      return a;
     }(), a = function() {
-      function b(f) {
-        this.onData = f;
+      function a(c) {
+        this.onData = c;
         this.processed = 0;
       }
-      b.prototype.writeBytes = function(b) {
-        this.onData.call(null, b);
-        this.processed += b.length;
+      a.prototype.writeBytes = function(a) {
+        this.onData.call(null, a);
+        this.processed += a.length;
       };
-      return b;
-    }(), h = function() {
-      function b(f) {
-        this.outStream = f;
+      return a;
+    }(), d = function() {
+      function a(c) {
+        this.outStream = c;
         this.buf = null;
         this.size = this.pos = 0;
         this.isFull = !1;
         this.totalPos = this.writePos = 0;
       }
-      b.prototype.create = function(b) {
-        this.buf = new Uint8Array(b);
+      a.prototype.create = function(a) {
+        this.buf = new Uint8Array(a);
         this.pos = 0;
-        this.size = b;
+        this.size = a;
         this.isFull = !1;
         this.totalPos = this.writePos = 0;
       };
-      b.prototype.putByte = function(b) {
+      a.prototype.putByte = function(a) {
         this.totalPos++;
-        this.buf[this.pos++] = b;
+        this.buf[this.pos++] = a;
         this.pos === this.size && (this.flush(), this.pos = 0, this.isFull = !0);
       };
-      b.prototype.getByte = function(b) {
-        return this.buf[b <= this.pos ? this.pos - b : this.size - b + this.pos];
+      a.prototype.getByte = function(a) {
+        return this.buf[a <= this.pos ? this.pos - a : this.size - a + this.pos];
       };
-      b.prototype.flush = function() {
+      a.prototype.flush = function() {
         this.writePos < this.pos && (this.outStream.writeBytes(this.buf.subarray(this.writePos, this.pos)), this.writePos = this.pos === this.size ? 0 : this.pos);
       };
-      b.prototype.copyMatch = function(b, f) {
-        for (var e = this.pos, d = this.size, a = this.buf, h = b <= e ? e - b : d - b + e, p = f;0 < p;) {
-          for (var c = Math.min(Math.min(p, d - e), d - h), m = 0;m < c;m++) {
-            var k = a[h++];
-            a[e++] = k;
+      a.prototype.copyMatch = function(a, c) {
+        for (var e = this.pos, d = this.size, l = this.buf, n = a <= e ? e - a : d - a + e, b = c;0 < b;) {
+          for (var h = Math.min(Math.min(b, d - e), d - n), f = 0;f < h;f++) {
+            var m = l[n++];
+            l[e++] = m;
           }
           e === d && (this.pos = e, this.flush(), e = 0, this.isFull = !0);
-          h === d && (h = 0);
-          p -= c;
+          n === d && (n = 0);
+          b -= h;
         }
         this.pos = e;
-        this.totalPos += f;
+        this.totalPos += c;
       };
-      b.prototype.checkDistance = function(b) {
-        return b <= this.pos || this.isFull;
+      a.prototype.checkDistance = function(a) {
+        return a <= this.pos || this.isFull;
       };
-      b.prototype.isEmpty = function() {
+      a.prototype.isEmpty = function() {
         return 0 === this.pos && !this.isFull;
       };
-      return b;
-    }(), p = function() {
-      function b(f) {
-        this.inStream = f;
+      return a;
+    }(), n = function() {
+      function a(c) {
+        this.inStream = c;
         this.code = this.range = 0;
         this.corrupted = !1;
       }
-      b.prototype.init = function() {
+      a.prototype.init = function() {
         0 !== this.inStream.readByte() && (this.corrupted = !0);
         this.range = -1;
-        for (var b = 0, f = 0;4 > f;f++) {
-          b = b << 8 | this.inStream.readByte();
+        for (var a = 0, c = 0;4 > c;c++) {
+          a = a << 8 | this.inStream.readByte();
         }
-        b === this.range && (this.corrupted = !0);
-        this.code = b;
+        a === this.range && (this.corrupted = !0);
+        this.code = a;
       };
-      b.prototype.isFinishedOK = function() {
+      a.prototype.isFinishedOK = function() {
         return 0 === this.code;
       };
-      b.prototype.decodeDirectBits = function(b) {
-        var f = 0, e = this.range, d = this.code;
+      a.prototype.decodeDirectBits = function(a) {
+        var c = 0, e = this.range, d = this.code;
         do {
-          var e = e >>> 1 | 0, d = d - e | 0, a = d >> 31, d = d + (e & a) | 0;
+          var e = e >>> 1 | 0, d = d - e | 0, l = d >> 31, d = d + (e & l) | 0;
           d === e && (this.corrupted = !0);
           0 <= e && 16777216 > e && (e <<= 8, d = d << 8 | this.inStream.readByte());
-          f = (f << 1) + a + 1 | 0;
-        } while (--b);
+          c = (c << 1) + l + 1 | 0;
+        } while (--a);
         this.range = e;
         this.code = d;
-        return f;
+        return c;
       };
-      b.prototype.decodeBit = function(b, f) {
-        var e = this.range, d = this.code, a = b[f], h = (e >>> 11) * a;
-        d >>> 0 < h ? (a = a + (2048 - a >> 5) | 0, e = h | 0, h = 0) : (a = a - (a >> 5) | 0, d = d - h | 0, e = e - h | 0, h = 1);
-        b[f] = a & 65535;
+      a.prototype.decodeBit = function(a, c) {
+        var e = this.range, d = this.code, l = a[c], n = (e >>> 11) * l;
+        d >>> 0 < n ? (l = l + (2048 - l >> 5) | 0, e = n | 0, n = 0) : (l = l - (l >> 5) | 0, d = d - n | 0, e = e - n | 0, n = 1);
+        a[c] = l & 65535;
         0 <= e && 16777216 > e && (e <<= 8, d = d << 8 | this.inStream.readByte());
         this.range = e;
         this.code = d;
-        return h;
+        return n;
       };
-      return b;
-    }(), k = function() {
-      function b(f) {
-        this.numBits = f;
-        this.probs = g(1 << f);
-      }
-      b.prototype.decode = function(b) {
-        for (var f = 1, e = 0;e < this.numBits;e++) {
-          f = (f << 1) + b.decodeBit(this.probs, f);
+      return a;
+    }(), f = function() {
+      function a(c) {
+        this.numBits = c;
+        this.probs = g(1 << c);
+      }
+      a.prototype.decode = function(a) {
+        for (var c = 1, e = 0;e < this.numBits;e++) {
+          c = (c << 1) + a.decodeBit(this.probs, c);
         }
-        return f - (1 << this.numBits);
+        return c - (1 << this.numBits);
       };
-      b.prototype.reverseDecode = function(b) {
-        return c(this.probs, 0, this.numBits, b);
+      a.prototype.reverseDecode = function(a) {
+        return b(this.probs, 0, this.numBits, a);
       };
-      return b;
-    }(), u = function() {
-      function b() {
+      return a;
+    }(), v = function() {
+      function a() {
         this.choice = g(2);
-        this.lowCoder = t(3, 16);
-        this.midCoder = t(3, 16);
-        this.highCoder = new k(8);
+        this.lowCoder = u(3, 16);
+        this.midCoder = u(3, 16);
+        this.highCoder = new f(8);
       }
-      b.prototype.decode = function(b, f) {
-        return 0 === b.decodeBit(this.choice, 0) ? this.lowCoder[f].decode(b) : 0 === b.decodeBit(this.choice, 1) ? 8 + this.midCoder[f].decode(b) : 16 + this.highCoder.decode(b);
+      a.prototype.decode = function(a, c) {
+        return 0 === a.decodeBit(this.choice, 0) ? this.lowCoder[c].decode(a) : 0 === a.decodeBit(this.choice, 1) ? 8 + this.midCoder[c].decode(a) : 16 + this.highCoder.decode(a);
       };
-      return b;
-    }(), n = function() {
-      function b(f, e) {
-        this.rangeDec = new p(f);
-        this.outWindow = new h(e);
+      return a;
+    }(), m = function() {
+      function a(c, e) {
+        this.rangeDec = new n(c);
+        this.outWindow = new d(e);
         this.markerIsMandatory = !1;
         this.dictSizeInProperties = this.dictSize = this.lp = this.pb = this.lc = 0;
         this.leftToUnpack = this.unpackSize = void 0;
         this.reps = new Int32Array(4);
         this.state = 0;
       }
-      b.prototype.decodeProperties = function(b) {
-        var f = b[0];
-        if (225 <= f) {
+      a.prototype.decodeProperties = function(a) {
+        var c = a[0];
+        if (225 <= c) {
           throw Error("Incorrect LZMA properties");
         }
-        this.lc = f % 9;
-        f = f / 9 | 0;
-        this.pb = f / 5 | 0;
-        this.lp = f % 5;
-        for (f = this.dictSizeInProperties = 0;4 > f;f++) {
-          this.dictSizeInProperties |= b[f + 1] << 8 * f;
+        this.lc = c % 9;
+        c = c / 9 | 0;
+        this.pb = c / 5 | 0;
+        this.lp = c % 5;
+        for (c = this.dictSizeInProperties = 0;4 > c;c++) {
+          this.dictSizeInProperties |= a[c + 1] << 8 * c;
         }
         this.dictSize = this.dictSizeInProperties;
         4096 > this.dictSize && (this.dictSize = 4096);
       };
-      b.prototype.create = function() {
+      a.prototype.create = function() {
         this.outWindow.create(this.dictSize);
         this.init();
         this.rangeDec.init();
@@ -3426,40 +3430,40 @@
         this.state = this.reps[3] = 0;
         this.leftToUnpack = this.unpackSize;
       };
-      b.prototype.decodeLiteral = function(b, f) {
-        var e = this.outWindow, d = this.rangeDec, a = 0;
-        e.isEmpty() || (a = e.getByte(1));
-        var h = 1, a = 768 * (((e.totalPos & (1 << this.lp) - 1) << this.lc) + (a >> 8 - this.lc));
-        if (7 <= b) {
-          e = e.getByte(f + 1);
+      a.prototype.decodeLiteral = function(a, c) {
+        var e = this.outWindow, d = this.rangeDec, l = 0;
+        e.isEmpty() || (l = e.getByte(1));
+        var n = 1, l = 768 * (((e.totalPos & (1 << this.lp) - 1) << this.lc) + (l >> 8 - this.lc));
+        if (7 <= a) {
+          e = e.getByte(c + 1);
           do {
-            var p = e >> 7 & 1, e = e << 1, c = d.decodeBit(this.litProbs, a + ((1 + p << 8) + h)), h = h << 1 | c;
-            if (p !== c) {
+            var b = e >> 7 & 1, e = e << 1, h = d.decodeBit(this.litProbs, l + ((1 + b << 8) + n)), n = n << 1 | h;
+            if (b !== h) {
               break;
             }
-          } while (256 > h);
+          } while (256 > n);
         }
-        for (;256 > h;) {
-          h = h << 1 | d.decodeBit(this.litProbs, a + h);
+        for (;256 > n;) {
+          n = n << 1 | d.decodeBit(this.litProbs, l + n);
         }
-        return h - 256 & 255;
+        return n - 256 & 255;
       };
-      b.prototype.decodeDistance = function(b) {
-        var f = b;
-        3 < f && (f = 3);
-        b = this.rangeDec;
-        f = this.posSlotDecoder[f].decode(b);
-        if (4 > f) {
-          return f;
+      a.prototype.decodeDistance = function(a) {
+        var c = a;
+        3 < c && (c = 3);
+        a = this.rangeDec;
+        c = this.posSlotDecoder[c].decode(a);
+        if (4 > c) {
+          return c;
         }
-        var e = (f >> 1) - 1, d = (2 | f & 1) << e;
-        14 > f ? d = d + c(this.posDecoders, d - f, e, b) | 0 : (d = d + (b.decodeDirectBits(e - 4) << 4) | 0, d = d + this.alignDecoder.reverseDecode(b) | 0);
+        var e = (c >> 1) - 1, d = (2 | c & 1) << e;
+        14 > c ? d = d + b(this.posDecoders, d - c, e, a) | 0 : (d = d + (a.decodeDirectBits(e - 4) << 4) | 0, d = d + this.alignDecoder.reverseDecode(a) | 0);
         return d;
       };
-      b.prototype.init = function() {
+      a.prototype.init = function() {
         this.litProbs = g(768 << this.lc + this.lp);
-        this.posSlotDecoder = t(6, 4);
-        this.alignDecoder = new k(4);
+        this.posSlotDecoder = u(6, 4);
+        this.alignDecoder = new f(4);
         this.posDecoders = g(115);
         this.isMatch = g(192);
         this.isRep = g(12);
@@ -3467,1085 +3471,1093 @@
         this.isRepG1 = g(12);
         this.isRepG2 = g(12);
         this.isRep0Long = g(192);
-        this.lenDecoder = new u;
-        this.repLenDecoder = new u;
+        this.lenDecoder = new v;
+        this.repLenDecoder = new v;
       };
-      b.prototype.decode = function(b) {
-        for (var f = this.rangeDec, a = this.outWindow, h = this.pb, p = this.dictSize, c = this.markerIsMandatory, m = this.leftToUnpack, k = this.isMatch, n = this.isRep, u = this.isRepG0, g = this.isRepG1, l = this.isRepG2, r = this.isRep0Long, t = this.lenDecoder, y = this.repLenDecoder, z = this.reps[0], B = this.reps[1], x = this.reps[2], E = this.reps[3], A = this.state;;) {
-          if (b && 48 > f.inStream.available) {
+      a.prototype.decode = function(a) {
+        for (var c = this.rangeDec, e = this.outWindow, d = this.pb, n = this.dictSize, b = this.markerIsMandatory, h = this.leftToUnpack, f = this.isMatch, m = this.isRep, v = this.isRepG0, g = this.isRepG1, k = this.isRepG2, p = this.isRep0Long, u = this.lenDecoder, z = this.repLenDecoder, A = this.reps[0], C = this.reps[1], x = this.reps[2], F = this.reps[3], B = this.state;;) {
+          if (a && 48 > c.inStream.available) {
             this.outWindow.flush();
             break;
           }
-          if (0 === m && !c && (this.outWindow.flush(), f.isFinishedOK())) {
-            return d;
+          if (0 === h && !b && (this.outWindow.flush(), c.isFinishedOK())) {
+            return t;
           }
-          var D = a.totalPos & (1 << h) - 1;
-          if (0 === f.decodeBit(k, (A << 4) + D)) {
-            if (0 === m) {
-              return s;
-            }
-            a.putByte(this.decodeLiteral(A, z));
-            A = 4 > A ? 0 : 10 > A ? A - 3 : A - 6;
-            m--;
+          var E = e.totalPos & (1 << d) - 1;
+          if (0 === c.decodeBit(f, (B << 4) + E)) {
+            if (0 === h) {
+              return r;
+            }
+            e.putByte(this.decodeLiteral(B, A));
+            B = 4 > B ? 0 : 10 > B ? B - 3 : B - 6;
+            h--;
           } else {
-            if (0 !== f.decodeBit(n, A)) {
-              if (0 === m || a.isEmpty()) {
-                return s;
-              }
-              if (0 === f.decodeBit(u, A)) {
-                if (0 === f.decodeBit(r, (A << 4) + D)) {
-                  A = 7 > A ? 9 : 11;
-                  a.putByte(a.getByte(z + 1));
-                  m--;
+            if (0 !== c.decodeBit(m, B)) {
+              if (0 === h || e.isEmpty()) {
+                return r;
+              }
+              if (0 === c.decodeBit(v, B)) {
+                if (0 === c.decodeBit(p, (B << 4) + E)) {
+                  B = 7 > B ? 9 : 11;
+                  e.putByte(e.getByte(A + 1));
+                  h--;
                   continue;
                 }
               } else {
-                var F;
-                0 === f.decodeBit(g, A) ? F = B : (0 === f.decodeBit(l, A) ? F = x : (F = E, E = x), x = B);
-                B = z;
-                z = F;
+                var G;
+                0 === c.decodeBit(g, B) ? G = C : (0 === c.decodeBit(k, B) ? G = x : (G = F, F = x), x = C);
+                C = A;
+                A = G;
               }
-              D = y.decode(f, D);
-              A = 7 > A ? 8 : 11;
+              E = z.decode(c, E);
+              B = 7 > B ? 8 : 11;
             } else {
-              E = x;
-              x = B;
-              B = z;
-              D = t.decode(f, D);
-              A = 7 > A ? 7 : 10;
-              z = this.decodeDistance(D);
-              if (-1 === z) {
-                return this.outWindow.flush(), f.isFinishedOK() ? v : s;
-              }
-              if (0 === m || z >= p || !a.checkDistance(z)) {
-                return s;
-              }
-            }
-            D += 2;
-            F = !1;
-            void 0 !== m && m < D && (D = m, F = !0);
-            a.copyMatch(z + 1, D);
-            m -= D;
-            if (F) {
-              return s;
+              F = x;
+              x = C;
+              C = A;
+              E = u.decode(c, E);
+              B = 7 > B ? 7 : 10;
+              A = this.decodeDistance(E);
+              if (-1 === A) {
+                return this.outWindow.flush(), c.isFinishedOK() ? w : r;
+              }
+              if (0 === h || A >= n || !e.checkDistance(A)) {
+                return r;
+              }
+            }
+            E += 2;
+            G = !1;
+            void 0 !== h && h < E && (E = h, G = !0);
+            e.copyMatch(A + 1, E);
+            h -= E;
+            if (G) {
+              return r;
             }
           }
         }
-        this.state = A;
-        this.reps[0] = z;
-        this.reps[1] = B;
+        this.state = B;
+        this.reps[0] = A;
+        this.reps[1] = C;
         this.reps[2] = x;
-        this.reps[3] = E;
-        this.leftToUnpack = m;
-        return e;
+        this.reps[3] = F;
+        this.leftToUnpack = h;
+        return l;
       };
-      return b;
-    }(), s = 0, v = 1, d = 2, e = 3, b;
-    (function(b) {
-      b[b.WAIT_FOR_LZMA_HEADER = 0] = "WAIT_FOR_LZMA_HEADER";
-      b[b.WAIT_FOR_SWF_HEADER = 1] = "WAIT_FOR_SWF_HEADER";
-      b[b.PROCESS_DATA = 2] = "PROCESS_DATA";
-      b[b.CLOSED = 3] = "CLOSED";
-    })(b || (b = {}));
-    b = function() {
-      function b(f) {
-        void 0 === f && (f = !1);
-        this._state = f ? 1 : 0;
+      return a;
+    }(), r = 0, w = 1, t = 2, l = 3, c;
+    (function(a) {
+      a[a.WAIT_FOR_LZMA_HEADER = 0] = "WAIT_FOR_LZMA_HEADER";
+      a[a.WAIT_FOR_SWF_HEADER = 1] = "WAIT_FOR_SWF_HEADER";
+      a[a.PROCESS_DATA = 2] = "PROCESS_DATA";
+      a[a.CLOSED = 3] = "CLOSED";
+    })(c || (c = {}));
+    c = function() {
+      function c(a) {
+        void 0 === a && (a = !1);
+        this._state = a ? 1 : 0;
         this.buffer = null;
       }
-      b.prototype.push = function(b) {
+      c.prototype.push = function(c) {
         if (2 > this._state) {
-          var f = this.buffer ? this.buffer.length : 0, d = (1 === this._state ? 17 : 13) + 5;
-          if (f + b.length < d) {
-            d = new Uint8Array(f + b.length);
-            0 < f && d.set(this.buffer);
-            d.set(b, f);
+          var e = this.buffer ? this.buffer.length : 0, d = (1 === this._state ? 17 : 13) + 5;
+          if (e + c.length < d) {
+            d = new Uint8Array(e + c.length);
+            0 < e && d.set(this.buffer);
+            d.set(c, e);
             this.buffer = d;
             return;
           }
-          var h = new Uint8Array(d);
-          0 < f && h.set(this.buffer);
-          h.set(b.subarray(0, d - f), f);
-          this._inStream = new m;
-          this._inStream.append(h.subarray(d - 5));
-          this._outStream = new a(function(b) {
-            this.onData.call(null, b);
+          var n = new Uint8Array(d);
+          0 < e && n.set(this.buffer);
+          n.set(c.subarray(0, d - e), e);
+          this._inStream = new h;
+          this._inStream.append(n.subarray(d - 5));
+          this._outStream = new a(function(a) {
+            this.onData.call(null, a);
           }.bind(this));
-          this._decoder = new n(this._inStream, this._outStream);
+          this._decoder = new m(this._inStream, this._outStream);
           if (1 === this._state) {
-            this._decoder.decodeProperties(h.subarray(12, 17)), this._decoder.markerIsMandatory = !1, this._decoder.unpackSize = ((h[4] | h[5] << 8 | h[6] << 16 | h[7] << 24) >>> 0) - 8;
+            this._decoder.decodeProperties(n.subarray(12, 17)), this._decoder.markerIsMandatory = !1, this._decoder.unpackSize = ((n[4] | n[5] << 8 | n[6] << 16 | n[7] << 24) >>> 0) - 8;
           } else {
-            this._decoder.decodeProperties(h.subarray(0, 5));
-            for (var f = 0, p = !1, c = 0;8 > c;c++) {
-              var k = h[5 + c];
-              255 !== k && (p = !0);
-              f |= k << 8 * c;
+            this._decoder.decodeProperties(n.subarray(0, 5));
+            for (var e = 0, b = !1, f = 0;8 > f;f++) {
+              var t = n[5 + f];
+              255 !== t && (b = !0);
+              e |= t << 8 * f;
             }
-            this._decoder.markerIsMandatory = !p;
-            this._decoder.unpackSize = p ? f : void 0;
+            this._decoder.markerIsMandatory = !b;
+            this._decoder.unpackSize = b ? e : void 0;
           }
           this._decoder.create();
-          b = b.subarray(d);
+          c = c.subarray(d);
           this._state = 2;
         }
-        this._inStream.append(b);
-        b = this._decoder.decode(!0);
+        this._inStream.append(c);
+        c = this._decoder.decode(!0);
         this._inStream.compact();
-        b !== e && this._checkError(b);
+        c !== l && this._checkError(c);
       };
-      b.prototype.close = function() {
+      c.prototype.close = function() {
         this._state = 3;
-        var b = this._decoder.decode(!1);
-        this._checkError(b);
+        var a = this._decoder.decode(!1);
+        this._checkError(a);
         this._decoder = null;
       };
-      b.prototype._checkError = function(b) {
-        var f;
-        b === s ? f = "LZMA decoding error" : b === e ? f = "Decoding is not complete" : b === v ? void 0 !== this._decoder.unpackSize && this._decoder.unpackSize !== this._outStream.processed && (f = "Finished with end marker before than specified size") : f = "Internal LZMA Error";
-        if (f && this.onError) {
-          this.onError(f);
+      c.prototype._checkError = function(a) {
+        var c;
+        a === r ? c = "LZMA decoding error" : a === l ? c = "Decoding is not complete" : a === w ? void 0 !== this._decoder.unpackSize && this._decoder.unpackSize !== this._outStream.processed && (c = "Finished with end marker before than specified size") : c = "Internal LZMA Error";
+        if (c && this.onError) {
+          this.onError(c);
         }
       };
-      return b;
+      return c;
     }();
-    l.LzmaDecoder = b;
-  })(l.ArrayUtilities || (l.ArrayUtilities = {}));
+    k.LzmaDecoder = c;
+  })(k.ArrayUtilities || (k.ArrayUtilities = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
-    function g(a, d) {
-      a !== h(a, 0, d) && throwError("RangeError", Errors.ParamRangeError);
+(function(k) {
+  (function(p) {
+    function g(a, n) {
+      a !== d(a, 0, n) && throwError("RangeError", Errors.ParamRangeError);
     }
-    function c(a) {
+    function b(a) {
       return "string" === typeof a ? a : void 0 == a ? null : a + "";
     }
-    var t = l.Debug.notImplemented, m = l.StringUtilities.utf8decode, a = l.StringUtilities.utf8encode, h = l.NumberUtilities.clamp, p = function() {
-      return function(a, d, e) {
+    var u = k.Debug.notImplemented, h = k.StringUtilities.utf8decode, a = k.StringUtilities.utf8encode, d = k.NumberUtilities.clamp, n = function() {
+      return function(a, d, l) {
         this.buffer = a;
         this.length = d;
-        this.littleEndian = e;
+        this.littleEndian = l;
       };
     }();
-    r.PlainObjectDataBuffer = p;
-    for (var k = new Uint32Array(33), u = 1, n = 0;32 >= u;u++) {
-      k[u] = n = n << 1 | 1;
+    p.PlainObjectDataBuffer = n;
+    for (var f = new Uint32Array(33), v = 1, m = 0;32 >= v;v++) {
+      f[v] = m = m << 1 | 1;
     }
-    var s;
+    var r;
     (function(a) {
       a[a.U8 = 1] = "U8";
       a[a.I32 = 2] = "I32";
       a[a.F32 = 4] = "F32";
-    })(s || (s = {}));
-    u = function() {
-      function n(d) {
-        void 0 === d && (d = n.INITIAL_SIZE);
-        this._buffer || (this._buffer = new ArrayBuffer(d), this._position = this._length = 0, this._resetViews(), this._littleEndian = n._nativeLittleEndian, this._bitLength = this._bitBuffer = 0);
-      }
-      n.FromArrayBuffer = function(d, e) {
-        void 0 === e && (e = -1);
-        var b = Object.create(n.prototype);
-        b._buffer = d;
-        b._length = -1 === e ? d.byteLength : e;
-        b._position = 0;
-        b._resetViews();
-        b._littleEndian = n._nativeLittleEndian;
-        b._bitBuffer = 0;
-        b._bitLength = 0;
-        return b;
+    })(r || (r = {}));
+    v = function() {
+      function m(a) {
+        void 0 === a && (a = m.INITIAL_SIZE);
+        this._buffer || (this._buffer = new ArrayBuffer(a), this._position = this._length = 0, this._resetViews(), this._littleEndian = m._nativeLittleEndian, this._bitLength = this._bitBuffer = 0);
+      }
+      m.FromArrayBuffer = function(a, d) {
+        void 0 === d && (d = -1);
+        var c = Object.create(m.prototype);
+        c._buffer = a;
+        c._length = -1 === d ? a.byteLength : d;
+        c._position = 0;
+        c._resetViews();
+        c._littleEndian = m._nativeLittleEndian;
+        c._bitBuffer = 0;
+        c._bitLength = 0;
+        return c;
       };
-      n.FromPlainObject = function(d) {
-        var e = n.FromArrayBuffer(d.buffer, d.length);
-        e._littleEndian = d.littleEndian;
-        return e;
+      m.FromPlainObject = function(a) {
+        var d = m.FromArrayBuffer(a.buffer, a.length);
+        d._littleEndian = a.littleEndian;
+        return d;
       };
-      n.prototype.toPlainObject = function() {
-        return new p(this._buffer, this._length, this._littleEndian);
+      m.prototype.toPlainObject = function() {
+        return new n(this._buffer, this._length, this._littleEndian);
       };
-      n.prototype._resetViews = function() {
+      m.prototype._resetViews = function() {
         this._u8 = new Uint8Array(this._buffer);
         this._f32 = this._i32 = null;
       };
-      n.prototype._requestViews = function(d) {
-        0 === (this._buffer.byteLength & 3) && (null === this._i32 && d & 2 && (this._i32 = new Int32Array(this._buffer)), null === this._f32 && d & 4 && (this._f32 = new Float32Array(this._buffer)));
+      m.prototype._requestViews = function(a) {
+        0 === (this._buffer.byteLength & 3) && (null === this._i32 && a & 2 && (this._i32 = new Int32Array(this._buffer)), null === this._f32 && a & 4 && (this._f32 = new Float32Array(this._buffer)));
       };
-      n.prototype.getBytes = function() {
+      m.prototype.getBytes = function() {
         return new Uint8Array(this._buffer, 0, this._length);
       };
-      n.prototype._ensureCapacity = function(d) {
-        var e = this._buffer;
-        if (e.byteLength < d) {
-          for (var b = Math.max(e.byteLength, 1);b < d;) {
-            b *= 2;
-          }
-          d = n._arrayBufferPool.acquire(b);
-          b = this._u8;
-          this._buffer = d;
+      m.prototype._ensureCapacity = function(a) {
+        var d = this._buffer;
+        if (d.byteLength < a) {
+          for (var c = Math.max(d.byteLength, 1);c < a;) {
+            c *= 2;
+          }
+          a = m._arrayBufferPool.acquire(c);
+          c = this._u8;
+          this._buffer = a;
           this._resetViews();
-          this._u8.set(b);
-          n._arrayBufferPool.release(e);
+          this._u8.set(c);
+          m._arrayBufferPool.release(d);
         }
       };
-      n.prototype.clear = function() {
+      m.prototype.clear = function() {
         this._position = this._length = 0;
       };
-      n.prototype.readBoolean = function() {
+      m.prototype.readBoolean = function() {
         return 0 !== this.readUnsignedByte();
       };
-      n.prototype.readByte = function() {
+      m.prototype.readByte = function() {
         return this.readUnsignedByte() << 24 >> 24;
       };
-      n.prototype.readUnsignedByte = function() {
+      m.prototype.readUnsignedByte = function() {
         this._position + 1 > this._length && throwError("EOFError", Errors.EOFError);
         return this._u8[this._position++];
       };
-      n.prototype.readBytes = function(d, e) {
-        var b = 0;
-        void 0 === b && (b = 0);
-        void 0 === e && (e = 0);
-        var f = this._position;
-        b || (b = 0);
-        e || (e = this._length - f);
-        f + e > this._length && throwError("EOFError", Errors.EOFError);
-        d.length < b + e && (d._ensureCapacity(b + e), d.length = b + e);
-        d._u8.set(new Uint8Array(this._buffer, f, e), b);
-        this._position += e;
+      m.prototype.readBytes = function(a, d) {
+        var c = 0;
+        void 0 === c && (c = 0);
+        void 0 === d && (d = 0);
+        var e = this._position;
+        c || (c = 0);
+        d || (d = this._length - e);
+        e + d > this._length && throwError("EOFError", Errors.EOFError);
+        a.length < c + d && (a._ensureCapacity(c + d), a.length = c + d);
+        a._u8.set(new Uint8Array(this._buffer, e, d), c);
+        this._position += d;
       };
-      n.prototype.readShort = function() {
+      m.prototype.readShort = function() {
         return this.readUnsignedShort() << 16 >> 16;
       };
-      n.prototype.readUnsignedShort = function() {
-        var d = this._u8, e = this._position;
-        e + 2 > this._length && throwError("EOFError", Errors.EOFError);
-        var b = d[e + 0], d = d[e + 1];
-        this._position = e + 2;
-        return this._littleEndian ? d << 8 | b : b << 8 | d;
-      };
-      n.prototype.readInt = function() {
-        var d = this._u8, e = this._position;
-        e + 4 > this._length && throwError("EOFError", Errors.EOFError);
-        var b = d[e + 0], f = d[e + 1], a = d[e + 2], d = d[e + 3];
-        this._position = e + 4;
-        return this._littleEndian ? d << 24 | a << 16 | f << 8 | b : b << 24 | f << 16 | a << 8 | d;
-      };
-      n.prototype.readUnsignedInt = function() {
-        return this.readInt() >>> 0;
+      m.prototype.readUnsignedShort = function() {
+        var a = this._u8, d = this._position;
+        d + 2 > this._length && throwError("EOFError", Errors.EOFError);
+        var c = a[d + 0], a = a[d + 1];
+        this._position = d + 2;
+        return this._littleEndian ? a << 8 | c : c << 8 | a;
       };
-      n.prototype.readFloat = function() {
-        var d = this._position;
+      m.prototype.readInt = function() {
+        var a = this._u8, d = this._position;
         d + 4 > this._length && throwError("EOFError", Errors.EOFError);
+        var c = a[d + 0], e = a[d + 1], q = a[d + 2], a = a[d + 3];
         this._position = d + 4;
+        return this._littleEndian ? a << 24 | q << 16 | e << 8 | c : c << 24 | e << 16 | q << 8 | a;
+      };
+      m.prototype.readUnsignedInt = function() {
+        return this.readInt() >>> 0;
+      };
+      m.prototype.readFloat = function() {
+        var a = this._position;
+        a + 4 > this._length && throwError("EOFError", Errors.EOFError);
+        this._position = a + 4;
         this._requestViews(4);
-        if (this._littleEndian && 0 === (d & 3) && this._f32) {
-          return this._f32[d >> 2];
+        if (this._littleEndian && 0 === (a & 3) && this._f32) {
+          return this._f32[a >> 2];
         }
-        var e = this._u8, b = l.IntegerUtilities.u8;
-        this._littleEndian ? (b[0] = e[d + 0], b[1] = e[d + 1], b[2] = e[d + 2], b[3] = e[d + 3]) : (b[3] = e[d + 0], b[2] = e[d + 1], b[1] = e[d + 2], b[0] = e[d + 3]);
-        return l.IntegerUtilities.f32[0];
-      };
-      n.prototype.readDouble = function() {
-        var d = this._u8, e = this._position;
-        e + 8 > this._length && throwError("EOFError", Errors.EOFError);
-        var b = l.IntegerUtilities.u8;
-        this._littleEndian ? (b[0] = d[e + 0], b[1] = d[e + 1], b[2] = d[e + 2], b[3] = d[e + 3], b[4] = d[e + 4], b[5] = d[e + 5], b[6] = d[e + 6], b[7] = d[e + 7]) : (b[0] = d[e + 7], b[1] = d[e + 6], b[2] = d[e + 5], b[3] = d[e + 4], b[4] = d[e + 3], b[5] = d[e + 2], b[6] = d[e + 1], b[7] = d[e + 0]);
-        this._position = e + 8;
-        return l.IntegerUtilities.f64[0];
-      };
-      n.prototype.writeBoolean = function(d) {
-        this.writeByte(d ? 1 : 0);
-      };
-      n.prototype.writeByte = function(d) {
-        var e = this._position + 1;
-        this._ensureCapacity(e);
-        this._u8[this._position++] = d;
-        e > this._length && (this._length = e);
-      };
-      n.prototype.writeUnsignedByte = function(d) {
-        var e = this._position + 1;
-        this._ensureCapacity(e);
-        this._u8[this._position++] = d;
-        e > this._length && (this._length = e);
-      };
-      n.prototype.writeRawBytes = function(d) {
-        var e = this._position + d.length;
-        this._ensureCapacity(e);
-        this._u8.set(d, this._position);
-        this._position = e;
-        e > this._length && (this._length = e);
-      };
-      n.prototype.writeBytes = function(d, e, b) {
-        void 0 === e && (e = 0);
-        void 0 === b && (b = 0);
-        l.isNullOrUndefined(d) && throwError("TypeError", Errors.NullPointerError, "bytes");
-        2 > arguments.length && (e = 0);
-        3 > arguments.length && (b = 0);
-        g(e, d.length);
-        g(e + b, d.length);
-        0 === b && (b = d.length - e);
-        this.writeRawBytes(new Int8Array(d._buffer, e, b));
+        var d = this._u8, c = k.IntegerUtilities.u8;
+        this._littleEndian ? (c[0] = d[a + 0], c[1] = d[a + 1], c[2] = d[a + 2], c[3] = d[a + 3]) : (c[3] = d[a + 0], c[2] = d[a + 1], c[1] = d[a + 2], c[0] = d[a + 3]);
+        return k.IntegerUtilities.f32[0];
+      };
+      m.prototype.readDouble = function() {
+        var a = this._u8, d = this._position;
+        d + 8 > this._length && throwError("EOFError", Errors.EOFError);
+        var c = k.IntegerUtilities.u8;
+        this._littleEndian ? (c[0] = a[d + 0], c[1] = a[d + 1], c[2] = a[d + 2], c[3] = a[d + 3], c[4] = a[d + 4], c[5] = a[d + 5], c[6] = a[d + 6], c[7] = a[d + 7]) : (c[0] = a[d + 7], c[1] = a[d + 6], c[2] = a[d + 5], c[3] = a[d + 4], c[4] = a[d + 3], c[5] = a[d + 2], c[6] = a[d + 1], c[7] = a[d + 0]);
+        this._position = d + 8;
+        return k.IntegerUtilities.f64[0];
+      };
+      m.prototype.writeBoolean = function(a) {
+        this.writeByte(a ? 1 : 0);
+      };
+      m.prototype.writeByte = function(a) {
+        var d = this._position + 1;
+        this._ensureCapacity(d);
+        this._u8[this._position++] = a;
+        d > this._length && (this._length = d);
+      };
+      m.prototype.writeUnsignedByte = function(a) {
+        var d = this._position + 1;
+        this._ensureCapacity(d);
+        this._u8[this._position++] = a;
+        d > this._length && (this._length = d);
+      };
+      m.prototype.writeRawBytes = function(a) {
+        var d = this._position + a.length;
+        this._ensureCapacity(d);
+        this._u8.set(a, this._position);
+        this._position = d;
+        d > this._length && (this._length = d);
       };
-      n.prototype.writeShort = function(d) {
-        this.writeUnsignedShort(d);
+      m.prototype.writeBytes = function(a, d, c) {
+        void 0 === d && (d = 0);
+        void 0 === c && (c = 0);
+        k.isNullOrUndefined(a) && throwError("TypeError", Errors.NullPointerError, "bytes");
+        2 > arguments.length && (d = 0);
+        3 > arguments.length && (c = 0);
+        g(d, a.length);
+        g(d + c, a.length);
+        0 === c && (c = a.length - d);
+        this.writeRawBytes(new Int8Array(a._buffer, d, c));
       };
-      n.prototype.writeUnsignedShort = function(d) {
-        var e = this._position;
-        this._ensureCapacity(e + 2);
-        var b = this._u8;
-        this._littleEndian ? (b[e + 0] = d, b[e + 1] = d >> 8) : (b[e + 0] = d >> 8, b[e + 1] = d);
-        this._position = e += 2;
-        e > this._length && (this._length = e);
-      };
-      n.prototype.writeInt = function(d) {
-        this.writeUnsignedInt(d);
+      m.prototype.writeShort = function(a) {
+        this.writeUnsignedShort(a);
       };
-      n.prototype.write2Ints = function(d, e) {
-        this.write2UnsignedInts(d, e);
+      m.prototype.writeUnsignedShort = function(a) {
+        var d = this._position;
+        this._ensureCapacity(d + 2);
+        var c = this._u8;
+        this._littleEndian ? (c[d + 0] = a, c[d + 1] = a >> 8) : (c[d + 0] = a >> 8, c[d + 1] = a);
+        this._position = d += 2;
+        d > this._length && (this._length = d);
+      };
+      m.prototype.writeInt = function(a) {
+        this.writeUnsignedInt(a);
       };
-      n.prototype.write4Ints = function(d, e, b, f) {
-        this.write4UnsignedInts(d, e, b, f);
+      m.prototype.write2Ints = function(a, d) {
+        this.write2UnsignedInts(a, d);
       };
-      n.prototype.writeUnsignedInt = function(d) {
-        var e = this._position;
-        this._ensureCapacity(e + 4);
+      m.prototype.write4Ints = function(a, d, c, e) {
+        this.write4UnsignedInts(a, d, c, e);
+      };
+      m.prototype.writeUnsignedInt = function(a) {
+        var d = this._position;
+        this._ensureCapacity(d + 4);
         this._requestViews(2);
-        if (this._littleEndian === n._nativeLittleEndian && 0 === (e & 3) && this._i32) {
-          this._i32[e >> 2] = d;
+        if (this._littleEndian === m._nativeLittleEndian && 0 === (d & 3) && this._i32) {
+          this._i32[d >> 2] = a;
         } else {
-          var b = this._u8;
-          this._littleEndian ? (b[e + 0] = d, b[e + 1] = d >> 8, b[e + 2] = d >> 16, b[e + 3] = d >> 24) : (b[e + 0] = d >> 24, b[e + 1] = d >> 16, b[e + 2] = d >> 8, b[e + 3] = d);
+          var c = this._u8;
+          this._littleEndian ? (c[d + 0] = a, c[d + 1] = a >> 8, c[d + 2] = a >> 16, c[d + 3] = a >> 24) : (c[d + 0] = a >> 24, c[d + 1] = a >> 16, c[d + 2] = a >> 8, c[d + 3] = a);
         }
-        this._position = e += 4;
-        e > this._length && (this._length = e);
+        this._position = d += 4;
+        d > this._length && (this._length = d);
       };
-      n.prototype.write2UnsignedInts = function(d, e) {
-        var b = this._position;
-        this._ensureCapacity(b + 8);
+      m.prototype.write2UnsignedInts = function(a, d) {
+        var c = this._position;
+        this._ensureCapacity(c + 8);
         this._requestViews(2);
-        this._littleEndian === n._nativeLittleEndian && 0 === (b & 3) && this._i32 ? (this._i32[(b >> 2) + 0] = d, this._i32[(b >> 2) + 1] = e, this._position = b += 8, b > this._length && (this._length = b)) : (this.writeUnsignedInt(d), this.writeUnsignedInt(e));
+        this._littleEndian === m._nativeLittleEndian && 0 === (c & 3) && this._i32 ? (this._i32[(c >> 2) + 0] = a, this._i32[(c >> 2) + 1] = d, this._position = c += 8, c > this._length && (this._length = c)) : (this.writeUnsignedInt(a), this.writeUnsignedInt(d));
       };
-      n.prototype.write4UnsignedInts = function(d, e, b, f) {
-        var a = this._position;
-        this._ensureCapacity(a + 16);
+      m.prototype.write4UnsignedInts = function(a, d, c, e) {
+        var q = this._position;
+        this._ensureCapacity(q + 16);
         this._requestViews(2);
-        this._littleEndian === n._nativeLittleEndian && 0 === (a & 3) && this._i32 ? (this._i32[(a >> 2) + 0] = d, this._i32[(a >> 2) + 1] = e, this._i32[(a >> 2) + 2] = b, this._i32[(a >> 2) + 3] = f, this._position = a += 16, a > this._length && (this._length = a)) : (this.writeUnsignedInt(d), this.writeUnsignedInt(e), this.writeUnsignedInt(b), this.writeUnsignedInt(f));
+        this._littleEndian === m._nativeLittleEndian && 0 === (q & 3) && this._i32 ? (this._i32[(q >> 2) + 0] = a, this._i32[(q >> 2) + 1] = d, this._i32[(q >> 2) + 2] = c, this._i32[(q >> 2) + 3] = e, this._position = q += 16, q > this._length && (this._length = q)) : (this.writeUnsignedInt(a), this.writeUnsignedInt(d), this.writeUnsignedInt(c), this.writeUnsignedInt(e));
       };
-      n.prototype.writeFloat = function(d) {
-        var e = this._position;
-        this._ensureCapacity(e + 4);
+      m.prototype.writeFloat = function(a) {
+        var d = this._position;
+        this._ensureCapacity(d + 4);
         this._requestViews(4);
-        if (this._littleEndian === n._nativeLittleEndian && 0 === (e & 3) && this._f32) {
-          this._f32[e >> 2] = d;
+        if (this._littleEndian === m._nativeLittleEndian && 0 === (d & 3) && this._f32) {
+          this._f32[d >> 2] = a;
         } else {
-          var b = this._u8;
-          l.IntegerUtilities.f32[0] = d;
-          d = l.IntegerUtilities.u8;
-          this._littleEndian ? (b[e + 0] = d[0], b[e + 1] = d[1], b[e + 2] = d[2], b[e + 3] = d[3]) : (b[e + 0] = d[3], b[e + 1] = d[2], b[e + 2] = d[1], b[e + 3] = d[0]);
-        }
-        this._position = e += 4;
-        e > this._length && (this._length = e);
-      };
-      n.prototype.write6Floats = function(d, e, b, f, a, h) {
-        var p = this._position;
-        this._ensureCapacity(p + 24);
+          var c = this._u8;
+          k.IntegerUtilities.f32[0] = a;
+          a = k.IntegerUtilities.u8;
+          this._littleEndian ? (c[d + 0] = a[0], c[d + 1] = a[1], c[d + 2] = a[2], c[d + 3] = a[3]) : (c[d + 0] = a[3], c[d + 1] = a[2], c[d + 2] = a[1], c[d + 3] = a[0]);
+        }
+        this._position = d += 4;
+        d > this._length && (this._length = d);
+      };
+      m.prototype.write6Floats = function(a, d, c, e, q, s) {
+        var n = this._position;
+        this._ensureCapacity(n + 24);
         this._requestViews(4);
-        this._littleEndian === n._nativeLittleEndian && 0 === (p & 3) && this._f32 ? (this._f32[(p >> 2) + 0] = d, this._f32[(p >> 2) + 1] = e, this._f32[(p >> 2) + 2] = b, this._f32[(p >> 2) + 3] = f, this._f32[(p >> 2) + 4] = a, this._f32[(p >> 2) + 5] = h, this._position = p += 24, p > this._length && (this._length = p)) : (this.writeFloat(d), this.writeFloat(e), this.writeFloat(b), this.writeFloat(f), this.writeFloat(a), this.writeFloat(h));
+        this._littleEndian === m._nativeLittleEndian && 0 === (n & 3) && this._f32 ? (this._f32[(n >> 2) + 0] = a, this._f32[(n >> 2) + 1] = d, this._f32[(n >> 2) + 2] = c, this._f32[(n >> 2) + 3] = e, this._f32[(n >> 2) + 4] = q, this._f32[(n >> 2) + 5] = s, this._position = n += 24, n > this._length && (this._length = n)) : (this.writeFloat(a), this.writeFloat(d), this.writeFloat(c), this.writeFloat(e), this.writeFloat(q), this.writeFloat(s));
       };
-      n.prototype.writeDouble = function(d) {
-        var e = this._position;
-        this._ensureCapacity(e + 8);
-        var b = this._u8;
-        l.IntegerUtilities.f64[0] = d;
-        d = l.IntegerUtilities.u8;
-        this._littleEndian ? (b[e + 0] = d[0], b[e + 1] = d[1], b[e + 2] = d[2], b[e + 3] = d[3], b[e + 4] = d[4], b[e + 5] = d[5], b[e + 6] = d[6], b[e + 7] = d[7]) : (b[e + 0] = d[7], b[e + 1] = d[6], b[e + 2] = d[5], b[e + 3] = d[4], b[e + 4] = d[3], b[e + 5] = d[2], b[e + 6] = d[1], b[e + 7] = d[0]);
-        this._position = e += 8;
-        e > this._length && (this._length = e);
+      m.prototype.writeDouble = function(a) {
+        var d = this._position;
+        this._ensureCapacity(d + 8);
+        var c = this._u8;
+        k.IntegerUtilities.f64[0] = a;
+        a = k.IntegerUtilities.u8;
+        this._littleEndian ? (c[d + 0] = a[0], c[d + 1] = a[1], c[d + 2] = a[2], c[d + 3] = a[3], c[d + 4] = a[4], c[d + 5] = a[5], c[d + 6] = a[6], c[d + 7] = a[7]) : (c[d + 0] = a[7], c[d + 1] = a[6], c[d + 2] = a[5], c[d + 3] = a[4], c[d + 4] = a[3], c[d + 5] = a[2], c[d + 6] = a[1], c[d + 7] = a[0]);
+        this._position = d += 8;
+        d > this._length && (this._length = d);
       };
-      n.prototype.readRawBytes = function() {
+      m.prototype.readRawBytes = function() {
         return new Int8Array(this._buffer, 0, this._length);
       };
-      n.prototype.writeUTF = function(d) {
-        d = c(d);
-        d = m(d);
-        this.writeShort(d.length);
-        this.writeRawBytes(d);
-      };
-      n.prototype.writeUTFBytes = function(d) {
-        d = c(d);
-        d = m(d);
-        this.writeRawBytes(d);
+      m.prototype.writeUTF = function(a) {
+        a = b(a);
+        a = h(a);
+        this.writeShort(a.length);
+        this.writeRawBytes(a);
+      };
+      m.prototype.writeUTFBytes = function(a) {
+        a = b(a);
+        a = h(a);
+        this.writeRawBytes(a);
       };
-      n.prototype.readUTF = function() {
+      m.prototype.readUTF = function() {
         return this.readUTFBytes(this.readShort());
       };
-      n.prototype.readUTFBytes = function(d) {
+      m.prototype.readUTFBytes = function(d) {
         d >>>= 0;
-        var e = this._position;
-        e + d > this._length && throwError("EOFError", Errors.EOFError);
+        var l = this._position;
+        l + d > this._length && throwError("EOFError", Errors.EOFError);
         this._position += d;
-        return a(new Int8Array(this._buffer, e, d));
+        return a(new Int8Array(this._buffer, l, d));
       };
-      Object.defineProperty(n.prototype, "length", {get:function() {
+      Object.defineProperty(m.prototype, "length", {get:function() {
         return this._length;
-      }, set:function(d) {
-        d >>>= 0;
-        d > this._buffer.byteLength && this._ensureCapacity(d);
-        this._length = d;
-        this._position = h(this._position, 0, this._length);
+      }, set:function(a) {
+        a >>>= 0;
+        a > this._buffer.byteLength && this._ensureCapacity(a);
+        this._length = a;
+        this._position = d(this._position, 0, this._length);
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(n.prototype, "bytesAvailable", {get:function() {
+      Object.defineProperty(m.prototype, "bytesAvailable", {get:function() {
         return this._length - this._position;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(n.prototype, "position", {get:function() {
+      Object.defineProperty(m.prototype, "position", {get:function() {
         return this._position;
-      }, set:function(d) {
-        this._position = d >>> 0;
+      }, set:function(a) {
+        this._position = a >>> 0;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(n.prototype, "buffer", {get:function() {
+      Object.defineProperty(m.prototype, "buffer", {get:function() {
         return this._buffer;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(n.prototype, "bytes", {get:function() {
+      Object.defineProperty(m.prototype, "bytes", {get:function() {
         return this._u8;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(n.prototype, "ints", {get:function() {
+      Object.defineProperty(m.prototype, "ints", {get:function() {
         this._requestViews(2);
         return this._i32;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(n.prototype, "objectEncoding", {get:function() {
+      Object.defineProperty(m.prototype, "objectEncoding", {get:function() {
         return this._objectEncoding;
-      }, set:function(d) {
-        this._objectEncoding = d >>> 0;
+      }, set:function(a) {
+        this._objectEncoding = a >>> 0;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(n.prototype, "endian", {get:function() {
+      Object.defineProperty(m.prototype, "endian", {get:function() {
         return this._littleEndian ? "littleEndian" : "bigEndian";
-      }, set:function(d) {
-        d = c(d);
-        this._littleEndian = "auto" === d ? n._nativeLittleEndian : "littleEndian" === d;
+      }, set:function(a) {
+        a = b(a);
+        this._littleEndian = "auto" === a ? m._nativeLittleEndian : "littleEndian" === a;
       }, enumerable:!0, configurable:!0});
-      n.prototype.toString = function() {
+      m.prototype.toString = function() {
         return a(new Int8Array(this._buffer, 0, this._length));
       };
-      n.prototype.toBlob = function(d) {
-        return new Blob([new Int8Array(this._buffer, this._position, this._length)], {type:d});
+      m.prototype.toBlob = function(a) {
+        return new Blob([new Int8Array(this._buffer, this._position, this._length)], {type:a});
       };
-      n.prototype.writeMultiByte = function(d, e) {
-        t("packageInternal flash.utils.ObjectOutput::writeMultiByte");
+      m.prototype.writeMultiByte = function(a, d) {
+        u("packageInternal flash.utils.ObjectOutput::writeMultiByte");
       };
-      n.prototype.readMultiByte = function(d, e) {
-        t("packageInternal flash.utils.ObjectInput::readMultiByte");
+      m.prototype.readMultiByte = function(a, d) {
+        u("packageInternal flash.utils.ObjectInput::readMultiByte");
       };
-      n.prototype.getValue = function(d) {
-        d |= 0;
-        return d >= this._length ? void 0 : this._u8[d];
-      };
-      n.prototype.setValue = function(d, e) {
-        d |= 0;
-        var b = d + 1;
-        this._ensureCapacity(b);
-        this._u8[d] = e;
-        b > this._length && (this._length = b);
+      m.prototype.getValue = function(a) {
+        a |= 0;
+        return a >= this._length ? void 0 : this._u8[a];
+      };
+      m.prototype.setValue = function(a, d) {
+        a |= 0;
+        var c = a + 1;
+        this._ensureCapacity(c);
+        this._u8[a] = d;
+        c > this._length && (this._length = c);
       };
-      n.prototype.readFixed = function() {
+      m.prototype.readFixed = function() {
         return this.readInt() / 65536;
       };
-      n.prototype.readFixed8 = function() {
+      m.prototype.readFixed8 = function() {
         return this.readShort() / 256;
       };
-      n.prototype.readFloat16 = function() {
-        var d = this.readUnsignedShort(), e = d >> 15 ? -1 : 1, b = (d & 31744) >> 10, d = d & 1023;
-        return b ? 31 === b ? d ? NaN : Infinity * e : e * Math.pow(2, b - 15) * (1 + d / 1024) : d / 1024 * Math.pow(2, -14) * e;
-      };
-      n.prototype.readEncodedU32 = function() {
-        var d = this.readUnsignedByte();
-        if (!(d & 128)) {
-          return d;
+      m.prototype.readFloat16 = function() {
+        var a = this.readUnsignedShort(), d = a >> 15 ? -1 : 1, c = (a & 31744) >> 10, a = a & 1023;
+        return c ? 31 === c ? a ? NaN : Infinity * d : d * Math.pow(2, c - 15) * (1 + a / 1024) : a / 1024 * Math.pow(2, -14) * d;
+      };
+      m.prototype.readEncodedU32 = function() {
+        var a = this.readUnsignedByte();
+        if (!(a & 128)) {
+          return a;
         }
-        d = d & 127 | this.readUnsignedByte() << 7;
-        if (!(d & 16384)) {
-          return d;
+        a = a & 127 | this.readUnsignedByte() << 7;
+        if (!(a & 16384)) {
+          return a;
         }
-        d = d & 16383 | this.readUnsignedByte() << 14;
-        if (!(d & 2097152)) {
-          return d;
+        a = a & 16383 | this.readUnsignedByte() << 14;
+        if (!(a & 2097152)) {
+          return a;
         }
-        d = d & 2097151 | this.readUnsignedByte() << 21;
-        return d & 268435456 ? d & 268435455 | this.readUnsignedByte() << 28 : d;
+        a = a & 2097151 | this.readUnsignedByte() << 21;
+        return a & 268435456 ? a & 268435455 | this.readUnsignedByte() << 28 : a;
       };
-      n.prototype.readBits = function(d) {
-        return this.readUnsignedBits(d) << 32 - d >> 32 - d;
+      m.prototype.readBits = function(a) {
+        return this.readUnsignedBits(a) << 32 - a >> 32 - a;
       };
-      n.prototype.readUnsignedBits = function(d) {
-        for (var e = this._bitBuffer, b = this._bitLength;d > b;) {
-          e = e << 8 | this.readUnsignedByte(), b += 8;
-        }
-        b -= d;
-        d = e >>> b & k[d];
-        this._bitBuffer = e;
-        this._bitLength = b;
-        return d;
+      m.prototype.readUnsignedBits = function(a) {
+        for (var d = this._bitBuffer, c = this._bitLength;a > c;) {
+          d = d << 8 | this.readUnsignedByte(), c += 8;
+        }
+        c -= a;
+        a = d >>> c & f[a];
+        this._bitBuffer = d;
+        this._bitLength = c;
+        return a;
       };
-      n.prototype.readFixedBits = function(d) {
-        return this.readBits(d) / 65536;
+      m.prototype.readFixedBits = function(a) {
+        return this.readBits(a) / 65536;
       };
-      n.prototype.readString = function(d) {
-        var e = this._position;
+      m.prototype.readString = function(d) {
+        var l = this._position;
         if (d) {
-          e + d > this._length && throwError("EOFError", Errors.EOFError), this._position += d;
+          l + d > this._length && throwError("EOFError", Errors.EOFError), this._position += d;
         } else {
           d = 0;
-          for (var b = e;b < this._length && this._u8[b];b++) {
+          for (var c = l;c < this._length && this._u8[c];c++) {
             d++;
           }
           this._position += d + 1;
         }
-        return a(new Int8Array(this._buffer, e, d));
+        return a(new Int8Array(this._buffer, l, d));
       };
-      n.prototype.align = function() {
+      m.prototype.align = function() {
         this._bitLength = this._bitBuffer = 0;
       };
-      n.prototype._compress = function(d) {
-        d = c(d);
-        switch(d) {
+      m.prototype.deflate = function() {
+        this.compress("deflate");
+      };
+      m.prototype.inflate = function() {
+        this.uncompress("deflate");
+      };
+      m.prototype.compress = function(a) {
+        a = 0 === arguments.length ? "zlib" : b(a);
+        var d;
+        switch(a) {
           case "zlib":
-            d = new r.Deflate(!0);
+            d = new p.Deflate(!0);
             break;
           case "deflate":
-            d = new r.Deflate(!1);
+            d = new p.Deflate(!1);
             break;
           default:
             return;
         }
-        var e = new n;
-        d.onData = e.writeRawBytes.bind(e);
+        var c = new m;
+        d.onData = c.writeRawBytes.bind(c);
         d.push(this._u8.subarray(0, this._length));
         d.close();
-        this._ensureCapacity(e._u8.length);
-        this._u8.set(e._u8);
-        this.length = e.length;
+        this._ensureCapacity(c._u8.length);
+        this._u8.set(c._u8);
+        this.length = c.length;
         this._position = 0;
       };
-      n.prototype._uncompress = function(d) {
-        d = c(d);
-        switch(d) {
+      m.prototype.uncompress = function(a) {
+        a = 0 === arguments.length ? "zlib" : b(a);
+        var d;
+        switch(a) {
           case "zlib":
-            d = r.Inflate.create(!0);
+            d = p.Inflate.create(!0);
             break;
           case "deflate":
-            d = r.Inflate.create(!1);
+            d = p.Inflate.create(!1);
             break;
           case "lzma":
-            d = new r.LzmaDecoder(!1);
+            d = new p.LzmaDecoder(!1);
             break;
           default:
             return;
         }
-        var e = new n, b;
-        d.onData = e.writeRawBytes.bind(e);
-        d.onError = function(f) {
-          return b = f;
+        var c = new m, e;
+        d.onData = c.writeRawBytes.bind(c);
+        d.onError = function(a) {
+          return e = a;
         };
         d.push(this._u8.subarray(0, this._length));
-        b && throwError("IOError", Errors.CompressedDataError);
+        e && throwError("IOError", Errors.CompressedDataError);
         d.close();
-        this._ensureCapacity(e._u8.length);
-        this._u8.set(e._u8);
-        this.length = e.length;
+        this._ensureCapacity(c._u8.length);
+        this._u8.set(c._u8);
+        this.length = c.length;
         this._position = 0;
       };
-      n._nativeLittleEndian = 1 === (new Int8Array((new Int32Array([1])).buffer))[0];
-      n.INITIAL_SIZE = 128;
-      n._arrayBufferPool = new l.ArrayBufferPool;
-      return n;
+      m._nativeLittleEndian = 1 === (new Int8Array((new Int32Array([1])).buffer))[0];
+      m.INITIAL_SIZE = 128;
+      m._arrayBufferPool = new k.ArrayBufferPool;
+      return m;
     }();
-    r.DataBuffer = u;
-  })(l.ArrayUtilities || (l.ArrayUtilities = {}));
+    p.DataBuffer = v;
+  })(k.ArrayUtilities || (k.ArrayUtilities = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  var r = l.ArrayUtilities.DataBuffer, g = l.ArrayUtilities.ensureTypedArrayCapacity;
-  (function(c) {
-    c[c.BeginSolidFill = 1] = "BeginSolidFill";
-    c[c.BeginGradientFill = 2] = "BeginGradientFill";
-    c[c.BeginBitmapFill = 3] = "BeginBitmapFill";
-    c[c.EndFill = 4] = "EndFill";
-    c[c.LineStyleSolid = 5] = "LineStyleSolid";
-    c[c.LineStyleGradient = 6] = "LineStyleGradient";
-    c[c.LineStyleBitmap = 7] = "LineStyleBitmap";
-    c[c.LineEnd = 8] = "LineEnd";
-    c[c.MoveTo = 9] = "MoveTo";
-    c[c.LineTo = 10] = "LineTo";
-    c[c.CurveTo = 11] = "CurveTo";
-    c[c.CubicCurveTo = 12] = "CubicCurveTo";
-  })(l.PathCommand || (l.PathCommand = {}));
-  (function(c) {
-    c[c.Linear = 16] = "Linear";
-    c[c.Radial = 18] = "Radial";
-  })(l.GradientType || (l.GradientType = {}));
-  (function(c) {
-    c[c.Pad = 0] = "Pad";
-    c[c.Reflect = 1] = "Reflect";
-    c[c.Repeat = 2] = "Repeat";
-  })(l.GradientSpreadMethod || (l.GradientSpreadMethod = {}));
-  (function(c) {
-    c[c.RGB = 0] = "RGB";
-    c[c.LinearRGB = 1] = "LinearRGB";
-  })(l.GradientInterpolationMethod || (l.GradientInterpolationMethod = {}));
-  (function(c) {
-    c[c.None = 0] = "None";
-    c[c.Normal = 1] = "Normal";
-    c[c.Vertical = 2] = "Vertical";
-    c[c.Horizontal = 3] = "Horizontal";
-  })(l.LineScaleMode || (l.LineScaleMode = {}));
-  var c = function() {
-    return function(c, a, h, p, k, u, n, s, g, d, e) {
-      this.commands = c;
+(function(k) {
+  var p = k.ArrayUtilities.DataBuffer, g = k.ArrayUtilities.ensureTypedArrayCapacity;
+  (function(b) {
+    b[b.BeginSolidFill = 1] = "BeginSolidFill";
+    b[b.BeginGradientFill = 2] = "BeginGradientFill";
+    b[b.BeginBitmapFill = 3] = "BeginBitmapFill";
+    b[b.EndFill = 4] = "EndFill";
+    b[b.LineStyleSolid = 5] = "LineStyleSolid";
+    b[b.LineStyleGradient = 6] = "LineStyleGradient";
+    b[b.LineStyleBitmap = 7] = "LineStyleBitmap";
+    b[b.LineEnd = 8] = "LineEnd";
+    b[b.MoveTo = 9] = "MoveTo";
+    b[b.LineTo = 10] = "LineTo";
+    b[b.CurveTo = 11] = "CurveTo";
+    b[b.CubicCurveTo = 12] = "CubicCurveTo";
+  })(k.PathCommand || (k.PathCommand = {}));
+  (function(b) {
+    b[b.Linear = 16] = "Linear";
+    b[b.Radial = 18] = "Radial";
+  })(k.GradientType || (k.GradientType = {}));
+  (function(b) {
+    b[b.Pad = 0] = "Pad";
+    b[b.Reflect = 1] = "Reflect";
+    b[b.Repeat = 2] = "Repeat";
+  })(k.GradientSpreadMethod || (k.GradientSpreadMethod = {}));
+  (function(b) {
+    b[b.RGB = 0] = "RGB";
+    b[b.LinearRGB = 1] = "LinearRGB";
+  })(k.GradientInterpolationMethod || (k.GradientInterpolationMethod = {}));
+  (function(b) {
+    b[b.None = 0] = "None";
+    b[b.Normal = 1] = "Normal";
+    b[b.Vertical = 2] = "Vertical";
+    b[b.Horizontal = 3] = "Horizontal";
+  })(k.LineScaleMode || (k.LineScaleMode = {}));
+  var b = function() {
+    return function(b, a, d, n, f, v, m, r, g, k, l) {
+      this.commands = b;
       this.commandsPosition = a;
-      this.coordinates = h;
-      this.morphCoordinates = p;
-      this.coordinatesPosition = k;
-      this.styles = u;
-      this.stylesLength = n;
-      this.morphStyles = s;
+      this.coordinates = d;
+      this.morphCoordinates = n;
+      this.coordinatesPosition = f;
+      this.styles = v;
+      this.stylesLength = m;
+      this.morphStyles = r;
       this.morphStylesLength = g;
-      this.hasFills = d;
-      this.hasLines = e;
+      this.hasFills = k;
+      this.hasLines = l;
     };
   }();
-  l.PlainObjectShapeData = c;
-  var t;
-  (function(c) {
-    c[c.Commands = 32] = "Commands";
-    c[c.Coordinates = 128] = "Coordinates";
-    c[c.Styles = 16] = "Styles";
-  })(t || (t = {}));
-  t = function() {
-    function m(a) {
+  k.PlainObjectShapeData = b;
+  var u;
+  (function(b) {
+    b[b.Commands = 32] = "Commands";
+    b[b.Coordinates = 128] = "Coordinates";
+    b[b.Styles = 16] = "Styles";
+  })(u || (u = {}));
+  u = function() {
+    function h(a) {
       void 0 === a && (a = !0);
       a && this.clear();
     }
-    m.FromPlainObject = function(a) {
-      var h = new m(!1);
-      h.commands = a.commands;
-      h.coordinates = a.coordinates;
-      h.morphCoordinates = a.morphCoordinates;
-      h.commandsPosition = a.commandsPosition;
-      h.coordinatesPosition = a.coordinatesPosition;
-      h.styles = r.FromArrayBuffer(a.styles, a.stylesLength);
-      h.styles.endian = "auto";
-      a.morphStyles && (h.morphStyles = r.FromArrayBuffer(a.morphStyles, a.morphStylesLength), h.morphStyles.endian = "auto");
-      h.hasFills = a.hasFills;
-      h.hasLines = a.hasLines;
-      return h;
+    h.FromPlainObject = function(a) {
+      var d = new h(!1);
+      d.commands = a.commands;
+      d.coordinates = a.coordinates;
+      d.morphCoordinates = a.morphCoordinates;
+      d.commandsPosition = a.commandsPosition;
+      d.coordinatesPosition = a.coordinatesPosition;
+      d.styles = p.FromArrayBuffer(a.styles, a.stylesLength);
+      d.styles.endian = "auto";
+      a.morphStyles && (d.morphStyles = p.FromArrayBuffer(a.morphStyles, a.morphStylesLength), d.morphStyles.endian = "auto");
+      d.hasFills = a.hasFills;
+      d.hasLines = a.hasLines;
+      return d;
     };
-    m.prototype.moveTo = function(a, h) {
+    h.prototype.moveTo = function(a, d) {
       this.ensurePathCapacities(1, 2);
       this.commands[this.commandsPosition++] = 9;
       this.coordinates[this.coordinatesPosition++] = a;
-      this.coordinates[this.coordinatesPosition++] = h;
+      this.coordinates[this.coordinatesPosition++] = d;
     };
-    m.prototype.lineTo = function(a, h) {
+    h.prototype.lineTo = function(a, d) {
       this.ensurePathCapacities(1, 2);
       this.commands[this.commandsPosition++] = 10;
       this.coordinates[this.coordinatesPosition++] = a;
-      this.coordinates[this.coordinatesPosition++] = h;
+      this.coordinates[this.coordinatesPosition++] = d;
     };
-    m.prototype.curveTo = function(a, h, c, k) {
+    h.prototype.curveTo = function(a, d, b, f) {
       this.ensurePathCapacities(1, 4);
       this.commands[this.commandsPosition++] = 11;
       this.coordinates[this.coordinatesPosition++] = a;
-      this.coordinates[this.coordinatesPosition++] = h;
-      this.coordinates[this.coordinatesPosition++] = c;
-      this.coordinates[this.coordinatesPosition++] = k;
+      this.coordinates[this.coordinatesPosition++] = d;
+      this.coordinates[this.coordinatesPosition++] = b;
+      this.coordinates[this.coordinatesPosition++] = f;
     };
-    m.prototype.cubicCurveTo = function(a, h, c, k, m, n) {
+    h.prototype.cubicCurveTo = function(a, d, b, f, h, m) {
       this.ensurePathCapacities(1, 6);
       this.commands[this.commandsPosition++] = 12;
       this.coordinates[this.coordinatesPosition++] = a;
+      this.coordinates[this.coordinatesPosition++] = d;
+      this.coordinates[this.coordinatesPosition++] = b;
+      this.coordinates[this.coordinatesPosition++] = f;
       this.coordinates[this.coordinatesPosition++] = h;
-      this.coordinates[this.coordinatesPosition++] = c;
-      this.coordinates[this.coordinatesPosition++] = k;
       this.coordinates[this.coordinatesPosition++] = m;
-      this.coordinates[this.coordinatesPosition++] = n;
     };
-    m.prototype.beginFill = function(a) {
+    h.prototype.beginFill = function(a) {
       this.ensurePathCapacities(1, 0);
       this.commands[this.commandsPosition++] = 1;
       this.styles.writeUnsignedInt(a);
       this.hasFills = !0;
     };
-    m.prototype.writeMorphFill = function(a) {
+    h.prototype.writeMorphFill = function(a) {
       this.morphStyles.writeUnsignedInt(a);
     };
-    m.prototype.endFill = function() {
+    h.prototype.endFill = function() {
       this.ensurePathCapacities(1, 0);
       this.commands[this.commandsPosition++] = 4;
     };
-    m.prototype.endLine = function() {
+    h.prototype.endLine = function() {
       this.ensurePathCapacities(1, 0);
       this.commands[this.commandsPosition++] = 8;
     };
-    m.prototype.lineStyle = function(a, h, c, k, m, n, s) {
+    h.prototype.lineStyle = function(a, d, b, f, h, m, r) {
       this.ensurePathCapacities(2, 0);
       this.commands[this.commandsPosition++] = 5;
       this.coordinates[this.coordinatesPosition++] = a;
       a = this.styles;
-      a.writeUnsignedInt(h);
-      a.writeBoolean(c);
-      a.writeUnsignedByte(k);
+      a.writeUnsignedInt(d);
+      a.writeBoolean(b);
+      a.writeUnsignedByte(f);
+      a.writeUnsignedByte(h);
       a.writeUnsignedByte(m);
-      a.writeUnsignedByte(n);
-      a.writeUnsignedByte(s);
+      a.writeUnsignedByte(r);
       this.hasLines = !0;
     };
-    m.prototype.writeMorphLineStyle = function(a, h) {
+    h.prototype.writeMorphLineStyle = function(a, d) {
       this.morphCoordinates[this.coordinatesPosition - 1] = a;
-      this.morphStyles.writeUnsignedInt(h);
+      this.morphStyles.writeUnsignedInt(d);
     };
-    m.prototype.beginBitmap = function(a, h, c, k, m) {
+    h.prototype.beginBitmap = function(a, d, b, f, h) {
       this.ensurePathCapacities(1, 0);
       this.commands[this.commandsPosition++] = a;
       a = this.styles;
-      a.writeUnsignedInt(h);
-      this._writeStyleMatrix(c, !1);
-      a.writeBoolean(k);
-      a.writeBoolean(m);
+      a.writeUnsignedInt(d);
+      this._writeStyleMatrix(b, !1);
+      a.writeBoolean(f);
+      a.writeBoolean(h);
       this.hasFills = !0;
     };
-    m.prototype.writeMorphBitmap = function(a) {
+    h.prototype.writeMorphBitmap = function(a) {
       this._writeStyleMatrix(a, !0);
     };
-    m.prototype.beginGradient = function(a, h, c, k, m, n, s, g) {
+    h.prototype.beginGradient = function(a, d, b, f, h, m, r, g) {
       this.ensurePathCapacities(1, 0);
       this.commands[this.commandsPosition++] = a;
       a = this.styles;
-      a.writeUnsignedByte(k);
+      a.writeUnsignedByte(f);
       a.writeShort(g);
-      this._writeStyleMatrix(m, !1);
-      k = h.length;
-      a.writeByte(k);
-      for (m = 0;m < k;m++) {
-        a.writeUnsignedByte(c[m]), a.writeUnsignedInt(h[m]);
+      this._writeStyleMatrix(h, !1);
+      f = d.length;
+      a.writeByte(f);
+      for (h = 0;h < f;h++) {
+        a.writeUnsignedByte(b[h]), a.writeUnsignedInt(d[h]);
       }
-      a.writeUnsignedByte(n);
-      a.writeUnsignedByte(s);
+      a.writeUnsignedByte(m);
+      a.writeUnsignedByte(r);
       this.hasFills = !0;
     };
-    m.prototype.writeMorphGradient = function(a, h, c) {
-      this._writeStyleMatrix(c, !0);
-      c = this.morphStyles;
-      for (var k = 0;k < a.length;k++) {
-        c.writeUnsignedByte(h[k]), c.writeUnsignedInt(a[k]);
+    h.prototype.writeMorphGradient = function(a, d, b) {
+      this._writeStyleMatrix(b, !0);
+      b = this.morphStyles;
+      for (var f = 0;f < a.length;f++) {
+        b.writeUnsignedByte(d[f]), b.writeUnsignedInt(a[f]);
       }
     };
-    m.prototype.writeCommandAndCoordinates = function(a, h, c) {
+    h.prototype.writeCommandAndCoordinates = function(a, d, b) {
       this.ensurePathCapacities(1, 2);
       this.commands[this.commandsPosition++] = a;
-      this.coordinates[this.coordinatesPosition++] = h;
-      this.coordinates[this.coordinatesPosition++] = c;
+      this.coordinates[this.coordinatesPosition++] = d;
+      this.coordinates[this.coordinatesPosition++] = b;
     };
-    m.prototype.writeCoordinates = function(a, h) {
+    h.prototype.writeCoordinates = function(a, d) {
       this.ensurePathCapacities(0, 2);
       this.coordinates[this.coordinatesPosition++] = a;
-      this.coordinates[this.coordinatesPosition++] = h;
+      this.coordinates[this.coordinatesPosition++] = d;
     };
-    m.prototype.writeMorphCoordinates = function(a, h) {
+    h.prototype.writeMorphCoordinates = function(a, d) {
       this.morphCoordinates = g(this.morphCoordinates, this.coordinatesPosition);
       this.morphCoordinates[this.coordinatesPosition - 2] = a;
-      this.morphCoordinates[this.coordinatesPosition - 1] = h;
+      this.morphCoordinates[this.coordinatesPosition - 1] = d;
     };
-    m.prototype.clear = function() {
+    h.prototype.clear = function() {
       this.commandsPosition = this.coordinatesPosition = 0;
       this.commands = new Uint8Array(32);
       this.coordinates = new Int32Array(128);
-      this.styles = new r(16);
+      this.styles = new p(16);
       this.styles.endian = "auto";
       this.hasFills = this.hasLines = !1;
     };
-    m.prototype.isEmpty = function() {
+    h.prototype.isEmpty = function() {
       return 0 === this.commandsPosition;
     };
-    m.prototype.clone = function() {
-      var a = new m(!1);
+    h.prototype.clone = function() {
+      var a = new h(!1);
       a.commands = new Uint8Array(this.commands);
       a.commandsPosition = this.commandsPosition;
       a.coordinates = new Int32Array(this.coordinates);
       a.coordinatesPosition = this.coordinatesPosition;
-      a.styles = new r(this.styles.length);
+      a.styles = new p(this.styles.length);
       a.styles.writeRawBytes(this.styles.bytes);
-      this.morphStyles && (a.morphStyles = new r(this.morphStyles.length), a.morphStyles.writeRawBytes(this.morphStyles.bytes));
+      this.morphStyles && (a.morphStyles = new p(this.morphStyles.length), a.morphStyles.writeRawBytes(this.morphStyles.bytes));
       a.hasFills = this.hasFills;
       a.hasLines = this.hasLines;
       return a;
     };
-    m.prototype.toPlainObject = function() {
-      return new c(this.commands, this.commandsPosition, this.coordinates, this.morphCoordinates, this.coordinatesPosition, this.styles.buffer, this.styles.length, this.morphStyles && this.morphStyles.buffer, this.morphStyles ? this.morphStyles.length : 0, this.hasFills, this.hasLines);
+    h.prototype.toPlainObject = function() {
+      return new b(this.commands, this.commandsPosition, this.coordinates, this.morphCoordinates, this.coordinatesPosition, this.styles.buffer, this.styles.length, this.morphStyles && this.morphStyles.buffer, this.morphStyles ? this.morphStyles.length : 0, this.hasFills, this.hasLines);
     };
-    Object.defineProperty(m.prototype, "buffers", {get:function() {
+    Object.defineProperty(h.prototype, "buffers", {get:function() {
       var a = [this.commands.buffer, this.coordinates.buffer, this.styles.buffer];
       this.morphCoordinates && a.push(this.morphCoordinates.buffer);
       this.morphStyles && a.push(this.morphStyles.buffer);
       return a;
     }, enumerable:!0, configurable:!0});
-    m.prototype._writeStyleMatrix = function(a, h) {
-      (h ? this.morphStyles : this.styles).write6Floats(a.a, a.b, a.c, a.d, a.tx, a.ty);
+    h.prototype._writeStyleMatrix = function(a, d) {
+      (d ? this.morphStyles : this.styles).write6Floats(a.a, a.b, a.c, a.d, a.tx, a.ty);
     };
-    m.prototype.ensurePathCapacities = function(a, h) {
+    h.prototype.ensurePathCapacities = function(a, d) {
       this.commands = g(this.commands, this.commandsPosition + a);
-      this.coordinates = g(this.coordinates, this.coordinatesPosition + h);
+      this.coordinates = g(this.coordinates, this.coordinatesPosition + d);
     };
-    return m;
+    return h;
   }();
-  l.ShapeData = t;
+  k.ShapeData = u;
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      (function(c) {
-        c[c.CODE_END = 0] = "CODE_END";
-        c[c.CODE_SHOW_FRAME = 1] = "CODE_SHOW_FRAME";
-        c[c.CODE_DEFINE_SHAPE = 2] = "CODE_DEFINE_SHAPE";
-        c[c.CODE_FREE_CHARACTER = 3] = "CODE_FREE_CHARACTER";
-        c[c.CODE_PLACE_OBJECT = 4] = "CODE_PLACE_OBJECT";
-        c[c.CODE_REMOVE_OBJECT = 5] = "CODE_REMOVE_OBJECT";
-        c[c.CODE_DEFINE_BITS = 6] = "CODE_DEFINE_BITS";
-        c[c.CODE_DEFINE_BUTTON = 7] = "CODE_DEFINE_BUTTON";
-        c[c.CODE_JPEG_TABLES = 8] = "CODE_JPEG_TABLES";
-        c[c.CODE_SET_BACKGROUND_COLOR = 9] = "CODE_SET_BACKGROUND_COLOR";
-        c[c.CODE_DEFINE_FONT = 10] = "CODE_DEFINE_FONT";
-        c[c.CODE_DEFINE_TEXT = 11] = "CODE_DEFINE_TEXT";
-        c[c.CODE_DO_ACTION = 12] = "CODE_DO_ACTION";
-        c[c.CODE_DEFINE_FONT_INFO = 13] = "CODE_DEFINE_FONT_INFO";
-        c[c.CODE_DEFINE_SOUND = 14] = "CODE_DEFINE_SOUND";
-        c[c.CODE_START_SOUND = 15] = "CODE_START_SOUND";
-        c[c.CODE_STOP_SOUND = 16] = "CODE_STOP_SOUND";
-        c[c.CODE_DEFINE_BUTTON_SOUND = 17] = "CODE_DEFINE_BUTTON_SOUND";
-        c[c.CODE_SOUND_STREAM_HEAD = 18] = "CODE_SOUND_STREAM_HEAD";
-        c[c.CODE_SOUND_STREAM_BLOCK = 19] = "CODE_SOUND_STREAM_BLOCK";
-        c[c.CODE_DEFINE_BITS_LOSSLESS = 20] = "CODE_DEFINE_BITS_LOSSLESS";
-        c[c.CODE_DEFINE_BITS_JPEG2 = 21] = "CODE_DEFINE_BITS_JPEG2";
-        c[c.CODE_DEFINE_SHAPE2 = 22] = "CODE_DEFINE_SHAPE2";
-        c[c.CODE_DEFINE_BUTTON_CXFORM = 23] = "CODE_DEFINE_BUTTON_CXFORM";
-        c[c.CODE_PROTECT = 24] = "CODE_PROTECT";
-        c[c.CODE_PATHS_ARE_POSTSCRIPT = 25] = "CODE_PATHS_ARE_POSTSCRIPT";
-        c[c.CODE_PLACE_OBJECT2 = 26] = "CODE_PLACE_OBJECT2";
-        c[c.CODE_REMOVE_OBJECT2 = 28] = "CODE_REMOVE_OBJECT2";
-        c[c.CODE_SYNC_FRAME = 29] = "CODE_SYNC_FRAME";
-        c[c.CODE_FREE_ALL = 31] = "CODE_FREE_ALL";
-        c[c.CODE_DEFINE_SHAPE3 = 32] = "CODE_DEFINE_SHAPE3";
-        c[c.CODE_DEFINE_TEXT2 = 33] = "CODE_DEFINE_TEXT2";
-        c[c.CODE_DEFINE_BUTTON2 = 34] = "CODE_DEFINE_BUTTON2";
-        c[c.CODE_DEFINE_BITS_JPEG3 = 35] = "CODE_DEFINE_BITS_JPEG3";
-        c[c.CODE_DEFINE_BITS_LOSSLESS2 = 36] = "CODE_DEFINE_BITS_LOSSLESS2";
-        c[c.CODE_DEFINE_EDIT_TEXT = 37] = "CODE_DEFINE_EDIT_TEXT";
-        c[c.CODE_DEFINE_VIDEO = 38] = "CODE_DEFINE_VIDEO";
-        c[c.CODE_DEFINE_SPRITE = 39] = "CODE_DEFINE_SPRITE";
-        c[c.CODE_NAME_CHARACTER = 40] = "CODE_NAME_CHARACTER";
-        c[c.CODE_PRODUCT_INFO = 41] = "CODE_PRODUCT_INFO";
-        c[c.CODE_DEFINE_TEXT_FORMAT = 42] = "CODE_DEFINE_TEXT_FORMAT";
-        c[c.CODE_FRAME_LABEL = 43] = "CODE_FRAME_LABEL";
-        c[c.CODE_DEFINE_BEHAVIOUR = 44] = "CODE_DEFINE_BEHAVIOUR";
-        c[c.CODE_SOUND_STREAM_HEAD2 = 45] = "CODE_SOUND_STREAM_HEAD2";
-        c[c.CODE_DEFINE_MORPH_SHAPE = 46] = "CODE_DEFINE_MORPH_SHAPE";
-        c[c.CODE_GENERATE_FRAME = 47] = "CODE_GENERATE_FRAME";
-        c[c.CODE_DEFINE_FONT2 = 48] = "CODE_DEFINE_FONT2";
-        c[c.CODE_GEN_COMMAND = 49] = "CODE_GEN_COMMAND";
-        c[c.CODE_DEFINE_COMMAND_OBJECT = 50] = "CODE_DEFINE_COMMAND_OBJECT";
-        c[c.CODE_CHARACTER_SET = 51] = "CODE_CHARACTER_SET";
-        c[c.CODE_EXTERNAL_FONT = 52] = "CODE_EXTERNAL_FONT";
-        c[c.CODE_DEFINE_FUNCTION = 53] = "CODE_DEFINE_FUNCTION";
-        c[c.CODE_PLACE_FUNCTION = 54] = "CODE_PLACE_FUNCTION";
-        c[c.CODE_GEN_TAG_OBJECTS = 55] = "CODE_GEN_TAG_OBJECTS";
-        c[c.CODE_EXPORT_ASSETS = 56] = "CODE_EXPORT_ASSETS";
-        c[c.CODE_IMPORT_ASSETS = 57] = "CODE_IMPORT_ASSETS";
-        c[c.CODE_ENABLE_DEBUGGER = 58] = "CODE_ENABLE_DEBUGGER";
-        c[c.CODE_DO_INIT_ACTION = 59] = "CODE_DO_INIT_ACTION";
-        c[c.CODE_DEFINE_VIDEO_STREAM = 60] = "CODE_DEFINE_VIDEO_STREAM";
-        c[c.CODE_VIDEO_FRAME = 61] = "CODE_VIDEO_FRAME";
-        c[c.CODE_DEFINE_FONT_INFO2 = 62] = "CODE_DEFINE_FONT_INFO2";
-        c[c.CODE_DEBUG_ID = 63] = "CODE_DEBUG_ID";
-        c[c.CODE_ENABLE_DEBUGGER2 = 64] = "CODE_ENABLE_DEBUGGER2";
-        c[c.CODE_SCRIPT_LIMITS = 65] = "CODE_SCRIPT_LIMITS";
-        c[c.CODE_SET_TAB_INDEX = 66] = "CODE_SET_TAB_INDEX";
-        c[c.CODE_FILE_ATTRIBUTES = 69] = "CODE_FILE_ATTRIBUTES";
-        c[c.CODE_PLACE_OBJECT3 = 70] = "CODE_PLACE_OBJECT3";
-        c[c.CODE_IMPORT_ASSETS2 = 71] = "CODE_IMPORT_ASSETS2";
-        c[c.CODE_DO_ABC_DEFINE = 72] = "CODE_DO_ABC_DEFINE";
-        c[c.CODE_DEFINE_FONT_ALIGN_ZONES = 73] = "CODE_DEFINE_FONT_ALIGN_ZONES";
-        c[c.CODE_CSM_TEXT_SETTINGS = 74] = "CODE_CSM_TEXT_SETTINGS";
-        c[c.CODE_DEFINE_FONT3 = 75] = "CODE_DEFINE_FONT3";
-        c[c.CODE_SYMBOL_CLASS = 76] = "CODE_SYMBOL_CLASS";
-        c[c.CODE_METADATA = 77] = "CODE_METADATA";
-        c[c.CODE_DEFINE_SCALING_GRID = 78] = "CODE_DEFINE_SCALING_GRID";
-        c[c.CODE_DO_ABC = 82] = "CODE_DO_ABC";
-        c[c.CODE_DEFINE_SHAPE4 = 83] = "CODE_DEFINE_SHAPE4";
-        c[c.CODE_DEFINE_MORPH_SHAPE2 = 84] = "CODE_DEFINE_MORPH_SHAPE2";
-        c[c.CODE_DEFINE_SCENE_AND_FRAME_LABEL_DATA = 86] = "CODE_DEFINE_SCENE_AND_FRAME_LABEL_DATA";
-        c[c.CODE_DEFINE_BINARY_DATA = 87] = "CODE_DEFINE_BINARY_DATA";
-        c[c.CODE_DEFINE_FONT_NAME = 88] = "CODE_DEFINE_FONT_NAME";
-        c[c.CODE_START_SOUND2 = 89] = "CODE_START_SOUND2";
-        c[c.CODE_DEFINE_BITS_JPEG4 = 90] = "CODE_DEFINE_BITS_JPEG4";
-        c[c.CODE_DEFINE_FONT4 = 91] = "CODE_DEFINE_FONT4";
+      (function(b) {
+        b[b.CODE_END = 0] = "CODE_END";
+        b[b.CODE_SHOW_FRAME = 1] = "CODE_SHOW_FRAME";
+        b[b.CODE_DEFINE_SHAPE = 2] = "CODE_DEFINE_SHAPE";
+        b[b.CODE_FREE_CHARACTER = 3] = "CODE_FREE_CHARACTER";
+        b[b.CODE_PLACE_OBJECT = 4] = "CODE_PLACE_OBJECT";
+        b[b.CODE_REMOVE_OBJECT = 5] = "CODE_REMOVE_OBJECT";
+        b[b.CODE_DEFINE_BITS = 6] = "CODE_DEFINE_BITS";
+        b[b.CODE_DEFINE_BUTTON = 7] = "CODE_DEFINE_BUTTON";
+        b[b.CODE_JPEG_TABLES = 8] = "CODE_JPEG_TABLES";
+        b[b.CODE_SET_BACKGROUND_COLOR = 9] = "CODE_SET_BACKGROUND_COLOR";
+        b[b.CODE_DEFINE_FONT = 10] = "CODE_DEFINE_FONT";
+        b[b.CODE_DEFINE_TEXT = 11] = "CODE_DEFINE_TEXT";
+        b[b.CODE_DO_ACTION = 12] = "CODE_DO_ACTION";
+        b[b.CODE_DEFINE_FONT_INFO = 13] = "CODE_DEFINE_FONT_INFO";
+        b[b.CODE_DEFINE_SOUND = 14] = "CODE_DEFINE_SOUND";
+        b[b.CODE_START_SOUND = 15] = "CODE_START_SOUND";
+        b[b.CODE_STOP_SOUND = 16] = "CODE_STOP_SOUND";
+        b[b.CODE_DEFINE_BUTTON_SOUND = 17] = "CODE_DEFINE_BUTTON_SOUND";
+        b[b.CODE_SOUND_STREAM_HEAD = 18] = "CODE_SOUND_STREAM_HEAD";
+        b[b.CODE_SOUND_STREAM_BLOCK = 19] = "CODE_SOUND_STREAM_BLOCK";
+        b[b.CODE_DEFINE_BITS_LOSSLESS = 20] = "CODE_DEFINE_BITS_LOSSLESS";
+        b[b.CODE_DEFINE_BITS_JPEG2 = 21] = "CODE_DEFINE_BITS_JPEG2";
+        b[b.CODE_DEFINE_SHAPE2 = 22] = "CODE_DEFINE_SHAPE2";
+        b[b.CODE_DEFINE_BUTTON_CXFORM = 23] = "CODE_DEFINE_BUTTON_CXFORM";
+        b[b.CODE_PROTECT = 24] = "CODE_PROTECT";
+        b[b.CODE_PATHS_ARE_POSTSCRIPT = 25] = "CODE_PATHS_ARE_POSTSCRIPT";
+        b[b.CODE_PLACE_OBJECT2 = 26] = "CODE_PLACE_OBJECT2";
+        b[b.CODE_REMOVE_OBJECT2 = 28] = "CODE_REMOVE_OBJECT2";
+        b[b.CODE_SYNC_FRAME = 29] = "CODE_SYNC_FRAME";
+        b[b.CODE_FREE_ALL = 31] = "CODE_FREE_ALL";
+        b[b.CODE_DEFINE_SHAPE3 = 32] = "CODE_DEFINE_SHAPE3";
+        b[b.CODE_DEFINE_TEXT2 = 33] = "CODE_DEFINE_TEXT2";
+        b[b.CODE_DEFINE_BUTTON2 = 34] = "CODE_DEFINE_BUTTON2";
+        b[b.CODE_DEFINE_BITS_JPEG3 = 35] = "CODE_DEFINE_BITS_JPEG3";
+        b[b.CODE_DEFINE_BITS_LOSSLESS2 = 36] = "CODE_DEFINE_BITS_LOSSLESS2";
+        b[b.CODE_DEFINE_EDIT_TEXT = 37] = "CODE_DEFINE_EDIT_TEXT";
+        b[b.CODE_DEFINE_VIDEO = 38] = "CODE_DEFINE_VIDEO";
+        b[b.CODE_DEFINE_SPRITE = 39] = "CODE_DEFINE_SPRITE";
+        b[b.CODE_NAME_CHARACTER = 40] = "CODE_NAME_CHARACTER";
+        b[b.CODE_PRODUCT_INFO = 41] = "CODE_PRODUCT_INFO";
+        b[b.CODE_DEFINE_TEXT_FORMAT = 42] = "CODE_DEFINE_TEXT_FORMAT";
+        b[b.CODE_FRAME_LABEL = 43] = "CODE_FRAME_LABEL";
+        b[b.CODE_DEFINE_BEHAVIOUR = 44] = "CODE_DEFINE_BEHAVIOUR";
+        b[b.CODE_SOUND_STREAM_HEAD2 = 45] = "CODE_SOUND_STREAM_HEAD2";
+        b[b.CODE_DEFINE_MORPH_SHAPE = 46] = "CODE_DEFINE_MORPH_SHAPE";
+        b[b.CODE_GENERATE_FRAME = 47] = "CODE_GENERATE_FRAME";
+        b[b.CODE_DEFINE_FONT2 = 48] = "CODE_DEFINE_FONT2";
+        b[b.CODE_GEN_COMMAND = 49] = "CODE_GEN_COMMAND";
+        b[b.CODE_DEFINE_COMMAND_OBJECT = 50] = "CODE_DEFINE_COMMAND_OBJECT";
+        b[b.CODE_CHARACTER_SET = 51] = "CODE_CHARACTER_SET";
+        b[b.CODE_EXTERNAL_FONT = 52] = "CODE_EXTERNAL_FONT";
+        b[b.CODE_DEFINE_FUNCTION = 53] = "CODE_DEFINE_FUNCTION";
+        b[b.CODE_PLACE_FUNCTION = 54] = "CODE_PLACE_FUNCTION";
+        b[b.CODE_GEN_TAG_OBJECTS = 55] = "CODE_GEN_TAG_OBJECTS";
+        b[b.CODE_EXPORT_ASSETS = 56] = "CODE_EXPORT_ASSETS";
+        b[b.CODE_IMPORT_ASSETS = 57] = "CODE_IMPORT_ASSETS";
+        b[b.CODE_ENABLE_DEBUGGER = 58] = "CODE_ENABLE_DEBUGGER";
+        b[b.CODE_DO_INIT_ACTION = 59] = "CODE_DO_INIT_ACTION";
+        b[b.CODE_DEFINE_VIDEO_STREAM = 60] = "CODE_DEFINE_VIDEO_STREAM";
+        b[b.CODE_VIDEO_FRAME = 61] = "CODE_VIDEO_FRAME";
+        b[b.CODE_DEFINE_FONT_INFO2 = 62] = "CODE_DEFINE_FONT_INFO2";
+        b[b.CODE_DEBUG_ID = 63] = "CODE_DEBUG_ID";
+        b[b.CODE_ENABLE_DEBUGGER2 = 64] = "CODE_ENABLE_DEBUGGER2";
+        b[b.CODE_SCRIPT_LIMITS = 65] = "CODE_SCRIPT_LIMITS";
+        b[b.CODE_SET_TAB_INDEX = 66] = "CODE_SET_TAB_INDEX";
+        b[b.CODE_FILE_ATTRIBUTES = 69] = "CODE_FILE_ATTRIBUTES";
+        b[b.CODE_PLACE_OBJECT3 = 70] = "CODE_PLACE_OBJECT3";
+        b[b.CODE_IMPORT_ASSETS2 = 71] = "CODE_IMPORT_ASSETS2";
+        b[b.CODE_DO_ABC_DEFINE = 72] = "CODE_DO_ABC_DEFINE";
+        b[b.CODE_DEFINE_FONT_ALIGN_ZONES = 73] = "CODE_DEFINE_FONT_ALIGN_ZONES";
+        b[b.CODE_CSM_TEXT_SETTINGS = 74] = "CODE_CSM_TEXT_SETTINGS";
+        b[b.CODE_DEFINE_FONT3 = 75] = "CODE_DEFINE_FONT3";
+        b[b.CODE_SYMBOL_CLASS = 76] = "CODE_SYMBOL_CLASS";
+        b[b.CODE_METADATA = 77] = "CODE_METADATA";
+        b[b.CODE_DEFINE_SCALING_GRID = 78] = "CODE_DEFINE_SCALING_GRID";
+        b[b.CODE_DO_ABC = 82] = "CODE_DO_ABC";
+        b[b.CODE_DEFINE_SHAPE4 = 83] = "CODE_DEFINE_SHAPE4";
+        b[b.CODE_DEFINE_MORPH_SHAPE2 = 84] = "CODE_DEFINE_MORPH_SHAPE2";
+        b[b.CODE_DEFINE_SCENE_AND_FRAME_LABEL_DATA = 86] = "CODE_DEFINE_SCENE_AND_FRAME_LABEL_DATA";
+        b[b.CODE_DEFINE_BINARY_DATA = 87] = "CODE_DEFINE_BINARY_DATA";
+        b[b.CODE_DEFINE_FONT_NAME = 88] = "CODE_DEFINE_FONT_NAME";
+        b[b.CODE_START_SOUND2 = 89] = "CODE_START_SOUND2";
+        b[b.CODE_DEFINE_BITS_JPEG4 = 90] = "CODE_DEFINE_BITS_JPEG4";
+        b[b.CODE_DEFINE_FONT4 = 91] = "CODE_DEFINE_FONT4";
       })(g.SwfTag || (g.SwfTag = {}));
-      (function(c) {
-        c[c.CODE_DEFINE_SHAPE = 2] = "CODE_DEFINE_SHAPE";
-        c[c.CODE_DEFINE_BITS = 6] = "CODE_DEFINE_BITS";
-        c[c.CODE_DEFINE_BUTTON = 7] = "CODE_DEFINE_BUTTON";
-        c[c.CODE_DEFINE_FONT = 10] = "CODE_DEFINE_FONT";
-        c[c.CODE_DEFINE_TEXT = 11] = "CODE_DEFINE_TEXT";
-        c[c.CODE_DEFINE_SOUND = 14] = "CODE_DEFINE_SOUND";
-        c[c.CODE_DEFINE_BITS_LOSSLESS = 20] = "CODE_DEFINE_BITS_LOSSLESS";
-        c[c.CODE_DEFINE_BITS_JPEG2 = 21] = "CODE_DEFINE_BITS_JPEG2";
-        c[c.CODE_DEFINE_SHAPE2 = 22] = "CODE_DEFINE_SHAPE2";
-        c[c.CODE_DEFINE_SHAPE3 = 32] = "CODE_DEFINE_SHAPE3";
-        c[c.CODE_DEFINE_TEXT2 = 33] = "CODE_DEFINE_TEXT2";
-        c[c.CODE_DEFINE_BUTTON2 = 34] = "CODE_DEFINE_BUTTON2";
-        c[c.CODE_DEFINE_BITS_JPEG3 = 35] = "CODE_DEFINE_BITS_JPEG3";
-        c[c.CODE_DEFINE_BITS_LOSSLESS2 = 36] = "CODE_DEFINE_BITS_LOSSLESS2";
-        c[c.CODE_DEFINE_EDIT_TEXT = 37] = "CODE_DEFINE_EDIT_TEXT";
-        c[c.CODE_DEFINE_SPRITE = 39] = "CODE_DEFINE_SPRITE";
-        c[c.CODE_DEFINE_MORPH_SHAPE = 46] = "CODE_DEFINE_MORPH_SHAPE";
-        c[c.CODE_DEFINE_FONT2 = 48] = "CODE_DEFINE_FONT2";
-        c[c.CODE_DEFINE_VIDEO_STREAM = 60] = "CODE_DEFINE_VIDEO_STREAM";
-        c[c.CODE_DEFINE_FONT3 = 75] = "CODE_DEFINE_FONT3";
-        c[c.CODE_DEFINE_SHAPE4 = 83] = "CODE_DEFINE_SHAPE4";
-        c[c.CODE_DEFINE_MORPH_SHAPE2 = 84] = "CODE_DEFINE_MORPH_SHAPE2";
-        c[c.CODE_DEFINE_BINARY_DATA = 87] = "CODE_DEFINE_BINARY_DATA";
-        c[c.CODE_DEFINE_BITS_JPEG4 = 90] = "CODE_DEFINE_BITS_JPEG4";
-        c[c.CODE_DEFINE_FONT4 = 91] = "CODE_DEFINE_FONT4";
+      (function(b) {
+        b[b.CODE_DEFINE_SHAPE = 2] = "CODE_DEFINE_SHAPE";
+        b[b.CODE_DEFINE_BITS = 6] = "CODE_DEFINE_BITS";
+        b[b.CODE_DEFINE_BUTTON = 7] = "CODE_DEFINE_BUTTON";
+        b[b.CODE_DEFINE_FONT = 10] = "CODE_DEFINE_FONT";
+        b[b.CODE_DEFINE_TEXT = 11] = "CODE_DEFINE_TEXT";
+        b[b.CODE_DEFINE_SOUND = 14] = "CODE_DEFINE_SOUND";
+        b[b.CODE_DEFINE_BITS_LOSSLESS = 20] = "CODE_DEFINE_BITS_LOSSLESS";
+        b[b.CODE_DEFINE_BITS_JPEG2 = 21] = "CODE_DEFINE_BITS_JPEG2";
+        b[b.CODE_DEFINE_SHAPE2 = 22] = "CODE_DEFINE_SHAPE2";
+        b[b.CODE_DEFINE_SHAPE3 = 32] = "CODE_DEFINE_SHAPE3";
+        b[b.CODE_DEFINE_TEXT2 = 33] = "CODE_DEFINE_TEXT2";
+        b[b.CODE_DEFINE_BUTTON2 = 34] = "CODE_DEFINE_BUTTON2";
+        b[b.CODE_DEFINE_BITS_JPEG3 = 35] = "CODE_DEFINE_BITS_JPEG3";
+        b[b.CODE_DEFINE_BITS_LOSSLESS2 = 36] = "CODE_DEFINE_BITS_LOSSLESS2";
+        b[b.CODE_DEFINE_EDIT_TEXT = 37] = "CODE_DEFINE_EDIT_TEXT";
+        b[b.CODE_DEFINE_SPRITE = 39] = "CODE_DEFINE_SPRITE";
+        b[b.CODE_DEFINE_MORPH_SHAPE = 46] = "CODE_DEFINE_MORPH_SHAPE";
+        b[b.CODE_DEFINE_FONT2 = 48] = "CODE_DEFINE_FONT2";
+        b[b.CODE_DEFINE_VIDEO_STREAM = 60] = "CODE_DEFINE_VIDEO_STREAM";
+        b[b.CODE_DEFINE_FONT3 = 75] = "CODE_DEFINE_FONT3";
+        b[b.CODE_DEFINE_SHAPE4 = 83] = "CODE_DEFINE_SHAPE4";
+        b[b.CODE_DEFINE_MORPH_SHAPE2 = 84] = "CODE_DEFINE_MORPH_SHAPE2";
+        b[b.CODE_DEFINE_BINARY_DATA = 87] = "CODE_DEFINE_BINARY_DATA";
+        b[b.CODE_DEFINE_BITS_JPEG4 = 90] = "CODE_DEFINE_BITS_JPEG4";
+        b[b.CODE_DEFINE_FONT4 = 91] = "CODE_DEFINE_FONT4";
       })(g.DefinitionTags || (g.DefinitionTags = {}));
-      (function(c) {
-        c[c.CODE_DEFINE_BITS = 6] = "CODE_DEFINE_BITS";
-        c[c.CODE_DEFINE_BITS_JPEG2 = 21] = "CODE_DEFINE_BITS_JPEG2";
-        c[c.CODE_DEFINE_BITS_JPEG3 = 35] = "CODE_DEFINE_BITS_JPEG3";
-        c[c.CODE_DEFINE_BITS_JPEG4 = 90] = "CODE_DEFINE_BITS_JPEG4";
+      (function(b) {
+        b[b.CODE_DEFINE_BITS = 6] = "CODE_DEFINE_BITS";
+        b[b.CODE_DEFINE_BITS_JPEG2 = 21] = "CODE_DEFINE_BITS_JPEG2";
+        b[b.CODE_DEFINE_BITS_JPEG3 = 35] = "CODE_DEFINE_BITS_JPEG3";
+        b[b.CODE_DEFINE_BITS_JPEG4 = 90] = "CODE_DEFINE_BITS_JPEG4";
       })(g.ImageDefinitionTags || (g.ImageDefinitionTags = {}));
-      (function(c) {
-        c[c.CODE_DEFINE_FONT = 10] = "CODE_DEFINE_FONT";
-        c[c.CODE_DEFINE_FONT2 = 48] = "CODE_DEFINE_FONT2";
-        c[c.CODE_DEFINE_FONT3 = 75] = "CODE_DEFINE_FONT3";
-        c[c.CODE_DEFINE_FONT4 = 91] = "CODE_DEFINE_FONT4";
+      (function(b) {
+        b[b.CODE_DEFINE_FONT = 10] = "CODE_DEFINE_FONT";
+        b[b.CODE_DEFINE_FONT2 = 48] = "CODE_DEFINE_FONT2";
+        b[b.CODE_DEFINE_FONT3 = 75] = "CODE_DEFINE_FONT3";
+        b[b.CODE_DEFINE_FONT4 = 91] = "CODE_DEFINE_FONT4";
       })(g.FontDefinitionTags || (g.FontDefinitionTags = {}));
-      (function(c) {
-        c[c.CODE_PLACE_OBJECT = 4] = "CODE_PLACE_OBJECT";
-        c[c.CODE_PLACE_OBJECT2 = 26] = "CODE_PLACE_OBJECT2";
-        c[c.CODE_PLACE_OBJECT3 = 70] = "CODE_PLACE_OBJECT3";
-        c[c.CODE_REMOVE_OBJECT = 5] = "CODE_REMOVE_OBJECT";
-        c[c.CODE_REMOVE_OBJECT2 = 28] = "CODE_REMOVE_OBJECT2";
-        c[c.CODE_START_SOUND = 15] = "CODE_START_SOUND";
-        c[c.CODE_START_SOUND2 = 89] = "CODE_START_SOUND2";
-        c[c.CODE_VIDEO_FRAME = 61] = "CODE_VIDEO_FRAME";
+      (function(b) {
+        b[b.CODE_PLACE_OBJECT = 4] = "CODE_PLACE_OBJECT";
+        b[b.CODE_PLACE_OBJECT2 = 26] = "CODE_PLACE_OBJECT2";
+        b[b.CODE_PLACE_OBJECT3 = 70] = "CODE_PLACE_OBJECT3";
+        b[b.CODE_REMOVE_OBJECT = 5] = "CODE_REMOVE_OBJECT";
+        b[b.CODE_REMOVE_OBJECT2 = 28] = "CODE_REMOVE_OBJECT2";
+        b[b.CODE_START_SOUND = 15] = "CODE_START_SOUND";
+        b[b.CODE_START_SOUND2 = 89] = "CODE_START_SOUND2";
+        b[b.CODE_VIDEO_FRAME = 61] = "CODE_VIDEO_FRAME";
       })(g.ControlTags || (g.ControlTags = {}));
-      (function(c) {
-        c[c.Move = 1] = "Move";
-        c[c.HasCharacter = 2] = "HasCharacter";
-        c[c.HasMatrix = 4] = "HasMatrix";
-        c[c.HasColorTransform = 8] = "HasColorTransform";
-        c[c.HasRatio = 16] = "HasRatio";
-        c[c.HasName = 32] = "HasName";
-        c[c.HasClipDepth = 64] = "HasClipDepth";
-        c[c.HasClipActions = 128] = "HasClipActions";
-        c[c.HasFilterList = 256] = "HasFilterList";
-        c[c.HasBlendMode = 512] = "HasBlendMode";
-        c[c.HasCacheAsBitmap = 1024] = "HasCacheAsBitmap";
-        c[c.HasClassName = 2048] = "HasClassName";
-        c[c.HasImage = 4096] = "HasImage";
-        c[c.HasVisible = 8192] = "HasVisible";
-        c[c.OpaqueBackground = 16384] = "OpaqueBackground";
-        c[c.Reserved = 32768] = "Reserved";
+      (function(b) {
+        b[b.Move = 1] = "Move";
+        b[b.HasCharacter = 2] = "HasCharacter";
+        b[b.HasMatrix = 4] = "HasMatrix";
+        b[b.HasColorTransform = 8] = "HasColorTransform";
+        b[b.HasRatio = 16] = "HasRatio";
+        b[b.HasName = 32] = "HasName";
+        b[b.HasClipDepth = 64] = "HasClipDepth";
+        b[b.HasClipActions = 128] = "HasClipActions";
+        b[b.HasFilterList = 256] = "HasFilterList";
+        b[b.HasBlendMode = 512] = "HasBlendMode";
+        b[b.HasCacheAsBitmap = 1024] = "HasCacheAsBitmap";
+        b[b.HasClassName = 2048] = "HasClassName";
+        b[b.HasImage = 4096] = "HasImage";
+        b[b.HasVisible = 8192] = "HasVisible";
+        b[b.OpaqueBackground = 16384] = "OpaqueBackground";
+        b[b.Reserved = 32768] = "Reserved";
       })(g.PlaceObjectFlags || (g.PlaceObjectFlags = {}));
-      (function(c) {
-        c[c.Load = 1] = "Load";
-        c[c.EnterFrame = 2] = "EnterFrame";
-        c[c.Unload = 4] = "Unload";
-        c[c.MouseMove = 8] = "MouseMove";
-        c[c.MouseDown = 16] = "MouseDown";
-        c[c.MouseUp = 32] = "MouseUp";
-        c[c.KeyDown = 64] = "KeyDown";
-        c[c.KeyUp = 128] = "KeyUp";
-        c[c.Data = 256] = "Data";
-        c[c.Initialize = 512] = "Initialize";
-        c[c.Press = 1024] = "Press";
-        c[c.Release = 2048] = "Release";
-        c[c.ReleaseOutside = 4096] = "ReleaseOutside";
-        c[c.RollOver = 8192] = "RollOver";
-        c[c.RollOut = 16384] = "RollOut";
-        c[c.DragOver = 32768] = "DragOver";
-        c[c.DragOut = 65536] = "DragOut";
-        c[c.KeyPress = 131072] = "KeyPress";
-        c[c.Construct = 262144] = "Construct";
+      (function(b) {
+        b[b.Load = 1] = "Load";
+        b[b.EnterFrame = 2] = "EnterFrame";
+        b[b.Unload = 4] = "Unload";
+        b[b.MouseMove = 8] = "MouseMove";
+        b[b.MouseDown = 16] = "MouseDown";
+        b[b.MouseUp = 32] = "MouseUp";
+        b[b.KeyDown = 64] = "KeyDown";
+        b[b.KeyUp = 128] = "KeyUp";
+        b[b.Data = 256] = "Data";
+        b[b.Initialize = 512] = "Initialize";
+        b[b.Press = 1024] = "Press";
+        b[b.Release = 2048] = "Release";
+        b[b.ReleaseOutside = 4096] = "ReleaseOutside";
+        b[b.RollOver = 8192] = "RollOver";
+        b[b.RollOut = 16384] = "RollOut";
+        b[b.DragOver = 32768] = "DragOver";
+        b[b.DragOut = 65536] = "DragOut";
+        b[b.KeyPress = 131072] = "KeyPress";
+        b[b.Construct = 262144] = "Construct";
       })(g.AVM1ClipEvents || (g.AVM1ClipEvents = {}));
-    })(l.Parser || (l.Parser = {}));
-  })(l.SWF || (l.SWF = {}));
+    })(k.Parser || (k.Parser = {}));
+  })(k.SWF || (k.SWF = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  var r = l.Debug.unexpected, g = function() {
-    function c(c, m, a, h) {
-      this.url = c;
-      this.method = m;
+(function(k) {
+  var p = k.Debug.unexpected, g = function() {
+    function b(b, h, a, d) {
+      this.url = b;
+      this.method = h;
       this.mimeType = a;
-      this.data = h;
+      this.data = d;
     }
-    c.prototype.readAll = function(c, m) {
-      var a = this.url, h = new XMLHttpRequest({mozSystem:!0});
-      h.open(this.method || "GET", this.url, !0);
-      h.responseType = "arraybuffer";
-      c && (h.onprogress = function(a) {
-        c(h.response, a.loaded, a.total);
+    b.prototype.readAll = function(b, h) {
+      var a = this.url, d = new XMLHttpRequest({mozSystem:!0});
+      d.open(this.method || "GET", this.url, !0);
+      d.responseType = "arraybuffer";
+      b && (d.onprogress = function(a) {
+        b(d.response, a.loaded, a.total);
       });
-      h.onreadystatechange = function(c) {
-        4 === h.readyState && (200 !== h.status && 0 !== h.status || null === h.response ? (r("Path: " + a + " not found."), m(null, h.statusText)) : m(h.response));
+      d.onreadystatechange = function(b) {
+        4 === d.readyState && (200 !== d.status && 0 !== d.status || null === d.response ? (p("Path: " + a + " not found."), h(null, d.statusText)) : h(d.response));
       };
-      this.mimeType && h.setRequestHeader("Content-Type", this.mimeType);
-      h.send(this.data || null);
+      this.mimeType && d.setRequestHeader("Content-Type", this.mimeType);
+      d.send(this.data || null);
     };
-    c.prototype.readChunked = function(c, m, a, h, p, k) {
-      if (0 >= c) {
-        this.readAsync(m, a, h, p, k);
+    b.prototype.readChunked = function(b, h, a, d, n, f) {
+      if (0 >= b) {
+        this.readAsync(h, a, d, n, f);
       } else {
-        var u = 0, n = new Uint8Array(c), s = 0, g;
-        this.readAsync(function(d, e) {
-          g = e.total;
-          for (var b = d.length, f = 0;u + b >= c;) {
-            var a = c - u;
-            n.set(d.subarray(f, f + a), u);
-            f += a;
-            b -= a;
-            s += c;
-            m(n, {loaded:s, total:g});
-            u = 0;
-          }
-          n.set(d.subarray(f), u);
-          u += b;
-        }, a, h, function() {
-          0 < u && (s += u, m(n.subarray(0, u), {loaded:s, total:g}), u = 0);
-          p && p();
-        }, k);
-      }
-    };
-    c.prototype.readAsync = function(c, m, a, h, p) {
-      var k = new XMLHttpRequest({mozSystem:!0}), u = this.url, n = 0, s = 0;
-      k.open(this.method || "GET", u, !0);
-      k.responseType = "moz-chunked-arraybuffer";
-      var g = "moz-chunked-arraybuffer" !== k.responseType;
-      g && (k.responseType = "arraybuffer");
-      k.onprogress = function(d) {
-        g || (n = d.loaded, s = d.total, c(new Uint8Array(k.response), {loaded:n, total:s}));
-      };
-      k.onreadystatechange = function(d) {
-        2 === k.readyState && p && p(u, k.status, k.getAllResponseHeaders());
-        4 === k.readyState && (200 !== k.status && 0 !== k.status || null === k.response && (0 === s || n !== s) ? m(k.statusText) : (g && (d = k.response, c(new Uint8Array(d), {loaded:0, total:d.byteLength})), h && h()));
+        var v = 0, m = new Uint8Array(b), r = 0, g;
+        this.readAsync(function(a, d) {
+          g = d.total;
+          for (var c = a.length, e = 0;v + c >= b;) {
+            var q = b - v;
+            m.set(a.subarray(e, e + q), v);
+            e += q;
+            c -= q;
+            r += b;
+            h(m, {loaded:r, total:g});
+            v = 0;
+          }
+          m.set(a.subarray(e), v);
+          v += c;
+        }, a, d, function() {
+          0 < v && (r += v, h(m.subarray(0, v), {loaded:r, total:g}), v = 0);
+          n && n();
+        }, f);
+      }
+    };
+    b.prototype.readAsync = function(b, h, a, d, n) {
+      var f = new XMLHttpRequest({mozSystem:!0}), v = this.url, m = 0, r = 0;
+      f.open(this.method || "GET", v, !0);
+      f.responseType = "moz-chunked-arraybuffer";
+      var g = "moz-chunked-arraybuffer" !== f.responseType;
+      g && (f.responseType = "arraybuffer");
+      f.onprogress = function(a) {
+        g || (m = a.loaded, r = a.total, b(new Uint8Array(f.response), {loaded:m, total:r}));
+      };
+      f.onreadystatechange = function(a) {
+        2 === f.readyState && n && n(v, f.status, f.getAllResponseHeaders());
+        4 === f.readyState && (200 !== f.status && 0 !== f.status || null === f.response && (0 === r || m !== r) ? h(f.statusText) : (g && (a = f.response, b(new Uint8Array(a), {loaded:0, total:a.byteLength})), d && d()));
       };
-      this.mimeType && k.setRequestHeader("Content-Type", this.mimeType);
-      k.send(this.data || null);
+      this.mimeType && f.setRequestHeader("Content-Type", this.mimeType);
+      f.send(this.data || null);
       a && a();
     };
-    return c;
+    return b;
   }();
-  l.BinaryFileReader = g;
+  k.BinaryFileReader = g;
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
       g[g.Objects = 0] = "Objects";
       g[g.References = 1] = "References";
-    })(l.RemotingPhase || (l.RemotingPhase = {}));
+    })(k.RemotingPhase || (k.RemotingPhase = {}));
     (function(g) {
       g[g.HasMatrix = 1] = "HasMatrix";
       g[g.HasBounds = 2] = "HasBounds";
@@ -4555,11 +4567,11 @@
       g[g.HasMiscellaneousProperties = 32] = "HasMiscellaneousProperties";
       g[g.HasMask = 64] = "HasMask";
       g[g.HasClip = 128] = "HasClip";
-    })(l.MessageBits || (l.MessageBits = {}));
+    })(k.MessageBits || (k.MessageBits = {}));
     (function(g) {
       g[g.None = 0] = "None";
       g[g.Asset = 134217728] = "Asset";
-    })(l.IDMask || (l.IDMask = {}));
+    })(k.IDMask || (k.IDMask = {}));
     (function(g) {
       g[g.EOF = 0] = "EOF";
       g[g.UpdateFrame = 100] = "UpdateFrame";
@@ -4573,16 +4585,16 @@
       g[g.MouseEvent = 300] = "MouseEvent";
       g[g.KeyboardEvent = 301] = "KeyboardEvent";
       g[g.FocusEvent = 302] = "FocusEvent";
-    })(l.MessageTag || (l.MessageTag = {}));
+    })(k.MessageTag || (k.MessageTag = {}));
     (function(g) {
       g[g.Blur = 0] = "Blur";
       g[g.DropShadow = 1] = "DropShadow";
-    })(l.FilterType || (l.FilterType = {}));
+    })(k.FilterType || (k.FilterType = {}));
     (function(g) {
       g[g.Identity = 0] = "Identity";
       g[g.AlphaMultiplierOnly = 1] = "AlphaMultiplierOnly";
       g[g.All = 2] = "All";
-    })(l.ColorTransformEncoding || (l.ColorTransformEncoding = {}));
+    })(k.ColorTransformEncoding || (k.ColorTransformEncoding = {}));
     (function(g) {
       g[g.Initialized = 0] = "Initialized";
       g[g.Metadata = 1] = "Metadata";
@@ -4596,7 +4608,7 @@
       g[g.Seeked = 9] = "Seeked";
       g[g.Progress = 10] = "Progress";
       g[g.Error = 11] = "Error";
-    })(l.VideoPlaybackEvent || (l.VideoPlaybackEvent = {}));
+    })(k.VideoPlaybackEvent || (k.VideoPlaybackEvent = {}));
     (function(g) {
       g[g.Init = 1] = "Init";
       g[g.Pause = 2] = "Pause";
@@ -4607,13 +4619,13 @@
       g[g.GetBytesLoaded = 7] = "GetBytesLoaded";
       g[g.GetBytesTotal = 8] = "GetBytesTotal";
       g[g.EnsurePlaying = 9] = "EnsurePlaying";
-    })(l.VideoControlEvent || (l.VideoControlEvent = {}));
+    })(k.VideoControlEvent || (k.VideoControlEvent = {}));
     (function(g) {
       g[g.ShowAll = 0] = "ShowAll";
       g[g.ExactFit = 1] = "ExactFit";
       g[g.NoBorder = 2] = "NoBorder";
       g[g.NoScale = 4] = "NoScale";
-    })(l.StageScaleMode || (l.StageScaleMode = {}));
+    })(k.StageScaleMode || (k.StageScaleMode = {}));
     (function(g) {
       g[g.None = 0] = "None";
       g[g.Top = 1] = "Top";
@@ -4624,560 +4636,558 @@
       g[g.BottomLeft = g.Bottom | g.Left] = "BottomLeft";
       g[g.BottomRight = g.Bottom | g.Right] = "BottomRight";
       g[g.TopRight = g.Top | g.Right] = "TopRight";
-    })(l.StageAlignFlags || (l.StageAlignFlags = {}));
-    l.MouseEventNames = "click dblclick mousedown mousemove mouseup mouseover mouseout".split(" ");
-    l.KeyboardEventNames = ["keydown", "keypress", "keyup"];
+    })(k.StageAlignFlags || (k.StageAlignFlags = {}));
+    k.MouseEventNames = "click dblclick mousedown mousemove mouseup mouseover mouseout".split(" ");
+    k.KeyboardEventNames = ["keydown", "keypress", "keyup"];
     (function(g) {
       g[g.CtrlKey = 1] = "CtrlKey";
       g[g.AltKey = 2] = "AltKey";
       g[g.ShiftKey = 4] = "ShiftKey";
-    })(l.KeyboardEventFlags || (l.KeyboardEventFlags = {}));
+    })(k.KeyboardEventFlags || (k.KeyboardEventFlags = {}));
     (function(g) {
       g[g.DocumentHidden = 0] = "DocumentHidden";
       g[g.DocumentVisible = 1] = "DocumentVisible";
       g[g.WindowBlur = 2] = "WindowBlur";
       g[g.WindowFocus = 3] = "WindowFocus";
-    })(l.FocusEventType || (l.FocusEventType = {}));
-  })(l.Remoting || (l.Remoting = {}));
+    })(k.FocusEventType || (k.FocusEventType = {}));
+  })(k.Remoting || (k.Remoting = {}));
 })(Shumway || (Shumway = {}));
 var throwError, Errors;
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      var c = function() {
-        function c() {
+      var b = function() {
+        function b() {
         }
-        c.toRGBA = function(a, h, c, k) {
-          void 0 === k && (k = 1);
-          return "rgba(" + a + "," + h + "," + c + "," + k + ")";
+        b.toRGBA = function(a, d, b, f) {
+          void 0 === f && (f = 1);
+          return "rgba(" + a + "," + d + "," + b + "," + f + ")";
         };
-        return c;
+        return b;
       }();
-      g.UI = c;
-      var l = function() {
-        function m() {
+      g.UI = b;
+      var k = function() {
+        function h() {
         }
-        m.prototype.tabToolbar = function(a) {
+        h.prototype.tabToolbar = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(37, 44, 51, a);
+          return b.toRGBA(37, 44, 51, a);
         };
-        m.prototype.toolbars = function(a) {
+        h.prototype.toolbars = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(52, 60, 69, a);
+          return b.toRGBA(52, 60, 69, a);
         };
-        m.prototype.selectionBackground = function(a) {
+        h.prototype.selectionBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(29, 79, 115, a);
+          return b.toRGBA(29, 79, 115, a);
         };
-        m.prototype.selectionText = function(a) {
+        h.prototype.selectionText = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(245, 247, 250, a);
+          return b.toRGBA(245, 247, 250, a);
         };
-        m.prototype.splitters = function(a) {
+        h.prototype.splitters = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(0, 0, 0, a);
+          return b.toRGBA(0, 0, 0, a);
         };
-        m.prototype.bodyBackground = function(a) {
+        h.prototype.bodyBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(17, 19, 21, a);
+          return b.toRGBA(17, 19, 21, a);
         };
-        m.prototype.sidebarBackground = function(a) {
+        h.prototype.sidebarBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(24, 29, 32, a);
+          return b.toRGBA(24, 29, 32, a);
         };
-        m.prototype.attentionBackground = function(a) {
+        h.prototype.attentionBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(161, 134, 80, a);
+          return b.toRGBA(161, 134, 80, a);
         };
-        m.prototype.bodyText = function(a) {
+        h.prototype.bodyText = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(143, 161, 178, a);
+          return b.toRGBA(143, 161, 178, a);
         };
-        m.prototype.foregroundTextGrey = function(a) {
+        h.prototype.foregroundTextGrey = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(182, 186, 191, a);
+          return b.toRGBA(182, 186, 191, a);
         };
-        m.prototype.contentTextHighContrast = function(a) {
+        h.prototype.contentTextHighContrast = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(169, 186, 203, a);
+          return b.toRGBA(169, 186, 203, a);
         };
-        m.prototype.contentTextGrey = function(a) {
+        h.prototype.contentTextGrey = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(143, 161, 178, a);
+          return b.toRGBA(143, 161, 178, a);
         };
-        m.prototype.contentTextDarkGrey = function(a) {
+        h.prototype.contentTextDarkGrey = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(95, 115, 135, a);
+          return b.toRGBA(95, 115, 135, a);
         };
-        m.prototype.blueHighlight = function(a) {
+        h.prototype.blueHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(70, 175, 227, a);
+          return b.toRGBA(70, 175, 227, a);
         };
-        m.prototype.purpleHighlight = function(a) {
+        h.prototype.purpleHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(107, 122, 187, a);
+          return b.toRGBA(107, 122, 187, a);
         };
-        m.prototype.pinkHighlight = function(a) {
+        h.prototype.pinkHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(223, 128, 255, a);
+          return b.toRGBA(223, 128, 255, a);
         };
-        m.prototype.redHighlight = function(a) {
+        h.prototype.redHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(235, 83, 104, a);
+          return b.toRGBA(235, 83, 104, a);
         };
-        m.prototype.orangeHighlight = function(a) {
+        h.prototype.orangeHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(217, 102, 41, a);
+          return b.toRGBA(217, 102, 41, a);
         };
-        m.prototype.lightOrangeHighlight = function(a) {
+        h.prototype.lightOrangeHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(217, 155, 40, a);
+          return b.toRGBA(217, 155, 40, a);
         };
-        m.prototype.greenHighlight = function(a) {
+        h.prototype.greenHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(112, 191, 83, a);
+          return b.toRGBA(112, 191, 83, a);
         };
-        m.prototype.blueGreyHighlight = function(a) {
+        h.prototype.blueGreyHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(94, 136, 176, a);
+          return b.toRGBA(94, 136, 176, a);
         };
-        return m;
+        return h;
       }();
-      g.UIThemeDark = l;
-      l = function() {
-        function m() {
+      g.UIThemeDark = k;
+      k = function() {
+        function h() {
         }
-        m.prototype.tabToolbar = function(a) {
+        h.prototype.tabToolbar = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(235, 236, 237, a);
+          return b.toRGBA(235, 236, 237, a);
         };
-        m.prototype.toolbars = function(a) {
+        h.prototype.toolbars = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(240, 241, 242, a);
+          return b.toRGBA(240, 241, 242, a);
         };
-        m.prototype.selectionBackground = function(a) {
+        h.prototype.selectionBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(76, 158, 217, a);
+          return b.toRGBA(76, 158, 217, a);
         };
-        m.prototype.selectionText = function(a) {
+        h.prototype.selectionText = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(245, 247, 250, a);
+          return b.toRGBA(245, 247, 250, a);
         };
-        m.prototype.splitters = function(a) {
+        h.prototype.splitters = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(170, 170, 170, a);
+          return b.toRGBA(170, 170, 170, a);
         };
-        m.prototype.bodyBackground = function(a) {
+        h.prototype.bodyBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(252, 252, 252, a);
+          return b.toRGBA(252, 252, 252, a);
         };
-        m.prototype.sidebarBackground = function(a) {
+        h.prototype.sidebarBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(247, 247, 247, a);
+          return b.toRGBA(247, 247, 247, a);
         };
-        m.prototype.attentionBackground = function(a) {
+        h.prototype.attentionBackground = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(161, 134, 80, a);
+          return b.toRGBA(161, 134, 80, a);
         };
-        m.prototype.bodyText = function(a) {
+        h.prototype.bodyText = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(24, 25, 26, a);
+          return b.toRGBA(24, 25, 26, a);
         };
-        m.prototype.foregroundTextGrey = function(a) {
+        h.prototype.foregroundTextGrey = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(88, 89, 89, a);
+          return b.toRGBA(88, 89, 89, a);
         };
-        m.prototype.contentTextHighContrast = function(a) {
+        h.prototype.contentTextHighContrast = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(41, 46, 51, a);
+          return b.toRGBA(41, 46, 51, a);
         };
-        m.prototype.contentTextGrey = function(a) {
+        h.prototype.contentTextGrey = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(143, 161, 178, a);
+          return b.toRGBA(143, 161, 178, a);
         };
-        m.prototype.contentTextDarkGrey = function(a) {
+        h.prototype.contentTextDarkGrey = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(102, 115, 128, a);
+          return b.toRGBA(102, 115, 128, a);
         };
-        m.prototype.blueHighlight = function(a) {
+        h.prototype.blueHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(0, 136, 204, a);
+          return b.toRGBA(0, 136, 204, a);
         };
-        m.prototype.purpleHighlight = function(a) {
+        h.prototype.purpleHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(91, 95, 255, a);
+          return b.toRGBA(91, 95, 255, a);
         };
-        m.prototype.pinkHighlight = function(a) {
+        h.prototype.pinkHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(184, 46, 229, a);
+          return b.toRGBA(184, 46, 229, a);
         };
-        m.prototype.redHighlight = function(a) {
+        h.prototype.redHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(237, 38, 85, a);
+          return b.toRGBA(237, 38, 85, a);
         };
-        m.prototype.orangeHighlight = function(a) {
+        h.prototype.orangeHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(241, 60, 0, a);
+          return b.toRGBA(241, 60, 0, a);
         };
-        m.prototype.lightOrangeHighlight = function(a) {
+        h.prototype.lightOrangeHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(217, 126, 0, a);
+          return b.toRGBA(217, 126, 0, a);
         };
-        m.prototype.greenHighlight = function(a) {
+        h.prototype.greenHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(44, 187, 15, a);
+          return b.toRGBA(44, 187, 15, a);
         };
-        m.prototype.blueGreyHighlight = function(a) {
+        h.prototype.blueGreyHighlight = function(a) {
           void 0 === a && (a = 1);
-          return c.toRGBA(95, 136, 176, a);
+          return b.toRGBA(95, 136, 176, a);
         };
-        return m;
+        return h;
       }();
-      g.UIThemeLight = l;
-    })(l.Theme || (l.Theme = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.UIThemeLight = k;
+    })(k.Theme || (k.Theme = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      var c = function() {
-        function c(m) {
-          this._buffers = m || [];
+      var b = function() {
+        function b(h, a) {
+          this._buffers = h || [];
           this._snapshots = [];
+          this._windowStart = this._startTime = a;
           this._maxDepth = 0;
         }
-        c.prototype.addBuffer = function(c) {
-          this._buffers.push(c);
+        b.prototype.addBuffer = function(b) {
+          this._buffers.push(b);
         };
-        c.prototype.getSnapshotAt = function(c) {
-          return this._snapshots[c];
+        b.prototype.getSnapshotAt = function(b) {
+          return this._snapshots[b];
         };
-        Object.defineProperty(c.prototype, "hasSnapshots", {get:function() {
+        Object.defineProperty(b.prototype, "hasSnapshots", {get:function() {
           return 0 < this.snapshotCount;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "snapshotCount", {get:function() {
+        Object.defineProperty(b.prototype, "snapshotCount", {get:function() {
           return this._snapshots.length;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "startTime", {get:function() {
+        Object.defineProperty(b.prototype, "startTime", {get:function() {
           return this._startTime;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "endTime", {get:function() {
+        Object.defineProperty(b.prototype, "endTime", {get:function() {
           return this._endTime;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "totalTime", {get:function() {
+        Object.defineProperty(b.prototype, "totalTime", {get:function() {
           return this.endTime - this.startTime;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "windowStart", {get:function() {
+        Object.defineProperty(b.prototype, "windowStart", {get:function() {
           return this._windowStart;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "windowEnd", {get:function() {
+        Object.defineProperty(b.prototype, "windowEnd", {get:function() {
           return this._windowEnd;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "windowLength", {get:function() {
+        Object.defineProperty(b.prototype, "windowLength", {get:function() {
           return this.windowEnd - this.windowStart;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "maxDepth", {get:function() {
+        Object.defineProperty(b.prototype, "maxDepth", {get:function() {
           return this._maxDepth;
         }, enumerable:!0, configurable:!0});
-        c.prototype.forEachSnapshot = function(c) {
-          for (var a = 0, h = this.snapshotCount;a < h;a++) {
-            c(this._snapshots[a], a);
+        b.prototype.forEachSnapshot = function(b) {
+          for (var a = 0, d = this.snapshotCount;a < d;a++) {
+            b(this._snapshots[a], a);
           }
         };
-        c.prototype.createSnapshots = function() {
-          var c = Number.MAX_VALUE, a = Number.MIN_VALUE, h = 0;
+        b.prototype.createSnapshots = function() {
+          var b = Number.MIN_VALUE, a = 0;
           for (this._snapshots = [];0 < this._buffers.length;) {
-            var p = this._buffers.shift().createSnapshot();
-            p && (c > p.startTime && (c = p.startTime), a < p.endTime && (a = p.endTime), h < p.maxDepth && (h = p.maxDepth), this._snapshots.push(p));
+            var d = this._buffers.shift().createSnapshot();
+            d && (b < d.endTime && (b = d.endTime), a < d.maxDepth && (a = d.maxDepth), this._snapshots.push(d));
           }
-          this._startTime = c;
-          this._endTime = a;
-          this._windowStart = c;
-          this._windowEnd = a;
-          this._maxDepth = h;
+          this._windowEnd = this._endTime = b;
+          this._maxDepth = a;
         };
-        c.prototype.setWindow = function(c, a) {
-          if (c > a) {
-            var h = c;
-            c = a;
-            a = h;
-          }
-          h = Math.min(a - c, this.totalTime);
-          c < this._startTime ? (c = this._startTime, a = this._startTime + h) : a > this._endTime && (c = this._endTime - h, a = this._endTime);
-          this._windowStart = c;
+        b.prototype.setWindow = function(b, a) {
+          if (b > a) {
+            var d = b;
+            b = a;
+            a = d;
+          }
+          d = Math.min(a - b, this.totalTime);
+          b < this._startTime ? (b = this._startTime, a = this._startTime + d) : a > this._endTime && (b = this._endTime - d, a = this._endTime);
+          this._windowStart = b;
           this._windowEnd = a;
         };
-        c.prototype.moveWindowTo = function(c) {
-          this.setWindow(c - this.windowLength / 2, c + this.windowLength / 2);
+        b.prototype.moveWindowTo = function(b) {
+          this.setWindow(b - this.windowLength / 2, b + this.windowLength / 2);
         };
-        return c;
+        return b;
       }();
-      g.Profile = c;
-    })(l.Profiler || (l.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.Profile = b;
+    })(k.Profiler || (k.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-__extends = this.__extends || function(l, r) {
+__extends = this.__extends || function(k, p) {
   function g() {
-    this.constructor = l;
+    this.constructor = k;
   }
-  for (var c in r) {
-    r.hasOwnProperty(c) && (l[c] = r[c]);
+  for (var b in p) {
+    p.hasOwnProperty(b) && (k[b] = p[b]);
   }
-  g.prototype = r.prototype;
-  l.prototype = new g;
+  g.prototype = p.prototype;
+  k.prototype = new g;
 };
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      var c = function() {
-        return function(c) {
-          this.kind = c;
+      var b = function() {
+        return function(b) {
+          this.kind = b;
           this.totalTime = this.selfTime = this.count = 0;
         };
       }();
-      g.TimelineFrameStatistics = c;
-      var l = function() {
-        function m(a, h, c, k, m, n) {
+      g.TimelineFrameStatistics = b;
+      var k = function() {
+        function h(a, d, b, f, h, m) {
           this.parent = a;
-          this.kind = h;
-          this.startData = c;
-          this.endData = k;
-          this.startTime = m;
-          this.endTime = n;
+          this.kind = d;
+          this.startData = b;
+          this.endData = f;
+          this.startTime = h;
+          this.endTime = m;
           this.maxDepth = 0;
         }
-        Object.defineProperty(m.prototype, "totalTime", {get:function() {
+        Object.defineProperty(h.prototype, "totalTime", {get:function() {
           return this.endTime - this.startTime;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(m.prototype, "selfTime", {get:function() {
+        Object.defineProperty(h.prototype, "selfTime", {get:function() {
           var a = this.totalTime;
           if (this.children) {
-            for (var h = 0, c = this.children.length;h < c;h++) {
-              var k = this.children[h], a = a - (k.endTime - k.startTime)
+            for (var d = 0, b = this.children.length;d < b;d++) {
+              var f = this.children[d], a = a - (f.endTime - f.startTime)
             }
           }
           return a;
         }, enumerable:!0, configurable:!0});
-        m.prototype.getChildIndex = function(a) {
-          for (var h = this.children, c = 0;c < h.length;c++) {
-            if (h[c].endTime > a) {
-              return c;
+        h.prototype.getChildIndex = function(a) {
+          for (var d = this.children, b = 0;b < d.length;b++) {
+            if (d[b].endTime > a) {
+              return b;
             }
           }
           return 0;
         };
-        m.prototype.getChildRange = function(a, h) {
-          if (this.children && a <= this.endTime && h >= this.startTime && h >= a) {
-            var c = this._getNearestChild(a), k = this._getNearestChildReverse(h);
-            if (c <= k) {
-              return a = this.children[c].startTime, h = this.children[k].endTime, {startIndex:c, endIndex:k, startTime:a, endTime:h, totalTime:h - a};
+        h.prototype.getChildRange = function(a, d) {
+          if (this.children && a <= this.endTime && d >= this.startTime && d >= a) {
+            var b = this._getNearestChild(a), f = this._getNearestChildReverse(d);
+            if (b <= f) {
+              return a = this.children[b].startTime, d = this.children[f].endTime, {startIndex:b, endIndex:f, startTime:a, endTime:d, totalTime:d - a};
             }
           }
           return null;
         };
-        m.prototype._getNearestChild = function(a) {
-          var h = this.children;
-          if (h && h.length) {
-            if (a <= h[0].endTime) {
+        h.prototype._getNearestChild = function(a) {
+          var d = this.children;
+          if (d && d.length) {
+            if (a <= d[0].endTime) {
               return 0;
             }
-            for (var c, k = 0, m = h.length - 1;m > k;) {
-              c = (k + m) / 2 | 0;
-              var n = h[c];
-              if (a >= n.startTime && a <= n.endTime) {
-                return c;
+            for (var b, f = 0, h = d.length - 1;h > f;) {
+              b = (f + h) / 2 | 0;
+              var m = d[b];
+              if (a >= m.startTime && a <= m.endTime) {
+                return b;
               }
-              a > n.endTime ? k = c + 1 : m = c;
+              a > m.endTime ? f = b + 1 : h = b;
             }
-            return Math.ceil((k + m) / 2);
+            return Math.ceil((f + h) / 2);
           }
           return 0;
         };
-        m.prototype._getNearestChildReverse = function(a) {
-          var h = this.children;
-          if (h && h.length) {
-            var c = h.length - 1;
-            if (a >= h[c].startTime) {
-              return c;
-            }
-            for (var k, m = 0;c > m;) {
-              k = Math.ceil((m + c) / 2);
-              var n = h[k];
-              if (a >= n.startTime && a <= n.endTime) {
-                return k;
+        h.prototype._getNearestChildReverse = function(a) {
+          var d = this.children;
+          if (d && d.length) {
+            var b = d.length - 1;
+            if (a >= d[b].startTime) {
+              return b;
+            }
+            for (var f, h = 0;b > h;) {
+              f = Math.ceil((h + b) / 2);
+              var m = d[f];
+              if (a >= m.startTime && a <= m.endTime) {
+                return f;
               }
-              a > n.endTime ? m = k : c = k - 1;
+              a > m.endTime ? h = f : b = f - 1;
             }
-            return(m + c) / 2 | 0;
+            return(h + b) / 2 | 0;
           }
           return 0;
         };
-        m.prototype.query = function(a) {
+        h.prototype.query = function(a) {
           if (a < this.startTime || a > this.endTime) {
             return null;
           }
-          var h = this.children;
-          if (h && 0 < h.length) {
-            for (var c, k = 0, m = h.length - 1;m > k;) {
-              var n = (k + m) / 2 | 0;
-              c = h[n];
-              if (a >= c.startTime && a <= c.endTime) {
-                return c.query(a);
-              }
-              a > c.endTime ? k = n + 1 : m = n;
-            }
-            c = h[m];
-            if (a >= c.startTime && a <= c.endTime) {
-              return c.query(a);
+          var d = this.children;
+          if (d && 0 < d.length) {
+            for (var b, f = 0, h = d.length - 1;h > f;) {
+              var m = (f + h) / 2 | 0;
+              b = d[m];
+              if (a >= b.startTime && a <= b.endTime) {
+                return b.query(a);
+              }
+              a > b.endTime ? f = m + 1 : h = m;
+            }
+            b = d[h];
+            if (a >= b.startTime && a <= b.endTime) {
+              return b.query(a);
             }
           }
           return this;
         };
-        m.prototype.queryNext = function(a) {
-          for (var h = this;a > h.endTime;) {
-            if (h.parent) {
-              h = h.parent;
+        h.prototype.queryNext = function(a) {
+          for (var d = this;a > d.endTime;) {
+            if (d.parent) {
+              d = d.parent;
             } else {
               break;
             }
           }
-          return h.query(a);
+          return d.query(a);
         };
-        m.prototype.getDepth = function() {
-          for (var a = 0, h = this;h;) {
-            a++, h = h.parent;
+        h.prototype.getDepth = function() {
+          for (var a = 0, d = this;d;) {
+            a++, d = d.parent;
           }
           return a;
         };
-        m.prototype.calculateStatistics = function() {
-          function a(p) {
-            if (p.kind) {
-              var k = h[p.kind.id] || (h[p.kind.id] = new c(p.kind));
-              k.count++;
-              k.selfTime += p.selfTime;
-              k.totalTime += p.totalTime;
+        h.prototype.calculateStatistics = function() {
+          function a(n) {
+            if (n.kind) {
+              var f = d[n.kind.id] || (d[n.kind.id] = new b(n.kind));
+              f.count++;
+              f.selfTime += n.selfTime;
+              f.totalTime += n.totalTime;
             }
-            p.children && p.children.forEach(a);
+            n.children && n.children.forEach(a);
           }
-          var h = this.statistics = [];
+          var d = this.statistics = [];
           a(this);
         };
-        m.prototype.trace = function(a) {
-          var h = (this.kind ? this.kind.name + ": " : "Profile: ") + (this.endTime - this.startTime).toFixed(2);
+        h.prototype.trace = function(a) {
+          var d = (this.kind ? this.kind.name + ": " : "Profile: ") + (this.endTime - this.startTime).toFixed(2);
           if (this.children && this.children.length) {
-            a.enter(h);
-            for (h = 0;h < this.children.length;h++) {
-              this.children[h].trace(a);
+            a.enter(d);
+            for (d = 0;d < this.children.length;d++) {
+              this.children[d].trace(a);
             }
             a.outdent();
           } else {
-            a.writeLn(h);
+            a.writeLn(d);
           }
         };
-        return m;
+        return h;
       }();
-      g.TimelineFrame = l;
-      l = function(c) {
+      g.TimelineFrame = k;
+      k = function(b) {
         function a(a) {
-          c.call(this, null, null, null, null, NaN, NaN);
+          b.call(this, null, null, null, null, NaN, NaN);
           this.name = a;
         }
-        __extends(a, c);
+        __extends(a, b);
         return a;
-      }(l);
-      g.TimelineBufferSnapshot = l;
-    })(l.Profiler || (l.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      }(k);
+      g.TimelineBufferSnapshot = k;
+    })(k.Profiler || (k.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = function() {
-        function c(m, a) {
-          void 0 === m && (m = "");
-          this.name = m || "";
-          this._startTime = l.isNullOrUndefined(a) ? jsGlobal.START_TIME : a;
+      var b = function() {
+        function b(h, a) {
+          void 0 === h && (h = "");
+          this.name = h || "";
+          this._startTime = k.isNullOrUndefined(a) ? jsGlobal.START_TIME : a;
         }
-        c.prototype.getKind = function(c) {
-          return this._kinds[c];
+        b.prototype.getKind = function(b) {
+          return this._kinds[b];
         };
-        Object.defineProperty(c.prototype, "kinds", {get:function() {
+        Object.defineProperty(b.prototype, "kinds", {get:function() {
           return this._kinds.concat();
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "depth", {get:function() {
+        Object.defineProperty(b.prototype, "depth", {get:function() {
           return this._depth;
         }, enumerable:!0, configurable:!0});
-        c.prototype._initialize = function() {
+        b.prototype._initialize = function() {
           this._depth = 0;
           this._stack = [];
           this._data = [];
           this._kinds = [];
           this._kindNameMap = Object.create(null);
-          this._marks = new l.CircularBuffer(Int32Array, 20);
-          this._times = new l.CircularBuffer(Float64Array, 20);
+          this._marks = new k.CircularBuffer(Int32Array, 20);
+          this._times = new k.CircularBuffer(Float64Array, 20);
         };
-        c.prototype._getKindId = function(m) {
-          var a = c.MAX_KINDID;
-          if (void 0 === this._kindNameMap[m]) {
-            if (a = this._kinds.length, a < c.MAX_KINDID) {
-              var h = {id:a, name:m, visible:!0};
-              this._kinds.push(h);
-              this._kindNameMap[m] = h;
+        b.prototype._getKindId = function(h) {
+          var a = b.MAX_KINDID;
+          if (void 0 === this._kindNameMap[h]) {
+            if (a = this._kinds.length, a < b.MAX_KINDID) {
+              var d = {id:a, name:h, visible:!0};
+              this._kinds.push(d);
+              this._kindNameMap[h] = d;
             } else {
-              a = c.MAX_KINDID;
+              a = b.MAX_KINDID;
             }
           } else {
-            a = this._kindNameMap[m].id;
+            a = this._kindNameMap[h].id;
           }
           return a;
         };
-        c.prototype._getMark = function(m, a, h) {
-          var p = c.MAX_DATAID;
-          l.isNullOrUndefined(h) || a === c.MAX_KINDID || (p = this._data.length, p < c.MAX_DATAID ? this._data.push(h) : p = c.MAX_DATAID);
-          return m | p << 16 | a;
+        b.prototype._getMark = function(h, a, d) {
+          var n = b.MAX_DATAID;
+          k.isNullOrUndefined(d) || a === b.MAX_KINDID || (n = this._data.length, n < b.MAX_DATAID ? this._data.push(d) : n = b.MAX_DATAID);
+          return h | n << 16 | a;
         };
-        c.prototype.enter = function(m, a, h) {
-          h = (l.isNullOrUndefined(h) ? performance.now() : h) - this._startTime;
+        b.prototype.enter = function(h, a, d) {
+          d = (k.isNullOrUndefined(d) ? performance.now() : d) - this._startTime;
           this._marks || this._initialize();
           this._depth++;
-          m = this._getKindId(m);
-          this._marks.write(this._getMark(c.ENTER, m, a));
-          this._times.write(h);
-          this._stack.push(m);
-        };
-        c.prototype.leave = function(m, a, h) {
-          h = (l.isNullOrUndefined(h) ? performance.now() : h) - this._startTime;
-          var p = this._stack.pop();
-          m && (p = this._getKindId(m));
-          this._marks.write(this._getMark(c.LEAVE, p, a));
-          this._times.write(h);
+          h = this._getKindId(h);
+          this._marks.write(this._getMark(b.ENTER, h, a));
+          this._times.write(d);
+          this._stack.push(h);
+        };
+        b.prototype.leave = function(h, a, d) {
+          d = (k.isNullOrUndefined(d) ? performance.now() : d) - this._startTime;
+          var n = this._stack.pop();
+          h && (n = this._getKindId(h));
+          this._marks.write(this._getMark(b.LEAVE, n, a));
+          this._times.write(d);
           this._depth--;
         };
-        c.prototype.count = function(c, a, h) {
+        b.prototype.count = function(b, a, d) {
         };
-        c.prototype.createSnapshot = function() {
-          var m;
-          void 0 === m && (m = Number.MAX_VALUE);
+        b.prototype.createSnapshot = function() {
+          var h;
+          void 0 === h && (h = Number.MAX_VALUE);
           if (!this._marks) {
             return null;
           }
-          var a = this._times, h = this._kinds, p = this._data, k = new g.TimelineBufferSnapshot(this.name), u = [k], n = 0;
+          var a = this._times, d = this._kinds, n = this._data, f = new g.TimelineBufferSnapshot(this.name), v = [f], m = 0;
           this._marks || this._initialize();
-          this._marks.forEachInReverse(function(k, v) {
-            var d = p[k >>> 16 & c.MAX_DATAID], e = h[k & c.MAX_KINDID];
-            if (l.isNullOrUndefined(e) || e.visible) {
-              var b = k & 2147483648, f = a.get(v), q = u.length;
-              if (b === c.LEAVE) {
-                if (1 === q && (n++, n > m)) {
+          this._marks.forEachInReverse(function(f, w) {
+            var p = n[f >>> 16 & b.MAX_DATAID], l = d[f & b.MAX_KINDID];
+            if (k.isNullOrUndefined(l) || l.visible) {
+              var c = f & 2147483648, e = a.get(w), q = v.length;
+              if (c === b.LEAVE) {
+                if (1 === q && (m++, m > h)) {
                   return!0;
                 }
-                u.push(new g.TimelineFrame(u[q - 1], e, null, d, NaN, f));
+                v.push(new g.TimelineFrame(v[q - 1], l, null, p, NaN, e));
               } else {
-                if (b === c.ENTER) {
-                  if (e = u.pop(), b = u[u.length - 1]) {
-                    for (b.children ? b.children.unshift(e) : b.children = [e], b = u.length, e.depth = b, e.startData = d, e.startTime = f;e;) {
-                      if (e.maxDepth < b) {
-                        e.maxDepth = b, e = e.parent;
+                if (c === b.ENTER) {
+                  if (l = v.pop(), c = v[v.length - 1]) {
+                    for (c.children ? c.children.unshift(l) : c.children = [l], c = v.length, l.depth = c, l.startData = p, l.startTime = e;l;) {
+                      if (l.maxDepth < c) {
+                        l.maxDepth = c, l = l.parent;
                       } else {
                         break;
                       }
@@ -5189,87 +5199,87 @@
               }
             }
           });
-          k.children && k.children.length && (k.startTime = k.children[0].startTime, k.endTime = k.children[k.children.length - 1].endTime);
-          return k;
+          f.children && f.children.length && (f.startTime = f.children[0].startTime, f.endTime = f.children[f.children.length - 1].endTime);
+          return f;
         };
-        c.prototype.reset = function(c) {
-          this._startTime = l.isNullOrUndefined(c) ? performance.now() : c;
+        b.prototype.reset = function(b) {
+          this._startTime = k.isNullOrUndefined(b) ? performance.now() : b;
           this._marks ? (this._depth = 0, this._data = [], this._marks.reset(), this._times.reset()) : this._initialize();
         };
-        c.FromFirefoxProfile = function(m, a) {
-          for (var h = m.profile.threads[0].samples, p = new c(a, h[0].time), k = [], g, n = 0;n < h.length;n++) {
-            g = h[n];
-            var s = g.time, l = g.frames, d = 0;
-            for (g = Math.min(l.length, k.length);d < g && l[d].location === k[d].location;) {
-              d++;
+        b.FromFirefoxProfile = function(h, a) {
+          for (var d = h.profile.threads[0].samples, n = new b(a, d[0].time), f = [], g, m = 0;m < d.length;m++) {
+            g = d[m];
+            var r = g.time, k = g.frames, p = 0;
+            for (g = Math.min(k.length, f.length);p < g && k[p].location === f[p].location;) {
+              p++;
             }
-            for (var e = k.length - d, b = 0;b < e;b++) {
-              g = k.pop(), p.leave(g.location, null, s);
+            for (var l = f.length - p, c = 0;c < l;c++) {
+              g = f.pop(), n.leave(g.location, null, r);
             }
-            for (;d < l.length;) {
-              g = l[d++], p.enter(g.location, null, s);
+            for (;p < k.length;) {
+              g = k[p++], n.enter(g.location, null, r);
             }
-            k = l;
+            f = k;
           }
-          for (;g = k.pop();) {
-            p.leave(g.location, null, s);
+          for (;g = f.pop();) {
+            n.leave(g.location, null, r);
           }
-          return p;
+          return n;
         };
-        c.FromChromeProfile = function(m, a) {
-          var h = m.timestamps, p = m.samples, k = new c(a, h[0] / 1E3), g = [], n = {}, s;
-          c._resolveIds(m.head, n);
-          for (var l = 0;l < h.length;l++) {
-            var d = h[l] / 1E3, e = [];
-            for (s = n[p[l]];s;) {
-              e.unshift(s), s = s.parent;
+        b.FromChromeProfile = function(h, a) {
+          var d = h.timestamps, n = h.samples, f = new b(a, d[0] / 1E3), g = [], m = {}, r;
+          b._resolveIds(h.head, m);
+          for (var k = 0;k < d.length;k++) {
+            var p = d[k] / 1E3, l = [];
+            for (r = m[n[k]];r;) {
+              l.unshift(r), r = r.parent;
             }
-            var b = 0;
-            for (s = Math.min(e.length, g.length);b < s && e[b] === g[b];) {
-              b++;
+            var c = 0;
+            for (r = Math.min(l.length, g.length);c < r && l[c] === g[c];) {
+              c++;
             }
-            for (var f = g.length - b, q = 0;q < f;q++) {
-              s = g.pop(), k.leave(s.functionName, null, d);
+            for (var e = g.length - c, q = 0;q < e;q++) {
+              r = g.pop(), f.leave(r.functionName, null, p);
             }
-            for (;b < e.length;) {
-              s = e[b++], k.enter(s.functionName, null, d);
+            for (;c < l.length;) {
+              r = l[c++], f.enter(r.functionName, null, p);
             }
-            g = e;
+            g = l;
           }
-          for (;s = g.pop();) {
-            k.leave(s.functionName, null, d);
+          for (;r = g.pop();) {
+            f.leave(r.functionName, null, p);
           }
-          return k;
+          return f;
         };
-        c._resolveIds = function(m, a) {
-          a[m.id] = m;
-          if (m.children) {
-            for (var h = 0;h < m.children.length;h++) {
-              m.children[h].parent = m, c._resolveIds(m.children[h], a);
+        b._resolveIds = function(h, a) {
+          a[h.id] = h;
+          if (h.children) {
+            for (var d = 0;d < h.children.length;d++) {
+              h.children[d].parent = h, b._resolveIds(h.children[d], a);
             }
           }
         };
-        c.ENTER = 0;
-        c.LEAVE = -2147483648;
-        c.MAX_KINDID = 65535;
-        c.MAX_DATAID = 32767;
-        return c;
+        b.ENTER = 0;
+        b.LEAVE = -2147483648;
+        b.MAX_KINDID = 65535;
+        b.MAX_DATAID = 32767;
+        return b;
       }();
-      g.TimelineBuffer = c;
-    })(r.Profiler || (r.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.TimelineBuffer = b;
+    })(p.Profiler || (p.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      (function(c) {
-        c[c.DARK = 0] = "DARK";
-        c[c.LIGHT = 1] = "LIGHT";
+      (function(b) {
+        b[b.DARK = 0] = "DARK";
+        b[b.LIGHT = 1] = "LIGHT";
       })(g.UIThemeType || (g.UIThemeType = {}));
-      var c = function() {
-        function c(m, a) {
+      var b = function() {
+        function b(h, a) {
           void 0 === a && (a = 0);
-          this._container = m;
+          this._container = h;
           this._headers = [];
           this._charts = [];
           this._profiles = [];
@@ -5277,71 +5287,70 @@
           this.themeType = a;
           this._tooltip = this._createTooltip();
         }
-        c.prototype.createProfile = function(c, a) {
-          void 0 === a && (a = !0);
-          var h = new g.Profile(c);
-          h.createSnapshots();
-          this._profiles.push(h);
-          a && this.activateProfile(h);
-          return h;
+        b.prototype.createProfile = function(b, a) {
+          var d = new g.Profile(b, a);
+          d.createSnapshots();
+          this._profiles.push(d);
+          this.activateProfile(d);
+          return d;
         };
-        c.prototype.activateProfile = function(c) {
+        b.prototype.activateProfile = function(b) {
           this.deactivateProfile();
-          this._activeProfile = c;
+          this._activeProfile = b;
           this._createViews();
           this._initializeViews();
         };
-        c.prototype.activateProfileAt = function(c) {
-          this.activateProfile(this.getProfileAt(c));
+        b.prototype.activateProfileAt = function(b) {
+          this.activateProfile(this.getProfileAt(b));
         };
-        c.prototype.deactivateProfile = function() {
+        b.prototype.deactivateProfile = function() {
           this._activeProfile && (this._destroyViews(), this._activeProfile = null);
         };
-        c.prototype.resize = function() {
+        b.prototype.resize = function() {
           this._onResize();
         };
-        c.prototype.getProfileAt = function(c) {
-          return this._profiles[c];
+        b.prototype.getProfileAt = function(b) {
+          return this._profiles[b];
         };
-        Object.defineProperty(c.prototype, "activeProfile", {get:function() {
+        Object.defineProperty(b.prototype, "activeProfile", {get:function() {
           return this._activeProfile;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "profileCount", {get:function() {
+        Object.defineProperty(b.prototype, "profileCount", {get:function() {
           return this._profiles.length;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "container", {get:function() {
+        Object.defineProperty(b.prototype, "container", {get:function() {
           return this._container;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "themeType", {get:function() {
+        Object.defineProperty(b.prototype, "themeType", {get:function() {
           return this._themeType;
-        }, set:function(c) {
-          switch(c) {
+        }, set:function(b) {
+          switch(b) {
             case 0:
-              this._theme = new r.Theme.UIThemeDark;
+              this._theme = new p.Theme.UIThemeDark;
               break;
             case 1:
-              this._theme = new r.Theme.UIThemeLight;
+              this._theme = new p.Theme.UIThemeLight;
           }
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "theme", {get:function() {
+        Object.defineProperty(b.prototype, "theme", {get:function() {
           return this._theme;
         }, enumerable:!0, configurable:!0});
-        c.prototype.getSnapshotAt = function(c) {
-          return this._activeProfile.getSnapshotAt(c);
+        b.prototype.getSnapshotAt = function(b) {
+          return this._activeProfile.getSnapshotAt(b);
         };
-        c.prototype._createViews = function() {
+        b.prototype._createViews = function() {
           if (this._activeProfile) {
-            var c = this;
+            var b = this;
             this._overviewHeader = new g.FlameChartHeader(this, 0);
             this._overview = new g.FlameChartOverview(this, 0);
-            this._activeProfile.forEachSnapshot(function(a, h) {
-              c._headers.push(new g.FlameChartHeader(c, 1));
-              c._charts.push(new g.FlameChart(c, a));
+            this._activeProfile.forEachSnapshot(function(a, d) {
+              b._headers.push(new g.FlameChartHeader(b, 1));
+              b._charts.push(new g.FlameChart(b, a));
             });
             window.addEventListener("resize", this._onResize.bind(this));
           }
         };
-        c.prototype._destroyViews = function() {
+        b.prototype._destroyViews = function() {
           if (this._activeProfile) {
             this._overviewHeader.destroy();
             for (this._overview.destroy();this._headers.length;) {
@@ -5353,116 +5362,116 @@
             window.removeEventListener("resize", this._onResize.bind(this));
           }
         };
-        c.prototype._initializeViews = function() {
+        b.prototype._initializeViews = function() {
           if (this._activeProfile) {
-            var c = this, a = this._activeProfile.startTime, h = this._activeProfile.endTime;
-            this._overviewHeader.initialize(a, h);
-            this._overview.initialize(a, h);
-            this._activeProfile.forEachSnapshot(function(p, k) {
-              c._headers[k].initialize(a, h);
-              c._charts[k].initialize(a, h);
+            var b = this, a = this._activeProfile.startTime, d = this._activeProfile.endTime;
+            this._overviewHeader.initialize(a, d);
+            this._overview.initialize(a, d);
+            this._activeProfile.forEachSnapshot(function(n, f) {
+              b._headers[f].initialize(a, d);
+              b._charts[f].initialize(a, d);
             });
           }
         };
-        c.prototype._onResize = function() {
+        b.prototype._onResize = function() {
           if (this._activeProfile) {
-            var c = this, a = this._container.offsetWidth;
+            var b = this, a = this._container.offsetWidth;
             this._overviewHeader.setSize(a);
             this._overview.setSize(a);
-            this._activeProfile.forEachSnapshot(function(h, p) {
-              c._headers[p].setSize(a);
-              c._charts[p].setSize(a);
+            this._activeProfile.forEachSnapshot(function(d, n) {
+              b._headers[n].setSize(a);
+              b._charts[n].setSize(a);
             });
           }
         };
-        c.prototype._updateViews = function() {
+        b.prototype._updateViews = function() {
           if (this._activeProfile) {
-            var c = this, a = this._activeProfile.windowStart, h = this._activeProfile.windowEnd;
-            this._overviewHeader.setWindow(a, h);
-            this._overview.setWindow(a, h);
-            this._activeProfile.forEachSnapshot(function(p, k) {
-              c._headers[k].setWindow(a, h);
-              c._charts[k].setWindow(a, h);
+            var b = this, a = this._activeProfile.windowStart, d = this._activeProfile.windowEnd;
+            this._overviewHeader.setWindow(a, d);
+            this._overview.setWindow(a, d);
+            this._activeProfile.forEachSnapshot(function(n, f) {
+              b._headers[f].setWindow(a, d);
+              b._charts[f].setWindow(a, d);
             });
           }
         };
-        c.prototype._drawViews = function() {
-        };
-        c.prototype._createTooltip = function() {
-          var c = document.createElement("div");
-          c.classList.add("profiler-tooltip");
-          c.style.display = "none";
-          this._container.insertBefore(c, this._container.firstChild);
-          return c;
+        b.prototype._drawViews = function() {
         };
-        c.prototype.setWindow = function(c, a) {
-          this._activeProfile.setWindow(c, a);
+        b.prototype._createTooltip = function() {
+          var b = document.createElement("div");
+          b.classList.add("profiler-tooltip");
+          b.style.display = "none";
+          this._container.insertBefore(b, this._container.firstChild);
+          return b;
+        };
+        b.prototype.setWindow = function(b, a) {
+          this._activeProfile.setWindow(b, a);
           this._updateViews();
         };
-        c.prototype.moveWindowTo = function(c) {
-          this._activeProfile.moveWindowTo(c);
+        b.prototype.moveWindowTo = function(b) {
+          this._activeProfile.moveWindowTo(b);
           this._updateViews();
         };
-        c.prototype.showTooltip = function(c, a, h, p) {
+        b.prototype.showTooltip = function(b, a, d, n) {
           this.removeTooltipContent();
-          this._tooltip.appendChild(this.createTooltipContent(c, a));
+          this._tooltip.appendChild(this.createTooltipContent(b, a));
           this._tooltip.style.display = "block";
-          var k = this._tooltip.firstChild;
-          a = k.clientWidth;
-          k = k.clientHeight;
-          h += h + a >= c.canvas.clientWidth - 50 ? -(a + 20) : 25;
-          p += c.canvas.offsetTop - k / 2;
-          this._tooltip.style.left = h + "px";
-          this._tooltip.style.top = p + "px";
+          var f = this._tooltip.firstChild;
+          a = f.clientWidth;
+          f = f.clientHeight;
+          d += d + a >= b.canvas.clientWidth - 50 ? -(a + 20) : 25;
+          n += b.canvas.offsetTop - f / 2;
+          this._tooltip.style.left = d + "px";
+          this._tooltip.style.top = n + "px";
         };
-        c.prototype.hideTooltip = function() {
+        b.prototype.hideTooltip = function() {
           this._tooltip.style.display = "none";
         };
-        c.prototype.createTooltipContent = function(c, a) {
-          var h = Math.round(1E5 * a.totalTime) / 1E5, p = Math.round(1E5 * a.selfTime) / 1E5, k = Math.round(1E4 * a.selfTime / a.totalTime) / 100, g = document.createElement("div"), n = document.createElement("h1");
-          n.textContent = a.kind.name;
-          g.appendChild(n);
-          n = document.createElement("p");
-          n.textContent = "Total: " + h + " ms";
-          g.appendChild(n);
-          h = document.createElement("p");
-          h.textContent = "Self: " + p + " ms (" + k + "%)";
-          g.appendChild(h);
-          if (p = c.getStatistics(a.kind)) {
-            k = document.createElement("p"), k.textContent = "Count: " + p.count, g.appendChild(k), k = Math.round(1E5 * p.totalTime) / 1E5, h = document.createElement("p"), h.textContent = "All Total: " + k + " ms", g.appendChild(h), p = Math.round(1E5 * p.selfTime) / 1E5, k = document.createElement("p"), k.textContent = "All Self: " + p + " ms", g.appendChild(k);
+        b.prototype.createTooltipContent = function(b, a) {
+          var d = Math.round(1E5 * a.totalTime) / 1E5, n = Math.round(1E5 * a.selfTime) / 1E5, f = Math.round(1E4 * a.selfTime / a.totalTime) / 100, g = document.createElement("div"), m = document.createElement("h1");
+          m.textContent = a.kind.name;
+          g.appendChild(m);
+          m = document.createElement("p");
+          m.textContent = "Total: " + d + " ms";
+          g.appendChild(m);
+          d = document.createElement("p");
+          d.textContent = "Self: " + n + " ms (" + f + "%)";
+          g.appendChild(d);
+          if (n = b.getStatistics(a.kind)) {
+            f = document.createElement("p"), f.textContent = "Count: " + n.count, g.appendChild(f), f = Math.round(1E5 * n.totalTime) / 1E5, d = document.createElement("p"), d.textContent = "All Total: " + f + " ms", g.appendChild(d), n = Math.round(1E5 * n.selfTime) / 1E5, f = document.createElement("p"), f.textContent = "All Self: " + n + " ms", g.appendChild(f);
           }
           this.appendDataElements(g, a.startData);
           this.appendDataElements(g, a.endData);
           return g;
         };
-        c.prototype.appendDataElements = function(c, a) {
-          if (!l.isNullOrUndefined(a)) {
-            c.appendChild(document.createElement("hr"));
-            var h;
-            if (l.isObject(a)) {
-              for (var p in a) {
-                h = document.createElement("p"), h.textContent = p + ": " + a[p], c.appendChild(h);
+        b.prototype.appendDataElements = function(b, a) {
+          if (!k.isNullOrUndefined(a)) {
+            b.appendChild(document.createElement("hr"));
+            var d;
+            if (k.isObject(a)) {
+              for (var n in a) {
+                d = document.createElement("p"), d.textContent = n + ": " + a[n], b.appendChild(d);
               }
             } else {
-              h = document.createElement("p"), h.textContent = a.toString(), c.appendChild(h);
+              d = document.createElement("p"), d.textContent = a.toString(), b.appendChild(d);
             }
           }
         };
-        c.prototype.removeTooltipContent = function() {
-          for (var c = this._tooltip;c.firstChild;) {
-            c.removeChild(c.firstChild);
+        b.prototype.removeTooltipContent = function() {
+          for (var b = this._tooltip;b.firstChild;) {
+            b.removeChild(b.firstChild);
           }
         };
-        return c;
+        return b;
       }();
-      g.Controller = c;
-    })(r.Profiler || (r.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.Controller = b;
+    })(p.Profiler || (p.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.NumberUtilities.clamp, r = function() {
+      var b = k.NumberUtilities.clamp, p = function() {
         function a(a) {
           this.value = a;
         }
@@ -5505,11 +5514,11 @@
         a.GRABBING = new a("grabbing");
         return a;
       }();
-      g.MouseCursor = r;
-      var m = function() {
-        function a(a, c) {
+      g.MouseCursor = p;
+      var h = function() {
+        function a(a, b) {
           this._target = a;
-          this._eventTarget = c;
+          this._eventTarget = b;
           this._wheelDisabled = !1;
           this._boundOnMouseDown = this._onMouseDown.bind(this);
           this._boundOnMouseUp = this._onMouseUp.bind(this);
@@ -5518,10 +5527,10 @@
           this._boundOnMouseMove = this._onMouseMove.bind(this);
           this._boundOnMouseWheel = this._onMouseWheel.bind(this);
           this._boundOnDrag = this._onDrag.bind(this);
-          c.addEventListener("mousedown", this._boundOnMouseDown, !1);
-          c.addEventListener("mouseover", this._boundOnMouseOver, !1);
-          c.addEventListener("mouseout", this._boundOnMouseOut, !1);
-          c.addEventListener("onwheel" in document ? "wheel" : "mousewheel", this._boundOnMouseWheel, !1);
+          b.addEventListener("mousedown", this._boundOnMouseDown, !1);
+          b.addEventListener("mouseover", this._boundOnMouseOver, !1);
+          b.addEventListener("mouseout", this._boundOnMouseOut, !1);
+          b.addEventListener("onwheel" in document ? "wheel" : "mousewheel", this._boundOnMouseWheel, !1);
         }
         a.prototype.destroy = function() {
           var a = this._eventTarget;
@@ -5534,38 +5543,38 @@
           this._killHoverCheck();
           this._target = this._eventTarget = null;
         };
-        a.prototype.updateCursor = function(c) {
+        a.prototype.updateCursor = function(d) {
           if (!a._cursorOwner || a._cursorOwner === this._target) {
-            var p = this._eventTarget.parentElement;
-            a._cursor !== c && (a._cursor = c, ["", "-moz-", "-webkit-"].forEach(function(a) {
-              p.style.cursor = a + c;
+            var b = this._eventTarget.parentElement;
+            a._cursor !== d && (a._cursor = d, ["", "-moz-", "-webkit-"].forEach(function(a) {
+              b.style.cursor = a + d;
             }));
-            a._cursorOwner = a._cursor === r.DEFAULT ? null : this._target;
+            a._cursorOwner = a._cursor === p.DEFAULT ? null : this._target;
           }
         };
         a.prototype._onMouseDown = function(a) {
           this._killHoverCheck();
           if (0 === a.button) {
-            var c = this._getTargetMousePos(a, a.target);
-            this._dragInfo = {start:c, current:c, delta:{x:0, y:0}, hasMoved:!1, originalTarget:a.target};
+            var b = this._getTargetMousePos(a, a.target);
+            this._dragInfo = {start:b, current:b, delta:{x:0, y:0}, hasMoved:!1, originalTarget:a.target};
             window.addEventListener("mousemove", this._boundOnDrag, !1);
             window.addEventListener("mouseup", this._boundOnMouseUp, !1);
-            this._target.onMouseDown(c.x, c.y);
+            this._target.onMouseDown(b.x, b.y);
           }
         };
         a.prototype._onDrag = function(a) {
-          var c = this._dragInfo;
-          a = this._getTargetMousePos(a, c.originalTarget);
-          var k = {x:a.x - c.start.x, y:a.y - c.start.y};
-          c.current = a;
-          c.delta = k;
-          c.hasMoved = !0;
-          this._target.onDrag(c.start.x, c.start.y, a.x, a.y, k.x, k.y);
+          var b = this._dragInfo;
+          a = this._getTargetMousePos(a, b.originalTarget);
+          var f = {x:a.x - b.start.x, y:a.y - b.start.y};
+          b.current = a;
+          b.delta = f;
+          b.hasMoved = !0;
+          this._target.onDrag(b.start.x, b.start.y, a.x, a.y, f.x, f.y);
         };
         a.prototype._onMouseUp = function(a) {
           window.removeEventListener("mousemove", this._boundOnDrag);
           window.removeEventListener("mouseup", this._boundOnMouseUp);
-          var c = this;
+          var b = this;
           a = this._dragInfo;
           if (a.hasMoved) {
             this._target.onDragEnd(a.start.x, a.start.y, a.current.x, a.current.y, a.delta.x, a.delta.y);
@@ -5575,14 +5584,14 @@
           this._dragInfo = null;
           this._wheelDisabled = !0;
           setTimeout(function() {
-            c._wheelDisabled = !1;
+            b._wheelDisabled = !1;
           }, 500);
         };
         a.prototype._onMouseOver = function(a) {
           a.target.addEventListener("mousemove", this._boundOnMouseMove, !1);
           if (!this._dragInfo) {
-            var c = this._getTargetMousePos(a, a.target);
-            this._target.onMouseOver(c.x, c.y);
+            var b = this._getTargetMousePos(a, a.target);
+            this._target.onMouseOver(b.x, b.y);
             this._startHoverCheck(a);
           }
         };
@@ -5595,21 +5604,21 @@
         };
         a.prototype._onMouseMove = function(a) {
           if (!this._dragInfo) {
-            var c = this._getTargetMousePos(a, a.target);
-            this._target.onMouseMove(c.x, c.y);
+            var b = this._getTargetMousePos(a, a.target);
+            this._target.onMouseMove(b.x, b.y);
             this._killHoverCheck();
             this._startHoverCheck(a);
           }
         };
         a.prototype._onMouseWheel = function(a) {
           if (!(a.altKey || a.metaKey || a.ctrlKey || a.shiftKey || (a.preventDefault(), this._dragInfo || this._wheelDisabled))) {
-            var p = this._getTargetMousePos(a, a.target);
-            a = c("undefined" !== typeof a.deltaY ? a.deltaY / 16 : -a.wheelDelta / 40, -1, 1);
-            this._target.onMouseWheel(p.x, p.y, Math.pow(1.2, a) - 1);
+            var n = this._getTargetMousePos(a, a.target);
+            a = b("undefined" !== typeof a.deltaY ? a.deltaY / 16 : -a.wheelDelta / 40, -1, 1);
+            this._target.onMouseWheel(n.x, n.y, Math.pow(1.2, a) - 1);
           }
         };
-        a.prototype._startHoverCheck = function(c) {
-          this._hoverInfo = {isHovering:!1, timeoutHandle:setTimeout(this._onMouseMoveIdleHandler.bind(this), a.HOVER_TIMEOUT), pos:this._getTargetMousePos(c, c.target)};
+        a.prototype._startHoverCheck = function(d) {
+          this._hoverInfo = {isHovering:!1, timeoutHandle:setTimeout(this._onMouseMoveIdleHandler.bind(this), a.HOVER_TIMEOUT), pos:this._getTargetMousePos(d, d.target)};
         };
         a.prototype._killHoverCheck = function() {
           if (this._hoverInfo) {
@@ -5625,219 +5634,219 @@
           a.isHovering = !0;
           this._target.onHoverStart(a.pos.x, a.pos.y);
         };
-        a.prototype._getTargetMousePos = function(a, c) {
-          var k = c.getBoundingClientRect();
-          return{x:a.clientX - k.left, y:a.clientY - k.top};
+        a.prototype._getTargetMousePos = function(a, b) {
+          var f = b.getBoundingClientRect();
+          return{x:a.clientX - f.left, y:a.clientY - f.top};
         };
         a.HOVER_TIMEOUT = 500;
-        a._cursor = r.DEFAULT;
+        a._cursor = p.DEFAULT;
         return a;
       }();
-      g.MouseController = m;
-    })(r.Profiler || (r.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.MouseController = h;
+    })(p.Profiler || (p.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      (function(c) {
-        c[c.NONE = 0] = "NONE";
-        c[c.WINDOW = 1] = "WINDOW";
-        c[c.HANDLE_LEFT = 2] = "HANDLE_LEFT";
-        c[c.HANDLE_RIGHT = 3] = "HANDLE_RIGHT";
-        c[c.HANDLE_BOTH = 4] = "HANDLE_BOTH";
+      (function(b) {
+        b[b.NONE = 0] = "NONE";
+        b[b.WINDOW = 1] = "WINDOW";
+        b[b.HANDLE_LEFT = 2] = "HANDLE_LEFT";
+        b[b.HANDLE_RIGHT = 3] = "HANDLE_RIGHT";
+        b[b.HANDLE_BOTH = 4] = "HANDLE_BOTH";
       })(g.FlameChartDragTarget || (g.FlameChartDragTarget = {}));
-      var c = function() {
-        function c(m) {
-          this._controller = m;
+      var b = function() {
+        function b(h) {
+          this._controller = h;
           this._initialized = !1;
           this._canvas = document.createElement("canvas");
           this._context = this._canvas.getContext("2d");
           this._mouseController = new g.MouseController(this, this._canvas);
-          m = m.container;
-          m.appendChild(this._canvas);
-          m = m.getBoundingClientRect();
-          this.setSize(m.width);
+          h = h.container;
+          h.appendChild(this._canvas);
+          h = h.getBoundingClientRect();
+          this.setSize(h.width);
         }
-        Object.defineProperty(c.prototype, "canvas", {get:function() {
+        Object.defineProperty(b.prototype, "canvas", {get:function() {
           return this._canvas;
         }, enumerable:!0, configurable:!0});
-        c.prototype.setSize = function(c, a) {
+        b.prototype.setSize = function(b, a) {
           void 0 === a && (a = 20);
-          this._width = c;
+          this._width = b;
           this._height = a;
           this._resetCanvas();
           this.draw();
         };
-        c.prototype.initialize = function(c, a) {
+        b.prototype.initialize = function(b, a) {
           this._initialized = !0;
-          this.setRange(c, a);
-          this.setWindow(c, a, !1);
+          this.setRange(b, a);
+          this.setWindow(b, a, !1);
           this.draw();
         };
-        c.prototype.setWindow = function(c, a, h) {
-          void 0 === h && (h = !0);
-          this._windowStart = c;
+        b.prototype.setWindow = function(b, a, d) {
+          void 0 === d && (d = !0);
+          this._windowStart = b;
           this._windowEnd = a;
-          !h || this.draw();
+          !d || this.draw();
         };
-        c.prototype.setRange = function(c, a) {
-          var h = !1;
-          void 0 === h && (h = !0);
-          this._rangeStart = c;
+        b.prototype.setRange = function(b, a) {
+          var d = !1;
+          void 0 === d && (d = !0);
+          this._rangeStart = b;
           this._rangeEnd = a;
-          !h || this.draw();
+          !d || this.draw();
         };
-        c.prototype.destroy = function() {
+        b.prototype.destroy = function() {
           this._mouseController.destroy();
           this._mouseController = null;
           this._controller.container.removeChild(this._canvas);
           this._controller = null;
         };
-        c.prototype._resetCanvas = function() {
-          var c = window.devicePixelRatio, a = this._canvas;
-          a.width = this._width * c;
-          a.height = this._height * c;
+        b.prototype._resetCanvas = function() {
+          var b = window.devicePixelRatio, a = this._canvas;
+          a.width = this._width * b;
+          a.height = this._height * b;
           a.style.width = this._width + "px";
           a.style.height = this._height + "px";
         };
-        c.prototype.draw = function() {
+        b.prototype.draw = function() {
         };
-        c.prototype._almostEq = function(c, a) {
-          var h;
-          void 0 === h && (h = 10);
-          return Math.abs(c - a) < 1 / Math.pow(10, h);
+        b.prototype._almostEq = function(b, a) {
+          var d;
+          void 0 === d && (d = 10);
+          return Math.abs(b - a) < 1 / Math.pow(10, d);
         };
-        c.prototype._windowEqRange = function() {
+        b.prototype._windowEqRange = function() {
           return this._almostEq(this._windowStart, this._rangeStart) && this._almostEq(this._windowEnd, this._rangeEnd);
         };
-        c.prototype._decimalPlaces = function(c) {
-          return(+c).toFixed(10).replace(/^-?\d*\.?|0+$/g, "").length;
+        b.prototype._decimalPlaces = function(b) {
+          return(+b).toFixed(10).replace(/^-?\d*\.?|0+$/g, "").length;
         };
-        c.prototype._toPixelsRelative = function(c) {
+        b.prototype._toPixelsRelative = function(b) {
           return 0;
         };
-        c.prototype._toPixels = function(c) {
+        b.prototype._toPixels = function(b) {
           return 0;
         };
-        c.prototype._toTimeRelative = function(c) {
+        b.prototype._toTimeRelative = function(b) {
           return 0;
         };
-        c.prototype._toTime = function(c) {
+        b.prototype._toTime = function(b) {
           return 0;
         };
-        c.prototype.onMouseWheel = function(g, a, h) {
-          g = this._toTime(g);
+        b.prototype.onMouseWheel = function(h, a, d) {
+          h = this._toTime(h);
           a = this._windowStart;
-          var p = this._windowEnd, k = p - a;
-          h = Math.max((c.MIN_WINDOW_LEN - k) / k, h);
-          this._controller.setWindow(a + (a - g) * h, p + (p - g) * h);
+          var n = this._windowEnd, f = n - a;
+          d = Math.max((b.MIN_WINDOW_LEN - f) / f, d);
+          this._controller.setWindow(a + (a - h) * d, n + (n - h) * d);
           this.onHoverEnd();
         };
-        c.prototype.onMouseDown = function(c, a) {
+        b.prototype.onMouseDown = function(b, a) {
         };
-        c.prototype.onMouseMove = function(c, a) {
+        b.prototype.onMouseMove = function(b, a) {
         };
-        c.prototype.onMouseOver = function(c, a) {
+        b.prototype.onMouseOver = function(b, a) {
         };
-        c.prototype.onMouseOut = function() {
+        b.prototype.onMouseOut = function() {
         };
-        c.prototype.onDrag = function(c, a, h, p, k, g) {
+        b.prototype.onDrag = function(b, a, d, n, f, g) {
         };
-        c.prototype.onDragEnd = function(c, a, h, p, k, g) {
+        b.prototype.onDragEnd = function(b, a, d, n, f, g) {
         };
-        c.prototype.onClick = function(c, a) {
+        b.prototype.onClick = function(b, a) {
         };
-        c.prototype.onHoverStart = function(c, a) {
+        b.prototype.onHoverStart = function(b, a) {
         };
-        c.prototype.onHoverEnd = function() {
+        b.prototype.onHoverEnd = function() {
         };
-        c.DRAGHANDLE_WIDTH = 4;
-        c.MIN_WINDOW_LEN = .1;
-        return c;
+        b.DRAGHANDLE_WIDTH = 4;
+        b.MIN_WINDOW_LEN = .1;
+        return b;
       }();
-      g.FlameChartBase = c;
-    })(l.Profiler || (l.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.FlameChartBase = b;
+    })(k.Profiler || (k.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.StringUtilities.trimMiddle, r = function(m) {
-        function a(a, c) {
-          m.call(this, a);
+      var b = k.StringUtilities.trimMiddle, p = function(h) {
+        function a(a, b) {
+          h.call(this, a);
           this._textWidth = {};
           this._minFrameWidthInPixels = 1;
-          this._snapshot = c;
+          this._snapshot = b;
           this._kindStyle = Object.create(null);
         }
-        __extends(a, m);
-        a.prototype.setSize = function(a, c) {
-          m.prototype.setSize.call(this, a, c || this._initialized ? 12.5 * this._maxDepth : 100);
+        __extends(a, h);
+        a.prototype.setSize = function(a, b) {
+          h.prototype.setSize.call(this, a, b || this._initialized ? 12.5 * this._maxDepth : 100);
         };
-        a.prototype.initialize = function(a, c) {
+        a.prototype.initialize = function(a, b) {
           this._initialized = !0;
           this._maxDepth = this._snapshot.maxDepth;
-          this.setRange(a, c);
-          this.setWindow(a, c, !1);
+          this.setRange(a, b);
+          this.setWindow(a, b, !1);
           this.setSize(this._width, 12.5 * this._maxDepth);
         };
         a.prototype.destroy = function() {
-          m.prototype.destroy.call(this);
+          h.prototype.destroy.call(this);
           this._snapshot = null;
         };
         a.prototype.draw = function() {
-          var a = this._context, c = window.devicePixelRatio;
-          l.ColorStyle.reset();
+          var a = this._context, b = window.devicePixelRatio;
+          k.ColorStyle.reset();
           a.save();
-          a.scale(c, c);
+          a.scale(b, b);
           a.fillStyle = this._controller.theme.bodyBackground(1);
           a.fillRect(0, 0, this._width, this._height);
           this._initialized && this._drawChildren(this._snapshot);
           a.restore();
         };
-        a.prototype._drawChildren = function(a, c) {
-          void 0 === c && (c = 0);
-          var k = a.getChildRange(this._windowStart, this._windowEnd);
-          if (k) {
-            for (var g = k.startIndex;g <= k.endIndex;g++) {
-              var n = a.children[g];
-              this._drawFrame(n, c) && this._drawChildren(n, c + 1);
+        a.prototype._drawChildren = function(a, b) {
+          void 0 === b && (b = 0);
+          var f = a.getChildRange(this._windowStart, this._windowEnd);
+          if (f) {
+            for (var h = f.startIndex;h <= f.endIndex;h++) {
+              var m = a.children[h];
+              this._drawFrame(m, b) && this._drawChildren(m, b + 1);
             }
           }
         };
-        a.prototype._drawFrame = function(a, c) {
-          var k = this._context, g = this._toPixels(a.startTime), n = this._toPixels(a.endTime), s = n - g;
-          if (s <= this._minFrameWidthInPixels) {
-            return k.fillStyle = this._controller.theme.tabToolbar(1), k.fillRect(g, 12.5 * c, this._minFrameWidthInPixels, 12 + 12.5 * (a.maxDepth - a.depth)), !1;
-          }
-          0 > g && (n = s + g, g = 0);
-          var n = n - g, m = this._kindStyle[a.kind.id];
-          m || (m = l.ColorStyle.randomStyle(), m = this._kindStyle[a.kind.id] = {bgColor:m, textColor:l.ColorStyle.contrastStyle(m)});
-          k.save();
-          k.fillStyle = m.bgColor;
-          k.fillRect(g, 12.5 * c, n, 12);
-          12 < s && (s = a.kind.name) && s.length && (s = this._prepareText(k, s, n - 4), s.length && (k.fillStyle = m.textColor, k.textBaseline = "bottom", k.fillText(s, g + 2, 12.5 * (c + 1) - 1)));
-          k.restore();
+        a.prototype._drawFrame = function(a, b) {
+          var f = this._context, h = this._toPixels(a.startTime), m = this._toPixels(a.endTime), g = m - h;
+          if (g <= this._minFrameWidthInPixels) {
+            return f.fillStyle = this._controller.theme.tabToolbar(1), f.fillRect(h, 12.5 * b, this._minFrameWidthInPixels, 12 + 12.5 * (a.maxDepth - a.depth)), !1;
+          }
+          0 > h && (m = g + h, h = 0);
+          var m = m - h, w = this._kindStyle[a.kind.id];
+          w || (w = k.ColorStyle.randomStyle(), w = this._kindStyle[a.kind.id] = {bgColor:w, textColor:k.ColorStyle.contrastStyle(w)});
+          f.save();
+          f.fillStyle = w.bgColor;
+          f.fillRect(h, 12.5 * b, m, 12);
+          12 < g && (g = a.kind.name) && g.length && (g = this._prepareText(f, g, m - 4), g.length && (f.fillStyle = w.textColor, f.textBaseline = "bottom", f.fillText(g, h + 2, 12.5 * (b + 1) - 1)));
+          f.restore();
           return!0;
         };
-        a.prototype._prepareText = function(a, p, k) {
-          var g = this._measureWidth(a, p);
-          if (k > g) {
-            return p;
-          }
-          for (var g = 3, n = p.length;g < n;) {
-            var m = g + n >> 1;
-            this._measureWidth(a, c(p, m)) < k ? g = m + 1 : n = m;
-          }
-          p = c(p, n - 1);
-          g = this._measureWidth(a, p);
-          return g <= k ? p : "";
-        };
-        a.prototype._measureWidth = function(a, c) {
-          var k = this._textWidth[c];
-          k || (k = a.measureText(c).width, this._textWidth[c] = k);
-          return k;
+        a.prototype._prepareText = function(a, n, f) {
+          var h = this._measureWidth(a, n);
+          if (f > h) {
+            return n;
+          }
+          for (var h = 3, m = n.length;h < m;) {
+            var g = h + m >> 1;
+            this._measureWidth(a, b(n, g)) < f ? h = g + 1 : m = g;
+          }
+          n = b(n, m - 1);
+          h = this._measureWidth(a, n);
+          return h <= f ? n : "";
+        };
+        a.prototype._measureWidth = function(a, b) {
+          var f = this._textWidth[b];
+          f || (f = a.measureText(b).width, this._textWidth[b] = f);
+          return f;
         };
         a.prototype._toPixelsRelative = function(a) {
           return a * this._width / (this._windowEnd - this._windowStart);
@@ -5851,143 +5860,143 @@
         a.prototype._toTime = function(a) {
           return this._toTimeRelative(a) + this._windowStart;
         };
-        a.prototype._getFrameAtPosition = function(a, c) {
-          var k = 1 + c / 12.5 | 0, g = this._snapshot.query(this._toTime(a));
-          if (g && g.depth >= k) {
-            for (;g && g.depth > k;) {
-              g = g.parent;
+        a.prototype._getFrameAtPosition = function(a, b) {
+          var f = 1 + b / 12.5 | 0, h = this._snapshot.query(this._toTime(a));
+          if (h && h.depth >= f) {
+            for (;h && h.depth > f;) {
+              h = h.parent;
             }
-            return g;
+            return h;
           }
           return null;
         };
-        a.prototype.onMouseDown = function(a, c) {
+        a.prototype.onMouseDown = function(a, b) {
           this._windowEqRange() || (this._mouseController.updateCursor(g.MouseCursor.ALL_SCROLL), this._dragInfo = {windowStartInitial:this._windowStart, windowEndInitial:this._windowEnd, target:1});
         };
-        a.prototype.onMouseMove = function(a, c) {
+        a.prototype.onMouseMove = function(a, b) {
         };
-        a.prototype.onMouseOver = function(a, c) {
+        a.prototype.onMouseOver = function(a, b) {
         };
         a.prototype.onMouseOut = function() {
         };
-        a.prototype.onDrag = function(a, c, k, g, n, m) {
+        a.prototype.onDrag = function(a, b, f, h, m, g) {
           if (a = this._dragInfo) {
-            n = this._toTimeRelative(-n), this._controller.setWindow(a.windowStartInitial + n, a.windowEndInitial + n);
+            m = this._toTimeRelative(-m), this._controller.setWindow(a.windowStartInitial + m, a.windowEndInitial + m);
           }
         };
-        a.prototype.onDragEnd = function(a, c, k, m, n, s) {
+        a.prototype.onDragEnd = function(a, b, f, h, m, r) {
           this._dragInfo = null;
           this._mouseController.updateCursor(g.MouseCursor.DEFAULT);
         };
-        a.prototype.onClick = function(a, c) {
+        a.prototype.onClick = function(a, b) {
           this._dragInfo = null;
           this._mouseController.updateCursor(g.MouseCursor.DEFAULT);
         };
-        a.prototype.onHoverStart = function(a, c) {
-          var k = this._getFrameAtPosition(a, c);
-          k && (this._hoveredFrame = k, this._controller.showTooltip(this, k, a, c));
+        a.prototype.onHoverStart = function(a, b) {
+          var f = this._getFrameAtPosition(a, b);
+          f && (this._hoveredFrame = f, this._controller.showTooltip(this, f, a, b));
         };
         a.prototype.onHoverEnd = function() {
           this._hoveredFrame && (this._hoveredFrame = null, this._controller.hideTooltip());
         };
         a.prototype.getStatistics = function(a) {
-          var c = this._snapshot;
-          c.statistics || c.calculateStatistics();
-          return c.statistics[a.id];
+          var b = this._snapshot;
+          b.statistics || b.calculateStatistics();
+          return b.statistics[a.id];
         };
         return a;
       }(g.FlameChartBase);
-      g.FlameChart = r;
-    })(r.Profiler || (r.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.FlameChart = p;
+    })(p.Profiler || (p.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.NumberUtilities.clamp;
-      (function(c) {
-        c[c.OVERLAY = 0] = "OVERLAY";
-        c[c.STACK = 1] = "STACK";
-        c[c.UNION = 2] = "UNION";
+      var b = k.NumberUtilities.clamp;
+      (function(b) {
+        b[b.OVERLAY = 0] = "OVERLAY";
+        b[b.STACK = 1] = "STACK";
+        b[b.UNION = 2] = "UNION";
       })(g.FlameChartOverviewMode || (g.FlameChartOverviewMode = {}));
-      var r = function(m) {
-        function a(a, c) {
-          void 0 === c && (c = 1);
-          this._mode = c;
+      var p = function(h) {
+        function a(a, b) {
+          void 0 === b && (b = 1);
+          this._mode = b;
           this._overviewCanvasDirty = !0;
           this._overviewCanvas = document.createElement("canvas");
           this._overviewContext = this._overviewCanvas.getContext("2d");
-          m.call(this, a);
+          h.call(this, a);
         }
-        __extends(a, m);
-        a.prototype.setSize = function(a, c) {
-          m.prototype.setSize.call(this, a, c || 64);
+        __extends(a, h);
+        a.prototype.setSize = function(a, b) {
+          h.prototype.setSize.call(this, a, b || 64);
         };
         Object.defineProperty(a.prototype, "mode", {set:function(a) {
           this._mode = a;
           this.draw();
         }, enumerable:!0, configurable:!0});
         a.prototype._resetCanvas = function() {
-          m.prototype._resetCanvas.call(this);
+          h.prototype._resetCanvas.call(this);
           this._overviewCanvas.width = this._canvas.width;
           this._overviewCanvas.height = this._canvas.height;
           this._overviewCanvasDirty = !0;
         };
         a.prototype.draw = function() {
-          var a = this._context, c = window.devicePixelRatio, k = this._width, g = this._height;
+          var a = this._context, b = window.devicePixelRatio, f = this._width, h = this._height;
           a.save();
-          a.scale(c, c);
+          a.scale(b, b);
           a.fillStyle = this._controller.theme.bodyBackground(1);
-          a.fillRect(0, 0, k, g);
+          a.fillRect(0, 0, f, h);
           a.restore();
           this._initialized && (this._overviewCanvasDirty && (this._drawChart(), this._overviewCanvasDirty = !1), a.drawImage(this._overviewCanvas, 0, 0), this._drawSelection());
         };
         a.prototype._drawSelection = function() {
-          var a = this._context, c = this._height, k = window.devicePixelRatio, g = this._selection ? this._selection.left : this._toPixels(this._windowStart), n = this._selection ? this._selection.right : this._toPixels(this._windowEnd), m = this._controller.theme;
+          var a = this._context, b = this._height, f = window.devicePixelRatio, h = this._selection ? this._selection.left : this._toPixels(this._windowStart), m = this._selection ? this._selection.right : this._toPixels(this._windowEnd), g = this._controller.theme;
           a.save();
-          a.scale(k, k);
-          this._selection ? (a.fillStyle = m.selectionText(.15), a.fillRect(g, 1, n - g, c - 1), a.fillStyle = "rgba(133, 0, 0, 1)", a.fillRect(g + .5, 0, n - g - 1, 4), a.fillRect(g + .5, c - 4, n - g - 1, 4)) : (a.fillStyle = m.bodyBackground(.4), a.fillRect(0, 1, g, c - 1), a.fillRect(n, 1, this._width, c - 1));
+          a.scale(f, f);
+          this._selection ? (a.fillStyle = g.selectionText(.15), a.fillRect(h, 1, m - h, b - 1), a.fillStyle = "rgba(133, 0, 0, 1)", a.fillRect(h + .5, 0, m - h - 1, 4), a.fillRect(h + .5, b - 4, m - h - 1, 4)) : (a.fillStyle = g.bodyBackground(.4), a.fillRect(0, 1, h, b - 1), a.fillRect(m, 1, this._width, b - 1));
           a.beginPath();
-          a.moveTo(g, 0);
-          a.lineTo(g, c);
-          a.moveTo(n, 0);
-          a.lineTo(n, c);
+          a.moveTo(h, 0);
+          a.lineTo(h, b);
+          a.moveTo(m, 0);
+          a.lineTo(m, b);
           a.lineWidth = .5;
-          a.strokeStyle = m.foregroundTextGrey(1);
+          a.strokeStyle = g.foregroundTextGrey(1);
           a.stroke();
-          c = Math.abs((this._selection ? this._toTime(this._selection.right) : this._windowEnd) - (this._selection ? this._toTime(this._selection.left) : this._windowStart));
-          a.fillStyle = m.selectionText(.5);
+          b = Math.abs((this._selection ? this._toTime(this._selection.right) : this._windowEnd) - (this._selection ? this._toTime(this._selection.left) : this._windowStart));
+          a.fillStyle = g.selectionText(.5);
           a.font = "8px sans-serif";
           a.textBaseline = "alphabetic";
           a.textAlign = "end";
-          a.fillText(c.toFixed(2), Math.min(g, n) - 4, 10);
-          a.fillText((c / 60).toFixed(2), Math.min(g, n) - 4, 20);
+          a.fillText(b.toFixed(2), Math.min(h, m) - 4, 10);
+          a.fillText((b / 60).toFixed(2), Math.min(h, m) - 4, 20);
           a.restore();
         };
         a.prototype._drawChart = function() {
-          var a = window.devicePixelRatio, c = this._height, k = this._controller.activeProfile, g = 4 * this._width, n = k.totalTime / g, m = this._overviewContext, l = this._controller.theme.blueHighlight(1);
-          m.save();
-          m.translate(0, a * c);
-          var d = -a * c / (k.maxDepth - 1);
-          m.scale(a / 4, d);
-          m.clearRect(0, 0, g, k.maxDepth - 1);
-          1 == this._mode && m.scale(1, 1 / k.snapshotCount);
-          for (var e = 0, b = k.snapshotCount;e < b;e++) {
-            var f = k.getSnapshotAt(e);
-            if (f) {
-              var q = null, w = 0;
-              m.beginPath();
-              m.moveTo(0, 0);
-              for (var G = 0;G < g;G++) {
-                w = k.startTime + G * n, w = (q = q ? q.queryNext(w) : f.query(w)) ? q.getDepth() - 1 : 0, m.lineTo(G, w);
-              }
-              m.lineTo(G, 0);
-              m.fillStyle = l;
-              m.fill();
-              1 == this._mode && m.translate(0, -c * a / d);
+          var a = window.devicePixelRatio, b = this._height, f = this._controller.activeProfile, h = 4 * this._width, m = f.totalTime / h, g = this._overviewContext, k = this._controller.theme.blueHighlight(1);
+          g.save();
+          g.translate(0, a * b);
+          var p = -a * b / (f.maxDepth - 1);
+          g.scale(a / 4, p);
+          g.clearRect(0, 0, h, f.maxDepth - 1);
+          1 == this._mode && g.scale(1, 1 / f.snapshotCount);
+          for (var l = 0, c = f.snapshotCount;l < c;l++) {
+            var e = f.getSnapshotAt(l);
+            if (e) {
+              var q = null, s = 0;
+              g.beginPath();
+              g.moveTo(0, 0);
+              for (var y = 0;y < h;y++) {
+                s = f.startTime + y * m, s = (q = q ? q.queryNext(s) : e.query(s)) ? q.getDepth() - 1 : 0, g.lineTo(y, s);
+              }
+              g.lineTo(y, 0);
+              g.fillStyle = k;
+              g.fill();
+              1 == this._mode && g.translate(0, -b * a / p);
             }
           }
-          m.restore();
+          g.restore();
         };
         a.prototype._toPixelsRelative = function(a) {
           return a * this._width / (this._rangeEnd - this._rangeStart);
@@ -6001,154 +6010,154 @@
         a.prototype._toTime = function(a) {
           return this._toTimeRelative(a) + this._rangeStart;
         };
-        a.prototype._getDragTargetUnderCursor = function(a, c) {
-          if (0 <= c && c < this._height) {
-            var k = this._toPixels(this._windowStart), m = this._toPixels(this._windowEnd), n = 2 + g.FlameChartBase.DRAGHANDLE_WIDTH / 2, s = a >= k - n && a <= k + n, l = a >= m - n && a <= m + n;
-            if (s && l) {
+        a.prototype._getDragTargetUnderCursor = function(a, b) {
+          if (0 <= b && b < this._height) {
+            var f = this._toPixels(this._windowStart), h = this._toPixels(this._windowEnd), m = 2 + g.FlameChartBase.DRAGHANDLE_WIDTH / 2, r = a >= f - m && a <= f + m, k = a >= h - m && a <= h + m;
+            if (r && k) {
               return 4;
             }
-            if (s) {
+            if (r) {
               return 2;
             }
-            if (l) {
+            if (k) {
               return 3;
             }
-            if (!this._windowEqRange() && a > k + n && a < m - n) {
+            if (!this._windowEqRange() && a > f + m && a < h - m) {
               return 1;
             }
           }
           return 0;
         };
-        a.prototype.onMouseDown = function(a, c) {
-          var k = this._getDragTargetUnderCursor(a, c);
-          0 === k ? (this._selection = {left:a, right:a}, this.draw()) : (1 === k && this._mouseController.updateCursor(g.MouseCursor.GRABBING), this._dragInfo = {windowStartInitial:this._windowStart, windowEndInitial:this._windowEnd, target:k});
-        };
-        a.prototype.onMouseMove = function(a, c) {
-          var k = g.MouseCursor.DEFAULT, m = this._getDragTargetUnderCursor(a, c);
-          0 === m || this._selection || (k = 1 === m ? g.MouseCursor.GRAB : g.MouseCursor.EW_RESIZE);
-          this._mouseController.updateCursor(k);
+        a.prototype.onMouseDown = function(a, b) {
+          var f = this._getDragTargetUnderCursor(a, b);
+          0 === f ? (this._selection = {left:a, right:a}, this.draw()) : (1 === f && this._mouseController.updateCursor(g.MouseCursor.GRABBING), this._dragInfo = {windowStartInitial:this._windowStart, windowEndInitial:this._windowEnd, target:f});
+        };
+        a.prototype.onMouseMove = function(a, b) {
+          var f = g.MouseCursor.DEFAULT, h = this._getDragTargetUnderCursor(a, b);
+          0 === h || this._selection || (f = 1 === h ? g.MouseCursor.GRAB : g.MouseCursor.EW_RESIZE);
+          this._mouseController.updateCursor(f);
         };
-        a.prototype.onMouseOver = function(a, c) {
-          this.onMouseMove(a, c);
+        a.prototype.onMouseOver = function(a, b) {
+          this.onMouseMove(a, b);
         };
         a.prototype.onMouseOut = function() {
           this._mouseController.updateCursor(g.MouseCursor.DEFAULT);
         };
-        a.prototype.onDrag = function(a, p, k, m, n, s) {
+        a.prototype.onDrag = function(a, n, f, h, m, r) {
           if (this._selection) {
-            this._selection = {left:a, right:c(k, 0, this._width - 1)}, this.draw();
+            this._selection = {left:a, right:b(f, 0, this._width - 1)}, this.draw();
           } else {
             a = this._dragInfo;
             if (4 === a.target) {
-              if (0 !== n) {
-                a.target = 0 > n ? 2 : 3;
+              if (0 !== m) {
+                a.target = 0 > m ? 2 : 3;
               } else {
                 return;
               }
             }
-            p = this._windowStart;
-            k = this._windowEnd;
-            n = this._toTimeRelative(n);
+            n = this._windowStart;
+            f = this._windowEnd;
+            m = this._toTimeRelative(m);
             switch(a.target) {
               case 1:
-                p = a.windowStartInitial + n;
-                k = a.windowEndInitial + n;
+                n = a.windowStartInitial + m;
+                f = a.windowEndInitial + m;
                 break;
               case 2:
-                p = c(a.windowStartInitial + n, this._rangeStart, k - g.FlameChartBase.MIN_WINDOW_LEN);
+                n = b(a.windowStartInitial + m, this._rangeStart, f - g.FlameChartBase.MIN_WINDOW_LEN);
                 break;
               case 3:
-                k = c(a.windowEndInitial + n, p + g.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
+                f = b(a.windowEndInitial + m, n + g.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
                 break;
               default:
                 return;
             }
-            this._controller.setWindow(p, k);
+            this._controller.setWindow(n, f);
           }
         };
-        a.prototype.onDragEnd = function(a, c, k, g, n, m) {
-          this._selection && (this._selection = null, this._controller.setWindow(this._toTime(a), this._toTime(k)));
+        a.prototype.onDragEnd = function(a, b, f, h, m, g) {
+          this._selection && (this._selection = null, this._controller.setWindow(this._toTime(a), this._toTime(f)));
           this._dragInfo = null;
-          this.onMouseMove(k, g);
+          this.onMouseMove(f, h);
         };
-        a.prototype.onClick = function(a, c) {
+        a.prototype.onClick = function(a, b) {
           this._selection = this._dragInfo = null;
-          this._windowEqRange() || (0 === this._getDragTargetUnderCursor(a, c) && this._controller.moveWindowTo(this._toTime(a)), this.onMouseMove(a, c));
+          this._windowEqRange() || (0 === this._getDragTargetUnderCursor(a, b) && this._controller.moveWindowTo(this._toTime(a)), this.onMouseMove(a, b));
           this.draw();
         };
-        a.prototype.onHoverStart = function(a, c) {
+        a.prototype.onHoverStart = function(a, b) {
         };
         a.prototype.onHoverEnd = function() {
         };
         return a;
       }(g.FlameChartBase);
-      g.FlameChartOverview = r;
-    })(r.Profiler || (r.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.FlameChartOverview = p;
+    })(p.Profiler || (p.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.NumberUtilities.clamp;
-      (function(c) {
-        c[c.OVERVIEW = 0] = "OVERVIEW";
-        c[c.CHART = 1] = "CHART";
+      var b = k.NumberUtilities.clamp;
+      (function(b) {
+        b[b.OVERVIEW = 0] = "OVERVIEW";
+        b[b.CHART = 1] = "CHART";
       })(g.FlameChartHeaderType || (g.FlameChartHeaderType = {}));
-      var r = function(m) {
-        function a(a, c) {
-          this._type = c;
-          m.call(this, a);
+      var p = function(h) {
+        function a(a, b) {
+          this._type = b;
+          h.call(this, a);
         }
-        __extends(a, m);
+        __extends(a, h);
         a.prototype.draw = function() {
-          var a = this._context, c = window.devicePixelRatio, k = this._width, g = this._height;
+          var a = this._context, b = window.devicePixelRatio, f = this._width, h = this._height;
           a.save();
-          a.scale(c, c);
+          a.scale(b, b);
           a.fillStyle = this._controller.theme.tabToolbar(1);
-          a.fillRect(0, 0, k, g);
-          this._initialized && (0 == this._type ? (c = this._toPixels(this._windowStart), k = this._toPixels(this._windowEnd), a.fillStyle = this._controller.theme.bodyBackground(1), a.fillRect(c, 0, k - c, g), this._drawLabels(this._rangeStart, this._rangeEnd), this._drawDragHandle(c), this._drawDragHandle(k)) : this._drawLabels(this._windowStart, this._windowEnd));
+          a.fillRect(0, 0, f, h);
+          this._initialized && (0 == this._type ? (b = this._toPixels(this._windowStart), f = this._toPixels(this._windowEnd), a.fillStyle = this._controller.theme.bodyBackground(1), a.fillRect(b, 0, f - b, h), this._drawLabels(this._rangeStart, this._rangeEnd), this._drawDragHandle(b), this._drawDragHandle(f)) : this._drawLabels(this._windowStart, this._windowEnd));
           a.restore();
         };
-        a.prototype._drawLabels = function(c, p) {
-          var k = this._context, g = this._calculateTickInterval(c, p), n = Math.ceil(c / g) * g, m = 500 <= g, l = m ? 1E3 : 1, d = this._decimalPlaces(g / l), m = m ? "s" : "ms", e = this._toPixels(n), b = this._height / 2, f = this._controller.theme;
-          k.lineWidth = 1;
-          k.strokeStyle = f.contentTextDarkGrey(.5);
-          k.fillStyle = f.contentTextDarkGrey(1);
-          k.textAlign = "right";
-          k.textBaseline = "middle";
-          k.font = "11px sans-serif";
-          for (f = this._width + a.TICK_MAX_WIDTH;e < f;) {
-            k.fillText((n / l).toFixed(d) + " " + m, e - 7, b + 1), k.beginPath(), k.moveTo(e, 0), k.lineTo(e, this._height + 1), k.closePath(), k.stroke(), n += g, e = this._toPixels(n);
+        a.prototype._drawLabels = function(b, n) {
+          var f = this._context, h = this._calculateTickInterval(b, n), m = Math.ceil(b / h) * h, g = 500 <= h, k = g ? 1E3 : 1, p = this._decimalPlaces(h / k), g = g ? "s" : "ms", l = this._toPixels(m), c = this._height / 2, e = this._controller.theme;
+          f.lineWidth = 1;
+          f.strokeStyle = e.contentTextDarkGrey(.5);
+          f.fillStyle = e.contentTextDarkGrey(1);
+          f.textAlign = "right";
+          f.textBaseline = "middle";
+          f.font = "11px sans-serif";
+          for (e = this._width + a.TICK_MAX_WIDTH;l < e;) {
+            f.fillText((m / k).toFixed(p) + " " + g, l - 7, c + 1), f.beginPath(), f.moveTo(l, 0), f.lineTo(l, this._height + 1), f.closePath(), f.stroke(), m += h, l = this._toPixels(m);
           }
         };
-        a.prototype._calculateTickInterval = function(c, p) {
-          var k = (p - c) / (this._width / a.TICK_MAX_WIDTH), g = Math.pow(10, Math.floor(Math.log(k) / Math.LN10)), k = k / g;
-          return 5 < k ? 10 * g : 2 < k ? 5 * g : 1 < k ? 2 * g : g;
+        a.prototype._calculateTickInterval = function(b, n) {
+          var f = (n - b) / (this._width / a.TICK_MAX_WIDTH), h = Math.pow(10, Math.floor(Math.log(f) / Math.LN10)), f = f / h;
+          return 5 < f ? 10 * h : 2 < f ? 5 * h : 1 < f ? 2 * h : h;
         };
         a.prototype._drawDragHandle = function(a) {
-          var c = this._context;
-          c.lineWidth = 2;
-          c.strokeStyle = this._controller.theme.bodyBackground(1);
-          c.fillStyle = this._controller.theme.foregroundTextGrey(.7);
-          this._drawRoundedRect(c, a - g.FlameChartBase.DRAGHANDLE_WIDTH / 2, g.FlameChartBase.DRAGHANDLE_WIDTH, this._height - 2);
+          var b = this._context;
+          b.lineWidth = 2;
+          b.strokeStyle = this._controller.theme.bodyBackground(1);
+          b.fillStyle = this._controller.theme.foregroundTextGrey(.7);
+          this._drawRoundedRect(b, a - g.FlameChartBase.DRAGHANDLE_WIDTH / 2, g.FlameChartBase.DRAGHANDLE_WIDTH, this._height - 2);
         };
-        a.prototype._drawRoundedRect = function(a, c, k, g) {
-          var n, m = !0;
+        a.prototype._drawRoundedRect = function(a, b, f, h) {
+          var m, g = !0;
+          void 0 === g && (g = !0);
           void 0 === m && (m = !0);
-          void 0 === n && (n = !0);
           a.beginPath();
-          a.moveTo(c + 2, 1);
-          a.lineTo(c + k - 2, 1);
-          a.quadraticCurveTo(c + k, 1, c + k, 3);
-          a.lineTo(c + k, 1 + g - 2);
-          a.quadraticCurveTo(c + k, 1 + g, c + k - 2, 1 + g);
-          a.lineTo(c + 2, 1 + g);
-          a.quadraticCurveTo(c, 1 + g, c, 1 + g - 2);
-          a.lineTo(c, 3);
-          a.quadraticCurveTo(c, 1, c + 2, 1);
+          a.moveTo(b + 2, 1);
+          a.lineTo(b + f - 2, 1);
+          a.quadraticCurveTo(b + f, 1, b + f, 3);
+          a.lineTo(b + f, 1 + h - 2);
+          a.quadraticCurveTo(b + f, 1 + h, b + f - 2, 1 + h);
+          a.lineTo(b + 2, 1 + h);
+          a.quadraticCurveTo(b, 1 + h, b, 1 + h - 2);
+          a.lineTo(b, 3);
+          a.quadraticCurveTo(b, 1, b + 2, 1);
           a.closePath();
-          m && a.stroke();
-          n && a.fill();
+          g && a.stroke();
+          m && a.fill();
         };
         a.prototype._toPixelsRelative = function(a) {
           return a * this._width / (0 === this._type ? this._rangeEnd - this._rangeStart : this._windowEnd - this._windowStart);
@@ -6162,17 +6171,17 @@
         a.prototype._toTime = function(a) {
           return this._toTimeRelative(a) + (0 === this._type ? this._rangeStart : this._windowStart);
         };
-        a.prototype._getDragTargetUnderCursor = function(a, c) {
-          if (0 <= c && c < this._height) {
+        a.prototype._getDragTargetUnderCursor = function(a, b) {
+          if (0 <= b && b < this._height) {
             if (0 === this._type) {
-              var k = this._toPixels(this._windowStart), m = this._toPixels(this._windowEnd), n = 2 + g.FlameChartBase.DRAGHANDLE_WIDTH / 2, k = a >= k - n && a <= k + n, m = a >= m - n && a <= m + n;
-              if (k && m) {
+              var f = this._toPixels(this._windowStart), h = this._toPixels(this._windowEnd), m = 2 + g.FlameChartBase.DRAGHANDLE_WIDTH / 2, f = a >= f - m && a <= f + m, h = a >= h - m && a <= h + m;
+              if (f && h) {
                 return 4;
               }
-              if (k) {
+              if (f) {
                 return 2;
               }
-              if (m) {
+              if (h) {
                 return 3;
               }
             }
@@ -6182,105 +6191,105 @@
           }
           return 0;
         };
-        a.prototype.onMouseDown = function(a, c) {
-          var k = this._getDragTargetUnderCursor(a, c);
-          1 === k && this._mouseController.updateCursor(g.MouseCursor.GRABBING);
-          this._dragInfo = {windowStartInitial:this._windowStart, windowEndInitial:this._windowEnd, target:k};
-        };
-        a.prototype.onMouseMove = function(a, c) {
-          var k = g.MouseCursor.DEFAULT, m = this._getDragTargetUnderCursor(a, c);
-          0 !== m && (1 !== m ? k = g.MouseCursor.EW_RESIZE : 1 !== m || this._windowEqRange() || (k = g.MouseCursor.GRAB));
-          this._mouseController.updateCursor(k);
+        a.prototype.onMouseDown = function(a, b) {
+          var f = this._getDragTargetUnderCursor(a, b);
+          1 === f && this._mouseController.updateCursor(g.MouseCursor.GRABBING);
+          this._dragInfo = {windowStartInitial:this._windowStart, windowEndInitial:this._windowEnd, target:f};
+        };
+        a.prototype.onMouseMove = function(a, b) {
+          var f = g.MouseCursor.DEFAULT, h = this._getDragTargetUnderCursor(a, b);
+          0 !== h && (1 !== h ? f = g.MouseCursor.EW_RESIZE : 1 !== h || this._windowEqRange() || (f = g.MouseCursor.GRAB));
+          this._mouseController.updateCursor(f);
         };
-        a.prototype.onMouseOver = function(a, c) {
-          this.onMouseMove(a, c);
+        a.prototype.onMouseOver = function(a, b) {
+          this.onMouseMove(a, b);
         };
         a.prototype.onMouseOut = function() {
           this._mouseController.updateCursor(g.MouseCursor.DEFAULT);
         };
-        a.prototype.onDrag = function(a, p, k, m, n, s) {
+        a.prototype.onDrag = function(a, n, f, h, m, k) {
           a = this._dragInfo;
           if (4 === a.target) {
-            if (0 !== n) {
-              a.target = 0 > n ? 2 : 3;
+            if (0 !== m) {
+              a.target = 0 > m ? 2 : 3;
             } else {
               return;
             }
           }
-          p = this._windowStart;
-          k = this._windowEnd;
-          n = this._toTimeRelative(n);
+          n = this._windowStart;
+          f = this._windowEnd;
+          m = this._toTimeRelative(m);
           switch(a.target) {
             case 1:
-              k = 0 === this._type ? 1 : -1;
-              p = a.windowStartInitial + k * n;
-              k = a.windowEndInitial + k * n;
+              f = 0 === this._type ? 1 : -1;
+              n = a.windowStartInitial + f * m;
+              f = a.windowEndInitial + f * m;
               break;
             case 2:
-              p = c(a.windowStartInitial + n, this._rangeStart, k - g.FlameChartBase.MIN_WINDOW_LEN);
+              n = b(a.windowStartInitial + m, this._rangeStart, f - g.FlameChartBase.MIN_WINDOW_LEN);
               break;
             case 3:
-              k = c(a.windowEndInitial + n, p + g.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
+              f = b(a.windowEndInitial + m, n + g.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
               break;
             default:
               return;
           }
-          this._controller.setWindow(p, k);
+          this._controller.setWindow(n, f);
         };
-        a.prototype.onDragEnd = function(a, c, k, g, n, m) {
+        a.prototype.onDragEnd = function(a, b, f, h, m, g) {
           this._dragInfo = null;
-          this.onMouseMove(k, g);
+          this.onMouseMove(f, h);
         };
-        a.prototype.onClick = function(a, c) {
+        a.prototype.onClick = function(a, b) {
           1 === this._dragInfo.target && this._mouseController.updateCursor(g.MouseCursor.GRAB);
         };
-        a.prototype.onHoverStart = function(a, c) {
+        a.prototype.onHoverStart = function(a, b) {
         };
         a.prototype.onHoverEnd = function() {
         };
         a.TICK_MAX_WIDTH = 75;
         return a;
       }(g.FlameChartBase);
-      g.FlameChartHeader = r;
-    })(r.Profiler || (r.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.FlameChartHeader = p;
+    })(p.Profiler || (p.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      (function(c) {
+      (function(b) {
         var g = function() {
-          function a(a, c, k, g, n) {
+          function a(a, b, f, h, m) {
             this.pageLoaded = a;
-            this.threadsTotal = c;
-            this.threadsLoaded = k;
-            this.threadFilesTotal = g;
-            this.threadFilesLoaded = n;
+            this.threadsTotal = b;
+            this.threadsLoaded = f;
+            this.threadFilesTotal = h;
+            this.threadFilesLoaded = m;
           }
           a.prototype.toString = function() {
-            return "[" + ["pageLoaded", "threadsTotal", "threadsLoaded", "threadFilesTotal", "threadFilesLoaded"].map(function(a, c, k) {
+            return "[" + ["pageLoaded", "threadsTotal", "threadsLoaded", "threadFilesTotal", "threadFilesLoaded"].map(function(a, b, f) {
               return a + ":" + this[a];
             }, this).join(", ") + "]";
           };
           return a;
         }();
-        c.TraceLoggerProgressInfo = g;
-        var m = function() {
+        b.TraceLoggerProgressInfo = g;
+        var h = function() {
           function a(a) {
             this._baseUrl = a;
             this._threads = [];
             this._progressInfo = null;
           }
-          a.prototype.loadPage = function(a, c, k) {
+          a.prototype.loadPage = function(a, b, f) {
             this._threads = [];
-            this._pageLoadCallback = c;
-            this._pageLoadProgressCallback = k;
+            this._pageLoadCallback = b;
+            this._pageLoadProgressCallback = f;
             this._progressInfo = new g(!1, 0, 0, 0, 0);
             this._loadData([a], this._onLoadPage.bind(this));
           };
           Object.defineProperty(a.prototype, "buffers", {get:function() {
-            for (var a = [], c = 0, k = this._threads.length;c < k;c++) {
-              a.push(this._threads[c].buffer);
+            for (var a = [], b = 0, f = this._threads.length;b < f;b++) {
+              a.push(this._threads[b].buffer);
             }
             return a;
           }, enumerable:!0, configurable:!0});
@@ -6289,27 +6298,27 @@
           };
           a.prototype._onLoadPage = function(a) {
             if (a && 1 == a.length) {
-              var g = this, k = 0;
+              var h = this, f = 0;
               a = a[0];
-              var m = a.length;
-              this._threads = Array(m);
+              var g = a.length;
+              this._threads = Array(g);
               this._progressInfo.pageLoaded = !0;
-              this._progressInfo.threadsTotal = m;
-              for (var n = 0;n < a.length;n++) {
-                var l = a[n], v = [l.dict, l.tree];
-                l.corrections && v.push(l.corrections);
-                this._progressInfo.threadFilesTotal += v.length;
-                this._loadData(v, function(a) {
-                  return function(e) {
-                    e && (e = new c.Thread(e), e.buffer.name = "Thread " + a, g._threads[a] = e);
-                    k++;
-                    g._progressInfo.threadsLoaded++;
-                    g._onProgress();
-                    k === m && g._pageLoadCallback.call(g, null, g._threads);
+              this._progressInfo.threadsTotal = g;
+              for (var m = 0;m < a.length;m++) {
+                var k = a[m], w = [k.dict, k.tree];
+                k.corrections && w.push(k.corrections);
+                this._progressInfo.threadFilesTotal += w.length;
+                this._loadData(w, function(a) {
+                  return function(d) {
+                    d && (d = new b.Thread(d), d.buffer.name = "Thread " + a, h._threads[a] = d);
+                    f++;
+                    h._progressInfo.threadsLoaded++;
+                    h._onProgress();
+                    f === g && h._pageLoadCallback.call(h, null, h._threads);
                   };
-                }(n), function(a) {
-                  g._progressInfo.threadFilesLoaded++;
-                  g._onProgress();
+                }(m), function(a) {
+                  h._progressInfo.threadFilesLoaded++;
+                  h._onProgress();
                 });
               }
               this._onProgress();
@@ -6317,86 +6326,86 @@
               this._pageLoadCallback.call(this, "Error loading page.", null);
             }
           };
-          a.prototype._loadData = function(a, c, g) {
-            var m = 0, n = 0, l = a.length, v = [];
-            v.length = l;
-            for (var d = 0;d < l;d++) {
-              var e = this._baseUrl + a[d], b = new XMLHttpRequest, f = /\.tl$/i.test(e) ? "arraybuffer" : "json";
-              b.open("GET", e, !0);
-              b.responseType = f;
-              b.onload = function(b, f) {
-                return function(a) {
-                  if ("json" === f) {
-                    if (a = this.response, "string" === typeof a) {
+          a.prototype._loadData = function(a, b, f) {
+            var h = 0, m = 0, g = a.length, k = [];
+            k.length = g;
+            for (var p = 0;p < g;p++) {
+              var l = this._baseUrl + a[p], c = new XMLHttpRequest, e = /\.tl$/i.test(l) ? "arraybuffer" : "json";
+              c.open("GET", l, !0);
+              c.responseType = e;
+              c.onload = function(a, c) {
+                return function(e) {
+                  if ("json" === c) {
+                    if (e = this.response, "string" === typeof e) {
                       try {
-                        a = JSON.parse(a), v[b] = a;
-                      } catch (e) {
-                        n++;
+                        e = JSON.parse(e), k[a] = e;
+                      } catch (d) {
+                        m++;
                       }
                     } else {
-                      v[b] = a;
+                      k[a] = e;
                     }
                   } else {
-                    v[b] = this.response;
+                    k[a] = this.response;
                   }
-                  ++m;
-                  g && g(m);
-                  m === l && c(v);
+                  ++h;
+                  f && f(h);
+                  h === g && b(k);
                 };
-              }(d, f);
-              b.send();
+              }(p, e);
+              c.send();
             }
           };
           a.colors = "#0044ff #8c4b00 #cc5c33 #ff80c4 #ffbfd9 #ff8800 #8c5e00 #adcc33 #b380ff #bfd9ff #ffaa00 #8c0038 #bf8f30 #f780ff #cc99c9 #aaff00 #000073 #452699 #cc8166 #cca799 #000066 #992626 #cc6666 #ccc299 #ff6600 #526600 #992663 #cc6681 #99ccc2 #ff0066 #520066 #269973 #61994d #739699 #ffcc00 #006629 #269199 #94994d #738299 #ff0000 #590000 #234d8c #8c6246 #7d7399 #ee00ff #00474d #8c2385 #8c7546 #7c8c69 #eeff00 #4d003d #662e1a #62468c #8c6969 #6600ff #4c2900 #1a6657 #8c464f #8c6981 #44ff00 #401100 #1a2466 #663355 #567365 #d90074 #403300 #101d40 #59562d #66614d #cc0000 #002b40 #234010 #4c2626 #4d5e66 #00a3cc #400011 #231040 #4c3626 #464359 #0000bf #331b00 #80e6ff #311a33 #4d3939 #a69b00 #003329 #80ffb2 #331a20 #40303d #00a658 #40ffd9 #ffc480 #ffe1bf #332b26 #8c2500 #9933cc #80fff6 #ffbfbf #303326 #005e8c #33cc47 #b2ff80 #c8bfff #263332 #00708c #cc33ad #ffe680 #f2ffbf #262a33 #388c00 #335ccc #8091ff #bfffd9".split(" ");
           return a;
         }();
-        c.TraceLogger = m;
+        b.TraceLogger = h;
       })(g.TraceLogger || (g.TraceLogger = {}));
-    })(l.Profiler || (l.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+    })(k.Profiler || (k.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      (function(c) {
-        var l;
-        (function(c) {
-          c[c.START_HI = 0] = "START_HI";
-          c[c.START_LO = 4] = "START_LO";
-          c[c.STOP_HI = 8] = "STOP_HI";
-          c[c.STOP_LO = 12] = "STOP_LO";
-          c[c.TEXTID = 16] = "TEXTID";
-          c[c.NEXTID = 20] = "NEXTID";
-        })(l || (l = {}));
-        l = function() {
-          function c(a) {
+      (function(b) {
+        var k;
+        (function(b) {
+          b[b.START_HI = 0] = "START_HI";
+          b[b.START_LO = 4] = "START_LO";
+          b[b.STOP_HI = 8] = "STOP_HI";
+          b[b.STOP_LO = 12] = "STOP_LO";
+          b[b.TEXTID = 16] = "TEXTID";
+          b[b.NEXTID = 20] = "NEXTID";
+        })(k || (k = {}));
+        k = function() {
+          function b(a) {
             2 <= a.length && (this._text = a[0], this._data = new DataView(a[1]), this._buffer = new g.TimelineBuffer, this._walkTree(0));
           }
-          Object.defineProperty(c.prototype, "buffer", {get:function() {
+          Object.defineProperty(b.prototype, "buffer", {get:function() {
             return this._buffer;
           }, enumerable:!0, configurable:!0});
-          c.prototype._walkTree = function(a) {
-            var h = this._data, g = this._buffer;
+          b.prototype._walkTree = function(a) {
+            var d = this._data, n = this._buffer;
             do {
-              var k = a * c.ITEM_SIZE, l = 4294967295 * h.getUint32(k + 0) + h.getUint32(k + 4), n = 4294967295 * h.getUint32(k + 8) + h.getUint32(k + 12), s = h.getUint32(k + 16), k = h.getUint32(k + 20), v = 1 === (s & 1), s = s >>> 1, s = this._text[s];
-              g.enter(s, null, l / 1E6);
-              v && this._walkTree(a + 1);
-              g.leave(s, null, n / 1E6);
-              a = k;
+              var f = a * b.ITEM_SIZE, g = 4294967295 * d.getUint32(f + 0) + d.getUint32(f + 4), m = 4294967295 * d.getUint32(f + 8) + d.getUint32(f + 12), k = d.getUint32(f + 16), f = d.getUint32(f + 20), p = 1 === (k & 1), k = k >>> 1, k = this._text[k];
+              n.enter(k, null, g / 1E6);
+              p && this._walkTree(a + 1);
+              n.leave(k, null, m / 1E6);
+              a = f;
             } while (0 !== a);
           };
-          c.ITEM_SIZE = 24;
-          return c;
+          b.ITEM_SIZE = 24;
+          return b;
         }();
-        c.Thread = l;
+        b.Thread = k;
       })(g.TraceLogger || (g.TraceLogger = {}));
-    })(l.Profiler || (l.Profiler = {}));
-  })(l.Tools || (l.Tools = {}));
+    })(k.Profiler || (k.Profiler = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.NumberUtilities.clamp, r = function() {
+      var b = k.NumberUtilities.clamp, p = function() {
         function a() {
           this.length = 0;
           this.lines = [];
@@ -6405,9 +6414,9 @@
           this.repeat = [];
           this.length = 0;
         }
-        a.prototype.append = function(a, c) {
-          var g = this.lines;
-          0 < g.length && g[g.length - 1] === a ? this.repeat[g.length - 1]++ : (this.lines.push(a), this.repeat.push(1), this.format.push(c ? {backgroundFillStyle:c} : void 0), this.time.push(performance.now()), this.length++);
+        a.prototype.append = function(a, b) {
+          var f = this.lines;
+          0 < f.length && f[f.length - 1] === a ? this.repeat[f.length - 1]++ : (this.lines.push(a), this.repeat.push(1), this.format.push(b ? {backgroundFillStyle:b} : void 0), this.time.push(performance.now()), this.length++);
         };
         a.prototype.get = function(a) {
           return this.lines[a];
@@ -6423,8 +6432,8 @@
         };
         return a;
       }();
-      g.Buffer = r;
-      var m = function() {
+      g.Buffer = p;
+      var h = function() {
         function a(a) {
           this.lineColor = "#2A2A2A";
           this.alternateLineColor = "#262626";
@@ -6447,52 +6456,52 @@
           this._resizeHandler();
           this.textMarginBottom = this.textMarginLeft = 4;
           this.refreshFrequency = 0;
-          this.buffer = new r;
+          this.buffer = new p;
           a.addEventListener("keydown", function(a) {
-            var h = 0;
+            var d = 0;
             switch(a.keyCode) {
               case q:
                 this.showLineNumbers = !this.showLineNumbers;
                 break;
-              case w:
+              case s:
                 this.showLineTime = !this.showLineTime;
                 break;
-              case l:
-                h = -1;
+              case g:
+                d = -1;
                 break;
-              case v:
-                h = 1;
+              case k:
+                d = 1;
                 break;
-              case c:
-                h = -this.pageLineCount;
+              case b:
+                d = -this.pageLineCount;
                 break;
-              case g:
-                h = this.pageLineCount;
+              case f:
+                d = this.pageLineCount;
                 break;
-              case m:
-                h = -this.lineIndex;
+              case h:
+                d = -this.lineIndex;
                 break;
-              case n:
-                h = this.buffer.length - this.lineIndex;
+              case m:
+                d = this.buffer.length - this.lineIndex;
                 break;
-              case d:
+              case t:
                 this.columnIndex -= a.metaKey ? 10 : 1;
                 0 > this.columnIndex && (this.columnIndex = 0);
                 a.preventDefault();
                 break;
-              case e:
+              case l:
                 this.columnIndex += a.metaKey ? 10 : 1;
                 a.preventDefault();
                 break;
-              case b:
+              case c:
                 a.metaKey && (this.selection = {start:0, end:this.buffer.length}, a.preventDefault());
                 break;
-              case f:
+              case e:
                 if (a.metaKey) {
                   var V = "";
                   if (this.selection) {
-                    for (var Q = this.selection.start;Q <= this.selection.end;Q++) {
-                      V += this.buffer.get(Q) + "\n";
+                    for (var R = this.selection.start;R <= this.selection.end;R++) {
+                      V += this.buffer.get(R) + "\n";
                     }
                   } else {
                     V = this.buffer.get(this.lineIndex);
@@ -6501,29 +6510,29 @@
                 }
               ;
             }
-            a.metaKey && (h *= this.pageLineCount);
-            h && (this.scroll(h), a.preventDefault());
-            h && a.shiftKey ? this.selection ? this.lineIndex > this.selection.start ? this.selection.end = this.lineIndex : this.selection.start = this.lineIndex : 0 < h ? this.selection = {start:this.lineIndex - h, end:this.lineIndex} : 0 > h && (this.selection = {start:this.lineIndex, end:this.lineIndex - h}) : h && (this.selection = null);
+            a.metaKey && (d *= this.pageLineCount);
+            d && (this.scroll(d), a.preventDefault());
+            d && a.shiftKey ? this.selection ? this.lineIndex > this.selection.start ? this.selection.end = this.lineIndex : this.selection.start = this.lineIndex : 0 < d ? this.selection = {start:this.lineIndex - d, end:this.lineIndex} : 0 > d && (this.selection = {start:this.lineIndex, end:this.lineIndex - d}) : d && (this.selection = null);
             this.paint();
           }.bind(this), !1);
-          a.addEventListener("focus", function(b) {
+          a.addEventListener("focus", function(a) {
             this.hasFocus = !0;
           }.bind(this), !1);
-          a.addEventListener("blur", function(b) {
+          a.addEventListener("blur", function(a) {
             this.hasFocus = !1;
           }.bind(this), !1);
-          var c = 33, g = 34, m = 36, n = 35, l = 38, v = 40, d = 37, e = 39, b = 65, f = 67, q = 78, w = 84;
+          var b = 33, f = 34, h = 36, m = 35, g = 38, k = 40, t = 37, l = 39, c = 65, e = 67, q = 78, s = 84;
         }
         a.prototype.resize = function() {
           this._resizeHandler();
         };
         a.prototype._resizeHandler = function() {
-          var a = this.canvas.parentElement, c = a.clientWidth, a = a.clientHeight - 1, g = window.devicePixelRatio || 1;
-          1 !== g ? (this.ratio = g / 1, this.canvas.width = c * this.ratio, this.canvas.height = a * this.ratio, this.canvas.style.width = c + "px", this.canvas.style.height = a + "px") : (this.ratio = 1, this.canvas.width = c, this.canvas.height = a);
+          var a = this.canvas.parentElement, b = a.clientWidth, a = a.clientHeight - 1, f = window.devicePixelRatio || 1;
+          1 !== f ? (this.ratio = f / 1, this.canvas.width = b * this.ratio, this.canvas.height = a * this.ratio, this.canvas.style.width = b + "px", this.canvas.style.height = a + "px") : (this.ratio = 1, this.canvas.width = b, this.canvas.height = a);
           this.pageLineCount = Math.floor(this.canvas.height / this.lineHeight);
         };
         a.prototype.gotoLine = function(a) {
-          this.lineIndex = c(a, 0, this.buffer.length - 1);
+          this.lineIndex = b(a, 0, this.buffer.length - 1);
         };
         a.prototype.scrollIntoView = function() {
           this.lineIndex < this.pageIndex ? this.pageIndex = this.lineIndex : this.lineIndex >= this.pageIndex + this.pageLineCount && (this.pageIndex = this.lineIndex - this.pageLineCount + 1);
@@ -6535,465 +6544,465 @@
         a.prototype.paint = function() {
           var a = this.pageLineCount;
           this.pageIndex + a > this.buffer.length && (a = this.buffer.length - this.pageIndex);
-          var c = this.textMarginLeft, g = c + (this.showLineNumbers ? 5 * (String(this.buffer.length).length + 2) : 0), m = g + (this.showLineTime ? 40 : 10), n = m + 25;
+          var b = this.textMarginLeft, f = b + (this.showLineNumbers ? 5 * (String(this.buffer.length).length + 2) : 0), h = f + (this.showLineTime ? 40 : 10), m = h + 25;
           this.context.font = this.fontSize + 'px Consolas, "Liberation Mono", Courier, monospace';
           this.context.setTransform(this.ratio, 0, 0, this.ratio, 0, 0);
-          for (var l = this.canvas.width, v = this.lineHeight, d = 0;d < a;d++) {
-            var e = d * this.lineHeight, b = this.pageIndex + d, f = this.buffer.get(b), q = this.buffer.getFormat(b), w = this.buffer.getRepeat(b), G = 1 < b ? this.buffer.getTime(b) - this.buffer.getTime(0) : 0;
-            this.context.fillStyle = b % 2 ? this.lineColor : this.alternateLineColor;
+          for (var g = this.canvas.width, k = this.lineHeight, p = 0;p < a;p++) {
+            var l = p * this.lineHeight, c = this.pageIndex + p, e = this.buffer.get(c), q = this.buffer.getFormat(c), s = this.buffer.getRepeat(c), y = 1 < c ? this.buffer.getTime(c) - this.buffer.getTime(0) : 0;
+            this.context.fillStyle = c % 2 ? this.lineColor : this.alternateLineColor;
             q && q.backgroundFillStyle && (this.context.fillStyle = q.backgroundFillStyle);
-            this.context.fillRect(0, e, l, v);
+            this.context.fillRect(0, l, g, k);
             this.context.fillStyle = this.selectionTextColor;
             this.context.fillStyle = this.textColor;
-            this.selection && b >= this.selection.start && b <= this.selection.end && (this.context.fillStyle = this.selectionColor, this.context.fillRect(0, e, l, v), this.context.fillStyle = this.selectionTextColor);
-            this.hasFocus && b === this.lineIndex && (this.context.fillStyle = this.selectionColor, this.context.fillRect(0, e, l, v), this.context.fillStyle = this.selectionTextColor);
-            0 < this.columnIndex && (f = f.substring(this.columnIndex));
-            e = (d + 1) * this.lineHeight - this.textMarginBottom;
-            this.showLineNumbers && this.context.fillText(String(b), c, e);
-            this.showLineTime && this.context.fillText(G.toFixed(1).padLeft(" ", 6), g, e);
-            1 < w && this.context.fillText(String(w).padLeft(" ", 3), m, e);
-            this.context.fillText(f, n, e);
+            this.selection && c >= this.selection.start && c <= this.selection.end && (this.context.fillStyle = this.selectionColor, this.context.fillRect(0, l, g, k), this.context.fillStyle = this.selectionTextColor);
+            this.hasFocus && c === this.lineIndex && (this.context.fillStyle = this.selectionColor, this.context.fillRect(0, l, g, k), this.context.fillStyle = this.selectionTextColor);
+            0 < this.columnIndex && (e = e.substring(this.columnIndex));
+            l = (p + 1) * this.lineHeight - this.textMarginBottom;
+            this.showLineNumbers && this.context.fillText(String(c), b, l);
+            this.showLineTime && this.context.fillText(y.toFixed(1).padLeft(" ", 6), f, l);
+            1 < s && this.context.fillText(String(s).padLeft(" ", 3), h, l);
+            this.context.fillText(e, m, l);
           }
         };
         a.prototype.refreshEvery = function(a) {
-          function c() {
-            g.paint();
-            g.refreshFrequency && setTimeout(c, g.refreshFrequency);
+          function b() {
+            f.paint();
+            f.refreshFrequency && setTimeout(b, f.refreshFrequency);
           }
-          var g = this;
+          var f = this;
           this.refreshFrequency = a;
-          g.refreshFrequency && setTimeout(c, g.refreshFrequency);
+          f.refreshFrequency && setTimeout(b, f.refreshFrequency);
         };
         a.prototype.isScrolledToBottom = function() {
           return this.lineIndex === this.buffer.length - 1;
         };
         return a;
       }();
-      g.Terminal = m;
-    })(r.Terminal || (r.Terminal = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.Terminal = h;
+    })(p.Terminal || (p.Terminal = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      var c = function() {
-        function c(g) {
+      var b = function() {
+        function b(h) {
           this._lastWeightedTime = this._lastTime = this._index = 0;
           this._gradient = "#FF0000 #FF1100 #FF2300 #FF3400 #FF4600 #FF5700 #FF6900 #FF7B00 #FF8C00 #FF9E00 #FFAF00 #FFC100 #FFD300 #FFE400 #FFF600 #F7FF00 #E5FF00 #D4FF00 #C2FF00 #B0FF00 #9FFF00 #8DFF00 #7CFF00 #6AFF00 #58FF00 #47FF00 #35FF00 #24FF00 #12FF00 #00FF00".split(" ");
-          this._container = g;
+          this._container = h;
           this._canvas = document.createElement("canvas");
           this._container.appendChild(this._canvas);
           this._context = this._canvas.getContext("2d");
           this._listenForContainerSizeChanges();
         }
-        c.prototype._listenForContainerSizeChanges = function() {
-          var c = this._containerWidth, a = this._containerHeight;
+        b.prototype._listenForContainerSizeChanges = function() {
+          var b = this._containerWidth, a = this._containerHeight;
           this._onContainerSizeChanged();
-          var h = this;
+          var d = this;
           setInterval(function() {
-            if (c !== h._containerWidth || a !== h._containerHeight) {
-              h._onContainerSizeChanged(), c = h._containerWidth, a = h._containerHeight;
+            if (b !== d._containerWidth || a !== d._containerHeight) {
+              d._onContainerSizeChanged(), b = d._containerWidth, a = d._containerHeight;
             }
           }, 10);
         };
-        c.prototype._onContainerSizeChanged = function() {
-          var c = this._containerWidth, a = this._containerHeight, h = window.devicePixelRatio || 1;
-          1 !== h ? (this._ratio = h / 1, this._canvas.width = c * this._ratio, this._canvas.height = a * this._ratio, this._canvas.style.width = c + "px", this._canvas.style.height = a + "px") : (this._ratio = 1, this._canvas.width = c, this._canvas.height = a);
+        b.prototype._onContainerSizeChanged = function() {
+          var b = this._containerWidth, a = this._containerHeight, d = window.devicePixelRatio || 1;
+          1 !== d ? (this._ratio = d / 1, this._canvas.width = b * this._ratio, this._canvas.height = a * this._ratio, this._canvas.style.width = b + "px", this._canvas.style.height = a + "px") : (this._ratio = 1, this._canvas.width = b, this._canvas.height = a);
         };
-        Object.defineProperty(c.prototype, "_containerWidth", {get:function() {
+        Object.defineProperty(b.prototype, "_containerWidth", {get:function() {
           return this._container.clientWidth;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(c.prototype, "_containerHeight", {get:function() {
+        Object.defineProperty(b.prototype, "_containerHeight", {get:function() {
           return this._container.clientHeight;
         }, enumerable:!0, configurable:!0});
-        c.prototype.tickAndRender = function(c, a) {
-          void 0 === c && (c = !1);
+        b.prototype.tickAndRender = function(b, a) {
+          void 0 === b && (b = !1);
           void 0 === a && (a = 0);
           if (0 === this._lastTime) {
             this._lastTime = performance.now();
           } else {
-            var h = 1 * (performance.now() - this._lastTime) + 0 * this._lastWeightedTime, g = this._context, k = 2 * this._ratio, l = 30 * this._ratio, n = performance;
-            n.memory && (l += 30 * this._ratio);
-            var s = (this._canvas.width - l) / (k + 1) | 0, v = this._index++;
-            this._index > s && (this._index = 0);
-            s = this._canvas.height;
+            var d = 1 * (performance.now() - this._lastTime) + 0 * this._lastWeightedTime, g = this._context, f = 2 * this._ratio, k = 30 * this._ratio, m = performance;
+            m.memory && (k += 30 * this._ratio);
+            var r = (this._canvas.width - k) / (f + 1) | 0, p = this._index++;
+            this._index > r && (this._index = 0);
+            r = this._canvas.height;
             g.globalAlpha = 1;
             g.fillStyle = "black";
-            g.fillRect(l + v * (k + 1), 0, 4 * k, this._canvas.height);
-            var d = Math.min(1E3 / 60 / h, 1);
+            g.fillRect(k + p * (f + 1), 0, 4 * f, this._canvas.height);
+            var t = Math.min(1E3 / 60 / d, 1);
             g.fillStyle = "#00FF00";
-            g.globalAlpha = c ? .5 : 1;
-            d = s / 2 * d | 0;
-            g.fillRect(l + v * (k + 1), s - d, k, d);
-            a && (d = Math.min(1E3 / 240 / a, 1), g.fillStyle = "#FF6347", d = s / 2 * d | 0, g.fillRect(l + v * (k + 1), s / 2 - d, k, d));
-            0 === v % 16 && (g.globalAlpha = 1, g.fillStyle = "black", g.fillRect(0, 0, l, this._canvas.height), g.fillStyle = "white", g.font = 8 * this._ratio + "px Arial", g.textBaseline = "middle", k = (1E3 / h).toFixed(0), a && (k += " " + a.toFixed(0)), n.memory && (k += " " + (n.memory.usedJSHeapSize / 1024 / 1024).toFixed(2)), g.fillText(k, 2 * this._ratio, this._containerHeight / 2 * this._ratio));
+            g.globalAlpha = b ? .5 : 1;
+            t = r / 2 * t | 0;
+            g.fillRect(k + p * (f + 1), r - t, f, t);
+            a && (t = Math.min(1E3 / 240 / a, 1), g.fillStyle = "#FF6347", t = r / 2 * t | 0, g.fillRect(k + p * (f + 1), r / 2 - t, f, t));
+            0 === p % 16 && (g.globalAlpha = 1, g.fillStyle = "black", g.fillRect(0, 0, k, this._canvas.height), g.fillStyle = "white", g.font = 8 * this._ratio + "px Arial", g.textBaseline = "middle", f = (1E3 / d).toFixed(0), a && (f += " " + a.toFixed(0)), m.memory && (f += " " + (m.memory.usedJSHeapSize / 1024 / 1024).toFixed(2)), g.fillText(f, 2 * this._ratio, this._containerHeight / 2 * this._ratio));
             this._lastTime = performance.now();
-            this._lastWeightedTime = h;
+            this._lastWeightedTime = d;
           }
         };
-        return c;
+        return b;
       }();
-      g.FPS = c;
-    })(l.Mini || (l.Mini = {}));
-  })(l.Tools || (l.Tools = {}));
+      g.FPS = b;
+    })(k.Mini || (k.Mini = {}));
+  })(k.Tools || (k.Tools = {}));
 })(Shumway || (Shumway = {}));
 console.timeEnd("Load Shared Dependencies");
 console.time("Load GFX Dependencies");
-(function(l) {
-  (function(r) {
-    function g(b, f, a) {
-      return p && a ? "string" === typeof f ? (b = l.ColorUtilities.cssStyleToRGBA(f), l.ColorUtilities.rgbaToCSSStyle(a.transformRGBA(b))) : f instanceof CanvasGradient && f._template ? f._template.createCanvasGradient(b, a) : f : f;
+(function(k) {
+  (function(p) {
+    function g(a, c, e) {
+      return n && e ? "string" === typeof c ? (a = k.ColorUtilities.cssStyleToRGBA(c), k.ColorUtilities.rgbaToCSSStyle(e.transformRGBA(a))) : c instanceof CanvasGradient && c._template ? c._template.createCanvasGradient(a, e) : c : c;
     }
-    var c = l.NumberUtilities.clamp;
-    (function(b) {
-      b[b.None = 0] = "None";
-      b[b.Brief = 1] = "Brief";
-      b[b.Verbose = 2] = "Verbose";
-    })(r.TraceLevel || (r.TraceLevel = {}));
-    var t = l.Metrics.Counter.instance;
-    r.frameCounter = new l.Metrics.Counter(!0);
-    r.traceLevel = 2;
-    r.writer = null;
-    r.frameCount = function(b) {
-      t.count(b);
-      r.frameCounter.count(b);
-    };
-    r.timelineBuffer = new l.Tools.Profiler.TimelineBuffer("GFX");
-    r.enterTimeline = function(b, f) {
-    };
-    r.leaveTimeline = function(b, f) {
-    };
-    var m = null, a = null, h = null, p = !0;
-    p && "undefined" !== typeof CanvasRenderingContext2D && (m = CanvasGradient.prototype.addColorStop, a = CanvasRenderingContext2D.prototype.createLinearGradient, h = CanvasRenderingContext2D.prototype.createRadialGradient, CanvasRenderingContext2D.prototype.createLinearGradient = function(b, f, a, e) {
-      return(new u(b, f, a, e)).createCanvasGradient(this, null);
-    }, CanvasRenderingContext2D.prototype.createRadialGradient = function(b, f, a, e, d, c) {
-      return(new n(b, f, a, e, d, c)).createCanvasGradient(this, null);
-    }, CanvasGradient.prototype.addColorStop = function(b, f) {
-      m.call(this, b, f);
-      this._template.addColorStop(b, f);
+    var b = k.NumberUtilities.clamp;
+    (function(a) {
+      a[a.None = 0] = "None";
+      a[a.Brief = 1] = "Brief";
+      a[a.Verbose = 2] = "Verbose";
+    })(p.TraceLevel || (p.TraceLevel = {}));
+    var u = k.Metrics.Counter.instance;
+    p.frameCounter = new k.Metrics.Counter(!0);
+    p.traceLevel = 2;
+    p.writer = null;
+    p.frameCount = function(a) {
+      u.count(a);
+      p.frameCounter.count(a);
+    };
+    p.timelineBuffer = new k.Tools.Profiler.TimelineBuffer("GFX");
+    p.enterTimeline = function(a, c) {
+    };
+    p.leaveTimeline = function(a, c) {
+    };
+    var h = null, a = null, d = null, n = !0;
+    n && "undefined" !== typeof CanvasRenderingContext2D && (h = CanvasGradient.prototype.addColorStop, a = CanvasRenderingContext2D.prototype.createLinearGradient, d = CanvasRenderingContext2D.prototype.createRadialGradient, CanvasRenderingContext2D.prototype.createLinearGradient = function(a, c, e, b) {
+      return(new v(a, c, e, b)).createCanvasGradient(this, null);
+    }, CanvasRenderingContext2D.prototype.createRadialGradient = function(a, c, e, b, q, d) {
+      return(new m(a, c, e, b, q, d)).createCanvasGradient(this, null);
+    }, CanvasGradient.prototype.addColorStop = function(a, c) {
+      h.call(this, a, c);
+      this._template.addColorStop(a, c);
     });
-    var k = function() {
-      return function(b, f) {
-        this.offset = b;
-        this.color = f;
-      };
-    }(), u = function() {
-      function b(f, a, e, d) {
-        this.x0 = f;
-        this.y0 = a;
-        this.x1 = e;
-        this.y1 = d;
+    var f = function() {
+      return function(a, c) {
+        this.offset = a;
+        this.color = c;
+      };
+    }(), v = function() {
+      function c(a, e, b, q) {
+        this.x0 = a;
+        this.y0 = e;
+        this.x1 = b;
+        this.y1 = q;
         this.colorStops = [];
       }
-      b.prototype.addColorStop = function(b, f) {
-        this.colorStops.push(new k(b, f));
+      c.prototype.addColorStop = function(a, c) {
+        this.colorStops.push(new f(a, c));
       };
-      b.prototype.createCanvasGradient = function(b, f) {
-        for (var e = a.call(b, this.x0, this.y0, this.x1, this.y1), d = this.colorStops, c = 0;c < d.length;c++) {
-          var q = d[c], w = q.offset, q = q.color, q = f ? g(b, q, f) : q;
-          m.call(e, w, q);
+      c.prototype.createCanvasGradient = function(c, e) {
+        for (var b = a.call(c, this.x0, this.y0, this.x1, this.y1), q = this.colorStops, d = 0;d < q.length;d++) {
+          var s = q[d], l = s.offset, s = s.color, s = e ? g(c, s, e) : s;
+          h.call(b, l, s);
         }
-        e._template = this;
-        e._transform = this._transform;
-        return e;
+        b._template = this;
+        b._transform = this._transform;
+        return b;
       };
-      return b;
-    }(), n = function() {
-      function b(f, a, e, d, c, q) {
-        this.x0 = f;
-        this.y0 = a;
-        this.r0 = e;
-        this.x1 = d;
-        this.y1 = c;
-        this.r1 = q;
+      return c;
+    }(), m = function() {
+      function a(c, e, b, q, d, s) {
+        this.x0 = c;
+        this.y0 = e;
+        this.r0 = b;
+        this.x1 = q;
+        this.y1 = d;
+        this.r1 = s;
         this.colorStops = [];
       }
-      b.prototype.addColorStop = function(b, f) {
-        this.colorStops.push(new k(b, f));
+      a.prototype.addColorStop = function(a, c) {
+        this.colorStops.push(new f(a, c));
       };
-      b.prototype.createCanvasGradient = function(b, f) {
-        for (var a = h.call(b, this.x0, this.y0, this.r0, this.x1, this.y1, this.r1), e = this.colorStops, d = 0;d < e.length;d++) {
-          var c = e[d], q = c.offset, c = c.color, c = f ? g(b, c, f) : c;
-          m.call(a, q, c);
+      a.prototype.createCanvasGradient = function(a, c) {
+        for (var e = d.call(a, this.x0, this.y0, this.r0, this.x1, this.y1, this.r1), b = this.colorStops, q = 0;q < b.length;q++) {
+          var s = b[q], l = s.offset, s = s.color, s = c ? g(a, s, c) : s;
+          h.call(e, l, s);
         }
-        a._template = this;
-        a._transform = this._transform;
-        return a;
+        e._template = this;
+        e._transform = this._transform;
+        return e;
       };
-      return b;
-    }(), s;
-    (function(b) {
-      b[b.ClosePath = 1] = "ClosePath";
-      b[b.MoveTo = 2] = "MoveTo";
-      b[b.LineTo = 3] = "LineTo";
-      b[b.QuadraticCurveTo = 4] = "QuadraticCurveTo";
-      b[b.BezierCurveTo = 5] = "BezierCurveTo";
-      b[b.ArcTo = 6] = "ArcTo";
-      b[b.Rect = 7] = "Rect";
-      b[b.Arc = 8] = "Arc";
-      b[b.Save = 9] = "Save";
-      b[b.Restore = 10] = "Restore";
-      b[b.Transform = 11] = "Transform";
-    })(s || (s = {}));
-    var v = function() {
-      function b(f) {
-        this._commands = new Uint8Array(b._arrayBufferPool.acquire(8), 0, 8);
+      return a;
+    }(), r;
+    (function(a) {
+      a[a.ClosePath = 1] = "ClosePath";
+      a[a.MoveTo = 2] = "MoveTo";
+      a[a.LineTo = 3] = "LineTo";
+      a[a.QuadraticCurveTo = 4] = "QuadraticCurveTo";
+      a[a.BezierCurveTo = 5] = "BezierCurveTo";
+      a[a.ArcTo = 6] = "ArcTo";
+      a[a.Rect = 7] = "Rect";
+      a[a.Arc = 8] = "Arc";
+      a[a.Save = 9] = "Save";
+      a[a.Restore = 10] = "Restore";
+      a[a.Transform = 11] = "Transform";
+    })(r || (r = {}));
+    var w = function() {
+      function a(c) {
+        this._commands = new Uint8Array(a._arrayBufferPool.acquire(8), 0, 8);
         this._commandPosition = 0;
-        this._data = new Float64Array(b._arrayBufferPool.acquire(8 * Float64Array.BYTES_PER_ELEMENT), 0, 8);
+        this._data = new Float64Array(a._arrayBufferPool.acquire(8 * Float64Array.BYTES_PER_ELEMENT), 0, 8);
         this._dataPosition = 0;
-        f instanceof b && this.addPath(f);
+        c instanceof a && this.addPath(c);
       }
-      b._apply = function(b, f) {
-        var a = b._commands, e = b._data, d = 0, c = 0;
-        f.beginPath();
-        for (var q = b._commandPosition;d < q;) {
-          switch(a[d++]) {
+      a._apply = function(a, c) {
+        var e = a._commands, b = a._data, q = 0, d = 0;
+        c.beginPath();
+        for (var s = a._commandPosition;q < s;) {
+          switch(e[q++]) {
             case 1:
-              f.closePath();
+              c.closePath();
               break;
             case 2:
-              f.moveTo(e[c++], e[c++]);
+              c.moveTo(b[d++], b[d++]);
               break;
             case 3:
-              f.lineTo(e[c++], e[c++]);
+              c.lineTo(b[d++], b[d++]);
               break;
             case 4:
-              f.quadraticCurveTo(e[c++], e[c++], e[c++], e[c++]);
+              c.quadraticCurveTo(b[d++], b[d++], b[d++], b[d++]);
               break;
             case 5:
-              f.bezierCurveTo(e[c++], e[c++], e[c++], e[c++], e[c++], e[c++]);
+              c.bezierCurveTo(b[d++], b[d++], b[d++], b[d++], b[d++], b[d++]);
               break;
             case 6:
-              f.arcTo(e[c++], e[c++], e[c++], e[c++], e[c++]);
+              c.arcTo(b[d++], b[d++], b[d++], b[d++], b[d++]);
               break;
             case 7:
-              f.rect(e[c++], e[c++], e[c++], e[c++]);
+              c.rect(b[d++], b[d++], b[d++], b[d++]);
               break;
             case 8:
-              f.arc(e[c++], e[c++], e[c++], e[c++], e[c++], !!e[c++]);
+              c.arc(b[d++], b[d++], b[d++], b[d++], b[d++], !!b[d++]);
               break;
             case 9:
-              f.save();
+              c.save();
               break;
             case 10:
-              f.restore();
+              c.restore();
               break;
             case 11:
-              f.transform(e[c++], e[c++], e[c++], e[c++], e[c++], e[c++]);
+              c.transform(b[d++], b[d++], b[d++], b[d++], b[d++], b[d++]);
           }
         }
       };
-      b.prototype._ensureCommandCapacity = function(f) {
-        this._commands = b._arrayBufferPool.ensureUint8ArrayLength(this._commands, f);
+      a.prototype._ensureCommandCapacity = function(c) {
+        this._commands = a._arrayBufferPool.ensureUint8ArrayLength(this._commands, c);
       };
-      b.prototype._ensureDataCapacity = function(f) {
-        this._data = b._arrayBufferPool.ensureFloat64ArrayLength(this._data, f);
+      a.prototype._ensureDataCapacity = function(c) {
+        this._data = a._arrayBufferPool.ensureFloat64ArrayLength(this._data, c);
       };
-      b.prototype._writeCommand = function(b) {
+      a.prototype._writeCommand = function(a) {
         this._commandPosition >= this._commands.length && this._ensureCommandCapacity(this._commandPosition + 1);
-        this._commands[this._commandPosition++] = b;
+        this._commands[this._commandPosition++] = a;
       };
-      b.prototype._writeData = function(b, f, a, e, c, d) {
-        var q = arguments.length;
-        this._dataPosition + q >= this._data.length && this._ensureDataCapacity(this._dataPosition + q);
-        var w = this._data, h = this._dataPosition;
-        w[h] = b;
-        w[h + 1] = f;
-        2 < q && (w[h + 2] = a, w[h + 3] = e, 4 < q && (w[h + 4] = c, 6 === q && (w[h + 5] = d)));
-        this._dataPosition += q;
+      a.prototype._writeData = function(a, c, e, b, q, d) {
+        var s = arguments.length;
+        this._dataPosition + s >= this._data.length && this._ensureDataCapacity(this._dataPosition + s);
+        var l = this._data, m = this._dataPosition;
+        l[m] = a;
+        l[m + 1] = c;
+        2 < s && (l[m + 2] = e, l[m + 3] = b, 4 < s && (l[m + 4] = q, 6 === s && (l[m + 5] = d)));
+        this._dataPosition += s;
       };
-      b.prototype.closePath = function() {
+      a.prototype.closePath = function() {
         this._writeCommand(1);
       };
-      b.prototype.moveTo = function(b, f) {
+      a.prototype.moveTo = function(a, c) {
         this._writeCommand(2);
-        this._writeData(b, f);
+        this._writeData(a, c);
       };
-      b.prototype.lineTo = function(b, f) {
+      a.prototype.lineTo = function(a, c) {
         this._writeCommand(3);
-        this._writeData(b, f);
+        this._writeData(a, c);
       };
-      b.prototype.quadraticCurveTo = function(b, f, a, e) {
+      a.prototype.quadraticCurveTo = function(a, c, e, b) {
         this._writeCommand(4);
-        this._writeData(b, f, a, e);
+        this._writeData(a, c, e, b);
       };
-      b.prototype.bezierCurveTo = function(b, f, a, e, c, d) {
+      a.prototype.bezierCurveTo = function(a, c, e, b, q, d) {
         this._writeCommand(5);
-        this._writeData(b, f, a, e, c, d);
+        this._writeData(a, c, e, b, q, d);
       };
-      b.prototype.arcTo = function(b, f, a, e, c) {
+      a.prototype.arcTo = function(a, c, e, b, q) {
         this._writeCommand(6);
-        this._writeData(b, f, a, e, c);
+        this._writeData(a, c, e, b, q);
       };
-      b.prototype.rect = function(b, f, a, e) {
+      a.prototype.rect = function(a, c, e, b) {
         this._writeCommand(7);
-        this._writeData(b, f, a, e);
+        this._writeData(a, c, e, b);
       };
-      b.prototype.arc = function(b, f, a, e, c, d) {
+      a.prototype.arc = function(a, c, e, b, q, d) {
         this._writeCommand(8);
-        this._writeData(b, f, a, e, c, +d);
+        this._writeData(a, c, e, b, q, +d);
       };
-      b.prototype.addPath = function(b, f) {
-        f && (this._writeCommand(9), this._writeCommand(11), this._writeData(f.a, f.b, f.c, f.d, f.e, f.f));
-        var a = this._commandPosition + b._commandPosition;
-        a >= this._commands.length && this._ensureCommandCapacity(a);
-        for (var e = this._commands, c = b._commands, d = this._commandPosition, q = 0;d < a;d++) {
-          e[d] = c[q++];
-        }
-        this._commandPosition = a;
-        a = this._dataPosition + b._dataPosition;
-        a >= this._data.length && this._ensureDataCapacity(a);
-        e = this._data;
-        c = b._data;
+      a.prototype.addPath = function(a, c) {
+        c && (this._writeCommand(9), this._writeCommand(11), this._writeData(c.a, c.b, c.c, c.d, c.e, c.f));
+        var e = this._commandPosition + a._commandPosition;
+        e >= this._commands.length && this._ensureCommandCapacity(e);
+        for (var b = this._commands, q = a._commands, d = this._commandPosition, s = 0;d < e;d++) {
+          b[d] = q[s++];
+        }
+        this._commandPosition = e;
+        e = this._dataPosition + a._dataPosition;
+        e >= this._data.length && this._ensureDataCapacity(e);
+        b = this._data;
+        q = a._data;
         d = this._dataPosition;
-        for (q = 0;d < a;d++) {
-          e[d] = c[q++];
+        for (s = 0;d < e;d++) {
+          b[d] = q[s++];
         }
-        this._dataPosition = a;
-        f && this._writeCommand(10);
+        this._dataPosition = e;
+        c && this._writeCommand(10);
       };
-      b._arrayBufferPool = new l.ArrayBufferPool;
-      return b;
+      a._arrayBufferPool = new k.ArrayBufferPool;
+      return a;
     }();
-    r.Path = v;
+    p.Path = w;
     if ("undefined" !== typeof CanvasRenderingContext2D && ("undefined" === typeof Path2D || !Path2D.prototype.addPath)) {
-      var d = CanvasRenderingContext2D.prototype.fill;
-      CanvasRenderingContext2D.prototype.fill = function(b, f) {
-        arguments.length && (b instanceof v ? v._apply(b, this) : f = b);
-        f ? d.call(this, f) : d.call(this);
-      };
-      var e = CanvasRenderingContext2D.prototype.stroke;
-      CanvasRenderingContext2D.prototype.stroke = function(b, f) {
-        arguments.length && (b instanceof v ? v._apply(b, this) : f = b);
-        f ? e.call(this, f) : e.call(this);
-      };
-      var b = CanvasRenderingContext2D.prototype.clip;
-      CanvasRenderingContext2D.prototype.clip = function(f, a) {
-        arguments.length && (f instanceof v ? v._apply(f, this) : a = f);
-        a ? b.call(this, a) : b.call(this);
+      var t = CanvasRenderingContext2D.prototype.fill;
+      CanvasRenderingContext2D.prototype.fill = function(a, c) {
+        arguments.length && (a instanceof w ? w._apply(a, this) : c = a);
+        c ? t.call(this, c) : t.call(this);
+      };
+      var l = CanvasRenderingContext2D.prototype.stroke;
+      CanvasRenderingContext2D.prototype.stroke = function(a, c) {
+        arguments.length && (a instanceof w ? w._apply(a, this) : c = a);
+        c ? l.call(this, c) : l.call(this);
+      };
+      var c = CanvasRenderingContext2D.prototype.clip;
+      CanvasRenderingContext2D.prototype.clip = function(a, e) {
+        arguments.length && (a instanceof w ? w._apply(a, this) : e = a);
+        e ? c.call(this, e) : c.call(this);
       };
-      window.Path2D = v;
+      window.Path2D = w;
     }
     if ("undefined" !== typeof CanvasPattern && Path2D.prototype.addPath) {
-      s = function(b) {
-        this._transform = b;
-        this._template && (this._template._transform = b);
-      };
-      CanvasPattern.prototype.setTransform || (CanvasPattern.prototype.setTransform = s);
-      CanvasGradient.prototype.setTransform || (CanvasGradient.prototype.setTransform = s);
-      var f = CanvasRenderingContext2D.prototype.fill, q = CanvasRenderingContext2D.prototype.stroke;
-      CanvasRenderingContext2D.prototype.fill = function(b, a) {
-        var e = !!this.fillStyle._transform;
-        if ((this.fillStyle instanceof CanvasPattern || this.fillStyle instanceof CanvasGradient) && e && b instanceof Path2D) {
-          var e = this.fillStyle._transform, c;
+      r = function(a) {
+        this._transform = a;
+        this._template && (this._template._transform = a);
+      };
+      CanvasPattern.prototype.setTransform || (CanvasPattern.prototype.setTransform = r);
+      CanvasGradient.prototype.setTransform || (CanvasGradient.prototype.setTransform = r);
+      var e = CanvasRenderingContext2D.prototype.fill, q = CanvasRenderingContext2D.prototype.stroke;
+      CanvasRenderingContext2D.prototype.fill = function(a, c) {
+        var b = !!this.fillStyle._transform;
+        if ((this.fillStyle instanceof CanvasPattern || this.fillStyle instanceof CanvasGradient) && b && a instanceof Path2D) {
+          var b = this.fillStyle._transform, q;
           try {
-            c = e.inverse();
+            q = b.inverse();
           } catch (d) {
-            c = e = r.Geometry.Matrix.createIdentitySVGMatrix();
+            q = b = p.Geometry.Matrix.createIdentitySVGMatrix();
           }
-          this.transform(e.a, e.b, e.c, e.d, e.e, e.f);
-          e = new Path2D;
-          e.addPath(b, c);
-          f.call(this, e, a);
-          this.transform(c.a, c.b, c.c, c.d, c.e, c.f);
+          this.transform(b.a, b.b, b.c, b.d, b.e, b.f);
+          b = new Path2D;
+          b.addPath(a, q);
+          e.call(this, b, c);
+          this.transform(q.a, q.b, q.c, q.d, q.e, q.f);
         } else {
-          0 === arguments.length ? f.call(this) : 1 === arguments.length ? f.call(this, b) : 2 === arguments.length && f.call(this, b, a);
+          0 === arguments.length ? e.call(this) : 1 === arguments.length ? e.call(this, a) : 2 === arguments.length && e.call(this, a, c);
         }
       };
-      CanvasRenderingContext2D.prototype.stroke = function(b) {
-        var f = !!this.strokeStyle._transform;
-        if ((this.strokeStyle instanceof CanvasPattern || this.strokeStyle instanceof CanvasGradient) && f && b instanceof Path2D) {
-          var a = this.strokeStyle._transform, f = a.inverse();
-          this.transform(a.a, a.b, a.c, a.d, a.e, a.f);
-          a = new Path2D;
-          a.addPath(b, f);
-          var e = this.lineWidth;
-          this.lineWidth *= (f.a + f.d) / 2;
-          q.call(this, a);
-          this.transform(f.a, f.b, f.c, f.d, f.e, f.f);
-          this.lineWidth = e;
+      CanvasRenderingContext2D.prototype.stroke = function(a) {
+        var c = !!this.strokeStyle._transform;
+        if ((this.strokeStyle instanceof CanvasPattern || this.strokeStyle instanceof CanvasGradient) && c && a instanceof Path2D) {
+          var e = this.strokeStyle._transform, c = e.inverse();
+          this.transform(e.a, e.b, e.c, e.d, e.e, e.f);
+          e = new Path2D;
+          e.addPath(a, c);
+          var b = this.lineWidth;
+          this.lineWidth *= (c.a + c.d) / 2;
+          q.call(this, e);
+          this.transform(c.a, c.b, c.c, c.d, c.e, c.f);
+          this.lineWidth = b;
         } else {
-          0 === arguments.length ? q.call(this) : 1 === arguments.length && q.call(this, b);
+          0 === arguments.length ? q.call(this) : 1 === arguments.length && q.call(this, a);
         }
       };
     }
     "undefined" !== typeof CanvasRenderingContext2D && function() {
-      function b() {
-        return r.Geometry.Matrix.createSVGMatrixFromArray(this.mozCurrentTransform);
+      function a() {
+        return p.Geometry.Matrix.createSVGMatrixFromArray(this.mozCurrentTransform);
       }
-      CanvasRenderingContext2D.prototype.flashStroke = function(b, f) {
-        var a = this.currentTransform;
-        if (a) {
-          var e = new Path2D;
-          e.addPath(b, a);
+      CanvasRenderingContext2D.prototype.flashStroke = function(a, c) {
+        var e = this.currentTransform;
+        if (e) {
+          var q = new Path2D;
+          q.addPath(a, e);
           var d = this.lineWidth;
           this.setTransform(1, 0, 0, 1, 0, 0);
-          switch(f) {
+          switch(c) {
             case 1:
-              this.lineWidth = c(d * (l.getScaleX(a) + l.getScaleY(a)) / 2, 1, 1024);
+              this.lineWidth = b(d * (k.getScaleX(e) + k.getScaleY(e)) / 2, 1, 1024);
               break;
             case 2:
-              this.lineWidth = c(d * l.getScaleY(a), 1, 1024);
+              this.lineWidth = b(d * k.getScaleY(e), 1, 1024);
               break;
             case 3:
-              this.lineWidth = c(d * l.getScaleX(a), 1, 1024);
+              this.lineWidth = b(d * k.getScaleX(e), 1, 1024);
           }
-          this.stroke(e);
-          this.setTransform(a.a, a.b, a.c, a.d, a.e, a.f);
+          this.stroke(q);
+          this.setTransform(e.a, e.b, e.c, e.d, e.e, e.f);
           this.lineWidth = d;
         } else {
-          this.stroke(b);
+          this.stroke(a);
         }
       };
-      !("currentTransform" in CanvasRenderingContext2D.prototype) && "mozCurrentTransform" in CanvasRenderingContext2D.prototype && Object.defineProperty(CanvasRenderingContext2D.prototype, "currentTransform", {get:b});
+      !("currentTransform" in CanvasRenderingContext2D.prototype) && "mozCurrentTransform" in CanvasRenderingContext2D.prototype && Object.defineProperty(CanvasRenderingContext2D.prototype, "currentTransform", {get:a});
     }();
     if ("undefined" !== typeof CanvasRenderingContext2D && void 0 === CanvasRenderingContext2D.prototype.globalColorMatrix) {
-      var w = CanvasRenderingContext2D.prototype.fill, G = CanvasRenderingContext2D.prototype.stroke, U = CanvasRenderingContext2D.prototype.fillText, V = CanvasRenderingContext2D.prototype.strokeText;
+      var s = CanvasRenderingContext2D.prototype.fill, y = CanvasRenderingContext2D.prototype.stroke, I = CanvasRenderingContext2D.prototype.fillText, V = CanvasRenderingContext2D.prototype.strokeText;
       Object.defineProperty(CanvasRenderingContext2D.prototype, "globalColorMatrix", {get:function() {
         return this._globalColorMatrix ? this._globalColorMatrix.clone() : null;
-      }, set:function(b) {
-        b ? this._globalColorMatrix ? this._globalColorMatrix.set(b) : this._globalColorMatrix = b.clone() : this._globalColorMatrix = null;
+      }, set:function(a) {
+        a ? this._globalColorMatrix ? this._globalColorMatrix.set(a) : this._globalColorMatrix = a.clone() : this._globalColorMatrix = null;
       }, enumerable:!0, configurable:!0});
-      CanvasRenderingContext2D.prototype.fill = function(b, f) {
-        var a = null;
-        this._globalColorMatrix && (a = this.fillStyle, this.fillStyle = g(this, this.fillStyle, this._globalColorMatrix));
-        0 === arguments.length ? w.call(this) : 1 === arguments.length ? w.call(this, b) : 2 === arguments.length && w.call(this, b, f);
-        a && (this.fillStyle = a);
-      };
-      CanvasRenderingContext2D.prototype.stroke = function(b, f) {
-        var a = null;
-        this._globalColorMatrix && (a = this.strokeStyle, this.strokeStyle = g(this, this.strokeStyle, this._globalColorMatrix));
-        0 === arguments.length ? G.call(this) : 1 === arguments.length && G.call(this, b);
-        a && (this.strokeStyle = a);
-      };
-      CanvasRenderingContext2D.prototype.fillText = function(b, f, a, e) {
-        var c = null;
-        this._globalColorMatrix && (c = this.fillStyle, this.fillStyle = g(this, this.fillStyle, this._globalColorMatrix));
-        3 === arguments.length ? U.call(this, b, f, a) : 4 === arguments.length ? U.call(this, b, f, a, e) : l.Debug.unexpected();
-        c && (this.fillStyle = c);
-      };
-      CanvasRenderingContext2D.prototype.strokeText = function(b, f, a, e) {
-        var c = null;
-        this._globalColorMatrix && (c = this.strokeStyle, this.strokeStyle = g(this, this.strokeStyle, this._globalColorMatrix));
-        3 === arguments.length ? V.call(this, b, f, a) : 4 === arguments.length ? V.call(this, b, f, a, e) : l.Debug.unexpected();
-        c && (this.strokeStyle = c);
-      };
-    }
-  })(l.GFX || (l.GFX = {}));
-})(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
-    l.ScreenShot = function() {
-      return function(g, c, l) {
+      CanvasRenderingContext2D.prototype.fill = function(a, c) {
+        var e = null;
+        this._globalColorMatrix && (e = this.fillStyle, this.fillStyle = g(this, this.fillStyle, this._globalColorMatrix));
+        0 === arguments.length ? s.call(this) : 1 === arguments.length ? s.call(this, a) : 2 === arguments.length && s.call(this, a, c);
+        e && (this.fillStyle = e);
+      };
+      CanvasRenderingContext2D.prototype.stroke = function(a, c) {
+        var e = null;
+        this._globalColorMatrix && (e = this.strokeStyle, this.strokeStyle = g(this, this.strokeStyle, this._globalColorMatrix));
+        0 === arguments.length ? y.call(this) : 1 === arguments.length && y.call(this, a);
+        e && (this.strokeStyle = e);
+      };
+      CanvasRenderingContext2D.prototype.fillText = function(a, c, e, b) {
+        var q = null;
+        this._globalColorMatrix && (q = this.fillStyle, this.fillStyle = g(this, this.fillStyle, this._globalColorMatrix));
+        3 === arguments.length ? I.call(this, a, c, e) : 4 === arguments.length ? I.call(this, a, c, e, b) : k.Debug.unexpected();
+        q && (this.fillStyle = q);
+      };
+      CanvasRenderingContext2D.prototype.strokeText = function(a, c, e, b) {
+        var q = null;
+        this._globalColorMatrix && (q = this.strokeStyle, this.strokeStyle = g(this, this.strokeStyle, this._globalColorMatrix));
+        3 === arguments.length ? V.call(this, a, c, e) : 4 === arguments.length ? V.call(this, a, c, e, b) : k.Debug.unexpected();
+        q && (this.strokeStyle = q);
+      };
+    }
+  })(k.GFX || (k.GFX = {}));
+})(Shumway || (Shumway = {}));
+(function(k) {
+  (function(k) {
+    k.ScreenShot = function() {
+      return function(g, b, k) {
         this.dataURL = g;
-        this.w = c;
-        this.h = l;
+        this.w = b;
+        this.h = k;
       };
     }();
-  })(l.GFX || (l.GFX = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  var r = function() {
+(function(k) {
+  var p = function() {
     function g() {
       this._count = 0;
       this._head = this._tail = null;
@@ -7004,39 +7013,39 @@
     Object.defineProperty(g.prototype, "head", {get:function() {
       return this._head;
     }, enumerable:!0, configurable:!0});
-    g.prototype._unshift = function(c) {
-      0 === this._count ? this._head = this._tail = c : (c.next = this._head, this._head = c.next.previous = c);
+    g.prototype._unshift = function(b) {
+      0 === this._count ? this._head = this._tail = b : (b.next = this._head, this._head = b.next.previous = b);
       this._count++;
     };
-    g.prototype._remove = function(c) {
-      c === this._head && c === this._tail ? this._head = this._tail = null : c === this._head ? (this._head = c.next, this._head.previous = null) : c == this._tail ? (this._tail = c.previous, this._tail.next = null) : (c.previous.next = c.next, c.next.previous = c.previous);
-      c.previous = c.next = null;
+    g.prototype._remove = function(b) {
+      b === this._head && b === this._tail ? this._head = this._tail = null : b === this._head ? (this._head = b.next, this._head.previous = null) : b == this._tail ? (this._tail = b.previous, this._tail.next = null) : (b.previous.next = b.next, b.next.previous = b.previous);
+      b.previous = b.next = null;
       this._count--;
     };
-    g.prototype.use = function(c) {
-      this._head !== c && ((c.next || c.previous || this._tail === c) && this._remove(c), this._unshift(c));
+    g.prototype.use = function(b) {
+      this._head !== b && ((b.next || b.previous || this._tail === b) && this._remove(b), this._unshift(b));
     };
     g.prototype.pop = function() {
       if (!this._tail) {
         return null;
       }
-      var c = this._tail;
-      this._remove(c);
-      return c;
+      var b = this._tail;
+      this._remove(b);
+      return b;
     };
-    g.prototype.visit = function(c, g) {
+    g.prototype.visit = function(b, g) {
       void 0 === g && (g = !0);
-      for (var m = g ? this._head : this._tail;m && c(m);) {
-        m = g ? m.next : m.previous;
+      for (var h = g ? this._head : this._tail;h && b(h);) {
+        h = g ? h.next : h.previous;
       }
     };
     return g;
   }();
-  l.LRUList = r;
-  l.getScaleX = function(g) {
+  k.LRUList = p;
+  k.getScaleX = function(g) {
     return g.a;
   };
-  l.getScaleY = function(g) {
+  k.getScaleY = function(g) {
     return g.d;
   };
 })(Shumway || (Shumway = {}));
@@ -7081,227 +7090,227 @@
 GFX$$inline_29.cacheShapes = canvas2DOptions$$inline_36.register(new Option$$inline_30("", "cacheShapes", "boolean", !0, ""));
 GFX$$inline_29.cacheShapesMaxSize = canvas2DOptions$$inline_36.register(new Option$$inline_30("", "cacheShapesMaxSize", "number", 256, "", {range:{min:1, max:1024, step:1}}));
 GFX$$inline_29.cacheShapesThreshold = canvas2DOptions$$inline_36.register(new Option$$inline_30("", "cacheShapesThreshold", "number", 256, "", {range:{min:1, max:1024, step:1}}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      function c(a, b, f, c) {
-        var d = 1 - c;
-        return a * d * d + 2 * b * d * c + f * c * c;
-      }
-      function t(a, b, f, c, d) {
-        var h = d * d, n = 1 - d, g = n * n;
-        return a * n * g + 3 * b * d * g + 3 * f * n * h + c * d * h;
+      function b(a, c, e, b) {
+        var d = 1 - b;
+        return a * d * d + 2 * c * d * b + e * b * b;
+      }
+      function u(a, c, e, b, d) {
+        var m = d * d, f = 1 - d, g = f * f;
+        return a * f * g + 3 * c * d * g + 3 * e * f * m + b * d * m;
       }
-      var m = l.NumberUtilities.clamp, a = l.NumberUtilities.pow2, h = l.NumberUtilities.epsilonEquals;
+      var h = k.NumberUtilities.clamp, a = k.NumberUtilities.pow2, d = k.NumberUtilities.epsilonEquals;
       g.radianToDegrees = function(a) {
         return 180 * a / Math.PI;
       };
       g.degreesToRadian = function(a) {
         return a * Math.PI / 180;
       };
-      g.quadraticBezier = c;
-      g.quadraticBezierExtreme = function(a, b, f) {
-        var d = (a - b) / (a - 2 * b + f);
-        return 0 > d ? a : 1 < d ? f : c(a, b, f, d);
-      };
-      g.cubicBezier = t;
-      g.cubicBezierExtremes = function(a, b, f, c) {
-        var d = b - a, h;
-        h = 2 * (f - b);
-        var n = c - f;
-        d + n === h && (n *= 1.0001);
-        var g = 2 * d - h, k = h - 2 * d, k = Math.sqrt(k * k - 4 * d * (d - h + n));
-        h = 2 * (d - h + n);
-        d = (g + k) / h;
-        g = (g - k) / h;
-        k = [];
-        0 <= d && 1 >= d && k.push(t(a, b, f, c, d));
-        0 <= g && 1 >= g && k.push(t(a, b, f, c, g));
-        return k;
+      g.quadraticBezier = b;
+      g.quadraticBezierExtreme = function(a, c, e) {
+        var q = (a - c) / (a - 2 * c + e);
+        return 0 > q ? a : 1 < q ? e : b(a, c, e, q);
+      };
+      g.cubicBezier = u;
+      g.cubicBezierExtremes = function(a, c, e, b) {
+        var d = c - a, m;
+        m = 2 * (e - c);
+        var f = b - e;
+        d + f === m && (f *= 1.0001);
+        var g = 2 * d - m, h = m - 2 * d, h = Math.sqrt(h * h - 4 * d * (d - m + f));
+        m = 2 * (d - m + f);
+        d = (g + h) / m;
+        g = (g - h) / m;
+        h = [];
+        0 <= d && 1 >= d && h.push(u(a, c, e, b, d));
+        0 <= g && 1 >= g && h.push(u(a, c, e, b, g));
+        return h;
       };
-      var p = function() {
-        function a(b, f) {
-          this.x = b;
-          this.y = f;
-        }
-        a.prototype.setElements = function(b, f) {
-          this.x = b;
-          this.y = f;
+      var n = function() {
+        function a(c, e) {
+          this.x = c;
+          this.y = e;
+        }
+        a.prototype.setElements = function(a, e) {
+          this.x = a;
+          this.y = e;
           return this;
         };
-        a.prototype.set = function(b) {
-          this.x = b.x;
-          this.y = b.y;
+        a.prototype.set = function(a) {
+          this.x = a.x;
+          this.y = a.y;
           return this;
         };
-        a.prototype.dot = function(b) {
-          return this.x * b.x + this.y * b.y;
+        a.prototype.dot = function(a) {
+          return this.x * a.x + this.y * a.y;
         };
         a.prototype.squaredLength = function() {
           return this.dot(this);
         };
-        a.prototype.distanceTo = function(b) {
-          return Math.sqrt(this.dot(b));
+        a.prototype.distanceTo = function(a) {
+          return Math.sqrt(this.dot(a));
         };
-        a.prototype.sub = function(b) {
-          this.x -= b.x;
-          this.y -= b.y;
+        a.prototype.sub = function(a) {
+          this.x -= a.x;
+          this.y -= a.y;
           return this;
         };
-        a.prototype.mul = function(b) {
-          this.x *= b;
-          this.y *= b;
+        a.prototype.mul = function(a) {
+          this.x *= a;
+          this.y *= a;
           return this;
         };
         a.prototype.clone = function() {
           return new a(this.x, this.y);
         };
-        a.prototype.toString = function(b) {
-          void 0 === b && (b = 2);
-          return "{x: " + this.x.toFixed(b) + ", y: " + this.y.toFixed(b) + "}";
-        };
-        a.prototype.inTriangle = function(b, f, a) {
-          var e = b.y * a.x - b.x * a.y + (a.y - b.y) * this.x + (b.x - a.x) * this.y, c = b.x * f.y - b.y * f.x + (b.y - f.y) * this.x + (f.x - b.x) * this.y;
-          if (0 > e != 0 > c) {
+        a.prototype.toString = function(a) {
+          void 0 === a && (a = 2);
+          return "{x: " + this.x.toFixed(a) + ", y: " + this.y.toFixed(a) + "}";
+        };
+        a.prototype.inTriangle = function(a, e, b) {
+          var d = a.y * b.x - a.x * b.y + (b.y - a.y) * this.x + (a.x - b.x) * this.y, l = a.x * e.y - a.y * e.x + (a.y - e.y) * this.x + (e.x - a.x) * this.y;
+          if (0 > d != 0 > l) {
             return!1;
           }
-          b = -f.y * a.x + b.y * (a.x - f.x) + b.x * (f.y - a.y) + f.x * a.y;
-          0 > b && (e = -e, c = -c, b = -b);
-          return 0 < e && 0 < c && e + c < b;
+          a = -e.y * b.x + a.y * (b.x - e.x) + a.x * (e.y - b.y) + e.x * b.y;
+          0 > a && (d = -d, l = -l, a = -a);
+          return 0 < d && 0 < l && d + l < a;
         };
         a.createEmpty = function() {
           return new a(0, 0);
         };
-        a.createEmptyPoints = function(b) {
-          for (var f = [], c = 0;c < b;c++) {
-            f.push(new a(0, 0));
+        a.createEmptyPoints = function(c) {
+          for (var e = [], b = 0;b < c;b++) {
+            e.push(new a(0, 0));
           }
-          return f;
+          return e;
         };
         return a;
       }();
-      g.Point = p;
-      var k = function() {
-        function a(b, f, e) {
-          this.x = b;
-          this.y = f;
-          this.z = e;
-        }
-        a.prototype.setElements = function(b, f, a) {
-          this.x = b;
-          this.y = f;
-          this.z = a;
+      g.Point = n;
+      var f = function() {
+        function a(c, e, b) {
+          this.x = c;
+          this.y = e;
+          this.z = b;
+        }
+        a.prototype.setElements = function(a, e, b) {
+          this.x = a;
+          this.y = e;
+          this.z = b;
           return this;
         };
-        a.prototype.set = function(b) {
-          this.x = b.x;
-          this.y = b.y;
-          this.z = b.z;
+        a.prototype.set = function(a) {
+          this.x = a.x;
+          this.y = a.y;
+          this.z = a.z;
           return this;
         };
-        a.prototype.dot = function(b) {
-          return this.x * b.x + this.y * b.y + this.z * b.z;
+        a.prototype.dot = function(a) {
+          return this.x * a.x + this.y * a.y + this.z * a.z;
         };
-        a.prototype.cross = function(b) {
-          var f = this.z * b.x - this.x * b.z, a = this.x * b.y - this.y * b.x;
-          this.x = this.y * b.z - this.z * b.y;
-          this.y = f;
-          this.z = a;
+        a.prototype.cross = function(a) {
+          var e = this.z * a.x - this.x * a.z, b = this.x * a.y - this.y * a.x;
+          this.x = this.y * a.z - this.z * a.y;
+          this.y = e;
+          this.z = b;
           return this;
         };
         a.prototype.squaredLength = function() {
           return this.dot(this);
         };
-        a.prototype.sub = function(b) {
-          this.x -= b.x;
-          this.y -= b.y;
-          this.z -= b.z;
+        a.prototype.sub = function(a) {
+          this.x -= a.x;
+          this.y -= a.y;
+          this.z -= a.z;
           return this;
         };
-        a.prototype.mul = function(b) {
-          this.x *= b;
-          this.y *= b;
-          this.z *= b;
+        a.prototype.mul = function(a) {
+          this.x *= a;
+          this.y *= a;
+          this.z *= a;
           return this;
         };
         a.prototype.normalize = function() {
-          var b = Math.sqrt(this.squaredLength());
-          1E-5 < b ? this.mul(1 / b) : this.setElements(0, 0, 0);
+          var a = Math.sqrt(this.squaredLength());
+          1E-5 < a ? this.mul(1 / a) : this.setElements(0, 0, 0);
           return this;
         };
         a.prototype.clone = function() {
           return new a(this.x, this.y, this.z);
         };
-        a.prototype.toString = function(b) {
-          void 0 === b && (b = 2);
-          return "{x: " + this.x.toFixed(b) + ", y: " + this.y.toFixed(b) + ", z: " + this.z.toFixed(b) + "}";
+        a.prototype.toString = function(a) {
+          void 0 === a && (a = 2);
+          return "{x: " + this.x.toFixed(a) + ", y: " + this.y.toFixed(a) + ", z: " + this.z.toFixed(a) + "}";
         };
         a.createEmpty = function() {
           return new a(0, 0, 0);
         };
-        a.createEmptyPoints = function(b) {
-          for (var f = [], c = 0;c < b;c++) {
-            f.push(new a(0, 0, 0));
+        a.createEmptyPoints = function(c) {
+          for (var e = [], b = 0;b < c;b++) {
+            e.push(new a(0, 0, 0));
           }
-          return f;
+          return e;
         };
         return a;
       }();
-      g.Point3D = k;
-      var u = function() {
-        function a(b, f, c, d) {
-          this.setElements(b, f, c, d);
+      g.Point3D = f;
+      var v = function() {
+        function a(c, e, b, d) {
+          this.setElements(c, e, b, d);
           a.allocationCount++;
         }
-        a.prototype.setElements = function(b, f, a, e) {
-          this.x = b;
-          this.y = f;
-          this.w = a;
-          this.h = e;
+        a.prototype.setElements = function(a, e, b, d) {
+          this.x = a;
+          this.y = e;
+          this.w = b;
+          this.h = d;
         };
-        a.prototype.set = function(b) {
-          this.x = b.x;
-          this.y = b.y;
-          this.w = b.w;
-          this.h = b.h;
-        };
-        a.prototype.contains = function(b) {
-          var f = b.x + b.w, a = b.y + b.h, e = this.x + this.w, c = this.y + this.h;
-          return b.x >= this.x && b.x < e && b.y >= this.y && b.y < c && f > this.x && f <= e && a > this.y && a <= c;
-        };
-        a.prototype.containsPoint = function(b) {
-          return b.x >= this.x && b.x < this.x + this.w && b.y >= this.y && b.y < this.y + this.h;
-        };
-        a.prototype.isContained = function(b) {
-          for (var f = 0;f < b.length;f++) {
-            if (b[f].contains(this)) {
+        a.prototype.set = function(a) {
+          this.x = a.x;
+          this.y = a.y;
+          this.w = a.w;
+          this.h = a.h;
+        };
+        a.prototype.contains = function(a) {
+          var e = a.x + a.w, b = a.y + a.h, d = this.x + this.w, l = this.y + this.h;
+          return a.x >= this.x && a.x < d && a.y >= this.y && a.y < l && e > this.x && e <= d && b > this.y && b <= l;
+        };
+        a.prototype.containsPoint = function(a) {
+          return a.x >= this.x && a.x < this.x + this.w && a.y >= this.y && a.y < this.y + this.h;
+        };
+        a.prototype.isContained = function(a) {
+          for (var e = 0;e < a.length;e++) {
+            if (a[e].contains(this)) {
               return!0;
             }
           }
           return!1;
         };
-        a.prototype.isSmallerThan = function(b) {
-          return this.w < b.w && this.h < b.h;
+        a.prototype.isSmallerThan = function(a) {
+          return this.w < a.w && this.h < a.h;
         };
-        a.prototype.isLargerThan = function(b) {
-          return this.w > b.w && this.h > b.h;
+        a.prototype.isLargerThan = function(a) {
+          return this.w > a.w && this.h > a.h;
         };
-        a.prototype.union = function(b) {
+        a.prototype.union = function(a) {
           if (this.isEmpty()) {
-            this.set(b);
+            this.set(a);
           } else {
-            if (!b.isEmpty()) {
-              var f = this.x, a = this.y;
-              this.x > b.x && (f = b.x);
-              this.y > b.y && (a = b.y);
-              var e = this.x + this.w;
-              e < b.x + b.w && (e = b.x + b.w);
-              var c = this.y + this.h;
-              c < b.y + b.h && (c = b.y + b.h);
-              this.x = f;
-              this.y = a;
-              this.w = e - f;
-              this.h = c - a;
+            if (!a.isEmpty()) {
+              var e = this.x, b = this.y;
+              this.x > a.x && (e = a.x);
+              this.y > a.y && (b = a.y);
+              var d = this.x + this.w;
+              d < a.x + a.w && (d = a.x + a.w);
+              var l = this.y + this.h;
+              l < a.y + a.h && (l = a.y + a.h);
+              this.x = e;
+              this.y = b;
+              this.w = d - e;
+              this.h = l - b;
             }
           }
         };
@@ -7311,99 +7320,99 @@
         a.prototype.setEmpty = function() {
           this.h = this.w = this.y = this.x = 0;
         };
-        a.prototype.intersect = function(b) {
-          var f = a.createEmpty();
-          if (this.isEmpty() || b.isEmpty()) {
-            return f.setEmpty(), f;
-          }
-          f.x = Math.max(this.x, b.x);
-          f.y = Math.max(this.y, b.y);
-          f.w = Math.min(this.x + this.w, b.x + b.w) - f.x;
-          f.h = Math.min(this.y + this.h, b.y + b.h) - f.y;
-          f.isEmpty() && f.setEmpty();
-          this.set(f);
+        a.prototype.intersect = function(c) {
+          var e = a.createEmpty();
+          if (this.isEmpty() || c.isEmpty()) {
+            return e.setEmpty(), e;
+          }
+          e.x = Math.max(this.x, c.x);
+          e.y = Math.max(this.y, c.y);
+          e.w = Math.min(this.x + this.w, c.x + c.w) - e.x;
+          e.h = Math.min(this.y + this.h, c.y + c.h) - e.y;
+          e.isEmpty() && e.setEmpty();
+          this.set(e);
         };
-        a.prototype.intersects = function(b) {
-          if (this.isEmpty() || b.isEmpty()) {
+        a.prototype.intersects = function(a) {
+          if (this.isEmpty() || a.isEmpty()) {
             return!1;
           }
-          var f = Math.max(this.x, b.x), a = Math.max(this.y, b.y), f = Math.min(this.x + this.w, b.x + b.w) - f;
-          b = Math.min(this.y + this.h, b.y + b.h) - a;
-          return!(0 >= f || 0 >= b);
-        };
-        a.prototype.intersectsTransformedAABB = function(b, f) {
-          var c = a._temporary;
-          c.set(b);
-          f.transformRectangleAABB(c);
-          return this.intersects(c);
+          var e = Math.max(this.x, a.x), b = Math.max(this.y, a.y), e = Math.min(this.x + this.w, a.x + a.w) - e;
+          a = Math.min(this.y + this.h, a.y + a.h) - b;
+          return!(0 >= e || 0 >= a);
+        };
+        a.prototype.intersectsTransformedAABB = function(c, e) {
+          var b = a._temporary;
+          b.set(c);
+          e.transformRectangleAABB(b);
+          return this.intersects(b);
         };
-        a.prototype.intersectsTranslated = function(b, f, a) {
-          if (this.isEmpty() || b.isEmpty()) {
+        a.prototype.intersectsTranslated = function(a, e, b) {
+          if (this.isEmpty() || a.isEmpty()) {
             return!1;
           }
-          var e = Math.max(this.x, b.x + f), c = Math.max(this.y, b.y + a);
-          f = Math.min(this.x + this.w, b.x + f + b.w) - e;
-          b = Math.min(this.y + this.h, b.y + a + b.h) - c;
-          return!(0 >= f || 0 >= b);
+          var d = Math.max(this.x, a.x + e), l = Math.max(this.y, a.y + b);
+          e = Math.min(this.x + this.w, a.x + e + a.w) - d;
+          a = Math.min(this.y + this.h, a.y + b + a.h) - l;
+          return!(0 >= e || 0 >= a);
         };
         a.prototype.area = function() {
           return this.w * this.h;
         };
         a.prototype.clone = function() {
-          var b = a.allocate();
-          b.set(this);
-          return b;
+          var c = a.allocate();
+          c.set(this);
+          return c;
         };
         a.allocate = function() {
-          var b = a._dirtyStack;
-          return b.length ? b.pop() : new a(12345, 67890, 12345, 67890);
+          var c = a._dirtyStack;
+          return c.length ? c.pop() : new a(12345, 67890, 12345, 67890);
         };
         a.prototype.free = function() {
           a._dirtyStack.push(this);
         };
         a.prototype.snap = function() {
-          var b = Math.ceil(this.x + this.w), f = Math.ceil(this.y + this.h);
+          var a = Math.ceil(this.x + this.w), e = Math.ceil(this.y + this.h);
           this.x = Math.floor(this.x);
           this.y = Math.floor(this.y);
-          this.w = b - this.x;
-          this.h = f - this.y;
+          this.w = a - this.x;
+          this.h = e - this.y;
           return this;
         };
-        a.prototype.scale = function(b, f) {
-          this.x *= b;
-          this.y *= f;
-          this.w *= b;
-          this.h *= f;
+        a.prototype.scale = function(a, e) {
+          this.x *= a;
+          this.y *= e;
+          this.w *= a;
+          this.h *= e;
           return this;
         };
-        a.prototype.offset = function(b, f) {
-          this.x += b;
-          this.y += f;
+        a.prototype.offset = function(a, e) {
+          this.x += a;
+          this.y += e;
           return this;
         };
-        a.prototype.resize = function(b, f) {
-          this.w += b;
-          this.h += f;
+        a.prototype.resize = function(a, e) {
+          this.w += a;
+          this.h += e;
           return this;
         };
-        a.prototype.expand = function(b, f) {
-          this.offset(-b, -f).resize(2 * b, 2 * f);
+        a.prototype.expand = function(a, e) {
+          this.offset(-a, -e).resize(2 * a, 2 * e);
           return this;
         };
         a.prototype.getCenter = function() {
-          return new p(this.x + this.w / 2, this.y + this.h / 2);
+          return new n(this.x + this.w / 2, this.y + this.h / 2);
         };
         a.prototype.getAbsoluteBounds = function() {
           return new a(0, 0, this.w, this.h);
         };
-        a.prototype.toString = function(b) {
-          void 0 === b && (b = 2);
-          return "{" + this.x.toFixed(b) + ", " + this.y.toFixed(b) + ", " + this.w.toFixed(b) + ", " + this.h.toFixed(b) + "}";
+        a.prototype.toString = function(a) {
+          void 0 === a && (a = 2);
+          return "{" + this.x.toFixed(a) + ", " + this.y.toFixed(a) + ", " + this.w.toFixed(a) + ", " + this.h.toFixed(a) + "}";
         };
         a.createEmpty = function() {
-          var b = a.allocate();
-          b.setEmpty();
-          return b;
+          var c = a.allocate();
+          c.setEmpty();
+          return c;
         };
         a.createSquare = function() {
           return new a(-512, -512, 1024, 1024);
@@ -7414,56 +7423,56 @@
         a.prototype.setMaxI16 = function() {
           this.setElements(-32768, -32768, 65535, 65535);
         };
-        a.prototype.getCorners = function(b) {
-          b[0].x = this.x;
-          b[0].y = this.y;
-          b[1].x = this.x + this.w;
-          b[1].y = this.y;
-          b[2].x = this.x + this.w;
-          b[2].y = this.y + this.h;
-          b[3].x = this.x;
-          b[3].y = this.y + this.h;
+        a.prototype.getCorners = function(a) {
+          a[0].x = this.x;
+          a[0].y = this.y;
+          a[1].x = this.x + this.w;
+          a[1].y = this.y;
+          a[2].x = this.x + this.w;
+          a[2].y = this.y + this.h;
+          a[3].x = this.x;
+          a[3].y = this.y + this.h;
         };
         a.allocationCount = 0;
         a._temporary = new a(0, 0, 0, 0);
         a._dirtyStack = [];
         return a;
       }();
-      g.Rectangle = u;
-      var n = function() {
-        function a(b) {
-          this.corners = b.map(function(b) {
-            return b.clone();
+      g.Rectangle = v;
+      var m = function() {
+        function a(c) {
+          this.corners = c.map(function(a) {
+            return a.clone();
           });
-          this.axes = [b[1].clone().sub(b[0]), b[3].clone().sub(b[0])];
+          this.axes = [c[1].clone().sub(c[0]), c[3].clone().sub(c[0])];
           this.origins = [];
-          for (var f = 0;2 > f;f++) {
-            this.axes[f].mul(1 / this.axes[f].squaredLength()), this.origins.push(b[0].dot(this.axes[f]));
+          for (var e = 0;2 > e;e++) {
+            this.axes[e].mul(1 / this.axes[e].squaredLength()), this.origins.push(c[0].dot(this.axes[e]));
           }
         }
         a.prototype.getBounds = function() {
           return a.getBounds(this.corners);
         };
-        a.getBounds = function(b) {
-          for (var f = new p(Number.MAX_VALUE, Number.MAX_VALUE), a = new p(Number.MIN_VALUE, Number.MIN_VALUE), e = 0;4 > e;e++) {
-            var c = b[e].x, d = b[e].y;
-            f.x = Math.min(f.x, c);
-            f.y = Math.min(f.y, d);
-            a.x = Math.max(a.x, c);
-            a.y = Math.max(a.y, d);
-          }
-          return new u(f.x, f.y, a.x - f.x, a.y - f.y);
-        };
-        a.prototype.intersects = function(b) {
-          return this.intersectsOneWay(b) && b.intersectsOneWay(this);
-        };
-        a.prototype.intersectsOneWay = function(b) {
-          for (var f = 0;2 > f;f++) {
-            for (var a = 0;4 > a;a++) {
-              var e = b.corners[a].dot(this.axes[f]), c, d;
-              0 === a ? d = c = e : e < c ? c = e : e > d && (d = e);
+        a.getBounds = function(a) {
+          for (var e = new n(Number.MAX_VALUE, Number.MAX_VALUE), b = new n(Number.MIN_VALUE, Number.MIN_VALUE), d = 0;4 > d;d++) {
+            var l = a[d].x, m = a[d].y;
+            e.x = Math.min(e.x, l);
+            e.y = Math.min(e.y, m);
+            b.x = Math.max(b.x, l);
+            b.y = Math.max(b.y, m);
+          }
+          return new v(e.x, e.y, b.x - e.x, b.y - e.y);
+        };
+        a.prototype.intersects = function(a) {
+          return this.intersectsOneWay(a) && a.intersectsOneWay(this);
+        };
+        a.prototype.intersectsOneWay = function(a) {
+          for (var e = 0;2 > e;e++) {
+            for (var b = 0;4 > b;b++) {
+              var d = a.corners[b].dot(this.axes[e]), l, m;
+              0 === b ? m = l = d : d < l ? l = d : d > m && (m = d);
             }
-            if (c > 1 + this.origins[f] || d < this.origins[f]) {
+            if (l > 1 + this.origins[e] || m < this.origins[e]) {
               return!1;
             }
           }
@@ -7471,294 +7480,294 @@
         };
         return a;
       }();
-      g.OBB = n;
+      g.OBB = m;
       (function(a) {
         a[a.Unknown = 0] = "Unknown";
         a[a.Identity = 1] = "Identity";
         a[a.Translation = 2] = "Translation";
       })(g.MatrixType || (g.MatrixType = {}));
-      var s = function() {
-        function a(b, f, c, d, h, n) {
+      var r = function() {
+        function a(c, e, b, d, m, f) {
           this._data = new Float64Array(6);
           this._type = 0;
-          this.setElements(b, f, c, d, h, n);
+          this.setElements(c, e, b, d, m, f);
           a.allocationCount++;
         }
         Object.defineProperty(a.prototype, "a", {get:function() {
           return this._data[0];
-        }, set:function(b) {
-          this._data[0] = b;
+        }, set:function(a) {
+          this._data[0] = a;
           this._type = 0;
         }, enumerable:!0, configurable:!0});
         Object.defineProperty(a.prototype, "b", {get:function() {
           return this._data[1];
-        }, set:function(b) {
-          this._data[1] = b;
+        }, set:function(a) {
+          this._data[1] = a;
           this._type = 0;
         }, enumerable:!0, configurable:!0});
         Object.defineProperty(a.prototype, "c", {get:function() {
           return this._data[2];
-        }, set:function(b) {
-          this._data[2] = b;
+        }, set:function(a) {
+          this._data[2] = a;
           this._type = 0;
         }, enumerable:!0, configurable:!0});
         Object.defineProperty(a.prototype, "d", {get:function() {
           return this._data[3];
-        }, set:function(b) {
-          this._data[3] = b;
+        }, set:function(a) {
+          this._data[3] = a;
           this._type = 0;
         }, enumerable:!0, configurable:!0});
         Object.defineProperty(a.prototype, "tx", {get:function() {
           return this._data[4];
-        }, set:function(b) {
-          this._data[4] = b;
+        }, set:function(a) {
+          this._data[4] = a;
           1 === this._type && (this._type = 2);
         }, enumerable:!0, configurable:!0});
         Object.defineProperty(a.prototype, "ty", {get:function() {
           return this._data[5];
-        }, set:function(b) {
-          this._data[5] = b;
+        }, set:function(a) {
+          this._data[5] = a;
           1 === this._type && (this._type = 2);
         }, enumerable:!0, configurable:!0});
-        a.prototype.setElements = function(b, a, c, e, d, h) {
-          var n = this._data;
-          n[0] = b;
-          n[1] = a;
-          n[2] = c;
-          n[3] = e;
-          n[4] = d;
-          n[5] = h;
+        a.prototype.setElements = function(a, e, b, d, m, l) {
+          var f = this._data;
+          f[0] = a;
+          f[1] = e;
+          f[2] = b;
+          f[3] = d;
+          f[4] = m;
+          f[5] = l;
           this._type = 0;
         };
-        a.prototype.set = function(b) {
-          var a = this._data, c = b._data;
-          a[0] = c[0];
-          a[1] = c[1];
-          a[2] = c[2];
-          a[3] = c[3];
-          a[4] = c[4];
-          a[5] = c[5];
-          this._type = b._type;
-        };
-        a.prototype.emptyArea = function(b) {
-          b = this._data;
-          return 0 === b[0] || 0 === b[3] ? !0 : !1;
-        };
-        a.prototype.infiniteArea = function(b) {
-          b = this._data;
-          return Infinity === Math.abs(b[0]) || Infinity === Math.abs(b[3]) ? !0 : !1;
+        a.prototype.set = function(a) {
+          var e = this._data, b = a._data;
+          e[0] = b[0];
+          e[1] = b[1];
+          e[2] = b[2];
+          e[3] = b[3];
+          e[4] = b[4];
+          e[5] = b[5];
+          this._type = a._type;
+        };
+        a.prototype.emptyArea = function(a) {
+          a = this._data;
+          return 0 === a[0] || 0 === a[3] ? !0 : !1;
+        };
+        a.prototype.infiniteArea = function(a) {
+          a = this._data;
+          return Infinity === Math.abs(a[0]) || Infinity === Math.abs(a[3]) ? !0 : !1;
         };
-        a.prototype.isEqual = function(b) {
-          if (1 === this._type && 1 === b._type) {
+        a.prototype.isEqual = function(a) {
+          if (1 === this._type && 1 === a._type) {
             return!0;
           }
-          var a = this._data;
-          b = b._data;
-          return a[0] === b[0] && a[1] === b[1] && a[2] === b[2] && a[3] === b[3] && a[4] === b[4] && a[5] === b[5];
+          var e = this._data;
+          a = a._data;
+          return e[0] === a[0] && e[1] === a[1] && e[2] === a[2] && e[3] === a[3] && e[4] === a[4] && e[5] === a[5];
         };
         a.prototype.clone = function() {
-          var b = a.allocate();
-          b.set(this);
-          return b;
+          var c = a.allocate();
+          c.set(this);
+          return c;
         };
         a.allocate = function() {
-          var b = a._dirtyStack;
-          return b.length ? b.pop() : new a(12345, 12345, 12345, 12345, 12345, 12345);
+          var c = a._dirtyStack;
+          return c.length ? c.pop() : new a(12345, 12345, 12345, 12345, 12345, 12345);
         };
         a.prototype.free = function() {
           a._dirtyStack.push(this);
         };
-        a.prototype.transform = function(b, a, c, e, d, h) {
-          var n = this._data, g = n[0], k = n[1], p = n[2], m = n[3], l = n[4], s = n[5];
-          n[0] = g * b + p * a;
-          n[1] = k * b + m * a;
-          n[2] = g * c + p * e;
-          n[3] = k * c + m * e;
-          n[4] = g * d + p * h + l;
-          n[5] = k * d + m * h + s;
+        a.prototype.transform = function(a, e, b, d, m, l) {
+          var f = this._data, g = f[0], h = f[1], n = f[2], k = f[3], r = f[4], v = f[5];
+          f[0] = g * a + n * e;
+          f[1] = h * a + k * e;
+          f[2] = g * b + n * d;
+          f[3] = h * b + k * d;
+          f[4] = g * m + n * l + r;
+          f[5] = h * m + k * l + v;
           this._type = 0;
           return this;
         };
-        a.prototype.transformRectangle = function(b, a) {
-          var c = this._data, e = c[0], d = c[1], h = c[2], n = c[3], g = c[4], c = c[5], k = b.x, p = b.y, m = b.w, l = b.h;
-          a[0].x = e * k + h * p + g;
-          a[0].y = d * k + n * p + c;
-          a[1].x = e * (k + m) + h * p + g;
-          a[1].y = d * (k + m) + n * p + c;
-          a[2].x = e * (k + m) + h * (p + l) + g;
-          a[2].y = d * (k + m) + n * (p + l) + c;
-          a[3].x = e * k + h * (p + l) + g;
-          a[3].y = d * k + n * (p + l) + c;
+        a.prototype.transformRectangle = function(a, e) {
+          var b = this._data, d = b[0], m = b[1], l = b[2], f = b[3], g = b[4], b = b[5], h = a.x, n = a.y, k = a.w, r = a.h;
+          e[0].x = d * h + l * n + g;
+          e[0].y = m * h + f * n + b;
+          e[1].x = d * (h + k) + l * n + g;
+          e[1].y = m * (h + k) + f * n + b;
+          e[2].x = d * (h + k) + l * (n + r) + g;
+          e[2].y = m * (h + k) + f * (n + r) + b;
+          e[3].x = d * h + l * (n + r) + g;
+          e[3].y = m * h + f * (n + r) + b;
         };
         a.prototype.isTranslationOnly = function() {
           if (2 === this._type) {
             return!0;
           }
-          var b = this._data;
-          return 1 === b[0] && 0 === b[1] && 0 === b[2] && 1 === b[3] || h(b[0], 1) && h(b[1], 0) && h(b[2], 0) && h(b[3], 1) ? (this._type = 2, !0) : !1;
-        };
-        a.prototype.transformRectangleAABB = function(b) {
           var a = this._data;
+          return 1 === a[0] && 0 === a[1] && 0 === a[2] && 1 === a[3] || d(a[0], 1) && d(a[1], 0) && d(a[2], 0) && d(a[3], 1) ? (this._type = 2, !0) : !1;
+        };
+        a.prototype.transformRectangleAABB = function(a) {
+          var e = this._data;
           if (1 !== this._type) {
             if (2 === this._type) {
-              b.x += a[4], b.y += a[5];
+              a.x += e[4], a.y += e[5];
             } else {
-              var c = a[0], e = a[1], d = a[2], h = a[3], n = a[4], g = a[5], k = b.x, p = b.y, m = b.w, l = b.h, a = c * k + d * p + n, s = e * k + h * p + g, u = c * (k + m) + d * p + n, v = e * (k + m) + h * p + g, r = c * (k + m) + d * (p + l) + n, m = e * (k + m) + h * (p + l) + g, c = c * k + d * (p + l) + n, e = e * k + h * (p + l) + g, h = 0;
-              a > u && (h = a, a = u, u = h);
-              r > c && (h = r, r = c, c = h);
-              b.x = a < r ? a : r;
-              b.w = (u > c ? u : c) - b.x;
-              s > v && (h = s, s = v, v = h);
-              m > e && (h = m, m = e, e = h);
-              b.y = s < m ? s : m;
-              b.h = (v > e ? v : e) - b.y;
+              var b = e[0], d = e[1], m = e[2], l = e[3], f = e[4], g = e[5], h = a.x, n = a.y, k = a.w, r = a.h, e = b * h + m * n + f, v = d * h + l * n + g, p = b * (h + k) + m * n + f, w = d * (h + k) + l * n + g, t = b * (h + k) + m * (n + r) + f, k = d * (h + k) + l * (n + r) + g, b = b * h + m * (n + r) + f, d = d * h + l * (n + r) + g, l = 0;
+              e > p && (l = e, e = p, p = l);
+              t > b && (l = t, t = b, b = l);
+              a.x = e < t ? e : t;
+              a.w = (p > b ? p : b) - a.x;
+              v > w && (l = v, v = w, w = l);
+              k > d && (l = k, k = d, d = l);
+              a.y = v < k ? v : k;
+              a.h = (w > d ? w : d) - a.y;
             }
           }
         };
-        a.prototype.scale = function(b, a) {
-          var c = this._data;
-          c[0] *= b;
-          c[1] *= a;
-          c[2] *= b;
-          c[3] *= a;
-          c[4] *= b;
-          c[5] *= a;
+        a.prototype.scale = function(a, e) {
+          var b = this._data;
+          b[0] *= a;
+          b[1] *= e;
+          b[2] *= a;
+          b[3] *= e;
+          b[4] *= a;
+          b[5] *= e;
           this._type = 0;
           return this;
         };
-        a.prototype.scaleClone = function(b, a) {
-          return 1 === b && 1 === a ? this : this.clone().scale(b, a);
+        a.prototype.scaleClone = function(a, e) {
+          return 1 === a && 1 === e ? this : this.clone().scale(a, e);
         };
-        a.prototype.rotate = function(b) {
-          var a = this._data, c = a[0], e = a[1], d = a[2], h = a[3], n = a[4], g = a[5], k = Math.cos(b);
-          b = Math.sin(b);
-          a[0] = k * c - b * e;
-          a[1] = b * c + k * e;
-          a[2] = k * d - b * h;
-          a[3] = b * d + k * h;
-          a[4] = k * n - b * g;
-          a[5] = b * n + k * g;
+        a.prototype.rotate = function(a) {
+          var e = this._data, b = e[0], d = e[1], m = e[2], l = e[3], f = e[4], h = e[5], g = Math.cos(a);
+          a = Math.sin(a);
+          e[0] = g * b - a * d;
+          e[1] = a * b + g * d;
+          e[2] = g * m - a * l;
+          e[3] = a * m + g * l;
+          e[4] = g * f - a * h;
+          e[5] = a * f + g * h;
           this._type = 0;
           return this;
         };
-        a.prototype.concat = function(b) {
-          if (1 === b._type) {
+        a.prototype.concat = function(a) {
+          if (1 === a._type) {
             return this;
           }
-          var a = this._data;
-          b = b._data;
-          var c = a[0] * b[0], e = 0, d = 0, h = a[3] * b[3], n = a[4] * b[0] + b[4], g = a[5] * b[3] + b[5];
-          if (0 !== a[1] || 0 !== a[2] || 0 !== b[1] || 0 !== b[2]) {
-            c += a[1] * b[2], h += a[2] * b[1], e += a[0] * b[1] + a[1] * b[3], d += a[2] * b[0] + a[3] * b[2], n += a[5] * b[2], g += a[4] * b[1];
-          }
-          a[0] = c;
-          a[1] = e;
-          a[2] = d;
-          a[3] = h;
-          a[4] = n;
-          a[5] = g;
+          var e = this._data;
+          a = a._data;
+          var b = e[0] * a[0], d = 0, m = 0, l = e[3] * a[3], f = e[4] * a[0] + a[4], g = e[5] * a[3] + a[5];
+          if (0 !== e[1] || 0 !== e[2] || 0 !== a[1] || 0 !== a[2]) {
+            b += e[1] * a[2], l += e[2] * a[1], d += e[0] * a[1] + e[1] * a[3], m += e[2] * a[0] + e[3] * a[2], f += e[5] * a[2], g += e[4] * a[1];
+          }
+          e[0] = b;
+          e[1] = d;
+          e[2] = m;
+          e[3] = l;
+          e[4] = f;
+          e[5] = g;
           this._type = 0;
           return this;
         };
-        a.prototype.concatClone = function(b) {
-          return this.clone().concat(b);
+        a.prototype.concatClone = function(a) {
+          return this.clone().concat(a);
         };
-        a.prototype.preMultiply = function(b) {
-          var a = this._data, c = b._data;
-          if (2 === b._type && this._type & 3) {
-            a[4] += c[4], a[5] += c[5], this._type = 2;
+        a.prototype.preMultiply = function(a) {
+          var e = this._data, b = a._data;
+          if (2 === a._type && this._type & 3) {
+            e[4] += b[4], e[5] += b[5], this._type = 2;
           } else {
-            if (1 !== b._type) {
-              b = c[0] * a[0];
-              var e = 0, d = 0, h = c[3] * a[3], n = c[4] * a[0] + a[4], g = c[5] * a[3] + a[5];
-              if (0 !== c[1] || 0 !== c[2] || 0 !== a[1] || 0 !== a[2]) {
-                b += c[1] * a[2], h += c[2] * a[1], e += c[0] * a[1] + c[1] * a[3], d += c[2] * a[0] + c[3] * a[2], n += c[5] * a[2], g += c[4] * a[1];
-              }
-              a[0] = b;
-              a[1] = e;
-              a[2] = d;
-              a[3] = h;
-              a[4] = n;
-              a[5] = g;
+            if (1 !== a._type) {
+              a = b[0] * e[0];
+              var d = 0, m = 0, l = b[3] * e[3], f = b[4] * e[0] + e[4], g = b[5] * e[3] + e[5];
+              if (0 !== b[1] || 0 !== b[2] || 0 !== e[1] || 0 !== e[2]) {
+                a += b[1] * e[2], l += b[2] * e[1], d += b[0] * e[1] + b[1] * e[3], m += b[2] * e[0] + b[3] * e[2], f += b[5] * e[2], g += b[4] * e[1];
+              }
+              e[0] = a;
+              e[1] = d;
+              e[2] = m;
+              e[3] = l;
+              e[4] = f;
+              e[5] = g;
               this._type = 0;
             }
           }
         };
-        a.prototype.translate = function(b, a) {
-          var c = this._data;
-          c[4] += b;
-          c[5] += a;
+        a.prototype.translate = function(a, e) {
+          var b = this._data;
+          b[4] += a;
+          b[5] += e;
           1 === this._type && (this._type = 2);
           return this;
         };
         a.prototype.setIdentity = function() {
-          var b = this._data;
-          b[0] = 1;
-          b[1] = 0;
-          b[2] = 0;
-          b[3] = 1;
-          b[4] = 0;
-          b[5] = 0;
+          var a = this._data;
+          a[0] = 1;
+          a[1] = 0;
+          a[2] = 0;
+          a[3] = 1;
+          a[4] = 0;
+          a[5] = 0;
           this._type = 1;
         };
         a.prototype.isIdentity = function() {
           if (1 === this._type) {
             return!0;
           }
-          var b = this._data;
-          return 1 === b[0] && 0 === b[1] && 0 === b[2] && 1 === b[3] && 0 === b[4] && 0 === b[5];
+          var a = this._data;
+          return 1 === a[0] && 0 === a[1] && 0 === a[2] && 1 === a[3] && 0 === a[4] && 0 === a[5];
         };
-        a.prototype.transformPoint = function(b) {
+        a.prototype.transformPoint = function(a) {
           if (1 !== this._type) {
-            var a = this._data, c = b.x, e = b.y;
-            b.x = a[0] * c + a[2] * e + a[4];
-            b.y = a[1] * c + a[3] * e + a[5];
+            var e = this._data, b = a.x, d = a.y;
+            a.x = e[0] * b + e[2] * d + e[4];
+            a.y = e[1] * b + e[3] * d + e[5];
           }
         };
-        a.prototype.transformPoints = function(b) {
+        a.prototype.transformPoints = function(a) {
           if (1 !== this._type) {
-            for (var a = 0;a < b.length;a++) {
-              this.transformPoint(b[a]);
+            for (var e = 0;e < a.length;e++) {
+              this.transformPoint(a[e]);
             }
           }
         };
-        a.prototype.deltaTransformPoint = function(b) {
+        a.prototype.deltaTransformPoint = function(a) {
           if (1 !== this._type) {
-            var a = this._data, c = b.x, e = b.y;
-            b.x = a[0] * c + a[2] * e;
-            b.y = a[1] * c + a[3] * e;
+            var e = this._data, b = a.x, d = a.y;
+            a.x = e[0] * b + e[2] * d;
+            a.y = e[1] * b + e[3] * d;
           }
         };
-        a.prototype.inverse = function(b) {
-          var a = this._data, c = b._data;
+        a.prototype.inverse = function(a) {
+          var e = this._data, b = a._data;
           if (1 === this._type) {
-            b.setIdentity();
+            a.setIdentity();
           } else {
             if (2 === this._type) {
-              c[0] = 1, c[1] = 0, c[2] = 0, c[3] = 1, c[4] = -a[4], c[5] = -a[5], b._type = 2;
+              b[0] = 1, b[1] = 0, b[2] = 0, b[3] = 1, b[4] = -e[4], b[5] = -e[5], a._type = 2;
             } else {
-              var e = a[1], d = a[2], h = a[4], n = a[5];
-              if (0 === e && 0 === d) {
-                var g = c[0] = 1 / a[0], a = c[3] = 1 / a[3];
-                c[1] = 0;
-                c[2] = 0;
-                c[4] = -g * h;
-                c[5] = -a * n;
+              var d = e[1], m = e[2], l = e[4], f = e[5];
+              if (0 === d && 0 === m) {
+                var g = b[0] = 1 / e[0], e = b[3] = 1 / e[3];
+                b[1] = 0;
+                b[2] = 0;
+                b[4] = -g * l;
+                b[5] = -e * f;
               } else {
-                var g = a[0], a = a[3], k = g * a - e * d;
-                if (0 === k) {
-                  b.setIdentity();
+                var g = e[0], e = e[3], h = g * e - d * m;
+                if (0 === h) {
+                  a.setIdentity();
                   return;
                 }
-                k = 1 / k;
-                c[0] = a * k;
-                e = c[1] = -e * k;
-                d = c[2] = -d * k;
-                a = c[3] = g * k;
-                c[4] = -(c[0] * h + d * n);
-                c[5] = -(e * h + a * n);
+                h = 1 / h;
+                b[0] = e * h;
+                d = b[1] = -d * h;
+                m = b[2] = -m * h;
+                e = b[3] = g * h;
+                b[4] = -(b[0] * l + m * f);
+                b[5] = -(d * l + e * f);
               }
-              b._type = 0;
+              a._type = 0;
             }
           }
         };
@@ -7769,20 +7778,20 @@
           return this._data[4];
         };
         a.prototype.getScaleX = function() {
-          var b = this._data;
-          if (1 === b[0] && 0 === b[1]) {
+          var a = this._data;
+          if (1 === a[0] && 0 === a[1]) {
             return 1;
           }
-          var a = Math.sqrt(b[0] * b[0] + b[1] * b[1]);
-          return 0 < b[0] ? a : -a;
+          var e = Math.sqrt(a[0] * a[0] + a[1] * a[1]);
+          return 0 < a[0] ? e : -e;
         };
         a.prototype.getScaleY = function() {
-          var b = this._data;
-          if (0 === b[2] && 1 === b[3]) {
+          var a = this._data;
+          if (0 === a[2] && 1 === a[3]) {
             return 1;
           }
-          var a = Math.sqrt(b[2] * b[2] + b[3] * b[3]);
-          return 0 < b[3] ? a : -a;
+          var e = Math.sqrt(a[2] * a[2] + a[3] * a[3]);
+          return 0 < a[3] ? e : -e;
         };
         a.prototype.getScale = function() {
           return(this.getScaleX() + this.getScaleY()) / 2;
@@ -7794,482 +7803,482 @@
           return Math.abs(this.getScaleY());
         };
         a.prototype.getRotation = function() {
-          var b = this._data;
-          return 180 * Math.atan(b[1] / b[0]) / Math.PI;
+          var a = this._data;
+          return 180 * Math.atan(a[1] / a[0]) / Math.PI;
         };
         a.prototype.isScaleOrRotation = function() {
-          var b = this._data;
-          return.01 > Math.abs(b[0] * b[2] + b[1] * b[3]);
-        };
-        a.prototype.toString = function(b) {
-          void 0 === b && (b = 2);
           var a = this._data;
-          return "{" + a[0].toFixed(b) + ", " + a[1].toFixed(b) + ", " + a[2].toFixed(b) + ", " + a[3].toFixed(b) + ", " + a[4].toFixed(b) + ", " + a[5].toFixed(b) + "}";
+          return.01 > Math.abs(a[0] * a[2] + a[1] * a[3]);
+        };
+        a.prototype.toString = function(a) {
+          void 0 === a && (a = 2);
+          var e = this._data;
+          return "{" + e[0].toFixed(a) + ", " + e[1].toFixed(a) + ", " + e[2].toFixed(a) + ", " + e[3].toFixed(a) + ", " + e[4].toFixed(a) + ", " + e[5].toFixed(a) + "}";
         };
         a.prototype.toWebGLMatrix = function() {
-          var b = this._data;
-          return new Float32Array([b[0], b[1], 0, b[2], b[3], 0, b[4], b[5], 1]);
+          var a = this._data;
+          return new Float32Array([a[0], a[1], 0, a[2], a[3], 0, a[4], a[5], 1]);
         };
         a.prototype.toCSSTransform = function() {
-          var b = this._data;
-          return "matrix(" + b[0] + ", " + b[1] + ", " + b[2] + ", " + b[3] + ", " + b[4] + ", " + b[5] + ")";
+          var a = this._data;
+          return "matrix(" + a[0] + ", " + a[1] + ", " + a[2] + ", " + a[3] + ", " + a[4] + ", " + a[5] + ")";
         };
         a.createIdentity = function() {
-          var b = a.allocate();
-          b.setIdentity();
-          return b;
+          var c = a.allocate();
+          c.setIdentity();
+          return c;
         };
         a.prototype.toSVGMatrix = function() {
-          var b = this._data, f = a._svg.createSVGMatrix();
-          f.a = b[0];
-          f.b = b[1];
-          f.c = b[2];
-          f.d = b[3];
-          f.e = b[4];
-          f.f = b[5];
-          return f;
+          var c = this._data, e = a._svg.createSVGMatrix();
+          e.a = c[0];
+          e.b = c[1];
+          e.c = c[2];
+          e.d = c[3];
+          e.e = c[4];
+          e.f = c[5];
+          return e;
         };
         a.prototype.snap = function() {
-          var b = this._data;
-          return this.isTranslationOnly() ? (b[0] = 1, b[1] = 0, b[2] = 0, b[3] = 1, b[4] = Math.round(b[4]), b[5] = Math.round(b[5]), this._type = 2, !0) : !1;
+          var a = this._data;
+          return this.isTranslationOnly() ? (a[0] = 1, a[1] = 0, a[2] = 0, a[3] = 1, a[4] = Math.round(a[4]), a[5] = Math.round(a[5]), this._type = 2, !0) : !1;
         };
         a.createIdentitySVGMatrix = function() {
           return a._svg.createSVGMatrix();
         };
-        a.createSVGMatrixFromArray = function(b) {
-          var f = a._svg.createSVGMatrix();
-          f.a = b[0];
-          f.b = b[1];
-          f.c = b[2];
-          f.d = b[3];
-          f.e = b[4];
-          f.f = b[5];
-          return f;
+        a.createSVGMatrixFromArray = function(c) {
+          var e = a._svg.createSVGMatrix();
+          e.a = c[0];
+          e.b = c[1];
+          e.c = c[2];
+          e.d = c[3];
+          e.e = c[4];
+          e.f = c[5];
+          return e;
         };
         a.allocationCount = 0;
         a._dirtyStack = [];
         a._svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-        a.multiply = function(b, a) {
-          var c = a._data;
-          b.transform(c[0], c[1], c[2], c[3], c[4], c[5]);
+        a.multiply = function(a, e) {
+          var b = e._data;
+          a.transform(b[0], b[1], b[2], b[3], b[4], b[5]);
         };
         return a;
       }();
-      g.Matrix = s;
-      s = function() {
-        function a(b) {
-          this._m = new Float32Array(b);
+      g.Matrix = r;
+      r = function() {
+        function a(c) {
+          this._m = new Float32Array(c);
         }
         a.prototype.asWebGLMatrix = function() {
           return this._m;
         };
-        a.createCameraLookAt = function(b, f, c) {
-          f = b.clone().sub(f).normalize();
-          c = c.clone().cross(f).normalize();
-          var d = f.clone().cross(c);
-          return new a([c.x, c.y, c.z, 0, d.x, d.y, d.z, 0, f.x, f.y, f.z, 0, b.x, b.y, b.z, 1]);
-        };
-        a.createLookAt = function(b, f, c) {
-          f = b.clone().sub(f).normalize();
-          c = c.clone().cross(f).normalize();
-          var d = f.clone().cross(c);
-          return new a([c.x, d.x, f.x, 0, d.x, d.y, f.y, 0, f.x, d.z, f.z, 0, -c.dot(b), -d.dot(b), -f.dot(b), 1]);
-        };
-        a.prototype.mul = function(b) {
-          b = [b.x, b.y, b.z, 0];
-          for (var a = this._m, c = [], d = 0;4 > d;d++) {
-            c[d] = 0;
-            for (var e = 4 * d, h = 0;4 > h;h++) {
-              c[d] += a[e + h] * b[h];
-            }
-          }
-          return new k(c[0], c[1], c[2]);
-        };
-        a.create2DProjection = function(b, f, c) {
-          return new a([2 / b, 0, 0, 0, 0, -2 / f, 0, 0, 0, 0, 2 / c, 0, -1, 1, 0, 1]);
-        };
-        a.createPerspective = function(b) {
-          b = Math.tan(.5 * Math.PI - .5 * b);
-          var f = 1 / -4999.9;
-          return new a([b / 1, 0, 0, 0, 0, b, 0, 0, 0, 0, 5000.1 * f, -1, 0, 0, 1E3 * f, 0]);
+        a.createCameraLookAt = function(c, e, b) {
+          e = c.clone().sub(e).normalize();
+          b = b.clone().cross(e).normalize();
+          var d = e.clone().cross(b);
+          return new a([b.x, b.y, b.z, 0, d.x, d.y, d.z, 0, e.x, e.y, e.z, 0, c.x, c.y, c.z, 1]);
+        };
+        a.createLookAt = function(c, e, b) {
+          e = c.clone().sub(e).normalize();
+          b = b.clone().cross(e).normalize();
+          var d = e.clone().cross(b);
+          return new a([b.x, d.x, e.x, 0, d.x, d.y, e.y, 0, e.x, d.z, e.z, 0, -b.dot(c), -d.dot(c), -e.dot(c), 1]);
+        };
+        a.prototype.mul = function(a) {
+          a = [a.x, a.y, a.z, 0];
+          for (var e = this._m, b = [], d = 0;4 > d;d++) {
+            b[d] = 0;
+            for (var m = 4 * d, l = 0;4 > l;l++) {
+              b[d] += e[m + l] * a[l];
+            }
+          }
+          return new f(b[0], b[1], b[2]);
+        };
+        a.create2DProjection = function(c, e, b) {
+          return new a([2 / c, 0, 0, 0, 0, -2 / e, 0, 0, 0, 0, 2 / b, 0, -1, 1, 0, 1]);
+        };
+        a.createPerspective = function(c) {
+          c = Math.tan(.5 * Math.PI - .5 * c);
+          var e = 1 / -4999.9;
+          return new a([c / 1, 0, 0, 0, 0, c, 0, 0, 0, 0, 5000.1 * e, -1, 0, 0, 1E3 * e, 0]);
         };
         a.createIdentity = function() {
           return a.createTranslation(0, 0);
         };
-        a.createTranslation = function(b, f) {
-          return new a([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, b, f, 0, 1]);
+        a.createTranslation = function(c, e) {
+          return new a([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, c, e, 0, 1]);
         };
-        a.createXRotation = function(b) {
-          var f = Math.cos(b);
-          b = Math.sin(b);
-          return new a([1, 0, 0, 0, 0, f, b, 0, 0, -b, f, 0, 0, 0, 0, 1]);
-        };
-        a.createYRotation = function(b) {
-          var f = Math.cos(b);
-          b = Math.sin(b);
-          return new a([f, 0, -b, 0, 0, 1, 0, 0, b, 0, f, 0, 0, 0, 0, 1]);
-        };
-        a.createZRotation = function(b) {
-          var f = Math.cos(b);
-          b = Math.sin(b);
-          return new a([f, b, 0, 0, -b, f, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
-        };
-        a.createScale = function(b, f, c) {
-          return new a([b, 0, 0, 0, 0, f, 0, 0, 0, 0, c, 0, 0, 0, 0, 1]);
-        };
-        a.createMultiply = function(b, f) {
-          var c = b._m, d = f._m, h = c[0], n = c[1], g = c[2], k = c[3], p = c[4], m = c[5], l = c[6], s = c[7], u = c[8], v = c[9], r = c[10], t = c[11], y = c[12], z = c[13], B = c[14], c = c[15], x = d[0], E = d[1], A = d[2], D = d[3], F = d[4], I = d[5], J = d[6], K = d[7], L = d[8], M = d[9], N = d[10], O = d[11], R = d[12], S = d[13], T = d[14], d = d[15];
-          return new a([h * x + n * F + g * L + k * R, h * E + n * I + g * M + k * S, h * A + n * J + g * N + k * T, h * D + n * K + g * O + k * d, p * x + m * F + l * L + s * R, p * E + m * I + l * M + s * S, p * A + m * J + l * N + s * T, p * D + m * K + l * O + s * d, u * x + v * F + r * L + t * R, u * E + v * I + r * M + t * S, u * A + v * J + r * N + t * T, u * D + v * K + r * O + t * d, y * x + z * F + B * L + c * R, y * E + z * I + B * M + c * S, y * A + z * J + B * N + c * T, y * D + z * 
-          K + B * O + c * d]);
-        };
-        a.createInverse = function(b) {
-          var f = b._m;
-          b = f[0];
-          var c = f[1], d = f[2], h = f[3], n = f[4], g = f[5], k = f[6], p = f[7], m = f[8], l = f[9], s = f[10], u = f[11], v = f[12], r = f[13], t = f[14], f = f[15], y = s * f, z = t * u, B = k * f, x = t * p, E = k * u, A = s * p, D = d * f, F = t * h, I = d * u, J = s * h, K = d * p, L = k * h, M = m * r, N = v * l, O = n * r, R = v * g, S = n * l, T = m * g, X = b * r, Y = v * c, Z = b * l, $ = m * c, aa = b * g, ba = n * c, ca = y * g + x * l + E * r - (z * g + B * l + A * r), da = z * c + 
-          D * l + J * r - (y * c + F * l + I * r), r = B * c + F * g + K * r - (x * c + D * g + L * r), c = A * c + I * g + L * l - (E * c + J * g + K * l), g = 1 / (b * ca + n * da + m * r + v * c);
-          return new a([g * ca, g * da, g * r, g * c, g * (z * n + B * m + A * v - (y * n + x * m + E * v)), g * (y * b + F * m + I * v - (z * b + D * m + J * v)), g * (x * b + D * n + L * v - (B * b + F * n + K * v)), g * (E * b + J * n + K * m - (A * b + I * n + L * m)), g * (M * p + R * u + S * f - (N * p + O * u + T * f)), g * (N * h + X * u + $ * f - (M * h + Y * u + Z * f)), g * (O * h + Y * p + aa * f - (R * h + X * p + ba * f)), g * (T * h + Z * p + ba * u - (S * h + $ * p + aa * u)), g * 
-          (O * s + T * t + N * k - (S * t + M * k + R * s)), g * (Z * t + M * d + Y * s - (X * s + $ * t + N * d)), g * (X * k + ba * t + R * d - (aa * t + O * d + Y * k)), g * (aa * s + S * d + $ * k - (Z * k + ba * s + T * d))]);
+        a.createXRotation = function(c) {
+          var e = Math.cos(c);
+          c = Math.sin(c);
+          return new a([1, 0, 0, 0, 0, e, c, 0, 0, -c, e, 0, 0, 0, 0, 1]);
+        };
+        a.createYRotation = function(c) {
+          var e = Math.cos(c);
+          c = Math.sin(c);
+          return new a([e, 0, -c, 0, 0, 1, 0, 0, c, 0, e, 0, 0, 0, 0, 1]);
+        };
+        a.createZRotation = function(c) {
+          var e = Math.cos(c);
+          c = Math.sin(c);
+          return new a([e, c, 0, 0, -c, e, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
+        };
+        a.createScale = function(c, e, b) {
+          return new a([c, 0, 0, 0, 0, e, 0, 0, 0, 0, b, 0, 0, 0, 0, 1]);
+        };
+        a.createMultiply = function(c, e) {
+          var b = c._m, d = e._m, m = b[0], f = b[1], g = b[2], h = b[3], n = b[4], k = b[5], r = b[6], v = b[7], p = b[8], w = b[9], t = b[10], u = b[11], z = b[12], A = b[13], C = b[14], b = b[15], x = d[0], F = d[1], B = d[2], E = d[3], G = d[4], J = d[5], K = d[6], L = d[7], M = d[8], N = d[9], O = d[10], P = d[11], S = d[12], T = d[13], U = d[14], d = d[15];
+          return new a([m * x + f * G + g * M + h * S, m * F + f * J + g * N + h * T, m * B + f * K + g * O + h * U, m * E + f * L + g * P + h * d, n * x + k * G + r * M + v * S, n * F + k * J + r * N + v * T, n * B + k * K + r * O + v * U, n * E + k * L + r * P + v * d, p * x + w * G + t * M + u * S, p * F + w * J + t * N + u * T, p * B + w * K + t * O + u * U, p * E + w * L + t * P + u * d, z * x + A * G + C * M + b * S, z * F + A * J + C * N + b * T, z * B + A * K + C * O + b * U, z * E + A * 
+          L + C * P + b * d]);
+        };
+        a.createInverse = function(c) {
+          var e = c._m;
+          c = e[0];
+          var b = e[1], d = e[2], m = e[3], f = e[4], g = e[5], h = e[6], n = e[7], k = e[8], r = e[9], v = e[10], p = e[11], w = e[12], t = e[13], u = e[14], e = e[15], z = v * e, A = u * p, C = h * e, x = u * n, F = h * p, B = v * n, E = d * e, G = u * m, J = d * p, K = v * m, L = d * n, M = h * m, N = k * t, O = w * r, P = f * t, S = w * g, T = f * r, U = k * g, X = c * t, Y = w * b, Z = c * r, $ = k * b, aa = c * g, ba = f * b, da = z * g + x * r + F * t - (A * g + C * r + B * t), ea = A * b + 
+          E * r + K * t - (z * b + G * r + J * t), t = C * b + G * g + L * t - (x * b + E * g + M * t), b = B * b + J * g + M * r - (F * b + K * g + L * r), g = 1 / (c * da + f * ea + k * t + w * b);
+          return new a([g * da, g * ea, g * t, g * b, g * (A * f + C * k + B * w - (z * f + x * k + F * w)), g * (z * c + G * k + J * w - (A * c + E * k + K * w)), g * (x * c + E * f + M * w - (C * c + G * f + L * w)), g * (F * c + K * f + L * k - (B * c + J * f + M * k)), g * (N * n + S * p + T * e - (O * n + P * p + U * e)), g * (O * m + X * p + $ * e - (N * m + Y * p + Z * e)), g * (P * m + Y * n + aa * e - (S * m + X * n + ba * e)), g * (U * m + Z * n + ba * p - (T * m + $ * n + aa * p)), g * 
+          (P * v + U * u + O * h - (T * u + N * h + S * v)), g * (Z * u + N * d + Y * v - (X * v + $ * u + O * d)), g * (X * h + ba * u + S * d - (aa * u + P * d + Y * h)), g * (aa * v + T * d + $ * h - (Z * h + ba * v + U * d))]);
         };
         return a;
       }();
-      g.Matrix3D = s;
-      s = function() {
-        function a(b, f, c) {
-          void 0 === c && (c = 7);
-          var d = this.size = 1 << c;
-          this.sizeInBits = c;
-          this.w = b;
-          this.h = f;
-          this.c = Math.ceil(b / d);
-          this.r = Math.ceil(f / d);
+      g.Matrix3D = r;
+      r = function() {
+        function a(c, e, b) {
+          void 0 === b && (b = 7);
+          var d = this.size = 1 << b;
+          this.sizeInBits = b;
+          this.w = c;
+          this.h = e;
+          this.c = Math.ceil(c / d);
+          this.r = Math.ceil(e / d);
           this.grid = [];
-          for (b = 0;b < this.r;b++) {
-            for (this.grid.push([]), f = 0;f < this.c;f++) {
-              this.grid[b][f] = new a.Cell(new u(f * d, b * d, d, d));
+          for (c = 0;c < this.r;c++) {
+            for (this.grid.push([]), e = 0;e < this.c;e++) {
+              this.grid[c][e] = new a.Cell(new v(e * d, c * d, d, d));
             }
           }
         }
         a.prototype.clear = function() {
-          for (var b = 0;b < this.r;b++) {
-            for (var a = 0;a < this.c;a++) {
-              this.grid[b][a].clear();
+          for (var a = 0;a < this.r;a++) {
+            for (var e = 0;e < this.c;e++) {
+              this.grid[a][e].clear();
             }
           }
         };
         a.prototype.getBounds = function() {
-          return new u(0, 0, this.w, this.h);
+          return new v(0, 0, this.w, this.h);
         };
-        a.prototype.addDirtyRectangle = function(b) {
-          var a = b.x >> this.sizeInBits, c = b.y >> this.sizeInBits;
-          if (!(a >= this.c || c >= this.r)) {
-            0 > a && (a = 0);
-            0 > c && (c = 0);
-            var d = this.grid[c][a];
-            b = b.clone();
-            b.snap();
-            if (d.region.contains(b)) {
-              d.bounds.isEmpty() ? d.bounds.set(b) : d.bounds.contains(b) || d.bounds.union(b);
+        a.prototype.addDirtyRectangle = function(a) {
+          var e = a.x >> this.sizeInBits, b = a.y >> this.sizeInBits;
+          if (!(e >= this.c || b >= this.r)) {
+            0 > e && (e = 0);
+            0 > b && (b = 0);
+            var d = this.grid[b][e];
+            a = a.clone();
+            a.snap();
+            if (d.region.contains(a)) {
+              d.bounds.isEmpty() ? d.bounds.set(a) : d.bounds.contains(a) || d.bounds.union(a);
             } else {
-              for (var e = Math.min(this.c, Math.ceil((b.x + b.w) / this.size)) - a, h = Math.min(this.r, Math.ceil((b.y + b.h) / this.size)) - c, n = 0;n < e;n++) {
-                for (var g = 0;g < h;g++) {
-                  d = this.grid[c + g][a + n], d = d.region.clone(), d.intersect(b), d.isEmpty() || this.addDirtyRectangle(d);
+              for (var m = Math.min(this.c, Math.ceil((a.x + a.w) / this.size)) - e, f = Math.min(this.r, Math.ceil((a.y + a.h) / this.size)) - b, g = 0;g < m;g++) {
+                for (var l = 0;l < f;l++) {
+                  d = this.grid[b + l][e + g], d = d.region.clone(), d.intersect(a), d.isEmpty() || this.addDirtyRectangle(d);
                 }
               }
             }
           }
         };
-        a.prototype.gatherRegions = function(b) {
-          for (var a = 0;a < this.r;a++) {
-            for (var c = 0;c < this.c;c++) {
-              this.grid[a][c].bounds.isEmpty() || b.push(this.grid[a][c].bounds);
+        a.prototype.gatherRegions = function(a) {
+          for (var e = 0;e < this.r;e++) {
+            for (var b = 0;b < this.c;b++) {
+              this.grid[e][b].bounds.isEmpty() || a.push(this.grid[e][b].bounds);
             }
           }
         };
-        a.prototype.gatherOptimizedRegions = function(b) {
-          this.gatherRegions(b);
+        a.prototype.gatherOptimizedRegions = function(a) {
+          this.gatherRegions(a);
         };
         a.prototype.getDirtyRatio = function() {
-          var b = this.w * this.h;
-          if (0 === b) {
+          var a = this.w * this.h;
+          if (0 === a) {
             return 0;
           }
-          for (var a = 0, c = 0;c < this.r;c++) {
+          for (var e = 0, b = 0;b < this.r;b++) {
             for (var d = 0;d < this.c;d++) {
-              a += this.grid[c][d].region.area();
+              e += this.grid[b][d].region.area();
             }
           }
-          return a / b;
+          return e / a;
         };
-        a.prototype.render = function(b, a) {
-          function c(a) {
-            b.rect(a.x, a.y, a.w, a.h);
+        a.prototype.render = function(a, e) {
+          function b(e) {
+            a.rect(e.x, e.y, e.w, e.h);
           }
-          if (a && a.drawGrid) {
-            b.strokeStyle = "white";
+          if (e && e.drawGrid) {
+            a.strokeStyle = "white";
             for (var d = 0;d < this.r;d++) {
-              for (var e = 0;e < this.c;e++) {
-                var h = this.grid[d][e];
-                b.beginPath();
-                c(h.region);
-                b.closePath();
-                b.stroke();
+              for (var m = 0;m < this.c;m++) {
+                var f = this.grid[d][m];
+                a.beginPath();
+                b(f.region);
+                a.closePath();
+                a.stroke();
               }
             }
           }
-          b.strokeStyle = "#E0F8D8";
+          a.strokeStyle = "#E0F8D8";
           for (d = 0;d < this.r;d++) {
-            for (e = 0;e < this.c;e++) {
-              h = this.grid[d][e], b.beginPath(), c(h.bounds), b.closePath(), b.stroke();
+            for (m = 0;m < this.c;m++) {
+              f = this.grid[d][m], a.beginPath(), b(f.bounds), a.closePath(), a.stroke();
             }
           }
         };
-        a.tmpRectangle = u.createEmpty();
+        a.tmpRectangle = v.createEmpty();
         return a;
       }();
-      g.DirtyRegion = s;
+      g.DirtyRegion = r;
       (function(a) {
-        var b = function() {
-          function b(a) {
-            this.region = a;
-            this.bounds = u.createEmpty();
+        var c = function() {
+          function a(c) {
+            this.region = c;
+            this.bounds = v.createEmpty();
           }
-          b.prototype.clear = function() {
+          a.prototype.clear = function() {
             this.bounds.setEmpty();
           };
-          return b;
+          return a;
         }();
-        a.Cell = b;
-      })(s = g.DirtyRegion || (g.DirtyRegion = {}));
-      var v = function() {
-        function a(b, f, c, d, e, h) {
-          this.index = b;
-          this.x = f;
-          this.y = c;
-          this.scale = h;
-          this.bounds = new u(f * d, c * e, d, e);
+        a.Cell = c;
+      })(r = g.DirtyRegion || (g.DirtyRegion = {}));
+      var w = function() {
+        function a(c, e, b, d, m, f) {
+          this.index = c;
+          this.x = e;
+          this.y = b;
+          this.scale = f;
+          this.bounds = new v(e * d, b * m, d, m);
         }
         a.prototype.getOBB = function() {
           if (this._obb) {
             return this._obb;
           }
           this.bounds.getCorners(a.corners);
-          return this._obb = new n(a.corners);
+          return this._obb = new m(a.corners);
         };
-        a.corners = p.createEmptyPoints(4);
+        a.corners = n.createEmptyPoints(4);
         return a;
       }();
-      g.Tile = v;
-      var d = function() {
-        function a(b, f, c, d, e) {
-          this.tileW = c;
+      g.Tile = w;
+      var t = function() {
+        function a(c, e, b, d, m) {
+          this.tileW = b;
           this.tileH = d;
-          this.scale = e;
-          this.w = b;
-          this.h = f;
-          this.rows = Math.ceil(f / d);
-          this.columns = Math.ceil(b / c);
+          this.scale = m;
+          this.w = c;
+          this.h = e;
+          this.rows = Math.ceil(e / d);
+          this.columns = Math.ceil(c / b);
           this.tiles = [];
-          for (f = b = 0;f < this.rows;f++) {
-            for (var h = 0;h < this.columns;h++) {
-              this.tiles.push(new v(b++, h, f, c, d, e));
+          for (e = c = 0;e < this.rows;e++) {
+            for (var f = 0;f < this.columns;f++) {
+              this.tiles.push(new w(c++, f, e, b, d, m));
             }
           }
         }
-        a.prototype.getTiles = function(b, a) {
-          if (a.emptyArea(b)) {
+        a.prototype.getTiles = function(a, e) {
+          if (e.emptyArea(a)) {
             return[];
           }
-          if (a.infiniteArea(b)) {
+          if (e.infiniteArea(a)) {
             return this.tiles;
           }
-          var c = this.columns * this.rows;
-          return 40 > c && a.isScaleOrRotation() ? this.getFewTiles(b, a, 10 < c) : this.getManyTiles(b, a);
+          var b = this.columns * this.rows;
+          return 40 > b && e.isScaleOrRotation() ? this.getFewTiles(a, e, 10 < b) : this.getManyTiles(a, e);
         };
-        a.prototype.getFewTiles = function(b, f, c) {
-          void 0 === c && (c = !0);
-          if (f.isTranslationOnly() && 1 === this.tiles.length) {
-            return this.tiles[0].bounds.intersectsTranslated(b, f.tx, f.ty) ? [this.tiles[0]] : [];
+        a.prototype.getFewTiles = function(c, e, b) {
+          void 0 === b && (b = !0);
+          if (e.isTranslationOnly() && 1 === this.tiles.length) {
+            return this.tiles[0].bounds.intersectsTranslated(c, e.tx, e.ty) ? [this.tiles[0]] : [];
           }
-          f.transformRectangle(b, a._points);
+          e.transformRectangle(c, a._points);
           var d;
-          b = new u(0, 0, this.w, this.h);
-          c && (d = new n(a._points));
-          b.intersect(n.getBounds(a._points));
-          if (b.isEmpty()) {
+          c = new v(0, 0, this.w, this.h);
+          b && (d = new m(a._points));
+          c.intersect(m.getBounds(a._points));
+          if (c.isEmpty()) {
             return[];
           }
-          var h = b.x / this.tileW | 0;
-          f = b.y / this.tileH | 0;
-          var g = Math.ceil((b.x + b.w) / this.tileW) | 0, k = Math.ceil((b.y + b.h) / this.tileH) | 0, h = m(h, 0, this.columns), g = m(g, 0, this.columns);
-          f = m(f, 0, this.rows);
-          for (var k = m(k, 0, this.rows), p = [];h < g;h++) {
-            for (var l = f;l < k;l++) {
-              var s = this.tiles[l * this.columns + h];
-              s.bounds.intersects(b) && (c ? s.getOBB().intersects(d) : 1) && p.push(s);
-            }
-          }
-          return p;
-        };
-        a.prototype.getManyTiles = function(b, f) {
-          function c(b, a, f) {
-            return(b - a.x) * (f.y - a.y) / (f.x - a.x) + a.y;
-          }
-          function d(b, a, f, c, e) {
-            if (!(0 > f || f >= a.columns)) {
-              for (c = m(c, 0, a.rows), e = m(e + 1, 0, a.rows);c < e;c++) {
-                b.push(a.tiles[c * a.columns + f]);
-              }
+          var f = c.x / this.tileW | 0;
+          e = c.y / this.tileH | 0;
+          var g = Math.ceil((c.x + c.w) / this.tileW) | 0, n = Math.ceil((c.y + c.h) / this.tileH) | 0, f = h(f, 0, this.columns), g = h(g, 0, this.columns);
+          e = h(e, 0, this.rows);
+          for (var n = h(n, 0, this.rows), k = [];f < g;f++) {
+            for (var r = e;r < n;r++) {
+              var p = this.tiles[r * this.columns + f];
+              p.bounds.intersects(c) && (b ? p.getOBB().intersects(d) : 1) && k.push(p);
             }
           }
-          var h = a._points;
-          f.transformRectangle(b, h);
-          for (var n = h[0].x < h[1].x ? 0 : 1, g = h[2].x < h[3].x ? 2 : 3, g = h[n].x < h[g].x ? n : g, n = [], k = 0;5 > k;k++, g++) {
-            n.push(h[g % 4]);
-          }
-          (n[1].x - n[0].x) * (n[3].y - n[0].y) < (n[1].y - n[0].y) * (n[3].x - n[0].x) && (h = n[1], n[1] = n[3], n[3] = h);
-          var h = [], p, l, g = Math.floor(n[0].x / this.tileW), k = (g + 1) * this.tileW;
-          if (n[2].x < k) {
-            p = Math.min(n[0].y, n[1].y, n[2].y, n[3].y);
-            l = Math.max(n[0].y, n[1].y, n[2].y, n[3].y);
-            var s = Math.floor(p / this.tileH), u = Math.floor(l / this.tileH);
-            d(h, this, g, s, u);
-            return h;
+          return k;
+        };
+        a.prototype.getManyTiles = function(c, e) {
+          function b(a, c, e) {
+            return(a - c.x) * (e.y - c.y) / (e.x - c.x) + c.y;
+          }
+          function d(a, c, e, b, q) {
+            if (!(0 > e || e >= c.columns)) {
+              for (b = h(b, 0, c.rows), q = h(q + 1, 0, c.rows);b < q;b++) {
+                a.push(c.tiles[b * c.columns + e]);
+              }
+            }
           }
-          var v = 0, r = 4, t = !1;
-          if (n[0].x === n[1].x || n[0].x === n[3].x) {
-            n[0].x === n[1].x ? (t = !0, v++) : r--, p = c(k, n[v], n[v + 1]), l = c(k, n[r], n[r - 1]), s = Math.floor(n[v].y / this.tileH), u = Math.floor(n[r].y / this.tileH), d(h, this, g, s, u), g++;
+          var m = a._points;
+          e.transformRectangle(c, m);
+          for (var f = m[0].x < m[1].x ? 0 : 1, g = m[2].x < m[3].x ? 2 : 3, g = m[f].x < m[g].x ? f : g, f = [], n = 0;5 > n;n++, g++) {
+            f.push(m[g % 4]);
+          }
+          (f[1].x - f[0].x) * (f[3].y - f[0].y) < (f[1].y - f[0].y) * (f[3].x - f[0].x) && (m = f[1], f[1] = f[3], f[3] = m);
+          var m = [], k, r, g = Math.floor(f[0].x / this.tileW), n = (g + 1) * this.tileW;
+          if (f[2].x < n) {
+            k = Math.min(f[0].y, f[1].y, f[2].y, f[3].y);
+            r = Math.max(f[0].y, f[1].y, f[2].y, f[3].y);
+            var v = Math.floor(k / this.tileH), p = Math.floor(r / this.tileH);
+            d(m, this, g, v, p);
+            return m;
+          }
+          var w = 0, t = 4, u = !1;
+          if (f[0].x === f[1].x || f[0].x === f[3].x) {
+            f[0].x === f[1].x ? (u = !0, w++) : t--, k = b(n, f[w], f[w + 1]), r = b(n, f[t], f[t - 1]), v = Math.floor(f[w].y / this.tileH), p = Math.floor(f[t].y / this.tileH), d(m, this, g, v, p), g++;
           }
           do {
-            var C, y, z, B;
-            n[v + 1].x < k ? (C = n[v + 1].y, z = !0) : (C = c(k, n[v], n[v + 1]), z = !1);
-            n[r - 1].x < k ? (y = n[r - 1].y, B = !0) : (y = c(k, n[r], n[r - 1]), B = !1);
-            s = Math.floor((n[v].y < n[v + 1].y ? p : C) / this.tileH);
-            u = Math.floor((n[r].y > n[r - 1].y ? l : y) / this.tileH);
-            d(h, this, g, s, u);
-            if (z && t) {
+            var D, z, A, C;
+            f[w + 1].x < n ? (D = f[w + 1].y, A = !0) : (D = b(n, f[w], f[w + 1]), A = !1);
+            f[t - 1].x < n ? (z = f[t - 1].y, C = !0) : (z = b(n, f[t], f[t - 1]), C = !1);
+            v = Math.floor((f[w].y < f[w + 1].y ? k : D) / this.tileH);
+            p = Math.floor((f[t].y > f[t - 1].y ? r : z) / this.tileH);
+            d(m, this, g, v, p);
+            if (A && u) {
               break;
             }
-            z ? (t = !0, v++, p = c(k, n[v], n[v + 1])) : p = C;
-            B ? (r--, l = c(k, n[r], n[r - 1])) : l = y;
+            A ? (u = !0, w++, k = b(n, f[w], f[w + 1])) : k = D;
+            C ? (t--, r = b(n, f[t], f[t - 1])) : r = z;
             g++;
-            k = (g + 1) * this.tileW;
-          } while (v < r);
-          return h;
+            n = (g + 1) * this.tileW;
+          } while (w < t);
+          return m;
         };
-        a._points = p.createEmptyPoints(4);
+        a._points = n.createEmptyPoints(4);
         return a;
       }();
-      g.TileCache = d;
-      s = function() {
-        function c(b, a, d) {
+      g.TileCache = t;
+      r = function() {
+        function b(a, e, d) {
           this._cacheLevels = [];
-          this._source = b;
-          this._tileSize = a;
+          this._source = a;
+          this._tileSize = e;
           this._minUntiledSize = d;
         }
-        c.prototype._getTilesAtScale = function(b, f, c) {
-          var e = Math.max(f.getAbsoluteScaleX(), f.getAbsoluteScaleY()), h = 0;
-          1 !== e && (h = m(Math.round(Math.log(1 / e) / Math.LN2), -5, 3));
-          e = a(h);
+        b.prototype._getTilesAtScale = function(c, e, b) {
+          var d = Math.max(e.getAbsoluteScaleX(), e.getAbsoluteScaleY()), f = 0;
+          1 !== d && (f = h(Math.round(Math.log(1 / d) / Math.LN2), -5, 3));
+          d = a(f);
           if (this._source.hasFlags(1048576)) {
             for (;;) {
-              e = a(h);
-              if (c.contains(this._source.getBounds().getAbsoluteBounds().clone().scale(e, e))) {
+              d = a(f);
+              if (b.contains(this._source.getBounds().getAbsoluteBounds().clone().scale(d, d))) {
                 break;
               }
-              h--;
+              f--;
             }
           }
-          this._source.hasFlags(2097152) || (h = m(h, -5, 0));
-          e = a(h);
-          c = 5 + h;
-          h = this._cacheLevels[c];
-          if (!h) {
-            var h = this._source.getBounds().getAbsoluteBounds().clone().scale(e, e), n, g;
-            this._source.hasFlags(1048576) || !this._source.hasFlags(4194304) || Math.max(h.w, h.h) <= this._minUntiledSize ? (n = h.w, g = h.h) : n = g = this._tileSize;
-            h = this._cacheLevels[c] = new d(h.w, h.h, n, g, e);
-          }
-          return h.getTiles(b, f.scaleClone(e, e));
-        };
-        c.prototype.fetchTiles = function(b, a, c, d) {
-          var e = new u(0, 0, c.canvas.width, c.canvas.height);
-          b = this._getTilesAtScale(b, a, e);
-          var h;
-          a = this._source;
-          for (var n = 0;n < b.length;n++) {
-            var g = b[n];
-            g.cachedSurfaceRegion && g.cachedSurfaceRegion.surface && !a.hasFlags(1048592) || (h || (h = []), h.push(g));
+          this._source.hasFlags(2097152) || (f = h(f, -5, 0));
+          d = a(f);
+          b = 5 + f;
+          f = this._cacheLevels[b];
+          if (!f) {
+            var f = this._source.getBounds().getAbsoluteBounds().clone().scale(d, d), m, g;
+            this._source.hasFlags(1048576) || !this._source.hasFlags(4194304) || Math.max(f.w, f.h) <= this._minUntiledSize ? (m = f.w, g = f.h) : m = g = this._tileSize;
+            f = this._cacheLevels[b] = new t(f.w, f.h, m, g, d);
+          }
+          return f.getTiles(c, e.scaleClone(d, d));
+        };
+        b.prototype.fetchTiles = function(a, e, b, d) {
+          var f = new v(0, 0, b.canvas.width, b.canvas.height);
+          a = this._getTilesAtScale(a, e, f);
+          var m;
+          e = this._source;
+          for (var g = 0;g < a.length;g++) {
+            var l = a[g];
+            l.cachedSurfaceRegion && l.cachedSurfaceRegion.surface && !e.hasFlags(1048592) || (m || (m = []), m.push(l));
           }
-          h && this._cacheTiles(c, h, d, e);
-          a.removeFlags(16);
-          return b;
+          m && this._cacheTiles(b, m, d, f);
+          e.removeFlags(16);
+          return a;
         };
-        c.prototype._getTileBounds = function(b) {
-          for (var a = u.createEmpty(), c = 0;c < b.length;c++) {
-            a.union(b[c].bounds);
+        b.prototype._getTileBounds = function(a) {
+          for (var e = v.createEmpty(), b = 0;b < a.length;b++) {
+            e.union(a[b].bounds);
           }
-          return a;
+          return e;
         };
-        c.prototype._cacheTiles = function(b, a, c, d, e) {
-          void 0 === e && (e = 4);
-          var h = this._getTileBounds(a);
-          b.save();
-          b.setTransform(1, 0, 0, 1, 0, 0);
-          b.clearRect(0, 0, d.w, d.h);
-          b.translate(-h.x, -h.y);
-          b.scale(a[0].scale, a[0].scale);
-          var n = this._source.getBounds();
-          b.translate(-n.x, -n.y);
-          2 <= r.traceLevel && r.writer && r.writer.writeLn("Rendering Tiles: " + h);
-          this._source.render(b, 0);
-          b.restore();
-          for (var n = null, g = 0;g < a.length;g++) {
-            var k = a[g], p = k.bounds.clone();
-            p.x -= h.x;
-            p.y -= h.y;
-            d.contains(p) || (n || (n = []), n.push(k));
-            k.cachedSurfaceRegion = c(k.cachedSurfaceRegion, b, p);
+        b.prototype._cacheTiles = function(a, e, b, d, f) {
+          void 0 === f && (f = 4);
+          var m = this._getTileBounds(e);
+          a.save();
+          a.setTransform(1, 0, 0, 1, 0, 0);
+          a.clearRect(0, 0, d.w, d.h);
+          a.translate(-m.x, -m.y);
+          a.scale(e[0].scale, e[0].scale);
+          var g = this._source.getBounds();
+          a.translate(-g.x, -g.y);
+          2 <= p.traceLevel && p.writer && p.writer.writeLn("Rendering Tiles: " + m);
+          this._source.render(a, 0);
+          a.restore();
+          for (var g = null, l = 0;l < e.length;l++) {
+            var h = e[l], n = h.bounds.clone();
+            n.x -= m.x;
+            n.y -= m.y;
+            d.contains(n) || (g || (g = []), g.push(h));
+            h.cachedSurfaceRegion = b(h.cachedSurfaceRegion, a, n);
           }
-          n && (2 <= n.length ? (a = n.slice(0, n.length / 2 | 0), h = n.slice(a.length), this._cacheTiles(b, a, c, d, e - 1), this._cacheTiles(b, h, c, d, e - 1)) : this._cacheTiles(b, n, c, d, e - 1));
+          g && (2 <= g.length ? (e = g.slice(0, g.length / 2 | 0), m = g.slice(e.length), this._cacheTiles(a, e, b, d, f - 1), this._cacheTiles(a, m, b, d, f - 1)) : this._cacheTiles(a, g, b, d, f - 1));
         };
-        return c;
+        return b;
       }();
-      g.RenderableTileCache = s;
-    })(r.Geometry || (r.Geometry = {}));
-  })(l.GFX || (l.GFX = {}));
+      g.RenderableTileCache = r;
+    })(p.Geometry || (p.Geometry = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-__extends = this.__extends || function(l, r) {
+__extends = this.__extends || function(k, p) {
   function g() {
-    this.constructor = l;
+    this.constructor = k;
   }
-  for (var c in r) {
-    r.hasOwnProperty(c) && (l[c] = r[c]);
+  for (var b in p) {
+    p.hasOwnProperty(b) && (k[b] = p[b]);
   }
-  g.prototype = r.prototype;
-  l.prototype = new g;
+  g.prototype = p.prototype;
+  k.prototype = new g;
 };
-(function(l) {
-  (function(r) {
-    var g = l.IntegerUtilities.roundToMultipleOfPowerOfTwo, c = r.Geometry.Rectangle;
-    (function(l) {
-      var m = function(a) {
-        function c() {
+(function(k) {
+  (function(p) {
+    var g = k.IntegerUtilities.roundToMultipleOfPowerOfTwo, b = p.Geometry.Rectangle;
+    (function(k) {
+      var h = function(a) {
+        function b() {
           a.apply(this, arguments);
         }
-        __extends(c, a);
-        return c;
-      }(r.Geometry.Rectangle);
-      l.Region = m;
+        __extends(b, a);
+        return b;
+      }(p.Geometry.Rectangle);
+      k.Region = h;
       var a = function() {
-        function a(c, d) {
-          this._root = new h(0, 0, c | 0, d | 0, !1);
+        function a(b, f) {
+          this._root = new d(0, 0, b | 0, f | 0, !1);
         }
-        a.prototype.allocate = function(a, c) {
+        a.prototype.allocate = function(a, b) {
           a = Math.ceil(a);
-          c = Math.ceil(c);
-          var e = this._root.insert(a, c);
-          e && (e.allocator = this, e.allocated = !0);
-          return e;
+          b = Math.ceil(b);
+          var d = this._root.insert(a, b);
+          d && (d.allocator = this, d.allocated = !0);
+          return d;
         };
         a.prototype.free = function(a) {
           a.clear();
@@ -8279,54 +8288,54 @@
         a.MAX_DEPTH = 256;
         return a;
       }();
-      l.CompactAllocator = a;
-      var h = function(c) {
-        function h(a, e, b, f, q) {
-          c.call(this, a, e, b, f);
+      k.CompactAllocator = a;
+      var d = function(b) {
+        function d(a, f, c, e, q) {
+          b.call(this, a, f, c, e);
           this._children = null;
           this._horizontal = q;
           this.allocated = !1;
         }
-        __extends(h, c);
-        h.prototype.clear = function() {
+        __extends(d, b);
+        d.prototype.clear = function() {
           this._children = null;
           this.allocated = !1;
         };
-        h.prototype.insert = function(a, c) {
-          return this._insert(a, c, 0);
+        d.prototype.insert = function(a, b) {
+          return this._insert(a, b, 0);
         };
-        h.prototype._insert = function(c, e, b) {
-          if (!(b > a.MAX_DEPTH || this.allocated || this.w < c || this.h < e)) {
+        d.prototype._insert = function(b, f, c) {
+          if (!(c > a.MAX_DEPTH || this.allocated || this.w < b || this.h < f)) {
             if (this._children) {
-              var f;
-              if ((f = this._children[0]._insert(c, e, b + 1)) || (f = this._children[1]._insert(c, e, b + 1))) {
-                return f;
+              var e;
+              if ((e = this._children[0]._insert(b, f, c + 1)) || (e = this._children[1]._insert(b, f, c + 1))) {
+                return e;
               }
             } else {
-              return f = !this._horizontal, a.RANDOM_ORIENTATION && (f = .5 <= Math.random()), this._children = this._horizontal ? [new h(this.x, this.y, this.w, e, !1), new h(this.x, this.y + e, this.w, this.h - e, f)] : [new h(this.x, this.y, c, this.h, !0), new h(this.x + c, this.y, this.w - c, this.h, f)], f = this._children[0], f.w === c && f.h === e ? (f.allocated = !0, f) : this._insert(c, e, b + 1);
+              return e = !this._horizontal, a.RANDOM_ORIENTATION && (e = .5 <= Math.random()), this._children = this._horizontal ? [new d(this.x, this.y, this.w, f, !1), new d(this.x, this.y + f, this.w, this.h - f, e)] : [new d(this.x, this.y, b, this.h, !0), new d(this.x + b, this.y, this.w - b, this.h, e)], e = this._children[0], e.w === b && e.h === f ? (e.allocated = !0, e) : this._insert(b, f, c + 1);
             }
           }
         };
-        return h;
-      }(l.Region), p = function() {
-        function a(c, d, e, b) {
-          this._columns = c / e | 0;
-          this._rows = d / b | 0;
-          this._sizeW = e;
-          this._sizeH = b;
+        return d;
+      }(k.Region), n = function() {
+        function a(b, d, f, c) {
+          this._columns = b / f | 0;
+          this._rows = d / c | 0;
+          this._sizeW = f;
+          this._sizeH = c;
           this._freeList = [];
           this._index = 0;
           this._total = this._columns * this._rows;
         }
-        a.prototype.allocate = function(a, c) {
+        a.prototype.allocate = function(a, b) {
           a = Math.ceil(a);
-          c = Math.ceil(c);
-          var e = this._sizeW, b = this._sizeH;
-          if (a > e || c > b) {
+          b = Math.ceil(b);
+          var d = this._sizeW, c = this._sizeH;
+          if (a > d || b > c) {
             return null;
           }
-          var f = this._freeList, q = this._index;
-          return 0 < f.length ? (e = f.pop(), e.w = a, e.h = c, e.allocated = !0, e) : q < this._total ? (f = q / this._columns | 0, e = new k((q - f * this._columns) * e, f * b, a, c), e.index = q, e.allocator = this, e.allocated = !0, this._index++, e) : null;
+          var e = this._freeList, q = this._index;
+          return 0 < e.length ? (d = e.pop(), d.w = a, d.h = b, d.allocated = !0, d) : q < this._total ? (e = q / this._columns | 0, d = new f((q - e * this._columns) * d, e * c, a, b), d.index = q, d.allocator = this, d.allocated = !0, this._index++, d) : null;
         };
         a.prototype.free = function(a) {
           a.allocated = !1;
@@ -8334,74 +8343,74 @@
         };
         return a;
       }();
-      l.GridAllocator = p;
-      var k = function(a) {
-        function c(d, e, b, f) {
-          a.call(this, d, e, b, f);
+      k.GridAllocator = n;
+      var f = function(a) {
+        function b(d, f, c, e) {
+          a.call(this, d, f, c, e);
           this.index = -1;
         }
-        __extends(c, a);
-        return c;
-      }(l.Region);
-      l.GridCell = k;
-      var u = function() {
-        return function(a, c, d) {
+        __extends(b, a);
+        return b;
+      }(k.Region);
+      k.GridCell = f;
+      var v = function() {
+        return function(a, b, d) {
           this.size = a;
-          this.region = c;
+          this.region = b;
           this.allocator = d;
         };
-      }(), n = function(a) {
-        function c(d, e, b, f, q) {
-          a.call(this, d, e, b, f);
+      }(), m = function(a) {
+        function b(d, f, c, e, q) {
+          a.call(this, d, f, c, e);
           this.region = q;
         }
-        __extends(c, a);
-        return c;
-      }(l.Region);
-      l.BucketCell = n;
-      m = function() {
-        function a(c, d) {
+        __extends(b, a);
+        return b;
+      }(k.Region);
+      k.BucketCell = m;
+      h = function() {
+        function a(b, d) {
           this._buckets = [];
-          this._w = c | 0;
+          this._w = b | 0;
           this._h = d | 0;
           this._filled = 0;
         }
         a.prototype.allocate = function(a, d) {
           a = Math.ceil(a);
           d = Math.ceil(d);
-          var e = Math.max(a, d);
+          var f = Math.max(a, d);
           if (a > this._w || d > this._h) {
             return null;
           }
-          var b = null, f, q = this._buckets;
+          var c = null, e, q = this._buckets;
           do {
-            for (var h = 0;h < q.length && !(q[h].size >= e && (f = q[h], b = f.allocator.allocate(a, d)));h++) {
+            for (var s = 0;s < q.length && !(q[s].size >= f && (e = q[s], c = e.allocator.allocate(a, d)));s++) {
             }
-            if (!b) {
-              var k = this._h - this._filled;
-              if (k < d) {
+            if (!c) {
+              var h = this._h - this._filled;
+              if (h < d) {
                 return null;
               }
-              var h = g(e, 8), m = 2 * h;
-              m > k && (m = k);
-              if (m < h) {
+              var s = g(f, 8), k = 2 * s;
+              k > h && (k = h);
+              if (k < s) {
                 return null;
               }
-              k = new c(0, this._filled, this._w, m);
-              this._buckets.push(new u(h, k, new p(k.w, k.h, h, h)));
-              this._filled += m;
+              h = new b(0, this._filled, this._w, k);
+              this._buckets.push(new v(s, h, new n(h.w, h.h, s, s)));
+              this._filled += k;
             }
-          } while (!b);
-          return new n(f.region.x + b.x, f.region.y + b.y, b.w, b.h, b);
+          } while (!c);
+          return new m(e.region.x + c.x, e.region.y + c.y, c.w, c.h, c);
         };
         a.prototype.free = function(a) {
           a.region.allocator.free(a.region);
         };
         return a;
       }();
-      l.BucketAllocator = m;
-    })(r.RegionAllocator || (r.RegionAllocator = {}));
-    (function(c) {
+      k.BucketAllocator = h;
+    })(p.RegionAllocator || (p.RegionAllocator = {}));
+    (function(b) {
       var g = function() {
         function a(a) {
           this._createSurface = a;
@@ -8410,207 +8419,210 @@
         Object.defineProperty(a.prototype, "surfaces", {get:function() {
           return this._surfaces;
         }, enumerable:!0, configurable:!0});
-        a.prototype._createNewSurface = function(a, c) {
-          var g = this._createSurface(a, c);
-          this._surfaces.push(g);
-          return g;
+        a.prototype._createNewSurface = function(a, b) {
+          var f = this._createSurface(a, b);
+          this._surfaces.push(f);
+          return f;
         };
         a.prototype.addSurface = function(a) {
           this._surfaces.push(a);
         };
-        a.prototype.allocate = function(a, c, g) {
-          for (var m = 0;m < this._surfaces.length;m++) {
-            var n = this._surfaces[m];
-            if (n !== g && (n = n.allocate(a, c))) {
-              return n;
+        a.prototype.allocate = function(a, b, f) {
+          for (var g = 0;g < this._surfaces.length;g++) {
+            var m = this._surfaces[g];
+            if (m !== f && (m = m.allocate(a, b))) {
+              return m;
             }
           }
-          return this._createNewSurface(a, c).allocate(a, c);
+          return this._createNewSurface(a, b).allocate(a, b);
         };
         a.prototype.free = function(a) {
         };
         return a;
       }();
-      c.SimpleAllocator = g;
-    })(r.SurfaceRegionAllocator || (r.SurfaceRegionAllocator = {}));
-  })(l.GFX || (l.GFX = {}));
-})(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
-    var g = r.Geometry.Rectangle, c = r.Geometry.Matrix, t = r.Geometry.DirtyRegion;
-    (function(b) {
-      b[b.Normal = 1] = "Normal";
-      b[b.Layer = 2] = "Layer";
-      b[b.Multiply = 3] = "Multiply";
-      b[b.Screen = 4] = "Screen";
-      b[b.Lighten = 5] = "Lighten";
-      b[b.Darken = 6] = "Darken";
-      b[b.Difference = 7] = "Difference";
-      b[b.Add = 8] = "Add";
-      b[b.Subtract = 9] = "Subtract";
-      b[b.Invert = 10] = "Invert";
-      b[b.Alpha = 11] = "Alpha";
-      b[b.Erase = 12] = "Erase";
-      b[b.Overlay = 13] = "Overlay";
-      b[b.HardLight = 14] = "HardLight";
-    })(r.BlendMode || (r.BlendMode = {}));
-    var m = r.BlendMode;
-    (function(b) {
-      b[b.None = 0] = "None";
-      b[b.BoundsAutoCompute = 2] = "BoundsAutoCompute";
-      b[b.IsMask = 4] = "IsMask";
-      b[b.Dirty = 16] = "Dirty";
-      b[b.InvalidBounds = 256] = "InvalidBounds";
-      b[b.InvalidConcatenatedMatrix = 512] = "InvalidConcatenatedMatrix";
-      b[b.InvalidInvertedConcatenatedMatrix = 1024] = "InvalidInvertedConcatenatedMatrix";
-      b[b.InvalidConcatenatedColorMatrix = 2048] = "InvalidConcatenatedColorMatrix";
-      b[b.UpOnAddedOrRemoved = b.InvalidBounds | b.Dirty] = "UpOnAddedOrRemoved";
-      b[b.UpOnMoved = b.InvalidBounds | b.Dirty] = "UpOnMoved";
-      b[b.DownOnAddedOrRemoved = b.InvalidConcatenatedMatrix | b.InvalidInvertedConcatenatedMatrix | b.InvalidConcatenatedColorMatrix] = "DownOnAddedOrRemoved";
-      b[b.DownOnMoved = b.InvalidConcatenatedMatrix | b.InvalidInvertedConcatenatedMatrix | b.InvalidConcatenatedColorMatrix] = "DownOnMoved";
-      b[b.UpOnColorMatrixChanged = b.Dirty] = "UpOnColorMatrixChanged";
-      b[b.DownOnColorMatrixChanged = b.InvalidConcatenatedColorMatrix] = "DownOnColorMatrixChanged";
-      b[b.Visible = 65536] = "Visible";
-      b[b.UpOnInvalidate = b.InvalidBounds | b.Dirty] = "UpOnInvalidate";
-      b[b.Default = b.BoundsAutoCompute | b.InvalidBounds | b.InvalidConcatenatedMatrix | b.InvalidInvertedConcatenatedMatrix | b.Visible] = "Default";
-      b[b.CacheAsBitmap = 131072] = "CacheAsBitmap";
-      b[b.PixelSnapping = 262144] = "PixelSnapping";
-      b[b.ImageSmoothing = 524288] = "ImageSmoothing";
-      b[b.Dynamic = 1048576] = "Dynamic";
-      b[b.Scalable = 2097152] = "Scalable";
-      b[b.Tileable = 4194304] = "Tileable";
-      b[b.Transparent = 32768] = "Transparent";
-    })(r.NodeFlags || (r.NodeFlags = {}));
-    var a = r.NodeFlags;
-    (function(b) {
-      b[b.Node = 1] = "Node";
-      b[b.Shape = 3] = "Shape";
-      b[b.Group = 5] = "Group";
-      b[b.Stage = 13] = "Stage";
-      b[b.Renderable = 33] = "Renderable";
-    })(r.NodeType || (r.NodeType = {}));
-    var h = r.NodeType;
-    (function(b) {
-      b[b.None = 0] = "None";
-      b[b.OnStageBoundsChanged = 1] = "OnStageBoundsChanged";
-    })(r.NodeEventType || (r.NodeEventType = {}));
-    var p = function() {
-      function b() {
+      b.SimpleAllocator = g;
+    })(p.SurfaceRegionAllocator || (p.SurfaceRegionAllocator = {}));
+  })(k.GFX || (k.GFX = {}));
+})(Shumway || (Shumway = {}));
+(function(k) {
+  (function(p) {
+    var g = p.Geometry.Rectangle, b = p.Geometry.Matrix, u = p.Geometry.DirtyRegion;
+    (function(a) {
+      a[a.Normal = 1] = "Normal";
+      a[a.Layer = 2] = "Layer";
+      a[a.Multiply = 3] = "Multiply";
+      a[a.Screen = 4] = "Screen";
+      a[a.Lighten = 5] = "Lighten";
+      a[a.Darken = 6] = "Darken";
+      a[a.Difference = 7] = "Difference";
+      a[a.Add = 8] = "Add";
+      a[a.Subtract = 9] = "Subtract";
+      a[a.Invert = 10] = "Invert";
+      a[a.Alpha = 11] = "Alpha";
+      a[a.Erase = 12] = "Erase";
+      a[a.Overlay = 13] = "Overlay";
+      a[a.HardLight = 14] = "HardLight";
+    })(p.BlendMode || (p.BlendMode = {}));
+    var h = p.BlendMode;
+    (function(a) {
+      a[a.None = 0] = "None";
+      a[a.BoundsAutoCompute = 2] = "BoundsAutoCompute";
+      a[a.IsMask = 4] = "IsMask";
+      a[a.Dirty = 16] = "Dirty";
+      a[a.InvalidBounds = 256] = "InvalidBounds";
+      a[a.InvalidConcatenatedMatrix = 512] = "InvalidConcatenatedMatrix";
+      a[a.InvalidInvertedConcatenatedMatrix = 1024] = "InvalidInvertedConcatenatedMatrix";
+      a[a.InvalidConcatenatedColorMatrix = 2048] = "InvalidConcatenatedColorMatrix";
+      a[a.UpOnAddedOrRemoved = a.InvalidBounds | a.Dirty] = "UpOnAddedOrRemoved";
+      a[a.UpOnMoved = a.InvalidBounds | a.Dirty] = "UpOnMoved";
+      a[a.DownOnAddedOrRemoved = a.InvalidConcatenatedMatrix | a.InvalidInvertedConcatenatedMatrix | a.InvalidConcatenatedColorMatrix] = "DownOnAddedOrRemoved";
+      a[a.DownOnMoved = a.InvalidConcatenatedMatrix | a.InvalidInvertedConcatenatedMatrix | a.InvalidConcatenatedColorMatrix] = "DownOnMoved";
+      a[a.UpOnColorMatrixChanged = a.Dirty] = "UpOnColorMatrixChanged";
+      a[a.DownOnColorMatrixChanged = a.InvalidConcatenatedColorMatrix] = "DownOnColorMatrixChanged";
+      a[a.Visible = 65536] = "Visible";
+      a[a.UpOnInvalidate = a.InvalidBounds | a.Dirty] = "UpOnInvalidate";
+      a[a.Default = a.BoundsAutoCompute | a.InvalidBounds | a.InvalidConcatenatedMatrix | a.InvalidInvertedConcatenatedMatrix | a.Visible] = "Default";
+      a[a.CacheAsBitmap = 131072] = "CacheAsBitmap";
+      a[a.PixelSnapping = 262144] = "PixelSnapping";
+      a[a.ImageSmoothing = 524288] = "ImageSmoothing";
+      a[a.Dynamic = 1048576] = "Dynamic";
+      a[a.Scalable = 2097152] = "Scalable";
+      a[a.Tileable = 4194304] = "Tileable";
+      a[a.Transparent = 32768] = "Transparent";
+    })(p.NodeFlags || (p.NodeFlags = {}));
+    var a = p.NodeFlags;
+    (function(a) {
+      a[a.Node = 1] = "Node";
+      a[a.Shape = 3] = "Shape";
+      a[a.Group = 5] = "Group";
+      a[a.Stage = 13] = "Stage";
+      a[a.Renderable = 33] = "Renderable";
+    })(p.NodeType || (p.NodeType = {}));
+    var d = p.NodeType;
+    (function(a) {
+      a[a.None = 0] = "None";
+      a[a.OnStageBoundsChanged = 1] = "OnStageBoundsChanged";
+      a[a.RemovedFromStage = 2] = "RemovedFromStage";
+    })(p.NodeEventType || (p.NodeEventType = {}));
+    var n = function() {
+      function a() {
       }
-      b.prototype.visitNode = function(b, a) {
+      a.prototype.visitNode = function(a, b) {
       };
-      b.prototype.visitShape = function(b, a) {
-        this.visitNode(b, a);
+      a.prototype.visitShape = function(a, b) {
+        this.visitNode(a, b);
       };
-      b.prototype.visitGroup = function(b, a) {
-        this.visitNode(b, a);
-        for (var c = b.getChildren(), d = 0;d < c.length;d++) {
-          c[d].visit(this, a);
+      a.prototype.visitGroup = function(a, b) {
+        this.visitNode(a, b);
+        for (var c = a.getChildren(), d = 0;d < c.length;d++) {
+          c[d].visit(this, b);
         }
       };
-      b.prototype.visitStage = function(b, a) {
-        this.visitGroup(b, a);
+      a.prototype.visitStage = function(a, b) {
+        this.visitGroup(a, b);
       };
-      b.prototype.visitRenderable = function(b, a) {
-        this.visitNode(b, a);
+      a.prototype.visitRenderable = function(a, b) {
+        this.visitNode(a, b);
       };
-      return b;
+      return a;
     }();
-    r.NodeVisitor = p;
-    var k = function() {
+    p.NodeVisitor = n;
+    var f = function() {
       return function() {
       };
     }();
-    r.State = k;
-    var u = function(b) {
-      function a() {
-        b.call(this);
-        this.matrix = c.createIdentity();
+    p.State = f;
+    var v = function(a) {
+      function e() {
+        a.call(this);
+        this.matrix = b.createIdentity();
+        this.depth = 0;
       }
-      __extends(a, b);
-      a.prototype.transform = function(b) {
-        var a = this.clone();
-        a.matrix.preMultiply(b.getMatrix());
-        return a;
-      };
-      a.allocate = function() {
-        var b = a._dirtyStack, c = null;
-        b.length && (c = b.pop());
-        return c;
+      __extends(e, a);
+      e.prototype.transform = function(a) {
+        var e = this.clone();
+        e.matrix.preMultiply(a.getMatrix());
+        return e;
       };
-      a.prototype.clone = function() {
-        var b = a.allocate();
-        b || (b = new a);
-        b.set(this);
+      e.allocate = function() {
+        var a = e._dirtyStack, b = null;
+        a.length && (b = a.pop());
         return b;
       };
-      a.prototype.set = function(b) {
-        this.matrix.set(b.matrix);
+      e.prototype.clone = function() {
+        var a = e.allocate();
+        a || (a = new e);
+        a.set(this);
+        return a;
+      };
+      e.prototype.set = function(a) {
+        this.matrix.set(a.matrix);
       };
-      a.prototype.free = function() {
-        a._dirtyStack.push(this);
+      e.prototype.free = function() {
+        e._dirtyStack.push(this);
       };
-      a._dirtyStack = [];
-      return a;
-    }(k);
-    r.MatrixState = u;
-    var n = function(b) {
-      function a() {
-        b.apply(this, arguments);
+      e._dirtyStack = [];
+      return e;
+    }(f);
+    p.PreRenderState = v;
+    var m = function(a) {
+      function e() {
+        a.apply(this, arguments);
         this.isDirty = !0;
       }
-      __extends(a, b);
-      a.prototype.start = function(b, a) {
-        this._dirtyRegion = a;
-        var c = new u;
-        c.matrix.setIdentity();
-        b.visit(this, c);
-        c.free();
-      };
-      a.prototype.visitGroup = function(b, a) {
-        var c = b.getChildren();
-        this.visitNode(b, a);
-        for (var f = 0;f < c.length;f++) {
-          var d = c[f], e = a.transform(d.getTransform());
-          d.visit(this, e);
-          e.free();
-        }
-      };
-      a.prototype.visitNode = function(b, a) {
-        b.hasFlags(16) && (this.isDirty = !0);
-        b.toggleFlags(16, !1);
+      __extends(e, a);
+      e.prototype.start = function(a, e) {
+        this._dirtyRegion = e;
+        var b = new v;
+        b.matrix.setIdentity();
+        a.visit(this, b);
+        b.free();
+      };
+      e.prototype.visitGroup = function(a, e) {
+        var b = a.getChildren();
+        this.visitNode(a, e);
+        for (var c = 0;c < b.length;c++) {
+          var d = b[c], f = e.transform(d.getTransform());
+          d.visit(this, f);
+          f.free();
+        }
       };
-      return a;
-    }(p);
-    r.DirtyNodeVisitor = n;
-    k = function(b) {
-      function a(c) {
-        b.call(this);
-        this.writer = c;
+      e.prototype.visitNode = function(a, e) {
+        a.hasFlags(16) && (this.isDirty = !0);
+        a.toggleFlags(16, !1);
+        a.depth = e.depth++;
+      };
+      return e;
+    }(n);
+    p.PreRenderVisitor = m;
+    f = function(a) {
+      function e(e) {
+        a.call(this);
+        this.writer = e;
       }
-      __extends(a, b);
-      a.prototype.visitNode = function(b, a) {
+      __extends(e, a);
+      e.prototype.visitNode = function(a, e) {
       };
-      a.prototype.visitShape = function(b, a) {
-        this.writer.writeLn(b.toString());
-        this.visitNode(b, a);
-      };
-      a.prototype.visitGroup = function(b, a) {
-        this.visitNode(b, a);
-        var c = b.getChildren();
-        this.writer.enter(b.toString() + " " + c.length);
-        for (var f = 0;f < c.length;f++) {
-          c[f].visit(this, a);
+      e.prototype.visitShape = function(a, e) {
+        this.writer.writeLn(a.toString());
+        this.visitNode(a, e);
+      };
+      e.prototype.visitGroup = function(a, e) {
+        this.visitNode(a, e);
+        var b = a.getChildren();
+        this.writer.enter(a.toString() + " " + b.length);
+        for (var c = 0;c < b.length;c++) {
+          b[c].visit(this, e);
         }
         this.writer.outdent();
       };
-      a.prototype.visitStage = function(b, a) {
-        this.visitGroup(b, a);
+      e.prototype.visitStage = function(a, e) {
+        this.visitGroup(a, e);
       };
-      return a;
-    }(p);
-    r.TracingNodeVisitor = k;
-    var s = function() {
+      return e;
+    }(n);
+    p.TracingNodeVisitor = f;
+    var r = function() {
       function b() {
         this._clip = -1;
         this._eventListeners = null;
@@ -8623,17 +8635,26 @@
       Object.defineProperty(b.prototype, "id", {get:function() {
         return this._id;
       }, enumerable:!0, configurable:!0});
-      b.prototype._dispatchEvent = function(b) {
+      b.prototype._dispatchEvent = function(a) {
         if (this._eventListeners) {
-          for (var a = this._eventListeners, c = 0;c < a.length;c++) {
-            var d = a[c];
-            d.type === b && d.listener(this, b);
+          for (var b = this._eventListeners, c = 0;c < b.length;c++) {
+            var d = b[c];
+            d.type === a && d.listener(this, a);
           }
         }
       };
-      b.prototype.addEventListener = function(b, a) {
+      b.prototype.addEventListener = function(a, b) {
         this._eventListeners || (this._eventListeners = []);
-        this._eventListeners.push({type:b, listener:a});
+        this._eventListeners.push({type:a, listener:b});
+      };
+      b.prototype.removeEventListener = function(a, b) {
+        for (var c = this._eventListeners, d = 0;d < c.length;d++) {
+          var f = c[d];
+          if (f.type === a && f.listener === b) {
+            c.splice(d, 1);
+            break;
+          }
+        }
       };
       Object.defineProperty(b.prototype, "properties", {get:function() {
         return this._properties || (this._properties = {});
@@ -8641,31 +8662,32 @@
       b.prototype.reset = function() {
         this._flags = a.Default;
         this._properties = this._transform = this._layer = this._bounds = null;
+        this.depth = -1;
       };
       Object.defineProperty(b.prototype, "clip", {get:function() {
         return this._clip;
-      }, set:function(b) {
-        this._clip = b;
+      }, set:function(a) {
+        this._clip = a;
       }, enumerable:!0, configurable:!0});
       Object.defineProperty(b.prototype, "parent", {get:function() {
         return this._parent;
       }, enumerable:!0, configurable:!0});
-      b.prototype.getTransformedBounds = function(b) {
-        var a = this.getBounds(!0);
-        if (b !== this && !a.isEmpty()) {
+      b.prototype.getTransformedBounds = function(a) {
+        var b = this.getBounds(!0);
+        if (a !== this && !b.isEmpty()) {
           var c = this.getTransform().getConcatenatedMatrix();
-          b ? (b = b.getTransform().getInvertedConcatenatedMatrix(), b.preMultiply(c), b.transformRectangleAABB(a), b.free()) : c.transformRectangleAABB(a);
+          a ? (a = a.getTransform().getInvertedConcatenatedMatrix(), a.preMultiply(c), a.transformRectangleAABB(b), a.free()) : c.transformRectangleAABB(b);
         }
-        return a;
+        return b;
       };
       b.prototype._markCurrentBoundsAsDirtyRegion = function() {
       };
-      b.prototype.getStage = function(b) {
-        void 0 === b && (b = !0);
-        for (var a = this._parent;a;) {
-          if (a.isType(13)) {
-            var c = a;
-            if (b) {
+      b.prototype.getStage = function(a) {
+        void 0 === a && (a = !0);
+        for (var b = this._parent;b;) {
+          if (b.isType(13)) {
+            var c = b;
+            if (a) {
               if (c.dirtyRegion) {
                 return c;
               }
@@ -8673,79 +8695,79 @@
               return c;
             }
           }
-          a = a._parent;
+          b = b._parent;
         }
         return null;
       };
-      b.prototype.getChildren = function(b) {
+      b.prototype.getChildren = function(a) {
         throw void 0;
       };
-      b.prototype.getBounds = function(b) {
+      b.prototype.getBounds = function(a) {
         throw void 0;
       };
-      b.prototype.setBounds = function(b) {
-        (this._bounds || (this._bounds = g.createEmpty())).set(b);
+      b.prototype.setBounds = function(a) {
+        (this._bounds || (this._bounds = g.createEmpty())).set(a);
         this.removeFlags(256);
       };
       b.prototype.clone = function() {
         throw void 0;
       };
-      b.prototype.setFlags = function(b) {
-        this._flags |= b;
+      b.prototype.setFlags = function(a) {
+        this._flags |= a;
       };
-      b.prototype.hasFlags = function(b) {
-        return(this._flags & b) === b;
+      b.prototype.hasFlags = function(a) {
+        return(this._flags & a) === a;
       };
-      b.prototype.hasAnyFlags = function(b) {
-        return!!(this._flags & b);
+      b.prototype.hasAnyFlags = function(a) {
+        return!!(this._flags & a);
       };
-      b.prototype.removeFlags = function(b) {
-        this._flags &= ~b;
+      b.prototype.removeFlags = function(a) {
+        this._flags &= ~a;
       };
-      b.prototype.toggleFlags = function(b, a) {
-        this._flags = a ? this._flags | b : this._flags & ~b;
+      b.prototype.toggleFlags = function(a, b) {
+        this._flags = b ? this._flags | a : this._flags & ~a;
       };
-      b.prototype._propagateFlagsUp = function(b) {
-        if (0 !== b && !this.hasFlags(b)) {
-          this.hasFlags(2) || (b &= -257);
-          this.setFlags(b);
-          var a = this._parent;
-          a && a._propagateFlagsUp(b);
+      b.prototype._propagateFlagsUp = function(a) {
+        if (0 !== a && !this.hasFlags(a)) {
+          this.hasFlags(2) || (a &= -257);
+          this.setFlags(a);
+          var b = this._parent;
+          b && b._propagateFlagsUp(a);
         }
       };
-      b.prototype._propagateFlagsDown = function(b) {
+      b.prototype._propagateFlagsDown = function(a) {
         throw void 0;
       };
-      b.prototype.isAncestor = function(b) {
-        for (;b;) {
-          if (b === this) {
+      b.prototype.isAncestor = function(a) {
+        for (;a;) {
+          if (a === this) {
             return!0;
           }
-          b = b._parent;
+          a = a._parent;
         }
         return!1;
       };
-      b._getAncestors = function(a, c) {
-        var d = b._path;
-        for (d.length = 0;a && a !== c;) {
-          d.push(a), a = a._parent;
+      b._getAncestors = function(a, d) {
+        var f = b._path;
+        for (f.length = 0;a && a !== d;) {
+          f.push(a), a = a._parent;
         }
-        return d;
+        return f;
       };
       b.prototype._findClosestAncestor = function() {
-        for (var b = this;b;) {
-          if (!1 === b.hasFlags(512)) {
-            return b;
+        for (var a = this;a;) {
+          if (!1 === a.hasFlags(512)) {
+            return a;
           }
-          b = b._parent;
+          a = a._parent;
         }
         return null;
       };
-      b.prototype.isType = function(b) {
-        return this._type === b;
+      b.prototype.isType = function(a) {
+        return this._type === a;
       };
-      b.prototype.isTypeOf = function(b) {
-        return(this._type & b) === b;
+      b.prototype.isTypeOf = function(a) {
+        return(this._type & a) === a;
       };
       b.prototype.isLeaf = function() {
         return this.isType(33) || this.isType(3);
@@ -8755,82 +8777,82 @@
           return!0;
         }
         if (this.isType(5)) {
-          var b = this._children;
-          if (1 === b.length && b[0].isLinear()) {
+          var a = this._children;
+          if (1 === a.length && a[0].isLinear()) {
             return!0;
           }
         }
         return!1;
       };
       b.prototype.getTransformMatrix = function() {
-        var b;
-        void 0 === b && (b = !1);
-        return this.getTransform().getMatrix(b);
+        var a;
+        void 0 === a && (a = !1);
+        return this.getTransform().getMatrix(a);
       };
       b.prototype.getTransform = function() {
-        null === this._transform && (this._transform = new d(this));
+        null === this._transform && (this._transform = new t(this));
         return this._transform;
       };
       b.prototype.getLayer = function() {
-        null === this._layer && (this._layer = new e(this));
+        null === this._layer && (this._layer = new l(this));
         return this._layer;
       };
-      b.prototype.visit = function(b, a) {
+      b.prototype.visit = function(a, b) {
         switch(this._type) {
           case 1:
-            b.visitNode(this, a);
+            a.visitNode(this, b);
             break;
           case 5:
-            b.visitGroup(this, a);
+            a.visitGroup(this, b);
             break;
           case 13:
-            b.visitStage(this, a);
+            a.visitStage(this, b);
             break;
           case 3:
-            b.visitShape(this, a);
+            a.visitShape(this, b);
             break;
           case 33:
-            b.visitRenderable(this, a);
+            a.visitRenderable(this, b);
             break;
           default:
-            l.Debug.unexpectedCase();
+            k.Debug.unexpectedCase();
         }
       };
       b.prototype.invalidate = function() {
         this._propagateFlagsUp(a.UpOnInvalidate);
       };
-      b.prototype.toString = function(b) {
-        void 0 === b && (b = !1);
-        var a = h[this._type] + " " + this._id;
-        b && (a += " " + this._bounds.toString());
-        return a;
+      b.prototype.toString = function(a) {
+        void 0 === a && (a = !1);
+        var b = d[this._type] + " " + this._id;
+        a && (b += " " + this._bounds.toString());
+        return b;
       };
       b._path = [];
       b._nextId = 0;
       return b;
     }();
-    r.Node = s;
-    var v = function(b) {
-      function c() {
+    p.Node = r;
+    var w = function(b) {
+      function e() {
         b.call(this);
         this._type = 5;
         this._children = [];
       }
-      __extends(c, b);
-      c.prototype.getChildren = function(b) {
-        void 0 === b && (b = !1);
-        return b ? this._children.slice(0) : this._children;
+      __extends(e, b);
+      e.prototype.getChildren = function(a) {
+        void 0 === a && (a = !1);
+        return a ? this._children.slice(0) : this._children;
       };
-      c.prototype.childAt = function(b) {
-        return this._children[b];
+      e.prototype.childAt = function(a) {
+        return this._children[a];
       };
-      Object.defineProperty(c.prototype, "child", {get:function() {
+      Object.defineProperty(e.prototype, "child", {get:function() {
         return this._children[0];
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(c.prototype, "groupChild", {get:function() {
+      Object.defineProperty(e.prototype, "groupChild", {get:function() {
         return this._children[0];
       }, enumerable:!0, configurable:!0});
-      c.prototype.addChild = function(b) {
+      e.prototype.addChild = function(b) {
         b._parent && b._parent.removeChildAt(b._index);
         b._parent = this;
         b._index = this._children.length;
@@ -8838,158 +8860,158 @@
         this._propagateFlagsUp(a.UpOnAddedOrRemoved);
         b._propagateFlagsDown(a.DownOnAddedOrRemoved);
       };
-      c.prototype.removeChildAt = function(b) {
-        var c = this._children[b];
+      e.prototype.removeChildAt = function(b) {
+        var e = this._children[b];
         this._children.splice(b, 1);
-        c._index = -1;
-        c._parent = null;
+        e._index = -1;
+        e._parent = null;
         this._propagateFlagsUp(a.UpOnAddedOrRemoved);
-        c._propagateFlagsDown(a.DownOnAddedOrRemoved);
+        e._propagateFlagsDown(a.DownOnAddedOrRemoved);
       };
-      c.prototype.clearChildren = function() {
+      e.prototype.clearChildren = function() {
         for (var b = 0;b < this._children.length;b++) {
-          var c = this._children[b];
-          c && (c._index = -1, c._parent = null, c._propagateFlagsDown(a.DownOnAddedOrRemoved));
+          var e = this._children[b];
+          e && (e._index = -1, e._parent = null, e._propagateFlagsDown(a.DownOnAddedOrRemoved));
         }
         this._children.length = 0;
         this._propagateFlagsUp(a.UpOnAddedOrRemoved);
       };
-      c.prototype._propagateFlagsDown = function(b) {
-        if (!this.hasFlags(b)) {
-          this.setFlags(b);
-          for (var a = this._children, c = 0;c < a.length;c++) {
-            a[c]._propagateFlagsDown(b);
+      e.prototype._propagateFlagsDown = function(a) {
+        if (!this.hasFlags(a)) {
+          this.setFlags(a);
+          for (var b = this._children, e = 0;e < b.length;e++) {
+            b[e]._propagateFlagsDown(a);
           }
         }
       };
-      c.prototype.getBounds = function(b) {
-        void 0 === b && (b = !1);
-        var a = this._bounds || (this._bounds = g.createEmpty());
+      e.prototype.getBounds = function(a) {
+        void 0 === a && (a = !1);
+        var b = this._bounds || (this._bounds = g.createEmpty());
         if (this.hasFlags(256)) {
-          a.setEmpty();
-          for (var c = this._children, f = g.allocate(), d = 0;d < c.length;d++) {
-            var e = c[d];
-            f.set(e.getBounds());
-            e.getTransformMatrix().transformRectangleAABB(f);
-            a.union(f);
+          b.setEmpty();
+          for (var e = this._children, c = g.allocate(), d = 0;d < e.length;d++) {
+            var f = e[d];
+            c.set(f.getBounds());
+            f.getTransformMatrix().transformRectangleAABB(c);
+            b.union(c);
           }
-          f.free();
+          c.free();
           this.removeFlags(256);
         }
-        return b ? a.clone() : a;
+        return a ? b.clone() : b;
       };
-      return c;
-    }(s);
-    r.Group = v;
-    var d = function() {
-      function b(b) {
-        this._node = b;
-        this._matrix = c.createIdentity();
-        this._colorMatrix = r.ColorMatrix.createIdentity();
-        this._concatenatedMatrix = c.createIdentity();
-        this._invertedConcatenatedMatrix = c.createIdentity();
-        this._concatenatedColorMatrix = r.ColorMatrix.createIdentity();
+      return e;
+    }(r);
+    p.Group = w;
+    var t = function() {
+      function c(a) {
+        this._node = a;
+        this._matrix = b.createIdentity();
+        this._colorMatrix = p.ColorMatrix.createIdentity();
+        this._concatenatedMatrix = b.createIdentity();
+        this._invertedConcatenatedMatrix = b.createIdentity();
+        this._concatenatedColorMatrix = p.ColorMatrix.createIdentity();
       }
-      b.prototype.setMatrix = function(b) {
+      c.prototype.setMatrix = function(b) {
         this._matrix.isEqual(b) || (this._matrix.set(b), this._node._propagateFlagsUp(a.UpOnMoved), this._node._propagateFlagsDown(a.DownOnMoved));
       };
-      b.prototype.setColorMatrix = function(b) {
+      c.prototype.setColorMatrix = function(b) {
         this._colorMatrix.set(b);
         this._node._propagateFlagsUp(a.UpOnColorMatrixChanged);
         this._node._propagateFlagsDown(a.DownOnColorMatrixChanged);
       };
-      b.prototype.getMatrix = function(b) {
-        void 0 === b && (b = !1);
-        return b ? this._matrix.clone() : this._matrix;
+      c.prototype.getMatrix = function(a) {
+        void 0 === a && (a = !1);
+        return a ? this._matrix.clone() : this._matrix;
       };
-      b.prototype.hasColorMatrix = function() {
+      c.prototype.hasColorMatrix = function() {
         return null !== this._colorMatrix;
       };
-      b.prototype.getColorMatrix = function() {
-        var b;
-        void 0 === b && (b = !1);
-        null === this._colorMatrix && (this._colorMatrix = r.ColorMatrix.createIdentity());
-        return b ? this._colorMatrix.clone() : this._colorMatrix;
+      c.prototype.getColorMatrix = function() {
+        var a;
+        void 0 === a && (a = !1);
+        null === this._colorMatrix && (this._colorMatrix = p.ColorMatrix.createIdentity());
+        return a ? this._colorMatrix.clone() : this._colorMatrix;
       };
-      b.prototype.getConcatenatedMatrix = function(b) {
-        void 0 === b && (b = !1);
+      c.prototype.getConcatenatedMatrix = function(a) {
+        void 0 === a && (a = !1);
         if (this._node.hasFlags(512)) {
-          for (var a = this._node._findClosestAncestor(), d = s._getAncestors(this._node, a), e = a ? a.getTransform()._concatenatedMatrix.clone() : c.createIdentity(), h = d.length - 1;0 <= h;h--) {
-            var a = d[h], n = a.getTransform();
-            e.preMultiply(n._matrix);
-            n._concatenatedMatrix.set(e);
-            a.removeFlags(512);
+          for (var c = this._node._findClosestAncestor(), d = r._getAncestors(this._node, c), f = c ? c.getTransform()._concatenatedMatrix.clone() : b.createIdentity(), m = d.length - 1;0 <= m;m--) {
+            var c = d[m], g = c.getTransform();
+            f.preMultiply(g._matrix);
+            g._concatenatedMatrix.set(f);
+            c.removeFlags(512);
           }
         }
-        return b ? this._concatenatedMatrix.clone() : this._concatenatedMatrix;
-      };
-      b.prototype.getInvertedConcatenatedMatrix = function() {
-        var b = !0;
-        void 0 === b && (b = !1);
+        return a ? this._concatenatedMatrix.clone() : this._concatenatedMatrix;
+      };
+      c.prototype.getInvertedConcatenatedMatrix = function() {
+        var a = !0;
+        void 0 === a && (a = !1);
         this._node.hasFlags(1024) && (this.getConcatenatedMatrix().inverse(this._invertedConcatenatedMatrix), this._node.removeFlags(1024));
-        return b ? this._invertedConcatenatedMatrix.clone() : this._invertedConcatenatedMatrix;
+        return a ? this._invertedConcatenatedMatrix.clone() : this._invertedConcatenatedMatrix;
       };
-      b.prototype.toString = function() {
+      c.prototype.toString = function() {
         return this._matrix.toString();
       };
-      return b;
+      return c;
     }();
-    r.Transform = d;
-    var e = function() {
-      function b(b) {
+    p.Transform = t;
+    var l = function() {
+      function a(b) {
         this._node = b;
         this._mask = null;
         this._blendMode = 1;
       }
-      Object.defineProperty(b.prototype, "filters", {get:function() {
+      Object.defineProperty(a.prototype, "filters", {get:function() {
         return this._filters;
-      }, set:function(b) {
-        this._filters = b;
+      }, set:function(a) {
+        this._filters = a;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(b.prototype, "blendMode", {get:function() {
+      Object.defineProperty(a.prototype, "blendMode", {get:function() {
         return this._blendMode;
-      }, set:function(b) {
-        this._blendMode = b;
+      }, set:function(a) {
+        this._blendMode = a;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(b.prototype, "mask", {get:function() {
+      Object.defineProperty(a.prototype, "mask", {get:function() {
         return this._mask;
-      }, set:function(b) {
-        this._mask && this._mask !== b && this._mask.removeFlags(4);
-        (this._mask = b) && this._mask.setFlags(4);
+      }, set:function(a) {
+        this._mask && this._mask !== a && this._mask.removeFlags(4);
+        (this._mask = a) && this._mask.setFlags(4);
       }, enumerable:!0, configurable:!0});
-      b.prototype.toString = function() {
-        return m[this._blendMode];
+      a.prototype.toString = function() {
+        return h[this._blendMode];
       };
-      return b;
+      return a;
     }();
-    r.Layer = e;
-    k = function(b) {
-      function a(c) {
-        b.call(this);
-        this._source = c;
+    p.Layer = l;
+    f = function(a) {
+      function b(e) {
+        a.call(this);
+        this._source = e;
         this._type = 3;
         this.ratio = 0;
       }
-      __extends(a, b);
-      a.prototype.getBounds = function(b) {
-        void 0 === b && (b = !1);
-        var a = this._bounds || (this._bounds = g.createEmpty());
-        this.hasFlags(256) && (a.set(this._source.getBounds()), this.removeFlags(256));
-        return b ? a.clone() : a;
+      __extends(b, a);
+      b.prototype.getBounds = function(a) {
+        void 0 === a && (a = !1);
+        var b = this._bounds || (this._bounds = g.createEmpty());
+        this.hasFlags(256) && (b.set(this._source.getBounds()), this.removeFlags(256));
+        return a ? b.clone() : b;
       };
-      Object.defineProperty(a.prototype, "source", {get:function() {
+      Object.defineProperty(b.prototype, "source", {get:function() {
         return this._source;
       }, enumerable:!0, configurable:!0});
-      a.prototype._propagateFlagsDown = function(b) {
-        this.setFlags(b);
+      b.prototype._propagateFlagsDown = function(a) {
+        this.setFlags(a);
       };
-      a.prototype.getChildren = function(b) {
+      b.prototype.getChildren = function(a) {
         return[this._source];
       };
-      return a;
-    }(s);
-    r.Shape = k;
-    r.RendererOptions = function() {
+      return b;
+    }(r);
+    p.Shape = f;
+    p.RendererOptions = function() {
       return function() {
         this.debug = !1;
         this.paintRenderable = !0;
@@ -8997,124 +9019,124 @@
         this.clear = !0;
       };
     }();
-    (function(b) {
-      b[b.Canvas2D = 0] = "Canvas2D";
-      b[b.WebGL = 1] = "WebGL";
-      b[b.Both = 2] = "Both";
-      b[b.DOM = 3] = "DOM";
-      b[b.SVG = 4] = "SVG";
-    })(r.Backend || (r.Backend = {}));
-    p = function(b) {
-      function a(c, f, d) {
-        b.call(this);
-        this._container = c;
-        this._stage = f;
-        this._options = d;
+    (function(a) {
+      a[a.Canvas2D = 0] = "Canvas2D";
+      a[a.WebGL = 1] = "WebGL";
+      a[a.Both = 2] = "Both";
+      a[a.DOM = 3] = "DOM";
+      a[a.SVG = 4] = "SVG";
+    })(p.Backend || (p.Backend = {}));
+    n = function(a) {
+      function b(e, d, f) {
+        a.call(this);
+        this._container = e;
+        this._stage = d;
+        this._options = f;
         this._viewport = g.createSquare();
         this._devicePixelRatio = 1;
       }
-      __extends(a, b);
-      Object.defineProperty(a.prototype, "viewport", {set:function(b) {
-        this._viewport.set(b);
+      __extends(b, a);
+      Object.defineProperty(b.prototype, "viewport", {set:function(a) {
+        this._viewport.set(a);
       }, enumerable:!0, configurable:!0});
-      a.prototype.render = function() {
+      b.prototype.render = function() {
         throw void 0;
       };
-      a.prototype.resize = function() {
+      b.prototype.resize = function() {
         throw void 0;
       };
-      a.prototype.screenShot = function(b, a) {
+      b.prototype.screenShot = function(a, b) {
         throw void 0;
       };
-      return a;
-    }(p);
-    r.Renderer = p;
-    p = function(b) {
-      function a(c, d, e) {
-        void 0 === e && (e = !1);
-        b.call(this);
-        this._dirtyVisitor = new n;
+      return b;
+    }(n);
+    p.Renderer = n;
+    n = function(a) {
+      function e(b, d, f) {
+        void 0 === f && (f = !1);
+        a.call(this);
+        this._preVisitor = new m;
         this._flags &= -3;
         this._type = 13;
-        this._scaleMode = a.DEFAULT_SCALE;
-        this._align = a.DEFAULT_ALIGN;
-        this._content = new v;
+        this._scaleMode = e.DEFAULT_SCALE;
+        this._align = e.DEFAULT_ALIGN;
+        this._content = new w;
         this._content._flags &= -3;
         this.addChild(this._content);
         this.setFlags(16);
-        this.setBounds(new g(0, 0, c, d));
-        e ? (this._dirtyRegion = new t(c, d), this._dirtyRegion.addDirtyRectangle(new g(0, 0, c, d))) : this._dirtyRegion = null;
+        this.setBounds(new g(0, 0, b, d));
+        f ? (this._dirtyRegion = new u(b, d), this._dirtyRegion.addDirtyRectangle(new g(0, 0, b, d))) : this._dirtyRegion = null;
         this._updateContentMatrix();
       }
-      __extends(a, b);
-      Object.defineProperty(a.prototype, "dirtyRegion", {get:function() {
+      __extends(e, a);
+      Object.defineProperty(e.prototype, "dirtyRegion", {get:function() {
         return this._dirtyRegion;
       }, enumerable:!0, configurable:!0});
-      a.prototype.setBounds = function(a) {
-        b.prototype.setBounds.call(this, a);
+      e.prototype.setBounds = function(b) {
+        a.prototype.setBounds.call(this, b);
         this._updateContentMatrix();
         this._dispatchEvent(1);
-        this._dirtyRegion && (this._dirtyRegion = new t(a.w, a.h), this._dirtyRegion.addDirtyRectangle(a));
+        this._dirtyRegion && (this._dirtyRegion = new u(b.w, b.h), this._dirtyRegion.addDirtyRectangle(b));
       };
-      Object.defineProperty(a.prototype, "content", {get:function() {
+      Object.defineProperty(e.prototype, "content", {get:function() {
         return this._content;
       }, enumerable:!0, configurable:!0});
-      a.prototype.readyToRender = function() {
-        this._dirtyVisitor.isDirty = !1;
-        this._dirtyVisitor.start(this, this._dirtyRegion);
-        return this._dirtyVisitor.isDirty ? !0 : !1;
+      e.prototype.readyToRender = function() {
+        this._preVisitor.isDirty = !1;
+        this._preVisitor.start(this, this._dirtyRegion);
+        return this._preVisitor.isDirty ? !0 : !1;
       };
-      Object.defineProperty(a.prototype, "align", {get:function() {
+      Object.defineProperty(e.prototype, "align", {get:function() {
         return this._align;
-      }, set:function(b) {
-        this._align = b;
+      }, set:function(a) {
+        this._align = a;
         this._updateContentMatrix();
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(a.prototype, "scaleMode", {get:function() {
+      Object.defineProperty(e.prototype, "scaleMode", {get:function() {
         return this._scaleMode;
-      }, set:function(b) {
-        this._scaleMode = b;
+      }, set:function(a) {
+        this._scaleMode = a;
         this._updateContentMatrix();
       }, enumerable:!0, configurable:!0});
-      a.prototype._updateContentMatrix = function() {
-        if (this._scaleMode === a.DEFAULT_SCALE && this._align === a.DEFAULT_ALIGN) {
-          this._content.getTransform().setMatrix(new c(1, 0, 0, 1, 0, 0));
+      e.prototype._updateContentMatrix = function() {
+        if (this._scaleMode === e.DEFAULT_SCALE && this._align === e.DEFAULT_ALIGN) {
+          this._content.getTransform().setMatrix(new b(1, 0, 0, 1, 0, 0));
         } else {
-          var b = this.getBounds(), d = this._content.getBounds(), e = b.w / d.w, h = b.h / d.h;
+          var a = this.getBounds(), c = this._content.getBounds(), d = a.w / c.w, f = a.h / c.h;
           switch(this._scaleMode) {
             case 2:
-              e = h = Math.max(e, h);
+              d = f = Math.max(d, f);
               break;
             case 4:
-              e = h = 1;
+              d = f = 1;
               break;
             case 1:
               break;
             default:
-              e = h = Math.min(e, h);
+              d = f = Math.min(d, f);
           }
-          var n;
-          n = this._align & 4 ? 0 : this._align & 8 ? b.w - d.w * e : (b.w - d.w * e) / 2;
-          b = this._align & 1 ? 0 : this._align & 2 ? b.h - d.h * h : (b.h - d.h * h) / 2;
-          this._content.getTransform().setMatrix(new c(e, 0, 0, h, n, b));
+          var m;
+          m = this._align & 4 ? 0 : this._align & 8 ? a.w - c.w * d : (a.w - c.w * d) / 2;
+          a = this._align & 1 ? 0 : this._align & 2 ? a.h - c.h * f : (a.h - c.h * f) / 2;
+          this._content.getTransform().setMatrix(new b(d, 0, 0, f, m, a));
         }
       };
-      a.DEFAULT_SCALE = 4;
-      a.DEFAULT_ALIGN = 5;
-      return a;
-    }(v);
-    r.Stage = p;
-  })(l.GFX || (l.GFX = {}));
-})(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
-    function g(a, b, c) {
-      return a + (b - a) * c;
+      e.DEFAULT_SCALE = 4;
+      e.DEFAULT_ALIGN = 5;
+      return e;
+    }(w);
+    p.Stage = n;
+  })(k.GFX || (k.GFX = {}));
+})(Shumway || (Shumway = {}));
+(function(k) {
+  (function(p) {
+    function g(a, b, e) {
+      return a + (b - a) * e;
     }
-    function c(a, b, c) {
-      return g(a >> 24 & 255, b >> 24 & 255, c) << 24 | g(a >> 16 & 255, b >> 16 & 255, c) << 16 | g(a >> 8 & 255, b >> 8 & 255, c) << 8 | g(a & 255, b & 255, c);
+    function b(a, b, e) {
+      return g(a >> 24 & 255, b >> 24 & 255, e) << 24 | g(a >> 16 & 255, b >> 16 & 255, e) << 16 | g(a >> 8 & 255, b >> 8 & 255, e) << 8 | g(a & 255, b & 255, e);
     }
-    var t = r.Geometry.Point, m = r.Geometry.Rectangle, a = r.Geometry.Matrix, h = l.ArrayUtilities.indexOf, p = function(a) {
+    var u = p.Geometry.Point, h = p.Geometry.Rectangle, a = p.Geometry.Matrix, d = k.ArrayUtilities.indexOf, n = function(a) {
       function b() {
         a.call(this);
         this._parents = [];
@@ -9124,104 +9146,122 @@
         this._type = 33;
       }
       __extends(b, a);
-      b.prototype.addParent = function(b) {
-        h(this._parents, b);
-        this._parents.push(b);
-      };
-      b.prototype.addRenderableParent = function(b) {
-        h(this._renderableParents, b);
-        this._renderableParents.push(b);
+      Object.defineProperty(b.prototype, "parents", {get:function() {
+        return this._parents;
+      }, enumerable:!0, configurable:!0});
+      b.prototype.addParent = function(a) {
+        d(this._parents, a);
+        this._parents.push(a);
+      };
+      b.prototype.willRender = function() {
+        for (var a = this._parents, b = 0;b < a.length;b++) {
+          for (var c = a[b];c;) {
+            if (c.isType(13)) {
+              return!0;
+            }
+            if (!c.hasFlags(65536)) {
+              break;
+            }
+            c = c._parent;
+          }
+        }
+        return!1;
+      };
+      b.prototype.addRenderableParent = function(a) {
+        d(this._renderableParents, a);
+        this._renderableParents.push(a);
       };
       b.prototype.wrap = function() {
-        for (var b, a = this._parents, c = 0;c < a.length;c++) {
-          if (b = a[c], !b._parent) {
-            return b;
+        for (var a, b = this._parents, c = 0;c < b.length;c++) {
+          if (a = b[c], !a._parent) {
+            return a;
           }
         }
-        b = new r.Shape(this);
-        this.addParent(b);
-        return b;
+        a = new p.Shape(this);
+        this.addParent(a);
+        return a;
       };
       b.prototype.invalidate = function() {
         this.setFlags(16);
-        for (var b = this._parents, a = 0;a < b.length;a++) {
-          b[a].invalidate();
+        for (var a = this._parents, b = 0;b < a.length;b++) {
+          a[b].invalidate();
         }
-        b = this._renderableParents;
-        for (a = 0;a < b.length;a++) {
-          b[a].invalidate();
+        a = this._renderableParents;
+        for (b = 0;b < a.length;b++) {
+          a[b].invalidate();
         }
-        if (b = this._invalidateEventListeners) {
-          for (a = 0;a < b.length;a++) {
-            b[a](this);
+        if (a = this._invalidateEventListeners) {
+          for (b = 0;b < a.length;b++) {
+            a[b](this);
           }
         }
       };
-      b.prototype.addInvalidateEventListener = function(b) {
+      b.prototype.addInvalidateEventListener = function(a) {
         this._invalidateEventListeners || (this._invalidateEventListeners = []);
-        h(this._invalidateEventListeners, b);
-        this._invalidateEventListeners.push(b);
+        d(this._invalidateEventListeners, a);
+        this._invalidateEventListeners.push(a);
       };
-      b.prototype.getBounds = function(b) {
-        void 0 === b && (b = !1);
-        return b ? this._bounds.clone() : this._bounds;
+      b.prototype.getBounds = function(a) {
+        void 0 === a && (a = !1);
+        return a ? this._bounds.clone() : this._bounds;
       };
-      b.prototype.getChildren = function(b) {
+      b.prototype.getChildren = function(a) {
         return null;
       };
-      b.prototype._propagateFlagsUp = function(b) {
-        if (0 !== b && !this.hasFlags(b)) {
-          for (var a = 0;a < this._parents.length;a++) {
-            this._parents[a]._propagateFlagsUp(b);
+      b.prototype._propagateFlagsUp = function(a) {
+        if (0 !== a && !this.hasFlags(a)) {
+          for (var b = 0;b < this._parents.length;b++) {
+            this._parents[b]._propagateFlagsUp(a);
           }
         }
       };
-      b.prototype.render = function(b, a, c, d, e) {
+      b.prototype.render = function(a, b, c, d, f) {
       };
       return b;
-    }(r.Node);
-    r.Renderable = p;
-    var k = function(a) {
-      function b(b, c) {
+    }(p.Node);
+    p.Renderable = n;
+    var f = function(a) {
+      function b(e, c) {
         a.call(this);
-        this.setBounds(b);
+        this.setBounds(e);
         this.render = c;
       }
       __extends(b, a);
       return b;
-    }(p);
-    r.CustomRenderable = k;
+    }(n);
+    p.CustomRenderable = f;
     (function(a) {
       a[a.Idle = 1] = "Idle";
       a[a.Playing = 2] = "Playing";
       a[a.Paused = 3] = "Paused";
       a[a.Ended = 4] = "Ended";
-    })(r.RenderableVideoState || (r.RenderableVideoState = {}));
-    k = function(a) {
-      function b(c, d) {
+    })(p.RenderableVideoState || (p.RenderableVideoState = {}));
+    f = function(a) {
+      function b(e, d) {
         a.call(this);
         this._flags = 1048592;
         this._lastPausedTime = this._lastTimeInvalidated = 0;
         this._pauseHappening = this._seekHappening = !1;
         this._isDOMElement = !0;
-        this.setBounds(new m(0, 0, 1, 1));
-        this._assetId = c;
+        this.setBounds(new h(0, 0, 1, 1));
+        this._assetId = e;
         this._eventSerializer = d;
-        var h = document.createElement("video"), n = this._handleVideoEvent.bind(this);
-        h.preload = "metadata";
-        h.addEventListener("play", n);
-        h.addEventListener("pause", n);
-        h.addEventListener("ended", n);
-        h.addEventListener("loadeddata", n);
-        h.addEventListener("progress", n);
-        h.addEventListener("suspend", n);
-        h.addEventListener("loadedmetadata", n);
-        h.addEventListener("error", n);
-        h.addEventListener("seeking", n);
-        h.addEventListener("seeked", n);
-        h.addEventListener("canplay", n);
-        this._video = h;
-        this._videoEventHandler = n;
+        var f = document.createElement("video"), m = this._handleVideoEvent.bind(this);
+        f.preload = "metadata";
+        f.addEventListener("play", m);
+        f.addEventListener("pause", m);
+        f.addEventListener("ended", m);
+        f.addEventListener("loadeddata", m);
+        f.addEventListener("progress", m);
+        f.addEventListener("suspend", m);
+        f.addEventListener("loadedmetadata", m);
+        f.addEventListener("error", m);
+        f.addEventListener("seeking", m);
+        f.addEventListener("seeked", m);
+        f.addEventListener("canplay", m);
+        f.style.position = "absolute";
+        this._video = f;
+        this._videoEventHandler = m;
         b._renderableVideos.push(this);
         "undefined" !== typeof registerInspectorAsset && registerInspectorAsset(-1, -1, this);
         this._state = 1;
@@ -9234,99 +9274,103 @@
         return this._state;
       }, enumerable:!0, configurable:!0});
       b.prototype.play = function() {
-        this._video.play();
         this._state = 2;
+        this._video.play();
       };
       b.prototype.pause = function() {
-        this._video.pause();
         this._state = 3;
+        this._video.pause();
       };
-      b.prototype._handleVideoEvent = function(b) {
-        var a = null, c = this._video;
-        switch(b.type) {
+      b.prototype._handleVideoEvent = function(a) {
+        var b = null, c = this._video;
+        switch(a.type) {
           case "play":
             if (!this._pauseHappening) {
               return;
             }
-            b = 7;
+            a = 7;
             break;
           case "pause":
-            b = 6;
+            if (2 === this._state) {
+              c.play();
+              return;
+            }
+            a = 6;
             this._pauseHappening = !0;
             break;
           case "ended":
             this._state = 4;
-            this._notifyNetStream(3, a);
-            b = 4;
+            this._notifyNetStream(3, b);
+            a = 4;
             break;
           case "loadeddata":
             this._pauseHappening = !1;
-            this._notifyNetStream(2, a);
+            this._notifyNetStream(2, b);
             this.play();
             return;
           case "canplay":
             if (this._pauseHappening) {
               return;
             }
-            b = 5;
+            a = 5;
             break;
           case "progress":
-            b = 10;
+            a = 10;
             break;
           case "suspend":
             return;
           case "loadedmetadata":
-            b = 1;
-            a = {videoWidth:c.videoWidth, videoHeight:c.videoHeight, duration:c.duration};
+            a = 1;
+            b = {videoWidth:c.videoWidth, videoHeight:c.videoHeight, duration:c.duration};
             break;
           case "error":
-            b = 11;
-            a = {code:c.error.code};
+            a = 11;
+            b = {code:c.error.code};
             break;
           case "seeking":
             if (!this._seekHappening) {
               return;
             }
-            b = 8;
+            a = 8;
             break;
           case "seeked":
             if (!this._seekHappening) {
               return;
             }
-            b = 9;
+            a = 9;
             this._seekHappening = !1;
             break;
           default:
             return;
         }
-        this._notifyNetStream(b, a);
+        this._notifyNetStream(a, b);
       };
-      b.prototype._notifyNetStream = function(b, a) {
-        this._eventSerializer.sendVideoPlaybackEvent(this._assetId, b, a);
+      b.prototype._notifyNetStream = function(a, b) {
+        this._eventSerializer.sendVideoPlaybackEvent(this._assetId, a, b);
       };
-      b.prototype.processControlRequest = function(b, a) {
+      b.prototype.processControlRequest = function(a, b) {
         var c = this._video;
-        switch(b) {
+        switch(a) {
           case 1:
-            c.src = a.url;
-            1 < this._state && this.play();
+            c.src = b.url;
+            this.play();
             this._notifyNetStream(0, null);
             break;
           case 9:
             c.paused && c.play();
             break;
           case 2:
-            c && (a.paused && !c.paused ? (isNaN(a.time) ? this._lastPausedTime = c.currentTime : (0 !== c.seekable.length && (c.currentTime = a.time), this._lastPausedTime = a.time), this.pause()) : !a.paused && c.paused && (this.play(), isNaN(a.time) || this._lastPausedTime === a.time || 0 === c.seekable.length || (c.currentTime = a.time)));
+            c && (b.paused && !c.paused ? (isNaN(b.time) ? this._lastPausedTime = c.currentTime : (0 !== c.seekable.length && (c.currentTime = b.time), this._lastPausedTime = b.time), this.pause()) : !b.paused && c.paused && (this.play(), isNaN(b.time) || this._lastPausedTime === b.time || 0 === c.seekable.length || (c.currentTime = b.time)));
             break;
           case 3:
-            c && 0 !== c.seekable.length && (this._seekHappening = !0, c.currentTime = a.time);
+            c && 0 !== c.seekable.length && (this._seekHappening = !0, c.currentTime = b.time);
             break;
           case 4:
             return c ? c.currentTime : 0;
           case 5:
             return c ? c.duration : 0;
           case 6:
-            c && (c.volume = a.volume);
+            c && (c.volume = b.volume);
             break;
           case 7:
             if (!c) {
@@ -9334,8 +9378,8 @@
             }
             var d = -1;
             if (c.buffered) {
-              for (var e = 0;e < c.buffered.length;e++) {
-                d = Math.max(d, c.buffered.end(e));
+              for (var f = 0;f < c.buffered.length;f++) {
+                d = Math.max(d, c.buffered.end(f));
               }
             } else {
               d = c.duration;
@@ -9350,79 +9394,81 @@
         this._lastTimeInvalidated = this._video.currentTime;
       };
       b.checkForVideoUpdates = function() {
-        for (var a = b._renderableVideos, c = 0;c < a.length;c++) {
-          a[c].checkForUpdate();
+        for (var a = b._renderableVideos, d = 0;d < a.length;d++) {
+          var f = a[d];
+          f.willRender() ? (f._video.parentElement || f.invalidate(), f._video.style.zIndex = f.parents[0].depth + "") : f._video.parentElement && f._dispatchEvent(2);
+          a[d].checkForUpdate();
         }
       };
-      b.prototype.render = function(b, a, c) {
-        (a = this._video) && 0 < a.videoWidth && b.drawImage(a, 0, 0, a.videoWidth, a.videoHeight, 0, 0, this._bounds.w, this._bounds.h);
+      b.prototype.render = function(a, b, c) {
+        (b = this._video) && 0 < b.videoWidth && a.drawImage(b, 0, 0, b.videoWidth, b.videoHeight, 0, 0, this._bounds.w, this._bounds.h);
       };
       b._renderableVideos = [];
       return b;
-    }(p);
-    r.RenderableVideo = k;
-    k = function(a) {
-      function b(b, c) {
+    }(n);
+    p.RenderableVideo = f;
+    f = function(a) {
+      function b(e, c) {
         a.call(this);
         this._flags = 1048592;
         this.properties = {};
         this.setBounds(c);
-        b instanceof HTMLCanvasElement ? this._initializeSourceCanvas(b) : this._sourceImage = b;
+        e instanceof HTMLCanvasElement ? this._initializeSourceCanvas(e) : this._sourceImage = e;
       }
       __extends(b, a);
-      b.FromDataBuffer = function(a, c, d) {
-        var e = document.createElement("canvas");
-        e.width = d.w;
-        e.height = d.h;
-        d = new b(e, d);
-        d.updateFromDataBuffer(a, c);
-        return d;
+      b.FromDataBuffer = function(a, d, f) {
+        var m = document.createElement("canvas");
+        m.width = f.w;
+        m.height = f.h;
+        f = new b(m, f);
+        f.updateFromDataBuffer(a, d);
+        return f;
       };
-      b.FromNode = function(a, c, d, e, h) {
-        var n = document.createElement("canvas"), g = a.getBounds();
-        n.width = g.w;
-        n.height = g.h;
-        n = new b(n, g);
-        n.drawNode(a, c, d, e, h);
-        return n;
+      b.FromNode = function(a, d, f, m, g) {
+        var h = document.createElement("canvas"), n = a.getBounds();
+        h.width = n.w;
+        h.height = n.h;
+        h = new b(h, n);
+        h.drawNode(a, d, f, m, g);
+        return h;
       };
       b.FromImage = function(a) {
-        return new b(a, new m(0, 0, -1, -1));
+        return new b(a, new h(0, 0, -1, -1));
       };
-      b.prototype.updateFromDataBuffer = function(b, a) {
-        if (r.imageUpdateOption.value) {
-          var c = a.buffer;
-          if (4 !== b && 5 !== b && 6 !== b) {
-            var d = this._bounds, e = this._imageData;
-            e && e.width === d.w && e.height === d.h || (e = this._imageData = this._context.createImageData(d.w, d.h));
-            r.imageConvertOption.value && (c = new Int32Array(c), d = new Int32Array(e.data.buffer), l.ColorUtilities.convertImage(b, 3, c, d));
+      b.prototype.updateFromDataBuffer = function(a, b) {
+        if (p.imageUpdateOption.value) {
+          var c = b.buffer;
+          if (4 !== a && 5 !== a && 6 !== a) {
+            var d = this._bounds, f = this._imageData;
+            f && f.width === d.w && f.height === d.h || (f = this._imageData = this._context.createImageData(d.w, d.h));
+            p.imageConvertOption.value && (c = new Int32Array(c), d = new Int32Array(f.data.buffer), k.ColorUtilities.convertImage(a, 3, c, d));
             this._ensureSourceCanvas();
-            this._context.putImageData(e, 0, 0);
+            this._context.putImageData(f, 0, 0);
           }
           this.invalidate();
         }
       };
-      b.prototype.readImageData = function(b) {
-        b.writeRawBytes(this.imageData.data);
+      b.prototype.readImageData = function(a) {
+        a.writeRawBytes(this.imageData.data);
       };
-      b.prototype.render = function(b, a, c) {
-        this.renderSource ? b.drawImage(this.renderSource, 0, 0) : this._renderFallback(b);
+      b.prototype.render = function(a, b, c) {
+        this.renderSource ? a.drawImage(this.renderSource, 0, 0) : this._renderFallback(a);
       };
-      b.prototype.drawNode = function(b, a, c, d, e) {
-        c = r.Canvas2D;
+      b.prototype.drawNode = function(a, b, c, d, f) {
+        c = p.Canvas2D;
         d = this.getBounds();
-        (new c.Canvas2DRenderer(this._canvas, null)).renderNode(b, e || d, a);
+        (new c.Canvas2DRenderer(this._canvas, null)).renderNode(a, f || d, b);
       };
-      b.prototype._initializeSourceCanvas = function(b) {
-        this._canvas = b;
+      b.prototype._initializeSourceCanvas = function(a) {
+        this._canvas = a;
         this._context = this._canvas.getContext("2d");
       };
       b.prototype._ensureSourceCanvas = function() {
         if (!this._canvas) {
-          var b = document.createElement("canvas"), a = this._bounds;
-          b.width = a.w;
-          b.height = a.h;
-          this._initializeSourceCanvas(b);
+          var a = document.createElement("canvas"), b = this._bounds;
+          a.width = b.w;
+          a.height = b.h;
+          this._initializeSourceCanvas(a);
         }
       };
       Object.defineProperty(b.prototype, "imageData", {get:function() {
@@ -9432,392 +9478,392 @@
       Object.defineProperty(b.prototype, "renderSource", {get:function() {
         return this._canvas || this._sourceImage;
       }, enumerable:!0, configurable:!0});
-      b.prototype._renderFallback = function(b) {
+      b.prototype._renderFallback = function(a) {
       };
       return b;
-    }(p);
-    r.RenderableBitmap = k;
+    }(n);
+    p.RenderableBitmap = f;
     (function(a) {
       a[a.Fill = 0] = "Fill";
       a[a.Stroke = 1] = "Stroke";
       a[a.StrokeFill = 2] = "StrokeFill";
-    })(r.PathType || (r.PathType = {}));
-    var u = function() {
-      return function(a, b, c, d) {
+    })(p.PathType || (p.PathType = {}));
+    var v = function() {
+      return function(a, b, e, d) {
         this.type = a;
         this.style = b;
-        this.smoothImage = c;
+        this.smoothImage = e;
         this.strokeProperties = d;
         this.path = new Path2D;
       };
     }();
-    r.StyledPath = u;
-    var n = function() {
-      return function(a, b, c, d, h) {
+    p.StyledPath = v;
+    var m = function() {
+      return function(a, b, e, d, f) {
         this.thickness = a;
         this.scaleMode = b;
-        this.capsStyle = c;
+        this.capsStyle = e;
         this.jointsStyle = d;
-        this.miterLimit = h;
+        this.miterLimit = f;
       };
     }();
-    r.StrokeProperties = n;
-    var s = function(c) {
-      function b(b, a, d, h) {
-        c.call(this);
+    p.StrokeProperties = m;
+    var r = function(b) {
+      function c(a, c, d, f) {
+        b.call(this);
         this._flags = 6291472;
         this.properties = {};
-        this.setBounds(h);
-        this._id = b;
-        this._pathData = a;
+        this.setBounds(f);
+        this._id = a;
+        this._pathData = c;
         this._textures = d;
         d.length && this.setFlags(1048576);
       }
-      __extends(b, c);
-      b.prototype.update = function(b, a, c) {
+      __extends(c, b);
+      c.prototype.update = function(a, b, c) {
         this.setBounds(c);
-        this._pathData = b;
+        this._pathData = a;
         this._paths = null;
-        this._textures = a;
+        this._textures = b;
         this.setFlags(1048576);
         this.invalidate();
       };
-      b.prototype.render = function(b, a, c, d, e) {
+      c.prototype.render = function(a, b, c, d, f) {
         void 0 === d && (d = !1);
-        void 0 === e && (e = !1);
-        b.fillStyle = b.strokeStyle = "transparent";
-        a = this._deserializePaths(this._pathData, b, a);
-        for (c = 0;c < a.length;c++) {
-          var h = a[c];
-          b.mozImageSmoothingEnabled = b.msImageSmoothingEnabled = b.imageSmoothingEnabled = h.smoothImage;
-          if (0 === h.type) {
-            d ? b.clip(h.path, "evenodd") : (b.fillStyle = e ? "#000000" : h.style, b.fill(h.path, "evenodd"), b.fillStyle = "transparent");
+        void 0 === f && (f = !1);
+        a.fillStyle = a.strokeStyle = "transparent";
+        b = this._deserializePaths(this._pathData, a, b);
+        for (c = 0;c < b.length;c++) {
+          var m = b[c];
+          a.mozImageSmoothingEnabled = a.msImageSmoothingEnabled = a.imageSmoothingEnabled = m.smoothImage;
+          if (0 === m.type) {
+            d ? a.clip(m.path, "evenodd") : (a.fillStyle = f ? "#000000" : m.style, a.fill(m.path, "evenodd"), a.fillStyle = "transparent");
           } else {
-            if (!d && !e) {
-              b.strokeStyle = h.style;
-              var n = 1;
-              h.strokeProperties && (n = h.strokeProperties.scaleMode, b.lineWidth = h.strokeProperties.thickness, b.lineCap = h.strokeProperties.capsStyle, b.lineJoin = h.strokeProperties.jointsStyle, b.miterLimit = h.strokeProperties.miterLimit);
-              var g = b.lineWidth;
-              (g = 1 === g || 3 === g) && b.translate(.5, .5);
-              b.flashStroke(h.path, n);
-              g && b.translate(-.5, -.5);
-              b.strokeStyle = "transparent";
+            if (!d && !f) {
+              a.strokeStyle = m.style;
+              var g = 1;
+              m.strokeProperties && (g = m.strokeProperties.scaleMode, a.lineWidth = m.strokeProperties.thickness, a.lineCap = m.strokeProperties.capsStyle, a.lineJoin = m.strokeProperties.jointsStyle, a.miterLimit = m.strokeProperties.miterLimit);
+              var h = a.lineWidth;
+              (h = 1 === h || 3 === h) && a.translate(.5, .5);
+              a.flashStroke(m.path, g);
+              h && a.translate(-.5, -.5);
+              a.strokeStyle = "transparent";
             }
           }
         }
       };
-      b.prototype._deserializePaths = function(a, c, d) {
+      c.prototype._deserializePaths = function(a, b, d) {
         if (this._paths) {
           return this._paths;
         }
         d = this._paths = [];
-        var e = null, h = null, g = 0, k = 0, p, m, s = !1, u = 0, r = 0, v = a.commands, t = a.coordinates, C = a.styles, y = C.position = 0;
+        var f = null, g = null, h = 0, n = 0, l, r, v = !1, p = 0, w = 0, t = a.commands, u = a.coordinates, D = a.styles, z = D.position = 0;
         a = a.commandsPosition;
-        for (var z = 0;z < a;z++) {
-          switch(v[z]) {
+        for (var A = 0;A < a;A++) {
+          switch(t[A]) {
             case 9:
-              s && e && (e.lineTo(u, r), h && h.lineTo(u, r));
-              s = !0;
-              g = u = t[y++] / 20;
-              k = r = t[y++] / 20;
-              e && e.moveTo(g, k);
-              h && h.moveTo(g, k);
+              v && f && (f.lineTo(p, w), g && g.lineTo(p, w));
+              v = !0;
+              h = p = u[z++] / 20;
+              n = w = u[z++] / 20;
+              f && f.moveTo(h, n);
+              g && g.moveTo(h, n);
               break;
             case 10:
-              g = t[y++] / 20;
-              k = t[y++] / 20;
-              e && e.lineTo(g, k);
-              h && h.lineTo(g, k);
+              h = u[z++] / 20;
+              n = u[z++] / 20;
+              f && f.lineTo(h, n);
+              g && g.lineTo(h, n);
               break;
             case 11:
-              p = t[y++] / 20;
-              m = t[y++] / 20;
-              g = t[y++] / 20;
-              k = t[y++] / 20;
-              e && e.quadraticCurveTo(p, m, g, k);
-              h && h.quadraticCurveTo(p, m, g, k);
+              l = u[z++] / 20;
+              r = u[z++] / 20;
+              h = u[z++] / 20;
+              n = u[z++] / 20;
+              f && f.quadraticCurveTo(l, r, h, n);
+              g && g.quadraticCurveTo(l, r, h, n);
               break;
             case 12:
-              p = t[y++] / 20;
-              m = t[y++] / 20;
-              var B = t[y++] / 20, x = t[y++] / 20, g = t[y++] / 20, k = t[y++] / 20;
-              e && e.bezierCurveTo(p, m, B, x, g, k);
-              h && h.bezierCurveTo(p, m, B, x, g, k);
+              l = u[z++] / 20;
+              r = u[z++] / 20;
+              var C = u[z++] / 20, x = u[z++] / 20, h = u[z++] / 20, n = u[z++] / 20;
+              f && f.bezierCurveTo(l, r, C, x, h, n);
+              g && g.bezierCurveTo(l, r, C, x, h, n);
               break;
             case 1:
-              e = this._createPath(0, l.ColorUtilities.rgbaToCSSStyle(C.readUnsignedInt()), !1, null, g, k);
+              f = this._createPath(0, k.ColorUtilities.rgbaToCSSStyle(D.readUnsignedInt()), !1, null, h, n);
               break;
             case 3:
-              p = this._readBitmap(C, c);
-              e = this._createPath(0, p.style, p.smoothImage, null, g, k);
+              l = this._readBitmap(D, b);
+              f = this._createPath(0, l.style, l.smoothImage, null, h, n);
               break;
             case 2:
-              e = this._createPath(0, this._readGradient(C, c), !1, null, g, k);
+              f = this._createPath(0, this._readGradient(D, b), !1, null, h, n);
               break;
             case 4:
-              e = null;
+              f = null;
               break;
             case 5:
-              h = l.ColorUtilities.rgbaToCSSStyle(C.readUnsignedInt());
-              C.position += 1;
-              p = C.readByte();
-              m = b.LINE_CAPS_STYLES[C.readByte()];
-              B = b.LINE_JOINTS_STYLES[C.readByte()];
-              p = new n(t[y++] / 20, p, m, B, C.readByte());
-              h = this._createPath(1, h, !1, p, g, k);
+              g = k.ColorUtilities.rgbaToCSSStyle(D.readUnsignedInt());
+              D.position += 1;
+              l = D.readByte();
+              r = c.LINE_CAPS_STYLES[D.readByte()];
+              C = c.LINE_JOINTS_STYLES[D.readByte()];
+              l = new m(u[z++] / 20, l, r, C, D.readByte());
+              g = this._createPath(1, g, !1, l, h, n);
               break;
             case 6:
-              h = this._createPath(2, this._readGradient(C, c), !1, null, g, k);
+              g = this._createPath(2, this._readGradient(D, b), !1, null, h, n);
               break;
             case 7:
-              p = this._readBitmap(C, c);
-              h = this._createPath(2, p.style, p.smoothImage, null, g, k);
+              l = this._readBitmap(D, b);
+              g = this._createPath(2, l.style, l.smoothImage, null, h, n);
               break;
             case 8:
-              h = null;
+              g = null;
           }
         }
-        s && e && (e.lineTo(u, r), h && h.lineTo(u, r));
+        v && f && (f.lineTo(p, w), g && g.lineTo(p, w));
         this._pathData = null;
         return d;
       };
-      b.prototype._createPath = function(b, a, c, d, e, h) {
-        b = new u(b, a, c, d);
-        this._paths.push(b);
-        b.path.moveTo(e, h);
-        return b.path;
+      c.prototype._createPath = function(a, b, c, d, f, m) {
+        a = new v(a, b, c, d);
+        this._paths.push(a);
+        a.path.moveTo(f, m);
+        return a.path;
       };
-      b.prototype._readMatrix = function(b) {
+      c.prototype._readMatrix = function(b) {
         return new a(b.readFloat(), b.readFloat(), b.readFloat(), b.readFloat(), b.readFloat(), b.readFloat());
       };
-      b.prototype._readGradient = function(b, a) {
-        var c = b.readUnsignedByte(), d = 2 * b.readShort() / 255, e = this._readMatrix(b), c = 16 === c ? a.createLinearGradient(-1, 0, 1, 0) : a.createRadialGradient(d, 0, 0, 0, 0, 1);
-        c.setTransform && c.setTransform(e.toSVGMatrix());
-        e = b.readUnsignedByte();
-        for (d = 0;d < e;d++) {
-          var h = b.readUnsignedByte() / 255, n = l.ColorUtilities.rgbaToCSSStyle(b.readUnsignedInt());
-          c.addColorStop(h, n);
+      c.prototype._readGradient = function(a, b) {
+        var c = a.readUnsignedByte(), d = 2 * a.readShort() / 255, f = this._readMatrix(a), c = 16 === c ? b.createLinearGradient(-1, 0, 1, 0) : b.createRadialGradient(d, 0, 0, 0, 0, 1);
+        c.setTransform && c.setTransform(f.toSVGMatrix());
+        f = a.readUnsignedByte();
+        for (d = 0;d < f;d++) {
+          var m = a.readUnsignedByte() / 255, g = k.ColorUtilities.rgbaToCSSStyle(a.readUnsignedInt());
+          c.addColorStop(m, g);
         }
-        b.position += 2;
+        a.position += 2;
         return c;
       };
-      b.prototype._readBitmap = function(b, a) {
-        var c = b.readUnsignedInt(), d = this._readMatrix(b), e = b.readBoolean() ? "repeat" : "no-repeat", h = b.readBoolean();
-        (c = this._textures[c]) ? (e = a.createPattern(c.renderSource, e), e.setTransform(d.toSVGMatrix())) : e = null;
-        return{style:e, smoothImage:h};
-      };
-      b.prototype._renderFallback = function(b) {
-        this.fillStyle || (this.fillStyle = l.ColorStyle.randomStyle());
-        var a = this._bounds;
-        b.save();
-        b.beginPath();
-        b.lineWidth = 2;
-        b.fillStyle = this.fillStyle;
-        b.fillRect(a.x, a.y, a.w, a.h);
-        b.restore();
+      c.prototype._readBitmap = function(a, b) {
+        var c = a.readUnsignedInt(), d = this._readMatrix(a), f = a.readBoolean() ? "repeat" : "no-repeat", m = a.readBoolean();
+        (c = this._textures[c]) ? (f = b.createPattern(c.renderSource, f), f.setTransform(d.toSVGMatrix())) : f = null;
+        return{style:f, smoothImage:m};
+      };
+      c.prototype._renderFallback = function(a) {
+        this.fillStyle || (this.fillStyle = k.ColorStyle.randomStyle());
+        var b = this._bounds;
+        a.save();
+        a.beginPath();
+        a.lineWidth = 2;
+        a.fillStyle = this.fillStyle;
+        a.fillRect(b.x, b.y, b.w, b.h);
+        a.restore();
       };
-      b.LINE_CAPS_STYLES = ["round", "butt", "square"];
-      b.LINE_JOINTS_STYLES = ["round", "bevel", "miter"];
-      return b;
-    }(p);
-    r.RenderableShape = s;
-    k = function(d) {
-      function b() {
+      c.LINE_CAPS_STYLES = ["round", "butt", "square"];
+      c.LINE_JOINTS_STYLES = ["round", "bevel", "miter"];
+      return c;
+    }(n);
+    p.RenderableShape = r;
+    f = function(d) {
+      function c() {
         d.apply(this, arguments);
         this._flags = 7340048;
         this._morphPaths = Object.create(null);
       }
-      __extends(b, d);
-      b.prototype._deserializePaths = function(b, a, d) {
+      __extends(c, d);
+      c.prototype._deserializePaths = function(a, c, d) {
         if (this._morphPaths[d]) {
           return this._morphPaths[d];
         }
-        var e = this._morphPaths[d] = [], h = null, k = null, p = 0, m = 0, u, r, v = !1, t = 0, P = 0, H = b.commands, C = b.coordinates, y = b.morphCoordinates, z = b.styles, B = b.morphStyles;
-        z.position = 0;
-        var x = B.position = 0;
-        b = b.commandsPosition;
-        for (var E = 0;E < b;E++) {
-          switch(H[E]) {
+        var f = this._morphPaths[d] = [], h = null, n = null, l = 0, v = 0, p, w, t = !1, u = 0, Q = 0, H = a.commands, D = a.coordinates, z = a.morphCoordinates, A = a.styles, C = a.morphStyles;
+        A.position = 0;
+        var x = C.position = 0;
+        a = a.commandsPosition;
+        for (var F = 0;F < a;F++) {
+          switch(H[F]) {
             case 9:
-              v && h && (h.lineTo(t, P), k && k.lineTo(t, P));
-              v = !0;
-              p = t = g(C[x], y[x++], d) / 20;
-              m = P = g(C[x], y[x++], d) / 20;
-              h && h.moveTo(p, m);
-              k && k.moveTo(p, m);
+              t && h && (h.lineTo(u, Q), n && n.lineTo(u, Q));
+              t = !0;
+              l = u = g(D[x], z[x++], d) / 20;
+              v = Q = g(D[x], z[x++], d) / 20;
+              h && h.moveTo(l, v);
+              n && n.moveTo(l, v);
               break;
             case 10:
-              p = g(C[x], y[x++], d) / 20;
-              m = g(C[x], y[x++], d) / 20;
-              h && h.lineTo(p, m);
-              k && k.lineTo(p, m);
+              l = g(D[x], z[x++], d) / 20;
+              v = g(D[x], z[x++], d) / 20;
+              h && h.lineTo(l, v);
+              n && n.lineTo(l, v);
               break;
             case 11:
-              u = g(C[x], y[x++], d) / 20;
-              r = g(C[x], y[x++], d) / 20;
-              p = g(C[x], y[x++], d) / 20;
-              m = g(C[x], y[x++], d) / 20;
-              h && h.quadraticCurveTo(u, r, p, m);
-              k && k.quadraticCurveTo(u, r, p, m);
+              p = g(D[x], z[x++], d) / 20;
+              w = g(D[x], z[x++], d) / 20;
+              l = g(D[x], z[x++], d) / 20;
+              v = g(D[x], z[x++], d) / 20;
+              h && h.quadraticCurveTo(p, w, l, v);
+              n && n.quadraticCurveTo(p, w, l, v);
               break;
             case 12:
-              u = g(C[x], y[x++], d) / 20;
-              r = g(C[x], y[x++], d) / 20;
-              var A = g(C[x], y[x++], d) / 20, D = g(C[x], y[x++], d) / 20, p = g(C[x], y[x++], d) / 20, m = g(C[x], y[x++], d) / 20;
-              h && h.bezierCurveTo(u, r, A, D, p, m);
-              k && k.bezierCurveTo(u, r, A, D, p, m);
+              p = g(D[x], z[x++], d) / 20;
+              w = g(D[x], z[x++], d) / 20;
+              var B = g(D[x], z[x++], d) / 20, E = g(D[x], z[x++], d) / 20, l = g(D[x], z[x++], d) / 20, v = g(D[x], z[x++], d) / 20;
+              h && h.bezierCurveTo(p, w, B, E, l, v);
+              n && n.bezierCurveTo(p, w, B, E, l, v);
               break;
             case 1:
-              h = this._createMorphPath(0, d, l.ColorUtilities.rgbaToCSSStyle(c(z.readUnsignedInt(), B.readUnsignedInt(), d)), !1, null, p, m);
+              h = this._createMorphPath(0, d, k.ColorUtilities.rgbaToCSSStyle(b(A.readUnsignedInt(), C.readUnsignedInt(), d)), !1, null, l, v);
               break;
             case 3:
-              u = this._readMorphBitmap(z, B, d, a);
-              h = this._createMorphPath(0, d, u.style, u.smoothImage, null, p, m);
+              p = this._readMorphBitmap(A, C, d, c);
+              h = this._createMorphPath(0, d, p.style, p.smoothImage, null, l, v);
               break;
             case 2:
-              u = this._readMorphGradient(z, B, d, a);
-              h = this._createMorphPath(0, d, u, !1, null, p, m);
+              p = this._readMorphGradient(A, C, d, c);
+              h = this._createMorphPath(0, d, p, !1, null, l, v);
               break;
             case 4:
               h = null;
               break;
             case 5:
-              u = g(C[x], y[x++], d) / 20;
-              k = l.ColorUtilities.rgbaToCSSStyle(c(z.readUnsignedInt(), B.readUnsignedInt(), d));
-              z.position += 1;
-              r = z.readByte();
-              A = s.LINE_CAPS_STYLES[z.readByte()];
-              D = s.LINE_JOINTS_STYLES[z.readByte()];
-              u = new n(u, r, A, D, z.readByte());
-              k = this._createMorphPath(1, d, k, !1, u, p, m);
+              p = g(D[x], z[x++], d) / 20;
+              n = k.ColorUtilities.rgbaToCSSStyle(b(A.readUnsignedInt(), C.readUnsignedInt(), d));
+              A.position += 1;
+              w = A.readByte();
+              B = r.LINE_CAPS_STYLES[A.readByte()];
+              E = r.LINE_JOINTS_STYLES[A.readByte()];
+              p = new m(p, w, B, E, A.readByte());
+              n = this._createMorphPath(1, d, n, !1, p, l, v);
               break;
             case 6:
-              u = this._readMorphGradient(z, B, d, a);
-              k = this._createMorphPath(2, d, u, !1, null, p, m);
+              p = this._readMorphGradient(A, C, d, c);
+              n = this._createMorphPath(2, d, p, !1, null, l, v);
               break;
             case 7:
-              u = this._readMorphBitmap(z, B, d, a);
-              k = this._createMorphPath(2, d, u.style, u.smoothImage, null, p, m);
+              p = this._readMorphBitmap(A, C, d, c);
+              n = this._createMorphPath(2, d, p.style, p.smoothImage, null, l, v);
               break;
             case 8:
-              k = null;
+              n = null;
           }
         }
-        v && h && (h.lineTo(t, P), k && k.lineTo(t, P));
-        return e;
+        t && h && (h.lineTo(u, Q), n && n.lineTo(u, Q));
+        return f;
       };
-      b.prototype._createMorphPath = function(b, a, c, d, e, h, n) {
-        b = new u(b, c, d, e);
-        this._morphPaths[a].push(b);
-        b.path.moveTo(h, n);
-        return b.path;
+      c.prototype._createMorphPath = function(a, b, c, d, f, m, g) {
+        a = new v(a, c, d, f);
+        this._morphPaths[b].push(a);
+        a.path.moveTo(m, g);
+        return a.path;
       };
-      b.prototype._readMorphMatrix = function(b, c, d) {
+      c.prototype._readMorphMatrix = function(b, c, d) {
         return new a(g(b.readFloat(), c.readFloat(), d), g(b.readFloat(), c.readFloat(), d), g(b.readFloat(), c.readFloat(), d), g(b.readFloat(), c.readFloat(), d), g(b.readFloat(), c.readFloat(), d), g(b.readFloat(), c.readFloat(), d));
       };
-      b.prototype._readMorphGradient = function(b, a, d, e) {
-        var h = b.readUnsignedByte(), n = 2 * b.readShort() / 255, k = this._readMorphMatrix(b, a, d);
-        e = 16 === h ? e.createLinearGradient(-1, 0, 1, 0) : e.createRadialGradient(n, 0, 0, 0, 0, 1);
-        e.setTransform && e.setTransform(k.toSVGMatrix());
-        k = b.readUnsignedByte();
-        for (h = 0;h < k;h++) {
-          var n = g(b.readUnsignedByte() / 255, a.readUnsignedByte() / 255, d), p = c(b.readUnsignedInt(), a.readUnsignedInt(), d), p = l.ColorUtilities.rgbaToCSSStyle(p);
-          e.addColorStop(n, p);
+      c.prototype._readMorphGradient = function(a, c, d, f) {
+        var m = a.readUnsignedByte(), h = 2 * a.readShort() / 255, n = this._readMorphMatrix(a, c, d);
+        f = 16 === m ? f.createLinearGradient(-1, 0, 1, 0) : f.createRadialGradient(h, 0, 0, 0, 0, 1);
+        f.setTransform && f.setTransform(n.toSVGMatrix());
+        n = a.readUnsignedByte();
+        for (m = 0;m < n;m++) {
+          var h = g(a.readUnsignedByte() / 255, c.readUnsignedByte() / 255, d), l = b(a.readUnsignedInt(), c.readUnsignedInt(), d), l = k.ColorUtilities.rgbaToCSSStyle(l);
+          f.addColorStop(h, l);
         }
-        b.position += 2;
-        return e;
+        a.position += 2;
+        return f;
       };
-      b.prototype._readMorphBitmap = function(b, a, c, d) {
-        var e = b.readUnsignedInt();
-        a = this._readMorphMatrix(b, a, c);
-        c = b.readBoolean() ? "repeat" : "no-repeat";
-        b = b.readBoolean();
-        d = d.createPattern(this._textures[e]._canvas, c);
-        d.setTransform(a.toSVGMatrix());
-        return{style:d, smoothImage:b};
+      c.prototype._readMorphBitmap = function(a, b, c, d) {
+        var f = a.readUnsignedInt();
+        b = this._readMorphMatrix(a, b, c);
+        c = a.readBoolean() ? "repeat" : "no-repeat";
+        a = a.readBoolean();
+        d = d.createPattern(this._textures[f]._canvas, c);
+        d.setTransform(b.toSVGMatrix());
+        return{style:d, smoothImage:a};
       };
-      return b;
-    }(s);
-    r.RenderableMorphShape = k;
-    var v = function() {
+      return c;
+    }(r);
+    p.RenderableMorphShape = f;
+    var w = function() {
       function a() {
         this.align = this.leading = this.descent = this.ascent = this.width = this.y = this.x = 0;
         this.runs = [];
       }
-      a.prototype.addRun = function(b, c, h, n) {
-        if (h) {
+      a.prototype.addRun = function(b, e, d, f) {
+        if (d) {
           a._measureContext.font = b;
-          var g = a._measureContext.measureText(h).width | 0;
-          this.runs.push(new d(b, c, h, g, n));
-          this.width += g;
+          var m = a._measureContext.measureText(d).width | 0;
+          this.runs.push(new t(b, e, d, m, f));
+          this.width += m;
         }
       };
       a.prototype.wrap = function(b) {
-        var c = [this], h = this.runs, n = this;
-        n.width = 0;
-        n.runs = [];
-        for (var g = a._measureContext, k = 0;k < h.length;k++) {
-          var p = h[k], m = p.text;
-          p.text = "";
-          p.width = 0;
-          g.font = p.font;
-          for (var l = b, s = m.split(/[\s.-]/), u = 0, r = 0;r < s.length;r++) {
-            var v = s[r], t = m.substr(u, v.length + 1), H = g.measureText(t).width | 0;
-            if (H > l) {
+        var e = [this], d = this.runs, f = this;
+        f.width = 0;
+        f.runs = [];
+        for (var m = a._measureContext, g = 0;g < d.length;g++) {
+          var h = d[g], n = h.text;
+          h.text = "";
+          h.width = 0;
+          m.font = h.font;
+          for (var k = b, r = n.split(/[\s.-]/), v = 0, p = 0;p < r.length;p++) {
+            var w = r[p], u = n.substr(v, w.length + 1), H = m.measureText(u).width | 0;
+            if (H > k) {
               do {
-                if (p.text && (n.runs.push(p), n.width += p.width, p = new d(p.font, p.fillStyle, "", 0, p.underline), l = new a, l.y = n.y + n.descent + n.leading + n.ascent | 0, l.ascent = n.ascent, l.descent = n.descent, l.leading = n.leading, l.align = n.align, c.push(l), n = l), l = b - H, 0 > l) {
-                  var H = t.length, C, y;
+                if (h.text && (f.runs.push(h), f.width += h.width, h = new t(h.font, h.fillStyle, "", 0, h.underline), k = new a, k.y = f.y + f.descent + f.leading + f.ascent | 0, k.ascent = f.ascent, k.descent = f.descent, k.leading = f.leading, k.align = f.align, e.push(k), f = k), k = b - H, 0 > k) {
+                  var H = u.length, D, z;
                   do {
                     H--;
                     if (1 > H) {
                       throw Error("Shall never happen: bad maxWidth?");
                     }
-                    C = t.substr(0, H);
-                    y = g.measureText(C).width | 0;
-                  } while (y > b);
-                  p.text = C;
-                  p.width = y;
-                  t = t.substr(H);
-                  H = g.measureText(t).width | 0;
+                    D = u.substr(0, H);
+                    z = m.measureText(D).width | 0;
+                  } while (z > b);
+                  h.text = D;
+                  h.width = z;
+                  u = u.substr(H);
+                  H = m.measureText(u).width | 0;
                 }
-              } while (0 > l);
+              } while (0 > k);
             } else {
-              l -= H;
+              k -= H;
             }
-            p.text += t;
-            p.width += H;
-            u += v.length + 1;
+            h.text += u;
+            h.width += H;
+            v += w.length + 1;
           }
-          n.runs.push(p);
-          n.width += p.width;
+          f.runs.push(h);
+          f.width += h.width;
         }
-        return c;
+        return e;
       };
       a._measureContext = document.createElement("canvas").getContext("2d");
       return a;
     }();
-    r.TextLine = v;
-    var d = function() {
-      return function(a, b, c, d, h) {
+    p.TextLine = w;
+    var t = function() {
+      return function(a, b, e, d, f) {
         void 0 === a && (a = "");
         void 0 === b && (b = "");
-        void 0 === c && (c = "");
+        void 0 === e && (e = "");
         void 0 === d && (d = 0);
-        void 0 === h && (h = !1);
+        void 0 === f && (f = !1);
         this.font = a;
         this.fillStyle = b;
-        this.text = c;
+        this.text = e;
         this.width = d;
-        this.underline = h;
+        this.underline = f;
       };
     }();
-    r.TextRun = d;
-    k = function(c) {
-      function b(b) {
-        c.call(this);
+    p.TextRun = t;
+    f = function(b) {
+      function c(c) {
+        b.call(this);
         this._flags = 1048592;
         this.properties = {};
-        this._textBounds = b.clone();
+        this._textBounds = c.clone();
         this._textRunData = null;
         this._plainText = "";
         this._borderColor = this._backgroundColor = 0;
@@ -9825,467 +9871,469 @@
         this._coords = null;
         this._scrollV = 1;
         this._scrollH = 0;
-        this.textRect = b.clone();
+        this.textRect = c.clone();
         this.lines = [];
-        this.setBounds(b);
+        this.setBounds(c);
       }
-      __extends(b, c);
-      b.prototype.setBounds = function(b) {
-        c.prototype.setBounds.call(this, b);
-        this._textBounds.set(b);
-        this.textRect.setElements(b.x + 2, b.y + 2, b.w - 2, b.h - 2);
-      };
-      b.prototype.setContent = function(b, a, c, d) {
-        this._textRunData = a;
-        this._plainText = b;
+      __extends(c, b);
+      c.prototype.setBounds = function(a) {
+        b.prototype.setBounds.call(this, a);
+        this._textBounds.set(a);
+        this.textRect.setElements(a.x + 2, a.y + 2, a.w - 2, a.h - 2);
+      };
+      c.prototype.setContent = function(a, b, c, d) {
+        this._textRunData = b;
+        this._plainText = a;
         this._matrix.set(c);
         this._coords = d;
         this.lines = [];
       };
-      b.prototype.setStyle = function(b, a, c, d) {
-        this._backgroundColor = b;
-        this._borderColor = a;
+      c.prototype.setStyle = function(a, b, c, d) {
+        this._backgroundColor = a;
+        this._borderColor = b;
         this._scrollV = c;
         this._scrollH = d;
       };
-      b.prototype.reflow = function(b, a) {
+      c.prototype.reflow = function(a, b) {
         var c = this._textRunData;
         if (c) {
-          for (var d = this._bounds, e = d.w - 4, h = this._plainText, n = this.lines, g = new v, k = 0, p = 0, m = 0, s = 0, u = 0, r = -1;c.position < c.length;) {
-            var t = c.readInt(), y = c.readInt(), z = c.readInt(), B = c.readUTF(), x = c.readInt(), E = c.readInt(), A = c.readInt();
-            x > m && (m = x);
-            E > s && (s = E);
-            A > u && (u = A);
+          for (var d = this._bounds, f = d.w - 4, m = this._plainText, g = this.lines, h = new w, n = 0, l = 0, r = 0, v = 0, p = 0, t = -1;c.position < c.length;) {
+            var u = c.readInt(), z = c.readInt(), A = c.readInt(), C = c.readUTF(), x = c.readInt(), F = c.readInt(), B = c.readInt();
+            x > r && (r = x);
+            F > v && (v = F);
+            B > p && (p = B);
             x = c.readBoolean();
-            E = "";
-            c.readBoolean() && (E += "italic ");
-            x && (E += "bold ");
-            z = E + z + "px " + B;
-            B = c.readInt();
-            B = l.ColorUtilities.rgbToHex(B);
+            F = "";
+            c.readBoolean() && (F += "italic ");
+            x && (F += "bold ");
+            A = F + A + "px " + C;
+            C = c.readInt();
+            C = k.ColorUtilities.rgbToHex(C);
             x = c.readInt();
-            -1 === r && (r = x);
+            -1 === t && (t = x);
             c.readBoolean();
             c.readInt();
             c.readInt();
             c.readInt();
             c.readInt();
             c.readInt();
-            for (var x = c.readBoolean(), D = "", E = !1;!E;t++) {
-              E = t >= y - 1;
-              A = h[t];
-              if ("\r" !== A && "\n" !== A && (D += A, t < h.length - 1)) {
+            for (var x = c.readBoolean(), E = "", F = !1;!F;u++) {
+              F = u >= z - 1;
+              B = m[u];
+              if ("\r" !== B && "\n" !== B && (E += B, u < m.length - 1)) {
                 continue;
               }
-              g.addRun(z, B, D, x);
-              if (g.runs.length) {
-                n.length && (k += u);
-                k += m;
-                g.y = k | 0;
-                k += s;
-                g.ascent = m;
-                g.descent = s;
-                g.leading = u;
-                g.align = r;
-                if (a && g.width > e) {
-                  for (g = g.wrap(e), D = 0;D < g.length;D++) {
-                    var F = g[D], k = F.y + F.descent + F.leading;
-                    n.push(F);
-                    F.width > p && (p = F.width);
+              h.addRun(A, C, E, x);
+              if (h.runs.length) {
+                g.length && (n += p);
+                n += r;
+                h.y = n | 0;
+                n += v;
+                h.ascent = r;
+                h.descent = v;
+                h.leading = p;
+                h.align = t;
+                if (b && h.width > f) {
+                  for (h = h.wrap(f), E = 0;E < h.length;E++) {
+                    var G = h[E], n = G.y + G.descent + G.leading;
+                    g.push(G);
+                    G.width > l && (l = G.width);
                   }
                 } else {
-                  n.push(g), g.width > p && (p = g.width);
+                  g.push(h), h.width > l && (l = h.width);
                 }
-                g = new v;
+                h = new w;
               } else {
-                k += m + s + u;
+                n += r + v + p;
               }
-              D = "";
-              if (E) {
-                u = s = m = 0;
-                r = -1;
+              E = "";
+              if (F) {
+                p = v = r = 0;
+                t = -1;
                 break;
               }
-              "\r" === A && "\n" === h[t + 1] && t++;
+              "\r" === B && "\n" === m[u + 1] && u++;
             }
-            g.addRun(z, B, D, x);
+            h.addRun(A, C, E, x);
           }
-          c = h[h.length - 1];
-          "\r" !== c && "\n" !== c || n.push(g);
+          c = m[m.length - 1];
+          "\r" !== c && "\n" !== c || g.push(h);
           c = this.textRect;
-          c.w = p;
-          c.h = k;
-          if (b) {
-            if (!a) {
-              e = p;
-              p = d.w;
-              switch(b) {
+          c.w = l;
+          c.h = n;
+          if (a) {
+            if (!b) {
+              f = l;
+              l = d.w;
+              switch(a) {
                 case 1:
-                  c.x = p - (e + 4) >> 1;
+                  c.x = l - (f + 4) >> 1;
                   break;
                 case 3:
-                  c.x = p - (e + 4);
+                  c.x = l - (f + 4);
               }
               this._textBounds.setElements(c.x - 2, c.y - 2, c.w + 4, c.h + 4);
+              d.w = f + 4;
             }
-            d.h = k + 4;
+            d.x = c.x - 2;
+            d.h = n + 4;
           } else {
             this._textBounds = d;
           }
-          for (t = 0;t < n.length;t++) {
-            if (d = n[t], d.width < e) {
+          for (u = 0;u < g.length;u++) {
+            if (d = g[u], d.width < f) {
               switch(d.align) {
                 case 1:
-                  d.x = e - d.width | 0;
+                  d.x = f - d.width | 0;
                   break;
                 case 2:
-                  d.x = (e - d.width) / 2 | 0;
+                  d.x = (f - d.width) / 2 | 0;
               }
             }
           }
           this.invalidate();
         }
       };
-      b.roundBoundPoints = function(b) {
-        for (var a = 0;a < b.length;a++) {
-          var c = b[a];
+      c.roundBoundPoints = function(a) {
+        for (var b = 0;b < a.length;b++) {
+          var c = a[b];
           c.x = Math.floor(c.x + .1) + .5;
           c.y = Math.floor(c.y + .1) + .5;
         }
       };
-      b.prototype.render = function(c) {
-        c.save();
+      c.prototype.render = function(b) {
+        b.save();
         var d = this._textBounds;
-        this._backgroundColor && (c.fillStyle = l.ColorUtilities.rgbaToCSSStyle(this._backgroundColor), c.fillRect(d.x, d.y, d.w, d.h));
+        this._backgroundColor && (b.fillStyle = k.ColorUtilities.rgbaToCSSStyle(this._backgroundColor), b.fillRect(d.x, d.y, d.w, d.h));
         if (this._borderColor) {
-          c.strokeStyle = l.ColorUtilities.rgbaToCSSStyle(this._borderColor);
-          c.lineCap = "square";
-          c.lineWidth = 1;
-          var e = b.absoluteBoundPoints, h = c.currentTransform;
-          h ? (d = d.clone(), (new a(h.a, h.b, h.c, h.d, h.e, h.f)).transformRectangle(d, e), c.setTransform(1, 0, 0, 1, 0, 0)) : (e[0].x = d.x, e[0].y = d.y, e[1].x = d.x + d.w, e[1].y = d.y, e[2].x = d.x + d.w, e[2].y = d.y + d.h, e[3].x = d.x, e[3].y = d.y + d.h);
-          b.roundBoundPoints(e);
+          b.strokeStyle = k.ColorUtilities.rgbaToCSSStyle(this._borderColor);
+          b.lineCap = "square";
+          b.lineWidth = 1;
+          var f = c.absoluteBoundPoints, m = b.currentTransform;
+          m ? (d = d.clone(), (new a(m.a, m.b, m.c, m.d, m.e, m.f)).transformRectangle(d, f), b.setTransform(1, 0, 0, 1, 0, 0)) : (f[0].x = d.x, f[0].y = d.y, f[1].x = d.x + d.w, f[1].y = d.y, f[2].x = d.x + d.w, f[2].y = d.y + d.h, f[3].x = d.x, f[3].y = d.y + d.h);
+          c.roundBoundPoints(f);
           d = new Path2D;
-          d.moveTo(e[0].x, e[0].y);
-          d.lineTo(e[1].x, e[1].y);
-          d.lineTo(e[2].x, e[2].y);
-          d.lineTo(e[3].x, e[3].y);
-          d.lineTo(e[0].x, e[0].y);
-          c.stroke(d);
-          h && c.setTransform(h.a, h.b, h.c, h.d, h.e, h.f);
+          d.moveTo(f[0].x, f[0].y);
+          d.lineTo(f[1].x, f[1].y);
+          d.lineTo(f[2].x, f[2].y);
+          d.lineTo(f[3].x, f[3].y);
+          d.lineTo(f[0].x, f[0].y);
+          b.stroke(d);
+          m && b.setTransform(m.a, m.b, m.c, m.d, m.e, m.f);
         }
-        this._coords ? this._renderChars(c) : this._renderLines(c);
-        c.restore();
+        this._coords ? this._renderChars(b) : this._renderLines(b);
+        b.restore();
       };
-      b.prototype._renderChars = function(b) {
+      c.prototype._renderChars = function(a) {
         if (this._matrix) {
-          var a = this._matrix;
-          b.transform(a.a, a.b, a.c, a.d, a.tx, a.ty);
+          var b = this._matrix;
+          a.transform(b.a, b.b, b.c, b.d, b.tx, b.ty);
         }
-        for (var a = this.lines, c = this._coords, d = c.position = 0;d < a.length;d++) {
-          for (var e = a[d].runs, h = 0;h < e.length;h++) {
-            var n = e[h];
-            b.font = n.font;
-            b.fillStyle = n.fillStyle;
-            for (var n = n.text, g = 0;g < n.length;g++) {
-              var k = c.readInt() / 20, p = c.readInt() / 20;
-              b.fillText(n[g], k, p);
+        for (var b = this.lines, c = this._coords, d = c.position = 0;d < b.length;d++) {
+          for (var f = b[d].runs, m = 0;m < f.length;m++) {
+            var g = f[m];
+            a.font = g.font;
+            a.fillStyle = g.fillStyle;
+            for (var g = g.text, h = 0;h < g.length;h++) {
+              var n = c.readInt() / 20, l = c.readInt() / 20;
+              a.fillText(g[h], n, l);
             }
           }
         }
       };
-      b.prototype._renderLines = function(b) {
-        var a = this._textBounds;
-        b.beginPath();
-        b.rect(a.x + 2, a.y + 2, a.w - 4, a.h - 4);
-        b.clip();
-        b.translate(a.x - this._scrollH + 2, a.y + 2);
-        for (var c = this.lines, d = this._scrollV, e = 0, h = 0;h < c.length;h++) {
-          var n = c[h], g = n.x, k = n.y;
-          if (h + 1 < d) {
-            e = k + n.descent + n.leading;
+      c.prototype._renderLines = function(a) {
+        var b = this._textBounds;
+        a.beginPath();
+        a.rect(b.x + 2, b.y + 2, b.w - 4, b.h - 4);
+        a.clip();
+        a.translate(b.x - this._scrollH + 2, b.y + 2);
+        for (var c = this.lines, d = this._scrollV, f = 0, m = 0;m < c.length;m++) {
+          var g = c[m], h = g.x, n = g.y;
+          if (m + 1 < d) {
+            f = n + g.descent + g.leading;
           } else {
-            k -= e;
-            if (h + 1 - d && k > a.h) {
+            n -= f;
+            if (m + 1 - d && n > b.h) {
               break;
             }
-            for (var p = n.runs, m = 0;m < p.length;m++) {
-              var l = p[m];
-              b.font = l.font;
-              b.fillStyle = l.fillStyle;
-              l.underline && b.fillRect(g, k + n.descent / 2 | 0, l.width, 1);
-              b.textAlign = "left";
-              b.textBaseline = "alphabetic";
-              b.fillText(l.text, g, k);
-              g += l.width;
+            for (var l = g.runs, k = 0;k < l.length;k++) {
+              var r = l[k];
+              a.font = r.font;
+              a.fillStyle = r.fillStyle;
+              r.underline && a.fillRect(h, n + g.descent / 2 | 0, r.width, 1);
+              a.textAlign = "left";
+              a.textBaseline = "alphabetic";
+              a.fillText(r.text, h, n);
+              h += r.width;
             }
           }
         }
       };
-      b.absoluteBoundPoints = [new t(0, 0), new t(0, 0), new t(0, 0), new t(0, 0)];
-      return b;
-    }(p);
-    r.RenderableText = k;
-    p = function(a) {
-      function b(b, c) {
+      c.absoluteBoundPoints = [new u(0, 0), new u(0, 0), new u(0, 0), new u(0, 0)];
+      return c;
+    }(n);
+    p.RenderableText = f;
+    n = function(a) {
+      function b(c, d) {
         a.call(this);
         this._flags = 3145728;
         this.properties = {};
-        this.setBounds(new m(0, 0, b, c));
+        this.setBounds(new h(0, 0, c, d));
       }
       __extends(b, a);
       Object.defineProperty(b.prototype, "text", {get:function() {
         return this._text;
-      }, set:function(b) {
-        this._text = b;
+      }, set:function(a) {
+        this._text = a;
       }, enumerable:!0, configurable:!0});
-      b.prototype.render = function(b, a, c) {
-        b.save();
-        b.textBaseline = "top";
-        b.fillStyle = "white";
-        b.fillText(this.text, 0, 0);
-        b.restore();
+      b.prototype.render = function(a, b, c) {
+        a.save();
+        a.textBaseline = "top";
+        a.fillStyle = "white";
+        a.fillText(this.text, 0, 0);
+        a.restore();
       };
       return b;
-    }(p);
-    r.Label = p;
-  })(l.GFX || (l.GFX = {}));
-})(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
-    var g = l.ColorUtilities.clampByte, c = function() {
+    }(n);
+    p.Label = n;
+  })(k.GFX || (k.GFX = {}));
+})(Shumway || (Shumway = {}));
+(function(k) {
+  (function(p) {
+    var g = k.ColorUtilities.clampByte, b = function() {
       return function() {
       };
     }();
-    r.Filter = c;
-    var t = function(c) {
-      function a(a, g, k) {
-        c.call(this);
+    p.Filter = b;
+    var u = function(b) {
+      function a(a, g, f) {
+        b.call(this);
         this.blurX = a;
         this.blurY = g;
-        this.quality = k;
+        this.quality = f;
       }
-      __extends(a, c);
+      __extends(a, b);
       return a;
-    }(c);
-    r.BlurFilter = t;
-    t = function(c) {
-      function a(a, g, k, l, n, s, r, d, e, b, f) {
-        c.call(this);
+    }(b);
+    p.BlurFilter = u;
+    u = function(b) {
+      function a(a, g, f, k, m, r, p, t, l, c, e) {
+        b.call(this);
         this.alpha = a;
         this.angle = g;
-        this.blurX = k;
-        this.blurY = l;
-        this.color = n;
-        this.distance = s;
-        this.hideObject = r;
-        this.inner = d;
-        this.knockout = e;
-        this.quality = b;
-        this.strength = f;
+        this.blurX = f;
+        this.blurY = k;
+        this.color = m;
+        this.distance = r;
+        this.hideObject = p;
+        this.inner = t;
+        this.knockout = l;
+        this.quality = c;
+        this.strength = e;
       }
-      __extends(a, c);
+      __extends(a, b);
       return a;
-    }(c);
-    r.DropshadowFilter = t;
-    c = function(c) {
-      function a(a, g, k, l, n, s, r, d) {
-        c.call(this);
+    }(b);
+    p.DropshadowFilter = u;
+    b = function(b) {
+      function a(a, g, f, k, m, r, p, t) {
+        b.call(this);
         this.alpha = a;
         this.blurX = g;
-        this.blurY = k;
-        this.color = l;
-        this.inner = n;
-        this.knockout = s;
-        this.quality = r;
-        this.strength = d;
+        this.blurY = f;
+        this.color = k;
+        this.inner = m;
+        this.knockout = r;
+        this.quality = p;
+        this.strength = t;
       }
-      __extends(a, c);
+      __extends(a, b);
       return a;
-    }(c);
-    r.GlowFilter = c;
-    (function(c) {
-      c[c.Unknown = 0] = "Unknown";
-      c[c.Identity = 1] = "Identity";
-    })(r.ColorMatrixType || (r.ColorMatrixType = {}));
-    c = function() {
-      function c(a) {
+    }(b);
+    p.GlowFilter = b;
+    (function(b) {
+      b[b.Unknown = 0] = "Unknown";
+      b[b.Identity = 1] = "Identity";
+    })(p.ColorMatrixType || (p.ColorMatrixType = {}));
+    b = function() {
+      function b(a) {
         this._data = new Float32Array(a);
         this._type = 0;
       }
-      c.prototype.clone = function() {
-        var a = new c(this._data);
+      b.prototype.clone = function() {
+        var a = new b(this._data);
         a._type = this._type;
         return a;
       };
-      c.prototype.set = function(a) {
+      b.prototype.set = function(a) {
         this._data.set(a._data);
         this._type = a._type;
       };
-      c.prototype.toWebGLMatrix = function() {
+      b.prototype.toWebGLMatrix = function() {
         return new Float32Array(this._data);
       };
-      c.prototype.asWebGLMatrix = function() {
+      b.prototype.asWebGLMatrix = function() {
         return this._data.subarray(0, 16);
       };
-      c.prototype.asWebGLVector = function() {
+      b.prototype.asWebGLVector = function() {
         return this._data.subarray(16, 20);
       };
-      c.prototype.isIdentity = function() {
+      b.prototype.isIdentity = function() {
         if (this._type & 1) {
           return!0;
         }
         var a = this._data;
         return 1 == a[0] && 0 == a[1] && 0 == a[2] && 0 == a[3] && 0 == a[4] && 1 == a[5] && 0 == a[6] && 0 == a[7] && 0 == a[8] && 0 == a[9] && 1 == a[10] && 0 == a[11] && 0 == a[12] && 0 == a[13] && 0 == a[14] && 1 == a[15] && 0 == a[16] && 0 == a[17] && 0 == a[18] && 0 == a[19];
       };
-      c.createIdentity = function() {
-        var a = new c([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0]);
+      b.createIdentity = function() {
+        var a = new b([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0]);
         a._type = 1;
         return a;
       };
-      c.prototype.setMultipliersAndOffsets = function(a, c, g, k, m, n, l, r) {
-        for (var d = this._data, e = 0;e < d.length;e++) {
-          d[e] = 0;
-        }
-        d[0] = a;
-        d[5] = c;
-        d[10] = g;
-        d[15] = k;
-        d[16] = m / 255;
-        d[17] = n / 255;
-        d[18] = l / 255;
-        d[19] = r / 255;
+      b.prototype.setMultipliersAndOffsets = function(a, b, g, f, h, m, k, p) {
+        for (var t = this._data, l = 0;l < t.length;l++) {
+          t[l] = 0;
+        }
+        t[0] = a;
+        t[5] = b;
+        t[10] = g;
+        t[15] = f;
+        t[16] = h / 255;
+        t[17] = m / 255;
+        t[18] = k / 255;
+        t[19] = p / 255;
         this._type = 0;
       };
-      c.prototype.transformRGBA = function(a) {
-        var c = a >> 24 & 255, p = a >> 16 & 255, k = a >> 8 & 255, m = a & 255, n = this._data;
-        a = g(c * n[0] + p * n[1] + k * n[2] + m * n[3] + 255 * n[16]);
-        var l = g(c * n[4] + p * n[5] + k * n[6] + m * n[7] + 255 * n[17]), r = g(c * n[8] + p * n[9] + k * n[10] + m * n[11] + 255 * n[18]), c = g(c * n[12] + p * n[13] + k * n[14] + m * n[15] + 255 * n[19]);
-        return a << 24 | l << 16 | r << 8 | c;
+      b.prototype.transformRGBA = function(a) {
+        var b = a >> 24 & 255, h = a >> 16 & 255, f = a >> 8 & 255, k = a & 255, m = this._data;
+        a = g(b * m[0] + h * m[1] + f * m[2] + k * m[3] + 255 * m[16]);
+        var r = g(b * m[4] + h * m[5] + f * m[6] + k * m[7] + 255 * m[17]), p = g(b * m[8] + h * m[9] + f * m[10] + k * m[11] + 255 * m[18]), b = g(b * m[12] + h * m[13] + f * m[14] + k * m[15] + 255 * m[19]);
+        return a << 24 | r << 16 | p << 8 | b;
       };
-      c.prototype.multiply = function(a) {
+      b.prototype.multiply = function(a) {
         if (!(a._type & 1)) {
-          var c = this._data, g = a._data;
-          a = c[0];
-          var k = c[1], m = c[2], n = c[3], l = c[4], r = c[5], d = c[6], e = c[7], b = c[8], f = c[9], q = c[10], w = c[11], G = c[12], U = c[13], t = c[14], Q = c[15], ea = c[16], fa = c[17], ga = c[18], ha = c[19], W = g[0], P = g[1], H = g[2], C = g[3], y = g[4], z = g[5], B = g[6], x = g[7], E = g[8], A = g[9], D = g[10], F = g[11], I = g[12], J = g[13], K = g[14], L = g[15], M = g[16], N = g[17], O = g[18], g = g[19];
-          c[0] = a * W + l * P + b * H + G * C;
-          c[1] = k * W + r * P + f * H + U * C;
-          c[2] = m * W + d * P + q * H + t * C;
-          c[3] = n * W + e * P + w * H + Q * C;
-          c[4] = a * y + l * z + b * B + G * x;
-          c[5] = k * y + r * z + f * B + U * x;
-          c[6] = m * y + d * z + q * B + t * x;
-          c[7] = n * y + e * z + w * B + Q * x;
-          c[8] = a * E + l * A + b * D + G * F;
-          c[9] = k * E + r * A + f * D + U * F;
-          c[10] = m * E + d * A + q * D + t * F;
-          c[11] = n * E + e * A + w * D + Q * F;
-          c[12] = a * I + l * J + b * K + G * L;
-          c[13] = k * I + r * J + f * K + U * L;
-          c[14] = m * I + d * J + q * K + t * L;
-          c[15] = n * I + e * J + w * K + Q * L;
-          c[16] = a * M + l * N + b * O + G * g + ea;
-          c[17] = k * M + r * N + f * O + U * g + fa;
-          c[18] = m * M + d * N + q * O + t * g + ga;
-          c[19] = n * M + e * N + w * O + Q * g + ha;
+          var b = this._data, g = a._data;
+          a = b[0];
+          var f = b[1], h = b[2], m = b[3], k = b[4], p = b[5], t = b[6], l = b[7], c = b[8], e = b[9], q = b[10], s = b[11], y = b[12], I = b[13], u = b[14], R = b[15], fa = b[16], ca = b[17], ga = b[18], ha = b[19], W = g[0], Q = g[1], H = g[2], D = g[3], z = g[4], A = g[5], C = g[6], x = g[7], F = g[8], B = g[9], E = g[10], G = g[11], J = g[12], K = g[13], L = g[14], M = g[15], N = g[16], O = g[17], P = g[18], g = g[19];
+          b[0] = a * W + k * Q + c * H + y * D;
+          b[1] = f * W + p * Q + e * H + I * D;
+          b[2] = h * W + t * Q + q * H + u * D;
+          b[3] = m * W + l * Q + s * H + R * D;
+          b[4] = a * z + k * A + c * C + y * x;
+          b[5] = f * z + p * A + e * C + I * x;
+          b[6] = h * z + t * A + q * C + u * x;
+          b[7] = m * z + l * A + s * C + R * x;
+          b[8] = a * F + k * B + c * E + y * G;
+          b[9] = f * F + p * B + e * E + I * G;
+          b[10] = h * F + t * B + q * E + u * G;
+          b[11] = m * F + l * B + s * E + R * G;
+          b[12] = a * J + k * K + c * L + y * M;
+          b[13] = f * J + p * K + e * L + I * M;
+          b[14] = h * J + t * K + q * L + u * M;
+          b[15] = m * J + l * K + s * L + R * M;
+          b[16] = a * N + k * O + c * P + y * g + fa;
+          b[17] = f * N + p * O + e * P + I * g + ca;
+          b[18] = h * N + t * O + q * P + u * g + ga;
+          b[19] = m * N + l * O + s * P + R * g + ha;
           this._type = 0;
         }
       };
-      Object.defineProperty(c.prototype, "alphaMultiplier", {get:function() {
+      Object.defineProperty(b.prototype, "alphaMultiplier", {get:function() {
         return this._data[15];
       }, enumerable:!0, configurable:!0});
-      c.prototype.hasOnlyAlphaMultiplier = function() {
+      b.prototype.hasOnlyAlphaMultiplier = function() {
         var a = this._data;
         return 1 == a[0] && 0 == a[1] && 0 == a[2] && 0 == a[3] && 0 == a[4] && 1 == a[5] && 0 == a[6] && 0 == a[7] && 0 == a[8] && 0 == a[9] && 1 == a[10] && 0 == a[11] && 0 == a[12] && 0 == a[13] && 0 == a[14] && 0 == a[16] && 0 == a[17] && 0 == a[18] && 0 == a[19];
       };
-      c.prototype.equals = function(a) {
+      b.prototype.equals = function(a) {
         if (!a) {
           return!1;
         }
         if (this._type === a._type && 1 === this._type) {
           return!0;
         }
-        var c = this._data;
+        var b = this._data;
         a = a._data;
         for (var g = 0;20 > g;g++) {
-          if (.001 < Math.abs(c[g] - a[g])) {
+          if (.001 < Math.abs(b[g] - a[g])) {
             return!1;
           }
         }
         return!0;
       };
-      c.prototype.toSVGFilterMatrix = function() {
+      b.prototype.toSVGFilterMatrix = function() {
         var a = this._data;
         return[a[0], a[4], a[8], a[12], a[16], a[1], a[5], a[9], a[13], a[17], a[2], a[6], a[10], a[14], a[18], a[3], a[7], a[11], a[15], a[19]].join(" ");
       };
-      return c;
+      return b;
     }();
-    r.ColorMatrix = c;
-  })(l.GFX || (l.GFX = {}));
+    p.ColorMatrix = b;
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      function c(a, c) {
-        return-1 !== a.indexOf(c, this.length - c.length);
+      function b(a, b) {
+        return-1 !== a.indexOf(b, this.length - b.length);
       }
-      var t = r.Geometry.Point3D, m = r.Geometry.Matrix3D, a = r.Geometry.degreesToRadian, h = l.Debug.unexpected, p = l.Debug.notImplemented;
+      var u = p.Geometry.Point3D, h = p.Geometry.Matrix3D, a = p.Geometry.degreesToRadian, d = k.Debug.unexpected, n = k.Debug.notImplemented;
       g.SHADER_ROOT = "shaders/";
-      var k = function() {
-        function k(a, c) {
-          this._fillColor = l.Color.Red;
-          this._surfaceRegionCache = new l.LRUList;
-          this.modelViewProjectionMatrix = m.createIdentity();
+      var f = function() {
+        function f(a, b) {
+          this._fillColor = k.Color.Red;
+          this._surfaceRegionCache = new k.LRUList;
+          this.modelViewProjectionMatrix = h.createIdentity();
           this._canvas = a;
-          this._options = c;
+          this._options = b;
           this.gl = a.getContext("experimental-webgl", {preserveDrawingBuffer:!1, antialias:!0, stencil:!0, premultipliedAlpha:!1});
           this._programCache = Object.create(null);
           this._resize();
-          this.gl.pixelStorei(this.gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, c.unpackPremultiplyAlpha ? this.gl.ONE : this.gl.ZERO);
-          this._backgroundColor = l.Color.Black;
+          this.gl.pixelStorei(this.gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, b.unpackPremultiplyAlpha ? this.gl.ONE : this.gl.ZERO);
+          this._backgroundColor = k.Color.Black;
           this._geometry = new g.WebGLGeometry(this);
           this._tmpVertices = g.Vertex.createEmptyVertices(g.Vertex, 64);
-          this._maxSurfaces = c.maxSurfaces;
-          this._maxSurfaceSize = c.maxSurfaceSize;
+          this._maxSurfaces = b.maxSurfaces;
+          this._maxSurfaceSize = b.maxSurfaceSize;
           this.gl.blendFunc(this.gl.ONE, this.gl.ONE_MINUS_SRC_ALPHA);
           this.gl.enable(this.gl.BLEND);
-          this.modelViewProjectionMatrix = m.create2DProjection(this._w, this._h, 2E3);
-          var h = this;
-          this._surfaceRegionAllocator = new r.SurfaceRegionAllocator.SimpleAllocator(function() {
-            var a = h._createTexture();
+          this.modelViewProjectionMatrix = h.create2DProjection(this._w, this._h, 2E3);
+          var d = this;
+          this._surfaceRegionAllocator = new p.SurfaceRegionAllocator.SimpleAllocator(function() {
+            var a = d._createTexture();
             return new g.WebGLSurface(1024, 1024, a);
           });
         }
-        Object.defineProperty(k.prototype, "surfaces", {get:function() {
+        Object.defineProperty(f.prototype, "surfaces", {get:function() {
           return this._surfaceRegionAllocator.surfaces;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(k.prototype, "fillStyle", {set:function(a) {
-          this._fillColor.set(l.Color.parseColor(a));
+        Object.defineProperty(f.prototype, "fillStyle", {set:function(a) {
+          this._fillColor.set(k.Color.parseColor(a));
         }, enumerable:!0, configurable:!0});
-        k.prototype.setBlendMode = function(a) {
-          var c = this.gl;
+        f.prototype.setBlendMode = function(a) {
+          var b = this.gl;
           switch(a) {
             case 8:
-              c.blendFunc(c.SRC_ALPHA, c.DST_ALPHA);
+              b.blendFunc(b.SRC_ALPHA, b.DST_ALPHA);
               break;
             case 3:
-              c.blendFunc(c.DST_COLOR, c.ONE_MINUS_SRC_ALPHA);
+              b.blendFunc(b.DST_COLOR, b.ONE_MINUS_SRC_ALPHA);
               break;
             case 4:
-              c.blendFunc(c.SRC_ALPHA, c.ONE);
+              b.blendFunc(b.SRC_ALPHA, b.ONE);
               break;
             case 2:
             ;
             case 1:
-              c.blendFunc(c.ONE, c.ONE_MINUS_SRC_ALPHA);
+              b.blendFunc(b.ONE, b.ONE_MINUS_SRC_ALPHA);
               break;
             default:
-              p("Blend Mode: " + a);
+              n("Blend Mode: " + a);
           }
         };
-        k.prototype.setBlendOptions = function() {
+        f.prototype.setBlendOptions = function() {
           this.gl.blendFunc(this._options.sourceBlendFactor, this._options.destinationBlendFactor);
         };
-        k.glSupportedBlendMode = function(a) {
+        f.glSupportedBlendMode = function(a) {
           switch(a) {
             case 8:
             ;
@@ -10299,284 +10347,284 @@
               return!1;
           }
         };
-        k.prototype.create2DProjectionMatrix = function() {
-          return m.create2DProjection(this._w, this._h, -this._w);
+        f.prototype.create2DProjectionMatrix = function() {
+          return h.create2DProjection(this._w, this._h, -this._w);
         };
-        k.prototype.createPerspectiveMatrix = function(c, h, g) {
-          g = a(g);
-          h = m.createPerspective(a(h));
-          var d = new t(0, 1, 0), e = new t(0, 0, 0);
-          c = new t(0, 0, c);
-          c = m.createCameraLookAt(c, e, d);
-          c = m.createInverse(c);
-          d = m.createIdentity();
-          d = m.createMultiply(d, m.createTranslation(-this._w / 2, -this._h / 2));
-          d = m.createMultiply(d, m.createScale(1 / this._w, -1 / this._h, .01));
-          d = m.createMultiply(d, m.createYRotation(g));
-          d = m.createMultiply(d, c);
-          return d = m.createMultiply(d, h);
-        };
-        k.prototype.discardCachedImages = function() {
-          2 <= r.traceLevel && r.writer && r.writer.writeLn("Discard Cache");
-          for (var a = this._surfaceRegionCache.count / 2 | 0, c = 0;c < a;c++) {
-            var h = this._surfaceRegionCache.pop();
-            2 <= r.traceLevel && r.writer && r.writer.writeLn("Discard: " + h);
-            h.texture.atlas.remove(h.region);
-            h.texture = null;
-          }
-        };
-        k.prototype.cacheImage = function(a) {
-          var c = this.allocateSurfaceRegion(a.width, a.height);
-          2 <= r.traceLevel && r.writer && r.writer.writeLn("Uploading Image: @ " + c.region);
-          this._surfaceRegionCache.use(c);
-          this.updateSurfaceRegion(a, c);
-          return c;
+        f.prototype.createPerspectiveMatrix = function(b, d, f) {
+          f = a(f);
+          d = h.createPerspective(a(d));
+          var g = new u(0, 1, 0), n = new u(0, 0, 0);
+          b = new u(0, 0, b);
+          b = h.createCameraLookAt(b, n, g);
+          b = h.createInverse(b);
+          g = h.createIdentity();
+          g = h.createMultiply(g, h.createTranslation(-this._w / 2, -this._h / 2));
+          g = h.createMultiply(g, h.createScale(1 / this._w, -1 / this._h, .01));
+          g = h.createMultiply(g, h.createYRotation(f));
+          g = h.createMultiply(g, b);
+          return g = h.createMultiply(g, d);
+        };
+        f.prototype.discardCachedImages = function() {
+          2 <= p.traceLevel && p.writer && p.writer.writeLn("Discard Cache");
+          for (var a = this._surfaceRegionCache.count / 2 | 0, b = 0;b < a;b++) {
+            var d = this._surfaceRegionCache.pop();
+            2 <= p.traceLevel && p.writer && p.writer.writeLn("Discard: " + d);
+            d.texture.atlas.remove(d.region);
+            d.texture = null;
+          }
+        };
+        f.prototype.cacheImage = function(a) {
+          var b = this.allocateSurfaceRegion(a.width, a.height);
+          2 <= p.traceLevel && p.writer && p.writer.writeLn("Uploading Image: @ " + b.region);
+          this._surfaceRegionCache.use(b);
+          this.updateSurfaceRegion(a, b);
+          return b;
         };
-        k.prototype.allocateSurfaceRegion = function(a, c) {
-          return this._surfaceRegionAllocator.allocate(a, c, null);
+        f.prototype.allocateSurfaceRegion = function(a, b) {
+          return this._surfaceRegionAllocator.allocate(a, b, null);
         };
-        k.prototype.updateSurfaceRegion = function(a, c) {
-          var h = this.gl;
-          h.bindTexture(h.TEXTURE_2D, c.surface.texture);
-          h.texSubImage2D(h.TEXTURE_2D, 0, c.region.x, c.region.y, h.RGBA, h.UNSIGNED_BYTE, a);
+        f.prototype.updateSurfaceRegion = function(a, b) {
+          var d = this.gl;
+          d.bindTexture(d.TEXTURE_2D, b.surface.texture);
+          d.texSubImage2D(d.TEXTURE_2D, 0, b.region.x, b.region.y, d.RGBA, d.UNSIGNED_BYTE, a);
         };
-        k.prototype._resize = function() {
+        f.prototype._resize = function() {
           var a = this.gl;
           this._w = this._canvas.width;
           this._h = this._canvas.height;
           a.viewport(0, 0, this._w, this._h);
-          for (var c in this._programCache) {
-            this._initializeProgram(this._programCache[c]);
+          for (var b in this._programCache) {
+            this._initializeProgram(this._programCache[b]);
           }
         };
-        k.prototype._initializeProgram = function(a) {
+        f.prototype._initializeProgram = function(a) {
           this.gl.useProgram(a);
         };
-        k.prototype._createShaderFromFile = function(a) {
-          var h = g.SHADER_ROOT + a, k = this.gl;
+        f.prototype._createShaderFromFile = function(a) {
+          var d = g.SHADER_ROOT + a, f = this.gl;
           a = new XMLHttpRequest;
-          a.open("GET", h, !1);
+          a.open("GET", d, !1);
           a.send();
-          if (c(h, ".vert")) {
-            h = k.VERTEX_SHADER;
+          if (b(d, ".vert")) {
+            d = f.VERTEX_SHADER;
           } else {
-            if (c(h, ".frag")) {
-              h = k.FRAGMENT_SHADER;
+            if (b(d, ".frag")) {
+              d = f.FRAGMENT_SHADER;
             } else {
               throw "Shader Type: not supported.";
             }
           }
-          return this._createShader(h, a.responseText);
+          return this._createShader(d, a.responseText);
         };
-        k.prototype.createProgramFromFiles = function() {
+        f.prototype.createProgramFromFiles = function() {
           var a = this._programCache["combined.vert-combined.frag"];
           a || (a = this._createProgram([this._createShaderFromFile("combined.vert"), this._createShaderFromFile("combined.frag")]), this._queryProgramAttributesAndUniforms(a), this._initializeProgram(a), this._programCache["combined.vert-combined.frag"] = a);
           return a;
         };
-        k.prototype._createProgram = function(a) {
-          var c = this.gl, g = c.createProgram();
+        f.prototype._createProgram = function(a) {
+          var b = this.gl, f = b.createProgram();
           a.forEach(function(a) {
-            c.attachShader(g, a);
+            b.attachShader(f, a);
           });
-          c.linkProgram(g);
-          c.getProgramParameter(g, c.LINK_STATUS) || (h("Cannot link program: " + c.getProgramInfoLog(g)), c.deleteProgram(g));
-          return g;
+          b.linkProgram(f);
+          b.getProgramParameter(f, b.LINK_STATUS) || (d("Cannot link program: " + b.getProgramInfoLog(f)), b.deleteProgram(f));
+          return f;
         };
-        k.prototype._createShader = function(a, c) {
-          var g = this.gl, d = g.createShader(a);
-          g.shaderSource(d, c);
-          g.compileShader(d);
-          return g.getShaderParameter(d, g.COMPILE_STATUS) ? d : (h("Cannot compile shader: " + g.getShaderInfoLog(d)), g.deleteShader(d), null);
-        };
-        k.prototype._createTexture = function() {
-          var a = this.gl, c = a.createTexture();
-          a.bindTexture(a.TEXTURE_2D, c);
+        f.prototype._createShader = function(a, b) {
+          var f = this.gl, g = f.createShader(a);
+          f.shaderSource(g, b);
+          f.compileShader(g);
+          return f.getShaderParameter(g, f.COMPILE_STATUS) ? g : (d("Cannot compile shader: " + f.getShaderInfoLog(g)), f.deleteShader(g), null);
+        };
+        f.prototype._createTexture = function() {
+          var a = this.gl, b = a.createTexture();
+          a.bindTexture(a.TEXTURE_2D, b);
           a.texParameteri(a.TEXTURE_2D, a.TEXTURE_WRAP_S, a.CLAMP_TO_EDGE);
           a.texParameteri(a.TEXTURE_2D, a.TEXTURE_WRAP_T, a.CLAMP_TO_EDGE);
           a.texParameteri(a.TEXTURE_2D, a.TEXTURE_MIN_FILTER, a.LINEAR);
           a.texParameteri(a.TEXTURE_2D, a.TEXTURE_MAG_FILTER, a.LINEAR);
           a.texImage2D(a.TEXTURE_2D, 0, a.RGBA, 1024, 1024, 0, a.RGBA, a.UNSIGNED_BYTE, null);
-          return c;
+          return b;
         };
-        k.prototype._createFramebuffer = function(a) {
-          var c = this.gl, h = c.createFramebuffer();
-          c.bindFramebuffer(c.FRAMEBUFFER, h);
-          c.framebufferTexture2D(c.FRAMEBUFFER, c.COLOR_ATTACHMENT0, c.TEXTURE_2D, a, 0);
-          c.bindFramebuffer(c.FRAMEBUFFER, null);
-          return h;
+        f.prototype._createFramebuffer = function(a) {
+          var b = this.gl, d = b.createFramebuffer();
+          b.bindFramebuffer(b.FRAMEBUFFER, d);
+          b.framebufferTexture2D(b.FRAMEBUFFER, b.COLOR_ATTACHMENT0, b.TEXTURE_2D, a, 0);
+          b.bindFramebuffer(b.FRAMEBUFFER, null);
+          return d;
         };
-        k.prototype._queryProgramAttributesAndUniforms = function(a) {
+        f.prototype._queryProgramAttributesAndUniforms = function(a) {
           a.uniforms = {};
           a.attributes = {};
-          for (var c = this.gl, h = 0, d = c.getProgramParameter(a, c.ACTIVE_ATTRIBUTES);h < d;h++) {
-            var e = c.getActiveAttrib(a, h);
-            a.attributes[e.name] = e;
-            e.location = c.getAttribLocation(a, e.name);
-          }
-          h = 0;
-          for (d = c.getProgramParameter(a, c.ACTIVE_UNIFORMS);h < d;h++) {
-            e = c.getActiveUniform(a, h), a.uniforms[e.name] = e, e.location = c.getUniformLocation(a, e.name);
+          for (var b = this.gl, d = 0, f = b.getProgramParameter(a, b.ACTIVE_ATTRIBUTES);d < f;d++) {
+            var g = b.getActiveAttrib(a, d);
+            a.attributes[g.name] = g;
+            g.location = b.getAttribLocation(a, g.name);
+          }
+          d = 0;
+          for (f = b.getProgramParameter(a, b.ACTIVE_UNIFORMS);d < f;d++) {
+            g = b.getActiveUniform(a, d), a.uniforms[g.name] = g, g.location = b.getUniformLocation(a, g.name);
           }
         };
-        Object.defineProperty(k.prototype, "target", {set:function(a) {
-          var c = this.gl;
-          a ? (c.viewport(0, 0, a.w, a.h), c.bindFramebuffer(c.FRAMEBUFFER, a.framebuffer)) : (c.viewport(0, 0, this._w, this._h), c.bindFramebuffer(c.FRAMEBUFFER, null));
+        Object.defineProperty(f.prototype, "target", {set:function(a) {
+          var b = this.gl;
+          a ? (b.viewport(0, 0, a.w, a.h), b.bindFramebuffer(b.FRAMEBUFFER, a.framebuffer)) : (b.viewport(0, 0, this._w, this._h), b.bindFramebuffer(b.FRAMEBUFFER, null));
         }, enumerable:!0, configurable:!0});
-        k.prototype.clear = function(a) {
+        f.prototype.clear = function(a) {
           a = this.gl;
           a.clearColor(0, 0, 0, 0);
           a.clear(a.COLOR_BUFFER_BIT);
         };
-        k.prototype.clearTextureRegion = function(a, c) {
-          void 0 === c && (c = l.Color.None);
-          var h = this.gl, d = a.region;
+        f.prototype.clearTextureRegion = function(a, b) {
+          void 0 === b && (b = k.Color.None);
+          var d = this.gl, f = a.region;
           this.target = a.surface;
-          h.enable(h.SCISSOR_TEST);
-          h.scissor(d.x, d.y, d.w, d.h);
-          h.clearColor(c.r, c.g, c.b, c.a);
-          h.clear(h.COLOR_BUFFER_BIT | h.DEPTH_BUFFER_BIT);
-          h.disable(h.SCISSOR_TEST);
+          d.enable(d.SCISSOR_TEST);
+          d.scissor(f.x, f.y, f.w, f.h);
+          d.clearColor(b.r, b.g, b.b, b.a);
+          d.clear(d.COLOR_BUFFER_BIT | d.DEPTH_BUFFER_BIT);
+          d.disable(d.SCISSOR_TEST);
         };
-        k.prototype.sizeOf = function(a) {
-          var c = this.gl;
+        f.prototype.sizeOf = function(a) {
+          var b = this.gl;
           switch(a) {
-            case c.UNSIGNED_BYTE:
+            case b.UNSIGNED_BYTE:
               return 1;
-            case c.UNSIGNED_SHORT:
+            case b.UNSIGNED_SHORT:
               return 2;
             case this.gl.INT:
             ;
             case this.gl.FLOAT:
               return 4;
             default:
-              p(a);
+              n(a);
           }
         };
-        k.MAX_SURFACES = 8;
-        return k;
+        f.MAX_SURFACES = 8;
+        return f;
       }();
-      g.WebGLContext = k;
-    })(r.WebGL || (r.WebGL = {}));
-  })(l.GFX || (l.GFX = {}));
+      g.WebGLContext = f;
+    })(p.WebGL || (p.WebGL = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-__extends = this.__extends || function(l, r) {
+__extends = this.__extends || function(k, p) {
   function g() {
-    this.constructor = l;
+    this.constructor = k;
   }
-  for (var c in r) {
-    r.hasOwnProperty(c) && (l[c] = r[c]);
+  for (var b in p) {
+    p.hasOwnProperty(b) && (k[b] = p[b]);
   }
-  g.prototype = r.prototype;
-  l.prototype = new g;
+  g.prototype = p.prototype;
+  k.prototype = new g;
 };
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.Debug.assert, t = function(a) {
-        function h() {
+      var b = k.Debug.assert, u = function(a) {
+        function d() {
           a.apply(this, arguments);
         }
-        __extends(h, a);
-        h.prototype.ensureVertexCapacity = function(a) {
-          c(0 === (this._offset & 3));
+        __extends(d, a);
+        d.prototype.ensureVertexCapacity = function(a) {
+          b(0 === (this._offset & 3));
           this.ensureCapacity(this._offset + 8 * a);
         };
-        h.prototype.writeVertex = function(a, h) {
-          c(0 === (this._offset & 3));
+        d.prototype.writeVertex = function(a, d) {
+          b(0 === (this._offset & 3));
           this.ensureCapacity(this._offset + 8);
-          this.writeVertexUnsafe(a, h);
+          this.writeVertexUnsafe(a, d);
         };
-        h.prototype.writeVertexUnsafe = function(a, c) {
-          var h = this._offset >> 2;
-          this._f32[h] = a;
-          this._f32[h + 1] = c;
+        d.prototype.writeVertexUnsafe = function(a, b) {
+          var d = this._offset >> 2;
+          this._f32[d] = a;
+          this._f32[d + 1] = b;
           this._offset += 8;
         };
-        h.prototype.writeVertex3D = function(a, h, g) {
-          c(0 === (this._offset & 3));
+        d.prototype.writeVertex3D = function(a, d, g) {
+          b(0 === (this._offset & 3));
           this.ensureCapacity(this._offset + 12);
-          this.writeVertex3DUnsafe(a, h, g);
+          this.writeVertex3DUnsafe(a, d, g);
         };
-        h.prototype.writeVertex3DUnsafe = function(a, c, h) {
+        d.prototype.writeVertex3DUnsafe = function(a, b, d) {
           var g = this._offset >> 2;
           this._f32[g] = a;
-          this._f32[g + 1] = c;
-          this._f32[g + 2] = h;
+          this._f32[g + 1] = b;
+          this._f32[g + 2] = d;
           this._offset += 12;
         };
-        h.prototype.writeTriangleElements = function(a, h, g) {
-          c(0 === (this._offset & 1));
+        d.prototype.writeTriangleElements = function(a, d, g) {
+          b(0 === (this._offset & 1));
           this.ensureCapacity(this._offset + 6);
-          var n = this._offset >> 1;
-          this._u16[n] = a;
-          this._u16[n + 1] = h;
-          this._u16[n + 2] = g;
+          var m = this._offset >> 1;
+          this._u16[m] = a;
+          this._u16[m + 1] = d;
+          this._u16[m + 2] = g;
           this._offset += 6;
         };
-        h.prototype.ensureColorCapacity = function(a) {
-          c(0 === (this._offset & 2));
+        d.prototype.ensureColorCapacity = function(a) {
+          b(0 === (this._offset & 2));
           this.ensureCapacity(this._offset + 16 * a);
         };
-        h.prototype.writeColorFloats = function(a, h, g, n) {
-          c(0 === (this._offset & 2));
+        d.prototype.writeColorFloats = function(a, d, g, m) {
+          b(0 === (this._offset & 2));
           this.ensureCapacity(this._offset + 16);
-          this.writeColorFloatsUnsafe(a, h, g, n);
+          this.writeColorFloatsUnsafe(a, d, g, m);
         };
-        h.prototype.writeColorFloatsUnsafe = function(a, c, h, g) {
-          var m = this._offset >> 2;
-          this._f32[m] = a;
-          this._f32[m + 1] = c;
-          this._f32[m + 2] = h;
-          this._f32[m + 3] = g;
+        d.prototype.writeColorFloatsUnsafe = function(a, b, d, g) {
+          var h = this._offset >> 2;
+          this._f32[h] = a;
+          this._f32[h + 1] = b;
+          this._f32[h + 2] = d;
+          this._f32[h + 3] = g;
           this._offset += 16;
         };
-        h.prototype.writeColor = function() {
-          var a = Math.random(), h = Math.random(), g = Math.random(), n = Math.random() / 2;
-          c(0 === (this._offset & 3));
+        d.prototype.writeColor = function() {
+          var a = Math.random(), d = Math.random(), g = Math.random(), m = Math.random() / 2;
+          b(0 === (this._offset & 3));
           this.ensureCapacity(this._offset + 4);
-          this._i32[this._offset >> 2] = n << 24 | g << 16 | h << 8 | a;
+          this._i32[this._offset >> 2] = m << 24 | g << 16 | d << 8 | a;
           this._offset += 4;
         };
-        h.prototype.writeColorUnsafe = function(a, c, h, g) {
-          this._i32[this._offset >> 2] = g << 24 | h << 16 | c << 8 | a;
+        d.prototype.writeColorUnsafe = function(a, b, d, g) {
+          this._i32[this._offset >> 2] = g << 24 | d << 16 | b << 8 | a;
           this._offset += 4;
         };
-        h.prototype.writeRandomColor = function() {
+        d.prototype.writeRandomColor = function() {
           this.writeColor();
         };
-        return h;
-      }(l.ArrayUtilities.ArrayWriter);
-      g.BufferWriter = t;
+        return d;
+      }(k.ArrayUtilities.ArrayWriter);
+      g.BufferWriter = u;
       g.WebGLAttribute = function() {
-        return function(a, c, g, k) {
-          void 0 === k && (k = !1);
+        return function(a, b, g, f) {
+          void 0 === f && (f = !1);
           this.name = a;
-          this.size = c;
+          this.size = b;
           this.type = g;
-          this.normalized = k;
+          this.normalized = f;
         };
       }();
-      var m = function() {
+      var h = function() {
         function a(a) {
           this.size = 0;
           this.attributes = a;
         }
         a.prototype.initialize = function(a) {
-          for (var c = 0, g = 0;g < this.attributes.length;g++) {
-            this.attributes[g].offset = c, c += a.sizeOf(this.attributes[g].type) * this.attributes[g].size;
+          for (var b = 0, f = 0;f < this.attributes.length;f++) {
+            this.attributes[f].offset = b, b += a.sizeOf(this.attributes[f].type) * this.attributes[f].size;
           }
-          this.size = c;
+          this.size = b;
         };
         return a;
       }();
-      g.WebGLAttributeList = m;
-      m = function() {
+      g.WebGLAttributeList = h;
+      h = function() {
         function a(a) {
           this._elementOffset = this.triangleCount = 0;
           this.context = a;
-          this.array = new t(8);
+          this.array = new u(8);
           this.buffer = a.gl.createBuffer();
-          this.elementArray = new t(8);
+          this.elementArray = new u(8);
           this.elementBuffer = a.gl.createBuffer();
         }
         Object.defineProperty(a.prototype, "elementOffset", {get:function() {
@@ -10607,21 +10655,21 @@
         };
         return a;
       }();
-      g.WebGLGeometry = m;
-      m = function(a) {
-        function c(h, g, m) {
-          a.call(this, h, g, m);
-        }
-        __extends(c, a);
-        c.createEmptyVertices = function(a, c) {
-          for (var h = [], g = 0;g < c;g++) {
-            h.push(new a(0, 0, 0));
+      g.WebGLGeometry = h;
+      h = function(a) {
+        function b(d, f, g) {
+          a.call(this, d, f, g);
+        }
+        __extends(b, a);
+        b.createEmptyVertices = function(a, b) {
+          for (var d = [], g = 0;g < b;g++) {
+            d.push(new a(0, 0, 0));
           }
-          return h;
+          return d;
         };
-        return c;
-      }(r.Geometry.Point3D);
-      g.Vertex = m;
+        return b;
+      }(p.Geometry.Point3D);
+      g.Vertex = h;
       (function(a) {
         a[a.ZERO = 0] = "ZERO";
         a[a.ONE = 1] = "ONE";
@@ -10639,48 +10687,48 @@
         a[a.CONSTANT_ALPHA = 32771] = "CONSTANT_ALPHA";
         a[a.ONE_MINUS_CONSTANT_ALPHA = 32772] = "ONE_MINUS_CONSTANT_ALPHA";
       })(g.WebGLBlendFactor || (g.WebGLBlendFactor = {}));
-    })(r.WebGL || (r.WebGL = {}));
-  })(l.GFX || (l.GFX = {}));
+    })(p.WebGL || (p.WebGL = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      var c = function() {
-        function c(a, h, g) {
+      var b = function() {
+        function b(a, d, g) {
           this.texture = g;
           this.w = a;
-          this.h = h;
-          this._regionAllocator = new l.RegionAllocator.CompactAllocator(this.w, this.h);
+          this.h = d;
+          this._regionAllocator = new k.RegionAllocator.CompactAllocator(this.w, this.h);
         }
-        c.prototype.allocate = function(a, c) {
-          var g = this._regionAllocator.allocate(a, c);
-          return g ? new t(this, g) : null;
+        b.prototype.allocate = function(a, b) {
+          var g = this._regionAllocator.allocate(a, b);
+          return g ? new u(this, g) : null;
         };
-        c.prototype.free = function(a) {
+        b.prototype.free = function(a) {
           this._regionAllocator.free(a.region);
         };
-        return c;
+        return b;
       }();
-      g.WebGLSurface = c;
-      var t = function() {
-        return function(c, a) {
-          this.surface = c;
+      g.WebGLSurface = b;
+      var u = function() {
+        return function(b, a) {
+          this.surface = b;
           this.region = a;
           this.next = this.previous = null;
         };
       }();
-      g.WebGLSurfaceRegion = t;
-    })(l.WebGL || (l.WebGL = {}));
-  })(l.GFX || (l.GFX = {}));
+      g.WebGLSurfaceRegion = u;
+    })(k.WebGL || (k.WebGL = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.Color;
+      var b = k.Color;
       g.TILE_SIZE = 256;
       g.MIN_UNTILED_SIZE = 256;
-      var t = r.Geometry.Matrix, m = r.Geometry.Rectangle, a = function(a) {
-        function c() {
+      var u = p.Geometry.Matrix, h = p.Geometry.Rectangle, a = function(a) {
+        function b() {
           a.apply(this, arguments);
           this.maxSurfaces = 8;
           this.maxSurfaceSize = 4096;
@@ -10695,20 +10743,20 @@
           this.sourceBlendFactor = 1;
           this.destinationBlendFactor = 771;
         }
-        __extends(c, a);
-        return c;
-      }(r.RendererOptions);
+        __extends(b, a);
+        return b;
+      }(p.RendererOptions);
       g.WebGLRendererOptions = a;
-      var h = function(h) {
-        function k(c, n, k) {
-          void 0 === k && (k = new a);
-          h.call(this, c, n, k);
+      var d = function(d) {
+        function f(b, f, h) {
+          void 0 === h && (h = new a);
+          d.call(this, b, f, h);
           this._tmpVertices = g.Vertex.createEmptyVertices(g.Vertex, 64);
           this._cachedTiles = [];
-          c = this._context = new g.WebGLContext(this._canvas, k);
+          b = this._context = new g.WebGLContext(this._canvas, h);
           this._updateSize();
-          this._brush = new g.WebGLCombinedBrush(c, new g.WebGLGeometry(c));
-          this._stencilBrush = new g.WebGLCombinedBrush(c, new g.WebGLGeometry(c));
+          this._brush = new g.WebGLCombinedBrush(b, new g.WebGLGeometry(b));
+          this._stencilBrush = new g.WebGLCombinedBrush(b, new g.WebGLGeometry(b));
           this._scratchCanvas = document.createElement("canvas");
           this._scratchCanvas.width = this._scratchCanvas.height = 2048;
           this._scratchCanvasContext = this._scratchCanvas.getContext("2d", {willReadFrequently:!0});
@@ -10718,99 +10766,99 @@
           this._uploadCanvas = document.createElement("canvas");
           this._uploadCanvas.width = this._uploadCanvas.height = 0;
           this._uploadCanvasContext = this._uploadCanvas.getContext("2d", {willReadFrequently:!0});
-          k.showTemporaryCanvases && (document.getElementById("temporaryCanvasPanelContainer").appendChild(this._uploadCanvas), document.getElementById("temporaryCanvasPanelContainer").appendChild(this._scratchCanvas));
+          h.showTemporaryCanvases && (document.getElementById("temporaryCanvasPanelContainer").appendChild(this._uploadCanvas), document.getElementById("temporaryCanvasPanelContainer").appendChild(this._scratchCanvas));
           this._clipStack = [];
         }
-        __extends(k, h);
-        k.prototype.resize = function() {
+        __extends(f, d);
+        f.prototype.resize = function() {
           this._updateSize();
           this.render();
         };
-        k.prototype._updateSize = function() {
-          this._viewport = new m(0, 0, this._canvas.width, this._canvas.height);
+        f.prototype._updateSize = function() {
+          this._viewport = new h(0, 0, this._canvas.width, this._canvas.height);
           this._context._resize();
         };
-        k.prototype._cacheImageCallback = function(a, c, h) {
-          var g = h.w, d = h.h, e = h.x;
-          h = h.y;
-          this._uploadCanvas.width = g + 2;
-          this._uploadCanvas.height = d + 2;
-          this._uploadCanvasContext.drawImage(c.canvas, e, h, g, d, 1, 1, g, d);
-          this._uploadCanvasContext.drawImage(c.canvas, e, h, g, 1, 1, 0, g, 1);
-          this._uploadCanvasContext.drawImage(c.canvas, e, h + d - 1, g, 1, 1, d + 1, g, 1);
-          this._uploadCanvasContext.drawImage(c.canvas, e, h, 1, d, 0, 1, 1, d);
-          this._uploadCanvasContext.drawImage(c.canvas, e + g - 1, h, 1, d, g + 1, 1, 1, d);
+        f.prototype._cacheImageCallback = function(a, b, d) {
+          var f = d.w, g = d.h, h = d.x;
+          d = d.y;
+          this._uploadCanvas.width = f + 2;
+          this._uploadCanvas.height = g + 2;
+          this._uploadCanvasContext.drawImage(b.canvas, h, d, f, g, 1, 1, f, g);
+          this._uploadCanvasContext.drawImage(b.canvas, h, d, f, 1, 1, 0, f, 1);
+          this._uploadCanvasContext.drawImage(b.canvas, h, d + g - 1, f, 1, 1, g + 1, f, 1);
+          this._uploadCanvasContext.drawImage(b.canvas, h, d, 1, g, 0, 1, 1, g);
+          this._uploadCanvasContext.drawImage(b.canvas, h + f - 1, d, 1, g, f + 1, 1, 1, g);
           return a && a.surface ? (this._options.disableSurfaceUploads || this._context.updateSurfaceRegion(this._uploadCanvas, a), a) : this._context.cacheImage(this._uploadCanvas);
         };
-        k.prototype._enterClip = function(a, c, h, g) {
-          h.flush();
-          c = this._context.gl;
-          0 === this._clipStack.length && (c.enable(c.STENCIL_TEST), c.clear(c.STENCIL_BUFFER_BIT), c.stencilFunc(c.ALWAYS, 1, 1));
+        f.prototype._enterClip = function(a, b, d, f) {
+          d.flush();
+          b = this._context.gl;
+          0 === this._clipStack.length && (b.enable(b.STENCIL_TEST), b.clear(b.STENCIL_BUFFER_BIT), b.stencilFunc(b.ALWAYS, 1, 1));
           this._clipStack.push(a);
-          c.colorMask(!1, !1, !1, !1);
-          c.stencilOp(c.KEEP, c.KEEP, c.INCR);
-          h.flush();
-          c.colorMask(!0, !0, !0, !0);
-          c.stencilFunc(c.NOTEQUAL, 0, this._clipStack.length);
-          c.stencilOp(c.KEEP, c.KEEP, c.KEEP);
-        };
-        k.prototype._leaveClip = function(a, c, h, g) {
-          h.flush();
-          c = this._context.gl;
+          b.colorMask(!1, !1, !1, !1);
+          b.stencilOp(b.KEEP, b.KEEP, b.INCR);
+          d.flush();
+          b.colorMask(!0, !0, !0, !0);
+          b.stencilFunc(b.NOTEQUAL, 0, this._clipStack.length);
+          b.stencilOp(b.KEEP, b.KEEP, b.KEEP);
+        };
+        f.prototype._leaveClip = function(a, b, d, f) {
+          d.flush();
+          b = this._context.gl;
           if (a = this._clipStack.pop()) {
-            c.colorMask(!1, !1, !1, !1), c.stencilOp(c.KEEP, c.KEEP, c.DECR), h.flush(), c.colorMask(!0, !0, !0, !0), c.stencilFunc(c.NOTEQUAL, 0, this._clipStack.length), c.stencilOp(c.KEEP, c.KEEP, c.KEEP);
+            b.colorMask(!1, !1, !1, !1), b.stencilOp(b.KEEP, b.KEEP, b.DECR), d.flush(), b.colorMask(!0, !0, !0, !0), b.stencilFunc(b.NOTEQUAL, 0, this._clipStack.length), b.stencilOp(b.KEEP, b.KEEP, b.KEEP);
           }
-          0 === this._clipStack.length && c.disable(c.STENCIL_TEST);
+          0 === this._clipStack.length && b.disable(b.STENCIL_TEST);
         };
-        k.prototype._renderFrame = function(a, c, h, g) {
+        f.prototype._renderFrame = function(a, b, d, f) {
         };
-        k.prototype._renderSurfaces = function(a) {
-          var h = this._options, k = this._context, l = this._viewport;
-          if (h.drawSurfaces) {
-            var d = k.surfaces, k = t.createIdentity();
-            if (0 <= h.drawSurface && h.drawSurface < d.length) {
-              for (var h = d[h.drawSurface | 0], d = new m(0, 0, h.w, h.h), e = d.clone();e.w > l.w;) {
-                e.scale(.5, .5);
+        f.prototype._renderSurfaces = function(a) {
+          var d = this._options, f = this._context, k = this._viewport;
+          if (d.drawSurfaces) {
+            var n = f.surfaces, f = u.createIdentity();
+            if (0 <= d.drawSurface && d.drawSurface < n.length) {
+              for (var d = n[d.drawSurface | 0], n = new h(0, 0, d.w, d.h), l = n.clone();l.w > k.w;) {
+                l.scale(.5, .5);
               }
-              a.drawImage(new g.WebGLSurfaceRegion(h, d), e, c.White, null, k, .2);
+              a.drawImage(new g.WebGLSurfaceRegion(d, n), l, b.White, null, f, .2);
             } else {
-              e = l.w / 5;
-              e > l.h / d.length && (e = l.h / d.length);
-              a.fillRectangle(new m(l.w - e, 0, e, l.h), new c(0, 0, 0, .5), k, .1);
-              for (var b = 0;b < d.length;b++) {
-                var h = d[b], f = new m(l.w - e, b * e, e, e);
-                a.drawImage(new g.WebGLSurfaceRegion(h, new m(0, 0, h.w, h.h)), f, c.White, null, k, .2);
+              l = k.w / 5;
+              l > k.h / n.length && (l = k.h / n.length);
+              a.fillRectangle(new h(k.w - l, 0, l, k.h), new b(0, 0, 0, .5), f, .1);
+              for (var c = 0;c < n.length;c++) {
+                var d = n[c], e = new h(k.w - l, c * l, l, l);
+                a.drawImage(new g.WebGLSurfaceRegion(d, new h(0, 0, d.w, d.h)), e, b.White, null, f, .2);
               }
             }
             a.flush();
           }
         };
-        k.prototype.render = function() {
-          var a = this._options, h = this._context.gl;
+        f.prototype.render = function() {
+          var a = this._options, d = this._context.gl;
           this._context.modelViewProjectionMatrix = a.perspectiveCamera ? this._context.createPerspectiveMatrix(a.perspectiveCameraDistance + (a.animateZoom ? .8 * Math.sin(Date.now() / 3E3) : 0), a.perspectiveCameraFOV, a.perspectiveCameraAngle) : this._context.create2DProjectionMatrix();
-          var g = this._brush;
-          h.clearColor(0, 0, 0, 0);
-          h.clear(h.COLOR_BUFFER_BIT | h.DEPTH_BUFFER_BIT);
-          g.reset();
-          h = this._viewport;
-          g.flush();
-          a.paintViewport && (g.fillRectangle(h, new c(.5, 0, 0, .25), t.createIdentity(), 0), g.flush());
-          this._renderSurfaces(g);
-        };
-        return k;
-      }(r.Renderer);
-      g.WebGLRenderer = h;
-    })(r.WebGL || (r.WebGL = {}));
-  })(l.GFX || (l.GFX = {}));
+          var f = this._brush;
+          d.clearColor(0, 0, 0, 0);
+          d.clear(d.COLOR_BUFFER_BIT | d.DEPTH_BUFFER_BIT);
+          f.reset();
+          d = this._viewport;
+          f.flush();
+          a.paintViewport && (f.fillRectangle(d, new b(.5, 0, 0, .25), u.createIdentity(), 0), f.flush());
+          this._renderSurfaces(f);
+        };
+        return f;
+      }(p.Renderer);
+      g.WebGLRenderer = d;
+    })(p.WebGL || (p.WebGL = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.Color, t = r.Geometry.Point, m = r.Geometry.Matrix3D, a = function() {
-        function a(c, h, g) {
+      var b = k.Color, u = p.Geometry.Point, h = p.Geometry.Matrix3D, a = function() {
+        function a(b, d, g) {
           this._target = g;
-          this._context = c;
-          this._geometry = h;
+          this._context = b;
+          this._geometry = d;
         }
         a.prototype.reset = function() {
         };
@@ -10830,20 +10878,20 @@
         a[a.FillTexture = 1] = "FillTexture";
         a[a.FillTextureWithColorMatrix = 2] = "FillTextureWithColorMatrix";
       })(g.WebGLCombinedBrushKind || (g.WebGLCombinedBrushKind = {}));
-      var h = function(a) {
-        function h(g, k, l) {
-          a.call(this, g, k, l);
+      var d = function(a) {
+        function d(f, g, h) {
+          a.call(this, f, g, h);
           this.kind = 0;
-          this.color = new c(0, 0, 0, 0);
+          this.color = new b(0, 0, 0, 0);
           this.sampler = 0;
-          this.coordinate = new t(0, 0);
+          this.coordinate = new u(0, 0);
         }
-        __extends(h, a);
-        h.initializeAttributeList = function(a) {
-          var c = a.gl;
-          h.attributeList || (h.attributeList = new g.WebGLAttributeList([new g.WebGLAttribute("aPosition", 3, c.FLOAT), new g.WebGLAttribute("aCoordinate", 2, c.FLOAT), new g.WebGLAttribute("aColor", 4, c.UNSIGNED_BYTE, !0), new g.WebGLAttribute("aKind", 1, c.FLOAT), new g.WebGLAttribute("aSampler", 1, c.FLOAT)]), h.attributeList.initialize(a));
+        __extends(d, a);
+        d.initializeAttributeList = function(a) {
+          var b = a.gl;
+          d.attributeList || (d.attributeList = new g.WebGLAttributeList([new g.WebGLAttribute("aPosition", 3, b.FLOAT), new g.WebGLAttribute("aCoordinate", 2, b.FLOAT), new g.WebGLAttribute("aColor", 4, b.UNSIGNED_BYTE, !0), new g.WebGLAttribute("aKind", 1, b.FLOAT), new g.WebGLAttribute("aSampler", 1, b.FLOAT)]), d.attributeList.initialize(a));
         };
-        h.prototype.writeTo = function(a) {
+        d.prototype.writeTo = function(a) {
           a = a.array;
           a.ensureAdditionalCapacity();
           a.writeVertex3DUnsafe(this.x, this.y, this.z);
@@ -10852,107 +10900,107 @@
           a.writeFloatUnsafe(this.kind);
           a.writeFloatUnsafe(this.sampler);
         };
-        return h;
+        return d;
       }(g.Vertex);
-      g.WebGLCombinedBrushVertex = h;
+      g.WebGLCombinedBrushVertex = d;
       a = function(a) {
-        function c(g, k, l) {
-          void 0 === l && (l = null);
-          a.call(this, g, k, l);
+        function b(f, g, h) {
+          void 0 === h && (h = null);
+          a.call(this, f, g, h);
           this._blendMode = 1;
-          this._program = g.createProgramFromFiles();
+          this._program = f.createProgramFromFiles();
           this._surfaces = [];
-          h.initializeAttributeList(this._context);
+          d.initializeAttributeList(this._context);
         }
-        __extends(c, a);
-        c.prototype.reset = function() {
+        __extends(b, a);
+        b.prototype.reset = function() {
           this._surfaces = [];
           this._geometry.reset();
         };
-        c.prototype.drawImage = function(a, h, g, l, d, e, b) {
-          void 0 === e && (e = 0);
-          void 0 === b && (b = 1);
+        b.prototype.drawImage = function(a, d, g, h, k, l, c) {
+          void 0 === l && (l = 0);
+          void 0 === c && (c = 1);
           if (!a || !a.surface) {
             return!0;
           }
-          h = h.clone();
-          this._colorMatrix && (l && this._colorMatrix.equals(l) || this.flush());
-          this._colorMatrix = l;
-          this._blendMode !== b && (this.flush(), this._blendMode = b);
-          b = this._surfaces.indexOf(a.surface);
-          0 > b && (8 === this._surfaces.length && this.flush(), this._surfaces.push(a.surface), b = this._surfaces.length - 1);
-          var f = c._tmpVertices, q = a.region.clone();
+          d = d.clone();
+          this._colorMatrix && (h && this._colorMatrix.equals(h) || this.flush());
+          this._colorMatrix = h;
+          this._blendMode !== c && (this.flush(), this._blendMode = c);
+          c = this._surfaces.indexOf(a.surface);
+          0 > c && (8 === this._surfaces.length && this.flush(), this._surfaces.push(a.surface), c = this._surfaces.length - 1);
+          var e = b._tmpVertices, q = a.region.clone();
           q.offset(1, 1).resize(-2, -2);
           q.scale(1 / a.surface.w, 1 / a.surface.h);
-          d.transformRectangle(h, f);
+          k.transformRectangle(d, e);
           for (a = 0;4 > a;a++) {
-            f[a].z = e;
+            e[a].z = l;
           }
-          f[0].coordinate.x = q.x;
-          f[0].coordinate.y = q.y;
-          f[1].coordinate.x = q.x + q.w;
-          f[1].coordinate.y = q.y;
-          f[2].coordinate.x = q.x + q.w;
-          f[2].coordinate.y = q.y + q.h;
-          f[3].coordinate.x = q.x;
-          f[3].coordinate.y = q.y + q.h;
+          e[0].coordinate.x = q.x;
+          e[0].coordinate.y = q.y;
+          e[1].coordinate.x = q.x + q.w;
+          e[1].coordinate.y = q.y;
+          e[2].coordinate.x = q.x + q.w;
+          e[2].coordinate.y = q.y + q.h;
+          e[3].coordinate.x = q.x;
+          e[3].coordinate.y = q.y + q.h;
           for (a = 0;4 > a;a++) {
-            e = c._tmpVertices[a], e.kind = l ? 2 : 1, e.color.set(g), e.sampler = b, e.writeTo(this._geometry);
+            l = b._tmpVertices[a], l.kind = h ? 2 : 1, l.color.set(g), l.sampler = c, l.writeTo(this._geometry);
           }
           this._geometry.addQuad();
           return!0;
         };
-        c.prototype.fillRectangle = function(a, h, g, l) {
-          void 0 === l && (l = 0);
-          g.transformRectangle(a, c._tmpVertices);
+        b.prototype.fillRectangle = function(a, d, g, h) {
+          void 0 === h && (h = 0);
+          g.transformRectangle(a, b._tmpVertices);
           for (a = 0;4 > a;a++) {
-            g = c._tmpVertices[a], g.kind = 0, g.color.set(h), g.z = l, g.writeTo(this._geometry);
+            g = b._tmpVertices[a], g.kind = 0, g.color.set(d), g.z = h, g.writeTo(this._geometry);
           }
           this._geometry.addQuad();
         };
-        c.prototype.flush = function() {
-          var a = this._geometry, c = this._program, g = this._context.gl, k;
+        b.prototype.flush = function() {
+          var a = this._geometry, b = this._program, f = this._context.gl, g;
           a.uploadBuffers();
-          g.useProgram(c);
-          this._target ? (k = m.create2DProjection(this._target.w, this._target.h, 2E3), k = m.createMultiply(k, m.createScale(1, -1, 1))) : k = this._context.modelViewProjectionMatrix;
-          g.uniformMatrix4fv(c.uniforms.uTransformMatrix3D.location, !1, k.asWebGLMatrix());
-          this._colorMatrix && (g.uniformMatrix4fv(c.uniforms.uColorMatrix.location, !1, this._colorMatrix.asWebGLMatrix()), g.uniform4fv(c.uniforms.uColorVector.location, this._colorMatrix.asWebGLVector()));
-          for (k = 0;k < this._surfaces.length;k++) {
-            g.activeTexture(g.TEXTURE0 + k), g.bindTexture(g.TEXTURE_2D, this._surfaces[k].texture);
-          }
-          g.uniform1iv(c.uniforms["uSampler[0]"].location, [0, 1, 2, 3, 4, 5, 6, 7]);
-          g.bindBuffer(g.ARRAY_BUFFER, a.buffer);
-          var d = h.attributeList.size, e = h.attributeList.attributes;
-          for (k = 0;k < e.length;k++) {
-            var b = e[k], f = c.attributes[b.name].location;
-            g.enableVertexAttribArray(f);
-            g.vertexAttribPointer(f, b.size, b.type, b.normalized, d, b.offset);
+          f.useProgram(b);
+          this._target ? (g = h.create2DProjection(this._target.w, this._target.h, 2E3), g = h.createMultiply(g, h.createScale(1, -1, 1))) : g = this._context.modelViewProjectionMatrix;
+          f.uniformMatrix4fv(b.uniforms.uTransformMatrix3D.location, !1, g.asWebGLMatrix());
+          this._colorMatrix && (f.uniformMatrix4fv(b.uniforms.uColorMatrix.location, !1, this._colorMatrix.asWebGLMatrix()), f.uniform4fv(b.uniforms.uColorVector.location, this._colorMatrix.asWebGLVector()));
+          for (g = 0;g < this._surfaces.length;g++) {
+            f.activeTexture(f.TEXTURE0 + g), f.bindTexture(f.TEXTURE_2D, this._surfaces[g].texture);
+          }
+          f.uniform1iv(b.uniforms["uSampler[0]"].location, [0, 1, 2, 3, 4, 5, 6, 7]);
+          f.bindBuffer(f.ARRAY_BUFFER, a.buffer);
+          var k = d.attributeList.size, l = d.attributeList.attributes;
+          for (g = 0;g < l.length;g++) {
+            var c = l[g], e = b.attributes[c.name].location;
+            f.enableVertexAttribArray(e);
+            f.vertexAttribPointer(e, c.size, c.type, c.normalized, k, c.offset);
           }
           this._context.setBlendOptions();
           this._context.target = this._target;
-          g.bindBuffer(g.ELEMENT_ARRAY_BUFFER, a.elementBuffer);
-          g.drawElements(g.TRIANGLES, 3 * a.triangleCount, g.UNSIGNED_SHORT, 0);
+          f.bindBuffer(f.ELEMENT_ARRAY_BUFFER, a.elementBuffer);
+          f.drawElements(f.TRIANGLES, 3 * a.triangleCount, f.UNSIGNED_SHORT, 0);
           this.reset();
         };
-        c._tmpVertices = g.Vertex.createEmptyVertices(h, 4);
-        c._depth = 1;
-        return c;
+        b._tmpVertices = g.Vertex.createEmptyVertices(d, 4);
+        b._depth = 1;
+        return b;
       }(a);
       g.WebGLCombinedBrush = a;
-    })(r.WebGL || (r.WebGL = {}));
-  })(l.GFX || (l.GFX = {}));
+    })(p.WebGL || (p.WebGL = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(l) {
+(function(k) {
+  (function(k) {
     (function(g) {
-      var c = CanvasRenderingContext2D.prototype.save, l = CanvasRenderingContext2D.prototype.clip, m = CanvasRenderingContext2D.prototype.fill, a = CanvasRenderingContext2D.prototype.stroke, h = CanvasRenderingContext2D.prototype.restore, p = CanvasRenderingContext2D.prototype.beginPath;
+      var b = CanvasRenderingContext2D.prototype.save, k = CanvasRenderingContext2D.prototype.clip, h = CanvasRenderingContext2D.prototype.fill, a = CanvasRenderingContext2D.prototype.stroke, d = CanvasRenderingContext2D.prototype.restore, n = CanvasRenderingContext2D.prototype.beginPath;
       g.notifyReleaseChanged = function() {
-        CanvasRenderingContext2D.prototype.save = c;
-        CanvasRenderingContext2D.prototype.clip = l;
-        CanvasRenderingContext2D.prototype.fill = m;
+        CanvasRenderingContext2D.prototype.save = b;
+        CanvasRenderingContext2D.prototype.clip = k;
+        CanvasRenderingContext2D.prototype.fill = h;
         CanvasRenderingContext2D.prototype.stroke = a;
-        CanvasRenderingContext2D.prototype.restore = h;
-        CanvasRenderingContext2D.prototype.beginPath = p;
+        CanvasRenderingContext2D.prototype.restore = d;
+        CanvasRenderingContext2D.prototype.beginPath = n;
       };
       CanvasRenderingContext2D.prototype.enterBuildingClippingRegion = function() {
         this.buildingClippingRegionDepth || (this.buildingClippingRegionDepth = 0);
@@ -10961,178 +11009,178 @@
       CanvasRenderingContext2D.prototype.leaveBuildingClippingRegion = function() {
         this.buildingClippingRegionDepth--;
       };
-    })(l.Canvas2D || (l.Canvas2D = {}));
-  })(l.GFX || (l.GFX = {}));
+    })(k.Canvas2D || (k.Canvas2D = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      function c(a) {
-        var c = "source-over";
+      function b(a) {
+        var b = "source-over";
         switch(a) {
           case 1:
           ;
           case 2:
             break;
           case 3:
-            c = "multiply";
+            b = "multiply";
             break;
           case 8:
           ;
           case 4:
-            c = "screen";
+            b = "screen";
             break;
           case 5:
-            c = "lighten";
+            b = "lighten";
             break;
           case 6:
-            c = "darken";
+            b = "darken";
             break;
           case 7:
-            c = "difference";
+            b = "difference";
             break;
           case 13:
-            c = "overlay";
+            b = "overlay";
             break;
           case 14:
-            c = "hard-light";
+            b = "hard-light";
             break;
           case 11:
-            c = "destination-in";
+            b = "destination-in";
             break;
           case 12:
-            c = "destination-out";
+            b = "destination-out";
             break;
           default:
-            l.Debug.somewhatImplemented("Blend Mode: " + r.BlendMode[a]);
+            k.Debug.somewhatImplemented("Blend Mode: " + p.BlendMode[a]);
         }
-        return c;
+        return b;
       }
-      var t = l.NumberUtilities.clamp;
+      var u = k.NumberUtilities.clamp;
       navigator.userAgent.indexOf("Firefox");
-      var m = function() {
+      var h = function() {
         function a() {
         }
         a._prepareSVGFilters = function() {
           if (!a._svgBlurFilter) {
-            var c = document.createElementNS("http://www.w3.org/2000/svg", "svg"), g = document.createElementNS("http://www.w3.org/2000/svg", "defs"), l = document.createElementNS("http://www.w3.org/2000/svg", "filter");
-            l.setAttribute("id", "svgBlurFilter");
-            var n = document.createElementNS("http://www.w3.org/2000/svg", "feGaussianBlur");
-            n.setAttribute("stdDeviation", "0 0");
-            l.appendChild(n);
-            g.appendChild(l);
-            a._svgBlurFilter = n;
-            l = document.createElementNS("http://www.w3.org/2000/svg", "filter");
-            l.setAttribute("id", "svgDropShadowFilter");
-            n = document.createElementNS("http://www.w3.org/2000/svg", "feGaussianBlur");
-            n.setAttribute("in", "SourceAlpha");
-            n.setAttribute("stdDeviation", "3");
-            l.appendChild(n);
-            a._svgDropshadowFilterBlur = n;
-            n = document.createElementNS("http://www.w3.org/2000/svg", "feOffset");
-            n.setAttribute("dx", "0");
-            n.setAttribute("dy", "0");
-            n.setAttribute("result", "offsetblur");
-            l.appendChild(n);
-            a._svgDropshadowFilterOffset = n;
-            n = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
-            n.setAttribute("flood-color", "rgba(0,0,0,1)");
-            l.appendChild(n);
-            a._svgDropshadowFilterFlood = n;
-            n = document.createElementNS("http://www.w3.org/2000/svg", "feComposite");
-            n.setAttribute("in2", "offsetblur");
-            n.setAttribute("operator", "in");
-            l.appendChild(n);
-            var n = document.createElementNS("http://www.w3.org/2000/svg", "feMerge"), m = document.createElementNS("http://www.w3.org/2000/svg", "feMergeNode");
-            n.appendChild(m);
-            m = document.createElementNS("http://www.w3.org/2000/svg", "feMergeNode");
-            m.setAttribute("in", "SourceGraphic");
-            n.appendChild(m);
-            l.appendChild(n);
-            g.appendChild(l);
-            l = document.createElementNS("http://www.w3.org/2000/svg", "filter");
-            l.setAttribute("id", "svgColorMatrixFilter");
-            n = document.createElementNS("http://www.w3.org/2000/svg", "feColorMatrix");
-            n.setAttribute("color-interpolation-filters", "sRGB");
-            n.setAttribute("in", "SourceGraphic");
-            n.setAttribute("type", "matrix");
-            l.appendChild(n);
-            g.appendChild(l);
-            a._svgColorMatrixFilter = n;
-            c.appendChild(g);
-            document.documentElement.appendChild(c);
+            var b = document.createElementNS("http://www.w3.org/2000/svg", "svg"), f = document.createElementNS("http://www.w3.org/2000/svg", "defs"), g = document.createElementNS("http://www.w3.org/2000/svg", "filter");
+            g.setAttribute("id", "svgBlurFilter");
+            var h = document.createElementNS("http://www.w3.org/2000/svg", "feGaussianBlur");
+            h.setAttribute("stdDeviation", "0 0");
+            g.appendChild(h);
+            f.appendChild(g);
+            a._svgBlurFilter = h;
+            g = document.createElementNS("http://www.w3.org/2000/svg", "filter");
+            g.setAttribute("id", "svgDropShadowFilter");
+            h = document.createElementNS("http://www.w3.org/2000/svg", "feGaussianBlur");
+            h.setAttribute("in", "SourceAlpha");
+            h.setAttribute("stdDeviation", "3");
+            g.appendChild(h);
+            a._svgDropshadowFilterBlur = h;
+            h = document.createElementNS("http://www.w3.org/2000/svg", "feOffset");
+            h.setAttribute("dx", "0");
+            h.setAttribute("dy", "0");
+            h.setAttribute("result", "offsetblur");
+            g.appendChild(h);
+            a._svgDropshadowFilterOffset = h;
+            h = document.createElementNS("http://www.w3.org/2000/svg", "feFlood");
+            h.setAttribute("flood-color", "rgba(0,0,0,1)");
+            g.appendChild(h);
+            a._svgDropshadowFilterFlood = h;
+            h = document.createElementNS("http://www.w3.org/2000/svg", "feComposite");
+            h.setAttribute("in2", "offsetblur");
+            h.setAttribute("operator", "in");
+            g.appendChild(h);
+            var h = document.createElementNS("http://www.w3.org/2000/svg", "feMerge"), k = document.createElementNS("http://www.w3.org/2000/svg", "feMergeNode");
+            h.appendChild(k);
+            k = document.createElementNS("http://www.w3.org/2000/svg", "feMergeNode");
+            k.setAttribute("in", "SourceGraphic");
+            h.appendChild(k);
+            g.appendChild(h);
+            f.appendChild(g);
+            g = document.createElementNS("http://www.w3.org/2000/svg", "filter");
+            g.setAttribute("id", "svgColorMatrixFilter");
+            h = document.createElementNS("http://www.w3.org/2000/svg", "feColorMatrix");
+            h.setAttribute("color-interpolation-filters", "sRGB");
+            h.setAttribute("in", "SourceGraphic");
+            h.setAttribute("type", "matrix");
+            g.appendChild(h);
+            f.appendChild(g);
+            a._svgColorMatrixFilter = h;
+            b.appendChild(f);
+            document.documentElement.appendChild(b);
           }
         };
-        a._applyColorMatrixFilter = function(c, g) {
+        a._applyColorMatrixFilter = function(b, f) {
           a._prepareSVGFilters();
-          a._svgColorMatrixFilter.setAttribute("values", g.toSVGFilterMatrix());
-          c.filter = "url(#svgColorMatrixFilter)";
+          a._svgColorMatrixFilter.setAttribute("values", f.toSVGFilterMatrix());
+          b.filter = "url(#svgColorMatrixFilter)";
         };
-        a._applyFilters = function(c, g, m) {
-          function n(a) {
-            var b = c / 2;
+        a._applyFilters = function(b, f, g) {
+          function h(a) {
+            var c = b / 2;
             switch(a) {
               case 0:
                 return 0;
               case 1:
-                return b / 2.7;
+                return c / 2.7;
               case 2:
-                return b / 1.28;
+                return c / 1.28;
               default:
-                return b;
+                return c;
             }
           }
           a._prepareSVGFilters();
-          a._removeFilters(g);
-          for (var s = 0;s < m.length;s++) {
-            var v = m[s];
-            if (v instanceof r.BlurFilter) {
-              var d = v, v = n(d.quality);
-              a._svgBlurFilter.setAttribute("stdDeviation", d.blurX * v + " " + d.blurY * v);
-              g.filter = "url(#svgBlurFilter)";
+          a._removeFilters(f);
+          for (var r = 0;r < g.length;r++) {
+            var w = g[r];
+            if (w instanceof p.BlurFilter) {
+              var t = w, w = h(t.quality);
+              a._svgBlurFilter.setAttribute("stdDeviation", t.blurX * w + " " + t.blurY * w);
+              f.filter = "url(#svgBlurFilter)";
             } else {
-              v instanceof r.DropshadowFilter && (d = v, v = n(d.quality), a._svgDropshadowFilterBlur.setAttribute("stdDeviation", d.blurX * v + " " + d.blurY * v), a._svgDropshadowFilterOffset.setAttribute("dx", String(Math.cos(d.angle * Math.PI / 180) * d.distance * c)), a._svgDropshadowFilterOffset.setAttribute("dy", String(Math.sin(d.angle * Math.PI / 180) * d.distance * c)), a._svgDropshadowFilterFlood.setAttribute("flood-color", l.ColorUtilities.rgbaToCSSStyle(d.color << 8 | Math.round(255 * 
-              d.alpha))), g.filter = "url(#svgDropShadowFilter)");
+              w instanceof p.DropshadowFilter && (t = w, w = h(t.quality), a._svgDropshadowFilterBlur.setAttribute("stdDeviation", t.blurX * w + " " + t.blurY * w), a._svgDropshadowFilterOffset.setAttribute("dx", String(Math.cos(t.angle * Math.PI / 180) * t.distance * b)), a._svgDropshadowFilterOffset.setAttribute("dy", String(Math.sin(t.angle * Math.PI / 180) * t.distance * b)), a._svgDropshadowFilterFlood.setAttribute("flood-color", k.ColorUtilities.rgbaToCSSStyle(t.color << 8 | Math.round(255 * 
+              t.alpha))), f.filter = "url(#svgDropShadowFilter)");
             }
           }
         };
         a._removeFilters = function(a) {
           a.filter = "none";
         };
-        a._applyColorMatrix = function(c, g) {
-          a._removeFilters(c);
-          g.isIdentity() ? (c.globalAlpha = 1, c.globalColorMatrix = null) : g.hasOnlyAlphaMultiplier() ? (c.globalAlpha = t(g.alphaMultiplier, 0, 1), c.globalColorMatrix = null) : (c.globalAlpha = 1, a._svgFiltersAreSupported ? (a._applyColorMatrixFilter(c, g), c.globalColorMatrix = null) : c.globalColorMatrix = g);
+        a._applyColorMatrix = function(b, f) {
+          a._removeFilters(b);
+          f.isIdentity() ? (b.globalAlpha = 1, b.globalColorMatrix = null) : f.hasOnlyAlphaMultiplier() ? (b.globalAlpha = u(f.alphaMultiplier, 0, 1), b.globalColorMatrix = null) : (b.globalAlpha = 1, a._svgFiltersAreSupported ? (a._applyColorMatrixFilter(b, f), b.globalColorMatrix = null) : b.globalColorMatrix = f);
         };
         a._svgFiltersAreSupported = !!Object.getOwnPropertyDescriptor(CanvasRenderingContext2D.prototype, "filter");
         return a;
       }();
-      g.Filters = m;
+      g.Filters = h;
       var a = function() {
-        function a(c, h, g, n) {
-          this.surface = c;
-          this.region = h;
+        function a(b, d, g, h) {
+          this.surface = b;
+          this.region = d;
           this.w = g;
-          this.h = n;
+          this.h = h;
         }
         a.prototype.free = function() {
           this.surface.free(this);
         };
-        a._ensureCopyCanvasSize = function(c, g) {
-          var m;
+        a._ensureCopyCanvasSize = function(b, f) {
+          var g;
           if (a._copyCanvasContext) {
-            if (m = a._copyCanvasContext.canvas, m.width < c || m.height < g) {
-              m.width = l.IntegerUtilities.nearestPowerOfTwo(c), m.height = l.IntegerUtilities.nearestPowerOfTwo(g);
+            if (g = a._copyCanvasContext.canvas, g.width < b || g.height < f) {
+              g.width = k.IntegerUtilities.nearestPowerOfTwo(b), g.height = k.IntegerUtilities.nearestPowerOfTwo(f);
             }
           } else {
-            m = document.createElement("canvas"), "undefined" !== typeof registerScratchCanvas && registerScratchCanvas(m), m.width = 512, m.height = 512, a._copyCanvasContext = m.getContext("2d");
+            g = document.createElement("canvas"), "undefined" !== typeof registerScratchCanvas && registerScratchCanvas(g), g.width = 512, g.height = 512, a._copyCanvasContext = g.getContext("2d");
           }
         };
-        a.prototype.draw = function(g, k, l, n, m, r) {
+        a.prototype.draw = function(g, f, h, m, k, p) {
           this.context.setTransform(1, 0, 0, 1, 0, 0);
-          var d, e = 0, b = 0;
-          g.context.canvas === this.context.canvas ? (a._ensureCopyCanvasSize(n, m), d = a._copyCanvasContext, d.clearRect(0, 0, n, m), d.drawImage(g.surface.canvas, g.region.x, g.region.y, n, m, 0, 0, n, m), d = d.canvas, b = e = 0) : (d = g.surface.canvas, e = g.region.x, b = g.region.y);
+          var t, l = 0, c = 0;
+          g.context.canvas === this.context.canvas ? (a._ensureCopyCanvasSize(m, k), t = a._copyCanvasContext, t.clearRect(0, 0, m, k), t.drawImage(g.surface.canvas, g.region.x, g.region.y, m, k, 0, 0, m, k), t = t.canvas, c = l = 0) : (t = g.surface.canvas, l = g.region.x, c = g.region.y);
           a: {
-            switch(r) {
+            switch(p) {
               case 11:
                 g = !0;
                 break a;
@@ -11140,10 +11188,10 @@
                 g = !1;
             }
           }
-          g && (this.context.save(), this.context.beginPath(), this.context.rect(k, l, n, m), this.context.clip());
-          this.context.globalCompositeOperation = c(r);
-          this.context.drawImage(d, e, b, n, m, k, l, n, m);
-          this.context.globalCompositeOperation = c(1);
+          g && (this.context.save(), this.context.beginPath(), this.context.rect(f, h, m, k), this.context.clip());
+          this.context.globalCompositeOperation = b(p);
+          this.context.drawImage(t, l, c, m, k, f, h, m, k);
+          this.context.globalCompositeOperation = b(1);
           g && this.context.restore();
         };
         Object.defineProperty(a.prototype, "context", {get:function() {
@@ -11159,74 +11207,74 @@
           a.strokeStyle = null;
           a.globalAlpha = 1;
           a.globalColorMatrix = null;
-          a.globalCompositeOperation = c(1);
+          a.globalCompositeOperation = b(1);
         };
         a.prototype.fill = function(a) {
-          var c = this.surface.context, g = this.region;
-          c.fillStyle = a;
-          c.fillRect(g.x, g.y, g.w, g.h);
+          var b = this.surface.context, d = this.region;
+          b.fillStyle = a;
+          b.fillRect(d.x, d.y, d.w, d.h);
         };
         a.prototype.clear = function(a) {
-          var c = this.surface.context, g = this.region;
-          a || (a = g);
-          c.clearRect(a.x, a.y, a.w, a.h);
+          var b = this.surface.context, d = this.region;
+          a || (a = d);
+          b.clearRect(a.x, a.y, a.w, a.h);
         };
         return a;
       }();
       g.Canvas2DSurfaceRegion = a;
-      m = function() {
-        function c(a, g) {
+      h = function() {
+        function b(a, d) {
           this.canvas = a;
           this.context = a.getContext("2d");
           this.w = a.width;
           this.h = a.height;
-          this._regionAllocator = g;
+          this._regionAllocator = d;
         }
-        c.prototype.allocate = function(c, g) {
-          var h = this._regionAllocator.allocate(c, g);
-          return h ? new a(this, h, c, g) : null;
+        b.prototype.allocate = function(b, d) {
+          var g = this._regionAllocator.allocate(b, d);
+          return g ? new a(this, g, b, d) : null;
         };
-        c.prototype.free = function(a) {
+        b.prototype.free = function(a) {
           this._regionAllocator.free(a.region);
         };
-        return c;
+        return b;
       }();
-      g.Canvas2DSurface = m;
-    })(r.Canvas2D || (r.Canvas2D = {}));
-  })(l.GFX || (l.GFX = {}));
+      g.Canvas2DSurface = h;
+    })(p.Canvas2D || (p.Canvas2D = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.Debug.assert, t = l.GFX.Geometry.Rectangle, m = l.GFX.Geometry.Point, a = l.GFX.Geometry.Matrix, h = l.NumberUtilities.clamp, p = l.NumberUtilities.pow2, k = new l.IndentingWriter(!1, dumpLine), u = function() {
-        return function(a, c) {
+      var b = k.Debug.assert, u = k.GFX.Geometry.Rectangle, h = k.GFX.Geometry.Point, a = k.GFX.Geometry.Matrix, d = k.NumberUtilities.clamp, n = k.NumberUtilities.pow2, f = new k.IndentingWriter(!1, dumpLine), v = function() {
+        return function(a, b) {
           this.surfaceRegion = a;
-          this.scale = c;
+          this.scale = b;
         };
       }();
-      g.MipMapLevel = u;
-      var n = function() {
-        function a(b, c, d, e) {
+      g.MipMapLevel = v;
+      var m = function() {
+        function a(b, c, d, f) {
           this._node = c;
           this._levels = [];
           this._surfaceRegionAllocator = d;
-          this._size = e;
+          this._size = f;
           this._renderer = b;
         }
         a.prototype.getLevel = function(a) {
           a = Math.max(a.getAbsoluteScaleX(), a.getAbsoluteScaleY());
           var b = 0;
-          1 !== a && (b = h(Math.round(Math.log(a) / Math.LN2), -5, 3));
-          this._node.hasFlags(2097152) || (b = h(b, -5, 0));
-          a = p(b);
+          1 !== a && (b = d(Math.round(Math.log(a) / Math.LN2), -5, 3));
+          this._node.hasFlags(2097152) || (b = d(b, -5, 0));
+          a = n(b);
           var c = 5 + b, b = this._levels[c];
           if (!b) {
-            var d = this._node.getBounds().clone();
-            d.scale(a, a);
-            d.snap();
-            var e = this._surfaceRegionAllocator.allocate(d.w, d.h, null), g = e.region, b = this._levels[c] = new u(e, a), c = new v(e);
-            c.clip.set(g);
-            c.matrix.setElements(a, 0, 0, a, g.x - d.x, g.y - d.y);
+            var f = this._node.getBounds().clone();
+            f.scale(a, a);
+            f.snap();
+            var g = this._surfaceRegionAllocator.allocate(f.w, f.h, null), h = g.region, b = this._levels[c] = new v(g, a), c = new w(g);
+            c.clip.set(h);
+            c.matrix.setElements(a, 0, 0, a, h.x - f.x, h.y - f.y);
             c.flags |= 64;
             this._renderer.renderNodeWithState(this._node, c);
             c.free();
@@ -11235,13 +11283,13 @@
         };
         return a;
       }();
-      g.MipMap = n;
+      g.MipMap = m;
       (function(a) {
         a[a.NonZero = 0] = "NonZero";
         a[a.EvenOdd = 1] = "EvenOdd";
       })(g.FillRule || (g.FillRule = {}));
-      var s = function(a) {
-        function c() {
+      var r = function(a) {
+        function b() {
           a.apply(this, arguments);
           this.blending = this.imageSmoothing = this.snapToDevicePixels = !0;
           this.debugLayers = !1;
@@ -11251,10 +11299,10 @@
           this.cacheShapesThreshold = 16;
           this.alpha = !1;
         }
-        __extends(c, a);
-        return c;
-      }(r.RendererOptions);
-      g.Canvas2DRendererOptions = s;
+        __extends(b, a);
+        return b;
+      }(p.RendererOptions);
+      g.Canvas2DRendererOptions = r;
       (function(a) {
         a[a.None = 0] = "None";
         a[a.IgnoreNextLayer = 1] = "IgnoreNextLayer";
@@ -11271,120 +11319,121 @@
         a[a.ImageSmoothing = 4096] = "ImageSmoothing";
         a[a.PixelSnapping = 8192] = "PixelSnapping";
       })(g.RenderFlags || (g.RenderFlags = {}));
-      t.createMaxI16();
-      var v = function(b) {
-        function c(d) {
+      u.createMaxI16();
+      var w = function(b) {
+        function d(f) {
           b.call(this);
-          this.clip = t.createEmpty();
+          this.clip = u.createEmpty();
           this.clipList = [];
           this.flags = 0;
           this.target = null;
           this.matrix = a.createIdentity();
-          this.colorMatrix = r.ColorMatrix.createIdentity();
-          c.allocationCount++;
-          this.target = d;
+          this.colorMatrix = p.ColorMatrix.createIdentity();
+          d.allocationCount++;
+          this.target = f;
         }
-        __extends(c, b);
-        c.prototype.set = function(a) {
+        __extends(d, b);
+        d.prototype.set = function(a) {
           this.clip.set(a.clip);
           this.target = a.target;
           this.matrix.set(a.matrix);
           this.colorMatrix.set(a.colorMatrix);
           this.flags = a.flags;
-          l.ArrayUtilities.copyFrom(this.clipList, a.clipList);
+          k.ArrayUtilities.copyFrom(this.clipList, a.clipList);
         };
-        c.prototype.clone = function() {
-          var a = c.allocate();
-          a || (a = new c(this.target));
+        d.prototype.clone = function() {
+          var a = d.allocate();
+          a || (a = new d(this.target));
           a.set(this);
           return a;
         };
-        c.allocate = function() {
-          var a = c._dirtyStack, b = null;
+        d.allocate = function() {
+          var a = d._dirtyStack, b = null;
           a.length && (b = a.pop());
           return b;
         };
-        c.prototype.free = function() {
-          c._dirtyStack.push(this);
+        d.prototype.free = function() {
+          d._dirtyStack.push(this);
         };
-        c.prototype.transform = function(a) {
+        d.prototype.transform = function(a) {
           var b = this.clone();
           b.matrix.preMultiply(a.getMatrix());
           a.hasColorMatrix() && b.colorMatrix.multiply(a.getColorMatrix());
           return b;
         };
-        c.prototype.hasFlags = function(a) {
+        d.prototype.hasFlags = function(a) {
           return(this.flags & a) === a;
         };
-        c.prototype.removeFlags = function(a) {
+        d.prototype.removeFlags = function(a) {
           this.flags &= ~a;
         };
-        c.prototype.toggleFlags = function(a, b) {
+        d.prototype.toggleFlags = function(a, b) {
           this.flags = b ? this.flags | a : this.flags & ~a;
         };
-        c.allocationCount = 0;
-        c._dirtyStack = [];
-        return c;
-      }(r.State);
-      g.RenderState = v;
-      var d = function() {
+        d.allocationCount = 0;
+        d._dirtyStack = [];
+        return d;
+      }(p.State);
+      g.RenderState = w;
+      var t = function() {
         function b() {
           this.culledNodes = this.groups = this.shapes = this._count = 0;
         }
         b.prototype.enter = function(a) {
           this._count++;
-          k && (k.enter("> Frame: " + this._count), this._enterTime = performance.now(), this.culledNodes = this.groups = this.shapes = 0);
+          f && (f.enter("> Frame: " + this._count), this._enterTime = performance.now(), this.culledNodes = this.groups = this.shapes = 0);
         };
         b.prototype.leave = function() {
-          k && (k.writeLn("Shapes: " + this.shapes + ", Groups: " + this.groups + ", Culled Nodes: " + this.culledNodes), k.writeLn("Elapsed: " + (performance.now() - this._enterTime).toFixed(2)), k.writeLn("Rectangle: " + t.allocationCount + ", Matrix: " + a.allocationCount + ", State: " + v.allocationCount), k.leave("<"));
+          f && (f.writeLn("Shapes: " + this.shapes + ", Groups: " + this.groups + ", Culled Nodes: " + this.culledNodes), f.writeLn("Elapsed: " + (performance.now() - this._enterTime).toFixed(2)), f.writeLn("Rectangle: " + u.allocationCount + ", Matrix: " + a.allocationCount + ", State: " + w.allocationCount), f.leave("<"));
         };
         return b;
       }();
-      g.FrameInfo = d;
-      var e = function(b) {
-        function e(a, c, g) {
-          void 0 === g && (g = new s);
-          b.call(this, a, c, g);
+      g.FrameInfo = t;
+      var l = function(c) {
+        function d(a, b, f) {
+          void 0 === f && (f = new r);
+          c.call(this, a, b, f);
           this._visited = 0;
-          this._frameInfo = new d;
+          this._frameInfo = new t;
           this._fontSize = 0;
           this._layers = [];
           if (a instanceof HTMLCanvasElement) {
-            var h = a;
-            this._viewport = new t(0, 0, h.width, h.height);
-            this._target = this._createTarget(h);
+            var g = a;
+            this._viewport = new u(0, 0, g.width, g.height);
+            this._target = this._createTarget(g);
           } else {
             this._addLayer("Background Layer");
-            g = this._addLayer("Canvas Layer");
-            h = document.createElement("canvas");
-            g.appendChild(h);
-            this._viewport = new t(0, 0, a.scrollWidth, a.scrollHeight);
-            var k = this;
-            c.addEventListener(1, function() {
-              k._onStageBoundsChanged(h);
+            f = this._addLayer("Canvas Layer");
+            g = document.createElement("canvas");
+            f.appendChild(g);
+            this._viewport = new u(0, 0, a.scrollWidth, a.scrollHeight);
+            var h = this;
+            b.addEventListener(1, function() {
+              h._onStageBoundsChanged(g);
             });
-            this._onStageBoundsChanged(h);
+            this._onStageBoundsChanged(g);
           }
-          e._prepareSurfaceAllocators();
+          d._prepareSurfaceAllocators();
         }
-        __extends(e, b);
-        e.prototype._addLayer = function(a) {
+        __extends(d, c);
+        d.prototype._addLayer = function(a) {
           a = document.createElement("div");
           a.style.position = "absolute";
           a.style.overflow = "hidden";
           a.style.width = "100%";
           a.style.height = "100%";
+          a.style.zIndex = this._layers.length + "";
           this._container.appendChild(a);
           this._layers.push(a);
           return a;
         };
-        Object.defineProperty(e.prototype, "_backgroundVideoLayer", {get:function() {
+        Object.defineProperty(d.prototype, "_backgroundVideoLayer", {get:function() {
           return this._layers[0];
         }, enumerable:!0, configurable:!0});
-        e.prototype._createTarget = function(a) {
-          return new g.Canvas2DSurfaceRegion(new g.Canvas2DSurface(a), new r.RegionAllocator.Region(0, 0, a.width, a.height), a.width, a.height);
+        d.prototype._createTarget = function(a) {
+          return new g.Canvas2DSurfaceRegion(new g.Canvas2DSurface(a), new p.RegionAllocator.Region(0, 0, a.width, a.height), a.width, a.height);
         };
-        e.prototype._onStageBoundsChanged = function(a) {
+        d.prototype._onStageBoundsChanged = function(a) {
           var b = this._stage.getBounds(!0);
           b.snap();
           for (var c = this._devicePixelRatio = window.devicePixelRatio || 1, d = b.w / c + "px", c = b.h / c + "px", e = 0;e < this._layers.length;e++) {
@@ -11400,25 +11449,25 @@
           this._target = this._createTarget(a);
           this._fontSize = 10 * this._devicePixelRatio;
         };
-        e._prepareSurfaceAllocators = function() {
-          e._initializedCaches || (e._surfaceCache = new r.SurfaceRegionAllocator.SimpleAllocator(function(a, b) {
+        d._prepareSurfaceAllocators = function() {
+          d._initializedCaches || (d._surfaceCache = new p.SurfaceRegionAllocator.SimpleAllocator(function(a, b) {
             var c = document.createElement("canvas");
             "undefined" !== typeof registerScratchCanvas && registerScratchCanvas(c);
             var d = Math.max(1024, a), e = Math.max(1024, b);
             c.width = d;
             c.height = e;
-            var f = null, f = 512 <= a || 512 <= b ? new r.RegionAllocator.GridAllocator(d, e, d, e) : new r.RegionAllocator.BucketAllocator(d, e);
+            var f = null, f = 512 <= a || 512 <= b ? new p.RegionAllocator.GridAllocator(d, e, d, e) : new p.RegionAllocator.BucketAllocator(d, e);
             return new g.Canvas2DSurface(c, f);
-          }), e._shapeCache = new r.SurfaceRegionAllocator.SimpleAllocator(function(a, b) {
+          }), d._shapeCache = new p.SurfaceRegionAllocator.SimpleAllocator(function(a, b) {
             var c = document.createElement("canvas");
             "undefined" !== typeof registerScratchCanvas && registerScratchCanvas(c);
             c.width = 1024;
             c.height = 1024;
-            var d = d = new r.RegionAllocator.CompactAllocator(1024, 1024);
+            var d = d = new p.RegionAllocator.CompactAllocator(1024, 1024);
             return new g.Canvas2DSurface(c, d);
-          }), e._initializedCaches = !0);
+          }), d._initializedCaches = !0);
         };
-        e.prototype.render = function() {
+        d.prototype.render = function() {
           var a = this._stage, b = this._target, c = this._options, d = this._viewport;
           b.reset();
           b.context.save();
@@ -11430,35 +11479,35 @@
           c.paintViewport && (b.context.beginPath(), b.context.rect(d.x, d.y, d.w, d.h), b.context.strokeStyle = "#FF4981", b.context.lineWidth = 2, b.context.stroke());
           b.context.restore();
         };
-        e.prototype.renderNode = function(a, b, c) {
-          var d = new v(this._target);
+        d.prototype.renderNode = function(a, b, c) {
+          var d = new w(this._target);
           d.clip.set(b);
           d.flags = 256;
           d.matrix.set(c);
           a.visit(this, d);
           d.free();
         };
-        e.prototype.renderNodeWithState = function(a, b) {
+        d.prototype.renderNodeWithState = function(a, b) {
           a.visit(this, b);
         };
-        e.prototype._renderWithCache = function(a, b) {
-          var c = b.matrix, d = a.getBounds();
-          if (d.isEmpty()) {
+        d.prototype._renderWithCache = function(a, b) {
+          var c = b.matrix, f = a.getBounds();
+          if (f.isEmpty()) {
             return!1;
           }
           var g = this._options.cacheShapesMaxSize, h = Math.max(c.getAbsoluteScaleX(), c.getAbsoluteScaleY()), k = !!(b.flags & 16), l = !!(b.flags & 8);
           if (b.hasFlags(256)) {
-            if (l || k || !b.colorMatrix.isIdentity() || a.hasFlags(1048576) || 100 < this._options.cacheShapesThreshold || d.w * h > g || d.h * h > g) {
+            if (l || k || !b.colorMatrix.isIdentity() || a.hasFlags(1048576) || 100 < this._options.cacheShapesThreshold || f.w * h > g || f.h * h > g) {
               return!1;
             }
-            (h = a.properties.mipMap) || (h = a.properties.mipMap = new n(this, a, e._shapeCache, g));
+            (h = a.properties.mipMap) || (h = a.properties.mipMap = new m(this, a, d._shapeCache, g));
             k = h.getLevel(c);
             g = k.surfaceRegion;
             h = g.region;
-            return k ? (k = b.target.context, k.imageSmoothingEnabled = k.mozImageSmoothingEnabled = !0, k.setTransform(c.a, c.b, c.c, c.d, c.tx, c.ty), k.drawImage(g.surface.canvas, h.x, h.y, h.w, h.h, d.x, d.y, d.w, d.h), !0) : !1;
+            return k ? (k = b.target.context, k.imageSmoothingEnabled = k.mozImageSmoothingEnabled = !0, k.setTransform(c.a, c.b, c.c, c.d, c.tx, c.ty), k.drawImage(g.surface.canvas, h.x, h.y, h.w, h.h, f.x, f.y, f.w, f.h), !0) : !1;
           }
         };
-        e.prototype._intersectsClipList = function(a, b) {
+        d.prototype._intersectsClipList = function(a, b) {
           var c = a.getBounds(!0), d = !1;
           b.matrix.transformRectangleAABB(c);
           b.clip.intersects(c) && (d = !0);
@@ -11474,7 +11523,7 @@
           c.free();
           return d;
         };
-        e.prototype.visitGroup = function(a, b) {
+        d.prototype.visitGroup = function(a, b) {
           this._frameInfo.groups++;
           a.getBounds();
           if ((!a.hasFlags(4) || b.flags & 4) && a.hasFlags(65536)) {
@@ -11510,17 +11559,17 @@
             this._renderDebugInfo(a, b);
           }
         };
-        e.prototype._renderDebugInfo = function(a, b) {
+        d.prototype._renderDebugInfo = function(a, b) {
           if (b.flags & 1024) {
-            var c = b.target.context, d = a.getBounds(!0), g = a.properties.style;
-            g || (g = a.properties.style = l.Color.randomColor().toCSSStyle());
+            var c = b.target.context, f = a.getBounds(!0), g = a.properties.style;
+            g || (g = a.properties.style = k.Color.randomColor().toCSSStyle());
             c.strokeStyle = g;
-            b.matrix.transformRectangleAABB(d);
+            b.matrix.transformRectangleAABB(f);
             c.setTransform(1, 0, 0, 1, 0, 0);
-            d.free();
-            d = a.getBounds();
-            g = e._debugPoints;
-            b.matrix.transformRectangle(d, g);
+            f.free();
+            f = a.getBounds();
+            g = d._debugPoints;
+            b.matrix.transformRectangle(f, g);
             c.lineWidth = 1;
             c.beginPath();
             c.moveTo(g[0].x, g[0].y);
@@ -11531,7 +11580,7 @@
             c.stroke();
           }
         };
-        e.prototype.visitStage = function(a, b) {
+        d.prototype.visitStage = function(a, b) {
           var c = b.target.context, d = a.getBounds(!0);
           b.matrix.transformRectangleAABB(d);
           d.intersect(b.clip);
@@ -11543,32 +11592,36 @@
           a.dirtyRegion && (c.restore(), b.target.reset(), c.globalAlpha = .4, b.hasFlags(2048) && a.dirtyRegion.render(b.target.context), a.dirtyRegion.clear());
           b.free();
         };
-        e.prototype.visitShape = function(a, b) {
+        d.prototype.visitShape = function(a, b) {
           if (this._intersectsClipList(a, b)) {
             var c = b.matrix;
             b.flags & 8192 && (c = c.clone(), c.snap());
             var d = b.target.context;
             g.Filters._applyColorMatrix(d, b.colorMatrix);
-            a.source instanceof r.RenderableVideo ? this.visitRenderableVideo(a.source, b) : 0 < d.globalAlpha && this.visitRenderable(a.source, b, a.ratio);
+            a.source instanceof p.RenderableVideo ? this.visitRenderableVideo(a.source, b) : 0 < d.globalAlpha && this.visitRenderable(a.source, b, a.ratio);
             b.flags & 8192 && c.free();
           }
         };
-        e.prototype.visitRenderableVideo = function(a, b) {
+        d.prototype.visitRenderableVideo = function(a, b) {
           if (a.video && a.video.videoWidth) {
             var c = this._devicePixelRatio, d = b.matrix.clone();
             d.scale(1 / c, 1 / c);
-            var c = a.getBounds(), e = l.GFX.Geometry.Matrix.createIdentity();
+            var c = a.getBounds(), e = k.GFX.Geometry.Matrix.createIdentity();
             e.scale(c.w / a.video.videoWidth, c.h / a.video.videoHeight);
             d.preMultiply(e);
             e.free();
             c = d.toCSSTransform();
             a.video.style.transformOrigin = "0 0";
             a.video.style.transform = c;
-            this._backgroundVideoLayer !== a.video.parentElement && (this._backgroundVideoLayer.appendChild(a.video), 1 === a.state && a.play());
+            var f = this._backgroundVideoLayer;
+            f !== a.video.parentElement && (f.appendChild(a.video), a.addEventListener(2, function ca(a) {
+              f.removeChild(a.video);
+              a.removeEventListener(2, ca);
+            }));
             d.free();
           }
         };
-        e.prototype.visitRenderable = function(a, b, c) {
+        d.prototype.visitRenderable = function(a, b, c) {
           var d = a.getBounds();
           if (!(b.flags & 32 || d.isEmpty())) {
             if (b.hasFlags(64)) {
@@ -11587,17 +11640,17 @@
             a.render(d, c, null, f, g);
           }
         };
-        e.prototype._renderLayer = function(a, b) {
+        d.prototype._renderLayer = function(a, b) {
           var c = a.getLayer(), d = c.mask;
           if (d) {
             this._renderWithMask(a, d, c.blendMode, !a.hasFlags(131072) || !d.hasFlags(131072), b);
           } else {
-            var d = t.allocate(), e = this._renderToTemporarySurface(a, b, d, null);
+            var d = u.allocate(), e = this._renderToTemporarySurface(a, b, d, null);
             e && (b.target.draw(e, d.x, d.y, d.w, d.h, c.blendMode), e.free());
             d.free();
           }
         };
-        e.prototype._renderWithMask = function(a, b, c, d, e) {
+        d.prototype._renderWithMask = function(a, b, c, d, e) {
           var f = b.getTransform().getConcatenatedMatrix(!0);
           b.parent || (f = f.scale(this._devicePixelRatio, this._devicePixelRatio));
           var g = a.getBounds().clone();
@@ -11612,13 +11665,13 @@
               k.intersect(g);
               k.intersect(h);
               k.snap();
-              k.isEmpty() || (g = e.clone(), g.clip.set(k), a = this._renderToTemporarySurface(a, g, t.createEmpty(), null), g.free(), g = e.clone(), g.clip.set(k), g.matrix = f, g.flags |= 4, d && (g.flags |= 8), b = this._renderToTemporarySurface(b, g, t.createEmpty(), a.surface), g.free(), a.draw(b, 0, 0, k.w, k.h, 11), e.target.draw(a, k.x, k.y, k.w, k.h, c), b.free(), a.free());
+              k.isEmpty() || (g = e.clone(), g.clip.set(k), a = this._renderToTemporarySurface(a, g, u.createEmpty(), null), g.free(), g = e.clone(), g.clip.set(k), g.matrix = f, g.flags |= 4, d && (g.flags |= 8), b = this._renderToTemporarySurface(b, g, u.createEmpty(), a.surface), g.free(), a.draw(b, 0, 0, k.w, k.h, 11), e.target.draw(a, k.x, k.y, k.w, k.h, c), b.free(), a.free());
             }
           }
         };
-        e.prototype._renderStageToTarget = function(b, c, d) {
-          t.allocationCount = a.allocationCount = v.allocationCount = 0;
-          b = new v(b);
+        d.prototype._renderStageToTarget = function(b, c, d) {
+          u.allocationCount = a.allocationCount = w.allocationCount = 0;
+          b = new w(b);
           b.clip.set(d);
           this._options.paintRenderable || (b.flags |= 32);
           this._options.paintBounds && (b.flags |= 1024);
@@ -11631,7 +11684,7 @@
           c.visit(this, b);
           this._frameInfo.leave();
         };
-        e.prototype._renderToTemporarySurface = function(a, b, c, d) {
+        d.prototype._renderToTemporarySurface = function(a, b, c, d) {
           var e = b.matrix, f = a.getBounds().clone();
           e.transformRectangleAABB(f);
           f.snap();
@@ -11643,7 +11696,7 @@
           }
           d = this._allocateSurface(c.w, c.h, d);
           f = d.region;
-          f = new t(f.x, f.y, c.w, c.h);
+          f = new u(f.x, f.y, c.w, c.h);
           d.context.setTransform(1, 0, 0, 1, 0, 0);
           d.clear();
           e = e.clone();
@@ -11658,18 +11711,18 @@
           d.context.restore();
           return d;
         };
-        e.prototype._allocateSurface = function(a, b, c) {
-          return e._surfaceCache.allocate(a, b, c);
+        d.prototype._allocateSurface = function(a, b, c) {
+          return d._surfaceCache.allocate(a, b, c);
         };
-        e.prototype.screenShot = function(a, b) {
-          if (b) {
+        d.prototype.screenShot = function(a, c) {
+          if (c) {
             var d = this._stage.content.groupChild.child;
-            c(d instanceof r.Stage);
+            b(d instanceof p.Stage);
             a = d.content.getBounds(!0);
             d.content.getTransform().getConcatenatedMatrix().transformRectangleAABB(a);
             a.intersect(this._viewport);
           }
-          a || (a = new t(0, 0, this._target.w, this._target.h));
+          a || (a = new u(0, 0, this._target.w, this._target.h));
           d = document.createElement("canvas");
           d.width = a.w;
           d.height = a.h;
@@ -11677,303 +11730,304 @@
           e.fillStyle = this._container.style.backgroundColor;
           e.fillRect(0, 0, a.w, a.h);
           e.drawImage(this._target.context.canvas, a.x, a.y, a.w, a.h, 0, 0, a.w, a.h);
-          return new r.ScreenShot(d.toDataURL("image/png"), a.w, a.h);
+          return new p.ScreenShot(d.toDataURL("image/png"), a.w, a.h);
         };
-        e._initializedCaches = !1;
-        e._debugPoints = m.createEmptyPoints(4);
-        return e;
-      }(r.Renderer);
-      g.Canvas2DRenderer = e;
-    })(r.Canvas2D || (r.Canvas2D = {}));
-  })(l.GFX || (l.GFX = {}));
-})(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
-    var g = r.Geometry.Point, c = r.Geometry.Matrix, t = r.Geometry.Rectangle, m = l.Tools.Mini.FPS, a = function() {
+        d._initializedCaches = !1;
+        d._debugPoints = h.createEmptyPoints(4);
+        return d;
+      }(p.Renderer);
+      g.Canvas2DRenderer = l;
+    })(p.Canvas2D || (p.Canvas2D = {}));
+  })(k.GFX || (k.GFX = {}));
+})(Shumway || (Shumway = {}));
+(function(k) {
+  (function(p) {
+    var g = p.Geometry.Point, b = p.Geometry.Matrix, u = p.Geometry.Rectangle, h = k.Tools.Mini.FPS, a = function() {
       function a() {
       }
-      a.prototype.onMouseUp = function(a, c) {
+      a.prototype.onMouseUp = function(a, b) {
         a.state = this;
       };
-      a.prototype.onMouseDown = function(a, c) {
+      a.prototype.onMouseDown = function(a, b) {
         a.state = this;
       };
-      a.prototype.onMouseMove = function(a, c) {
+      a.prototype.onMouseMove = function(a, b) {
         a.state = this;
       };
-      a.prototype.onMouseWheel = function(a, c) {
+      a.prototype.onMouseWheel = function(a, b) {
         a.state = this;
       };
-      a.prototype.onMouseClick = function(a, c) {
+      a.prototype.onMouseClick = function(a, b) {
         a.state = this;
       };
-      a.prototype.onKeyUp = function(a, c) {
+      a.prototype.onKeyUp = function(a, b) {
         a.state = this;
       };
-      a.prototype.onKeyDown = function(a, c) {
+      a.prototype.onKeyDown = function(a, b) {
         a.state = this;
       };
-      a.prototype.onKeyPress = function(a, c) {
+      a.prototype.onKeyPress = function(a, b) {
         a.state = this;
       };
       return a;
     }();
-    r.UIState = a;
-    var h = function(a) {
-      function c() {
+    p.UIState = a;
+    var d = function(a) {
+      function b() {
         a.apply(this, arguments);
         this._keyCodes = [];
       }
-      __extends(c, a);
-      c.prototype.onMouseDown = function(a, c) {
-        c.altKey && (a.state = new k(a.worldView, a.getMousePosition(c, null), a.worldView.getTransform().getMatrix(!0)));
+      __extends(b, a);
+      b.prototype.onMouseDown = function(a, b) {
+        b.altKey && (a.state = new f(a.worldView, a.getMousePosition(b, null), a.worldView.getTransform().getMatrix(!0)));
       };
-      c.prototype.onMouseClick = function(a, c) {
+      b.prototype.onMouseClick = function(a, b) {
       };
-      c.prototype.onKeyDown = function(a, c) {
-        this._keyCodes[c.keyCode] = !0;
+      b.prototype.onKeyDown = function(a, b) {
+        this._keyCodes[b.keyCode] = !0;
       };
-      c.prototype.onKeyUp = function(a, c) {
-        this._keyCodes[c.keyCode] = !1;
+      b.prototype.onKeyUp = function(a, b) {
+        this._keyCodes[b.keyCode] = !1;
       };
-      return c;
-    }(a), p = function(a) {
-      function c() {
+      return b;
+    }(a), n = function(a) {
+      function b() {
         a.apply(this, arguments);
         this._keyCodes = [];
         this._paused = !1;
         this._mousePosition = new g(0, 0);
       }
-      __extends(c, a);
-      c.prototype.onMouseMove = function(a, c) {
-        this._mousePosition = a.getMousePosition(c, null);
+      __extends(b, a);
+      b.prototype.onMouseMove = function(a, b) {
+        this._mousePosition = a.getMousePosition(b, null);
         this._update(a);
       };
-      c.prototype.onMouseDown = function(a, c) {
+      b.prototype.onMouseDown = function(a, b) {
       };
-      c.prototype.onMouseClick = function(a, c) {
+      b.prototype.onMouseClick = function(a, b) {
       };
-      c.prototype.onMouseWheel = function(a, c) {
-        var d = "DOMMouseScroll" === c.type ? -c.detail : c.wheelDelta / 40;
-        if (c.altKey) {
-          c.preventDefault();
-          var e = a.getMousePosition(c, null), b = a.worldView.getTransform().getMatrix(!0), d = 1 + d / 1E3;
-          b.translate(-e.x, -e.y);
-          b.scale(d, d);
-          b.translate(e.x, e.y);
-          a.worldView.getTransform().setMatrix(b);
-        }
-      };
-      c.prototype.onKeyPress = function(a, c) {
-        if (c.altKey) {
-          var d = c.keyCode || c.which;
+      b.prototype.onMouseWheel = function(a, b) {
+        var d = "DOMMouseScroll" === b.type ? -b.detail : b.wheelDelta / 40;
+        if (b.altKey) {
+          b.preventDefault();
+          var f = a.getMousePosition(b, null), c = a.worldView.getTransform().getMatrix(!0), d = 1 + d / 1E3;
+          c.translate(-f.x, -f.y);
+          c.scale(d, d);
+          c.translate(f.x, f.y);
+          a.worldView.getTransform().setMatrix(c);
+        }
+      };
+      b.prototype.onKeyPress = function(a, b) {
+        if (b.altKey) {
+          var d = b.keyCode || b.which;
           console.info("onKeyPress Code: " + d);
           switch(d) {
             case 248:
               this._paused = !this._paused;
-              c.preventDefault();
+              b.preventDefault();
               break;
             case 223:
               a.toggleOption("paintRenderable");
-              c.preventDefault();
+              b.preventDefault();
               break;
             case 8730:
               a.toggleOption("paintViewport");
-              c.preventDefault();
+              b.preventDefault();
               break;
             case 8747:
               a.toggleOption("paintBounds");
-              c.preventDefault();
+              b.preventDefault();
               break;
             case 8706:
               a.toggleOption("paintDirtyRegion");
-              c.preventDefault();
+              b.preventDefault();
               break;
             case 231:
               a.toggleOption("clear");
-              c.preventDefault();
+              b.preventDefault();
               break;
             case 402:
-              a.toggleOption("paintFlashing"), c.preventDefault();
+              a.toggleOption("paintFlashing"), b.preventDefault();
           }
           this._update(a);
         }
       };
-      c.prototype.onKeyDown = function(a, c) {
-        this._keyCodes[c.keyCode] = !0;
+      b.prototype.onKeyDown = function(a, b) {
+        this._keyCodes[b.keyCode] = !0;
         this._update(a);
       };
-      c.prototype.onKeyUp = function(a, c) {
-        this._keyCodes[c.keyCode] = !1;
+      b.prototype.onKeyUp = function(a, b) {
+        this._keyCodes[b.keyCode] = !1;
         this._update(a);
       };
-      c.prototype._update = function(a) {
+      b.prototype._update = function(a) {
         a.paused = this._paused;
         if (a.getOption()) {
-          var c = r.viewportLoupeDiameter.value, d = r.viewportLoupeDiameter.value;
-          a.viewport = new t(this._mousePosition.x - c / 2, this._mousePosition.y - d / 2, c, d);
+          var b = p.viewportLoupeDiameter.value, d = p.viewportLoupeDiameter.value;
+          a.viewport = new u(this._mousePosition.x - b / 2, this._mousePosition.y - d / 2, b, d);
         } else {
           a.viewport = null;
         }
       };
-      return c;
+      return b;
     }(a);
     (function(a) {
-      function c() {
+      function b() {
         a.apply(this, arguments);
         this._startTime = Date.now();
       }
-      __extends(c, a);
-      c.prototype.onMouseMove = function(a, c) {
+      __extends(b, a);
+      b.prototype.onMouseMove = function(a, b) {
         if (!(10 > Date.now() - this._startTime)) {
           var d = a._world;
-          d && (a.state = new k(d, a.getMousePosition(c, null), d.getTransform().getMatrix(!0)));
+          d && (a.state = new f(d, a.getMousePosition(b, null), d.getTransform().getMatrix(!0)));
         }
       };
-      c.prototype.onMouseUp = function(a, c) {
-        a.state = new h;
-        a.selectNodeUnderMouse(c);
+      b.prototype.onMouseUp = function(a, b) {
+        a.state = new d;
+        a.selectNodeUnderMouse(b);
       };
-      return c;
+      return b;
     })(a);
-    var k = function(a) {
-      function c(g, h, d) {
+    var f = function(a) {
+      function b(d, f, g) {
         a.call(this);
-        this._target = g;
-        this._startPosition = h;
-        this._startMatrix = d;
-      }
-      __extends(c, a);
-      c.prototype.onMouseMove = function(a, c) {
-        c.preventDefault();
-        var d = a.getMousePosition(c, null);
+        this._target = d;
+        this._startPosition = f;
+        this._startMatrix = g;
+      }
+      __extends(b, a);
+      b.prototype.onMouseMove = function(a, b) {
+        b.preventDefault();
+        var d = a.getMousePosition(b, null);
         d.sub(this._startPosition);
         this._target.getTransform().setMatrix(this._startMatrix.clone().translate(d.x, d.y));
         a.state = this;
       };
-      c.prototype.onMouseUp = function(a, c) {
-        a.state = new h;
+      b.prototype.onMouseUp = function(a, b) {
+        a.state = new d;
       };
-      return c;
+      return b;
     }(a), a = function() {
-      function a(c, g, k) {
-        function d(a) {
-          f._state.onMouseWheel(f, a);
-          f._persistentState.onMouseWheel(f, a);
-        }
-        void 0 === g && (g = !1);
-        void 0 === k && (k = void 0);
-        this._state = new h;
-        this._persistentState = new p;
+      function a(b, f, g) {
+        function t(a) {
+          e._state.onMouseWheel(e, a);
+          e._persistentState.onMouseWheel(e, a);
+        }
+        void 0 === f && (f = !1);
+        void 0 === g && (g = void 0);
+        this._state = new d;
+        this._persistentState = new n;
         this.paused = !1;
         this.viewport = null;
         this._selectedNodes = [];
         this._eventListeners = Object.create(null);
         this._fullScreen = !1;
-        this._container = c;
-        this._stage = new r.Stage(512, 512, !0);
+        this._container = b;
+        this._stage = new p.Stage(512, 512, !0);
         this._worldView = this._stage.content;
-        this._world = new r.Group;
+        this._world = new p.Group;
         this._worldView.addChild(this._world);
-        this._disableHiDPI = g;
-        g = document.createElement("div");
-        g.style.position = "absolute";
-        g.style.width = "100%";
-        g.style.height = "100%";
-        c.appendChild(g);
-        if (r.hud.value) {
-          var e = document.createElement("div");
-          e.style.position = "absolute";
-          e.style.width = "100%";
-          e.style.height = "100%";
-          e.style.pointerEvents = "none";
-          var b = document.createElement("div");
-          b.style.position = "absolute";
-          b.style.width = "100%";
-          b.style.height = "20px";
-          b.style.pointerEvents = "none";
-          e.appendChild(b);
-          c.appendChild(e);
-          this._fps = new m(b);
+        this._disableHiDPI = f;
+        f = document.createElement("div");
+        f.style.position = "absolute";
+        f.style.width = "100%";
+        f.style.height = "100%";
+        f.style.zIndex = "0";
+        b.appendChild(f);
+        if (p.hud.value) {
+          var l = document.createElement("div");
+          l.style.position = "absolute";
+          l.style.width = "100%";
+          l.style.height = "100%";
+          l.style.pointerEvents = "none";
+          var c = document.createElement("div");
+          c.style.position = "absolute";
+          c.style.width = "100%";
+          c.style.height = "20px";
+          c.style.pointerEvents = "none";
+          l.appendChild(c);
+          b.appendChild(l);
+          this._fps = new h(c);
         } else {
           this._fps = null;
         }
-        this.transparent = e = 0 === k;
-        void 0 === k || 0 === k || l.ColorUtilities.rgbaToCSSStyle(k);
-        this._options = new r.Canvas2D.Canvas2DRendererOptions;
-        this._options.alpha = e;
-        this._renderer = new r.Canvas2D.Canvas2DRenderer(g, this._stage, this._options);
+        this.transparent = l = 0 === g;
+        void 0 === g || 0 === g || k.ColorUtilities.rgbaToCSSStyle(g);
+        this._options = new p.Canvas2D.Canvas2DRendererOptions;
+        this._options.alpha = l;
+        this._renderer = new p.Canvas2D.Canvas2DRenderer(f, this._stage, this._options);
         this._listenForContainerSizeChanges();
         this._onMouseUp = this._onMouseUp.bind(this);
         this._onMouseDown = this._onMouseDown.bind(this);
         this._onMouseMove = this._onMouseMove.bind(this);
-        var f = this;
+        var e = this;
         window.addEventListener("mouseup", function(a) {
-          f._state.onMouseUp(f, a);
-          f._render();
+          e._state.onMouseUp(e, a);
+          e._render();
         }, !1);
         window.addEventListener("mousemove", function(a) {
-          f._state.onMouseMove(f, a);
-          f._persistentState.onMouseMove(f, a);
+          e._state.onMouseMove(e, a);
+          e._persistentState.onMouseMove(e, a);
         }, !1);
-        window.addEventListener("DOMMouseScroll", d);
-        window.addEventListener("mousewheel", d);
-        c.addEventListener("mousedown", function(a) {
-          f._state.onMouseDown(f, a);
+        window.addEventListener("DOMMouseScroll", t);
+        window.addEventListener("mousewheel", t);
+        b.addEventListener("mousedown", function(a) {
+          e._state.onMouseDown(e, a);
         });
         window.addEventListener("keydown", function(a) {
-          f._state.onKeyDown(f, a);
-          if (f._state !== f._persistentState) {
-            f._persistentState.onKeyDown(f, a);
+          e._state.onKeyDown(e, a);
+          if (e._state !== e._persistentState) {
+            e._persistentState.onKeyDown(e, a);
           }
         }, !1);
         window.addEventListener("keypress", function(a) {
-          f._state.onKeyPress(f, a);
-          if (f._state !== f._persistentState) {
-            f._persistentState.onKeyPress(f, a);
+          e._state.onKeyPress(e, a);
+          if (e._state !== e._persistentState) {
+            e._persistentState.onKeyPress(e, a);
           }
         }, !1);
         window.addEventListener("keyup", function(a) {
-          f._state.onKeyUp(f, a);
-          if (f._state !== f._persistentState) {
-            f._persistentState.onKeyUp(f, a);
+          e._state.onKeyUp(e, a);
+          if (e._state !== e._persistentState) {
+            e._persistentState.onKeyUp(e, a);
           }
         }, !1);
         this._enterRenderLoop();
       }
       a.prototype._listenForContainerSizeChanges = function() {
-        var a = this._containerWidth, c = this._containerHeight;
+        var a = this._containerWidth, b = this._containerHeight;
         this._onContainerSizeChanged();
-        var g = this;
+        var d = this;
         setInterval(function() {
-          if (a !== g._containerWidth || c !== g._containerHeight) {
-            g._onContainerSizeChanged(), a = g._containerWidth, c = g._containerHeight;
+          if (a !== d._containerWidth || b !== d._containerHeight) {
+            d._onContainerSizeChanged(), a = d._containerWidth, b = d._containerHeight;
           }
         }, 10);
       };
       a.prototype._onContainerSizeChanged = function() {
-        var a = this.getRatio(), g = Math.ceil(this._containerWidth * a), h = Math.ceil(this._containerHeight * a);
-        this._stage.setBounds(new t(0, 0, g, h));
-        this._stage.content.setBounds(new t(0, 0, g, h));
-        this._worldView.getTransform().setMatrix(new c(a, 0, 0, a, 0, 0));
+        var a = this.getRatio(), d = Math.ceil(this._containerWidth * a), f = Math.ceil(this._containerHeight * a);
+        this._stage.setBounds(new u(0, 0, d, f));
+        this._stage.content.setBounds(new u(0, 0, d, f));
+        this._worldView.getTransform().setMatrix(new b(a, 0, 0, a, 0, 0));
         this._dispatchEvent("resize");
       };
-      a.prototype.addEventListener = function(a, c) {
+      a.prototype.addEventListener = function(a, b) {
         this._eventListeners[a] || (this._eventListeners[a] = []);
-        this._eventListeners[a].push(c);
+        this._eventListeners[a].push(b);
       };
       a.prototype._dispatchEvent = function(a) {
         if (a = this._eventListeners[a]) {
-          for (var c = 0;c < a.length;c++) {
-            a[c]();
+          for (var b = 0;b < a.length;b++) {
+            a[b]();
           }
         }
       };
       a.prototype._enterRenderLoop = function() {
         var a = this;
-        requestAnimationFrame(function v() {
+        requestAnimationFrame(function w() {
           a.render();
-          requestAnimationFrame(v);
+          requestAnimationFrame(w);
         });
       };
       Object.defineProperty(a.prototype, "state", {set:function(a) {
@@ -11983,17 +12037,17 @@
         this._container.style.cursor = a;
       }, enumerable:!0, configurable:!0});
       a.prototype._render = function() {
-        r.RenderableVideo.checkForVideoUpdates();
-        var a = (this._stage.readyToRender() || r.forcePaint.value) && !this.paused, c = 0;
+        p.RenderableVideo.checkForVideoUpdates();
+        var a = (this._stage.readyToRender() || p.forcePaint.value) && !this.paused, b = 0;
         if (a) {
-          var g = this._renderer;
-          g.viewport = this.viewport ? this.viewport : this._stage.getBounds();
+          var d = this._renderer;
+          d.viewport = this.viewport ? this.viewport : this._stage.getBounds();
           this._dispatchEvent("render");
-          c = performance.now();
-          g.render();
-          c = performance.now() - c;
+          b = performance.now();
+          d.render();
+          b = performance.now() - b;
         }
-        this._fps && this._fps.tickAndRender(!a, c);
+        this._fps && this._fps.tickAndRender(!a, b);
       };
       a.prototype.render = function() {
         this._render();
@@ -12014,16 +12068,16 @@
         return{stageWidth:this._containerWidth, stageHeight:this._containerHeight, pixelRatio:this.getRatio(), screenWidth:window.screen ? window.screen.width : 640, screenHeight:window.screen ? window.screen.height : 480};
       };
       a.prototype.toggleOption = function(a) {
-        var c = this._options;
-        c[a] = !c[a];
+        var b = this._options;
+        b[a] = !b[a];
       };
       a.prototype.getOption = function() {
         return this._options.paintViewport;
       };
       a.prototype.getRatio = function() {
-        var a = window.devicePixelRatio || 1, c = 1;
-        1 === a || this._disableHiDPI || (c = a / 1);
-        return c;
+        var a = window.devicePixelRatio || 1, b = 1;
+        1 === a || this._disableHiDPI || (b = a / 1);
+        return b;
       };
       Object.defineProperty(a.prototype, "_containerWidth", {get:function() {
         return this._container.clientWidth;
@@ -12038,15 +12092,15 @@
         (a = this._world) && this._selectedNodes.push(a);
         this._render();
       };
-      a.prototype.getMousePosition = function(a, h) {
-        var k = this._container, d = k.getBoundingClientRect(), e = this.getRatio(), k = new g(k.scrollWidth / d.width * (a.clientX - d.left) * e, k.scrollHeight / d.height * (a.clientY - d.top) * e);
-        if (!h) {
-          return k;
+      a.prototype.getMousePosition = function(a, d) {
+        var f = this._container, h = f.getBoundingClientRect(), k = this.getRatio(), f = new g(f.scrollWidth / h.width * (a.clientX - h.left) * k, f.scrollHeight / h.height * (a.clientY - h.top) * k);
+        if (!d) {
+          return f;
         }
-        d = c.createIdentity();
-        h.getTransform().getConcatenatedMatrix().inverse(d);
-        d.transformPoint(k);
-        return k;
+        h = b.createIdentity();
+        d.getTransform().getConcatenatedMatrix().inverse(h);
+        h.transformPoint(f);
+        return f;
       };
       a.prototype.getMouseWorldPosition = function(a) {
         return this.getMousePosition(a, this._world);
@@ -12057,57 +12111,57 @@
       };
       a.prototype._onMouseMove = function(a) {
       };
-      a.prototype.screenShot = function(a, c) {
-        return this._renderer.screenShot(a, c);
+      a.prototype.screenShot = function(a, b) {
+        return this._renderer.screenShot(a, b);
       };
       return a;
     }();
-    r.Easel = a;
-  })(l.GFX || (l.GFX = {}));
+    p.Easel = a;
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
-    var g = l.GFX.Geometry.Matrix;
-    (function(c) {
-      c[c.Simple = 0] = "Simple";
-    })(r.Layout || (r.Layout = {}));
-    var c = function(c) {
+(function(k) {
+  (function(p) {
+    var g = k.GFX.Geometry.Matrix;
+    (function(b) {
+      b[b.Simple = 0] = "Simple";
+    })(p.Layout || (p.Layout = {}));
+    var b = function(b) {
       function a() {
-        c.apply(this, arguments);
+        b.apply(this, arguments);
         this.layout = 0;
       }
-      __extends(a, c);
+      __extends(a, b);
       return a;
-    }(r.RendererOptions);
-    r.TreeRendererOptions = c;
-    var t = function(l) {
-      function a(a, g, k) {
-        void 0 === k && (k = new c);
-        l.call(this, a, g, k);
+    }(p.RendererOptions);
+    p.TreeRendererOptions = b;
+    var u = function(h) {
+      function a(a, g, f) {
+        void 0 === f && (f = new b);
+        h.call(this, a, g, f);
         this._canvas = document.createElement("canvas");
         this._container.appendChild(this._canvas);
         this._context = this._canvas.getContext("2d");
         this._listenForContainerSizeChanges();
       }
-      __extends(a, l);
+      __extends(a, h);
       a.prototype._listenForContainerSizeChanges = function() {
-        var a = this._containerWidth, c = this._containerHeight;
+        var a = this._containerWidth, b = this._containerHeight;
         this._onContainerSizeChanged();
-        var g = this;
+        var f = this;
         setInterval(function() {
-          if (a !== g._containerWidth || c !== g._containerHeight) {
-            g._onContainerSizeChanged(), a = g._containerWidth, c = g._containerHeight;
+          if (a !== f._containerWidth || b !== f._containerHeight) {
+            f._onContainerSizeChanged(), a = f._containerWidth, b = f._containerHeight;
           }
         }, 10);
       };
       a.prototype._getRatio = function() {
-        var a = window.devicePixelRatio || 1, c = 1;
-        1 !== a && (c = a / 1);
-        return c;
+        var a = window.devicePixelRatio || 1, b = 1;
+        1 !== a && (b = a / 1);
+        return b;
       };
       a.prototype._onContainerSizeChanged = function() {
-        var a = this._getRatio(), c = Math.ceil(this._containerWidth * a), g = Math.ceil(this._containerHeight * a), l = this._canvas;
-        0 < a ? (l.width = c * a, l.height = g * a, l.style.width = c + "px", l.style.height = g + "px") : (l.width = c, l.height = g);
+        var a = this._getRatio(), b = Math.ceil(this._containerWidth * a), f = Math.ceil(this._containerHeight * a), g = this._canvas;
+        0 < a ? (g.width = b * a, g.height = f * a, g.style.width = b + "px", g.style.height = f + "px") : (g.width = b, g.height = f);
       };
       Object.defineProperty(a.prototype, "_containerWidth", {get:function() {
         return this._container.clientWidth;
@@ -12123,47 +12177,47 @@
         0 === this._options.layout && this._renderNodeSimple(this._context, this._stage, g.createIdentity());
         a.restore();
       };
-      a.prototype._renderNodeSimple = function(a, c, g) {
-        function l(b) {
-          var c = b.getChildren();
+      a.prototype._renderNodeSimple = function(a, b, f) {
+        function g(b) {
+          var e = b.getChildren();
           a.fillStyle = b.hasFlags(16) ? "red" : "white";
-          var g = String(b.id);
-          b instanceof r.RenderableText ? g = "T" + g : b instanceof r.RenderableShape ? g = "S" + g : b instanceof r.RenderableBitmap ? g = "B" + g : b instanceof r.RenderableVideo && (g = "V" + g);
-          b instanceof r.Renderable && (g = g + " [" + b._parents.length + "]");
-          b = a.measureText(g).width;
-          a.fillText(g, s, t);
-          if (c) {
-            s += b + 4;
-            e = Math.max(e, s + 20);
-            for (g = 0;g < c.length;g++) {
-              l(c[g]), g < c.length - 1 && (t += 18, t > m._canvas.height && (a.fillStyle = "gray", s = s - d + e + 8, d = e + 8, t = 0, a.fillStyle = "white"));
+          var f = String(b.id);
+          b instanceof p.RenderableText ? f = "T" + f : b instanceof p.RenderableShape ? f = "S" + f : b instanceof p.RenderableBitmap ? f = "B" + f : b instanceof p.RenderableVideo && (f = "V" + f);
+          b instanceof p.Renderable && (f = f + " [" + b._parents.length + "]");
+          b = a.measureText(f).width;
+          a.fillText(f, k, u);
+          if (e) {
+            k += b + 4;
+            l = Math.max(l, k + 20);
+            for (f = 0;f < e.length;f++) {
+              g(e[f]), f < e.length - 1 && (u += 18, u > h._canvas.height && (a.fillStyle = "gray", k = k - t + l + 8, t = l + 8, u = 0, a.fillStyle = "white"));
             }
-            s -= b + 4;
+            k -= b + 4;
           }
         }
-        var m = this;
+        var h = this;
         a.save();
         a.font = "16px Arial";
         a.fillStyle = "white";
-        var s = 0, t = 0, d = 0, e = 0;
-        l(c);
+        var k = 0, u = 0, t = 0, l = 0;
+        g(b);
         a.restore();
       };
       return a;
-    }(r.Renderer);
-    r.TreeRenderer = t;
-  })(l.GFX || (l.GFX = {}));
+    }(p.Renderer);
+    p.TreeRenderer = u;
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.GFX.BlurFilter, t = l.GFX.DropshadowFilter, m = l.GFX.Shape, a = l.GFX.Group, h = l.GFX.RenderableShape, p = l.GFX.RenderableMorphShape, k = l.GFX.RenderableBitmap, u = l.GFX.RenderableVideo, n = l.GFX.RenderableText, s = l.GFX.ColorMatrix, v = l.ShapeData, d = l.ArrayUtilities.DataBuffer, e = l.GFX.Stage, b = l.GFX.Geometry.Matrix, f = l.GFX.Geometry.Rectangle, q = function() {
+      var b = k.GFX.BlurFilter, u = k.GFX.DropshadowFilter, h = k.GFX.Shape, a = k.GFX.Group, d = k.GFX.RenderableShape, n = k.GFX.RenderableMorphShape, f = k.GFX.RenderableBitmap, v = k.GFX.RenderableVideo, m = k.GFX.RenderableText, r = k.GFX.ColorMatrix, w = k.ShapeData, t = k.ArrayUtilities.DataBuffer, l = k.GFX.Stage, c = k.GFX.Geometry.Matrix, e = k.GFX.Geometry.Rectangle, q = function() {
         function a() {
         }
         a.prototype.writeMouseEvent = function(a, b) {
           var c = this.output;
           c.writeInt(300);
-          var d = l.Remoting.MouseEventNames.indexOf(a.type);
+          var d = k.Remoting.MouseEventNames.indexOf(a.type);
           c.writeInt(d);
           c.writeFloat(b.x);
           c.writeFloat(b.y);
@@ -12173,7 +12227,7 @@
         a.prototype.writeKeyboardEvent = function(a) {
           var b = this.output;
           b.writeInt(301);
-          var c = l.Remoting.KeyboardEventNames.indexOf(a.type);
+          var c = k.Remoting.KeyboardEventNames.indexOf(a.type);
           b.writeInt(c);
           b.writeInt(a.keyCode);
           b.writeInt(a.charCode);
@@ -12190,18 +12244,18 @@
       g.GFXChannelSerializer = q;
       q = function() {
         function a(b, c, d) {
-          function f(a) {
+          function e(a) {
             a = a.getBounds(!0);
             var c = b.easel.getRatio();
             a.scale(1 / c, 1 / c);
             a.snap();
-            g.setBounds(a);
+            f.setBounds(a);
           }
-          var g = this.stage = new e(128, 512);
-          "undefined" !== typeof registerInspectorStage && registerInspectorStage(g);
-          f(b.stage);
-          b.stage.addEventListener(1, f);
-          b.content = g.content;
+          var f = this.stage = new l(128, 512);
+          "undefined" !== typeof registerInspectorStage && registerInspectorStage(f);
+          e(b.stage);
+          b.stage.addEventListener(1, e);
+          b.content = f.content;
           d && this.stage.setFlags(32768);
           c.addChild(this.stage);
           this._nodes = [];
@@ -12234,27 +12288,27 @@
           return this._assets[a];
         };
         a.prototype.registerFont = function(a, b, c) {
-          l.registerCSSFont(a, b.data, !inFirefox);
+          k.registerCSSFont(a, b.data, !inFirefox);
           inFirefox ? c(null) : window.setTimeout(c, 400);
         };
         a.prototype.registerImage = function(a, b, c, d) {
           this._registerAsset(a, b, this._decodeImage(c.dataType, c.data, d));
         };
         a.prototype.registerVideo = function(a) {
-          this._registerAsset(a, 0, new u(a, this));
+          this._registerAsset(a, 0, new v(a, this));
         };
         a.prototype._decodeImage = function(a, b, c) {
-          var d = new Image, e = k.FromImage(d);
-          d.src = URL.createObjectURL(new Blob([b], {type:l.getMIMETypeForImageType(a)}));
+          var d = new Image, g = f.FromImage(d);
+          d.src = URL.createObjectURL(new Blob([b], {type:k.getMIMETypeForImageType(a)}));
           d.onload = function() {
-            e.setBounds(new f(0, 0, d.width, d.height));
-            e.invalidate();
+            g.setBounds(new e(0, 0, d.width, d.height));
+            g.invalidate();
             c({width:d.width, height:d.height});
           };
           d.onerror = function() {
             c(null);
           };
-          return e;
+          return g;
         };
         a.prototype.sendVideoPlaybackEvent = function(a, b, c) {
           this._easelHost.sendVideoPlaybackEvent(a, b, c);
@@ -12263,9 +12317,9 @@
       }();
       g.GFXChannelDeserializerContext = q;
       q = function() {
-        function e() {
+        function g() {
         }
-        e.prototype.read = function() {
+        g.prototype.read = function() {
           for (var a = 0, b = this.input, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0, k = 0, l = 0;0 < b.bytesAvailable;) {
             switch(a = b.readInt(), a) {
               case 0:
@@ -12303,110 +12357,110 @@
             }
           }
         };
-        e.prototype._readMatrix = function() {
-          var a = this.input, b = e._temporaryReadMatrix;
+        g.prototype._readMatrix = function() {
+          var a = this.input, b = g._temporaryReadMatrix;
           b.setElements(a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat() / 20, a.readFloat() / 20);
           return b;
         };
-        e.prototype._readRectangle = function() {
-          var a = this.input, b = e._temporaryReadRectangle;
+        g.prototype._readRectangle = function() {
+          var a = this.input, b = g._temporaryReadRectangle;
           b.setElements(a.readInt() / 20, a.readInt() / 20, a.readInt() / 20, a.readInt() / 20);
           return b;
         };
-        e.prototype._readColorMatrix = function() {
-          var a = this.input, b = e._temporaryReadColorMatrix, c = 1, d = 1, f = 1, g = 1, h = 0, k = 0, l = 0, m = 0;
+        g.prototype._readColorMatrix = function() {
+          var a = this.input, b = g._temporaryReadColorMatrix, c = 1, d = 1, e = 1, f = 1, h = 0, k = 0, l = 0, m = 0;
           switch(a.readInt()) {
             case 0:
-              return e._temporaryReadColorMatrixIdentity;
+              return g._temporaryReadColorMatrixIdentity;
             case 1:
-              g = a.readFloat();
+              f = a.readFloat();
               break;
             case 2:
-              c = a.readFloat(), d = a.readFloat(), f = a.readFloat(), g = a.readFloat(), h = a.readInt(), k = a.readInt(), l = a.readInt(), m = a.readInt();
+              c = a.readFloat(), d = a.readFloat(), e = a.readFloat(), f = a.readFloat(), h = a.readInt(), k = a.readInt(), l = a.readInt(), m = a.readInt();
           }
-          b.setMultipliersAndOffsets(c, d, f, g, h, k, l, m);
+          b.setMultipliersAndOffsets(c, d, e, f, h, k, l, m);
           return b;
         };
-        e.prototype._readAsset = function() {
+        g.prototype._readAsset = function() {
           var a = this.input.readInt(), b = this.inputAssets[a];
           this.inputAssets[a] = null;
           return b;
         };
-        e.prototype._readUpdateGraphics = function() {
-          for (var a = this.input, b = this.context, c = a.readInt(), d = a.readInt(), e = b._getAsset(c), f = this._readRectangle(), g = v.FromPlainObject(this._readAsset()), k = a.readInt(), l = [], m = 0;m < k;m++) {
-            var n = a.readInt();
-            l.push(b._getBitmapAsset(n));
+        g.prototype._readUpdateGraphics = function() {
+          for (var a = this.input, b = this.context, c = a.readInt(), e = a.readInt(), f = b._getAsset(c), g = this._readRectangle(), h = w.FromPlainObject(this._readAsset()), k = a.readInt(), l = [], m = 0;m < k;m++) {
+            var p = a.readInt();
+            l.push(b._getBitmapAsset(p));
           }
-          if (e) {
-            e.update(g, l, f);
+          if (f) {
+            f.update(h, l, g);
           } else {
-            a = g.morphCoordinates ? new p(c, g, l, f) : new h(c, g, l, f);
+            a = h.morphCoordinates ? new n(c, h, l, g) : new d(c, h, l, g);
             for (m = 0;m < l.length;m++) {
               l[m] && l[m].addRenderableParent(a);
             }
-            b._registerAsset(c, d, a);
+            b._registerAsset(c, e, a);
           }
         };
-        e.prototype._readUpdateBitmapData = function() {
-          var a = this.input, b = this.context, c = a.readInt(), e = a.readInt(), f = b._getBitmapAsset(c), g = this._readRectangle(), a = a.readInt(), h = d.FromPlainObject(this._readAsset());
-          f ? f.updateFromDataBuffer(a, h) : (f = k.FromDataBuffer(a, h, g), b._registerAsset(c, e, f));
+        g.prototype._readUpdateBitmapData = function() {
+          var a = this.input, b = this.context, c = a.readInt(), d = a.readInt(), e = b._getBitmapAsset(c), g = this._readRectangle(), a = a.readInt(), h = t.FromPlainObject(this._readAsset());
+          e ? e.updateFromDataBuffer(a, h) : (e = f.FromDataBuffer(a, h, g), b._registerAsset(c, d, e));
         };
-        e.prototype._readUpdateTextContent = function() {
-          var a = this.input, b = this.context, c = a.readInt(), e = a.readInt(), f = b._getTextAsset(c), g = this._readRectangle(), h = this._readMatrix(), k = a.readInt(), l = a.readInt(), m = a.readInt(), p = a.readBoolean(), q = a.readInt(), r = a.readInt(), s = this._readAsset(), u = d.FromPlainObject(this._readAsset()), t = null, v = a.readInt();
-          v && (t = new d(4 * v), a.readBytes(t, 4 * v));
-          f ? (f.setBounds(g), f.setContent(s, u, h, t), f.setStyle(k, l, q, r), f.reflow(m, p)) : (f = new n(g), f.setContent(s, u, h, t), f.setStyle(k, l, q, r), f.reflow(m, p), b._registerAsset(c, e, f));
+        g.prototype._readUpdateTextContent = function() {
+          var a = this.input, b = this.context, c = a.readInt(), d = a.readInt(), e = b._getTextAsset(c), f = this._readRectangle(), g = this._readMatrix(), h = a.readInt(), k = a.readInt(), l = a.readInt(), n = a.readBoolean(), p = a.readInt(), q = a.readInt(), r = this._readAsset(), s = t.FromPlainObject(this._readAsset()), v = null, u = a.readInt();
+          u && (v = new t(4 * u), a.readBytes(v, 4 * u));
+          e ? (e.setBounds(f), e.setContent(r, s, g, v), e.setStyle(h, k, p, q), e.reflow(l, n)) : (e = new m(f), e.setContent(r, s, g, v), e.setStyle(h, k, p, q), e.reflow(l, n), b._registerAsset(c, d, e));
           if (this.output) {
-            for (a = f.textRect, this.output.writeInt(20 * a.w), this.output.writeInt(20 * a.h), this.output.writeInt(20 * a.x), f = f.lines, a = f.length, this.output.writeInt(a), b = 0;b < a;b++) {
-              this._writeLineMetrics(f[b]);
+            for (a = e.textRect, this.output.writeInt(20 * a.w), this.output.writeInt(20 * a.h), this.output.writeInt(20 * a.x), e = e.lines, a = e.length, this.output.writeInt(a), b = 0;b < a;b++) {
+              this._writeLineMetrics(e[b]);
             }
           }
         };
-        e.prototype._writeLineMetrics = function(a) {
+        g.prototype._writeLineMetrics = function(a) {
           this.output.writeInt(a.x);
           this.output.writeInt(a.width);
           this.output.writeInt(a.ascent);
           this.output.writeInt(a.descent);
           this.output.writeInt(a.leading);
         };
-        e.prototype._readUpdateStage = function() {
+        g.prototype._readUpdateStage = function() {
           var a = this.context, b = this.input.readInt();
           a._nodes[b] || (a._nodes[b] = a.stage.content);
           var b = this.input.readInt(), c = this._readRectangle();
           a.stage.content.setBounds(c);
-          a.stage.color = l.Color.FromARGB(b);
+          a.stage.color = k.Color.FromARGB(b);
           a.stage.align = this.input.readInt();
           a.stage.scaleMode = this.input.readInt();
           b = this.input.readInt();
           this.input.readInt();
           c = this.input.readInt();
-          a._easelHost.cursor = l.UI.toCSSCursor(c);
+          a._easelHost.cursor = k.UI.toCSSCursor(c);
           a._easelHost.fullscreen = 0 === b || 1 === b;
         };
-        e.prototype._readUpdateNetStream = function() {
+        g.prototype._readUpdateNetStream = function() {
           var a = this.context, b = this.input.readInt(), c = a._getVideoAsset(b), d = this._readRectangle();
           c || (a.registerVideo(b), c = a._getVideoAsset(b));
           c.setBounds(d);
         };
-        e.prototype._readFilters = function(a) {
-          var b = this.input, d = b.readInt(), e = [];
+        g.prototype._readFilters = function(a) {
+          var c = this.input, d = c.readInt(), e = [];
           if (d) {
             for (var f = 0;f < d;f++) {
-              var g = b.readInt();
+              var g = c.readInt();
               switch(g) {
                 case 0:
-                  e.push(new c(b.readFloat(), b.readFloat(), b.readInt()));
+                  e.push(new b(c.readFloat(), c.readFloat(), c.readInt()));
                   break;
                 case 1:
-                  e.push(new t(b.readFloat(), b.readFloat(), b.readFloat(), b.readFloat(), b.readInt(), b.readFloat(), b.readBoolean(), b.readBoolean(), b.readBoolean(), b.readInt(), b.readFloat()));
+                  e.push(new u(c.readFloat(), c.readFloat(), c.readFloat(), c.readFloat(), c.readInt(), c.readFloat(), c.readBoolean(), c.readBoolean(), c.readBoolean(), c.readInt(), c.readFloat()));
                   break;
                 default:
-                  l.Debug.somewhatImplemented(r.FilterType[g]);
+                  k.Debug.somewhatImplemented(p.FilterType[g]);
               }
             }
             a.getLayer().filters = e;
           }
         };
-        e.prototype._readUpdateFrame = function() {
+        g.prototype._readUpdateFrame = function() {
           var b = this.input, c = this.context, d = b.readInt(), e = 0, f = c._nodes[d];
           f || (f = c._nodes[d] = new a);
           d = b.readInt();
@@ -12422,186 +12476,186 @@
             d = b.readInt();
             g = f;
             g.clearChildren();
-            for (var h = 0;h < d;h++) {
-              var k = b.readInt(), k = c._makeNode(k);
-              g.addChild(k);
+            for (var k = 0;k < d;k++) {
+              var l = b.readInt(), l = c._makeNode(l);
+              g.addChild(l);
             }
           }
-          e && (k = f.getChildren()[0], k instanceof m && (k.ratio = e));
-        };
-        e.prototype._readDrawToBitmap = function() {
-          var a = this.input, c = this.context, d = a.readInt(), e = a.readInt(), f = a.readInt(), g, h, l;
-          g = f & 1 ? this._readMatrix().clone() : b.createIdentity();
-          f & 8 && (h = this._readColorMatrix());
-          f & 16 && (l = this._readRectangle());
-          f = a.readInt();
+          e && (l = f.getChildren()[0], l instanceof h && (l.ratio = e));
+        };
+        g.prototype._readDrawToBitmap = function() {
+          var a = this.input, b = this.context, d = a.readInt(), e = a.readInt(), g = a.readInt(), h, k, l;
+          h = g & 1 ? this._readMatrix().clone() : c.createIdentity();
+          g & 8 && (k = this._readColorMatrix());
+          g & 16 && (l = this._readRectangle());
+          g = a.readInt();
           a.readBoolean();
-          a = c._getBitmapAsset(d);
-          e = c._makeNode(e);
-          a ? a.drawNode(e, g, h, f, l) : c._registerAsset(d, -1, k.FromNode(e, g, h, f, l));
+          a = b._getBitmapAsset(d);
+          e = b._makeNode(e);
+          a ? a.drawNode(e, h, k, g, l) : b._registerAsset(d, -1, f.FromNode(e, h, k, g, l));
         };
-        e.prototype._readRequestBitmapData = function() {
+        g.prototype._readRequestBitmapData = function() {
           var a = this.output, b = this.context, c = this.input.readInt();
           b._getBitmapAsset(c).readImageData(a);
         };
-        e._temporaryReadMatrix = b.createIdentity();
-        e._temporaryReadRectangle = f.createEmpty();
-        e._temporaryReadColorMatrix = s.createIdentity();
-        e._temporaryReadColorMatrixIdentity = s.createIdentity();
-        return e;
+        g._temporaryReadMatrix = c.createIdentity();
+        g._temporaryReadRectangle = e.createEmpty();
+        g._temporaryReadColorMatrix = r.createIdentity();
+        g._temporaryReadColorMatrixIdentity = r.createIdentity();
+        return g;
       }();
       g.GFXChannelDeserializer = q;
-    })(r.GFX || (r.GFX = {}));
-  })(l.Remoting || (l.Remoting = {}));
+    })(p.GFX || (p.GFX = {}));
+  })(k.Remoting || (k.Remoting = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
-    var g = l.GFX.Geometry.Point, c = l.ArrayUtilities.DataBuffer, t = function() {
-      function m(a) {
+(function(k) {
+  (function(p) {
+    var g = k.GFX.Geometry.Point, b = k.ArrayUtilities.DataBuffer, u = function() {
+      function h(a) {
         this._easel = a;
-        var c = a.transparent;
+        var b = a.transparent;
         this._group = a.world;
         this._content = null;
         this._fullscreen = !1;
-        this._context = new l.Remoting.GFX.GFXChannelDeserializerContext(this, this._group, c);
+        this._context = new k.Remoting.GFX.GFXChannelDeserializerContext(this, this._group, b);
         this._addEventListeners();
       }
-      m.prototype.onSendUpdates = function(a, c) {
+      h.prototype.onSendUpdates = function(a, b) {
         throw Error("This method is abstract");
       };
-      Object.defineProperty(m.prototype, "easel", {get:function() {
+      Object.defineProperty(h.prototype, "easel", {get:function() {
         return this._easel;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(m.prototype, "stage", {get:function() {
+      Object.defineProperty(h.prototype, "stage", {get:function() {
         return this._easel.stage;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(m.prototype, "content", {set:function(a) {
+      Object.defineProperty(h.prototype, "content", {set:function(a) {
         this._content = a;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(m.prototype, "cursor", {set:function(a) {
+      Object.defineProperty(h.prototype, "cursor", {set:function(a) {
         this._easel.cursor = a;
       }, enumerable:!0, configurable:!0});
-      Object.defineProperty(m.prototype, "fullscreen", {set:function(a) {
+      Object.defineProperty(h.prototype, "fullscreen", {set:function(a) {
         if (this._fullscreen !== a) {
           this._fullscreen = a;
-          var c = window.FirefoxCom;
-          c && c.request("setFullscreen", a, null);
+          var b = window.FirefoxCom;
+          b && b.request("setFullscreen", a, null);
         }
       }, enumerable:!0, configurable:!0});
-      m.prototype._mouseEventListener = function(a) {
-        var h = this._easel.getMousePosition(a, this._content), h = new g(h.x, h.y), m = new c, k = new l.Remoting.GFX.GFXChannelSerializer;
-        k.output = m;
-        k.writeMouseEvent(a, h);
-        this.onSendUpdates(m, []);
-      };
-      m.prototype._keyboardEventListener = function(a) {
-        var g = new c, m = new l.Remoting.GFX.GFXChannelSerializer;
-        m.output = g;
-        m.writeKeyboardEvent(a);
-        this.onSendUpdates(g, []);
-      };
-      m.prototype._addEventListeners = function() {
-        for (var a = this._mouseEventListener.bind(this), c = this._keyboardEventListener.bind(this), g = m._mouseEvents, k = 0;k < g.length;k++) {
-          window.addEventListener(g[k], a);
-        }
-        a = m._keyboardEvents;
-        for (k = 0;k < a.length;k++) {
-          window.addEventListener(a[k], c);
+      h.prototype._mouseEventListener = function(a) {
+        var d = this._easel.getMousePosition(a, this._content), d = new g(d.x, d.y), h = new b, f = new k.Remoting.GFX.GFXChannelSerializer;
+        f.output = h;
+        f.writeMouseEvent(a, d);
+        this.onSendUpdates(h, []);
+      };
+      h.prototype._keyboardEventListener = function(a) {
+        var d = new b, g = new k.Remoting.GFX.GFXChannelSerializer;
+        g.output = d;
+        g.writeKeyboardEvent(a);
+        this.onSendUpdates(d, []);
+      };
+      h.prototype._addEventListeners = function() {
+        for (var a = this._mouseEventListener.bind(this), b = this._keyboardEventListener.bind(this), g = h._mouseEvents, f = 0;f < g.length;f++) {
+          window.addEventListener(g[f], a);
+        }
+        a = h._keyboardEvents;
+        for (f = 0;f < a.length;f++) {
+          window.addEventListener(a[f], b);
         }
         this._addFocusEventListeners();
         this._easel.addEventListener("resize", this._resizeEventListener.bind(this));
       };
-      m.prototype._sendFocusEvent = function(a) {
-        var g = new c, m = new l.Remoting.GFX.GFXChannelSerializer;
-        m.output = g;
-        m.writeFocusEvent(a);
-        this.onSendUpdates(g, []);
+      h.prototype._sendFocusEvent = function(a) {
+        var d = new b, g = new k.Remoting.GFX.GFXChannelSerializer;
+        g.output = d;
+        g.writeFocusEvent(a);
+        this.onSendUpdates(d, []);
       };
-      m.prototype._addFocusEventListeners = function() {
+      h.prototype._addFocusEventListeners = function() {
         var a = this;
-        document.addEventListener("visibilitychange", function(c) {
+        document.addEventListener("visibilitychange", function(b) {
           a._sendFocusEvent(document.hidden ? 0 : 1);
         });
-        window.addEventListener("focus", function(c) {
+        window.addEventListener("focus", function(b) {
           a._sendFocusEvent(3);
         });
-        window.addEventListener("blur", function(c) {
+        window.addEventListener("blur", function(b) {
           a._sendFocusEvent(2);
         });
       };
-      m.prototype._resizeEventListener = function() {
+      h.prototype._resizeEventListener = function() {
         this.onDisplayParameters(this._easel.getDisplayParameters());
       };
-      m.prototype.onDisplayParameters = function(a) {
+      h.prototype.onDisplayParameters = function(a) {
         throw Error("This method is abstract");
       };
-      m.prototype.processUpdates = function(a, c, g) {
+      h.prototype.processUpdates = function(a, b, g) {
         void 0 === g && (g = null);
-        var k = new l.Remoting.GFX.GFXChannelDeserializer;
-        k.input = a;
-        k.inputAssets = c;
-        k.output = g;
-        k.context = this._context;
-        k.read();
+        var f = new k.Remoting.GFX.GFXChannelDeserializer;
+        f.input = a;
+        f.inputAssets = b;
+        f.output = g;
+        f.context = this._context;
+        f.read();
       };
-      m.prototype.processExternalCommand = function(a) {
+      h.prototype.processExternalCommand = function(a) {
         if ("isEnabled" === a.action) {
           a.result = !1;
         } else {
           throw Error("This command is not supported");
         }
       };
-      m.prototype.processVideoControl = function(a, c, g) {
-        var k = this._context, l = k._getVideoAsset(a);
-        if (!l) {
-          if (1 !== c) {
+      h.prototype.processVideoControl = function(a, b, g) {
+        var f = this._context, h = f._getVideoAsset(a);
+        if (!h) {
+          if (1 !== b) {
             return;
           }
-          k.registerVideo(a);
-          l = k._getVideoAsset(a);
+          f.registerVideo(a);
+          h = f._getVideoAsset(a);
         }
-        return l.processControlRequest(c, g);
+        return h.processControlRequest(b, g);
       };
-      m.prototype.processRegisterFontOrImage = function(a, c, g, k, l) {
-        "font" === g ? this._context.registerFont(a, k, l) : this._context.registerImage(a, c, k, l);
+      h.prototype.processRegisterFontOrImage = function(a, b, g, f, h) {
+        "font" === g ? this._context.registerFont(a, f, h) : this._context.registerImage(a, b, f, h);
       };
-      m.prototype.processFSCommand = function(a, c) {
+      h.prototype.processFSCommand = function(a, b) {
       };
-      m.prototype.processFrame = function() {
+      h.prototype.processFrame = function() {
       };
-      m.prototype.onExernalCallback = function(a) {
+      h.prototype.onExernalCallback = function(a) {
         throw Error("This method is abstract");
       };
-      m.prototype.sendExernalCallback = function(a, c) {
-        var g = {functionName:a, args:c};
+      h.prototype.sendExernalCallback = function(a, b) {
+        var g = {functionName:a, args:b};
         this.onExernalCallback(g);
         if (g.error) {
           throw Error(g.error);
         }
         return g.result;
       };
-      m.prototype.onVideoPlaybackEvent = function(a, c, g) {
+      h.prototype.onVideoPlaybackEvent = function(a, b, g) {
         throw Error("This method is abstract");
       };
-      m.prototype.sendVideoPlaybackEvent = function(a, c, g) {
-        this.onVideoPlaybackEvent(a, c, g);
+      h.prototype.sendVideoPlaybackEvent = function(a, b, g) {
+        this.onVideoPlaybackEvent(a, b, g);
       };
-      m._mouseEvents = l.Remoting.MouseEventNames;
-      m._keyboardEvents = l.Remoting.KeyboardEventNames;
-      return m;
+      h._mouseEvents = k.Remoting.MouseEventNames;
+      h._keyboardEvents = k.Remoting.KeyboardEventNames;
+      return h;
     }();
-    r.EaselHost = t;
-  })(l.GFX || (l.GFX = {}));
+    p.EaselHost = u;
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.ArrayUtilities.DataBuffer, t = l.CircularBuffer, m = l.Tools.Profiler.TimelineBuffer, a = function(a) {
-        function g(c, l, m) {
-          a.call(this, c);
+      var b = k.ArrayUtilities.DataBuffer, u = k.CircularBuffer, h = k.Tools.Profiler.TimelineBuffer, a = function(a) {
+        function g(b, h, k) {
+          a.call(this, b);
           this._timelineRequests = Object.create(null);
-          this._playerWindow = l;
-          this._window = m;
+          this._playerWindow = h;
+          this._window = k;
           this._window.addEventListener("message", function(a) {
             this.onWindowMessage(a.data);
           }.bind(this));
@@ -12610,67 +12664,67 @@
           }.bind(this));
         }
         __extends(g, a);
-        g.prototype.onSendUpdates = function(a, c) {
-          var g = a.getBytes();
-          this._playerWindow.postMessage({type:"gfx", updates:g, assets:c}, "*", [g.buffer]);
+        g.prototype.onSendUpdates = function(a, b) {
+          var d = a.getBytes();
+          this._playerWindow.postMessage({type:"gfx", updates:d, assets:b}, "*", [d.buffer]);
         };
         g.prototype.onExernalCallback = function(a) {
-          var c = this._playerWindow.document.createEvent("CustomEvent");
-          c.initCustomEvent("syncmessage", !1, !1, {type:"externalCallback", request:a});
-          this._playerWindow.dispatchEvent(c);
+          var b = this._playerWindow.document.createEvent("CustomEvent");
+          b.initCustomEvent("syncmessage", !1, !1, {type:"externalCallback", request:a});
+          this._playerWindow.dispatchEvent(b);
         };
         g.prototype.onDisplayParameters = function(a) {
           this._playerWindow.postMessage({type:"displayParameters", params:a}, "*");
         };
-        g.prototype.onVideoPlaybackEvent = function(a, c, g) {
-          var h = this._playerWindow.document.createEvent("CustomEvent");
-          h.initCustomEvent("syncmessage", !1, !1, {type:"videoPlayback", id:a, eventType:c, data:g});
-          this._playerWindow.dispatchEvent(h);
-        };
-        g.prototype.requestTimeline = function(a, c) {
-          return new Promise(function(g) {
-            this._timelineRequests[a] = g;
-            this._playerWindow.postMessage({type:"timeline", cmd:c, request:a}, "*");
+        g.prototype.onVideoPlaybackEvent = function(a, b, d) {
+          var g = this._playerWindow.document.createEvent("CustomEvent");
+          g.initCustomEvent("syncmessage", !1, !1, {type:"videoPlayback", id:a, eventType:b, data:d});
+          this._playerWindow.dispatchEvent(g);
+        };
+        g.prototype.requestTimeline = function(a, b) {
+          return new Promise(function(d) {
+            this._timelineRequests[a] = d;
+            this._playerWindow.postMessage({type:"timeline", cmd:b, request:a}, "*");
           }.bind(this));
         };
-        g.prototype.onWindowMessage = function(a, g) {
-          void 0 === g && (g = !0);
+        g.prototype.onWindowMessage = function(a, d) {
+          void 0 === d && (d = !0);
           if ("object" === typeof a && null !== a) {
             if ("player" === a.type) {
-              var h = c.FromArrayBuffer(a.updates.buffer);
-              if (g) {
-                this.processUpdates(h, a.assets);
+              var g = b.FromArrayBuffer(a.updates.buffer);
+              if (d) {
+                this.processUpdates(g, a.assets);
               } else {
-                var l = new c;
-                this.processUpdates(h, a.assets, l);
-                a.result = l.toPlainObject();
+                var k = new b;
+                this.processUpdates(g, a.assets, k);
+                a.result = k.toPlainObject();
               }
             } else {
-              "frame" !== a.type && ("external" === a.type ? this.processExternalCommand(a.request) : "videoControl" === a.type ? a.result = this.processVideoControl(a.id, a.eventType, a.data) : "registerFontOrImage" === a.type ? this.processRegisterFontOrImage(a.syncId, a.symbolId, a.assetType, a.data, a.resolve) : "fscommand" !== a.type && "timelineResponse" === a.type && a.timeline && (a.timeline.__proto__ = m.prototype, a.timeline._marks.__proto__ = t.prototype, a.timeline._times.__proto__ = 
-              t.prototype, this._timelineRequests[a.request](a.timeline)));
+              "frame" !== a.type && ("external" === a.type ? this.processExternalCommand(a.request) : "videoControl" === a.type ? a.result = this.processVideoControl(a.id, a.eventType, a.data) : "registerFontOrImage" === a.type ? this.processRegisterFontOrImage(a.syncId, a.symbolId, a.assetType, a.data, a.resolve) : "fscommand" !== a.type && "timelineResponse" === a.type && a.timeline && (a.timeline.__proto__ = h.prototype, a.timeline._marks.__proto__ = u.prototype, a.timeline._times.__proto__ = 
+              u.prototype, this._timelineRequests[a.request](a.timeline)));
             }
           }
         };
         return g;
-      }(r.EaselHost);
+      }(p.EaselHost);
       g.WindowEaselHost = a;
-    })(r.Window || (r.Window = {}));
-  })(l.GFX || (l.GFX = {}));
+    })(p.Window || (p.Window = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
-(function(l) {
-  (function(r) {
+(function(k) {
+  (function(p) {
     (function(g) {
-      var c = l.ArrayUtilities.DataBuffer, t = function(g) {
+      var b = k.ArrayUtilities.DataBuffer, u = function(g) {
         function a(a) {
           g.call(this, a);
-          this._worker = l.Player.Test.FakeSyncWorker.instance;
+          this._worker = k.Player.Test.FakeSyncWorker.instance;
           this._worker.addEventListener("message", this._onWorkerMessage.bind(this));
           this._worker.addEventListener("syncmessage", this._onSyncWorkerMessage.bind(this));
         }
         __extends(a, g);
-        a.prototype.onSendUpdates = function(a, c) {
-          var g = a.getBytes();
-          this._worker.postMessage({type:"gfx", updates:g, assets:c}, [g.buffer]);
+        a.prototype.onSendUpdates = function(a, b) {
+          var f = a.getBytes();
+          this._worker.postMessage({type:"gfx", updates:f, assets:b}, [f.buffer]);
         };
         a.prototype.onExernalCallback = function(a) {
           this._worker.postSyncMessage({type:"externalCallback", request:a});
@@ -12678,50 +12732,50 @@
         a.prototype.onDisplayParameters = function(a) {
           this._worker.postMessage({type:"displayParameters", params:a});
         };
-        a.prototype.onVideoPlaybackEvent = function(a, c, g) {
-          this._worker.postMessage({type:"videoPlayback", id:a, eventType:c, data:g});
+        a.prototype.onVideoPlaybackEvent = function(a, b, f) {
+          this._worker.postMessage({type:"videoPlayback", id:a, eventType:b, data:f});
         };
-        a.prototype.requestTimeline = function(a, c) {
-          var g;
+        a.prototype.requestTimeline = function(a, b) {
+          var f;
           switch(a) {
             case "AVM2":
-              g = l.AVM2.timelineBuffer;
+              f = k.AVM2.timelineBuffer;
               break;
             case "Player":
-              g = l.Player.timelineBuffer;
+              f = k.Player.timelineBuffer;
               break;
             case "SWF":
-              g = l.SWF.timelineBuffer;
+              f = k.SWF.timelineBuffer;
           }
-          "clear" === c && g && g.reset();
-          return Promise.resolve(g);
+          "clear" === b && f && f.reset();
+          return Promise.resolve(f);
         };
         a.prototype._onWorkerMessage = function(a, g) {
           void 0 === g && (g = !0);
-          var k = a.data;
-          if ("object" === typeof k && null !== k) {
-            switch(k.type) {
+          var f = a.data;
+          if ("object" === typeof f && null !== f) {
+            switch(f.type) {
               case "player":
-                var l = c.FromArrayBuffer(k.updates.buffer);
+                var h = b.FromArrayBuffer(f.updates.buffer);
                 if (g) {
-                  this.processUpdates(l, k.assets);
+                  this.processUpdates(h, f.assets);
                 } else {
-                  var m = new c;
-                  this.processUpdates(l, k.assets, m);
-                  a.result = m.toPlainObject();
+                  var k = new b;
+                  this.processUpdates(h, f.assets, k);
+                  a.result = k.toPlainObject();
                   a.handled = !0;
                 }
                 break;
               case "external":
-                a.result = this.processExternalCommand(k.command);
+                a.result = this.processExternalCommand(f.command);
                 a.handled = !0;
                 break;
               case "videoControl":
-                a.result = this.processVideoControl(k.id, k.eventType, k.data);
+                a.result = this.processVideoControl(f.id, f.eventType, f.data);
                 a.handled = !0;
                 break;
               case "registerFontOrImage":
-                this.processRegisterFontOrImage(k.syncId, k.symbolId, k.assetType, k.data, k.resolve), a.handled = !0;
+                this.processRegisterFontOrImage(f.syncId, f.symbolId, f.assetType, f.data, f.resolve), a.handled = !0;
             }
           }
         };
@@ -12729,10 +12783,10 @@
           return this._onWorkerMessage(a, !1);
         };
         return a;
-      }(r.EaselHost);
-      g.TestEaselHost = t;
-    })(r.Test || (r.Test = {}));
-  })(l.GFX || (l.GFX = {}));
+      }(p.EaselHost);
+      g.TestEaselHost = u;
+    })(p.Test || (p.Test = {}));
+  })(k.GFX || (k.GFX = {}));
 })(Shumway || (Shumway = {}));
 console.timeEnd("Load GFX Dependencies");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/shumway.player.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/shumway.player.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/shumway.player.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/shumway.player.js	2015-02-28 15:03:03.000000000 +0000
@@ -16,9 +16,9 @@
 */
 console.time("Load Player Dependencies");
 console.time("Load Shared Dependencies");
-var Shumway, Shumway$$inline_20 = Shumway || (Shumway = {});
-Shumway$$inline_20.version = "0.9.3775";
-Shumway$$inline_20.build = "a82ac47";
+var Shumway, Shumway$$inline_24 = Shumway || (Shumway = {});
+Shumway$$inline_24.version = "0.10.182";
+Shumway$$inline_24.build = "0195a96";
 var jsGlobal = function() {
   return this || (0,eval)("this//# sourceURL=jsGlobal-getter");
 }(), inBrowser = "undefined" !== typeof window && "document" in window && "plugins" in window.document, inFirefox = "undefined" !== typeof navigator && 0 <= navigator.userAgent.indexOf("Firefox");
@@ -39,7 +39,7 @@
   function a(f) {
     return "object" === typeof f || "function" === typeof f;
   }
-  function r(f) {
+  function q(f) {
     return String(Number(f)) === f;
   }
   function v(f) {
@@ -60,19 +60,19 @@
     if (e > d.UINT32_CHAR_BUFFER_LENGTH) {
       return!1;
     }
-    var q = 0, b = f.charCodeAt(q++) - 48;
+    var n = 0, b = f.charCodeAt(n++) - 48;
     if (1 > b || 9 < b) {
       return!1;
     }
-    for (var n = 0, x = 0;q < e;) {
-      x = f.charCodeAt(q++) - 48;
+    for (var r = 0, x = 0;n < e;) {
+      x = f.charCodeAt(n++) - 48;
       if (0 > x || 9 < x) {
         return!1;
       }
-      n = b;
+      r = b;
       b = 10 * b + x;
     }
-    return n < d.UINT32_MAX_DIV_10 || n === d.UINT32_MAX_DIV_10 && x <= d.UINT32_MAX_MOD_10 ? !0 : !1;
+    return r < d.UINT32_MAX_DIV_10 || r === d.UINT32_MAX_DIV_10 && x <= d.UINT32_MAX_MOD_10 ? !0 : !1;
   }
   (function(f) {
     f[f._0 = 48] = "_0";
@@ -110,14 +110,14 @@
   d.toNumber = function(f) {
     return+f;
   };
-  d.isNumericString = r;
+  d.isNumericString = q;
   d.isNumeric = function(f) {
     if ("number" === typeof f) {
       return!0;
     }
     if ("string" === typeof f) {
       var b = f.charCodeAt(0);
-      return 65 <= b && 90 >= b || 97 <= b && 122 >= b || 36 === b || 95 === b ? !1 : v(f) || r(f);
+      return 65 <= b && 90 >= b || 97 <= b && 122 >= b || 36 === b || 95 === b ? !1 : v(f) || q(f);
     }
     return!1;
   };
@@ -125,30 +125,30 @@
   d.isNullOrUndefined = function(f) {
     return void 0 == f;
   };
-  var u;
+  var t;
   (function(f) {
     f.error = function(b) {
       console.error(b);
       throw Error(b);
     };
-    f.assert = function(b, q) {
-      void 0 === q && (q = "assertion failed");
+    f.assert = function(b, n) {
+      void 0 === n && (n = "assertion failed");
       "" === b && (b = !0);
       if (!b) {
         if ("undefined" !== typeof console && "assert" in console) {
-          throw console.assert(!1, q), Error(q);
+          throw console.assert(!1, n), Error(n);
         }
-        f.error(q.toString());
+        f.error(n.toString());
       }
     };
     f.assertUnreachable = function(b) {
-      var q = Error().stack.split("\n")[1];
-      throw Error("Reached unreachable location " + q + b);
+      var n = Error().stack.split("\n")[1];
+      throw Error("Reached unreachable location " + n + b);
     };
-    f.assertNotImplemented = function(b, q) {
-      b || f.error("notImplemented: " + q);
+    f.assertNotImplemented = function(b, n) {
+      b || f.error("notImplemented: " + n);
     };
-    f.warning = function(b, q, n) {
+    f.warning = function(b, n, r) {
     };
     f.notUsed = function(b) {
     };
@@ -168,37 +168,37 @@
     f.unexpectedCase = function(b) {
       f.assert(!1, "Unexpected Case: " + b);
     };
-  })(u = d.Debug || (d.Debug = {}));
+  })(t = d.Debug || (d.Debug = {}));
   d.getTicks = function() {
     return performance.now();
   };
   (function(f) {
-    function b(b, n) {
+    function b(b, r) {
       for (var e = 0, f = b.length;e < f;e++) {
-        if (b[e] === n) {
+        if (b[e] === r) {
           return e;
         }
       }
-      b.push(n);
+      b.push(r);
       return b.length - 1;
     }
-    f.popManyInto = function(b, n, e) {
-      for (var f = n - 1;0 <= f;f--) {
+    f.popManyInto = function(b, r, e) {
+      for (var f = r - 1;0 <= f;f--) {
         e[f] = b.pop();
       }
-      e.length = n;
+      e.length = r;
     };
-    f.popMany = function(b, n) {
-      var e = b.length - n, f = b.slice(e, this.length);
+    f.popMany = function(b, r) {
+      var e = b.length - r, f = b.slice(e, this.length);
       b.length = e;
       return f;
     };
-    f.popManyIntoVoid = function(b, n) {
-      b.length -= n;
+    f.popManyIntoVoid = function(b, r) {
+      b.length -= r;
     };
-    f.pushMany = function(b, n) {
-      for (var e = 0;e < n.length;e++) {
-        b.push(n[e]);
+    f.pushMany = function(b, r) {
+      for (var e = 0;e < r.length;e++) {
+        b.push(r[e]);
       }
     };
     f.top = function(b) {
@@ -210,20 +210,20 @@
     f.peek = function(b) {
       return b[b.length - 1];
     };
-    f.indexOf = function(b, n) {
+    f.indexOf = function(b, r) {
       for (var e = 0, f = b.length;e < f;e++) {
-        if (b[e] === n) {
+        if (b[e] === r) {
           return e;
         }
       }
       return-1;
     };
-    f.equals = function(b, n) {
-      if (b.length !== n.length) {
+    f.equals = function(b, r) {
+      if (b.length !== r.length) {
         return!1;
       }
       for (var e = 0;e < b.length;e++) {
-        if (b[e] !== n[e]) {
+        if (b[e] !== r[e]) {
           return!1;
         }
       }
@@ -231,29 +231,29 @@
     };
     f.pushUnique = b;
     f.unique = function(e) {
-      for (var n = [], f = 0;f < e.length;f++) {
-        b(n, e[f]);
+      for (var r = [], f = 0;f < e.length;f++) {
+        b(r, e[f]);
       }
-      return n;
+      return r;
     };
-    f.copyFrom = function(b, n) {
+    f.copyFrom = function(b, r) {
       b.length = 0;
-      f.pushMany(b, n);
+      f.pushMany(b, r);
     };
-    f.ensureTypedArrayCapacity = function(b, n) {
-      if (b.length < n) {
+    f.ensureTypedArrayCapacity = function(b, r) {
+      if (b.length < r) {
         var e = b;
-        b = new b.constructor(d.IntegerUtilities.nearestPowerOfTwo(n));
+        b = new b.constructor(d.IntegerUtilities.nearestPowerOfTwo(r));
         b.set(e, 0);
       }
       return b;
     };
     var e = function() {
-      function b(n) {
-        void 0 === n && (n = 16);
+      function b(r) {
+        void 0 === r && (r = 16);
         this._f32 = this._i32 = this._u16 = this._u8 = null;
         this._offset = 0;
-        this.ensureCapacity(n);
+        this.ensureCapacity(r);
       }
       b.prototype.reset = function() {
         this._offset = 0;
@@ -304,30 +304,30 @@
         this._f32[this._offset >> 2] = b;
         this._offset += 4;
       };
-      b.prototype.write4Floats = function(b, e, q, f) {
+      b.prototype.write4Floats = function(b, e, n, f) {
         this.ensureCapacity(this._offset + 16);
-        this.write4FloatsUnsafe(b, e, q, f);
+        this.write4FloatsUnsafe(b, e, n, f);
       };
-      b.prototype.write4FloatsUnsafe = function(b, e, q, f) {
+      b.prototype.write4FloatsUnsafe = function(b, e, n, f) {
         var g = this._offset >> 2;
         this._f32[g + 0] = b;
         this._f32[g + 1] = e;
-        this._f32[g + 2] = q;
+        this._f32[g + 2] = n;
         this._f32[g + 3] = f;
         this._offset += 16;
       };
-      b.prototype.write6Floats = function(b, e, q, f, g, c) {
+      b.prototype.write6Floats = function(b, e, n, f, g, m) {
         this.ensureCapacity(this._offset + 24);
-        this.write6FloatsUnsafe(b, e, q, f, g, c);
+        this.write6FloatsUnsafe(b, e, n, f, g, m);
       };
-      b.prototype.write6FloatsUnsafe = function(b, e, q, f, g, c) {
-        var s = this._offset >> 2;
-        this._f32[s + 0] = b;
-        this._f32[s + 1] = e;
-        this._f32[s + 2] = q;
-        this._f32[s + 3] = f;
-        this._f32[s + 4] = g;
-        this._f32[s + 5] = c;
+      b.prototype.write6FloatsUnsafe = function(b, e, n, f, g, m) {
+        var c = this._offset >> 2;
+        this._f32[c + 0] = b;
+        this._f32[c + 1] = e;
+        this._f32[c + 2] = n;
+        this._f32[c + 3] = f;
+        this._f32[c + 4] = g;
+        this._f32[c + 5] = m;
         this._offset += 24;
       };
       b.prototype.subF32View = function() {
@@ -342,9 +342,9 @@
       b.prototype.subU8View = function() {
         return this._u8.subarray(0, this._offset);
       };
-      b.prototype.hashWords = function(b, e, q) {
+      b.prototype.hashWords = function(b, e, n) {
         e = this._i32;
-        for (var f = 0;f < q;f++) {
+        for (var f = 0;f < n;f++) {
           b = (31 * b | 0) + e[f] | 0;
         }
         return b;
@@ -358,7 +358,7 @@
     }();
     f.ArrayWriter = e;
   })(d.ArrayUtilities || (d.ArrayUtilities = {}));
-  var t = function() {
+  var u = function() {
     function f(b) {
       this._u8 = new Uint8Array(b);
       this._u16 = new Uint16Array(b);
@@ -384,23 +384,23 @@
     };
     return f;
   }();
-  d.ArrayReader = t;
+  d.ArrayReader = u;
   (function(f) {
-    function b(b, n) {
-      return Object.prototype.hasOwnProperty.call(b, n);
+    function b(b, r) {
+      return Object.prototype.hasOwnProperty.call(b, r);
     }
-    function e(e, n) {
-      for (var f in n) {
-        b(n, f) && (e[f] = n[f]);
+    function e(e, r) {
+      for (var f in r) {
+        b(r, f) && (e[f] = r[f]);
       }
     }
     f.boxValue = function(b) {
       return void 0 == b || a(b) ? b : Object(b);
     };
     f.toKeyValueArray = function(b) {
-      var n = Object.prototype.hasOwnProperty, e = [], f;
+      var r = Object.prototype.hasOwnProperty, e = [], f;
       for (f in b) {
-        n.call(b, f) && e.push([f, b[f]]);
+        r.call(b, f) && e.push([f, b[f]]);
       }
       return e;
     };
@@ -408,22 +408,22 @@
       return Object.getOwnPropertyDescriptor(b, "prototype").writable;
     };
     f.hasOwnProperty = b;
-    f.propertyIsEnumerable = function(b, n) {
-      return Object.prototype.propertyIsEnumerable.call(b, n);
+    f.propertyIsEnumerable = function(b, r) {
+      return Object.prototype.propertyIsEnumerable.call(b, r);
     };
-    f.getOwnPropertyDescriptor = function(b, n) {
-      return Object.getOwnPropertyDescriptor(b, n);
+    f.getOwnPropertyDescriptor = function(b, r) {
+      return Object.getOwnPropertyDescriptor(b, r);
     };
-    f.hasOwnGetter = function(b, n) {
-      var e = Object.getOwnPropertyDescriptor(b, n);
+    f.hasOwnGetter = function(b, r) {
+      var e = Object.getOwnPropertyDescriptor(b, r);
       return!(!e || !e.get);
     };
-    f.getOwnGetter = function(b, n) {
-      var e = Object.getOwnPropertyDescriptor(b, n);
+    f.getOwnGetter = function(b, r) {
+      var e = Object.getOwnPropertyDescriptor(b, r);
       return e ? e.get : null;
     };
-    f.hasOwnSetter = function(b, n) {
-      var e = Object.getOwnPropertyDescriptor(b, n);
+    f.hasOwnSetter = function(b, r) {
+      var e = Object.getOwnPropertyDescriptor(b, r);
       return!(!e || !e.set);
     };
     f.createMap = function() {
@@ -432,43 +432,43 @@
     f.createArrayMap = function() {
       return[];
     };
-    f.defineReadOnlyProperty = function(b, n, e) {
-      Object.defineProperty(b, n, {value:e, writable:!1, configurable:!0, enumerable:!1});
+    f.defineReadOnlyProperty = function(b, r, e) {
+      Object.defineProperty(b, r, {value:e, writable:!1, configurable:!0, enumerable:!1});
     };
     f.getOwnPropertyDescriptors = function(b) {
-      for (var n = f.createMap(), e = Object.getOwnPropertyNames(b), g = 0;g < e.length;g++) {
-        n[e[g]] = Object.getOwnPropertyDescriptor(b, e[g]);
+      for (var r = f.createMap(), e = Object.getOwnPropertyNames(b), g = 0;g < e.length;g++) {
+        r[e[g]] = Object.getOwnPropertyDescriptor(b, e[g]);
       }
-      return n;
+      return r;
     };
     f.cloneObject = function(b) {
-      var n = Object.create(Object.getPrototypeOf(b));
-      e(n, b);
-      return n;
+      var r = Object.create(Object.getPrototypeOf(b));
+      e(r, b);
+      return r;
     };
-    f.copyProperties = function(b, n) {
-      for (var e in n) {
-        b[e] = n[e];
+    f.copyProperties = function(b, r) {
+      for (var e in r) {
+        b[e] = r[e];
       }
     };
     f.copyOwnProperties = e;
-    f.copyOwnPropertyDescriptors = function(e, n, f) {
+    f.copyOwnPropertyDescriptors = function(e, r, f) {
       void 0 === f && (f = !0);
-      for (var g in n) {
-        if (b(n, g)) {
-          var c = Object.getOwnPropertyDescriptor(n, g);
+      for (var g in r) {
+        if (b(r, g)) {
+          var m = Object.getOwnPropertyDescriptor(r, g);
           if (f || !b(e, g)) {
             try {
-              Object.defineProperty(e, g, c);
-            } catch (s) {
+              Object.defineProperty(e, g, m);
+            } catch (c) {
             }
           }
         }
       }
     };
-    f.getLatestGetterOrSetterPropertyDescriptor = function(b, n) {
+    f.getLatestGetterOrSetterPropertyDescriptor = function(b, r) {
       for (var e = {};b;) {
-        var f = Object.getOwnPropertyDescriptor(b, n);
+        var f = Object.getOwnPropertyDescriptor(b, r);
         f && (e.get = e.get || f.get, e.set = e.set || f.set);
         if (e.get && e.set) {
           break;
@@ -477,31 +477,31 @@
       }
       return e;
     };
-    f.defineNonEnumerableGetterOrSetter = function(b, n, e, g) {
-      var c = f.getLatestGetterOrSetterPropertyDescriptor(b, n);
-      c.configurable = !0;
-      c.enumerable = !1;
-      g ? c.get = e : c.set = e;
-      Object.defineProperty(b, n, c);
-    };
-    f.defineNonEnumerableGetter = function(b, n, e) {
-      Object.defineProperty(b, n, {get:e, configurable:!0, enumerable:!1});
-    };
-    f.defineNonEnumerableSetter = function(b, n, e) {
-      Object.defineProperty(b, n, {set:e, configurable:!0, enumerable:!1});
-    };
-    f.defineNonEnumerableProperty = function(b, n, e) {
-      Object.defineProperty(b, n, {value:e, writable:!0, configurable:!0, enumerable:!1});
-    };
-    f.defineNonEnumerableForwardingProperty = function(b, n, e) {
-      Object.defineProperty(b, n, {get:l.makeForwardingGetter(e), set:l.makeForwardingSetter(e), writable:!0, configurable:!0, enumerable:!1});
-    };
-    f.defineNewNonEnumerableProperty = function(b, n, e) {
-      f.defineNonEnumerableProperty(b, n, e);
-    };
-    f.createPublicAliases = function(b, n) {
-      for (var e = {value:null, writable:!0, configurable:!0, enumerable:!1}, f = 0;f < n.length;f++) {
-        var g = n[f];
+    f.defineNonEnumerableGetterOrSetter = function(b, r, e, g) {
+      var m = f.getLatestGetterOrSetterPropertyDescriptor(b, r);
+      m.configurable = !0;
+      m.enumerable = !1;
+      g ? m.get = e : m.set = e;
+      Object.defineProperty(b, r, m);
+    };
+    f.defineNonEnumerableGetter = function(b, r, e) {
+      Object.defineProperty(b, r, {get:e, configurable:!0, enumerable:!1});
+    };
+    f.defineNonEnumerableSetter = function(b, r, e) {
+      Object.defineProperty(b, r, {set:e, configurable:!0, enumerable:!1});
+    };
+    f.defineNonEnumerableProperty = function(b, r, e) {
+      Object.defineProperty(b, r, {value:e, writable:!0, configurable:!0, enumerable:!1});
+    };
+    f.defineNonEnumerableForwardingProperty = function(b, r, e) {
+      Object.defineProperty(b, r, {get:l.makeForwardingGetter(e), set:l.makeForwardingSetter(e), writable:!0, configurable:!0, enumerable:!1});
+    };
+    f.defineNewNonEnumerableProperty = function(b, r, e) {
+      f.defineNonEnumerableProperty(b, r, e);
+    };
+    f.createPublicAliases = function(b, r) {
+      for (var e = {value:null, writable:!0, configurable:!0, enumerable:!1}, f = 0;f < r.length;f++) {
+        var g = r[f];
         e.value = b[g];
         Object.defineProperty(b, "$Bg" + g, e);
       }
@@ -516,19 +516,19 @@
       return new Function("value", 'this["' + b + '"] = value;//# sourceURL=fwd-set-' + b + ".as");
     };
     f.bindSafely = function(b, e) {
-      function f() {
+      function n() {
         return b.apply(e, arguments);
       }
-      f.boundTo = e;
-      return f;
+      n.boundTo = e;
+      return n;
     };
   })(l = d.FunctionUtilities || (d.FunctionUtilities = {}));
   (function(f) {
     function b(b) {
       return "string" === typeof b ? '"' + b + '"' : "number" === typeof b || "boolean" === typeof b ? String(b) : b instanceof Array ? "[] " + b.length : typeof b;
     }
-    f.repeatString = function(b, n) {
-      for (var e = "", f = 0;f < n;f++) {
+    f.repeatString = function(b, r) {
+      for (var e = "", n = 0;n < r;n++) {
         e += b;
       }
       return e;
@@ -538,59 +538,59 @@
       return 1024 > b ? b + " B" : 1048576 > b ? (b / 1024).toFixed(2) + "KB" : (b / 1048576).toFixed(2) + "MB";
     };
     f.toSafeString = b;
-    f.toSafeArrayString = function(n) {
-      for (var e = [], f = 0;f < n.length;f++) {
-        e.push(b(n[f]));
+    f.toSafeArrayString = function(r) {
+      for (var e = [], n = 0;n < r.length;n++) {
+        e.push(b(r[n]));
       }
       return e.join(", ");
     };
     f.utf8decode = function(b) {
-      for (var n = new Uint8Array(4 * b.length), e = 0, f = 0, q = b.length;f < q;f++) {
-        var g = b.charCodeAt(f);
+      for (var r = new Uint8Array(4 * b.length), e = 0, n = 0, f = b.length;n < f;n++) {
+        var g = b.charCodeAt(n);
         if (127 >= g) {
-          n[e++] = g;
+          r[e++] = g;
         } else {
           if (55296 <= g && 56319 >= g) {
-            var c = b.charCodeAt(f + 1);
-            56320 <= c && 57343 >= c && (g = ((g & 1023) << 10) + (c & 1023) + 65536, ++f);
+            var x = b.charCodeAt(n + 1);
+            56320 <= x && 57343 >= x && (g = ((g & 1023) << 10) + (x & 1023) + 65536, ++n);
           }
-          0 !== (g & 4292870144) ? (n[e++] = 248 | g >>> 24 & 3, n[e++] = 128 | g >>> 18 & 63, n[e++] = 128 | g >>> 12 & 63, n[e++] = 128 | g >>> 6 & 63) : 0 !== (g & 4294901760) ? (n[e++] = 240 | g >>> 18 & 7, n[e++] = 128 | g >>> 12 & 63, n[e++] = 128 | g >>> 6 & 63) : 0 !== (g & 4294965248) ? (n[e++] = 224 | g >>> 12 & 15, n[e++] = 128 | g >>> 6 & 63) : n[e++] = 192 | g >>> 6 & 31;
-          n[e++] = 128 | g & 63;
+          0 !== (g & 4292870144) ? (r[e++] = 248 | g >>> 24 & 3, r[e++] = 128 | g >>> 18 & 63, r[e++] = 128 | g >>> 12 & 63, r[e++] = 128 | g >>> 6 & 63) : 0 !== (g & 4294901760) ? (r[e++] = 240 | g >>> 18 & 7, r[e++] = 128 | g >>> 12 & 63, r[e++] = 128 | g >>> 6 & 63) : 0 !== (g & 4294965248) ? (r[e++] = 224 | g >>> 12 & 15, r[e++] = 128 | g >>> 6 & 63) : r[e++] = 192 | g >>> 6 & 31;
+          r[e++] = 128 | g & 63;
         }
       }
-      return n.subarray(0, e);
+      return r.subarray(0, e);
     };
     f.utf8encode = function(b) {
-      for (var n = 0, e = "";n < b.length;) {
-        var f = b[n++] & 255;
-        if (127 >= f) {
-          e += String.fromCharCode(f);
+      for (var r = 0, e = "";r < b.length;) {
+        var n = b[r++] & 255;
+        if (127 >= n) {
+          e += String.fromCharCode(n);
         } else {
-          var q = 192, g = 5;
+          var f = 192, g = 5;
           do {
-            if ((f & (q >> 1 | 128)) === q) {
+            if ((n & (f >> 1 | 128)) === f) {
               break;
             }
-            q = q >> 1 | 128;
+            f = f >> 1 | 128;
             --g;
           } while (0 <= g);
           if (0 >= g) {
-            e += String.fromCharCode(f);
+            e += String.fromCharCode(n);
           } else {
-            for (var f = f & (1 << g) - 1, q = !1, c = 5;c >= g;--c) {
-              var x = b[n++];
-              if (128 != (x & 192)) {
-                q = !0;
+            for (var n = n & (1 << g) - 1, f = !1, x = 5;x >= g;--x) {
+              var m = b[r++];
+              if (128 != (m & 192)) {
+                f = !0;
                 break;
               }
-              f = f << 6 | x & 63;
+              n = n << 6 | m & 63;
             }
-            if (q) {
-              for (g = n - (7 - c);g < n;++g) {
+            if (f) {
+              for (g = r - (7 - x);g < r;++g) {
                 e += String.fromCharCode(b[g] & 255);
               }
             } else {
-              e = 65536 <= f ? e + String.fromCharCode(f - 65536 >> 10 & 1023 | 55296, f & 1023 | 56320) : e + String.fromCharCode(f);
+              e = 65536 <= n ? e + String.fromCharCode(n - 65536 >> 10 & 1023 | 55296, n & 1023 | 56320) : e + String.fromCharCode(n);
             }
           }
         }
@@ -598,36 +598,35 @@
       return e;
     };
     f.base64ArrayBuffer = function(b) {
-      var n = "";
+      var r = "";
       b = new Uint8Array(b);
-      for (var e = b.byteLength, f = e % 3, e = e - f, q, g, c, x, s = 0;s < e;s += 3) {
-        x = b[s] << 16 | b[s + 1] << 8 | b[s + 2], q = (x & 16515072) >> 18, g = (x & 258048) >> 12, c = (x & 4032) >> 6, x &= 63, n += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[q] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[g] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[c] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[x];
+      for (var e = b.byteLength, n = e % 3, e = e - n, f, g, x, m, c = 0;c < e;c += 3) {
+        m = b[c] << 16 | b[c + 1] << 8 | b[c + 2], f = (m & 16515072) >> 18, g = (m & 258048) >> 12, x = (m & 4032) >> 6, m &= 63, r += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[f] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[g] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[x] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[m];
       }
-      1 == f ? (x = b[e], n += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(x & 252) >> 2] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(x & 3) << 4] + "==") : 2 == f && (x = b[e] << 8 | b[e + 1], n += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(x & 64512) >> 10] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(x & 1008) >> 4] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(x & 15) << 
+      1 == n ? (m = b[e], r += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(m & 252) >> 2] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(m & 3) << 4] + "==") : 2 == n && (m = b[e] << 8 | b[e + 1], r += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(m & 64512) >> 10] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(m & 1008) >> 4] + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[(m & 15) << 
       2] + "=");
-      return n;
+      return r;
     };
     f.escapeString = function(b) {
       void 0 !== b && (b = b.replace(/[^\w$]/gi, "$"), /^\d/.test(b) && (b = "$" + b));
       return b;
     };
     f.fromCharCodeArray = function(b) {
-      for (var n = "", e = 0;e < b.length;e += 16384) {
-        var f = Math.min(b.length - e, 16384), n = n + String.fromCharCode.apply(null, b.subarray(e, e + f))
+      for (var r = "", e = 0;e < b.length;e += 16384) {
+        var n = Math.min(b.length - e, 16384), r = r + String.fromCharCode.apply(null, b.subarray(e, e + n))
       }
-      return n;
+      return r;
     };
     f.variableLengthEncodeInt32 = function(b) {
-      for (var n = 32 - Math.clz32(b), e = Math.ceil(n / 6), n = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[e], e = e - 1;0 <= e;e--) {
-        n += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[b >> 6 * e & 63];
+      for (var r = 32 - Math.clz32(b), e = Math.ceil(r / 6), r = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[e], e = e - 1;0 <= e;e--) {
+        r += "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[b >> 6 * e & 63];
       }
-      return n;
+      return r;
     };
     f.toEncoding = function(b) {
       return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_"[b];
     };
     f.fromEncoding = function(b) {
-      b = b.charCodeAt(0);
       if (65 <= b && 90 >= b) {
         return b - 65;
       }
@@ -645,145 +644,145 @@
       }
     };
     f.variableLengthDecodeInt32 = function(b) {
-      for (var n = f.fromEncoding(b[0]), e = 0, q = 0;q < n;q++) {
-        var g = 6 * (n - q - 1), e = e | f.fromEncoding(b[1 + q]) << g
+      for (var r = f.fromEncoding(b.charCodeAt(0)), e = 0, n = 0;n < r;n++) {
+        var g = 6 * (r - n - 1), e = e | f.fromEncoding(b.charCodeAt(1 + n)) << g
       }
       return e;
     };
-    f.trimMiddle = function(b, n) {
-      if (b.length <= n) {
+    f.trimMiddle = function(b, r) {
+      if (b.length <= r) {
         return b;
       }
-      var e = n >> 1, f = n - e - 1;
-      return b.substr(0, e) + "\u2026" + b.substr(b.length - f, f);
+      var e = r >> 1, n = r - e - 1;
+      return b.substr(0, e) + "\u2026" + b.substr(b.length - n, n);
     };
-    f.multiple = function(b, n) {
-      for (var e = "", f = 0;f < n;f++) {
+    f.multiple = function(b, r) {
+      for (var e = "", n = 0;n < r;n++) {
         e += b;
       }
       return e;
     };
-    f.indexOfAny = function(b, n, e) {
-      for (var f = b.length, q = 0;q < n.length;q++) {
-        var g = b.indexOf(n[q], e);
-        0 <= g && (f = Math.min(f, g));
+    f.indexOfAny = function(b, r, e) {
+      for (var n = b.length, f = 0;f < r.length;f++) {
+        var g = b.indexOf(r[f], e);
+        0 <= g && (n = Math.min(n, g));
       }
-      return f === b.length ? -1 : f;
+      return n === b.length ? -1 : n;
     };
-    var e = Array(3), q = Array(4), n = Array(5), g = Array(6), c = Array(7), s = Array(8), p = Array(9);
-    f.concat3 = function(b, n, f) {
+    var e = Array(3), n = Array(4), r = Array(5), g = Array(6), m = Array(7), c = Array(8), h = Array(9);
+    f.concat3 = function(b, r, n) {
       e[0] = b;
-      e[1] = n;
-      e[2] = f;
+      e[1] = r;
+      e[2] = n;
       return e.join("");
     };
-    f.concat4 = function(b, n, e, f) {
-      q[0] = b;
-      q[1] = n;
-      q[2] = e;
-      q[3] = f;
-      return q.join("");
-    };
-    f.concat5 = function(b, e, f, q, g) {
+    f.concat4 = function(b, r, e, f) {
       n[0] = b;
-      n[1] = e;
-      n[2] = f;
-      n[3] = q;
-      n[4] = g;
+      n[1] = r;
+      n[2] = e;
+      n[3] = f;
       return n.join("");
     };
-    f.concat6 = function(b, n, e, f, q, c) {
+    f.concat5 = function(b, e, n, f, g) {
+      r[0] = b;
+      r[1] = e;
+      r[2] = n;
+      r[3] = f;
+      r[4] = g;
+      return r.join("");
+    };
+    f.concat6 = function(b, r, e, n, f, m) {
       g[0] = b;
-      g[1] = n;
+      g[1] = r;
       g[2] = e;
-      g[3] = f;
-      g[4] = q;
-      g[5] = c;
+      g[3] = n;
+      g[4] = f;
+      g[5] = m;
       return g.join("");
     };
-    f.concat7 = function(b, n, e, f, q, g, x) {
+    f.concat7 = function(b, r, e, n, f, g, x) {
+      m[0] = b;
+      m[1] = r;
+      m[2] = e;
+      m[3] = n;
+      m[4] = f;
+      m[5] = g;
+      m[6] = x;
+      return m.join("");
+    };
+    f.concat8 = function(b, r, e, n, f, g, x, m) {
       c[0] = b;
-      c[1] = n;
+      c[1] = r;
       c[2] = e;
-      c[3] = f;
-      c[4] = q;
+      c[3] = n;
+      c[4] = f;
       c[5] = g;
       c[6] = x;
+      c[7] = m;
       return c.join("");
     };
-    f.concat8 = function(b, n, e, f, q, g, c, x) {
-      s[0] = b;
-      s[1] = n;
-      s[2] = e;
-      s[3] = f;
-      s[4] = q;
-      s[5] = g;
-      s[6] = c;
-      s[7] = x;
-      return s.join("");
-    };
-    f.concat9 = function(b, n, e, f, q, g, c, x, s) {
-      p[0] = b;
-      p[1] = n;
-      p[2] = e;
-      p[3] = f;
-      p[4] = q;
-      p[5] = g;
-      p[6] = c;
-      p[7] = x;
-      p[8] = s;
-      return p.join("");
+    f.concat9 = function(b, r, e, n, f, g, x, m, c) {
+      h[0] = b;
+      h[1] = r;
+      h[2] = e;
+      h[3] = n;
+      h[4] = f;
+      h[5] = g;
+      h[6] = x;
+      h[7] = m;
+      h[8] = c;
+      return h.join("");
     };
   })(d.StringUtilities || (d.StringUtilities = {}));
   (function(f) {
     var b = new Uint8Array([7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]), e = new Int32Array([-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426, -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162, 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632, 
     643717713, -373897302, -701558691, 38016083, -660478335, -405537848, 568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784, 1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556, -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222, -722521979, 76029189, -640364487, -421815835, 530742520, -995338651, -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606, -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649, 
     -145523070, -1120210379, 718787259, -343485551]);
-    f.hashBytesTo32BitsMD5 = function(f, n, g) {
-      var c = 1732584193, s = -271733879, p = -1732584194, m = 271733878, h = g + 72 & -64, l = new Uint8Array(h), a;
-      for (a = 0;a < g;++a) {
-        l[a] = f[n++];
-      }
-      l[a++] = 128;
-      for (f = h - 8;a < f;) {
-        l[a++] = 0;
-      }
-      l[a++] = g << 3 & 255;
-      l[a++] = g >> 5 & 255;
-      l[a++] = g >> 13 & 255;
-      l[a++] = g >> 21 & 255;
-      l[a++] = g >>> 29 & 255;
-      l[a++] = 0;
-      l[a++] = 0;
-      l[a++] = 0;
-      f = new Int32Array(16);
-      for (a = 0;a < h;) {
-        for (g = 0;16 > g;++g, a += 4) {
-          f[g] = l[a] | l[a + 1] << 8 | l[a + 2] << 16 | l[a + 3] << 24;
-        }
-        var r = c;
-        n = s;
-        var t = p, d = m, u, k;
-        for (g = 0;64 > g;++g) {
-          16 > g ? (u = n & t | ~n & d, k = g) : 32 > g ? (u = d & n | ~d & t, k = 5 * g + 1 & 15) : 48 > g ? (u = n ^ t ^ d, k = 3 * g + 5 & 15) : (u = t ^ (n | ~d), k = 7 * g & 15);
-          var v = d, r = r + u + e[g] + f[k] | 0;
-          u = b[g];
-          d = t;
-          t = n;
-          n = n + (r << u | r >>> 32 - u) | 0;
-          r = v;
-        }
-        c = c + r | 0;
-        s = s + n | 0;
-        p = p + t | 0;
-        m = m + d | 0;
+    f.hashBytesTo32BitsMD5 = function(n, r, f) {
+      var g = 1732584193, m = -271733879, c = -1732584194, h = 271733878, p = f + 72 & -64, l = new Uint8Array(p), s;
+      for (s = 0;s < f;++s) {
+        l[s] = n[r++];
+      }
+      l[s++] = 128;
+      for (n = p - 8;s < n;) {
+        l[s++] = 0;
+      }
+      l[s++] = f << 3 & 255;
+      l[s++] = f >> 5 & 255;
+      l[s++] = f >> 13 & 255;
+      l[s++] = f >> 21 & 255;
+      l[s++] = f >>> 29 & 255;
+      l[s++] = 0;
+      l[s++] = 0;
+      l[s++] = 0;
+      n = new Int32Array(16);
+      for (s = 0;s < p;) {
+        for (f = 0;16 > f;++f, s += 4) {
+          n[f] = l[s] | l[s + 1] << 8 | l[s + 2] << 16 | l[s + 3] << 24;
+        }
+        var a = g;
+        r = m;
+        var q = c, u = h, d, t;
+        for (f = 0;64 > f;++f) {
+          16 > f ? (d = r & q | ~r & u, t = f) : 32 > f ? (d = u & r | ~u & q, t = 5 * f + 1 & 15) : 48 > f ? (d = r ^ q ^ u, t = 3 * f + 5 & 15) : (d = q ^ (r | ~u), t = 7 * f & 15);
+          var k = u, a = a + d + e[f] + n[t] | 0;
+          d = b[f];
+          u = q;
+          q = r;
+          r = r + (a << d | a >>> 32 - d) | 0;
+          a = k;
+        }
+        g = g + a | 0;
+        m = m + r | 0;
+        c = c + q | 0;
+        h = h + u | 0;
       }
-      return c;
+      return g;
     };
-    f.hashBytesTo32BitsAdler = function(b, n, e) {
+    f.hashBytesTo32BitsAdler = function(b, r, e) {
       var f = 1, g = 0;
-      for (e = n + e;n < e;++n) {
-        f = (f + (b[n] & 255)) % 65521, g = (g + f) % 65521;
+      for (e = r + e;r < e;++r) {
+        f = (f + (b[r] & 255)) % 65521, g = (g + f) % 65521;
       }
       return g << 16 | f;
     };
@@ -798,9 +797,9 @@
     f.next = function() {
       var b = this._state, e = Math.imul(18273, b[0] & 65535) + (b[0] >>> 16) | 0;
       b[0] = e;
-      var f = Math.imul(36969, b[1] & 65535) + (b[1] >>> 16) | 0;
-      b[1] = f;
-      b = (e << 16) + (f & 65535) | 0;
+      var n = Math.imul(36969, b[1] & 65535) + (b[1] >>> 16) | 0;
+      b[1] = n;
+      b = (e << 16) + (n & 65535) | 0;
       return 2.3283064365386963E-10 * (0 > b ? b + 4294967296 : b);
     };
     f._state = new Uint32Array([57005, 48879]);
@@ -818,15 +817,17 @@
       var b = 0;
       f.prototype = {has:function(b) {
         return b.hasOwnProperty(this.id);
-      }, get:function(b, f) {
-        return b.hasOwnProperty(this.id) ? b[this.id] : f;
-      }, set:function(b, f) {
-        Object.defineProperty(b, this.id, {value:f, enumerable:!1, configurable:!0});
+      }, get:function(b, n) {
+        return b.hasOwnProperty(this.id) ? b[this.id] : n;
+      }, set:function(b, n) {
+        Object.defineProperty(b, this.id, {value:n, enumerable:!1, configurable:!0});
+      }, delete:function(b) {
+        delete b[this.id];
       }};
       jsGlobal.WeakMap = f;
     }
   })();
-  t = function() {
+  u = function() {
     function f() {
       "undefined" !== typeof netscape && netscape.security.PrivilegeManager ? this._map = new WeakMap : this._list = [];
     }
@@ -841,20 +842,20 @@
     };
     f.prototype.forEach = function(b) {
       if (this._map) {
-        "undefined" !== typeof netscape && netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"), Components.utils.nondeterministicGetWeakMapKeys(this._map).forEach(function(n) {
-          0 !== n._referenceCount && b(n);
+        "undefined" !== typeof netscape && netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"), Components.utils.nondeterministicGetWeakMapKeys(this._map).forEach(function(r) {
+          0 !== r._referenceCount && b(r);
         });
       } else {
-        for (var e = this._list, f = 0, n = 0;n < e.length;n++) {
-          var g = e[n];
-          g && (0 === g._referenceCount ? (e[n] = null, f++) : b(g));
-        }
-        if (16 < f && f > e.length >> 2) {
-          f = [];
-          for (n = 0;n < e.length;n++) {
-            (g = e[n]) && 0 < g._referenceCount && f.push(g);
+        for (var e = this._list, n = 0, r = 0;r < e.length;r++) {
+          var f = e[r];
+          f && (0 === f._referenceCount ? (e[r] = null, n++) : b(f));
+        }
+        if (16 < n && n > e.length >> 2) {
+          n = [];
+          for (r = 0;r < e.length;r++) {
+            (f = e[r]) && 0 < f._referenceCount && n.push(f);
           }
-          this._list = f;
+          this._list = n;
         }
       }
     };
@@ -863,14 +864,14 @@
     }, enumerable:!0, configurable:!0});
     return f;
   }();
-  d.WeakList = t;
+  d.WeakList = u;
   var h;
   (function(f) {
     f.pow2 = function(b) {
       return b === (b | 0) ? 0 > b ? 1 / (1 << -b) : 1 << b : Math.pow(2, b);
     };
-    f.clamp = function(b, e, f) {
-      return Math.max(e, Math.min(f, b));
+    f.clamp = function(b, e, n) {
+      return Math.max(e, Math.min(n, b));
     };
     f.roundHalfEven = function(b) {
       if (.5 === Math.abs(b % 1)) {
@@ -879,6 +880,9 @@
       }
       return Math.round(b);
     };
+    f.altTieBreakRound = function(b, e) {
+      return.5 !== Math.abs(b % 1) || e ? Math.round(b) : b | 0;
+    };
     f.epsilonEquals = function(b, e) {
       return 1E-7 > Math.abs(b - e);
     };
@@ -937,10 +941,10 @@
     f.trailingZeros = function(b) {
       return f.ones((b & -b) - 1);
     };
-    f.getFlags = function(b, n) {
+    f.getFlags = function(b, r) {
       var e = "";
-      for (b = 0;b < n.length;b++) {
-        b & 1 << b && (e += n[b] + " ");
+      for (b = 0;b < r.length;b++) {
+        b & 1 << b && (e += r[b] + " ");
       }
       return 0 === e.length ? "" : e.trim();
     };
@@ -960,13 +964,13 @@
       b++;
       return b;
     };
-    f.roundToMultipleOfPowerOfTwo = function(b, n) {
-      var e = (1 << n) - 1;
+    f.roundToMultipleOfPowerOfTwo = function(b, r) {
+      var e = (1 << r) - 1;
       return b + e & ~e;
     };
-    Math.imul || (Math.imul = function(b, n) {
-      var e = b & 65535, f = n & 65535;
-      return e * f + ((b >>> 16 & 65535) * f + e * (n >>> 16 & 65535) << 16 >>> 0) | 0;
+    Math.imul || (Math.imul = function(b, r) {
+      var e = b & 65535, f = r & 65535;
+      return e * f + ((b >>> 16 & 65535) * f + e * (r >>> 16 & 65535) << 16 >>> 0) | 0;
     });
     Math.clz32 || (Math.clz32 = function(b) {
       b |= b >> 1;
@@ -977,29 +981,29 @@
     });
   })(p = d.IntegerUtilities || (d.IntegerUtilities = {}));
   (function(f) {
-    function b(b, f, n, g, c, s) {
-      return(n - b) * (s - f) - (g - f) * (c - b);
+    function b(b, f, r, g, m, c) {
+      return(r - b) * (c - f) - (g - f) * (m - b);
     }
-    f.pointInPolygon = function(b, f, n) {
-      for (var g = 0, c = n.length - 2, s = 0;s < c;s += 2) {
-        var p = n[s + 0], m = n[s + 1], h = n[s + 2], l = n[s + 3];
-        (m <= f && l > f || m > f && l <= f) && b < p + (f - m) / (l - m) * (h - p) && g++;
+    f.pointInPolygon = function(b, f, r) {
+      for (var g = 0, m = r.length - 2, c = 0;c < m;c += 2) {
+        var h = r[c + 0], p = r[c + 1], l = r[c + 2], s = r[c + 3];
+        (p <= f && s > f || p > f && s <= f) && b < h + (f - p) / (s - p) * (l - h) && g++;
       }
       return 1 === (g & 1);
     };
     f.signedArea = b;
-    f.counterClockwise = function(e, f, n, g, c, s) {
-      return 0 < b(e, f, n, g, c, s);
+    f.counterClockwise = function(e, f, r, g, m, c) {
+      return 0 < b(e, f, r, g, m, c);
     };
-    f.clockwise = function(e, f, n, g, c, s) {
-      return 0 > b(e, f, n, g, c, s);
+    f.clockwise = function(e, f, r, g, m, c) {
+      return 0 > b(e, f, r, g, m, c);
     };
-    f.pointInPolygonInt32 = function(b, f, n) {
+    f.pointInPolygonInt32 = function(b, f, r) {
       b |= 0;
       f |= 0;
-      for (var g = 0, c = n.length - 2, s = 0;s < c;s += 2) {
-        var p = n[s + 0], m = n[s + 1], h = n[s + 2], l = n[s + 3];
-        (m <= f && l > f || m > f && l <= f) && b < p + (f - m) / (l - m) * (h - p) && g++;
+      for (var g = 0, m = r.length - 2, c = 0;c < m;c += 2) {
+        var h = r[c + 0], p = r[c + 1], l = r[c + 2], s = r[c + 3];
+        (p <= f && s > f || p > f && s <= f) && b < h + (f - p) / (s - p) * (l - h) && g++;
       }
       return 1 === (g & 1);
     };
@@ -1012,7 +1016,7 @@
     f[f.Info = 16] = "Info";
     f[f.All = 31] = "All";
   })(d.LogLevel || (d.LogLevel = {}));
-  t = function() {
+  u = function() {
     function f(b, e) {
       void 0 === b && (b = !1);
       this._tab = "  ";
@@ -1093,16 +1097,16 @@
       this.colorLns(f.RED, b);
     };
     f.prototype.colorLns = function(b, e) {
-      for (var f = e.split("\n"), n = 0;n < f.length;n++) {
-        this.colorLn(b, f[n]);
+      for (var f = e.split("\n"), r = 0;r < f.length;r++) {
+        this.colorLn(b, f[r]);
       }
     };
     f.prototype.enter = function(b) {
       this._suppressOutput || this._out(this._padding + b);
       this.indent();
     };
-    f.prototype.leaveAndEnter = function() {
-      this.leave("Slots");
+    f.prototype.leaveAndEnter = function(b) {
+      this.leave(b);
       this.indent();
     };
     f.prototype.leave = function(b) {
@@ -1119,11 +1123,11 @@
       void 0 === e && (e = !1);
       void 0 === f && (f = !1);
       e = e || !1;
-      for (var n = 0, g = b.length;n < g;n++) {
-        var c = "";
-        e && (c = null === b[n] ? "null" : void 0 === b[n] ? "undefined" : b[n].constructor.name, c += " ");
-        var s = f ? "" : ("" + n).padRight(" ", 4);
-        this.writeLn(s + c + b[n]);
+      for (var r = 0, g = b.length;r < g;r++) {
+        var m = "";
+        e && (m = null === b[r] ? "null" : void 0 === b[r] ? "undefined" : b[r].constructor.name, m += " ");
+        var c = f ? "" : ("" + r).padRight(" ", 4);
+        this.writeLn(c + m + b[r]);
       }
     };
     f.PURPLE = "\u001b[94m";
@@ -1137,13 +1141,13 @@
     f._consoleOutNoNewline = console.info.bind(console);
     return f;
   }();
-  d.IndentingWriter = t;
+  d.IndentingWriter = u;
   var s = function() {
     return function(f, b) {
       this.value = f;
       this.next = b;
     };
-  }(), t = function() {
+  }(), u = function() {
     function f(b) {
       this._compare = b;
       this._head = null;
@@ -1154,8 +1158,8 @@
       if (this._head) {
         var e = this._head, f = null;
         b = new s(b, null);
-        for (var n = this._compare;e;) {
-          if (0 < n(e.value, b.value)) {
+        for (var r = this._compare;e;) {
+          if (0 < r(e.value, b.value)) {
             f ? (b.next = e, f.next = b) : (b.next = this._head, this._head = b);
             return;
           }
@@ -1168,12 +1172,12 @@
       }
     };
     f.prototype.forEach = function(b) {
-      for (var e = this._head, q = null;e;) {
-        var n = b(e.value);
-        if (n === f.RETURN) {
+      for (var e = this._head, n = null;e;) {
+        var r = b(e.value);
+        if (r === f.RETURN) {
           break;
         } else {
-          n === f.DELETE ? e = q ? q.next = e.next : this._head = this._head.next : (q = e, e = e.next);
+          r === f.DELETE ? e = n ? n.next = e.next : this._head = this._head.next : (n = e, e = e.next);
         }
       }
     };
@@ -1207,8 +1211,8 @@
     f.DELETE = 2;
     return f;
   }();
-  d.SortedList = t;
-  t = function() {
+  d.SortedList = u;
+  u = function() {
     function f(b, e) {
       void 0 === e && (e = 12);
       this.start = this.index = 0;
@@ -1242,287 +1246,287 @@
     };
     return f;
   }();
-  d.CircularBuffer = t;
+  d.CircularBuffer = u;
   (function(f) {
     function b(b) {
       return b + (f.BITS_PER_WORD - 1) >> f.ADDRESS_BITS_PER_WORD << f.ADDRESS_BITS_PER_WORD;
     }
-    function e(b, n) {
+    function e(b, r) {
       b = b || "1";
-      n = n || "0";
+      r = r || "0";
       for (var e = "", f = 0;f < length;f++) {
-        e += this.get(f) ? b : n;
+        e += this.get(f) ? b : r;
       }
       return e;
     }
-    function q(b) {
-      for (var n = [], e = 0;e < length;e++) {
-        this.get(e) && n.push(b ? b[e] : e);
+    function n(b) {
+      for (var r = [], e = 0;e < length;e++) {
+        this.get(e) && r.push(b ? b[e] : e);
       }
-      return n.join(", ");
+      return r.join(", ");
     }
     f.ADDRESS_BITS_PER_WORD = 5;
     f.BITS_PER_WORD = 1 << f.ADDRESS_BITS_PER_WORD;
     f.BIT_INDEX_MASK = f.BITS_PER_WORD - 1;
-    var n = function() {
-      function n(e) {
+    var r = function() {
+      function r(e) {
         this.size = b(e);
         this.dirty = this.count = 0;
         this.length = e;
         this.bits = new Uint32Array(this.size >> f.ADDRESS_BITS_PER_WORD);
       }
-      n.prototype.recount = function() {
+      r.prototype.recount = function() {
         if (this.dirty) {
-          for (var b = this.bits, n = 0, e = 0, f = b.length;e < f;e++) {
-            var q = b[e], q = q - (q >> 1 & 1431655765), q = (q & 858993459) + (q >> 2 & 858993459), n = n + (16843009 * (q + (q >> 4) & 252645135) >> 24)
+          for (var b = this.bits, r = 0, e = 0, f = b.length;e < f;e++) {
+            var n = b[e], n = n - (n >> 1 & 1431655765), n = (n & 858993459) + (n >> 2 & 858993459), r = r + (16843009 * (n + (n >> 4) & 252645135) >> 24)
           }
-          this.count = n;
+          this.count = r;
           this.dirty = 0;
         }
       };
-      n.prototype.set = function(b) {
-        var n = b >> f.ADDRESS_BITS_PER_WORD, e = this.bits[n];
+      r.prototype.set = function(b) {
+        var r = b >> f.ADDRESS_BITS_PER_WORD, e = this.bits[r];
         b = e | 1 << (b & f.BIT_INDEX_MASK);
-        this.bits[n] = b;
+        this.bits[r] = b;
         this.dirty |= e ^ b;
       };
-      n.prototype.setAll = function() {
-        for (var b = this.bits, n = 0, e = b.length;n < e;n++) {
-          b[n] = 4294967295;
+      r.prototype.setAll = function() {
+        for (var b = this.bits, r = 0, e = b.length;r < e;r++) {
+          b[r] = 4294967295;
         }
         this.count = this.size;
         this.dirty = 0;
       };
-      n.prototype.assign = function(b) {
+      r.prototype.assign = function(b) {
         this.count = b.count;
         this.dirty = b.dirty;
         this.size = b.size;
-        for (var n = 0, e = this.bits.length;n < e;n++) {
-          this.bits[n] = b.bits[n];
+        for (var r = 0, e = this.bits.length;r < e;r++) {
+          this.bits[r] = b.bits[r];
         }
       };
-      n.prototype.clear = function(b) {
-        var n = b >> f.ADDRESS_BITS_PER_WORD, e = this.bits[n];
+      r.prototype.clear = function(b) {
+        var r = b >> f.ADDRESS_BITS_PER_WORD, e = this.bits[r];
         b = e & ~(1 << (b & f.BIT_INDEX_MASK));
-        this.bits[n] = b;
+        this.bits[r] = b;
         this.dirty |= e ^ b;
       };
-      n.prototype.get = function(b) {
+      r.prototype.get = function(b) {
         return 0 !== (this.bits[b >> f.ADDRESS_BITS_PER_WORD] & 1 << (b & f.BIT_INDEX_MASK));
       };
-      n.prototype.clearAll = function() {
-        for (var b = this.bits, n = 0, e = b.length;n < e;n++) {
-          b[n] = 0;
+      r.prototype.clearAll = function() {
+        for (var b = this.bits, r = 0, e = b.length;r < e;r++) {
+          b[r] = 0;
         }
         this.dirty = this.count = 0;
       };
-      n.prototype._union = function(b) {
-        var n = this.dirty, e = this.bits;
+      r.prototype._union = function(b) {
+        var r = this.dirty, e = this.bits;
         b = b.bits;
-        for (var f = 0, q = e.length;f < q;f++) {
-          var g = e[f], c = g | b[f];
-          e[f] = c;
-          n |= g ^ c;
+        for (var f = 0, n = e.length;f < n;f++) {
+          var g = e[f], m = g | b[f];
+          e[f] = m;
+          r |= g ^ m;
         }
-        this.dirty = n;
+        this.dirty = r;
       };
-      n.prototype.intersect = function(b) {
-        var n = this.dirty, e = this.bits;
+      r.prototype.intersect = function(b) {
+        var r = this.dirty, e = this.bits;
         b = b.bits;
-        for (var f = 0, q = e.length;f < q;f++) {
-          var g = e[f], c = g & b[f];
-          e[f] = c;
-          n |= g ^ c;
+        for (var f = 0, n = e.length;f < n;f++) {
+          var g = e[f], m = g & b[f];
+          e[f] = m;
+          r |= g ^ m;
         }
-        this.dirty = n;
+        this.dirty = r;
       };
-      n.prototype.subtract = function(b) {
-        var n = this.dirty, e = this.bits;
+      r.prototype.subtract = function(b) {
+        var r = this.dirty, e = this.bits;
         b = b.bits;
-        for (var f = 0, q = e.length;f < q;f++) {
-          var g = e[f], c = g & ~b[f];
-          e[f] = c;
-          n |= g ^ c;
-        }
-        this.dirty = n;
-      };
-      n.prototype.negate = function() {
-        for (var b = this.dirty, n = this.bits, e = 0, f = n.length;e < f;e++) {
-          var q = n[e], g = ~q;
-          n[e] = g;
-          b |= q ^ g;
+        for (var f = 0, n = e.length;f < n;f++) {
+          var g = e[f], m = g & ~b[f];
+          e[f] = m;
+          r |= g ^ m;
+        }
+        this.dirty = r;
+      };
+      r.prototype.negate = function() {
+        for (var b = this.dirty, r = this.bits, e = 0, f = r.length;e < f;e++) {
+          var n = r[e], g = ~n;
+          r[e] = g;
+          b |= n ^ g;
         }
         this.dirty = b;
       };
-      n.prototype.forEach = function(b) {
-        for (var n = this.bits, e = 0, q = n.length;e < q;e++) {
-          var g = n[e];
+      r.prototype.forEach = function(b) {
+        for (var r = this.bits, e = 0, n = r.length;e < n;e++) {
+          var g = r[e];
           if (g) {
-            for (var c = 0;c < f.BITS_PER_WORD;c++) {
-              g & 1 << c && b(e * f.BITS_PER_WORD + c);
+            for (var m = 0;m < f.BITS_PER_WORD;m++) {
+              g & 1 << m && b(e * f.BITS_PER_WORD + m);
             }
           }
         }
       };
-      n.prototype.toArray = function() {
-        for (var b = [], n = this.bits, e = 0, q = n.length;e < q;e++) {
-          var g = n[e];
+      r.prototype.toArray = function() {
+        for (var b = [], r = this.bits, e = 0, n = r.length;e < n;e++) {
+          var g = r[e];
           if (g) {
-            for (var c = 0;c < f.BITS_PER_WORD;c++) {
-              g & 1 << c && b.push(e * f.BITS_PER_WORD + c);
+            for (var m = 0;m < f.BITS_PER_WORD;m++) {
+              g & 1 << m && b.push(e * f.BITS_PER_WORD + m);
             }
           }
         }
         return b;
       };
-      n.prototype.equals = function(b) {
+      r.prototype.equals = function(b) {
         if (this.size !== b.size) {
           return!1;
         }
-        var n = this.bits;
+        var r = this.bits;
         b = b.bits;
-        for (var e = 0, f = n.length;e < f;e++) {
-          if (n[e] !== b[e]) {
+        for (var e = 0, f = r.length;e < f;e++) {
+          if (r[e] !== b[e]) {
             return!1;
           }
         }
         return!0;
       };
-      n.prototype.contains = function(b) {
+      r.prototype.contains = function(b) {
         if (this.size !== b.size) {
           return!1;
         }
-        var n = this.bits;
+        var r = this.bits;
         b = b.bits;
-        for (var e = 0, f = n.length;e < f;e++) {
-          if ((n[e] | b[e]) !== n[e]) {
+        for (var e = 0, f = r.length;e < f;e++) {
+          if ((r[e] | b[e]) !== r[e]) {
             return!1;
           }
         }
         return!0;
       };
-      n.prototype.isEmpty = function() {
+      r.prototype.isEmpty = function() {
         this.recount();
         return 0 === this.count;
       };
-      n.prototype.clone = function() {
-        var b = new n(this.length);
+      r.prototype.clone = function() {
+        var b = new r(this.length);
         b._union(this);
         return b;
       };
-      return n;
+      return r;
     }();
-    f.Uint32ArrayBitSet = n;
+    f.Uint32ArrayBitSet = r;
     var g = function() {
-      function n(e) {
+      function r(e) {
         this.dirty = this.count = 0;
         this.size = b(e);
         this.bits = 0;
         this.singleWord = !0;
         this.length = e;
       }
-      n.prototype.recount = function() {
+      r.prototype.recount = function() {
         if (this.dirty) {
           var b = this.bits, b = b - (b >> 1 & 1431655765), b = (b & 858993459) + (b >> 2 & 858993459);
           this.count = 0 + (16843009 * (b + (b >> 4) & 252645135) >> 24);
           this.dirty = 0;
         }
       };
-      n.prototype.set = function(b) {
-        var n = this.bits;
-        this.bits = b = n | 1 << (b & f.BIT_INDEX_MASK);
-        this.dirty |= n ^ b;
+      r.prototype.set = function(b) {
+        var r = this.bits;
+        this.bits = b = r | 1 << (b & f.BIT_INDEX_MASK);
+        this.dirty |= r ^ b;
       };
-      n.prototype.setAll = function() {
+      r.prototype.setAll = function() {
         this.bits = 4294967295;
         this.count = this.size;
         this.dirty = 0;
       };
-      n.prototype.assign = function(b) {
+      r.prototype.assign = function(b) {
         this.count = b.count;
         this.dirty = b.dirty;
         this.size = b.size;
         this.bits = b.bits;
       };
-      n.prototype.clear = function(b) {
-        var n = this.bits;
-        this.bits = b = n & ~(1 << (b & f.BIT_INDEX_MASK));
-        this.dirty |= n ^ b;
+      r.prototype.clear = function(b) {
+        var r = this.bits;
+        this.bits = b = r & ~(1 << (b & f.BIT_INDEX_MASK));
+        this.dirty |= r ^ b;
       };
-      n.prototype.get = function(b) {
+      r.prototype.get = function(b) {
         return 0 !== (this.bits & 1 << (b & f.BIT_INDEX_MASK));
       };
-      n.prototype.clearAll = function() {
+      r.prototype.clearAll = function() {
         this.dirty = this.count = this.bits = 0;
       };
-      n.prototype._union = function(b) {
-        var n = this.bits;
-        this.bits = b = n | b.bits;
-        this.dirty = n ^ b;
-      };
-      n.prototype.intersect = function(b) {
-        var n = this.bits;
-        this.bits = b = n & b.bits;
-        this.dirty = n ^ b;
-      };
-      n.prototype.subtract = function(b) {
-        var n = this.bits;
-        this.bits = b = n & ~b.bits;
-        this.dirty = n ^ b;
-      };
-      n.prototype.negate = function() {
-        var b = this.bits, n = ~b;
-        this.bits = n;
-        this.dirty = b ^ n;
-      };
-      n.prototype.forEach = function(b) {
-        var n = this.bits;
-        if (n) {
+      r.prototype._union = function(b) {
+        var r = this.bits;
+        this.bits = b = r | b.bits;
+        this.dirty = r ^ b;
+      };
+      r.prototype.intersect = function(b) {
+        var r = this.bits;
+        this.bits = b = r & b.bits;
+        this.dirty = r ^ b;
+      };
+      r.prototype.subtract = function(b) {
+        var r = this.bits;
+        this.bits = b = r & ~b.bits;
+        this.dirty = r ^ b;
+      };
+      r.prototype.negate = function() {
+        var b = this.bits, r = ~b;
+        this.bits = r;
+        this.dirty = b ^ r;
+      };
+      r.prototype.forEach = function(b) {
+        var r = this.bits;
+        if (r) {
           for (var e = 0;e < f.BITS_PER_WORD;e++) {
-            n & 1 << e && b(e);
+            r & 1 << e && b(e);
           }
         }
       };
-      n.prototype.toArray = function() {
-        var b = [], n = this.bits;
-        if (n) {
+      r.prototype.toArray = function() {
+        var b = [], r = this.bits;
+        if (r) {
           for (var e = 0;e < f.BITS_PER_WORD;e++) {
-            n & 1 << e && b.push(e);
+            r & 1 << e && b.push(e);
           }
         }
         return b;
       };
-      n.prototype.equals = function(b) {
+      r.prototype.equals = function(b) {
         return this.bits === b.bits;
       };
-      n.prototype.contains = function(b) {
-        var n = this.bits;
-        return(n | b.bits) === n;
+      r.prototype.contains = function(b) {
+        var r = this.bits;
+        return(r | b.bits) === r;
       };
-      n.prototype.isEmpty = function() {
+      r.prototype.isEmpty = function() {
         this.recount();
         return 0 === this.count;
       };
-      n.prototype.clone = function() {
-        var b = new n(this.length);
+      r.prototype.clone = function() {
+        var b = new r(this.length);
         b._union(this);
         return b;
       };
-      return n;
+      return r;
     }();
     f.Uint32BitSet = g;
-    g.prototype.toString = q;
+    g.prototype.toString = n;
     g.prototype.toBitString = e;
-    n.prototype.toString = q;
-    n.prototype.toBitString = e;
+    r.prototype.toString = n;
+    r.prototype.toBitString = e;
     f.BitSetFunctor = function(e) {
-      var q = 1 === b(e) >> f.ADDRESS_BITS_PER_WORD ? g : n;
+      var n = 1 === b(e) >> f.ADDRESS_BITS_PER_WORD ? g : r;
       return function() {
-        return new q(e);
+        return new n(e);
       };
     };
   })(d.BitSets || (d.BitSets = {}));
-  t = function() {
+  u = function() {
     function f() {
     }
     f.randomStyle = function() {
@@ -1562,13 +1566,13 @@
     f._gradient = "#FF0000 #FF1100 #FF2300 #FF3400 #FF4600 #FF5700 #FF6900 #FF7B00 #FF8C00 #FF9E00 #FFAF00 #FFC100 #FFD300 #FFE400 #FFF600 #F7FF00 #E5FF00 #D4FF00 #C2FF00 #B0FF00 #9FFF00 #8DFF00 #7CFF00 #6AFF00 #58FF00 #47FF00 #35FF00 #24FF00 #12FF00 #00FF00".split(" ");
     return f;
   }();
-  d.ColorStyle = t;
-  t = function() {
-    function f(b, e, f, n) {
+  d.ColorStyle = u;
+  u = function() {
+    function f(b, e, f, r) {
       this.xMin = b | 0;
       this.yMin = e | 0;
       this.xMax = f | 0;
-      this.yMax = n | 0;
+      this.yMax = r | 0;
     }
     f.FromUntyped = function(b) {
       return new f(b.xMin, b.yMin, b.xMax, b.yMax);
@@ -1576,11 +1580,11 @@
     f.FromRectangle = function(b) {
       return new f(20 * b.x | 0, 20 * b.y | 0, 20 * (b.x + b.width) | 0, 20 * (b.y + b.height) | 0);
     };
-    f.prototype.setElements = function(b, e, f, n) {
+    f.prototype.setElements = function(b, e, f, r) {
       this.xMin = b;
       this.yMin = e;
       this.xMax = f;
-      this.yMax = n;
+      this.yMax = r;
     };
     f.prototype.copyFrom = function(b) {
       this.setElements(b.xMin, b.yMin, b.xMax, b.yMax);
@@ -1637,17 +1641,17 @@
     };
     return f;
   }();
-  d.Bounds = t;
-  t = function() {
-    function f(b, e, f, n) {
-      u.assert(k(b));
-      u.assert(k(e));
-      u.assert(k(f));
-      u.assert(k(n));
+  d.Bounds = u;
+  u = function() {
+    function f(b, e, f, r) {
+      t.assert(k(b));
+      t.assert(k(e));
+      t.assert(k(f));
+      t.assert(k(r));
       this._xMin = b | 0;
       this._yMin = e | 0;
       this._xMax = f | 0;
-      this._yMax = n | 0;
+      this._yMax = r | 0;
     }
     f.FromUntyped = function(b) {
       return new f(b.xMin, b.yMin, b.xMax, b.yMax);
@@ -1655,11 +1659,11 @@
     f.FromRectangle = function(b) {
       return new f(20 * b.x | 0, 20 * b.y | 0, 20 * (b.x + b.width) | 0, 20 * (b.y + b.height) | 0);
     };
-    f.prototype.setElements = function(b, e, f, n) {
+    f.prototype.setElements = function(b, e, f, r) {
       this.xMin = b;
       this.yMin = e;
       this.xMax = f;
-      this.yMax = n;
+      this.yMax = r;
     };
     f.prototype.copyFrom = function(b) {
       this.setElements(b.xMin, b.yMin, b.xMax, b.yMax);
@@ -1689,19 +1693,19 @@
     Object.defineProperty(f.prototype, "xMin", {get:function() {
       return this._xMin;
     }, set:function(b) {
-      u.assert(k(b));
+      t.assert(k(b));
       this._xMin = b;
     }, enumerable:!0, configurable:!0});
     Object.defineProperty(f.prototype, "yMin", {get:function() {
       return this._yMin;
     }, set:function(b) {
-      u.assert(k(b));
+      t.assert(k(b));
       this._yMin = b | 0;
     }, enumerable:!0, configurable:!0});
     Object.defineProperty(f.prototype, "xMax", {get:function() {
       return this._xMax;
     }, set:function(b) {
-      u.assert(k(b));
+      t.assert(k(b));
       this._xMax = b | 0;
     }, enumerable:!0, configurable:!0});
     Object.defineProperty(f.prototype, "width", {get:function() {
@@ -1710,7 +1714,7 @@
     Object.defineProperty(f.prototype, "yMax", {get:function() {
       return this._yMax;
     }, set:function(b) {
-      u.assert(k(b));
+      t.assert(k(b));
       this._yMax = b | 0;
     }, enumerable:!0, configurable:!0});
     Object.defineProperty(f.prototype, "height", {get:function() {
@@ -1735,13 +1739,13 @@
     };
     return f;
   }();
-  d.DebugBounds = t;
-  t = function() {
-    function f(b, e, f, n) {
+  d.DebugBounds = u;
+  u = function() {
+    function f(b, e, f, r) {
       this.r = b;
       this.g = e;
       this.b = f;
-      this.a = n;
+      this.a = r;
     }
     f.FromARGB = function(b) {
       return new f((b >> 16 & 255) / 255, (b >> 8 & 255) / 255, (b >> 0 & 255) / 255, (b >> 24 & 255) / 255);
@@ -1773,15 +1777,15 @@
       var e = document.createElement("span");
       document.body.appendChild(e);
       e.style.backgroundColor = b;
-      var q = getComputedStyle(e).backgroundColor;
+      var n = getComputedStyle(e).backgroundColor;
       document.body.removeChild(e);
-      (e = /^rgb\((\d+), (\d+), (\d+)\)$/.exec(q)) || (e = /^rgba\((\d+), (\d+), (\d+), ([\d.]+)\)$/.exec(q));
-      q = new f(0, 0, 0, 0);
-      q.r = parseFloat(e[1]) / 255;
-      q.g = parseFloat(e[2]) / 255;
-      q.b = parseFloat(e[3]) / 255;
-      q.a = e[4] ? parseFloat(e[4]) / 255 : 1;
-      return f.colorCache[b] = q;
+      (e = /^rgb\((\d+), (\d+), (\d+)\)$/.exec(n)) || (e = /^rgba\((\d+), (\d+), (\d+), ([\d.]+)\)$/.exec(n));
+      n = new f(0, 0, 0, 0);
+      n.r = parseFloat(e[1]) / 255;
+      n.g = parseFloat(e[2]) / 255;
+      n.b = parseFloat(e[3]) / 255;
+      n.a = e[4] ? parseFloat(e[4]) / 255 : 1;
+      return f.colorCache[b] = n;
     };
     f.Red = new f(1, 0, 0, 1);
     f.Green = new f(0, 1, 0, 1);
@@ -1792,15 +1796,15 @@
     f.colorCache = {};
     return f;
   }();
-  d.Color = t;
+  d.Color = u;
   var m;
   (function(f) {
     function b(b) {
-      var e, f, q = b >> 24 & 255;
-      f = (Math.imul(b >> 16 & 255, q) + 127) / 255 | 0;
-      e = (Math.imul(b >> 8 & 255, q) + 127) / 255 | 0;
-      b = (Math.imul(b >> 0 & 255, q) + 127) / 255 | 0;
-      return q << 24 | f << 16 | e << 8 | b;
+      var e, f, n = b >> 24 & 255;
+      f = (Math.imul(b >> 16 & 255, n) + 127) / 255 | 0;
+      e = (Math.imul(b >> 8 & 255, n) + 127) / 255 | 0;
+      b = (Math.imul(b >> 0 & 255, n) + 127) / 255 | 0;
+      return n << 24 | f << 16 | e << 8 | b;
     }
     f.RGBAToARGB = function(b) {
       return b >> 8 & 16777215 | (b & 255) << 24;
@@ -1836,11 +1840,11 @@
       return Math.max(0, Math.min(255, b));
     };
     f.unpremultiplyARGB = function(b) {
-      var e, f, q = b >> 24 & 255;
-      f = Math.imul(255, b >> 16 & 255) / q & 255;
-      e = Math.imul(255, b >> 8 & 255) / q & 255;
-      b = Math.imul(255, b >> 0 & 255) / q & 255;
-      return q << 24 | f << 16 | e << 8 | b;
+      var e, f, n = b >> 24 & 255;
+      f = Math.imul(255, b >> 16 & 255) / n & 255;
+      e = Math.imul(255, b >> 8 & 255) / n & 255;
+      b = Math.imul(255, b >> 0 & 255) / n & 255;
+      return n << 24 | f << 16 | e << 8 | b;
     };
     f.premultiplyARGB = b;
     var e;
@@ -1863,57 +1867,57 @@
       if (255 === f) {
         return b;
       }
-      var q, g, c = f << 8, s = e;
-      g = s[c + (b >> 16 & 255)];
-      q = s[c + (b >> 8 & 255)];
-      b = s[c + (b >> 0 & 255)];
-      return f << 24 | g << 16 | q << 8 | b;
+      var n, g, m = f << 8, c = e;
+      g = c[m + (b >> 16 & 255)];
+      n = c[m + (b >> 8 & 255)];
+      b = c[m + (b >> 0 & 255)];
+      return f << 24 | g << 16 | n << 8 | b;
     };
     f.blendPremultipliedBGRA = function(b, e) {
-      var f, q;
-      q = 256 - (e & 255);
-      f = Math.imul(b & 16711935, q) >> 8;
-      q = Math.imul(b >> 8 & 16711935, q) >> 8;
-      return((e >> 8 & 16711935) + q & 16711935) << 8 | (e & 16711935) + f & 16711935;
-    };
-    var q = p.swap32;
-    f.convertImage = function(n, f, c, s) {
-      var p = c.length;
-      if (n === f) {
-        if (c !== s) {
-          for (n = 0;n < p;n++) {
-            s[n] = c[n];
+      var f, n;
+      n = 256 - (e & 255);
+      f = Math.imul(b & 16711935, n) >> 8;
+      n = Math.imul(b >> 8 & 16711935, n) >> 8;
+      return((e >> 8 & 16711935) + n & 16711935) << 8 | (e & 16711935) + f & 16711935;
+    };
+    var n = p.swap32;
+    f.convertImage = function(r, f, m, c) {
+      var h = m.length;
+      if (r === f) {
+        if (m !== c) {
+          for (r = 0;r < h;r++) {
+            c[r] = m[r];
           }
         }
       } else {
-        if (1 === n && 3 === f) {
-          for (d.ColorUtilities.ensureUnpremultiplyTable(), n = 0;n < p;n++) {
-            var m = c[n];
-            f = m & 255;
+        if (1 === r && 3 === f) {
+          for (d.ColorUtilities.ensureUnpremultiplyTable(), r = 0;r < h;r++) {
+            var p = m[r];
+            f = p & 255;
             if (0 === f) {
-              s[n] = 0;
+              c[r] = 0;
             } else {
               if (255 === f) {
-                s[n] = 4278190080 | m >> 8 & 16777215;
+                c[r] = 4278190080 | p >> 8 & 16777215;
               } else {
-                var h = m >> 24 & 255, l = m >> 16 & 255, m = m >> 8 & 255, a = f << 8, r = e, m = r[a + m], l = r[a + l], h = r[a + h];
-                s[n] = f << 24 | h << 16 | l << 8 | m;
+                var l = p >> 24 & 255, s = p >> 16 & 255, p = p >> 8 & 255, a = f << 8, q = e, p = q[a + p], s = q[a + s], l = q[a + l];
+                c[r] = f << 24 | l << 16 | s << 8 | p;
               }
             }
           }
         } else {
-          if (2 === n && 3 === f) {
-            for (n = 0;n < p;n++) {
-              s[n] = q(c[n]);
+          if (2 === r && 3 === f) {
+            for (r = 0;r < h;r++) {
+              c[r] = n(m[r]);
             }
           } else {
-            if (3 === n && 1 === f) {
-              for (n = 0;n < p;n++) {
-                f = c[n], s[n] = q(b(f & 4278255360 | f >> 16 & 255 | (f & 255) << 16));
+            if (3 === r && 1 === f) {
+              for (r = 0;r < h;r++) {
+                f = m[r], c[r] = n(b(f & 4278255360 | f >> 16 & 255 | (f & 255) << 16));
               }
             } else {
-              for (u.somewhatImplemented("Image Format Conversion: " + g[n] + " -> " + g[f]), n = 0;n < p;n++) {
-                s[n] = c[n];
+              for (t.somewhatImplemented("Image Format Conversion: " + g[r] + " -> " + g[f]), r = 0;r < h;r++) {
+                c[r] = m[r];
               }
             }
           }
@@ -1921,7 +1925,7 @@
       }
     };
   })(m = d.ColorUtilities || (d.ColorUtilities = {}));
-  t = function() {
+  u = function() {
     function f(b) {
       void 0 === b && (b = 32);
       this._list = [];
@@ -1929,10 +1933,10 @@
     }
     f.prototype.acquire = function(b) {
       if (f._enabled) {
-        for (var e = this._list, q = 0;q < e.length;q++) {
-          var n = e[q];
-          if (n.byteLength >= b) {
-            return e.splice(q, 1), n;
+        for (var e = this._list, n = 0;n < e.length;n++) {
+          var r = e[n];
+          if (r.byteLength >= b) {
+            return e.splice(n, 1), r;
           }
         }
       }
@@ -1966,7 +1970,7 @@
     f._enabled = !0;
     return f;
   }();
-  d.ArrayBufferPool = t;
+  d.ArrayBufferPool = u;
   (function(f) {
     (function(b) {
       b[b.EXTERNAL_INTERFACE_FEATURE = 1] = "EXTERNAL_INTERFACE_FEATURE";
@@ -1987,11 +1991,11 @@
   })(d.FileLoadingService || (d.FileLoadingService = {}));
   d.registerCSSFont = function(f, b, e) {
     if (inBrowser) {
-      var q = document.head;
-      q.insertBefore(document.createElement("style"), q.firstChild);
-      q = document.styleSheets[0];
+      var n = document.head;
+      n.insertBefore(document.createElement("style"), n.firstChild);
+      n = document.styleSheets[0];
       b = "@font-face{font-family:swffont" + f + ";src:url(data:font/opentype;base64," + d.StringUtilities.base64ArrayBuffer(b) + ")}";
-      q.insertRule(b, q.cssRules.length);
+      n.insertRule(b, n.cssRules.length);
       e && (e = document.createElement("div"), e.style.fontFamily = "swffont" + f, e.innerHTML = "hello", document.body.appendChild(e), document.body.removeChild(e));
     }
   };
@@ -2005,7 +2009,7 @@
       return null;
     }};
   })(d.ExternalInterfaceService || (d.ExternalInterfaceService = {}));
-  t = function() {
+  u = function() {
     function f() {
     }
     f.prototype.setClipboard = function(b) {
@@ -2013,14 +2017,14 @@
     f.instance = null;
     return f;
   }();
-  d.ClipboardService = t;
-  t = function() {
+  d.ClipboardService = u;
+  u = function() {
     function f() {
       this._queues = {};
     }
     f.prototype.register = function(b, e) {
-      u.assert(b);
-      u.assert(e);
+      t.assert(b);
+      t.assert(e);
       var f = this._queues[b];
       if (f) {
         if (-1 < f.indexOf(e)) {
@@ -2032,12 +2036,12 @@
       f.push(e);
     };
     f.prototype.unregister = function(b, e) {
-      u.assert(b);
-      u.assert(e);
+      t.assert(b);
+      t.assert(e);
       var f = this._queues[b];
       if (f) {
-        var n = f.indexOf(e);
-        -1 !== n && f.splice(n, 1);
+        var r = f.indexOf(e);
+        -1 !== r && f.splice(r, 1);
         0 === f.length && (this._queues[b] = null);
       }
     };
@@ -2046,22 +2050,22 @@
       if (f) {
         f = f.slice();
         e = Array.prototype.slice.call(arguments, 0);
-        for (var n = 0;n < f.length;n++) {
-          f[n].apply(null, e);
+        for (var r = 0;r < f.length;r++) {
+          f[r].apply(null, e);
         }
       }
     };
     f.prototype.notify1 = function(b, e) {
       var f = this._queues[b];
       if (f) {
-        for (var f = f.slice(), n = 0;n < f.length;n++) {
-          (0,f[n])(b, e);
+        for (var f = f.slice(), r = 0;r < f.length;r++) {
+          (0,f[r])(b, e);
         }
       }
     };
     return f;
   }();
-  d.Callback = t;
+  d.Callback = u;
   (function(f) {
     f[f.None = 0] = "None";
     f[f.PremultipliedAlphaARGB = 1] = "PremultipliedAlphaARGB";
@@ -2100,7 +2104,7 @@
       }
     };
   })(d.UI || (d.UI = {}));
-  t = function() {
+  u = function() {
     function f() {
       this.promise = new Promise(function(b, e) {
         this.resolve = b;
@@ -2112,7 +2116,7 @@
     };
     return f;
   }();
-  d.PromiseWrapper = t;
+  d.PromiseWrapper = u;
 })(Shumway || (Shumway = {}));
 (function() {
   function d(b) {
@@ -2141,15 +2145,15 @@
         return!1;
       }
       f.call(b, e.resolve, e.reject);
-    } catch (q) {
-      f = e.reject, f(q);
+    } catch (n) {
+      f = e.reject, f(n);
     }
     return!0;
   }
   function a(b) {
     return "object" === typeof b && null !== b && "undefined" !== typeof b.promiseStatus;
   }
-  function r(b, e) {
+  function q(b, e) {
     if ("unresolved" === b.promiseStatus) {
       var f = b.rejectReactions;
       b.result = e;
@@ -2161,43 +2165,43 @@
   }
   function v(b, e) {
     for (var f = 0;f < b.length;f++) {
-      u({reaction:b[f], argument:e});
+      t({reaction:b[f], argument:e});
     }
   }
-  function u(b) {
-    0 === q.length && setTimeout(l, 0);
-    q.push(b);
+  function t(b) {
+    0 === n.length && setTimeout(l, 0);
+    n.push(b);
   }
-  function t(b, e) {
-    var f = b.deferred, q = b.handler, g, c;
+  function u(b, e) {
+    var f = b.deferred, n = b.handler, g, m;
     try {
-      g = q(e);
-    } catch (s) {
-      return f = f.reject, f(s);
+      g = n(e);
+    } catch (c) {
+      return f = f.reject, f(c);
     }
     if (g === f.promise) {
       return f = f.reject, f(new TypeError("Self resolution"));
     }
     try {
-      if (c = k(g, f), !c) {
-        var p = f.resolve;
-        return p(g);
+      if (m = k(g, f), !m) {
+        var h = f.resolve;
+        return h(g);
       }
-    } catch (m) {
-      return f = f.reject, f(m);
+    } catch (p) {
+      return f = f.reject, f(p);
     }
   }
   function l() {
-    for (;0 < q.length;) {
-      var e = q[0];
+    for (;0 < n.length;) {
+      var r = n[0];
       try {
-        t(e.reaction, e.argument);
-      } catch (f) {
+        u(r.reaction, r.argument);
+      } catch (e) {
         if ("function" === typeof b.onerror) {
-          b.onerror(f);
+          b.onerror(e);
         }
       }
-      q.shift();
+      n.shift();
     }
   }
   function c(b) {
@@ -2208,7 +2212,7 @@
   }
   function p(b) {
     return function(e) {
-      r(b, e);
+      q(b, e);
     };
   }
   function s(b) {
@@ -2231,23 +2235,23 @@
     return b;
   }
   function g(b, e, f) {
-    return function(q) {
-      if (q === b) {
+    return function(n) {
+      if (n === b) {
         return f(new TypeError("Self resolution"));
       }
       var g = b.promiseConstructor;
-      if (a(q) && q.promiseConstructor === g) {
-        return q.then(e, f);
+      if (a(n) && n.promiseConstructor === g) {
+        return n.then(e, f);
       }
       g = d(g);
-      return k(q, g) ? g.promise.then(e, f) : e(q);
+      return k(n, g) ? g.promise.then(e, f) : e(n);
     };
   }
-  function f(b, e, f, q) {
+  function f(b, e, f, n) {
     return function(g) {
       e[b] = g;
-      q.countdown--;
-      0 === q.countdown && f.resolve(e);
+      n.countdown--;
+      0 === n.countdown && f.resolve(e);
     };
   }
   function b(e) {
@@ -2261,11 +2265,11 @@
     this.resolveReactions = [];
     this.rejectReactions = [];
     this.result = void 0;
-    var f = s(this), q = p(this);
+    var f = s(this), n = p(this);
     try {
-      e(f, q);
+      e(f, n);
     } catch (g) {
-      r(this, g);
+      q(this, g);
     }
     this.promiseConstructor = b;
     return this;
@@ -2273,35 +2277,35 @@
   var e = Function("return this")();
   if (e.Promise) {
     "function" !== typeof e.Promise.all && (e.Promise.all = function(b) {
-      var f = 0, q = [], g, c, s = new e.Promise(function(b, e) {
+      var f = 0, n = [], g, m, c = new e.Promise(function(b, e) {
         g = b;
-        c = e;
+        m = e;
       });
       b.forEach(function(b, e) {
         f++;
         b.then(function(b) {
-          q[e] = b;
+          n[e] = b;
           f--;
-          0 === f && g(q);
-        }, c);
+          0 === f && g(n);
+        }, m);
       });
-      0 === f && g(q);
-      return s;
+      0 === f && g(n);
+      return c;
     }), "function" !== typeof e.Promise.resolve && (e.Promise.resolve = function(b) {
       return new e.Promise(function(e) {
         e(b);
       });
     });
   } else {
-    var q = [];
+    var n = [];
     b.all = function(b) {
-      var e = d(this), q = [], g = {countdown:0}, c = 0;
+      var e = d(this), n = [], g = {countdown:0}, m = 0;
       b.forEach(function(b) {
-        this.cast(b).then(f(c, q, e, g), e.reject);
-        c++;
+        this.cast(b).then(f(m, n, e, g), e.reject);
+        m++;
         g.countdown++;
       }, this);
-      0 === c && e.resolve(q);
+      0 === m && e.resolve(n);
       return e.promise;
     };
     b.cast = function(b) {
@@ -2328,17 +2332,17 @@
       if (!a(this)) {
         throw new TypeError("this is not a Promises");
       }
-      var f = d(this.promiseConstructor), q = "function" === typeof e ? e : c, s = {deferred:f, handler:g(this, "function" === typeof b ? b : h, q)}, q = {deferred:f, handler:q};
+      var f = d(this.promiseConstructor), n = "function" === typeof e ? e : c, m = {deferred:f, handler:g(this, "function" === typeof b ? b : h, n)}, n = {deferred:f, handler:n};
       switch(this.promiseStatus) {
         case "unresolved":
-          this.resolveReactions.push(s);
-          this.rejectReactions.push(q);
+          this.resolveReactions.push(m);
+          this.rejectReactions.push(n);
           break;
         case "has-resolution":
-          u({reaction:s, argument:this.result});
+          t({reaction:m, argument:this.result});
           break;
         case "has-rejection":
-          u({reaction:q, argument:this.result});
+          t({reaction:n, argument:this.result});
       }
       return f.promise;
     }};
@@ -2347,28 +2351,28 @@
 })();
 "undefined" !== typeof exports && (exports.Shumway = Shumway);
 (function() {
-  function d(d, a, r) {
-    d[a] || Object.defineProperty(d, a, {value:r, writable:!0, configurable:!0, enumerable:!1});
+  function d(d, a, q) {
+    d[a] || Object.defineProperty(d, a, {value:q, writable:!0, configurable:!0, enumerable:!1});
   }
   d(String.prototype, "padRight", function(d, a) {
-    var r = this, v = r.replace(/\033\[[0-9]*m/g, "").length;
+    var q = this, v = q.replace(/\033\[[0-9]*m/g, "").length;
     if (!d || v >= a) {
-      return r;
+      return q;
     }
-    for (var v = (a - v) / d.length, u = 0;u < v;u++) {
-      r += d;
+    for (var v = (a - v) / d.length, t = 0;t < v;t++) {
+      q += d;
     }
-    return r;
+    return q;
   });
   d(String.prototype, "padLeft", function(d, a) {
-    var r = this, v = r.length;
+    var q = this, v = q.length;
     if (!d || v >= a) {
-      return r;
+      return q;
     }
-    for (var v = (a - v) / d.length, u = 0;u < v;u++) {
-      r = d + r;
+    for (var v = (a - v) / d.length, t = 0;t < v;t++) {
+      q = d + q;
     }
-    return r;
+    return q;
   });
   d(String.prototype, "trim", function() {
     return this.replace(/^\s+|\s+$/g, "");
@@ -2380,15 +2384,15 @@
     if (d === a) {
       return 0;
     }
-    for (var r = 0, v = 0;v < this.length;v++) {
-      this[v] === d && (this[v] = a, r++);
+    for (var q = 0, v = 0;v < this.length;v++) {
+      this[v] === d && (this[v] = a, q++);
     }
-    return r;
+    return q;
   });
 })();
 (function(d) {
   (function(k) {
-    var a = d.isObject, r = function() {
+    var a = d.isObject, q = function() {
       function a(l, c, h, p) {
         this.shortName = l;
         this.longName = c;
@@ -2404,25 +2408,25 @@
       };
       return a;
     }();
-    k.Argument = r;
+    k.Argument = q;
     var v = function() {
       function a() {
         this.args = [];
       }
       a.prototype.addArgument = function(l, c, h, p) {
-        l = new r(l, c, h, p);
+        l = new q(l, c, h, p);
         this.args.push(l);
         return l;
       };
       a.prototype.addBoundOption = function(l) {
-        this.args.push(new r(l.shortName, l.longName, l.type, {parse:function(c) {
+        this.args.push(new q(l.shortName, l.longName, l.type, {parse:function(c) {
           l.value = c;
         }}));
       };
       a.prototype.addBoundOptionSet = function(l) {
         var c = this;
         l.options.forEach(function(h) {
-          h instanceof u ? c.addBoundOptionSet(h) : c.addBoundOption(h);
+          h instanceof t ? c.addBoundOptionSet(h) : c.addBoundOption(h);
         });
       };
       a.prototype.getUsage = function() {
@@ -2461,26 +2465,26 @@
       return a;
     }();
     k.ArgumentParser = v;
-    var u = function() {
-      function r(l, c) {
+    var t = function() {
+      function q(l, c) {
         void 0 === c && (c = null);
         this.open = !1;
         this.name = l;
         this.settings = c || {};
         this.options = [];
       }
-      r.prototype.register = function(l) {
-        if (l instanceof r) {
+      q.prototype.register = function(l) {
+        if (l instanceof q) {
           for (var c = 0;c < this.options.length;c++) {
             var h = this.options[c];
-            if (h instanceof r && h.name === l.name) {
+            if (h instanceof q && h.name === l.name) {
               return h;
             }
           }
         }
         this.options.push(l);
         if (this.settings) {
-          if (l instanceof r) {
+          if (l instanceof q) {
             c = this.settings[l.name], a(c) && (l.settings = c.settings, l.open = c.open);
           } else {
             if ("undefined" !== typeof this.settings[l.longName]) {
@@ -2499,28 +2503,28 @@
         }
         return l;
       };
-      r.prototype.trace = function(l) {
+      q.prototype.trace = function(l) {
         l.enter(this.name + " {");
         this.options.forEach(function(c) {
           c.trace(l);
         });
         l.leave("}");
       };
-      r.prototype.getSettings = function() {
+      q.prototype.getSettings = function() {
         var l = {};
         this.options.forEach(function(c) {
-          c instanceof r ? l[c.name] = {settings:c.getSettings(), open:c.open} : l[c.longName] = c.value;
+          c instanceof q ? l[c.name] = {settings:c.getSettings(), open:c.open} : l[c.longName] = c.value;
         });
         return l;
       };
-      r.prototype.setSettings = function(l) {
+      q.prototype.setSettings = function(l) {
         l && this.options.forEach(function(c) {
-          c instanceof r ? c.name in l && c.setSettings(l[c.name].settings) : c.longName in l && (c.value = l[c.longName]);
+          c instanceof q ? c.name in l && c.setSettings(l[c.name].settings) : c.longName in l && (c.value = l[c.longName]);
         });
       };
-      return r;
+      return q;
     }();
-    k.OptionSet = u;
+    k.OptionSet = t;
     v = function() {
       function a(l, c, h, p, s, m) {
         void 0 === m && (m = null);
@@ -2551,28 +2555,28 @@
         return!1;
       }
     }
-    function r(r) {
-      void 0 === r && (r = k.ROOT);
+    function q(q) {
+      void 0 === q && (q = k.ROOT);
       var d = {};
-      if (a() && (r = window.localStorage[r])) {
+      if (a() && (q = window.localStorage[q])) {
         try {
-          d = JSON.parse(r);
-        } catch (t) {
+          d = JSON.parse(q);
+        } catch (u) {
         }
       }
       return d;
     }
     k.ROOT = "Shumway Options";
-    k.shumwayOptions = new d.Options.OptionSet(k.ROOT, r());
+    k.shumwayOptions = new d.Options.OptionSet(k.ROOT, q());
     k.isStorageSupported = a;
-    k.load = r;
-    k.save = function(r, d) {
-      void 0 === r && (r = null);
+    k.load = q;
+    k.save = function(q, d) {
+      void 0 === q && (q = null);
       void 0 === d && (d = k.ROOT);
       if (a()) {
         try {
-          window.localStorage[d] = JSON.stringify(r ? r : k.shumwayOptions.getSettings());
-        } catch (t) {
+          window.localStorage[d] = JSON.stringify(q ? q : k.shumwayOptions.getSettings());
+        } catch (u) {
         }
       }
     };
@@ -2587,15 +2591,15 @@
 (function(d) {
   (function(k) {
     var a = function() {
-      function a(r, u) {
-        this._parent = r;
+      function a(q, t) {
+        this._parent = q;
         this._timers = d.ObjectUtilities.createMap();
-        this._name = u;
+        this._name = t;
         this._count = this._total = this._last = this._begin = 0;
       }
-      a.time = function(d, u) {
+      a.time = function(d, t) {
         a.start(d);
-        u();
+        t();
         a.stop();
       };
       a.start = function(d) {
@@ -2627,8 +2631,8 @@
       };
       a.prototype.trace = function(a) {
         a.enter(this._name + ": " + this._total.toFixed(2) + " ms, count: " + this._count + ", average: " + (this._total / this._count).toFixed(2) + " ms");
-        for (var r in this._timers) {
-          this._timers[r].trace(a);
+        for (var q in this._timers) {
+          this._timers[q].trace(a);
         }
         a.outdent();
       };
@@ -2644,8 +2648,8 @@
     }();
     k.Timer = a;
     a = function() {
-      function a(r) {
-        this._enabled = r;
+      function a(q) {
+        this._enabled = q;
         this.clear();
       }
       Object.defineProperty(a.prototype, "counts", {get:function() {
@@ -2661,49 +2665,49 @@
       a.prototype.toJSON = function() {
         return{counts:this._counts, times:this._times};
       };
-      a.prototype.count = function(a, r, t) {
-        void 0 === r && (r = 1);
-        void 0 === t && (t = 0);
+      a.prototype.count = function(a, q, u) {
+        void 0 === q && (q = 1);
+        void 0 === u && (u = 0);
         if (this._enabled) {
-          return void 0 === this._counts[a] && (this._counts[a] = 0, this._times[a] = 0), this._counts[a] += r, this._times[a] += t, this._counts[a];
+          return void 0 === this._counts[a] && (this._counts[a] = 0, this._times[a] = 0), this._counts[a] += q, this._times[a] += u, this._counts[a];
         }
       };
       a.prototype.trace = function(a) {
-        for (var r in this._counts) {
-          a.writeLn(r + ": " + this._counts[r]);
+        for (var q in this._counts) {
+          a.writeLn(q + ": " + this._counts[q]);
         }
       };
-      a.prototype._pairToString = function(a, r) {
-        var t = r[0], l = r[1], c = a[t], t = t + ": " + l;
-        c && (t += ", " + c.toFixed(4), 1 < l && (t += " (" + (c / l).toFixed(4) + ")"));
-        return t;
+      a.prototype._pairToString = function(a, q) {
+        var u = q[0], l = q[1], c = a[u], u = u + ": " + l;
+        c && (u += ", " + c.toFixed(4), 1 < l && (u += " (" + (c / l).toFixed(4) + ")"));
+        return u;
       };
       a.prototype.toStringSorted = function() {
-        var a = this, r = this._times, t = [], l;
+        var a = this, q = this._times, u = [], l;
         for (l in this._counts) {
-          t.push([l, this._counts[l]]);
+          u.push([l, this._counts[l]]);
         }
-        t.sort(function(c, h) {
+        u.sort(function(c, h) {
           return h[1] - c[1];
         });
-        return t.map(function(c) {
-          return a._pairToString(r, c);
+        return u.map(function(c) {
+          return a._pairToString(q, c);
         }).join(", ");
       };
       a.prototype.traceSorted = function(a) {
-        var r = !0;
-        void 0 === r && (r = !1);
-        var t = this, l = this._times, c = [], h;
+        var q = !0;
+        void 0 === q && (q = !1);
+        var u = this, l = this._times, c = [], h;
         for (h in this._counts) {
           c.push([h, this._counts[h]]);
         }
-        c.sort(function(c, s) {
-          return s[1] - c[1];
+        c.sort(function(c, h) {
+          return h[1] - c[1];
         });
-        r ? a.writeLn(c.map(function(c) {
-          return t._pairToString(l, c);
+        q ? a.writeLn(c.map(function(c) {
+          return u._pairToString(l, c);
         }).join(", ")) : c.forEach(function(c) {
-          a.writeLn(t._pairToString(l, c));
+          a.writeLn(u._pairToString(l, c));
         });
       };
       a.instance = new a(!0);
@@ -2711,8 +2715,8 @@
     }();
     k.Counter = a;
     a = function() {
-      function a(r) {
-        this._samples = new Float64Array(r);
+      function a(q) {
+        this._samples = new Float64Array(q);
         this._index = this._count = 0;
       }
       a.prototype.push = function(a) {
@@ -2721,8 +2725,8 @@
         this._samples[this._index % this._samples.length] = a;
       };
       a.prototype.average = function() {
-        for (var a = 0, r = 0;r < this._count;r++) {
-          a += this._samples[r];
+        for (var a = 0, q = 0;q < this._count;q++) {
+          a += this._samples[q];
         }
         return a / this._count;
       };
@@ -2735,8 +2739,8 @@
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
@@ -2744,25 +2748,25 @@
 (function(d) {
   (function(d) {
     function a(b) {
-      for (var f = Math.max.apply(null, b), n = b.length, g = 1 << f, c = new Uint32Array(g), s = f << 16 | 65535, p = 0;p < g;p++) {
-        c[p] = s;
+      for (var f = Math.max.apply(null, b), r = b.length, g = 1 << f, m = new Uint32Array(g), c = f << 16 | 65535, h = 0;h < g;h++) {
+        m[h] = c;
       }
-      for (var s = 0, p = 1, m = 2;p <= f;s <<= 1, ++p, m <<= 1) {
-        for (var h = 0;h < n;++h) {
-          if (b[h] === p) {
-            for (var l = 0, a = 0;a < p;++a) {
-              l = 2 * l + (s >> a & 1);
+      for (var c = 0, h = 1, p = 2;h <= f;c <<= 1, ++h, p <<= 1) {
+        for (var l = 0;l < r;++l) {
+          if (b[l] === h) {
+            for (var s = 0, a = 0;a < h;++a) {
+              s = 2 * s + (c >> a & 1);
             }
-            for (a = l;a < g;a += m) {
-              c[a] = p << 16 | h;
+            for (a = s;a < g;a += p) {
+              m[a] = h << 16 | l;
             }
-            ++s;
+            ++c;
           }
         }
       }
-      return{codes:c, maxBits:f};
+      return{codes:m, maxBits:f};
     }
-    var r;
+    var q;
     (function(b) {
       b[b.INIT = 0] = "INIT";
       b[b.BLOCK_0 = 1] = "BLOCK_0";
@@ -2772,8 +2776,8 @@
       b[b.DONE = 5] = "DONE";
       b[b.ERROR = 6] = "ERROR";
       b[b.VERIFY_HEADER = 7] = "VERIFY_HEADER";
-    })(r || (r = {}));
-    r = function() {
+    })(q || (q = {}));
+    q = function() {
       function b(e) {
       }
       b.prototype.push = function(b) {
@@ -2798,55 +2802,55 @@
         }
         return 2;
       };
-      b.inflate = function(f, n, g) {
-        var c = new Uint8Array(n), s = 0;
-        n = b.create(g);
-        n.onData = function(b) {
-          c.set(b, s);
-          s += b.length;
+      b.inflate = function(f, r, g) {
+        var m = new Uint8Array(r), c = 0;
+        r = b.create(g);
+        r.onData = function(b) {
+          m.set(b, c);
+          c += b.length;
         };
-        n.push(f);
-        n.close();
-        return c;
+        r.push(f);
+        r.close();
+        return m;
       };
       return b;
     }();
-    d.Inflate = r;
+    d.Inflate = q;
     var v = function(b) {
-      function f(n) {
-        b.call(this, n);
+      function f(r) {
+        b.call(this, r);
         this._buffer = null;
         this._bitLength = this._bitBuffer = this._bufferPosition = this._bufferSize = 0;
         this._window = new Uint8Array(65794);
         this._windowPosition = 0;
-        this._state = n ? 7 : 0;
+        this._state = r ? 7 : 0;
         this._isFinalBlock = !1;
         this._distanceTable = this._literalTable = null;
         this._block0Read = 0;
         this._block2State = null;
         this._copyState = {state:0, len:0, lenBits:0, dist:0, distBits:0};
         if (!m) {
-          u = new Uint8Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
-          t = new Uint16Array(30);
+          t = new Uint8Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
+          u = new Uint16Array(30);
           l = new Uint8Array(30);
-          for (var g = n = 0, q = 1;30 > n;++n) {
-            t[n] = q, q += 1 << (l[n] = ~~((g += 2 < n ? 1 : 0) / 2));
+          for (var g = r = 0, n = 1;30 > r;++r) {
+            u[r] = n, n += 1 << (l[r] = ~~((g += 2 < r ? 1 : 0) / 2));
           }
-          var r = new Uint8Array(288);
-          for (n = 0;32 > n;++n) {
-            r[n] = 5;
+          var q = new Uint8Array(288);
+          for (r = 0;32 > r;++r) {
+            q[r] = 5;
           }
-          c = a(r.subarray(0, 32));
+          c = a(q.subarray(0, 32));
           h = new Uint16Array(29);
           p = new Uint8Array(29);
-          g = n = 0;
-          for (q = 3;29 > n;++n) {
-            h[n] = q - (28 == n ? 1 : 0), q += 1 << (p[n] = ~~((g += 4 < n ? 1 : 0) / 4 % 6));
+          g = r = 0;
+          for (n = 3;29 > r;++r) {
+            h[r] = n - (28 == r ? 1 : 0), n += 1 << (p[r] = ~~((g += 4 < r ? 1 : 0) / 4 % 6));
           }
-          for (n = 0;288 > n;++n) {
-            r[n] = 144 > n || 279 < n ? 8 : 256 > n ? 9 : 7;
+          for (r = 0;288 > r;++r) {
+            q[r] = 144 > r || 279 < r ? 8 : 256 > r ? 9 : 7;
           }
-          s = a(r);
+          s = a(q);
           m = !0;
         }
       }
@@ -2900,25 +2904,25 @@
         if (this._isFinalBlock) {
           return this._state = 5, !1;
         }
-        var b = this._buffer, e = this._bufferSize, f = this._bitBuffer, g = this._bitLength, q = this._bufferPosition;
-        if (3 > (e - q << 3) + g) {
+        var b = this._buffer, e = this._bufferSize, f = this._bitBuffer, n = this._bitLength, g = this._bufferPosition;
+        if (3 > (e - g << 3) + n) {
           return!0;
         }
-        3 > g && (f |= b[q++] << g, g += 8);
-        var p = f & 7, f = f >> 3, g = g - 3;
-        switch(p >> 1) {
+        3 > n && (f |= b[g++] << n, n += 8);
+        var m = f & 7, f = f >> 3, n = n - 3;
+        switch(m >> 1) {
           case 0:
-            g = f = 0;
-            if (4 > e - q) {
+            n = f = 0;
+            if (4 > e - g) {
               return!0;
             }
-            var m = b[q] | b[q + 1] << 8, b = b[q + 2] | b[q + 3] << 8, q = q + 4;
-            if (65535 !== (m ^ b)) {
+            var h = b[g] | b[g + 1] << 8, b = b[g + 2] | b[g + 3] << 8, g = g + 4;
+            if (65535 !== (h ^ b)) {
               this._error("inflate: invalid block 0 length");
               b = 6;
               break;
             }
-            0 === m ? b = 0 : (this._block0Read = m, b = 1);
+            0 === h ? b = 0 : (this._block0Read = h, b = 1);
             break;
           case 1:
             b = 2;
@@ -2926,35 +2930,35 @@
             this._distanceTable = c;
             break;
           case 2:
-            if (26 > (e - q << 3) + g) {
+            if (26 > (e - g << 3) + n) {
               return!0;
             }
-            for (;14 > g;) {
-              f |= b[q++] << g, g += 8;
+            for (;14 > n;) {
+              f |= b[g++] << n, n += 8;
             }
-            m = (f >> 10 & 15) + 4;
-            if ((e - q << 3) + g < 14 + 3 * m) {
+            h = (f >> 10 & 15) + 4;
+            if ((e - g << 3) + n < 14 + 3 * h) {
               return!0;
             }
-            for (var e = {numLiteralCodes:(f & 31) + 257, numDistanceCodes:(f >> 5 & 31) + 1, codeLengthTable:void 0, bitLengths:void 0, codesRead:0, dupBits:0}, f = f >> 14, g = g - 14, h = new Uint8Array(19), l = 0;l < m;++l) {
-              3 > g && (f |= b[q++] << g, g += 8), h[u[l]] = f & 7, f >>= 3, g -= 3;
+            for (var e = {numLiteralCodes:(f & 31) + 257, numDistanceCodes:(f >> 5 & 31) + 1, codeLengthTable:void 0, bitLengths:void 0, codesRead:0, dupBits:0}, f = f >> 14, n = n - 14, p = new Uint8Array(19), l = 0;l < h;++l) {
+              3 > n && (f |= b[g++] << n, n += 8), p[t[l]] = f & 7, f >>= 3, n -= 3;
             }
             for (;19 > l;l++) {
-              h[u[l]] = 0;
+              p[t[l]] = 0;
             }
             e.bitLengths = new Uint8Array(e.numLiteralCodes + e.numDistanceCodes);
-            e.codeLengthTable = a(h);
+            e.codeLengthTable = a(p);
             this._block2State = e;
             b = 3;
             break;
           default:
             return this._error("inflate: unsupported block type"), !1;
         }
-        this._isFinalBlock = !!(p & 1);
+        this._isFinalBlock = !!(m & 1);
         this._state = b;
-        this._bufferPosition = q;
+        this._bufferPosition = g;
         this._bitBuffer = f;
-        this._bitLength = g;
+        this._bitLength = n;
         return!1;
       };
       f.prototype._error = function(b) {
@@ -2963,97 +2967,97 @@
         }
       };
       f.prototype._decodeBlock0 = function() {
-        var b = this._bufferPosition, e = this._windowPosition, f = this._block0Read, g = 65794 - e, q = this._bufferSize - b, c = q < f, s = Math.min(g, q, f);
-        this._window.set(this._buffer.subarray(b, b + s), e);
-        this._windowPosition = e + s;
-        this._bufferPosition = b + s;
-        this._block0Read = f - s;
-        return f === s ? (this._state = 0, !1) : c && g < q;
+        var b = this._bufferPosition, e = this._windowPosition, f = this._block0Read, n = 65794 - e, g = this._bufferSize - b, m = g < f, c = Math.min(n, g, f);
+        this._window.set(this._buffer.subarray(b, b + c), e);
+        this._windowPosition = e + c;
+        this._bufferPosition = b + c;
+        this._block0Read = f - c;
+        return f === c ? (this._state = 0, !1) : m && n < g;
       };
       f.prototype._readBits = function(b) {
         var e = this._bitBuffer, f = this._bitLength;
         if (b > f) {
-          var g = this._bufferPosition, q = this._bufferSize;
+          var n = this._bufferPosition, g = this._bufferSize;
           do {
-            if (g >= q) {
-              return this._bufferPosition = g, this._bitBuffer = e, this._bitLength = f, -1;
+            if (n >= g) {
+              return this._bufferPosition = n, this._bitBuffer = e, this._bitLength = f, -1;
             }
-            e |= this._buffer[g++] << f;
+            e |= this._buffer[n++] << f;
             f += 8;
           } while (b > f);
-          this._bufferPosition = g;
+          this._bufferPosition = n;
         }
         this._bitBuffer = e >> b;
         this._bitLength = f - b;
         return e & (1 << b) - 1;
       };
       f.prototype._readCode = function(b) {
-        var e = this._bitBuffer, f = this._bitLength, g = b.maxBits;
-        if (g > f) {
-          var q = this._bufferPosition, c = this._bufferSize;
+        var e = this._bitBuffer, f = this._bitLength, n = b.maxBits;
+        if (n > f) {
+          var g = this._bufferPosition, m = this._bufferSize;
           do {
-            if (q >= c) {
-              return this._bufferPosition = q, this._bitBuffer = e, this._bitLength = f, -1;
+            if (g >= m) {
+              return this._bufferPosition = g, this._bitBuffer = e, this._bitLength = f, -1;
             }
-            e |= this._buffer[q++] << f;
+            e |= this._buffer[g++] << f;
             f += 8;
-          } while (g > f);
-          this._bufferPosition = q;
+          } while (n > f);
+          this._bufferPosition = g;
         }
-        b = b.codes[e & (1 << g) - 1];
-        g = b >> 16;
+        b = b.codes[e & (1 << n) - 1];
+        n = b >> 16;
         if (b & 32768) {
           return this._error("inflate: invalid encoding"), this._state = 6, -1;
         }
-        this._bitBuffer = e >> g;
-        this._bitLength = f - g;
+        this._bitBuffer = e >> n;
+        this._bitLength = f - n;
         return b & 65535;
       };
       f.prototype._decodeBlock2Pre = function() {
-        var b = this._block2State, e = b.numLiteralCodes + b.numDistanceCodes, f = b.bitLengths, g = b.codesRead, q = 0 < g ? f[g - 1] : 0, c = b.codeLengthTable, s;
+        var b = this._block2State, e = b.numLiteralCodes + b.numDistanceCodes, f = b.bitLengths, n = b.codesRead, g = 0 < n ? f[n - 1] : 0, m = b.codeLengthTable, c;
         if (0 < b.dupBits) {
-          s = this._readBits(b.dupBits);
-          if (0 > s) {
+          c = this._readBits(b.dupBits);
+          if (0 > c) {
             return!0;
           }
-          for (;s--;) {
-            f[g++] = q;
+          for (;c--;) {
+            f[n++] = g;
           }
           b.dupBits = 0;
         }
-        for (;g < e;) {
-          var p = this._readCode(c);
-          if (0 > p) {
-            return b.codesRead = g, !0;
+        for (;n < e;) {
+          var h = this._readCode(m);
+          if (0 > h) {
+            return b.codesRead = n, !0;
           }
-          if (16 > p) {
-            f[g++] = q = p;
+          if (16 > h) {
+            f[n++] = g = h;
           } else {
-            var m;
-            switch(p) {
+            var p;
+            switch(h) {
               case 16:
-                m = 2;
-                s = 3;
-                p = q;
+                p = 2;
+                c = 3;
+                h = g;
                 break;
               case 17:
-                s = m = 3;
-                p = 0;
+                c = p = 3;
+                h = 0;
                 break;
               case 18:
-                m = 7, s = 11, p = 0;
+                p = 7, c = 11, h = 0;
             }
-            for (;s--;) {
-              f[g++] = p;
+            for (;c--;) {
+              f[n++] = h;
             }
-            s = this._readBits(m);
-            if (0 > s) {
-              return b.codesRead = g, b.dupBits = m, !0;
+            c = this._readBits(p);
+            if (0 > c) {
+              return b.codesRead = n, b.dupBits = p, !0;
             }
-            for (;s--;) {
-              f[g++] = p;
+            for (;c--;) {
+              f[n++] = h;
             }
-            q = p;
+            g = h;
           }
         }
         this._literalTable = a(f.subarray(0, b.numLiteralCodes));
@@ -3063,85 +3067,85 @@
         return!1;
       };
       f.prototype._decodeBlock = function() {
-        var b = this._literalTable, e = this._distanceTable, f = this._window, g = this._windowPosition, q = this._copyState, c, s, m, a;
-        if (0 !== q.state) {
-          switch(q.state) {
+        var b = this._literalTable, e = this._distanceTable, f = this._window, n = this._windowPosition, g = this._copyState, m, c, s, a;
+        if (0 !== g.state) {
+          switch(g.state) {
             case 1:
-              if (0 > (c = this._readBits(q.lenBits))) {
+              if (0 > (m = this._readBits(g.lenBits))) {
                 return!0;
               }
-              q.len += c;
-              q.state = 2;
+              g.len += m;
+              g.state = 2;
             case 2:
-              if (0 > (c = this._readCode(e))) {
+              if (0 > (m = this._readCode(e))) {
                 return!0;
               }
-              q.distBits = l[c];
-              q.dist = t[c];
-              q.state = 3;
+              g.distBits = l[m];
+              g.dist = u[m];
+              g.state = 3;
             case 3:
-              c = 0;
-              if (0 < q.distBits && 0 > (c = this._readBits(q.distBits))) {
+              m = 0;
+              if (0 < g.distBits && 0 > (m = this._readBits(g.distBits))) {
                 return!0;
               }
-              a = q.dist + c;
-              s = q.len;
-              for (c = g - a;s--;) {
-                f[g++] = f[c++];
-              }
-              q.state = 0;
-              if (65536 <= g) {
-                return this._windowPosition = g, !1;
+              a = g.dist + m;
+              c = g.len;
+              for (m = n - a;c--;) {
+                f[n++] = f[m++];
+              }
+              g.state = 0;
+              if (65536 <= n) {
+                return this._windowPosition = n, !1;
               }
               break;
           }
         }
         do {
-          c = this._readCode(b);
-          if (0 > c) {
-            return this._windowPosition = g, !0;
-          }
-          if (256 > c) {
-            f[g++] = c;
-          } else {
-            if (256 < c) {
-              this._windowPosition = g;
-              c -= 257;
-              m = p[c];
-              s = h[c];
-              c = 0 === m ? 0 : this._readBits(m);
-              if (0 > c) {
-                return q.state = 1, q.len = s, q.lenBits = m, !0;
-              }
-              s += c;
-              c = this._readCode(e);
-              if (0 > c) {
-                return q.state = 2, q.len = s, !0;
-              }
-              m = l[c];
-              a = t[c];
-              c = 0 === m ? 0 : this._readBits(m);
-              if (0 > c) {
-                return q.state = 3, q.len = s, q.dist = a, q.distBits = m, !0;
-              }
-              a += c;
-              for (c = g - a;s--;) {
-                f[g++] = f[c++];
+          m = this._readCode(b);
+          if (0 > m) {
+            return this._windowPosition = n, !0;
+          }
+          if (256 > m) {
+            f[n++] = m;
+          } else {
+            if (256 < m) {
+              this._windowPosition = n;
+              m -= 257;
+              s = p[m];
+              c = h[m];
+              m = 0 === s ? 0 : this._readBits(s);
+              if (0 > m) {
+                return g.state = 1, g.len = c, g.lenBits = s, !0;
+              }
+              c += m;
+              m = this._readCode(e);
+              if (0 > m) {
+                return g.state = 2, g.len = c, !0;
+              }
+              s = l[m];
+              a = u[m];
+              m = 0 === s ? 0 : this._readBits(s);
+              if (0 > m) {
+                return g.state = 3, g.len = c, g.dist = a, g.distBits = s, !0;
+              }
+              a += m;
+              for (m = n - a;c--;) {
+                f[n++] = f[m++];
               }
             } else {
               this._state = 0;
               break;
             }
           }
-        } while (65536 > g);
-        this._windowPosition = g;
+        } while (65536 > n);
+        this._windowPosition = n;
         return!1;
       };
       return f;
-    }(r), u, t, l, c, h, p, s, m = !1, g = function(b) {
-      function f(n) {
-        b.call(this, n);
-        this._verifyHeader = n;
+    }(q), t, u, l, c, h, p, s, m = !1, g = function(b) {
+      function f(r) {
+        b.call(this, r);
+        this._verifyHeader = r;
         this._specialInflate = new SpecialInflate;
         this._specialInflate.onData = function(b) {
           this.onData(b);
@@ -3166,7 +3170,7 @@
         this._specialInflate && (this._specialInflate.close(), this._specialInflate = null);
       };
       return f;
-    }(r), f;
+    }(q), f;
     (function(b) {
       b[b.WRITE = 0] = "WRITE";
       b[b.DONE = 1] = "DONE";
@@ -3178,11 +3182,11 @@
         this.b = 0;
       }
       b.prototype.update = function(b, e, f) {
-        for (var g = this.a, c = this.b;e < f;++e) {
-          g = (g + (b[e] & 255)) % 65521, c = (c + g) % 65521;
+        for (var g = this.a, m = this.b;e < f;++e) {
+          g = (g + (b[e] & 255)) % 65521, m = (m + g) % 65521;
         }
         this.a = g;
-        this.b = c;
+        this.b = m;
       };
       b.prototype.getChecksum = function() {
         return this.b << 16 | this.a;
@@ -3197,11 +3201,11 @@
       }
       e.prototype.push = function(b) {
         2 === this._state && (this.onData(new Uint8Array([120, 156])), this._state = 0);
-        for (var e = b.length, f = new Uint8Array(e + 5 * Math.ceil(e / 65535)), g = 0, c = 0;65535 < e;) {
-          f.set(new Uint8Array([0, 255, 255, 0, 0]), g), g += 5, f.set(b.subarray(c, c + 65535), g), c += 65535, g += 65535, e -= 65535;
+        for (var e = b.length, f = new Uint8Array(e + 5 * Math.ceil(e / 65535)), g = 0, m = 0;65535 < e;) {
+          f.set(new Uint8Array([0, 255, 255, 0, 0]), g), g += 5, f.set(b.subarray(m, m + 65535), g), m += 65535, g += 65535, e -= 65535;
         }
         f.set(new Uint8Array([0, e & 255, e >> 8 & 255, ~e & 255, ~e >> 8 & 255]), g);
-        f.set(b.subarray(c, e), g + 5);
+        f.set(b.subarray(m, e), g + 5);
         this.onData(f);
         this._adler32 && this._adler32.update(b, 0, e);
       };
@@ -3226,11 +3230,11 @@
       }
       return e;
     }
-    function r(b, e, f, g) {
-      for (var c = 1, s = 0, p = 0;p < f;p++) {
-        var m = g.decodeBit(b, c + e), c = (c << 1) + m, s = s | m << p
+    function q(b, e, f, g) {
+      for (var m = 1, c = 0, h = 0;h < f;h++) {
+        var p = g.decodeBit(b, m + e), m = (m << 1) + p, c = c | p << h
       }
-      return s;
+      return c;
     }
     function v(b, e) {
       var f = [];
@@ -3240,7 +3244,7 @@
       }
       return f;
     }
-    var u = function() {
+    var t = function() {
       function b() {
         this.pos = this.available = 0;
         this.buffer = new Uint8Array(2E3);
@@ -3269,7 +3273,7 @@
         return this.buffer[this.pos++];
       };
       return b;
-    }(), t = function() {
+    }(), u = function() {
       function b(e) {
         this.onData = e;
         this.processed = 0;
@@ -3306,14 +3310,14 @@
         this.writePos < this.pos && (this.outStream.writeBytes(this.buf.subarray(this.writePos, this.pos)), this.writePos = this.pos === this.size ? 0 : this.pos);
       };
       b.prototype.copyMatch = function(b, e) {
-        for (var f = this.pos, g = this.size, q = this.buf, c = b <= f ? f - b : g - b + f, s = e;0 < s;) {
-          for (var p = Math.min(Math.min(s, g - f), g - c), m = 0;m < p;m++) {
-            var h = q[c++];
-            q[f++] = h;
+        for (var f = this.pos, g = this.size, n = this.buf, m = b <= f ? f - b : g - b + f, c = e;0 < c;) {
+          for (var h = Math.min(Math.min(c, g - f), g - m), p = 0;p < h;p++) {
+            var l = n[m++];
+            n[f++] = l;
           }
           f === g && (this.pos = f, this.flush(), f = 0, this.isFull = !0);
-          c === g && (c = 0);
-          s -= p;
+          m === g && (m = 0);
+          c -= h;
         }
         this.pos = f;
         this.totalPos += e;
@@ -3346,23 +3350,23 @@
       b.prototype.decodeDirectBits = function(b) {
         var e = 0, f = this.range, g = this.code;
         do {
-          var f = f >>> 1 | 0, g = g - f | 0, q = g >> 31, g = g + (f & q) | 0;
+          var f = f >>> 1 | 0, g = g - f | 0, n = g >> 31, g = g + (f & n) | 0;
           g === f && (this.corrupted = !0);
           0 <= f && 16777216 > f && (f <<= 8, g = g << 8 | this.inStream.readByte());
-          e = (e << 1) + q + 1 | 0;
+          e = (e << 1) + n + 1 | 0;
         } while (--b);
         this.range = f;
         this.code = g;
         return e;
       };
       b.prototype.decodeBit = function(b, e) {
-        var f = this.range, g = this.code, q = b[e], c = (f >>> 11) * q;
-        g >>> 0 < c ? (q = q + (2048 - q >> 5) | 0, f = c | 0, c = 0) : (q = q - (q >> 5) | 0, g = g - c | 0, f = f - c | 0, c = 1);
-        b[e] = q & 65535;
+        var f = this.range, g = this.code, n = b[e], m = (f >>> 11) * n;
+        g >>> 0 < m ? (n = n + (2048 - n >> 5) | 0, f = m | 0, m = 0) : (n = n - (n >> 5) | 0, g = g - m | 0, f = f - m | 0, m = 1);
+        b[e] = n & 65535;
         0 <= f && 16777216 > f && (f <<= 8, g = g << 8 | this.inStream.readByte());
         this.range = f;
         this.code = g;
-        return c;
+        return m;
       };
       return b;
     }(), h = function() {
@@ -3377,7 +3381,7 @@
         return e - (1 << this.numBits);
       };
       b.prototype.reverseDecode = function(b) {
-        return r(this.probs, 0, this.numBits, b);
+        return q(this.probs, 0, this.numBits, b);
       };
       return b;
     }(), p = function() {
@@ -3427,22 +3431,22 @@
         this.leftToUnpack = this.unpackSize;
       };
       e.prototype.decodeLiteral = function(b, e) {
-        var f = this.outWindow, g = this.rangeDec, q = 0;
-        f.isEmpty() || (q = f.getByte(1));
-        var c = 1, q = 768 * (((f.totalPos & (1 << this.lp) - 1) << this.lc) + (q >> 8 - this.lc));
+        var f = this.outWindow, g = this.rangeDec, n = 0;
+        f.isEmpty() || (n = f.getByte(1));
+        var m = 1, n = 768 * (((f.totalPos & (1 << this.lp) - 1) << this.lc) + (n >> 8 - this.lc));
         if (7 <= b) {
           f = f.getByte(e + 1);
           do {
-            var s = f >> 7 & 1, f = f << 1, p = g.decodeBit(this.litProbs, q + ((1 + s << 8) + c)), c = c << 1 | p;
-            if (s !== p) {
+            var c = f >> 7 & 1, f = f << 1, h = g.decodeBit(this.litProbs, n + ((1 + c << 8) + m)), m = m << 1 | h;
+            if (c !== h) {
               break;
             }
-          } while (256 > c);
+          } while (256 > m);
         }
-        for (;256 > c;) {
-          c = c << 1 | g.decodeBit(this.litProbs, q + c);
+        for (;256 > m;) {
+          m = m << 1 | g.decodeBit(this.litProbs, n + m);
         }
-        return c - 256 & 255;
+        return m - 256 & 255;
       };
       e.prototype.decodeDistance = function(b) {
         var e = b;
@@ -3453,7 +3457,7 @@
           return e;
         }
         var f = (e >> 1) - 1, g = (2 | e & 1) << f;
-        14 > e ? g = g + r(this.posDecoders, g - e, f, b) | 0 : (g = g + (b.decodeDirectBits(f - 4) << 4) | 0, g = g + this.alignDecoder.reverseDecode(b) | 0);
+        14 > e ? g = g + q(this.posDecoders, g - e, f, b) | 0 : (g = g + (b.decodeDirectBits(f - 4) << 4) | 0, g = g + this.alignDecoder.reverseDecode(b) | 0);
         return g;
       };
       e.prototype.init = function() {
@@ -3471,72 +3475,72 @@
         this.repLenDecoder = new p;
       };
       e.prototype.decode = function(e) {
-        for (var q = this.rangeDec, c = this.outWindow, s = this.pb, p = this.dictSize, h = this.markerIsMandatory, l = this.leftToUnpack, a = this.isMatch, r = this.isRep, t = this.isRepG0, d = this.isRepG1, u = this.isRepG2, k = this.isRep0Long, v = this.lenDecoder, G = this.repLenDecoder, C = this.reps[0], I = this.reps[1], P = this.reps[2], T = this.reps[3], O = this.state;;) {
-          if (e && 48 > q.inStream.available) {
+        for (var n = this.rangeDec, c = this.outWindow, h = this.pb, p = this.dictSize, l = this.markerIsMandatory, s = this.leftToUnpack, a = this.isMatch, q = this.isRep, u = this.isRepG0, d = this.isRepG1, t = this.isRepG2, k = this.isRep0Long, v = this.lenDecoder, G = this.repLenDecoder, I = this.reps[0], D = this.reps[1], R = this.reps[2], T = this.reps[3], J = this.state;;) {
+          if (e && 48 > n.inStream.available) {
             this.outWindow.flush();
             break;
           }
-          if (0 === l && !h && (this.outWindow.flush(), q.isFinishedOK())) {
+          if (0 === s && !l && (this.outWindow.flush(), n.isFinishedOK())) {
             return f;
           }
-          var Q = c.totalPos & (1 << s) - 1;
-          if (0 === q.decodeBit(a, (O << 4) + Q)) {
-            if (0 === l) {
+          var P = c.totalPos & (1 << h) - 1;
+          if (0 === n.decodeBit(a, (J << 4) + P)) {
+            if (0 === s) {
               return m;
             }
-            c.putByte(this.decodeLiteral(O, C));
-            O = 4 > O ? 0 : 10 > O ? O - 3 : O - 6;
-            l--;
+            c.putByte(this.decodeLiteral(J, I));
+            J = 4 > J ? 0 : 10 > J ? J - 3 : J - 6;
+            s--;
           } else {
-            if (0 !== q.decodeBit(r, O)) {
-              if (0 === l || c.isEmpty()) {
+            if (0 !== n.decodeBit(q, J)) {
+              if (0 === s || c.isEmpty()) {
                 return m;
               }
-              if (0 === q.decodeBit(t, O)) {
-                if (0 === q.decodeBit(k, (O << 4) + Q)) {
-                  O = 7 > O ? 9 : 11;
-                  c.putByte(c.getByte(C + 1));
-                  l--;
+              if (0 === n.decodeBit(u, J)) {
+                if (0 === n.decodeBit(k, (J << 4) + P)) {
+                  J = 7 > J ? 9 : 11;
+                  c.putByte(c.getByte(I + 1));
+                  s--;
                   continue;
                 }
               } else {
                 var S;
-                0 === q.decodeBit(d, O) ? S = I : (0 === q.decodeBit(u, O) ? S = P : (S = T, T = P), P = I);
-                I = C;
-                C = S;
+                0 === n.decodeBit(d, J) ? S = D : (0 === n.decodeBit(t, J) ? S = R : (S = T, T = R), R = D);
+                D = I;
+                I = S;
               }
-              Q = G.decode(q, Q);
-              O = 7 > O ? 8 : 11;
+              P = G.decode(n, P);
+              J = 7 > J ? 8 : 11;
             } else {
-              T = P;
-              P = I;
-              I = C;
-              Q = v.decode(q, Q);
-              O = 7 > O ? 7 : 10;
-              C = this.decodeDistance(Q);
-              if (-1 === C) {
-                return this.outWindow.flush(), q.isFinishedOK() ? g : m;
+              T = R;
+              R = D;
+              D = I;
+              P = v.decode(n, P);
+              J = 7 > J ? 7 : 10;
+              I = this.decodeDistance(P);
+              if (-1 === I) {
+                return this.outWindow.flush(), n.isFinishedOK() ? g : m;
               }
-              if (0 === l || C >= p || !c.checkDistance(C)) {
+              if (0 === s || I >= p || !c.checkDistance(I)) {
                 return m;
               }
             }
-            Q += 2;
+            P += 2;
             S = !1;
-            void 0 !== l && l < Q && (Q = l, S = !0);
-            c.copyMatch(C + 1, Q);
-            l -= Q;
+            void 0 !== s && s < P && (P = s, S = !0);
+            c.copyMatch(I + 1, P);
+            s -= P;
             if (S) {
               return m;
             }
           }
         }
-        this.state = O;
-        this.reps[0] = C;
-        this.reps[1] = I;
-        this.reps[2] = P;
+        this.state = J;
+        this.reps[0] = I;
+        this.reps[1] = D;
+        this.reps[2] = R;
         this.reps[3] = T;
-        this.leftToUnpack = l;
+        this.leftToUnpack = s;
         return b;
       };
       return e;
@@ -3563,26 +3567,26 @@
             this.buffer = g;
             return;
           }
-          var c = new Uint8Array(g);
-          0 < f && c.set(this.buffer);
-          c.set(e.subarray(0, g - f), f);
-          this._inStream = new u;
-          this._inStream.append(c.subarray(g - 5));
-          this._outStream = new t(function(b) {
+          var n = new Uint8Array(g);
+          0 < f && n.set(this.buffer);
+          n.set(e.subarray(0, g - f), f);
+          this._inStream = new t;
+          this._inStream.append(n.subarray(g - 5));
+          this._outStream = new u(function(b) {
             this.onData.call(null, b);
           }.bind(this));
           this._decoder = new s(this._inStream, this._outStream);
           if (1 === this._state) {
-            this._decoder.decodeProperties(c.subarray(12, 17)), this._decoder.markerIsMandatory = !1, this._decoder.unpackSize = ((c[4] | c[5] << 8 | c[6] << 16 | c[7] << 24) >>> 0) - 8;
+            this._decoder.decodeProperties(n.subarray(12, 17)), this._decoder.markerIsMandatory = !1, this._decoder.unpackSize = ((n[4] | n[5] << 8 | n[6] << 16 | n[7] << 24) >>> 0) - 8;
           } else {
-            this._decoder.decodeProperties(c.subarray(0, 5));
-            for (var f = 0, q = !1, p = 0;8 > p;p++) {
-              var m = c[5 + p];
-              255 !== m && (q = !0);
-              f |= m << 8 * p;
+            this._decoder.decodeProperties(n.subarray(0, 5));
+            for (var f = 0, m = !1, c = 0;8 > c;c++) {
+              var h = n[5 + c];
+              255 !== h && (m = !0);
+              f |= h << 8 * c;
             }
-            this._decoder.markerIsMandatory = !q;
-            this._decoder.unpackSize = q ? f : void 0;
+            this._decoder.markerIsMandatory = !m;
+            this._decoder.unpackSize = m ? f : void 0;
           }
           this._decoder.create();
           e = e.subarray(g);
@@ -3616,10 +3620,10 @@
     function a(g, f) {
       g !== l(g, 0, f) && throwError("RangeError", Errors.ParamRangeError);
     }
-    function r(g) {
+    function q(g) {
       return "string" === typeof g ? g : void 0 == g ? null : g + "";
     }
-    var v = d.Debug.notImplemented, u = d.StringUtilities.utf8decode, t = d.StringUtilities.utf8encode, l = d.NumberUtilities.clamp, c = function() {
+    var v = d.Debug.notImplemented, t = d.StringUtilities.utf8decode, u = d.StringUtilities.utf8encode, l = d.NumberUtilities.clamp, c = function() {
       return function(g, f, b) {
         this.buffer = g;
         this.length = f;
@@ -3722,9 +3726,9 @@
       g.prototype.readInt = function() {
         var f = this._u8, b = this._position;
         b + 4 > this._length && throwError("EOFError", Errors.EOFError);
-        var e = f[b + 0], g = f[b + 1], n = f[b + 2], f = f[b + 3];
+        var e = f[b + 0], g = f[b + 1], r = f[b + 2], f = f[b + 3];
         this._position = b + 4;
-        return this._littleEndian ? f << 24 | n << 16 | g << 8 | e : e << 24 | g << 16 | n << 8 | f;
+        return this._littleEndian ? f << 24 | r << 16 | g << 8 | e : e << 24 | g << 16 | r << 8 | f;
       };
       g.prototype.readUnsignedInt = function() {
         return this.readInt() >>> 0;
@@ -3821,11 +3825,11 @@
         this._requestViews(2);
         this._littleEndian === g._nativeLittleEndian && 0 === (e & 3) && this._i32 ? (this._i32[(e >> 2) + 0] = f, this._i32[(e >> 2) + 1] = b, this._position = e += 8, e > this._length && (this._length = e)) : (this.writeUnsignedInt(f), this.writeUnsignedInt(b));
       };
-      g.prototype.write4UnsignedInts = function(f, b, e, c) {
-        var n = this._position;
-        this._ensureCapacity(n + 16);
+      g.prototype.write4UnsignedInts = function(f, b, e, n) {
+        var r = this._position;
+        this._ensureCapacity(r + 16);
         this._requestViews(2);
-        this._littleEndian === g._nativeLittleEndian && 0 === (n & 3) && this._i32 ? (this._i32[(n >> 2) + 0] = f, this._i32[(n >> 2) + 1] = b, this._i32[(n >> 2) + 2] = e, this._i32[(n >> 2) + 3] = c, this._position = n += 16, n > this._length && (this._length = n)) : (this.writeUnsignedInt(f), this.writeUnsignedInt(b), this.writeUnsignedInt(e), this.writeUnsignedInt(c));
+        this._littleEndian === g._nativeLittleEndian && 0 === (r & 3) && this._i32 ? (this._i32[(r >> 2) + 0] = f, this._i32[(r >> 2) + 1] = b, this._i32[(r >> 2) + 2] = e, this._i32[(r >> 2) + 3] = n, this._position = r += 16, r > this._length && (this._length = r)) : (this.writeUnsignedInt(f), this.writeUnsignedInt(b), this.writeUnsignedInt(e), this.writeUnsignedInt(n));
       };
       g.prototype.writeFloat = function(f) {
         var b = this._position;
@@ -3842,11 +3846,11 @@
         this._position = b += 4;
         b > this._length && (this._length = b);
       };
-      g.prototype.write6Floats = function(f, b, e, c, n, s) {
-        var p = this._position;
-        this._ensureCapacity(p + 24);
+      g.prototype.write6Floats = function(f, b, e, n, r, m) {
+        var c = this._position;
+        this._ensureCapacity(c + 24);
         this._requestViews(4);
-        this._littleEndian === g._nativeLittleEndian && 0 === (p & 3) && this._f32 ? (this._f32[(p >> 2) + 0] = f, this._f32[(p >> 2) + 1] = b, this._f32[(p >> 2) + 2] = e, this._f32[(p >> 2) + 3] = c, this._f32[(p >> 2) + 4] = n, this._f32[(p >> 2) + 5] = s, this._position = p += 24, p > this._length && (this._length = p)) : (this.writeFloat(f), this.writeFloat(b), this.writeFloat(e), this.writeFloat(c), this.writeFloat(n), this.writeFloat(s));
+        this._littleEndian === g._nativeLittleEndian && 0 === (c & 3) && this._f32 ? (this._f32[(c >> 2) + 0] = f, this._f32[(c >> 2) + 1] = b, this._f32[(c >> 2) + 2] = e, this._f32[(c >> 2) + 3] = n, this._f32[(c >> 2) + 4] = r, this._f32[(c >> 2) + 5] = m, this._position = c += 24, c > this._length && (this._length = c)) : (this.writeFloat(f), this.writeFloat(b), this.writeFloat(e), this.writeFloat(n), this.writeFloat(r), this.writeFloat(m));
       };
       g.prototype.writeDouble = function(f) {
         var b = this._position;
@@ -3862,14 +3866,14 @@
         return new Int8Array(this._buffer, 0, this._length);
       };
       g.prototype.writeUTF = function(f) {
-        f = r(f);
-        f = u(f);
+        f = q(f);
+        f = t(f);
         this.writeShort(f.length);
         this.writeRawBytes(f);
       };
       g.prototype.writeUTFBytes = function(f) {
-        f = r(f);
-        f = u(f);
+        f = q(f);
+        f = t(f);
         this.writeRawBytes(f);
       };
       g.prototype.readUTF = function() {
@@ -3880,7 +3884,7 @@
         var b = this._position;
         b + f > this._length && throwError("EOFError", Errors.EOFError);
         this._position += f;
-        return t(new Int8Array(this._buffer, b, f));
+        return u(new Int8Array(this._buffer, b, f));
       };
       Object.defineProperty(g.prototype, "length", {get:function() {
         return this._length;
@@ -3916,11 +3920,11 @@
       Object.defineProperty(g.prototype, "endian", {get:function() {
         return this._littleEndian ? "littleEndian" : "bigEndian";
       }, set:function(f) {
-        f = r(f);
+        f = q(f);
         this._littleEndian = "auto" === f ? g._nativeLittleEndian : "littleEndian" === f;
       }, enumerable:!0, configurable:!0});
       g.prototype.toString = function() {
-        return t(new Int8Array(this._buffer, 0, this._length));
+        return u(new Int8Array(this._buffer, 0, this._length));
       };
       g.prototype.toBlob = function(f) {
         return new Blob([new Int8Array(this._buffer, this._position, this._length)], {type:f});
@@ -3995,58 +3999,66 @@
           }
           this._position += f + 1;
         }
-        return t(new Int8Array(this._buffer, b, f));
+        return u(new Int8Array(this._buffer, b, f));
       };
       g.prototype.align = function() {
         this._bitLength = this._bitBuffer = 0;
       };
-      g.prototype._compress = function(f) {
-        f = r(f);
+      g.prototype.deflate = function() {
+        this.compress("deflate");
+      };
+      g.prototype.inflate = function() {
+        this.uncompress("deflate");
+      };
+      g.prototype.compress = function(f) {
+        f = 0 === arguments.length ? "zlib" : q(f);
+        var b;
         switch(f) {
           case "zlib":
-            f = new k.Deflate(!0);
+            b = new k.Deflate(!0);
             break;
           case "deflate":
-            f = new k.Deflate(!1);
+            b = new k.Deflate(!1);
             break;
           default:
             return;
         }
-        var b = new g;
-        f.onData = b.writeRawBytes.bind(b);
-        f.push(this._u8.subarray(0, this._length));
-        f.close();
-        this._ensureCapacity(b._u8.length);
-        this._u8.set(b._u8);
-        this.length = b.length;
+        var e = new g;
+        b.onData = e.writeRawBytes.bind(e);
+        b.push(this._u8.subarray(0, this._length));
+        b.close();
+        this._ensureCapacity(e._u8.length);
+        this._u8.set(e._u8);
+        this.length = e.length;
         this._position = 0;
       };
-      g.prototype._uncompress = function(f) {
-        f = r(f);
+      g.prototype.uncompress = function(f) {
+        f = 0 === arguments.length ? "zlib" : q(f);
+        var b;
         switch(f) {
           case "zlib":
-            f = k.Inflate.create(!0);
+            b = k.Inflate.create(!0);
             break;
           case "deflate":
-            f = k.Inflate.create(!1);
+            b = k.Inflate.create(!1);
             break;
           case "lzma":
-            f = new k.LzmaDecoder(!1);
+            b = new k.LzmaDecoder(!1);
             break;
           default:
             return;
         }
-        var b = new g, e;
-        f.onData = b.writeRawBytes.bind(b);
-        f.onError = function(b) {
-          return e = b;
-        };
-        f.push(this._u8.subarray(0, this._length));
-        e && throwError("IOError", Errors.CompressedDataError);
-        f.close();
-        this._ensureCapacity(b._u8.length);
-        this._u8.set(b._u8);
-        this.length = b.length;
+        var e = new g, n;
+        b.onData = e.writeRawBytes.bind(e);
+        b.onError = function(b) {
+          return n = b;
+        };
+        b.push(this._u8.subarray(0, this._length));
+        n && throwError("IOError", Errors.CompressedDataError);
+        b.close();
+        this._ensureCapacity(e._u8.length);
+        this._u8.set(e._u8);
+        this.length = e.length;
         this._position = 0;
       };
       g._nativeLittleEndian = 1 === (new Int8Array((new Int32Array([1])).buffer))[0];
@@ -4092,10 +4104,10 @@
     a[a.Vertical = 2] = "Vertical";
     a[a.Horizontal = 3] = "Horizontal";
   })(d.LineScaleMode || (d.LineScaleMode = {}));
-  var r = function() {
-    return function(a, r, l, c, h, p, s, m, g, f, b) {
+  var q = function() {
+    return function(a, q, l, c, h, p, s, m, g, f, b) {
       this.commands = a;
-      this.commandsPosition = r;
+      this.commandsPosition = q;
       this.coordinates = l;
       this.morphCoordinates = c;
       this.coordinatesPosition = h;
@@ -4107,7 +4119,7 @@
       this.hasLines = b;
     };
   }();
-  d.PlainObjectShapeData = r;
+  d.PlainObjectShapeData = q;
   var v;
   (function(a) {
     a[a.Commands = 32] = "Commands";
@@ -4244,9 +4256,9 @@
       this.coordinates[this.coordinatesPosition++] = a;
       this.coordinates[this.coordinatesPosition++] = l;
     };
-    d.prototype.writeMorphCoordinates = function(r, l) {
+    d.prototype.writeMorphCoordinates = function(q, l) {
       this.morphCoordinates = a(this.morphCoordinates, this.coordinatesPosition);
-      this.morphCoordinates[this.coordinatesPosition - 2] = r;
+      this.morphCoordinates[this.coordinatesPosition - 2] = q;
       this.morphCoordinates[this.coordinatesPosition - 1] = l;
     };
     d.prototype.clear = function() {
@@ -4274,7 +4286,7 @@
       return a;
     };
     d.prototype.toPlainObject = function() {
-      return new r(this.commands, this.commandsPosition, this.coordinates, this.morphCoordinates, this.coordinatesPosition, this.styles.buffer, this.styles.length, this.morphStyles && this.morphStyles.buffer, this.morphStyles ? this.morphStyles.length : 0, this.hasFills, this.hasLines);
+      return new q(this.commands, this.commandsPosition, this.coordinates, this.morphCoordinates, this.coordinatesPosition, this.styles.buffer, this.styles.length, this.morphStyles && this.morphStyles.buffer, this.morphStyles ? this.morphStyles.length : 0, this.hasFills, this.hasLines);
     };
     Object.defineProperty(d.prototype, "buffers", {get:function() {
       var a = [this.commands.buffer, this.coordinates.buffer, this.styles.buffer];
@@ -4285,8 +4297,8 @@
     d.prototype._writeStyleMatrix = function(a, l) {
       (l ? this.morphStyles : this.styles).write6Floats(a.a, a.b, a.c, a.d, a.tx, a.ty);
     };
-    d.prototype.ensurePathCapacities = function(r, l) {
-      this.commands = a(this.commands, this.commandsPosition + r);
+    d.prototype.ensurePathCapacities = function(q, l) {
+      this.commands = a(this.commands, this.commandsPosition + q);
       this.coordinates = a(this.coordinates, this.coordinatesPosition + l);
     };
     return d;
@@ -4475,47 +4487,47 @@
 })(Shumway || (Shumway = {}));
 (function(d) {
   var k = d.Debug.unexpected, a = function() {
-    function a(d, r, t, l) {
+    function a(d, q, u, l) {
       this.url = d;
-      this.method = r;
-      this.mimeType = t;
+      this.method = q;
+      this.mimeType = u;
       this.data = l;
     }
     a.prototype.readAll = function(a) {
-      var d = this.url, t = new XMLHttpRequest({mozSystem:!0});
-      t.open(this.method || "GET", this.url, !0);
-      t.responseType = "arraybuffer";
-      t.onreadystatechange = function(l) {
-        4 === t.readyState && (200 !== t.status && 0 !== t.status || null === t.response ? (k("Path: " + d + " not found."), a(null, t.statusText)) : a(t.response));
+      var d = this.url, u = new XMLHttpRequest({mozSystem:!0});
+      u.open(this.method || "GET", this.url, !0);
+      u.responseType = "arraybuffer";
+      u.onreadystatechange = function(l) {
+        4 === u.readyState && (200 !== u.status && 0 !== u.status || null === u.response ? (k("Path: " + d + " not found."), a(null, u.statusText)) : a(u.response));
       };
-      this.mimeType && t.setRequestHeader("Content-Type", this.mimeType);
-      t.send(this.data || null);
+      this.mimeType && u.setRequestHeader("Content-Type", this.mimeType);
+      u.send(this.data || null);
     };
-    a.prototype.readChunked = function(a, d, t, l, c, h) {
+    a.prototype.readChunked = function(a, d, u, l, c, h) {
       if (0 >= a) {
-        this.readAsync(d, t, l, c, h);
+        this.readAsync(d, u, l, c, h);
       } else {
         var p = 0, s = new Uint8Array(a), m = 0, g;
         this.readAsync(function(f, b) {
           g = b.total;
-          for (var e = f.length, c = 0;p + e >= a;) {
-            var n = a - p;
-            s.set(f.subarray(c, c + n), p);
-            c += n;
-            e -= n;
+          for (var e = f.length, n = 0;p + e >= a;) {
+            var r = a - p;
+            s.set(f.subarray(n, n + r), p);
+            n += r;
+            e -= r;
             m += a;
             d(s, {loaded:m, total:g});
             p = 0;
           }
-          s.set(f.subarray(c), p);
+          s.set(f.subarray(n), p);
           p += e;
-        }, t, l, function() {
+        }, u, l, function() {
           0 < p && (m += p, d(s.subarray(0, p), {loaded:m, total:g}), p = 0);
           c && c();
         }, h);
       }
     };
-    a.prototype.readAsync = function(a, d, t, l, c) {
+    a.prototype.readAsync = function(a, d, u, l, c) {
       var h = new XMLHttpRequest({mozSystem:!0}), p = this.url, s = 0, m = 0;
       h.open(this.method || "GET", p, !0);
       h.responseType = "moz-chunked-arraybuffer";
@@ -4530,7 +4542,7 @@
       };
       this.mimeType && h.setRequestHeader("Content-Type", this.mimeType);
       h.send(this.data || null);
-      t && t();
+      u && u();
     };
     return a;
   }();
@@ -4837,9 +4849,10 @@
   (function(d) {
     (function(a) {
       var d = function() {
-        function a(d) {
+        function a(d, u) {
           this._buffers = d || [];
           this._snapshots = [];
+          this._windowStart = this._startTime = u;
           this._maxDepth = 0;
         }
         a.prototype.addBuffer = function(a) {
@@ -4881,16 +4894,13 @@
           }
         };
         a.prototype.createSnapshots = function() {
-          var a = Number.MAX_VALUE, d = Number.MIN_VALUE, l = 0;
+          var a = Number.MIN_VALUE, d = 0;
           for (this._snapshots = [];0 < this._buffers.length;) {
-            var c = this._buffers.shift().createSnapshot();
-            c && (a > c.startTime && (a = c.startTime), d < c.endTime && (d = c.endTime), l < c.maxDepth && (l = c.maxDepth), this._snapshots.push(c));
+            var l = this._buffers.shift().createSnapshot();
+            l && (a < l.endTime && (a = l.endTime), d < l.maxDepth && (d = l.maxDepth), this._snapshots.push(l));
           }
-          this._startTime = a;
-          this._endTime = d;
-          this._windowStart = a;
-          this._windowEnd = d;
-          this._maxDepth = l;
+          this._windowEnd = this._endTime = a;
+          this._maxDepth = d;
         };
         a.prototype.setWindow = function(a, d) {
           if (a > d) {
@@ -4916,8 +4926,8 @@
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
@@ -5088,22 +5098,22 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = function() {
-        function r(a, t) {
+      var q = function() {
+        function q(a, u) {
           void 0 === a && (a = "");
           this.name = a || "";
-          this._startTime = d.isNullOrUndefined(t) ? jsGlobal.START_TIME : t;
+          this._startTime = d.isNullOrUndefined(u) ? jsGlobal.START_TIME : u;
         }
-        r.prototype.getKind = function(a) {
+        q.prototype.getKind = function(a) {
           return this._kinds[a];
         };
-        Object.defineProperty(r.prototype, "kinds", {get:function() {
+        Object.defineProperty(q.prototype, "kinds", {get:function() {
           return this._kinds.concat();
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(r.prototype, "depth", {get:function() {
+        Object.defineProperty(q.prototype, "depth", {get:function() {
           return this._depth;
         }, enumerable:!0, configurable:!0});
-        r.prototype._initialize = function() {
+        q.prototype._initialize = function() {
           this._depth = 0;
           this._stack = [];
           this._data = [];
@@ -5112,66 +5122,66 @@
           this._marks = new d.CircularBuffer(Int32Array, 20);
           this._times = new d.CircularBuffer(Float64Array, 20);
         };
-        r.prototype._getKindId = function(a) {
-          var d = r.MAX_KINDID;
+        q.prototype._getKindId = function(a) {
+          var d = q.MAX_KINDID;
           if (void 0 === this._kindNameMap[a]) {
-            if (d = this._kinds.length, d < r.MAX_KINDID) {
+            if (d = this._kinds.length, d < q.MAX_KINDID) {
               var l = {id:d, name:a, visible:!0};
               this._kinds.push(l);
               this._kindNameMap[a] = l;
             } else {
-              d = r.MAX_KINDID;
+              d = q.MAX_KINDID;
             }
           } else {
             d = this._kindNameMap[a].id;
           }
           return d;
         };
-        r.prototype._getMark = function(a, t, l) {
-          var c = r.MAX_DATAID;
-          d.isNullOrUndefined(l) || t === r.MAX_KINDID || (c = this._data.length, c < r.MAX_DATAID ? this._data.push(l) : c = r.MAX_DATAID);
-          return a | c << 16 | t;
+        q.prototype._getMark = function(a, u, l) {
+          var c = q.MAX_DATAID;
+          d.isNullOrUndefined(l) || u === q.MAX_KINDID || (c = this._data.length, c < q.MAX_DATAID ? this._data.push(l) : c = q.MAX_DATAID);
+          return a | c << 16 | u;
         };
-        r.prototype.enter = function(a, t, l) {
+        q.prototype.enter = function(a, u, l) {
           l = (d.isNullOrUndefined(l) ? performance.now() : l) - this._startTime;
           this._marks || this._initialize();
           this._depth++;
           a = this._getKindId(a);
-          this._marks.write(this._getMark(r.ENTER, a, t));
+          this._marks.write(this._getMark(q.ENTER, a, u));
           this._times.write(l);
           this._stack.push(a);
         };
-        r.prototype.leave = function(a, t, l) {
+        q.prototype.leave = function(a, u, l) {
           l = (d.isNullOrUndefined(l) ? performance.now() : l) - this._startTime;
           var c = this._stack.pop();
           a && (c = this._getKindId(a));
-          this._marks.write(this._getMark(r.LEAVE, c, t));
+          this._marks.write(this._getMark(q.LEAVE, c, u));
           this._times.write(l);
           this._depth--;
         };
-        r.prototype.count = function(a, d, l) {
+        q.prototype.count = function(a, d, l) {
         };
-        r.prototype.createSnapshot = function() {
-          var u;
-          void 0 === u && (u = Number.MAX_VALUE);
+        q.prototype.createSnapshot = function() {
+          var t;
+          void 0 === t && (t = Number.MAX_VALUE);
           if (!this._marks) {
             return null;
           }
-          var t = this._times, l = this._kinds, c = this._data, h = new a.TimelineBufferSnapshot(this.name), p = [h], s = 0;
+          var u = this._times, l = this._kinds, c = this._data, h = new a.TimelineBufferSnapshot(this.name), p = [h], s = 0;
           this._marks || this._initialize();
           this._marks.forEachInReverse(function(m, g) {
-            var f = c[m >>> 16 & r.MAX_DATAID], b = l[m & r.MAX_KINDID];
+            var f = c[m >>> 16 & q.MAX_DATAID], b = l[m & q.MAX_KINDID];
             if (d.isNullOrUndefined(b) || b.visible) {
-              var e = m & 2147483648, q = t.get(g), n = p.length;
-              if (e === r.LEAVE) {
-                if (1 === n && (s++, s > u)) {
+              var e = m & 2147483648, n = u.get(g), r = p.length;
+              if (e === q.LEAVE) {
+                if (1 === r && (s++, s > t)) {
                   return!0;
                 }
-                p.push(new a.TimelineFrame(p[n - 1], b, null, f, NaN, q));
+                p.push(new a.TimelineFrame(p[r - 1], b, null, f, NaN, n));
               } else {
-                if (e === r.ENTER) {
+                if (e === q.ENTER) {
                   if (b = p.pop(), e = p[p.length - 1]) {
-                    for (e.children ? e.children.unshift(b) : e.children = [b], e = p.length, b.depth = e, b.startData = f, b.startTime = q;b;) {
+                    for (e.children ? e.children.unshift(b) : e.children = [b], e = p.length, b.depth = e, b.startData = f, b.startTime = n;b;) {
                       if (b.maxDepth < e) {
                         b.maxDepth = e, b = b.parent;
                       } else {
@@ -5188,12 +5198,12 @@
           h.children && h.children.length && (h.startTime = h.children[0].startTime, h.endTime = h.children[h.children.length - 1].endTime);
           return h;
         };
-        r.prototype.reset = function(a) {
+        q.prototype.reset = function(a) {
           this._startTime = d.isNullOrUndefined(a) ? performance.now() : a;
           this._marks ? (this._depth = 0, this._data = [], this._marks.reset(), this._times.reset()) : this._initialize();
         };
-        r.FromFirefoxProfile = function(a, d) {
-          for (var l = a.profile.threads[0].samples, c = new r(d, l[0].time), h = [], p, s = 0;s < l.length;s++) {
+        q.FromFirefoxProfile = function(a, d) {
+          for (var l = a.profile.threads[0].samples, c = new q(d, l[0].time), h = [], p, s = 0;s < l.length;s++) {
             p = l[s];
             var m = p.time, g = p.frames, f = 0;
             for (p = Math.min(g.length, h.length);f < p && g[f].location === h[f].location;) {
@@ -5212,9 +5222,9 @@
           }
           return c;
         };
-        r.FromChromeProfile = function(a, d) {
-          var l = a.timestamps, c = a.samples, h = new r(d, l[0] / 1E3), p = [], s = {}, m;
-          r._resolveIds(a.head, s);
+        q.FromChromeProfile = function(a, d) {
+          var l = a.timestamps, c = a.samples, h = new q(d, l[0] / 1E3), p = [], s = {}, m;
+          q._resolveIds(a.head, s);
           for (var g = 0;g < l.length;g++) {
             var f = l[g] / 1E3, b = [];
             for (m = s[c[g]];m;) {
@@ -5224,7 +5234,7 @@
             for (m = Math.min(b.length, p.length);e < m && b[e] === p[e];) {
               e++;
             }
-            for (var q = p.length - e, n = 0;n < q;n++) {
+            for (var n = p.length - e, r = 0;r < n;r++) {
               m = p.pop(), h.leave(m.functionName, null, f);
             }
             for (;e < b.length;) {
@@ -5237,21 +5247,21 @@
           }
           return h;
         };
-        r._resolveIds = function(a, d) {
+        q._resolveIds = function(a, d) {
           d[a.id] = a;
           if (a.children) {
             for (var l = 0;l < a.children.length;l++) {
-              a.children[l].parent = a, r._resolveIds(a.children[l], d);
+              a.children[l].parent = a, q._resolveIds(a.children[l], d);
             }
           }
         };
-        r.ENTER = 0;
-        r.LEAVE = -2147483648;
-        r.MAX_KINDID = 65535;
-        r.MAX_DATAID = 32767;
-        return r;
+        q.ENTER = 0;
+        q.LEAVE = -2147483648;
+        q.MAX_KINDID = 65535;
+        q.MAX_DATAID = 32767;
+        return q;
       }();
-      a.TimelineBuffer = r;
+      a.TimelineBuffer = q;
     })(k.Profiler || (k.Profiler = {}));
   })(d.Tools || (d.Tools = {}));
 })(Shumway || (Shumway = {}));
@@ -5262,8 +5272,8 @@
         a[a.DARK = 0] = "DARK";
         a[a.LIGHT = 1] = "LIGHT";
       })(a.UIThemeType || (a.UIThemeType = {}));
-      var r = function() {
-        function r(a, d) {
+      var q = function() {
+        function q(a, d) {
           void 0 === d && (d = 0);
           this._container = a;
           this._headers = [];
@@ -5273,42 +5283,41 @@
           this.themeType = d;
           this._tooltip = this._createTooltip();
         }
-        r.prototype.createProfile = function(d, r) {
-          void 0 === r && (r = !0);
-          var l = new a.Profile(d);
+        q.prototype.createProfile = function(d, q) {
+          var l = new a.Profile(d, q);
           l.createSnapshots();
           this._profiles.push(l);
-          r && this.activateProfile(l);
+          this.activateProfile(l);
           return l;
         };
-        r.prototype.activateProfile = function(a) {
+        q.prototype.activateProfile = function(a) {
           this.deactivateProfile();
           this._activeProfile = a;
           this._createViews();
           this._initializeViews();
         };
-        r.prototype.activateProfileAt = function(a) {
+        q.prototype.activateProfileAt = function(a) {
           this.activateProfile(this.getProfileAt(a));
         };
-        r.prototype.deactivateProfile = function() {
+        q.prototype.deactivateProfile = function() {
           this._activeProfile && (this._destroyViews(), this._activeProfile = null);
         };
-        r.prototype.resize = function() {
+        q.prototype.resize = function() {
           this._onResize();
         };
-        r.prototype.getProfileAt = function(a) {
+        q.prototype.getProfileAt = function(a) {
           return this._profiles[a];
         };
-        Object.defineProperty(r.prototype, "activeProfile", {get:function() {
+        Object.defineProperty(q.prototype, "activeProfile", {get:function() {
           return this._activeProfile;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(r.prototype, "profileCount", {get:function() {
+        Object.defineProperty(q.prototype, "profileCount", {get:function() {
           return this._profiles.length;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(r.prototype, "container", {get:function() {
+        Object.defineProperty(q.prototype, "container", {get:function() {
           return this._container;
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(r.prototype, "themeType", {get:function() {
+        Object.defineProperty(q.prototype, "themeType", {get:function() {
           return this._themeType;
         }, set:function(a) {
           switch(a) {
@@ -5319,25 +5328,25 @@
               this._theme = new k.Theme.UIThemeLight;
           }
         }, enumerable:!0, configurable:!0});
-        Object.defineProperty(r.prototype, "theme", {get:function() {
+        Object.defineProperty(q.prototype, "theme", {get:function() {
           return this._theme;
         }, enumerable:!0, configurable:!0});
-        r.prototype.getSnapshotAt = function(a) {
+        q.prototype.getSnapshotAt = function(a) {
           return this._activeProfile.getSnapshotAt(a);
         };
-        r.prototype._createViews = function() {
+        q.prototype._createViews = function() {
           if (this._activeProfile) {
             var d = this;
             this._overviewHeader = new a.FlameChartHeader(this, 0);
             this._overview = new a.FlameChartOverview(this, 0);
-            this._activeProfile.forEachSnapshot(function(r, l) {
+            this._activeProfile.forEachSnapshot(function(q, l) {
               d._headers.push(new a.FlameChartHeader(d, 1));
-              d._charts.push(new a.FlameChart(d, r));
+              d._charts.push(new a.FlameChart(d, q));
             });
             window.addEventListener("resize", this._onResize.bind(this));
           }
         };
-        r.prototype._destroyViews = function() {
+        q.prototype._destroyViews = function() {
           if (this._activeProfile) {
             this._overviewHeader.destroy();
             for (this._overview.destroy();this._headers.length;) {
@@ -5349,7 +5358,7 @@
             window.removeEventListener("resize", this._onResize.bind(this));
           }
         };
-        r.prototype._initializeViews = function() {
+        q.prototype._initializeViews = function() {
           if (this._activeProfile) {
             var a = this, d = this._activeProfile.startTime, l = this._activeProfile.endTime;
             this._overviewHeader.initialize(d, l);
@@ -5360,7 +5369,7 @@
             });
           }
         };
-        r.prototype._onResize = function() {
+        q.prototype._onResize = function() {
           if (this._activeProfile) {
             var a = this, d = this._container.offsetWidth;
             this._overviewHeader.setSize(d);
@@ -5371,7 +5380,7 @@
             });
           }
         };
-        r.prototype._updateViews = function() {
+        q.prototype._updateViews = function() {
           if (this._activeProfile) {
             var a = this, d = this._activeProfile.windowStart, l = this._activeProfile.windowEnd;
             this._overviewHeader.setWindow(d, l);
@@ -5382,24 +5391,24 @@
             });
           }
         };
-        r.prototype._drawViews = function() {
+        q.prototype._drawViews = function() {
         };
-        r.prototype._createTooltip = function() {
+        q.prototype._createTooltip = function() {
           var a = document.createElement("div");
           a.classList.add("profiler-tooltip");
           a.style.display = "none";
           this._container.insertBefore(a, this._container.firstChild);
           return a;
         };
-        r.prototype.setWindow = function(a, d) {
+        q.prototype.setWindow = function(a, d) {
           this._activeProfile.setWindow(a, d);
           this._updateViews();
         };
-        r.prototype.moveWindowTo = function(a) {
+        q.prototype.moveWindowTo = function(a) {
           this._activeProfile.moveWindowTo(a);
           this._updateViews();
         };
-        r.prototype.showTooltip = function(a, d, l, c) {
+        q.prototype.showTooltip = function(a, d, l, c) {
           this.removeTooltipContent();
           this._tooltip.appendChild(this.createTooltipContent(a, d));
           this._tooltip.style.display = "block";
@@ -5411,10 +5420,10 @@
           this._tooltip.style.left = l + "px";
           this._tooltip.style.top = c + "px";
         };
-        r.prototype.hideTooltip = function() {
+        q.prototype.hideTooltip = function() {
           this._tooltip.style.display = "none";
         };
-        r.prototype.createTooltipContent = function(a, d) {
+        q.prototype.createTooltipContent = function(a, d) {
           var l = Math.round(1E5 * d.totalTime) / 1E5, c = Math.round(1E5 * d.selfTime) / 1E5, h = Math.round(1E4 * d.selfTime / d.totalTime) / 100, p = document.createElement("div"), s = document.createElement("h1");
           s.textContent = d.kind.name;
           p.appendChild(s);
@@ -5431,34 +5440,34 @@
           this.appendDataElements(p, d.endData);
           return p;
         };
-        r.prototype.appendDataElements = function(a, r) {
-          if (!d.isNullOrUndefined(r)) {
+        q.prototype.appendDataElements = function(a, q) {
+          if (!d.isNullOrUndefined(q)) {
             a.appendChild(document.createElement("hr"));
             var l;
-            if (d.isObject(r)) {
-              for (var c in r) {
-                l = document.createElement("p"), l.textContent = c + ": " + r[c], a.appendChild(l);
+            if (d.isObject(q)) {
+              for (var c in q) {
+                l = document.createElement("p"), l.textContent = c + ": " + q[c], a.appendChild(l);
               }
             } else {
-              l = document.createElement("p"), l.textContent = r.toString(), a.appendChild(l);
+              l = document.createElement("p"), l.textContent = q.toString(), a.appendChild(l);
             }
           }
         };
-        r.prototype.removeTooltipContent = function() {
+        q.prototype.removeTooltipContent = function() {
           for (var a = this._tooltip;a.firstChild;) {
             a.removeChild(a.firstChild);
           }
         };
-        return r;
+        return q;
       }();
-      a.Controller = r;
+      a.Controller = q;
     })(k.Profiler || (k.Profiler = {}));
   })(d.Tools || (d.Tools = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.NumberUtilities.clamp, k = function() {
+      var q = d.NumberUtilities.clamp, k = function() {
         function a(l) {
           this.value = l;
         }
@@ -5502,7 +5511,7 @@
         return a;
       }();
       a.MouseCursor = k;
-      var u = function() {
+      var t = function() {
         function a(l, c) {
           this._target = l;
           this._eventTarget = c;
@@ -5600,7 +5609,7 @@
         a.prototype._onMouseWheel = function(a) {
           if (!(a.altKey || a.metaKey || a.ctrlKey || a.shiftKey || (a.preventDefault(), this._dragInfo || this._wheelDisabled))) {
             var c = this._getTargetMousePos(a, a.target);
-            a = r("undefined" !== typeof a.deltaY ? a.deltaY / 16 : -a.wheelDelta / 40, -1, 1);
+            a = q("undefined" !== typeof a.deltaY ? a.deltaY / 16 : -a.wheelDelta / 40, -1, 1);
             this._target.onMouseWheel(c.x, c.y, Math.pow(1.2, a) - 1);
           }
         };
@@ -5629,7 +5638,7 @@
         a._cursor = k.DEFAULT;
         return a;
       }();
-      a.MouseController = u;
+      a.MouseController = t;
     })(k.Profiler || (k.Profiler = {}));
   })(d.Tools || (d.Tools = {}));
 })(Shumway || (Shumway = {}));
@@ -5644,16 +5653,16 @@
         a[a.HANDLE_BOTH = 4] = "HANDLE_BOTH";
       })(a.FlameChartDragTarget || (a.FlameChartDragTarget = {}));
       var d = function() {
-        function d(r) {
-          this._controller = r;
+        function d(q) {
+          this._controller = q;
           this._initialized = !1;
           this._canvas = document.createElement("canvas");
           this._context = this._canvas.getContext("2d");
           this._mouseController = new a.MouseController(this, this._canvas);
-          r = r.container;
-          r.appendChild(this._canvas);
-          r = r.getBoundingClientRect();
-          this.setSize(r.width);
+          q = q.container;
+          q.appendChild(this._canvas);
+          q = q.getBoundingClientRect();
+          this.setSize(q.width);
         }
         Object.defineProperty(d.prototype, "canvas", {get:function() {
           return this._canvas;
@@ -5722,12 +5731,12 @@
         d.prototype._toTime = function(a) {
           return 0;
         };
-        d.prototype.onMouseWheel = function(a, r, l) {
+        d.prototype.onMouseWheel = function(a, q, l) {
           a = this._toTime(a);
-          r = this._windowStart;
-          var c = this._windowEnd, h = c - r;
+          q = this._windowStart;
+          var c = this._windowEnd, h = c - q;
           l = Math.max((d.MIN_WINDOW_LEN - h) / h, l);
-          this._controller.setWindow(r + (r - a) * l, c + (c - a) * l);
+          this._controller.setWindow(q + (q - a) * l, c + (c - a) * l);
           this.onHoverEnd();
         };
         d.prototype.onMouseDown = function(a, d) {
@@ -5759,30 +5768,30 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.StringUtilities.trimMiddle, k = function(k) {
-        function t(a, c) {
+      var q = d.StringUtilities.trimMiddle, k = function(k) {
+        function u(a, c) {
           k.call(this, a);
           this._textWidth = {};
           this._minFrameWidthInPixels = 1;
           this._snapshot = c;
           this._kindStyle = Object.create(null);
         }
-        __extends(t, k);
-        t.prototype.setSize = function(a, c) {
+        __extends(u, k);
+        u.prototype.setSize = function(a, c) {
           k.prototype.setSize.call(this, a, c || this._initialized ? 12.5 * this._maxDepth : 100);
         };
-        t.prototype.initialize = function(a, c) {
+        u.prototype.initialize = function(a, c) {
           this._initialized = !0;
           this._maxDepth = this._snapshot.maxDepth;
           this.setRange(a, c);
           this.setWindow(a, c, !1);
           this.setSize(this._width, 12.5 * this._maxDepth);
         };
-        t.prototype.destroy = function() {
+        u.prototype.destroy = function() {
           k.prototype.destroy.call(this);
           this._snapshot = null;
         };
-        t.prototype.draw = function() {
+        u.prototype.draw = function() {
           var a = this._context, c = window.devicePixelRatio;
           d.ColorStyle.reset();
           a.save();
@@ -5792,7 +5801,7 @@
           this._initialized && this._drawChildren(this._snapshot);
           a.restore();
         };
-        t.prototype._drawChildren = function(a, c) {
+        u.prototype._drawChildren = function(a, c) {
           void 0 === c && (c = 0);
           var h = a.getChildRange(this._windowStart, this._windowEnd);
           if (h) {
@@ -5802,7 +5811,7 @@
             }
           }
         };
-        t.prototype._drawFrame = function(a, c) {
+        u.prototype._drawFrame = function(a, c) {
           var h = this._context, p = this._toPixels(a.startTime), s = this._toPixels(a.endTime), m = s - p;
           if (m <= this._minFrameWidthInPixels) {
             return h.fillStyle = this._controller.theme.tabToolbar(1), h.fillRect(p, 12.5 * c, this._minFrameWidthInPixels, 12 + 12.5 * (a.maxDepth - a.depth)), !1;
@@ -5817,37 +5826,37 @@
           h.restore();
           return!0;
         };
-        t.prototype._prepareText = function(a, c, h) {
+        u.prototype._prepareText = function(a, c, h) {
           var p = this._measureWidth(a, c);
           if (h > p) {
             return c;
           }
           for (var p = 3, s = c.length;p < s;) {
             var m = p + s >> 1;
-            this._measureWidth(a, r(c, m)) < h ? p = m + 1 : s = m;
+            this._measureWidth(a, q(c, m)) < h ? p = m + 1 : s = m;
           }
-          c = r(c, s - 1);
+          c = q(c, s - 1);
           p = this._measureWidth(a, c);
           return p <= h ? c : "";
         };
-        t.prototype._measureWidth = function(a, c) {
+        u.prototype._measureWidth = function(a, c) {
           var h = this._textWidth[c];
           h || (h = a.measureText(c).width, this._textWidth[c] = h);
           return h;
         };
-        t.prototype._toPixelsRelative = function(a) {
+        u.prototype._toPixelsRelative = function(a) {
           return a * this._width / (this._windowEnd - this._windowStart);
         };
-        t.prototype._toPixels = function(a) {
+        u.prototype._toPixels = function(a) {
           return this._toPixelsRelative(a - this._windowStart);
         };
-        t.prototype._toTimeRelative = function(a) {
+        u.prototype._toTimeRelative = function(a) {
           return a * (this._windowEnd - this._windowStart) / this._width;
         };
-        t.prototype._toTime = function(a) {
+        u.prototype._toTime = function(a) {
           return this._toTimeRelative(a) + this._windowStart;
         };
-        t.prototype._getFrameAtPosition = function(a, c) {
+        u.prototype._getFrameAtPosition = function(a, c) {
           var h = 1 + c / 12.5 | 0, p = this._snapshot.query(this._toTime(a));
           if (p && p.depth >= h) {
             for (;p && p.depth > h;) {
@@ -5857,41 +5866,41 @@
           }
           return null;
         };
-        t.prototype.onMouseDown = function(l, c) {
+        u.prototype.onMouseDown = function(l, c) {
           this._windowEqRange() || (this._mouseController.updateCursor(a.MouseCursor.ALL_SCROLL), this._dragInfo = {windowStartInitial:this._windowStart, windowEndInitial:this._windowEnd, target:1});
         };
-        t.prototype.onMouseMove = function(a, c) {
+        u.prototype.onMouseMove = function(a, c) {
         };
-        t.prototype.onMouseOver = function(a, c) {
+        u.prototype.onMouseOver = function(a, c) {
         };
-        t.prototype.onMouseOut = function() {
+        u.prototype.onMouseOut = function() {
         };
-        t.prototype.onDrag = function(a, c, h, p, s, m) {
+        u.prototype.onDrag = function(a, c, h, p, s, m) {
           if (a = this._dragInfo) {
             s = this._toTimeRelative(-s), this._controller.setWindow(a.windowStartInitial + s, a.windowEndInitial + s);
           }
         };
-        t.prototype.onDragEnd = function(l, c, h, p, s, m) {
+        u.prototype.onDragEnd = function(l, c, h, p, s, m) {
           this._dragInfo = null;
           this._mouseController.updateCursor(a.MouseCursor.DEFAULT);
         };
-        t.prototype.onClick = function(l, c) {
+        u.prototype.onClick = function(l, c) {
           this._dragInfo = null;
           this._mouseController.updateCursor(a.MouseCursor.DEFAULT);
         };
-        t.prototype.onHoverStart = function(a, c) {
+        u.prototype.onHoverStart = function(a, c) {
           var h = this._getFrameAtPosition(a, c);
           h && (this._hoveredFrame = h, this._controller.showTooltip(this, h, a, c));
         };
-        t.prototype.onHoverEnd = function() {
+        u.prototype.onHoverEnd = function() {
           this._hoveredFrame && (this._hoveredFrame = null, this._controller.hideTooltip());
         };
-        t.prototype.getStatistics = function(a) {
+        u.prototype.getStatistics = function(a) {
           var c = this._snapshot;
           c.statistics || c.calculateStatistics();
           return c.statistics[a.id];
         };
-        return t;
+        return u;
       }(a.FlameChartBase);
       a.FlameChart = k;
     })(k.Profiler || (k.Profiler = {}));
@@ -5900,7 +5909,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.NumberUtilities.clamp;
+      var q = d.NumberUtilities.clamp;
       (function(a) {
         a[a.OVERLAY = 0] = "OVERLAY";
         a[a.STACK = 1] = "STACK";
@@ -5969,13 +5978,13 @@
           m.clearRect(0, 0, p, h.maxDepth - 1);
           1 == this._mode && m.scale(1, 1 / h.snapshotCount);
           for (var b = 0, e = h.snapshotCount;b < e;b++) {
-            var q = h.getSnapshotAt(b);
-            if (q) {
-              var n = null, x = 0;
+            var n = h.getSnapshotAt(b);
+            if (n) {
+              var r = null, x = 0;
               m.beginPath();
               m.moveTo(0, 0);
               for (var d = 0;d < p;d++) {
-                x = h.startTime + d * s, x = (n = n ? n.queryNext(x) : q.query(x)) ? n.getDepth() - 1 : 0, m.lineTo(d, x);
+                x = h.startTime + d * s, x = (r = r ? r.queryNext(x) : n.query(x)) ? r.getDepth() - 1 : 0, m.lineTo(d, x);
               }
               m.lineTo(d, 0);
               m.fillStyle = g;
@@ -6032,7 +6041,7 @@
         };
         k.prototype.onDrag = function(l, c, h, p, s, m) {
           if (this._selection) {
-            this._selection = {left:l, right:r(h, 0, this._width - 1)}, this.draw();
+            this._selection = {left:l, right:q(h, 0, this._width - 1)}, this.draw();
           } else {
             l = this._dragInfo;
             if (4 === l.target) {
@@ -6051,10 +6060,10 @@
                 h = l.windowEndInitial + s;
                 break;
               case 2:
-                c = r(l.windowStartInitial + s, this._rangeStart, h - a.FlameChartBase.MIN_WINDOW_LEN);
+                c = q(l.windowStartInitial + s, this._rangeStart, h - a.FlameChartBase.MIN_WINDOW_LEN);
                 break;
               case 3:
-                h = r(l.windowEndInitial + s, c + a.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
+                h = q(l.windowEndInitial + s, c + a.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
                 break;
               default:
                 return;
@@ -6085,7 +6094,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.NumberUtilities.clamp;
+      var q = d.NumberUtilities.clamp;
       (function(a) {
         a[a.OVERVIEW = 0] = "OVERVIEW";
         a[a.CHART = 1] = "CHART";
@@ -6106,14 +6115,14 @@
           a.restore();
         };
         k.prototype._drawLabels = function(a, c) {
-          var h = this._context, p = this._calculateTickInterval(a, c), s = Math.ceil(a / p) * p, m = 500 <= p, g = m ? 1E3 : 1, f = this._decimalPlaces(p / g), m = m ? "s" : "ms", b = this._toPixels(s), e = this._height / 2, q = this._controller.theme;
+          var h = this._context, p = this._calculateTickInterval(a, c), s = Math.ceil(a / p) * p, m = 500 <= p, g = m ? 1E3 : 1, f = this._decimalPlaces(p / g), m = m ? "s" : "ms", b = this._toPixels(s), e = this._height / 2, n = this._controller.theme;
           h.lineWidth = 1;
-          h.strokeStyle = q.contentTextDarkGrey(.5);
-          h.fillStyle = q.contentTextDarkGrey(1);
+          h.strokeStyle = n.contentTextDarkGrey(.5);
+          h.fillStyle = n.contentTextDarkGrey(1);
           h.textAlign = "right";
           h.textBaseline = "middle";
           h.font = "11px sans-serif";
-          for (q = this._width + k.TICK_MAX_WIDTH;b < q;) {
+          for (n = this._width + k.TICK_MAX_WIDTH;b < n;) {
             h.fillText((s / g).toFixed(f) + " " + m, b - 7, e + 1), h.beginPath(), h.moveTo(b, 0), h.lineTo(b, this._height + 1), h.closePath(), h.stroke(), s += p, b = this._toPixels(s);
           }
         };
@@ -6213,10 +6222,10 @@
               h = l.windowEndInitial + h * s;
               break;
             case 2:
-              c = r(l.windowStartInitial + s, this._rangeStart, h - a.FlameChartBase.MIN_WINDOW_LEN);
+              c = q(l.windowStartInitial + s, this._rangeStart, h - a.FlameChartBase.MIN_WINDOW_LEN);
               break;
             case 3:
-              h = r(l.windowEndInitial + s, c + a.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
+              h = q(l.windowEndInitial + s, c + a.FlameChartBase.MIN_WINDOW_LEN, this._rangeEnd);
               break;
             default:
               return;
@@ -6317,9 +6326,9 @@
             var p = 0, s = 0, m = a.length, g = [];
             g.length = m;
             for (var f = 0;f < m;f++) {
-              var b = this._baseUrl + a[f], e = new XMLHttpRequest, q = /\.tl$/i.test(b) ? "arraybuffer" : "json";
+              var b = this._baseUrl + a[f], e = new XMLHttpRequest, n = /\.tl$/i.test(b) ? "arraybuffer" : "json";
               e.open("GET", b, !0);
-              e.responseType = q;
+              e.responseType = n;
               e.onload = function(b, e) {
                 return function(f) {
                   if ("json" === e) {
@@ -6339,7 +6348,7 @@
                   h && h(p);
                   p === m && c(g);
                 };
-              }(f, q);
+              }(f, n);
               e.send();
             }
           };
@@ -6365,8 +6374,8 @@
           a[a.NEXTID = 20] = "NEXTID";
         })(k || (k = {}));
         k = function() {
-          function d(r) {
-            2 <= r.length && (this._text = r[0], this._data = new DataView(r[1]), this._buffer = new a.TimelineBuffer, this._walkTree(0));
+          function d(q) {
+            2 <= q.length && (this._text = q[0], this._data = new DataView(q[1]), this._buffer = new a.TimelineBuffer, this._walkTree(0));
           }
           Object.defineProperty(d.prototype, "buffer", {get:function() {
             return this._buffer;
@@ -6392,7 +6401,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.NumberUtilities.clamp, k = function() {
+      var q = d.NumberUtilities.clamp, k = function() {
         function a() {
           this.length = 0;
           this.lines = [];
@@ -6420,7 +6429,7 @@
         return a;
       }();
       a.Buffer = k;
-      var u = function() {
+      var t = function() {
         function a(l) {
           this.lineColor = "#2A2A2A";
           this.alternateLineColor = "#262626";
@@ -6447,7 +6456,7 @@
           l.addEventListener("keydown", function(a) {
             var l = 0;
             switch(a.keyCode) {
-              case n:
+              case r:
                 this.showLineNumbers = !this.showLineNumbers;
                 break;
               case x:
@@ -6483,12 +6492,12 @@
               case e:
                 a.metaKey && (this.selection = {start:0, end:this.buffer.length}, a.preventDefault());
                 break;
-              case q:
+              case n:
                 if (a.metaKey) {
                   var d = "";
                   if (this.selection) {
-                    for (var r = this.selection.start;r <= this.selection.end;r++) {
-                      d += this.buffer.get(r) + "\n";
+                    for (var q = this.selection.start;q <= this.selection.end;q++) {
+                      d += this.buffer.get(q) + "\n";
                     }
                   } else {
                     d = this.buffer.get(this.lineIndex);
@@ -6508,7 +6517,7 @@
           l.addEventListener("blur", function(b) {
             this.hasFocus = !1;
           }.bind(this), !1);
-          var c = 33, h = 34, p = 36, s = 35, m = 38, g = 40, f = 37, b = 39, e = 65, q = 67, n = 78, x = 84;
+          var c = 33, h = 34, p = 36, s = 35, m = 38, g = 40, f = 37, b = 39, e = 65, n = 67, r = 78, x = 84;
         }
         a.prototype.resize = function() {
           this._resizeHandler();
@@ -6519,7 +6528,7 @@
           this.pageLineCount = Math.floor(this.canvas.height / this.lineHeight);
         };
         a.prototype.gotoLine = function(a) {
-          this.lineIndex = r(a, 0, this.buffer.length - 1);
+          this.lineIndex = q(a, 0, this.buffer.length - 1);
         };
         a.prototype.scrollIntoView = function() {
           this.lineIndex < this.pageIndex ? this.pageIndex = this.lineIndex : this.lineIndex >= this.pageIndex + this.pageLineCount && (this.pageIndex = this.lineIndex - this.pageLineCount + 1);
@@ -6535,20 +6544,20 @@
           this.context.font = this.fontSize + 'px Consolas, "Liberation Mono", Courier, monospace';
           this.context.setTransform(this.ratio, 0, 0, this.ratio, 0, 0);
           for (var m = this.canvas.width, g = this.lineHeight, f = 0;f < a;f++) {
-            var b = f * this.lineHeight, e = this.pageIndex + f, q = this.buffer.get(e), n = this.buffer.getFormat(e), x = this.buffer.getRepeat(e), d = 1 < e ? this.buffer.getTime(e) - this.buffer.getTime(0) : 0;
+            var b = f * this.lineHeight, e = this.pageIndex + f, n = this.buffer.get(e), r = this.buffer.getFormat(e), x = this.buffer.getRepeat(e), d = 1 < e ? this.buffer.getTime(e) - this.buffer.getTime(0) : 0;
             this.context.fillStyle = e % 2 ? this.lineColor : this.alternateLineColor;
-            n && n.backgroundFillStyle && (this.context.fillStyle = n.backgroundFillStyle);
+            r && r.backgroundFillStyle && (this.context.fillStyle = r.backgroundFillStyle);
             this.context.fillRect(0, b, m, g);
             this.context.fillStyle = this.selectionTextColor;
             this.context.fillStyle = this.textColor;
             this.selection && e >= this.selection.start && e <= this.selection.end && (this.context.fillStyle = this.selectionColor, this.context.fillRect(0, b, m, g), this.context.fillStyle = this.selectionTextColor);
             this.hasFocus && e === this.lineIndex && (this.context.fillStyle = this.selectionColor, this.context.fillRect(0, b, m, g), this.context.fillStyle = this.selectionTextColor);
-            0 < this.columnIndex && (q = q.substring(this.columnIndex));
+            0 < this.columnIndex && (n = n.substring(this.columnIndex));
             b = (f + 1) * this.lineHeight - this.textMarginBottom;
             this.showLineNumbers && this.context.fillText(String(e), c, b);
             this.showLineTime && this.context.fillText(d.toFixed(1).padLeft(" ", 6), h, b);
             1 < x && this.context.fillText(String(x).padLeft(" ", 3), p, b);
-            this.context.fillText(q, s, b);
+            this.context.fillText(n, s, b);
           }
         };
         a.prototype.refreshEvery = function(a) {
@@ -6565,7 +6574,7 @@
         };
         return a;
       }();
-      a.Terminal = u;
+      a.Terminal = t;
     })(k.Terminal || (k.Terminal = {}));
   })(d.Tools || (d.Tools = {}));
 })(Shumway || (Shumway = {}));
@@ -6652,45 +6661,53 @@
 (function(d) {
   (function(k) {
     function a(a) {
-      for (var d = [], k = 1;k < arguments.length;k++) {
-        d[k - 1] = arguments[k];
+      for (var d = [], l = 1;l < arguments.length;l++) {
+        d[l - 1] = arguments[l];
       }
-      var t = a.message;
-      d.forEach(function(a, c) {
-        t = t.replace("%" + (c + 1), a);
+      var c = a.message;
+      d.forEach(function(a, p) {
+        c = c.replace("%" + (p + 1), a);
       });
-      return "Error #" + a.code + ": " + t;
+      return "Error #" + a.code + ": " + c;
+    }
+    k.Errors = {InvokeOnIncompatibleObjectError:{code:1004, message:"Method %1 was invoked on an incompatible object."}, CallOfNonFunctionError:{code:1006, message:"%1 is not a function."}, ConvertNullToObjectError:{code:1009, message:"Cannot access a property or method of a null object reference."}, ConvertUndefinedToObjectError:{code:1010, message:"A term is undefined and has no properties."}, ClassNotFoundError:{code:1014, message:"Class %1 could not be found."}, CheckTypeFailedError:{code:1034, 
+    message:"Type Coercion failed: cannot convert %1 to %2."}, WrongArgumentCountError:{code:1063, message:"Argument count mismatch on %1. Expected %2, got %3."}, ConstWriteError:{code:1074, message:"Illegal write to read-only property %1 on %2."}, XMLOnlyWorksWithOneItemLists:{code:1086, message:"The %1 method only works on lists containing one item."}, XMLAssignmentToIndexedXMLNotAllowed:{code:1087, message:"Assignment to indexed XML is not allowed."}, XMLMarkupMustBeWellFormed:{code:1088, message:"The markup in the document following the root element must be well-formed."}, 
+    XMLAssigmentOneItemLists:{code:1089, message:"Assignment to lists with more than one item is not supported."}, XMLNamespaceWithPrefixAndNoURI:{code:1098, message:"Illegal prefix %1 for no namespace."}, OutOfRangeError:{code:1125, message:"The index %1 is out of range %2."}, VectorFixedError:{code:1126, message:"Cannot change the length of a fixed Vector."}, JSONCyclicStructure:{code:1129, message:"Cyclic structure cannot be converted to JSON string."}, JSONInvalidReplacer:{code:1131, message:"Replacer argument to JSON stringifier must be an array or a two parameter function."}, 
+    JSONInvalidParseInput:{code:1132, message:"Invalid JSON parse input."}, InvalidRangeError:{code:1506, message:"The specified range is invalid."}, NullArgumentError:{code:1507, message:"Argument %1 cannot be null."}, InvalidArgumentError:{code:1508, message:"The value specified for argument %1 is invalid."}, InvalidParamError:{code:2004, message:"One of the parameters is invalid."}, ParamRangeError:{code:2006, message:"The supplied index is out of bounds."}, NullPointerError:{code:2007, message:"Parameter %1 must be non-null."}, 
+    InvalidEnumError:{code:2008, message:"Parameter %1 must be one of the accepted values."}, CantInstantiateError:{code:2012, message:"%1 class cannot be instantiated."}, InvalidBitmapData:{code:2015, message:"Invalid BitmapData."}, EOFError:{code:2030, message:"End of file was encountered.", fqn:"flash.errors.EOFError"}, CompressedDataError:{code:2058, message:"There was an error decompressing the data.", fqn:"flash.errors.IOError"}, ProxyGetPropertyError:{code:2088, message:"The Proxy class does not implement getProperty. It must be overridden by a subclass."}, 
+    ProxySetPropertyError:{code:2089, message:"The Proxy class does not implement setProperty. It must be overridden by a subclass."}, ProxyCallPropertyError:{code:2090, message:"The Proxy class does not implement callProperty. It must be overridden by a subclass."}, ProxyHasPropertyError:{code:2091, message:"The Proxy class does not implement hasProperty. It must be overridden by a subclass."}, ProxyDeletePropertyError:{code:2092, message:"The Proxy class does not implement deleteProperty. It must be overridden by a subclass."}, 
+    ProxyGetDescendantsError:{code:2093, message:"The Proxy class does not implement getDescendants. It must be overridden by a subclass."}, ProxyNextNameIndexError:{code:2105, message:"The Proxy class does not implement nextNameIndex. It must be overridden by a subclass."}, ProxyNextNameError:{code:2106, message:"The Proxy class does not implement nextName. It must be overridden by a subclass."}, ProxyNextValueError:{code:2107, message:"The Proxy class does not implement nextValue. It must be overridden by a subclass."}, 
+    TooFewArgumentsError:{code:2001, message:"Too few arguments were specified; got %1, %2 expected."}, SocketConnectError:{code:2011, message:"Socket connection failed to %1:%2."}, CantAddSelfError:{code:2024, message:"An object cannot be added as a child of itself."}, NotAChildError:{code:2025, message:"The supplied DisplayObject must be a child of the caller."}, DelayRangeError:{code:2066, message:"The Timer delay specified is out of range."}, ExternalInterfaceNotAvailableError:{code:2067, message:"The ExternalInterface is not available in this container. ExternalInterface requires Internet Explorer ActiveX, Firefox, Mozilla 1.7.5 and greater, or other browsers that support NPRuntime."}, 
+    InvalidLoaderMethodError:{code:2069, message:"The Loader class does not implement this method."}, InvalidStageMethodError:{code:2071, message:"The Stage class does not implement this property or method."}, LoadingObjectNotSWFError:{code:2098, message:"The loading object is not a .swf file, you cannot request SWF properties from it."}, LoadingObjectNotInitializedError:{code:2099, message:"The loading object is not sufficiently loaded to provide this information."}, DecodeParamError:{code:2101, 
+    message:"The String passed to URLVariables.decode() must be a URL-encoded query string containing name/value pairs."}, SceneNotFoundError:{code:2108, message:"Scene %1 was not found."}, FrameLabelNotFoundError:{code:2109, message:"Frame label %1 not found in scene %2."}, InvalidLoaderInfoMethodError:{code:2118, message:"The LoaderInfo class does not implement this method."}, CantAddParentError:{code:2150, message:"An object cannot be added as a child to one of it's children (or children's children, etc.)."}, 
+    ObjectWithStringsParamError:{code:2196, message:"Parameter %1 must be an Object with only String values."}};
+    for (var q in k.Errors) {
+      var v = k.Errors[q];
+      v.typeName = q;
+      k.Errors[v.code] = v;
     }
-    k.Errors = {CallOfNonFunctionError:{code:1006, message:"%1 is not a function."}, ConvertNullToObjectError:{code:1009, message:"Cannot access a property or method of a null object reference."}, ConvertUndefinedToObjectError:{code:1010, message:"A term is undefined and has no properties."}, ClassNotFoundError:{code:1014, message:"Class %1 could not be found."}, CheckTypeFailedError:{code:1034, message:"Type Coercion failed: cannot convert %1 to %2."}, WrongArgumentCountError:{code:1063, message:"Argument count mismatch on %1. Expected %2, got %3."}, 
-    ConstWriteError:{code:1074, message:"Illegal write to read-only property %1 on %2."}, XMLOnlyWorksWithOneItemLists:{code:1086, message:"The %1 method only works on lists containing one item."}, XMLAssignmentToIndexedXMLNotAllowed:{code:1087, message:"Assignment to indexed XML is not allowed."}, XMLMarkupMustBeWellFormed:{code:1088, message:"The markup in the document following the root element must be well-formed."}, XMLAssigmentOneItemLists:{code:1089, message:"Assignment to lists with more than one item is not supported."}, 
-    XMLNamespaceWithPrefixAndNoURI:{code:1098, message:"Illegal prefix %1 for no namespace."}, OutOfRangeError:{code:1125, message:"The index %1 is out of range %2."}, VectorFixedError:{code:1126, message:"Cannot change the length of a fixed Vector."}, InvalidRangeError:{code:1506, message:"The specified range is invalid."}, NullArgumentError:{code:1507, message:"Argument %1 cannot be null."}, InvalidArgumentError:{code:1508, message:"The value specified for argument %1 is invalid."}, InvalidParamError:{code:2004, 
-    message:"One of the parameters is invalid."}, ParamRangeError:{code:2006, message:"The supplied index is out of bounds."}, NullPointerError:{code:2007, message:"Parameter %1 must be non-null."}, InvalidEnumError:{code:2008, message:"Parameter %1 must be one of the accepted values."}, CantInstantiateError:{code:2012, message:"%1 class cannot be instantiated."}, InvalidBitmapData:{code:2015, message:"Invalid BitmapData."}, EOFError:{code:2030, message:"End of file was encountered.", fqn:"flash.errors.EOFError"}, 
-    CompressedDataError:{code:2058, message:"There was an error decompressing the data.", fqn:"flash.errors.IOError"}, TooFewArgumentsError:{code:2001, message:"Too few arguments were specified; got %1, %2 expected."}, SocketConnectError:{code:2011, message:"Socket connection failed to %1:%2."}, CantAddSelfError:{code:2024, message:"An object cannot be added as a child of itself."}, NotAChildError:{code:2025, message:"The supplied DisplayObject must be a child of the caller."}, DelayRangeError:{code:2066, 
-    message:"The Timer delay specified is out of range."}, ExternalInterfaceNotAvailableError:{code:2067, message:"The ExternalInterface is not available in this container. ExternalInterface requires Internet Explorer ActiveX, Firefox, Mozilla 1.7.5 and greater, or other browsers that support NPRuntime."}, InvalidLoaderMethodError:{code:2069, message:"The Loader class does not implement this method."}, InvalidStageMethodError:{code:2071, message:"The Stage class does not implement this property or method."}, 
-    LoadingObjectNotSWFError:{code:2098, message:"The loading object is not a .swf file, you cannot request SWF properties from it."}, LoadingObjectNotInitializedError:{code:2099, message:"The loading object is not sufficiently loaded to provide this information."}, DecodeParamError:{code:2101, message:"The String passed to URLVariables.decode() must be a URL-encoded query string containing name/value pairs."}, SceneNotFoundError:{code:2108, message:"Scene %1 was not found."}, FrameLabelNotFoundError:{code:2109, 
-    message:"Frame label %1 not found in scene %2."}, InvalidLoaderInfoMethodError:{code:2118, message:"The LoaderInfo class does not implement this method."}, CantAddParentError:{code:2150, message:"An object cannot be added as a child to one of it's children (or children's children, etc.)."}, ObjectWithStringsParamError:{code:2196, message:"Parameter %1 must be an Object with only String values."}};
     k.getErrorMessage = function(a) {
+      var q = "Error #" + a;
       if (!d.AVM2.Runtime.debuggerMode.value) {
-        return "Error #" + a;
-      }
-      for (var v in k.Errors) {
-        if (k.Errors[v].code == a) {
-          return "Error #" + a + ": " + k.Errors[v].message;
-        }
+        return q;
       }
-      return "Error #" + a + ": (unknown)";
+      a = k.Errors[a];
+      return q + ": " + (a && a.message || "(unknown)");
+    };
+    k.getErrorInfo = function(a) {
+      return k.Errors[a];
     };
     k.formatErrorMessage = a;
-    k.translateErrorMessage = function(r) {
-      if (r.type) {
-        switch(r.type) {
+    k.translateErrorMessage = function(q) {
+      if (q.type) {
+        switch(q.type) {
           case "undefined_method":
             return a(k.Errors.CallOfNonFunctionError, "value");
           default:
-            throw d.Debug.notImplemented(r.type);;
+            throw d.Debug.notImplemented(q.type);;
         }
       } else {
-        return 0 <= r.message.indexOf("is not a function") ? a(k.Errors.CallOfNonFunctionError, "value") : r.message;
+        return 0 <= q.message.indexOf("is not a function") ? a(k.Errors.CallOfNonFunctionError, "value") : q.message;
       }
     };
   })(d.AVM2 || (d.AVM2 = {}));
@@ -6699,8 +6716,8 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = null;
-      "undefined" !== typeof TextDecoder && (r = new TextDecoder);
+      var q = null;
+      "undefined" !== typeof TextDecoder && (q = new TextDecoder);
       var k = function() {
         function a(d) {
           this._bytes = d;
@@ -6726,10 +6743,10 @@
           return this._bytes[this._position++];
         };
         a.prototype.readU8s = function(a) {
-          var l = new Uint8Array(a);
-          l.set(this._bytes.subarray(this._position, this._position + a), 0);
+          var d = new Uint8Array(a);
+          d.set(this._bytes.subarray(this._position, this._position + a), 0);
           this._position += a;
-          return l;
+          return d;
         };
         a.prototype.readS8 = function() {
           return this._bytes[this._position++] << 24 >> 24;
@@ -6765,10 +6782,10 @@
           return a;
         };
         a.prototype.readUTFString = function(k) {
-          if (r) {
+          if (q) {
             var l = this._position;
             this._position += k;
-            return r.decode(this._bytes.subarray(l, l + k));
+            return q.decode(this._bytes.subarray(l, l + k));
           }
           var l = this._position, c = l + k, h = this._bytes, p = 0;
           for (k = a._getResultBuffer(2 * k);l < c;) {
@@ -6797,8 +6814,8 @@
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
@@ -6806,7 +6823,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.isNumeric, v = d.isObject, u = d.Debug.notImplemented, t = function() {
+      var q = d.isNumeric, v = d.isObject, t = d.Debug.notImplemented, u = function() {
         return function(b, e, a, f) {
           this.name = b;
           this.type = e;
@@ -6814,43 +6831,44 @@
           this.optional = f;
         };
       }();
-      a.Parameter = t;
+      a.Parameter = u;
       var l = function() {
-        function e(b, a, f) {
-          var n = b.constantPool, c = b.methods, q = b.classes, s = b.metadata;
-          this.holder = f;
-          this.name = n.multinames[a.readU30()];
-          f = a.readU8();
-          this.kind = f & 15;
-          this.attributes = f >> 4 & 15;
+        function e(b, f, r) {
+          var n = b.constantPool, m = b.methods, c = b.classes, h = b.metadata;
+          this.holder = r;
+          this.name = n.multinames[f.readU30()];
+          r = f.readU8();
+          this.kind = r & 15;
+          this.attributes = r >> 4 & 15;
           switch(this.kind) {
             case 0:
             ;
             case 6:
-              this.slotId = a.readU30();
-              this.typeName = n.multinames[a.readU30()];
-              b = a.readU30();
+              this.slotId = f.readU30();
+              this.typeName = n.multinames[f.readU30()];
+              b = f.readU30();
               this.value = void 0;
-              0 !== b && (this.hasDefaultValue = !0, this.value = n.getValue(a.readU8(), b));
+              0 !== b && (this.hasDefaultValue = !0, this.value = n.getValue(f.readU8(), b));
               break;
             case 1:
             ;
             case 3:
             ;
             case 2:
-              this.dispId = a.readU30();
-              this.methodInfo = c[a.readU30()];
+              this.dispId = f.readU30();
+              this.methodInfo = m[f.readU30()];
               this.methodInfo.name = this.name;
+              this.methodInfo.flags |= a.MethodTypeFlagByTraitKind[this.kind];
               g.attachHolder(this.methodInfo, this.holder);
               this.methodInfo.abc = b;
               break;
             case 4:
-              this.slotId = a.readU30(), this.classInfo = q[a.readU30()];
+              this.slotId = f.readU30(), this.classInfo = c[f.readU30()];
           }
           if (this.attributes & 4) {
             var p, n = 0;
-            for (b = a.readU30();n < b;n++) {
-              c = s[a.readU30()], "__go_to_definition_help" !== c.name && "__go_to_ctor_definition_help" !== c.name && (p || (p = {}), p[c.name] = c);
+            for (b = f.readU30();n < b;n++) {
+              m = h[f.readU30()], "__go_to_definition_help" !== m.name && "__go_to_ctor_definition_help" !== m.name && (p || (p = {}), p[m.name] = m);
             }
             p && (this.isClass() && (this.classInfo.metadata = p), this.metadata = p);
           }
@@ -6927,10 +6945,10 @@
           }
         };
         e.parseTraits = function(b, a, f) {
-          for (var g = a.readU30(), c = [], q = 0;q < g;q++) {
-            c.push(new e(b, a, f));
+          for (var g = a.readU30(), n = [], m = 0;m < g;m++) {
+            n.push(new e(b, a, f));
           }
-          return c;
+          return n;
         };
         return e;
       }();
@@ -6949,30 +6967,30 @@
           b.call(this, a, f, 131072);
           this.holder = null;
           this.maxScopeDepth = this.initScopeDepth = this.localCount = this.maxStack = 0;
-          this.analysis = this.activationPrototype = this.lastBoundMethod = this.cachedMemoizer = this.cachedMethodOrTrampoline = this.freeMethod = this.exceptions = this.code = null;
+          this.analysis = this.activationPrototype = this.lastBoundMethod = this.classScope = this.cachedMemoizer = this.cachedMethodOrTrampoline = this.freeMethod = this.exceptions = this.code = null;
           a = a.constantPool;
           f = g.readU30();
           this.returnType = a.multinames[g.readU30()];
           this.parameters = [];
-          for (var c = 0;c < f;c++) {
-            this.parameters.push(new t(void 0, a.multinames[g.readU30()], void 0, !1));
+          for (var n = 0;n < f;n++) {
+            this.parameters.push(new u(void 0, a.multinames[g.readU30()], void 0, !1));
           }
           g.readU30();
           this.flags = g.readU8();
           if (this.flags & 8) {
-            for (c = g.readU30(), c = f - c;c < f;c++) {
-              var q = g.readU30();
-              this.parameters[c].value = a.getValue(g.readU8(), q);
-              this.parameters[c].optional = !0;
+            for (n = g.readU30(), n = f - n;n < f;n++) {
+              var m = g.readU30();
+              this.parameters[n].value = a.getValue(g.readU8(), m);
+              this.parameters[n].optional = !0;
             }
           }
           if (this.flags & 128) {
-            for (c = 0;c < f;c++) {
-              e.parseParameterNames ? this.parameters[c].name = a.strings[g.readU30()] : (g.readU30(), this.parameters[c].name = e._getParameterName(c));
+            for (n = 0;n < f;n++) {
+              e.parseParameterNames ? this.parameters[n].name = a.strings[g.readU30()] : (g.readU30(), this.parameters[n].name = e._getParameterName(n));
             }
           } else {
-            for (c = 0;c < f;c++) {
-              this.parameters[c].name = e._getParameterName(c);
+            for (n = 0;n < f;n++) {
+              this.parameters[n].name = e._getParameterName(n);
             }
           }
         }
@@ -6997,6 +7015,21 @@
         }, set:function(b) {
           this.flags |= 2048;
         }, enumerable:!0, configurable:!0});
+        Object.defineProperty(e.prototype, "isMethod", {get:function() {
+          return!!(this.flags & 4096);
+        }, set:function(b) {
+          this.flags |= 4096;
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(e.prototype, "isGetter", {get:function() {
+          return!!(this.flags & 8192);
+        }, set:function(b) {
+          this.flags |= 8192;
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(e.prototype, "isSetter", {get:function() {
+          return!!(this.flags & 16384);
+        }, set:function(b) {
+          this.flags |= 16384;
+        }, enumerable:!0, configurable:!0});
         e._getParameterName = function(b) {
           return 26 > b ? String.fromCharCode(65 + b) : "P" + (b - 26);
         };
@@ -7032,22 +7065,23 @@
           return!!(this.flags & 64);
         };
         e.parseException = function(b, e) {
-          var a = b.constantPool.multinames;
-          return{start:e.readU30(), end:e.readU30(), target:e.readU30(), typeName:a[e.readU30()], varName:a[e.readU30()]};
+          var a = b.constantPool.multinames, f = {start:e.readU30(), end:e.readU30(), target:e.readU30(), typeNameIndex:e.readU30(), typeName:void 0, varName:a[e.readU30()]};
+          f.typeName = a[f.typeNameIndex];
+          return f;
         };
         e.parseBody = function(b, a) {
-          var f = b.methods, n = a.readU30(), f = f[n];
-          f.index = n;
+          var f = b.methods, r = a.readU30(), f = f[r];
+          f.index = r;
           f.hasBody = !0;
           f.maxStack = a.readU30();
           f.localCount = a.readU30();
           f.initScopeDepth = a.readU30();
           f.maxScopeDepth = a.readU30();
           f.code = a.readU8s(a.readU30());
-          for (var n = [], g = a.readU30(), c = 0;c < g;++c) {
-            n.push(e.parseException(b, a));
+          for (var r = [], g = a.readU30(), n = 0;n < g;++n) {
+            r.push(e.parseException(b, a));
           }
-          f.exceptions = n;
+          f.exceptions = r;
           f.traits = l.parseTraits(b, a, f);
         };
         e.prototype.hasExceptions = function() {
@@ -7058,26 +7092,26 @@
       }(c);
       a.MethodInfo = h;
       var p = function(b) {
-        function e(a, f, c) {
+        function e(a, f, n) {
           b.call(this, a, f, 65536);
           this.runtimeId = e.nextID++;
           f = a.constantPool;
-          var q = a.methods;
-          this.name = f.multinames[c.readU30()];
-          this.superName = f.multinames[c.readU30()];
-          this.flags = c.readU8();
+          var m = a.methods;
+          this.name = f.multinames[n.readU30()];
+          this.superName = f.multinames[n.readU30()];
+          this.flags = n.readU8();
           this.protectedNs = void 0;
-          this.flags & 8 && (this.protectedNs = f.namespaces[c.readU30()]);
-          var s = c.readU30();
+          this.flags & 8 && (this.protectedNs = f.namespaces[n.readU30()]);
+          var c = n.readU30();
           this.interfaces = [];
-          for (var p = 0;p < s;p++) {
-            this.interfaces[p] = f.multinames[c.readU30()];
+          for (var h = 0;h < c;h++) {
+            this.interfaces[h] = f.multinames[n.readU30()];
           }
-          this.init = q[c.readU30()];
+          this.init = m[n.readU30()];
           this.init.isInstanceInitializer = !0;
           this.init.name = this.name;
           g.attachHolder(this.init, this);
-          this.traits = l.parseTraits(a, c, this);
+          this.traits = l.parseTraits(a, n, this);
         }
         __extends(e, b);
         e.prototype.toString = function() {
@@ -7109,19 +7143,19 @@
         b[b.IndexOffset = 19] = "IndexOffset";
       })(a.Hashes || (a.Hashes = {}));
       var s = function(e) {
-        function a(b, f, c) {
+        function a(b, f, n) {
           e.call(this, b, f, 0);
           this.runtimeId = a.nextID++;
-          this.init = b.methods[c.readU30()];
+          this.init = b.methods[n.readU30()];
           this.init.isClassInitializer = !0;
           g.attachHolder(this.init, this);
-          this.traits = l.parseTraits(b, c, this);
+          this.traits = l.parseTraits(b, n, this);
           this.instanceInfo = b.instances[f];
           this.instanceInfo.classInfo = this;
-          this.defaultValue = a._getDefaultValue(this.instanceInfo.name);
+          this.defaultValue = a.getDefaultValue(this.instanceInfo.name);
         }
         __extends(a, e);
-        a._getDefaultValue = function(e) {
+        a.getDefaultValue = function(e) {
           return b.getQualifiedName(e) === b.Int || b.getQualifiedName(e) === b.Uint ? 0 : b.getQualifiedName(e) === b.Number ? NaN : b.getQualifiedName(e) === b.Boolean ? !1 : null;
         };
         a.prototype.toString = function() {
@@ -7132,23 +7166,19 @@
       }(c);
       a.ClassInfo = s;
       var m = function(b) {
-        function e(a, f, c) {
+        function e(a, f, n) {
           b.call(this, a, f, 196608);
           this.runtimeId = s.nextID++;
           this.name = a.name + "$script" + f;
-          this.init = a.methods[c.readU30()];
+          this.init = a.methods[n.readU30()];
           this.init.isScriptInitializer = !0;
           g.attachHolder(this.init, this);
-          this.traits = l.parseTraits(a, c, this);
+          this.traits = l.parseTraits(a, n, this);
         }
         __extends(e, b);
-        Object.defineProperty(e.prototype, "entryPoint", {get:function() {
-          return this.init;
-        }, enumerable:!0, configurable:!0});
         e.prototype.toString = function() {
           return this.name;
         };
-        e.nextID = 1;
         return e;
       }(c);
       a.ScriptInfo = m;
@@ -7164,7 +7194,7 @@
           c = new a.AbcStream(f);
           b._checkMagic(c);
           k.enterTimeline("Parse constantPool");
-          this.constantPool = new q(c, this);
+          this.constantPool = new n(c, this);
           k.leaveTimeline();
           k.enterTimeline("Parse Method Infos");
           this.methods = [];
@@ -7237,21 +7267,21 @@
             case 262144:
               return this.constantPool.namespaceSets[e];
             default:
-              u("Kind");
+              t("Kind");
           }
         };
         return b;
       }();
       a.AbcFile = g;
       var f = function() {
-        function b(e, a, f, n) {
+        function b(e, a, f, r) {
           void 0 === a && (a = "");
           void 0 === a && (a = "");
           this.kind = e;
           this.uri = a;
           this.prefix = f;
           this.qualifiedName = void 0;
-          this._buildNamespace(n);
+          this._buildNamespace(r);
         }
         b.prototype._buildNamespace = function(e) {
           22 === this.kind && (this.kind = 8);
@@ -7264,27 +7294,27 @@
           if (0 <= g) {
             return e << 2 | g;
           }
-          var g = new Int32Array(1 + a.length + f.length), c = 0;
-          g[c++] = e;
+          var g = new Int32Array(1 + a.length + f.length), n = 0;
+          g[n++] = e;
           for (e = 0;e < a.length;e++) {
-            g[c++] = a.charCodeAt(e);
+            g[n++] = a.charCodeAt(e);
           }
           for (e = 0;e < f.length;e++) {
-            g[c++] = f.charCodeAt(e);
+            g[n++] = f.charCodeAt(e);
           }
-          return d.HashUtilities.hashBytesTo32BitsMD5(g, 0, c);
+          return d.HashUtilities.hashBytesTo32BitsMD5(g, 0, n);
         };
         b._qualifyNamespace = function(e, a, f) {
-          var g = e + a, c = b._mangledNamespaceCache[g];
-          if (c) {
-            return c;
+          var g = e + a, n = b._mangledNamespaceCache[g];
+          if (n) {
+            return n;
           }
-          c = d.StringUtilities.variableLengthEncodeInt32(b._hashNamespace(e, a, f));
-          b._mangledNamespaceMap[c] = {kind:e, uri:a, prefix:f};
-          return b._mangledNamespaceCache[g] = c;
+          "8http://adobe.com/AS3/2006/builtin" === g ? n = "$AS3_" : (n = b._hashNamespace(e, a, f), n = d.StringUtilities.variableLengthEncodeInt32(n));
+          b._mangledNamespaceMap[n] = {kind:e, uri:a, prefix:f};
+          return b._mangledNamespaceCache[g] = n;
         };
         b.fromQualifiedName = function(e) {
-          var a = d.StringUtilities.fromEncoding(e[0]);
+          var a = e.charCodeAt(0), a = 36 === a ? e.indexOf("_", 1) : d.StringUtilities.fromEncoding(a);
           e = b._mangledNamespaceMap[e.substring(0, a + 1)];
           return new b(e.kind, e.uri, e.prefix);
         };
@@ -7401,47 +7431,47 @@
           this.name = a;
           this.flags = f | 0;
         }
-        b.parse = function(e, a, f, g, c) {
-          var q = 0, s = a.readU8(), p, m = [], h = 0;
-          switch(s) {
+        b.parse = function(e, a, f, g, n) {
+          var m = 0, c = a.readU8(), h, p = [], s = 0;
+          switch(c) {
             case 7:
             ;
             case 13:
-              (q = a.readU30()) ? m = [e.namespaces[q]] : h &= ~b.RUNTIME_NAME;
-              (q = a.readU30()) && (p = e.strings[q]);
+              (m = a.readU30()) ? p = [e.namespaces[m]] : s &= ~b.RUNTIME_NAME;
+              (m = a.readU30()) && (h = e.strings[m]);
               break;
             case 15:
             ;
             case 16:
-              (q = a.readU30()) ? p = e.strings[q] : h &= ~b.RUNTIME_NAME;
-              h |= b.RUNTIME_NAMESPACE;
+              (m = a.readU30()) ? h = e.strings[m] : s &= ~b.RUNTIME_NAME;
+              s |= b.RUNTIME_NAMESPACE;
               break;
             case 17:
             ;
             case 18:
-              h |= b.RUNTIME_NAMESPACE;
-              h |= b.RUNTIME_NAME;
+              s |= b.RUNTIME_NAMESPACE;
+              s |= b.RUNTIME_NAME;
               break;
             case 9:
             ;
             case 14:
-              (q = a.readU30()) ? p = e.strings[q] : h &= ~b.RUNTIME_NAME;
-              q = a.readU30();
-              m = e.namespaceSets[q];
+              (m = a.readU30()) ? h = e.strings[m] : s &= ~b.RUNTIME_NAME;
+              m = a.readU30();
+              p = e.namespaceSets[m];
               break;
             case 27:
             ;
             case 28:
-              h |= b.RUNTIME_NAME;
-              q = a.readU30();
-              m = e.namespaceSets[q];
+              s |= b.RUNTIME_NAME;
+              m = a.readU30();
+              p = e.namespaceSets[m];
               break;
             case 29:
-              return e = a.readU32(), a.readU32(), a = a.readU32(), q = void 0, f[e] && f[a] ? (q = new b(f[e].namespaces, f[e].name, h), q.typeParameter = f[a]) : g.push({index:c, factoryTypeIndex:e, typeParameterIndex:a, flags:h}), q;
+              return e = a.readU32(), a.readU32(), a = a.readU32(), m = void 0, f[e] && f[a] ? (m = new b(f[e].namespaces, f[e].name, s), m.typeParameter = f[a]) : g.push({index:n, factoryTypeIndex:e, typeParameterIndex:a, flags:s}), m;
             default:
               d.Debug.unexpected();
           }
-          switch(s) {
+          switch(c) {
             case 13:
             ;
             case 16:
@@ -7451,9 +7481,9 @@
             case 14:
             ;
             case 28:
-              h |= b.ATTRIBUTE;
+              s |= b.ATTRIBUTE;
           }
-          return new b(m, p, h);
+          return new b(p, h, s);
         };
         b.isMultiname = function(e) {
           return "number" === typeof e || "string" === typeof e || e instanceof b || e instanceof Number;
@@ -7479,7 +7509,7 @@
               return e.qualifiedName;
             }
             var a = String(e.name);
-            if (r(a) && e.namespaces[0].isPublic()) {
+            if (q(a) && e.namespaces[0].isPublic()) {
               return e.qualifiedName = a;
             }
             e = e.qualifiedName = b.qualifyName(e.namespaces[0], a);
@@ -7497,7 +7527,7 @@
           if (e instanceof b) {
             return e;
           }
-          if (r(e)) {
+          if (q(e)) {
             return new b([f.PUBLIC], e, 0);
           }
           if ("$" === e[0]) {
@@ -7518,7 +7548,7 @@
           if ("string" === typeof e && (a = b._publicQualifiedNameCache[e])) {
             return a;
           }
-          if (r(e)) {
+          if (q(e)) {
             return d.toNumber(e);
           }
           if (null !== e && v(e)) {
@@ -7529,13 +7559,13 @@
           return a;
         };
         b.isPublicQualifiedName = function(b) {
-          return "number" === typeof b || r(b) || 1 === b.indexOf(f.PUBLIC.qualifiedName);
+          return "number" === typeof b || q(b) || 1 === b.indexOf(f.PUBLIC.qualifiedName);
         };
         b.getAccessModifier = function(b) {
           return "number" === typeof b || "string" === typeof b || b instanceof Number ? "public" : b.namespaces[0].getAccessModifier();
         };
         b.isNumeric = function(e) {
-          return "number" === typeof e ? !0 : "string" === typeof e ? r(e) : !isNaN(parseInt(b.getName(e), 10));
+          return "number" === typeof e ? !0 : "string" === typeof e ? q(e) : !isNaN(parseInt(b.getName(e), 10));
         };
         b.getName = function(b) {
           return b.getName();
@@ -7591,6 +7621,9 @@
         b.prototype.isQName = function() {
           return 1 === this.namespaces.length && !this.isAnyName();
         };
+        b.prototype.isSimpleStatic = function() {
+          return!(this.flags & (b.RUNTIME_NAME | b.RUNTIME_NAMESPACE)) && 1 === this.namespaces.length;
+        };
         b.prototype.hasTypeParameter = function() {
           return!!this.typeParameter;
         };
@@ -7661,15 +7694,15 @@
       a.Multiname = b;
       var e = function() {
         function b(e, a) {
-          for (var f = e.constantPool.strings, n = this.name = f[a.readU30()], g = a.readU30(), c = [], q = [], s = 0;s < g;s++) {
-            c[s] = f[a.readU30()];
+          for (var f = e.constantPool.strings, g = this.name = f[a.readU30()], r = a.readU30(), n = [], m = [], c = 0;c < r;c++) {
+            n[c] = f[a.readU30()];
           }
-          for (s = 0;s < g;s++) {
-            var p = c[s];
-            q[s] = {key:p, value:f[a.readU30()]};
-            p && "native" === n && (this[p] = q[s].value);
+          for (c = 0;c < r;c++) {
+            var h = n[c];
+            m[c] = {key:h, value:f[a.readU30()]};
+            h && "native" === g && (this[h] = m[c].value);
           }
-          this.value = q;
+          this.value = m;
         }
         b.prototype.toString = function() {
           return "[" + this.name + "]";
@@ -7726,6 +7759,9 @@
         b[b.InstanceInitializer = 512] = "InstanceInitializer";
         b[b.ClassInitializer = 1024] = "ClassInitializer";
         b[b.ScriptInitializer = 2048] = "ScriptInitializer";
+        b[b.MethodTrait = 4096] = "MethodTrait";
+        b[b.GetterTrait = 8192] = "GetterTrait";
+        b[b.SetterTrait = 16384] = "SetterTrait";
       })(a.METHOD || (a.METHOD = {}));
       (function(b) {
         b[b.Slot = 0] = "Slot";
@@ -7736,6 +7772,7 @@
         b[b.Function = 5] = "Function";
         b[b.Const = 6] = "Const";
       })(a.TRAIT || (a.TRAIT = {}));
+      a.MethodTypeFlagByTraitKind = {1:4096, 2:8192, 3:16384};
       (function(b) {
         b[b.Final = 1] = "Final";
         b[b.Override = 2] = "Override";
@@ -7748,69 +7785,69 @@
         b[b.RETURNINDEXEDARRAY = 8] = "RETURNINDEXEDARRAY";
         b[b.NUMERIC = 16] = "NUMERIC";
       })(a.SORT || (a.SORT = {}));
-      var q = function() {
+      var n = function() {
         function e(a, g) {
-          var c, q = [0];
-          c = a.readU30();
-          for (var s = 1;s < c;++s) {
-            q.push(a.readS32());
-          }
-          var p = [0];
-          c = a.readU30();
-          for (s = 1;s < c;++s) {
-            p.push(a.readU32());
-          }
-          var m = [NaN];
-          c = a.readU30();
-          for (s = 1;s < c;++s) {
-            m.push(a.readDouble());
+          var n, m = [0];
+          n = a.readU30();
+          for (var c = 1;c < n;++c) {
+            m.push(a.readS32());
+          }
+          var h = [0];
+          n = a.readU30();
+          for (c = 1;c < n;++c) {
+            h.push(a.readU32());
+          }
+          var p = [NaN];
+          n = a.readU30();
+          for (c = 1;c < n;++c) {
+            p.push(a.readDouble());
           }
           k.enterTimeline("Parse Strings");
-          var h = [""];
-          c = a.readU30();
-          for (s = 1;s < c;++s) {
-            h.push(a.readUTFString(a.readU30()));
+          var s = [""];
+          n = a.readU30();
+          for (c = 1;c < n;++c) {
+            s.push(a.readUTFString(a.readU30()));
           }
           k.leaveTimeline();
-          this.ints = q;
-          this.uints = p;
-          this.doubles = m;
-          this.strings = h;
+          this.ints = m;
+          this.uints = h;
+          this.doubles = p;
+          this.strings = s;
           k.enterTimeline("Parse Namespaces");
-          q = [void 0];
-          c = a.readU30();
-          for (s = 1;s < c;++s) {
-            q.push(f.parse(this, a, g.hash + s));
+          m = [void 0];
+          n = a.readU30();
+          for (c = 1;c < n;++c) {
+            m.push(f.parse(this, a, g.hash + c));
           }
           k.leaveTimeline();
           k.enterTimeline("Parse Namespace Sets");
-          p = [void 0];
-          c = a.readU30();
-          for (s = 1;s < c;++s) {
-            m = a.readU30();
-            h = [];
-            h.runtimeId = e._nextNamespaceSetID++;
-            h.hash = g.hash & 65535 | 262144 | s << 19;
-            for (var l = 0;l < m;++l) {
-              h.push(q[a.readU30()]);
+          h = [void 0];
+          n = a.readU30();
+          for (c = 1;c < n;++c) {
+            p = a.readU30();
+            s = [];
+            s.runtimeId = e._nextNamespaceSetID++;
+            s.hash = g.hash & 65535 | 262144 | c << 19;
+            for (var d = 0;d < p;++d) {
+              s.push(m[a.readU30()]);
             }
-            p.push(h);
+            h.push(s);
           }
           k.leaveTimeline();
-          this.namespaces = q;
-          this.namespaceSets = p;
+          this.namespaces = m;
+          this.namespaceSets = h;
           k.enterTimeline("Parse Multinames");
-          q = [void 0];
-          p = [];
-          c = a.readU30();
-          for (s = 1;s < c;++s) {
-            q.push(b.parse(this, a, q, p, s));
+          m = [void 0];
+          h = [];
+          n = a.readU30();
+          for (c = 1;c < n;++c) {
+            m.push(b.parse(this, a, m, h, c));
           }
-          for (s = 0;s < p.length;s++) {
-            c = p[s], h = q[c.factoryTypeIndex], m = q[c.typeParameterIndex], h = new b(h.namespaces, h.name, c.flags), h.typeParameter = m, q[c.index] = h;
+          for (c = 0;c < h.length;c++) {
+            n = h[c], s = m[n.factoryTypeIndex], p = m[n.typeParameterIndex], s = new b(s.namespaces, s.name, n.flags), s.typeParameter = p, m[n.index] = s;
           }
           k.leaveTimeline();
-          this.multinames = q;
+          this.multinames = m;
         }
         e.prototype.getValue = function(b, e) {
           switch(b) {
@@ -7853,14 +7890,14 @@
         e._nextNamespaceSetID = 1;
         return e;
       }();
-      a.ConstantPool = q;
+      a.ConstantPool = n;
     })(k.ABC || (k.ABC = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(a, c, m, g) {
+      function q(a, c, m, g) {
         void 0 === g && (g = null);
         0 !== m.length && (a.enter(c + " {"), m.forEach(function(f, b) {
           f.trace(a, g);
@@ -7893,35 +7930,35 @@
               case 5:
                 h = m.readU32();
             }
-            var l = "";
+            var d = "";
             switch(e.type) {
               case "":
                 break;
               case "I":
-                l = c.constantPool.ints[h];
+                d = c.constantPool.ints[h];
                 break;
               case "U":
-                l = c.constantPool.uints[h];
+                d = c.constantPool.uints[h];
                 break;
               case "D":
-                l = c.constantPool.doubles[h];
+                d = c.constantPool.doubles[h];
                 break;
               case "S":
-                l = c.constantPool.strings[h];
+                d = c.constantPool.strings[h];
                 break;
               case "N":
-                l = c.constantPool.namespaces[h];
+                d = c.constantPool.namespaces[h];
                 break;
               case "CI":
-                l = c.classes[h];
+                d = c.classes[h];
                 break;
               case "M":
                 h = c.constantPool.multinames[h];
                 break a;
               default:
-                l = "?";
+                d = "?";
             }
-            h = e.name + ":" + h + ("" === l ? "" : " (" + l + ")");
+            h = e.name + ":" + h + ("" === d ? "" : " (" + d + ")");
           }
           b = g + h;
           f < a.operands.length - 1 && (b += ", ");
@@ -7929,33 +7966,33 @@
         g && m.seek(f);
         return b;
       }
-      function u(a, c) {
+      function t(a, c) {
         var m = new h(a);
         c.scripts.forEach(function(a) {
           m.traceTraits(a.traits);
         });
       }
-      function t(c, s) {
-        var m = new d.Metrics.Counter(!0), g = new d.Metrics.Counter(!0), f = new d.Metrics.Counter(!0), b = new d.Metrics.Counter(!0), e = {}, q = {}, n = {};
-        s.classes.forEach(function(b) {
+      function u(c, h) {
+        var m = new d.Metrics.Counter(!0), g = new d.Metrics.Counter(!0), f = new d.Metrics.Counter(!0), b = new d.Metrics.Counter(!0), e = {}, n = {}, r = {};
+        h.classes.forEach(function(b) {
           e[b.instanceInfo.name.name] = !0;
         });
-        s.scripts.forEach(function(b) {
+        h.scripts.forEach(function(b) {
           b.traits.forEach(function(b) {
             if (b.isClass()) {
               var a = b.classInfo.instanceInfo.superName ? b.classInfo.instanceInfo.superName.name : "?";
               a in e || g.count(a);
               b.classInfo.traits.forEach(function(b) {
-                b.isMethod() ? q[b.name.name] = !0 : n[b.name.name] = !0;
+                b.isMethod() ? n[b.name.name] = !0 : r[b.name.name] = !0;
               });
               b.classInfo.instanceInfo.traits.forEach(function(b) {
-                !b.isMethod() || b.attributes & 2 ? n[b.name.name] = !0 : q[b.name.name] = !0;
+                !b.isMethod() || b.attributes & 2 ? r[b.name.name] = !0 : n[b.name.name] = !0;
               });
             }
           });
         });
-        var h = new d.Metrics.Counter(!0);
-        s.methods.forEach(function(g) {
+        var x = new d.Metrics.Counter(!0);
+        h.methods.forEach(function(g) {
           function c(b) {
             var e = 0;
             switch(b.size) {
@@ -7982,25 +8019,25 @@
               case "":
                 break;
               case "I":
-                a = s.constantPool.ints[e];
+                a = h.constantPool.ints[e];
                 break;
               case "U":
-                a = s.constantPool.uints[e];
+                a = h.constantPool.uints[e];
                 break;
               case "D":
-                a = s.constantPool.doubles[e];
+                a = h.constantPool.doubles[e];
                 break;
               case "S":
-                a = s.constantPool.strings[e];
+                a = h.constantPool.strings[e];
                 break;
               case "N":
-                a = s.constantPool.namespaces[e];
+                a = h.constantPool.namespaces[e];
                 break;
               case "CI":
-                a = s.classes[e];
+                a = h.classes[e];
                 break;
               case "M":
-                a = s.constantPool.multinames[e];
+                a = h.constantPool.multinames[e];
                 break;
               default:
                 a = "?";
@@ -8010,9 +8047,9 @@
           if (g.code) {
             for (var p = new a.AbcStream(g.code);0 < p.remaining();) {
               g = p.readU8();
-              var l = k.opcodeTable[g], d = null;
-              if (l) {
-                switch(h.count(k.opcodeName(l)), l.operands && (d = l.operands.map(c)), g) {
+              var d = k.opcodeTable[g], l = null;
+              if (d) {
+                switch(x.count(k.opcodeName(d)), d.operands && (l = d.operands.map(c)), g) {
                   case 65:
                   ;
                   case 67:
@@ -8028,46 +8065,46 @@
                   case 69:
                   ;
                   case 78:
-                    !d[0] || d[0].name in q || f.count(d[0].name);
+                    !l[0] || l[0].name in n || f.count(l[0].name);
                     break;
                   case 74:
-                    !d[0] || d[0].name in e || m.count(d[0].name);
+                    !l[0] || l[0].name in e || m.count(l[0].name);
                     break;
                   case 102:
                   ;
                   case 97:
-                    !d[0] || d[0].name in n || b.count(d[0].name);
+                    !l[0] || l[0].name in r || b.count(l[0].name);
                 }
               }
             }
           }
         });
-        c.writeLn(JSON.stringify({definedClasses:e, definedMethods:q, definedProperties:n, libraryClasses:m.counts, librarySuperClasses:g.counts, libraryMethods:f.counts, libraryProperties:b.counts, operations:h.counts}, null, 2));
+        c.writeLn(JSON.stringify({definedClasses:e, definedMethods:n, definedProperties:r, libraryClasses:m.counts, librarySuperClasses:g.counts, libraryMethods:f.counts, libraryProperties:b.counts, operations:x.counts}, null, 2));
       }
       var l = d.Debug.notImplemented, c = new d.Options.Option("f", "filter", "string", "SpciMsmNtu", "[S]ource, constant[p]ool, [c]lasses, [i]nstances, [M]etadata, [s]cripts, [m]ethods, multi[N]ames, S[t]atistics, [u]tf");
       a.AbcFile.prototype.trace = function(a) {
         0 <= c.value.indexOf("p") && this.constantPool.trace(a);
         0 <= c.value.indexOf("N") && a.writeArray(this.constantPool.multinames, null, !0);
-        0 <= c.value.indexOf("c") && r(a, "classes", this.classes);
-        0 <= c.value.indexOf("i") && r(a, "instances", this.instances);
-        0 <= c.value.indexOf("M") && r(a, "metadata", this.metadata);
-        0 <= c.value.indexOf("s") && r(a, "scripts", this.scripts);
-        0 <= c.value.indexOf("m") && r(a, "methods", this.methods, this);
-        0 <= c.value.indexOf("S") && u(a, this);
-        0 <= c.value.indexOf("t") && t(a, this);
+        0 <= c.value.indexOf("c") && q(a, "classes", this.classes);
+        0 <= c.value.indexOf("i") && q(a, "instances", this.instances);
+        0 <= c.value.indexOf("M") && q(a, "metadata", this.metadata);
+        0 <= c.value.indexOf("s") && q(a, "scripts", this.scripts);
+        0 <= c.value.indexOf("m") && q(a, "methods", this.methods, this);
+        0 <= c.value.indexOf("S") && t(a, this);
+        0 <= c.value.indexOf("t") && u(a, this);
       };
       a.ConstantPool.prototype.trace = function(a) {
         a.enter("constantPool {");
         for (var c in this) {
-          "namespaces" === c ? (a.enter("namespaces {"), this.namespaces.forEach(function(c, g) {
-            a.writeLn(("" + g).padRight(" ", 3) + (c ? c.toString() : "*"));
+          "namespaces" === c ? (a.enter("namespaces {"), this.namespaces.forEach(function(m, g) {
+            a.writeLn(("" + g).padRight(" ", 3) + (m ? m.toString() : "*"));
           }), a.leave("}")) : this[c] instanceof Array && (a.enter(c + " " + this[c].length + " {"), a.writeArray(this[c]), a.leave("}"));
         }
         a.leave("}");
       };
       a.ClassInfo.prototype.trace = function(a) {
         a.enter("class " + this + " {");
-        r(a, "traits", this.traits);
+        q(a, "traits", this.traits);
         a.leave("}");
       };
       a.MetaDataInfo.prototype.trace = function(a) {
@@ -8079,12 +8116,12 @@
       };
       a.InstanceInfo.prototype.trace = function(a) {
         a.enter("instance " + this + " {");
-        r(a, "traits", this.traits);
+        q(a, "traits", this.traits);
         a.leave("}");
       };
       a.ScriptInfo.prototype.trace = function(a) {
         a.enter("script " + this + " {");
-        r(a, "traits", this.traits);
+        q(a, "traits", this.traits);
         a.leave("}");
       };
       a.Trait.prototype.trace = function(a) {
@@ -8096,7 +8133,7 @@
         a.writeLn(this);
       };
       a.MethodInfo.prototype.trace = function(c) {
-        var s = this.abc;
+        var h = this.abc;
         c.enter("method" + (this.name ? " " + this.name : "") + " {");
         c.writeLn("flags: " + d.IntegerUtilities.getFlags(this.flags, "NEED_ARGUMENTS NEED_ACTIVATION NEED_REST HAS_OPTIONAL  NATIVE SET_DXN HAS_PARAM_NAMES".split(" ")));
         c.writeLn("parameters: " + this.parameters.map(function(b) {
@@ -8104,7 +8141,7 @@
         }));
         if (this.code) {
           var m = new a.AbcStream(this.code);
-          r(c, "traits", this.traits);
+          q(c, "traits", this.traits);
           for (c.enter("code {");0 < m.remaining();) {
             var g = m.readU8(), f = d.AVM2.opcodeTable[g], b;
             b = ("" + m.position).padRight(" ", 6);
@@ -8119,7 +8156,7 @@
                 c.writeLn(b);
                 break;
               default:
-                f && (b += k.opcodeName(g).padRight(" ", 20), f.operands && (0 < f.operands.length && (b += v(f, s, m)), c.writeLn(b)));
+                f && (b += k.opcodeName(g).padRight(" ", 20), f.operands && (0 < f.operands.length && (b += v(f, h, m)), c.writeLn(b)));
             }
           }
           c.leave("}");
@@ -8130,7 +8167,7 @@
         function c(a) {
           return void 0 === a ? "undefined" : null === a ? "null" : "string" === typeof a ? '"' + a + '"' : String(a);
         }
-        function s(a, f) {
+        function h(a, f) {
           void 0 === f && (f = !1);
           return a.parameters.map(function(b) {
             var e = b.name;
@@ -8142,31 +8179,31 @@
           this.writer = a;
         }
         m.prototype = {traceTraits:function(g, f, b) {
-          var e = this.writer, q = this;
+          var e = this.writer, n = this;
           g.forEach(function(g) {
             var m;
             m = a.Multiname.getAccessModifier(g.name);
-            var h = g.name.namespaces[0].uri;
-            h && ("http://adobe.com/AS3/2006/builtin" === h && (h = "AS3"), m = "public" === m ? b === h ? "" : h : m);
+            var d = g.name.namespaces[0].uri;
+            d && ("http://adobe.com/AS3/2006/builtin" === d && (d = "AS3"), m = "public" === m ? b === d ? "" : d : m);
             f && (m += " static");
             if (g.isSlot() || g.isConst()) {
-              q.traceMetadata(g.metadata), m = g.isConst() ? m + " const" : m + " var", m += " " + g.name.getName(), g.typeName && (m += ":" + g.typeName.getName()), g.value && (m += " = " + c(g.value)), e.writeLn(m + ";");
+              n.traceMetadata(g.metadata), m = g.isConst() ? m + " const" : m + " var", m += " " + g.name.getName(), g.typeName && (m += ":" + g.typeName.getName()), g.value && (m += " = " + c(g.value)), e.writeLn(m + ";");
             } else {
               if (g.isMethod() || g.isGetter() || g.isSetter()) {
-                q.traceMetadata(g.metadata);
-                h = g.methodInfo;
+                n.traceMetadata(g.metadata);
+                d = g.methodInfo;
                 g.attributes & 2 && (m += " override");
-                h.isNative() && (m += " native");
+                d.isNative() && (m += " native");
                 m = m + " function" + (g.isGetter() ? " get" : g.isSetter() ? " set" : "");
                 m += " " + g.name.getName();
-                m += "(" + s(h) + ")";
-                m += h.returnType ? ":" + h.returnType.getName() : "";
-                var d;
-                g.holder instanceof a.ClassInfo ? (d = g.holder.instanceInfo.name, d.getName()) : g.holder instanceof a.InstanceInfo && (d = g.holder.name, d.getName());
-                h.isNative();
-                h.isNative() ? e.writeLn(m + ";") : b ? e.writeLn(m + ";") : e.writeLn(m + ' { notImplemented("' + g.name.getName() + '"); }');
+                m += "(" + h(d) + ")";
+                m += d.returnType ? ":" + d.returnType.getName() : "";
+                var q;
+                g.holder instanceof a.ClassInfo ? (q = g.holder.instanceInfo.name, q.getName()) : g.holder instanceof a.InstanceInfo && (q = g.holder.name, q.getName());
+                d.isNative();
+                d.isNative() ? e.writeLn(m + ";") : b ? e.writeLn(m + ";") : e.writeLn(m + ' { notImplemented("' + g.name.getName() + '"); }');
               } else {
-                g.isClass() ? (d = g.classInfo.instanceInfo.name, e.enter("package " + d.namespaces[0].uri + " {\n"), q.traceMetadata(g.metadata), q.traceClass(g.classInfo), e.leave("\n}"), q.traceClassStub(g)) : l(g);
+                g.isClass() ? (q = g.classInfo.instanceInfo.name, e.enter("package " + q.namespaces[0].uri + " {\n"), n.traceMetadata(g.metadata), n.traceClass(g.classInfo), e.leave("\n}"), n.traceClassStub(g)) : l(g);
               }
             }
           });
@@ -8178,14 +8215,14 @@
               (b.isMethod() || b.isGetter() || b.isSetter()) && b.methodInfo.isNative() && f.push(b);
             });
             f.forEach(function(e, a) {
-              var g = e.methodInfo, c = e.name.getName();
-              b.writeLn("// " + c + " :: " + (g.parameters.length ? s(g) : "void") + " -> " + (g.returnType ? g.returnType.getName() : "any"));
-              b.enter((e.isGetter() ? '"get ' + c + '"' : e.isSetter() ? '"set ' + c + '"' : c) + ": function " + c + "(" + s(g, !0) + ") {");
-              b.writeLn('  notImplemented("' + n + "." + c + '");');
+              var g = e.methodInfo, n = e.name.getName();
+              b.writeLn("// " + n + " :: " + (g.parameters.length ? h(g) : "void") + " -> " + (g.returnType ? g.returnType.getName() : "any"));
+              b.enter((e.isGetter() ? '"get ' + n + '"' : e.isSetter() ? '"set ' + n + '"' : n) + ": function " + n + "(" + h(g, !0) + ") {");
+              b.writeLn('  notImplemented("' + m + "." + n + '");');
               b.leave("}" + (a === f.length - 1 ? "" : ",\n"));
             });
           }
-          var b = this.writer, e = a.classInfo, c = e.instanceInfo, n = c.name.getName();
+          var b = this.writer, e = a.classInfo, n = e.instanceInfo, m = n.name.getName();
           a = a.metadata ? a.metadata.native : null;
           if (!a) {
             return!1;
@@ -8193,13 +8230,13 @@
           b.writeLn("Cut and paste the following into `native.js' and edit accordingly");
           b.writeLn("8< --------------------------------------------------------------");
           b.enter("natives." + a.cls + " = function " + a.cls + "(runtime, scope, instanceConstructor, baseClass) {");
-          b.writeLn('var c = new Class("' + n + '", instanceConstructor, ApplicationDomain.passthroughCallable(instanceConstructor));');
+          b.writeLn('var c = new Class("' + m + '", instanceConstructor, ApplicationDomain.passthroughCallable(instanceConstructor));');
           b.writeLn("c.extend(baseClass);\n");
           b.enter("c.nativeStatics = {");
           f(e.traits, !0);
           b.leave("};\n");
           b.enter("c.nativeMethods = {");
-          f(c.traits);
+          f(n.traits);
           b.leave("};\n");
           b.writeLn("return c;");
           b.leave("};");
@@ -8215,46 +8252,46 @@
           }
           function b(b, a) {
             function g(b, f) {
-              var c = b.methodInfo, q = b.name.getName(), m = "// (" + (c.parameters.length ? s(c) : "void") + ") -> " + (c.returnType ? c.returnType.getName() : "any"), p = q;
-              b.isGetter() ? p = "get" : b.isSetter() && (p = "set");
-              e.enter(p + ": function " + q + "(" + s(c, !0) + ") { " + m);
-              e.writeLn('notImplemented("' + n + "." + q + '");');
-              a || (b.isGetter() ? e.writeLn("return this._" + q + ";") : b.isSetter() && e.writeLn("this._" + q + " = " + c.parameters[0].name + ";"));
+              var n = b.methodInfo, c = b.name.getName(), p = "// (" + (n.parameters.length ? h(n) : "void") + ") -> " + (n.returnType ? n.returnType.getName() : "any"), d = c;
+              b.isGetter() ? d = "get" : b.isSetter() && (d = "set");
+              e.enter(d + ": function " + c + "(" + h(n, !0) + ") { " + p);
+              e.writeLn('notImplemented("' + m + "." + c + '");');
+              a || (b.isGetter() ? e.writeLn("return this._" + c + ";") : b.isSetter() && e.writeLn("this._" + c + " = " + n.parameters[0].name + ";"));
               e.leave("}" + (f ? "," : ""));
             }
             void 0 === a && (a = !1);
             b = f(b);
-            var c = [], q = Object.create(null);
+            var n = [], c = Object.create(null);
             b.methods.forEach(function(b, e) {
               var a = b.name.getName();
-              b.isGetter() || b.isSetter() ? (q[a] || (q[a] = []), q[a].push(b)) : c.push(b);
+              b.isGetter() || b.isSetter() ? (c[a] || (c[a] = []), c[a].push(b)) : n.push(b);
             });
-            for (var m = 0;m < c.length;m++) {
-              g(c[m], m < c.length - 1);
+            for (var p = 0;p < n.length;p++) {
+              g(n[p], p < n.length - 1);
             }
-            for (var p = d.ObjectUtilities.toKeyValueArray(q), h = 0;h < p.length;h++) {
-              e.enter(p[h][0] + ": {");
-              for (var l = p[h][1], m = 0;m < l.length;m++) {
-                g(l[m], m < l.length - 1);
+            for (var x = d.ObjectUtilities.toKeyValueArray(c), l = 0;l < x.length;l++) {
+              e.enter(x[l][0] + ": {");
+              for (var q = x[l][1], p = 0;p < q.length;p++) {
+                g(q[p], p < q.length - 1);
               }
-              e.leave("}" + (h < p.length - 1 ? "," : ""));
+              e.leave("}" + (l < x.length - 1 ? "," : ""));
             }
             b.properties.forEach(function(a, f) {
-              var g = a.name.getName(), c = f === b.properties.length - 1;
-              a.name.getNamespace().isPublic() && e.writeLn(g + ": " + ("'public " + a.name.name + "'") + (c ? "" : ","));
+              var g = a.name.getName(), n = f === b.properties.length - 1;
+              a.name.getNamespace().isPublic() && e.writeLn(g + ": " + ("'public " + a.name.name + "'") + (n ? "" : ","));
             });
           }
           var e = this.writer;
           a = a.classInfo;
-          var c = a.instanceInfo, n = c.name.getName();
+          var n = a.instanceInfo, m = n.name.getName();
           e.writeLn("Cut and paste the following glue and edit accordingly.");
-          e.writeLn("Class " + c);
+          e.writeLn("Class " + n);
           e.writeLn("8< --------------------------------------------------------------");
-          var m = c.name.namespaces[0].uri;
-          e.enter("var " + n + "Definition = (function () {");
+          var c = n.name.namespaces[0].uri;
+          e.enter("var " + m + "Definition = (function () {");
           e.enter("return {");
-          e.writeLn("// (" + s(c.init, !1) + ")");
-          e.writeLn('__class__: "' + m + "." + n + '",');
+          e.writeLn("// (" + h(n.init, !1) + ")");
+          e.writeLn('__class__: "' + c + "." + m + '",');
           e.enter("initialize: function () {");
           e.leave("},");
           e.enter("__glue__: {");
@@ -8263,7 +8300,7 @@
           b(a.traits, !0);
           e.leave("},");
           e.enter("instance: {");
-          b(c.traits);
+          b(n.traits);
           e.leave("}");
           e.leave("},");
           e.enter("script: {");
@@ -8275,21 +8312,21 @@
           e.writeLn("-------------------------------------------------------------- >8");
           return!0;
         }, traceClass:function(g) {
-          var f = this.writer, b = g.instanceInfo, e = b.name, c = a.Multiname.getAccessModifier(e);
-          b.isFinal() && (c += " final");
-          b.isSealed() || (c += " dynamic");
-          c += b.isInterface() ? " interface " : " class ";
-          c += e.getName();
-          b.superName && "Object" !== b.superName.getName() && (c += " extends " + b.superName.getName());
-          b.interfaces.length && (c += " implements " + b.interfaces.map(function(b) {
+          var f = this.writer, b = g.instanceInfo, e = b.name, n = a.Multiname.getAccessModifier(e);
+          b.isFinal() && (n += " final");
+          b.isSealed() || (n += " dynamic");
+          n += b.isInterface() ? " interface " : " class ";
+          n += e.getName();
+          b.superName && "Object" !== b.superName.getName() && (n += " extends " + b.superName.getName());
+          b.interfaces.length && (n += " implements " + b.interfaces.map(function(b) {
             return b.getName();
           }).join(", "));
-          f.enter(c + " {");
-          b.isInterface() || f.writeLn("public function " + e.getName() + "(" + s(b.init) + ") {}");
-          var n;
-          b.isInterface() && (n = e.namespaces[0].uri + ":" + e.name);
-          this.traceTraits(g.traits, !0, n);
-          this.traceTraits(b.traits, !1, n);
+          f.enter(n + " {");
+          b.isInterface() || f.writeLn("public function " + e.getName() + "(" + h(b.init) + ") {}");
+          var m;
+          b.isInterface() && (m = e.namespaces[0].uri + ":" + e.name);
+          this.traceTraits(g.traits, !0, m);
+          this.traceTraits(b.traits, !1, m);
           f.leave("}");
         }, traceMetadata:function(a) {
           var f = this.writer, b;
@@ -8306,7 +8343,7 @@
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
-    var a = d.AVM2.ABC.AbcStream, r = d.ArrayUtilities.top, v = d.ArrayUtilities.peek;
+    var a = d.AVM2.ABC.AbcStream, q = d.ArrayUtilities.top, v = d.ArrayUtilities.peek;
     (function(a) {
       a[a.bkpt = 1] = "bkpt";
       a[a.nop = 2] = "nop";
@@ -8488,7 +8525,7 @@
       a[a["instanceof"] = 177] = "instanceof";
       a[a["in"] = 180] = "in";
     })(k.OP || (k.OP = {}));
-    var u = k.OP;
+    var t = k.OP;
     k.opcodeTable = [null, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[{name:"index", size:4, type:""}]}, {canThrow:!0, operands:[{name:"index", size:4, type:""}]}, {canThrow:!0, operands:[{name:"index", size:4, type:""}]}, {canThrow:!0, operands:[]}, {canThrow:!1, operands:[{name:"index", size:4, type:""}]}, {canThrow:!1, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[{name:"offset", size:3, 
     type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!1, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!1, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!1, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, 
     operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!1, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!1, operands:[{name:"offset", size:3, type:""}]}, {canThrow:!1, operands:null}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!1, 
@@ -8504,7 +8541,7 @@
     size:4, type:""}]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[{name:"index", size:4, type:""}]}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!0, operands:[]}, null, null, null, null, null, null, null, null, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, 
     operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[{name:"index", size:4, type:"M"}]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, null, null, null, null, null, null, null, null, null, null, null, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[{name:"index", 
     size:4, type:""}]}, {canThrow:!0, operands:[{name:"index", size:4, type:""}]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, {canThrow:!0, operands:[]}, null, null, null, null, null, null, null, null, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, {canThrow:!1, operands:[]}, null, null, null, null, null, null, 
-    null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, {canThrow:!1, operands:[]}, null, {canThrow:!0, operands:[{name:"value", size:0, type:""}, {name:"index", size:4, type:"S"}, {name:"object", size:0, type:""}, {name:"argCount", size:4, type:""}]}, {canThrow:!0, operands:[{name:"offset", size:4, type:""}]}, {canThrow:!0, operands:[{name:"index", size:4, type:"S"}]}, null, null, null, null, null, null, null, null, null, null, null, null, null, null];
+    null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, {canThrow:!1, operands:[]}, null, {canThrow:!1, operands:[{name:"value", size:0, type:""}, {name:"index", size:4, type:"S"}, {name:"object", size:0, type:""}, {name:"argCount", size:4, type:""}]}, {canThrow:!1, operands:[{name:"offset", size:4, type:""}]}, {canThrow:!1, operands:[{name:"index", size:4, type:"S"}]}, null, null, null, null, null, null, null, null, null, null, null, null, null, null];
     (function(a) {
       a[a.u08 = 0] = "u08";
       a[a.s08 = 1] = "s08";
@@ -8514,61 +8551,136 @@
       a[a.u32 = 5] = "u32";
     })(k.OpcodeSize || (k.OpcodeSize = {}));
     k.opcodeName = function(a) {
-      return u[a];
+      return t[a];
     };
-    var t = function() {
-      function a(c) {
+    var u = function() {
+      function a() {
+      }
+      a.get = function(a) {
+        return this._pool.length ? this._pool.pop().parse(a) : new l(a);
+      };
+      a.release = function(a) {
+        a.bid = void 0;
+        a.succs = null;
+        a.preds = null;
+        a.dominatees = null;
+        a.dominator = null;
+        a.end = null;
+        a.region = null;
+        a.spbacks = null;
+        a.bdo = 0;
+        a.target = null;
+        a.targets = null;
+        a.ti = null;
+        this._pool.push(a);
+      };
+      a.releaseList = function(a) {
+        for (var f = a.length;f--;) {
+          this.release(a[f]);
+        }
+        a.length = 0;
+      };
+      a._pool = [];
+      return a;
+    }();
+    k.BytecodePool = u;
+    var l = function() {
+      function a(g) {
         this.ti = null;
         this.position = 0;
         this.targets = this.target = this.offsets = null;
-        this.level = 0;
+        this.relooperBlock = this.level = 0;
         this.spbacks = this.region = this.end = this.dominator = this.dominatees = this.preds = this.succs = null;
         this.bdo = 0;
         this.hasCatches = !1;
         this.verifierEntryState = null;
         this.value = this.offset = this.argCount = this.object = this.index = 0;
-        if (c) {
-          var g = c.readU8();
-          this.op = g;
-          var f = k.opcodeTable[g];
-          this.canThrow = f.canThrow;
-          var b;
-          if (27 === g) {
-            f = c.readS24();
-            this.offsets = [];
-            b = c.readU30() + 1;
-            for (g = 0;g < b;g++) {
-              this.offsets.push(c.readS24());
-            }
-            this.offsets.push(f);
-          } else {
-            for (g = 0, b = f.operands.length;g < b;g++) {
-              var e = f.operands[g];
-              switch(e.size) {
-                case 0:
-                  this[e.name] = c.readU8();
-                  break;
-                case 1:
-                  this[e.name] = c.readS8();
-                  break;
-                case 2:
-                  this[e.name] = c.readS16();
-                  break;
-                case 3:
-                  this[e.name] = c.readS24();
-                  break;
-                case 4:
-                  this[e.name] = c.readU30();
-                  break;
-                case 5:
-                  this[e.name] = c.readU32();
-              }
-            }
+        this.parse(g);
+      }
+      a.prototype.parse = function(a) {
+        if (!a) {
+          return this.op = 237, this.canThrow = !0, this;
+        }
+        var f = a.readU8();
+        this.op = f;
+        var b = k.opcodeTable[f];
+        this.canThrow = b.canThrow;
+        if (27 === f) {
+          b = a.readS24();
+          this.offsets = [];
+          for (var f = a.readU30() + 1, e = 0;e < f;e++) {
+            this.offsets.push(a.readS24());
           }
+          this.offsets.push(b);
         } else {
-          this.op = 237, this.canThrow = !0;
+          for (e = 0, f = b.operands.length;e < f;e++) {
+            var n = b.operands[e];
+            switch(n.size) {
+              case 0:
+                this[n.name] = a.readU8();
+                break;
+              case 1:
+                this[n.name] = a.readS8();
+                break;
+              case 2:
+                this[n.name] = a.readS16();
+                break;
+              case 3:
+                this[n.name] = a.readS24();
+                break;
+              case 4:
+                this[n.name] = a.readU30();
+                break;
+              case 5:
+                this[n.name] = a.readU32();
+            }
+          }
         }
-      }
+        return this;
+      };
+      a.prototype.isBlockEnd = function() {
+        switch(this.op) {
+          case 27:
+          ;
+          case 16:
+          ;
+          case 21:
+          ;
+          case 12:
+          ;
+          case 22:
+          ;
+          case 13:
+          ;
+          case 23:
+          ;
+          case 14:
+          ;
+          case 24:
+          ;
+          case 15:
+          ;
+          case 19:
+          ;
+          case 20:
+          ;
+          case 25:
+          ;
+          case 26:
+          ;
+          case 17:
+          ;
+          case 18:
+          ;
+          case 72:
+          ;
+          case 71:
+          ;
+          case 3:
+            return!0;
+        }
+        return!1;
+      };
       a.prototype.makeBlockHead = function(a) {
         if (this.succs) {
           return a;
@@ -8583,145 +8695,146 @@
         this.succs && a.writeLn("#" + this.bid);
       };
       a.prototype.toString = function(a) {
-        var c = d.AVM2.opcodeTable[this.op], f = u[this.op].padRight(" ", 20), b, e;
+        var f = d.AVM2.opcodeTable[this.op], b = t[this.op].padRight(" ", 20), e, n;
         if (27 === this.op) {
-          for (f += "targets:", b = 0, e = this.targets.length;b < e;b++) {
-            f += (0 < b ? "," : "") + this.targets[b].position;
+          for (b += "targets:", e = 0, n = this.targets.length;e < n;e++) {
+            b += (0 < e ? "," : "") + this.targets[e].position;
           }
         } else {
-          for (b = 0, e = c.operands.length;b < e;b++) {
-            var q = c.operands[b];
-            if ("offset" === q.name) {
-              f += "target:" + this.target.position;
+          for (e = 0, n = f.operands.length;e < n;e++) {
+            var c = f.operands[e];
+            if ("offset" === c.name) {
+              this.target && (b += "target:" + this.target.position);
             } else {
-              var f = f + (q.name + ": "), n = this[q.name];
+              var b = b + (c.name + ": "), h = this[c.name];
               if (a) {
-                switch(q.type) {
+                switch(c.type) {
                   case "":
-                    f += n;
+                    b += h;
                     break;
                   case "I":
-                    f += a.constantPool.ints[n];
+                    b += a.constantPool.ints[h];
                     break;
                   case "U":
-                    f += a.constantPool.uints[n];
+                    b += a.constantPool.uints[h];
                     break;
                   case "D":
-                    f += a.constantPool.doubles[n];
+                    b += a.constantPool.doubles[h];
                     break;
                   case "S":
-                    f += a.constantPool.strings[n];
+                    b += a.constantPool.strings[h];
                     break;
                   case "N":
-                    f += a.constantPool.namespaces[n];
+                    b += a.constantPool.namespaces[h];
                     break;
                   case "CI":
-                    f += a.classes[n];
+                    b += a.classes[h];
                     break;
                   case "M":
-                    f += a.constantPool.multinames[n];
+                    b += a.constantPool.multinames[h];
                     break;
                   default:
-                    f += "?";
+                    b += "?";
                 }
               } else {
-                f += n;
+                b += h;
               }
             }
-            b < e - 1 && (f += ", ");
+            e < n - 1 && (b += ", ");
           }
         }
-        return f;
+        return b;
       };
       return a;
     }();
-    k.Bytecode = t;
-    var l = d.BitSets.BITS_PER_WORD, c = d.BitSets.ADDRESS_BITS_PER_WORD, h = d.BitSets.BIT_INDEX_MASK, p = function(a) {
-      function p(c, f) {
-        a.call(this, c);
-        this.blockById = f;
-      }
-      __extends(p, a);
-      p.prototype.forEachBlock = function(a) {
-        for (var f = this.blockById, b = this.bits, e = 0, c = b.length;e < c;e++) {
-          var n = b[e];
-          if (n) {
-            for (var p = 0;p < l;p++) {
-              n & 1 << p && a(f[e * l + p]);
+    k.Bytecode = l;
+    var c = d.BitSets.BITS_PER_WORD, h = d.BitSets.ADDRESS_BITS_PER_WORD, p = d.BitSets.BIT_INDEX_MASK, s = function(a) {
+      function g(f, b) {
+        a.call(this, f);
+        this.blockById = b;
+      }
+      __extends(g, a);
+      g.prototype.forEachBlock = function(a) {
+        for (var b = this.blockById, e = this.bits, g = 0, r = e.length;g < r;g++) {
+          var h = e[g];
+          if (h) {
+            for (var m = 0;m < c;m++) {
+              h & 1 << m && a(b[g * c + m]);
             }
           }
         }
       };
-      p.prototype.choose = function() {
-        for (var a = this.blockById, f = this.bits, b = 0, e = f.length;b < e;b++) {
-          var c = f[b];
-          if (c) {
-            for (var n = 0;n < l;n++) {
-              if (c & 1 << n) {
-                return a[b * l + n];
+      g.prototype.choose = function() {
+        for (var a = this.blockById, b = this.bits, e = 0, g = b.length;e < g;e++) {
+          var r = b[e];
+          if (r) {
+            for (var h = 0;h < c;h++) {
+              if (r & 1 << h) {
+                return a[e * c + h];
               }
             }
           }
         }
       };
-      p.prototype.members = function() {
-        for (var a = this.blockById, f = [], b = this.bits, e = 0, c = b.length;e < c;e++) {
-          var n = b[e];
-          if (n) {
-            for (var p = 0;p < l;p++) {
-              n & 1 << p && f.push(a[e * l + p]);
+      g.prototype.members = function() {
+        for (var a = this.blockById, b = [], e = this.bits, g = 0, r = e.length;g < r;g++) {
+          var h = e[g];
+          if (h) {
+            for (var m = 0;m < c;m++) {
+              h & 1 << m && b.push(a[g * c + m]);
             }
           }
         }
-        return f;
+        return b;
       };
-      p.prototype.setBlocks = function(a) {
-        for (var f = this.bits, b = 0, e = a.length;b < e;b++) {
-          var q = a[b].bid;
-          f[q >> c] |= 1 << (q & h);
+      g.prototype.setBlocks = function(a) {
+        for (var b = this.bits, e = 0, g = a.length;e < g;e++) {
+          var c = a[e].bid;
+          b[c >> h] |= 1 << (c & p);
         }
       };
-      return p;
+      return g;
     }(d.BitSets.Uint32ArrayBitSet);
-    k.BlockSet = p;
-    p = function() {
+    k.BlockSet = s;
+    s = function() {
       function c(a) {
         this.methodInfo = a;
         this.boundBlockSet = this.bytecodes = this.blocks = null;
         this.analyzedControlFlow = this.markedLoops = !1;
         a.code && (k.enterTimeline("normalizeBytecode"), this.normalizeBytecode(), k.leaveTimeline());
       }
-      c.prototype.makeBlockSetFactory = function(a, c) {
+      c.prototype.makeBlockSetFactory = function(a, f) {
         this.boundBlockSet = function() {
-          return new d.AVM2.BlockSet(a, c);
+          return new d.AVM2.BlockSet(a, f);
         };
       };
       c.prototype.accessLocal = function(a) {
         0 !== a-- && a < this.methodInfo.parameters.length && (this.methodInfo.parameters[a].isUsed = !0);
       };
-      c.prototype.getInvalidTarget = function(a, c) {
-        if (a && a[c]) {
-          return a[c];
-        }
-        var f = new t(null);
-        f.position = c;
-        a && (a[c] = f);
-        return f;
+      c.prototype.getInvalidTarget = function(a, f) {
+        if (a && a[f]) {
+          return a[f];
+        }
+        var b = u.get(null);
+        b.position = f;
+        a && (a[f] = b);
+        return b;
       };
       c.prototype.normalizeBytecode = function() {
-        for (var c = this.methodInfo, g = [], f = [], b = new a(c.code), e;0 < b.remaining();) {
-          var q = b.position;
-          e = new t(b);
-          switch(e.op) {
+        for (var g = this.methodInfo, f = [], b = [], e = new a(g.code), n;0 < e.remaining();) {
+          var c = e.position;
+          n = u.get(e);
+          n.pc = c;
+          switch(n.op) {
             case 2:
             ;
             case 9:
-              g[q] = f.length;
+              f[c] = b.length;
               continue;
             case 27:
-              e.targets = [];
-              for (var n = e.offsets, p = 0, h = n.length;p < h;p++) {
-                n[p] += q;
+              n.targets = [];
+              for (var h = n.offsets, m = 0, p = h.length;m < p;m++) {
+                h[m] += c;
               }
               break;
             case 16:
@@ -8753,7 +8866,7 @@
             case 17:
             ;
             case 18:
-              e.offset += b.position;
+              n.offset += e.position;
               break;
             case 208:
             ;
@@ -8762,22 +8875,22 @@
             case 210:
             ;
             case 211:
-              this.accessLocal(e.op - 208);
+              this.accessLocal(n.op - 208);
               break;
             case 98:
-              this.accessLocal(e.index);
+              this.accessLocal(n.index);
           }
-          e.position = f.length;
-          g[q] = f.length;
-          f.push(e);
+          n.position = b.length;
+          f[c] = b.length;
+          b.push(n);
         }
-        for (var b = {}, s = 0, l = f.length;s < l;s++) {
-          switch(e = f[s], e.op) {
+        for (var e = {}, s = 0, d = b.length;s < d;s++) {
+          switch(n = b[s], n.op) {
             case 27:
-              n = e.offsets;
-              p = 0;
-              for (h = n.length;p < h;p++) {
-                q = g[n[p]], e.targets.push(f[q] || this.getInvalidTarget(b, n[p])), n[p] = q;
+              h = n.offsets;
+              m = 0;
+              for (p = h.length;m < p;m++) {
+                c = f[h[m]], n.targets.push(b[c] || this.getInvalidTarget(e, h[m])), h[m] = c;
               }
               break;
             case 16:
@@ -8809,14 +8922,14 @@
             case 17:
             ;
             case 18:
-              q = g[e.offset], e.target = f[q] || this.getInvalidTarget(b, e.offset), e.offset = q;
+              c = f[n.offset], n.target = b[c] || this.getInvalidTarget(e, n.offset), n.offset = c;
           }
         }
-        this.bytecodes = f;
-        c = c.exceptions;
-        p = 0;
-        for (h = c.length;p < h;p++) {
-          e = c[p], e.start = g[e.start], e.end = g[e.end], e.offset = g[e.target], e.target = f[e.offset], e.target.exception = e;
+        this.bytecodes = b;
+        g = g.exceptions;
+        m = 0;
+        for (p = g.length;m < p;m++) {
+          n = g[m], n.start_pc = n.start, n.end_pc = n.end, n.target_pc = n.target, n.start = f[n.start], n.end = f[n.end], n.offset = f[n.target], n.target = b[n.offset], n.target.exception = n;
         }
       };
       c.prototype.analyzeControlFlow = function() {
@@ -8829,24 +8942,24 @@
         return!0;
       };
       c.prototype.detectBasicBlocks = function() {
-        var a = this.bytecodes, c = this.methodInfo.exceptions, f = 0 < c.length, b = {}, e, q, n, p;
-        p = a[0].makeBlockHead(0);
-        q = 0;
-        for (n = a.length - 1;q < n;q++) {
-          switch(e = a[q], e.op) {
+        var a = this.bytecodes, f = this.methodInfo.exceptions, b = 0 < f.length, e = {}, n, c, h, m;
+        m = a[0].makeBlockHead(0);
+        c = 0;
+        for (h = a.length - 1;c < h;c++) {
+          switch(n = a[c], n.op) {
             case 71:
             ;
             case 72:
             ;
             case 3:
-              p = a[q + 1].makeBlockHead(p);
+              m = a[c + 1].makeBlockHead(m);
               break;
             case 27:
-              e = e.targets;
-              for (var h = 0, s = e.length;h < s;h++) {
-                p = e[h].makeBlockHead(p);
+              n = n.targets;
+              for (var p = 0, s = n.length;p < s;p++) {
+                m = n[p].makeBlockHead(m);
               }
-              p = a[q + 1].makeBlockHead(p);
+              m = a[c + 1].makeBlockHead(m);
               break;
             case 16:
             ;
@@ -8877,20 +8990,20 @@
             case 17:
             ;
             case 18:
-              p = e.target.makeBlockHead(p), p = a[q + 1].makeBlockHead(p);
+              m = n.target.makeBlockHead(m), m = a[c + 1].makeBlockHead(m);
           }
         }
-        e = a[n];
-        switch(e.op) {
+        n = a[h];
+        switch(n.op) {
           case 27:
-            e = e.targets;
-            h = 0;
-            for (s = e.length;h < s;h++) {
-              p = e[h].makeBlockHead(p);
+            n = n.targets;
+            p = 0;
+            for (s = n.length;p < s;p++) {
+              m = n[p].makeBlockHead(m);
             }
             break;
           case 16:
-            p = e.target.makeBlockHead(p);
+            m = n.target.makeBlockHead(m);
             break;
           case 21:
           ;
@@ -8919,22 +9032,22 @@
           case 17:
           ;
           case 18:
-            p = e.target.makeBlockHead(p), a[q + 1] = this.getInvalidTarget(null, q + 1), p = a[q + 1].makeBlockHead(p);
+            m = n.target.makeBlockHead(m), a[c + 1] = this.getInvalidTarget(null, c + 1), m = a[c + 1].makeBlockHead(m);
         }
-        if (f) {
-          for (h = 0;h < c.length;h++) {
-            q = c[h], n = a[q.end + 1], p = a[q.start].makeBlockHead(p), n && (p = n.makeBlockHead(p)), p = q.target.makeBlockHead(p);
+        if (b) {
+          for (p = 0;p < f.length;p++) {
+            c = f[p], h = a[c.end + 1], m = a[c.start].makeBlockHead(m), h && (m = h.makeBlockHead(m)), m = c.target.makeBlockHead(m);
           }
         }
-        var l = a[0];
-        q = 1;
-        for (n = a.length;q < n;q++) {
-          if (a[q].succs) {
-            b[l.bid] = l;
-            e = a[q - 1];
-            l.end = e;
-            var d = a[q];
-            switch(e.op) {
+        var d = a[0];
+        c = 1;
+        for (h = a.length;c < h;c++) {
+          if (a[c].succs) {
+            e[d.bid] = d;
+            n = a[c - 1];
+            d.end = n;
+            var l = a[c];
+            switch(n.op) {
               case 71:
               ;
               case 72:
@@ -8942,13 +9055,13 @@
               case 3:
                 break;
               case 27:
-                h = 0;
-                for (s = e.targets.length;h < s;h++) {
-                  l.succs.push(e.targets[h]);
+                p = 0;
+                for (s = n.targets.length;p < s;p++) {
+                  d.succs.push(n.targets[p]);
                 }
                 break;
               case 16:
-                l.succs.push(e.target);
+                d.succs.push(n.target);
                 break;
               case 21:
               ;
@@ -8977,137 +9090,137 @@
               case 17:
               ;
               case 18:
-                l.succs.push(e.target);
-                e.target !== d && l.succs.push(d);
+                d.succs.push(n.target);
+                n.target !== l && d.succs.push(l);
                 break;
               default:
-                l.succs.push(d);
+                d.succs.push(l);
             }
-            if (f) {
-              h = l;
+            if (b) {
+              p = d;
               s = [];
-              e = 0;
-              for (var r = c.length;e < r;e++) {
-                var k = c[e];
-                h.position >= k.start && h.end.position <= k.end && s.push(k.target);
-              }
-              e = s;
-              l.hasCatches = 0 < e.length;
-              l.succs.push.apply(l.succs, e);
+              n = 0;
+              for (var q = f.length;n < q;n++) {
+                var k = f[n];
+                p.position >= k.start && p.end.position <= k.end && s.push(k.target);
+              }
+              n = s;
+              d.hasCatches = 0 < n.length;
+              d.succs.push.apply(d.succs, n);
             }
-            l = d;
+            d = l;
           }
         }
-        b[l.bid] = l;
-        e = a[n - 1];
-        switch(e.op) {
+        e[d.bid] = d;
+        n = a[h - 1];
+        switch(n.op) {
           case 27:
-            h = 0;
-            for (s = e.targets.length;h < s;h++) {
-              l.succs.push(e.targets[h]);
+            p = 0;
+            for (s = n.targets.length;p < s;p++) {
+              d.succs.push(n.targets[p]);
             }
             break;
           case 16:
-            l.succs.push(e.target);
+            d.succs.push(n.target);
         }
-        l.end = e;
-        this.makeBlockSetFactory(p, b);
+        d.end = n;
+        this.makeBlockSetFactory(m, e);
       };
       c.prototype.normalizeReachableBlocks = function() {
-        var a = this.bytecodes[0], c = [], f = {}, b = {}, e = [a];
-        for (b[a.bid] = !0;a = r(e);) {
-          if (f[a.bid]) {
-            if (1 === f[a.bid]) {
-              f[a.bid] = 2;
-              c.push(a);
-              for (var q = a.succs, n = 0, p = q.length;n < p;n++) {
-                q[n].preds.push(a);
+        var a = this.bytecodes[0], f = [], b = {}, e = {}, n = [a];
+        for (e[a.bid] = !0;a = q(n);) {
+          if (b[a.bid]) {
+            if (1 === b[a.bid]) {
+              b[a.bid] = 2;
+              f.push(a);
+              for (var c = a.succs, h = 0, m = c.length;h < m;h++) {
+                c[h].preds.push(a);
               }
             }
-            b[a.bid] = !1;
-            e.pop();
+            e[a.bid] = !1;
+            n.pop();
           } else {
-            for (f[a.bid] = 1, b[a.bid] = !0, q = a.succs, n = 0, p = q.length;n < p;n++) {
-              var h = q[n];
-              b[h.bid] && (a.spbacks || (a.spbacks = new this.boundBlockSet), a.spbacks.set(h.bid));
-              !f[h.bid] && e.push(h);
+            for (b[a.bid] = 1, e[a.bid] = !0, c = a.succs, h = 0, m = c.length;h < m;h++) {
+              var p = c[h];
+              e[p.bid] && (a.spbacks || (a.spbacks = new this.boundBlockSet), a.spbacks.set(p.bid));
+              !b[p.bid] && n.push(p);
             }
           }
         }
-        this.blocks = c.reverse();
+        this.blocks = f.reverse();
       };
       c.prototype.computeDominance = function() {
-        var a = this.blocks, c = a.length, f = Array(c);
-        f[0] = 0;
-        for (var b = {}, e = 0;e < c;e++) {
-          b[a[e].bid] = e;
+        var a = this.blocks, f = a.length, b = Array(f);
+        b[0] = 0;
+        for (var e = {}, n = 0;n < f;n++) {
+          e[a[n].bid] = n;
         }
-        for (var q = !0;q;) {
-          for (q = !1, e = 1;e < c;e++) {
-            var n = a[e].preds, p = n.length, h = b[n[0].bid];
-            if (!(h in f)) {
-              for (var s = 1;s < p && !(h = b[n[s].bid], h in f);s++) {
+        for (var c = !0;c;) {
+          for (c = !1, n = 1;n < f;n++) {
+            var h = a[n].preds, m = h.length, p = e[h[0].bid];
+            if (!(p in b)) {
+              for (var s = 1;s < m && !(p = e[h[s].bid], p in b);s++) {
               }
             }
-            for (s = 0;s < p;s++) {
-              var l = b[n[s].bid];
-              if (l !== h && l in f) {
-                for (;l !== h;) {
-                  for (;l > h;) {
-                    l = f[l];
+            for (s = 0;s < m;s++) {
+              var d = e[h[s].bid];
+              if (d !== p && d in b) {
+                for (;d !== p;) {
+                  for (;d > p;) {
+                    d = b[d];
                   }
-                  for (;h > l;) {
-                    h = f[h];
+                  for (;p > d;) {
+                    p = b[p];
                   }
                 }
-                h = l;
+                p = d;
               }
             }
-            f[e] !== h && (f[e] = h, q = !0);
+            b[n] !== p && (b[n] = p, c = !0);
           }
         }
         a[0].dominator = a[0];
-        for (e = 1;e < c;e++) {
-          b = a[e], s = a[f[e]], b.dominator = s, s.dominatees.push(b), b.npreds = b.preds.length;
+        for (n = 1;n < f;n++) {
+          e = a[n], s = a[b[n]], e.dominator = s, s.dominatees.push(e), e.npreds = e.preds.length;
         }
-        c = [a[0]];
-        for (a[0].level || (a[0].level = 0);b = c.shift();) {
-          a = b.dominatees;
+        f = [a[0]];
+        for (a[0].level || (a[0].level = 0);e = f.shift();) {
+          a = e.dominatees;
           for (s = 0;s < a.length;s++) {
-            a[s].level = b.level + 1;
+            a[s].level = e.level + 1;
           }
-          c.push.apply(c, a);
+          f.push.apply(f, a);
         }
       };
       c.prototype.markLoops = function() {
         function a(b) {
-          var e = 1, f = {}, c = {}, g = [], n = [], q = [], p = b.level + 1;
+          var e = 1, f = {}, g = {}, n = [], c = [], r = [], h = b.level + 1;
           b = [b];
-          for (var h, m;h = r(b);) {
-            if (f[h.bid]) {
-              if (v(n) === h) {
-                n.pop();
+          for (var m, p;m = q(b);) {
+            if (f[m.bid]) {
+              if (v(c) === m) {
+                c.pop();
                 var s = [];
                 do {
-                  m = g.pop(), c[m.bid] = !0, s.push(m);
-                } while (m !== h);
-                (1 < s.length || m.spbacks && m.spbacks.get(m.bid)) && q.push(s);
+                  p = n.pop(), g[p.bid] = !0, s.push(p);
+                } while (p !== m);
+                (1 < s.length || p.spbacks && p.spbacks.get(p.bid)) && r.push(s);
               }
               b.pop();
             } else {
-              f[h.bid] = e++;
-              g.push(h);
-              n.push(h);
-              m = h.succs;
-              for (var s = 0, l = m.length;s < l;s++) {
-                if (h = m[s], !(h.level < p)) {
-                  var d = h.bid;
-                  if (!f[d]) {
-                    b.push(h);
+              f[m.bid] = e++;
+              n.push(m);
+              c.push(m);
+              p = m.succs;
+              for (var s = 0, d = p.length;s < d;s++) {
+                if (m = p[s], !(m.level < h)) {
+                  var l = m.bid;
+                  if (!f[l]) {
+                    b.push(m);
                   } else {
-                    if (!c[d]) {
-                      for (;f[v(n).bid] > f[d];) {
-                        n.pop();
+                    if (!g[l]) {
+                      for (;f[v(c).bid] > f[l];) {
+                        c.pop();
                       }
                     }
                   }
@@ -9115,34 +9228,34 @@
               }
             }
           }
-          return q;
+          return r;
         }
-        function c(a, e) {
-          var f = new b;
-          f.setBlocks(a);
+        function f(b, a) {
+          var f = new e;
+          f.setBlocks(b);
           f.recount();
-          this.id = e;
+          this.id = a;
           this.body = f;
-          this.exit = new b;
+          this.exit = new e;
           this.save = {};
-          this.head = new b;
+          this.head = new e;
           this.npreds = 0;
           this._dirtyLocals = null;
         }
         if (!this.analyzedControlFlow && !this.analyzeControlFlow()) {
           return!1;
         }
-        var f = this.bytecodes, b = this.boundBlockSet;
-        c.prototype.getDirtyLocals = function() {
+        var b = this.bytecodes, e = this.boundBlockSet;
+        f.prototype.getDirtyLocals = function() {
           if (this._dirtyLocals) {
             return this._dirtyLocals;
           }
-          var b = this._dirtyLocals = [];
-          this.body.members().forEach(function(a) {
-            var e = a.position;
-            for (a = a.end.position;e <= a;e++) {
-              var c = f[e], g = c.op;
-              switch(g) {
+          var a = this._dirtyLocals = [];
+          this.body.members().forEach(function(e) {
+            var f = e.position;
+            for (e = e.end.position;f <= e;f++) {
+              var g = b[f], n = g.op;
+              switch(n) {
                 case 146:
                 ;
                 case 148:
@@ -9152,11 +9265,11 @@
                 case 194:
                 ;
                 case 195:
-                  b[c.index] = !0;
+                  a[g.index] = !0;
                   break;
                 case 50:
-                  b[c.index] = !0;
-                  b[c.object] = !0;
+                  a[g.index] = !0;
+                  a[g.object] = !0;
                   break;
                 case 212:
                 ;
@@ -9165,47 +9278,47 @@
                 case 214:
                 ;
                 case 215:
-                  b[g - 212] = !0;
+                  a[n - 212] = !0;
               }
             }
           });
-          return b;
+          return a;
         };
-        var e = function(a) {
-          for (var e = new b, f = 0, c = a.length;f < c;f++) {
-            var g = a[f], n = g.spbacks;
-            if (n) {
-              for (var g = g.succs, q = 0, p = g.length;q < p;q++) {
-                var h = g[q];
-                n.get(h.bid) && e.set(h.dominator.bid);
+        var n = function(b) {
+          for (var a = new e, f = 0, g = b.length;f < g;f++) {
+            var n = b[f], c = n.spbacks;
+            if (c) {
+              for (var n = n.succs, r = 0, h = n.length;r < h;r++) {
+                var m = n[r];
+                c.get(m.bid) && a.set(m.dominator.bid);
               }
             }
           }
-          return e.members();
+          return a.members();
         }(this.blocks);
-        if (0 >= e.length) {
+        if (0 >= n.length) {
           return this.markedLoops = !0;
         }
-        for (var e = e.sort(function(b, a) {
+        for (var n = n.sort(function(b, a) {
           return b.level - a.level;
-        }), q = 0, n = e.length - 1;0 <= n;n--) {
-          var p = e[n], h = a(p);
-          if (0 !== h.length) {
-            for (var s = 0, l = h.length;s < l;s++) {
-              for (var d = h[s], k = new c(d, q++), u = 0, t = d.length;u < t;u++) {
-                var D = d[u];
-                if (D.level === p.level + 1 && !D.loop) {
-                  D.loop = k;
-                  k.head.set(D.bid);
-                  for (var B = D.preds, E = 0, y = B.length;E < y;E++) {
-                    k.body.get(B[E].bid) && D.npreds--;
-                  }
-                  k.npreds += D.npreds;
-                }
-              }
-              u = 0;
-              for (t = d.length;u < t;u++) {
-                D = d[u], D.level === p.level + 1 && (D.npreds = k.npreds);
+        }), c = 0, h = n.length - 1;0 <= h;h--) {
+          var m = n[h], p = a(m);
+          if (0 !== p.length) {
+            for (var s = 0, d = p.length;s < d;s++) {
+              for (var l = p[s], k = new f(l, c++), t = 0, u = l.length;t < u;t++) {
+                var y = l[t];
+                if (y.level === m.level + 1 && !y.loop) {
+                  y.loop = k;
+                  k.head.set(y.bid);
+                  for (var L = y.preds, A = 0, z = L.length;A < z;A++) {
+                    k.body.get(L[A].bid) && y.npreds--;
+                  }
+                  k.npreds += y.npreds;
+                }
+              }
+              t = 0;
+              for (u = l.length;t < u;t++) {
+                y = l[t], y.level === m.level + 1 && (y.npreds = k.npreds);
               }
               k.head.recount();
             }
@@ -9215,15 +9328,15 @@
       };
       return c;
     }();
-    k.Analysis = p;
+    k.Analysis = s;
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 var Bytecode = Shumway.AVM2.Bytecode, Analysis = Shumway.AVM2.Analysis;
 (function(d) {
   (function(k) {
-    var a = d.Options.Option, r = d.Options.OptionSet, v = d.Settings.shumwayOptions.register(new r("AVM2"));
+    var a = d.Options.Option, q = d.Options.OptionSet, v = d.Settings.shumwayOptions.register(new q("AVM2"));
     (function(d) {
-      var k = v.register(new r("Runtime"));
+      var k = v.register(new q("Runtime"));
       d.traceExecution = k.register(new a("tx", "traceExecution", "number", 0, "trace script execution", {choices:{off:0, normal:2, verbose:3}}));
       d.traceCallExecution = k.register(new a("txc", "traceCallExecution", "number", 0, "trace call execution", {choices:{off:0, normal:1, verbose:2}}));
       d.traceFunctions = k.register(new a("t", "traceFunctions", "number", 0, "trace functions", {choices:{off:0, compiled:1, "compiled & abc":2}}));
@@ -9239,14 +9352,16 @@
       d[d.COMPILE = 2] = "COMPILE";
     })(k.Runtime || (k.Runtime = {}));
     (function(d) {
-      d.options = v.register(new r("Compiler"));
+      d.options = v.register(new q("Compiler"));
       d.traceLevel = d.options.register(new a("tc4", "tc4", "number", 0, "Compiler Trace Level"));
       d.breakFilter = d.options.register(new a("", "break", "string", "", "Set a break point at methods whose qualified name matches this string pattern."));
       d.compileFilter = d.options.register(new a("", "compile", "string", "", "Only compile methods whose qualified name matches this string pattern."));
-      d.enableDirtyLocals = d.options.register(new a("dl", "dirtyLocals", "boolean", !0, "Performe dirty local analysis to minimise PHI nodes."));
+      d.enableDirtyLocals = d.options.register(new a("dl", "dirtyLocals", "boolean", !0, "Perform dirty local analysis to minimise PHI nodes."));
+      d.useBaseline = d.options.register(new a("bl", "useBaseline", "boolean", !1, "Use baseline instead of optimizing compiler."));
+      d.baselineDebugLevel = d.options.register(new a("bl-dbg", "baselineDebugLevel", "number", 0, "Level of trace and code debug output in baseline compiler.", {choices:{off:0, normal:1, verbose:2}}));
     })(k.Compiler || (k.Compiler = {}));
     (function(d) {
-      d.options = v.register(new r("Verifier"));
+      d.options = v.register(new q("Verifier"));
       d.enabled = d.options.register(new a("verifier", "verifier", "boolean", !0, "Enable verifier."));
       d.traceLevel = d.options.register(new a("tv", "tv", "number", 0, "Verifier Trace Level"));
     })(k.Verifier || (k.Verifier = {}));
@@ -9256,32 +9371,32 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(b) {
+      function q(b) {
         var e = this.resolutionMap[b.runtimeId];
         if (e) {
           return e;
         }
-        var e = this.resolutionMap[b.runtimeId] = d.ObjectUtilities.createMap(), f = this.bindings, c;
-        for (c in f.map) {
-          var g = c, n = f.map[c].trait;
-          if (n.isGetter() || n.isSetter()) {
-            g = g.substring(a.Binding.KEY_PREFIX_LENGTH);
+        var e = this.resolutionMap[b.runtimeId] = d.ObjectUtilities.createMap(), f = this.bindings, g;
+        for (g in f.map) {
+          var n = g, c = f.map[g].trait;
+          if (c.isGetter() || c.isSetter()) {
+            n = n.substring(a.Binding.KEY_PREFIX_LENGTH);
           }
-          g = W.fromQualifiedName(g);
-          g.getNamespace().inNamespaceSet(b) && (e[g.getName()] = W.getQualifiedName(n.name));
+          n = O.fromQualifiedName(n);
+          n.getNamespace().inNamespaceSet(b) && (e[n.getName()] = O.getQualifiedName(c.name));
         }
         return e;
       }
       function v(b, a, e) {
-        ta(a) ? a = String(Q(a)) : "object" === typeof a && (a = String(a));
-        return d.isNumeric(a) ? d.toNumber(a) : b ? 1 < b.length ? (b = this.getNamespaceResolutionMap(b)[a]) ? b : W.getPublicQualifiedName(a) : W.qualifyName(b[0], a) : W.getPublicQualifiedName(a);
+        sa(a) ? a = String(J(a)) : "object" === typeof a && (a = String(a));
+        return d.isNumeric(a) ? d.toNumber(a) : b ? 1 < b.length ? (b = this.getNamespaceResolutionMap(b)[a]) ? b : O.getPublicQualifiedName(a) : O.qualifyName(b[0], a) : O.getPublicQualifiedName(a);
       }
-      function u(b) {
+      function t(b) {
         return this.asGetProperty(void 0, b, 0);
       }
-      function t(b, a, e) {
+      function u(b, a, e) {
         b = this.resolveMultinameProperty(b, a, e);
-        return this.asGetNumericProperty && W.isNumeric(b) ? this.asGetNumericProperty(b) : this[b];
+        return this.asGetNumericProperty && O.isNumeric(b) ? this.asGetNumericProperty(b) : this[b];
       }
       function l(b) {
         return this[b];
@@ -9294,66 +9409,63 @@
       function h(b, a) {
         return this.asSetProperty(void 0, b, 0, a);
       }
-      function p(b, e) {
-        e === W.VALUE_OF ? (ha(b, "original_valueOf", b.valueOf), b.valueOf = a.forwardValueOf) : e === W.TO_STRING && (ha(b, "original_toString", b.toString), b.toString = a.forwardToString);
-      }
-      function s(b, a, e, f) {
+      function p(b, a, e, f) {
         "object" === typeof a && (a = String(a));
         b = this.resolveMultinameProperty(b, a, e);
-        if (this.asSetNumericProperty && W.isNumeric(b)) {
+        if (this.asSetNumericProperty && O.isNumeric(b)) {
           return this.asSetNumericProperty(b, f);
         }
         (a = this.asSlots.byQN[b]) && (a = a.type) && a.coerce && (f = a.coerce(f));
-        p(this, b);
         this[b] = f;
       }
-      function m(b, a) {
+      function s(b, a) {
         return this.asDefineProperty(void 0, b, 0, a);
       }
-      function g(b, a, e, f) {
+      function m(b, a, e, f) {
         "object" === typeof a && (a = String(a));
         b = this.resolveMultinameProperty(b, a, e);
         Object.defineProperty(this, b, f);
       }
-      function f(b, a, e) {
+      function g(b, a, e) {
         "object" === typeof a && (a = String(a));
         b = this.resolveMultinameProperty(b, a, e);
         return Object.getOwnPropertyDescriptor(this, b);
       }
-      function b(b, a) {
+      function f(b, a) {
         return this.asCallProperty(void 0, b, 0, !1, a);
       }
-      function e(b, a, e, f, c) {
+      function b(b, a, e, f, g) {
         f = f ? null : this;
         b = this.resolveMultinameProperty(b, a, e);
-        this.asGetNumericProperty && W.isNumeric(b) ? (b = this.asGetNumericProperty(b), c = b.asApply(f, c)) : (a = this.asOpenMethods, c = f && a && a[b] ? a[b].apply(f, c) : this[b].asApply(f, c));
-        return c;
+        this.asGetNumericProperty && O.isNumeric(b) ? (b = this.asGetNumericProperty(b), g = b.asApply(f, g)) : (a = this.asOpenMethods, g = f && a && a[b] ? a[b].apply(f, g) : this[b].asApply(f, g));
+        return g;
       }
-      function q(b, a, e, f, c) {
+      function e(b, a, e, f, g) {
         b = b.object.baseClass;
         a = b.traitsPrototype.resolveMultinameProperty(a, e, f);
-        return b.traitsPrototype.asOpenMethods[a].apply(this, c);
+        return b.traitsPrototype.asOpenMethods[a].apply(this, g);
       }
-      function n(b, e, f, c, g) {
+      function n(b, e, f, g, n) {
         b = b.object.baseClass;
-        var n = b.traitsPrototype.resolveMultinameProperty(e, f, c);
-        this.asSlots.byQN[n] ? this.asSetProperty(e, f, c, g) : b.traitsPrototype[a.VM_OPEN_SET_METHOD_PREFIX + n].call(this, g);
+        var c = b.traitsPrototype.resolveMultinameProperty(e, f, g);
+        this.asSlots.byQN[c] ? this.asSetProperty(e, f, g, n) : b.traitsPrototype[a.VM_OPEN_SET_METHOD_PREFIX + c].call(this, n);
       }
-      function x(b, e, f, c) {
+      function r(b, e, f, g) {
         b = b.object.baseClass;
-        var g = b.traitsPrototype.resolveMultinameProperty(e, f, c);
-        return this.asSlots.byQN[g] ? this.asGetProperty(e, f, c) : b.traitsPrototype[a.VM_OPEN_GET_METHOD_PREFIX + g].call(this);
+        var n = b.traitsPrototype.resolveMultinameProperty(e, f, g);
+        e = this.asSlots.byQN[n] ? this.asGetProperty(e, f, g) : (e = b.traitsPrototype[a.VM_OPEN_GET_METHOD_PREFIX + n]) ? e.call(this) : b.traitsPrototype[a.VM_OPEN_METHOD_PREFIX + n];
+        return e;
       }
-      function L(b, a) {
+      function x(b, a) {
         if (b.classInfo) {
-          var e = W.getQualifiedName(b.classInfo.instanceInfo.name);
-          if (e === W.String) {
+          var e = O.getQualifiedName(b.classInfo.instanceInfo.name);
+          if (e === O.String) {
             return String.apply(null, a);
           }
-          if (e === W.Boolean) {
+          if (e === O.Boolean) {
             return Boolean.apply(null, a);
           }
-          if (e === W.Number) {
+          if (e === O.Number) {
             return Number.apply(null, a);
           }
         }
@@ -9382,44 +9494,44 @@
           case 10:
             return new e(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9]);
         }
-        for (var f = [], c = 0;c < a.length;c++) {
-          f[c + 1] = a[c];
+        for (var f = [], g = 0;g < a.length;g++) {
+          f[g + 1] = a[g];
         }
         return new (Function.bind.apply(e, f));
       }
-      function A(b, e, f, c) {
+      function H(b, e, f, g) {
         b = this.asGetProperty(b, e, f);
-        a.traceCallExecution.value && a.callWriter.enter("construct " + e + "(" + (c ? Ba(c) : "") + ") #" + ea.count(e));
-        e = L(b, c);
-        0 < a.traceCallExecution.value && a.callWriter.leave("return " + Ca(e));
+        a.traceCallExecution.value && a.callWriter.enter("construct " + e + "(" + (g ? Ba(g) : "") + ") #" + da.count(e));
+        e = x(b, g);
+        0 < a.traceCallExecution.value && a.callWriter.leave("return " + Ha(e));
         return e;
       }
-      function H(b, a, e) {
+      function C(b, a, e) {
         return this.resolveMultinameProperty(b, a, e) in this;
       }
-      function K(b, a, e) {
+      function F(b, a, e) {
         b = this.resolveMultinameProperty(b, a, e);
-        return pa(this, b) || 0 <= this.asBindings.indexOf(b);
+        return this.asBindings[b] || na(this, b);
       }
-      function F(b, a, e) {
+      function K(b, a, e) {
         b = this.resolveMultinameProperty(b, a, e);
-        return Da(this, b);
+        return Ca(this, b);
       }
-      function J(b, a, e) {
+      function E(b, a, e) {
         return this.asHasTraitProperty(b, a, e) ? !1 : delete this[this.resolveMultinameProperty(b, a, e)];
       }
-      function M(b, a, e) {
+      function Q(b, a, e) {
         b = this.resolveMultinameProperty(b, a, e);
-        return 0 <= this.asBindings.indexOf(b);
+        return this.asBindings[b];
       }
-      function D(b) {
+      function N(b) {
         return this[b];
       }
       function B(b, a) {
         this[b] = a;
       }
-      function E(b) {
-        0 === b && ha(this, "asEnumerableKeys", this.asGetEnumerableKeys());
+      function y(b) {
+        0 === b && fa(this, "asEnumerableKeys", this.asGetEnumerableKeys());
         for (var a = this.asEnumerableKeys;b < a.length;) {
           if (this.asHasProperty(void 0, a[b], 0)) {
             return b + 1;
@@ -9428,17 +9540,17 @@
         }
         return 0;
       }
-      function y(b) {
+      function L(b) {
         return this.asEnumerableKeys[b - 1];
       }
-      function z(b) {
+      function A(b) {
         return this.asGetPublicProperty(this.asNextName(b));
       }
-      function G(b) {
-        if (ta(b.object)) {
+      function z(b) {
+        if (sa(b.object)) {
           b.index = 0, b.object = null;
         } else {
-          var a = Ea(b.object), e = a.asNextNameIndex(b.index);
+          var a = wa(b.object), e = a.asNextNameIndex(b.index);
           if (0 < e) {
             b.index = e, b.object = a;
           } else {
@@ -9459,110 +9571,113 @@
           }
         }
       }
-      function C() {
+      function G() {
         if (this instanceof String || this instanceof Number) {
           return[];
         }
         for (var b = Object.keys(this), a = [], e = 0;e < b.length;e++) {
           var f = b[e];
-          d.isNumeric(f) ? a.push(f) : (f = W.stripPublicQualifier(f), void 0 !== f && a.push(f));
+          d.isNumeric(f) ? a.push(f) : (f = O.stripPublicQualifier(f), void 0 !== f && a.push(f));
         }
         return a;
       }
       function I(b, a) {
-        b || P("TypeError", k.Errors.NullPointerError, a);
+        b || D("TypeError", k.Errors.NullPointerError, a);
       }
-      function P(b, e, f, c, g, n) {
+      function D(b, e, f, g, n, c) {
         e.fqn && (b = e.fqn);
-        var q = d.AVM2.formatErrorMessage.apply(null, Array.prototype.slice.call(arguments, 1)), p = a.AVM2.currentDomain(), h = e.code;
-        throw new (p.getClass(b).instanceConstructor)(q, h);
+        var r = d.AVM2.formatErrorMessage.apply(null, Array.prototype.slice.call(arguments, 1)), h = a.AVM2.currentDomain(), m = e.code;
+        throw new (h.getClass(b).instanceConstructor)(r, m);
       }
-      function T(b) {
+      function R(b) {
         return b instanceof k.AS.ASXML || b instanceof k.AS.ASXMLList || b instanceof k.AS.ASQName || b instanceof k.AS.ASNamespace;
       }
-      function O(b, a) {
+      function T(b, a) {
         return b.coerce(a);
       }
-      function Q(b) {
-        return "string" === typeof b ? b : void 0 == b ? null : b + "";
+      function J(b) {
+        return "string" === typeof b ? b : void 0 == b ? null : b.toString();
       }
-      function S(b) {
+      function P(b) {
         return b instanceof Boolean ? b.valueOf() : void 0 == b ? null : "string" === typeof b || "number" === typeof b ? b : Object(b);
       }
-      function V(b, a) {
+      function S(b, a) {
         return String(b).localeCompare(String(a));
       }
-      function aa(b) {
+      function W(b) {
         return b instanceof k.AS.ASXML || b instanceof k.AS.ASXMLList;
       }
-      function $(p) {
+      function ba(d) {
         "Object Number Boolean String Array Date RegExp".split(" ").forEach(function(b) {
-          Fa(p[b].prototype, a.VM_NATIVE_PROTOTYPE_FLAG, !0);
+          Da(d[b].prototype, a.VM_NATIVE_PROTOTYPE_FLAG, !0);
         });
-        ha(p.Object.prototype, "getNamespaceResolutionMap", r);
-        ha(p.Object.prototype, "resolveMultinameProperty", v);
-        ha(p.Object.prototype, "asGetProperty", t);
-        ha(p.Object.prototype, "asGetPublicProperty", u);
-        ha(p.Object.prototype, "asGetResolvedStringProperty", l);
-        ha(p.Object.prototype, "asSetProperty", s);
-        ha(p.Object.prototype, "asSetPublicProperty", h);
-        ha(p.Object.prototype, "asDefineProperty", g);
-        ha(p.Object.prototype, "asDefinePublicProperty", m);
-        ha(p.Object.prototype, "asGetPropertyDescriptor", f);
-        ha(p.Object.prototype, "asCallProperty", e);
-        ha(p.Object.prototype, "asCallSuper", q);
-        ha(p.Object.prototype, "asGetSuper", x);
-        ha(p.Object.prototype, "asSetSuper", n);
-        ha(p.Object.prototype, "asCallPublicProperty", b);
-        ha(p.Object.prototype, "asCallResolvedStringProperty", c);
-        ha(p.Object.prototype, "asConstructProperty", A);
-        ha(p.Object.prototype, "asHasProperty", H);
-        ha(p.Object.prototype, "asHasPropertyInternal", H);
-        ha(p.Object.prototype, "asHasOwnProperty", K);
-        ha(p.Object.prototype, "asPropertyIsEnumerable", F);
-        ha(p.Object.prototype, "asHasTraitProperty", M);
-        ha(p.Object.prototype, "asDeleteProperty", J);
-        ha(p.Object.prototype, "asHasNext2", G);
-        ha(p.Object.prototype, "asNextName", y);
-        ha(p.Object.prototype, "asNextValue", z);
-        ha(p.Object.prototype, "asNextNameIndex", E);
-        ha(p.Object.prototype, "asGetEnumerableKeys", C);
-        ha(p.Function.prototype, "asCall", p.Function.prototype.call);
-        ha(p.Function.prototype, "asApply", p.Function.prototype.apply);
+        fa(d.Object.prototype, "getNamespaceResolutionMap", q);
+        fa(d.Object.prototype, "resolveMultinameProperty", v);
+        fa(d.Object.prototype, "asGetProperty", u);
+        fa(d.Object.prototype, "asGetPublicProperty", t);
+        fa(d.Object.prototype, "asGetResolvedStringProperty", l);
+        fa(d.Object.prototype, "asSetProperty", p);
+        fa(d.Object.prototype, "asSetPublicProperty", h);
+        fa(d.Object.prototype, "asDefineProperty", m);
+        fa(d.Object.prototype, "asDefinePublicProperty", s);
+        fa(d.Object.prototype, "asGetPropertyDescriptor", g);
+        fa(d.Object.prototype, "asCallProperty", b);
+        fa(d.Object.prototype, "asCallSuper", e);
+        fa(d.Object.prototype, "asGetSuper", r);
+        fa(d.Object.prototype, "asSetSuper", n);
+        fa(d.Object.prototype, "asCallPublicProperty", f);
+        fa(d.Object.prototype, "asCallResolvedStringProperty", c);
+        fa(d.Object.prototype, "asConstructProperty", H);
+        fa(d.Object.prototype, "asHasProperty", C);
+        fa(d.Object.prototype, "asHasPropertyInternal", C);
+        fa(d.Object.prototype, "asHasOwnProperty", F);
+        fa(d.Object.prototype, "asPropertyIsEnumerable", K);
+        fa(d.Object.prototype, "asHasTraitProperty", Q);
+        fa(d.Object.prototype, "asDeleteProperty", E);
+        fa(d.Object.prototype, "asHasNext2", z);
+        fa(d.Object.prototype, "asNextName", L);
+        fa(d.Object.prototype, "asNextValue", A);
+        fa(d.Object.prototype, "asNextNameIndex", y);
+        fa(d.Object.prototype, "asGetEnumerableKeys", G);
+        fa(d.Function.prototype, "asCall", d.Function.prototype.call);
+        fa(d.Function.prototype, "asApply", d.Function.prototype.apply);
         "Array Object Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array".split(" ").forEach(function(b) {
-          b in p ? (ha(p[b].prototype, "asGetNumericProperty", D), ha(p[b].prototype, "asSetNumericProperty", B)) : console.warn(b + " was not found in globals");
+          b in d ? (fa(d[b].prototype, "asGetNumericProperty", N), fa(d[b].prototype, "asSetNumericProperty", B)) : console.warn(b + " was not found in globals");
         });
-        p.Array.prototype.asGetProperty = function(b, a, e) {
-          return "number" === typeof a ? this[a] : t.call(this, b, a, e);
+        d.Array.prototype.asGetProperty = function(b, a, e) {
+          return "number" === typeof a ? this[a] : u.call(this, b, a, e);
         };
-        p.Array.prototype.asSetProperty = function(b, a, e, f) {
+        d.Array.prototype.asSetProperty = function(b, a, e, f) {
           if ("number" === typeof a) {
             this[a] = f;
           } else {
-            return s.call(this, b, a, e, f);
+            return p.call(this, b, a, e, f);
           }
         };
       }
       function w(b, e) {
         e && (new a.CatchBindings(new a.Scope(null, this), e)).applyTo(b, this);
       }
-      function U(b, a) {
+      function X(b, a, e) {
         void 0 === a && (a = 0);
-        return Array.prototype.slice.call(b, a);
+        void 0 === e && (e = void 0);
+        b = Array.prototype.slice.call(b, a);
+        e && b.asDefinePublicProperty("callee", {value:e, configurable:!0});
+        return b;
       }
-      function ba(b) {
+      function U(b) {
         return!b.hasBody || b.hasExceptions() && !a.compilerEnableExceptions.value || b.hasSetsDxns() || b.code.length > a.compilerMaximumMethodSize.value ? !1 : !0;
       }
-      function R(b) {
-        return!ba(b) || b.isClassInitializer || b.isScriptInitializer ? !1 : !0;
+      function $(b) {
+        return!U(b) || b.isClassInitializer || b.isScriptInitializer ? !1 : !0;
       }
-      function N(b) {
+      function Y(b) {
         if (b.hasExceptions()) {
           return!1;
         }
         b = b.holder;
-        b instanceof Y && (b = b.instanceInfo);
-        if (b instanceof la) {
+        b instanceof V && (b = b.instanceInfo);
+        if (b instanceof ja) {
           switch(b.name.namespaces[0].uri) {
             case "flash.geom":
             ;
@@ -9576,7 +9691,7 @@
         }
         return!1;
       }
-      function Z(b) {
+      function M(b) {
         if (a.codeCaching.value) {
           var e = a.CODE_CACHE[b.abc.hash];
           if (e) {
@@ -9591,30 +9706,30 @@
           }
         }
       }
-      function fa(b) {
-        var a = b.name ? W.getFullQualifiedName(b.name) : "fn" + xa;
+      function Z(b) {
+        var a = b.name ? O.getFullQualifiedName(b.name) : "fn" + xa;
         if (b.holder) {
           var e = "";
-          b.holder instanceof Y ? e = "static$" + b.holder.instanceInfo.name.getName() : b.holder instanceof la ? e = b.holder.name.getName() : b.holder instanceof ma && (e = "script");
-          a = e + "$" + a;
+          b.holder instanceof V ? e = "static$" + b.holder.instanceInfo.name.getName() : b.holder instanceof ja ? e = b.holder.name.getName() : b.holder instanceof la && (e = "script");
+          a = e + a;
         }
         a = d.StringUtilities.escapeString(a);
-        b.verified && (a += "$V");
-        return a;
+        b.isGetter ? a += "_get" : b.isSetter && (a += "_set");
+        return a += "_" + (b.abc.hash >>> 0);
       }
-      function X(b, a, e) {
-        var f = !1, c = b.parameters.map(function(b) {
+      function ca(b, a, e) {
+        var f = !1, g = b.parameters.map(function(b) {
           void 0 !== b.value && (f = !0);
           return b.value;
         });
         e = e ? function(a) {
-          var e = this === jsGlobal ? a.global.object : this, g = U(arguments, 1);
-          f && g.length < c.length && (g = g.concat(c.slice(g.length - c.length)));
-          return d.AVM2.Interpreter.interpretMethod(e, b, a, g);
+          var e = this === jsGlobal ? a.global.object : this, n = X(arguments, 1, arguments.callee);
+          f && n.length < g.length && (n = n.concat(g.slice(n.length - g.length)));
+          return d.AVM2.Interpreter.interpretMethod(e, b, a, n);
         } : function() {
-          var e = this === jsGlobal ? a.global.object : this, g = U(arguments);
-          f && g.length < c.length && (g = g.concat(c.slice(arguments.length - c.length)));
-          return d.AVM2.Interpreter.interpretMethod(e, b, a, g);
+          var e = this === jsGlobal ? a.global.object : this, n = X(arguments, 0, arguments.callee);
+          f && n.length < g.length && (n = n.concat(g.slice(arguments.length - g.length)));
+          return d.AVM2.Interpreter.interpretMethod(e, b, a, n);
         };
         b.hasSetsDxns() && (e = function(b) {
           return function() {
@@ -9629,82 +9744,84 @@
           };
         }(e));
         e.instanceConstructor = e;
-        var g = fa(b);
-        e.displayName = e.debugName = g;
+        var n = Z(b);
+        e.displayName = e.debugName = n;
         e.methodInfo = b;
-        return jsGlobal[g] = e;
+        return jsGlobal[n] = e;
       }
-      function ia(b, a, e, f, c) {
-        c = Z(b);
-        var g;
-        c || (g = k.Compiler.compileMethod(b, a, e));
-        a = fa(b);
-        f || (e = d.AVM2.Compiler.breakFilter.value) && 0 <= a.search(e) && (f = !0);
-        e = g.body;
-        f && (e = "{ debugger; \n" + e + "}");
-        if (!c) {
-          var n = "jsGlobal. " + a + " = function " + a + " (" + g.parameters.join(", ") + ") " + e, n = n + ("//# sourceURL=fun-" + a + ".as")
+      function ga(b, a, e, f, g) {
+        var n;
+        g = Z(b);
+        var c = "mi_" + g;
+        jsGlobal[c] = b;
+        var r = M(b);
+        r || (k.Compiler.useBaseline.value ? (k.enterTimeline("Baseline compile"), n = k.Compiler.baselineCompileMethod(b, a, e, c), n.body = "{\n" + n.body + "\n}", k.leaveTimeline()) : n = k.Compiler.compileMethod(b, a, e));
+        f || (a = d.AVM2.Compiler.breakFilter.value) && 0 <= g.search(a) && (f = !0);
+        a = n.body;
+        f && (a = "{ debugger; \n" + a + "}");
+        if (!r) {
+          var h = "jsGlobal." + g + " = function " + g + " (" + n.parameters.join(", ") + ") " + a, h = h + ("//# sourceURL=fun-" + g + ".as")
         }
-        (new Function("return " + (c || n)))();
-        f = jsGlobal[a];
-        f.debugName = a;
+        (new Function("return " + (r || h)))();
+        f = jsGlobal[g];
+        f.debugName = g;
         f.methodInfo = b;
         return f;
       }
-      function ga(b, e, f, c, g) {
-        void 0 === g && (g = !1);
+      function ha(b, e, f, g, n) {
+        void 0 === n && (n = !1);
         if (b.freeMethod) {
           return f ? a.bindFreeMethodScope(b, e) : b.freeMethod;
         }
-        var n;
-        if ((n = a.checkMethodOverrides(b)) || (n = a.checkCommonMethodPatterns(b))) {
-          return n;
+        var c;
+        if ((c = a.checkMethodOverrides(b)) || (c = a.checkCommonMethodPatterns(b))) {
+          return c;
         }
-        ca(b);
-        1 !== b.abc.applicationDomain.mode && R(b) || N(b) || (g = !0);
-        (n = d.AVM2.Compiler.compileFilter.value) && b.name && 0 > W.getQualifiedName(b.name).search(n) && (g = !0);
-        g ? b.freeMethod = X(b, e, f) : (xa++, b.freeMethod = ia(b, e, f, c, b.isInstanceInitializer));
+        ea(b);
+        1 !== b.abc.applicationDomain.mode && $(b) || Y(b) || (n = !0);
+        (c = d.AVM2.Compiler.compileFilter.value) && b.name && 0 > O.getQualifiedName(b.name).search(c) && (n = !0);
+        n ? b.freeMethod = ca(b, e, f) : (xa++, b.freeMethod = ga(b, e, f, g, b.isInstanceInitializer));
         b.freeMethod.methodInfo = b;
         return f ? a.bindFreeMethodScope(b, e) : b.freeMethod;
       }
-      function ca(b) {
+      function ea(b) {
         if (!b.analysis) {
           b.analysis = new k.Analysis(b);
           b.needsActivation() && (b.activationPrototype = new ya(b), (new a.ActivationBindings(b)).applyTo(b.abc.applicationDomain, b.activationPrototype));
-          for (var e = b.exceptions, f = 0, c = e.length;f < c;f++) {
-            var g = e[f];
-            if (g.varName) {
-              var n = Object.create(na.prototype);
-              n.kind = 0;
-              n.name = g.varName;
-              n.typeName = g.typeName;
-              n.holder = b;
-              g.scopeObject = new w(b.abc.applicationDomain, n);
+          for (var e = b.exceptions, f = 0, g = e.length;f < g;f++) {
+            var n = e[f];
+            if (n.varName) {
+              var c = Object.create(ma.prototype);
+              c.kind = 0;
+              c.name = n.varName;
+              c.typeName = n.typeName;
+              c.holder = b;
+              n.scopeObject = new w(b.abc.applicationDomain, c);
             } else {
-              g.scopeObject = new w(void 0, void 0);
+              n.scopeObject = new w(void 0, void 0);
             }
           }
         }
       }
-      function da(b, a, e) {
-        var f = b.methodInfo, c;
+      function aa(b, a, e) {
+        var f = b.methodInfo, g;
         if (f.isNative()) {
-          if ((a = b.metadata) && a.native ? c = d.AVM2.AS.getNative(a.native.value[0].value) : e && (c = d.AVM2.AS.getMethodOrAccessorNative(b, e)), !c) {
+          if ((a = b.metadata) && a.native ? g = d.AVM2.AS.getNative(a.native.value[0].value) : e && (g = d.AVM2.AS.getMethodOrAccessorNative(b, e)), !g) {
             return function(a) {
               return function() {
-                d.Debug.warning("Calling undefined native method: " + b.kindName() + " " + a.holder.name + "::" + W.getQualifiedName(a.name));
+                d.Debug.warning("Calling undefined native method: " + b.kindName() + " " + a.holder.name + "::" + O.getQualifiedName(a.name));
               };
             }(f);
           }
         } else {
-          c = ga(f, a, !1, !1);
+          g = ha(f, a, !1, !1);
         }
-        return c;
+        return g;
       }
       a.sealConstTraits = !1;
       a.useAsAdd = !0;
-      var ea = new d.Metrics.Counter(!0), W = d.AVM2.ABC.Multiname, ka = d.AVM2.ABC.Namespace, Y = d.AVM2.ABC.ClassInfo, la = d.AVM2.ABC.InstanceInfo, ma = d.AVM2.ABC.ScriptInfo, na = d.AVM2.ABC.Trait, sa = d.IndentingWriter, pa = d.ObjectUtilities.hasOwnProperty, Da = d.ObjectUtilities.propertyIsEnumerable, ta = d.isNullOrUndefined, Ea = d.ObjectUtilities.boxValue, ua = d.ObjectUtilities.defineNonEnumerableGetterOrSetter, ha = d.ObjectUtilities.defineNonEnumerableProperty, Fa = d.ObjectUtilities.defineReadOnlyProperty, 
-      Ia = d.ObjectUtilities.defineNonEnumerableGetter, Ca = d.StringUtilities.toSafeString, Ba = d.StringUtilities.toSafeArrayString;
+      var da = new d.Metrics.Counter(!0), O = d.AVM2.ABC.Multiname, ka = d.AVM2.ABC.Namespace, V = d.AVM2.ABC.ClassInfo, ja = d.AVM2.ABC.InstanceInfo, la = d.AVM2.ABC.ScriptInfo, ma = d.AVM2.ABC.Trait, ra = d.IndentingWriter, na = d.ObjectUtilities.hasOwnProperty, Ca = d.ObjectUtilities.propertyIsEnumerable, sa = d.isNullOrUndefined, wa = d.ObjectUtilities.boxValue, ta = d.ObjectUtilities.defineNonEnumerableGetterOrSetter, fa = d.ObjectUtilities.defineNonEnumerableProperty, Da = d.ObjectUtilities.defineReadOnlyProperty, 
+      Ea = d.ObjectUtilities.defineNonEnumerableGetter, Ha = d.StringUtilities.toSafeString, Ba = d.StringUtilities.toSafeArrayString;
       a.VM_SLOTS = "asSlots";
       a.VM_LENGTH = "asLength";
       a.VM_BINDINGS = "asBindings";
@@ -9723,65 +9840,63 @@
       a.traitsWriter = null;
       a.callWriter = null;
       lazyInitializer(d.AVM2.Runtime, function() {
-        return new sa;
+        return new ra;
       });
       a.patch = function(b, e) {
         for (var f = 0;f < b.length;f++) {
-          var c = b[f];
+          var g = b[f];
           if (3 <= a.traceExecution.value) {
-            var g = "Patching: ";
-            c.name ? g += c.name : c.get ? g += "get " + c.get : c.set && (g += "set " + c.set);
-            a.traitsWriter && a.traitsWriter.redLn(g);
+            var n = "Patching: ";
+            g.name ? n += g.name : g.get ? n += "get " + g.get : g.set && (n += "set " + g.set);
+            a.traitsWriter && a.traitsWriter.redLn(n);
           }
-          c.get ? ua(c.object, c.get, e, !0) : c.set ? ua(c.object, c.set, e, !1) : ha(c.object, c.name, e);
+          g.get ? ta(g.object, g.get, e, !0) : g.set ? ta(g.object, g.set, e, !1) : fa(g.object, g.name, e);
         }
       };
-      a.applyMethodTrait = function(b, e, f, c) {
-        var g = f.trait, n = g.isMethod(), q = g.isGetter(), h = n ? a.VM_OPEN_METHOD_PREFIX : q ? a.VM_OPEN_GET_METHOD_PREFIX : a.VM_OPEN_SET_METHOD_PREFIX, m = g.methodInfo.cachedMethodOrTrampoline, s;
-        m ? m.isTrampoline && (s = m.patchTargets) : (g.methodInfo.isNative() ? m = da(g, f.scope, f.natives) : (s = [], m = a.makeTrampoline(g, f.scope, f.natives, s, n ? g.methodInfo.parameters.length : 0, String(g.name))), g.methodInfo.cachedMethodOrTrampoline = m);
-        s && (s.push({object:e, name:h + b}), n ? s.push({object:e.asOpenMethods, name:b}) : (f = {object:e}, q ? f.get = b : f.set = b, s.push(f)));
-        ha(e, h + b, m);
-        n ? (e.asOpenMethods[b] = m, c ? (c = g.methodInfo.cachedMemoizer, c || (m = {value:m}, s && s.push({object:m, name:"value"}), c = a.makeMemoizer(b, m), g.methodInfo.cachedMemoizer = c), Ia(e, b, c), p(e, b)) : ha(e, b, m)) : (ua(e, b, m, q), c && ha(e, h + b, m));
+      a.applyMethodTrait = function(b, e, f, g) {
+        var n = f.trait, c = n.isMethod(), r = n.isGetter(), h = c ? a.VM_OPEN_METHOD_PREFIX : r ? a.VM_OPEN_GET_METHOD_PREFIX : a.VM_OPEN_SET_METHOD_PREFIX, m = n.methodInfo.cachedMethodOrTrampoline, p;
+        m ? m.isTrampoline && (p = m.patchTargets) : (n.methodInfo.isNative() ? m = aa(n, f.scope, f.natives) : (p = [], m = a.makeTrampoline(n, f.scope, f.natives, p, c ? n.methodInfo.parameters.length : 0, String(n.name))), n.methodInfo.cachedMethodOrTrampoline = m);
+        p && (p.push({object:e, name:h + b}), c ? p.push({object:e.asOpenMethods, name:b}) : (f = {object:e}, r ? f.get = b : f.set = b, p.push(f)));
+        fa(e, h + b, m);
+        c ? (e.asOpenMethods[b] = m, g ? (g = n.methodInfo.cachedMemoizer, g || (m = {value:m}, p && p.push({object:m, name:"value"}), g = a.makeMemoizer(b, m), n.methodInfo.cachedMemoizer = g), Ea(e, b, g)) : fa(e, b, m)) : ta(e, b, m, r);
       };
-      a.getNamespaceResolutionMap = r;
+      a.getNamespaceResolutionMap = q;
       a.resolveMultinameProperty = v;
-      a.asGetPublicProperty = u;
-      a.asGetProperty = t;
+      a.asGetPublicProperty = t;
+      a.asGetProperty = u;
       a.asGetResolvedStringProperty = l;
       a.asCallResolvedStringProperty = c;
-      a.asGetResolvedStringPropertyFallback = function(b) {
-        b = W.getNameFromPublicQualifiedName(b);
-        return this.asGetProperty([ka.PUBLIC], b, 0);
-      };
       a.asSetPublicProperty = h;
-      a.forwardValueOf = new Function("", "return this." + W.VALUE_OF + ".apply(this, arguments)//# sourceURL=forward-valueOf.as");
-      a.forwardToString = new Function("", "return this." + W.TO_STRING + ".apply(this, arguments)//# sourceURL=forward-toString.as");
-      a.asSetProperty = s;
-      a.asDefinePublicProperty = m;
-      a.asDefineProperty = g;
-      a.asGetPropertyDescriptor = f;
-      a.asCallPublicProperty = b;
-      a.asCallProperty = e;
-      a.asCallSuper = q;
+      a.asToString = function() {
+        var b = wa(this);
+        return b instanceof k.AS.ASClass ? d.StringUtilities.concat3("[class ", b.classInfo.instanceInfo.name.name, "]") : d.StringUtilities.concat3("[object ", b.class.classInfo.instanceInfo.name.name, "]");
+      };
+      a.asSetProperty = p;
+      a.asDefinePublicProperty = s;
+      a.asDefineProperty = m;
+      a.asGetPropertyDescriptor = g;
+      a.asCallPublicProperty = f;
+      a.asCallProperty = b;
+      a.asCallSuper = e;
       a.asSetSuper = n;
-      a.asGetSuper = x;
-      a.construct = L;
-      a.asConstructProperty = A;
-      a.asHasProperty = H;
-      a.asHasOwnProperty = K;
-      a.asPropertyIsEnumerable = F;
-      a.asDeleteProperty = J;
-      a.asHasTraitProperty = M;
-      a.asGetNumericProperty = D;
+      a.asGetSuper = r;
+      a.construct = x;
+      a.asConstructProperty = H;
+      a.asHasProperty = C;
+      a.asHasOwnProperty = F;
+      a.asPropertyIsEnumerable = K;
+      a.asDeleteProperty = E;
+      a.asHasTraitProperty = Q;
+      a.asGetNumericProperty = N;
       a.asSetNumericProperty = B;
       a.asGetDescendants = function(b, a, e) {
         d.Debug.notImplemented("asGetDescendants");
       };
-      a.asNextNameIndex = E;
-      a.asNextName = y;
-      a.asNextValue = z;
-      a.asHasNext2 = G;
-      a.asGetEnumerableKeys = C;
+      a.asNextNameIndex = y;
+      a.asNextName = L;
+      a.asNextValue = A;
+      a.asHasNext2 = z;
+      a.asGetEnumerableKeys = G;
       a.asTypeOf = function(b) {
         if (b) {
           if (b.constructor === String) {
@@ -9805,9 +9920,9 @@
       a.publicizeProperties = function(b) {
         for (var a = Object.keys(b), e = 0;e < a.length;e++) {
           var f = a[e];
-          if (!W.isPublicQualifiedName(f)) {
-            var c = b[f];
-            b[W.getPublicQualifiedName(f)] = c;
+          if (!O.isPublicQualifiedName(f)) {
+            var g = b[f];
+            b[O.getPublicQualifiedName(f)] = g;
             delete b[f];
           }
         }
@@ -9823,17 +9938,17 @@
         }
       };
       a.asCheckVectorSetNumericProperty = function(b, a, e) {
-        (0 > b || b > a || b === a && e || !d.isNumeric(b)) && P("RangeError", k.Errors.OutOfRangeError, b, a);
+        (0 > b || b > a || b === a && e || !d.isNumeric(b)) && D("RangeError", k.Errors.OutOfRangeError, b, a);
       };
       a.asCheckVectorGetNumericProperty = function(b, a) {
-        (0 > b || b >= a || !d.isNumeric(b)) && P("RangeError", k.Errors.OutOfRangeError, b, a);
+        (0 > b || b >= a || !d.isNumeric(b)) && D("RangeError", k.Errors.OutOfRangeError, b, a);
       };
       a.checkNullParameter = I;
       a.checkParameterType = function(b, a, e) {
         I(b, a);
-        e.isType(b) || P("TypeError", k.Errors.CheckTypeFailedError, b, e.classInfo.instanceInfo.name.getOriginalName());
+        e.isType(b) || D("TypeError", k.Errors.CheckTypeFailedError, b, e.classInfo.instanceInfo.name.getOriginalName());
       };
-      a.throwError = P;
+      a.throwError = D;
       a.translateError = function(b, a) {
         if (a instanceof Error) {
           var e = b.getClass(a.name);
@@ -9860,27 +9975,27 @@
         return k.AS.escapeElementValue(b);
       };
       a.asEquals = function(b, a) {
-        return T(b) ? b.equals(a) : T(a) ? a.equals(b) : b == a;
+        return R(b) ? b.equals(a) : R(a) ? a.equals(b) : b == a;
       };
       a.asCoerceByMultiname = function(b, a, e) {
-        switch(W.getQualifiedName(a)) {
-          case W.Int:
+        switch(O.getQualifiedName(a)) {
+          case O.Int:
             return e | 0;
-          case W.Uint:
+          case O.Uint:
             return e >>> 0;
-          case W.String:
-            return Q(e);
-          case W.Number:
+          case O.String:
+            return J(e);
+          case O.Number:
             return+e;
-          case W.Boolean:
+          case O.Boolean:
             return!!e;
-          case W.Object:
-            return S(e);
+          case O.Object:
+            return P(e);
         }
-        return O(b.abc.applicationDomain.getType(a), e);
+        return T(b.abc.applicationDomain.getType(a), e);
       };
-      a.asCoerce = O;
-      a.asCoerceString = Q;
+      a.asCoerce = T;
+      a.asCoerceString = J;
       a.asCoerceInt = function(b) {
         return b | 0;
       };
@@ -9893,33 +10008,33 @@
       a.asCoerceBoolean = function(b) {
         return!!b;
       };
-      a.asCoerceObject = S;
-      a.asDefaultCompareFunction = V;
+      a.asCoerceObject = P;
+      a.asDefaultCompareFunction = S;
       a.asCompare = function(b, a, e, f) {
-        var c = 0;
-        f || (f = V);
+        var g = 0;
+        f || (f = S);
         e & 1 && (b = String(b).toLowerCase(), a = String(a).toLowerCase());
-        e & 16 ? (b = d.toNumber(b), a = d.toNumber(a), c = b < a ? -1 : b > a ? 1 : 0) : c = f(b, a);
-        e & 2 && (c *= -1);
-        return c;
+        e & 16 ? (b = d.toNumber(b), a = d.toNumber(a), g = b < a ? -1 : b > a ? 1 : 0) : g = f(b, a);
+        e & 2 && (g *= -1);
+        return g;
       };
       a.asAdd = function(b, a) {
-        return "string" === typeof b || "string" === typeof a ? String(b) + String(a) : aa(b) && aa(a) ? d.AVM2.AS.ASXMLList.addXML(b, a) : b + a;
+        return "string" === typeof b || "string" === typeof a ? String(b) + String(a) : W(b) && W(a) ? d.AVM2.AS.ASXMLList.addXML(b, a) : b + a;
       };
       a.getDescendants = function(b, a) {
-        if (!aa(b)) {
+        if (!W(b)) {
           throw "Not XML object in getDescendants";
         }
         return b.descendants(a);
       };
       a.checkFilter = function(b) {
-        if (!b.class || !aa(b)) {
+        if (!b.class || !W(b)) {
           throw "TypeError operand of childFilter not of XML type";
         }
         return b;
       };
-      a.initializeGlobalObject = $;
-      $(jsGlobal);
+      a.initializeGlobalObject = ba;
+      ba(jsGlobal);
       a.nameInTraits = function(b, e) {
         if (b.hasOwnProperty(a.VM_BINDINGS) && b.hasOwnProperty(e)) {
           return!0;
@@ -9928,7 +10043,7 @@
         return f.hasOwnProperty(a.VM_BINDINGS) && f.hasOwnProperty(e);
       };
       a.CatchScopeObject = w;
-      var qa = function() {
+      var pa = function() {
         function b(e) {
           this.scriptInfo = e;
           e.global = this;
@@ -9946,15 +10061,15 @@
           return this.scriptInfo.executing;
         };
         b.prototype.ensureExecuted = function() {
-          d.AVM2.Runtime.ensureScriptIsExecuted(this.scriptInfo);
+          d.AVM2.Runtime.ensureScriptIsExecuted(this.scriptInfo, "external");
         };
         return b;
       }();
-      a.Global = qa;
-      ha(qa.prototype, W.getPublicQualifiedName("toString"), function() {
+      a.Global = pa;
+      fa(pa.prototype, O.getPublicQualifiedName("toString"), function() {
         return this.toString();
       });
-      qa = function() {
+      pa = function() {
         function b(a) {
           this._isLazyInitializer = !0;
           this._target = a;
@@ -9967,19 +10082,19 @@
           if (this._resolved) {
             return this._resolved;
           }
-          if (this._target instanceof ma) {
+          if (this._target instanceof la) {
             var b = this._target;
             a.ensureScriptIsExecuted(b, "Lazy Initializer");
             return this._resolved = b.global;
           }
-          if (this._target instanceof Y) {
+          if (this._target instanceof V) {
             return b = this._target, b.classObject ? this._resolved = b.classObject : this._resolved = b.abc.applicationDomain.getProperty(b.instanceInfo.name, !1, !1);
           }
           d.Debug.notImplemented(String(this._target));
         };
         return b;
       }();
-      a.LazyInitializer = qa;
+      a.LazyInitializer = pa;
       a.forEachPublicProperty = function(b, a, e) {
         if (!b.asBindings) {
           for (var f in b) {
@@ -9990,9 +10105,9 @@
             if (d.isNumeric(f)) {
               a.call(e, f, b[f]);
             } else {
-              if (W.isPublicQualifiedName(f) && 0 > b.asBindings.indexOf(f)) {
-                var c = W.stripPublicQualifier(f);
-                a.call(e, c, b[f]);
+              if (!b.asBindings[f] && O.isPublicQualifiedName(f)) {
+                var g = O.stripPublicQualifier(f);
+                a.call(e, g, b[f]);
               }
             }
           }
@@ -10001,7 +10116,7 @@
       a.wrapJSObject = function(b) {
         var a = Object.create(b), e;
         for (e in b) {
-          Object.defineProperty(a, W.getPublicQualifiedName(e), function(b, a) {
+          Object.defineProperty(a, O.getPublicQualifiedName(e), function(b, a) {
             return{get:function() {
               return b[a];
             }, set:function(e) {
@@ -10014,41 +10129,41 @@
       a.asCreateActivation = function(b) {
         return Object.create(b.activationPrototype);
       };
-      qa = function() {
+      pa = function() {
         function b() {
         }
         b.updateTraits = function(a) {
           for (var e = 0;e < a.length;e++) {
-            var f = a[e], c = f.name.name, f = f.name.getNamespace();
-            f.isDynamic() || (b.hasNonDynamicNamespaces[c] = !0, b.wasResolved[c] && d.Debug.notImplemented("We have to the undo the optimization, " + c + " can now bind to " + f));
+            var f = a[e], g = f.name.name, f = f.name.getNamespace();
+            f.isDynamic() || (b.hasNonDynamicNamespaces[g] = !0, b.wasResolved[g] && d.Debug.notImplemented("We have to the undo the optimization, " + g + " can now bind to " + f));
           }
         };
         b.loadAbc = function(e) {
           if (a.globalMultinameAnalysis.value) {
-            var f = e.scripts, c = e.classes;
+            var f = e.scripts, g = e.classes;
             e = e.methods;
-            for (var g = 0;g < f.length;g++) {
-              b.updateTraits(f[g].traits);
+            for (var n = 0;n < f.length;n++) {
+              b.updateTraits(f[n].traits);
             }
-            for (g = 0;g < c.length;g++) {
-              b.updateTraits(c[g].traits), b.updateTraits(c[g].instanceInfo.traits);
+            for (n = 0;n < g.length;n++) {
+              b.updateTraits(g[n].traits), b.updateTraits(g[n].instanceInfo.traits);
             }
-            for (g = 0;g < e.length;g++) {
-              e[g].traits && b.updateTraits(e[g].traits);
+            for (n = 0;n < e.length;n++) {
+              e[n].traits && b.updateTraits(e[n].traits);
             }
           }
         };
         b.resolveMultiname = function(a) {
           var e = a.name;
           if (!b.hasNonDynamicNamespaces[e]) {
-            return b.wasResolved[e] = !0, new W([ka.PUBLIC], a.name, 0);
+            return b.wasResolved[e] = !0, new O([ka.PUBLIC], a.name, 0);
           }
         };
         b.hasNonDynamicNamespaces = Object.create(null);
         b.wasResolved = Object.create(null);
         return b;
       }();
-      a.GlobalMultinameResolver = qa;
+      a.GlobalMultinameResolver = pa;
       var ya = function() {
         return function(b) {
           this.methodInfo = b;
@@ -10061,32 +10176,32 @@
           this.index = a;
         };
       }();
-      a.sliceArguments = U;
-      a.canCompile = ba;
-      a.shouldCompile = R;
-      a.forceCompile = N;
+      a.sliceArguments = X;
+      a.canCompile = U;
+      a.shouldCompile = $;
+      a.forceCompile = Y;
       a.CODE_CACHE = Object.create(null);
-      a.searchCodeCache = Z;
-      a.createInterpretedFunction = X;
+      a.searchCodeCache = M;
+      a.createInterpretedFunction = ca;
       a.debugName = function(b) {
         return d.isFunction(b) ? b.name : b;
       };
-      a.createCompiledFunction = ia;
-      a.createFunction = ga;
-      a.ensureFunctionIsInitialized = ca;
-      a.getTraitFunction = da;
+      a.createCompiledFunction = ga;
+      a.createFunction = ha;
+      a.ensureFunctionIsInitialized = ea;
+      a.getTraitFunction = aa;
       a.createClass = function(b, e, f) {
-        var c = b.instanceInfo, g = b.abc.applicationDomain, n = W.getName(c.name);
-        k.enterTimeline("createClass", {className:n, classInfo:b});
-        e = c.isInterface() ? d.AVM2.AS.createInterface(b) : d.AVM2.AS.createClass(b, e, f);
-        a.traceClasses.value && (g.loadedClasses.push(e), g.traceLoadedClasses());
-        if (c.isInterface()) {
+        var g = b.instanceInfo, n = b.abc.applicationDomain, c = O.getName(g.name);
+        k.enterTimeline("createClass", {className:c, classInfo:b});
+        e = g.isInterface() ? d.AVM2.AS.createInterface(b) : d.AVM2.AS.createClass(b, e, f);
+        a.traceClasses.value && (n.loadedClasses.push(e), n.traceLoadedClasses());
+        if (g.isInterface()) {
           return k.leaveTimeline(), e;
         }
-        g.onMessage.notify1("classCreated", e);
+        n.onMessage.notify1("classCreated", e);
         b.classObject = e;
         k.enterTimeline("staticInitializer");
-        ga(b.init, f, !1, !1, !0).call(e);
+        ha(b.init, f, !1, !1, !0).call(e);
         k.leaveTimeline();
         a.sealConstTraits && this.sealConstantTraits(e, b.traits);
         k.leaveTimeline();
@@ -10094,21 +10209,21 @@
       };
       a.sealConstantTraits = function(b, a) {
         for (var e = 0, f = a.length;e < f;e++) {
-          var c = a[e];
-          c.isConst() && (c = W.getQualifiedName(c.name), function(a, e) {
+          var g = a[e];
+          g.isConst() && (g = O.getQualifiedName(g.name), function(a, e) {
             Object.defineProperty(b, a, {configurable:!1, enumerable:!1, get:function() {
               return e;
             }, set:function() {
-              P("ReferenceError", k.Errors.ConstWriteError, a);
+              D("ReferenceError", k.Errors.ConstWriteError, a);
             }});
-          }(c, b[c]));
+          }(g, b[g]));
         }
       };
       a.applyType = function(b, a, e) {
         a = a.classInfo.instanceInfo.name.name;
         if ("Vector" === a) {
           e = e[0];
-          if (!ta(e)) {
+          if (!sa(e)) {
             switch(a = e.classInfo.instanceInfo.name.name.toLowerCase(), a) {
               case "number":
                 a = "double";
@@ -10126,7 +10241,7 @@
       };
       a.createName = function(b, a, e) {
         void 0 === a && (a = "*");
-        return new W(b, a, e);
+        return new O(b, a, e);
       };
     })(k.Runtime || (k.Runtime = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -10134,16 +10249,16 @@
 throwError = Shumway.AVM2.Runtime.throwError;
 var CC = Shumway.AVM2.Runtime.CODE_CACHE, HasNext2Info = Shumway.AVM2.Runtime.HasNext2Info, asCreateActivation = Shumway.AVM2.Runtime.asCreateActivation, asIsInstanceOf = Shumway.AVM2.Runtime.asIsInstanceOf, asIsType = Shumway.AVM2.Runtime.asIsType, asAsType = Shumway.AVM2.Runtime.asAsType, asEquals = Shumway.AVM2.Runtime.asEquals, asTypeOf = Shumway.AVM2.Runtime.asTypeOf, asCoerceByMultiname = Shumway.AVM2.Runtime.asCoerceByMultiname, asCoerce = Shumway.AVM2.Runtime.asCoerce, asCoerceString = Shumway.AVM2.Runtime.asCoerceString, 
 asCoerceInt = Shumway.AVM2.Runtime.asCoerceInt, asCoerceUint = Shumway.AVM2.Runtime.asCoerceUint, asCoerceNumber = Shumway.AVM2.Runtime.asCoerceNumber, asCoerceBoolean = Shumway.AVM2.Runtime.asCoerceBoolean, asCoerceObject = Shumway.AVM2.Runtime.asCoerceObject, asCompare = Shumway.AVM2.Runtime.asCompare, asAdd = Shumway.AVM2.Runtime.asAdd, applyType = Shumway.AVM2.Runtime.applyType, escapeXMLAttribute = Shumway.AVM2.Runtime.escapeXMLAttribute, escapeXMLElement = Shumway.AVM2.Runtime.escapeXMLElement, 
-asGetSlot = Shumway.AVM2.Runtime.asGetSlot, asSetSlot = Shumway.AVM2.Runtime.asSetSlot, asHasNext2 = Shumway.AVM2.Runtime.asHasNext2, getDescendants = Shumway.AVM2.Runtime.getDescendants, checkFilter = Shumway.AVM2.Runtime.checkFilter, sliceArguments = Shumway.AVM2.Runtime.sliceArguments, createFunction = Shumway.AVM2.Runtime.createFunction, createName = Shumway.AVM2.Runtime.createName;
+asGetSlot = Shumway.AVM2.Runtime.asGetSlot, asSetSlot = Shumway.AVM2.Runtime.asSetSlot, asHasNext2 = Shumway.AVM2.Runtime.asHasNext2, getDescendants = Shumway.AVM2.Runtime.getDescendants, checkFilter = Shumway.AVM2.Runtime.checkFilter, sliceArguments = Shumway.AVM2.Runtime.sliceArguments, createClass = Shumway.AVM2.Runtime.createClass, createFunction = Shumway.AVM2.Runtime.createFunction, createName = Shumway.AVM2.Runtime.createName;
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.AVM2.ABC.Multiname, v = d.ObjectUtilities.boxValue, u = function() {
-        function a(l, c, h) {
+      var q = d.AVM2.ABC.Multiname, v = d.ObjectUtilities.boxValue, t = function() {
+        function a(d, c, h) {
           void 0 === h && (h = !1);
-          this.parent = l;
+          this.parent = d;
           this.object = v(c);
-          this.global = l ? l.global : this;
+          this.global = d ? d.global : this;
           this.isWith = h;
           this.cache = Object.create(null);
         }
@@ -10179,7 +10294,7 @@
           if (m) {
             return null;
           }
-          if (g = p.abc.applicationDomain.findDomainProperty(new r(a, c, h), s, !0)) {
+          if (g = p.abc.applicationDomain.findDomainProperty(new q(a, c, h), s, !0)) {
             return g;
           }
           s && d.Debug.unexpected("Cannot find property " + c);
@@ -10187,7 +10302,7 @@
         };
         return a;
       }();
-      a.Scope = u;
+      a.Scope = t;
       a.bindFreeMethodScope = function(a, d) {
         var c = a.freeMethod;
         if (a.lastBoundMethod && a.lastBoundMethod.scope === d) {
@@ -10218,8 +10333,8 @@
           }
         }
         h || (h = function() {
-          for (var a = [d], p = 0;p < arguments.length;p++) {
-            a.push(arguments[p]);
+          for (var a = [d], h = 0;h < arguments.length;h++) {
+            a.push(arguments[h]);
           }
           return c.apply(this === jsGlobal ? d.global.object : this, a);
         });
@@ -10235,7 +10350,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.AVM2.ABC.Multiname, k = d.ObjectUtilities.createMap, u = d.ObjectUtilities.cloneObject, t = d.ObjectUtilities.copyProperties, l = d.ObjectUtilities.defineNonEnumerableProperty, c = d.ObjectUtilities.defineNonEnumerableGetter, h = d.FunctionUtilities.makeForwardingGetter, p = d.ArrayUtilities.pushUnique, s = function() {
+      var q = d.AVM2.ABC.Multiname, k = d.ObjectUtilities.createMap, t = d.ObjectUtilities.cloneObject, u = d.ObjectUtilities.copyProperties, l = d.ObjectUtilities.defineNonEnumerableProperty, c = d.ObjectUtilities.defineNonEnumerableGetter, h = d.FunctionUtilities.makeForwardingGetter, p = function() {
         function b(a) {
           this.trait = a;
         }
@@ -10252,8 +10367,8 @@
         b.KEY_PREFIX_LENGTH = 4;
         return b;
       }();
-      a.Binding = s;
-      var m = function() {
+      a.Binding = p;
+      var s = function() {
         return function(b, a, e, f) {
           this.name = b;
           this.isConst = a;
@@ -10261,183 +10376,183 @@
           this.trait = f;
         };
       }();
-      a.SlotInfo = m;
-      var g = function() {
+      a.SlotInfo = s;
+      var m = function() {
         return function() {
           this.byID = k();
           this.byQN = k();
         };
       }();
-      a.SlotInfoMap = g;
-      var f = function() {
-        function b() {
+      a.SlotInfoMap = m;
+      var g = function() {
+        function f() {
           this.map = k();
           this.slots = [];
           this.nextSlotId = 1;
         }
-        b.prototype.assignNextSlot = function(b) {
+        f.prototype.assignNextSlot = function(b) {
           b.slotId ? this.nextSlotId = b.slotId + 1 : b.slotId = this.nextSlotId++;
           this.slots[b.slotId] = b;
         };
-        b.prototype.trace = function(b) {
+        f.prototype.trace = function(b) {
           b.enter("Bindings");
           for (var a in this.map) {
             var e = this.map[a];
             b.writeLn(e.trait.kindName() + ": " + a + " -> " + e);
           }
-          b.leaveAndEnter();
+          b.leaveAndEnter("Slots");
           b.writeArray(this.slots);
           b.outdent();
         };
-        b.prototype.applyTo = function(b, f, n) {
+        f.prototype.applyTo = function(f, g, n) {
           void 0 === n && (n = !1);
-          n || (l(f, a.VM_SLOTS, new g), l(f, a.VM_BINDINGS, []), l(f, a.VM_OPEN_METHODS, k()), l(f, "bindings", this), l(f, "resolutionMap", []));
-          q && q.greenLn("Applying Traits" + (n ? " (Append)" : ""));
+          n || (l(g, a.VM_SLOTS, new m), l(g, a.VM_BINDINGS, Object.create(null)), l(g, a.VM_OPEN_METHODS, k()), l(g, "bindings", this), l(g, "resolutionMap", []));
+          e && e.greenLn("Applying Traits" + (n ? " (Append)" : ""));
           for (var d in this.map) {
-            var u = this.map[d];
-            n = u.trait;
-            var t = r.getQualifiedName(n.name);
+            var t = this.map[d];
+            n = t.trait;
+            var u = q.getQualifiedName(n.name);
             if (n.isSlot() || n.isConst() || n.isClass()) {
-              u = void 0;
+              t = void 0;
               if (n.isSlot() || n.isConst()) {
                 if (n.hasDefaultValue) {
-                  u = n.value;
+                  t = n.value;
                 } else {
                   if (n.typeName) {
-                    var J = b.findClassInfo(n.typeName);
-                    J && (u = J.defaultValue);
+                    var E = f.findClassInfo(n.typeName);
+                    E && (t = E.defaultValue);
                   }
                 }
               }
-              d !== t ? (q && q.yellowLn("Binding Trait: " + d + " -> " + t), c(f, d, h(t)), p(f.asBindings, d)) : (q && q.greenLn("Applying Trait " + n.kindName() + ": " + n), l(f, t, u), p(f.asBindings, t), u = new m(t, n.isConst(), n.typeName ? b.getProperty(n.typeName, !1, !1) : null, n), f.asSlots.byID[n.slotId] = u, f.asSlots.byQN[t] = u);
+              d !== u ? (e && e.yellowLn("Binding Trait: " + d + " -> " + u), c(g, d, h(u))) : (e && e.greenLn("Applying Trait " + n.kindName() + ": " + n), l(g, u, t), t = new s(u, n.isConst(), n.typeName ? f.getProperty(n.typeName, !1, !1) : null, n), g.asSlots.byID[n.slotId] = t, g.asSlots.byQN[u] = t);
             } else {
               if (n.isMethod() || n.isGetter() || n.isSetter()) {
                 if (n.isGetter() || n.isSetter()) {
-                  d = d.substring(s.KEY_PREFIX_LENGTH);
+                  d = d.substring(p.KEY_PREFIX_LENGTH);
                 }
-                d !== t ? q && q.yellowLn("Binding Trait: " + d + " -> " + t) : q && q.greenLn("Applying Trait " + n.kindName() + ": " + n);
-                p(f.asBindings, d);
-                a.applyMethodTrait(d, f, u, !(this instanceof e));
+                d !== u ? e && e.yellowLn("Binding Trait: " + d + " -> " + u) : e && e.greenLn("Applying Trait " + n.kindName() + ": " + n);
+                a.applyMethodTrait(d, g, t, !(this instanceof b));
               }
             }
+            g.asBindings[d] = !0;
           }
         };
-        return b;
+        return f;
       }();
-      a.Bindings = f;
-      var b = function(b) {
+      a.Bindings = g;
+      var f = function(b) {
         function a(e) {
           b.call(this);
           this.methodInfo = e;
           e = e.traits;
           for (var f = 0;f < e.length;f++) {
-            var c = e[f], g = r.getQualifiedName(c.name);
-            this.map[g] = new s(c);
-            this.assignNextSlot(c);
+            var g = e[f], c = q.getQualifiedName(g.name);
+            this.map[c] = new p(g);
+            this.assignNextSlot(g);
           }
         }
         __extends(a, b);
         return a;
-      }(f);
-      a.ActivationBindings = b;
-      b = function(b) {
+      }(g);
+      a.ActivationBindings = f;
+      f = function(b) {
         function a(e, f) {
           b.call(this);
-          var c = r.getQualifiedName(f.name);
-          this.map[c] = new s(f);
+          var g = q.getQualifiedName(f.name);
+          this.map[g] = new p(f);
           this.assignNextSlot(f);
         }
         __extends(a, b);
         return a;
-      }(f);
-      a.CatchBindings = b;
-      var e = function(b) {
+      }(g);
+      a.CatchBindings = f;
+      var b = function(b) {
         function a(e, f) {
           b.call(this);
           this.scope = f;
           this.scriptInfo = e;
-          for (var c = e.traits, g = 0;g < c.length;g++) {
-            var q = c[g], p = r.getQualifiedName(q.name), p = s.getKey(p, q), p = this.map[p] = new s(q);
-            (q.isSlot() || q.isConst() || q.isClass()) && this.assignNextSlot(q);
-            q.isClass() && q.metadata && q.metadata.native && (q.classInfo.native = q.metadata.native);
-            if (q.isMethod() || q.isGetter() || q.isSetter()) {
-              p.scope = this.scope;
+          for (var g = e.traits, c = 0;c < g.length;c++) {
+            var r = g[c], h = q.getQualifiedName(r.name), h = p.getKey(h, r), h = this.map[h] = new p(r);
+            (r.isSlot() || r.isConst() || r.isClass()) && this.assignNextSlot(r);
+            r.isClass() && r.metadata && r.metadata.native && (r.classInfo.native = r.metadata.native);
+            if (r.isMethod() || r.isGetter() || r.isSetter()) {
+              h.scope = this.scope;
             }
           }
         }
         __extends(a, b);
         return a;
-      }(f);
-      a.ScriptBindings = e;
-      b = function(b) {
-        function a(e, f, c) {
+      }(g);
+      a.ScriptBindings = b;
+      f = function(b) {
+        function a(e, f, g) {
           b.call(this);
           this.scope = f;
-          this.natives = c;
+          this.natives = g;
           this.classInfo = e;
           e = e.traits;
           for (f = 0;f < e.length;f++) {
-            c = e[f];
-            var g = r.getQualifiedName(c.name), g = s.getKey(g, c), g = this.map[g] = new s(c);
-            (c.isSlot() || c.isConst()) && this.assignNextSlot(c);
-            if (c.isMethod() || c.isGetter() || c.isSetter()) {
-              g.scope = this.scope, g.natives = this.natives;
+            g = e[f];
+            var c = q.getQualifiedName(g.name), c = p.getKey(c, g), c = this.map[c] = new p(g);
+            (g.isSlot() || g.isConst()) && this.assignNextSlot(g);
+            if (g.isMethod() || g.isGetter() || g.isSetter()) {
+              c.scope = this.scope, c.natives = this.natives;
             }
           }
         }
         __extends(a, b);
         return a;
-      }(f);
-      a.ClassBindings = b;
-      f = function(b) {
-        function a(e, f, c, g) {
+      }(g);
+      a.ClassBindings = f;
+      g = function(b) {
+        function a(e, f, g, c) {
           b.call(this);
-          this.scope = c;
-          this.natives = g;
+          this.scope = g;
+          this.natives = c;
           this.parent = e;
           this.instanceInfo = f;
-          this.implementedInterfaces = e ? u(e.implementedInterfaces) : Object.create(null);
+          this.implementedInterfaces = e ? t(e.implementedInterfaces) : Object.create(null);
           e && (this.slots = e.slots.slice(), this.nextSlotId = e.nextSlotId);
           this.extend(e);
         }
         __extends(a, b);
         a.prototype.extend = function(b) {
-          var a = this.instanceInfo, e, f = this.map, c, g, n, q;
+          var a = this.instanceInfo, e, f = this.map, g, n, c, r;
           if (b) {
-            for (g in b.map) {
-              c = b.map[g], n = c.trait, f[g] = c, n.isProtected() && (q = r.getQualifiedName(new r([a.protectedNs], n.name.getName(), 0)), q = s.getKey(q, n), f[q] = c);
+            for (n in b.map) {
+              g = b.map[n], c = g.trait, f[n] = g, c.isProtected() && (r = q.getQualifiedName(new q([a.protectedNs], c.name.getName(), 0)), r = p.getKey(r, c), f[r] = g);
             }
           }
-          var p = a.traits;
-          for (b = 0;b < p.length;b++) {
-            n = p[b];
-            c = r.getQualifiedName(n.name);
-            g = s.getKey(c, n);
-            c = new s(n);
+          var h = a.traits;
+          for (b = 0;b < h.length;b++) {
+            c = h[b];
+            g = q.getQualifiedName(c.name);
+            n = p.getKey(g, c);
+            g = new p(c);
             e = f;
-            q = c;
-            var h = e[g];
-            e[g] = q;
-            if (n.isProtected()) {
+            r = g;
+            var m = e[n];
+            e[n] = r;
+            if (c.isProtected()) {
               for (e = this.parent;e && e.instanceInfo.protectedNs;) {
-                q = r.getQualifiedName(new r([e.instanceInfo.protectedNs], n.name.getName(), 0)), q = s.getKey(q, n), q in f && (f[q] = c), e = e.parent;
+                r = q.getQualifiedName(new q([e.instanceInfo.protectedNs], c.name.getName(), 0)), r = p.getKey(r, c), r in f && (f[r] = g), e = e.parent;
               }
             }
-            (n.isSlot() || n.isConst()) && this.assignNextSlot(n);
-            if (n.isMethod() || n.isGetter() || n.isSetter()) {
-              c.scope = this.scope, c.natives = this.natives;
+            (c.isSlot() || c.isConst()) && this.assignNextSlot(c);
+            if (c.isMethod() || c.isGetter() || c.isSetter()) {
+              g.scope = this.scope, g.natives = this.natives;
             }
           }
-          n = a.abc.applicationDomain;
-          c = a.interfaces;
-          for (b = 0;b < c.length;b++) {
-            p = n.getProperty(c[b], !0, !0), t(this.implementedInterfaces, p.interfaceBindings.implementedInterfaces), this.implementedInterfaces[r.getQualifiedName(p.classInfo.instanceInfo.name)] = p;
-          }
-          for (var m in this.implementedInterfaces) {
-            p = this.implementedInterfaces[m];
-            e = p.interfaceBindings;
-            for (var d in e.map) {
-              b = e.map[d], a.isInterface() ? f[d] = b : (c = r.getPublicQualifiedName(b.trait.name.getName()), g = s.getKey(c, b.trait), f[d] = f[g]);
+          c = a.abc.applicationDomain;
+          g = a.interfaces;
+          for (b = 0;b < g.length;b++) {
+            h = c.getProperty(g[b], !0, !0), u(this.implementedInterfaces, h.interfaceBindings.implementedInterfaces), this.implementedInterfaces[q.getQualifiedName(h.classInfo.instanceInfo.name)] = h;
+          }
+          for (var d in this.implementedInterfaces) {
+            h = this.implementedInterfaces[d];
+            e = h.interfaceBindings;
+            for (var s in e.map) {
+              b = e.map[s], a.isInterface() ? f[s] = b : (g = q.getPublicQualifiedName(b.trait.name.getName()), n = p.getKey(g, b.trait), f[s] = f[n]);
             }
           }
         };
@@ -10445,9 +10560,9 @@
           return this.instanceInfo.toString();
         };
         return a;
-      }(f);
-      a.InstanceBindings = f;
-      var q = null;
+      }(g);
+      a.InstanceBindings = g;
+      var e = null;
     })(k.Runtime || (k.Runtime = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
@@ -10476,13 +10591,13 @@
         if (!g.isRegExp(e)) {
           throw new TypeError("Type RegExp expected");
         }
-        var c = b.exec.call(/\/([a-z]*)$/i, String(e))[1];
+        var n = b.exec.call(/\/([a-z]*)$/i, String(e))[1];
         f = f || {};
-        f.add && (c = d(c + f.add));
-        f.remove && (c = b.replace.call(c, new RegExp("[" + f.remove + "]+", "g"), ""));
-        return e = a(new RegExp(e.source, c), e.xregexp && e.xregexp.captureNames ? e.xregexp.captureNames.slice(0) : null, f.addProto);
+        f.add && (n = d(n + f.add));
+        f.remove && (n = b.replace.call(n, new RegExp("[" + f.remove + "]+", "g"), ""));
+        return e = a(new RegExp(e.source, n), e.xregexp && e.xregexp.captureNames ? e.xregexp.captureNames.slice(0) : null, f.addProto);
       }
-      function u(b, a) {
+      function t(b, a) {
         if (Array.prototype.indexOf) {
           return b.indexOf(a);
         }
@@ -10494,8 +10609,8 @@
         }
         return-1;
       }
-      function t(b, a) {
-        return J.call(b) === "[object " + a + "]";
+      function u(b, a) {
+        return Q.call(b) === "[object " + a + "]";
       }
       function l(a, e, f) {
         return b.test.call(-1 < f.indexOf("x") ? /^(?:\s+|#.*|\(\?#[^)]*\))*(?:[?*+]|{\d+(?:,\d*)?})/ : /^(?:\(\?#[^)]*\))*(?:[?*+]|{\d+(?:,\d*)?})/, a.slice(e));
@@ -10513,7 +10628,7 @@
           return "";
         });
         for (f = 0;f < e.length;++f) {
-          if (!F[e.charAt(f)]) {
+          if (!E[e.charAt(f)]) {
             throw new SyntaxError("Unknown regex flag " + e.charAt(f));
           }
         }
@@ -10521,7 +10636,7 @@
       }
       function h(b) {
         b = b || {};
-        t(b, "String") && (b = g.forEach(b, /[^\s,]+/, function(b) {
+        u(b, "String") && (b = g.forEach(b, /[^\s,]+/, function(b) {
           this[b] = !0;
         }, {}));
         return b;
@@ -10530,7 +10645,7 @@
         if (!/^[\w$]$/.test(b)) {
           throw Error("Flag must be a single character A-Za-z0-9_$");
         }
-        F[b] = !0;
+        E[b] = !0;
       }
       function s(a) {
         RegExp.prototype.exec = (a ? e : b).exec;
@@ -10546,10 +10661,10 @@
         }
         return b;
       }
-      var g, f = {astral:!1, natives:!1}, b = {exec:RegExp.prototype.exec, test:RegExp.prototype.test, match:String.prototype.match, replace:String.prototype.replace, split:String.prototype.split}, e = {}, q = {}, n = {}, x = [], L = {"default":/\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??|[\s\S]/, "class":/\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|[\s\S]/}, A = /\$(?:{([\w$]+)}|([\d$&`']))/g, 
-      H = void 0 === b.exec.call(/()??/, "")[1], K = void 0 !== RegExp.prototype.sticky, F = {g:!0, i:!0, m:!0, y:K}, J = {}.toString, M;
+      var g, f = {astral:!1, natives:!1}, b = {exec:RegExp.prototype.exec, test:RegExp.prototype.test, match:String.prototype.match, replace:String.prototype.replace, split:String.prototype.split}, e = {}, n = {}, r = {}, x = [], H = {"default":/\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\d*|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|\(\?[:=!]|[?*+]\?|{\d+(?:,\d*)?}\??|[\s\S]/, "class":/\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\dA-Fa-f]{2}|u[\dA-Fa-f]{4}|c[A-Za-z]|[\s\S])|[\s\S]/}, C = /\$(?:{([\w$]+)}|([\d$&`']))/g, 
+      F = void 0 === b.exec.call(/()??/, "")[1], K = void 0 !== RegExp.prototype.sticky, E = {g:!0, i:!0, m:!0, y:K}, Q = {}.toString, N;
       g = function(e, f) {
-        var q = {hasNamedCapture:!1, captureNames:[]}, p = "default", h = "", m = 0, s, d;
+        var n = {hasNamedCapture:!1, captureNames:[]}, h = "default", m = "", p = 0, d, s;
         if (g.isRegExp(e)) {
           if (void 0 !== f) {
             throw new TypeError("Cannot supply flags when copying a RegExp");
@@ -10558,37 +10673,37 @@
         }
         e = void 0 === e ? "" : String(e);
         f = void 0 === f ? "" : String(f);
-        d = e + "***" + f;
-        if (!n[d]) {
-          s = c(e, f);
-          e = s.pattern;
-          for (f = s.flags;m < e.length;) {
+        s = e + "***" + f;
+        if (!r[s]) {
+          d = c(e, f);
+          e = d.pattern;
+          for (f = d.flags;p < e.length;) {
             do {
-              s = e;
-              for (var l = f, r = m, u = p, t = q, A = x.length, K = null, H = void 0, F = void 0;A--;) {
-                if (F = x[A], (F.scope === u || "all" === F.scope) && (!F.flag || -1 < l.indexOf(F.flag)) && (H = g.exec(s, F.regex, r, "sticky"))) {
-                  K = {matchLength:H[0].length, output:F.handler.call(t, H, u, l), reparse:F.reparse};
+              d = e;
+              for (var l = f, q = p, t = h, C = n, u = x.length, F = null, K = void 0, E = void 0;u--;) {
+                if (E = x[u], (E.scope === t || "all" === E.scope) && (!E.flag || -1 < l.indexOf(E.flag)) && (K = g.exec(d, E.regex, q, "sticky"))) {
+                  F = {matchLength:K[0].length, output:E.handler.call(C, K, t, l), reparse:E.reparse};
                   break;
                 }
               }
-              (s = K) && s.reparse && (e = e.slice(0, m) + s.output + e.slice(m + s.matchLength));
-            } while (s && s.reparse);
-            s ? (h += s.output, m += s.matchLength || 1) : (s = g.exec(e, L[p], m, "sticky")[0], h += s, m += s.length, "[" === s && "default" === p ? p = "class" : "]" === s && "class" === p && (p = "default"));
+              (d = F) && d.reparse && (e = e.slice(0, p) + d.output + e.slice(p + d.matchLength));
+            } while (d && d.reparse);
+            d ? (m += d.output, p += d.matchLength || 1) : (d = g.exec(e, H[h], p, "sticky")[0], m += d, p += d.length, "[" === d && "default" === h ? h = "class" : "]" === d && "class" === h && (h = "default"));
           }
-          n[d] = {pattern:b.replace.call(h, /\(\?:\)(?=\(\?:\))|^\(\?:\)|\(\?:\)$/g, ""), flags:b.replace.call(f, /[^gimy]+/g, ""), captures:q.hasNamedCapture ? q.captureNames : null};
+          r[s] = {pattern:b.replace.call(m, /\(\?:\)(?=\(\?:\))|^\(\?:\)|\(\?:\)$/g, ""), flags:b.replace.call(f, /[^gimy]+/g, ""), captures:n.hasNamedCapture ? n.captureNames : null};
         }
-        d = n[d];
-        return a(new RegExp(d.pattern, d.flags), d.captures, !0);
+        s = r[s];
+        return a(new RegExp(s.pattern, s.flags), s.captures, !0);
       };
       g.prototype = RegExp();
       g.version = "3.0.0-pre";
       g.addToken = function(a, e, f) {
         f = f || {};
-        var c = f.optionalFlags, n;
+        var n = f.optionalFlags, c;
         f.flag && p(f.flag);
-        if (c) {
-          for (c = b.split.call(c, ""), n = 0;n < c.length;++n) {
-            p(c[n]);
+        if (n) {
+          for (n = b.split.call(n, ""), c = 0;c < n.length;++c) {
+            p(n[c]);
           }
         }
         x.push({regex:k(a, {add:"g" + (K ? "y" : "")}), handler:e, scope:f.scope || "default", flag:f.flag, reparse:f.reparse});
@@ -10596,28 +10711,28 @@
       };
       g.cache = function(b, a) {
         var e = b + "***" + (a || "");
-        return q[e] || (q[e] = g(b, a));
+        return n[e] || (n[e] = g(b, a));
       };
       g.cache.flush = function(b) {
-        "patterns" === b ? n = {} : q = {};
+        "patterns" === b ? r = {} : n = {};
       };
       g.escape = function(a) {
         return b.replace.call(m(a), /[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
       };
-      g.exec = function(b, a, f, c) {
-        var g = "g";
-        K && (c || a.sticky && !1 !== c) && (g += "y");
+      g.exec = function(b, a, f, g) {
+        var n = "g";
+        K && (g || a.sticky && !1 !== g) && (n += "y");
         a.xregexp = a.xregexp || {captureNames:null};
-        g = a.xregexp[g] || (a.xregexp[g] = k(a, {add:g, remove:!1 === c ? "y" : ""}));
-        g.lastIndex = f = f || 0;
-        b = e.exec.call(g, b);
-        c && b && b.index !== f && (b = null);
-        a.global && (a.lastIndex = b ? g.lastIndex : 0);
+        n = a.xregexp[n] || (a.xregexp[n] = k(a, {add:n, remove:!1 === g ? "y" : ""}));
+        n.lastIndex = f = f || 0;
+        b = e.exec.call(n, b);
+        g && b && b.index !== f && (b = null);
+        a.global && (a.lastIndex = b ? n.lastIndex : 0);
         return b;
       };
       g.forEach = function(b, a, e, f) {
-        for (var c = 0, n = -1;c = g.exec(b, a, c);) {
-          e.call(f, c, ++n, b, a), c = c.index + (c[0].length || 1);
+        for (var n = 0, c = -1;n = g.exec(b, a, n);) {
+          e.call(f, n, ++c, b, a), n = n.index + (n[0].length || 1);
         }
         return f;
       };
@@ -10633,40 +10748,40 @@
         return!!f[b];
       };
       g.isRegExp = function(b) {
-        return "[object RegExp]" === J.call(b);
+        return "[object RegExp]" === Q.call(b);
       };
       g.match = function(a, e, f) {
-        var c = e.global && "one" !== f || "all" === f, g = (c ? "g" : "") + (e.sticky ? "y" : "");
+        var g = e.global && "one" !== f || "all" === f, n = (g ? "g" : "") + (e.sticky ? "y" : "");
         e.xregexp = e.xregexp || {captureNames:null};
-        g = e.xregexp[g || "noGY"] || (e.xregexp[g || "noGY"] = k(e, {add:g, remove:"one" === f ? "g" : ""}));
-        a = b.match.call(m(a), g);
+        n = e.xregexp[n || "noGY"] || (e.xregexp[n || "noGY"] = k(e, {add:n, remove:"one" === f ? "g" : ""}));
+        a = b.match.call(m(a), n);
         e.global && (e.lastIndex = "one" === f && a ? a.index + a[0].length : 0);
-        return c ? a || [] : a && a[0];
+        return g ? a || [] : a && a[0];
       };
       g.matchChain = function(b, a) {
-        return function y(b, e) {
+        return function A(b, e) {
           function f(b) {
-            if (c.backref) {
-              if (!(b.hasOwnProperty(c.backref) || +c.backref < b.length)) {
-                throw new ReferenceError("Backreference to undefined group: " + c.backref);
+            if (n.backref) {
+              if (!(b.hasOwnProperty(n.backref) || +n.backref < b.length)) {
+                throw new ReferenceError("Backreference to undefined group: " + n.backref);
               }
-              n.push(b[c.backref] || "");
+              c.push(b[n.backref] || "");
             } else {
-              n.push(b[0]);
+              c.push(b[0]);
             }
           }
-          var c = a[e].regex ? a[e] : {regex:a[e]}, n = [], q;
-          for (q = 0;q < b.length;++q) {
-            g.forEach(b[q], c.regex, f);
+          var n = a[e].regex ? a[e] : {regex:a[e]}, c = [], r;
+          for (r = 0;r < b.length;++r) {
+            g.forEach(b[r], n.regex, f);
           }
-          return e !== a.length - 1 && n.length ? y(n, e + 1) : n;
+          return e !== a.length - 1 && c.length ? A(c, e + 1) : c;
         }([b], 0);
       };
-      g.replace = function(b, a, f, c) {
-        var n = g.isRegExp(a), q = a.global && "one" !== c || "all" === c, p = (q ? "g" : "") + (a.sticky ? "y" : ""), h = a;
-        n ? (a.xregexp = a.xregexp || {captureNames:null}, h = a.xregexp[p || "noGY"] || (a.xregexp[p || "noGY"] = k(a, {add:p, remove:"one" === c ? "g" : ""}))) : q && (h = new RegExp(g.escape(String(a)), "g"));
-        b = e.replace.call(m(b), h, f);
-        n && a.global && (a.lastIndex = 0);
+      g.replace = function(b, a, f, n) {
+        var c = g.isRegExp(a), r = a.global && "one" !== n || "all" === n, h = (r ? "g" : "") + (a.sticky ? "y" : ""), p = a;
+        c ? (a.xregexp = a.xregexp || {captureNames:null}, p = a.xregexp[h || "noGY"] || (a.xregexp[h || "noGY"] = k(a, {add:h, remove:"one" === n ? "g" : ""}))) : r && (p = new RegExp(g.escape(String(a)), "g"));
+        b = e.replace.call(m(b), p, f);
+        c && a.global && (a.lastIndex = 0);
         return b;
       };
       g.replaceEach = function(b, a) {
@@ -10689,39 +10804,39 @@
       };
       g.union = function(a, e) {
         function f(b, a, e) {
-          var c = h[q - p];
+          var g = m[r - h];
           if (a) {
-            if (++q, c) {
-              return "(?<" + c + ">";
+            if (++r, g) {
+              return "(?<" + g + ">";
             }
           } else {
             if (e) {
-              return "\\" + (+e + p);
+              return "\\" + (+e + h);
             }
           }
           return b;
         }
-        var c = /(\()(?!\?)|\\([1-9]\d*)|\\[\s\S]|\[(?:[^\\\]]|\\[\s\S])*]/g, n = [], q = 0, p, h, m, s;
-        if (!t(a, "Array") || !a.length) {
+        var n = /(\()(?!\?)|\\([1-9]\d*)|\\[\s\S]|\[(?:[^\\\]]|\\[\s\S])*]/g, c = [], r = 0, h, m, p, d;
+        if (!u(a, "Array") || !a.length) {
           throw new TypeError("Must provide a nonempty array of patterns to merge");
         }
-        for (s = 0;s < a.length;++s) {
-          m = a[s], g.isRegExp(m) ? (p = q, h = m.xregexp && m.xregexp.captureNames || [], n.push(b.replace.call(g(m.source).source, c, f))) : n.push(g.escape(m));
+        for (d = 0;d < a.length;++d) {
+          p = a[d], g.isRegExp(p) ? (h = r, m = p.xregexp && p.xregexp.captureNames || [], c.push(b.replace.call(g(p.source).source, n, f))) : c.push(g.escape(p));
         }
-        return g(n.join("|"), e);
+        return g(c.join("|"), e);
       };
       e.exec = function(a) {
-        var e = this.lastIndex, f = b.exec.apply(this, arguments), c, g;
+        var e = this.lastIndex, f = b.exec.apply(this, arguments), g, n;
         if (f) {
-          !H && 1 < f.length && -1 < u(f, "") && (c = k(this, {remove:"g"}), b.replace.call(String(a).slice(f.index), c, function() {
+          !F && 1 < f.length && -1 < t(f, "") && (g = k(this, {remove:"g"}), b.replace.call(String(a).slice(f.index), g, function() {
             var b = arguments.length, a;
             for (a = 1;a < b - 2;++a) {
               void 0 === arguments[a] && (f[a] = void 0);
             }
           }));
           if (this.xregexp && this.xregexp.captureNames) {
-            for (g = 1;g < f.length;++g) {
-              (c = this.xregexp.captureNames[g - 1]) && (f[c] = f[g]);
+            for (n = 1;n < f.length;++n) {
+              (g = this.xregexp.captureNames[n - 1]) && (f[g] = f[n]);
             }
           }
           this.global && !f[0].length && this.lastIndex > f.index && (this.lastIndex = f.index);
@@ -10744,26 +10859,26 @@
         return e.exec.call(a, m(this));
       };
       e.replace = function(a, e) {
-        var f = g.isRegExp(a), c, n, q;
-        f ? (a.xregexp && (n = a.xregexp.captureNames), c = a.lastIndex) : a += "";
-        q = t(e, "Function") ? b.replace.call(String(this), a, function() {
-          var b = arguments, c;
-          if (n) {
-            for (b[0] = new String(b[0]), c = 0;c < n.length;++c) {
-              n[c] && (b[0][n[c]] = b[c + 1]);
+        var f = g.isRegExp(a), n, c, r;
+        f ? (a.xregexp && (c = a.xregexp.captureNames), n = a.lastIndex) : a += "";
+        r = u(e, "Function") ? b.replace.call(String(this), a, function() {
+          var b = arguments, g;
+          if (c) {
+            for (b[0] = new String(b[0]), g = 0;g < c.length;++g) {
+              c[g] && (b[0][c[g]] = b[g + 1]);
             }
           }
           f && a.global && (a.lastIndex = b[b.length - 2] + b[0].length);
           return e.apply(void 0, b);
         }) : b.replace.call(null == this ? this : String(this), a, function() {
           var a = arguments;
-          return b.replace.call(String(e), A, function(b, e, f) {
+          return b.replace.call(String(e), C, function(b, e, f) {
             if (e) {
               f = +e;
               if (f <= a.length - 3) {
                 return a[f] || "";
               }
-              f = n ? u(n, e) : -1;
+              f = c ? t(c, e) : -1;
               if (0 > f) {
                 throw new SyntaxError("Backreference to undefined group " + b);
               }
@@ -10791,69 +10906,69 @@
             throw new SyntaxError("Invalid token " + b);
           });
         });
-        f && (a.lastIndex = a.global ? 0 : c);
-        return q;
+        f && (a.lastIndex = a.global ? 0 : n);
+        return r;
       };
       e.split = function(a, e) {
         if (!g.isRegExp(a)) {
           return b.split.apply(this, arguments);
         }
-        var f = String(this), c = [], n = a.lastIndex, q = 0, p;
+        var f = String(this), n = [], c = a.lastIndex, r = 0, h;
         e = (void 0 === e ? -1 : e) >>> 0;
         g.forEach(f, a, function(b) {
-          b.index + b[0].length > q && (c.push(f.slice(q, b.index)), 1 < b.length && b.index < f.length && Array.prototype.push.apply(c, b.slice(1)), p = b[0].length, q = b.index + p);
+          b.index + b[0].length > r && (n.push(f.slice(r, b.index)), 1 < b.length && b.index < f.length && Array.prototype.push.apply(n, b.slice(1)), h = b[0].length, r = b.index + h);
         });
-        q === f.length ? b.test.call(a, "") && !p || c.push("") : c.push(f.slice(q));
-        a.lastIndex = n;
-        return c.length > e ? c.slice(0, e) : c;
+        r === f.length ? b.test.call(a, "") && !h || n.push("") : n.push(f.slice(r));
+        a.lastIndex = c;
+        return n.length > e ? n.slice(0, e) : n;
       };
-      M = g.addToken;
-      M(/\\([ABCE-RTUVXYZaeg-mopqyz]|c(?![A-Za-z])|u(?![\dA-Fa-f]{4})|x(?![\dA-Fa-f]{2}))/, function(b, a) {
+      N = g.addToken;
+      N(/\\([ABCE-RTUVXYZaeg-mopqyz]|c(?![A-Za-z])|u(?![\dA-Fa-f]{4})|x(?![\dA-Fa-f]{2}))/, function(b, a) {
         if ("B" === b[1] && "default" === a) {
           return b[0];
         }
         throw new SyntaxError("Invalid escape " + b[0]);
       }, {scope:"all"});
-      M(/\[(\^?)]/, function(b) {
+      N(/\[(\^?)]/, function(b) {
         return b[1] ? "[\\s\\S]" : "\\b\\B";
       });
-      M(/\(\?#[^)]*\)/, function(b, a, e) {
+      N(/\(\?#[^)]*\)/, function(b, a, e) {
         return l(b.input, b.index + b[0].length, e) ? "" : "(?:)";
       });
-      M(/\s+|#.*/, function(b, a, e) {
+      N(/\s+|#.*/, function(b, a, e) {
         return l(b.input, b.index + b[0].length, e) ? "" : "(?:)";
       }, {flag:"x"});
-      M(/\./, function() {
+      N(/\./, function() {
         return "[\\s\\S]";
       }, {flag:"s"});
-      M(/\\k<([\w$]+)>/, function(b) {
-        var a = isNaN(b[1]) ? u(this.captureNames, b[1]) + 1 : +b[1], e = b.index + b[0].length;
+      N(/\\k<([\w$]+)>/, function(b) {
+        var a = isNaN(b[1]) ? t(this.captureNames, b[1]) + 1 : +b[1], e = b.index + b[0].length;
         if (!a || a > this.captureNames.length) {
           throw new SyntaxError("Backreference to undefined group " + b[0]);
         }
         return "\\" + a + (e === b.input.length || isNaN(b.input.charAt(e)) ? "" : "(?:)");
       });
-      M(/\\(\d+)/, function(b, a) {
+      N(/\\(\d+)/, function(b, a) {
         if (!("default" === a && /^[1-9]/.test(b[1]) && +b[1] <= this.captureNames.length) && "0" !== b[1]) {
           throw new SyntaxError("Cannot use octal escape or backreference to undefined group " + b[0]);
         }
         return b[0];
       }, {scope:"all"});
-      M(/\(\?P?<([\w$]+)>/, function(b) {
+      N(/\(\?P?<([\w$]+)>/, function(b) {
         if (!isNaN(b[1])) {
           throw new SyntaxError("Cannot use integer as capture name " + b[0]);
         }
         if ("length" === b[1] || "__proto__" === b[1]) {
           throw new SyntaxError("Cannot use reserved word as capture name " + b[0]);
         }
-        if (-1 < u(this.captureNames, b[1])) {
+        if (-1 < t(this.captureNames, b[1])) {
           throw new SyntaxError("Cannot use same name for multiple groups " + b[0]);
         }
         this.captureNames.push(b[1]);
         this.hasNamedCapture = !0;
         return "(";
       });
-      M(/\((?!\?)/, function(b, a, e) {
+      N(/\((?!\?)/, function(b, a, e) {
         if (-1 < e.indexOf("n")) {
           return "(?:";
         }
@@ -10868,7 +10983,27 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(b) {
+      function q(a, e, f) {
+        var g = a[e];
+        if (Array.isArray(g)) {
+          for (var n = 0, c = g.length;n < c;n++) {
+            var r = q(g, b(n), f);
+            void 0 === r ? delete g[n] : g[n] = r;
+          }
+        } else {
+          if (null !== g && "boolean" !== typeof g && "number" !== typeof g && "string" !== typeof g) {
+            for (n in g) {
+              if (!g.hasOwnProperty(n) || !t.isPublicQualifiedName(n)) {
+                break;
+              }
+              r = q(g, n, f);
+              void 0 === r ? delete g[n] : g[n] = r;
+            }
+          }
+        }
+        return f.call(a, e, g);
+      }
+      function v(b) {
         switch(b) {
           case "prototype":
             return "native_prototype";
@@ -10882,32 +11017,22 @@
             return b;
         }
       }
-      function v(b) {
-        for (var a = b.split("."), e = ea, f = 0, c = a.length;f < c;f++) {
-          e = e && e[a[f]];
-        }
-        e || (e = ca[b]);
-        return e;
-      }
-      var u = d.AVM2.ABC.Multiname, t = d.AVM2.Runtime.Scope, l = d.ObjectUtilities.hasOwnProperty, c = d.ObjectUtilities.defineNonEnumerableProperty, h = d.isNumber, p = d.isNullOrUndefined, s = d.ObjectUtilities.isPrototypeWriteable, m = d.ObjectUtilities.getOwnPropertyDescriptor, g = d.Debug.notImplemented, f = d.AVM2.Runtime.asCoerceString, b = d.AVM2.Runtime.createFunction, e = d.AVM2.Runtime, q = d.ObjectUtilities.boxValue, n = d.AVM2.Runtime.ClassBindings, x = d.AVM2.Runtime.InstanceBindings, 
-      L = d.AVM2.Runtime.asCompare;
-      (function(b) {
-        b[b.NONE = 0] = "NONE";
-        b[b.OWN_INITIALIZE = 1] = "OWN_INITIALIZE";
-        b[b.SUPER_INITIALIZE = 2] = "SUPER_INITIALIZE";
-      })(a.InitializationFlags || (a.InitializationFlags = {}));
-      var A = function() {
+      var t = d.AVM2.ABC.Multiname, u = d.AVM2.Runtime.Scope, l = d.ObjectUtilities.hasOwnProperty, c = d.ObjectUtilities.defineReadOnlyProperty, h = d.ObjectUtilities.defineNonEnumerableProperty, p = d.isNumber, s = d.isNullOrUndefined, m = d.ObjectUtilities.isPrototypeWriteable, g = d.ObjectUtilities.getOwnPropertyDescriptor, f = d.Debug.notImplemented, b = d.AVM2.Runtime.asCoerceString, e = d.AVM2.Runtime.createFunction, n = d.AVM2.Runtime, r = d.ObjectUtilities.boxValue, x = d.AVM2.Runtime.ClassBindings, 
+      H = d.AVM2.Runtime.InstanceBindings, C = d.AVM2.Runtime.asCompare, F = function() {
         function b() {
         }
+        b.init = function() {
+        };
         b.morphIntoASClass = function(b) {
           this.classInfo = b;
-          this.__proto__ = K.prototype;
+          this.__proto__ = E.prototype;
         };
         b.create = function(b, a, e) {
-          K.create(b, a, this.instanceConstructor);
+          b.baseClass = a;
+          E.create(b, a, this.instanceConstructor);
         };
         b.initializeFrom = function(b) {
-          return F.initializeFrom.call(this, b);
+          return Q.initializeFrom.call(this, b);
         };
         b.asCall = function(b) {
           for (var a = [], e = 1;e < arguments.length;e++) {
@@ -10919,40 +11044,42 @@
           return this.callableConstructor.apply(b, a);
         };
         b.verify = function() {
-          F.verify.call(this);
+          Q.verify.call(this);
         };
         b.trace = function(b) {
-          F.trace.call(this, b);
+          Q.trace.call(this, b);
         };
         b.getQualifiedClassName = function() {
-          return F.getQualifiedClassName.call(this);
+          return Q.getQualifiedClassName.call(this);
         };
         b._setPropertyIsEnumerable = function(b, a, e) {
-          a = u.getPublicQualifiedName(a);
-          e = m(b, a);
-          e.enumerable = !1;
-          Object.defineProperty(b, a, e);
-        };
-        b._dontEnumPrototype = function(b) {
-          for (var a in b) {
-            if (u.isPublicQualifiedName(a)) {
-              var e = m(b, a);
-              e.enumerable = !1;
-              Object.defineProperty(b, a, e);
-            }
-          }
+          void 0 === e && (e = !0);
+          a = t.getPublicQualifiedName(a);
+          var f = g(b, a);
+          f.enumerable = !!e;
+          Object.defineProperty(b, a, f);
         };
         b._init = function() {
-          this.dynamicPrototype.asSetPublicProperty("hasOwnProperty", b.prototype.native_hasOwnProperty);
-          this.dynamicPrototype.asSetPublicProperty("propertyIsEnumerable", b.prototype.native_propertyIsEnumerable);
-          this.dynamicPrototype.asSetPublicProperty("setPropertyIsEnumerable", b.prototype.setPropertyIsEnumerable);
-          this.dynamicPrototype.asSetPublicProperty("isPrototypeOf", b.prototype.native_isPrototypeOf);
-          this.dynamicPrototype.asSetPublicProperty("toString", b.prototype.toString);
-          this.dynamicPrototype.asSetPublicProperty("valueOf", b.prototype.valueOf);
-          b._dontEnumPrototype(this.dynamicPrototype);
+          c(b, "$Bglength", 1);
+          c(Object, "$Bglength", 1);
+          var a = this.dynamicPrototype;
+          h(a, "$BghasOwnProperty", b.prototype.native_hasOwnProperty);
+          h(a, "$BgpropertyIsEnumerable", b.prototype.native_propertyIsEnumerable);
+          h(a, "$BgsetPropertyIsEnumerable", b.prototype.setPropertyIsEnumerable);
+          h(a, "$BgisPrototypeOf", b.prototype.native_isPrototypeOf);
+          h(a, "$BgtoString", n.asToString);
+          h(a, "toString", b.prototype.toString);
+          h(a, "$BgvalueOf", Object.prototype.valueOf);
+          h(a, "valueOf", b.prototype.valueOf);
+        };
+        b.prototype.toString = function() {
+          return this.$BgtoString();
+        };
+        b.prototype.valueOf = function() {
+          return this.$BgvalueOf();
         };
         b.prototype.native_isPrototypeOf = function(b) {
-          g("isPrototypeOf");
+          f("isPrototypeOf");
           return!1;
         };
         b.prototype.native_hasOwnProperty = function(b) {
@@ -10964,10 +11091,6 @@
         b.prototype.setPropertyIsEnumerable = function(a, e) {
           b._setPropertyIsEnumerable(this, a, e);
         };
-        b.prototype.toString = function() {
-          var b = q(this);
-          return b instanceof K ? d.StringUtilities.concat3("[class ", b.classInfo.instanceInfo.name.name, "]") : d.StringUtilities.concat3("[object ", b.class.classInfo.instanceInfo.name.name, "]");
-        };
         b.baseClass = null;
         b.instanceConstructor = Object;
         b.instanceConstructorNoInitialize = null;
@@ -10976,15 +11099,14 @@
         b.classInitializer = null;
         b.callableConstructor = b.instanceConstructor;
         b.defaultValue = null;
-        b.initializationFlags = 0;
         b.call = Function.prototype.call;
         b.apply = Function.prototype.apply;
-        b.coerce = e.asCoerceObject;
+        b.coerce = n.asCoerceObject;
         b.defineProperty = Object.defineProperty;
         return b;
       }();
-      a.ASObject = A;
-      var H = function(b) {
+      a.ASObject = F;
+      var K = function(b) {
         function a() {
           b.apply(this, arguments);
         }
@@ -11000,40 +11122,35 @@
         a.traitsPrototype = null;
         a.dynamicPrototype = null;
         a.defaultValue = null;
-        a.initializationFlags = 0;
         return a;
-      }(A);
-      a.ASNative = H;
-      var K = function(b) {
+      }(F);
+      a.ASNative = K;
+      var E = function(b) {
         function a(b) {
           this.classInfo = b;
-          this.instanceNatives = this.staticNatives = null;
-          this.initializationFlags = 0;
-          this.defaultValue = null;
+          this.defaultValue = this.instanceNatives = this.staticNatives = null;
         }
         __extends(a, b);
         a.configureBuiltinPrototype = function(b, a) {
-          b.baseClass = a;
           b.dynamicPrototype = b.traitsPrototype = b.instanceConstructor.prototype;
         };
         a.configurePrototype = function(b, a) {
-          b.baseClass = a;
           b.dynamicPrototype = Object.create(a.dynamicPrototype);
           b.traitsPrototype = Object.create(b.dynamicPrototype);
           for (var e = b.traitsPrototype, f = [];b;) {
             f.push(b), b = b.baseClass;
           }
-          for (var c = 0;c < f.length;c++) {
-            var g = [f[c].typeScriptPrototype];
-            f[c].instanceNatives && d.ArrayUtilities.pushMany(g, f[c].instanceNatives);
-            for (var n = 0;n < g.length;n++) {
-              var q = g[n], p;
-              for (p in q) {
-                if (!(0 < c && "toString" === p) && l(q, p) && !l(e, p)) {
-                  var h = Object.getOwnPropertyDescriptor(q, p);
+          for (var g = 0;g < f.length;g++) {
+            var n = [f[g].typeScriptPrototype];
+            f[g].instanceNatives && d.ArrayUtilities.pushMany(n, f[g].instanceNatives);
+            for (var c = 0;c < n.length;c++) {
+              var r = n[c], h;
+              for (h in r) {
+                if (!(0 < g && "toString" === h) && l(r, h) && !l(e, h)) {
+                  var m = Object.getOwnPropertyDescriptor(r, h);
                   try {
-                    Object.defineProperty(e, p, h);
-                  } catch (m) {
+                    Object.defineProperty(e, h, m);
+                  } catch (p) {
                   }
                 }
               }
@@ -11042,13 +11159,13 @@
         };
         a.create = function(b, e, f) {
           b.typeScriptPrototype = b.prototype;
-          b.instanceConstructor && !s(b.instanceConstructor) ? a.configureBuiltinPrototype(b, e) : a.configurePrototype(b, e);
+          b.instanceConstructor && !m(b.instanceConstructor) ? a.configureBuiltinPrototype(b, e) : a.configurePrototype(b, e);
           b.instanceConstructor || (b.instanceConstructor = f, b !== f && (b.instanceConstructor.__proto__ = b));
           b.callableConstructor || (b.callableConstructor = b.coerce.bind(b));
           b.instanceConstructorNoInitialize = b.instanceConstructor;
           b.instanceConstructor.prototype = b.traitsPrototype;
-          c(b.instanceConstructor.prototype, "class", b);
-          c(b.dynamicPrototype, u.getPublicQualifiedName("constructor"), b);
+          h(b.instanceConstructor.prototype, "class", b);
+          h(b.dynamicPrototype, t.getPublicQualifiedName("constructor"), b);
           b.protocol && d.ObjectUtilities.copyOwnPropertyDescriptors(b.traitsPrototype, b.protocol);
         };
         a.prototype.initializeFrom = function(b) {
@@ -11071,38 +11188,38 @@
           b.initializers && (b.instanceConstructor = function() {
             a.runInitializers(this, void 0);
             return b.instanceConstructorNoInitialize.apply(this, arguments);
-          }, b.instanceConstructor.prototype = b.traitsPrototype, c(b.instanceConstructor.prototype, "class", b), b.instanceConstructor.classInfo = b.classInfo, b.instanceConstructor.__proto__ = b);
+          }, b.instanceConstructor.prototype = b.traitsPrototype, h(b.instanceConstructor.prototype, "class", b), b.instanceConstructor.classInfo = b.classInfo, b.instanceConstructor.__proto__ = b);
         };
         a.runClassInitializer = function(b) {
           b.classInitializer && b.classInitializer();
         };
         a.linkSymbols = function(b) {
-          function a(b, e, f) {
-            for (var c = 0;c < e.length;c++) {
-              var n = e[c], q;
+          function a(b, e, g) {
+            for (var n = 0;n < e.length;n++) {
+              var c = e[n], r;
               a: {
-                q = b;
-                for (var p = n.name.name, h = 0;h < q.length;h++) {
-                  var m = q[h];
-                  if (0 <= m.indexOf(p)) {
-                    var s = "!" === m[m.length - 1];
-                    s && (m = m.slice(0, m.length - 1));
-                    if (p === m) {
-                      q = s;
+                r = b;
+                for (var h = c.name.name, m = 0;m < r.length;m++) {
+                  var p = r[m];
+                  if (0 <= p.indexOf(h)) {
+                    var d = "!" === p[p.length - 1];
+                    d && (p = p.slice(0, p.length - 1));
+                    if (h === p) {
+                      r = d;
                       break a;
                     }
                   }
                 }
-                q = !1;
+                r = !1;
               }
-              if (q) {
-                if (n.isConst()) {
-                  g("Don't link against const traits.");
+              if (r) {
+                if (c.isConst()) {
+                  f("Don't link against const traits.");
                   break;
                 }
-                q = n.name.name;
-                p = u.getQualifiedName(n.name);
-                n.isSlot() ? Object.defineProperty(f, q, {get:new Function("", "return this." + p + "//# sourceURL=get-" + p + ".as"), set:new Function("v", "this." + p + " = v;//# sourceURL=set-" + p + ".as")}) : n.isMethod() ? f[q] = f.asOpenMethods[p] : n.isGetter() ? Object.defineProperty(f, q, {get:new Function("", "return this." + p + "//# sourceURL=get-" + p + ".as")}) : g(n);
+                r = c.name.name;
+                h = t.getQualifiedName(c.name);
+                c.isSlot() ? Object.defineProperty(g, r, {get:new Function("", "return this." + h + "//# sourceURL=get-" + h + ".as"), set:new Function("v", "this." + h + " = v;//# sourceURL=set-" + h + ".as")}) : c.isMethod() ? g[r] = g.asOpenMethods[h] : c.isGetter() ? Object.defineProperty(g, r, {get:new Function("", "return this." + h + "//# sourceURL=get-" + h + ".as")}) : f(c);
               }
             }
           }
@@ -11131,12 +11248,12 @@
           if (d.isNullOrUndefined(b)) {
             return!1;
           }
-          b = q(b);
+          b = r(b);
           if (this.isInterface()) {
             if (null === b || "object" !== typeof b) {
               return!1;
             }
-            var a = u.getQualifiedName(this.classInfo.instanceInfo.name);
+            var a = t.getQualifiedName(this.classInfo.instanceInfo.name);
             return void 0 !== b.class.implementedInterfaces[a];
           }
           return this.dynamicPrototype.isPrototypeOf(b);
@@ -11162,8 +11279,8 @@
         };
         a.prototype.verify = function() {
           function b(a, e, f) {
-            for (var c = 0;c < a.length;c++) {
-              if (e(a[c], f)) {
+            for (var g = 0;g < a.length;g++) {
+              if (e(a[g], f)) {
                 return!0;
               }
             }
@@ -11174,12 +11291,12 @@
             this.staticNatives && d.ArrayUtilities.pushMany(e, this.staticNatives);
             var f = [this.prototype];
             this.instanceNatives && d.ArrayUtilities.pushMany(f, this.instanceNatives);
-            for (var c = 0;c < a.length;c++) {
-              for (var g = 0 === c, n = 0;n < a[c].length;n++) {
-                var q = a[c][n], p = r(q.name.name);
-                if (q.isMethodOrAccessor() && q.methodInfo.isNative()) {
-                  var h = g ? e : f;
-                  q.isMethod() ? b(h, d.ObjectUtilities.hasOwnProperty, p) : q.isGetter() ? b(h, d.ObjectUtilities.hasOwnGetter, p) : q.isSetter() && b(h, d.ObjectUtilities.hasOwnSetter, p);
+            for (var g = 0;g < a.length;g++) {
+              for (var n = 0 === g, c = 0;c < a[g].length;c++) {
+                var r = a[g][c], h = v(r.name.name);
+                if (r.isMethodOrAccessor() && r.methodInfo.isNative()) {
+                  var m = n ? e : f;
+                  r.isMethod() ? b(m, d.ObjectUtilities.hasOwnProperty, h) : r.isGetter() ? b(m, d.ObjectUtilities.hasOwnGetter, h) : r.isSetter() && b(m, d.ObjectUtilities.hasOwnSetter, h);
                 }
               }
             }
@@ -11212,14 +11329,17 @@
         a.instanceConstructor = a;
         a.staticNatives = null;
         a.instanceNatives = null;
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+        };
         a.labelCounter = 0;
         return a;
-      }(A);
-      a.ASClass = K;
-      var F = K.prototype;
-      F.call = Function.prototype.call;
-      F.apply = Function.prototype.apply;
-      var J = function(b) {
+      }(F);
+      a.ASClass = E;
+      var Q = E.prototype;
+      Q.call = Function.prototype.call;
+      Q.apply = Function.prototype.apply;
+      var N = function(b) {
         function a() {
         }
         __extends(a, b);
@@ -11229,7 +11349,7 @@
           this.prototype = b;
         }, enumerable:!0, configurable:!0});
         Object.defineProperty(a.prototype, "native_length", {get:function() {
-          return this.hasOwnProperty(e.VM_LENGTH) ? this.asLength : this.length;
+          return this.hasOwnProperty(n.VM_LENGTH) ? this.asLength : this.length;
         }, enumerable:!0, configurable:!0});
         a.prototype.toString = function() {
           return "function Function() {}";
@@ -11238,10 +11358,19 @@
         a.instanceConstructor = Function;
         a.staticNatives = [Function];
         a.instanceNatives = [Function.prototype];
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          var b = a.dynamicPrototype, e = a.prototype;
+          h(b, "$BgtoString", e.toString);
+          h(b, "toString", e.toString);
+          h(b, "$BgtoLocaleString", e.toString);
+          h(b, "$Bgcall", b.call);
+          h(b, "$Bgapply", b.apply);
+        };
         return a;
-      }(A);
-      a.ASFunction = J;
-      var M = function(b) {
+      }(F);
+      a.ASFunction = N;
+      var B = function(b) {
         function a(b) {
         }
         __extends(a, b);
@@ -11249,48 +11378,80 @@
         a.callableConstructor = a.instanceConstructor;
         a.staticNatives = null;
         a.instanceNatives = null;
-        a.coerce = e.asCoerceBoolean;
+        a.coerce = n.asCoerceBoolean;
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          var b = Boolean.prototype;
+          h(b, "$BgtoString", b.toString);
+          h(b, "$BgvalueOf", b.valueOf);
+        };
         return a;
-      }(A);
-      a.ASBoolean = M;
-      M.prototype.toString = Boolean.prototype.toString;
-      M.prototype.valueOf = Boolean.prototype.valueOf;
-      var D = function(b) {
+      }(F);
+      a.ASBoolean = B;
+      B.prototype.toString = Boolean.prototype.toString;
+      B.prototype.valueOf = Boolean.prototype.valueOf;
+      var y = function(b) {
         function a(b, e) {
           var f = d.FunctionUtilities.bindSafely(e, b);
-          c(this, "call", f.call.bind(f));
-          c(this, "apply", f.apply.bind(f));
+          h(this, "call", f.call.bind(f));
+          h(this, "apply", f.apply.bind(f));
         }
         __extends(a, b);
+        Object.defineProperty(a.prototype, "native_prototype", {get:function() {
+          return null;
+        }, set:function(b) {
+          throwError("ReferenceError", k.Errors.ConstWriteError, "prototype", "MethodClosure");
+        }, enumerable:!0, configurable:!0});
         a.prototype.toString = function() {
           return "function Function() {}";
         };
         a.staticNatives = null;
         a.instanceNatives = null;
         return a.instanceConstructor = a;
-      }(J);
-      a.ASMethodClosure = D;
-      var B = function(b) {
-        function a() {
-          b.apply(this, arguments);
+      }(N);
+      a.ASMethodClosure = y;
+      var L = function(b) {
+        function a(b) {
         }
         __extends(a, b);
-        a._numberToString = function(b, a) {
-          return Number(b).toString(a | 0);
-        };
-        a._minValue = function() {
-          return Number.MIN_VALUE;
+        a.initializeDynamicMethods = function() {
+          var b = this.dynamicPrototype, a = Number.prototype;
+          h(b, "toString", a.toString);
+          h(b, "$BgtoString", a.toString);
+          h(b, "$BgtoLocaleString", a.toString);
+          h(b, "valueOf", a.valueOf);
+          h(b, "$BgvalueOf", a.valueOf);
+          h(b, "$BgtoExponential", a.toExponential);
+          h(b, "$BgtoPrecision", a.toPrecision);
+          h(b, "$BgtoFixed", a.toFixed);
         };
         a.instanceConstructor = Number;
         a.callableConstructor = a.instanceConstructor;
         a.staticNatives = [Math];
         a.instanceNatives = [Number.prototype];
         a.defaultValue = Number(0);
-        a.coerce = e.asCoerceNumber;
-        return a;
-      }(A);
-      a.ASNumber = B;
-      var E = function(b) {
+        a.coerce = n.asCoerceNumber;
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          h(this, "$BgNaN", Number.NaN);
+          h(this, "$BgNEGATIVE_INFINITY", Number.NEGATIVE_INFINITY);
+          h(this, "$BgPOSITIVE_INFINITY", Number.POSITIVE_INFINITY);
+          h(this, "$BgMIN_VALUE", Number.MIN_VALUE);
+          h(this, "$BgMAX_VALUE", Number.MAX_VALUE);
+          h(this, "$BgE", Math.E);
+          h(this, "$BgLN10", Math.LN10);
+          h(this, "$BgLN2", Math.LN2);
+          h(this, "$BgLOG10E", Math.LOG10E);
+          h(this, "$BgLOG2E", Math.LOG2E);
+          h(this, "$BgPI", Math.PI);
+          h(this, "$BgSQRT1_2", Math.SQRT2);
+          h(this, "$BgSQRT2", Math.SQRT2);
+          a.initializeDynamicMethods.call(this);
+        };
+        return a;
+      }(F);
+      a.ASNumber = L;
+      var A = function(b) {
         function a(b) {
           return Object(Number(b | 0));
         }
@@ -11305,18 +11466,24 @@
           return!1;
         };
         a.isType = function(b) {
-          return h(b) || b instanceof Number ? (b = +b, (b | 0) === b) : !1;
+          return p(b) || b instanceof Number ? (b = +b, (b | 0) === b) : !1;
         };
         a.instanceConstructor = a;
         a.callableConstructor = a.instanceConstructor;
         a.staticNatives = [Math];
         a.instanceNatives = [Number.prototype];
         a.defaultValue = 0;
-        a.coerce = e.asCoerceInt;
+        a.coerce = n.asCoerceInt;
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          h(this, "$BgMIN_VALUE", -2147483648);
+          h(this, "$BgMAX_VALUE", 2147483647);
+          L.initializeDynamicMethods.call(this);
+        };
         return a;
-      }(A);
-      a.ASInt = E;
-      var y = function(b) {
+      }(F);
+      a.ASInt = A;
+      var z = function(b) {
         function a(b) {
           return Object(Number(b >>> 0));
         }
@@ -11331,26 +11498,31 @@
           return!1;
         };
         a.isType = function(b) {
-          return h(b) || b instanceof Number ? (b = +b, b >>> 0 === b) : !1;
+          return p(b) || b instanceof Number ? (b = +b, b >>> 0 === b) : !1;
         };
         a.instanceConstructor = a;
         a.callableConstructor = a.instanceConstructor;
         a.staticNatives = [Math];
         a.instanceNatives = [Number.prototype];
         a.defaultValue = 0;
-        a.coerce = e.asCoerceUint;
+        a.coerce = n.asCoerceUint;
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          h(this, "$BgMIN_VALUE", 0);
+          h(this, "$BgMAX_VALUE", 4294967295);
+          L.initializeDynamicMethods.call(this);
+        };
         return a;
-      }(A);
-      a.ASUint = y;
-      var z = function(b) {
-        function a() {
-          b.apply(this, arguments);
+      }(F);
+      a.ASUint = z;
+      var G = function(a) {
+        function e(b) {
         }
-        __extends(a, b);
-        Object.defineProperty(a.prototype, "native_length", {get:function() {
+        __extends(e, a);
+        Object.defineProperty(e.prototype, "native_length", {get:function() {
           return this.length;
         }, enumerable:!0, configurable:!0});
-        a.prototype.match = function(b) {
+        e.prototype.match = function(b) {
           if (void 0 === b || null === b) {
             return null;
           }
@@ -11363,47 +11535,71 @@
           b instanceof k.XRegExp || "string" === typeof b || (b = String(b));
           return this.match(b);
         };
-        a.prototype.search = function(b) {
-          return b instanceof k.XRegExp ? this.search(b) : this.indexOf(f(b));
+        e.prototype.search = function(a) {
+          return a instanceof k.XRegExp ? this.search(a) : this.indexOf(b(a));
         };
-        a.prototype.toUpperCase = function() {
+        e.prototype.toUpperCase = function() {
           var b = String.prototype.toUpperCase.apply(this);
           return b = b.replace(/\u039C/g, String.fromCharCode(181));
         };
-        a.prototype.toLocaleUpperCase = function() {
+        e.prototype.toLocaleUpperCase = function() {
           var b = String.prototype.toLocaleUpperCase.apply(this);
           return b = b.replace(/\u039C/g, String.fromCharCode(181));
         };
-        a.instanceConstructor = String;
-        a.callableConstructor = a.instanceConstructor;
-        a.staticNatives = [String];
-        a.instanceNatives = [String.prototype];
-        a.coerce = e.asCoerceString;
-        return a;
-      }(A);
-      a.ASString = z;
+        e.instanceConstructor = String;
+        e.callableConstructor = e.instanceConstructor;
+        e.staticNatives = [String];
+        e.instanceNatives = [String.prototype];
+        e.coerce = n.asCoerceString;
+        e.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          h(String, "$Bglength", 1);
+          h(String, "$BgfromCharCode", String.fromCharCode);
+          var b = String.prototype;
+          h(b, "$BgindexOf", b.indexOf);
+          h(b, "$BglastIndexOf", b.lastIndexOf);
+          h(b, "$BgcharAt", b.charAt);
+          h(b, "$BgcharCodeAt", b.charCodeAt);
+          h(b, "$Bgconcat", b.concat);
+          h(b, "$BglocaleCompare", b.localeCompare);
+          h(b, "$Bgmatch", b.match);
+          h(b, "$Bgreplace", b.replace);
+          h(b, "$Bgsearch", b.search);
+          h(b, "$Bgslice", b.slice);
+          h(b, "$Bgsplit", b.split);
+          h(b, "$Bgsubstring", b.substring);
+          h(b, "$Bgsubstr", b.substr);
+          h(b, "$BgtoLowerCase", b.toLowerCase);
+          h(b, "$BgtoLocaleLowerCase", b.toLowerCase);
+          h(b, "$BgtoUpperCase", b.toUpperCase);
+          h(b, "$BgtoLocaleUpperCase", b.toUpperCase);
+          h(b, "$BgtoString", b.toString);
+          h(b, "$BgvalueOf", b.valueOf);
+        };
+        return e;
+      }(F);
+      a.ASString = G;
       a.arraySort = function(b, a) {
         if (0 === a.length) {
           return b.sort();
         }
         var e, f = 0;
-        a[0] instanceof Function ? e = a[0] : h(a[0]) && (f = a[0]);
-        h(a[1]) && (f = a[1]);
+        a[0] instanceof Function ? e = a[0] : p(a[0]) && (f = a[0]);
+        p(a[1]) && (f = a[1]);
         b.sort(function(b, a) {
-          return L(b, a, f, e);
+          return C(b, a, f, e);
         });
         return b;
       };
-      var G = function(b) {
-        function a() {
-          b.apply(this, arguments);
+      var I = function(b) {
+        function a(b) {
         }
         __extends(a, b);
         a.prototype.toLocaleString = function() {
-          for (var b = a.coerce(this), e = "", f = 0, c = b.length;f < c;f++) {
-            var g = b[f];
-            null !== g && void 0 !== g && (e += g.toLocaleString());
-            f + 1 < c && (e += ",");
+          for (var b = a.coerce(this), e = "", f = 0, g = b.length;f < g;f++) {
+            var n = b[f];
+            null !== n && void 0 !== n && (e += n.toLocaleString());
+            f + 1 < g && (e += ",");
           }
           return e;
         };
@@ -11426,25 +11622,25 @@
             return this.sort();
           }
           var b, a = 0;
-          arguments[0] instanceof Function ? b = arguments[0] : h(arguments[0]) && (a = arguments[0]);
-          h(arguments[1]) && (a = arguments[1]);
-          this.sort(function(f, c) {
-            return e.asCompare(f, c, a, b);
+          arguments[0] instanceof Function ? b = arguments[0] : p(arguments[0]) && (a = arguments[0]);
+          p(arguments[1]) && (a = arguments[1]);
+          this.sort(function(e, f) {
+            return n.asCompare(e, f, a, b);
           });
           return this;
         };
-        a.prototype.sortOn = function(b, f) {
+        a.prototype.sortOn = function(b, e) {
           d.isString(b) && (b = [b]);
-          p(f) ? f = [] : h(f) && (f = [f]);
-          for (var c = b.length - 1;0 <= c;c--) {
-            var g = u.getPublicQualifiedName(b[c]);
-            if (a.CACHE_NUMERIC_COMPARATORS && f[c] & 16) {
-              var n = "var x = +(a." + g + "), y = +(b." + g + ");", n = f[c] & 2 ? n + "return x < y ? 1 : (x > y ? -1 : 0);" : n + "return x < y ? -1 : (x > y ? 1 : 0);", q = a.numericComparatorCache[n];
-              q || (q = a.numericComparatorCache[n] = new Function("a", "b", n));
-              this.sort(q);
+          s(e) ? e = [] : p(e) && (e = [e]);
+          for (var f = b.length - 1;0 <= f;f--) {
+            var g = t.getPublicQualifiedName(b[f]);
+            if (a.CACHE_NUMERIC_COMPARATORS && e[f] & 16) {
+              var c = "var x = +(a." + g + "), y = +(b." + g + ");", c = e[f] & 2 ? c + "return x < y ? 1 : (x > y ? -1 : 0);" : c + "return x < y ? -1 : (x > y ? 1 : 0);", r = a.numericComparatorCache[c];
+              r || (r = a.numericComparatorCache[c] = new Function("a", "b", c));
+              this.sort(r);
             } else {
               this.sort(function(b, a) {
-                return e.asCompare(b[g], a[g], f[c] | 0);
+                return n.asCompare(b[g], a[g], e[f] | 0);
               });
             }
           }
@@ -11459,34 +11655,40 @@
         a.staticNatives = [Array];
         a.instanceNatives = [Array.prototype];
         a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          h(this, "$BgCASEINSENSITIVE", 1);
+          h(this, "$BgDESCENDING", 2);
+          h(this, "$BgUNIQUESORT", 4);
+          h(this, "$BgRETURNINDEXEDARRAY", 8);
+          h(this, "$BgNUMERIC", 16);
           var b = Array.prototype, e = a.prototype;
-          c(b, "$Bgjoin", b.join);
-          c(b, "$BgtoString", b.join);
-          c(b, "$BgtoLocaleString", e.toLocaleString);
-          c(b, "$Bgpop", b.pop);
-          c(b, "$Bgpush", b.push);
-          c(b, "$Bgreverse", b.reverse);
-          c(b, "$Bgconcat", b.concat);
-          c(b, "$Bgsplice", e.splice);
-          c(b, "$Bgslice", b.slice);
-          c(b, "$Bgshift", b.shift);
-          c(b, "$Bgunshift", b.unshift);
-          c(b, "$BgindexOf", b.indexOf);
-          c(b, "$BglastIndexOf", b.lastIndexOf);
-          c(b, "$BgforEach", b.forEach);
-          c(b, "$Bgmap", b.map);
-          c(b, "$Bgfilter", b.filter);
-          c(b, "$Bgsome", b.some);
-          c(b, "$Bgevery", e.every);
-          c(b, "$Bgsort", e.sort);
-          c(b, "$BgsortOn", e.sortOn);
+          h(b, "$Bgjoin", b.join);
+          h(b, "$BgtoString", b.join);
+          h(b, "$BgtoLocaleString", e.toLocaleString);
+          h(b, "$Bgpop", b.pop);
+          h(b, "$Bgpush", b.push);
+          h(b, "$Bgreverse", b.reverse);
+          h(b, "$Bgconcat", b.concat);
+          h(b, "$Bgsplice", e.splice);
+          h(b, "$Bgslice", b.slice);
+          h(b, "$Bgshift", b.shift);
+          h(b, "$Bgunshift", b.unshift);
+          h(b, "$BgindexOf", b.indexOf);
+          h(b, "$BglastIndexOf", b.lastIndexOf);
+          h(b, "$BgforEach", b.forEach);
+          h(b, "$Bgmap", b.map);
+          h(b, "$Bgfilter", b.filter);
+          h(b, "$Bgsome", b.some);
+          h(b, "$Bgevery", e.every);
+          h(b, "$Bgsort", e.sort);
+          h(b, "$BgsortOn", e.sortOn);
         };
         a.CACHE_NUMERIC_COMPARATORS = !0;
         a.numericComparatorCache = Object.create(null);
         return a;
-      }(A);
-      a.ASArray = G;
-      var C = function(b) {
+      }(F);
+      a.ASArray = I;
+      var D = function(b) {
         function a() {
           b.apply(this, arguments);
         }
@@ -11499,158 +11701,292 @@
         a.instanceConstructor = a;
         a.callableConstructor = null;
         return a;
-      }(H);
-      a.ASVector = C;
-      var I = function(b) {
-        function a() {
-          b.apply(this, arguments);
+      }(K);
+      a.ASVector = D;
+      var R = function(a) {
+        function e() {
+          a.apply(this, arguments);
         }
-        __extends(a, b);
-        a.transformJSValueToAS = function(b, e) {
-          if ("object" !== typeof b || p(b)) {
+        __extends(e, a);
+        e.parse = function(a, e) {
+          a = b(a);
+          null === a && throwError("SyntaxError", k.Errors.JSONInvalidParseInput);
+          var f = this.transformJSValueToAS(JSON.parse(a), !0);
+          return null === e || 2 > arguments.length ? f : q({"":f}, "", e);
+        };
+        e.stringify = function(b, a, e) {
+          void 0 === a && (a = null);
+          void 0 === e && (e = null);
+          null === a || a instanceof Function || Array.isArray(a) || throwError("TypeError", k.Errors.JSONInvalidReplacer);
+          e = "string" === typeof e ? 10 < e.length ? e.substring(0, 10) : e : "number" === typeof e ? "          ".substring(0, Math.min(10, e | 0)) : "";
+          return null === a ? this.stringifySpecializedToString(b, null, null, e) : Array.isArray(a) ? this.stringifySpecializedToString(b, this.computePropertyList(a), null, e) : this.stringifySpecializedToString(b, null, a, e);
+        };
+        e.computePropertyList = function(a) {
+          for (var e = [], f = Object.create(null), g = 0, n = a.length;g < n;g++) {
+            if (a.hasOwnProperty(g)) {
+              var c = a[g], r = null;
+              "string" === typeof c ? r = c : "number" === typeof c && (r = b(c));
+              null === r || f[r] || (f[r] = !0, e.push(r));
+            }
+          }
+          return e;
+        };
+        e.transformJSValueToAS = function(b, a) {
+          if ("object" !== typeof b || s(b)) {
             return b;
           }
-          for (var f = Object.keys(b), c = Array.isArray(b) ? [] : {}, g = 0;g < f.length;g++) {
-            var n = b[f[g]];
-            e && (n = a.transformJSValueToAS(n, !0));
-            c.asSetPublicProperty(f[g], n);
+          for (var f = Object.keys(b), g = Array.isArray(b) ? [] : {}, n = 0;n < f.length;n++) {
+            var c = b[f[n]];
+            a && (c = e.transformJSValueToAS(c, !0));
+            g.asSetPublicProperty(f[n], c);
           }
-          return c;
+          return g;
         };
-        a.transformASValueToJS = function(b, e) {
-          if ("object" !== typeof b || p(b)) {
+        e.transformASValueToJS = function(b, a) {
+          if ("object" !== typeof b || s(b)) {
             return b;
           }
-          for (var f = Object.keys(b), c = Array.isArray(b) ? [] : {}, g = 0;g < f.length;g++) {
-            var n = f[g], q = n;
-            d.isNumeric(n) || (q = u.getNameFromPublicQualifiedName(n));
-            n = b[n];
-            e && (n = a.transformASValueToJS(n, !0));
-            c[q] = n;
+          for (var f = Object.keys(b), g = Array.isArray(b) ? [] : {}, n = 0;n < f.length;n++) {
+            var c = f[n], r = c;
+            d.isNumeric(c) || (r = t.getNameFromPublicQualifiedName(c));
+            c = b[c];
+            a && (c = e.transformASValueToJS(c, !0));
+            g[r] = c;
           }
-          return c;
+          return g;
+        };
+        e.stringifySpecializedToString = function(b, a, f, g) {
+          return JSON.stringify(e.transformASValueToJS(b, !0), f, g);
+        };
+        e.instanceConstructor = e;
+        e.staticNatives = null;
+        e.instanceNatives = null;
+        return e;
+      }(F);
+      a.ASJSON = R;
+      var T = function(a) {
+        function e(a, f) {
+          this.message = b(a);
+          this._errorID = f | 0;
+          this.name = this.constructor.dynamicPrototype.$Bgname;
+        }
+        __extends(e, a);
+        e.throwError = function(b, a) {
+          for (var e = [k.getErrorInfo(a)], f = 2;f < arguments.length;f++) {
+            e.push(arguments[f]);
+          }
+          e = k.formatErrorMessage.apply(null, e);
+          throw new b(e, a);
         };
-        a.parseCore = function(b) {
-          b = f(b);
-          return a.transformJSValueToAS(JSON.parse(b), !0);
+        e.prototype.toString = function() {
+          return "" !== this.message ? this.name + ": " + this.message : this.name;
         };
-        a.stringifySpecializedToString = function(b, e, f, c) {
-          return JSON.stringify(a.transformASValueToJS(b, !0), f, c);
+        Object.defineProperty(e.prototype, "errorID", {get:function() {
+          return this._errorID;
+        }, enumerable:!0, configurable:!0});
+        e.prototype.getStackTrace = function() {
+          return null;
+        };
+        e.instanceConstructor = null;
+        e.staticNatives = null;
+        e.instanceNatives = null;
+        e.getErrorMessage = d.AVM2.getErrorMessage;
+        e.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          h(this.dynamicPrototype, "$Bgname", "Error");
+          h(this.dynamicPrototype, "$Bgmessage", "Error");
+          h(this.dynamicPrototype, "$BgtoString", this.prototype.toString);
+        };
+        return e;
+      }(K);
+      a.ASError = T;
+      var J = function(b) {
+        function a() {
+          b.apply(this, arguments);
+        }
+        __extends(a, b);
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          h(this.dynamicPrototype, "$Bgname", this.name.substr(2));
         };
-        a.instanceConstructor = a;
-        a.staticNatives = null;
-        a.instanceNatives = null;
         return a;
-      }(A);
-      a.ASJSON = I;
+      }(T);
+      a.ASDefinitionError = J;
       var P = function(b) {
-        function a(b, e) {
-          g("ASError");
+        function a() {
+          b.apply(this, arguments);
         }
         __extends(a, b);
-        a.prototype.getStackTrace = function() {
-          return null;
-        };
-        a.instanceConstructor = null;
-        a.staticNatives = null;
-        a.instanceNatives = null;
-        a.getErrorMessage = d.AVM2.getErrorMessage;
+        a.classInitializer = J.classInitializer;
         return a;
-      }(H);
-      a.ASError = P;
-      var T = function(b) {
+      }(T);
+      a.ASEvalError = P;
+      var S = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASDefinitionError = T;
-      var O = function(b) {
+      }(T);
+      a.ASRangeError = S;
+      var W = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASEvalError = O;
-      var Q = function(b) {
+      }(T);
+      a.ASReferenceError = W;
+      var ba = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASRangeError = Q;
-      var S = function(b) {
+      }(T);
+      a.ASSecurityError = ba;
+      var w = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASReferenceError = S;
-      var V = function(b) {
+      }(T);
+      a.ASSyntaxError = w;
+      var X = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASSecurityError = V;
-      var aa = function(b) {
+      }(T);
+      a.ASTypeError = X;
+      var U = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASSyntaxError = aa;
+      }(T);
+      a.ASURIError = U;
       var $ = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASTypeError = $;
-      var w = function(b) {
+      }(T);
+      a.ASVerifyError = $;
+      var Y = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASURIError = w;
-      var U = function(b) {
+      }(T);
+      a.ASUninitializedError = Y;
+      var M = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASVerifyError = U;
-      var ba = function(b) {
+      }(T);
+      a.ASArgumentError = M;
+      var Z = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASUninitializedError = ba;
-      var R = function(b) {
+      }(T);
+      a.ASIOError = Z;
+      var ca = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
         return a;
-      }(P);
-      a.ASArgumentError = R;
-      var N = function(b) {
+      }(T);
+      a.ASEOFError = ca;
+      var ga = function(b) {
+        function a() {
+          b.apply(this, arguments);
+        }
+        __extends(a, b);
+        a.classInitializer = J.classInitializer;
+        return a;
+      }(T);
+      a.ASMemoryError = ga;
+      var ha = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
+        a.classInitializer = J.classInitializer;
+        return a;
+      }(T);
+      a.ASIllegalOperationError = ha;
+      var ea = function(b) {
+        function a(b) {
+        }
+        __extends(a, b);
+        a.prototype.ecmaToString = function() {
+          var b = "/" + this.source + "/";
+          this.global && (b += "g");
+          this.ignoreCase && (b += "i");
+          this.multiline && (b += "m");
+          this.dotall && (b += "s");
+          this.extended && (b += "x");
+          return b;
+        };
+        Object.defineProperty(a.prototype, "source", {get:function() {
+          var b = g(RegExp.prototype, "source");
+          if (b && "get" in b) {
+            return b.get.call(this);
+          }
+          if ((b = g(this, "source")) && "value" in b) {
+            return b.value;
+          }
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "global", {get:function() {
+          var b = g(RegExp.prototype, "global");
+          if (b && "get" in b) {
+            return b.get.call(this);
+          }
+          if ((b = g(this, "global")) && "value" in b) {
+            return b.value;
+          }
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "ignoreCase", {get:function() {
+          var b = g(RegExp.prototype, "ignoreCase");
+          if (b && "get" in b) {
+            return b.get.call(this);
+          }
+          if ((b = g(this, "ignoreCase")) && "value" in b) {
+            return b.value;
+          }
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "multiline", {get:function() {
+          var b = g(RegExp.prototype, "multiline");
+          if (b && "get" in b) {
+            return b.get.call(this);
+          }
+          if ((b = g(this, "multiline")) && "value" in b) {
+            return b.value;
+          }
+        }, enumerable:!0, configurable:!0});
         Object.defineProperty(a.prototype, "native_source", {get:function() {
           return this.source;
         }, enumerable:!0, configurable:!0});
@@ -11681,113 +12017,258 @@
             return a;
           }
           for (var e = Object.keys(a), f = 0;f < e.length;f++) {
-            var c = e[f];
-            d.isNumeric(c) || void 0 === a[c] && (a[c] = "");
+            var g = e[f];
+            d.isNumeric(g) || void 0 === a[g] && (a[g] = "");
           }
           d.AVM2.Runtime.publicizeProperties(a);
           return a;
         };
+        a.prototype.test = function(b) {
+          void 0 === b && (b = "");
+          return null !== this.exec(b);
+        };
         a.instanceConstructor = k.XRegExp;
         a.staticNatives = [k.XRegExp];
         a.instanceNatives = [k.XRegExp.prototype];
+        a.classInitializer = function() {
+          h(this, "$Bglength", 1);
+          var b = k.XRegExp.prototype;
+          h(b, "$BgtoString", a.prototype.ecmaToString);
+          h(b, "$Bgexec", b.exec);
+          h(b, "$Bgtest", b.test);
+        };
         return a;
-      }(A);
-      a.ASRegExp = N;
-      var Z = function(b) {
+      }(F);
+      a.ASRegExp = ea;
+      var aa = function(b) {
         function a() {
           b.apply(this, arguments);
         }
         __extends(a, b);
         a.staticNatives = [Math];
+        a.classInitializer = function() {
+          h(this, "$BgE", Math.E);
+          h(this, "$BgLN10", Math.LN10);
+          h(this, "$BgLN2", Math.LN2);
+          h(this, "$BgLOG10E", Math.LOG10E);
+          h(this, "$BgLOG2E", Math.LOG2E);
+          h(this, "$BgPI", Math.PI);
+          h(this, "$BgSQRT1_2", Math.SQRT2);
+          h(this, "$BgSQRT2", Math.SQRT2);
+        };
         return a;
-      }(H);
-      a.ASMath = Z;
-      var fa = function(b) {
-        function a() {
-          b.apply(this, arguments);
+      }(K);
+      a.ASMath = aa;
+      var da = function(b) {
+        function a(b) {
         }
         __extends(a, b);
-        a.staticNatives = [Date];
-        a.instanceNatives = [Date.prototype];
-        a.instanceConstructor = Date;
-        return a;
-      }(H);
-      a.ASDate = fa;
-      var X = d.ObjectUtilities.createMap(), ia = !1;
+        Object.defineProperty(a.prototype, "fullYear", {get:function() {
+          return this.getFullYear();
+        }, set:function(b) {
+          this.setFullYear(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "month", {get:function() {
+          return this.getMonth();
+        }, set:function(b) {
+          this.setMonth(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "date", {get:function() {
+          return this.getDate();
+        }, set:function(b) {
+          this.setDate(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "hours", {get:function() {
+          return this.getHours();
+        }, set:function(b) {
+          this.setHours(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "minutes", {get:function() {
+          return this.getMinutes();
+        }, set:function(b) {
+          this.setMinutes(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "seconds", {get:function() {
+          return this.getSeconds();
+        }, set:function(b) {
+          this.setSeconds(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "milliseconds", {get:function() {
+          return this.getMilliseconds();
+        }, set:function(b) {
+          this.setMilliseconds(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "fullYearUTC", {get:function() {
+          return this.getUTCFullYear();
+        }, set:function(b) {
+          this.setUTCFullYear(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "monthUTC", {get:function() {
+          return this.getUTCMonth();
+        }, set:function(b) {
+          this.setUTCMonth(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "dateUTC", {get:function() {
+          return this.getUTCDate();
+        }, set:function(b) {
+          this.setUTCDate(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "hoursUTC", {get:function() {
+          return this.getUTCHours();
+        }, set:function(b) {
+          this.setUTCHours(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "minutesUTC", {get:function() {
+          return this.getUTCMinutes();
+        }, set:function(b) {
+          this.setUTCMinutes(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "secondsUTC", {get:function() {
+          return this.getUTCSeconds();
+        }, set:function(b) {
+          this.setUTCSeconds(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "millisecondsUTC", {get:function() {
+          return this.getUTCMilliseconds();
+        }, set:function(b) {
+          this.setUTCMilliseconds(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "time", {get:function() {
+          return this.getTime();
+        }, set:function(b) {
+          this.setTime(b);
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "timezoneOffset", {get:function() {
+          return this.getTimezoneOffset();
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "day", {get:function() {
+          return this.getDay();
+        }, enumerable:!0, configurable:!0});
+        Object.defineProperty(a.prototype, "dayUTC", {get:function() {
+          return this.getUTCDay();
+        }, enumerable:!0, configurable:!0});
+        a.staticNatives = [Date];
+        a.instanceNatives = [Date.prototype];
+        a.instanceConstructor = Date;
+        a.classInitializer = function() {
+          c(a, "$Bglength", 7);
+          c(Date, "$Bglength", 7);
+          var b = Date.prototype;
+          h(b, "$BgtoString", b.toString);
+          h(b, "$BgvalueOf", b.valueOf);
+          h(b, "$BgtoDateString", b.toDateString);
+          h(b, "$BgtoTimeString", b.toTimeString);
+          h(b, "$BgtoLocaleString", b.toLocaleString);
+          h(b, "$BgtoLocaleDateString", b.toLocaleDateString);
+          h(b, "$BgtoLocaleTimeString", b.toLocaleTimeString);
+          h(b, "$BgtoUTCString", b.toUTCString);
+          h(b, "$BgtoJSON", b.toJSON);
+          h(b, "$BggetUTCFullYear", b.getUTCFullYear);
+          h(b, "$BggetUTCMonth", b.getUTCMonth);
+          h(b, "$BggetUTCDate", b.getUTCDate);
+          h(b, "$BggetUTCDay", b.getUTCDay);
+          h(b, "$BggetUTCHours", b.getUTCHours);
+          h(b, "$BggetUTCMinutes", b.getUTCMinutes);
+          h(b, "$BggetUTCSeconds", b.getUTCSeconds);
+          h(b, "$BggetUTCMilliseconds", b.getUTCMilliseconds);
+          h(b, "$BggetFullYear", b.getFullYear);
+          h(b, "$BggetMonth", b.getMonth);
+          h(b, "$BggetDate", b.getDate);
+          h(b, "$BggetDay", b.getDay);
+          h(b, "$BggetHours", b.getHours);
+          h(b, "$BggetMinutes", b.getMinutes);
+          h(b, "$BggetSeconds", b.getSeconds);
+          h(b, "$BggetMilliseconds", b.getMilliseconds);
+          h(b, "$BggetTimezoneOffset", b.getTimezoneOffset);
+          h(b, "$BggetTime", b.getTime);
+          h(b, "$BgsetFullYear", b.setFullYear);
+          h(b, "$BgsetMonth", b.setMonth);
+          h(b, "$BgsetDate", b.setDate);
+          h(b, "$BgsetHours", b.setHours);
+          h(b, "$BgsetMinutes", b.setMinutes);
+          h(b, "$BgsetSeconds", b.setSeconds);
+          h(b, "$BgsetMilliseconds", b.setMilliseconds);
+          h(b, "$BgsetUTCFullYear", b.setUTCFullYear);
+          h(b, "$BgsetUTCMonth", b.setUTCMonth);
+          h(b, "$BgsetUTCDate", b.setUTCDate);
+          h(b, "$BgsetUTCHours", b.setUTCHours);
+          h(b, "$BgsetUTCMinutes", b.setUTCMinutes);
+          h(b, "$BgsetUTCSeconds", b.setUTCSeconds);
+          h(b, "$BgsetUTCMilliseconds", b.setUTCMilliseconds);
+        };
+        return a;
+      }(K);
+      a.ASDate = da;
+      var O = d.ObjectUtilities.createMap(), ka = !1;
       a.initialize = function(b) {
-        ia || (X.ObjectClass = A, X.Class = K, X.FunctionClass = J, X.BooleanClass = M, X.MethodClosureClass = D, X.NamespaceClass = a.ASNamespace, X.NumberClass = B, X.IntClass = E, X.UIntClass = y, X.StringClass = z, X.ArrayClass = G, X.VectorClass = C, X.ObjectVectorClass = a.GenericVector, X.IntVectorClass = a.Int32Vector, X.UIntVectorClass = a.Uint32Vector, X.DoubleVectorClass = a.Float64Vector, X.JSONClass = I, X.XMLClass = a.ASXML, X.XMLListClass = a.ASXMLList, X.QNameClass = a.ASQName, X.ErrorClass = 
-        P, X.DefinitionErrorClass = T, X.EvalErrorClass = O, X.RangeErrorClass = Q, X.ReferenceErrorClass = S, X.SecurityErrorClass = V, X.SyntaxErrorClass = aa, X.TypeErrorClass = $, X.URIErrorClass = w, X.VerifyErrorClass = U, X.UninitializedErrorClass = ba, X.ArgumentErrorClass = R, X.DateClass = fa, X.MathClass = Z, X.RegExpClass = N, X.ProxyClass = a.flash.utils.OriginalProxy, X.DictionaryClass = a.flash.utils.OriginalDictionary, X.ByteArrayClass = a.flash.utils.OriginalByteArray, X.SystemClass = 
-        a.flash.system.OriginalSystem, ia = !0);
+        ka || (O.ObjectClass = F, O.Class = E, O.FunctionClass = N, O.BooleanClass = B, O.MethodClosureClass = y, O.NamespaceClass = a.ASNamespace, O.NumberClass = L, O.IntClass = A, O.UIntClass = z, O.StringClass = G, O.ArrayClass = I, O.VectorClass = D, O.ObjectVectorClass = a.GenericVector, O.IntVectorClass = a.Int32Vector, O.UIntVectorClass = a.Uint32Vector, O.DoubleVectorClass = a.Float64Vector, O.JSONClass = R, O.XMLClass = a.ASXML, O.XMLListClass = a.ASXMLList, O.QNameClass = a.ASQName, O.ErrorClass = 
+        T, O.DefinitionErrorClass = J, O.EvalErrorClass = P, O.RangeErrorClass = S, O.ReferenceErrorClass = W, O.SecurityErrorClass = ba, O.SyntaxErrorClass = w, O.TypeErrorClass = X, O.URIErrorClass = U, O.VerifyErrorClass = $, O.UninitializedErrorClass = Y, O.ArgumentErrorClass = M, O.IOErrorClass = Z, O.EOFErrorClass = ca, O.MemoryErrorClass = ga, O.IllegalOperationErrorClass = ha, O.DateClass = da, O.MathClass = aa, O.RegExpClass = ea, O.ProxyClass = a.flash.utils.OriginalProxy, O.DictionaryClass = 
+        a.flash.utils.OriginalDictionary, O.ByteArrayClass = a.flash.utils.OriginalByteArray, O.CompressionAlgorithmClass = a.flash.utils.CompressionAlgorithm, O.SystemClass = a.flash.system.OriginalSystem, ka = !0);
       };
-      var ga = d.ObjectUtilities.createMap(), ca = d.ObjectUtilities.createMap();
+      var V = d.ObjectUtilities.createMap(), ja = d.ObjectUtilities.createMap();
       a.registerNativeClass = function(b, a) {
-        ga[b] = a;
+        V[b] = a;
       };
       a.registerNativeFunction = function(b, a) {
-        ca[b] = a;
+        ja[b] = a;
       };
       a.createInterface = function(b) {
         var a = b.instanceInfo;
-        b = new K(b);
-        b.interfaceBindings = new x(null, a, null, null);
+        b = new E(b);
+        b.interfaceBindings = new H(null, a, null, null);
         b.verify();
         return b;
       };
-      var da = [];
-      a.createClass = function(a, e, f) {
-        var c = a.instanceInfo, g = a.abc.applicationDomain, q = a.native, p;
-        q ? ((p = X[a.native.cls]) || (p = ga[a.native.cls]), p || d.Debug.unexpected("No native class for " + a.native.cls), p.morphIntoASClass(a), da && da.push(p)) : p = new K(a);
-        f = new t(f, null);
-        f.object = p;
-        var h = null, h = c.init.isNative() ? p : b(c.init, f, !1, !1), m = null, s = null;
-        q && (m = [p], p.staticNatives && d.ArrayUtilities.pushMany(m, p.staticNatives), s = [p.prototype], p.instanceNatives && d.ArrayUtilities.pushMany(s, p.instanceNatives));
-        K.create(p, e, h);
-        if ("Class" === a.instanceInfo.name.name) {
-          for (q = 0;q < da.length;q++) {
-            da[q].__proto__ = K.prototype;
+      var la = [];
+      a.createClass = function(b, a, f) {
+        var g = b.instanceInfo, n = b.abc.applicationDomain, c = b.native, r;
+        c ? ((r = O[b.native.cls]) || (r = V[b.native.cls]), r || d.Debug.unexpected("No native class for " + b.native.cls), r.morphIntoASClass(b), la && la.push(r)) : r = new E(b);
+        r.baseClass = a;
+        f = new u(f, null);
+        f.object = r;
+        var h = null, h = g.init.isNative() ? r : e(g.init, f, !1, !1), m = null, p = null;
+        c && (m = [r], r.staticNatives && d.ArrayUtilities.pushMany(m, r.staticNatives), p = [r.prototype], r.instanceNatives && d.ArrayUtilities.pushMany(p, r.instanceNatives));
+        E.create(r, a, h);
+        if ("Class" === b.instanceInfo.name.name) {
+          for (c = 0;c < la.length;c++) {
+            la[c].__proto__ = E.prototype;
           }
-          da = null;
+          la = null;
         }
         k.enterTimeline("InstanceBindings");
-        p.instanceBindings = new x(e ? e.instanceBindings : null, c, f, s);
-        p.instanceConstructor && (k.enterTimeline("applyTo"), p.instanceBindings.applyTo(g, p.traitsPrototype), k.leaveTimeline());
+        r.instanceBindings = new H(a ? a.instanceBindings : null, g, f, p);
+        r.instanceConstructor && (k.enterTimeline("applyTo"), r.instanceBindings.applyTo(n, r.traitsPrototype), k.leaveTimeline());
         k.leaveTimeline();
         k.enterTimeline("ClassBindings");
-        p.classBindings = new n(a, f, m);
+        r.classBindings = new x(b, f, m);
         k.enterTimeline("applyTo");
-        p.classBindings.applyTo(g, p);
-        p === K ? p.instanceBindings.applyTo(g, A, !0) : K.instanceBindings && K.instanceBindings.applyTo(g, p, !0);
+        r.classBindings.applyTo(n, r);
+        r === E ? r.instanceBindings.applyTo(n, F, !0) : E.instanceBindings && E.instanceBindings.applyTo(n, r, !0);
         k.leaveTimeline();
         k.leaveTimeline();
-        p.implementedInterfaces = p.instanceBindings.implementedInterfaces;
+        r.implementedInterfaces = r.instanceBindings.implementedInterfaces;
         k.enterTimeline("Configure");
-        K.configureInitializers(p);
-        K.linkSymbols(p);
-        K.runClassInitializer(p);
+        E.configureInitializers(r);
+        E.linkSymbols(r);
+        E.runClassInitializer(r);
         k.leaveTimeline();
-        return p;
+        return r;
       };
       a.getMethodOrAccessorNative = function(b, a) {
-        for (var e = r(u.getName(b.name)), f = 0;f < a.length;f++) {
-          var c = a[f], g = e;
-          l(c, "original_" + e) && (g = "original_" + e);
-          !l(c, e) && l(c, "native_" + e) && (g = "native_" + e);
-          if (l(c, g)) {
-            return b.isAccessor() ? (e = m(c, g), e = b.isGetter() ? e.get : e.set) : e = c[g], e;
+        for (var e = v(t.getName(b.name)), f = 0;f < a.length;f++) {
+          var n = a[f], c = e;
+          l(n, "original_" + e) && (c = "original_" + e);
+          !l(n, e) && l(n, "native_" + e) && (c = "native_" + e);
+          if (l(n, c)) {
+            return b.isAccessor() ? (e = g(n, c), e = b.isGetter() ? e.get : e.set) : e = n[c], e;
           }
         }
-        d.Debug.warning("No native method for: " + b.kindName() + " " + b.methodInfo.holder + "::" + u.getQualifiedName(b.name) + ", make sure you've got the static keyword for static methods.");
+        d.Debug.warning("No native method for: " + b.kindName() + " " + b.methodInfo.holder + "::" + t.getQualifiedName(b.name) + ", make sure you've got the static keyword for static methods.");
         return null;
       };
-      a.escapeNativeName = r;
-      var ea;
+      a.escapeNativeName = v;
+      var ma;
       (function(b) {
-        function a(b) {
-          for (var e = {prototype:Object.create(null)}, f = Object.getOwnPropertyNames(b.prototype), c = 0;c < f.length;c++) {
-            e.prototype[f[c]] = b.prototype[f[c]];
-          }
-          return e;
-        }
         b.String = jsGlobal.String;
         b.Function = jsGlobal.Function;
         b.Boolean = jsGlobal.Boolean;
@@ -11795,8 +12276,7 @@
         b.Date = jsGlobal.Date;
         b.ASObject = d.AVM2.AS.ASObject;
         b.ASFunction = d.AVM2.AS.ASFunction;
-        b.Original = {Date:a(b.Date), Array:a(Array), String:a(b.String), Number:a(b.Number), Boolean:a(b.Boolean)};
-        b.print = function(b, a, e, f, c) {
+        b.print = function(b, a, e, f, g) {
           jsGlobal.print.apply(null, arguments);
         };
         b.debugBreak = function(b) {
@@ -11828,18 +12308,18 @@
           if (void 0 === b) {
             return "void";
           }
-          if (E.isType(b)) {
+          if (A.isType(b)) {
             return "int";
           }
-          b = q(b);
-          return K.isType(b) ? b.getQualifiedClassName() : b.class.getQualifiedClassName();
+          b = r(b);
+          return E.isType(b) ? b.getQualifiedClassName() : b.class.getQualifiedClassName();
         };
         b.getQualifiedSuperclassName = function(b) {
-          if (p(b)) {
+          if (s(b)) {
             return "null";
           }
-          b = q(b);
-          b = K.isType(b) ? b : b.class;
+          b = r(b);
+          b = E.isType(b) ? b : b.class;
           return b.baseClass ? b.baseClass.getQualifiedClassName() : "null";
         };
         b.getDefinitionByName = function(a) {
@@ -11852,22 +12332,27 @@
         b.describeTypeJSON = function(b, a) {
           return d.AVM2.AS.describeTypeJSON(b, a);
         };
-      })(ea = a.Natives || (a.Natives = {}));
-      a.getNative = v;
-      ca.unsafeJSNative = v;
+      })(ma = a.Natives || (a.Natives = {}));
+      a.getNative = function(b) {
+        for (var a = b.split("."), e = ma, f = 0, g = a.length;f < g;f++) {
+          e = e && e[a[f]];
+        }
+        e || (e = ja[b]);
+        return e;
+      };
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.AVM2.Runtime.asCoerceString, v = d.ObjectUtilities.defineNonEnumerableProperty, u = d.AVM2.Runtime.throwError, t = d.AVM2.Runtime.asCheckVectorGetNumericProperty, l = d.AVM2.Runtime.asCheckVectorSetNumericProperty, c = function(c) {
-        function p(c, p, g) {
+      var q = d.AVM2.Runtime.asCoerceString, v = d.ObjectUtilities.defineNonEnumerableProperty, t = d.AVM2.Runtime.throwError, u = d.AVM2.Runtime.asCheckVectorGetNumericProperty, l = d.AVM2.Runtime.asCheckVectorSetNumericProperty, c = function(c) {
+        function p(c, h, g) {
           void 0 === c && (c = 0);
-          void 0 === p && (p = !1);
+          void 0 === h && (h = !1);
           void 0 === g && (g = a.ASObject);
           c >>>= 0;
-          this._fixed = !!p;
+          this._fixed = !!h;
           this._buffer = Array(c);
           this._defaultValue = (this._type = g) ? g.defaultValue : null;
           this._fill(c, this._defaultValue);
@@ -11892,14 +12377,14 @@
           }
           h.prototype = p.prototype;
           h.instanceConstructor = h;
-          h.callableConstructor = function(c) {
-            if (c instanceof a.Int32Vector) {
-              return c;
+          h.callableConstructor = function(g) {
+            if (g instanceof a.Int32Vector) {
+              return g;
             }
-            var f = c.asGetProperty(void 0, "length");
+            var f = g.asGetProperty(void 0, "length");
             if (void 0 !== f) {
               for (var b = new h(f, !1), e = 0;e < f;e++) {
-                b.asSetNumericProperty(e, c.asGetPublicProperty(e));
+                b.asSetNumericProperty(e, g.asGetPublicProperty(e));
               }
               return b;
             }
@@ -11938,9 +12423,9 @@
           }) : this._buffer.sort(function(a, f) {
             return asCoerceNumber(a) - asCoerceNumber(f);
           }) : c && p.CASEINSENSITIVE ? c & p.DESCENDING ? this._buffer.sort(function(a, f) {
-            return r(f).toLowerCase() - r(a).toLowerCase();
+            return q(f).toLowerCase() - q(a).toLowerCase();
           }) : this._buffer.sort(function(a, f) {
-            return r(a).toLowerCase() - r(f).toLowerCase();
+            return q(a).toLowerCase() - q(f).toLowerCase();
           }) : c & p.DESCENDING ? this._buffer.sort(function(a, f) {
             return f - a;
           }) : this._buffer.sort();
@@ -11960,7 +12445,7 @@
           return g;
         };
         p.prototype.some = function(a, c) {
-          2 !== arguments.length ? u("ArgumentError", k.Errors.WrongArgumentCountError) : d.isFunction(a) || u("ArgumentError", k.Errors.CheckTypeFailedError);
+          2 !== arguments.length ? t("ArgumentError", k.Errors.WrongArgumentCountError) : d.isFunction(a) || t("ArgumentError", k.Errors.CheckTypeFailedError);
           for (var g = 0;g < this._buffer.length;g++) {
             if (a.call(c, this.asGetNumericProperty(g), g, this)) {
               return!0;
@@ -11969,7 +12454,7 @@
           return!1;
         };
         p.prototype.forEach = function(a, c) {
-          d.isFunction(a) || u("ArgumentError", k.Errors.CheckTypeFailedError);
+          d.isFunction(a) || t("ArgumentError", k.Errors.CheckTypeFailedError);
           for (var g = 0;g < this._buffer.length;g++) {
             a.call(c, this.asGetNumericProperty(g), g, this);
           }
@@ -11991,16 +12476,16 @@
           return this._buffer.lastIndexOf(a, c);
         };
         p.prototype.map = function(a, c) {
-          d.isFunction(a) || u("ArgumentError", k.Errors.CheckTypeFailedError);
+          d.isFunction(a) || t("ArgumentError", k.Errors.CheckTypeFailedError);
           for (var g = new p(0, !1, this._type), f = 0;f < this._buffer.length;f++) {
             g.push(a.call(c, this.asGetNumericProperty(f), f, this));
           }
           return g;
         };
-        p.prototype.push = function(a, c, g, f, b, e, q, n) {
+        p.prototype.push = function(a, c, g, f, b, e, n, r) {
           this._checkFixed();
-          for (var p = 0;p < arguments.length;p++) {
-            this._buffer.push(this._coerce(arguments[p]));
+          for (var h = 0;h < arguments.length;h++) {
+            this._buffer.push(this._coerce(arguments[h]));
           }
         };
         p.prototype.pop = function() {
@@ -12042,8 +12527,8 @@
         p.prototype.splice = function(a, c) {
           var g = this._buffer, f = g.length, b = Math.min(Math.max(a, 0), f), f = Math.min(Math.max(c, 0), f - b), e = arguments.length - 2;
           f !== e && this._checkFixed();
-          for (var b = [b, f], q = 2;q < e + 2;q++) {
-            b[q] = this._coerce(arguments[q]);
+          for (var b = [b, f], n = 2;n < e + 2;n++) {
+            b[n] = this._coerce(arguments[n]);
           }
           f = new p(f, this.fixed, this._type);
           f._buffer = g.splice.apply(g, b);
@@ -12067,7 +12552,7 @@
           this._fixed = !!a;
         }, enumerable:!0, configurable:!0});
         p.prototype._checkFixed = function() {
-          this._fixed && u("RangeError", k.Errors.VectorFixedError);
+          this._fixed && t("RangeError", k.Errors.VectorFixedError);
         };
         p.prototype.asNextName = function(a) {
           return a - 1;
@@ -12087,7 +12572,7 @@
           return 0 <= a && a < this._buffer.length;
         };
         p.prototype.asGetNumericProperty = function(a) {
-          t(a, this._buffer.length);
+          u(a, this._buffer.length);
           return this._buffer[a];
         };
         p.prototype.asSetNumericProperty = function(a, c) {
@@ -12136,7 +12621,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.ObjectUtilities.defineNonEnumerableProperty, v = d.AVM2.Runtime.throwError, u = d.AVM2.Runtime.asCheckVectorGetNumericProperty, t = d.AVM2.Runtime.asCheckVectorSetNumericProperty, l = function(a) {
+      var q = d.ObjectUtilities.defineNonEnumerableProperty, v = d.AVM2.Runtime.throwError, t = d.AVM2.Runtime.asCheckVectorGetNumericProperty, u = d.AVM2.Runtime.asCheckVectorSetNumericProperty, l = function(a) {
         function h(a, c) {
           void 0 === a && (a = 0);
           void 0 === c && (c = !1);
@@ -12279,11 +12764,11 @@
           }
           return m;
         };
-        h.prototype.push = function(a, c, h, g, f, b, e, q) {
+        h.prototype.push = function(a, c, h, g, f, b, e, n) {
           this._checkFixed();
           this._ensureCapacity(this._length + arguments.length);
-          for (var n = 0;n < arguments.length;n++) {
-            this._buffer[this._offset + this._length++] = arguments[n];
+          for (var r = 0;r < arguments.length;r++) {
+            this._buffer[this._offset + this._length++] = arguments[r];
           }
         };
         h.prototype.pop = function() {
@@ -12339,15 +12824,15 @@
           return b;
         };
         h.prototype.splice = function(a, c) {
-          var m = this._buffer, g = this._length, f = Math.min(Math.max(a, 0), g), b = this._offset + f, e = Math.min(Math.max(c, 0), g - f), f = arguments.length - 2, q, n = new h(e, this.fixed);
-          0 < e && (q = m.subarray(b, b + e), n._buffer.set(q, n._offset));
+          var m = this._buffer, g = this._length, f = Math.min(Math.max(a, 0), g), b = this._offset + f, e = Math.min(Math.max(c, 0), g - f), f = arguments.length - 2, n, r = new h(e, this.fixed);
+          0 < e && (n = m.subarray(b, b + e), r._buffer.set(n, r._offset));
           this._ensureCapacity(g - e + f);
           m.set(m.subarray(b + e, g), b + f);
           this._length += f - e;
           for (g = 0;g < f;g++) {
             m[b + g] = arguments[g + 2];
           }
-          return n;
+          return r;
         };
         h.prototype._slide = function(a) {
           this._buffer.set(this._view(), this._offset + a);
@@ -12374,11 +12859,11 @@
           this._fixed && v("RangeError", k.Errors.VectorFixedError);
         };
         h.prototype.asGetNumericProperty = function(a) {
-          u(a, this._length);
+          t(a, this._length);
           return this._buffer[this._offset + a];
         };
         h.prototype.asSetNumericProperty = function(a, c) {
-          t(a, this._length, this._fixed);
+          u(a, this._length, this._fixed);
           a === this._length && (this._ensureCapacity(this._length + 1), this._length++);
           this._buffer[this._offset + a] = c;
         };
@@ -12414,25 +12899,25 @@
         h.callableConstructor = h.callable;
         h.classInitializer = function() {
           var a = h.prototype;
-          r(a, "$Bgjoin", a.join);
-          r(a, "$BgtoString", a.join);
-          r(a, "$BgtoLocaleString", a.toLocaleString);
-          r(a, "$Bgpop", a.pop);
-          r(a, "$Bgpush", a.push);
-          r(a, "$Bgreverse", a.reverse);
-          r(a, "$Bgconcat", a.concat);
-          r(a, "$Bgsplice", a.splice);
-          r(a, "$Bgslice", a.slice);
-          r(a, "$Bgshift", a.shift);
-          r(a, "$Bgunshift", a.unshift);
-          r(a, "$BgindexOf", a.indexOf);
-          r(a, "$BglastIndexOf", a.lastIndexOf);
-          r(a, "$BgforEach", a.forEach);
-          r(a, "$Bgmap", a.map);
-          r(a, "$Bgfilter", a.filter);
-          r(a, "$Bgsome", a.some);
-          r(a, "$Bgevery", a.every);
-          r(a, "$Bgsort", a.sort);
+          q(a, "$Bgjoin", a.join);
+          q(a, "$BgtoString", a.join);
+          q(a, "$BgtoLocaleString", a.toLocaleString);
+          q(a, "$Bgpop", a.pop);
+          q(a, "$Bgpush", a.push);
+          q(a, "$Bgreverse", a.reverse);
+          q(a, "$Bgconcat", a.concat);
+          q(a, "$Bgsplice", a.splice);
+          q(a, "$Bgslice", a.slice);
+          q(a, "$Bgshift", a.shift);
+          q(a, "$Bgunshift", a.unshift);
+          q(a, "$BgindexOf", a.indexOf);
+          q(a, "$BglastIndexOf", a.lastIndexOf);
+          q(a, "$BgforEach", a.forEach);
+          q(a, "$Bgmap", a.map);
+          q(a, "$Bgfilter", a.filter);
+          q(a, "$Bgsome", a.some);
+          q(a, "$Bgevery", a.every);
+          q(a, "$Bgsort", a.sort);
         };
         return h;
       }(a.ASVector);
@@ -12443,7 +12928,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.ObjectUtilities.defineNonEnumerableProperty, v = d.AVM2.Runtime.throwError, u = d.AVM2.Runtime.asCheckVectorGetNumericProperty, t = d.AVM2.Runtime.asCheckVectorSetNumericProperty, l = function(a) {
+      var q = d.ObjectUtilities.defineNonEnumerableProperty, v = d.AVM2.Runtime.throwError, t = d.AVM2.Runtime.asCheckVectorGetNumericProperty, u = d.AVM2.Runtime.asCheckVectorSetNumericProperty, l = function(a) {
         function h(a, c) {
           void 0 === a && (a = 0);
           void 0 === c && (c = !1);
@@ -12586,11 +13071,11 @@
           }
           return m;
         };
-        h.prototype.push = function(a, c, h, g, f, b, e, q) {
+        h.prototype.push = function(a, c, h, g, f, b, e, n) {
           this._checkFixed();
           this._ensureCapacity(this._length + arguments.length);
-          for (var n = 0;n < arguments.length;n++) {
-            this._buffer[this._offset + this._length++] = arguments[n];
+          for (var r = 0;r < arguments.length;r++) {
+            this._buffer[this._offset + this._length++] = arguments[r];
           }
         };
         h.prototype.pop = function() {
@@ -12646,15 +13131,15 @@
           return b;
         };
         h.prototype.splice = function(a, c) {
-          var m = this._buffer, g = this._length, f = Math.min(Math.max(a, 0), g), b = this._offset + f, e = Math.min(Math.max(c, 0), g - f), f = arguments.length - 2, q, n = new h(e, this.fixed);
-          0 < e && (q = m.subarray(b, b + e), n._buffer.set(q, n._offset));
+          var m = this._buffer, g = this._length, f = Math.min(Math.max(a, 0), g), b = this._offset + f, e = Math.min(Math.max(c, 0), g - f), f = arguments.length - 2, n, r = new h(e, this.fixed);
+          0 < e && (n = m.subarray(b, b + e), r._buffer.set(n, r._offset));
           this._ensureCapacity(g - e + f);
           m.set(m.subarray(b + e, g), b + f);
           this._length += f - e;
           for (g = 0;g < f;g++) {
             m[b + g] = arguments[g + 2];
           }
-          return n;
+          return r;
         };
         h.prototype._slide = function(a) {
           this._buffer.set(this._view(), this._offset + a);
@@ -12681,11 +13166,11 @@
           this._fixed && v("RangeError", k.Errors.VectorFixedError);
         };
         h.prototype.asGetNumericProperty = function(a) {
-          u(a, this._length);
+          t(a, this._length);
           return this._buffer[this._offset + a];
         };
         h.prototype.asSetNumericProperty = function(a, c) {
-          t(a, this._length, this._fixed);
+          u(a, this._length, this._fixed);
           a === this._length && (this._ensureCapacity(this._length + 1), this._length++);
           this._buffer[this._offset + a] = c;
         };
@@ -12721,25 +13206,25 @@
         h.callableConstructor = h.callable;
         h.classInitializer = function() {
           var a = h.prototype;
-          r(a, "$Bgjoin", a.join);
-          r(a, "$BgtoString", a.join);
-          r(a, "$BgtoLocaleString", a.toLocaleString);
-          r(a, "$Bgpop", a.pop);
-          r(a, "$Bgpush", a.push);
-          r(a, "$Bgreverse", a.reverse);
-          r(a, "$Bgconcat", a.concat);
-          r(a, "$Bgsplice", a.splice);
-          r(a, "$Bgslice", a.slice);
-          r(a, "$Bgshift", a.shift);
-          r(a, "$Bgunshift", a.unshift);
-          r(a, "$BgindexOf", a.indexOf);
-          r(a, "$BglastIndexOf", a.lastIndexOf);
-          r(a, "$BgforEach", a.forEach);
-          r(a, "$Bgmap", a.map);
-          r(a, "$Bgfilter", a.filter);
-          r(a, "$Bgsome", a.some);
-          r(a, "$Bgevery", a.every);
-          r(a, "$Bgsort", a.sort);
+          q(a, "$Bgjoin", a.join);
+          q(a, "$BgtoString", a.join);
+          q(a, "$BgtoLocaleString", a.toLocaleString);
+          q(a, "$Bgpop", a.pop);
+          q(a, "$Bgpush", a.push);
+          q(a, "$Bgreverse", a.reverse);
+          q(a, "$Bgconcat", a.concat);
+          q(a, "$Bgsplice", a.splice);
+          q(a, "$Bgslice", a.slice);
+          q(a, "$Bgshift", a.shift);
+          q(a, "$Bgunshift", a.unshift);
+          q(a, "$BgindexOf", a.indexOf);
+          q(a, "$BglastIndexOf", a.lastIndexOf);
+          q(a, "$BgforEach", a.forEach);
+          q(a, "$Bgmap", a.map);
+          q(a, "$Bgfilter", a.filter);
+          q(a, "$Bgsome", a.some);
+          q(a, "$Bgevery", a.every);
+          q(a, "$Bgsort", a.sort);
         };
         return h;
       }(a.ASVector);
@@ -12750,7 +13235,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.ObjectUtilities.defineNonEnumerableProperty, v = d.AVM2.Runtime.throwError, u = d.AVM2.Runtime.asCheckVectorGetNumericProperty, t = d.AVM2.Runtime.asCheckVectorSetNumericProperty, l = function(a) {
+      var q = d.ObjectUtilities.defineNonEnumerableProperty, v = d.AVM2.Runtime.throwError, t = d.AVM2.Runtime.asCheckVectorGetNumericProperty, u = d.AVM2.Runtime.asCheckVectorSetNumericProperty, l = function(a) {
         function h(a, c) {
           void 0 === a && (a = 0);
           void 0 === c && (c = !1);
@@ -12893,11 +13378,11 @@
           }
           return m;
         };
-        h.prototype.push = function(a, c, h, g, f, b, e, q) {
+        h.prototype.push = function(a, c, h, g, f, b, e, n) {
           this._checkFixed();
           this._ensureCapacity(this._length + arguments.length);
-          for (var n = 0;n < arguments.length;n++) {
-            this._buffer[this._offset + this._length++] = arguments[n];
+          for (var r = 0;r < arguments.length;r++) {
+            this._buffer[this._offset + this._length++] = arguments[r];
           }
         };
         h.prototype.pop = function() {
@@ -12953,15 +13438,15 @@
           return b;
         };
         h.prototype.splice = function(a, c) {
-          var m = this._buffer, g = this._length, f = Math.min(Math.max(a, 0), g), b = this._offset + f, e = Math.min(Math.max(c, 0), g - f), f = arguments.length - 2, q, n = new h(e, this.fixed);
-          0 < e && (q = m.subarray(b, b + e), n._buffer.set(q, n._offset));
+          var m = this._buffer, g = this._length, f = Math.min(Math.max(a, 0), g), b = this._offset + f, e = Math.min(Math.max(c, 0), g - f), f = arguments.length - 2, n, r = new h(e, this.fixed);
+          0 < e && (n = m.subarray(b, b + e), r._buffer.set(n, r._offset));
           this._ensureCapacity(g - e + f);
           m.set(m.subarray(b + e, g), b + f);
           this._length += f - e;
           for (g = 0;g < f;g++) {
             m[b + g] = arguments[g + 2];
           }
-          return n;
+          return r;
         };
         h.prototype._slide = function(a) {
           this._buffer.set(this._view(), this._offset + a);
@@ -12988,11 +13473,11 @@
           this._fixed && v("RangeError", k.Errors.VectorFixedError);
         };
         h.prototype.asGetNumericProperty = function(a) {
-          u(a, this._length);
+          t(a, this._length);
           return this._buffer[this._offset + a];
         };
         h.prototype.asSetNumericProperty = function(a, c) {
-          t(a, this._length, this._fixed);
+          u(a, this._length, this._fixed);
           a === this._length && (this._ensureCapacity(this._length + 1), this._length++);
           this._buffer[this._offset + a] = c;
         };
@@ -13028,25 +13513,25 @@
         h.callableConstructor = h.callable;
         h.classInitializer = function() {
           var a = h.prototype;
-          r(a, "$Bgjoin", a.join);
-          r(a, "$BgtoString", a.join);
-          r(a, "$BgtoLocaleString", a.toLocaleString);
-          r(a, "$Bgpop", a.pop);
-          r(a, "$Bgpush", a.push);
-          r(a, "$Bgreverse", a.reverse);
-          r(a, "$Bgconcat", a.concat);
-          r(a, "$Bgsplice", a.splice);
-          r(a, "$Bgslice", a.slice);
-          r(a, "$Bgshift", a.shift);
-          r(a, "$Bgunshift", a.unshift);
-          r(a, "$BgindexOf", a.indexOf);
-          r(a, "$BglastIndexOf", a.lastIndexOf);
-          r(a, "$BgforEach", a.forEach);
-          r(a, "$Bgmap", a.map);
-          r(a, "$Bgfilter", a.filter);
-          r(a, "$Bgsome", a.some);
-          r(a, "$Bgevery", a.every);
-          r(a, "$Bgsort", a.sort);
+          q(a, "$Bgjoin", a.join);
+          q(a, "$BgtoString", a.join);
+          q(a, "$BgtoLocaleString", a.toLocaleString);
+          q(a, "$Bgpop", a.pop);
+          q(a, "$Bgpush", a.push);
+          q(a, "$Bgreverse", a.reverse);
+          q(a, "$Bgconcat", a.concat);
+          q(a, "$Bgsplice", a.splice);
+          q(a, "$Bgslice", a.slice);
+          q(a, "$Bgshift", a.shift);
+          q(a, "$Bgunshift", a.unshift);
+          q(a, "$BgindexOf", a.indexOf);
+          q(a, "$BglastIndexOf", a.lastIndexOf);
+          q(a, "$BgforEach", a.forEach);
+          q(a, "$Bgmap", a.map);
+          q(a, "$Bgfilter", a.filter);
+          q(a, "$Bgsome", a.some);
+          q(a, "$Bgevery", a.every);
+          q(a, "$Bgsort", a.sort);
         };
         return h;
       }(a.ASVector);
@@ -13057,7 +13542,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(b) {
+      function q(b) {
         return b instanceof a.ASXML || b instanceof a.ASXMLList;
       }
       function v(b) {
@@ -13080,7 +13565,7 @@
             return s(b);
         }
       }
-      function u(b) {
+      function t(b) {
         for (var a = 0, e;a < b.length && "&" !== (e = b[a]) && "<" !== e && ">" !== e;) {
           a++;
         }
@@ -13104,7 +13589,7 @@
         }
         return f;
       }
-      function t(b) {
+      function u(b) {
         for (var a = 0, e;a < b.length && "&" !== (e = b[a]) && "<" !== e && '"' !== e && "\n" !== e && "\r" !== e && "\t" !== e;) {
           a++;
         }
@@ -13182,62 +13667,62 @@
           throw new TypeError;
         }
         if (!(b instanceof S)) {
-          return b instanceof V ? b._children.map(function(b) {
+          return b instanceof W ? b._children.map(function(b) {
             return s(b, e);
-          }).join(S.prettyPrinting ? "\n" : "") : u(String(b));
+          }).join(S.prettyPrinting ? "\n" : "") : t(String(b));
         }
         var g = S.prettyPrinting;
         f |= 0;
         var n = g ? h(f) : "";
         switch(b._kind) {
           case 3:
-            return g ? n + u(c(b._value)) : u(b._value);
+            return g ? n + t(c(b._value)) : t(b._value);
           case 2:
-            return n + t(b._value);
+            return n + u(b._value);
           case 4:
             return n + "\x3c!--" + b._value + "--\x3e";
           case 5:
             return n + "<?" + b._name.localName + " " + b._value + "?>";
         }
         e = e || [];
-        for (var q = [], m = 0;b._inScopeNamespaces && m < b._inScopeNamespaces.length;m++) {
+        for (var r = [], m = 0;b._inScopeNamespaces && m < b._inScopeNamespaces.length;m++) {
           var d = b._inScopeNamespaces[m].prefix, l = b._inScopeNamespaces[m].uri;
           if (e.every(function(b) {
             return b.uri != l || b.prefix != d;
           })) {
             var x = new a.ASNamespace(d, l);
-            q.push(x);
+            r.push(x);
           }
         }
-        var r = e.concat(q), x = b._name.getNamespace(r);
-        void 0 === x.prefix && (m = p(r), m = new a.ASNamespace(m, x.uri), q.push(m), r.push(m));
+        var q = e.concat(r), x = b._name.getNamespace(q);
+        void 0 === x.prefix && (m = p(q), m = new a.ASNamespace(m, x.uri), r.push(m), q.push(m));
         var k = (x.prefix ? x.prefix + ":" : "") + b._name.localName, n = n + ("<" + k);
         b._attributes && b._attributes.forEach(function(b) {
-          b = b._name.getNamespace(r);
+          b = b._name.getNamespace(q);
           if (void 0 === b.prefix) {
-            var e = p(r);
+            var e = p(q);
             b = new a.ASNamespace(e, b.uri);
-            q.push(b);
             r.push(b);
+            q.push(b);
           }
         });
-        for (m = 0;m < q.length;m++) {
-          x = q[m], n += " " + (x.prefix ? "xmlns:" + x.prefix : "xmlns") + '="' + t(x.uri) + '"';
+        for (m = 0;m < r.length;m++) {
+          x = r[m], n += " " + (x.prefix ? "xmlns:" + x.prefix : "xmlns") + '="' + u(x.uri) + '"';
         }
         b._attributes && b._attributes.forEach(function(b) {
           var a = b._name, f = a.getNamespace(e);
-          n += " " + (f.prefix ? f.prefix + ":" + a.localName : a.localName) + '="' + t(b._value) + '"';
+          n += " " + (f.prefix ? f.prefix + ":" + a.localName : a.localName) + '="' + u(b._value) + '"';
         });
         if (0 === b.length()) {
           return n += "/>";
         }
-        var n = n + ">", L = 1 < b._children.length || 1 === b._children.length && 3 !== b._children[0]._kind, A = g && L ? f + S.prettyIndent : 0;
+        var n = n + ">", H = 1 < b._children.length || 1 === b._children.length && 3 !== b._children[0]._kind, C = g && H ? f + S.prettyIndent : 0;
         b._children.forEach(function(b, a) {
-          g && L && (n += "\n");
-          var e = s(b, r, A);
+          g && H && (n += "\n");
+          var e = s(b, q, C);
           n += e;
         });
-        g && L && (n += "\n" + h(f));
+        g && H && (n += "\n" + h(f));
         return n += "</" + k + ">";
       }
       function m(b) {
@@ -13250,10 +13735,10 @@
         if (b instanceof S) {
           return b;
         }
-        if (b instanceof V) {
+        if (b instanceof W) {
           return 1 !== b._children.length && k.Runtime.throwError("TypeError", k.Errors.XMLMarkupMustBeWellFormed), b._children[0];
         }
-        b = C.parseFromString(H(b));
+        b = I.parseFromString(F(b));
         var a = b.length();
         if (0 === a) {
           return x(3);
@@ -13269,7 +13754,7 @@
         if (b instanceof S) {
           a.append(b);
         } else {
-          var e = m('<parent xmlns="' + t(S.defaultNamespace) + '">' + b + "</parent>")._children;
+          var e = m('<parent xmlns="' + u(S.defaultNamespace) + '">' + b + "</parent>")._children;
           if (e) {
             for (var f = 0;f < e.length;f++) {
               var c = e[f];
@@ -13285,7 +13770,7 @@
           if (b instanceof T) {
             return new a.ASQName(b.uri, b.localName, !0);
           }
-          if (L.isQName(b)) {
+          if (H.isQName(b)) {
             return T.fromMultiname(b);
           }
         }
@@ -13300,11 +13785,11 @@
           if (b instanceof T) {
             return b;
           }
-          if (L.isQName(b)) {
+          if (H.isQName(b)) {
             return T.fromMultiname(b);
           }
           var e;
-          e = b instanceof S || b instanceof V ? v(b) : b instanceof L ? b.name : b.toString();
+          e = b instanceof S || b instanceof W ? v(b) : b instanceof H ? b.name : b.toString();
         } else {
           if ("string" === typeof b) {
             e = b;
@@ -13317,10 +13802,10 @@
       function e(b) {
         return b instanceof T && !!(b.name.flags & 1);
       }
-      function q(b, e, f) {
-        return b && 1 === b.length && b[0] instanceof I && ("string" === typeof e || void 0 === e) ? new a.ASQName(b[0], e || "*", f) : e;
+      function n(b, e, f) {
+        return b && 1 === b.length && b[0] instanceof D && ("string" === typeof e || void 0 === e) ? new a.ASQName(b[0], e || "*", f) : e;
       }
-      function n(b) {
+      function r(b) {
         try {
           new a.ASQName(b);
         } catch (e) {
@@ -13336,13 +13821,13 @@
         g.init(b, e, f, c);
         return g;
       }
-      var L = d.AVM2.ABC.Multiname, A = d.Debug.notImplemented, H = d.AVM2.Runtime.asCoerceString, K = d.ObjectUtilities.defineNonEnumerableProperty, F = d.ObjectUtilities.createPublicAliases, J = Object.prototype.asGetProperty, M = Object.prototype.asSetProperty, D = Object.prototype.asCallProperty, B = Object.prototype.asHasProperty, E = Object.prototype.asHasOwnProperty, y = Object.prototype.asDeleteProperty, z = Object.prototype.asGetEnumerableKeys;
-      a.escapeElementValue = u;
-      a.escapeAttributeValue = t;
+      var H = d.AVM2.ABC.Multiname, C = d.Debug.notImplemented, F = d.AVM2.Runtime.asCoerceString, K = d.ObjectUtilities.defineNonEnumerableProperty, E = d.ObjectUtilities.createPublicAliases, Q = Object.prototype.asGetProperty, N = Object.prototype.asSetProperty, B = Object.prototype.asCallProperty, y = Object.prototype.asHasProperty, L = Object.prototype.asHasOwnProperty, A = Object.prototype.asDeleteProperty, z = Object.prototype.asGetEnumerableKeys;
+      a.escapeElementValue = t;
+      a.escapeAttributeValue = u;
       var G = [];
-      a.isXMLName = n;
-      d.AVM2.AS.Natives.isXMLName = n;
-      var C = new function() {
+      a.isXMLName = r;
+      d.AVM2.AS.Natives.isXMLName = r;
+      var I = new function() {
         function b(a, e) {
           function f(b) {
             return b.replace(/&([^;]+);/g, function(b, a) {
@@ -13366,32 +13851,32 @@
             });
           }
           function g() {
-            for (var b = s.length - 1;0 <= b;--b) {
-              if ("preserve" === s[b].space) {
+            for (var b = x.length - 1;0 <= b;--b) {
+              if ("preserve" === x[b].space) {
                 return!0;
               }
             }
             return!1;
           }
           function n() {
-            for (var b = s.length - 1;0 <= b;--b) {
-              if ("xmlns" in s[b]) {
-                return s[b].xmlns;
+            for (var b = x.length - 1;0 <= b;--b) {
+              if ("xmlns" in x[b]) {
+                return x[b].xmlns;
               }
             }
             return "";
           }
-          function q(b) {
-            for (var a = s.length - 1;0 <= a;--a) {
-              if (b in s[a].lookup) {
-                return s[a].lookup[b];
+          function r(b) {
+            for (var a = x.length - 1;0 <= a;--a) {
+              if (b in x[a].lookup) {
+                return x[a].lookup[b];
               }
             }
           }
           function h(b, a) {
             var e = b.indexOf(":");
             if (0 <= e) {
-              var f = b.substring(0, e), c = q(f);
+              var f = b.substring(0, e), c = r(f);
               if (void 0 === c) {
                 throw "Unknown namespace: " + f;
               }
@@ -13412,8 +13897,8 @@
             g = b.substring(a, c);
             for (e();c < b.length && ">" !== b[c] && "/" !== b[c] && "?" !== b[c];) {
               e();
-              for (var q = "", h = "";c < b.length && !l(b, c) && "=" !== b[c];) {
-                q += b[c], ++c;
+              for (var r = "", h = "";c < b.length && !l(b, c) && "=" !== b[c];) {
+                r += b[c], ++c;
               }
               e();
               if ("=" !== b[c]) {
@@ -13425,18 +13910,18 @@
               if ('"' !== h && "'" !== h) {
                 throw "Quote expected";
               }
-              var p = b.indexOf(h, ++c);
-              if (0 > p) {
+              var d = b.indexOf(h, ++c);
+              if (0 > d) {
                 throw "Unexpected EOF[6]";
               }
-              h = b.substring(c, p);
-              n.push({name:q, value:f(h)});
-              c = p + 1;
+              h = b.substring(c, d);
+              n.push({name:r, value:f(h)});
+              c = d + 1;
               e();
             }
             return{name:g, attributes:n, parsed:c - a};
           }
-          function p(b, a) {
+          function d(b, a) {
             for (var e = a, f;e < b.length && !l(b, e) && ">" !== b[e] && "/" !== b[e];) {
               ++e;
             }
@@ -13448,61 +13933,61 @@
             }
             return{name:f, value:b.substring(c, e), parsed:e - a};
           }
-          for (var d = 0, s = [{namespaces:[], lookup:{xmlns:"http://www.w3.org/2000/xmlns/", xml:"http://www.w3.org/XML/1998/namespace"}, inScopes:S.defaultNamespace ? [{uri:S.defaultNamespace, prefix:""}] : [], space:"default", xmlns:S.defaultNamespace || ""}];d < a.length;) {
-            var x = d;
-            if ("<" === a[d]) {
-              switch(++x, a[x]) {
+          for (var p = 0, x = [{namespaces:[], lookup:{xmlns:"http://www.w3.org/2000/xmlns/", xml:"http://www.w3.org/XML/1998/namespace"}, inScopes:S.defaultNamespace ? [{uri:S.defaultNamespace, prefix:""}] : [], space:"default", xmlns:S.defaultNamespace || ""}];p < a.length;) {
+            var s = p;
+            if ("<" === a[p]) {
+              switch(++s, a[s]) {
                 case "/":
-                  ++x;
-                  d = a.indexOf(">", x);
-                  if (0 > d) {
+                  ++s;
+                  p = a.indexOf(">", s);
+                  if (0 > p) {
                     throw "Unexpected EOF[1]";
                   }
-                  x = h(a.substring(x, d), !0);
-                  e.endElement(x);
-                  s.pop();
-                  x = d + 1;
+                  s = h(a.substring(s, p), !0);
+                  e.endElement(s);
+                  x.pop();
+                  s = p + 1;
                   break;
                 case "?":
-                  ++x;
-                  d = p(a, x);
-                  if ("?>" != a.substring(x + d.parsed, x + d.parsed + 2)) {
+                  ++s;
+                  p = d(a, s);
+                  if ("?>" != a.substring(s + p.parsed, s + p.parsed + 2)) {
                     throw "Unexpected EOF[2]";
                   }
-                  e.pi(d.name, d.value);
-                  x += d.parsed + 2;
+                  e.pi(p.name, p.value);
+                  s += p.parsed + 2;
                   break;
                 case "!":
-                  if ("--" === a.substring(x + 1, x + 3)) {
-                    d = a.indexOf("--\x3e", x + 3);
-                    if (0 > d) {
+                  if ("--" === a.substring(s + 1, s + 3)) {
+                    p = a.indexOf("--\x3e", s + 3);
+                    if (0 > p) {
                       throw "Unexpected EOF[3]";
                     }
-                    e.comment(a.substring(x + 3, d));
-                    x = d + 3;
+                    e.comment(a.substring(s + 3, p));
+                    s = p + 3;
                   } else {
-                    if ("[CDATA[" === a.substring(x + 1, x + 8)) {
-                      d = a.indexOf("]]\x3e", x + 8);
-                      if (0 > d) {
+                    if ("[CDATA[" === a.substring(s + 1, s + 8)) {
+                      p = a.indexOf("]]\x3e", s + 8);
+                      if (0 > p) {
                         throw "Unexpected EOF[4]";
                       }
-                      e.cdata(a.substring(x + 8, d));
-                      x = d + 3;
+                      e.cdata(a.substring(s + 8, p));
+                      s = p + 3;
                     } else {
-                      if ("DOCTYPE" === a.substring(x + 1, x + 8)) {
-                        var r = a.indexOf("[", x + 8), k = !1, d = a.indexOf(">", x + 8);
-                        if (0 > d) {
+                      if ("DOCTYPE" === a.substring(s + 1, s + 8)) {
+                        var q = a.indexOf("[", s + 8), k = !1, p = a.indexOf(">", s + 8);
+                        if (0 > p) {
                           throw "Unexpected EOF[5]";
                         }
-                        if (0 < r && d > r) {
-                          d = a.indexOf("]>", x + 8);
-                          if (0 > d) {
+                        if (0 < q && p > q) {
+                          p = a.indexOf("]>", s + 8);
+                          if (0 > p) {
                             throw "Unexpected EOF[7]";
                           }
                           k = !0;
                         }
-                        e.doctype(a.substring(x + 8, d + (k ? 1 : 0)));
-                        x = d + (k ? 2 : 1);
+                        e.doctype(a.substring(s + 8, p + (k ? 1 : 0)));
+                        s = p + (k ? 2 : 1);
                       } else {
                         throw "Unknown !tag";
                       }
@@ -13510,67 +13995,67 @@
                   }
                   break;
                 default:
-                  r = m(a, x);
+                  q = m(a, s);
                   k = !1;
-                  if ("/>" === a.substring(x + r.parsed, x + r.parsed + 2)) {
+                  if ("/>" === a.substring(s + q.parsed, s + q.parsed + 2)) {
                     k = !0;
                   } else {
-                    if (">" !== a.substring(x + r.parsed, x + r.parsed + 1)) {
+                    if (">" !== a.substring(s + q.parsed, s + q.parsed + 1)) {
                       throw "Unexpected EOF[2]";
                     }
                   }
-                  for (var L = {namespaces:[], lookup:Object.create(null)}, u = r.attributes, d = 0;d < u.length;++d) {
-                    var t = u[d], A = t.name;
-                    if ("xmlns:" === A.substring(0, 6)) {
-                      A = A.substring(6), t = t.value, q(A) !== t && (L.lookup[A] = c(t), L.namespaces.push({uri:t, prefix:A})), delete u[d];
+                  for (var H = {namespaces:[], lookup:Object.create(null)}, t = q.attributes, p = 0;p < t.length;++p) {
+                    var C = t[p], u = C.name;
+                    if ("xmlns:" === u.substring(0, 6)) {
+                      u = u.substring(6), C = C.value, r(u) !== C && (H.lookup[u] = c(C), H.namespaces.push({uri:C, prefix:u})), delete t[p];
                     } else {
-                      if ("xmlns" === A) {
-                        t = t.value, n() !== t && (L.xmlns = c(t), L.namespaces.push({uri:t, prefix:""})), delete u[d];
+                      if ("xmlns" === u) {
+                        C = C.value, n() !== C && (H.xmlns = c(C), H.namespaces.push({uri:C, prefix:""})), delete t[p];
                       } else {
-                        if ("xml:" === A.substring(0, 4)) {
-                          var v = A.substring(4);
+                        if ("xml:" === u.substring(0, 4)) {
+                          var v = u.substring(4);
                           if ("space" !== v && "lang" !== v && "base" !== v && "id" !== v) {
-                            throw "Invalid xml attribute: " + A;
+                            throw "Invalid xml attribute: " + u;
                           }
-                          L[v] = c(t.value);
+                          H[v] = c(C.value);
                         } else {
-                          if ("xml" === A.substring(0, 3)) {
+                          if ("xml" === u.substring(0, 3)) {
                             throw "Invalid xml attribute";
                           }
                         }
                       }
                     }
                   }
-                  var K = [];
-                  L.namespaces.forEach(function(b) {
-                    b.prefix && L.lookup[b.prefix] !== b.uri || K.push(b);
+                  var F = [];
+                  H.namespaces.forEach(function(b) {
+                    b.prefix && H.lookup[b.prefix] !== b.uri || F.push(b);
                   });
-                  s[s.length - 1].inScopes.forEach(function(b) {
-                    (!b.prefix || b.prefix in L.lookup) && (b.prefix || "xmlns" in L) || K.push(b);
+                  x[x.length - 1].inScopes.forEach(function(b) {
+                    (!b.prefix || b.prefix in H.lookup) && (b.prefix || "xmlns" in H) || F.push(b);
                   });
-                  L.inScopes = K;
-                  s.push(L);
-                  A = [];
-                  for (d = 0;d < u.length;++d) {
-                    (t = u[d]) && A.push({name:h(t.name, !1), value:t.value});
-                  }
-                  e.beginElement(h(r.name, !0), A, K, k);
-                  x += r.parsed + (k ? 2 : 1);
-                  k && s.pop();
+                  H.inScopes = F;
+                  x.push(H);
+                  u = [];
+                  for (p = 0;p < t.length;++p) {
+                    (C = t[p]) && u.push({name:h(C.name, !1), value:C.value});
+                  }
+                  e.beginElement(h(q.name, !0), u, F, k);
+                  s += q.parsed + (k ? 2 : 1);
+                  k && x.pop();
               }
             } else {
-              for (;x++ < a.length && "<" !== a[x];) {
+              for (;s++ < a.length && "<" !== a[s];) {
               }
-              e.text(f(a.substring(d, x)), g());
+              e.text(f(a.substring(p, s)), g());
             }
-            d = x;
+            p = s;
           }
         }
         this.parseFromString = function(e, f) {
           var g = x(1, "", "", ""), n = [];
           b(e, {beginElement:function(b, e, f, c) {
-            var q = g;
-            n.push(q);
+            var r = g;
+            n.push(r);
             g = x(1, b.namespace, b.localName, b.prefix);
             for (b = 0;b < e.length;++b) {
               var h = e[b], m = x(2, h.name.namespace, h.name.localName, h.name.prefix);
@@ -13581,7 +14066,7 @@
             for (b = 0;b < f.length;++b) {
               e = f[b], e = new a.ASNamespace(e.prefix, e.uri), g._inScopeNamespaces.push(e);
             }
-            q.insert(q.length(), g);
+            r.insert(r.length(), g);
             c && (g = n.pop());
           }, endElement:function(b) {
             g = n.pop();
@@ -13612,10 +14097,10 @@
           }});
           return g;
         };
-      }, I = function(b) {
+      }, D = function(b) {
         function e(b, a) {
           var f = "", c = "";
-          0 !== arguments.length && (1 === arguments.length ? (f = b, d.isObject(f) && f instanceof e ? (c = f.prefix, f = f.uri) : d.isObject(f) && f instanceof T && null !== f.uri ? f = f.uri : (f = v(f), c = "" === f ? "" : void 0)) : (f = a, f = d.isObject(f) && f instanceof T && null !== f.uri ? f.uri : v(f), "" === f ? void 0 === b || "" === v(b) ? c = "" : k.Runtime.throwError("TypeError", k.Errors.XMLNamespaceWithPrefixAndNoURI, b) : c = void 0 === b ? void 0 : !1 === n(b) ? void 0 : v(b)));
+          0 !== arguments.length && (1 === arguments.length ? (f = b, d.isObject(f) && f instanceof e ? (c = f.prefix, f = f.uri) : d.isObject(f) && f instanceof T && null !== f.uri ? f = f.uri : (f = v(f), c = "" === f ? "" : void 0)) : (f = a, f = d.isObject(f) && f instanceof T && null !== f.uri ? f.uri : v(f), "" === f ? void 0 === b || "" === v(b) ? c = "" : k.Runtime.throwError("TypeError", k.Errors.XMLNamespaceWithPrefixAndNoURI, b) : c = void 0 === b ? void 0 : !1 === r(b) ? void 0 : v(b)));
           this._ns = Namespace.createNamespace(f, c);
         }
         __extends(e, b);
@@ -13638,6 +14123,7 @@
         e.instanceNatives = null;
         e.instanceConstructor = e;
         e.classInitializer = function() {
+          K(this, "$Bglength", 2);
           var b = e.prototype;
           K(b, "$BgtoString", b.toString);
         };
@@ -13656,14 +14142,14 @@
         };
         return e;
       }(a.ASObject);
-      a.ASNamespace = I;
-      var P;
+      a.ASNamespace = D;
+      var R;
       (function(b) {
         b[b.ATTR_NAME = 1] = "ATTR_NAME";
         b[b.ELEM_NAME = 2] = "ELEM_NAME";
         b[b.ANY_NAME = 4] = "ANY_NAME";
         b[b.ANY_NAMESPACE = 8] = "ANY_NAMESPACE";
-      })(P || (P = {}));
+      })(R || (R = {}));
       var T = function(b) {
         function e(b, f, c) {
           var g, n;
@@ -13678,12 +14164,12 @@
           if (void 0 === n || 2 > arguments.length) {
             n = "*" === g ? null : new a.ASNamespace("", S.defaultNamespace);
           }
-          var q = g;
-          null !== n && (n = n instanceof I ? n : new a.ASNamespace(n));
+          var r = g;
+          null !== n && (n = n instanceof D ? n : new a.ASNamespace(n));
           var h = c ? 1 : 2;
           "*" === g && (h |= 4);
           null === n && (h |= 8);
-          this.name = new L([n ? n._ns : null], q, h);
+          this.name = new H([n ? n._ns : null], r, h);
         }
         __extends(e, b);
         e.fromMultiname = function(b) {
@@ -13704,9 +14190,27 @@
           this.name.namespaces[0] || this.name.namespaces.push(Namespace.createNamespace(""));
           this.name.namespaces[0].uri = "";
         };
+        e.prototype.ecmaToString = function() {
+          if (this === e.dynamicPrototype) {
+            return "";
+          }
+          this instanceof a.ASQName || throwError("TypeError", k.Errors.InvokeOnIncompatibleObjectError, "QName.prototype.toString");
+          return this.toString();
+        };
         e.prototype.toString = function() {
           var b = this.uri;
-          return b ? b + "::" + this.name.name : this.name.name;
+          if ("" === b) {
+            return this.name.name;
+          }
+          if (null === b) {
+            return "*::" + this.name.name;
+          }
+          var a = b.charCodeAt(b.length - 1), e = b;
+          57344 <= a && 63743 >= a && (e = b.substr(0, b.length - 1));
+          return "" === e ? this.name.name : e + "::" + this.name.name;
+        };
+        e.prototype.valueOf = function() {
+          return this;
         };
         Object.defineProperty(e.prototype, "prefix", {get:function() {
           return this.name.namespaces[0] ? this.name.namespaces[0].prefix : null;
@@ -13725,7 +14229,11 @@
         Object.defineProperty(e.prototype, "flags", {get:function() {
           return this.name.flags;
         }, enumerable:!0, configurable:!0});
-        e.instanceConstructor = e;
+        e.classInitializer = function() {
+          K(this, "$Bglength", 2);
+          var b = e.prototype;
+          K(b, "$BgtoString", b.ecmaToString);
+        };
         e.callableConstructor = function(b, f) {
           if (1 === arguments.length && d.isObject(b) && b instanceof e) {
             return b;
@@ -13742,14 +14250,14 @@
         return e;
       }(a.ASNative);
       a.ASQName = T;
-      var O;
+      var J;
       (function(b) {
         b[b.FLAG_IGNORE_COMMENTS = 1] = "FLAG_IGNORE_COMMENTS";
         b[b.FLAG_IGNORE_PROCESSING_INSTRUCTIONS = 2] = "FLAG_IGNORE_PROCESSING_INSTRUCTIONS";
         b[b.FLAG_IGNORE_WHITESPACE = 4] = "FLAG_IGNORE_WHITESPACE";
         b[b.FLAG_PRETTY_PRINTING = 8] = "FLAG_PRETTY_PRINTING";
         b[b.ALL = b.FLAG_IGNORE_COMMENTS | b.FLAG_IGNORE_PROCESSING_INSTRUCTIONS | b.FLAG_IGNORE_WHITESPACE | b.FLAG_PRETTY_PRINTING] = "ALL";
-      })(O || (O = {}));
+      })(J || (J = {}));
       (function(b) {
         b[b.Unknown = 0] = "Unknown";
         b[b.Element = 1] = "Element";
@@ -13758,7 +14266,7 @@
         b[b.Comment = 4] = "Comment";
         b[b.ProcessingInstruction = 5] = "ProcessingInstruction";
       })(a.ASXMLKind || (a.ASXMLKind = {}));
-      var Q = [null, "element", "attribute", "text", "comment", "processing-instruction"], S = function(f) {
+      var P = [null, "element", "attribute", "text", "comment", "processing-instruction"], S = function(f) {
         function c(b) {
           this._parent = null;
           d.isNullOrUndefined(b) && (b = "");
@@ -13766,7 +14274,7 @@
             this._kind = 3, this._value = "";
           } else {
             var a = m(b);
-            r(b) && (a = a._deepCopy());
+            q(b) && (a = a._deepCopy());
             return a;
           }
         }
@@ -13785,7 +14293,7 @@
           return this;
         };
         c.prototype.equals = function(b) {
-          return b instanceof V ? b.equals(this) : b instanceof c ? (3 === this._kind || 2 === this._kind) && b.hasSimpleContent() || (3 === b._kind || 2 === b._kind) && this.hasSimpleContent() ? this.toString() === b.toString() : this._deepEquals(b) : this.hasSimpleContent() && this.toString() === H(b);
+          return b instanceof W ? b.equals(this) : b instanceof c ? (3 === this._kind || 2 === this._kind) && b.hasSimpleContent() || (3 === b._kind || 2 === b._kind) && this.hasSimpleContent() ? this.toString() === b.toString() : this._deepEquals(b) : this.hasSimpleContent() && this.toString() === F(b);
         };
         c.prototype.init = function(b, e, f, c) {
           e = e || c ? new a.ASNamespace(c, e) : void 0;
@@ -13827,8 +14335,8 @@
           }
           var g = 0;
           a: for (;g < a.length;g++) {
-            for (var n = a[g], q = 0;q < e.length;q++) {
-              var h = e[q];
+            for (var n = a[g], r = 0;r < e.length;r++) {
+              var h = e[r];
               if (h._name.equals(n._name) && h._value === n._value) {
                 continue a;
               }
@@ -13915,7 +14423,7 @@
             return a.ASObject.prototype.native_hasOwnProperty.call(this, e);
           }
           var f = b(e);
-          return this.hasProperty(f, !!(f.flags & 1), !1) ? !0 : E.call(this, String(e));
+          return this.hasProperty(f, !!(f.flags & 1), !1) ? !0 : L.call(this, String(e));
         };
         c.prototype.native_propertyIsEnumerable = function(b) {
           void 0 === b && (b = void 0);
@@ -14022,11 +14530,11 @@
         };
         c.prototype.insertChildAfter = function(b, a) {
           this instanceof c || k.Runtime.throwError("TypeError", k.Errors.CheckTypeFailedError, this, "XML");
-          A("public.XML::insertChildAfter");
+          C("public.XML::insertChildAfter");
         };
         c.prototype.insertChildBefore = function(b, a) {
           this instanceof c || k.Runtime.throwError("TypeError", k.Errors.CheckTypeFailedError, this, "XML");
-          A("public.XML::insertChildBefore");
+          C("public.XML::insertChildBefore");
         };
         c.prototype.length = function() {
           this instanceof c || k.Runtime.throwError("TypeError", k.Errors.CheckTypeFailedError, this, "XML");
@@ -14049,7 +14557,7 @@
           if (0 === arguments.length) {
             return this._name.getNamespace(a);
           }
-          b = H(b);
+          b = F(b);
           for (var e = 0;e < a.length;e++) {
             var f = a[e];
             if (f.prefix === b) {
@@ -14059,11 +14567,11 @@
         };
         c.prototype.namespaceDeclarations = function() {
           this instanceof c || k.Runtime.throwError("TypeError", k.Errors.CheckTypeFailedError, this, "XML");
-          A("public.XML::namespaceDeclarations");
+          C("public.XML::namespaceDeclarations");
         };
         c.prototype.nodeKind = function() {
           this instanceof c || k.Runtime.throwError("TypeError", k.Errors.CheckTypeFailedError, this, "XML");
-          return Q[this._kind];
+          return P[this._kind];
         };
         c.prototype.normalize = function() {
           this instanceof c || k.Runtime.throwError("TypeError", k.Errors.CheckTypeFailedError, this, "XML");
@@ -14115,10 +14623,10 @@
           return e;
         };
         c.prototype.prependChild = function(b) {
-          A("public.XML::prependChild");
+          C("public.XML::prependChild");
         };
         c.prototype.removeNamespace = function(b) {
-          A("public.XML::removeNamespace");
+          C("public.XML::removeNamespace");
         };
         c.prototype.replace = function(b, a) {
           var e, f = this;
@@ -14164,7 +14672,7 @@
           return this;
         };
         c.prototype.setLocalName = function(b) {
-          A("public.XML::setLocalName");
+          C("public.XML::setLocalName");
         };
         c.prototype.setName = function(b) {
           if (3 !== this._kind && 4 !== this._kind) {
@@ -14183,7 +14691,7 @@
           }
         };
         c.prototype.setNamespace = function(b) {
-          A("public.XML::setNamespace");
+          C("public.XML::setNamespace");
         };
         c.prototype.text = function() {
           var b = a.ASXMLList.createList(this, this._name);
@@ -14214,8 +14722,8 @@
         c.prototype.setProperty = function(e, f, c) {
           e === e >>> 0 && k.Runtime.throwError("TypeError", k.Errors.XMLAssignmentToIndexedXMLNotAllowed);
           if (3 !== this._kind && 4 !== this._kind && 5 !== this._kind && 2 !== this._kind) {
-            if (c = r(c) && 3 !== c._kind && 2 !== c._kind ? c._deepCopy() : v(c), e = b(e), f) {
-              if (n(e.name)) {
+            if (c = q(c) && 3 !== c._kind && 2 !== c._kind ? c._deepCopy() : v(c), e = b(e), f) {
+              if (r(e.name)) {
                 if (c instanceof a.ASXMLList) {
                   if (0 === c._children.length) {
                     c = "";
@@ -14227,11 +14735,11 @@
                     c = f;
                   }
                 } else {
-                  c = H(c);
+                  c = F(c);
                 }
                 f = null;
-                for (var q = this._attributes, h = this._attributes = [], g = 0;q && g < q.length;g++) {
-                  var m = q[g];
+                for (var n = this._attributes, h = this._attributes = [], g = 0;n && g < n.length;g++) {
+                  var m = n[g];
                   if (m._name.equals(e)) {
                     if (f) {
                       m._parent = null;
@@ -14246,41 +14754,41 @@
                 f._value = c;
               }
             } else {
-              f = !r(c) && "*" !== e.localName;
-              q = e.flags & 4;
+              f = !q(c) && "*" !== e.localName;
+              n = e.flags & 4;
               h = e.flags & 8;
               for (m = this.length() - 1;0 <= m;m--) {
-                (q || 1 === this._children[m]._kind && this._children[m]._name.localName === e.localName) && (h || 1 === this._children[m]._kind && this._children[m]._name.uri === e.uri) && (void 0 !== g && this.deleteByIndex(g), g = m);
+                (n || 1 === this._children[m]._kind && this._children[m]._name.localName === e.localName) && (h || 1 === this._children[m]._kind && this._children[m]._name.uri === e.uri) && (void 0 !== g && this.deleteByIndex(g), g = m);
               }
-              void 0 === g && (g = this.length(), f && (q = null === e.uri ? new a.ASQName(new a.ASNamespace("", S.defaultNamespace), e) : new a.ASQName(e), e = x(1, q.uri, q.localName, q.prefix), e._parent = this, q = q.getNamespace(), this.replace(String(g), e), e.addInScopeNamespace(q)));
+              void 0 === g && (g = this.length(), f && (n = null === e.uri ? new a.ASQName(new a.ASNamespace("", S.defaultNamespace), e) : new a.ASQName(e), e = x(1, n.uri, n.localName, n.prefix), e._parent = this, n = n.getNamespace(), this.replace(String(g), e), e.addInScopeNamespace(n)));
               f ? (this._children[g]._children = [], f = v(c), "" !== f && this._children[g].replace("0", f)) : this.replace(String(g), c);
             }
           }
         };
         c.prototype.asSetProperty = function(b, a, e, f) {
           if (c.isTraitsOrDynamicPrototype(this)) {
-            return M.call(this, b, a, e, f);
+            return N.call(this, b, a, e, f);
           }
-          e = !!(e & L.ATTRIBUTE);
-          this.setProperty(q(b, a, e), e, f);
+          e = !!(e & H.ATTRIBUTE);
+          this.setProperty(n(b, a, e), e, f);
         };
         c.prototype.getProperty = function(e, f) {
-          if (d.isIndex(e) || !L.isQName(e) && d.isNumeric(e)) {
+          if (d.isIndex(e) || !H.isQName(e) && d.isNumeric(e)) {
             return 0 === (e | 0) ? this : null;
           }
           var c = b(e), g = a.ASXMLList.createList(this, this._name);
           g._targetObject = this;
           g._targetProperty = c;
-          var n = 0, q = c.name.flags, h = q & 4, m = q & 8;
-          if (f || q & 1) {
-            for (q = 0;this._attributes && q < this._attributes.length;q++) {
-              var p = this._attributes[q];
+          var n = 0, r = c.name.flags, h = r & 4, m = r & 8;
+          if (f || r & 1) {
+            for (r = 0;this._attributes && r < this._attributes.length;r++) {
+              var p = this._attributes[r];
               !h && p._name.localName !== c.localName || !m && p._name.uri !== c.uri || (g._children[n++] = p);
             }
             return g;
           }
-          for (q = 0;this._children && q < this._children.length;q++) {
-            p = this._children[q], (h || 1 === p._kind && p._name.localName === c.localName) && (m || 1 === p._kind && p._name.uri === c.uri) && (g._children[n++] = p);
+          for (r = 0;this._children && r < this._children.length;r++) {
+            p = this._children[r], (h || 1 === p._kind && p._name.localName === c.localName) && (m || 1 === p._kind && p._name.uri === c.uri) && (g._children[n++] = p);
           }
           return g;
         };
@@ -14292,14 +14800,14 @@
         };
         c.prototype.asGetProperty = function(b, a, e) {
           if (c.isTraitsOrDynamicPrototype(this)) {
-            return J.call(this, b, a, e);
+            return Q.call(this, b, a, e);
           }
-          e = !!(e & L.ATTRIBUTE);
-          return this.getProperty(q(b, a, e), e);
+          e = !!(e & H.ATTRIBUTE);
+          return this.getProperty(n(b, a, e), e);
         };
         c.prototype.hasProperty = function(a, e, f) {
           if (f) {
-            return e = L.isQName(a) ? a : this.resolveMultinameProperty(a.namespaces, a.name, a.flags), !!this[L.getQualifiedName(e)];
+            return e = H.isQName(a) ? a : this.resolveMultinameProperty(a.namespaces, a.name, a.flags), !!this[H.getQualifiedName(e)];
           }
           if (d.isIndex(a)) {
             return 0 === Number(a);
@@ -14327,17 +14835,17 @@
           if (d.isIndex(a)) {
             return!0;
           }
-          var f = b(a), c = f.localName, g = f.uri, n = f.name.flags, q = n & 4, h = n & 8;
+          var f = b(a), c = f.localName, g = f.uri, n = f.name.flags, r = n & 4, h = n & 8;
           if (e) {
             if (n = this._attributes) {
               for (var m = this._attributes = [], p = 0;p < n.length;p++) {
                 var l = n[p], x = l._name;
-                !q && x.localName !== c || !h && x.uri !== g ? m.push(l) : l._parent = null;
+                !r && x.localName !== c || !h && x.uri !== g ? m.push(l) : l._parent = null;
               }
             }
           } else {
             if (this._children.some(function(b, a) {
-              return(q || 1 === b._kind && b._name.localName === f.localName) && (h || 1 === b._kind && b._name.uri === f.uri);
+              return(r || 1 === b._kind && b._name.localName === f.localName) && (h || 1 === b._kind && b._name.uri === f.uri);
             })) {
               return!0;
             }
@@ -14345,34 +14853,34 @@
         };
         c.prototype.asHasProperty = function(b, a, e) {
           if (c.isTraitsOrDynamicPrototype(this)) {
-            return B.call(this, b, a, e);
+            return y.call(this, b, a, e);
           }
-          var f = !!(e & L.ATTRIBUTE);
-          a = q(b, a, f);
+          var f = !!(e & H.ATTRIBUTE);
+          a = n(b, a, f);
           if (this.hasProperty(a, f, !1)) {
             return!0;
           }
-          b = L.isQName(a) ? a : this.resolveMultinameProperty(b, a, e);
-          return!!this[L.getQualifiedName(b)];
+          b = H.isQName(a) ? a : this.resolveMultinameProperty(b, a, e);
+          return!!this[H.getQualifiedName(b)];
         };
         c.prototype._asDeleteProperty = function(b, a, e) {
           if (c.isTraitsOrDynamicPrototype(this)) {
-            return y.call(this, b, a, e);
+            return A.call(this, b, a, e);
           }
-          var f = !!(e & L.ATTRIBUTE);
-          a = q(b, a, f);
+          var f = !!(e & H.ATTRIBUTE);
+          a = n(b, a, f);
           if (this.deleteProperty(a, f)) {
             return!0;
           }
-          b = L.isQName(a) ? a : this.resolveMultinameProperty(b, a, e);
-          return delete this[L.getQualifiedName(b)];
+          b = H.isQName(a) ? a : this.resolveMultinameProperty(b, a, e);
+          return delete this[H.getQualifiedName(b)];
         };
         c.prototype.asHasPropertyInternal = function(b, a, e) {
           return this.asHasProperty(b, a, e);
         };
         c.prototype.asCallProperty = function(b, a, e, f, g) {
           if (c.isTraitsOrDynamicPrototype(this) || f) {
-            return D.call(this, b, a, e, f, g);
+            return B.call(this, b, a, e, f, g);
           }
           var n;
           n = this.resolveMultinameProperty(b, a, e);
@@ -14385,7 +14893,7 @@
           throwError("TypeError", k.Errors.CallOfNonFunctionError, "value");
         };
         c.prototype._delete = function(b, a) {
-          A("XML.[[Delete]]");
+          C("XML.[[Delete]]");
         };
         c.prototype.deleteByIndex = function(b) {
           if (String(b >>> 0) !== String(b)) {
@@ -14409,7 +14917,7 @@
                 f = f._parent;
               }
             }
-            if (this instanceof V) {
+            if (this instanceof W) {
               if (f = this.length(), 0 === f) {
                 return;
               }
@@ -14419,7 +14927,7 @@
             for (var c = this.length() - 1;c >= e;c--) {
               this._children[c + f] = this._children[c];
             }
-            if (this instanceof V) {
+            if (this instanceof W) {
               for (f = a.length(), c = 0;c < f;c++) {
                 a._children[c]._parent = this, this[e + c] = a[c];
               }
@@ -14466,25 +14974,26 @@
         };
         c.instanceConstructor = c;
         c.classInitializer = function() {
+          K(this, "$Bglength", 1);
           var b = c.prototype;
           K(b, "asDeleteProperty", b._asDeleteProperty);
           K(b, "$BgvalueOf", Object.prototype.$BgvalueOf);
           K(b, "$BghasOwnProperty", b.native_hasOwnProperty);
           K(b, "$BgpropertyIsEnumerable", b.native_propertyIsEnumerable);
-          F(c, ["settings", "setSettings", "defaultSettings"]);
-          F(b, "toString addNamespace appendChild attribute attributes child childIndex children comments contains copy descendants elements hasComplexContent hasSimpleContent inScopeNamespaces insertChildAfter insertChildBefore length localName name namespace namespaceDeclarations nodeKind normalize parent processingInstructions prependChild removeNamespace replace setChildren setLocalName setName setNamespace text toXMLString toJSON".split(" "));
+          E(c, ["settings", "setSettings", "defaultSettings"]);
+          E(b, "toString addNamespace appendChild attribute attributes child childIndex children comments contains copy descendants elements hasComplexContent hasSimpleContent inScopeNamespaces insertChildAfter insertChildBefore length localName name namespace namespaceDeclarations nodeKind normalize parent processingInstructions prependChild removeNamespace replace setChildren setLocalName setName setNamespace text toXMLString toJSON".split(" "));
         };
         c.callableConstructor = function(b) {
           d.isNullOrUndefined(b) && (b = "");
           return m(b);
         };
         c.defaultNamespace = "";
-        c._flags = O.ALL;
+        c._flags = J.ALL;
         c._prettyIndent = 2;
         return c;
       }(a.ASNative);
       a.ASXML = S;
-      var V = function(f) {
+      var W = function(f) {
         function c(b) {
           this._children = [];
           d.isNullOrUndefined(b) && (b = "");
@@ -14558,7 +15067,7 @@
           return b;
         };
         c.prototype.native_hasOwnProperty = function(e) {
-          e = H(e);
+          e = F(e);
           if (c.isTraitsOrDynamicPrototype(this)) {
             return a.ASObject.prototype.native_hasOwnProperty.call(this, e);
           }
@@ -14567,8 +15076,8 @@
           }
           e = b(e);
           for (var f = !!(e.flags & 1), g = this._children, n = 0;n < g.length;n++) {
-            var q = g[n];
-            if (1 === q._kind && q.hasProperty(e, f, !1)) {
+            var r = g[n];
+            if (1 === r._kind && r.hasProperty(e, f, !1)) {
               return!0;
             }
           }
@@ -14834,24 +15343,24 @@
         };
         c.prototype.asGetProperty = function(b, a, e) {
           if (c.isTraitsOrDynamicPrototype(this)) {
-            return J.call(this, b, a, e);
+            return Q.call(this, b, a, e);
           }
-          e = !!(e & L.ATTRIBUTE);
-          return this.getProperty(q(b, a, e), e);
+          e = !!(e & H.ATTRIBUTE);
+          return this.getProperty(n(b, a, e), e);
         };
         c.prototype.hasProperty = function(b, a) {
           return d.isIndex(b) ? Number(b) < this._children.length : !0;
         };
         c.prototype.asHasProperty = function(b, a, e) {
           if (c.isTraitsOrDynamicPrototype(this)) {
-            return J.call(this, b, a, e);
+            return Q.call(this, b, a, e);
           }
-          e = !!(e & L.ATTRIBUTE);
-          return this.hasProperty(q(b, a, e), e);
+          e = !!(e & H.ATTRIBUTE);
+          return this.hasProperty(n(b, a, e), e);
         };
         c.prototype.asHasPropertyInternal = function(b, a, e) {
-          e = !!(e & L.ATTRIBUTE);
-          return this.hasProperty(q(b, a, e), e);
+          e = !!(e & H.ATTRIBUTE);
+          return this.hasProperty(n(b, a, e), e);
         };
         c.prototype.resolveValue = function() {
           return this;
@@ -14888,53 +15397,53 @@
               b = f;
               if (2 !== n._kind) {
                 if (null !== g) {
-                  var q;
+                  var r;
                   if (0 < b) {
                     var h = this._children[b - 1];
-                    for (q = 0;q < g.length - 1 && g._children[q] !== h;q++) {
+                    for (r = 0;r < g.length - 1 && g._children[r] !== h;r++) {
                     }
                   } else {
-                    q = g.length() - 1;
+                    r = g.length() - 1;
                   }
-                  g._children[q + 1] = n;
+                  g._children[r + 1] = n;
                   n._parent = g;
                 }
                 c instanceof a.ASXML ? n._name = c._name : c instanceof a.ASXMLList && (n._name = c._targetProperty);
                 this.append(n);
               }
             }
-            r(c) && 3 !== c._kind && 2 !== c._kind || (c += "");
-            q = this._children[b];
-            n = q._kind;
-            g = q._parent;
+            q(c) && 3 !== c._kind && 2 !== c._kind || (c += "");
+            r = this._children[b];
+            n = r._kind;
+            g = r._parent;
             if (2 === n) {
-              var m = g._children.indexOf(q);
-              g.setProperty(q._name, !0, !1);
+              var m = g._children.indexOf(r);
+              g.setProperty(r._name, !0, !1);
               this._children[b] = g._children[m];
             } else {
               if (c instanceof a.ASXMLList) {
                 m = c._shallowCopy();
                 c = m.length();
                 if (null !== g) {
-                  for (n = g._children.indexOf(q), g.replace(n, m), q = 0;q < c;q++) {
-                    m.setProperty(q, !1, g._children[n + q]);
+                  for (n = g._children.indexOf(r), g.replace(n, m), r = 0;r < c;r++) {
+                    m.setProperty(r, !1, g._children[n + r]);
                   }
                 }
                 if (0 === c) {
-                  for (q = b + 1;q < f;q++) {
-                    this._children[q - 1] = this._children[q];
+                  for (r = b + 1;r < f;r++) {
+                    this._children[r - 1] = this._children[r];
                   }
                   this._children.length--;
                 } else {
-                  for (q = f - 1;q > b;q--) {
-                    this._children[q + c - 1] = this._children[q];
+                  for (r = f - 1;r > b;r--) {
+                    this._children[r + c - 1] = this._children[r];
                   }
                 }
-                for (q = 0;q < c;q++) {
-                  this._children[b + q] = m._children[q];
+                for (r = 0;r < c;r++) {
+                  this._children[b + r] = m._children[r];
                 }
               } else {
-                c instanceof a.ASXML || 3 <= n ? (null !== g && (n = g._children.indexOf(q), g.replace(n, m), c = g._children[n]), "string" === typeof c ? (m = new a.ASXML(c), this._children[b] = m) : this._children[b] = c) : q.setProperty("*", !1, c);
+                c instanceof a.ASXML || 3 <= n ? (null !== g && (n = g._children.indexOf(r), g.replace(n, m), c = g._children[n]), "string" === typeof c ? (m = new a.ASXML(c), this._children[b] = m) : this._children[b] = c) : r.setProperty("*", !1, c);
               }
             }
           } else {
@@ -14950,10 +15459,10 @@
         };
         c.prototype.asSetProperty = function(b, a, e, f) {
           if (c.isTraitsOrDynamicPrototype(this)) {
-            return M.call(this, b, a, e, f);
+            return N.call(this, b, a, e, f);
           }
-          e = !!(e & L.ATTRIBUTE);
-          a = q(b, a, e);
+          e = !!(e & H.ATTRIBUTE);
+          a = n(b, a, e);
           return this.setProperty(a, e, f);
         };
         c.prototype._asDeleteProperty = function(b, a, e) {
@@ -14965,8 +15474,8 @@
             this.removeByIndex(b);
             return!0;
           }
-          e = !!(e & L.ATTRIBUTE);
-          a = q(b, a, e);
+          e = !!(e & H.ATTRIBUTE);
+          a = n(b, a, e);
           for (b = 0;b < this._children.length;b++) {
             var f = this._children[b];
             1 === f._kind && f.deleteProperty(a, e);
@@ -14980,7 +15489,7 @@
         };
         c.prototype.asCallProperty = function(b, a, e, f, g) {
           if (c.isTraitsOrDynamicPrototype(this) || f) {
-            return D.call(this, b, a, e, f, g);
+            return B.call(this, b, a, e, f, g);
           }
           var n;
           n = this.resolveMultinameProperty(b, a, e);
@@ -14994,12 +15503,13 @@
         };
         c.instanceConstructor = c;
         c.classInitializer = function() {
+          K(this, "$Bglength", 1);
           var b = c.prototype;
           K(b, "asDeleteProperty", b._asDeleteProperty);
           K(b, "$BgvalueOf", Object.prototype.$BgvalueOf);
           K(b, "$BghasOwnProperty", b.native_hasOwnProperty);
           K(b, "$BgpropertyIsEnumerable", b.native_propertyIsEnumerable);
-          F(b, "toString addNamespace appendChild attribute attributes child childIndex children comments contains copy descendants elements hasComplexContent hasSimpleContent inScopeNamespaces insertChildAfter insertChildBefore length localName name namespace namespaceDeclarations nodeKind normalize parent processingInstructions prependChild removeNamespace replace setChildren setLocalName setName setNamespace text toXMLString toJSON".split(" "));
+          E(b, "toString addNamespace appendChild attribute attributes child childIndex children comments contains copy descendants elements hasComplexContent hasSimpleContent inScopeNamespaces insertChildAfter insertChildBefore length localName name namespace namespaceDeclarations nodeKind normalize parent processingInstructions prependChild removeNamespace replace setChildren setLocalName setName setNamespace text toXMLString toJSON".split(" "));
         };
         c.callableConstructor = function(b) {
           d.isNullOrUndefined(b) && (b = "");
@@ -15012,14 +15522,14 @@
         };
         return c;
       }(a.ASNative);
-      a.ASXMLList = V;
+      a.ASXMLList = W;
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(b, a) {
+      function q(b, a) {
         var e = (b | 0) === b;
         if (a & 512 && (d.isNullOrUndefined(b) || e)) {
           return null;
@@ -15038,13 +15548,13 @@
           }
         }
         b = Object(b);
-        var g = b.classInfo ? b : Object.getPrototypeOf(b).class, q = g === b && !(a & 512), h = g.classInfo, m = {};
-        m[n] = e ? "int" : f ? "builtin.as$0::MethodClosure" : c(h.instanceInfo.name);
-        m[l("isDynamic")] = q || !(h.instanceInfo.flags & 1) && !f;
-        m[l("isFinal")] = q || !!(h.instanceInfo.flags & 2) || f;
-        m[l("isStatic")] = q;
+        var g = b.classInfo ? b : Object.getPrototypeOf(b).class, n = g === b && !(a & 512), h = g.classInfo, m = {};
+        m[r] = e ? "int" : f ? "builtin.as$0::MethodClosure" : c(h.instanceInfo.name);
+        m[l("isDynamic")] = n || !(h.instanceInfo.flags & 1) && !f;
+        m[l("isFinal")] = n || !!(h.instanceInfo.flags & 2) || f;
+        m[l("isStatic")] = n;
         if (a & 256) {
-          var p = m[l("traits")] = s(g, h, q, a)
+          var p = m[l("traits")] = s(g, h, n, a)
         }
         f && (p[l("bases")].unshift("Function"), p[l("accessors")][1][l("declaredBy")] = "builtin.as$0::MethodClosure");
         return m;
@@ -15059,27 +15569,27 @@
         for (g = 0;c && g < c.length;g++) {
           n = new a.ASXML('<implementsInterface type="' + a.escapeAttributeValue(c[g]) + '"/>'), b.appendChild(n), f++;
         }
-        null !== e[l("constructor")] && (n = new a.ASXML("<constructor/>"), u(n, e[l("constructor")]), b.appendChild(n), f++);
+        null !== e[l("constructor")] && (n = new a.ASXML("<constructor/>"), t(n, e[l("constructor")]), b.appendChild(n), f++);
         c = e[l("variables")];
         for (g = 0;c && g < c.length;g++) {
-          var q = c[g], n = "readonly" === q[l("access")] ? "constant" : "variable", n = new a.ASXML("<" + n + ' name="' + a.escapeAttributeValue(q[l("name")]) + '" type="' + q[l("type")] + '"/>');
-          null !== q[l("uri")] && n.setProperty("uri", !0, q[l("uri")]);
-          null !== q[l("metadata")] && t(n, q[l("metadata")]);
+          var r = c[g], n = "readonly" === r[l("access")] ? "constant" : "variable", n = new a.ASXML("<" + n + ' name="' + a.escapeAttributeValue(r[l("name")]) + '" type="' + r[l("type")] + '"/>');
+          null !== r[l("uri")] && n.setProperty("uri", !0, r[l("uri")]);
+          null !== r[l("metadata")] && u(n, r[l("metadata")]);
           b.appendChild(n);
           f++;
         }
         c = e[l("accessors")];
         for (g = 0;c && g < c.length;g++) {
-          q = c[g], n = new a.ASXML('<accessor name="' + a.escapeAttributeValue(q[l("name")]) + '" access="' + q[l("access")] + '" type="' + a.escapeAttributeValue(q[l("type")]) + '" declaredBy="' + a.escapeAttributeValue(q[l("declaredBy")]) + '"/>'), null !== q[l("uri")] && n.setProperty("uri", !0, q[l("uri")]), null !== q[l("metadata")] && t(n, q[l("metadata")]), b.appendChild(n), f++;
+          r = c[g], n = new a.ASXML('<accessor name="' + a.escapeAttributeValue(r[l("name")]) + '" access="' + r[l("access")] + '" type="' + a.escapeAttributeValue(r[l("type")]) + '" declaredBy="' + a.escapeAttributeValue(r[l("declaredBy")]) + '"/>'), null !== r[l("uri")] && n.setProperty("uri", !0, r[l("uri")]), null !== r[l("metadata")] && u(n, r[l("metadata")]), b.appendChild(n), f++;
         }
         c = e[l("methods")];
         for (g = 0;c && g < c.length;g++) {
-          q = c[g], n = new a.ASXML('<method name="' + a.escapeAttributeValue(q[l("name")]) + '" declaredBy="' + a.escapeAttributeValue(q[l("declaredBy")]) + '" returnType="' + a.escapeAttributeValue(q[l("returnType")]) + '"/>'), u(n, q[l("parameters")]), null !== q[l("uri")] && n.setProperty("uri", !0, q[l("uri")]), null !== q[l("metadata")] && t(n, q[l("metadata")]), b.appendChild(n), f++;
+          r = c[g], n = new a.ASXML('<method name="' + a.escapeAttributeValue(r[l("name")]) + '" declaredBy="' + a.escapeAttributeValue(r[l("declaredBy")]) + '" returnType="' + a.escapeAttributeValue(r[l("returnType")]) + '"/>'), t(n, r[l("parameters")]), null !== r[l("uri")] && n.setProperty("uri", !0, r[l("uri")]), null !== r[l("metadata")] && u(n, r[l("metadata")]), b.appendChild(n), f++;
         }
-        t(b, e[l("metadata")]);
+        u(b, e[l("metadata")]);
         return 0 < f;
       }
-      function u(b, e) {
+      function t(b, e) {
         if (e) {
           for (var f = 0;f < e.length;f++) {
             var c = e[f], c = new a.ASXML('<parameter index="' + (f + 1) + '" type="' + a.escapeAttributeValue(c[l("type")]) + '" optional="' + c[l("optional")] + '"/>');
@@ -15087,12 +15597,12 @@
           }
         }
       }
-      function t(b, e) {
+      function u(b, e) {
         if (e) {
           for (var f = 0;f < e.length;f++) {
             for (var c = e[f], g = new a.ASXML('<metadata name="' + a.escapeAttributeValue(c[l("name")]) + '"/>'), c = c[l("value")], n = 0;n < c.length;n++) {
-              var q = c[n], q = new a.ASXML('<arg key="' + a.escapeAttributeValue(q[l("key")]) + '" value="' + a.escapeAttributeValue(q[l("value")]) + '"/>');
-              g.appendChild(q);
+              var r = c[n], r = new a.ASXML('<arg key="' + a.escapeAttributeValue(r[l("key")]) + '" value="' + a.escapeAttributeValue(r[l("value")]) + '"/>');
+              g.appendChild(r);
             }
             b.appendChild(g);
           }
@@ -15117,102 +15627,102 @@
       }
       function p(b) {
         var a = {};
-        a[n] = b.name;
-        a[A] = b.value.map(function(b) {
+        a[r] = b.name;
+        a[C] = b.value.map(function(b) {
           var a = {};
-          a[A] = b.value;
-          a[H] = b.key;
+          a[C] = b.value;
+          a[F] = b.key;
           return a;
         });
         return a;
       }
-      function s(g, m, p, d) {
+      function s(g, m, d, p) {
         function s(a) {
           for (var g = a.length;g--;) {
             var m = a[g], l = m.name.getNamespace();
-            if (!(!l.isPublic() && !m.name.uri || d & 1 && l.uri)) {
-              var r = c(m.name);
-              if (S[r] !== V[r]) {
-                l = Q[r], l[e] = "readwrite", 2 === m.kind && (l[x] = m.methodInfo.returnType ? c(m.methodInfo.returnType) : "*");
+            if (!(!l.isPublic() && !m.name.uri || p & 1 && l.uri)) {
+              var q = c(m.name);
+              if (S[q] !== W[q]) {
+                l = P[q], l[e] = "readwrite", 2 === m.kind && (l[x] = m.methodInfo.returnType ? c(m.methodInfo.returnType) : "*");
               } else {
-                if (!Q[r]) {
-                  switch(l = {}, Q[r] = l, m.kind) {
+                if (!P[q]) {
+                  switch(l = {}, P[q] = l, m.kind) {
                     case 6:
                     ;
                     case 0:
-                      if (!(d & 8)) {
+                      if (!(p & 8)) {
                         continue;
                       }
-                      l[n] = r;
-                      l[q] = void 0 === m.name.uri ? null : m.name.uri;
+                      l[r] = q;
+                      l[n] = void 0 === m.name.uri ? null : m.name.uri;
                       l[x] = m.typeName ? c(m.typeName) : "*";
                       l[e] = "readwrite";
-                      l[b] = d & 64 ? h(m.metadata) : null;
-                      t.push(l);
+                      l[b] = p & 64 ? h(m.metadata) : null;
+                      C.push(l);
                       break;
                     case 1:
                       if (!k) {
                         continue;
                       }
-                      l[L] = m.methodInfo.returnType ? c(m.methodInfo.returnType) : "*";
-                      l[b] = d & 64 ? h(m.metadata) : null;
-                      l[n] = r;
-                      l[q] = void 0 === m.name.uri ? null : m.name.uri;
-                      for (var r = l[K] = [], m = m.methodInfo.parameters, u = 0;u < m.length;u++) {
-                        var v = m[u], H = {};
-                        H[x] = v.type ? c(v.type) : "*";
-                        H[F] = "value" in v;
-                        r.push(H);
+                      l[H] = m.methodInfo.returnType ? c(m.methodInfo.returnType) : "*";
+                      l[b] = p & 64 ? h(m.metadata) : null;
+                      l[r] = q;
+                      l[n] = void 0 === m.name.uri ? null : m.name.uri;
+                      for (var q = l[K] = [], m = m.methodInfo.parameters, t = 0;t < m.length;t++) {
+                        var v = m[t], F = {};
+                        F[x] = v.type ? c(v.type) : "*";
+                        F[E] = "value" in v;
+                        q.push(F);
                       }
-                      l[f] = aa;
-                      O.push(l);
+                      l[f] = ba;
+                      J.push(l);
                       break;
                     case 2:
                     ;
                     case 3:
-                      if (!(d & 16) || p) {
+                      if (!(p & 16) || d) {
                         continue;
                       }
-                      l[n] = r;
-                      2 === m.kind ? (l[x] = m.methodInfo.returnType ? c(m.methodInfo.returnType) : "*", S[r] = l) : (u = m.methodInfo.parameters[0].type, l[x] = u ? c(u) : "*", V[r] = l);
+                      l[r] = q;
+                      2 === m.kind ? (l[x] = m.methodInfo.returnType ? c(m.methodInfo.returnType) : "*", S[q] = l) : (t = m.methodInfo.parameters[0].type, l[x] = t ? c(t) : "*", W[q] = l);
                       l[e] = 2 === m.kind ? "readonly" : "writeonly";
-                      l[b] = d & 64 ? h(m.metadata) : null;
-                      l[q] = void 0 === m.name.uri ? null : m.name.uri;
-                      l[f] = aa;
-                      A.push(l);
+                      l[b] = p & 64 ? h(m.metadata) : null;
+                      l[n] = void 0 === m.name.uri ? null : m.name.uri;
+                      l[f] = ba;
+                      u.push(l);
                   }
                 }
               }
             }
           }
         }
-        var r = d & 2, k = d & 32 && !p, u = {}, t = u[l("variables")] = d & 8 ? [] : null, A = u[l("accessors")] = d & 16 ? [] : null, v = null;
-        d & 64 && (v = p ? [] : h(m.metadata) || []);
-        u[b] = v;
-        u[l("constructor")] = null;
-        if (d & 4) {
-          if (m = u[l("interfaces")] = [], !p) {
-            for (var H in g.implementedInterfaces) {
-              v = g.implementedInterfaces[H].getQualifiedClassName(), m.push(v);
+        var q = p & 2, k = p & 32 && !d, t = {}, C = t[l("variables")] = p & 8 ? [] : null, u = t[l("accessors")] = p & 16 ? [] : null, v = null;
+        p & 64 && (v = d ? [] : h(m.metadata) || []);
+        t[b] = v;
+        t[l("constructor")] = null;
+        if (p & 4) {
+          if (m = t[l("interfaces")] = [], !d) {
+            for (var F in g.implementedInterfaces) {
+              v = g.implementedInterfaces[F].getQualifiedClassName(), m.push(v);
             }
           }
         } else {
-          u[l("interfaces")] = null;
+          t[l("interfaces")] = null;
         }
-        var O = u[l("methods")] = k ? [] : null;
-        H = u[l("bases")] = r ? [] : null;
-        var Q = {}, S = {}, V = {};
+        var J = t[l("methods")] = k ? [] : null;
+        F = t[l("bases")] = q ? [] : null;
+        var P = {}, S = {}, W = {};
         for (m = !1;g;) {
-          var aa = c(g.classInfo.instanceInfo.name);
-          r && m && !p ? H.push(aa) : m = !0;
-          if (d & 1024 && g === a.ASObject) {
+          var ba = c(g.classInfo.instanceInfo.name);
+          q && m && !d ? F.push(ba) : m = !0;
+          if (p & 1024 && g === a.ASObject) {
             break;
           }
-          p ? s(g.classInfo.traits) : s(g.classInfo.instanceInfo.traits);
+          d ? s(g.classInfo.traits) : s(g.classInfo.instanceInfo.traits);
           g = g.baseClass;
         }
-        p && (d & 16 && (g = {}, g[n] = "prototype", g[x] = "*", g[e] = "readonly", g[b] = null, g[q] = null, g[f] = "Class", A.push(g)), r && (H.pop(), H.push("Class", "Object"), g = a.ASClass));
-        return u;
+        d && (p & 16 && (g = {}, g[r] = "prototype", g[x] = "*", g[e] = "readonly", g[b] = null, g[n] = null, g[f] = "Class", u.push(g)), q && (F.pop(), F.push("Class", "Object"), g = a.ASClass));
+        return t;
       }
       var m = d.AVM2.ABC.Multiname, g;
       (function(b) {
@@ -15228,10 +15738,10 @@
         b[b.USE_ITRAITS = 512] = "USE_ITRAITS";
         b[b.HIDE_OBJECT = 1024] = "HIDE_OBJECT";
       })(g || (g = {}));
-      var f = l("declaredBy"), b = l("metadata"), e = l("access"), q = l("uri"), n = l("name"), x = l("type"), L = l("returnType"), A = l("value"), H = l("key"), K = l("parameters"), F = l("optional");
-      a.describeTypeJSON = r;
+      var f = l("declaredBy"), b = l("metadata"), e = l("access"), n = l("uri"), r = l("name"), x = l("type"), H = l("returnType"), C = l("value"), F = l("key"), K = l("parameters"), E = l("optional");
+      a.describeTypeJSON = q;
       a.describeType = function(b, e) {
-        var f = r(b, e), c = k.Runtime.AVM2.instance.systemDomain;
+        var f = q(b, e), c = k.Runtime.AVM2.instance.systemDomain;
         c.getClass("XML");
         c.getClass("XMLList");
         c.getClass("QName");
@@ -15244,7 +15754,7 @@
         c.setProperty("isFinal", !0, f[l("isFinal")].toString());
         c.setProperty("isStatic", !0, f[l("isStatic")].toString());
         v(c, f[l("traits")]);
-        if (f = r(b, e | 512)) {
+        if (f = q(b, e | 512)) {
           g = new a.ASXML("<factory/>"), g.setProperty("type", !0, f[l("name")]), v(g, f[l("traits")]) && c.appendChild(g);
         }
         return c;
@@ -15253,12 +15763,17 @@
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
-  (function(d) {
+  (function(k) {
     (function(a) {
-      (function(d) {
-        (function(d) {
-          var r = Object.prototype.asGetProperty, k = Object.prototype.asSetProperty, l = Object.prototype.asHasProperty, c = Object.prototype.asDeleteProperty, h = Object.prototype.asGetEnumerableKeys, p = function(a) {
+      (function(q) {
+        (function(q) {
+          var k = Object.prototype.asGetProperty, u = Object.prototype.asSetProperty, l = Object.prototype.asHasProperty, c = Object.prototype.asDeleteProperty, h = Object.prototype.asGetEnumerableKeys, p = function(a) {
             function m(a) {
+              void 0 === a && (a = !1);
+              this.weakKeys = !!a;
+              this.map = new WeakMap;
+              a || (this.keys = []);
+              this.primitiveMap = Object.create(null);
             }
             __extends(m, a);
             m.isTraitsOrDynamicPrototype = function(a) {
@@ -15269,11 +15784,8 @@
                 return a;
               }
             };
-            m.prototype.init = function(a) {
-              this.weakKeys = !!a;
-              this.map = new WeakMap;
-              a || (this.keys = []);
-              this.primitiveMap = Object.create(null);
+            m.prototype.toJSON = function() {
+              return "Dictionary";
             };
             m.prototype.asGetNumericProperty = function(a) {
               return this.asGetProperty(null, a, 0);
@@ -15283,14 +15795,14 @@
             };
             m.prototype.asGetProperty = function(a, f, b) {
               if (m.isTraitsOrDynamicPrototype(this)) {
-                return r.call(this, a, f, b);
+                return k.call(this, a, f, b);
               }
               a = m.makePrimitiveKey(f);
               return void 0 !== a ? this.primitiveMap[a] : this.map.get(Object(f));
             };
             m.prototype.asSetProperty = function(a, f, b, e) {
               if (m.isTraitsOrDynamicPrototype(this)) {
-                return k.call(this, a, f, b, e);
+                return u.call(this, a, f, b, e);
               }
               a = m.makePrimitiveKey(f);
               void 0 !== a ? this.primitiveMap[a] = e : (this.map.set(Object(f), e), !this.weakKeys && 0 > this.keys.indexOf(f) && this.keys.push(f));
@@ -15323,29 +15835,60 @@
               }
               return this.weakKeys ? a : a.concat(this.keys);
             };
+            m.classInitializer = function() {
+              var a = m.prototype;
+              d.ObjectUtilities.defineNonEnumerableProperty(a, "$BgtoJSON", a.toJSON);
+            };
             m.protocol = m.prototype;
             return m;
           }(a.ASNative);
-          d.Dictionary = p;
-          d.OriginalDictionary = p;
-        })(d.utils || (d.utils = {}));
+          q.Dictionary = p;
+          q.OriginalDictionary = p;
+        })(q.utils || (q.utils = {}));
       })(a.flash || (a.flash = {}));
-    })(d.AS || (d.AS = {}));
+    })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.Debug.notImplemented, k = d.AVM2.ABC.Namespace;
+      var q = d.Debug.notImplemented, v = d.AVM2.ABC.Namespace, t = d.AVM2.Runtime.throwError;
       (function(d) {
         (function(d) {
-          var l = Object.prototype.asGetProperty, c = Object.prototype.asSetProperty, h = Object.prototype.asCallProperty, p = Object.prototype.asHasProperty, s = Object.prototype.asHasOwnProperty, m = Object.prototype.asHasTraitProperty, g = Object.prototype.asDeleteProperty, f = function(b) {
+          var c = Object.prototype.asGetProperty, h = Object.prototype.asSetProperty, p = Object.prototype.asCallProperty, s = Object.prototype.asHasProperty, m = Object.prototype.asHasOwnProperty, g = Object.prototype.asHasTraitProperty, f = Object.prototype.asDeleteProperty, b = function(b) {
             function a() {
               b.apply(this, arguments);
             }
             __extends(a, b);
+            a.prototype.native_getProperty = function(b) {
+              t("IllegalOperationError", k.Errors.ProxyGetPropertyError);
+            };
+            a.prototype.native_setProperty = function() {
+              t("IllegalOperationError", k.Errors.ProxySetPropertyError);
+            };
+            a.prototype.native_callProperty = function() {
+              t("IllegalOperationError", k.Errors.ProxyCallPropertyError);
+            };
+            a.prototype.native_hasProperty = function() {
+              t("IllegalOperationError", k.Errors.ProxyHasPropertyError);
+            };
+            a.prototype.native_deleteProperty = function() {
+              t("IllegalOperationError", k.Errors.ProxyDeletePropertyError);
+            };
+            a.prototype.native_getDescendants = function() {
+              t("IllegalOperationError", k.Errors.ProxyGetDescendantsError);
+            };
+            a.prototype.native_nextNameIndex = function() {
+              t("IllegalOperationError", k.Errors.ProxyNextNameIndexError);
+            };
+            a.prototype.native_nextName = function() {
+              t("IllegalOperationError", k.Errors.ProxyNextNameError);
+            };
+            a.prototype.native_nextValue = function() {
+              t("IllegalOperationError", k.Errors.ProxyNextValueError);
+            };
             a.prototype.asGetProperty = function(b, a, e) {
-              return m.call(this, b, a, e) ? l.call(this, b, a, e) : h.call(this, [k.PROXY], "getProperty", 0, !1, [a]);
+              return g.call(this, b, a, e) ? c.call(this, b, a, e) : p.call(this, [v.PROXY], "getProperty", 0, !1, [a]);
             };
             a.prototype.asGetNumericProperty = function(b) {
               return this.asGetProperty(null, b, 0);
@@ -15354,34 +15897,34 @@
               this.asSetProperty(null, b, 0, a);
             };
             a.prototype.asSetProperty = function(b, a, e, f) {
-              m.call(this, b, a, e) ? c.call(this, b, a, e, f) : h.call(this, [k.PROXY], "setProperty", 0, !1, [a, f]);
+              g.call(this, b, a, e) ? h.call(this, b, a, e, f) : p.call(this, [v.PROXY], "setProperty", 0, !1, [a, f]);
             };
             a.prototype.asCallProperty = function(b, a, e, f, c) {
-              return m.call(this, b, a, e) ? h.call(this, b, a, e, !1, c) : h.call(this, [k.PROXY], "callProperty", 0, !1, [a].concat(c));
+              return g.call(this, b, a, e) ? p.call(this, b, a, e, !1, c) : p.call(this, [v.PROXY], "callProperty", 0, !1, [a].concat(c));
             };
             a.prototype.asHasProperty = function(b, a, e) {
-              return m.call(this, b, a, e) ? p.call(this, b, a, e) : h.call(this, [k.PROXY], "hasProperty", 0, !1, [a]);
+              return g.call(this, b, a, e) ? s.call(this, b, a, e) : p.call(this, [v.PROXY], "hasProperty", 0, !1, [a]);
             };
             a.prototype.asHasOwnProperty = function(b, a, e) {
-              return m.call(this, b, a, e) ? s.call(this, b, a, e) : h.call(this, [k.PROXY], "hasProperty", 0, !1, [a]);
+              return g.call(this, b, a, e) ? m.call(this, b, a, e) : p.call(this, [v.PROXY], "hasProperty", 0, !1, [a]);
             };
             a.prototype.asDeleteProperty = function(b, a, e) {
-              return m.call(this, b, a, e) ? g.call(this, b, a, e) : h.call(this, [k.PROXY], "deleteProperty", 0, !1, [a]);
+              return g.call(this, b, a, e) ? f.call(this, b, a, e) : p.call(this, [v.PROXY], "deleteProperty", 0, !1, [a]);
             };
             a.prototype.asNextName = function(b) {
-              r("Proxy asNextName");
+              q("Proxy asNextName");
             };
             a.prototype.asNextValue = function(b) {
-              r("Proxy asNextValue");
+              q("Proxy asNextValue");
             };
             a.prototype.asNextNameIndex = function(b) {
-              r("Proxy asNextNameIndex");
+              q("Proxy asNextNameIndex");
             };
             a.protocol = a.prototype;
             return a;
           }(a.ASNative);
-          d.Proxy = f;
-          d.OriginalProxy = f;
+          d.Proxy = b;
+          d.OriginalProxy = b;
         })(d.utils || (d.utils = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -15390,7 +15933,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.Debug.notImplemented, v = d.Debug.unexpected, u = d.ArrayUtilities.DataBuffer;
+      var q = d.Debug.notImplemented, v = d.Debug.unexpected, t = d.ArrayUtilities.DataBuffer;
       (function(d) {
         (function(d) {
           var c = function(a) {
@@ -15399,10 +15942,10 @@
             }
             __extends(c, a);
             Object.defineProperty(c, "dynamicPropertyWriter", {get:function() {
-              r("public flash.net.ObjectEncoding::get dynamicPropertyWriter");
+              q("public flash.net.ObjectEncoding::get dynamicPropertyWriter");
               return null;
             }, set:function(a) {
-              r("public flash.net.ObjectEncoding::set dynamicPropertyWriter");
+              q("public flash.net.ObjectEncoding::set dynamicPropertyWriter");
             }, enumerable:!0, configurable:!0});
             c.AMF0 = 0;
             c.AMF3 = 3;
@@ -15412,7 +15955,7 @@
           d.ObjectEncoding = c;
         })(d.net || (d.net = {}));
       })(a.flash || (a.flash = {}));
-      (function(r) {
+      (function(q) {
         (function(l) {
           var c = function(a) {
             function c() {
@@ -15423,11 +15966,14 @@
             }, set:function(a) {
               this._defaultObjectEncoding = a >>> 0;
             }, enumerable:!0, configurable:!0});
+            c.prototype.toJSON = function() {
+              return "ByteArray";
+            };
             c.prototype.readObject = function() {
               switch(this._objectEncoding) {
-                case r.net.ObjectEncoding.AMF0:
+                case q.net.ObjectEncoding.AMF0:
                   return k.AMF0.read(this);
-                case r.net.ObjectEncoding.AMF3:
+                case q.net.ObjectEncoding.AMF3:
                   return k.AMF3.read(this);
                 default:
                   v("Object Encoding");
@@ -15435,21 +15981,25 @@
             };
             c.prototype.writeObject = function(a) {
               switch(this._objectEncoding) {
-                case r.net.ObjectEncoding.AMF0:
+                case q.net.ObjectEncoding.AMF0:
                   return k.AMF0.write(this, a);
-                case r.net.ObjectEncoding.AMF3:
+                case q.net.ObjectEncoding.AMF3:
                   return k.AMF3.write(this, a);
                 default:
                   v("Object Encoding");
               }
             };
-            c.instanceConstructor = u;
-            c.staticNatives = [u];
-            c.instanceNatives = [u.prototype];
+            c.instanceConstructor = t;
+            c.staticNatives = [t];
+            c.instanceNatives = [t.prototype];
             c.callableConstructor = null;
+            c.classInitializer = function() {
+              var a = t.prototype;
+              d.ObjectUtilities.defineNonEnumerableProperty(a, "$BgtoJSON", a.toJSON);
+            };
             c.initializer = function(a) {
               var h, g = 0;
-              a ? (a instanceof ArrayBuffer ? h = a.slice() : Array.isArray(a) ? h = (new Uint8Array(a)).buffer : "buffer" in a ? a.buffer instanceof ArrayBuffer ? h = (new Uint8Array(a)).buffer : a.buffer instanceof Uint8Array ? (h = a.buffer.byteOffset, h = a.buffer.buffer.slice(h, h + a.buffer.length)) : h = a.buffer.slice() : d.Debug.unexpected("Source type."), g = h.byteLength) : h = new ArrayBuffer(c.INITIAL_SIZE);
+              a ? (a instanceof ArrayBuffer ? h = a.slice() : Array.isArray(a) ? h = (new Uint8Array(a)).buffer : "buffer" in a ? a.buffer instanceof ArrayBuffer ? h = (new Uint8Array(a.buffer)).buffer : a.buffer instanceof Uint8Array ? (h = a.buffer.byteOffset, h = a.buffer.buffer.slice(h, h + a.buffer.length)) : h = a.buffer.slice() : d.Debug.unexpected("Source type."), g = h.byteLength) : h = new ArrayBuffer(c.INITIAL_SIZE);
               this._buffer = h;
               this._length = g;
               this._position = 0;
@@ -15460,14 +16010,32 @@
             };
             c.protocol = c.prototype;
             c.INITIAL_SIZE = 128;
-            c._defaultObjectEncoding = r.net.ObjectEncoding.DEFAULT;
+            c._defaultObjectEncoding = q.net.ObjectEncoding.DEFAULT;
             return c;
           }(a.ASNative);
           l.ByteArray = c;
-          c.prototype.asGetNumericProperty = u.prototype.getValue;
-          c.prototype.asSetNumericProperty = u.prototype.setValue;
+          c.prototype.asGetNumericProperty = t.prototype.getValue;
+          c.prototype.asSetNumericProperty = t.prototype.setValue;
           l.OriginalByteArray = c;
-        })(r.utils || (r.utils = {}));
+          c = function(a) {
+            function c() {
+            }
+            __extends(c, a);
+            c.classInitializer = function() {
+              d.ObjectUtilities.defineNonEnumerableProperty(this, "$BgZLIB", c.ZLIB);
+              d.ObjectUtilities.defineNonEnumerableProperty(this, "$BgDEFLATE", c.DEFLATE);
+              d.ObjectUtilities.defineNonEnumerableProperty(this, "$BgLZMA", c.LZMA);
+            };
+            c.initializer = null;
+            c.classSymbols = null;
+            c.instanceSymbols = null;
+            c.ZLIB = "zlib";
+            c.DEFLATE = "deflate";
+            c.LZMA = "lzma";
+            return c;
+          }(a.ASNative);
+          l.CompressionAlgorithm = c;
+        })(q.utils || (q.utils = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -15475,36 +16043,36 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.Debug.notImplemented, k = d.Debug.somewhatImplemented, u = d.AVM2.Runtime.asCoerceString;
-      (function(t) {
+      var q = d.Debug.notImplemented, k = d.Debug.somewhatImplemented, t = d.AVM2.Runtime.asCoerceString;
+      (function(u) {
         (function(l) {
           var c = function(a) {
             function c() {
             }
             __extends(c, a);
             Object.defineProperty(c, "enabled", {get:function() {
-              r("public flash.system.IME::static get enabled");
+              q("public flash.system.IME::static get enabled");
             }, set:function(a) {
-              r("public flash.system.IME::static set enabled");
+              q("public flash.system.IME::static set enabled");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c, "conversionMode", {get:function() {
-              r("public flash.system.IME::static get conversionMode");
+              q("public flash.system.IME::static get conversionMode");
             }, set:function(a) {
-              u(a);
-              r("public flash.system.IME::static set conversionMode");
+              t(a);
+              q("public flash.system.IME::static set conversionMode");
             }, enumerable:!0, configurable:!0});
             c.setCompositionString = function(a) {
-              u(a);
-              r("public flash.system.IME::static setCompositionString");
+              t(a);
+              q("public flash.system.IME::static setCompositionString");
             };
             c.doConversion = function() {
-              r("public flash.system.IME::static doConversion");
+              q("public flash.system.IME::static doConversion");
             };
             c.compositionSelectionChanged = function(a, c) {
-              r("public flash.system.IME::static compositionSelectionChanged");
+              q("public flash.system.IME::static compositionSelectionChanged");
             };
             c.compositionAbandoned = function() {
-              r("public flash.system.IME::static compositionAbandoned");
+              q("public flash.system.IME::static compositionAbandoned");
             };
             Object.defineProperty(c, "isSupported", {get:function() {
               k("public flash.system.IME::static get isSupported");
@@ -15519,10 +16087,10 @@
             }
             __extends(c, a);
             Object.defineProperty(c, "ime", {get:function() {
-              r("public flash.system.System::get ime");
+              q("public flash.system.System::get ime");
             }, enumerable:!0, configurable:!0});
             c.setClipboard = function(a) {
-              a = u(a);
+              a = t(a);
               null === d.ClipboardService.instance ? console.warn("setClipboard is only available in the Firefox extension") : d.ClipboardService.instance.setClipboard(a);
             };
             Object.defineProperty(c, "totalMemoryNumber", {get:function() {
@@ -15574,7 +16142,7 @@
           }(a.ASNative);
           l.System = c;
           l.OriginalSystem = c;
-        })(t.system || (t.system = {}));
+        })(u.system || (u.system = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -15582,7 +16150,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.AVM2.ABC.Multiname, v = d.AVM2.ABC.ClassInfo, u = d.AVM2.ABC.ScriptInfo, t = d.AVM2.ABC.InstanceInfo, l = d.AVM2.ABC.Info, c = d.AVM2.ABC.MethodInfo, h = d.Debug.notImplemented, p = d.ArrayUtilities.popManyIntoVoid, s = function() {
+      var q = d.AVM2.ABC.Multiname, v = d.AVM2.ABC.ClassInfo, t = d.AVM2.ABC.ScriptInfo, u = d.AVM2.ABC.InstanceInfo, l = d.AVM2.ABC.Info, c = d.AVM2.ABC.MethodInfo, h = d.Debug.notImplemented, p = d.ArrayUtilities.popManyIntoVoid, s = function() {
         return function(b) {
           void 0 === b && (b = "");
           this.message = b;
@@ -15602,31 +16170,31 @@
       var g = function() {
         function a() {
         }
-        a.from = function(e, c) {
-          var f = a._cache[e.hash];
-          f || (f = a._cache[e.hash] = new b(e, c));
-          return f;
+        a.from = function(e, f) {
+          var c = a._cache[e.hash];
+          c || (c = a._cache[e.hash] = new b(e, f));
+          return c;
         };
         a.fromSimpleName = function(b, e) {
-          return a.fromName(r.fromSimpleName(b), e);
+          return a.fromName(q.fromSimpleName(b), e);
         };
         a.fromName = function(b, e) {
           if (void 0 === b) {
             return a.Undefined;
           }
-          var c = r.isQName(b) ? r.getFullQualifiedName(b) : void 0;
-          if (c) {
-            var f = a._cache.byQN[c];
-            if (f) {
-              return f;
+          var f = q.isQName(b) ? q.getFullQualifiedName(b) : void 0;
+          if (f) {
+            var c = a._cache.byQN[f];
+            if (c) {
+              return c;
             }
           }
-          if (c === r.getPublicQualifiedName("void")) {
+          if (f === q.getPublicQualifiedName("void")) {
             return a.Void;
           }
-          f = (f = e.findClassInfo(b)) ? a.from(f, e) : a.Any;
-          b.hasTypeParameter() && (f = new n(f, a.fromName(b.typeParameter, e)));
-          return a._cache.byQN[c] = f;
+          c = (c = e.findClassInfo(b)) ? a.from(c, e) : a.Any;
+          b.hasTypeParameter() && (c = new r(c, a.fromName(b.typeParameter, e)));
+          return a._cache.byQN[f] = c;
         };
         a.initializeTypes = function(b) {
           a._typesInitialized || (a.Any = new f("any", "?"), a.Null = new f("Null", "X"), a.Void = new f("Void", "V"), a.Undefined = new f("Undefined", "_"), a.Int = a.fromSimpleName("int", b).instanceType(), a.Uint = a.fromSimpleName("uint", b).instanceType(), a.Class = a.fromSimpleName("Class", b).instanceType(), a.Array = a.fromSimpleName("Array", b).instanceType(), a.Object = a.fromSimpleName("Object", b).instanceType(), a.String = a.fromSimpleName("String", b).instanceType(), a.Number = a.fromSimpleName("Number", 
@@ -15681,13 +16249,13 @@
           return this instanceof b;
         };
         a.prototype.isParameterizedType = function() {
-          return this instanceof n;
+          return this instanceof r;
         };
         a.prototype.isMethodType = function() {
           return this instanceof e;
         };
         a.prototype.isMultinameType = function() {
-          return this instanceof q;
+          return this instanceof n;
         };
         a.prototype.isConstantType = function() {
           return this instanceof x;
@@ -15758,9 +16326,9 @@
         };
         a.prototype.findTraitByName = function(b, a, e) {
           var f = !e, c;
-          if (r.isQName(a)) {
-            for (a = r.getQualifiedName(a), n = 0;n < b.length;n++) {
-              if (c = b[n], r.getQualifiedName(c.name) === a && !(e && c.isGetter() || f && c.isSetter())) {
+          if (q.isQName(a)) {
+            for (a = q.getQualifiedName(a), n = 0;n < b.length;n++) {
+              if (c = b[n], q.getQualifiedName(c.name) === a && !(e && c.isGetter() || f && c.isSetter())) {
                 return c;
               }
             }
@@ -15832,7 +16400,7 @@
           return g.Any;
         };
         a.prototype.isScriptInfo = function() {
-          return this.info instanceof u;
+          return this.info instanceof t;
         };
         a.prototype.isClassInfo = function() {
           return this.info instanceof v;
@@ -15841,22 +16409,22 @@
           return this.info instanceof c;
         };
         a.prototype.isInstanceInfo = function() {
-          return this.info instanceof t;
+          return this.info instanceof u;
         };
         a.prototype.isInstanceOrClassInfo = function() {
           return this.isInstanceInfo() || this.isClassInfo();
         };
         a.prototype.applyType = function(b) {
-          return new n(this, b);
+          return new r(this, b);
         };
         a.prototype._getInfoName = function() {
-          if (this.info instanceof u) {
+          if (this.info instanceof t) {
             return "SI";
           }
           if (this.info instanceof v) {
             return "CI:" + this.info.instanceInfo.name.name;
           }
-          if (this.info instanceof t) {
+          if (this.info instanceof u) {
             return "II:" + this.info.name.name;
           }
           if (this.info instanceof c) {
@@ -15902,7 +16470,7 @@
         return a;
       }(b);
       a.MethodType = e;
-      var q = function(b) {
+      var n = function(b) {
         function a(e, f, c) {
           b.call(this);
           this.namespaces = e;
@@ -15915,8 +16483,8 @@
         };
         return a;
       }(g);
-      a.MultinameType = q;
-      var n = function(b) {
+      a.MultinameType = n;
+      var r = function(b) {
         function a(e, f) {
           b.call(this, e.info, e.domain);
           this.type = e;
@@ -15925,7 +16493,7 @@
         __extends(a, b);
         return a;
       }(b);
-      a.ParameterizedType = n;
+      a.ParameterizedType = r;
       var x = function(b) {
         function a(e) {
           b.call(this);
@@ -15946,7 +16514,7 @@
         return a;
       }(g);
       a.ConstantType = x;
-      var L = function() {
+      var H = function() {
         function b() {
           this.originalId = this.id = b.id += 1;
           this.stack = [];
@@ -16008,8 +16576,8 @@
         b.id = 0;
         return b;
       }();
-      a.State = L;
-      var A = function() {
+      a.State = H;
+      var C = function() {
         function a(b, e, f) {
           this.methodInfo = b;
           this.domain = e;
@@ -16026,7 +16594,7 @@
           this._verifyBlocks(this._prepareEntryState());
         };
         a.prototype._prepareEntryState = function() {
-          var b = new L, a = this.methodInfo;
+          var b = new H, a = this.methodInfo;
           this.thisType = a.holder ? g.from(a.holder, this.domain) : g.Any;
           b.local.push(this.thisType);
           for (var e = a.parameters, f = 0;f < e.length;f++) {
@@ -16064,100 +16632,97 @@
           function c() {
             return U.ti || (U.ti = new m);
           }
-          function n(b) {
+          function r(b) {
             c().type = b;
-            $.push(b);
-            O.pushCount++;
-            b === g.Any && O.pushAnyCount++;
+            w.push(b);
+            J.pushCount++;
+            b === g.Any && J.pushAnyCount++;
           }
           function l(b) {
-            return $.pop();
+            return w.pop();
           }
-          function L() {
+          function H() {
             h("Bytecode not implemented in verifier: " + U);
           }
-          function u() {
-            var b = O.multinames[U.index];
+          function t() {
+            var b = J.multinames[U.index];
             if (b.isRuntime()) {
               var a;
               a = b.isRuntimeName() ? l() : x.from(b.name);
               var e;
               e = b.isRuntimeNamespace() ? [l()] : x.fromArray(b.namespaces);
-              return new q(e, a, b.flags);
+              return new n(e, a, b.flags);
             }
             return x.from(b);
           }
-          function t(b) {
-            return b.isMultinameType() && b.asMultinameType().name.isNumeric() || b.isConstantType() && r.isNumeric(b.value) ? !0 : !1;
+          function C(b) {
+            return b.isMultinameType() && b.asMultinameType().name.isNumeric() || b.isConstantType() && q.isNumeric(b.value) ? !0 : !1;
           }
-          function A(b, a) {
+          function u(b, a) {
             if (b.isTraitsType() || b.isParameterizedType()) {
               var f = b.getTrait(a, !1, !0);
               if (f) {
-                Q && Q.debugLn("getProperty(" + a + ") -> " + f);
+                P && P.debugLn("getProperty(" + a + ") -> " + f);
                 c().trait = f;
                 if (f.isSlot() || f.isConst()) {
-                  return g.fromName(f.typeName, O.domain).instanceType();
+                  return g.fromName(f.typeName, J.domain).instanceType();
                 }
                 if (f.isGetter()) {
-                  return g.fromName(f.methodInfo.returnType, O.domain).instanceType();
+                  return g.fromName(f.methodInfo.returnType, J.domain).instanceType();
                 }
                 if (f.isClass()) {
-                  return g.from(f.classInfo, O.domain);
+                  return g.from(f.classInfo, J.domain);
                 }
                 if (f.isMethod()) {
-                  return new e(f.methodInfo, O.domain);
+                  return new e(f.methodInfo, J.domain);
                 }
               } else {
-                if (t(a) && b.isParameterizedType()) {
-                  return f = b.asParameterizedType().parameter, Q && Q.debugLn("getProperty(" + a + ") -> " + f), f;
+                if (C(a) && b.isParameterizedType()) {
+                  return f = b.asParameterizedType().parameter, P && P.debugLn("getProperty(" + a + ") -> " + f), f;
                 }
-                b !== g.Array && Q && Q.warnLn("getProperty(" + a + ")");
+                b !== g.Array && P && P.warnLn("getProperty(" + a + ")");
               }
             }
             return g.Any;
           }
           function v(b, a, e) {
             if (b.isTraitsType() || b.isParameterizedType()) {
-              (e = b.getTrait(a, !0, !0)) ? (Q && Q.debugLn("setProperty(" + a + ") -> " + e), c().trait = e) : t(a) && b.isParameterizedType() || b !== g.Array && Q && Q.warnLn("setProperty(" + a + ")");
+              (e = b.getTrait(a, !0, !0)) ? (P && P.debugLn("setProperty(" + a + ") -> " + e), c().trait = e) : C(a) && b.isParameterizedType() || b !== g.Array && P && P.warnLn("setProperty(" + a + ")");
             }
           }
-          function H(b, a) {
+          function F(b, a) {
             if (b.isMultinameType()) {
               return g.Any;
             }
-            for (var e = O.savedScope, f = w.length - 1;f >= -e.length;f--) {
-              var n = 0 <= f ? w[f] : e[e.length + f];
+            for (var e = J.savedScope, f = X.length - 1;f >= -e.length;f--) {
+              var n = 0 <= f ? X[f] : e[e.length + f];
               if (n.isTraitsType()) {
                 if (n.getTrait(b, !1, !0)) {
-                  c().scopeDepth = w.length - f - 1;
+                  c().scopeDepth = X.length - f - 1;
                   if (n.isClassInfo() || n.isScriptInfo()) {
                     c().object = k.Runtime.LazyInitializer.create(n.info);
                   }
-                  Q && Q.debugLn("findProperty(" + b + ") -> " + n);
+                  P && P.debugLn("findProperty(" + b + ") -> " + n);
                   return n;
                 }
               } else {
-                return Q && Q.warnLn("findProperty(" + b + ")"), g.Any;
+                return P && P.warnLn("findProperty(" + b + ")"), g.Any;
               }
             }
-            if (e = O.domain.findDefiningScript(b.value, !1)) {
-              return c().object = k.Runtime.LazyInitializer.create(e.script), n = g.from(e.script, O.domain), Q && Q.debugLn("findProperty(" + b + ") -> " + n), n;
+            if (e = J.domain.findDefiningScript(b.value, !1)) {
+              return c().object = k.Runtime.LazyInitializer.create(e.script), n = g.from(e.script, J.domain), P && P.debugLn("findProperty(" + b + ") -> " + n), n;
             }
-            if (b.isConstantType() && "unsafeJSNative" === b.value.name) {
-              return g.Any;
-            }
-            Q && Q.warnLn("findProperty(" + b + ")");
+            P && P.warnLn("findProperty(" + b + ")");
             return g.Any;
           }
           function K(a) {
-            if (a instanceof b && (a = a.getTraitAt(U.index), Q && Q.debugLn("accessSlot() -> " + a), a)) {
+            if (a instanceof b && (a = a.getTraitAt(U.index), P && P.debugLn("accessSlot() -> " + a), a)) {
               c().trait = a;
               if (a.isSlot()) {
-                return g.fromName(a.typeName, O.domain).instanceType();
+                return g.fromName(a.typeName, J.domain).instanceType();
               }
               if (a.isClass()) {
-                return g.from(a.classInfo, O.domain);
+                return g.from(a.classInfo, J.domain);
               }
             }
             return g.Any;
@@ -16166,44 +16731,44 @@
             if (b.isTraitsType() || b.isParameterizedType()) {
               return b === g.Function || b === g.Class || b === g.Object ? g.Object : b.instanceType();
             }
-            Q && Q.warnLn("construct(" + b + ")");
+            P && P.warnLn("construct(" + b + ")");
             return g.Any;
           }
-          for (var O = this, Q = this.writer, S = this.methodInfo, V = S.analysis.bytecodes, aa = f.local, $ = f.stack, w = f.scope, U, ba = this.savedScope[0], R, N, Z, fa = a.position, X = a.end.position;fa <= X;fa++) {
-            if (U = V[fa], R = U.op, 240 !== R && 241 !== R) {
-              switch(Q && 1 < d.AVM2.Verifier.traceLevel.value && Q.writeLn(("stateBefore: " + f.toString() + " $$[" + this.savedScope.join(", ") + "]").padRight(" ", 100) + " : " + fa + ", " + U.toString(S.abc)), R) {
+          for (var J = this, P = this.writer, S = this.methodInfo, W = S.analysis.bytecodes, ba = f.local, w = f.stack, X = f.scope, U, $ = this.savedScope[0], Y, M, Z, ca = a.position, ga = a.end.position;ca <= ga;ca++) {
+            if (U = W[ca], Y = U.op, 240 !== Y && 241 !== Y) {
+              switch(P && 1 < d.AVM2.Verifier.traceLevel.value && P.writeLn(("stateBefore: " + f.toString() + " $$[" + this.savedScope.join(", ") + "]").padRight(" ", 100) + " : " + ca + ", " + U.toString(S.abc)), Y) {
                 case 1:
                   break;
                 case 3:
                   l();
                   break;
                 case 4:
-                  Z = u();
-                  N = l();
+                  Z = t();
+                  M = l();
                   c().baseClass = k.Runtime.LazyInitializer.create(this.thisType.asTraitsType().super().classType().info);
-                  n(A(N.super(), Z));
+                  r(u(M.super(), Z));
                   break;
                 case 5:
-                  R = l();
-                  Z = u();
-                  N = l();
+                  Y = l();
+                  Z = t();
+                  M = l();
                   c().baseClass = k.Runtime.LazyInitializer.create(this.thisType.asTraitsType().super().classType().info);
-                  v(N.super(), Z, R);
+                  v(M.super(), Z, Y);
                   break;
                 case 6:
-                  L();
+                  H();
                   break;
                 case 7:
-                  L();
+                  H();
                   break;
                 case 8:
                   f.local[U.index] = g.Undefined;
                   break;
                 case 10:
-                  L();
+                  H();
                   break;
                 case 11:
-                  L();
+                  H();
                   break;
                 case 12:
                 ;
@@ -16242,92 +16807,92 @@
                   l(g.Int);
                   break;
                 case 29:
-                  w.pop();
+                  X.pop();
                   break;
                 case 30:
                 ;
                 case 35:
                   l(g.Int);
                   l();
-                  n(g.Any);
+                  r(g.Any);
                   break;
                 case 31:
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 50:
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 32:
-                  n(g.Null);
+                  r(g.Null);
                   break;
                 case 33:
-                  n(g.Undefined);
+                  r(g.Undefined);
                   break;
                 case 34:
-                  L();
+                  H();
                   break;
                 case 36:
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 37:
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 44:
-                  n(g.String);
+                  r(g.String);
                   break;
                 case 45:
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 46:
-                  n(g.Uint);
+                  r(g.Uint);
                   break;
                 case 47:
-                  n(g.Number);
+                  r(g.Number);
                   break;
                 case 38:
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 39:
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 40:
-                  n(g.Number);
+                  r(g.Number);
                   break;
                 case 41:
                   l();
                   break;
                 case 42:
-                  R = l();
-                  n(R);
-                  n(R);
+                  Y = l();
+                  r(Y);
+                  r(Y);
                   break;
                 case 43:
-                  N = l();
+                  M = l();
                   Z = l();
-                  n(N);
-                  n(Z);
+                  r(M);
+                  r(Z);
                   break;
                 case 28:
                   l();
-                  w.push(g.Any);
+                  X.push(g.Any);
                   break;
                 case 48:
-                  w.push(l());
+                  X.push(l());
                   break;
                 case 49:
-                  L();
+                  H();
                   break;
                 case 53:
                 ;
                 case 54:
                 ;
                 case 55:
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 56:
                 ;
                 case 57:
-                  n(g.Number);
+                  r(g.Number);
                   break;
                 case 58:
                 ;
@@ -16342,18 +16907,18 @@
                   l(g.Number);
                   break;
                 case 64:
-                  n(g.Function);
+                  r(g.Function);
                   break;
                 case 65:
-                  p($, U.argCount);
-                  N = l();
+                  p(w, U.argCount);
+                  M = l();
                   l();
-                  n(g.Any);
+                  r(g.Any);
                   break;
                 case 67:
                   throw new s("callmethod");;
                 case 68:
-                  L();
+                  H();
                   break;
                 case 69:
                 ;
@@ -16364,45 +16929,45 @@
                 case 70:
                 ;
                 case 76:
-                  p($, U.argCount);
-                  Z = u();
-                  N = l();
-                  if (69 === R || 78 === R) {
-                    N = this.thisType.super(), c().baseClass = k.Runtime.LazyInitializer.create(this.thisType.asTraitsType().super().classType().info);
+                  p(w, U.argCount);
+                  Z = t();
+                  M = l();
+                  if (69 === Y || 78 === Y) {
+                    M = this.thisType.super(), c().baseClass = k.Runtime.LazyInitializer.create(this.thisType.asTraitsType().super().classType().info);
                   }
-                  N = A(N, Z);
-                  if (79 === R || 78 === R) {
+                  M = u(M, Z);
+                  if (79 === Y || 78 === Y) {
                     break;
                   }
-                  N = N.isMethodType() ? N.asMethodType().returnType().instanceType() : N.isTraitsType() && N.isClassInfo() ? N.instanceType() : g.Any;
-                  n(N);
+                  M = M.isMethodType() ? M.asMethodType().returnType().instanceType() : M.isTraitsType() && M.isClassInfo() ? M.instanceType() : g.Any;
+                  r(M);
                   break;
                 case 71:
                   this.returnType.merge(g.Undefined);
                   break;
                 case 72:
-                  N = l();
-                  S.returnType && (Z = g.fromName(S.returnType, this.domain).instanceType(), Z.isSubtypeOf(N) && (c().noCoercionNeeded = !0));
+                  M = l();
+                  S.returnType && (Z = g.fromName(S.returnType, this.domain).instanceType(), Z.isSubtypeOf(M) && (c().noCoercionNeeded = !0));
                   break;
                 case 73:
-                  p($, U.argCount);
-                  $.pop();
+                  p(w, U.argCount);
+                  w.pop();
                   this.thisType.isInstanceInfo() && this.thisType.super() === g.Object ? c().noCallSuperNeeded = !0 : c().baseClass = k.Runtime.LazyInitializer.create(this.thisType.asTraitsType().super().classType().info);
                   break;
                 case 66:
-                  p($, U.argCount);
-                  n(T(l()));
+                  p(w, U.argCount);
+                  r(T(l()));
                   break;
                 case 74:
-                  p($, U.argCount);
-                  Z = u();
-                  n(T(A($.pop(), Z)));
+                  p(w, U.argCount);
+                  Z = t();
+                  r(T(u(w.pop(), Z)));
                   break;
                 case 75:
-                  L();
+                  H();
                   break;
                 case 77:
-                  L();
+                  H();
                   break;
                 case 80:
                 ;
@@ -16411,178 +16976,178 @@
                 case 82:
                   break;
                 case 83:
-                  R = l();
-                  N = l();
-                  N === g.Any ? n(g.Any) : n(N.applyType(R));
+                  Y = l();
+                  M = l();
+                  M === g.Any ? r(g.Any) : r(M.applyType(Y));
                   break;
                 case 84:
-                  L();
+                  H();
                   break;
                 case 85:
-                  p($, 2 * U.argCount);
-                  n(g.Object);
+                  p(w, 2 * U.argCount);
+                  r(g.Object);
                   break;
                 case 86:
-                  p($, U.argCount);
-                  n(g.Array);
+                  p(w, U.argCount);
+                  r(g.Array);
                   break;
                 case 87:
-                  n(g.from(this.methodInfo, this.domain));
+                  r(g.from(this.methodInfo, this.domain));
                   break;
                 case 88:
-                  n(g.Any);
+                  r(g.Any);
                   break;
                 case 89:
-                  u();
+                  t();
                   l();
-                  n(g.XMLList);
+                  r(g.XMLList);
                   break;
                 case 90:
-                  n(g.Any);
+                  r(g.Any);
                   break;
                 case 93:
-                  n(H(u(), !0));
+                  r(F(t(), !0));
                   break;
                 case 94:
-                  n(H(u(), !1));
+                  r(F(t(), !1));
                   break;
                 case 95:
-                  L();
+                  H();
                   break;
                 case 96:
-                  Z = u();
-                  n(A(H(Z, !0), Z));
+                  Z = t();
+                  r(u(F(Z, !0), Z));
                   break;
                 case 104:
                 ;
                 case 97:
-                  R = l();
-                  Z = u();
-                  N = l();
-                  v(N, Z, R);
+                  Y = l();
+                  Z = t();
+                  M = l();
+                  v(M, Z, Y);
                   break;
                 case 98:
-                  n(aa[U.index]);
+                  r(ba[U.index]);
                   break;
                 case 99:
-                  aa[U.index] = l();
+                  ba[U.index] = l();
                   break;
                 case 100:
-                  n(ba);
-                  c().object = k.Runtime.LazyInitializer.create(ba.asTraitsType().info);
+                  r($);
+                  c().object = k.Runtime.LazyInitializer.create($.asTraitsType().info);
                   break;
                 case 101:
-                  n(w[U.index]);
+                  r(X[U.index]);
                   break;
                 case 102:
-                  Z = u();
-                  N = l();
-                  n(A(N, Z));
+                  Z = t();
+                  M = l();
+                  r(u(M, Z));
                   break;
                 case 103:
-                  L();
+                  H();
                   break;
                 case 105:
-                  L();
+                  H();
                   break;
                 case 106:
-                  u();
+                  t();
                   l();
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 107:
-                  L();
+                  H();
                   break;
                 case 108:
-                  n(K(l()));
+                  r(K(l()));
                   break;
                 case 109:
-                  R = l();
-                  N = l();
-                  K(N);
+                  Y = l();
+                  M = l();
+                  K(M);
                   break;
                 case 110:
-                  L();
+                  H();
                   break;
                 case 111:
-                  L();
+                  H();
                   break;
                 case 112:
                   l();
-                  n(g.String);
+                  r(g.String);
                   break;
                 case 113:
                   l();
-                  n(g.String);
+                  r(g.String);
                   break;
                 case 114:
                   l();
-                  n(g.String);
+                  r(g.String);
                   break;
                 case 131:
                 ;
                 case 115:
                   l();
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 136:
                 ;
                 case 116:
                   l();
-                  n(g.Uint);
+                  r(g.Uint);
                   break;
                 case 132:
                 ;
                 case 117:
                   l();
-                  n(g.Number);
+                  r(g.Number);
                   break;
                 case 129:
                 ;
                 case 118:
                   l();
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 119:
-                  L();
+                  H();
                   break;
                 case 120:
                   break;
                 case 121:
                   l();
-                  n(g.Number);
+                  r(g.Number);
                   break;
                 case 122:
-                  L();
+                  H();
                   break;
                 case 123:
-                  L();
+                  H();
                   break;
                 case 128:
-                  N = l();
+                  M = l();
                   Z = g.fromName(this.multinames[U.index], this.domain).instanceType();
-                  Z.isSubtypeOf(N) && (c().noCoercionNeeded = !0);
-                  n(Z);
+                  Z.isSubtypeOf(M) && (c().noCoercionNeeded = !0);
+                  r(Z);
                   break;
                 case 130:
                   break;
                 case 133:
                   l();
-                  n(g.String);
+                  r(g.String);
                   break;
                 case 134:
-                  N = l();
+                  M = l();
                   Z = g.fromName(this.multinames[U.index], this.domain).instanceType();
-                  Z.isSubtypeOf(N) && (c().noCoercionNeeded = !0);
-                  n(Z);
+                  Z.isSubtypeOf(M) && (c().noCoercionNeeded = !0);
+                  r(Z);
                   break;
                 case 135:
-                  N = l();
+                  M = l();
                   l();
-                  N === g.Class ? n(N) : N.isTraitsType() ? n(N.instanceType()) : n(g.Any);
+                  M === g.Class ? r(M) : M.isTraitsType() ? r(M.instanceType()) : r(g.Any);
                   break;
                 case 137:
-                  L();
+                  H();
                   break;
                 case 144:
                 ;
@@ -16590,25 +17155,25 @@
                 ;
                 case 147:
                   l();
-                  n(g.Number);
+                  r(g.Number);
                   break;
                 case 146:
                 ;
                 case 148:
-                  aa[U.index] = g.Number;
+                  ba[U.index] = g.Number;
                   break;
                 case 149:
                   l();
-                  n(g.String);
+                  r(g.String);
                   break;
                 case 150:
                   l();
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 160:
                   Z = l();
-                  N = l();
-                  N.isNumeric() && Z.isNumeric() ? n(g.Number) : N === g.String || Z === g.String ? n(g.String) : n(g.Any);
+                  M = l();
+                  M.isNumeric() && Z.isNumeric() ? r(g.Number) : M === g.String || Z === g.String ? r(g.String) : r(g.Any);
                   break;
                 case 161:
                 ;
@@ -16619,7 +17184,7 @@
                 case 164:
                   l();
                   l();
-                  n(g.Number);
+                  r(g.Number);
                   break;
                 case 168:
                 ;
@@ -16634,11 +17199,11 @@
                 case 167:
                   l();
                   l();
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 151:
                   l();
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 171:
                 ;
@@ -16657,21 +17222,21 @@
                 case 180:
                   l();
                   l();
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 178:
                   l();
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 179:
                   l();
                   l();
-                  n(g.Boolean);
+                  r(g.Boolean);
                   break;
                 case 194:
                 ;
                 case 195:
-                  aa[U.index] = g.Int;
+                  ba[U.index] = g.Int;
                   break;
                 case 193:
                 ;
@@ -16679,7 +17244,7 @@
                 ;
                 case 196:
                   l();
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 197:
                 ;
@@ -16688,7 +17253,7 @@
                 case 199:
                   l();
                   l();
-                  n(g.Int);
+                  r(g.Int);
                   break;
                 case 208:
                 ;
@@ -16697,7 +17262,7 @@
                 case 210:
                 ;
                 case 211:
-                  n(aa[R - 208]);
+                  r(ba[Y - 208]);
                   break;
                 case 212:
                 ;
@@ -16706,7 +17271,7 @@
                 case 214:
                 ;
                 case 215:
-                  aa[R - 212] = l();
+                  ba[Y - 212] = l();
                   break;
                 case 239:
                   break;
@@ -16721,7 +17286,7 @@
           }
         };
         return a;
-      }(), H = function() {
+      }(), F = function() {
         function b() {
         }
         b.prototype._prepareScopeObjects = function(b, a) {
@@ -16732,11 +17297,11 @@
         };
         b.prototype.verifyMethod = function(b, a) {
           var e = this._prepareScopeObjects(b, a);
-          (new A(b, b.abc.applicationDomain, e)).verify();
+          (new C(b, b.abc.applicationDomain, e)).verify();
         };
         return b;
       }();
-      a.Verifier = H;
+      a.Verifier = F;
     })(k.Verifier || (k.Verifier = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
@@ -16749,32 +17314,32 @@
             a(b[e]);
           }
         }
-        function u(a) {
-          var n, p = d.StringUtilities;
+        function t(a) {
+          var r, p = d.StringUtilities;
           if (a instanceof e) {
-            return a.value instanceof t ? a.value.name : a.value;
+            return a.value instanceof u ? a.value.name : a.value;
           }
           if (a instanceof f) {
             return a.name;
           }
           if (a instanceof g) {
-            return n = p.concat3("|", a.id, "|"), n;
+            return r = p.concat3("|", a.id, "|"), r;
           }
           if (a instanceof h) {
-            return n = p.concat3("{", a.id, "}"), n;
+            return r = p.concat3("{", a.id, "}"), r;
           }
           if (a instanceof b) {
-            return 3 === a.type ? (n = p.concat5("[", a.id, "->", a.argument.id, "]"), n) : (n = p.concat3("(", a.id, ")"), n);
+            return 3 === a.type ? (r = p.concat5("[", a.id, "->", a.argument.id, "]"), r) : (r = p.concat3("(", a.id, ")"), r);
           }
           if (a instanceof m) {
-            return n = p.concat3("(", a.id, ")"), n;
+            return r = p.concat3("(", a.id, ")"), r;
           }
           if (a instanceof c) {
             return a.id;
           }
           l(a + " " + typeof a);
         }
-        var t = d.AVM2.ABC.Multiname, l = d.Debug.unexpected;
+        var u = d.AVM2.ABC.Multiname, l = d.Debug.unexpected;
         (function(b) {
           b[b.NumericProperty = 1] = "NumericProperty";
           b[b.RESOLVED = 2] = "RESOLVED";
@@ -16799,13 +17364,13 @@
           };
           b.prototype.toString = function(b) {
             if (b) {
-              return u(this);
+              return t(this);
             }
             var a = [];
             this.visitInputs(function(b) {
-              a.push(u(b));
+              a.push(t(b));
             });
-            b = u(this) + " = " + this.nodeName.toUpperCase();
+            b = t(this) + " = " + this.nodeName.toUpperCase();
             a.length && (b += " " + a.join(", "));
             return b;
           };
@@ -16968,11 +17533,11 @@
         a.StoreDependent = p;
         p.prototype.nodeName = "StoreDependent";
         s = function(b) {
-          function a(e, f, c, g, n, h) {
+          function a(e, f, c, g, r, h) {
             b.call(this, e, f);
             this.callee = c;
             this.object = g;
-            this.args = n;
+            this.args = r;
             this.flags = h;
           }
           __extends(a, b);
@@ -17025,11 +17590,11 @@
         a.GetProperty = s;
         s.prototype.nodeName = "GetProperty";
         s = function(b) {
-          function a(e, f, c, g, n) {
+          function a(e, f, c, g, r) {
             b.call(this, e, f);
             this.object = c;
             this.name = g;
-            this.value = n;
+            this.value = r;
           }
           __extends(a, b);
           a.prototype.visitInputs = function(b) {
@@ -17063,11 +17628,11 @@
         a.DeleteProperty = s;
         s.prototype.nodeName = "DeleteProperty";
         p = function(b) {
-          function a(e, f, c, g, n, h) {
+          function a(e, f, c, g, r, h) {
             b.call(this, e, f);
             this.object = c;
             this.name = g;
-            this.args = n;
+            this.args = r;
             this.flags = h;
           }
           __extends(a, b);
@@ -17437,7 +18002,7 @@
         a.KeyValuePair = p;
         p.prototype.mustFloat = !0;
         p.prototype.nodeName = "KeyValuePair";
-        a.nameOf = u;
+        a.nameOf = t;
       })(a.IR || (a.IR = {}));
     })(k.Compiler || (k.Compiler = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -17449,14 +18014,14 @@
         function v(b) {
           return b.id;
         }
-        function u(b) {
+        function t(b) {
           return b instanceof a.Phi;
         }
-        function t(b) {
+        function u(b) {
           return b instanceof a.Constant && b.value instanceof f;
         }
         function l(b) {
-          return u(b) || b instanceof a.Store || s(b, 3);
+          return t(b) || b instanceof a.Store || s(b, 3);
         }
         function c(b) {
           return b instanceof a.Constant;
@@ -17473,17 +18038,17 @@
         function m(b) {
           return b instanceof a.Projection ? b.project() : b;
         }
-        var g = d.Debug.unexpected, f = d.AVM2.ABC.Multiname, b = d.ArrayUtilities.top, e = d.ArrayUtilities.pushUnique, q = d.ArrayUtilities.unique;
+        var g = d.Debug.unexpected, f = d.AVM2.ABC.Multiname, b = d.ArrayUtilities.top, e = d.ArrayUtilities.pushUnique, n = d.ArrayUtilities.unique;
         a.isNotPhi = function(b) {
-          return!u(b);
+          return!t(b);
         };
-        a.isPhi = u;
+        a.isPhi = t;
         a.isScope = function(b) {
-          return u(b) || b instanceof a.ASScope || s(b, 4);
+          return t(b) || b instanceof a.ASScope || s(b, 4);
         };
-        a.isMultinameConstant = t;
+        a.isMultinameConstant = u;
         a.isMultiname = function(b) {
-          return t(b) || b instanceof a.ASMultiname;
+          return u(b) || b instanceof a.ASMultiname;
         };
         a.isStore = l;
         a.isConstant = c;
@@ -17503,7 +18068,7 @@
         a.Undefined = new a.Constant(void 0);
         a.True = new a.Constant(!0);
         a.False = new a.Constant(!1);
-        var n = function() {
+        var r = function() {
           function b(a, e, f) {
             this.id = a;
             this.nodes = [e, f];
@@ -17548,13 +18113,13 @@
           };
           return b;
         }();
-        a.Block = n;
+        a.Block = r;
         var x = function() {
           function e(b) {
             this.exit = this.exit = b;
           }
           e.prototype.buildCFG = function() {
-            return A.fromDFG(this);
+            return C.fromDFG(this);
           };
           e.preOrderDepthFirstSearch = function(b, a, e) {
             var f = [];
@@ -17602,9 +18167,9 @@
             }
             function c(b) {
               b = f(b);
-              n[b.id] || (n[b.id] = !0, b.block && q.push(b.block), g.push(b), b.visitInputsNoConstants(c));
+              n[b.id] || (n[b.id] = !0, b.block && h.push(b.block), g.push(b), b.visitInputsNoConstants(c));
             }
-            var g = [], n = {}, q = [];
+            var g = [], n = {}, h = [];
             c(this.exit);
             b.writeLn("");
             b.enter("digraph DFG {");
@@ -17612,7 +18177,7 @@
             b.writeLn("edge [color = white];");
             b.writeLn("node [shape = box, fontname = Consolas, fontsize = 11, color = white, fontcolor = white];");
             b.writeLn("rankdir = BT;");
-            q.forEach(function(a) {
+            h.forEach(function(a) {
               b.enter("subgraph cluster" + a.nodes[0].id + " { bgcolor = gray20;");
               a.visitNodes(function(a) {
                 a = f(a);
@@ -17635,7 +18200,7 @@
           return e;
         }();
         a.DFG = x;
-        var L = function() {
+        var H = function() {
           function b() {
             this.entries = [];
           }
@@ -17677,8 +18242,8 @@
           };
           return b;
         }();
-        a.Uses = L;
-        var A = function() {
+        a.Uses = H;
+        var C = function() {
           function b() {
             this.nextBlockID = 0;
             this.blocks = [];
@@ -17693,12 +18258,12 @@
                 b = e.block = c.buildBlock(e, b);
                 e instanceof a.Start && (c.root = b);
                 for (var n = 0;n < e.predecessors.length;n++) {
-                  var q = e.predecessors[n], h, m = !1;
-                  q instanceof a.Projection ? (h = q.project(), m = 1 === q.type) : h = q;
-                  h instanceof a.Region && (h = new a.Jump(q), h = new a.Projection(h, 1), e.predecessors[n] = h, h = h.project(), m = !0);
-                  f(h);
-                  var d = h.control.block;
-                  h instanceof a.Switch ? d.pushSuccessorAt(b, q.selector.value) : m && 0 < d.successors.length ? (d.pushSuccessor(b, !0), d.hasFlippedSuccessors = !0) : d.pushSuccessor(b, !0);
+                  var h = e.predecessors[n], r, m = !1;
+                  h instanceof a.Projection ? (r = h.project(), m = 1 === h.type) : r = h;
+                  r instanceof a.Region && (r = new a.Jump(h), r = new a.Projection(r, 1), e.predecessors[n] = r, r = r.project(), m = !0);
+                  f(r);
+                  var d = r.control.block;
+                  r instanceof a.Switch ? d.pushSuccessorAt(b, h.selector.value) : m && 0 < d.successors.length ? (d.pushSuccessor(b, !0), d.hasFlippedSuccessors = !0) : d.pushSuccessor(b, !0);
                 }
               }
             }
@@ -17712,7 +18277,7 @@
             return c;
           };
           b.prototype.buildRootAndExit = function() {
-            0 < this.blocks[0].predecessors.length ? (this.root = new n(this.nextBlockID++), this.blocks.push(this.root), this.root.pushSuccessor(this.blocks[0], !0)) : this.root = this.blocks[0];
+            0 < this.blocks[0].predecessors.length ? (this.root = new r(this.nextBlockID++), this.blocks.push(this.root), this.root.pushSuccessor(this.blocks[0], !0)) : this.root = this.blocks[0];
             for (var b = [], a = 0;a < this.blocks.length;a++) {
               var e = this.blocks[a];
               0 === e.successors.length && b.push(e);
@@ -17723,7 +18288,7 @@
               if (1 === b.length && b[0] !== this.root) {
                 this.exit = b[0];
               } else {
-                for (this.exit = new n(this.nextBlockID++), this.blocks.push(this.exit), a = 0;a < b.length;a++) {
+                for (this.exit = new r(this.nextBlockID++), this.blocks.push(this.exit), a = 0;a < b.length;a++) {
                   b[a].pushSuccessor(this.exit, !0);
                 }
               }
@@ -17735,7 +18300,7 @@
               if (a) {
                 return a;
               }
-              c[b] = a = new n(f.nextBlockID++);
+              c[b] = a = new r(f.nextBlockID++);
               a.name = b;
               g.push(a);
               return a;
@@ -17757,7 +18322,7 @@
             this.root = c[a];
           };
           b.prototype.buildBlock = function(b, a) {
-            var e = new n(this.nextBlockID++, b, a);
+            var e = new r(this.nextBlockID++, b, a);
             this.blocks.push(e);
             return e;
           };
@@ -17781,9 +18346,9 @@
             function e(c) {
               f.set(c.id);
               b && b(c);
-              for (var g = c.successors, n = 0, q = g.length;n < q;n++) {
-                var h = g[n];
-                f.get(h.id) || e(h);
+              for (var g = c.successors, n = 0, h = g.length;n < h;n++) {
+                var r = g[n];
+                f.get(r.id) || e(r);
               }
               a && a(c);
             }
@@ -17805,17 +18370,17 @@
             var f = this.createBlockSet();
             this.depthFirstSearch(function(b) {
               for (var e = b.successors, c = 0, g = e.length;c < g;c++) {
-                var n = e[c].id, q = b.id, h = n;
+                var n = e[c].id, h = b.id, r = n;
                 if (!(0 > a[n])) {
                   n = a[n];
                   for (f.clearAll();0 <= n;) {
                     f.set(n), n = a[n];
                   }
-                  for (;0 <= q && !f.get(q);) {
-                    q = a[q];
+                  for (;0 <= h && !f.get(h);) {
+                    h = a[h];
                   }
                 }
-                a[h] = q;
+                a[r] = h;
               }
             });
             for (var e = 0, c = this.blocks.length;e < c;e++) {
@@ -17834,7 +18399,7 @@
               }
               e.set(c.id);
               a.set(c.id);
-              for (var g = 0, n = 0, q = c.successors.length;n < q;n++) {
+              for (var g = 0, n = 0, h = c.successors.length;n < h;n++) {
                 g |= b(c.successors[n]);
               }
               c.isLoopHeader && (g &= ~c.loops);
@@ -17847,7 +18412,7 @@
           };
           b.prototype.computeUses = function() {
             k.enterTimeline("computeUses");
-            var b = this.dfg, a = new L;
+            var b = this.dfg, a = new H;
             b.forEachInPreOrderDepthFirstSearch(function(b) {
               b.visitInputs(function(e) {
                 a.addUse(e, b);
@@ -17864,7 +18429,7 @@
           };
           b.prototype.optimizePhis = function() {
             function b(a, e) {
-              e = q(e);
+              e = n(e);
               if (1 === e.length) {
                 return e[0];
               }
@@ -17880,7 +18445,7 @@
             }
             var a = [], e = this.computeUses().entries;
             e.forEach(function(b) {
-              u(b.def) && a.push(b.def);
+              t(b.def) && a.push(b.def);
             });
             for (var f = 0, c = 0, g = !0;g;) {
               c++, g = !1, a.forEach(function(a) {
@@ -17890,8 +18455,8 @@
                   if (0 === n.uses.length) {
                     a = !1;
                   } else {
-                    for (var q = 0, h = n.uses, m = 0, d = h.length;m < d;m++) {
-                      q += h[m].replaceInput(a, c);
+                    for (var h = 0, r = n.uses, m = 0, d = r.length;m < d;m++) {
+                      h += r[m].replaceInput(a, c);
                     }
                     n.uses = [];
                     a = !0;
@@ -17911,13 +18476,13 @@
               }
             }
             for (var b = e.length, n;n = e.pop();) {
-              var f = n.from.successors.indexOf(n.to), c = n.to.predecessors.indexOf(n.from), g = n.to, q = g.region, h = new a.Region(q.predecessors[c]), m = new a.Jump(h), h = this.buildBlock(h, m);
-              q.predecessors[c] = new a.Projection(m, 1);
+              var f = n.from.successors.indexOf(n.to), c = n.to.predecessors.indexOf(n.from), g = n.to, h = g.region, r = new a.Region(h.predecessors[c]), m = new a.Jump(r), r = this.buildBlock(r, m);
+              h.predecessors[c] = new a.Projection(m, 1);
               n = n.from;
-              n.successors[f] = h;
-              h.pushPredecessor(n);
-              h.pushSuccessor(g);
-              g.predecessors[c] = h;
+              n.successors[f] = r;
+              r.pushPredecessor(n);
+              r.pushSuccessor(g);
+              g.predecessors[c] = r;
             }
             return b;
           };
@@ -17933,10 +18498,10 @@
             for (var f = [], c = 0;c < e.length;c++) {
               var g = e[c], n = g.phis, g = g.predecessors;
               if (n) {
-                for (var q = 0;q < n.length;q++) {
-                  for (var h = n[q], m = h.args, d = 0;d < g.length;d++) {
+                for (var h = 0;h < n.length;h++) {
+                  for (var r = n[h], m = r.args, d = 0;d < g.length;d++) {
                     var l = g[d], p = m[d];
-                    p.abstract || s(p, 3) || (l = f[l.id] || (f[l.id] = []), p = p.variable || p, h.variable !== p && l.push(new a.Move(h.variable, p)));
+                    p.abstract || s(p, 3) || (l = f[l.id] || (f[l.id] = []), p = p.variable || p, r.variable !== p && l.push(new a.Move(r.variable, p)));
                   }
                 }
               }
@@ -17945,8 +18510,8 @@
             f.forEach(function(b, e) {
               for (var f = x[e], c = 0;b.length;) {
                 for (var g = 0;g < b.length;g++) {
-                  for (var n = b[g], q = 0;q < b.length;q++) {
-                    if (g !== q && b[q].from === n.to) {
+                  for (var n = b[g], h = 0;h < b.length;h++) {
+                    if (g !== h && b[h].from === n.to) {
                       n = null;
                       break;
                     }
@@ -17954,8 +18519,8 @@
                   n && (b.splice(g--, 1), f.append(n));
                 }
                 if (b.length) {
-                  for (n = b[0], q = new a.Variable("t" + c++), x[e].append(new a.Move(q, n.to)), g = 1;g < b.length;g++) {
-                    b[g].from === n.to && (b[g].from = q);
+                  for (n = b[0], h = new a.Variable("t" + c++), x[e].append(new a.Move(h, n.to)), g = 1;g < b.length;g++) {
+                    b[g].from === n.to && (b[g].from = h);
                   }
                 }
               }
@@ -17966,7 +18531,7 @@
               return e.mustNotFloat || e.shouldNotFloat ? !1 : e.mustFloat || e.shouldFloat || e instanceof a.Parameter || e instanceof a.This || e instanceof a.Arguments ? !0 : e instanceof a.Binary || e instanceof a.Unary || e instanceof a.Parameter;
             }
             function e(a) {
-              q[a.id] = !0;
+              h[a.id] = !0;
               b(a) || a.control.block.append(a);
             }
             function f(b, a) {
@@ -17974,21 +18539,21 @@
               e(b);
             }
             function g(b) {
-              var h = [];
+              var r = [];
               b.visitInputs(function(b) {
-                c(b) || p(b) && h.push(m(b));
+                c(b) || p(b) && r.push(m(b));
               });
-              for (var d = 0;d < h.length;d++) {
-                var l = h[d];
-                u(l) || q[l.id] || g(l);
+              for (var d = 0;d < r.length;d++) {
+                var l = r[d];
+                t(l) || h[l.id] || g(l);
               }
               if (b.control) {
-                b instanceof a.End || b instanceof a.Phi || b instanceof a.Start || q[b.id] || e(b);
+                b instanceof a.End || b instanceof a.Phi || b instanceof a.Start || h[b.id] || e(b);
               } else {
-                if (h.length) {
-                  l = h[0].control;
-                  for (d = 1;d < h.length;d++) {
-                    var s = h[d].control;
+                if (r.length) {
+                  l = r[0].control;
+                  for (d = 1;d < r.length;d++) {
+                    var s = r[d].control;
                     l.block.dominatorDepth < s.block.dominatorDepth && (l = s);
                   }
                   f(b, l);
@@ -17997,21 +18562,21 @@
                 }
               }
             }
-            var n = this, q = [], h = [];
+            var n = this, h = [], r = [];
             this.dfg.forEachInPreOrderDepthFirstSearch(function(e) {
-              e instanceof a.Region || e instanceof a.Jump || (e.control && h.push(e), u(e) && e.args.forEach(function(a) {
+              e instanceof a.Region || e instanceof a.Jump || (e.control && r.push(e), t(e) && e.args.forEach(function(a) {
                 b(a) && (a.mustNotFloat = !0);
               }));
             });
-            for (var d = 0;d < h.length;d++) {
-              var l = h[d];
+            for (var d = 0;d < r.length;d++) {
+              var l = r[d];
               if (l instanceof a.Phi) {
                 var s = l.control.block;
                 (s.phis || (s.phis = [])).push(l);
               }
               l.control && g(l);
             }
-            h.forEach(function(b) {
+            r.forEach(function(b) {
               m(b);
             });
           };
@@ -18045,7 +18610,7 @@
           };
           return b;
         }();
-        a.CFG = A;
+        a.CFG = C;
         x = function() {
           function b() {
           }
@@ -18084,91 +18649,91 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(b) {
-        return b instanceof w && d.isString(b.value);
+      function q(b) {
+        return b instanceof X && d.isString(b.value);
       }
       function v(b) {
-        return b instanceof w && d.isNumeric(b.value) ? !0 : b.ty && b.ty.isNumeric();
+        return b instanceof X && d.isNumeric(b.value) ? !0 : b.ty && b.ty.isNumeric();
       }
-      function u(b, a) {
-        return v(b) && v(a) || t(b) && t(a) ? !0 : !1;
+      function t(b, a) {
+        return v(b) && v(a) || u(b) && u(a) ? !0 : !1;
       }
-      function t(b) {
-        return r(b) ? !0 : b.ty && b.ty.isString();
+      function u(b) {
+        return q(b) ? !0 : b.ty && b.ty.isString();
       }
       function l(b) {
-        return new w(b);
+        return new X(b);
       }
       function c(b) {
         switch(b) {
           case 161:
-            return N.SUB;
+            return M.SUB;
           case 162:
-            return N.MUL;
+            return M.MUL;
           case 163:
-            return N.DIV;
+            return M.DIV;
           case 164:
-            return N.MOD;
+            return M.MOD;
           case 165:
-            return N.LSH;
+            return M.LSH;
           case 166:
-            return N.RSH;
+            return M.RSH;
           case 167:
-            return N.URSH;
+            return M.URSH;
           case 168:
-            return N.AND;
+            return M.AND;
           case 169:
-            return N.OR;
+            return M.OR;
           case 170:
-            return N.XOR;
+            return M.XOR;
           case 20:
-            return N.NE;
+            return M.NE;
           case 26:
-            return N.SNE;
+            return M.SNE;
           case 19:
           ;
           case 171:
-            return N.EQ;
+            return M.EQ;
           case 25:
           ;
           case 172:
-            return N.SEQ;
+            return M.SEQ;
           case 21:
           ;
           case 173:
-            return N.LT;
+            return M.LT;
           case 22:
           ;
           case 174:
-            return N.LE;
+            return M.LE;
           case 23:
           ;
           case 175:
-            return N.GT;
+            return M.GT;
           case 24:
           ;
           case 176:
-            return N.GE;
+            return M.GE;
           case 144:
-            return N.NEG;
+            return M.NEG;
           case 196:
-            return N.NEG;
+            return M.NEG;
           case 197:
-            return N.ADD;
+            return M.ADD;
           case 198:
-            return N.SUB;
+            return M.SUB;
           case 199:
-            return N.MUL;
+            return M.MUL;
           case 17:
-            return N.TRUE;
+            return M.TRUE;
           case 18:
-            return N.FALSE;
+            return M.FALSE;
           case 150:
-            return N.FALSE;
+            return M.FALSE;
           case 151:
-            return N.BITWISE_NOT;
+            return M.BITWISE_NOT;
           default:
-            D("Invalid operator op: " + b);
+            B("Invalid operator op: " + b);
         }
       }
       function h(b, e, f) {
@@ -18184,18 +18749,18 @@
         return b;
       }
       function s(b, a) {
-        var e = new $(b, a);
+        var e = new w(b, a);
         da && (e = da.fold(e));
         return e;
       }
       function m(b, a, e) {
-        var f = new aa(b, a, e);
-        if (b === N.EQ || b === N.NE) {
+        var f = new ba(b, a, e);
+        if (b === M.EQ || b === M.NE) {
           if (a.ty && a.ty.isStrictComparableWith(e.ty)) {
-            f.operator = b === N.EQ ? N.SEQ : N.SNE;
+            f.operator = b === M.EQ ? M.SEQ : M.SNE;
           } else {
             if (!a.ty || a.ty.canBeXML() || !e.ty || e.ty.canBeXML()) {
-              f = new U(null, null, p("asEquals"), null, [a, e], 0), b === N.NE && (f = s(N.FALSE, f));
+              f = new U(null, null, p("asEquals"), null, [a, e], 0), b === M.NE && (f = s(M.FALSE, f));
             }
           }
         }
@@ -18203,41 +18768,41 @@
         return f;
       }
       function g(b) {
-        return m(N.OR, b, l(0));
+        return m(M.OR, b, l(0));
       }
       function f(b) {
-        return m(N.URSH, b, l(0));
+        return m(M.URSH, b, l(0));
       }
       function b(b) {
-        return v(b) ? b : s(N.PLUS, b);
+        return v(b) ? b : s(M.PLUS, b);
       }
       function e(b) {
-        return s(N.FALSE, s(N.FALSE, b));
+        return s(M.FALSE, s(M.FALSE, b));
       }
-      function q(b) {
+      function n(b) {
         b.shouldNotFloat = !0;
         return b;
       }
-      function n(b, a) {
+      function r(b, a) {
         return new U(null, null, b, null, a, 4);
       }
       function x(b, a) {
-        return n(p(b), [a]);
+        return r(p(b), [a]);
       }
-      function L(b) {
-        return r(b) ? b : n(p("String"), [b]);
+      function H(b) {
+        return q(b) ? b : r(p("String"), [b]);
       }
-      function A(b) {
-        return r(b) ? b : ga(b) ? new w(y.asCoerceString(b.value)) : n(p("asCoerceString"), [b]);
+      function C(b) {
+        return q(b) ? b : ea(b) ? new X(A.asCoerceString(b.value)) : r(p("asCoerceString"), [b]);
       }
-      function H(b) {
-        return ga(b) ? new w(y.escapeXMLAttribute(b.value)) : n(p("escapeXMLAttribute"), [b]);
+      function F(b) {
+        return ea(b) ? new X(A.escapeXMLAttribute(b.value)) : r(p("escapeXMLAttribute"), [b]);
       }
       function K(b) {
-        return ga(b) ? new w(y.escapeXMLElement(b.value)) : n(p("escapeXMLElement"), [b]);
+        return ea(b) ? new X(A.escapeXMLElement(b.value)) : r(p("escapeXMLElement"), [b]);
       }
-      var F = d.AVM2.ABC.Multiname, J = d.AVM2.ABC.InstanceInfo, M = d.Debug.notImplemented, D = d.Debug.assertUnreachable, B = d.ArrayUtilities.top, E = d.ArrayUtilities.unique, y = d.AVM2.Runtime, z = d.AVM2.Runtime.GlobalMultinameResolver, G = a.IR.Node, C = a.IR.Start, I = a.IR.Region, P = a.IR.Null, T = a.IR.Undefined, O = a.IR.True, Q = a.IR.False, S = a.IR.This, V = a.IR.Projection, aa = a.IR.Binary, $ = a.IR.Unary, w = a.IR.Constant, U = a.IR.Call, ba = a.IR.Phi, R = a.IR.Stop, N = a.IR.Operator, 
-      Z = a.IR.Parameter, fa = a.IR.NewArray, X = a.IR.NewObject, ia = a.IR.KeyValuePair, ga = a.IR.isConstant, ca = new d.IndentingWriter, da = new a.IR.PeepholeOptimizer, ea = function() {
+      var E = d.AVM2.ABC.Multiname, Q = d.AVM2.ABC.InstanceInfo, N = d.Debug.notImplemented, B = d.Debug.assertUnreachable, y = d.ArrayUtilities.top, L = d.ArrayUtilities.unique, A = d.AVM2.Runtime, z = d.AVM2.Runtime.GlobalMultinameResolver, G = a.IR.Node, I = a.IR.Start, D = a.IR.Region, R = a.IR.Null, T = a.IR.Undefined, J = a.IR.True, P = a.IR.False, S = a.IR.This, W = a.IR.Projection, ba = a.IR.Binary, w = a.IR.Unary, X = a.IR.Constant, U = a.IR.Call, $ = a.IR.Phi, Y = a.IR.Stop, M = a.IR.Operator, 
+      Z = a.IR.Parameter, ca = a.IR.NewArray, ga = a.IR.NewObject, ha = a.IR.KeyValuePair, ea = a.IR.isConstant, aa = new d.IndentingWriter, da = new a.IR.PeepholeOptimizer, O = function() {
         function b(a) {
           void 0 === a && (a = 0);
           this.id = b._nextID += 1;
@@ -18265,7 +18830,7 @@
         };
         b.prototype.makeLoopPhis = function(a, e) {
           function f(b) {
-            b = new ba(a, b);
+            b = new $(a, b);
             b.isLoop = !0;
             return b;
           }
@@ -18282,11 +18847,11 @@
           return c;
         };
         b.tryOptimizePhi = function(b) {
-          if (b instanceof ba) {
+          if (b instanceof $) {
             if (b.isLoop) {
               return b;
             }
-            var a = E(b.args);
+            var a = L(b.args);
             if (1 === a.length) {
               return b.seal(), k.countTimeline("Builder: OptimizedPhi"), a[0];
             }
@@ -18301,7 +18866,7 @@
           this.store = b.tryOptimizePhi(this.store);
         };
         b.mergeValue = function(b, a, e) {
-          b = a instanceof ba && a.control === b ? a : new ba(b, a);
+          b = a instanceof $ && a.control === b ? a : new $(b, a);
           b.pushValue(e);
           return b;
         };
@@ -18328,20 +18893,20 @@
         };
         b._nextID = 0;
         return b;
-      }(), W = x.bind(null, "asCoerceObject"), ka = Object.create(null);
-      ka[F.Int] = g;
-      ka[F.Uint] = f;
-      ka[F.Number] = b;
-      ka[F.String] = A;
-      ka[F.Object] = W;
-      ka[F.Boolean] = e;
-      var Y = Object.create(null);
-      Y[F.Int] = g;
-      Y[F.Uint] = f;
-      Y[F.Number] = x.bind(null, "Number");
-      Y[F.String] = x.bind(null, "String");
-      Y[F.Object] = x.bind(null, "Object");
-      Y[F.Boolean] = x.bind(null, "Boolean");
+      }(), ka = x.bind(null, "asCoerceObject"), V = Object.create(null);
+      V[E.Int] = g;
+      V[E.Uint] = f;
+      V[E.Number] = b;
+      V[E.String] = C;
+      V[E.Object] = ka;
+      V[E.Boolean] = e;
+      var ja = Object.create(null);
+      ja[E.Int] = g;
+      ja[E.Uint] = f;
+      ja[E.Number] = x.bind(null, "Number");
+      ja[E.String] = x.bind(null, "String");
+      ja[E.Object] = x.bind(null, "Object");
+      ja[E.Boolean] = x.bind(null, "Boolean");
       var la = x.bind(null, "Object"), ma = function() {
         function x(b, a, e, f) {
           this.builder = b;
@@ -18358,12 +18923,12 @@
         x.prototype.popMultiname = function() {
           var b = this.constantPool.multinames[this.bc.index], e, f;
           b.isRuntimeName() ? (e = this.state.stack.pop(), f = l(0)) : (e = l(b.name), f = l(b.flags));
-          b.isRuntimeNamespace() ? (b = new fa(this.region, [this.state.stack.pop()]), b.shouldFloat = !0) : b = l(b.namespaces);
+          b.isRuntimeNamespace() ? (b = new ca(this.region, [this.state.stack.pop()]), b.shouldFloat = !0) : b = l(b.namespaces);
           return new a.IR.ASMultiname(b, e, f);
         };
         x.prototype.setIfStops = function(b) {
           b = new a.IR.If(this.region, b);
-          this.stops = [{control:new V(b, 2), target:this.bytecodes[this.bc.position + 1], state:this.state}, {control:new V(b, 1), target:this.bc.target, state:this.state}];
+          this.stops = [{control:new W(b, 2), target:this.bytecodes[this.bc.position + 1], state:this.state}, {control:new W(b, 1), target:this.bc.target, state:this.state}];
         };
         x.prototype.setJumpStop = function() {
           this.stops = [{control:this.region, target:this.bc.target, state:this.state}];
@@ -18379,10 +18944,10 @@
             this.stops = [];
             b = new a.IR.Switch(this.region, b);
             for (var e = 0;e < this.bc.targets.length;e++) {
-              this.stops.push({control:new V(b, 0, l(e)), target:this.bc.targets[e], state:this.state});
+              this.stops.push({control:new W(b, 0, l(e)), target:this.bc.targets[e], state:this.state});
             }
           } else {
-            b = m(N.SEQ, b, l(0)), b = new a.IR.If(this.region, b), this.stops = [{control:new V(b, 2), target:this.bc.targets[1], state:this.state}, {control:new V(b, 1), target:this.bc.targets[0], state:this.state}];
+            b = m(M.SEQ, b, l(0)), b = new a.IR.If(this.region, b), this.stops = [{control:new W(b, 2), target:this.bc.targets[1], state:this.state}, {control:new W(b, 1), target:this.bc.targets[0], state:this.state}];
           }
         };
         x.prototype.savedScope = function() {
@@ -18404,7 +18969,7 @@
             }
             return e;
           }
-          return 0 < a.length ? B(a) : this.savedScope();
+          return 0 < a.length ? y(a) : this.savedScope();
         };
         x.prototype.getGlobalScope = function() {
           var b = this.bc.ti;
@@ -18426,12 +18991,12 @@
           return c;
         };
         x.prototype.coerce = function(b, a) {
-          var e = ka[F.getQualifiedName(b)];
+          var e = V[E.getQualifiedName(b)];
           return e ? e(a) : a;
         };
         x.prototype.store = function(b) {
           var a = this.state;
-          a.store = new V(b, 3);
+          a.store = new W(b, 3);
           b.loads = a.loads.slice(0);
           a.loads.length = 0;
           return b;
@@ -18447,20 +19012,20 @@
           return this.store(new U(this.region, this.state.store, b, a, e, 16));
         };
         x.prototype.callProperty = function(b, e, f, c) {
-          var g = this.bc.ti, n = this.region, q = this.state;
+          var g = this.bc.ti, n = this.region, h = this.state;
           if (g && g.trait) {
             if (g.trait.isMethod()) {
-              return e = g.trait.holder instanceof J && g.trait.holder.isInterface() ? F.getPublicQualifiedName(F.getName(g.trait.name)) : F.getQualifiedName(g.trait.name), e = y.VM_OPEN_METHOD_PREFIX + e, this.store(new a.IR.CallProperty(n, q.store, b, l(e), f, 4));
+              return e = g.trait.holder instanceof Q && g.trait.holder.isInterface() ? E.getPublicQualifiedName(E.getName(g.trait.name)) : E.getQualifiedName(g.trait.name), e = A.VM_OPEN_METHOD_PREFIX + e, this.store(new a.IR.CallProperty(n, h.store, b, l(e), f, 4));
             }
             if (g.trait.isClass()) {
-              if (e = Y[F.getQualifiedName(g.trait.name)]) {
+              if (e = ja[E.getQualifiedName(g.trait.name)]) {
                 return e(f[0]);
               }
-              e = F.getQualifiedName(g.trait.name);
-              return this.store(new a.IR.CallProperty(n, q.store, b, l(e), f, 16));
+              e = E.getQualifiedName(g.trait.name);
+              return this.store(new a.IR.CallProperty(n, h.store, b, l(e), f, 16));
             }
           }
-          return(g = this.resolveMultinameGlobally(e)) ? this.store(new a.IR.ASCallProperty(n, q.store, b, l(F.getQualifiedName(g)), f, 6, c)) : this.store(new a.IR.ASCallProperty(n, q.store, b, e, f, 4, c));
+          return(g = this.resolveMultinameGlobally(e)) ? this.store(new a.IR.ASCallProperty(n, h.store, b, l(E.getQualifiedName(g)), f, 6, c)) : this.store(new a.IR.ASCallProperty(n, h.store, b, e, f, 4, c));
         };
         x.prototype.getProperty = function(b, e, f) {
           var c = this.bc.ti, g = this.region, n = this.state;
@@ -18469,14 +19034,14 @@
             if (c.trait.isConst() && c.trait.hasDefaultValue) {
               return l(c.trait.value);
             }
-            b = new a.IR.GetProperty(g, n.store, b, l(F.getQualifiedName(c.trait.name)));
+            b = new a.IR.GetProperty(g, n.store, b, l(E.getQualifiedName(c.trait.name)));
             return c.trait.isGetter() ? this.store(b) : this.load(b);
           }
           if (v(e.name)) {
             return this.store(new a.IR.ASGetProperty(g, n.store, b, e, 1));
           }
           if (c = this.resolveMultinameGlobally(e)) {
-            return this.store(new a.IR.ASGetProperty(g, n.store, b, l(F.getQualifiedName(c)), 2 | (f ? 8 : 0)));
+            return this.store(new a.IR.ASGetProperty(g, n.store, b, l(E.getQualifiedName(c)), 2 | (f ? 8 : 0)));
           }
           k.countTimeline("Compiler: Slow ASGetProperty");
           return this.store(new a.IR.ASGetProperty(g, n.store, b, e, f ? 8 : 0));
@@ -18484,7 +19049,7 @@
         x.prototype.setProperty = function(b, e, f) {
           var c = this.bc.ti, g = this.region, n = this.state;
           if (c && c.trait) {
-            (e = c.trait.typeName ? ka[F.getQualifiedName(c.trait.typeName)] : null) && (f = e(f)), this.store(new a.IR.SetProperty(g, n.store, b, l(F.getQualifiedName(c.trait.name)), f));
+            (e = c.trait.typeName ? V[E.getQualifiedName(c.trait.typeName)] : null) && (f = e(f)), this.store(new a.IR.SetProperty(g, n.store, b, l(E.getQualifiedName(c.trait.name)), f));
           } else {
             if (v(e.name)) {
               return this.store(new a.IR.ASSetProperty(g, n.store, b, e, f, 1));
@@ -18494,16 +19059,24 @@
           }
         };
         x.prototype.callSuper = function(b, e, f, c) {
-          var g = this.bc.ti, n = this.region, q = this.state;
-          return g && g.trait && g.trait.isMethod() && g.baseClass ? (b = y.VM_OPEN_METHOD_PREFIX + F.getQualifiedName(g.trait.name), g = this.getJSProperty(l(g.baseClass), "traitsPrototype." + b), this.call(g, e, c)) : this.store(new a.IR.ASCallSuper(n, q.store, e, f, c, 4, b));
+          var g = this.bc.ti, n = this.region, h = this.state;
+          return g && g.trait && g.trait.isMethod() && g.baseClass ? (b = A.VM_OPEN_METHOD_PREFIX + E.getQualifiedName(g.trait.name), g = this.getJSProperty(l(g.baseClass), "traitsPrototype." + b), this.call(g, e, c)) : this.store(new a.IR.ASCallSuper(n, h.store, e, f, c, 4, b));
         };
         x.prototype.getSuper = function(b, e, f) {
           var c = this.bc.ti, g = this.region, n = this.state;
-          return c && c.trait && c.trait.isGetter() && c.baseClass ? (b = y.VM_OPEN_GET_METHOD_PREFIX + F.getQualifiedName(c.trait.name), c = this.getJSProperty(l(c.baseClass), "traitsPrototype." + b), this.call(c, e, [])) : this.store(new a.IR.ASGetSuper(g, n.store, e, f, b));
+          if (c && c.trait && c.baseClass) {
+            if (c.trait.isGetter()) {
+              return b = A.VM_OPEN_GET_METHOD_PREFIX + E.getQualifiedName(c.trait.name), c = this.getJSProperty(l(c.baseClass), "traitsPrototype." + b), this.call(c, e, []);
+            }
+            if (c.trait.isMethod()) {
+              return b = A.VM_OPEN_METHOD_PREFIX + E.getQualifiedName(c.trait.name), this.getJSProperty(l(c.baseClass), "traitsPrototype." + b);
+            }
+          }
+          return this.store(new a.IR.ASGetSuper(g, n.store, e, f, b));
         };
         x.prototype.setSuper = function(b, e, f, c) {
-          var g = this.bc.ti, n = this.region, q = this.state;
-          return g && g.trait && g.trait.isSetter() && g.baseClass ? (b = y.VM_OPEN_SET_METHOD_PREFIX + F.getQualifiedName(g.trait.name), g = this.getJSProperty(l(g.baseClass), "traitsPrototype." + b), this.call(g, e, [c])) : this.store(new a.IR.ASSetSuper(n, q.store, e, f, c, b));
+          var g = this.bc.ti, n = this.region, h = this.state;
+          return g && g.trait && g.trait.isSetter() && g.baseClass ? (b = A.VM_OPEN_SET_METHOD_PREFIX + E.getQualifiedName(g.trait.name), g = this.getJSProperty(l(g.baseClass), "traitsPrototype." + b), this.call(g, e, [c])) : this.store(new a.IR.ASSetSuper(n, h.store, e, f, c, b));
         };
         x.prototype.constructSuper = function(b, a, e) {
           var f = this.bc.ti;
@@ -18528,7 +19101,7 @@
               if (n.isConst() && f.trait.hasDefaultValue) {
                 return l(n.value);
               }
-              f = F.getQualifiedName(n.name);
+              f = E.getQualifiedName(n.name);
               return this.store(new a.IR.GetProperty(c, g.store, b, l(f)));
             }
           }
@@ -18537,7 +19110,7 @@
         x.prototype.setSlot = function(b, e, f) {
           var c = this.bc.ti, g = this.region, n = this.state;
           if (c && (c = c.trait)) {
-            e = F.getQualifiedName(c.name);
+            e = E.getQualifiedName(c.name);
             this.store(new a.IR.SetProperty(g, n.store, b, l(e), f));
             return;
           }
@@ -18546,9 +19119,9 @@
         x.prototype.resolveMultinameGlobally = function(b) {
           var a = b.namespaces, e = b.name;
           if (d.AVM2.Runtime.globalMultinameAnalysis.value) {
-            if (ga(a) && ga(e) && !b.isAttribute()) {
+            if (ea(a) && ea(e) && !b.isAttribute()) {
               if (!d.isNumeric(e.value) && d.isString(e.value) && e.value) {
-                return z.resolveMultiname(new F(a.value, e.value, b.flags));
+                return z.resolveMultiname(new E(a.value, e.value, b.flags));
               }
               k.countTimeline("GlobalMultinameResolver: Cannot resolve numeric or any names.");
             } else {
@@ -18563,7 +19136,7 @@
           this.store(new a.IR.SetProperty(null, this.state.store, b, l(e), f));
         };
         x.prototype.simplifyName = function(b) {
-          return b instanceof w && b.value instanceof F && F.isQName(b.value) ? l(F.getQualifiedName(b.value)) : b;
+          return b instanceof X && b.value instanceof E && E.isQName(b.value) ? l(E.getQualifiedName(b.value)) : b;
         };
         x.prototype.getDescendants = function(b, e) {
           var f = this.region, c = this.state;
@@ -18579,7 +19152,7 @@
           return b;
         };
         x.prototype.negatedTruthyCondition = function(b) {
-          b = s(N.FALSE, this.truthyCondition(b));
+          b = s(M.FALSE, this.truthyCondition(b));
           da && (b = da.fold(b, !0));
           return b;
         };
@@ -18597,7 +19170,7 @@
         };
         x.prototype.popLocal = function(b) {
           var a = this.state;
-          a.local[b] = q(a.stack.pop());
+          a.local[b] = n(a.stack.pop());
         };
         x.prototype.build = function() {
           function h() {
@@ -18606,17 +19179,17 @@
           function s(b) {
             return d.ArrayUtilities.popMany(v, b);
           }
-          var x = this.block, r = this.state, t = this.state.local, v = this.state.stack, E = this.state.scope, B = this.region, D = this.bytecodes, y, J, z, w = this.push.bind(this);
+          var x = this.block, q = this.state, u = this.state.local, v = this.state.stack, L = this.state.scope, B = this.region, Q = this.bytecodes, y, A, z, w = this.push.bind(this);
           this.stops = null;
-          this.traceBuilder && (ca.writeLn("Processing Region: " + B + ", Block: " + x.bid), ca.enter(("> state: " + B.entryState.toString()).padRight(" ", 100)));
+          this.traceBuilder && (aa.writeLn("Processing Region: " + B + ", Block: " + x.bid), aa.enter(("> state: " + B.entryState.toString()).padRight(" ", 100)));
           for (var G = x.position, I = x.end.position;G <= I;G++) {
-            this.bc = x = D[G];
-            var C = x.op;
-            r.index = G;
-            switch(C) {
+            this.bc = x = Q[G];
+            var D = x.op;
+            q.index = G;
+            switch(D) {
               case 3:
                 this.store(new a.IR.Throw(B, h()));
-                this.builder.stopPoints.push({region:B, store:r.store, value:T});
+                this.builder.stopPoints.push({region:B, store:q.store, value:T});
                 this.setThrowStop();
                 break;
               case 98:
@@ -18629,7 +19202,7 @@
               case 210:
               ;
               case 211:
-                this.pushLocal(C - 208);
+                this.pushLocal(D - 208);
                 break;
               case 99:
                 this.popLocal(x.index);
@@ -18641,36 +19214,36 @@
               case 214:
               ;
               case 215:
-                this.popLocal(C - 212);
+                this.popLocal(D - 212);
                 break;
               case 28:
               ;
               case 48:
-                E.push(new a.IR.ASScope(this.topScope(), h(), 28 === C));
+                L.push(new a.IR.ASScope(this.topScope(), h(), 28 === D));
                 break;
               case 29:
-                E.pop();
+                L.pop();
                 break;
               case 100:
                 w(this.getGlobalScope());
                 break;
               case 101:
-                w(this.getScopeObject(r.scope[x.index]));
+                w(this.getScopeObject(q.scope[x.index]));
                 break;
               case 94:
               ;
               case 93:
-                w(this.findProperty(this.popMultiname(), 93 === C));
+                w(this.findProperty(this.popMultiname(), 93 === D));
                 break;
               case 102:
                 z = this.popMultiname();
-                J = h();
-                w(this.getProperty(J, z, !1));
+                A = h();
+                w(this.getProperty(A, z, !1));
                 break;
               case 89:
                 z = this.popMultiname();
-                J = h();
-                w(this.getDescendants(J, z));
+                A = h();
+                w(this.getDescendants(A, z));
                 break;
               case 96:
                 z = this.popMultiname();
@@ -18681,46 +19254,46 @@
               case 97:
                 y = h();
                 z = this.popMultiname();
-                J = h();
-                this.setProperty(J, z, y);
+                A = h();
+                this.setProperty(A, z, y);
                 break;
               case 106:
                 z = this.popMultiname();
-                J = h();
-                w(this.store(new a.IR.ASDeleteProperty(B, r.store, J, z)));
+                A = h();
+                w(this.store(new a.IR.ASDeleteProperty(B, q.store, A, z)));
                 break;
               case 108:
-                J = h();
-                w(this.getSlot(J, l(x.index)));
+                A = h();
+                w(this.getSlot(A, l(x.index)));
                 break;
               case 109:
                 y = h();
-                J = h();
-                this.setSlot(J, l(x.index), y);
+                A = h();
+                this.setSlot(A, l(x.index), y);
                 break;
               case 4:
                 z = this.popMultiname();
-                J = h();
-                w(this.getSuper(this.savedScope(), J, z));
+                A = h();
+                w(this.getSuper(this.savedScope(), A, z));
                 break;
               case 5:
                 y = h();
                 z = this.popMultiname();
-                J = h();
-                this.setSuper(this.savedScope(), J, z, y);
+                A = h();
+                this.setSuper(this.savedScope(), A, z, y);
                 break;
               case 241:
               ;
               case 240:
                 break;
               case 64:
-                w(n(this.builder.createFunctionCallee, [l(this.abc.methods[x.index]), this.topScope(), l(!0)]));
+                w(r(this.builder.createFunctionCallee, [l(this.abc.methods[x.index]), this.topScope(), l(!0)]));
                 break;
               case 65:
                 y = s(x.argCount);
-                J = h();
+                A = h();
                 z = h();
-                w(this.callCall(z, J, y));
+                w(this.callCall(z, A, y));
                 break;
               case 70:
               ;
@@ -18729,35 +19302,35 @@
               case 76:
                 y = s(x.argCount);
                 z = this.popMultiname();
-                J = h();
-                y = this.callProperty(J, z, y, 76 === C);
-                79 !== C && w(y);
+                A = h();
+                y = this.callProperty(A, z, y, 76 === D);
+                79 !== D && w(y);
                 break;
               case 69:
               ;
               case 78:
                 z = this.popMultiname();
                 y = s(x.argCount);
-                J = h();
-                y = this.callSuper(this.savedScope(), J, z, y);
-                78 !== C && w(y);
+                A = h();
+                y = this.callSuper(this.savedScope(), A, z, y);
+                78 !== D && w(y);
                 break;
               case 66:
                 y = s(x.argCount);
-                J = h();
-                w(this.store(new a.IR.ASNew(B, r.store, J, y)));
+                A = h();
+                w(this.store(new a.IR.ASNew(B, q.store, A, y)));
                 break;
               case 73:
                 y = s(x.argCount);
-                J = h();
-                this.constructSuper(this.savedScope(), J, y);
+                A = h();
+                this.constructSuper(this.savedScope(), A, y);
                 break;
               case 74:
                 y = s(x.argCount);
                 z = this.popMultiname();
-                J = h();
-                z = this.getProperty(J, z, !1);
-                w(this.store(new a.IR.ASNew(B, r.store, z, y)));
+                A = h();
+                z = this.getProperty(A, z, !1);
+                w(this.store(new a.IR.ASNew(B, q.store, z, y)));
                 break;
               case 128:
                 if (x.ti && x.ti.noCoercionNeeded) {
@@ -18795,13 +19368,13 @@
               case 130:
                 break;
               case 133:
-                w(A(h()));
+                w(C(h()));
                 break;
               case 112:
-                w(L(h()));
+                w(H(h()));
                 break;
               case 114:
-                w(H(h()));
+                w(F(h()));
                 break;
               case 113:
                 w(K(h()));
@@ -18814,56 +19387,56 @@
                   k.countTimeline("Compiler: CoercionNeeded");
                 }
                 y = h();
-                J = this.constantPool.multinames[x.index];
-                z = new a.IR.ASMultiname(l(J.namespaces), l(J.name), l(J.flags));
-                J = this.getProperty(this.findProperty(z, !1), z);
-                w(this.call(p("asAsType"), null, [J, y]));
+                A = this.constantPool.multinames[x.index];
+                z = new a.IR.ASMultiname(l(A.namespaces), l(A.name), l(A.flags));
+                A = this.getProperty(this.findProperty(z, !1), z);
+                w(this.call(p("asAsType"), null, [A, y]));
                 break;
               case 135:
-                J = h();
+                A = h();
                 y = h();
-                w(this.call(p("asAsType"), null, [J, y]));
+                w(this.call(p("asAsType"), null, [A, y]));
                 break;
               case 72:
               ;
               case 71:
                 y = T;
-                72 === C && (y = h(), this.methodInfo.returnType && (x.ti && x.ti.noCoercionNeeded || (y = this.coerce(this.methodInfo.returnType, y))));
-                this.builder.stopPoints.push({region:B, store:r.store, value:y});
+                72 === D && (y = h(), this.methodInfo.returnType && (x.ti && x.ti.noCoercionNeeded || (y = this.coerce(this.methodInfo.returnType, y))));
+                this.builder.stopPoints.push({region:B, store:q.store, value:y});
                 this.setReturnStop();
                 break;
               case 30:
               ;
               case 35:
                 y = h();
-                J = h();
-                w(new a.IR.CallProperty(B, r.store, J, l(30 === C ? "asNextName" : "asNextValue"), [y], 4));
+                A = h();
+                w(new a.IR.CallProperty(B, q.store, A, l(30 === D ? "asNextName" : "asNextValue"), [y], 4));
                 break;
               case 50:
                 y = new a.IR.ASNewHasNext2;
-                this.setJSProperty(y, "object", t[x.object]);
-                this.setJSProperty(y, "index", t[x.index]);
-                this.store(new a.IR.CallProperty(B, r.store, la(t[x.object]), l("asHasNext2"), [y], 4));
-                t[x.object] = this.getJSProperty(y, "object");
-                w(t[x.index] = this.getJSProperty(y, "index"));
+                this.setJSProperty(y, "object", u[x.object]);
+                this.setJSProperty(y, "index", u[x.index]);
+                this.store(new a.IR.CallProperty(B, q.store, la(u[x.object]), l("asHasNext2"), [y], 4));
+                u[x.object] = this.getJSProperty(y, "object");
+                w(u[x.index] = this.getJSProperty(y, "index"));
                 break;
               case 32:
-                w(P);
+                w(R);
                 break;
               case 33:
                 w(T);
                 break;
               case 38:
-                w(O);
+                w(J);
                 break;
               case 39:
-                w(Q);
+                w(P);
                 break;
               case 40:
                 w(l(NaN));
                 break;
               case 34:
-                M(String(x));
+                N(String(x));
                 break;
               case 36:
               ;
@@ -18886,12 +19459,12 @@
                 h();
                 break;
               case 42:
-                y = q(h());
+                y = n(h());
                 w(y);
                 w(y);
                 break;
               case 43:
-                r.stack.push(h(), h());
+                q.stack.push(h(), h());
                 break;
               case 239:
               ;
@@ -18903,16 +19476,16 @@
                 this.setJumpStop();
                 break;
               case 12:
-                this.setIfStops(this.negatedTruthyCondition(N.LT));
+                this.setIfStops(this.negatedTruthyCondition(M.LT));
                 break;
               case 15:
-                this.setIfStops(this.negatedTruthyCondition(N.GE));
+                this.setIfStops(this.negatedTruthyCondition(M.GE));
                 break;
               case 14:
-                this.setIfStops(this.negatedTruthyCondition(N.GT));
+                this.setIfStops(this.negatedTruthyCondition(M.GT));
                 break;
               case 13:
-                this.setIfStops(this.negatedTruthyCondition(N.LE));
+                this.setIfStops(this.negatedTruthyCondition(M.LE));
                 break;
               case 24:
               ;
@@ -18933,16 +19506,16 @@
               case 25:
               ;
               case 26:
-                this.setIfStops(this.truthyCondition(c(C)));
+                this.setIfStops(this.truthyCondition(c(D)));
                 break;
               case 27:
                 this.setSwitchStops(h());
                 break;
               case 160:
-                J = h();
+                A = h();
                 y = h();
-                z = u(y, J) ? N.ADD : d.AVM2.Runtime.useAsAdd ? N.AS_ADD : N.ADD;
-                w(m(z, y, J));
+                z = t(y, A) ? M.ADD : d.AVM2.Runtime.useAsAdd ? M.AS_ADD : M.ADD;
+                w(m(z, y, A));
                 break;
               case 161:
               ;
@@ -18981,7 +19554,7 @@
               case 150:
               ;
               case 151:
-                this.pushExpression(c(C));
+                this.pushExpression(c(D));
                 break;
               case 196:
               ;
@@ -18990,7 +19563,7 @@
               case 198:
               ;
               case 199:
-                this.pushExpression(c(C), !0);
+                this.pushExpression(c(D), !0);
                 break;
               case 145:
               ;
@@ -19000,8 +19573,8 @@
               ;
               case 193:
                 w(l(1));
-                145 === C || 147 === C ? w(b(h())) : w(g(h()));
-                145 === C || 192 === C ? this.pushExpression(N.ADD) : this.pushExpression(N.SUB);
+                145 === D || 147 === D ? w(b(h())) : w(g(h()));
+                145 === D || 192 === D ? this.pushExpression(M.ADD) : this.pushExpression(M.SUB);
                 break;
               case 146:
               ;
@@ -19011,31 +19584,31 @@
               ;
               case 195:
                 w(l(1));
-                146 === C || 148 === C ? w(b(t[x.index])) : w(g(t[x.index]));
-                146 === C || 194 === C ? this.pushExpression(N.ADD) : this.pushExpression(N.SUB);
+                146 === D || 148 === D ? w(b(u[x.index])) : w(g(u[x.index]));
+                146 === D || 194 === D ? this.pushExpression(M.ADD) : this.pushExpression(M.SUB);
                 this.popLocal(x.index);
                 break;
               case 177:
-                J = h();
+                A = h();
                 y = h();
-                w(this.call(this.getJSProperty(J, "isInstanceOf"), null, [y]));
+                w(this.call(this.getJSProperty(A, "isInstanceOf"), null, [y]));
                 break;
               case 178:
                 y = h();
                 z = this.popMultiname();
-                J = this.getProperty(this.findProperty(z, !1), z);
-                w(this.call(p("asIsType"), null, [J, y]));
+                A = this.getProperty(this.findProperty(z, !1), z);
+                w(this.call(p("asIsType"), null, [A, y]));
                 break;
               case 179:
-                J = h();
+                A = h();
                 y = h();
-                w(this.call(p("asIsType"), null, [J, y]));
+                w(this.call(p("asIsType"), null, [A, y]));
                 break;
               case 180:
-                J = h();
+                A = h();
                 y = h();
                 z = new a.IR.ASMultiname(T, y, l(0));
-                w(this.store(new a.IR.ASHasProperty(B, r.store, J, z)));
+                w(this.store(new a.IR.ASHasProperty(B, q.store, A, z)));
                 break;
               case 149:
                 w(this.call(p("asTypeOf"), null, [h()]));
@@ -19046,22 +19619,22 @@
                 break;
               case 83:
                 y = s(x.argCount);
-                J = h();
+                A = h();
                 z = p("applyType");
-                w(this.call(z, null, [this.methodInfoConstant, J, new fa(B, y)]));
+                w(this.call(z, null, [this.methodInfoConstant, A, new ca(B, y)]));
                 break;
               case 86:
                 y = s(x.argCount);
-                w(new fa(B, y));
+                w(new ca(B, y));
                 break;
               case 85:
-                J = [];
+                A = [];
                 for (z = 0;z < x.argCount;z++) {
                   y = h();
-                  var da = h(), da = l(F.getPublicQualifiedName(da.value));
-                  J.push(new ia(da, y));
+                  var O = h(), O = l(E.getPublicQualifiedName(O.value));
+                  A.push(new ha(O, y));
                 }
-                w(new X(B, J));
+                w(new ga(B, A));
                 break;
               case 87:
                 w(new a.IR.ASNewActivation(l(this.methodInfo)));
@@ -19071,17 +19644,17 @@
                 w(this.call(z, null, [l(this.abc.classes[x.index]), h(), this.topScope()]));
                 break;
               default:
-                M(String(x));
+                N(String(x));
             }
-            239 !== C && 241 !== C && 240 !== C && this.traceBuilder && ca.writeLn(("state: " + r.toString()).padRight(" ", 100) + " : " + G + ", " + x.toString(this.abc));
+            239 !== D && 241 !== D && 240 !== D && this.traceBuilder && aa.writeLn(("state: " + q.toString()).padRight(" ", 100) + " : " + G + ", " + x.toString(this.abc));
           }
-          this.traceBuilder && ca.leave(("< state: " + r.toString()).padRight(" ", 100));
+          this.traceBuilder && aa.leave(("< state: " + q.toString()).padRight(" ", 100));
         };
         return x;
-      }(), na = function() {
+      }(), ra = function() {
         function b(a, e, f) {
           this.abc = a.abc;
-          this.methodInfoConstant = new w(a);
+          this.methodInfoConstant = new X(a);
           this.scope = e;
           this.methodInfo = a;
           this.hasDynamicScope = f;
@@ -19091,7 +19664,7 @@
           this.bytecodes = this.methodInfo.analysis.bytecodes;
         }
         b.prototype.buildStart = function(b) {
-          var e = this.methodInfo, f = b.entryState = new ea(0);
+          var e = this.methodInfo, f = b.entryState = new O(0);
           f.local.push(new S(b));
           for (var c = this.hasDynamicScope ? 1 : 0, g = e.parameters.length, n = 0;n < g;n++) {
             f.local.push(new Z(b, c + n, e.parameters[n].name));
@@ -19099,24 +19672,27 @@
           for (n = g;n < e.localCount;n++) {
             f.local.push(T);
           }
-          f.store = new V(b, 3);
-          b.scope = this.hasDynamicScope ? new Z(b, 0, y.SAVED_SCOPE_NAME) : new w(this.scope);
-          f.saved = new V(b, 4);
+          f.store = new W(b, 3);
+          b.scope = this.hasDynamicScope ? new Z(b, 0, A.SAVED_SCOPE_NAME) : new X(this.scope);
+          f.saved = new W(b, 4);
           n = new a.IR.Arguments(b);
           if (e.needsRest() || e.needsArguments()) {
-            var q = l(c + (e.needsRest() ? g : 0));
-            f.local[g + 1] = new U(b, f.store, p("sliceArguments"), null, [n, q], 4);
+            var r = l(c + (e.needsRest() ? g : 0)), m;
+            m = e.needsArguments() ? h(f, n, "callee") : l(void 0);
+            f.local[g + 1] = new U(b, f.store, p("sliceArguments"), null, [n, r, m], 4);
           }
-          q = h(f, n, "length");
+          r = h(f, n, "length");
           for (n = 0;n < g;n++) {
-            var m = e.parameters[n], d = n + 1, s = f.local[d];
-            if (void 0 !== m.value) {
+            var d = e.parameters[n];
+            m = n + 1;
+            var s = f.local[m];
+            if (void 0 !== d.value) {
               var x;
-              x = new a.IR.Binary(N.LT, q, l(c + n + 1));
-              s = new a.IR.Latch(null, x, l(m.value), s);
+              x = new a.IR.Binary(M.LT, r, l(c + n + 1));
+              s = new a.IR.Latch(null, x, l(d.value), s);
             }
-            m.type && !m.type.isAnyName() && (m = ka[F.getQualifiedName(m.type)]) && (s = m(s));
-            f.local[d] = s;
+            d.type && !d.type.isAnyName() && (d = V[E.getQualifiedName(d.type)]) && (s = d(s));
+            f.local[m] = s;
           }
           return b;
         };
@@ -19126,35 +19702,35 @@
           }
           var c = new d.SortedList(function(b, a) {
             return b.block.bdo - a.block.bdo;
-          }), f = new C;
+          }), f = new I;
           this.buildStart(f);
           for (c.push({region:f, block:b[0]});b = c.pop();) {
             this.buildBlock(b.region, b.block, b.region.entryState.clone()).forEach(function(b) {
               var f = b.target, g = f.region;
               if (g) {
-                e && ca.enter("Merging into region: " + g + " @ " + f.position + ", block " + f.bid + " {"), e && ca.writeLn("  R " + g.entryState), e && ca.writeLn("+ I " + b.state), g.entryState.merge(g, b.state), g.predecessors.push(b.control), e && ca.writeLn("  = " + g.entryState), e && ca.leave("}");
+                e && aa.enter("Merging into region: " + g + " @ " + f.position + ", block " + f.bid + " {"), e && aa.writeLn("  R " + g.entryState), e && aa.writeLn("+ I " + b.state), g.entryState.merge(g, b.state), g.predecessors.push(b.control), e && aa.writeLn("  = " + g.entryState), e && aa.leave("}");
               } else {
-                var g = f.region = new I(b.control), n = null;
-                f.loop && (n = a.enableDirtyLocals.value && f.loop.getDirtyLocals(), e && ca.writeLn("Adding PHIs to loop region. " + n));
+                var g = f.region = new D(b.control), n = null;
+                f.loop && (n = a.enableDirtyLocals.value && f.loop.getDirtyLocals(), e && aa.writeLn("Adding PHIs to loop region. " + n));
                 g.entryState = f.loop ? b.state.makeLoopPhis(g, n) : b.state.clone(f.position);
-                e && ca.writeLn("Adding new region: " + g + " @ " + f.position + " to worklist.");
+                e && aa.writeLn("Adding new region: " + g + " @ " + f.position + " to worklist.");
                 c.push({region:g, block:f});
               }
-            }), e && ca.enter("Worklist: {"), c.forEach(function(b) {
-              e && ca.writeLn(b.region + " " + b.block.bdo + " " + b.region.entryState);
-            }), e && ca.leave("}");
+            }), e && aa.enter("Worklist: {"), c.forEach(function(b) {
+              e && aa.writeLn(b.region + " " + b.block.bdo + " " + b.region.entryState);
+            }), e && aa.leave("}");
           }
-          e && ca.writeLn("Done");
+          e && aa.writeLn("Done");
           if (1 < this.stopPoints.length) {
-            var g = new I(null), n = new ba(g, null), q = new ba(g, null);
+            var g = new D(null), n = new $(g, null), h = new $(g, null);
             this.stopPoints.forEach(function(b) {
               g.predecessors.push(b.region);
               n.pushValue(b.value);
-              q.pushValue(b.store);
+              h.pushValue(b.store);
             });
-            b = new R(g, q, n);
+            b = new Y(g, h, n);
           } else {
-            b = new R(this.stopPoints[0].region, this.stopPoints[0].store, this.stopPoints[0].value);
+            b = new Y(this.stopPoints[0].region, this.stopPoints[0].store, this.stopPoints[0].value);
           }
           return new a.IR.DFG(b);
         };
@@ -19162,7 +19738,7 @@
           e.optimize();
           var f = a.verifierEntryState;
           if (f) {
-            this.traceBuilder && ca.writeLn("Type State: " + f);
+            this.traceBuilder && aa.writeLn("Type State: " + f);
             for (var c = 0;c < f.local.length;c++) {
               var g = f.local[c], n = e.local[c];
               n.ty || (n.ty = g);
@@ -19184,13 +19760,13 @@
           a = 0 < d.AVM2.Compiler.traceLevel.value;
           var g = 1 < d.AVM2.Compiler.traceLevel.value, n = 2 < d.AVM2.Compiler.traceLevel.value;
           if (a) {
-            var q = window.performance.now()
+            var h = window.performance.now()
           }
           k.enterTimeline("Build IR");
           G.startNumbering();
           f = (new b(e, f, c)).buildGraph();
           k.leaveTimeline();
-          n && f.trace(ca);
+          n && f.trace(aa);
           k.enterTimeline("Build CFG");
           f = f.buildCFG();
           k.leaveTimeline();
@@ -19200,7 +19776,7 @@
           k.enterTimeline("Schedule Nodes");
           f.scheduleEarly();
           k.leaveTimeline();
-          n && f.trace(ca);
+          n && f.trace(aa);
           k.enterTimeline("Verify IR");
           f.verify();
           k.leaveTimeline();
@@ -19210,16 +19786,16 @@
           k.enterTimeline("Generate Source");
           n = d.AVM2.Compiler.Backend.generate(f);
           k.leaveTimeline();
-          g && ca.writeLn(n.body);
+          g && aa.writeLn(n.body);
           G.stopNumbering();
           k.leaveTimeline();
-          a && ca.writeLn("Compiled " + (e.name ? "function " + e.name : "anonymous function") + " in " + (window.performance.now() - q).toPrecision(2) + "ms");
+          a && aa.writeLn("Compiled " + (e.name ? "function " + e.name : "anonymous function") + " in " + (window.performance.now() - h).toPrecision(2) + "ms");
           return n;
         };
         return b;
-      }(), sa = new d.AVM2.Verifier.Verifier;
+      }(), na = new d.AVM2.Verifier.Verifier;
       a.compileMethod = function(b, a, e) {
-        return na.buildMethod(sa, b, a, e);
+        return ra.buildMethod(na, b, a, e);
       };
     })(k.Compiler || (k.Compiler = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -19227,7 +19803,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(b, a) {
+      function q(b, a) {
         var f = new h(null, b), g = b.abc.applicationDomain, m = [];
         k(b.init, a, f, m, !1);
         b.traits.forEach(function(b) {
@@ -19245,7 +19821,7 @@
             });
             c(b.classInfo, a, p, m);
           } else {
-            (b.isMethod() || b.isGetter() || b.isSetter()) && t(b, a, f, m);
+            (b.isMethod() || b.isGetter() || b.isSetter()) && u(b, a, f, m);
           }
         });
         m.forEach(function(b) {
@@ -19261,7 +19837,7 @@
             a.enter(b.index + ": ");
             f ? a.writeLn("undefined") : a.writeLns(d.toSource());
             a.leave(",");
-            g && u(b, a, c, g);
+            g && t(b, a, c, g);
           } catch (l) {
             a.writeLn("// " + l);
           }
@@ -19269,7 +19845,7 @@
           a.writeLn("// Can't compile method: " + b.index);
         }
       }
-      function u(b, a, f, c) {
+      function t(b, a, f, c) {
         for (var g = b.analysis.bytecodes, m = b.abc.methods, d = 0;d < g.length;d++) {
           var l = g[d];
           if (64 === l.op) {
@@ -19277,16 +19853,16 @@
             s(l);
             var p = new h(f, b);
             c.push({scope:p, methodInfo:l});
-            u(l, a, p, c);
+            t(l, a, p, c);
           }
         }
       }
-      function t(b, a, f, c) {
+      function u(b, a, f, c) {
         (b.isMethod() || b.isGetter() || b.isSetter()) && b.methodInfo.hasBody && (a.writeLn("// " + b), k(b.methodInfo, a, f, c, !1));
       }
       function l(b, a, f, c) {
         b.forEach(function(b) {
-          t(b, a, f, c);
+          u(b, a, f, c);
         });
       }
       function c(b, a, f, c) {
@@ -19309,7 +19885,7 @@
         a.enter("{");
         a.enter("methods: {");
         for (var f = 0;f < b.scripts.length;f++) {
-          r(b.scripts[f], a);
+          q(b.scripts[f], a);
         }
         a.leave("}");
         a.leave("}");
@@ -19328,137 +19904,143 @@
           }
           return e;
         }
-        function u(b) {
-          if (null === b) {
-            return "null";
+        function t(b) {
+          var a, e, f, c, g = 0, n = 0, r = b;
+          if (a = p[r]) {
+            return a;
           }
-          if ("string" === typeof b) {
-            var a, e, f, g, q = 0, m = 0, d = b;
-            a = h[d];
-            if (!a) {
-              1024 === c && (h = Object.create(null), c = 0);
-              a = "";
-              "undefined" === typeof b[0] && (b = k(b));
-              e = 0;
-              for (f = b.length;e < f;++e) {
-                g = b[e];
-                if ("'" === g) {
-                  ++q;
+          1024 === h && (p = Object.create(null), h = 0);
+          a = "";
+          "undefined" === typeof b[0] && (b = k(b));
+          e = 0;
+          for (f = b.length;e < f;++e) {
+            c = b[e];
+            if ("'" === c) {
+              ++g;
+            } else {
+              if ('"' === c) {
+                ++n;
+              } else {
+                if (0 <= "\\\n\r\u2028\u2029".indexOf(c)) {
+                  var m = "\\";
+                  switch(c) {
+                    case "\\":
+                      m += "\\";
+                      break;
+                    case "\n":
+                      m += "n";
+                      break;
+                    case "\r":
+                      m += "r";
+                      break;
+                    case "\u2028":
+                      m += "u2028";
+                      break;
+                    case "\u2029":
+                      m += "u2029";
+                      break;
+                    default:
+                      throw Error("Incorrectly classified character");;
+                  }
+                  a += m;
+                  continue;
                 } else {
-                  if ('"' === g) {
-                    ++m;
-                  } else {
-                    if (0 <= "\\\n\r\u2028\u2029".indexOf(g)) {
-                      var r = "\\";
-                      switch(g) {
-                        case "\\":
-                          r += "\\";
-                          break;
-                        case "\n":
-                          r += "n";
-                          break;
-                        case "\r":
-                          r += "r";
-                          break;
-                        case "\u2028":
-                          r += "u2028";
-                          break;
-                        case "\u2029":
-                          r += "u2029";
-                          break;
-                        default:
-                          throw Error("Incorrectly classified character");;
-                      }
-                      a += r;
-                      continue;
-                    } else {
-                      if (!(" " <= g && "~" >= g)) {
-                        var r = b[e + 1], u = g.charCodeAt(0), t = u.toString(16), E = "\\";
-                        switch(g) {
-                          case "\b":
-                            E += "b";
-                            break;
-                          case "\f":
-                            E += "f";
-                            break;
-                          case "\t":
-                            E += "t";
-                            break;
-                          default:
-                            E = 255 < u ? E + ("u" + "0000".slice(t.length) + t) : "\x00" === g && 0 > "0123456789".indexOf(r) ? E + "0" : "\x0B" === g ? E + "x0B" : E + ("x" + "00".slice(t.length) + t);
-                        }
-                        a += E;
-                        continue;
-                      }
+                  if (!(" " <= c && "~" >= c)) {
+                    var m = b[e + 1], d = c.charCodeAt(0), l = d.toString(16), s = "\\";
+                    switch(c) {
+                      case "\b":
+                        s += "b";
+                        break;
+                      case "\f":
+                        s += "f";
+                        break;
+                      case "\t":
+                        s += "t";
+                        break;
+                      default:
+                        s = 255 < d ? s + ("u" + "0000".slice(l.length) + l) : "\x00" === c && 0 > "0123456789".indexOf(m) ? s + "0" : "\x0B" === c ? s + "x0B" : s + ("x" + "00".slice(l.length) + l);
                     }
+                    a += s;
+                    continue;
                   }
                 }
-                a += g;
               }
-              b = a;
-              a = '"';
-              "undefined" === typeof b[0] && (b = k(b));
-              e = 0;
-              for (f = b.length;e < f;++e) {
-                g = b[e], '"' === g && (a += "\\"), a += g;
-              }
-              a += '"';
-              h[d] = a;
-              c++;
             }
-            return a;
+            a += c;
+          }
+          b = a;
+          a = '"';
+          "undefined" === typeof b[0] && (b = k(b));
+          e = 0;
+          for (f = b.length;e < f;++e) {
+            c = b[e], '"' === c && (a += "\\"), a += c;
+          }
+          a += '"';
+          p[r] = a;
+          h++;
+          return a;
+        }
+        function u(b) {
+          if (null === b) {
+            return "null";
+          }
+          if ("string" === typeof b) {
+            return t(b);
           }
           if ("number" === typeof b) {
+            var a;
             if (b !== b) {
               throw Error("Numeric literal whose value is NaN");
             }
             if (0 > b || 0 === b && 0 > 1 / b) {
               throw Error("Numeric literal whose value is negative");
             }
-            b === 1 / 0 ? b = "1e+400" : (e = s[b], e || (1024 === p && (s = Object.create(null), p = 0), e = "" + b, s[b] = e, p++), b = e);
+            b === 1 / 0 ? b = "1e+400" : (a = m[b], a || (1024 === s && (m = Object.create(null), s = 0), a = "" + b, m[b] = a, s++), b = a);
             return b;
           }
           if ("boolean" === typeof b) {
             return b ? "true" : "false";
           }
-          l(b);
+          c(b);
         }
-        function t(b, a, e) {
+        function l(b, a, e) {
           for (var f = "", c = 0;c < b.length;c++) {
             f += b[c].toSource(a), e && c < b.length - 1 && (f += e);
           }
           return f;
         }
-        var l = d.Debug.assertUnreachable, c = 0, h = Object.create(null), p = 0, s = Object.create(null), m = {"||":3, "&&":4, "|":5, "^":6, "&":7, "==":8, "!=":8, "===":8, "!==":8, is:8, isnt:8, "<":9, ">":9, "<=":9, ">=":9, "in":9, "instanceof":9, "<<":10, ">>":10, ">>>":10, "+":11, "-":11, "*":12, "%":12, "/":12}, g = function() {
+        var c = d.Debug.assertUnreachable, h = 0, p = Object.create(null);
+        a.escapeString = t;
+        var s = 0, m = Object.create(null), g = {"||":3, "&&":4, "|":5, "^":6, "&":7, "==":8, "!=":8, "===":8, "!==":8, is:8, isnt:8, "<":9, ">":9, "<=":9, ">=":9, "in":9, "instanceof":9, "<<":10, ">>":10, ">>>":10, "+":11, "-":11, "*":12, "%":12, "/":12}, f = function() {
           function b() {
             this.type = "Node";
           }
           b.prototype.toSource = function(b) {
-            l("toSource called on abstract base class Node with type " + this.type);
+            c("toSource called on abstract base class Node with type " + this.type);
             return "";
           };
           return b;
         }();
-        a.Node = g;
-        var f = function(b) {
+        a.Node = f;
+        var b = function(b) {
           function a() {
             b.apply(this, arguments);
             this.type = "Statement";
           }
           __extends(a, b);
           return a;
-        }(g);
-        a.Statement = f;
-        var b = function(b) {
+        }(f);
+        a.Statement = b;
+        var e = function(b) {
           function a() {
             b.apply(this, arguments);
             this.type = "Expression";
           }
           __extends(a, b);
           return a;
-        }(g);
-        a.Expression = b;
-        var e = function(b) {
+        }(f);
+        a.Expression = e;
+        var n = function(b) {
           function a(e) {
             b.call(this);
             this.body = e;
@@ -19466,18 +20048,18 @@
           }
           __extends(a, b);
           return a;
-        }(g);
-        a.Program = e;
-        e = function(b) {
+        }(f);
+        a.Program = n;
+        n = function(b) {
           function a() {
             b.apply(this, arguments);
             this.type = "EmptyStatement";
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.EmptyStatement = e;
-        e = function(b) {
+        }(b);
+        a.EmptyStatement = n;
+        n = function(b) {
           function a(e) {
             b.call(this);
             this.body = e;
@@ -19485,12 +20067,12 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return "{\n" + t(this.body, b) + "}";
+            return "{\n" + l(this.body, b) + "}";
           };
           return a;
-        }(f);
-        a.BlockStatement = e;
-        e = function(b) {
+        }(b);
+        a.BlockStatement = n;
+        n = function(b) {
           function a(e) {
             b.call(this);
             this.expression = e;
@@ -19501,9 +20083,9 @@
             return this.expression.toSource(0) + ";\n";
           };
           return a;
-        }(f);
-        a.ExpressionStatement = e;
-        e = function(b) {
+        }(b);
+        a.ExpressionStatement = n;
+        n = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.test = e;
@@ -19518,9 +20100,9 @@
             return b;
           };
           return a;
-        }(f);
-        a.IfStatement = e;
-        e = function(b) {
+        }(b);
+        a.IfStatement = n;
+        n = function(b) {
           function a(e, f) {
             b.call(this);
             this.label = e;
@@ -19529,9 +20111,9 @@
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.LabeledStatement = e;
-        e = function(b) {
+        }(b);
+        a.LabeledStatement = n;
+        n = function(b) {
           function a(e) {
             b.call(this);
             this.label = e;
@@ -19544,9 +20126,9 @@
             return b + ";";
           };
           return a;
-        }(f);
-        a.BreakStatement = e;
-        e = function(b) {
+        }(b);
+        a.BreakStatement = n;
+        n = function(b) {
           function a(e) {
             b.call(this);
             this.label = e;
@@ -19559,9 +20141,9 @@
             return b + ";";
           };
           return a;
-        }(f);
-        a.ContinueStatement = e;
-        e = function(b) {
+        }(b);
+        a.ContinueStatement = n;
+        n = function(b) {
           function a(e, f) {
             b.call(this);
             this.object = e;
@@ -19570,9 +20152,9 @@
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.WithStatement = e;
-        e = function(b) {
+        }(b);
+        a.WithStatement = n;
+        n = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.discriminant = e;
@@ -19582,12 +20164,12 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return "switch(" + this.discriminant.toSource(0) + "){" + t(this.cases, 0, ";") + "};";
+            return "switch(" + this.discriminant.toSource(0) + "){" + l(this.cases, 0, ";") + "};";
           };
           return a;
-        }(f);
-        a.SwitchStatement = e;
-        e = function(b) {
+        }(b);
+        a.SwitchStatement = n;
+        n = function(b) {
           function a(e) {
             b.call(this);
             this.argument = e;
@@ -19600,9 +20182,9 @@
             return b + ";\n";
           };
           return a;
-        }(f);
-        a.ReturnStatement = e;
-        e = function(b) {
+        }(b);
+        a.ReturnStatement = n;
+        n = function(b) {
           function a(e) {
             b.call(this);
             this.argument = e;
@@ -19613,9 +20195,9 @@
             return "throw " + this.argument.toSource(0) + ";\n";
           };
           return a;
-        }(f);
-        a.ThrowStatement = e;
-        e = function(b) {
+        }(b);
+        a.ThrowStatement = n;
+        n = function(b) {
           function a(e, f, c, g) {
             b.call(this);
             this.block = e;
@@ -19626,9 +20208,9 @@
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.TryStatement = e;
-        e = function(b) {
+        }(b);
+        a.TryStatement = n;
+        n = function(b) {
           function a(e, f) {
             b.call(this);
             this.test = e;
@@ -19640,9 +20222,9 @@
             return "while(" + this.test.toSource(0) + "){" + this.body.toSource(0) + "}";
           };
           return a;
-        }(f);
-        a.WhileStatement = e;
-        e = function(b) {
+        }(b);
+        a.WhileStatement = n;
+        n = function(b) {
           function a(e, f) {
             b.call(this);
             this.body = e;
@@ -19651,9 +20233,9 @@
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.DoWhileStatement = e;
-        e = function(b) {
+        }(b);
+        a.DoWhileStatement = n;
+        n = function(b) {
           function a(e, f, c, g) {
             b.call(this);
             this.init = e;
@@ -19664,9 +20246,9 @@
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.ForStatement = e;
-        e = function(b) {
+        }(b);
+        a.ForStatement = n;
+        n = function(b) {
           function a(e, f, c, g) {
             b.call(this);
             this.left = e;
@@ -19677,43 +20259,43 @@
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.ForInStatement = e;
-        e = function(b) {
+        }(b);
+        a.ForInStatement = n;
+        n = function(b) {
           function a() {
             b.apply(this, arguments);
             this.type = "DebuggerStatement";
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.DebuggerStatement = e;
-        f = function(b) {
+        }(b);
+        a.DebuggerStatement = n;
+        b = function(b) {
           function a() {
             b.apply(this, arguments);
             this.type = "Declaration";
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.Declaration = f;
-        e = function(b) {
-          function a(e, f, c, g, q, h, m) {
+        }(b);
+        a.Declaration = b;
+        n = function(b) {
+          function a(e, f, c, g, n, h, r) {
             b.call(this);
             this.id = e;
             this.params = f;
             this.defaults = c;
             this.rest = g;
-            this.body = q;
+            this.body = n;
             this.generator = h;
-            this.expression = m;
+            this.expression = r;
             this.type = "FunctionDeclaration";
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.FunctionDeclaration = e;
-        f = function(b) {
+        }(b);
+        a.FunctionDeclaration = n;
+        b = function(b) {
           function a(e, f) {
             b.call(this);
             this.declarations = e;
@@ -19722,12 +20304,12 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return this.kind + " " + t(this.declarations, b, ",") + ";\n";
+            return this.kind + " " + l(this.declarations, b, ",") + ";\n";
           };
           return a;
-        }(f);
-        a.VariableDeclaration = f;
-        f = function(b) {
+        }(b);
+        a.VariableDeclaration = b;
+        b = function(b) {
           function a(e, f) {
             b.call(this);
             this.id = e;
@@ -19741,9 +20323,9 @@
             return b;
           };
           return a;
-        }(g);
-        a.VariableDeclarator = f;
-        f = function(b) {
+        }(f);
+        a.VariableDeclarator = b;
+        b = function(b) {
           function a(e) {
             b.call(this);
             this.name = e;
@@ -19754,9 +20336,9 @@
             return this.name;
           };
           return a;
-        }(b);
-        a.Identifier = f;
-        var q = function(b) {
+        }(e);
+        a.Identifier = b;
+        var r = function(b) {
           function a(e) {
             b.call(this);
             this.value = e;
@@ -19767,9 +20349,9 @@
             return u(this.value);
           };
           return a;
-        }(b);
-        a.Literal = q;
-        f = function(b) {
+        }(e);
+        a.Literal = r;
+        b = function(b) {
           function a() {
             b.apply(this, arguments);
             this.type = "ThisExpression";
@@ -19779,9 +20361,9 @@
             return "this";
           };
           return a;
-        }(b);
-        a.ThisExpression = f;
-        f = function(b) {
+        }(e);
+        a.ThisExpression = b;
+        b = function(b) {
           function a(e) {
             b.call(this);
             this.elements = e;
@@ -19789,12 +20371,12 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return "[" + t(this.elements, 1, ",") + "]";
+            return "[" + l(this.elements, 1, ",") + "]";
           };
           return a;
-        }(b);
-        a.ArrayExpression = f;
-        f = function(b) {
+        }(e);
+        a.ArrayExpression = b;
+        b = function(b) {
           function a(e) {
             b.call(this);
             this.properties = e;
@@ -19802,28 +20384,28 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return "{" + t(this.properties, 0, ",") + "}";
+            return "{" + l(this.properties, 0, ",") + "}";
           };
           return a;
-        }(b);
-        a.ObjectExpression = f;
-        f = function(b) {
-          function a(e, f, c, g, q, h, m) {
+        }(e);
+        a.ObjectExpression = b;
+        b = function(b) {
+          function a(e, f, c, g, n, h, r) {
             b.call(this);
             this.id = e;
             this.params = f;
             this.defaults = c;
             this.rest = g;
-            this.body = q;
+            this.body = n;
             this.generator = h;
-            this.expression = m;
+            this.expression = r;
             this.type = "FunctionExpression";
           }
           __extends(a, b);
           return a;
-        }(b);
-        a.FunctionExpression = f;
-        f = function(b) {
+        }(e);
+        a.FunctionExpression = b;
+        b = function(b) {
           function a(e) {
             b.call(this);
             this.expressions = e;
@@ -19831,9 +20413,9 @@
           }
           __extends(a, b);
           return a;
-        }(b);
-        a.SequenceExpression = f;
-        f = function(b) {
+        }(e);
+        a.SequenceExpression = b;
+        b = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.operator = e;
@@ -19847,9 +20429,9 @@
             return 13 < b ? "(" + a + ")" : a;
           };
           return a;
-        }(b);
-        a.UnaryExpression = f;
-        f = function(b) {
+        }(e);
+        a.UnaryExpression = b;
+        b = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.operator = e;
@@ -19859,13 +20441,13 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            var a = m[this.operator], e = this.left.toSource(a) + this.operator + this.right.toSource(a + 1);
+            var a = g[this.operator], e = this.left.toSource(a) + this.operator + this.right.toSource(a + 1);
             return a < b ? "(" + e + ")" : e;
           };
           return a;
-        }(b);
-        a.BinaryExpression = f;
-        e = function(b) {
+        }(e);
+        a.BinaryExpression = b;
+        n = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.operator = e;
@@ -19879,9 +20461,9 @@
             return 1 < b ? "(" + a + ")" : a;
           };
           return a;
-        }(b);
-        a.AssignmentExpression = e;
-        e = function(b) {
+        }(e);
+        a.AssignmentExpression = n;
+        n = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.operator = e;
@@ -19891,18 +20473,18 @@
           }
           __extends(a, b);
           return a;
-        }(b);
-        a.UpdateExpression = e;
-        f = function(b) {
+        }(e);
+        a.UpdateExpression = n;
+        b = function(b) {
           function a(e, f, c) {
             b.call(this, e, f, c);
             this.type = "LogicalExpression";
           }
           __extends(a, b);
           return a;
-        }(f);
-        a.LogicalExpression = f;
-        f = function(b) {
+        }(b);
+        a.LogicalExpression = b;
+        b = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.test = e;
@@ -19915,9 +20497,9 @@
             return this.test.toSource(3) + "?" + this.consequent.toSource(1) + ":" + this.alternate.toSource(1);
           };
           return a;
-        }(b);
-        a.ConditionalExpression = f;
-        f = function(b) {
+        }(e);
+        a.ConditionalExpression = b;
+        b = function(b) {
           function a(e, f) {
             b.call(this);
             this.callee = e;
@@ -19926,12 +20508,12 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return "new " + this.callee.toSource(b) + "(" + t(this.arguments, b, ",") + ")";
+            return "new " + this.callee.toSource(b) + "(" + l(this.arguments, b, ",") + ")";
           };
           return a;
-        }(b);
-        a.NewExpression = f;
-        f = function(b) {
+        }(e);
+        a.NewExpression = b;
+        b = function(b) {
           function a(e, f) {
             b.call(this);
             this.callee = e;
@@ -19940,12 +20522,12 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return this.callee.toSource(b) + "(" + t(this.arguments, b, ",") + ")";
+            return this.callee.toSource(b) + "(" + l(this.arguments, b, ",") + ")";
           };
           return a;
-        }(b);
-        a.CallExpression = f;
-        b = function(b) {
+        }(e);
+        a.CallExpression = b;
+        e = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.object = e;
@@ -19956,14 +20538,14 @@
           __extends(a, b);
           a.prototype.toSource = function(b) {
             var a = this.object.toSource(15);
-            this.object instanceof q && (a = "(" + a + ")");
+            this.object instanceof r && (a = "(" + a + ")");
             var e = this.property.toSource(0), a = this.computed ? a + ("[" + e + "]") : a + ("." + e);
             return 17 < b ? "(" + a + ")" : a;
           };
           return a;
-        }(b);
-        a.MemberExpression = b;
-        b = function(b) {
+        }(e);
+        a.MemberExpression = e;
+        e = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.key = e;
@@ -19976,9 +20558,9 @@
             return this.key.toSource(b) + ":" + this.value.toSource(b);
           };
           return a;
-        }(g);
-        a.Property = b;
-        b = function(b) {
+        }(f);
+        a.Property = e;
+        e = function(b) {
           function a(e, f) {
             b.call(this);
             this.test = e;
@@ -19987,12 +20569,12 @@
           }
           __extends(a, b);
           a.prototype.toSource = function(b) {
-            return(this.test ? "case " + this.test.toSource(b) : "default") + ": " + t(this.consequent, b, ";");
+            return(this.test ? "case " + this.test.toSource(b) : "default") + ": " + l(this.consequent, b, ";");
           };
           return a;
-        }(g);
-        a.SwitchCase = b;
-        g = function(b) {
+        }(f);
+        a.SwitchCase = e;
+        f = function(b) {
           function a(e, f, c) {
             b.call(this);
             this.param = e;
@@ -20002,8 +20584,8 @@
           }
           __extends(a, b);
           return a;
-        }(g);
-        a.CatchClause = g;
+        }(f);
+        a.CatchClause = f;
       })(a.AST || (a.AST = {}));
     })(k.Compiler || (k.Compiler = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -20232,7 +20814,7 @@
   (function(k) {
     (function(a) {
       (function(a) {
-        var v = d.ArrayUtilities.top, u = d.ArrayUtilities.peek, t;
+        var v = d.ArrayUtilities.top, t = d.ArrayUtilities.peek, u;
         (function(a) {
           (function(b) {
             b[b.SEQ = 1] = "SEQ";
@@ -20367,8 +20949,8 @@
               b.call(this, 7);
               this.cases = e;
               for (var f = {}, c = 0, g = e.length;c < g;c++) {
-                for (var h = e[c], d = 0, m = h.labels.length;d < m;d++) {
-                  f[h.labels[d]] = h;
+                for (var h = e[c], m = 0, d = h.labels.length;m < d;m++) {
+                  f[h.labels[m]] = h;
                 }
               }
               this.labelMap = f;
@@ -20458,7 +21040,7 @@
             return a;
           }(c);
           a.Catch = c;
-        })(t = a.Control || (a.Control = {}));
+        })(u = a.Control || (a.Control = {}));
         var l = d.BitSets.BITS_PER_WORD, c = d.BitSets.ADDRESS_BITS_PER_WORD, h = d.BitSets.BIT_INDEX_MASK, p = function(a) {
           function g(f, b) {
             a.call(this, f);
@@ -20469,8 +21051,8 @@
             for (var b = this.blockById, e = this.bits, c = 0, g = e.length;c < g;c++) {
               var h = e[c];
               if (h) {
-                for (var d = 0;d < l;d++) {
-                  h & 1 << d && a(b[c * l + d]);
+                for (var m = 0;m < l;m++) {
+                  h & 1 << m && a(b[c * l + m]);
                 }
               }
             }
@@ -20491,8 +21073,8 @@
             for (var a = this.blockById, b = [], e = this.bits, c = 0, g = e.length;c < g;c++) {
               var h = e[c];
               if (h) {
-                for (var d = 0;d < l;d++) {
-                  h & 1 << d && b.push(a[c * l + d]);
+                for (var m = 0;m < l;m++) {
+                  h & 1 << m && b.push(a[c * l + m]);
                 }
               }
             }
@@ -20500,8 +21082,8 @@
           };
           g.prototype.setBlocks = function(a) {
             for (var b = this.bits, e = 0, g = a.length;e < g;e++) {
-              var n = a[e].id;
-              b[n >> c] |= 1 << (n & h);
+              var r = a[e].id;
+              b[r >> c] |= 1 << (r & h);
             }
           };
           return g;
@@ -20519,17 +21101,17 @@
             };
           };
           a.prototype.normalizeReachableBlocks = function(a) {
-            var f = this.boundBlockSet, b = [], e = {}, c = {}, n = [a];
-            for (c[a.id] = !0;a = v(n);) {
+            var f = this.boundBlockSet, b = [], e = {}, c = {}, h = [a];
+            for (c[a.id] = !0;a = v(h);) {
               if (e[a.id]) {
-                1 === e[a.id] && (e[a.id] = 2, b.push(a)), c[a.id] = !1, n.pop();
+                1 === e[a.id] && (e[a.id] = 2, b.push(a)), c[a.id] = !1, h.pop();
               } else {
                 e[a.id] = 1;
                 c[a.id] = !0;
-                for (var h = a.successors, d = 0, m = h.length;d < m;d++) {
-                  var l = h[d];
-                  c[l.id] && (a.spbacks || (a.spbacks = new f), a.spbacks.set(l.id));
-                  !e[l.id] && n.push(l);
+                for (var m = a.successors, d = 0, l = m.length;d < l;d++) {
+                  var p = m[d];
+                  c[p.id] && (a.spbacks || (a.spbacks = new f), a.spbacks.set(p.id));
+                  !e[p.id] && h.push(p);
                 }
               }
             }
@@ -20541,39 +21123,39 @@
             for (var e = [], c = 0;c < f;c++) {
               e[a[c].id] = c, a[c].dominatees = [];
             }
-            for (var n = !0;n;) {
-              for (n = !1, c = 1;c < f;c++) {
-                var h = a[c].predecessors, d = h.length, m = e[h[0].id];
-                if (!(m in b)) {
-                  for (var l = 1;l < d && !(m = e[h[l].id], m in b);l++) {
+            for (var h = !0;h;) {
+              for (h = !1, c = 1;c < f;c++) {
+                var m = a[c].predecessors, d = m.length, l = e[m[0].id];
+                if (!(l in b)) {
+                  for (var p = 1;p < d && !(l = e[m[p].id], l in b);p++) {
                   }
                 }
-                for (l = 0;l < d;l++) {
-                  var p = e[h[l].id];
-                  if (p !== m && p in b) {
-                    for (;p !== m;) {
-                      for (;p > m;) {
-                        p = b[p];
+                for (p = 0;p < d;p++) {
+                  var s = e[m[p].id];
+                  if (s !== l && s in b) {
+                    for (;s !== l;) {
+                      for (;s > l;) {
+                        s = b[s];
                       }
-                      for (;m > p;) {
-                        m = b[m];
+                      for (;l > s;) {
+                        l = b[l];
                       }
                     }
-                    m = p;
+                    l = s;
                   }
                 }
-                b[c] !== m && (b[c] = m, n = !0);
+                b[c] !== l && (b[c] = l, h = !0);
               }
             }
             a[0].dominator = a[0];
             for (c = 1;c < f;c++) {
-              e = a[c], l = a[b[c]], e.dominator = l, l.dominatees.push(e), e.npredecessors = e.predecessors.length;
+              e = a[c], p = a[b[c]], e.dominator = p, p.dominatees.push(e), e.npredecessors = e.predecessors.length;
             }
             f = [a[0]];
             for (a[0].level || (a[0].level = 0);e = f.shift();) {
               a = e.dominatees;
-              for (l = 0;l < a.length;l++) {
-                a[l].level = e.level + 1;
+              for (p = 0;p < a.length;p++) {
+                a[p].level = e.level + 1;
               }
               f.push.apply(f, a);
             }
@@ -20586,9 +21168,9 @@
             for (e = f.length;b < e;b++) {
               var a = f[b], c = a.predecessors;
               if (2 <= c.length) {
-                for (var n = a.dominator, h = 0, d = c.length;h < d;h++) {
-                  for (var m = c[h];m !== n;) {
-                    m.frontier.set(a.id), m = m.dominator;
+                for (var h = a.dominator, m = 0, d = c.length;m < d;m++) {
+                  for (var l = c[m];l !== h;) {
+                    l.frontier.set(a.id), l = l.dominator;
                   }
                 }
               }
@@ -20600,32 +21182,32 @@
           };
           a.prototype.markLoops = function() {
             function a(b) {
-              var e = 1, f = {}, c = {}, g = [], n = [], h = [], q = b.level + 1;
+              var e = 1, f = {}, c = {}, g = [], n = [], h = [], r = b.level + 1;
               b = [b];
-              for (var d, m;d = v(b);) {
-                if (f[d.id]) {
-                  if (u(n) === d) {
+              for (var m, d;m = v(b);) {
+                if (f[m.id]) {
+                  if (t(n) === m) {
                     n.pop();
                     var l = [];
                     do {
-                      m = g.pop(), c[m.id] = !0, l.push(m);
-                    } while (m !== d);
-                    (1 < l.length || m.spbacks && m.spbacks.get(m.id)) && h.push(l);
+                      d = g.pop(), c[d.id] = !0, l.push(d);
+                    } while (d !== m);
+                    (1 < l.length || d.spbacks && d.spbacks.get(d.id)) && h.push(l);
                   }
                   b.pop();
                 } else {
-                  f[d.id] = e++;
-                  g.push(d);
-                  n.push(d);
-                  m = d.successors;
-                  for (var l = 0, p = m.length;l < p;l++) {
-                    if (d = m[l], !(d.level < q)) {
-                      var s = d.id;
+                  f[m.id] = e++;
+                  g.push(m);
+                  n.push(m);
+                  d = m.successors;
+                  for (var l = 0, p = d.length;l < p;l++) {
+                    if (m = d[l], !(m.level < r)) {
+                      var s = m.id;
                       if (!f[s]) {
-                        b.push(d);
+                        b.push(m);
                       } else {
                         if (!c[s]) {
-                          for (;f[u(n).id] > f[s];) {
+                          for (;f[t(n).id] > f[s];) {
                             n.pop();
                           }
                         }
@@ -20654,9 +21236,9 @@
               for (var e = new b, f = 0, c = a.length;f < c;f++) {
                 var g = a[f], n = g.spbacks;
                 if (n) {
-                  for (var g = g.successors, h = 0, q = g.length;h < q;h++) {
-                    var d = g[h];
-                    n.get(d.id) && e.set(d.dominator.id);
+                  for (var g = g.successors, h = 0, r = g.length;h < r;h++) {
+                    var m = g[h];
+                    n.get(m.id) && e.set(m.dominator.id);
                   }
                 }
               }
@@ -20667,26 +21249,26 @@
             }
             for (var e = e.sort(function(b, a) {
               return b.level - a.level;
-            }), c = 0, n = e.length - 1;0 <= n;n--) {
-              var h = e[n], d = a(h);
+            }), c = 0, h = e.length - 1;0 <= h;h--) {
+              var m = e[h], d = a(m);
               if (0 !== d.length) {
-                for (var m = 0, l = d.length;m < l;m++) {
-                  for (var p = d[m], s = new f(p, c++), k = 0, r = p.length;k < r;k++) {
-                    var t = p[k];
-                    if (t.level === h.level + 1 && !t.loop) {
-                      t.loop = s;
-                      s.head.set(t.id);
-                      for (var B = t.predecessors, E = 0, y = B.length;E < y;E++) {
-                        s.body.get(B[E].id) && t.npredecessors--;
+                for (var l = 0, p = d.length;l < p;l++) {
+                  for (var s = d[l], k = new f(s, c++), q = 0, u = s.length;q < u;q++) {
+                    var B = s[q];
+                    if (B.level === m.level + 1 && !B.loop) {
+                      B.loop = k;
+                      k.head.set(B.id);
+                      for (var y = B.predecessors, L = 0, A = y.length;L < A;L++) {
+                        k.body.get(y[L].id) && B.npredecessors--;
                       }
-                      s.npredecessors += t.npredecessors;
+                      k.npredecessors += B.npredecessors;
                     }
                   }
-                  k = 0;
-                  for (r = p.length;k < r;k++) {
-                    t = p[k], t.level === h.level + 1 && (t.npredecessors = s.npredecessors);
+                  q = 0;
+                  for (u = s.length;q < u;q++) {
+                    B = s[q], B.level === m.level + 1 && (B.npredecessors = k.npredecessors);
                   }
-                  s.head.recount();
+                  k.head.recount();
                 }
               }
             }
@@ -20701,132 +21283,132 @@
               b.save = e;
               return b;
             }
-            function f(n, h, d, m, l, p, s) {
-              for (var k = [];n;) {
-                if (1 < n.count) {
-                  for (var r = new e, u = {}, B = [], E = n.members(), y = 0, z = E.length;y < z;y++) {
-                    var G = E[y], C = G.id, I;
-                    if (G.loop && n.contains(G.loop.head)) {
-                      var P = G.loop;
-                      if (!P.induced) {
-                        for (var T = P.head.members(), O = 0, Q = 0, S = T.length;Q < S;Q++) {
-                          O += n.save[T[Q].id];
+            function f(h, m, d, l, p, s, k) {
+              for (var q = [];h;) {
+                if (1 < h.count) {
+                  for (var t = new e, B = {}, y = [], L = h.members(), A = 0, z = L.length;A < z;A++) {
+                    var G = L[A], I = G.id, D;
+                    if (G.loop && h.contains(G.loop.head)) {
+                      var R = G.loop;
+                      if (!R.induced) {
+                        for (var T = R.head.members(), J = 0, P = 0, S = T.length;P < S;P++) {
+                          J += h.save[T[P].id];
                         }
-                        if (0 < G.npredecessors - O) {
-                          G.npredecessors -= n.save[C], G.save = n.save[C], I = f(G, r, u, m), B.push(new t.LabelCase([C], I));
+                        if (0 < G.npredecessors - J) {
+                          G.npredecessors -= h.save[I], G.save = h.save[I], D = f(G, t, B, l), y.push(new u.LabelCase([I], D));
                         } else {
-                          Q = 0;
-                          for (S = T.length;Q < S;Q++) {
-                            I = T[Q], I.npredecessors -= O, I.save = O;
+                          P = 0;
+                          for (S = T.length;P < S;P++) {
+                            D = T[P], D.npredecessors -= J, D.save = J;
                           }
-                          I = f(G, r, u, m);
-                          B.push(new t.LabelCase(P.head.toArray(), I));
-                          P.induced = !0;
+                          D = f(G, t, B, l);
+                          y.push(new u.LabelCase(R.head.toArray(), D));
+                          R.induced = !0;
                         }
                       }
                     } else {
-                      G.npredecessors -= n.save[C], G.save = n.save[C], I = f(G, r, u, m), B.push(new t.LabelCase([C], I));
+                      G.npredecessors -= h.save[I], G.save = h.save[I], D = f(G, t, B, l), y.push(new u.LabelCase([I], D));
                     }
                   }
-                  for (var G = [], Q = 0, y = 0;y < B.length;y++) {
-                    I = B[y];
-                    z = I.labels;
+                  for (var G = [], P = 0, A = 0;A < y.length;A++) {
+                    D = y[A];
+                    z = D.labels;
                     T = S = 0;
-                    for (P = z.length;T < P;T++) {
-                      C = z[T], r.get(C) && 0 < E[y].npredecessors - n.save[C] ? G.push(C) : z[S++] = C;
+                    for (R = z.length;T < R;T++) {
+                      I = z[T], t.get(I) && 0 < L[A].npredecessors - h.save[I] ? G.push(I) : z[S++] = I;
                     }
                     z.length = S;
-                    0 < z.length && (B[Q++] = I);
+                    0 < z.length && (y[P++] = D);
                   }
-                  B.length = Q;
-                  if (0 === B.length) {
-                    for (y = 0;y < G.length;y++) {
-                      C = G[y], d[C] = (d[C] || 0) + n.save[C], h.set(C);
+                  y.length = P;
+                  if (0 === y.length) {
+                    for (A = 0;A < G.length;A++) {
+                      I = G[A], d[I] = (d[I] || 0) + h.save[I], m.set(I);
                     }
-                    p && k.push(new t.Break(void 0, p));
+                    s && q.push(new u.Break(void 0, s));
                     break;
                   }
-                  k.push(new t.LabelSwitch(B));
-                  n = a(r, u);
+                  q.push(new u.LabelSwitch(y));
+                  h = a(t, B);
                 } else {
-                  1 === n.count ? (G = n.choose(), C = G.id, G.npredecessors -= n.save[C], G.save = n.save[C]) : (G = n, C = G.id);
-                  if (l) {
-                    l = !1;
+                  1 === h.count ? (G = h.choose(), I = G.id, G.npredecessors -= h.save[I], G.save = h.save[I]) : (G = h, I = G.id);
+                  if (p) {
+                    p = !1;
                   } else {
-                    if (m && !m.body.get(C)) {
+                    if (l && !l.body.get(I)) {
                       G.npredecessors += G.save;
-                      m.exit.set(C);
-                      m.save[C] = (m.save[C] || 0) + G.save;
-                      k.push(new t.Break(C, m));
+                      l.exit.set(I);
+                      l.save[I] = (l.save[I] || 0) + G.save;
+                      q.push(new u.Break(I, l));
                       break;
                     }
-                    if (m && G.loop === m) {
+                    if (l && G.loop === l) {
                       G.npredecessors += G.save;
-                      k.push(new t.Continue(C, m));
+                      q.push(new u.Continue(I, l));
                       break;
                     }
-                    if (G === s) {
+                    if (G === k) {
                       break;
                     }
                     if (0 < G.npredecessors) {
                       G.npredecessors += G.save;
-                      d[C] = (d[C] || 0) + G.save;
-                      h.set(C);
-                      k.push(p ? new t.Break(C, p) : new t.Exit(C));
+                      d[I] = (d[I] || 0) + G.save;
+                      m.set(I);
+                      q.push(s ? new u.Break(I, s) : new u.Exit(I));
                       break;
                     }
                     if (G.loop) {
                       var S = G.loop;
                       if (1 === S.head.count) {
-                        r = f(S.head.choose(), null, null, S, !0);
+                        t = f(S.head.choose(), null, null, S, !0);
                       } else {
-                        r = [];
+                        t = [];
                         T = S.head.members();
-                        y = 0;
-                        for (z = T.length;y < z;y++) {
-                          I = T[y], u = I.id, I = f(I, null, null, S, !0), r.push(new t.LabelCase([u], I));
+                        A = 0;
+                        for (z = T.length;A < z;A++) {
+                          D = T[A], B = D.id, D = f(D, null, null, S, !0), t.push(new u.LabelCase([B], D));
                         }
-                        r = new t.LabelSwitch(r);
+                        t = new u.LabelSwitch(t);
                       }
-                      k.push(new t.Loop(r));
-                      n = a(S.exit, S.save);
+                      q.push(new u.Loop(t));
+                      h = a(S.exit, S.save);
                       continue;
                     }
                   }
-                  r = new e;
-                  u = {};
+                  t = new e;
+                  B = {};
                   if (b && G.hasCatches) {
-                    I = G.successors;
-                    B = [];
-                    n = [];
-                    y = 0;
-                    for (z = I.length;y < z;y++) {
-                      E = I[y], (E.exception ? B : n).push(E);
+                    D = G.successors;
+                    y = [];
+                    h = [];
+                    A = 0;
+                    for (z = D.length;A < z;A++) {
+                      L = D[A], (L.exception ? y : h).push(L);
                     }
                     z = [];
-                    for (y = 0;y < B.length;y++) {
-                      E = B[y], E.npredecessors -= 1, E.save = 1, I = f(E, r, u, m), E = E.exception, z.push(new t.Catch(E.varName, E.typeName, I));
+                    for (A = 0;A < y.length;A++) {
+                      L = y[A], L.npredecessors -= 1, L.save = 1, D = f(L, t, B, l), L = L.exception, z.push(new u.Catch(L.varName, L.typeName, D));
                     }
-                    z = new t.Try(G, z);
+                    z = new u.Try(G, z);
                   } else {
-                    n = G.successors, z = G;
+                    h = G.successors, z = G;
                   }
-                  if (2 < n.length) {
-                    B = [];
-                    for (y = n.length - 1;0 <= y;y--) {
-                      E = n[y], E.npredecessors -= 1, E.save = 1, I = f(E, r, u, m, null, G, n[y + 1]), B.unshift(new t.Case(y, I));
-                    }
-                    v(B).index = void 0;
-                    b && G.hasCatches ? (z.nothingThrownLabel = c, z = new t.Switch(z, B, c++)) : z = new t.Switch(z, B);
-                    n = a(r, u);
+                  if (2 < h.length) {
+                    y = [];
+                    for (A = h.length - 1;0 <= A;A--) {
+                      L = h[A], L.npredecessors -= 1, L.save = 1, D = f(L, t, B, l, null, G, h[A + 1]), y.unshift(new u.Case(A, D));
+                    }
+                    v(y).index = void 0;
+                    b && G.hasCatches ? (z.nothingThrownLabel = c, z = new u.Switch(z, y, c++)) : z = new u.Switch(z, y);
+                    h = a(t, B);
                   } else {
-                    2 === n.length ? (y = G.hasFlippedSuccessors ? n[1] : n[0], I = G.hasFlippedSuccessors ? n[0] : n[1], y.npredecessors -= 1, y.save = 1, y = f(y, r, u, m), I.npredecessors -= 1, I.save = 1, I = f(I, r, u, m), b && G.hasCatches ? (z.nothingThrownLabel = c, z = new t.If(z, y, I, c++)) : z = new t.If(z, y, I), n = a(r, u)) : (I = n[0]) ? b && G.hasCatches ? (z.nothingThrownLabel = I.id, u[I.id] = (u[I.id] || 0) + 1, r.set(I.id), n = a(r, u)) : (I.npredecessors -= 1, I.save = 1, n = 
-                    I) : b && G.hasCatches ? (z.nothingThrownLabel = -1, n = a(r, u)) : n = I;
+                    2 === h.length ? (A = G.hasFlippedSuccessors ? h[1] : h[0], D = G.hasFlippedSuccessors ? h[0] : h[1], A.npredecessors -= 1, A.save = 1, A = f(A, t, B, l), D.npredecessors -= 1, D.save = 1, D = f(D, t, B, l), b && G.hasCatches ? (z.nothingThrownLabel = c, z = new u.If(z, A, D, c++)) : z = new u.If(z, A, D), h = a(t, B)) : (D = h[0]) ? b && G.hasCatches ? (z.nothingThrownLabel = D.id, B[D.id] = (B[D.id] || 0) + 1, t.set(D.id), h = a(t, B)) : (D.npredecessors -= 1, D.save = 1, h = 
+                    D) : b && G.hasCatches ? (z.nothingThrownLabel = -1, h = a(t, B)) : h = D;
                   }
-                  k.push(z);
+                  q.push(z);
                 }
               }
-              return 1 < k.length ? new t.Seq(k) : k[0];
+              return 1 < q.length ? new u.Seq(q) : q[0];
             }
             var b = this.hasExceptions, e = this.boundBlockSet, c = this.blocks.length;
             this.controlTree = f(this.blocks[0], new e, {});
@@ -20856,38 +21438,38 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
+      (function(q) {
         function v(b, a) {
           if ("string" === typeof b || null === b || !0 === b || !1 === b) {
-            return new A(b);
+            return new C(b);
           }
           if (void 0 === b) {
-            return new H("undefined");
+            return new F("undefined");
           }
           if ("object" === typeof b || "function" === typeof b) {
-            return b instanceof d.AVM2.Runtime.LazyInitializer ? h(l(X, "C"), [new A(a.useConstant(b))]) : new J(ia, new A(a.useConstant(b)), !0);
+            return b instanceof d.AVM2.Runtime.LazyInitializer ? h(l(ga, "C"), [new C(a.useConstant(b))]) : new Q(ha, new C(a.useConstant(b)), !0);
           }
           if ("number" === typeof b && isNaN(b)) {
-            return new H("NaN");
+            return new F("NaN");
           }
           if (Infinity === b) {
-            return new H("Infinity");
+            return new F("Infinity");
           }
           if (-Infinity === b) {
-            return new I("-", !0, new H("Infinity"));
+            return new D("-", !0, new F("Infinity"));
           }
           if ("number" === typeof b && 0 > 1 / b) {
-            return new I("-", !0, new A(Math.abs(b)));
+            return new D("-", !0, new C(Math.abs(b)));
           }
           if ("number" === typeof b) {
-            return new A(b);
+            return new C(b);
           }
-          q("Cannot emit constant for value: " + b);
-        }
-        function u(b) {
-          return new H(b);
+          n("Cannot emit constant for value: " + b);
         }
         function t(b) {
+          return new F(b);
+        }
+        function u(b) {
           var a = b[0];
           if (!("$" === a || "_" === a || "\\" === a || "a" <= a && "z" >= a || "A" <= a && "Z" >= a)) {
             return!1;
@@ -20901,13 +21483,13 @@
           return!0;
         }
         function l(b, a) {
-          return t(a) ? new J(b, new H(a), !1) : new J(b, new A(a), !0);
+          return u(a) ? new Q(b, new F(a), !1) : new Q(b, new C(a), !0);
         }
         function c(b, a) {
-          return t(a.value) ? new J(b, new H(a.value), !1) : new J(b, a, !0);
+          return u(a.value) ? new Q(b, new F(a.value), !1) : new Q(b, a, !0);
         }
         function h(b, a) {
-          return new D(b, a);
+          return new B(b, a);
         }
         function p(b, a, e) {
           return h(l(b, "asCall"), [a].concat(e));
@@ -20916,13 +21498,13 @@
           return h(l(b, "call"), [a].concat(e));
         }
         function m(b, a) {
-          return new B("=", b, a);
+          return new y("=", b, a);
         }
         function g(b) {
           return new K(b, "var");
         }
         function f(b, a, e) {
-          return e || !b.variable ? b.compile(a) : u(b.variable.name);
+          return e || !b.variable ? b.compile(a) : t(b.variable.name);
         }
         function b(b, a) {
           return[f(b.namespaces, a), f(b.name, a), f(b.flags, a)];
@@ -20932,39 +21514,39 @@
             return f(b, a);
           });
         }
-        var q = d.Debug.unexpected, n = d.Debug.notImplemented, x = d.ArrayUtilities.pushUnique, L = d.AVM2.Compiler.AST, A = L.Literal, H = L.Identifier, K = L.VariableDeclaration, F = L.VariableDeclarator, J = L.MemberExpression, M = L.BinaryExpression, D = L.CallExpression, B = L.AssignmentExpression, E = L.ExpressionStatement, y = L.ReturnStatement, z = L.ConditionalExpression, G = L.ObjectExpression, C = L.ArrayExpression, I = L.UnaryExpression, P = L.NewExpression, T = L.Property, O = L.BlockStatement, 
-        Q = L.ThisExpression, S = L.ThrowStatement, V = L.IfStatement, aa = L.WhileStatement, $ = L.BreakStatement, w = L.ContinueStatement, U = L.SwitchStatement, ba = L.SwitchCase, R = a.IR.Variable, N = a.IR.Constant, Z = a.IR.Operator, L = d.AVM2.Compiler.Looper.Control, fa = d.ArrayUtilities.last;
-        L.Break.prototype.compile = function(b) {
+        var n = d.Debug.unexpected, r = d.Debug.notImplemented, x = d.ArrayUtilities.pushUnique, H = d.AVM2.Compiler.AST, C = H.Literal, F = H.Identifier, K = H.VariableDeclaration, E = H.VariableDeclarator, Q = H.MemberExpression, N = H.BinaryExpression, B = H.CallExpression, y = H.AssignmentExpression, L = H.ExpressionStatement, A = H.ReturnStatement, z = H.ConditionalExpression, G = H.ObjectExpression, I = H.ArrayExpression, D = H.UnaryExpression, R = H.NewExpression, T = H.Property, J = H.BlockStatement, 
+        P = H.ThisExpression, S = H.ThrowStatement, W = H.IfStatement, ba = H.WhileStatement, w = H.BreakStatement, X = H.ContinueStatement, U = H.SwitchStatement, $ = H.SwitchCase, Y = a.IR.Variable, M = a.IR.Constant, Z = a.IR.Operator, H = d.AVM2.Compiler.Looper.Control, ca = d.ArrayUtilities.last;
+        H.Break.prototype.compile = function(b) {
           return b.compileBreak(this);
         };
-        L.Continue.prototype.compile = function(b) {
+        H.Continue.prototype.compile = function(b) {
           return b.compileContinue(this);
         };
-        L.Exit.prototype.compile = function(b) {
+        H.Exit.prototype.compile = function(b) {
           return b.compileExit(this);
         };
-        L.LabelSwitch.prototype.compile = function(b) {
+        H.LabelSwitch.prototype.compile = function(b) {
           return b.compileLabelSwitch(this);
         };
-        L.Seq.prototype.compile = function(b) {
+        H.Seq.prototype.compile = function(b) {
           return b.compileSequence(this);
         };
-        L.Loop.prototype.compile = function(b) {
+        H.Loop.prototype.compile = function(b) {
           return b.compileLoop(this);
         };
-        L.Switch.prototype.compile = function(b) {
+        H.Switch.prototype.compile = function(b) {
           return b.compileSwitch(this);
         };
-        L.If.prototype.compile = function(b) {
+        H.If.prototype.compile = function(b) {
           return b.compileIf(this);
         };
-        L.Try.prototype.compile = function(b) {
-          n("try");
+        H.Try.prototype.compile = function(b) {
+          r("try");
           return null;
         };
-        var X = new H("$F"), ia = new H("$C"), ga = function() {
+        var ga = new F("$F"), ha = new F("$C"), ea = function() {
           function b() {
-            this.label = new R("$L");
+            this.label = new Y("$L");
             this.variables = [];
             this.constants = [];
             this.lazyConstants = [];
@@ -20982,21 +21564,21 @@
           };
           b.prototype.compileLabelBody = function(b) {
             var a = [];
-            void 0 !== b.label && (this.useVariable(this.label), a.push(new E(m(u(this.label.name), new A(b.label)))));
+            void 0 !== b.label && (this.useVariable(this.label), a.push(new L(m(t(this.label.name), new C(b.label)))));
             return a;
           };
           b.prototype.compileBreak = function(b) {
             b = this.compileLabelBody(b);
-            b.push(new $(null));
-            return new O(b);
+            b.push(new w(null));
+            return new J(b);
           };
           b.prototype.compileContinue = function(b) {
             b = this.compileLabelBody(b);
-            b.push(new w(null));
-            return new O(b);
+            b.push(new X(null));
+            return new J(b);
           };
           b.prototype.compileExit = function(b) {
-            return new O(this.compileLabelBody(b));
+            return new J(this.compileLabelBody(b));
           };
           b.prototype.compileIf = function(b) {
             var a = b.cond.compile(this), e = null, c = null;
@@ -21006,24 +21588,24 @@
             if (b.negated) {
               a: {
                 b = g;
-                if (b instanceof N) {
+                if (b instanceof M) {
                   if (!0 === b.value || !1 === b.value) {
                     b = v(!b.value);
                     break a;
                   }
                 } else {
-                  if (b instanceof H) {
-                    b = new I(Z.FALSE.name, !0, b);
+                  if (b instanceof F) {
+                    b = new D(Z.FALSE.name, !0, b);
                     break a;
                   }
                 }
-                var g = b instanceof M ? b.left : b.argument, n = b.right, h = Z.fromName(b.operator);
-                b = h === Z.EQ && n instanceof A && !1 === n.value || h === Z.FALSE ? g : h.not ? b instanceof M ? new M(h.not.name, g, n) : new I(h.not.name, !0, g) : new I(Z.FALSE.name, !0, b);
+                var g = b instanceof N ? b.left : b.argument, n = b.right, h = Z.fromName(b.operator);
+                b = h === Z.EQ && n instanceof C && !1 === n.value || h === Z.FALSE ? g : h.not ? b instanceof N ? new N(h.not.name, g, n) : new D(h.not.name, !0, g) : new D(Z.FALSE.name, !0, b);
               }
             } else {
               b = g;
             }
-            a.body.push(new V(b, e || new O([]), c || null));
+            a.body.push(new W(b, e || new J([]), c || null));
             return a;
           };
           b.prototype.compileSwitch = function(b) {
@@ -21031,58 +21613,58 @@
             b.cases.forEach(function(b) {
               var a;
               b.body && (a = b.body.compile(this));
-              b = "number" === typeof b.index ? new A(b.index) : void 0;
-              e.push(new ba(b, a ? [a] : []));
+              b = "number" === typeof b.index ? new C(b.index) : void 0;
+              e.push(new $(b, a ? [a] : []));
             }, this);
             b = f(a.end.determinant, this);
             a.body.push(new U(b, e, !1));
             return a;
           };
           b.prototype.compileLabelSwitch = function(b) {
-            for (var a = null, e = u(this.label.name), f = b.cases.length - 1;0 <= f;f--) {
-              for (var c = b.cases[f], g = c.labels, n = new M("===", e, new A(g[0])), h = 1;h < g.length;h++) {
-                n = new M("||", n, new M("===", e, new A(g[h])));
+            for (var a = null, e = t(this.label.name), f = b.cases.length - 1;0 <= f;f--) {
+              for (var c = b.cases[f], g = c.labels, n = new N("===", e, new C(g[0])), h = 1;h < g.length;h++) {
+                n = new N("||", n, new N("===", e, new C(g[h])));
               }
-              a = new V(n, c.body ? c.body.compile(this) : new O([]), a);
+              a = new W(n, c.body ? c.body.compile(this) : new J([]), a);
             }
             return a;
           };
           b.prototype.compileLoop = function(b) {
             b = b.body.compile(this);
-            return new aa(v(!0), b);
+            return new ba(v(!0), b);
           };
           b.prototype.compileSequence = function(b) {
             var a = this, e = [];
             b.body.forEach(function(b) {
               b = b.compile(a);
-              b instanceof O ? e = e.concat(b.body) : e.push(b);
+              b instanceof J ? e = e.concat(b.body) : e.push(b);
             });
-            return new O(e);
+            return new J(e);
           };
           b.prototype.compileBlock = function(b) {
             for (var e = [], c = 1;c < b.nodes.length - 1;c++) {
               var g = b.nodes[c], n;
-              g instanceof a.IR.Throw ? n = f(g, this, !0) : (g instanceof a.IR.Move ? (n = u(g.to.name), this.useVariable(g.to), g = f(g.from, this)) : (g.variable ? (n = u(g.variable.name), this.useVariable(g.variable)) : n = null, g = f(g, this, !0)), n = n ? new E(m(n, g)) : new E(g));
+              g instanceof a.IR.Throw ? n = f(g, this, !0) : (g instanceof a.IR.Move ? (n = t(g.to.name), this.useVariable(g.to), g = f(g.from, this)) : (g.variable ? (n = t(g.variable.name), this.useVariable(g.variable)) : n = null, g = f(g, this, !0)), n = n ? new L(m(n, g)) : new L(g));
               e.push(n);
             }
-            c = fa(b.nodes);
-            c instanceof a.IR.Stop && e.push(new y(f(c.argument, this)));
-            e = new O(e);
-            e.end = fa(b.nodes);
+            c = ca(b.nodes);
+            c instanceof a.IR.Stop && e.push(new A(f(c.argument, this)));
+            e = new J(e);
+            e.end = ca(b.nodes);
             return e;
           };
           return b;
         }();
-        r.Context = ga;
+        q.Context = ea;
         a.IR.Parameter.prototype.compile = function(b) {
           b.useParameter(this);
-          return u(this.name);
+          return t(this.name);
         };
         a.IR.Constant.prototype.compile = function(b) {
           return v(this.value, b);
         };
         a.IR.Variable.prototype.compile = function(b) {
-          return u(this.name);
+          return t(this.name);
         };
         a.IR.Phi.prototype.compile = function(b) {
           return f(this.variable, b);
@@ -21090,13 +21672,13 @@
         a.IR.ASScope.prototype.compile = function(b) {
           var a = f(this.parent, b);
           b = f(this.object, b);
-          var e = new A(this.isWith);
-          return new P(u("Scope"), [a, b, e]);
+          var e = new C(this.isWith);
+          return new R(t("Scope"), [a, b, e]);
         };
         a.IR.ASFindProperty.prototype.compile = function(a) {
           var e = f(this.scope, a), c = b(this.name, a);
           a = f(this.methodInfo, a);
-          var g = new A(this.strict);
+          var g = new C(this.strict);
           return h(l(e, "findScopeProperty"), c.concat([a, g]));
         };
         a.IR.ASGetProperty.prototype.compile = function(a) {
@@ -21108,7 +21690,7 @@
             return h(l(e, "asGetResolvedStringProperty"), [f(this.name, a)]);
           }
           a = b(this.name, a);
-          var c = new A(this.flags & 8);
+          var c = new C(this.flags & 8);
           return h(l(e, "asGetProperty"), a.concat(c));
         };
         a.IR.ASGetSuper.prototype.compile = function(a) {
@@ -21120,7 +21702,7 @@
           return new z(f(this.condition, b), f(this.left, b), f(this.right, b));
         };
         a.IR.Unary.prototype.compile = function(b) {
-          return new I(this.operator.name, !0, f(this.argument, b));
+          return new D(this.operator.name, !0, f(this.argument, b));
         };
         a.IR.Copy.prototype.compile = function(b) {
           return f(this.argument, b);
@@ -21128,7 +21710,7 @@
         a.IR.Binary.prototype.compile = function(b) {
           var e = f(this.left, b);
           b = f(this.right, b);
-          return this.operator === a.IR.Operator.AS_ADD ? h(u("asAdd"), [e, b]) : new M(this.operator.name, e, b);
+          return this.operator === a.IR.Operator.AS_ADD ? h(t("asAdd"), [e, b]) : new N(this.operator.name, e, b);
         };
         a.IR.CallProperty.prototype.compile = function(b) {
           var a = f(this.object, b), e = f(this.name, b), e = c(a, e), g = this.args.map(function(a) {
@@ -21141,39 +21723,39 @@
             return f(b, a);
           });
           if (this.flags & 2) {
-            return h(l(e, "asCallResolvedStringProperty"), [f(this.name, a), new A(this.isLex), new C(c)]);
+            return h(l(e, "asCallResolvedStringProperty"), [f(this.name, a), new C(this.isLex), new I(c)]);
           }
           var g = b(this.name, a);
-          return h(l(e, "asCallProperty"), g.concat([new A(this.isLex), new C(c)]));
+          return h(l(e, "asCallProperty"), g.concat([new C(this.isLex), new I(c)]));
         };
         a.IR.ASCallSuper.prototype.compile = function(a) {
           var e = f(this.scope, a), c = f(this.object, a), g = this.args.map(function(b) {
             return f(b, a);
           }), n = b(this.name, a);
-          return h(l(c, "asCallSuper"), [e].concat(n).concat(new C(g)));
+          return h(l(c, "asCallSuper"), [e].concat(n).concat(new I(g)));
         };
         a.IR.Call.prototype.compile = function(b) {
           var a = this.args.map(function(a) {
             return f(a, b);
           }), e = f(this.callee, b), c;
-          c = this.object ? f(this.object, b) : new A(null);
+          c = this.object ? f(this.object, b) : new C(null);
           return this.flags & 16 ? p(e, c, a) : null === this.object ? h(e, a) : s(e, c, a);
         };
         a.IR.ASNew.prototype.compile = function(b) {
           var a = this.args.map(function(a) {
             return f(a, b);
           }), e = f(this.callee, b), e = l(e, "instanceConstructor");
-          return new P(e, a);
+          return new R(e, a);
         };
         a.IR.This.prototype.compile = function(b) {
-          return new Q;
+          return new P;
         };
         a.IR.Throw.prototype.compile = function(b) {
           b = f(this.argument, b);
           return new S(b);
         };
         a.IR.Arguments.prototype.compile = function(b) {
-          return u("arguments");
+          return t("arguments");
         };
         a.IR.ASGlobal.prototype.compile = function(b) {
           b = f(this.scope, b);
@@ -21203,7 +21785,7 @@
           return h(l(e, "asHasProperty"), a);
         };
         a.IR.GlobalProperty.prototype.compile = function(b) {
-          return u(this.name);
+          return t(this.name);
         };
         a.IR.GetProperty.prototype.compile = function(b) {
           var a = f(this.object, b);
@@ -21218,23 +21800,23 @@
         a.IR.ASGetDescendants.prototype.compile = function(b) {
           var a = f(this.object, b);
           b = f(this.name, b);
-          return h(u("getDescendants"), [a, b]);
+          return h(t("getDescendants"), [a, b]);
         };
         a.IR.ASSetSlot.prototype.compile = function(b) {
           var a = f(this.object, b), e = f(this.name, b);
           b = f(this.value, b);
-          return h(u("asSetSlot"), [a, e, b]);
+          return h(t("asSetSlot"), [a, e, b]);
         };
         a.IR.ASGetSlot.prototype.compile = function(b) {
           var a = f(this.object, b);
           b = f(this.name, b);
-          return h(u("asGetSlot"), [a, b]);
+          return h(t("asGetSlot"), [a, b]);
         };
         a.IR.Projection.prototype.compile = function(b) {
           return f(this.argument.scope, b);
         };
         a.IR.NewArray.prototype.compile = function(b) {
-          return new C(e(this.elements, b));
+          return new I(e(this.elements, b));
         };
         a.IR.NewObject.prototype.compile = function(b) {
           var a = this.properties.map(function(a) {
@@ -21246,20 +21828,20 @@
         };
         a.IR.ASNewActivation.prototype.compile = function(b) {
           b = f(this.methodInfo, b);
-          return h(u("asCreateActivation"), [b]);
+          return h(t("asCreateActivation"), [b]);
         };
         a.IR.ASNewHasNext2.prototype.compile = function(b) {
-          return new P(u("HasNext2Info"), []);
+          return new R(t("HasNext2Info"), []);
         };
         a.IR.ASMultiname.prototype.compile = function(b) {
           var a = f(this.namespaces, b), e = f(this.name, b);
           b = f(this.flags, b);
-          return h(u("createName"), [a, e, b]);
+          return h(t("createName"), [a, e, b]);
         };
         a.IR.Block.prototype.compile = function(b) {
           return b.compileBlock(this);
         };
-        var ca = function() {
+        var aa = function() {
           function b(a, e, f, c) {
             this.parameters = a;
             this.body = e;
@@ -21274,56 +21856,1134 @@
           b.id = 0;
           return b;
         }();
-        r.Compilation = ca;
-        r.generate = function(b) {
+        q.Compilation = aa;
+        q.generate = function(b) {
           k.enterTimeline("Looper");
           var e = a.Looper.analyze(b);
           k.leaveTimeline();
           new d.IndentingWriter;
-          b = new ga;
+          b = new ea;
           k.enterTimeline("Construct AST");
           var f = e.compile(b);
           k.leaveTimeline();
           for (var e = [], c = 0;c < b.parameters.length;c++) {
-            e.push(u(b.parameters[c] ? b.parameters[c].name : "_" + c));
+            e.push(t(b.parameters[c] ? b.parameters[c].name : "_" + c));
           }
-          c = "$$F" + ca.id++;
+          c = "$$F" + aa.id++;
           if (b.constants.length) {
-            var n = new H(c), h = new J(n, new H("constants"), !1);
-            f.body.unshift(g([new F(u("$F"), n), new F(u("$C"), h)]));
+            var n = new F(c), h = new Q(n, new F("constants"), !1);
+            f.body.unshift(g([new E(t("$F"), n), new E(t("$C"), h)]));
+          }
+          b.variables.length && (k.countTimeline("Backend: Locals", b.variables.length), n = g(b.variables.map(function(b) {
+            return new E(t(b.name));
+          })), f.body.unshift(n));
+          k.enterTimeline("Serialize AST");
+          f = f.toSource();
+          k.leaveTimeline();
+          return jsGlobal[c] = new aa(e.map(function(b) {
+            return b.name;
+          }), f, b.constants, b.lazyConstants);
+        };
+      })(a.Backend || (a.Backend = {}));
+    })(k.Compiler || (k.Compiler = {}));
+  })(d.AVM2 || (d.AVM2 = {}));
+})(Shumway || (Shumway = {}));
+(function(d) {
+  (function(k) {
+    (function(a) {
+      function q(a) {
+        return "string" === typeof a ? b(a) : String(a);
+      }
+      function v(b, a) {
+        if (!a) {
+          return b;
+        }
+        switch(g.getQualifiedName(a)) {
+          case g.Int:
+            return b + "|0";
+          case g.Uint:
+            return b + " >>> 0";
+          case g.String:
+            return "asCoerceString(" + b + ")";
+          case g.Number:
+            return "+" + b;
+          case g.Boolean:
+            return "!!" + b;
+          case g.Object:
+            return "asCoerceObject(" + b + ")";
+          default:
+            return b;
+        }
+      }
+      function t(b, a, f, c) {
+        var g = Relooper.r;
+        Relooper.r = 0;
+        b = new F(b, a, f, c);
+        try {
+          var n = b.compile();
+        } catch (h) {
+          Relooper.cleanup(), x++, e && e.errorLn("Error: " + h);
+        }
+        Relooper.r = g;
+        return n;
+      }
+      function u(b) {
+        return d.StringUtilities.variableLengthEncodeInt32(b.abc.hash) + "_" + b.index;
+      }
+      function l(b) {
+        return d.StringUtilities.variableLengthEncodeInt32(b.abc.hash) + "_" + g.getQualifiedName(b.instanceInfo.name);
+      }
+      function c(b, a) {
+        for (var e = 0;e < a.length;e++) {
+          var f = a[e];
+          if (f.isConst() || f.isSlot()) {
+            var c = f.hasDefaultValue ? q(f.value) : s.getDefaultValue(f.typeName);
+            b.writeLn("this." + g.getQualifiedName(f.name) + " = " + c + ";");
+          }
+        }
+      }
+      function h(b, a, e) {
+        for (var f = 0;f < e.length;f++) {
+          var c = e[f];
+          if (c.isMethodOrAccessor()) {
+            var n = c.methodInfo;
+            if (!n.code) {
+              break;
+            }
+            if (n = t(n, new m(null, {baseClass:{traitsPrototype:{}}}), !1, "")) {
+              b.enter("function " + a + g.getQualifiedName(c.name) + "(" + n.parameters.join(", ") + ") {"), b.writeLns(n.body), b.leave("}");
+            }
+          }
+        }
+      }
+      function p(b, a) {
+        function e(a) {
+          if (a.instanceInfo.superName) {
+            var f;
+            a: {
+              f = a.instanceInfo.superName;
+              for (var n = 0;n < K.length;n++) {
+                for (var h = K[n].scripts, r = 0;r < h.length;r++) {
+                  for (var m = h[r].traits, d = 0;d < m.length;d++) {
+                    var l = m[d];
+                    if (l.isClass()) {
+                      for (var p = g.getQualifiedName(l.name), s = 0, x = f.namespaces.length;s < x;s++) {
+                        var k = f.getQName(s);
+                        if (p === g.getQualifiedName(k)) {
+                          f = l.classInfo;
+                          break a;
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+              f = void 0;
+            }
+            e(f);
+          }
+          b.writeLn("// Traits: " + a.instanceInfo.name);
+          c(b, a.instanceInfo.traits);
+        }
+        b.writeLn("// Class: " + a.instanceInfo.name + " extends " + a.instanceInfo.superName);
+        var f = l(a), n = f + "_Static";
+        h(b, n + "_", a.traits);
+        b.enter("function " + n + " () {");
+        c(b, a.traits);
+        b.leave("}");
+        h(b, f + "_", a.instanceInfo.traits);
+        b.enter("function " + f + "() {");
+        e(a);
+        b.leave("}");
+      }
+      var s = k.ABC.ClassInfo, m = k.Runtime.Scope, g = k.ABC.Multiname, f = d.Debug.assert, b = d.AVM2.Compiler.AST.escapeString, e = 0 < a.baselineDebugLevel.value ? new d.IndentingWriter : null, n = 0, r = 0, x = 0, H = 0, C = function() {
+        function b(a) {
+          this._indent = 0;
+          this._buffer = [];
+          this._emitIndent = !0;
+        }
+        b.prototype.reset = function() {
+          this._indent = this._buffer.length = 0;
+        };
+        b.prototype.enter = function(b) {
+          this.writeLn(b);
+          this._indent++;
+        };
+        b.prototype.leave = function(b) {
+          this._indent--;
+          this.writeLn(b);
+        };
+        b.prototype.leaveAndEnter = function(b) {
+          this._indent--;
+          this.writeLn(b);
+          this._indent++;
+        };
+        b.prototype.writeLn = function(b) {
+          this._buffer.push(b);
+        };
+        b.prototype.writeLns = function(b) {
+          this._buffer.push(b);
+        };
+        b.prototype.indent = function() {
+          this._indent++;
+        };
+        b.prototype.outdent = function() {
+          this._indent--;
+        };
+        b.prototype.toString = function() {
+          return this._buffer.join("\n");
+        };
+        return b;
+      }(), F = function() {
+        function a(b, e, f, c) {
+          this.methodInfo = b;
+          this.scope = e;
+          this.hasDynamicScope = f;
+          this.globalMiName = c;
+          this.pushedStrings = [];
+          this.hasNext2Infos = this.scopeIndex = this.stack = 0;
+          this.blockBodies = [];
+          this.constantPool = this.methodInfo.abc.constantPool;
+        }
+        a.prototype.compile = function() {
+          n++;
+          Relooper.init();
+          this.bodyEmitter = new C(!1);
+          this.blockEmitter = new C(!1);
+          var b = this.methodInfo.hasExceptions();
+          b && this.bodyEmitter.writeLn("var pc = 0;");
+          var a = performance.now(), f = this.methodInfo.analysis || new k.Analysis(this.methodInfo);
+          f.analyzedControlFlow || f.analyzeControlFlow();
+          this.methodInfo.classScope = this.scope;
+          var c = this.blocks = f.blocks;
+          this.bytecodes = f.bytecodes;
+          this.blockStates = [];
+          this.local = ["this"];
+          this.parameters = [];
+          this.hasDynamicScope && this.parameters.push("$0");
+          for (var g = this.hasDynamicScope ? 1 : 0, h = this.methodInfo.parameters.length, m = 0;m < h;m++) {
+            var d = this.methodInfo.parameters[m], l = this.getLocalName(m + 1);
+            this.local.push(l);
+            this.parameters.push(l);
+            if (d.optional && d.isUsed) {
+              var p = q(d.value);
+              this.bodyEmitter.writeLn("arguments.length < " + (g + m + 1) + " && (" + l + " = " + p + ");");
+            }
+            d = v(l, d.type);
+            d !== l && this.bodyEmitter.writeLn(l + " = " + d + ";");
+          }
+          l = this.methodInfo.localCount;
+          if (l > h + 1) {
+            d = "var ";
+            for (m = h + 1;m < l;m++) {
+              this.local.push(this.getLocalName(m)), d += this.local[m] + (m < l - 1 ? ", " : ";");
+            }
+            this.bodyEmitter.writeLn(d);
+          }
+          if (0 < this.methodInfo.maxStack) {
+            l = "var ";
+            for (m = 0;m < this.methodInfo.maxStack;m++) {
+              l += this.getStack(m) + (m < this.methodInfo.maxStack - 1 ? ", " : ";");
+            }
+            this.bodyEmitter.writeLn(l);
+          }
+          l = this.methodInfo.maxScopeDepth - this.methodInfo.initScopeDepth + 1;
+          m = this.hasDynamicScope ? 1 : 0;
+          if (l - m) {
+            for (d = "var ";m < l;m++) {
+              d += this.getScope(m) + (m < l - 1 ? ", " : ";");
+            }
+            this.bodyEmitter.writeLn(d);
+          }
+          this.bodyEmitter.writeLn("var mi = " + this.globalMiName + ";");
+          this.hasDynamicScope || this.bodyEmitter.writeLn("$0 = mi.classScope;");
+          this.bodyEmitter.writeLn("var label;");
+          (this.methodInfo.needsRest() || this.methodInfo.needsArguments()) && this.bodyEmitter.writeLn(this.local[h + 1] + " = sliceArguments(arguments, " + (g + (this.methodInfo.needsRest() ? h : 0)) + ");");
+          h = this.relooperEntryBlock = Relooper.addBlock("// Entry Block");
+          for (m = 0;m < c.length;m++) {
+            g = c[m], g.relooperBlock = Relooper.addBlock("// Block: " + g.bid);
+          }
+          if (b) {
+            for (g = this.methodInfo.exceptions, m = 0;m < g.length;m++) {
+              l = g[m].target, this.propagateBlockState(null, l, 1, 0), Relooper.addBranch(h, l.relooperBlock, "pc === " + l.pc);
+            }
+          }
+          Relooper.addBranch(h, c[0].relooperBlock);
+          this.propagateBlockState(null, c[0], 0, 0);
+          this.emitBlocks();
+          if (0 < this.hasNext2Infos) {
+            g = "var ";
+            for (m = 0;m < this.hasNext2Infos;m++) {
+              g += "hasNext" + m + " = new HasNext2Info()", g += m < this.hasNext2Infos - 1 ? ", " : ";";
+            }
+            this.bodyEmitter.writeLn(g);
+          }
+          b && (this.bodyEmitter.enter("while(1) {"), this.bodyEmitter.enter("try {"));
+          g = Relooper.render(this.relooperEntryBlock);
+          for (m = 0;m < c.length;m++) {
+            h = c[m].bid, l = this.blockBodies[h], g = g.split("\"'\"'" + h + "\"'\"'").join(l);
+          }
+          this.bodyEmitter.writeLns(g);
+          if (b) {
+            this.bodyEmitter.leaveAndEnter("} catch (ex) {");
+            g = this.methodInfo.exceptions;
+            for (m = 0;m < g.length;m++) {
+              b = g[m], c = "", b.typeName && (this.bodyEmitter.writeLn("var mn = mi.abc.constantPool.multinames[" + b.typeNameIndex + "];"), this.bodyEmitter.writeLn("var type = mi.abc.applicationDomain.getType(mn);"), c = " && type.isType(ex)"), this.bodyEmitter.writeLn("if (pc >= " + b.start_pc + " && pc <= " + b.end_pc + c + ") { pc = " + b.target_pc + "; continue; }");
+            }
+            this.bodyEmitter.leave("}");
+            this.bodyEmitter.leave("}");
+          }
+          m = this.bodyEmitter.toString();
+          a = performance.now() - a;
+          H += a;
+          r++;
+          e && e.writeLn("Compiled: PASS: " + r + ", FAIL: " + x + ", TIME: " + a.toFixed(2) + ", RATIO: " + (r / n).toFixed(4) + " (" + H.toFixed(2) + " total)");
+          k.BytecodePool.releaseList(f.bytecodes);
+          Relooper.cleanup();
+          return{body:m, parameters:this.parameters};
+        };
+        a.prototype.emitBlocks = function() {
+          for (var b = this.blocks, a = 0;a < b.length;a++) {
+            this.emitBlock(b[a]);
+          }
+        };
+        a.prototype.setCurrentBlockState = function(b) {
+          var a = this.blockStates[b.bid];
+          f(a, "No state exists for " + b.bid);
+          this.stack = a.stack;
+          this.scopeIndex = a.scopeIndex;
+        };
+        a.prototype.propagateBlockState = function(b, a, e, c) {
+          (b = this.blockStates[a.bid]) ? (f(b.stack === e, "Stack heights don't match, stack: " + e + ", was: " + b.stack), f(b.scopeIndex === c, "Scope index doesn't match, scopeIndex: " + c + ", was: " + b.scopeIndex)) : this.blockStates[a.bid] = {stack:e, scopeIndex:c};
+        };
+        a.prototype.getHandler = function(b) {
+          if (!k.opcodeTable[b.op].canThrow) {
+            return null;
+          }
+          b = b.pc;
+          for (var a = this.methodInfo.exceptions, e = 0;e < a.length;e++) {
+            var f = a[e];
+            if (f.start_pc >= b && b <= f.end_pc) {
+              return f;
+            }
+          }
+          return null;
+        };
+        a.prototype.getStack = function(b) {
+          return b >= a.stackNames.length ? "s" + (b - a.stackNames.length) : a.stackNames[b];
+        };
+        a.prototype.getLocalName = function(b) {
+          return b >= a.localNames.length ? "l" + (b - a.localNames.length) : a.localNames[b];
+        };
+        a.prototype.getScope = function(b) {
+          return "$" + b;
+        };
+        a.prototype.getLocal = function(b) {
+          if (0 > b || b >= this.local.length) {
+            throw Error("Out of bounds local read: " + b + " > " + (this.local.length - 1));
+          }
+          return this.local[b];
+        };
+        a.prototype.peek = function() {
+          return this.getStack(this.stack - 1);
+        };
+        a.prototype.emitPopTemporaries = function(b) {
+          for (var a = 0;a < b;a++) {
+            this.blockEmitter.writeLn("var t" + a + " = " + this.pop() + ";");
+          }
+        };
+        a.prototype.emitPushTemporary = function() {
+          for (var b = [], a = 0;a < arguments.length;a++) {
+            b[a - 0] = arguments[a];
+          }
+          for (a = 0;a < b.length;a++) {
+            this.emitPush("t" + b[a]);
+          }
+        };
+        a.prototype.pop = function() {
+          this.stack--;
+          return this.getStack(this.stack);
+        };
+        a.prototype.emitBlock = function(b) {
+          this.setCurrentBlockState(b);
+          this.blockEmitter.reset();
+          for (var a = this.bytecodes, e, f = b.position, c = b.end.position;f <= c;f++) {
+            e = a[f], this.emitBytecode(b, e);
+          }
+          this.blockBodies[b.bid] = this.blockEmitter.toString();
+          Relooper.setBlockCode(b.relooperBlock, "\"'\"'" + b.bid + "\"'\"'");
+          (a = c + 1 < a.length ? a[c + 1] : null) && !e.isBlockEnd() && (Relooper.addBranch(b.relooperBlock, a.relooperBlock), this.propagateBlockState(b, a, this.stack, this.scopeIndex));
+        };
+        a.prototype.peekScope = function() {
+          return this.getScope(this.scopeIndex);
+        };
+        a.prototype.emitBytecode = function(b, a) {
+          this.getHandler(a) && this.blockEmitter.writeLn("pc = " + a.pc + ";");
+          var e = a.op;
+          switch(e) {
+            case 98:
+              this.emitLoadLocal(a.index);
+              break;
+            case 208:
+            ;
+            case 209:
+            ;
+            case 210:
+            ;
+            case 211:
+              this.emitLoadLocal(e - 208);
+              break;
+            case 99:
+              this.emitStoreLocal(a.index);
+              break;
+            case 212:
+            ;
+            case 213:
+            ;
+            case 214:
+            ;
+            case 215:
+              this.emitStoreLocal(e - 212);
+              break;
+            case 104:
+            ;
+            case 97:
+              this.emitSetProperty(a.index);
+              break;
+            case 5:
+              this.emitSetSuper(a.index);
+              break;
+            case 102:
+              this.emitGetProperty(a.index);
+              break;
+            case 4:
+              this.emitGetSuper(a.index);
+              break;
+            case 106:
+              this.emitDeleteProperty(a.index);
+              break;
+            case 94:
+              this.emitFindProperty(a.index, !1);
+              break;
+            case 93:
+              this.emitFindProperty(a.index, !0);
+              break;
+            case 70:
+            ;
+            case 79:
+            ;
+            case 76:
+              this.emitCallProperty(a);
+              break;
+            case 69:
+            ;
+            case 78:
+              this.emitCallSuper(a);
+              break;
+            case 65:
+              this.emitCall(a);
+              break;
+            case 96:
+              this.emitGetLex(a.index);
+              break;
+            case 89:
+              this.emitGetDescendants(a.index);
+              break;
+            case 120:
+              this.emitCheckFilter();
+              break;
+            case 28:
+              this.emitPushScope(!0);
+              break;
+            case 48:
+              this.emitPushScope(!1);
+              break;
+            case 29:
+              this.popScope();
+              break;
+            case 100:
+              this.emitGetGlobalScope();
+              break;
+            case 101:
+              this.emitGetScopeObject();
+              break;
+            case 108:
+              this.emitGetSlot(a.index);
+              break;
+            case 109:
+              this.emitSetSlot(a.index);
+              break;
+            case 87:
+              this.emitPush("Object.create(mi.activationPrototype)");
+              break;
+            case 85:
+              this.emitNewObject(a);
+              break;
+            case 86:
+              this.emitNewArray(a);
+              break;
+            case 88:
+              this.emitNewClass(a);
+              break;
+            case 64:
+              this.emitNewFunction(a);
+              break;
+            case 90:
+              this.emitNewCatch(a);
+              break;
+            case 66:
+              this.emitConstruct(a);
+              break;
+            case 74:
+              this.emitConstructProperty(a);
+              break;
+            case 3:
+              this.emitThrow();
+              break;
+            case 50:
+              this.emitHasNext2(a);
+              break;
+            case 30:
+              this.emitNextName();
+              break;
+            case 35:
+              this.emitNextValue();
+              break;
+            case 16:
+              this.emitJump(b, a);
+              break;
+            case 12:
+              this.emitBinaryIf(b, a, "<", !0);
+              break;
+            case 15:
+              this.emitBinaryIf(b, a, ">=", !0);
+              break;
+            case 14:
+              this.emitBinaryIf(b, a, ">", !0);
+              break;
+            case 13:
+              this.emitBinaryIf(b, a, "<=", !0);
+              break;
+            case 24:
+              this.emitBinaryIf(b, a, ">=", !1);
+              break;
+            case 23:
+              this.emitBinaryIf(b, a, ">", !1);
+              break;
+            case 22:
+              this.emitBinaryIf(b, a, "<=", !1);
+              break;
+            case 21:
+              this.emitBinaryIf(b, a, "<", !1);
+              break;
+            case 19:
+              this.emitIfEq(b, a, !1);
+              break;
+            case 20:
+              this.emitIfEq(b, a, !0);
+              break;
+            case 25:
+              this.emitBinaryIf(b, a, "===", !1);
+              break;
+            case 26:
+              this.emitBinaryIf(b, a, "!==", !1);
+              break;
+            case 17:
+              this.emitUnaryIf(b, a, "!!");
+              break;
+            case 18:
+              this.emitUnaryIf(b, a, "!");
+              break;
+            case 27:
+              this.emitLookupSwitch(b, a);
+              break;
+            case 44:
+              this.emitPushString(a);
+              break;
+            case 47:
+              this.emitPushDouble(a);
+              break;
+            case 45:
+              this.emitPush(this.constantPool.ints[a.index]);
+              break;
+            case 46:
+              this.emitPush(this.constantPool.uints[a.index]);
+              break;
+            case 36:
+            ;
+            case 37:
+              this.emitPush(a.value);
+              break;
+            case 32:
+              this.emitPush(null);
+              break;
+            case 33:
+              this.emitPush(void 0);
+              break;
+            case 38:
+              this.emitPush(!0);
+              break;
+            case 39:
+              this.emitPush(!1);
+              break;
+            case 40:
+              this.emitPush("NaN");
+              break;
+            case 41:
+              0 < this.stack && this.stack--;
+              break;
+            case 8:
+              0 < a.index && this.emitReplaceLocal(a.index, "undefined");
+              break;
+            case 73:
+              this.emitConstructSuper(a);
+              break;
+            case 145:
+              this.emitLine(this.peek() + "++;");
+              break;
+            case 192:
+              this.emitReplace("(" + this.peek() + "|0) + 1");
+              break;
+            case 147:
+              this.emitLine(this.peek() + "--;");
+              break;
+            case 193:
+              this.emitReplace("(" + this.peek() + "|0) - 1");
+              break;
+            case 146:
+              this.emitLine(this.getLocal(a.index) + "++;");
+              break;
+            case 194:
+              this.emitReplaceLocal(a.index, "(" + this.getLocal(a.index) + "|0) + 1");
+              break;
+            case 148:
+              this.emitLine(this.getLocal(a.index) + "--;");
+              break;
+            case 195:
+              this.emitReplaceLocal(a.index, "(" + this.getLocal(a.index) + "|0) - 1");
+              break;
+            case 150:
+              this.emitUnaryOp("!");
+              break;
+            case 151:
+              this.emitUnaryOp("~");
+              break;
+            case 144:
+              this.emitUnaryOp("-");
+              break;
+            case 196:
+              this.emitUnaryOp_i();
+              break;
+            case 122:
+              this.emitUnaryOp("+");
+              break;
+            case 171:
+              this.emitEquals();
+              break;
+            case 160:
+              this.emitAddExpression();
+              break;
+            case 197:
+              this.emitBinaryExpression_i(" + ");
+              break;
+            case 161:
+              this.emitBinaryExpression(" - ");
+              break;
+            case 198:
+              this.emitBinaryExpression_i(" - ");
+              break;
+            case 162:
+              this.emitBinaryExpression(" * ");
+              break;
+            case 199:
+              this.emitBinaryExpression_i(" * ");
+              break;
+            case 163:
+              this.emitBinaryExpression(" / ");
+              break;
+            case 164:
+              this.emitBinaryExpression(" % ");
+              break;
+            case 165:
+              this.emitBinaryExpression(" << ");
+              break;
+            case 166:
+              this.emitBinaryExpression(" >> ");
+              break;
+            case 167:
+              this.emitBinaryExpression(" >>> ");
+              break;
+            case 168:
+              this.emitBinaryExpression(" & ");
+              break;
+            case 169:
+              this.emitBinaryExpression(" | ");
+              break;
+            case 170:
+              this.emitBinaryExpression(" ^ ");
+              break;
+            case 172:
+              this.emitBinaryExpression(" === ");
+              break;
+            case 174:
+              this.emitBinaryExpression(" <= ");
+              break;
+            case 173:
+              this.emitBinaryExpression(" < ");
+              break;
+            case 176:
+              this.emitBinaryExpression(" >= ");
+              break;
+            case 175:
+              this.emitBinaryExpression(" > ");
+              break;
+            case 128:
+              this.emitCoerce(a);
+              break;
+            case 130:
+              break;
+            case 131:
+            ;
+            case 115:
+              this.emitCoerceInt();
+              break;
+            case 136:
+            ;
+            case 116:
+              this.emitCoerceUint();
+              break;
+            case 132:
+            ;
+            case 117:
+              this.emitCoerceNumber();
+              break;
+            case 129:
+            ;
+            case 118:
+              this.emitCoerceBoolean();
+              break;
+            case 137:
+            ;
+            case 119:
+              this.emitCoerceObject(a);
+              break;
+            case 133:
+            ;
+            case 112:
+              this.emitCoerceString(a);
+              break;
+            case 177:
+              this.emitInstanceof();
+              break;
+            case 178:
+              this.emitIsType(a.index);
+              break;
+            case 179:
+              this.emitIsTypeLate();
+              break;
+            case 135:
+              this.emitAsTypeLate();
+              break;
+            case 83:
+              this.emitApplyType(a);
+              break;
+            case 180:
+              this.emitIn();
+              break;
+            case 149:
+              this.emitReplace("asTypeOf(" + this.peek() + ")");
+              break;
+            case 42:
+              this.emitDup();
+              break;
+            case 43:
+              this.emitSwap();
+              break;
+            case 71:
+              this.emitReturnVoid();
+              break;
+            case 72:
+              this.emitReturnValue();
+              break;
+            case 239:
+            ;
+            case 241:
+            ;
+            case 240:
+              break;
+            default:
+              throw "Not Implemented: " + k.OP[e];;
+          }
+        };
+        a.prototype.emitLoadLocal = function(b) {
+          this.emitPush(this.getLocal(b));
+        };
+        a.prototype.emitStoreLocal = function(b) {
+          this.blockEmitter.writeLn(this.getLocal(b) + " = " + this.pop() + ";");
+        };
+        a.prototype.emitReplaceLocal = function(b, a) {
+          this.blockEmitter.writeLn(this.getLocal(b) + " = " + a + ";");
+        };
+        a.prototype.emitSetProperty = function(b) {
+          var a = this.pop();
+          b = this.emitMultiname(b);
+          this.blockEmitter.writeLn(this.pop() + ".asSetProperty(" + b + ", " + a + ");");
+        };
+        a.prototype.emitSetSuper = function(b) {
+          var a = this.pop(), e = this.constantPool.multinames[b];
+          e.isSimpleStatic() ? (b = g.qualifyName(e.namespaces[0], e.name), "s" + b in this.methodInfo.classScope.object.baseClass.traitsPrototype ? this.emitLine("mi.classScope.object.baseClass.traitsPrototype.s" + b + ".call(" + this.pop() + ", " + a + ");") : this.emitLine(this.pop() + "." + b + " = " + a + ";")) : (b = this.emitMultiname(b), this.emitLine(this.pop() + ".asSetSuper(mi.classScope, " + b + ", " + a + ");"));
+        };
+        a.prototype.emitGetProperty = function(b) {
+          b = this.emitMultiname(b);
+          this.emitReplace(this.peek() + ".asGetProperty(" + b + ", false)");
+        };
+        a.prototype.emitGetSuper = function(b) {
+          var a = this.constantPool.multinames[b];
+          a.isSimpleStatic() ? (b = g.qualifyName(a.namespaces[0], a.name), "g" + b in this.methodInfo.classScope.object.baseClass.traitsPrototype ? this.emitReplace("mi.classScope.object.baseClass.traitsPrototype.g" + b + ".call(this)") : this.emitReplace(this.peek() + "." + b)) : (b = this.emitMultiname(b), a = this.peek(), this.emitReplace(a + ".asGetSuper(mi.classScope, " + b + ")"));
+        };
+        a.prototype.emitDeleteProperty = function(b) {
+          b = this.emitMultiname(b);
+          this.emitReplace(this.peek() + ".asDeleteProperty(" + b + ", false)");
+        };
+        a.prototype.emitFindProperty = function(b, a) {
+          var e = this.getScope(this.scopeIndex), f = this.emitMultiname(b);
+          this.emitPush(e + ".findScopeProperty(" + f + ", mi, " + a + ")");
+          return f;
+        };
+        a.prototype.emitCallProperty = function(b) {
+          var a = this.popArgs(b.argCount), e = 76 === b.op, a = ".asCallProperty(" + this.emitMultiname(b.index) + ", " + e + ", [" + a + "])";
+          79 !== b.op ? this.emitReplace(this.peek() + a) : this.blockEmitter.writeLn(this.pop() + a + ";");
+        };
+        a.prototype.emitCallSuper = function(b) {
+          var a = this.popArgs(b.argCount), e = this.constantPool.multinames[b.index];
+          e.isSimpleStatic() && (f = "mi.classScope.object.baseClass.traitsPrototype.m" + g.qualifyName(e.namespaces[0], e.name) + ".call(" + this.peek() + (a.length ? ", " + a : "") + ")");
+          if (!f) {
+            var e = this.emitMultiname(b.index), f = this.peek() + ".asCallSuper(mi.classScope, " + e + ", [" + a + "])"
+          }
+          78 !== b.op ? this.emitReplace(f) : (this.stack--, this.blockEmitter.writeLn(f + ";"));
+        };
+        a.prototype.emitCall = function(b) {
+          b = this.popArgs(b.argCount);
+          b = b.length ? ", " + b.join(", ") : "";
+          var a = this.pop(), e = this.peek();
+          this.emitReplace(e + ".asCall(" + a + b + ")");
+        };
+        a.prototype.emitConstruct = function(b) {
+          b = this.popArgs(b.argCount);
+          var a = this.peek();
+          this.emitReplace("new " + a + ".instanceConstructor(" + b + ")");
+        };
+        a.prototype.emitConstructProperty = function(b) {
+          var a = this.popArgs(b.argCount);
+          this.emitGetProperty(b.index);
+          b = this.peek();
+          this.blockEmitter.writeLn(b + " = new " + b + ".instanceConstructor(" + a + ");");
+        };
+        a.prototype.emitGetLex = function(b) {
+          var a = this.emitFindProperty(b, !0);
+          b = this.constantPool.multinames[b];
+          b.isSimpleStatic() ? (a = g.qualifyName(b.namespaces[0], b.name), this.emitReplace(this.peek() + "." + a)) : this.emitReplace(this.peek() + ".asGetProperty(" + a + ", false)");
+        };
+        a.prototype.emitGetDescendants = function(b) {
+          b = this.constantPool.multinames[b];
+          b = b.isRuntime() ? this.pop() : b.name;
+          this.emitReplace(this.peek() + ".descendants('" + b + "')");
+        };
+        a.prototype.emitCheckFilter = function() {
+          this.emitReplace("checkFilter(" + this.peek() + ")");
+        };
+        a.prototype.emitMultiname = function(b) {
+          var a = this.constantPool.multinames[b];
+          this.blockEmitter.writeLn("var mn = mi.abc.constantPool.multinames[" + b + "]; // ");
+          b = a.isRuntimeName() ? this.pop() : '"' + (a.name || "*") + '"';
+          return(a.isRuntimeNamespace() ? "[" + this.pop() + "]" : "mn.namespaces") + ", " + b + ", " + a.flags;
+        };
+        a.prototype.emitBinaryIf = function(b, a, e, f) {
+          var c = this.pop();
+          e = this.pop() + " " + e + " " + c;
+          f && (e = "!(" + e + ")");
+          this.emitIf(b, a, e);
+        };
+        a.prototype.emitIfEq = function(b, a, e) {
+          var f = this.pop(), f = "asEquals(" + this.pop() + ", " + f + ")";
+          e && (f = "!" + f);
+          this.emitIf(b, a, f);
+        };
+        a.prototype.emitUnaryIf = function(b, a, e) {
+          var f = this.pop();
+          this.emitIf(b, a, e + f);
+        };
+        a.prototype.emitIf = function(b, a, e) {
+          var f = this.bytecodes[a.position + 1];
+          a = a.target;
+          Relooper.addBranch(b.relooperBlock, f.relooperBlock);
+          this.propagateBlockState(b, f, this.stack, this.scopeIndex);
+          f !== a && (Relooper.addBranch(b.relooperBlock, a.relooperBlock, e), this.propagateBlockState(b, a, this.stack, this.scopeIndex));
+        };
+        a.prototype.emitJump = function(b, a) {
+          Relooper.addBranch(b.relooperBlock, a.target.relooperBlock);
+          this.propagateBlockState(b, a.target, this.stack, this.scopeIndex);
+        };
+        a.prototype.emitHasNext2 = function(b) {
+          var a = "hasNext" + this.hasNext2Infos++, e = this.local[b.object];
+          b = this.local[b.index];
+          this.emitLine(a + ".object = " + e + ";");
+          this.emitLine(a + ".index = " + b + ";");
+          this.emitLine("Object(" + e + ").asHasNext2(" + a + ");");
+          this.emitLine(e + " = " + a + ".object;");
+          this.emitPush(b + " = " + a + ".index");
+        };
+        a.prototype.emitNextName = function() {
+          var b = this.pop();
+          this.emitReplace(this.peek() + ".asNextName(" + b + ")");
+        };
+        a.prototype.emitNextValue = function() {
+          var b = this.pop();
+          this.emitReplace(this.peek() + ".asNextValue(" + b + ")");
+        };
+        a.prototype.emitThrow = function() {
+          this.emitLine("throw " + this.pop() + ";");
+        };
+        a.prototype.emitLookupSwitch = function(b, a) {
+          var e = this.pop(), e = Relooper.addBlock("// Lookup Switch", String(e));
+          Relooper.addBranch(b.relooperBlock, e);
+          var f = a.targets[a.targets.length - 1], c = f.relooperBlock;
+          this.propagateBlockState(b, f, this.stack, this.scopeIndex);
+          for (f = 0;f < a.targets.length - 1;f++) {
+            var g = a.targets[f], n = g.relooperBlock, h = Relooper.addBlock();
+            Relooper.addBranch(e, h, "case " + f + ":");
+            Relooper.addBranch(h, n);
+            this.propagateBlockState(b, g, this.stack, this.scopeIndex);
+          }
+          Relooper.addBranch(e, c);
+        };
+        a.prototype.emitPush = function(b) {
+          this.blockEmitter.writeLn(this.getStack(this.stack) + " = " + b + ";");
+          this.stack++;
+        };
+        a.prototype.emitReplace = function(b) {
+          this.blockEmitter.writeLn(this.getStack(this.stack - 1) + " = " + b + ";");
+        };
+        a.prototype.emitLine = function(b) {
+          this.blockEmitter.writeLn(b);
+        };
+        a.prototype.emitPushDouble = function(b) {
+          b = this.constantPool.doubles[b.index];
+          this.emitPush(0 === b && 0 > 1 / b ? "-0" : b);
+        };
+        a.prototype.emitPushString = function(a) {
+          this.pushedStrings[this.stack] = a.index;
+          var e = this.constantPool.strings[a.index];
+          40 < e.length || -1 < e.indexOf("\n") || -1 < e.indexOf("\r") || -1 < e.indexOf('"') ? this.emitPush("mi.abc.constantPool.strings[" + a.index + "]") : this.emitPush(b(e));
+        };
+        a.prototype.emitPushScope = function(b) {
+          b = "new Scope(" + this.getScope(this.scopeIndex) + ", " + this.pop() + ", " + b + ")";
+          this.scopeIndex++;
+          this.blockEmitter.writeLn(this.getScope(this.scopeIndex) + " = " + b + ";");
+        };
+        a.prototype.popScope = function() {
+          this.scopeIndex--;
+        };
+        a.prototype.emitGetGlobalScope = function() {
+          this.emitPush(this.peekScope() + ".global.object");
+        };
+        a.prototype.emitGetScopeObject = function() {
+          this.emitPush(this.peekScope() + ".object");
+        };
+        a.prototype.emitGetSlot = function(b) {
+          this.emitReplace("asGetSlot(" + this.peek() + ", " + b + ")");
+        };
+        a.prototype.emitSetSlot = function(b) {
+          var a = this.pop(), e = this.pop();
+          this.emitLine("asSetSlot(" + e + ", " + b + ", " + a + ")");
+        };
+        a.prototype.emitNewClass = function(b) {
+          this.emitPush("createClass(mi.abc.classes[" + b.index + "], " + this.pop() + ", " + this.peekScope() + ")");
+        };
+        a.prototype.emitNewObject = function(a) {
+          for (var e = [], f = 0;f < a.argCount;f++) {
+            var c = this.pop();
+            this.pop();
+            var g = this.constantPool.strings[this.pushedStrings[this.stack]];
+            e.push((d.isNumeric(g) ? g : b("$Bg" + g)) + ": " + c);
+          }
+          this.emitPush("{ " + e.join(", ") + " }");
+        };
+        a.prototype.emitNewArray = function(b) {
+          for (var a = [], e = 0;e < b.argCount;e++) {
+            a.push(this.pop());
+          }
+          this.emitPush("[" + a.reverse() + "]");
+        };
+        a.prototype.emitNewFunction = function(b) {
+          this.emitPush("createFunction(mi.abc.methods[" + b.index + "], " + this.peekScope() + ", true)");
+        };
+        a.prototype.emitNewCatch = function(b) {
+          this.emitPush("mi.exceptions[" + b.index + "].scopeObject");
+        };
+        a.prototype.emitConstructSuper = function(b) {
+          var a = "mi.classScope.object.baseClass.instanceConstructorNoInitialize.call(";
+          b = this.popArgs(b.argCount);
+          a += this.pop();
+          b.length && (a += ", " + b.join(", "));
+          this.blockEmitter.writeLn(a + ");");
+        };
+        a.prototype.emitCoerce = function(b) {
+          switch(this.constantPool.multinames[b.index]) {
+            case g.Int:
+              return this.emitCoerceInt();
+            case g.Uint:
+              return this.emitCoerceUint();
+            case g.Number:
+              return this.emitCoerceNumber();
+            case g.Boolean:
+              return this.emitCoerceBoolean();
+            case g.Object:
+              return this.emitCoerceObject(b);
+            case g.String:
+              return this.emitCoerceString(b);
+          }
+          b.ti && b.ti.noCoercionNeeded || (b = "asCoerce(mi.abc.applicationDomain.getType(mi.abc.constantPool.multinames[" + b.index + "]), " + this.pop() + ")", this.emitPush(b));
+        };
+        a.prototype.emitCoerceInt = function() {
+          var b = this.peek();
+          this.blockEmitter.writeLn(b + " |= 0;");
+        };
+        a.prototype.emitCoerceUint = function() {
+          var b = this.peek();
+          this.blockEmitter.writeLn(b + " >>>= 0;");
+        };
+        a.prototype.emitCoerceNumber = function() {
+          var b = this.peek();
+          this.blockEmitter.writeLn(b + "= +" + b);
+        };
+        a.prototype.emitCoerceBoolean = function() {
+          var b = this.peek();
+          this.blockEmitter.writeLn(b + " = !!" + b + ";");
+        };
+        a.prototype.emitCoerceObject = function(b) {
+          b.ti && b.ti.noCoercionNeeded || (b = this.peek(), this.blockEmitter.writeLn(b + " = asCoerceObject(" + b + ");"));
+        };
+        a.prototype.emitCoerceString = function(b) {
+          b.ti && b.ti.noCoercionNeeded || (b = this.peek(), this.blockEmitter.writeLn(b + " = asCoerceString(" + b + ");"));
+        };
+        a.prototype.emitInstanceof = function() {
+          var b = this.pop();
+          this.emitReplace(b + ".isInstanceOf(" + this.peek() + ")");
+        };
+        a.prototype.emitIsType = function(b) {
+          this.emitLine("var mn = mi.abc.constantPool.multinames[" + b + "];");
+          this.emitReplace("mi.abc.applicationDomain.getType(mn).isType(" + this.peek() + ")");
+        };
+        a.prototype.emitIsTypeLate = function() {
+          var b = this.pop();
+          this.emitReplace("asIsType(" + b + ", " + this.peek() + ")");
+        };
+        a.prototype.emitAsTypeLate = function() {
+          var b = this.pop();
+          this.emitReplace("asAsType(" + b + ", " + this.peek() + ")");
+        };
+        a.prototype.emitApplyType = function(b) {
+          b = this.popArgs(b.argCount);
+          var a = this.peek();
+          this.emitReplace("applyType(mi, " + a + ", [" + b + "])");
+        };
+        a.prototype.emitIn = function() {
+          var b = this.pop();
+          this.emitReplace(b + ".asHasProperty(null, " + this.peek() + ")");
+        };
+        a.prototype.emitDup = function() {
+          this.emitPush(this.peek());
+        };
+        a.prototype.emitSwap = function() {
+          var b = this.getStack(this.stack - 1), a = this.getStack(this.stack - 2);
+          this.blockEmitter.writeLn("var $t = " + b + ";");
+          this.blockEmitter.writeLn(b + " = " + a + ";");
+          this.blockEmitter.writeLn(a + " = $t;");
+        };
+        a.prototype.emitEquals = function() {
+          var b = this.pop();
+          this.emitReplace("asEquals(" + this.peek() + ", " + b + ")");
+        };
+        a.prototype.emitUnaryOp = function(b) {
+          this.emitReplace(b + this.peek());
+        };
+        a.prototype.emitUnaryOp_i = function() {
+          this.emitReplace("-" + this.peek() + "|0");
+        };
+        a.prototype.emitAddExpression = function() {
+          var b = this.pop(), a = this.peek();
+          this.blockEmitter.writeLn(a + " = asAdd(" + a + ", " + b + ");");
+        };
+        a.prototype.emitBinaryExpression = function(b) {
+          var a = this.pop(), e = this.peek();
+          this.blockEmitter.writeLn(e + " = " + e + b + a + ";");
+        };
+        a.prototype.emitBinaryExpression_i = function(b) {
+          var a = this.pop(), e = this.peek();
+          this.blockEmitter.writeLn(e + " = " + e + "|0" + b + a + "|0;");
+        };
+        a.prototype.emitReturnVoid = function() {
+          this.blockEmitter.writeLn("return;");
+        };
+        a.prototype.emitReturnValue = function() {
+          var b = this.pop();
+          this.blockEmitter.writeLn("return " + v(b, this.methodInfo.returnType) + ";");
+        };
+        a.prototype.popArgs = function(b) {
+          for (var a = [], e = this.stack, f = b = e - b;f < e;f++) {
+            a.push(this.getStack(f));
           }
-          b.variables.length && (k.countTimeline("Backend: Locals", b.variables.length), n = g(b.variables.map(function(b) {
-            return new F(u(b.name));
-          })), f.body.unshift(n));
-          k.enterTimeline("Serialize AST");
-          f = f.toSource();
-          k.leaveTimeline();
-          return jsGlobal[c] = new ca(e.map(function(b) {
-            return b.name;
-          }), f, b.constants, b.lazyConstants);
+          this.stack = b;
+          return a;
         };
-      })(a.Backend || (a.Backend = {}));
+        a.localNames = "this a b c d e f g h i j k l m n o p q r s t u v w x y z".split(" ");
+        a.stackNames = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".split("");
+        return a;
+      }();
+      a.baselineCompileMethod = t;
+      var K = [];
+      a.baselineCompileABCs = function(b, a) {
+        e && e.writeLn("Compiling LIBs: " + b);
+        e && e.writeLn("Compiling ABCs: " + a);
+        K.push.apply(K, b);
+        K.push.apply(K, a);
+        for (var f = 0;f < a.length;f++) {
+          var g = a[f];
+          e && e.writeLn("Compiling ABC: " + g);
+          for (var n = new C(!0), r = 0;r < g.scripts.length;r++) {
+            var m = n, d = g.scripts[r];
+            d.abc.hash;
+            m.writeLn("// Script: " + d.name);
+            h(m, u(d), d.traits);
+            m.enter("function " + u(d) + "() {");
+            c(m, d.traits);
+            m.leave("}");
+          }
+          for (r = 0;r < g.classes.length;r++) {
+            p(n, g.classes[r]);
+          }
+        }
+      };
     })(k.Compiler || (k.Compiler = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(f) {
+      function q(f) {
         k.enterTimeline("executeScript", {name:f.name});
-        var b = f.abc, e = new a.Global(f);
-        b.applicationDomain.allowNatives && (e[c.getPublicQualifiedName("unsafeJSNative")] = d.AVM2.AS.getNative);
+        new a.Global(f);
         f.executing = !0;
-        b = new a.Scope(null, f.global);
+        var b = new a.Scope(null, f.global);
         a.createFunction(f.init, b, !1, !1).call(f.global, !1);
         f.executed = !0;
         k.leaveTimeline();
       }
       function v(a, b) {
-        void 0 === b && (b = "");
-        a.executed || a.executing || (2 <= d.AVM2.Runtime.traceExecution.value && console.log("Executing Script For: " + b), r(a));
+        a.executed || a.executing || q(a);
       }
-      function u(f) {
+      function t(f) {
         if (!a.playerglobal) {
           return null;
         }
@@ -21335,12 +22995,14 @@
         }
         return e ? (f = e, f = (b = a.playerglobal.scripts[f]) ? new l(new Uint8Array(a.playerglobal.abcs, b.offset, b.length), f) : null, f) : null;
       }
-      function t(a, b) {
+      function u(a, b) {
         return new Promise(function(e, c) {
+          d.SWF.enterTimeline("Load file", a);
           var g = new XMLHttpRequest;
           g.open("GET", a);
           g.responseType = b;
           g.onload = function() {
+            d.SWF.leaveTimeline();
             var h = g.response;
             h ? ("json" === b && "json" !== g.responseType && (h = JSON.parse(h)), e(h)) : c("Unable to load " + a + ": " + g.statusText);
           };
@@ -21348,7 +23010,7 @@
         });
       }
       var l = d.AVM2.ABC.AbcFile, c = d.AVM2.ABC.Multiname, h = d.Callback, p = d.IndentingWriter;
-      a.executeScript = r;
+      a.executeScript = q;
       a.ensureScriptIsExecuted = v;
       (function(a) {
         a[a.PUBLIC_PROPERTIES = 1] = "PUBLIC_PROPERTIES";
@@ -21366,7 +23028,7 @@
         function f(b, a) {
           this.systemDomain = new g(this, null, b, !0);
           this.applicationDomain = new g(this, this.systemDomain, a, !1);
-          this.findDefiningAbc = u;
+          this.findDefiningAbc = t;
           this.exception = {value:void 0};
           this.exceptions = [];
           this.globals = Object.create(null);
@@ -21394,7 +23056,7 @@
           if (a.playerglobalLoadedPromise) {
             return Promise.reject("Playerglobal is already loaded");
           }
-          a.playerglobalLoadedPromise = Promise.all([t(b, "arraybuffer"), t(e, "json")]).then(function(b) {
+          a.playerglobalLoadedPromise = Promise.all([u(b, "arraybuffer"), u(e, "json")]).then(function(b) {
             a.playerglobal = {abcs:b[0], map:Object.create(null), scripts:Object.create(null)};
             b = b[1];
             for (var e = 0;e < b.length;e++) {
@@ -21464,7 +23126,6 @@
           return g;
         };
         f.prototype.findDomainProperty = function(b, a, f) {
-          d.AVM2.Runtime.traceDomain.value && console.log("ApplicationDomain.findDomainProperty: " + b);
           if (f = this.findDefiningScript(b, f)) {
             return f.script.global;
           }
@@ -21484,9 +23145,9 @@
         };
         f.prototype.findClassInfoSlow = function(b, a) {
           for (var f = this.abcs, g = 0;g < f.length;g++) {
-            for (var h = f[g], h = h.scripts, d = 0;d < h.length;d++) {
-              for (var m = h[d].traits, l = 0;l < m.length;l++) {
-                var p = m[l];
+            for (var h = f[g], h = h.scripts, m = 0;m < h.length;m++) {
+              for (var d = h[m].traits, l = 0;l < d.length;l++) {
+                var p = d[l];
                 if (p.isClass()) {
                   var s = c.getQualifiedName(p.name);
                   if (a) {
@@ -21494,10 +23155,10 @@
                       return this.classInfoCache[a] = p.classInfo;
                     }
                   } else {
-                    for (var k = 0, r = b.namespaces.length;k < r;k++) {
-                      var u = b.getQName(k);
-                      if (s === c.getQualifiedName(u)) {
-                        return this.classInfoCache[u] = p.classInfo;
+                    for (var k = 0, q = b.namespaces.length;k < q;k++) {
+                      var t = b.getQName(k);
+                      if (s === c.getQualifiedName(t)) {
+                        return this.classInfoCache[t] = p.classInfo;
                       }
                     }
                   }
@@ -21516,13 +23177,13 @@
         f.prototype.findDefiningScriptSlow = function(b, a) {
           k.countTimeline("ApplicationDomain: findDefiningScriptSlow");
           for (var f = this.abcs, g = 0;g < f.length;g++) {
-            for (var h = f[g], h = h.scripts, d = 0;d < h.length;d++) {
-              var m = h[d], l = m.traits;
+            for (var h = f[g], h = h.scripts, m = 0;m < h.length;m++) {
+              var d = h[m], l = d.traits;
               if (b instanceof c) {
                 for (var p = 0;p < l.length;p++) {
                   var s = l[p];
                   if (b.hasQName(s.name)) {
-                    return a && v(m, String(s.name)), this.scriptCache[b.runtimeId] = {script:m, trait:s};
+                    return a && v(d, ""), this.scriptCache[b.runtimeId] = {script:d, trait:s};
                   }
                 }
               }
@@ -21537,7 +23198,7 @@
         };
         f.prototype.executeAbc = function(b) {
           this.loadAbc(b);
-          r(b.lastScript);
+          q(b.lastScript);
         };
         f.prototype.loadAbc = function(b) {
           d.AVM2.Runtime.traceExecution.value && console.log("Loading: " + b.name);
@@ -21572,8 +23233,8 @@
         a.prototype.initializeShell = function(b, a) {
           var f = this.compartment;
           f.AVM2.initialize(b, a);
-          f.AVM2.instance.systemDomain.executeAbc(f.grabAbc(homePath + "src/avm2/generated/builtin/builtin.abc"));
-          f.AVM2.instance.systemDomain.executeAbc(f.grabAbc(homePath + "src/avm2/generated/shell/shell.abc"));
+          f.AVM2.instance.systemDomain.executeAbc(f.grabAbc(homePath + "build/libs/builtin.abc"));
+          f.AVM2.instance.systemDomain.executeAbc(f.grabAbc(homePath + "build/libs/shell.abc"));
           this.systemDomain = f.AVM2.instance.systemDomain;
           this.applicationDomain = f.AVM2.instance.applicationDomain;
         };
@@ -21587,19 +23248,19 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(a) {
-        return a.holder instanceof u ? "static " + a.holder.instanceInfo.name.getOriginalName() + "::" + a.name.getOriginalName() : a.holder instanceof t ? a.holder.name.getOriginalName() + "::" + a.name.getOriginalName() : a.name.getOriginalName();
+      function q(a) {
+        return a.holder instanceof t ? "static " + a.holder.instanceInfo.name.getOriginalName() + "::" + a.name.getOriginalName() : a.holder instanceof u ? a.holder.name.getOriginalName() + "::" + a.name.getOriginalName() : a.name.getOriginalName();
       }
-      var v = d.AVM2.ABC.Multiname, u = d.AVM2.ABC.ClassInfo, t = d.AVM2.ABC.InstanceInfo, l = d.ObjectUtilities.defineReadOnlyProperty, c = d.FunctionUtilities.bindSafely;
-      a.getMethodOverrideKey = r;
+      var v = d.AVM2.ABC.Multiname, t = d.AVM2.ABC.ClassInfo, u = d.AVM2.ABC.InstanceInfo, l = d.ObjectUtilities.defineReadOnlyProperty, c = d.FunctionUtilities.bindSafely;
+      a.getMethodOverrideKey = q;
       a.checkMethodOverrides = function(c) {
-        if (c.name && (c = r(c), c in a.VM_METHOD_OVERRIDES)) {
+        if (c.name && (c = q(c), c in a.VM_METHOD_OVERRIDES)) {
           return a.VM_METHOD_OVERRIDES[c];
         }
       };
       a.checkCommonMethodPatterns = function(a) {
         var c = a.code;
-        return c && 208 === c[0] && 48 === c[1] ? 71 === c[2] || a.holder instanceof t && 208 === c[2] && 73 === c[3] && 0 === c[4] && 71 === c[5] && v.getQualifiedName(a.holder.superName) === v.Object ? function() {
+        return c && 208 === c[0] && 48 === c[1] ? 71 === c[2] || a.holder instanceof u && 208 === c[2] && 73 === c[3] && 0 === c[4] && 71 === c[5] && v.getQualifiedName(a.holder.superName) === v.Object ? function() {
         } : null : null;
       };
       a.makeTrampoline = function(c, d, s, m, g, f) {
@@ -21645,8 +23306,8 @@
       e.name = a.isRuntimeName() ? b.pop() : a.name;
       e.namespaces = a.isRuntimeNamespace() ? [b.pop()] : a.namespaces;
     }
-    var r = d.AVM2.Runtime.Scope, v = d.AVM2.Runtime.asCoerceByMultiname, u = d.AVM2.Runtime.asGetSlot, t = d.AVM2.Runtime.asSetSlot, l = d.AVM2.Runtime.asCoerce, c = d.AVM2.Runtime.asCoerceString, h = d.AVM2.Runtime.asAsType, p = d.AVM2.Runtime.asTypeOf, s = d.AVM2.Runtime.asIsInstanceOf, m = d.AVM2.Runtime.asIsType, g = d.AVM2.Runtime.applyType, f = d.AVM2.Runtime.createFunction, b = d.AVM2.Runtime.createClass, e = d.AVM2.Runtime.getDescendants, q = d.AVM2.Runtime.checkFilter, n = d.AVM2.Runtime.asAdd, 
-    x = d.AVM2.Runtime.translateError, L = d.AVM2.Runtime.asCreateActivation, A = d.AVM2.Runtime.sliceArguments, H = d.ObjectUtilities.boxValue, K = d.ArrayUtilities.popManyInto, F = d.AVM2.Runtime.construct, J = d.AVM2.ABC.Multiname, M = d.AVM2.Runtime.HasNext2Info, D = function() {
+    var q = d.AVM2.Runtime.Scope, v = d.AVM2.Runtime.asCoerceByMultiname, t = d.AVM2.Runtime.asGetSlot, u = d.AVM2.Runtime.asSetSlot, l = d.AVM2.Runtime.asCoerce, c = d.AVM2.Runtime.asCoerceString, h = d.AVM2.Runtime.asAsType, p = d.AVM2.Runtime.asTypeOf, s = d.AVM2.Runtime.asIsInstanceOf, m = d.AVM2.Runtime.asIsType, g = d.AVM2.Runtime.applyType, f = d.AVM2.Runtime.createFunction, b = d.AVM2.Runtime.createClass, e = d.AVM2.Runtime.checkFilter, n = d.AVM2.Runtime.asAdd, r = d.AVM2.Runtime.translateError, 
+    x = d.AVM2.Runtime.asCreateActivation, H = d.AVM2.Runtime.sliceArguments, C = d.ObjectUtilities.boxValue, F = d.ArrayUtilities.popManyInto, K = d.AVM2.Runtime.construct, E = d.AVM2.ABC.Multiname, Q = d.AVM2.Runtime.HasNext2Info, N = function() {
       function b(a) {
         this.parent = a;
         this.stack = [];
@@ -21671,146 +23332,146 @@
         this.scopes || (this.scopes = []);
         for (var b = this.parent, a = 0;a < this.stack.length;a++) {
           var e = this.stack[a], f = this.isWith[a], c = this.scopes[a];
-          c && c.parent === b && c.object === e && c.isWith === f || (c = this.scopes[a] = new r(b, e, f));
+          c && c.parent === b && c.object === e && c.isWith === f || (c = this.scopes[a] = new q(b, e, f));
           b = c;
         }
         return b;
       };
       return b;
     }(), B = function() {
-      function r() {
+      function q() {
       }
-      r.interpretMethod = function(r, E, B, C) {
+      q.interpretMethod = function(q, y, B, G) {
         k.countTimeline("Interpret Method");
-        var I = E.abc, P = I.constantPool.ints, T = I.constantPool.uints, O = I.constantPool.doubles, Q = I.constantPool.strings, S = I.methods, V = I.constantPool.multinames, aa = I.applicationDomain, $ = E.exceptions;
-        r = [r];
-        for (var w = [], U = new D(B), ba = E.parameters.length, R = C.length, N, Z = 0;Z < ba;Z++) {
-          var fa = E.parameters[Z];
-          N = Z < R ? C[Z] : fa.value;
-          fa.type && !fa.type.isAnyName() && (N = v(E, fa.type, N));
-          r.push(N);
-        }
-        E.needsRest() ? r.push(A(C, ba)) : E.needsArguments() && r.push(A(C, 0));
-        C = E.analysis.bytecodes;
-        var X, ia, ga, ca, da, ea, ba = [], R = J.TEMPORARY, fa = [], W = 0, ka = C.length;
-        a: for (;W < ka;) {
+        var I = y.abc, D = I.constantPool.ints, R = I.constantPool.uints, T = I.constantPool.doubles, J = I.constantPool.strings, P = I.methods, S = I.constantPool.multinames, W = I.applicationDomain, ba = y.exceptions;
+        q = [q];
+        for (var w = [], X = new N(B), U = y.parameters.length, $ = G.length, Y, M = 0;M < U;M++) {
+          var Z = y.parameters[M];
+          Y = M < $ ? G[M] : Z.value;
+          Z.type && !Z.type.isAnyName() && (Y = v(y, Z.type, Y));
+          q.push(Y);
+        }
+        y.needsRest() ? q.push(H(G, U)) : y.needsArguments() && q.push(H(G, 0, G.asGetPublicProperty("callee")));
+        G = y.analysis.bytecodes;
+        var ca, ga, ha, ea, aa, da, U = [], $ = E.TEMPORARY, Z = [], O = 0, ka = G.length;
+        a: for (;O < ka;) {
           try {
-            var Y = C[W], la = Y.op;
-            switch(la | 0) {
+            var V = G[O], ja = V.op;
+            switch(ja | 0) {
               case 3:
                 throw w.pop();;
               case 4:
-                a(w, V[Y.index], R);
-                w.push(w.pop().asGetSuper(B, R.namespaces, R.name, R.flags));
+                a(w, S[V.index], $);
+                w.push(w.pop().asGetSuper(B, $.namespaces, $.name, $.flags));
                 break;
               case 5:
-                N = w.pop();
-                a(w, V[Y.index], R);
-                w.pop().asSetSuper(B, R.namespaces, R.name, R.flags, N);
+                Y = w.pop();
+                a(w, S[V.index], $);
+                w.pop().asSetSuper(B, $.namespaces, $.name, $.flags, Y);
                 break;
               case 8:
-                r[Y.index] = void 0;
+                q[V.index] = void 0;
                 break;
               case 12:
-                ea = w.pop();
                 da = w.pop();
-                W = da < ea ? W + 1 : Y.offset;
+                aa = w.pop();
+                O = aa < da ? O + 1 : V.offset;
                 continue;
               case 24:
-                ea = w.pop();
                 da = w.pop();
-                W = da >= ea ? Y.offset : W + 1;
+                aa = w.pop();
+                O = aa >= da ? V.offset : O + 1;
                 continue;
               case 13:
-                ea = w.pop();
                 da = w.pop();
-                W = da <= ea ? W + 1 : Y.offset;
+                aa = w.pop();
+                O = aa <= da ? O + 1 : V.offset;
                 continue;
               case 23:
-                ea = w.pop();
                 da = w.pop();
-                W = da > ea ? Y.offset : W + 1;
+                aa = w.pop();
+                O = aa > da ? V.offset : O + 1;
                 continue;
               case 14:
-                ea = w.pop();
                 da = w.pop();
-                W = da > ea ? W + 1 : Y.offset;
+                aa = w.pop();
+                O = aa > da ? O + 1 : V.offset;
                 continue;
               case 22:
-                ea = w.pop();
                 da = w.pop();
-                W = da <= ea ? Y.offset : W + 1;
+                aa = w.pop();
+                O = aa <= da ? V.offset : O + 1;
                 continue;
               case 15:
-                ea = w.pop();
                 da = w.pop();
-                W = da >= ea ? W + 1 : Y.offset;
+                aa = w.pop();
+                O = aa >= da ? O + 1 : V.offset;
                 continue;
               case 21:
-                ea = w.pop();
                 da = w.pop();
-                W = da < ea ? Y.offset : W + 1;
+                aa = w.pop();
+                O = aa < da ? V.offset : O + 1;
                 continue;
               case 16:
-                W = Y.offset;
+                O = V.offset;
                 continue;
               case 17:
-                W = w.pop() ? Y.offset : W + 1;
+                O = w.pop() ? V.offset : O + 1;
                 continue;
               case 18:
-                W = w.pop() ? W + 1 : Y.offset;
+                O = w.pop() ? O + 1 : V.offset;
                 continue;
               case 19:
-                ea = w.pop();
                 da = w.pop();
-                W = asEquals(da, ea) ? Y.offset : W + 1;
+                aa = w.pop();
+                O = asEquals(aa, da) ? V.offset : O + 1;
                 continue;
               case 20:
-                ea = w.pop();
                 da = w.pop();
-                W = asEquals(da, ea) ? W + 1 : Y.offset;
+                aa = w.pop();
+                O = asEquals(aa, da) ? O + 1 : V.offset;
                 continue;
               case 25:
-                ea = w.pop();
                 da = w.pop();
-                W = da === ea ? Y.offset : W + 1;
+                aa = w.pop();
+                O = aa === da ? V.offset : O + 1;
                 continue;
               case 26:
-                ea = w.pop();
                 da = w.pop();
-                W = da !== ea ? Y.offset : W + 1;
+                aa = w.pop();
+                O = aa !== da ? V.offset : O + 1;
                 continue;
               case 27:
-                ia = w.pop();
-                if (0 > ia || ia >= Y.offsets.length) {
-                  ia = Y.offsets.length - 1;
+                ga = w.pop();
+                if (0 > ga || ga >= V.offsets.length) {
+                  ga = V.offsets.length - 1;
                 }
-                W = Y.offsets[ia];
+                O = V.offsets[ga];
                 continue;
               case 28:
-                U.push(H(w.pop()), !0);
+                X.push(C(w.pop()), !0);
                 break;
               case 29:
-                U.pop();
+                X.pop();
                 break;
               case 30:
-                ia = w.pop();
-                w[w.length - 1] = H(w[w.length - 1]).asNextName(ia);
+                ga = w.pop();
+                w[w.length - 1] = C(w[w.length - 1]).asNextName(ga);
                 break;
               case 35:
-                ia = w.pop();
-                w[w.length - 1] = H(w[w.length - 1]).asNextValue(ia);
+                ga = w.pop();
+                w[w.length - 1] = C(w[w.length - 1]).asNextValue(ga);
                 break;
               case 50:
-                var ma = fa[W] || (fa[W] = new M(null, 0));
-                X = r[Y.object];
-                ia = r[Y.index];
-                ma.object = X;
-                ma.index = ia;
-                Object(X).asHasNext2(ma);
-                r[Y.object] = ma.object;
-                r[Y.index] = ma.index;
-                w.push(!!ma.index);
+                var la = Z[O] || (Z[O] = new Q(null, 0));
+                ca = q[V.object];
+                ga = q[V.index];
+                la.object = ca;
+                la.index = ga;
+                Object(ca).asHasNext2(la);
+                q[V.object] = la.object;
+                q[V.index] = la.index;
+                w.push(!!la.index);
                 break;
               case 32:
                 w.push(null);
@@ -21821,19 +23482,19 @@
               case 36:
               ;
               case 37:
-                w.push(Y.value);
+                w.push(V.value);
                 break;
               case 44:
-                w.push(Q[Y.index]);
+                w.push(J[V.index]);
                 break;
               case 45:
-                w.push(P[Y.index]);
+                w.push(D[V.index]);
                 break;
               case 46:
-                w.push(T[Y.index]);
+                w.push(R[V.index]);
                 break;
               case 47:
-                w.push(O[Y.index]);
+                w.push(T[V.index]);
                 break;
               case 38:
                 w.push(!0);
@@ -21851,40 +23512,40 @@
                 w.push(w[w.length - 1]);
                 break;
               case 43:
-                X = w[w.length - 1];
+                ca = w[w.length - 1];
                 w[w.length - 1] = w[w.length - 2];
-                w[w.length - 2] = X;
+                w[w.length - 2] = ca;
                 break;
               case 48:
-                U.push(H(w.pop()), !1);
+                X.push(C(w.pop()), !1);
                 break;
               case 64:
-                w.push(f(S[Y.index], U.topScope(), !0, !1));
+                w.push(f(P[V.index], X.topScope(), !0, !1));
                 break;
               case 65:
-                K(w, Y.argCount, ba);
-                X = w.pop();
-                w[w.length - 1] = w[w.length - 1].asApply(X, ba);
+                F(w, V.argCount, U);
+                ca = w.pop();
+                w[w.length - 1] = w[w.length - 1].asApply(ca, U);
                 break;
               case 66:
-                K(w, Y.argCount, ba);
-                w[w.length - 1] = F(w[w.length - 1], ba);
+                F(w, V.argCount, U);
+                w[w.length - 1] = K(w[w.length - 1], U);
                 break;
               case 71:
                 return;
               case 72:
-                return E.returnType ? v(E, E.returnType, w.pop()) : w.pop();
+                return y.returnType ? v(y, y.returnType, w.pop()) : w.pop();
               case 73:
-                K(w, Y.argCount, ba);
-                X = w.pop();
-                B.object.baseClass.instanceConstructorNoInitialize.apply(X, ba);
+                F(w, V.argCount, U);
+                ca = w.pop();
+                B.object.baseClass.instanceConstructorNoInitialize.apply(ca, U);
                 break;
               case 74:
-                K(w, Y.argCount, ba);
-                a(w, V[Y.index], R);
-                X = H(w[w.length - 1]);
-                X = X.asConstructProperty(R.namespaces, R.name, R.flags, ba);
-                w[w.length - 1] = X;
+                F(w, V.argCount, U);
+                a(w, S[V.index], $);
+                ca = C(w[w.length - 1]);
+                ca = ca.asConstructProperty($.namespaces, $.name, $.flags, U);
+                w[w.length - 1] = ca;
                 break;
               case 75:
                 d.Debug.notImplemented("OP.callsuperid");
@@ -21894,95 +23555,94 @@
               case 70:
               ;
               case 79:
-                K(w, Y.argCount, ba);
-                a(w, V[Y.index], R);
-                ca = H(w.pop()).asCallProperty(R.namespaces, R.name, R.flags, 76 === la, ba);
-                79 !== la && w.push(ca);
+                F(w, V.argCount, U);
+                a(w, S[V.index], $);
+                ea = C(w.pop()).asCallProperty($.namespaces, $.name, $.flags, 76 === ja, U);
+                79 !== ja && w.push(ea);
                 break;
               case 69:
               ;
               case 78:
-                K(w, Y.argCount, ba);
-                a(w, V[Y.index], R);
-                ca = w.pop().asCallSuper(B, R.namespaces, R.name, R.flags, ba);
-                78 !== la && w.push(ca);
+                F(w, V.argCount, U);
+                a(w, S[V.index], $);
+                ea = w.pop().asCallSuper(B, $.namespaces, $.name, $.flags, U);
+                78 !== ja && w.push(ea);
                 break;
               case 83:
-                K(w, Y.argCount, ba);
-                w[w.length - 1] = g(E, w[w.length - 1], ba);
+                F(w, V.argCount, U);
+                w[w.length - 1] = g(y, w[w.length - 1], U);
                 break;
               case 85:
-                X = {};
-                for (Z = 0;Z < Y.argCount;Z++) {
-                  N = w.pop(), X[J.getPublicQualifiedName(w.pop())] = N;
+                ca = {};
+                for (M = 0;M < V.argCount;M++) {
+                  Y = w.pop(), ca[E.getPublicQualifiedName(w.pop())] = Y;
                 }
-                w.push(X);
+                w.push(ca);
                 break;
               case 86:
-                X = [];
-                K(w, Y.argCount, ba);
-                X.push.apply(X, ba);
-                w.push(X);
+                ca = [];
+                F(w, V.argCount, U);
+                ca.push.apply(ca, U);
+                w.push(ca);
                 break;
               case 87:
-                w.push(L(E));
+                w.push(x(y));
                 break;
               case 88:
-                w[w.length - 1] = b(I.classes[Y.index], w[w.length - 1], U.topScope());
+                w[w.length - 1] = b(I.classes[V.index], w[w.length - 1], X.topScope());
                 break;
               case 89:
-                a(w, V[Y.index], R);
-                void 0 === R.name && (R.name = "*");
-                w.push(e(w.pop(), R));
+                a(w, S[V.index], $);
+                w[w.length - 1] = w[w.length - 1].descendants($.name);
                 break;
               case 90:
-                w.push($[Y.index].scopeObject);
+                w.push(ba[V.index].scopeObject);
                 break;
               case 94:
               ;
               case 93:
-                a(w, V[Y.index], R);
-                w.push(U.topScope().findScopeProperty(R.namespaces, R.name, R.flags, E, 93 === la, !1));
+                a(w, S[V.index], $);
+                w.push(X.topScope().findScopeProperty($.namespaces, $.name, $.flags, y, 93 === ja, !1));
                 break;
               case 96:
-                ga = V[Y.index];
-                X = U.topScope().findScopeProperty(ga.namespaces, ga.name, ga.flags, E, !0, !1);
-                w.push(X.asGetProperty(ga.namespaces, ga.name, ga.flags));
+                ha = S[V.index];
+                ca = X.topScope().findScopeProperty(ha.namespaces, ha.name, ha.flags, y, !0, !1);
+                w.push(ca.asGetProperty(ha.namespaces, ha.name, ha.flags));
                 break;
               case 104:
               ;
               case 97:
-                N = w.pop();
-                a(w, V[Y.index], R);
-                H(w.pop()).asSetProperty(R.namespaces, R.name, R.flags, N);
+                Y = w.pop();
+                a(w, S[V.index], $);
+                C(w.pop()).asSetProperty($.namespaces, $.name, $.flags, Y);
                 break;
               case 98:
-                w.push(r[Y.index]);
+                w.push(q[V.index]);
                 break;
               case 99:
-                r[Y.index] = w.pop();
+                q[V.index] = w.pop();
                 break;
               case 100:
                 w.push(B.global.object);
                 break;
               case 101:
-                w.push(U.get(Y.index));
+                w.push(X.get(V.index));
                 break;
               case 102:
-                a(w, V[Y.index], R);
-                w[w.length - 1] = H(w[w.length - 1]).asGetProperty(R.namespaces, R.name, R.flags);
+                a(w, S[V.index], $);
+                w[w.length - 1] = C(w[w.length - 1]).asGetProperty($.namespaces, $.name, $.flags);
                 break;
               case 106:
-                a(w, V[Y.index], R);
-                w[w.length - 1] = H(w[w.length - 1]).asDeleteProperty(R.namespaces, R.name, R.flags);
+                a(w, S[V.index], $);
+                w[w.length - 1] = C(w[w.length - 1]).asDeleteProperty($.namespaces, $.name, $.flags);
                 break;
               case 108:
-                w[w.length - 1] = u(w[w.length - 1], Y.index);
+                w[w.length - 1] = t(w[w.length - 1], V.index);
                 break;
               case 109:
-                N = w.pop();
-                X = w.pop();
-                t(X, Y.index, N);
+                Y = w.pop();
+                ca = w.pop();
+                u(ca, V.index, Y);
                 break;
               case 112:
                 w[w.length - 1] = c(w[w.length - 1]);
@@ -22014,10 +23674,10 @@
                 w[w.length - 1] = !!w[w.length - 1];
                 break;
               case 120:
-                w[w.length - 1] = q(w[w.length - 1]);
+                w[w.length - 1] = e(w[w.length - 1]);
                 break;
               case 128:
-                w[w.length - 1] = l(aa.getType(V[Y.index]), w[w.length - 1]);
+                w[w.length - 1] = l(W.getType(S[V.index]), w[w.length - 1]);
                 break;
               case 130:
                 break;
@@ -22025,14 +23685,14 @@
                 w[w.length - 1] = c(w[w.length - 1]);
                 break;
               case 134:
-                w[w.length - 2] = h(aa.getType(V[Y.index]), w[w.length - 1]);
+                w[w.length - 2] = h(W.getType(S[V.index]), w[w.length - 1]);
                 break;
               case 135:
                 w[w.length - 2] = h(w.pop(), w[w.length - 1]);
                 break;
               case 137:
-                X = w[w.length - 1];
-                w[w.length - 1] = void 0 == X ? null : X;
+                ca = w[w.length - 1];
+                w[w.length - 1] = void 0 == ca ? null : ca;
                 break;
               case 144:
                 w[w.length - 1] = -w[w.length - 1];
@@ -22041,13 +23701,13 @@
                 ++w[w.length - 1];
                 break;
               case 146:
-                ++r[Y.index];
+                ++q[V.index];
                 break;
               case 147:
                 --w[w.length - 1];
                 break;
               case 148:
-                --r[Y.index];
+                --q[V.index];
                 break;
               case 149:
                 w[w.length - 1] = p(w[w.length - 1]);
@@ -22113,13 +23773,13 @@
                 w[w.length - 2] = s(w.pop(), w[w.length - 1]);
                 break;
               case 178:
-                w[w.length - 1] = m(aa.getType(V[Y.index]), w[w.length - 1]);
+                w[w.length - 1] = m(W.getType(S[V.index]), w[w.length - 1]);
                 break;
               case 179:
                 w[w.length - 2] = m(w.pop(), w[w.length - 1]);
                 break;
               case 180:
-                w[w.length - 2] = H(w.pop()).asHasProperty(null, w[w.length - 1]);
+                w[w.length - 2] = C(w.pop()).asHasProperty(null, w[w.length - 1]);
                 break;
               case 192:
                 w[w.length - 1] = (w[w.length - 1] | 0) + 1;
@@ -22128,10 +23788,10 @@
                 w[w.length - 1] = (w[w.length - 1] | 0) - 1;
                 break;
               case 194:
-                r[Y.index] = (r[Y.index] | 0) + 1;
+                q[V.index] = (q[V.index] | 0) + 1;
                 break;
               case 195:
-                r[Y.index] = (r[Y.index] | 0) - 1;
+                q[V.index] = (q[V.index] | 0) - 1;
                 break;
               case 196:
                 w[w.length - 1] = ~w[w.length - 1];
@@ -22152,7 +23812,7 @@
               case 210:
               ;
               case 211:
-                w.push(r[la - 208]);
+                w.push(q[ja - 208]);
                 break;
               case 212:
               ;
@@ -22161,10 +23821,10 @@
               case 214:
               ;
               case 215:
-                r[la - 212] = w.pop();
+                q[ja - 212] = w.pop();
                 break;
               case 6:
-                d.AVM2.AS.ASXML.defaultNamespace = Q[Y.index];
+                d.AVM2.AS.ASXML.defaultNamespace = J[V.index];
                 break;
               case 7:
                 d.AVM2.AS.ASXML.defaultNamespace = w.pop();
@@ -22176,28 +23836,28 @@
               case 241:
                 break;
               default:
-                d.Debug.notImplemented(d.AVM2.opcodeName(la));
+                d.Debug.notImplemented(d.AVM2.opcodeName(ja));
             }
-            W++;
-          } catch (na) {
-            if (1 > $.length) {
-              throw na;
-            }
-            for (var na = x(aa, na), Z = 0, sa = $.length;Z < sa;Z++) {
-              var pa = $[Z];
-              if (W >= pa.start && W <= pa.end && (!pa.typeName || aa.getType(pa.typeName).isType(na))) {
+            O++;
+          } catch (ma) {
+            if (1 > ba.length) {
+              throw ma;
+            }
+            for (var ma = r(W, ma), M = 0, ra = ba.length;M < ra;M++) {
+              var na = ba[M];
+              if (O >= na.start && O <= na.end && (!na.typeName || W.getType(na.typeName).isType(ma))) {
                 w.length = 0;
-                w.push(na);
-                U.clear();
-                W = pa.offset;
+                w.push(ma);
+                X.clear();
+                O = na.offset;
                 continue a;
               }
             }
-            throw na;
+            throw ma;
           }
         }
       };
-      return r;
+      return q;
     }();
     k.Interpreter = B;
   })(d.AVM2 || (d.AVM2 = {}));
@@ -22259,7 +23919,7 @@
         b.writeByte(0), b.writeByte(0);
       }
     }
-    function r(b) {
+    function q(b) {
       var a = b.readByte() << 8 | b.readByte();
       if (!a) {
         return "";
@@ -22276,13 +23936,13 @@
         b.writeByte(f.getUint8(c));
       }
     }
-    function u(b) {
+    function t(b) {
       for (var a = new ArrayBuffer(8), e = new DataView(a), f = 0;f < a.byteLength;f++) {
         e.setUint8(f, b.readByte());
       }
       return e.getFloat64(0, !1);
     }
-    function t(b) {
+    function u(b) {
       var a = b.readByte();
       if (0 === (a & 128)) {
         return a;
@@ -22318,7 +23978,7 @@
       }
     }
     function c(b, a) {
-      var e = t(b);
+      var e = u(b);
       if (1 === e) {
         return "";
       }
@@ -22360,77 +24020,77 @@
         case 3:
           return!0;
         case 4:
-          return t(a);
-        case 5:
           return u(a);
+        case 5:
+          return t(a);
         case 6:
           return c(a, e);
         case 8:
-          return new Date(u(a));
+          return new Date(t(a));
         case 10:
-          var h = t(a);
+          var h = u(a);
           if (0 === (h & 1)) {
             return e.objectsCache[h >> 1];
           }
           if (0 !== (h & 4)) {
             throw "AMF3 Traits-Ext is not supported";
           }
-          var d, m;
+          var m, d;
           if (0 === (h & 2)) {
-            d = e.traitsCache[h >> 2], m = d.class;
+            m = e.traitsCache[h >> 2], d = m.class;
           } else {
-            d = {};
+            m = {};
             f = c(a, e);
-            m = (d.className = f) && k.aliasesCache.names[f];
-            d.class = m;
-            d.isDynamic = 0 !== (h & 8);
-            d.members = [];
-            for (var l = m && m.instanceBindings.slots, f = 0, h = h >> 4;f < h;f++) {
-              for (var s = c(a, e), r = null, h = 1;l && h < l.length;h++) {
+            d = (m.className = f) && k.aliasesCache.names[f];
+            m.class = d;
+            m.isDynamic = 0 !== (h & 8);
+            m.members = [];
+            for (var l = d && d.instanceBindings.slots, f = 0, h = h >> 4;f < h;f++) {
+              for (var s = c(a, e), q = null, h = 1;l && h < l.length;h++) {
                 if (l[h].name.name === s) {
-                  r = l[h];
+                  q = l[h];
                   break;
                 }
               }
-              d.members.push(r ? g.getQualifiedName(r.name) : g.getPublicQualifiedName(s));
+              m.members.push(q ? g.getQualifiedName(q.name) : g.getPublicQualifiedName(s));
             }
-            (e.traitsCache || (e.traitsCache = [])).push(d);
+            (e.traitsCache || (e.traitsCache = [])).push(m);
           }
-          l = m ? b(m, []) : {};
+          l = d ? b(d, []) : {};
           (e.objectsCache || (e.objectsCache = [])).push(l);
-          for (f = 0;f < d.members.length;f++) {
-            m = p(a, e), l[d.members[f]] = m;
+          for (f = 0;f < m.members.length;f++) {
+            d = p(a, e), l[m.members[f]] = d;
           }
-          if (d.isDynamic) {
+          if (m.isDynamic) {
             for (;;) {
               f = c(a, e);
               if (!f.length) {
                 break;
               }
-              m = p(a, e);
-              l.asSetPublicProperty(f, m);
+              d = p(a, e);
+              l.asSetPublicProperty(f, d);
             }
           }
           return l;
         case 9:
-          h = t(a);
+          h = u(a);
           if (0 === (h & 1)) {
             return e.objectsCache[h >> 1];
           }
-          d = [];
-          (e.objectsCache || (e.objectsCache = [])).push(d);
+          m = [];
+          (e.objectsCache || (e.objectsCache = [])).push(m);
           for (l = h >> 1;;) {
             f = c(a, e);
             if (!f.length) {
               break;
             }
-            m = p(a, e);
-            d.asSetPublicProperty(f, m);
+            d = p(a, e);
+            m.asSetPublicProperty(f, d);
           }
           for (f = 0;f < l;f++) {
-            m = p(a, e), d.asSetPublicProperty(f, m);
+            d = p(a, e), m.asSetPublicProperty(f, d);
           }
-          return d;
+          return m;
         default:
           throw "AMF3 Unknown marker " + f;;
       }
@@ -22492,29 +24152,29 @@
                 if (s(b, a, e)) {
                   break;
                 }
-                var p = !0, r = a.class;
-                if (r) {
-                  var p = !r.classInfo.instanceInfo.isSealed(), u = k.aliasesCache.classes.get(r) || "", t, J = e.traitsCache || (e.traitsCache = []), M = e.traitsInfos || (e.traitsInfos = []), D = J.indexOf(r);
-                  if (0 > D) {
-                    var B = r.instanceBindings.slots;
-                    t = [];
-                    for (var D = [], E = 1;E < B.length;E++) {
-                      var y = B[E];
-                      y.name.getNamespace().isPublic() && (t.push(g.getQualifiedName(y.name)), D.push(y.name.name));
-                    }
-                    J.push(r);
-                    M.push(t);
-                    r = D.length;
-                    l(b, (p ? 11 : 3) + (r << 4));
-                    h(b, u, e);
-                    for (E = 0;E < r;E++) {
-                      h(b, D[E], e);
+                var p = !0, q = a.class;
+                if (q) {
+                  var p = !q.classInfo.instanceInfo.isSealed(), t = k.aliasesCache.classes.get(q) || "", u, Q = e.traitsCache || (e.traitsCache = []), N = e.traitsInfos || (e.traitsInfos = []), B = Q.indexOf(q);
+                  if (0 > B) {
+                    var y = q.instanceBindings.slots;
+                    u = [];
+                    for (var B = [], L = 1;L < y.length;L++) {
+                      var A = y[L];
+                      A.name.getNamespace().isPublic() && (u.push(g.getQualifiedName(A.name)), B.push(A.name.name));
+                    }
+                    Q.push(q);
+                    N.push(u);
+                    q = B.length;
+                    l(b, (p ? 11 : 3) + (q << 4));
+                    h(b, t, e);
+                    for (L = 0;L < q;L++) {
+                      h(b, B[L], e);
                     }
                   } else {
-                    t = M[D], r = t.length, l(b, 1 + (D << 2));
+                    u = N[B], q = u.length, l(b, 1 + (B << 2));
                   }
-                  for (E = 0;E < r;E++) {
-                    m(b, a[t[E]], e);
+                  for (L = 0;L < q;L++) {
+                    m(b, a[u[L]], e);
                   }
                 } else {
                   l(b, 11), h(b, "", e);
@@ -22581,14 +24241,14 @@
         var a = b.readByte();
         switch(a) {
           case 0:
-            return u(b);
+            return t(b);
           case 1:
             return!!b.readByte();
           case 2:
-            return r(b);
+            return q(b);
           case 3:
             for (var e = {};;) {
-              a = r(b);
+              a = q(b);
               if (!a.length) {
                 break;
               }
@@ -22606,7 +24266,7 @@
           case 8:
             e = [];
             for (e.length = b.readByte() << 24 | b.readByte() << 16 | b.readByte() << 8 | b.readByte();;) {
-              a = r(b);
+              a = q(b);
               if (!a.length) {
                 break;
               }
@@ -22673,7 +24333,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(a, c, d) {
+      function q(a, c, d) {
         return k(a, c, d) << 32 - d >> 32 - d;
       }
       function k(a, c, d) {
@@ -22681,12 +24341,12 @@
           m = m << 8 | a[c.pos++], g += 8;
         }
         g -= d;
-        a = m >>> g & t[d];
+        a = m >>> g & u[d];
         c.bitBuffer = m;
         c.bitLength = g;
         return a;
       }
-      var u = Math.pow;
+      var t = Math.pow;
       a.readSi8 = function(a, c) {
         return c.getInt8(c.pos++);
       };
@@ -22715,7 +24375,7 @@
         var d = c.getUint16(c.pos);
         c.pos += 2;
         var m = d >> 15 ? -1 : 1, g = (d & 31744) >> 10, d = d & 1023;
-        return g ? 31 === g ? d ? NaN : Infinity * m : m * u(2, g - 15) * (1 + d / 1024) : m * u(2, -14) * (d / 1024);
+        return g ? 31 === g ? d ? NaN : Infinity * m : m * t(2, g - 15) * (1 + d / 1024) : m * t(2, -14) * (d / 1024);
       };
       a.readFloat = function(a, c) {
         return c.getFloat32(c.pos, c.pos += 4);
@@ -22745,13 +24405,13 @@
       a.align = function(a, c) {
         c.align();
       };
-      a.readSb = r;
-      for (var t = new Uint32Array(33), l = 1, c = 0;32 >= l;++l) {
-        t[l] = c = c << 1 | 1;
+      a.readSb = q;
+      for (var u = new Uint32Array(33), l = 1, c = 0;32 >= l;++l) {
+        u[l] = c = c << 1 | 1;
       }
       a.readUb = k;
       a.readFb = function(a, c, d) {
-        return r(a, c, d) / 65536;
+        return q(a, c, d) / 65536;
       };
       a.readString = function(a, c, l) {
         var m = c.pos;
@@ -22776,57 +24436,57 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
-        function k(b, f, c, g, h) {
+      (function(k) {
+        function v(b, f, c, g, h) {
           c || (c = {});
           c.id = a.readUi16(b, f);
           var n = c.lineBounds = {};
           e(b, f, n, g, h);
           if (n = c.isMorph = 46 === h || 84 === h) {
-            var q = c.lineBoundsMorph = {};
-            e(b, f, q, g, h);
+            var m = c.lineBoundsMorph = {};
+            e(b, f, m, g, h);
           }
-          if (q = c.canHaveStrokes = 83 === h || 84 === h) {
-            var d = c.fillBounds = {};
-            e(b, f, d, g, h);
-            n && (d = c.fillBoundsMorph = {}, e(b, f, d, g, h));
+          if (m = c.canHaveStrokes = 83 === h || 84 === h) {
+            var r = c.fillBounds = {};
+            e(b, f, r, g, h);
+            n && (r = c.fillBoundsMorph = {}, e(b, f, r, g, h));
             c.flags = a.readUi8(b, f);
           }
           if (n) {
             c.offsetMorph = a.readUi32(b, f);
-            var m = c, l, p, d = H(b, f, m, g, h, n, q), s = d.lineBits, r = d.fillBits, x = m.records = [];
+            var d = c, l, p, r = F(b, f, d, g, h, n, m), s = r.lineBits, k = r.fillBits, x = d.records = [];
             do {
-              var u = {}, d = A(b, f, u, g, h, n, r, s, q, p);
-              l = d.eos;
-              r = d.fillBits;
-              s = d.lineBits;
-              p = d.bits;
-              x.push(u);
+              var q = {}, r = C(b, f, q, g, h, n, k, s, m, p);
+              l = r.eos;
+              k = r.fillBits;
+              s = r.lineBits;
+              p = r.bits;
+              x.push(q);
             } while (!l);
-            d = K(b, f);
-            r = d.fillBits;
-            s = d.lineBits;
-            m = m.recordsMorph = [];
+            r = K(b, f);
+            k = r.fillBits;
+            s = r.lineBits;
+            d = d.recordsMorph = [];
             do {
-              x = {}, d = A(b, f, x, g, h, n, r, s, q, p), l = d.eos, r = d.fillBits, s = d.lineBits, p = d.bits, m.push(x);
+              x = {}, r = C(b, f, x, g, h, n, k, s, m, p), l = r.eos, k = r.fillBits, s = r.lineBits, p = r.bits, d.push(x);
             } while (!l);
           } else {
-            r = c;
-            p = H(b, f, r, g, h, n, q);
-            d = p.fillBits;
+            k = c;
+            p = F(b, f, k, g, h, n, m);
+            r = p.fillBits;
             s = p.lineBits;
-            m = r.records = [];
+            d = k.records = [];
             do {
-              x = {}, p = A(b, f, x, g, h, n, d, s, q, l), r = p.eos, d = p.fillBits, s = p.lineBits, l = p.bits, m.push(x);
-            } while (!r);
+              x = {}, p = C(b, f, x, g, h, n, r, s, m, l), k = p.eos, r = p.fillBits, s = p.lineBits, l = p.bits, d.push(x);
+            } while (!k);
           }
           return c;
         }
-        function u(b, e, f, c, g, h) {
+        function t(b, e, f, c, g, h) {
           var n;
           f || (f = {});
           if (4 === g) {
-            return f.symbolId = a.readUi16(b, e), f.depth = a.readUi16(b, e), f.flags |= 4, f.matrix = x(b, e), e.pos < h && (f.flags |= 8, c = f.cxform = {}, L(b, e, c, g)), f;
+            return f.symbolId = a.readUi16(b, e), f.depth = a.readUi16(b, e), f.flags |= 4, f.matrix = x(b, e), e.pos < h && (f.flags |= 8, c = f.cxform = {}, H(b, e, c, g)), f;
           }
           n = f.flags = 26 < g ? a.readUi16(b, e) : a.readUi8(b, e);
           f.depth = a.readUi16(b, e);
@@ -22834,32 +24494,32 @@
           n & 2 && (f.symbolId = a.readUi16(b, e));
           n & 4 && (f.matrix = x(b, e));
           if (n & 8) {
-            var q = f.cxform = {};
-            L(b, e, q, g);
+            var m = f.cxform = {};
+            H(b, e, m, g);
           }
           n & 16 && (f.ratio = a.readUi16(b, e));
           n & 32 && (f.name = a.readString(b, e, 0));
           n & 64 && (f.clipDepth = a.readUi16(b, e));
           if (n & 256) {
-            for (q = a.readUi8(b, e), g = f.filters = [];q--;) {
-              var d = {};
-              J(b, e, d);
-              g.push(d);
+            for (m = a.readUi8(b, e), g = f.filters = [];m--;) {
+              var r = {};
+              Q(b, e, r);
+              g.push(r);
             }
           }
           n & 512 && (f.blendMode = a.readUi8(b, e));
           n & 1024 && (f.bmpCache = a.readUi8(b, e));
           n & 8192 && (f.visibility = a.readUi8(b, e));
-          n & 16384 && (g = f, q = a.readUi8(b, e) | a.readUi8(b, e) << 24 | a.readUi8(b, e) << 16 | a.readUi8(b, e) << 8, g.backgroundColor = q);
+          n & 16384 && (g = f, m = a.readUi8(b, e) | a.readUi8(b, e) << 24 | a.readUi8(b, e) << 16 | a.readUi8(b, e) << 8, g.backgroundColor = m);
           if (n & 128) {
             a.readUi16(b, e);
             6 <= c ? a.readUi32(b, e) : a.readUi16(b, e);
             n = f.events = [];
             do {
               g = {};
-              var q = b, d = e, m = g, l = c, p = m.flags = 6 <= l ? a.readUi32(q, d) : a.readUi16(q, d);
-              p ? (6 === l && (p &= -262145), l = m.length = a.readUi32(q, d), p & 131072 && (m.keyCode = a.readUi8(q, d), l--), p = d.pos + l, m.actionsData = q.subarray(d.pos, p), d.pos = p, q = !1) : q = !0;
-              if (q) {
+              var m = b, r = e, d = g, l = c, p = d.flags = 6 <= l ? a.readUi32(m, r) : a.readUi16(m, r);
+              p ? (6 === l && (p &= -262145), l = d.length = a.readUi32(m, r), p & 131072 && (d.keyCode = a.readUi8(m, r), l--), p = r.pos + l, d.actionsData = m.subarray(r.pos, p), r.pos = p, m = !1) : m = !0;
+              if (m) {
                 break;
               }
               if (e.pos > h) {
@@ -22871,7 +24531,7 @@
           }
           return f;
         }
-        function t(b, e, f, c, g) {
+        function u(b, e, f, c, g) {
           f || (f = {});
           5 === g && (f.symbolId = a.readUi16(b, e));
           f.depth = a.readUi16(b, e);
@@ -22881,11 +24541,11 @@
           c = f || {};
           c.id = a.readUi16(b, e);
           if (21 < g) {
-            var q = a.readUi32(b, e);
+            var m = a.readUi32(b, e);
             90 === g && (c.deblock = a.readFixed8(b, e));
-            q += e.pos;
-            f = c.imgData = b.subarray(e.pos, q);
-            c.alphaData = b.subarray(q, h);
+            m += e.pos;
+            f = c.imgData = b.subarray(e.pos, m);
+            c.alphaData = b.subarray(m, h);
           } else {
             f = c.imgData = b.subarray(e.pos, h);
           }
@@ -22913,63 +24573,63 @@
           f || (f = {});
           f.id = a.readUi16(b, e);
           if (7 == g) {
-            var q = f.characters = [];
+            var m = f.characters = [];
             do {
-              var d = {};
+              var r = {};
               n = b;
-              var m = e, l = d, p = c, s = g, r = a.readUi8(n, m), k = l.eob = !r;
-              l.flags = 8 <= p ? (r >> 5 & 1 ? 512 : 0) | (r >> 4 & 1 ? 256 : 0) : 0;
-              l.stateHitTest = r >> 3 & 1;
-              l.stateDown = r >> 2 & 1;
-              l.stateOver = r >> 1 & 1;
-              l.stateUp = r & 1;
-              k || (l.symbolId = a.readUi16(n, m), l.depth = a.readUi16(n, m), l.matrix = x(n, m), 34 === s && (p = l.cxform = {}, L(n, m, p, s)), l.flags & 256 && (l.filterCount = a.readUi8(n, m), s = l.filters = {}, J(n, m, s)), l.flags & 512 && (l.blendMode = a.readUi8(n, m)));
-              n = k;
-              q.push(d);
+              var d = e, l = r, p = c, s = g, k = a.readUi8(n, d), q = l.eob = !k;
+              l.flags = 8 <= p ? (k >> 5 & 1 ? 512 : 0) | (k >> 4 & 1 ? 256 : 0) : 0;
+              l.stateHitTest = k >> 3 & 1;
+              l.stateDown = k >> 2 & 1;
+              l.stateOver = k >> 1 & 1;
+              l.stateUp = k & 1;
+              q || (l.symbolId = a.readUi16(n, d), l.depth = a.readUi16(n, d), l.matrix = x(n, d), 34 === s && (p = l.cxform = {}, H(n, d, p, s)), l.flags & 256 && (l.filterCount = a.readUi8(n, d), s = l.filters = {}, Q(n, d, s)), l.flags & 512 && (l.blendMode = a.readUi8(n, d)));
+              n = q;
+              m.push(r);
             } while (!n);
             f.actionsData = b.subarray(e.pos, h);
             e.pos = h;
           } else {
-            q = a.readUi8(b, e);
-            f.trackAsMenu = q >> 7 & 1;
-            d = a.readUi16(b, e);
-            q = f.characters = [];
+            m = a.readUi8(b, e);
+            f.trackAsMenu = m >> 7 & 1;
+            r = a.readUi16(b, e);
+            m = f.characters = [];
             do {
-              m = {};
+              d = {};
               l = a.readUi8(b, e);
-              n = m.eob = !l;
-              m.flags = 8 <= c ? (l >> 5 & 1 ? 512 : 0) | (l >> 4 & 1 ? 256 : 0) : 0;
-              m.stateHitTest = l >> 3 & 1;
-              m.stateDown = l >> 2 & 1;
-              m.stateOver = l >> 1 & 1;
-              m.stateUp = l & 1;
+              n = d.eob = !l;
+              d.flags = 8 <= c ? (l >> 5 & 1 ? 512 : 0) | (l >> 4 & 1 ? 256 : 0) : 0;
+              d.stateHitTest = l >> 3 & 1;
+              d.stateDown = l >> 2 & 1;
+              d.stateOver = l >> 1 & 1;
+              d.stateUp = l & 1;
               if (!n) {
-                m.symbolId = a.readUi16(b, e);
-                m.depth = a.readUi16(b, e);
-                m.matrix = x(b, e);
-                34 === g && (l = m.cxform = {}, L(b, e, l, g));
-                if (m.flags & 256) {
-                  for (k = a.readUi8(b, e), l = f.filters = [];k--;) {
-                    s = {}, J(b, e, s), l.push(s);
+                d.symbolId = a.readUi16(b, e);
+                d.depth = a.readUi16(b, e);
+                d.matrix = x(b, e);
+                34 === g && (l = d.cxform = {}, H(b, e, l, g));
+                if (d.flags & 256) {
+                  for (q = a.readUi8(b, e), l = f.filters = [];q--;) {
+                    s = {}, Q(b, e, s), l.push(s);
                   }
                 }
-                m.flags & 512 && (m.blendMode = a.readUi8(b, e));
+                d.flags & 512 && (d.blendMode = a.readUi8(b, e));
               }
-              q.push(m);
+              m.push(d);
             } while (!n);
-            if (d) {
+            if (r) {
               for (c = f.buttonActions = [];e.pos < h;) {
                 g = b;
-                q = e;
+                m = e;
                 n = h;
-                d = q.pos;
-                n = (m = a.readUi16(g, q)) ? d + m : n;
-                m = a.readUi16(g, q);
-                q.pos = n;
+                r = m.pos;
+                n = (d = a.readUi16(g, m)) ? r + d : n;
+                d = a.readUi16(g, m);
+                m.pos = n;
                 if (e.pos > h) {
                   break;
                 }
-                c.push({keyCode:(m & 65024) >> 9, stateTransitionFlags:m & 511, actionsData:g.subarray(d + 4, n)});
+                c.push({keyCode:(d & 65024) >> 9, stateTransitionFlags:d & 511, actionsData:g.subarray(r + 4, n)});
               }
               e.pos = h;
             }
@@ -22979,43 +24639,43 @@
         function h(b, e, f, c, g) {
           f || (f = {});
           f.id = a.readUi16(b, e);
-          for (var h = a.readUi16(b, e), n = f.glyphCount = h / 2, q = [], d = n - 1;d--;) {
-            q.push(a.readUi16(b, e));
+          for (var h = a.readUi16(b, e), n = f.glyphCount = h / 2, m = [], r = n - 1;r--;) {
+            m.push(a.readUi16(b, e));
           }
-          f.offsets = [h].concat(q);
+          f.offsets = [h].concat(m);
           for (h = f.glyphs = [];n--;) {
-            q = {}, M(b, e, q, c, g), h.push(q);
+            m = {}, N(b, e, m, c, g), h.push(m);
           }
           return f;
         }
         function p(b, f, c, g, h) {
-          var d;
+          var m;
           c || (c = {});
           c.id = a.readUi16(b, f);
-          var m = c.bbox = {};
-          e(b, f, m, g, h);
+          var d = c.bbox = {};
+          e(b, f, d, g, h);
           c.matrix = x(b, f);
           g = c.glyphBits = a.readUi8(b, f);
-          var m = c.advanceBits = a.readUi8(b, f), l = c.records = [];
+          var d = c.advanceBits = a.readUi8(b, f), l = c.records = [];
           do {
             var p = {};
-            d = b;
-            var s = f, r = p, k = h, u = g, t = m, L = void 0;
-            a.align(d, s);
-            var v = a.readUb(d, s, 8), A = r.eot = !v, L = d, H = s, K = r, F = v, v = K.hasFont = F >> 3 & 1, J = K.hasColor = F >> 2 & 1, M = K.hasMoveY = F >> 1 & 1, F = K.hasMoveX = F & 1;
-            v && (K.fontId = a.readUi16(L, H));
-            J && (K.color = 33 === k ? n(L, H) : q(L, H));
-            F && (K.moveX = a.readSi16(L, H));
-            M && (K.moveY = a.readSi16(L, H));
-            v && (K.fontHeight = a.readUi16(L, H));
-            if (!A) {
-              for (L = a.readUi8(d, s), L = r.glyphCount = L, r = r.entries = [];L--;) {
-                H = {}, K = d, k = s, v = H, J = t, v.glyphIndex = a.readUb(K, k, u), v.advance = a.readSb(K, k, J), r.push(H);
+            m = b;
+            var s = f, k = p, q = h, t = g, u = d, H = void 0;
+            a.align(m, s);
+            var v = a.readUb(m, s, 8), C = k.eot = !v, H = m, F = s, K = k, E = v, v = K.hasFont = E >> 3 & 1, Q = K.hasColor = E >> 2 & 1, N = K.hasMoveY = E >> 1 & 1, E = K.hasMoveX = E & 1;
+            v && (K.fontId = a.readUi16(H, F));
+            Q && (K.color = 33 === q ? r(H, F) : n(H, F));
+            E && (K.moveX = a.readSi16(H, F));
+            N && (K.moveY = a.readSi16(H, F));
+            v && (K.fontHeight = a.readUi16(H, F));
+            if (!C) {
+              for (H = a.readUi8(m, s), H = k.glyphCount = H, k = k.entries = [];H--;) {
+                F = {}, K = m, q = s, v = F, Q = u, v.glyphIndex = a.readUb(K, q, t), v.advance = a.readSb(K, q, Q), k.push(F);
               }
             }
-            d = A;
+            m = C;
             l.push(p);
-          } while (!d);
+          } while (!m);
           return c;
         }
         function s(b, e, f, c, g) {
@@ -23027,19 +24687,19 @@
           a.readUb(b, e, 2);
           g.stop = a.readUb(b, e, 1);
           g.noMultiple = a.readUb(b, e, 1);
-          var h = g.hasEnvelope = a.readUb(b, e, 1), n = g.hasLoops = a.readUb(b, e, 1), q = g.hasOutPoint = a.readUb(b, e, 1);
+          var h = g.hasEnvelope = a.readUb(b, e, 1), n = g.hasLoops = a.readUb(b, e, 1), m = g.hasOutPoint = a.readUb(b, e, 1);
           if (g.hasInPoint = a.readUb(b, e, 1)) {
             g.inPoint = a.readUi32(b, e);
           }
-          q && (g.outPoint = a.readUi32(b, e));
+          m && (g.outPoint = a.readUi32(b, e));
           n && (g.loopCount = a.readUi16(b, e));
           if (h) {
             for (n = g.envelopeCount = a.readUi8(b, e), h = g.envelopes = [];n--;) {
-              var q = {}, d = b, m = e, l = q;
-              l.pos44 = a.readUi32(d, m);
-              l.volumeLeft = a.readUi16(d, m);
-              l.volumeRight = a.readUi16(d, m);
-              h.push(q);
+              var m = {}, r = b, d = e, l = m;
+              l.pos44 = a.readUi32(r, d);
+              l.volumeLeft = a.readUi16(r, d);
+              l.volumeRight = a.readUi16(r, d);
+              h.push(m);
             }
           }
           c.soundInfo = g;
@@ -23060,11 +24720,11 @@
         function g(b, f, c, g, h) {
           c || (c = {});
           c.id = a.readUi16(b, f);
-          var n = a.readUi8(b, f), q = c.hasLayout = n & 128 ? 1 : 0;
+          var n = a.readUi8(b, f), m = c.hasLayout = n & 128 ? 1 : 0;
           c.shiftJis = 5 < g && n & 64 ? 1 : 0;
           c.smallText = n & 32 ? 1 : 0;
           c.ansi = n & 16 ? 1 : 0;
-          var d = c.wideOffset = n & 8 ? 1 : 0, m = c.wide = n & 4 ? 1 : 0;
+          var r = c.wideOffset = n & 8 ? 1 : 0, d = c.wide = n & 4 ? 1 : 0;
           c.italic = n & 2 ? 1 : 0;
           c.bold = n & 1 ? 1 : 0;
           5 < g ? c.language = a.readUi8(b, f) : (a.readUi8(b, f), c.language = 0);
@@ -23076,46 +24736,46 @@
             return c;
           }
           var l = f.pos;
-          if (d) {
-            for (var d = c.offsets = [], p = n;p--;) {
-              d.push(a.readUi32(b, f));
+          if (r) {
+            for (var r = c.offsets = [], p = n;p--;) {
+              r.push(a.readUi32(b, f));
             }
             c.mapOffset = a.readUi32(b, f);
           } else {
-            d = c.offsets = [];
+            r = c.offsets = [];
             for (p = n;p--;) {
-              d.push(a.readUi16(b, f));
+              r.push(a.readUi16(b, f));
             }
             c.mapOffset = a.readUi16(b, f);
           }
-          d = c.glyphs = [];
+          r = c.glyphs = [];
           for (p = n;p--;) {
             var s = {};
-            1 === c.offsets[n - p] + l - f.pos ? (a.readUi8(b, f), d.push({records:[{type:0, eos:!0, hasNewStyles:0, hasLineStyle:0, hasFillStyle1:0, hasFillStyle0:0, move:0}]})) : (M(b, f, s, g, h), d.push(s));
+            1 === c.offsets[n - p] + l - f.pos ? (a.readUi8(b, f), r.push({records:[{type:0, eos:!0, hasNewStyles:0, hasLineStyle:0, hasFillStyle1:0, hasFillStyle0:0, move:0}]})) : (N(b, f, s, g, h), r.push(s));
           }
-          if (m) {
-            for (l = c.codes = [], d = n;d--;) {
+          if (d) {
+            for (l = c.codes = [], r = n;r--;) {
               l.push(a.readUi16(b, f));
             }
           } else {
-            for (l = c.codes = [], d = n;d--;) {
+            for (l = c.codes = [], r = n;r--;) {
               l.push(a.readUi8(b, f));
             }
           }
-          if (q) {
+          if (m) {
             c.ascent = a.readUi16(b, f);
             c.descent = a.readUi16(b, f);
             c.leading = a.readSi16(b, f);
-            q = c.advance = [];
+            m = c.advance = [];
             for (l = n;l--;) {
-              q.push(a.readSi16(b, f));
+              m.push(a.readSi16(b, f));
             }
-            for (q = c.bbox = [];n--;) {
-              l = {}, e(b, f, l, g, h), q.push(l);
+            for (m = c.bbox = [];n--;) {
+              l = {}, e(b, f, l, g, h), m.push(l);
             }
             h = a.readUi16(b, f);
             for (g = c.kerning = [];h--;) {
-              n = {}, q = b, l = f, d = n, m ? (d.code1 = a.readUi16(q, l), d.code2 = a.readUi16(q, l)) : (d.code1 = a.readUi8(q, l), d.code2 = a.readUi8(q, l)), d.adjustment = a.readUi16(q, l), g.push(n);
+              n = {}, m = b, l = f, r = n, d ? (r.code1 = a.readUi16(m, l), r.code2 = a.readUi16(m, l)) : (r.code1 = a.readUi8(m, l), r.code2 = a.readUi8(m, l)), r.adjustment = a.readUi16(m, l), g.push(n);
             }
           }
           return c;
@@ -23157,10 +24817,10 @@
           f.yMax = h;
           a.align(b, e);
         }
-        function q(b, e) {
+        function n(b, e) {
           return(a.readUi8(b, e) << 24 | a.readUi8(b, e) << 16 | a.readUi8(b, e) << 8 | 255) >>> 0;
         }
-        function n(b, e) {
+        function r(b, e) {
           return a.readUi8(b, e) << 24 | a.readUi8(b, e) << 16 | a.readUi8(b, e) << 8 | a.readUi8(b, e);
         }
         function x(b, e) {
@@ -23180,62 +24840,62 @@
           a.align(b, e);
           return f;
         }
-        function L(b, e, f, c) {
+        function H(b, e, f, c) {
           a.align(b, e);
           var g = a.readUb(b, e, 1), h = a.readUb(b, e, 1), n = a.readUb(b, e, 4);
           h ? (f.redMultiplier = a.readSb(b, e, n), f.greenMultiplier = a.readSb(b, e, n), f.blueMultiplier = a.readSb(b, e, n), f.alphaMultiplier = 4 < c ? a.readSb(b, e, n) : 256) : (f.redMultiplier = 256, f.greenMultiplier = 256, f.blueMultiplier = 256, f.alphaMultiplier = 256);
           g ? (f.redOffset = a.readSb(b, e, n), f.greenOffset = a.readSb(b, e, n), f.blueOffset = a.readSb(b, e, n), f.alphaOffset = 4 < c ? a.readSb(b, e, n) : 0) : (f.redOffset = 0, f.greenOffset = 0, f.blueOffset = 0, f.alphaOffset = 0);
           a.align(b, e);
         }
-        function A(b, e, f, c, g, h, n, q, d, m) {
+        function C(b, e, f, c, g, h, n, m, r, d) {
           var l, p = f.type = a.readUb(b, e, 1), s = a.readUb(b, e, 5);
           l = f.eos = !(p || s);
           if (p) {
             c = (s & 15) + 2, (f.isStraight = s >> 4) ? (f.isGeneral = a.readUb(b, e, 1)) ? (f.deltaX = a.readSb(b, e, c), f.deltaY = a.readSb(b, e, c)) : (f.isVertical = a.readUb(b, e, 1)) ? f.deltaY = a.readSb(b, e, c) : f.deltaX = a.readSb(b, e, c) : (f.controlDeltaX = a.readSb(b, e, c), f.controlDeltaY = a.readSb(b, e, c), f.anchorDeltaX = a.readSb(b, e, c), f.anchorDeltaY = a.readSb(b, e, c)), b = c;
           } else {
-            var r = f.hasNewStyles = 2 < g ? s >> 4 : 0, k = f.hasLineStyle = s >> 3 & 1, x = f.hasFillStyle1 = s >> 2 & 1, u = f.hasFillStyle0 = s >> 1 & 1;
+            var k = f.hasNewStyles = 2 < g ? s >> 4 : 0, x = f.hasLineStyle = s >> 3 & 1, q = f.hasFillStyle1 = s >> 2 & 1, t = f.hasFillStyle0 = s >> 1 & 1;
             if (f.move = s & 1) {
-              m = a.readUb(b, e, 5), f.moveX = a.readSb(b, e, m), f.moveY = a.readSb(b, e, m);
+              d = a.readUb(b, e, 5), f.moveX = a.readSb(b, e, d), f.moveY = a.readSb(b, e, d);
             }
-            u && (f.fillStyle0 = a.readUb(b, e, n));
-            x && (f.fillStyle1 = a.readUb(b, e, n));
-            k && (f.lineStyle = a.readUb(b, e, q));
-            r && (b = H(b, e, f, c, g, h, d), q = b.lineBits, n = b.fillBits);
-            b = m;
-          }
-          return{type:p, flags:s, eos:l, fillBits:n, lineBits:q, bits:b};
-        }
-        function H(b, e, f, c, g, h, d) {
-          var m, l = a.readUi8(b, e);
-          m = 2 < g && 255 === l ? a.readUi16(b, e) : l;
-          for (l = f.fillStyles = [];m--;) {
+            t && (f.fillStyle0 = a.readUb(b, e, n));
+            q && (f.fillStyle1 = a.readUb(b, e, n));
+            x && (f.lineStyle = a.readUb(b, e, m));
+            k && (b = F(b, e, f, c, g, h, r), m = b.lineBits, n = b.fillBits);
+            b = d;
+          }
+          return{type:p, flags:s, eos:l, fillBits:n, lineBits:m, bits:b};
+        }
+        function F(b, e, f, c, g, h, m) {
+          var d, l = a.readUi8(b, e);
+          d = 2 < g && 255 === l ? a.readUi16(b, e) : l;
+          for (l = f.fillStyles = [];d--;) {
             var p = {};
-            F(b, e, p, c, g, h);
+            E(b, e, p, c, g, h);
             l.push(p);
           }
           l = a.readUi8(b, e);
           l = 2 < g && 255 === l ? a.readUi16(b, e) : l;
           for (f = f.lineStyles = [];l--;) {
-            m = {};
-            var p = b, s = e, r = m, k = c, x = g, u = h, t = d;
-            r.width = a.readUi16(p, s);
-            u && (r.widthMorph = a.readUi16(p, s));
-            if (t) {
+            d = {};
+            var p = b, s = e, k = d, x = c, q = g, t = h, u = m;
+            k.width = a.readUi16(p, s);
+            t && (k.widthMorph = a.readUi16(p, s));
+            if (u) {
               a.align(p, s);
-              r.startCapsStyle = a.readUb(p, s, 2);
-              var t = r.jointStyle = a.readUb(p, s, 2), L = r.hasFill = a.readUb(p, s, 1);
-              r.noHscale = a.readUb(p, s, 1);
-              r.noVscale = a.readUb(p, s, 1);
-              r.pixelHinting = a.readUb(p, s, 1);
+              k.startCapsStyle = a.readUb(p, s, 2);
+              var u = k.jointStyle = a.readUb(p, s, 2), H = k.hasFill = a.readUb(p, s, 1);
+              k.noHscale = a.readUb(p, s, 1);
+              k.noVscale = a.readUb(p, s, 1);
+              k.pixelHinting = a.readUb(p, s, 1);
               a.readUb(p, s, 5);
-              r.noClose = a.readUb(p, s, 1);
-              r.endCapsStyle = a.readUb(p, s, 2);
-              2 === t && (r.miterLimitFactor = a.readFixed8(p, s));
-              L ? (r = r.fillStyle = {}, F(p, s, r, k, x, u)) : (r.color = n(p, s), u && (r.colorMorph = n(p, s)));
+              k.noClose = a.readUb(p, s, 1);
+              k.endCapsStyle = a.readUb(p, s, 2);
+              2 === u && (k.miterLimitFactor = a.readFixed8(p, s));
+              H ? (k = k.fillStyle = {}, E(p, s, k, x, q, t)) : (k.color = r(p, s), t && (k.colorMorph = r(p, s)));
             } else {
-              r.color = 22 < x ? n(p, s) : q(p, s), u && (r.colorMorph = n(p, s));
+              k.color = 22 < q ? r(p, s) : n(p, s), t && (k.colorMorph = r(p, s));
             }
-            f.push(m);
+            f.push(d);
           }
           b = K(b, e);
           return{fillBits:b.fillBits, lineBits:b.lineBits};
@@ -23245,12 +24905,12 @@
           var f = a.readUb(b, e, 4), c = a.readUb(b, e, 4);
           return{fillBits:f, lineBits:c};
         }
-        function F(b, e, f, c, g, h) {
+        function E(b, e, f, c, g, h) {
           c = f.type = a.readUi8(b, e);
           switch(c) {
             case 0:
-              f.color = 22 < g || h ? n(b, e) : q(b, e);
-              h && (f.colorMorph = n(b, e));
+              f.color = 22 < g || h ? r(b, e) : n(b, e);
+              h && (f.colorMorph = r(b, e));
               break;
             case 16:
             ;
@@ -23260,12 +24920,12 @@
               f.matrix = x(b, e);
               h && (f.matrixMorph = x(b, e));
               83 === g ? (f.spreadMode = a.readUb(b, e, 2), f.interpolationMode = a.readUb(b, e, 2)) : a.readUb(b, e, 4);
-              for (var d = f.count = a.readUb(b, e, 4), m = f.records = [];d--;) {
-                var l = {}, p = b, s = e, r = l, k = g, u = h;
-                r.ratio = a.readUi8(p, s);
-                r.color = 22 < k ? n(p, s) : q(p, s);
-                u && (r.ratioMorph = a.readUi8(p, s), r.colorMorph = n(p, s));
-                m.push(l);
+              for (var m = f.count = a.readUb(b, e, 4), d = f.records = [];m--;) {
+                var l = {}, p = b, s = e, k = l, q = g, t = h;
+                k.ratio = a.readUi8(p, s);
+                k.color = 22 < q ? r(p, s) : n(p, s);
+                t && (k.ratioMorph = a.readUi8(p, s), k.colorMorph = r(p, s));
+                d.push(l);
               }
               19 === c && (f.focalPoint = a.readSi16(b, e), h && (f.focalPointMorph = a.readSi16(b, e)));
               break;
@@ -23279,7 +24939,7 @@
               f.bitmapId = a.readUi16(b, e), f.condition = 64 === c || 67 === c, f.matrix = x(b, e), h && (f.matrixMorph = x(b, e));
           }
         }
-        function J(b, e, f) {
+        function Q(b, e, f) {
           var c = f.type = a.readUi8(b, e);
           switch(c) {
             case 0:
@@ -23293,10 +24953,10 @@
             case 7:
               var g;
               g = 4 === c || 7 === c ? a.readUi8(b, e) : 1;
-              for (var h = f.colors = [], q = g;q--;) {
-                h.push(n(b, e));
+              for (var h = f.colors = [], n = g;n--;) {
+                h.push(r(b, e));
               }
-              3 === c && (f.hightlightColor = n(b, e));
+              3 === c && (f.hightlightColor = r(b, e));
               if (4 === c || 7 === c) {
                 for (h = f.ratios = [];g--;) {
                   h.push(a.readUi8(b, e));
@@ -23326,7 +24986,7 @@
               for (g *= h;g--;) {
                 c.push(a.readFloat(b, e));
               }
-              f.color = n(b, e);
+              f.color = r(b, e);
               a.readUb(b, e, 6);
               f.clamp = a.readUb(b, e, 1);
               f.preserveAlpha = a.readUb(b, e, 1);
@@ -23338,23 +24998,23 @@
             ;
           }
         }
-        function M(b, a, e, f, c) {
+        function N(b, a, e, f, c) {
           var g, h;
           h = K(b, a);
-          var n = h.fillBits, q = h.lineBits, d = e.records = [];
+          var n = h.fillBits, m = h.lineBits, r = e.records = [];
           do {
-            var m = {};
-            h = A(b, a, m, f, c, !1, n, q, !1, g);
+            var d = {};
+            h = C(b, a, d, f, c, !1, n, m, !1, g);
             e = h.eos;
             n = h.fillBits;
-            q = h.lineBits;
+            m = h.lineBits;
             g = h.bits;
-            d.push(m);
+            r.push(d);
           } while (!e);
         }
-        r.defineImage = l;
-        r.defineFont = h;
-        r.soundStreamHead = function(b, e) {
+        k.defineImage = l;
+        k.defineFont = h;
+        k.soundStreamHead = function(b, e) {
           var f = {}, c = a.readUi8(b, e);
           f.playbackRate = c >> 2 & 3;
           f.playbackSize = c >> 1 & 1;
@@ -23367,12 +25027,12 @@
           2 == g && (f.latencySeek = a.readSi16(b, e));
           return f;
         };
-        r.defineBitmap = m;
-        r.defineFont2 = g;
-        r.defineFont4 = f;
-        r.defineScene = b;
-        r.rgb = q;
-        r.tagHandlers = {0:void 0, 1:void 0, 2:k, 4:u, 5:t, 6:l, 7:c, 8:void 0, 9:void 0, 10:h, 11:p, 12:void 0, 13:void 0, 14:function(b, e, f, c, g, h) {
+        k.defineBitmap = m;
+        k.defineFont2 = g;
+        k.defineFont4 = f;
+        k.defineScene = b;
+        k.rgb = n;
+        k.tagHandlers = {0:void 0, 1:void 0, 2:v, 4:t, 5:u, 6:l, 7:c, 8:void 0, 9:void 0, 10:h, 11:p, 12:void 0, 13:void 0, 14:function(b, e, f, c, g, h) {
           f || (f = {});
           f.id = a.readUi16(b, e);
           c = a.readUi8(b, e);
@@ -23384,18 +25044,18 @@
           f.soundData = b.subarray(e.pos, h);
           e.pos = h;
           return f;
-        }, 15:s, 17:void 0, 18:void 0, 19:void 0, 20:m, 21:l, 22:k, 23:void 0, 24:void 0, 26:u, 28:t, 32:k, 33:p, 34:c, 35:l, 36:m, 37:function(b, f, c, g, h) {
+        }, 15:s, 17:void 0, 18:void 0, 19:void 0, 20:m, 21:l, 22:v, 23:void 0, 24:void 0, 26:t, 28:u, 32:v, 33:p, 34:c, 35:l, 36:m, 37:function(b, f, c, g, h) {
           c || (c = {});
           c.id = a.readUi16(b, f);
-          var q = c.bbox = {};
-          e(b, f, q, g, h);
+          var n = c.bbox = {};
+          e(b, f, n, g, h);
           g = a.readUi16(b, f);
           h = c.hasText = g >> 7 & 1;
           c.wordWrap = g >> 6 & 1;
           c.multiline = g >> 5 & 1;
           c.password = g >> 4 & 1;
           c.readonly = g >> 3 & 1;
-          var q = c.hasColor = g >> 2 & 1, d = c.hasMaxLength = g >> 1 & 1, m = c.hasFont = g & 1, l = c.hasFontClass = g >> 15 & 1;
+          var n = c.hasColor = g >> 2 & 1, m = c.hasMaxLength = g >> 1 & 1, d = c.hasFont = g & 1, l = c.hasFontClass = g >> 15 & 1;
           c.autoSize = g >> 14 & 1;
           var p = c.hasLayout = g >> 13 & 1;
           c.noSelect = g >> 12 & 1;
@@ -23403,22 +25063,22 @@
           c.wasStatic = g >> 10 & 1;
           c.html = g >> 9 & 1;
           c.useOutlines = g >> 8 & 1;
-          m && (c.fontId = a.readUi16(b, f));
+          d && (c.fontId = a.readUi16(b, f));
           l && (c.fontClass = a.readString(b, f, 0));
-          m && (c.fontHeight = a.readUi16(b, f));
-          q && (c.color = n(b, f));
-          d && (c.maxLength = a.readUi16(b, f));
+          d && (c.fontHeight = a.readUi16(b, f));
+          n && (c.color = r(b, f));
+          m && (c.maxLength = a.readUi16(b, f));
           p && (c.align = a.readUi8(b, f), c.leftMargin = a.readUi16(b, f), c.rightMargin = a.readUi16(b, f), c.indent = a.readSi16(b, f), c.leading = a.readSi16(b, f));
           c.variableName = a.readString(b, f, 0);
           h && (c.initialText = a.readString(b, f, 0));
           return c;
-        }, 39:void 0, 43:void 0, 45:void 0, 46:k, 48:g, 56:void 0, 57:void 0, 58:void 0, 59:void 0, 60:void 0, 61:void 0, 62:void 0, 64:void 0, 65:void 0, 66:void 0, 69:void 0, 70:u, 71:void 0, 72:void 0, 73:void 0, 74:void 0, 75:g, 76:void 0, 77:void 0, 78:function(b, f, c, g, h) {
+        }, 39:void 0, 43:void 0, 45:void 0, 46:v, 48:g, 56:void 0, 57:void 0, 58:void 0, 59:void 0, 60:void 0, 61:void 0, 62:void 0, 64:void 0, 65:void 0, 66:void 0, 69:void 0, 70:t, 71:void 0, 72:void 0, 73:void 0, 74:void 0, 75:g, 76:void 0, 77:void 0, 78:function(b, f, c, g, h) {
           c || (c = {});
           c.symbolId = a.readUi16(b, f);
           var n = c.splitter = {};
           e(b, f, n, g, h);
           return c;
-        }, 82:void 0, 83:k, 84:k, 86:b, 87:function(b, e, f, c, g, h) {
+        }, 82:void 0, 83:v, 84:v, 86:b, 87:function(b, e, f, c, g, h) {
           f || (f = {});
           f.id = a.readUi16(b, e);
           a.readUi32(b, e);
@@ -23426,11 +25086,11 @@
           e.pos = h;
           return f;
         }, 88:void 0, 89:s, 90:l, 91:f};
-        r.readHeader = function(b, e) {
+        k.readHeader = function(b, e) {
           var f = a.readUb(b, e, 5), c = a.readSb(b, e, f), g = a.readSb(b, e, f), h = a.readSb(b, e, f), f = a.readSb(b, e, f);
           a.align(b, e);
-          var n = a.readUi8(b, e), n = a.readUi8(b, e) + n / 256, q = a.readUi16(b, e);
-          return{frameRate:n, frameCount:q, bounds:new d.Bounds(c, h, g, f)};
+          var n = a.readUi8(b, e), n = a.readUi8(b, e) + n / 256, m = a.readUi16(b, e);
+          return{frameRate:n, frameCount:m, bounds:new d.Bounds(c, h, g, f)};
         };
       })(a.LowLevel || (a.LowLevel = {}));
     })(k.Parser || (k.Parser = {}));
@@ -23439,7 +25099,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.IntegerUtilities.roundToMultipleOfFour, v = d.ArrayUtilities.Inflate;
+      var q = d.IntegerUtilities.roundToMultipleOfFour, v = d.ArrayUtilities.Inflate;
       (function(a) {
         a[a.FORMAT_COLORMAPPED = 3] = "FORMAT_COLORMAPPED";
         a[a.FORMAT_15BPP = 4] = "FORMAT_15BPP";
@@ -23447,50 +25107,50 @@
       })(a.BitmapFormat || (a.BitmapFormat = {}));
       a.defineBitmap = function(a) {
         k.enterTimeline("defineBitmap");
-        var t, l = 0;
+        var u, l = 0;
         switch(a.format) {
           case 3:
-            t = a.width;
-            var l = a.height, c = a.hasAlpha, h = r(t) - t, p = c ? 4 : 3, s = r((a.colorTableSize + 1) * p), m = v.inflate(a.bmpData, s + (t + h) * l, !0), g = new Uint32Array(t * l), f = 0, b = 0;
+            u = a.width;
+            var l = a.height, c = a.hasAlpha, h = q(u) - u, p = c ? 4 : 3, s = q((a.colorTableSize + 1) * p), m = v.inflate(a.bmpData, s + (u + h) * l, !0), g = new Uint32Array(u * l), f = 0, b = 0;
             if (c) {
               for (c = 0;c < l;c++) {
-                for (var e = 0;e < t;e++) {
-                  var b = m[s++] << 2, q = m[b + 3], n = m[b + 0], x = m[b + 1], b = m[b + 2];
-                  g[f++] = b << 24 | x << 16 | n << 8 | q;
+                for (var e = 0;e < u;e++) {
+                  var b = m[s++] << 2, n = m[b + 3], r = m[b + 0], x = m[b + 1], b = m[b + 2];
+                  g[f++] = b << 24 | x << 16 | r << 8 | n;
                 }
                 s += h;
               }
             } else {
               for (c = 0;c < l;c++) {
-                for (e = 0;e < t;e++) {
-                  b = m[s++] * p, q = 255, n = m[b + 0], x = m[b + 1], b = m[b + 2], g[f++] = b << 24 | x << 16 | n << 8 | q;
+                for (e = 0;e < u;e++) {
+                  b = m[s++] * p, n = 255, r = m[b + 0], x = m[b + 1], b = m[b + 2], g[f++] = b << 24 | x << 16 | r << 8 | n;
                 }
                 s += h;
               }
             }
-            t = new Uint8Array(g.buffer);
+            u = new Uint8Array(g.buffer);
             l = 1;
             break;
           case 5:
             h = a.width;
             p = a.height;
             l = a.hasAlpha;
-            t = v.inflate(a.bmpData, p * h * 4, !0);
+            u = v.inflate(a.bmpData, p * h * 4, !0);
             if (!l) {
               l = new Uint32Array(h * p);
               h *= p;
               for (m = p = 0;m < h;m++) {
-                p++, g = t[p++], s = t[p++], f = t[p++], l[m] = f << 24 | s << 16 | g << 8 | 255;
+                p++, g = u[p++], s = u[p++], f = u[p++], l[m] = f << 24 | s << 16 | g << 8 | 255;
               }
-              t = new Uint8Array(l.buffer);
+              u = new Uint8Array(l.buffer);
             }
             l = 1;
             break;
           case 4:
-            d.Debug.notImplemented("parse15BPP"), t = null, l = 1;
+            d.Debug.notImplemented("parse15BPP"), u = null, l = 1;
         }
         k.leaveTimeline();
-        return{definition:{type:"image", id:a.id, width:a.width, height:a.height, mimeType:"application/octet-stream", data:t, dataType:l, image:null}, type:"image"};
+        return{definition:{type:"image", id:a.id, width:a.width, height:a.height, mimeType:"application/octet-stream", data:u, dataType:l, image:null}, type:"image"};
       };
     })(k.Parser || (k.Parser = {}));
   })(d.SWF || (d.SWF = {}));
@@ -23499,14 +25159,14 @@
   (function(d) {
     (function(a) {
       a.defineButton = function(a, d) {
-        for (var k = a.characters, t = {up:[], over:[], down:[], hitTest:[]}, l = 0, c;(c = k[l++]) && !c.eob;) {
+        for (var k = a.characters, u = {up:[], over:[], down:[], hitTest:[]}, l = 0, c;(c = k[l++]) && !c.eob;) {
           var h = {symbolId:d[c.symbolId].id, code:4, depth:c.depth, flags:c.matrix ? 4 : 0, matrix:c.matrix};
-          c.stateUp && t.up.push(h);
-          c.stateOver && t.over.push(h);
-          c.stateDown && t.down.push(h);
-          c.stateHitTest && t.hitTest.push(h);
+          c.stateUp && u.up.push(h);
+          c.stateOver && u.over.push(h);
+          c.stateDown && u.down.push(h);
+          c.stateHitTest && u.hitTest.push(h);
         }
-        return{type:"button", id:a.id, buttonActions:a.buttonActions, states:t};
+        return{type:"button", id:a.id, buttonActions:a.buttonActions, states:u};
       };
     })(d.Parser || (d.Parser = {}));
   })(d.SWF || (d.SWF = {}));
@@ -23523,15 +25183,15 @@
       function k(a) {
         return s(a >> 8 & 255, a & 255);
       }
-      function u(a) {
+      function t(a) {
         return k(a >> 16) + k(a);
       }
-      function t(a) {
+      function u(a) {
         for (var c = 0, f = 0, b = 0, e = 0, h = 0;h < a.length;h++) {
-          var n = a[h];
-          if (n) {
-            for (var n = n.records, d, l = 0, p = 0, s = 0;s < n.length;s++) {
-              d = n[s];
+          var r = a[h];
+          if (r) {
+            for (var r = r.records, d, l = 0, p = 0, s = 0;s < r.length;s++) {
+              d = r[s];
               if (d.type) {
                 d.isStraight ? (l += d.deltaX || 0, p += -(d.deltaY || 0)) : (l += d.controlDeltaX, p += -d.controlDeltaY, l += d.anchorDeltaX, p += -d.anchorDeltaY);
               } else {
@@ -23551,175 +25211,175 @@
       }
       var l = Math.pow, c = Math.min, h = Math.max, p = Math.log, s = String.fromCharCode;
       a.defineFont = function(a) {
-        var g = "swf-font-" + a.id, f = a.name || g, b = {type:"font", id:a.id, name:f, bold:1 === a.bold, italic:1 === a.italic, codes:null, metrics:null, data:a.data, originalSize:!1}, e = a.glyphs, q = e ? a.glyphCount = e.length : 0;
-        if (!q) {
+        var g = "swf-font-" + a.id, f = a.name || g, b = {type:"font", id:a.id, name:f, bold:1 === a.bold, italic:1 === a.italic, codes:null, metrics:null, data:a.data, originalSize:!1}, e = a.glyphs, n = e ? a.glyphCount = e.length : 0;
+        if (!n) {
           return b;
         }
-        var n = {}, l = [], s = {}, A = [], H, K = !("advance" in a), F = 48 === a.code, J = 75 === a.code;
+        var r = {}, l = [], s = {}, C = [], F, K = !("advance" in a), E = 48 === a.code, Q = 75 === a.code;
         K && (a.advance = []);
-        H = Math.max.apply(null, a.codes) || 35;
+        F = Math.max.apply(null, a.codes) || 35;
         if (a.codes) {
-          for (var M = 0;M < a.codes.length;M++) {
-            var D = a.codes[M];
-            if (32 > D || -1 < l.indexOf(D)) {
-              H++, 8232 == H && (H = 8240), D = H;
+          for (var N = 0;N < a.codes.length;N++) {
+            var B = a.codes[N];
+            if (32 > B || -1 < l.indexOf(B)) {
+              F++, 8232 == F && (F = 8240), B = F;
             }
-            l.push(D);
-            s[D] = M;
+            l.push(B);
+            s[B] = N;
           }
-          H = l.concat();
+          F = l.concat();
           l.sort(function(b, a) {
             return b - a;
           });
-          for (var M = 0, B;void 0 !== (D = l[M++]);) {
-            var E = D, y = E;
-            for (B = [M - 1];void 0 !== (D = l[M]) && y + 1 === D;) {
-              ++y, B.push(M), ++M;
+          for (var N = 0, y;void 0 !== (B = l[N++]);) {
+            var L = B, A = L;
+            for (y = [N - 1];void 0 !== (B = l[N]) && A + 1 === B;) {
+              ++A, y.push(N), ++N;
             }
-            A.push([E, y, B]);
+            C.push([L, A, y]);
           }
         } else {
-          B = [];
-          for (M = 0;M < q;M++) {
-            D = 57344 + M, l.push(D), s[D] = M, B.push(M);
+          y = [];
+          for (N = 0;N < n;N++) {
+            B = 57344 + N, l.push(B), s[B] = N, y.push(N);
           }
-          A.push([57344, 57344 + q - 1, B]);
-          H = l.concat();
+          C.push([57344, 57344 + n - 1, y]);
+          F = l.concat();
         }
         var z = a.resolution || 1;
-        F && t(e) && (z = 20, b.originalSize = !0);
-        F = Math.ceil(a.ascent / z) || 1024;
-        B = -Math.ceil(a.descent / z) || 0;
-        for (var G = a.leading / z || 0, C = n["OS/2"] = "", I = "", P = "", T = "", M = 0, O;O = A[M++];) {
-          E = O[0], y = O[1], D = O[2][0], C += k(E), I += k(y), P += k(D - E + 1 & 65535), T += k(0);
+        E && u(e) && (z = 20, b.originalSize = !0);
+        E = Math.ceil(a.ascent / z) || 1024;
+        y = -Math.ceil(a.descent / z) || 0;
+        for (var G = a.leading / z || 0, I = r["OS/2"] = "", D = "", R = "", T = "", N = 0, J;J = C[N++];) {
+          L = J[0], A = J[1], B = J[2][0], I += k(L), D += k(A), R += k(B - L + 1 & 65535), T += k(0);
         }
+        D += "\u00ff\u00ff";
         I += "\u00ff\u00ff";
-        C += "\u00ff\u00ff";
-        P += "\x00\u0001";
+        R += "\x00\u0001";
         T += "\x00\x00";
-        A = A.length + 1;
-        M = 2 * d(A);
-        E = 2 * A - M;
-        M = "\x00\x00" + k(2 * A) + k(M) + k(p(A) / p(2)) + k(E) + I + "\x00\x00" + C + P + T;
-        n.cmap = "\x00\x00\x00\u0001\x00\u0003\x00\u0001\x00\x00\x00\f\x00\u0004" + k(M.length + 4) + M;
-        var Q = "\x00\u0001\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001\x00", C = "\x00\x00", A = 16, I = 0, T = [], E = [], y = [];
-        O = [];
-        for (var M = P = 0, S = {};void 0 !== (D = l[M++]);) {
-          for (var V = e[s[D]], aa = V.records, $ = 0, w = 0, U = "", ba = "", R = 0, N = [], R = -1, V = 0;V < aa.length;V++) {
-            U = aa[V];
+        C = C.length + 1;
+        N = 2 * d(C);
+        L = 2 * C - N;
+        N = "\x00\x00" + k(2 * C) + k(N) + k(p(C) / p(2)) + k(L) + D + "\x00\x00" + I + R + T;
+        r.cmap = "\x00\x00\x00\u0001\x00\u0003\x00\u0001\x00\x00\x00\f\x00\u0004" + k(N.length + 4) + N;
+        var P = "\x00\u0001\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x001\x00", I = "\x00\x00", C = 16, D = 0, T = [], L = [], A = [];
+        J = [];
+        for (var N = R = 0, S = {};void 0 !== (B = l[N++]);) {
+          for (var W = e[s[B]], ba = W.records, w = 0, X = 0, U = "", $ = "", Y = 0, M = [], Y = -1, W = 0;W < ba.length;W++) {
+            U = ba[W];
             if (U.type) {
-              0 > R && (R = 0, N[R] = {data:[], commands:[], xMin:0, xMax:0, yMin:0, yMax:0});
+              0 > Y && (Y = 0, M[Y] = {data:[], commands:[], xMin:0, xMax:0, yMin:0, yMax:0});
               if (U.isStraight) {
-                N[R].commands.push(2);
-                var Z = (U.deltaX || 0) / z, fa = -(U.deltaY || 0) / z;
+                M[Y].commands.push(2);
+                var Z = (U.deltaX || 0) / z, ca = -(U.deltaY || 0) / z;
               } else {
-                N[R].commands.push(3), Z = U.controlDeltaX / z, fa = -U.controlDeltaY / z, $ += Z, w += fa, N[R].data.push($, w), Z = U.anchorDeltaX / z, fa = -U.anchorDeltaY / z;
+                M[Y].commands.push(3), Z = U.controlDeltaX / z, ca = -U.controlDeltaY / z, w += Z, X += ca, M[Y].data.push(w, X), Z = U.anchorDeltaX / z, ca = -U.anchorDeltaY / z;
               }
-              $ += Z;
-              w += fa;
-              N[R].data.push($, w);
+              w += Z;
+              X += ca;
+              M[Y].data.push(w, X);
             } else {
               if (U.eos) {
                 break;
               }
               if (U.move) {
-                R++;
-                N[R] = {data:[], commands:[], xMin:0, xMax:0, yMin:0, yMax:0};
-                N[R].commands.push(1);
-                var X = U.moveX / z, U = -U.moveY / z, Z = X - $, fa = U - w, $ = X, w = U;
-                N[R].data.push($, w);
+                Y++;
+                M[Y] = {data:[], commands:[], xMin:0, xMax:0, yMin:0, yMax:0};
+                M[Y].commands.push(1);
+                var ga = U.moveX / z, U = -U.moveY / z, Z = ga - w, ca = U - X, w = ga, X = U;
+                M[Y].data.push(w, X);
               }
             }
-            -1 < R && (N[R].xMin > $ && (N[R].xMin = $), N[R].yMin > w && (N[R].yMin = w), N[R].xMax < $ && (N[R].xMax = $), N[R].yMax < w && (N[R].yMax = w));
+            -1 < Y && (M[Y].xMin > w && (M[Y].xMin = w), M[Y].yMin > X && (M[Y].yMin = X), M[Y].xMax < w && (M[Y].xMax = w), M[Y].yMax < X && (M[Y].yMax = X));
           }
-          J || N.sort(function(b, a) {
+          Q || M.sort(function(b, a) {
             return(a.xMax - a.xMin) * (a.yMax - a.yMin) - (b.xMax - b.xMin) * (b.yMax - b.yMin);
           });
-          S[D] = N;
+          S[B] = M;
         }
-        for (M = 0;void 0 !== (D = l[M++]);) {
-          for (var V = e[s[D]], aa = V.records, N = S[D], ia = 1, R = 0, Z = w = U = $ = "", D = w = $ = 0, aa = -1024, X = 0, ga = -1024, ba = U = "", R = 0, R = -1, ca = [], da = [], V = 0;V < N.length;V++) {
-            ca = ca.concat(N[V].data), da = da.concat(N[V].commands);
-          }
-          for (var ea = w = $ = 0, W = 0, ka = "", N = "", Y = 0, R = 0, ia = 1, ba = "", V = 0;V < da.length;V++) {
-            Z = da[V], 1 === Z ? (R && (++ia, ba += k(R - 1)), ea = ca[Y++], W = ca[Y++], Z = ea - $, fa = W - w, U += "\u0001", ka += k(Z), N += k(fa), $ = ea, w = W) : 2 === Z ? (ea = ca[Y++], W = ca[Y++], Z = ea - $, fa = W - w, U += "\u0001", ka += k(Z), N += k(fa), $ = ea, w = W) : 3 === Z && (ea = ca[Y++], W = ca[Y++], Z = ea - $, fa = W - w, U += "\x00", ka += k(Z), N += k(fa), $ = ea, w = W, R++, ea = ca[Y++], W = ca[Y++], Z = ea - $, fa = W - w, U += "\u0001", ka += k(Z), N += k(fa), $ = 
-            ea, w = W), R++, R > I && (I = R), D > $ && (D = $), X > w && (X = w), aa < $ && (aa = $), ga < w && (ga = w);
-          }
-          $ = ba += k((R || 1) - 1);
-          w = ka;
-          Z = N;
-          V || (D = aa = X = ga = 0, U += "1");
-          V = k(ia) + k(D) + k(X) + k(aa) + k(ga) + $ + "\x00\x00" + U + w + Z;
-          V.length & 1 && (V += "\x00");
-          Q += V;
-          C += k(A / 2);
-          A += V.length;
-          T.push(D);
-          E.push(aa);
-          y.push(X);
-          O.push(ga);
-          ia > P && (P = ia);
-          R > I && (I = R);
-          K && a.advance.push((aa - D) * z * 1.3);
-        }
-        C += k(A / 2);
-        n.glyf = Q;
-        J || (M = Math.min.apply(null, y), 0 > M && (B = B || M));
-        n["OS/2"] = "\x00\u0001\x00\x00" + k(a.bold ? 700 : 400) + "\x00\u0005\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00ALF " + k((a.italic ? 1 : 0) | (a.bold ? 32 : 0)) + k(l[0]) + k(l[l.length - 1]) + k(F) + k(B) + k(G) + k(F) + k(-B) + "\x00\x00\x00\x00\x00\x00\x00\x00";
-        n.head = "\x00\u0001\x00\x00\x00\u0001\x00\x00\x00\x00\x00\x00_\u000f<\u00f5\x00\x0B\u0004\x00\x00\x00\x00\x00" + u(Date.now()) + "\x00\x00\x00\x00" + u(Date.now()) + k(c.apply(null, T)) + k(c.apply(null, y)) + k(h.apply(null, E)) + k(h.apply(null, O)) + k((a.italic ? 2 : 0) | (a.bold ? 1 : 0)) + "\x00\b\x00\u0002\x00\x00\x00\x00";
+        for (N = 0;void 0 !== (B = l[N++]);) {
+          for (var W = e[s[B]], ba = W.records, M = S[B], ha = 1, Y = 0, Z = X = U = w = "", B = X = w = 0, ba = -1024, ga = 0, ea = -1024, $ = U = "", Y = 0, Y = -1, aa = [], da = [], W = 0;W < M.length;W++) {
+            aa = aa.concat(M[W].data), da = da.concat(M[W].commands);
+          }
+          for (var O = X = w = 0, ka = 0, V = "", M = "", ja = 0, Y = 0, ha = 1, $ = "", W = 0;W < da.length;W++) {
+            Z = da[W], 1 === Z ? (Y && (++ha, $ += k(Y - 1)), O = aa[ja++], ka = aa[ja++], Z = O - w, ca = ka - X, U += "\u0001", V += k(Z), M += k(ca), w = O, X = ka) : 2 === Z ? (O = aa[ja++], ka = aa[ja++], Z = O - w, ca = ka - X, U += "\u0001", V += k(Z), M += k(ca), w = O, X = ka) : 3 === Z && (O = aa[ja++], ka = aa[ja++], Z = O - w, ca = ka - X, U += "\x00", V += k(Z), M += k(ca), w = O, X = ka, Y++, O = aa[ja++], ka = aa[ja++], Z = O - w, ca = ka - X, U += "\u0001", V += k(Z), M += k(ca), 
+            w = O, X = ka), Y++, Y > D && (D = Y), B > w && (B = w), ga > X && (ga = X), ba < w && (ba = w), ea < X && (ea = X);
+          }
+          w = $ += k((Y || 1) - 1);
+          X = V;
+          Z = M;
+          W || (B = ba = ga = ea = 0, U += "1");
+          W = k(ha) + k(B) + k(ga) + k(ba) + k(ea) + w + "\x00\x00" + U + X + Z;
+          W.length & 1 && (W += "\x00");
+          P += W;
+          I += k(C / 2);
+          C += W.length;
+          T.push(B);
+          L.push(ba);
+          A.push(ga);
+          J.push(ea);
+          ha > R && (R = ha);
+          Y > D && (D = Y);
+          K && a.advance.push((ba - B) * z * 1.3);
+        }
+        I += k(C / 2);
+        r.glyf = P;
+        Q || (N = Math.min.apply(null, A), 0 > N && (y = y || N));
+        r["OS/2"] = "\x00\u0001\x00\x00" + k(a.bold ? 700 : 400) + "\x00\u0005\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00ALF " + k((a.italic ? 1 : 0) | (a.bold ? 32 : 0)) + k(l[0]) + k(l[l.length - 1]) + k(E) + k(y) + k(G) + k(E) + k(-y) + "\x00\x00\x00\x00\x00\x00\x00\x00";
+        r.head = "\x00\u0001\x00\x00\x00\u0001\x00\x00\x00\x00\x00\x00_\u000f<\u00f5\x00\x0B\u0004\x00\x00\x00\x00\x00" + t(Date.now()) + "\x00\x00\x00\x00" + t(Date.now()) + k(c.apply(null, T)) + k(c.apply(null, A)) + k(h.apply(null, L)) + k(h.apply(null, J)) + k((a.italic ? 2 : 0) | (a.bold ? 1 : 0)) + "\x00\b\x00\u0002\x00\x00\x00\x00";
         l = a.advance;
-        n.hhea = "\x00\u0001\x00\x00" + k(F) + k(B) + k(G) + k(l ? h.apply(null, l) : 1024) + "\x00\x00\x00\x00\u0003\u00b8\x00\u0001\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + k(q + 1);
+        r.hhea = "\x00\u0001\x00\x00" + k(E) + k(y) + k(G) + k(l ? h.apply(null, l) : 1024) + "\x00\x00\x00\x00\u0003\u00b8\x00\u0001\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" + k(n + 1);
         e = "\x00\x00\x00\x00";
-        for (M = 0;M < q;++M) {
-          e += k(l ? l[M] / z : 1024) + "\x00\x00";
+        for (N = 0;N < n;++N) {
+          e += k(l ? l[N] / z : 1024) + "\x00\x00";
         }
-        n.hmtx = e;
+        r.hmtx = e;
         if (a.kerning) {
           l = a.kerning;
           z = l.length;
-          M = 2 * d(z);
-          z = "\x00\x00\x00\u0001\x00\x00" + k(14 + 6 * z) + "\x00\u0001" + k(z) + k(M) + k(p(z) / p(2)) + k(2 * z - M);
-          for (M = 0;U = l[M++];) {
+          N = 2 * d(z);
+          z = "\x00\x00\x00\u0001\x00\x00" + k(14 + 6 * z) + "\x00\u0001" + k(z) + k(N) + k(p(z) / p(2)) + k(2 * z - N);
+          for (N = 0;U = l[N++];) {
             z += k(s[U.code1]) + k(s[U.code2]) + k(U.adjustment);
           }
-          n.kern = z;
+          r.kern = z;
         }
-        n.loca = C;
-        n.maxp = "\x00\u0001\x00\x00" + k(q + 1) + k(I) + k(P) + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-        M = f.replace(/ /g, "");
-        g = [a.copyright || "Original licence", f, "Unknown", g, f, "1.0", M, "Unknown", "Unknown", "Unknown"];
-        M = g.length;
-        a = "\x00\x00" + k(M) + k(12 * M + 6);
-        for (M = A = 0;f = g[M++];) {
-          a += "\x00\u0001\x00\x00\x00\x00" + k(M - 1) + k(f.length) + k(A), A += f.length;
-        }
-        n.name = a + g.join("");
-        n.post = "\x00\u0003\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-        g = Object.keys(n);
-        M = g.length;
-        f = "\x00\u0001\x00\x00" + k(M) + "\x00\u0080\x00\u0003\x00 ";
-        q = "";
-        A = 16 * M + f.length;
-        for (M = 0;a = g[M++];) {
-          s = n[a];
+        r.loca = I;
+        r.maxp = "\x00\u0001\x00\x00" + k(n + 1) + k(D) + k(R) + "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+        N = f.replace(/ /g, "");
+        g = [a.copyright || "Original licence", f, "Unknown", g, f, "1.0", N, "Unknown", "Unknown", "Unknown"];
+        N = g.length;
+        a = "\x00\x00" + k(N) + k(12 * N + 6);
+        for (N = C = 0;f = g[N++];) {
+          a += "\x00\u0001\x00\x00\x00\x00" + k(N - 1) + k(f.length) + k(C), C += f.length;
+        }
+        r.name = a + g.join("");
+        r.post = "\x00\u0003\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+        g = Object.keys(r);
+        N = g.length;
+        f = "\x00\u0001\x00\x00" + k(N) + "\x00\u0080\x00\u0003\x00 ";
+        n = "";
+        C = 16 * N + f.length;
+        for (N = 0;a = g[N++];) {
+          s = r[a];
           l = s.length;
-          for (f += a + "\x00\x00\x00\x00" + u(A) + u(l);l & 3;) {
+          for (f += a + "\x00\x00\x00\x00" + t(C) + t(l);l & 3;) {
             s += "\x00", ++l;
           }
-          for (q += s;A & 3;) {
-            ++A;
+          for (n += s;C & 3;) {
+            ++C;
           }
-          A += l;
+          C += l;
         }
-        n = f + q;
-        F = {ascent:F / 1024, descent:-B / 1024, leading:G / 1024};
-        B = new Uint8Array(n.length);
-        for (M = 0;M < n.length;M++) {
-          B[M] = n.charCodeAt(M) & 255;
-        }
-        b.codes = H;
-        b.metrics = F;
-        b.data = B;
+        r = f + n;
+        E = {ascent:E / 1024, descent:-y / 1024, leading:G / 1024};
+        y = new Uint8Array(r.length);
+        for (N = 0;N < r.length;N++) {
+          y[N] = r.charCodeAt(N) & 255;
+        }
+        b.codes = F;
+        b.metrics = E;
+        b.data = y;
         return b;
       };
     })(d.Parser || (d.Parser = {}));
@@ -23728,7 +25388,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(a, h) {
+      function q(a, h) {
         return a[h] << 8 | a[h + 1];
       }
       function v(a, h, d) {
@@ -23749,8 +25409,8 @@
               continue;
             } else {
               if (208 > g || 216 < g) {
-                var b = r(h, l);
-                192 <= g && 195 >= g && (a.height = r(h, l + 3), a.width = r(h, l + 5));
+                var b = q(h, l);
+                192 <= g && 195 >= g && (a.height = q(h, l + 3), a.width = q(h, l + 5));
                 l += b;
               }
             }
@@ -23759,7 +25419,7 @@
         } while (l < m);
         return d;
       }
-      function u(a, h) {
+      function t(a, h) {
         if (73 === h[12] && 72 === h[13] && 68 === h[14] && 82 === h[15]) {
           a.width = h[16] << 24 | h[17] << 16 | h[18] << 8 | h[19];
           a.height = h[20] << 24 | h[21] << 16 | h[22] << 8 | h[23];
@@ -23767,7 +25427,7 @@
           a.hasAlpha = 4 === d || 6 === d;
         }
       }
-      function t(a) {
+      function u(a) {
         for (var h = 0, d = 0;d < a.length;d++) {
           h += a[d].length;
         }
@@ -23780,7 +25440,7 @@
       }
       var l = d.ArrayUtilities.Inflate;
       a.parseJpegChunks = v;
-      a.parsePngHeaders = u;
+      a.parsePngHeaders = t;
       a.defineImage = function(a) {
         k.enterTimeline("defineImage");
         var h = {type:"image", id:a.id, mimeType:a.mimeType}, p = a.imgData;
@@ -23788,7 +25448,7 @@
           var s = a.alphaData;
           if (s) {
             a = new d.JPEG.JpegImage;
-            a.parse(t(v(h, p, [])));
+            a.parse(u(v(h, p, [])));
             var p = h.width * h.height, s = l.inflate(s, p, !0), m = h.data = new Uint8ClampedArray(4 * p);
             a.copyToImageData(h);
             a = 0;
@@ -23798,10 +25458,10 @@
             h.mimeType = "application/octet-stream";
             h.dataType = 3;
           } else {
-            s = [], a.jpegTables && s.push(a.jpegTables), v(h, p, s), a.jpegTables && 0 < a.jpegTables.byteLength && (s[1] = s[1].subarray(2)), h.data = t(s), h.dataType = 4;
+            s = [], a.jpegTables && s.push(a.jpegTables), v(h, p, s), a.jpegTables && 0 < a.jpegTables.byteLength && (s[1] = s[1].subarray(2)), h.data = u(s), h.dataType = 4;
           }
         } else {
-          u(h, p), h.data = p, h.dataType = 5;
+          t(h, p), h.data = p, h.dataType = 5;
         }
         k.leaveTimeline();
         return h;
@@ -23835,7 +25495,7 @@
         }
       }
       function v(a, e, f, c) {
-        f && (a.morph = u(a, e, c));
+        f && (a.morph = t(a, e, c));
         if (e) {
           a.miterLimit = 2 * (a.miterLimitFactor || 1.5);
           if (!a.color && a.hasFill) {
@@ -23890,10 +25550,10 @@
         a.matrix = null;
         return a;
       }
-      function u(a, e, f) {
+      function t(a, e, f) {
         var c = Object.create(a);
         if (e) {
-          return c.width = a.widthMorph, !a.color && a.hasFill ? (a = u(a.fillStyle, !1, f), c.transform = a.transform, c.colors = a.colors, c.ratios = a.ratios) : c.color = a.colorMorph, c;
+          return c.width = a.widthMorph, !a.color && a.hasFill ? (a = t(a.fillStyle, !1, f), c.transform = a.transform, c.colors = a.colors, c.ratios = a.ratios) : c.color = a.colorMorph, c;
         }
         if (void 0 === a.type) {
           return c;
@@ -23912,9 +25572,9 @@
             e = c.colors = [];
             f = c.ratios = [];
             for (var h = 0;h < g.length;h++) {
-              var q = g[h];
-              e.push(q.colorMorph);
-              f.push(q.ratioMorph);
+              var n = g[h];
+              e.push(n.colorMorph);
+              f.push(n.ratioMorph);
             }
             g = 819.2;
             break;
@@ -23934,10 +25594,10 @@
         c.transform = {a:a.a * g, b:a.b * g, c:a.c * g, d:a.d * g, tx:a.tx / 20, ty:a.ty / 20};
         return c;
       }
-      function t(b, a, e, f) {
+      function u(b, a, e, f) {
         for (var c = [], g = 0;g < b.length;g++) {
           var h = v(b[g], a, e, f);
-          c[g] = a ? new q(null, h) : new q(h, null);
+          c[g] = a ? new n(null, h) : new n(h, null);
         }
         return c;
       }
@@ -23965,46 +25625,46 @@
       })(f || (f = {}));
       var b = {a:1, b:0, c:0, d:1, tx:0, ty:0};
       a.defineShape = function(b) {
-        for (var a = [], f = t(b.fillStyles, !1, !!b.recordsMorph, a), c = t(b.lineStyles, !0, !!b.recordsMorph, a), h = b.records, d = c, m = b.recordsMorph || null, c = null !== m, l = {fill0:0, fill1:0, line:0}, u = null, D, B, E = h.length - 1, y = 0, z = 0, G = 0, C = 0, I, P = 0, T = 0;P < E;P++) {
-          var O = h[P], Q;
-          c && (Q = m[T++]);
-          if (0 === O.type) {
-            u && k(u, l, d, f), O.hasNewStyles && (D || (D = []), g.apply(D, f), f = t(O.fillStyles, !1, c, a), g.apply(D, d), d = t(O.lineStyles, !0, c, a), B && (D.push(B), B = null), l = {fill0:0, fill1:0, line:0}), O.hasFillStyle0 && (l.fill0 = O.fillStyle0), O.hasFillStyle1 && (l.fill1 = O.fillStyle1), O.hasLineStyle && (l.line = O.lineStyle), l.fill1 ? I = f[l.fill1 - 1] : l.line ? I = d[l.line - 1] : l.fill0 && (I = f[l.fill0 - 1]), O.move && (y = O.moveX | 0, z = O.moveY | 0), I && (u = e.FromDefaults(c), 
-            I.addSegment(u), c ? (0 === Q.type ? (G = Q.moveX | 0, C = Q.moveY | 0) : (G = y, C = z, T--), u.morphMoveTo(y, z, G, C)) : u.moveTo(y, z));
+        for (var a = [], f = u(b.fillStyles, !1, !!b.recordsMorph, a), c = u(b.lineStyles, !0, !!b.recordsMorph, a), h = b.records, m = c, d = b.recordsMorph || null, c = null !== d, l = {fill0:0, fill1:0, line:0}, t = null, B, y, L = h.length - 1, A = 0, z = 0, G = 0, I = 0, D, R = 0, T = 0;R < L;R++) {
+          var J = h[R], P;
+          c && (P = d[T++]);
+          if (0 === J.type) {
+            t && k(t, l, m, f), J.hasNewStyles && (B || (B = []), g.apply(B, f), f = u(J.fillStyles, !1, c, a), g.apply(B, m), m = u(J.lineStyles, !0, c, a), y && (B.push(y), y = null), l = {fill0:0, fill1:0, line:0}), J.hasFillStyle0 && (l.fill0 = J.fillStyle0), J.hasFillStyle1 && (l.fill1 = J.fillStyle1), J.hasLineStyle && (l.line = J.lineStyle), l.fill1 ? D = f[l.fill1 - 1] : l.line ? D = m[l.line - 1] : l.fill0 && (D = f[l.fill0 - 1]), J.move && (A = J.moveX | 0, z = J.moveY | 0), D && (t = e.FromDefaults(c), 
+            D.addSegment(t), c ? (0 === P.type ? (G = P.moveX | 0, I = P.moveY | 0) : (G = A, I = z, T--), t.morphMoveTo(A, z, G, I)) : t.moveTo(A, z));
           } else {
-            u || (B || (B = new q(null, v({color:{red:0, green:0, blue:0, alpha:0}, width:20}, !0, c, a))), u = e.FromDefaults(c), B.addSegment(u), c ? u.morphMoveTo(y, z, G, C) : u.moveTo(y, z));
+            t || (y || (y = new n(null, v({color:{red:0, green:0, blue:0, alpha:0}, width:20}, !0, c, a))), t = e.FromDefaults(c), y.addSegment(t), c ? t.morphMoveTo(A, z, G, I) : t.moveTo(A, z));
             if (c) {
-              for (;Q && 0 === Q.type;) {
-                Q = m[T++];
+              for (;P && 0 === P.type;) {
+                P = d[T++];
               }
-              Q || (Q = O);
+              P || (P = J);
             }
-            if (!O.isStraight || c && !Q.isStraight) {
-              var S, V, aa;
-              O.isStraight ? (aa = O.deltaX | 0, O = O.deltaY | 0, S = y + (aa >> 1), V = z + (O >> 1), y += aa, z += O) : (S = y + O.controlDeltaX | 0, V = z + O.controlDeltaY | 0, y = S + O.anchorDeltaX | 0, z = V + O.anchorDeltaY | 0);
+            if (!J.isStraight || c && !P.isStraight) {
+              var S, W, ba;
+              J.isStraight ? (ba = J.deltaX | 0, J = J.deltaY | 0, S = A + (ba >> 1), W = z + (J >> 1), A += ba, z += J) : (S = A + J.controlDeltaX | 0, W = z + J.controlDeltaY | 0, A = S + J.anchorDeltaX | 0, z = W + J.anchorDeltaY | 0);
               if (c) {
-                if (Q.isStraight) {
-                  aa = Q.deltaX | 0, O = Q.deltaY | 0, $ = G + (aa >> 1), w = C + (O >> 1), G += aa, C += O;
+                if (P.isStraight) {
+                  ba = P.deltaX | 0, J = P.deltaY | 0, w = G + (ba >> 1), X = I + (J >> 1), G += ba, I += J;
                 } else {
-                  var $ = G + Q.controlDeltaX | 0, w = C + Q.controlDeltaY | 0, G = $ + Q.anchorDeltaX | 0, C = w + Q.anchorDeltaY | 0
+                  var w = G + P.controlDeltaX | 0, X = I + P.controlDeltaY | 0, G = w + P.anchorDeltaX | 0, I = X + P.anchorDeltaY | 0
                 }
-                u.morphCurveTo(S, V, y, z, $, w, G, C);
+                t.morphCurveTo(S, W, A, z, w, X, G, I);
               } else {
-                u.curveTo(S, V, y, z);
+                t.curveTo(S, W, A, z);
               }
             } else {
-              y += O.deltaX | 0, z += O.deltaY | 0, c ? (G += Q.deltaX | 0, C += Q.deltaY | 0, u.morphLineTo(y, z, G, C)) : u.lineTo(y, z);
+              A += J.deltaX | 0, z += J.deltaY | 0, c ? (G += P.deltaX | 0, I += P.deltaY | 0, t.morphLineTo(A, z, G, I)) : t.lineTo(A, z);
             }
           }
         }
-        k(u, l, d, f);
-        D ? g.apply(D, f) : D = f;
-        g.apply(D, d);
-        B && D.push(B);
+        k(t, l, m, f);
+        B ? g.apply(B, f) : B = f;
+        g.apply(B, m);
+        y && B.push(y);
         h = new s;
         c && (h.morphCoordinates = new Int32Array(h.coordinates.length), h.morphStyles = new p(16));
-        for (P = 0;P < D.length;P++) {
-          D[P].serialize(h);
+        for (R = 0;R < B.length;R++) {
+          B[R].serialize(h);
         }
         return{type:b.isMorph ? "morphshape" : "shape", id:b.id, fillBounds:b.fillBounds, lineBounds:b.lineBounds, morphFillBounds:b.fillBoundsMorph || null, morphLineBounds:b.lineBoundsMorph || null, shape:h.toPlainObject(), transferables:h.buffers, require:a.length ? a : null};
       };
@@ -24077,8 +25737,8 @@
           } else {
             var e = this.commands.bytes, f = this.data.length >> 2, c = this.morphData ? this.morphData.ints : null, g = this.data.ints, h = 0;
             g[0] === a.x && g[1] === a.y && h++;
-            for (var n = this.commands.length, q = 2 * h;h < n;h++) {
-              q = this._writeCommand(e[h], q, g, c, b);
+            for (var n = this.commands.length, m = 2 * h;h < n;h++) {
+              m = this._writeCommand(e[h], m, g, c, b);
             }
             a.x = g[f - 2];
             a.y = g[f - 1];
@@ -24106,7 +25766,7 @@
         };
         b._counter = 0;
         return b;
-      }(), q = function() {
+      }(), n = function() {
         function b(a, e) {
           this.fillStyle = a;
           this.lineStyle = e;
@@ -24218,8 +25878,8 @@
         k.set(p);
         if (g) {
           g = 0;
-          for (var r = p.length;g < b.length;g += 2, r += 2) {
-            k[r] = b[g + 1], k[r + 1] = b[g];
+          for (var q = p.length;g < b.length;g += 2, q += 2) {
+            k[q] = b[g + 1], k[q + 1] = b[g];
           }
         } else {
           k.set(b, p.length);
@@ -24242,40 +25902,40 @@
           d -= a;
           return h >>> d & (1 << a) - 1;
         }
-        for (var g = 0, h = 0, d = 0, l = 0, p = c(2), r = s[p];l < a.length;) {
-          var u = a[l++] = c(16) << 16 >> 16, t, v = c(6), B;
-          1 < f && (t = a[l++] = c(16) << 16 >> 16, B = c(6));
-          for (var E = 1 << p + 1, y = 0;4095 > y;y++) {
-            for (var z = c(p + 2), G = m[v], C = 0, I = E >> 1;I;I >>= 1, G >>= 1) {
-              z & I && (C += G);
-            }
-            u += (z & E ? -1 : 1) * (C + G);
-            a[l++] = u = -32768 > u ? -32768 : 32767 < u ? 32767 : u;
-            v += r[z & ~E];
+        for (var g = 0, h = 0, d = 0, l = 0, p = c(2), q = s[p];l < a.length;) {
+          var t = a[l++] = c(16) << 16 >> 16, u, v = c(6), y;
+          1 < f && (u = a[l++] = c(16) << 16 >> 16, y = c(6));
+          for (var L = 1 << p + 1, A = 0;4095 > A;A++) {
+            for (var z = c(p + 2), G = m[v], I = 0, D = L >> 1;D;D >>= 1, G >>= 1) {
+              z & D && (I += G);
+            }
+            t += (z & L ? -1 : 1) * (I + G);
+            a[l++] = t = -32768 > t ? -32768 : 32767 < t ? 32767 : t;
+            v += q[z & ~L];
             v = 0 > v ? 0 : 88 < v ? 88 : v;
             if (1 < f) {
               z = c(p + 2);
-              G = m[B];
-              C = 0;
-              for (I = E >> 1;I;I >>= 1, G >>= 1) {
-                z & I && (C += G);
-              }
-              t += (z & E ? -1 : 1) * (C + G);
-              a[l++] = t = -32768 > t ? -32768 : 32767 < t ? 32767 : t;
-              B += r[z & ~E];
-              B = 0 > B ? 0 : 88 < B ? 88 : B;
+              G = m[y];
+              I = 0;
+              for (D = L >> 1;D;D >>= 1, G >>= 1) {
+                z & D && (I += G);
+              }
+              u += (z & L ? -1 : 1) * (I + G);
+              a[l++] = u = -32768 > u ? -32768 : 32767 < u ? 32767 : u;
+              y += q[z & ~L];
+              y = 0 > y ? 0 : 88 < y ? 88 : y;
             }
           }
         }
       }
-      function u(b) {
+      function t(b) {
         for (var a = new Float32Array(b.length), f = 0;f < a.length;f++) {
           a[f] = (b[f] - 128) / 128;
         }
         this.currentSample += a.length / this.channels;
         return{streamId:this.streamId, samplesCount:a.length / this.channels, pcm:a};
       }
-      function t(b) {
+      function u(b) {
         for (var a = new Float32Array(b.length / 2), f = 0, c = 0;f < a.length;f++, c += 2) {
           a[f] = (b[c] << 24 | b[c + 1] << 16) / 2147483648;
         }
@@ -24296,32 +25956,32 @@
       }
       var h = [5512, 11250, 22500, 44100], p = new Uint8Array([82, 73, 70, 70, 0, 0, 0, 0, 87, 65, 86, 69, 102, 109, 116, 32, 16, 0, 0, 0, 1, 0, 2, 0, 68, 172, 0, 0, 16, 177, 2, 0, 4, 0, 16, 0, 100, 97, 116, 97, 0, 0, 0, 0]);
       a.defineSound = function(b) {
-        var a = 1 == b.soundType ? 2 : 1, f = b.samplesCount, c = h[b.soundRate], g = b.soundData, l;
+        var a = 1 == b.soundType ? 2 : 1, f = b.samplesCount, c = h[b.soundRate], g = b.soundData, m;
         switch(b.soundFormat) {
           case 0:
-            l = new Float32Array(f * a);
+            m = new Float32Array(f * a);
             if (1 == b.soundSize) {
-              for (var m = f = 0;f < l.length;f++, m += 2) {
-                l[f] = (g[m] << 24 | g[m + 1] << 16) / 2147483648;
+              for (var l = f = 0;f < m.length;f++, l += 2) {
+                m[f] = (g[l] << 24 | g[l + 1] << 16) / 2147483648;
               }
               g = d(g, c, a, 16, !0);
             } else {
-              for (f = 0;f < l.length;f++) {
-                l[f] = (g[f] - 128) / 128;
+              for (f = 0;f < m.length;f++) {
+                m[f] = (g[f] - 128) / 128;
               }
               g = d(g, c, a, 8, !1);
             }
             break;
           case 3:
-            l = new Float32Array(f * a);
+            m = new Float32Array(f * a);
             if (1 == b.soundSize) {
-              for (m = f = 0;f < l.length;f++, m += 2) {
-                l[f] = (g[m + 1] << 24 | g[m] << 16) / 2147483648;
+              for (l = f = 0;f < m.length;f++, l += 2) {
+                m[f] = (g[l + 1] << 24 | g[l] << 16) / 2147483648;
               }
               g = d(g, c, a, 16, !1);
             } else {
-              for (f = 0;f < l.length;f++) {
-                l[f] = (g[f] - 128) / 128;
+              for (f = 0;f < m.length;f++) {
+                m[f] = (g[f] - 128) / 128;
               }
               g = d(g, c, a, 8, !1);
             }
@@ -24330,18 +25990,18 @@
             g = {data:new Uint8Array(g.subarray(2)), mimeType:"audio/mpeg"};
             break;
           case 1:
-            m = new Int16Array(f * a);
-            k(g, m, a);
-            l = new Float32Array(f * a);
-            for (f = 0;f < l.length;f++) {
-              l[f] = m[f] / 32768;
+            l = new Int16Array(f * a);
+            k(g, l, a);
+            m = new Float32Array(f * a);
+            for (f = 0;f < m.length;f++) {
+              m[f] = l[f] / 32768;
             }
-            g = d(new Uint8Array(m.buffer), c, a, 16, !(new Uint8Array((new Uint16Array([1])).buffer))[0]);
+            g = d(new Uint8Array(l.buffer), c, a, 16, !(new Uint8Array((new Uint16Array([1])).buffer))[0]);
             break;
           default:
             throw Error("Unsupported audio format: " + b.soundFormat);;
         }
-        b = {type:"sound", id:b.id, sampleRate:c, channels:a, pcm:l, packaged:null};
+        b = {type:"sound", id:b.id, sampleRate:c, channels:a, pcm:m, packaged:null};
         g && (b.packaged = g);
         return b;
       };
@@ -24362,7 +26022,7 @@
             ;
             case 3:
               f.format = "wave";
-              f.decode = 1 == a.soundSize ? 0 === a.streamCompression ? t : l : u;
+              f.decode = 1 == a.soundSize ? 0 === a.streamCompression ? u : l : t;
               break;
             case 2:
               f.format = "mp3";
@@ -24397,9 +26057,9 @@
     };
   })(d.SWF || (d.SWF = {}));
 })(Shumway || (Shumway = {}));
-var Shumway$$inline_715 = Shumway || (Shumway = {}), SWF$$inline_716 = Shumway$$inline_715.SWF || (Shumway$$inline_715.SWF = {}), Option$$inline_717 = Shumway$$inline_715.Options.Option;
-SWF$$inline_716.parserOptions = Shumway$$inline_715.Settings.shumwayOptions.register(new Shumway$$inline_715.Options.OptionSet("Parser Options"));
-SWF$$inline_716.traceLevel = SWF$$inline_716.parserOptions.register(new Option$$inline_717("parsertracelevel", "Parser Trace Level", "number", 0, "Parser Trace Level"));
+var Shumway$$inline_722 = Shumway || (Shumway = {}), SWF$$inline_723 = Shumway$$inline_722.SWF || (Shumway$$inline_722.SWF = {}), Option$$inline_724 = Shumway$$inline_722.Options.Option;
+SWF$$inline_723.parserOptions = Shumway$$inline_722.Settings.shumwayOptions.register(new Shumway$$inline_722.Options.OptionSet("Parser Options"));
+SWF$$inline_723.traceLevel = SWF$$inline_723.parserOptions.register(new Option$$inline_724("parsertracelevel", "Parser Trace Level", "number", 0, "Parser Trace Level"));
 (function(d) {
   (function(d) {
     function a(a, h) {
@@ -24424,23 +26084,23 @@
       }
       return l[0].children;
     }
-    function r(a, h, d, l, m, g, f, b, e) {
-      function q() {
-        if (0 < E) {
-          return E--, B >> E & 1;
+    function q(a, h, d, l, m, g, f, b, e) {
+      function n() {
+        if (0 < L) {
+          return L--, y >> L & 1;
         }
-        B = a[h++];
-        if (255 == B) {
+        y = a[h++];
+        if (255 == y) {
           var b = a[h++];
           if (b) {
-            throw "unexpected marker: " + (B << 8 | b).toString(16);
+            throw "unexpected marker: " + (y << 8 | b).toString(16);
           }
         }
-        E = 7;
-        return B >>> 7;
+        L = 7;
+        return y >>> 7;
       }
-      function n(b) {
-        for (var a;null !== (a = q());) {
+      function r(b) {
+        for (var a;null !== (a = n());) {
           b = b[a];
           if ("number" === typeof b) {
             return b;
@@ -24453,7 +26113,7 @@
       }
       function k(b) {
         for (var a = 0;0 < b;) {
-          var e = q();
+          var e = n();
           if (null === e) {
             return;
           }
@@ -24462,152 +26122,152 @@
         }
         return a;
       }
-      function r(b) {
+      function q(b) {
         if (1 === b) {
-          return 1 === q() ? 1 : -1;
+          return 1 === n() ? 1 : -1;
         }
         var a = k(b);
         return a >= 1 << b - 1 ? a : a + (-1 << b) + 1;
       }
-      function u(b, a) {
-        var e = n(b.huffmanTableDC), e = 0 === e ? 0 : r(e);
+      function t(b, a) {
+        var e = r(b.huffmanTableDC), e = 0 === e ? 0 : q(e);
         b.blockData[a] = b.pred += e;
         for (e = 1;64 > e;) {
-          var f = n(b.huffmanTableAC), c = f & 15, f = f >> 4;
+          var f = r(b.huffmanTableAC), c = f & 15, f = f >> 4;
           if (0 === c) {
             if (15 > f) {
               break;
             }
             e += 16;
           } else {
-            e += f, b.blockData[a + t[e]] = r(c), e++;
+            e += f, b.blockData[a + u[e]] = q(c), e++;
           }
         }
       }
       function v(b, a) {
-        var f = n(b.huffmanTableDC), f = 0 === f ? 0 : r(f) << e;
+        var f = r(b.huffmanTableDC), f = 0 === f ? 0 : q(f) << e;
         b.blockData[a] = b.pred += f;
       }
       function K(b, a) {
-        b.blockData[a] |= q() << e;
+        b.blockData[a] |= n() << e;
       }
-      function F(b, a) {
-        if (0 < y) {
-          y--;
+      function E(b, a) {
+        if (0 < A) {
+          A--;
         } else {
           for (var c = g;c <= f;) {
-            var h = n(b.huffmanTableAC), d = h & 15, h = h >> 4;
-            if (0 === d) {
+            var h = r(b.huffmanTableAC), n = h & 15, h = h >> 4;
+            if (0 === n) {
               if (15 > h) {
-                y = k(h) + (1 << h) - 1;
+                A = k(h) + (1 << h) - 1;
                 break;
               }
               c += 16;
             } else {
-              c += h, b.blockData[a + t[c]] = r(d) * (1 << e), c++;
+              c += h, b.blockData[a + u[c]] = q(n) * (1 << e), c++;
             }
           }
         }
       }
-      function J(b, a) {
-        for (var c = g, h = 0, d;c <= f;) {
-          d = t[c];
+      function Q(b, a) {
+        for (var c = g, h = 0, m;c <= f;) {
+          m = u[c];
           switch(z) {
             case 0:
-              h = n(b.huffmanTableAC);
-              d = h & 15;
+              h = r(b.huffmanTableAC);
+              m = h & 15;
               h >>= 4;
-              if (0 === d) {
-                15 > h ? (y = k(h) + (1 << h), z = 4) : (h = 16, z = 1);
+              if (0 === m) {
+                15 > h ? (A = k(h) + (1 << h), z = 4) : (h = 16, z = 1);
               } else {
-                if (1 !== d) {
+                if (1 !== m) {
                   throw "invalid ACn encoding";
                 }
-                G = r(d);
+                G = q(m);
                 z = h ? 2 : 3;
               }
               continue;
             case 1:
             ;
             case 2:
-              b.blockData[a + d] ? b.blockData[a + d] += q() << e : (h--, 0 === h && (z = 2 == z ? 3 : 0));
+              b.blockData[a + m] ? b.blockData[a + m] += n() << e : (h--, 0 === h && (z = 2 == z ? 3 : 0));
               break;
             case 3:
-              b.blockData[a + d] ? b.blockData[a + d] += q() << e : (b.blockData[a + d] = G << e, z = 0);
+              b.blockData[a + m] ? b.blockData[a + m] += n() << e : (b.blockData[a + m] = G << e, z = 0);
               break;
             case 4:
-              b.blockData[a + d] && (b.blockData[a + d] += q() << e);
+              b.blockData[a + m] && (b.blockData[a + m] += n() << e);
           }
           c++;
         }
-        4 === z && (y--, 0 === y && (z = 0));
+        4 === z && (A--, 0 === A && (z = 0));
       }
-      var M = d.mcusPerLine, D = h, B = 0, E = 0, y = 0, z = 0, G, C = l.length, I, P, T, O, Q;
-      b = d.progressive ? 0 === g ? 0 === b ? v : K : 0 === b ? F : J : u;
+      var N = d.mcusPerLine, B = h, y = 0, L = 0, A = 0, z = 0, G, I = l.length, D, R, T, J, P;
+      b = d.progressive ? 0 === g ? 0 === b ? v : K : 0 === b ? E : Q : t;
       var S = 0;
-      d = 1 == C ? l[0].blocksPerLine * l[0].blocksPerColumn : M * d.mcusPerColumn;
+      d = 1 == I ? l[0].blocksPerLine * l[0].blocksPerColumn : N * d.mcusPerColumn;
       m || (m = d);
-      for (var V, aa;S < d;) {
-        for (P = 0;P < C;P++) {
-          l[P].pred = 0;
-        }
-        y = 0;
-        if (1 == C) {
-          for (I = l[0], Q = 0;Q < m;Q++) {
-            b(I, 64 * ((I.blocksPerLine + 1) * (S / I.blocksPerLine | 0) + S % I.blocksPerLine)), S++;
+      for (var W, ba;S < d;) {
+        for (R = 0;R < I;R++) {
+          l[R].pred = 0;
+        }
+        A = 0;
+        if (1 == I) {
+          for (D = l[0], P = 0;P < m;P++) {
+            b(D, 64 * ((D.blocksPerLine + 1) * (S / D.blocksPerLine | 0) + S % D.blocksPerLine)), S++;
           }
         } else {
-          for (Q = 0;Q < m;Q++) {
-            for (P = 0;P < C;P++) {
-              for (I = l[P], V = I.h, aa = I.v, T = 0;T < aa;T++) {
-                for (O = 0;O < V;O++) {
-                  b(I, 64 * ((I.blocksPerLine + 1) * ((S / M | 0) * I.v + T) + (S % M * I.h + O)));
+          for (P = 0;P < m;P++) {
+            for (R = 0;R < I;R++) {
+              for (D = l[R], W = D.h, ba = D.v, T = 0;T < ba;T++) {
+                for (J = 0;J < W;J++) {
+                  b(D, 64 * ((D.blocksPerLine + 1) * ((S / N | 0) * D.v + T) + (S % N * D.h + J)));
                 }
               }
             }
             S++;
           }
         }
-        E = 0;
-        I = a[h] << 8 | a[h + 1];
-        if (65280 >= I) {
+        L = 0;
+        D = a[h] << 8 | a[h + 1];
+        if (65280 >= D) {
           throw "marker was not found";
         }
-        if (65488 <= I && 65495 >= I) {
+        if (65488 <= D && 65495 >= D) {
           h += 2;
         } else {
           break;
         }
       }
-      return h - D;
+      return h - B;
     }
     function v(a, h) {
       for (var d = h.blocksPerLine, l = h.blocksPerColumn, m = new Int32Array(64), g = 0;g < l;g++) {
         for (var f = 0;f < d;f++) {
-          for (var b = h, e = 64 * ((h.blocksPerLine + 1) * g + f), q = m, n = b.quantizationTable, k = void 0, r = void 0, u = void 0, t = void 0, v = void 0, F = void 0, J = void 0, M = void 0, D = void 0, B = void 0, B = 0;64 > B;B++) {
-            q[B] = b.blockData[e + B] * n[B];
+          for (var b = h, e = 64 * ((h.blocksPerLine + 1) * g + f), n = m, r = b.quantizationTable, k = void 0, q = void 0, t = void 0, u = void 0, v = void 0, E = void 0, Q = void 0, N = void 0, B = void 0, y = void 0, y = 0;64 > y;y++) {
+            n[y] = b.blockData[e + y] * r[y];
           }
-          for (B = 0;8 > B;++B) {
-            n = 8 * B, 0 === q[1 + n] && 0 === q[2 + n] && 0 === q[3 + n] && 0 === q[4 + n] && 0 === q[5 + n] && 0 === q[6 + n] && 0 === q[7 + n] ? (D = 5793 * q[0 + n] + 512 >> 10, q[0 + n] = D, q[1 + n] = D, q[2 + n] = D, q[3 + n] = D, q[4 + n] = D, q[5 + n] = D, q[6 + n] = D, q[7 + n] = D) : (k = 5793 * q[0 + n] + 128 >> 8, r = 5793 * q[4 + n] + 128 >> 8, u = q[2 + n], t = q[6 + n], v = 2896 * (q[1 + n] - q[7 + n]) + 128 >> 8, M = 2896 * (q[1 + n] + q[7 + n]) + 128 >> 8, F = q[3 + n] << 4, J = 
-            q[5 + n] << 4, D = k - r + 1 >> 1, k = k + r + 1 >> 1, r = D, D = 3784 * u + 1567 * t + 128 >> 8, u = 1567 * u - 3784 * t + 128 >> 8, t = D, D = v - J + 1 >> 1, v = v + J + 1 >> 1, J = D, D = M + F + 1 >> 1, F = M - F + 1 >> 1, M = D, D = k - t + 1 >> 1, k = k + t + 1 >> 1, t = D, D = r - u + 1 >> 1, r = r + u + 1 >> 1, u = D, D = 2276 * v + 3406 * M + 2048 >> 12, v = 3406 * v - 2276 * M + 2048 >> 12, M = D, D = 799 * F + 4017 * J + 2048 >> 12, F = 4017 * F - 799 * J + 2048 >> 12, J = 
-            D, q[0 + n] = k + M, q[7 + n] = k - M, q[1 + n] = r + J, q[6 + n] = r - J, q[2 + n] = u + F, q[5 + n] = u - F, q[3 + n] = t + v, q[4 + n] = t - v);
-          }
-          for (B = 0;8 > B;++B) {
-            n = B, 0 === q[8 + n] && 0 === q[16 + n] && 0 === q[24 + n] && 0 === q[32 + n] && 0 === q[40 + n] && 0 === q[48 + n] && 0 === q[56 + n] ? (D = 5793 * q[B + 0] + 8192 >> 14, q[0 + n] = D, q[8 + n] = D, q[16 + n] = D, q[24 + n] = D, q[32 + n] = D, q[40 + n] = D, q[48 + n] = D, q[56 + n] = D) : (k = 5793 * q[0 + n] + 2048 >> 12, r = 5793 * q[32 + n] + 2048 >> 12, u = q[16 + n], t = q[48 + n], v = 2896 * (q[8 + n] - q[56 + n]) + 2048 >> 12, M = 2896 * (q[8 + n] + q[56 + n]) + 2048 >> 12, 
-            F = q[24 + n], J = q[40 + n], D = k - r + 1 >> 1, k = k + r + 1 >> 1, r = D, D = 3784 * u + 1567 * t + 2048 >> 12, u = 1567 * u - 3784 * t + 2048 >> 12, t = D, D = v - J + 1 >> 1, v = v + J + 1 >> 1, J = D, D = M + F + 1 >> 1, F = M - F + 1 >> 1, M = D, D = k - t + 1 >> 1, k = k + t + 1 >> 1, t = D, D = r - u + 1 >> 1, r = r + u + 1 >> 1, u = D, D = 2276 * v + 3406 * M + 2048 >> 12, v = 3406 * v - 2276 * M + 2048 >> 12, M = D, D = 799 * F + 4017 * J + 2048 >> 12, F = 4017 * F - 799 * 
-            J + 2048 >> 12, J = D, q[0 + n] = k + M, q[56 + n] = k - M, q[8 + n] = r + J, q[48 + n] = r - J, q[16 + n] = u + F, q[40 + n] = u - F, q[24 + n] = t + v, q[32 + n] = t - v);
+          for (y = 0;8 > y;++y) {
+            r = 8 * y, 0 === n[1 + r] && 0 === n[2 + r] && 0 === n[3 + r] && 0 === n[4 + r] && 0 === n[5 + r] && 0 === n[6 + r] && 0 === n[7 + r] ? (B = 5793 * n[0 + r] + 512 >> 10, n[0 + r] = B, n[1 + r] = B, n[2 + r] = B, n[3 + r] = B, n[4 + r] = B, n[5 + r] = B, n[6 + r] = B, n[7 + r] = B) : (k = 5793 * n[0 + r] + 128 >> 8, q = 5793 * n[4 + r] + 128 >> 8, t = n[2 + r], u = n[6 + r], v = 2896 * (n[1 + r] - n[7 + r]) + 128 >> 8, N = 2896 * (n[1 + r] + n[7 + r]) + 128 >> 8, E = n[3 + r] << 4, Q = 
+            n[5 + r] << 4, B = k - q + 1 >> 1, k = k + q + 1 >> 1, q = B, B = 3784 * t + 1567 * u + 128 >> 8, t = 1567 * t - 3784 * u + 128 >> 8, u = B, B = v - Q + 1 >> 1, v = v + Q + 1 >> 1, Q = B, B = N + E + 1 >> 1, E = N - E + 1 >> 1, N = B, B = k - u + 1 >> 1, k = k + u + 1 >> 1, u = B, B = q - t + 1 >> 1, q = q + t + 1 >> 1, t = B, B = 2276 * v + 3406 * N + 2048 >> 12, v = 3406 * v - 2276 * N + 2048 >> 12, N = B, B = 799 * E + 4017 * Q + 2048 >> 12, E = 4017 * E - 799 * Q + 2048 >> 12, Q = 
+            B, n[0 + r] = k + N, n[7 + r] = k - N, n[1 + r] = q + Q, n[6 + r] = q - Q, n[2 + r] = t + E, n[5 + r] = t - E, n[3 + r] = u + v, n[4 + r] = u - v);
+          }
+          for (y = 0;8 > y;++y) {
+            r = y, 0 === n[8 + r] && 0 === n[16 + r] && 0 === n[24 + r] && 0 === n[32 + r] && 0 === n[40 + r] && 0 === n[48 + r] && 0 === n[56 + r] ? (B = 5793 * n[y + 0] + 8192 >> 14, n[0 + r] = B, n[8 + r] = B, n[16 + r] = B, n[24 + r] = B, n[32 + r] = B, n[40 + r] = B, n[48 + r] = B, n[56 + r] = B) : (k = 5793 * n[0 + r] + 2048 >> 12, q = 5793 * n[32 + r] + 2048 >> 12, t = n[16 + r], u = n[48 + r], v = 2896 * (n[8 + r] - n[56 + r]) + 2048 >> 12, N = 2896 * (n[8 + r] + n[56 + r]) + 2048 >> 12, 
+            E = n[24 + r], Q = n[40 + r], B = k - q + 1 >> 1, k = k + q + 1 >> 1, q = B, B = 3784 * t + 1567 * u + 2048 >> 12, t = 1567 * t - 3784 * u + 2048 >> 12, u = B, B = v - Q + 1 >> 1, v = v + Q + 1 >> 1, Q = B, B = N + E + 1 >> 1, E = N - E + 1 >> 1, N = B, B = k - u + 1 >> 1, k = k + u + 1 >> 1, u = B, B = q - t + 1 >> 1, q = q + t + 1 >> 1, t = B, B = 2276 * v + 3406 * N + 2048 >> 12, v = 3406 * v - 2276 * N + 2048 >> 12, N = B, B = 799 * E + 4017 * Q + 2048 >> 12, E = 4017 * E - 799 * 
+            Q + 2048 >> 12, Q = B, n[0 + r] = k + N, n[56 + r] = k - N, n[8 + r] = q + Q, n[48 + r] = q - Q, n[16 + r] = t + E, n[40 + r] = t - E, n[24 + r] = u + v, n[32 + r] = u - v);
           }
-          for (B = 0;64 > B;++B) {
-            k = e + B, r = q[B], r = -2056 >= r ? 0 : 2024 <= r ? 255 : r + 2056 >> 4, b.blockData[k] = r;
+          for (y = 0;64 > y;++y) {
+            k = e + y, q = n[y], q = -2056 >= q ? 0 : 2024 <= q ? 255 : q + 2056 >> 4, b.blockData[k] = q;
           }
         }
       }
       return h.blockData;
     }
-    function u(a) {
+    function t(a) {
       return 0 >= a ? 0 : 255 <= a ? 255 : a;
     }
-    var t = new Int32Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]), l = function() {
+    var u = new Int32Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]), l = function() {
       function c() {
       }
       c.prototype.parse = function(c) {
@@ -24623,22 +26283,22 @@
         }
         function m(b) {
           for (var a = Math.ceil(b.samplesPerLine / 8 / b.maxH), e = Math.ceil(b.scanLines / 8 / b.maxV), f = 0;f < b.components.length;f++) {
-            B = b.components[f];
-            var c = Math.ceil(Math.ceil(b.samplesPerLine / 8) * B.h / b.maxH), g = Math.ceil(Math.ceil(b.scanLines / 8) * B.v / b.maxV);
-            B.blockData = new Int16Array(64 * e * B.v * (a * B.h + 1));
-            B.blocksPerLine = c;
-            B.blocksPerColumn = g;
+            y = b.components[f];
+            var c = Math.ceil(Math.ceil(b.samplesPerLine / 8) * y.h / b.maxH), g = Math.ceil(Math.ceil(b.scanLines / 8) * y.v / b.maxV);
+            y.blockData = new Int16Array(64 * e * y.v * (a * y.h + 1));
+            y.blocksPerLine = c;
+            y.blocksPerColumn = g;
           }
           b.mcusPerLine = a;
           b.mcusPerColumn = e;
         }
-        var g = 0, f = null, b = null, e, q, n = [], k = [], u = [], A = d();
-        if (65496 != A) {
+        var g = 0, f = null, b = null, e, n, r = [], k = [], t = [], C = d();
+        if (65496 != C) {
           throw "SOI not found";
         }
-        for (A = d();65497 != A;) {
-          var H, K;
-          switch(A) {
+        for (C = d();65497 != C;) {
+          var F, K;
+          switch(C) {
             case 65504:
             ;
             case 65505:
@@ -24672,27 +26332,27 @@
             case 65519:
             ;
             case 65534:
-              H = l();
-              65504 === A && 74 === H[0] && 70 === H[1] && 73 === H[2] && 70 === H[3] && 0 === H[4] && (f = {version:{major:H[5], minor:H[6]}, densityUnits:H[7], xDensity:H[8] << 8 | H[9], yDensity:H[10] << 8 | H[11], thumbWidth:H[12], thumbHeight:H[13], thumbData:H.subarray(14, 14 + 3 * H[12] * H[13])});
-              65518 === A && 65 === H[0] && 100 === H[1] && 111 === H[2] && 98 === H[3] && 101 === H[4] && 0 === H[5] && (b = {version:H[6], flags0:H[7] << 8 | H[8], flags1:H[9] << 8 | H[10], transformCode:H[11]});
+              F = l();
+              65504 === C && 74 === F[0] && 70 === F[1] && 73 === F[2] && 70 === F[3] && 0 === F[4] && (f = {version:{major:F[5], minor:F[6]}, densityUnits:F[7], xDensity:F[8] << 8 | F[9], yDensity:F[10] << 8 | F[11], thumbWidth:F[12], thumbHeight:F[13], thumbData:F.subarray(14, 14 + 3 * F[12] * F[13])});
+              65518 === C && 65 === F[0] && 100 === F[1] && 111 === F[2] && 98 === F[3] && 101 === F[4] && 0 === F[5] && (b = {version:F[6], flags0:F[7] << 8 | F[8], flags1:F[9] << 8 | F[10], transformCode:F[11]});
               break;
             case 65499:
-              for (var A = d() + g - 2, F;g < A;) {
-                var J = c[g++], M = new Int32Array(64);
-                if (0 === J >> 4) {
-                  for (H = 0;64 > H;H++) {
-                    F = t[H], M[F] = c[g++];
+              for (var C = d() + g - 2, E;g < C;) {
+                var Q = c[g++], N = new Int32Array(64);
+                if (0 === Q >> 4) {
+                  for (F = 0;64 > F;F++) {
+                    E = u[F], N[E] = c[g++];
                   }
                 } else {
-                  if (1 === J >> 4) {
-                    for (H = 0;64 > H;H++) {
-                      F = t[H], M[F] = d();
+                  if (1 === Q >> 4) {
+                    for (F = 0;64 > F;F++) {
+                      E = u[F], N[E] = d();
                     }
                   } else {
                     throw "DQT: invalid table spec";
                   }
                 }
-                n[J & 15] = M;
+                r[Q & 15] = N;
               }
               break;
             case 65472:
@@ -24705,158 +26365,158 @@
               }
               d();
               e = {};
-              e.extended = 65473 === A;
-              e.progressive = 65474 === A;
+              e.extended = 65473 === C;
+              e.progressive = 65474 === C;
               e.precision = c[g++];
               e.scanLines = d();
               e.samplesPerLine = d();
               e.components = [];
               e.componentIds = {};
-              H = c[g++];
-              for (A = M = J = 0;A < H;A++) {
-                F = c[g];
+              F = c[g++];
+              for (C = N = Q = 0;C < F;C++) {
+                E = c[g];
                 K = c[g + 1] >> 4;
-                var D = c[g + 1] & 15;
-                J < K && (J = K);
-                M < D && (M = D);
-                K = e.components.push({h:K, v:D, quantizationTable:n[c[g + 2]]});
-                e.componentIds[F] = K - 1;
+                var B = c[g + 1] & 15;
+                Q < K && (Q = K);
+                N < B && (N = B);
+                K = e.components.push({h:K, v:B, quantizationTable:r[c[g + 2]]});
+                e.componentIds[E] = K - 1;
                 g += 3;
               }
-              e.maxH = J;
-              e.maxV = M;
+              e.maxH = Q;
+              e.maxV = N;
               m(e);
               break;
             case 65476:
-              F = d();
-              for (A = 2;A < F;) {
-                J = c[g++];
-                M = new Uint8Array(16);
-                for (H = K = 0;16 > H;H++, g++) {
-                  K += M[H] = c[g];
-                }
-                D = new Uint8Array(K);
-                for (H = 0;H < K;H++, g++) {
-                  D[H] = c[g];
+              E = d();
+              for (C = 2;C < E;) {
+                Q = c[g++];
+                N = new Uint8Array(16);
+                for (F = K = 0;16 > F;F++, g++) {
+                  K += N[F] = c[g];
+                }
+                B = new Uint8Array(K);
+                for (F = 0;F < K;F++, g++) {
+                  B[F] = c[g];
                 }
-                A += 17 + K;
-                (0 === J >> 4 ? u : k)[J & 15] = a(M, D);
+                C += 17 + K;
+                (0 === Q >> 4 ? t : k)[Q & 15] = a(N, B);
               }
               break;
             case 65501:
               d();
-              q = d();
+              n = d();
               break;
             case 65498:
               d();
-              F = c[g++];
-              H = [];
-              for (var B, A = 0;A < F;A++) {
-                J = e.componentIds[c[g++]], B = e.components[J], J = c[g++], B.huffmanTableDC = u[J >> 4], B.huffmanTableAC = k[J & 15], H.push(B);
-              }
-              A = c[g++];
-              F = c[g++];
-              J = c[g++];
-              A = r(c, g, e, H, q, A, F, J >> 4, J & 15);
-              g += A;
+              E = c[g++];
+              F = [];
+              for (var y, C = 0;C < E;C++) {
+                Q = e.componentIds[c[g++]], y = e.components[Q], Q = c[g++], y.huffmanTableDC = t[Q >> 4], y.huffmanTableAC = k[Q & 15], F.push(y);
+              }
+              C = c[g++];
+              E = c[g++];
+              Q = c[g++];
+              C = q(c, g, e, F, n, C, E, Q >> 4, Q & 15);
+              g += C;
               break;
             default:
               if (255 == c[g - 3] && 192 <= c[g - 2] && 254 >= c[g - 2]) {
                 g -= 3;
                 break;
               }
-              throw "unknown JPEG marker " + A.toString(16);;
+              throw "unknown JPEG marker " + C.toString(16);;
           }
-          A = d();
+          C = d();
         }
         this.width = e.samplesPerLine;
         this.height = e.scanLines;
         this.jfif = f;
         this.adobe = b;
         this.components = [];
-        for (A = 0;A < e.components.length;A++) {
-          B = e.components[A], this.components.push({output:v(e, B), scaleX:B.h / e.maxH, scaleY:B.v / e.maxV, blocksPerLine:B.blocksPerLine, blocksPerColumn:B.blocksPerColumn});
+        for (C = 0;C < e.components.length;C++) {
+          y = e.components[C], this.components.push({output:v(e, y), scaleX:y.h / e.maxH, scaleY:y.v / e.maxV, blocksPerLine:y.blocksPerLine, blocksPerColumn:y.blocksPerColumn});
         }
         this.numComponents = this.components.length;
       };
       c.prototype._getLinearizedBlockData = function(a, c) {
-        var d = this.width / a, l = this.height / c, g, f, b, e, q, n, k = 0, r, u = this.components.length, t = a * c * u, v = new Uint8Array(t), F = new Uint32Array(a);
-        for (n = 0;n < u;n++) {
-          g = this.components[n];
+        var d = this.width / a, m = this.height / c, g, f, b, e, n, r, l = 0, k, q = this.components.length, t = a * c * q, u = new Uint8Array(t), v = new Uint32Array(a);
+        for (r = 0;r < q;r++) {
+          g = this.components[r];
           f = g.scaleX * d;
-          b = g.scaleY * l;
-          k = n;
-          r = g.output;
+          b = g.scaleY * m;
+          l = r;
+          k = g.output;
           e = g.blocksPerLine + 1 << 3;
-          for (q = 0;q < a;q++) {
-            g = 0 | q * f, F[q] = (g & 4294967288) << 3 | g & 7;
+          for (n = 0;n < a;n++) {
+            g = 0 | n * f, v[n] = (g & 4294967288) << 3 | g & 7;
           }
           for (f = 0;f < c;f++) {
-            for (g = 0 | f * b, g = e * (g & 4294967288) | (g & 7) << 3, q = 0;q < a;q++) {
-              v[k] = r[g + F[q]], k += u;
+            for (g = 0 | f * b, g = e * (g & 4294967288) | (g & 7) << 3, n = 0;n < a;n++) {
+              u[l] = k[g + v[n]], l += q;
             }
           }
         }
-        if (l = this.decodeTransform) {
-          for (n = 0;n < t;) {
-            for (d = g = 0;g < u;g++, n++, d += 2) {
-              v[n] = (v[n] * l[d] >> 8) + l[d + 1];
+        if (m = this.decodeTransform) {
+          for (r = 0;r < t;) {
+            for (d = g = 0;g < q;g++, r++, d += 2) {
+              u[r] = (u[r] * m[d] >> 8) + m[d + 1];
             }
           }
         }
-        return v;
+        return u;
       };
       c.prototype._isColorConversionNeeded = function() {
         return this.adobe && this.adobe.transformCode ? !0 : 3 == this.numComponents ? !0 : !1;
       };
       c.prototype._convertYccToRgb = function(a) {
-        for (var c, d, l, g = 0, f = a.length;g < f;g += 3) {
-          c = a[g], d = a[g + 1], l = a[g + 2], a[g] = u(c - 179.456 + 1.402 * l), a[g + 1] = u(c + 135.459 - .344 * d - .714 * l), a[g + 2] = u(c - 226.816 + 1.772 * d);
+        for (var c, d, m, g = 0, f = a.length;g < f;g += 3) {
+          c = a[g], d = a[g + 1], m = a[g + 2], a[g] = t(c - 179.456 + 1.402 * m), a[g + 1] = t(c + 135.459 - .344 * d - .714 * m), a[g + 2] = t(c - 226.816 + 1.772 * d);
         }
         return a;
       };
       c.prototype._convertYcckToRgb = function(a) {
-        for (var c, d, l, g, f, b, e, q, n, k, r, t, v, K, F = 0, J = 0, M = a.length;J < M;J += 4) {
-          c = a[J];
-          d = a[J + 1];
-          l = a[J + 2];
-          g = a[J + 3];
+        for (var c, d, m, g, f, b, e, n, r, l, k, q, u, v, E = 0, Q = 0, N = a.length;Q < N;Q += 4) {
+          c = a[Q];
+          d = a[Q + 1];
+          m = a[Q + 2];
+          g = a[Q + 3];
           f = d * d;
-          b = d * l;
+          b = d * m;
           e = d * c;
-          q = d * g;
-          n = l * l;
-          k = l * g;
-          r = l * c;
-          t = c * c;
-          v = c * g;
-          K = g * g;
-          var D = -122.67195406894 - 6.60635669420364E-5 * f + 4.37130475926232E-4 * b - 5.4080610064599E-5 * e + 4.8449797120281E-4 * q - .154362151871126 * d - 9.57964378445773E-4 * n + 8.17076911346625E-4 * r - .00477271405408747 * k + 1.53380253221734 * l + 9.61250184130688E-4 * t - .00266257332283933 * v + .48357088451265 * c - 3.36197177618394E-4 * K + .484791561490776 * g, B = 107.268039397724 + 2.19927104525741E-5 * f - 6.40992018297945E-4 * b + 6.59397001245577E-4 * e + 4.26105652938837E-4 * 
-          q - .176491792462875 * d - 7.78269941513683E-4 * n + .00130872261408275 * r + 7.70482631801132E-4 * k - .151051492775562 * l + .00126935368114843 * t - .00265090189010898 * v + .25802910206845 * c - 3.18913117588328E-4 * K - .213742400323665 * g;
-          c = -20.810012546947 - 5.70115196973677E-4 * f - 2.63409051004589E-5 * b + .0020741088115012 * e - .00288260236853442 * q + .814272968359295 * d - 1.53496057440975E-5 * n - 1.32689043961446E-4 * r + 5.60833691242812E-4 * k - .195152027534049 * l + .00174418132927582 * t - .00255243321439347 * v + .116935020465145 * c - 3.43531996510555E-4 * K + .24165260232407 * g;
-          a[F++] = u(D);
-          a[F++] = u(B);
-          a[F++] = u(c);
+          n = d * g;
+          r = m * m;
+          l = m * g;
+          k = m * c;
+          q = c * c;
+          u = c * g;
+          v = g * g;
+          var B = -122.67195406894 - 6.60635669420364E-5 * f + 4.37130475926232E-4 * b - 5.4080610064599E-5 * e + 4.8449797120281E-4 * n - .154362151871126 * d - 9.57964378445773E-4 * r + 8.17076911346625E-4 * k - .00477271405408747 * l + 1.53380253221734 * m + 9.61250184130688E-4 * q - .00266257332283933 * u + .48357088451265 * c - 3.36197177618394E-4 * v + .484791561490776 * g, y = 107.268039397724 + 2.19927104525741E-5 * f - 6.40992018297945E-4 * b + 6.59397001245577E-4 * e + 4.26105652938837E-4 * 
+          n - .176491792462875 * d - 7.78269941513683E-4 * r + .00130872261408275 * k + 7.70482631801132E-4 * l - .151051492775562 * m + .00126935368114843 * q - .00265090189010898 * u + .25802910206845 * c - 3.18913117588328E-4 * v - .213742400323665 * g;
+          c = -20.810012546947 - 5.70115196973677E-4 * f - 2.63409051004589E-5 * b + .0020741088115012 * e - .00288260236853442 * n + .814272968359295 * d - 1.53496057440975E-5 * r - 1.32689043961446E-4 * k + 5.60833691242812E-4 * l - .195152027534049 * m + .00174418132927582 * q - .00255243321439347 * u + .116935020465145 * c - 3.43531996510555E-4 * v + .24165260232407 * g;
+          a[E++] = t(B);
+          a[E++] = t(y);
+          a[E++] = t(c);
         }
         return a;
       };
       c.prototype._convertYcckToCmyk = function(a) {
-        for (var c, d, l, g = 0, f = a.length;g < f;g += 4) {
-          c = a[g], d = a[g + 1], l = a[g + 2], a[g] = u(434.456 - c - 1.402 * l), a[g + 1] = u(119.541 - c + .344 * d + .714 * l), a[g + 2] = u(481.816 - c - 1.772 * d);
+        for (var c, d, m, g = 0, f = a.length;g < f;g += 4) {
+          c = a[g], d = a[g + 1], m = a[g + 2], a[g] = t(434.456 - c - 1.402 * m), a[g + 1] = t(119.541 - c + .344 * d + .714 * m), a[g + 2] = t(481.816 - c - 1.772 * d);
         }
         return a;
       };
       c.prototype._convertCmykToRgb = function(a) {
-        for (var c, d, l, g, f = 0, b = 1 / 255 / 255, e = 0, q = a.length;e < q;e += 4) {
+        for (var c, d, m, g, f = 0, b = 1 / 255 / 255, e = 0, n = a.length;e < n;e += 4) {
           c = a[e];
           d = a[e + 1];
-          l = a[e + 2];
+          m = a[e + 2];
           g = a[e + 3];
-          var n = c * (-4.387332384609988 * c + 54.48615194189176 * d + 18.82290502165302 * l + 212.25662451639585 * g - 72734.4411664936) + d * (1.7149763477362134 * d - 5.6096736904047315 * l - 17.873870861415444 * g - 1401.7366389350734) + l * (-2.5217340131683033 * l - 21.248923337353073 * g + 4465.541406466231) - g * (21.86122147463605 * g + 48317.86113160301), k = c * (8.841041422036149 * c + 60.118027045597366 * d + 6.871425592049007 * l + 31.159100130055922 * g - 20220.756542821975) + d * 
-          (-15.310361306967817 * d + 17.575251261109482 * l + 131.35250912493976 * g - 48691.05921601825) + l * (4.444339102852739 * l + 9.8632861493405 * g - 6341.191035517494) - g * (20.737325471181034 * g + 47890.15695978492);
-          c = c * (.8842522430003296 * c + 8.078677503112928 * d + 30.89978309703729 * l - .23883238689178934 * g - 3616.812083916688) + d * (10.49593273432072 * d + 63.02378494754052 * l + 50.606957656360734 * g - 28620.90484698408) + l * (.03296041114873217 * l + 115.60384449646641 * g - 49363.43385999684) - g * (22.33816807309886 * g + 45932.16563550634);
-          a[f++] = 0 <= n ? 255 : -16581375 >= n ? 0 : 255 + n * b | 0;
-          a[f++] = 0 <= k ? 255 : -16581375 >= k ? 0 : 255 + k * b | 0;
+          var r = c * (-4.387332384609988 * c + 54.48615194189176 * d + 18.82290502165302 * m + 212.25662451639585 * g - 72734.4411664936) + d * (1.7149763477362134 * d - 5.6096736904047315 * m - 17.873870861415444 * g - 1401.7366389350734) + m * (-2.5217340131683033 * m - 21.248923337353073 * g + 4465.541406466231) - g * (21.86122147463605 * g + 48317.86113160301), l = c * (8.841041422036149 * c + 60.118027045597366 * d + 6.871425592049007 * m + 31.159100130055922 * g - 20220.756542821975) + d * 
+          (-15.310361306967817 * d + 17.575251261109482 * m + 131.35250912493976 * g - 48691.05921601825) + m * (4.444339102852739 * m + 9.8632861493405 * g - 6341.191035517494) - g * (20.737325471181034 * g + 47890.15695978492);
+          c = c * (.8842522430003296 * c + 8.078677503112928 * d + 30.89978309703729 * m - .23883238689178934 * g - 3616.812083916688) + d * (10.49593273432072 * d + 63.02378494754052 * m + 50.606957656360734 * g - 28620.90484698408) + m * (.03296041114873217 * m + 115.60384449646641 * g - 49363.43385999684) - g * (22.33816807309886 * g + 45932.16563550634);
+          a[f++] = 0 <= r ? 255 : -16581375 >= r ? 0 : 255 + r * b | 0;
+          a[f++] = 0 <= l ? 255 : -16581375 >= l ? 0 : 255 + l * b | 0;
           a[f++] = 0 <= c ? 255 : -16581375 >= c ? 0 : 255 + c * b | 0;
         }
         return a;
@@ -24869,23 +26529,23 @@
         return 3 === this.numComponents ? this._convertYccToRgb(a) : 4 === this.numComponents ? this._isColorConversionNeeded() ? d ? this._convertYcckToRgb(a) : this._convertYcckToCmyk(a) : this._convertCmykToRgb(a) : a;
       };
       c.prototype.copyToImageData = function(a) {
-        var c = a.width, d = a.height, l = c * d * 4;
+        var c = a.width, d = a.height, m = c * d * 4;
         a = a.data;
-        var c = this.getData(c, d, !0), g = d = 0, f, b, e, q;
+        var c = this.getData(c, d, !0), g = d = 0, f, b, e, n;
         switch(this.components.length) {
           case 1:
-            for (;g < l;) {
+            for (;g < m;) {
               f = c[d++], a[g++] = f, a[g++] = f, a[g++] = f, a[g++] = 255;
             }
             break;
           case 3:
-            for (;g < l;) {
-              e = c[d++], q = c[d++], f = c[d++], a[g++] = e, a[g++] = q, a[g++] = f, a[g++] = 255;
+            for (;g < m;) {
+              e = c[d++], n = c[d++], f = c[d++], a[g++] = e, a[g++] = n, a[g++] = f, a[g++] = 255;
             }
             break;
           case 4:
-            for (;g < l;) {
-              e = c[d++], q = c[d++], f = c[d++], b = c[d++], e = 255 - u(e * (1 - b / 255) + b), q = 255 - u(q * (1 - b / 255) + b), f = 255 - u(f * (1 - b / 255) + b), a[g++] = e, a[g++] = q, a[g++] = f, a[g++] = 255;
+            for (;g < m;) {
+              e = c[d++], n = c[d++], f = c[d++], b = c[d++], e = 255 - t(e * (1 - b / 255) + b), n = 255 - t(n * (1 - b / 255) + b), f = 255 - t(f * (1 - b / 255) + b), a[g++] = e, a[g++] = n, a[g++] = f, a[g++] = 255;
             }
             break;
           default:
@@ -24902,7 +26562,7 @@
     function a() {
       this.bitBuffer = this.bitLength = 0;
     }
-    function r(a) {
+    function q(a) {
       if (this.pos + a > this.end) {
         throw d.StreamNoDataError;
       }
@@ -24910,13 +26570,13 @@
     function v() {
       return this.end - this.pos;
     }
-    function u(a, h) {
+    function t(a, h) {
       var d = new l(this.bytes);
       d.pos = a;
       d.end = h;
       return d;
     }
-    function t(a) {
+    function u(a) {
       var h = this.bytes, d = this.end + a.length;
       if (d > h.length) {
         throw "stream buffer overfow";
@@ -24939,10 +26599,10 @@
         c.bitBuffer = 0;
         c.bitLength = 0;
         c.align = a;
-        c.ensure = r;
+        c.ensure = q;
         c.remaining = v;
-        c.substream = u;
-        c.push = t;
+        c.substream = t;
+        c.push = u;
         return c;
       };
     }();
@@ -24952,13 +26612,13 @@
 (function(d) {
   (function(k) {
     function a() {
-      r || (r = new Worker(k.MP3WORKER_PATH), r.addEventListener("message", function(a) {
+      q || (q = new Worker(k.MP3WORKER_PATH), q.addEventListener("message", function(a) {
         "console" === a.data.action && console[a.data.method].call(console, a.data.message);
       }));
-      return r;
+      return q;
     }
     k.MP3WORKER_PATH = "../../lib/mp3/mp3worker.js";
-    var r = null, v = 0, u = function() {
+    var q = null, v = 0, t = function() {
       function k() {
         this._sessionId = v++;
         this._onworkermessageBound = this.onworkermessage.bind(this);
@@ -25028,15 +26688,15 @@
       };
       return k;
     }();
-    k.MP3DecoderSession = u;
+    k.MP3DecoderSession = t;
   })(d.SWF || (d.SWF = {}));
 })(Shumway || (Shumway = {}));
 __extends = this.__extends || function(d, k) {
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
@@ -25046,7 +26706,7 @@
     function a(b, a) {
       return b && a ? "boldItalic" : b ? "bold" : a ? "italic" : "regular";
     }
-    function r(b, a) {
+    function q(b, a) {
       switch(b.code) {
         case 6:
         ;
@@ -25100,7 +26760,7 @@
           return b;
       }
     }
-    var v = d.SWF.Parser, u = k.Stream, t = d.ArrayUtilities.Inflate, l = d.ArrayUtilities.LzmaDecoder, c = v.SwfTag, h = v.DefinitionTags, p = v.ImageDefinitionTags, s = v.FontDefinitionTags, m = v.ControlTags, g = function() {
+    var v = d.SWF.Parser, t = k.Stream, u = d.ArrayUtilities.Inflate, l = d.ArrayUtilities.LzmaDecoder, c = v.SwfTag, h = v.DefinitionTags, p = v.ImageDefinitionTags, s = v.FontDefinitionTags, m = v.ControlTags, g = function() {
       function g(b, a) {
         this.isCompressed = !1;
         this.swfVersion = 0;
@@ -25150,7 +26810,7 @@
         var a = {code:b.tagCode}, e = b.byteOffset + b.byteLength;
         (0,v.LowLevel.tagHandlers[b.tagCode])(this.data, this._dataStream, a, this.swfVersion, b.tagCode, e);
         this._dataStream.pos < e && (this._dataStream.pos = e);
-        b = r(a, this.dictionary);
+        b = q(a, this.dictionary);
         k.leaveTimeline();
         return b;
       };
@@ -25163,10 +26823,10 @@
         this._uncompressedLength = b[4] | b[5] << 8 | b[6] << 16 | b[7] << 24;
         this.bytesLoaded = b.length;
         this.data = new Uint8Array(this._uncompressedLength);
-        this._dataStream = new u(this.data.buffer);
+        this._dataStream = new t(this.data.buffer);
         this._dataStream.pos = 8;
         this._dataView = this._dataStream;
-        a ? (this.data.set(b.subarray(0, 8)), this._uncompressedLoadedLength = 8, this._decompressor = t.create(!0), this._decompressor.onData = this.processFirstBatchOfDecompressedData.bind(this), this._decompressor.push(b.subarray(8))) : e ? (this.data.set(b.subarray(0, 8)), this._uncompressedLoadedLength = 8, this._decompressor = new l(!0), this._decompressor.onData = this.processFirstBatchOfDecompressedData.bind(this), this._decompressor.push(b)) : (this.data.set(b), this._uncompressedLoadedLength = 
+        a ? (this.data.set(b.subarray(0, 8)), this._uncompressedLoadedLength = 8, this._decompressor = u.create(!0), this._decompressor.onData = this.processFirstBatchOfDecompressedData.bind(this), this._decompressor.push(b.subarray(8))) : e ? (this.data.set(b.subarray(0, 8)), this._uncompressedLoadedLength = 8, this._decompressor = new l(!0), this._decompressor.onData = this.processFirstBatchOfDecompressedData.bind(this), this._decompressor.push(b)) : (this.data.set(b), this._uncompressedLoadedLength = 
         b.length, this._decompressor = null, this.parseHeaderContents());
         k.leaveTimeline();
         this._lastScanPosition = this._dataStream.pos;
@@ -25196,7 +26856,7 @@
         k.leaveTimeline();
       };
       g.prototype.scanTagsToOffset = function(b, a) {
-        for (var e = new q(0, 0, 0), f;(f = this._dataStream.pos) < b - 1 && this.parseNextTagHeader(e);) {
+        for (var e = new n(0, 0, 0), f;(f = this._dataStream.pos) < b - 1 && this.parseNextTagHeader(e);) {
           if (0 === e.tagCode) {
             a && (this._endTagEncountered = !0, console.log("SWF load time: " + (.001 * (Date.now() - this._loadStarted)).toFixed(4) + "sec"));
             break;
@@ -25227,44 +26887,44 @@
         return!0;
       };
       g.prototype.scanTag = function(a, f) {
-        var g = this._dataStream, n = g.pos, d = a.tagCode, q = a.byteLength;
+        var g = this._dataStream, n = g.pos, d = a.tagCode, r = a.byteLength;
         if (39 === d) {
-          this.addLazySymbol(d, n, q), n += q, g.pos += 4, this.scanTagsToOffset(n, !1), this._dataStream.pos < l && (this.emitTagSlopWarning(a, l), g.pos = n);
+          this.addLazySymbol(d, n, r), n += r, g.pos += 4, this.scanTagsToOffset(n, !1), this._dataStream.pos < l && (this.emitTagSlopWarning(a, l), g.pos = n);
         } else {
           if (p[d]) {
-            g = this.addLazySymbol(d, n, q), this.decodeEmbeddedImage(g);
+            g = this.addLazySymbol(d, n, r), this.decodeEmbeddedImage(g);
           } else {
             if (s[d]) {
-              g = this.addLazySymbol(d, n, q), this.registerEmbeddedFont(g);
+              g = this.addLazySymbol(d, n, r), this.registerEmbeddedFont(g);
             } else {
               if (h[d]) {
-                this.addLazySymbol(d, n, q), this.jumpToNextTag(q);
+                this.addLazySymbol(d, n, r), this.jumpToNextTag(r);
               } else {
                 if (f || 76 === d || 56 === d) {
                   if (m[d]) {
-                    this.addControlTag(d, n, q);
+                    this.addControlTag(d, n, r);
                   } else {
                     switch(d) {
                       case 69:
-                        this.setFileAttributes(q);
+                        this.setFileAttributes(r);
                         break;
                       case 86:
-                        this.setSceneAndFrameLabelData(q);
+                        this.setSceneAndFrameLabelData(r);
                         break;
                       case 9:
                         this.backgroundColor = v.LowLevel.rgb(this.data, this._dataStream);
                         break;
                       case 8:
-                        this._jpegTables || (this._jpegTables = 0 === q ? new Uint8Array(0) : this.data.subarray(g.pos, g.pos + q - 2));
-                        this.jumpToNextTag(q);
+                        this._jpegTables || (this._jpegTables = 0 === r ? new Uint8Array(0) : this.data.subarray(g.pos, g.pos + r - 2));
+                        this.jumpToNextTag(r);
                         break;
                       case 82:
                       ;
                       case 72:
                         if (this.useAVM1) {
-                          this.jumpToNextTag(q);
+                          this.jumpToNextTag(r);
                         } else {
-                          var l = n + q, n = new b;
+                          var l = n + r, n = new b;
                           82 === d ? (n.flags = v.readUi32(this.data, g), n.name = v.readString(this.data, g, 0)) : (n.flags = 0, n.name = "");
                           n.data = this.data.subarray(g.pos, l);
                           this.abcBlocks.push(n);
@@ -25272,19 +26932,19 @@
                         }
                         break;
                       case 76:
-                        l = n + q;
-                        for (q = v.readUi16(this.data, g);q--;) {
+                        l = n + r;
+                        for (r = v.readUi16(this.data, g);r--;) {
                           n = v.readUi16(this.data, g), d = v.readString(this.data, g, 0), this.symbolClassesMap[n] = d, this.symbolClassesList.push({id:n, className:d});
                         }
                         g.pos = l;
                         break;
                       case 59:
-                        this.useAVM1 && (l = this._currentInitActionBlocks || (this._currentInitActionBlocks = []), g = this._dataView.getUint16(g.pos, !0), l.push({spriteId:g, actionsData:this.data.subarray(n + 2, n + q)}));
-                        this.jumpToNextTag(q);
+                        this.useAVM1 && (l = this._currentInitActionBlocks || (this._currentInitActionBlocks = []), g = this._dataView.getUint16(g.pos, !0), l.push({spriteId:g, actionsData:this.data.subarray(n + 2, n + r)}));
+                        this.jumpToNextTag(r);
                         break;
                       case 12:
-                        this.useAVM1 && (this._currentActionBlocks || (this._currentActionBlocks = [])).push(this.data.subarray(g.pos, g.pos + q));
-                        this.jumpToNextTag(q);
+                        this.useAVM1 && (this._currentActionBlocks || (this._currentActionBlocks = [])).push(this.data.subarray(g.pos, g.pos + r));
+                        this.jumpToNextTag(r);
                         break;
                       case 18:
                       ;
@@ -25293,10 +26953,10 @@
                         this._currentSoundStreamHead = v.SoundStream.FromTag(g);
                         break;
                       case 19:
-                        this._currentSoundStreamBlock = this.data.subarray(g.pos, g.pos += q);
+                        this._currentSoundStreamBlock = this.data.subarray(g.pos, g.pos += r);
                         break;
                       case 43:
-                        l = g.pos + q;
+                        l = g.pos + r;
                         this._currentFrameLabel = v.readString(this.data, g, 0);
                         g.pos = l;
                         break;
@@ -25306,9 +26966,9 @@
                       case 0:
                         break;
                       case 56:
-                        l = g.pos + q;
-                        q = v.readUi16(this.data, g);
-                        for (d = this._currentExports || (this._currentExports = []);q--;) {
+                        l = g.pos + r;
+                        r = v.readUi16(this.data, g);
+                        for (d = this._currentExports || (this._currentExports = []);r--;) {
                           var n = v.readUi16(this.data, g), k = v.readString(this.data, g, 0);
                           if (g.pos > l) {
                             g.pos = l;
@@ -25331,7 +26991,7 @@
                       case 57:
                       ;
                       case 71:
-                        this.jumpToNextTag(q);
+                        this.jumpToNextTag(r);
                         break;
                       case 74:
                       ;
@@ -25340,7 +27000,7 @@
                       case 65:
                       ;
                       case 66:
-                        this.jumpToNextTag(q);
+                        this.jumpToNextTag(r);
                         break;
                       case 58:
                       ;
@@ -25355,7 +27015,7 @@
                       case 77:
                       ;
                       case 24:
-                        this.jumpToNextTag(q);
+                        this.jumpToNextTag(r);
                         break;
                       case 51:
                       ;
@@ -25381,14 +27041,14 @@
                       ;
                       case 29:
                         console.info("Ignored tag (these shouldn't occur) " + d + ": " + c[d]);
-                        this.jumpToNextTag(q);
+                        this.jumpToNextTag(r);
                         break;
                       default:
-                        this.jumpToNextTag(q);
+                        this.jumpToNextTag(r);
                     }
                   }
                 } else {
-                  this.jumpToNextTag(q);
+                  this.jumpToNextTag(r);
                 }
               }
             }
@@ -25397,43 +27057,43 @@
       };
       g.prototype.parseSpriteTimeline = function(b) {
         k.enterTimeline("parseSpriteTimeline");
-        var a = this.data, e = this._dataStream, c = this._dataView, g = {id:b.id, type:"sprite", frames:[]}, h = b.byteOffset + b.byteLength, n = g.frames, d = null, l = [], m = null, p = null, s = null, r = null;
+        var a = this.data, e = this._dataStream, c = this._dataView, g = {id:b.id, type:"sprite", frames:[]}, h = b.byteOffset + b.byteLength, d = g.frames, m = null, r = [], l = null, p = null, s = null, q = null;
         e.pos = b.byteOffset + 2;
         g.frameCount = c.getUint16(e.pos, !0);
         e.pos += 2;
-        for (b = new q(0, 0, 0);e.pos < h;) {
+        for (b = new n(0, 0, 0);e.pos < h;) {
           this.parseNextTagHeader(b);
-          var u = b.byteLength, x = b.tagCode;
-          if (e.pos + u > h) {
+          var x = b.byteLength, t = b.tagCode;
+          if (e.pos + x > h) {
             break;
           }
-          if (v.ControlTags[x]) {
-            l.push(new q(x, e.pos, u));
+          if (v.ControlTags[t]) {
+            r.push(new n(t, e.pos, x));
           } else {
-            switch(x) {
+            switch(t) {
               case 12:
-                this.useAVM1 && (s || (s = []), s.push(a.subarray(e.pos, e.pos + u)));
+                this.useAVM1 && (s || (s = []), s.push(a.subarray(e.pos, e.pos + x)));
                 break;
               case 59:
-                this.useAVM1 && (r || (r = []), x = c.getUint16(e.pos, !0), e.pos += 2, r.push({spriteId:x, actionsData:a.subarray(e.pos, e.pos + u)}));
+                this.useAVM1 && (q || (q = []), t = c.getUint16(e.pos, !0), e.pos += 2, q.push({spriteId:t, actionsData:a.subarray(e.pos, e.pos + x)}));
                 break;
               case 43:
-                u = e.pos + u;
-                d = v.readString(a, e, 0);
-                e.pos = u;
-                u = 0;
+                x = e.pos + x;
+                m = v.readString(a, e, 0);
+                e.pos = x;
+                x = 0;
                 break;
               case 1:
-                n.push(new f(l, d, m, p, s, r, null));
-                d = null;
-                l = [];
-                r = s = p = m = null;
+                d.push(new f(r, m, l, p, s, q, null));
+                m = null;
+                r = [];
+                q = s = p = l = null;
                 break;
               case 0:
-                e.pos = h, u = 0;
+                e.pos = h, x = 0;
             }
           }
-          e.pos += u;
+          e.pos += x;
         }
         k.leaveTimeline();
         return g;
@@ -25461,12 +27121,12 @@
         this.sceneAndFrameLabelData = v.LowLevel.defineScene(this.data, this._dataStream, null);
       };
       g.prototype.addControlTag = function(b, a, e) {
-        (this._currentControlTags || (this._currentControlTags = [])).push(new q(b, a, e));
+        (this._currentControlTags || (this._currentControlTags = [])).push(new n(b, a, e));
         this.jumpToNextTag(e);
       };
       g.prototype.addLazySymbol = function(b, a, e) {
         var f = this._dataStream.getUint16(this._dataStream.pos, !0);
-        b = new n(f, b, a, e);
+        b = new r(f, b, a, e);
         return this.dictionary[f] = b;
       };
       g.prototype.decodeEmbeddedFont = function(b) {
@@ -25523,23 +27183,23 @@
       };
     }();
     k.SymbolExport = e;
-    var q = function() {
+    var n = function() {
       return function(b, a, e) {
         this.tagCode = b;
         this.byteOffset = a;
         this.byteLength = e;
       };
     }();
-    k.UnparsedTag = q;
-    var n = function(b) {
+    k.UnparsedTag = n;
+    var r = function(b) {
       function a(e, f, c, g) {
         b.call(this, f, c, g);
         this.id = e;
       }
       __extends(a, b);
       return a;
-    }(q);
-    k.DictionaryEntry = n;
+    }(n);
+    k.DictionaryEntry = r;
     var x = function(b) {
       function a(e, f, c, g) {
         b.call(this, e, f.tagCode, f.byteOffset, f.byteLength);
@@ -25549,7 +27209,7 @@
       }
       __extends(a, b);
       return a;
-    }(n);
+    }(r);
     k.EagerlyParsedDictionaryEntry = x;
   })(d.SWF || (d.SWF = {}));
 })(Shumway || (Shumway = {}));
@@ -25590,14 +27250,15 @@
     };
   }();
   d.LoadProgressUpdate = a;
-  var r = function() {
-    function r(a) {
+  var q = function() {
+    function q(a) {
       this._file = null;
       this._listener = a;
       this._delayedUpdatesPromise = this._loadingServiceSession = null;
       this._bytesLoaded = 0;
     }
-    r.prototype.loadFile = function(a) {
+    q.prototype.loadFile = function(a) {
+      d.SWF.enterTimeline("Load file", a.url);
       this._bytesLoaded = 0;
       var l = this._loadingServiceSession = d.FileLoadingService.instance.createSession();
       l.onopen = this.processLoadOpen.bind(this);
@@ -25606,31 +27267,32 @@
       l.onclose = this.processLoadClose.bind(this);
       l.open(a);
     };
-    r.prototype.abortLoad = function() {
+    q.prototype.abortLoad = function() {
     };
-    r.prototype.loadBytes = function(a) {
+    q.prototype.loadBytes = function(a) {
+      d.SWF.enterTimeline("Load bytes");
       this.processNewData(a, {bytesLoaded:a.length, bytesTotal:a.length});
       this.processLoadClose();
     };
-    r.prototype.processLoadOpen = function() {
+    q.prototype.processLoadOpen = function() {
     };
-    r.prototype.processNewData = function(r, l) {
-      this._bytesLoaded += r.length;
+    q.prototype.processNewData = function(q, l) {
+      this._bytesLoaded += q.length;
       if (8192 > this._bytesLoaded && this._bytesLoaded < l.bytesTotal) {
-        this._queuedInitialData || (this._queuedInitialData = new Uint8Array(Math.min(8192, l.bytesTotal))), this._queuedInitialData.set(r, this._bytesLoaded - r.length);
+        this._queuedInitialData || (this._queuedInitialData = new Uint8Array(Math.min(8192, l.bytesTotal))), this._queuedInitialData.set(q, this._bytesLoaded - q.length);
       } else {
         if (this._queuedInitialData) {
           var c = new Uint8Array(this._bytesLoaded);
           c.set(this._queuedInitialData);
-          c.set(r, this._bytesLoaded - r.length);
-          r = c;
+          c.set(q, this._bytesLoaded - q.length);
+          q = c;
           this._queuedInitialData = null;
         }
         var h = this._file, p = c = 0;
         if (h) {
-          h instanceof k && (c = h.eagerlyParsedSymbolsList.length, p = h.framesLoaded), h.appendLoadedData(r);
+          h instanceof k && (c = h.eagerlyParsedSymbolsList.length, p = h.framesLoaded), h.appendLoadedData(q);
         } else {
-          var h = r, s = l.bytesTotal, m = h[0] << 16 | h[1] << 8 | h[2], h = 22355 === (m & 65535) ? new k(h, s) : 16767231 === m || 8998990 === m || 4671814 === m ? new d.ImageFile(h, s) : null;
+          var h = q, s = l.bytesTotal, m = h[0] << 16 | h[1] << 8 | h[2], h = 22355 === (m & 65535) ? new k(h, s) : 16767231 === m || 8998990 === m || 4671814 === m ? new d.ImageFile(h, s) : null;
           h = this._file = h;
           this._listener.onLoadOpen(h);
         }
@@ -25643,17 +27305,18 @@
         }
       }
     };
-    r.prototype.processError = function(a) {
+    q.prototype.processError = function(a) {
     };
-    r.prototype.processLoadClose = function() {
+    q.prototype.processLoadClose = function() {
       var a = this._file;
       if (a instanceof k) {
-        var d = a.eagerlyParsedSymbolsList.length, c = a.framesLoaded;
+        var l = a.eagerlyParsedSymbolsList.length, c = a.framesLoaded;
         a.finishLoading();
-        this.processSWFFileUpdate(a, d, c);
+        this.processSWFFileUpdate(a, l, c);
       }
+      a.bytesLoaded !== a.bytesTotal || d.SWF.leaveTimeline();
     };
-    r.prototype.processSWFFileUpdate = function(d, l, c) {
+    q.prototype.processSWFFileUpdate = function(d, l, c) {
       var h;
       if (l = d.eagerlyParsedSymbolsList.length - l) {
         h = this._listener.onNewEagerlyParsedSymbols(d.eagerlyParsedSymbolsList, l);
@@ -25678,9 +27341,9 @@
         }
       }
     };
-    return r;
+    return q;
   }();
-  d.FileLoader = r;
+  d.FileLoader = q;
   var v;
   (function(a) {
     a[a.SWF = 22355] = "SWF";
@@ -25700,47 +27363,47 @@
     }
     return c;
   }
-  var a = /^<([-A-Za-z0-9_]+)((?:\s+[-A-Za-z0-9_]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/, r = /^<\/([-A-Za-z0-9_]+)[^>]*>/, v = /([-A-Za-z0-9_]+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g, u = k("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed"), t = k("address,applet,blockquote,button,center,dd,del,dir,div,dl,dt,fieldset,form,frameset,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,p,pre,script,table,tbody,td,tfoot,th,thead,tr,ul"), 
+  var a = /^<([-A-Za-z0-9_]+)((?:\s+[-A-Za-z0-9_]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/, q = /^<\/([-A-Za-z0-9_]+)[^>]*>/, v = /([-A-Za-z0-9_]+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g, t = k("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed"), u = k("address,applet,blockquote,button,center,dd,del,dir,div,dl,dt,fieldset,form,frameset,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,p,pre,script,table,tbody,td,tfoot,th,thead,tr,ul"), 
   l = k("a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var"), c = k("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr"), h = k("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"), p = k("script,style");
   d.HTMLParser = function(d, m) {
     function g() {
       return this[this.length - 1];
     }
-    function f(a, e, f, d) {
+    function f(a, e, f, n) {
       e = e.toLowerCase();
-      if (t[e]) {
+      if (u[e]) {
         for (;g() && l[g()];) {
           b("", g());
         }
       }
       c[e] && g() == e && b("", e);
-      (d = u[e] || !!d) || n.push(e);
+      (n = t[e] || !!n) || r.push(e);
       if (m.start) {
-        var q = Object.create(null);
+        var d = Object.create(null);
         f.replace(v, function(b, a, e, f, c) {
           a = a.toLowerCase();
-          q[a] = e ? e : f ? f : c ? c : h[a] ? a : "";
+          d[a] = e ? e : f ? f : c ? c : h[a] ? a : "";
           return b;
         });
-        m.start && m.start(e, q, !!d);
+        m.start && m.start(e, d, !!n);
       }
     }
     function b(b, a) {
       if (a) {
-        for (e = n.length - 1;0 <= e && n[e] != a;e--) {
+        for (e = r.length - 1;0 <= e && r[e] != a;e--) {
         }
       } else {
         var e = 0
       }
       if (0 <= e) {
-        for (var f = n.length - 1;f >= e;f--) {
-          m.end && m.end(n[f]);
+        for (var f = r.length - 1;f >= e;f--) {
+          m.end && m.end(r[f]);
         }
-        n.length = e;
+        r.length = e;
       }
     }
-    for (var e, q, n = [], k = d;d;) {
-      q = !0;
+    for (var e, n, r = [], k = d;d;) {
+      n = !0;
       if (g() && p[g()]) {
         d = d.replace(new RegExp("(.*)</" + g() + "[^>]*>"), function(b, a) {
           a = a.replace(/\x3c!--(.*?)--\x3e/g, "$1").replace(/<!\[CDATA\[(.*?)]]\x3e/g, "$1");
@@ -25749,17 +27412,17 @@
         }), b("", g());
       } else {
         if (0 == d.indexOf("\x3c!--")) {
-          e = d.indexOf("--\x3e"), 0 <= e && (m.comment && m.comment(d.substring(4, e)), d = d.substring(e + 3), q = !1);
+          e = d.indexOf("--\x3e"), 0 <= e && (m.comment && m.comment(d.substring(4, e)), d = d.substring(e + 3), n = !1);
         } else {
           if (0 == d.indexOf("</")) {
-            if (e = d.match(r)) {
-              d = d.substring(e[0].length), e[0].replace(r, b), q = !1;
+            if (e = d.match(q)) {
+              d = d.substring(e[0].length), e[0].replace(q, b), n = !1;
             }
           } else {
-            0 == d.indexOf("<") && (e = d.match(a)) && (d = d.substring(e[0].length), e[0].replace(a, f), q = !1);
+            0 == d.indexOf("<") && (e = d.match(a)) && (d = d.substring(e[0].length), e[0].replace(a, f), n = !1);
           }
         }
-        q && (e = d.indexOf("<"), q = 0 > e ? d : d.substring(0, e), d = 0 > e ? "" : d.substring(e), m.chars && m.chars(q));
+        n && (e = d.indexOf("<"), n = 0 > e ? d : d.substring(0, e), d = 0 > e ? "" : d.substring(e), m.chars && m.chars(n));
       }
       if (d == k) {
         throw "Parse Error: " + d;
@@ -25770,7 +27433,7 @@
   };
 })(Shumway || (Shumway = {}));
 (function(d) {
-  var k = d.Debug.notImplemented, a = d.Debug.somewhatImplemented, r = d.Bounds, v = d.ArrayUtilities.DataBuffer, u = d.ColorUtilities, t = d.AVM2.AS.flash;
+  var k = d.Debug.notImplemented, a = d.Debug.somewhatImplemented, q = d.Bounds, v = d.ArrayUtilities.DataBuffer, t = d.ColorUtilities, u = d.AVM2.AS.flash, l = d.NumberUtilities.altTieBreakRound;
   (function(a) {
     a[a.None = 0] = "None";
     a[a.DirtyBounds = 1] = "DirtyBounds";
@@ -25779,40 +27442,40 @@
     a[a.DirtyFlow = 8] = "DirtyFlow";
     a[a.Dirty = a.DirtyBounds | a.DirtyContent | a.DirtyStyle | a.DirtyFlow] = "Dirty";
   })(d.TextContentFlags || (d.TextContentFlags = {}));
-  var l = {lt:"<", gt:">", amp:"&", quot:'"', apos:"'", nbsp:"\u00a0"}, c = function() {
-    function c(a) {
-      this._id = t.display.DisplayObject.getNextSyncID();
-      this._bounds = new r(0, 0, 0, 0);
+  var c = {lt:"<", gt:">", amp:"&", quot:'"', apos:"'", nbsp:"\u00a0"}, h = function() {
+    function h(a) {
+      this._id = u.display.DisplayObject.getNextSyncID();
+      this._bounds = new q(0, 0, 0, 0);
       this._plainText = "";
       this._autoSize = this._borderColor = this._backgroundColor = 0;
       this._wordWrap = !1;
       this._scrollV = 1;
       this.flags = this._scrollH = 0;
-      this.defaultTextFormat = a || new t.text.TextFormat;
+      this.defaultTextFormat = a || new u.text.TextFormat;
       this.textRuns = [];
       this.textRunData = new v;
       this.coords = this.matrix = null;
     }
-    c.prototype.parseHtml = function(c, h, m) {
-      var g = "", f = this.textRuns, b = f.length = 0, e = 0, q = this.defaultTextFormat.clone(), n = null, r = [], v;
-      d.HTMLParser(c, v = {chars:function(a) {
-        for (var c = "", h = 0;h < a.length;h++) {
+    h.prototype.parseHtml = function(h, m, g) {
+      var f = "", b = this.textRuns, e = b.length = 0, n = 0, r = this.defaultTextFormat.clone(), l = null, p = [], q;
+      d.HTMLParser(h, q = {chars:function(a) {
+        for (var g = "", h = 0;h < a.length;h++) {
           var m = a.charAt(h);
           if ("&" !== m) {
-            c += m;
+            g += m;
           } else {
             if (m = d.StringUtilities.indexOfAny(a, ["&", ";"], h + 1), 0 < m) {
               h = a.substring(h + 1, m);
               if (1 < h.length && "#" === h.charAt(0)) {
-                var p = 0, p = 2 < h.length && "x" === h.charAt(1) ? parseInt(h.substring(1)) : parseInt(h.substring(2), 16), c = c + String.fromCharCode(p)
+                var p = 0, p = 2 < h.length && "x" === h.charAt(1) ? parseInt(h.substring(1)) : parseInt(h.substring(2), 16), g = g + String.fromCharCode(p)
               } else {
-                void 0 !== l[h] ? c += l[h] : d.Debug.unexpected(h);
+                void 0 !== c[h] ? g += c[h] : d.Debug.unexpected(h);
               }
               h = m;
             } else {
-              for (var s in l) {
+              for (var s in c) {
                 if (a.indexOf(s, h + 1) === h + 1) {
-                  c += l[s];
+                  g += c[s];
                   h += s.length;
                   break;
                 }
@@ -25820,76 +27483,76 @@
             }
           }
         }
-        a = c;
-        g += a;
-        e += a.length;
-        e - b && (n && n.textFormat.equals(q) ? n.endIndex = e : (n = new t.text.TextRun(b, e, q), f.push(n)), b = e);
+        a = g;
+        f += a;
+        n += a.length;
+        n - e && (l && l.textFormat.equals(r) ? l.endIndex = n : (l = new u.text.TextRun(e, n, r), b.push(l)), e = n);
       }, start:function(b, e) {
-        var f = !1;
-        h && (f = h.hasStyle(b)) && (r.push(q), q = q.clone(), h.applyStyle(q, b));
+        var c = !1;
+        m && (c = m.hasStyle(b)) && (p.push(r), r = r.clone(), m.applyStyle(r, b));
         switch(b) {
           case "a":
-            r.push(q);
+            p.push(r);
             a("<a/>");
-            var c = e.target || q.target, n = e.url || q.url;
-            if (c !== q.target || n !== q.url) {
-              f || (q = q.clone()), q.target = c, q.url = n;
+            var h = e.target || r.target, n = e.url || r.url;
+            if (h !== r.target || n !== r.url) {
+              c || (r = r.clone()), r.target = h, r.url = n;
             }
             break;
           case "b":
-            r.push(q);
-            q.bold || (f || (q = q.clone()), q.bold = !0);
+            p.push(r);
+            r.bold || (c || (r = r.clone()), r.bold = !0);
             break;
           case "font":
-            r.push(q);
-            var c = u.isValidHexColor(e.color) ? u.hexToRGB(e.color) : q.color, n = e.face || q.font, d = isNaN(e.size) ? q.size : +e.size;
-            if (c !== q.color || n !== q.font || d !== q.size) {
-              f || (q = q.clone()), q.color = c, q.font = n, q.size = d;
+            p.push(r);
+            var h = t.isValidHexColor(e.color) ? t.hexToRGB(e.color) : r.color, n = e.face || r.font, d = isNaN(e.size) ? r.size : +e.size;
+            if (h !== r.color || n !== r.font || d !== r.size) {
+              c || (r = r.clone()), r.color = h, r.font = n, r.size = d;
             }
             break;
           case "img":
             k("<img/>");
             break;
           case "i":
-            r.push(q);
-            q.italic || (f || (q = q.clone()), q.italic = !0);
+            p.push(r);
+            r.italic || (c || (r = r.clone()), r.italic = !0);
             break;
           case "li":
-            if (r.push(q), q.bullet || (f || (q = q.clone()), q.bullet = !0), "\r" === g[g.length - 1]) {
+            if (p.push(r), r.bullet || (c || (r = r.clone()), r.bullet = !0), "\r" === f[f.length - 1]) {
               break;
             }
           ;
           case "br":
-            m && v.chars("\r");
+            g && q.chars("\r");
             break;
           case "span":
           ;
           case "p":
-            c = !1;
-            r.push(q);
-            h && e.class && (n = "." + e.class, c = h.hasStyle(n)) && (f || (q = q.clone()), h.applyStyle(q, n));
+            h = !1;
+            p.push(r);
+            m && e.class && (n = "." + e.class, h = m.hasStyle(n)) && (c || (r = r.clone()), m.applyStyle(r, n));
             if ("span" === b) {
               break;
             }
             n = e.align;
-            -1 < t.text.TextFormatAlign.toNumber(n) && n !== q.align && (f || c || (q = q.clone()), q.align = n);
+            -1 < u.text.TextFormatAlign.toNumber(n) && n !== r.align && (c || h || (r = r.clone()), r.align = n);
             break;
           case "textformat":
-            r.push(q);
-            var c = isNaN(e.blockindent) ? q.blockIndent : +e.blockindent, n = isNaN(e.indent) ? q.indent : +e.indent, d = isNaN(e.leading) ? q.leading : +e.leading, l = isNaN(e.leftmargin) ? q.leftMargin : +e.leftmargin, p = isNaN(e.rightmargin) ? q.rightMargin : +e.rightmargin;
-            if (c !== q.blockIndent || n !== q.indent || d !== q.leading || l !== q.leftMargin || p !== q.rightMargin) {
-              f || (q = q.clone()), q.blockIndent = c, q.indent = n, q.leading = d, q.leftMargin = l, q.rightMargin = p;
+            p.push(r);
+            var h = isNaN(e.blockindent) ? r.blockIndent : +e.blockindent, n = isNaN(e.indent) ? r.indent : +e.indent, d = isNaN(e.leading) ? r.leading : +e.leading, l = isNaN(e.leftmargin) ? r.leftMargin : +e.leftmargin, s = isNaN(e.rightmargin) ? r.rightMargin : +e.rightmargin;
+            if (h !== r.blockIndent || n !== r.indent || d !== r.leading || l !== r.leftMargin || s !== r.rightMargin) {
+              c || (r = r.clone()), r.blockIndent = h, r.indent = n, r.leading = d, r.leftMargin = l, r.rightMargin = s;
             }
             break;
           case "u":
-            r.push(q), q.underline || (f || (q = q.clone()), q.underline = !0);
+            p.push(r), r.underline || (c || (r = r.clone()), r.underline = !0);
         }
       }, end:function(b) {
         switch(b) {
           case "li":
           ;
           case "p":
-            m && v.chars("\r");
+            g && q.chars("\r");
           case "a":
           ;
           case "b":
@@ -25901,57 +27564,57 @@
           case "textformat":
           ;
           case "u":
-            q = r.pop(), h && h.hasStyle(b) && (q = r.pop());
+            r = p.pop(), m && m.hasStyle(b) && (r = p.pop());
         }
       }});
-      this._plainText = g;
+      this._plainText = f;
       this._serializeTextRuns();
     };
-    Object.defineProperty(c.prototype, "plainText", {get:function() {
+    Object.defineProperty(h.prototype, "plainText", {get:function() {
       return this._plainText;
     }, set:function(a) {
       this._plainText = a;
       this.textRuns.length = 0;
-      a && (a = new t.text.TextRun(0, a.length, this.defaultTextFormat), this.textRuns[0] = a);
+      a && (a = new u.text.TextRun(0, a.length, this.defaultTextFormat), this.textRuns[0] = a);
       this._serializeTextRuns();
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(c.prototype, "bounds", {get:function() {
+    Object.defineProperty(h.prototype, "bounds", {get:function() {
       return this._bounds;
     }, set:function(a) {
       this._bounds.copyFrom(a);
       this.flags |= 1;
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(c.prototype, "autoSize", {get:function() {
+    Object.defineProperty(h.prototype, "autoSize", {get:function() {
       return this._autoSize;
     }, set:function(a) {
       a !== this._autoSize && (this._autoSize = a, this._plainText && (this.flags |= 8));
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(c.prototype, "wordWrap", {get:function() {
+    Object.defineProperty(h.prototype, "wordWrap", {get:function() {
       return this._wordWrap;
     }, set:function(a) {
       a !== this._wordWrap && (this._wordWrap = a, this._plainText && (this.flags |= 8));
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(c.prototype, "scrollV", {get:function() {
+    Object.defineProperty(h.prototype, "scrollV", {get:function() {
       return this._scrollV;
     }, set:function(a) {
       a !== this._scrollV && (this._scrollV = a, this._plainText && (this.flags |= 8));
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(c.prototype, "scrollH", {get:function() {
+    Object.defineProperty(h.prototype, "scrollH", {get:function() {
       return this._scrollH;
     }, set:function(a) {
       a !== this._scrollH && (this._scrollH = a, this._plainText && (this.flags |= 8));
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(c.prototype, "backgroundColor", {get:function() {
+    Object.defineProperty(h.prototype, "backgroundColor", {get:function() {
       return this._backgroundColor;
     }, set:function(a) {
       a !== this._backgroundColor && (this._backgroundColor = a, this.flags |= 4);
     }, enumerable:!0, configurable:!0});
-    Object.defineProperty(c.prototype, "borderColor", {get:function() {
+    Object.defineProperty(h.prototype, "borderColor", {get:function() {
       return this._borderColor;
     }, set:function(a) {
       a !== this._borderColor && (this._borderColor = a, this.flags |= 4);
     }, enumerable:!0, configurable:!0});
-    c.prototype._serializeTextRuns = function() {
+    h.prototype._serializeTextRuns = function() {
       var a = this.textRuns;
       this.textRunData.clear();
       for (var c = 0;c < a.length;c++) {
@@ -25959,24 +27622,24 @@
       }
       this.flags |= 2;
     };
-    c.prototype._writeTextRun = function(a) {
+    h.prototype._writeTextRun = function(a) {
       var c = this.textRunData;
       c.writeInt(a.beginIndex);
       c.writeInt(a.endIndex);
       a = a.textFormat;
-      var h = +a.size;
-      c.writeInt(h);
-      var g = t.text.Font.getByNameAndStyle(a.font, a.style) || t.text.Font.getDefaultFont();
-      g.fontType === t.text.FontType.EMBEDDED ? c.writeUTF("swffont" + g._id) : c.writeUTF(g._fontFamily);
-      c.writeInt(g.ascent * h);
-      c.writeInt(g.descent * h);
-      c.writeInt(null === a.leading ? g.leading * h : +a.leading);
-      var f = h = !1;
-      g.fontType === t.text.FontType.DEVICE && (h = null === a.bold ? g.fontStyle === t.text.FontStyle.BOLD || g.fontType === t.text.FontStyle.BOLD_ITALIC : !!a.bold, f = null === a.italic ? g.fontStyle === t.text.FontStyle.ITALIC || g.fontType === t.text.FontStyle.BOLD_ITALIC : !!a.italic);
-      c.writeBoolean(h);
-      c.writeBoolean(f);
+      var g = +a.size;
+      c.writeInt(g);
+      var f = u.text.Font.getByNameAndStyle(a.font, a.style) || u.text.Font.getDefaultFont();
+      f.fontType === u.text.FontType.EMBEDDED ? c.writeUTF("swffont" + f._id) : c.writeUTF(f._fontFamily);
+      c.writeInt(l(f.ascent * g, !0));
+      c.writeInt(l(f.descent * g, !1));
+      c.writeInt(null === a.leading ? f.leading * g : +a.leading);
+      var b = g = !1;
+      f.fontType === u.text.FontType.DEVICE && (g = null === a.bold ? f.fontStyle === u.text.FontStyle.BOLD || f.fontType === u.text.FontStyle.BOLD_ITALIC : !!a.bold, b = null === a.italic ? f.fontStyle === u.text.FontStyle.ITALIC || f.fontType === u.text.FontStyle.BOLD_ITALIC : !!a.italic);
+      c.writeBoolean(g);
+      c.writeBoolean(b);
       c.writeInt(+a.color);
-      c.writeInt(t.text.TextFormatAlign.toNumber(a.align));
+      c.writeInt(u.text.TextFormatAlign.toNumber(a.align));
       c.writeBoolean(!!a.bullet);
       c.writeInt(+a.indent);
       c.writeInt(+a.kerning);
@@ -25985,61 +27648,61 @@
       c.writeInt(+a.rightMargin);
       c.writeBoolean(!!a.underline);
     };
-    c.prototype.appendText = function(a, c) {
+    h.prototype.appendText = function(a, c) {
       c || (c = this.defaultTextFormat);
-      var h = this._plainText, g = new t.text.TextRun(h.length, h.length + a.length, c);
-      this._plainText = h + a;
-      this.textRuns.push(g);
-      this._writeTextRun(g);
+      var g = this._plainText, f = new u.text.TextRun(g.length, g.length + a.length, c);
+      this._plainText = g + a;
+      this.textRuns.push(f);
+      this._writeTextRun(f);
     };
-    c.prototype.prependText = function(a, c) {
+    h.prototype.prependText = function(a, c) {
       c || (c = this.defaultTextFormat);
       this._plainText = a + this._plainText;
-      for (var h = this.textRuns, g = a.length, f = 0;f < h.length;f++) {
-        var b = h[f];
-        b.beginIndex += g;
-        b.endIndex += g;
+      for (var g = this.textRuns, f = a.length, b = 0;b < g.length;b++) {
+        var e = g[b];
+        e.beginIndex += f;
+        e.endIndex += f;
       }
-      h.unshift(new t.text.TextRun(0, g, c));
+      g.unshift(new u.text.TextRun(0, f, c));
       this._serializeTextRuns();
     };
-    c.prototype.replaceText = function(a, c, h, g) {
-      if (!(c < a) && h) {
+    h.prototype.replaceText = function(a, c, g, f) {
+      if (!(c < a) && g) {
         if (0 === c) {
-          this.prependText(h, g);
+          this.prependText(g, f);
         } else {
-          var f = this._plainText;
-          if (a >= f.length) {
-            this.appendText(h, g);
-          } else {
-            var b = this.defaultTextFormat, e = b;
-            g && (e = e.clone(), e.merge(g));
-            if (0 >= a && c >= f.length) {
-              g ? (this.defaultTextFormat = e, this.plainText = h, this.defaultTextFormat = b) : this.plainText = h;
+          var b = this._plainText;
+          if (a >= b.length) {
+            this.appendText(g, f);
+          } else {
+            var e = this.defaultTextFormat, h = e;
+            f && (h = h.clone(), h.merge(f));
+            if (0 >= a && c >= b.length) {
+              f ? (this.defaultTextFormat = h, this.plainText = g, this.defaultTextFormat = e) : this.plainText = g;
             } else {
-              for (var b = this.textRuns, d = [], n = a + h.length, l = n - c, k = 0;k < b.length;k++) {
-                var r = b[k];
-                if (a < r.endIndex) {
-                  if (a <= r.beginIndex && n >= r.endIndex) {
+              for (var e = this.textRuns, d = [], l = a + g.length, p = l - c, k = 0;k < e.length;k++) {
+                var q = e[k];
+                if (a < q.endIndex) {
+                  if (a <= q.beginIndex && l >= q.endIndex) {
                     continue;
                   }
-                  var u = r.containsIndex(a), v = r.containsIndex(c);
-                  if (u && v) {
-                    if (g) {
-                      u = r.clone();
-                      u.endIndex = a;
-                      d.push(u);
+                  var t = q.containsIndex(a), v = q.containsIndex(c);
+                  if (t && v) {
+                    if (f) {
+                      t = q.clone();
+                      t.endIndex = a;
+                      d.push(t);
                       k--;
-                      r.beginIndex = a + 1;
+                      q.beginIndex = a + 1;
                       continue;
                     }
                   } else {
-                    u ? r.endIndex = a : v ? g ? (d.push(new t.text.TextRun(a, n, e)), r.beginIndex = n) : (r.beginIndex = a, r.endIndex += l) : (r.beginIndex += l, r.endIndex += l);
+                    t ? q.endIndex = a : v ? f ? (d.push(new u.text.TextRun(a, l, h)), q.beginIndex = l) : (q.beginIndex = a, q.endIndex += p) : (q.beginIndex += p, q.endIndex += p);
                   }
                 }
-                d.push(r);
+                d.push(q);
               }
-              this._plainText = f.substring(0, a) + h + f.substring(c);
+              this._plainText = b.substring(0, a) + g + b.substring(c);
               this.textRuns = d;
               this._serializeTextRuns();
             }
@@ -26047,32 +27710,33 @@
         }
       }
     };
-    return c;
+    return h;
   }();
-  d.TextContent = c;
+  d.TextContent = h;
 })(Shumway || (Shumway = {}));
-var Shumway$$inline_763 = Shumway || (Shumway = {}), AVM2$$inline_764 = Shumway$$inline_763.AVM2 || (Shumway$$inline_763.AVM2 = {}), AS$$inline_765 = AVM2$$inline_764.AS || (AVM2$$inline_764.AS = {});
-AS$$inline_765.flashOptions = Shumway$$inline_763.Settings.shumwayOptions.register(new Shumway$$inline_763.Options.OptionSet("Flash Options"));
-AS$$inline_765.traceEventsOption = AS$$inline_765.flashOptions.register(new Shumway$$inline_763.Options.Option("te", "Trace Events", "boolean", !1, "Trace dispatching of events."));
-AS$$inline_765.traceLoaderOption = AS$$inline_765.flashOptions.register(new Shumway$$inline_763.Options.Option("tp", "Trace Loader", "boolean", !1, "Trace loader execution."));
-AS$$inline_765.disableAudioOption = AS$$inline_765.flashOptions.register(new Shumway$$inline_763.Options.Option("da", "Disable Audio", "boolean", !1, "Disables audio."));
-AS$$inline_765.webAudioOption = AS$$inline_765.flashOptions.register(new Shumway$$inline_763.Options.Option(null, "Use WebAudio for Sound", "boolean", !1, "Enables WebAudio API for MovieClip sound stream. (MP3 format is an exception)"));
-AS$$inline_765.webAudioMP3Option = AS$$inline_765.flashOptions.register(new Shumway$$inline_763.Options.Option(null, "Use MP3 decoding to WebAudio", "boolean", !1, "Enables WebAudio API and software MP3 decoding and disables any AUDIO tag usage for MP3 format"));
-AS$$inline_765.mediaSourceOption = AS$$inline_765.flashOptions.register(new Shumway$$inline_763.Options.Option(null, "Use Media Source for Video", "boolean", !1, "Enables Media Source Extension API for NetStream."));
-AS$$inline_765.mediaSourceMP3Option = AS$$inline_765.flashOptions.register(new Shumway$$inline_763.Options.Option(null, "Use Media Source for MP3", "boolean", !0, "Enables Media Source Extension API for MP3 streams."));
+var Shumway$$inline_767 = Shumway || (Shumway = {}), AVM2$$inline_768 = Shumway$$inline_767.AVM2 || (Shumway$$inline_767.AVM2 = {}), AS$$inline_769 = AVM2$$inline_768.AS || (AVM2$$inline_768.AS = {});
+AS$$inline_769.flashOptions = Shumway$$inline_767.Settings.shumwayOptions.register(new Shumway$$inline_767.Options.OptionSet("Flash Options"));
+AS$$inline_769.traceEventsOption = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option("te", "Trace Events", "boolean", !1, "Trace dispatching of events."));
+AS$$inline_769.traceLoaderOption = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option("tp", "Trace Loader", "boolean", !1, "Trace loader execution."));
+AS$$inline_769.disableAudioOption = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option("da", "Disable Audio", "boolean", !1, "Disables audio."));
+AS$$inline_769.webAudioOption = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option(null, "Use WebAudio for Sound", "boolean", !1, "Enables WebAudio API for MovieClip sound stream. (MP3 format is an exception)"));
+AS$$inline_769.webAudioMP3Option = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option(null, "Use MP3 decoding to WebAudio", "boolean", !1, "Enables WebAudio API and software MP3 decoding and disables any AUDIO tag usage for MP3 format"));
+AS$$inline_769.mediaSourceOption = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option(null, "Use Media Source for Video", "boolean", !1, "Enables Media Source Extension API for NetStream."));
+AS$$inline_769.mediaSourceMP3Option = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option(null, "Use Media Source for MP3", "boolean", !0, "Enables Media Source Extension API for MP3 streams."));
+AS$$inline_769.flvOption = AS$$inline_769.flashOptions.register(new Shumway$$inline_767.Options.Option(null, "FLV support.", "string", "unsupported", "Defines how to deal with FLV streams."));
 __extends = this.__extends || function(d, k) {
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
 };
 (function(d) {
   (function(k) {
-    var a = d.Debug.warning, r = d.Bounds, v = d.AVM2.AS.flash, u = function() {
+    var a = d.Debug.warning, q = d.Bounds, v = d.AVM2.AS.flash, t = function() {
       function l(c, h) {
         this.data = c;
         if (c.className) {
@@ -26092,22 +27756,22 @@
       }, enumerable:!0, configurable:!0});
       return l;
     }();
-    k.Symbol = u;
-    var t = function(a) {
+    k.Symbol = t;
+    var u = function(a) {
       function c(c, d, s) {
         a.call(this, c, d);
         this.dynamic = s;
       }
       __extends(c, a);
       c.prototype._setBoundsFromData = function(a) {
-        this.fillBounds = a.fillBounds ? r.FromUntyped(a.fillBounds) : null;
-        this.lineBounds = a.lineBounds ? r.FromUntyped(a.lineBounds) : null;
+        this.fillBounds = a.fillBounds ? q.FromUntyped(a.fillBounds) : null;
+        this.lineBounds = a.lineBounds ? q.FromUntyped(a.lineBounds) : null;
         !this.lineBounds && this.fillBounds && (this.lineBounds = this.fillBounds.clone());
       };
       return c;
-    }(u);
-    k.DisplaySymbol = t;
-    u = function(a) {
+    }(t);
+    k.DisplaySymbol = u;
+    t = function(a) {
       function c(c) {
         a.call(this, c, v.utils.ByteArray);
       }
@@ -26119,8 +27783,8 @@
         return d;
       };
       return c;
-    }(u);
-    k.BinarySymbol = u;
+    }(t);
+    k.BinarySymbol = t;
     k.SoundStart = function() {
       return function(a, c) {
         this.soundId = a;
@@ -26421,7 +28085,7 @@
     a.prototype.connect = function(a, d) {
       throw Error("Abstract BaseTransport.connect method");
     };
-    a.prototype._initChannel = function(a, t) {
+    a.prototype._initChannel = function(a, u) {
       var l = new d.ChunkedChannel, c = this;
       l.oncreated = function() {
         var c = new k.utils.ByteArray;
@@ -26429,7 +28093,7 @@
         c.writeObject("connect");
         c.writeObject(1);
         c.writeObject(a);
-        c.writeObject(t || null);
+        c.writeObject(u || null);
         l.send(3, {streamId:0, typeId:20, data:new Uint8Array(c._buffer, 0, c.length)});
       };
       l.onmessage = function(a) {
@@ -26452,7 +28116,7 @@
               } else {
                 var m = d.readObject(), d = d.readObject();
                 if (c.onstreamcreated) {
-                  var g = new r(c, d);
+                  var g = new q(c, d);
                   c._streams[d] = g;
                   c.onstreamcreated({transactionId:l, commandObject:m, streamId:d, stream:g, isError:a});
                 }
@@ -26499,7 +28163,7 @@
     return a;
   }();
   d.BaseTransport = a;
-  var r = function() {
+  var q = function() {
     function a(d, k) {
       this.transport = d;
       this.streamId = k;
@@ -26565,7 +28229,7 @@
 (function(d) {
   (function(k) {
     function a(a, d, c) {
-      d || (d = u);
+      d || (d = t);
       var h = window.createRtmpXHR, p = h ? h() : new XMLHttpRequest({mozSystem:!0});
       p.open("POST", a, !0);
       p.responseType = "arraybuffer";
@@ -26579,7 +28243,7 @@
       };
       p.send(d);
     }
-    var r = navigator.mozTCPSocket, v = function(a) {
+    var q = navigator.mozTCPSocket, v = function(a) {
       function d(c) {
         a.call(this);
         "string" === typeof c && (c = {host:c});
@@ -26588,39 +28252,39 @@
         this.ssl = !!c.ssl || !1;
       }
       __extends(d, a);
-      d.prototype.connect = function(a, d) {
-        function l(a) {
+      d.prototype.connect = function(a, h) {
+        function d(a) {
           return b.send(a.buffer, a.byteOffset, a.byteLength);
         }
-        if (!r) {
+        if (!q) {
           throw Error("Your browser does not support socket communication.\nCurrenly only Firefox with enabled mozTCPSocket is allowed (see README.md).");
         }
-        var s = this._initChannel(a, d), m = [], g = !1, f = window.createRtmpSocket, b = f ? f({host:this.host, port:this.port, ssl:this.ssl}) : r.open(this.host, this.port, {useSecureTransport:this.ssl, binaryType:"arraybuffer"});
+        var l = this._initChannel(a, h), m = [], g = !1, f = window.createRtmpSocket, b = f ? f({host:this.host, port:this.port, ssl:this.ssl}) : q.open(this.host, this.port, {useSecureTransport:this.ssl, binaryType:"arraybuffer"});
         b.onopen = function(a) {
-          s.ondata = function(b) {
+          l.ondata = function(b) {
             b = new Uint8Array(b);
             m.push(b);
-            1 < m.length || l(b) && m.shift();
+            1 < m.length || d(b) && m.shift();
           };
-          s.onclose = function() {
+          l.onclose = function() {
             b.close();
           };
-          s.start();
+          l.start();
         };
         b.ondrain = function(b) {
-          for (m.shift();0 < m.length && l(m[0]);) {
+          for (m.shift();0 < m.length && d(m[0]);) {
             m.shift();
           }
         };
         b.onclose = function(b) {
-          s.stop(g);
+          l.stop(g);
         };
         b.onerror = function(b) {
           g = !0;
           console.error("socket error: " + b.data);
         };
         b.ondata = function(b) {
-          s.push(new Uint8Array(b.data));
+          l.push(new Uint8Array(b.data));
         };
       };
       return d;
@@ -26638,23 +28302,23 @@
         this.data = [];
       }
       __extends(l, d);
-      l.prototype.connect = function(c, d) {
-        var l = this._initChannel(c, d);
-        l.ondata = function(a) {
+      l.prototype.connect = function(c, h) {
+        var d = this._initChannel(c, h);
+        d.ondata = function(a) {
           this.data.push(new Uint8Array(a));
         }.bind(this);
-        l.onclose = function() {
+        d.onclose = function() {
           this.stopped = !0;
         }.bind(this);
-        a(this.baseUrl + "/fcs/ident2", null, function(c, d) {
-          if (404 !== d) {
-            throw Error("Unexpected response: " + d);
+        a(this.baseUrl + "/fcs/ident2", null, function(c, h) {
+          if (404 !== h) {
+            throw Error("Unexpected response: " + h);
           }
           a(this.baseUrl + "/open/1", null, function(a, f) {
             this.sessionId = String.fromCharCode.apply(null, a).slice(0, -1);
             console.log("session id: " + this.sessionId);
             this.tick();
-            l.start();
+            d.start();
           }.bind(this));
         }.bind(this));
       };
@@ -26672,18 +28336,18 @@
           });
         } else {
           if (0 < this.data.length) {
-            var d, l = 0;
+            var h, d = 0;
             this.data.forEach(function(a) {
-              l += a.length;
+              d += a.length;
             });
-            var s = 0;
-            d = new Uint8Array(l);
+            var l = 0;
+            h = new Uint8Array(d);
             this.data.forEach(function(a) {
-              d.set(a, s);
-              s += a.length;
+              h.set(a, l);
+              l += a.length;
             });
             this.data.length = 0;
-            a(this.baseUrl + "/send/" + this.sessionId + "/" + this.requestId++, d, c);
+            a(this.baseUrl + "/send/" + this.sessionId + "/" + this.requestId++, h, c);
           } else {
             a(this.baseUrl + "/idle/" + this.sessionId + "/" + this.requestId++, null, c);
           }
@@ -26692,7 +28356,7 @@
       return l;
     }(d.BaseTransport);
     k.RtmptTransport = v;
-    var u = new Uint8Array([0]);
+    var t = new Uint8Array([0]);
   })(d.Browser || (d.Browser = {}));
 })(RtmpJs || (RtmpJs = {}));
 (function(d) {
@@ -26710,10 +28374,10 @@
         a[f + 2] = b >> 8 & 255;
         a[f + 3] = b & 255;
       }
-      function u(a) {
+      function t(a) {
         return a.charCodeAt(0) << 24 | a.charCodeAt(1) << 16 | a.charCodeAt(2) << 8 | a.charCodeAt(3);
       }
-      var t = Shumway.StringUtilities.utf8decode, l = [1, 0, 0, 0, 1, 0, 0, 0, 1], c = [0, 0, 0], h = function() {
+      var u = Shumway.StringUtilities.utf8decode, l = [1, 0, 0, 0, 1, 0, 0, 0, 1], c = [0, 0, 0], h = function() {
         function a(f, b) {
           this.boxtype = f;
           "uuid" === f && (this.userType = b);
@@ -26726,7 +28390,7 @@
         };
         a.prototype.write = function(a) {
           k(a, this.offset, this.size);
-          k(a, this.offset + 4, u(this.boxtype));
+          k(a, this.offset + 4, t(this.boxtype));
           if (!this.userType) {
             return 8;
           }
@@ -26774,11 +28438,11 @@
         };
         f.prototype.write = function(b) {
           var e = this, f = a.prototype.write.call(this, b);
-          k(b, this.offset + f, u(this.majorBrand));
+          k(b, this.offset + f, t(this.majorBrand));
           k(b, this.offset + f + 4, this.minorVersion);
           f += 8;
           this.compatibleBrands.forEach(function(a) {
-            k(b, e.offset + f, u(a));
+            k(b, e.offset + f, t(a));
             f += 4;
           }, this);
           return f;
@@ -26822,10 +28486,10 @@
       }(s);
       a.MovieBox = m;
       m = function(a) {
-        function f(b, e, f, c, d, h, m, p) {
+        function f(b, e, f, c, h, d, m, p) {
           void 0 === c && (c = 1);
-          void 0 === d && (d = 1);
-          void 0 === h && (h = l);
+          void 0 === h && (h = 1);
+          void 0 === d && (d = l);
           void 0 === m && (m = -20828448E5);
           void 0 === p && (p = -20828448E5);
           a.call(this, "mvhd", 0, 0);
@@ -26833,8 +28497,8 @@
           this.duration = e;
           this.nextTrackId = f;
           this.rate = c;
-          this.volume = d;
-          this.matrix = h;
+          this.volume = h;
+          this.matrix = d;
           this.creationTime = m;
           this.modificationTime = p;
         }
@@ -26883,23 +28547,23 @@
         a[a.TRACK_IN_PREVIEW = 4] = "TRACK_IN_PREVIEW";
       })(a.TrackHeaderFlags || (a.TrackHeaderFlags = {}));
       m = function(a) {
-        function f(b, e, f, c, d, h, m, p, s, k, r) {
+        function f(b, e, f, c, h, d, m, p, k, s, q) {
           void 0 === m && (m = 0);
           void 0 === p && (p = 0);
-          void 0 === s && (s = l);
-          void 0 === k && (k = -20828448E5);
-          void 0 === r && (r = -20828448E5);
+          void 0 === k && (k = l);
+          void 0 === s && (s = -20828448E5);
+          void 0 === q && (q = -20828448E5);
           a.call(this, "tkhd", 0, b);
           this.trackId = e;
           this.duration = f;
           this.width = c;
-          this.height = d;
-          this.volume = h;
+          this.height = h;
+          this.volume = d;
           this.alternateGroup = m;
           this.layer = p;
-          this.matrix = s;
-          this.creationTime = k;
-          this.modificationTime = r;
+          this.matrix = k;
+          this.creationTime = s;
+          this.modificationTime = q;
         }
         __extends(f, a);
         f.prototype.layout = function(b) {
@@ -26936,16 +28600,16 @@
       }(p);
       a.TrackHeaderBox = m;
       m = function(a) {
-        function f(b, e, f, c, d) {
+        function f(b, e, f, c, h) {
           void 0 === f && (f = "unk");
           void 0 === c && (c = -20828448E5);
-          void 0 === d && (d = -20828448E5);
+          void 0 === h && (h = -20828448E5);
           a.call(this, "mdhd", 0, 0);
           this.timescale = b;
           this.duration = e;
           this.language = f;
           this.creationTime = c;
-          this.modificationTime = d;
+          this.modificationTime = h;
         }
         __extends(f, a);
         f.prototype.layout = function(b) {
@@ -26969,7 +28633,7 @@
           a.call(this, "hdlr", 0, 0);
           this.handlerType = b;
           this.name = e;
-          this._encodedName = t(this.name);
+          this._encodedName = u(this.name);
         }
         __extends(f, a);
         f.prototype.layout = function(b) {
@@ -26978,7 +28642,7 @@
         f.prototype.write = function(b) {
           var e = a.prototype.write.call(this, b);
           k(b, this.offset + e, 0);
-          k(b, this.offset + e + 4, u(this.handlerType));
+          k(b, this.offset + e + 4, t(this.handlerType));
           k(b, this.offset + e + 8, 0);
           k(b, this.offset + e + 12, 0);
           k(b, this.offset + e + 16, 0);
@@ -27035,7 +28699,7 @@
           void 0 === e && (e = null);
           c.call(this, "url ", 0, b);
           this.location = e;
-          b & a.SELF_CONTAINED_DATA_REFERENCE_FLAG || (this._encodedLocation = t(e));
+          b & a.SELF_CONTAINED_DATA_REFERENCE_FLAG || (this._encodedLocation = u(e));
         }
         __extends(f, c);
         f.prototype.layout = function(b) {
@@ -27110,13 +28774,13 @@
       }(p);
       a.SampleDescriptionBox = m;
       m = function(a) {
-        function f(b, e, f, c, d) {
-          a.call(this, "stbl", [b, e, f, c, d]);
+        function f(b, e, f, c, h) {
+          a.call(this, "stbl", [b, e, f, c, h]);
           this.sampleDescriptions = b;
           this.timeToSample = e;
           this.sampleToChunk = f;
           this.sampleSizes = c;
-          this.chunkOffset = d;
+          this.chunkOffset = h;
         }
         __extends(f, a);
         return f;
@@ -27155,13 +28819,13 @@
       }(s);
       a.TrackBox = m;
       m = function(a) {
-        function f(b, e, f, c, d) {
+        function f(b, e, f, c, h) {
           a.call(this, "trex", 0, 0);
           this.trackId = b;
           this.defaultSampleDescriptionIndex = e;
           this.defaultSampleDuration = f;
           this.defaultSampleSize = c;
-          this.defaultSampleFlags = d;
+          this.defaultSampleFlags = h;
         }
         __extends(f, a);
         f.prototype.layout = function(b) {
@@ -27239,14 +28903,14 @@
         a[a.DEFAULT_SAMPLE_FLAGS_PRESENT = 32] = "DEFAULT_SAMPLE_FLAGS_PRESENT";
       })(a.TrackFragmentFlags || (a.TrackFragmentFlags = {}));
       m = function(a) {
-        function f(b, e, f, c, d, h, l) {
+        function f(b, e, f, c, h, d, m) {
           a.call(this, "tfhd", 0, b);
           this.trackId = e;
           this.baseDataOffset = f;
           this.sampleDescriptionIndex = c;
-          this.defaultSampleDuration = d;
-          this.defaultSampleSize = h;
-          this.defaultSampleFlags = l;
+          this.defaultSampleDuration = h;
+          this.defaultSampleSize = d;
+          this.defaultSampleFlags = m;
         }
         __extends(f, a);
         f.prototype.layout = function(b) {
@@ -27345,12 +29009,12 @@
           e += 4;
           c & 1 && (k(b, this.offset + e, this.dataOffset), e += 4);
           c & 4 && (k(b, this.offset + e, this.firstSampleFlags), e += 4);
-          for (var d = 0;d < f;d++) {
-            var h = this.samples[d];
-            c & 256 && (k(b, this.offset + e, h.duration), e += 4);
-            c & 512 && (k(b, this.offset + e, h.size), e += 4);
-            c & 1024 && (k(b, this.offset + e, h.flags), e += 4);
-            c & 2048 && (k(b, this.offset + e, h.compositionTimeOffset), e += 4);
+          for (var h = 0;h < f;h++) {
+            var d = this.samples[h];
+            c & 256 && (k(b, this.offset + e, d.duration), e += 4);
+            c & 512 && (k(b, this.offset + e, d.size), e += 4);
+            c & 1024 && (k(b, this.offset + e, d.flags), e += 4);
+            c & 2048 && (k(b, this.offset + e, d.compositionTimeOffset), e += 4);
           }
           return e;
         };
@@ -27410,16 +29074,16 @@
       }(h);
       a.SampleEntry = p;
       s = function(a) {
-        function f(b, e, f, c, d, h) {
+        function f(b, e, f, c, h, d) {
           void 0 === f && (f = 2);
           void 0 === c && (c = 16);
-          void 0 === d && (d = 44100);
-          void 0 === h && (h = null);
+          void 0 === h && (h = 44100);
+          void 0 === d && (d = null);
           a.call(this, b, e);
           this.channelCount = f;
           this.sampleSize = c;
-          this.sampleRate = d;
-          this.otherBoxes = h;
+          this.sampleRate = h;
+          this.otherBoxes = d;
         }
         __extends(f, a);
         f.prototype.layout = function(b) {
@@ -27447,23 +29111,23 @@
       a.AudioSampleEntry = s;
       a.COLOR_NO_ALPHA_VIDEO_SAMPLE_DEPTH = 24;
       p = function(c) {
-        function f(b, e, f, d, h, l, m, p, s, k) {
-          void 0 === h && (h = "");
-          void 0 === l && (l = 72);
+        function f(b, e, f, h, d, m, l, p, k, s) {
+          void 0 === d && (d = "");
           void 0 === m && (m = 72);
+          void 0 === l && (l = 72);
           void 0 === p && (p = 1);
-          void 0 === s && (s = a.COLOR_NO_ALPHA_VIDEO_SAMPLE_DEPTH);
-          void 0 === k && (k = null);
+          void 0 === k && (k = a.COLOR_NO_ALPHA_VIDEO_SAMPLE_DEPTH);
+          void 0 === s && (s = null);
           c.call(this, b, e);
           this.width = f;
-          this.height = d;
-          this.compressorName = h;
-          this.horizResolution = l;
-          this.vertResolution = m;
+          this.height = h;
+          this.compressorName = d;
+          this.horizResolution = m;
+          this.vertResolution = l;
           this.frameCount = p;
-          this.depth = s;
-          this.otherBoxes = k;
-          if (31 < h.length) {
+          this.depth = k;
+          this.otherBoxes = s;
+          if (31 < d.length) {
             throw Error("invalid compressor name");
           }
         }
@@ -27527,17 +29191,17 @@
 (function(d) {
   (function(d) {
     function a(a) {
-      for (var c = a.length >> 1, d = new Uint8Array(c), g = 0;g < c;g++) {
-        d[g] = parseInt(a.substr(2 * g, 2), 16);
+      for (var c = a.length >> 1, h = new Uint8Array(c), g = 0;g < c;g++) {
+        h[g] = parseInt(a.substr(2 * g, 2), 16);
       }
-      return d;
+      return h;
     }
-    var r = [5500, 11025, 22050, 44100], v = ["PCM", "ADPCM", "MP3", "PCM le", "Nellymouser16", "Nellymouser8", "Nellymouser", "G.711 A-law", "G.711 mu-law", null, "AAC", "Speex", "MP3 8khz"], u;
+    var q = [5500, 11025, 22050, 44100], v = ["PCM", "ADPCM", "MP3", "PCM le", "Nellymouser16", "Nellymouser8", "Nellymouser", "G.711 A-law", "G.711 mu-law", null, "AAC", "Speex", "MP3 8khz"], t;
     (function(a) {
       a[a.HEADER = 0] = "HEADER";
       a[a.RAW = 1] = "RAW";
-    })(u || (u = {}));
-    var t = [null, "JPEG", "Sorenson", "Screen", "VP6", "VP6 alpha", "Screen2", "AVC"], l;
+    })(t || (t = {}));
+    var u = [null, "JPEG", "Sorenson", "Screen", "VP6", "VP6 alpha", "Screen2", "AVC"], l;
     (function(a) {
       a[a.KEY = 1] = "KEY";
       a[a.INNER = 2] = "INNER";
@@ -27557,9 +29221,9 @@
       a[a.NEED_HEADER_DATA = 1] = "NEED_HEADER_DATA";
       a[a.MAIN_PACKETS = 2] = "MAIN_PACKETS";
     })(h || (h = {}));
-    u = function() {
+    t = function() {
       function c(a) {
-        var d = this;
+        var h = this;
         this.oncodecinfo = function(a) {
         };
         this.ondata = function(a) {
@@ -27568,8 +29232,8 @@
         this.metadata = a;
         this.trackStates = this.metadata.tracks.map(function(a, f) {
           var b = {trackId:f + 1, trackInfo:a, cachedDuration:0, samplesProcessed:0, initializationData:[]};
-          d.metadata.audioTrackId === f && (d.audioTrackState = b);
-          d.metadata.videoTrackId === f && (d.videoTrackState = b);
+          h.metadata.audioTrackId === f && (h.audioTrackState = b);
+          h.metadata.videoTrackId === f && (h.videoTrackState = b);
           return b;
         }, this);
         this._checkIfNeedHeaderData();
@@ -27582,19 +29246,19 @@
         switch(a) {
           case 8:
             a = this.audioTrackState;
-            var f = 0, b = 1, e = c[f], d = e >> 4, h;
+            var f = 0, b = 1, e = c[f], h = e >> 4, d;
             f++;
-            switch(d) {
+            switch(h) {
               case 10:
                 b = c[f++];
-                h = 1024;
+                d = 1024;
                 break;
               case 2:
-                h = c[f + 1] >> 3 & 3;
+                d = c[f + 1] >> 3 & 3;
                 var l = c[f + 1] >> 1 & 3;
-                h = 1 === l ? 3 === h ? 1152 : 576 : 3 === l ? 384 : 1152;
+                d = 1 === l ? 3 === d ? 1152 : 576 : 3 === l ? 384 : 1152;
             }
-            c = {codecDescription:v[d], codecId:d, data:c.subarray(f), rate:r[e >> 2 & 3], size:e & 2 ? 16 : 8, channels:e & 1 ? 2 : 1, samples:h, packetType:b};
+            c = {codecDescription:v[h], codecId:h, data:c.subarray(f), rate:q[e >> 2 & 3], size:e & 2 ? 16 : 8, channels:e & 1 ? 2 : 1, samples:d, packetType:b};
             if (!a || a.trackInfo.codecId !== c.codecId) {
               throw Error("Unexpected audio packet codec: " + c.codecDescription);
             }
@@ -27618,7 +29282,7 @@
             e = c[f] >> 4;
             b = c[f] & 15;
             f++;
-            e = {frameType:e, codecId:b, codecDescription:t[b]};
+            e = {frameType:e, codecId:b, codecDescription:u[b]};
             switch(b) {
               case 7:
                 b = c[f++];
@@ -27676,29 +29340,29 @@
             var f = this.trackStates[g], b = f.trackInfo, e;
             switch(b.codecId) {
               case 10:
-                var l = f.initializationData[0];
+                var n = f.initializationData[0];
                 e = new d.Iso.AudioSampleEntry("mp4a", 1, b.channels, b.samplesize, b.samplerate);
-                var n = new Uint8Array(41 + l.length);
-                n.set(a("0000000003808080"), 0);
-                n[8] = 32 + l.length;
-                n.set(a("00020004808080"), 9);
-                n[16] = 18 + l.length;
-                n.set(a("40150000000000FA000000000005808080"), 17);
-                n[34] = l.length;
-                n.set(l, 35);
-                n.set(a("068080800102"), 35 + l.length);
-                e.otherBoxes = [new d.Iso.RawTag("esds", n)];
-                f.mimeTypeCodec = "mp4a.40." + (l[0] >> 3);
+                var r = new Uint8Array(41 + n.length);
+                r.set(a("0000000003808080"), 0);
+                r[8] = 32 + n.length;
+                r.set(a("00020004808080"), 9);
+                r[16] = 18 + n.length;
+                r.set(a("40150000000000FA000000000005808080"), 17);
+                r[34] = n.length;
+                r.set(n, 35);
+                r.set(a("068080800102"), 35 + n.length);
+                e.otherBoxes = [new d.Iso.RawTag("esds", r)];
+                f.mimeTypeCodec = "mp4a.40." + (n[0] >> 3);
                 break;
               case 2:
                 e = new d.Iso.AudioSampleEntry(".mp3", 1, b.channels, b.samplesize, b.samplerate);
                 f.mimeTypeCodec = "mp3";
                 break;
               case 7:
-                l = f.initializationData[0];
+                n = f.initializationData[0];
                 e = new d.Iso.VideoSampleEntry("avc1", 1, b.width, b.height);
-                e.otherBoxes = [new d.Iso.RawTag("avcC", l)];
-                f.mimeTypeCodec = "avc1." + (16777216 | l[1] << 16 | l[2] << 8 | l[3]).toString(16).substr(1);
+                e.otherBoxes = [new d.Iso.RawTag("avcC", n)];
+                f.mimeTypeCodec = "avc1." + (16777216 | n[1] << 16 | n[2] << 8 | n[3]).toString(16).substr(1);
                 c.push("iso2", "avc1", "mp41");
                 break;
               case 4:
@@ -27709,11 +29373,11 @@
               default:
                 throw Error("not supported track type");;
             }
-            var p;
-            f === this.audioTrackState ? p = new d.Iso.TrackBox(new d.Iso.TrackHeaderBox(3, f.trackId, -1, 0, 0, 1, g), new d.Iso.MediaBox(new d.Iso.MediaHeaderBox(b.timescale, -1, b.language), new d.Iso.HandlerBox("soun", "SoundHandler"), new d.Iso.MediaInformationBox(new d.Iso.SoundMediaHeaderBox, new d.Iso.DataInformationBox(new d.Iso.DataReferenceBox([new d.Iso.DataEntryUrlBox(d.Iso.SELF_CONTAINED_DATA_REFERENCE_FLAG)])), new d.Iso.SampleTableBox(new d.Iso.SampleDescriptionBox([e]), new d.Iso.RawTag("stts", 
-            a("0000000000000000")), new d.Iso.RawTag("stsc", a("0000000000000000")), new d.Iso.RawTag("stsz", a("000000000000000000000000")), new d.Iso.RawTag("stco", a("0000000000000000")))))) : f === this.videoTrackState && (p = new d.Iso.TrackBox(new d.Iso.TrackHeaderBox(3, f.trackId, -1, b.width, b.height, 0, g), new d.Iso.MediaBox(new d.Iso.MediaHeaderBox(b.timescale, -1, b.language), new d.Iso.HandlerBox("vide", "VideoHandler"), new d.Iso.MediaInformationBox(new d.Iso.VideoMediaHeaderBox, new d.Iso.DataInformationBox(new d.Iso.DataReferenceBox([new d.Iso.DataEntryUrlBox(d.Iso.SELF_CONTAINED_DATA_REFERENCE_FLAG)])), 
+            var l;
+            f === this.audioTrackState ? l = new d.Iso.TrackBox(new d.Iso.TrackHeaderBox(3, f.trackId, -1, 0, 0, 1, g), new d.Iso.MediaBox(new d.Iso.MediaHeaderBox(b.timescale, -1, b.language), new d.Iso.HandlerBox("soun", "SoundHandler"), new d.Iso.MediaInformationBox(new d.Iso.SoundMediaHeaderBox, new d.Iso.DataInformationBox(new d.Iso.DataReferenceBox([new d.Iso.DataEntryUrlBox(d.Iso.SELF_CONTAINED_DATA_REFERENCE_FLAG)])), new d.Iso.SampleTableBox(new d.Iso.SampleDescriptionBox([e]), new d.Iso.RawTag("stts", 
+            a("0000000000000000")), new d.Iso.RawTag("stsc", a("0000000000000000")), new d.Iso.RawTag("stsz", a("000000000000000000000000")), new d.Iso.RawTag("stco", a("0000000000000000")))))) : f === this.videoTrackState && (l = new d.Iso.TrackBox(new d.Iso.TrackHeaderBox(3, f.trackId, -1, b.width, b.height, 0, g), new d.Iso.MediaBox(new d.Iso.MediaHeaderBox(b.timescale, -1, b.language), new d.Iso.HandlerBox("vide", "VideoHandler"), new d.Iso.MediaInformationBox(new d.Iso.VideoMediaHeaderBox, new d.Iso.DataInformationBox(new d.Iso.DataReferenceBox([new d.Iso.DataEntryUrlBox(d.Iso.SELF_CONTAINED_DATA_REFERENCE_FLAG)])), 
             new d.Iso.SampleTableBox(new d.Iso.SampleDescriptionBox([e]), new d.Iso.RawTag("stts", a("0000000000000000")), new d.Iso.RawTag("stsc", a("0000000000000000")), new d.Iso.RawTag("stsz", a("000000000000000000000000")), new d.Iso.RawTag("stco", a("0000000000000000")))))));
-            h.push(p);
+            h.push(l);
           }
           g = new d.Iso.MovieExtendsBox(null, [new d.Iso.TrackExtendsBox(1, 1, 0, 0, 0), new d.Iso.TrackExtendsBox(2, 1, 0, 0, 0)], null);
           f = new d.Iso.BoxContainerBox("udat", [new d.Iso.MetaBox(new d.Iso.RawTag("hdlr", a("00000000000000006D6469726170706C000000000000000000")), [new d.Iso.RawTag("ilst", a("00000025A9746F6F0000001D6461746100000001000000004C61766635342E36332E313034"))])]);
@@ -27737,56 +29401,56 @@
         var a, c = this.cachedPackets;
         if (0 !== c.length) {
           for (var g = [], f = 0, b = [], e = [], h = 0;h < this.trackStates.length;h++) {
-            var n = this.trackStates[h], l = n.trackInfo, p = n.trackId, r = c.filter(function(b) {
+            var r = this.trackStates[h], l = r.trackInfo, p = r.trackId, q = c.filter(function(b) {
               return b.trackId === p;
             });
-            if (0 !== r.length) {
-              var u = new d.Iso.TrackFragmentBaseMediaDecodeTimeBox(n.cachedDuration), t;
+            if (0 !== q.length) {
+              var t = new d.Iso.TrackFragmentBaseMediaDecodeTimeBox(r.cachedDuration), u;
               e.push(f);
               switch(l.codecId) {
                 case 10:
                 ;
                 case 2:
-                  t = [];
-                  for (a = 0;a < r.length;a++) {
-                    var v = r[a].packet, J = Math.round(v.samples * l.timescale / l.samplerate);
+                  u = [];
+                  for (a = 0;a < q.length;a++) {
+                    var v = q[a].packet, Q = Math.round(v.samples * l.timescale / l.samplerate);
                     g.push(v.data);
                     f += v.data.length;
-                    t.push({duration:J, size:v.data.length});
-                    n.samplesProcessed += v.samples;
+                    u.push({duration:Q, size:v.data.length});
+                    r.samplesProcessed += v.samples;
                   }
                   a = 32;
                   a = new d.Iso.TrackFragmentHeaderBox(a, p, 0, 0, 0, 0, 33554432);
-                  r = 769;
-                  t = new d.Iso.TrackRunBox(r, t, 0, 0);
-                  n.cachedDuration = Math.round(n.samplesProcessed * l.timescale / l.samplerate);
+                  q = 769;
+                  u = new d.Iso.TrackRunBox(q, u, 0, 0);
+                  r.cachedDuration = Math.round(r.samplesProcessed * l.timescale / l.samplerate);
                   break;
                 case 7:
                 ;
                 case 4:
-                  t = [];
-                  v = n.samplesProcessed;
-                  J = Math.round(v * l.timescale / l.framerate);
-                  for (a = 0;a < r.length;a++) {
-                    var M = r[a].packet;
+                  u = [];
+                  v = r.samplesProcessed;
+                  Q = Math.round(v * l.timescale / l.framerate);
+                  for (a = 0;a < q.length;a++) {
+                    var N = q[a].packet;
                     v++;
-                    var D = Math.round(v * l.timescale / l.framerate), B = D - J, J = D, E = Math.round(v * l.timescale / l.framerate + M.compositionTime * l.timescale / 1E3);
-                    g.push(M.data);
-                    f += M.data.length;
-                    t.push({duration:B, size:M.data.length, flags:1 === M.frameType ? 33554432 : 16842752, compositionTimeOffset:E - D});
+                    var B = Math.round(v * l.timescale / l.framerate), y = B - Q, Q = B, L = Math.round(v * l.timescale / l.framerate + N.compositionTime * l.timescale / 1E3);
+                    g.push(N.data);
+                    f += N.data.length;
+                    u.push({duration:y, size:N.data.length, flags:1 === N.frameType ? 33554432 : 16842752, compositionTimeOffset:L - B});
                   }
                   a = 32;
                   a = new d.Iso.TrackFragmentHeaderBox(a, p, 0, 0, 0, 0, 33554432);
-                  r = 3841;
-                  t = new d.Iso.TrackRunBox(r, t, 0, 0);
-                  n.cachedDuration = J;
-                  n.samplesProcessed = v;
+                  q = 3841;
+                  u = new d.Iso.TrackRunBox(q, u, 0, 0);
+                  r.cachedDuration = Q;
+                  r.samplesProcessed = v;
                   break;
                 default:
                   throw Error("Un codec");;
               }
-              n = new d.Iso.TrackFragmentBox(a, u, t);
-              b.push(n);
+              r = new d.Iso.TrackFragmentBox(a, t, u);
+              b.push(r);
             }
           }
           this.cachedPackets.splice(0, c.length);
@@ -27794,12 +29458,12 @@
           c = new d.Iso.MovieFragmentBox(h, b);
           f = c.layout(0);
           g = new d.Iso.MediaDataBox(g);
-          n = g.layout(f);
+          r = g.layout(f);
           l = f + 8;
           for (h = 0;h < b.length;h++) {
             b[h].run.dataOffset = l + e[h];
           }
-          b = new Uint8Array(f + n);
+          b = new Uint8Array(f + r);
           c.write(b);
           g.write(b);
           this.ondata(b);
@@ -27808,10 +29472,10 @@
       };
       return c;
     }();
-    d.MP4Mux = u;
+    d.MP4Mux = t;
     d.parseFLVMetadata = function(a) {
-      var c = [], d = -1, g = -1, f = +a.asGetPublicProperty("duration"), b, e, h = a.asGetPublicProperty("audiocodecid");
-      switch(h) {
+      var c = [], h = -1, g = -1, f = +a.asGetPublicProperty("duration"), b, e, d = a.asGetPublicProperty("audiocodecid");
+      switch(d) {
         case 2:
         ;
         case "mp3":
@@ -27825,45 +29489,45 @@
           e = 10;
           break;
         default:
-          if (!isNaN(h)) {
-            throw Error("Unsupported audio codec: " + h);
+          if (!isNaN(d)) {
+            throw Error("Unsupported audio codec: " + d);
           }
           b = null;
           e = -1;
       }
-      var n, l, k = a.asGetPublicProperty("videocodecid");
+      var r, l, k = a.asGetPublicProperty("videocodecid");
       switch(k) {
         case 4:
         ;
         case "vp6f":
-          n = "vp6f";
+          r = "vp6f";
           l = 4;
           break;
         case 7:
         ;
         case "avc1":
-          n = "avc1";
+          r = "avc1";
           l = 7;
           break;
         default:
           if (!isNaN(k)) {
             throw Error("Unsupported video codec: " + k);
           }
-          n = null;
+          r = null;
           l = -1;
       }
       b = null === b ? null : {codecDescription:b, codecId:e, language:"und", timescale:+a.asGetPublicProperty("audiosamplerate") || 44100, samplerate:+a.asGetPublicProperty("audiosamplerate") || 44100, channels:+a.asGetPublicProperty("audiochannels") || 2, samplesize:16};
-      n = null === n ? null : {codecDescription:n, codecId:l, language:"und", timescale:6E4, framerate:+a.asGetPublicProperty("videoframerate") || +a.asGetPublicProperty("framerate"), width:+a.asGetPublicProperty("width"), height:+a.asGetPublicProperty("height")};
+      r = null === r ? null : {codecDescription:r, codecId:l, language:"und", timescale:6E4, framerate:+a.asGetPublicProperty("videoframerate") || +a.asGetPublicProperty("framerate"), width:+a.asGetPublicProperty("width"), height:+a.asGetPublicProperty("height")};
       if (a = a.asGetPublicProperty("trackinfo")) {
         for (l = 0;l < a.length;l++) {
           e = a[l];
-          var r = e.asGetPublicProperty("sampledescription")[0];
-          r.asGetPublicProperty("sampletype") === h ? (b.language = e.asGetPublicProperty("language"), b.timescale = +e.asGetPublicProperty("timescale")) : r.asGetPublicProperty("sampletype") === k && (n.language = e.asGetPublicProperty("language"), n.timescale = +e.asGetPublicProperty("timescale"));
+          var q = e.asGetPublicProperty("sampledescription")[0];
+          q.asGetPublicProperty("sampletype") === d ? (b.language = e.asGetPublicProperty("language"), b.timescale = +e.asGetPublicProperty("timescale")) : q.asGetPublicProperty("sampletype") === k && (r.language = e.asGetPublicProperty("language"), r.timescale = +e.asGetPublicProperty("timescale"));
         }
       }
-      n && (g = c.length, c.push(n));
-      b && (d = c.length, c.push(b));
-      return{tracks:c, duration:f, audioTrackId:d, videoTrackId:g};
+      r && (g = c.length, c.push(r));
+      b && (h = c.length, c.push(b));
+      return{tracks:c, duration:f, audioTrackId:h, videoTrackId:g};
     };
   })(d.MP4 || (d.MP4 = {}));
 })(RtmpJs || (RtmpJs = {}));
@@ -27972,7 +29636,7 @@
     (function(a) {
       (function(d) {
         (function(k) {
-          function u(a) {
+          function t(a) {
             switch(a) {
               case c:
               ;
@@ -27990,7 +29654,7 @@
                 return Math.cos(a);
             }
           }
-          function t(a) {
+          function u(a) {
             switch(a) {
               case c:
               ;
@@ -28009,20 +29673,20 @@
             }
           }
           var l = Math.PI, c = l / 2, h = l + c, p = 2 * l, s = function(a) {
-            function c(a, b, e, g, d, h) {
+            function c(a, b, e, g, h, d) {
               void 0 === a && (a = 1);
               void 0 === b && (b = 0);
               void 0 === e && (e = 0);
               void 0 === g && (g = 1);
-              void 0 === d && (d = 0);
               void 0 === h && (h = 0);
-              var l = this._data = new Float64Array(6);
-              l[0] = a;
-              l[1] = b;
-              l[2] = e;
-              l[3] = g;
-              l[4] = d;
-              l[5] = h;
+              void 0 === d && (d = 0);
+              var m = this._data = new Float64Array(6);
+              m[0] = a;
+              m[1] = b;
+              m[2] = e;
+              m[3] = g;
+              m[4] = h;
+              m[5] = d;
             }
             __extends(c, a);
             c.FromUntyped = function(a) {
@@ -28064,45 +29728,45 @@
             c.prototype.concat = function(a) {
               var b = this._data;
               a = a._data;
-              var e = b[0] * a[0], c = 0, g = 0, d = b[3] * a[3], h = b[4] * a[0] + a[4], l = b[5] * a[3] + a[5];
+              var e = b[0] * a[0], c = 0, g = 0, h = b[3] * a[3], d = b[4] * a[0] + a[4], m = b[5] * a[3] + a[5];
               if (0 !== b[1] || 0 !== b[2] || 0 !== a[1] || 0 !== a[2]) {
-                e += b[1] * a[2], d += b[2] * a[1], c += b[0] * a[1] + b[1] * a[3], g += b[2] * a[0] + b[3] * a[2], h += b[5] * a[2], l += b[4] * a[1];
+                e += b[1] * a[2], h += b[2] * a[1], c += b[0] * a[1] + b[1] * a[3], g += b[2] * a[0] + b[3] * a[2], d += b[5] * a[2], m += b[4] * a[1];
               }
               b[0] = e;
               b[1] = c;
               b[2] = g;
-              b[3] = d;
-              b[4] = h;
-              b[5] = l;
+              b[3] = h;
+              b[4] = d;
+              b[5] = m;
             };
             c.prototype.preMultiply = function(a) {
               this.preMultiplyInto(a, this);
             };
             c.prototype.preMultiplyInto = function(a, b) {
-              var e = this._data, c = a._data, g = b._data, d = c[0] * e[0], h = 0, l = 0, m = c[3] * e[3], p = c[4] * e[0] + e[4], s = c[5] * e[3] + e[5];
+              var e = this._data, c = a._data, g = b._data, h = c[0] * e[0], d = 0, m = 0, l = c[3] * e[3], p = c[4] * e[0] + e[4], k = c[5] * e[3] + e[5];
               if (0 !== c[1] || 0 !== c[2] || 0 !== e[1] || 0 !== e[2]) {
-                d += c[1] * e[2], m += c[2] * e[1], h += c[0] * e[1] + c[1] * e[3], l += c[2] * e[0] + c[3] * e[2], p += c[5] * e[2], s += c[4] * e[1];
+                h += c[1] * e[2], l += c[2] * e[1], d += c[0] * e[1] + c[1] * e[3], m += c[2] * e[0] + c[3] * e[2], p += c[5] * e[2], k += c[4] * e[1];
               }
-              g[0] = d;
-              g[1] = h;
-              g[2] = l;
-              g[3] = m;
+              g[0] = h;
+              g[1] = d;
+              g[2] = m;
+              g[3] = l;
               g[4] = p;
-              g[5] = s;
+              g[5] = k;
             };
             c.prototype.invert = function() {
               this.invertInto(this);
             };
             c.prototype.invertInto = function(a) {
-              var b = this._data, e = a._data, c = b[1], g = b[2], d = b[4], h = b[5];
+              var b = this._data, e = a._data, c = b[1], g = b[2], h = b[4], d = b[5];
               if (0 === c && 0 === g) {
-                var l = e[0] = 1 / b[0], b = e[3] = 1 / b[3];
+                var m = e[0] = 1 / b[0], b = e[3] = 1 / b[3];
                 e[1] = e[2] = 0;
-                e[4] = -l * d;
-                e[5] = -b * h;
+                e[4] = -m * h;
+                e[5] = -b * d;
               } else {
-                var l = b[0], b = b[3], m = l * b - c * g;
-                0 === m ? a.identity() : (m = 1 / m, a = 0, a = e[0] = b * m, c = e[1] = -c * m, g = e[2] = -g * m, b = e[3] = l * m, e[4] = -(a * d + g * h), e[5] = -(c * d + b * h));
+                var m = b[0], b = b[3], l = m * b - c * g;
+                0 === l ? a.identity() : (l = 1 / l, a = 0, a = e[0] = b * l, c = e[1] = -c * l, g = e[2] = -g * l, b = e[3] = m * l, e[4] = -(a * h + g * d), e[5] = -(c * h + b * d));
               }
             };
             c.prototype.identity = function() {
@@ -28114,19 +29778,19 @@
               void 0 === e && (e = 0);
               void 0 === c && (c = 0);
               void 0 === g && (g = 0);
-              var d = this._data;
+              var h = this._data;
               if (0 !== e) {
-                var h = u(e);
-                e = t(e);
-                d[0] = h * a;
-                d[1] = e * b;
-                d[2] = -e * a;
-                d[3] = h * b;
+                var d = t(e);
+                e = u(e);
+                h[0] = d * a;
+                h[1] = e * b;
+                h[2] = -e * a;
+                h[3] = d * b;
               } else {
-                d[0] = a, d[1] = 0, d[2] = 0, d[3] = b;
+                h[0] = a, h[1] = 0, h[2] = 0, h[3] = b;
               }
-              d[4] = c;
-              d[5] = g;
+              h[4] = c;
+              h[5] = g;
             };
             c.prototype.createGradientBox = function(a, b, e, c, g) {
               void 0 === e && (e = 0);
@@ -28137,15 +29801,15 @@
             c.prototype.rotate = function(a) {
               a = +a;
               if (0 !== a) {
-                var b = this._data, e = u(a);
-                a = t(a);
-                var c = b[0], g = b[1], d = b[2], h = b[3], l = b[4], m = b[5];
+                var b = this._data, e = t(a);
+                a = u(a);
+                var c = b[0], g = b[1], h = b[2], d = b[3], m = b[4], l = b[5];
                 b[0] = c * e - g * a;
                 b[1] = c * a + g * e;
-                b[2] = d * e - h * a;
-                b[3] = d * a + h * e;
-                b[4] = l * e - m * a;
-                b[5] = l * a + m * e;
+                b[2] = h * e - d * a;
+                b[3] = h * a + d * e;
+                b[4] = m * e - l * a;
+                b[5] = m * a + l * e;
               }
             };
             c.prototype.translate = function(a, b) {
@@ -28179,15 +29843,15 @@
               return a;
             };
             c.prototype.transformBounds = function(a) {
-              var b = this._data, e = b[0], c = b[1], g = b[2], d = b[3], h = b[4], l = b[5], m = a.xMin, p = a.yMin, s = a.width, k = a.height, b = Math.round(e * m + g * p + h), r = Math.round(c * m + d * p + l), u = Math.round(e * (m + s) + g * p + h), t = Math.round(c * (m + s) + d * p + l), v = Math.round(e * (m + s) + g * (p + k) + h), s = Math.round(c * (m + s) + d * (p + k) + l), e = Math.round(e * m + g * (p + k) + h), c = Math.round(c * m + d * (p + k) + l), d = 0;
-              b > u && (d = b, b = u, u = d);
-              v > e && (d = v, v = e, e = d);
+              var b = this._data, e = b[0], c = b[1], g = b[2], h = b[3], d = b[4], m = b[5], l = a.xMin, p = a.yMin, k = a.width, s = a.height, b = Math.round(e * l + g * p + d), q = Math.round(c * l + h * p + m), t = Math.round(e * (l + k) + g * p + d), u = Math.round(c * (l + k) + h * p + m), v = Math.round(e * (l + k) + g * (p + s) + d), k = Math.round(c * (l + k) + h * (p + s) + m), e = Math.round(e * l + g * (p + s) + d), c = Math.round(c * l + h * (p + s) + m), h = 0;
+              b > t && (h = b, b = t, t = h);
+              v > e && (h = v, v = e, e = h);
               a.xMin = b < v ? b : v;
-              a.xMax = u > e ? u : e;
-              r > t && (d = r, r = t, t = d);
-              s > c && (d = s, s = c, c = d);
-              a.yMin = r < s ? r : s;
-              a.yMax = t > c ? t : c;
+              a.xMax = t > e ? t : e;
+              q > u && (h = q, q = u, u = h);
+              k > c && (h = k, k = c, c = h);
+              a.yMin = q < k ? q : k;
+              a.yMax = u > c ? u : c;
             };
             c.prototype.getDeterminant = function() {
               var a = this._data;
@@ -28240,14 +29904,14 @@
               b[4] = a.tx;
               b[5] = a.ty;
             };
-            c.prototype.setTo = function(a, b, e, c, g, d) {
-              var h = this._data;
-              h[0] = a;
-              h[1] = b;
-              h[2] = e;
-              h[3] = c;
-              h[4] = g;
-              h[5] = d;
+            c.prototype.setTo = function(a, b, e, c, g, h) {
+              var d = this._data;
+              d[0] = a;
+              d[1] = b;
+              d[2] = e;
+              d[3] = c;
+              d[4] = g;
+              d[5] = h;
             };
             c.prototype.toTwipsInPlace = function() {
               var a = this._data;
@@ -28284,10 +29948,10 @@
             c.prototype.updateScaleAndRotation = function(a, b, e, c) {
               var g = this._data;
               if (0 !== e && e !== p || 0 !== c && c !== p) {
-                var d = u(e), h = t(e);
-                e === c ? (g[0] = d * a, g[1] = h * a) : (g[0] = u(c) * a, g[1] = t(c) * a);
-                g[2] = -h * b;
-                g[3] = d * b;
+                var h = t(e), d = u(e);
+                e === c ? (g[0] = h * a, g[1] = d * a) : (g[0] = t(c) * a, g[1] = u(c) * a);
+                g[2] = -d * b;
+                g[3] = h * b;
               } else {
                 g[0] = a, g[1] = g[2] = 0, g[3] = b;
               }
@@ -28333,36 +29997,36 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          function u(a, c, d, g, f, b, e) {
-            var h = c * c, n = d * d, l = g * g, u = h + n + l, t = Math.sqrt(u);
-            c /= t;
-            d /= t;
-            g /= t;
+          function t(a, c, h, g, f, b, e) {
+            var d = c * c, l = h * h, x = g * g, t = d + l + x, u = Math.sqrt(t);
+            c /= u;
             h /= u;
-            n /= u;
-            l /= u;
-            u = Math.cos(a);
+            g /= u;
+            d /= t;
+            l /= t;
+            x /= t;
+            t = Math.cos(a);
             a = Math.sin(a);
-            return new k.geom.Matrix3D([h + (n + l) * u, c * d * (1 - u) + g * a, c * g * (1 - u) - d * a, 0, c * d * (1 - u) - g * a, n + (h + l) * u, d * g * (1 - u) + c * a, 0, c * g * (1 - u) + d * a, d * g * (1 - u) - c * a, l + (h + n) * u, 0, (f * (n + l) - c * (b * d + e * g)) * (1 - u) + (b * g - e * d) * a, (b * (h + l) - d * (f * c + e * g)) * (1 - u) + (e * c - f * g) * a, (e * (h + n) - g * (f * c + b * d)) * (1 - u) + (f * d - b * c) * a, 1]);
+            return new k.geom.Matrix3D([d + (l + x) * t, c * h * (1 - t) + g * a, c * g * (1 - t) - h * a, 0, c * h * (1 - t) - g * a, l + (d + x) * t, h * g * (1 - t) + c * a, 0, c * g * (1 - t) + h * a, h * g * (1 - t) - c * a, x + (d + l) * t, 0, (f * (l + x) - c * (b * h + e * g)) * (1 - t) + (b * g - e * h) * a, (b * (d + x) - h * (f * c + e * g)) * (1 - t) + (e * c - f * g) * a, (e * (d + l) - g * (f * c + b * h)) * (1 - t) + (f * h - b * c) * a, 1]);
           }
-          var t = d.Debug.notImplemented, l = d.AVM2.Runtime.asCoerceString, c = new Uint32Array([0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15]), h = function(d) {
-            function h(a) {
+          var u = d.Debug.notImplemented, l = d.AVM2.Runtime.asCoerceString, c = new Uint32Array([0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15]), h = function(h) {
+            function d(a) {
               void 0 === a && (a = null);
               this._matrix = new Float32Array(16);
               a && 16 <= a.length ? this.copyRawDataFrom(a) : this.identity();
             }
-            __extends(h, d);
-            h.interpolate = function(a, c, f) {
-              t("public flash.geom.Matrix3D::static interpolate");
+            __extends(d, h);
+            d.interpolate = function(a, c, f) {
+              u("public flash.geom.Matrix3D::static interpolate");
             };
-            Object.defineProperty(h.prototype, "rawData", {get:function() {
+            Object.defineProperty(d.prototype, "rawData", {get:function() {
               var c = new a.Float64Vector;
               this.copyRawDataTo(c);
               return c;
             }, set:function(a) {
               this.copyRawDataFrom(a);
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(h.prototype, "position", {get:function() {
+            Object.defineProperty(d.prototype, "position", {get:function() {
               var a = this._matrix;
               return new k.geom.Vector3D(a[12], a[13], a[14]);
             }, set:function(a) {
@@ -28371,120 +30035,120 @@
               c[13] = a.y;
               c[14] = a.z;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(h.prototype, "determinant", {get:function() {
-              var a = this._matrix, c = a[4], f = a[8], b = a[12], e = a[5], d = a[9], h = a[13], l = a[6], p = a[10], s = a[14], k = a[7], r = a[11], u = a[15];
-              return a[0] * (e * (p * u - r * s) - l * (d * u - r * h) + k * (d * s - p * h)) - a[1] * (c * (p * u - r * s) - l * (f * u - r * b) + k * (f * s - p * b)) + a[2] * (c * (d * u - r * h) - e * (f * u - r * b) + k * (f * h - d * b)) - a[3] * (c * (d * s - p * h) - e * (f * s - p * b) + l * (f * h - d * b));
+            Object.defineProperty(d.prototype, "determinant", {get:function() {
+              var a = this._matrix, c = a[4], f = a[8], b = a[12], e = a[5], h = a[9], d = a[13], l = a[6], p = a[10], k = a[14], s = a[7], q = a[11], t = a[15];
+              return a[0] * (e * (p * t - q * k) - l * (h * t - q * d) + s * (h * k - p * d)) - a[1] * (c * (p * t - q * k) - l * (f * t - q * b) + s * (f * k - p * b)) + a[2] * (c * (h * t - q * d) - e * (f * t - q * b) + s * (f * d - h * b)) - a[3] * (c * (h * k - p * d) - e * (f * k - p * b) + l * (f * d - h * b));
             }, enumerable:!0, configurable:!0});
-            h.prototype.clone = function() {
+            d.prototype.clone = function() {
               return new k.geom.Matrix3D(this._matrix);
             };
-            h.prototype.copyToMatrix3D = function(a) {
+            d.prototype.copyToMatrix3D = function(a) {
               a._matrix.set(this._matrix);
             };
-            h.prototype.append = function(a) {
+            d.prototype.append = function(a) {
               var c = a._matrix, f = this._matrix;
               a = this._matrix;
-              var b = c[0], e = c[4], d = c[8], h = c[12], l = c[1], p = c[5], s = c[9], k = c[13], r = c[2], u = c[6], t = c[10], v = c[14], D = c[3], B = c[7], E = c[11], c = c[15], y = f[0], z = f[4], G = f[8], C = f[12], I = f[1], P = f[5], T = f[9], O = f[13], Q = f[2], S = f[6], V = f[10], aa = f[14], $ = f[3], w = f[7], U = f[11], f = f[15];
-              a[0] = b * y + e * I + d * Q + h * $;
-              a[1] = l * y + p * I + s * Q + k * $;
-              a[2] = r * y + u * I + t * Q + v * $;
-              a[3] = D * y + B * I + E * Q + c * $;
-              a[4] = b * z + e * P + d * S + h * w;
-              a[5] = l * z + p * P + s * S + k * w;
-              a[6] = r * z + u * P + t * S + v * w;
-              a[7] = D * z + B * P + E * S + c * w;
-              a[8] = b * G + e * T + d * V + h * U;
-              a[9] = l * G + p * T + s * V + k * U;
-              a[10] = r * G + u * T + t * V + v * U;
-              a[11] = D * G + B * T + E * V + c * U;
-              a[12] = b * C + e * O + d * aa + h * f;
-              a[13] = l * C + p * O + s * aa + k * f;
-              a[14] = r * C + u * O + t * aa + v * f;
-              a[15] = D * C + B * O + E * aa + c * f;
+              var b = c[0], e = c[4], h = c[8], d = c[12], l = c[1], p = c[5], k = c[9], s = c[13], q = c[2], t = c[6], u = c[10], v = c[14], B = c[3], y = c[7], L = c[11], c = c[15], A = f[0], z = f[4], G = f[8], I = f[12], D = f[1], R = f[5], T = f[9], J = f[13], P = f[2], S = f[6], W = f[10], ba = f[14], w = f[3], X = f[7], U = f[11], f = f[15];
+              a[0] = b * A + e * D + h * P + d * w;
+              a[1] = l * A + p * D + k * P + s * w;
+              a[2] = q * A + t * D + u * P + v * w;
+              a[3] = B * A + y * D + L * P + c * w;
+              a[4] = b * z + e * R + h * S + d * X;
+              a[5] = l * z + p * R + k * S + s * X;
+              a[6] = q * z + t * R + u * S + v * X;
+              a[7] = B * z + y * R + L * S + c * X;
+              a[8] = b * G + e * T + h * W + d * U;
+              a[9] = l * G + p * T + k * W + s * U;
+              a[10] = q * G + t * T + u * W + v * U;
+              a[11] = B * G + y * T + L * W + c * U;
+              a[12] = b * I + e * J + h * ba + d * f;
+              a[13] = l * I + p * J + k * ba + s * f;
+              a[14] = q * I + t * J + u * ba + v * f;
+              a[15] = B * I + y * J + L * ba + c * f;
             };
-            h.prototype.prepend = function(a) {
+            d.prototype.prepend = function(a) {
               var c = this._matrix, f = a._matrix;
               a = this._matrix;
-              var b = c[0], e = c[4], d = c[8], h = c[12], l = c[1], p = c[5], s = c[9], k = c[13], r = c[2], u = c[6], t = c[10], v = c[14], D = c[3], B = c[7], E = c[11], c = c[15], y = f[0], z = f[4], G = f[8], C = f[12], I = f[1], P = f[5], T = f[9], O = f[13], Q = f[2], S = f[6], V = f[10], aa = f[14], $ = f[3], w = f[7], U = f[11], f = f[15];
-              a[0] = b * y + e * I + d * Q + h * $;
-              a[1] = l * y + p * I + s * Q + k * $;
-              a[2] = r * y + u * I + t * Q + v * $;
-              a[3] = D * y + B * I + E * Q + c * $;
-              a[4] = b * z + e * P + d * S + h * w;
-              a[5] = l * z + p * P + s * S + k * w;
-              a[6] = r * z + u * P + t * S + v * w;
-              a[7] = D * z + B * P + E * S + c * w;
-              a[8] = b * G + e * T + d * V + h * U;
-              a[9] = l * G + p * T + s * V + k * U;
-              a[10] = r * G + u * T + t * V + v * U;
-              a[11] = D * G + B * T + E * V + c * U;
-              a[12] = b * C + e * O + d * aa + h * f;
-              a[13] = l * C + p * O + s * aa + k * f;
-              a[14] = r * C + u * O + t * aa + v * f;
-              a[15] = D * C + B * O + E * aa + c * f;
+              var b = c[0], e = c[4], h = c[8], d = c[12], l = c[1], p = c[5], k = c[9], s = c[13], q = c[2], t = c[6], u = c[10], v = c[14], B = c[3], y = c[7], L = c[11], c = c[15], A = f[0], z = f[4], G = f[8], I = f[12], D = f[1], R = f[5], T = f[9], J = f[13], P = f[2], S = f[6], W = f[10], ba = f[14], w = f[3], X = f[7], U = f[11], f = f[15];
+              a[0] = b * A + e * D + h * P + d * w;
+              a[1] = l * A + p * D + k * P + s * w;
+              a[2] = q * A + t * D + u * P + v * w;
+              a[3] = B * A + y * D + L * P + c * w;
+              a[4] = b * z + e * R + h * S + d * X;
+              a[5] = l * z + p * R + k * S + s * X;
+              a[6] = q * z + t * R + u * S + v * X;
+              a[7] = B * z + y * R + L * S + c * X;
+              a[8] = b * G + e * T + h * W + d * U;
+              a[9] = l * G + p * T + k * W + s * U;
+              a[10] = q * G + t * T + u * W + v * U;
+              a[11] = B * G + y * T + L * W + c * U;
+              a[12] = b * I + e * J + h * ba + d * f;
+              a[13] = l * I + p * J + k * ba + s * f;
+              a[14] = q * I + t * J + u * ba + v * f;
+              a[15] = B * I + y * J + L * ba + c * f;
             };
-            h.prototype.invert = function() {
+            d.prototype.invert = function() {
               var a = this.determinant;
               if (1E-7 > Math.abs(a)) {
                 return!1;
               }
-              var a = 1 / a, c = this._matrix, f = c[0], b = c[1], e = c[2], d = c[3], h = c[4], l = c[5], p = c[6], s = c[7], k = c[8], r = c[9], u = c[10], t = c[11], v = c[12], D = c[13], B = c[14], E = c[15];
-              c[0] = a * (l * (u * E - B * t) - r * (p * E - B * s) + D * (p * t - u * s));
-              c[1] = -a * (b * (u * E - B * t) - r * (e * E - B * d) + D * (e * t - u * d));
-              c[2] = a * (b * (p * E - B * s) - l * (e * E - B * d) + D * (e * s - p * d));
-              c[3] = -a * (b * (p * t - u * s) - l * (e * t - u * d) + r * (e * s - p * d));
-              c[4] = -a * (h * (u * E - B * t) - k * (p * E - B * s) + v * (p * t - u * s));
-              c[5] = a * (f * (u * E - B * t) - k * (e * E - B * d) + v * (e * t - u * d));
-              c[6] = -a * (f * (p * E - B * s) - h * (e * E - B * d) + v * (e * s - p * d));
-              c[7] = a * (f * (p * t - u * s) - h * (e * t - u * d) + k * (e * s - p * d));
-              c[8] = a * (h * (r * E - D * t) - k * (l * E - D * s) + v * (l * t - r * s));
-              c[9] = -a * (f * (r * E - D * t) - k * (b * E - D * d) + v * (b * t - r * d));
-              c[10] = a * (f * (l * E - D * s) - h * (b * E - D * d) + v * (b * s - l * d));
-              c[11] = -a * (f * (l * t - r * s) - h * (b * t - r * d) + k * (b * s - l * d));
-              c[12] = -a * (h * (r * B - D * u) - k * (l * B - D * p) + v * (l * u - r * p));
-              c[13] = a * (f * (r * B - D * u) - k * (b * B - D * e) + v * (b * u - r * e));
-              c[14] = -a * (f * (l * B - D * p) - h * (b * B - D * e) + v * (b * p - l * e));
-              c[15] = a * (f * (l * u - r * p) - h * (b * u - r * e) + k * (b * p - l * e));
+              var a = 1 / a, c = this._matrix, f = c[0], b = c[1], e = c[2], h = c[3], d = c[4], l = c[5], p = c[6], k = c[7], s = c[8], q = c[9], t = c[10], u = c[11], v = c[12], B = c[13], y = c[14], L = c[15];
+              c[0] = a * (l * (t * L - y * u) - q * (p * L - y * k) + B * (p * u - t * k));
+              c[1] = -a * (b * (t * L - y * u) - q * (e * L - y * h) + B * (e * u - t * h));
+              c[2] = a * (b * (p * L - y * k) - l * (e * L - y * h) + B * (e * k - p * h));
+              c[3] = -a * (b * (p * u - t * k) - l * (e * u - t * h) + q * (e * k - p * h));
+              c[4] = -a * (d * (t * L - y * u) - s * (p * L - y * k) + v * (p * u - t * k));
+              c[5] = a * (f * (t * L - y * u) - s * (e * L - y * h) + v * (e * u - t * h));
+              c[6] = -a * (f * (p * L - y * k) - d * (e * L - y * h) + v * (e * k - p * h));
+              c[7] = a * (f * (p * u - t * k) - d * (e * u - t * h) + s * (e * k - p * h));
+              c[8] = a * (d * (q * L - B * u) - s * (l * L - B * k) + v * (l * u - q * k));
+              c[9] = -a * (f * (q * L - B * u) - s * (b * L - B * h) + v * (b * u - q * h));
+              c[10] = a * (f * (l * L - B * k) - d * (b * L - B * h) + v * (b * k - l * h));
+              c[11] = -a * (f * (l * u - q * k) - d * (b * u - q * h) + s * (b * k - l * h));
+              c[12] = -a * (d * (q * y - B * t) - s * (l * y - B * p) + v * (l * t - q * p));
+              c[13] = a * (f * (q * y - B * t) - s * (b * y - B * e) + v * (b * t - q * e));
+              c[14] = -a * (f * (l * y - B * p) - d * (b * y - B * e) + v * (b * p - l * e));
+              c[15] = a * (f * (l * t - q * p) - d * (b * t - q * e) + s * (b * p - l * e));
               return!0;
             };
-            h.prototype.identity = function() {
+            d.prototype.identity = function() {
               var a = this._matrix;
               a[0] = a[5] = a[10] = a[15] = 1;
               a[1] = a[2] = a[3] = a[4] = a[6] = a[7] = a[8] = a[9] = a[11] = a[12] = a[13] = a[14] = 0;
             };
-            h.prototype.decompose = function(a) {
+            d.prototype.decompose = function(a) {
               void 0 === a && (a = "eulerAngles");
               l(a);
-              t("public flash.geom.Matrix3D::decompose");
+              u("public flash.geom.Matrix3D::decompose");
             };
-            h.prototype.recompose = function(a, c) {
+            d.prototype.recompose = function(a, c) {
               void 0 === c && (c = "eulerAngles");
               l(c);
-              t("public flash.geom.Matrix3D::recompose");
+              u("public flash.geom.Matrix3D::recompose");
             };
-            h.prototype.appendTranslation = function(a, c, f) {
+            d.prototype.appendTranslation = function(a, c, f) {
               a = +a;
               c = +c;
               f = +f;
-              var b = this._matrix, e = b[3], d = b[7], h = b[11], l = b[15];
+              var b = this._matrix, e = b[3], h = b[7], d = b[11], l = b[15];
               b[0] += a * e;
               b[1] += c * e;
               b[2] += f * e;
-              b[4] += a * d;
-              b[5] += c * d;
-              b[6] += f * d;
-              b[8] += a * h;
-              b[9] += c * h;
-              b[10] += f * h;
+              b[4] += a * h;
+              b[5] += c * h;
+              b[6] += f * h;
+              b[8] += a * d;
+              b[9] += c * d;
+              b[10] += f * d;
               b[12] += a * l;
               b[13] += c * l;
               b[14] += f * l;
             };
-            h.prototype.appendRotation = function(a, c, f) {
+            d.prototype.appendRotation = function(a, c, f) {
               void 0 === f && (f = null);
-              this.append(u(+a / 180 * Math.PI, c.x, c.y, c.z, f ? f.x : 0, f ? f.y : 0, f ? f.z : 0));
+              this.append(t(+a / 180 * Math.PI, c.x, c.y, c.z, f ? f.x : 0, f ? f.y : 0, f ? f.z : 0));
             };
-            h.prototype.appendScale = function(a, c, f) {
+            d.prototype.appendScale = function(a, c, f) {
               a = +a;
               c = +c;
               f = +f;
@@ -28502,21 +30166,21 @@
               b[13] *= c;
               b[14] *= f;
             };
-            h.prototype.prependTranslation = function(a, c, f) {
+            d.prototype.prependTranslation = function(a, c, f) {
               a = +a;
               c = +c;
               f = +f;
-              var b = this._matrix, e = b[1], d = b[5], h = b[9], l = b[2], p = b[6], s = b[10], k = b[3], r = b[7], u = b[11];
+              var b = this._matrix, e = b[1], h = b[5], d = b[9], l = b[2], p = b[6], k = b[10], s = b[3], q = b[7], t = b[11];
               b[12] += b[0] * a + b[4] * c + b[8] * f;
-              b[13] += e * a + d * c + h * f;
-              b[14] += l * a + p * c + s * f;
-              b[15] += k * a + r * c + u * f;
+              b[13] += e * a + h * c + d * f;
+              b[14] += l * a + p * c + k * f;
+              b[15] += s * a + q * c + t * f;
             };
-            h.prototype.prependRotation = function(a, c, f) {
+            d.prototype.prependRotation = function(a, c, f) {
               void 0 === f && (f = null);
-              this.prepend(u(+a / 180 * Math.PI, c.x, c.y, c.z, f ? f.x : 0, f ? f.y : 0, f ? f.z : 0));
+              this.prepend(t(+a / 180 * Math.PI, c.x, c.y, c.z, f ? f.x : 0, f ? f.y : 0, f ? f.z : 0));
             };
-            h.prototype.prependScale = function(a, c, f) {
+            d.prototype.prependScale = function(a, c, f) {
               a = +a;
               c = +c;
               f = +f;
@@ -28534,25 +30198,25 @@
               b[10] *= f;
               b[11] *= f;
             };
-            h.prototype.transformVector = function(a) {
+            d.prototype.transformVector = function(a) {
               var c = this._matrix, f = a.x, b = a.y;
               a = a.z;
               return new k.geom.Vector3D(c[0] * f + c[4] * b + c[8] * a + c[12], c[1] * f + c[5] * b + c[9] * a + c[13], c[2] * f + c[6] * b + c[10] * a + c[14]);
             };
-            h.prototype.deltaTransformVector = function(a) {
+            d.prototype.deltaTransformVector = function(a) {
               var c = this._matrix, f = a.x, b = a.y;
               a = a.z;
               return new k.geom.Vector3D(c[0] * f + c[4] * b + c[8] * a, c[1] * f + c[5] * b + c[9] * a, c[2] * f + c[6] * b + c[10] * a);
             };
-            h.prototype.transformVectors = function(a, c) {
-              for (var f = this._matrix, b = f[0], e = f[4], d = f[8], h = f[12], l = f[1], p = f[5], s = f[9], k = f[13], r = f[2], u = f[6], t = f[10], f = f[14], v = 0;v < a.length - 2;v += 3) {
-                var D = a.asGetNumericProperty(v), B = a.asGetNumericProperty(v + 1), E = a.asGetNumericProperty(v + 2);
-                c.push(b * D + e * B + d * E + h);
-                c.push(l * D + p * B + s * E + k);
-                c.push(r * D + u * B + t * E + f);
+            d.prototype.transformVectors = function(a, c) {
+              for (var f = this._matrix, b = f[0], e = f[4], h = f[8], d = f[12], l = f[1], p = f[5], k = f[9], s = f[13], q = f[2], t = f[6], u = f[10], f = f[14], v = 0;v < a.length - 2;v += 3) {
+                var B = a.asGetNumericProperty(v), y = a.asGetNumericProperty(v + 1), L = a.asGetNumericProperty(v + 2);
+                c.push(b * B + e * y + h * L + d);
+                c.push(l * B + p * y + k * L + s);
+                c.push(q * B + t * y + u * L + f);
               }
             };
-            h.prototype.transpose = function() {
+            d.prototype.transpose = function() {
               var a = this._matrix, c;
               c = a[1];
               a[1] = a[4];
@@ -28573,16 +30237,16 @@
               a[11] = a[14];
               a[14] = c;
             };
-            h.prototype.pointAt = function(a, c, f) {
-              t("public flash.geom.Matrix3D::pointAt");
+            d.prototype.pointAt = function(a, c, f) {
+              u("public flash.geom.Matrix3D::pointAt");
             };
-            h.prototype.interpolateTo = function(a, c) {
-              t("public flash.geom.Matrix3D::interpolateTo");
+            d.prototype.interpolateTo = function(a, c) {
+              u("public flash.geom.Matrix3D::interpolateTo");
             };
-            h.prototype.copyFrom = function(a) {
+            d.prototype.copyFrom = function(a) {
               this._matrix.set(a._matrix);
             };
-            h.prototype.copyRawDataTo = function(a) {
+            d.prototype.copyRawDataTo = function(a) {
               var g = 0, f = !1;
               void 0 === g && (g = 0);
               void 0 === f && (f = !1);
@@ -28597,7 +30261,7 @@
                 }
               }
             };
-            h.prototype.copyRawDataFrom = function(a) {
+            d.prototype.copyRawDataFrom = function(a) {
               var g = 0, f = !1;
               void 0 === g && (g = 0);
               void 0 === f && (f = !1);
@@ -28612,39 +30276,39 @@
                 }
               }
             };
-            h.prototype.copyRowTo = function(a, c) {
+            d.prototype.copyRowTo = function(a, c) {
               var f = a >>> 0 | 0, b = this._matrix;
               c.x = b[f];
               c.y = b[f + 4];
               c.z = b[f + 8];
               c.w = b[f + 12];
             };
-            h.prototype.copyColumnTo = function(a, c) {
+            d.prototype.copyColumnTo = function(a, c) {
               var f = a >>> 0 << 2, b = this._matrix;
               c.x = b[f];
               c.y = b[f + 1];
               c.z = b[f + 2];
               c.w = b[f + 3];
             };
-            h.prototype.copyRowFrom = function(a, c) {
+            d.prototype.copyRowFrom = function(a, c) {
               var f = a >>> 0 | 0, b = this._matrix;
               b[f] = c.x;
               b[f + 4] = c.y;
               b[f + 8] = c.z;
               b[f + 12] = c.w;
             };
-            h.prototype.copyColumnFrom = function(a, c) {
+            d.prototype.copyColumnFrom = function(a, c) {
               var f = a >>> 0 << 2, b = this._matrix;
               b[f] = c.x;
               b[f + 1] = c.y;
               b[f + 2] = c.z;
               b[f + 3] = c.w;
             };
-            h.classInitializer = null;
-            h.initializer = null;
-            h.classSymbols = null;
-            h.instanceSymbols = null;
-            return h;
+            d.classInitializer = null;
+            d.initializer = null;
+            d.classSymbols = null;
+            d.instanceSymbols = null;
+            return d;
           }(a.ASNative);
           v.Matrix3D = h;
         })(k.geom || (k.geom = {}));
@@ -28657,9 +30321,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.geom.Orientation3D");
+              q("public flash.geom.Orientation3D");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -28671,7 +30335,7 @@
             c.QUATERNION = "quaternion";
             return c;
           }(a.ASNative);
-          k.Orientation3D = t;
+          k.Orientation3D = u;
         })(k.geom || (k.geom = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -28682,34 +30346,34 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
-            function d() {
-              t("public flash.geom.PerspectiveProjection");
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
+            function h() {
+              u("public flash.geom.PerspectiveProjection");
             }
-            __extends(d, a);
-            Object.defineProperty(d.prototype, "fieldOfView", {get:function() {
-              r("public flash.geom.PerspectiveProjection::get fieldOfView");
+            __extends(h, a);
+            Object.defineProperty(h.prototype, "fieldOfView", {get:function() {
+              q("public flash.geom.PerspectiveProjection::get fieldOfView");
             }, set:function(a) {
-              r("public flash.geom.PerspectiveProjection::set fieldOfView");
+              q("public flash.geom.PerspectiveProjection::set fieldOfView");
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(d.prototype, "projectionCenter", {get:function() {
-              r("public flash.geom.PerspectiveProjection::get projectionCenter");
+            Object.defineProperty(h.prototype, "projectionCenter", {get:function() {
+              q("public flash.geom.PerspectiveProjection::get projectionCenter");
             }, set:function(a) {
-              r("public flash.geom.PerspectiveProjection::set projectionCenter");
+              q("public flash.geom.PerspectiveProjection::set projectionCenter");
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(d.prototype, "focalLength", {get:function() {
-              r("public flash.geom.PerspectiveProjection::get focalLength");
+            Object.defineProperty(h.prototype, "focalLength", {get:function() {
+              q("public flash.geom.PerspectiveProjection::get focalLength");
             }, set:function(a) {
-              r("public flash.geom.PerspectiveProjection::set focalLength");
+              q("public flash.geom.PerspectiveProjection::set focalLength");
             }, enumerable:!0, configurable:!0});
-            d.prototype.toMatrix3D = function() {
-              r("public flash.geom.PerspectiveProjection::toMatrix3D");
+            h.prototype.toMatrix3D = function() {
+              q("public flash.geom.PerspectiveProjection::toMatrix3D");
             };
-            d.classInitializer = null;
-            d.initializer = null;
-            d.classSymbols = null;
-            d.instanceSymbols = null;
-            return d;
+            h.classInitializer = null;
+            h.initializer = null;
+            h.classSymbols = null;
+            h.instanceSymbols = null;
+            return h;
           }(a.ASNative);
           k.PerspectiveProjection = l;
         })(k.geom || (k.geom = {}));
@@ -28740,22 +30404,22 @@
             }, set:function(a) {
               this.y = a;
             }, enumerable:!0, configurable:!0});
-            d.prototype.Point = function(a, d) {
+            d.prototype.Point = function(a, h) {
               void 0 === a && (a = 0);
-              void 0 === d && (d = 0);
+              void 0 === h && (h = 0);
               this.x = a;
-              this.y = d;
+              this.y = h;
             };
             Object.defineProperty(d.prototype, "length", {get:function() {
               return Math.sqrt(this.x * this.x + this.y * this.y);
             }, enumerable:!0, configurable:!0});
             d.interpolate = function(a, h, p) {
-              var s = 1 - p;
-              return new d(a.x * p + h.x * s, a.y * p + h.y * s);
+              var k = 1 - p;
+              return new d(a.x * p + h.x * k, a.y * p + h.y * k);
             };
-            d.distance = function(a, d) {
-              var l = d.x - a.x, s = d.y - a.y;
-              return 0 === l ? Math.abs(s) : 0 === s ? Math.abs(l) : Math.sqrt(l * l + s * s);
+            d.distance = function(a, h) {
+              var d = h.x - a.x, l = h.y - a.y;
+              return 0 === d ? Math.abs(l) : 0 === l ? Math.abs(d) : Math.sqrt(d * d + l * l);
             };
             d.polar = function(a, h) {
               a = +a;
@@ -28765,9 +30429,9 @@
             d.prototype.clone = function() {
               return new d(this.x, this.y);
             };
-            d.prototype.offset = function(a, d) {
+            d.prototype.offset = function(a, h) {
               this.x += +a;
-              this.y += +d;
+              this.y += +h;
             };
             d.prototype.equals = function(a) {
               return this.x === a.x && this.y === a.y;
@@ -28787,9 +30451,9 @@
               this.x = a.x;
               this.y = a.y;
             };
-            d.prototype.setTo = function(a, d) {
+            d.prototype.setTo = function(a, h) {
               this.x = +a;
-              this.y = +d;
+              this.y = +h;
             };
             d.prototype.toTwips = function() {
               this.x = 20 * this.x | 0;
@@ -28827,20 +30491,20 @@
       (function(d) {
         (function(d) {
           var k = function(a) {
-            function l(a, d, l, s) {
+            function l(a, h, d, l) {
               void 0 === a && (a = 0);
+              void 0 === h && (h = 0);
               void 0 === d && (d = 0);
               void 0 === l && (l = 0);
-              void 0 === s && (s = 0);
               this.x = +a;
-              this.y = +d;
-              this.width = +l;
-              this.height = +s;
+              this.y = +h;
+              this.width = +d;
+              this.height = +l;
             }
             __extends(l, a);
             l.FromBounds = function(a) {
-              var d = a.xMin, p = a.yMin;
-              return new l(d / 20, p / 20, (a.xMax - d) / 20, (a.yMax - p) / 20);
+              var h = a.xMin, d = a.yMin;
+              return new l(h / 20, d / 20, (a.xMax - h) / 20, (a.yMax - d) / 20);
             };
             Object.defineProperty(l.prototype, "native_x", {get:function() {
               return this.x;
@@ -28916,35 +30580,35 @@
             l.prototype.setEmpty = function() {
               this.height = this.width = this.y = this.x = 0;
             };
-            l.prototype.inflate = function(a, d) {
+            l.prototype.inflate = function(a, h) {
               a = +a;
-              d = +d;
+              h = +h;
               this.x -= a;
-              this.y -= d;
+              this.y -= h;
               this.width += 2 * a;
-              this.height += 2 * d;
+              this.height += 2 * h;
             };
             l.prototype.inflatePoint = function(a) {
               this.inflate(a.x, a.y);
             };
-            l.prototype.offset = function(a, d) {
+            l.prototype.offset = function(a, h) {
               this.x += +a;
-              this.y += +d;
+              this.y += +h;
             };
             l.prototype.offsetPoint = function(a) {
               this.offset(a.x, a.y);
             };
-            l.prototype.contains = function(a, d) {
+            l.prototype.contains = function(a, h) {
               a = +a;
-              d = +d;
-              return a >= this.x && a < this.right && d >= this.y && d < this.bottom;
+              h = +h;
+              return a >= this.x && a < this.right && h >= this.y && h < this.bottom;
             };
             l.prototype.containsPoint = function(a) {
               return this.contains(a.x, a.y);
             };
             l.prototype.containsRect = function(a) {
-              var d = a.x + a.width, l = a.y + a.height, s = this.x + this.width, m = this.y + this.height;
-              return a.x >= this.x && a.x < s && a.y >= this.y && a.y < m && d > this.x && d <= s && l > this.y && l <= m;
+              var h = a.x + a.width, d = a.y + a.height, l = this.x + this.width, m = this.y + this.height;
+              return a.x >= this.x && a.x < l && a.y >= this.y && a.y < m && h > this.x && h <= l && d > this.y && d <= m;
             };
             l.prototype.intersection = function(a) {
               return this.clone().intersectInPlace(a);
@@ -28953,17 +30617,17 @@
               return Math.max(this.x, a.x) <= Math.min(this.right, a.right) && Math.max(this.y, a.y) <= Math.min(this.bottom, a.bottom);
             };
             l.prototype.intersectInPlace = function(a) {
-              var d = this.x, l = this.y, s = a.x, m = a.y, g = Math.max(d, s), d = Math.min(d + this.width, s + a.width);
-              if (g <= d && (s = Math.max(l, m), a = Math.min(l + this.height, m + a.height), s <= a)) {
-                return this.setTo(g, s, d - g, a - s), this;
+              var h = this.x, d = this.y, l = a.x, m = a.y, g = Math.max(h, l), h = Math.min(h + this.width, l + a.width);
+              if (g <= h && (l = Math.max(d, m), a = Math.min(d + this.height, m + a.height), l <= a)) {
+                return this.setTo(g, l, h - g, a - l), this;
               }
               this.setEmpty();
               return this;
             };
             l.prototype.intersectInPlaceInt32 = function(a) {
-              var d = this.x | 0, l = this.y | 0, s = this.width | 0, m = this.height | 0, g = a.x | 0, f = a.width | 0, b = Math.max(d, g) | 0, d = Math.min(d + s | 0, g + f | 0) | 0;
-              if (b <= d && (s = a.y | 0, g = a.height | 0, a = Math.max(l, s) | 0, l = Math.min(l + m | 0, s + g | 0), a <= l)) {
-                return this.setTo(b, a, d - b, l - a), this;
+              var h = this.x | 0, d = this.y | 0, l = this.width | 0, m = this.height | 0, g = a.x | 0, f = a.width | 0, b = Math.max(h, g) | 0, h = Math.min(h + l | 0, g + f | 0) | 0;
+              if (b <= h && (l = a.y | 0, g = a.height | 0, a = Math.max(d, l) | 0, d = Math.min(d + m | 0, l + g | 0), a <= d)) {
+                return this.setTo(b, a, h - b, d - a), this;
               }
               this.setEmpty();
               return this;
@@ -28978,8 +30642,8 @@
               if (this.isEmpty()) {
                 return this.copyFrom(a), this;
               }
-              var d = Math.min(this.x, a.x), l = Math.min(this.y, a.y);
-              this.setTo(d, l, Math.max(this.right, a.right) - d, Math.max(this.bottom, a.bottom) - l);
+              var h = Math.min(this.x, a.x), d = Math.min(this.y, a.y);
+              this.setTo(h, d, Math.max(this.right, a.right) - h, Math.max(this.bottom, a.bottom) - d);
               return this;
             };
             l.prototype.equals = function(a) {
@@ -28991,11 +30655,11 @@
               this.width = a.width;
               this.height = a.height;
             };
-            l.prototype.setTo = function(a, d, l, s) {
+            l.prototype.setTo = function(a, h, d, l) {
               this.x = +a;
-              this.y = +d;
-              this.width = +l;
-              this.height = +s;
+              this.y = +h;
+              this.width = +d;
+              this.height = +l;
             };
             l.prototype.toTwips = function() {
               this.x = 20 * this.x | 0;
@@ -29018,19 +30682,19 @@
               return this;
             };
             l.prototype.snapInPlace = function() {
-              var a = Math.ceil(this.x + this.width), d = Math.ceil(this.y + this.height);
+              var a = Math.ceil(this.x + this.width), h = Math.ceil(this.y + this.height);
               this.x = Math.floor(this.x);
               this.y = Math.floor(this.y);
               this.width = a - this.x;
-              this.height = d - this.y;
+              this.height = h - this.y;
               return this;
             };
             l.prototype.roundInPlace = function() {
-              var a = Math.round(this.x + this.width), d = Math.round(this.y + this.height);
+              var a = Math.round(this.x + this.width), h = Math.round(this.y + this.height);
               this.x = Math.round(this.x);
               this.y = Math.round(this.y);
               this.width = a - this.x;
-              this.height = d - this.y;
+              this.height = h - this.y;
               return this;
             };
             l.prototype.toString = function() {
@@ -29065,55 +30729,55 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = d.AVM2.Runtime.throwError, c = d.AVM2.Errors, h = function(a) {
-            function d(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = d.AVM2.Runtime.throwError, c = d.AVM2.Errors, h = function(a) {
+            function h(a) {
               a || l("ArgumentError", c.NullPointerError, "displayObject");
               this._displayObject = a;
             }
-            __extends(d, a);
-            Object.defineProperty(d.prototype, "matrix", {get:function() {
+            __extends(h, a);
+            Object.defineProperty(h.prototype, "matrix", {get:function() {
               return this._displayObject._getMatrix().clone().toPixelsInPlace();
             }, set:function(a) {
               this._displayObject._setMatrix(a, !0);
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(d.prototype, "colorTransform", {get:function() {
+            Object.defineProperty(h.prototype, "colorTransform", {get:function() {
               return this._displayObject._colorTransform.clone();
             }, set:function(a) {
               this._displayObject._setColorTransform(a);
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(d.prototype, "concatenatedMatrix", {get:function() {
+            Object.defineProperty(h.prototype, "concatenatedMatrix", {get:function() {
               var a = this._displayObject._getConcatenatedMatrix().clone().toPixelsInPlace();
               this._displayObject._stage || a.scale(5, 5);
               return a;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(d.prototype, "concatenatedColorTransform", {get:function() {
+            Object.defineProperty(h.prototype, "concatenatedColorTransform", {get:function() {
               return this._displayObject._getConcatenatedColorTransform();
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(d.prototype, "pixelBounds", {get:function() {
-              u("public flash.geom.Transform::get pixelBounds");
+            Object.defineProperty(h.prototype, "pixelBounds", {get:function() {
+              t("public flash.geom.Transform::get pixelBounds");
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(d.prototype, "matrix3D", {get:function() {
+            Object.defineProperty(h.prototype, "matrix3D", {get:function() {
               var a = this._displayObject._matrix3D;
               return a && a.clone();
             }, set:function(a) {
               v.Matrix3D.isType(a) || l("TypeError", c.CheckTypeFailedError, a, "flash.geom.Matrix3D");
               a = a.rawData;
               this.matrix = new k.geom.Matrix(a.asGetPublicProperty(0), a.asGetPublicProperty(1), a.asGetPublicProperty(4), a.asGetPublicProperty(5), a.asGetPublicProperty(12), a.asGetPublicProperty(13));
-              t("public flash.geom.Transform::set matrix3D");
+              u("public flash.geom.Transform::set matrix3D");
             }, enumerable:!0, configurable:!0});
-            d.prototype.getRelativeMatrix3D = function(a) {
-              u("public flash.geom.Transform::getRelativeMatrix3D");
+            h.prototype.getRelativeMatrix3D = function(a) {
+              t("public flash.geom.Transform::getRelativeMatrix3D");
             };
-            Object.defineProperty(d.prototype, "perspectiveProjection", {get:function() {
-              u("public flash.geom.Transform::get perspectiveProjection");
+            Object.defineProperty(h.prototype, "perspectiveProjection", {get:function() {
+              t("public flash.geom.Transform::get perspectiveProjection");
             }, set:function(a) {
-              u("public flash.geom.Transform::set perspectiveProjection");
+              t("public flash.geom.Transform::set perspectiveProjection");
             }, enumerable:!0, configurable:!0});
-            d.classInitializer = null;
-            d.initializer = null;
-            d.classSymbols = null;
-            d.instanceSymbols = null;
-            return d;
+            h.classInitializer = null;
+            h.initializer = null;
+            h.classSymbols = null;
+            h.instanceSymbols = null;
+            return h;
           }(a.ASNative);
           v.Transform = h;
         })(k.geom || (k.geom = {}));
@@ -29126,25 +30790,25 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
-            function d() {
-              t("public flash.geom.Utils3D");
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
+            function h() {
+              u("public flash.geom.Utils3D");
             }
-            __extends(d, a);
-            d.projectVector = function(a, c) {
-              r("public flash.geom.Utils3D::static projectVector");
+            __extends(h, a);
+            h.projectVector = function(a, c) {
+              q("public flash.geom.Utils3D::static projectVector");
             };
-            d.projectVectors = function(a, c, d, g) {
-              r("public flash.geom.Utils3D::static projectVectors");
+            h.projectVectors = function(a, c, h, g) {
+              q("public flash.geom.Utils3D::static projectVectors");
             };
-            d.pointTowards = function(a, c, d, g, f) {
-              r("public flash.geom.Utils3D::static pointTowards");
+            h.pointTowards = function(a, c, h, g, f) {
+              q("public flash.geom.Utils3D::static pointTowards");
             };
-            d.classInitializer = null;
-            d.initializer = null;
-            d.classSymbols = null;
-            d.instanceSymbols = null;
-            return d;
+            h.classInitializer = null;
+            h.initializer = null;
+            h.classSymbols = null;
+            h.instanceSymbols = null;
+            return h;
           }(a.ASNative);
           k.Utils3D = l;
         })(k.geom || (k.geom = {}));
@@ -29158,15 +30822,15 @@
       (function(d) {
         (function(d) {
           var k = function(a) {
-            function d(a, h, l, s) {
+            function d(a, h, l, k) {
               void 0 === a && (a = 0);
               void 0 === h && (h = 0);
               void 0 === l && (l = 0);
-              void 0 === s && (s = 0);
+              void 0 === k && (k = 0);
               this.x = +a;
               this.y = +h;
               this.z = +l;
-              this.w = +s;
+              this.w = +k;
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "native_x", {get:function() {
@@ -29195,11 +30859,11 @@
             Object.defineProperty(d.prototype, "lengthSquared", {get:function() {
               return this.x * this.x + this.y * this.y + this.z * this.z;
             }, enumerable:!0, configurable:!0});
-            d.angleBetween = function(a, d) {
-              return Math.acos(a.dotProduct(d) / (a.length * d.length));
+            d.angleBetween = function(a, h) {
+              return Math.acos(a.dotProduct(h) / (a.length * h.length));
             };
-            d.distance = function(a, d) {
-              return a.subtract(d).length;
+            d.distance = function(a, h) {
+              return a.subtract(h).length;
             };
             d.prototype.dotProduct = function(a) {
               return this.x * a.x + this.y * a.y + this.z * a.z;
@@ -29239,11 +30903,11 @@
               this.y = -this.y;
               this.z = -this.z;
             };
-            d.prototype.equals = function(a, d) {
-              return this.x === a.x && this.y === a.y && this.z === a.z && (!d || this.w === a.w);
+            d.prototype.equals = function(a, h) {
+              return this.x === a.x && this.y === a.y && this.z === a.z && (!h || this.w === a.w);
             };
-            d.prototype.nearEquals = function(a, d, l) {
-              return Math.abs(this.x - a.x) < d && Math.abs(this.y - a.y) < d && Math.abs(this.z - a.z) < d && (!l || Math.abs(this.w - a.w) < d);
+            d.prototype.nearEquals = function(a, h, d) {
+              return Math.abs(this.x - a.x) < h && Math.abs(this.y - a.y) < h && Math.abs(this.z - a.z) < h && (!d || Math.abs(this.w - a.w) < h);
             };
             d.prototype.project = function() {
               this.x /= this.w;
@@ -29255,10 +30919,10 @@
               this.y = a.y;
               this.z = a.z;
             };
-            d.prototype.setTo = function(a, d, l) {
+            d.prototype.setTo = function(a, h, d) {
               this.x = +a;
-              this.y = +d;
-              this.z = +l;
+              this.y = +h;
+              this.z = +d;
             };
             d.prototype.clone = function() {
               return new d(this.x, this.y, this.z, this.w);
@@ -29286,9 +30950,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.Debug.somewhatImplemented, c = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.Debug.somewhatImplemented, c = function(a) {
             function c() {
-              t("public flash.accessibility.Accessibility");
+              u("public flash.accessibility.Accessibility");
             }
             __extends(c, a);
             Object.defineProperty(c, "active", {get:function() {
@@ -29296,10 +30960,10 @@
               return c._active;
             }, enumerable:!0, configurable:!0});
             c.sendEvent = function(a, c, g, f) {
-              r("public flash.accessibility.Accessibility::static sendEvent");
+              q("public flash.accessibility.Accessibility::static sendEvent");
             };
             c.updateProperties = function() {
-              r("public flash.accessibility.Accessibility::static updateProperties");
+              q("public flash.accessibility.Accessibility::static updateProperties");
             };
             c.classInitializer = null;
             c.initializer = null;
@@ -29319,9 +30983,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.accessibility.AccessibilityImplementation");
+              q("public flash.accessibility.AccessibilityImplementation");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -29330,7 +30994,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.AccessibilityImplementation = t;
+          k.AccessibilityImplementation = u;
         })(k.accessibility || (k.accessibility = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -29362,9 +31026,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.AVM2.Runtime.asCoerceString, t = function(a) {
+          var q = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a, c, d) {
-              this._type = r(a);
+              this._type = q(a);
               this._bubbles = !!c;
               this._cancelable = !!d;
               this._currentTarget = this._target = null;
@@ -29510,7 +31174,7 @@
             c.AVM1_LOAD = "load";
             return c;
           }(a.ASNative);
-          k.Event = t;
+          k.Event = u;
         })(k.events || (k.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -29519,9 +31183,9 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
+      (function(q) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = d.isFunction, l = d.isNullOrUndefined, c = d.AVM2.Runtime.throwError, h = function() {
+          var t = d.AVM2.Runtime.asCoerceString, u = d.isFunction, l = d.isNullOrUndefined, c = d.AVM2.Runtime.throwError, h = function() {
             return function(a, c, b) {
               this.listener = a;
               this.useCapture = c;
@@ -29536,19 +31200,19 @@
               return 0 === this._entries.length;
             };
             a.prototype.insert = function(a, b, e) {
-              for (var c = this._entries, d = c.length, g = d - 1;0 <= g;g--) {
-                var l = c[g];
+              for (var c = this._entries, g = c.length, d = g - 1;0 <= d;d--) {
+                var l = c[d];
                 if (l.listener === a) {
                   return;
                 }
                 if (e > l.priority) {
-                  d = g;
+                  g = d;
                 } else {
                   break;
                 }
               }
               c = this.ensureNonAliasedEntries();
-              c.splice(d, 0, new h(a, b, e));
+              c.splice(g, 0, new h(a, b, e));
             };
             a.prototype.ensureNonAliasedEntries = function() {
               var a = this._entries;
@@ -29590,14 +31254,14 @@
               var b = this._queues[a.type];
               if (b) {
                 for (var e = 0, c = 0;c < b.length;c++) {
-                  var d = b[c];
-                  if (null === d) {
+                  var g = b[c];
+                  if (null === g) {
                     e++;
                   } else {
                     try {
-                      d.dispatchEvent(a);
-                    } catch (g) {
-                      console.warn("caught error under broadcast event " + a.type + ": ", g);
+                      g.dispatchEvent(a);
+                    } catch (d) {
+                      console.warn("caught error under broadcast event " + a.type + ": ", d);
                     }
                   }
                 }
@@ -29616,12 +31280,12 @@
             return a;
           }();
           v.BroadcastEventDispatchQueue = s;
-          var m = function(d) {
+          var m = function(g) {
             function f(a) {
               void 0 === a && (a = null);
               this._target = a || this;
             }
-            __extends(f, d);
+            __extends(f, g);
             f.prototype.toString = function() {
               return a.ASObject.dynamicPrototype.$BgtoString.call(this);
             };
@@ -29632,29 +31296,29 @@
             f.prototype._getListeners = function(a) {
               return a ? this._captureListeners || (this._captureListeners = Object.create(null)) : this._targetOrBubblingListeners || (this._targetOrBubblingListeners = Object.create(null));
             };
-            f.prototype.addEventListener = function(a, e, d, g, h) {
-              void 0 === d && (d = !1);
-              void 0 === g && (g = 0);
+            f.prototype.addEventListener = function(a, e, g, d, h) {
+              void 0 === g && (g = !1);
+              void 0 === d && (d = 0);
               void 0 === h && (h = !1);
               (2 > arguments.length || 5 < arguments.length) && c("ArgumentError", k.Errors.WrongArgumentCountError, "flash.events::EventDispatcher/addEventListener()", 2, arguments.length);
-              t(e) || c("TypeError", k.Errors.CheckTypeFailedError, e, "Function");
+              u(e) || c("TypeError", k.Errors.CheckTypeFailedError, e, "Function");
               l(a) && c("TypeError", k.Errors.NullPointerError, "type");
-              a = u(a);
-              d = !!d;
-              g |= 0;
+              a = t(a);
+              g = !!g;
+              d |= 0;
               h = !!h;
-              var m = this._getListeners(d);
-              (m[a] || (m[a] = new p)).insert(e, d, g);
-              !d && v.Event.isBroadcastEventType(a) && f.broadcastEventDispatchQueue.add(a, this);
+              var m = this._getListeners(g);
+              (m[a] || (m[a] = new p)).insert(e, g, d);
+              !g && v.Event.isBroadcastEventType(a) && f.broadcastEventDispatchQueue.add(a, this);
             };
-            f.prototype.removeEventListener = function(a, e, d) {
-              void 0 === d && (d = !1);
+            f.prototype.removeEventListener = function(a, e, g) {
+              void 0 === g && (g = !1);
               (2 > arguments.length || 3 < arguments.length) && c("ArgumentError", k.Errors.WrongArgumentCountError, "flash.events::EventDispatcher/removeEventListener()", 2, arguments.length);
-              t(e) || c("TypeError", k.Errors.CheckTypeFailedError, e, "Function");
+              u(e) || c("TypeError", k.Errors.CheckTypeFailedError, e, "Function");
               l(a) && c("TypeError", k.Errors.NullPointerError, "type");
-              a = u(a);
-              var g = this._getListeners(!!d), h = g[a];
-              h && (h.remove(e), h.isEmpty() && (!d && v.Event.isBroadcastEventType(a) && f.broadcastEventDispatchQueue.remove(a, this), g[a] = null));
+              a = t(a);
+              var d = this._getListeners(!!g), h = d[a];
+              h && (h.remove(e), h.isEmpty() && (!g && v.Event.isBroadcastEventType(a) && f.broadcastEventDispatchQueue.remove(a, this), d[a] = null));
             };
             f.prototype._hasTargetOrBubblingEventListener = function(a) {
               return!(!this._targetOrBubblingListeners || !this._targetOrBubblingListeners[a]);
@@ -29668,17 +31332,17 @@
             f.prototype.hasEventListener = function(a) {
               1 !== arguments.length && c("ArgumentError", k.Errors.WrongArgumentCountError, "flash.events::EventDispatcher/hasEventListener()", 1, arguments.length);
               l(a) && c("TypeError", k.Errors.NullPointerError, "type");
-              a = u(a);
+              a = t(a);
               return this._hasEventListener(a);
             };
             f.prototype.willTrigger = function(a) {
               1 !== arguments.length && c("ArgumentError", k.Errors.WrongArgumentCountError, "flash.events::EventDispatcher/hasEventListener()", 1, arguments.length);
               l(a) && c("TypeError", k.Errors.NullPointerError, "type");
-              a = u(a);
+              a = t(a);
               if (this._hasEventListener(a)) {
                 return!0;
               }
-              if (r.display.DisplayObject.isType(this)) {
+              if (q.display.DisplayObject.isType(this)) {
                 var e = this._parent;
                 do {
                   if (e._hasEventListener(a)) {
@@ -29692,7 +31356,7 @@
               if (this._hasEventListener(a.type)) {
                 return!1;
               }
-              if (!a.isBroadcastEvent() && a._bubbles && r.display.DisplayObject.isType(this)) {
+              if (!a.isBroadcastEvent() && a._bubbles && q.display.DisplayObject.isType(this)) {
                 for (var e = this._parent;e;e = e._parent) {
                   if (e._hasEventListener(a.type)) {
                     return!1;
@@ -29706,42 +31370,42 @@
               if (this._skipDispatchEvent(a)) {
                 return!0;
               }
-              var e = a._type, d = this._target, g = !0, h = [];
-              if (!a.isBroadcastEvent() && r.display.DisplayObject.isType(this)) {
+              var e = a._type, g = this._target, d = !0, h = [];
+              if (!a.isBroadcastEvent() && q.display.DisplayObject.isType(this)) {
                 for (var l = this._parent;l;) {
                   l._hasEventListener(e) && h.push(l), l = l._parent;
                 }
-                for (l = h.length - 1;0 <= l && g;l--) {
+                for (l = h.length - 1;0 <= l && d;l--) {
                   var m = h[l];
                   if (m._hasCaptureEventListener(e)) {
-                    var p = m._getListenersForType(!0, e), g = f.callListeners(p, a, d, m, v.EventPhase.CAPTURING_PHASE)
+                    var p = m._getListenersForType(!0, e), d = f.callListeners(p, a, g, m, v.EventPhase.CAPTURING_PHASE)
                   }
                 }
               }
-              g && (p = this._getListenersForType(!1, e)) && (g = f.callListeners(p, a, d, d, v.EventPhase.AT_TARGET));
-              if (!a.isBroadcastEvent() && g && a.bubbles) {
-                for (l = 0;l < h.length && g;l++) {
-                  m = h[l], m._hasTargetOrBubblingEventListener(e) && (p = m._getListenersForType(!1, e), g = f.callListeners(p, a, d, m, v.EventPhase.BUBBLING_PHASE));
+              d && (p = this._getListenersForType(!1, e)) && (d = f.callListeners(p, a, g, g, v.EventPhase.AT_TARGET));
+              if (!a.isBroadcastEvent() && d && a.bubbles) {
+                for (l = 0;l < h.length && d;l++) {
+                  m = h[l], m._hasTargetOrBubblingEventListener(e) && (p = m._getListenersForType(!1, e), d = f.callListeners(p, a, g, m, v.EventPhase.BUBBLING_PHASE));
                 }
               }
               return!a._isDefaultPrevented;
             };
-            f.callListeners = function(a, e, c, f, d) {
+            f.callListeners = function(a, e, c, f, g) {
               if (a.isEmpty()) {
                 return!0;
               }
               e._target && (e = e.asCallPublicProperty("clone", null));
-              for (var g = a.snapshot(), h = 0;h < g.length;h++) {
-                var l = g[h];
+              for (var d = a.snapshot(), h = 0;h < d.length;h++) {
+                var l = d[h];
                 e._target = c;
                 e._currentTarget = f;
-                e._eventPhase = d;
+                e._eventPhase = g;
                 l.listener(e);
                 if (e._stopImmediatePropagation) {
                   break;
                 }
               }
-              a.releaseSnapshot(g);
+              a.releaseSnapshot(d);
               return!e._stopPropagation;
             };
             f.classInitializer = function() {
@@ -29756,7 +31420,7 @@
             return f;
           }(a.ASNative);
           v.EventDispatcher = m;
-        })(r.events || (r.events = {}));
+        })(q.events || (q.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -29766,10 +31430,10 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
               a.call(this);
-              r("public flash.events.EventPhase");
+              q("public flash.events.EventPhase");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -29781,7 +31445,7 @@
             c.BUBBLING_PHASE = 3;
             return c;
           }(a.ASNative);
-          k.EventPhase = t;
+          k.EventPhase = u;
         })(k.events || (k.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -29792,7 +31456,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = function(a) {
+          var t = d.Debug.notImplemented, u = function(a) {
             function c(c, d, k, m) {
               a.call(this, c, d, k);
               this._text = m;
@@ -29812,7 +31476,7 @@
               return this.formatToString("TextEvent", "type", "bubbles", "cancelable", "text");
             };
             c.prototype.copyNativeData = function(a) {
-              u("public flash.events.TextEvent::copyNativeData");
+              t("public flash.events.TextEvent::copyNativeData");
             };
             c.classInitializer = null;
             c.initializer = null;
@@ -29822,7 +31486,7 @@
             c.TEXT_INPUT = "textInput";
             return c;
           }(a.events.Event);
-          k.TextEvent = t;
+          k.TextEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -29873,10 +31537,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
             function c(c, d, k, m) {
               a.call(this, void 0, void 0, void 0);
-              u("public flash.events.GameInputEvent");
+              t("public flash.events.GameInputEvent");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -29887,7 +31551,7 @@
             c.DEVICE_REMOVED = "deviceRemoved";
             return c;
           }(a.events.Event);
-          k.GameInputEvent = t;
+          k.GameInputEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -29898,10 +31562,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.AVM2.Runtime.asCoerceString, t = d.Debug.dummyConstructor, l = d.Debug.somewhatImplemented, c = function(c) {
-            function d(a, l, g, f, b, e, q, n, p) {
+          var t = d.AVM2.Runtime.asCoerceString, u = d.Debug.dummyConstructor, l = d.Debug.somewhatImplemented, c = function(c) {
+            function d(a, l, g, f, b, e, n, r, k) {
               c.call(this, void 0, void 0, void 0);
-              t("public flash.events.GestureEvent");
+              u("public flash.events.GestureEvent");
             }
             __extends(d, c);
             Object.defineProperty(d.prototype, "localX", {get:function() {
@@ -29940,15 +31604,15 @@
             Object.defineProperty(d.prototype, "phase", {get:function() {
               return this._phase;
             }, set:function(a) {
-              this._phase = u(a);
+              this._phase = t(a);
             }, enumerable:!0, configurable:!0});
             d.prototype.updateAfterEvent = function() {
               l("public flash.events.GestureEvent::updateAfterEvent");
             };
-            d.prototype.NativeCtor = function(a, c, d, f, b, e) {
-              this._phase = u(a);
+            d.prototype.NativeCtor = function(a, c, g, f, b, e) {
+              this._phase = t(a);
               this._localX = +c;
-              this._localY = +d;
+              this._localY = +g;
               this._ctrlKey = !!f;
               this._altKey = !!b;
               this._shiftKey = !!e;
@@ -29977,10 +31641,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
             function c(c, d, k, m) {
               a.call(this, void 0, void 0, void 0);
-              u("public flash.events.HTTPStatusEvent");
+              t("public flash.events.HTTPStatusEvent");
             }
             __extends(c, a);
             c.prototype._setStatus = function(a) {
@@ -30016,7 +31680,7 @@
             c.HTTP_RESPONSE_STATUS = "httpResponseStatus";
             return c;
           }(a.events.Event);
-          k.HTTPStatusEvent = t;
+          k.HTTPStatusEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -30065,10 +31729,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
-            function c(c, d, k, m, g, f, b, e, q) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
+            function c(c, d, k, m, g, f, b, e, n) {
               a.call(this, void 0, void 0, void 0);
-              u("public flash.events.KeyboardEvent");
+              t("public flash.events.KeyboardEvent");
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "charCode", {get:function() {
@@ -30118,7 +31782,7 @@
             c.KEY_UP = "keyUp";
             return c;
           }(a.events.Event);
-          k.KeyboardEvent = t;
+          k.KeyboardEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -30129,10 +31793,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(c) {
-            function h(a, d, h, g, f, b, e, l, n, k, r) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(c) {
+            function h(a, d, h, g, f, b, e, n, l, k, q) {
               c.call(this, void 0, void 0, void 0);
-              t("public flash.events.MouseEvent");
+              u("public flash.events.MouseEvent");
             }
             __extends(h, c);
             h.typeFromDOMType = function(a) {
@@ -30152,7 +31816,7 @@
                 case "mouseup":
                   return h.MOUSE_UP;
                 default:
-                  u(a);
+                  t(a);
               }
             };
             Object.defineProperty(h.prototype, "localX", {get:function() {
@@ -30299,10 +31963,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(d) {
+          var t = d.Debug.dummyConstructor, u = function(d) {
             function c(a, c, k, m, g) {
               d.call(this, void 0, void 0, void 0);
-              u("public flash.events.ProgressEvent");
+              t("public flash.events.ProgressEvent");
             }
             __extends(c, d);
             Object.defineProperty(c.prototype, "bytesLoaded", {get:function() {
@@ -30329,7 +31993,7 @@
             c.SOCKET_DATA = "socketData";
             return c;
           }(a.events.Event);
-          k.ProgressEvent = t;
+          k.ProgressEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -30340,10 +32004,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
             function c(c, d, k, m, g) {
               a.call(this, void 0, void 0, void 0, void 0, void 0);
-              u("public flash.events.SecurityErrorEvent");
+              t("public flash.events.SecurityErrorEvent");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -30353,7 +32017,7 @@
             c.SECURITY_ERROR = "securityError";
             return c;
           }(a.events.ErrorEvent);
-          k.SecurityErrorEvent = t;
+          k.SecurityErrorEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -30364,10 +32028,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
             function c(c, d, k) {
               a.call(this, void 0, void 0, void 0);
-              u("public flash.events.TimerEvent");
+              t("public flash.events.TimerEvent");
             }
             __extends(c, a);
             c.prototype.clone = function() {
@@ -30387,7 +32051,7 @@
             c.TIMER_COMPLETE = "timerComplete";
             return c;
           }(a.events.Event);
-          k.TimerEvent = t;
+          k.TimerEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -30398,10 +32062,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.somewhatImplemented, t = d.Debug.dummyConstructor, l = function(a) {
-            function h(d, h, l, g, f, b, e, q, n, k, r, u, v, K) {
+          var t = d.Debug.somewhatImplemented, u = d.Debug.dummyConstructor, l = function(a) {
+            function h(d, h, l, g, f, b, e, n, r, k, q, t, v, K) {
               a.call(this, void 0, void 0, void 0);
-              t("public flash.events.TouchEvent");
+              u("public flash.events.TouchEvent");
             }
             __extends(h, a);
             Object.defineProperty(h.prototype, "touchPointID", {get:function() {
@@ -30460,11 +32124,11 @@
               this._shiftKey = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "stageX", {get:function() {
-              u("TouchEvent::get stageX");
+              t("TouchEvent::get stageX");
               return this._localX;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "stageY", {get:function() {
-              u("TouchEvent::get stageY");
+              t("TouchEvent::get stageY");
               return this._localY;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "isRelatedObjectInaccessible", {get:function() {
@@ -30513,10 +32177,10 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
             function c(c, d, k, m) {
               a.call(this, void 0, void 0, void 0, void 0, void 0);
-              u("public flash.events.UncaughtErrorEvent");
+              t("public flash.events.UncaughtErrorEvent");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -30526,7 +32190,7 @@
             c.UNCAUGHT_ERROR = "uncaughtError";
             return c;
           }(a.events.ErrorEvent);
-          k.UncaughtErrorEvent = t;
+          k.UncaughtErrorEvent = u;
         })(a.events || (a.events = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -30559,7 +32223,7 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = d.isNullOrUndefined, c = d.AVM2.Runtime.asCoerceString, h = d.AVM2.Runtime.throwError, p = d.AVM2.Runtime.checkNullParameter, s = d.Bounds, m = a.geom, g = a.events;
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = d.isNullOrUndefined, c = d.AVM2.Runtime.asCoerceString, h = d.AVM2.Runtime.throwError, p = d.AVM2.Runtime.checkNullParameter, s = d.Bounds, m = a.geom, g = a.events;
           (function(a) {
             a[a.None = 0] = "None";
             a[a.Visible = 1] = "Visible";
@@ -30616,19 +32280,19 @@
             a[a.Shape = 2] = "Shape";
           })(v.HitTestingResult || (v.HitTestingResult = {}));
           var b = function(b) {
-            function q() {
+            function n() {
               g.EventDispatcher.instanceConstructorNoInitialize.call(this);
               this._addReference();
               this._setFlags(256);
             }
-            __extends(q, b);
-            q.getNextSyncID = function() {
+            __extends(n, b);
+            n.getNextSyncID = function() {
               return this._syncID++;
             };
-            q.reset = function() {
+            n.reset = function() {
               this._advancableInstances = new d.WeakList;
             };
-            q.prototype.createAnimatedDisplayObject = function(b, e, c) {
+            n.prototype.createAnimatedDisplayObject = function(b, e, c) {
               var f = b.symbolClass;
               b = f.isSubtypeOf(a.display.BitmapData) ? a.display.Bitmap.initializeFrom(b) : f.initializeFrom(b);
               e.flags & 32 && (b._name = e.name);
@@ -30637,21 +32301,27 @@
               c && f.instanceConstructorNoInitialize.call(b);
               return b;
             };
-            q.performFrameNavigation = function(b, e) {
-              b ? (q._runScripts = e, k.enterTimeline("DisplayObject.performFrameNavigation", {instances:0})) : e = q._runScripts;
+            n.performFrameNavigation = function(b, e) {
+              b ? n._runScripts = e : e = n._runScripts;
+              k.enterTimeline("DisplayObject.InitFrame");
               v.DisplayObject._advancableInstances.forEach(function(a) {
                 a._initFrame(b);
               });
-              b && e && q._broadcastFrameEvent(g.Event.ENTER_FRAME);
+              k.leaveTimeline();
+              k.enterTimeline("DisplayObject.EnterFrame");
+              b && e && n._broadcastFrameEvent(g.Event.ENTER_FRAME);
+              k.leaveTimeline();
+              k.enterTimeline("DisplayObject.ConstructFrame");
               v.DisplayObject._advancableInstances.forEach(function(a) {
                 a._constructFrame();
               });
-              e ? (q._broadcastFrameEvent(g.Event.FRAME_CONSTRUCTED), v.DisplayObject._advancableInstances.forEach(function(a) {
+              k.leaveTimeline();
+              e ? (k.enterTimeline("DisplayObject.FrameConstructed"), n._broadcastFrameEvent(g.Event.FRAME_CONSTRUCTED), k.leaveTimeline(), k.enterTimeline("DisplayObject.EnqueueFrameScripts"), v.DisplayObject._advancableInstances.forEach(function(a) {
                 v.DisplayObjectContainer.isInstanceOf(a) && !a.parent && a._enqueueFrameScripts();
-              }), a.display.DisplayObject._stage._enqueueFrameScripts(), v.MovieClip.runFrameScripts(), q._broadcastFrameEvent(g.Event.EXIT_FRAME)) : v.MovieClip.reset();
-              b && (k.leaveTimeline(), q._runScripts = !0);
+              }), a.display.DisplayObject._stage._enqueueFrameScripts(), k.leaveTimeline(), k.enterTimeline("DisplayObject.RunFrameScript"), v.MovieClip.runFrameScripts(), k.leaveTimeline(), k.enterTimeline("DisplayObject.ExitFrame"), n._broadcastFrameEvent(g.Event.EXIT_FRAME), k.leaveTimeline()) : v.MovieClip.reset();
+              b && (n._runScripts = !0);
             };
-            q._broadcastFrameEvent = function(a) {
+            n._broadcastFrameEvent = function(a) {
               var b;
               switch(a) {
                 case g.Event.ENTER_FRAME:
@@ -30665,10 +32335,10 @@
               }
               g.EventDispatcher.broadcastEventDispatchQueue.dispatchEvent(b);
             };
-            q.prototype._setInitialName = function() {
+            n.prototype._setInitialName = function() {
               this._name = "instance" + a.display.DisplayObject._instanceID++;
             };
-            q.prototype._setParent = function(a, b) {
+            n.prototype._setParent = function(a, b) {
               var e = this._parent;
               this._parent = a;
               this._setDepth(b);
@@ -30681,11 +32351,11 @@
               }
               e && this._removeReference();
             };
-            q.prototype._setDepth = function(a) {
+            n.prototype._setDepth = function(a) {
               -1 < a ? this._setFlags(2048) : this._removeFlags(2048);
               this._depth = a;
             };
-            q.prototype._setFillAndLineBoundsFromWidthAndHeight = function(a, b) {
+            n.prototype._setFillAndLineBoundsFromWidthAndHeight = function(a, b) {
               this._fillBounds.width = a;
               this._fillBounds.height = b;
               this._lineBounds.width = a;
@@ -30693,41 +32363,41 @@
               this._removeFlags(6);
               this._invalidateParentFillAndLineBounds(!0, !0);
             };
-            q.prototype._setFillAndLineBoundsFromSymbol = function(a) {
+            n.prototype._setFillAndLineBoundsFromSymbol = function(a) {
               a.fillBounds && (this._fillBounds.copyFrom(a.fillBounds), this._removeFlags(4));
               a.lineBounds && (this._lineBounds.copyFrom(a.lineBounds), this._removeFlags(2));
               this._invalidateParentFillAndLineBounds(!!a.fillBounds, !!a.lineBounds);
             };
-            q.prototype._setFlags = function(a) {
+            n.prototype._setFlags = function(a) {
               this._displayObjectFlags |= a;
             };
-            q.prototype._setDirtyFlags = function(a) {
+            n.prototype._setDirtyFlags = function(a) {
               this._displayObjectFlags |= a;
               this._parent && this._parent._propagateFlagsUp(536870912);
             };
-            q.prototype._toggleFlags = function(a, b) {
+            n.prototype._toggleFlags = function(a, b) {
               this._displayObjectFlags = b ? this._displayObjectFlags | a : this._displayObjectFlags & ~a;
             };
-            q.prototype._removeFlags = function(a) {
+            n.prototype._removeFlags = function(a) {
               this._displayObjectFlags &= ~a;
             };
-            q.prototype._hasFlags = function(a) {
+            n.prototype._hasFlags = function(a) {
               return(this._displayObjectFlags & a) === a;
             };
-            q.prototype._hasAnyFlags = function(a) {
+            n.prototype._hasAnyFlags = function(a) {
               return!!(this._displayObjectFlags & a);
             };
-            q.prototype._propagateFlagsUp = function(a) {
+            n.prototype._propagateFlagsUp = function(a) {
               if (!this._hasFlags(a)) {
                 this._setFlags(a);
                 var b = this._parent;
                 b && b._propagateFlagsUp(a);
               }
             };
-            q.prototype._propagateFlagsDown = function(a) {
+            n.prototype._propagateFlagsDown = function(a) {
               this._setFlags(a);
             };
-            q.prototype._findNearestAncestor = function() {
+            n.prototype._findNearestAncestor = function() {
               for (var a = this;a;) {
                 if (!1 === a._hasFlags(128)) {
                   return a;
@@ -30736,7 +32406,7 @@
               }
               return null;
             };
-            q.prototype._findFurthestAncestorOrSelf = function() {
+            n.prototype._findFurthestAncestorOrSelf = function() {
               for (var a = this;a;) {
                 if (!a._parent) {
                   return a;
@@ -30744,7 +32414,7 @@
                 a = a._parent;
               }
             };
-            q.prototype._isAncestor = function(a) {
+            n.prototype._isAncestor = function(a) {
               for (;a;) {
                 if (a === this) {
                   return!0;
@@ -30753,27 +32423,27 @@
               }
               return!1;
             };
-            q._clampRotation = function(a) {
+            n._clampRotation = function(a) {
               a %= 360;
               180 < a ? a -= 360 : -180 > a && (a += 360);
               return a;
             };
-            q._getAncestors = function(a, b) {
-              var e = q._path;
+            n._getAncestors = function(a, b) {
+              var e = n._path;
               for (e.length = 0;a && a !== b;) {
                 e.push(a), a = a._parent;
               }
               return e;
             };
-            q.prototype._getConcatenatedMatrix = function() {
+            n.prototype._getConcatenatedMatrix = function() {
               this._hasFlags(32) && (this._parent ? this._parent._getConcatenatedMatrix().preMultiplyInto(this._getMatrix(), this._concatenatedMatrix) : this._concatenatedMatrix.copyFrom(this._getMatrix()), this._removeFlags(32));
               return this._concatenatedMatrix;
             };
-            q.prototype._getInvertedConcatenatedMatrix = function() {
+            n.prototype._getInvertedConcatenatedMatrix = function() {
               this._hasFlags(64) && (this._getConcatenatedMatrix().invertInto(this._invertedConcatenatedMatrix), this._removeFlags(64));
               return this._invertedConcatenatedMatrix;
             };
-            q.prototype._setMatrix = function(a, b) {
+            n.prototype._setMatrix = function(a, b) {
               if (b || !this._matrix.equals(a)) {
                 var e = this._matrix;
                 e.copyFrom(a);
@@ -30782,27 +32452,27 @@
                 this._scaleY = e.getScaleY();
                 this._skewX = a.getSkewX();
                 this._skewY = a.getSkewY();
-                this._rotation = q._clampRotation(180 * this._skewY / Math.PI);
+                this._rotation = n._clampRotation(180 * this._skewY / Math.PI);
                 this._removeFlags(8);
                 this._setFlags(16);
                 this._setDirtyFlags(1048576);
                 this._invalidatePosition();
               }
             };
-            q.prototype._getMatrix = function() {
+            n.prototype._getMatrix = function() {
               this._hasFlags(8) && (this._matrix.updateScaleAndRotation(this._scaleX, this._scaleY, this._skewX, this._skewY), this._removeFlags(8));
               return this._matrix;
             };
-            q.prototype._getInvertedMatrix = function() {
+            n.prototype._getInvertedMatrix = function() {
               this._hasFlags(16) && (this._getMatrix().invertInto(this._invertedMatrix), this._removeFlags(16));
               return this._invertedMatrix;
             };
-            q.prototype._getConcatenatedColorTransform = function() {
+            n.prototype._getConcatenatedColorTransform = function() {
               if (!this.stage) {
                 return this._colorTransform.clone();
               }
               if (this._hasFlags(128)) {
-                var b = this._findNearestAncestor(), e = q._getAncestors(this, b), c = e.length - 1;
+                var b = this._findNearestAncestor(), e = n._getAncestors(this, b), c = e.length - 1;
                 a.display.Stage.isType(e[c]) && c--;
                 for (var f = b && !a.display.Stage.isType(b) ? b._concatenatedColorTransform.clone() : new m.ColorTransform;0 <= c;) {
                   b = e[c--], f.preMultiply(b._colorTransform), f.convertToFixedPoint(), b._concatenatedColorTransform.copyFrom(f), b._removeFlags(128);
@@ -30810,19 +32480,19 @@
               }
               return this._concatenatedColorTransform;
             };
-            q.prototype._setColorTransform = function(a) {
+            n.prototype._setColorTransform = function(a) {
               this._colorTransform.copyFrom(a);
               this._colorTransform.convertToFixedPoint();
               this._propagateFlagsDown(128);
               this._setDirtyFlags(67108864);
             };
-            q.prototype._invalidateFillAndLineBounds = function(a, b) {
+            n.prototype._invalidateFillAndLineBounds = function(a, b) {
               this._propagateFlagsUp((b ? 2 : 0) | (a ? 4 : 0));
             };
-            q.prototype._invalidateParentFillAndLineBounds = function(a, b) {
+            n.prototype._invalidateParentFillAndLineBounds = function(a, b) {
               this._parent && this._parent._invalidateFillAndLineBounds(a, b);
             };
-            q.prototype._getContentBounds = function(a) {
+            n.prototype._getContentBounds = function(a) {
               void 0 === a && (a = !0);
               var b, e;
               a ? (b = 2, e = this._lineBounds) : (b = 4, e = this._fillBounds);
@@ -30834,9 +32504,9 @@
               }
               return e;
             };
-            q.prototype._getChildBounds = function(a, b) {
+            n.prototype._getChildBounds = function(a, b) {
             };
-            q.prototype._getTransformedBounds = function(a, b) {
+            n.prototype._getTransformedBounds = function(a, b) {
               var e = this._getContentBounds(b).clone();
               if (a === this || e.isEmpty()) {
                 return e;
@@ -30846,19 +32516,19 @@
               c.transformBounds(e);
               return e;
             };
-            q.prototype._stopTimelineAnimation = function() {
+            n.prototype._stopTimelineAnimation = function() {
               this._removeFlags(4096);
             };
-            q.prototype._invalidateMatrix = function() {
+            n.prototype._invalidateMatrix = function() {
               this._setDirtyFlags(1048576);
               this._setFlags(24);
               this._invalidatePosition();
             };
-            q.prototype._invalidatePosition = function() {
+            n.prototype._invalidatePosition = function() {
               this._propagateFlagsDown(96);
               this._invalidateParentFillAndLineBounds(!0, !0);
             };
-            q.prototype._animate = function(b) {
+            n.prototype._animate = function(b) {
               var e = !(b.flags & 1) && b.flags & 2;
               b.flags & 4 ? (m.Matrix.TEMP_MATRIX.copyFromUntyped(b.matrix), this._setMatrix(m.Matrix.TEMP_MATRIX, !1)) : e && this._setMatrix(m.Matrix.FROZEN_IDENTITY_MATRIX, !1);
               b.flags & 8 ? (m.ColorTransform.TEMP_COLOR_TRANSFORM.copyFromUntyped(b.cxform), this._setColorTransform(m.ColorTransform.TEMP_COLOR_TRANSFORM)) : e && this._setColorTransform(m.ColorTransform.FROZEN_IDENTITY_COLOR_TRANSFORM);
@@ -30870,32 +32540,32 @@
                 c = void 0 === b.clipDepth ? -1 : b.clipDepth, c !== this._clipDepth && (this._clipDepth = c, this._setDirtyFlags(268435456));
               }
               if (b.flags & 256) {
-                for (var c = [], f = b.filters, d = 0;d < f.length;d++) {
-                  var g = f[d], h;
-                  switch(g.type) {
+                for (var c = [], f = b.filters, g = 0;g < f.length;g++) {
+                  var d = f[g], h;
+                  switch(d.type) {
                     case 0:
-                      h = a.filters.DropShadowFilter.FromUntyped(g);
+                      h = a.filters.DropShadowFilter.FromUntyped(d);
                       break;
                     case 1:
-                      h = a.filters.BlurFilter.FromUntyped(g);
+                      h = a.filters.BlurFilter.FromUntyped(d);
                       break;
                     case 2:
-                      h = a.filters.GlowFilter.FromUntyped(g);
+                      h = a.filters.GlowFilter.FromUntyped(d);
                       break;
                     case 3:
-                      h = a.filters.BevelFilter.FromUntyped(g);
+                      h = a.filters.BevelFilter.FromUntyped(d);
                       break;
                     case 4:
-                      h = a.filters.GradientGlowFilter.FromUntyped(g);
+                      h = a.filters.GradientGlowFilter.FromUntyped(d);
                       break;
                     case 5:
-                      h = a.filters.ConvolutionFilter.FromUntyped(g);
+                      h = a.filters.ConvolutionFilter.FromUntyped(d);
                       break;
                     case 6:
-                      h = a.filters.ColorMatrixFilter.FromUntyped(g);
+                      h = a.filters.ColorMatrixFilter.FromUntyped(d);
                       break;
                     case 7:
-                      h = a.filters.GradientBevelFilter.FromUntyped(g);
+                      h = a.filters.GradientBevelFilter.FromUntyped(d);
                   }
                   c.push(h);
                 }
@@ -30914,13 +32584,13 @@
                 b = 0 !== b.visibility, b !== this._hasFlags(1) && (this._toggleFlags(1, b), this._setDirtyFlags(1073741824));
               }
             };
-            q.prototype._propagateEvent = function(a) {
+            n.prototype._propagateEvent = function(a) {
               this.visit(function(b) {
                 b.dispatchEvent(a);
                 return 0;
               }, 0);
             };
-            Object.defineProperty(q.prototype, "x", {get:function() {
+            Object.defineProperty(n.prototype, "x", {get:function() {
               return this._getX();
             }, set:function(a) {
               a = 20 * a | 0;
@@ -30931,14 +32601,14 @@
               }
               a !== this._matrix.tx && (this._matrix.tx = a, this._invertedMatrix.tx = -a, this._invalidatePosition(), this._setDirtyFlags(1048576));
             }, enumerable:!0, configurable:!0});
-            q.prototype._getX = function() {
+            n.prototype._getX = function() {
               var a = this._matrix.tx;
               if (this._canHaveTextContent()) {
                 var b = this._getContentBounds(), a = a + b.xMin
               }
               return a / 20;
             };
-            Object.defineProperty(q.prototype, "y", {get:function() {
+            Object.defineProperty(n.prototype, "y", {get:function() {
               return this._getY();
             }, set:function(a) {
               a = 20 * a | 0;
@@ -30949,38 +32619,38 @@
               }
               a !== this._matrix.ty && (this._matrix.ty = a, this._invertedMatrix.ty = -a, this._invalidatePosition(), this._setDirtyFlags(1048576));
             }, enumerable:!0, configurable:!0});
-            q.prototype._getY = function() {
+            n.prototype._getY = function() {
               var a = this._matrix.ty;
               if (this._canHaveTextContent()) {
                 var b = this._getContentBounds(), a = a + b.yMin
               }
               return a / 20;
             };
-            Object.defineProperty(q.prototype, "scaleX", {get:function() {
+            Object.defineProperty(n.prototype, "scaleX", {get:function() {
               return Math.abs(this._scaleX);
             }, set:function(a) {
               a = +a;
               this._stopTimelineAnimation();
               a !== this._scaleX && (this._scaleX = a, this._invalidateMatrix());
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "scaleY", {get:function() {
+            Object.defineProperty(n.prototype, "scaleY", {get:function() {
               return this._scaleY;
             }, set:function(a) {
               a = +a;
               this._stopTimelineAnimation();
               a !== this._scaleY && (this._scaleY = a, this._invalidateMatrix());
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "scaleZ", {get:function() {
+            Object.defineProperty(n.prototype, "scaleZ", {get:function() {
               return this._scaleZ;
             }, set:function(a) {
-              u("public DisplayObject::set scaleZ");
+              t("public DisplayObject::set scaleZ");
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "rotation", {get:function() {
+            Object.defineProperty(n.prototype, "rotation", {get:function() {
               return this._rotation;
             }, set:function(a) {
               a = +a;
               this._stopTimelineAnimation();
-              a = q._clampRotation(a);
+              a = n._clampRotation(a);
               if (a !== this._rotation) {
                 var b = (a - this._rotation) / 180 * Math.PI;
                 this._skewX += b;
@@ -30989,30 +32659,30 @@
                 this._invalidateMatrix();
               }
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "rotationX", {get:function() {
+            Object.defineProperty(n.prototype, "rotationX", {get:function() {
               return this._rotationX;
             }, set:function(a) {
-              u("public DisplayObject::set rotationX");
+              t("public DisplayObject::set rotationX");
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "rotationY", {get:function() {
+            Object.defineProperty(n.prototype, "rotationY", {get:function() {
               return this._rotationY;
             }, set:function(a) {
-              u("public DisplayObject::set rotationY");
+              t("public DisplayObject::set rotationY");
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "rotationZ", {get:function() {
+            Object.defineProperty(n.prototype, "rotationZ", {get:function() {
               return this._rotationZ;
             }, set:function(a) {
-              u("public DisplayObject::set rotationZ");
+              t("public DisplayObject::set rotationZ");
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "width", {get:function() {
+            Object.defineProperty(n.prototype, "width", {get:function() {
               return this._getWidth();
             }, set:function(a) {
               this._setWidth(a);
             }, enumerable:!0, configurable:!0});
-            q.prototype._getWidth = function() {
+            n.prototype._getWidth = function() {
               return this._getTransformedBounds(this._parent, !0).width / 20;
             };
-            q.prototype._setWidth = function(a) {
+            n.prototype._setWidth = function(a) {
               a = 20 * a | 0;
               this._stopTimelineAnimation();
               if (!(0 > a)) {
@@ -31026,15 +32696,15 @@
                 }
               }
             };
-            Object.defineProperty(q.prototype, "height", {get:function() {
+            Object.defineProperty(n.prototype, "height", {get:function() {
               return this._getHeight();
             }, set:function(a) {
               this._setHeight(a);
             }, enumerable:!0, configurable:!0});
-            q.prototype._getHeight = function() {
+            n.prototype._getHeight = function() {
               return this._getTransformedBounds(this._parent, !0).height / 20;
             };
-            q.prototype._setHeight = function(a) {
+            n.prototype._setHeight = function(a) {
               a = 20 * a | 0;
               this._stopTimelineAnimation();
               if (!(0 > a)) {
@@ -31048,7 +32718,7 @@
                 }
               }
             };
-            Object.defineProperty(q.prototype, "mask", {get:function() {
+            Object.defineProperty(n.prototype, "mask", {get:function() {
               return this._mask;
             }, set:function(a) {
               if (this._mask !== a && a !== this) {
@@ -31059,20 +32729,20 @@
                 this._setDirtyFlags(134217728);
               }
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "transform", {get:function() {
+            Object.defineProperty(n.prototype, "transform", {get:function() {
               return this._getTransform();
             }, set:function(a) {
               this._stopTimelineAnimation();
               a.matrix3D ? this._matrix3D = a.matrix3D : this._setMatrix(a.matrix, !0);
               this._setColorTransform(a.colorTransform);
             }, enumerable:!0, configurable:!0});
-            q.prototype._getTransform = function() {
+            n.prototype._getTransform = function() {
               return new a.geom.Transform(this);
             };
-            q.prototype.destroy = function() {
+            n.prototype.destroy = function() {
               this._setFlags(512);
             };
-            Object.defineProperty(q.prototype, "root", {get:function() {
+            Object.defineProperty(n.prototype, "root", {get:function() {
               var a = this;
               do {
                 if (a._root === a) {
@@ -31082,7 +32752,7 @@
               } while (a);
               return null;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "stage", {get:function() {
+            Object.defineProperty(n.prototype, "stage", {get:function() {
               var a = this;
               do {
                 if (a._stage === a) {
@@ -31092,48 +32762,48 @@
               } while (a);
               return null;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "name", {get:function() {
+            Object.defineProperty(n.prototype, "name", {get:function() {
               return this._name;
             }, set:function(a) {
               p(a, "name");
               this._name = c(a);
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "parent", {get:function() {
+            Object.defineProperty(n.prototype, "parent", {get:function() {
               return this._parent;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "alpha", {get:function() {
+            Object.defineProperty(n.prototype, "alpha", {get:function() {
               return this._colorTransform.alphaMultiplier;
             }, set:function(a) {
               this._stopTimelineAnimation();
               a = +a;
               a !== this._colorTransform.alphaMultiplier && (this._colorTransform.alphaMultiplier = a, this._colorTransform.convertToFixedPoint(), this._propagateFlagsDown(128), this._setDirtyFlags(67108864));
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "blendMode", {get:function() {
+            Object.defineProperty(n.prototype, "blendMode", {get:function() {
               return this._blendMode;
             }, set:function(a) {
               this._stopTimelineAnimation();
               a = c(a);
               a !== this._blendMode && (0 > v.BlendMode.toNumber(a) && h("ArgumentError", k.Errors.InvalidEnumError, "blendMode"), this._blendMode = a, this._setDirtyFlags(1073741824));
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "scale9Grid", {get:function() {
+            Object.defineProperty(n.prototype, "scale9Grid", {get:function() {
               return this._getScale9Grid();
             }, set:function(a) {
               this._stopTimelineAnimation();
               this._scale9Grid = s.FromRectangle(a);
               this._setDirtyFlags(1073741824);
             }, enumerable:!0, configurable:!0});
-            q.prototype._getScale9Grid = function() {
+            n.prototype._getScale9Grid = function() {
               return this._scale9Grid ? a.geom.Rectangle.FromBounds(this._scale9Grid) : null;
             };
-            Object.defineProperty(q.prototype, "cacheAsBitmap", {get:function() {
+            Object.defineProperty(n.prototype, "cacheAsBitmap", {get:function() {
               return this._getCacheAsBitmap();
             }, set:function(a) {
               this._hasFlags(65536) || (this._toggleFlags(65536, !!a), this._setDirtyFlags(1073741824));
             }, enumerable:!0, configurable:!0});
-            q.prototype._getCacheAsBitmap = function() {
+            n.prototype._getCacheAsBitmap = function() {
               return this._filters && 0 < this._filters.length || this._hasFlags(65536);
             };
-            Object.defineProperty(q.prototype, "filters", {get:function() {
+            Object.defineProperty(n.prototype, "filters", {get:function() {
               return this._getFilters();
             }, set:function(a) {
               this._filters || (this._filters = []);
@@ -31143,83 +32813,83 @@
               }), b = !0);
               b && this._setDirtyFlags(1073741824);
             }, enumerable:!0, configurable:!0});
-            q.prototype._getFilters = function() {
+            n.prototype._getFilters = function() {
               return this._filters ? this._filters.map(function(a) {
                 return a.clone();
               }) : [];
             };
-            Object.defineProperty(q.prototype, "visible", {get:function() {
+            Object.defineProperty(n.prototype, "visible", {get:function() {
               return this._hasFlags(1);
             }, set:function(a) {
               a = !!a;
               a !== this._hasFlags(1) && (this._toggleFlags(1, a), this._setDirtyFlags(1073741824));
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "z", {get:function() {
+            Object.defineProperty(n.prototype, "z", {get:function() {
               return this._z;
             }, set:function(a) {
               this._z = +a;
-              u("public DisplayObject::set z");
+              t("public DisplayObject::set z");
             }, enumerable:!0, configurable:!0});
-            q.prototype.getBounds = function(a) {
+            n.prototype.getBounds = function(a) {
               return m.Rectangle.FromBounds(this._getTransformedBounds(a || this, !0));
             };
-            q.prototype.getRect = function(a) {
+            n.prototype.getRect = function(a) {
               return m.Rectangle.FromBounds(this._getTransformedBounds(a || this, !1));
             };
-            q.prototype.globalToLocal = function(a) {
+            n.prototype.globalToLocal = function(a) {
               return this._getInvertedConcatenatedMatrix().transformPointInPlace(a.clone().toTwips()).round().toPixels();
             };
-            q.prototype.localToGlobal = function(a) {
+            n.prototype.localToGlobal = function(a) {
               return this._getConcatenatedMatrix().transformPointInPlace(a.clone().toTwips()).round().toPixels();
             };
-            q.prototype.globalToLocal3D = function(a) {
-              u("public DisplayObject::globalToLocal3D");
+            n.prototype.globalToLocal3D = function(a) {
+              t("public DisplayObject::globalToLocal3D");
               return null;
             };
-            q.prototype.localToGlobal3D = function(a) {
-              u("public DisplayObject::localToGlobal3D");
+            n.prototype.localToGlobal3D = function(a) {
+              t("public DisplayObject::localToGlobal3D");
               return null;
             };
-            q.prototype.local3DToGlobal = function(a) {
-              u("public DisplayObject::local3DToGlobal");
+            n.prototype.local3DToGlobal = function(a) {
+              t("public DisplayObject::local3DToGlobal");
               return null;
             };
-            q.prototype.visit = function(a, b, e) {
+            n.prototype.visit = function(a, b, e) {
               void 0 === e && (e = 0);
-              var c, f, d = b & 8;
+              var c, f, g = b & 8;
               for (c = [this];0 < c.length;) {
                 f = c.pop();
-                var g = 0, g = b & 16 && !f._hasAnyFlags(e) ? 2 : a(f);
-                if (0 === g) {
+                var d = 0, d = b & 16 && !f._hasAnyFlags(e) ? 2 : a(f);
+                if (0 === d) {
                   if (f = f._children) {
-                    for (var g = f.length, h = 0;h < g;h++) {
-                      c.push(f[d ? h : g - 1 - h]);
+                    for (var d = f.length, h = 0;h < d;h++) {
+                      c.push(f[g ? h : d - 1 - h]);
                     }
                   }
                 } else {
-                  if (1 === g) {
+                  if (1 === d) {
                     break;
                   }
                 }
               }
             };
-            Object.defineProperty(q.prototype, "loaderInfo", {get:function() {
+            Object.defineProperty(n.prototype, "loaderInfo", {get:function() {
               var a = this.root;
               return a ? a._loaderInfo : null;
             }, enumerable:!0, configurable:!0});
-            q.prototype._canHaveGraphics = function() {
+            n.prototype._canHaveGraphics = function() {
               return!1;
             };
-            q.prototype._getGraphics = function() {
+            n.prototype._getGraphics = function() {
               return null;
             };
-            q.prototype._canHaveTextContent = function() {
+            n.prototype._canHaveTextContent = function() {
               return!1;
             };
-            q.prototype._getTextContent = function() {
+            n.prototype._getTextContent = function() {
               return null;
             };
-            q.prototype._ensureGraphics = function() {
+            n.prototype._ensureGraphics = function() {
               if (this._graphics) {
                 return this._graphics;
               }
@@ -31229,59 +32899,59 @@
               this._setDirtyFlags(4194304);
               return this._graphics;
             };
-            q.prototype._setStaticContentFromSymbol = function(b) {
+            n.prototype._setStaticContentFromSymbol = function(b) {
               this._canHaveGraphics() ? (this._graphics = b.graphics, this._setDirtyFlags(4194304)) : a.text.StaticText.isType(this) && (this._textContent = b.textContent, this._setDirtyFlags(8388608));
               this._symbol = b;
               this._setFillAndLineBoundsFromSymbol(b);
             };
-            q.prototype.hitTestObject = function(a) {
+            n.prototype.hitTestObject = function(a) {
               var b = this._getContentBounds(!1).clone(), e = a._getContentBounds(!1).clone();
               this._getConcatenatedMatrix().transformBounds(b);
               a._getConcatenatedMatrix().transformBounds(e);
               return b.intersects(e);
             };
-            q.prototype.hitTestPoint = function(a, b, e) {
+            n.prototype.hitTestPoint = function(a, b, e) {
               return!!this._containsGlobalPoint(20 * +a | 0, 20 * +b | 0, e ? 2 : 0, null);
             };
-            q.prototype._containsPoint = function(a, b, e, c, f, d) {
-              var g = this._boundsAndMaskContainPoint(a, b, e, c, f);
-              if (0 === g || 2 > f) {
-                return g;
+            n.prototype._containsPoint = function(a, b, e, c, f, g) {
+              var d = this._boundsAndMaskContainPoint(a, b, e, c, f);
+              if (0 === d || 2 > f) {
+                return d;
               }
-              (a = this._containsPointDirectly(e, c, a, b)) && d && (5 === f ? d[0] = this : (4 === f || v.InteractiveObject.isType(this) && this._mouseEnabled) && d.push(this));
-              return a ? 2 : g;
+              (a = this._containsPointDirectly(e, c, a, b)) && g && (5 === f ? g[0] = this : (4 === f || v.InteractiveObject.isType(this) && this._mouseEnabled) && g.push(this));
+              return a ? 2 : d;
             };
-            q.prototype._containsGlobalPoint = function(a, b, e, c) {
+            n.prototype._containsGlobalPoint = function(a, b, e, c) {
               var f = this._getInvertedConcatenatedMatrix();
               return this._containsPoint(a, b, f.transformX(a, b), f.transformY(a, b), e, c);
             };
-            q.prototype._boundsAndMaskContainPoint = function(a, b, e, c, f) {
+            n.prototype._boundsAndMaskContainPoint = function(a, b, e, c, f) {
               return 1 <= f && this._hasFlags(32768) ? 1 : 3 <= f && !this._hasFlags(1) || !this._getContentBounds().contains(e, c) ? 0 : 0 !== f && this._mask ? this._mask._containsGlobalPoint(a, b, 1, null) : 1;
             };
-            q.prototype._containsPointDirectly = function(a, b, e, c) {
+            n.prototype._containsPointDirectly = function(a, b, e, c) {
               return!1;
             };
-            Object.defineProperty(q.prototype, "scrollRect", {get:function() {
+            Object.defineProperty(n.prototype, "scrollRect", {get:function() {
               return this._getScrollRect();
             }, set:function(a) {
               this._scrollRect = a ? a.clone() : null;
-              t("public DisplayObject::set scrollRect");
+              u("public DisplayObject::set scrollRect");
             }, enumerable:!0, configurable:!0});
-            q.prototype._getScrollRect = function() {
+            n.prototype._getScrollRect = function() {
               return this._scrollRect ? this._scrollRect.clone() : null;
             };
-            Object.defineProperty(q.prototype, "opaqueBackground", {get:function() {
+            Object.defineProperty(n.prototype, "opaqueBackground", {get:function() {
               return this._opaqueBackground;
             }, set:function(a) {
               this._opaqueBackground = a;
             }, enumerable:!0, configurable:!0});
-            q.prototype._getDistance = function(a) {
+            n.prototype._getDistance = function(a) {
               for (var b = 0, e = this;e !== a;) {
                 b++, e = e._parent;
               }
               return b;
             };
-            q.prototype.findNearestCommonAncestor = function(a) {
+            n.prototype.findNearestCommonAncestor = function(a) {
               if (!a) {
                 return null;
               }
@@ -31296,18 +32966,18 @@
               }
               return b;
             };
-            q.prototype._getLocalMousePosition = function() {
+            n.prototype._getLocalMousePosition = function() {
               var b = a.ui.Mouse._currentPosition;
               this._parent && (b = this._parent.globalToLocal(a.ui.Mouse._currentPosition));
               return b;
             };
-            Object.defineProperty(q.prototype, "mouseX", {get:function() {
+            Object.defineProperty(n.prototype, "mouseX", {get:function() {
               return this._getLocalMousePosition().x;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "mouseY", {get:function() {
+            Object.defineProperty(n.prototype, "mouseY", {get:function() {
               return this._getLocalMousePosition().y;
             }, enumerable:!0, configurable:!0});
-            q.prototype.debugName = function(a) {
+            n.prototype.debugName = function(a) {
               void 0 === a && (a = !1);
               var b = this._id + " [" + this._depth + "]: (" + this._referenceCount + ") " + this;
               if (a) {
@@ -31319,7 +32989,7 @@
               }
               return b;
             };
-            q.prototype.debugTrace = function() {
+            n.prototype.debugTrace = function() {
               var a, b;
               void 0 === a && (a = 1024);
               void 0 === b && (b = "");
@@ -31334,10 +33004,10 @@
                 return 0;
               }, 0);
             };
-            q.prototype._addReference = function() {
+            n.prototype._addReference = function() {
               this._referenceCount++;
             };
-            q.prototype._removeReference = function() {
+            n.prototype._removeReference = function() {
               this._referenceCount--;
               if (0 === this._referenceCount && this._children) {
                 for (var a = this._children, b = 0;b < a.length;b++) {
@@ -31345,20 +33015,20 @@
                 }
               }
             };
-            Object.defineProperty(q.prototype, "accessibilityProperties", {get:function() {
+            Object.defineProperty(n.prototype, "accessibilityProperties", {get:function() {
               return this._accessibilityProperties;
             }, set:function(a) {
               this._accessibilityProperties = a;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "blendShader", {set:function(a) {
-              u("public DisplayObject::set blendShader");
+            Object.defineProperty(n.prototype, "blendShader", {set:function(a) {
+              t("public DisplayObject::set blendShader");
             }, enumerable:!0, configurable:!0});
-            q._syncID = 0;
-            q._instanceID = 1;
-            q.classInitializer = function() {
+            n._syncID = 0;
+            n._instanceID = 1;
+            n.classInitializer = function() {
               this.reset();
             };
-            q.initializer = function(b) {
+            n.initializer = function(b) {
               this._id = a.display.DisplayObject.getNextSyncID();
               this._displayObjectFlags = 2085617767;
               this._stage = this._root = null;
@@ -31391,11 +33061,11 @@
               this._referenceCount = 0;
               b && (b.scale9Grid && (this._scale9Grid = b.scale9Grid), this._symbol = b);
             };
-            q.classSymbols = null;
-            q.instanceSymbols = null;
-            q._runScripts = !0;
-            q._path = [];
-            return q;
+            n.classSymbols = null;
+            n.instanceSymbols = null;
+            n._runScripts = !0;
+            n._path = [];
+            return n;
           }(a.events.EventDispatcher);
           v.DisplayObject = b;
         })(a.display || (a.display = {}));
@@ -31408,22 +33078,22 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = d.AVM2.Runtime.throwError, l = function(c) {
+          var t = d.AVM2.Runtime.asCoerceString, u = d.AVM2.Runtime.throwError, l = function(c) {
             function h(a, c, d) {
               void 0 === a && (a = null);
               void 0 === c && (c = "auto");
               void 0 === d && (d = !1);
               v.DisplayObject.instanceConstructorNoInitialize.call(this);
               this._symbol ? this._bitmapData.class.instanceConstructorNoInitialize.call(this._bitmapData) : this.bitmapData = a;
-              this._pixelSnapping = u(c);
+              this._pixelSnapping = t(c);
               this._smoothing = !!d;
             }
             __extends(h, c);
             Object.defineProperty(h.prototype, "pixelSnapping", {get:function() {
               return this._pixelSnapping;
             }, set:function(a) {
-              0 > v.PixelSnapping.toNumber(a) && t("ArgumentError", k.Errors.InvalidEnumError, "pixelSnapping");
-              this._pixelSnapping = u(a);
+              0 > v.PixelSnapping.toNumber(a) && u("ArgumentError", k.Errors.InvalidEnumError, "pixelSnapping");
+              this._pixelSnapping = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "smoothing", {get:function() {
               return this._smoothing;
@@ -31469,7 +33139,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.warning, t = function(a) {
+          var t = d.Debug.warning, u = function(a) {
             function c() {
               k.DisplayObject.instanceConstructorNoInitialize.call(this);
             }
@@ -31496,8 +33166,8 @@
             };
             return c;
           }(a.display.DisplayObject);
-          k.Shape = t;
-          t = function(d) {
+          k.Shape = u;
+          u = function(d) {
             function c(a, c) {
               d.call(this, a, c, !1);
               this.graphics = null;
@@ -31514,13 +33184,13 @@
               if (a) {
                 for (var d = this.graphics._textures, l = 0;l < a.length;l++) {
                   var g = c.getSymbolById(a[l]);
-                  g ? d.push(g.getSharedInstance()) : (65535 !== a[l] && u("Bitmap symbol " + a[l] + " required by shape, but not defined."), d.push(null));
+                  g ? d.push(g.getSharedInstance()) : (65535 !== a[l] && t("Bitmap symbol " + a[l] + " required by shape, but not defined."), d.push(null));
                 }
               }
             };
             return c;
           }(d.Timeline.DisplaySymbol);
-          k.ShapeSymbol = t;
+          k.ShapeSymbol = u;
         })(a.display || (a.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -31531,7 +33201,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = a.display.DisplayObject, c = a.events, h = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = a.display.DisplayObject, c = a.events, h = function(a) {
             function d() {
               l.instanceConstructorNoInitialize.call(this);
             }
@@ -31540,22 +33210,22 @@
               return this._tabEnabled;
             }, set:function(a) {
               a = !!a;
-              var d = this._tabEnabled;
+              var g = this._tabEnabled;
               this._tabEnabled = a;
-              d !== a && this.dispatchEvent(c.Event.getInstance(c.Event.TAB_ENABLED_CHANGE, !0));
+              g !== a && this.dispatchEvent(c.Event.getInstance(c.Event.TAB_ENABLED_CHANGE, !0));
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "tabIndex", {get:function() {
               return this._tabIndex;
             }, set:function(a) {
               a |= 0;
-              var d = this._tabIndex;
+              var g = this._tabIndex;
               this._tabIndex = a;
-              d !== a && this.dispatchEvent(c.Event.getInstance(c.Event.TAB_INDEX_CHANGE, !0));
+              g !== a && this.dispatchEvent(c.Event.getInstance(c.Event.TAB_INDEX_CHANGE, !0));
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "focusRect", {get:function() {
               return this._focusRect;
             }, set:function(a) {
-              t("public flash.display.InteractiveObject::set focusRect");
+              u("public flash.display.InteractiveObject::set focusRect");
               this._focusRect = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "mouseEnabled", {get:function() {
@@ -31571,26 +33241,26 @@
             Object.defineProperty(d.prototype, "accessibilityImplementation", {get:function() {
               return this._accessibilityImplementation;
             }, set:function(a) {
-              u("public flash.display.InteractiveObject::set accessibilityImplementation");
+              t("public flash.display.InteractiveObject::set accessibilityImplementation");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "softKeyboardInputAreaOfInterest", {get:function() {
               return this._softKeyboardInputAreaOfInterest;
             }, set:function(a) {
-              u("public flash.display.InteractiveObject::set softKeyboardInputAreaOfInterest");
+              t("public flash.display.InteractiveObject::set softKeyboardInputAreaOfInterest");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "needsSoftKeyboard", {get:function() {
               return this._needsSoftKeyboard;
             }, set:function(a) {
-              u("public flash.display.InteractiveObject::set needsSoftKeyboard");
+              t("public flash.display.InteractiveObject::set needsSoftKeyboard");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "contextMenu", {get:function() {
               return this._contextMenu;
             }, set:function(a) {
-              t("public flash.display.InteractiveObject::set contextMenu");
+              u("public flash.display.InteractiveObject::set contextMenu");
               this._contextMenu = a;
             }, enumerable:!0, configurable:!0});
             d.prototype.requestSoftKeyboard = function() {
-              u("public flash.display.InteractiveObject::requestSoftKeyboard");
+              t("public flash.display.InteractiveObject::requestSoftKeyboard");
             };
             d.classInitializer = null;
             d.initializer = function() {
@@ -31618,7 +33288,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = function(a) {
+          var t = d.Debug.notImplemented, u = function(a) {
             function d(a, c, h, g) {
               void 0 === a && (a = null);
               void 0 === c && (c = null);
@@ -31650,7 +33320,7 @@
             Object.defineProperty(d.prototype, "trackAsMenu", {get:function() {
               return this._trackAsMenu;
             }, set:function(a) {
-              u("public flash.display.SimpleButton::set trackAsMenu");
+              t("public flash.display.SimpleButton::set trackAsMenu");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "upState", {get:function() {
               return this._upState;
@@ -31682,9 +33352,9 @@
               this._hitTestState = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "soundTransform", {get:function() {
-              u("public flash.display.SimpleButton::get soundTransform");
+              t("public flash.display.SimpleButton::get soundTransform");
             }, set:function(a) {
-              u("public flash.display.SimpleButton::set soundTransform");
+              t("public flash.display.SimpleButton::set soundTransform");
             }, enumerable:!0, configurable:!0});
             d.prototype._containsPoint = function(a, c, d, g, f, b) {
               d = 3 === f ? this._hitTestState : this._currentState;
@@ -31724,7 +33394,7 @@
             d.instanceSymbols = null;
             return d;
           }(a.display.InteractiveObject);
-          k.SimpleButton = t;
+          k.SimpleButton = u;
           var l = function() {
             return function(a, d) {
               this.symbol = a;
@@ -31732,7 +33402,7 @@
             };
           }();
           k.ButtonState = l;
-          t = function(c) {
+          u = function(c) {
             function h(d, h) {
               c.call(this, d, a.display.SimpleButton, !0);
               this.hitTestState = this.downState = this.overState = this.upState = null;
@@ -31744,13 +33414,13 @@
               s.actionScriptVersion === k.ActionScriptVersion.ACTIONSCRIPT2 && (m.isAVM1Object = !0);
               var g = c.states, f = null, b, e;
               for (e in g) {
-                var q = g[e];
-                if (1 === q.length) {
-                  if (b = q[0], f = s.getSymbolById(b.symbolId), !f) {
+                var n = g[e];
+                if (1 === n.length) {
+                  if (b = n[0], f = s.getSymbolById(b.symbolId), !f) {
                     continue;
                   }
                 } else {
-                  b = {flags:1, depth:1}, f = new a.display.SpriteSymbol({id:-1, className:null}, s), f.frames.push(new d.SWF.SWFFrame(q));
+                  b = {flags:1, depth:1}, f = new a.display.SpriteSymbol({id:-1, className:null}, s), f.frames.push(new d.SWF.SWFFrame(n));
                 }
                 m[e + "State"] = new l(f, b);
               }
@@ -31758,7 +33428,7 @@
             };
             return h;
           }(d.Timeline.DisplaySymbol);
-          k.ButtonSymbol = t;
+          k.ButtonSymbol = u;
         })(a.display || (a.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -31769,7 +33439,7 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.AVM2.Runtime.asCoerceString, l = d.AVM2.Runtime.throwError, c = d.AVM2.Runtime.checkParameterType, h = d.NumberUtilities.clamp, p = d.AVM2.ABC.Multiname, s = a.events, m = function(d) {
+          var t = d.Debug.notImplemented, u = d.AVM2.Runtime.asCoerceString, l = d.AVM2.Runtime.throwError, c = d.AVM2.Runtime.checkParameterType, h = d.NumberUtilities.clamp, p = d.AVM2.ABC.Multiname, s = a.events, m = function(d) {
             function f() {
               v.InteractiveObject.instanceConstructorNoInitialize.call(this);
               this._setDirtyFlags(2097152);
@@ -31840,7 +33510,7 @@
               return this._children.length;
             };
             Object.defineProperty(f.prototype, "textSnapshot", {get:function() {
-              u("public DisplayObjectContainer::get textSnapshot");
+              t("public DisplayObjectContainer::get textSnapshot");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "tabChildren", {get:function() {
               return this._tabChildren;
@@ -32000,7 +33670,7 @@
               return 0;
             };
             f.prototype.getChildByName = function(a) {
-              a = t(a);
+              a = u(a);
               return(a = this._lookupChildByName(a)) ? (a._addReference(), a) : null;
             };
             f.prototype._lookupChildByIndex = function(a) {
@@ -32069,7 +33739,7 @@
               return e.reverse();
             };
             f.prototype.areInaccessibleObjectsUnderPoint = function(a) {
-              u("public DisplayObjectContainer::areInaccessibleObjectsUnderPoint");
+              t("public DisplayObjectContainer::areInaccessibleObjectsUnderPoint");
             };
             f.prototype.contains = function(b) {
               c(b, "child", a.display.DisplayObject);
@@ -32130,9 +33800,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.JointStyle");
+              q("public flash.display.JointStyle");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -32168,7 +33838,7 @@
             c.MITER = "miter";
             return c;
           }(a.ASNative);
-          k.JointStyle = t;
+          k.JointStyle = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32179,9 +33849,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.CapsStyle");
+              q("public flash.display.CapsStyle");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -32217,7 +33887,7 @@
             c.SQUARE = "square";
             return c;
           }(a.ASNative);
-          k.CapsStyle = t;
+          k.CapsStyle = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32228,9 +33898,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.LineScaleMode");
+              q("public flash.display.LineScaleMode");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -32271,7 +33941,7 @@
             c.NONE = "none";
             return c;
           }(a.ASNative);
-          k.LineScaleMode = t;
+          k.LineScaleMode = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32282,9 +33952,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.GradientType");
+              q("public flash.display.GradientType");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -32315,7 +33985,7 @@
             c.RADIAL = "radial";
             return c;
           }(a.ASNative);
-          k.GradientType = t;
+          k.GradientType = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32326,9 +33996,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.SpreadMethod");
+              q("public flash.display.SpreadMethod");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -32364,7 +34034,7 @@
             c.REPEAT = "repeat";
             return c;
           }(a.ASNative);
-          k.SpreadMethod = t;
+          k.SpreadMethod = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32375,9 +34045,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.InterpolationMethod");
+              q("public flash.display.InterpolationMethod");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -32408,7 +34078,7 @@
             c.LINEAR_RGB = "linearRGB";
             return c;
           }(a.ASNative);
-          k.InterpolationMethod = t;
+          k.InterpolationMethod = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32448,9 +34118,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.GraphicsEndFill");
+              q("public flash.display.GraphicsEndFill");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -32459,7 +34129,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.GraphicsEndFill = t;
+          k.GraphicsEndFill = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32470,7 +34140,7 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.AVM2.Runtime.asCoerceString, t = function(a) {
+          var q = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a, c, d, l, g, f, b, e) {
               void 0 === a && (a = "linear");
               void 0 === c && (c = null);
@@ -32480,13 +34150,13 @@
               void 0 === f && (f = "pad");
               void 0 === b && (b = "rgb");
               void 0 === e && (e = 0);
-              this.type = r(a);
+              this.type = q(a);
               this.colors = c;
               this.alphas = d;
               this.ratios = l;
               this.matrix = g;
               this.spreadMethod = f;
-              this.interpolationMethod = r(b);
+              this.interpolationMethod = q(b);
               this.focalPointRatio = +e;
             }
             __extends(c, a);
@@ -32496,7 +34166,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.GraphicsGradientFill = t;
+          k.GraphicsGradientFill = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32507,14 +34177,14 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.AVM2.Runtime.asCoerceString, t = function(a) {
+          var q = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a, c, d) {
               void 0 === a && (a = null);
               void 0 === c && (c = null);
               void 0 === d && (d = "evenOdd");
               this.commands = a;
               this.data = c;
-              this.winding = r(d);
+              this.winding = q(d);
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -32523,7 +34193,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.GraphicsPath = t;
+          k.GraphicsPath = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32534,9 +34204,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.GraphicsPathCommand");
+              q("public flash.display.GraphicsPathCommand");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -32552,7 +34222,7 @@
             c.CUBIC_CURVE_TO = 6;
             return c;
           }(a.ASNative);
-          k.GraphicsPathCommand = t;
+          k.GraphicsPathCommand = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32563,9 +34233,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.GraphicsPathWinding");
+              q("public flash.display.GraphicsPathWinding");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -32576,7 +34246,7 @@
             c.NON_ZERO = "nonZero";
             return c;
           }(a.ASNative);
-          k.GraphicsPathWinding = t;
+          k.GraphicsPathWinding = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32612,7 +34282,7 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.AVM2.Runtime.asCoerceString, t = function(a) {
+          var q = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a, c, d, l, g, f, b) {
               void 0 === a && (a = NaN);
               void 0 === c && (c = !1);
@@ -32623,9 +34293,9 @@
               void 0 === b && (b = null);
               this.thickness = +a;
               this.pixelHinting = !!c;
-              this.scaleMode = r(d);
-              this.caps = r(l);
-              this.joints = r(g);
+              this.scaleMode = q(d);
+              this.caps = q(l);
+              this.joints = q(g);
               this.miterLimit = +f;
               this.fill = b;
             }
@@ -32636,7 +34306,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.GraphicsStroke = t;
+          k.GraphicsStroke = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -32647,11 +34317,11 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = d.AVM2.Runtime.asCoerceString, l = function(a) {
+          var q = d.Debug.dummyConstructor, u = d.AVM2.Runtime.asCoerceString, l = function(a) {
             function d(a, c, h, g) {
               void 0 === g && (g = "none");
-              t(g);
-              r("public flash.display.GraphicsTrianglePath");
+              u(g);
+              q("public flash.display.GraphicsTrianglePath");
             }
             __extends(d, a);
             d.classInitializer = null;
@@ -32669,20 +34339,20 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
+      (function(q) {
         (function(v) {
-          function u(a, b, e, c) {
+          function t(a, b, e, c) {
             a = e - a;
             b = c - b;
             return a * a + b * b;
           }
-          function t(a, b, e, c) {
+          function u(a, b, e, c) {
             var f = 1 - c;
             return a * f * f + 2 * b * f * c + e * c * c;
           }
           function l(a, b, e) {
             var c = (a - b) / (a - 2 * b + e);
-            return 0 > c ? a : 1 < c ? e : t(a, b, e, c);
+            return 0 > c ? a : 1 < c ? e : u(a, b, e, c);
           }
           function c(a, b, e, c, f) {
             var d = f * f, g = 1 - f, h = g * g;
@@ -32693,39 +34363,39 @@
             g = 2 * (e - b);
             var h = f - e;
             d + h === g && (h *= 1.0001);
-            var l = 2 * d - g, n = g - 2 * d, n = Math.sqrt(n * n - 4 * d * (d - g + h));
+            var n = 2 * d - g, l = g - 2 * d, l = Math.sqrt(l * l - 4 * d * (d - g + h));
             g = 2 * (d - g + h);
-            d = (l + n) / g;
-            l = (l - n) / g;
-            n = [];
-            0 <= d && 1 >= d && n.push(Math.round(c(a, b, e, f, d)));
-            0 <= l && 1 >= l && n.push(Math.round(c(a, b, e, f, l)));
-            return n;
+            d = (n + l) / g;
+            n = (n - l) / g;
+            l = [];
+            0 <= d && 1 >= d && l.push(Math.round(c(a, b, e, f, d)));
+            0 <= n && 1 >= n && l.push(Math.round(c(a, b, e, f, n)));
+            return l;
           }
-          function p(a, b, e, c, f, d, g, h, l) {
-            function n(a) {
-              return a * (p + a * (u + a * x)) + b - l;
+          function p(a, b, e, c, f, d, g, h, n) {
+            function l(a) {
+              return a * (p + a * (t + a * x)) + b - n;
             }
-            function q(b) {
+            function m(b) {
               0 > b ? b = 0 : 1 < b && (b = 1);
-              return a + b * (k + b * (r + b * t));
+              return a + b * (k + b * (q + b * u));
             }
-            function m(a, b, e, c) {
+            function r(a, b, e, c) {
               if (!(Math.abs(e - b) <= c)) {
                 var f = .5 * (b + e);
-                0 >= a(b) * a(e) ? (v = b, L = e) : (m(a, b, f, c), m(a, f, e, c));
+                0 >= a(b) * a(e) ? (v = b, H = e) : (r(a, b, f, c), r(a, f, e, c));
               }
             }
-            var k = 3 * (e - a), p = 3 * (c - b), r = 3 * (f - e) - k, u = 3 * (d - c) - p, t = g - a - k - r, x = h - b - p - u, v = 0, L = 1;
-            m(n, 0, 1, .05);
-            d = s(v, L, n);
-            if (1E-5 < Math.abs(n(d))) {
+            var k = 3 * (e - a), p = 3 * (c - b), q = 3 * (f - e) - k, t = 3 * (d - c) - p, u = g - a - k - q, x = h - b - p - t, v = 0, H = 1;
+            r(l, 0, 1, .05);
+            d = s(v, H, l);
+            if (1E-5 < Math.abs(l(d))) {
               return[];
             }
             e = [];
-            1 >= d && e.push(q(d));
+            1 >= d && e.push(m(d));
             c = x;
-            f = d * c + u;
+            f = d * c + t;
             g = f * f - 4 * c * (d * f + p);
             if (0 > g) {
               return e;
@@ -32734,12 +34404,12 @@
             c = 1 / (c + c);
             d = (g - f) * c;
             c *= -f - g;
-            0 <= d && 1 >= d && e.push(q(d));
-            0 <= c && 1 >= c && e.push(q(c));
+            0 <= d && 1 >= d && e.push(m(d));
+            0 <= c && 1 >= c && e.push(m(c));
             return e;
           }
           function s(a, b, e) {
-            var c, f, d, g, h, l, n = a;
+            var c, f, d, g, h, n, l = a;
             f = e(a);
             if (0 === f) {
               return a;
@@ -32751,8 +34421,8 @@
             if (0 < g * f) {
               return a;
             }
-            for (var q = 0, m = 0;50 > m;++m) {
-              q++;
+            for (var m = 0, r = 0;50 > r;++r) {
+              m++;
               c = .5 * (b + a);
               d = e(c);
               if (0 === d) {
@@ -32763,19 +34433,19 @@
               }
               0 < d * f && (a = b, b = f, f = g, g = b);
               b = d - f;
-              l = g - d;
+              n = g - d;
               h = g - f;
               if (g * h < 2 * d * b) {
                 b = c, g = d;
               } else {
                 g = (c - a) / b;
-                b = (b - l) / (l * h);
+                b = (b - n) / (n * h);
                 b = a - g * f * (1 - b * d);
                 g = e(b);
-                if (0 === g || 1E-6 > Math.abs(b - n)) {
+                if (0 === g || 1E-6 > Math.abs(b - l)) {
                   return b;
                 }
-                n = b;
+                l = b;
                 0 > g * f || (a = b, f = g, b = c, g = d);
               }
             }
@@ -32784,13 +34454,13 @@
           function m(a, b, e, c, f, d) {
             return d > b !== c > b && a < (e - f) * (b - d) / (c - d) + f;
           }
-          var g = d.Debug.notImplemented, f = d.AVM2.Runtime.asCoerceString, b = d.AVM2.Runtime.throwError, e = d.NumberUtilities.clamp, q = d.Bounds, n = r.display.GradientType, x = r.display.SpreadMethod, L = r.display.InterpolationMethod, A = r.display.LineScaleMode, H = r.display.CapsStyle, K = r.display.JointStyle, F = d.ShapeData, J = function(a) {
+          var g = d.Debug.notImplemented, f = d.AVM2.Runtime.asCoerceString, b = d.AVM2.Runtime.throwError, e = d.NumberUtilities.clamp, n = d.Bounds, r = q.display.GradientType, x = q.display.SpreadMethod, H = q.display.InterpolationMethod, C = q.display.LineScaleMode, F = q.display.CapsStyle, K = q.display.JointStyle, E = d.ShapeData, Q = function(a) {
             function s() {
-              this._id = r.display.DisplayObject.getNextSyncID();
-              this._graphicsData = new F;
+              this._id = q.display.DisplayObject.getNextSyncID();
+              this._graphicsData = new E;
               this._textures = [];
-              this._fillBounds = new q(134217728, 134217728, 134217728, 134217728);
-              this._lineBounds = new q(134217728, 134217728, 134217728, 134217728);
+              this._fillBounds = new n(134217728, 134217728, 134217728, 134217728);
+              this._lineBounds = new n(134217728, 134217728, 134217728, 134217728);
               this._lastX = this._lastY = 0;
               this._boundsIncludeLastCoordinates = !0;
               this._parent = null;
@@ -32799,8 +34469,8 @@
             }
             __extends(s, a);
             s.FromData = function(a) {
-              var b = new r.display.Graphics;
-              b._graphicsData = F.FromPlainObject(a.shape);
+              var b = new q.display.Graphics;
+              b._graphicsData = E.FromPlainObject(a.shape);
               a.lineBounds && (b._lineBounds.copyFrom(a.lineBounds), b._fillBounds.copyFrom(a.fillBounds || a.lineBounds));
               return b;
             };
@@ -32861,23 +34531,23 @@
             s.prototype.endFill = function() {
               this._graphicsData.endFill();
             };
-            s.prototype.lineStyle = function(a, b, c, d, g, h, l, n) {
+            s.prototype.lineStyle = function(a, b, c, d, g, h, n, l) {
               void 0 === b && (b = 0);
               void 0 === c && (c = 1);
               void 0 === d && (d = !1);
               void 0 === g && (g = "normal");
               void 0 === h && (h = null);
-              void 0 === l && (l = null);
-              void 0 === n && (n = 3);
+              void 0 === n && (n = null);
+              void 0 === l && (l = 3);
               a = +a;
               b = b >>> 0 & 16777215;
               c = Math.round(255 * e(+c, -1, 1));
               d = !!d;
               g = f(g);
               h = f(h);
-              l = f(l);
-              n = e(+n | 0, 0, 255);
-              isNaN(a) ? (this._setStrokeWidth(0), this._graphicsData.endLine()) : (a = 20 * e(+a, 0, 255) | 0, this._setStrokeWidth(a), g = A.toNumber(f(g)), 0 > g && (g = A.toNumber(A.NORMAL)), h = H.toNumber(f(h)), 0 > h && (h = H.toNumber(H.ROUND)), l = K.toNumber(f(l)), 0 > l && (l = K.toNumber(K.ROUND)), this._graphicsData.lineStyle(a, b << 8 | c, d, g, h, l, n));
+              n = f(n);
+              l = e(+l | 0, 0, 255);
+              isNaN(a) ? (this._setStrokeWidth(0), this._graphicsData.endLine()) : (a = 20 * e(+a, 0, 255) | 0, this._setStrokeWidth(a), g = C.toNumber(f(g)), 0 > g && (g = C.toNumber(C.NORMAL)), h = F.toNumber(f(h)), 0 > h && (h = F.toNumber(F.ROUND)), n = K.toNumber(f(n)), 0 > n && (n = K.toNumber(K.ROUND)), this._graphicsData.lineStyle(a, b << 8 | c, d, g, h, n, l));
             };
             s.prototype.lineGradientStyle = function(a, b, e, c, f, d, g, h) {
               void 0 === f && (f = null);
@@ -32935,13 +34605,13 @@
               if (f | d | g | h) {
                 e = a + e;
                 c = b + c;
-                var l = a + f;
+                var n = a + f;
                 this.moveTo(e, c - h);
                 this.curveTo(e, c, e - h, c);
                 this.lineTo(a + g, c);
                 this.curveTo(a, c, a, c - g);
                 this.lineTo(a, b + f);
-                this.curveTo(a, b, l, b);
+                this.curveTo(a, b, n, b);
                 this.lineTo(e - d, b);
                 this.curveTo(e, b, e, b + d);
                 this.lineTo(e, c - h);
@@ -32960,10 +34630,10 @@
               b = +b + c;
               var f = a + e, d = b;
               this.moveTo(f, d);
-              for (var g = 0, h = 1, l = 0, n = 0;4 > n;n++) {
-                var q = g + Math.PI / 2, g = 4 / 3 * Math.tan((q - g) / 4), m = f - l * g * e, k = d + h * g * c, h = Math.cos(q), l = Math.sin(q), f = a + h * e, d = b + l * c;
-                this.cubicCurveTo(m, k, f + l * g * e, d - h * g * c, f, d);
-                g = q;
+              for (var g = 0, h = 1, n = 0, l = 0;4 > l;l++) {
+                var m = g + Math.PI / 2, g = 4 / 3 * Math.tan((m - g) / 4), r = f - n * g * e, k = d + h * g * c, h = Math.cos(m), n = Math.sin(m), f = a + h * e, d = b + n * c;
+                this.cubicCurveTo(r, k, f + n * g * e, d - h * g * c, f, d);
+                g = m;
               }
             };
             s.prototype.moveTo = function(a, b) {
@@ -33000,14 +34670,14 @@
               f = 20 * f | 0;
               d = 20 * d | 0;
               this._graphicsData.cubicCurveTo(a, b, e, c, f, d);
-              var g = this._lastX, l = this._lastY;
+              var g = this._lastX, n = this._lastY;
               if (a < g || e < g || a > f || e > f) {
                 for (a = h(g, a, e, f), e = a.length;e--;) {
                   this._extendBoundsByX(a[e] | 0);
                 }
               }
-              if (b < l || c < l || b > d || c > d) {
-                for (a = h(l, b, c, d), e = a.length;e--;) {
+              if (b < n || c < n || b > d || c > d) {
+                for (a = h(n, b, c, d), e = a.length;e--;) {
                   this._extendBoundsByY(a[e] | 0);
                 }
               }
@@ -33048,69 +34718,69 @@
               return f;
             };
             s.prototype._fillContainsPoint = function(a, b, e) {
-              for (var c = this._graphicsData, f = c.commands, d = c.commandsPosition, g = c.coordinates, c = c.morphCoordinates, h = 0, l = 0, n = 0, q = 0, k = 0, s, r, u = !1, x = !1, v = 0, L = 0, A = !1, H = 0;H < d;H++) {
-                s = f[H];
+              for (var c = this._graphicsData, f = c.commands, d = c.commandsPosition, g = c.coordinates, c = c.morphCoordinates, h = 0, n = 0, l = 0, r = 0, k = 0, s, q, t = !1, x = !1, v = 0, H = 0, C = !1, F = 0;F < d;F++) {
+                s = f[F];
                 switch(s) {
                   case 9:
-                    u && x && m(a, b, l, n, v, L) && (A = !A);
-                    u = !0;
-                    l = v = g[h++];
-                    n = L = g[h++];
-                    e && (l = v += (c[h - 2] - v) * e, n = L += (c[h - 2] - L) * e);
+                    t && x && m(a, b, n, l, v, H) && (C = !C);
+                    t = !0;
+                    n = v = g[h++];
+                    l = H = g[h++];
+                    e && (n = v += (c[h - 2] - v) * e, l = H += (c[h - 2] - H) * e);
                     continue;
                   case 10:
-                    q = g[h++];
+                    r = g[h++];
                     k = g[h++];
-                    e && (q += (c[h - 2] - q) * e, k += (c[h - 1] - k) * e);
-                    x && m(a, b, l, n, q, k) && (A = !A);
+                    e && (r += (c[h - 2] - r) * e, k += (c[h - 1] - k) * e);
+                    x && m(a, b, n, l, r, k) && (C = !C);
                     break;
                   case 11:
                     s = g[h++];
-                    r = g[h++];
                     q = g[h++];
+                    r = g[h++];
                     k = g[h++];
-                    e && (s += (c[h - 4] - s) * e, r += (c[h - 3] - r) * e, q += (c[h - 2] - q) * e, k += (c[h - 1] - k) * e);
+                    e && (s += (c[h - 4] - s) * e, q += (c[h - 3] - q) * e, r += (c[h - 2] - r) * e, k += (c[h - 1] - k) * e);
                     var K;
                     if (K = x) {
-                      if (r > b === n > b && k > b === n > b) {
+                      if (q > b === l > b && k > b === l > b) {
                         K = !1;
                       } else {
-                        if (l >= a && s >= a && q >= a) {
+                        if (n >= a && s >= a && r >= a) {
                           K = !0;
                         } else {
-                          K = n - 2 * r + k;
-                          r = 2 * (r - n);
-                          var F = r * r - 4 * K * (n - b);
-                          0 > F ? K = !1 : (F = Math.sqrt(F), K = 1 / (K + K), n = (F - r) * K, r = (-r - F) * K, K = !1, 0 <= n && 1 >= n && t(l, s, q, n) > a && (K = !K), 0 <= r && 1 >= r && t(l, s, q, r) > a && (K = !K));
+                          K = l - 2 * q + k;
+                          q = 2 * (q - l);
+                          var E = q * q - 4 * K * (l - b);
+                          0 > E ? K = !1 : (E = Math.sqrt(E), K = 1 / (K + K), l = (E - q) * K, q = (-q - E) * K, K = !1, 0 <= l && 1 >= l && u(n, s, r, l) > a && (K = !K), 0 <= q && 1 >= q && u(n, s, r, q) > a && (K = !K));
                         }
                       }
                     }
-                    K && (A = !A);
+                    K && (C = !C);
                     break;
                   case 12:
                     s = g[h++];
-                    r = g[h++];
-                    var F = g[h++], J = g[h++], q = g[h++], k = g[h++];
-                    e && (s += (c[h - 6] - s) * e, r += (c[h - 5] - r) * e, F += (c[h - 4] - F) * e, J += (c[h - 3] - J) * e, q += (c[h - 2] - q) * e, k += (c[h - 1] - k) * e);
+                    q = g[h++];
+                    var E = g[h++], Q = g[h++], r = g[h++], k = g[h++];
+                    e && (s += (c[h - 6] - s) * e, q += (c[h - 5] - q) * e, E += (c[h - 4] - E) * e, Q += (c[h - 3] - Q) * e, r += (c[h - 2] - r) * e, k += (c[h - 1] - k) * e);
                     if (K = x) {
                       K = a;
-                      var M = n > b;
-                      if (r > b === M && J > b === M && k > b === M) {
+                      var B = l > b;
+                      if (q > b === B && Q > b === B && k > b === B) {
                         K = !1;
                       } else {
-                        if (l < K && s < K && F < K && q < K) {
+                        if (n < K && s < K && E < K && r < K) {
                           K = !1;
                         } else {
-                          M = !1;
-                          l = p(l, n, s, r, F, J, q, k, b);
-                          for (s = l.length;s;s--) {
-                            l[s] >= K && (M = !M);
+                          B = !1;
+                          n = p(n, l, s, q, E, Q, r, k, b);
+                          for (s = n.length;s;s--) {
+                            n[s] >= K && (B = !B);
                           }
-                          K = M;
+                          K = B;
                         }
                       }
                     }
-                    K && (A = !A);
+                    K && (C = !C);
                     break;
                   case 1:
                   ;
@@ -33119,161 +34789,161 @@
                   case 3:
                   ;
                   case 4:
-                    u && x && m(a, b, l, n, v, L) && (A = !A);
-                    if (A) {
+                    t && x && m(a, b, n, l, v, H) && (C = !C);
+                    if (C) {
                       return!0;
                     }
-                    u = !1;
+                    t = !1;
                     x = 4 !== s;
                     break;
                   case 5:
                     h++;
                 }
-                l = q;
-                n = k;
+                n = r;
+                l = k;
               }
-              u && x && m(a, b, l, n, v, L) && (A = !A);
-              return A;
+              t && x && m(a, b, n, l, v, H) && (C = !C);
+              return C;
             };
             s.prototype._linesContainsPoint = function(a, b, e) {
-              for (var f = this._graphicsData, d = f.commands, g = f.commandsPosition, n = f.coordinates, f = f.morphCoordinates, q = 0, m = 0, k = 0, p = 0, s = 0, r, x, v, L, A, H = 0, K = r = 0, F = 0, J = 0, M = 0, D = 0, ia = 0;ia < g;ia++) {
-                switch(d[ia]) {
+              for (var f = this._graphicsData, d = f.commands, g = f.commandsPosition, n = f.coordinates, f = f.morphCoordinates, m = 0, r = 0, k = 0, p = 0, s = 0, q, x, v, H, C, F = 0, K = q = 0, E = 0, Q = 0, B = 0, N = 0, ha = 0;ha < g;ha++) {
+                switch(d[ha]) {
                   case 9:
-                    m = n[q++];
-                    k = n[q++];
-                    e && (m += (f[q - 2] - m) * e, k += (f[q - 1] - k) * e);
+                    r = n[m++];
+                    k = n[m++];
+                    e && (r += (f[m - 2] - r) * e, k += (f[m - 1] - k) * e);
                     continue;
                   case 10:
-                    if (0 === H) {
-                      m = n[q++];
-                      k = n[q++];
-                      e && (m += (f[q - 2] - m) * e, k += (f[q - 1] - k) * e);
+                    if (0 === F) {
+                      r = n[m++];
+                      k = n[m++];
+                      e && (r += (f[m - 2] - r) * e, k += (f[m - 1] - k) * e);
                       continue;
                     }
-                    p = n[q++];
-                    s = n[q++];
-                    e && (p += (f[q - 2] - p) * e, s += (f[q - 1] - s) * e);
-                    if (m === p && k === s) {
+                    p = n[m++];
+                    s = n[m++];
+                    e && (p += (f[m - 2] - p) * e, s += (f[m - 1] - s) * e);
+                    if (r === p && k === s) {
                       break;
                     }
-                    if (J < m && J < p || F > m && F > p || D < k && D < s || M > k && M > s) {
+                    if (Q < r && Q < p || E > r && E > p || N < k && N < s || B > k && B > s) {
                       break;
                     }
-                    if (p === m || s === k) {
+                    if (p === r || s === k) {
                       return!0;
                     }
-                    A = ((a - m) * (p - m) + (b - k) * (s - k)) / u(m, k, p, s);
-                    if (0 > A) {
-                      if (u(a, b, m, k) <= K) {
+                    C = ((a - r) * (p - r) + (b - k) * (s - k)) / t(r, k, p, s);
+                    if (0 > C) {
+                      if (t(a, b, r, k) <= K) {
                         return!0;
                       }
                       break;
                     }
-                    if (1 < A) {
-                      if (u(a, b, p, s) <= K) {
+                    if (1 < C) {
+                      if (t(a, b, p, s) <= K) {
                         return!0;
                       }
                       break;
                     }
-                    if (u(a, b, m + A * (p - m), k + A * (s - k)) <= K) {
+                    if (t(a, b, r + C * (p - r), k + C * (s - k)) <= K) {
                       return!0;
                     }
                     break;
                   case 11:
-                    if (0 === H) {
-                      q += 2;
-                      m = n[q++];
-                      k = n[q++];
-                      e && (m += (f[q - 2] - m) * e, k += (f[q - 1] - k) * e);
+                    if (0 === F) {
+                      m += 2;
+                      r = n[m++];
+                      k = n[m++];
+                      e && (r += (f[m - 2] - r) * e, k += (f[m - 1] - k) * e);
                       continue;
                     }
-                    r = n[q++];
-                    x = n[q++];
-                    p = n[q++];
-                    s = n[q++];
-                    e && (r += (f[q - 4] - r) * e, x += (f[q - 3] - x) * e, p += (f[q - 2] - p) * e, s += (f[q - 1] - s) * e);
-                    var ga = l(m, r, p);
-                    if (J < m && J < ga && J < p || F > m && F > ga && F > p) {
+                    q = n[m++];
+                    x = n[m++];
+                    p = n[m++];
+                    s = n[m++];
+                    e && (q += (f[m - 4] - q) * e, x += (f[m - 3] - x) * e, p += (f[m - 2] - p) * e, s += (f[m - 1] - s) * e);
+                    var ea = l(r, q, p);
+                    if (Q < r && Q < ea && Q < p || E > r && E > ea && E > p) {
                       break;
                     }
-                    ga = l(k, x, s);
-                    if (D < k && D < ga && D < s || M > k && M > ga && M > s) {
+                    ea = l(k, x, s);
+                    if (N < k && N < ea && N < s || B > k && B > ea && B > s) {
                       break;
                     }
-                    for (A = 0;1 > A;A += .02) {
-                      if (v = t(m, r, p, A), !(v < F || v > J) && (L = t(k, x, s, A), !(L < M || L > D) && (a - v) * (a - v) + (b - L) * (b - L) < K)) {
+                    for (C = 0;1 > C;C += .02) {
+                      if (v = u(r, q, p, C), !(v < E || v > Q) && (H = u(k, x, s, C), !(H < B || H > N) && (a - v) * (a - v) + (b - H) * (b - H) < K)) {
                         return!0;
                       }
                     }
                     break;
                   case 12:
-                    if (0 === H) {
-                      q += 4;
-                      q++;
-                      m = n[q++];
-                      e && (m += (f[q - 2] - m) * e, k += (f[q - 1] - k) * e);
+                    if (0 === F) {
+                      m += 4;
+                      m++;
+                      r = n[m++];
+                      e && (r += (f[m - 2] - r) * e, k += (f[m - 1] - k) * e);
                       continue;
                     }
-                    r = n[q++];
-                    x = n[q++];
-                    var ga = n[q++], ca = n[q++], p = n[q++], s = n[q++];
-                    e && (r += (f[q - 6] - r) * e, x += (f[q - 5] - x) * e, ga += (f[q - 4] - ga) * e, ca += (f[q - 3] - ca) * e, p += (f[q - 2] - p) * e, s += (f[q - 1] - s) * e);
-                    for (v = h(m, r, ga, p);2 > v.length;) {
+                    q = n[m++];
+                    x = n[m++];
+                    var ea = n[m++], aa = n[m++], p = n[m++], s = n[m++];
+                    e && (q += (f[m - 6] - q) * e, x += (f[m - 5] - x) * e, ea += (f[m - 4] - ea) * e, aa += (f[m - 3] - aa) * e, p += (f[m - 2] - p) * e, s += (f[m - 1] - s) * e);
+                    for (v = h(r, q, ea, p);2 > v.length;) {
                       v.push(p);
                     }
-                    if (J < m && J < p && J < v[0] && J < v[1] || F > m && F > p && F > v[0] && F > v[1]) {
+                    if (Q < r && Q < p && Q < v[0] && Q < v[1] || E > r && E > p && E > v[0] && E > v[1]) {
                       break;
                     }
-                    for (v = h(k, x, ca, s);2 > v.length;) {
+                    for (v = h(k, x, aa, s);2 > v.length;) {
                       v.push(s);
                     }
-                    if (D < k && D < s && D < v[0] && D < v[1] || M > k && M > s && M > v[0] && M > v[1]) {
+                    if (N < k && N < s && N < v[0] && N < v[1] || B > k && B > s && B > v[0] && B > v[1]) {
                       break;
                     }
-                    for (A = 0;1 > A;A += .02) {
-                      if (v = c(m, r, ga, p, A), !(v < F || v > J) && (L = c(k, x, ca, s, A), !(L < M || L > D) && (a - v) * (a - v) + (b - L) * (b - L) < K)) {
+                    for (C = 0;1 > C;C += .02) {
+                      if (v = c(r, q, ea, p, C), !(v < E || v > Q) && (H = c(k, x, aa, s, C), !(H < B || H > N) && (a - v) * (a - v) + (b - H) * (b - H) < K)) {
                         return!0;
                       }
                     }
                     break;
                   case 5:
-                    H = n[q++], e && (H += (f[q - 1] - H) * e), r = H >> 2, K = r * r, F = a - r, J = a + r, M = b - r, D = b + r;
+                    F = n[m++], e && (F += (f[m - 1] - F) * e), q = F >> 2, K = q * q, E = a - q, Q = a + q, B = b - q, N = b + q;
                 }
-                m = p;
+                r = p;
                 k = s;
               }
               return!1;
             };
             s.prototype._writeBitmapStyle = function(a, e, c, f, g, h) {
-              d.isNullOrUndefined(e) ? b("TypeError", k.Errors.NullPointerError, "bitmap") : r.display.BitmapData.isType(e) || b("TypeError", k.Errors.CheckTypeFailedError, "bitmap", "flash.display.BitmapData");
-              d.isNullOrUndefined(c) ? c = r.geom.Matrix.FROZEN_IDENTITY_MATRIX : r.geom.Matrix.isType(c) || b("TypeError", k.Errors.CheckTypeFailedError, "matrix", "flash.geom.Matrix");
+              d.isNullOrUndefined(e) ? b("TypeError", k.Errors.NullPointerError, "bitmap") : q.display.BitmapData.isType(e) || b("TypeError", k.Errors.CheckTypeFailedError, "bitmap", "flash.display.BitmapData");
+              d.isNullOrUndefined(c) ? c = q.geom.Matrix.FROZEN_IDENTITY_MATRIX : q.geom.Matrix.isType(c) || b("TypeError", k.Errors.CheckTypeFailedError, "matrix", "flash.geom.Matrix");
               f = !!f;
               g = !!g;
               h || (h = this._textures.length, this._textures.push(e), this._graphicsData.beginBitmap(a, h, c, f, g));
             };
-            s.prototype._writeGradientStyle = function(a, c, g, h, l, q, m, p, s, u) {
+            s.prototype._writeGradientStyle = function(a, c, g, h, n, l, m, p, s, t) {
               d.isNullOrUndefined(c) && b("TypeError", k.Errors.NullPointerError, "type");
-              c = n.toNumber(f(c));
+              c = r.toNumber(f(c));
               0 > c && b("ArgumentError", k.Errors.InvalidEnumError, "type");
               d.isNullOrUndefined(g) && b("TypeError", k.Errors.NullPointerError, "colors");
               g instanceof Array || b("TypeError", k.Errors.CheckTypeFailedError, "colors", "Array");
               h instanceof Array || b("TypeError", k.Errors.CheckTypeFailedError, "alphas", "Array");
               d.isNullOrUndefined(h) && b("TypeError", k.Errors.NullPointerError, "alphas");
-              l instanceof Array || b("TypeError", k.Errors.CheckTypeFailedError, "ratios", "Array");
-              d.isNullOrUndefined(l) && b("TypeError", k.Errors.NullPointerError, "ratios");
-              var t = [], v = [], A = g.length, H = A === h.length && A === l.length;
-              if (H) {
-                for (var K = 0;K < A;K++) {
-                  var F = +l[K];
-                  if (255 < F || 0 > F) {
-                    H = !1;
+              n instanceof Array || b("TypeError", k.Errors.CheckTypeFailedError, "ratios", "Array");
+              d.isNullOrUndefined(n) && b("TypeError", k.Errors.NullPointerError, "ratios");
+              var u = [], v = [], C = g.length, F = C === h.length && C === n.length;
+              if (F) {
+                for (var K = 0;K < C;K++) {
+                  var E = +n[K];
+                  if (255 < E || 0 > E) {
+                    F = !1;
                     break;
                   }
-                  t[K] = g[K] << 8 & 4294967040 | 255 * e(+h[K], 0, 1);
-                  v[K] = F;
+                  u[K] = g[K] << 8 & 4294967040 | 255 * e(+h[K], 0, 1);
+                  v[K] = E;
                 }
               }
-              H && (d.isNullOrUndefined(q) ? q = r.geom.Matrix.FROZEN_IDENTITY_MATRIX : r.geom.Matrix.isType(q) || b("TypeError", k.Errors.CheckTypeFailedError, "matrix", "flash.geom.Matrix"), u || (g = x.toNumber(f(m)), 0 > g && (g = x.toNumber(x.PAD)), p = L.toNumber(f(p)), 0 > p && (p = L.toNumber(L.RGB)), s = e(+s, -1, 1) / 2 * 255 | 0, this._graphicsData.beginGradient(a, t, v, c, q, g, p, s)));
+              F && (d.isNullOrUndefined(l) ? l = q.geom.Matrix.FROZEN_IDENTITY_MATRIX : q.geom.Matrix.isType(l) || b("TypeError", k.Errors.CheckTypeFailedError, "matrix", "flash.geom.Matrix"), t || (g = x.toNumber(f(m)), 0 > g && (g = x.toNumber(x.PAD)), p = H.toNumber(f(p)), 0 > p && (p = H.toNumber(H.RGB)), s = e(+s, -1, 1) / 2 * 255 | 0, this._graphicsData.beginGradient(a, u, v, c, l, g, p, s)));
             };
             s.prototype._extendBoundsByPoint = function(a, b) {
               this._extendBoundsByX(a);
@@ -33302,8 +34972,8 @@
             s.instanceSymbols = null;
             return s;
           }(a.ASNative);
-          v.Graphics = J;
-        })(r.display || (r.display = {}));
+          v.Graphics = Q;
+        })(q.display || (q.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -33313,7 +34983,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Timeline, l = d.NumberUtilities.clamp, c;
+          var t = d.Debug.notImplemented, u = d.Timeline, l = d.NumberUtilities.clamp, c;
           (function(a) {
             a[a.Inactive = 0] = "Inactive";
             a[a.LockToPointer = 1] = "LockToPointer";
@@ -33414,9 +35084,9 @@
               this._useHandCursor = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "soundTransform", {get:function() {
-              u("public flash.display.Sprite::get soundTransform");
+              t("public flash.display.Sprite::get soundTransform");
             }, set:function(a) {
-              u("public flash.display.Sprite::set soundTransform");
+              t("public flash.display.Sprite::set soundTransform");
             }, enumerable:!0, configurable:!0});
             p.prototype.startDrag = function(c, d) {
               void 0 === c && (c = !1);
@@ -33447,10 +35117,10 @@
               this._dropTarget = a;
             };
             p.prototype.startTouchDrag = function(a, c, d) {
-              u("public flash.display.Sprite::startTouchDrag");
+              t("public flash.display.Sprite::startTouchDrag");
             };
             p.prototype.stopTouchDrag = function(a) {
-              u("public flash.display.Sprite::stopTouchDrag");
+              t("public flash.display.Sprite::stopTouchDrag");
             };
             p.prototype._containsPoint = function(a, c, d, f, b, e) {
               if (!(5 === b && 0 < this._dragMode)) {
@@ -33481,7 +35151,7 @@
             return p;
           }(a.display.DisplayObjectContainer);
           k.Sprite = c;
-          t = function(c) {
+          u = function(c) {
             function d(l, m) {
               c.call(this, l, a.display.MovieClip, !0);
               this.numFrames = 1;
@@ -33497,10 +35167,10 @@
               h.actionScriptVersion === k.ActionScriptVersion.ACTIONSCRIPT2 && (g.isAVM1Object = !0, g.avm1Context = h._avm1Context);
               g.frameScripts = [];
               for (var f = c.frames, b = 0;b < f.length;b++) {
-                var e = h.getFrame(c, b), l = e.actionBlocks;
-                if (l) {
-                  for (var n = 0;n < l.length;n++) {
-                    g.frameScripts.push(b), g.frameScripts.push(l[n]);
+                var e = h.getFrame(c, b), n = e.actionBlocks;
+                if (n) {
+                  for (var l = 0;l < n.length;l++) {
+                    g.frameScripts.push(b), g.frameScripts.push(n[l]);
                   }
                 }
                 e.labelName && g.labels.push(new a.display.FrameLabel(e.labelName, b + 1));
@@ -33509,8 +35179,8 @@
               return g;
             };
             return d;
-          }(t.DisplaySymbol);
-          k.SpriteSymbol = t;
+          }(u.DisplaySymbol);
+          k.SpriteSymbol = u;
         })(a.display || (a.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -33521,7 +35191,7 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = d.AVM2.Runtime.throwError, l = d.Telemetry, c = a.events;
+          var t = d.AVM2.Runtime.asCoerceString, u = d.AVM2.Runtime.throwError, l = d.Telemetry, c = a.events;
           (function(a) {
             a[a.SWF1 = 1] = "SWF1";
             a[a.SWF9 = 9] = "SWF9";
@@ -33673,14 +35343,14 @@
             m.prototype._getAbsFrameNumber = function(a, c) {
               var b = 10 !== v.MovieClip.frameNavigationModel, e;
               if (null !== c) {
-                c = u(c);
+                c = t(c);
                 for (var d = this._scenes, h = 0;h < d.length && (e = d[h], e.name !== c);h++) {
                 }
                 if (h === d.length) {
                   if (b) {
                     return;
                   }
-                  t("ArgumentError", k.Errors.SceneNotFoundError, c);
+                  u("ArgumentError", k.Errors.SceneNotFoundError, c);
                 }
               } else {
                 e = this._sceneForFrameIndex(this._currentFrame);
@@ -33692,7 +35362,7 @@
                   if (b) {
                     return;
                   }
-                  t("ArgumentError", k.Errors.FrameLabelNotFoundError, a, c);
+                  u("ArgumentError", k.Errors.FrameLabelNotFoundError, a, c);
                 }
                 d = d.frame;
               }
@@ -33810,24 +35480,24 @@
             };
             m.prototype.gotoAndPlay = function(a, c) {
               void 0 === c && (c = null);
-              (0 === arguments.length || 2 < arguments.length) && t("ArgumentError", k.Errors.WrongArgumentCountError, "flash.display::MovieClip/gotoAndPlay()", 1, arguments.length);
-              c = u(c);
-              a = u(a) + "";
+              (0 === arguments.length || 2 < arguments.length) && u("ArgumentError", k.Errors.WrongArgumentCountError, "flash.display::MovieClip/gotoAndPlay()", 1, arguments.length);
+              c = t(c);
+              a = t(a) + "";
               this.play();
               this._gotoFrame(a, c);
             };
             m.prototype.gotoAndStop = function(a, c) {
               void 0 === c && (c = null);
-              (0 === arguments.length || 2 < arguments.length) && t("ArgumentError", k.Errors.WrongArgumentCountError, "flash.display::MovieClip/gotoAndPlay()", 1, arguments.length);
-              c = u(c);
-              a = u(a) + "";
+              (0 === arguments.length || 2 < arguments.length) && u("ArgumentError", k.Errors.WrongArgumentCountError, "flash.display::MovieClip/gotoAndPlay()", 1, arguments.length);
+              c = t(c);
+              a = t(a) + "";
               this.stop();
               this._gotoFrame(a, c);
             };
             m.prototype.addFrameScript = function(a, c) {
               if (this._currentFrame) {
                 var b = arguments.length;
-                b & 1 && t("ArgumentError", k.Errors.TooFewArgumentsError, b, b + 1);
+                b & 1 && u("ArgumentError", k.Errors.TooFewArgumentsError, b, b + 1);
                 for (var e = this._frameScripts, d = this._totalFrames, h = 0;h < b;h += 2) {
                   var l = (arguments[h] | 0) + 1;
                   1 > l || l > d || (e[l] = arguments[h + 1], l === this._currentFrame && (this._setFlags(8192), this._parent && this._propagateFlagsUp(16384)));
@@ -33923,7 +35593,7 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          function u(a, c) {
+          function t(a, c) {
             var f = !1, b;
             a.addEventListener("timeupdate", function(a) {
               f ? performance.now() : (b = performance.now(), f = !0);
@@ -33935,7 +35605,7 @@
               f = !1;
             });
           }
-          var t = d.SWF.MP3DecoderSession, l = function() {
+          var u = d.SWF.MP3DecoderSession, l = function() {
             function a(c) {
               this._element = c;
             }
@@ -34049,7 +35719,7 @@
             function c(f) {
               a.call(this, f);
               this._decoderPosition = 0;
-              this._decoderSession = new t;
+              this._decoderSession = new u;
               this._decoderSession.onframedata = function(a) {
                 var e = this._decoderPosition;
                 f.pcm.set(a, e);
@@ -34084,7 +35754,7 @@
                 var e = document.createElement("audio");
                 e.preload = "metadata";
                 e.loop = !1;
-                u(e, f);
+                t(e, f);
                 if (e.canPlayType("audio/mpeg")) {
                   this.element = e;
                   a.mediaSourceMP3Option.value ? "undefined" !== typeof MediaSource && MediaSource.isTypeSupported("audio/mpeg") ? this.soundStreamAdapter = new c(e) : (console.warn("MediaSource is not supported"), this.soundStreamAdapter = new h(e)) : this.soundStreamAdapter = new h(e);
@@ -34118,9 +35788,9 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
+      (function(q) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = d.AVM2.Runtime.asCoerceString, c = d.AVM2.Runtime.throwError, h = function(d) {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = d.AVM2.Runtime.asCoerceString, c = d.AVM2.Runtime.throwError, h = function(d) {
             function h() {
               v.DisplayObjectContainer.instanceConstructorNoInitialize.call(this);
               this._root = this;
@@ -34142,7 +35812,7 @@
               this._colorARGB = 4294967295;
               this._fullScreenHeight = this._fullScreenWidth = 0;
               this._wmodeGPU = !1;
-              this._softKeyboardRect = new r.geom.Rectangle;
+              this._softKeyboardRect = new q.geom.Rectangle;
               this._allowsFullScreenInteractive = this._allowsFullScreen = !1;
               this._contentsScaleFactor = 1;
               this._displayContextInfo = null;
@@ -34162,15 +35832,15 @@
               return this._scaleMode;
             }, set:function(a) {
               a = l(a);
-              0 > r.display.StageScaleMode.toNumber(a) && c("ArgumentError", k.Errors.InvalidEnumError, "scaleMode");
+              0 > q.display.StageScaleMode.toNumber(a) && c("ArgumentError", k.Errors.InvalidEnumError, "scaleMode");
               this._scaleMode = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "align", {get:function() {
               return this._align;
             }, set:function(a) {
               a = l(a);
-              a = r.display.StageAlign.toNumber(a);
-              this._align = r.display.StageAlign.fromNumber(a);
+              a = q.display.StageAlign.toNumber(a);
+              this._align = q.display.StageAlign.fromNumber(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "stageWidth", {get:function() {
               return this.scaleMode !== v.StageScaleMode.NO_SCALE ? this._stageWidth / 20 | 0 : this._stageContainerWidth;
@@ -34195,7 +35865,7 @@
             h.prototype.setStageContainerSize = function(a, c, f) {
               this._contentsScaleFactor = f;
               if (this._stageContainerWidth !== a || this._stageContainerHeight !== c) {
-                this._stageContainerWidth = a, this._stageContainerHeight = c, this.scaleMode === v.StageScaleMode.NO_SCALE && this.dispatchEvent(r.events.Event.getInstance(r.events.Event.RESIZE));
+                this._stageContainerWidth = a, this._stageContainerHeight = c, this.scaleMode === v.StageScaleMode.NO_SCALE && this.dispatchEvent(q.events.Event.getInstance(q.events.Event.RESIZE));
               }
             };
             Object.defineProperty(h.prototype, "showDefaultContextMenu", {get:function() {
@@ -34211,7 +35881,7 @@
             Object.defineProperty(h.prototype, "colorCorrection", {get:function() {
               return this._colorCorrection;
             }, set:function(a) {
-              u("public flash.display.Stage::set colorCorrection");
+              t("public flash.display.Stage::set colorCorrection");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "colorCorrectionSupport", {get:function() {
               return this._colorCorrectionSupport;
@@ -34225,33 +35895,33 @@
               return this._quality.toUpperCase();
             }, set:function(a) {
               a = (l(a) || "").toLowerCase();
-              0 > r.display.StageQuality.toNumber(a) && (a = r.display.StageQuality.HIGH);
+              0 > q.display.StageQuality.toNumber(a) && (a = q.display.StageQuality.HIGH);
               this._quality = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "displayState", {get:function() {
               return this._displayState;
             }, set:function(a) {
               a = l(a);
-              0 > r.display.StageDisplayState.toNumber(a) && (a = r.display.StageDisplayState.NORMAL);
+              0 > q.display.StageDisplayState.toNumber(a) && (a = q.display.StageDisplayState.NORMAL);
               this._displayState = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "fullScreenSourceRect", {get:function() {
               return this._fullScreenSourceRect;
             }, set:function(a) {
-              u("public flash.display.Stage::set fullScreenSourceRect");
+              t("public flash.display.Stage::set fullScreenSourceRect");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "mouseLock", {get:function() {
               return this._mouseLock;
             }, set:function(a) {
-              t("public flash.display.Stage::set mouseLock");
+              u("public flash.display.Stage::set mouseLock");
               this._mouseLock = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "stageVideos", {get:function() {
-              t("public flash.display.Stage::get stageVideos");
+              u("public flash.display.Stage::get stageVideos");
               return this._stageVideos;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "stage3Ds", {get:function() {
-              u("public flash.display.Stage::get stage3Ds");
+              t("public flash.display.Stage::get stage3Ds");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h.prototype, "color", {get:function() {
               return this._colorARGB;
@@ -34341,12 +36011,12 @@
               this._invalidated = !0;
             };
             h.prototype.isFocusInaccessible = function() {
-              u("public flash.display.Stage::isFocusInaccessible");
+              t("public flash.display.Stage::isFocusInaccessible");
             };
             h.prototype.requireOwnerPermissions = function() {
             };
             h.prototype.render = function() {
-              this._invalidated && (v.DisplayObject._broadcastFrameEvent(r.events.Event.RENDER), this._invalidated = !1);
+              this._invalidated && (v.DisplayObject._broadcastFrameEvent(q.events.Event.RENDER), this._invalidated = !1);
             };
             Object.defineProperty(h.prototype, "name", {get:function() {
               return this._name;
@@ -34492,9 +36162,9 @@
             h.instanceSymbols = null;
             h.initializer = null;
             return h;
-          }(r.display.DisplayObjectContainer);
+          }(q.display.DisplayObjectContainer);
           v.Stage = h;
-        })(r.display || (r.display = {}));
+        })(q.display || (q.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -34504,9 +36174,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.ActionScriptVersion");
+              q("public flash.display.ActionScriptVersion");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -34517,7 +36187,7 @@
             c.ACTIONSCRIPT3 = 3;
             return c;
           }(a.ASNative);
-          k.ActionScriptVersion = t;
+          k.ActionScriptVersion = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -34528,9 +36198,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.BlendMode");
+              q("public flash.display.BlendMode");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -34624,7 +36294,7 @@
             c.SHADER = "shader";
             return c;
           }(a.ASNative);
-          k.BlendMode = t;
+          k.BlendMode = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -34635,9 +36305,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.ColorCorrection");
+              q("public flash.display.ColorCorrection");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -34673,7 +36343,7 @@
             c.OFF = "off";
             return c;
           }(a.ASNative);
-          k.ColorCorrection = t;
+          k.ColorCorrection = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -34684,9 +36354,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.ColorCorrectionSupport");
+              q("public flash.display.ColorCorrectionSupport");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -34722,7 +36392,7 @@
             c.DEFAULT_OFF = "defaultOff";
             return c;
           }(a.ASNative);
-          k.ColorCorrectionSupport = t;
+          k.ColorCorrectionSupport = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -34733,9 +36403,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.FocusDirection");
+              q("public flash.display.FocusDirection");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -34747,7 +36417,7 @@
             c.NONE = "none";
             return c;
           }(a.ASNative);
-          k.FocusDirection = t;
+          k.FocusDirection = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -34758,9 +36428,9 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.AVM2.Runtime.asCoerceString, t = function(a) {
+          var t = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a, c) {
-              this._name = u(a);
+              this._name = t(a);
               this._frame = c | 0;
             }
             __extends(c, a);
@@ -34779,7 +36449,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.events.EventDispatcher);
-          k.FrameLabel = t;
+          k.FrameLabel = u;
         })(a.display || (a.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -34790,8 +36460,8 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = d.ArrayUtilities.DataBuffer, c = d.AVM2.Runtime.asCoerceString, h = d.AVM2.Runtime.throwError, p = d.AVM2.Runtime.AVM2, s = d.IntegerUtilities.swap32, m = d.ColorUtilities.premultiplyARGB, g = d.ColorUtilities.unpremultiplyARGB, f = d.ColorUtilities.RGBAToARGB, b = d.ArrayUtilities.indexOf, e = k.geom.Rectangle, q = function(n) {
-            function q(a, b, c, f) {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = d.ArrayUtilities.DataBuffer, c = d.AVM2.Runtime.asCoerceString, h = d.AVM2.Runtime.throwError, p = d.AVM2.Runtime.AVM2, s = d.IntegerUtilities.swap32, m = d.ColorUtilities.premultiplyARGB, g = d.ColorUtilities.unpremultiplyARGB, f = d.ColorUtilities.RGBAToARGB, b = d.ArrayUtilities.indexOf, e = k.geom.Rectangle, n = function(n) {
+            function x(a, b, c, f) {
               void 0 === c && (c = !0);
               void 0 === f && (f = 4294967295);
               a |= 0;
@@ -34800,14 +36470,14 @@
               f |= 0;
               var d = this._symbol;
               d && (a = d.width | 0, b = d.height | 0);
-              (a > q.MAXIMUM_WIDTH || 0 >= a || b > q.MAXIMUM_HEIGHT || 0 >= b || a * b > q.MAXIMUM_DIMENSION) && h("ArgumentError", p.Errors.InvalidBitmapData);
+              (a > x.MAXIMUM_WIDTH || 0 >= a || b > x.MAXIMUM_HEIGHT || 0 >= b || a * b > x.MAXIMUM_DIMENSION) && h("ArgumentError", p.Errors.InvalidBitmapData);
               this._rect = new e(0, 0, a, b);
               this._transparent = c;
               d ? (this._id = d.syncId, 1 === d.type || 2 === d.type || 3 === d.type ? this._setData(d.data, d.type) : (this._isDirty = !1, this._isRemoteDirty = !0), this._solidFillColorPBGRA = null) : (this._id = k.display.DisplayObject.getNextSyncID(), this._setData(new Uint8Array(a * b * 4), 1), 0 === f >> 24 && c ? this._solidFillColorPBGRA = 0 : this.fillRect(this._rect, f));
               this._bitmapReferrers = [];
             }
-            __extends(q, n);
-            q.prototype._setData = function(a, b) {
+            __extends(x, n);
+            x.prototype._setData = function(a, b) {
               a instanceof Uint8ClampedArray && (a = new Uint8Array(a.buffer));
               this._data = a;
               this._type = b;
@@ -34816,15 +36486,15 @@
               this._isDirty = !0;
               this._isRemoteDirty = !1;
             };
-            q.prototype._addBitmapReferrer = function(a) {
+            x.prototype._addBitmapReferrer = function(a) {
               b(this._bitmapReferrers, a);
               this._bitmapReferrers.push(a);
             };
-            q.prototype._removeBitmapReferrer = function(a) {
+            x.prototype._removeBitmapReferrer = function(a) {
               a = b(this._bitmapReferrers, a);
               this._bitmapReferrers[a] = null;
             };
-            q.prototype._invalidate = function() {
+            x.prototype._invalidate = function() {
               if (!this._isDirty) {
                 this._isDirty = !0;
                 this._isRemoteDirty = !1;
@@ -34834,66 +36504,66 @@
                 }
               }
             };
-            q.prototype._getTemporaryRectangleFrom = function(a, b) {
+            x.prototype._getTemporaryRectangleFrom = function(a, b) {
               void 0 === b && (b = 0);
-              var e = q._temporaryRectangles[b];
+              var e = x._temporaryRectangles[b];
               a && e.copyFrom(a);
               return e;
             };
-            q.prototype.getDataBuffer = function() {
+            x.prototype.getDataBuffer = function() {
               return this._dataBuffer;
             };
-            q.prototype._getContentBounds = function() {
+            x.prototype._getContentBounds = function() {
               return d.Bounds.FromRectangle(this._rect);
             };
-            q.prototype._getPixelData = function(a) {
+            x.prototype._getPixelData = function(a) {
               var b = this._getTemporaryRectangleFrom(this._rect).intersectInPlace(a);
               if (!b.isEmpty()) {
                 a = b.x;
                 for (var e = b.x + b.width, c = b.y, f = b.y + b.height, d = this._view, g = this._rect.width, b = new Int32Array(b.area), h = 0;c < f;c++) {
-                  for (var l = c * g, n = a;n < e;n++) {
-                    var q = d[l + n], k = q & 255, q = 255 * (q >>> 8) / k << 8 | k;
-                    b[h++] = q;
+                  for (var n = c * g, l = a;l < e;l++) {
+                    var m = d[n + l], k = m & 255, m = 255 * (m >>> 8) / k << 8 | k;
+                    b[h++] = m;
                   }
                 }
                 return b;
               }
             };
-            q.prototype._putPixelData = function(a, b) {
+            x.prototype._putPixelData = function(a, b) {
               var e = this._getTemporaryRectangleFrom(this._rect).intersectInPlace(a);
               if (!e.isEmpty()) {
-                for (var c = e.x, f = e.x + e.width, d = e.y + e.height, g = this._view, h = this._rect.width, l = a.width * a.height - e.height + (c - a.x), n = a.width - e.width, q = this._transparent ? 0 : 255, e = e.y;e < d;e++) {
-                  for (var k = e * h, m = c;m < f;m++) {
-                    var p = b[l++], s = p & q;
-                    g[k + m] = (((p >>> 8) * s + 254) / 255 & 16777215) << 8 | s;
+                for (var c = e.x, f = e.x + e.width, d = e.y + e.height, g = this._view, h = this._rect.width, n = a.width * a.height - e.height + (c - a.x), l = a.width - e.width, m = this._transparent ? 0 : 255, e = e.y;e < d;e++) {
+                  for (var k = e * h, r = c;r < f;r++) {
+                    var p = b[n++], s = p & m;
+                    g[k + r] = (((p >>> 8) * s + 254) / 255 & 16777215) << 8 | s;
                   }
-                  l += n;
+                  n += l;
                 }
                 this._invalidate();
               }
             };
-            Object.defineProperty(q.prototype, "width", {get:function() {
+            Object.defineProperty(x.prototype, "width", {get:function() {
               return this._rect.width;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "height", {get:function() {
+            Object.defineProperty(x.prototype, "height", {get:function() {
               return this._rect.height;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "rect", {get:function() {
+            Object.defineProperty(x.prototype, "rect", {get:function() {
               return this._rect.clone();
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(q.prototype, "transparent", {get:function() {
+            Object.defineProperty(x.prototype, "transparent", {get:function() {
               return this._transparent;
             }, enumerable:!0, configurable:!0});
-            q.prototype.clone = function() {
-              t("public flash.display.BitmapData::clone");
-              var a = new q(this._rect.width, this._rect.height, this._transparent, this._solidFillColorPBGRA);
+            x.prototype.clone = function() {
+              u("public flash.display.BitmapData::clone");
+              var a = new x(this._rect.width, this._rect.height, this._transparent, this._solidFillColorPBGRA);
               a._view.set(this._view);
               return a;
             };
-            q.prototype.getPixel = function(a, b) {
+            x.prototype.getPixel = function(a, b) {
               return this.getPixel32(a | 0, b | 0) & 16777215;
             };
-            q.prototype.getPixel32 = function(a, b) {
+            x.prototype.getPixel32 = function(a, b) {
               a |= 0;
               b |= 0;
               if (!this._rect.contains(a, b)) {
@@ -34910,13 +36580,13 @@
                   return d.Debug.notImplemented(d.ImageType[this._type]), 0;
               }
             };
-            q.prototype.setPixel = function(a, b, e) {
+            x.prototype.setPixel = function(a, b, e) {
               a |= 0;
               b |= 0;
               e |= 0;
               this._rect.contains(a, b) && (this._ensureBitmapData(), a = b * this._rect.width + a, e = e & 16777215 | (this._view[a] & 255) << 24, e = m(e), this._view[a] = s(e), this._invalidate(), this._solidFillColorPBGRA = null);
             };
-            q.prototype.setPixel32 = function(a, b, e) {
+            x.prototype.setPixel32 = function(a, b, e) {
               a |= 0;
               b |= 0;
               if (this._rect.contains(a, b)) {
@@ -34929,67 +36599,67 @@
                 this._solidFillColorPBGRA = null;
               }
             };
-            q.prototype.applyFilter = function(a, b, e, c) {
-              t("public flash.display.BitmapData::applyFilter " + c);
+            x.prototype.applyFilter = function(a, b, e, c) {
+              u("public flash.display.BitmapData::applyFilter " + c);
             };
-            q.prototype.colorTransform = function(a, b) {
-              t("public flash.display.BitmapData::colorTransform");
+            x.prototype.colorTransform = function(a, b) {
+              u("public flash.display.BitmapData::colorTransform");
             };
-            q.prototype.compare = function(a) {
-              u("public flash.display.BitmapData::compare");
+            x.prototype.compare = function(a) {
+              t("public flash.display.BitmapData::compare");
             };
-            q.prototype.copyChannel = function(a, b, e, c, f) {
-              u("public flash.display.BitmapData::copyChannel");
+            x.prototype.copyChannel = function(a, b, e, c, f) {
+              t("public flash.display.BitmapData::copyChannel");
             };
-            q.prototype.copyPixels = function(a, b, e, c, f, d) {
+            x.prototype.copyPixels = function(a, b, e, c, f, d) {
               void 0 === c && (c = null);
               void 0 === f && (f = null);
               void 0 === d && (d = !1);
               d = !!d;
               if (c || f) {
-                u("public flash.display.BitmapData::copyPixels - Alpha");
+                t("public flash.display.BitmapData::copyPixels - Alpha");
               } else {
                 var g = this._getTemporaryRectangleFrom(b, 0).roundInPlace();
                 b = this._rect;
                 f = a._rect;
                 var h = Math.max(g.x, 0);
                 c = Math.max(g.y, 0);
-                var l = Math.min(g.x + g.width, f.width), n = Math.min(g.y + g.height, f.height);
+                var n = Math.min(g.x + g.width, f.width), l = Math.min(g.y + g.height, f.height);
                 f = e.x | 0 + (h - g.x);
                 g = e.y | 0 + (c - g.y);
                 0 > f && (h -= f, f = 0);
                 0 > g && (c -= g, g = 0);
-                e = Math.min(l - h, b.width - f);
-                b = Math.min(n - c, b.height - g);
+                e = Math.min(n - h, b.width - f);
+                b = Math.min(l - c, b.height - g);
                 if (!(0 >= e || 0 >= b)) {
-                  var l = h, n = c, q = f, k = g;
+                  var n = h, l = c, m = f, k = g;
                   c = a._rect.width;
                   f = this._rect.width;
                   this._ensureBitmapData();
                   a._ensureBitmapData();
                   h = a._view;
                   g = this._view;
-                  a._type !== this._type && t("public flash.display.BitmapData::copyPixels - Color Format Conversion");
+                  a._type !== this._type && u("public flash.display.BitmapData::copyPixels - Color Format Conversion");
                   if (d && 1 !== this._type) {
-                    u("public flash.display.BitmapData::copyPixels - Merge Alpha");
+                    t("public flash.display.BitmapData::copyPixels - Merge Alpha");
                   } else {
                     if (null === this._solidFillColorPBGRA || this._solidFillColorPBGRA !== a._solidFillColorPBGRA) {
                       null !== a._solidFillColorPBGRA && 255 === (a._solidFillColorPBGRA & 255) && (d = !1);
                       if (d) {
-                        this._copyPixelsAndMergeAlpha(h, l, n, c, g, q, k, f, e, b);
+                        this._copyPixelsAndMergeAlpha(h, n, l, c, g, m, k, f, e, b);
                       } else {
-                        if (a = n * c + l | 0, d = k * f + q | 0, 0 === (e & 3)) {
-                          for (l = 0;l < b;l = l + 1 | 0) {
-                            for (n = 0;n < e;n = n + 4 | 0) {
-                              g[d + n + 0 | 0] = h[a + n + 0 | 0], g[d + n + 1 | 0] = h[a + n + 1 | 0], g[d + n + 2 | 0] = h[a + n + 2 | 0], g[d + n + 3 | 0] = h[a + n + 3 | 0];
+                        if (a = l * c + n | 0, d = k * f + m | 0, 0 === (e & 3)) {
+                          for (n = 0;n < b;n = n + 1 | 0) {
+                            for (l = 0;l < e;l = l + 4 | 0) {
+                              g[d + l + 0 | 0] = h[a + l + 0 | 0], g[d + l + 1 | 0] = h[a + l + 1 | 0], g[d + l + 2 | 0] = h[a + l + 2 | 0], g[d + l + 3 | 0] = h[a + l + 3 | 0];
                             }
                             a = a + c | 0;
                             d = d + f | 0;
                           }
                         } else {
-                          for (l = 0;l < b;l = l + 1 | 0) {
-                            for (n = 0;n < e;n = n + 1 | 0) {
-                              g[d + n | 0] = h[a + n | 0];
+                          for (n = 0;n < b;n = n + 1 | 0) {
+                            for (l = 0;l < e;l = l + 1 | 0) {
+                              g[d + l | 0] = h[a + l | 0];
                             }
                             a = a + c | 0;
                             d = d + f | 0;
@@ -35003,18 +36673,18 @@
                 }
               }
             };
-            q.prototype._copyPixelsAndMergeAlpha = function(a, b, e, c, f, d, g, h, l, n) {
+            x.prototype._copyPixelsAndMergeAlpha = function(a, b, e, c, f, d, g, h, n, l) {
               b = e * c + b | 0;
               d = g * h + d | 0;
-              for (g = 0;g < n;g = g + 1 | 0) {
-                for (e = 0;e < l;e = e + 1 | 0) {
-                  var q = a[b + e | 0], k = q & 255;
+              for (g = 0;g < l;g = g + 1 | 0) {
+                for (e = 0;e < n;e = e + 1 | 0) {
+                  var m = a[b + e | 0], k = m & 255;
                   if (255 === k) {
-                    f[d + e | 0] = q;
+                    f[d + e | 0] = m;
                   } else {
                     if (0 !== k) {
-                      var m = q & 16711935, q = q >> 8 & 16711935, p = f[d + e | 0], s = p & 16711935, p = p >> 8 & 16711935, k = 256 - k, s = Math.imul(s, k) >> 8, p = Math.imul(p, k) >> 8;
-                      f[d + e | 0] = (q + p & 16711935) << 8 | m + s & 16711935;
+                      var r = m & 16711935, m = m >> 8 & 16711935, p = f[d + e | 0], s = p & 16711935, p = p >> 8 & 16711935, k = 256 - k, s = Math.imul(s, k) >> 8, p = Math.imul(p, k) >> 8;
+                      f[d + e | 0] = (m + p & 16711935) << 8 | r + s & 16711935;
                     }
                   }
                 }
@@ -35022,31 +36692,31 @@
                 d = d + h | 0;
               }
             };
-            q.prototype.dispose = function() {
+            x.prototype.dispose = function() {
               this._rect.setEmpty();
               this._view = null;
               this._invalidate();
             };
-            q.prototype.draw = function(a, b, e, c, f, d) {
+            x.prototype.draw = function(a, b, e, c, f, d) {
               void 0 === b && (b = null);
               void 0 === e && (e = null);
               void 0 === c && (c = null);
               void 0 === f && (f = null);
               void 0 === d && (d = !1);
-              t("public flash.display.BitmapData::draw");
+              u("public flash.display.BitmapData::draw");
               var g = p.instance.globals["Shumway.Player.Utils"];
               b && (b = b.clone().toTwipsInPlace());
               g.drawToBitmap(this, a, b, e, c, f, d);
               this._isRemoteDirty = !0;
             };
-            q.prototype.drawWithQuality = function(a, b, e, f, d, g, h) {
+            x.prototype.drawWithQuality = function(a, b, e, f, d, g, h) {
               void 0 === f && (f = null);
               void 0 === h && (h = null);
               c(f);
               c(h);
-              u("public flash.display.BitmapData::drawWithQuality");
+              t("public flash.display.BitmapData::drawWithQuality");
             };
-            q.prototype.fillRect = function(a, b) {
+            x.prototype.fillRect = function(a, b) {
               this._ensureBitmapData();
               var e = this._transparent ? m(b) : b | 4278190080, e = s(e), c = this._getTemporaryRectangleFrom(this._rect).intersectInPlace(a);
               if (!c.isEmpty() && this._solidFillColorPBGRA !== e) {
@@ -35064,9 +36734,9 @@
                   }
                   this._solidFillColorPBGRA = e;
                 } else {
-                  for (var d = c.x | 0, g = c.x + c.width | 0, h = c.y + c.height | 0, l = this._rect.width | 0, c = c.y | 0;c < h;c++) {
-                    for (var n = c * l | 0, q = d;q < g;q++) {
-                      f[n + q] = e;
+                  for (var d = c.x | 0, g = c.x + c.width | 0, h = c.y + c.height | 0, n = this._rect.width | 0, c = c.y | 0;c < h;c++) {
+                    for (var l = c * n | 0, k = d;k < g;k++) {
+                      f[l + k] = e;
                     }
                   }
                   this._solidFillColorPBGRA = null;
@@ -35074,25 +36744,25 @@
                 this._invalidate();
               }
             };
-            q.prototype.floodFill = function(a, b, e) {
-              u("public flash.display.BitmapData::floodFill");
+            x.prototype.floodFill = function(a, b, e) {
+              t("public flash.display.BitmapData::floodFill");
             };
-            q.prototype.generateFilterRect = function(a, b) {
-              u("public flash.display.BitmapData::generateFilterRect");
+            x.prototype.generateFilterRect = function(a, b) {
+              t("public flash.display.BitmapData::generateFilterRect");
             };
-            q.prototype.getColorBoundsRect = function(a, b, e) {
-              u("public flash.display.BitmapData::getColorBoundsRect");
+            x.prototype.getColorBoundsRect = function(a, b, e) {
+              t("public flash.display.BitmapData::getColorBoundsRect");
             };
-            q.prototype.getPixels = function(a) {
+            x.prototype.getPixels = function(a) {
               var b = new k.utils.ByteArray;
               this.copyPixelsToByteArray(a, b);
               return b;
             };
-            q.prototype.copyPixelsToByteArray = function(a, b) {
+            x.prototype.copyPixelsToByteArray = function(a, b) {
               var e = this._getPixelData(a);
               e && b.writeRawBytes(new Uint8Array(e));
             };
-            q.prototype.getVector = function(b) {
+            x.prototype.getVector = function(b) {
               var e = new a.Uint32Vector(c.length), c = this._getPixelData(b);
               if (!c) {
                 return e;
@@ -35101,50 +36771,50 @@
               e._view().set(c);
               return e;
             };
-            q.prototype.hitTest = function(a, b, e, c, f) {
-              u("public flash.display.BitmapData::hitTest");
+            x.prototype.hitTest = function(a, b, e, c, f) {
+              t("public flash.display.BitmapData::hitTest");
             };
-            q.prototype.merge = function(a, b, e, c, f, d, g) {
-              t("public flash.display.BitmapData::merge");
+            x.prototype.merge = function(a, b, e, c, f, d, g) {
+              u("public flash.display.BitmapData::merge");
             };
-            q.prototype.noise = function(a, b, e, c, f) {
-              t("public flash.display.BitmapData::noise");
+            x.prototype.noise = function(a, b, e, c, f) {
+              u("public flash.display.BitmapData::noise");
             };
-            q.prototype.paletteMap = function(a, b, e, c, f, d, g) {
-              t("public flash.display.BitmapData::paletteMap");
+            x.prototype.paletteMap = function(a, b, e, c, f, d, g) {
+              u("public flash.display.BitmapData::paletteMap");
             };
-            q.prototype.perlinNoise = function(a, b, e, c, f, d, g, h, l) {
-              t("public flash.display.BitmapData::perlinNoise");
+            x.prototype.perlinNoise = function(a, b, e, c, f, d, g, h, n) {
+              u("public flash.display.BitmapData::perlinNoise");
             };
-            q.prototype.pixelDissolve = function(a, b, e, c, f, d) {
-              u("public flash.display.BitmapData::pixelDissolve");
+            x.prototype.pixelDissolve = function(a, b, e, c, f, d) {
+              t("public flash.display.BitmapData::pixelDissolve");
             };
-            q.prototype.scroll = function(a, b) {
-              u("public flash.display.BitmapData::scroll");
+            x.prototype.scroll = function(a, b) {
+              t("public flash.display.BitmapData::scroll");
             };
-            q.prototype.setPixels = function(a, b) {
+            x.prototype.setPixels = function(a, b) {
               this._putPixelData(a, new Int32Array(b.readRawBytes()));
             };
-            q.prototype.setVector = function(a, b) {
+            x.prototype.setVector = function(a, b) {
               this._putPixelData(a, b._view());
             };
-            q.prototype.threshold = function(a, b, e, f, d, g, h, l) {
+            x.prototype.threshold = function(a, b, e, f, d, g, h, n) {
               c(f);
-              u("public flash.display.BitmapData::threshold");
+              t("public flash.display.BitmapData::threshold");
             };
-            q.prototype.lock = function() {
+            x.prototype.lock = function() {
               this._locked = !0;
             };
-            q.prototype.unlock = function(a) {
+            x.prototype.unlock = function(a) {
               this._locked = !1;
             };
-            q.prototype.histogram = function(a) {
-              u("public flash.display.BitmapData::histogram");
+            x.prototype.histogram = function(a) {
+              t("public flash.display.BitmapData::histogram");
             };
-            q.prototype.encode = function(a, b, e) {
-              u("public flash.display.BitmapData::encode");
+            x.prototype.encode = function(a, b, e) {
+              t("public flash.display.BitmapData::encode");
             };
-            q.prototype._ensureBitmapData = function() {
+            x.prototype._ensureBitmapData = function() {
               if (this._isRemoteDirty) {
                 var a = d.AVM2.Runtime.AVM2.instance.globals["Shumway.Player.Utils"].requestBitmapData(this);
                 this._setData(a.getBytes(), 3);
@@ -35153,21 +36823,21 @@
               }
               1 !== this._type && (d.ColorUtilities.convertImage(this._type, 1, this._view, this._view), this._type = 1, this._solidFillColorPBGRA = null);
             };
-            q.classInitializer = function() {
+            x.classInitializer = function() {
             };
-            q.initializer = function(a) {
+            x.initializer = function(a) {
               this._symbol = a;
             };
-            q.classSymbols = null;
-            q.instanceSymbols = null;
-            q.MAXIMUM_WIDTH = 8191;
-            q.MAXIMUM_HEIGHT = 8191;
-            q.MAXIMUM_DIMENSION = 16777215;
-            q._temporaryRectangles = [new k.geom.Rectangle, new k.geom.Rectangle, new k.geom.Rectangle];
-            return q;
+            x.classSymbols = null;
+            x.instanceSymbols = null;
+            x.MAXIMUM_WIDTH = 8191;
+            x.MAXIMUM_HEIGHT = 8191;
+            x.MAXIMUM_DIMENSION = 16777215;
+            x._temporaryRectangles = [new k.geom.Rectangle, new k.geom.Rectangle, new k.geom.Rectangle];
+            return x;
           }(a.ASNative);
-          v.BitmapData = q;
-          q = function(a) {
+          v.BitmapData = n;
+          n = function(a) {
             function b(e) {
               a.call(this, e, k.display.BitmapData, !1);
               this.ready = !1;
@@ -35194,7 +36864,7 @@
                   e.type = 6;
                   break;
                 default:
-                  u(a.mimeType);
+                  t(a.mimeType);
               }
               return e;
             };
@@ -35215,7 +36885,7 @@
             };
             return b;
           }(d.Timeline.DisplaySymbol);
-          v.BitmapSymbol = q;
+          v.BitmapSymbol = n;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -35226,9 +36896,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.BitmapDataChannel");
+              q("public flash.display.BitmapDataChannel");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -35241,7 +36911,7 @@
             c.ALPHA = 8;
             return c;
           }(a.ASNative);
-          k.BitmapDataChannel = t;
+          k.BitmapDataChannel = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -35252,9 +36922,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.BitmapEncodingColorSpace");
+              q("public flash.display.BitmapEncodingColorSpace");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -35267,7 +36937,7 @@
             c.COLORSPACE_4_2_0 = "4:2:0";
             return c;
           }(a.ASNative);
-          k.BitmapEncodingColorSpace = t;
+          k.BitmapEncodingColorSpace = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -35278,9 +36948,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c(a) {
-              r("public flash.display.JPEGEncoderOptions");
+              q("public flash.display.JPEGEncoderOptions");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -35289,7 +36959,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.JPEGEncoderOptions = t;
+          k.JPEGEncoderOptions = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -35300,334 +36970,352 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.AVM2.Runtime.throwError, t = a.display.ActionScriptVersion, l = d.AVM2.Runtime.AVM2, c = a.events, h = d.FileLoader, p = d.AVM2.ABC.AbcFile, s = d.SWF.SWFFile, m;
+          var t = d.Debug.somewhatImplemented, u = d.AVM2.Runtime.throwError, l = a.display.ActionScriptVersion, c = d.AVM2.Runtime.AVM2, h = a.events, p = d.FileLoader, s = d.AVM2.ABC.AbcFile, m = d.SWF.SWFFile, g = d.AVM2.enterTimeline, f = d.AVM2.leaveTimeline, b;
           (function(a) {
             a[a.Unloaded = 0] = "Unloaded";
             a[a.Opened = 1] = "Opened";
             a[a.Initialized = 2] = "Initialized";
             a[a.Complete = 3] = "Complete";
-          })(m || (m = {}));
-          var g;
+          })(b || (b = {}));
+          var e;
           (function(a) {
             a[a.External = 0] = "External";
             a[a.Bytes = 1] = "Bytes";
-          })(g || (g = {}));
-          m = function(f) {
-            function b() {
+          })(e || (e = {}));
+          b = function(b) {
+            function e() {
               k.DisplayObjectContainer.instanceConstructorNoInitialize.call(this);
               this._content = null;
-              b._rootLoader && (this._contentID = k.DisplayObject._instanceID++);
+              e._rootLoader && (this._contentID = k.DisplayObject._instanceID++);
               this._contentLoaderInfo = new k.LoaderInfo(k.LoaderInfo.CtorToken);
               this._contentLoaderInfo._loader = this;
-              var a = l.currentAbc();
+              var a = c.currentAbc();
               a && (this._contentLoaderInfo._loaderUrl = a.env.loaderInfo.url);
               this._fileLoader = null;
               this._loadStatus = 0;
             }
-            __extends(b, f);
-            b.getRootLoader = function() {
-              if (b._rootLoader) {
-                return b._rootLoader;
+            __extends(e, b);
+            e.getRootLoader = function() {
+              if (e._rootLoader) {
+                return e._rootLoader;
               }
-              var e = new a.display.Loader;
+              var b = new a.display.Loader;
               a.display.DisplayObject._instanceID--;
-              e._contentLoaderInfo._loader = null;
-              return b._rootLoader = e;
+              b._contentLoaderInfo._loader = null;
+              return e._rootLoader = b;
             };
-            b.reset = function() {
-              b._loadQueue.forEach(function(a) {
+            e.reset = function() {
+              e._loadQueue.forEach(function(a) {
                 return a.unload();
               });
-              b.classInitializer();
+              e.classInitializer();
             };
-            b.processEvents = function() {
-              b.processEarlyEvents();
-              b.processLateEvents();
-            };
-            b.processEarlyEvents = function() {
-              for (var a = b._loadQueue, f = 0;f < a.length;f++) {
-                var g = a[f], h = g._contentLoaderInfo, l = g._imageSymbol;
-                if (h._file instanceof d.ImageFile) {
-                  if (!l || !l.ready || g._queuedLoadUpdate) {
+            e.processEvents = function() {
+              e.processEarlyEvents();
+              e.processLateEvents();
+            };
+            e.processEarlyEvents = function() {
+              for (var a = e._loadQueue, b = 0;b < a.length;b++) {
+                var c = a[b], n = c._contentLoaderInfo, l = c._imageSymbol;
+                if (n._file instanceof d.ImageFile) {
+                  if (!l || !l.ready || c._queuedLoadUpdate) {
                     continue;
                   }
-                  g._applyDecodedImage(l);
+                  c._applyDecodedImage(l);
                 }
-                if (1 === g._loadStatus && g._content) {
+                if (1 === c._loadStatus && c._content) {
+                  g("Loader.INIT");
                   try {
-                    h.dispatchEvent(c.Event.getInstance(c.Event.INIT));
-                  } catch (k) {
-                    console.warn("caught error under loaderInfo INIT event:", k);
+                    n.dispatchEvent(h.Event.getInstance(h.Event.INIT));
+                  } catch (m) {
+                    console.warn("caught error under loaderInfo INIT event:", m);
                   }
-                  g._loadStatus = 2;
-                  if (g === b._rootLoader) {
+                  f();
+                  c._loadStatus = 2;
+                  if (c === e._rootLoader) {
+                    g("Loader.Progress", "rootLoader");
                     try {
-                      h.dispatchEvent(new c.ProgressEvent(c.ProgressEvent.PROGRESS, !1, !1, h.bytesLoaded, h.bytesTotal));
-                    } catch (m) {
-                      console.warn("caught error under loaderInfo PROGRESS event:", m);
+                      n.dispatchEvent(new h.ProgressEvent(h.ProgressEvent.PROGRESS, !1, !1, n.bytesLoaded, n.bytesTotal));
+                    } catch (k) {
+                      console.warn("caught error under loaderInfo PROGRESS event:", k);
                     }
+                    f();
                   }
                 }
-                if (2 === g._loadStatus && h.bytesLoaded === h.bytesTotal) {
-                  a.splice(f--, 1);
-                  g._loadStatus = 3;
+                if (2 === c._loadStatus && n.bytesLoaded === n.bytesTotal) {
+                  a.splice(b--, 1);
+                  c._loadStatus = 3;
+                  g("Loader.Complete");
                   try {
-                    h.dispatchEvent(c.Event.getInstance(c.Event.COMPLETE));
+                    n.dispatchEvent(h.Event.getInstance(h.Event.COMPLETE));
                   } catch (p) {
                     console.warn("caught error under loaderInfo COMPLETE event: ", p);
                   }
+                  f();
                 }
               }
             };
-            b.processLateEvents = function() {
-              for (var a = b._loadQueue, f = 0;f < a.length;f++) {
-                var d = a[f], g = d._contentLoaderInfo, h = d._queuedLoadUpdate, l = g._bytesTotal;
-                if (h && l || 1 === d._loadStatus) {
-                  d._queuedLoadUpdate = null;
-                  if (0 === d._loadStatus) {
-                    if (0 === d._loadingType) {
+            e.processLateEvents = function() {
+              for (var a = e._loadQueue, b = 0;b < a.length;b++) {
+                var c = a[b], d = c._contentLoaderInfo, n = c._queuedLoadUpdate, l = d._bytesTotal;
+                if (n && l || 1 === c._loadStatus) {
+                  c._queuedLoadUpdate = null;
+                  if (0 === c._loadStatus) {
+                    if (0 === c._loadingType) {
+                      g("Loader.Open");
                       try {
-                        g.dispatchEvent(c.Event.getInstance(c.Event.OPEN));
-                      } catch (k) {
-                        console.warn("caught error under loaderInfo OPEN event: ", k);
+                        d.dispatchEvent(h.Event.getInstance(h.Event.OPEN));
+                      } catch (m) {
+                        console.warn("caught error under loaderInfo OPEN event: ", m);
                       }
+                      f();
                     }
-                    g.dispatchEvent(new c.ProgressEvent(c.ProgressEvent.PROGRESS, !1, !1, 0, l));
-                    d._loadStatus = 1;
-                  }
-                  if (h) {
-                    d._applyLoadUpdate(h);
+                    g("Loader.Progress");
+                    try {
+                      d.dispatchEvent(new h.ProgressEvent(h.ProgressEvent.PROGRESS, !1, !1, 0, l));
+                    } catch (k) {
+                      console.warn("caught error under loaderInfo PROGRESS event: ", k);
+                    }
+                    f();
+                    c._loadStatus = 1;
+                  }
+                  if (n) {
+                    c._applyLoadUpdate(n);
+                    g("Loader.Progress");
                     try {
-                      g.dispatchEvent(new c.ProgressEvent(c.ProgressEvent.PROGRESS, !1, !1, h.bytesLoaded, l));
-                    } catch (m) {
-                      console.warn("caught error under loaderInfo PROGRESS event: ", m);
+                      d.dispatchEvent(new h.ProgressEvent(h.ProgressEvent.PROGRESS, !1, !1, n.bytesLoaded, l));
+                    } catch (p) {
+                      console.warn("caught error under loaderInfo PROGRESS event: ", p);
                     }
+                    f();
                   }
                 }
               }
             };
-            b.prototype._setStage = function(a) {
+            e.prototype._setStage = function(a) {
               this._stage = a;
             };
-            b.prototype._initFrame = function(a) {
+            e.prototype._initFrame = function(a) {
             };
-            b.prototype._constructFrame = function() {
-              this === b.getRootLoader() && this._content ? (k.DisplayObject._advancableInstances.remove(this), this._children[0] = this._content, this._constructChildren(), this._children.length = 0) : this._constructChildren();
+            e.prototype._constructFrame = function() {
+              this === e.getRootLoader() && this._content ? (k.DisplayObject._advancableInstances.remove(this), this._children[0] = this._content, this._constructChildren(), this._children.length = 0) : this._constructChildren();
             };
-            b.prototype.addChild = function(a) {
-              u("IllegalOperationError", l.Errors.InvalidLoaderMethodError);
+            e.prototype.addChild = function(a) {
+              u("IllegalOperationError", c.Errors.InvalidLoaderMethodError);
               return null;
             };
-            b.prototype.addChildAt = function(a, b) {
-              u("IllegalOperationError", l.Errors.InvalidLoaderMethodError);
+            e.prototype.addChildAt = function(a, b) {
+              u("IllegalOperationError", c.Errors.InvalidLoaderMethodError);
               return null;
             };
-            b.prototype.removeChild = function(a) {
-              u("IllegalOperationError", l.Errors.InvalidLoaderMethodError);
+            e.prototype.removeChild = function(a) {
+              u("IllegalOperationError", c.Errors.InvalidLoaderMethodError);
               return null;
             };
-            b.prototype.removeChildAt = function(a) {
-              u("IllegalOperationError", l.Errors.InvalidLoaderMethodError);
+            e.prototype.removeChildAt = function(a) {
+              u("IllegalOperationError", c.Errors.InvalidLoaderMethodError);
               return null;
             };
-            b.prototype.setChildIndex = function(a, b) {
-              u("IllegalOperationError", l.Errors.InvalidLoaderMethodError);
+            e.prototype.setChildIndex = function(a, b) {
+              u("IllegalOperationError", c.Errors.InvalidLoaderMethodError);
             };
-            b.prototype._describeData = function(a) {
-              var b = [], c;
-              for (c in a) {
-                b.push(c + ":" + d.StringUtilities.toSafeString(a[c]));
+            e.prototype._describeData = function(a) {
+              var b = [], e;
+              for (e in a) {
+                b.push(e + ":" + d.StringUtilities.toSafeString(a[e]));
               }
               return "{" + b.join(", ") + "}";
             };
-            Object.defineProperty(b.prototype, "content", {get:function() {
+            Object.defineProperty(e.prototype, "content", {get:function() {
               return 0 === this._loadStatus ? null : this._content;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(b.prototype, "contentLoaderInfo", {get:function() {
+            Object.defineProperty(e.prototype, "contentLoaderInfo", {get:function() {
               return this._contentLoaderInfo;
             }, enumerable:!0, configurable:!0});
-            b.prototype._getJPEGLoaderContextdeblockingfilter = function(b) {
+            e.prototype._getJPEGLoaderContextdeblockingfilter = function(b) {
               return a.system.JPEGLoaderContext.isType(b) ? b.deblockingFilter : 0;
             };
-            Object.defineProperty(b.prototype, "uncaughtErrorEvents", {get:function() {
+            Object.defineProperty(e.prototype, "uncaughtErrorEvents", {get:function() {
+              t("public flash.display.Loader::uncaughtErrorEvents");
+              this._uncaughtErrorEvents || (this._uncaughtErrorEvents = new h.UncaughtErrorEvents);
               return this._uncaughtErrorEvents;
             }, enumerable:!0, configurable:!0});
-            b.prototype.load = function(a, c) {
+            e.prototype.load = function(a, b) {
               this.close();
               this._contentLoaderInfo._url = a.url;
-              this._applyLoaderContext(c);
+              this._applyLoaderContext(b);
               this._loadingType = 0;
-              this._fileLoader = new h(this);
+              this._fileLoader = new p(this);
               this._fileLoader.loadFile(a._toFileRequest());
               this._queuedLoadUpdate = null;
-              b._loadQueue.push(this);
+              e._loadQueue.push(this);
             };
-            b.prototype.loadBytes = function(a, c) {
+            e.prototype.loadBytes = function(a, b) {
               this.close();
-              this._contentLoaderInfo._url = (this.loaderInfo ? this.loaderInfo._url : "") + "/[[DYNAMIC]]/" + ++b._embeddedContentLoadCount;
-              this._applyLoaderContext(c);
+              this._contentLoaderInfo._url = (this.loaderInfo ? this.loaderInfo._url : "") + "/[[DYNAMIC]]/" + ++e._embeddedContentLoadCount;
+              this._applyLoaderContext(b);
               this._loadingType = 1;
-              this._fileLoader = new h(this);
+              this._fileLoader = new p(this);
               this._queuedLoadUpdate = null;
               this._fileLoader.loadBytes(new Uint8Array(a.bytes, 0, a.length));
-              b._loadQueue.push(this);
+              e._loadQueue.push(this);
             };
-            b.prototype.close = function() {
-              var a = b._loadQueue.indexOf(this);
-              -1 < a && b._loadQueue.splice(a, 1);
+            e.prototype.close = function() {
+              var a = e._loadQueue.indexOf(this);
+              -1 < a && e._loadQueue.splice(a, 1);
               this._contentLoaderInfo.reset();
               this._fileLoader && (this._fileLoader = null);
             };
-            b.prototype._unload = function(a, b) {
-              2 > this._loadStatus ? this._loadStatus = 0 : (this.close(), this._content = null, this._contentLoaderInfo._loader = null, this._loadStatus = 0, this.dispatchEvent(c.Event.getInstance(c.Event.UNLOAD)));
+            e.prototype._unload = function(a, b) {
+              2 > this._loadStatus ? this._loadStatus = 0 : (this.close(), this._content = null, this._contentLoaderInfo._loader = null, this._loadStatus = 0, this.dispatchEvent(h.Event.getInstance(h.Event.UNLOAD)));
             };
-            b.prototype.unload = function() {
+            e.prototype.unload = function() {
               this._unload(!1, !1);
             };
-            b.prototype.unloadAndStop = function(a) {
+            e.prototype.unloadAndStop = function(a) {
               this._unload(!0, !!a);
             };
-            b.prototype._applyLoaderContext = function(b) {
-              var c = {};
+            e.prototype._applyLoaderContext = function(b) {
+              var e = {};
               if (b && b.parameters) {
                 var f = b.parameters, g;
                 for (g in f) {
                   var h = f[g];
-                  d.isString(h) || u("IllegalOperationError", l.Errors.ObjectWithStringsParamError, "LoaderContext.parameters");
-                  c[g] = h;
+                  d.isString(h) || u("IllegalOperationError", c.Errors.ObjectWithStringsParamError, "LoaderContext.parameters");
+                  e[g] = h;
                 }
               }
               b && b.applicationDomain && (b = new a.system.ApplicationDomain(a.system.ApplicationDomain.currentDomain), this._contentLoaderInfo._applicationDomain = b);
-              this._contentLoaderInfo._parameters = c;
+              this._contentLoaderInfo._parameters = e;
             };
-            b.prototype.onLoadOpen = function(a) {
+            e.prototype.onLoadOpen = function(a) {
               this._contentLoaderInfo.setFile(a);
             };
-            b.prototype.onLoadProgress = function(a) {
+            e.prototype.onLoadProgress = function(a) {
               this._queuedLoadUpdate = a;
             };
-            b.prototype.onNewEagerlyParsedSymbols = function(a, b) {
-              for (var c = [], f = a.length - b;f < a.length;f++) {
-                var d = this._contentLoaderInfo.getSymbolById(a[f].id);
-                d.ready || c.push(d.resolveAssetPromise.promise);
+            e.prototype.onNewEagerlyParsedSymbols = function(a, b) {
+              for (var e = [], c = a.length - b;c < a.length;c++) {
+                var f = this._contentLoaderInfo.getSymbolById(a[c].id);
+                f.ready || e.push(f.resolveAssetPromise.promise);
               }
-              return Promise.all(c);
+              return Promise.all(e);
             };
-            b.prototype.onImageBytesLoaded = function() {
+            e.prototype.onImageBytesLoaded = function() {
               var a = this._contentLoaderInfo._file, a = {id:-1, data:a.data, mimeType:a.mimeType, dataType:a.type, type:"image"}, b = k.BitmapSymbol.FromData(a);
               this._imageSymbol = b;
-              l.instance.globals["Shumway.Player.Utils"].registerFontOrImage(b, a);
+              c.instance.globals["Shumway.Player.Utils"].registerFontOrImage(b, a);
             };
-            b.prototype._applyDecodedImage = function(b) {
+            e.prototype._applyDecodedImage = function(b) {
               b = b.createSharedInstance();
               this._content = new a.display.Bitmap(b);
               this._contentLoaderInfo._width = 20 * this._content.width;
               this._contentLoaderInfo._height = 20 * this._content.height;
               this.addTimelineObjectAtDepth(this._content, 0);
             };
-            b.prototype._applyLoadUpdate = function(b) {
-              var c = this._contentLoaderInfo;
-              c._bytesLoaded = b.bytesLoaded;
-              var f = c._file;
-              if (f instanceof s && 0 !== f.framesLoaded) {
-                if (c._allowCodeExecution) {
-                  var d = l.instance.applicationDomain, g = f.abcBlocks.length;
-                  if (0 < g - c._abcBlocksLoaded) {
-                    for (b = c._abcBlocksLoaded;b < g;b++) {
-                      var h = f.abcBlocks[b], k = new p(h.data, h.name);
-                      k.env.loaderInfo = c;
-                      h.flags ? d.loadAbc(k) : d.executeAbc(k);
+            e.prototype._applyLoadUpdate = function(b) {
+              var e = this._contentLoaderInfo;
+              e._bytesLoaded = b.bytesLoaded;
+              var f = e._file;
+              if (f instanceof m && 0 !== f.framesLoaded) {
+                if (e._allowCodeExecution) {
+                  var d = c.instance.applicationDomain, g = f.abcBlocks.length;
+                  if (0 < g - e._abcBlocksLoaded) {
+                    for (b = e._abcBlocksLoaded;b < g;b++) {
+                      var h = f.abcBlocks[b], n = new s(h.data, h.name);
+                      n.env.loaderInfo = e;
+                      h.flags ? d.loadAbc(n) : d.executeAbc(n);
                     }
-                    c._abcBlocksLoaded = g;
+                    e._abcBlocksLoaded = g;
                   }
                   g = f.symbolClassesList.length;
-                  if (0 < g - c._mappedSymbolsLoaded) {
-                    for (b = c._mappedSymbolsLoaded;b < g;b++) {
-                      h = f.symbolClassesList[b], k = d.getClass(h.className), Object.defineProperty(k, "defaultInitializerArgument", {get:c.getSymbolResolver(k, h.id), configurable:!0});
+                  if (0 < g - e._mappedSymbolsLoaded) {
+                    for (b = e._mappedSymbolsLoaded;b < g;b++) {
+                      h = f.symbolClassesList[b], n = d.getClass(h.className), Object.defineProperty(n, "defaultInitializerArgument", {get:e.getSymbolResolver(n, h.id), configurable:!0});
                     }
-                    c._mappedSymbolsLoaded = g;
+                    e._mappedSymbolsLoaded = g;
                   }
                 }
-                if (inFirefox && (d = f.fonts.length, 0 < d - c._fontsLoaded)) {
-                  for (b = c._fontsLoaded;b < d;b++) {
-                    a.text.Font.registerEmbeddedFont(f.fonts[b], c);
+                if (inFirefox && (d = f.fonts.length, 0 < d - e._fontsLoaded)) {
+                  for (b = e._fontsLoaded;b < d;b++) {
+                    a.text.Font.registerEmbeddedFont(f.fonts[b], e);
                   }
-                  c._fontsLoaded = d;
+                  e._fontsLoaded = d;
                 }
-                d = c.getRootSymbol();
+                d = e.getRootSymbol();
                 g = f.framesLoaded - d.frames.length;
                 if (0 !== g) {
                   for ((b = this._content) || (b = this.createContentRoot(d, f.sceneAndFrameLabelData)), f = b, b = 0;b < g;b++) {
-                    h = c.getFrame(null, d.frames.length), f._addFrame(h);
+                    h = e.getFrame(null, d.frames.length), f._addFrame(h);
                   }
                 }
               }
             };
-            b.prototype.onLoadComplete = function() {
+            e.prototype.onLoadComplete = function() {
             };
-            b.prototype.onLoadError = function() {
+            e.prototype.onLoadError = function() {
             };
-            b.prototype.createContentRoot = function(e, c) {
-              e.isAVM1Object && this._initAvm1(e);
-              var f = e.symbolClass.initializeFrom(e);
+            e.prototype.createContentRoot = function(b, c) {
+              b.isAVM1Object && this._initAvm1(b);
+              var f = b.symbolClass.initializeFrom(b);
               a.display.DisplayObject._instanceID--;
-              f._name = this === b._rootLoader ? "root1" : "instance" + this._contentID;
+              f._name = this === e._rootLoader ? "root1" : "instance" + this._contentID;
               if (k.MovieClip.isType(f)) {
                 var d = f;
                 if (c) {
-                  for (var g = c.scenes, h = 0, l = g.length;h < l;h++) {
+                  for (var g = c.scenes, h = 0, n = g.length;h < n;h++) {
                     var m = g[h], p = m.offset;
-                    d.addScene(m.name, [], p, (h < l - 1 ? g[h + 1].offset : e.numFrames) - p);
+                    d.addScene(m.name, [], p, (h < n - 1 ? g[h + 1].offset : b.numFrames) - p);
                   }
                   g = c.labels;
                   for (h = 0;h < g.length;h++) {
-                    l = g[h], d.addFrameLabel(l.name, l.frame + 1);
+                    n = g[h], d.addFrameLabel(n.name, n.frame + 1);
                   }
                 } else {
-                  d.addScene("Scene 1", [], 0, e.numFrames);
+                  d.addScene("Scene 1", [], 0, b.numFrames);
                 }
               }
               d = this._contentLoaderInfo;
               f._loaderInfo = d;
               h = f;
-              d.actionScriptVersion === t.ACTIONSCRIPT2 ? f = this._initAvm1Root(f) : this === b.getRootLoader() && (k.MovieClip.frameNavigationModel = 10 > d.swfVersion ? 9 : 10);
+              d.actionScriptVersion === l.ACTIONSCRIPT2 ? f = this._initAvm1Root(f) : this === e.getRootLoader() && (k.MovieClip.frameNavigationModel = 10 > d.swfVersion ? 9 : 10);
               this._content = f;
-              this === b.getRootLoader() ? (b.runtimeStartTime = Date.now(), this._stage.setRoot(f)) : this.addTimelineObjectAtDepth(f, 0);
+              this === e.getRootLoader() ? (e.runtimeStartTime = Date.now(), this._stage.setRoot(f)) : this.addTimelineObjectAtDepth(f, 0);
               return h;
             };
-            b.prototype._initAvm1 = function(a) {
-              var c = this._contentLoaderInfo, f;
-              this.loaderInfo && this.loaderInfo._avm1Context ? f = c._avm1Context = this.loaderInfo._avm1Context : (d.AVM1.Lib.installObjectMethods(), f = d.AVM1.AVM1Context.create(c), c._avm1Context = f, this === b.getRootLoader() && (f.globals.Key._bind(this._stage, f), f.globals.Mouse._bind(this._stage, f), k.MovieClip.frameNavigationModel = 1));
-              a.avm1Context = f;
+            e.prototype._initAvm1 = function(a) {
+              var b = this._contentLoaderInfo, c;
+              this.loaderInfo && this.loaderInfo._avm1Context ? c = b._avm1Context = this.loaderInfo._avm1Context : (d.AVM1.Lib.installObjectMethods(), c = d.AVM1.AVM1Context.create(b), b._avm1Context = c, this === e.getRootLoader() && (c.globals.Key._bind(this._stage, c), c.globals.Mouse._bind(this._stage, c), k.MovieClip.frameNavigationModel = 1));
+              a.avm1Context = c;
             };
-            b.prototype._initAvm1Root = function(b) {
-              var c = this._contentLoaderInfo._avm1Context, f = d.AVM1.Lib.getAVM1Object(b, c);
+            e.prototype._initAvm1Root = function(b) {
+              var e = this._contentLoaderInfo._avm1Context, c = d.AVM1.Lib.getAVM1Object(b, e);
               if (this.loaderInfo && this.loaderInfo._avm1Context) {
-                return f.context = this.loaderInfo._avm1Context, b;
+                return c.context = this.loaderInfo._avm1Context, b;
               }
-              c.root = f;
-              b.addEventListener("frameConstructed", c.flushPendingScripts.bind(c), !1, Number.MAX_VALUE);
+              e.root = c;
+              b.addEventListener("frameConstructed", e.flushPendingScripts.bind(e), !1, Number.MAX_VALUE);
               b = new a.display.AVM1Movie(b);
-              var c = this._contentLoaderInfo._parameters, g;
-              for (g in c) {
-                g in f || (f[g] = c[g]);
+              var e = this._contentLoaderInfo._parameters, f;
+              for (f in e) {
+                f in c || (c[f] = e[f]);
               }
               return b;
             };
-            b.classInitializer = function() {
-              b._rootLoader = null;
-              b._loadQueue = [];
-              b.runtimeStartTime = 0;
-              b._embeddedContentLoadCount = 0;
+            e.classInitializer = function() {
+              e._rootLoader = null;
+              e._loadQueue = [];
+              e.runtimeStartTime = 0;
+              e._embeddedContentLoadCount = 0;
             };
-            b.initializer = function() {
+            e.initializer = function() {
               k.DisplayObject._advancableInstances.push(this);
             };
-            b.classSymbols = null;
-            b.instanceSymbols = null;
-            return b;
+            e.classSymbols = null;
+            e.instanceSymbols = null;
+            return e;
           }(a.display.DisplayObjectContainer);
-          k.Loader = m;
+          k.Loader = b;
         })(a.display || (a.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -35638,7 +37326,7 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = d.SWF.SWFFile, c = function(c) {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = d.SWF.SWFFile, c = function(c) {
             function p(c) {
               c !== p.CtorToken && throwError("ArgumentError", k.Errors.CantInstantiateError, "LoaderInfo$");
               a.events.EventDispatcher.instanceConstructorNoInitialize.call(this);
@@ -35665,7 +37353,7 @@
               a instanceof l && (a = a.bounds, this._width = a.xMax - a.xMin, this._height = a.yMax - a.yMin);
             };
             p.getLoaderInfoByDefinition = function(a) {
-              u("public flash.display.LoaderInfo::static getLoaderInfoByDefinition");
+              t("public flash.display.LoaderInfo::static getLoaderInfoByDefinition");
             };
             Object.defineProperty(p.prototype, "loaderURL", {get:function() {
               if (!this._loader) {
@@ -35678,7 +37366,7 @@
               return this._file ? this._url : null;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "isURLInaccessible", {get:function() {
-              t("public flash.display.LoaderInfo::get isURLInaccessible");
+              u("public flash.display.LoaderInfo::get isURLInaccessible");
               return this._file ? !1 : !0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "bytesLoaded", {get:function() {
@@ -35688,7 +37376,7 @@
               return this._bytesTotal;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "applicationDomain", {get:function() {
-              t("public flash.display.LoaderInfo::get applicationDomain");
+              u("public flash.display.LoaderInfo::get applicationDomain");
               return this._file ? a.system.ApplicationDomain.currentDomain : null;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "swfVersion", {get:function() {
@@ -35718,37 +37406,37 @@
               return this._file ? this._file instanceof d.ImageFile ? this._file.mimeType : "application/x-shockwave-flash" : null;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "sharedEvents", {get:function() {
-              t("public flash.display.LoaderInfo::get sharedEvents");
+              u("public flash.display.LoaderInfo::get sharedEvents");
               this._sharedEvents || (this._sharedEvents = new a.events.EventDispatcher);
               return this._sharedEvents;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "parentSandboxBridge", {get:function() {
-              t("public flash.display.LoaderInfo::get parentSandboxBridge");
+              u("public flash.display.LoaderInfo::get parentSandboxBridge");
               return this._parentSandboxBridge;
             }, set:function(a) {
-              t("public flash.display.LoaderInfo::set parentSandboxBridge");
+              u("public flash.display.LoaderInfo::set parentSandboxBridge");
               this._parentSandboxBridge = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "childSandboxBridge", {get:function() {
-              t("public flash.display.LoaderInfo::get childSandboxBridge");
+              u("public flash.display.LoaderInfo::get childSandboxBridge");
               return this._childSandboxBridge;
             }, set:function(a) {
-              t("public flash.display.LoaderInfo::set childSandboxBridge");
+              u("public flash.display.LoaderInfo::set childSandboxBridge");
               this._childSandboxBridge = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "sameDomain", {get:function() {
               this._file || throwError("Error", k.Errors.LoadingObjectNotInitializedError);
-              t("public flash.display.LoaderInfo::get sameDomain");
+              u("public flash.display.LoaderInfo::get sameDomain");
               return!0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "childAllowsParent", {get:function() {
               this._file || throwError("Error", k.Errors.LoadingObjectNotInitializedError);
-              t("public flash.display.LoaderInfo::get childAllowsParent");
+              u("public flash.display.LoaderInfo::get childAllowsParent");
               return!0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "parentAllowsChild", {get:function() {
               this._file || throwError("Error", k.Errors.LoadingObjectNotInitializedError);
-              t("public flash.display.LoaderInfo::get parentAllowsChild");
+              u("public flash.display.LoaderInfo::get parentAllowsChild");
               return!0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "loader", {get:function() {
@@ -35761,15 +37449,15 @@
               if (!this._file) {
                 return new a.utils.ByteArray;
               }
-              u("public flash.display.LoaderInfo::get bytes");
+              t("public flash.display.LoaderInfo::get bytes");
               return null;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "parameters", {get:function() {
-              t("public flash.display.LoaderInfo::get parameters");
+              u("public flash.display.LoaderInfo::get parameters");
               return this._parameters ? d.ObjectUtilities.cloneObject(this._parameters) : {};
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(p.prototype, "uncaughtErrorEvents", {get:function() {
-              t("public flash.display.LoaderInfo::_getUncaughtErrorEvents");
+              u("public flash.display.LoaderInfo::_getUncaughtErrorEvents");
               this._uncaughtErrorEvents || (this._uncaughtErrorEvents = new a.events.UncaughtErrorEvents);
               return this._uncaughtErrorEvents;
             }, enumerable:!0, configurable:!0});
@@ -35939,18 +37627,18 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.somewhatImplemented, t = function(d) {
+          var t = d.Debug.somewhatImplemented, u = function(d) {
             function c() {
               a.events.EventDispatcher.instanceConstructorNoInitialize.call(this);
               this._enabled = !0;
             }
             __extends(c, d);
             Object.defineProperty(c.prototype, "enabled", {get:function() {
-              u("public flash.display.NativeMenuItem::get enabled");
+              t("public flash.display.NativeMenuItem::get enabled");
               return this._enabled;
             }, set:function(a) {
               a = !!a;
-              u("public flash.display.NativeMenuItem::set enabled");
+              t("public flash.display.NativeMenuItem::set enabled");
               this._enabled = a;
             }, enumerable:!0, configurable:!0});
             c.classInitializer = null;
@@ -35959,7 +37647,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.events.EventDispatcher);
-          k.NativeMenuItem = t;
+          k.NativeMenuItem = u;
         })(a.display || (a.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -35970,9 +37658,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c(a) {
-              r("public flash.display.PNGEncoderOptions");
+              q("public flash.display.PNGEncoderOptions");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -35981,7 +37669,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.PNGEncoderOptions = t;
+          k.PNGEncoderOptions = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -35992,9 +37680,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.PixelSnapping");
+              q("public flash.display.PixelSnapping");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -36030,7 +37718,7 @@
             c.AUTO = "auto";
             return c;
           }(a.ASNative);
-          k.PixelSnapping = t;
+          k.PixelSnapping = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36041,9 +37729,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.SWFVersion");
+              q("public flash.display.SWFVersion");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -36064,7 +37752,7 @@
             c.FLASH12 = 12;
             return c;
           }(a.ASNative);
-          k.SWFVersion = t;
+          k.SWFVersion = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36075,9 +37763,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.AVM2.Runtime.asCoerceString, t = function(a) {
+          var q = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a, c, d, l) {
-              this._name = r(a);
+              this._name = q(a);
               this._labels = c;
               this.offset = d;
               this._numFrames = l | 0;
@@ -36123,7 +37811,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.Scene = t;
+          k.Scene = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36134,9 +37822,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.StageAlign");
+              q("public flash.display.StageAlign");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -36173,7 +37861,7 @@
             c.BOTTOM_RIGHT = "BR";
             return c;
           }(a.ASNative);
-          k.StageAlign = t;
+          k.StageAlign = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36184,9 +37872,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.StageDisplayState");
+              q("public flash.display.StageDisplayState");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -36222,7 +37910,7 @@
             c.NORMAL = "normal";
             return c;
           }(a.ASNative);
-          k.StageDisplayState = t;
+          k.StageDisplayState = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36233,9 +37921,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.StageQuality");
+              q("public flash.display.StageQuality");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -36296,7 +37984,7 @@
             c.HIGH_16X16_LINEAR = "16x16linear";
             return c;
           }(a.ASNative);
-          k.StageQuality = t;
+          k.StageQuality = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36307,9 +37995,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.StageScaleMode");
+              q("public flash.display.StageScaleMode");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -36354,7 +38042,7 @@
             c.NO_SCALE_LOWERCASE = "noscale";
             return c;
           }(a.ASNative);
-          k.StageScaleMode = t;
+          k.StageScaleMode = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36365,9 +38053,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.display.TriangleCulling");
+              q("public flash.display.TriangleCulling");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -36379,7 +38067,7 @@
             c.NEGATIVE = "negative";
             return c;
           }(a.ASNative);
-          k.TriangleCulling = t;
+          k.TriangleCulling = u;
         })(k.display || (k.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36390,7 +38078,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = function(d) {
+          var t = d.Debug.notImplemented, u = function(d) {
             function c(c) {
               a.display.DisplayObject.instanceConstructorNoInitialize.call(this);
               this._children = [];
@@ -36403,10 +38091,10 @@
             }
             __extends(c, d);
             c.prototype.call = function(a) {
-              u("AVM1Movie#call");
+              t("AVM1Movie#call");
             };
             c.prototype.addCallback = function(a, c) {
-              u("AVM1Movie#call");
+              t("AVM1Movie#call");
             };
             c.prototype._initFrame = function(a) {
             };
@@ -36435,7 +38123,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.display.DisplayObject);
-          k.AVM1Movie = t;
+          k.AVM1Movie = u;
         })(a.display || (a.display = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36446,11 +38134,11 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = d.AVM2.Runtime.asCoerceString, l = function(a) {
+          var q = d.Debug.dummyConstructor, u = d.AVM2.Runtime.asCoerceString, l = function(a) {
             function d(a, c) {
               void 0 === a && (a = "");
-              t(a);
-              r("public flash.errors.IllegalOperationError");
+              u(a);
+              q("public flash.errors.IllegalOperationError");
             }
             __extends(d, a);
             d.classInitializer = null;
@@ -36470,57 +38158,57 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = d.AVM2.Runtime.asCoerceString, l = d.Telemetry, c = d.AVM2.Runtime.forEachPublicProperty, h = d.ExternalInterfaceService, p = function(d) {
-            function k() {
-              r("public flash.external.ExternalInterface");
+          var q = d.Debug.dummyConstructor, u = d.AVM2.Runtime.asCoerceString, l = d.Telemetry, c = d.AVM2.Runtime.forEachPublicProperty, h = d.ExternalInterfaceService, p = function(d) {
+            function m() {
+              q("public flash.external.ExternalInterface");
             }
-            __extends(k, d);
-            k._getAvailable = function() {
+            __extends(m, d);
+            m._getAvailable = function() {
               return h.instance.enabled;
             };
-            k._initJS = function() {
-              k.initialized || (l.instance.reportTelemetry({topic:"feature", feature:1}), k.initialized = !0, h.instance.initJS(k._callIn));
+            m._initJS = function() {
+              m.initialized || (l.instance.reportTelemetry({topic:"feature", feature:1}), m.initialized = !0, h.instance.initJS(m._callIn));
             };
-            k._callIn = function(c, f) {
-              var b = k.registeredCallbacks[c];
+            m._callIn = function(c, f) {
+              var b = m.registeredCallbacks[c];
               if (b) {
                 return b(c, a.ASJSON.transformJSValueToAS(f, !0));
               }
             };
-            k._getPropNames = function(a) {
+            m._getPropNames = function(a) {
               var f = [];
               c(a, function(a) {
                 f.push(a);
               }, null);
               return f;
             };
-            k._addCallback = function(a, c, b) {
-              b ? (h.instance.unregisterCallback(a), delete k.registeredCallbacks[a]) : (h.instance.registerCallback(a), k.registeredCallbacks[a] = c);
+            m._addCallback = function(a, c, b) {
+              b ? (h.instance.unregisterCallback(a), delete m.registeredCallbacks[a]) : (h.instance.registerCallback(a), m.registeredCallbacks[a] = c);
             };
-            k._evalJS = function(a) {
-              a = t(a);
+            m._evalJS = function(a) {
+              a = u(a);
               return h.instance.eval(a);
             };
-            k._callOut = function(a) {
-              a = t(a);
+            m._callOut = function(a) {
+              a = u(a);
               return h.instance.call(a);
             };
-            Object.defineProperty(k, "available", {get:function() {
-              return k._getAvailable();
+            Object.defineProperty(m, "available", {get:function() {
+              return m._getAvailable();
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(k, "objectID", {get:function() {
+            Object.defineProperty(m, "objectID", {get:function() {
               return h.instance.getId();
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(k, "activeX", {get:function() {
+            Object.defineProperty(m, "activeX", {get:function() {
               return!1;
             }, enumerable:!0, configurable:!0});
-            k.classInitializer = null;
-            k.initializer = null;
-            k.classSymbols = null;
-            k.instanceSymbols = null;
-            k.initialized = !1;
-            k.registeredCallbacks = Object.create(null);
-            return k;
+            m.classInitializer = null;
+            m.initializer = null;
+            m.classSymbols = null;
+            m.instanceSymbols = null;
+            m.initialized = !1;
+            m.registeredCallbacks = Object.create(null);
+            return m;
           }(a.ASNative);
           k.ExternalInterface = p;
         })(k.external || (k.external = {}));
@@ -36581,7 +38269,7 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = function(a) {
+          var q = function(a) {
             function d() {
             }
             __extends(d, a);
@@ -36607,8 +38295,8 @@
             d.blurFilterStepWidths = [.5, 1.05, 1.35, 1.55, 1.75, 1.9, 2, 2.1, 2.2, 2.3, 2.5, 3, 3, 3.5, 3.5];
             return d;
           }(a.ASNative);
-          k.BitmapFilter = r;
-          r = function() {
+          k.BitmapFilter = q;
+          q = function() {
             function a() {
             }
             a.sanitize = function(a, c, h) {
@@ -36664,7 +38352,7 @@
             };
             return a;
           }();
-          k.GradientArrays = r;
+          k.GradientArrays = q;
         })(k.filters || (k.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36675,8 +38363,8 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = function(l) {
-            function c(a, c, d, l, g, f, b, e, q, n, k, r) {
+          var t = d.AVM2.Runtime.asCoerceString, u = function(l) {
+            function c(a, c, d, l, g, f, b, e, n, k, q, t) {
               void 0 === a && (a = 4);
               void 0 === c && (c = 45);
               void 0 === d && (d = 16777215);
@@ -36685,10 +38373,10 @@
               void 0 === f && (f = 1);
               void 0 === b && (b = 4);
               void 0 === e && (e = 4);
-              void 0 === q && (q = 1);
               void 0 === n && (n = 1);
-              void 0 === k && (k = "inner");
-              void 0 === r && (r = !1);
+              void 0 === k && (k = 1);
+              void 0 === q && (q = "inner");
+              void 0 === t && (t = !1);
               this.distance = a;
               this.angle = c;
               this.highlightColor = d;
@@ -36697,10 +38385,10 @@
               this.shadowAlpha = f;
               this.blurX = b;
               this.blurY = e;
-              this.strength = q;
-              this.quality = n;
-              this.type = k;
-              this.knockout = r;
+              this.strength = n;
+              this.quality = k;
+              this.type = q;
+              this.knockout = t;
             }
             __extends(c, l);
             c.FromUntyped = function(d) {
@@ -36775,7 +38463,7 @@
             Object.defineProperty(c.prototype, "type", {get:function() {
               return this._type;
             }, set:function(a) {
-              a = u(a);
+              a = t(a);
               null === a ? k.Runtime.throwError("TypeError", k.Errors.NullPointerError, "type") : this._type = a === v.BitmapFilterType.INNER || a === v.BitmapFilterType.OUTER ? a : v.BitmapFilterType.FULL;
             }, enumerable:!0, configurable:!0});
             c.prototype.clone = function() {
@@ -36787,7 +38475,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.filters.BitmapFilter);
-          v.BevelFilter = t;
+          v.BevelFilter = u;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36798,7 +38486,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = function(a) {
+          var t = function(a) {
             function l(a, d, l) {
               void 0 === a && (a = 4);
               void 0 === d && (d = 4);
@@ -36845,7 +38533,7 @@
             l.instanceSymbols = null;
             return l;
           }(a.filters.BitmapFilter);
-          k.BlurFilter = u;
+          k.BlurFilter = t;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36856,7 +38544,7 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = function(a) {
+          var t = function(a) {
             function l(a) {
               void 0 === a && (a = null);
               a ? this.matrix = a : this._matrix = [1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0];
@@ -36894,7 +38582,7 @@
             l.instanceSymbols = null;
             return l;
           }(a.filters.BitmapFilter);
-          v.ColorMatrixFilter = u;
+          v.ColorMatrixFilter = t;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -36905,7 +38593,7 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = function(a) {
+          var t = function(a) {
             function l(a, d, l, k, m, g, f, b, e) {
               void 0 === a && (a = 0);
               void 0 === d && (d = 0);
@@ -37002,7 +38690,7 @@
             l.instanceSymbols = null;
             return l;
           }(a.filters.BitmapFilter);
-          v.ConvolutionFilter = u;
+          v.ConvolutionFilter = t;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -37013,9 +38701,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.filters.DisplacementMapFilterMode");
+              q("public flash.filters.DisplacementMapFilterMode");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -37028,7 +38716,7 @@
             c.COLOR = "color";
             return c;
           }(a.ASNative);
-          k.DisplacementMapFilterMode = t;
+          k.DisplacementMapFilterMode = u;
         })(k.filters || (k.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -37039,8 +38727,8 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.somewhatImplemented, t = d.AVM2.Runtime.asCoerceString, l = function(a) {
-            function d(a, c, h, g, f, b, e, l, n) {
+          var t = d.Debug.somewhatImplemented, u = d.AVM2.Runtime.asCoerceString, l = function(a) {
+            function d(a, c, h, g, f, b, e, n, l) {
               void 0 === a && (a = null);
               void 0 === c && (c = null);
               void 0 === h && (h = 0);
@@ -37048,8 +38736,8 @@
               void 0 === f && (f = 0);
               void 0 === b && (b = 0);
               void 0 === e && (e = "wrap");
-              void 0 === l && (l = 0);
               void 0 === n && (n = 0);
+              void 0 === l && (l = 0);
               this.mapBitmap = a;
               this.mapPoint = c;
               this.componentX = h;
@@ -37057,67 +38745,67 @@
               this.scaleX = f;
               this.scaleY = b;
               this.mode = e;
-              this.color = l;
-              this.alpha = n;
+              this.color = n;
+              this.alpha = l;
             }
             __extends(d, a);
             d.FromUntyped = function(a) {
               return new d(a.mapBitmap, a.mapPoint, a.componentX, a.componentY, a.scaleX, a.scaleY, a.mode, a.color, a.alpha);
             };
             Object.defineProperty(d.prototype, "mapBitmap", {get:function() {
-              u("public flash.filters.DisplacementMapFilter::get mapBitmap");
+              t("public flash.filters.DisplacementMapFilter::get mapBitmap");
               return this._mapBitmap;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set mapBitmap");
+              t("public flash.filters.DisplacementMapFilter::set mapBitmap");
               this._mapBitmap = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "mapPoint", {get:function() {
-              u("public flash.filters.DisplacementMapFilter::get mapPoint");
+              t("public flash.filters.DisplacementMapFilter::get mapPoint");
               return this._mapPoint;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set mapPoint");
+              t("public flash.filters.DisplacementMapFilter::set mapPoint");
               this._mapPoint = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "componentX", {get:function() {
               return this._componentX;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set componentX");
+              t("public flash.filters.DisplacementMapFilter::set componentX");
               this._componentX = a >>> 0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "componentY", {get:function() {
               return this._componentY;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set componentY");
+              t("public flash.filters.DisplacementMapFilter::set componentY");
               this._componentY = a >>> 0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "scaleX", {get:function() {
               return this._scaleX;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set scaleX");
+              t("public flash.filters.DisplacementMapFilter::set scaleX");
               this._scaleX = +a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "scaleY", {get:function() {
               return this._scaleY;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set scaleY");
+              t("public flash.filters.DisplacementMapFilter::set scaleY");
               this._scaleY = +a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "mode", {get:function() {
               return this._mode;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set mode");
-              this._mode = t(a);
+              t("public flash.filters.DisplacementMapFilter::set mode");
+              this._mode = u(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "color", {get:function() {
               return this._color;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set color");
+              t("public flash.filters.DisplacementMapFilter::set color");
               this._color = a >>> 0 & 16777215;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "alpha", {get:function() {
               return this._alpha;
             }, set:function(a) {
-              u("public flash.filters.DisplacementMapFilter::set alpha");
+              t("public flash.filters.DisplacementMapFilter::set alpha");
               this._alpha = +a;
             }, enumerable:!0, configurable:!0});
             d.prototype.clone = function() {
@@ -37140,8 +38828,8 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = function(a) {
-            function l(a, d, l, k, m, g, f, b, e, q, n) {
+          var t = function(a) {
+            function l(a, d, l, k, m, g, f, b, e, n, r) {
               void 0 === a && (a = 4);
               void 0 === d && (d = 45);
               void 0 === l && (l = 0);
@@ -37151,8 +38839,8 @@
               void 0 === f && (f = 1);
               void 0 === b && (b = 1);
               void 0 === e && (e = !1);
-              void 0 === q && (q = !1);
               void 0 === n && (n = !1);
+              void 0 === r && (r = !1);
               this.distance = a;
               this.angle = d;
               this.color = l;
@@ -37162,8 +38850,8 @@
               this.strength = f;
               this.quality = b;
               this.inner = e;
-              this.knockout = q;
-              this.hideObject = n;
+              this.knockout = n;
+              this.hideObject = r;
             }
             __extends(l, a);
             l.FromUntyped = function(a) {
@@ -37242,7 +38930,7 @@
             l.instanceSymbols = null;
             return l;
           }(a.filters.BitmapFilter);
-          k.DropShadowFilter = u;
+          k.DropShadowFilter = t;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -37253,7 +38941,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = function(a) {
+          var t = function(a) {
             function l(a, d, l, k, m, g, f, b) {
               void 0 === a && (a = 16711680);
               void 0 === d && (d = 1);
@@ -37328,7 +39016,7 @@
             l.instanceSymbols = null;
             return l;
           }(a.filters.BitmapFilter);
-          k.GlowFilter = u;
+          k.GlowFilter = t;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -37339,8 +39027,8 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = function(l) {
-            function c(a, c, d, l, g, f, b, e, q, n, k) {
+          var t = d.AVM2.Runtime.asCoerceString, u = function(l) {
+            function c(a, c, d, l, g, f, b, e, n, k, q) {
               void 0 === a && (a = 4);
               void 0 === c && (c = 45);
               void 0 === d && (d = null);
@@ -37349,9 +39037,9 @@
               void 0 === f && (f = 4);
               void 0 === b && (b = 4);
               void 0 === e && (e = 1);
-              void 0 === q && (q = 1);
-              void 0 === n && (n = "inner");
-              void 0 === k && (k = !1);
+              void 0 === n && (n = 1);
+              void 0 === k && (k = "inner");
+              void 0 === q && (q = !1);
               this.distance = a;
               this.angle = c;
               v.GradientArrays.sanitize(d, l, g);
@@ -37361,9 +39049,9 @@
               this.blurX = f;
               this.blurY = b;
               this.strength = e;
-              this.quality = q;
-              this.type = n;
-              this.knockout = k;
+              this.quality = n;
+              this.type = k;
+              this.knockout = q;
             }
             __extends(c, l);
             c.FromUntyped = function(d) {
@@ -37438,7 +39126,7 @@
             Object.defineProperty(c.prototype, "type", {get:function() {
               return this._type;
             }, set:function(a) {
-              a = u(a);
+              a = t(a);
               null === a ? k.Runtime.throwError("TypeError", k.Errors.NullPointerError, "type") : this._type = a === v.BitmapFilterType.INNER || a === v.BitmapFilterType.OUTER ? a : v.BitmapFilterType.FULL;
             }, enumerable:!0, configurable:!0});
             c.prototype.clone = function() {
@@ -37450,7 +39138,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.filters.BitmapFilter);
-          v.GradientBevelFilter = t;
+          v.GradientBevelFilter = u;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -37461,8 +39149,8 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = function(l) {
-            function c(a, c, d, l, g, f, b, e, q, n, k) {
+          var t = d.AVM2.Runtime.asCoerceString, u = function(l) {
+            function c(a, c, d, l, g, f, b, e, n, k, q) {
               void 0 === a && (a = 4);
               void 0 === c && (c = 45);
               void 0 === d && (d = null);
@@ -37471,9 +39159,9 @@
               void 0 === f && (f = 4);
               void 0 === b && (b = 4);
               void 0 === e && (e = 1);
-              void 0 === q && (q = 1);
-              void 0 === n && (n = "inner");
-              void 0 === k && (k = !1);
+              void 0 === n && (n = 1);
+              void 0 === k && (k = "inner");
+              void 0 === q && (q = !1);
               this.distance = a;
               this.angle = c;
               v.GradientArrays.sanitize(d, l, g);
@@ -37483,9 +39171,9 @@
               this.blurX = f;
               this.blurY = b;
               this.strength = e;
-              this.quality = q;
-              this.type = n;
-              this.knockout = k;
+              this.quality = n;
+              this.type = k;
+              this.knockout = q;
             }
             __extends(c, l);
             c.FromUntyped = function(d) {
@@ -37560,7 +39248,7 @@
             Object.defineProperty(c.prototype, "type", {get:function() {
               return this._type;
             }, set:function(a) {
-              a = u(a);
+              a = t(a);
               null === a ? k.Runtime.throwError("TypeError", k.Errors.NullPointerError, "type") : this._type = a === v.BitmapFilterType.INNER || a === v.BitmapFilterType.OUTER ? a : v.BitmapFilterType.FULL;
             }, enumerable:!0, configurable:!0});
             c.prototype.clone = function() {
@@ -37572,7 +39260,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.filters.BitmapFilter);
-          v.GradientGlowFilter = t;
+          v.GradientGlowFilter = u;
         })(a.filters || (a.filters = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -37583,8 +39271,8 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.IntegerUtilities.toS16, t = d.IntegerUtilities.clampS8U8, l = function(a) {
-            function d(a, c, h, g, f, b, e, l) {
+          var q = d.IntegerUtilities.toS16, u = d.IntegerUtilities.clampS8U8, l = function(a) {
+            function d(a, c, h, g, f, b, e, n) {
               void 0 === a && (a = 1);
               void 0 === c && (c = 1);
               void 0 === h && (h = 1);
@@ -37592,7 +39280,7 @@
               void 0 === f && (f = 0);
               void 0 === b && (b = 0);
               void 0 === e && (e = 0);
-              void 0 === l && (l = 0);
+              void 0 === n && (n = 0);
               this.redMultiplier = +a;
               this.greenMultiplier = +c;
               this.blueMultiplier = +h;
@@ -37600,7 +39288,7 @@
               this.redOffset = +f;
               this.greenOffset = +b;
               this.blueOffset = +e;
-              this.alphaOffset = +l;
+              this.alphaOffset = +n;
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "native_redMultiplier", {get:function() {
@@ -37723,14 +39411,14 @@
               return new d(this.redMultiplier, this.greenMultiplier, this.blueMultiplier, this.alphaMultiplier, this.redOffset, this.greenOffset, this.blueOffset, this.alphaOffset);
             };
             d.prototype.convertToFixedPoint = function() {
-              this.redMultiplier = t(this.redMultiplier);
-              this.greenMultiplier = t(this.greenMultiplier);
-              this.blueMultiplier = t(this.blueMultiplier);
-              this.alphaMultiplier = t(this.alphaMultiplier);
-              this.redOffset = r(this.redOffset);
-              this.greenOffset = r(this.greenOffset);
-              this.blueOffset = r(this.blueOffset);
-              this.alphaOffset = r(this.alphaOffset);
+              this.redMultiplier = u(this.redMultiplier);
+              this.greenMultiplier = u(this.greenMultiplier);
+              this.blueMultiplier = u(this.blueMultiplier);
+              this.alphaMultiplier = u(this.alphaMultiplier);
+              this.redOffset = q(this.redOffset);
+              this.greenOffset = q(this.greenOffset);
+              this.blueOffset = q(this.blueOffset);
+              this.alphaOffset = q(this.alphaOffset);
               return this;
             };
             d.prototype.toString = function() {
@@ -37755,96 +39443,96 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
             function c() {
-              t("public flash.media.Camera");
+              u("public flash.media.Camera");
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "names", {get:function() {
-              u("public flash.media.Camera::get names");
+              t("public flash.media.Camera::get names");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "isSupported", {get:function() {
-              u("public flash.media.Camera::get isSupported");
+              t("public flash.media.Camera::get isSupported");
             }, enumerable:!0, configurable:!0});
             c.getCamera = function(a) {
               void 0 === a && (a = null);
               l(a);
-              u("public flash.media.Camera::static getCamera");
+              t("public flash.media.Camera::static getCamera");
             };
             c._scanHardware = function() {
-              u("public flash.media.Camera::static _scanHardware");
+              t("public flash.media.Camera::static _scanHardware");
             };
             Object.defineProperty(c.prototype, "activityLevel", {get:function() {
-              u("public flash.media.Camera::get activityLevel");
+              t("public flash.media.Camera::get activityLevel");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "bandwidth", {get:function() {
-              u("public flash.media.Camera::get bandwidth");
+              t("public flash.media.Camera::get bandwidth");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "currentFPS", {get:function() {
-              u("public flash.media.Camera::get currentFPS");
+              t("public flash.media.Camera::get currentFPS");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "fps", {get:function() {
-              u("public flash.media.Camera::get fps");
+              t("public flash.media.Camera::get fps");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "height", {get:function() {
-              u("public flash.media.Camera::get height");
+              t("public flash.media.Camera::get height");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "index", {get:function() {
-              u("public flash.media.Camera::get index");
+              t("public flash.media.Camera::get index");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "keyFrameInterval", {get:function() {
-              u("public flash.media.Camera::get keyFrameInterval");
+              t("public flash.media.Camera::get keyFrameInterval");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "loopback", {get:function() {
-              u("public flash.media.Camera::get loopback");
+              t("public flash.media.Camera::get loopback");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "motionLevel", {get:function() {
-              u("public flash.media.Camera::get motionLevel");
+              t("public flash.media.Camera::get motionLevel");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "motionTimeout", {get:function() {
-              u("public flash.media.Camera::get motionTimeout");
+              t("public flash.media.Camera::get motionTimeout");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "muted", {get:function() {
-              u("public flash.media.Camera::get muted");
+              t("public flash.media.Camera::get muted");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "name", {get:function() {
-              u("public flash.media.Camera::get name");
+              t("public flash.media.Camera::get name");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "position", {get:function() {
-              u("public flash.media.Camera::get position");
+              t("public flash.media.Camera::get position");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "quality", {get:function() {
-              u("public flash.media.Camera::get quality");
+              t("public flash.media.Camera::get quality");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "width", {get:function() {
-              u("public flash.media.Camera::get width");
+              t("public flash.media.Camera::get width");
             }, enumerable:!0, configurable:!0});
             c.prototype.setCursor = function(a) {
-              u("public flash.media.Camera::setCursor");
+              t("public flash.media.Camera::setCursor");
             };
             c.prototype.setKeyFrameInterval = function(a) {
-              u("public flash.media.Camera::setKeyFrameInterval");
+              t("public flash.media.Camera::setKeyFrameInterval");
             };
             c.prototype.setLoopback = function(a) {
-              u("public flash.media.Camera::setLoopback");
+              t("public flash.media.Camera::setLoopback");
             };
             c.prototype.setMode = function(a, c, d, f) {
-              u("public flash.media.Camera::setMode");
+              t("public flash.media.Camera::setMode");
             };
             c.prototype.setMotionLevel = function(a, c) {
-              u("public flash.media.Camera::setMotionLevel");
+              t("public flash.media.Camera::setMotionLevel");
             };
             c.prototype.setQuality = function(a, c) {
-              u("public flash.media.Camera::setQuality");
+              t("public flash.media.Camera::setQuality");
             };
             c.prototype.drawToBitmapData = function(a) {
-              u("public flash.media.Camera::drawToBitmapData");
+              t("public flash.media.Camera::drawToBitmapData");
             };
             c.prototype.copyToByteArray = function(a, c) {
-              u("public flash.media.Camera::copyToByteArray");
+              t("public flash.media.Camera::copyToByteArray");
             };
             c.prototype.copyToVector = function(a, c) {
-              u("public flash.media.Camera::copyToVector");
+              t("public flash.media.Camera::copyToVector");
             };
             c.classInitializer = null;
             c.initializer = null;
@@ -37863,9 +39551,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.media.ID3Info");
+              q("public flash.media.ID3Info");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -37874,7 +39562,7 @@
             c.instanceSymbols = "songName artist album year comment genre track".split(" ");
             return c;
           }(a.ASNative);
-          k.ID3Info = t;
+          k.ID3Info = u;
         })(k.media || (k.media = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -37885,100 +39573,100 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = d.Debug.dummyConstructor, c = d.AVM2.Runtime.asCoerceString, h = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = d.Debug.dummyConstructor, c = d.AVM2.Runtime.asCoerceString, h = function(a) {
             function d() {
               l("public flash.media.Microphone");
             }
             __extends(d, a);
             Object.defineProperty(d, "names", {get:function() {
-              t("public flash.media.Microphone::get names");
+              u("public flash.media.Microphone::get names");
               return[];
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "isSupported", {get:function() {
-              t("public flash.media.Microphone::get isSupported");
+              u("public flash.media.Microphone::get isSupported");
               return!1;
             }, enumerable:!0, configurable:!0});
             d.getMicrophone = function(a) {
-              u("public flash.media.Microphone::static getMicrophone");
+              t("public flash.media.Microphone::static getMicrophone");
             };
             d.getEnhancedMicrophone = function(a) {
-              u("public flash.media.Microphone::static getEnhancedMicrophone");
+              t("public flash.media.Microphone::static getEnhancedMicrophone");
             };
             Object.defineProperty(d.prototype, "rate", {get:function() {
-              u("public flash.media.Microphone::get rate");
+              t("public flash.media.Microphone::get rate");
             }, set:function(a) {
-              u("public flash.media.Microphone::set rate");
+              t("public flash.media.Microphone::set rate");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "codec", {get:function() {
-              u("public flash.media.Microphone::get codec");
+              t("public flash.media.Microphone::get codec");
             }, set:function(a) {
               c(a);
-              u("public flash.media.Microphone::set codec");
+              t("public flash.media.Microphone::set codec");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "framesPerPacket", {get:function() {
-              u("public flash.media.Microphone::get framesPerPacket");
+              t("public flash.media.Microphone::get framesPerPacket");
             }, set:function(a) {
-              u("public flash.media.Microphone::set framesPerPacket");
+              t("public flash.media.Microphone::set framesPerPacket");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "encodeQuality", {get:function() {
-              u("public flash.media.Microphone::get encodeQuality");
+              t("public flash.media.Microphone::get encodeQuality");
             }, set:function(a) {
-              u("public flash.media.Microphone::set encodeQuality");
+              t("public flash.media.Microphone::set encodeQuality");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "noiseSuppressionLevel", {get:function() {
-              u("public flash.media.Microphone::get noiseSuppressionLevel");
+              t("public flash.media.Microphone::get noiseSuppressionLevel");
             }, set:function(a) {
-              u("public flash.media.Microphone::set noiseSuppressionLevel");
+              t("public flash.media.Microphone::set noiseSuppressionLevel");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "enableVAD", {get:function() {
-              u("public flash.media.Microphone::get enableVAD");
+              t("public flash.media.Microphone::get enableVAD");
             }, set:function(a) {
-              u("public flash.media.Microphone::set enableVAD");
+              t("public flash.media.Microphone::set enableVAD");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "activityLevel", {get:function() {
-              u("public flash.media.Microphone::get activityLevel");
+              t("public flash.media.Microphone::get activityLevel");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "gain", {get:function() {
-              u("public flash.media.Microphone::get gain");
+              t("public flash.media.Microphone::get gain");
             }, set:function(a) {
-              u("public flash.media.Microphone::set gain");
+              t("public flash.media.Microphone::set gain");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "index", {get:function() {
-              u("public flash.media.Microphone::get index");
+              t("public flash.media.Microphone::get index");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "muted", {get:function() {
-              u("public flash.media.Microphone::get muted");
+              t("public flash.media.Microphone::get muted");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "name", {get:function() {
-              u("public flash.media.Microphone::get name");
+              t("public flash.media.Microphone::get name");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "silenceLevel", {get:function() {
-              u("public flash.media.Microphone::get silenceLevel");
+              t("public flash.media.Microphone::get silenceLevel");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "silenceTimeout", {get:function() {
-              u("public flash.media.Microphone::get silenceTimeout");
+              t("public flash.media.Microphone::get silenceTimeout");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "useEchoSuppression", {get:function() {
-              u("public flash.media.Microphone::get useEchoSuppression");
+              t("public flash.media.Microphone::get useEchoSuppression");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "soundTransform", {get:function() {
-              u("public flash.media.Microphone::get soundTransform");
+              t("public flash.media.Microphone::get soundTransform");
             }, set:function(a) {
-              u("public flash.media.Microphone::set soundTransform");
+              t("public flash.media.Microphone::set soundTransform");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "enhancedOptions", {get:function() {
-              u("public flash.media.Microphone::get enhancedOptions");
+              t("public flash.media.Microphone::get enhancedOptions");
             }, set:function(a) {
-              u("public flash.media.Microphone::set enhancedOptions");
+              t("public flash.media.Microphone::set enhancedOptions");
             }, enumerable:!0, configurable:!0});
             d.prototype.setSilenceLevel = function(a, c) {
-              u("public flash.media.Microphone::setSilenceLevel");
+              t("public flash.media.Microphone::setSilenceLevel");
             };
             d.prototype.setUseEchoSuppression = function(a) {
-              u("public flash.media.Microphone::setUseEchoSuppression");
+              t("public flash.media.Microphone::setUseEchoSuppression");
             };
             d.prototype.setLoopBack = function(a) {
-              u("public flash.media.Microphone::setLoopBack");
+              t("public flash.media.Microphone::setLoopBack");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -37997,13 +39685,13 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          function u(a, c) {
+          function t(a, c) {
             var b = document.createElement("audio");
             b.canPlayType(a.mimeType) ? (b.preload = "metadata", b.src = URL.createObjectURL(new Blob([a.data], {type:a.mimeType})), b.load(), b.addEventListener("loadedmetadata", function() {
               c({duration:1E3 * this.duration});
             })) : c({duration:0});
           }
-          var t = d.Debug.notImplemented, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.Telemetry, p = d.AVM2.ABC.Multiname, s = function() {
+          var u = d.Debug.notImplemented, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.Telemetry, p = d.AVM2.ABC.Multiname, s = function() {
             return function() {
             };
           }(), m = function(g) {
@@ -38037,12 +39725,12 @@
               return this._id3;
             }, enumerable:!0, configurable:!0});
             f.prototype.loadCompressedDataFromByteArray = function(a, e) {
-              t("public flash.media.Sound::loadCompressedDataFromByteArray");
+              u("public flash.media.Sound::loadCompressedDataFromByteArray");
             };
             f.prototype.loadPCMFromByteArray = function(a, e, c, f, d) {
               void 0 === c && (c = "float");
               l(c);
-              t("public flash.media.Sound::loadPCMFromByteArray");
+              u("public flash.media.Sound::loadPCMFromByteArray");
             };
             f.prototype.play = function(b, e, c) {
               void 0 === b && (b = 0);
@@ -38070,7 +39758,7 @@
               c("public flash.media.Sound::close");
             };
             f.prototype.extract = function(a, e, c) {
-              t("public flash.media.Sound::extract");
+              u("public flash.media.Sound::extract");
             };
             f.prototype.load = function(b, e) {
               if (b) {
@@ -38096,7 +39784,7 @@
                   m.data = d._buffer;
                   m.mimeType = "audio/mpeg";
                   m.completed = !0;
-                  h || (c._soundData = m, u(m, function(a) {
+                  h || (c._soundData = m, t(m, function(a) {
                     c._length = a.duration;
                   }), c._playQueue.forEach(function(a) {
                     a.channel._playSoundDataViaAudio(m, a.startTime);
@@ -38121,7 +39809,7 @@
                 a.pcm && (e.pcm = a.pcm, e.end = a.pcm.length);
                 a.packaged && (e.data = a.packaged.data.buffer, e.mimeType = a.packaged.mimeType);
                 var c = this;
-                u(e, function(a) {
+                t(e, function(a) {
                   c._length = a.duration;
                 });
                 this._soundData = e;
@@ -38158,7 +39846,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = d.Debug.somewhatImplemented, l = d.Debug.error, c = function() {
+          var t = d.Debug.dummyConstructor, u = d.Debug.somewhatImplemented, l = d.Debug.error, c = function() {
             function a(c, d) {
               this._sourceRate = c;
               this._targetRate = d;
@@ -38172,8 +39860,8 @@
               this.ondatarequested({data:d, count:e});
               for (h = 0;h < a.length;h++) {
                 for (var l = a[h], k = d[h], p = 0;p < c;p++) {
-                  var s = p * f + b, r = s | 0, u = Math.ceil(s) | 0, t = 0 > r ? this._tail[h] : k[r];
-                  r === u ? l[p] = t : (s -= r, l[p] = t * (1 - s) + k[u] * s);
+                  var s = p * f + b, q = s | 0, t = Math.ceil(s) | 0, u = 0 > q ? this._tail[h] : k[q];
+                  q === t ? l[p] = u : (s -= q, l[p] = u * (1 - s) + k[t] * s);
                 }
                 this._tail[h] = k[e - 1];
               }
@@ -38224,7 +39912,7 @@
             return a;
           }(), p = function(c) {
             function m() {
-              u("public flash.media.SoundChannel");
+              t("public flash.media.SoundChannel");
             }
             __extends(m, c);
             Object.defineProperty(m.prototype, "position", {get:function() {
@@ -38233,7 +39921,7 @@
             Object.defineProperty(m.prototype, "soundTransform", {get:function() {
               return this._soundTransform;
             }, set:function(c) {
-              t("public flash.media.SoundChannel::set soundTransform");
+              u("public flash.media.SoundChannel::set soundTransform");
               this._soundTransform = d.isNullOrUndefined(c) ? new a.media.SoundTransform : c;
               k.SoundMixer._updateSoundSource(this);
             }, enumerable:!0, configurable:!0});
@@ -38268,32 +39956,32 @@
             };
             m.prototype._playSoundDataViaChannel = function(c, f, b) {
               k.SoundMixer._registerSoundSource(this);
-              var e = this, d = Math.round(f / 1E3 * c.sampleRate) * c.channels, n = d;
+              var e = this, d = Math.round(f / 1E3 * c.sampleRate) * c.channels, m = d;
               this._position = f;
               h.isSupported ? f = new h(c.sampleRate, c.channels) : (l("PCM data playback is not supported by the browser"), f = void 0);
               this._audioChannel = f;
               this._audioChannel.ondatarequested = function(f) {
                 var h = c.end;
-                if (n >= h && c.completed) {
+                if (m >= h && c.completed) {
                   k.SoundMixer._unregisterSoundSource(this), e._audioChannel.stop(), e.dispatchEvent(new a.events.Event("soundComplete", !1, !1));
                 } else {
                   var l = f.count;
                   f = f.data;
-                  var m = c.pcm;
+                  var p = c.pcm;
                   do {
-                    for (var p = Math.min(h - n, l), s = 0;s < p;s++) {
-                      f[s] = m[n++];
+                    for (var s = Math.min(h - m, l), t = 0;t < s;t++) {
+                      f[t] = p[m++];
                     }
-                    l -= p;
-                    if (n >= h) {
+                    l -= s;
+                    if (m >= h) {
                       if (!b) {
                         break;
                       }
                       b--;
-                      n = d;
+                      m = d;
                     }
                   } while (0 < l);
-                  e._position = n / c.sampleRate / c.channels * 1E3;
+                  e._position = m / c.sampleRate / c.channels * 1E3;
                 }
               };
               this._audioChannel.start();
@@ -38328,9 +40016,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c(a, c) {
-              r("public flash.media.SoundLoaderContext");
+              q("public flash.media.SoundLoaderContext");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -38339,7 +40027,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.SoundLoaderContext = t;
+          k.SoundLoaderContext = u;
         })(k.media || (k.media = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -38350,13 +40038,13 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = function(a) {
             function h() {
-              t("public flash.media.SoundMixer");
+              u("public flash.media.SoundMixer");
             }
             __extends(h, a);
             Object.defineProperty(h, "bufferTime", {get:function() {
-              u("public flash.media.SoundMixer::get bufferTime");
+              t("public flash.media.SoundMixer::get bufferTime");
               return h._bufferTime;
             }, set:function(a) {
               c("public flash.media.SoundMixer::set bufferTime");
@@ -38371,15 +40059,15 @@
               h._updateAllSoundSources();
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h, "audioPlaybackMode", {get:function() {
-              u("public flash.media.SoundMixer::get audioPlaybackMode");
+              t("public flash.media.SoundMixer::get audioPlaybackMode");
             }, set:function(a) {
               l(a);
-              u("public flash.media.SoundMixer::set audioPlaybackMode");
+              t("public flash.media.SoundMixer::set audioPlaybackMode");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h, "useSpeakerphoneForVoice", {get:function() {
-              u("public flash.media.SoundMixer::get useSpeakerphoneForVoice");
+              t("public flash.media.SoundMixer::get useSpeakerphoneForVoice");
             }, set:function(a) {
-              u("public flash.media.SoundMixer::set useSpeakerphoneForVoice");
+              t("public flash.media.SoundMixer::set useSpeakerphoneForVoice");
             }, enumerable:!0, configurable:!0});
             h.stopAll = function() {
               h._registeredSoundSources.forEach(function(a) {
@@ -38397,7 +40085,7 @@
               a.position = 0;
             };
             h.areSoundsInaccessible = function() {
-              u("public flash.media.SoundMixer::static areSoundsInaccessible");
+              t("public flash.media.SoundMixer::static areSoundsInaccessible");
             };
             h._getMasterVolume = function() {
               return h._masterVolume;
@@ -38442,9 +40130,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = d.Debug.somewhatImplemented, l = function(a) {
+          var q = d.Debug.dummyConstructor, u = d.Debug.somewhatImplemented, l = function(a) {
             function d(a, c) {
-              r("public flash.media.SoundTransform");
+              q("public flash.media.SoundTransform");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "volume", {get:function() {
@@ -38486,7 +40174,7 @@
               this.rightToLeft = 0;
             }, enumerable:!0, configurable:!0});
             d.prototype._updateTransform = function() {
-              t("public flash.media.SoundTransform::_updateTransform");
+              u("public flash.media.SoundTransform::_updateTransform");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -38505,45 +40193,45 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.media.StageVideo");
+              u("public flash.media.StageVideo");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "viewPort", {get:function() {
-              u("public flash.media.StageVideo::get viewPort");
+              t("public flash.media.StageVideo::get viewPort");
             }, set:function(a) {
-              u("public flash.media.StageVideo::set viewPort");
+              t("public flash.media.StageVideo::set viewPort");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "pan", {get:function() {
-              u("public flash.media.StageVideo::get pan");
+              t("public flash.media.StageVideo::get pan");
             }, set:function(a) {
-              u("public flash.media.StageVideo::set pan");
+              t("public flash.media.StageVideo::set pan");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "zoom", {get:function() {
-              u("public flash.media.StageVideo::get zoom");
+              t("public flash.media.StageVideo::get zoom");
             }, set:function(a) {
-              u("public flash.media.StageVideo::set zoom");
+              t("public flash.media.StageVideo::set zoom");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "depth", {get:function() {
-              u("public flash.media.StageVideo::get depth");
+              t("public flash.media.StageVideo::get depth");
             }, set:function(a) {
-              u("public flash.media.StageVideo::set depth");
+              t("public flash.media.StageVideo::set depth");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "videoWidth", {get:function() {
-              u("public flash.media.StageVideo::get videoWidth");
+              t("public flash.media.StageVideo::get videoWidth");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "videoHeight", {get:function() {
-              u("public flash.media.StageVideo::get videoHeight");
+              t("public flash.media.StageVideo::get videoHeight");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "colorSpaces", {get:function() {
-              u("public flash.media.StageVideo::get colorSpaces");
+              t("public flash.media.StageVideo::get colorSpaces");
             }, enumerable:!0, configurable:!0});
             d.prototype.attachNetStream = function(a) {
-              u("public flash.media.StageVideo::attachNetStream");
+              t("public flash.media.StageVideo::attachNetStream");
             };
             d.prototype.attachCamera = function(a) {
-              u("public flash.media.StageVideo::attachCamera");
+              t("public flash.media.StageVideo::attachCamera");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -38562,9 +40250,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.media.StageVideoAvailability");
+              q("public flash.media.StageVideoAvailability");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -38575,7 +40263,7 @@
             c.UNAVAILABLE = "unavailable";
             return c;
           }(a.ASNative);
-          k.StageVideoAvailability = t;
+          k.StageVideoAvailability = u;
         })(k.media || (k.media = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -38586,7 +40274,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = function(c) {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = function(c) {
             function d(c, h) {
               void 0 === c && (c = 320);
               void 0 === h && (h = 240);
@@ -38616,7 +40304,7 @@
               return!0;
             };
             d.prototype.clear = function() {
-              t("public flash.media.Video::clear");
+              u("public flash.media.Video::clear");
             };
             d.prototype.attachNetStream = function(a) {
               if (this._netStream !== a) {
@@ -38628,7 +40316,7 @@
               }
             };
             d.prototype.attachCamera = function(a) {
-              u("public flash.media.Video::attachCamera");
+              t("public flash.media.Video::attachCamera");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -38647,9 +40335,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.media.VideoStreamSettings");
+              q("public flash.media.VideoStreamSettings");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -38658,7 +40346,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.VideoStreamSettings = t;
+          k.VideoStreamSettings = u;
         })(k.media || (k.media = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -38669,25 +40357,25 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = d.AVM2.Runtime.asCoerceString, l = function(a) {
+          var q = d.Debug.dummyConstructor, u = d.AVM2.Runtime.asCoerceString, l = function(a) {
             function d(a, c, h) {
-              r("public flash.net.FileFilter");
+              q("public flash.net.FileFilter");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "description", {get:function() {
               return this._description;
             }, set:function(a) {
-              this._description = t(a);
+              this._description = u(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "extension", {get:function() {
               return this._extension;
             }, set:function(a) {
-              this._extension = t(a);
+              this._extension = u(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "macType", {get:function() {
               return this._macType;
             }, set:function(a) {
-              this._macType = t(a);
+              this._macType = u(a);
             }, enumerable:!0, configurable:!0});
             d.classInitializer = null;
             d.initializer = null;
@@ -38706,17 +40394,17 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.FileLoadingService, p = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.FileLoadingService, p = function(a) {
             function d() {
-              t("public flash.net.LocalConnection");
+              u("public flash.net.LocalConnection");
             }
             __extends(d, a);
             d.prototype.close = function() {
-              u("public flash.net.LocalConnection::close");
+              t("public flash.net.LocalConnection::close");
             };
             d.prototype.connect = function(a) {
               l(a);
-              u("public flash.net.LocalConnection::connect");
+              t("public flash.net.LocalConnection::connect");
             };
             Object.defineProperty(d.prototype, "domain", {get:function() {
               c("public flash.net.LocalConnection::get domain");
@@ -38726,23 +40414,23 @@
             d.prototype.send = function(a, c) {
               l(a);
               l(c);
-              u("public flash.net.LocalConnection::send");
+              t("public flash.net.LocalConnection::send");
             };
             Object.defineProperty(d.prototype, "client", {get:function() {
-              u("public flash.net.LocalConnection::get client");
+              t("public flash.net.LocalConnection::get client");
             }, set:function(a) {
-              u("public flash.net.LocalConnection::set client");
+              t("public flash.net.LocalConnection::set client");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "isPerUser", {get:function() {
-              u("public flash.net.LocalConnection::get isPerUser");
+              t("public flash.net.LocalConnection::get isPerUser");
             }, set:function(a) {
-              u("public flash.net.LocalConnection::set isPerUser");
+              t("public flash.net.LocalConnection::set isPerUser");
             }, enumerable:!0, configurable:!0});
             d.prototype.allowDomain = function() {
-              u("public flash.net.LocalConnection::allowDomain");
+              t("public flash.net.LocalConnection::allowDomain");
             };
             d.prototype.allowInsecureDomain = function() {
-              u("public flash.net.LocalConnection::allowInsecureDomain");
+              t("public flash.net.LocalConnection::allowInsecureDomain");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -38761,9 +40449,9 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.AVM2.Runtime.wrapJSObject, p = d.Telemetry, s = d.AVM2.AS.flash.events, m = function(g) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.AVM2.Runtime.wrapJSObject, p = d.Telemetry, s = d.AVM2.AS.flash.events, m = function(g) {
             function f() {
-              t("public flash.net.NetConnection");
+              u("public flash.net.NetConnection");
             }
             __extends(f, g);
             Object.defineProperty(f, "defaultObjectEncoding", {get:function() {
@@ -38836,7 +40524,7 @@
               this._proxyType = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "connectedProxyType", {get:function() {
-              u("public flash.net.NetConnection::get connectedProxyType");
+              t("public flash.net.NetConnection::get connectedProxyType");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "usingTLS", {get:function() {
               return this._usingTLS;
@@ -38845,24 +40533,24 @@
               return this._protocol;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "maxPeerConnections", {get:function() {
-              u("public flash.net.NetConnection::get maxPeerConnections");
+              t("public flash.net.NetConnection::get maxPeerConnections");
             }, set:function(a) {
-              u("public flash.net.NetConnection::set maxPeerConnections");
+              t("public flash.net.NetConnection::set maxPeerConnections");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "nearID", {get:function() {
-              u("public flash.net.NetConnection::get nearID");
+              t("public flash.net.NetConnection::get nearID");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "farID", {get:function() {
-              u("public flash.net.NetConnection::get farID");
+              t("public flash.net.NetConnection::get farID");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "nearNonce", {get:function() {
-              u("public flash.net.NetConnection::get nearNonce");
+              t("public flash.net.NetConnection::get nearNonce");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "farNonce", {get:function() {
-              u("public flash.net.NetConnection::get farNonce");
+              t("public flash.net.NetConnection::get farNonce");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "unconnectedPeerStreams", {get:function() {
-              u("public flash.net.NetConnection::get unconnectedPeerStreams");
+              t("public flash.net.NetConnection::get unconnectedPeerStreams");
             }, enumerable:!0, configurable:!0});
             f.prototype.ctor = function() {
               this._uri = null;
@@ -38886,7 +40574,7 @@
                 case 2:
                   f = !0;
               }
-              (f ? c : u)("private flash.net.NetConnection::_invoke (" + a + ")");
+              (f ? c : t)("private flash.net.NetConnection::_invoke (" + a + ")");
             };
             f.classInitializer = null;
             f.initializer = null;
@@ -38906,12 +40594,12 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          function u(a) {
+          function t(a) {
             var b = "video/mp4";
             a && (b += ';codecs="' + a.join(",") + '"');
             return b;
           }
-          var t = d.Debug.notImplemented, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.AVM2.Runtime.wrapJSObject, p = d.AVM2.AS.flash.events;
+          var u = d.Debug.notImplemented, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.AVM2.Runtime.wrapJSObject, p = d.AVM2.AS.flash.events;
           v = d.AVM2.AS.flash.net;
           var s = d.AVM2.AS.flash.utils, m = d.FileLoadingService, g = d.AVM2.Runtime.AVM2, f = function(a) {
             function b(a, c) {
@@ -38924,7 +40612,7 @@
               this._soundTransform = new k.media.SoundTransform;
               this._contentTypeHint = null;
               this._checkPolicyFile = !0;
-              this._videoStream = new e;
+              this._videoStream = new e(this);
               this._videoStream._onEnsurePlay = function() {
                 this._notifyVideoControl(9, null);
               }.bind(this);
@@ -38932,7 +40620,7 @@
             }
             __extends(b, a);
             b.prototype.dispose = function() {
-              t("public flash.net.NetStream::dispose");
+              u("public flash.net.NetStream::dispose");
             };
             b.prototype._getVideoStreamURL = function() {
               return this._videoStream.url;
@@ -38945,7 +40633,7 @@
               this._notifyVideoControl(1, {url:this._videoStream.url});
             };
             b.prototype.play2 = function(a) {
-              t("public flash.net.NetStream::play2");
+              u("public flash.net.NetStream::play2");
             };
             Object.defineProperty(b.prototype, "info", {get:function() {
               c("public flash.net.NetStream::get info");
@@ -38953,7 +40641,7 @@
               return new v.NetStreamInfo(232, 233 * (1 + a), 232, 32, 32 * (1 + a), 200, 200 * (1 + a), 1, 1 * (1 + a), 233 * a, 0, 32, 200, 1, 1, 1, 1, 0, 0, 0, this._metaData, null, this._connection.uri, this._resourceName, !1);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "multicastInfo", {get:function() {
-              t("public flash.net.NetStream::get multicastInfo");
+              u("public flash.net.NetStream::get multicastInfo");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "soundTransform", {get:function() {
               return this._soundTransform;
@@ -38973,74 +40661,74 @@
               this._client = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "objectEncoding", {get:function() {
-              t("public flash.net.NetStream::get objectEncoding");
+              u("public flash.net.NetStream::get objectEncoding");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "multicastPushNeighborLimit", {get:function() {
-              t("public flash.net.NetStream::get multicastPushNeighborLimit");
+              u("public flash.net.NetStream::get multicastPushNeighborLimit");
             }, set:function(a) {
-              t("public flash.net.NetStream::set multicastPushNeighborLimit");
+              u("public flash.net.NetStream::set multicastPushNeighborLimit");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "multicastWindowDuration", {get:function() {
-              t("public flash.net.NetStream::get multicastWindowDuration");
+              u("public flash.net.NetStream::get multicastWindowDuration");
             }, set:function(a) {
-              t("public flash.net.NetStream::set multicastWindowDuration");
+              u("public flash.net.NetStream::set multicastWindowDuration");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "multicastRelayMarginDuration", {get:function() {
-              t("public flash.net.NetStream::get multicastRelayMarginDuration");
+              u("public flash.net.NetStream::get multicastRelayMarginDuration");
             }, set:function(a) {
-              t("public flash.net.NetStream::set multicastRelayMarginDuration");
+              u("public flash.net.NetStream::set multicastRelayMarginDuration");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "multicastAvailabilityUpdatePeriod", {get:function() {
-              t("public flash.net.NetStream::get multicastAvailabilityUpdatePeriod");
+              u("public flash.net.NetStream::get multicastAvailabilityUpdatePeriod");
             }, set:function(a) {
-              t("public flash.net.NetStream::set multicastAvailabilityUpdatePeriod");
+              u("public flash.net.NetStream::set multicastAvailabilityUpdatePeriod");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "multicastFetchPeriod", {get:function() {
-              t("public flash.net.NetStream::get multicastFetchPeriod");
+              u("public flash.net.NetStream::get multicastFetchPeriod");
             }, set:function(a) {
-              t("public flash.net.NetStream::set multicastFetchPeriod");
+              u("public flash.net.NetStream::set multicastFetchPeriod");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "multicastAvailabilitySendToAll", {get:function() {
-              t("public flash.net.NetStream::get multicastAvailabilitySendToAll");
+              u("public flash.net.NetStream::get multicastAvailabilitySendToAll");
             }, set:function(a) {
-              t("public flash.net.NetStream::set multicastAvailabilitySendToAll");
+              u("public flash.net.NetStream::set multicastAvailabilitySendToAll");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "farID", {get:function() {
-              t("public flash.net.NetStream::get farID");
+              u("public flash.net.NetStream::get farID");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "nearNonce", {get:function() {
-              t("public flash.net.NetStream::get nearNonce");
+              u("public flash.net.NetStream::get nearNonce");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "farNonce", {get:function() {
-              t("public flash.net.NetStream::get farNonce");
+              u("public flash.net.NetStream::get farNonce");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "peerStreams", {get:function() {
-              t("public flash.net.NetStream::get peerStreams");
+              u("public flash.net.NetStream::get peerStreams");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "audioReliable", {get:function() {
-              t("public flash.net.NetStream::get audioReliable");
+              u("public flash.net.NetStream::get audioReliable");
             }, set:function(a) {
-              t("public flash.net.NetStream::set audioReliable");
+              u("public flash.net.NetStream::set audioReliable");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "videoReliable", {get:function() {
-              t("public flash.net.NetStream::get videoReliable");
+              u("public flash.net.NetStream::get videoReliable");
             }, set:function(a) {
-              t("public flash.net.NetStream::set videoReliable");
+              u("public flash.net.NetStream::set videoReliable");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "dataReliable", {get:function() {
-              t("public flash.net.NetStream::get dataReliable");
+              u("public flash.net.NetStream::get dataReliable");
             }, set:function(a) {
-              t("public flash.net.NetStream::set dataReliable");
+              u("public flash.net.NetStream::set dataReliable");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "audioSampleAccess", {get:function() {
-              t("public flash.net.NetStream::get audioSampleAccess");
+              u("public flash.net.NetStream::get audioSampleAccess");
             }, set:function(a) {
-              t("public flash.net.NetStream::set audioSampleAccess");
+              u("public flash.net.NetStream::set audioSampleAccess");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "videoSampleAccess", {get:function() {
-              t("public flash.net.NetStream::get videoSampleAccess");
+              u("public flash.net.NetStream::get videoSampleAccess");
             }, set:function(a) {
-              t("public flash.net.NetStream::set videoSampleAccess");
+              u("public flash.net.NetStream::set videoSampleAccess");
             }, enumerable:!0, configurable:!0});
             b.prototype.appendBytes = function(a) {
               a = new Uint8Array(a._buffer, 0, a.length);
@@ -39050,19 +40738,19 @@
               this._videoStream.appendBytesAction(a);
             };
             Object.defineProperty(b.prototype, "useHardwareDecoder", {get:function() {
-              t("public flash.net.NetStream::get useHardwareDecoder");
+              u("public flash.net.NetStream::get useHardwareDecoder");
             }, set:function(a) {
-              t("public flash.net.NetStream::set useHardwareDecoder");
+              u("public flash.net.NetStream::set useHardwareDecoder");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "useJitterBuffer", {get:function() {
-              t("public flash.net.NetStream::get useJitterBuffer");
+              u("public flash.net.NetStream::get useJitterBuffer");
             }, set:function(a) {
-              t("public flash.net.NetStream::set useJitterBuffer");
+              u("public flash.net.NetStream::set useJitterBuffer");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(b.prototype, "videoStreamSettings", {get:function() {
-              t("public flash.net.NetStream::get videoStreamSettings");
+              u("public flash.net.NetStream::get videoStreamSettings");
             }, set:function(a) {
-              t("public flash.net.NetStream::set videoStreamSettings");
+              u("public flash.net.NetStream::set videoStreamSettings");
             }, enumerable:!0, configurable:!0});
             b.prototype.invoke = function(a) {
               return this._invoke(a >>> 0, Array.prototype.slice.call(arguments, 1));
@@ -39111,7 +40799,7 @@
                 case 306:
                   f = this._notifyVideoControl(8, null), e = !0;
               }
-              (e ? c : t)("NetStream._invoke (" + a + ")");
+              (e ? c : u)("NetStream._invoke (" + a + ")");
               return f;
             };
             b.prototype._notifyVideoControl = function(a, b) {
@@ -39187,7 +40875,7 @@
             a[a.ERROR = 4] = "ERROR";
           })(b || (b = {}));
           var e = function() {
-            function b() {
+            function b(a) {
               this._domReady = new d.PromiseWrapper;
               this._metadataReady = new d.PromiseWrapper;
               this._started = !1;
@@ -39196,6 +40884,7 @@
               this._contentTypeHint = this._mediaSourceBufferLock = this._mediaSourceBuffer = this._mediaSource = this._url = null;
               this._state = 0;
               this._head = null;
+              this._netStream = a;
             }
             Object.defineProperty(b.prototype, "state", {get:function() {
               return this._state;
@@ -39207,29 +40896,44 @@
               return this._url;
             }, enumerable:!0, configurable:!0});
             b.prototype.play = function(b, e) {
-              var f = a.mediaSourceOption.value;
-              f && "undefined" === typeof MediaSource && (console.warn("MediaSource API is not enabled, falling back to regular playback"), f = !1);
-              if (/\.flv($|\?)/i.test(b) || f) {
+              var f = this, d = a.mediaSourceOption.value;
+              d && "undefined" === typeof MediaSource && (console.warn("MediaSource API is not enabled, falling back to regular playback"), d = !1);
+              var g = !1;
+              if (/\.flv($|\?)/i.test(b)) {
+                if ("supported" === a.flvOption.value) {
+                  g = !0;
+                } else {
+                  if ("mock" === a.flvOption.value) {
+                    b = "resource://shumway/web/noflv.mp4";
+                  } else {
+                    setTimeout(function() {
+                      f._netStream.dispatchEvent(new p.NetStatusEvent(p.NetStatusEvent.NET_STATUS, !1, !1, h({code:"NetStream.Play.NoSupportedTrackFound", level:"error"})));
+                    });
+                    return;
+                  }
+                }
+              }
+              if (g || d) {
                 this.openInDataGenerationMode();
-                f = new v.URLRequest(b);
-                f._checkPolicyFile = e;
-                var d = new v.URLStream;
-                d.addEventListener("httpStatus", function(a) {
+                d = new v.URLRequest(b);
+                d._checkPolicyFile = e;
+                var n = new v.URLStream;
+                n.addEventListener("httpStatus", function(a) {
                   (a = a.asGetPublicProperty("responseHeaders").filter(function(a) {
                     return "Content-Type" === a.asGetPublicProperty("name");
                   })[0]) && a.asGetPublicProperty("value");
                 }.bind(this));
-                d.addEventListener("progress", function(a) {
-                  a = d.bytesAvailable;
+                n.addEventListener("progress", function(a) {
+                  a = n.bytesAvailable;
                   var b = new s.ByteArray;
-                  d.readBytes(b, 0, a);
+                  n.readBytes(b, 0, a);
                   a = new Uint8Array(b._buffer, 0, b.length);
                   this.appendBytes(a);
                 }.bind(this));
-                d.addEventListener("complete", function(a) {
+                n.addEventListener("complete", function(a) {
                   this.appendBytesAction("endSequence");
                 }.bind(this));
-                d.load(f);
+                n.load(d);
               } else {
                 c("public flash.net.NetStream::play"), this._state = 1, this._url = m.instance.resolveUrl(b);
               }
@@ -39239,7 +40943,7 @@
               var e = this, c, f = {packets:0, init:function(a) {
                 if (a.asGetPublicProperty("audiocodecid") || a.asGetPublicProperty("videocodecid")) {
                   a = RtmpJs.MP4.parseFLVMetadata(a), c = new RtmpJs.MP4.MP4Mux(a), c.oncodecinfo = function(a) {
-                    this._contentTypeHint = u(a);
+                    this._contentTypeHint = t(a);
                   }, c.ondata = function(a) {
                     e.appendBytes(new Uint8Array(a));
                   }.bind(this);
@@ -39284,7 +40988,7 @@
                 null !== this._head ? (b = this._head.length, e = new Uint8Array(b + a.length), e.set(a, b)) : (b = 0, e = a);
                 if (!this._decoder) {
                   var c = this._detectContentType(e);
-                  "video/x-flv" === c ? (c = new q, c.onHeader = function(a) {
+                  "video/x-flv" === c ? (c = new n, c.onHeader = function(a) {
                     this._mediaSourceBuffer = this._mediaSource.addSourceBuffer(a);
                     this._mediaSourceBufferLock = Promise.resolve(void 0);
                   }.bind(this), c.onData = this._queueData.bind(this), this._decoder = c) : c && (this._decoder = {onData:this._queueData.bind(this), onError:function(a) {
@@ -39359,7 +41063,7 @@
               }
             };
             return b;
-          }(), q = function() {
+          }(), n = function() {
             function a() {
               this._flvParser = new RtmpJs.FLV.FLVParser;
               this._flvParser.onHeader = this._onFlvHeader.bind(this);
@@ -39378,7 +41082,7 @@
                 a = d.AVM2.AMF0.read(b);
                 b = d.AVM2.AMF0.read(b);
                 "onMetaData" === a && (b = RtmpJs.MP4.parseFLVMetadata(b), b = new RtmpJs.MP4.MP4Mux(b), b.oncodecinfo = function(a) {
-                  this.onHeader(u(a));
+                  this.onHeader(t(a));
                 }.bind(this), b.ondata = function(a) {
                   this.onData.call(null, a);
                 }.bind(this), this._mp4Mux = b);
@@ -39424,13 +41128,13 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = d.AVM2.Runtime.asCoerceString, l = function(a) {
-            function d(a, c, h, g, f, b, e, l, k, x, v, A, H, K, F, J, M, D, B, E, y, z, G, C, I) {
+          var q = d.Debug.dummyConstructor, u = d.AVM2.Runtime.asCoerceString, l = function(a) {
+            function d(a, c, h, g, f, b, e, n, l, k, v, C, F, K, E, Q, N, B, y, L, A, z, G, I, D) {
               void 0 === G && (G = null);
-              void 0 === C && (C = null);
-              t(G);
-              t(C);
-              r("public flash.net.NetStreamInfo");
+              void 0 === I && (I = null);
+              u(G);
+              u(I);
+              q("public flash.net.NetStreamInfo");
             }
             __extends(d, a);
             d.classInitializer = null;
@@ -39450,9 +41154,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
-            function c(a, c, d, l, g, f, b, e, k, n, t, v, A, H, K, F, J, M, D) {
-              r("public flash.net.NetStreamMulticastInfo");
+          var q = d.Debug.dummyConstructor, u = function(a) {
+            function c(a, c, d, l, g, f, b, e, n, k, u, v, C, F, K, E, Q, N, B) {
+              q("public flash.net.NetStreamMulticastInfo");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -39461,7 +41165,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.NetStreamMulticastInfo = t;
+          k.NetStreamMulticastInfo = u;
         })(k.net || (k.net = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -39472,9 +41176,9 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              u("public flash.net.NetStreamPlayOptions");
+              t("public flash.net.NetStreamPlayOptions");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -39483,7 +41187,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.events.EventDispatcher);
-          k.NetStreamPlayOptions = t;
+          k.NetStreamPlayOptions = u;
         })(a.net || (a.net = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -39494,9 +41198,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c(a, c) {
-              r("public flash.net.Responder");
+              q("public flash.net.Responder");
             }
             __extends(c, a);
             c.prototype.ctor = function(a, c) {
@@ -39509,7 +41213,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.Responder = t;
+          k.Responder = u;
         })(k.net || (k.net = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -39520,19 +41224,19 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.AVM2.Runtime.asCoerceString, l = d.Debug.somewhatImplemented, c = function(c) {
+          var t = d.Debug.notImplemented, u = d.AVM2.Runtime.asCoerceString, l = d.Debug.somewhatImplemented, c = function(c) {
             function k() {
               a.events.EventDispatcher.instanceConstructorNoInitialize.call(this);
               this._data = Object.create(null);
             }
             __extends(k, c);
             k.deleteAll = function(a) {
-              t(a);
-              u("public flash.net.SharedObject::static deleteAll");
+              u(a);
+              t("public flash.net.SharedObject::static deleteAll");
             };
             k.getDiskUsage = function(a) {
-              t(a);
-              u("public flash.net.SharedObject::static getDiskUsage");
+              u(a);
+              t("public flash.net.SharedObject::static getDiskUsage");
             };
             k._create = function(a, c) {
               var g = new k;
@@ -39544,8 +41248,8 @@
             };
             k.getLocal = function(a, c, d) {
               void 0 === c && (c = null);
-              a = t(a);
-              c = t(c);
+              a = u(a);
+              c = u(c);
               a = (c || "") + "/" + a;
               if (k._sharedObjects[a]) {
                 return k._sharedObjects[a];
@@ -39556,9 +41260,9 @@
             };
             k.getRemote = function(a, c, d, f) {
               void 0 === c && (c = null);
-              t(a);
-              t(c);
-              u("public flash.net.SharedObject::static getRemote");
+              u(a);
+              u(c);
+              t("public flash.net.SharedObject::static getRemote");
             };
             Object.defineProperty(k, "defaultObjectEncoding", {get:function() {
               return k._defaultObjectEncoding;
@@ -39574,12 +41278,12 @@
               this._objectEncoding = a >>> 0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(k.prototype, "client", {get:function() {
-              u("public flash.net.SharedObject::get client");
+              t("public flash.net.SharedObject::get client");
             }, set:function(a) {
-              u("public flash.net.SharedObject::set client");
+              t("public flash.net.SharedObject::set client");
             }, enumerable:!0, configurable:!0});
             k.prototype.setDirty = function(a) {
-              t(a);
+              u(a);
               l("public flash.net.SharedObject::setDirty");
             };
             k.prototype.invoke = function(a) {
@@ -39607,7 +41311,7 @@
                 case 3:
                   d = !0;
               }
-              (d ? l : u)("private flash.net.SharedObject::_invoke (" + a + ")");
+              (d ? l : t)("private flash.net.SharedObject::_invoke (" + a + ")");
               return f;
             };
             k.classInitializer = null;
@@ -39629,118 +41333,118 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.AVM2.Errors, p = d.AVM2.Runtime.throwError, s = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.AVM2.Errors, p = d.AVM2.Runtime.throwError, s = function(a) {
             function d(a, b) {
               void 0 === a && (a = null);
               l(a);
-              t("public flash.net.Socket");
+              u("public flash.net.Socket");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "bytesAvailable", {get:function() {
-              u("public flash.net.Socket::get bytesAvailable");
+              t("public flash.net.Socket::get bytesAvailable");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "connected", {get:function() {
-              u("public flash.net.Socket::get connected");
+              t("public flash.net.Socket::get connected");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "objectEncoding", {get:function() {
-              u("public flash.net.Socket::get objectEncoding");
+              t("public flash.net.Socket::get objectEncoding");
             }, set:function(a) {
-              u("public flash.net.Socket::set objectEncoding");
+              t("public flash.net.Socket::set objectEncoding");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "endian", {get:function() {
-              u("public flash.net.Socket::get endian");
+              t("public flash.net.Socket::get endian");
             }, set:function(a) {
               l(a);
-              u("public flash.net.Socket::set endian");
+              t("public flash.net.Socket::set endian");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "bytesPending", {get:function() {
-              u("public flash.net.Socket::get bytesPending");
+              t("public flash.net.Socket::get bytesPending");
             }, enumerable:!0, configurable:!0});
             d.prototype.readBytes = function(a, b, e) {
-              u("public flash.net.Socket::readBytes");
+              t("public flash.net.Socket::readBytes");
             };
             d.prototype.writeBytes = function(a, b, e) {
-              u("public flash.net.Socket::writeBytes");
+              t("public flash.net.Socket::writeBytes");
             };
             d.prototype.writeBoolean = function(a) {
-              u("public flash.net.Socket::writeBoolean");
+              t("public flash.net.Socket::writeBoolean");
             };
             d.prototype.writeByte = function(a) {
-              u("public flash.net.Socket::writeByte");
+              t("public flash.net.Socket::writeByte");
             };
             d.prototype.writeShort = function(a) {
-              u("public flash.net.Socket::writeShort");
+              t("public flash.net.Socket::writeShort");
             };
             d.prototype.writeInt = function(a) {
-              u("public flash.net.Socket::writeInt");
+              t("public flash.net.Socket::writeInt");
             };
             d.prototype.writeUnsignedInt = function(a) {
-              u("public flash.net.Socket::writeUnsignedInt");
+              t("public flash.net.Socket::writeUnsignedInt");
             };
             d.prototype.writeFloat = function(a) {
-              u("public flash.net.Socket::writeFloat");
+              t("public flash.net.Socket::writeFloat");
             };
             d.prototype.writeDouble = function(a) {
-              u("public flash.net.Socket::writeDouble");
+              t("public flash.net.Socket::writeDouble");
             };
             d.prototype.writeMultiByte = function(a, b) {
               l(a);
               l(b);
-              u("public flash.net.Socket::writeMultiByte");
+              t("public flash.net.Socket::writeMultiByte");
             };
             d.prototype.writeUTF = function(a) {
               l(a);
-              u("public flash.net.Socket::writeUTF");
+              t("public flash.net.Socket::writeUTF");
             };
             d.prototype.writeUTFBytes = function(a) {
               l(a);
-              u("public flash.net.Socket::writeUTFBytes");
+              t("public flash.net.Socket::writeUTFBytes");
             };
             d.prototype.readBoolean = function() {
-              u("public flash.net.Socket::readBoolean");
+              t("public flash.net.Socket::readBoolean");
             };
             d.prototype.readByte = function() {
-              u("public flash.net.Socket::readByte");
+              t("public flash.net.Socket::readByte");
             };
             d.prototype.readUnsignedByte = function() {
-              u("public flash.net.Socket::readUnsignedByte");
+              t("public flash.net.Socket::readUnsignedByte");
             };
             d.prototype.readShort = function() {
-              u("public flash.net.Socket::readShort");
+              t("public flash.net.Socket::readShort");
             };
             d.prototype.readUnsignedShort = function() {
-              u("public flash.net.Socket::readUnsignedShort");
+              t("public flash.net.Socket::readUnsignedShort");
             };
             d.prototype.readInt = function() {
-              u("public flash.net.Socket::readInt");
+              t("public flash.net.Socket::readInt");
             };
             d.prototype.readUnsignedInt = function() {
-              u("public flash.net.Socket::readUnsignedInt");
+              t("public flash.net.Socket::readUnsignedInt");
             };
             d.prototype.readFloat = function() {
-              u("public flash.net.Socket::readFloat");
+              t("public flash.net.Socket::readFloat");
             };
             d.prototype.readDouble = function() {
-              u("public flash.net.Socket::readDouble");
+              t("public flash.net.Socket::readDouble");
             };
             d.prototype.readMultiByte = function(a, b) {
               l(b);
-              u("public flash.net.Socket::readMultiByte");
+              t("public flash.net.Socket::readMultiByte");
             };
             d.prototype.readUTF = function() {
-              u("public flash.net.Socket::readUTF");
+              t("public flash.net.Socket::readUTF");
             };
             d.prototype.readUTFBytes = function(a) {
-              u("public flash.net.Socket::readUTFBytes");
+              t("public flash.net.Socket::readUTFBytes");
             };
             d.prototype.flush = function() {
-              u("public flash.net.Socket::flush");
+              t("public flash.net.Socket::flush");
             };
             d.prototype.writeObject = function(a) {
-              u("public flash.net.Socket::writeObject");
+              t("public flash.net.Socket::writeObject");
             };
             d.prototype.readObject = function() {
-              u("public flash.net.Socket::readObject");
+              t("public flash.net.Socket::readObject");
             };
             d.prototype.internalGetSecurityErrorMessage = function(a, b) {
               l(a);
@@ -39774,14 +41478,14 @@
     (function(a) {
       (function(a) {
         (function(d) {
-          var k = a.events.Event, t = a.events.IOErrorEvent, l = a.events.ProgressEvent, c = a.events.HTTPStatusEvent, h = a.events.SecurityErrorEvent, p = function(p) {
+          var k = a.events.Event, u = a.events.IOErrorEvent, l = a.events.ProgressEvent, c = a.events.HTTPStatusEvent, h = a.events.SecurityErrorEvent, p = function(p) {
             function m(g) {
               a.events.EventDispatcher.instanceConstructorNoInitialize.call(this);
               var f = this._stream = new d.URLStream;
               f.addEventListener(k.OPEN, this.onStreamOpen.bind(this));
               f.addEventListener(k.COMPLETE, this.onStreamComplete.bind(this));
               f.addEventListener(l.PROGRESS, this.onStreamProgress.bind(this));
-              f.addEventListener(t.IO_ERROR, this.onStreamIOError.bind(this));
+              f.addEventListener(u.IO_ERROR, this.onStreamIOError.bind(this));
               f.addEventListener(c.HTTP_STATUS, this.onStreamHTTPStatus.bind(this));
               f.addEventListener(c.HTTP_RESPONSE_STATUS, this.onStreamHTTPResponseStatus.bind(this));
               f.addEventListener(h.SECURITY_ERROR, this.onStreamSecurityError.bind(this));
@@ -39863,18 +41567,18 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
+      (function(q) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = d.AVM2.Runtime.throwError, l = function(a) {
+          var t = d.AVM2.Runtime.asCoerceString, u = d.AVM2.Runtime.throwError, l = function(a) {
             function d(a) {
               void 0 === a && (a = null);
-              this._url = u(a);
+              this._url = t(a);
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "url", {get:function() {
               return this._url;
             }, set:function(a) {
-              this._url = a = u(a);
+              this._url = a = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "data", {get:function() {
               return this._data;
@@ -39884,25 +41588,25 @@
             Object.defineProperty(d.prototype, "method", {get:function() {
               return this._method;
             }, set:function(a) {
-              a = u(a);
-              "get" !== a && "GET" !== a && "post" !== a && "POST" !== a && t("ArgumentError", k.Errors.InvalidArgumentError);
+              a = t(a);
+              "get" !== a && "GET" !== a && "post" !== a && "POST" !== a && u("ArgumentError", k.Errors.InvalidArgumentError);
               this._method = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "contentType", {get:function() {
               return this._contentType;
             }, set:function(a) {
-              this._contentType = a = u(a);
+              this._contentType = a = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "requestHeaders", {get:function() {
               return this._requestHeaders;
             }, set:function(a) {
-              Array.isArray(a) || t("ArgumentError", k.Errors.InvalidArgumentError, "value");
+              Array.isArray(a) || u("ArgumentError", k.Errors.InvalidArgumentError, "value");
               this._requestHeaders = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "digest", {get:function() {
               return this._digest;
             }, set:function(a) {
-              this._digest = a = u(a);
+              this._digest = a = t(a);
             }, enumerable:!0, configurable:!0});
             d.prototype._toFileRequest = function() {
               var a = {};
@@ -39910,7 +41614,7 @@
               a.method = this._method;
               a.checkPolicyFile = this._checkPolicyFile;
               if (this._data) {
-                if (a.mimeType = this._contentType, r.utils.ByteArray.isType(this._data)) {
+                if (a.mimeType = this._contentType, q.utils.ByteArray.isType(this._data)) {
                   a.data = new Uint8Array(this._data._buffer, 0, this._data.length);
                 } else {
                   var c = this._data.asGetPublicProperty("toString").call(this._data);
@@ -39938,7 +41642,7 @@
             return d;
           }(a.ASNative);
           v.URLRequest = l;
-        })(r.net || (r.net = {}));
+        })(q.net || (q.net = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -39948,12 +41652,12 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.AVM2.Runtime.asCoerceString, t = function(a) {
+          var q = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a, c) {
               void 0 === a && (a = "");
               void 0 === c && (c = "");
-              r(a);
-              r(c);
+              q(a);
+              q(c);
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -39962,7 +41666,7 @@
             c.instanceSymbols = ["name!", "value!"];
             return c;
           }(a.ASNative);
-          k.URLRequestHeader = t;
+          k.URLRequestHeader = u;
         })(k.net || (k.net = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -39973,9 +41677,9 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.FileLoadingService, h = d.AVM2.Runtime.throwError, p = d.AVM2.AS.flash.utils, s = function(d) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.FileLoadingService, h = d.AVM2.Runtime.throwError, p = d.AVM2.AS.flash.utils, s = function(d) {
             function g() {
-              t("public flash.net.URLStream");
+              u("public flash.net.URLStream");
             }
             __extends(g, d);
             Object.defineProperty(g.prototype, "connected", {get:function() {
@@ -39996,7 +41700,7 @@
               this._buffer.endian = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(g.prototype, "diskCacheEnabled", {get:function() {
-              u("public flash.net.URLStream::get diskCacheEnabled");
+              t("public flash.net.URLStream::get diskCacheEnabled");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(g.prototype, "position", {get:function() {
               return this._buffer.position;
@@ -40052,35 +41756,35 @@
               this._buffer.readBytes(a, b, e);
             };
             g.prototype.readBoolean = function() {
-              u("public flash.net.URLStream::readBoolean");
+              t("public flash.net.URLStream::readBoolean");
             };
             g.prototype.readByte = function() {
               return this._buffer.readByte();
             };
             g.prototype.readUnsignedByte = function() {
-              u("public flash.net.URLStream::readUnsignedByte");
+              t("public flash.net.URLStream::readUnsignedByte");
             };
             g.prototype.readShort = function() {
-              u("public flash.net.URLStream::readShort");
+              t("public flash.net.URLStream::readShort");
             };
             g.prototype.readUnsignedShort = function() {
               return this._buffer.readUnsignedShort();
             };
             g.prototype.readUnsignedInt = function() {
-              u("public flash.net.URLStream::readUnsignedInt");
+              t("public flash.net.URLStream::readUnsignedInt");
             };
             g.prototype.readInt = function() {
-              u("public flash.net.URLStream::readInt");
+              t("public flash.net.URLStream::readInt");
             };
             g.prototype.readFloat = function() {
-              u("public flash.net.URLStream::readFloat");
+              t("public flash.net.URLStream::readFloat");
             };
             g.prototype.readDouble = function() {
-              u("public flash.net.URLStream::readDouble");
+              t("public flash.net.URLStream::readDouble");
             };
             g.prototype.readMultiByte = function(a, b) {
               l(b);
-              u("public flash.net.URLStream::readMultiByte");
+              t("public flash.net.URLStream::readMultiByte");
             };
             g.prototype.readUTF = function() {
               return this._buffer.readUTF();
@@ -40092,10 +41796,10 @@
               this._session.close();
             };
             g.prototype.readObject = function() {
-              u("public flash.net.URLStream::readObject");
+              t("public flash.net.URLStream::readObject");
             };
             g.prototype.stop = function() {
-              u("public flash.net.URLStream::stop");
+              t("public flash.net.URLStream::stop");
             };
             g.classInitializer = null;
             g.initializer = function() {
@@ -40116,9 +41820,9 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
-        (function(r) {
-          var u = d.AVM2.Runtime.asCoerceString, t = function(a) {
+      (function(q) {
+        (function(q) {
+          var t = d.AVM2.Runtime.asCoerceString, u = function(a) {
             function c(a) {
               void 0 === a && (a = null);
               this._ignoreDecodingErrors = !1;
@@ -40126,7 +41830,7 @@
             }
             __extends(c, a);
             c.prototype.decode = function(a) {
-              a = u(a);
+              a = t(a);
               a = a.split("&");
               for (var c = 0;c < a.length;c++) {
                 var d = a[c], l = d.indexOf("=");
@@ -40154,8 +41858,8 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          r.URLVariables = t;
-        })(r.net || (r.net = {}));
+          q.URLVariables = u;
+        })(q.net || (q.net = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -40165,19 +41869,19 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.sensors.Accelerometer");
+              u("public flash.sensors.Accelerometer");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "isSupported", {get:function() {
-              u("public flash.sensors.Accelerometer::get isSupported");
+              t("public flash.sensors.Accelerometer::get isSupported");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "muted", {get:function() {
-              u("public flash.sensors.Accelerometer::get muted");
+              t("public flash.sensors.Accelerometer::get muted");
             }, enumerable:!0, configurable:!0});
             d.prototype.setRequestedUpdateInterval = function(a) {
-              u("public flash.sensors.Accelerometer::setRequestedUpdateInterval");
+              t("public flash.sensors.Accelerometer::setRequestedUpdateInterval");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -40196,19 +41900,19 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.sensors.Geolocation");
+              u("public flash.sensors.Geolocation");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "isSupported", {get:function() {
-              u("public flash.sensors.Geolocation::get isSupported");
+              t("public flash.sensors.Geolocation::get isSupported");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "muted", {get:function() {
-              u("public flash.sensors.Geolocation::get muted");
+              t("public flash.sensors.Geolocation::get muted");
             }, enumerable:!0, configurable:!0});
             d.prototype.setRequestedUpdateInterval = function(a) {
-              u("public flash.sensors.Geolocation::setRequestedUpdateInterval");
+              t("public flash.sensors.Geolocation::setRequestedUpdateInterval");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -40227,7 +41931,7 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.AVM2.Runtime.asCoerceString, l = d.AVM2.Runtime.AVM2, c = d.AVM2.Runtime.ApplicationDomain, h = d.AVM2.ABC.Multiname, p = function(a) {
+          var q = d.Debug.notImplemented, u = d.AVM2.Runtime.asCoerceString, l = d.AVM2.Runtime.AVM2, c = d.AVM2.Runtime.ApplicationDomain, h = d.AVM2.ABC.Multiname, p = function(a) {
             function d(a) {
               void 0 === a && (a = null);
               a instanceof c ? this._runtimeDomain = a : (a = a ? a._runtimeDomain : l.currentDomain().system, this._runtimeDomain = new c(a.vm, a, 2, !1));
@@ -40237,24 +41941,24 @@
               return new d(l.currentDomain());
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "MIN_DOMAIN_MEMORY_LENGTH", {get:function() {
-              r("public flash.system.ApplicationDomain::get MIN_DOMAIN_MEMORY_LENGTH");
+              q("public flash.system.ApplicationDomain::get MIN_DOMAIN_MEMORY_LENGTH");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "parentDomain", {get:function() {
               return this._runtimeDomain.base ? new d(this._runtimeDomain.base) : null;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "domainMemory", {get:function() {
-              r("public flash.system.ApplicationDomain::get domainMemory");
+              q("public flash.system.ApplicationDomain::get domainMemory");
             }, set:function(a) {
-              r("public flash.system.ApplicationDomain::set domainMemory");
+              q("public flash.system.ApplicationDomain::set domainMemory");
             }, enumerable:!0, configurable:!0});
             d.prototype.getDefinition = function(a) {
-              return(a = t(a)) ? (a = a.replace("::", "."), this._runtimeDomain.getProperty(h.fromSimpleName(a), !0, !0)) : null;
+              return(a = u(a)) ? (a = a.replace("::", "."), this._runtimeDomain.getProperty(h.fromSimpleName(a), !0, !0)) : null;
             };
             d.prototype.hasDefinition = function(a) {
-              return(a = t(a)) ? (a = a.replace("::", "."), !!this._runtimeDomain.findDomainProperty(h.fromSimpleName(a), !1, !1)) : !1;
+              return(a = u(a)) ? (a = a.replace("::", "."), !!this._runtimeDomain.findDomainProperty(h.fromSimpleName(a), !1, !1)) : !1;
             };
             d.prototype.getQualifiedDefinitionNames = function() {
-              r("public flash.system.ApplicationDomain::getQualifiedDefinitionNames");
+              q("public flash.system.ApplicationDomain::getQualifiedDefinitionNames");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -40273,57 +41977,57 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.ObjectUtilities.toKeyValueArray, p = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = d.ObjectUtilities.toKeyValueArray, p = function(a) {
             function d() {
-              t("public flash.system.Capabilities");
+              u("public flash.system.Capabilities");
             }
             __extends(d, a);
             Object.defineProperty(d, "isEmbeddedInAcrobat", {get:function() {
-              r("public flash.system.Capabilities::get isEmbeddedInAcrobat");
+              q("public flash.system.Capabilities::get isEmbeddedInAcrobat");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasEmbeddedVideo", {get:function() {
-              r("public flash.system.Capabilities::get hasEmbeddedVideo");
+              q("public flash.system.Capabilities::get hasEmbeddedVideo");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasAudio", {get:function() {
-              r("public flash.system.Capabilities::get hasAudio");
+              q("public flash.system.Capabilities::get hasAudio");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "avHardwareDisable", {get:function() {
-              r("public flash.system.Capabilities::get avHardwareDisable");
+              q("public flash.system.Capabilities::get avHardwareDisable");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasAccessibility", {get:function() {
               c("public flash.system.Capabilities::get hasAccessibility");
               return d._hasAccessibility;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasAudioEncoder", {get:function() {
-              r("public flash.system.Capabilities::get hasAudioEncoder");
+              q("public flash.system.Capabilities::get hasAudioEncoder");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasMP3", {get:function() {
-              r("public flash.system.Capabilities::get hasMP3");
+              q("public flash.system.Capabilities::get hasMP3");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasPrinting", {get:function() {
-              r("public flash.system.Capabilities::get hasPrinting");
+              q("public flash.system.Capabilities::get hasPrinting");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasScreenBroadcast", {get:function() {
-              r("public flash.system.Capabilities::get hasScreenBroadcast");
+              q("public flash.system.Capabilities::get hasScreenBroadcast");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasScreenPlayback", {get:function() {
-              r("public flash.system.Capabilities::get hasScreenPlayback");
+              q("public flash.system.Capabilities::get hasScreenPlayback");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasStreamingAudio", {get:function() {
-              r("public flash.system.Capabilities::get hasStreamingAudio");
+              q("public flash.system.Capabilities::get hasStreamingAudio");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasStreamingVideo", {get:function() {
-              r("public flash.system.Capabilities::get hasStreamingVideo");
+              q("public flash.system.Capabilities::get hasStreamingVideo");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasVideoEncoder", {get:function() {
-              r("public flash.system.Capabilities::get hasVideoEncoder");
+              q("public flash.system.Capabilities::get hasVideoEncoder");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "isDebugger", {get:function() {
               c("public flash.system.Capabilities::get isDebugger");
               return d._isDebugger;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "localFileReadDisable", {get:function() {
-              r("public flash.system.Capabilities::get localFileReadDisable");
+              q("public flash.system.Capabilities::get localFileReadDisable");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "language", {get:function() {
               c("public flash.system.Capabilities::get language");
@@ -40336,13 +42040,13 @@
             Object.defineProperty(d, "os", {get:function() {
               if (null === d._os) {
                 var a, c = window.navigator.userAgent;
-                0 < c.indexOf("Macintosh") ? a = "Mac OS 10.5.2" : 0 < c.indexOf("Windows") ? a = "Windows XP" : 0 < c.indexOf("Linux") ? a = "Linux" : /(iPad|iPhone|iPod|Android)/.test(c) ? a = "iPhone3,1" : r("public flash.system.Capabilities::get os");
+                0 < c.indexOf("Macintosh") ? a = "Mac OS 10.5.2" : 0 < c.indexOf("Windows") ? a = "Windows XP" : 0 < c.indexOf("Linux") ? a = "Linux" : /(iPad|iPhone|iPod|Android)/.test(c) ? a = "iPhone3,1" : q("public flash.system.Capabilities::get os");
                 d._os = a;
               }
               return d._os;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "cpuArchitecture", {get:function() {
-              r("public flash.system.Capabilities::get cpuArchitecture");
+              q("public flash.system.Capabilities::get cpuArchitecture");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "playerType", {get:function() {
               c("public flash.system.Capabilities::get playerType");
@@ -40362,7 +42066,7 @@
               return "color";
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "pixelAspectRatio", {get:function() {
-              r("public flash.system.Capabilities::get pixelAspectRatio");
+              q("public flash.system.Capabilities::get pixelAspectRatio");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "screenDPI", {get:function() {
               c("public flash.system.Capabilities::get screenDPI");
@@ -40377,29 +42081,29 @@
               return window.screen.height;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "touchscreenType", {get:function() {
-              r("public flash.system.Capabilities::get touchscreenType");
+              q("public flash.system.Capabilities::get touchscreenType");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasIME", {get:function() {
-              r("public flash.system.Capabilities::get hasIME");
+              q("public flash.system.Capabilities::get hasIME");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasTLS", {get:function() {
-              r("public flash.system.Capabilities::get hasTLS");
+              q("public flash.system.Capabilities::get hasTLS");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "maxLevelIDC", {get:function() {
-              r("public flash.system.Capabilities::get maxLevelIDC");
+              q("public flash.system.Capabilities::get maxLevelIDC");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "supports32BitProcesses", {get:function() {
-              r("public flash.system.Capabilities::get supports32BitProcesses");
+              q("public flash.system.Capabilities::get supports32BitProcesses");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "supports64BitProcesses", {get:function() {
-              r("public flash.system.Capabilities::get supports64BitProcesses");
+              q("public flash.system.Capabilities::get supports64BitProcesses");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "_internal", {get:function() {
-              r("public flash.system.Capabilities::get _internal");
+              q("public flash.system.Capabilities::get _internal");
             }, enumerable:!0, configurable:!0});
             d.hasMultiChannelAudio = function(a) {
               l(a);
-              r("public flash.system.Capabilities::static hasMultiChannelAudio");
+              q("public flash.system.Capabilities::static hasMultiChannelAudio");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -40426,14 +42130,14 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = d.AVM2.Runtime.asCoerceString, l = function(a) {
+          var q = d.Debug.dummyConstructor, u = d.AVM2.Runtime.asCoerceString, l = function(a) {
             function h() {
-              r("packageInternal flash.system.FSCommand");
+              q("packageInternal flash.system.FSCommand");
             }
             __extends(h, a);
             h._fscommand = function(a, c) {
-              a = t(a);
-              c = t(c);
+              a = u(a);
+              c = u(c);
               console.log("FSCommand: " + a + "; " + c);
               a = a.toLowerCase();
               if ("debugger" === a) {
@@ -40459,9 +42163,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.system.ImageDecodingPolicy");
+              q("public flash.system.ImageDecodingPolicy");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -40472,7 +42176,7 @@
             c.ON_LOAD = "onLoad";
             return c;
           }(a.ASNative);
-          k.ImageDecodingPolicy = t;
+          k.ImageDecodingPolicy = u;
         })(k.system || (k.system = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -40483,7 +42187,7 @@
     (function(a) {
       (function(d) {
         (function(k) {
-          var u = function(a) {
+          var t = function(a) {
             function l(a, h, l) {
               void 0 === a && (a = !1);
               void 0 === h && (h = null);
@@ -40500,7 +42204,7 @@
             l.instanceSymbols = "checkPolicyFile! applicationDomain! securityDomain! allowCodeImport! requestedContentParent! parameters! imageDecodingPolicy!".split(" ");
             return l;
           }(a.ASNative);
-          k.LoaderContext = u;
+          k.LoaderContext = t;
         })(d.system || (d.system = {}));
       })(a.flash || (a.flash = {}));
     })(d.AS || (d.AS = {}));
@@ -40511,9 +42215,9 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
+          var t = d.Debug.dummyConstructor, u = function(a) {
             function c(a, c, d, l) {
-              u("public flash.system.JPEGLoaderContext");
+              t("public flash.system.JPEGLoaderContext");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -40522,7 +42226,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.system.LoaderContext);
-          k.JPEGLoaderContext = t;
+          k.JPEGLoaderContext = u;
         })(a.system || (a.system = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -40533,25 +42237,25 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.system.MessageChannel");
+              u("public flash.system.MessageChannel");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "messageAvailable", {get:function() {
-              u("public flash.system.MessageChannel::get messageAvailable");
+              t("public flash.system.MessageChannel::get messageAvailable");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "state", {get:function() {
-              u("public flash.system.MessageChannel::get state");
+              t("public flash.system.MessageChannel::get state");
             }, enumerable:!0, configurable:!0});
             d.prototype.send = function(a, c) {
-              u("public flash.system.MessageChannel::send");
+              t("public flash.system.MessageChannel::send");
             };
             d.prototype.receive = function(a) {
-              u("public flash.system.MessageChannel::receive");
+              t("public flash.system.MessageChannel::receive");
             };
             d.prototype.close = function() {
-              u("public flash.system.MessageChannel::close");
+              t("public flash.system.MessageChannel::close");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -40570,9 +42274,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.system.MessageChannelState");
+              q("public flash.system.MessageChannelState");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -40584,7 +42288,7 @@
             c.CLOSED = "closed";
             return c;
           }(a.ASNative);
-          k.MessageChannelState = t;
+          k.MessageChannelState = u;
         })(k.system || (k.system = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -40595,9 +42299,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = d.Debug.somewhatImplemented, h = function(a) {
             function h() {
-              t("public flash.system.Security");
+              u("public flash.system.Security");
             }
             __extends(h, a);
             Object.defineProperty(h, "exactSettings", {get:function() {
@@ -40606,9 +42310,9 @@
               h._exactSettings = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h, "disableAVM1Loading", {get:function() {
-              r("public flash.system.Security::get disableAVM1Loading");
+              q("public flash.system.Security::get disableAVM1Loading");
             }, set:function(a) {
-              r("public flash.system.Security::set disableAVM1Loading");
+              q("public flash.system.Security::set disableAVM1Loading");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(h, "sandboxType", {get:function() {
               c("public flash.system.Security::get sandboxType");
@@ -40633,13 +42337,13 @@
             h.showSettings = function(a) {
               void 0 === a && (a = "default");
               l(a);
-              r("public flash.system.Security::static showSettings");
+              q("public flash.system.Security::static showSettings");
             };
             h.duplicateSandboxBridgeInputArguments = function(a, c) {
-              r("public flash.system.Security::static duplicateSandboxBridgeInputArguments");
+              q("public flash.system.Security::static duplicateSandboxBridgeInputArguments");
             };
             h.duplicateSandboxBridgeOutputArgument = function(a, c) {
-              r("public flash.system.Security::static duplicateSandboxBridgeOutputArgument");
+              q("public flash.system.Security::static duplicateSandboxBridgeOutputArgument");
             };
             h.classInitializer = null;
             h.initializer = null;
@@ -40665,13 +42369,13 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.somewhatImplemented, t = function(a) {
+          var q = d.Debug.somewhatImplemented, u = function(a) {
             function c() {
             }
             __extends(c, a);
             Object.defineProperty(c, "currentDomain", {get:function() {
               this._currentDomain || (this._currentDomain = new k.SecurityDomain);
-              r("public flash.system.SecurityDomain::get currentDomain");
+              q("public flash.system.SecurityDomain::get currentDomain");
               return this._currentDomain;
             }, enumerable:!0, configurable:!0});
             c.classInitializer = null;
@@ -40680,7 +42384,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.SecurityDomain = t;
+          k.SecurityDomain = u;
         })(k.system || (k.system = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -40691,9 +42395,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.system.SecurityPanel");
+              q("public flash.system.SecurityPanel");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -40709,7 +42413,7 @@
             c.SETTINGS_MANAGER = "settingsManager";
             return c;
           }(a.ASNative);
-          k.SecurityPanel = t;
+          k.SecurityPanel = u;
         })(k.system || (k.system = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -40720,9 +42424,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.system.TouchscreenType");
+              q("public flash.system.TouchscreenType");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -40734,7 +42438,7 @@
             c.NONE = "none";
             return c;
           }(a.ASNative);
-          k.TouchscreenType = t;
+          k.TouchscreenType = u;
         })(k.system || (k.system = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -40840,7 +42544,7 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          var u = d.Debug.somewhatImplemented, t = d.AVM2.Runtime.asCoerceString, l = k.text.FontStyle, c = k.text.FontType, h = function(a) {
+          var t = d.Debug.somewhatImplemented, u = d.AVM2.Runtime.asCoerceString, l = k.text.FontStyle, c = k.text.FontType, h = function(a) {
             function h() {
             }
             __extends(h, a);
@@ -40865,11 +42569,11 @@
               return h.getByNameAndStyle(h.DEFAULT_FONT_SANS, l.REGULAR);
             };
             h.enumerateFonts = function(a) {
-              u("public flash.text.Font::static enumerateFonts");
+              t("public flash.text.Font::static enumerateFonts");
               return h._fonts.slice();
             };
             h.registerFont = function(a) {
-              u("Font.registerFont");
+              t("Font.registerFont");
             };
             h.registerEmbeddedFont = function(a, c) {
               var b = k.display.DisplayObject.getNextSyncID(), e = {get:h.resolveEmbeddedFont.bind(h, c, a.id, b), configurable:!0};
@@ -40891,8 +42595,8 @@
               return this._fontType;
             }, enumerable:!0, configurable:!0});
             h.prototype.hasGlyphs = function(a) {
-              t(a);
-              u("Font#hasGlyphs");
+              u(a);
+              t("Font#hasGlyphs");
               return!0;
             };
             h.DEFAULT_FONT_SANS = "Arial";
@@ -41107,7 +42811,7 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          function u(a, d, l) {
+          function t(a, d, l) {
             for (;d < l;) {
               switch(a[d]) {
                 case " ":
@@ -41125,7 +42829,7 @@
             }
             return l;
           }
-          var t = d.AVM2.Runtime.asCoerceString, l = function(c) {
+          var u = d.AVM2.Runtime.asCoerceString, l = function(c) {
             function d() {
               k.events.EventDispatcher.instanceConstructorNoInitialize.call(this);
               this.clear();
@@ -41139,16 +42843,16 @@
               return c;
             }, enumerable:!0, configurable:!0});
             d.prototype.getStyle = function(c) {
-              c = t(c);
+              c = u(c);
               return(c = this._rules[c.toLowerCase()]) ? a.ASJSON.transformJSValueToAS(c, !1) : {};
             };
             d.prototype.applyStyle = function(a, c) {
-              c = t(c);
+              c = u(c);
               var d = this._rules[c.toLowerCase()];
               return d ? a.transform(d) : a;
             };
             d.prototype.setStyle = function(c, d) {
-              "object" === typeof d && (c = t(c), this._rules[c.toLowerCase()] = a.ASJSON.transformASValueToJS(d, !1));
+              "object" === typeof d && (c = u(c), this._rules[c.toLowerCase()] = a.ASJSON.transformASValueToJS(d, !1));
             };
             d.prototype.hasStyle = function(a) {
               return!!this._rules[a.toLowerCase()];
@@ -41166,26 +42870,26 @@
               return d;
             };
             d.prototype.parseCSS = function(a) {
-              a = t(a) + "";
-              for (var c = a.length, d = u(a, 0, c), g = {}, f = [], b = !1, e = "";d < c;) {
+              a = u(a) + "";
+              for (var c = a.length, d = t(a, 0, c), g = {}, f = [], b = !1, e = "";d < c;) {
                 var h = a[d++];
                 switch(h) {
                   case "{":
                     b = !1;
                     f.push(e);
                     a: {
-                      var e = a, h = c, l = g, k = {}, r = "", v = !1, H = !1, d = u(e, d, h);
+                      var e = a, h = c, l = g, k = {}, q = "", v = !1, F = !1, d = t(e, d, h);
                       b: for (;d < h;) {
                         var K = e[d++];
                         switch(K) {
                           case "}":
-                            if (0 < r.length) {
+                            if (0 < q.length) {
                               d = -1;
                               break a;
                             }
                             break b;
                           case ":":
-                            var F = "", J = r, r = "", H = v = !1;
+                            var E = "", Q = q, q = "", F = v = !1;
                             for (;d < h;) {
                               switch(K = e[d], K) {
                                 case ";":
@@ -41193,18 +42897,18 @@
                                 case "\r":
                                 ;
                                 case "\n":
-                                  d++, d = u(e, d, h);
+                                  d++, d = t(e, d, h);
                                 case "}":
-                                  k[J] = F;
+                                  k[Q] = E;
                                   continue b;
                                 default:
-                                  d++, F += K;
+                                  d++, E += K;
                               }
                             }
                             d = -1;
                             break a;
                           case "-":
-                            ":" === e[d] ? r += K : H = !0;
+                            ":" === e[d] ? q += K : F = !0;
                             break;
                           case " ":
                           ;
@@ -41214,16 +42918,16 @@
                           ;
                           case "\t":
                             v = !0;
-                            r += K;
-                            H = !1;
+                            q += K;
+                            F = !1;
                             break;
                           default:
                             if (v) {
                               d = -1;
                               break a;
                             }
-                            H && (K = K.toUpperCase(), H = !1);
-                            r += K;
+                            F && (K = K.toUpperCase(), F = !1);
+                            q += K;
                         }
                       }
                       if ("}" !== e[d - 1]) {
@@ -41239,13 +42943,13 @@
                     }
                     f = [];
                     e = "";
-                    d = u(a, d, c);
+                    d = t(a, d, c);
                     break;
                   case ",":
                     b = !1;
                     f.push(e);
                     e = "";
-                    d = u(a, d, c);
+                    d = t(a, d, c);
                     break;
                   case " ":
                   ;
@@ -41255,7 +42959,7 @@
                   ;
                   case "\t":
                     b = !0;
-                    d = u(a, d, c);
+                    d = t(a, d, c);
                     break;
                   default:
                     if (b) {
@@ -41311,7 +43015,7 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.warning, l = d.Debug.somewhatImplemented, c = d.AVM2.Runtime.throwError, h = d.AVM2.Runtime.asCoerceString, p = d.NumberUtilities.clamp, s = function(g) {
+          var t = d.Debug.notImplemented, u = d.Debug.warning, l = d.Debug.somewhatImplemented, c = d.AVM2.Runtime.throwError, h = d.AVM2.Runtime.asCoerceString, p = d.NumberUtilities.clamp, s = function(g) {
             function f() {
               a.display.InteractiveObject.instanceConstructorNoInitialize.call(this);
             }
@@ -41395,7 +43099,7 @@
               return this._bottomScrollV;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "caretIndex", {get:function() {
-              u("public flash.text.TextField::get caretIndex");
+              t("public flash.text.TextField::get caretIndex");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "condenseWhite", {get:function() {
               return this._condenseWhite;
@@ -41405,7 +43109,9 @@
             Object.defineProperty(f.prototype, "defaultTextFormat", {get:function() {
               return this._textContent.defaultTextFormat.clone();
             }, set:function(a) {
-              this._textContent.defaultTextFormat.merge(a);
+              var e = this._textContent.defaultTextFormat;
+              e.merge(a);
+              null === e.color ? e.color = this._textColor : this._textColor = +e.color;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "embedFonts", {get:function() {
               return this._embedFonts;
@@ -41431,7 +43137,7 @@
               return this._length;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "textInteractionMode", {get:function() {
-              u("public flash.text.TextField::get textInteractionMode");
+              t("public flash.text.TextField::get textInteractionMode");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "maxChars", {get:function() {
               return this._maxChars;
@@ -41519,9 +43225,9 @@
               a !== this._textContent.plainText && (this._textContent.plainText = a, this._invalidateContent(), this._ensureLineMetrics());
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "textColor", {get:function() {
-              return 0 > this._textColor ? +this._textContent.defaultTextFormat.color : this._textColor;
+              return null === this._textColor ? +this._textContent.defaultTextFormat.color : this._textColor;
             }, set:function(a) {
-              this._textColor = a >>> 0;
+              this._textColor = this._textContent.defaultTextFormat.color = a >>> 0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "textHeight", {get:function() {
               this._ensureLineMetrics();
@@ -41548,24 +43254,24 @@
               a !== this._textContent.wordWrap && (this._textContent.wordWrap = !!a, this._invalidateContent());
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(f.prototype, "useRichTextClipboard", {get:function() {
-              u("public flash.text.TextField::get useRichTextClipboard");
+              t("public flash.text.TextField::get useRichTextClipboard");
             }, set:function(a) {
-              u("public flash.text.TextField::set useRichTextClipboard");
+              t("public flash.text.TextField::set useRichTextClipboard");
             }, enumerable:!0, configurable:!0});
             f.prototype.copyRichText = function() {
-              u("public flash.text.TextField::copyRichText");
+              t("public flash.text.TextField::copyRichText");
             };
             f.prototype.pasteRichText = function(a) {
               h(a);
-              u("public flash.text.TextField::pasteRichText");
+              t("public flash.text.TextField::pasteRichText");
             };
             f.prototype.getXMLText = function(a, e) {
-              u("public flash.text.TextField::getXMLText");
+              t("public flash.text.TextField::getXMLText");
               return "";
             };
             f.prototype.insertXMLText = function(a, e, c, f) {
               h(c);
-              u("public flash.text.TextField::insertXMLText");
+              t("public flash.text.TextField::insertXMLText");
             };
             f.prototype._ensureLineMetrics = function() {
               if (this._hasFlags(8388608)) {
@@ -41600,19 +43306,19 @@
               return new a.geom.Rectangle(b * c, 0, c, e);
             };
             f.prototype.getCharIndexAtPoint = function(a, e) {
-              u("public flash.text.TextField::getCharIndexAtPoint");
+              t("public flash.text.TextField::getCharIndexAtPoint");
             };
             f.prototype.getFirstCharInParagraph = function(a) {
-              u("public flash.text.TextField::getFirstCharInParagraph");
+              t("public flash.text.TextField::getFirstCharInParagraph");
             };
             f.prototype.getLineIndexAtPoint = function(a, e) {
-              u("public flash.text.TextField::getLineIndexAtPoint");
+              t("public flash.text.TextField::getLineIndexAtPoint");
             };
             f.prototype.getLineIndexOfChar = function(a) {
-              u("public flash.text.TextField::getLineIndexOfChar");
+              t("public flash.text.TextField::getLineIndexOfChar");
             };
             f.prototype.getLineLength = function(a) {
-              u("public flash.text.TextField::getLineLength");
+              t("public flash.text.TextField::getLineLength");
             };
             f.prototype.getLineMetrics = function() {
               var a;
@@ -41626,13 +43332,13 @@
               return new v.TextLineMetrics(a, f, d + g + e, d, g, e);
             };
             f.prototype.getLineOffset = function(a) {
-              u("public flash.text.TextField::getLineOffset");
+              t("public flash.text.TextField::getLineOffset");
             };
             f.prototype.getLineText = function(a) {
-              u("public flash.text.TextField::getLineText");
+              t("public flash.text.TextField::getLineText");
             };
             f.prototype.getParagraphLength = function(a) {
-              u("public flash.text.TextField::getParagraphLength");
+              t("public flash.text.TextField::getParagraphLength");
             };
             f.prototype.getTextFormat = function(a, e) {
               void 0 === a && (a = -1);
@@ -41658,7 +43364,7 @@
               return f;
             };
             f.prototype.getRawText = function() {
-              u("public flash.text.TextField::getRawText");
+              t("public flash.text.TextField::getRawText");
             };
             f.prototype.replaceSelectedText = function(a) {
               this.replaceText(this._selectionBeginIndex, this._selectionEndIndex, "" + a);
@@ -41683,7 +43389,7 @@
               f <= e || (this._textContent.replaceText(e, f, d.substring(e, f), a), this._invalidateContent(), this._ensureLineMetrics());
             };
             f.prototype.getImageReference = function(a) {
-              u("public flash.text.TextField::getImageReference");
+              t("public flash.text.TextField::getImageReference");
             };
             f.classSymbols = null;
             f.instanceSymbols = null;
@@ -41712,8 +43418,7 @@
               this._selectable = !0;
               this._selectedText = "";
               this._sharpness = this._selectionEndIndex = this._selectionBeginIndex = 0;
-              this._styleSheet = null;
-              this._textColor = -1;
+              this._textColor = this._styleSheet = null;
               this._thickness = this._textWidth = this._textHeight = 0;
               this._type = v.TextFieldType.DYNAMIC;
               this._useRichTextClipboard = !1;
@@ -41760,7 +43465,7 @@
                 c.textContent = h;
               }
               g.hasColor && (c.color = g.color >>> 8);
-              g.hasFont && (c.size = g.fontHeight, (h = e.getSymbolById(g.fontId)) ? (c.face = g.useOutlines ? h.name : "swffont" + h.syncId, c.bold = h.bold, c.italic = h.italic) : t("Font " + g.fontId + " is not defined."));
+              g.hasFont && (c.size = g.fontHeight, (h = e.getSymbolById(g.fontId)) ? (c.face = g.useOutlines ? h.name : "swffont" + h.syncId, c.bold = h.bold, c.italic = h.italic) : u("Font " + g.fontId + " is not defined."));
               g.hasLayout && (c.align = a.text.TextFormatAlign.fromNumber(g.align), c.leftMargin = g.leftMargin, c.rightMargin = g.rightMargin, c.indent = g.indent, c.leading = g.leading);
               c.multiline = !!g.multiline;
               c.wordWrap = !!g.wordWrap;
@@ -41777,26 +43482,26 @@
               return c;
             };
             f.FromLabelData = function(a, e) {
-              for (var c = a.fillBounds, d = a.records, g = a.coords = [], h = "", l = 12, k = "Times Roman", p = !1, s = !1, r = 0, u = 0, t = 0, v, E = 0;E < d.length;E++) {
-                var y = d[E];
-                if (y.eot) {
-                  break;
-                }
-                if (y.hasFont) {
-                  var z = e.getSymbolById(y.fontId);
-                  z && (v = z.codes, l = y.fontHeight, z.originalSize || (l /= 20), k = z.metrics ? "swffont" + z.syncId : z.name, p = z.bold, s = z.italic);
-                }
-                y.hasColor && (r = y.color >>> 8);
-                y.hasMoveX && (u = y.moveX, u < c.xMin && (c.xMin = u));
-                y.hasMoveY && (t = y.moveY, t < c.yMin && (c.yMin = t));
-                for (var z = "", y = y.entries, G = 0, C;C = y[G++];) {
-                  var I = String.fromCharCode(v[C.glyphIndex]), z = z + (m[I] || I);
-                  g.push(u, t);
-                  u += C.advance;
+              for (var c = a.fillBounds, d = a.records, g = a.coords = [], h = "", l = 12, k = "Times Roman", p = !1, q = !1, s = 0, t = 0, u = 0, v, L = 0;L < d.length;L++) {
+                var A = d[L];
+                if (A.eot) {
+                  break;
+                }
+                if (A.hasFont) {
+                  var z = e.getSymbolById(A.fontId);
+                  z && (v = z.codes, l = A.fontHeight, z.originalSize || (l /= 20), k = z.metrics ? "swffont" + z.syncId : z.name, p = z.bold, q = z.italic);
+                }
+                A.hasColor && (s = A.color >>> 8);
+                A.hasMoveX && (t = A.moveX, t < c.xMin && (c.xMin = t));
+                A.hasMoveY && (u = A.moveY, u < c.yMin && (c.yMin = u));
+                for (var z = "", A = A.entries, G = 0, I;I = A[G++];) {
+                  var D = String.fromCharCode(v[I.glyphIndex]), z = z + (m[D] || D);
+                  g.push(t, u);
+                  t += I.advance;
                 }
-                s && (z = "<i>" + z + "</i>");
+                q && (z = "<i>" + z + "</i>");
                 p && (z = "<b>" + z + "</b>");
-                h += '<font size="' + l + '" face="' + k + '" color="#' + ("000000" + r.toString(16)).slice(-6) + '">' + z + "</font>";
+                h += '<font size="' + l + '" face="' + k + '" color="#' + ("000000" + s.toString(16)).slice(-6) + '">' + z + "</font>";
               }
               a.tag.initialText = h;
               return f.FromTextData(a, e);
@@ -41891,10 +43596,10 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
+      (function(q) {
         (function(v) {
-          var u = d.AVM2.Runtime.asCoerceString, t = d.NumberUtilities.roundHalfEven, l = d.AVM2.Runtime.throwError, c = function(a) {
-            function c(a, d, g, f, b, e, h, l, k, p, r, u, t) {
+          var t = d.AVM2.Runtime.asCoerceString, u = d.NumberUtilities.roundHalfEven, l = d.AVM2.Runtime.throwError, c = function(a) {
+            function c(a, d, g, f, b, e, h, l, k, p, q, t, u) {
               void 0 === a && (a = null);
               void 0 === d && (d = null);
               void 0 === g && (g = null);
@@ -41905,9 +43610,9 @@
               void 0 === l && (l = null);
               void 0 === k && (k = null);
               void 0 === p && (p = null);
-              void 0 === r && (r = null);
-              void 0 === u && (u = null);
+              void 0 === q && (q = null);
               void 0 === t && (t = null);
+              void 0 === u && (u = null);
               this.font = a;
               this.size = d;
               this.color = g;
@@ -41918,15 +43623,15 @@
               this.target = l;
               this.align = k;
               this.leftMargin = p;
-              this.rightMargin = r;
-              this.indent = u;
-              this.leading = t;
+              this.rightMargin = q;
+              this.indent = t;
+              this.leading = u;
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "align", {get:function() {
               return this._align;
             }, set:function(a) {
-              this._align = a = u(a);
+              this._align = a = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "blockIndent", {get:function() {
               return this._blockIndent;
@@ -41946,17 +43651,17 @@
             Object.defineProperty(c.prototype, "color", {get:function() {
               return this._color;
             }, set:function(a) {
-              this._color = +a | 0;
+              this._color = null != a ? +a | 0 : null;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "display", {get:function() {
               return this._display;
             }, set:function(a) {
-              this._display = u(a);
+              this._display = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "font", {get:function() {
               return this._font;
             }, set:function(a) {
-              this._font = u(a);
+              this._font = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "style", {get:function() {
               return this._bold && this._italic ? v.FontStyle.BOLD_ITALIC : this._bold ? v.FontStyle.BOLD : this._italic ? v.FontStyle.ITALIC : v.FontStyle.REGULAR;
@@ -42010,7 +43715,7 @@
             Object.defineProperty(c.prototype, "target", {get:function() {
               return this._target;
             }, set:function(a) {
-              this._target = u(a);
+              this._target = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "underline", {get:function() {
               return this._underline;
@@ -42020,16 +43725,16 @@
             Object.defineProperty(c.prototype, "url", {get:function() {
               return this._url;
             }, set:function(a) {
-              this._url = u(a);
+              this._url = t(a);
             }, enumerable:!0, configurable:!0});
             c.coerceNumber = function(a) {
-              return void 0 == a ? null : isNaN(a) || 268435455 < a ? -2147483648 : t(a);
+              return void 0 == a ? null : isNaN(a) || 268435455 < a ? -2147483648 : u(a);
             };
             c.coerceBoolean = function(a) {
               return void 0 == a ? null : !!a;
             };
             c.prototype.clone = function() {
-              return new r.text.TextFormat(this.font, this.size, this.color, this.bold, this.italic, this.underline, this.url, this.target, this.align, this.leftMargin, this.rightMargin, this.indent, this.leading);
+              return new q.text.TextFormat(this.font, this.size, this.color, this.bold, this.italic, this.underline, this.url, this.target, this.align, this.leftMargin, this.rightMargin, this.indent, this.leading);
             };
             c.prototype.equals = function(a) {
               return this._align === a._align && this._blockIndent === a._blockIndent && this._bold === a._bold && this._bullet === a._bullet && this._color === a._color && this._display === a._display && this._font === a._font && this._indent === a._indent && this._italic === a._italic && this._kerning === a._kerning && this._leading === a._leading && this._leftMargin === a._leftMargin && this._letterSpacing === a._letterSpacing && this._rightMargin === a._rightMargin && this._size === a._size && 
@@ -42083,12 +43788,12 @@
               c = a.fontWeight;
               "bold" === c ? this.bold = !0 : "normal" === c && (this.bold = !1);
               if (c = a.color) {
-                if (c = u(c).trim().toLowerCase(), "#" === c[0]) {
+                if (c = t(c).trim().toLowerCase(), "#" === c[0]) {
                   for (c = c.substr(1);"0" === c[0];) {
                     c = c.substr(1);
                   }
                   var d = parseInt(c, 16);
-                  d.original_toString(16) === c && (this.color = d);
+                  d.toString(16) === c && (this.color = d);
                 }
               }
               if (c = a.display) {
@@ -42130,7 +43835,7 @@
             return c;
           }(a.ASNative);
           v.TextFormat = c;
-        })(r.text || (r.text = {}));
+        })(q.text || (q.text = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -42252,9 +43957,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c(a, c, d, l, g, f) {
-              r("public flash.text.TextLineMetrics");
+              q("public flash.text.TextLineMetrics");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -42263,7 +43968,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.TextLineMetrics = t;
+          k.TextLineMetrics = u;
         })(k.text || (k.text = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -42274,7 +43979,7 @@
     (function(a) {
       (function(d) {
         (function(k) {
-          var u = function(a) {
+          var t = function(a) {
             function l(a, d, l) {
               this._beginIndex = a | 0;
               this._endIndex = d | 0;
@@ -42311,7 +44016,7 @@
             l.instanceSymbols = null;
             return l;
           }(a.ASNative);
-          k.TextRun = u;
+          k.TextRun = t;
         })(d.text || (d.text = {}));
       })(a.flash || (a.flash = {}));
     })(d.AS || (d.AS = {}));
@@ -42322,38 +44027,38 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
             function c() {
-              t("public flash.text.TextSnapshot");
+              u("public flash.text.TextSnapshot");
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "charCount", {get:function() {
-              r("public flash.text.TextSnapshot::get charCount");
+              q("public flash.text.TextSnapshot::get charCount");
             }, enumerable:!0, configurable:!0});
             c.prototype.findText = function(a, c, d) {
               l(c);
-              r("public flash.text.TextSnapshot::findText");
+              q("public flash.text.TextSnapshot::findText");
             };
             c.prototype.getSelected = function(a, c) {
-              r("public flash.text.TextSnapshot::getSelected");
+              q("public flash.text.TextSnapshot::getSelected");
             };
             c.prototype.getSelectedText = function(a) {
-              r("public flash.text.TextSnapshot::getSelectedText");
+              q("public flash.text.TextSnapshot::getSelectedText");
             };
             c.prototype.getText = function(a, c, d) {
-              r("public flash.text.TextSnapshot::getText");
+              q("public flash.text.TextSnapshot::getText");
             };
             c.prototype.getTextRunInfo = function(a, c) {
-              r("public flash.text.TextSnapshot::getTextRunInfo");
+              q("public flash.text.TextSnapshot::getTextRunInfo");
             };
             c.prototype.hitTestTextNearPos = function(a, c, d) {
-              r("public flash.text.TextSnapshot::hitTestTextNearPos");
+              q("public flash.text.TextSnapshot::hitTestTextNearPos");
             };
             c.prototype.setSelectColor = function(a) {
-              r("public flash.text.TextSnapshot::setSelectColor");
+              q("public flash.text.TextSnapshot::setSelectColor");
             };
             c.prototype.setSelected = function(a, c, d) {
-              r("public flash.text.TextSnapshot::setSelected");
+              q("public flash.text.TextSnapshot::setSelected");
             };
             c.classInitializer = null;
             c.initializer = null;
@@ -42372,22 +44077,22 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.trace.Trace");
+              u("public flash.trace.Trace");
             }
             __extends(d, a);
             d.setLevel = function(a, c) {
-              r("public flash.trace.Trace::static setLevel");
+              q("public flash.trace.Trace::static setLevel");
             };
             d.getLevel = function(a) {
-              r("public flash.trace.Trace::static getLevel");
+              q("public flash.trace.Trace::static getLevel");
             };
             d.setListener = function(a) {
-              r("public flash.trace.Trace::static setListener");
+              q("public flash.trace.Trace::static setListener");
             };
             d.getListener = function() {
-              r("public flash.trace.Trace::static getListener");
+              q("public flash.trace.Trace::static getListener");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -42413,7 +44118,7 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.somewhatImplemented, t = function(d) {
+          var t = d.Debug.somewhatImplemented, u = function(d) {
             function c() {
               a.display.NativeMenu.instanceConstructorNoInitialize.call(this);
               this.builtInItems = new k.ContextMenuBuiltInItems;
@@ -42421,43 +44126,43 @@
             }
             __extends(c, d);
             Object.defineProperty(c, "isSupported", {get:function() {
-              u("ContextMenu::isSupported");
+              t("ContextMenu::isSupported");
               return!1;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "builtInItems", {get:function() {
-              u("public flash.ui.ContextMenu::get builtInItems");
+              t("public flash.ui.ContextMenu::get builtInItems");
               return this._builtInItems;
             }, set:function(a) {
-              u("public flash.ui.ContextMenu::set builtInItems");
+              t("public flash.ui.ContextMenu::set builtInItems");
               this._builtInItems = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "customItems", {get:function() {
-              u("public flash.ui.ContextMenu::get customItems");
+              t("public flash.ui.ContextMenu::get customItems");
               return this._customItems;
             }, set:function(a) {
-              u("public flash.ui.ContextMenu::set customItems");
+              t("public flash.ui.ContextMenu::set customItems");
               this._customItems = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "link", {get:function() {
-              u("public flash.ui.ContextMenu::get link");
+              t("public flash.ui.ContextMenu::get link");
               return this._link;
             }, set:function(a) {
-              u("public flash.ui.ContextMenu::set link");
+              t("public flash.ui.ContextMenu::set link");
               this._link = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "clipboardMenu", {get:function() {
-              u("public flash.ui.ContextMenu::get clipboardMenu");
+              t("public flash.ui.ContextMenu::get clipboardMenu");
               return this._clipboardMenu;
             }, set:function(a) {
               a = !!a;
-              u("public flash.ui.ContextMenu::set clipboardMenu");
+              t("public flash.ui.ContextMenu::set clipboardMenu");
               this._clipboardMenu = a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "clipboardItems", {get:function() {
-              u("public flash.ui.ContextMenu::get clipboardItems");
+              t("public flash.ui.ContextMenu::get clipboardItems");
               return this._clipboardItems;
             }, set:function(a) {
-              u("public flash.ui.ContextMenu::set clipboardItems");
+              t("public flash.ui.ContextMenu::set clipboardItems");
               this._clipboardItems = a;
             }, enumerable:!0, configurable:!0});
             c.prototype.hideBuiltInItems = function() {
@@ -42474,7 +44179,7 @@
               return a;
             };
             c.prototype.cloneLinkAndClipboardProperties = function(a) {
-              u("public flash.ui.ContextMenu::cloneLinkAndClipboardProperties");
+              t("public flash.ui.ContextMenu::cloneLinkAndClipboardProperties");
             };
             c.classInitializer = null;
             c.initializer = null;
@@ -42482,7 +44187,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.display.NativeMenu);
-          k.ContextMenu = t;
+          k.ContextMenu = u;
         })(a.ui || (a.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -42567,44 +44272,44 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.somewhatImplemented, t = function(a) {
+          var q = d.Debug.somewhatImplemented, u = function(a) {
             function c() {
               this._selectAll = this._clear = this._paste = this._copy = this._cut = !0;
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "cut", {get:function() {
-              r("cut");
+              q("cut");
               return this._cut;
             }, set:function(a) {
-              r("cut");
+              q("cut");
               this._cut = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "copy", {get:function() {
-              r("copy");
+              q("copy");
               return this._copy;
             }, set:function(a) {
-              r("copy");
+              q("copy");
               this._copy = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "paste", {get:function() {
-              r("paste");
+              q("paste");
               return this._paste;
             }, set:function(a) {
-              r("paste");
+              q("paste");
               this._paste = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "clear", {get:function() {
-              r("clear");
+              q("clear");
               return this._clear;
             }, set:function(a) {
-              r("clear");
+              q("clear");
               this._clear = !!a;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "selectAll", {get:function() {
-              r("selectAll");
+              q("selectAll");
               return this._selectAll;
             }, set:function(a) {
-              r("selectAll");
+              q("selectAll");
               this._selectAll = !!a;
             }, enumerable:!0, configurable:!0});
             c.prototype.clone = function() {
@@ -42622,7 +44327,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.ASNative);
-          k.ContextMenuClipboardItems = t;
+          k.ContextMenuClipboardItems = u;
         })(k.ui || (k.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -42633,21 +44338,21 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.AVM2.Runtime.asCoerceString, t = function(a) {
-            function c(a, c, d, l) {
+          var t = d.AVM2.Runtime.asCoerceString, u = function(a) {
+            function c(a, c, d, k) {
               void 0 === c && (c = !1);
               void 0 === d && (d = !0);
-              void 0 === l && (l = !0);
-              this._caption = (a = u(a)) ? a : "";
+              void 0 === k && (k = !0);
+              this._caption = (a = t(a)) ? a : "";
               this._separatorBefore = !!c;
               this._enabled = !!d;
-              this._visible = !!l;
+              this._visible = !!k;
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "caption", {get:function() {
               return this._caption;
             }, set:function(a) {
-              this._caption = a = u(a);
+              this._caption = a = t(a);
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "separatorBefore", {get:function() {
               return this._separatorBefore;
@@ -42665,7 +44370,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.display.NativeMenuItem);
-          k.ContextMenuItem = t;
+          k.ContextMenuItem = u;
         })(a.ui || (a.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -42676,21 +44381,21 @@
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = d.Debug.somewhatImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.throwError, c = function(a) {
+          var t = d.Debug.somewhatImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.throwError, c = function(a) {
             function c() {
-              t("public flash.ui.GameInput");
+              u("public flash.ui.GameInput");
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "numDevices", {get:function() {
-              u("public flash.ui.GameInput::get numDevices");
+              t("public flash.ui.GameInput::get numDevices");
               return 0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "isSupported", {get:function() {
-              u("public flash.ui.GameInput::get isSupported");
+              t("public flash.ui.GameInput::get isSupported");
               return!1;
             }, enumerable:!0, configurable:!0});
             c.getDeviceAt = function(a) {
-              u("public flash.ui.GameInput::static getDeviceAt");
+              t("public flash.ui.GameInput::static getDeviceAt");
               l("RangeError", k.Errors.ParamRangeError, "index");
               return null;
             };
@@ -42711,34 +44416,34 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.ui.GameInputControl");
+              u("public flash.ui.GameInputControl");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "numValues", {get:function() {
-              u("public flash.ui.GameInputControl::get numValues");
+              t("public flash.ui.GameInputControl::get numValues");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "index", {get:function() {
-              u("public flash.ui.GameInputControl::get index");
+              t("public flash.ui.GameInputControl::get index");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "relative", {get:function() {
-              u("public flash.ui.GameInputControl::get relative");
+              t("public flash.ui.GameInputControl::get relative");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "type", {get:function() {
-              u("public flash.ui.GameInputControl::get type");
+              t("public flash.ui.GameInputControl::get type");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "hand", {get:function() {
-              u("public flash.ui.GameInputControl::get hand");
+              t("public flash.ui.GameInputControl::get hand");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "finger", {get:function() {
-              u("public flash.ui.GameInputControl::get finger");
+              t("public flash.ui.GameInputControl::get finger");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "device", {get:function() {
-              u("public flash.ui.GameInputControl::get device");
+              t("public flash.ui.GameInputControl::get device");
             }, enumerable:!0, configurable:!0});
             d.prototype.getValueAt = function(a) {
-              u("public flash.ui.GameInputControl::getValueAt");
+              t("public flash.ui.GameInputControl::getValueAt");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -42757,9 +44462,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.ui.GameInputControlType");
+              q("public flash.ui.GameInputControlType");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -42774,7 +44479,7 @@
             c.TRIGGER = "trigger";
             return c;
           }(a.ASNative);
-          k.GameInputControlType = t;
+          k.GameInputControlType = u;
         })(k.ui || (k.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -42785,41 +44490,41 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.ui.GameInputDevice");
+              u("public flash.ui.GameInputDevice");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "numControls", {get:function() {
-              u("public flash.ui.GameInputDevice::get numControls");
+              t("public flash.ui.GameInputDevice::get numControls");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "sampleInterval", {get:function() {
-              u("public flash.ui.GameInputDevice::get sampleInterval");
+              t("public flash.ui.GameInputDevice::get sampleInterval");
             }, set:function(a) {
-              u("public flash.ui.GameInputDevice::set sampleInterval");
+              t("public flash.ui.GameInputDevice::set sampleInterval");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "enabled", {get:function() {
-              u("public flash.ui.GameInputDevice::get enabled");
+              t("public flash.ui.GameInputDevice::get enabled");
             }, set:function(a) {
-              u("public flash.ui.GameInputDevice::set enabled");
+              t("public flash.ui.GameInputDevice::set enabled");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "id", {get:function() {
-              u("public flash.ui.GameInputDevice::get id");
+              t("public flash.ui.GameInputDevice::get id");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "name", {get:function() {
-              u("public flash.ui.GameInputDevice::get name");
+              t("public flash.ui.GameInputDevice::get name");
             }, enumerable:!0, configurable:!0});
             d.prototype.getControlAt = function(a) {
-              u("public flash.ui.GameInputDevice::getControlAt");
+              t("public flash.ui.GameInputDevice::getControlAt");
             };
             d.prototype.startCachingSamples = function(a, c) {
-              u("public flash.ui.GameInputDevice::startCachingSamples");
+              t("public flash.ui.GameInputDevice::startCachingSamples");
             };
             d.prototype.stopCachingSamples = function() {
-              u("public flash.ui.GameInputDevice::stopCachingSamples");
+              t("public flash.ui.GameInputDevice::stopCachingSamples");
             };
             d.prototype.getCachedSamples = function(a, c) {
-              u("public flash.ui.GameInputDevice::getCachedSamples");
+              t("public flash.ui.GameInputDevice::getCachedSamples");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -42839,9 +44544,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.ui.GameInputFinger");
+              q("public flash.ui.GameInputFinger");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -42854,7 +44559,7 @@
             c.UNKNOWN = "unknown";
             return c;
           }(a.ASNative);
-          k.GameInputFinger = t;
+          k.GameInputFinger = u;
         })(k.ui || (k.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -42865,9 +44570,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.ui.GameInputHand");
+              q("public flash.ui.GameInputHand");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -42879,7 +44584,7 @@
             c.UNKNOWN = "unknown";
             return c;
           }(a.ASNative);
-          k.GameInputHand = t;
+          k.GameInputHand = u;
         })(k.ui || (k.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -42890,7 +44595,7 @@
     (function(a) {
       (function(k) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function() {
+          var t = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function() {
             function a() {
               this._lastKeyCode = 0;
               this._captureKeyPress = !1;
@@ -42923,23 +44628,23 @@
           v.KeyboardEventDispatcher = l;
           l = function(a) {
             function d() {
-              t("public flash.ui.Keyboard");
+              u("public flash.ui.Keyboard");
             }
             __extends(d, a);
             Object.defineProperty(d, "capsLock", {get:function() {
-              u("public flash.ui.Keyboard::get capsLock");
+              t("public flash.ui.Keyboard::get capsLock");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "numLock", {get:function() {
-              u("public flash.ui.Keyboard::get numLock");
+              t("public flash.ui.Keyboard::get numLock");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "hasVirtualKeyboard", {get:function() {
-              u("public flash.ui.Keyboard::get hasVirtualKeyboard");
+              t("public flash.ui.Keyboard::get hasVirtualKeyboard");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "physicalKeyboardType", {get:function() {
-              u("public flash.ui.Keyboard::get physicalKeyboardType");
+              t("public flash.ui.Keyboard::get physicalKeyboardType");
             }, enumerable:!0, configurable:!0});
             d.isAccessible = function() {
-              u("public flash.ui.Keyboard::static isAccessible");
+              t("public flash.ui.Keyboard::static isAccessible");
             };
             d.classInitializer = null;
             d.initializer = null;
@@ -43232,9 +44937,9 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      (function(r) {
+      (function(q) {
         (function(v) {
-          var u = d.Debug.notImplemented, t = d.Debug.somewhatImplemented, l = d.AVM2.Runtime.asCoerceString, c = r.events, h = function() {
+          var t = d.Debug.notImplemented, u = d.Debug.somewhatImplemented, l = d.AVM2.Runtime.asCoerceString, c = q.events, h = function() {
             function a() {
               this.currentTarget = this.stage = null;
             }
@@ -43255,8 +44960,8 @@
                 return d;
               }
               var g = a.point;
-              r.ui.Mouse.updateCurrentPosition(g);
-              var f = this.currentTarget, b = null, e = r.events.MouseEvent.typeFromDOMType(a.type);
+              q.ui.Mouse.updateCurrentPosition(g);
+              var f = this.currentTarget, b = null, e = q.events.MouseEvent.typeFromDOMType(a.type);
               if (0 <= g.x && g.x < d.stageWidth && 0 <= g.y && g.y < d.stageHeight) {
                 b = this._findTarget(g, 3) || this.stage;
               } else {
@@ -43268,7 +44973,7 @@
                   return d;
                 }
               }
-              r.ui.Mouse.draggableObject && (g = this._findTarget(g, 5), r.ui.Mouse.draggableObject._updateDragState(g));
+              q.ui.Mouse.draggableObject && (g = this._findTarget(g, 5), q.ui.Mouse.draggableObject._updateDragState(g));
               switch(e) {
                 case c.MouseEvent.MOUSE_DOWN:
                   a.buttons & 1 ? a.buttons = 1 : a.buttons & 2 ? (e = c.MouseEvent.MIDDLE_MOUSE_DOWN, a.buttons = 2) : a.buttons & 4 && (e = c.MouseEvent.RIGHT_MOUSE_DOWN, a.buttons = 4);
@@ -43299,7 +45004,7 @@
                     f._mouseOver = !1;
                     f._mouseDown = !1;
                     this._dispatchMouseEvent(f, c.MouseEvent.MOUSE_OUT, a, b);
-                    for (var h = f;h !== g;) {
+                    for (var h = f;h && h !== g;) {
                       this._dispatchMouseEvent(h, c.MouseEvent.ROLL_OUT, a, b), h = h.parent;
                     }
                   }
@@ -43345,24 +45050,24 @@
               return!0;
             }, enumerable:!0, configurable:!0});
             c.hide = function() {
-              t("public flash.ui.Mouse::static hide");
+              u("public flash.ui.Mouse::static hide");
             };
             c.show = function() {
-              t("public flash.ui.Mouse::static show");
+              u("public flash.ui.Mouse::static show");
             };
             c.registerCursor = function(a, c) {
               l(a);
-              u("public flash.ui.Mouse::static registerCursor");
+              t("public flash.ui.Mouse::static registerCursor");
             };
             c.unregisterCursor = function(a) {
               l(a);
-              u("public flash.ui.Mouse::static unregisterCursor");
+              t("public flash.ui.Mouse::static unregisterCursor");
             };
             c.updateCurrentPosition = function(a) {
               this._currentPosition.copyFrom(a);
             };
             c.classInitializer = function() {
-              this._currentPosition = new r.geom.Point;
+              this._currentPosition = new q.geom.Point;
               this._cursor = v.MouseCursor.AUTO;
               this.draggableObject = null;
             };
@@ -43372,7 +45077,7 @@
             return c;
           }(a.ASNative);
           v.Mouse = h;
-        })(r.ui || (r.ui = {}));
+        })(q.ui || (q.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
@@ -43382,9 +45087,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.ui.MouseCursor");
+              q("public flash.ui.MouseCursor");
             }
             __extends(c, a);
             c.fromNumber = function(a) {
@@ -43430,7 +45135,7 @@
             c.IBEAM = "ibeam";
             return c;
           }(a.ASNative);
-          k.MouseCursor = t;
+          k.MouseCursor = u;
         })(k.ui || (k.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -43441,25 +45146,25 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = function(a) {
             function d() {
-              t("public flash.ui.MouseCursorData");
+              u("public flash.ui.MouseCursorData");
             }
             __extends(d, a);
             Object.defineProperty(d.prototype, "data", {get:function() {
-              r("public flash.ui.MouseCursorData::get data");
+              q("public flash.ui.MouseCursorData::get data");
             }, set:function(a) {
-              r("public flash.ui.MouseCursorData::set data");
+              q("public flash.ui.MouseCursorData::set data");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "hotSpot", {get:function() {
-              r("public flash.ui.MouseCursorData::get hotSpot");
+              q("public flash.ui.MouseCursorData::get hotSpot");
             }, set:function(a) {
-              r("public flash.ui.MouseCursorData::set hotSpot");
+              q("public flash.ui.MouseCursorData::set hotSpot");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d.prototype, "frameRate", {get:function() {
-              r("public flash.ui.MouseCursorData::get frameRate");
+              q("public flash.ui.MouseCursorData::get frameRate");
             }, set:function(a) {
-              r("public flash.ui.MouseCursorData::set frameRate");
+              q("public flash.ui.MouseCursorData::set frameRate");
             }, enumerable:!0, configurable:!0});
             d.classInitializer = null;
             d.initializer = null;
@@ -43478,38 +45183,38 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.somewhatImplemented, t = d.Debug.notImplemented, l = d.Debug.dummyConstructor, c = d.AVM2.Runtime.asCoerceString, h = function(a) {
+          var q = d.Debug.somewhatImplemented, u = d.Debug.notImplemented, l = d.Debug.dummyConstructor, c = d.AVM2.Runtime.asCoerceString, h = function(a) {
             function d() {
               l("public flash.ui.Multitouch");
             }
             __extends(d, a);
             Object.defineProperty(d, "inputMode", {get:function() {
-              t("public flash.ui.Multitouch::get inputMode");
+              u("public flash.ui.Multitouch::get inputMode");
             }, set:function(a) {
               c(a);
-              t("public flash.ui.Multitouch::set inputMode");
+              u("public flash.ui.Multitouch::set inputMode");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "supportsTouchEvents", {get:function() {
-              r("public flash.ui.Multitouch::get supportsTouchEvents");
+              q("public flash.ui.Multitouch::get supportsTouchEvents");
               return!1;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "supportsGestureEvents", {get:function() {
-              r("public flash.ui.Multitouch::get supportsGestureEvents");
+              q("public flash.ui.Multitouch::get supportsGestureEvents");
               return!1;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "supportedGestures", {get:function() {
-              r("public flash.ui.Multitouch::get supportedGestures");
+              q("public flash.ui.Multitouch::get supportedGestures");
               return null;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "maxTouchPoints", {get:function() {
-              r("public flash.ui.Multitouch::get maxTouchPoints");
+              q("public flash.ui.Multitouch::get maxTouchPoints");
               return 0;
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(d, "mapTouchToMouse", {get:function() {
-              r("public flash.ui.Multitouch::get mapTouchToMouse");
+              q("public flash.ui.Multitouch::get mapTouchToMouse");
               return!0;
             }, set:function(a) {
-              t("public flash.ui.Multitouch::set mapTouchToMouse");
+              u("public flash.ui.Multitouch::set mapTouchToMouse");
             }, enumerable:!0, configurable:!0});
             d.classInitializer = null;
             d.initializer = null;
@@ -43528,9 +45233,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.ui.MultitouchInputMode");
+              q("public flash.ui.MultitouchInputMode");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -43542,7 +45247,7 @@
             c.TOUCH_POINT = "touchPoint";
             return c;
           }(a.ASNative);
-          k.MultitouchInputMode = t;
+          k.MultitouchInputMode = u;
         })(k.ui || (k.ui = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -43553,9 +45258,9 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.utils.Endian");
+              q("public flash.utils.Endian");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -43566,86 +45271,90 @@
             c.LITTLE_ENDIAN = "littleEndian";
             return c;
           }(a.ASNative);
-          k.Endian = t;
+          k.Endian = u;
         })(k.utils || (k.utils = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
-  (function(d) {
+  (function(k) {
     (function(a) {
       (function(a) {
         (function(v) {
-          var u = function(t) {
-            function l(c, d) {
+          var t = d.AVM2.enterTimeline, u = d.AVM2.leaveTimeline, l = function(c) {
+            function d(c, h) {
               a.events.EventDispatcher.instanceConstructorNoInitialize.call(this);
               this._delay = +c;
-              this._repeatCount = d | 0;
+              this._repeatCount = h | 0;
               this._iteration = 0;
             }
-            __extends(l, t);
-            Object.defineProperty(l.prototype, "running", {get:function() {
+            __extends(d, c);
+            Object.defineProperty(d.prototype, "running", {get:function() {
               return this._running;
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(l.prototype, "delay", {get:function() {
+            Object.defineProperty(d.prototype, "delay", {get:function() {
               return this._delay;
             }, set:function(a) {
               a = +a;
-              (0 > a || !isFinite(a)) && throwError("RangeError", d.Errors.DelayRangeError);
+              (0 > a || !isFinite(a)) && throwError("RangeError", k.Errors.DelayRangeError);
               this._delay = a;
               this._running && (this.stop(), this.start());
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(l.prototype, "repeatCount", {get:function() {
+            Object.defineProperty(d.prototype, "repeatCount", {get:function() {
               return this._repeatCount;
             }, set:function(a) {
               (this._repeatCount = a | 0) && this._running && this._iteration >= this._repeatCount && this.stop();
             }, enumerable:!0, configurable:!0});
-            Object.defineProperty(l.prototype, "currentCount", {get:function() {
+            Object.defineProperty(d.prototype, "currentCount", {get:function() {
               return this._iteration;
             }, enumerable:!0, configurable:!0});
-            l.prototype.reset = function() {
+            d.prototype.reset = function() {
               this._running && this.stop();
               this._iteration = 0;
             };
-            l.prototype.stop = function() {
+            d.prototype.stop = function() {
               this._running = !1;
               clearInterval(this._interval);
             };
-            l.prototype.start = function() {
+            d.prototype.start = function() {
               this._running || (this._running = !0, this._interval = setInterval(this._tick.bind(this), this._delay));
             };
-            l.prototype._tick = function() {
+            d.prototype._tick = function() {
               this._iteration++;
               if (this._running) {
                 if (a.utils.Timer.dispatchingEnabled) {
+                  t("Timer.Timer");
                   try {
                     this.dispatchEvent(new a.events.TimerEvent("timer", !0, !1));
                   } catch (c) {
                     console.warn("caught error under Timer TIMER event: ", c);
                   }
+                  u();
                 }
                 if (0 !== this._repeatCount && this._iteration >= this._repeatCount) {
                   this.stop();
+                  t("Timer.TimerComplete");
                   try {
                     this.dispatchEvent(new a.events.TimerEvent(a.events.TimerEvent.TIMER_COMPLETE, !1, !1));
                   } catch (d) {
                     console.warn("caught error under Timer COMPLETE event: ", d);
                   }
+                  u();
                 }
               }
             };
-            l.classInitializer = null;
-            l.initializer = null;
-            l.classSymbols = null;
-            l.instanceSymbols = null;
-            l.dispatchingEnabled = !0;
-            return l;
+            d.classInitializer = null;
+            d.initializer = null;
+            d.classSymbols = null;
+            d.instanceSymbols = null;
+            d.dispatchingEnabled = !0;
+            return d;
           }(a.events.EventDispatcher);
-          v.Timer = u;
+          v.Timer = l;
         })(a.utils || (a.utils = {}));
       })(a.flash || (a.flash = {}));
-    })(d.AS || (d.AS = {}));
+    })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
@@ -43653,9 +45362,9 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = function(a) {
-            function c(a, c, d, l) {
-              u("packageInternal flash.utils.SetIntervalTimer");
+          var t = d.Debug.dummyConstructor, u = function(a) {
+            function c(a, c, d, k) {
+              t("packageInternal flash.utils.SetIntervalTimer");
             }
             __extends(c, a);
             c.classInitializer = null;
@@ -43664,7 +45373,7 @@
             c.instanceSymbols = null;
             return c;
           }(a.utils.Timer);
-          k.SetIntervalTimer = t;
+          k.SetIntervalTimer = u;
         })(a.utils || (a.utils = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -43675,15 +45384,15 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
             function c(a, d) {
               l(d);
-              t("public flash.xml.XMLNode");
+              u("public flash.xml.XMLNode");
             }
             __extends(c, a);
             c.escapeXML = function(a) {
               l(a);
-              r("public flash.xml.XMLNode::static escapeXML");
+              q("public flash.xml.XMLNode::static escapeXML");
             };
             c.initializer = null;
             return c;
@@ -43699,11 +45408,11 @@
     (function(a) {
       (function(a) {
         (function(k) {
-          var u = d.Debug.dummyConstructor, t = d.AVM2.Runtime.asCoerceString, l = function(a) {
+          var t = d.Debug.dummyConstructor, u = d.AVM2.Runtime.asCoerceString, l = function(a) {
             function d(a) {
               void 0 === a && (a = null);
-              t(a);
-              u("public flash.xml.XMLDocument");
+              u(a);
+              t("public flash.xml.XMLDocument");
             }
             __extends(d, a);
             d.initializer = null;
@@ -43720,15 +45429,15 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.dummyConstructor, t = function(a) {
+          var q = d.Debug.dummyConstructor, u = function(a) {
             function c() {
-              r("public flash.xml.XMLNodeType");
+              q("public flash.xml.XMLNodeType");
             }
             __extends(c, a);
             c.initializer = null;
             return c;
           }(a.ASNative);
-          k.XMLNodeType = t;
+          k.XMLNodeType = u;
         })(k.xml || (k.xml = {}));
       })(a.flash || (a.flash = {}));
     })(k.AS || (k.AS = {}));
@@ -43739,17 +45448,17 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
             function c() {
-              t("packageInternal flash.xml.XMLParser");
+              u("packageInternal flash.xml.XMLParser");
             }
             __extends(c, a);
             c.prototype.startParse = function(a, c) {
               l(a);
-              r("packageInternal flash.xml.XMLParser::startParse");
+              q("packageInternal flash.xml.XMLParser::startParse");
             };
             c.prototype.getNext = function(a) {
-              r("packageInternal flash.xml.XMLParser::getNext");
+              q("packageInternal flash.xml.XMLParser::getNext");
             };
             c.initializer = null;
             return c;
@@ -43765,31 +45474,31 @@
     (function(a) {
       (function(k) {
         (function(k) {
-          var r = d.Debug.notImplemented, t = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
+          var q = d.Debug.notImplemented, u = d.Debug.dummyConstructor, l = d.AVM2.Runtime.asCoerceString, c = function(a) {
             function c() {
-              t("packageInternal flash.xml.XMLTag");
+              u("packageInternal flash.xml.XMLTag");
             }
             __extends(c, a);
             Object.defineProperty(c.prototype, "type", {get:function() {
-              r("packageInternal flash.xml.XMLTag::get type");
+              q("packageInternal flash.xml.XMLTag::get type");
             }, set:function(a) {
-              r("packageInternal flash.xml.XMLTag::set type");
+              q("packageInternal flash.xml.XMLTag::set type");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "empty", {get:function() {
-              r("packageInternal flash.xml.XMLTag::get empty");
+              q("packageInternal flash.xml.XMLTag::get empty");
             }, set:function(a) {
-              r("packageInternal flash.xml.XMLTag::set empty");
+              q("packageInternal flash.xml.XMLTag::set empty");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "value", {get:function() {
-              r("packageInternal flash.xml.XMLTag::get value");
+              q("packageInternal flash.xml.XMLTag::get value");
             }, set:function(a) {
               l(a);
-              r("packageInternal flash.xml.XMLTag::set value");
+              q("packageInternal flash.xml.XMLTag::set value");
             }, enumerable:!0, configurable:!0});
             Object.defineProperty(c.prototype, "attrs", {get:function() {
-              r("packageInternal flash.xml.XMLTag::get attrs");
+              q("packageInternal flash.xml.XMLTag::get attrs");
             }, set:function(a) {
-              r("packageInternal flash.xml.XMLTag::set attrs");
+              q("packageInternal flash.xml.XMLTag::set attrs");
             }, enumerable:!0, configurable:!0});
             c.initializer = null;
             return c;
@@ -43803,7 +45512,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(a, c, b) {
+      function q(a, c, b) {
         return{classSimpleName:a, nativeName:c, cls:b};
       }
       function v(a, c, b) {
@@ -43813,10 +45522,10 @@
           return a[b];
         }, configurable:!0});
       }
-      function u() {
+      function t() {
         return Date.now() - s.display.Loader.runtimeStartTime;
       }
-      function t(a, c) {
+      function u(a, c) {
         null !== a && void 0 !== a || p("TypeError", k.Errors.NullPointerError, "request");
         d.AVM2.Runtime.AVM2.instance.systemDomain.getClass("flash.net.URLRequest").isInstanceOf(a) || p("TypeError", k.Errors.CheckTypeFailedError, a, "flash.net.URLRequest");
         var b = a.url;
@@ -43846,38 +45555,38 @@
       var p = d.AVM2.Runtime.throwError, s = d.AVM2.AS.flash, m = d.AVM2.ABC.Multiname;
       jsGlobal.flash = d.AVM2.AS.flash;
       a.linkNatives = function(g) {
-        [r("flash.display.DisplayObject", "DisplayObjectClass", s.display.DisplayObject), r("flash.display.InteractiveObject", "InteractiveObjectClass", s.display.InteractiveObject), r("flash.display.DisplayObjectContainer", "ContainerClass", s.display.DisplayObjectContainer), r("flash.display.Sprite", "SpriteClass", s.display.Sprite), r("flash.display.MovieClip", "MovieClipClass", s.display.MovieClip), r("flash.display.Shape", "ShapeClass", s.display.Shape), r("flash.display.Bitmap", "BitmapClass", 
-        s.display.Bitmap), r("flash.display.BitmapData", "BitmapDataClass", s.display.BitmapData), r("flash.display.Stage", "StageClass", s.display.Stage), r("flash.display.Loader", "LoaderClass", s.display.Loader), r("flash.display.LoaderInfo", "LoaderInfoClass", s.display.LoaderInfo), r("flash.display.Graphics", "GraphicsClass", s.display.Graphics), r("flash.display.SimpleButton", "SimpleButtonClass", s.display.SimpleButton), r("flash.display.MorphShape", "MorphShapeClass", s.display.MorphShape), 
-        r("flash.display.NativeMenu", "NativeMenuClass", s.display.NativeMenu), r("flash.display.NativeMenuItem", "NativeMenuItemClass", s.display.NativeMenuItem), r("flash.display.FrameLabel", "FrameLabelClass", s.display.FrameLabel), r("flash.display.Scene", "SceneClass", s.display.Scene), r("flash.display.AVM1Movie", "AVM1MovieClass", s.display.AVM1Movie), r("flash.filters.BevelFilter", "BevelFilterClass", s.filters.BevelFilter), r("flash.filters.BitmapFilter", "BitmapFilterClass", s.filters.BitmapFilter), 
-        r("flash.filters.BlurFilter", "BlurFilterClass", s.filters.BlurFilter), r("flash.filters.ColorMatrixFilter", "ColorMatrixFilterClass", s.filters.ColorMatrixFilter), r("flash.filters.ConvolutionFilter", "ConvolutionFilterClass", s.filters.ConvolutionFilter), r("flash.filters.DisplacementMapFilter", "DisplacementMapFilterClass", s.filters.DisplacementMapFilter), r("flash.filters.DropShadowFilter", "DropShadowFilterClass", s.filters.DropShadowFilter), r("flash.filters.GlowFilter", "GlowFilterClass", 
-        s.filters.GlowFilter), r("flash.filters.GradientBevelFilter", "GradientBevelFilterClass", s.filters.GradientBevelFilter), r("flash.filters.GradientGlowFilter", "GradientGlowFilterClass", s.filters.GradientGlowFilter), r("flash.geom.Point", "PointClass", s.geom.Point), r("flash.geom.Rectangle", "RectangleClass", s.geom.Rectangle), r("flash.geom.Matrix", "MatrixClass", s.geom.Matrix), r("flash.geom.Matrix3D", "Matrix3DClass", s.geom.Matrix3D), r("flash.geom.Vector3D", "Vector3DClass", s.geom.Vector3D), 
-        r("flash.geom.Transform", "TransformClass", s.geom.Transform), r("flash.geom.ColorTransform", "ColorTransformClass", s.geom.ColorTransform), r("flash.events.EventDispatcher", "EventDispatcherClass", s.events.EventDispatcher), r("flash.events.Event", "EventClass", s.events.Event), r("flash.events.ErrorEvent", "ErrorEventClass", s.events.ErrorEvent), r("flash.events.IOErrorEvent", "IOErrorEventClass", s.events.IOErrorEvent), r("flash.events.KeyboardEvent", "KeyboardEventClass", s.events.KeyboardEvent), 
-        r("flash.events.MouseEvent", "MouseEventClass", s.events.MouseEvent), r("flash.events.GestureEvent", "GestureEventClass", s.events.GestureEvent), r("flash.events.TextEvent", "TextEventClass", s.events.TextEvent), r("flash.events.TimerEvent", "TimerEventClass", s.events.TimerEvent), r("flash.events.ProgressEvent", "ProgressEventClass", s.events.ProgressEvent), r("flash.events.NetStatusEvent", "NetStatusEventClass", s.events.NetStatusEvent), r("flash.events.HTTPStatusEvent", "HTTPStatusEventClass", 
-        s.events.HTTPStatusEvent), r("flash.events.UncaughtErrorEvents", "UncaughtErrorEventsClass", s.events.UncaughtErrorEvents), r("flash.external.ExternalInterface", "ExternalInterfaceClass", s.external.ExternalInterface), r("flash.ui.ContextMenu", "ContextMenuClass", s.ui.ContextMenu), r("flash.ui.ContextMenuItem", "ContextMenuItemClass", s.ui.ContextMenuItem), r("flash.ui.ContextMenuBuiltInItems", "ContextMenuBuiltInItemsClass", s.ui.ContextMenuBuiltInItems), r("flash.ui.ContextMenuClipboardItems", 
-        "ContextMenuClipboardItemsClass", s.ui.ContextMenuClipboardItems), r("flash.ui.Keyboard", "KeyboardClass", s.ui.Keyboard), r("flash.ui.Mouse", "MouseClass", s.ui.Mouse), r("flash.ui.MouseCursorData", "MouseCursorDataClass", s.ui.MouseCursorData), r("flash.ui.GameInput", "GameInputClass", s.ui.GameInput), r("flash.events.GameInputEvent", "GameInputEventClass", s.events.GameInputEvent), r("flash.ui.GameInputControl", "GameInputControlClass", s.ui.GameInputControl), r("flash.ui.GameInputControlType", 
-        "GameInputControlTypeClass", s.ui.GameInputControlType), r("flash.ui.GameInputDevice", "GameInputDeviceClass", s.ui.GameInputDevice), r("flash.ui.GameInputFinger", "GameInputFingerClass", s.ui.GameInputFinger), r("flash.ui.GameInputHand", "GameInputHandClass", s.ui.GameInputHand), r("flash.ui.Multitouch", "MultitouchClass", s.ui.Multitouch), r("flash.ui.MultitouchInputMode", "MultitouchInputModeClass", s.ui.MultitouchInputMode), r("flash.events.TouchEvent", "TouchEventClass", s.events.TouchEvent), 
-        r("flash.text.Font", "FontClass", s.text.Font), r("flash.text.TextField", "TextFieldClass", s.text.TextField), r("flash.text.StaticText", "StaticTextClass", s.text.StaticText), r("flash.text.StyleSheet", "StyleSheetClass", s.text.StyleSheet), r("flash.text.TextFormat", "TextFormatClass", s.text.TextFormat), r("flash.text.TextRun", "TextRunClass", s.text.TextRun), r("flash.text.TextLineMetrics"), r("flash.media.Sound", "SoundClass", s.media.Sound), r("flash.media.SoundChannel", "SoundChannelClass", 
-        s.media.SoundChannel), r("flash.media.SoundMixer", "SoundMixerClass", s.media.SoundMixer), r("flash.media.SoundTransform", "SoundTransformClass", s.media.SoundTransform), r("flash.media.Video", "VideoClass", s.media.Video), r("flash.media.StageVideo", "StageVideoClass", s.media.StageVideo), r("flash.media.ID3Info", "ID3InfoClass", s.media.ID3Info), r("flash.media.Microphone", "MicrophoneClass", s.media.Microphone), r("flash.net.FileFilter", "FileFilterClass", s.net.FileFilter), r("flash.net.NetConnection", 
-        "NetConnectionClass", s.net.NetConnection), r("flash.net.NetStream", "NetStreamClass", s.net.NetStream), r("flash.net.Responder", "ResponderClass", s.net.Responder), r("flash.net.URLRequest", "URLRequestClass", s.net.URLRequest), r("flash.net.URLRequestHeader"), r("flash.net.URLStream", "URLStreamClass", s.net.URLStream), r("flash.net.URLLoader", "URLLoaderClass", s.net.URLLoader), r("flash.net.SharedObject", "SharedObjectClass", s.net.SharedObject), r("flash.net.ObjectEncoding", "ObjectEncodingClass", 
-        s.net.ObjectEncoding), r("flash.net.LocalConnection", "LocalConnectionClass", s.net.LocalConnection), r("flash.net.Socket", "SocketClass", s.net.Socket), r("flash.net.URLVariables", "URLVariablesClass", s.net.URLVariables), r("packageInternal flash.system.FSCommand", "FSCommandClass", s.system.FSCommand), r("flash.system.Capabilities", "CapabilitiesClass", s.system.Capabilities), r("flash.system.Security", "SecurityClass", s.system.Security), r("flash.system.SecurityDomain", "SecurityDomainClass", 
-        s.system.SecurityDomain), r("flash.system.ApplicationDomain", "ApplicationDomainClass", s.system.ApplicationDomain), r("flash.system.JPEGLoaderContext", "JPEGLoaderContextClass", s.system.JPEGLoaderContext), r("flash.system.LoaderContext", "LoaderContextClass", s.system.LoaderContext), r("flash.accessibility.Accessibility", "AccessibilityClass", s.accessibility.Accessibility), r("flash.utils.Timer", "TimerClass", s.utils.Timer), r("flash.utils.ByteArray", "ByteArrayClass", s.utils.ByteArray)].forEach(function(c) {
-          for (var b = m.fromSimpleName(c.classSimpleName).getOriginalName().split("."), e = d.AVM2.AS, g = 0, l = b.length - 1;g < l;g++) {
+        [q("flash.display.DisplayObject", "DisplayObjectClass", s.display.DisplayObject), q("flash.display.InteractiveObject", "InteractiveObjectClass", s.display.InteractiveObject), q("flash.display.DisplayObjectContainer", "ContainerClass", s.display.DisplayObjectContainer), q("flash.display.Sprite", "SpriteClass", s.display.Sprite), q("flash.display.MovieClip", "MovieClipClass", s.display.MovieClip), q("flash.display.Shape", "ShapeClass", s.display.Shape), q("flash.display.Bitmap", "BitmapClass", 
+        s.display.Bitmap), q("flash.display.BitmapData", "BitmapDataClass", s.display.BitmapData), q("flash.display.Stage", "StageClass", s.display.Stage), q("flash.display.Loader", "LoaderClass", s.display.Loader), q("flash.display.LoaderInfo", "LoaderInfoClass", s.display.LoaderInfo), q("flash.display.Graphics", "GraphicsClass", s.display.Graphics), q("flash.display.SimpleButton", "SimpleButtonClass", s.display.SimpleButton), q("flash.display.MorphShape", "MorphShapeClass", s.display.MorphShape), 
+        q("flash.display.NativeMenu", "NativeMenuClass", s.display.NativeMenu), q("flash.display.NativeMenuItem", "NativeMenuItemClass", s.display.NativeMenuItem), q("flash.display.FrameLabel", "FrameLabelClass", s.display.FrameLabel), q("flash.display.Scene", "SceneClass", s.display.Scene), q("flash.display.AVM1Movie", "AVM1MovieClass", s.display.AVM1Movie), q("flash.filters.BevelFilter", "BevelFilterClass", s.filters.BevelFilter), q("flash.filters.BitmapFilter", "BitmapFilterClass", s.filters.BitmapFilter), 
+        q("flash.filters.BlurFilter", "BlurFilterClass", s.filters.BlurFilter), q("flash.filters.ColorMatrixFilter", "ColorMatrixFilterClass", s.filters.ColorMatrixFilter), q("flash.filters.ConvolutionFilter", "ConvolutionFilterClass", s.filters.ConvolutionFilter), q("flash.filters.DisplacementMapFilter", "DisplacementMapFilterClass", s.filters.DisplacementMapFilter), q("flash.filters.DropShadowFilter", "DropShadowFilterClass", s.filters.DropShadowFilter), q("flash.filters.GlowFilter", "GlowFilterClass", 
+        s.filters.GlowFilter), q("flash.filters.GradientBevelFilter", "GradientBevelFilterClass", s.filters.GradientBevelFilter), q("flash.filters.GradientGlowFilter", "GradientGlowFilterClass", s.filters.GradientGlowFilter), q("flash.geom.Point", "PointClass", s.geom.Point), q("flash.geom.Rectangle", "RectangleClass", s.geom.Rectangle), q("flash.geom.Matrix", "MatrixClass", s.geom.Matrix), q("flash.geom.Matrix3D", "Matrix3DClass", s.geom.Matrix3D), q("flash.geom.Vector3D", "Vector3DClass", s.geom.Vector3D), 
+        q("flash.geom.Transform", "TransformClass", s.geom.Transform), q("flash.geom.ColorTransform", "ColorTransformClass", s.geom.ColorTransform), q("flash.events.EventDispatcher", "EventDispatcherClass", s.events.EventDispatcher), q("flash.events.Event", "EventClass", s.events.Event), q("flash.events.ErrorEvent", "ErrorEventClass", s.events.ErrorEvent), q("flash.events.IOErrorEvent", "IOErrorEventClass", s.events.IOErrorEvent), q("flash.events.KeyboardEvent", "KeyboardEventClass", s.events.KeyboardEvent), 
+        q("flash.events.MouseEvent", "MouseEventClass", s.events.MouseEvent), q("flash.events.GestureEvent", "GestureEventClass", s.events.GestureEvent), q("flash.events.TextEvent", "TextEventClass", s.events.TextEvent), q("flash.events.TimerEvent", "TimerEventClass", s.events.TimerEvent), q("flash.events.ProgressEvent", "ProgressEventClass", s.events.ProgressEvent), q("flash.events.NetStatusEvent", "NetStatusEventClass", s.events.NetStatusEvent), q("flash.events.HTTPStatusEvent", "HTTPStatusEventClass", 
+        s.events.HTTPStatusEvent), q("flash.events.UncaughtErrorEvents", "UncaughtErrorEventsClass", s.events.UncaughtErrorEvents), q("flash.external.ExternalInterface", "ExternalInterfaceClass", s.external.ExternalInterface), q("flash.ui.ContextMenu", "ContextMenuClass", s.ui.ContextMenu), q("flash.ui.ContextMenuItem", "ContextMenuItemClass", s.ui.ContextMenuItem), q("flash.ui.ContextMenuBuiltInItems", "ContextMenuBuiltInItemsClass", s.ui.ContextMenuBuiltInItems), q("flash.ui.ContextMenuClipboardItems", 
+        "ContextMenuClipboardItemsClass", s.ui.ContextMenuClipboardItems), q("flash.ui.Keyboard", "KeyboardClass", s.ui.Keyboard), q("flash.ui.Mouse", "MouseClass", s.ui.Mouse), q("flash.ui.MouseCursorData", "MouseCursorDataClass", s.ui.MouseCursorData), q("flash.ui.GameInput", "GameInputClass", s.ui.GameInput), q("flash.events.GameInputEvent", "GameInputEventClass", s.events.GameInputEvent), q("flash.ui.GameInputControl", "GameInputControlClass", s.ui.GameInputControl), q("flash.ui.GameInputControlType", 
+        "GameInputControlTypeClass", s.ui.GameInputControlType), q("flash.ui.GameInputDevice", "GameInputDeviceClass", s.ui.GameInputDevice), q("flash.ui.GameInputFinger", "GameInputFingerClass", s.ui.GameInputFinger), q("flash.ui.GameInputHand", "GameInputHandClass", s.ui.GameInputHand), q("flash.ui.Multitouch", "MultitouchClass", s.ui.Multitouch), q("flash.ui.MultitouchInputMode", "MultitouchInputModeClass", s.ui.MultitouchInputMode), q("flash.events.TouchEvent", "TouchEventClass", s.events.TouchEvent), 
+        q("flash.text.Font", "FontClass", s.text.Font), q("flash.text.TextField", "TextFieldClass", s.text.TextField), q("flash.text.StaticText", "StaticTextClass", s.text.StaticText), q("flash.text.StyleSheet", "StyleSheetClass", s.text.StyleSheet), q("flash.text.TextFormat", "TextFormatClass", s.text.TextFormat), q("flash.text.TextRun", "TextRunClass", s.text.TextRun), q("flash.text.TextLineMetrics"), q("flash.media.Sound", "SoundClass", s.media.Sound), q("flash.media.SoundChannel", "SoundChannelClass", 
+        s.media.SoundChannel), q("flash.media.SoundMixer", "SoundMixerClass", s.media.SoundMixer), q("flash.media.SoundTransform", "SoundTransformClass", s.media.SoundTransform), q("flash.media.Video", "VideoClass", s.media.Video), q("flash.media.StageVideo", "StageVideoClass", s.media.StageVideo), q("flash.media.ID3Info", "ID3InfoClass", s.media.ID3Info), q("flash.media.Microphone", "MicrophoneClass", s.media.Microphone), q("flash.net.FileFilter", "FileFilterClass", s.net.FileFilter), q("flash.net.NetConnection", 
+        "NetConnectionClass", s.net.NetConnection), q("flash.net.NetStream", "NetStreamClass", s.net.NetStream), q("flash.net.Responder", "ResponderClass", s.net.Responder), q("flash.net.URLRequest", "URLRequestClass", s.net.URLRequest), q("flash.net.URLRequestHeader"), q("flash.net.URLStream", "URLStreamClass", s.net.URLStream), q("flash.net.URLLoader", "URLLoaderClass", s.net.URLLoader), q("flash.net.SharedObject", "SharedObjectClass", s.net.SharedObject), q("flash.net.ObjectEncoding", "ObjectEncodingClass", 
+        s.net.ObjectEncoding), q("flash.net.LocalConnection", "LocalConnectionClass", s.net.LocalConnection), q("flash.net.Socket", "SocketClass", s.net.Socket), q("flash.net.URLVariables", "URLVariablesClass", s.net.URLVariables), q("packageInternal flash.system.FSCommand", "FSCommandClass", s.system.FSCommand), q("flash.system.Capabilities", "CapabilitiesClass", s.system.Capabilities), q("flash.system.Security", "SecurityClass", s.system.Security), q("flash.system.SecurityDomain", "SecurityDomainClass", 
+        s.system.SecurityDomain), q("flash.system.ApplicationDomain", "ApplicationDomainClass", s.system.ApplicationDomain), q("flash.system.JPEGLoaderContext", "JPEGLoaderContextClass", s.system.JPEGLoaderContext), q("flash.system.LoaderContext", "LoaderContextClass", s.system.LoaderContext), q("flash.accessibility.Accessibility", "AccessibilityClass", s.accessibility.Accessibility), q("flash.utils.Timer", "TimerClass", s.utils.Timer), q("flash.utils.ByteArray", "ByteArrayClass", s.utils.ByteArray)].forEach(function(c) {
+          for (var b = m.fromSimpleName(c.classSimpleName).getOriginalName().split("."), e = d.AVM2.AS, g = 0, h = b.length - 1;g < h;g++) {
             e[b[g]] || (e[b[g]] = {}), e = e[b[g]];
           }
           v(e, c.classSimpleName, b[b.length - 1]);
           a.registerNativeClass(c.nativeName, c.cls);
         });
         a.registerNativeFunction("FlashUtilScript::getDefinitionByName", d.AVM2.AS.Natives.getDefinitionByName);
-        a.registerNativeFunction("FlashUtilScript::getTimer", u);
+        a.registerNativeFunction("FlashUtilScript::getTimer", t);
         a.registerNativeFunction("FlashUtilScript::escapeMultiByte", escape);
         a.registerNativeFunction("FlashUtilScript::unescapeMultiByte", unescape);
-        a.registerNativeFunction("FlashNetScript::navigateToURL", t);
+        a.registerNativeFunction("FlashNetScript::navigateToURL", u);
         a.registerNativeFunction("FlashNetScript::sendToURL", l);
         a.registerNativeFunction("Toplevel::registerClassAlias", c);
         a.registerNativeFunction("Toplevel::getClassByAlias", h);
       };
-      a.FlashUtilScript_getTimer = u;
-      a.FlashNetScript_navigateToURL = t;
+      a.FlashUtilScript_getTimer = t;
+      a.FlashNetScript_navigateToURL = u;
     })(k.AS || (k.AS = {}));
   })(d.AVM2 || (d.AVM2 = {}));
 })(Shumway || (Shumway = {}));
@@ -43891,9 +45600,9 @@
         this.position = 0;
         this.end = d.length;
         this.readANSI = 6 > k;
-        var r = new ArrayBuffer(4);
-        (new Int32Array(r))[0] = 1;
-        if (!(new Uint8Array(r))[0]) {
+        var q = new ArrayBuffer(4);
+        (new Int32Array(q))[0] = 1;
+        if (!(new Uint8Array(q))[0]) {
           throw Error("big-endian platform");
         }
       }
@@ -44101,12 +45810,12 @@
       a[a.ActionFSCommand2 = 45] = "ActionFSCommand2";
       a[a.ActionStrictMode = 137] = "ActionStrictMode";
     })(k.ActionCode || (k.ActionCode = {}));
-    var r = function() {
+    var q = function() {
       return function(a) {
         this.registerNumber = a;
       };
     }();
-    k.ParsedPushRegisterAction = r;
+    k.ParsedPushRegisterAction = q;
     var v = function() {
       return function(a) {
         this.constantIndex = a;
@@ -44123,7 +45832,7 @@
       a[a.Parent = 32] = "Parent";
       a[a.Root = 64] = "Root";
     })(k.ArgumentAssignmentType || (k.ArgumentAssignmentType = {}));
-    var u = function() {
+    var t = function() {
       function d(c, h) {
         this._actionsData = c;
         this.dataId = c.id;
@@ -44183,7 +45892,7 @@
                   g = void 0;
                   break;
                 case 4:
-                  g = new r(a.readUI8());
+                  g = new q(a.readUI8());
                   break;
                 case 5:
                   g = a.readBoolean();
@@ -44253,21 +45962,21 @@
             m = [new k.AVM1ActionsData(a.readBytes(g), this.dataId + "_w" + a.position, this._actionsData)];
             break;
           case 135:
-            var q = a.readUI8(), m = [q];
+            var n = a.readUI8(), m = [n];
             break;
           case 142:
-            for (var m = a.readString(), b = a.readUI16(), n = a.readUI8(), g = a.readUI16(), u = [], f = [], e = 0;e < b;e++) {
-              var q = a.readUI8(), L = a.readString();
-              f.push(L);
-              q && (u[q] = {type:1, name:L, index:e});
+            for (var m = a.readString(), b = a.readUI16(), r = a.readUI8(), g = a.readUI16(), t = [], f = [], e = 0;e < b;e++) {
+              var n = a.readUI8(), H = a.readString();
+              f.push(H);
+              n && (t[n] = {type:1, name:H, index:e});
             }
             b = 1;
-            g & 1 && (u[b++] = {type:2});
-            g & 4 && (u[b++] = {type:4});
-            g & 16 && (u[b++] = {type:8});
-            g & 64 && (u[b++] = {type:64});
-            g & 128 && (u[b++] = {type:32});
-            g & 256 && (u[b++] = {type:16});
+            g & 1 && (t[b++] = {type:2});
+            g & 4 && (t[b++] = {type:4});
+            g & 16 && (t[b++] = {type:8});
+            g & 64 && (t[b++] = {type:64});
+            g & 128 && (t[b++] = {type:32});
+            g & 256 && (t[b++] = {type:16});
             b = 0;
             g & 2 && (b |= 2);
             g & 8 && (b |= 4);
@@ -44275,7 +45984,7 @@
             g = a.readUI16();
             s += g;
             g = new k.AVM1ActionsData(a.readBytes(g), this.dataId + "_f" + a.position, this._actionsData);
-            m = [g, m, f, n, u, b];
+            m = [g, m, f, r, t, b];
             break;
           case 143:
             g = a.readUI8();
@@ -44284,19 +45993,19 @@
             g = !!(g & 1);
             b = a.readUI16();
             e = a.readUI16();
-            u = a.readUI16();
-            n = m ? a.readUI8() : a.readString();
-            s += b + e + u;
+            t = a.readUI16();
+            r = m ? a.readUI8() : a.readString();
+            s += b + e + t;
             b = new k.AVM1ActionsData(a.readBytes(b), this.dataId + "_t" + a.position, this._actionsData);
             e = new k.AVM1ActionsData(a.readBytes(e), this.dataId + "_c" + a.position, this._actionsData);
-            u = new k.AVM1ActionsData(a.readBytes(u), this.dataId + "_z" + a.position, this._actionsData);
-            m = [m, n, b, g, e, f, u];
+            t = new k.AVM1ActionsData(a.readBytes(t), this.dataId + "_z" + a.position, this._actionsData);
+            m = [m, r, b, g, e, f, t];
             break;
           case 137:
             m = [a.readUI8()];
         }
         a.position = s;
-        return{position:d, actionCode:l, actionName:t[l], args:m};
+        return{position:d, actionCode:l, actionName:u[l], args:m};
       };
       d.prototype.skip = function(a) {
         for (var d = this._stream;0 < a && d.position < d.end;) {
@@ -44307,8 +46016,8 @@
       };
       return d;
     }();
-    k.ActionsDataParser = u;
-    var t = {0:"EOA", 4:"ActionNextFrame", 5:"ActionPreviousFrame", 6:"ActionPlay", 7:"ActionStop", 8:"ActionToggleQuality", 9:"ActionStopSounds", 10:"ActionAdd", 11:"ActionSubtract", 12:"ActionMultiply", 13:"ActionDivide", 14:"ActionEquals", 15:"ActionLess", 16:"ActionAnd", 17:"ActionOr", 18:"ActionNot", 19:"ActionStringEquals", 20:"ActionStringLength", 21:"ActionStringExtract", 23:"ActionPop", 24:"ActionToInteger", 28:"ActionGetVariable", 29:"ActionSetVariable", 32:"ActionSetTarget2", 33:"ActionStringAdd", 
+    k.ActionsDataParser = t;
+    var u = {0:"EOA", 4:"ActionNextFrame", 5:"ActionPreviousFrame", 6:"ActionPlay", 7:"ActionStop", 8:"ActionToggleQuality", 9:"ActionStopSounds", 10:"ActionAdd", 11:"ActionSubtract", 12:"ActionMultiply", 13:"ActionDivide", 14:"ActionEquals", 15:"ActionLess", 16:"ActionAnd", 17:"ActionOr", 18:"ActionNot", 19:"ActionStringEquals", 20:"ActionStringLength", 21:"ActionStringExtract", 23:"ActionPop", 24:"ActionToInteger", 28:"ActionGetVariable", 29:"ActionSetVariable", 32:"ActionSetTarget2", 33:"ActionStringAdd", 
     34:"ActionGetProperty", 35:"ActionSetProperty", 36:"ActionCloneSprite", 37:"ActionRemoveSprite", 38:"ActionTrace", 39:"ActionStartDrag", 40:"ActionEndDrag", 41:"ActionStringLess", 42:"ActionThrow", 43:"ActionCastOp", 44:"ActionImplementsOp", 45:"ActionFSCommand2", 48:"ActionRandomNumber", 49:"ActionMBStringLength", 50:"ActionCharToAscii", 51:"ActionAsciiToChar", 52:"ActionGetTime", 53:"ActionMBStringExtract", 54:"ActionMBCharToAscii", 55:"ActionMBAsciiToChar", 58:"ActionDelete", 59:"ActionDelete2", 
     60:"ActionDefineLocal", 61:"ActionCallFunction", 62:"ActionReturn", 63:"ActionModulo", 64:"ActionNewObject", 65:"ActionDefineLocal2", 66:"ActionInitArray", 67:"ActionInitObject", 68:"ActionTypeOf", 69:"ActionTargetPath", 70:"ActionEnumerate", 71:"ActionAdd2", 72:"ActionLess2", 73:"ActionEquals2", 74:"ActionToNumber", 75:"ActionToString", 76:"ActionPushDuplicate", 77:"ActionStackSwap", 78:"ActionGetMember", 79:"ActionSetMember", 80:"ActionIncrement", 81:"ActionDecrement", 82:"ActionCallMethod", 
     83:"ActionNewMethod", 84:"ActionInstanceOf", 85:"ActionEnumerate2", 96:"ActionBitAnd", 97:"ActionBitOr", 98:"ActionBitXor", 99:"ActionBitLShift", 100:"ActionBitRShift", 101:"ActionBitURShift", 102:"ActionStrictEquals", 103:"ActionGreater", 104:"ActionStringGreater", 105:"ActionExtends", 129:"ActionGotoFrame", 131:"ActionGetURL", 135:"ActionStoreRegister", 136:"ActionConstantPool", 137:"ActionStrictMode", 138:"ActionWaitForFrame", 139:"ActionSetTarget", 140:"ActionGoToLabel", 141:"ActionWaitForFrame2", 
@@ -44324,14 +46033,14 @@
       }
       a.prototype.analyze = function(a) {
         for (var d = [], k = [0], l = [!0], c = !1, h = null, p = [0];0 < p.length;) {
-          var r = p.shift();
-          if (!d[r]) {
-            for (a.position = r;!a.eof && !d[r];) {
+          var q = p.shift();
+          if (!d[q]) {
+            for (a.position = q;!a.eof && !d[q];) {
               var m = a.readNext();
               if (0 === m.actionCode) {
                 break;
               }
-              var g = a.position, f = {action:m, next:g, conditionalJumpTo:-1}, b = 0, e = !1, q = !1;
+              var g = a.position, f = {action:m, next:g, conditionalJumpTo:-1}, b = 0, e = !1, n = !1;
               switch(m.actionCode) {
                 case 138:
                 ;
@@ -44342,7 +46051,7 @@
                   a.position = g;
                   break;
                 case 153:
-                  e = q = !0;
+                  e = n = !0;
                   b = g + m.args[0];
                   break;
                 case 157:
@@ -44354,7 +46063,7 @@
                 case 62:
                 ;
                 case 0:
-                  e = q = !0;
+                  e = n = !0;
                   b = a.length;
                   break;
                 case 136:
@@ -44363,36 +46072,36 @@
                     break;
                   }
                   c = !0;
-                  0 === r && (h = m.args[0]);
+                  0 === q && (h = m.args[0]);
               }
               if (e) {
                 if (0 > b || b > a.length) {
                   console.error("jump outside the action block;"), b = a.length;
                 }
-                q ? f.next = b : f.conditionalJumpTo = b;
+                n ? f.next = b : f.conditionalJumpTo = b;
                 l[b] || (k.push(b), p.push(b), l[b] = !0);
               }
-              d[r] = f;
-              if (q) {
+              d[q] = f;
+              if (n) {
                 break;
               }
-              r = g;
+              q = g;
             }
           }
         }
-        var n = [];
+        var r = [];
         k.forEach(function(a) {
           if (d[a]) {
             var b = [], e = a;
             do {
               e = d[e], b.push(e), e = e.next;
             } while (!l[e] && d[e]);
-            n.push({label:a, items:b, jump:e});
+            r.push({label:a, items:b, jump:e});
           }
         });
         k = null;
         c ? k = h : this.parentResults && (k = this.parentResults.singleConstantPool);
-        return{actions:d, blocks:n, dataId:a.dataId, singleConstantPool:k, registersLimit:this.registersLimit};
+        return{actions:d, blocks:r, dataId:a.dataId, singleConstantPool:k, registersLimit:this.registersLimit};
       };
       return a;
     }();
@@ -44445,8 +46154,8 @@
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
@@ -44462,7 +46171,7 @@
       }
       console.warn.apply(console, arguments);
     }
-    function r(a) {
+    function q(a) {
       if (null === a) {
         return "null";
       }
@@ -44470,16 +46179,16 @@
       return "function" === b ? "object" : "object" === b && "object" === typeof a && a && a instanceof k.Lib.AVM1MovieClip ? "movieclip" : b;
     }
     function v(a) {
-      return "object" !== r(a) ? a : a.valueOf();
+      return "object" !== q(a) ? a : a.valueOf();
     }
-    function u() {
+    function t() {
       return k.AVM1Context.instance.loaderInfo.swfVersion;
     }
-    function t(a) {
-      return "object" !== r(a) ? a : a instanceof Date && 6 <= u() ? a.toString() : a.valueOf();
+    function u(a) {
+      return "object" !== q(a) ? a : a instanceof Date && 6 <= t() ? a.toString() : a.valueOf();
     }
     function l(a) {
-      switch(r(a)) {
+      switch(q(a)) {
         default:
         ;
         case "undefined":
@@ -44500,19 +46209,19 @@
     }
     function c(a) {
       a = v(a);
-      switch(r(a)) {
+      switch(q(a)) {
         case "undefined":
         ;
         case "null":
-          return 7 <= u() ? NaN : 0;
+          return 7 <= t() ? NaN : 0;
         case "boolean":
           return a ? 1 : 0;
         case "number":
           return a;
         case "string":
-          return "" === a && 5 > u() ? 0 : +a;
+          return "" === a && 5 > t() ? 0 : +a;
         default:
-          return 5 <= u() ? NaN : 0;
+          return 5 <= t() ? NaN : 0;
       }
     }
     function h(a) {
@@ -44520,9 +46229,9 @@
       return isNaN(a) || !isFinite(a) || 0 === a ? 0 : a | 0;
     }
     function p(a) {
-      switch(r(a)) {
+      switch(q(a)) {
         case "undefined":
-          return 7 <= u() ? "undefined" : "";
+          return 7 <= t() ? "undefined" : "";
         case "null":
           return "null";
         case "boolean":
@@ -44602,63 +46311,63 @@
       if (d.isNullOrUndefined(b)) {
         return a("AVM1 warning: cannot look up member '" + e + "' on undefined object"), null;
       }
-      var k;
+      var h;
       b = Object(b);
-      if (null !== (k = f(b, e))) {
-        return k;
+      if (null !== (h = f(b, e))) {
+        return h;
       }
-      if (Yb(e) || 6 < u()) {
+      if (Yb(e) || 6 < t()) {
         return c ? (oa.link = b, oa.name = e, oa) : null;
       }
-      var h = e.toLowerCase();
-      if (null !== (k = f(b, h))) {
-        return k;
+      var n = e.toLowerCase();
+      if (null !== (h = f(b, n))) {
+        return h;
       }
-      null === Ga && (Ga = Object.create(null), Zb.forEach(function(a) {
-        Ga[a.toLowerCase()] = a;
+      null === Fa && (Fa = Object.create(null), Zb.forEach(function(a) {
+        Fa[a.toLowerCase()] = a;
       }));
-      var l = Ga[h] || null;
-      if (l && null !== (k = f(b, l))) {
-        return k;
+      var k = Fa[n] || null;
+      if (k && null !== (h = f(b, k))) {
+        return h;
       }
-      var n = null, q = null;
+      var l = null, m = null;
       g(b, function(a, b) {
-        null === n && b.toLowerCase() === h && (q = a, n = b);
+        null === l && b.toLowerCase() === n && (m = a, l = b);
       }, null);
-      return n ? (oa.link = q, oa.name = n, oa) : c ? (oa.link = b, oa.name = l || e, oa) : null;
+      return l ? (oa.link = m, oa.name = l, oa) : c ? (oa.link = b, oa.name = k || e, oa) : null;
     }
     function e(a, e) {
       var c = b(a, e, !1);
       return c ? c.link.asGetPublicProperty(c.name) : void 0;
     }
-    function q(a, e, c) {
+    function n(a, e, c) {
       if (e = b(a, e, !0)) {
         var d = e.link.asGetPropertyDescriptor(void 0, e.name, 0);
         !d || "value" in d ? a.asSetPublicProperty(e.name, c) : e.link.asSetPublicProperty(e.name, c);
-        n(e.name);
+        r(e.name);
       }
     }
-    function n(a) {
+    function r(a) {
       "o" === a[0] && "n" === a[1] && k.AVM1Context.instance.broadcastEventPropertyChange(a);
     }
     function x(a) {
-      return "undefined" !== typeof InternalError && a instanceof InternalError && "too much recursion" === a.message ? new ra("long running script -- AVM1 recursion limit is reached") : a;
+      return "undefined" !== typeof InternalError && a instanceof InternalError && "too much recursion" === a.message ? new qa("long running script -- AVM1 recursion limit is reached") : a;
     }
-    function L(a, b, e) {
+    function H(a, b, e) {
       a.asSetPublicProperty("__proto__", b);
       a.asDefinePublicProperty("__constructor__", {value:e, writable:!0, enumerable:!1, configurable:!1});
     }
-    function A(a, b) {
+    function C(a, b) {
       var e;
       if (a instanceof d.AVM2.AS.ASClass) {
-        e = $b(a, b), L(e, a.asGetPublicProperty("prototype"), a);
+        e = $b(a, b), H(e, a.asGetPublicProperty("prototype"), a);
       } else {
-        if (Ja(a)) {
+        if (Ia(a)) {
           for (var c = a.asGetPublicProperty("prototype");c && !c.initAVM1ObjectInstance;) {
             c = c.asGetPublicProperty("__proto__");
           }
           e = c ? Object.create(c) : {};
-          L(e, a.asGetPublicProperty("prototype"), a);
+          H(e, a.asGetPublicProperty("prototype"), a);
           c && c.initAVM1ObjectInstance.call(e, k.AVM1Context.instance);
           a.apply(e, b);
         } else {
@@ -44667,13 +46376,13 @@
       }
       return e;
     }
-    function H(a, b) {
+    function F(a, b) {
       g(a, function(a, e) {
         return b.call(null, e);
       });
     }
     function K(a, e) {
-      if (6 > u()) {
+      if (6 > t()) {
         return null;
       }
       var c;
@@ -44688,9 +46397,9 @@
       c = c.asGetPublicProperty("__proto__");
       return c ? (c = b(c, e, !1)) ? {target:c.link, name:c.name, obj:c.link.asGetPublicProperty(c.name)} : null : null;
     }
-    function F(a, b, e) {
+    function E(a, b, e) {
       if (!b.executionProhibited) {
-        var c = Va.get(), d = [];
+        var c = Ua.get(), d = [];
         d.length = 4;
         var f = b.initialScope.create(e), g;
         b.pushCallFrame(e, null, null);
@@ -44698,12 +46407,12 @@
         c.indent();
         b.enterContext(function() {
           try {
-            va(a, f, [], d);
+            ua(a, f, [], d);
           } catch (b) {
             g = x(b);
           }
         }, e);
-        g instanceof ra && (b.executionProhibited = !0, console.error("Disabling AVM1 execution"));
+        g instanceof qa && (b.executionProhibited = !0, console.error("Disabling AVM1 execution"));
         b.popCallFrame();
         c.unindent();
         c.message("ActionScript Execution Stops");
@@ -44712,7 +46421,7 @@
         }
       }
     }
-    function J(b, e, c) {
+    function Q(b, e, c) {
       var d = b.split(/[\/.]/g);
       "" === d[d.length - 1] && d.pop();
       if ("" === d[0] || "_level0" === d[0] || "_root" === d[0]) {
@@ -44728,7 +46437,7 @@
       }
       return e;
     }
-    function M(a, b) {
+    function N(a, b) {
       if (a === Array) {
         var e = b;
         1 == b.length && "number" === typeof b[0] && (e = [], e.length = b[0]);
@@ -44748,27 +46457,27 @@
         }
       }
       if (a === Object) {
-        return new Wa;
+        return new Va;
       }
     }
-    function D(b, e) {
+    function B(b, e) {
       if (isNaN(b) || 0 > b) {
         return a("Invalid amount of arguments: " + b), 0;
       }
       b |= 0;
       return b > e ? (a("Truncating amount of arguments: from " + b + " to " + e), e) : b;
     }
-    function B(a) {
-      for (var b = +a.pop(), b = D(b, a.length), e = [], c = 0;c < b;c++) {
+    function y(a) {
+      for (var b = +a.pop(), b = B(b, a.length), e = [], c = 0;c < b;c++) {
         e.push(a.pop());
       }
       return e;
     }
-    function E(a, b) {
+    function L(a, b) {
       var e = a.context;
       if (b) {
         try {
-          var c = J(b, e.currentTarget || e.defaultTarget, e.resolveLevel(0));
+          var c = Q(b, e.currentTarget || e.defaultTarget, e.resolveLevel(0));
           e.currentTarget = c;
         } catch (d) {
           throw e.currentTarget = null, d;
@@ -44777,190 +46486,190 @@
         e.currentTarget = null;
       }
     }
-    function y(a) {
+    function A(a) {
       return a === this;
     }
     function z(a, b, e, c, d, f, g) {
-      function k() {
-        if (!l.executionProhibited) {
-          var a, e = new ac, d = y(this) ? m : this, x, v, Ua = l.pushCallFrame(d, k, arguments);
-          g & 4 || (x = Xa(arguments, 0), e.asSetPublicProperty("arguments", x));
+      function h() {
+        if (!k.executionProhibited) {
+          var a, e = new ac, d = A(this) ? r : this, x, v, Ta = k.pushCallFrame(d, h, arguments);
+          g & 4 || (x = Wa(arguments, 0), e.asSetPublicProperty("arguments", x));
           g & 2 || e.asSetPublicProperty("this", d);
-          g & 8 || (v = new wa(Ua), e.asSetPublicProperty("super", v));
-          a = q.create(e);
-          var A, w = h();
-          for (A = 0;A < u;A++) {
-            var K = f[A];
-            if (K) {
-              switch(K.type) {
+          g & 8 || (v = new va(Ta), e.asSetPublicProperty("super", v));
+          a = m.create(e);
+          var C, w = n();
+          for (C = 0;C < t;C++) {
+            var F = f[C];
+            if (F) {
+              switch(F.type) {
                 case 1:
-                  w[A] = arguments[K.index];
+                  w[C] = arguments[F.index];
                   break;
                 case 2:
-                  w[A] = d;
+                  w[C] = d;
                   break;
                 case 4:
-                  x = x || Xa(arguments, 0);
-                  w[A] = x;
+                  x = x || Wa(arguments, 0);
+                  w[C] = x;
                   break;
                 case 8:
-                  v = v || new wa(Ua);
-                  w[A] = v;
+                  v = v || new va(Ta);
+                  w[C] = v;
                   break;
                 case 16:
-                  w[A] = n;
+                  w[C] = l;
                   break;
                 case 32:
-                  w[A] = m.asGetPublicProperty("_parent");
+                  w[C] = r.asGetPublicProperty("_parent");
                   break;
                 case 64:
-                  w[A] = l.resolveLevel(0);
+                  w[C] = k.resolveLevel(0);
               }
             }
           }
-          for (A = 0;A < arguments.length || A < c.length;A++) {
-            t && t[A] || e.asSetPublicProperty(c[A], arguments[A]);
+          for (C = 0;C < arguments.length || C < c.length;C++) {
+            u && u[C] || e.asSetPublicProperty(c[C], arguments[C]);
           }
-          var H, F;
+          var K, E;
           p.indent();
-          if (256 <= ++l.stackDepth) {
-            throw new ra("long running script -- AVM1 recursion limit is reached");
+          if (256 <= ++k.stackDepth) {
+            throw new qa("long running script -- AVM1 recursion limit is reached");
           }
-          l.enterContext(function() {
+          k.enterContext(function() {
             try {
-              H = va(b, a, s, w);
+              K = ua(b, a, s, w);
             } catch (e) {
-              F = e;
+              E = e;
             }
-          }, r);
-          l.stackDepth--;
-          l.popCallFrame();
+          }, q);
+          k.stackDepth--;
+          k.popCallFrame();
           p.unindent();
-          10 < L.length || L.push(w);
-          if (F) {
-            throw F;
+          10 < H.length || H.push(w);
+          if (E) {
+            throw E;
           }
-          return H;
+          return K;
         }
       }
-      function h() {
-        if (0 < L.length) {
-          return L.pop();
+      function n() {
+        if (0 < H.length) {
+          return H.pop();
         }
         var a = [];
         a.length = v;
         return a;
       }
-      var l = a.context, n = a.global, q = a.scopeContainer, m = a.scope, p = a.actionTracer, r = l.defaultTarget, s = a.constantPool, t = null, u = f ? f.length : 0;
-      for (a = 0;a < u;a++) {
+      var k = a.context, l = a.global, m = a.scopeContainer, r = a.scope, p = a.actionTracer, q = k.defaultTarget, s = a.constantPool, u = null, t = f ? f.length : 0;
+      for (a = 0;a < t;a++) {
         var x = f[a];
-        x && 1 === x.type && (t || (t = []), t[f[a].index] = !0);
+        x && 1 === x.type && (u || (u = []), u[f[a].index] = !0);
       }
-      var v = Math.min(d, 255), v = Math.max(v, u + 1), L = [];
-      d = k;
-      d.instanceConstructor = k;
+      var v = Math.min(d, 255), v = Math.max(v, t + 1), H = [];
+      d = h;
+      d.instanceConstructor = h;
       d.debugName = "avm1 " + (e || "<function>");
       e && (d.name = e);
-      return k;
+      return h;
     }
     function G(a) {
       return a && (0 <= a.indexOf(".") || 0 <= a.indexOf(":"));
     }
-    function C(e, c, d) {
+    function I(e, c, d) {
       var f = e.global;
       e = e.context;
-      var g, k;
+      var g, h;
       if (0 <= c.indexOf(":")) {
         g = e.currentTarget || e.defaultTarget;
-        k = c.split(":");
-        g = J(k[0], g, e.resolveLevel(0));
+        h = c.split(":");
+        g = Q(h[0], g, e.resolveLevel(0));
         if (!g) {
-          return a(k[0] + " is undefined"), null;
+          return a(h[0] + " is undefined"), null;
         }
-        k = k[1];
+        h = h[1];
       } else {
         if (0 <= c.indexOf(".")) {
-          for (c = c.split("."), k = c.pop(), g = f, f = 0;f < c.length;f++) {
+          for (c = c.split("."), h = c.pop(), g = f, f = 0;f < c.length;f++) {
             if (g = (e = b(g, c[f], !1)) && e.link.asGetPublicProperty(e.name), !g) {
               return a(c.slice(0, f + 1) + " is undefined"), null;
             }
           }
         }
       }
-      return(e = b(g, k, d)) ? (ja.obj = g, ja.link = e.link, ja.name = e.name, ja) : null;
+      return(e = b(g, h, d)) ? (ia.obj = g, ia.link = e.link, ia.name = e.name, ia) : null;
     }
-    function I(a, e) {
+    function D(a, e) {
       if (G(e)) {
-        return C(a, e, !1);
+        return I(a, e, !1);
       }
       var c = a.scopeContainer, d = a.context, d = d.currentTarget || d.defaultTarget, f = a.scope, g;
       if (g = b(f, e, !1)) {
-        return ja.obj = f, ja.link = g.link, ja.name = g.name, ja;
+        return ia.obj = f, ia.link = g.link, ia.name = g.name, ia;
       }
       for (;c;c = c.next) {
         if (g = b(c.scope, e, !1)) {
-          return ja.obj = c.scope, ja.link = g.link, ja.name = g.name, ja;
+          return ia.obj = c.scope, ia.link = g.link, ia.name = g.name, ia;
         }
       }
-      return(g = b(d, e, !1)) ? (ja.obj = d, ja.link = g.link, ja.name = g.name, ja) : "this" === e ? (f.asDefinePublicProperty("this", {value:d, configurable:!0}), ja.obj = f, ja.link = f, ja.name = "this", ja) : null;
+      return(g = b(d, e, !1)) ? (ia.obj = d, ia.link = g.link, ia.name = g.name, ia) : "this" === e ? (f.asDefinePublicProperty("this", {value:d, configurable:!0}), ia.obj = f, ia.link = f, ia.name = "this", ia) : null;
     }
-    function P(a, e) {
+    function R(a, e) {
       if (G(e)) {
-        return C(a, e, !0);
+        return I(a, e, !0);
       }
       var c = a.scopeContainer, d = a.context, f = d.currentTarget || d.defaultTarget, g = a.scope;
       if (d.currentTarget) {
-        return ja.obj = f, ja.link = f, ja.name = e, ja;
+        return ia.obj = f, ia.link = f, ia.name = e, ia;
       }
       if (d = b(g, e, !1)) {
-        return ja.obj = g, ja.link = d.link, ja.name = d.name, ja;
+        return ia.obj = g, ia.link = d.link, ia.name = d.name, ia;
       }
       for (;c.next;c = c.next) {
         if (d = b(c.scope, e, !1)) {
-          return ja.obj = c.scope, ja.link = d.link, ja.name = d.name, ja;
+          return ia.obj = c.scope, ia.link = d.link, ia.name = d.name, ia;
         }
       }
-      ja.obj = f;
-      ja.link = f;
-      ja.name = e;
-      return ja;
+      ia.obj = f;
+      ia.link = f;
+      ia.name = e;
+      return ia;
     }
     function T(a, b) {
       var e = a.global, c = b[0];
       b[1] ? e.gotoAndPlay(c + 1) : e.gotoAndStop(c + 1);
     }
-    function O(a, b) {
+    function J(a, b) {
       a.global.getURL(b[0], b[1]);
     }
-    function Q(a) {
+    function P(a) {
       a.global.nextFrame();
     }
     function S(a) {
       a.global.prevFrame();
     }
-    function V(a) {
+    function W(a) {
       a.global.play();
     }
-    function aa(a) {
+    function ba(a) {
       a.global.stop();
     }
-    function $(a) {
+    function w(a) {
       a.global.toggleHighQuality();
     }
-    function w(a) {
+    function X(a) {
       a.global.stopAllSounds();
     }
     function U(a, b) {
       return!a.global.ifFrameLoaded(b[0]);
     }
-    function ba(a, b) {
-      E(a, b[0]);
+    function $(a, b) {
+      L(a, b[0]);
     }
-    function R(a, b) {
+    function Y(a, b) {
       var e = a.global, c = b[0];
       b[1] ? e.gotoAndPlay(c) : e.gotoAndStop(c);
     }
-    function N(a, b) {
+    function M(a, b) {
       var e = a.registers, c = a.constantPool, d = a.stack;
       b.forEach(function(a) {
         a instanceof k.ParsedPushConstantAction ? d.push(c[a.constantIndex]) : a instanceof k.ParsedPushRegisterAction ? (a = a.registerNumber, 0 > a || a >= e.length ? d.push(void 0) : d.push(e[a])) : d.push(a);
@@ -44969,28 +46678,28 @@
     function Z(a) {
       a.stack.pop();
     }
-    function fa(a) {
+    function ca(a) {
       a = a.stack;
       var b = c(a.pop()), e = c(a.pop());
       a.push(b + e);
     }
-    function X(a) {
+    function ga(a) {
       a = a.stack;
       var b = c(a.pop()), e = c(a.pop());
       a.push(e - b);
     }
-    function ia(a) {
+    function ha(a) {
       a = a.stack;
       var b = c(a.pop()), e = c(a.pop());
       a.push(b * e);
     }
-    function ga(a) {
+    function ea(a) {
       var b = a.stack;
       a = a.isSwfVersion5;
       var e = c(b.pop()), e = c(b.pop()) / e;
       b.push(a ? e : isFinite(e) ? e : "#ERROR#");
     }
-    function ca(a) {
+    function aa(a) {
       var b = a.stack;
       a = a.isSwfVersion5;
       var e = c(b.pop()), d = c(b.pop()), e = e == d;
@@ -45002,25 +46711,25 @@
       var e = c(b.pop()), e = c(b.pop()) < e;
       b.push(a ? e : e ? 1 : 0);
     }
-    function ea(a) {
+    function O(a) {
       var b = a.stack;
       a = a.isSwfVersion5;
       var e = l(b.pop()), c = l(b.pop()), e = e && c;
       b.push(a ? e : e ? 1 : 0);
     }
-    function W(a) {
+    function ka(a) {
       var b = a.stack;
       a = a.isSwfVersion5;
       var e = l(b.pop()), c = l(b.pop()), e = e || c;
       b.push(a ? e : e ? 1 : 0);
     }
-    function ka(a) {
+    function V(a) {
       var b = a.stack;
       a = a.isSwfVersion5;
       var e = !l(b.pop());
       b.push(a ? e : e ? 1 : 0);
     }
-    function Y(a) {
+    function ja(a) {
       var b = a.stack;
       a = a.isSwfVersion5;
       var e = p(b.pop()), c = p(b.pop()), e = e == c;
@@ -45038,84 +46747,84 @@
       var e = p(b.pop());
       b.push(a.length_(e));
     }
-    function na(a) {
+    function ra(a) {
       a = a.stack;
       var b = p(a.pop()), e = p(a.pop());
       a.push(e + b);
     }
-    function sa(a) {
+    function na(a) {
       var b = a.stack;
       a = a.global;
       var e = b.pop(), c = b.pop(), d = p(b.pop());
       b.push(a.substring(d, c, e));
     }
-    function pa(a) {
+    function Ca(a) {
       var b = a.stack;
       a = a.global;
       var e = b.pop(), c = b.pop(), d = p(b.pop());
       b.push(a.mbsubstring(d, c, e));
     }
-    function Da(a) {
+    function sa(a) {
       var b = a.stack;
       a = a.isSwfVersion5;
       var e = p(b.pop()), e = p(b.pop()) < e;
       b.push(a ? e : e ? 1 : 0);
     }
-    function ta(a) {
+    function wa(a) {
       var b = a.stack;
       b.push(a.global.int(b.pop()));
     }
-    function Ea(a) {
+    function ta(a) {
       var b = a.stack;
       a = a.global;
       var e = b.pop();
       b.push(a.ord(e));
     }
-    function ua(a) {
+    function fa(a) {
       var b = a.stack;
       a = a.global;
       var e = b.pop();
       b.push(a.mbord(e));
     }
-    function ha(a) {
+    function Da(a) {
       var b = a.stack;
       a = a.global;
       var e = +b.pop();
       b.push(a.chr(e));
     }
-    function Fa(a) {
+    function Ea(a) {
       var b = a.stack;
       a = a.global;
       var e = +b.pop();
       b.push(a.mbchr(e));
     }
-    function Ia(a, b) {
+    function Ha(a, b) {
     }
-    function Ca(a, b) {
+    function Ba(a, b) {
       return!!a.stack.pop();
     }
-    function Ba(a) {
+    function xa(a) {
       var b = a.global;
       a = a.stack.pop();
       b.call(a);
     }
-    function xa(a) {
+    function pa(a) {
       var b = a.stack, e = "" + b.pop(), c = b.length;
       b.push(void 0);
-      a = I(a, e);
+      a = D(a, e);
       b[c] = a ? a.link.asGetPublicProperty(a.name) : void 0;
     }
-    function qa(a) {
+    function ya(a) {
       var b = a.stack, e = b.pop(), b = "" + b.pop();
-      if (a = P(a, b)) {
-        a.link.asSetPublicProperty(a.name, e), n(a.name);
+      if (a = R(a, b)) {
+        a.link.asSetPublicProperty(a.name, e), r(a.name);
       }
     }
-    function ya(a, b) {
+    function Ja(a, b) {
       var e = a.global, c = a.stack, d = b[0], f = c.pop(), c = c.pop(), g;
       d & 1 ? g = "GET" : d & 2 && (g = "POST");
-      var k = d & 64;
-      d & 128 ? e.loadVariables(c, f, g) : k ? e.loadMovie(c, f, g) : e.getURL(c, f, g);
+      var h = d & 64;
+      d & 128 ? e.loadVariables(c, f, g) : h ? e.loadMovie(c, f, g) : e.getURL(c, f, g);
     }
     function Ka(a, b) {
       var e = a.global, c = b[0], d = [a.stack.pop()];
@@ -45124,7 +46833,7 @@
     }
     function La(a) {
       var b = a.stack.pop();
-      E(a, b);
+      L(a, b);
     }
     function Ma(a) {
       var b = a.global;
@@ -45165,7 +46874,7 @@
       var e = a.global, c = a.stack.pop();
       return!e.ifFrameLoaded(c);
     }
-    function Ta(a) {
+    function Xa(a) {
       var b = a.global;
       a = a.stack.pop();
       b.trace(void 0 === a ? "undefined" : p(a));
@@ -45178,36 +46887,36 @@
       b.push(a.global.random(b.pop()));
     }
     function $a(b) {
-      var e = b.stack, c = e.pop(), d = B(e), f = e.length;
+      var e = b.stack, c = e.pop(), d = y(e), f = e.length;
       e.push(void 0);
-      var g = (b = I(b, c)) ? b.link.asGetPublicProperty(b.name) : void 0;
+      var g = (b = D(b, c)) ? b.link.asGetPublicProperty(b.name) : void 0;
       g instanceof Function ? e[f] = g.apply(b.obj || null, d) : a("AVM1 warning: function '" + c + (g ? "' is not callable" : "' is undefined"));
     }
     function ab(b) {
-      var c = b.stack, f = c.pop(), g = c.pop(), k = B(c), h, l = c.length;
+      var c = b.stack, f = c.pop(), g = c.pop(), h = y(c), n, k = c.length;
       c.push(void 0);
       if (d.isNullOrUndefined(g)) {
         a("AVM1 warning: method '" + f + "' can't be called on undefined object");
       } else {
         b = b.context.frame;
-        var n, q;
+        var l, m;
         if (d.isNullOrUndefined(f) || "" === f) {
-          if (g instanceof wa) {
-            var m = g.callFrame, p = K(m, "__constructor__");
-            p && (n = p.target, q = p.obj, h = m.currentThis);
+          if (g instanceof va) {
+            var r = g.callFrame, p = K(r, "__constructor__");
+            p && (l = p.target, m = p.obj, n = r.currentThis);
           } else {
-            h = q = g;
+            n = m = g;
           }
-          Ja(q) ? (b.setCallee(h, n, q, k), c[l] = q.apply(h, k), b.resetCallee()) : a("AVM1 warning: obj '" + g + (g ? "' is not callable" : "' is undefined"));
+          Ia(m) ? (b.setCallee(n, l, m, h), c[k] = m.apply(n, h), b.resetCallee()) : a("AVM1 warning: obj '" + g + (g ? "' is not callable" : "' is undefined"));
         } else {
-          if (g instanceof wa) {
-            if (m = g.callFrame, p = K(m, f)) {
-              n = p.target, q = p.obj, h = m.currentThis;
+          if (g instanceof va) {
+            if (r = g.callFrame, p = K(r, f)) {
+              l = p.target, m = p.obj, n = r.currentThis;
             }
           } else {
-            q = e(g, f), h = g;
+            m = e(g, f), n = g;
           }
-          Ja(q) ? (b.setCallee(h, n, q, k), c[l] = q.apply(h, k), b.resetCallee()) : a("AVM1 warning: method '" + f + "' on object", g, d.isNullOrUndefined(q) ? "is undefined" : "is not callable");
+          Ia(m) ? (b.setCallee(n, l, m, h), c[k] = m.apply(n, h), b.resetCallee()) : a("AVM1 warning: method '" + f + "' on object", g, d.isNullOrUndefined(m) ? "is undefined" : "is not callable");
         }
       }
     }
@@ -45233,7 +46942,7 @@
       a = a.stack;
       var b = a.pop(), e = a.pop();
       a.push(e.asDeleteProperty(void 0, b, 0));
-      n(b);
+      r(b);
     }
     function gb(a) {
       var e = a.stack, c = e.pop();
@@ -45249,13 +46958,13 @@
         a = !1;
       }
       e.push(a);
-      n(c);
+      r(c);
     }
     function hb(a) {
       var b = a.stack, e = b.pop();
       b.push(null);
-      a = (a = I(a, e)) ? a.link.asGetPublicProperty(a.name) : void 0;
-      d.isNullOrUndefined(a) || H(a, function(a) {
+      a = (a = D(a, e)) ? a.link.asGetPublicProperty(a.name) : void 0;
+      d.isNullOrUndefined(a) || F(a, function(a) {
         b.push(a);
       });
     }
@@ -45271,7 +46980,7 @@
       if (d.isNullOrUndefined(f)) {
         a("AVM1 warning: cannot get member '" + c + "' on undefined object");
       } else {
-        if (f instanceof wa) {
+        if (f instanceof va) {
           if (c = K(f.callFrame, c)) {
             b[b.length - 1] = c.obj;
           }
@@ -45282,13 +46991,13 @@
     }
     function kb(a) {
       a = a.stack;
-      var b = B(a);
+      var b = y(a);
       a.push(b);
     }
     function lb(a) {
       a = a.stack;
-      var b = +a.pop(), b = D(b, a.length >> 1), e = {};
-      L(e, null, Wa);
+      var b = +a.pop(), b = B(b, a.length >> 1), e = {};
+      H(e, null, Va);
       for (var c = 0;c < b;c++) {
         var d = a.pop(), f = a.pop();
         e.asSetPublicProperty(f, d);
@@ -45297,40 +47006,40 @@
     }
     function mb(e) {
       e = e.stack;
-      var c = e.pop(), f = e.pop(), g = B(e), k = e.length;
+      var c = e.pop(), f = e.pop(), g = y(e), h = e.length;
       e.push(void 0);
       if (d.isNullOrUndefined(f)) {
         a("AVM1 warning: method '" + c + "' can't be constructed on undefined object");
       } else {
-        var h;
-        d.isNullOrUndefined(c) || "" === c ? h = f : (h = b(f, c, !1), h = f.asGetPublicProperty(h ? h.name : null));
-        g = A(h, g);
+        var n;
+        d.isNullOrUndefined(c) || "" === c ? n = f : (n = b(f, c, !1), n = f.asGetPublicProperty(n ? n.name : null));
+        g = C(n, g);
         void 0 === g && a("AVM1 warning: method '" + c + "' on object", f, "is not constructible");
-        e[k] = g;
+        e[h] = g;
       }
     }
     function nb(b) {
-      var e = b.stack, c = e.pop(), d = B(e), f = e.length;
+      var e = b.stack, c = e.pop(), d = y(e), f = e.length;
       e.push(void 0);
-      b = (b = I(b, c)) ? b.link.asGetPublicProperty(b.name) : void 0;
-      var g = M(b, d);
-      void 0 === g && (g = A(b, d), void 0 === g && a("AVM1 warning: object '" + c + (b ? "' is not constructible" : "' is undefined")));
+      b = (b = D(b, c)) ? b.link.asGetPublicProperty(b.name) : void 0;
+      var g = N(b, d);
+      void 0 === g && (g = C(b, d), void 0 === g && a("AVM1 warning: object '" + c + (b ? "' is not constructible" : "' is undefined")));
       e[f] = g;
     }
     function ob(b) {
       var e = b.stack;
       b = e.pop();
       var c = e.pop(), e = e.pop();
-      d.isNullOrUndefined(e) ? a("AVM1 warning: cannot set member '" + c + "' on undefined object") : e instanceof wa ? a("AVM1 warning: cannot set member '" + c + "' on super") : q(e, c, b);
+      d.isNullOrUndefined(e) ? a("AVM1 warning: cannot set member '" + c + "' on undefined object") : e instanceof va ? a("AVM1 warning: cannot set member '" + c + "' on super") : n(e, c, b);
     }
     function pb(a) {
       a = a.stack;
       var b = a.pop();
-      a.push("movieclip" === r(b) ? b._target : void 0);
+      a.push("movieclip" === q(b) ? b._target : void 0);
     }
     function qb(a, b) {
       var e = b[0], c = a.stack.pop(), d = a.constantPool, f = a.registers, c = a.scopeContainer.create(Object(c));
-      va(e, c, d, f);
+      ua(e, c, d, f);
     }
     function rb(a) {
       a = a.stack;
@@ -45343,11 +47052,11 @@
     function tb(a) {
       a = a.stack;
       var b = a.pop();
-      a.push(r(b));
+      a.push(q(b));
     }
     function ub(a) {
       a = a.stack;
-      var b = t(a.pop()), e = t(a.pop());
+      var b = u(a.pop()), e = u(a.pop());
       "string" === typeof b || "string" === typeof e ? a.push(p(e) + p(b)) : a.push(c(e) + c(b));
     }
     function vb(a) {
@@ -45426,7 +47135,7 @@
       var e = b.stack;
       b = e.pop();
       e.push(null);
-      d.isNullOrUndefined(b) ? a("AVM1 warning: cannot iterate over undefined object") : H(b, function(a) {
+      d.isNullOrUndefined(b) ? a("AVM1 warning: cannot iterate over undefined object") : F(b, function(a) {
         e.push(a);
       });
     }
@@ -45465,31 +47174,31 @@
     function Rb(a) {
       a = a.stack;
       var b = a.pop(), e = +a.pop();
-      D(e, a.length);
+      B(e, a.length);
       for (var c = [], d = 0;d < e;d++) {
         c.push(a.pop());
       }
       b._as2Interfaces = c;
     }
     function Sb(a, b) {
-      var e = b[5], c = b[3], d = b[1], f = b[2], g = b[4], k = b[6], h = a.context, l = a.scopeContainer, n = a.scope, q = a.constantPool, m = a.registers, p = h.isTryCatchListening, r;
+      var e = b[5], c = b[3], d = b[1], f = b[2], g = b[4], h = b[6], n = a.context, k = a.scopeContainer, l = a.scope, m = a.constantPool, r = a.registers, p = n.isTryCatchListening, q;
       try {
-        h.isTryCatchListening = !0, va(f, l, q, m);
+        n.isTryCatchListening = !0, ua(f, k, m, r);
       } catch (s) {
-        h.isTryCatchListening = p, c && s instanceof Ha ? ("string" === typeof d ? n.asSetPublicProperty(d, s.error) : m[d] = s.error, va(g, l, q, m)) : r = s;
+        n.isTryCatchListening = p, c && s instanceof Ga ? ("string" === typeof d ? l.asSetPublicProperty(d, s.error) : r[d] = s.error, ua(g, k, m, r)) : q = s;
       }
-      h.isTryCatchListening = p;
-      e && va(k, l, q, m);
-      if (r) {
-        throw r;
+      n.isTryCatchListening = p;
+      e && ua(h, k, m, r);
+      if (q) {
+        throw q;
       }
     }
     function Tb(a) {
       a = a.stack.pop();
-      throw new Ha(a);
+      throw new Ga(a);
     }
     function Ub(a) {
-      var b = a.stack, e = a.global, c = B(b);
+      var b = a.stack, e = a.global, c = y(b);
       a = b.length;
       b.push(void 0);
       e = e.fscommand.apply(null, c);
@@ -45505,16 +47214,16 @@
         } catch (f) {
           c = b.context;
           f = x(f);
-          if (f instanceof ra) {
+          if (f instanceof qa) {
             throw f;
           }
-          if (f instanceof Ha) {
+          if (f instanceof Ga) {
             throw f;
           }
           Vb.instance.reportTelemetry({topic:"error", error:1});
           if (!b.recoveringFromError) {
             if (1E3 <= c.errorsIgnored++) {
-              throw new ra("long running script -- AVM1 errors limit is reached");
+              throw new qa("long running script -- AVM1 errors limit is reached");
             }
             console.log(typeof f);
             console.log(Object.getPrototypeOf(f));
@@ -45531,13 +47240,13 @@
       a = k.avm1ErrorsEnabled.value ? function(a) {
         return a;
       } : cc;
-      return{ActionGotoFrame:a(T), ActionGetURL:a(O), ActionNextFrame:a(Q), ActionPreviousFrame:a(S), ActionPlay:a(V), ActionStop:a(aa), ActionToggleQuality:a($), ActionStopSounds:a(w), ActionWaitForFrame:a(U), ActionSetTarget:a(ba), ActionGoToLabel:a(R), ActionPush:a(N), ActionPop:a(Z), ActionAdd:a(fa), ActionSubtract:a(X), ActionMultiply:a(ia), ActionDivide:a(ga), ActionEquals:a(ca), ActionLess:a(da), ActionAnd:a(ea), ActionOr:a(W), ActionNot:a(ka), ActionStringEquals:a(Y), ActionStringLength:a(la), 
-      ActionMBStringLength:a(ma), ActionStringAdd:a(na), ActionStringExtract:a(sa), ActionMBStringExtract:a(pa), ActionStringLess:a(Da), ActionToInteger:a(ta), ActionCharToAscii:a(Ea), ActionMBCharToAscii:a(ua), ActionAsciiToChar:a(ha), ActionMBAsciiToChar:a(Fa), ActionJump:a(Ia), ActionIf:a(Ca), ActionCall:a(Ba), ActionGetVariable:a(xa), ActionSetVariable:a(qa), ActionGetURL2:a(ya), ActionGotoFrame2:a(Ka), ActionSetTarget2:a(La), ActionGetProperty:a(Ma), ActionSetProperty:a(Na), ActionCloneSprite:a(Oa), 
-      ActionRemoveSprite:a(Pa), ActionStartDrag:a(Qa), ActionEndDrag:a(Ra), ActionWaitForFrame2:a(Sa), ActionTrace:a(Ta), ActionGetTime:a(Ya), ActionRandomNumber:a(Za), ActionCallFunction:a($a), ActionCallMethod:a(ab), ActionConstantPool:a(bb), ActionDefineFunction:a(cb), ActionDefineLocal:a(db), ActionDefineLocal2:a(eb), ActionDelete:a(fb), ActionDelete2:a(gb), ActionEnumerate:a(hb), ActionEquals2:a(ib), ActionGetMember:a(jb), ActionInitArray:a(kb), ActionInitObject:a(lb), ActionNewMethod:a(mb), 
+      return{ActionGotoFrame:a(T), ActionGetURL:a(J), ActionNextFrame:a(P), ActionPreviousFrame:a(S), ActionPlay:a(W), ActionStop:a(ba), ActionToggleQuality:a(w), ActionStopSounds:a(X), ActionWaitForFrame:a(U), ActionSetTarget:a($), ActionGoToLabel:a(Y), ActionPush:a(M), ActionPop:a(Z), ActionAdd:a(ca), ActionSubtract:a(ga), ActionMultiply:a(ha), ActionDivide:a(ea), ActionEquals:a(aa), ActionLess:a(da), ActionAnd:a(O), ActionOr:a(ka), ActionNot:a(V), ActionStringEquals:a(ja), ActionStringLength:a(la), 
+      ActionMBStringLength:a(ma), ActionStringAdd:a(ra), ActionStringExtract:a(na), ActionMBStringExtract:a(Ca), ActionStringLess:a(sa), ActionToInteger:a(wa), ActionCharToAscii:a(ta), ActionMBCharToAscii:a(fa), ActionAsciiToChar:a(Da), ActionMBAsciiToChar:a(Ea), ActionJump:a(Ha), ActionIf:a(Ba), ActionCall:a(xa), ActionGetVariable:a(pa), ActionSetVariable:a(ya), ActionGetURL2:a(Ja), ActionGotoFrame2:a(Ka), ActionSetTarget2:a(La), ActionGetProperty:a(Ma), ActionSetProperty:a(Na), ActionCloneSprite:a(Oa), 
+      ActionRemoveSprite:a(Pa), ActionStartDrag:a(Qa), ActionEndDrag:a(Ra), ActionWaitForFrame2:a(Sa), ActionTrace:a(Xa), ActionGetTime:a(Ya), ActionRandomNumber:a(Za), ActionCallFunction:a($a), ActionCallMethod:a(ab), ActionConstantPool:a(bb), ActionDefineFunction:a(cb), ActionDefineLocal:a(db), ActionDefineLocal2:a(eb), ActionDelete:a(fb), ActionDelete2:a(gb), ActionEnumerate:a(hb), ActionEquals2:a(ib), ActionGetMember:a(jb), ActionInitArray:a(kb), ActionInitObject:a(lb), ActionNewMethod:a(mb), 
       ActionNewObject:a(nb), ActionSetMember:a(ob), ActionTargetPath:a(pb), ActionWith:a(qb), ActionToNumber:a(rb), ActionToString:a(sb), ActionTypeOf:a(tb), ActionAdd2:a(ub), ActionLess2:a(vb), ActionModulo:a(wb), ActionBitAnd:a(xb), ActionBitLShift:a(yb), ActionBitOr:a(zb), ActionBitRShift:a(Ab), ActionBitURShift:a(Bb), ActionBitXor:a(Cb), ActionDecrement:a(Db), ActionIncrement:a(Eb), ActionPushDuplicate:a(Fb), ActionReturn:a(Gb), ActionStackSwap:a(Hb), ActionStoreRegister:a(Ib), ActionInstanceOf:a(Jb), 
       ActionEnumerate2:a(Kb), ActionStrictEquals:a(Lb), ActionGreater:a(Mb), ActionStringGreater:a(Nb), ActionDefineFunction2:a(Ob), ActionExtends:a(Pb), ActionCastOp:a(Qb), ActionImplementsOp:a(Rb), ActionTry:a(Sb), ActionThrow:a(Tb), ActionFSCommand2:a(Ub), ActionStrictMode:a(bc)};
     }
-    function va(a, b, e, c) {
+    function ua(a, b, e, c) {
       var f = k.AVM1Context.instance;
       if (!a.ir) {
         var g = new k.ActionsDataParser(a, f.loaderInfo.swfVersion), h = new k.ActionsDataAnalyzer;
@@ -45546,17 +47255,17 @@
         a.ir = h.analyze(g);
         if (k.avm1CompilerEnabled.value) {
           try {
-            var l = new ec;
-            a.ir.compiled = l.generate(a.ir);
-          } catch (n) {
-            console.error("Unable to compile AVM1 function: " + n);
+            var n = new ec;
+            a.ir.compiled = n.generate(a.ir);
+          } catch (l) {
+            console.error("Unable to compile AVM1 function: " + l);
           }
         }
       }
       a = a.ir;
-      var h = a.compiled, g = [], q = 5 <= f.loaderInfo.swfVersion, m = Va.get(), l = b.scope;
-      b = {context:f, global:f.globals, scopeContainer:b, scope:l, actionTracer:m, constantPool:e, registers:c, stack:g, frame:null, isSwfVersion5:q, recoveringFromError:!1, isEndOfActions:!1};
-      l._as3Object && l._as3Object._deferScriptExecution && (f.deferScriptExecution = !0);
+      var h = a.compiled, g = [], m = 5 <= f.loaderInfo.swfVersion, r = Ua.get(), n = b.scope;
+      b = {context:f, global:f.globals, scopeContainer:b, scope:n, actionTracer:r, constantPool:e, registers:c, stack:g, frame:null, isSwfVersion5:m, recoveringFromError:!1, isEndOfActions:!1};
+      n._as3Object && n._as3Object._deferScriptExecution && (f.deferScriptExecution = !0);
       if (h) {
         return h(b);
       }
@@ -45567,349 +47276,349 @@
       }
       for (c = a.actions[0];c && !b.isEndOfActions;) {
         if (0 === e++ % 1E3 && Date.now() >= f) {
-          throw new ra("long running script -- AVM1 instruction hang timeout");
+          throw new qa("long running script -- AVM1 instruction hang timeout");
         }
         h = b;
-        l = q = void 0;
+        n = m = void 0;
         try {
-          var q = h, p = c.action, r = p.actionCode, s = p.args;
-          q.actionTracer.print(p, q.stack);
-          m = !1;
-          switch(r | 0) {
+          var m = h, p = c.action, q = p.actionCode, s = p.args;
+          m.actionTracer.print(p, m.stack);
+          r = !1;
+          switch(q | 0) {
             case 129:
-              T(q, s);
+              T(m, s);
               break;
             case 131:
-              O(q, s);
+              J(m, s);
               break;
             case 4:
-              Q(q);
+              P(m);
               break;
             case 5:
-              S(q);
+              S(m);
               break;
             case 6:
-              V(q);
+              W(m);
               break;
             case 7:
-              aa(q);
+              ba(m);
               break;
             case 8:
-              $(q);
+              w(m);
               break;
             case 9:
-              w(q);
+              X(m);
               break;
             case 138:
-              m = U(q, s);
+              r = U(m, s);
               break;
             case 139:
-              ba(q, s);
+              $(m, s);
               break;
             case 140:
-              R(q, s);
+              Y(m, s);
               break;
             case 150:
-              N(q, s);
+              M(m, s);
               break;
             case 23:
-              Z(q);
+              Z(m);
               break;
             case 10:
-              fa(q);
+              ca(m);
               break;
             case 11:
-              X(q);
+              ga(m);
               break;
             case 12:
-              ia(q);
+              ha(m);
               break;
             case 13:
-              ga(q);
+              ea(m);
               break;
             case 14:
-              ca(q);
+              aa(m);
               break;
             case 15:
-              da(q);
+              da(m);
               break;
             case 16:
-              ea(q);
+              O(m);
               break;
             case 17:
-              W(q);
+              ka(m);
               break;
             case 18:
-              ka(q);
+              V(m);
               break;
             case 19:
-              Y(q);
+              ja(m);
               break;
             case 20:
-              la(q);
+              la(m);
               break;
             case 49:
-              ma(q);
+              ma(m);
               break;
             case 33:
-              na(q);
+              ra(m);
               break;
             case 21:
-              sa(q);
+              na(m);
               break;
             case 53:
-              pa(q);
+              Ca(m);
               break;
             case 41:
-              Da(q);
+              sa(m);
               break;
             case 24:
-              ta(q);
+              wa(m);
               break;
             case 50:
-              Ea(q);
+              ta(m);
               break;
             case 54:
-              ua(q);
+              fa(m);
               break;
             case 51:
-              ha(q);
+              Da(m);
               break;
             case 55:
-              Fa(q);
+              Ea(m);
               break;
             case 153:
               break;
             case 157:
-              m = Ca(q, s);
+              r = Ba(m, s);
               break;
             case 158:
-              Ba(q);
+              xa(m);
               break;
             case 28:
-              xa(q);
+              pa(m);
               break;
             case 29:
-              qa(q);
+              ya(m);
               break;
             case 154:
-              ya(q, s);
+              Ja(m, s);
               break;
             case 159:
-              Ka(q, s);
+              Ka(m, s);
               break;
             case 32:
-              La(q);
+              La(m);
               break;
             case 34:
-              Ma(q);
+              Ma(m);
               break;
             case 35:
-              Na(q);
+              Na(m);
               break;
             case 36:
-              Oa(q);
+              Oa(m);
               break;
             case 37:
-              Pa(q);
+              Pa(m);
               break;
             case 39:
-              Qa(q);
+              Qa(m);
               break;
             case 40:
-              Ra(q);
+              Ra(m);
               break;
             case 141:
-              m = Sa(q, s);
+              r = Sa(m, s);
               break;
             case 38:
-              Ta(q);
+              Xa(m);
               break;
             case 52:
-              Ya(q);
+              Ya(m);
               break;
             case 48:
-              Za(q);
+              Za(m);
               break;
             case 61:
-              $a(q);
+              $a(m);
               break;
             case 82:
-              ab(q);
+              ab(m);
               break;
             case 136:
-              bb(q, s);
+              bb(m, s);
               break;
             case 155:
-              cb(q, s);
+              cb(m, s);
               break;
             case 60:
-              db(q);
+              db(m);
               break;
             case 65:
-              eb(q);
+              eb(m);
               break;
             case 58:
-              fb(q);
+              fb(m);
               break;
             case 59:
-              gb(q);
+              gb(m);
               break;
             case 70:
-              hb(q);
+              hb(m);
               break;
             case 73:
-              ib(q);
+              ib(m);
               break;
             case 78:
-              jb(q);
+              jb(m);
               break;
             case 66:
-              kb(q);
+              kb(m);
               break;
             case 67:
-              lb(q);
+              lb(m);
               break;
             case 83:
-              mb(q);
+              mb(m);
               break;
             case 64:
-              nb(q);
+              nb(m);
               break;
             case 79:
-              ob(q);
+              ob(m);
               break;
             case 69:
-              pb(q);
+              pb(m);
               break;
             case 148:
-              qb(q, s);
+              qb(m, s);
               break;
             case 74:
-              rb(q);
+              rb(m);
               break;
             case 75:
-              sb(q);
+              sb(m);
               break;
             case 68:
-              tb(q);
+              tb(m);
               break;
             case 71:
-              ub(q);
+              ub(m);
               break;
             case 72:
-              vb(q);
+              vb(m);
               break;
             case 63:
-              wb(q);
+              wb(m);
               break;
             case 96:
-              xb(q);
+              xb(m);
               break;
             case 99:
-              yb(q);
+              yb(m);
               break;
             case 97:
-              zb(q);
+              zb(m);
               break;
             case 100:
-              Ab(q);
+              Ab(m);
               break;
             case 101:
-              Bb(q);
+              Bb(m);
               break;
             case 98:
-              Cb(q);
+              Cb(m);
               break;
             case 81:
-              Db(q);
+              Db(m);
               break;
             case 80:
-              Eb(q);
+              Eb(m);
               break;
             case 76:
-              Fb(q);
+              Fb(m);
               break;
             case 62:
-              Gb(q);
+              Gb(m);
               break;
             case 77:
-              Hb(q);
+              Hb(m);
               break;
             case 135:
-              Ib(q, s);
+              Ib(m, s);
               break;
             case 84:
-              Jb(q);
+              Jb(m);
               break;
             case 85:
-              Kb(q);
+              Kb(m);
               break;
             case 102:
-              Lb(q);
+              Lb(m);
               break;
             case 103:
-              Mb(q);
+              Mb(m);
               break;
             case 104:
-              Nb(q);
+              Nb(m);
               break;
             case 142:
-              Ob(q, s);
+              Ob(m, s);
               break;
             case 105:
-              Pb(q);
+              Pb(m);
               break;
             case 43:
-              Qb(q);
+              Qb(m);
               break;
             case 44:
-              Rb(q);
+              Rb(m);
               break;
             case 143:
-              Sb(q, s);
+              Sb(m, s);
               break;
             case 42:
-              Tb(q);
+              Tb(m);
               break;
             case 45:
-              Ub(q);
+              Ub(m);
               break;
             case 137:
               break;
             case 0:
-              q.isEndOfActions = !0;
+              m.isEndOfActions = !0;
               break;
             default:
-              throw Error("Unknown action code: " + r);;
+              throw Error("Unknown action code: " + q);;
           }
-          l = m;
+          n = r;
           h.recoveringFromError = !1;
-        } catch (t) {
-          q = h.context;
-          t = x(t);
-          if (k.avm1ErrorsEnabled.value && !q.isTryCatchListening || t instanceof ra) {
-            throw t;
+        } catch (u) {
+          m = h.context;
+          u = x(u);
+          if (k.avm1ErrorsEnabled.value && !m.isTryCatchListening || u instanceof qa) {
+            throw u;
           }
-          if (t instanceof Ha) {
-            throw t;
+          if (u instanceof Ga) {
+            throw u;
           }
           Vb.instance.reportTelemetry({topic:"error", error:1});
           if (!h.recoveringFromError) {
-            if (1E3 <= q.errorsIgnored++) {
-              throw new ra("long running script -- AVM1 errors limit is reached");
+            if (1E3 <= m.errorsIgnored++) {
+              throw new qa("long running script -- AVM1 errors limit is reached");
             }
-            console.error("AVM1 error: " + t);
-            d.AVM2.Runtime.AVM2.instance.exceptions.push({source:"avm1", message:t.message, stack:t.stack});
+            console.error("AVM1 error: " + u);
+            d.AVM2.Runtime.AVM2.instance.exceptions.push({source:"avm1", message:u.message, stack:u.stack});
             h.recoveringFromError = !0;
           }
         }
-        c = l ? c.conditionalJumpTo : c.next;
+        c = n ? c.conditionalJumpTo : c.next;
         c = a.actions[c];
       }
       return g.pop();
     }
-    var Xb = d.AVM2.Runtime.forEachPublicProperty, $b = d.AVM2.Runtime.construct, Yb = d.isNumeric, Ja = d.isFunction, fc = d.Debug.notImplemented, Wb = d.AVM2.Runtime.asCoerceString, Xa = d.AVM2.Runtime.sliceArguments, za = d.Options.Option, Vb = d.Telemetry, Aa = d.Settings.shumwayOptions.register(new d.Options.OptionSet("AVM1"));
+    var Xb = d.AVM2.Runtime.forEachPublicProperty, $b = d.AVM2.Runtime.construct, Yb = d.isNumeric, Ia = d.isFunction, fc = d.Debug.notImplemented, Wb = d.AVM2.Runtime.asCoerceString, Wa = d.AVM2.Runtime.sliceArguments, za = d.Options.Option, Vb = d.Telemetry, Aa = d.Settings.shumwayOptions.register(new d.Options.OptionSet("AVM1"));
     k.avm1TraceEnabled = Aa.register(new za("t1", "traceAvm1", "boolean", !1, "trace AVM1 execution"));
     k.avm1ErrorsEnabled = Aa.register(new za("e1", "errorsAvm1", "boolean", !1, "fail on AVM1 warnings and errors"));
     k.avm1TimeoutDisabled = Aa.register(new za("ha1", "nohangAvm1", "boolean", !1, "disable fail on AVM1 hang"));
@@ -45917,7 +47626,7 @@
     k.avm1DebuggerEnabled = Aa.register(new za("da1", "debugAvm1", "boolean", !1, "allows AVM1 code debugging"));
     k.Debugger = {pause:!1, breakpoints:{}};
     var Zb = "addCallback addListener addProperty addRequestHeader AsBroadcaster attachAudio attachMovie attachSound attachVideo beginFill beginGradientFill blendMode blockIndent broadcastMessage cacheAsBitmap CASEINSENSITIVE charAt charCodeAt checkPolicyFile clearInterval clearRequestHeaders concat createEmptyMovieClip curveTo DESCENDING displayState duplicateMovieClip E endFill exactSettings fromCharCode fullScreenSourceRect getBounds getBytesLoaded getBytesTotal getDate getDay getDepth getDepth getDuration getFullYear getHours getLocal getMilliseconds getMinutes getMonth getNewTextFormat getPan getPosition getRGB getSeconds getSize getTextFormat getTime getTimezoneOffset getTransform getUTCDate getUTCDay getUTCFullYear getUTCHours getUTCMilliseconds getUTCMinutes getUTCMonth getUTCSeconds getUTCYear getVolume getYear globalToLocal gotoAndPlay gotoAndStop hasAccessibility hasAudio hasAudioEncoder hasEmbeddedVideo hasIME hasMP3 hasOwnProperty hasPrinting hasScreenBroadcast hasScreenPlayback hasStreamingAudio hasStreamingVideo hasVideoEncoder hitTest indexOf isActive isDebugger isFinite isNaN isPropertyEnumerable isPrototypeOf lastIndexOf leftMargin letterSpacing lineStyle lineTo LN10 LN10E LN2 LN2E loadSound localFileReadDisable localToGlobal MAX_VALUE MIN_VALUE moveTo NaN NEGATIVE_INFINITY nextFrame NUMERIC onChanged onData onDragOut onDragOver onEnterFrame onFullScreen onKeyDown onKeyUp onKillFocus onLoad onMouseDown onMouseMove onMouseUp onPress onRelease onReleaseOutside onResize onResize onRollOut onRollOver onScroller onSetFocus onStatus onSync onUnload parseFloat parseInt PI pixelAspectRatio playerType POSITIVE_INFINITY prevFrame registerClass removeListener removeMovieClip removeTextField replaceSel RETURNINDEXEDARRAY rightMargin scale9Grid scaleMode screenColor screenDPI screenResolutionX screenResolutionY serverString setClipboard setDate setDuration setFps setFullYear setHours setInterval setMask setMilliseconds setMinutes setMonth setNewTextFormat setPan setPosition setRGB setSeconds setTextFormat setTime setTimeout setTransform setTransform setUTCDate setUTCFullYear setUTCHours setUTCMilliseconds setUTCMinutes setUTCMonth setUTCSeconds setVolume setYear showMenu showRedrawRegions sortOn SQRT1_2 SQRT2 startDrag stopDrag swapDepths tabEnabled tabIndex tabIndex tabStops toLowerCase toString toUpperCase trackAsMenu UNIQUESORT updateAfterEvent updateProperties useCodepage useHandCursor UTC valueOf".split(" "), 
-    Ga = null, gc = function() {
+    Fa = null, gc = function() {
       function a(b, e) {
         this.scope = b;
         this.next = e;
@@ -45987,7 +47696,7 @@
           return c;
         }, setProperty:function(a, b, e) {
           f.enterContext(function() {
-            q(a, b, e);
+            n(a, b, e);
           }, a);
         }};
       }
@@ -46020,7 +47729,7 @@
       };
       d.prototype.resolveTarget = function(a) {
         var b = this.currentTarget || this.defaultTarget;
-        a ? "string" === typeof a && (a = J(a, b, this.resolveLevel(0))) : a = b;
+        a ? "string" === typeof a && (a = Q(a, b, this.resolveLevel(0))) : a = b;
         if ("object" !== typeof a || null === a || !("_as3Object" in a)) {
           throw Error("Invalid AVM1 target object: " + Object.prototype.toString.call(a));
         }
@@ -46067,7 +47776,7 @@
         }
       };
       d.prototype.executeActions = function(a, b) {
-        F(a, this, b);
+        E(a, this, b);
       };
       d.prototype.registerEventPropertyObserver = function(a, b) {
         var e = this.eventObservers[a];
@@ -46092,11 +47801,11 @@
     k.AVM1Context.create = function(a) {
       return new ic(a);
     };
-    var Ha = function() {
+    var Ga = function() {
       return function(a) {
         this.error = a;
       };
-    }(), ra = function(a) {
+    }(), qa = function(a) {
       function b(e, c) {
         a.call(this, e);
         this.error = c;
@@ -46104,18 +47813,18 @@
       __extends(b, a);
       return b;
     }(Error), oa = {link:void 0, name:null};
-    k.executeActions = F;
-    var Wa = function(a) {
+    k.executeActions = E;
+    var Va = function(a) {
       function b() {
         a.apply(this, arguments);
       }
       __extends(b, a);
       return b;
-    }(d.AVM2.AS.ASObject), wa = function() {
+    }(d.AVM2.AS.ASObject), va = function() {
       return function(a) {
         this.callFrame = a;
       };
-    }(), ja = {obj:null, link:null, name:null}, ec = function() {
+    }(), ia = {obj:null, link:null, name:null}, ec = function() {
       function a() {
         a.cachedCalls || (a.cachedCalls = dc());
       }
@@ -46130,8 +47839,8 @@
                 var h = c.singleConstantPool[g.constantIndex];
                 d.push(void 0 === h ? "undefined" : JSON.stringify(h));
               } else {
-                var h = "", l = e.constantPool;
-                l && (h = l[g.constantIndex], h = void 0 === h ? "undefined" : JSON.stringify(h), h = 0 <= h.indexOf("*/") ? "" : " /* " + h + " */");
+                var h = "", n = e.constantPool;
+                n && (h = n[g.constantIndex], h = void 0 === h ? "undefined" : JSON.stringify(h), h = 0 <= h.indexOf("*/") ? "" : " /* " + h + " */");
                 d.push("constantPool[" + g.constantIndex + "]" + h);
               }
             } else {
@@ -46165,7 +47874,7 @@
       };
       a.prototype.checkAvm1Timeout = function(a) {
         if (Date.now() >= a.context.abortExecutionAt) {
-          throw new ra("long running script -- AVM1 instruction hang timeout");
+          throw new qa("long running script -- AVM1 instruction hang timeout");
         }
       };
       a.prototype.generate = function(b) {
@@ -46184,7 +47893,7 @@
         return(new Function("calls", "res", "checkTimeout", h))(a.cachedCalls, d, this.checkAvm1Timeout);
       };
       return a;
-    }(), Va = function() {
+    }(), Ua = function() {
       function a() {
       }
       a.get = function() {
@@ -46194,8 +47903,8 @@
         var a = 0;
         return{print:function(b, e) {
           for (var c = b.position, d = b.actionCode, f = b.actionName, g = [], h = 0;h < e.length;h++) {
-            var k = e[h];
-            k && "object" === typeof k ? (k = k.asGetPublicProperty("__constructor__"), g.push("[" + (k ? k.name : "Object") + "]")) : g.push(k);
+            var n = e[h];
+            n && "object" === typeof n ? (n = n.asGetPublicProperty("__constructor__"), g.push("[" + (n ? n.name : "Object") + "]")) : g.push(n);
           }
           console.log("AVM1 trace: " + Array(a + 1).join("..") + c + ": " + f + "(" + d.toString(16) + "), stack=" + g);
         }, indent:function() {
@@ -46218,7 +47927,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(a, c, b) {
+      function q(a, c, b) {
         return a.utils.hasProperty(c, b) ? !0 : (c = a.utils.getProperty(c, "_listeners")) ? c.some(function(e) {
           return a.utils.hasProperty(e, b);
         }) : !1;
@@ -46233,7 +47942,7 @@
           d.isFunction(h) && h.apply(c, e);
         });
       }
-      function u(a, c, b) {
+      function t(a, c, b) {
         for (var e = a.prototype;e && !e.initAVM1SymbolInstance;) {
           e = e.asGetPublicProperty("__proto__");
         }
@@ -46245,8 +47954,8 @@
         a.call(e);
         return e;
       }
-      function t(a, c) {
-        return a ? a._as2Object ? a._as2Object : h.display.MovieClip.isType(a) ? a._avm1SymbolClass ? u(a._avm1SymbolClass, a, c) : u(c.globals.MovieClip, a, c) : h.display.SimpleButton.isType(a) ? u(c.globals.Button, a, c) : h.text.TextField.isType(a) ? u(c.globals.TextField, a, c) : h.display.BitmapData.isType(a) ? new a : null : null;
+      function u(a, c) {
+        return a ? a._as2Object ? a._as2Object : h.display.MovieClip.isType(a) ? a._avm1SymbolClass ? t(a._avm1SymbolClass, a, c) : t(c.globals.MovieClip, a, c) : h.display.SimpleButton.isType(a) ? t(c.globals.Button, a, c) : h.text.TextField.isType(a) ? t(c.globals.TextField, a, c) : h.display.BitmapData.isType(a) ? new a : null : null;
       }
       function l(a, c) {
         var b;
@@ -46326,8 +48035,8 @@
             f.registerEventPropertyObserver(a.propertyName, d);
             d._updateEvent(a);
           });
-          e && d.as3Object.addEventListener("removedFromStage", function A() {
-            d.as3Object.removeEventListener("removedFromStage", A);
+          e && d.as3Object.addEventListener("removedFromStage", function C() {
+            d.as3Object.removeEventListener("removedFromStage", C);
             d.unbindEvents();
           });
         };
@@ -46345,7 +48054,7 @@
           }, this);
         };
         c.prototype._updateEvent = function(a) {
-          r(this.context, this, a.propertyName) ? this._addEventListener(a) : this._removeEventListener(a);
+          q(this.context, this, a.propertyName) ? this._addEventListener(a) : this._removeEventListener(a);
         };
         c.prototype._addEventListener = function(a) {
           var e = this._eventsListeners[a.propertyName];
@@ -46364,7 +48073,7 @@
         return c;
       }(p);
       a.AVM1SymbolBase = p;
-      a.avm1HasEventProperty = r;
+      a.avm1HasEventProperty = q;
       a.avm1BroadcastEvent = v;
       p = function() {
         function a() {
@@ -46404,7 +48113,7 @@
         return a;
       }();
       a.AVM1Utils = p;
-      a.getAVM1Object = t;
+      a.getAVM1Object = u;
       a.wrapAVM1Object = l;
       a.wrapAVM1Class = function(a, c, b) {
         c = l(a, c);
@@ -46448,7 +48157,7 @@
         }
       };
       a.initializeAVM1Object = function(a, d, b) {
-        d = t(a, d);
+        d = u(a, d);
         b.variableName && d.asSetPublicProperty("variable", b.variableName);
         var e = b.events;
         if (e) {
@@ -46456,11 +48165,11 @@
             var l = e[h], p;
             l.actionsData ? (p = new k.AVM1ActionsData(l.actionsData, "s" + b.symbolId + "e" + h), l.actionsData = null, l.compiled = p) : p = l.compiled;
             p = c.bind(null, p, d);
-            var l = l.flags, r;
-            for (r in m) {
-              if (r |= 0, l & (r | 0)) {
-                var s = m[r];
-                switch(r) {
+            var l = l.flags, q;
+            for (q in m) {
+              if (q |= 0, l & (q | 0)) {
+                var s = m[q];
+                switch(q) {
                   case 2048:
                   ;
                   case 4096:
@@ -46506,9 +48215,9 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.Debug.notImplemented, v = d.Debug.somewhatImplemented, u = d.AVM2.Runtime.forEachPublicProperty, t = d.AVM2.AS.flash, l = jsGlobal.escape, c = [], h = function() {
+      var q = d.Debug.notImplemented, v = d.Debug.somewhatImplemented, t = d.AVM2.Runtime.forEachPublicProperty, u = d.AVM2.AS.flash, l = jsGlobal.escape, c = [], h = function() {
         function h(c) {
-          this.fscommand = t.system.FSCommand._fscommand;
+          this.fscommand = u.system.FSCommand._fscommand;
           this.getTimer = d.AVM2.AS.FlashUtilScript_getTimer;
           this.NaN = Number.NaN;
           this.Infinity = Number.POSITIVE_INFINITY;
@@ -46537,9 +48246,9 @@
           this.Mouse = a.AVM1Mouse.createAVM1Class();
           this.MovieClipLoader = a.AVM1MovieClipLoader.createAVM1Class();
           this.Sound = a.AVM1Sound.createAVM1Class();
-          this.SharedObject = t.net.SharedObject;
-          this.ContextMenu = t.ui.ContextMenu;
-          this.ContextMenuItem = t.ui.ContextMenuItem;
+          this.SharedObject = u.net.SharedObject;
+          this.ContextMenu = u.ui.ContextMenu;
+          this.ContextMenuItem = u.ui.ContextMenuItem;
           this.TextFormat = a.AVM1TextFormat.createAVM1Class();
           h.instance = this;
           this._global = this;
@@ -46555,7 +48264,7 @@
           return a.wrapAVM1Class(h, [], "_global flash ASSetPropFlags call chr clearInterval clearTimeout duplicateMovieClip fscommand escape unescape getTimer getURL getVersion gotoAndPlay gotoAndStop ifFrameLoaded int length=>length_ loadMovie loadMovieNum loadVariables loadVariablesNum mbchr mblength mbord mbsubstring nextFrame nextScene ord play prevFrame prevScene print printAsBitmap printAsBitmapNum printNum random removeMovieClip setInterval setTimeout showRedrawRegions startDrag stop stopDrag substring targetPath toggleHighQuality trace unloadMovie unloadMovieNum updateAfterEvent NaN Infinity isFinite isNaN parseFloat parseInt undefined Object Function Array Number Math Boolean Date RegExp String MovieClip AsBroadcaster System Stage Button TextField Color Key Mouse MovieClipLoader Sound SharedObject ContextMenu ContextMenuItem TextFormat toString $asfunction=>asfunction".split(" "));
         };
         h.prototype.asfunction = function(a) {
-          r("AVM1Globals.$asfunction");
+          q("AVM1Globals.$asfunction");
         };
         h.prototype.ASSetPropFlags = function(a, c, d, b) {
         };
@@ -46582,12 +48291,12 @@
           return a.AVM1Utils.resolveTarget(c)[p[d]];
         };
         h.prototype.getURL = function(a, c, f) {
-          var b = new t.net.URLRequest(String(a));
+          var b = new u.net.URLRequest(String(a));
           f && (b.method = f);
           "string" === typeof c && 0 === c.indexOf("_level") ? this.loadMovieNum(a, +c.substr(6), f) : d.AVM2.AS.FlashNetScript_navigateToURL(b, c);
         };
         h.prototype.getVersion = function() {
-          return t.system.Capabilities.version;
+          return u.system.Capabilities.version;
         };
         h.prototype._addToPendingScripts = function(a, c, d) {
           void 0 === d && (d = null);
@@ -46645,8 +48354,8 @@
           } else {
             var b = "string" === typeof d && 0 === d.indexOf("_level"), e;
             b && (b = d.charAt(6), e = parseInt(b, 10), b = e.toString() === b);
-            e = new t.display.Loader;
-            b ? (c = new t.net.URLRequest(c), f && (c.method = f), e.load(c)) : a.AVM1Utils.resolveTarget(d).loadMovie(c, f);
+            e = new u.display.Loader;
+            b ? (c = new u.net.URLRequest(c), f && (c.method = f), e.load(c)) : a.AVM1Utils.resolveTarget(d).loadMovie(c, f);
           }
         };
         h.prototype._setLevel = function(a, c) {
@@ -46655,8 +48364,8 @@
           if (a && 0 === a.toLowerCase().indexOf("fscommand:")) {
             return this.fscommand(a.substring(10));
           }
-          c = new t.display.Loader;
-          a = new t.net.URLRequest(a);
+          c = new u.display.Loader;
+          a = new u.net.URLRequest(a);
           d && (a.method = d);
           c.load(a);
         };
@@ -46671,18 +48380,18 @@
         };
         h.prototype._loadVariables = function(c, d, f) {
           function b(d) {
-            h.removeEventListener(t.events.Event.COMPLETE, b);
-            u(h.data, function(a, b) {
+            h.removeEventListener(u.events.Event.COMPLETE, b);
+            t(h.data, function(a, b) {
               e.utils.setProperty(c, a, b);
             });
             c instanceof a.AVM1MovieClip && a.avm1BroadcastEvent(e, c, "onData");
           }
-          d = new t.net.URLRequest(d);
+          d = new u.net.URLRequest(d);
           f && (d.method = f);
-          var e = k.AVM1Context.instance, h = new t.net.URLLoader(d);
+          var e = k.AVM1Context.instance, h = new u.net.URLLoader(d);
           h._ignoreDecodeErrors = !0;
           h.dataFormat = "variables";
-          h.addEventListener(t.events.Event.COMPLETE, b);
+          h.addEventListener(u.events.Event.COMPLETE, b);
         };
         h.prototype.mbchr = function(a) {
           return String.fromCharCode(a);
@@ -46719,16 +48428,16 @@
           this._addToPendingScripts(c, c.prevScene);
         };
         h.prototype.print = function(a, c) {
-          r("AVM1Globals.print");
+          q("AVM1Globals.print");
         };
         h.prototype.printAsBitmap = function(a, c) {
-          r("AVM1Globals.printAsBitmap");
+          q("AVM1Globals.printAsBitmap");
         };
         h.prototype.printAsBitmapNum = function(a, c) {
-          r("AVM1Globals.printAsBitmapNum");
+          q("AVM1Globals.printAsBitmapNum");
         };
         h.prototype.printNum = function(a, c) {
-          r("AVM1Globals.printNum");
+          q("AVM1Globals.printNum");
         };
         h.prototype.random = function(a) {
           return 0 | Math.random() * (0 | a);
@@ -46772,16 +48481,16 @@
           }
         };
         h.prototype.showRedrawRegions = function(a, c) {
-          r("AVM1Globals.showRedrawRegions");
+          q("AVM1Globals.showRedrawRegions");
         };
         h.prototype.startDrag = function(c, d, f, b, e, h) {
-          a.AVM1Utils.resolveTarget(c).startDrag(d, 3 > arguments.length ? null : new t.geom.Rectangle(f, b, e - f, h - b));
+          a.AVM1Utils.resolveTarget(c).startDrag(d, 3 > arguments.length ? null : new u.geom.Rectangle(f, b, e - f, h - b));
         };
         h.prototype.stop = function() {
           a.AVM1Utils.resolveTarget().stop();
         };
         h.prototype.stopAllSounds = function() {
-          t.media.SoundMixer.stopAll();
+          u.media.SoundMixer.stopAll();
         };
         h.prototype.stopDrag = function(c) {
           a.AVM1Utils.resolveTarget(c).stopDrag();
@@ -46793,7 +48502,7 @@
           return a.AVM1Utils.resolveTarget(c)._target;
         };
         h.prototype.toggleHighQuality = function() {
-          r("AVM1Globals.toggleHighQuality");
+          q("AVM1Globals.toggleHighQuality");
         };
         h.prototype.trace = function(a) {
           d.AVM2.AS.Natives.print(a);
@@ -46818,10 +48527,10 @@
           this.flash.asSetPublicProperty("external", c);
           this.flash.asSetPublicProperty("filters", {});
           c = {};
-          c.asSetPublicProperty("ColorTransform", t.geom.ColorTransform);
-          c.asSetPublicProperty("Matrix", t.geom.Matrix);
-          c.asSetPublicProperty("Point", t.geom.Point);
-          c.asSetPublicProperty("Rectangle", t.geom.Rectangle);
+          c.asSetPublicProperty("ColorTransform", u.geom.ColorTransform);
+          c.asSetPublicProperty("Matrix", u.geom.Matrix);
+          c.asSetPublicProperty("Point", u.geom.Point);
+          c.asSetPublicProperty("Rectangle", u.geom.Rectangle);
           c.asSetPublicProperty("Transform", a.AVM1Transform.createAVM1Class());
           this.flash.asSetPublicProperty("geom", c);
           this.flash.asSetPublicProperty("text", {});
@@ -46839,19 +48548,19 @@
 (function(d) {
   (function(d) {
     (function(a) {
-      var r = function() {
-        function r() {
+      var q = function() {
+        function q() {
         }
-        r.setAVM1Context = function(a) {
+        q.setAVM1Context = function(a) {
           this._context = a;
         };
-        r.createAVM1Class = function() {
-          return a.wrapAVM1Class(r, ["initialize"], []);
+        q.createAVM1Class = function() {
+          return a.wrapAVM1Class(q, ["initialize"], []);
         };
-        r.initialize = function(a) {
-          r.initializeWithContext(a, d.AVM1Context.instance);
+        q.initialize = function(a) {
+          q.initializeWithContext(a, d.AVM1Context.instance);
         };
-        r.initializeWithContext = function(d, k) {
+        q.initializeWithContext = function(d, k) {
           d.asSetPublicProperty("_listeners", []);
           d.asSetPublicProperty("broadcastMessage", function(d) {
             for (var c = [], h = 1;h < arguments.length;h++) {
@@ -46874,9 +48583,9 @@
             return!0;
           });
         };
-        return r;
+        return q;
       }();
-      a.AVM1Broadcaster = r;
+      a.AVM1Broadcaster = q;
     })(d.Lib || (d.Lib = {}));
   })(d.AVM1 || (d.AVM1 = {}));
 })(Shumway || (Shumway = {}));
@@ -47000,7 +48709,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.AVM2.AS.flash, v = d.AVM2.ABC.Multiname, u = d.AVM2.Runtime.resolveMultinameProperty, t = Object.prototype.asGetProperty, l = Object.prototype.asHasProperty, c = Object.prototype.asGetEnumerableKeys, h = function(a) {
+      var q = d.AVM2.AS.flash, v = d.AVM2.ABC.Multiname, t = d.AVM2.Runtime.resolveMultinameProperty, u = Object.prototype.asGetProperty, l = Object.prototype.asHasProperty, c = Object.prototype.asGetEnumerableKeys, h = function(a) {
         function c(d, f, b) {
           void 0 === b && (b = null);
           a.call(this, d, f, b);
@@ -47054,8 +48763,8 @@
             var e = Object.create(b.symbolProps);
             e.avm1Name = c;
             e.avm1SymbolClass = b.theClass;
-            b = r.display.MovieClip.initializeFrom(e);
-            r.display.MovieClip.instanceConstructorNoInitialize.call(b);
+            b = q.display.MovieClip.initializeFrom(e);
+            q.display.MovieClip.instanceConstructorNoInitialize.call(b);
             return b;
           }
         };
@@ -47072,7 +48781,7 @@
           this.graphics.beginFill(a, c);
         };
         m.prototype.beginBitmapFill = function(a, c, b, e) {
-          a instanceof r.display.BitmapData && this.graphics.beginBitmapFill(a, c, b, e);
+          a instanceof q.display.BitmapData && this.graphics.beginBitmapFill(a, c, b, e);
         };
         m.prototype.beginGradientFill = function(a, c, b, e, d, h, k, l) {
           this.graphics.beginGradientFill(a, c, b, e, d, h, k, l);
@@ -47095,15 +48804,15 @@
         m.prototype._insertChildAtDepth = function(c, d) {
           var b = this.as3Object;
           b.addTimelineObjectAtDepth(c, Math.min(b.numChildren, d));
-          return r.display.Bitmap.isType(c) ? null : a.getAVM1Object(c, this.context);
+          return q.display.Bitmap.isType(c) ? null : a.getAVM1Object(c, this.context);
         };
         m.prototype.createEmptyMovieClip = function(a, c) {
-          var b = new r.display.MovieClip;
+          var b = new q.display.MovieClip;
           b.name = a;
           return this._insertChildAtDepth(b, c);
         };
         m.prototype.createTextField = function(a, c, b, e, d, h) {
-          var k = new r.text.TextField;
+          var k = new q.text.TextField;
           k.name = a;
           k.x = b;
           k.y = e;
@@ -47176,7 +48885,7 @@
           for (var d = this.as3Object, b = 0, e = d.numChildren;b < e;b++) {
             var h = d._lookupChildByIndex(b);
             if (h && h._depth === c) {
-              return r.display.Bitmap.isType(h) ? this : a.getAVM1Object(h, this.context);
+              return q.display.Bitmap.isType(h) ? this : a.getAVM1Object(h, this.context);
             }
           }
           return null;
@@ -47198,12 +48907,12 @@
           throw "Not implemented: getTextSnapshot";
         };
         m.prototype.getURL = function(a, c, b) {
-          a = new r.net.URLRequest(a);
+          a = new q.net.URLRequest(a);
           b && (a.method = b);
           d.AVM2.AS.FlashNetScript_navigateToURL(a, c);
         };
         m.prototype.globalToLocal = function(a) {
-          var c = this.as3Object.globalToLocal(new r.geom.Point(a.asGetPublicProperty("x"), a.asGetPublicProperty("y")));
+          var c = this.as3Object.globalToLocal(new q.geom.Point(a.asGetPublicProperty("x"), a.asGetPublicProperty("y")));
           a.asSetPublicProperty("x", c.x);
           a.asSetPublicProperty("y", c.y);
         };
@@ -47241,22 +48950,22 @@
         };
         m.prototype.loadMovie = function(a, c) {
           function b(a) {
-            e.removeEventListener(r.events.Event.COMPLETE, b);
+            e.removeEventListener(q.events.Event.COMPLETE, b);
             a = this.as3Object.parent;
             var c = a.getChildIndex(this.as3Object);
             a.removeChild(this.as3Object);
             a.addChildAt(e.content, c);
           }
-          var e = new r.display.Loader, d = new r.net.URLRequest(a);
+          var e = new q.display.Loader, d = new q.net.URLRequest(a);
           c && (d.method = c);
           e.load(d);
-          e.addEventListener(r.events.Event.COMPLETE, b);
+          e.addEventListener(q.events.Event.COMPLETE, b);
         };
         m.prototype.loadVariables = function(a, c) {
           this.context.globals._loadVariables(this, a, c);
         };
         m.prototype.localToGlobal = function(a) {
-          var c = this.as3Object.localToGlobal(new r.geom.Point(a.asGetPublicProperty("x"), a.asGetPublicProperty("y")));
+          var c = this.as3Object.localToGlobal(new q.geom.Point(a.asGetPublicProperty("x"), a.asGetPublicProperty("y")));
           a.asSetPublicProperty("x", c.x);
           a.asSetPublicProperty("y", c.y);
         };
@@ -47337,7 +49046,7 @@
           throw "Not implemented: set$_soundbuftime";
         }, enumerable:!0, configurable:!0});
         m.prototype.startDrag = function(a, c, b, e, d) {
-          this.as3Object.startDrag(a, 3 > arguments.length ? null : new r.geom.Rectangle(c, b, e - c, d - b));
+          this.as3Object.startDrag(a, 3 > arguments.length ? null : new q.geom.Rectangle(c, b, e - c, d - b));
         };
         m.prototype.stop = function() {
           return this.as3Object.stop();
@@ -47456,7 +49165,7 @@
         };
         m.prototype.asGetProperty = function(a, c, b) {
           if (l.call(this, a, c, b)) {
-            return t.call(this, a, c, b);
+            return u.call(this, a, c, b);
           }
           if ("string" === typeof c && "_" === c[0]) {
             var e = this._resolveLevelNProperty(c);
@@ -47464,7 +49173,7 @@
               return e;
             }
           }
-          a = u(a, c, b);
+          a = t(a, c, b);
           if (v.isPublicQualifiedName(a) && this.isAVM1Instance) {
             return this.__lookupChild(v.getNameFromPublicQualifiedName(a));
           }
@@ -47473,7 +49182,7 @@
           if (l.call(this, a, c, b) || "string" === typeof c && "_" === c[0] && this._resolveLevelNProperty(c)) {
             return!0;
           }
-          a = u(a, c, b);
+          a = t(a, c, b);
           return v.isPublicQualifiedName(a) && this.isAVM1Instance ? !!this.__lookupChild(v.getNameFromPublicQualifiedName(a)) : !1;
         };
         m.prototype.asGetEnumerableKeys = function() {
@@ -47539,7 +49248,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.Debug.somewhatImplemented, v;
+      var q = d.Debug.somewhatImplemented, v;
       (function(a) {
         a[a.IdleToOverUp = 1] = "IdleToOverUp";
         a[a.OverUpToIdle = 2] = "OverUpToIdle";
@@ -47551,7 +49260,7 @@
         a[a.IdleToOverDown = 128] = "IdleToOverDown";
         a[a.OverDownToIdle = 256] = "OverDownToIdle";
       })(v || (v = {}));
-      var u = [-1, 37, 39, 36, 35, 45, 46, -1, 8, -1, -1, -1, -1, 13, 38, 40, 33, 34, 9, 27];
+      var t = [-1, 37, 39, 36, 35, 45, 46, -1, 8, -1, -1, -1, -1, 13, 38, 40, 33, 34, 9, 27];
       v = function(d) {
         function l() {
           d.apply(this, arguments);
@@ -47593,12 +49302,12 @@
                   case 16:
                   ;
                   case 32:
-                    r("AVM1 drag over/out button actions");
+                    q("AVM1 drag over/out button actions");
                     break;
                   case 128:
                   ;
                   case 256:
-                    r("AVM1 drag trackAsMenu over/out button actions");
+                    q("AVM1 drag trackAsMenu over/out button actions");
                     break;
                   default:
                     console.warn("Unknown AVM1 button action type: " + f.stateTransitionFlags);
@@ -47761,7 +49470,7 @@
         l.prototype._keyDownHandler = function(a) {
           for (var d = this._actions, k = 0;k < d.length;k++) {
             var l = d[k];
-            l.keyCode && (32 > l.keyCode && u[l.keyCode] === a.asGetPublicProperty("keyCode") || l.keyCode === a.asGetPublicProperty("charCode")) && this._runAction(l);
+            l.keyCode && (32 > l.keyCode && t[l.keyCode] === a.asGetPublicProperty("keyCode") || l.keyCode === a.asGetPublicProperty("charCode")) && this._runAction(l);
           }
         };
         l.prototype._mouseEventHandler = function(a) {
@@ -48019,8 +49728,8 @@
               c = a.getAVM1Object(d._parent, this.context);
             }
             for (;0 < p.length;) {
-              var r = p.shift();
-              c = h.getProperty(c, r);
+              var q = p.shift();
+              c = h.getProperty(c, q);
               if (!c) {
                 return;
               }
@@ -48163,18 +49872,18 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var k = d.Debug.notImplemented, v = Object.prototype.asGetProperty, u = Object.prototype.asSetProperty, t = Object.prototype.asCallProperty, l = Object.prototype.asHasProperty, c = Object.prototype.asHasOwnProperty, h = Object.prototype.asHasTraitProperty, p = Object.prototype.asDeleteProperty, s = function(d) {
+      var k = d.Debug.notImplemented, v = Object.prototype.asGetProperty, t = Object.prototype.asSetProperty, u = Object.prototype.asCallProperty, l = Object.prototype.asHasProperty, c = Object.prototype.asHasOwnProperty, h = Object.prototype.asHasTraitProperty, p = Object.prototype.asDeleteProperty, s = function(d) {
         function g() {
         }
         __extends(g, d);
         g.prototype.setTarget = function(a) {
           this._target = a;
         };
-        g.prototype._isInternalProperty = function(a, b, c) {
+        g.prototype._isInternalProperty = function(a, b, e) {
           return!this._target || a || "__proto__" === b || "__constructor__" === b ? !0 : !1;
         };
-        g.prototype.asGetProperty = function(a, b, c) {
-          return this._isInternalProperty(a, b, c) ? v.call(this, a, b, c) : this._target.asGetPublicProperty(b);
+        g.prototype.asGetProperty = function(a, b, e) {
+          return this._isInternalProperty(a, b, e) ? v.call(this, a, b, e) : this._target.asGetPublicProperty(b);
         };
         g.prototype.asGetNumericProperty = function(a) {
           return this._target.asGetNumericProperty(a);
@@ -48182,25 +49891,25 @@
         g.prototype.asSetNumericProperty = function(a, b) {
           return this._target.asSetNumericProperty(a, b);
         };
-        g.prototype.asSetProperty = function(a, b, c, d) {
-          if (this._isInternalProperty(a, b, c)) {
-            u.call(this, a, b, c, d);
+        g.prototype.asSetProperty = function(a, b, e, c) {
+          if (this._isInternalProperty(a, b, e)) {
+            t.call(this, a, b, e, c);
           } else {
-            return this._target.asSetPublicProperty(b, d);
+            return this._target.asSetPublicProperty(b, c);
           }
         };
-        g.prototype.asCallProperty = function(a, b, c, d, g) {
-          return this._isInternalProperty(a, b, c) ? t.call(this, a, b, c, !1, g) : this._target.asCallPublicProperty(b, g);
+        g.prototype.asCallProperty = function(a, b, e, c, d) {
+          return this._isInternalProperty(a, b, e) ? u.call(this, a, b, e, !1, d) : this._target.asCallPublicProperty(b, d);
         };
-        g.prototype.asHasProperty = function(a, b, c) {
-          return this._isInternalProperty(a, b, c) ? l.call(this, a, b, c) : this._target.asHasProperty(void 0, b, 0);
+        g.prototype.asHasProperty = function(a, b, e) {
+          return this._isInternalProperty(a, b, e) ? l.call(this, a, b, e) : this._target.asHasProperty(void 0, b, 0);
         };
         g.prototype.asHasOwnProperty = function(a, b, e) {
           return this._isInternalProperty(a, b, e) ? c.call(this, a, b, e) : this._target.asHasOwnProperty(void 0, b, 0);
         };
-        g.prototype.asDeleteProperty = function(a, b, c) {
-          if (h.call(this, a, b, c)) {
-            return p.call(this, a, b, c);
+        g.prototype.asDeleteProperty = function(a, b, e) {
+          if (h.call(this, a, b, e)) {
+            return p.call(this, a, b, e);
           }
           k("AVM1Proxy asDeleteProperty");
           return!1;
@@ -48236,8 +49945,8 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var k = d.AVM2.AS.flash, v = d.AVM2.Runtime.asCoerceString, u = function(d) {
-        function l(a, d, l, s, m, g, f, b, e, q, n, t, u) {
+      var k = d.AVM2.AS.flash, v = d.AVM2.Runtime.asCoerceString, t = function(d) {
+        function l(a, d, l, s, m, g, f, b, e, n, r, u, t) {
           k.text.TextFormat.apply(this, arguments);
         }
         __extends(l, d);
@@ -48264,29 +49973,29 @@
         };
         return l;
       }(k.text.TextFormat);
-      a.AVM1TextFormat = u;
+      a.AVM1TextFormat = t;
     })(k.Lib || (k.Lib = {}));
   })(d.AVM1 || (d.AVM1 = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
     (function(a) {
-      var r = d.AVM2.AS.flash, v = function(d) {
-        function t() {
+      var q = d.AVM2.AS.flash, v = function(d) {
+        function u() {
           d.apply(this, arguments);
         }
-        __extends(t, d);
-        t.createAVM1Class = function() {
-          var d = a.AVM1Proxy.wrap(t, null);
-          d.asSetPublicProperty("loadBitmap", t.loadBitmap);
+        __extends(u, d);
+        u.createAVM1Class = function() {
+          var d = a.AVM1Proxy.wrap(u, null);
+          d.asSetPublicProperty("loadBitmap", u.loadBitmap);
           return d;
         };
-        t.loadBitmap = function(a) {
+        u.loadBitmap = function(a) {
           a = asCoerceString(a);
-          return(a = k.AVM1Context.instance.getAsset(a)) && a.symbolProps instanceof r.display.BitmapSymbol ? (a = t.initializeFrom(a), a.class.instanceConstructorNoInitialize.call(a), a) : null;
+          return(a = k.AVM1Context.instance.getAsset(a)) && a.symbolProps instanceof q.display.BitmapSymbol ? (a = u.initializeFrom(a), a.class.instanceConstructorNoInitialize.call(a), a) : null;
         };
-        return t;
-      }(r.display.BitmapData);
+        return u;
+      }(q.display.BitmapData);
       a.AVM1BitmapData = v;
     })(k.Lib || (k.Lib = {}));
   })(d.AVM1 || (d.AVM1 = {}));
@@ -48326,58 +50035,58 @@
   (function(k) {
     (function(a) {
       var k = d.AVM2.AS.flash, v = function(d) {
-        function t(k) {
+        function u(k) {
           d.call(this);
           this._target = a.AVM1Utils.resolveTarget(k);
           this._linkageID = this._channel = this._sound = null;
         }
-        __extends(t, d);
-        t.createAVM1Class = function() {
-          return a.wrapAVM1Class(t, [], "attachSound duration getBytesLoaded getBytesTotal getPan setPan getTransform setTransform getVolume setVolume start stop".split(" "));
+        __extends(u, d);
+        u.createAVM1Class = function() {
+          return a.wrapAVM1Class(u, [], "attachSound duration getBytesLoaded getBytesTotal getPan setPan getTransform setTransform getVolume setVolume start stop".split(" "));
         };
-        t.prototype.attachSound = function(a) {
+        u.prototype.attachSound = function(a) {
           var c = this.context.getAsset(a);
           c && (c = Object.create(c.symbolProps), c = k.media.Sound.initializeFrom(c), k.media.Sound.instanceConstructorNoInitialize.call(c), this._linkageID = a, this._sound = c);
         };
-        t.prototype.loadSound = function(a, c) {
+        u.prototype.loadSound = function(a, c) {
         };
-        t.prototype.getBytesLoaded = function() {
+        u.prototype.getBytesLoaded = function() {
           return 0;
         };
-        t.prototype.getBytesTotal = function() {
+        u.prototype.getBytesTotal = function() {
           return 0;
         };
-        t.prototype.getPan = function() {
+        u.prototype.getPan = function() {
           var a = this._channel && this._channel.soundTransform;
           return a ? 100 * a.asGetPublicProperty("pan") : 0;
         };
-        t.prototype.setPan = function(a) {
+        u.prototype.setPan = function(a) {
           var c = this._channel && this._channel.soundTransform;
           c && (c.asSetPublicProperty("pan", a / 100), this._channel.soundTransform = c);
         };
-        t.prototype.getTransform = function() {
+        u.prototype.getTransform = function() {
           return null;
         };
-        t.prototype.setTransform = function(a) {
+        u.prototype.setTransform = function(a) {
         };
-        t.prototype.getVolume = function() {
+        u.prototype.getVolume = function() {
           var a = this._channel && this._channel.soundTransform;
           return a ? 100 * a.asGetPublicProperty("volume") : 0;
         };
-        t.prototype.setVolume = function(a) {
+        u.prototype.setVolume = function(a) {
           var c = this._channel && this._channel.soundTransform;
           c && (c.asSetPublicProperty("volume", a / 100), this._channel.soundTransform = c);
         };
-        t.prototype.start = function(a, c) {
+        u.prototype.start = function(a, c) {
           this._sound && (a = isNaN(a) || 0 > a ? 0 : +a, c = isNaN(c) || 1 > c ? 1 : Math.floor(c), this._stopSoundChannel(), this._channel = this._sound.play(a, c - 1));
         };
-        t.prototype._stopSoundChannel = function() {
+        u.prototype._stopSoundChannel = function() {
           this._channel && (this._channel.stop(), this._channel = null);
         };
-        t.prototype.stop = function(a) {
+        u.prototype.stop = function(a) {
           a && a !== this._linkageID || this._stopSoundChannel();
         };
-        return t;
+        return u;
       }(a.AVM1NativeObject);
       a.AVM1Sound = v;
     })(k.Lib || (k.Lib = {}));
@@ -48469,7 +50178,7 @@
     function a(a, b, e) {
       return c && e ? "string" === typeof b ? (a = d.ColorUtilities.cssStyleToRGBA(b), d.ColorUtilities.rgbaToCSSStyle(e.transformRGBA(a))) : b instanceof CanvasGradient && b._template ? b._template.createCanvasGradient(a, e) : b : b;
     }
-    var r = d.NumberUtilities.clamp;
+    var q = d.NumberUtilities.clamp;
     (function(a) {
       a[a.None = 0] = "None";
       a[a.Brief = 1] = "Brief";
@@ -48488,13 +50197,13 @@
     };
     k.leaveTimeline = function(a, b) {
     };
-    var u = null, t = null, l = null, c = !0;
-    c && "undefined" !== typeof CanvasRenderingContext2D && (u = CanvasGradient.prototype.addColorStop, t = CanvasRenderingContext2D.prototype.createLinearGradient, l = CanvasRenderingContext2D.prototype.createRadialGradient, CanvasRenderingContext2D.prototype.createLinearGradient = function(a, b, c, e) {
-      return(new p(a, b, c, e)).createCanvasGradient(this, null);
-    }, CanvasRenderingContext2D.prototype.createRadialGradient = function(a, b, c, e, d, f) {
-      return(new s(a, b, c, e, d, f)).createCanvasGradient(this, null);
+    var t = null, u = null, l = null, c = !0;
+    c && "undefined" !== typeof CanvasRenderingContext2D && (t = CanvasGradient.prototype.addColorStop, u = CanvasRenderingContext2D.prototype.createLinearGradient, l = CanvasRenderingContext2D.prototype.createRadialGradient, CanvasRenderingContext2D.prototype.createLinearGradient = function(a, b, e, c) {
+      return(new p(a, b, e, c)).createCanvasGradient(this, null);
+    }, CanvasRenderingContext2D.prototype.createRadialGradient = function(a, b, e, c, d, f) {
+      return(new s(a, b, e, c, d, f)).createCanvasGradient(this, null);
     }, CanvasGradient.prototype.addColorStop = function(a, b) {
-      u.call(this, a, b);
+      t.call(this, a, b);
       this._template.addColorStop(a, b);
     });
     var h = function() {
@@ -48503,31 +50212,31 @@
         this.color = b;
       };
     }(), p = function() {
-      function b(a, c, e, d) {
+      function b(a, e, c, d) {
         this.x0 = a;
-        this.y0 = c;
-        this.x1 = e;
+        this.y0 = e;
+        this.x1 = c;
         this.y1 = d;
         this.colorStops = [];
       }
       b.prototype.addColorStop = function(a, b) {
         this.colorStops.push(new h(a, b));
       };
-      b.prototype.createCanvasGradient = function(b, c) {
-        for (var e = t.call(b, this.x0, this.y0, this.x1, this.y1), d = this.colorStops, f = 0;f < d.length;f++) {
-          var g = d[f], k = g.offset, g = g.color, g = c ? a(b, g, c) : g;
-          u.call(e, k, g);
+      b.prototype.createCanvasGradient = function(b, e) {
+        for (var c = u.call(b, this.x0, this.y0, this.x1, this.y1), d = this.colorStops, f = 0;f < d.length;f++) {
+          var g = d[f], h = g.offset, g = g.color, g = e ? a(b, g, e) : g;
+          t.call(c, h, g);
         }
-        e._template = this;
-        e._transform = this._transform;
-        return e;
+        c._template = this;
+        c._transform = this._transform;
+        return c;
       };
       return b;
     }(), s = function() {
-      function b(a, c, e, d, f, g) {
+      function b(a, e, c, d, f, g) {
         this.x0 = a;
-        this.y0 = c;
-        this.r0 = e;
+        this.y0 = e;
+        this.r0 = c;
         this.x1 = d;
         this.y1 = f;
         this.r1 = g;
@@ -48536,14 +50245,14 @@
       b.prototype.addColorStop = function(a, b) {
         this.colorStops.push(new h(a, b));
       };
-      b.prototype.createCanvasGradient = function(b, c) {
-        for (var e = l.call(b, this.x0, this.y0, this.r0, this.x1, this.y1, this.r1), d = this.colorStops, f = 0;f < d.length;f++) {
-          var g = d[f], k = g.offset, g = g.color, g = c ? a(b, g, c) : g;
-          u.call(e, k, g);
+      b.prototype.createCanvasGradient = function(b, e) {
+        for (var c = l.call(b, this.x0, this.y0, this.r0, this.x1, this.y1, this.r1), d = this.colorStops, f = 0;f < d.length;f++) {
+          var g = d[f], h = g.offset, g = g.color, g = e ? a(b, g, e) : g;
+          t.call(c, h, g);
         }
-        e._template = this;
-        e._transform = this._transform;
-        return e;
+        c._template = this;
+        c._transform = this._transform;
+        return c;
       };
       return b;
     }(), m;
@@ -48569,33 +50278,33 @@
         b instanceof a && this.addPath(b);
       }
       a._apply = function(a, b) {
-        var c = a._commands, e = a._data, d = 0, f = 0;
+        var e = a._commands, c = a._data, d = 0, f = 0;
         b.beginPath();
         for (var g = a._commandPosition;d < g;) {
-          switch(c[d++]) {
+          switch(e[d++]) {
             case 1:
               b.closePath();
               break;
             case 2:
-              b.moveTo(e[f++], e[f++]);
+              b.moveTo(c[f++], c[f++]);
               break;
             case 3:
-              b.lineTo(e[f++], e[f++]);
+              b.lineTo(c[f++], c[f++]);
               break;
             case 4:
-              b.quadraticCurveTo(e[f++], e[f++], e[f++], e[f++]);
+              b.quadraticCurveTo(c[f++], c[f++], c[f++], c[f++]);
               break;
             case 5:
-              b.bezierCurveTo(e[f++], e[f++], e[f++], e[f++], e[f++], e[f++]);
+              b.bezierCurveTo(c[f++], c[f++], c[f++], c[f++], c[f++], c[f++]);
               break;
             case 6:
-              b.arcTo(e[f++], e[f++], e[f++], e[f++], e[f++]);
+              b.arcTo(c[f++], c[f++], c[f++], c[f++], c[f++]);
               break;
             case 7:
-              b.rect(e[f++], e[f++], e[f++], e[f++]);
+              b.rect(c[f++], c[f++], c[f++], c[f++]);
               break;
             case 8:
-              b.arc(e[f++], e[f++], e[f++], e[f++], e[f++], !!e[f++]);
+              b.arc(c[f++], c[f++], c[f++], c[f++], c[f++], !!c[f++]);
               break;
             case 9:
               b.save();
@@ -48604,7 +50313,7 @@
               b.restore();
               break;
             case 11:
-              b.transform(e[f++], e[f++], e[f++], e[f++], e[f++], e[f++]);
+              b.transform(c[f++], c[f++], c[f++], c[f++], c[f++], c[f++]);
           }
         }
       };
@@ -48621,10 +50330,10 @@
       a.prototype._writeData = function(a, b, e, c, d, f) {
         var g = arguments.length;
         this._dataPosition + g >= this._data.length && this._ensureDataCapacity(this._dataPosition + g);
-        var k = this._data, h = this._dataPosition;
-        k[h] = a;
-        k[h + 1] = b;
-        2 < g && (k[h + 2] = e, k[h + 3] = c, 4 < g && (k[h + 4] = d, 6 === g && (k[h + 5] = f)));
+        var h = this._data, k = this._dataPosition;
+        h[k] = a;
+        h[k + 1] = b;
+        2 < g && (h[k + 2] = e, h[k + 3] = c, 4 < g && (h[k + 4] = d, 6 === g && (h[k + 5] = f)));
         this._dataPosition += g;
       };
       a.prototype.closePath = function() {
@@ -48706,7 +50415,7 @@
       };
       CanvasPattern.prototype.setTransform || (CanvasPattern.prototype.setTransform = m);
       CanvasGradient.prototype.setTransform || (CanvasGradient.prototype.setTransform = m);
-      var q = CanvasRenderingContext2D.prototype.fill, n = CanvasRenderingContext2D.prototype.stroke;
+      var n = CanvasRenderingContext2D.prototype.fill, r = CanvasRenderingContext2D.prototype.stroke;
       CanvasRenderingContext2D.prototype.fill = function(a, b) {
         var e = !!this.fillStyle._transform;
         if ((this.fillStyle instanceof CanvasPattern || this.fillStyle instanceof CanvasGradient) && e && a instanceof Path2D) {
@@ -48719,10 +50428,10 @@
           this.transform(e.a, e.b, e.c, e.d, e.e, e.f);
           e = new Path2D;
           e.addPath(a, c);
-          q.call(this, e, b);
+          n.call(this, e, b);
           this.transform(c.a, c.b, c.c, c.d, c.e, c.f);
         } else {
-          0 === arguments.length ? q.call(this) : 1 === arguments.length ? q.call(this, a) : 2 === arguments.length && q.call(this, a, b);
+          0 === arguments.length ? n.call(this) : 1 === arguments.length ? n.call(this, a) : 2 === arguments.length && n.call(this, a, b);
         }
       };
       CanvasRenderingContext2D.prototype.stroke = function(a) {
@@ -48734,11 +50443,11 @@
           e.addPath(a, b);
           var c = this.lineWidth;
           this.lineWidth *= (b.a + b.d) / 2;
-          n.call(this, e);
+          r.call(this, e);
           this.transform(b.a, b.b, b.c, b.d, b.e, b.f);
           this.lineWidth = c;
         } else {
-          0 === arguments.length ? n.call(this) : 1 === arguments.length && n.call(this, a);
+          0 === arguments.length ? r.call(this) : 1 === arguments.length && r.call(this, a);
         }
       };
     }
@@ -48755,13 +50464,13 @@
           this.setTransform(1, 0, 0, 1, 0, 0);
           switch(b) {
             case 1:
-              this.lineWidth = r(f * (d.getScaleX(e) + d.getScaleY(e)) / 2, 1, 1024);
+              this.lineWidth = q(f * (d.getScaleX(e) + d.getScaleY(e)) / 2, 1, 1024);
               break;
             case 2:
-              this.lineWidth = r(f * d.getScaleY(e), 1, 1024);
+              this.lineWidth = q(f * d.getScaleY(e), 1, 1024);
               break;
             case 3:
-              this.lineWidth = r(f * d.getScaleX(e), 1, 1024);
+              this.lineWidth = q(f * d.getScaleX(e), 1, 1024);
           }
           this.stroke(c);
           this.setTransform(e.a, e.b, e.c, e.d, e.e, e.f);
@@ -48773,7 +50482,7 @@
       !("currentTransform" in CanvasRenderingContext2D.prototype) && "mozCurrentTransform" in CanvasRenderingContext2D.prototype && Object.defineProperty(CanvasRenderingContext2D.prototype, "currentTransform", {get:a});
     }();
     if ("undefined" !== typeof CanvasRenderingContext2D && void 0 === CanvasRenderingContext2D.prototype.globalColorMatrix) {
-      var x = CanvasRenderingContext2D.prototype.fill, L = CanvasRenderingContext2D.prototype.stroke, A = CanvasRenderingContext2D.prototype.fillText, H = CanvasRenderingContext2D.prototype.strokeText;
+      var x = CanvasRenderingContext2D.prototype.fill, H = CanvasRenderingContext2D.prototype.stroke, C = CanvasRenderingContext2D.prototype.fillText, F = CanvasRenderingContext2D.prototype.strokeText;
       Object.defineProperty(CanvasRenderingContext2D.prototype, "globalColorMatrix", {get:function() {
         return this._globalColorMatrix ? this._globalColorMatrix.clone() : null;
       }, set:function(a) {
@@ -48788,19 +50497,19 @@
       CanvasRenderingContext2D.prototype.stroke = function(b, e) {
         var c = null;
         this._globalColorMatrix && (c = this.strokeStyle, this.strokeStyle = a(this, this.strokeStyle, this._globalColorMatrix));
-        0 === arguments.length ? L.call(this) : 1 === arguments.length && L.call(this, b);
+        0 === arguments.length ? H.call(this) : 1 === arguments.length && H.call(this, b);
         c && (this.strokeStyle = c);
       };
       CanvasRenderingContext2D.prototype.fillText = function(b, e, c, f) {
         var g = null;
         this._globalColorMatrix && (g = this.fillStyle, this.fillStyle = a(this, this.fillStyle, this._globalColorMatrix));
-        3 === arguments.length ? A.call(this, b, e, c) : 4 === arguments.length ? A.call(this, b, e, c, f) : d.Debug.unexpected();
+        3 === arguments.length ? C.call(this, b, e, c) : 4 === arguments.length ? C.call(this, b, e, c, f) : d.Debug.unexpected();
         g && (this.fillStyle = g);
       };
       CanvasRenderingContext2D.prototype.strokeText = function(b, e, c, f) {
         var g = null;
         this._globalColorMatrix && (g = this.strokeStyle, this.strokeStyle = a(this, this.strokeStyle, this._globalColorMatrix));
-        3 === arguments.length ? H.call(this, b, e, c) : 4 === arguments.length ? H.call(this, b, e, c, f) : d.Debug.unexpected();
+        3 === arguments.length ? F.call(this, b, e, c) : 4 === arguments.length ? F.call(this, b, e, c, f) : d.Debug.unexpected();
         g && (this.strokeStyle = g);
       };
     }
@@ -48865,83 +50574,83 @@
     return a.d;
   };
 })(Shumway || (Shumway = {}));
-var Shumway$$inline_742 = Shumway || (Shumway = {}), GFX$$inline_743 = Shumway$$inline_742.GFX || (Shumway$$inline_742.GFX = {}), Option$$inline_744 = Shumway$$inline_742.Options.Option, OptionSet$$inline_745 = Shumway$$inline_742.Options.OptionSet, shumwayOptions$$inline_746 = Shumway$$inline_742.Settings.shumwayOptions, rendererOptions$$inline_747 = shumwayOptions$$inline_746.register(new OptionSet$$inline_745("Renderer Options"));
-GFX$$inline_743.imageUpdateOption = rendererOptions$$inline_747.register(new Option$$inline_744("", "imageUpdate", "boolean", !0, "Enable image updating."));
-GFX$$inline_743.imageConvertOption = rendererOptions$$inline_747.register(new Option$$inline_744("", "imageConvert", "boolean", !0, "Enable image conversion."));
-GFX$$inline_743.stageOptions = shumwayOptions$$inline_746.register(new OptionSet$$inline_745("Stage Renderer Options"));
-GFX$$inline_743.forcePaint = GFX$$inline_743.stageOptions.register(new Option$$inline_744("", "forcePaint", "boolean", !1, "Force repainting."));
-GFX$$inline_743.ignoreViewport = GFX$$inline_743.stageOptions.register(new Option$$inline_744("", "ignoreViewport", "boolean", !1, "Cull elements outside of the viewport."));
-GFX$$inline_743.viewportLoupeDiameter = GFX$$inline_743.stageOptions.register(new Option$$inline_744("", "viewportLoupeDiameter", "number", 256, "Size of the viewport loupe.", {range:{min:1, max:1024, step:1}}));
-GFX$$inline_743.disableClipping = GFX$$inline_743.stageOptions.register(new Option$$inline_744("", "disableClipping", "boolean", !1, "Disable clipping."));
-GFX$$inline_743.debugClipping = GFX$$inline_743.stageOptions.register(new Option$$inline_744("", "debugClipping", "boolean", !1, "Disable clipping."));
-GFX$$inline_743.hud = GFX$$inline_743.stageOptions.register(new Option$$inline_744("", "hud", "boolean", !1, "Enable HUD."));
-var webGLOptions$$inline_748 = GFX$$inline_743.stageOptions.register(new OptionSet$$inline_745("WebGL Options"));
-GFX$$inline_743.perspectiveCamera = webGLOptions$$inline_748.register(new Option$$inline_744("", "pc", "boolean", !1, "Use perspective camera."));
-GFX$$inline_743.perspectiveCameraFOV = webGLOptions$$inline_748.register(new Option$$inline_744("", "pcFOV", "number", 60, "Perspective Camera FOV."));
-GFX$$inline_743.perspectiveCameraDistance = webGLOptions$$inline_748.register(new Option$$inline_744("", "pcDistance", "number", 2, "Perspective Camera Distance."));
-GFX$$inline_743.perspectiveCameraAngle = webGLOptions$$inline_748.register(new Option$$inline_744("", "pcAngle", "number", 0, "Perspective Camera Angle."));
-GFX$$inline_743.perspectiveCameraAngleRotate = webGLOptions$$inline_748.register(new Option$$inline_744("", "pcRotate", "boolean", !1, "Rotate Use perspective camera."));
-GFX$$inline_743.perspectiveCameraSpacing = webGLOptions$$inline_748.register(new Option$$inline_744("", "pcSpacing", "number", .01, "Element Spacing."));
-GFX$$inline_743.perspectiveCameraSpacingInflate = webGLOptions$$inline_748.register(new Option$$inline_744("", "pcInflate", "boolean", !1, "Rotate Use perspective camera."));
-GFX$$inline_743.drawTiles = webGLOptions$$inline_748.register(new Option$$inline_744("", "drawTiles", "boolean", !1, "Draw WebGL Tiles"));
-GFX$$inline_743.drawSurfaces = webGLOptions$$inline_748.register(new Option$$inline_744("", "drawSurfaces", "boolean", !1, "Draw WebGL Surfaces."));
-GFX$$inline_743.drawSurface = webGLOptions$$inline_748.register(new Option$$inline_744("", "drawSurface", "number", -1, "Draw WebGL Surface #"));
-GFX$$inline_743.drawElements = webGLOptions$$inline_748.register(new Option$$inline_744("", "drawElements", "boolean", !0, "Actually call gl.drawElements. This is useful to test if the GPU is the bottleneck."));
-GFX$$inline_743.disableSurfaceUploads = webGLOptions$$inline_748.register(new Option$$inline_744("", "disableSurfaceUploads", "boolean", !1, "Disable surface uploads."));
-GFX$$inline_743.premultipliedAlpha = webGLOptions$$inline_748.register(new Option$$inline_744("", "premultipliedAlpha", "boolean", !1, "Set the premultipliedAlpha flag on getContext()."));
-GFX$$inline_743.unpackPremultiplyAlpha = webGLOptions$$inline_748.register(new Option$$inline_744("", "unpackPremultiplyAlpha", "boolean", !0, "Use UNPACK_PREMULTIPLY_ALPHA_WEBGL in pixelStorei."));
-var factorChoices$$inline_749 = {ZERO:0, ONE:1, SRC_COLOR:768, ONE_MINUS_SRC_COLOR:769, DST_COLOR:774, ONE_MINUS_DST_COLOR:775, SRC_ALPHA:770, ONE_MINUS_SRC_ALPHA:771, DST_ALPHA:772, ONE_MINUS_DST_ALPHA:773, SRC_ALPHA_SATURATE:776, CONSTANT_COLOR:32769, ONE_MINUS_CONSTANT_COLOR:32770, CONSTANT_ALPHA:32771, ONE_MINUS_CONSTANT_ALPHA:32772};
-GFX$$inline_743.sourceBlendFactor = webGLOptions$$inline_748.register(new Option$$inline_744("", "sourceBlendFactor", "number", factorChoices$$inline_749.ONE, "", {choices:factorChoices$$inline_749}));
-GFX$$inline_743.destinationBlendFactor = webGLOptions$$inline_748.register(new Option$$inline_744("", "destinationBlendFactor", "number", factorChoices$$inline_749.ONE_MINUS_SRC_ALPHA, "", {choices:factorChoices$$inline_749}));
-var canvas2DOptions$$inline_750 = GFX$$inline_743.stageOptions.register(new OptionSet$$inline_745("Canvas2D Options"));
-GFX$$inline_743.clipDirtyRegions = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "clipDirtyRegions", "boolean", !1, "Clip dirty regions."));
-GFX$$inline_743.clipCanvas = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "clipCanvas", "boolean", !1, "Clip Regions."));
-GFX$$inline_743.cull = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "cull", "boolean", !1, "Enable culling."));
-GFX$$inline_743.snapToDevicePixels = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "snapToDevicePixels", "boolean", !1, ""));
-GFX$$inline_743.imageSmoothing = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "imageSmoothing", "boolean", !1, ""));
-GFX$$inline_743.masking = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "masking", "boolean", !0, "Composite Mask."));
-GFX$$inline_743.blending = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "blending", "boolean", !0, ""));
-GFX$$inline_743.debugLayers = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "debugLayers", "boolean", !1, ""));
-GFX$$inline_743.filters = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "filters", "boolean", !1, ""));
-GFX$$inline_743.cacheShapes = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "cacheShapes", "boolean", !0, ""));
-GFX$$inline_743.cacheShapesMaxSize = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "cacheShapesMaxSize", "number", 256, "", {range:{min:1, max:1024, step:1}}));
-GFX$$inline_743.cacheShapesThreshold = canvas2DOptions$$inline_750.register(new Option$$inline_744("", "cacheShapesThreshold", "number", 256, "", {range:{min:1, max:1024, step:1}}));
+var Shumway$$inline_749 = Shumway || (Shumway = {}), GFX$$inline_750 = Shumway$$inline_749.GFX || (Shumway$$inline_749.GFX = {}), Option$$inline_751 = Shumway$$inline_749.Options.Option, OptionSet$$inline_752 = Shumway$$inline_749.Options.OptionSet, shumwayOptions$$inline_753 = Shumway$$inline_749.Settings.shumwayOptions, rendererOptions$$inline_754 = shumwayOptions$$inline_753.register(new OptionSet$$inline_752("Renderer Options"));
+GFX$$inline_750.imageUpdateOption = rendererOptions$$inline_754.register(new Option$$inline_751("", "imageUpdate", "boolean", !0, "Enable image updating."));
+GFX$$inline_750.imageConvertOption = rendererOptions$$inline_754.register(new Option$$inline_751("", "imageConvert", "boolean", !0, "Enable image conversion."));
+GFX$$inline_750.stageOptions = shumwayOptions$$inline_753.register(new OptionSet$$inline_752("Stage Renderer Options"));
+GFX$$inline_750.forcePaint = GFX$$inline_750.stageOptions.register(new Option$$inline_751("", "forcePaint", "boolean", !1, "Force repainting."));
+GFX$$inline_750.ignoreViewport = GFX$$inline_750.stageOptions.register(new Option$$inline_751("", "ignoreViewport", "boolean", !1, "Cull elements outside of the viewport."));
+GFX$$inline_750.viewportLoupeDiameter = GFX$$inline_750.stageOptions.register(new Option$$inline_751("", "viewportLoupeDiameter", "number", 256, "Size of the viewport loupe.", {range:{min:1, max:1024, step:1}}));
+GFX$$inline_750.disableClipping = GFX$$inline_750.stageOptions.register(new Option$$inline_751("", "disableClipping", "boolean", !1, "Disable clipping."));
+GFX$$inline_750.debugClipping = GFX$$inline_750.stageOptions.register(new Option$$inline_751("", "debugClipping", "boolean", !1, "Disable clipping."));
+GFX$$inline_750.hud = GFX$$inline_750.stageOptions.register(new Option$$inline_751("", "hud", "boolean", !1, "Enable HUD."));
+var webGLOptions$$inline_755 = GFX$$inline_750.stageOptions.register(new OptionSet$$inline_752("WebGL Options"));
+GFX$$inline_750.perspectiveCamera = webGLOptions$$inline_755.register(new Option$$inline_751("", "pc", "boolean", !1, "Use perspective camera."));
+GFX$$inline_750.perspectiveCameraFOV = webGLOptions$$inline_755.register(new Option$$inline_751("", "pcFOV", "number", 60, "Perspective Camera FOV."));
+GFX$$inline_750.perspectiveCameraDistance = webGLOptions$$inline_755.register(new Option$$inline_751("", "pcDistance", "number", 2, "Perspective Camera Distance."));
+GFX$$inline_750.perspectiveCameraAngle = webGLOptions$$inline_755.register(new Option$$inline_751("", "pcAngle", "number", 0, "Perspective Camera Angle."));
+GFX$$inline_750.perspectiveCameraAngleRotate = webGLOptions$$inline_755.register(new Option$$inline_751("", "pcRotate", "boolean", !1, "Rotate Use perspective camera."));
+GFX$$inline_750.perspectiveCameraSpacing = webGLOptions$$inline_755.register(new Option$$inline_751("", "pcSpacing", "number", .01, "Element Spacing."));
+GFX$$inline_750.perspectiveCameraSpacingInflate = webGLOptions$$inline_755.register(new Option$$inline_751("", "pcInflate", "boolean", !1, "Rotate Use perspective camera."));
+GFX$$inline_750.drawTiles = webGLOptions$$inline_755.register(new Option$$inline_751("", "drawTiles", "boolean", !1, "Draw WebGL Tiles"));
+GFX$$inline_750.drawSurfaces = webGLOptions$$inline_755.register(new Option$$inline_751("", "drawSurfaces", "boolean", !1, "Draw WebGL Surfaces."));
+GFX$$inline_750.drawSurface = webGLOptions$$inline_755.register(new Option$$inline_751("", "drawSurface", "number", -1, "Draw WebGL Surface #"));
+GFX$$inline_750.drawElements = webGLOptions$$inline_755.register(new Option$$inline_751("", "drawElements", "boolean", !0, "Actually call gl.drawElements. This is useful to test if the GPU is the bottleneck."));
+GFX$$inline_750.disableSurfaceUploads = webGLOptions$$inline_755.register(new Option$$inline_751("", "disableSurfaceUploads", "boolean", !1, "Disable surface uploads."));
+GFX$$inline_750.premultipliedAlpha = webGLOptions$$inline_755.register(new Option$$inline_751("", "premultipliedAlpha", "boolean", !1, "Set the premultipliedAlpha flag on getContext()."));
+GFX$$inline_750.unpackPremultiplyAlpha = webGLOptions$$inline_755.register(new Option$$inline_751("", "unpackPremultiplyAlpha", "boolean", !0, "Use UNPACK_PREMULTIPLY_ALPHA_WEBGL in pixelStorei."));
+var factorChoices$$inline_756 = {ZERO:0, ONE:1, SRC_COLOR:768, ONE_MINUS_SRC_COLOR:769, DST_COLOR:774, ONE_MINUS_DST_COLOR:775, SRC_ALPHA:770, ONE_MINUS_SRC_ALPHA:771, DST_ALPHA:772, ONE_MINUS_DST_ALPHA:773, SRC_ALPHA_SATURATE:776, CONSTANT_COLOR:32769, ONE_MINUS_CONSTANT_COLOR:32770, CONSTANT_ALPHA:32771, ONE_MINUS_CONSTANT_ALPHA:32772};
+GFX$$inline_750.sourceBlendFactor = webGLOptions$$inline_755.register(new Option$$inline_751("", "sourceBlendFactor", "number", factorChoices$$inline_756.ONE, "", {choices:factorChoices$$inline_756}));
+GFX$$inline_750.destinationBlendFactor = webGLOptions$$inline_755.register(new Option$$inline_751("", "destinationBlendFactor", "number", factorChoices$$inline_756.ONE_MINUS_SRC_ALPHA, "", {choices:factorChoices$$inline_756}));
+var canvas2DOptions$$inline_757 = GFX$$inline_750.stageOptions.register(new OptionSet$$inline_752("Canvas2D Options"));
+GFX$$inline_750.clipDirtyRegions = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "clipDirtyRegions", "boolean", !1, "Clip dirty regions."));
+GFX$$inline_750.clipCanvas = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "clipCanvas", "boolean", !1, "Clip Regions."));
+GFX$$inline_750.cull = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "cull", "boolean", !1, "Enable culling."));
+GFX$$inline_750.snapToDevicePixels = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "snapToDevicePixels", "boolean", !1, ""));
+GFX$$inline_750.imageSmoothing = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "imageSmoothing", "boolean", !1, ""));
+GFX$$inline_750.masking = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "masking", "boolean", !0, "Composite Mask."));
+GFX$$inline_750.blending = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "blending", "boolean", !0, ""));
+GFX$$inline_750.debugLayers = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "debugLayers", "boolean", !1, ""));
+GFX$$inline_750.filters = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "filters", "boolean", !1, ""));
+GFX$$inline_750.cacheShapes = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "cacheShapes", "boolean", !0, ""));
+GFX$$inline_750.cacheShapesMaxSize = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "cacheShapesMaxSize", "number", 256, "", {range:{min:1, max:1024, step:1}}));
+GFX$$inline_750.cacheShapesThreshold = canvas2DOptions$$inline_757.register(new Option$$inline_751("", "cacheShapesThreshold", "number", 256, "", {range:{min:1, max:1024, step:1}}));
 (function(d) {
   (function(k) {
     (function(a) {
-      function r(a, e, c, d) {
+      function q(a, e, c, d) {
         var f = 1 - d;
         return a * f * f + 2 * e * f * d + c * d * d;
       }
       function v(a, e, c, d, f) {
-        var g = f * f, k = 1 - f, h = k * k;
-        return a * k * h + 3 * e * f * h + 3 * c * k * g + d * f * g;
+        var g = f * f, h = 1 - f, k = h * h;
+        return a * h * k + 3 * e * f * k + 3 * c * h * g + d * f * g;
       }
-      var u = d.NumberUtilities.clamp, t = d.NumberUtilities.pow2, l = d.NumberUtilities.epsilonEquals;
+      var t = d.NumberUtilities.clamp, u = d.NumberUtilities.pow2, l = d.NumberUtilities.epsilonEquals;
       a.radianToDegrees = function(a) {
         return 180 * a / Math.PI;
       };
       a.degreesToRadian = function(a) {
         return a * Math.PI / 180;
       };
-      a.quadraticBezier = r;
+      a.quadraticBezier = q;
       a.quadraticBezierExtreme = function(a, e, c) {
         var d = (a - e) / (a - 2 * e + c);
-        return 0 > d ? a : 1 < d ? c : r(a, e, c, d);
+        return 0 > d ? a : 1 < d ? c : q(a, e, c, d);
       };
       a.cubicBezier = v;
       a.cubicBezierExtremes = function(a, e, c, d) {
         var f = e - a, g;
         g = 2 * (c - e);
-        var k = d - c;
-        f + k === g && (k *= 1.0001);
-        var h = 2 * f - g, l = g - 2 * f, l = Math.sqrt(l * l - 4 * f * (f - g + k));
-        g = 2 * (f - g + k);
-        f = (h + l) / g;
-        h = (h - l) / g;
+        var h = d - c;
+        f + h === g && (h *= 1.0001);
+        var k = 2 * f - g, l = g - 2 * f, l = Math.sqrt(l * l - 4 * f * (f - g + h));
+        g = 2 * (f - g + h);
+        f = (k + l) / g;
+        k = (k - l) / g;
         l = [];
         0 <= f && 1 >= f && l.push(v(a, e, c, d, f));
-        0 <= h && 1 >= h && l.push(v(a, e, c, d, h));
+        0 <= k && 1 >= k && l.push(v(a, e, c, d, k));
         return l;
       };
       var c = function() {
@@ -48997,11 +50706,11 @@
         a.createEmpty = function() {
           return new a(0, 0);
         };
-        a.createEmptyPoints = function(c) {
-          for (var d = [], f = 0;f < c;f++) {
-            d.push(new a(0, 0));
+        a.createEmptyPoints = function(e) {
+          for (var c = [], d = 0;d < e;d++) {
+            c.push(new a(0, 0));
           }
-          return d;
+          return c;
         };
         return a;
       }();
@@ -49064,18 +50773,18 @@
         a.createEmpty = function() {
           return new a(0, 0, 0);
         };
-        a.createEmptyPoints = function(c) {
-          for (var d = [], f = 0;f < c;f++) {
-            d.push(new a(0, 0, 0));
+        a.createEmptyPoints = function(e) {
+          for (var c = [], d = 0;d < e;d++) {
+            c.push(new a(0, 0, 0));
           }
-          return d;
+          return c;
         };
         return a;
       }();
       a.Point3D = h;
       var p = function() {
-        function a(c, d, f, g) {
-          this.setElements(c, d, f, g);
+        function a(e, c, d, f) {
+          this.setElements(e, c, d, f);
           a.allocationCount++;
         }
         a.prototype.setElements = function(a, b, c, d) {
@@ -49136,17 +50845,17 @@
         a.prototype.setEmpty = function() {
           this.h = this.w = this.y = this.x = 0;
         };
-        a.prototype.intersect = function(c) {
-          var d = a.createEmpty();
-          if (this.isEmpty() || c.isEmpty()) {
-            return d.setEmpty(), d;
-          }
-          d.x = Math.max(this.x, c.x);
-          d.y = Math.max(this.y, c.y);
-          d.w = Math.min(this.x + this.w, c.x + c.w) - d.x;
-          d.h = Math.min(this.y + this.h, c.y + c.h) - d.y;
-          d.isEmpty() && d.setEmpty();
-          this.set(d);
+        a.prototype.intersect = function(e) {
+          var c = a.createEmpty();
+          if (this.isEmpty() || e.isEmpty()) {
+            return c.setEmpty(), c;
+          }
+          c.x = Math.max(this.x, e.x);
+          c.y = Math.max(this.y, e.y);
+          c.w = Math.min(this.x + this.w, e.x + e.w) - c.x;
+          c.h = Math.min(this.y + this.h, e.y + e.h) - c.y;
+          c.isEmpty() && c.setEmpty();
+          this.set(c);
         };
         a.prototype.intersects = function(a) {
           if (this.isEmpty() || a.isEmpty()) {
@@ -49156,11 +50865,11 @@
           a = Math.min(this.y + this.h, a.y + a.h) - c;
           return!(0 >= b || 0 >= a);
         };
-        a.prototype.intersectsTransformedAABB = function(c, d) {
-          var f = a._temporary;
-          f.set(c);
-          d.transformRectangleAABB(f);
-          return this.intersects(f);
+        a.prototype.intersectsTransformedAABB = function(e, c) {
+          var d = a._temporary;
+          d.set(e);
+          c.transformRectangleAABB(d);
+          return this.intersects(d);
         };
         a.prototype.intersectsTranslated = function(a, b, c) {
           if (this.isEmpty() || a.isEmpty()) {
@@ -49175,13 +50884,13 @@
           return this.w * this.h;
         };
         a.prototype.clone = function() {
-          var c = a.allocate();
-          c.set(this);
-          return c;
+          var e = a.allocate();
+          e.set(this);
+          return e;
         };
         a.allocate = function() {
-          var c = a._dirtyStack;
-          return c.length ? c.pop() : new a(12345, 67890, 12345, 67890);
+          var e = a._dirtyStack;
+          return e.length ? e.pop() : new a(12345, 67890, 12345, 67890);
         };
         a.prototype.free = function() {
           a._dirtyStack.push(this);
@@ -49226,9 +50935,9 @@
           return "{" + this.x.toFixed(a) + ", " + this.y.toFixed(a) + ", " + this.w.toFixed(a) + ", " + this.h.toFixed(a) + "}";
         };
         a.createEmpty = function() {
-          var c = a.allocate();
-          c.setEmpty();
-          return c;
+          var e = a.allocate();
+          e.setEmpty();
+          return e;
         };
         a.createSquare = function() {
           return new a(-512, -512, 1024, 1024);
@@ -49271,11 +50980,11 @@
         };
         a.getBounds = function(a) {
           for (var b = new c(Number.MAX_VALUE, Number.MAX_VALUE), d = new c(Number.MIN_VALUE, Number.MIN_VALUE), f = 0;4 > f;f++) {
-            var g = a[f].x, k = a[f].y;
+            var g = a[f].x, h = a[f].y;
             b.x = Math.min(b.x, g);
-            b.y = Math.min(b.y, k);
+            b.y = Math.min(b.y, h);
             d.x = Math.max(d.x, g);
-            d.y = Math.max(d.y, k);
+            d.y = Math.max(d.y, h);
           }
           return new p(b.x, b.y, d.x - b.x, d.y - b.y);
         };
@@ -49303,10 +51012,10 @@
         a[a.Translation = 2] = "Translation";
       })(a.MatrixType || (a.MatrixType = {}));
       var m = function() {
-        function a(c, d, f, g, k, h) {
+        function a(e, c, d, f, g, h) {
           this._data = new Float64Array(6);
           this._type = 0;
-          this.setElements(c, d, f, g, k, h);
+          this.setElements(e, c, d, f, g, h);
           a.allocationCount++;
         }
         Object.defineProperty(a.prototype, "a", {get:function() {
@@ -49346,13 +51055,13 @@
           1 === this._type && (this._type = 2);
         }, enumerable:!0, configurable:!0});
         a.prototype.setElements = function(a, b, c, d, f, g) {
-          var k = this._data;
-          k[0] = a;
-          k[1] = b;
-          k[2] = c;
-          k[3] = d;
-          k[4] = f;
-          k[5] = g;
+          var h = this._data;
+          h[0] = a;
+          h[1] = b;
+          h[2] = c;
+          h[3] = d;
+          h[4] = f;
+          h[5] = g;
           this._type = 0;
         };
         a.prototype.set = function(a) {
@@ -49382,38 +51091,38 @@
           return b[0] === a[0] && b[1] === a[1] && b[2] === a[2] && b[3] === a[3] && b[4] === a[4] && b[5] === a[5];
         };
         a.prototype.clone = function() {
-          var c = a.allocate();
-          c.set(this);
-          return c;
+          var e = a.allocate();
+          e.set(this);
+          return e;
         };
         a.allocate = function() {
-          var c = a._dirtyStack;
-          return c.length ? c.pop() : new a(12345, 12345, 12345, 12345, 12345, 12345);
+          var e = a._dirtyStack;
+          return e.length ? e.pop() : new a(12345, 12345, 12345, 12345, 12345, 12345);
         };
         a.prototype.free = function() {
           a._dirtyStack.push(this);
         };
         a.prototype.transform = function(a, b, c, d, f, g) {
-          var k = this._data, h = k[0], l = k[1], m = k[2], p = k[3], r = k[4], s = k[5];
-          k[0] = h * a + m * b;
-          k[1] = l * a + p * b;
-          k[2] = h * c + m * d;
-          k[3] = l * c + p * d;
-          k[4] = h * f + m * g + r;
-          k[5] = l * f + p * g + s;
+          var h = this._data, k = h[0], l = h[1], m = h[2], p = h[3], q = h[4], s = h[5];
+          h[0] = k * a + m * b;
+          h[1] = l * a + p * b;
+          h[2] = k * c + m * d;
+          h[3] = l * c + p * d;
+          h[4] = k * f + m * g + q;
+          h[5] = l * f + p * g + s;
           this._type = 0;
           return this;
         };
         a.prototype.transformRectangle = function(a, b) {
-          var c = this._data, d = c[0], f = c[1], g = c[2], k = c[3], h = c[4], c = c[5], l = a.x, m = a.y, p = a.w, r = a.h;
-          b[0].x = d * l + g * m + h;
-          b[0].y = f * l + k * m + c;
-          b[1].x = d * (l + p) + g * m + h;
-          b[1].y = f * (l + p) + k * m + c;
-          b[2].x = d * (l + p) + g * (m + r) + h;
-          b[2].y = f * (l + p) + k * (m + r) + c;
-          b[3].x = d * l + g * (m + r) + h;
-          b[3].y = f * l + k * (m + r) + c;
+          var c = this._data, d = c[0], f = c[1], g = c[2], h = c[3], k = c[4], c = c[5], l = a.x, m = a.y, p = a.w, q = a.h;
+          b[0].x = d * l + g * m + k;
+          b[0].y = f * l + h * m + c;
+          b[1].x = d * (l + p) + g * m + k;
+          b[1].y = f * (l + p) + h * m + c;
+          b[2].x = d * (l + p) + g * (m + q) + k;
+          b[2].y = f * (l + p) + h * (m + q) + c;
+          b[3].x = d * l + g * (m + q) + k;
+          b[3].y = f * l + h * (m + q) + c;
         };
         a.prototype.isTranslationOnly = function() {
           if (2 === this._type) {
@@ -49428,15 +51137,15 @@
             if (2 === this._type) {
               a.x += b[4], a.y += b[5];
             } else {
-              var c = b[0], d = b[1], f = b[2], g = b[3], k = b[4], h = b[5], l = a.x, m = a.y, p = a.w, r = a.h, b = c * l + f * m + k, s = d * l + g * m + h, t = c * (l + p) + f * m + k, u = d * (l + p) + g * m + h, v = c * (l + p) + f * (m + r) + k, p = d * (l + p) + g * (m + r) + h, c = c * l + f * (m + r) + k, d = d * l + g * (m + r) + h, g = 0;
-              b > t && (g = b, b = t, t = g);
+              var c = b[0], d = b[1], f = b[2], g = b[3], h = b[4], k = b[5], l = a.x, m = a.y, p = a.w, q = a.h, b = c * l + f * m + h, s = d * l + g * m + k, u = c * (l + p) + f * m + h, t = d * (l + p) + g * m + k, v = c * (l + p) + f * (m + q) + h, p = d * (l + p) + g * (m + q) + k, c = c * l + f * (m + q) + h, d = d * l + g * (m + q) + k, g = 0;
+              b > u && (g = b, b = u, u = g);
               v > c && (g = v, v = c, c = g);
               a.x = b < v ? b : v;
-              a.w = (t > c ? t : c) - a.x;
-              s > u && (g = s, s = u, u = g);
+              a.w = (u > c ? u : c) - a.x;
+              s > t && (g = s, s = t, t = g);
               p > d && (g = p, p = d, d = g);
               a.y = s < p ? s : p;
-              a.h = (u > d ? u : d) - a.y;
+              a.h = (t > d ? t : d) - a.y;
             }
           }
         };
@@ -49455,14 +51164,14 @@
           return 1 === a && 1 === b ? this : this.clone().scale(a, b);
         };
         a.prototype.rotate = function(a) {
-          var b = this._data, c = b[0], d = b[1], f = b[2], g = b[3], k = b[4], h = b[5], l = Math.cos(a);
+          var b = this._data, c = b[0], d = b[1], f = b[2], g = b[3], h = b[4], k = b[5], l = Math.cos(a);
           a = Math.sin(a);
           b[0] = l * c - a * d;
           b[1] = a * c + l * d;
           b[2] = l * f - a * g;
           b[3] = a * f + l * g;
-          b[4] = l * k - a * h;
-          b[5] = a * k + l * h;
+          b[4] = l * h - a * k;
+          b[5] = a * h + l * k;
           this._type = 0;
           return this;
         };
@@ -49472,16 +51181,16 @@
           }
           var b = this._data;
           a = a._data;
-          var c = b[0] * a[0], d = 0, f = 0, g = b[3] * a[3], k = b[4] * a[0] + a[4], h = b[5] * a[3] + a[5];
+          var c = b[0] * a[0], d = 0, f = 0, g = b[3] * a[3], h = b[4] * a[0] + a[4], k = b[5] * a[3] + a[5];
           if (0 !== b[1] || 0 !== b[2] || 0 !== a[1] || 0 !== a[2]) {
-            c += b[1] * a[2], g += b[2] * a[1], d += b[0] * a[1] + b[1] * a[3], f += b[2] * a[0] + b[3] * a[2], k += b[5] * a[2], h += b[4] * a[1];
+            c += b[1] * a[2], g += b[2] * a[1], d += b[0] * a[1] + b[1] * a[3], f += b[2] * a[0] + b[3] * a[2], h += b[5] * a[2], k += b[4] * a[1];
           }
           b[0] = c;
           b[1] = d;
           b[2] = f;
           b[3] = g;
-          b[4] = k;
-          b[5] = h;
+          b[4] = h;
+          b[5] = k;
           this._type = 0;
           return this;
         };
@@ -49495,16 +51204,16 @@
           } else {
             if (1 !== a._type) {
               a = c[0] * b[0];
-              var d = 0, f = 0, g = c[3] * b[3], k = c[4] * b[0] + b[4], h = c[5] * b[3] + b[5];
+              var d = 0, f = 0, g = c[3] * b[3], h = c[4] * b[0] + b[4], k = c[5] * b[3] + b[5];
               if (0 !== c[1] || 0 !== c[2] || 0 !== b[1] || 0 !== b[2]) {
-                a += c[1] * b[2], g += c[2] * b[1], d += c[0] * b[1] + c[1] * b[3], f += c[2] * b[0] + c[3] * b[2], k += c[5] * b[2], h += c[4] * b[1];
+                a += c[1] * b[2], g += c[2] * b[1], d += c[0] * b[1] + c[1] * b[3], f += c[2] * b[0] + c[3] * b[2], h += c[5] * b[2], k += c[4] * b[1];
               }
               b[0] = a;
               b[1] = d;
               b[2] = f;
               b[3] = g;
-              b[4] = k;
-              b[5] = h;
+              b[4] = h;
+              b[5] = k;
               this._type = 0;
             }
           }
@@ -49562,15 +51271,15 @@
             if (2 === this._type) {
               c[0] = 1, c[1] = 0, c[2] = 0, c[3] = 1, c[4] = -b[4], c[5] = -b[5], a._type = 2;
             } else {
-              var d = b[1], f = b[2], g = b[4], k = b[5];
+              var d = b[1], f = b[2], g = b[4], h = b[5];
               if (0 === d && 0 === f) {
-                var h = c[0] = 1 / b[0], b = c[3] = 1 / b[3];
+                var k = c[0] = 1 / b[0], b = c[3] = 1 / b[3];
                 c[1] = 0;
                 c[2] = 0;
-                c[4] = -h * g;
-                c[5] = -b * k;
+                c[4] = -k * g;
+                c[5] = -b * h;
               } else {
-                var h = b[0], b = b[3], l = h * b - d * f;
+                var k = b[0], b = b[3], l = k * b - d * f;
                 if (0 === l) {
                   a.setIdentity();
                   return;
@@ -49579,9 +51288,9 @@
                 c[0] = b * l;
                 d = c[1] = -d * l;
                 f = c[2] = -f * l;
-                b = c[3] = h * l;
-                c[4] = -(c[0] * g + f * k);
-                c[5] = -(d * g + b * k);
+                b = c[3] = k * l;
+                c[4] = -(c[0] * g + f * h);
+                c[5] = -(d * g + b * h);
               }
               a._type = 0;
             }
@@ -49715,8 +51424,8 @@
         };
         a.createPerspective = function(c, d, f, g) {
           c = Math.tan(.5 * Math.PI - .5 * c);
-          var k = 1 / (f - g);
-          return new a([c / d, 0, 0, 0, 0, c, 0, 0, 0, 0, (f + g) * k, -1, 0, 0, f * g * k * 2, 0]);
+          var h = 1 / (f - g);
+          return new a([c / d, 0, 0, 0, 0, c, 0, 0, 0, 0, (f + g) * h, -1, 0, 0, f * g * h * 2, 0]);
         };
         a.createIdentity = function() {
           return a.createTranslation();
@@ -49743,17 +51452,17 @@
           return new a([c, 0, 0, 0, 0, d, 0, 0, 0, 0, f, 0, 0, 0, 0, 1]);
         };
         a.createMultiply = function(c, d) {
-          var f = c._m, g = d._m, k = f[0], h = f[1], l = f[2], m = f[3], p = f[4], r = f[5], s = f[6], t = f[7], u = f[8], v = f[9], y = f[10], z = f[11], G = f[12], C = f[13], I = f[14], f = f[15], P = g[0], T = g[1], O = g[2], Q = g[3], S = g[4], V = g[5], aa = g[6], $ = g[7], w = g[8], U = g[9], ba = g[10], R = g[11], N = g[12], Z = g[13], fa = g[14], g = g[15];
-          return new a([k * P + h * S + l * w + m * N, k * T + h * V + l * U + m * Z, k * O + h * aa + l * ba + m * fa, k * Q + h * $ + l * R + m * g, p * P + r * S + s * w + t * N, p * T + r * V + s * U + t * Z, p * O + r * aa + s * ba + t * fa, p * Q + r * $ + s * R + t * g, u * P + v * S + y * w + z * N, u * T + v * V + y * U + z * Z, u * O + v * aa + y * ba + z * fa, u * Q + v * $ + y * R + z * g, G * P + C * S + I * w + f * N, G * T + C * V + I * U + f * Z, G * O + C * aa + I * ba + f * fa, 
-          G * Q + C * $ + I * R + f * g]);
+          var f = c._m, g = d._m, h = f[0], k = f[1], l = f[2], m = f[3], p = f[4], q = f[5], s = f[6], u = f[7], t = f[8], v = f[9], A = f[10], z = f[11], G = f[12], I = f[13], D = f[14], f = f[15], R = g[0], T = g[1], J = g[2], P = g[3], S = g[4], W = g[5], ba = g[6], w = g[7], X = g[8], U = g[9], $ = g[10], Y = g[11], M = g[12], Z = g[13], ca = g[14], g = g[15];
+          return new a([h * R + k * S + l * X + m * M, h * T + k * W + l * U + m * Z, h * J + k * ba + l * $ + m * ca, h * P + k * w + l * Y + m * g, p * R + q * S + s * X + u * M, p * T + q * W + s * U + u * Z, p * J + q * ba + s * $ + u * ca, p * P + q * w + s * Y + u * g, t * R + v * S + A * X + z * M, t * T + v * W + A * U + z * Z, t * J + v * ba + A * $ + z * ca, t * P + v * w + A * Y + z * g, G * R + I * S + D * X + f * M, G * T + I * W + D * U + f * Z, G * J + I * ba + D * $ + f * ca, G * 
+          P + I * w + D * Y + f * g]);
         };
         a.createInverse = function(c) {
           var d = c._m;
           c = d[0];
-          var f = d[1], g = d[2], k = d[3], h = d[4], l = d[5], m = d[6], p = d[7], r = d[8], s = d[9], t = d[10], u = d[11], v = d[12], y = d[13], z = d[14], d = d[15], G = t * d, C = z * u, I = m * d, P = z * p, T = m * u, O = t * p, Q = g * d, S = z * k, V = g * u, aa = t * k, $ = g * p, w = m * k, U = r * y, ba = v * s, R = h * y, N = v * l, Z = h * s, fa = r * l, X = c * y, ia = v * f, ga = c * s, ca = r * f, da = c * l, ea = h * f, W = G * l + P * s + T * y - (C * l + I * s + O * y), ka = C * 
-          f + Q * s + aa * y - (G * f + S * s + V * y), y = I * f + S * l + $ * y - (P * f + Q * l + w * y), f = O * f + V * l + w * s - (T * f + aa * l + $ * s), l = 1 / (c * W + h * ka + r * y + v * f);
-          return new a([l * W, l * ka, l * y, l * f, l * (C * h + I * r + O * v - (G * h + P * r + T * v)), l * (G * c + S * r + V * v - (C * c + Q * r + aa * v)), l * (P * c + Q * h + w * v - (I * c + S * h + $ * v)), l * (T * c + aa * h + $ * r - (O * c + V * h + w * r)), l * (U * p + N * u + Z * d - (ba * p + R * u + fa * d)), l * (ba * k + X * u + ca * d - (U * k + ia * u + ga * d)), l * (R * k + ia * p + da * d - (N * k + X * p + ea * d)), l * (fa * k + ga * p + ea * u - (Z * k + ca * p + da * 
-          u)), l * (R * t + fa * z + ba * m - (Z * z + U * m + N * t)), l * (ga * z + U * g + ia * t - (X * t + ca * z + ba * g)), l * (X * m + ea * z + N * g - (da * z + R * g + ia * m)), l * (da * t + Z * g + ca * m - (ga * m + ea * t + fa * g))]);
+          var f = d[1], g = d[2], h = d[3], k = d[4], l = d[5], m = d[6], p = d[7], q = d[8], s = d[9], u = d[10], t = d[11], v = d[12], A = d[13], z = d[14], d = d[15], G = u * d, I = z * t, D = m * d, R = z * p, T = m * t, J = u * p, P = g * d, S = z * h, W = g * t, ba = u * h, w = g * p, X = m * h, U = q * A, $ = v * s, Y = k * A, M = v * l, Z = k * s, ca = q * l, ga = c * A, ha = v * f, ea = c * s, aa = q * f, da = c * l, O = k * f, ka = G * l + R * s + T * A - (I * l + D * s + J * A), V = I * 
+          f + P * s + ba * A - (G * f + S * s + W * A), A = D * f + S * l + w * A - (R * f + P * l + X * A), f = J * f + W * l + X * s - (T * f + ba * l + w * s), l = 1 / (c * ka + k * V + q * A + v * f);
+          return new a([l * ka, l * V, l * A, l * f, l * (I * k + D * q + J * v - (G * k + R * q + T * v)), l * (G * c + S * q + W * v - (I * c + P * q + ba * v)), l * (R * c + P * k + X * v - (D * c + S * k + w * v)), l * (T * c + ba * k + w * q - (J * c + W * k + X * q)), l * (U * p + M * t + Z * d - ($ * p + Y * t + ca * d)), l * ($ * h + ga * t + aa * d - (U * h + ha * t + ea * d)), l * (Y * h + ha * p + da * d - (M * h + ga * p + O * d)), l * (ca * h + ea * p + O * t - (Z * h + aa * p + da * 
+          t)), l * (Y * u + ca * z + $ * m - (Z * z + U * m + M * u)), l * (ea * z + U * g + ha * u - (ga * u + aa * z + $ * g)), l * (ga * m + O * z + M * g - (da * z + Y * g + ha * m)), l * (da * u + Z * g + aa * m - (ea * m + O * u + ca * g))]);
         };
         return a;
       }();
@@ -49795,9 +51504,9 @@
             if (d.region.contains(a)) {
               d.bounds.isEmpty() ? d.bounds.set(a) : d.bounds.contains(a) || d.bounds.union(a);
             } else {
-              for (var f = Math.min(this.c, Math.ceil((a.x + a.w) / this.size)) - b, g = Math.min(this.r, Math.ceil((a.y + a.h) / this.size)) - c, k = 0;k < f;k++) {
-                for (var h = 0;h < g;h++) {
-                  d = this.grid[c + h][b + k], d = d.region.clone(), d.intersect(a), d.isEmpty() || this.addDirtyRectangle(d);
+              for (var f = Math.min(this.c, Math.ceil((a.x + a.w) / this.size)) - b, g = Math.min(this.r, Math.ceil((a.y + a.h) / this.size)) - c, h = 0;h < f;h++) {
+                for (var k = 0;k < g;k++) {
+                  d = this.grid[c + k][b + h], d = d.region.clone(), d.intersect(a), d.isEmpty() || this.addDirtyRectangle(d);
                 }
               }
             }
@@ -49866,11 +51575,11 @@
         a.Cell = c;
       })(m = a.DirtyRegion || (a.DirtyRegion = {}));
       var g = function() {
-        function a(b, c, d, f, g, k) {
+        function a(b, c, d, f, g, h) {
           this.index = b;
           this.x = c;
           this.y = d;
-          this.scale = k;
+          this.scale = h;
           this.bounds = new p(c * f, d * g, f, g);
         }
         a.prototype.getOBB = function() {
@@ -49885,18 +51594,18 @@
       }();
       a.Tile = g;
       var f = function() {
-        function a(b, c, d, f, k) {
+        function a(b, c, d, f, h) {
           this.tileW = d;
           this.tileH = f;
-          this.scale = k;
+          this.scale = h;
           this.w = b;
           this.h = c;
           this.rows = Math.ceil(c / f);
           this.columns = Math.ceil(b / d);
           this.tiles = [];
           for (c = b = 0;c < this.rows;c++) {
-            for (var h = 0;h < this.columns;h++) {
-              this.tiles.push(new g(b++, h, c, d, f, k));
+            for (var k = 0;k < this.columns;k++) {
+              this.tiles.push(new g(b++, k, c, d, f, h));
             }
           }
         }
@@ -49923,14 +51632,14 @@
           if (c.isEmpty()) {
             return[];
           }
-          var k = c.x / this.tileW | 0;
+          var h = c.x / this.tileW | 0;
           d = c.y / this.tileH | 0;
-          var h = Math.ceil((c.x + c.w) / this.tileW) | 0, l = Math.ceil((c.y + c.h) / this.tileH) | 0, k = u(k, 0, this.columns), h = u(h, 0, this.columns);
-          d = u(d, 0, this.rows);
-          for (var l = u(l, 0, this.rows), m = [];k < h;k++) {
-            for (var r = d;r < l;r++) {
-              var t = this.tiles[r * this.columns + k];
-              t.bounds.intersects(c) && (f ? t.getOBB().intersects(g) : 1) && m.push(t);
+          var k = Math.ceil((c.x + c.w) / this.tileW) | 0, l = Math.ceil((c.y + c.h) / this.tileH) | 0, h = t(h, 0, this.columns), k = t(k, 0, this.columns);
+          d = t(d, 0, this.rows);
+          for (var l = t(l, 0, this.rows), m = [];h < k;h++) {
+            for (var q = d;q < l;q++) {
+              var u = this.tiles[q * this.columns + h];
+              u.bounds.intersects(c) && (f ? u.getOBB().intersects(g) : 1) && m.push(u);
             }
           }
           return m;
@@ -49941,45 +51650,45 @@
           }
           function g(a, b, c, e, d) {
             if (!(0 > c || c >= b.columns)) {
-              for (e = u(e, 0, b.rows), d = u(d + 1, 0, b.rows);e < d;e++) {
+              for (e = t(e, 0, b.rows), d = t(d + 1, 0, b.rows);e < d;e++) {
                 a.push(b.tiles[e * b.columns + c]);
               }
             }
           }
-          var k = a._points;
-          d.transformRectangle(c, k);
-          for (var h = k[0].x < k[1].x ? 0 : 1, l = k[2].x < k[3].x ? 2 : 3, l = k[h].x < k[l].x ? h : l, h = [], m = 0;5 > m;m++, l++) {
-            h.push(k[l % 4]);
-          }
-          (h[1].x - h[0].x) * (h[3].y - h[0].y) < (h[1].y - h[0].y) * (h[3].x - h[0].x) && (k = h[1], h[1] = h[3], h[3] = k);
-          var k = [], p, r, l = Math.floor(h[0].x / this.tileW), m = (l + 1) * this.tileW;
-          if (h[2].x < m) {
-            p = Math.min(h[0].y, h[1].y, h[2].y, h[3].y);
-            r = Math.max(h[0].y, h[1].y, h[2].y, h[3].y);
-            var s = Math.floor(p / this.tileH), t = Math.floor(r / this.tileH);
-            g(k, this, l, s, t);
-            return k;
+          var h = a._points;
+          d.transformRectangle(c, h);
+          for (var k = h[0].x < h[1].x ? 0 : 1, l = h[2].x < h[3].x ? 2 : 3, l = h[k].x < h[l].x ? k : l, k = [], m = 0;5 > m;m++, l++) {
+            k.push(h[l % 4]);
+          }
+          (k[1].x - k[0].x) * (k[3].y - k[0].y) < (k[1].y - k[0].y) * (k[3].x - k[0].x) && (h = k[1], k[1] = k[3], k[3] = h);
+          var h = [], p, q, l = Math.floor(k[0].x / this.tileW), m = (l + 1) * this.tileW;
+          if (k[2].x < m) {
+            p = Math.min(k[0].y, k[1].y, k[2].y, k[3].y);
+            q = Math.max(k[0].y, k[1].y, k[2].y, k[3].y);
+            var s = Math.floor(p / this.tileH), u = Math.floor(q / this.tileH);
+            g(h, this, l, s, u);
+            return h;
           }
-          var v = 0, E = 4, y = !1;
-          if (h[0].x === h[1].x || h[0].x === h[3].x) {
-            h[0].x === h[1].x ? (y = !0, v++) : E--, p = f(m, h[v], h[v + 1]), r = f(m, h[E], h[E - 1]), s = Math.floor(h[v].y / this.tileH), t = Math.floor(h[E].y / this.tileH), g(k, this, l, s, t), l++;
+          var v = 0, L = 4, A = !1;
+          if (k[0].x === k[1].x || k[0].x === k[3].x) {
+            k[0].x === k[1].x ? (A = !0, v++) : L--, p = f(m, k[v], k[v + 1]), q = f(m, k[L], k[L - 1]), s = Math.floor(k[v].y / this.tileH), u = Math.floor(k[L].y / this.tileH), g(h, this, l, s, u), l++;
           }
           do {
-            var z, G, C, I;
-            h[v + 1].x < m ? (z = h[v + 1].y, C = !0) : (z = f(m, h[v], h[v + 1]), C = !1);
-            h[E - 1].x < m ? (G = h[E - 1].y, I = !0) : (G = f(m, h[E], h[E - 1]), I = !1);
-            s = Math.floor((h[v].y < h[v + 1].y ? p : z) / this.tileH);
-            t = Math.floor((h[E].y > h[E - 1].y ? r : G) / this.tileH);
-            g(k, this, l, s, t);
-            if (C && y) {
+            var z, G, I, D;
+            k[v + 1].x < m ? (z = k[v + 1].y, I = !0) : (z = f(m, k[v], k[v + 1]), I = !1);
+            k[L - 1].x < m ? (G = k[L - 1].y, D = !0) : (G = f(m, k[L], k[L - 1]), D = !1);
+            s = Math.floor((k[v].y < k[v + 1].y ? p : z) / this.tileH);
+            u = Math.floor((k[L].y > k[L - 1].y ? q : G) / this.tileH);
+            g(h, this, l, s, u);
+            if (I && A) {
               break;
             }
-            C ? (y = !0, v++, p = f(m, h[v], h[v + 1])) : p = z;
-            I ? (E--, r = f(m, h[E], h[E - 1])) : r = G;
+            I ? (A = !0, v++, p = f(m, k[v], k[v + 1])) : p = z;
+            D ? (L--, q = f(m, k[L], k[L - 1])) : q = G;
             l++;
             m = (l + 1) * this.tileW;
-          } while (v < E);
-          return k;
+          } while (v < L);
+          return h;
         };
         a._points = c.createEmptyPoints(4);
         return a;
@@ -49994,19 +51703,19 @@
         }
         a.prototype._getTilesAtScale = function(a, b, c) {
           var d = Math.max(b.getAbsoluteScaleX(), b.getAbsoluteScaleY()), g = 0;
-          1 !== d && (g = u(Math.round(Math.log(1 / d) / Math.LN2), -5, 3));
-          d = t(g);
+          1 !== d && (g = t(Math.round(Math.log(1 / d) / Math.LN2), -5, 3));
+          d = u(g);
           if (this._source.hasFlags(1048576)) {
             for (;;) {
-              d = t(g);
+              d = u(g);
               if (c.contains(this._source.getBounds().getAbsoluteBounds().clone().scale(d, d))) {
                 break;
               }
               g--;
             }
           }
-          this._source.hasFlags(2097152) || (g = u(g, -5, 0));
-          d = t(g);
+          this._source.hasFlags(2097152) || (g = t(g, -5, 0));
+          d = u(g);
           c = 5 + g;
           g = this._cacheLevels[c];
           if (!g) {
@@ -50067,25 +51776,25 @@
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
 };
 (function(d) {
   (function(k) {
-    var a = d.IntegerUtilities.roundToMultipleOfPowerOfTwo, r = k.Geometry.Rectangle;
+    var a = d.IntegerUtilities.roundToMultipleOfPowerOfTwo, q = k.Geometry.Rectangle;
     (function(d) {
-      var u = function(a) {
+      var t = function(a) {
         function c() {
           a.apply(this, arguments);
         }
         __extends(c, a);
         return c;
       }(k.Geometry.Rectangle);
-      d.Region = u;
-      var t = function() {
+      d.Region = t;
+      var u = function() {
         function a(c, d) {
           this._root = new l(0, 0, c | 0, d | 0, !1);
         }
@@ -50104,7 +51813,7 @@
         a.MAX_DEPTH = 256;
         return a;
       }();
-      d.CompactAllocator = t;
+      d.CompactAllocator = u;
       var l = function(a) {
         function c(d, b, e, g, h) {
           a.call(this, d, b, e, g);
@@ -50121,14 +51830,14 @@
           return this._insert(a, b, 0);
         };
         c.prototype._insert = function(a, b, e) {
-          if (!(e > t.MAX_DEPTH || this.allocated || this.w < a || this.h < b)) {
+          if (!(e > u.MAX_DEPTH || this.allocated || this.w < a || this.h < b)) {
             if (this._children) {
               var d;
               if ((d = this._children[0]._insert(a, b, e + 1)) || (d = this._children[1]._insert(a, b, e + 1))) {
                 return d;
               }
             } else {
-              return d = !this._horizontal, t.RANDOM_ORIENTATION && (d = .5 <= Math.random()), this._children = this._horizontal ? [new c(this.x, this.y, this.w, b, !1), new c(this.x, this.y + b, this.w, this.h - b, d)] : [new c(this.x, this.y, a, this.h, !0), new c(this.x + a, this.y, this.w - a, this.h, d)], d = this._children[0], d.w === a && d.h === b ? (d.allocated = !0, d) : this._insert(a, b, e + 1);
+              return d = !this._horizontal, u.RANDOM_ORIENTATION && (d = .5 <= Math.random()), this._children = this._horizontal ? [new c(this.x, this.y, this.w, b, !1), new c(this.x, this.y + b, this.w, this.h - b, d)] : [new c(this.x, this.y, a, this.h, !0), new c(this.x + a, this.y, this.w - a, this.h, d)], d = this._children[0], d.w === a && d.h === b ? (d.allocated = !0, d) : this._insert(a, b, e + 1);
             }
           }
         };
@@ -50184,7 +51893,7 @@
         return c;
       }(d.Region);
       d.BucketCell = s;
-      u = function() {
+      t = function() {
         function d(a, c) {
           this._buckets = [];
           this._w = a | 0;
@@ -50207,14 +51916,14 @@
               if (m < f) {
                 return null;
               }
-              var l = a(b, 8), t = 2 * l;
-              t > m && (t = m);
-              if (t < l) {
+              var l = a(b, 8), u = 2 * l;
+              u > m && (u = m);
+              if (u < l) {
                 return null;
               }
-              m = new r(0, this._filled, this._w, t);
+              m = new q(0, this._filled, this._w, u);
               this._buckets.push(new p(l, m, new c(m.w, m.h, l, l)));
-              this._filled += t;
+              this._filled += u;
             }
           } while (!e);
           return new s(h.region.x + e.x, h.region.y + e.y, e.w, e.h, e);
@@ -50224,7 +51933,7 @@
         };
         return d;
       }();
-      d.BucketAllocator = u;
+      d.BucketAllocator = t;
     })(k.RegionAllocator || (k.RegionAllocator = {}));
     (function(a) {
       var d = function() {
@@ -50245,9 +51954,9 @@
         };
         a.prototype.allocate = function(a, c, d) {
           for (var k = 0;k < this._surfaces.length;k++) {
-            var r = this._surfaces[k];
-            if (r !== d && (r = r.allocate(a, c))) {
-              return r;
+            var q = this._surfaces[k];
+            if (q !== d && (q = q.allocate(a, c))) {
+              return q;
             }
           }
           return this._createNewSurface(a, c).allocate(a, c);
@@ -50262,7 +51971,7 @@
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
-    var a = k.Geometry.Rectangle, r = k.Geometry.Matrix, v = k.Geometry.DirtyRegion;
+    var a = k.Geometry.Rectangle, q = k.Geometry.Matrix, v = k.Geometry.DirtyRegion;
     (function(a) {
       a[a.Normal = 1] = "Normal";
       a[a.Layer = 2] = "Layer";
@@ -50279,7 +51988,7 @@
       a[a.Overlay = 13] = "Overlay";
       a[a.HardLight = 14] = "HardLight";
     })(k.BlendMode || (k.BlendMode = {}));
-    var u = k.BlendMode;
+    var t = k.BlendMode;
     (function(a) {
       a[a.None = 0] = "None";
       a[a.BoundsAutoCompute = 2] = "BoundsAutoCompute";
@@ -50306,7 +52015,7 @@
       a[a.Tileable = 4194304] = "Tileable";
       a[a.Transparent = 32768] = "Transparent";
     })(k.NodeFlags || (k.NodeFlags = {}));
-    var t = k.NodeFlags;
+    var u = k.NodeFlags;
     (function(a) {
       a[a.Node = 1] = "Node";
       a[a.Shape = 3] = "Shape";
@@ -50318,6 +52027,7 @@
     (function(a) {
       a[a.None = 0] = "None";
       a[a.OnStageBoundsChanged = 1] = "OnStageBoundsChanged";
+      a[a.RemovedFromStage = 2] = "RemovedFromStage";
     })(k.NodeEventType || (k.NodeEventType = {}));
     var c = function() {
       function a() {
@@ -50329,8 +52039,8 @@
       };
       a.prototype.visitGroup = function(a, b) {
         this.visitNode(a, b);
-        for (var c = a.getChildren(), d = 0;d < c.length;d++) {
-          c[d].visit(this, b);
+        for (var c = a.getChildren(), e = 0;e < c.length;e++) {
+          c[e].visit(this, b);
         }
       };
       a.prototype.visitStage = function(a, b) {
@@ -50350,7 +52060,8 @@
     var p = function(a) {
       function b() {
         a.call(this);
-        this.matrix = r.createIdentity();
+        this.matrix = q.createIdentity();
+        this.depth = 0;
       }
       __extends(b, a);
       b.prototype.transform = function(a) {
@@ -50378,7 +52089,7 @@
       b._dirtyStack = [];
       return b;
     }(h);
-    k.MatrixState = p;
+    k.PreRenderState = p;
     var s = function(a) {
       function b() {
         a.apply(this, arguments);
@@ -50395,19 +52106,20 @@
       b.prototype.visitGroup = function(a, b) {
         var c = a.getChildren();
         this.visitNode(a, b);
-        for (var d = 0;d < c.length;d++) {
-          var e = c[d], f = b.transform(e.getTransform());
-          e.visit(this, f);
+        for (var e = 0;e < c.length;e++) {
+          var d = c[e], f = b.transform(d.getTransform());
+          d.visit(this, f);
           f.free();
         }
       };
       b.prototype.visitNode = function(a, b) {
         a.hasFlags(16) && (this.isDirty = !0);
         a.toggleFlags();
+        a.depth = b.depth++;
       };
       return b;
     }(c);
-    k.DirtyNodeVisitor = s;
+    k.PreRenderVisitor = s;
     h = function(a) {
       function b(c) {
         a.call(this);
@@ -50424,8 +52136,8 @@
         this.visitNode(a, b);
         var c = a.getChildren();
         this.writer.enter(a.toString() + " " + c.length);
-        for (var d = 0;d < c.length;d++) {
-          c[d].visit(this, b);
+        for (var e = 0;e < c.length;e++) {
+          c[e].visit(this, b);
         }
         this.writer.outdent();
       };
@@ -50448,11 +52160,11 @@
       Object.defineProperty(c.prototype, "id", {get:function() {
         return this._id;
       }, enumerable:!0, configurable:!0});
-      c.prototype._dispatchEvent = function() {
+      c.prototype._dispatchEvent = function(a) {
         if (this._eventListeners) {
-          for (var a = this._eventListeners, b = 0;b < a.length;b++) {
-            var c = a[b];
-            1 === c.type && c.listener(this, 1);
+          for (var b = this._eventListeners, c = 0;c < b.length;c++) {
+            var e = b[c];
+            e.type === a && e.listener(this, a);
           }
         }
       };
@@ -50460,12 +52172,22 @@
         this._eventListeners || (this._eventListeners = []);
         this._eventListeners.push({type:a, listener:b});
       };
+      c.prototype.removeEventListener = function(a, b) {
+        for (var c = this._eventListeners, e = 0;e < c.length;e++) {
+          var d = c[e];
+          if (d.type === a && d.listener === b) {
+            c.splice(e, 1);
+            break;
+          }
+        }
+      };
       Object.defineProperty(c.prototype, "properties", {get:function() {
         return this._properties || (this._properties = {});
       }, enumerable:!0, configurable:!0});
       c.prototype.reset = function() {
-        this._flags = t.Default;
+        this._flags = u.Default;
         this._properties = this._transform = this._layer = this._bounds = null;
+        this.depth = -1;
       };
       Object.defineProperty(c.prototype, "clip", {get:function() {
         return this._clip;
@@ -50622,7 +52344,7 @@
         }
       };
       c.prototype.invalidate = function() {
-        this._propagateFlagsUp(t.UpOnInvalidate);
+        this._propagateFlagsUp(u.UpOnInvalidate);
       };
       c.prototype.toString = function(a) {
         void 0 === a && (a = !1);
@@ -50660,24 +52382,24 @@
         a._parent = this;
         a._index = this._children.length;
         this._children.push(a);
-        this._propagateFlagsUp(t.UpOnAddedOrRemoved);
-        a._propagateFlagsDown(t.DownOnAddedOrRemoved);
+        this._propagateFlagsUp(u.UpOnAddedOrRemoved);
+        a._propagateFlagsDown(u.DownOnAddedOrRemoved);
       };
       c.prototype.removeChildAt = function(a) {
         var b = this._children[a];
         this._children.splice(a, 1);
         b._index = -1;
         b._parent = null;
-        this._propagateFlagsUp(t.UpOnAddedOrRemoved);
-        b._propagateFlagsDown(t.DownOnAddedOrRemoved);
+        this._propagateFlagsUp(u.UpOnAddedOrRemoved);
+        b._propagateFlagsDown(u.DownOnAddedOrRemoved);
       };
       c.prototype.clearChildren = function() {
         for (var a = 0;a < this._children.length;a++) {
           var b = this._children[a];
-          b && (b._index = -1, b._parent = null, b._propagateFlagsDown(t.DownOnAddedOrRemoved));
+          b && (b._index = -1, b._parent = null, b._propagateFlagsDown(u.DownOnAddedOrRemoved));
         }
         this._children.length = 0;
-        this._propagateFlagsUp(t.UpOnAddedOrRemoved);
+        this._propagateFlagsUp(u.UpOnAddedOrRemoved);
       };
       c.prototype._propagateFlagsDown = function(a) {
         if (!this.hasFlags(a)) {
@@ -50692,13 +52414,13 @@
         var c = this._bounds || (this._bounds = a.createEmpty());
         if (this.hasFlags(256)) {
           c.setEmpty();
-          for (var d = this._children, e = a.allocate(), f = 0;f < d.length;f++) {
-            var g = d[f];
-            e.set(g.getBounds());
-            g.getTransformMatrix().transformRectangleAABB(e);
-            c.union(e);
+          for (var e = this._children, d = a.allocate(), f = 0;f < e.length;f++) {
+            var g = e[f];
+            d.set(g.getBounds());
+            g.getTransformMatrix().transformRectangleAABB(d);
+            c.union(d);
           }
-          e.free();
+          d.free();
           this.removeFlags(256);
         }
         return b ? c.clone() : c;
@@ -50709,19 +52431,19 @@
     var f = function() {
       function a(b) {
         this._node = b;
-        this._matrix = r.createIdentity();
+        this._matrix = q.createIdentity();
         this._colorMatrix = k.ColorMatrix.createIdentity();
-        this._concatenatedMatrix = r.createIdentity();
-        this._invertedConcatenatedMatrix = r.createIdentity();
+        this._concatenatedMatrix = q.createIdentity();
+        this._invertedConcatenatedMatrix = q.createIdentity();
         this._concatenatedColorMatrix = k.ColorMatrix.createIdentity();
       }
       a.prototype.setMatrix = function(a) {
-        this._matrix.isEqual(a) || (this._matrix.set(a), this._node._propagateFlagsUp(t.UpOnMoved), this._node._propagateFlagsDown(t.DownOnMoved));
+        this._matrix.isEqual(a) || (this._matrix.set(a), this._node._propagateFlagsUp(u.UpOnMoved), this._node._propagateFlagsDown(u.DownOnMoved));
       };
       a.prototype.setColorMatrix = function(a) {
         this._colorMatrix.set(a);
-        this._node._propagateFlagsUp(t.UpOnColorMatrixChanged);
-        this._node._propagateFlagsDown(t.DownOnColorMatrixChanged);
+        this._node._propagateFlagsUp(u.UpOnColorMatrixChanged);
+        this._node._propagateFlagsDown(u.DownOnColorMatrixChanged);
       };
       a.prototype.getMatrix = function(a) {
         void 0 === a && (a = !1);
@@ -50739,10 +52461,10 @@
         var a;
         void 0 === a && (a = !1);
         if (this._node.hasFlags(512)) {
-          for (var b = this._node._findClosestAncestor(), c = m._getAncestors(this._node, b), d = b ? b.getTransform()._concatenatedMatrix.clone() : r.createIdentity(), e = c.length - 1;0 <= e;e--) {
-            var b = c[e], f = b.getTransform();
-            d.preMultiply(f._matrix);
-            f._concatenatedMatrix.set(d);
+          for (var b = this._node._findClosestAncestor(), c = m._getAncestors(this._node, b), e = b ? b.getTransform()._concatenatedMatrix.clone() : q.createIdentity(), d = c.length - 1;0 <= d;d--) {
+            var b = c[d], f = b.getTransform();
+            e.preMultiply(f._matrix);
+            f._concatenatedMatrix.set(e);
             b.removeFlags(512);
           }
         }
@@ -50783,7 +52505,7 @@
         (this._mask = a) && this._mask.setFlags(4);
       }, enumerable:!0, configurable:!0});
       a.prototype.toString = function() {
-        return u[this._blendMode];
+        return t[this._blendMode];
       };
       return a;
     }();
@@ -50858,7 +52580,7 @@
       function c(d, f, h) {
         void 0 === h && (h = !1);
         b.call(this);
-        this._dirtyVisitor = new s;
+        this._preVisitor = new s;
         this._flags &= -3;
         this._type = 13;
         this._scaleMode = c.DEFAULT_SCALE;
@@ -50878,16 +52600,16 @@
       c.prototype.setBounds = function(a) {
         b.prototype.setBounds.call(this, a);
         this._updateContentMatrix();
-        this._dispatchEvent();
+        this._dispatchEvent(1);
         this._dirtyRegion && (this._dirtyRegion = new v(a.w, a.h), this._dirtyRegion.addDirtyRectangle(a));
       };
       Object.defineProperty(c.prototype, "content", {get:function() {
         return this._content;
       }, enumerable:!0, configurable:!0});
       c.prototype.readyToRender = function() {
-        this._dirtyVisitor.isDirty = !1;
-        this._dirtyVisitor.start(this, this._dirtyRegion);
-        return this._dirtyVisitor.isDirty ? !0 : !1;
+        this._preVisitor.isDirty = !1;
+        this._preVisitor.start(this, this._dirtyRegion);
+        return this._preVisitor.isDirty ? !0 : !1;
       };
       Object.defineProperty(c.prototype, "align", {get:function() {
         return this._align;
@@ -50903,25 +52625,25 @@
       }, enumerable:!0, configurable:!0});
       c.prototype._updateContentMatrix = function() {
         if (this._scaleMode === c.DEFAULT_SCALE && this._align === c.DEFAULT_ALIGN) {
-          this._content.getTransform().setMatrix(new r(1, 0, 0, 1, 0, 0));
+          this._content.getTransform().setMatrix(new q(1, 0, 0, 1, 0, 0));
         } else {
-          var a = this.getBounds(), b = this._content.getBounds(), d = a.w / b.w, e = a.h / b.h;
+          var a = this.getBounds(), b = this._content.getBounds(), e = a.w / b.w, d = a.h / b.h;
           switch(this._scaleMode) {
             case 2:
-              d = e = Math.max(d, e);
+              e = d = Math.max(e, d);
               break;
             case 4:
-              d = e = 1;
+              e = d = 1;
               break;
             case 1:
               break;
             default:
-              d = e = Math.min(d, e);
+              e = d = Math.min(e, d);
           }
           var f;
-          f = this._align & 4 ? 0 : this._align & 8 ? a.w - b.w * d : (a.w - b.w * d) / 2;
-          a = this._align & 1 ? 0 : this._align & 2 ? a.h - b.h * e : (a.h - b.h * e) / 2;
-          this._content.getTransform().setMatrix(new r(d, 0, 0, e, f, a));
+          f = this._align & 4 ? 0 : this._align & 8 ? a.w - b.w * e : (a.w - b.w * e) / 2;
+          a = this._align & 1 ? 0 : this._align & 2 ? a.h - b.h * d : (a.h - b.h * d) / 2;
+          this._content.getTransform().setMatrix(new q(e, 0, 0, d, f, a));
         }
       };
       c.DEFAULT_SCALE = 4;
@@ -50936,10 +52658,10 @@
     function a(a, c, d) {
       return a + (c - a) * d;
     }
-    function r(b, c, d) {
+    function q(b, c, d) {
       return a(b >> 24 & 255, c >> 24 & 255, d) << 24 | a(b >> 16 & 255, c >> 16 & 255, d) << 16 | a(b >> 8 & 255, c >> 8 & 255, d) << 8 | a(b & 255, c & 255, d);
     }
-    var v = k.Geometry.Point, u = k.Geometry.Rectangle, t = k.Geometry.Matrix, l = d.ArrayUtilities.indexOf, c = function(a) {
+    var v = k.Geometry.Point, t = k.Geometry.Rectangle, u = k.Geometry.Matrix, l = d.ArrayUtilities.indexOf, c = function(a) {
       function c() {
         a.call(this);
         this._parents = [];
@@ -50949,10 +52671,27 @@
         this._type = 33;
       }
       __extends(c, a);
+      Object.defineProperty(c.prototype, "parents", {get:function() {
+        return this._parents;
+      }, enumerable:!0, configurable:!0});
       c.prototype.addParent = function(a) {
         l(this._parents, a);
         this._parents.push(a);
       };
+      c.prototype.willRender = function() {
+        for (var a = this._parents, b = 0;b < a.length;b++) {
+          for (var c = a[b];c;) {
+            if (c.isType(13)) {
+              return!0;
+            }
+            if (!c.hasFlags(65536)) {
+              break;
+            }
+            c = c._parent;
+          }
+        }
+        return!1;
+      };
       c.prototype.addRenderableParent = function(a) {
         l(this._renderableParents, a);
         this._renderableParents.push(a);
@@ -51029,7 +52768,7 @@
         this._lastPausedTime = this._lastTimeInvalidated = 0;
         this._pauseHappening = this._seekHappening = !1;
         this._isDOMElement = !0;
-        this.setBounds(new u(0, 0, 1, 1));
+        this.setBounds(new t(0, 0, 1, 1));
         this._assetId = d;
         this._eventSerializer = f;
         var g = document.createElement("video"), h = this._handleVideoEvent.bind(this);
@@ -51045,6 +52784,7 @@
         g.addEventListener("seeking", h);
         g.addEventListener("seeked", h);
         g.addEventListener("canplay", h);
+        g.style.position = "absolute";
         this._video = g;
         this._videoEventHandler = h;
         c._renderableVideos.push(this);
@@ -51059,12 +52799,12 @@
         return this._state;
       }, enumerable:!0, configurable:!0});
       c.prototype.play = function() {
-        this._video.play();
         this._state = 2;
+        this._video.play();
       };
       c.prototype.pause = function() {
-        this._video.pause();
         this._state = 3;
+        this._video.pause();
       };
       c.prototype._handleVideoEvent = function(a) {
         var b = null, c = this._video;
@@ -51076,6 +52816,10 @@
             a = 7;
             break;
           case "pause":
+            if (2 === this._state) {
+              c.play();
+              return;
+            }
             a = 6;
             this._pauseHappening = !0;
             break;
@@ -51134,7 +52878,7 @@
         switch(a) {
           case 1:
             c.src = b.url;
-            1 < this._state && this.play();
+            this.play();
             this._notifyNetStream(0, null);
             break;
           case 9:
@@ -51176,6 +52920,8 @@
       };
       c.checkForVideoUpdates = function() {
         for (var a = c._renderableVideos, b = 0;b < a.length;b++) {
+          var d = a[b];
+          d.willRender() ? (d._video.parentElement || d.invalidate(), d._video.style.zIndex = d.parents[0].depth + "") : d._video.parentElement && d._dispatchEvent(2);
           a[b].checkForUpdate();
         }
       };
@@ -51218,7 +52964,7 @@
         return h;
       };
       c.FromImage = function(a, b, d) {
-        return new c(a, new u(0, 0, b, d));
+        return new c(a, new t(0, 0, b, d));
       };
       c.prototype.updateFromDataBuffer = function(a, b) {
         if (k.imageUpdateOption.value) {
@@ -51353,38 +53099,38 @@
           return this._paths;
         }
         f = this._paths = [];
-        var g = null, h = null, l = 0, m = 0, p, r, t = !1, u = 0, v = 0, E = a.commands, y = a.coordinates, z = a.styles, G = z.position = 0;
+        var g = null, h = null, l = 0, m = 0, p, q, u = !1, t = 0, v = 0, L = a.commands, A = a.coordinates, z = a.styles, G = z.position = 0;
         a = a.commandsPosition;
-        for (var C = 0;C < a;C++) {
-          switch(E[C]) {
+        for (var I = 0;I < a;I++) {
+          switch(L[I]) {
             case 9:
-              t && g && (g.lineTo(u, v), h && h.lineTo(u, v));
-              t = !0;
-              l = u = y[G++] / 20;
-              m = v = y[G++] / 20;
+              u && g && (g.lineTo(t, v), h && h.lineTo(t, v));
+              u = !0;
+              l = t = A[G++] / 20;
+              m = v = A[G++] / 20;
               g && g.moveTo(l, m);
               h && h.moveTo(l, m);
               break;
             case 10:
-              l = y[G++] / 20;
-              m = y[G++] / 20;
+              l = A[G++] / 20;
+              m = A[G++] / 20;
               g && g.lineTo(l, m);
               h && h.lineTo(l, m);
               break;
             case 11:
-              p = y[G++] / 20;
-              r = y[G++] / 20;
-              l = y[G++] / 20;
-              m = y[G++] / 20;
-              g && g.quadraticCurveTo(p, r, l, m);
-              h && h.quadraticCurveTo(p, r, l, m);
+              p = A[G++] / 20;
+              q = A[G++] / 20;
+              l = A[G++] / 20;
+              m = A[G++] / 20;
+              g && g.quadraticCurveTo(p, q, l, m);
+              h && h.quadraticCurveTo(p, q, l, m);
               break;
             case 12:
-              p = y[G++] / 20;
-              r = y[G++] / 20;
-              var I = y[G++] / 20, P = y[G++] / 20, l = y[G++] / 20, m = y[G++] / 20;
-              g && g.bezierCurveTo(p, r, I, P, l, m);
-              h && h.bezierCurveTo(p, r, I, P, l, m);
+              p = A[G++] / 20;
+              q = A[G++] / 20;
+              var D = A[G++] / 20, R = A[G++] / 20, l = A[G++] / 20, m = A[G++] / 20;
+              g && g.bezierCurveTo(p, q, D, R, l, m);
+              h && h.bezierCurveTo(p, q, D, R, l, m);
               break;
             case 1:
               g = this._createPath(0, d.ColorUtilities.rgbaToCSSStyle(z.readUnsignedInt()), !1, null, l, m);
@@ -51403,9 +53149,9 @@
               h = d.ColorUtilities.rgbaToCSSStyle(z.readUnsignedInt());
               z.position += 1;
               p = z.readByte();
-              r = c.LINE_CAPS_STYLES[z.readByte()];
-              I = c.LINE_JOINTS_STYLES[z.readByte()];
-              p = new s(y[G++] / 20, p, r, I, z.readByte());
+              q = c.LINE_CAPS_STYLES[z.readByte()];
+              D = c.LINE_JOINTS_STYLES[z.readByte()];
+              p = new s(A[G++] / 20, p, q, D, z.readByte());
               h = this._createPath(1, h, !1, p, l, m);
               break;
             case 6:
@@ -51419,7 +53165,7 @@
               h = null;
           }
         }
-        t && g && (g.lineTo(u, v), h && h.lineTo(u, v));
+        u && g && (g.lineTo(t, v), h && h.lineTo(t, v));
         this._pathData = null;
         k.leaveTimeline("RenderableShape.deserializePaths");
         return f;
@@ -51431,7 +53177,7 @@
         return a.path;
       };
       c.prototype._readMatrix = function(a) {
-        return new t(a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat());
+        return new u(a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat(), a.readFloat());
       };
       c.prototype._readGradient = function(a, b) {
         var c = a.readUnsignedByte(), e = 2 * a.readShort() / 255, f = this._readMatrix(a), c = 16 === c ? b.createLinearGradient(-1, 0, 1, 0) : b.createRadialGradient(e, 0, 0, 0, 0, 1);
@@ -51476,78 +53222,78 @@
         if (this._morphPaths[e]) {
           return this._morphPaths[e];
         }
-        var f = this._morphPaths[e] = [], g = null, h = null, l = 0, p = 0, t, u, v = !1, B = 0, E = 0, y = b.commands, z = b.coordinates, G = b.morphCoordinates, C = b.styles, I = b.morphStyles;
-        C.position = 0;
-        var P = I.position = 0;
+        var f = this._morphPaths[e] = [], g = null, h = null, l = 0, p = 0, u, t, v = !1, y = 0, L = 0, A = b.commands, z = b.coordinates, G = b.morphCoordinates, I = b.styles, D = b.morphStyles;
+        I.position = 0;
+        var R = D.position = 0;
         b = b.commandsPosition;
         for (var T = 0;T < b;T++) {
-          switch(y[T]) {
+          switch(A[T]) {
             case 9:
-              v && g && (g.lineTo(B, E), h && h.lineTo(B, E));
+              v && g && (g.lineTo(y, L), h && h.lineTo(y, L));
               v = !0;
-              l = B = a(z[P], G[P++], e) / 20;
-              p = E = a(z[P], G[P++], e) / 20;
+              l = y = a(z[R], G[R++], e) / 20;
+              p = L = a(z[R], G[R++], e) / 20;
               g && g.moveTo(l, p);
               h && h.moveTo(l, p);
               break;
             case 10:
-              l = a(z[P], G[P++], e) / 20;
-              p = a(z[P], G[P++], e) / 20;
+              l = a(z[R], G[R++], e) / 20;
+              p = a(z[R], G[R++], e) / 20;
               g && g.lineTo(l, p);
               h && h.lineTo(l, p);
               break;
             case 11:
-              t = a(z[P], G[P++], e) / 20;
-              u = a(z[P], G[P++], e) / 20;
-              l = a(z[P], G[P++], e) / 20;
-              p = a(z[P], G[P++], e) / 20;
-              g && g.quadraticCurveTo(t, u, l, p);
-              h && h.quadraticCurveTo(t, u, l, p);
+              u = a(z[R], G[R++], e) / 20;
+              t = a(z[R], G[R++], e) / 20;
+              l = a(z[R], G[R++], e) / 20;
+              p = a(z[R], G[R++], e) / 20;
+              g && g.quadraticCurveTo(u, t, l, p);
+              h && h.quadraticCurveTo(u, t, l, p);
               break;
             case 12:
-              t = a(z[P], G[P++], e) / 20;
-              u = a(z[P], G[P++], e) / 20;
-              var O = a(z[P], G[P++], e) / 20, Q = a(z[P], G[P++], e) / 20, l = a(z[P], G[P++], e) / 20, p = a(z[P], G[P++], e) / 20;
-              g && g.bezierCurveTo(t, u, O, Q, l, p);
-              h && h.bezierCurveTo(t, u, O, Q, l, p);
+              u = a(z[R], G[R++], e) / 20;
+              t = a(z[R], G[R++], e) / 20;
+              var J = a(z[R], G[R++], e) / 20, P = a(z[R], G[R++], e) / 20, l = a(z[R], G[R++], e) / 20, p = a(z[R], G[R++], e) / 20;
+              g && g.bezierCurveTo(u, t, J, P, l, p);
+              h && h.bezierCurveTo(u, t, J, P, l, p);
               break;
             case 1:
-              g = this._createMorphPath(0, e, d.ColorUtilities.rgbaToCSSStyle(r(C.readUnsignedInt(), I.readUnsignedInt(), e)), !1, null, l, p);
+              g = this._createMorphPath(0, e, d.ColorUtilities.rgbaToCSSStyle(q(I.readUnsignedInt(), D.readUnsignedInt(), e)), !1, null, l, p);
               break;
             case 3:
-              t = this._readMorphBitmap(C, I, e, c);
-              g = this._createMorphPath(0, e, t.style, t.smoothImage, null, l, p);
+              u = this._readMorphBitmap(I, D, e, c);
+              g = this._createMorphPath(0, e, u.style, u.smoothImage, null, l, p);
               break;
             case 2:
-              t = this._readMorphGradient(C, I, e, c);
-              g = this._createMorphPath(0, e, t, !1, null, l, p);
+              u = this._readMorphGradient(I, D, e, c);
+              g = this._createMorphPath(0, e, u, !1, null, l, p);
               break;
             case 4:
               g = null;
               break;
             case 5:
-              t = a(z[P], G[P++], e) / 20;
-              h = d.ColorUtilities.rgbaToCSSStyle(r(C.readUnsignedInt(), I.readUnsignedInt(), e));
-              C.position += 1;
-              u = C.readByte();
-              O = m.LINE_CAPS_STYLES[C.readByte()];
-              Q = m.LINE_JOINTS_STYLES[C.readByte()];
-              t = new s(t, u, O, Q, C.readByte());
-              h = this._createMorphPath(1, e, h, !1, t, l, p);
+              u = a(z[R], G[R++], e) / 20;
+              h = d.ColorUtilities.rgbaToCSSStyle(q(I.readUnsignedInt(), D.readUnsignedInt(), e));
+              I.position += 1;
+              t = I.readByte();
+              J = m.LINE_CAPS_STYLES[I.readByte()];
+              P = m.LINE_JOINTS_STYLES[I.readByte()];
+              u = new s(u, t, J, P, I.readByte());
+              h = this._createMorphPath(1, e, h, !1, u, l, p);
               break;
             case 6:
-              t = this._readMorphGradient(C, I, e, c);
-              h = this._createMorphPath(2, e, t, !1, null, l, p);
+              u = this._readMorphGradient(I, D, e, c);
+              h = this._createMorphPath(2, e, u, !1, null, l, p);
               break;
             case 7:
-              t = this._readMorphBitmap(C, I, e, c);
-              h = this._createMorphPath(2, e, t.style, t.smoothImage, null, l, p);
+              u = this._readMorphBitmap(I, D, e, c);
+              h = this._createMorphPath(2, e, u.style, u.smoothImage, null, l, p);
               break;
             case 8:
               h = null;
           }
         }
-        v && g && (g.lineTo(B, E), h && h.lineTo(B, E));
+        v && g && (g.lineTo(y, L), h && h.lineTo(y, L));
         k.leaveTimeline("RenderableMorphShape.deserializPaths");
         return f;
       };
@@ -51558,7 +53304,7 @@
         return a.path;
       };
       c.prototype._readMorphMatrix = function(b, c, d) {
-        return new t(a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d));
+        return new u(a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d), a(b.readFloat(), c.readFloat(), d));
       };
       c.prototype._readMorphGradient = function(b, c, e, f) {
         var g = b.readUnsignedByte(), h = 2 * b.readShort() / 255, k = this._readMorphMatrix(b, c, e);
@@ -51566,7 +53312,7 @@
         f.setTransform && f.setTransform(k.toSVGMatrix());
         k = b.readUnsignedByte();
         for (g = 0;g < k;g++) {
-          var h = a(b.readUnsignedByte() / 255, c.readUnsignedByte() / 255, e), l = r(b.readUnsignedInt(), c.readUnsignedInt(), e), l = d.ColorUtilities.rgbaToCSSStyle(l);
+          var h = a(b.readUnsignedByte() / 255, c.readUnsignedByte() / 255, e), l = q(b.readUnsignedInt(), c.readUnsignedInt(), e), l = d.ColorUtilities.rgbaToCSSStyle(l);
           f.addColorStop(h, l);
         }
         b.position += 2;
@@ -51606,32 +53352,32 @@
           m.text = "";
           m.width = 0;
           k.font = m.font;
-          for (var r = c, s = p.split(/[\s.-]/), t = 0, u = 0;u < s.length;u++) {
-            var v = s[u], E = p.substr(t, v.length + 1), y = k.measureText(E).width | 0;
-            if (y > r) {
+          for (var q = c, s = p.split(/[\s.-]/), u = 0, t = 0;t < s.length;t++) {
+            var v = s[t], L = p.substr(u, v.length + 1), A = k.measureText(L).width | 0;
+            if (A > q) {
               do {
-                if (m.text && (h.runs.push(m), h.width += m.width, m = new f(m.font, m.fillStyle, "", 0, m.underline), r = new a, r.y = h.y + h.descent + h.leading + h.ascent | 0, r.ascent = h.ascent, r.descent = h.descent, r.leading = h.leading, r.align = h.align, d.push(r), h = r), r = c - y, 0 > r) {
-                  var y = E.length, z, G;
+                if (m.text && (h.runs.push(m), h.width += m.width, m = new f(m.font, m.fillStyle, "", 0, m.underline), q = new a, q.y = h.y + h.descent + h.leading + h.ascent | 0, q.ascent = h.ascent, q.descent = h.descent, q.leading = h.leading, q.align = h.align, d.push(q), h = q), q = c - A, 0 > q) {
+                  var A = L.length, z, G;
                   do {
-                    y--;
-                    if (1 > y) {
+                    A--;
+                    if (1 > A) {
                       throw Error("Shall never happen: bad maxWidth?");
                     }
-                    z = E.substr(0, y);
+                    z = L.substr(0, A);
                     G = k.measureText(z).width | 0;
                   } while (G > c);
                   m.text = z;
                   m.width = G;
-                  E = E.substr(y);
-                  y = k.measureText(E).width | 0;
+                  L = L.substr(A);
+                  A = k.measureText(L).width | 0;
                 }
-              } while (0 > r);
+              } while (0 > q);
             } else {
-              r -= y;
+              q -= A;
             }
-            m.text += E;
-            m.width += y;
-            t += v.length + 1;
+            m.text += L;
+            m.width += A;
+            u += v.length + 1;
           }
           h.runs.push(m);
           h.width += m.width;
@@ -51666,7 +53412,7 @@
         this._textRunData = null;
         this._plainText = "";
         this._borderColor = this._backgroundColor = 0;
-        this._matrix = t.createIdentity();
+        this._matrix = u.createIdentity();
         this._coords = null;
         this._scrollV = 1;
         this._scrollH = 0;
@@ -51696,84 +53442,86 @@
       c.prototype.reflow = function(a, b) {
         var c = this._textRunData;
         if (c) {
-          var e = this._bounds, f = e.w - 4, h = this._plainText, l = this.lines, m = new g, p = 0, r = 0, s = 0, t = 0, u = 0, v = -1;
+          var e = this._bounds, f = e.w - 4, h = this._plainText, l = this.lines, m = new g, p = 0, q = 0, s = 0, u = 0, t = 0, v = -1;
           for (k.enterTimeline("RenderableText.reflow");c.position < c.length;) {
-            var z = c.readInt(), G = c.readInt(), C = c.readInt(), I = c.readUTF(), P = c.readInt(), T = c.readInt(), O = c.readInt();
-            P > s && (s = P);
-            T > t && (t = T);
-            O > u && (u = O);
-            P = c.readBoolean();
+            var z = c.readInt(), G = c.readInt(), I = c.readInt(), D = c.readUTF(), R = c.readInt(), T = c.readInt(), J = c.readInt();
+            R > s && (s = R);
+            T > u && (u = T);
+            J > t && (t = J);
+            R = c.readBoolean();
             T = "";
             c.readBoolean() && (T += "italic ");
-            P && (T += "bold ");
-            C = T + C + "px " + I;
-            I = c.readInt();
-            I = d.ColorUtilities.rgbToHex(I);
-            P = c.readInt();
-            -1 === v && (v = P);
+            R && (T += "bold ");
+            I = T + I + "px " + D;
+            D = c.readInt();
+            D = d.ColorUtilities.rgbToHex(D);
+            R = c.readInt();
+            -1 === v && (v = R);
             c.readBoolean();
             c.readInt();
             c.readInt();
             c.readInt();
             c.readInt();
             c.readInt();
-            for (var P = c.readBoolean(), Q = "", T = !1;!T;z++) {
+            for (var R = c.readBoolean(), P = "", T = !1;!T;z++) {
               T = z >= G - 1;
-              O = h[z];
-              if ("\r" !== O && "\n" !== O && (Q += O, z < h.length - 1)) {
+              J = h[z];
+              if ("\r" !== J && "\n" !== J && (P += J, z < h.length - 1)) {
                 continue;
               }
-              m.addRun(C, I, Q, P);
+              m.addRun(I, D, P, R);
               if (m.runs.length) {
-                l.length && (p += u);
+                l.length && (p += t);
                 p += s;
                 m.y = p | 0;
-                p += t;
+                p += u;
                 m.ascent = s;
-                m.descent = t;
-                m.leading = u;
+                m.descent = u;
+                m.leading = t;
                 m.align = v;
                 if (b && m.width > f) {
-                  for (m = m.wrap(f), Q = 0;Q < m.length;Q++) {
-                    var S = m[Q], p = S.y + S.descent + S.leading;
+                  for (m = m.wrap(f), P = 0;P < m.length;P++) {
+                    var S = m[P], p = S.y + S.descent + S.leading;
                     l.push(S);
-                    S.width > r && (r = S.width);
+                    S.width > q && (q = S.width);
                   }
                 } else {
-                  l.push(m), m.width > r && (r = m.width);
+                  l.push(m), m.width > q && (q = m.width);
                 }
                 m = new g;
               } else {
-                p += s + t + u;
+                p += s + u + t;
               }
-              Q = "";
+              P = "";
               if (T) {
-                u = t = s = 0;
+                t = u = s = 0;
                 v = -1;
                 break;
               }
-              "\r" === O && "\n" === h[z + 1] && z++;
+              "\r" === J && "\n" === h[z + 1] && z++;
             }
-            m.addRun(C, I, Q, P);
+            m.addRun(I, D, P, R);
           }
           c = h[h.length - 1];
           "\r" !== c && "\n" !== c || l.push(m);
           c = this.textRect;
-          c.w = r;
+          c.w = q;
           c.h = p;
           if (a) {
             if (!b) {
-              f = r;
-              r = e.w;
+              f = q;
+              q = e.w;
               switch(a) {
                 case 1:
-                  c.x = r - (f + 4) >> 1;
+                  c.x = q - (f + 4) >> 1;
                   break;
                 case 3:
-                  c.x = r - (f + 4);
+                  c.x = q - (f + 4);
               }
               this._textBounds.setElements(c.x - 2, c.y - 2, c.w + 4, c.h + 4);
+              e.w = f + 4;
             }
+            e.x = c.x - 2;
             e.h = p + 4;
           } else {
             this._textBounds = e;
@@ -51810,7 +53558,7 @@
           a.lineCap = "square";
           a.lineWidth = 1;
           var f = c.absoluteBoundPoints, g = a.currentTransform;
-          g ? (b = b.clone(), (new t(g.a, g.b, g.c, g.d, g.e, g.f)).transformRectangle(b, f), a.setTransform(1, 0, 0, 1, 0, 0)) : (f[0].x = b.x, f[0].y = b.y, f[1].x = b.x + b.w, f[1].y = b.y, f[2].x = b.x + b.w, f[2].y = b.y + b.h, f[3].x = b.x, f[3].y = b.y + b.h);
+          g ? (b = b.clone(), (new u(g.a, g.b, g.c, g.d, g.e, g.f)).transformRectangle(b, f), a.setTransform(1, 0, 0, 1, 0, 0)) : (f[0].x = b.x, f[0].y = b.y, f[1].x = b.x + b.w, f[1].y = b.y, f[2].x = b.x + b.w, f[2].y = b.y + b.h, f[3].x = b.x, f[3].y = b.y + b.h);
           c.roundBoundPoints(f);
           b = new Path2D;
           b.moveTo(f[0].x, f[0].y);
@@ -51879,7 +53627,7 @@
         a.call(this);
         this._flags = 3145728;
         this.properties = {};
-        this.setBounds(new u(0, 0, d, e));
+        this.setBounds(new t(0, 0, d, e));
       }
       __extends(c, a);
       Object.defineProperty(c.prototype, "text", {get:function() {
@@ -51901,11 +53649,11 @@
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
-    var a = d.ColorUtilities.clampByte, r = function() {
+    var a = d.ColorUtilities.clampByte, q = function() {
       return function() {
       };
     }();
-    k.Filter = r;
+    k.Filter = q;
     var v = function(a) {
       function d(k, c, h) {
         a.call(this);
@@ -51915,48 +53663,48 @@
       }
       __extends(d, a);
       return d;
-    }(r);
+    }(q);
     k.BlurFilter = v;
     v = function(a) {
-      function d(k, c, h, p, r, m, g, f, b, e, q) {
+      function d(k, c, h, p, q, m, g, f, b, e, n) {
         a.call(this);
         this.alpha = k;
         this.angle = c;
         this.blurX = h;
         this.blurY = p;
-        this.color = r;
+        this.color = q;
         this.distance = m;
         this.hideObject = g;
         this.inner = f;
         this.knockout = b;
         this.quality = e;
-        this.strength = q;
+        this.strength = n;
       }
       __extends(d, a);
       return d;
-    }(r);
+    }(q);
     k.DropshadowFilter = v;
-    r = function(a) {
-      function d(k, c, h, p, r, m, g, f) {
+    q = function(a) {
+      function d(k, c, h, p, q, m, g, f) {
         a.call(this);
         this.alpha = k;
         this.blurX = c;
         this.blurY = h;
         this.color = p;
-        this.inner = r;
+        this.inner = q;
         this.knockout = m;
         this.quality = g;
         this.strength = f;
       }
       __extends(d, a);
       return d;
-    }(r);
-    k.GlowFilter = r;
+    }(q);
+    k.GlowFilter = q;
     (function(a) {
       a[a.Unknown = 0] = "Unknown";
       a[a.Identity = 1] = "Identity";
     })(k.ColorMatrixType || (k.ColorMatrixType = {}));
-    r = function() {
+    q = function() {
       function d(a) {
         this._data = new Float32Array(a);
         this._type = 0;
@@ -51991,7 +53739,7 @@
         a._type = 1;
         return a;
       };
-      d.prototype.setMultipliersAndOffsets = function(a, d, c, h, k, r, m, g) {
+      d.prototype.setMultipliersAndOffsets = function(a, d, c, h, k, q, m, g) {
         for (var f = this._data, b = 0;b < f.length;b++) {
           f[b] = 0;
         }
@@ -52000,42 +53748,42 @@
         f[10] = c;
         f[15] = h;
         f[16] = k / 255;
-        f[17] = r / 255;
+        f[17] = q / 255;
         f[18] = m / 255;
         f[19] = g / 255;
         this._type = 0;
       };
       d.prototype.transformRGBA = function(d) {
-        var k = d >> 24 & 255, c = d >> 16 & 255, h = d >> 8 & 255, p = d & 255, r = this._data;
-        d = a(k * r[0] + c * r[1] + h * r[2] + p * r[3] + 255 * r[16]);
-        var m = a(k * r[4] + c * r[5] + h * r[6] + p * r[7] + 255 * r[17]), g = a(k * r[8] + c * r[9] + h * r[10] + p * r[11] + 255 * r[18]), k = a(k * r[12] + c * r[13] + h * r[14] + p * r[15] + 255 * r[19]);
+        var k = d >> 24 & 255, c = d >> 16 & 255, h = d >> 8 & 255, p = d & 255, q = this._data;
+        d = a(k * q[0] + c * q[1] + h * q[2] + p * q[3] + 255 * q[16]);
+        var m = a(k * q[4] + c * q[5] + h * q[6] + p * q[7] + 255 * q[17]), g = a(k * q[8] + c * q[9] + h * q[10] + p * q[11] + 255 * q[18]), k = a(k * q[12] + c * q[13] + h * q[14] + p * q[15] + 255 * q[19]);
         return d << 24 | m << 16 | g << 8 | k;
       };
       d.prototype.multiply = function(a) {
         if (!(a._type & 1)) {
           var d = this._data, c = a._data;
           a = d[0];
-          var h = d[1], k = d[2], r = d[3], m = d[4], g = d[5], f = d[6], b = d[7], e = d[8], q = d[9], n = d[10], u = d[11], v = d[12], A = d[13], H = d[14], K = d[15], F = d[16], J = d[17], M = d[18], D = d[19], B = c[0], E = c[1], y = c[2], z = c[3], G = c[4], C = c[5], I = c[6], P = c[7], T = c[8], O = c[9], Q = c[10], S = c[11], V = c[12], aa = c[13], $ = c[14], w = c[15], U = c[16], ba = c[17], R = c[18], c = c[19];
-          d[0] = a * B + m * E + e * y + v * z;
-          d[1] = h * B + g * E + q * y + A * z;
-          d[2] = k * B + f * E + n * y + H * z;
-          d[3] = r * B + b * E + u * y + K * z;
-          d[4] = a * G + m * C + e * I + v * P;
-          d[5] = h * G + g * C + q * I + A * P;
-          d[6] = k * G + f * C + n * I + H * P;
-          d[7] = r * G + b * C + u * I + K * P;
-          d[8] = a * T + m * O + e * Q + v * S;
-          d[9] = h * T + g * O + q * Q + A * S;
-          d[10] = k * T + f * O + n * Q + H * S;
-          d[11] = r * T + b * O + u * Q + K * S;
-          d[12] = a * V + m * aa + e * $ + v * w;
-          d[13] = h * V + g * aa + q * $ + A * w;
-          d[14] = k * V + f * aa + n * $ + H * w;
-          d[15] = r * V + b * aa + u * $ + K * w;
-          d[16] = a * U + m * ba + e * R + v * c + F;
-          d[17] = h * U + g * ba + q * R + A * c + J;
-          d[18] = k * U + f * ba + n * R + H * c + M;
-          d[19] = r * U + b * ba + u * R + K * c + D;
+          var h = d[1], k = d[2], q = d[3], m = d[4], g = d[5], f = d[6], b = d[7], e = d[8], n = d[9], r = d[10], t = d[11], v = d[12], C = d[13], F = d[14], K = d[15], E = d[16], Q = d[17], N = d[18], B = d[19], y = c[0], L = c[1], A = c[2], z = c[3], G = c[4], I = c[5], D = c[6], R = c[7], T = c[8], J = c[9], P = c[10], S = c[11], W = c[12], ba = c[13], w = c[14], X = c[15], U = c[16], $ = c[17], Y = c[18], c = c[19];
+          d[0] = a * y + m * L + e * A + v * z;
+          d[1] = h * y + g * L + n * A + C * z;
+          d[2] = k * y + f * L + r * A + F * z;
+          d[3] = q * y + b * L + t * A + K * z;
+          d[4] = a * G + m * I + e * D + v * R;
+          d[5] = h * G + g * I + n * D + C * R;
+          d[6] = k * G + f * I + r * D + F * R;
+          d[7] = q * G + b * I + t * D + K * R;
+          d[8] = a * T + m * J + e * P + v * S;
+          d[9] = h * T + g * J + n * P + C * S;
+          d[10] = k * T + f * J + r * P + F * S;
+          d[11] = q * T + b * J + t * P + K * S;
+          d[12] = a * W + m * ba + e * w + v * X;
+          d[13] = h * W + g * ba + n * w + C * X;
+          d[14] = k * W + f * ba + r * w + F * X;
+          d[15] = q * W + b * ba + t * w + K * X;
+          d[16] = a * U + m * $ + e * Y + v * c + E;
+          d[17] = h * U + g * $ + n * Y + C * c + Q;
+          d[18] = k * U + f * $ + r * Y + F * c + N;
+          d[19] = q * U + b * $ + t * Y + K * c + B;
           this._type = 0;
         }
       };
@@ -52068,7 +53816,7 @@
       };
       return d;
     }();
-    k.ColorMatrix = r;
+    k.ColorMatrix = q;
   })(d.GFX || (d.GFX = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
@@ -52084,21 +53832,21 @@
     };
   })(d.Player || (d.Player = {}));
 })(Shumway || (Shumway = {}));
-var Shumway$$inline_614 = Shumway || (Shumway = {});
-Shumway$$inline_614.playerOptions = Shumway$$inline_614.Settings.shumwayOptions.register(new Shumway$$inline_614.Options.OptionSet("Player Options"));
-Shumway$$inline_614.frameEnabledOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("enableFrames", "Enable Frame Execution", "boolean", !0, "Enable frame execution."));
-Shumway$$inline_614.timerEnabledOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("enableTimers", "Enable Timers", "boolean", !0, "Enable timer events."));
-Shumway$$inline_614.pumpEnabledOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("enablePump", "Enable Pump", "boolean", !0, "Enable display tree serialization."));
-Shumway$$inline_614.pumpRateOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("pumpRate", "Pump Rate", "number", 60, "Number of times / second that the display list is synchronized.", {range:{min:1, max:120, step:1}}));
-Shumway$$inline_614.frameRateOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("frameRate", "Frame Rate", "number", 60, "Override a movie's frame rate, set to -1 to use the movies default frame rate.", {range:{min:-1, max:120, step:1}}));
-Shumway$$inline_614.tracePlayerOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("tp", "Trace Player", "number", 0, "Trace player every n frames.", {range:{min:0, max:512, step:1}}));
-Shumway$$inline_614.traceMouseEventOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("tme", "Trace Mouse Events", "boolean", !1, "Trace mouse events."));
-Shumway$$inline_614.frameRateMultiplierOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("", "Frame Rate Multiplier", "number", 1, "Play frames at a faster rate.", {range:{min:1, max:16, step:1}}));
-Shumway$$inline_614.dontSkipFramesOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("", "Disables Frame Skipping", "boolean", !1, "Play all frames, e.g. no skipping frame during throttle."));
-Shumway$$inline_614.playAllSymbolsOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("", "Play Symbols", "boolean", !1, "Plays all SWF symbols automatically."));
-Shumway$$inline_614.playSymbolOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("", "Play Symbol Number", "number", 0, "Select symbol by Id.", {range:{min:0, max:2E4, step:1}}));
-Shumway$$inline_614.playSymbolFrameDurationOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("", "Play Symbol Duration", "number", 0, "How many frames to play, 0 for all frames of the movie clip.", {range:{min:0, max:128, step:1}}));
-Shumway$$inline_614.playSymbolCountOption = Shumway$$inline_614.playerOptions.register(new Shumway$$inline_614.Options.Option("", "Play Symbol Count", "number", -1, "Select symbol count.", {range:{min:0, max:2E4, step:1}}));
+var Shumway$$inline_634 = Shumway || (Shumway = {});
+Shumway$$inline_634.playerOptions = Shumway$$inline_634.Settings.shumwayOptions.register(new Shumway$$inline_634.Options.OptionSet("Player Options"));
+Shumway$$inline_634.frameEnabledOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("enableFrames", "Enable Frame Execution", "boolean", !0, "Enable frame execution."));
+Shumway$$inline_634.timerEnabledOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("enableTimers", "Enable Timers", "boolean", !0, "Enable timer events."));
+Shumway$$inline_634.pumpEnabledOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("enablePump", "Enable Pump", "boolean", !0, "Enable display tree serialization."));
+Shumway$$inline_634.pumpRateOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("pumpRate", "Pump Rate", "number", 60, "Number of times / second that the display list is synchronized.", {range:{min:1, max:120, step:1}}));
+Shumway$$inline_634.frameRateOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("frameRate", "Frame Rate", "number", 60, "Override a movie's frame rate, set to -1 to use the movies default frame rate.", {range:{min:-1, max:120, step:1}}));
+Shumway$$inline_634.tracePlayerOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("tp", "Trace Player", "number", 0, "Trace player every n frames.", {range:{min:0, max:512, step:1}}));
+Shumway$$inline_634.traceMouseEventOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("tme", "Trace Mouse Events", "boolean", !1, "Trace mouse events."));
+Shumway$$inline_634.frameRateMultiplierOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("", "Frame Rate Multiplier", "number", 1, "Play frames at a faster rate.", {range:{min:1, max:16, step:1}}));
+Shumway$$inline_634.dontSkipFramesOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("", "Disables Frame Skipping", "boolean", !1, "Play all frames, e.g. no skipping frame during throttle."));
+Shumway$$inline_634.playAllSymbolsOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("", "Play Symbols", "boolean", !1, "Plays all SWF symbols automatically."));
+Shumway$$inline_634.playSymbolOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("", "Play Symbol Number", "number", 0, "Select symbol by Id.", {range:{min:0, max:2E4, step:1}}));
+Shumway$$inline_634.playSymbolFrameDurationOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("", "Play Symbol Duration", "number", 0, "How many frames to play, 0 for all frames of the movie clip.", {range:{min:0, max:128, step:1}}));
+Shumway$$inline_634.playSymbolCountOption = Shumway$$inline_634.playerOptions.register(new Shumway$$inline_634.Options.Option("", "Play Symbol Count", "number", -1, "Select symbol count.", {range:{min:0, max:2E4, step:1}}));
 (function(d) {
   var k = function() {
     function a() {
@@ -52124,8 +53872,8 @@
       return this._onTime;
     }, enumerable:!0, configurable:!0});
     a.prototype.startFrame = function(d) {
-      var k = d = 1E3 / d, u = this._onTimeDelta + this._delta;
-      0 !== u && (0 > u ? k *= a.SPEED_ADJUST_RATE : 0 < u && (k /= a.SPEED_ADJUST_RATE), this._onTimeDelta += d - k);
+      var k = d = 1E3 / d, t = this._onTimeDelta + this._delta;
+      0 !== t && (0 > t ? k *= a.SPEED_ADJUST_RATE : 0 < t && (k /= a.SPEED_ADJUST_RATE), this._onTimeDelta += d - k);
       this._expectedNextFrameAt += k;
       this._onTime = !0;
     };
@@ -52167,7 +53915,7 @@
 (function(d) {
   (function(k) {
     (function(a) {
-      var k = d.AVM2.AS.flash, v = k.display, u = k.display.BitmapData, t = k.display.DisplayObjectFlags, l = k.display.BlendMode, c = k.display.PixelSnapping, h = k.geom.Point, p = d.Bounds, s = k.ui.MouseCursor, m = d.Player.writer, g = function() {
+      var k = d.AVM2.AS.flash, v = k.display, t = k.display.BitmapData, u = k.display.DisplayObjectFlags, l = k.display.BlendMode, c = k.display.PixelSnapping, h = k.geom.Point, p = d.Bounds, s = k.ui.MouseCursor, m = d.Player.writer, g = function() {
         function a() {
           this.phase = 0;
           this.roots = null;
@@ -52191,7 +53939,7 @@
           void 0 === c && (c = !1);
           var f = this, g = this.roots;
           a.visit(function(a) {
-            a._hasAnyFlags(t.Dirty) && (f.writeUpdateFrame(a), g && a.mask && d.ArrayUtilities.pushUnique(g, a.mask._findFurthestAncestorOrSelf()));
+            a._hasAnyFlags(u.Dirty) && (f.writeUpdateFrame(a), g && a.mask && d.ArrayUtilities.pushUnique(g, a.mask._findFurthestAncestorOrSelf()));
             f.writeDirtyAssets(a);
             if (a._hasFlags(536870912)) {
               return 0;
@@ -52302,26 +54050,26 @@
           k.media.Video.isType(a) && (p = a);
           var s = !1;
           1 === this.phase && (s = a._hasAnyFlags(65011712), d = a._hasFlags(134217728));
-          var u = null;
-          v.Bitmap.isType(a) && (u = a);
-          var K = a._hasFlags(268435456), F;
-          F = 0 | (f ? 1 : 0) | (g ? 8 : 0);
-          F |= d ? 64 : 0;
-          F |= K ? 128 : 0;
-          F |= h ? 32 : 0;
-          F |= s ? 4 : 0;
-          this.output.writeInt(F);
+          var t = null;
+          v.Bitmap.isType(a) && (t = a);
+          var K = a._hasFlags(268435456), E;
+          E = 0 | (f ? 1 : 0) | (g ? 8 : 0);
+          E |= d ? 64 : 0;
+          E |= K ? 128 : 0;
+          E |= h ? 32 : 0;
+          E |= s ? 4 : 0;
+          this.output.writeInt(E);
           f && this._writeMatrix(a._getMatrix());
           g && this._writeColorTransform(a._colorTransform);
           d && this.output.writeInt(a.mask ? a.mask._id : -1);
           K && this.writeClippedObjectsCount(a);
-          h && (this.output.writeInt(a._ratio), this.output.writeInt(l.toNumber(a._blendMode)), this._writeFilters(a.filters), this.output.writeBoolean(a._hasFlags(1)), this.output.writeBoolean(a.cacheAsBitmap), u ? (this.output.writeInt(c.toNumber(u.pixelSnapping)), this.output.writeInt(u.smoothing ? 1 : 0)) : (this.output.writeInt(c.toNumber(c.AUTO)), this.output.writeInt(1)));
+          h && (this.output.writeInt(a._ratio), this.output.writeInt(l.toNumber(a._blendMode)), this._writeFilters(a.filters), this.output.writeBoolean(a._hasFlags(1)), this.output.writeBoolean(a.cacheAsBitmap), t ? (this.output.writeInt(c.toNumber(t.pixelSnapping)), this.output.writeInt(t.smoothing ? 1 : 0)) : (this.output.writeInt(c.toNumber(c.AUTO)), this.output.writeInt(1)));
           d = a._getGraphics();
           f = a._getTextContent();
           if (s) {
             m && m.enter("Children: {");
-            if (u) {
-              u.bitmapData ? (this.output.writeInt(1), this.output.writeInt(134217728 | u.bitmapData._id)) : this.output.writeInt(0);
+            if (t) {
+              t.bitmapData ? (this.output.writeInt(1), this.output.writeInt(134217728 | t.bitmapData._id)) : this.output.writeInt(0);
             } else {
               if (p) {
                 p._netStream ? (this.output.writeInt(1), this.output.writeInt(134217728 | p._netStream._id)) : this.output.writeInt(0);
@@ -52335,7 +54083,7 @@
             }
             m && m.leave("}");
           }
-          1 === this.phase && a._removeFlags(t.Dirty);
+          1 === this.phase && a._removeFlags(u.Dirty);
         };
         a.prototype.writeDirtyAssets = function(a) {
           var c = a._getGraphics();
@@ -52349,7 +54097,7 @@
           void 0 === k && (k = !1);
           this.output.writeInt(200);
           this.output.writeInt(a._id);
-          u.isType(c) ? this.output.writeInt(134217728 | c._id) : this.output.writeInt(c._id);
+          t.isType(c) ? this.output.writeInt(134217728 | c._id) : this.output.writeInt(c._id);
           a = 0 | (d ? 1 : 0) | (f ? 8 : 0);
           a |= h ? 16 : 0;
           this.output.writeInt(a);
@@ -52425,7 +54173,7 @@
 })(Shumway || (Shumway = {}));
 (function(d) {
   (function(k) {
-    var a = d.Debug.somewhatImplemented, r = d.AVM2.AS.flash, v = d.ArrayUtilities.DataBuffer, u = d.AVM2.Runtime.AVM2, t = r.events.Event, l = r.display.DisplayObject, c = r.events.EventDispatcher, h = r.display.Loader, p = r.ui.MouseEventDispatcher, s = r.ui.KeyboardEventDispatcher, m = function() {
+    var a = d.Debug.somewhatImplemented, q = d.AVM2.AS.flash, v = d.ArrayUtilities.DataBuffer, t = d.AVM2.Runtime.AVM2, u = q.events.Event, l = q.display.DisplayObject, c = q.events.EventDispatcher, h = q.display.Loader, p = q.ui.MouseEventDispatcher, s = q.ui.KeyboardEventDispatcher, m = function() {
       function g() {
         this._framesPlayed = 0;
         this._videoEventListeners = [];
@@ -52437,7 +54185,7 @@
         this._keyboardEventDispatcher = new s;
         this._mouseEventDispatcher = new p;
         this._writer = new d.IndentingWriter;
-        u.instance.globals["Shumway.Player.Utils"] = this;
+        t.instance.globals["Shumway.Player.Utils"] = this;
       }
       g.prototype._getNextAvailablePromiseId = function() {
         for (var a = this._pendingPromises.length, b = 0;b < a;b++) {
@@ -52474,8 +54222,8 @@
       }, enumerable:!0, configurable:!0});
       g.prototype.load = function(a, b) {
         this._swfUrl = this._loaderUrl = a;
-        this._stage = new r.display.Stage;
-        var c = this._loaderInfo = (this._loader = r.display.Loader.getRootLoader()).contentLoaderInfo;
+        this._stage = new q.display.Stage;
+        var c = this._loaderInfo = (this._loader = q.display.Loader.getRootLoader()).contentLoaderInfo;
         d.playAllSymbolsOption.value ? (this._playAllSymbols(), c._allowCodeExecution = !1) : this._enterRootLoadingLoop();
         c = this.createLoaderContext();
         if (b) {
@@ -52483,11 +54231,11 @@
           g.symbolClass.instanceConstructorNoInitialize.call(h);
           this._loader.loadBytes(h, c);
         } else {
-          this._loader.load(new r.net.URLRequest(a), c);
+          this._loader.load(new q.net.URLRequest(a), c);
         }
       };
       g.prototype.createLoaderContext = function() {
-        var a = new r.system.LoaderContext;
+        var a = new q.system.LoaderContext;
         if (this.movieParams) {
           var b = {}, c;
           for (c in this.movieParams) {
@@ -52525,7 +54273,7 @@
                 this._hasFocus = !1;
                 break;
               case 3:
-                c.broadcastEventDispatchQueue.dispatchEvent(t.getBroadcastInstance(t.ACTIVATE)), this._hasFocus = !0;
+                c.broadcastEventDispatchQueue.dispatchEvent(u.getBroadcastInstance(u.ACTIVATE)), this._hasFocus = !0;
             }
           ;
         }
@@ -52538,7 +54286,7 @@
         var c = new v, g = [], h = new d.Remoting.Player.PlayerChannelSerializer;
         h.output = c;
         h.outputAssets = g;
-        r.display.Stage.isType(a) && h.writeStage(a, this._mouseEventDispatcher.currentTarget);
+        q.display.Stage.isType(a) && h.writeStage(a, this._mouseEventDispatcher.currentTarget);
         h.begin(a);
         h.remoteObjects();
         h.remoteReferences();
@@ -52566,7 +54314,7 @@
         t.output = p;
         t.outputAssets = s;
         t.writeBitmapData(a);
-        r.display.BitmapData.isType(b) ? t.writeBitmapData(b) : (t.begin(b), t.remoteObjects(), t.remoteReferences());
+        q.display.BitmapData.isType(b) ? t.writeBitmapData(b) : (t.begin(b), t.remoteObjects(), t.remoteReferences());
         t.writeDrawToBitmap(a, b, c, g, h, l, m);
         p.writeInt(0);
         k.enterTimeline("sendUpdates");
@@ -52617,7 +54365,7 @@
             var h = b._stage, k = void 0 !== b.defaultStageColor ? b.defaultStageColor : g._file.backgroundColor;
             h._loaderInfo = g;
             h.align = b.stageAlign || "";
-            !b.stageScale || 0 > r.display.StageScaleMode.toNumber(b.stageScale) ? h.scaleMode = r.display.StageScaleMode.SHOW_ALL : h.scaleMode = b.stageScale;
+            !b.stageScale || 0 > q.display.StageScaleMode.toNumber(b.stageScale) ? h.scaleMode = q.display.StageScaleMode.SHOW_ALL : h.scaleMode = b.stageScale;
             h.frameRate = g.frameRate;
             h.setStageWidth(g.width);
             h.setStageHeight(g.height);
@@ -52662,7 +54410,7 @@
         d.AVM2.counter.clear();
         d.Player.counter.traceSorted(a);
         d.Player.counter.clear();
-        a.writeLn("advancableInstances: " + r.display.DisplayObject._advancableInstances.length);
+        a.writeLn("advancableInstances: " + q.display.DisplayObject._advancableInstances.length);
         a.outdent();
       };
       g.prototype._leaveEventLoop = function() {
@@ -52671,25 +54419,25 @@
       };
       g.prototype._playAllSymbols = function() {
         var a = this._stage, b = this._loader, c = this._loaderInfo, g = this;
-        c.addEventListener(r.events.ProgressEvent.PROGRESS, function x() {
-          b.content && (c.removeEventListener(r.events.ProgressEvent.PROGRESS, x), g._enterEventLoop());
+        c.addEventListener(q.events.ProgressEvent.PROGRESS, function x() {
+          b.content && (c.removeEventListener(q.events.ProgressEvent.PROGRESS, x), g._enterEventLoop());
         });
-        c.addEventListener(r.events.Event.COMPLETE, function() {
+        c.addEventListener(q.events.Event.COMPLETE, function() {
           function b() {
             var l;
             0 < d.playSymbolOption.value ? (l = c.getSymbolById(d.playSymbolOption.value), l instanceof d.Timeline.DisplaySymbol || (l = null)) : (l = h[k++], k === h.length && (k = 0), 0 <= d.playSymbolCountOption.value && k > d.playSymbolCountOption.value && (k = 0));
             var m = 1;
             if (l && 0 < l.id) {
               var p = l;
-              r.display.DisplayObject.reset();
-              r.display.MovieClip.reset();
+              q.display.DisplayObject.reset();
+              q.display.MovieClip.reset();
               var s = p.symbolClass.initializeFrom(p);
               p.symbolClass.instanceConstructorNoInitialize.call(s);
-              for (p instanceof r.display.BitmapSymbol && (s = new r.display.Bitmap(s));0 < a.numChildren;) {
+              for (p instanceof q.display.BitmapSymbol && (s = new q.display.Bitmap(s));0 < a.numChildren;) {
                 a.removeChildAt(0);
               }
               a.addChild(s);
-              l instanceof r.display.SpriteSymbol && (m = l.numFrames);
+              l instanceof q.display.SpriteSymbol && (m = l.numFrames);
             }
             0 < d.playSymbolFrameDurationOption.value && (m = d.playSymbolFrameDurationOption.value);
             setTimeout(b, g._getFrameInterval() * m);
@@ -52777,22 +54525,24 @@
   })(d.Player || (d.Player = {}));
 })(Shumway || (Shumway = {}));
 (function(d) {
-  var k = d.BinaryFileReader, a = d.AVM2.ABC.AbcFile, r = d.AVM2.Runtime.AVM2;
-  d.createAVM2 = function(v, u, t, l, c) {
+  var k = d.BinaryFileReader, a = d.AVM2.ABC.AbcFile, q = d.AVM2.Runtime.AVM2;
+  d.createAVM2 = function(v, t, u, l, c) {
     var h;
+    d.SWF.enterTimeline("Load file", v);
     (new k(v)).readAll(function(p) {
-      r.initialize(t, l);
-      h = r.instance;
+      d.SWF.leaveTimeline();
+      q.initialize(u, l);
+      h = q.instance;
       d.AVM2.AS.linkNatives(h);
       console.time("Execute builtin.abc");
       h.builtinsLoaded = !1;
       h.systemDomain.executeAbc(new a(new Uint8Array(p), "builtin.abc"));
       h.builtinsLoaded = !0;
       console.timeEnd("Execute builtin.abc");
-      "string" === typeof u ? (new k(u)).readAll(function(d) {
-        h.systemDomain.executeAbc(new a(new Uint8Array(d), u));
+      "string" === typeof t ? (new k(t)).readAll(function(d) {
+        h.systemDomain.executeAbc(new a(new Uint8Array(d), t));
         c(h);
-      }) : r.isPlayerglobalLoaded() || r.loadPlayerglobal(u.abcs, u.catalog).then(function() {
+      }) : q.isPlayerglobalLoaded() || q.loadPlayerglobal(t.abcs, t.catalog).then(function() {
         c(h);
       });
     });
@@ -52802,8 +54552,8 @@
   function a() {
     this.constructor = d;
   }
-  for (var r in k) {
-    k.hasOwnProperty(r) && (d[r] = k[r]);
+  for (var q in k) {
+    k.hasOwnProperty(q) && (d[q] = k[q]);
   }
   a.prototype = k.prototype;
   d.prototype = new a;
@@ -52812,7 +54562,7 @@
   (function(k) {
     (function(a) {
       var k = d.ArrayUtilities.DataBuffer, v = function(a) {
-        function t(d, c) {
+        function u(d, c) {
           a.call(this);
           this._window = d;
           this._parent = c || d.parent;
@@ -52823,8 +54573,8 @@
             this.onWindowMessage(a.detail, !1);
           }.bind(this));
         }
-        __extends(t, a);
-        t.prototype.onSendUpdates = function(a, c, d) {
+        __extends(u, a);
+        u.prototype.onSendUpdates = function(a, c, d) {
           void 0 === d && (d = !0);
           a = a.getBytes();
           c = {type:"player", updates:a, assets:c, result:void 0};
@@ -52835,29 +54585,29 @@
           this._parent.postMessage(c, "*", a);
           return null;
         };
-        t.prototype.onExternalCommand = function(a) {
+        u.prototype.onExternalCommand = function(a) {
           var c = this._parent.document.createEvent("CustomEvent");
           c.initCustomEvent("syncmessage", !1, !1, {type:"external", request:a});
           this._parent.dispatchEvent(c);
         };
-        t.prototype.onFSCommand = function(a, c) {
+        u.prototype.onFSCommand = function(a, c) {
           this._parent.postMessage({type:"fscommand", command:a, args:c}, "*");
         };
-        t.prototype.onVideoControl = function(a, c, d) {
+        u.prototype.onVideoControl = function(a, c, d) {
           var k = this._parent.document.createEvent("CustomEvent");
           k.initCustomEvent("syncmessage", !1, !1, {type:"videoControl", id:a, eventType:c, data:d, result:void 0});
           this._parent.dispatchEvent(k);
           return k.detail.result;
         };
-        t.prototype.onFrameProcessed = function() {
+        u.prototype.onFrameProcessed = function() {
           this._parent.postMessage({type:"frame"}, "*");
         };
-        t.prototype.registerFontOrImageImpl = function(a, c) {
+        u.prototype.registerFontOrImageImpl = function(a, c) {
           var d = this._parent.document.createEvent("CustomEvent");
           d.initCustomEvent("syncmessage", !1, !1, {type:"registerFontOrImage", syncId:a.syncId, symbolId:a.id, assetType:c.type, data:c, resolve:a.resolveAssetPromise.resolve});
           this._parent.dispatchEvent(d);
         };
-        t.prototype.onWindowMessage = function(a, c) {
+        u.prototype.onWindowMessage = function(a, c) {
           if ("object" === typeof a && null !== a) {
             switch(a.type) {
               case "gfx":
@@ -52903,7 +54653,7 @@
             }
           }
         };
-        return t;
+        return u;
       }(d.Player.Player);
       a.WindowPlayer = v;
     })(k.Window || (k.Window = {}));
@@ -52913,14 +54663,14 @@
   (function(k) {
     (function(a) {
       var k = d.ArrayUtilities.DataBuffer, v = function(a) {
-        function t() {
+        function u() {
           a.call(this);
           this._worker = d.Player.Test.FakeSyncWorker.instance;
           this._worker.addEventListener("message", this._onWorkerMessage.bind(this));
           this._worker.addEventListener("syncmessage", this._onSyncWorkerMessage.bind(this));
         }
-        __extends(t, a);
-        t.prototype.onSendUpdates = function(a, c, d) {
+        __extends(u, a);
+        u.prototype.onSendUpdates = function(a, c, d) {
           void 0 === d && (d = !0);
           a = a.getBytes();
           c = {type:"player", updates:a, assets:c};
@@ -52931,22 +54681,22 @@
           this._worker.postMessage(c, a);
           return null;
         };
-        t.prototype.onExternalCommand = function(a) {
+        u.prototype.onExternalCommand = function(a) {
           this._worker.postSyncMessage({type:"external", command:a});
         };
-        t.prototype.onFSCommand = function(a, c) {
+        u.prototype.onFSCommand = function(a, c) {
           this._worker.postMessage({type:"fscommand", command:a, args:c});
         };
-        t.prototype.onVideoControl = function(a, c, d) {
+        u.prototype.onVideoControl = function(a, c, d) {
           return this._worker.postSyncMessage({type:"videoControl", id:a, eventType:c, data:d});
         };
-        t.prototype.onFrameProcessed = function() {
+        u.prototype.onFrameProcessed = function() {
           this._worker.postMessage({type:"frame"});
         };
-        t.prototype.registerFontOrImageImpl = function(a, c) {
+        u.prototype.registerFontOrImageImpl = function(a, c) {
           return this._worker.postSyncMessage({type:"registerFontOrImage", syncId:a.syncId, symbolId:a.id, assetType:c.type, data:c, resolve:a.resolveAssetPromise.resolve});
         };
-        t.prototype._onWorkerMessage = function(a) {
+        u.prototype._onWorkerMessage = function(a) {
           var c = a.data;
           if ("object" === typeof c && null !== c) {
             switch(c.type) {
@@ -52966,10 +54716,10 @@
             }
           }
         };
-        t.prototype._onSyncWorkerMessage = function(a) {
+        u.prototype._onSyncWorkerMessage = function(a) {
           return this._onWorkerMessage(a);
         };
-        return t;
+        return u;
       }(d.Player.Player);
       a.TestPlayer = v;
     })(k.Test || (k.Test = {}));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/ShumwayStreamConverter.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/ShumwayStreamConverter.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/ShumwayStreamConverter.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/ShumwayStreamConverter.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -411,7 +411,7 @@
         var position = e.loaded;
         var data = new Uint8Array(xhr.response);
         notifyLoadFileListener({callback:"loadFile", sessionId: sessionId,
-             topic: "progress", array: data, loaded: e.loaded, total: e.total});
+             topic: "progress", array: data, loaded: position, total: e.total});
         lastPosition = position;
         if (limit && e.total >= limit) {
           xhr.abort();
@@ -755,6 +755,59 @@
       return requestListener.receive.apply(requestListener, arguments);
     };
     window.wrappedJSObject.runViewer();
+
+    var parentWindow = window.parent;
+    var viewerWindow = window.viewer.contentWindow;
+
+    function activate(e) {
+      e.preventDefault();
+      viewerWindow.removeEventListener('mousedown', activate, true);
+
+      parentWindow.addEventListener('keydown', forwardKeyEvent, true);
+      parentWindow.addEventListener('keyup', forwardKeyEvent, true);
+
+      sendFocusEvent('focus');
+
+      parentWindow.addEventListener('blur', deactivate, true);
+      parentWindow.addEventListener('mousedown', deactivate, true);
+      viewerWindow.addEventListener('unload', deactivate, true);
+    }
+
+    function deactivate() {
+      parentWindow.removeEventListener('blur', deactivate, true);
+      parentWindow.removeEventListener('mousedown', deactivate, true);
+      viewerWindow.removeEventListener('unload', deactivate, true);
+
+      parentWindow.removeEventListener('keydown', forwardKeyEvent, true);
+      parentWindow.removeEventListener('keyup', forwardKeyEvent, true);
+
+      sendFocusEvent('blur');
+
+      viewerWindow.addEventListener('mousedown', activate, true);
+    }
+
+    function forwardKeyEvent(e) {
+      var event = viewerWindow.document.createEvent('KeyboardEvent');
+      event.initKeyEvent(e.type,
+                         e.bubbles,
+                         e.cancelable,
+                         e.view,
+                         e.ctrlKey,
+                         e.altKey,
+                         e.shiftKey,
+                         e.metaKey,
+                         e.keyCode,
+                         e.charCode);
+      viewerWindow.dispatchEvent(event);
+    }
+
+    function sendFocusEvent(type) {
+      var event = viewerWindow.document.createEvent("UIEvent");
+      event.initEvent(type, false, true);
+      viewerWindow.dispatchEvent(event);
+    }
+
+    viewerWindow.addEventListener('mousedown', activate, true);
   }
 
   if (window.document.readyState === "interactive" ||
@@ -1034,6 +1087,8 @@
           return;
         }
 
+        domWindow.swfUrlLoading = actions.url;
+
         // Report telemetry on amount of swfs on the page
         if (actions.isOverlay) {
           // Looking for last actions with same baseUrl
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/version.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/version.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/version.txt	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/version.txt	2015-02-28 15:03:03.000000000 +0000
@@ -1,2 +1,2 @@
-0.9.3775
-a82ac47
+0.10.182
+0195a96
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/web/noflv.mp4 and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/web/noflv.mp4 differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/web/viewer.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/web/viewer.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/web/viewer.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/web/viewer.html	2015-02-28 15:03:03.000000000 +0000
@@ -111,6 +111,7 @@
         <menuitem label="Open in Inspector" id="inspectorMenu"></menuitem>
         <menuitem label="Report Problems" id="reportMenu"></menuitem>
         <menuitem label="Reload in Adobe Flash Player" id="fallbackMenu" hidden></menuitem>
+        <menuitem label="Debug this SWF" id="debugMenu"></menuitem>
         <menuitem label="About Shumway %version%..." id="aboutMenu"></menuitem>
       </menu>
     </section>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/web/viewer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/web/viewer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/web/viewer.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/web/viewer.js	2015-02-28 15:03:03.000000000 +0000
@@ -93,7 +93,7 @@
   catalog: SHUMWAY_ROOT + "playerglobal/playerglobal.json"
 };
 
-var builtinPath = SHUMWAY_ROOT + "avm2/generated/builtin/builtin.abc";
+var builtinPath = SHUMWAY_ROOT + "libs/builtin.abc";
 
 var playerWindow;
 var playerWindowLoaded = new Promise(function(resolve) {
@@ -165,6 +165,13 @@
   var version = Shumway.version || '';
   document.getElementById('aboutMenu').label =
     document.getElementById('aboutMenu').label.replace('%version%', version);
+
+  var debugMenuEnabled = FirefoxCom.requestSync('getBoolPref', {pref: 'shumway.debug.enabled', def: false});
+  if (debugMenuEnabled) {
+    document.getElementById('debugMenu').addEventListener('click', enableDebug);
+  } else {
+    document.getElementById('debugMenu').remove();
+  }
 }
 
 function showURL() {
@@ -205,6 +212,10 @@
   window.open('http://areweflashyet.com/');
 }
 
+function enableDebug() {
+  ShumwayCom.enableDebug();
+}
+
 var movieUrl, movieParams, objectParams;
 
 window.addEventListener("message", function handlerMessage(e) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/web/viewerPlayer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/web/viewerPlayer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/extensions/shumway/content/web/viewerPlayer.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/extensions/shumway/content/web/viewerPlayer.js	2015-02-28 15:03:03.000000000 +0000
@@ -22,8 +22,7 @@
   catalog: SHUMWAY_ROOT + "playerglobal/playerglobal.json"
 };
 
-var avm2Root = SHUMWAY_ROOT + "avm2/";
-var builtinPath = avm2Root + "generated/builtin/builtin.abc";
+var builtinPath = SHUMWAY_ROOT + "libs/builtin.abc";
 
 window.print = function(msg) {
   console.log(msg);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/installer/package-manifest.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/installer/package-manifest.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/installer/package-manifest.in	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/installer/package-manifest.in	2015-02-28 15:03:03.000000000 +0000
@@ -476,6 +476,8 @@
 @RESPATH@/components/formautofill.manifest
 @RESPATH@/components/FormAutofillContentService.js
 @RESPATH@/components/FormAutofillStartup.js
+@RESPATH@/components/CSSUnprefixingService.js
+@RESPATH@/components/CSSUnprefixingService.manifest
 @RESPATH@/components/contentAreaDropListener.manifest
 @RESPATH@/components/contentAreaDropListener.js
 @RESPATH@/browser/components/BrowserProfileMigrators.manifest
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/browser.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/browser.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/browser.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -840,3 +840,20 @@
 
 <!ENTITY emeLearnMoreContextMenu.label            "Learn more about DRM…">
 <!ENTITY emeLearnMoreContextMenu.accesskey        "D">
+<!ENTITY emeNotificationsNotNow.label             "Not now">
+<!ENTITY emeNotificationsNotNow.accesskey         "N">
+<!ENTITY emeNotificationsDontAskAgain.label       "Don't ask me again">
+<!ENTITY emeNotificationsDontAskAgain.accesskey   "D">
+
+<!ENTITY readingList.label                        "Reading List">
+<!ENTITY readingList.sidebar.commandKey           "R">
+<!ENTITY readingList.showSidebar.label            "Show Reading List Sidebar">
+<!-- Pre-landed string for bug 1124153 -->
+<!ENTITY readingList.sidebar.showMore.label       "Show more…">
+<!-- Pre-landed string for bug 1133662 -->
+<!ENTITY readingList.sidebar.emptyText            "Add articles to your Reading List to save them for later and find them easily when you need them.">
+<!-- Pre-landed string for bug 1123525 -->
+<!ENTITY readingList.sidebar.delete.tooltip       "Remove this from your Reading List">
+<!-- Pre-landed strings for bug 1123519 -->
+<!ENTITY readingList.sidebar.add.label            "Add to Reading List">
+<!ENTITY readingList.sidebar.add.tooltip          "Add this page to your Reading List">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/browser.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/browser.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/browser.properties	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/browser.properties	2015-02-28 15:03:03.000000000 +0000
@@ -40,15 +40,15 @@
 addonDownloadRestart.accessKey=R
 addonDownloadCancelTooltip=Cancel
 
-addonwatch.slow=%S might be making %S run slowly
+addonwatch.slow=%1$S might be making %2$S run slowly
 addonwatch.disable.label=Disable %S
 addonwatch.disable.accesskey=D
 addonwatch.ignoreSession.label=Ignore for now
 addonwatch.ignoreSession.accesskey=I
 addonwatch.ignorePerm.label=Ignore permanently
 addonwatch.ignorePerm.accesskey=p
-addonwatch.restart.message=To disable %S you must restart %S
-addonwatch.restart.label=Restart %s
+addonwatch.restart.message=To disable %1$S you must restart %2$S
+addonwatch.restart.label=Restart %S
 addonwatch.restart.accesskey=R
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
@@ -602,11 +602,39 @@
 # origin for the sharing menu if no readable origin could be deduced from the URL.
 getUserMedia.sharingMenuUnknownHost = Unknown origin
 
-# LOCALIZATION NOTE(emeNotifications.drmContentPlaying.message): %1$S is the vendor name of the DRM that's in use, %2$S is brandShortName.
-emeNotifications.drmContentPlaying.message = Some audio or video on this site uses %1$S DRM software, which may limit what %2$S can let you do with it.
+# LOCALIZATION NOTE(emeNotifications.drmContentPlaying.message2): %S is brandShortName.
+emeNotifications.drmContentPlaying.message2 = Some audio or video on this site uses DRM software, which may limit what %S can let you do with it.
 emeNotifications.drmContentPlaying.button.label = Configure…
 emeNotifications.drmContentPlaying.button.accesskey = C
 
+# LOCALIZATION NOTE(emeNotifications.drmContentDisabled.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S will be the 'learn more' link
+emeNotifications.drmContentDisabled.message = You must enable DRM to play some audio or video on this page. %S
+emeNotifications.drmContentDisabled.button.label = Enable DRM
+emeNotifications.drmContentDisabled.button.accesskey = E
+# LOCALIZATION NOTE(emeNotifications.drmContentDisabled.learnMoreLabel): NB: inserted via innerHTML, so please don't use <, > or & in this string.
+emeNotifications.drmContentDisabled.learnMoreLabel = Learn More
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S will be the 'learn more' link
+emeNotifications.drmContentCDMNotSupported.message = The audio or video on this page requires DRM software that %1$S does not support. %2$S
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.learnMoreLabel): NB: inserted via innerHTML, so please don't use <, > or & in this string.
+emeNotifications.drmContentCDMNotSupported.learnMoreLabel = Learn More
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMInsufficientVersion.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S is brandShortName
+emeNotifications.drmContentCDMInsufficientVersion.message = %S is installing updates needed to play the audio or video on this page. Please try again later.
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMInstalling.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S is brandShortName
+emeNotifications.drmContentCDMInstalling.message = %S is installing components needed to play the audio or video on this page. Please try again later.
+
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.64bit.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S will be the 'learn more' link
+emeNotifications.drmContentCDMNotSupported.64bit.message = The audio or video on this page requires DRM software that this 64-bit build of %1$S does not support. %2$S
+# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.unsupportedOS.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S is the name of the user's OS (Windows, Linux, Mac OS X), %3$S will be the 'learn more' link
+emeNotifications.drmContentCDMNotSupported.unsupportedOS.message = The audio or video on this page requires DRM software that %1$S does not support on %2$S. %3$S
+
+emeNotifications.optionsButton.label = Options
+emeNotifications.optionsButton.accesskey = O
+
+emeNotifications.unknownDRMSoftware = Unknown
+
 # LOCALIZATION NOTE - %S is brandShortName
 slowStartup.message = %S seems slow… to… start.
 slowStartup.helpButton.label = Learn How to Speed It Up
@@ -614,6 +642,10 @@
 slowStartup.disableNotificationButton.label = Don't Tell Me Again
 slowStartup.disableNotificationButton.accesskey = A
 
+# LOCALIZATION NOTE  - %S is brandShortName
+flashHang.message = %S changed some Adobe Flash settings to improve performance.
+flashHang.helpButton.label = Learn More…
+flashHang.helpButton.accesskey = L
 
 # LOCALIZATION NOTE(customizeTips.tip0): %1$S will be replaced with the text defined
 # in customizeTips.tip0.hint, %2$S will be replaced with brandShortName, %3$S will
@@ -630,3 +662,19 @@
 appmenu.updateFailed.description = Background update failed, please download update
 appmenu.restartBrowserButton.label = Restart %S
 appmenu.downloadUpdateButton.label = Download Update
+
+# Pre-landed string for bug 1124153
+# LOCALIZATION NOTE(readingList.sidebar.showMore.tooltip): %S is the number of items that will be added by clicking this button
+# Semicolon-separated list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+readingList.sidebar.showMore.tooltip = Show %S more item;Show %S more items
+# Pre-landed strings for bug 1131457 / bug 1131461
+readingList.urlbar.add = Add page to Reading List
+readingList.urlbar.addDone = Page added to Reading List
+readingList.urlbar.remove = Remove page from Reading List
+readingList.urlbar.removeDone = Page removed from Reading List
+# Pre-landed strings for bug 1133610 & bug 1133611
+# LOCALIZATION NOTE(readingList.promo.noSync.label): %S a link, using the text from readingList.promo.noSync.link
+readingList.promo.noSync.label = Access your Reading List on all your devices. %S
+readingList.promo.noSync.link = Get started with Sync.
+readingList.promo.hasSync.label = You can now access your Reading List on all your devices connected by Sync.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -24,9 +24,9 @@
 <!ENTITY canvasDebuggerUI.emptyNotice1    "Click on the">
 <!ENTITY canvasDebuggerUI.emptyNotice2    "button to record an animation frame's call stack.">
 
-<!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice1): This is the label shown
-  -  in the call list view while loading a snapshot. -->
-<!ENTITY canvasDebuggerUI.importNotice    "Loading…">
+<!-- LOCALIZATION NOTE (canvasDebuggerUI.waitingNotice): This is the label shown
+  -  in the call list view while recording a snapshot. -->
+<!ENTITY canvasDebuggerUI.waitingNotice   "Recording an animation cycle…">
 
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.recordSnapshot): This string is displayed
   -  on a button that starts a new snapshot. -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties	2015-02-28 15:03:03.000000000 +0000
@@ -76,3 +76,9 @@
 # This string is displayed in the snapshots list of the Canvas Debugger,
 # as a generic description about how many function calls were made in total.
 snapshotsList.functionCallsLabel=#1 call;#1 calls
+
+# LOCALIZATION NOTE (recordingTimeoutFailure):
+# This notification alert is displayed when attempting to record a requestAnimationFrame
+# cycle in the Canvas Debugger and no cycles detected. This alerts the user that no
+# loops were found.
+recordingTimeoutFailure=Canvas Debugger could not find a requestAnimationFrame or setTimeout cycle.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/device.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/device.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/device.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/device.properties	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 These strings are used inside Device Emulation developer
+# tools. The correct localization of this file might be to keep it in English,
+# or another language commonly spoken among web developers.  You want to make
+# that choice consistent across the developer tools.  A good criteria is the
+# language in which you'd find the best documentation on web development on the
+# web.
+
+# LOCALIZATION NOTE:
+# These strings are category names in a list of devices that a user can choose
+# to simulate (e.g. "ZTE Open C", "VIA Vixen", "720p HD Television", etc).
+device.phones=Phones
+device.tablets=Tablets
+device.notebooks=Notebooks
+device.televisions=TVs
+device.watches=Watches
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/profiler.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/profiler.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/profiler.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/profiler.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -64,9 +64,13 @@
   -  on the "+" (new tab) button for a profile when a selection is available. -->
 <!ENTITY profilerUI.newtab.tooltiptext "Add new tab from selection">
 
+<!-- LOCALIZATION NOTE (profilerUI.toolbar.filter.tooltiptext): This string
+  -  is displayed next to the filter button-->
+<!ENTITY profilerUI.options.filter.tooltiptext "Select what data to display in the timeline">
+
 <!-- LOCALIZATION NOTE (profilerUI.options.tooltiptext): This is the tooltip
   -  for the options button. -->
-<!ENTITY profilerUI.options.tooltiptext "Configure performance preferences.">
+<!ENTITY profilerUI.options.gear.tooltiptext "Configure performance preferences.">
 
 <!-- LOCALIZATION NOTE (profilerUI.invertTree): This is the label shown next to
   -  a checkbox that inverts and un-inverts the profiler's call tree. -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -72,8 +72,8 @@
 <!-- LOCALIZATION NOTE (options.enableChrome.label4): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
-<!ENTITY options.enableChrome.label4    "Enable chrome and add-on debugging">
-<!ENTITY options.enableChrome.tooltip2  "Turning this option on will allow you to use various developer tools in browser context and debug add-ons from the Add-ons Manager">
+<!ENTITY options.enableChrome.label5    "Enable browser chrome and add-on debugging toolboxes">
+<!ENTITY options.enableChrome.tooltip3  "Turning this option on will allow you to use various developer tools in browser context (via Tools > Web Developer > Browser Toolbox) and debug add-ons from the Add-ons Manager">
 
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/loop/loop.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/loop/loop.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/loop/loop.properties	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/loop/loop.properties	2015-02-28 15:03:03.000000000 +0000
@@ -7,6 +7,7 @@
 ## LOCALIZATION NOTE(clientShortname2): This should not be localized and
 ## should remain "Firefox Hello" for all locales.
 clientShortname2=Firefox Hello
+clientSuperShortname=Hello
 
 rooms_tab_button_tooltip=Conversations
 contacts_tab_button_tooltip=Contacts
@@ -43,10 +44,11 @@
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error for location
 retry_button=Retry
 
-share_email_subject4={{clientShortname}} — Join the conversation
+share_email_subject5={{clientShortname2}} — Join the conversation
 ## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
-## part between {{..}} and leave the \r\n\r\n part alone
-share_email_body4=Hello!\r\n\r\nJoin me for a video conversation using {{clientShortname}}:\r\n\r\nYou don't have to download or install anything. Just copy and paste this URL into your browser:\r\n\r\n{{callUrl}}\r\n\r\nIf you want, you can also learn more about {{clientShortname}} at {{learnMoreUrl}}\r\n\r\nTalk to you soon!
+## part between {{..}} and leave the \n\n part alone
+share_email_body5=Hello!\n\nJoin me for a video conversation on {{clientShortname2}}.\n\nIt's the easiest way to connect by video with anyone anywhere.  With {{clientSuperShortname}}, you don't have to download or install anything. Just click or paste this link into your {{brandShortname}}, Opera, or Chrome browser to join the conversation:\n\n{{callUrl}}\n\nIf you'd like to learn more about {{clientSuperShortname}} and how you can start your own free video conversations, visit {{learnMoreUrl}}\n\nTalk to you soon!
+
 share_button2=Email Link
 copy_url_button2=Copy Link
 copied_url_button=Copied!
@@ -167,6 +169,14 @@
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 video_call_menu_button=Video Conversation
 
+## LOCALIZATION NOTE(gravatars_promo_message): The {{learn_more}} part will be
+## replaced with a link with the text content of gravatars_promo_message_learnmore.
+gravatars_promo_message=You can automatically add profile icons to your contacts \
+  by sharing their email addresses with Gravatar. {{learn_more}}.
+gravatars_promo_message_learnmore=Learn more
+gravatars_promo_button_nothanks=No Thanks
+gravatars_promo_button_use=Use Profile Icons
+
 # Conversation Window Strings
 
 initiate_call_button_label2=Ready to start your conversation?
@@ -185,6 +195,7 @@
 unmute_local_video_button_title=Unmute your video
 active_screenshare_button_title=Stop sharing
 inactive_screenshare_button_title=Share your screen
+share_tabs_button_title=Share my Tabs
 share_windows_button_title=Share other Windows
 
 ## LOCALIZATION NOTE (call_with_contact_title): The title displayed
@@ -312,3 +323,11 @@
 rooms_room_joined_label=Someone has joined the conversation!
 rooms_room_join_label=Join the conversation
 rooms_signout_alert=Open conversations will be closed
+
+# Infobar strings
+
+infobar_screenshare_browser_message=Users in your conversation will now be able to see the contents of any tab you click on.
+infobar_button_gotit_label=Got it!
+infobar_button_gotit_accesskey=G
+infobar_menuitem_dontshowagain_label=Don't show this again
+infobar_menuitem_dontshowagain_accesskey=D
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -28,19 +28,16 @@
 
 <!ENTITY dataChoicesTab.label            "Data Choices">
 
-<!ENTITY healthReportSection.label       "&brandShortName; Health Report">
 <!ENTITY healthReportDesc.label          "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">
 <!ENTITY enableHealthReport.label        "Enable &brandShortName; Health Report">
 <!ENTITY enableHealthReport.accesskey    "R">
 <!ENTITY healthReportLearnMore.label     "Learn More">
 
-<!ENTITY telemetrySection.label          "Telemetry">
 <!ENTITY telemetryDesc.label             "Shares performance, usage, hardware and customization data about your browser with &vendorShortName; to help us make &brandShortName; better">
-<!ENTITY enableTelemetry.label           "Enable Telemetry">
-<!ENTITY enableTelemetry.accesskey       "T">
+<!ENTITY enableTelemetryData.label       "Share additional data (i.e., Telemetry)">
+<!ENTITY enableTelemetryData.accesskey   "T">
 <!ENTITY telemetryLearnMore.label        "Learn More">
 
-<!ENTITY crashReporterSection.label      "Crash Reporter">
 <!ENTITY crashReporterDesc.label         "&brandShortName; submits crash reports to help &vendorShortName; make your browser more stable and secure">
 <!ENTITY enableCrashReporter.label       "Enable Crash Reporter">
 <!ENTITY enableCrashReporter.accesskey   "C">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/permissions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/permissions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/permissions.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/permissions.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -3,7 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY window.title                 "Exceptions">
-<!ENTITY window.width                 "36em">
+<!ENTITY window.width                 "45em">
 
 <!ENTITY treehead.sitename.label      "Site">
 <!ENTITY treehead.status.label        "Status">
@@ -21,6 +21,8 @@
 <!ENTITY allow.accesskey              "A">
 <!ENTITY windowClose.key              "w">
 
-<!ENTITY button.close.label           "Close">
-<!ENTITY button.close.accesskey       "C">
+<!ENTITY button.cancel.label          "Cancel">
+<!ENTITY button.cancel.accesskey      "C">
+<!ENTITY button.ok.label              "Save Changes">
+<!ENTITY button.ok.accesskey          "S">
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/preferences.properties	2015-02-28 15:03:03.000000000 +0000
@@ -13,6 +13,10 @@
 
 labelDefaultFont=Default (%S)
 
+veryLargeMinimumFontTitle=Large minimum font size
+veryLargeMinimumFontWarning=You have selected a very large minimum font size (more than 24 pixels). This may make it difficult or impossible to use some important configuration pages like this one.
+acceptVeryLargeMinimumFont=Keep my changes anyway
+
 #### Permissions Manager
 
 cookiepermissionstext=You can specify which websites are always or never allowed to use cookies.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/sync.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/sync.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/preferences/sync.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/preferences/sync.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -26,6 +26,8 @@
 <!ENTITY syncMy.label               "Sync My">
 <!ENTITY engine.bookmarks.label     "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey "m">
+<!ENTITY engine.readinglist.label   "Reading List">
+<!ENTITY engine.readinglist.accesskey "L">
 <!ENTITY engine.tabs.label          "Tabs">
 <!ENTITY engine.tabs.accesskey      "T">
 <!ENTITY engine.history.label       "History">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/readerMode.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/readerMode.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/readerMode.properties	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/readerMode.properties	2015-02-28 15:03:03.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/.
 
-readerMode.enter=Enter Reader Mode
-readerMode.exit=Exit Reader Mode
+readerView.enter=Enter Reader View
+readerView.exit=Exit Reader View
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/search.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/search.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/search.properties	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/search.properties	2015-02-28 15:03:03.000000000 +0000
@@ -23,5 +23,12 @@
 cmd_showSuggestions=Show Suggestions
 cmd_showSuggestions_accesskey=S
 
+# LOCALIZATION NOTE (cmd_addFoundEngine): %S is replaced by the name of
+# a search engine offered by a web page. Each engine is displayed as a
+# menuitem at the bottom of the search panel.
 cmd_addFoundEngine=Add "%S"
-
+# LOCALIZATION NOTE (cmd_addFoundEngineMenu): When more than 5 engines
+# are offered by a web page, instead of listing all of them in the
+# search panel using the cmd_addFoundEngine string, they will be
+# grouped in a submenu using cmd_addFoundEngineMenu as a label.
+cmd_addFoundEngineMenu=Add search engine
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/syncCustomize.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/syncCustomize.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/browser/syncCustomize.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/browser/syncCustomize.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -15,6 +15,8 @@
 -->
 <!ENTITY engine.bookmarks.label           "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey       "m">
+<!ENTITY engine.readinglist.label         "Reading List">
+<!ENTITY engine.readinglist.accesskey     "L">
 <!ENTITY engine.history.label             "History">
 <!ENTITY engine.history.accesskey         "r">
 <!ENTITY engine.tabs.label                "Tabs">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2015-02-28 15:03:03.000000000 +0000
@@ -34,3 +34,5 @@
 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.
+## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
+sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/en-US/chrome/overrides/netError.dtd	2015-02-28 15:03:03.000000000 +0000
@@ -205,11 +205,8 @@
 <!ENTITY remoteXUL.title "Remote XUL">
 <!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
 
-<!ENTITY oldSecurityProtocol.title "Unable to Connect Securely">
-<!-- LOCALIZATION NOTE (oldSecurityProtocol.longDesc) - Do not translate the
-     <span id='hostname'></span>. -->
-<!ENTITY oldSecurityProtocol.longDesc2 "&brandShortName; cannot guarantee the safety of your data on <span id='hostname'></span> because it uses SSLv3, a broken security protocol.">
-<!-- LOCALIZATION NOTE (oldSecurityProtocol.advancedInfo) - Do not translate
-     the <span id='errorcode'></span>. -->
-<!ENTITY oldSecurityProtocol.advancedInfo "Advanced info: <span id='errorcode'></span>">
-<!ENTITY oldSecurityProtocol.learnMore "Learn More…">
+<!ENTITY sslv3Used.title "Unable to Connect Securely">
+<!-- LOCALIZATION NOTE (sslv3Used.longDesc) - Do not translate
+     "ssl_error_unsupported_version". -->
+<!ENTITY sslv3Used.longDesc "Advanced info: ssl_error_unsupported_version">
+<!ENTITY sslv3Used.learnMore "Learn More…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/locales/jar.mn	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/locales/jar.mn	2015-02-28 15:03:03.000000000 +0000
@@ -33,6 +33,7 @@
     locale/browser/devtools/appcacheutils.properties  (%chrome/browser/devtools/appcacheutils.properties)
     locale/browser/devtools/debugger.dtd              (%chrome/browser/devtools/debugger.dtd)
     locale/browser/devtools/debugger.properties       (%chrome/browser/devtools/debugger.properties)
+    locale/browser/devtools/device.properties         (%chrome/browser/devtools/device.properties)
     locale/browser/devtools/netmonitor.dtd            (%chrome/browser/devtools/netmonitor.dtd)
     locale/browser/devtools/netmonitor.properties     (%chrome/browser/devtools/netmonitor.properties)
     locale/browser/devtools/shadereditor.dtd          (%chrome/browser/devtools/shadereditor.dtd)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/AboutHome.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/AboutHome.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/AboutHome.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/AboutHome.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -198,7 +198,9 @@
 #endif
           // Trigger a search through nsISearchEngine.getSubmission()
           let submission = engine.getSubmission(data.searchTerms, null, "homepage");
-          window.loadURI(submission.uri.spec, null, submission.postData);
+          let where = data.useNewTab ? "tab" : "current";
+          window.openUILinkIn(submission.uri.spec, where, false,
+                              submission.postData);
 
           // Used for testing
           let mm = aMessage.target.messageManager;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/BrowserUITelemetry.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/BrowserUITelemetry.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/BrowserUITelemetry.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/BrowserUITelemetry.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -599,6 +599,10 @@
     this._countEvent(["click-builtin-item", source, "search-settings"]);
   },
 
+  countPanicEvent: function(timeId) {
+    this._countEvent(["forget-button", timeId]);
+  },
+
   _logAwesomeBarSearchResult: function (url) {
     let spec = Services.search.parseSubmissionURL(url);
     if (spec.engine) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/ContentObservers.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/ContentObservers.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/ContentObservers.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/ContentObservers.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -20,14 +20,10 @@
 Cu.import("resource://gre/modules/Services.jsm");
 
 let gEMEUIObserver = function(subject, topic, data) {
-  let win = subject.ownerDocument.defaultView.top;
+  let win = subject.top;
   let mm = getMessageManagerForWindow(win);
   if (mm) {
-    mm.sendAsyncMessage("EMEVideo:MetadataLoaded", {
-      // bug 1129370 covers making this the actual DRM provider inferred from
-      // either |subject| or |data| here.
-      drmProvider: "Adobe"
-    });
+    mm.sendAsyncMessage("EMEVideo:ContentMediaKeysRequest", data);
   }
 };
 
@@ -44,4 +40,4 @@
   }
 }
 
-Services.obs.addObserver(gEMEUIObserver, "media-eme-metadataloaded", false);
+Services.obs.addObserver(gEMEUIObserver, "mediakeys-request", false);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/ContentSearch.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/ContentSearch.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/ContentSearch.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/ContentSearch.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -210,6 +210,11 @@
     let engine = Services.search.getEngineByName(data.engineName);
     let submission = engine.getSubmission(data.searchString, "", data.whence);
     let browser = msg.target;
+    let newTab;
+    if (data.useNewTab) {
+      newTab = browser.getTabBrowser().addTab();
+      browser = newTab.linkedBrowser;
+    }
     try {
       browser.loadURIWithFlags(submission.uri.spec,
                                Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null,
@@ -221,6 +226,9 @@
       // method on it will throw.
       return Promise.resolve();
     }
+    if (data.useNewTab) {
+      browser.getTabBrowser().selectedTab = newTab;
+    }
     let win = browser.ownerDocument.defaultView;
     win.BrowserSearch.recordSearchInHealthReport(engine, data.whence,
                                                  data.selection || null);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/E10SUtils.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/E10SUtils.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/E10SUtils.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/E10SUtils.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -30,6 +30,10 @@
     if (!aURL)
       aURL = "about:blank";
 
+    // Javascript urls can load in any process, they apply to the current document
+    if (aURL.startsWith("javascript:"))
+      return true;
+
     let processIsRemote = aProcess == Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT;
 
     let canLoadRemote = true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/moz.build	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/moz.build	2015-02-28 15:03:03.000000000 +0000
@@ -32,6 +32,7 @@
     'ProcessHangMonitor.jsm',
     'ReaderParent.jsm',
     'RemotePrompt.jsm',
+    'SelfSupportBackend.jsm',
     'SitePermissions.jsm',
     'Social.jsm',
     'TabCrashReporter.jsm',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/ReaderParent.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/ReaderParent.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/ReaderParent.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/ReaderParent.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -26,10 +26,10 @@
     "Reader:ListStatusRequest",
     "Reader:RemoveFromList",
     "Reader:Share",
-    "Reader:ShowToast",
-    "Reader:ToolbarVisibility",
     "Reader:SystemUIVisibility",
     "Reader:UpdateReaderButton",
+    "Reader:SetIntPref",
+    "Reader:SetCharPref",
   ],
 
   init: function() {
@@ -70,18 +70,10 @@
         // XXX: To implement.
         break;
 
-      case "Reader:ShowToast":
-        // XXX: To implement.
-        break;
-
       case "Reader:SystemUIVisibility":
         // XXX: To implement.
         break;
 
-      case "Reader:ToolbarVisibility":
-        // XXX: To implement.
-        break;
-
       case "Reader:UpdateReaderButton": {
         let browser = message.target;
         if (message.data && message.data.isArticle !== undefined) {
@@ -90,6 +82,18 @@
         this.updateReaderButton(browser);
         break;
       }
+      case "Reader:SetIntPref": {
+        if (message.data && message.data.name !== undefined) {
+          Services.prefs.setIntPref(message.data.name, message.data.value);
+        }
+        break;
+      }
+      case "Reader:SetCharPref": {
+        if (message.data && message.data.name !== undefined) {
+          Services.prefs.setCharPref(message.data.name, message.data.value);
+        }
+        break;
+      }
     }
   },
 
@@ -103,10 +107,10 @@
     if (browser.currentURI.spec.startsWith("about:reader")) {
       button.setAttribute("readeractive", true);
       button.hidden = false;
-      button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerMode.exit"));
+      button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerView.exit"));
     } else {
       button.removeAttribute("readeractive");
-      button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerMode.enter"));
+      button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerView.enter"));
       button.hidden = !browser.isArticle;
     }
   },
@@ -122,23 +126,37 @@
 
     let win = event.target.ownerDocument.defaultView;
     let url = win.gBrowser.selectedBrowser.currentURI.spec;
+
     if (url.startsWith("about:reader")) {
-      win.openUILinkIn(this._getOriginalUrl(url), "current");
+      let originalURL = this._getOriginalUrl(url);
+      if (!originalURL) {
+        Cu.reportError("Error finding original URL for about:reader URL: " + url);
+      } else {
+        win.openUILinkIn(originalURL, "current", {"allowPinnedTabHostChange": true});
+      }
     } else {
-      win.openUILinkIn("about:reader?url=" + encodeURIComponent(url), "current");
+      win.openUILinkIn("about:reader?url=" + encodeURIComponent(url), "current", {"allowPinnedTabHostChange": true});
+    }
+  },
+
+  parseReaderUrl: function(url) {
+    if (!url.startsWith("about:reader?")) {
+      return null;
     }
+    return this._getOriginalUrl(url);
   },
 
   /**
    * Returns original URL from an about:reader URL.
    *
    * @param url An about:reader URL.
+   * @return The original URL for the article, or null if we did not find
+   *         a properly formatted about:reader URL.
    */
   _getOriginalUrl: function(url) {
-    let searchParams = new URLSearchParams(url.split("?")[1]);
+    let searchParams = new URLSearchParams(url.substring("about:reader?".length));
     if (!searchParams.has("url")) {
-      Cu.reportError("Error finding original URL for about:reader URL: " + url);
-      return url;
+      return null;
     }
     return decodeURIComponent(searchParams.get("url"));
   },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/SelfSupportBackend.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/SelfSupportBackend.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/SelfSupportBackend.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/SelfSupportBackend.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,323 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 = ["SelfSupportBackend"];
+
+const Cu = Components.utils;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+Cu.import("resource://gre/modules/Log.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "HiddenFrame",
+  "resource:///modules/HiddenFrame.jsm");
+
+// Enables or disables the Self Support.
+const PREF_ENABLED = "browser.selfsupport.enabled";
+// Url to open in the Self Support browser, in the urlFormatter service format.
+const PREF_URL = "browser.selfsupport.url";
+// FHR status.
+const PREF_FHR_ENABLED = "datareporting.healthreport.service.enabled";
+// UITour status.
+const PREF_UITOUR_ENABLED = "browser.uitour.enabled";
+
+// Controls the interval at which the self support page tries to reload in case of
+// errors.
+const RETRY_INTERVAL_MS = 30000;
+// Maximum number of SelfSupport page load attempts in case of failure.
+const MAX_RETRIES = 5;
+// The delay after which to load the self-support, at startup.
+const STARTUP_DELAY_MS = 5000;
+
+const LOGGER_NAME = "Browser.SelfSupportBackend";
+const PREF_BRANCH_LOG = "browser.selfsupport.log.";
+const PREF_LOG_LEVEL = PREF_BRANCH_LOG + "level";
+const PREF_LOG_DUMP = PREF_BRANCH_LOG + "dump";
+
+const HTML_NS = "http://www.w3.org/1999/xhtml";
+const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+const UITOUR_FRAME_SCRIPT = "chrome://browser/content/content-UITour.js";
+
+let gLogAppenderDump = null;
+
+this.SelfSupportBackend = Object.freeze({
+  init: function () {
+    SelfSupportBackendInternal.init();
+  },
+
+  uninit: function () {
+    SelfSupportBackendInternal.uninit();
+  },
+});
+
+let SelfSupportBackendInternal = {
+  // The browser element that will load the SelfSupport page.
+  _browser: null,
+  // The Id of the timer triggering delayed SelfSupport page load.
+  _delayedLoadTimerId: null,
+  // The HiddenFrame holding the _browser element.
+  _frame: null,
+  _log: null,
+  _progressListener: null,
+
+  /**
+   * Initializes the self support backend.
+   */
+  init: function () {
+    this._configureLogging();
+
+    this._log.trace("init");
+
+    Preferences.observe(PREF_BRANCH_LOG, this._configureLogging, this);
+
+    // Only allow to use SelfSupport if FHR is enabled.
+    let fhrEnabled = Preferences.get(PREF_FHR_ENABLED, false);
+    if (!fhrEnabled) {
+      this._log.config("init - Disabling SelfSupport because Health Report is disabled.");
+      return;
+    }
+
+    // Make sure UITour is enabled.
+    let uiTourEnabled = Preferences.get(PREF_UITOUR_ENABLED, false);
+    if (!uiTourEnabled) {
+      this._log.config("init - Disabling SelfSupport because UITour is disabled.");
+      return;
+    }
+
+    // Check the preferences to see if we want this to be active.
+    if (!Preferences.get(PREF_ENABLED, true)) {
+      this._log.config("init - SelfSupport is disabled.");
+      return;
+    }
+
+    Services.obs.addObserver(this, "sessionstore-windows-restored", false);
+  },
+
+  /**
+   * Shut down the self support backend, if active.
+   */
+  uninit: function () {
+    this._log.trace("uninit");
+
+    Preferences.ignore(PREF_BRANCH_LOG, this._configureLogging, this);
+
+    // Cancel delayed loading, if still active, when shutting down.
+    clearTimeout(this._delayedLoadTimerId);
+
+    // Dispose of the hidden browser.
+    if (this._browser !== null) {
+      if (this._browser.contentWindow) {
+        this._browser.contentWindow.removeEventListener("DOMWindowClose", this, true);
+      }
+
+      if (this._progressListener) {
+        this._browser.removeProgressListener(this._progressListener);
+        this._progressListener.destroy();
+        this._progressListener = null;
+      }
+
+      this._browser.remove();
+      this._browser = null;
+    }
+
+    if (this._frame) {
+      this._frame.destroy();
+      this._frame = null;
+    }
+  },
+
+  /**
+   * Handle notifications. Once all windows are created, we wait a little bit more
+   * since tabs might still be loading. Then, we open the self support.
+   */
+  observe: function (aSubject, aTopic, aData) {
+    this._log.trace("observe - Topic " + aTopic);
+
+    if (aTopic === "sessionstore-windows-restored") {
+      Services.obs.removeObserver(this, "sessionstore-windows-restored");
+      this._delayedLoadTimerId = setTimeout(this._loadSelfSupport.bind(this), STARTUP_DELAY_MS);
+    }
+  },
+
+  /**
+   * Configure the logger based on the preferences.
+   */
+  _configureLogging: function() {
+    if (!this._log) {
+      this._log = Log.repository.getLogger(LOGGER_NAME);
+
+      // Log messages need to go to the browser console.
+      let consoleAppender = new Log.ConsoleAppender(new Log.BasicFormatter());
+      this._log.addAppender(consoleAppender);
+    }
+
+    // Make sure the logger keeps up with the logging level preference.
+    this._log.level = Log.Level[Preferences.get(PREF_LOG_LEVEL, "Warn")];
+
+    // If enabled in the preferences, add a dump appender.
+    let logDumping = Preferences.get(PREF_LOG_DUMP, false);
+    if (logDumping != !!gLogAppenderDump) {
+      if (logDumping) {
+        gLogAppenderDump = new Log.DumpAppender(new Log.BasicFormatter());
+        this._log.addAppender(gLogAppenderDump);
+      } else {
+        this._log.removeAppender(gLogAppenderDump);
+        gLogAppenderDump = null;
+      }
+    }
+  },
+
+  /**
+   * Create an hidden frame to host our |browser|, then load the SelfSupport page in it.
+   * @param aURL The URL to load in the browser.
+   */
+  _makeHiddenBrowser: function(aURL) {
+    this._frame = new HiddenFrame();
+    return this._frame.get().then(aFrame => {
+      let doc = aFrame.document;
+
+      this._browser = doc.createElementNS(XUL_NS, "browser");
+      this._browser.setAttribute("type", "content");
+      this._browser.setAttribute("disableglobalhistory", "true");
+      this._browser.setAttribute("src", aURL);
+
+      doc.documentElement.appendChild(this._browser);
+    });
+  },
+
+  handleEvent: function(aEvent) {
+    this._log.trace("handleEvent - aEvent.type " + aEvent.type + ", Trusted " + aEvent.isTrusted);
+
+    if (aEvent.type === "DOMWindowClose") {
+      let window = this._browser.contentDocument.defaultView;
+      let target = aEvent.target;
+
+      if (target == window) {
+        // preventDefault stops the default window.close(). We need to do that to prevent
+        // Services.appShell.hiddenDOMWindow from being destroyed.
+        aEvent.preventDefault();
+
+        this.uninit();
+      }
+    }
+  },
+
+  /**
+   * Called when the self support page correctly loads.
+   */
+  _pageSuccessCallback: function() {
+    this._log.debug("_pageSuccessCallback - Page correctly loaded.");
+    this._browser.removeProgressListener(this._progressListener);
+    this._progressListener.destroy();
+    this._progressListener = null;
+
+    // Allow SelfSupportBackend to catch |window.close()| issued by the content.
+    this._browser.contentWindow.addEventListener("DOMWindowClose", this, true);
+  },
+
+  /**
+   * Called when the self support page fails to load.
+   */
+  _pageLoadErrorCallback: function() {
+    this._log.info("_pageLoadErrorCallback - Too many failed load attempts. Giving up.");
+    this.uninit();
+  },
+
+  /**
+   * Create a browser and attach it to an hidden window. The browser will contain the
+   * self support page and attempt to load the page content. If loading fails, try again
+   * after an interval.
+   */
+  _loadSelfSupport: function() {
+    // Fetch the Self Support URL from the preferences.
+    let unformattedURL = Preferences.get(PREF_URL, null);
+    let url = Services.urlFormatter.formatURL(unformattedURL);
+
+    this._log.config("_loadSelfSupport - URL " + url);
+
+    // Create the hidden browser.
+    this._makeHiddenBrowser(url).then(() => {
+      // Load UITour frame script.
+      this._browser.messageManager.loadFrameScript(UITOUR_FRAME_SCRIPT, true);
+
+      // We need to watch for load errors as well and, in case, try to reload
+      // the self support page.
+      const webFlags = Ci.nsIWebProgress.NOTIFY_STATE_WINDOW |
+                       Ci.nsIWebProgress.NOTIFY_STATE_REQUEST |
+                       Ci.nsIWebProgress.NOTIFY_LOCATION;
+
+      this._progressListener = new ProgressListener(() => this._pageLoadErrorCallback(),
+                                                    () => this._pageSuccessCallback());
+
+      this._browser.addProgressListener(this._progressListener, webFlags);
+    });
+  }
+};
+
+/**
+ * A progress listener object which notifies of page load error and load success
+ * through callbacks. When the page fails to load, the progress listener tries to
+ * reload it up to MAX_RETRIES times. The page is not loaded again immediately, but
+ * after a timeout.
+ *
+ * @param aLoadErrorCallback Called when a page failed to load MAX_RETRIES times.
+ * @param aLoadSuccessCallback Called when a page correctly loads.
+ */
+function ProgressListener(aLoadErrorCallback, aLoadSuccessCallback) {
+  this._loadErrorCallback = aLoadErrorCallback;
+  this._loadSuccessCallback = aLoadSuccessCallback;
+  // The number of page loads attempted.
+  this._loadAttempts = 0;
+  this._log = Log.repository.getLogger(LOGGER_NAME);
+  // The Id of the timer which triggers page load again in case of errors.
+  this._reloadTimerId = null;
+}
+
+ProgressListener.prototype = {
+  onLocationChange: function(aWebProgress, aRequest, aLocation, aFlags) {
+    if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) {
+      this._log.warn("onLocationChange - There was a problem fetching the SelfSupport URL (attempt " +
+                     this._loadAttempts + ").");
+
+      // Increase the number of attempts and bail out if we failed too many times.
+      this._loadAttempts++;
+      if (this._loadAttempts > MAX_RETRIES) {
+        this._loadErrorCallback();
+        return;
+      }
+
+      // Reload the page after the retry interval expires. The interval is multiplied
+      // by the number of attempted loads, so that it takes a bit more to try to reload
+      // when frequently failing.
+      this._reloadTimerId = setTimeout(() => {
+        this._log.debug("onLocationChange - Reloading SelfSupport URL in the hidden browser.");
+        aWebProgress.DOMWindow.location.reload();
+      }, RETRY_INTERVAL_MS * this._loadAttempts);
+    }
+  },
+
+  onStateChange: function (aWebProgress, aRequest, aFlags, aStatus) {
+    if (aFlags & Ci.nsIWebProgressListener.STATE_STOP &&
+        aFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK &&
+        aFlags & Ci.nsIWebProgressListener.STATE_IS_WINDOW &&
+        Components.isSuccessCode(aStatus)) {
+      this._loadSuccessCallback();
+    }
+  },
+
+  destroy: function () {
+    // Make sure we don't try to reload self support when shutting down.
+    clearTimeout(this._reloadTimerId);
+  },
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
+                                         Ci.nsISupportsWeakReference]),
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/test/browser.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/test/browser.ini	2015-02-28 15:03:03.000000000 +0000
@@ -12,6 +12,10 @@
   contentSearchSuggestions.xml
 [browser_NetworkPrioritizer.js]
 skip-if = e10s # Bug 666804 - Support NetworkPrioritizer in e10s
+[browser_SelfSupportBackend.js]
+support-files =
+  ../../components/uitour/test/uitour.html
+  ../../components/uitour/UITour-lib.js
 [browser_SignInToWebsite.js]
 skip-if = e10s # Bug 941426 - SignIntoWebsite.jsm not e10s friendly
 [browser_taskbar_preview.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/test/browser_SelfSupportBackend.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/test/browser_SelfSupportBackend.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/test/browser_SelfSupportBackend.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/test/browser_SelfSupportBackend.js	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,158 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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";
+
+// Pass an empty scope object to the import to prevent "leaked window property"
+// errors in tests.
+let Preferences = Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
+let PromiseUtils = Cu.import("resource://gre/modules/PromiseUtils.jsm", {}).PromiseUtils;
+let SelfSupportBackend =
+  Cu.import("resource:///modules/SelfSupportBackend.jsm", {}).SelfSupportBackend;
+
+const PREF_SELFSUPPORT_ENABLED = "browser.selfsupport.enabled";
+const PREF_SELFSUPPORT_URL = "browser.selfsupport.url";
+const PREF_UITOUR_ENABLED = "browser.uitour.enabled";
+
+const TEST_WAIT_RETRIES = 60;
+
+const TEST_PAGE_URL = getRootDirectory(gTestPath) + "uitour.html";
+
+/**
+ * Find a browser, with an IFRAME as parent, who has aURL as the source attribute.
+ *
+ * @param aURL The URL to look for to identify the browser.
+ *
+ * @returns {Object} The browser element or null on failure.
+ */
+function findSelfSupportBrowser(aURL) {
+  let frames = Services.appShell.hiddenDOMWindow.document.querySelectorAll('iframe');
+  for (let frame of frames) {
+    try {
+      let browser = frame.contentDocument.getElementById("win").querySelectorAll('browser')[0];
+      let url = browser.getAttribute("src");
+      if (url == aURL) {
+        return browser;
+      }
+    } catch (e) {
+      continue;
+    }
+  }
+  return null;
+}
+
+/**
+ * Wait for self support page to load.
+ *
+ * @param aURL The URL to look for to identify the browser.
+ *
+ * @returns {Promise} Return a promise which is resolved when SelfSupport page is fully
+ *          loaded.
+ */
+function promiseSelfSupportLoad(aURL) {
+  return new Promise((resolve, reject) => {
+    // Find the SelfSupport browser.
+    let browserPromise = waitForConditionPromise(() => !!findSelfSupportBrowser(aURL),
+                                                 "SelfSupport browser not found.",
+                                                 TEST_WAIT_RETRIES);
+
+    // Once found, append a "load" listener to catch page loads.
+    browserPromise.then(() => {
+      let browser = findSelfSupportBrowser(aURL);
+      if (browser.contentDocument.readyState === "complete") {
+        resolve(browser);
+      } else {
+        let handler = () => {
+          browser.removeEventListener("load", handler, true);
+          resolve(browser);
+        };
+        browser.addEventListener("load", handler, true);
+      }
+    }, reject);
+  });
+}
+
+/**
+ * Wait for self support to close.
+ *
+ * @param aURL The URL to look for to identify the browser.
+ *
+ * @returns {Promise} Return a promise which is resolved when SelfSupport browser cannot
+ *          be found anymore.
+ */
+function promiseSelfSupportClose(aURL) {
+  return waitForConditionPromise(() => !findSelfSupportBrowser(aURL),
+                                 "SelfSupport browser is still open.", TEST_WAIT_RETRIES);
+}
+
+/**
+ * Prepare the test environment.
+ */
+add_task(function* setupEnvironment() {
+  // We always run the SelfSupportBackend in tests to check for weird behaviours.
+  // Disable it to test its start-up.
+  SelfSupportBackend.uninit();
+
+  // Testing prefs are set via |user_pref|, so we need to get their value in order
+  // to restore them.
+  let selfSupportEnabled = Preferences.get(PREF_SELFSUPPORT_ENABLED, true);
+  let uitourEnabled = Preferences.get(PREF_UITOUR_ENABLED, false);
+  let selfSupportURL = Preferences.get(PREF_SELFSUPPORT_URL, "");
+
+  // Enable the SelfSupport backend and set the page URL. We also make sure UITour
+  // is enabled.
+  Preferences.set(PREF_SELFSUPPORT_ENABLED, true);
+  Preferences.set(PREF_UITOUR_ENABLED, true);
+  Preferences.set(PREF_SELFSUPPORT_URL, TEST_PAGE_URL);
+
+  registerCleanupFunction(() => {
+    Preferences.set(PREF_SELFSUPPORT_ENABLED, selfSupportEnabled);
+    Preferences.set(PREF_UITOUR_ENABLED, uitourEnabled);
+    Preferences.set(PREF_SELFSUPPORT_URL, selfSupportURL);
+  });
+});
+
+/**
+ * Test that the self support page can use the UITour API and close itself.
+ */
+add_task(function* test_selfSupport() {
+  // Initialise the SelfSupport backend and trigger the load.
+  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);
+
+  // Wait for the SelfSupport page to load.
+  info("Waiting for the SelfSupport local page to load.");
+  let selfSupportBrowser = yield promiseSelfSupportLoad(TEST_PAGE_URL);
+  Assert.ok(!!selfSupportBrowser, "SelfSupport browser must exist.");
+
+  // Get a reference to the UITour API.
+  info("Testing access to the UITour API.");
+  let contentWindow =
+    Cu.waiveXrays(selfSupportBrowser.contentDocument.defaultView);
+  let uitourAPI = contentWindow.Mozilla.UITour;
+
+  // Test the UITour API with a ping.
+  let pingPromise = new Promise((resolve) => {
+    uitourAPI.ping(resolve);
+  });
+  yield pingPromise;
+
+  // Close SelfSupport from content.
+  contentWindow.close();
+
+  // Wait until SelfSupport closes.
+  info("Waiting for the SelfSupport to close.");
+  yield promiseSelfSupportClose(TEST_PAGE_URL);
+
+  // Find the SelfSupport browser, again. We don't expect to find it.
+  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-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/WebappManager.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/WebappManager.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/WebappManager.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/WebappManager.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -35,6 +35,10 @@
     Services.obs.addObserver(this, "webapps-ask-uninstall", false);
     Services.obs.addObserver(this, "webapps-launch", false);
     Services.obs.addObserver(this, "webapps-uninstall", false);
+    cpmm.sendAsyncMessage("Webapps:RegisterForMessages",
+                          { messages: ["Webapps:Install:Return:OK",
+                                       "Webapps:Install:Return:KO",
+                                       "Webapps:UpdateState"]});
     cpmm.addMessageListener("Webapps:Install:Return:OK", this);
     cpmm.addMessageListener("Webapps:Install:Return:KO", this);
     cpmm.addMessageListener("Webapps:UpdateState", this);
@@ -45,6 +49,10 @@
     Services.obs.removeObserver(this, "webapps-ask-uninstall");
     Services.obs.removeObserver(this, "webapps-launch");
     Services.obs.removeObserver(this, "webapps-uninstall");
+    cpmm.sendAsyncMessage("Webapps:UnregisterForMessages",
+                          ["Webapps:Install:Return:OK",
+                           "Webapps:Install:Return:KO",
+                           "Webapps:UpdateState"]);
     cpmm.removeMessageListener("Webapps:Install:Return:OK", this);
     cpmm.removeMessageListener("Webapps:Install:Return:KO", this);
     cpmm.removeMessageListener("Webapps:UpdateState", this);
@@ -84,18 +92,18 @@
     let data = JSON.parse(aData);
     data.mm = aSubject;
 
-    let win;
+    let browser;
     switch(aTopic) {
       case "webapps-ask-install":
-        win = this._getWindowForId(data.oid);
-        if (win && win.location.href == data.from) {
-          this.doInstall(data, win);
+        browser = this._getBrowserForId(data.topId);
+        if (browser) {
+          this.doInstall(data, browser);
         }
         break;
       case "webapps-ask-uninstall":
-        win = this._getWindowForId(data.windowId);
-        if (win && win.location.href == data.from) {
-          this.doUninstall(data, win);
+        browser = this._getBrowserForId(data.topId);
+        if (browser) {
+          this.doUninstall(data, browser);
         }
         break;
       case "webapps-launch":
@@ -107,17 +115,28 @@
     }
   },
 
-  _getWindowForId: function(aId) {
-    let someWindow = Services.wm.getMostRecentWindow(null);
-    return someWindow && Services.wm.getOuterWindowWithId(aId);
+  _getBrowserForId: function(aId) {
+    let windows = Services.wm.getEnumerator("navigator:browser");
+    while (windows.hasMoreElements()) {
+      let window = windows.getNext();
+      let tabbrowser = window.gBrowser;
+      let foundBrowser = tabbrowser.getBrowserForOuterWindowID(aId);
+      if (foundBrowser) {
+        return foundBrowser;
+      }
+    }
+    let foundWindow = Services.wm.getOuterWindowWithId(aId);
+    if (foundWindow) {
+      return foundWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                        .getInterface(Ci.nsIWebNavigation)
+                        .QueryInterface(Ci.nsIDocShell)
+                        .chromeEventHandler;
+    }
+    return null;
   },
 
-  doInstall: function(aData, aWindow) {
-    let browser = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                         .getInterface(Ci.nsIWebNavigation)
-                         .QueryInterface(Ci.nsIDocShell)
-                         .chromeEventHandler;
-    let chromeDoc = browser.ownerDocument;
+  doInstall: function(aData, aBrowser) {
+    let chromeDoc = aBrowser.ownerDocument;
     let chromeWin = chromeDoc.defaultView;
     let popupProgressContent =
       chromeDoc.getElementById("webapps-install-progress-content");
@@ -135,7 +154,7 @@
         notification.remove();
 
         notification = chromeWin.PopupNotifications.
-                        show(browser,
+                        show(aBrowser,
                              "webapps-install-progress",
                              bundle.getString("webapps.install.inprogress"),
                              "webapps-notification-icon");
@@ -152,7 +171,7 @@
         this.installations[manifestURL] = Promise.defer();
         this.installations[manifestURL].promise.then(() => {
           notifyInstallSuccess(aData.app, nativeApp, bundle,
-                               PrivateBrowsingUtils.isWindowPrivate(aWindow));
+                               PrivateBrowsingUtils.isBrowserPrivate(aBrowser));
         }, (error) => {
           Cu.reportError("Error installing webapp: " + error);
         }).then(() => {
@@ -198,20 +217,41 @@
     let message = bundle.getFormattedString("webapps.requestInstall",
                                             [manifest.name, host], 2);
 
-    notification = chromeWin.PopupNotifications.show(browser,
+    let eventCallback = null;
+    let gBrowser = chromeWin.gBrowser;
+    if (gBrowser) {
+      let windowID = aData.oid;
+
+      let listener = {
+        onLocationChange(webProgress) {
+          if (webProgress.DOMWindowID == windowID) {
+            notification.remove();
+          }
+        }
+      };
+
+      gBrowser.addProgressListener(listener);
+
+      eventCallback = (event) => {
+        if (event != "removed") {
+          return;
+        }
+        // The notification was removed, so we should
+        // remove our listener.
+        gBrowser.removeProgressListener(listener);
+      }
+    }
+
+    notification = chromeWin.PopupNotifications.show(aBrowser,
                                                      "webapps-install",
                                                      message,
                                                      "webapps-notification-icon",
-                                                     mainAction);
-
+                                                     mainAction, [],
+                                                     eventCallback);
   },
 
-  doUninstall: function(aData, aWindow) {
-    let browser = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                         .getInterface(Ci.nsIWebNavigation)
-                         .QueryInterface(Ci.nsIDocShell)
-                         .chromeEventHandler;
-    let chromeDoc = browser.ownerDocument;
+  doUninstall: function(aData, aBrowser) {
+    let chromeDoc = aBrowser.ownerDocument;
     let chromeWin = chromeDoc.defaultView;
 
     let bundle = chromeWin.gNavigatorBundle;
@@ -243,10 +283,37 @@
     let message = bundle.getFormattedString("webapps.requestUninstall",
                                             [manifest.name]);
 
+
+    let eventCallback = null;
+    let gBrowser = chromeWin.gBrowser;
+    if (gBrowser) {
+      let windowID = aData.oid;
+
+      let listener = {
+        onLocationChange(webProgress) {
+          if (webProgress.DOMWindowID == windowID) {
+            notification.remove();
+          }
+        }
+      };
+
+      gBrowser.addProgressListener(listener);
+
+      eventCallback = (event) => {
+        if (event != "removed") {
+          return;
+        }
+        // The notification was removed, so we should
+        // remove our listener.
+        gBrowser.removeProgressListener(listener);
+      }
+    }
+
     notification = chromeWin.PopupNotifications.show(
-                     browser, "webapps-uninstall", message,
+                     aBrowser, "webapps-uninstall", message,
                      "webapps-notification-icon",
-                     mainAction, [secondaryAction]);
+                     mainAction, [secondaryAction],
+                     eventCallback);
   }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/WindowsPreviewPerTab.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/WindowsPreviewPerTab.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/modules/WindowsPreviewPerTab.jsm	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/modules/WindowsPreviewPerTab.jsm	2015-02-28 15:03:03.000000000 +0000
@@ -387,9 +387,7 @@
             this.onTabPaint(r);
           }
         }
-        let preview = this.preview;
-        if (preview.visible)
-          preview.invalidate();
+        this.preview.invalidate();
         break;
       case "TabAttrModified":
         this.updateTitleAndTooltip();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/linux/browser.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/linux/browser.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/linux/browser.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/linux/browser.css	2015-02-28 15:03:03.000000000 +0000
@@ -518,6 +518,11 @@
   list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
 }
 
+#menu_readingList,
+#BMB_readingList {
+  list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg");
+}
+
 #menu_openDownloads {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
   -moz-image-region: rect(0px 16px 16px 0px);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/linux/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/linux/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/linux/jar.mn	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/linux/jar.mn	2015-02-28 15:03:04.000000000 +0000
@@ -91,6 +91,8 @@
   skin/classic/browser/tab-crashed.svg                      (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/welcome-back.svg                     (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-mode-16.png             (../shared/reader/reader-mode-16.png)
+  skin/classic/browser/readinglist/readinglist-icon.svg (../shared/readinglist/readinglist-icon.svg)
+  skin/classic/browser/readinglist/sidebar.css        (../shared/readinglist/sidebar.css)
   skin/classic/browser/webRTC-shareDevice-16.png
   skin/classic/browser/webRTC-shareDevice-64.png
   skin/classic/browser/webRTC-sharingDevice-16.png    (../shared/webrtc/webRTC-sharingDevice-16.png)
@@ -174,8 +176,7 @@
 * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
 * skin/classic/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
   skin/classic/browser/preferences/in-content/favicon.ico     (../shared/incontentprefs/favicon.ico)
-  skin/classic/browser/preferences/in-content/icons.png       (../shared/incontentprefs/icons.png)
-  skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
+  skin/classic/browser/preferences/in-content/icons.svg       (../shared/incontentprefs/icons.svg)
   skin/classic/browser/preferences/in-content/search.css      (../shared/incontentprefs/search.css)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
   skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/linux/searchbar.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/linux/searchbar.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/linux/searchbar.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/linux/searchbar.css	2015-02-28 15:03:04.000000000 +0000
@@ -116,10 +116,13 @@
 
 .search-panel-current-engine {
   border-top: none !important;
-  border-bottom: 1px solid #ccc;
   -moz-box-align: center;
 }
 
+.search-panel-current-engine:not([showonlysettings]) {
+  border-bottom: 1px solid #ccc;
+}
+
 .search-panel-header {
   font-weight: normal;
   background-color: rgb(245, 245, 245);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/osx/browser.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/osx/browser.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/osx/browser.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/osx/browser.css	2015-02-28 15:03:04.000000000 +0000
@@ -563,6 +563,11 @@
   }
 }
 
+/* #menu_readingList, svg icons don't work in the mac native menubar */
+#BMB_readingList {
+  list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg");
+}
+
 /* ----- PRIMARY TOOLBAR BUTTONS ----- */
 
 toolbar .toolbarbutton-1:not([type="menu-button"]),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/osx/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/osx/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/osx/jar.mn	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/osx/jar.mn	2015-02-28 15:03:04.000000000 +0000
@@ -142,6 +142,8 @@
   skin/classic/browser/welcome-back.svg               (../shared/incontent-icons/welcome-back.svg)
   skin/classic/browser/reader-mode-16.png             (../shared/reader/reader-mode-16.png)
   skin/classic/browser/reader-mode-16@2x.png          (../shared/reader/reader-mode-16@2x.png)
+  skin/classic/browser/readinglist/readinglist-icon.svg (../shared/readinglist/readinglist-icon.svg)
+  skin/classic/browser/readinglist/sidebar.css        (../shared/readinglist/sidebar.css)
   skin/classic/browser/webRTC-shareDevice-16.png
   skin/classic/browser/webRTC-shareDevice-16@2x.png
   skin/classic/browser/webRTC-shareDevice-64.png
@@ -280,8 +282,7 @@
 * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
 * skin/classic/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
   skin/classic/browser/preferences/in-content/favicon.ico     (../shared/incontentprefs/favicon.ico)
-  skin/classic/browser/preferences/in-content/icons.png       (../shared/incontentprefs/icons.png)
-  skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
+  skin/classic/browser/preferences/in-content/icons.svg       (../shared/incontentprefs/icons.svg)
   skin/classic/browser/preferences/in-content/search.css      (../shared/incontentprefs/search.css)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/preferences/aboutPermissions.css     (preferences/aboutPermissions.css)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/osx/searchbar.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/osx/searchbar.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/osx/searchbar.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/osx/searchbar.css	2015-02-28 15:03:04.000000000 +0000
@@ -139,10 +139,13 @@
 
 .search-panel-current-engine {
   border-top: none !important;
-  border-bottom: 1px solid #ccc;
   border-radius: 4px 4px 0 0;
 }
 
+.search-panel-current-engine:not([showonlysettings]) {
+  border-bottom: 1px solid #ccc;
+}
+
 .search-panel-header {
   font-size: 10px;
   font-weight: normal;
@@ -287,10 +290,6 @@
   min-height: 32px;
 }
 
-.search-setting-button[showonlysettings] {
-  border-radius: 4px;
-}
-
 .search-setting-button[selected] {
   background-color: #d3d3d3;
   border-top-color: #bdbebe;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/animationinspector.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/animationinspector.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/animationinspector.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/animationinspector.css	2015-02-28 15:03:04.000000000 +0000
@@ -85,8 +85,7 @@
 }
 
 @media (min-resolution: 2dppx) {
-  #element-picker::before,
-  #toggle-all::before {
+  #element-picker::before {
     background-image: url("chrome://browser/skin/devtools/command-pick@2x.png");
     background-size: 64px;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/canvasdebugger.inc.css	2015-02-28 15:03:04.000000000 +0000
@@ -14,7 +14,6 @@
 
 .notice-container {
   margin-top: -50vh;
-  font-size: 120%;
   background-color: var(--theme-toolbar-background);
   color: var(--theme-body-color-alt);
 }
@@ -30,14 +29,8 @@
   display: none;
 }
 
-.theme-dark #import-notice {
-  font-size: 250%;
-  color: rgba(255,255,255,0.2);
-}
-
-.theme-light #import-notice {
-  font-size: 250%;
-  color: rgba(0,0,0,0.2);
+#waiting-notice {
+  font-size: 110%;
 }
 
 /* Snapshots pane */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/netmonitor.inc.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/netmonitor.inc.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/netmonitor.inc.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/netmonitor.inc.css	2015-02-28 15:03:04.000000000 +0000
@@ -495,9 +495,14 @@
 }
 
 .tabpanel-summary-value {
+  color: inherit;
   -moz-padding-start: 3px;
 }
 
+.theme-dark .tabpanel-summary-value {
+  color: var(--theme-selection-color);
+}
+
 /* Headers tabpanel */
 
 #headers-summary-status,
@@ -579,10 +584,6 @@
   overflow: auto;
 }
 
-#security-error-message {
-  white-space: pre-wrap;
-}
-
 .security-warning-icon {
   background-image: url(alerticon-warning.png);
   background-size: 13px 12px;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/performance.inc.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/performance.inc.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/devtools/performance.inc.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/devtools/performance.inc.css	2015-02-28 15:03:04.000000000 +0000
@@ -25,6 +25,10 @@
   -moz-border-end-color: var(--theme-splitter-color);
 }
 
+#performance-toolbar-control-other {
+  -moz-padding-end: 5px;
+}
+
 #performance-toolbar-controls-detail-views > toolbarbutton {
   min-width: 0;
 }
@@ -34,6 +38,31 @@
   -moz-padding-end: 8px;
 }
 
+#filter-button {
+  list-style-image: url(timeline-filter.svg#filter);
+  min-width: 24px;
+}
+
+#filter-button[disabled] {
+  list-style-image: url(timeline-filter.svg#filter-disabled);
+}
+
+#filter-button[open] {
+  list-style-image: url(timeline-filter.svg#filter-open);
+}
+
+#performance-filter-menupopup > menuitem:before {
+  content: "";
+  display: block;
+  width: 8px;
+  height: 8px;
+  margin: 0 8px;
+  border: 1px solid;
+  border-radius: 1px;
+  background-color: var(--bullet-bg);
+  border-color: var(--bullet-border);
+}
+
 /* Recording Notice */
 
 #performance-view .notice-container {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/drm-icon.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/drm-icon.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/drm-icon.svg	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/drm-icon.svg	2015-02-28 15:03:04.000000000 +0000
@@ -8,6 +8,9 @@
     #chains-pressed > use > path {
       fill: url(#pressedGradient);
     }
+    #chains-black > use > path {
+      fill: black;
+    }
 
     g:not(:target) {
       display: none;
@@ -43,5 +46,10 @@
     <use xlink:href="#path1"/>
     <use xlink:href="#path2"/>
     <use xlink:href="#path3"/>
+  </g>
+  <g id="chains-black">
+    <use xlink:href="#path1"/>
+    <use xlink:href="#path2"/>
+    <use xlink:href="#path3"/>
   </g>
 </svg>
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/incontentprefs/icons@2x.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/incontentprefs/icons@2x.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/incontentprefs/icons.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/incontentprefs/icons.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/incontentprefs/icons.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/incontentprefs/icons.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/incontentprefs/icons.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/incontentprefs/icons.svg	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     viewBox="0 0 24 24">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #fbfbfb;
+      stroke: rgba(0,0,0,0.4);
+      stroke-width: .5px;
+    }
+    use[id$="-native"] {
+      fill: ThreeDHighlight;
+    }
+  </style>
+  <defs style="display: none;">
+    <g id="general-shape">
+      <path
+        d="M18.97,3H5.03C3.914,3,3,3.914,3,5.03v13.94C3,20.086,3.914,21,5.03,21H18.97c1.117,0,2.03-0.914,2.03-2.03
+        V5.03C21,3.914,20.086,3,18.97,3z M5.35,19.326c-0.404,0-0.731-0.327-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731
+        c0.404,0,0.731,0.327,0.731,0.731C6.081,19,5.754,19.326,5.35,19.326z M5.35,6.168c-0.403,0-0.731-0.328-0.731-0.731
+        c0-0.404,0.328-0.731,0.731-0.731c0.403,0,0.731,0.327,0.731,0.731C6.081,5.84,5.753,6.168,5.35,6.168z M15.243,14.035
+        c0,0.229-0.186,0.416-0.414,0.416c-0.229,0-0.415,0.186-0.415,0.414v3.347c0,0.228-0.185,0.384-0.414,0.384l-4.141,0.03
+        c-0.227,0-0.414-0.186-0.414-0.414v-3.347c0-0.228-0.185-0.414-0.414-0.414c-0.227,0-0.414-0.187-0.414-0.416V6.582
+        c0-0.229,0.187-0.414,0.414-0.414h5.798c0.228,0,0.414,0.185,0.414,0.414V14.035z M18.509,19.326c-0.404,0-0.731-0.327-0.731-0.731
+        c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731C19.24,19,18.913,19.326,18.509,19.326z M18.509,6.168
+        c-0.404,0-0.731-0.328-0.731-0.731c0-0.404,0.327-0.731,0.731-0.731c0.404,0,0.731,0.327,0.731,0.731
+        C19.24,5.84,18.913,6.168,18.509,6.168z"/>
+      <path
+        d="M12.757,7.824h-1.657c-0.456,0-0.828,0.373-0.828,0.828v8.282c0,0.456,0.373,0.828,0.828,0.828h1.657
+        c0.456,0,0.828-0.373,0.828-0.828V8.652C13.586,8.196,13.213,7.824,12.757,7.824z"/>
+    </g>
+    <g id="search-shape">
+      <path
+        d="M2,10.018c0,4.43,3.585,8.019,8.009,8.019
+        c1.603,0,3.095-0.473,4.348-1.285l4.806,4.81c0.58,0.583,1.523,0.583,2.105,0l0.296-0.297c0.582-0.583,0.582-1.527,0-2.11
+        l-4.808-4.814c0.8-1.247,1.265-2.73,1.265-4.323c0-4.43-3.587-8.018-8.012-8.018C5.585,2,2,5.589,2,10.018z M5.104,10.021
+        c0-2.716,2.196-4.915,4.906-4.915c2.71,0,4.908,2.199,4.908,4.915c0,2.712-2.198,4.911-4.908,4.911
+        C7.3,14.931,5.104,12.732,5.104,10.021z"/>
+    </g>
+    <g id="content-shape">
+      <path
+        d="M16.286,2H5.571C4.388,2,3.429,2.96,3.429,4.143v15.714
+        C3.429,21.04,4.388,22,5.571,22h12.857c1.185,0,2.143-0.96,2.143-2.143V6.286L16.286,2z M18.945,19.223c0,0.22-0.18,0.4-0.4,0.4
+        h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V19.223z M18.945,15.223
+        c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2c0.22,0,0.4,0.18,0.4,0.4V15.223z
+         M18.945,11.229c0,0.22-0.18,0.4-0.4,0.4h-13.2c-0.22,0-0.4-0.18-0.4-0.4v-0.846c0-0.22,0.18-0.4,0.4-0.4h13.2
+        c0.22,0,0.4,0.18,0.4,0.4V11.229z M14.833,7.707v-4.65l4.65,4.65H14.833z"/>
+    </g>
+    <g id="applications-shape">
+      <path
+        d="M16.673,8.914C16.089,4.122,13.248,1,12,1c-1.25,0-3.986,3.122-4.767,7.914l-3.122,3.131v7.889h2.268
+        l2.978-3.436c0.28,0.29,0.737,1.666,1.065,1.858h3.155c0.331-0.193,0.789-1.569,1.068-1.858l3.123,3.436h2.12v-7.84L16.673,8.914z
+         M12.042,8.735c-0.604,0-1.279,0.06-1.818,0.165c0.478-1.453,1.345-3.117,1.781-3.117c0.435,0,1.301,1.655,1.775,3.1
+        C13.265,8.789,12.615,8.735,12.042,8.735z M12.524,19.145c0.076,0.196,0.119,0.602,0.119,0.86c0,0.66-0.524,1.074-0.687,1.074
+        c-0.163,0-0.615-0.414-0.615-1.074c0-0.257,0.045-0.664,0.119-0.86h-0.754c-0.089,0.345-0.39,1.005-0.39,1.408
+        c0,1.458,1.328,2.447,1.686,2.447c0.359,0,1.686-0.951,1.686-2.407c0-0.404-0.301-1.103-0.388-1.449H12.524z"/>
+    </g>
+    <g id="privacy-shape">
+      <path
+        d="M21.632,9.541c-0.083,1.403,0.246,3.079-1.597,5.498
+        c-1.965,2.578-3.914,2.594-4.284,2.575c-2.249-0.117-2.502-1.875-3.792-1.875c-1.13,0-2.012,1.745-3.711,1.836
+        c-0.37,0.02-2.319,0.042-4.284-2.536c-1.841-2.419-1.514-4.095-1.597-5.498C2.287,8.138,2,6.618,2,6.618s0.887,0.895,2.033,0.973
+        C5.179,7.67,5.394,7.191,7.811,6.501C10.424,5.752,12,8.814,12,8.814s1.776-3.016,4.189-2.313c2.414,0.7,2.515,1.169,3.661,1.091
+        C20.996,7.513,22,6.618,22,6.618S21.713,8.138,21.632,9.541z M8.117,10.129c-1.429-0.314-2.028,0.223-2.642,0.451
+        c-0.534,0.202-1.02,0.264-1.02,0.264s0.083,0.819,1.515,1.521c1.432,0.703,4.37,0.338,4.37,0.338S10.651,10.687,8.117,10.129z
+         M18.525,10.58c-0.612-0.228-1.212-0.765-2.642-0.451c-2.534,0.558-2.223,2.573-2.223,2.573s2.938,0.365,4.37-0.338
+        c1.432-0.702,1.515-1.521,1.515-1.521S19.059,10.782,18.525,10.58z"/>
+    </g>
+    <g id="security-shape">
+      <path
+        d="M18.909,9.783h-0.863V8.086C18.046,4.725,15.339,2,12,2
+        C8.661,2,5.954,4.725,5.954,8.086v1.697H5.091c-0.955,0-1.728,0.779-1.728,1.739v8.738c0,0.961,0.773,1.74,1.728,1.74h13.818
+        c0.954,0,1.728-0.779,1.728-1.74v-8.738C20.637,10.562,19.863,9.783,18.909,9.783z M8.545,8.086c0-1.92,1.547-3.478,3.455-3.478
+        c1.908,0,3.455,1.557,3.455,3.478v1.697h-6.91V8.086z M5.181,16.092l-0.909-1.2v-2.284l2.728,3.483H5.181z M8.818,16.092
+        l-2.773-3.657h1.727l2.864,3.657H8.818z M12,16.092l-2.773-3.657h1.727l2.864,3.657H12z M15.637,16.092l-2.773-3.657h1.727
+        l2.864,3.657H15.637z M19.728,16.092h-0.455l-2.773-3.657h1.727l1.501,1.916V16.092z"/>
+    </g>
+    <g id="sync-shape">
+      <path
+        d="M17.024,3.351 c-0.562,0.331 -1.311,0.879 -1.821,1.698 -0.367,0.592 -0.752,1.288 -1.08,1.914 0.987,0.413 1.862,1.095
+        2.476,2.029 0.614,0.957 0.929,2.122 0.83,3.351 -0.201,1.787 -1.359,3.433 -3.046,4.36 -0.696,-0.774 -1.951,-2.945
+        -1.951,-2.945 -0.007,0.007 -0.004,2.556 -0.871,4.334 -0.573,1.184 -1.24,2.202 -2.305,2.995 1.431,0.51 2.915,0.886
+        4.282,0.909 l 0.162,0.002 c 2.99,0.021 5.844,-0.48 5.844,-0.48 0,0 -1.236,-0.802 -1.808,-1.346 1.86,-1.072 3.111,-2.791
+        3.634,-4.708 0.283,-0.759 0.478,-1.566 0.57,-2.409 C 22.383,9.011 20.33,5.278 17.024,3.351 Z M 6.569,12.302 C 6.526,10.271
+        7.755,8.327 9.644,7.29 c 0.696,0.774 2.32,2.899 2.32,2.899 0,0 -0.064,-5.157 1.657,-7.973 -6.097,-0.668 -9.69,0.443
+        -9.69,0.443 0,0 1.763,0.607 2.333,1.136 C 6.122,3.891 5.984,3.992 5.85,4.096 4.4,5.064 3.368,6.449 2.825,7.994 2.436,8.892
+        2.171,9.863 2.06,10.887 1.622,14.886 3.629,18.572 6.871,20.515 7.39,20.124 7.975,19.631 8.61,18.983 9.189,18.389 9.647,17.682
+        10.021,16.967 8.082,16.208 6.714,14.404 6.569,12.302 Z"/>
+    </g>
+    <g id="advanced-shape">
+      <path
+        d="M19.173,16.163c0.004,0.04,0.007,0.08,0.007,0.121c0,1.748-3.197,3.165-7.14,3.165 c-3.943,0-7.14-1.417-7.14-3.165c0
+        -0.037,0.003-0.073,0.006-0.109C3.11,16.572,2,17.243,2,18.341C2,20.362,6.477,22,12,22 c5.523,0,10-1.638,10-3.659
+        C22,17.22,20.922,16.553,19.173,16.163z"/>
+      <path
+        d="M18.224,15.979c0.006-0.11-0.018-0.285-0.054-0.39c0,0-0.762-2.205-1.176-3.403
+        c-0.624-1.807-2.112-6.139-2.112-6.139c-0.036-0.104-0.031-0.273,0.01-0.376l0.497-1.234c0.041-0.102,0.116-0.266,0.166-0.364
+        l0.986-1.942c0.05-0.098,0.013-0.133-0.081-0.077L9.965,5.871c-0.095,0.056-0.203,0.186-0.24,0.29c0,0-0.252,0.7-0.412,1.144
+        C8.64,9.173,7.968,11.04,7.296,12.908c-0.26,0.723-0.52,1.446-0.78,2.168c-0.056,0.156-0.112,0.311-0.168,0.466
+        c-0.093,0.26-0.049,0.617,0.032,0.881c0.237,0.763,1.001,1.189,1.708,1.435c0.611,0.213,1.254,0.328,1.895,0.403
+        c0.895,0.105,1.805,0.14,2.706,0.112c1.356-0.041,2.767-0.261,4.004-0.846c0.429-0.203,0.854-0.459,1.174-0.816
+        c0.121-0.135,0.226-0.287,0.297-0.455C18.215,16.134,18.224,15.979,18.224,15.979z M14.063,16.131
+        c0.019,0.108-0.046,0.156-0.143,0.104l-1.466-0.772c-0.097-0.052-0.257-0.052-0.354,0l-1.466,0.773
+        c-0.097,0.052-0.162,0.004-0.143-0.104l0.28-1.636c0.019-0.109-0.031-0.261-0.109-0.338l-1.186-1.158
+        c-0.079-0.077-0.054-0.153,0.055-0.169l1.638-0.239c0.109-0.016,0.238-0.11,0.286-0.209l0.733-1.488
+        c0.049-0.099,0.128-0.099,0.177,0l0.733,1.488c0.049,0.099,0.178,0.193,0.286,0.209l1.639,0.239
+        c0.109,0.016,0.134,0.092,0.055,0.169l-1.186,1.158c-0.079,0.077-0.128,0.229-0.109,0.338L14.063,16.131z"/>
+    </g>
+  </defs>
+  <use id="general" xlink:href="#general-shape"/>
+  <use id="general-native" xlink:href="#general-shape"/>
+  <use id="search" xlink:href="#search-shape"/>
+  <use id="search-native" xlink:href="#search-shape"/>
+  <use id="content" xlink:href="#content-shape"/>
+  <use id="content-native" xlink:href="#content-shape"/>
+  <use id="applications" xlink:href="#applications-shape"/>
+  <use id="applications-native" xlink:href="#applications-shape"/>
+  <use id="privacy" xlink:href="#privacy-shape"/>
+  <use id="privacy-native" xlink:href="#privacy-shape"/>
+  <use id="security" xlink:href="#security-shape"/>
+  <use id="security-native" xlink:href="#security-shape"/>
+  <use id="sync" xlink:href="#sync-shape"/>
+  <use id="sync-native" xlink:href="#sync-shape"/>
+  <use id="advanced" xlink:href="#advanced-shape"/>
+  <use id="advanced-native" xlink:href="#advanced-shape"/>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/incontentprefs/preferences.inc.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/incontentprefs/preferences.inc.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/incontentprefs/preferences.inc.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/incontentprefs/preferences.inc.css	2015-02-28 15:03:04.000000000 +0000
@@ -43,78 +43,36 @@
   visibility: collapse;
 }
 
-.category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.png");
-}
-
 #category-general > .category-icon {
-  -moz-image-region: rect(0, 24px, 24px, 0);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general");
 }
 
 #category-search > .category-icon {
-  -moz-image-region: rect(0, 192px, 24px, 168px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search");
 }
 
 #category-content > .category-icon {
-  -moz-image-region: rect(0, 48px, 24px, 24px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content");
 }
 
 #category-application > .category-icon {
-  -moz-image-region: rect(0, 72px, 24px, 48px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications");
 }
 
 #category-privacy > .category-icon {
-  -moz-image-region: rect(0, 96px, 24px, 72px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy");
 }
 
 #category-security > .category-icon {
-  -moz-image-region: rect(0, 120px, 24px, 96px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security");
 }
 
 #category-sync > .category-icon {
-  -moz-image-region: rect(0, 144px, 24px, 120px);
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync");
 }
 
 #category-advanced > .category-icon {
-  -moz-image-region: rect(0, 168px, 24px, 144px);
-}
-
-@media (min-resolution: 2dppx) {
-  .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/icons@2x.png");
-  }
-
-  #category-general > .category-icon {
-    -moz-image-region: rect(0, 48px, 48px, 0);
-  }
-
-  #category-search > .category-icon {
-    -moz-image-region: rect(0, 384px, 48px, 336px);
-  }
-
-  #category-content > .category-icon {
-    -moz-image-region: rect(0, 96px, 48px, 48px);
-  }
-
-  #category-application > .category-icon {
-    -moz-image-region: rect(0, 144px, 48px, 96px);
-  }
-
-  #category-privacy > .category-icon {
-    -moz-image-region: rect(0, 192px, 48px, 144px);
-  }
-
-  #category-security > .category-icon {
-    -moz-image-region: rect(0, 240px, 48px, 192px);
-  }
-
-  #category-sync > .category-icon {
-    -moz-image-region: rect(0, 288px, 48px, 240px);
-  }
-
-  #category-advanced > .category-icon {
-    -moz-image-region: rect(0, 336px, 48px, 288px);
-  }
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced");
 }
 
 @media (max-width: 800px) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/readinglist/readinglist-icon.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/readinglist/readinglist-icon.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/readinglist/readinglist-icon.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/readinglist/readinglist-icon.svg	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
+  <rect x="4.8" y="6.4" fill="#808080" width="11.2" height="3.2"/>
+  <rect x="4.8" y="11.2" fill="#808080" width="11.2" height="3.2"/>
+  <rect x="4.8" y="1.6" fill="#808080" width="11.2" height="3.2"/>
+  <circle fill="#808080" cx="1.6" cy="3.2" r="1.6"/>
+  <circle fill="#808080" cx="1.6" cy="8" r="1.6"/>
+  <circle fill="#808080" cx="1.6" cy="12.8" r="1.6"/>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/readinglist/sidebar.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/readinglist/sidebar.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/shared/readinglist/sidebar.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/shared/readinglist/sidebar.css	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,72 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+:root, body {
+  height: 100%;
+  overflow-x: hidden;
+}
+
+body {
+  margin: 0;
+  font: message-box;
+  background: #F8F7F8;
+  color: #333333;
+  -moz-user-select: none;
+  overflow: hidden;
+}
+
+#list {
+  height: 100%;
+  overflow-x: auto;
+}
+
+.item {
+  display: flex;
+  flex-flow: row;
+  cursor: pointer;
+  padding: 6px;
+}
+
+.item.active {
+  background: #FEFEFE;
+}
+
+.item.selected {
+  background: #FDFDFD;
+}
+
+.item-thumb-container {
+  min-width: 64px;
+  max-width: 64px;
+  min-height: 40px;
+  max-height: 40px;
+  background: #EBEBEB;
+  border: 1px solid white;
+  box-shadow: 0px 1px 2px rgba(0,0,0,.35);
+  margin: 5px;
+}
+
+.item-summary-container {
+  display: flex;
+  flex-flow: column;
+  -moz-padding-start: 4px;
+  overflow: hidden;
+}
+
+.item-title {
+  overflow: hidden;
+  height: 2.8em;
+}
+
+.item-domain {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-height: 1.4em;
+  color: #0095DD;
+}
+
+.item:hover .item-domain {
+  color: #008ACB;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/browser.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/browser.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/browser.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/browser.css	2015-02-28 15:03:04.000000000 +0000
@@ -2526,6 +2526,12 @@
   -moz-image-region: auto;
 }
 
+#menu_readingList,
+#BMB_readingList {
+  list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg");
+  -moz-image-region: auto;
+}
+
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/jar.mn	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/jar.mn	2015-02-28 15:03:04.000000000 +0000
@@ -110,6 +110,8 @@
         skin/classic/browser/tab-crashed.svg                         (../shared/incontent-icons/tab-crashed.svg)
         skin/classic/browser/welcome-back.svg                        (../shared/incontent-icons/welcome-back.svg)
         skin/classic/browser/reader-mode-16.png                      (../shared/reader/reader-mode-16.png)
+        skin/classic/browser/readinglist/readinglist-icon.svg        (../shared/readinglist/readinglist-icon.svg)
+        skin/classic/browser/readinglist/sidebar.css                 (../shared/readinglist/sidebar.css)
         skin/classic/browser/notification-pluginNormal.png           (../shared/plugins/notification-pluginNormal.png)
         skin/classic/browser/notification-pluginAlert.png            (../shared/plugins/notification-pluginAlert.png)
         skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
@@ -202,8 +204,7 @@
 *       skin/classic/browser/preferences/in-content/preferences.css  (preferences/in-content/preferences.css)
 *       skin/classic/browser/preferences/in-content/dialog.css       (preferences/in-content/dialog.css)
         skin/classic/browser/preferences/in-content/favicon.ico      (../shared/incontentprefs/favicon.ico)
-        skin/classic/browser/preferences/in-content/icons.png        (../shared/incontentprefs/icons.png)
-        skin/classic/browser/preferences/in-content/icons@2x.png     (../shared/incontentprefs/icons@2x.png)
+        skin/classic/browser/preferences/in-content/icons.svg        (../shared/incontentprefs/icons.svg)
         skin/classic/browser/preferences/in-content/search.css       (../shared/incontentprefs/search.css)
         skin/classic/browser/preferences/applications.css            (preferences/applications.css)
         skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
@@ -490,7 +491,7 @@
 *       skin/classic/aero/browser/devedition.css                     (devedition-aero.css)
 *       skin/classic/aero/browser/browser-lightweightTheme.css
         skin/classic/aero/browser/click-to-play-warning-stripes.png
-*       skin/classic/aero/browser/content-contextmenu.svg
+        skin/classic/aero/browser/content-contextmenu.svg
         skin/classic/aero/browser/drm-icon.svg                       (../shared/drm-icon.svg)
 *       skin/classic/aero/browser/engineManager.css
         skin/classic/aero/browser/fullscreen-darknoise.png
@@ -576,6 +577,8 @@
         skin/classic/aero/browser/tab-crashed.svg                   (../shared/incontent-icons/tab-crashed.svg)
         skin/classic/aero/browser/welcome-back.svg                  (../shared/incontent-icons/welcome-back.svg)
         skin/classic/aero/browser/reader-mode-16.png                (../shared/reader/reader-mode-16.png)
+        skin/classic/aero/browser/readinglist/readinglist-icon.svg  (../shared/readinglist/readinglist-icon.svg)
+        skin/classic/aero/browser/readinglist/sidebar.css           (../shared/readinglist/sidebar.css)
         skin/classic/aero/browser/notification-pluginNormal.png     (../shared/plugins/notification-pluginNormal.png)
         skin/classic/aero/browser/notification-pluginAlert.png      (../shared/plugins/notification-pluginAlert.png)
         skin/classic/aero/browser/notification-pluginBlocked.png    (../shared/plugins/notification-pluginBlocked.png)
@@ -670,8 +673,7 @@
 *       skin/classic/aero/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
 *       skin/classic/aero/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
         skin/classic/aero/browser/preferences/in-content/favicon.ico     (../shared/incontentprefs/favicon.ico)
-        skin/classic/aero/browser/preferences/in-content/icons.png       (../shared/incontentprefs/icons.png)
-        skin/classic/aero/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
+        skin/classic/aero/browser/preferences/in-content/icons.svg       (../shared/incontentprefs/icons.svg)
         skin/classic/aero/browser/preferences/in-content/search.css      (../shared/incontentprefs/search.css)
         skin/classic/aero/browser/preferences/applications.css       (preferences/applications.css)
         skin/classic/aero/browser/preferences/aboutPermissions.css   (preferences/aboutPermissions.css)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/preferences/in-content/preferences.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/preferences/in-content/preferences.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/preferences/in-content/preferences.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/preferences/in-content/preferences.css	2015-02-28 15:03:04.000000000 +0000
@@ -4,6 +4,40 @@
 
 %include ../../../shared/incontentprefs/preferences.inc.css
 
+@media not all and (-moz-windows-default-theme) {
+  #category-general > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-native");
+  }
+
+  #category-search > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-native");
+  }
+
+  #category-content > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-native");
+  }
+
+  #category-application > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-native");
+  }
+
+  #category-privacy > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-native");
+  }
+
+  #category-security > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-native");
+  }
+
+  #category-sync > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-native");
+  }
+
+  #category-advanced > .category-icon {
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-native");
+  }
+}
+
 .actionsMenu > .menulist-label-box > .menulist-icon {
   -moz-margin-end: 9px;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/searchbar.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/searchbar.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/browser/themes/windows/searchbar.css	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/browser/themes/windows/searchbar.css	2015-02-28 15:03:04.000000000 +0000
@@ -128,10 +128,13 @@
 
 .search-panel-current-engine {
   border-top: none !important;
-  border-bottom: 1px solid #ccc;
   -moz-box-align: center;
 }
 
+.search-panel-current-engine:not([showonlysettings]) {
+  border-bottom: 1px solid #ccc;
+}
+
 .search-panel-header {
   font-weight: normal;
   background-color: rgb(245, 245, 245);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/automationutils.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/automationutils.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/automationutils.py	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/automationutils.py	2015-02-28 15:03:04.000000000 +0000
@@ -445,7 +445,7 @@
     self.leakedWindows = {}
     self.leakedDocShells = set()
     self.currentTest = None
-    self.seenShutdown = False
+    self.seenShutdown = set()
 
   def log(self, message):
     if message['action'] == 'log':
@@ -454,8 +454,9 @@
           self._logWindow(line)
         elif line[2:10] == "DOCSHELL":
           self._logDocShell(line)
-        elif line.startswith("TEST-START | Shutdown"):
-          self.seenShutdown = True
+        elif line.startswith("Completed ShutdownLeaks collections in process"):
+          pid = int(line.split()[-1])
+          self.seenShutdown.add(pid)
     elif message['action'] == 'test_start':
       fileName = message['test'].replace("chrome://mochitests/content/browser/", "")
       self.currentTest = {"fileName": fileName, "windows": set(), "docShells": set()}
@@ -499,7 +500,7 @@
         windows.add(key)
       else:
         windows.discard(key)
-    elif self.seenShutdown and not created:
+    elif int(pid) in self.seenShutdown and not created:
       self.leakedWindows[key] = self._parseValue(line, "url")
 
   def _logDocShell(self, line):
@@ -520,7 +521,7 @@
         docShells.add(key)
       else:
         docShells.discard(key)
-    elif self.seenShutdown and not created:
+    elif int(pid) in self.seenShutdown and not created:
       self.leakedDocShells.add(key)
 
   def _parseValue(self, line, name):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/mach_bootstrap.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/mach_bootstrap.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/mach_bootstrap.py	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/mach_bootstrap.py	2015-02-28 15:03:04.000000000 +0000
@@ -51,6 +51,7 @@
     'testing/marionette/client',
     'testing/marionette/client/marionette',
     'testing/marionette/transport',
+    'testing/marionette/driver',
     'testing/mozbase/mozcrash',
     'testing/mozbase/mozdebug',
     'testing/mozbase/mozdevice',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/Makefile.in	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/Makefile.in	2015-02-28 15:03:04.000000000 +0000
@@ -33,7 +33,7 @@
 DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)'
 endif
 
-ifdef MOZILLA_OFFICIAL
+ifdef MOZ_INCLUDE_SOURCE_INFO
 source_repo ?= $(call getSourceRepo,$(topsrcdir)/$(MOZ_BUILD_APP)/..)
 ifneq (,$(source_repo))
   DEFINES += -DMOZ_SOURCE_REPO='$(source_repo)'
@@ -42,16 +42,11 @@
 
 endif
 
-# Put a useful .gdbinit in the bin directory, to be picked up automatically
-# by GDB when we debug executables there.
 # NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
-GDBINIT_FILES := $(topsrcdir)/.gdbinit
-GDBINIT_OBJDIR_FILES = $(topsrcdir)/.gdbinit
-GDBINIT_DEST = $(FINAL_TARGET)
-
 # needs to be absolute to be distinct from $(topsrcdir)/.gdbinit
+GDBINIT_OBJDIR_FILES = $(topsrcdir)/.gdbinit
 GDBINIT_OBJDIR_DEST = $(abspath $(DEPTH))
-INSTALL_TARGETS += GDBINIT GDBINIT_OBJDIR
+INSTALL_TARGETS += GDBINIT_OBJDIR
 
 # Put a .lldbinit in the bin directory and the objdir, to be picked up
 # automatically by LLDB when we debug executables using either of those two
@@ -66,13 +61,6 @@
 LLDBINIT_FINAL_TARGET_DEST = $(FINAL_TARGET)
 INSTALL_TARGETS += LLDBINIT_FINAL_TARGET
 
-ifeq (1_1,$(MOZ_ASAN)_$(CLANG_CL))
-# Install the clang-cl runtime library for ASAN next to the binaries we produce.
-CLANG_RT_ASAN_FILES := $(MOZ_CLANG_RT_ASAN_LIB_PATH)
-CLANG_RT_ASAN_DEST = $(FINAL_TARGET)
-INSTALL_TARGETS += CLANG_RT_ASAN
-endif
-
 ifdef MOZTTDIR
 # Install the Firefox OS fonts.
 include $(MOZTTDIR)/fonts.mk
@@ -81,6 +69,19 @@
 INSTALL_TARGETS += MOZTT
 endif
 
+ifdef MOZ_VALGRIND
+_VALGRIND_DIR = $(DEPTH)/_valgrind
+GARBAGE_DIRS += $(_VALGRIND_DIR)
+
+_VALGRIND_FILES = \
+		$(topsrcdir)/build/valgrind/cross-architecture.sup \
+		$(topsrcdir)/build/valgrind/i386-redhat-linux-gnu.sup \
+		$(topsrcdir)/build/valgrind/x86_64-redhat-linux-gnu.sup \
+		$(NULL)
+_VALGRIND_DEST = $(_VALGRIND_DIR)
+INSTALL_TARGETS += _VALGRIND
+endif
+
 include $(topsrcdir)/config/rules.mk
 
 TARGET_DEPTH = ..
@@ -99,41 +100,6 @@
 
 libs:: automation.py
 
-ifdef MOZ_VALGRIND
-_VALGRIND_DIR = $(DEPTH)/_valgrind
-GARBAGE_DIRS += $(_VALGRIND_DIR)
-
-_VALGRIND_FILES = \
-		$(topsrcdir)/build/valgrind/cross-architecture.sup \
-		$(topsrcdir)/build/valgrind/i386-redhat-linux-gnu.sup \
-		$(topsrcdir)/build/valgrind/x86_64-redhat-linux-gnu.sup \
-		$(NULL)
-
-libs:: $(_VALGRIND_FILES)
-	$(INSTALL) $^ $(_VALGRIND_DIR)
-endif
-
-ifneq (,$(ENABLE_TESTS)$(MOZ_DMD))
-libs:: $(topsrcdir)/tools/rb/fix_stack_using_bpsyms.py
-	$(INSTALL) $< $(DIST)/bin
-
-ifeq ($(OS_ARCH),Darwin)
-libs:: $(topsrcdir)/tools/rb/fix_macosx_stack.py
-	$(INSTALL) $< $(DIST)/bin
-endif
-
-ifeq ($(OS_ARCH),Linux)
-libs:: $(topsrcdir)/tools/rb/fix_linux_stack.py
-	$(INSTALL) $< $(DIST)/bin
-endif
-endif # ENABLE_TESTS or MOZ_DMD
-
 ifdef ENABLE_TESTS
 GARBAGE += $(srcdir)/automationutils.pyc
 endif # ENABLE_TESTS
-
-ifdef MOZ_DMD
-libs:: $(topsrcdir)/memory/replace/dmd/dmd.py
-	$(INSTALL) $< $(DIST)/bin
-endif
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/moz-automation.mk thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/moz-automation.mk
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/moz-automation.mk	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/moz-automation.mk	2015-02-28 15:03:04.000000000 +0000
@@ -36,6 +36,7 @@
 tier_PRETTY_UPDATE_PACKAGING = pretty-update-packaging
 tier_UPLOAD_SYMBOLS = uploadsymbols
 tier_UPLOAD = upload
+tier_SDK = sdk
 
 # Automation build steps. Everything in MOZ_AUTOMATION_TIERS also gets used in
 # TIERS for mach display. As such, the MOZ_AUTOMATION_TIERS are roughly sorted
@@ -55,6 +56,7 @@
   L10N_CHECK \
   PRETTY_L10N_CHECK \
   UPLOAD \
+  SDK \
   $(NULL)
 MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$(MOZ_AUTOMATION_$(sym))),$(tier_$(sym))))
 
@@ -62,6 +64,7 @@
 automation/uploadsymbols: automation/buildsymbols
 
 automation/update-packaging: automation/package
+automation/update-packaging: automation/installer
 automation/pretty-update-packaging: automation/pretty-package
 automation/pretty-update-packaging: automation/pretty-installer
 
@@ -75,12 +78,18 @@
 automation/upload: automation/package-tests
 automation/upload: automation/buildsymbols
 automation/upload: automation/update-packaging
+automation/upload: automation/sdk
 
 # automation/{pretty-}package should depend on build (which is implicit due to
 # the way client.mk invokes automation/build), but buildsymbols changes the
 # binaries/libs, and that's what we package/test.
 automation/pretty-package: automation/buildsymbols
 
+# The installer, sdk and packager all run stage-package, and may conflict
+# with each other.
+automation/installer: automation/package
+automation/sdk: automation/installer automation/package
+
 # The 'pretty' versions of targets run before the regular ones to avoid
 # conflicts in writing to the same files.
 automation/installer: automation/pretty-installer
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/moz.build	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/moz.build	2015-02-28 15:03:04.000000000 +0000
@@ -48,3 +48,22 @@
     PYTHON_UNIT_TESTS += [
         'compare-mozconfig/compare-mozconfigs-wrapper.py',
     ]
+
+if CONFIG['ENABLE_TESTS'] or CONFIG['MOZ_DMD']:
+    tools_dir = TOPSRCDIR + '/tools/rb/'
+    FINAL_TARGET_FILES += [tools_dir + 'fix_stack_using_bpsyms.py']
+    if CONFIG['OS_ARCH'] == 'Darwin':
+        FINAL_TARGET_FILES += [tools_dir + 'fix_macosx_stack.py']
+    if CONFIG['OS_ARCH'] == 'Linux':
+        FINAL_TARGET_FILES += [tools_dir + 'fix_linux_stack.py']
+
+if CONFIG['MOZ_DMD']:
+    FINAL_TARGET_FILES += [TOPSRCDIR + '/memory/replace/dmd/dmd.py']
+
+# Put a useful .gdbinit in the bin directory, to be picked up automatically
+# by GDB when we debug executables there.
+FINAL_TARGET_FILES += [TOPSRCDIR + '/.gdbinit']
+
+# Install the clang-cl runtime library for ASAN next to the binaries we produce.
+if CONFIG['MOZ_ASAN'] and CONFIG['CLANG_CL']:
+    FINAL_TARGET_FILES += [CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/mozconfig.automation thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/mozconfig.automation
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/mozconfig.automation	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/mozconfig.automation	2015-02-28 15:03:04.000000000 +0000
@@ -17,6 +17,7 @@
 mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
+mk_add_options "export MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-0}"
 
 # If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
 # stages.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/virtualenv_packages.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/virtualenv_packages.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/build/virtualenv_packages.txt	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/build/virtualenv_packages.txt	2015-02-28 15:03:04.000000000 +0000
@@ -1,4 +1,5 @@
 marionette_transport.pth:testing/marionette/transport
+marionette_driver.pth:testing/marionette/driver
 marionette.pth:testing/marionette/client
 blessings.pth:python/blessings
 configobj.pth:python/configobj
@@ -25,3 +26,4 @@
 pyasn1.pth:python/pyasn1
 bitstring.pth:python/bitstring
 redo.pth:python/redo
+requests.pth:python/requests
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/moz.build	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/moz.build	2015-02-28 15:03:04.000000000 +0000
@@ -17,6 +17,7 @@
 EXPORTS += [
     'nsJSPrincipals.h',
     'nsNullPrincipal.h',
+    'nsNullPrincipalURI.h',
 ]
 
 UNIFIED_SOURCES += [
@@ -36,6 +37,8 @@
     '/js/xpconnect/src',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipal.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipal.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipal.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipal.cpp	2015-02-28 15:03:04.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
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -86,6 +87,24 @@
   mAppId = aAppId;
   mInMozBrowser = aInMozBrowser;
 
+  nsCString str;
+  nsresult rv = GenerateNullPrincipalURI(str);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mURI = new nsNullPrincipalURI(str);
+
+  return NS_OK;
+}
+
+void
+nsNullPrincipal::GetScriptLocation(nsACString &aStr)
+{
+  mURI->GetSpec(aStr);
+}
+
+nsresult
+nsNullPrincipal::GenerateNullPrincipalURI(nsACString &aStr)
+{
   // FIXME: bug 327161 -- make sure the uuid generator is reseeding-resistant.
   nsresult rv;
   nsCOMPtr<nsIUUIDGenerator> uuidgen =
@@ -104,28 +123,19 @@
 
   // Use an nsCString so we only do the allocation once here and then share
   // with nsJSPrincipals
-  nsCString str;
-  str.SetCapacity(prefixLen + suffixLen);
+  aStr.SetCapacity(prefixLen + suffixLen);
 
-  str.Append(NS_NULLPRINCIPAL_PREFIX);
-  str.Append(chars);
+  aStr.Append(NS_NULLPRINCIPAL_PREFIX);
+  aStr.Append(chars);
 
-  if (str.Length() != prefixLen + suffixLen) {
+  if (aStr.Length() != prefixLen + suffixLen) {
     NS_WARNING("Out of memory allocating null-principal URI");
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  mURI = new nsNullPrincipalURI(str);
-
   return NS_OK;
 }
 
-void
-nsNullPrincipal::GetScriptLocation(nsACString &aStr)
-{
-  mURI->GetSpec(aStr);
-}
-
 #ifdef DEBUG
 void nsNullPrincipal::dumpImpl()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipal.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipal.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipal.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipal.h	2015-02-28 15:03:04.000000000 +0000
@@ -31,7 +31,7 @@
 {
 public:
   nsNullPrincipal();
-  
+
   // Our refcount is managed by nsJSPrincipals.  Use this macro to avoid an
   // extra refcount member.
 
@@ -49,6 +49,8 @@
 
   virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;
 
+  static nsresult GenerateNullPrincipalURI(nsACString &aStr);
+
 #ifdef DEBUG
   virtual void dumpImpl() MOZ_OVERRIDE;
 #endif 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipalURI.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipalURI.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipalURI.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipalURI.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -9,6 +9,8 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryReporting.h"
 
+#include "mozilla/ipc/URIParams.h"
+
 #include "nsNetUtil.h"
 #include "nsEscape.h"
 #include "nsCRT.h"
@@ -18,6 +20,12 @@
 
 nsNullPrincipalURI::nsNullPrincipalURI(const nsCString &aSpec)
 {
+  InitializeFromSpec(aSpec);
+}
+
+void
+nsNullPrincipalURI::InitializeFromSpec(const nsCString &aSpec)
+{
   int32_t dividerPosition = aSpec.FindChar(':');
   NS_ASSERTION(dividerPosition != -1, "Malformed URI!");
 
@@ -44,6 +52,7 @@
   else
   NS_INTERFACE_MAP_ENTRY(nsIURI)
   NS_INTERFACE_MAP_ENTRY(nsISizeOf)
+  NS_INTERFACE_MAP_ENTRY(nsIIPCSerializableURI)
 NS_INTERFACE_MAP_END
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -273,6 +282,31 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+//// nsIIPCSerializableURI
+
+void
+nsNullPrincipalURI::Serialize(mozilla::ipc::URIParams &aParams)
+{
+  aParams = mozilla::ipc::NullPrincipalURIParams();
+}
+
+bool
+nsNullPrincipalURI::Deserialize(const mozilla::ipc::URIParams &aParams)
+{
+  if (aParams.type() != mozilla::ipc::URIParams::TNullPrincipalURIParams) {
+    MOZ_ASSERT_UNREACHABLE("unexpected URIParams type");
+    return false;
+  }
+
+  nsCString str;
+  nsresult rv = nsNullPrincipal::GenerateNullPrincipalURI(str);
+  NS_ENSURE_SUCCESS(rv, false);
+
+  InitializeFromSpec(str);
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 //// nsISizeOf
 
 size_t
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipalURI.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipalURI.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/caps/nsNullPrincipalURI.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/caps/nsNullPrincipalURI.h	2015-02-28 15:03:04.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "mozilla/Attributes.h"
+#include "nsIIPCSerializableURI.h"
 #include "mozilla/MemoryReporting.h"
 
 // {51fcd543-3b52-41f7-b91b-6b54102236e6}
@@ -25,10 +26,12 @@
 
 class nsNullPrincipalURI MOZ_FINAL : public nsIURI
                                    , public nsISizeOf
+                                   , public nsIIPCSerializableURI
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIURI
+  NS_DECL_NSIIPCSERIALIZABLEURI
 
   // nsISizeOf
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const MOZ_OVERRIDE;
@@ -36,9 +39,14 @@
 
   explicit nsNullPrincipalURI(const nsCString &aSpec);
 
+  // NB: This constructor exists only for deserialization.
+  nsNullPrincipalURI() { }
+
 private:
   ~nsNullPrincipalURI() {}
 
+  void InitializeFromSpec(const nsCString &aSpec);
+
   nsCString mScheme;
   nsCString mPath;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/chrome/nsChromeProtocolHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/chrome/nsChromeProtocolHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/chrome/nsChromeProtocolHandler.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/chrome/nsChromeProtocolHandler.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -147,20 +147,9 @@
         return rv;
     }
 
-    // Bug 1087720 (and Bug 1099296):
-    // Once all callsites have been updated to call NewChannel2() instead of NewChannel()
-    // we should have a non-null loadInfo consistently. Until then we have to branch on the
-    // loadInfo.
-    if (aLoadInfo) {
-        rv = NS_NewChannelInternal(getter_AddRefs(result),
-                                   resolvedURI,
-                                   aLoadInfo);
-    }
-    else {
-        nsCOMPtr<nsIIOService> ioServ(do_GetIOService(&rv));
-        NS_ENSURE_SUCCESS(rv, rv);
-        rv = ioServ->NewChannelFromURI(resolvedURI, getter_AddRefs(result));
-    }
+    rv = NS_NewChannelInternal(getter_AddRefs(result),
+                               resolvedURI,
+                               aLoadInfo);
     NS_ENSURE_SUCCESS(rv, rv);
 
 #ifdef DEBUG
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/CLOBBER thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/CLOBBER
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/CLOBBER	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/CLOBBER	2015-02-28 15:03:00.000000000 +0000
@@ -22,4 +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 879861 - Touch CLOBBER because adding a new IDL is a crapshoot these days.
+Merge day clobber
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/config/check_spidermonkey_style.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/config/check_spidermonkey_style.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/config/check_spidermonkey_style.py	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/config/check_spidermonkey_style.py	2015-02-28 15:03:04.000000000 +0000
@@ -67,6 +67,7 @@
     'js-config.h',              # generated in $OBJDIR
     'pratom.h',                 # NSPR
     'prcvar.h',                 # NSPR
+    'prerror.h',                # NSPR
     'prinit.h',                 # NSPR
     'prlink.h',                 # NSPR
     'prlock.h',                 # NSPR
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/config/milestone.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/config/milestone.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/config/milestone.txt	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/config/milestone.txt	2015-02-28 15:03:04.000000000 +0000
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-38.0a1
+39.0a1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/configure.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/configure.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/configure.in	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/configure.in	2015-02-28 15:03:04.000000000 +0000
@@ -2304,6 +2304,11 @@
         dnl Probably also a compiler bug, but what can you do?
         PROFILE_USE_LDFLAGS="-LTCG:PGUPDATE"
         LDFLAGS="$LDFLAGS -DYNAMICBASE"
+        if test "$_CC_MAJOR_VERSION" = "18" -a "$_CC_BUILD_VERSION" = "31101"; then
+            dnl Use MaxILKSize as a workaround for LNK1248 in VS2013update4
+            dnl See https://connect.microsoft.com/VisualStudio/feedback/details/1044914/fatal-error-lnk1248
+            LDFLAGS="$LDFLAGS -MaxILKSize:0x7FF00000"
+        fi
         dnl Minimum reqiurement of Gecko is VS2010 or later which supports
         dnl both SSSE3 and SSE4.1.
         HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1
@@ -3948,7 +3953,6 @@
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
-MOZ_ANDROID_NEW_TABLET_UI=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_PAY=
@@ -5038,14 +5042,6 @@
 fi
 
 dnl ========================================================
-dnl = Include New Tablet UI on Android
-dnl = Temporary build flag to allow development in Nightly
-dnl ========================================================
-if test -n "$MOZ_ANDROID_NEW_TABLET_UI"; then
-    AC_DEFINE(MOZ_ANDROID_NEW_TABLET_UI)
-fi
-
-dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
 MOZ_IPDL_TESTS=
@@ -8539,11 +8535,11 @@
 AC_SUBST(MOZ_ANDROID_BEAM)
 AC_SUBST(MOZ_LOCALE_SWITCHER)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
+AC_SUBST(MOZ_ANDROID_GECKOLIBS_AAR)
 AC_SUBST(MOZ_ANDROID_READING_LIST_SERVICE)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
 AC_SUBST(MOZ_ANDROID_TAB_QUEUE)
-AC_SUBST(MOZ_ANDROID_NEW_TABLET_UI)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(ENABLE_STRIP)
@@ -8694,6 +8690,13 @@
 
 AC_SUBST(MOZILLA_OFFICIAL)
 
+# Build revisions should always be present in official builds
+if test "$MOZILLA_OFFICIAL"; then
+    MOZ_INCLUDE_SOURCE_INFO=1
+fi
+
+AC_SUBST(MOZ_INCLUDE_SOURCE_INFO)
+
 AC_DEFINE_UNQUOTED(MOZ_TELEMETRY_DISPLAY_REV, 2)
 AC_SUBST(MOZ_TELEMETRY_DISPLAY_REV)
 
@@ -8889,6 +8892,7 @@
 
 AC_SUBST(MOZ_PACKAGE_JSSHELL)
 AC_SUBST(MOZ_FOLD_LIBS)
+AC_SUBST(SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE)
 
 AC_SUBST(MOZ_ENABLE_SZIP)
 AC_SUBST(MOZ_SZIP_FLAGS)
@@ -9127,6 +9131,9 @@
   # Force disable DSS support in jemalloc.
   ac_configure_args="$ac_configure_args ac_cv_func_sbrk=false"
 
+  # Make Linux builds munmap freed chunks instead of recycling them.
+  ac_configure_args="$ac_configure_args --enable-munmap"
+
   if ! test -e memory/jemalloc; then
     mkdir -p memory/jemalloc
   fi
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadContext.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadContext.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadContext.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadContext.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -11,7 +11,7 @@
 
 NS_IMPL_ISUPPORTS(LoadContext, nsILoadContext, nsIInterfaceRequestor)
 
-LoadContext::LoadContext(nsIPrincipal* aPrincipal)
+LoadContext::LoadContext(nsIPrincipal* aPrincipal, nsILoadContext* aOptionalBase)
   : mTopFrameElement(nullptr)
   , mNestedFrameId(0)
   , mIsContent(true)
@@ -24,6 +24,15 @@
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(aPrincipal->GetAppId(&mAppId)));
   MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
     aPrincipal->GetIsInBrowserElement(&mIsInBrowserElement)));
+
+  if (!aOptionalBase) {
+    return;
+  }
+
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(aOptionalBase->GetIsContent(&mIsContent)));
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(
+    aOptionalBase->GetUsePrivateBrowsing(&mUsePrivateBrowsing)));
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(aOptionalBase->GetUseRemoteTabs(&mUseRemoteTabs)));
 }
 
 //-----------------------------------------------------------------------------
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadContext.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadContext.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadContext.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadContext.h	2015-02-28 15:03:04.000000000 +0000
@@ -108,7 +108,8 @@
 
   // Constructor for creating a LoadContext with a given principal's appId and
   // browser flag.
-  explicit LoadContext(nsIPrincipal* aPrincipal);
+  explicit LoadContext(nsIPrincipal* aPrincipal,
+                       nsILoadContext* aOptionalBase = nullptr);
 
 private:
   ~LoadContext() {}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadInfo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadInfo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadInfo.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadInfo.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,163 +0,0 @@
-/* -*- 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/LoadInfo.h"
-
-#include "mozilla/Assertions.h"
-#include "nsIDocument.h"
-#include "nsIDOMDocument.h"
-#include "nsISupportsImpl.h"
-#include "nsISupportsUtils.h"
-
-namespace mozilla {
-
-LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
-                   nsIPrincipal* aTriggeringPrincipal,
-                   nsINode* aLoadingContext,
-                   nsSecurityFlags aSecurityFlags,
-                   nsContentPolicyType aContentPolicyType,
-                   nsIURI* aBaseURI)
-  : mLoadingPrincipal(aLoadingContext ?
-                        aLoadingContext->NodePrincipal() : aLoadingPrincipal)
-  , mTriggeringPrincipal(aTriggeringPrincipal ?
-                           aTriggeringPrincipal : mLoadingPrincipal.get())
-  , mLoadingContext(do_GetWeakReference(aLoadingContext))
-  , mSecurityFlags(aSecurityFlags)
-  , mContentPolicyType(aContentPolicyType)
-  , mBaseURI(aBaseURI)
-  , mInnerWindowID(aLoadingContext ?
-                     aLoadingContext->OwnerDoc()->InnerWindowID() : 0)
-{
-  MOZ_ASSERT(mLoadingPrincipal);
-  MOZ_ASSERT(mTriggeringPrincipal);
-
-  // if consumers pass both, aLoadingContext and aLoadingPrincipal
-  // then the loadingPrincipal must be the same as the node's principal
-  MOZ_ASSERT(!aLoadingContext || !aLoadingPrincipal ||
-             aLoadingContext->NodePrincipal() == aLoadingPrincipal);
-
-  // if the load is sandboxed, we can not also inherit the principal
-  if (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED) {
-    mSecurityFlags ^= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
-  }
-}
-
-LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
-                   nsIPrincipal* aTriggeringPrincipal,
-                   nsSecurityFlags aSecurityFlags,
-                   nsContentPolicyType aContentPolicyType,
-                   uint32_t aInnerWindowID)
-  : mLoadingPrincipal(aLoadingPrincipal)
-  , mTriggeringPrincipal(aTriggeringPrincipal)
-  , mSecurityFlags(aSecurityFlags)
-  , mContentPolicyType(aContentPolicyType)
-  , mInnerWindowID(aInnerWindowID)
-{
-  MOZ_ASSERT(mLoadingPrincipal);
-  MOZ_ASSERT(mTriggeringPrincipal);
-}
-
-LoadInfo::~LoadInfo()
-{
-}
-
-NS_IMPL_ISUPPORTS(LoadInfo, nsILoadInfo)
-
-NS_IMETHODIMP
-LoadInfo::GetLoadingPrincipal(nsIPrincipal** aLoadingPrincipal)
-{
-  NS_ADDREF(*aLoadingPrincipal = mLoadingPrincipal);
-  return NS_OK;
-}
-
-nsIPrincipal*
-LoadInfo::LoadingPrincipal()
-{
-  return mLoadingPrincipal;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetTriggeringPrincipal(nsIPrincipal** aTriggeringPrincipal)
-{
-  NS_ADDREF(*aTriggeringPrincipal = mTriggeringPrincipal);
-  return NS_OK;
-}
-
-nsIPrincipal*
-LoadInfo::TriggeringPrincipal()
-{
-  return mTriggeringPrincipal;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetLoadingDocument(nsIDOMDocument** aResult)
-{
-  nsCOMPtr<nsINode> node = do_QueryReferent(mLoadingContext);
-  if (node) {
-    nsCOMPtr<nsIDOMDocument> context = do_QueryInterface(node->OwnerDoc());
-    context.forget(aResult);
-  }
-  return NS_OK;
-}
-
-nsINode*
-LoadInfo::LoadingNode()
-{
-  nsCOMPtr<nsINode> node = do_QueryReferent(mLoadingContext);
-  return node;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetSecurityFlags(nsSecurityFlags* aResult)
-{
-  *aResult = mSecurityFlags;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetForceInheritPrincipal(bool* aInheritPrincipal)
-{
-  *aInheritPrincipal =
-    (mSecurityFlags & nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetLoadingSandboxed(bool* aLoadingSandboxed)
-{
-  *aLoadingSandboxed = (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetContentPolicyType(nsContentPolicyType* aResult)
-{
-  *aResult = mContentPolicyType;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetBaseURI(nsIURI** aBaseURI)
-{
-  *aBaseURI = mBaseURI;
-  NS_IF_ADDREF(*aBaseURI);
-  return NS_OK;
-}
-
-nsIURI*
-LoadInfo::BaseURI()
-{
-  return mBaseURI;
-}
-
-NS_IMETHODIMP
-LoadInfo::GetInnerWindowID(uint32_t* aResult)
-{
-  *aResult = mInnerWindowID;
-  return NS_OK;
-}
-
-} // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadInfo.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadInfo.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/LoadInfo.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/LoadInfo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/* -*- 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_LoadInfo_h
-#define mozilla_LoadInfo_h
-
-#include "nsIContentPolicy.h"
-#include "nsILoadInfo.h"
-#include "nsIPrincipal.h"
-#include "nsIWeakReferenceUtils.h" // for nsWeakPtr
-#include "nsIURI.h"
-
-class nsINode;
-
-namespace mozilla {
-
-namespace net {
-class HttpChannelParent;
-class FTPChannelParent;
-class WebSocketChannelParent;
-}
-
-/**
- * Class that provides an nsILoadInfo implementation.
- */
-class MOZ_EXPORT LoadInfo MOZ_FINAL : public nsILoadInfo
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSILOADINFO
-
-  // aLoadingPrincipal MUST NOT BE NULL.
-  LoadInfo(nsIPrincipal* aLoadingPrincipal,
-           nsIPrincipal* aTriggeringPrincipal,
-           nsINode* aLoadingContext,
-           nsSecurityFlags aSecurityFlags,
-           nsContentPolicyType aContentPolicyType,
-           nsIURI* aBaseURI = nullptr);
-
-private:
-  // private constructor that is only allowed to be called from within
-  // HttpChannelParent and FTPChannelParent declared as friends undeneath.
-  // In e10s we can not serialize nsINode, hence we store the innerWindowID.
-  LoadInfo(nsIPrincipal* aLoadingPrincipal,
-           nsIPrincipal* aTriggeringPrincipal,
-           nsSecurityFlags aSecurityFlags,
-           nsContentPolicyType aContentPolicyType,
-           uint32_t aInnerWindowID);
-
-  friend class net::HttpChannelParent;
-  friend class net::FTPChannelParent;
-  friend class net::WebSocketChannelParent;
-
-  ~LoadInfo();
-
-  nsCOMPtr<nsIPrincipal> mLoadingPrincipal;
-  nsCOMPtr<nsIPrincipal> mTriggeringPrincipal;
-  nsWeakPtr mLoadingContext;
-  nsSecurityFlags mSecurityFlags;
-  nsContentPolicyType mContentPolicyType;
-  nsCOMPtr<nsIURI> mBaseURI;
-  uint32_t mInnerWindowID;
-};
-
-} // namespace mozilla
-
-#endif // mozilla_LoadInfo_h
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/moz.build	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/moz.build	2015-02-28 15:03:04.000000000 +0000
@@ -20,7 +20,6 @@
     'nsIDownloadHistory.idl',
     'nsIGlobalHistory2.idl',
     'nsILoadContext.idl',
-    'nsILoadInfo.idl',
     'nsIPrivacyTransitionObserver.idl',
     'nsIReflowObserver.idl',
     'nsIRefreshURI.idl',
@@ -45,12 +44,10 @@
 EXPORTS.mozilla += [
     'IHistory.h',
     'LoadContext.h',
-    'LoadInfo.h',
 ]
 
 UNIFIED_SOURCES += [
     'LoadContext.cpp',
-    'LoadInfo.cpp',
     'nsAboutRedirector.cpp',
     'nsDefaultURIFixup.cpp',
     'nsDocShell.cpp',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsAboutRedirector.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsAboutRedirector.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsAboutRedirector.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsAboutRedirector.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -131,17 +131,9 @@
       nsCOMPtr<nsIURI> tempURI;
       rv = NS_NewURI(getter_AddRefs(tempURI), kRedirMap[i].url);
       NS_ENSURE_SUCCESS(rv, rv);
-      // Bug 1087720 (and Bug 1099296):
-      // Once all callsites have been updated to call NewChannel2()
-      // instead of NewChannel() we should have a non-null loadInfo
-      // consistently. Until then we have to branch on the loadInfo.
-      if (aLoadInfo) {
-        rv = NS_NewChannelInternal(getter_AddRefs(tempChannel),
-                                   tempURI,
-                                   aLoadInfo);
-      } else {
-        rv = ioService->NewChannelFromURI(tempURI, getter_AddRefs(tempChannel));
-      }
+      rv = NS_NewChannelInternal(getter_AddRefs(tempChannel),
+                                 tempURI,
+                                 aLoadInfo);
       if (NS_FAILED(rv)) {
         return rv;
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsDocShell.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsDocShell.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsDocShell.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsDocShell.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -52,6 +52,7 @@
 #include "nsIAuthPrompt2.h"
 #include "nsIChannelEventSink.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsIServiceWorkerManager.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScrollableFrame.h"
@@ -1041,6 +1042,7 @@
   NS_INTERFACE_MAP_ENTRY(nsILinkHandler)
   NS_INTERFACE_MAP_ENTRY(nsIClipboardCommands)
   NS_INTERFACE_MAP_ENTRY(nsIDOMStorageManager)
+  NS_INTERFACE_MAP_ENTRY(nsINetworkInterceptController)
 NS_INTERFACE_MAP_END_INHERITING(nsDocLoader)
 
 ///*****************************************************************************
@@ -4973,8 +4975,15 @@
     }
     tsi = do_QueryInterface(securityInfo);
     if (tsi) {
-      // Usually we should have aFailedChannel and get a detailed message
-      tsi->GetErrorMessage(getter_Copies(messageStr));
+      uint32_t securityState;
+      tsi->GetSecurityState(&securityState);
+      if (securityState & nsIWebProgressListener::STATE_USES_SSL_3) {
+        error.AssignLiteral("sslv3Used");
+        addHostPort = true;
+      } else {
+        // Usually we should have aFailedChannel and get a detailed message
+        tsi->GetErrorMessage(getter_Copies(messageStr));
+      }
     } else {
       // No channel, let's obtain the generic error message
       if (nsserr) {
@@ -7920,7 +7929,7 @@
   mFiredUnloadEvent = false;
 
   nsCOMPtr<nsIDocumentLoaderFactory> docFactory =
-    nsContentUtils::FindInternalContentViewer("text/html");
+    nsContentUtils::FindInternalContentViewer(NS_LITERAL_CSTRING("text/html"));
 
   if (docFactory) {
     nsCOMPtr<nsIPrincipal> principal;
@@ -8878,7 +8887,7 @@
 }
 
 nsresult
-nsDocShell::CreateContentViewer(const char* aContentType,
+nsDocShell::CreateContentViewer(const nsACString& aContentType,
                                 nsIRequest* aRequest,
                                 nsIStreamListener** aContentHandler)
 {
@@ -9074,7 +9083,7 @@
 }
 
 nsresult
-nsDocShell::NewContentViewerObj(const char* aContentType,
+nsDocShell::NewContentViewerObj(const nsACString& aContentType,
                                 nsIRequest* aRequest, nsILoadGroup* aLoadGroup,
                                 nsIStreamListener** aContentHandler,
                                 nsIContentViewer** aViewer)
@@ -13809,10 +13818,6 @@
 NS_IMETHODIMP
 nsDocShell::GetAsyncPanZoomEnabled(bool* aOut)
 {
-  if (TabChild* tabChild = TabChild::GetFrom(this)) {
-    *aOut = tabChild->IsAsyncPanZoomEnabled();
-    return NS_OK;
-  }
   *aOut = Preferences::GetBool("layers.async-pan-zoom.enabled", false);
   return NS_OK;
 }
@@ -13922,6 +13927,52 @@
 }
 
 NS_IMETHODIMP
+nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNavigate, bool* aShouldIntercept)
+{
+  *aShouldIntercept = false;
+  nsCOMPtr<nsIServiceWorkerManager> swm = mozilla::services::GetServiceWorkerManager();
+  if (!swm) {
+    return NS_OK;
+  }
+
+  if (aIsNavigate) {
+    return swm->IsAvailableForURI(aURI, aShouldIntercept);
+  }
+
+  nsCOMPtr<nsIDocument> doc = GetDocument();
+  if (!doc) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  return swm->IsControlled(doc, aShouldIntercept);
+}
+
+NS_IMETHODIMP
+nsDocShell::ChannelIntercepted(nsIInterceptedChannel* aChannel)
+{
+  nsCOMPtr<nsIServiceWorkerManager> swm = mozilla::services::GetServiceWorkerManager();
+  if (!swm) {
+    aChannel->Cancel();
+    return NS_OK;
+  }
+
+  bool isNavigation = false;
+  nsresult rv = aChannel->GetIsNavigation(&isNavigation);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIDocument> doc;
+
+  if (!isNavigation) {
+    doc = GetDocument();
+    if (!doc) {
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+  }
+
+  return swm->DispatchFetchEvent(doc, aChannel);
+}
+
+NS_IMETHODIMP
 nsDocShell::SetPaymentRequestId(const nsAString& aPaymentRequestId)
 {
   mPaymentRequestId = aPaymentRequestId;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsDocShell.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsDocShell.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsDocShell.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsDocShell.h	2015-02-28 15:03:04.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIBaseWindow.h"
+#include "nsINetworkInterceptController.h"
 #include "nsIScrollable.h"
 #include "nsITextScroll.h"
 #include "nsIContentViewerContainer.h"
@@ -152,6 +153,7 @@
   , public nsILinkHandler
   , public nsIClipboardCommands
   , public nsIDOMStorageManager
+  , public nsINetworkInterceptController
   , public mozilla::SupportsWeakPtr<nsDocShell>
 {
   friend class nsDSURIContentListener;
@@ -182,6 +184,7 @@
   NS_DECL_NSIAUTHPROMPTPROVIDER
   NS_DECL_NSICLIPBOARDCOMMANDS
   NS_DECL_NSIWEBSHELLSERVICES
+  NS_DECL_NSINETWORKINTERCEPTCONTROLLER
   NS_FORWARD_SAFE_NSIDOMSTORAGEMANAGER(TopSessionStorageManager())
 
   NS_IMETHOD Stop() MOZ_OVERRIDE {
@@ -287,10 +290,10 @@
   nsresult CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal,
                                          nsIURI* aBaseURI,
                                          bool aTryToSaveOldPresentation = true);
-  nsresult CreateContentViewer(const char* aContentType,
+  nsresult CreateContentViewer(const nsACString& aContentType,
                                nsIRequest* aRequest,
                                nsIStreamListener** aContentHandler);
-  nsresult NewContentViewerObj(const char* aContentType,
+  nsresult NewContentViewerObj(const nsACString& aContentType,
                                nsIRequest* aRequest, nsILoadGroup* aLoadGroup,
                                nsIStreamListener** aContentHandler,
                                nsIContentViewer** aViewer);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsDSURIContentListener.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsDSURIContentListener.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsDSURIContentListener.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsDSURIContentListener.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -87,7 +87,7 @@
 }
 
 NS_IMETHODIMP
-nsDSURIContentListener::DoContent(const char* aContentType,
+nsDSURIContentListener::DoContent(const nsACString& aContentType,
                                   bool aIsContentPreferred,
                                   nsIRequest* aRequest,
                                   nsIStreamListener** aContentHandler,
@@ -131,7 +131,7 @@
   }
 
   bool reuseCV = baseChannel && baseChannel == mExistingJPEGRequest &&
-                 nsDependentCString(aContentType).EqualsLiteral("image/jpeg");
+                 aContentType.EqualsLiteral("image/jpeg");
 
   if (mExistingJPEGStreamListener && reuseCV) {
     nsRefPtr<nsIStreamListener> copy(mExistingJPEGStreamListener);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsIDocumentLoaderFactory.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsIDocumentLoaderFactory.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsIDocumentLoaderFactory.idl	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsIDocumentLoaderFactory.idl	2015-02-28 15:03:04.000000000 +0000
@@ -22,12 +22,12 @@
  * The component is a service, so use GetService, not CreateInstance to get it.
  */
 
-[scriptable, uuid(70905274-8494-4e39-b011-d559adde3733)]
+[scriptable, uuid(e795239e-9d3c-47c4-b063-9e600fb3b287)]
 interface nsIDocumentLoaderFactory : nsISupports {
     nsIContentViewer createInstance(in string aCommand,
                               in nsIChannel aChannel,
                               in nsILoadGroup aLoadGroup,
-                              in string aContentType, 
+                              in ACString aContentType, 
                               in nsIDocShell aContainer,
                               in nsISupports aExtraInfo,
                               out nsIStreamListener aDocListenerResult);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsILoadInfo.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsILoadInfo.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsILoadInfo.idl	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsILoadInfo.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,203 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: ft=cpp tw=78 sw=2 et ts=2 sts=2 cin
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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"
-#include "nsIContentPolicy.idl"
-
-interface nsIDOMDocument;
-interface nsINode;
-interface nsIPrincipal;
-interface nsIURI;
-
-typedef unsigned long nsSecurityFlags;
-
-/**
- * An nsILoadOwner represents per-load information about who started the load.
- */
-[scriptable, builtinclass, uuid(768a1f20-57d4-462a-812a-41c04e5d1e19)]
-interface nsILoadInfo : nsISupports
-{
-  /**
-   * No special security flags:
-   */
-  const unsigned long SEC_NORMAL = 0;
-
-  /**
-   * Force inheriting of the Principal. The resulting resource will use the
-   * principal of the document which is doing the load. Setting this flag
-   * will cause GetChannelResultPrincipal to return the same principal as
-   * the loading principal that's passed in when creating the channel.
-   *
-   * This will happen independently of the scheme of the URI that the
-   * channel is loading.
-   *
-   * So if the loading document comes from "http://a.com/", and the channel
-   * is loading the URI "http://b.com/whatever", GetChannelResultPrincipal
-   * will return a principal from "http://a.com/".
-   *
-   * This flag can not be used together with SEC_SANDBOXED.
-   */
-  const unsigned long SEC_FORCE_INHERIT_PRINCIPAL = 0x01;
-
-  /**
-   * Sandbox the load. The resulting resource will use a freshly created
-   * null principal. So GetChannelResultPrincipal will always return a
-   * null principal whenever this flag is set.
-   *
-   * This will happen independently of the scheme of the URI that the
-   * channel is loading.
-   *
-   * This flag can not be used together with SEC_FORCE_INHERIT_PRINCIPAL.
-   */
-  const unsigned long SEC_SANDBOXED = 0x02;
-
-  /**
-   * The loadingPrincipal is the principal that is responsible for the load.
-   * It is *NOT* the principal tied to the resource/URI that this
-   * channel is loading, it's the principal of the resource's
-   * caller or requester. For example, if this channel is loading
-   * an image from http://b.com that is embedded in a document
-   * who's origin is http://a.com, the loadingPrincipal is http://a.com.
-   *
-   * The loadingPrincipal will never be null.
-   */
-  readonly attribute nsIPrincipal loadingPrincipal;
-
-  /**
-   * A C++-friendly version of loadingPrincipal.
-   */
-  [noscript, notxpcom, nostdcall, binaryname(LoadingPrincipal)]
-  nsIPrincipal binaryLoadingPrincipal();
-
-  /**
-   * The triggeringPrincipal is the principal that triggerd the load.
-   * Most likely the triggeringPrincipal and the loadingPrincipal are the same,
-   * in which case triggeringPrincipal returns the loadingPrincipal.
-   * In some cases the loadingPrincipal and the triggeringPrincipal are different
-   * however, e.g. a stylesheet may import a subresource. In that case the
-   * stylesheet principal is the triggeringPrincipal and the document that loads
-   * the stylesheet provides a loadingContext and hence the loadingPrincipal.
-   *
-   * If triggeringPrincipal and loadingPrincipal are the same, then
-   * triggeringPrincipal returns loadingPrincipal.
-   */
-  readonly attribute nsIPrincipal triggeringPrincipal;
-
-  /**
-   * A C++-friendly version of triggeringPrincipal.
-   */
-  [noscript, notxpcom, nostdcall, binaryname(TriggeringPrincipal)]
-  nsIPrincipal binaryTriggeringPrincipal();
-
-  /**
-   * The loadingDocument of the channel.
-   *
-   * The loadingDocument of a channel is the document that requested the
-   * load of the resource. It is *not* the resource itself, it's the
-   * resource's caller or requester in which the load is happening.
-   *
-   * <script> example: Assume a document who's origin is http://a.com embeds
-   * a script from http://b.com. The loadingDocument for the channel
-   * associated with the http://b.com script load is the document with origin
-   * http://a.com
-   *
-   * <iframe> example: Assume a document with origin http://a.com embeds
-   * <iframe src="http://b.com">. The loadingDocument for the channel associated
-   * with the http://b.com network request is the document who's origin is
-   * http://a.com. Now assume the iframe to http://b.com then further embeds
-   * <script src="http://c.com">. The loadingDocument for the channel associated
-   * with the http://c.com network request is the iframe with origin http://b.com.
-   *
-   * Warning: The loadingDocument can be null!
-   */
-  readonly attribute nsIDOMDocument loadingDocument;
-
-  /**
-   * A C++-friendly version of loadingDocument (loadingNode).
-   * This is the node most proximally responsible for the load.
-   */
-  [noscript, notxpcom, nostdcall, binaryname(LoadingNode)]
-  nsINode binaryLoadingNode();
-
-  /**
-   * The securityFlags of that channel.
-   */
-  readonly attribute nsSecurityFlags securityFlags;
-
-%{ C++
-  inline nsSecurityFlags GetSecurityFlags()
-  {
-    nsSecurityFlags result;
-    mozilla::DebugOnly<nsresult> rv = GetSecurityFlags(&result);
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-    return result;
-  }
-%}
-
-  /**
-   * If forceInheritPrincipal is true, the data coming from the channel should
-   * use loadingPrincipal for its principal, even when the data is loaded over
-   * http:// or another protocol that would normally use a URI-based principal.
-   * This attribute will never be true when loadingSandboxed is true.
-   */
-  [infallible] readonly attribute boolean forceInheritPrincipal;
-
-  /**
-   * If loadingSandboxed is true, the data coming from the channel is
-   * being loaded sandboxed, so it should have a nonce origin and
-   * hence should use a NullPrincipal.
-   */
-  [infallible] readonly attribute boolean loadingSandboxed;
-
-  /**
-   * The contentPolicyType of the channel, used for security checks
-   * like Mixed Content Blocking and Content Security Policy.
-   */
-  readonly attribute nsContentPolicyType contentPolicyType;
-
-%{ C++
-  inline nsContentPolicyType GetContentPolicyType()
-  {
-    nsContentPolicyType result;
-    mozilla::DebugOnly<nsresult> rv = GetContentPolicyType(&result);
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-    return result;
-  }
-%}
-
-  /**
-   * A base URI for use in situations where it cannot otherwise be inferred.
-   * This attribute may be null.  The value of this attribute may be
-   * ignored if the base URI can be inferred by the channel's URI.
-   */
-  readonly attribute nsIURI baseURI;
-
-  /**
-   * A C++-friendly version of baseURI.
-   */
-  [noscript, notxpcom, nostdcall, binaryname(BaseURI)]
-  nsIURI binaryBaseURI();
-
-  /**
-   * The innerWindowId of the loadingDocument, used to identify
-   * the loadingDocument in e10s where the loadingDocument is
-   * not available.
-   *
-   * Warning: If the loadingDocument is null, then the
-   * innerWindowId is 0.
-   */
-  readonly attribute unsigned long innerWindowID;
-
-%{ C++
-  inline uint32_t GetInnerWindowID()
-  {
-    uint32_t result;
-    mozilla::DebugOnly<nsresult> rv = GetInnerWindowID(&result);
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-    return result;
-  }
-%}
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsWebNavigationInfo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsWebNavigationInfo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/base/nsWebNavigationInfo.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/base/nsWebNavigationInfo.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -89,7 +89,7 @@
   nsContentUtils::ContentViewerType vtype = nsContentUtils::TYPE_UNSUPPORTED;
 
   nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
-    nsContentUtils::FindInternalContentViewer(aType.get(), &vtype);
+    nsContentUtils::FindInternalContentViewer(aType, &vtype);
 
   switch (vtype) {
     case nsContentUtils::TYPE_UNSUPPORTED:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/browser/browser_bug422543.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/browser/browser_bug422543.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/browser/browser_bug422543.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/browser/browser_bug422543.js	2015-02-28 15:03:04.000000000 +0000
@@ -127,7 +127,7 @@
 function setup(aCallback) {
   let tab = gBrowser.selectedTab = gBrowser.addTab("about:mozilla");
   let browser = tab.linkedBrowser;
-  registerCleanupFunction(function () gBrowser.removeTab(tab));
+  registerCleanupFunction(function () { gBrowser.removeTab(tab); });
 
   whenPageShown(browser, function () {
     gFirstListener = new SHistoryListener();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/browser/browser_bug670318.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/browser/browser_bug670318.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/browser/browser_bug670318.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/browser/browser_bug670318.js	2015-02-28 15:03:04.000000000 +0000
@@ -28,18 +28,18 @@
         history.removeSHistoryListener(listener);
         historyListenerRemoved = true;
 
-        executeSoon(function () BrowserReload());
+        executeSoon(function () { BrowserReload(); });
       }
 
       return true;
     },
 
-    OnHistoryReload: function () true,
-    OnHistoryGoBack: function () true,
-    OnHistoryGoForward: function () true,
-    OnHistoryGotoIndex: function () true,
-    OnHistoryPurge: function () true,
-    OnHistoryReplaceEntry: function () true,
+    OnHistoryReload: () => true,
+    OnHistoryGoBack: () => true,
+    OnHistoryGoForward: () => true,
+    OnHistoryGotoIndex: () => true,
+    OnHistoryPurge: () => true,
+    OnHistoryReplaceEntry: () => true,
 
     QueryInterface: XPCOMUtils.generateQI([Ci.nsISHistoryListener,
                                            Ci.nsISupportsWeakReference])
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/navigation/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/navigation/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/navigation/mochitest.ini	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/navigation/mochitest.ini	2015-02-28 15:03:04.000000000 +0000
@@ -22,9 +22,9 @@
   parent.html
 
 [test_bug13871.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #RANDOM
+skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' || e10s #RANDOM # Bug 1136180 disabled on B2G Desktop and Mulet for intermittent failures
 [test_bug270414.html]
-skip-if = buildapp == 'b2g' || toolkit == "android" || e10s
+skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == "android" || e10s # Bug 1136180 disabled on B2G Desktop and Mulet for intermittent failures
 [test_bug278916.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug279495.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/navigation/test_bug386782.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/navigation/test_bug386782.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/navigation/test_bug386782.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/navigation/test_bug386782.html	2015-02-28 15:03:04.000000000 +0000
@@ -23,7 +23,7 @@
         // <html><body><p>designModeDocument</p></body></html>
         url: "data:text/html;charset=utf-8,<html><body><p>designModeDocument</p></body></html>",
         name: 'designModeNavigate',
-        onload: function(doc) doc.designMode = "on",
+        onload(doc) { doc.designMode = "on"; },
         expectedBodyBeforeEdit: '<p>designModeDocument</p>',
         expectedBodyAfterEdit:  '<p>EDITED designModeDocument</p>',
         expectedBodyAfterSecondEdit: '<p>EDITED TWICE designModeDocument</p>',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/navigation/test_bug430723.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/navigation/test_bug430723.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/docshell/test/navigation/test_bug430723.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/docshell/test/navigation/test_bug430723.html	2015-02-28 15:03:04.000000000 +0000
@@ -37,7 +37,6 @@
 // <p>This is a very tall blue box.</p>
 // </div></body></html>
 
-
 window.onload = runTest;
 
 var testWindow;
@@ -45,8 +44,9 @@
 
 var smoothScrollPref = "general.smoothScroll";
 function runTest() {
-  SpecialPowers.setBoolPref(smoothScrollPref, false);
-  testWindow = window.open(gTallRedBoxURI, "testWindow", "width=300,height=300,location=yes,scrollbars=yes");
+  SpecialPowers.pushPrefEnv({"set":[[smoothScrollPref, false]]}, function(){
+    testWindow = window.open(gTallRedBoxURI, "testWindow", "width=300,height=300,location=yes,scrollbars=yes");
+  });
 }
 
 var nextTest =function() {
@@ -124,7 +124,6 @@
           "Page2Again: Ensure we can still scroll.");  
 
     testWindow.close();
-    SpecialPowers.clearUserPref(smoothScrollPref);
     window.SimpleTest.finish();
   }, true);
   sendKey('DOWN', testWindow);
@@ -137,4 +136,3 @@
 </pre>
 </body>
 </html>
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/AnimationPlayer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/AnimationPlayer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/AnimationPlayer.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/AnimationPlayer.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -31,6 +31,52 @@
   return dom::AnimationPlayerBinding::Wrap(aCx, this);
 }
 
+void
+AnimationPlayer::SetStartTime(const Nullable<TimeDuration>& aNewStartTime)
+{
+#if 1
+  // Bug 1096776: once we support inactive/missing timelines we'll want to take
+  // the disabled branch.
+  MOZ_ASSERT(mTimeline && !mTimeline->GetCurrentTime().IsNull(),
+             "We don't support inactive/missing timelines yet");
+#else
+  Nullable<TimeDuration> timelineTime = mTimeline->GetCurrentTime();
+  if (mTimeline) {
+    // The spec says to check if the timeline is active (has a resolved time)
+    // before using it here, but we don't need to since it's harmless to set
+    // the already null time to null.
+    timelineTime = mTimeline->GetCurrentTime();
+  }
+  if (timelineTime.IsNull() && !aNewStartTime.IsNull()) {
+    mHoldTime.SetNull();
+  }
+#endif
+  Nullable<TimeDuration> previousCurrentTime = GetCurrentTime();
+  mStartTime = aNewStartTime;
+  if (!aNewStartTime.IsNull()) {
+    // Until bug 1127380 (playbackRate) is implemented, the rate is essentially
+    // one. Once that bug is fixed we should only SetNull() if the rate is not
+    // zero.
+    mHoldTime.SetNull();
+  } else {
+    mHoldTime = previousCurrentTime;
+  }
+
+  CancelPendingPlay();
+  if (mReady) {
+    // We may have already resolved mReady, but in that case calling
+    // MaybeResolve is a no-op, so that's okay.
+    mReady->MaybeResolve(this);
+  }
+
+  UpdateSourceContent();
+  PostUpdate();
+
+  // FIXME: Once bug 1074630 is fixed, run the procedure to update a player's
+  // finished state for player:
+  // http://w3c.github.io/web-animations/#update-a-players-finished-state
+}
+
 Nullable<TimeDuration>
 AnimationPlayer::GetCurrentTime() const
 {
@@ -112,6 +158,12 @@
   return AnimationUtils::TimeDurationToDouble(mStartTime);
 }
 
+void
+AnimationPlayer::SetStartTimeAsDouble(const Nullable<double>& aStartTime)
+{
+  return SetStartTime(AnimationUtils::DoubleToTimeDuration(aStartTime));
+}
+  
 Nullable<double>
 AnimationPlayer::GetCurrentTimeAsDouble() const
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/AnimationPlayer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/AnimationPlayer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/AnimationPlayer.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/AnimationPlayer.h	2015-02-28 15:03:05.000000000 +0000
@@ -72,6 +72,7 @@
   Animation* GetSource() const { return mSource; }
   AnimationTimeline* Timeline() const { return mTimeline; }
   Nullable<TimeDuration> GetStartTime() const { return mStartTime; }
+  void SetStartTime(const Nullable<TimeDuration>& aNewStartTime);
   Nullable<TimeDuration> GetCurrentTime() const;
   AnimationPlayState PlayState() const;
   virtual Promise* GetReady(ErrorResult& aRv);
@@ -84,6 +85,7 @@
   // script but when called from script we (or one of our subclasses) perform
   // extra steps such as flushing style or converting the return type.
   Nullable<double> GetStartTimeAsDouble() const;
+  void SetStartTimeAsDouble(const Nullable<double>& aStartTime);
   Nullable<double> GetCurrentTimeAsDouble() const;
   virtual AnimationPlayState PlayStateFromJS() const { return PlayState(); }
   virtual void PlayFromJS() { Play(); }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/AnimationUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/AnimationUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/AnimationUtils.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/AnimationUtils.h	2015-02-28 15:03:05.000000000 +0000
@@ -26,6 +26,18 @@
 
     return result;
   }
+
+  static Nullable<TimeDuration>
+    DoubleToTimeDuration(const Nullable<double>& aTime)
+  {
+    Nullable<TimeDuration> result;
+
+    if (!aTime.IsNull()) {
+      result.SetValue(TimeDuration::FromMilliseconds(aTime.Value()));
+    }
+
+    return result;
+  }
 };
 
 } // namespace dom
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/test/css-animations/test_animation-player-starttime.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/test/css-animations/test_animation-player-starttime.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/test/css-animations/test_animation-player-starttime.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/test/css-animations/test_animation-player-starttime.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,554 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Tests for the effect of setting a CSS animation's AnimationPlayer.startTime</title>
+    <style>
+
+.animated-div {
+  margin-left: 10px;
+  /* Make it easier to calculate expected values: */
+  animation-timing-function: linear ! important;
+}
+
+@keyframes anim {
+  from { margin-left: 100px; }
+  to { margin-left: 200px; }
+}
+
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script type="text/javascript;version=1.8">
+
+'use strict';
+
+// TODO: add equivalent tests without an animation-delay, but first we need to
+// change the timing of animationstart dispatch. (Right now the animationstart
+// event will fire before the ready Promise is resolved if there is no
+// animation-delay.)
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=1134163
+
+// TODO: Once the computedTiming property is implemented, add checks to the
+// checker helpers to ensure that computedTiming's properties are updated as
+// expected.
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=1108055
+
+
+const CSS_ANIM_EVENTS = ['animationstart', 'animationiteration', 'animationend'];
+const ANIM_DELAY_MS = 1000000; // 1000s
+const ANIM_DUR_MS = 1000000; // 1000s
+
+// Expected computed 'margin-left' values at points during the active interval:
+// When we assert_between_inclusive using these values we could in theory cause
+// intermittent failure due to long refresh driver delays, but since the active
+// duration is 1000s long, a delay would need to be around 100s to cause that.
+// If that's happening than we have issues that we should solve anyway, so a
+// failure to make us look into that seems like a good thing.
+const UNANIMATED_POSITION = 10;
+const INITIAL_POSITION = 100;
+const TEN_PCT_POSITION = 110;
+const FIFTY_PCT_POSITION = 150;
+const NINETY_PCT_POSITION = 190;
+const END_POSITION = 200;
+
+function addDiv(id)
+{
+  var div = document.createElement('div');
+  div.setAttribute('class', 'animated-div');
+  if (id) {
+    div.setAttribute('id', id);
+  }
+  document.body.appendChild(div);
+  return div;
+}
+
+/**
+ * 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_true(false) 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_true(false, 'Not expecting event, but got: ' + evt.type +
+        ' targeting element #' + evt.target.getAttribute('id'));
+      return;
+    }
+    if (evt.type != waitingFor.types[0]) {
+      assert_true(false, '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 (let event of eventTypes) {
+    watchedNode.addEventListener(event, 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 (let event of eventTypes) {
+      watchedNode.removeEventListener(event, 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:
+//
+//   http://w3c.github.io/web-animations/#animation-node-phases-and-states
+//
+// Note the distinction between "player start time" and "animation start time".
+// The former is the start of the start delay. The latter is the start of the
+// active interval. (If there is no delay, they are the same.)
+
+// Called when startTime is set to the time the start delay would ideally
+// start (not accounting for any delay to next paint tick).
+function checkStateOnSettingStartTimeToAnimationCreationTime(player)
+{
+  // We don't test player.startTime since our caller just set it.
+
+  assert_equals(player.playState, 'running',
+    'AnimationPlayer.playState should be "running" at the start of ' +
+    'the start delay');
+
+  assert_equals(player.source.target.style.animationPlayState, 'running',
+    'AnimationPlayer.source.target.style.animationPlayState should be ' +
+    '"running" at the start of the start delay');
+
+  var div = player.source.target;
+  var marginLeft = parseFloat(getComputedStyle(div).marginLeft);
+  assert_equals(marginLeft, UNANIMATED_POSITION,
+                'the computed value of margin-left should be unaffected ' +
+                'at the beginning of the start delay');
+}
+
+// Called when the ready Promise's callbacks should happen
+function checkStateOnReadyPromiseResolved(player)
+{
+  assert_less_than_equal(player.startTime, document.timeline.currentTime,
+    'AnimationPlayer.startTime should be less than the timeline\'s ' +
+    'currentTime on the first paint tick after animation creation');
+
+  assert_equals(player.playState, 'running',
+    'AnimationPlayer.playState should be "running" on the first paint ' +
+    'tick after animation creation');
+
+  assert_equals(player.source.target.style.animationPlayState, 'running',
+    'AnimationPlayer.source.target.style.animationPlayState should be ' +
+    '"running" on the first paint tick after animation creation');
+
+  var div = player.source.target;
+  var marginLeft = parseFloat(getComputedStyle(div).marginLeft);
+  assert_equals(marginLeft, UNANIMATED_POSITION,
+                'the computed value of margin-left should be unaffected ' +
+                'by an animation with a delay on ready Promise resolve');
+}
+
+// Called when startTime is set to the time the active interval starts.
+function checkStateAtActiveIntervalStartTime(player)
+{
+  // We don't test player.startTime since our caller just set it.
+
+  assert_equals(player.playState, 'running',
+    'AnimationPlayer.playState should be "running" at the start of ' +
+    'the active interval');
+
+  assert_equals(player.source.target.style.animationPlayState, 'running',
+    'AnimationPlayer.source.target.style.animationPlayState should be ' +
+    '"running" at the start of the active interval');
+
+  var div = player.source.target;
+  var marginLeft = parseFloat(getComputedStyle(div).marginLeft);
+  assert_between_inclusive(marginLeft, INITIAL_POSITION, TEN_PCT_POSITION,
+    'the computed value of margin-left should be close to the value at the ' +
+    'beginning of the animation');
+}
+
+function checkStateAtFiftyPctOfActiveInterval(player)
+{
+  // We don't test player.startTime since our caller just set it.
+
+  var div = player.source.target;
+  var marginLeft = parseFloat(getComputedStyle(div).marginLeft);
+  assert_equals(marginLeft, FIFTY_PCT_POSITION,
+    'the computed value of margin-left should be half way through the ' +
+    'animation at the midpoint of the active interval');
+}
+
+function checkStateAtNinetyPctOfActiveInterval(player)
+{
+  // We don't test player.startTime since our caller just set it.
+
+  var div = player.source.target;
+  var marginLeft = parseFloat(getComputedStyle(div).marginLeft);
+  assert_between_inclusive(marginLeft, NINETY_PCT_POSITION, END_POSITION,
+    'the computed value of margin-left should be close to the value at the ' +
+    'end of the animation');
+}
+
+// Called when startTime is set to the time the active interval ends.
+function checkStateAtActiveIntervalEndTime(player)
+{
+  // We don't test player.startTime since our caller just set it.
+
+  assert_equals(player.playState, 'finished',
+    'AnimationPlayer.playState should be "finished" at the end of ' +
+    'the active interval');
+
+  assert_equals(player.source.target.style.animationPlayState, "running",
+    'AnimationPlayer.source.target.style.animationPlayState should be ' +
+    '"finished" at the end of the active interval');
+
+  var div = player.source.target;
+  var marginLeft = parseFloat(getComputedStyle(div).marginLeft);
+  assert_equals(marginLeft, UNANIMATED_POSITION,
+    'the computed value of margin-left should be unaffected ' +
+    'by the animation at the end of the active duration');
+}
+
+
+test(function()
+{
+  var div = addDiv();
+
+  div.style.animation = 'anim ' + ANIM_DUR_MS + 'ms ' + ANIM_DELAY_MS + 'ms';
+
+  var player = div.getAnimationPlayers()[0];
+
+  // Animations shouldn't start until the next paint tick, so:
+  assert_equals(player.startTime, null,
+    'AnimationPlayer.startTime should be unresolved when an animation ' +
+    'is initially created');
+
+  assert_equals(player.playState, "pending",
+    'AnimationPlayer.playState should be "pending" when an animation ' +
+    'is initially created');
+
+  assert_equals(player.source.target.style.animationPlayState, 'running',
+    'AnimationPlayer.source.target.style.animationPlayState should be ' +
+    '"running" when an animation is initially created');
+
+  // XXX Ideally we would have a test to check the ready Promise is initially
+  // unresolved, but currently there is no Web API to do that. Waiting for the
+  // ready Promise with a timeout doesn't work because the resolved callback
+  // will be called (async) regardless of whether the Promise was resolved in
+  // the past or is resolved in the future.
+
+  var currentTime = document.timeline.currentTime;
+  player.startTime = document.timeline.currentTime;
+  assert_approx_equals(player.startTime, currentTime, 0.0001, // rounding error
+    'Check setting of startTime actually works');
+
+  checkStateOnSettingStartTimeToAnimationCreationTime(player);
+
+  div.parentNode.removeChild(div);
+}, 'Examine newly created Animation');
+
+
+async_test(function(t) {
+  var div = addDiv();
+  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+
+  div.style.animation = 'anim ' + ANIM_DUR_MS + 'ms ' + ANIM_DELAY_MS + 'ms';
+
+  var player = div.getAnimationPlayers()[0];
+
+  player.ready.then(t.step_func(function() {
+    checkStateOnReadyPromiseResolved(player);
+
+    player.startTime = document.timeline.currentTime - ANIM_DELAY_MS; // jump to start of active interval
+    return eventWatcher.waitForEvent('animationstart');
+  })).then(t.step_func(function() {
+    checkStateAtActiveIntervalStartTime(player);
+
+    player.startTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS * 0.5; // 50% through active interval
+    checkStateAtFiftyPctOfActiveInterval(player);
+
+    player.startTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS * 0.9; // 90% through active interval
+    checkStateAtNinetyPctOfActiveInterval(player);
+
+    player.startTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS; // end of active interval
+    return eventWatcher.waitForEvent('animationend');
+  })).then(t.step_func(function() {
+    checkStateAtActiveIntervalEndTime(player);
+
+    eventWatcher.stopWatching();
+    div.parentNode.removeChild(div);
+  })).catch(t.step_func(function(reason) {
+    assert_true(false, reason);
+  })).then(function() {
+    t.done();
+  });
+}, 'Skipping forward through animation');
+
+
+async_test(function(t) {
+  var div = addDiv();
+  var eventWatcher = new EventWatcher(div, CSS_ANIM_EVENTS);
+
+  div.style.animation = 'anim ' + ANIM_DUR_MS + 'ms ' + ANIM_DELAY_MS + 'ms';
+
+  var player = div.getAnimationPlayers()[0];
+
+  player.startTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS; // end of active interval
+
+  // Skipping over the active interval will dispatch an 'animationstart' then
+  // 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() {
+    // Now we can start the tests for skipping backwards, but first we check
+    // that after the events we're still in the same end time state:
+    checkStateAtActiveIntervalEndTime(player);
+
+    player.startTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS * 0.9; // 90% through active interval
+
+    // Despite going backwards from after the end of the animation to just
+    // before the end of the animation, we now expect an animationstart event
+    // because we went from outside to inside the active interval.
+    return eventWatcher.waitForEvent('animationstart');
+  })).then(t.step_func(function() {
+    checkStateAtNinetyPctOfActiveInterval(player);
+
+    player.startTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS * 0.5; // 50% through active interval
+    checkStateAtFiftyPctOfActiveInterval(player);
+
+    player.startTime = document.timeline.currentTime - ANIM_DELAY_MS; // jump to start of active interval
+    checkStateAtActiveIntervalStartTime(player);
+
+    player.startTime = document.timeline.currentTime;
+    // 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');
+  })).then(t.step_func(function() {
+    checkStateOnReadyPromiseResolved(player);
+
+    eventWatcher.stopWatching();
+    div.parentNode.removeChild(div);
+  })).catch(t.step_func(function(reason) {
+    assert_true(false, reason);
+  })).then(function() {
+    t.done();
+  });
+
+  // This must come after we've set up the Promise chain, since requesting
+  // computed style will force events to be dispatched.
+  // XXX For some reason this fails occasionally (either the player.playState
+  // check or the marginLeft check).
+  //checkStateAtActiveIntervalEndTime(player);
+}, 'Skipping backwards through animation');
+
+
+// Here we have multiple tests to check that redundant startTime changes do NOT
+// dispatch events. It's impossible to distinguish between events not being
+// dispatched and events just taking an incredibly long time to dispatch
+// without some sort of risk of creating intermittent failure. We have a short
+// timeout here since we don't want to delay the completion of this test file
+// waiting for a long time to make "more sure" events weren't dispatched rather
+// than being late.
+//
+// We test:
+//
+//   * before -> active, then back
+//   * before -> after, then back
+//   * active -> before, then back
+//   * active -> after, then back
+//   * after -> before, then back
+//   * after -> active, then back
+//
+// We do all these tests in a single async_test since that allows us to share
+// the timeout that we use to wait so that this test file isn't delayed by the
+// timeout time multiplied by number of tests.
+async_test(function(t) {
+  var divs = new Array(6);
+  var eventWatchers = new Array(6);
+  var players = new Array(6);
+  for (let i = 0; i < 6; i++) {
+    divs[i] = addDiv();
+    eventWatchers[i] = new EventWatcher(divs[i], CSS_ANIM_EVENTS);
+    divs[i].style.animation = 'anim ' + ANIM_DUR_MS + 'ms ' + ANIM_DELAY_MS + 'ms';
+    players[i] = divs[i].getAnimationPlayers()[0];
+  }
+
+  var beforeTime = document.timeline.currentTime - ANIM_DELAY_MS / 2;
+  var activeTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS / 2;
+  var afterTime = document.timeline.currentTime - ANIM_DELAY_MS - ANIM_DUR_MS - ANIM_DELAY_MS / 2;
+
+  // before -> active, then back:
+  players[0].startTime = activeTime;
+  players[0].startTime = beforeTime;
+
+  // before -> after, then back:
+  players[1].startTime = afterTime;
+  players[1].startTime = beforeTime;
+
+  // active -> before, then back:
+  eventWatchers[2].waitForEvent('animationstart').then(function() {
+    players[2].startTime = beforeTime;
+    players[2].startTime = activeTime;
+  });
+  players[2].startTime = activeTime; // get us into the initial state
+
+  // active -> after, then back:
+  eventWatchers[3].waitForEvent('animationstart').then(function() {
+    players[3].startTime = afterTime;
+    players[3].startTime = activeTime;
+  });
+  players[3].startTime = activeTime; // get us into the initial state
+
+  // after -> before, then back:
+  eventWatchers[4].waitForEvents(['animationstart', 'animationend']).then(function() {
+    players[4].startTime = beforeTime;
+    players[4].startTime = afterTime;
+  });
+  players[4].startTime = afterTime; // get us into the initial state
+
+  // after -> active, then back:
+  eventWatchers[5].waitForEvents(['animationstart', 'animationend']).then(function() {
+    players[5].startTime = activeTime;
+    players[5].startTime = afterTime;
+  });
+  players[5].startTime = afterTime; // get us into the initial state
+
+  // See the long comment documenting this async_test for an explanation of
+  // why we have this timeout and its relationship to intermittent failure.
+  setTimeout(function() {
+    for (let i = 0; i < 6; i++) {
+      eventWatchers[i].stopWatching();
+      divs[i].parentNode.removeChild(divs[i]);
+    }
+    t.done();
+  }, 1000);
+}, 'Redundant changes');
+
+
+async_test(function(t) {
+  var div = addDiv();
+  div.style.animation = 'anim ' + ANIM_DUR_MS + 'ms ' + ANIM_DELAY_MS + 'ms';
+
+  var player = div.getAnimationPlayers()[0];
+
+  player.ready.then(t.step_func(function() {
+    player.startTime = null;
+    return player.ready;
+  })).then(t.step_func(function() {
+    div.parentNode.removeChild(div);
+  })).catch(t.step_func(function(reason) {
+    assert_true(false, reason);
+  })).then(function() {
+    t.done();
+  });
+}, 'Setting startTime to null');
+
+
+async_test(function(t) {
+  var div = addDiv();
+  div.style.animation = 'anim 100s';
+
+  var player = div.getAnimationPlayers()[0];
+
+  player.ready.then(t.step_func(function() {
+    var savedStartTime = player.startTime;
+
+    assert_not_equals(player.startTime, null,
+      'AnimationPlayer.startTime not null on ready Promise resolve');
+
+    player.pause();
+    assert_equals(player.startTime, null,
+      'AnimationPlayer.startTime is null after paused');
+    assert_equals(player.playState, 'paused',
+      'AnimationPlayer.playState is "paused" after pause() call');
+
+    div.parentNode.removeChild(div);
+  })).catch(t.step_func(function(reason) {
+    assert_true(false, reason);
+  })).then(function() {
+    t.done();
+  });
+}, 'AnimationPlayer.startTime after paused');
+
+    </script>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/test/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/test/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/animation/test/mochitest.ini	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/animation/test/mochitest.ini	2015-02-28 15:03:05.000000000 +0000
@@ -9,6 +9,7 @@
 [css-animations/test_animation-pausing.html]
 [css-animations/test_animation-player-playstate.html]
 [css-animations/test_animation-player-ready.html]
+[css-animations/test_animation-player-starttime.html]
 [css-animations/test_animation-target.html]
 [css-animations/test_element-get-animation-players.html]
 skip-if = buildapp == 'mulet'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/Langpacks.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/Langpacks.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/Langpacks.jsm	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/Langpacks.jsm	2015-02-28 15:03:05.000000000 +0000
@@ -32,7 +32,7 @@
   * "languages-target" : { "app://*.gaiamobile.org/manifest.webapp": "2.2" },
   * "languages-provided": {
   * "de": {
-  *   "version": 201411051234,
+  *   "revision": 201411051234,
   *   "name": "Deutsch",
   *   "apps": {
   *     "app://calendar.gaiamobile.org/manifest.webapp": "/de/calendar",
@@ -81,7 +81,7 @@
         }
         let current = this._data[aManifestURL].langs[lang];
         langs[lang].push({
-          version: current.version,
+          revision: current.revision,
           name: current.name,
           target: current.target
         });
@@ -128,7 +128,7 @@
                        "UnavailableLanguage");
     }
 
-    // Check that we have the right version.
+    // Check that we have the langpack for the right app version.
     let item = this._data[aData.manifestURL].langs[aData.lang];
     if (item.target != aData.version) {
       return sendError("No version " + aData.version + " for this app.",
@@ -187,14 +187,14 @@
     for (let lang in aManifest["languages-provided"]) {
       let item = aManifest["languages-provided"][lang];
 
-      if (!item.version) {
-        debug("Error: missing 'version' in languages-provided." + lang);
+      if (!item.revision) {
+        debug("Error: missing 'revision' in languages-provided." + lang);
         return false;
       }
 
-      if (typeof item.version !== "number") {
+      if (typeof item.revision !== "number") {
         debug("Error: languages-provided." + lang +
-              ".version must be a number but is a " + (typeof item.version));
+              ".revision must be a number but is a " + (typeof item.revision));
         return false;
       }
 
@@ -242,13 +242,13 @@
 
     for (let lang in aManifest["languages-provided"]) {
       let item = aManifest["languages-provided"][lang];
-      let version = item.version;   // The langpack version, not the platform.
+      let revision = item.revision;
       let name = item.name || lang; // If no name specified, default to lang.
       for (let app in item.apps) {
         let sendEvent = false;
         if (!this._data[app] ||
             !this._data[app].langs[lang] ||
-            this._data[app].langs[lang].version > version) {
+            this._data[app].langs[lang].revision > revision) {
           if (!this._data[app]) {
             this._data[app] = {
               appId: this._appIdFromManifestURL(app),
@@ -256,7 +256,7 @@
             };
           }
           this._data[app].langs[lang] = {
-            version: version,
+            revision: revision,
             target: platformVersion,
             name: name,
             url: origin.resolve(item.apps[app]),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/langpack/lang1.webapp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/langpack/lang1.webapp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/langpack/lang1.webapp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/langpack/lang1.webapp	2015-02-28 15:03:05.000000000 +0000
@@ -3,7 +3,7 @@
   "languages-target" : { "app://*.gaiamobile.org/manifest.webapp": "2.2" },
   "languages-provided": {
     "fr": {
-      "version": 201411051234,
+      "revision": 201411051234,
       "name": "Français",
       "apps": {
         "http://mochi.test:8888/tests/dom/apps/tests/langpack/manifest.webapp": "tests/dom/apps/tests/langpack/fr/"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/langpack/lang2.webapp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/langpack/lang2.webapp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/langpack/lang2.webapp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/langpack/lang2.webapp	2015-02-28 15:03:05.000000000 +0000
@@ -3,14 +3,14 @@
   "languages-target" : { "app://*.gaiamobile.org/manifest.webapp": "2.2" },
   "languages-provided": {
     "de": {
-      "version": 201411051234,
+      "revision": 201411051234,
       "name": "Deutsch",
       "apps": {
         "http://mochi.test:8888/tests/dom/apps/tests/langpack/manifest.webapp": "tests/dom/apps/tests/langpack/de/"
        }
      },
      "pl": {
-      "version": 201411051234,
+      "revision": 201411051234,
       "name": "Polski",
       "apps": {
         "http://mochi.test:8888/tests/dom/apps/tests/langpack/manifest.webapp": "tests/dom/apps/tests/langpack/pl/"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/test_app_update.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/test_app_update.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/test_app_update.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/test_app_update.html	2015-02-28 15:03:05.000000000 +0000
@@ -18,15 +18,13 @@
   var gHostedManifestURL = gBaseURL + 'file_app.sjs?apptype=hosted&getmanifest=true';
   var gCachedManifestURL = gBaseURL + 'file_app.sjs?apptype=cached&getmanifest=true';
   var gTrustedManifestURL = gBaseURL + 'file_app.sjs?apptype=trusted&getmanifest=true';
-  var gGenerator = runTest();
-
+  var gGenerator;
   // We need to set the trusted hosted app csp pref since it's only in
   // b2g.js for now.
   function setCSPPrefs() {
-    SpecialPowers.pushPrefEnv({'set':
-      [["security.apps.trusted.CSP.default",
-        "default-src *; object-src 'none'"]]},
-      function() {  gGenerator.next(); });
+    SpecialPowers.pushPrefEnv({'set':[["security.apps.trusted.CSP.default",
+"default-src *; object-src 'none'"], ["dom.mozBrowserFramesEnabled",true]]},
+      function() {  gGenerator = runTest(); gGenerator.next(); });
   }
 
   function go() {
@@ -64,10 +62,7 @@
 
   function runTest() {
     // Set up.
-
     SpecialPowers.setAllAppsLaunchable(true);
-    SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-
     // Test Bug 927699 - navigator.mozApps.install(url) lets NS_ERROR_FAILURE
     //                   onto the web
     var request = navigator.mozApps.install("");
@@ -324,7 +319,6 @@
   }
 
   function finish() {
-    SpecialPowers.clearUserPref("dom.mozBrowserFramesEnabled");
     SimpleTest.finish();
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/test_langpacks.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/test_langpacks.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/tests/test_langpacks.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/tests/test_langpacks.html	2015-02-28 15:03:05.000000000 +0000
@@ -133,7 +133,7 @@
   // Opens the iframe to the test page.
   // Only the French locale is available.
   openPage("index.html",
-    [_({"fr":[{"version":201411051234,"name":"Français","target":"2.2"}]})]);
+    [_({"fr":[{"revision":201411051234,"name":"Français","target":"2.2"}]})]);
   yield undefined;
 
   // Install the de and pl langpack.
@@ -143,7 +143,7 @@
   // Opens the iframe to the test page.
   // French, German and Polish locales are available.
   openPage("index.html",
-    [_({"fr":[{"version":201411051234,"name":"Français","target":"2.2"}],"de":[{"version":201411051234,"name":"Deutsch","target":"2.2"}],"pl":[{"version":201411051234,"name":"Polski","target":"2.2"}]})]);
+    [_({"fr":[{"revision":201411051234,"name":"Français","target":"2.2"}],"de":[{"revision":201411051234,"name":"Deutsch","target":"2.2"}],"pl":[{"revision":201411051234,"name":"Polski","target":"2.2"}]})]);
   yield undefined;
 
   // Uninstall the second langpack.
@@ -159,7 +159,7 @@
   // Opens the iframe to the test page.
   // Only the French locale is available.
   openPage("index.html",
-    [_({"fr":[{"version":201411051234,"name":"Français","target":"2.2"}]})]);
+    [_({"fr":[{"revision":201411051234,"name":"Français","target":"2.2"}]})]);
   yield undefined;
 
   // Uninstall the first langpack.
@@ -181,9 +181,9 @@
   // Opens the iframe to the event test page.
   // Will get additionallanguageschange events.
   openPage("event.html",
-    [_({"fr":[{"version":201411051234,"name":"Français","target":"2.2"}]}),
-     _({"fr":[{"version":201411051234,"name":"Français","target":"2.2"}],"de":[{"version":201411051234,"name":"Deutsch","target":"2.2"}]}),
-     _({"fr":[{"version":201411051234,"name":"Français","target":"2.2"}],"de":[{"version":201411051234,"name":"Deutsch","target":"2.2"}],"pl":[{"version":201411051234,"name":"Polski","target":"2.2"}]})]);
+    [_({"fr":[{"revision":201411051234,"name":"Français","target":"2.2"}]}),
+     _({"fr":[{"revision":201411051234,"name":"Français","target":"2.2"}],"de":[{"revision":201411051234,"name":"Deutsch","target":"2.2"}]}),
+     _({"fr":[{"revision":201411051234,"name":"Français","target":"2.2"}],"de":[{"revision":201411051234,"name":"Deutsch","target":"2.2"}],"pl":[{"revision":201411051234,"name":"Polski","target":"2.2"}]})]);
   yield undefined;
 
   // Opens the iframe to the resource test page.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/Webapps.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/Webapps.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/Webapps.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/Webapps.js	2015-02-28 15:03:05.000000000 +0000
@@ -180,6 +180,7 @@
 
              from: installURL,
              oid: this._id,
+             topId: this._topId,
              requestID: requestID,
              appId: principal.appId,
              isBrowser: principal.isInBrowserElement,
@@ -208,7 +209,7 @@
     this.addMessageListeners("Webapps:GetSelf:Return:OK");
     cpmm.sendAsyncMessage("Webapps:GetSelf", { origin: this._getOrigin(this._window.location.href),
                                                appId: this._window.document.nodePrincipal.appId,
-                                               oid: this._id,
+                                               oid: this._id, topId: this._topId,
                                                requestID: this.getRequestId(request) });
     return request;
   },
@@ -229,7 +230,7 @@
     this.addMessageListeners("Webapps:CheckInstalled:Return:OK");
     cpmm.sendAsyncMessage("Webapps:CheckInstalled", { origin: this._getOrigin(this._window.location.href),
                                                       manifestURL: manifestURL.spec,
-                                                      oid: this._id,
+                                                      oid: this._id, topId: this._topId,
                                                       requestID: this.getRequestId(request) });
     return request;
   },
@@ -238,7 +239,7 @@
     let request = this.createRequest();
     this.addMessageListeners("Webapps:GetInstalled:Return:OK");
     cpmm.sendAsyncMessage("Webapps:GetInstalled", { origin: this._getOrigin(this._window.location.href),
-                                                    oid: this._id,
+                                                    oid: this._id, topId: this._topId,
                                                     requestID: this.getRequestId(request) });
     return request;
   },
@@ -253,6 +254,7 @@
                    .createInstance(Ci.nsISupports);
       mgmt.wrappedJSObject.init(this._window, this.hasFullMgmtPrivilege);
       mgmt.wrappedJSObject._windowId = this._id;
+      mgmt.wrappedJSObject._topId = this._topId;
       this._mgmt = mgmt.__DOM_IMPL__
         ? mgmt.__DOM_IMPL__
         : this._window.DOMApplicationsManager._create(this._window, mgmt.wrappedJSObject);
@@ -265,6 +267,7 @@
     cpmm.sendAsyncMessage("Webapps:UnregisterForMessages",
                           ["Webapps:Install:Return:OK",
                            "Webapps:AdditionalLanguageChange"]);
+    this._window.removeEventListener("pagehide", this);
   },
 
   installPackage: function(aURL, aParams) {
@@ -321,6 +324,7 @@
         path: aPath,
         dataType: aType,
         oid: this._id,
+        topId: this._topId,
         requestID: this.getPromiseResolverId({
           resolve: aResolve,
           reject: aReject
@@ -334,6 +338,7 @@
     const prefs = new Preferences();
 
     this._window = aWindow;
+    this._window.addEventListener("pagehide", this);
 
     this.initDOMRequestHelper(aWindow, ["Webapps:Install:Return:OK",
                                         "Webapps:AdditionalLanguageChange"]);
@@ -341,6 +346,12 @@
     let util = this._window.QueryInterface(Ci.nsIInterfaceRequestor)
                            .getInterface(Ci.nsIDOMWindowUtils);
     this._id = util.outerWindowID;
+
+    let topUtil = this._window.top
+                              .QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIDOMWindowUtils);
+    this._topId = topUtil.outerWindowID;
+
     cpmm.sendAsyncMessage("Webapps:RegisterForMessages",
                           { messages: ["Webapps:Install:Return:OK",
                                        "Webapps:AdditionalLanguageChange"]});
@@ -366,6 +377,15 @@
     this.hasFullMgmtPrivilege = hasWebappsPermission;
   },
 
+  handleEvent(event) {
+    if (event.type == "pagehide" &&
+        event.target.defaultView == this._window) {
+      cpmm.sendAsyncMessage("Webapps:LocationChange", {
+        oid: this._id,
+      });
+    }
+  },
+
   classID: Components.ID("{fff440b3-fae2-45c1-bf03-3b5a2e432270}"),
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
@@ -548,6 +568,7 @@
     cpmm.sendAsyncMessage("Webapps:CheckForUpdate",
                           { manifestURL: this.manifestURL,
                             oid: this._id,
+                            topId: this._topId,
                             requestID: this.getRequestId(request) });
     return request;
   },
@@ -560,6 +581,7 @@
                                               manifestURL: this.manifestURL,
                                               startPoint: aStartPoint || "",
                                               oid: this._id,
+                                              topId: this._topId,
                                               timestamp: Date.now(),
                                               requestID: this.getRequestId(request) });
     return request;
@@ -574,6 +596,7 @@
       browserChild.messageManager.sendAsyncMessage("Webapps:ClearBrowserData", {
         manifestURL: this.manifestURL,
         oid: this._id,
+        topId: this._topId,
         requestID: this.getRequestId(request)
       });
     } else {
@@ -591,6 +614,7 @@
         rules: aRules,
         manifestURL: this.manifestURL,
         outerWindowID: this._id,
+        topWindowID: this._topId,
         requestID: this.getPromiseResolverId({
           resolve: aResolve,
           reject: aReject
@@ -605,6 +629,7 @@
       cpmm.sendAsyncMessage("Webapps:GetConnections", {
         manifestURL: this.manifestURL,
         outerWindowID: this._id,
+        topWindowID: this._topId,
         requestID: this.getPromiseResolverId({
           resolve: aResolve,
           reject: aReject
@@ -622,6 +647,7 @@
     cpmm.sendAsyncMessage("Webapps:AddReceipt", { manifestURL: this.manifestURL,
                                                   receipt: receipt,
                                                   oid: this._id,
+                                                  topId: this._topId,
                                                   requestID: this.getRequestId(request) });
 
     return request;
@@ -636,6 +662,7 @@
     cpmm.sendAsyncMessage("Webapps:RemoveReceipt", { manifestURL: this.manifestURL,
                                                      receipt: receipt,
                                                      oid: this._id,
+                                                     topId: this._topId,
                                                      requestID: this.getRequestId(request) });
 
     return request;
@@ -651,6 +678,7 @@
                                                       newReceipt: newReceipt,
                                                       oldReceipt: oldReceipt,
                                                       oid: this._id,
+                                                      topId: this._topId,
                                                       requestID: this.getRequestId(request) });
 
     return request;
@@ -662,6 +690,7 @@
       cpmm.sendAsyncMessage("Webapps:Export",
         { manifestURL: this.manifestURL,
           oid: this._id,
+          topId: this._topId,
           requestID: this.getPromiseResolverId({
             resolve: aResolve,
             reject: aReject
@@ -878,6 +907,7 @@
       origin: aApp.origin,
       manifestURL: aApp.manifestURL,
       oid: this._id,
+      topId: this._topId,
       from: this._window.location.href,
       windowId: this._windowId,
       requestID: this.getRequestId(request)
@@ -901,6 +931,7 @@
     return this.createPromise(function(aResolve, aReject) {
       cpmm.sendAsyncMessage("Webapps:GetIcon", {
         oid: this._id,
+        topId: this._topId,
         manifestURL: aApp.manifestURL,
         iconID: aIconID,
         entryPoint: aEntryPoint,
@@ -918,6 +949,7 @@
 
     cpmm.sendAsyncMessage("Webapps:GetNotInstalled", {
       oid: this._id,
+      topId: this._topId,
       requestID: this.getRequestId(request)
     }, null, principal);
 
@@ -930,6 +962,7 @@
       cpmm.sendAsyncMessage("Webapps:Import",
         { blob: aBlob,
           oid: this._id,
+          topId: this._topId,
           requestID: this.getPromiseResolverId({
             resolve: aResolve,
             reject: aReject
@@ -943,6 +976,7 @@
       cpmm.sendAsyncMessage("Webapps:ExtractManifest",
         { blob: aBlob,
           oid: this._id,
+          topId: this._topId,
           requestID: this.getPromiseResolverId({
             resolve: aResolve,
             reject: aReject
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/Webapps.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/Webapps.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/apps/Webapps.jsm	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/apps/Webapps.jsm	2015-02-28 15:03:05.000000000 +0000
@@ -199,6 +199,7 @@
   allAppsLaunchable: false,
   _updateHandlers: [ ],
   _pendingUninstalls: {},
+  _contentActions: new Map(),
   dirKey: DIRECTORY_NAME,
 
   init: function() {
@@ -209,6 +210,7 @@
                      "Webapps:GetInstalled",
                      "Webapps:GetNotInstalled",
                      "Webapps:Launch",
+                     "Webapps:LocationChange",
                      "Webapps:InstallPackage",
                      "Webapps:GetList",
                      "Webapps:RegisterForMessages",
@@ -1385,6 +1387,9 @@
         case "Webapps:Launch":
           this.doLaunch(msg, mm);
           break;
+        case "Webapps:LocationChange":
+          this.onLocationChange(msg.oid);
+          break;
         case "Webapps:CheckInstalled":
           this.checkInstalled(msg, mm);
           break;
@@ -2525,6 +2530,7 @@
       aMm.sendAsyncMessage("Webapps:Install:Return:KO", aData);
       Cu.reportError("Error installing app from: " + app.installOrigin +
                      ": " + aError);
+      this.popContentAction(aData.oid);
     }.bind(this);
 
     if (app.receipts.length > 0) {
@@ -2586,18 +2592,28 @@
 
     let installApp = (function() {
       app.manifestHash = this.computeManifestHash(app.manifest);
-      // We allow bypassing the install confirmation process to facilitate
-      // automation.
-      let prefName = "dom.mozApps.auto_confirm_install";
-      if (Services.prefs.prefHasUserValue(prefName) &&
-          Services.prefs.getBoolPref(prefName)) {
-        this.confirmInstall(aData);
-      } else {
-        Services.obs.notifyObservers(aMm, "webapps-ask-install",
-                                     JSON.stringify(aData));
+
+      // Check to see if the action has been cancelled in the interim.
+      let cancelled = this.actionCancelled(aData.oid);
+      this.popContentAction(aData.oid);
+      if (!cancelled) {
+        // We allow bypassing the install confirmation process to facilitate
+        // automation.
+        let prefName = "dom.mozApps.auto_confirm_install";
+        if (Services.prefs.prefHasUserValue(prefName) &&
+            Services.prefs.getBoolPref(prefName)) {
+          this.confirmInstall(aData);
+        } else {
+          Services.obs.notifyObservers(aMm, "webapps-ask-install",
+                                       JSON.stringify(aData));
+        }
       }
     }).bind(this);
 
+    // This action will be popped on success in installApp, or on
+    // failure in sendError.
+    this.pushContentAction(aData.oid);
+
     // We may already have the manifest (e.g. AutoInstall),
     // in which case we don't need to load it.
     if (app.manifest) {
@@ -2669,6 +2685,7 @@
       aMm.sendAsyncMessage("Webapps:Install:Return:KO", aData);
       Cu.reportError("Error installing packaged app from: " +
                      app.installOrigin + ": " + aError);
+      this.popContentAction(aData.oid);
     }.bind(this);
 
     if (app.receipts.length > 0) {
@@ -2707,18 +2724,27 @@
     let installApp = (function() {
       app.manifestHash = this.computeManifestHash(app.updateManifest);
 
-      // We allow bypassing the install confirmation process to facilitate
-      // automation.
-      let prefName = "dom.mozApps.auto_confirm_install";
-      if (Services.prefs.prefHasUserValue(prefName) &&
-          Services.prefs.getBoolPref(prefName)) {
-        this.confirmInstall(aData);
-      } else {
-        Services.obs.notifyObservers(aMm, "webapps-ask-install",
-                                     JSON.stringify(aData));
+      // Check to see if the action has been cancelled in the interim.
+      let cancelled = this.actionCancelled(aData.oid);
+      this.popContentAction(aData.oid);
+      if (!cancelled) {
+        // We allow bypassing the install confirmation process to facilitate
+        // automation.
+        let prefName = "dom.mozApps.auto_confirm_install";
+        if (Services.prefs.prefHasUserValue(prefName) &&
+            Services.prefs.getBoolPref(prefName)) {
+          this.confirmInstall(aData);
+        } else {
+          Services.obs.notifyObservers(aMm, "webapps-ask-install",
+                                       JSON.stringify(aData));
+        }
       }
     }).bind(this);
 
+    // This action will be popped on success in installApp, or on
+    // failure in sendError.
+    this.pushContentAction(aData.oid);
+
     // We may already have the manifest (e.g. AutoInstall),
     // in which case we don't need to load it.
     if (app.updateManifest) {
@@ -2767,6 +2793,42 @@
     xhr.send(null);
   },
 
+  onLocationChange(oid) {
+    let action = this._contentActions.get(oid);
+    if (action) {
+      action.cancelled = true;
+    }
+  },
+
+  pushContentAction: function(windowID) {
+    let actions = this._contentActions.get(windowID);
+    if (!actions) {
+      actions = {
+        count: 0,
+        cancelled: false,
+      };
+      this._contentActions.set(windowID, actions);
+    }
+    actions.count++;
+  },
+
+  popContentAction: function(windowID) {
+    let actions = this._contentActions.get(windowID);
+    if (!actions) {
+      Cu.reportError(`Failed to pop content action for window with ID ${windowID}`);
+      return;
+    }
+    actions.count--;
+    if (!actions.count) {
+      this._contentActions.delete(windowID);
+    }
+  },
+
+  actionCancelled: function(windowID) {
+    return this._contentActions.has(windowID) &&
+           this._contentActions.get(windowID).cancelled;
+  },
+
   denyInstall: function(aData) {
     let packageId = aData.app.packageId;
     if (packageId) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/audiochannel/AudioChannelService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/audiochannel/AudioChannelService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/audiochannel/AudioChannelService.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/audiochannel/AudioChannelService.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -507,15 +507,15 @@
 
 void
 AudioChannelService::SetDefaultVolumeControlChannel(int32_t aChannel,
-                                                    bool aHidden)
+                                                    bool aVisible)
 {
-  SetDefaultVolumeControlChannelInternal(aChannel, aHidden,
+  SetDefaultVolumeControlChannelInternal(aChannel, aVisible,
                                          CONTENT_PROCESS_ID_MAIN);
 }
 
 void
 AudioChannelService::SetDefaultVolumeControlChannelInternal(int32_t aChannel,
-                                                            bool aHidden,
+                                                            bool aVisible,
                                                             uint64_t aChildID)
 {
   if (XRE_GetProcessType() != GeckoProcessType_Default) {
@@ -525,15 +525,26 @@
   // If this child is in the background and mDefChannelChildID is set to
   // others then it means other child in the foreground already set it's
   // own default channel already.
-  if ((!aHidden && mDefChannelChildID != aChildID) ||
-      (mDefChannelChildID != aChildID &&
-       mDefChannelChildID != CONTENT_PROCESS_ID_UNKNOWN)) {
+  if (!aVisible && mDefChannelChildID != aChildID) {
+    return;
+  }
+  // Workaround for the call screen app. The call screen app is running on the
+  // main process, that will results in wrong visible state. Because we use the
+  // docshell's active state as visible state, the main process is always
+  // active. Therefore, we will see the strange situation that the visible
+  // state of the call screen is always true. If the mDefChannelChildID is set
+  // to others then it means other child in the foreground already set it's
+  // own default channel already.
+  // Summary :
+  //   Child process : foreground app always can set type.
+  //   Parent process : check the mDefChannelChildID.
+  else if (aChildID == CONTENT_PROCESS_ID_MAIN &&
+           mDefChannelChildID != CONTENT_PROCESS_ID_UNKNOWN) {
     return;
   }
 
-  mDefChannelChildID = aChildID;
-  nsString channelName;
-
+  mDefChannelChildID = aVisible ? aChildID : CONTENT_PROCESS_ID_UNKNOWN;
+  nsAutoString channelName;
   if (aChannel == -1) {
     channelName.AssignASCII("unknown");
   } else {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/audiochannel/AudioChannelService.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/audiochannel/AudioChannelService.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/audiochannel/AudioChannelService.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/audiochannel/AudioChannelService.h	2015-02-28 15:03:05.000000000 +0000
@@ -99,7 +99,7 @@
    * AudioChannel enum.
    */
   virtual void SetDefaultVolumeControlChannel(int32_t aChannel,
-                                              bool aHidden);
+                                              bool aVisible);
 
   bool AnyAudioChannelIsActive();
 
@@ -153,7 +153,7 @@
 
   /* Send the default-volume-channel-changed notification */
   void SetDefaultVolumeControlChannelInternal(int32_t aChannel,
-                                              bool aHidden, uint64_t aChildID);
+                                              bool aVisible, uint64_t aChildID);
 
   AudioChannelState CheckTelephonyPolicy(AudioChannel aChannel,
                                          uint64_t aChildID);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/Element.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/Element.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/Element.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/Element.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1803,7 +1803,12 @@
     if (doc) {
       nsCOMPtr<nsIPresShell> shell = doc->GetShell();
       if (shell) {
-        shell->RestyleForAnimation(this, eRestyle_StyleAttribute);
+        // Pass both eRestyle_StyleAttribute and
+        // eRestyle_StyleAttribute_Animations since we don't know if
+        // this style represents only the ticking of an existing
+        // animation or whether it's a new or changed animation.
+        shell->RestyleForAnimation(this, eRestyle_StyleAttribute |
+                                         eRestyle_StyleAttribute_Animations);
       }
     }
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/File.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/File.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/File.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/File.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -129,14 +129,11 @@
 NS_IMPL_CYCLE_COLLECTION_CLASS(File)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(File)
-  // No unlink for mImpl bacause FileImpl is not CC-able.
-  tmp->mImpl = nullptr;
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mParent)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(File)
-  // No traverse for mImpl bacause FileImpl is not CC-able.
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mParent)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/FragmentOrElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/FragmentOrElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/FragmentOrElement.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/FragmentOrElement.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1184,6 +1184,10 @@
     // The child can remove itself from the parent in BindToTree.
     mAttrsAndChildren.ChildAt(i)->DestroyContent();
   }
+  ShadowRoot* shadowRoot = GetShadowRoot();
+  if (shadowRoot) {
+    shadowRoot->DestroyContent();
+  }
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/moz.build	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/moz.build	2015-02-28 15:03:05.000000000 +0000
@@ -9,6 +9,7 @@
 XPIDL_SOURCES += [
     'nsIConsoleAPIStorage.idl',
     'nsIContentPolicy.idl',
+    'nsIContentPolicyBase.idl',
     'nsIDocumentEncoder.idl',
     'nsIDOMDataChannel.idl',
     'nsIDOMDOMCursor.idl',
@@ -32,6 +33,7 @@
     'nsISelectionDisplay.idl',
     'nsISelectionListener.idl',
     'nsISelectionPrivate.idl',
+    'nsISimpleContentPolicy.idl',
     'nsISiteSpecificUserAgent.idl',
     'nsISlowScriptDebug.idl',
     'nsIXMLHttpRequest.idl',
@@ -183,6 +185,7 @@
     'PerformanceMark.h',
     'PerformanceMeasure.h',
     'PerformanceResourceTiming.h',
+    'ProcessGlobal.h',
     'ResponsiveImageSelector.h',
     'ScreenOrientation.h',
     'ScriptSettings.h',
@@ -318,6 +321,7 @@
     'PerformanceMark.cpp',
     'PerformanceMeasure.cpp',
     'PerformanceResourceTiming.cpp',
+    'ProcessGlobal.cpp',
     'ResponsiveImageSelector.cpp',
     'ScriptSettings.cpp',
     'ShadowRoot.cpp',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/Navigator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/Navigator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/Navigator.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/Navigator.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -112,6 +112,10 @@
 
 #include "mozilla/dom/FeatureList.h"
 
+#ifdef MOZ_EME
+#include "mozilla/EMEUtils.h"
+#endif
+
 namespace mozilla {
 namespace dom {
 
@@ -2440,6 +2444,20 @@
 }
 
 /* static */
+bool
+Navigator::IsE10sEnabled(JSContext* aCx, JSObject* aGlobal)
+{
+  return XRE_GetProcessType() == GeckoProcessType_Content;
+}
+
+bool
+Navigator::MozE10sEnabled()
+{
+  // This will only be called if IsE10sEnabled() is true.
+  return true;
+}
+
+/* static */
 already_AddRefed<nsPIDOMWindow>
 Navigator::GetWindowFromGlobal(JSObject* aGlobal)
 {
@@ -2623,13 +2641,26 @@
     return p.forget();
   }
 
-  MediaKeySystemStatus status = MediaKeySystemAccess::GetKeySystemStatus(aKeySystem);
+  // Parse keysystem, split it out into keySystem prefix, and version suffix.
+  nsAutoString keySystem;
+  int32_t minCdmVersion = NO_CDM_VERSION;
+  if (!ParseKeySystem(aKeySystem,
+                      keySystem,
+                      minCdmVersion)) {
+    // Invalid keySystem string, or unsupported keySystem. Send notification
+    // to chrome to show a failure notice.
+    MediaKeySystemAccess::NotifyObservers(mWindow, aKeySystem, MediaKeySystemStatus::Cdm_not_supported);
+    p->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return p.forget();
+  }
+
+  MediaKeySystemStatus status = MediaKeySystemAccess::GetKeySystemStatus(keySystem, minCdmVersion);
   if (status != MediaKeySystemStatus::Available) {
     if (status != MediaKeySystemStatus::Error) {
       // Failed due to user disabling something, send a notification to
       // chrome, so we can show some UI to explain how the user can rectify
       // the situation.
-      MediaKeySystemAccess::NotifyObservers(mWindow, aKeySystem, status);
+      MediaKeySystemAccess::NotifyObservers(mWindow, keySystem, status);
     }
     p->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
     return p.forget();
@@ -2638,8 +2669,8 @@
   // TODO: Wait (async) until the CDM is downloaded, if it's not already.
 
   if (!aOptions.WasPassed() ||
-      MediaKeySystemAccess::IsSupported(aKeySystem, aOptions.Value())) {
-    nsRefPtr<MediaKeySystemAccess> access(new MediaKeySystemAccess(mWindow, aKeySystem));
+      MediaKeySystemAccess::IsSupported(keySystem, aOptions.Value())) {
+    nsRefPtr<MediaKeySystemAccess> access(new MediaKeySystemAccess(mWindow, keySystem));
     p->MaybeResolve(access);
     return p.forget();
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/Navigator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/Navigator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/Navigator.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/Navigator.h	2015-02-28 15:03:05.000000000 +0000
@@ -287,6 +287,8 @@
                            ErrorResult& aRv);
   void GetLanguages(nsTArray<nsString>& aLanguages);
 
+  bool MozE10sEnabled();
+
   static void GetAcceptLanguages(nsTArray<nsString>& aLanguages);
 
   // WebIDL helper methods
@@ -315,6 +317,8 @@
 
   static bool HasTVSupport(JSContext* aCx, JSObject* aGlobal);
 
+  static bool IsE10sEnabled(JSContext* aCx, JSObject* aGlobal);
+
   nsPIDOMWindow* GetParentObject() const
   {
     return GetWindow();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsCCUncollectableMarker.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsCCUncollectableMarker.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsCCUncollectableMarker.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsCCUncollectableMarker.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsISHistory.h"
 #include "nsISHEntry.h"
 #include "nsISHContainer.h"
+#include "nsITabChild.h"
 #include "nsIWindowWatcher.h"
 #include "mozilla/Services.h"
 #include "nsIXULWindow.h"
@@ -169,8 +170,8 @@
   if (nsFrameMessageManager::sSameProcessParentManager) {
     nsFrameMessageManager::sSameProcessParentManager->MarkForCC();
   }
-  if (nsFrameMessageManager::sChildProcessManager) {
-    nsFrameMessageManager::sChildProcessManager->MarkForCC();
+  if (nsFrameMessageManager::GetChildProcessManager()) {
+    nsFrameMessageManager::GetChildProcessManager()->MarkForCC();
   }
 }
 
@@ -297,6 +298,15 @@
       nsCOMPtr<nsIDocShell> rootDocShell = window->GetDocShell();
 
       MarkDocShell(rootDocShell, aCleanupJS, aPrepareForCC);
+
+      nsCOMPtr<nsITabChild> tabChild = do_GetInterface(rootDocShell);
+      if (tabChild) {
+        nsCOMPtr<nsIContentFrameMessageManager> mm;
+        tabChild->GetMessageManager(getter_AddRefs(mm));
+        if (mm) {
+          mm->MarkForCC();
+        }
+      }
     }
   }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentPolicy.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentPolicy.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentPolicy.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentPolicy.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -38,6 +38,7 @@
 
 nsContentPolicy::nsContentPolicy()
     : mPolicies(NS_CONTENTPOLICY_CATEGORY)
+    , mSimplePolicies(NS_SIMPLECONTENTPOLICY_CATEGORY)
 {
 #ifdef PR_LOGGING
     if (! gConPolLog) {
@@ -70,6 +71,7 @@
 
 inline nsresult
 nsContentPolicy::CheckPolicy(CPMethod          policyMethod,
+                             SCPMethod         simplePolicyMethod,
                              uint32_t          contentType,
                              nsIURI           *contentLocation,
                              nsIURI           *requestingLocation,
@@ -133,6 +135,53 @@
         }
     }
 
+    nsCOMPtr<nsIDOMElement> topFrameElement;
+    bool isTopLevel = true;
+    nsCOMPtr<nsPIDOMWindow> window;
+    if (nsCOMPtr<nsINode> node = do_QueryInterface(requestingContext)) {
+        window = node->OwnerDoc()->GetWindow();
+    } else {
+        window = do_QueryInterface(requestingContext);
+    }
+
+    if (window) {
+        nsCOMPtr<nsIDocShell> docShell = window->GetDocShell();
+        nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
+        loadContext->GetTopFrameElement(getter_AddRefs(topFrameElement));
+
+        MOZ_ASSERT(window->IsOuterWindow());
+
+        if (topFrameElement) {
+            nsCOMPtr<nsIDOMWindow> topWindow;
+            window->GetScriptableTop(getter_AddRefs(topWindow));
+            isTopLevel = topWindow == static_cast<nsIDOMWindow*>(window);
+        } else {
+            // If we don't have a top frame element, then requestingContext is
+            // part of the top-level XUL document. Presumably it's the <browser>
+            // element that content is being loaded into, so we call it the
+            // topFrameElement.
+            topFrameElement = do_QueryInterface(requestingContext);
+            isTopLevel = true;
+        }
+    }
+
+    nsCOMArray<nsISimpleContentPolicy> simpleEntries;
+    mSimplePolicies.GetEntries(simpleEntries);
+    count = simpleEntries.Count();
+    for (int32_t i = 0; i < count; i++) {
+        /* check the appropriate policy */
+        rv = (simpleEntries[i]->*simplePolicyMethod)(contentType, contentLocation,
+                                                     requestingLocation,
+                                                     topFrameElement, isTopLevel,
+                                                     mimeType, extra, requestPrincipal,
+                                                     decision);
+
+        if (NS_SUCCEEDED(rv) && NS_CP_REJECTED(*decision)) {
+            /* policy says no, no point continuing to check */
+            return NS_OK;
+        }
+    }
+
     // everyone returned failure, or no policies: sanitize result
     *decision = nsIContentPolicy::ACCEPT;
     return NS_OK;
@@ -185,7 +234,9 @@
 {
     // ShouldProcess does not need a content location, but we do
     NS_PRECONDITION(contentLocation, "Must provide request location");
-    nsresult rv = CheckPolicy(&nsIContentPolicy::ShouldLoad, contentType,
+    nsresult rv = CheckPolicy(&nsIContentPolicy::ShouldLoad,
+                              &nsISimpleContentPolicy::ShouldLoad,
+                              contentType,
                               contentLocation, requestingLocation,
                               requestingContext, mimeType, extra,
                               requestPrincipal, decision);
@@ -204,7 +255,9 @@
                                nsIPrincipal     *requestPrincipal,
                                int16_t          *decision)
 {
-    nsresult rv = CheckPolicy(&nsIContentPolicy::ShouldProcess, contentType,
+    nsresult rv = CheckPolicy(&nsIContentPolicy::ShouldProcess,
+                              &nsISimpleContentPolicy::ShouldProcess,
+                              contentType,
                               contentLocation, requestingLocation,
                               requestingContext, mimeType, extra,
                               requestPrincipal, decision);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentPolicy.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentPolicy.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentPolicy.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentPolicy.h	2015-02-28 15:03:05.000000000 +0000
@@ -8,6 +8,7 @@
 #define __nsContentPolicy_h__
 
 #include "nsIContentPolicy.h"
+#include "nsISimpleContentPolicy.h"
 #include "nsCategoryCache.h"
 
 /* 
@@ -28,6 +29,7 @@
  private:
     //Array of policies
     nsCategoryCache<nsIContentPolicy> mPolicies;
+    nsCategoryCache<nsISimpleContentPolicy> mSimplePolicies;
 
     //Helper type for CheckPolicy
     typedef
@@ -37,9 +39,17 @@
                            const nsACString &, nsISupports*, nsIPrincipal*,
                            int16_t*));
 
+    typedef
+    NS_STDCALL_FUNCPROTO(nsresult, SCPMethod, nsISimpleContentPolicy,
+                         ShouldProcess,
+                         (uint32_t, nsIURI*, nsIURI*, nsIDOMElement*, bool,
+                           const nsACString &, nsISupports*, nsIPrincipal*,
+                           int16_t*));
+
     //Helper method that applies policyMethod across all policies in mPolicies
     // with the given parameters
-    nsresult CheckPolicy(CPMethod policyMethod, uint32_t contentType,
+    nsresult CheckPolicy(CPMethod policyMethod, SCPMethod simplePolicyMethod,
+                         uint32_t contentType,
                          nsIURI *aURI, nsIURI *origURI,
                          nsISupports *requestingContext,
                          const nsACString &mimeGuess, nsISupports *extra,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentPolicyUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentPolicyUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentPolicyUtils.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentPolicyUtils.h	2015-02-28 15:03:05.000000000 +0000
@@ -29,6 +29,7 @@
 
 #define NS_CONTENTPOLICY_CONTRACTID   "@mozilla.org/layout/content-policy;1"
 #define NS_CONTENTPOLICY_CATEGORY "content-policy"
+#define NS_SIMPLECONTENTPOLICY_CATEGORY "simple-content-policy"
 #define NS_CONTENTPOLICY_CID                              \
   {0x0e3afd3d, 0xeb60, 0x4c2b,                            \
      { 0x96, 0x3b, 0x56, 0xd7, 0xc4, 0x39, 0xf1, 0x24 }}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentUtils.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentUtils.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -6406,7 +6406,7 @@
 }
 
 already_AddRefed<nsIDocumentLoaderFactory>
-nsContentUtils::FindInternalContentViewer(const char* aType,
+nsContentUtils::FindInternalContentViewer(const nsACString& aType,
                                           ContentViewerType* aLoaderType)
 {
   if (aLoaderType) {
@@ -6421,7 +6421,9 @@
   nsCOMPtr<nsIDocumentLoaderFactory> docFactory;
 
   nsXPIDLCString contractID;
-  nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", aType, getter_Copies(contractID));
+  nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers",
+                                         PromiseFlatCString(aType).get(),
+                                         getter_Copies(contractID));
   if (NS_SUCCEEDED(rv)) {
     docFactory = do_GetService(contractID);
     if (docFactory && aLoaderType) {
@@ -6435,7 +6437,7 @@
     return docFactory.forget();
   }
 
-  if (DecoderTraits::IsSupportedInVideoDocument(nsDependentCString(aType))) {
+  if (DecoderTraits::IsSupportedInVideoDocument(aType)) {
     docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1");
     if (docFactory && aLoaderType) {
       *aLoaderType = TYPE_CONTENT;
@@ -6770,7 +6772,7 @@
 {
   MOZ_ASSERT(aSelection && aRoot);
 
-  if (!aSelection->GetRangeCount()) {
+  if (!aSelection->RangeCount()) {
     // Nothing selected
     aOutStartOffset = aOutEndOffset = 0;
     return;
@@ -6831,7 +6833,7 @@
       res = nsLayoutUtils::TransformFrameRectToAncestor(frame, res, relativeTo);
     }
   } else {
-    int32_t rangeCount = aSel->GetRangeCount();
+    int32_t rangeCount = aSel->RangeCount();
     nsLayoutUtils::RectAccumulator accumulator;
     for (int32_t idx = 0; idx < rangeCount; ++idx) {
       nsRange* range = aSel->GetRangeAt(idx);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsContentUtils.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsContentUtils.h	2015-02-28 15:03:05.000000000 +0000
@@ -157,7 +157,7 @@
 {
   // This holds pointers to nsGkAtoms members, and is therefore safe as a
   // non-owning reference.
-  nsIAtom* MOZ_OWNING_REF mAtom;
+  nsIAtom* MOZ_NON_OWNING_REF mAtom;
   uint32_t mId;
   int32_t  mType;
   mozilla::EventClassID mEventClassID;
@@ -2020,7 +2020,7 @@
   };
 
   static already_AddRefed<nsIDocumentLoaderFactory>
-  FindInternalContentViewer(const char* aType,
+  FindInternalContentViewer(const nsACString& aType,
                             ContentViewerType* aLoaderType = nullptr);
 
   /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDeprecatedOperationList.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDeprecatedOperationList.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDeprecatedOperationList.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDeprecatedOperationList.h	2015-02-28 15:03:05.000000000 +0000
@@ -38,6 +38,5 @@
 DEPRECATED_OPERATION(Window_Content)
 DEPRECATED_OPERATION(SyncXMLHttpRequest)
 DEPRECATED_OPERATION(DataContainerEvent)
-DEPRECATED_OPERATION(SendAsBinary)
 DEPRECATED_OPERATION(Window_Controllers)
 DEPRECATED_OPERATION(ImportXULIntoContent)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDocument.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDocument.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDocument.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDocument.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1243,7 +1243,7 @@
   nsCOMPtr<nsIContentViewer> viewer;
   nsCOMPtr<nsIStreamListener> listener;
   rv = docLoaderFactory->CreateInstance("external-resource", chan, newLoadGroup,
-                                        type.get(), nullptr, nullptr,
+                                        type, nullptr, nullptr,
                                         getter_AddRefs(listener),
                                         getter_AddRefs(viewer));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -5125,7 +5125,7 @@
   // document).
   nsContentUtils::DispatchTrustedEvent(this, static_cast<nsIDocument*>(this),
                                        NS_LITERAL_STRING("DOMContentLoaded"),
-                                       true, true);
+                                       true, false);
 
   if (mTiming) {
     mTiming->NotifyDOMContentLoadedEnd(nsIDocument::GetDocumentURI());
@@ -6199,7 +6199,7 @@
     }
 
     if (!aOptions.mPrototype) {
-      protoObject = JS_NewObjectWithGivenProto(aCx, nullptr, htmlProto, JS::NullPtr());
+      protoObject = JS_NewObjectWithGivenProto(aCx, nullptr, htmlProto);
       if (!protoObject) {
         rv.Throw(NS_ERROR_UNEXPECTED);
         return;
@@ -6348,15 +6348,12 @@
       // Make sure that the element name matches the name in the definition.
       // (e.g. a definition for x-button extending button should match
       // <button is="x-button"> but not <x-button>.
-      // Note: we also check the tag name, because if it's not the above
-      // mentioned case, it can be that only the |is| property has been
-      // changed, which we should ignore by the spec.
-      if (elem->NodeInfo()->NameAtom() != nameAtom &&
-          elem->Tag() == nameAtom) {
+      if (elem->Tag() != nameAtom) {
         //Skip over this element because definition does not apply.
         continue;
       }
 
+      MOZ_ASSERT(elem->IsHTML(nameAtom));
       nsWrapperCache* cache;
       CallQueryInterface(elem, &cache);
       MOZ_ASSERT(cache, "Element doesn't support wrapper cache?");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDocumentEncoder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDocumentEncoder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDocumentEncoder.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDocumentEncoder.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1354,7 +1354,7 @@
   nsCOMPtr<nsIDOMRange> range;
   nsCOMPtr<nsIDOMNode> commonParent;
   Selection* selection = static_cast<Selection*>(aSelection);
-  uint32_t rangeCount = selection->GetRangeCount();
+  uint32_t rangeCount = selection->RangeCount();
 
   // if selection is uninitialized return
   if (!rangeCount)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDocument.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDocument.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDocument.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDocument.h	2015-02-28 15:03:05.000000000 +0000
@@ -622,7 +622,7 @@
     DECL_SHIM(nsIApplicationCacheContainer, NSIAPPLICATIONCACHECONTAINER)
 #undef DECL_SHIM
   };
-  
+
   /**
    * Add an ExternalResource for aURI.  aViewer and aLoadGroup might be null
    * when this is called if the URI didn't result in an XML document.  This
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDOMClassInfoClasses.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDOMClassInfoClasses.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDOMClassInfoClasses.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDOMClassInfoClasses.h	2015-02-28 15:03:05.000000000 +0000
@@ -40,6 +40,7 @@
 DOMCI_CLASS(CSSFontFaceRule)
 
 DOMCI_CLASS(ContentFrameMessageManager)
+DOMCI_CLASS(ContentProcessMessageManager)
 DOMCI_CLASS(ChromeMessageBroadcaster)
 DOMCI_CLASS(ChromeMessageSender)
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDOMClassInfo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDOMClassInfo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDOMClassInfo.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDOMClassInfo.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -260,6 +260,9 @@
   NS_DEFINE_CHROME_ONLY_CLASSINFO_DATA(ContentFrameMessageManager, nsEventTargetSH,
                                        DOM_DEFAULT_SCRIPTABLE_FLAGS |
                                        nsIXPCScriptable::IS_GLOBAL_OBJECT)
+  NS_DEFINE_CHROME_ONLY_CLASSINFO_DATA(ContentProcessMessageManager, nsDOMGenericSH,
+                                       DOM_DEFAULT_SCRIPTABLE_FLAGS |
+                                       nsIXPCScriptable::IS_GLOBAL_OBJECT)
   NS_DEFINE_CHROME_ONLY_CLASSINFO_DATA(ChromeMessageBroadcaster, nsDOMGenericSH,
                                        DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CHROME_ONLY_CLASSINFO_DATA(ChromeMessageSender, nsDOMGenericSH,
@@ -674,8 +677,16 @@
     DOM_CLASSINFO_MAP_ENTRY(nsIContentFrameMessageManager)
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ContentProcessMessageManager, nsISupports)
+    DOM_CLASSINFO_MAP_ENTRY(nsIMessageListenerManager)
+    DOM_CLASSINFO_MAP_ENTRY(nsIMessageSender)
+    DOM_CLASSINFO_MAP_ENTRY(nsISyncMessageSender)
+    DOM_CLASSINFO_MAP_ENTRY(nsIContentProcessMessageManager)
+  DOM_CLASSINFO_MAP_END
+
   DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ChromeMessageBroadcaster, nsISupports)
     DOM_CLASSINFO_MAP_ENTRY(nsIFrameScriptLoader)
+    DOM_CLASSINFO_MAP_ENTRY(nsIProcessScriptLoader)
     DOM_CLASSINFO_MAP_ENTRY(nsIMessageListenerManager)
     DOM_CLASSINFO_MAP_ENTRY(nsIMessageBroadcaster)
   DOM_CLASSINFO_MAP_END
@@ -683,6 +694,7 @@
   DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ChromeMessageSender, nsISupports)
     DOM_CLASSINFO_MAP_ENTRY(nsIProcessChecker)
     DOM_CLASSINFO_MAP_ENTRY(nsIFrameScriptLoader)
+    DOM_CLASSINFO_MAP_ENTRY(nsIProcessScriptLoader)
     DOM_CLASSINFO_MAP_ENTRY(nsIMessageListenerManager)
     DOM_CLASSINFO_MAP_ENTRY(nsIMessageSender)
   DOM_CLASSINFO_MAP_END
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDOMWindowUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDOMWindowUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsDOMWindowUtils.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsDOMWindowUtils.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -640,12 +640,18 @@
   if (aModifiers & nsIDOMWindowUtils::MODIFIER_FN) {
     result |= mozilla::MODIFIER_FN;
   }
+  if (aModifiers & nsIDOMWindowUtils::MODIFIER_FNLOCK) {
+    result |= mozilla::MODIFIER_FNLOCK;
+  }
   if (aModifiers & nsIDOMWindowUtils::MODIFIER_NUMLOCK) {
     result |= mozilla::MODIFIER_NUMLOCK;
   }
   if (aModifiers & nsIDOMWindowUtils::MODIFIER_SCROLLLOCK) {
     result |= mozilla::MODIFIER_SCROLLLOCK;
   }
+  if (aModifiers & nsIDOMWindowUtils::MODIFIER_SYMBOL) {
+    result |= mozilla::MODIFIER_SYMBOL;
+  }
   if (aModifiers & nsIDOMWindowUtils::MODIFIER_SYMBOLLOCK) {
     result |= mozilla::MODIFIER_SYMBOLLOCK;
   }
@@ -2373,31 +2379,6 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsDOMWindowUtils::GetParent(JS::Handle<JS::Value> aObject,
-                            JSContext* aCx,
-                            JS::MutableHandle<JS::Value> aParent)
-{
-  MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
-
-  // First argument must be an object.
-  if (aObject.isPrimitive()) {
-    return NS_ERROR_XPC_BAD_CONVERT_JS;
-  }
-
-  JS::Rooted<JSObject*> parent(aCx, JS_GetParent(&aObject.toObject()));
-
-  // Outerize if necessary.
-  if (parent) {
-    if (js::ObjectOp outerize = js::GetObjectClass(parent)->ext.outerObject) {
-      parent = outerize(aCx, parent);
-    }
-  }
-
-  aParent.setObject(*parent);
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMWindowUtils::GetOuterWindowID(uint64_t *aWindowID)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFormData.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFormData.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFormData.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFormData.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -6,9 +6,7 @@
 #include "nsIVariant.h"
 #include "nsIInputStream.h"
 #include "mozilla/dom/File.h"
-#include "mozilla/dom/File.h"
 #include "mozilla/dom/HTMLFormElement.h"
-#include "mozilla/dom/FormDataBinding.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -86,6 +84,119 @@
   AddNameFilePair(aName, &aBlob, filename);
 }
 
+void
+nsFormData::Delete(const nsAString& aName)
+{
+  // We have to use this slightly awkward for loop since uint32_t >= 0 is an
+  // error for being always true.
+  for (uint32_t i = mFormData.Length(); i-- > 0; ) {
+    if (aName.Equals(mFormData[i].name)) {
+      mFormData.RemoveElementAt(i);
+    }
+  }
+}
+
+void
+nsFormData::ExtractValue(const FormDataTuple& aTuple,
+                         OwningFileOrUSVString* aOutValue)
+{
+  if (aTuple.valueIsFile) {
+    aOutValue->SetAsFile() = aTuple.fileValue;
+  } else {
+    aOutValue->SetAsUSVString() = aTuple.stringValue;
+  }
+}
+
+void
+nsFormData::Get(const nsAString& aName,
+                Nullable<OwningFileOrUSVString>& aOutValue)
+{
+  for (uint32_t i = 0; i < mFormData.Length(); ++i) {
+    if (aName.Equals(mFormData[i].name)) {
+      ExtractValue(mFormData[i], &aOutValue.SetValue());
+      return;
+    }
+  }
+
+  aOutValue.SetNull();
+}
+
+void
+nsFormData::GetAll(const nsAString& aName,
+                   nsTArray<OwningFileOrUSVString>& aValues)
+{
+  for (uint32_t i = 0; i < mFormData.Length(); ++i) {
+    if (aName.Equals(mFormData[i].name)) {
+      OwningFileOrUSVString* element = aValues.AppendElement();
+      ExtractValue(mFormData[i], element);
+    }
+  }
+}
+
+bool
+nsFormData::Has(const nsAString& aName)
+{
+  for (uint32_t i = 0; i < mFormData.Length(); ++i) {
+    if (aName.Equals(mFormData[i].name)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+nsFormData::FormDataTuple*
+nsFormData::RemoveAllOthersAndGetFirstFormDataTuple(const nsAString& aName)
+{
+  FormDataTuple* lastFoundTuple = nullptr;
+  uint32_t lastFoundIndex = mFormData.Length();
+  // We have to use this slightly awkward for loop since uint32_t >= 0 is an
+  // error for being always true.
+  for (uint32_t i = mFormData.Length(); i-- > 0; ) {
+    if (aName.Equals(mFormData[i].name)) {
+      if (lastFoundTuple) {
+        // The one we found earlier was not the first one, we can remove it.
+        mFormData.RemoveElementAt(lastFoundIndex);
+      }
+
+      lastFoundTuple = &mFormData[i];
+      lastFoundIndex = i;
+    }
+  }
+
+  return lastFoundTuple;
+}
+
+void
+nsFormData::Set(const nsAString& aName, File& aBlob,
+                const Optional<nsAString>& aFilename)
+{
+  FormDataTuple* tuple = RemoveAllOthersAndGetFirstFormDataTuple(aName);
+  if (tuple) {
+    nsAutoString filename;
+    if (aFilename.WasPassed()) {
+      filename = aFilename.Value();
+    } else {
+      filename.SetIsVoid(true);
+    }
+
+    SetNameFilePair(tuple, aName, &aBlob, filename);
+  } else {
+    Append(aName, aBlob, aFilename);
+  }
+}
+
+void
+nsFormData::Set(const nsAString& aName, const nsAString& aValue)
+{
+  FormDataTuple* tuple = RemoveAllOthersAndGetFirstFormDataTuple(aName);
+  if (tuple) {
+    SetNameValuePair(tuple, aName, aValue);
+  } else {
+    Append(aName, aValue);
+  }
+}
+
 // -------------------------------------------------------------------------
 // nsIDOMFormData
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFormData.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFormData.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFormData.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFormData.h	2015-02-28 15:03:05.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsTArray.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/FormDataBinding.h"
 
 namespace mozilla {
 class ErrorResult;
@@ -29,8 +30,48 @@
                              public nsFormSubmission,
                              public nsWrapperCache
 {
+private:
   ~nsFormData() {}
 
+  typedef mozilla::dom::File File;
+  struct FormDataTuple
+  {
+    nsString name;
+    nsString stringValue;
+    nsRefPtr<File> fileValue;
+    nsString filename;
+    bool valueIsFile;
+  };
+
+  // Returns the FormDataTuple to modify. This may be null, in which case
+  // no element with aName was found.
+  FormDataTuple*
+  RemoveAllOthersAndGetFirstFormDataTuple(const nsAString& aName);
+
+  void SetNameValuePair(FormDataTuple* aData,
+                        const nsAString& aName,
+                        const nsAString& aValue)
+  {
+    MOZ_ASSERT(aData);
+    aData->name = aName;
+    aData->stringValue = aValue;
+    aData->valueIsFile = false;
+  }
+
+  void SetNameFilePair(FormDataTuple* aData,
+                       const nsAString& aName,
+                       File* aBlob,
+                       const nsAString& aFilename)
+  {
+    MOZ_ASSERT(aData);
+    aData->name = aName;
+    aData->fileValue = aBlob;
+    aData->filename = aFilename;
+    aData->valueIsFile = true;
+  }
+
+  void ExtractValue(const FormDataTuple& aTuple,
+                    mozilla::dom::OwningFileOrUSVString* aOutValue);
 public:
   explicit nsFormData(nsISupports* aOwner = nullptr);
 
@@ -55,8 +96,15 @@
               const mozilla::dom::Optional<mozilla::dom::NonNull<mozilla::dom::HTMLFormElement> >& aFormElement,
               mozilla::ErrorResult& aRv);
   void Append(const nsAString& aName, const nsAString& aValue);
-  void Append(const nsAString& aName, mozilla::dom::File& aBlob,
+  void Append(const nsAString& aName, File& aBlob,
               const mozilla::dom::Optional<nsAString>& aFilename);
+  void Delete(const nsAString& aName);
+  void Get(const nsAString& aName, mozilla::dom::Nullable<mozilla::dom::OwningFileOrUSVString>& aOutValue);
+  void GetAll(const nsAString& aName, nsTArray<mozilla::dom::OwningFileOrUSVString>& aValues);
+  bool Has(const nsAString& aName);
+  void Set(const nsAString& aName, File& aBlob,
+           const mozilla::dom::Optional<nsAString>& aFilename);
+  void Set(const nsAString& aName, const nsAString& aValue);
 
   // nsFormSubmission
   virtual nsresult GetEncodedSubmission(nsIURI* aURI,
@@ -65,35 +113,20 @@
                                     const nsAString& aValue) MOZ_OVERRIDE
   {
     FormDataTuple* data = mFormData.AppendElement();
-    data->name = aName;
-    data->stringValue = aValue;
-    data->valueIsFile = false;
+    SetNameValuePair(data, aName, aValue);
     return NS_OK;
   }
   virtual nsresult AddNameFilePair(const nsAString& aName,
-                                   nsIDOMBlob* aBlob,
+                                   File* aBlob,
                                    const nsString& aFilename) MOZ_OVERRIDE
   {
     FormDataTuple* data = mFormData.AppendElement();
-    data->name = aName;
-    data->fileValue = aBlob;
-    data->filename = aFilename;
-    data->valueIsFile = true;
+    SetNameFilePair(data, aName, aBlob, aFilename);
     return NS_OK;
   }
-
 private:
   nsCOMPtr<nsISupports> mOwner;
 
-  struct FormDataTuple
-  {
-    nsString name;
-    nsString stringValue;
-    nsCOMPtr<nsIDOMBlob> fileValue;
-    nsString filename;
-    bool valueIsFile;
-  };
-
   nsTArray<FormDataTuple> mFormData;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameLoader.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameLoader.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameLoader.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameLoader.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -194,7 +194,7 @@
   NS_ENSURE_TRUE(aOwner, nullptr);
   nsIDocument* doc = aOwner->OwnerDoc();
   NS_ENSURE_TRUE(!doc->IsResourceDoc() &&
-                 ((!doc->IsLoadedAsData() && aOwner->GetUncomposedDoc()) ||
+                 ((!doc->IsLoadedAsData() && aOwner->GetComposedDoc()) ||
                    doc->IsStaticDocument()),
                  nullptr);
 
@@ -349,7 +349,7 @@
 nsresult
 nsFrameLoader::ReallyStartLoadingInternal()
 {
-  NS_ENSURE_STATE(mURIToLoad && mOwnerContent && mOwnerContent->IsInDoc());
+  NS_ENSURE_STATE(mURIToLoad && mOwnerContent && mOwnerContent->IsInComposedDoc());
 
   PROFILER_LABEL("nsFrameLoader", "ReallyStartLoading",
     js::ProfileEntry::Category::OTHER);
@@ -876,12 +876,12 @@
   // want here.  For now, hack.
   if (!mRemoteBrowserShown) {
     if (!mOwnerContent ||
-        !mOwnerContent->GetUncomposedDoc()) {
+        !mOwnerContent->GetComposedDoc()) {
       return false;
     }
 
     nsRefPtr<layers::LayerManager> layerManager =
-      nsContentUtils::LayerManagerForDocument(mOwnerContent->GetUncomposedDoc());
+      nsContentUtils::LayerManagerForDocument(mOwnerContent->GetComposedDoc());
     if (!layerManager) {
       // This is just not going to work.
       return false;
@@ -972,8 +972,8 @@
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
-  nsIDocument* ourDoc = ourContent->GetCurrentDoc();
-  nsIDocument* otherDoc = otherContent->GetCurrentDoc();
+  nsIDocument* ourDoc = ourContent->GetComposedDoc();
+  nsIDocument* otherDoc = otherContent->GetComposedDoc();
   if (!ourDoc || !otherDoc) {
     // Again, how odd, given that we had docshells
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -1191,8 +1191,8 @@
     otherChildDocument->GetParentDocument();
 
   // Make sure to swap docshells between the two frames.
-  nsIDocument* ourDoc = ourContent->GetUncomposedDoc();
-  nsIDocument* otherDoc = otherContent->GetUncomposedDoc();
+  nsIDocument* ourDoc = ourContent->GetComposedDoc();
+  nsIDocument* otherDoc = otherContent->GetComposedDoc();
   if (!ourDoc || !otherDoc) {
     // Again, how odd, given that we had docshells
     return NS_ERROR_NOT_IMPLEMENTED;
@@ -1612,7 +1612,7 @@
   // XXXbz this is such a total hack.... We really need to have a
   // better setup for doing this.
   nsIDocument* doc = mOwnerContent->OwnerDoc();
-  if (!(doc->IsStaticDocument() || mOwnerContent->IsInDoc())) {
+  if (!(doc->IsStaticDocument() || mOwnerContent->IsInComposedDoc())) {
     return NS_ERROR_UNEXPECTED;
   }
 
@@ -2146,24 +2146,15 @@
   MutableTabContext context;
   nsCOMPtr<mozIApplication> ownApp = GetOwnApp();
   nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
-  ScrollingBehavior scrollingBehavior = DEFAULT_SCROLLING;
-
-  if (Preferences::GetBool("layers.async-pan-zoom.enabled", false) ||
-      mOwnerContent->AttrValueIs(kNameSpaceID_None,
-                                 nsGkAtoms::mozasyncpanzoom,
-                                 nsGkAtoms::_true,
-                                 eCaseMatters)) {
-    scrollingBehavior = ASYNC_PAN_ZOOM;
-  }
 
   bool rv = true;
   if (ownApp) {
-    rv = context.SetTabContextForAppFrame(ownApp, containingApp, scrollingBehavior);
+    rv = context.SetTabContextForAppFrame(ownApp, containingApp);
   } else if (OwnerIsBrowserFrame()) {
     // The |else| above is unnecessary; OwnerIsBrowserFrame() implies !ownApp.
-    rv = context.SetTabContextForBrowserFrame(containingApp, scrollingBehavior);
+    rv = context.SetTabContextForBrowserFrame(containingApp);
   } else {
-    rv = context.SetTabContextForNormalFrame(scrollingBehavior);
+    rv = context.SetTabContextForNormalFrame();
   }
   NS_ENSURE_TRUE(rv, false);
 
@@ -2303,7 +2294,7 @@
 }
 
 bool
-nsFrameLoader::DoLoadFrameScript(const nsAString& aURL, bool aRunInGlobalScope)
+nsFrameLoader::DoLoadMessageManagerScript(const nsAString& aURL, bool aRunInGlobalScope)
 {
   auto* tabParent = TabParent::GetFrom(GetRemoteBrowser());
   if (tabParent) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameLoader.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameLoader.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameLoader.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameLoader.h	2015-02-28 15:03:05.000000000 +0000
@@ -86,8 +86,8 @@
   /**
    * MessageManagerCallback methods that we override.
    */
-  virtual bool DoLoadFrameScript(const nsAString& aURL,
-                                 bool aRunInGlobalScope) MOZ_OVERRIDE;
+  virtual bool DoLoadMessageManagerScript(const nsAString& aURL,
+                                          bool aRunInGlobalScope) MOZ_OVERRIDE;
   virtual bool DoSendAsyncMessage(JSContext* aCx,
                                   const nsAString& aMessage,
                                   const mozilla::dom::StructuredCloneData& aData,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameMessageManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameMessageManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameMessageManager.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameMessageManager.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -29,10 +29,12 @@
 #include "nsIDOMClassInfo.h"
 #include "xpcpublic.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
+#include "mozilla/IntentionalCrash.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/nsIContentParent.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
+#include "mozilla/dom/ProcessGlobal.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/StructuredCloneUtils.h"
 #include "mozilla/dom/ipc/BlobChild.h"
@@ -120,6 +122,10 @@
   NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIFrameScriptLoader,
                                      mChrome && !mIsProcessManager)
 
+  /* Process message managers (process message managers) support nsIProcessScriptLoader. */
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIProcessScriptLoader,
+                                     mChrome && mIsProcessManager)
+
   /* Message senders in the chrome process support nsIProcessChecker. */
   NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIProcessChecker,
                                      mChrome && !mIsBroadcaster)
@@ -431,9 +437,9 @@
 // nsIFrameScriptLoader
 
 NS_IMETHODIMP
-nsFrameMessageManager::LoadFrameScript(const nsAString& aURL,
-                                       bool aAllowDelayedLoad,
-                                       bool aRunInGlobalScope)
+nsFrameMessageManager::LoadScript(const nsAString& aURL,
+                                  bool aAllowDelayedLoad,
+                                  bool aRunInGlobalScope)
 {
   if (aAllowDelayedLoad) {
     if (IsGlobal() || IsBroadcaster()) {
@@ -452,7 +458,7 @@
 #ifdef DEBUG_smaug
     printf("Will load %s \n", NS_ConvertUTF16toUTF8(aURL).get());
 #endif
-    NS_ENSURE_TRUE(mCallback->DoLoadFrameScript(aURL, aRunInGlobalScope),
+    NS_ENSURE_TRUE(mCallback->DoLoadMessageManagerScript(aURL, aRunInGlobalScope),
                    NS_ERROR_FAILURE);
   }
 
@@ -462,14 +468,14 @@
     if (mm) {
       // Use false here, so that child managers don't cache the script, which
       // is already cached in the parent.
-      mm->LoadFrameScript(aURL, false, aRunInGlobalScope);
+      mm->LoadScript(aURL, false, aRunInGlobalScope);
     }
   }
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsFrameMessageManager::RemoveDelayedFrameScript(const nsAString& aURL)
+nsFrameMessageManager::RemoveDelayedScript(const nsAString& aURL)
 {
   for (uint32_t i = 0; i < mPendingScripts.Length(); ++i) {
     if (mPendingScripts[i] == aURL) {
@@ -482,7 +488,7 @@
 }
 
 NS_IMETHODIMP
-nsFrameMessageManager::GetDelayedFrameScripts(JSContext* aCx, JS::MutableHandle<JS::Value> aList)
+nsFrameMessageManager::GetDelayedScripts(JSContext* aCx, JS::MutableHandle<JS::Value> aList)
 {
   // Frame message managers may return an incomplete list because scripts
   // that were loaded after it was connected are not added to the list.
@@ -516,6 +522,49 @@
   return NS_OK;
 }
 
+// nsIFrameScriptLoader
+
+NS_IMETHODIMP
+nsFrameMessageManager::LoadFrameScript(const nsAString& aURL,
+                                       bool aAllowDelayedLoad,
+                                       bool aRunInGlobalScope)
+{
+  return LoadScript(aURL, aAllowDelayedLoad, aRunInGlobalScope);
+}
+
+NS_IMETHODIMP
+nsFrameMessageManager::RemoveDelayedFrameScript(const nsAString& aURL)
+{
+  return RemoveDelayedScript(aURL);
+}
+
+NS_IMETHODIMP
+nsFrameMessageManager::GetDelayedFrameScripts(JSContext* aCx, JS::MutableHandle<JS::Value> aList)
+{
+  return GetDelayedScripts(aCx, aList);
+}
+
+// nsIProcessScriptLoader
+
+NS_IMETHODIMP
+nsFrameMessageManager::LoadProcessScript(const nsAString& aURL,
+                                         bool aAllowDelayedLoad)
+{
+  return LoadScript(aURL, aAllowDelayedLoad, false);
+}
+
+NS_IMETHODIMP
+nsFrameMessageManager::RemoveDelayedProcessScript(const nsAString& aURL)
+{
+  return RemoveDelayedScript(aURL);
+}
+
+NS_IMETHODIMP
+nsFrameMessageManager::GetDelayedProcessScripts(JSContext* aCx, JS::MutableHandle<JS::Value> aList)
+{
+  return GetDelayedScripts(aCx, aList);
+}
+
 static bool
 JSONCreator(const char16_t* aBuf, uint32_t aLen, void* aData)
 {
@@ -775,7 +824,12 @@
 NS_IMETHODIMP
 nsFrameMessageManager::PrivateNoteIntentionalCrash()
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  if (XRE_GetProcessType() == GeckoProcessType_Content) {
+    mozilla::NoteIntentionalCrash("tab");
+    return NS_OK;
+  } else {
+    return NS_ERROR_NOT_IMPLEMENTED;
+  }
 }
 
 NS_IMETHODIMP
@@ -796,14 +850,14 @@
 nsFrameMessageManager::Btoa(const nsAString& aBinaryData,
                             nsAString& aAsciiBase64String)
 {
-  return NS_OK;
+  return nsContentUtils::Btoa(aBinaryData, aAsciiBase64String);
 }
 
 NS_IMETHODIMP
 nsFrameMessageManager::Atob(const nsAString& aAsciiString,
                             nsAString& aBinaryData)
 {
-  return NS_OK;
+  return nsContentUtils::Atob(aAsciiString, aBinaryData);
 }
 
 // nsIProcessChecker
@@ -1393,17 +1447,17 @@
   return CallQueryInterface(mm, aResult);
 }
 
-nsDataHashtable<nsStringHashKey, nsFrameScriptObjectExecutorHolder*>*
-  nsFrameScriptExecutor::sCachedScripts = nullptr;
-nsScriptCacheCleaner* nsFrameScriptExecutor::sScriptCacheCleaner = nullptr;
+nsDataHashtable<nsStringHashKey, nsMessageManagerScriptHolder*>*
+  nsMessageManagerScriptExecutor::sCachedScripts = nullptr;
+nsScriptCacheCleaner* nsMessageManagerScriptExecutor::sScriptCacheCleaner = nullptr;
 
 void
-nsFrameScriptExecutor::DidCreateGlobal()
+nsMessageManagerScriptExecutor::DidCreateGlobal()
 {
   NS_ASSERTION(mGlobal, "Should have mGlobal!");
   if (!sCachedScripts) {
     sCachedScripts =
-      new nsDataHashtable<nsStringHashKey, nsFrameScriptObjectExecutorHolder*>;
+      new nsDataHashtable<nsStringHashKey, nsMessageManagerScriptHolder*>;
 
     nsRefPtr<nsScriptCacheCleaner> scriptCacheCleaner =
       new nsScriptCacheCleaner();
@@ -1413,7 +1467,7 @@
 
 static PLDHashOperator
 RemoveCachedScriptEntry(const nsAString& aKey,
-                        nsFrameScriptObjectExecutorHolder*& aData,
+                        nsMessageManagerScriptHolder*& aData,
                         void* aUserArg)
 {
   delete aData;
@@ -1422,7 +1476,7 @@
 
 // static
 void
-nsFrameScriptExecutor::Shutdown()
+nsMessageManagerScriptExecutor::Shutdown()
 {
   if (sCachedScripts) {
     AutoSafeJSContext cx;
@@ -1438,8 +1492,8 @@
 }
 
 void
-nsFrameScriptExecutor::LoadFrameScriptInternal(const nsAString& aURL,
-                                               bool aRunInGlobalScope)
+nsMessageManagerScriptExecutor::LoadScriptInternal(const nsAString& aURL,
+                                                   bool aRunInGlobalScope)
 {
   if (!mGlobal || !sCachedScripts) {
     return;
@@ -1448,7 +1502,7 @@
   JSRuntime* rt = CycleCollectedJSRuntime::Get()->Runtime();
   JS::Rooted<JSScript*> script(rt);
 
-  nsFrameScriptObjectExecutorHolder* holder = sCachedScripts->Get(aURL);
+  nsMessageManagerScriptHolder* holder = sCachedScripts->Get(aURL);
   if (holder && holder->WillRunInGlobalScope() == aRunInGlobalScope) {
     script = holder->mScript;
   } else {
@@ -1480,10 +1534,11 @@
 }
 
 void
-nsFrameScriptExecutor::TryCacheLoadAndCompileScript(const nsAString& aURL,
-                                                    bool aRunInGlobalScope,
-                                                    bool aShouldCache,
-                                                    JS::MutableHandle<JSScript*> aScriptp)
+nsMessageManagerScriptExecutor::TryCacheLoadAndCompileScript(
+  const nsAString& aURL,
+  bool aRunInGlobalScope,
+  bool aShouldCache,
+  JS::MutableHandle<JSScript*> aScriptp)
 {
   nsCString url = NS_ConvertUTF16toUTF8(aURL);
   nsCOMPtr<nsIURI> uri;
@@ -1565,11 +1620,11 @@
     uri->GetScheme(scheme);
     // We don't cache data: scripts!
     if (aShouldCache && !scheme.EqualsLiteral("data")) {
-      nsFrameScriptObjectExecutorHolder* holder;
+      nsMessageManagerScriptHolder* holder;
 
       // Root the object also for caching.
       if (script) {
-        holder = new nsFrameScriptObjectExecutorHolder(cx, script, aRunInGlobalScope);
+        holder = new nsMessageManagerScriptHolder(cx, script, aRunInGlobalScope);
       }
       sCachedScripts->Put(aURL, holder);
     }
@@ -1577,8 +1632,9 @@
 }
 
 void
-nsFrameScriptExecutor::TryCacheLoadAndCompileScript(const nsAString& aURL,
-                                                    bool aRunInGlobalScope)
+nsMessageManagerScriptExecutor::TryCacheLoadAndCompileScript(
+  const nsAString& aURL,
+  bool aRunInGlobalScope)
 {
   AutoSafeJSContext cx;
   JS::Rooted<JSScript*> script(cx);
@@ -1586,8 +1642,9 @@
 }
 
 bool
-nsFrameScriptExecutor::InitTabChildGlobalInternal(nsISupports* aScope,
-                                                  const nsACString& aID)
+nsMessageManagerScriptExecutor::InitChildGlobalInternal(
+  nsISupports* aScope,
+  const nsACString& aID)
 {
 
   nsCOMPtr<nsIJSRuntimeService> runtimeSvc =
@@ -1625,6 +1682,17 @@
   return true;
 }
 
+void
+nsMessageManagerScriptExecutor::MarkScopesForCC()
+{
+  for (uint32_t i = 0; i < mAnonymousGlobalScopes.Length(); ++i) {
+    JSObject* obj = mAnonymousGlobalScopes[i];
+    if (obj) {
+      JS::ExposeObjectToActiveJS(obj);
+    }
+  }
+}
+
 NS_IMPL_ISUPPORTS(nsScriptCacheCleaner, nsIObserver)
 
 nsFrameMessageManager* nsFrameMessageManager::sChildProcessManager = nullptr;
@@ -1647,7 +1715,7 @@
 
   NS_IMETHOD Run()
   {
-    nsFrameMessageManager* ppm = nsFrameMessageManager::sChildProcessManager;
+    nsFrameMessageManager* ppm = nsFrameMessageManager::GetChildProcessManager();
     ReceiveMessage(static_cast<nsIContentFrameMessageManager*>(ppm), ppm);
     return NS_OK;
   }
@@ -1669,11 +1737,20 @@
     MOZ_COUNT_DTOR(SameParentProcessMessageManagerCallback);
   }
 
+  virtual bool DoLoadMessageManagerScript(const nsAString& aURL,
+                                          bool aRunInGlobalScope) MOZ_OVERRIDE
+  {
+    ProcessGlobal* global = ProcessGlobal::Get();
+    MOZ_ASSERT(!aRunInGlobalScope);
+    global->LoadScript(aURL);
+    return true;
+  }
+
   virtual bool DoSendAsyncMessage(JSContext* aCx,
                                   const nsAString& aMessage,
                                   const StructuredCloneData& aData,
                                   JS::Handle<JSObject *> aCpows,
-                                  nsIPrincipal* aPrincipal)
+                                  nsIPrincipal* aPrincipal) MOZ_OVERRIDE
   {
     nsRefPtr<nsIRunnable> ev =
       new nsAsyncMessageToSameProcessChild(aCx, aMessage, aData, aCpows,
@@ -1682,25 +1759,25 @@
     return true;
   }
 
-  bool CheckPermission(const nsAString& aPermission)
+  bool CheckPermission(const nsAString& aPermission) MOZ_OVERRIDE
   {
     // In a single-process scenario, the child always has all capabilities.
     return true;
   }
 
-  bool CheckManifestURL(const nsAString& aManifestURL)
+  bool CheckManifestURL(const nsAString& aManifestURL) MOZ_OVERRIDE
   {
     // In a single-process scenario, the child always has all capabilities.
     return true;
   }
 
-  bool CheckAppHasPermission(const nsAString& aPermission)
+  bool CheckAppHasPermission(const nsAString& aPermission) MOZ_OVERRIDE
   {
     // In a single-process scenario, the child always has all capabilities.
     return true;
   }
 
-  virtual bool CheckAppHasStatus(unsigned short aStatus)
+  virtual bool CheckAppHasStatus(unsigned short aStatus) MOZ_OVERRIDE
   {
     // In a single-process scenario, the child always has all capabilities.
     return true;
@@ -1911,7 +1988,7 @@
 nsresult
 NS_NewChildProcessMessageManager(nsISyncMessageSender** aResult)
 {
-  NS_ASSERTION(!nsFrameMessageManager::sChildProcessManager,
+  NS_ASSERTION(!nsFrameMessageManager::GetChildProcessManager(),
                "Re-creating sChildProcessManager");
 
   MessageManagerCallback* cb;
@@ -1924,8 +2001,11 @@
   nsFrameMessageManager* mm = new nsFrameMessageManager(cb,
                                                         nullptr,
                                                         MM_PROCESSMANAGER | MM_OWNSCALLBACK);
-  nsFrameMessageManager::sChildProcessManager = mm;
-  return CallQueryInterface(mm, aResult);
+  nsFrameMessageManager::SetChildProcessManager(mm);
+  ProcessGlobal* global = new ProcessGlobal(mm);
+  NS_ENSURE_TRUE(global->Init(), NS_ERROR_UNEXPECTED);
+  return CallQueryInterface(global, aResult);
+
 }
 
 static PLDHashOperator
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameMessageManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameMessageManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsFrameMessageManager.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsFrameMessageManager.h	2015-02-28 15:03:05.000000000 +0000
@@ -54,7 +54,7 @@
 public:
   virtual ~MessageManagerCallback() {}
 
-  virtual bool DoLoadFrameScript(const nsAString& aURL, bool aRunInGlobalScope)
+  virtual bool DoLoadMessageManagerScript(const nsAString& aURL, bool aRunInGlobalScope)
   {
     return true;
   }
@@ -154,6 +154,7 @@
 class nsFrameMessageManager MOZ_FINAL : public nsIContentFrameMessageManager,
                                         public nsIMessageBroadcaster,
                                         public nsIFrameScriptLoader,
+                                        public nsIProcessScriptLoader,
                                         public nsIProcessChecker
 {
   friend class mozilla::dom::MessageManagerReporter;
@@ -217,8 +218,10 @@
   NS_DECL_NSIMESSAGESENDER
   NS_DECL_NSIMESSAGEBROADCASTER
   NS_DECL_NSISYNCMESSAGESENDER
+  NS_DECL_NSIMESSAGEMANAGERGLOBAL
   NS_DECL_NSICONTENTFRAMEMESSAGEMANAGER
   NS_DECL_NSIFRAMESCRIPTLOADER
+  NS_DECL_NSIPROCESSSCRIPTLOADER
   NS_DECL_NSIPROCESSCHECKER
 
   static nsFrameMessageManager*
@@ -273,6 +276,10 @@
   {
     return sChildProcessManager;
   }
+  static void SetChildProcessManager(nsFrameMessageManager* aManager)
+  {
+    sChildProcessManager = aManager;
+  }
 private:
   nsresult SendMessage(const nsAString& aMessageName,
                        JS::Handle<JS::Value> aJSON,
@@ -282,6 +289,13 @@
                        uint8_t aArgc,
                        JS::MutableHandle<JS::Value> aRetval,
                        bool aIsSync);
+
+  NS_IMETHOD LoadScript(const nsAString& aURL,
+                        bool aAllowDelayedLoad,
+                        bool aRunInGlobalScope);
+  NS_IMETHOD RemoveDelayedScript(const nsAString& aURL);
+  NS_IMETHOD GetDelayedScripts(JSContext* aCx, JS::MutableHandle<JS::Value> aList);
+
 protected:
   friend class MMListenerRemover;
   // We keep the message listeners as arrays in a hastable indexed by the
@@ -306,10 +320,10 @@
                           nsFrameMessageManager* aChildMM);
 public:
   static nsFrameMessageManager* sParentProcessManager;
-  static nsFrameMessageManager* sChildProcessManager;
   static nsFrameMessageManager* sSameProcessParentManager;
   static nsTArray<nsCOMPtr<nsIRunnable> >* sPendingSameProcessAsyncMessages;
 private:
+  static nsFrameMessageManager* sChildProcessManager;
   enum ProcessCheckerType {
     PROCESS_CHECKER_PERMISSION,
     PROCESS_CHECKER_MANIFEST_URL,
@@ -361,14 +375,16 @@
 
 class nsScriptCacheCleaner;
 
-struct nsFrameScriptObjectExecutorHolder
+struct nsMessageManagerScriptHolder
 {
-  nsFrameScriptObjectExecutorHolder(JSContext* aCx, JSScript* aScript, bool aRunInGlobalScope)
+  nsMessageManagerScriptHolder(JSContext* aCx,
+                               JSScript* aScript,
+                               bool aRunInGlobalScope)
    : mScript(aCx, aScript), mRunInGlobalScope(aRunInGlobalScope)
-  { MOZ_COUNT_CTOR(nsFrameScriptObjectExecutorHolder); }
+  { MOZ_COUNT_CTOR(nsMessageManagerScriptHolder); }
 
-  ~nsFrameScriptObjectExecutorHolder()
-  { MOZ_COUNT_DTOR(nsFrameScriptObjectExecutorHolder); }
+  ~nsMessageManagerScriptHolder()
+  { MOZ_COUNT_DTOR(nsMessageManagerScriptHolder); }
 
   bool WillRunInGlobalScope() { return mRunInGlobalScope; }
 
@@ -376,9 +392,7 @@
   bool mRunInGlobalScope;
 };
 
-class nsFrameScriptObjectExecutorStackHolder;
-
-class nsFrameScriptExecutor
+class nsMessageManagerScriptExecutor
 {
 public:
   static void Shutdown();
@@ -387,25 +401,27 @@
     nsCOMPtr<nsIXPConnectJSObjectHolder> ref = mGlobal;
     return ref.forget();
   }
+
+  void MarkScopesForCC();
 protected:
-  friend class nsFrameScriptCx;
-  nsFrameScriptExecutor() { MOZ_COUNT_CTOR(nsFrameScriptExecutor); }
-  ~nsFrameScriptExecutor() { MOZ_COUNT_DTOR(nsFrameScriptExecutor); }
+  friend class nsMessageManagerScriptCx;
+  nsMessageManagerScriptExecutor() { MOZ_COUNT_CTOR(nsMessageManagerScriptExecutor); }
+  ~nsMessageManagerScriptExecutor() { MOZ_COUNT_DTOR(nsMessageManagerScriptExecutor); }
 
   void DidCreateGlobal();
-  void LoadFrameScriptInternal(const nsAString& aURL, bool aRunInGlobalScope);
+  void LoadScriptInternal(const nsAString& aURL, bool aRunInGlobalScope);
   void TryCacheLoadAndCompileScript(const nsAString& aURL,
                                     bool aRunInGlobalScope,
                                     bool aShouldCache,
                                     JS::MutableHandle<JSScript*> aScriptp);
   void TryCacheLoadAndCompileScript(const nsAString& aURL,
                                     bool aRunInGlobalScope);
-  bool InitTabChildGlobalInternal(nsISupports* aScope, const nsACString& aID);
+  bool InitChildGlobalInternal(nsISupports* aScope, const nsACString& aID);
   nsCOMPtr<nsIXPConnectJSObjectHolder> mGlobal;
   nsCOMPtr<nsIPrincipal> mPrincipal;
   nsAutoTArray<JS::Heap<JSObject*>, 2> mAnonymousGlobalScopes;
 
-  static nsDataHashtable<nsStringHashKey, nsFrameScriptObjectExecutorHolder*>* sCachedScripts;
+  static nsDataHashtable<nsStringHashKey, nsMessageManagerScriptHolder*>* sCachedScripts;
   static nsScriptCacheCleaner* sScriptCacheCleaner;
 };
 
@@ -426,7 +442,7 @@
                         const char *aTopic,
                         const char16_t *aData) MOZ_OVERRIDE
   {
-    nsFrameScriptExecutor::Shutdown();
+    nsMessageManagerScriptExecutor::Shutdown();
     return NS_OK;
   }
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsGkAtomList.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsGkAtomList.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsGkAtomList.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsGkAtomList.h	2015-02-28 15:03:05.000000000 +0000
@@ -605,7 +605,6 @@
 GK_ATOM(mousethrough, "mousethrough")
 GK_ATOM(mouseup, "mouseup")
 GK_ATOM(mozaudiochannel, "mozaudiochannel")
-GK_ATOM(mozasyncpanzoom, "mozasyncpanzoom")
 GK_ATOM(mozfullscreenchange, "mozfullscreenchange")
 GK_ATOM(mozfullscreenerror, "mozfullscreenerror")
 GK_ATOM(mozpasspointerevents, "mozpasspointerevents")
@@ -2297,6 +2296,7 @@
 GK_ATOM(spelling, "spelling")
 GK_ATOM(spinbutton, "spinbutton")
 GK_ATOM(status, "status")
+GK_ATOM(_switch, "switch")
 GK_ATOM(tableCellIndex, "table-cell-index")
 GK_ATOM(tablist, "tablist")
 GK_ATOM(textIndent, "text-indent")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsGlobalWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsGlobalWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsGlobalWindow.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsGlobalWindow.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1057,13 +1057,15 @@
 nsChromeOuterWindowProxy::singleton;
 
 static JSObject*
-NewOuterWindowProxy(JSContext *cx, JS::Handle<JSObject*> parent, bool isChrome)
+NewOuterWindowProxy(JSContext *cx, JS::Handle<JSObject*> global, bool isChrome)
 {
-  JSAutoCompartment ac(cx, parent);
+  JSAutoCompartment ac(cx, global);
+  MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(global) == global);
+
   js::WrapperOptions options;
   options.setClass(&OuterWindowProxyClass);
   options.setSingleton(true);
-  JSObject *obj = js::Wrapper::New(cx, parent, parent,
+  JSObject *obj = js::Wrapper::New(cx, global,
                                    isChrome ? &nsChromeOuterWindowProxy::singleton
                                             : &nsOuterWindowProxy::singleton,
                                    options);
@@ -2597,21 +2599,10 @@
 
       SetWrapper(outerObject);
 
-      {
-        JSAutoCompartment ac(cx, outerObject);
-
-        JS_SetParent(cx, outerObject, newInnerGlobal);
-
-        // Inform the nsJSContext, which is the canonical holder of the outer.
-        mContext->SetWindowProxy(outerObject);
+      MOZ_ASSERT(js::GetObjectParent(outerObject) == newInnerGlobal);
 
-        NS_ASSERTION(!JS_IsExceptionPending(cx),
-                     "We might overwrite a pending exception!");
-        XPCWrappedNativeScope* scope = xpc::ObjectScope(outerObject);
-        if (scope->mWaiverWrapperMap) {
-          scope->mWaiverWrapperMap->Reparent(cx, newInnerGlobal);
-        }
-      }
+      // Inform the nsJSContext, which is the canonical holder of the outer.
+      mContext->SetWindowProxy(outerObject);
     }
 
     // Enter the new global's compartment.
@@ -9188,7 +9179,7 @@
                             (aUrl, aArgument, aOptions, aError), aError,
                             nullptr);
 
-  if (!IsShowModalDialogEnabled()) {
+  if (!IsShowModalDialogEnabled() || XRE_GetProcessType() == GeckoProcessType_Content) {
     aError.Throw(NS_ERROR_NOT_AVAILABLE);
     return nullptr;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsHostObjectProtocolHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsHostObjectProtocolHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsHostObjectProtocolHandler.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsHostObjectProtocolHandler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -518,26 +518,12 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIChannel> channel;
-  // Bug 1087720 (and Bug 1099296):
-  // Once all callsites have been updated to call NewChannel2() instead of NewChannel()
-  // we should have a non-null loadInfo consistently. Until then we have to brach on the
-  // loadInfo and provide default arguments to create a NewInputStreamChannel.
-  if (aLoadInfo) {
-    rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
-                                          uri,
-                                          stream,
-                                          EmptyCString(), // aContentType
-                                          EmptyCString(), // aContentCharset
-                                          aLoadInfo);
-  }
-  else {
-    rv = NS_NewInputStreamChannel(getter_AddRefs(channel),
-                                  uri,
-                                  stream,
-                                  info->mPrincipal,
-                                  nsILoadInfo::SEC_NORMAL,
-                                  nsIContentPolicy::TYPE_OTHER);
-  }
+  rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
+                                        uri,
+                                        stream,
+                                        EmptyCString(), // aContentType
+                                        EmptyCString(), // aContentCharset
+                                        aLoadInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsString type;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIContentPolicyBase.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIContentPolicyBase.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIContentPolicyBase.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIContentPolicyBase.idl	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,223 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=cpp tw=78 sw=2 et ts=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/. */
+
+#include "nsISupports.idl"
+
+interface nsIURI;
+interface nsIDOMNode;
+interface nsIPrincipal;
+
+/**
+ * The type of nsIContentPolicy::TYPE_*
+ */
+typedef unsigned long nsContentPolicyType;
+
+/**
+ * Interface for content policy mechanism.  Implementations of this
+ * interface can be used to control loading of various types of out-of-line
+ * content, or processing of certain types of in-line content.
+ *
+ * WARNING: do not block the caller from shouldLoad or shouldProcess (e.g.,
+ * by launching a dialog to prompt the user for something).
+ */
+
+[scriptable,uuid(21bb54b0-ab3c-11e4-bcd8-0800200c9a66)]
+interface nsIContentPolicyBase : nsISupports
+{
+  /**
+   * Indicates a unset or bogus policy type.
+   */
+  const nsContentPolicyType TYPE_INVALID = 0;
+
+  /**
+   * Gecko/Firefox developers: Avoid using TYPE_OTHER. Especially for
+   * requests that are coming from webpages. Or requests in general which
+   * you expect that security checks will be done on.
+   * Always use a more specific type if one is available. And do not hesitate
+   * to add more types as appropriate.
+   * But if you are fairly sure that no one would care about your more specific
+   * type, then it's ok to use TYPE_OTHER.
+   *
+   * Extension developers: Whenever it is reasonable, use one of the existing
+   * content types. If none of the existing content types are right for
+   * something you are doing, file a bug in the Core/DOM component that
+   * includes a patch that adds your new content type to the end of the list of
+   * TYPE_* constants here. But, don't start using your new content type until
+   * your patch has been accepted, because it will be uncertain what exact
+   * value and name your new content type will have; in that interim period,
+   * use TYPE_OTHER. In your patch, document your new content type in the style
+   * of the existing ones. In the bug you file, provide a more detailed
+   * description of the new type of content you want Gecko to support, so that
+   * the existing implementations of nsIContentPolicy can be properly modified
+   * to deal with that new type of content.
+   *
+   * Implementations of nsIContentPolicy should treat this the same way they
+   * treat unknown types, because existing users of TYPE_OTHER may be converted
+   * to use new content types.
+   */
+  const nsContentPolicyType TYPE_OTHER = 1;
+
+  /**
+   * Indicates an executable script (such as JavaScript).
+   */
+  const nsContentPolicyType TYPE_SCRIPT = 2;
+
+  /**
+   * Indicates an image (e.g., IMG elements).
+   */
+  const nsContentPolicyType TYPE_IMAGE = 3;
+
+  /**
+   * Indicates a stylesheet (e.g., STYLE elements).
+   */
+  const nsContentPolicyType TYPE_STYLESHEET = 4;
+
+  /**
+   * Indicates a generic object (plugin-handled content typically falls under
+   * this category).
+   */
+  const nsContentPolicyType TYPE_OBJECT = 5;
+
+  /**
+   * Indicates a document at the top-level (i.e., in a browser).
+   */
+  const nsContentPolicyType TYPE_DOCUMENT = 6;
+
+  /**
+   * Indicates a document contained within another document (e.g., IFRAMEs,
+   * FRAMES, and OBJECTs).
+   */
+  const nsContentPolicyType TYPE_SUBDOCUMENT = 7;
+
+  /**
+   * Indicates a timed refresh.
+   *
+   * shouldLoad will never get this, because it does not represent content
+   * to be loaded (the actual load triggered by the refresh will go through
+   * shouldLoad as expected).
+   *
+   * shouldProcess will get this for, e.g., META Refresh elements and HTTP
+   * Refresh headers.
+   */
+  const nsContentPolicyType TYPE_REFRESH = 8;
+
+  /**
+   * Indicates an XBL binding request, triggered either by -moz-binding CSS
+   * property.
+   */
+  const nsContentPolicyType TYPE_XBL = 9;
+
+  /**
+   * Indicates a ping triggered by a click on <A PING="..."> element.
+   */
+  const nsContentPolicyType TYPE_PING = 10;
+
+  /**
+   * Indicates an XMLHttpRequest. Also used for document.load and for EventSource.
+   */
+  const nsContentPolicyType TYPE_XMLHTTPREQUEST = 11;
+  const nsContentPolicyType TYPE_DATAREQUEST    = 11; // alias
+
+  /**
+   * Indicates a request by a plugin.
+   */
+  const nsContentPolicyType TYPE_OBJECT_SUBREQUEST = 12;
+
+  /**
+   * Indicates a DTD loaded by an XML document.
+   */
+  const nsContentPolicyType TYPE_DTD = 13;
+
+  /**
+   * Indicates a font loaded via @font-face rule.
+   */
+  const nsContentPolicyType TYPE_FONT = 14;
+
+  /**
+   * Indicates a video or audio load.
+   */
+  const nsContentPolicyType TYPE_MEDIA = 15;
+
+  /**
+   * Indicates a WebSocket load.
+   */
+  const nsContentPolicyType TYPE_WEBSOCKET = 16;
+
+  /**
+   * Indicates a Content Security Policy report.
+   */
+  const nsContentPolicyType TYPE_CSP_REPORT = 17;
+
+  /**
+   * Indicates a style sheet transformation.
+   */
+  const nsContentPolicyType TYPE_XSLT = 18;
+
+  /**
+   * Indicates a beacon post.
+   */
+  const nsContentPolicyType TYPE_BEACON = 19;
+
+  /**
+   * Indicates a load initiated by the fetch() function from the Fetch
+   * specification.
+   */
+  const nsContentPolicyType TYPE_FETCH = 20;
+
+  /**
+   * Indicates a <img srcset> or <picture> request.
+   */
+  const nsContentPolicyType TYPE_IMAGESET = 21;
+
+  /* When adding new content types, please update nsContentBlocker,
+   * NS_CP_ContentTypeName, nsCSPContext, all nsIContentPolicy
+   * implementations, and other things that are not listed here that are
+   * related to nsIContentPolicy. */
+
+  //////////////////////////////////////////////////////////////////////
+
+  /**
+   * Returned from shouldLoad or shouldProcess if the load or process request
+   * is rejected based on details of the request.
+   */
+  const short REJECT_REQUEST = -1;
+
+  /**
+   * Returned from shouldLoad or shouldProcess if the load/process is rejected
+   * based solely on its type (of the above flags).
+   *
+   * NOTE that it is not meant to stop future requests for this type--only the
+   * current request.
+   */
+  const short REJECT_TYPE = -2;
+
+  /**
+   * Returned from shouldLoad or shouldProcess if the load/process is rejected
+   * based on the server it is hosted on or requested from (aContentLocation or
+   * aRequestOrigin), e.g., if you block an IMAGE because it is served from
+   * goatse.cx (even if you don't necessarily block other types from that
+   * server/domain).
+   *
+   * NOTE that it is not meant to stop future requests for this server--only the
+   * current request.
+   */
+  const short REJECT_SERVER = -3;
+
+  /**
+   * Returned from shouldLoad or shouldProcess if the load/process is rejected
+   * based on some other criteria. Mozilla callers will handle this like
+   * REJECT_REQUEST; third-party implementors may, for example, use this to
+   * direct their own callers to consult the extra parameter for additional
+   * details.
+   */
+  const short REJECT_OTHER = -4;
+
+  /**
+   * Returned from shouldLoad or shouldProcess if the load or process request
+   * is not rejected.
+   */
+  const short ACCEPT = 1;
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIContentPolicy.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIContentPolicy.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIContentPolicy.idl	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIContentPolicy.idl	2015-02-28 15:03:05.000000000 +0000
@@ -5,17 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsISupports.idl"
+#include "nsIContentPolicyBase.idl"
 
 interface nsIURI;
 interface nsIDOMNode;
 interface nsIPrincipal;
 
 /**
- * The type of nsIContentPolicy::TYPE_*
- */
-typedef unsigned long nsContentPolicyType;
-
-/**
  * Interface for content policy mechanism.  Implementations of this
  * interface can be used to control loading of various types of out-of-line
  * content, or processing of certain types of in-line content.
@@ -24,206 +20,10 @@
  * by launching a dialog to prompt the user for something).
  */
 
-[scriptable,uuid(94513f07-d559-480e-8879-6249852365ea)]
-interface nsIContentPolicy : nsISupports
+[scriptable,uuid(447a2300-ab3c-11e4-bcd8-0800200c9a66)]
+interface nsIContentPolicy : nsIContentPolicyBase
 {
   /**
-   * Indicates a unset or bogus policy type.
-   */
-  const nsContentPolicyType TYPE_INVALID = 0;
-
-  /**
-   * Gecko/Firefox developers: Avoid using TYPE_OTHER. Especially for
-   * requests that are coming from webpages. Or requests in general which
-   * you expect that security checks will be done on.
-   * Always use a more specific type if one is available. And do not hesitate
-   * to add more types as appropriate.
-   * But if you are fairly sure that no one would care about your more specific
-   * type, then it's ok to use TYPE_OTHER.
-   *
-   * Extension developers: Whenever it is reasonable, use one of the existing
-   * content types. If none of the existing content types are right for
-   * something you are doing, file a bug in the Core/DOM component that
-   * includes a patch that adds your new content type to the end of the list of
-   * TYPE_* constants here. But, don't start using your new content type until
-   * your patch has been accepted, because it will be uncertain what exact
-   * value and name your new content type will have; in that interim period,
-   * use TYPE_OTHER. In your patch, document your new content type in the style
-   * of the existing ones. In the bug you file, provide a more detailed
-   * description of the new type of content you want Gecko to support, so that
-   * the existing implementations of nsIContentPolicy can be properly modified
-   * to deal with that new type of content.
-   *
-   * Implementations of nsIContentPolicy should treat this the same way they
-   * treat unknown types, because existing users of TYPE_OTHER may be converted
-   * to use new content types.
-   */
-  const nsContentPolicyType TYPE_OTHER = 1;
-
-  /**
-   * Indicates an executable script (such as JavaScript).
-   */
-  const nsContentPolicyType TYPE_SCRIPT = 2;
-
-  /**
-   * Indicates an image (e.g., IMG elements).
-   */
-  const nsContentPolicyType TYPE_IMAGE = 3;
-
-  /**
-   * Indicates a stylesheet (e.g., STYLE elements).
-   */
-  const nsContentPolicyType TYPE_STYLESHEET = 4;
-
-  /**
-   * Indicates a generic object (plugin-handled content typically falls under
-   * this category).
-   */
-  const nsContentPolicyType TYPE_OBJECT = 5;
-
-  /**
-   * Indicates a document at the top-level (i.e., in a browser).
-   */
-  const nsContentPolicyType TYPE_DOCUMENT = 6;
-
-  /**
-   * Indicates a document contained within another document (e.g., IFRAMEs,
-   * FRAMES, and OBJECTs).
-   */
-  const nsContentPolicyType TYPE_SUBDOCUMENT = 7;
-
-  /**
-   * Indicates a timed refresh.
-   *
-   * shouldLoad will never get this, because it does not represent content
-   * to be loaded (the actual load triggered by the refresh will go through
-   * shouldLoad as expected).
-   *
-   * shouldProcess will get this for, e.g., META Refresh elements and HTTP
-   * Refresh headers.
-   */
-  const nsContentPolicyType TYPE_REFRESH = 8;
-
-  /**
-   * Indicates an XBL binding request, triggered either by -moz-binding CSS
-   * property.
-   */
-  const nsContentPolicyType TYPE_XBL = 9;
-
-  /**
-   * Indicates a ping triggered by a click on <A PING="..."> element.
-   */
-  const nsContentPolicyType TYPE_PING = 10;
-
-  /**
-   * Indicates an XMLHttpRequest. Also used for document.load and for EventSource.
-   */
-  const nsContentPolicyType TYPE_XMLHTTPREQUEST = 11;
-  const nsContentPolicyType TYPE_DATAREQUEST    = 11; // alias
-
-  /**
-   * Indicates a request by a plugin.
-   */
-  const nsContentPolicyType TYPE_OBJECT_SUBREQUEST = 12;
-
-  /**
-   * Indicates a DTD loaded by an XML document.
-   */
-  const nsContentPolicyType TYPE_DTD = 13;
-
-  /**
-   * Indicates a font loaded via @font-face rule.
-   */
-  const nsContentPolicyType TYPE_FONT = 14;
-
-  /**
-   * Indicates a video or audio load.
-   */
-  const nsContentPolicyType TYPE_MEDIA = 15;
-
-  /**
-   * Indicates a WebSocket load.
-   */
-  const nsContentPolicyType TYPE_WEBSOCKET = 16;
-
-  /**
-   * Indicates a Content Security Policy report.
-   */
-  const nsContentPolicyType TYPE_CSP_REPORT = 17;
-
-  /**
-   * Indicates a style sheet transformation.
-   */
-  const nsContentPolicyType TYPE_XSLT = 18;
-
-  /**
-   * Indicates a beacon post.
-   */
-  const nsContentPolicyType TYPE_BEACON = 19;
-
-  /**
-   * Indicates a load initiated by the fetch() function from the Fetch
-   * specification.
-   */
-  const nsContentPolicyType TYPE_FETCH = 20;
-
-  /**
-   * Indicates a <img srcset> or <picture> request.
-   */
-  const nsContentPolicyType TYPE_IMAGESET = 21;
-
-  /* When adding new content types, please update nsContentBlocker,
-   * NS_CP_ContentTypeName, nsCSPContext, all nsIContentPolicy
-   * implementations, and other things that are not listed here that are
-   * related to nsIContentPolicy. */
-
-  //////////////////////////////////////////////////////////////////////
-
-  /**
-   * Returned from shouldLoad or shouldProcess if the load or process request
-   * is rejected based on details of the request.
-   */
-  const short REJECT_REQUEST = -1;
-
-  /**
-   * Returned from shouldLoad or shouldProcess if the load/process is rejected
-   * based solely on its type (of the above flags).
-   *
-   * NOTE that it is not meant to stop future requests for this type--only the
-   * current request.
-   */
-  const short REJECT_TYPE = -2;
-
-  /**
-   * Returned from shouldLoad or shouldProcess if the load/process is rejected
-   * based on the server it is hosted on or requested from (aContentLocation or
-   * aRequestOrigin), e.g., if you block an IMAGE because it is served from
-   * goatse.cx (even if you don't necessarily block other types from that
-   * server/domain).
-   *
-   * NOTE that it is not meant to stop future requests for this server--only the
-   * current request.
-   */
-  const short REJECT_SERVER = -3;
-
-  /**
-   * Returned from shouldLoad or shouldProcess if the load/process is rejected
-   * based on some other criteria. Mozilla callers will handle this like
-   * REJECT_REQUEST; third-party implementors may, for example, use this to
-   * direct their own callers to consult the extra parameter for additional
-   * details.
-   */
-  const short REJECT_OTHER = -4;
-
-  /**
-   * Returned from shouldLoad or shouldProcess if the load or process request
-   * is not rejected.
-   */
-  const short ACCEPT = 1;
-
-  //////////////////////////////////////////////////////////////////////
-
-  /**
    * Should the resource at this location be loaded?
    * ShouldLoad will be called before loading the resource at aContentLocation
    * to determine whether to start the load at all.
@@ -328,5 +128,4 @@
                       in ACString      aMimeType,
                       in nsISupports   aExtra,
                       [optional] in nsIPrincipal  aRequestPrincipal);
-
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIMessageManager.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIMessageManager.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIMessageManager.idl	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIMessageManager.idl	2015-02-28 15:03:05.000000000 +0000
@@ -341,35 +341,39 @@
                        [optional] in nsIPrincipal principal);
 };
 
-[scriptable, builtinclass, uuid(894ff2d4-39a3-4df8-9d76-8ee329975488)]
-interface nsIContentFrameMessageManager : nsISyncMessageSender
+[scriptable, builtinclass, uuid(e04a7ade-c61a-46ec-9f13-efeabedd9d3d)]
+interface nsIMessageManagerGlobal : nsISyncMessageSender
 {
   /**
-   * The current top level window in the frame or null.
+   * Print a string to stdout.
    */
-  readonly attribute nsIDOMWindow content;
+  void dump(in DOMString aStr);
 
   /**
-   * The top level docshell or null.
+   * If leak detection is enabled, print a note to the leak log that this
+   * process will intentionally crash.
    */
-  readonly attribute nsIDocShell docShell;
+  void privateNoteIntentionalCrash();
 
   /**
-   * Print a string to stdout.
+   * Ascii base64 data to binary data and vice versa
    */
-  void dump(in DOMString aStr);
+  DOMString atob(in DOMString aAsciiString);
+  DOMString btoa(in DOMString aBase64Data);
+};
 
+[scriptable, builtinclass, uuid(fff36099-9f84-4c7c-b69a-1cbf103d1708)]
+interface nsIContentFrameMessageManager : nsIMessageManagerGlobal
+{
   /**
-   * If leak detection is enabled, print a note to the leak log that this
-   * process will intentionally crash.
+   * The current top level window in the frame or null.
    */
-  void privateNoteIntentionalCrash();
+  readonly attribute nsIDOMWindow content;
 
-   /**
-    * Ascii base64 data to binary data and vice versa
-    */
-   DOMString atob(in DOMString aAsciiString);
-   DOMString btoa(in DOMString aBase64Data);
+  /**
+   * The top level docshell or null.
+   */
+  readonly attribute nsIDocShell docShell;
 };
 
 [uuid(a2325927-9c0c-437d-9215-749c79235031)]
@@ -378,6 +382,11 @@
   [notxpcom] nsIContent getOwnerContent();
 };
 
+[scriptable, builtinclass, uuid(9ca95410-b253-11e4-ab27-0800200c9a66)]
+interface nsIContentProcessMessageManager : nsIMessageManagerGlobal
+{
+};
+
 [scriptable, builtinclass, uuid(6fb78110-45ae-11e3-8f96-0800200c9a66)]
 interface nsIFrameScriptLoader : nsISupports
 {
@@ -405,6 +414,31 @@
   jsval getDelayedFrameScripts();
 };
 
+[scriptable, builtinclass, uuid(7e1e1a20-b24f-11e4-ab27-0800200c9a66)]
+interface nsIProcessScriptLoader : nsISupports
+{
+  /**
+   * Load a script in the (possibly remote) process. aURL must be the absolute URL.
+   * data: URLs are also supported. For example data:,dump("foo\n");
+   * If aAllowDelayedLoad is true, script will be loaded when the
+   * remote frame becomes available. Otherwise the script will be loaded
+   * only if the frame is already available.
+   */
+  void loadProcessScript(in AString aURL, in boolean aAllowDelayedLoad);
+
+  /**
+   * Removes aURL from the list of scripts which support delayed load.
+   */
+  void removeDelayedProcessScript(in AString aURL);
+
+  /**
+   * Returns all delayed scripts that will be loaded once a (remote)
+   * frame becomes available. The return value is a list of URLs.
+   */
+  [implicit_jscontext]
+  jsval getDelayedProcessScripts();
+};
+
 [scriptable, builtinclass, uuid(637e8538-4f8f-4a3d-8510-e74386233e19)]
 interface nsIProcessChecker : nsISupports
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsInProcessTabChildGlobal.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsInProcessTabChildGlobal.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsInProcessTabChildGlobal.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsInProcessTabChildGlobal.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -129,6 +129,7 @@
 NS_IMETHODIMP_(bool)
 nsInProcessTabChildGlobal::MarkForCC()
 {
+  MarkScopesForCC();
   return mMessageManager ? mMessageManager->MarkForCC() : false;
 }
 
@@ -205,27 +206,6 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsInProcessTabChildGlobal::Btoa(const nsAString& aBinaryData,
-                            nsAString& aAsciiBase64String)
-{
-  return nsContentUtils::Btoa(aBinaryData, aAsciiBase64String);
-}
-
-NS_IMETHODIMP
-nsInProcessTabChildGlobal::Atob(const nsAString& aAsciiString,
-                            nsAString& aBinaryData)
-{
-  return nsContentUtils::Atob(aAsciiString, aBinaryData);
-}
-
-
-NS_IMETHODIMP
-nsInProcessTabChildGlobal::PrivateNoteIntentionalCrash()
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 void
 nsInProcessTabChildGlobal::Disconnect()
 {
@@ -318,7 +298,7 @@
     id.Append(u);
   }
   nsISupports* scopeSupports = NS_ISUPPORTS_CAST(EventTarget*, this);
-  NS_ENSURE_STATE(InitTabChildGlobalInternal(scopeSupports, id));
+  NS_ENSURE_STATE(InitChildGlobalInternal(scopeSupports, id));
   return NS_OK;
 }
 
@@ -352,6 +332,6 @@
   }
   bool tmp = mLoadingScript;
   mLoadingScript = true;
-  LoadFrameScriptInternal(aURL, aRunInGlobalScope);
+  LoadScriptInternal(aURL, aRunInGlobalScope);
   mLoadingScript = tmp;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsInProcessTabChildGlobal.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsInProcessTabChildGlobal.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsInProcessTabChildGlobal.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsInProcessTabChildGlobal.h	2015-02-28 15:03:05.000000000 +0000
@@ -28,7 +28,7 @@
 } // namespace mozilla
 
 class nsInProcessTabChildGlobal : public mozilla::DOMEventTargetHelper,
-                                  public nsFrameScriptExecutor,
+                                  public nsMessageManagerScriptExecutor,
                                   public nsIInProcessContentFrameMessageManager,
                                   public nsIGlobalObject,
                                   public nsIScriptObjectPrincipal,
@@ -44,6 +44,7 @@
 
   NS_FORWARD_SAFE_NSIMESSAGELISTENERMANAGER(mMessageManager)
   NS_FORWARD_SAFE_NSIMESSAGESENDER(mMessageManager)
+  NS_FORWARD_SAFE_NSIMESSAGEMANAGERGLOBAL(mMessageManager)
   NS_IMETHOD SendSyncMessage(const nsAString& aMessageName,
                              JS::Handle<JS::Value> aObject,
                              JS::Handle<JS::Value> aRemote,
@@ -72,15 +73,6 @@
   }
   NS_IMETHOD GetContent(nsIDOMWindow** aContent) MOZ_OVERRIDE;
   NS_IMETHOD GetDocShell(nsIDocShell** aDocShell) MOZ_OVERRIDE;
-  NS_IMETHOD Dump(const nsAString& aStr) MOZ_OVERRIDE
-  {
-    return mMessageManager ? mMessageManager->Dump(aStr) : NS_OK;
-  }
-  NS_IMETHOD PrivateNoteIntentionalCrash() MOZ_OVERRIDE;
-  NS_IMETHOD Btoa(const nsAString& aBinaryData,
-                  nsAString& aAsciiBase64String) MOZ_OVERRIDE;
-  NS_IMETHOD Atob(const nsAString& aAsciiString,
-                  nsAString& aBinaryData) MOZ_OVERRIDE;
 
   NS_DECL_NSIINPROCESSCONTENTFRAMEMESSAGEMANAGER
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsISimpleContentPolicy.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsISimpleContentPolicy.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsISimpleContentPolicy.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsISimpleContentPolicy.idl	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,147 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ft=cpp tw=78 sw=2 et ts=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/. */
+
+#include "nsISupports.idl"
+#include "nsIContentPolicyBase.idl"
+
+interface nsIURI;
+interface nsIDOMNode;
+interface nsIPrincipal;
+interface nsIDOMElement;
+
+/**
+ * Interface for content policy mechanism.  Implementations of this
+ * interface can be used to control loading of various types of out-of-line
+ * content, or processing of certain types of in-line content.
+ *
+ * This interface differs from nsIContentPolicy in that it offers less control
+ * (the DOM node doing the load is not provided) but more flexibility for
+ * Gecko. In particular, this interface allows an add-on in the chrome process
+ * to block loads without using cross-process wrappers (CPOWs). Add-ons should
+ * prefer this interface to nsIContentPolicy because it should be faster in
+ * e10s. In the future, it may also be run asynchronously.
+ *
+ * WARNING: do not block the caller from shouldLoad or shouldProcess (e.g.,
+ * by launching a dialog to prompt the user for something).
+ */
+
+[scriptable,uuid(83d93c70-ab46-11e4-bcd8-0800200c9a66)]
+interface nsISimpleContentPolicy : nsIContentPolicyBase
+{
+  /**
+   * Should the resource at this location be loaded?
+   * ShouldLoad will be called before loading the resource at aContentLocation
+   * to determine whether to start the load at all.
+   *
+   * @param aContentType      the type of content being tested. This will be one
+   *                          one of the TYPE_* constants.
+   *
+   * @param aContentLocation  the location of the content being checked; must
+   *                          not be null
+   *
+   * @param aRequestOrigin    OPTIONAL. the location of the resource that
+   *                          initiated this load request; can be null if
+   *                          inapplicable
+   *
+   * @param aTopFrameElement  OPTIONAL. The top frame element (typically a
+   *                          <xul:browser> element) that initiated the
+   *                          request. In a content process, this argument
+   *                          will be null.
+   *
+   * @param aIsTopLevel       OPTIONAL. True iff the request was initiated
+   *                          from a frame where |window.top === window|.
+   *
+   * @param aMimeTypeGuess    OPTIONAL. a guess for the requested content's
+   *                          MIME type, based on information available to
+   *                          the request initiator (e.g., an OBJECT's type
+   *                          attribute); does not reliably reflect the
+   *                          actual MIME type of the requested content
+   *
+   * @param aExtra            an OPTIONAL argument, pass-through for non-Gecko
+   *                          callers to pass extra data to callees.
+   *
+   * @param aRequestPrincipal an OPTIONAL argument, defines the principal that
+   *                          caused the load. This is optional only for
+   *                          non-gecko code: all gecko code should set this
+   *                          argument.  For navigation events, this is
+   *                          the principal of the page that caused this load.
+   *
+   * @return ACCEPT or REJECT_*
+   *
+   * @note shouldLoad can be called while the DOM and layout of the document
+   * involved is in an inconsistent state.  This means that implementors of
+   * this method MUST NOT do any of the following:
+   * 1)  Modify the DOM in any way (e.g. setting attributes is a no-no).
+   * 2)  Query any DOM properties that depend on layout (e.g. offset*
+   *     properties).
+   * 3)  Query any DOM properties that depend on style (e.g. computed style).
+   * 4)  Query any DOM properties that depend on the current state of the DOM
+   *     outside the "context" node (e.g. lengths of node lists).
+   * 5)  [JavaScript implementations only] Access properties of any sort on any
+   *     object without using XPCNativeWrapper (either explicitly or
+   *     implicitly).  Due to various DOM0 things, this leads to item 4.
+   * If you do any of these things in your shouldLoad implementation, expect
+   * unpredictable behavior, possibly including crashes, content not showing
+   * up, content showing up doubled, etc.  If you need to do any of the things
+   * above, do them off timeout or event.
+   */
+  short shouldLoad(in nsContentPolicyType aContentType,
+                   in nsIURI        aContentLocation,
+                   in nsIURI        aRequestOrigin,
+                   in nsIDOMElement aTopFrameElement,
+                   in boolean       aIsTopLevel,
+                   in ACString      aMimeTypeGuess,
+                   in nsISupports   aExtra,
+                   in nsIPrincipal  aRequestPrincipal);
+
+  /**
+   * Should the resource be processed?
+   * ShouldProcess will be called once all the information passed to it has
+   * been determined about the resource, typically after part of the resource
+   * has been loaded.
+   *
+   * @param aContentType      the type of content being tested. This will be one
+   *                          one of the TYPE_* constants.
+   *
+   * @param aContentLocation  OPTIONAL; the location of the resource being
+   *                          requested: MAY be, e.g., a post-redirection URI
+   *                          for the resource.
+   *
+   * @param aRequestOrigin    OPTIONAL. the location of the resource that
+   *                          initiated this load request; can be null if
+   *                          inapplicable
+   *
+   * @param aTopFrameElement  OPTIONAL. The top frame element (typically a
+   *                          <xul:browser> element) that initiated the
+   *                          request. In a content process, this argument
+   *                          will be null.
+   *
+   * @param aIsTopLevel       OPTIONAL. True iff the request was initiated
+   *                          from a frame where |window.top === window|.
+   *
+   * @param aMimeType         the MIME type of the requested resource (e.g.,
+   *                          image/png), as reported by the networking library,
+   *                          if available (may be empty if inappropriate for
+   *                          the type, e.g., TYPE_REFRESH).
+   *
+   * @param aExtra            an OPTIONAL argument, pass-through for non-Gecko
+   *                          callers to pass extra data to callees.
+   *
+   * @return ACCEPT or REJECT_*
+   *
+   * @note shouldProcess can be called while the DOM and layout of the document
+   * involved is in an inconsistent state.  See the note on shouldLoad to see
+   * what this means for implementors of this method.
+   */
+  short shouldProcess(in nsContentPolicyType aContentType,
+                      in nsIURI        aContentLocation,
+                      in nsIURI        aRequestOrigin,
+                      in nsIDOMElement aTopFrameElement,
+                      in boolean       aIsTopLevel,
+                      in ACString      aMimeType,
+                      in nsISupports   aExtra,
+                      in nsIPrincipal  aRequestPrincipal);
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIXMLHttpRequest.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIXMLHttpRequest.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsIXMLHttpRequest.idl	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsIXMLHttpRequest.idl	2015-02-28 15:03:05.000000000 +0000
@@ -68,7 +68,7 @@
  * you're aware of all the security implications.  And then think twice about
  * it.
  */
-[scriptable, uuid(704e91dc-a3f6-4e4d-9f5f-4bb85159aeb7)]
+[scriptable, uuid(6f54214c-7175-498d-9d2d-0429e38c2869)]
 interface nsIXMLHttpRequest : nsISupports
 {
   /**
@@ -211,15 +211,6 @@
   void   send([optional] in nsIVariant body);
 
   /**
-   * A variant of the send() method used to send binary data.
-   *
-   * @param body The request body as a DOM string.  The string data will be
-   *             converted to a single-byte string by truncation (i.e., the
-   *             high-order byte of each character will be discarded).
-   */
-  void   sendAsBinary(in DOMString body);
-
-  /**
    * Sets a HTTP request header for HTTP requests. You must call open
    * before setting the request headers.
    *
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSEnvironment.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSEnvironment.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSEnvironment.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSEnvironment.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -107,6 +107,10 @@
 
 #define NS_FULL_GC_DELAY            60000 // ms
 
+// The amount of time to wait from the user being idle to starting a shrinking
+// GC.
+#define NS_SHRINKING_GC_DELAY       15000 // ms
+
 // Maximum amount of time that should elapse between incremental GC slices
 #define NS_INTERSLICE_GC_DELAY      100 // ms
 
@@ -148,6 +152,7 @@
 
 static nsITimer *sGCTimer;
 static nsITimer *sShrinkGCBuffersTimer;
+static nsITimer *sShrinkingGCTimer;
 static nsITimer *sCCTimer;
 static nsITimer *sICCTimer;
 static nsITimer *sFullGCTimer;
@@ -212,6 +217,7 @@
 // the appropriate pref is set.
 
 static bool sGCOnMemoryPressure;
+static bool sCompactOnUserInactive;
 
 // In testing, we call RunNextCollectorTimer() to ensure that the collectors are run more
 // aggressively than they would be in regular browsing. sExpensiveCollectorPokes keeps
@@ -234,6 +240,7 @@
 KillTimers()
 {
   nsJSContext::KillGCTimer();
+  nsJSContext::KillShrinkingGCTimer();
   nsJSContext::KillShrinkGCBuffersTimer();
   nsJSContext::KillCCTimer();
   nsJSContext::KillICCTimer();
@@ -266,22 +273,30 @@
 nsJSEnvironmentObserver::Observe(nsISupports* aSubject, const char* aTopic,
                                  const char16_t* aData)
 {
-  if (sGCOnMemoryPressure && !nsCRT::strcmp(aTopic, "memory-pressure")) {
-    if(StringBeginsWith(nsDependentString(aData),
-                        NS_LITERAL_STRING("low-memory-ongoing"))) {
-      // Don't GC/CC if we are in an ongoing low-memory state since its very
-      // slow and it likely won't help us anyway.
-      return NS_OK;
-    }
-    nsJSContext::GarbageCollectNow(JS::gcreason::MEM_PRESSURE,
-                                   nsJSContext::NonIncrementalGC,
-                                   nsJSContext::ShrinkingGC);
-    nsJSContext::CycleCollectNow();
-    if (NeedsGCAfterCC()) {
+  if (!nsCRT::strcmp(aTopic, "memory-pressure")) {
+    if (sGCOnMemoryPressure) {
+      if(StringBeginsWith(nsDependentString(aData),
+                          NS_LITERAL_STRING("low-memory-ongoing"))) {
+        // Don't GC/CC if we are in an ongoing low-memory state since its very
+        // slow and it likely won't help us anyway.
+        return NS_OK;
+      }
       nsJSContext::GarbageCollectNow(JS::gcreason::MEM_PRESSURE,
                                      nsJSContext::NonIncrementalGC,
                                      nsJSContext::ShrinkingGC);
+      nsJSContext::CycleCollectNow();
+      if (NeedsGCAfterCC()) {
+        nsJSContext::GarbageCollectNow(JS::gcreason::MEM_PRESSURE,
+                                       nsJSContext::NonIncrementalGC,
+                                       nsJSContext::ShrinkingGC);
+      }
     }
+  } else if (!nsCRT::strcmp(aTopic, "user-interaction-inactive")) {
+    if (sCompactOnUserInactive) {
+      nsJSContext::PokeShrinkingGC();
+    }
+  } else if (!nsCRT::strcmp(aTopic, "user-interaction-active")) {
+    nsJSContext::KillShrinkingGCTimer();
   } else if (!nsCRT::strcmp(aTopic, "quit-application") ||
              !nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
     sShuttingDown = true;
@@ -1284,12 +1299,11 @@
     return;
   }
 
+  JSGCInvocationKind gckind = aShrinking == ShrinkingGC ? GC_SHRINK : GC_NORMAL;
   JS::PrepareForFullGC(sRuntime);
   if (aIncremental == IncrementalGC) {
-    MOZ_ASSERT(aShrinking == NonShrinkingGC);
-    JS::StartIncrementalGC(sRuntime, GC_NORMAL, aReason, aSliceMillis);
+    JS::StartIncrementalGC(sRuntime, gckind, aReason, aSliceMillis);
   } else {
-    JSGCInvocationKind gckind = aShrinking == ShrinkingGC ? GC_SHRINK : GC_NORMAL;
     JS::GCForReason(sRuntime, gckind, aReason);
   }
 }
@@ -1798,6 +1812,16 @@
   nsJSContext::ShrinkGCBuffersNow();
 }
 
+// static
+void
+ShrinkingGCTimerFired(nsITimer* aTimer, void* aClosure)
+{
+  nsJSContext::KillShrinkingGCTimer();
+  nsJSContext::GarbageCollectNow(JS::gcreason::USER_INACTIVE,
+                                 nsJSContext::IncrementalGC,
+                                 nsJSContext::ShrinkingGC);
+}
+
 static bool
 ShouldTriggerCC(uint32_t aSuspected)
 {
@@ -2032,6 +2056,26 @@
 
 // static
 void
+nsJSContext::PokeShrinkingGC()
+{
+  if (sShrinkingGCTimer || sShuttingDown) {
+    return;
+  }
+
+  CallCreateInstance("@mozilla.org/timer;1", &sShrinkingGCTimer);
+
+  if (!sShrinkingGCTimer) {
+    // Failed to create timer (probably because we're in XPCOM shutdown)
+    return;
+  }
+
+  sShrinkingGCTimer->InitWithFuncCallback(ShrinkingGCTimerFired, nullptr,
+                                          NS_SHRINKING_GC_DELAY,
+                                          nsITimer::TYPE_ONE_SHOT);
+}
+
+// static
+void
 nsJSContext::MaybePokeCC()
 {
   if (sCCTimer || sICCTimer || sShuttingDown || !sHasRunGC) {
@@ -2093,6 +2137,16 @@
 
 //static
 void
+nsJSContext::KillShrinkingGCTimer()
+{
+  if (sShrinkingGCTimer) {
+    sShrinkingGCTimer->Cancel();
+    NS_RELEASE(sShrinkingGCTimer);
+  }
+}
+
+//static
+void
 nsJSContext::KillCCTimer()
 {
   sCCLockedOutTime = 0;
@@ -2204,8 +2258,11 @@
         nsJSContext::KillFullGCTimer();
 
         // Avoid shrinking during heavy activity, which is suggested by
-        // compartment GC.
-        nsJSContext::PokeShrinkGCBuffers();
+        // compartment GC. We don't need to shrink after a shrinking GC as this
+        // happens automatically in this case.
+        if (aDesc.invocationKind_ == GC_NORMAL) {
+          nsJSContext::PokeShrinkGCBuffers();
+        }
       }
 
       if (ShouldTriggerCC(nsCycleCollector_suspectedCount())) {
@@ -2279,7 +2336,7 @@
 mozilla::dom::StartupJSEnvironment()
 {
   // initialize all our statics, so that we can restart XPCOM
-  sGCTimer = sFullGCTimer = sCCTimer = sICCTimer = nullptr;
+  sGCTimer = sShrinkingGCTimer = sFullGCTimer = sCCTimer = sICCTimer = nullptr;
   sCCLockedOut = false;
   sCCLockedOutTime = 0;
   sLastCCEndTime = TimeStamp();
@@ -2684,8 +2741,14 @@
                                "javascript.options.gc_on_memory_pressure",
                                true);
 
+  Preferences::AddBoolVarCache(&sCompactOnUserInactive,
+                               "javascript.options.compact_on_user_inactive",
+                               true);
+
   nsIObserver* observer = new nsJSEnvironmentObserver();
   obs->AddObserver(observer, "memory-pressure", false);
+  obs->AddObserver(observer, "user-interaction-inactive", false);
+  obs->AddObserver(observer, "user-interaction-active", false);
   obs->AddObserver(observer, "quit-application", false);
   obs->AddObserver(observer, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSEnvironment.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSEnvironment.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSEnvironment.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSEnvironment.h	2015-02-28 15:03:05.000000000 +0000
@@ -116,6 +116,9 @@
   static void PokeShrinkGCBuffers();
   static void KillShrinkGCBuffersTimer();
 
+  static void PokeShrinkingGC();
+  static void KillShrinkingGCTimer();
+
   static void MaybePokeCC();
   static void KillCCTimer();
   static void KillICCTimer();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSUtils.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSUtils.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -371,3 +371,9 @@
   nsIScriptContext *scx = GetScriptContextFromJSContext(cx);
   return  scx ? scx->GetWindowProxy() : nullptr;
 }
+
+bool nsAutoJSString::init(const JS::Value &v)
+{
+  return init(nsContentUtils::RootingCxForThread(), v);
+}
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsJSUtils.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsJSUtils.h	2015-02-28 15:03:05.000000000 +0000
@@ -217,6 +217,8 @@
     return JS_IdToValue(aContext, id, &v) && init(aContext, v);
   }
 
+  bool init(const JS::Value &v);
+
   ~nsAutoJSString() {}
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsObjectLoadingContent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsObjectLoadingContent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsObjectLoadingContent.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsObjectLoadingContent.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -122,7 +122,7 @@
 static bool
 InActiveDocument(nsIContent *aContent)
 {
-  if (!aContent->IsInDoc()) {
+  if (!aContent->IsInComposedDoc()) {
     return false;
   }
   nsIDocument *doc = aContent->OwnerDoc();
@@ -552,26 +552,7 @@
     return false;
   }
 
-  const char* typeFromExt;
-  nsresult rv = pluginHost->IsPluginEnabledForExtension(ext.get(), typeFromExt);
-  if (NS_SUCCEEDED(rv)) {
-    mimeType = typeFromExt;
-    return true;
-  }
-  return false;
-}
-
-bool
-PluginExistsForType(const char* aMIMEType)
-{
-  nsRefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
-
-  if (!pluginHost) {
-    NS_NOTREACHED("No pluginhost");
-    return false;
-  }
-
-  return pluginHost->PluginExistsForType(aMIMEType);
+  return pluginHost->HavePluginForExtension(ext, mimeType);
 }
 
 ///
@@ -798,7 +779,7 @@
   }
 
   nsRefPtr<nsPluginInstanceOwner> newOwner;
-  rv = pluginHost->InstantiatePluginInstance(mContentType.get(),
+  rv = pluginHost->InstantiatePluginInstance(mContentType,
                                              mURI.get(), this,
                                              getter_AddRefs(newOwner));
 
@@ -1616,8 +1597,10 @@
       nsAdoptingCString javaMIME = Preferences::GetCString(kPrefJavaMIME);
       NS_ASSERTION(IsJavaMIME(javaMIME),
                    "plugin.mime.java should be recognized as java");
+      nsRefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
       if (StringBeginsWith(classIDAttr, NS_LITERAL_STRING("java:")) &&
-          PluginExistsForType(javaMIME)) {
+          pluginHost &&
+          pluginHost->HavePluginForType(javaMIME)) {
         newMime = javaMIME;
         isJava = true;
       } else {
@@ -2600,7 +2583,7 @@
        " (sync %i, notify %i)", this, aOldType, aOldState.GetInternalValue(),
        mType, ObjectState().GetInternalValue(), aSync, aNotify));
 
-  nsCOMPtr<nsIContent> thisContent = 
+  nsCOMPtr<nsIContent> thisContent =
     do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
 
@@ -2668,7 +2651,10 @@
     return eType_Document;
   }
 
-  if (caps & eSupportPlugins && PluginExistsForType(aMIMEType.get())) {
+  nsRefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
+  if ((caps & eSupportPlugins) &&
+      pluginHost &&
+      pluginHost->HavePluginForType(aMIMEType, nsPluginHost::eExcludeNone)) {
     // ShouldPlay will handle checking for disabled plugins
     return eType_Plugin;
   }
@@ -3206,7 +3192,8 @@
   aReason = eFallbackClickToPlay;
 
   uint32_t enabledState = nsIPluginTag::STATE_DISABLED;
-  pluginHost->GetStateForType(mContentType, &enabledState);
+  pluginHost->GetStateForType(mContentType, nsPluginHost::eExcludeNone,
+                              &enabledState);
   if (nsIPluginTag::STATE_DISABLED == enabledState) {
     aReason = eFallbackDisabled;
     return false;
@@ -3215,7 +3202,9 @@
   // Before we check permissions, get the blocklist state of this plugin to set
   // the fallback reason correctly.
   uint32_t blocklistState = nsIBlocklistService::STATE_NOT_BLOCKED;
-  pluginHost->GetBlocklistStateForType(mContentType.get(), &blocklistState);
+  pluginHost->GetBlocklistStateForType(mContentType,
+                                       nsPluginHost::eExcludeNone,
+                                       &blocklistState);
   if (blocklistState == nsIBlocklistService::STATE_BLOCKED) {
     // no override possible
     aReason = eFallbackBlocklisted;
@@ -3264,7 +3253,9 @@
   // code here wouldn't matter at all. Bug 775301 is tracking this.
   if (!nsContentUtils::IsSystemPrincipal(topDoc->NodePrincipal())) {
     nsAutoCString permissionString;
-    rv = pluginHost->GetPermissionStringForType(mContentType, permissionString);
+    rv = pluginHost->GetPermissionStringForType(mContentType,
+                                                nsPluginHost::eExcludeNone,
+                                                permissionString);
     NS_ENSURE_SUCCESS(rv, false);
     uint32_t permission;
     rv = permissionManager->TestPermissionFromPrincipal(topDoc->NodePrincipal(),
@@ -3315,11 +3306,10 @@
   nsCOMPtr<nsIContent> thisContent =
     do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
 
-  if (!thisContent->IsInDoc()) {
+  if (!thisContent->IsInComposedDoc()) {
     return nullptr;
   }
 
-  // XXXbz should this use GetComposedDoc()?  sXBL/XBL2 issue!
   nsIDocument *sub_doc = thisContent->OwnerDoc()->GetSubDocumentFor(thisContent);
   if (!sub_doc) {
     return nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsPerformance.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsPerformance.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsPerformance.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsPerformance.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -275,7 +275,8 @@
   if (!nsContentUtils::IsPerformanceTimingEnabled() || !IsInitialized()) {
     return mZeroTime;
   }
-  return TimeStampToDOMHighResOrFetchStart(mConnectStart);
+  return mConnectStart.IsNull() ? DomainLookupEndHighRes()
+                                : TimeStampToDOMHighRes(mConnectStart);
 }
 
 DOMTimeMilliSec
@@ -290,7 +291,8 @@
   if (!nsContentUtils::IsPerformanceTimingEnabled() || !IsInitialized()) {
     return mZeroTime;
   }
-  return TimeStampToDOMHighResOrFetchStart(mConnectEnd);
+  return mConnectEnd.IsNull() ? DomainLookupEndHighRes()
+                              : TimeStampToDOMHighRes(mConnectEnd);
 }
 
 DOMTimeMilliSec
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsRange.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsRange.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsRange.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsRange.h	2015-02-28 15:03:05.000000000 +0000
@@ -49,6 +49,7 @@
     , mIsDetached(false)
     , mMaySpanAnonymousSubtrees(false)
     , mInSelection(false)
+    , mIsGenerated(false)
     , mStartOffsetWasIncremented(false)
     , mEndOffsetWasIncremented(false)
     , mEnableGravitationOnElementRemoval(true)
@@ -153,6 +154,27 @@
     }
   }
 
+  /**
+   * Return true if this range was generated.
+   * @see SetIsGenerated
+   */
+  bool IsGenerated() const
+  {
+    return mIsGenerated;
+  }
+
+  /**
+   * Mark this range as being generated or not.
+   * Currently it is used for marking ranges that are created when splitting up
+   * a range to exclude a -moz-user-select:none region.
+   * @see Selection::AddItem
+   * @see ExcludeNonSelectableNodes
+   */
+  void SetIsGenerated(bool aIsGenerated)
+  {
+    mIsGenerated = aIsGenerated;
+  }
+
   nsINode* GetCommonAncestor() const;
   void Reset();
   nsresult SetStart(nsINode* aParent, int32_t aOffset);
@@ -329,13 +351,14 @@
   int32_t mStartOffset;
   int32_t mEndOffset;
 
-  bool mIsPositioned;
-  bool mIsDetached;
-  bool mMaySpanAnonymousSubtrees;
-  bool mInSelection;
-  bool mStartOffsetWasIncremented;
-  bool mEndOffsetWasIncremented;
-  bool mEnableGravitationOnElementRemoval;
+  bool mIsPositioned : 1;
+  bool mIsDetached : 1;
+  bool mMaySpanAnonymousSubtrees : 1;
+  bool mInSelection : 1;
+  bool mIsGenerated : 1;
+  bool mStartOffsetWasIncremented : 1;
+  bool mEndOffsetWasIncremented : 1;
+  bool mEnableGravitationOnElementRemoval : 1;
 #ifdef DEBUG
   int32_t  mAssertNextInsertOrAppendIndex;
   nsINode* mAssertNextInsertOrAppendNode;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsScriptLoader.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsScriptLoader.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsScriptLoader.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsScriptLoader.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -44,6 +44,7 @@
 #include "nsCRT.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsCORSListenerProxy.h"
+#include "nsProxyRelease.h"
 #include "nsSandboxFlags.h"
 #include "nsContentTypeParser.h"
 #include "nsINetworkPredictor.h"
@@ -796,6 +797,8 @@
     : mRequest(aRequest), mLoader(aLoader), mToken(nullptr)
   {}
 
+  virtual ~NotifyOffThreadScriptLoadCompletedRunnable();
+
   void SetToken(void* aToken) {
     MOZ_ASSERT(aToken && !mToken);
     mToken = aToken;
@@ -814,6 +817,23 @@
   return rv;
 }
 
+NotifyOffThreadScriptLoadCompletedRunnable::~NotifyOffThreadScriptLoadCompletedRunnable()
+{
+  if (MOZ_UNLIKELY(mRequest || mLoader) && !NS_IsMainThread()) {
+    nsCOMPtr<nsIThread> mainThread;
+    NS_GetMainThread(getter_AddRefs(mainThread));
+    if (mainThread) {
+      NS_ProxyRelease(mainThread, mRequest);
+      NS_ProxyRelease(mainThread, mLoader);
+    } else {
+      MOZ_ASSERT(false, "We really shouldn't leak!");
+      // Better to leak than crash.
+      unused << mRequest.forget();
+      unused << mLoader.forget();
+    }
+  }
+}
+
 NS_IMETHODIMP
 NotifyOffThreadScriptLoadCompletedRunnable::Run()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsStyleLinkElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsStyleLinkElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsStyleLinkElement.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsStyleLinkElement.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -120,27 +120,19 @@
 }
 
 /* static */ bool
-nsStyleLinkElement::IsImportEnabled(nsIPrincipal* aPrincipal)
+nsStyleLinkElement::IsImportEnabled()
 {
   static bool sAdded = false;
-  static bool sWebComponentsEnabled;
+  static bool sImportsEnabled;
   if (!sAdded) {
     // This part runs only once because of the static flag.
-    Preferences::AddBoolVarCache(&sWebComponentsEnabled,
-                                 "dom.webcomponents.enabled",
+    Preferences::AddBoolVarCache(&sImportsEnabled,
+                                 "dom.htmlimports.enabled",
                                  false);
     sAdded = true;
   }
 
-  if (sWebComponentsEnabled) {
-    return true;
-  }
-
-  // If the web components pref is not enabled, check
-  // if we are in a certified app because imports is enabled
-  // for certified apps.
-  return aPrincipal &&
-    aPrincipal->GetAppStatus() == nsIPrincipal::APP_STATUS_CERTIFIED;
+  return sImportsEnabled;
 }
 
 static uint32_t ToLinkMask(const nsAString& aLink, nsIPrincipal* aPrincipal)
@@ -155,8 +147,8 @@
     return nsStyleLinkElement::eNEXT;
   else if (aLink.EqualsLiteral("alternate"))
     return nsStyleLinkElement::eALTERNATE;
-  else if (aLink.EqualsLiteral("import") && aPrincipal &&
-           nsStyleLinkElement::IsImportEnabled(aPrincipal))
+  else if (aLink.EqualsLiteral("import") &&
+           nsStyleLinkElement::IsImportEnabled())
     return nsStyleLinkElement::eHTMLIMPORT;
   else 
     return 0;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsStyleLinkElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsStyleLinkElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsStyleLinkElement.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsStyleLinkElement.h	2015-02-28 15:03:05.000000000 +0000
@@ -68,7 +68,7 @@
   static uint32_t ParseLinkTypes(const nsAString& aTypes,
                                  nsIPrincipal* aPrincipal);
 
-  static bool IsImportEnabled(nsIPrincipal* aPrincipal);
+  static bool IsImportEnabled();
   
   void UpdateStyleSheetInternal()
   {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsWrapperCache.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsWrapperCache.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsWrapperCache.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsWrapperCache.h	2015-02-28 15:03:05.000000000 +0000
@@ -17,6 +17,7 @@
 namespace mozilla {
 namespace dom {
 class TabChildGlobal;
+class ProcessGlobal;
 } // namespace dom
 } // namespace mozilla
 class SandboxPrivate;
@@ -263,6 +264,7 @@
 
 private:
   friend class mozilla::dom::TabChildGlobal;
+  friend class mozilla::dom::ProcessGlobal;
   friend class SandboxPrivate;
   friend class nsInProcessTabChildGlobal;
   friend class nsWindowRoot;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsXMLHttpRequest.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsXMLHttpRequest.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsXMLHttpRequest.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsXMLHttpRequest.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -106,7 +106,10 @@
 #define XML_HTTP_REQUEST_HEADERS_RECEIVED (1 << 2) // 2 HEADERS_RECEIVED
 #define XML_HTTP_REQUEST_LOADING          (1 << 3) // 3 LOADING
 #define XML_HTTP_REQUEST_DONE             (1 << 4) // 4 DONE
-#define XML_HTTP_REQUEST_SENT             (1 << 5) // Internal, OPENED in IE and external view
+#define XML_HTTP_REQUEST_SENT             (1 << 5) // Internal, corresponds to
+                                                   // "OPENED and the send()
+                                                   // flag is set" in spec
+                                                   // terms.
 // The above states are mutually exclusive, change with ChangeState() only.
 // The states below can be combined.
 #define XML_HTTP_REQUEST_ABORTED        (1 << 7)  // Internal
@@ -1078,8 +1081,7 @@
 {
   aUrl.Truncate();
 
-  uint16_t readyState;
-  GetReadyState(&readyState);
+  uint16_t readyState = ReadyState();
   if ((readyState == UNSENT || readyState == OPENED) || !mChannel) {
     return;
   }
@@ -2348,60 +2350,6 @@
   }
 }
 
-NS_IMETHODIMP
-nsXMLHttpRequest::SendAsBinary(const nsAString &aBody)
-{
-  ErrorResult rv;
-  SendAsBinary(aBody, rv);
-  return rv.ErrorCode();
-}
-
-void
-nsXMLHttpRequest::SendAsBinary(const nsAString &aBody,
-                               ErrorResult& aRv)
-{
-  char *data = static_cast<char*>(NS_Alloc(aBody.Length() + 1));
-  if (!data) {
-    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-    return;
-  }
-
-  if (GetOwner() && GetOwner()->GetExtantDoc()) {
-    GetOwner()->GetExtantDoc()->WarnOnceAbout(nsIDocument::eSendAsBinary);
-  }
-
-  nsAString::const_iterator iter, end;
-  aBody.BeginReading(iter);
-  aBody.EndReading(end);
-  char *p = data;
-  while (iter != end) {
-    if (*iter & 0xFF00) {
-      NS_Free(data);
-      aRv.Throw(NS_ERROR_DOM_INVALID_CHARACTER_ERR);
-      return;
-    }
-    *p++ = static_cast<char>(*iter++);
-  }
-  *p = '\0';
-
-  nsCOMPtr<nsIInputStream> stream;
-  aRv = NS_NewByteInputStream(getter_AddRefs(stream), data, aBody.Length(),
-                              NS_ASSIGNMENT_ADOPT);
-  if (aRv.Failed()) {
-    NS_Free(data);
-    return;
-  }
-
-  nsCOMPtr<nsIWritableVariant> variant = new nsVariant();
-
-  aRv = variant->SetAsISupports(stream);
-  if (aRv.Failed()) {
-    return;
-  }
-
-  aRv = Send(variant);
-}
-
 static nsresult
 GetRequestBody(nsIDOMDocument* aDoc, nsIInputStream** aResult,
                uint64_t* aContentLength, nsACString& aContentType,
@@ -2951,13 +2899,18 @@
   if (method.EqualsLiteral("POST")) {
     AddLoadFlags(mChannel,
         nsIRequest::LOAD_BYPASS_CACHE | nsIRequest::INHIBIT_CACHING);
-  }
-  // When we are sync loading, we need to bypass the local cache when it would
-  // otherwise block us waiting for exclusive access to the cache.  If we don't
-  // do this, then we could dead lock in some cases (see bug 309424).
-  else if (!(mState & XML_HTTP_REQUEST_ASYNC)) {
+  } else {
+    // When we are sync loading, we need to bypass the local cache when it would
+    // otherwise block us waiting for exclusive access to the cache.  If we don't
+    // do this, then we could dead lock in some cases (see bug 309424).
+    //
+    // Also don't block on the cache entry on async if it is busy - favoring parallelism
+    // over cache hit rate for xhr. This does not disable the cache everywhere -
+    // only in cases where more than one channel for the same URI is accessed
+    // simultanously.
+
     AddLoadFlags(mChannel,
-        nsICachingChannel::LOAD_BYPASS_LOCAL_CACHE_IF_BUSY);
+                 nsICachingChannel::LOAD_BYPASS_LOCAL_CACHE_IF_BUSY);
   }
 
   // Since we expect XML data, set the type hint accordingly
@@ -3367,9 +3320,12 @@
 void
 nsXMLHttpRequest::SetWithCredentials(bool aWithCredentials, ErrorResult& aRv)
 {
-  // Return error if we're already processing a request
-  if (XML_HTTP_REQUEST_SENT & mState) {
-    aRv = NS_ERROR_FAILURE;
+  // Return error if we're already processing a request.  Note that we can't use
+  // ReadyState() here, because it can't differentiate between "opened" and
+  // "sent", so we use mState directly.
+  if (!(mState & XML_HTTP_REQUEST_UNSENT) &&
+      !(mState & XML_HTTP_REQUEST_OPENED)) {
+    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsXMLHttpRequest.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsXMLHttpRequest.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/nsXMLHttpRequest.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/nsXMLHttpRequest.h	2015-02-28 15:03:05.000000000 +0000
@@ -488,7 +488,6 @@
     }
     aRv = Send(RequestBody(aStream));
   }
-  void SendAsBinary(const nsAString& aBody, ErrorResult& aRv);
 
   void Abort();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ProcessGlobal.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ProcessGlobal.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ProcessGlobal.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ProcessGlobal.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,103 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8; -*- */
+/* vim: set sw=4 ts=8 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
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ProcessGlobal.h"
+
+#include "nsContentCID.h"
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+ProcessGlobal::ProcessGlobal(nsFrameMessageManager* aMessageManager)
+ : mInitialized(false),
+   mMessageManager(aMessageManager)
+{
+  SetIsNotDOMBinding();
+  mozilla::HoldJSObjects(this);
+}
+
+ProcessGlobal::~ProcessGlobal()
+{
+  mAnonymousGlobalScopes.Clear();
+  mozilla::DropJSObjects(this);
+}
+
+ProcessGlobal*
+ProcessGlobal::Get()
+{
+  nsCOMPtr<nsISyncMessageSender> service = do_GetService(NS_CHILDPROCESSMESSAGEMANAGER_CONTRACTID);
+  if (!service) {
+    return nullptr;
+  }
+  return static_cast<ProcessGlobal*>(service.get());
+}
+
+/* [notxpcom] boolean markForCC (); */
+// This method isn't automatically forwarded safely because it's notxpcom, so
+// the IDL binding doesn't know what value to return.
+NS_IMETHODIMP_(bool)
+ProcessGlobal::MarkForCC()
+{
+  MarkScopesForCC();
+  return mMessageManager ? mMessageManager->MarkForCC() : false;
+}
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(ProcessGlobal)
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(ProcessGlobal)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMessageManager)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGlobal)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(ProcessGlobal)
+  NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
+  for (uint32_t i = 0; i < tmp->mAnonymousGlobalScopes.Length(); ++i) {
+    NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mAnonymousGlobalScopes[i])
+  }
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ProcessGlobal)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mMessageManager)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mGlobal)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mAnonymousGlobalScopes)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ProcessGlobal)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIContentProcessMessageManager)
+  NS_INTERFACE_MAP_ENTRY(nsIMessageListenerManager)
+  NS_INTERFACE_MAP_ENTRY(nsIMessageSender)
+  NS_INTERFACE_MAP_ENTRY(nsISyncMessageSender)
+  NS_INTERFACE_MAP_ENTRY(nsIContentProcessMessageManager)
+  NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
+  NS_INTERFACE_MAP_ENTRY(nsIGlobalObject)
+  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ContentProcessMessageManager)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(ProcessGlobal)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(ProcessGlobal)
+
+bool
+ProcessGlobal::Init()
+{
+  if (mInitialized) {
+    return true;
+  }
+  mInitialized = true;
+
+  nsISupports* scopeSupports = NS_ISUPPORTS_CAST(nsIContentProcessMessageManager*, this);
+  return InitChildGlobalInternal(scopeSupports, NS_LITERAL_CSTRING("processChildGlobal"));
+}
+
+void
+ProcessGlobal::LoadScript(const nsAString& aURL)
+{
+  Init();
+  LoadScriptInternal(aURL, false);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ProcessGlobal.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ProcessGlobal.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ProcessGlobal.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ProcessGlobal.h	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8; -*- */
+/* vim: set sw=4 ts=8 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
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_ProcessGlobal_h
+#define mozilla_dom_ProcessGlobal_h
+
+#include "mozilla/Attributes.h"
+#include "nsCOMPtr.h"
+#include "nsFrameMessageManager.h"
+#include "nsIScriptContext.h"
+#include "nsIScriptObjectPrincipal.h"
+#include "nsIScriptContext.h"
+#include "nsIClassInfo.h"
+#include "nsIRunnable.h"
+#include "nsIGlobalObject.h"
+#include "nsIScriptObjectPrincipal.h"
+#include "nsWeakReference.h"
+
+namespace mozilla {
+namespace dom {
+
+class ProcessGlobal :
+  public nsMessageManagerScriptExecutor,
+  public nsIContentProcessMessageManager,
+  public nsIGlobalObject,
+  public nsIScriptObjectPrincipal,
+  public nsSupportsWeakReference,
+  public mozilla::dom::ipc::MessageManagerCallback,
+  public nsWrapperCache
+{
+public:
+  explicit ProcessGlobal(nsFrameMessageManager* aMessageManager);
+
+  bool Init();
+
+  static ProcessGlobal* Get();
+
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(ProcessGlobal, nsIContentProcessMessageManager)
+
+  NS_FORWARD_SAFE_NSIMESSAGELISTENERMANAGER(mMessageManager)
+  NS_FORWARD_SAFE_NSIMESSAGESENDER(mMessageManager)
+  NS_FORWARD_SAFE_NSISYNCMESSAGESENDER(mMessageManager)
+  NS_FORWARD_SAFE_NSIMESSAGEMANAGERGLOBAL(mMessageManager)
+
+  virtual void LoadScript(const nsAString& aURL);
+
+  virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE
+  {
+    if (!mGlobal) {
+      return nullptr;
+    }
+
+    return mGlobal->GetJSObject();
+  }
+  virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE { return mPrincipal; }
+
+  virtual JSObject* WrapObject(JSContext* cx) MOZ_OVERRIDE
+  {
+    MOZ_CRASH("ProcessGlobal doesn't use DOM bindings!");
+  }
+
+protected:
+  virtual ~ProcessGlobal();
+
+private:
+  bool mInitialized;
+  nsRefPtr<nsFrameMessageManager> mMessageManager;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_ProcessGlobal_h
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ShadowRoot.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ShadowRoot.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ShadowRoot.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ShadowRoot.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -711,6 +711,15 @@
   }
 }
 
+void
+ShadowRoot::DestroyContent()
+{
+  if (mOlderShadow) {
+    mOlderShadow->DestroyContent();
+  }
+  DocumentFragment::DestroyContent();
+}
+
 NS_IMPL_CYCLE_COLLECTION_INHERITED(ShadowRootStyleSheetList, StyleSheetList,
                                    mShadowRoot)
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ShadowRoot.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ShadowRoot.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/ShadowRoot.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/ShadowRoot.h	2015-02-28 15:03:05.000000000 +0000
@@ -133,6 +133,8 @@
   {
     mIsComposedDocParticipant = aIsComposedDocParticipant;
   }
+
+  virtual void DestroyContent() MOZ_OVERRIDE;
 protected:
   virtual ~ShadowRoot();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/browser.ini	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/browser.ini	2015-02-28 15:03:05.000000000 +0000
@@ -4,6 +4,7 @@
 skip-if = e10s # Bug ?????? - test directly touches content (contentWindow.iframe.addEventListener)
 [browser_bug902350.js]
 skip-if = e10s # Bug ?????? - test e10s utils don't support load events from iframe etc, which this test relies on.
+[browser_messagemanager_loadprocessscript.js]
 [browser_state_notifications.js]
 # skip-if = e10s # Bug ?????? - content-document-* notifications come while document's URI is still about:blank, but test expects real URL.
 skip-if = true # Intermittent failures - bug 987493. Restore the skip-if above once fixed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/browser_messagemanager_loadprocessscript.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/browser_messagemanager_loadprocessscript.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/browser_messagemanager_loadprocessscript.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/browser_messagemanager_loadprocessscript.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,44 @@
+let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
+           .getService(Ci.nsIMessageBroadcaster);
+ppmm.QueryInterface(Ci.nsIProcessScriptLoader);
+
+function processScript() {
+  let cpmm = Components.classes["@mozilla.org/childprocessmessagemanager;1"]
+           .getService(Components.interfaces.nsISyncMessageSender);
+  if (cpmm !== this) {
+    dump("Test failed: wrong global object\n");
+    return;
+  }
+
+  this.cpmm = cpmm;
+
+  addMessageListener("ProcessTest:Reply", function listener(msg) {
+    removeMessageListener("ProcessTest:Reply", listener);
+    sendAsyncMessage("ProcessTest:Finished");
+  });
+  sendSyncMessage("ProcessTest:Loaded");
+}
+
+function test() {
+  waitForExplicitFinish();
+
+  let replyCount = 0;
+
+  function loadListener(msg) {
+    replyCount++;
+    msg.target.sendAsyncMessage("ProcessTest:Reply");
+  }
+
+  ppmm.addMessageListener("ProcessTest:Loaded", loadListener);
+  ppmm.addMessageListener("ProcessTest:Finished", function finishListener(msg) {
+    if (replyCount < ppmm.childCount) {
+      return;
+    }
+    info("Got " + replyCount + " replies");
+    ok(replyCount, "Got message reply");
+    ppmm.removeMessageListener("ProcessTest:Loaded", loadListener);
+    ppmm.removeMessageListener("ProcessTest:Finished", finishListener);
+    finish();
+  });
+  ppmm.loadProcessScript("data:,(" + processScript.toString() + ")()", true);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/chrome/window_nsITextInputProcessor.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/chrome/window_nsITextInputProcessor.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/chrome/window_nsITextInputProcessor.xul	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/chrome/window_nsITextInputProcessor.xul	2015-02-28 15:03:05.000000000 +0000
@@ -153,8 +153,7 @@
      description + "TIP2.beginInputTransactionForTests(otherWindow) should succeed because there is composition synthesized by TIP1 but it's in other window");
 
   // Let's confirm that the composing string is NOT committed by above tests.
-  ok(TIP1.commitComposition(),
-     description + "TIP1.commitString() should succeed because there should be composing string");
+  TIP1.commitComposition();
   is(input.value, composingStr,
      description + "TIP1.commitString() without specifying commit string should be committed with the last composing string");
 
@@ -165,8 +164,1144 @@
   ok(TIP2.beginInputTransactionForTests(window),
      description + "TIP2.beginInputTransactionForTests() should succeed because the composition was already committed #2");
 
-  // Let's check if startComposition() throws an exception after ownership is strolen.
+  // Let's check if beginInputTransaction() fails to steal the rights of TextEventDispatcher during startComposition().
+  var events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from compositionstart event handler during TIP1.startComposition();");
+  }, false);
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.startComposition();
+  is(events.length, 1,
+     description + "compositionstart event should be fired by TIP1.startComposition()");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransaction() fails to steal the rights of TextEventDispatcher during flushPendingComposition().
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from compositionstart event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from compositionupdate event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from text event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from input event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  is(events.length, 4,
+     description + "compositionstart, compositionupdate, text and input events should be fired by TIP1.flushPendingComposition()");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransaction() fails to steal the rights of TextEventDispatcher during commitComposition().
+  events = [];
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from text event handler during a call of TIP1.commitComposition();");
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from compositionend event handler during a call of TIP1.commitComposition();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from input event handler during a call of TIP1.commitComposition();");
+  }, false);
+  TIP1.commitComposition();
+  is(events.length, 3,
+     description + "text, compositionend and input events should be fired by TIP1.commitComposition()");
+  is(events[0].type, "text",
+     description + "events[0] should be text");
+  is(events[1].type, "compositionend",
+     description + "events[1] should be compositionend");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+
+  // Let's check if beginInputTransaction() fails to steal the rights of TextEventDispatcher during commitCompositionWith("bar").
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from compositionstart event handler during TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction during compositionupdate event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction during text event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction during compositionend event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction during input event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.commitCompositionWith("bar");
+  is(events.length, 5,
+     description + "compositionstart, compositionupdate, text, compositionend and input events should be fired by TIP1.commitCompositionWith(\"bar\")");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "compositionend",
+     description + "events[3] should be compositionend");
+  is(events[4].type, "input",
+     description + "events[4] should be input");
+
+  // Let's check if beginInputTransaction() fails to steal the rights of TextEventDispatcher during cancelComposition().
+  events = [];
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from compositionupdate event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from text event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from compositionend event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from input event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  TIP1.cancelComposition();
+  is(events.length, 4,
+     description + "compositionupdate, text, compositionend and input events should be fired by TIP1.cancelComposition()");
+  is(events[0].type, "compositionupdate",
+     description + "events[0] should be compositionupdate");
+  is(events[1].type, "text",
+     description + "events[1] should be text");
+  is(events[2].type, "compositionend",
+     description + "events[2] should be compositionend");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+
+  // Let's check if beginInputTransaction() fails to steal the rights of TextEventDispatcher during keydown() and keyup().
+  events = [];
+  TIP1.beginInputTransaction(window, simpleCallback);
+  input.addEventListener("keydown", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from keydown event handler during a call of TIP1.keydown();");
+  }, false);
+  input.addEventListener("keypress", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from keypress event handler during a call of TIP1.keydown();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from input event handler during a call of TIP1.keydown();");
+  }, false);
+  input.addEventListener("keyup", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransaction(window, simpleCallback),
+       description + "TIP2 shouldn't be able to begin input transaction from keyup event handler during a call of TIP1.keyup();");
+  }, false);
+  var keyA = new KeyboardEvent("", { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+  TIP1.keydown(keyA);
+  TIP1.keyup(keyA);
+  is(events.length, 4,
+     description + "keydown, keypress, input, keyup events should be fired by TIP1.keydown() and TIP1.keyup()");
+  is(events[0].type, "keydown",
+     description + "events[0] should be keydown");
+  is(events[1].type, "keypress",
+     description + "events[1] should be keypress");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+  is(events[3].type, "keyup",
+     description + "events[3] should be keyup");
+
+  // Let's check if beginInputTransactionForTests() fails to steal the rights of TextEventDispatcher during startComposition().
+  var events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from compositionstart event handler during TIP1.startComposition();");
+  }, false);
+  TIP1.beginInputTransactionForTests(window);
+  TIP1.startComposition();
+  is(events.length, 1,
+     description + "compositionstart event should be fired by TIP1.startComposition()");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransactionForTests() fails to steal the rights of TextEventDispatcher during flushPendingComposition().
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from compositionstart event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from compositionupdate event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from text event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from input event handler during a call of TIP1.flushPendingComposition();");
+  }, false);
+  TIP1.beginInputTransactionForTests(window);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  is(events.length, 4,
+     description + "compositionstart, compositionupdate, text and input events should be fired by TIP1.flushPendingComposition()");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransactionForTests() fails to steal the rights of TextEventDispatcher during commitComposition().
+  events = [];
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from text event handler during a call of TIP1.commitComposition();");
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from compositionend event handler during a call of TIP1.commitComposition();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from input event handler during a call of TIP1.commitComposition();");
+  }, false);
+  TIP1.commitComposition();
+  is(events.length, 3,
+     description + "text, compositionend and input events should be fired by TIP1.commitComposition()");
+  is(events[0].type, "text",
+     description + "events[0] should be text");
+  is(events[1].type, "compositionend",
+     description + "events[1] should be compositionend");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+
+  // Let's check if beginInputTransactionForTests() fails to steal the rights of TextEventDispatcher during commitCompositionWith("bar").
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from compositionstart event handler during TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests during compositionupdate event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests during text event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests during compositionend event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests during input event handler TIP1.commitCompositionWith(\"bar\");");
+  }, false);
+  TIP1.beginInputTransactionForTests(window);
+  TIP1.commitCompositionWith("bar");
+  is(events.length, 5,
+     description + "compositionstart, compositionupdate, text, compositionend and input events should be fired by TIP1.commitCompositionWith(\"bar\")");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "compositionend",
+     description + "events[3] should be compositionend");
+  is(events[4].type, "input",
+     description + "events[4] should be input");
+
+  // Let's check if beginInputTransactionForTests() fails to steal the rights of TextEventDispatcher during cancelComposition().
+  events = [];
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from compositionupdate event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from text event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from compositionend event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from input event handler during a call of TIP1.cancelComposition();");
+  }, false);
+  TIP1.cancelComposition();
+  is(events.length, 4,
+     description + "compositionupdate, text, compositionend and input events should be fired by TIP1.cancelComposition()");
+  is(events[0].type, "compositionupdate",
+     description + "events[0] should be compositionupdate");
+  is(events[1].type, "text",
+     description + "events[1] should be text");
+  is(events[2].type, "compositionend",
+     description + "events[2] should be compositionend");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+
+  // Let's check if beginInputTransactionForTests() fails to steal the rights of TextEventDispatcher during keydown() and keyup().
+  events = [];
+  TIP1.beginInputTransactionForTests(window);
+  input.addEventListener("keydown", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests for tests from keydown event handler during a call of TIP1.keydown();");
+  }, false);
+  input.addEventListener("keypress", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from keypress event handler during a call of TIP1.keydown();");
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from input event handler during a call of TIP1.keydown();");
+  }, false);
+  input.addEventListener("keyup", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    ok(!TIP2.beginInputTransactionForTests(window),
+       description + "TIP2 shouldn't be able to begin input transaction for tests from keyup event handler during a call of TIP1.keyup();");
+  }, false);
+  var keyA = new KeyboardEvent("", { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+  TIP1.keydown(keyA);
+  TIP1.keyup(keyA);
+  is(events.length, 4,
+     description + "keydown, keypress, input, keyup events should be fired by TIP1.keydown() and TIP1.keyup()");
+  is(events[0].type, "keydown",
+     description + "events[0] should be keydown");
+  is(events[1].type, "keypress",
+     description + "events[1] should be keypress");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+  is(events[3].type, "keyup",
+     description + "events[3] should be keyup");
+
+  // Let's check if beginInputTransaction() with another window fails to begin new input transaction with different TextEventDispatcher during startComposition().
+  var events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionstart\" should throw an exception during startComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionstart\" should cause NS_ERROR_ALREADY_INITIALIZED during startComposition()");
+    }
+  }, false);
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.startComposition();
+  is(events.length, 1,
+     description + "compositionstart event should be fired by TIP1.startComposition()");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransaction() with another window fails to begin new input transaction with different TextEventDispatcher during flushPendingComposition().
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionstart\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionstart\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionupdate\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionupdate\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  is(events.length, 4,
+     description + "compositionstart, compositionupdate, text and input events should be fired by TIP1.flushPendingComposition()");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransaction() with another window fails to begin new input transaction with different TextEventDispatcher during commitComposition().
+  events = [];
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should throw an exception during commitComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during commitComposition()");
+    }
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionend\" should throw an exception during commitComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionend\" should cause NS_ERROR_ALREADY_INITIALIZED during commitComposition()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should throw an exception during commitComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during commitComposition()");
+    }
+  }, false);
+  TIP1.commitComposition();
+  is(events.length, 3,
+     description + "text, compositionend and input events should be fired by TIP1.commitComposition()");
+  is(events[0].type, "text",
+     description + "events[0] should be text");
+  is(events[1].type, "compositionend",
+     description + "events[1] should be compositionend");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+
+  // Let's check if beginInputTransaction() with another window fails to begin new input transaction with different TextEventDispatcher during commitCompositionWith("bar");.
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionstart\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionstart\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionupdate\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionupdate\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionend\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionend\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.commitCompositionWith("bar");
+  is(events.length, 5,
+     description + "compositionstart, compositionupdate, text, compositionend and input events should be fired by TIP1.commitCompositionWith(\"bar\")");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "compositionend",
+     description + "events[3] should be compositionend");
+  is(events[4].type, "input",
+     description + "events[4] should be input");
+
+  // Let's check if beginInputTransaction() with another window fails to begin new input transaction with different TextEventDispatcher during cancelComposition();.
+  events = [];
+  TIP1.beginInputTransaction(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionupdate\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionupdate\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionend\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"compositionend\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  TIP1.cancelComposition();
+  is(events.length, 4,
+     description + "compositionupdate, text, compositionend and input events should be fired by TIP1.cancelComposition()");
+  is(events[0].type, "compositionupdate",
+     description + "events[0] should be compositionupdate");
+  is(events[1].type, "text",
+     description + "events[1] should be text");
+  is(events[2].type, "compositionend",
+     description + "events[2] should be compositionend");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+
+  // Let's check if beginInputTransaction() with another window fails to begin new input transaction with different TextEventDispatcher during keydown() and keyup();.
+  events = [];
+  TIP1.beginInputTransaction(window, simpleCallback);
+  input.addEventListener("keydown", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"keydown\" should throw an exception during keydown()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"keydown\" should cause NS_ERROR_ALREADY_INITIALIZED during keydown()");
+    }
+  }, false);
+  input.addEventListener("keypress", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"keypress\" should throw an exception during keydown()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"keypress\" should cause NS_ERROR_ALREADY_INITIALIZED during keydown()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should throw an exception during keydown()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during keydown()");
+    }
+  }, false);
+  input.addEventListener("keyup", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransaction(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"keyup\" should throw an exception during keyup()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransaction(otherWindow, simpleCallback) called from \"keyup\" should cause NS_ERROR_ALREADY_INITIALIZED during keyup()");
+    }
+  }, false);
+  var keyA = new KeyboardEvent("", { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+  TIP1.keydown(keyA);
+  TIP1.keyup(keyA);
+  is(events.length, 4,
+     description + "keydown, keypress, input, keyup events should be fired by TIP1.keydown() and TIP1.keyup()");
+  is(events[0].type, "keydown",
+     description + "events[0] should be keydown");
+  is(events[1].type, "keypress",
+     description + "events[1] should be keypress");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+  is(events[3].type, "keyup",
+     description + "events[3] should be keyup");
+
+  // Let's check if beginInputTransactionForTests() with another window fails to begin new input transaction with different TextEventDispatcher during startComposition().
+  var events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionstart\" should throw an exception during startComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionstart\" should cause NS_ERROR_ALREADY_INITIALIZED during startComposition()");
+    }
+  }, false);
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  TIP1.startComposition();
+  is(events.length, 1,
+     description + "compositionstart event should be fired by TIP1.startComposition()");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransactionForTests() with another window fails to begin new input transaction with different TextEventDispatcher during flushPendingComposition().
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionstart\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionstart\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionupdate\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionupdate\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should throw an exception during flushPendingComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during flushPendingComposition()");
+    }
+  }, false);
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  is(events.length, 4,
+     description + "compositionstart, compositionupdate, text and input events should be fired by TIP1.flushPendingComposition()");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+  TIP1.cancelComposition();
+
+  // Let's check if beginInputTransactionForTests() with another window fails to begin new input transaction with different TextEventDispatcher during commitComposition().
+  events = [];
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should throw an exception during commitComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during commitComposition()");
+    }
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionend\" should throw an exception during commitComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionend\" should cause NS_ERROR_ALREADY_INITIALIZED during commitComposition()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should throw an exception during commitComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during commitComposition()");
+    }
+  }, false);
+  TIP1.commitComposition();
+  is(events.length, 3,
+     description + "text, compositionend and input events should be fired by TIP1.commitComposition()");
+  is(events[0].type, "text",
+     description + "events[0] should be text");
+  is(events[1].type, "compositionend",
+     description + "events[1] should be compositionend");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+
+  // Let's check if beginInputTransactionForTests() with another window fails to begin new input transaction with different TextEventDispatcher during commitCompositionWith("bar");.
+  events = [];
+  input.addEventListener("compositionstart", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionstart\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionstart\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionupdate\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionupdate\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionend\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionend\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should throw an exception during commitCompositionWith(\"bar\")");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during commitCompositionWith(\"bar\")");
+    }
+  }, false);
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  TIP1.commitCompositionWith("bar");
+  is(events.length, 5,
+     description + "compositionstart, compositionupdate, text, compositionend and input events should be fired by TIP1.commitCompositionWith(\"bar\")");
+  is(events[0].type, "compositionstart",
+     description + "events[0] should be compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "events[1] should be compositionupdate");
+  is(events[2].type, "text",
+     description + "events[2] should be text");
+  is(events[3].type, "compositionend",
+     description + "events[3] should be compositionend");
+  is(events[4].type, "input",
+     description + "events[4] should be input");
+
+  // Let's check if beginInputTransactionForTests() with another window fails to begin new input transaction with different TextEventDispatcher during cancelComposition();.
+  events = [];
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  TIP1.setPendingCompositionString(composingStr);
+  TIP1.appendClauseToPendingComposition(composingStr.length, TIP1.ATTR_RAW_CLAUSE);
+  TIP1.flushPendingComposition();
+  input.addEventListener("compositionupdate", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionupdate\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionupdate\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  input.addEventListener("text", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"text\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  input.addEventListener("compositionend", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionend\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"compositionend\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should throw an exception during cancelComposition()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during cancelComposition()");
+    }
+  }, false);
+  TIP1.cancelComposition();
+  is(events.length, 4,
+     description + "compositionupdate, text, compositionend and input events should be fired by TIP1.cancelComposition()");
+  is(events[0].type, "compositionupdate",
+     description + "events[0] should be compositionupdate");
+  is(events[1].type, "text",
+     description + "events[1] should be text");
+  is(events[2].type, "compositionend",
+     description + "events[2] should be compositionend");
+  is(events[3].type, "input",
+     description + "events[3] should be input");
+
+  // Let's check if beginInputTransactionForTests() with another window fails to begin new input transaction with different TextEventDispatcher during keydown() and keyup();.
+  events = [];
+  TIP1.beginInputTransactionForTests(window, simpleCallback);
+  input.addEventListener("keydown", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"keydown\" should throw an exception during keydown()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"keydown\" should cause NS_ERROR_ALREADY_INITIALIZED during keydown()");
+    }
+  }, false);
+  input.addEventListener("keypress", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"keypress\" should throw an exception during keydown()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"keypress\" should cause NS_ERROR_ALREADY_INITIALIZED during keydown()");
+    }
+  }, false);
+  input.addEventListener("input", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should throw an exception during keydown()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"input\" should cause NS_ERROR_ALREADY_INITIALIZED during keydown()");
+    }
+  }, false);
+  input.addEventListener("keyup", function (aEvent) {
+    events.push(aEvent);
+    input.removeEventListener(aEvent.type, arguments.callee, false);
+    try {
+      TIP1.beginInputTransactionForTests(otherWindow, simpleCallback);
+      ok(false,
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"keyup\" should throw an exception during keyup()");
+    } catch (e) {
+      ok(e.message.contains("NS_ERROR_ALREADY_INITIALIZED"),
+         description + "TIP1.beginInputTransactionForTests(otherWindow, simpleCallback) called from \"keyup\" should cause NS_ERROR_ALREADY_INITIALIZED during keyup()");
+    }
+  }, false);
+  var keyA = new KeyboardEvent("", { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+  TIP1.keydown(keyA);
+  TIP1.keyup(keyA);
+  is(events.length, 4,
+     description + "keydown, keypress, input, keyup events should be fired by TIP1.keydown() and TIP1.keyup()");
+  is(events[0].type, "keydown",
+     description + "events[0] should be keydown");
+  is(events[1].type, "keypress",
+     description + "events[1] should be keypress");
+  is(events[2].type, "input",
+     description + "events[2] should be input");
+  is(events[3].type, "keyup",
+     description + "events[3] should be keyup");
+
+  // Let's check if startComposition() throws an exception after ownership is stolen.
   input.value = "";
+  ok(TIP1.beginInputTransactionForTests(window),
+     description + "TIP1.beginInputTransactionForTests() should succeed because there is no composition");
+  ok(TIP2.beginInputTransactionForTests(window),
+     description + "TIP2.beginInputTransactionForTests() should succeed because there is no composition");
   try {
     TIP1.startComposition();
     ok(false,
@@ -201,24 +1336,62 @@
        description + "The input element should not have commit string");
   }
 
-  // Let's check if commitComposition("bar") throws an exception after ownership is stolen.
+  // Let's check if commitCompositionWith("bar") throws an exception after ownership is stolen.
   ok(TIP1.beginInputTransactionForTests(window),
      description + "TIP1.beginInputTransactionForTests() should succeed because there is no composition");
   ok(TIP2.beginInputTransactionForTests(window),
      description + "TIP2.beginInputTransactionForTests() should succeed because there is no composition");
   input.value = "";
   try {
-    TIP1.commitComposition("bar");
+    TIP1.commitCompositionWith("bar");
     ok(false,
-       description + "TIP1.commitComposition(\"bar\") should cause throwing an exception because TIP2 took the ownership");
+       description + "TIP1.commitCompositionWith(\"bar\") should cause throwing an exception because TIP2 took the ownership");
   } catch (e) {
     ok(e.message.contains("NS_ERROR_NOT_INITIALIZED"),
-       description + "TIP1.commitComposition(\"bar\") should cause throwing an exception including NS_ERROR_NOT_INITIALIZED");
+       description + "TIP1.commitCompositionWith(\"bar\") should cause throwing an exception including NS_ERROR_NOT_INITIALIZED");
   } finally {
     is(input.value, "",
        description + "The input element should not have commit string");
   }
 
+  // Let's check if keydown() throws an exception after ownership is stolen.
+  ok(TIP1.beginInputTransactionForTests(window),
+     description + "TIP1.beginInputTransactionForTests() should succeed because there is no composition");
+  ok(TIP2.beginInputTransactionForTests(window),
+     description + "TIP2.beginInputTransactionForTests() should succeed because there is no composition");
+  input.value = "";
+  try {
+    var keyF = new KeyboardEvent("", { key: "f", code: "KeyF", keyCode: KeyboardEvent.DOM_VK_F });
+    TIP1.keydown(keyF);
+    ok(false,
+       description + "TIP1.keydown(keyF) should cause throwing an exception because TIP2 took the ownership");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_NOT_INITIALIZED"),
+       description + "TIP1.keydown(keyF) should cause throwing an exception including NS_ERROR_NOT_INITIALIZED");
+  } finally {
+    is(input.value, "",
+       description + "The input element should not be modified");
+  }
+
+  // Let's check if keyup() throws an exception after ownership is stolen.
+  ok(TIP1.beginInputTransactionForTests(window),
+     description + "TIP1.beginInputTransactionForTests() should succeed because there is no composition");
+  ok(TIP2.beginInputTransactionForTests(window),
+     description + "TIP2.beginInputTransactionForTests() should succeed because there is no composition");
+  input.value = "";
+  try {
+    var keyF = new KeyboardEvent("", { key: "f", code: "KeyF", keyCode: KeyboardEvent.DOM_VK_F });
+    TIP1.keyup(keyF);
+    ok(false,
+       description + "TIP1.keyup(keyF) should cause throwing an exception because TIP2 took the ownership");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_NOT_INITIALIZED"),
+       description + "TIP1.keyup(keyF) should cause throwing an exception including NS_ERROR_NOT_INITIALIZED");
+  } finally {
+    is(input.value, "",
+       description + "The input element should not be modified");
+  }
+
   // aCallback of nsITextInputProcessor.beginInputTransaction() must not be omitted.
   try {
     TIP1.beginInputTransaction(window);
@@ -351,178 +1524,1810 @@
   TIP.appendClauseToPendingComposition(1, TIP.ATTR_CONVERTED_CLAUSE);
   TIP.setCaretInPendingComposition(2);
 
-  reset();
-  TIP.flushPendingComposition();
-  is(events.length, 0,
-     description + "flushPendingComposition() separating a clause information shouldn't cause compositionupdate");
-  is(input.value, "foo",
-     description + "separating composition clause shouldn't cause modifying the focused editor");
+  reset();
+  TIP.flushPendingComposition();
+  is(events.length, 0,
+     description + "flushPendingComposition() separating a clause information shouldn't cause compositionupdate");
+  is(input.value, "foo",
+     description + "separating composition clause shouldn't cause modifying the focused editor");
+
+  // Modifying the composition string
+  TIP.setPendingCompositionString("FOo");
+  TIP.appendClauseToPendingComposition(2, TIP.ATTR_SELECTED_CLAUSE);
+  TIP.appendClauseToPendingComposition(1, TIP.ATTR_CONVERTED_CLAUSE);
+  TIP.setCaretInPendingComposition(2);
+
+  reset();
+  TIP.flushPendingComposition();
+  is(events.length, 1,
+     description + "flushPendingComposition() causing modifying composition string should cause compositionupdate");
+  is(events[0].type, "compositionupdate",
+     description + "flushPendingComposition() causing modifying composition string should cause compositionupdate");
+  is(events[0].data, "FOo",
+     description + "compositionupdate caused by flushPendingComposition() should have new composition string in its data");
+  is(input.value, "FOo",
+     description + "modifying composition clause shouldn't cause modifying the focused editor");
+
+  // Committing the composition string
+  reset();
+  TIP.commitComposition();
+  is(events.length, 1,
+     description + "commitComposition() should cause compositionend but shoudn't cause compositionupdate");
+  is(events[0].type, "compositionend",
+     description + "commitComposition() should cause compositionend");
+  is(events[0].data, "FOo",
+     description + "compositionend caused by commitComposition() should have the committed string in its data");
+  is(input.value, "FOo",
+     description + "commitComposition() shouldn't cause modifying the focused editor");
+
+  // Starting new composition without a call of startComposition()
+  TIP.setPendingCompositionString("bar");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+
+  reset();
+  TIP.flushPendingComposition();
+  is(events.length, 2,
+     description + "flushPendingComposition() without a call of startComposition() should cause both compositionstart and compositionupdate");
+  is(events[0].type, "compositionstart",
+     description + "flushPendingComposition() without a call of startComposition() should cause compositionstart");
+  is(events[1].type, "compositionupdate",
+     description + "flushPendingComposition() without a call of startComposition() should cause compositionupdate after compositionstart");
+  is(events[1].data, "bar",
+     description + "compositionupdate caused by flushPendingComposition() without a call of startComposition() should have the composition string in its data");
+  is(input.value, "FOobar",
+     description + "new composition string should cause appending composition string to the focused editor");
+
+  // Canceling the composition
+  reset();
+  TIP.cancelComposition();
+  is(events.length, 2,
+     description + "cancelComposition() should cause both compositionupdate and compositionend");
+  is(events[0].type, "compositionupdate",
+     description + "cancelComposition() should cause compositionupdate");
+  is(events[0].data, "",
+     description + "compositionupdate caused by cancelComposition() should have empty string in its data");
+  is(events[1].type, "compositionend",
+     description + "cancelComposition() should cause compositionend after compositionupdate");
+  is(events[1].data, "",
+     description + "compositionend caused by cancelComposition() should have empty string in its data");
+  is(input.value, "FOo",
+     description + "canceled composition string should be removed from the focused editor");
+
+  // Starting composition explicitly and canceling it
+  reset();
+  TIP.startComposition();
+  TIP.cancelComposition();
+  is(events.length, 2,
+     description + "canceling composition immediately after startComposition() should cause compositionstart and compositionend");
+  is(events[0].type, "compositionstart",
+     description + "canceling composition immediately after startComposition() should cause compositionstart first");
+  is(events[1].type, "compositionend",
+     description + "canceling composition immediately after startComposition() should cause compositionend after compositionstart");
+  is(events[1].data, "",
+     description + "compositionend caused by canceling composition should have empty string in its data");
+  is(input.value, "FOo",
+     description + "canceling composition shouldn't modify the focused editor");
+
+  // Create composition for next test.
+  TIP.setPendingCompositionString("bar");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.flushPendingComposition();
+  is(input.value, "FOobar",
+     description + "The focused editor should have new composition string \"bar\"");
+
+  // Allow to set empty composition string
+  reset();
+  TIP.flushPendingComposition();
+  is(events.length, 1,
+     description + "making composition string empty should cause only compositionupdate");
+  is(events[0].type, "compositionupdate",
+     description + "making composition string empty should cause compositionupdate");
+  is(events[0].data, "",
+     description + "compositionupdate caused by making composition string empty should have empty string in its data");
+
+  // Allow to insert new composition string without compositionend/compositionstart
+  TIP.setPendingCompositionString("buzz");
+  TIP.appendClauseToPendingComposition(4, TIP.ATTR_RAW_CLAUSE);
+
+  reset();
+  TIP.flushPendingComposition();
+  is(events.length, 1,
+     description + "modifying composition string from empty string should cause only compositionupdate");
+  is(events[0].type, "compositionupdate",
+     description + "modifying composition string from empty string should cause compositionupdate");
+  is(events[0].data, "buzz",
+     description + "compositionupdate caused by modifying composition string from empty string should have new composition string in its data");
+  is(input.value, "FOobuzz",
+     description + "new composition string should be appended to the focused editor");
+
+  // Committing with different string
+  reset();
+  TIP.commitCompositionWith("bar");
+  is(events.length, 2,
+     description + "committing with different string should cause compositionupdate and compositionend");
+  is(events[0].type, "compositionupdate",
+     description + "committing with different string should cause compositionupdate first");
+  is(events[0].data, "bar",
+     description + "compositionupdate caused by committing with different string should have the committing string in its data");
+  is(events[1].type, "compositionend",
+     description + "committing with different string should cause compositionend after compositionupdate");
+  is(events[1].data, "bar",
+     description + "compositionend caused by committing with different string should have the committing string in its data");
+  is(input.value, "FOobar",
+     description + "new committed string should be appended to the focused editor");
+
+  // Appending new composition string
+  TIP.setPendingCompositionString("buzz");
+  TIP.appendClauseToPendingComposition(4, TIP.ATTR_RAW_CLAUSE);
+  TIP.flushPendingComposition();
+  is(input.value, "FOobarbuzz",
+     description + "new composition string should be appended to the focused editor");
+
+  // Committing with same string
+  reset();
+  TIP.commitCompositionWith("buzz");
+  is(events.length, 1,
+     description + "committing with same string should cause only compositionend");
+  is(events[0].type, "compositionend",
+     description + "committing with same string should cause compositionend");
+  is(events[0].data, "buzz",
+     description + "compositionend caused by committing with same string should have the committing string in its data");
+  is(input.value, "FOobarbuzz",
+     description + "new committed string should be appended to the focused editor");
+
+  // Inserting commit string directly
+  reset();
+  TIP.commitCompositionWith("boo!");
+  is(events.length, 3,
+     description + "committing text directly should cause compositionstart, compositionupdate and compositionend");
+  is(events[0].type, "compositionstart",
+     description + "committing text directly should cause compositionstart first");
+  is(events[1].type, "compositionupdate",
+     description + "committing text directly should cause compositionupdate after compositionstart");
+  is(events[1].data, "boo!",
+     description + "compositionupdate caused by committing text directly should have the committing text in its data");
+  is(events[2].type, "compositionend",
+     description + "committing text directly should cause compositionend after compositionupdate");
+  is(events[2].data, "boo!",
+     description + "compositionend caused by committing text directly should have the committing text in its data");
+  is(input.value, "FOobarbuzzboo!",
+     description + "committing text directly should append the committing text to the focused editor");
+
+  window.removeEventListener("compositionstart", handler, false);
+  window.removeEventListener("compositionupdate", handler, false);
+  window.removeEventListener("compositionend", handler, false);
+}
+
+function runCompositionWithKeyEventTests()
+{
+  var description = "runCompositionWithKeyEventTests(): ";
+
+  var TIP = createTIP();
+  ok(TIP.beginInputTransactionForTests(window),
+     description + "TIP.beginInputTransactionForTests() should succeed");
+
+  var events;
+
+  function reset()
+  {
+    events = [];
+  }
+
+  function handler(aEvent)
+  {
+    events.push(aEvent);
+  }
+
+  window.addEventListener("compositionstart", handler, false);
+  window.addEventListener("compositionupdate", handler, false);
+  window.addEventListener("compositionend", handler, false);
+  window.addEventListener("keydown", handler, false);
+  window.addEventListener("keypress", handler, false);
+  window.addEventListener("keyup", handler, false);
+
+  input.value = "";
+  input.focus();
+
+  var printableKeyEvent = new KeyboardEvent("", { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+  var enterKeyEvent = new KeyboardEvent("", { key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+  var escKeyEvent = new KeyboardEvent("", { key: "Escape", code: "Escape", keyCode: KeyboardEvent.DOM_VK_ESCAPE });
+  var convertKeyEvent = new KeyboardEvent("", { key: "Convert", code: "Convert", keyCode: KeyboardEvent.DOM_VK_CONVERT });
+  var backspaceKeyEvent = new KeyboardEvent("", { key: "Backspace", code: "Backspace", keyCode: KeyboardEvent.DOM_VK_BACK_SPACE });
+
+  SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", false);
+
+  // nsITextInputProcessor.startComposition()
+  reset();
+  TIP.startComposition(printableKeyEvent);
+  is(events.length, 2,
+     description + "startComposition(printableKeyEvent) should cause keydown and compositionstart");
+  is(events[0].type, "keydown",
+     description + "startComposition(printableKeyEvent) should cause keydown");
+  is(events[1].type, "compositionstart",
+     description + "startComposition(printableKeyEvent) should cause compositionstart");
+  is(input.value, "",
+     description + "startComposition(printableKeyEvent) shouldn't modify the focused editor");
+
+  // Setting composition string "foo" as a raw clause
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.setCaretInPendingComposition(3);
+
+  reset();
+  TIP.flushPendingComposition(printableKeyEvent);
+  is(events.length, 1,
+     description + "flushPendingComposition(KeyupInternal) after startComposition() should cause compositionupdate");
+  is(events[0].type, "compositionupdate",
+     description + "flushPendingComposition(KeyupInternal) after startComposition() should cause compositionupdate");
+  is(events[0].data, "foo",
+     description + "compositionupdate caused by flushPendingComposition(KeyupInternal) should have new composition string in its data");
+  is(input.value, "foo",
+     description + "modifying composition string should cause modifying the focused editor");
+
+  // Changing the raw clause to a selected clause
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_SELECTED_CLAUSE);
+
+  reset();
+  TIP.flushPendingComposition(convertKeyEvent);
+  is(events.length, 0,
+     description + "flushPendingComposition(convertKeyEvent) changing only clause information shouldn't cause compositionupdate");
+  is(input.value, "foo",
+     description + "modifying composition clause shouldn't cause modifying the focused editor");
+
+  // Separating the selected clause to two clauses
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(2, TIP.ATTR_SELECTED_CLAUSE);
+  TIP.appendClauseToPendingComposition(1, TIP.ATTR_CONVERTED_CLAUSE);
+  TIP.setCaretInPendingComposition(2);
+
+  reset();
+  TIP.flushPendingComposition(convertKeyEvent);
+  is(events.length, 0,
+     description + "flushPendingComposition(convertKeyEvent) separating a clause information shouldn't cause compositionupdate");
+  is(input.value, "foo",
+     description + "separating composition clause shouldn't cause modifying the focused editor");
+
+  // Modifying the composition string
+  TIP.setPendingCompositionString("FOo");
+  TIP.appendClauseToPendingComposition(2, TIP.ATTR_SELECTED_CLAUSE);
+  TIP.appendClauseToPendingComposition(1, TIP.ATTR_CONVERTED_CLAUSE);
+  TIP.setCaretInPendingComposition(2);
+
+  reset();
+  TIP.flushPendingComposition(convertKeyEvent);
+  is(events.length, 1,
+     description + "flushPendingComposition(convertKeyEvent) causing modifying composition string should cause compositionupdate");
+  is(events[0].type, "compositionupdate",
+     description + "flushPendingComposition(convertKeyEvent) causing modifying composition string should cause compositionupdate");
+  is(events[0].data, "FOo",
+     description + "compositionupdate caused by flushPendingComposition(convertKeyEvent) should have new composition string in its data");
+  is(input.value, "FOo",
+     description + "modifying composition clause shouldn't cause modifying the focused editor");
+
+  // Committing the composition string
+  reset();
+  TIP.commitComposition(enterKeyEvent);
+  is(events.length, 2,
+     description + "commitComposition(enterKeyEvent) should cause compositionend and keyup but shoudn't cause compositionupdate");
+  is(events[0].type, "compositionend",
+     description + "commitComposition(enterKeyEvent) should cause compositionend");
+  is(events[0].data, "FOo",
+     description + "compositionend caused by commitComposition(enterKeyEvent) should have the committed string in its data");
+  is(events[1].type, "keyup",
+     description + "commitComposition(enterKeyEvent) should cause keyup");
+  is(input.value, "FOo",
+     description + "commitComposition(enterKeyEvent) shouldn't cause modifying the focused editor");
+
+  // Starting new composition without a call of startComposition()
+  TIP.setPendingCompositionString("bar");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+
+  reset();
+  TIP.flushPendingComposition(printableKeyEvent);
+  is(events.length, 3,
+     description + "flushPendingComposition(printableKeyEvent) without a call of startComposition() should cause both compositionstart and compositionupdate");
+  is(events[0].type, "keydown",
+     description + "flushPendingComposition(printableKeyEvent) without a call of startComposition() should cause keydown");
+  is(events[1].type, "compositionstart",
+     description + "flushPendingComposition(printableKeyEvent) without a call of startComposition() should cause compositionstart");
+  is(events[2].type, "compositionupdate",
+     description + "flushPendingComposition(printableKeyEvent) without a call of startComposition() should cause compositionupdate after compositionstart");
+  is(events[2].data, "bar",
+     description + "compositionupdate caused by flushPendingComposition(printableKeyEvent) without a call of startComposition() should have the composition string in its data");
+  is(input.value, "FOobar",
+     description + "new composition string should cause appending composition string to the focused editor");
+
+  // Canceling the composition
+  reset();
+  TIP.cancelComposition(escKeyEvent);
+  is(events.length, 3,
+     description + "cancelComposition(escKeyEvent) should cause both compositionupdate and compositionend");
+  is(events[0].type, "compositionupdate",
+     description + "cancelComposition(escKeyEvent) should cause compositionupdate");
+  is(events[0].data, "",
+     description + "compositionupdate caused by cancelComposition(escKeyEvent) should have empty string in its data");
+  is(events[1].type, "compositionend",
+     description + "cancelComposition(escKeyEvent) should cause compositionend after compositionupdate");
+  is(events[1].data, "",
+     description + "compositionend caused by cancelComposition(escKeyEvent) should have empty string in its data");
+  is(events[2].type, "keyup",
+     description + "cancelComposition(escKeyEvent) should cause keyup after compositionend");
+  is(input.value, "FOo",
+     description + "canceled composition string should be removed from the focused editor");
+
+  // Starting composition explicitly and canceling it
+  reset();
+  TIP.startComposition(printableKeyEvent);
+  TIP.cancelComposition(escKeyEvent);
+  is(events.length, 4,
+     description + "canceling composition immediately after startComposition() should cause keydown, compositionstart, compositionend and keyup");
+  is(events[0].type, "keydown",
+     description + "canceling composition immediately after startComposition() should cause keydown first");
+  is(events[1].type, "compositionstart",
+     description + "canceling composition immediately after startComposition() should cause compositionstart after keydown");
+  is(events[2].type, "compositionend",
+     description + "canceling composition immediately after startComposition() should cause compositionend after compositionstart");
+  is(events[2].data, "",
+     description + "compositionend caused by canceling composition should have empty string in its data");
+  is(events[3].type, "keyup",
+     description + "canceling composition immediately after startComposition() should cause keyup after compositionend");
+  is(input.value, "FOo",
+     description + "canceling composition shouldn't modify the focused editor");
+
+  // Create composition for next test.
+  TIP.setPendingCompositionString("bar");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.flushPendingComposition();
+  is(input.value, "FOobar",
+     description + "The focused editor should have new composition string \"bar\"");
+
+  // Allow to set empty composition string
+  reset();
+  TIP.flushPendingComposition(backspaceKeyEvent);
+  is(events.length, 1,
+     description + "making composition string empty should cause only compositionupdate");
+  is(events[0].type, "compositionupdate",
+     description + "making composition string empty should cause compositionupdate");
+  is(events[0].data, "",
+     description + "compositionupdate caused by making composition string empty should have empty string in its data");
+
+  // Allow to insert new composition string without compositionend/compositionstart
+  TIP.setPendingCompositionString("buzz");
+  TIP.appendClauseToPendingComposition(4, TIP.ATTR_RAW_CLAUSE);
+
+  reset();
+  TIP.flushPendingComposition(printableKeyEvent);
+  is(events.length, 1,
+     description + "modifying composition string from empty string should cause only compositionupdate");
+  is(events[0].type, "compositionupdate",
+     description + "modifying composition string from empty string should cause compositionupdate");
+  is(events[0].data, "buzz",
+     description + "compositionupdate caused by modifying composition string from empty string should have new composition string in its data");
+  is(input.value, "FOobuzz",
+     description + "new composition string should be appended to the focused editor");
+
+  // Committing with different string
+  reset();
+  TIP.commitCompositionWith("bar", printableKeyEvent);
+  is(events.length, 3,
+     description + "committing with different string should cause compositionupdate and compositionend");
+  is(events[0].type, "compositionupdate",
+     description + "committing with different string should cause compositionupdate first");
+  is(events[0].data, "bar",
+     description + "compositionupdate caused by committing with different string should have the committing string in its data");
+  is(events[1].type, "compositionend",
+     description + "committing with different string should cause compositionend after compositionupdate");
+  is(events[1].data, "bar",
+     description + "compositionend caused by committing with different string should have the committing string in its data");
+  is(events[2].type, "keyup",
+     description + "committing with different string should cause keyup after compositionend");
+  is(input.value, "FOobar",
+     description + "new committed string should be appended to the focused editor");
+
+  // Appending new composition string
+  TIP.setPendingCompositionString("buzz");
+  TIP.appendClauseToPendingComposition(4, TIP.ATTR_RAW_CLAUSE);
+  TIP.flushPendingComposition();
+  is(input.value, "FOobarbuzz",
+     description + "new composition string should be appended to the focused editor");
+
+  // Committing with same string
+  reset();
+  TIP.commitCompositionWith("buzz", enterKeyEvent);
+  is(events.length, 2,
+     description + "committing with same string should cause only compositionend");
+  is(events[0].type, "compositionend",
+     description + "committing with same string should cause compositionend");
+  is(events[0].data, "buzz",
+     description + "compositionend caused by committing with same string should have the committing string in its data");
+  is(events[1].type, "keyup",
+     description + "committing with same string should cause keyup after compositionend");
+  is(input.value, "FOobarbuzz",
+     description + "new committed string should be appended to the focused editor");
+
+  // Inserting commit string directly
+  reset();
+  TIP.commitCompositionWith("boo!", printableKeyEvent);
+  is(events.length, 5,
+     description + "committing text directly should cause compositionstart, compositionupdate and compositionend");
+  is(events[0].type, "keydown",
+     description + "committing text directly should cause keydown first");
+  is(events[1].type, "compositionstart",
+     description + "committing text directly should cause compositionstart after keydown");
+  is(events[2].type, "compositionupdate",
+     description + "committing text directly should cause compositionupdate after compositionstart");
+  is(events[2].data, "boo!",
+     description + "compositionupdate caused by committing text directly should have the committing text in its data");
+  is(events[3].type, "compositionend",
+     description + "committing text directly should cause compositionend after compositionupdate");
+  is(events[3].data, "boo!",
+     description + "compositionend caused by committing text directly should have the committing text in its data");
+  is(events[4].type, "keyup",
+     description + "committing text directly should cause keyup after compositionend");
+  is(input.value, "FOobarbuzzboo!",
+     description + "committing text directly should append the committing text to the focused editor");
+
+  SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", true);
+
+  // Even if "dom.keyboardevent.dispatch_during_composition" is true, keypress event shouldn't be fired during composition
+  reset();
+  TIP.startComposition(printableKeyEvent);
+  is(events.length, 3,
+     description + "TIP.startComposition(printableKeyEvent) should cause keydown, compositionstart and keyup (keypress event shouldn't be fired during composition)");
+  is(events[0].type, "keydown",
+     description + "TIP.startComposition(printableKeyEvent) should cause keydown (keypress event shouldn't be fired during composition)");
+  is(events[1].type, "compositionstart",
+     description + "TIP.startComposition(printableKeyEvent) should cause compositionstart (keypress event shouldn't be fired during composition)");
+  is(events[2].type, "keyup",
+     description + "TIP.startComposition(printableKeyEvent) should cause keyup (keypress event shouldn't be fired during composition)");
+
+  // TIP.flushPendingComposition(printableKeyEvent) should cause keydown and keyup events if "dom.keyboardevent.dispatch_during_composition" is true
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.setCaretInPendingComposition(3);
+
+  reset();
+  TIP.flushPendingComposition(printableKeyEvent);
+  is(events.length, 3,
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause keydown, compositionupdate and keyup (keypress event shouldn't be fired during composition)");
+  is(events[0].type, "keydown",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause keydown (keypress event shouldn't be fired during composition)");
+  is(events[1].type, "compositionupdate",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause compositionupdate (keypress event shouldn't be fired during composition)");
+  is(events[2].type, "keyup",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause keyup (keypress event shouldn't be fired during composition)");
+
+  // TIP.commitComposition(enterKeyEvent) should cause keydown and keyup events if "dom.keyboardevent.dispatch_during_composition" is true
+  reset();
+  TIP.commitComposition(enterKeyEvent);
+  is(events.length, 3,
+     description + "TIP.commitComposition(enterKeyEvent) should cause keydown, compositionend and keyup (keypress event shouldn't be fired during composition)");
+  is(events[0].type, "keydown",
+     description + "TIP.commitComposition(enterKeyEvent) should cause keydown (keypress event shouldn't be fired during composition)");
+  is(events[1].type, "compositionend",
+     description + "TIP.commitComposition(enterKeyEvent) should cause compositionend (keypress event shouldn't be fired during composition)");
+  is(events[2].type, "keyup",
+     description + "TIP.commitComposition(enterKeyEvent) should cause keyup (keypress event shouldn't be fired during composition)");
+
+  // TIP.cancelComposition(escKeyEvent) should cause keydown and keyup events if "dom.keyboardevent.dispatch_during_composition" is true
+  TIP.startComposition();
+  reset();
+  TIP.cancelComposition(escKeyEvent);
+  is(events.length, 3,
+     description + "TIP.cancelComposition(escKeyEvent) should cause keydown, compositionend and keyup (keypress event shouldn't be fired during composition)");
+  is(events[0].type, "keydown",
+     description + "TIP.cancelComposition(escKeyEvent) should cause keydown (keypress event shouldn't be fired during composition)");
+  is(events[1].type, "compositionend",
+     description + "TIP.cancelComposition(escKeyEvent) should cause compositionend (keypress event shouldn't be fired during composition)");
+  is(events[2].type, "keyup",
+     description + "TIP.cancelComposition(escKeyEvent) should cause keyup (keypress event shouldn't be fired during composition)");
+
+  var printableKeydownEvent = new KeyboardEvent("keydown", { key: "b", code: "KeyB", keyCode: KeyboardEvent.DOM_VK_B });
+  var enterKeydownEvent = new KeyboardEvent("keydown", { key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+  var escKeydownEvent = new KeyboardEvent("keydown", { key: "Escape", code: "Escape", keyCode: KeyboardEvent.DOM_VK_ESCAPE });
+
+  // TIP.startComposition(printableKeydownEvent) shouldn't cause keyup event even if "dom.keyboardevent.dispatch_during_composition" is true
+  reset();
+  TIP.startComposition(printableKeydownEvent);
+  is(events.length, 2,
+     description + "TIP.startComposition(printableKeydownEvent) should cause keydown and compositionstart (keyup event shouldn't be fired)");
+  is(events[0].type, "keydown",
+     description + "TIP.startComposition(printableKeydownEvent) should cause keydown (keyup event shouldn't be fired)");
+  is(events[1].type, "compositionstart",
+     description + "TIP.startComposition(printableKeydownEvent) should cause compositionstart (keyup event shouldn't be fired)");
+
+  // TIP.flushPendingComposition(printableKeydownEvent) shouldn't cause keyup event even if "dom.keyboardevent.dispatch_during_composition" is true
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.setCaretInPendingComposition(3);
+
+  reset();
+  TIP.flushPendingComposition(printableKeydownEvent);
+  is(events.length, 2,
+     description + "TIP.flushPendingComposition(printableKeydownEvent) should cause keydown and compositionupdate (keyup event shouldn't be fired)");
+  is(events[0].type, "keydown",
+     description + "TIP.flushPendingComposition(printableKeydownEvent) should cause keydown (keyup event shouldn't be fired)");
+  is(events[1].type, "compositionupdate",
+     description + "TIP.flushPendingComposition(printableKeydownEvent) should cause compositionupdate (keyup event shouldn't be fired)");
+
+  // TIP.commitComposition(enterKeydownEvent) shouldn't cause keyup event even if "dom.keyboardevent.dispatch_during_composition" is true
+  reset();
+  TIP.commitComposition(enterKeydownEvent);
+  is(events.length, 2,
+     description + "TIP.commitComposition(enterKeydownEvent) should cause keydown and compositionend (keyup event shouldn't be fired)");
+  is(events[0].type, "keydown",
+     description + "TIP.commitComposition(enterKeydownEvent) should cause keydown (keyup event shouldn't be fired)");
+  is(events[1].type, "compositionend",
+     description + "TIP.commitComposition(enterKeydownEvent) should cause compositionend (keyup event shouldn't be fired)");
+
+  // TIP.cancelComposition(escKeydownEvent) shouldn't cause keyup event even if "dom.keyboardevent.dispatch_during_composition" is true
+  TIP.startComposition();
+  reset();
+  TIP.cancelComposition(escKeydownEvent);
+  is(events.length, 2,
+     description + "TIP.cancelComposition(escKeydownEvent) should cause keydown and compositionend (keyup event shouldn't be fired)");
+  is(events[0].type, "keydown",
+     description + "TIP.cancelComposition(escKeydownEvent) should cause keydown (keyup event shouldn't be fired)");
+  is(events[1].type, "compositionend",
+     description + "TIP.cancelComposition(escKeydownEvent) should cause compositionend (keyup event shouldn't be fired)");
+
+  SpecialPowers.clearUserPref("dom.keyboardevent.dispatch_during_composition");
+
+  window.removeEventListener("compositionstart", handler, false);
+  window.removeEventListener("compositionupdate", handler, false);
+  window.removeEventListener("compositionend", handler, false);
+  window.removeEventListener("keydown", handler, false);
+  window.removeEventListener("keypress", handler, false);
+  window.removeEventListener("keyup", handler, false);
+}
+
+function runConsumingKeydownBeforeCompositionTests()
+{
+  var description = "runConsumingKeydownBeforeCompositionTests(): ";
+
+  var TIP = createTIP();
+  ok(TIP.beginInputTransactionForTests(window),
+     description + "TIP.beginInputTransactionForTests() should succeed");
+
+  var events;
+
+  function reset()
+  {
+    events = [];
+  }
+
+  function handler(aEvent)
+  {
+    events.push(aEvent);
+    if (aEvent.type == "keydown") {
+      aEvent.preventDefault();
+    }
+  }
+
+  window.addEventListener("compositionstart", handler, false);
+  window.addEventListener("compositionupdate", handler, false);
+  window.addEventListener("compositionend", handler, false);
+  window.addEventListener("keydown", handler, false);
+  window.addEventListener("keypress", handler, false);
+  window.addEventListener("keyup", handler, false);
+
+  input.value = "";
+  input.focus();
+
+  var printableKeyEvent = new KeyboardEvent("", { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+  var enterKeyEvent = new KeyboardEvent("", { key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+  var escKeyEvent = new KeyboardEvent("", { key: "Escape", code: "Escape", keyCode: KeyboardEvent.DOM_VK_ESCAPE });
+
+  SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", false);
+
+  // If keydown before compositionstart is consumed, composition shouldn't be started.
+  reset();
+  ok(!TIP.startComposition(printableKeyEvent),
+     description + "TIP.startComposition(printableKeyEvent) should return false because it's keydown is consumed");
+  is(events.length, 2,
+     description + "TIP.startComposition(printableKeyEvent) should cause only keydown and keyup events");
+  is(events[0].type, "keydown",
+     description + "TIP.startComposition(printableKeyEvent) should cause keydown event first");
+  is(events[1].type, "keyup",
+     description + "TIP.startComposition(printableKeyEvent) should cause keyup event after keydown");
+  ok(!TIP.hasComposition,
+     description + "TIP.startComposition(printableKeyEvent) shouldn't cause composition");
+  is(input.value, "",
+     description + "TIP.startComposition(printableKeyEvent) shouldn't cause inserting text");
+
+  // If keydown before compositionstart caused by flushPendingComposition(printableKeyEvent) is consumed, composition shouldn't be started.
+  reset();
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.setCaretInPendingComposition(3);
+  ok(!TIP.flushPendingComposition(printableKeyEvent),
+     description + "TIP.flushPendingComposition(printableKeyEvent) should return false because it's keydown is consumed");
+  is(events.length, 2,
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause only keydown and keyup events");
+  is(events[0].type, "keydown",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause keydown event first");
+  is(events[1].type, "keyup",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause keyup event after keydown");
+  ok(!TIP.hasComposition,
+     description + "TIP.flushPendingComposition(printableKeyEvent) shouldn't cause composition");
+  is(input.value, "",
+     description + "TIP.flushPendingComposition(printableKeyEvent) shouldn't cause inserting text");
+
+  // If keydown before compositionstart is consumed, composition shouldn't be started.
+  reset();
+  ok(!TIP.commitCompositionWith("foo", printableKeyEvent),
+     description + "TIP.commitCompositionWith(\"foo\", printableKeyEvent) should return false because it's keydown is consumed");
+  is(events.length, 2,
+     description + "TIP.commitCompositionWith(\"foo\", printableKeyEvent) should cause only keydown and keyup events");
+  is(events[0].type, "keydown",
+     description + "TIP.commitCompositionWith(\"foo\", printableKeyEvent) should cause keydown event first");
+  is(events[1].type, "keyup",
+     description + "TIP.commitCompositionWith(\"foo\", printableKeyEvent) should cause keyup event after keydown");
+  ok(!TIP.hasComposition,
+     description + "TIP.commitCompositionWith(\"foo\", printableKeyEvent) shouldn't cause composition");
+  is(input.value, "",
+     description + "TIP.commitCompositionWith(\"foo\", printableKeyEvent) shouldn't cause inserting text");
+
+  SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", true);
+
+  // If composition is already started, TIP.flushPendingComposition(printableKeyEvent) shouldn't be canceled.
+  TIP.startComposition();
+  ok(TIP.hasComposition,
+     description + "Before TIP.flushPendingComposition(printableKeyEvent), composition should've been created");
+  reset();
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.setCaretInPendingComposition(3);
+  ok(TIP.flushPendingComposition(printableKeyEvent),
+     description + "TIP.flushPendingComposition(printableKeyEvent) should return true even if preceding keydown is consumed because there was a composition already");
+  is(events.length, 3,
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause only keydown and keyup events");
+  is(events[0].type, "keydown",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause keydown event first");
+  is(events[1].type, "compositionupdate",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause compositionupdate event after keydown");
+  is(events[2].type, "keyup",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause keyup event after compositionupdate");
+  ok(TIP.hasComposition,
+     description + "TIP.flushPendingComposition(printableKeyEvent) shouldn't cause canceling composition");
+  is(input.value, "foo",
+     description + "TIP.flushPendingComposition(printableKeyEvent) should cause inserting text even if preceding keydown is consumed because there was a composition already");
+
+  // If composition is already started, TIP.commitComposition(enterKeyEvent) shouldn't be canceled.
+  reset();
+  TIP.commitComposition(enterKeyEvent);
+  is(events.length, 3,
+     description + "TIP.commitComposition(enterKeyEvent) should cause keydown, compositionend and keyup events");
+  is(events[0].type, "keydown",
+     description + "TIP.commitComposition(enterKeyEvent) should cause keydown event first");
+  is(events[1].type, "compositionend",
+     description + "TIP.commitComposition(enterKeyEvent) should cause compositionend event after keydown");
+  is(events[2].type, "keyup",
+     description + "TIP.commitComposition(enterKeyEvent) should cause keyup event after compositionend");
+  ok(!TIP.hasComposition,
+     description + "TIP.commitComposition(enterKeyEvent) should cause committing composition even if preceding keydown is consumed because there was a composition already");
+  is(input.value, "foo",
+     description + "TIP.commitComposition(enterKeyEvent) should commit composition even if preceding keydown is consumed because there was a composition already");
+
+  // cancelComposition() should work even if preceding keydown event is consumed.
+  input.value = "";
+  TIP.setPendingCompositionString("foo");
+  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  TIP.setCaretInPendingComposition(3);
+  TIP.flushPendingComposition();
+  ok(TIP.hasComposition,
+     description + "Before TIP.cancelComposition(escKeyEvent), composition should've been created");
+  is(input.value, "foo",
+     description + "Before TIP.cancelComposition(escKeyEvent) should have composition string");
+  reset();
+  TIP.cancelComposition(escKeyEvent);
+  is(events.length, 4,
+     description + "TIP.cancelComposition(escKeyEvent) should cause keydown, compositionupdate, compositionend and keyup events even if preceding keydown is consumed because there was a composition already");
+  is(events[0].type, "keydown",
+     description + "TIP.cancelComposition(escKeyEvent) should cause keydown event first");
+  is(events[1].type, "compositionupdate",
+     description + "TIP.cancelComposition(escKeyEvent) should cause compositionupdate event after keydown");
+  is(events[2].type, "compositionend",
+     description + "TIP.cancelComposition(escKeyEvent) should cause compositionend event after compositionupdate");
+  is(events[3].type, "keyup",
+     description + "TIP.cancelComposition(escKeyEvent) should cause keyup event after compositionend");
+  ok(!TIP.hasComposition,
+     description + "TIP.cancelComposition(escKeyEvent) should cause canceling composition even if preceding keydown is consumed because there was a composition already");
+  is(input.value, "",
+     description + "TIP.cancelComposition(escKeyEvent) should cancel composition even if preceding keydown is consumed because there was a composition already");
+
+  SpecialPowers.clearUserPref("dom.keyboardevent.dispatch_during_composition");
+
+  window.removeEventListener("compositionstart", handler, false);
+  window.removeEventListener("compositionupdate", handler, false);
+  window.removeEventListener("compositionend", handler, false);
+  window.removeEventListener("keydown", handler, false);
+  window.removeEventListener("keypress", handler, false);
+  window.removeEventListener("keyup", handler, false);
+}
+
+function runKeyTests()
+{
+  var description = "runKeyTests(): ";
+  const kModifiers =
+    [ "Alt", "AltGraph", "CapsLock", "Control", "Fn", "FnLock", "Meta", "NumLock",
+      "ScrollLock", "Shift", "Symbol", "SymbolLock", "OS" ];
+
+  var TIP = createTIP();
+  ok(TIP.beginInputTransactionForTests(window),
+     description + "TIP.beginInputTransactionForTests() should succeed");
+
+  var events;
+  var doPreventDefaults;
+
+  function reset()
+  {
+    events = [];
+    doPreventDefaults = [];
+  }
+
+  function handler(aEvent)
+  {
+    events.push(aEvent);
+    if (doPreventDefaults.indexOf(aEvent.type) >= 0) {
+      aEvent.preventDefault();
+    }
+  }
+
+  function checkKeyAttrs(aMethodDescription, aEvent, aExpectedData)
+  {
+    var desc = description + aMethodDescription + ", type=\"" + aEvent.type + "\", key=\"" + aEvent.key + "\", code=\"" + aEvent.code + "\": ";
+    var defaultValues = {
+      key: "Unidentified", code: "", keyCode: 0, charCode: 0,
+      location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD, repeat: false, isComposing: false,
+      shiftKey: false, ctrlKey: false, altKey: false, metaKey: false,
+      defaultPrevented: false
+    };
+    function expectedValue(aAttr)
+    {
+      return aExpectedData[aAttr] !== undefined ? aExpectedData[aAttr] : defaultValues[aAttr];
+    }
+    is(aEvent.type, aExpectedData.type,
+       desc + " should cause keydown event");
+    if (aEvent.type != aExpectedData.type) {
+      return;
+    }
+    is(aEvent.defaultPrevented, expectedValue("defaultPrevented"),
+       desc + ".defaultPrevented is wrong");
+    is(aEvent.key, expectedValue("key"),
+       desc + ".key is wrong");
+    if (SpecialPowers.getBoolPref("dom.keyboardevent.code.enabled")) {
+      is(aEvent.code, expectedValue("code"),
+         desc + ".code is wrong");
+    }
+    is(aEvent.location, expectedValue("location"),
+       desc + ".location is wrong");
+    is(aEvent.repeat, expectedValue("repeat"),
+       desc + ".repeat is wrong");
+    is(aEvent.isComposing, expectedValue("isComposing"),
+       desc + ".isComposing is wrong");
+    is(aEvent.keyCode, expectedValue("keyCode"),
+       desc + ".keyCode is wrong");
+    is(aEvent.charCode, expectedValue("charCode"),
+       desc + ".charCode is wrong");
+    is(aEvent.shiftKey, expectedValue("shiftKey"),
+       desc + ".shiftKey is wrong");
+    is(aEvent.ctrlKey, expectedValue("ctrlKey"),
+       desc + ".ctrlKey is wrong");
+    is(aEvent.altKey, expectedValue("altKey"),
+       desc + ".altKey is wrong");
+    is(aEvent.metaKey, expectedValue("metaKey"),
+       desc + ".metaKey is wrong");
+    for (var i = 0; i < kModifiers.length; i++) {
+      is(aEvent.getModifierState(kModifiers[i]), aExpectedData[kModifiers[i]] !== undefined ? aExpectedData[kModifiers[i]] : false,
+         desc + ".getModifierState(\"" + kModifiers[i] + "\") is wrong");
+    }
+  }
+
+  window.addEventListener("keydown", handler, false);
+  window.addEventListener("keypress", handler, false);
+  window.addEventListener("keyup", handler, false);
+
+  input.value = "";
+  input.focus();
+
+
+  // Printable key test:
+  // Emulates pressing 'a' key.
+  var keyA = new KeyboardEvent("", { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+
+  reset();
+  var doDefaultKeydown = TIP.keydown(keyA);
+
+  ok(!doDefaultKeydown,
+     description + "TIP.keydown(keyA) should return false because the keypress event should be consumed by the input element");
+  is(events.length, 2,
+     description + "TIP.keydown(keyA) should cause keydown and keypress event");
+  checkKeyAttrs("TIP.keydown(keyA)", events[0],
+                { type: "keydown",  key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0 });
+  checkKeyAttrs("TIP.keydown(keyA)", events[1],
+                { type: "keypress", key: "a", code: "KeyA", keyCode: 0,                      charCode: "a".charCodeAt(0), defaultPrevented: true });
+  is(input.value, "a",
+     description + "input.value should be \"a\" which is inputted by TIP.keydown(keyA)");
+
+  // Emulates releasing 'a' key.
+  reset();
+  var doDefaultKeyup = TIP.keyup(keyA);
+  ok(doDefaultKeyup,
+     description + "TIP.keyup(keyA) should return true");
+  is(events.length, 1,
+     description + "TIP.keyup(keyA) should cause keyup event");
+  checkKeyAttrs("TIP.keyup(keyA)", events[0],
+                { type: "keyup",      key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0 });
+  is(input.value, "a",
+     description + "input.value should stay \"a\" which was inputted by TIP.keydown(keyA)");
+
+
+  // Non-printable key test:
+  // Emulates pressing Enter key.
+  var keyEnter = new KeyboardEvent("", { key: "Enter", code: "Enter" });
+
+  reset();
+  doDefaultKeydown = TIP.keydown(keyEnter);
+
+  ok(doDefaultKeydown,
+     description + "TIP.keydown(keyEnter) should return true");
+  is(events.length, 2,
+     description + "TIP.keydown(keyEnter) should cause keydown and keypress event");
+  checkKeyAttrs("TIP.keydown(keyEnter)", events[0],
+                { type: "keydown",  key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+  checkKeyAttrs("TIP.keydown(keyEnter)", events[1],
+                { type: "keypress", key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+  is(input.value, "a",
+     description + "input.value should stay \"a\" which was inputted by TIP.keydown(keyA)");
+
+  // Emulates releasing Enter key.
+  reset();
+  doDefaultKeyup = TIP.keyup(keyEnter);
+  ok(doDefaultKeyup,
+     description + "TIP.keyup(keyEnter) should return true");
+  is(events.length, 1,
+     description + "TIP.keyup(keyEnter) should cause keyup event");
+  checkKeyAttrs("TIP.keyup(keyEnter)", events[0],
+                { type: "keyup",      key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+  is(input.value, "a",
+     description + "input.value should stay \"a\" which was inputted by TIP.keydown(keyA)");
+
+
+  // KEY_DEFAULT_PREVENTED should cause defaultPrevented = true and not cause keypress event
+  var keyB = new KeyboardEvent("", { key: "b", code: "KeyB", keyCode: KeyboardEvent.DOM_VK_B });
+
+  reset();
+  doDefaultKeydown = TIP.keydown(keyB, TIP.KEY_DEFAULT_PREVENTED);
+  doDefaultKeyup   = TIP.keyup(keyB, TIP.KEY_DEFAULT_PREVENTED);
+
+  ok(!doDefaultKeydown,
+     description + "TIP.keydown(keyB, TIP.KEY_DEFAULT_PREVENTED) should return false because it's marked as consumed at dispatching the event");
+  ok(!doDefaultKeyup,
+     description + "TIP.keyup(keyB, TIP.KEY_DEFAULT_PREVENTED) should return false because it's marked as consumed at dispatching the event");
+  is(events.length, 2,
+     description + "TIP.keydown(keyB, TIP.KEY_DEFAULT_PREVENTED) and TIP.keyup(keyB, TIP.KEY_DEFAULT_PREVENTED) should cause keydown and keyup event");
+  checkKeyAttrs("TIP.keydown(keyB, TIP.KEY_DEFAULT_PREVENTED) and TIP.keyup(keyB, TIP.KEY_DEFAULT_PREVENTED)", events[0],
+                { type: "keydown", key: "b", code: "KeyB", keyCode: KeyboardEvent.DOM_VK_B, defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyB, TIP.KEY_DEFAULT_PREVENTED) and TIP.keyup(keyB, TIP.KEY_DEFAULT_PREVENTED)", events[1],
+                { type: "keyup",   key: "b", code: "KeyB", keyCode: KeyboardEvent.DOM_VK_B, defaultPrevented: true });
+  is(input.value, "a",
+     description + "input.value shouldn't be modified by default prevented key events");
+
+  // Assume that KeyX causes inputting text "abc"
+  input.value = "";
+  var keyABC = new KeyboardEvent("", { key: "abc", code: "KeyX", keyCode: KeyboardEvent.DOM_VK_A });
+
+  reset();
+  doDefaultKeydown = TIP.keydown(keyABC);
+  doDefaultKeyup   = TIP.keyup(keyABC);
+
+  ok(!doDefaultKeydown,
+     description + "TIP.keydown(keyABC) should return false because the keypress events should be consumed by the input element");
+  ok(doDefaultKeyup,
+     description + "TIP.keyup(keyABC) should return true");
+  is(events.length, 5,
+     description + "TIP.keydown(keyABC) and TIP.keyup(keyABC) should cause keydown, keypress, keypress, keypress and keyup event");
+  checkKeyAttrs("TIP.keydown(keyABC) and TIP.keyup(keyABC)", events[0],
+                { type: "keydown",  key: "abc",           code: "KeyX", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0,                   defaultPrevented: false });
+  checkKeyAttrs("TIP.keydown(keyABC) and TIP.keyup(keyABC)", events[1],
+                { type: "keypress", key: "abc".charAt(0), code: "KeyX", keyCode: 0,                      charCode: "abc".charCodeAt(0), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyABC) and TIP.keyup(keyABC)", events[2],
+                { type: "keypress", key: "abc".charAt(1), code: "KeyX", keyCode: 0,                      charCode: "abc".charCodeAt(1), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyABC) and TIP.keyup(keyABC)", events[3],
+                { type: "keypress", key: "abc".charAt(2), code: "KeyX", keyCode: 0,                      charCode: "abc".charCodeAt(2), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyABC) and TIP.keyup(keyABC)", events[4],
+                { type: "keyup",    key: "abc",           code: "KeyX", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0,                   defaultPrevented: false });
+  is(input.value, "abc",
+     description + "input.value should be \"abc\"");
+
+  // If KEY_FORCE_PRINTABLE_KEY is specified, registered key names can be a printable key which inputs the specified value.
+  input.value = "";
+  var keyEnterPrintable = new KeyboardEvent("", { key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+
+  reset();
+  doDefaultKeydown = TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY);
+  doDefaultKeyup   = TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY);
+
+  ok(!doDefaultKeydown,
+     description + "TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) should return false because the keypress events should be consumed by the input element");
+  ok(doDefaultKeyup,
+     description + "TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) should return true");
+  is(events.length, 7,
+     description + "TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) should cause keydown, keypress, keypress, keypress, keypress, keypress and keyup event");
+  checkKeyAttrs("TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)", events[0],
+                { type: "keydown",  key: "Enter",           code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN, charCode: 0,                    defaultPrevented: false });
+  checkKeyAttrs("TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)", events[1],
+                { type: "keypress", key: "Enter".charAt(0), code: "Enter", keyCode: 0,                           charCode: "Enter".charCodeAt(0), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)", events[2],
+                { type: "keypress", key: "Enter".charAt(1), code: "Enter", keyCode: 0,                           charCode: "Enter".charCodeAt(1), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)", events[3],
+                { type: "keypress", key: "Enter".charAt(2), code: "Enter", keyCode: 0,                           charCode: "Enter".charCodeAt(2), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)", events[4],
+                { type: "keypress", key: "Enter".charAt(3), code: "Enter", keyCode: 0,                           charCode: "Enter".charCodeAt(3), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)", events[5],
+                { type: "keypress", key: "Enter".charAt(4), code: "Enter", keyCode: 0,                           charCode: "Enter".charCodeAt(4), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY) and TIP.keyup(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)", events[6],
+                { type: "keyup",    key: "Enter",           code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN, charCode: 0,                     defaultPrevented: false });
+  is(input.value, "Enter",
+     description + "input.value should be \"Enter\"");
+
+  // modifiers should be ignored.
+  var keyWithModifiers = new KeyboardEvent("", { key: "Escape", code: "Escape", shiftKey: true, ctrlKey: true, altKey: true, metaKey: true });
+
+  reset();
+  doDefaultKeydown = TIP.keydown(keyWithModifiers);
+  doDefaultKeyup   = TIP.keyup(keyWithModifiers);
+
+  ok(doDefaultKeydown,
+     description + "TIP.keydown(keyWithModifiers) should return true");
+  ok(doDefaultKeyup,
+     description + "TIP.keyup(keyWithModifiers) should return true");
+  is(events.length, 3,
+     description + "TIP.keydown(keyWithModifiers) and TIP.keyup(keyWithModifiers) should cause keydown, keypress and keyup event");
+  checkKeyAttrs("TIP.keydown(keyWithModifiers) and TIP.keyup(keyWithModifiers)", events[0],
+                { type: "keydown",  key: "Escape", code: "Escape", keyCode: KeyboardEvent.DOM_VK_ESCAPE });
+  checkKeyAttrs("TIP.keydown(keyWithModifiers) and TIP.keyup(keyWithModifiers)", events[1],
+                { type: "keypress", key: "Escape", code: "Escape", keyCode: KeyboardEvent.DOM_VK_ESCAPE });
+  checkKeyAttrs("TIP.keydown(keyWithModifiers) and TIP.keyup(keyWithModifiers)", events[2],
+                { type: "keyup",    key: "Escape", code: "Escape", keyCode: KeyboardEvent.DOM_VK_ESCAPE });
+  is(input.value, "Enter",
+     description + "input.value should stay \"Enter\" which was inputted by TIP.keydown(keyEnterPrintable, TIP.KEY_FORCE_PRINTABLE_KEY)");
+
+  // Call preventDefault() at keydown
+  input.value = "";
+  reset();
+  doPreventDefaults = [ "keydown" ];
+  doDefaultKeydown = TIP.keydown(keyA);
+  doDefaultKeyup   = TIP.keyup(keyA);
+
+  ok(!doDefaultKeydown,
+     description + "TIP.keydown(keyA) should return false because keydown event's preventDefault should be called");
+  ok(doDefaultKeyup,
+     description + "TIP.keyup(keyA) should return true");
+  is(events.length, 2,
+     description + "TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keydown should cause keydown and keyup event");
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keydown", events[0],
+                { type: "keydown",  key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keydown", events[1],
+                { type: "keyup",    key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, defaultPrevented: false });
+  is(input.value, "",
+     description + "input.value shouldn't be modified by TIP.keyup(keyA) if the keydown event is consumed");
+
+  // Call preventDefault() at keypress
+  reset();
+  doPreventDefaults = [ "keypress" ];
+  doDefaultKeydown = TIP.keydown(keyA);
+  doDefaultKeyup   = TIP.keyup(keyA);
+
+  ok(!doDefaultKeydown,
+     description + "TIP.keydown(keyA) should return false because keypress event's preventDefault should be called");
+  ok(doDefaultKeyup,
+     description + "TIP.keyup(keyA) should return true");
+  is(events.length, 3,
+     description + "TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keypress should cause keydown, keypress and keyup event");
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keypress", events[0],
+                { type: "keydown",  key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0,                 defaultPrevented: false });
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keypress", events[1],
+                { type: "keypress", key: "a", code: "KeyA", keyCode: 0,                      charCode: "a".charCodeAt(0), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keypress", events[2],
+                { type: "keyup",    key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0,                 defaultPrevented: false });
+  is(input.value, "",
+     description + "input.value shouldn't be modified by TIP.keyup(keyA) if the keypress event is consumed");
+
+  // Call preventDefault() at keyup
+  input.value = "";
+  reset();
+  doPreventDefaults = [ "keyup" ];
+  doDefaultKeydown = TIP.keydown(keyA);
+  doDefaultKeyup   = TIP.keyup(keyA);
+
+  ok(!doDefaultKeydown,
+     description + "TIP.keydown(keyA) should return false because the key event should be consumed by the input element");
+  ok(!doDefaultKeyup,
+     description + "TIP.keyup(keyA) should return false because keyup event's preventDefault should be called");
+  is(events.length, 3,
+     description + "TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keyup should cause keydown, keypress and keyup event");
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keyup", events[0],
+                { type: "keydown",  key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0,                 defaultPrevented: false });
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keyup", events[1],
+                { type: "keypress", key: "a", code: "KeyA", keyCode: 0,                      charCode: "a".charCodeAt(0), defaultPrevented: true });
+  checkKeyAttrs("TIP.keydown(keyA) and TIP.keyup(keyA) with preventing default of keyup", events[2],
+                { type: "keyup",    key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0,                 defaultPrevented: true });
+  is(input.value, "a",
+     description + "input.value should be \"a\" by TIP.keyup(keyA) even if the keyup event is consumed");
+
+  // key events during composition
+  try {
+    SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", false);
+
+    ok(TIP.startComposition(), "TIP.startComposition() should start composition");
+
+    input.value = "";
+    reset();
+    TIP.keydown(keyA);
+    is(events.length, 0,
+       description + "TIP.keydown(keyA) shouldn't cause key events during composition if it's disabled by the pref");
+    reset();
+    TIP.keyup(keyA);
+    is(events.length, 0,
+       description + "TIP.keyup(keyA) shouldn't cause key events during composition if it's disabled by the pref");
+
+    SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", true);
+    reset();
+    TIP.keydown(keyA);
+    is(events.length, 1,
+       description + "TIP.keydown(keyA) should cause keydown event even composition if it's enabled by the pref");
+    checkKeyAttrs("TIP.keydown(keyA) during composition", events[0],
+                  { type: "keydown",  key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0, isComposing: true });
+    reset();
+    TIP.keyup(keyA);
+    is(events.length, 1,
+       description + "TIP.keyup(keyA) should cause keyup event even composition if it's enabled by the pref");
+    checkKeyAttrs("TIP.keyup(keyA) during composition", events[0],
+                  { type: "keyup",    key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A, charCode: 0, isComposing: true });
+
+  } finally {
+    TIP.cancelComposition();
+    SpecialPowers.clearUserPref("dom.keyboardevent.dispatch_during_composition");
+  }
+
+  // Test .location computation
+  const kCodeToLocation = [
+    { code: "BracketLeft",              location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "BracketRight",             location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Comma",                    location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit0",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit1",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit2",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit3",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit4",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit5",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit6",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit7",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit8",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Digit9",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Equal",                    location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Minus",                    location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Period",                   location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Slash",                    location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "AltLeft",                  location: KeyboardEvent.DOM_KEY_LOCATION_LEFT },
+    { code: "AltRight",                 location: KeyboardEvent.DOM_KEY_LOCATION_RIGHT },
+    { code: "CapsLock",                 location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "ContextMenu",              location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "ControlLeft",              location: KeyboardEvent.DOM_KEY_LOCATION_LEFT },
+    { code: "ControlRight",             location: KeyboardEvent.DOM_KEY_LOCATION_RIGHT },
+    { code: "Enter",                    location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "OSLeft",                   location: KeyboardEvent.DOM_KEY_LOCATION_LEFT },
+    { code: "OSRight",                  location: KeyboardEvent.DOM_KEY_LOCATION_RIGHT },
+    { code: "ShiftLeft",                location: KeyboardEvent.DOM_KEY_LOCATION_LEFT },
+    { code: "ShiftRight",               location: KeyboardEvent.DOM_KEY_LOCATION_RIGHT },
+    { code: "Space",                    location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Tab",                      location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "ArrowDown",                location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "ArrowLeft",                location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "ArrowRight",               location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "ArrowUp",                  location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "NumLock",                  location: KeyboardEvent.DOM_KEY_LOCATION_STANDARD },
+    { code: "Numpad0",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad1",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad2",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad3",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad4",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad5",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad6",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad7",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad8",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "Numpad9",                  location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadAdd",                location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadBackspace",          location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadClear",              location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadClearEntry",         location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadComma",              location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadDecimal",            location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadDivide",             location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadEnter",              location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadEqual",              location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadMemoryAdd",          location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadMemoryClear",        location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadMemoryRecall",       location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadMemoryStore",        location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadMemorySubtract",     location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadMultiply",           location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadParenLeft",          location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadParenRight",         location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+    { code: "NumpadSubtract",           location: KeyboardEvent.DOM_KEY_LOCATION_NUMPAD },
+  ];
+  for (var i = 0; i < kCodeToLocation.length; i++) {
+    var keyEvent = new KeyboardEvent("", { code: kCodeToLocation[i].code });
+    reset();
+    doPreventDefaults = [ "keypress" ];
+    // If the location isn't initialized or initialized with 0, it should be computed from the code value.
+    TIP.keydown(keyEvent);
+    TIP.keyup(keyEvent);
+    var longDesc = description + "testing computation of .location of \"" + kCodeToLocation[i].code + "\", ";
+    is(events.length, 3,
+       longDesc + "keydown, keypress and keyup events should be fired");
+    for (var j = 0; j < events.length; j++) {
+      is(events[j].location, kCodeToLocation[i].location,
+         longDesc + " type=\"" + events[j].type + "\", location value is wrong");
+    }
+    // However, if KEY_KEEP_KEY_LOCATION_STANDARD is specified, .location value should be kept as DOM_KEY_LOCATION_STANDARD (0).
+    reset();
+    doPreventDefaults = [ "keypress" ];
+    TIP.keydown(keyEvent, TIP.KEY_KEEP_KEY_LOCATION_STANDARD);
+    TIP.keyup(keyEvent, TIP.KEY_KEEP_KEY_LOCATION_STANDARD);
+    var longDesc = description + "testing if .location is forcibly set to DOM_KEY_LOCATION_STANDARD, ";
+    is(events.length, 3,
+       longDesc + "keydown, keypress and keyup events should be fired");
+    for (var j = 0; j < events.length; j++) {
+      is(events[j].location, KeyboardEvent.DOM_KEY_LOCATION_STANDARD,
+         longDesc + " type=\"" + events[j].type + "\", location value is not 0");
+    }
+    // If .location is initialized with non-zero value, the value shouldn't be computed again.
+    var keyEventWithLocation = new KeyboardEvent("", { code: kCodeToLocation[i].code, location: 0xFF });
+    reset();
+    doPreventDefaults = [ "keypress" ];
+    TIP.keydown(keyEventWithLocation);
+    TIP.keyup(keyEventWithLocation);
+    longDesc = description + "testing if .location is not computed for \"" + kCodeToLocation[i].location + "\", ";
+    is(events.length, 3,
+       longDesc + "keydown, keypress and keyup events should be fired");
+    for (var j = 0; j < events.length; j++) {
+      is(events[j].location, 0xFF,
+         longDesc + " type=\"" + events[j].type + "\", location shouldn't be computed if it's initialized with non-zero value");
+    }
+  }
+
+  // Test .keyCode value computation
+  const kKeyToKeyCode = [
+    { key: "Cancel",                    keyCode: KeyboardEvent.DOM_VK_CANCEL },
+    { key: "Help",                      keyCode: KeyboardEvent.DOM_VK_HELP },
+    { key: "Backspace",                 keyCode: KeyboardEvent.DOM_VK_BACK_SPACE },
+    { key: "Tab",                       keyCode: KeyboardEvent.DOM_VK_TAB },
+    { key: "Clear",                     keyCode: KeyboardEvent.DOM_VK_CLEAR },
+    { key: "Enter",                     keyCode: KeyboardEvent.DOM_VK_RETURN },
+    { key: "Shift",                     keyCode: KeyboardEvent.DOM_VK_SHIFT,              isModifier: true },
+    { key: "Control",                   keyCode: KeyboardEvent.DOM_VK_CONTROL,            isModifier: true },
+    { key: "Alt",                       keyCode: KeyboardEvent.DOM_VK_ALT,                isModifier: true },
+    { key: "Pause",                     keyCode: KeyboardEvent.DOM_VK_PAUSE },
+    { key: "CapsLock",                  keyCode: KeyboardEvent.DOM_VK_CAPS_LOCK,          isModifier: true, isLockableModifier: true },
+    { key: "Hiragana",                  keyCode: KeyboardEvent.DOM_VK_KANA },
+    { key: "Katakana",                  keyCode: KeyboardEvent.DOM_VK_KANA },
+    { key: "HiraganaKatakana",          keyCode: KeyboardEvent.DOM_VK_KANA },
+    { key: "KanaMode",                  keyCode: KeyboardEvent.DOM_VK_KANA },
+    { key: "HangulMode",                keyCode: KeyboardEvent.DOM_VK_HANGUL },
+    { key: "Eisu",                      keyCode: KeyboardEvent.DOM_VK_EISU },
+    { key: "JunjaMode",                 keyCode: KeyboardEvent.DOM_VK_JUNJA },
+    { key: "FinalMode",                 keyCode: KeyboardEvent.DOM_VK_FINAL },
+    { key: "HanjaMode",                 keyCode: KeyboardEvent.DOM_VK_HANJA },
+    { key: "KanjiMode",                 keyCode: KeyboardEvent.DOM_VK_KANJI },
+    { key: "Escape",                    keyCode: KeyboardEvent.DOM_VK_ESCAPE },
+    { key: "Convert",                   keyCode: KeyboardEvent.DOM_VK_CONVERT },
+    { key: "NonConvert",                keyCode: KeyboardEvent.DOM_VK_NONCONVERT },
+    { key: "Accept",                    keyCode: KeyboardEvent.DOM_VK_ACCEPT },
+    { key: "ModeChange",                keyCode: KeyboardEvent.DOM_VK_MODECHANGE },
+    { key: "PageUp",                    keyCode: KeyboardEvent.DOM_VK_PAGE_UP },
+    { key: "PageDown",                  keyCode: KeyboardEvent.DOM_VK_PAGE_DOWN },
+    { key: "End",                       keyCode: KeyboardEvent.DOM_VK_END },
+    { key: "Home",                      keyCode: KeyboardEvent.DOM_VK_HOME },
+    { key: "ArrowLeft",                 keyCode: KeyboardEvent.DOM_VK_LEFT },
+    { key: "ArrowUp",                   keyCode: KeyboardEvent.DOM_VK_UP },
+    { key: "ArrowRight",                keyCode: KeyboardEvent.DOM_VK_RIGHT },
+    { key: "ArrowDown",                 keyCode: KeyboardEvent.DOM_VK_DOWN },
+    { key: "Select",                    keyCode: KeyboardEvent.DOM_VK_SELECT },
+    { key: "Print",                     keyCode: KeyboardEvent.DOM_VK_PRINT },
+    { key: "Execute",                   keyCode: KeyboardEvent.DOM_VK_EXECUTE },
+    { key: "PrintScreen",               keyCode: KeyboardEvent.DOM_VK_PRINTSCREEN },
+    { key: "Insert",                    keyCode: KeyboardEvent.DOM_VK_INSERT },
+    { key: "Delete",                    keyCode: KeyboardEvent.DOM_VK_DELETE },
+    { key: "OS",                        keyCode: KeyboardEvent.DOM_VK_WIN,                isModifier: true },
+    { key: "ContextMenu",               keyCode: KeyboardEvent.DOM_VK_CONTEXT_MENU },
+    { key: "F1",                        keyCode: KeyboardEvent.DOM_VK_F1 },
+    { key: "F2",                        keyCode: KeyboardEvent.DOM_VK_F2 },
+    { key: "F3",                        keyCode: KeyboardEvent.DOM_VK_F3 },
+    { key: "F4",                        keyCode: KeyboardEvent.DOM_VK_F4 },
+    { key: "F5",                        keyCode: KeyboardEvent.DOM_VK_F5 },
+    { key: "F6",                        keyCode: KeyboardEvent.DOM_VK_F6 },
+    { key: "F7",                        keyCode: KeyboardEvent.DOM_VK_F7 },
+    { key: "F8",                        keyCode: KeyboardEvent.DOM_VK_F8 },
+    { key: "F9",                        keyCode: KeyboardEvent.DOM_VK_F9 },
+    { key: "F10",                       keyCode: KeyboardEvent.DOM_VK_F10 },
+    { key: "F11",                       keyCode: KeyboardEvent.DOM_VK_F11 },
+    { key: "F12",                       keyCode: KeyboardEvent.DOM_VK_F12 },
+    { key: "F13",                       keyCode: KeyboardEvent.DOM_VK_F13 },
+    { key: "F14",                       keyCode: KeyboardEvent.DOM_VK_F14 },
+    { key: "F15",                       keyCode: KeyboardEvent.DOM_VK_F15 },
+    { key: "F16",                       keyCode: KeyboardEvent.DOM_VK_F16 },
+    { key: "F17",                       keyCode: KeyboardEvent.DOM_VK_F17 },
+    { key: "F18",                       keyCode: KeyboardEvent.DOM_VK_F18 },
+    { key: "F19",                       keyCode: KeyboardEvent.DOM_VK_F19 },
+    { key: "F20",                       keyCode: KeyboardEvent.DOM_VK_F20 },
+    { key: "F21",                       keyCode: KeyboardEvent.DOM_VK_F21 },
+    { key: "F22",                       keyCode: KeyboardEvent.DOM_VK_F22 },
+    { key: "F23",                       keyCode: KeyboardEvent.DOM_VK_F23 },
+    { key: "F24",                       keyCode: KeyboardEvent.DOM_VK_F24 },
+    { key: "NumLock",                   keyCode: KeyboardEvent.DOM_VK_NUM_LOCK,           isModifier: true, isLockableModifier: true },
+    { key: "ScrollLock",                keyCode: KeyboardEvent.DOM_VK_SCROLL_LOCK,        isModifier: true, isLockableModifier: true },
+    { key: "VolumeMute",                keyCode: KeyboardEvent.DOM_VK_VOLUME_MUTE },
+    { key: "VolumeDown",                keyCode: KeyboardEvent.DOM_VK_VOLUME_DOWN },
+    { key: "VolumeUp",                  keyCode: KeyboardEvent.DOM_VK_VOLUME_UP },
+    { key: "Meta",                      keyCode: KeyboardEvent.DOM_VK_META,               isModifier: true },
+    { key: "AltGraph",                  keyCode: KeyboardEvent.DOM_VK_ALTGR,              isModifier: true },
+    { key: "Attn",                      keyCode: KeyboardEvent.DOM_VK_ATTN },
+    { key: "CrSel",                     keyCode: KeyboardEvent.DOM_VK_CRSEL },
+    { key: "ExSel",                     keyCode: KeyboardEvent.DOM_VK_EXSEL },
+    { key: "EraseEof",                  keyCode: KeyboardEvent.DOM_VK_EREOF },
+    { key: "Play",                      keyCode: KeyboardEvent.DOM_VK_PLAY },
+    { key: "ZoomToggle",                keyCode: KeyboardEvent.DOM_VK_ZOOM },
+    { key: "ZoomIn",                    keyCode: KeyboardEvent.DOM_VK_ZOOM },
+    { key: "ZoomOut",                   keyCode: KeyboardEvent.DOM_VK_ZOOM },
+    { key: "Unidentified",              keyCode: 0 },
+    { key: "a",                         keyCode: 0, isPrintable: true },
+    { key: "A",                         keyCode: 0, isPrintable: true },
+    { key: " ",                         keyCode: 0, isPrintable: true },
+    { key: "",                          keyCode: 0, isPrintable: true },
+  ];
+
+  for (var i = 0; i < kKeyToKeyCode.length; i++) {
+    var keyEvent = new KeyboardEvent("", { key: kKeyToKeyCode[i].key });
+    var causeKeypress = !kKeyToKeyCode[i].isModifier;
+    var baseFlags = kKeyToKeyCode[i].isPrintable ? 0 : TIP.KEY_NON_PRINTABLE_KEY;
+    reset();
+    doPreventDefaults = [ "keypress" ];
+    // If the keyCode isn't initialized or initialized with 0, it should be computed from the key value only when it's a printable key.
+    TIP.keydown(keyEvent, baseFlags);
+    TIP.keyup(keyEvent, baseFlags);
+    var longDesc = description + "testing computation of .keyCode of \"" + kKeyToKeyCode[i].key + "\", ";
+    is(events.length, causeKeypress ? 3 : 2,
+       longDesc + "keydown" + (causeKeypress ? ", keypress" : "") + " and keyup events should be fired");
+    for (var j = 0; j < events.length; j++) {
+      is(events[j].keyCode, events[j].type == "keypress" && kKeyToKeyCode[i].isPrintable ? 0 : kKeyToKeyCode[i].keyCode,
+         longDesc + " type=\"" + events[j].type + "\", keyCode value is wrong");
+    }
+    // However, if KEY_KEEP_KEYCODE_ZERO is specified, .keyCode value should be kept as 0.
+    reset();
+    doPreventDefaults = [ "keypress" ];
+    TIP.keydown(keyEvent, TIP.KEY_KEEP_KEYCODE_ZERO | baseFlags);
+    TIP.keyup(keyEvent, TIP.KEY_KEEP_KEYCODE_ZERO | baseFlags);
+    var longDesc = description + "testing if .keyCode is forcibly set to KEY_KEEP_KEYCODE_ZERO, ";
+    is(events.length, causeKeypress ? 3 : 2,
+       longDesc + "keydown" + (causeKeypress ? ", keypress" : "") + " and keyup events should be fired");
+    for (var j = 0; j < events.length; j++) {
+      is(events[j].keyCode, 0,
+         longDesc + " type=\"" + events[j].type + "\", keyCode value is not 0");
+    }
+    // If .keyCode is initialized with non-zero value, the value shouldn't be computed again.
+    var keyEventWithLocation = new KeyboardEvent("", { key: kKeyToKeyCode[i].key, keyCode: 0xFF });
+    reset();
+    doPreventDefaults = [ "keypress" ];
+    TIP.keydown(keyEventWithLocation, baseFlags);
+    TIP.keyup(keyEventWithLocation, baseFlags);
+    longDesc = description + "testing if .keyCode is not computed for \"" + kKeyToKeyCode[i].key + "\", ";
+    is(events.length, causeKeypress ? 3 : 2,
+       longDesc + "keydown" + (causeKeypress ? ", keypress" : "") + " and keyup events should be fired");
+    for (var j = 0; j < events.length; j++) {
+      is(events[j].keyCode, events[j].type == "keypress" && kKeyToKeyCode[i].isPrintable ? 0 : 0xFF,
+         longDesc + " type=\"" + events[j].type + "\", keyCode shouldn't be computed if it's initialized with non-zero value");
+    }
+    // Unlock lockable modifier if the key is a lockable modifier key.
+    if (kKeyToKeyCode[i].isLockableModifier) {
+      TIP.keydown(keyEvent, baseFlags);
+      TIP.keyup(keyEvent, baseFlags);
+    }
+  }
+
+  // Modifier state tests
+  var sharedTIP = createTIP();
+  ok(sharedTIP.beginInputTransactionForTests(otherWindow),
+     description + "sharedTIP.beginInputTransactionForTests(otherWindow) should return true");
+  TIP.shareModifierStateOf(sharedTIP);
+  var independentTIP = createTIP();
+  const kModifierKeys = [
+    { key: "Alt",        code: "AltLeft",      isLockable: false },
+    { key: "Alt",        code: "AltRight",     isLockable: false },
+    { key: "AltGraph",   code: "AltRight",     isLockable: false },
+    { key: "CapsLock",   code: "CapsLock",     isLockable: true },
+    { key: "Control",    code: "ControlLeft",  isLockable: false },
+    { key: "Control",    code: "ControlRight", isLockable: false },
+    { key: "Fn",         code: "Fn",           isLockable: false },
+    { key: "FnLock",     code: "",             isLockable: true },
+    { key: "Meta",       code: "OSLeft",       isLockable: false },
+    { key: "Meta",       code: "OSRight",      isLockable: false },
+    { key: "NumLock",    code: "NumLock",      isLockable: true },
+    { key: "ScrollLock", code: "ScrollLock",   isLockable: true },
+    { key: "Shift",      code: "ShiftLeft",    isLockable: false },
+    { key: "Shift",      code: "ShiftRight",   isLockable: false },
+    { key: "Symbol",     code: "",             isLockable: false },
+    { key: "SymbolLock", code: "",             isLockable: true },
+    { key: "OS",         code: "OSLeft",       isLockable: false },
+    { key: "OS",         code: "OSRight",      isLockable: false },
+  ];
+
+  function checkModifiers(aTestDesc, aEvent, aType, aKey, aCode, aModifiers)
+  {
+    var desc = description + aTestDesc + ", type=\"" + aEvent.type + "\", key=\"" + aEvent.key + "\", code=\"" + aEvent.code + "\"";
+    is(aEvent.type, aType,
+       desc + ", .type value is wrong");
+    if (aEvent.type != aType) {
+      return;
+    }
+    is(aEvent.key, aKey,
+       desc + ", .key value is wrong");
+    if (SpecialPowers.getBoolPref("dom.keyboardevent.code.enabled")) {
+      is(aEvent.code, aCode,
+         desc + ", .code value is wrong");
+    }
+    is(aEvent.altKey, aModifiers.indexOf("Alt") >= 0,
+       desc + ", .altKey value is wrong");
+    is(aEvent.ctrlKey, aModifiers.indexOf("Control") >= 0,
+       desc + ", .ctrlKey value is wrong");
+    is(aEvent.metaKey, aModifiers.indexOf("Meta") >= 0,
+       desc + ", .metaKey value is wrong");
+    is(aEvent.shiftKey, aModifiers.indexOf("Shift") >= 0,
+       desc + ", .shiftKey value is wrong");
+    for (var i = 0; i < kModifiers.length; i++) {
+      is(aEvent.getModifierState(kModifiers[i]), aModifiers.indexOf(kModifiers[i]) >= 0,
+         desc + ", .getModifierState(\"" + kModifiers[i] + "\") returns wrong value");
+    }
+  }
 
-  // Modifying the composition string
-  TIP.setPendingCompositionString("FOo");
-  TIP.appendClauseToPendingComposition(2, TIP.ATTR_SELECTED_CLAUSE);
-  TIP.appendClauseToPendingComposition(1, TIP.ATTR_CONVERTED_CLAUSE);
-  TIP.setCaretInPendingComposition(2);
+  function checkAllTIPModifiers(aTestDesc, aModifiers)
+  {
+    for (var i = 0; i < kModifiers.length; i++) {
+      is(TIP.getModifierState(kModifiers[i]), aModifiers.indexOf(kModifiers[i]) >= 0,
+         aTestDesc + ", TIP.getModifierState(\"" + kModifiers[i] + "\") returns wrong value");
+      is(sharedTIP.getModifierState(kModifiers[i]), TIP.getModifierState(kModifiers[i]),
+         aTestDesc + ", sharedTIP.getModifierState(\"" + kModifiers[i] + "\") returns different value from TIP");
+      is(independentTIP.getModifierState(kModifiers[i]), false,
+         aTestDesc + ", independentTIP.getModifierState(\"" + kModifiers[i] + "\") should return false");
+    }
+  }
 
+  // First, all modifiers must be false.
   reset();
-  TIP.flushPendingComposition();
-  is(events.length, 1,
-     description + "flushPendingComposition() causing modifying composition string should cause compositionupdate");
-  is(events[0].type, "compositionupdate",
-     description + "flushPendingComposition() causing modifying composition string should cause compositionupdate");
-  is(events[0].data, "FOo",
-     description + "compositionupdate caused by flushPendingComposition() should have new composition string in its data");
-  is(input.value, "FOo",
-     description + "modifying composition clause shouldn't cause modifying the focused editor");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(keyA);
+  TIP.keyup(keyA);
 
-  // Committing the composition string
-  reset();
-  TIP.commitComposition();
-  is(events.length, 1,
-     description + "commitComposition() should cause compositionend but shoudn't cause compositionupdate");
-  is(events[0].type, "compositionend",
-     description + "commitComposition() should cause compositionend");
-  is(events[0].data, "FOo",
-     description + "compositionend caused by commitComposition() should have the committed string in its data");
-  is(input.value, "FOo",
-     description + "commitComposition() shouldn't cause modifying the focused editor");
+  is(events.length, 3,
+     description + "TIP.keydown(keyA) and TIP.keyup(keyA) should cause keydown, keypress and keyup");
+  checkModifiers("Before dispatching modifier key events", events[0], "keydown",  "a", "KeyA", []);
+  checkModifiers("Before dispatching modifier key events", events[1], "keypress", "a", "KeyA", []);
+  checkModifiers("Before dispatching modifier key events", events[2], "keyup",    "a", "KeyA", []);
+
+  // Test each modifier keydown/keyup causes activating/inactivating the modifier state.
+  for (var i = 0; i < kModifierKeys.length; i++) {
+    reset();
+    doPreventDefaults = [ "keypress" ];
+    var modKey = new KeyboardEvent("", { key: kModifierKeys[i].key, code: kModifierKeys[i].code });
+    var testDesc = "A modifier key \"" + kModifierKeys[i].key + "\" (\"" + kModifierKeys[i].code + "\") and a printable key";
+    if (!kModifierKeys[i].isLockable) {
+      TIP.keydown(modKey);
+      checkAllTIPModifiers(testDesc + ", \"" + kModifierKeys[i].key + "\" keydown", [ kModifierKeys[i].key ]);
+      TIP.keydown(keyA);
+      checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ kModifierKeys[i].key ]);
+      TIP.keyup(keyA);
+      checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ kModifierKeys[i].key ]);
+      TIP.keyup(modKey);
+      checkAllTIPModifiers(testDesc + ", \"" + kModifierKeys[i].key + "\" keyup", [ ]);
+      is(events.length, 5,
+         description + testDesc + " should cause 5 events");
+      checkModifiers(testDesc, events[0], "keydown",  kModifierKeys[i].key, kModifierKeys[i].code, [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[1], "keydown",  "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[2], "keypress", "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[3], "keyup",    "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[4], "keyup",    kModifierKeys[i].key, kModifierKeys[i].code, [ ]);
+
+      // KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT shouldn't cause key events of modifier keys, but should modify the modifier state.
+      reset();
+      doPreventDefaults = [ "keypress" ];
+      testDesc = "A modifier key \"" + kModifierKeys[i].key + "\" (\"" + kModifierKeys[i].code + "\") with KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT and a printable key";
+      TIP.keydown(modKey, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+      TIP.keydown(keyA);
+      TIP.keyup(keyA);
+      TIP.keyup(modKey, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+      TIP.keydown(keyA);
+      TIP.keyup(keyA);
+      is(events.length, 6,
+         description + testDesc + " should cause 6 events");
+      checkModifiers(testDesc, events[0], "keydown",  "a", "KeyA", [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[1], "keypress", "a", "KeyA", [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[2], "keyup",    "a", "KeyA", [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[3], "keydown",  "a", "KeyA", [ ]);
+      checkModifiers(testDesc, events[4], "keypress", "a", "KeyA", [ ]);
+      checkModifiers(testDesc, events[5], "keyup",    "a", "KeyA", [ ]);
+    } else {
+      TIP.keydown(modKey);
+      checkAllTIPModifiers(testDesc + ", \"" + kModifierKeys[i].key + "\" first keydown", [ kModifierKeys[i].key ]);
+      TIP.keyup(modKey);
+      checkAllTIPModifiers(testDesc + ", \"" + kModifierKeys[i].key + "\" first keyup", [ kModifierKeys[i].key ]);
+      TIP.keydown(keyA);
+      checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ kModifierKeys[i].key ]);
+      TIP.keyup(keyA);
+      checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ kModifierKeys[i].key ]);
+      TIP.keydown(modKey);
+      checkAllTIPModifiers(testDesc + ", \"" + kModifierKeys[i].key + "\" second keydown", [ ]);
+      TIP.keyup(modKey);
+      checkAllTIPModifiers(testDesc + ", \"" + kModifierKeys[i].key + "\" second keyup", [ ]);
+      is(events.length, 7,
+         description + testDesc + " should cause 7 events");
+      checkModifiers(testDesc, events[0], "keydown",  kModifierKeys[i].key, kModifierKeys[i].code, [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[1], "keyup",    kModifierKeys[i].key, kModifierKeys[i].code, [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[2], "keydown",  "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[3], "keypress", "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[4], "keyup",    "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[5], "keydown",  kModifierKeys[i].key, kModifierKeys[i].code, [ ]);
+      checkModifiers(testDesc, events[6], "keyup",    kModifierKeys[i].key, kModifierKeys[i].code, [ ]);
+
+      // KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT shouldn't cause key events of modifier keys, but should modify the modifier state.
+      reset();
+      doPreventDefaults = [ "keypress" ];
+      testDesc = "A modifier key \"" + kModifierKeys[i].key + "\" (\"" + kModifierKeys[i].code + "\") with KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT and a printable key";
+      TIP.keydown(modKey, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+      TIP.keyup(modKey, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+      TIP.keydown(keyA);
+      TIP.keyup(keyA);
+      TIP.keydown(modKey, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+      TIP.keyup(modKey, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+      TIP.keydown(keyA);
+      TIP.keyup(keyA);
+      is(events.length, 6,
+         description + testDesc + " should cause 6 events");
+      checkModifiers(testDesc, events[0], "keydown",  "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[1], "keypress", "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[2], "keyup",    "a",                  "KeyA",                [ kModifierKeys[i].key ]);
+      checkModifiers(testDesc, events[3], "keydown",  "a",                  "KeyA",                [ ]);
+      checkModifiers(testDesc, events[4], "keypress", "a",                  "KeyA",                [ ]);
+      checkModifiers(testDesc, events[5], "keyup",    "a",                  "KeyA",                [ ]);
+    }
+  }
 
-  // Starting new composition without a call of startComposition()
-  TIP.setPendingCompositionString("bar");
-  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+  // Modifier state should be inactivated only when all pressed modifiers are released
+  var shiftLeft = new KeyboardEvent("", { key: "Shift", code: "ShiftLeft" });
+  var shiftRight = new KeyboardEvent("", { key: "Shift", code: "ShiftRight" });
+  var shiftVirtual = new KeyboardEvent("", { key: "Shift", code: "" });
+  var altGrVirtual = new KeyboardEvent("", { key: "AltGraph", code: "" });
+  var ctrlVirtual = new KeyboardEvent("", { key: "Control", code: "" });
 
+  var testDesc = "ShiftLeft press -> ShiftRight press -> ShiftRight release -> ShiftLeft release";
   reset();
-  TIP.flushPendingComposition();
-  is(events.length, 2,
-     description + "flushPendingComposition() without a call of startComposition() should cause both compositionstart and compositionupdate");
-  is(events[0].type, "compositionstart",
-     description + "flushPendingComposition() without a call of startComposition() should cause compositionstart");
-  is(events[1].type, "compositionupdate",
-     description + "flushPendingComposition() without a call of startComposition() should cause compositionupdate after compositionstart");
-  is(events[1].data, "bar",
-     description + "compositionupdate caused by flushPendingComposition() without a call of startComposition() should have the composition string in its data");
-  is(input.value, "FOobar",
-     description + "new composition string should cause appending composition string to the focused editor");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keydown", [ "Shift" ]);
+  TIP.keydown(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keydown", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift" ]);
+  TIP.keyup(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keyup", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Right-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Right-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keyup", [ ]);
+
+  is(events.length, 10,
+     description + testDesc + " should cause 10 events");
+  checkModifiers(testDesc, events[0], "keydown",  "Shift", "ShiftLeft",  [ "Shift" ]);
+  checkModifiers(testDesc, events[1], "keydown",  "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[2], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[3], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[4], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[5], "keyup",    "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[6], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[7], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[8], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[9], "keyup",    "Shift", "ShiftLeft",  [ ]);
 
-  // Canceling the composition
+  testDesc = "ShiftLeft press -> ShiftRight press -> ShiftLeft release -> ShiftRight release";
   reset();
-  TIP.cancelComposition();
-  is(events.length, 2,
-     description + "cancelComposition() should cause both compositionupdate and compositionend");
-  is(events[0].type, "compositionupdate",
-     description + "cancelComposition() should cause compositionupdate");
-  is(events[0].data, "",
-     description + "compositionupdate caused by cancelComposition() should have empty string in its data");
-  is(events[1].type, "compositionend",
-     description + "cancelComposition() should cause compositionend after compositionupdate");
-  is(events[1].data, "",
-     description + "compositionend caused by cancelComposition() should have empty string in its data");
-  is(input.value, "FOo",
-     description + "canceled composition string should be removed from the focused editor");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keydown", [ "Shift" ]);
+  TIP.keydown(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keydown", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift" ]);
+  TIP.keyup(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keyup", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Left-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Left-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keyup", [ ]);
+
+  is(events.length, 10,
+     description + testDesc + " should cause 10 events");
+  checkModifiers(testDesc, events[0], "keydown",  "Shift", "ShiftLeft",  [ "Shift" ]);
+  checkModifiers(testDesc, events[1], "keydown",  "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[2], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[3], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[4], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[5], "keyup",    "Shift", "ShiftLeft",  [ "Shift" ]);
+  checkModifiers(testDesc, events[6], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[7], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[8], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[9], "keyup",    "Shift", "ShiftRight",  [ ]);
 
-  // Starting composition explicitly and canceling it
+  testDesc = "ShiftLeft press -> virtual Shift press -> virtual Shift release -> ShiftLeft release";
   reset();
-  TIP.startComposition();
-  TIP.cancelComposition();
-  is(events.length, 2,
-     description + "canceling composition immediately after startComposition() should cause compositionstart and compositionend");
-  is(events[0].type, "compositionstart",
-     description + "canceling composition immediately after startComposition() should cause compositionstart first");
-  is(events[1].type, "compositionend",
-     description + "canceling composition immediately after startComposition() should cause compositionend after compositionstart");
-  is(events[1].data, "",
-     description + "compositionend caused by canceling composition should have empty string in its data");
-  is(input.value, "FOo",
-     description + "canceling composition shouldn't modify the focused editor");
-
-  // Create composition for next test.
-  TIP.setPendingCompositionString("bar");
-  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
-  TIP.flushPendingComposition();
-  is(input.value, "FOobar",
-     description + "The focused editor should have new composition string \"bar\"");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keydown", [ "Shift" ]);
+  TIP.keydown(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keydown", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift" ]);
+  TIP.keyup(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keyup", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Virtual-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Virtual-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keyup", [ ]);
+
+  is(events.length, 10,
+     description + testDesc + " should cause 10 events");
+  checkModifiers(testDesc, events[0], "keydown",  "Shift", "ShiftLeft",  [ "Shift" ]);
+  checkModifiers(testDesc, events[1], "keydown",  "Shift", "",           [ "Shift" ]);
+  checkModifiers(testDesc, events[2], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[3], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[4], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[5], "keyup",    "Shift", "",           [ "Shift" ]);
+  checkModifiers(testDesc, events[6], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[7], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[8], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[9], "keyup",    "Shift", "ShiftLeft",  [ ]);
 
-  // Allow to set empty composition string
+  testDesc = "virtual Shift press -> ShiftRight press -> ShiftRight release -> virtual Shift release";
   reset();
-  TIP.flushPendingComposition();
-  is(events.length, 1,
-     description + "making composition string empty should cause only compositionupdate");
-  is(events[0].type, "compositionupdate",
-     description + "making composition string empty should cause compositionupdate");
-  is(events[0].data, "",
-     description + "compositionupdate caused by making composition string empty should have empty string in its data");
-
-  // Allow to insert new composition string without compositionend/compositionstart
-  TIP.setPendingCompositionString("buzz");
-  TIP.appendClauseToPendingComposition(4, TIP.ATTR_RAW_CLAUSE);
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keydown", [ "Shift" ]);
+  TIP.keydown(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keydown", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift" ]);
+  TIP.keyup(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keyup", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Right-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Right-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keyup", [ ]);
+
+  is(events.length, 10,
+     description + testDesc + " should cause 10 events");
+  checkModifiers(testDesc, events[0], "keydown",  "Shift", "",           [ "Shift" ]);
+  checkModifiers(testDesc, events[1], "keydown",  "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[2], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[3], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[4], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[5], "keyup",    "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[6], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[7], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[8], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[9], "keyup",    "Shift", "",           [ ]);
 
+  testDesc = "ShiftLeft press -> ShiftRight press -> ShiftRight release -> ShiftRight release -> ShiftLeft release";
   reset();
-  TIP.flushPendingComposition();
-  is(events.length, 1,
-     description + "modifying composition string from empty string should cause only compositionupdate");
-  is(events[0].type, "compositionupdate",
-     description + "modifying composition string from empty string should cause compositionupdate");
-  is(events[0].data, "buzz",
-     description + "compositionupdate caused by modifying composition string from empty string should have new composition string in its data");
-  is(input.value, "FOobuzz",
-     description + "new composition string should be appended to the focused editor");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keydown", [ "Shift" ]);
+  TIP.keydown(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keydown", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift" ]);
+  TIP.keyup(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keyup", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Virtual-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Virtual-Shift keyup)", [ "Shift" ]);
+  TIP.keyup(shiftRight);
+  checkAllTIPModifiers(testDesc + ", Right-Shift keyup again", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Virtual-Shift keyup again)", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Virtual-Shift keyup again)", [ "Shift" ]);
+  TIP.keyup(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keyup", [ ]);
+
+  is(events.length, 14,
+     description + testDesc + " should cause 14 events");
+  checkModifiers(testDesc, events[0],  "keydown",  "Shift", "ShiftLeft",  [ "Shift" ]);
+  checkModifiers(testDesc, events[1],  "keydown",  "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[2],  "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[3],  "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[4],  "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[5],  "keyup",    "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[6],  "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[7],  "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[8],  "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[9],  "keyup",    "Shift", "ShiftRight", [ "Shift" ]);
+  checkModifiers(testDesc, events[10], "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[11], "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[12], "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[13], "keyup",    "Shift", "ShiftLeft",  [ ]);
 
-  // Committing with different string
+  testDesc = "ShiftLeft press -> ShiftLeft press -> ShiftLeft release -> ShiftLeft release";
   reset();
-  TIP.commitComposition("bar");
-  is(events.length, 2,
-     description + "committing with different string should cause compositionupdate and compositionend");
-  is(events[0].type, "compositionupdate",
-     description + "committing with different string should cause compositionupdate first");
-  is(events[0].data, "bar",
-     description + "compositionupdate caused by committing with different string should have the committing string in its data");
-  is(events[1].type, "compositionend",
-     description + "committing with different string should cause compositionend after compositionupdate");
-  is(events[1].data, "bar",
-     description + "compositionend caused by committing with different string should have the committing string in its data");
-  is(input.value, "FOobar",
-     description + "new committed string should be appended to the focused editor");
-
-  // Appending new composition string
-  TIP.setPendingCompositionString("buzz");
-  TIP.appendClauseToPendingComposition(4, TIP.ATTR_RAW_CLAUSE);
-  TIP.flushPendingComposition();
-  is(input.value, "FOobarbuzz",
-     description + "new composition string should be appended to the focused editor");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keydown", [ "Shift" ]);
+  TIP.keydown(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keydown again", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift" ]);
+  TIP.keyup(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keyup", [ ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Left-Shift keyup)", [ ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Left-Shift keyup)", [ ]);
+  TIP.keyup(shiftLeft);
+  checkAllTIPModifiers(testDesc + ", Left-Shift keyup again", [ ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Left-Shift keyup again)", [ ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Left-Shift keyup again)", [ ]);
+
+  is(events.length, 13,
+     description + testDesc + " should cause 13 events");
+  checkModifiers(testDesc, events[0],  "keydown",  "Shift", "ShiftLeft",  [ "Shift" ]);
+  checkModifiers(testDesc, events[1],  "keydown",  "Shift", "ShiftLeft",  [ "Shift" ]);
+  checkModifiers(testDesc, events[2],  "keydown",  "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[3],  "keypress", "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[4],  "keyup",    "a",     "KeyA",       [ "Shift" ]);
+  checkModifiers(testDesc, events[5],  "keyup",    "Shift", "ShiftLeft",  [ ]);
+  checkModifiers(testDesc, events[6],  "keydown",  "a",     "KeyA",       [ ]);
+  checkModifiers(testDesc, events[7],  "keypress", "a",     "KeyA",       [ ]);
+  checkModifiers(testDesc, events[8],  "keyup",    "a",     "KeyA",       [ ]);
+  checkModifiers(testDesc, events[9],  "keyup",    "Shift", "ShiftLeft",  [ ]);
+  checkModifiers(testDesc, events[10], "keydown",  "a",     "KeyA",       [ ]);
+  checkModifiers(testDesc, events[11], "keypress", "a",     "KeyA",       [ ]);
+  checkModifiers(testDesc, events[12], "keyup",    "a",     "KeyA",       [ ]);
 
-  // Committing with same string
+  testDesc = "virtual Shift press -> virtual AltGraph press -> virtual AltGraph release -> virtual Shift release";
   reset();
-  TIP.commitComposition("buzz");
-  is(events.length, 1,
-     description + "committing with same string should cause only compositionend");
-  is(events[0].type, "compositionend",
-     description + "committing with same string should cause compositionend");
-  is(events[0].data, "buzz",
-     description + "compositionend caused by committing with same string should have the committing string in its data");
-  is(input.value, "FOobarbuzz",
-     description + "new committed string should be appended to the focused editor");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keydown", [ "Shift" ]);
+  TIP.keydown(altGrVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-AltGraph keydown", [ "Shift", "AltGraph" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift", "AltGraph" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift", "AltGraph" ]);
+  TIP.keyup(altGrVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-AltGraph keyup", [ "Shift" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Virtual-AltGraph keyup)", [ "Shift" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Virtual-AltGraph keyup)", [ "Shift" ]);
+  TIP.keyup(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keyup", [ ]);
+
+  is(events.length, 10,
+     description + testDesc + " should cause 10 events");
+  checkModifiers(testDesc, events[0], "keydown",  "Shift",    "",     [ "Shift" ]);
+  checkModifiers(testDesc, events[1], "keydown",  "AltGraph", "",     [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[2], "keydown",  "a",        "KeyA", [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[3], "keypress", "a",        "KeyA", [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[4], "keyup",    "a",        "KeyA", [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[5], "keyup",    "AltGraph", "",     [ "Shift" ]);
+  checkModifiers(testDesc, events[6], "keydown",  "a",        "KeyA", [ "Shift" ]);
+  checkModifiers(testDesc, events[7], "keypress", "a",        "KeyA", [ "Shift" ]);
+  checkModifiers(testDesc, events[8], "keyup",    "a",        "KeyA", [ "Shift" ]);
+  checkModifiers(testDesc, events[9], "keyup",    "Shift",    "",     [ ]);
 
-  // Inserting commit string directly
+  testDesc = "virtual Shift press -> virtual AltGraph press -> virtual Shift release -> virtual AltGr release";
   reset();
-  TIP.commitComposition("boo!");
-  is(events.length, 3,
-     description + "committing text directly should cause compositionstart, compositionupdate and compositionend");
-  is(events[0].type, "compositionstart",
-     description + "committing text directly should cause compositionstart first");
-  is(events[1].type, "compositionupdate",
-     description + "committing text directly should cause compositionupdate after compositionstart");
-  is(events[1].data, "boo!",
-     description + "compositionupdate caused by committing text directly should have the committing text in its data");
-  is(events[2].type, "compositionend",
-     description + "committing text directly should cause compositionend after compositionupdate");
-  is(events[2].data, "boo!",
-     description + "compositionend caused by committing text directly should have the committing text in its data");
-  is(input.value, "FOobarbuzzboo!",
-     description + "committing text directly should append the committing text to the focused editor");
+  doPreventDefaults = [ "keypress" ];
+  TIP.keydown(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keydown", [ "Shift" ]);
+  TIP.keydown(altGrVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-AltGraph keydown", [ "Shift", "AltGraph" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown", [ "Shift", "AltGraph" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup", [ "Shift", "AltGraph" ]);
+  TIP.keyup(shiftVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-Shift keyup", [ "AltGraph" ]);
+  TIP.keydown(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keydown (after Virtual-Shift keyup)", [ "AltGraph" ]);
+  TIP.keyup(keyA);
+  checkAllTIPModifiers(testDesc + ", \"a\" keyup (after Virtual-Shift keyup)", [ "AltGraph" ]);
+  TIP.keyup(altGrVirtual);
+  checkAllTIPModifiers(testDesc + ", Virtual-AltGraph keyup", [ ]);
+
+  is(events.length, 10,
+     description + testDesc + " should cause 10 events");
+  checkModifiers(testDesc, events[0], "keydown",  "Shift",    "",     [ "Shift" ]);
+  checkModifiers(testDesc, events[1], "keydown",  "AltGraph", "",     [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[2], "keydown",  "a",        "KeyA", [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[3], "keypress", "a",        "KeyA", [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[4], "keyup",    "a",        "KeyA", [ "Shift", "AltGraph" ]);
+  checkModifiers(testDesc, events[5], "keyup",    "Shift",    "",     [ "AltGraph" ]);
+  checkModifiers(testDesc, events[6], "keydown",  "a",        "KeyA", [ "AltGraph" ]);
+  checkModifiers(testDesc, events[7], "keypress", "a",        "KeyA", [ "AltGraph" ]);
+  checkModifiers(testDesc, events[8], "keyup",    "a",        "KeyA", [ "AltGraph" ]);
+  checkModifiers(testDesc, events[9], "keyup",    "AltGraph", "",     [ ]);
 
-  window.removeEventListener("compositionstart", handler, false);
-  window.removeEventListener("compositionupdate", handler, false);
-  window.removeEventListener("compositionend", handler, false);
+  // shareModifierStateOf(null) should cause resetting the modifier state
+  function checkTIPModifiers(aTestDesc, aTIP, aModifiers)
+  {
+    for (var i = 0; i < kModifiers.length; i++) {
+      is(aTIP.getModifierState(kModifiers[i]), aModifiers.indexOf(kModifiers[i]) >= 0,
+         description + aTestDesc + ", aTIP.getModifierState(\"" + kModifiers[i] + "\") returns wrong value");
+    }
+  }
+  TIP.keydown(shiftVirtual);
+  TIP.keydown(altGrVirtual);
+  sharedTIP.shareModifierStateOf(null);
+  checkTIPModifiers("sharedTIP.sharedModifierStateOf(null) shouldn't cause TIP's modifiers reset", TIP, [ "Shift", "AltGraph" ]);
+  checkTIPModifiers("sharedTIP.sharedModifierStateOf(null) should cause sharedTIP modifiers reset", sharedTIP, [ ]);
+
+  // sharedTIP.shareModifierStateOf(null) should be unlinked from TIP.
+  TIP.keydown(ctrlVirtual);
+  checkTIPModifiers("TIP.keydown(ctrlVirtual) should cause TIP's modifiers set", TIP, [ "Shift", "AltGraph", "Control" ]);
+  checkTIPModifiers("TIP.keydown(ctrlVirtual) shouldn't cause sharedTIP modifiers set", sharedTIP, [ ]);
+
+  // beginInputTransactionForTests() shouldn't cause modifier state reset.
+  ok(TIP.beginInputTransactionForTests(otherWindow),
+     description + "TIP.beginInputTransactionForTests(otherWindow) should return true");
+  checkTIPModifiers("TIP.beginInputTransactionForTests(otherWindow) shouldn't cause TIP's modifiers set", TIP, [ "Shift", "AltGraph", "Control" ]);
+  TIP.keyup(shiftLeft);
+  TIP.keyup(altGrVirtual);
+  TIP.keyup(ctrlVirtual);
+  checkTIPModifiers("TIP should keep modifier's physical key state", TIP, [ "Shift" ]);
+  ok(TIP.beginInputTransactionForTests(window),
+     description + "TIP.beginInputTransactionForTests(window) should return true");
+  checkTIPModifiers("TIP.beginInputTransactionForTests(window) shouldn't cause TIP's modifiers set", TIP, [ "Shift" ]);
+  TIP.keyup(shiftVirtual);
+  checkTIPModifiers("TIP should keep modifier's physical key state", TIP, [ ]);
+
+  window.removeEventListener("keydown", handler, false);
+  window.removeEventListener("keypress", handler, false);
+  window.removeEventListener("keyup", handler, false);
 }
 
 function runErrorTests()
@@ -569,14 +3374,14 @@
        description + "commitComposition() should cause NS_ERROR_FAILURE if there is no composition");
   }
 
-  // commitComposition("") should throw an exception if there is no composition
+  // commitCompositionWith("") should throw an exception if there is no composition
   try {
-    TIP.commitComposition("");
+    TIP.commitCompositionWith("");
     ok(false,
-       description + "commitComposition(\"\") should fail if there is no composition");
+       description + "commitCompositionWith(\"\") should fail if there is no composition");
   } catch (e) {
     ok(e.message.contains("NS_ERROR_FAILURE"),
-       description + "commitComposition(\"\") should cause NS_ERROR_FAILURE if there is no composition");
+       description + "commitCompositionWith(\"\") should cause NS_ERROR_FAILURE if there is no composition");
   }
 
   // Pending composition string should allow to flush without clause information (for compatibility)
@@ -667,6 +3472,201 @@
     ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
        description + "flushPendingComposition() should cause NS_ERROR_ILLEGAL_VALUE if caret position is out of composition string");
   }
+
+  // Calling keydown() with a KeyboardEvent initialized with invalid code value should cause an exception.
+  input.value = "";
+  try {
+    var keyInvalidCode = new KeyboardEvent("", { key: "f", code: "InvalidCodeValue", keyCode: KeyboardEvent.DOM_VK_F });
+    TIP.keydown(keyInvalidCode);
+    ok(false,
+       description + "TIP.keydown(keyInvalidCode) should cause throwing an exception because its code value is not registered");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "TIP.keydown(keyInvalidCode) should cause throwing an exception including NS_ERROR_ILLEGAL_VALUE");
+  } finally {
+    is(input.value, "",
+       description + "The input element should not be modified");
+  }
+
+  // Calling keyup() with a KeyboardEvent initialized with invalid code value should cause an exception.
+  input.value = "";
+  try {
+    var keyInvalidCode = new KeyboardEvent("", { key: "f", code: "InvalidCodeValue", keyCode: KeyboardEvent.DOM_VK_F });
+    TIP.keyup(keyInvalidCode);
+    ok(false,
+       description + "TIP.keyup(keyInvalidCode) should cause throwing an exception because its code value is not registered");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "TIP.keyup(keyInvalidCode) should cause throwing an exception including NS_ERROR_ILLEGAL_VALUE");
+  } finally {
+    is(input.value, "",
+       description + "The input element should not be modified");
+  }
+
+  // Calling keydown(KEY_NON_PRINTABLE_KEY) with a KeyboardEvent initialized with non-key name should cause an exception.
+  input.value = "";
+  try {
+    var keyInvalidKey = new KeyboardEvent("", { key: "ESCAPE", code: "Escape", keyCode: KeyboardEvent.DOM_VK_Escape});
+    TIP.keydown(keyInvalidKey, TIP.KEY_NON_PRINTABLE_KEY);
+    ok(false,
+       description + "TIP.keydown(keyInvalidKey, TIP.KEY_NON_PRINTABLE_KEY) should cause throwing an exception because its key value is not registered");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keydown(keyInvalidKey, TIP.KEY_NON_PRINTABLE_KEY) should cause throwing an exception including NS_ERROR_ILLEGAL_VALUE");
+  } finally {
+    is(input.value, "",
+       description + "The input element should not be modified");
+  }
+
+  // Calling keyup(KEY_NON_PRINTABLE_KEY) with a KeyboardEvent initialized with non-key name should cause an exception.
+  input.value = "";
+  try {
+    var keyInvalidKey = new KeyboardEvent("", { key: "ESCAPE", code: "Escape", keyCode: KeyboardEvent.DOM_VK_Escape});
+    TIP.keydown(keyInvalidKey, TIP.KEY_NON_PRINTABLE_KEY);
+    ok(false,
+       description + "TIP.keyup(keyInvalidKey, TIP.KEY_NON_PRINTABLE_KEY) should cause throwing an exception because its key value is not registered");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keyup(keyInvalidKey, TIP.KEY_NON_PRINTABLE_KEY) should cause throwing an exception including NS_ERROR_ILLEGAL_VALUE");
+  } finally {
+    is(input.value, "",
+       description + "The input element should not be modified");
+  }
+
+  // KEY_KEEP_KEY_LOCATION_STANDARD flag should be used only when .location is not initialized with non-zero value.
+  try {
+    var keyEvent = new KeyboardEvent("", { code: "Enter", location: KeyboardEvent.DOM_KEY_LOCATION_LEFT });
+    TIP.keydown(keyEvent, TIP.KEY_KEEP_KEY_LOCATION_STANDARD);
+    ok(false,
+       description + "keydown(KEY_KEEP_KEY_LOCATION_STANDARD) should fail if the .location of the key event is initialized with non-zero value");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keydown(KEY_KEEP_KEY_LOCATION_STANDARD) should cause NS_ERROR_ILLEGAL_VALUE if the .location of the key event is initialized with nonzero value");
+  }
+  try {
+    var keyEvent = new KeyboardEvent("", { code: "Enter", location: KeyboardEvent.DOM_KEY_LOCATION_LEFT });
+    TIP.keyup(keyEvent, TIP.KEY_KEEP_KEY_LOCATION_STANDARD);
+    ok(false,
+       description + "keyup(KEY_KEEP_KEY_LOCATION_STANDARD) should fail if the .location of the key event is initialized with non-zero value");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keyup(KEY_KEEP_KEY_LOCATION_STANDARD) should cause NS_ERROR_ILLEGAL_VALUE if the .location of the key event is initialized with nonzero value");
+  }
+
+  // KEY_KEEP_KEYCODE_ZERO flag should be used only when .keyCode is not initialized with non-zero value.
+  try {
+    var keyEvent = new KeyboardEvent("", { key: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+    TIP.keydown(keyEvent, TIP.KEY_KEEP_KEYCODE_ZERO);
+    ok(false,
+       description + "keydown(KEY_KEEP_KEYCODE_ZERO) should fail if the .keyCode of the key event is initialized with non-zero value");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keydown(KEY_KEEP_KEYCODE_ZERO) should cause NS_ERROR_ILLEGAL_VALUE if the .keyCode of the key event is initialized with nonzero value");
+  }
+  try {
+    var keyEvent = new KeyboardEvent("", { key: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN });
+    TIP.keyup(keyEvent, TIP.KEY_KEEP_KEYCODE_ZERO);
+    ok(false,
+       description + "keyup(KEY_KEEP_KEYCODE_ZERO) should fail if the .keyCode of the key event is initialized with non-zero value");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keyup(KEY_KEEP_KEYCODE_ZERO) should cause NS_ERROR_ILLEGAL_VALUE if the .keyCode of the key event is initialized with nonzero value");
+  }
+
+  // Specifying KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT with non-modifier key, it should cause an exception.
+  try {
+    var keyEvent = new KeyboardEvent("", { key: "a", code: "ShiftLeft" });
+    TIP.keyup(keyEvent, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+    ok(false,
+       description + "keydown(KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT) should fail if the .key value isn't a modifier key");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keydown(KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT) should cause NS_ERROR_ILLEGAL_VALUE if the .key value isn't a modifier key");
+  }
+  try {
+    var keyEvent = new KeyboardEvent("", { key: "Enter", code: "ShiftLeft" });
+    TIP.keyup(keyEvent, TIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+    ok(false,
+       description + "keydown(KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT) should fail if the .key value isn't a modifier key");
+  } catch (e) {
+    ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+       description + "keydown(KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT) should cause NS_ERROR_ILLEGAL_VALUE if the .key value isn't a modifier key");
+  }
+
+  // The type of key events specified to composition methods should be "" or "keydown".
+  var kKeyEventTypes = [
+    { type: "keydown",   valid: true },
+    { type: "keypress",  valid: false },
+    { type: "keyup",     valid: false },
+    { type: "",          valid: true },
+    { type: "mousedown", valid: false },
+    { type: "foo",       valid: false },
+  ];
+  for (var i = 0; i < kKeyEventTypes[i].length; i++) {
+    var keyEvent =
+      new KeyboardEvent(kKeyEventTypes[i].type, { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A });
+    var testDescription = description + "type=\"" + kKeyEventTypes[i].type + "\", ";
+    try {
+      TIP.startComposition(keyEvent);
+      ok(kKeyEventTypes[i].valid,
+         testDescription + "TIP.startComposition(keyEvent) should not accept the event type");
+      TIP.cancelComposition();
+    } catch (e) {
+      ok(!kKeyEventTypes[i].valid,
+         testDescription + "TIP.startComposition(keyEvent) should not throw an exception for the event type");
+      ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+         testDescription + "TIP.startComposition(keyEvent) should cause NS_ERROR_ILLEGAL_VALUE if the key event type isn't valid");
+    }
+    try {
+      TIP.setPendingCompositionString("foo");
+      TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
+      TIP.setCaretInPendingComposition(3);
+      TIP.flushPendingComposition(keyEvent);
+      ok(kKeyEventTypes[i].valid,
+         testDescription + "TIP.flushPendingComposition(keyEvent) should not accept the event type");
+      TIP.cancelComposition();
+    } catch (e) {
+      ok(!kKeyEventTypes[i].valid,
+         testDescription + "TIP.flushPendingComposition(keyEvent) should not throw an exception for the event type");
+      ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+         testDescription + "TIP.flushPendingComposition(keyEvent) should cause NS_ERROR_ILLEGAL_VALUE if the key event type isn't valid");
+    }
+    try {
+      TIP.startComposition();
+      TIP.commitComposition(keyEvent);
+      ok(kKeyEventTypes[i].valid,
+         testDescription + "TIP.commitComposition(keyEvent) should not accept the event type");
+    } catch (e) {
+      ok(!kKeyEventTypes[i].valid,
+         testDescription + "TIP.commitComposition(keyEvent) should not throw an exception for the event type");
+      ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+         testDescription + "TIP.commitComposition(keyEvent) should cause NS_ERROR_ILLEGAL_VALUE if the key event type isn't valid");
+      TIP.cancelComposition();
+    }
+    try {
+      TIP.commitCompositionWith("foo", keyEvent);
+      ok(kKeyEventTypes[i].valid,
+         testDescription + "TIP.commitCompositionWith(\"foo\", keyEvent) should not accept the event type");
+    } catch (e) {
+      ok(!kKeyEventTypes[i].valid,
+         testDescription + "TIP.commitCompositionWith(\"foo\", keyEvent) should not throw an exception for the event type");
+      ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+         testDescription + "TIP.commitCompositionWith(\"foo\", keyEvent) should cause NS_ERROR_ILLEGAL_VALUE if the key event type isn't valid");
+    }
+    try {
+      TIP.startComposition();
+      TIP.cancelComposition(keyEvent);
+      ok(kKeyEventTypes[i].valid,
+         testDescription + "TIP.cancelComposition(keyEvent) should not accept the event type");
+    } catch (e) {
+      ok(!kKeyEventTypes[i].valid,
+         testDescription + "TIP.cancelComposition(keyEvent) should not throw an exception for the event type");
+      ok(e.message.contains("NS_ERROR_ILLEGAL_VALUE"),
+         testDescription + "TIP.cancelComposition(keyEvent) should cause NS_ERROR_ILLEGAL_VALUE if the key event type isn't valid");
+      TIP.cancelComposition();
+    }
+    input.value = "";
+  }
 }
 
 function runCommitCompositionTests()
@@ -689,39 +3689,19 @@
   is(input.value, "foo",
      description + "commitComposition() should commit the composition with the last data");
 
-  // commitComposition("") should commit the composition with empty string.
+  // commitCompositionWith("") should commit the composition with empty string.
   input.value = "";
   TIP.setPendingCompositionString("foo");
   TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
   TIP.setCaretInPendingComposition(3);
   TIP.flushPendingComposition();
-  TIP.commitComposition("");
+  TIP.commitCompositionWith("");
   is(input.value, "",
-     description + "commitComposition(\"\") should commit the composition with empty string");
-
-  // commitComposition(null) should commit the composition with empty string.
-  input.value = "";
-  TIP.setPendingCompositionString("foo");
-  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
-  TIP.setCaretInPendingComposition(3);
-  TIP.flushPendingComposition();
-  TIP.commitComposition(null);
-  is(input.value, "",
-     description + "commitComposition(null) should commit the composition with empty string");
-
-  // commitComposition(undefined) should commit the composition with the last data.
-  input.value = "";
-  TIP.setPendingCompositionString("foo");
-  TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
-  TIP.setCaretInPendingComposition(3);
-  TIP.flushPendingComposition();
-  TIP.commitComposition(undefined);
-  todo_is(input.value, "foo",
-          description + "commitComposition(undefined) should commit the composition with the last data");
+     description + "commitCompositionWith(\"\") should commit the composition with empty string");
 
   function doCommit(aText)
   {
-    TIP.commitComposition(aText);
+    TIP.commitCompositionWith(aText);
   }
 
   // doCommit() should commit the composition with the last data.
@@ -766,7 +3746,7 @@
 
   function doCommitWithNullCheck(aText)
   {
-    TIP.commitComposition(aText ? aText : "");
+    TIP.commitCompositionWith(aText ? aText : "");
   }
 
   // doCommitWithNullCheck() should commit the composition with the last data.
@@ -905,8 +3885,14 @@
     TIP.appendClauseToPendingComposition(3, TIP.ATTR_RAW_CLAUSE);
     TIP.setCaretInPendingComposition(3);
     TIP.flushPendingComposition();
-    is(input.value, "bar",
-       description + "the input in the parent document should have composition string");
+    if (input.value == "") {
+      // XXX TextInputProcessor or TextEventDispatcher may have a bug.
+      todo_is(input.value, "bar",
+              description + "the input in the parent document should have composition string");
+    } else {
+      is(input.value, "bar",
+         description + "the input in the parent document should have composition string");
+    }
 
     TIP.cancelComposition();
 
@@ -1021,6 +4007,9 @@
   runBeginInputTransactionMethodTests();
   runReleaseTests();
   runCompositionTests();
+  runCompositionWithKeyEventTests();
+  runConsumingKeydownBeforeCompositionTests();
+  runKeyTests();
   runErrorTests();
   runCommitCompositionTests();
   runCallbackTests(false);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/file_simplecontentpolicy.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/file_simplecontentpolicy.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/file_simplecontentpolicy.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/file_simplecontentpolicy.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,73 @@
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cr = Components.results;
+
+Components.utils.import("resource://gre/modules/Services.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function executeSoon(f)
+{
+  Services.tm.mainThread.dispatch(f, Ci.nsIThread.DISPATCH_NORMAL);
+}
+
+var urlSuffix = "/this/is/the/test/url";
+
+// Content policy / factory implementation for the test
+var policyID = Components.ID("{6aadacff-f1f2-46f4-a6db-6d429f884a30}");
+var policyName = "@mozilla.org/simpletestpolicy;1";
+var policy = {
+  // nsISupports implementation
+  QueryInterface:
+    XPCOMUtils.generateQI([
+      Ci.nsISupports,
+      Ci.nsIFactory,
+      Ci.nsISimpleContentPolicy]),
+
+  // nsIFactory implementation
+  createInstance: function(outer, iid) {
+    return this.QueryInterface(iid);
+  },
+
+  // nsIContentPolicy implementation
+  shouldLoad: function(contentType,
+                       contentLocation,
+                       requestOrigin,
+                       frame,
+                       isTopLevel,
+                       mimeTypeGuess,
+                       extra)
+  {
+    // Remember last content type seen for the test url
+    if (contentLocation.spec.endsWith(urlSuffix)) {
+      assert.ok(frame === browserElement, "correct <browser> element");
+      sendAsyncMessage("shouldLoad", {contentType: contentType, isTopLevel: isTopLevel});
+      return Ci.nsIContentPolicy.REJECT_REQUEST;
+    }
+
+    return Ci.nsIContentPolicy.ACCEPT;
+  },
+
+  shouldProcess: function() {
+    return Ci.nsIContentPolicy.ACCEPT;
+  }
+}
+
+// Register content policy
+var componentManager = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+componentManager.registerFactory(policyID, "Test simple content policy", policyName, policy);
+
+var categoryManager = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
+categoryManager.addCategoryEntry("simple-content-policy", policyName, policyName, false, true);
+
+addMessageListener("finished", () => {
+  // Unregister content policy
+  categoryManager.deleteCategoryEntry("simple-content-policy", policyName, false);
+
+  executeSoon(function() {
+    // Component must be unregistered delayed, otherwise other content
+    // policy will not be removed from the category correctly
+    componentManager.unregisterFactory(policyID, policy);
+  });
+});
+
+sendAsyncMessage("ready");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/mochitest.ini	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/mochitest.ini	2015-02-28 15:03:05.000000000 +0000
@@ -192,6 +192,7 @@
   file_mozfiledataurl_inner.html
   file_mozfiledataurl_text.txt
   file_restrictedEventSource.sjs
+  file_simplecontentpolicy.js
   file_websocket_basic_wsh.py
   file_websocket_hello_wsh.py
   file_websocket_http_resource.txt
@@ -305,6 +306,8 @@
 [test_settimeout_inner.html]
 [test_setting_opener.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
+[test_simplecontentpolicy.html]
+skip-if = e10s || buildapp == 'b2g'
 [test_url.html]
 [test_url_data.html]
 [test_url_empty_port.html]
@@ -764,6 +767,7 @@
 skip-if = buildapp == 'b2g' || e10s
 support-files = file_bug1011748_redirect.sjs file_bug1011748_OK.sjs
 [test_bug1025933.html]
+[test_bug1037687.html]
 [test_element.matches.html]
 [test_user_select.html]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug1037687.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug1037687.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug1037687.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug1037687.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1037687
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1037687</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">
+
+  /** Test for Bug 1037687 **/
+
+  SimpleTest.waitForExplicitFinish();
+
+  var host;
+  var sr;
+  var embed;
+  var object;
+  var iframe;
+  var resourceLoadCount = 0;
+
+  function resourceLoaded(event) {
+    ++resourceLoadCount;
+    ok(true, event.target + " got " + event.load);
+    if (resourceLoadCount == 3) {
+      SimpleTest.finish();
+    }
+  }
+
+  function createResource(sr, type) {
+    var el = document.createElement(type);
+    var attrName = type == "object" ? "data" : "src";
+    el.setAttribute(attrName, "file_mozfiledataurl_img.jpg");
+    el.onload = resourceLoaded;
+    var info = document.createElement("div");
+    info.textContent = type;
+    sr.appendChild(info);
+    sr.appendChild(el);
+  }
+
+  function test() {
+    host = document.getElementById("host");
+    sr = host.createShadowRoot();
+    embed = createResource(sr, "embed");
+    object = createResource(sr, "object");
+    iframe = createResource(sr, "iframe");
+  }
+
+  </script>
+</head>
+<body onload="test()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1037687">Mozilla Bug 1037687</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+<div id="host"></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug666604.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug666604.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug666604.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug666604.html	2015-02-28 15:03:05.000000000 +0000
@@ -108,44 +108,32 @@
   activationListener =
     function() {
       ok(true, "Untrusted DOMActivate should activate a link");
-      test7();
+      SpecialPowers.pushPrefEnv({"set":[["dom.disable_open_during_load", false]]}, test7);
     }
   dispatchDOMActivate(testlink);
 }
 
-var oldPref;
 function test7() {
-  oldPref = SpecialPowers.getBoolPref("dom.disable_open_during_load");
-  SpecialPowers.setBoolPref("dom.disable_open_during_load", false);
   testlink.href = "javascript:opener.activationListener(); window.close();";
   testlink.target = "_blank";
   activationListener =
     function() {
       ok(true, "Click() should activate a link");
-      setTimeout(test8, 0);
+      SpecialPowers.pushPrefEnv({"set":[["dom.disable_open_during_load", true]]}, test8);
     }
   testlink.click();
 }
 
 function test8() {
-  SpecialPowers.setBoolPref("dom.disable_open_during_load", true);
   testlink.href = "javascript:opener.activationListener(); window.close();";
   testlink.target = "_blank";
   activationListener =
     function() {
       ok(false, "Click() should not activate a link");
-      setTimeout(test9, 0);
     }
-  testlink.click();  
-  hitEventLoop(10, test9);
-} 
-
-
-function test9() {
-  SpecialPowers.setBoolPref("dom.disable_open_during_load", oldPref);
-  SimpleTest.finish();
+  testlink.click();
+  SimpleTest.executeSoon(SimpleTest.finish);
 }
-
 addLoadEvent(test1);
 
 </script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug715041_removal.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug715041_removal.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug715041_removal.xul	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug715041_removal.xul	2015-02-28 15:03:05.000000000 +0000
@@ -19,8 +19,6 @@
     <![CDATA[
 
   /** Mock Idle Service Test for Bug 715041 **/
-  SpecialPowers.setBoolPref("dom.idle-observers-api.fuzz_time.disabled", true);
-
   try {
     var idleServiceCID = Components.ID("6f95d965-4322-4829-8a3c-5dc8a4587f4d");
     var idleServiceContractID = "@mozilla.org/widget/idleservice;1";
@@ -836,9 +834,7 @@
   var RemoveHeadAfterLastLocalFiredEnabled = true;
   var RemoveHeadIdleObserverWhileIdleCase1Enabled = true;
   var RemoveLastAddLastEnabled = true;
-
-  RemoveHeadIdleObserverWhileActive();
-
+  SpecialPowers.pushPrefEnv({"set":[['dom.idle-observers-api.fuzz_time.disabled', true]]}, RemoveHeadIdleObserverWhileActive);
 ]]>
     </script>
     </window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug715041.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug715041.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_bug715041.xul	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_bug715041.xul	2015-02-28 15:03:05.000000000 +0000
@@ -19,8 +19,6 @@
     <![CDATA[
 
   /** Mock Idle Service Test for Bug 715041 **/
-  SpecialPowers.setBoolPref("dom.idle-observers-api.fuzz_time.disabled", true);
-
   //class mock javascript idle service
   var idleServiceObj = {
     observers: [],
@@ -810,8 +808,7 @@
   AddShiftLocalEnabled = true;
   AddIdleObserverWithInvalidTimeEnabled = false;
   
-  caseZero();  
-  
+  SpecialPowers.pushPrefEnv({"set":[['dom.idle-observers-api.fuzz_time.disabled', true]]}, caseZero);
     ]]>
     </script>
     </window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_child_process_shutdown_message.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_child_process_shutdown_message.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_child_process_shutdown_message.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_child_process_shutdown_message.html	2015-02-28 15:03:05.000000000 +0000
@@ -117,15 +117,13 @@
 }
 
 function setUp() {
-  SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-  SpecialPowers.setBoolPref("dom.ipc.browser_frames.oop_by_default", true);
   SpecialPowers.addPermission("browser", true, window.document);
   SpecialPowers.addPermission("embed-apps", true, window.document);
-
-  // TODO: remove in bug 820712
-  SpecialPowers.setBoolPref("network.disable.ipc.security", true);
-
-  runNextTest();
+  // TODO: remove network.disable.ipc.security in bug 820712
+  SpecialPowers.pushPrefEnv({
+    "set": [['dom.mozBrowserFramesEnabled', true],
+            ['dom.ipc.browser_frames.oop_by_default', true],
+            ['network.disable.ipc.security', true]]}, runNextTest);
 }
 
 function makeKillTest(isApp) function testKill() {
@@ -147,12 +145,6 @@
 }
 
 function tearDown() {
-  SpecialPowers.clearUserPref("dom.mozBrowserFramesEnabled");
-  SpecialPowers.clearUserPref("dom.ipc.browser_frames.oop_by_default");
-
-  // TODO: remove in bug 820712
-  SpecialPowers.clearUserPref("network.disable.ipc.security");
-
   SimpleTest.finish();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_EventSource_redirects.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_EventSource_redirects.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_EventSource_redirects.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_EventSource_redirects.html	2015-02-28 15:03:05.000000000 +0000
@@ -22,8 +22,6 @@
 
   function doTest(test_id) {
     oldPrefVal = SpecialPowers.getBoolPref("dom.server-events.enabled");
-    SpecialPowers.setBoolPref("dom.server-events.enabled", true);
-
     ok(true, "here we go");
 
     source = new EventSource("eventsource_redirect.resource");
@@ -49,8 +47,9 @@
   }
 
   SimpleTest.waitForExplicitFinish();
-  addLoadEvent(doTest);
-
+  addLoadEvent(function() {
+    SpecialPowers.pushPrefEnv({"set": [['dom.server-events.enabled', true]]}, doTest);
+  });
 </script>
 </pre>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_messagemanager_assertpermission.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_messagemanager_assertpermission.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_messagemanager_assertpermission.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_messagemanager_assertpermission.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,8 +27,6 @@
                      .getService(SpecialPowers.Ci.nsIAppsService);
 
 function setUp() {
-  SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-  SpecialPowers.setBoolPref("dom.ipc.browser_frames.oop_by_default", true);
   SpecialPowers.addPermission("browser", true, window.document);
   SpecialPowers.addPermission("embed-apps", true, window.document);
 
@@ -36,7 +34,8 @@
   SpecialPowers.addPermission("foobar", true, { url: APP_URL,
                                                 appId: appId,
                                                 isInBrowserElement: false });
-  runNextTest();
+  SpecialPowers.pushPrefEnv({"set":[['dom.mozBrowserFramesEnabled', true],
+                                    ['dom.ipc.browser_frames.oop_by_default', true]]}, runNextTest);
 }
 
 /**
@@ -168,8 +167,6 @@
 }
 
 function tearDown() {
-  SpecialPowers.clearUserPref("dom.mozBrowserFramesEnabled");
-  SpecialPowers.clearUserPref("dom.ipc.browser_frames.oop_by_default");
   SimpleTest.finish();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_simplecontentpolicy.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_simplecontentpolicy.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_simplecontentpolicy.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_simplecontentpolicy.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,149 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for nsISimpleContentPolicy</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1128798">Mozilla Bug 1128798</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+var lastContentType = -1;
+const testURL = window.location.href + "/this/is/the/test/url";
+const Cc = SpecialPowers.Cc;
+const Ci = SpecialPowers.Ci;
+
+var beaconUrl = "http://mochi.test:8888/tests/dom/tests/mochitest/beacon/beacon-handler.sjs";
+
+var chromeURL = SimpleTest.getTestFileURL("file_simplecontentpolicy.js");
+var script = SpecialPowers.loadChromeScript(chromeURL);
+
+// Try creating different request types. Most of these are not
+// top-level because they run in the test iframe.
+var tests = [["SCRIPT", false],
+             ["IMAGE", false],
+             ["STYLESHEET", false],
+             ["OBJECT", false],
+             ["DOCUMENT", true],
+             ["SUBDOCUMENT", false],
+             ["XBL", false],
+             ["XMLHTTPREQUEST", false],
+             ["BEACON", false]];
+var curTest = -1;
+
+var div;
+
+SimpleTest.waitForExplicitFinish();
+
+script.addMessageListener("ready", function(msg) {
+  SpecialPowers.pushPrefEnv({'set': [["beacon.enabled", true]]}, runNextTest);
+});
+
+script.addMessageListener("shouldLoad", function(msg) {
+  var isTopLevel = tests[curTest][1];
+  var type = "TYPE_" + tests[curTest][0];
+  is(msg.contentType, Ci.nsIContentPolicy[type], "Content policies triggered for " + type);
+  is(msg.isTopLevel, isTopLevel, "isTopLevel is set correctly");
+
+  if (tests[curTest] == "XBL") {
+    //XXX Removing binding to work-around a memory leak (bugs 478528, 499735).
+    div.style.MozBinding = "";
+  }
+
+  runNextTest();
+});
+
+function runNextTest() {
+  curTest++;
+  if (curTest < tests.length) {
+    var method = "request_" + tests[curTest][0].toLowerCase();
+    try {
+      window[method]();
+    } catch(e) {}
+  }
+  else {
+    script.sendAsyncMessage("finished");
+
+    SimpleTest.finish();
+  }
+}
+
+// Request creating functions
+
+function request_script() {
+  var content = $("content");
+
+Math.sin(1);
+  var script = document.createElement("script");
+  script.setAttribute("type", "text/javascript")
+  script.setAttribute("src", testURL)
+  content.appendChild(script);
+}
+
+function request_image() {
+  var content = $("content");
+
+  var image = new Image();
+  image.src = testURL;
+}
+
+function request_stylesheet() {
+  var content = $("content");
+
+  var stylesheet = document.createElement("link");
+  stylesheet.setAttribute("rel", "stylesheet");
+  stylesheet.setAttribute("type", "text/css");
+  stylesheet.setAttribute("href", testURL);
+  content.appendChild(stylesheet);
+}
+
+function request_object() {
+  var content = $("content");
+
+  var object = document.createElement("embed");
+  object.setAttribute("src", testURL);
+  content.appendChild(object);
+}
+
+function request_document() {
+  top.location.href = testURL;
+}
+
+function request_subdocument() {
+  var content = $("content");
+
+  var frame = document.createElement("iframe");
+  frame.setAttribute("src", testURL);
+  content.appendChild(frame);
+}
+
+function request_xbl() {
+  var content = $("content");
+
+  div = document.createElement("div");
+  div.style.MozBinding = "url(" + testURL + ")";
+  $('test').appendChild(div);
+  div.offsetLeft; // Flush styles.
+}
+
+function request_xmlhttprequest() {
+  var request = new XMLHttpRequest();
+  request.open("GET", testURL, false);
+  request.send(null);
+}
+
+function request_beacon() {
+  navigator.sendBeacon(testURL, "bacon would have been a better name than beacon");
+}
+
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_websocket_permessage_deflate.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_websocket_permessage_deflate.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_websocket_permessage_deflate.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_websocket_permessage_deflate.html	2015-02-28 15:03:05.000000000 +0000
@@ -5,7 +5,7 @@
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="testDeflate()">
+<body onload="loadDeflate()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=792831">Mozilla Bug </a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -50,8 +50,6 @@
 }
 
 function testDeflate() {
-  SpecialPowers.setBoolPref("network.websocket.extensions.permessage-deflate", tests[testIdx][0]);
-
   ws = new WebSocket(tests[testIdx][2]);
 
   ws.onopen = function(e) {
@@ -89,7 +87,7 @@
       sendText = true;
       testIdx++;
       if (testIdx < tests.length) {
-        testDeflate();
+        loadDeflate();
       } else {
         SimpleTest.finish();
       }
@@ -97,6 +95,10 @@
   }
 }
 
+function loadDeflate() {
+  SpecialPowers.pushPrefEnv({"set":[['network.websocket.extensions.permessage-deflate', tests[testIdx][0]]]}, testDeflate);
+}
+
 SimpleTest.waitForExplicitFinish();
 
 </script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_xhr_progressevents.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_xhr_progressevents.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/test_xhr_progressevents.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/test_xhr_progressevents.html	2015-02-28 15:03:05.000000000 +0000
@@ -97,7 +97,13 @@
 function sendData(s) {
   var xhr = new XMLHttpRequest();
   xhr.open("POST", "progressserver.sjs?send");
-  xhr.sendAsBinary(s);
+  // The Blob constructor encodes String elements as UTF-8;
+  // for straight bytes, manually convert to ArrayBuffer first
+  var buffer = new Uint8Array(s.length);
+  for (var i = 0; i < s.length; ++i) {
+    buffer[i] = s.charCodeAt(i) & 0xff;
+  };
+  xhr.send(new Blob([buffer]));
 }
 
 function closeConn() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/unit/test_error_codes.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/unit/test_error_codes.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/test/unit/test_error_codes.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/test/unit/test_error_codes.js	2015-02-28 15:03:05.000000000 +0000
@@ -6,6 +6,9 @@
 var gExpectedStatus = null;
 var gNextTestFunc   = null;
 
+var prefs = Components.classes["@mozilla.org/preferences-service;1"].
+    getService(Components.interfaces.nsIPrefBranch);
+
 var asyncXHR = {
   load: function() {
     var request = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"]
@@ -39,6 +42,7 @@
   catch (e) {
   }
   ioService.offline = true;
+  prefs.setBoolPref("network.dns.offline-localhost", false);
 
   gExpectedStatus = Components.results.NS_ERROR_OFFLINE;
   gNextTestFunc = run_test_pt2;
@@ -51,6 +55,7 @@
   var ioService = Components.classes["@mozilla.org/network/io-service;1"]
                             .getService(Components.interfaces.nsIIOService);
   ioService.offline = false;
+  prefs.clearUserPref("network.dns.offline-localhost");
 
   gExpectedStatus = Components.results.NS_ERROR_CONNECTION_REFUSED;
   gNextTestFunc = end_test;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/TextInputProcessor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/TextInputProcessor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/TextInputProcessor.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/TextInputProcessor.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/EventForwards.h"
 #include "mozilla/TextEventDispatcher.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TextInputProcessor.h"
 #include "nsIDocShell.h"
 #include "nsIWidget.h"
@@ -77,6 +78,21 @@
   }
 }
 
+bool
+TextInputProcessor::IsComposing() const
+{
+  return mDispatcher && mDispatcher->IsComposing();
+}
+
+NS_IMETHODIMP
+TextInputProcessor::GetHasComposition(bool* aHasComposition)
+{
+  MOZ_RELEASE_ASSERT(aHasComposition, "aHasComposition must not be nullptr");
+  MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
+  *aHasComposition = IsComposing();
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 TextInputProcessor::BeginInputTransaction(
                       nsIDOMWindow* aWindow,
@@ -150,15 +166,20 @@
     return NS_OK;
   }
 
-  // If this instance is composing, don't allow to initialize again.
-  if (mDispatcher && mDispatcher->IsComposing()) {
+  // If this instance is composing or dispatching an event, don't allow to
+  // initialize again.  Especially, if we allow to begin input transaction with
+  // another TextEventDispatcher during dispatching an event, it may cause that
+  // nobody cannot begin input transaction with it if the last event causes
+  // opening modal dialog.
+  if (mDispatcher &&
+      (mDispatcher->IsComposing() || mDispatcher->IsDispatchingEvent())) {
     return NS_ERROR_ALREADY_INITIALIZED;
   }
 
-  // And also if another instance is composing with the new dispatcher, it'll
-  // fail to steal its ownership.  Then, we should not throw an exception,
-  // just return false.
-  if (dispatcher->IsComposing()) {
+  // And also if another instance is composing with the new dispatcher or
+  // dispatching an event, it'll fail to steal its ownership.  Then, we should
+  // not throw an exception, just return false.
+  if (dispatcher->IsComposing() || dispatcher->IsDispatchingEvent()) {
     return NS_OK;
   }
 
@@ -214,24 +235,158 @@
   return NS_OK;
 }
 
+bool
+TextInputProcessor::IsValidEventTypeForComposition(
+                      const WidgetKeyboardEvent& aKeyboardEvent) const
+{
+  // The key event type of composition methods must be "" or "keydown".
+  if (aKeyboardEvent.message == NS_KEY_DOWN) {
+    return true;
+  }
+  if (aKeyboardEvent.message == NS_USER_DEFINED_EVENT &&
+      aKeyboardEvent.userType &&
+      nsDependentAtomString(aKeyboardEvent.userType).EqualsLiteral("on")) {
+    return true;
+  }
+  return false;
+}
+
+TextInputProcessor::EventDispatcherResult
+TextInputProcessor::MaybeDispatchKeydownForComposition(
+                      const WidgetKeyboardEvent* aKeyboardEvent,
+                      uint32_t aKeyFlags)
+{
+  EventDispatcherResult result;
+
+  result.mResult = IsValidStateForComposition();
+  if (NS_WARN_IF(NS_FAILED(result.mResult))) {
+    result.mCanContinue = false;
+    return result;
+  }
+
+  if (!aKeyboardEvent) {
+    return result;
+  }
+
+  // Modifier keys are not allowed because managing modifier state in this
+  // method makes this messy.
+  if (NS_WARN_IF(aKeyboardEvent->IsModifierKeyEvent())) {
+    result.mResult = NS_ERROR_INVALID_ARG;
+    result.mCanContinue = false;
+    return result;
+  }
+
+  result.mResult = KeydownInternal(*aKeyboardEvent, aKeyFlags, false,
+                                   result.mDoDefault);
+  if (NS_WARN_IF(NS_FAILED(result.mResult))) {
+    result.mCanContinue = false;
+    return result;
+  }
+
+  result.mCanContinue = NS_SUCCEEDED(IsValidStateForComposition());
+  return result;
+}
+
+TextInputProcessor::EventDispatcherResult
+TextInputProcessor::MaybeDispatchKeyupForComposition(
+                      const WidgetKeyboardEvent* aKeyboardEvent,
+                      uint32_t aKeyFlags)
+{
+  EventDispatcherResult result;
+
+  if (!aKeyboardEvent) {
+    return result;
+  }
+
+  // If the message is NS_KEY_DOWN, the caller doesn't want TIP to dispatch
+  // keyup event.
+  if (aKeyboardEvent->message == NS_KEY_DOWN) {
+    return result;
+  }
+
+  // If the widget has been destroyed, we can do nothing here.
+  result.mResult = IsValidStateForComposition();
+  if (NS_FAILED(result.mResult)) {
+    result.mCanContinue = false;
+    return result;
+  }
+
+  result.mResult = KeyupInternal(*aKeyboardEvent, aKeyFlags, result.mDoDefault);
+  if (NS_WARN_IF(NS_FAILED(result.mResult))) {
+    result.mCanContinue = false;
+    return result;
+  }
+
+  result.mCanContinue = NS_SUCCEEDED(IsValidStateForComposition());
+  return result;
+}
+
+nsresult
+TextInputProcessor::PrepareKeyboardEventForComposition(
+                      nsIDOMKeyEvent* aDOMKeyEvent,
+                      uint32_t& aKeyFlags,
+                      uint8_t aOptionalArgc,
+                      WidgetKeyboardEvent*& aKeyboardEvent)
+{
+  aKeyboardEvent = nullptr;
+
+  aKeyboardEvent =
+    aOptionalArgc && aDOMKeyEvent ?
+      aDOMKeyEvent->GetInternalNSEvent()->AsKeyboardEvent() : nullptr;
+  if (!aKeyboardEvent || aOptionalArgc < 2) {
+    aKeyFlags = 0;
+  }
+
+  if (!aKeyboardEvent) {
+    return NS_OK;
+  }
+
+  if (NS_WARN_IF(!IsValidEventTypeForComposition(*aKeyboardEvent))) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
-TextInputProcessor::StartComposition(bool* aSucceeded)
+TextInputProcessor::StartComposition(nsIDOMKeyEvent* aDOMKeyEvent,
+                                     uint32_t aKeyFlags,
+                                     uint8_t aOptionalArgc,
+                                     bool* aSucceeded)
 {
   MOZ_RELEASE_ASSERT(aSucceeded, "aSucceeded must not be nullptr");
   MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
   *aSucceeded = false;
+
   nsRefPtr<TextEventDispatcher> kungfuDeathGrip(mDispatcher);
-  nsresult rv = IsValidStateForComposition();
+
+  WidgetKeyboardEvent* keyboardEvent;
+  nsresult rv =
+    PrepareKeyboardEventForComposition(aDOMKeyEvent, aKeyFlags, aOptionalArgc,
+                                       keyboardEvent);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
-  nsEventStatus status = nsEventStatus_eIgnore;
-  rv = mDispatcher->StartComposition(status);
+
+  EventDispatcherResult dispatcherResult =
+    MaybeDispatchKeydownForComposition(keyboardEvent, aKeyFlags);
+  if (NS_WARN_IF(NS_FAILED(dispatcherResult.mResult)) ||
+      !dispatcherResult.mCanContinue) {
+    return dispatcherResult.mResult;
+  }
+
+  if (dispatcherResult.mDoDefault) {
+    nsEventStatus status = nsEventStatus_eIgnore;
+    rv = mDispatcher->StartComposition(status);
+    *aSucceeded = status != nsEventStatus_eConsumeNoDefault &&
+                    mDispatcher && mDispatcher->IsComposing();
+  }
+
+  MaybeDispatchKeyupForComposition(keyboardEvent, aKeyFlags);
+
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
-  *aSucceeded = status != nsEventStatus_eConsumeNoDefault &&
-                  mDispatcher && mDispatcher->IsComposing();
   return NS_OK;
 }
 
@@ -282,77 +437,181 @@
 }
 
 NS_IMETHODIMP
-TextInputProcessor::FlushPendingComposition(bool* aSucceeded)
+TextInputProcessor::FlushPendingComposition(nsIDOMKeyEvent* aDOMKeyEvent,
+                                            uint32_t aKeyFlags,
+                                            uint8_t aOptionalArgc,
+                                            bool* aSucceeded)
 {
   MOZ_RELEASE_ASSERT(aSucceeded, "aSucceeded must not be nullptr");
   MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
+
+  // Even if this doesn't flush pending composition actually, we need to reset
+  // pending composition for starting next composition with new user input.
+  AutoPendingCompositionResetter resetter(this);
+
   *aSucceeded = false;
   nsRefPtr<TextEventDispatcher> kungfuDeathGrip(mDispatcher);
-  nsresult rv = IsValidStateForComposition();
+  bool wasComposing = IsComposing();
+
+  WidgetKeyboardEvent* keyboardEvent;
+  nsresult rv =
+    PrepareKeyboardEventForComposition(aDOMKeyEvent, aKeyFlags, aOptionalArgc,
+                                       keyboardEvent);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
-  nsEventStatus status = nsEventStatus_eIgnore;
-  rv = mDispatcher->FlushPendingComposition(status);
+
+  EventDispatcherResult dispatcherResult =
+    MaybeDispatchKeydownForComposition(keyboardEvent, aKeyFlags);
+  if (NS_WARN_IF(NS_FAILED(dispatcherResult.mResult)) ||
+      !dispatcherResult.mCanContinue) {
+    return dispatcherResult.mResult;
+  }
+
+  // Even if the preceding keydown event was consumed, if the composition
+  // was already started, we shouldn't prevent the change of composition.
+  if (dispatcherResult.mDoDefault || wasComposing) {
+    // Preceding keydown event may cause destroying the widget.
+    if (NS_FAILED(IsValidStateForComposition())) {
+      return NS_OK;
+    }
+    nsEventStatus status = nsEventStatus_eIgnore;
+    rv = mDispatcher->FlushPendingComposition(status);
+    *aSucceeded = status != nsEventStatus_eConsumeNoDefault;
+  }
+
+  MaybeDispatchKeyupForComposition(keyboardEvent, aKeyFlags);
+
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
-  *aSucceeded = status != nsEventStatus_eConsumeNoDefault;
-  return rv;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
-TextInputProcessor::CommitComposition(const nsAString& aCommitString,
-                                      uint8_t aOptionalArgc,
-                                      bool* aSucceeded)
+TextInputProcessor::CommitComposition(nsIDOMKeyEvent* aDOMKeyEvent,
+                                      uint32_t aKeyFlags,
+                                      uint8_t aOptionalArgc)
+{
+  MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
+
+  WidgetKeyboardEvent* keyboardEvent;
+  nsresult rv =
+    PrepareKeyboardEventForComposition(aDOMKeyEvent, aKeyFlags, aOptionalArgc,
+                                       keyboardEvent);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  return CommitCompositionInternal(keyboardEvent, aKeyFlags);
+}
+
+NS_IMETHODIMP
+TextInputProcessor::CommitCompositionWith(const nsAString& aCommitString,
+                                          nsIDOMKeyEvent* aDOMKeyEvent,
+                                          uint32_t aKeyFlags,
+                                          uint8_t aOptionalArgc,
+                                          bool* aSucceeded)
 {
   MOZ_RELEASE_ASSERT(aSucceeded, "aSucceeded must not be nullptr");
   MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
-  const nsAString* commitString =
-    aOptionalArgc >= 1 ? &aCommitString : nullptr;
-  return CommitCompositionInternal(commitString, aSucceeded);
+
+  WidgetKeyboardEvent* keyboardEvent;
+  nsresult rv =
+    PrepareKeyboardEventForComposition(aDOMKeyEvent, aKeyFlags, aOptionalArgc,
+                                       keyboardEvent);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  return CommitCompositionInternal(keyboardEvent, aKeyFlags,
+                                   &aCommitString, aSucceeded);
 }
 
 nsresult
-TextInputProcessor::CommitCompositionInternal(const nsAString* aCommitString,
-                                              bool* aSucceeded)
+TextInputProcessor::CommitCompositionInternal(
+                      const WidgetKeyboardEvent* aKeyboardEvent,
+                      uint32_t aKeyFlags,
+                      const nsAString* aCommitString,
+                      bool* aSucceeded)
 {
   if (aSucceeded) {
     *aSucceeded = false;
   }
   nsRefPtr<TextEventDispatcher> kungfuDeathGrip(mDispatcher);
-  nsresult rv = IsValidStateForComposition();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+  bool wasComposing = IsComposing();
+
+  EventDispatcherResult dispatcherResult =
+    MaybeDispatchKeydownForComposition(aKeyboardEvent, aKeyFlags);
+  if (NS_WARN_IF(NS_FAILED(dispatcherResult.mResult)) ||
+      !dispatcherResult.mCanContinue) {
+    return dispatcherResult.mResult;
   }
-  nsEventStatus status = nsEventStatus_eIgnore;
-  rv = mDispatcher->CommitComposition(status, aCommitString);
+
+  // Even if the preceding keydown event was consumed, if the composition
+  // was already started, we shouldn't prevent the commit of composition.
+  nsresult rv = NS_OK;
+  if (dispatcherResult.mDoDefault || wasComposing) {
+    // Preceding keydown event may cause destroying the widget.
+    if (NS_FAILED(IsValidStateForComposition())) {
+      return NS_OK;
+    }
+    nsEventStatus status = nsEventStatus_eIgnore;
+    rv = mDispatcher->CommitComposition(status, aCommitString);
+    if (aSucceeded) {
+      *aSucceeded = status != nsEventStatus_eConsumeNoDefault;
+    }
+  }
+
+  MaybeDispatchKeyupForComposition(aKeyboardEvent, aKeyFlags);
+
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
-  if (aSucceeded) {
-    *aSucceeded = status != nsEventStatus_eConsumeNoDefault;
-  }
-  return rv;
+  return NS_OK;
 }
 
 NS_IMETHODIMP
-TextInputProcessor::CancelComposition()
+TextInputProcessor::CancelComposition(nsIDOMKeyEvent* aDOMKeyEvent,
+                                      uint32_t aKeyFlags,
+                                      uint8_t aOptionalArgc)
 {
   MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
-  return CancelCompositionInternal();
+
+  WidgetKeyboardEvent* keyboardEvent;
+  nsresult rv =
+    PrepareKeyboardEventForComposition(aDOMKeyEvent, aKeyFlags, aOptionalArgc,
+                                       keyboardEvent);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  return CancelCompositionInternal(keyboardEvent, aKeyFlags);
 }
 
 nsresult
-TextInputProcessor::CancelCompositionInternal()
+TextInputProcessor::CancelCompositionInternal(
+                      const WidgetKeyboardEvent* aKeyboardEvent,
+                      uint32_t aKeyFlags)
 {
   nsRefPtr<TextEventDispatcher> kungfuDeathGrip(mDispatcher);
-  nsresult rv = IsValidStateForComposition();
+
+  EventDispatcherResult dispatcherResult =
+    MaybeDispatchKeydownForComposition(aKeyboardEvent, aKeyFlags);
+  if (NS_WARN_IF(NS_FAILED(dispatcherResult.mResult)) ||
+      !dispatcherResult.mCanContinue) {
+    return dispatcherResult.mResult;
+  }
+
+  nsEventStatus status = nsEventStatus_eIgnore;
+  nsresult rv = mDispatcher->CommitComposition(status, &EmptyString());
+
+  MaybeDispatchKeyupForComposition(aKeyboardEvent, aKeyFlags);
+
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
-  nsEventStatus status = nsEventStatus_eIgnore;
-  return mDispatcher->CommitComposition(status, &EmptyString());
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -430,4 +689,306 @@
   UnlinkFromTextEventDispatcher();
 }
 
+nsresult
+TextInputProcessor::PrepareKeyboardEventToDispatch(
+                      WidgetKeyboardEvent& aKeyboardEvent,
+                      uint32_t aKeyFlags)
+{
+  if (NS_WARN_IF(aKeyboardEvent.mCodeNameIndex == CODE_NAME_INDEX_USE_STRING)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  if ((aKeyFlags & KEY_NON_PRINTABLE_KEY) &&
+      NS_WARN_IF(aKeyboardEvent.mKeyNameIndex == KEY_NAME_INDEX_USE_STRING)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  if ((aKeyFlags & KEY_FORCE_PRINTABLE_KEY) &&
+      aKeyboardEvent.mKeyNameIndex != KEY_NAME_INDEX_USE_STRING) {
+    aKeyboardEvent.GetDOMKeyName(aKeyboardEvent.mKeyValue);
+    aKeyboardEvent.mKeyNameIndex = KEY_NAME_INDEX_USE_STRING;
+  }
+  if (aKeyFlags & KEY_KEEP_KEY_LOCATION_STANDARD) {
+    // If .location is initialized with specific value, using
+    // KEY_KEEP_KEY_LOCATION_STANDARD must be a bug of the caller.
+    // Let's throw an exception for notifying the developer of this bug.
+    if (NS_WARN_IF(aKeyboardEvent.location)) {
+      return NS_ERROR_INVALID_ARG;
+    }
+  } else if (!aKeyboardEvent.location) {
+    // If KeyboardEvent.location is 0, it may be uninitialized.  If so, we
+    // should compute proper location value from its .code value.
+    aKeyboardEvent.location =
+      WidgetKeyboardEvent::ComputeLocationFromCodeValue(
+        aKeyboardEvent.mCodeNameIndex);
+  }
+
+  if (aKeyFlags & KEY_KEEP_KEYCODE_ZERO) {
+    // If .keyCode is initialized with specific value, using
+    // KEY_KEEP_KEYCODE_ZERO must be a bug of the caller.  Let's throw an
+    // exception for notifying the developer of such bug.
+    if (NS_WARN_IF(aKeyboardEvent.keyCode)) {
+      return NS_ERROR_INVALID_ARG;
+    }
+  } else if (!aKeyboardEvent.keyCode &&
+             aKeyboardEvent.mKeyNameIndex > KEY_NAME_INDEX_Unidentified &&
+             aKeyboardEvent.mKeyNameIndex < KEY_NAME_INDEX_USE_STRING) {
+    // If KeyboardEvent.keyCode is 0, it may be uninitialized.  If so, we may
+    // be able to decide a good .keyCode value if the .key value is a
+    // non-printable key.
+    aKeyboardEvent.keyCode =
+      WidgetKeyboardEvent::ComputeKeyCodeFromKeyNameIndex(
+        aKeyboardEvent.mKeyNameIndex);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TextInputProcessor::Keydown(nsIDOMKeyEvent* aDOMKeyEvent,
+                            uint32_t aKeyFlags,
+                            uint8_t aOptionalArgc,
+                            bool* aDoDefault)
+{
+  MOZ_RELEASE_ASSERT(aDoDefault, "aDoDefault must not be nullptr");
+  MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
+  if (!aOptionalArgc) {
+    aKeyFlags = 0;
+  }
+  if (NS_WARN_IF(!aDOMKeyEvent)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  WidgetKeyboardEvent* originalKeyEvent =
+    aDOMKeyEvent->GetInternalNSEvent()->AsKeyboardEvent();
+  if (NS_WARN_IF(!originalKeyEvent)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  return KeydownInternal(*originalKeyEvent, aKeyFlags, true, *aDoDefault);
+}
+
+nsresult
+TextInputProcessor::KeydownInternal(const WidgetKeyboardEvent& aKeyboardEvent,
+                                    uint32_t aKeyFlags,
+                                    bool aAllowToDispatchKeypress,
+                                    bool& aDoDefault)
+{
+  aDoDefault = false;
+
+  // We shouldn't modify the internal WidgetKeyboardEvent.
+  WidgetKeyboardEvent keyEvent(aKeyboardEvent);
+  nsresult rv = PrepareKeyboardEventToDispatch(keyEvent, aKeyFlags);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  aDoDefault = !(aKeyFlags & KEY_DEFAULT_PREVENTED);
+
+  if (WidgetKeyboardEvent::GetModifierForKeyName(keyEvent.mKeyNameIndex)) {
+    ModifierKeyData modifierKeyData(keyEvent);
+    if (WidgetKeyboardEvent::IsLockableModifier(keyEvent.mKeyNameIndex)) {
+      // If the modifier key is lockable modifier key such as CapsLock,
+      // let's toggle modifier key state at keydown.
+      ToggleModifierKey(modifierKeyData);
+    } else {
+      // Activate modifier flag before dispatching keydown event (i.e., keydown
+      // event should indicate the releasing modifier is active.
+      ActivateModifierKey(modifierKeyData);
+    }
+    if (aKeyFlags & KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT) {
+      return NS_OK;
+    }
+  } else if (NS_WARN_IF(aKeyFlags & KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  keyEvent.modifiers = GetActiveModifiers();
+
+  nsRefPtr<TextEventDispatcher> kungfuDeathGrip(mDispatcher);
+  rv = IsValidStateForComposition();
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  nsEventStatus status = aDoDefault ? nsEventStatus_eIgnore :
+                                      nsEventStatus_eConsumeNoDefault;
+  if (!mDispatcher->DispatchKeyboardEvent(NS_KEY_DOWN, keyEvent, status)) {
+    // If keydown event isn't dispatched, we don't need to dispatch keypress
+    // events.
+    return NS_OK;
+  }
+
+  if (aAllowToDispatchKeypress) {
+    mDispatcher->MaybeDispatchKeypressEvents(keyEvent, status);
+  }
+
+  aDoDefault = (status != nsEventStatus_eConsumeNoDefault);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TextInputProcessor::Keyup(nsIDOMKeyEvent* aDOMKeyEvent,
+                          uint32_t aKeyFlags,
+                          uint8_t aOptionalArgc,
+                          bool* aDoDefault)
+{
+  MOZ_RELEASE_ASSERT(aDoDefault, "aDoDefault must not be nullptr");
+  MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
+  if (!aOptionalArgc) {
+    aKeyFlags = 0;
+  }
+  if (NS_WARN_IF(!aDOMKeyEvent)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  WidgetKeyboardEvent* originalKeyEvent =
+    aDOMKeyEvent->GetInternalNSEvent()->AsKeyboardEvent();
+  if (NS_WARN_IF(!originalKeyEvent)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  return KeyupInternal(*originalKeyEvent, aKeyFlags, *aDoDefault);
+}
+
+nsresult
+TextInputProcessor::KeyupInternal(const WidgetKeyboardEvent& aKeyboardEvent,
+                                  uint32_t aKeyFlags,
+                                  bool& aDoDefault)
+{
+  aDoDefault = false;
+
+  // We shouldn't modify the internal WidgetKeyboardEvent.
+  WidgetKeyboardEvent keyEvent(aKeyboardEvent);
+  nsresult rv = PrepareKeyboardEventToDispatch(keyEvent, aKeyFlags);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  aDoDefault = !(aKeyFlags & KEY_DEFAULT_PREVENTED);
+
+  if (WidgetKeyboardEvent::GetModifierForKeyName(keyEvent.mKeyNameIndex)) {
+    if (!WidgetKeyboardEvent::IsLockableModifier(keyEvent.mKeyNameIndex)) {
+      // Inactivate modifier flag before dispatching keyup event (i.e., keyup
+      // event shouldn't indicate the releasing modifier is active.
+      InactivateModifierKey(ModifierKeyData(keyEvent));
+    }
+    if (aKeyFlags & KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT) {
+      return NS_OK;
+    }
+  } else if (NS_WARN_IF(aKeyFlags & KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  keyEvent.modifiers = GetActiveModifiers();
+
+  nsRefPtr<TextEventDispatcher> kungfuDeathGrip(mDispatcher);
+  rv = IsValidStateForComposition();
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  nsEventStatus status = aDoDefault ? nsEventStatus_eIgnore :
+                                      nsEventStatus_eConsumeNoDefault;
+  mDispatcher->DispatchKeyboardEvent(NS_KEY_UP, keyEvent, status);
+  aDoDefault = (status != nsEventStatus_eConsumeNoDefault);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TextInputProcessor::GetModifierState(const nsAString& aModifierKeyName,
+                                     bool* aActive)
+{
+  MOZ_RELEASE_ASSERT(aActive, "aActive must not be null");
+  MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
+  if (!mModifierKeyDataArray) {
+    *aActive = false;
+    return NS_OK;
+  }
+  Modifiers activeModifiers = mModifierKeyDataArray->GetActiveModifiers();
+  Modifiers modifier = WidgetInputEvent::GetModifier(aModifierKeyName);
+  *aActive = ((activeModifiers & modifier) != 0);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+TextInputProcessor::ShareModifierStateOf(nsITextInputProcessor* aOther)
+{
+  MOZ_RELEASE_ASSERT(nsContentUtils::IsCallerChrome());
+  if (!aOther) {
+    mModifierKeyDataArray = nullptr;
+    return NS_OK;
+  }
+  TextInputProcessor* other = static_cast<TextInputProcessor*>(aOther);
+  if (!other->mModifierKeyDataArray) {
+    other->mModifierKeyDataArray = new ModifierKeyDataArray();
+  }
+  mModifierKeyDataArray = other->mModifierKeyDataArray;
+  return NS_OK;
+}
+
+/******************************************************************************
+ * TextInputProcessor::AutoPendingCompositionResetter
+ ******************************************************************************/
+TextInputProcessor::AutoPendingCompositionResetter::
+  AutoPendingCompositionResetter(TextInputProcessor* aTIP)
+  : mTIP(aTIP)
+{
+  MOZ_RELEASE_ASSERT(mTIP.get(), "mTIP must not be null");
+}
+
+TextInputProcessor::AutoPendingCompositionResetter::
+  ~AutoPendingCompositionResetter()
+{
+  if (mTIP->mDispatcher) {
+    mTIP->mDispatcher->ClearPendingComposition();
+  }
+}
+
+/******************************************************************************
+ * TextInputProcessor::ModifierKeyData
+ ******************************************************************************/
+TextInputProcessor::ModifierKeyData::ModifierKeyData(
+  const WidgetKeyboardEvent& aKeyboardEvent)
+  : mKeyNameIndex(aKeyboardEvent.mKeyNameIndex)
+  , mCodeNameIndex(aKeyboardEvent.mCodeNameIndex)
+{
+  mModifier = WidgetKeyboardEvent::GetModifierForKeyName(mKeyNameIndex);
+  MOZ_ASSERT(mModifier, "mKeyNameIndex must be a modifier key name");
+}
+
+/******************************************************************************
+ * TextInputProcessor::ModifierKeyDataArray
+ ******************************************************************************/
+Modifiers
+TextInputProcessor::ModifierKeyDataArray::GetActiveModifiers() const
+{
+  Modifiers result = MODIFIER_NONE;
+  for (uint32_t i = 0; i < Length(); i++) {
+    result |= ElementAt(i).mModifier;
+  }
+  return result;
+}
+
+void
+TextInputProcessor::ModifierKeyDataArray::ActivateModifierKey(
+  const TextInputProcessor::ModifierKeyData& aModifierKeyData)
+{
+  if (Contains(aModifierKeyData)) {
+    return;
+  }
+  AppendElement(aModifierKeyData);
+}
+
+void
+TextInputProcessor::ModifierKeyDataArray::InactivateModifierKey(
+  const TextInputProcessor::ModifierKeyData& aModifierKeyData)
+{
+  RemoveElement(aModifierKeyData);
+}
+
+void
+TextInputProcessor::ModifierKeyDataArray::ToggleModifierKey(
+  const TextInputProcessor::ModifierKeyData& aModifierKeyData)
+{
+  auto index = IndexOf(aModifierKeyData);
+  if (index == NoIndex) {
+    AppendElement(aModifierKeyData);
+    return;
+  }
+  RemoveElementAt(index);
+}
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/TextInputProcessor.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/TextInputProcessor.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/TextInputProcessor.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/TextInputProcessor.h	2015-02-28 15:03:05.000000000 +0000
@@ -6,9 +6,13 @@
 #ifndef mozilla_dom_textinputprocessor_h_
 #define mozilla_dom_textinputprocessor_h_
 
+#include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/TextEventDispatcherListener.h"
+#include "nsAutoPtr.h"
 #include "nsITextInputProcessor.h"
 #include "nsITextInputProcessorCallback.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 
@@ -38,19 +42,144 @@
   virtual ~TextInputProcessor();
 
 private:
+  bool IsComposing() const;
   nsresult BeginInputTransactionInternal(
              nsIDOMWindow* aWindow,
              nsITextInputProcessorCallback* aCallback,
              bool aForTests,
              bool& aSucceeded);
-  nsresult CommitCompositionInternal(const nsAString* aCommitString = nullptr,
-                                     bool* aSucceeded = nullptr);
-  nsresult CancelCompositionInternal();
+  nsresult CommitCompositionInternal(
+             const WidgetKeyboardEvent* aKeyboardEvent = nullptr,
+             uint32_t aKeyFlags = 0,
+             const nsAString* aCommitString = nullptr,
+             bool* aSucceeded = nullptr);
+  nsresult CancelCompositionInternal(
+             const WidgetKeyboardEvent* aKeyboardEvent = nullptr,
+             uint32_t aKeyFlags = 0);
+  nsresult KeydownInternal(const WidgetKeyboardEvent& aKeyboardEvent,
+                           uint32_t aKeyFlags,
+                           bool aAllowToDispatchKeypress,
+                           bool& aDoDefault);
+  nsresult KeyupInternal(const WidgetKeyboardEvent& aKeyboardEvent,
+                         uint32_t aKeyFlags,
+                         bool& aDoDefault);
   nsresult IsValidStateForComposition();
   void UnlinkFromTextEventDispatcher();
+  nsresult PrepareKeyboardEventToDispatch(WidgetKeyboardEvent& aKeyboardEvent,
+                                          uint32_t aKeyFlags);
+  bool IsValidEventTypeForComposition(
+         const WidgetKeyboardEvent& aKeyboardEvent) const;
+  nsresult PrepareKeyboardEventForComposition(
+             nsIDOMKeyEvent* aDOMKeyEvent,
+             uint32_t& aKeyFlags,
+             uint8_t aOptionalArgc,
+             WidgetKeyboardEvent*& aKeyboardEvent);
+
+  struct EventDispatcherResult
+  {
+    nsresult mResult;
+    bool     mDoDefault;
+    bool     mCanContinue;
+
+    EventDispatcherResult()
+      : mResult(NS_OK)
+      , mDoDefault(true)
+      , mCanContinue(true)
+    {
+    }
+  };
+  EventDispatcherResult MaybeDispatchKeydownForComposition(
+                          const WidgetKeyboardEvent* aKeyboardEvent,
+                          uint32_t aKeyFlags);
+  EventDispatcherResult MaybeDispatchKeyupForComposition(
+                          const WidgetKeyboardEvent* aKeyboardEvent,
+                          uint32_t aKeyFlags);
+
+  /**
+   * AutoPendingCompositionResetter guarantees to clear all pending composition
+   * data in its destructor.
+   */
+  class MOZ_STACK_CLASS AutoPendingCompositionResetter
+  {
+  public:
+    explicit AutoPendingCompositionResetter(TextInputProcessor* aTIP);
+    ~AutoPendingCompositionResetter();
+
+  private:
+    nsRefPtr<TextInputProcessor> mTIP;
+  };
+
+  /**
+   * TextInputProcessor manages modifier state both with .key and .code.
+   * For example, left shift key up shouldn't cause inactivating shift state
+   * while right shift key is being pressed.
+   */
+  struct ModifierKeyData
+  {
+    // One of modifier key name
+    KeyNameIndex mKeyNameIndex;
+    // Any code name is allowed.
+    CodeNameIndex mCodeNameIndex;
+    // A modifier key flag which is activated by the key.
+    Modifiers mModifier;
+
+    explicit ModifierKeyData(const WidgetKeyboardEvent& aKeyboardEvent);
+
+    bool operator==(const ModifierKeyData& aOther) const
+    {
+      return mKeyNameIndex == aOther.mKeyNameIndex &&
+             mCodeNameIndex == aOther.mCodeNameIndex;
+    }
+  };
+
+  class ModifierKeyDataArray : public nsTArray<ModifierKeyData>
+  {
+    NS_INLINE_DECL_REFCOUNTING(ModifierKeyDataArray)
+
+  public:
+    Modifiers GetActiveModifiers() const;
+    void ActivateModifierKey(const ModifierKeyData& aModifierKeyData);
+    void InactivateModifierKey(const ModifierKeyData& aModifierKeyData);
+    void ToggleModifierKey(const ModifierKeyData& aModifierKeyData);
+
+  private:
+    virtual ~ModifierKeyDataArray() { }
+  };
+
+  Modifiers GetActiveModifiers() const
+  {
+    return mModifierKeyDataArray ?
+      mModifierKeyDataArray->GetActiveModifiers() : 0;
+  }
+  void EnsureModifierKeyDataArray()
+  {
+    if (mModifierKeyDataArray) {
+      return;
+    }
+    mModifierKeyDataArray = new ModifierKeyDataArray();
+  }
+  void ActivateModifierKey(const ModifierKeyData& aModifierKeyData)
+  {
+    EnsureModifierKeyDataArray();
+    mModifierKeyDataArray->ActivateModifierKey(aModifierKeyData);
+  }
+  void InactivateModifierKey(const ModifierKeyData& aModifierKeyData)
+  {
+    if (!mModifierKeyDataArray) {
+      return;
+    }
+    mModifierKeyDataArray->InactivateModifierKey(aModifierKeyData);
+  }
+  void ToggleModifierKey(const ModifierKeyData& aModifierKeyData)
+  {
+    EnsureModifierKeyDataArray();
+    mModifierKeyDataArray->ToggleModifierKey(aModifierKeyData);
+  }
 
   TextEventDispatcher* mDispatcher; // [Weak]
   nsCOMPtr<nsITextInputProcessorCallback> mCallback;
+  nsRefPtr<ModifierKeyDataArray> mModifierKeyDataArray;
+
   bool mForTests;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/WindowNamedPropertiesHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/WindowNamedPropertiesHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/base/WindowNamedPropertiesHandler.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/base/WindowNamedPropertiesHandler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -19,6 +19,13 @@
 static bool
 ShouldExposeChildWindow(nsString& aNameBeingResolved, nsIDOMWindow *aChild)
 {
+  nsCOMPtr<nsPIDOMWindow> piWin = do_QueryInterface(aChild);
+  NS_ENSURE_TRUE(piWin, false);
+  Element* e = piWin->GetFrameElementInternal();
+  if (e && e->IsInShadowTree()) {
+    return false;
+  }
+
   // If we're same-origin with the child, go ahead and expose it.
   nsCOMPtr<nsIScriptObjectPrincipal> sop = do_QueryInterface(aChild);
   NS_ENSURE_TRUE(sop, false);
@@ -63,9 +70,6 @@
   // allow the child to arbitrarily pollute the parent namespace, and requires
   // cross-origin communication only in a limited set of cases that can be
   // computed independently by the parent.
-  nsCOMPtr<nsPIDOMWindow> piWin = do_QueryInterface(aChild);
-  NS_ENSURE_TRUE(piWin, false);
-  Element* e = piWin->GetFrameElementInternal();
   return e && e->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name,
                              aNameBeingResolved, eCaseMatters);
 }
@@ -276,7 +280,6 @@
   options.setClass(&WindowNamedPropertiesClass.mBase);
   return js::NewProxyObject(aCx, WindowNamedPropertiesHandler::getInstance(),
                             JS::NullHandleValue, aProto,
-                            js::GetGlobalForObjectCrossCompartment(aProto),
                             options);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/BindingDeclarations.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/BindingDeclarations.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/BindingDeclarations.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/BindingDeclarations.h	2015-02-28 15:03:05.000000000 +0000
@@ -39,6 +39,14 @@
   bool StringifyToJSON(JSContext* aCx,
                        JS::MutableHandle<JS::Value> aValue,
                        nsAString& aJSON) const;
+
+  // Struct used as a way to force a dictionary constructor to not init the
+  // dictionary (via constructing from a pointer to this class).  We're putting
+  // it here so that all the dictionaries will have access to it, but outside
+  // code will not.
+  struct FastDictionaryInitializer {
+  };
+
 private:
   // aString is expected to actually be an nsAString*.  Should only be
   // called from StringifyToJSON.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Bindings.conf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Bindings.conf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Bindings.conf	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Bindings.conf	2015-02-28 15:03:05.000000000 +0000
@@ -13,13 +13,11 @@
 # Valid fields for all descriptors:
 #   * nativeType - The native type (concrete class or XPCOM interface) that
 #                  instances of this interface will unwrap to.  If not
-#                  specified, defaults to 'mozilla::dom::InterfaceName' for
-#                  non-worker non-external-or-callback interfaces, to
+#                  specified, defaults to 'nsIDOM' followed by the interface
+#                  name for external interfaces,
 #                  'mozilla::dom::workers::InterfaceName' for worker
-#                  non-external interfaces, to 'nsIDOM' followed by the
-#                  interface name for non-worker external-or-callback
-#                  interfaces, and to 'JSObject' for worker external-or-callback
-#                  interfaces.
+#                  non-callback interfaces, and 'mozilla::dom::InterfaceName'
+#                  for everything else.
 #   * headerFile - The file in which the nativeType is declared (defaults
 #                  to an educated guess).
 #   * concrete - Indicates whether there exist JS objects with this interface as
@@ -31,6 +29,7 @@
 #               will not be made available on the main thread.
 #   * notflattened - The native type does not have nsIClassInfo, so when
 #                    wrapping it the right IID needs to be passed in.
+#                    Only relevant for callback interfaces.
 #   * register - True if this binding should be registered.  Defaults to true.
 #   * binaryNames - Dict for mapping method and attribute names to different
 #                   names when calling the native methods (defaults to an empty
@@ -45,9 +44,13 @@
 #                   interfaces.  Defaults to true for non-worker non-callback
 #                   descriptors.
 #
-#   The following fields are either a string, an array (defaults to an empty
-#   array) or a dictionary with three possible keys (all, getterOnly and
-#   setterOnly) each having such an array as the value
+# A non-worker descriptor can have 'wantsXrays': False specified if it
+# should not have Xray hooks generated.  Make sure to have someone
+# familiar with Xrays review any use of this!
+#
+# The following fields are either a string, an array (defaults to an empty
+# array) or a dictionary with three possible keys (all, getterOnly and
+# setterOnly) each having such an array as the value
 #
 #   * implicitJSContext - attributes and methods specified in the .webidl file
 #                         that require a JSContext as the first argument
@@ -240,6 +243,16 @@
     'nativeType': 'mozilla::dom::workers::ChromeWorkerPrivate',
 },
 
+'Client': {
+    'nativeType': 'mozilla::dom::workers::ServiceWorkerClient',
+    'headerFile': 'mozilla/dom/workers/bindings/ServiceWorkerClient.h',
+},
+
+'Clients': {
+    'nativeType': 'mozilla::dom::workers::ServiceWorkerClients',
+    'headerFile': 'mozilla/dom/workers/bindings/ServiceWorkerClients.h',
+},
+
 'Console': {
     'implicitJSContext': [ 'trace', 'time', 'timeEnd' ],
 },
@@ -418,6 +431,14 @@
     'nativeType': 'mozilla::dom::workers::ExtendableEvent',
 },
 
+'FetchEvent': {
+    'headerFile': 'ServiceWorkerEvents.h',
+    'nativeType': 'mozilla::dom::workers::FetchEvent',
+    'binaryNames': {
+        'request': 'request_'
+    },
+},
+
 'FileList': {
     'headerFile': 'mozilla/dom/File.h',
 },
@@ -588,14 +609,10 @@
     'headerFile': 'IDBEvents.h',
 },
 
-'IID': [
-{
+'IID': {
     'nativeType': 'nsIJSID',
     'headerFile': 'xpcjsid.h',
 },
-{
-    'workers': True,
-}],
 
 'ImageCapture': {
     'binaryNames': { 'videoStreamTrack': 'GetVideoStreamTrack' }
@@ -605,14 +622,10 @@
     'wrapperCache': False,
 },
 
-'InputStream': [
-{
+'InputStream': {
     'nativeType': 'nsIInputStream',
     'notflattened': True
 },
-{
-    'workers': True,
-}],
 
 'InstallEvent': {
     'headerFile': 'ServiceWorkerEvents.h',
@@ -917,16 +930,6 @@
     'headerFile': 'mozilla/dom/workers/bindings/ServiceWorker.h',
 },
 
-'ServiceWorkerClient': {
-    'nativeType': 'mozilla::dom::workers::ServiceWorkerClient',
-    'headerFile': 'mozilla/dom/workers/bindings/ServiceWorkerClient.h',
-},
-
-'ServiceWorkerClients': {
-    'nativeType': 'mozilla::dom::workers::ServiceWorkerClients',
-    'headerFile': 'mozilla/dom/workers/bindings/ServiceWorkerClients.h',
-},
-
 'ServiceWorkerGlobalScope': {
     'headerFile': 'mozilla/dom/WorkerScope.h',
     'workers': True,
@@ -1476,16 +1479,10 @@
     },
 },
 
-'WindowProxy': [
-{
+'WindowProxy': {
     'nativeType': 'nsIDOMWindow',
     'concrete': False
 },
-{
-    # We need a worker descriptor for WindowProxy because EventTarget exists in
-    # workers.  But it's an external interface, so it'll just map to JSObject*.
-    'workers': True
-}],
 
 'WindowRoot': {
     'nativeType': 'nsWindowRoot'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/BindingUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/BindingUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/BindingUtils.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/BindingUtils.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -407,7 +407,7 @@
 {
   JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
   if (!args.thisv().isObject()) {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, js::GetErrorMessage, nullptr,
                          JSMSG_CANT_CONVERT_TO, "null", "object");
     return false;
   }
@@ -497,7 +497,7 @@
   if (constructorClass) {
     MOZ_ASSERT(constructorProto);
     constructor = JS_NewObjectWithGivenProto(cx, Jsvalify(constructorClass),
-                                             constructorProto, global);
+                                             constructorProto);
   } else {
     MOZ_ASSERT(constructorNative);
     MOZ_ASSERT(constructorProto == JS_GetFunctionPrototype(cx, global));
@@ -1615,7 +1615,7 @@
                                    obj, flags, props);
 }
 
-NativePropertyHooks sWorkerNativePropertyHooks = {
+NativePropertyHooks sEmptyNativePropertyHooks = {
   nullptr,
   nullptr,
   {
@@ -1774,17 +1774,19 @@
   JS::Rooted<JSObject*> aObj(aCx, aObjArg);
   const DOMJSClass* domClass = GetDOMClass(aObj);
 
+  // DOM things are always parented to globals.
   JS::Rooted<JSObject*> oldParent(aCx, JS_GetParent(aObj));
+  MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(oldParent) == oldParent);
+
   JS::Rooted<JSObject*> newParent(aCx, domClass->mGetParent(aCx, aObj));
+  MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(newParent) == newParent);
 
   JSAutoCompartment oldAc(aCx, oldParent);
 
   JSCompartment* oldCompartment = js::GetObjectCompartment(oldParent);
   JSCompartment* newCompartment = js::GetObjectCompartment(newParent);
   if (oldCompartment == newCompartment) {
-    if (!JS_SetParent(aCx, aObj, newParent)) {
-      MOZ_CRASH();
-    }
+    MOZ_ASSERT(oldParent == newParent);
     return NS_OK;
   }
 
@@ -1806,14 +1808,12 @@
   // return early we must avoid ending up with two reflectors pointing to the
   // same native. Other than that, the objects we create will just go away.
 
-  JS::Rooted<JSObject*> global(aCx,
-                               js::GetGlobalForObjectCrossCompartment(newParent));
-  JS::Handle<JSObject*> proto = (domClass->mGetProto)(aCx, global);
+  JS::Handle<JSObject*> proto = (domClass->mGetProto)(aCx, newParent);
   if (!proto) {
     return NS_ERROR_FAILURE;
   }
 
-  JS::Rooted<JSObject*> newobj(aCx, JS_CloneObject(aCx, aObj, proto, newParent));
+  JS::Rooted<JSObject*> newobj(aCx, JS_CloneObject(aCx, aObj, proto));
   if (!newobj) {
     return NS_ERROR_FAILURE;
   }
@@ -1833,8 +1833,7 @@
 
     JS::Rooted<JSObject*> copyFrom(aCx, isProxy ? expandoObject : aObj);
     if (copyFrom) {
-      propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, JS::NullPtr(),
-                                                  newParent);
+      propertyHolder = JS_NewObjectWithGivenProto(aCx, nullptr, JS::NullPtr());
       if (!propertyHolder) {
         return NS_ERROR_OUT_OF_MEMORY;
       }
@@ -1903,12 +1902,7 @@
     htmlobject->SetupProtoChain(aCx, aObj);
   }
 
-  // Now we can just fix up the parent and return the wrapper
-
-  if (newParent && !JS_SetParent(aCx, aObj, newParent)) {
-    MOZ_CRASH();
-  }
-
+  // Now we can just return the wrapper
   return NS_OK;
 }
 
@@ -2622,6 +2616,9 @@
 
   JS::Rooted<JS::Value> exn(cx);
   if (!JS_GetPendingException(cx, &exn)) {
+    // This is very important: if there is no pending exception here but we're
+    // ending up in this code, that means the callee threw an uncatchable
+    // exception.  Just propagate that out as-is.
     return false;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/BindingUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/BindingUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/BindingUtils.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/BindingUtils.h	2015-02-28 15:03:05.000000000 +0000
@@ -28,6 +28,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "nsCycleCollector.h"
+#include "nsIGlobalObject.h"
 #include "nsIXPConnect.h"
 #include "nsJSUtils.h"
 #include "nsISupportsImpl.h"
@@ -103,6 +104,13 @@
                              const char* memberName,
                              bool reportJSContentExceptions = false)
 {
+  if (rv.IsUncatchableException()) {
+    // Nuke any existing exception on aCx, to make sure we're uncatchable.
+    JS_ClearPendingException(cx);
+    // Don't do any reporting.  Just return false, to create an
+    // uncatchable exception.
+    return false;
+  }
   if (rv.IsErrorWithMessage()) {
     rv.ReportErrorWithMessage(cx);
     return false;
@@ -1570,6 +1578,15 @@
   return WrapNativeParent(cx, GetParentPointer(p), GetWrapperCache(p), GetUseXBLScope(p));
 }
 
+// Specialization for the case of nsIGlobalObject, since in that case
+// we can just get the JSObject* directly.
+template<>
+inline JSObject*
+WrapNativeParent(JSContext* cx, nsIGlobalObject* const& p)
+{
+  return p ? p->GetGlobalJSObject() : JS::CurrentGlobalOrNull(cx);
+}
+
 template<typename T, bool WrapperCached=NativeHasMember<T>::GetParentObject>
 struct GetParentObject
 {
@@ -2485,7 +2502,7 @@
   return JS_WrapObject(cx, protop);
 }
 
-extern NativePropertyHooks sWorkerNativePropertyHooks;
+extern NativePropertyHooks sEmptyNativePropertyHooks;
 
 // We use one constructor JSNative to represent all DOM interface objects (so
 // we can easily detect when we need to wrap them in an Xray wrapper). We store
@@ -2778,15 +2795,14 @@
   void
   CreateProxyObject(JSContext* aCx, const js::Class* aClass,
                     const DOMProxyHandler* aHandler,
-                    JS::Handle<JSObject*> aProto,
-                    JS::Handle<JSObject*> aParent, T* aNative,
+                    JS::Handle<JSObject*> aProto, T* aNative,
                     JS::MutableHandle<JSObject*> aReflector)
   {
     js::ProxyOptions options;
     options.setClass(aClass);
     JS::Rooted<JS::Value> proxyPrivateVal(aCx, JS::PrivateValue(aNative));
     aReflector.set(js::NewProxyObject(aCx, aHandler, proxyPrivateVal, aProto,
-                                      aParent, options));
+                                      options));
     if (aReflector) {
       mNative = aNative;
       mReflector = aReflector;
@@ -2795,10 +2811,10 @@
 
   void
   CreateObject(JSContext* aCx, const JSClass* aClass,
-               JS::Handle<JSObject*> aProto, JS::Handle<JSObject*> aParent,
+               JS::Handle<JSObject*> aProto,
                T* aNative, JS::MutableHandle<JSObject*> aReflector)
   {
-    aReflector.set(JS_NewObjectWithGivenProto(aCx, aClass, aProto, aParent));
+    aReflector.set(JS_NewObjectWithGivenProto(aCx, aClass, aProto));
     if (aReflector) {
       js::SetReservedSlot(aReflector, DOM_OBJECT_SLOT, JS::PrivateValue(aNative));
       mNative = aNative;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Codegen.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Codegen.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Codegen.py	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Codegen.py	2015-02-28 15:03:05.000000000 +0000
@@ -255,7 +255,7 @@
         self.properties = properties
 
     def declare(self):
-        if self.descriptor.workers:
+        if not self.descriptor.wantsXrays:
             return ""
         return dedent("""
             // We declare this as an array so that retrieving a pointer to this
@@ -269,7 +269,7 @@
             """)
 
     def define(self):
-        if self.descriptor.workers:
+        if not self.descriptor.wantsXrays:
             return ""
         if self.descriptor.concrete and self.descriptor.proxy:
             resolveOwnProperty = "ResolveOwnProperty"
@@ -323,7 +323,7 @@
 
 
 def NativePropertyHooks(descriptor):
-    return "&sWorkerNativePropertyHooks" if descriptor.workers else "sNativePropertyHooks"
+    return "&sEmptyNativePropertyHooks" if not descriptor.wantsXrays else "sNativePropertyHooks"
 
 
 def DOMClass(descriptor):
@@ -381,7 +381,7 @@
             classFlags += "JSCLASS_DOM_GLOBAL | JSCLASS_GLOBAL_FLAGS_WITH_SLOTS(DOM_GLOBAL_SLOTS) | JSCLASS_IMPLEMENTS_BARRIERS"
             traceHook = "JS_GlobalObjectTraceHook"
             reservedSlots = "JSCLASS_GLOBAL_APPLICATION_SLOTS"
-            if not self.descriptor.workers:
+            if self.descriptor.interface.identifier.name == "Window":
                 classExtensionAndObjectOps = fill(
                     """
                     {
@@ -523,69 +523,9 @@
                  descriptor.interface.getExtendedAttribute("Unforgeable")))
 
 
-def UseHolderForUnforgeable(descriptor):
-    return (descriptor.concrete and
-            descriptor.proxy and
-            any(m for m in descriptor.interface.members
-                if MemberIsUnforgeable(m, descriptor)))
-
-
-def CallOnUnforgeableHolder(descriptor, code, isXrayCheck=None,
-                            useSharedRoot=False):
-    """
-    Generate the code to execute the code in "code" on an unforgeable holder if
-    needed. code should be a string containing the code to execute. If it
-    contains a ${holder} string parameter it will be replaced with the
-    unforgeable holder object.
-
-    If isXrayCheck is not None it should be a string that contains a statement
-    returning whether proxy is an Xray. If isXrayCheck is None the generated
-    code won't try to unwrap Xrays.
-
-    If useSharedRoot is true, we will use an existing
-    JS::Rooted<JSObject*> sharedRoot for storing our unforgeable holder instead
-    of declaring a new Rooted.
-    """
-    if isXrayCheck is not None:
-        pre = fill(
-            """
-            // Scope for 'global', 'ac' and 'unforgeableHolder'
-            {
-              JS::Rooted<JSObject*> global(cx);
-              Maybe<JSAutoCompartment> ac;
-              if (${isXrayCheck}) {
-                global = js::GetGlobalForObjectCrossCompartment(js::UncheckedUnwrap(proxy));
-                ac.emplace(cx, global);
-              } else {
-                global = js::GetGlobalForObjectCrossCompartment(proxy);
-              }
-            """,
-            isXrayCheck=isXrayCheck)
-    else:
-        pre = dedent("""
-            // Scope for 'global' and 'unforgeableHolder'
-            {
-              JSObject* global = js::GetGlobalForObjectCrossCompartment(proxy);
-            """)
-
-    if useSharedRoot:
-        holderDecl = "JS::Rooted<JSObject*>& unforgeableHolder(sharedRoot);\n"
-    else:
-        holderDecl = "JS::Rooted<JSObject*> unforgeableHolder(cx);\n"
-
-    code = string.Template(code).substitute({"holder": "unforgeableHolder"})
-    return fill(
-        """
-        $*{pre}
-          $*{holderDecl}
-          unforgeableHolder = GetUnforgeableHolder(global, prototypes::id::${name});
-          $*{code}
-        }
-        """,
-        pre=pre,
-        holderDecl=holderDecl,
-        name=descriptor.name,
-        code=code)
+def HasUnforgeableMembers(descriptor):
+    return any(MemberIsUnforgeable(m, descriptor) for m in
+               descriptor.interface.members)
 
 
 def InterfacePrototypeObjectProtoGetter(descriptor):
@@ -631,8 +571,6 @@
     def define(self):
         prototypeID, depth = PrototypeIDAndDepth(self.descriptor)
         slotCount = "DOM_INTERFACE_PROTO_SLOTS_BASE"
-        if UseHolderForUnforgeable(self.descriptor):
-            slotCount += " + 1 /* slot for the JSObject holding the unforgeable properties */"
         (protoGetter, _) = InterfacePrototypeObjectProtoGetter(self.descriptor)
         type = "eGlobalInterfacePrototype" if self.descriptor.isGlobal() else "eInterfacePrototype"
         return fill(
@@ -1958,8 +1896,7 @@
         return "nullptr"
 
     def usedForXrays(self):
-        # No Xrays in workers.
-        return not self.descriptor.workers
+        return self.descriptor.wantsXrays
 
     def __str__(self):
         # We only need to generate id arrays for things that will end
@@ -2619,9 +2556,8 @@
         assert needInterfaceObject or needInterfacePrototypeObject
 
         idsToInit = []
-        # There is no need to init any IDs in workers, because worker bindings
-        # don't have Xrays.
-        if not self.descriptor.workers:
+        # There is no need to init any IDs in bindings that don't want Xrays.
+        if self.descriptor.wantsXrays:
             for var in self.properties.arrayNames():
                 props = getattr(self.properties, var)
                 # We only have non-chrome ids to init if we have no chrome ids.
@@ -2658,22 +2594,6 @@
         else:
             prefCache = None
 
-        if UseHolderForUnforgeable(self.descriptor):
-            createUnforgeableHolder = CGGeneric(dedent("""
-                JS::Rooted<JSObject*> unforgeableHolder(aCx,
-                  JS_NewObjectWithGivenProto(aCx, nullptr, JS::NullPtr(), JS::NullPtr()));
-                if (!unforgeableHolder) {
-                  return;
-                }
-                """))
-            defineUnforgeables = InitUnforgeablePropertiesOnObject(self.descriptor,
-                                                                   "unforgeableHolder",
-                                                                   self.properties)
-            createUnforgeableHolder = CGList(
-                [createUnforgeableHolder, defineUnforgeables])
-        else:
-            createUnforgeableHolder = None
-
         getParentProto = fill(
             """
             JS::${type}<JSObject*> parentProto(${getParentProto});
@@ -2758,22 +2678,9 @@
             chromeProperties=chromeProperties,
             name='"' + self.descriptor.interface.identifier.name + '"' if needInterfaceObject else "nullptr")
 
-        if UseHolderForUnforgeable(self.descriptor):
-            assert needInterfacePrototypeObject
-            setUnforgeableHolder = CGGeneric(fill(
-                """
-                JSObject* proto = aProtoAndIfaceCache.EntrySlotOrCreate(prototypes::id::${name});
-                if (proto) {
-                  js::SetReservedSlot(proto, DOM_INTERFACE_PROTO_SLOTS_BASE,
-                                      JS::ObjectValue(*unforgeableHolder));
-                }
-                """,
-                name=self.descriptor.name))
-        else:
-            setUnforgeableHolder = None
         return CGList(
             [CGGeneric(getParentProto), CGGeneric(getConstructorProto), initIds,
-             prefCache, createUnforgeableHolder, CGGeneric(call), setUnforgeableHolder],
+             prefCache, CGGeneric(call)],
             "\n").define()
 
 
@@ -3053,7 +2960,7 @@
         create = dedent(
             """
             creator.CreateProxyObject(aCx, &Class.mBase, DOMProxyHandler::getInstance(),
-                                      proto, global, aObject, aReflector);
+                                      proto, aObject, aReflector);
             if (!aReflector) {
               return false;
             }
@@ -3068,7 +2975,7 @@
     else:
         create = dedent(
             """
-            creator.CreateObject(aCx, Class.ToJSClass(), proto, global, aObject, aReflector);
+            creator.CreateObject(aCx, Class.ToJSClass(), proto, aObject, aReflector);
             if (!aReflector) {
               return false;
             }
@@ -3076,33 +2983,68 @@
     return objDecl + create
 
 
-def InitUnforgeablePropertiesOnObject(descriptor, obj, properties, failureReturnValue=""):
+def InitUnforgeableProperties(descriptor, properties, wrapperCache):
     """
     properties is a PropertyArrays instance
     """
-    unforgeables = []
+    unforgeableAttrs = properties.unforgeableAttrs
+    if not unforgeableAttrs.hasNonChromeOnly() and not unforgeableAttrs.hasChromeOnly():
+        return ""
+
+    unforgeables = [
+        CGGeneric(dedent(
+            """
+            // Important: do unforgeable property setup after we have handed
+            // over ownership of the C++ object to obj as needed, so that if
+            // we fail and it ends up GCed it won't have problems in the
+            // finalizer trying to drop its ownership of the C++ object.
+            """))
+    ]
 
-    if failureReturnValue:
-        failureReturnValue = " " + failureReturnValue
+    if wrapperCache:
+        cleanup = dedent(
+            """
+            aCache->ReleaseWrapper(aObject);
+            aCache->ClearWrapper();
+            """)
+    else:
+        cleanup = ""
+
+    # For proxies, we want to define on the expando object, not directly on the
+    # reflector, so we can make sure we don't get confused by named getters.
+    if descriptor.proxy:
+        unforgeables.append(CGGeneric(fill(
+            """
+            JS::Rooted<JSObject*> expando(aCx,
+              DOMProxyHandler::EnsureExpandoObject(aCx, aReflector));
+            if (!expando) {
+              $*{cleanup}
+              return false;
+            }
+            """,
+            cleanup=cleanup)))
+        obj = "expando"
     else:
-        failureReturnValue = ""
+        obj = "aReflector"
 
     defineUnforgeableAttrs = fill(
         """
         if (!DefineUnforgeableAttributes(aCx, ${obj}, %s)) {
-          return${rv};
+          $*{cleanup}
+          return false;
         }
         """,
         obj=obj,
-        rv=failureReturnValue)
+        cleanup=cleanup)
     defineUnforgeableMethods = fill(
         """
         if (!DefineUnforgeableMethods(aCx, ${obj}, %s)) {
-          return${rv};
+          $*{cleanup}
+          return false;
         }
         """,
         obj=obj,
-        rv=failureReturnValue)
+        cleanup=cleanup)
 
     unforgeableMembers = [
         (defineUnforgeableAttrs, properties.unforgeableAttrs),
@@ -3123,36 +3065,14 @@
             """
             if (!JS_DefineProperty(aCx, ${obj}, "toJSON", JS::UndefinedHandleValue,
                                    JSPROP_READONLY | JSPROP_ENUMERATE | JSPROP_PERMANENT)) {
-              return${rv};
+              $*{cleanup}
+              return false;
             }
             """,
             obj=obj,
-            rv=failureReturnValue)))
+            cleanup=cleanup)))
 
-    return CGList(unforgeables)
-
-
-def InitUnforgeableProperties(descriptor, properties):
-    """
-    properties is a PropertyArrays instance
-    """
-    unforgeableAttrs = properties.unforgeableAttrs
-    if not unforgeableAttrs.hasNonChromeOnly() and not unforgeableAttrs.hasChromeOnly():
-        return ""
-
-    if descriptor.proxy:
-        unforgeableProperties = CGGeneric(
-            "// Unforgeable properties on proxy-based bindings are stored in an object held\n"
-            "// by the interface prototype object.\n")
-    else:
-        unforgeableProperties = CGWrapper(
-            InitUnforgeablePropertiesOnObject(descriptor, "aReflector", properties, "false"),
-            pre=(
-                "// Important: do unforgeable property setup after we have handed\n"
-                "// over ownership of the C++ object to obj as needed, so that if\n"
-                "// we fail and it ends up GCed it won't have problems in the\n"
-                "// finalizer trying to drop its ownership of the C++ object.\n"))
-    return CGWrapper(unforgeableProperties, pre="\n").define()
+    return CGWrapper(CGList(unforgeables), pre="\n").define()
 
 
 def AssertInheritanceChain(descriptor):
@@ -3181,13 +3101,21 @@
     if not descriptor.interface.hasMembersInSlots():
         return ""
     if wrapperCache:
-        clearWrapper = "  aCache->ClearWrapper();\n"
+        clearWrapper = dedent(
+            """
+            aCache->ReleaseWrapper(aObject);
+            aCache->ClearWrapper();
+            """)
     else:
         clearWrapper = ""
-    return ("if (!UpdateMemberSlots(aCx, aReflector, aObject)) {\n"
-            "%s"
-            "  return false;\n"
-            "}\n" % clearWrapper)
+    return fill(
+        """
+        if (!UpdateMemberSlots(aCx, aReflector, aObject)) {
+          $*{clearWrapper}
+          return false;
+        }
+        """,
+        clearWrapper=clearWrapper)
 
 
 class CGWrapWithCacheMethod(CGAbstractMethod):
@@ -3206,6 +3134,16 @@
         self.properties = properties
 
     def definition_body(self):
+        # For proxies, we have to SetWrapper() before we init unforgeables.  But
+        # for non-proxies we'd rather do it the other way around, so our
+        # unforgeables don't force preservation of the wrapper.
+        setWrapper = "aCache->SetWrapper(aReflector);\n"
+        if self.descriptor.proxy:
+            setWrapperProxy = setWrapper
+            setWrapperNonProxy = ""
+        else:
+            setWrapperProxy = ""
+            setWrapperNonProxy = setWrapper
         return fill(
             """
             $*{assertion}
@@ -3234,16 +3172,18 @@
 
             $*{createObject}
 
+            $*{setWrapperProxy}
             $*{unforgeable}
-
-            aCache->SetWrapper(aReflector);
+            $*{setWrapperNonProxy}
             $*{slots}
             creator.InitializationSucceeded();
             return true;
             """,
             assertion=AssertInheritanceChain(self.descriptor),
             createObject=CreateBindingJSObject(self.descriptor, self.properties),
-            unforgeable=InitUnforgeableProperties(self.descriptor, self.properties),
+            setWrapperProxy=setWrapperProxy,
+            unforgeable=InitUnforgeableProperties(self.descriptor, self.properties, True),
+            setWrapperNonProxy=setWrapperNonProxy,
             slots=InitMemberSlots(self.descriptor, True))
 
 
@@ -3300,7 +3240,7 @@
             """,
             assertions=AssertInheritanceChain(self.descriptor),
             createObject=CreateBindingJSObject(self.descriptor, self.properties),
-            unforgeable=InitUnforgeableProperties(self.descriptor, self.properties),
+            unforgeable=InitUnforgeableProperties(self.descriptor, self.properties, False),
             slots=InitMemberSlots(self.descriptor, False))
 
 
@@ -3377,7 +3317,7 @@
             nativeType=self.descriptor.nativeType,
             properties=properties,
             chromeProperties=chromeProperties,
-            unforgeable=InitUnforgeableProperties(self.descriptor, self.properties),
+            unforgeable=InitUnforgeableProperties(self.descriptor, self.properties, True),
             slots=InitMemberSlots(self.descriptor, True),
             fireOnNewGlobal=fireOnNewGlobal)
 
@@ -4570,13 +4510,15 @@
 
             if tag in numericSuffixes or tag is IDLType.Tags.bool:
                 defaultStr = getHandleDefault(defaultValue)
-                value = declLoc + (".Value()" if nullable else "")
+                # Make sure we actually construct the thing inside the nullable.
+                value = declLoc + (".SetValue()" if nullable else "")
                 name = getUnionMemberName(defaultValue.type)
                 default = CGGeneric("%s.RawSetAs%s() = %s;\n" %
                                     (value, name, defaultStr))
             elif isinstance(defaultValue, IDLEmptySequenceValue):
                 name = getUnionMemberName(defaultValue.type)
-                value = declLoc + (".Value()" if nullable else "")
+                # Make sure we actually construct the thing inside the nullable.
+                value = declLoc + (".SetValue()" if nullable else "")
                 # It's enough to set us to the right type; that will
                 # create an empty array, which is all we need here.
                 default = CGGeneric("%s.RawSetAs%s();\n" %
@@ -4633,10 +4575,7 @@
         descriptor = descriptorProvider.getDescriptor(
             type.unroll().inner.identifier.name)
 
-        if descriptor.nativeType == 'JSObject':
-            # XXXbz Workers code does this sometimes
-            assert descriptor.workers
-            return handleJSObjectType(type, isMember, failureCode, exceptionCode, sourceDescription)
+        assert descriptor.nativeType != 'JSObject'
 
         if descriptor.interface.isCallback():
             name = descriptor.interface.identifier.name
@@ -4713,9 +4652,10 @@
                     exceptionCode,
                     isCallbackReturnValue,
                     firstCap(sourceDescription)))
-        elif descriptor.workers:
-            return handleJSObjectType(type, isMember, failureCode, exceptionCode, sourceDescription)
         else:
+            # Worker descriptors can't end up here, because all of our
+            # "external" stuff is not exposed in workers.
+            assert not descriptor.workers
             # Either external, or new-binding non-castable.  We always have a
             # holder for these, because we don't actually know whether we have
             # to addref when unwrapping or not.  So we just pass an
@@ -8852,7 +8792,7 @@
         dtor = CGSwitch("mType", destructorCases).define()
 
         methods.append(ClassMethod("Uninit", "void", [],
-                                   visibility="private", body=dtor,
+                                   visibility="public", body=dtor,
                                    bodyInHeader=not self.ownsMembers,
                                    inline=not self.ownsMembers))
 
@@ -10079,31 +10019,6 @@
         else:
             getIndexed = ""
 
-        if UseHolderForUnforgeable(self.descriptor):
-            tryHolder = dedent("""
-                if (!JS_GetPropertyDescriptorById(cx, ${holder}, id, desc)) {
-                  return false;
-                }
-                MOZ_ASSERT_IF(desc.object(), desc.object() == ${holder});
-                """)
-
-            # We don't want to look at the unforgeable holder at all
-            # in the xray case; that part got handled already.
-            getUnforgeable = fill(
-                """
-                if (!isXray) {
-                  $*{callOnUnforgeable}
-                  if (desc.object()) {
-                    desc.object().set(proxy);
-                    return true;
-                  }
-                }
-
-                """,
-                callOnUnforgeable=CallOnUnforgeableHolder(self.descriptor, tryHolder))
-        else:
-            getUnforgeable = ""
-
         if self.descriptor.supportsNamedProperties():
             operations = self.descriptor.operations
             readonly = toStringBool(operations['NamedSetter'] is None)
@@ -10160,7 +10075,6 @@
             """
             bool isXray = xpc::WrapperFactory::IsXrayWrapper(proxy);
             $*{getIndexed}
-            $*{getUnforgeable}
             JS::Rooted<JSObject*> expando(cx);
             if (!isXray && (expando = GetExpandoObject(proxy))) {
               if (!JS_GetPropertyDescriptorById(cx, expando, id, desc)) {
@@ -10178,7 +10092,6 @@
             return true;
             """,
             getIndexed=getIndexed,
-            getUnforgeable=getUnforgeable,
             namedGet=namedGet)
 
 
@@ -10223,25 +10136,12 @@
                 """,
                 name=self.descriptor.name)
 
-        if UseHolderForUnforgeable(self.descriptor):
-            # It's OK to do the defineOnUnforgeable thing even in the Xray case,
-            # since in practice it won't let us change anything; we just want
-            # the js_DefineOwnProperty call for error reporting purposes.
-            defineOnUnforgeable = ("bool hasUnforgeable;\n"
-                                   "if (!JS_HasPropertyById(cx, ${holder}, id, &hasUnforgeable)) {\n"
-                                   "  return false;\n"
-                                   "}\n"
-                                   "if (hasUnforgeable) {\n"
-                                   "  *defined = true;\n"
-                                   "  bool unused;\n"
-                                   "  return js_DefineOwnProperty(cx, ${holder}, id, desc, &unused);\n"
-                                   "}\n")
-            set += CallOnUnforgeableHolder(self.descriptor,
-                                           defineOnUnforgeable,
-                                           "xpc::WrapperFactory::IsXrayWrapper(proxy)")
-
         namedSetter = self.descriptor.operations['NamedSetter']
         if namedSetter:
+            if HasUnforgeableMembers(self.descriptor):
+                raise TypeError("Can't handle a named setter on an interface "
+                                "that has unforgeables.  Figure out how that "
+                                "should work!")
             if self.descriptor.operations['NamedCreator'] is not namedSetter:
                 raise TypeError("Can't handle creator that's different from the setter")
             # If we support indexed properties, we won't get down here for
@@ -10295,6 +10195,10 @@
             assert type in ("Named", "Indexed")
             deleter = self.descriptor.operations[type + 'Deleter']
             if deleter:
+                if HasUnforgeableMembers(self.descriptor):
+                    raise TypeError("Can't handle a deleter on an interface "
+                                    "that has unforgeables.  Figure out how "
+                                    "that should work!")
                 decls = ""
                 if (not deleter.signatures()[0][0].isPrimitive() or
                     deleter.signatures()[0][0].nullable() or
@@ -10356,20 +10260,6 @@
                 """,
                 indexedBody=indexedBody)
 
-        if UseHolderForUnforgeable(self.descriptor):
-            unforgeable = dedent("""
-                bool hasUnforgeable;
-                if (!JS_HasPropertyById(cx, ${holder}, id, &hasUnforgeable)) {
-                  return false;
-                }
-                if (hasUnforgeable) {
-                  *bp = false;
-                  return true;
-                }
-                """)
-            delete += CallOnUnforgeableHolder(self.descriptor, unforgeable)
-            delete += "\n"
-
         namedBody = getDeleterBody("Named", foundVar="found")
         if namedBody is not None:
             # We always return above for an index id in the case when we support
@@ -10430,18 +10320,6 @@
         else:
             addIndices = ""
 
-        if UseHolderForUnforgeable(self.descriptor):
-            addUnforgeable = dedent("""
-                if (!js::GetPropertyKeys(cx, ${holder}, flags, &props)) {
-                  return false;
-                }
-                """)
-            addUnforgeable = CallOnUnforgeableHolder(self.descriptor,
-                                                     addUnforgeable,
-                                                     "isXray")
-        else:
-            addUnforgeable = ""
-
         if self.descriptor.supportsNamedProperties():
             if self.descriptor.interface.getExtendedAttribute('OverrideBuiltins'):
                 shadow = "!isXray"
@@ -10464,7 +10342,6 @@
             """
             bool isXray = xpc::WrapperFactory::IsXrayWrapper(proxy);
             $*{addIndices}
-            $*{addUnforgeable}
             $*{addNames}
 
             JS::Rooted<JSObject*> expando(cx);
@@ -10476,7 +10353,6 @@
             return true;
             """,
             addIndices=addIndices,
-            addUnforgeable=addUnforgeable,
             addNames=addNames)
 
 
@@ -10508,19 +10384,6 @@
         else:
             indexed = ""
 
-        if UseHolderForUnforgeable(self.descriptor):
-            unforgeable = dedent("""
-                bool b = true;
-                bool ok = JS_AlreadyHasOwnPropertyById(cx, ${holder}, id, &b);
-                *bp = !!b;
-                if (!ok || *bp) {
-                  return ok;
-                }
-                """)
-            unforgeable = CallOnUnforgeableHolder(self.descriptor, unforgeable)
-        else:
-            unforgeable = ""
-
         if self.descriptor.supportsNamedProperties():
             # If we support indexed properties we always return above for index
             # property names, so no need to check for those here.
@@ -10556,7 +10419,6 @@
                       "Should not have a XrayWrapper here");
 
             $*{indexed}
-            $*{unforgeable}
 
             JS::Rooted<JSObject*> expando(cx, GetExpandoObject(proxy));
             if (expando) {
@@ -10572,7 +10434,6 @@
             return true;
             """,
             indexed=indexed,
-            unforgeable=unforgeable,
             named=named)
 
 
@@ -10588,24 +10449,9 @@
         self.descriptor = descriptor
 
     def getBody(self):
-        getUnforgeableOrExpando = "JS::Rooted<JSObject*> sharedRoot(cx);\n"
-        if UseHolderForUnforgeable(self.descriptor):
-            hasUnforgeable = dedent("""
-                bool hasUnforgeable;
-                if (!JS_AlreadyHasOwnPropertyById(cx, ${holder}, id, &hasUnforgeable)) {
-                  return false;
-                }
-                if (hasUnforgeable) {
-                  return JS_ForwardGetPropertyTo(cx, ${holder}, id, proxy, vp);
-                }
-                """)
-            getUnforgeableOrExpando += CallOnUnforgeableHolder(self.descriptor,
-                                                               hasUnforgeable,
-                                                               useSharedRoot=True)
-        getUnforgeableOrExpando += dedent("""
+        getUnforgeableOrExpando = dedent("""
             { // Scope for expando
-              JS::Rooted<JSObject*>& expando(sharedRoot);
-              expando = DOMProxyHandler::GetExpandoObject(proxy);
+              JS::Rooted<JSObject*> expando(cx, DOMProxyHandler::GetExpandoObject(proxy));
               if (expando) {
                 bool hasProp;
                 if (!JS_HasPropertyById(cx, expando, id, &hasProp)) {
@@ -10705,7 +10551,7 @@
             if self.descriptor.operations['NamedCreator'] is not namedSetter:
                 raise ValueError("In interface " + self.descriptor.name + ": " +
                                  "Can't cope with named setter that is not also a named creator")
-            if UseHolderForUnforgeable(self.descriptor):
+            if HasUnforgeableMembers(self.descriptor):
                 raise ValueError("In interface " + self.descriptor.name + ": " +
                                  "Can't cope with [OverrideBuiltins] and unforgeable members")
 
@@ -10775,7 +10621,8 @@
         self.descriptor = descriptor
 
     def getBody(self):
-        return ("%s* self = UnwrapProxy(proxy);\n\n" % self.descriptor.nativeType +
+        return (("%s* self = UnwrapPossiblyNotInitializedDOMObject<%s>(proxy);\n" %
+                 (self.descriptor.nativeType, self.descriptor.nativeType)) +
                 finalizeHook(self.descriptor, FINALIZE_HOOK_NAME, self.args[0].name).define())
 
 
@@ -11165,14 +11012,14 @@
         cgThings.append(CGGeneric(define=str(properties)))
         cgThings.append(CGNativeProperties(descriptor, properties))
 
-        # Set up our Xray callbacks as needed.  Note that we don't need to do
-        # it in workers.
-        if not descriptor.workers and descriptor.concrete and descriptor.proxy:
-            cgThings.append(CGResolveOwnProperty(descriptor))
-            cgThings.append(CGEnumerateOwnProperties(descriptor))
-        elif descriptor.needsXrayResolveHooks():
-            cgThings.append(CGResolveOwnPropertyViaResolve(descriptor))
-            cgThings.append(CGEnumerateOwnPropertiesViaGetOwnPropertyNames(descriptor))
+        # Set up our Xray callbacks as needed.
+        if descriptor.wantsXrays:
+            if descriptor.concrete and descriptor.proxy:
+                cgThings.append(CGResolveOwnProperty(descriptor))
+                cgThings.append(CGEnumerateOwnProperties(descriptor))
+            elif descriptor.needsXrayResolveHooks():
+                cgThings.append(CGResolveOwnPropertyViaResolve(descriptor))
+                cgThings.append(CGEnumerateOwnPropertiesViaGetOwnPropertyNames(descriptor))
 
         # Now that we have our ResolveOwnProperty/EnumerateOwnProperties stuff
         # done, set up our NativePropertyHooks.
@@ -11605,16 +11452,28 @@
                                visibility="public",
                                body=self.getMemberInitializer(m))
                    for m in self.memberInfo]
+        if d.parent:
+            # We always want to init our parent with our non-initializing
+            # constructor arg, because either we're about to init ourselves (and
+            # hence our parent) or we don't want any init happening.
+            baseConstructors = [
+                "%s(%s)" % (self.makeClassName(d.parent),
+                            self.getNonInitializingCtorArg())
+            ]
+        else:
+            baseConstructors = None
         ctors = [
             ClassConstructor(
                 [],
                 visibility="public",
+                baseConstructors=baseConstructors,
                 body=(
                     "// Safe to pass a null context if we pass a null value\n"
                     "Init(nullptr, JS::NullHandleValue);\n")),
             ClassConstructor(
-                [Argument("int", "")],
-                visibility="protected",
+                [Argument("const FastDictionaryInitializer&", "")],
+                visibility="public",
+                baseConstructors=baseConstructors,
                 explicit=True,
                 bodyInHeader=True,
                 body='// Do nothing here; this is used by our "Fast" subclass\n')
@@ -11663,7 +11522,9 @@
             [],
             visibility="public",
             bodyInHeader=True,
-            baseConstructors=["%s(42)" % selfName],
+            baseConstructors=["%s(%s)" %
+                              (selfName,
+                               self.getNonInitializingCtorArg())],
             body="// Doesn't matter what int we pass to the parent constructor\n")
 
         fastStruct = CGClass("Fast" + selfName,
@@ -11729,6 +11590,23 @@
                       "  return false;\n"
                       "}\n")
         if member.defaultValue:
+            if (member.type.isUnion() and
+                (not member.type.nullable() or
+                 not isinstance(member.defaultValue, IDLNullValue))):
+                # Since this has a default value, it might have been initialized
+                # already.  Go ahead and uninit it before we try to init it
+                # again.
+                memberName = self.makeMemberName(member.identifier.name)
+                if member.type.nullable():
+                    conversion += fill(
+                        """
+                        if (!${memberName}.IsNull()) {
+                          ${memberName}.Value().Uninit();
+                        }
+                        """,
+                        memberName=memberName)
+                else:
+                    conversion += "%s.Uninit();\n" % memberName
             conversion += "${convert}"
         elif not conversionInfo.dealWithOptional:
             # We're required, but have no default value.  Make sure
@@ -11889,6 +11767,12 @@
             return "JS::UndefinedValue()"
         if type.isObject():
             return "nullptr"
+        if type.isDictionary():
+            # When we construct ourselves, we don't want to init our member
+            # dictionaries.  Either we're being constructed-but-not-initialized
+            # ourselves (and then we don't want to init them) or we're about to
+            # init ourselves and then we'll init them anyway.
+            return CGDictionary.getNonInitializingCtorArg();
         return None
 
     def getMemberSourceDescription(self, member):
@@ -11900,6 +11784,10 @@
         return IDLToCIdentifier(name) + "_id"
 
     @staticmethod
+    def getNonInitializingCtorArg():
+        return "FastDictionaryInitializer()"
+
+    @staticmethod
     def isDictionaryCopyConstructible(dictionary):
         if (dictionary.parent and
             not CGDictionary.isDictionaryCopyConstructible(dictionary.parent)):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Configuration.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Configuration.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Configuration.py	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Configuration.py	2015-02-28 15:03:05.000000000 +0000
@@ -302,13 +302,17 @@
         DescriptorProvider.__init__(self, config, desc.get('workers', False))
         self.interface = interface
 
+        if self.workers:
+            assert 'wantsXrays' not in desc
+            self.wantsXrays = False
+        else:
+            self.wantsXrays = desc.get('wantsXrays', True)
+
         # Read the desc, and fill in the relevant defaults.
         ifaceName = self.interface.identifier.name
         if self.interface.isExternal():
-            if self.workers:
-                nativeTypeDefault = "JSObject"
-            else:
-                nativeTypeDefault = "nsIDOM" + ifaceName
+            assert not self.workers
+            nativeTypeDefault = "nsIDOM" + ifaceName
         elif self.interface.isCallback():
             nativeTypeDefault = "mozilla::dom::" + ifaceName
         else:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/DOMJSProxyHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/DOMJSProxyHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/DOMJSProxyHandler.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/DOMJSProxyHandler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -33,17 +33,22 @@
 js::DOMProxyShadowsResult
 DOMProxyShadows(JSContext* cx, JS::Handle<JSObject*> proxy, JS::Handle<jsid> id)
 {
+  JS::Rooted<JSObject*> expando(cx, DOMProxyHandler::GetExpandoObject(proxy));
   JS::Value v = js::GetProxyExtra(proxy, JSPROXYSLOT_EXPANDO);
-  if (v.isObject()) {
+  bool isOverrideBuiltins = !v.isObject() && !v.isUndefined();
+  if (expando) {
     bool hasOwn;
-    Rooted<JSObject*> object(cx, &v.toObject());
-    if (!JS_AlreadyHasOwnPropertyById(cx, object, id, &hasOwn))
+    if (!JS_AlreadyHasOwnPropertyById(cx, expando, id, &hasOwn))
       return js::ShadowCheckFailed;
 
-    return hasOwn ? js::Shadows : js::DoesntShadow;
+    if (hasOwn) {
+      return isOverrideBuiltins ?
+        js::ShadowsViaIndirectExpando : js::ShadowsViaDirectExpando;
+    }
   }
 
-  if (v.isUndefined()) {
+  if (!isOverrideBuiltins) {
+    // Our expando, if any, didn't shadow, so we're not shadowing at all.
     return js::DoesntShadow;
   }
 
@@ -197,7 +202,7 @@
     return JS_ReportErrorFlagsAndNumber(cx,
                                         JSREPORT_WARNING | JSREPORT_STRICT |
                                         JSREPORT_STRICT_MODE_ERROR,
-                                        js_GetErrorMessage, nullptr,
+                                        js::GetErrorMessage, nullptr,
                                         JSMSG_GETTER_ONLY);
   }
 
@@ -211,7 +216,7 @@
   }
 
   bool dummy;
-  return js_DefineOwnProperty(cx, expando, id, desc, &dummy);
+  return js::DefineOwnProperty(cx, expando, id, desc, &dummy);
 }
 
 bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/ErrorResult.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/ErrorResult.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/ErrorResult.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/ErrorResult.h	2015-02-28 15:03:05.000000000 +0000
@@ -97,6 +97,14 @@
                                 const char* memberName);
   bool IsNotEnoughArgsError() const { return ErrorCode() == NS_ERROR_XPC_NOT_ENOUGH_ARGS; }
 
+  // Support for uncatchable exceptions.
+  void ThrowUncatchableException() {
+    Throw(NS_ERROR_UNCATCHABLE_EXCEPTION);
+  }
+  bool IsUncatchableException() const {
+    return ErrorCode() == NS_ERROR_UNCATCHABLE_EXCEPTION;
+  }
+
   // StealJSException steals the JS Exception from the object. This method must
   // be called only if IsJSException() returns true. This method also resets the
   // ErrorCode() to NS_OK.  The value will be ensured to be sanitized wrt to the
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Errors.msg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Errors.msg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Errors.msg	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Errors.msg	2015-02-28 15:03:05.000000000 +0000
@@ -62,7 +62,7 @@
 MSG_DEF(MSG_PERMISSION_DENIED_TO_PASS_ARG, 1, JSEXN_TYPEERR, "Permission denied to pass cross-origin object as {0}.")
 MSG_DEF(MSG_MISSING_REQUIRED_DICTIONARY_MEMBER, 1, JSEXN_TYPEERR, "Missing required {0}.")
 MSG_DEF(MSG_INVALID_REQUEST_METHOD, 1, JSEXN_TYPEERR, "Invalid request method {0}.")
-MSG_DEF(MSG_REQUEST_BODY_CONSUMED_ERROR, 0, JSEXN_TYPEERR, "Request body has already been consumed.")
+MSG_DEF(MSG_FETCH_BODY_CONSUMED_ERROR, 0, JSEXN_TYPEERR, "Body has already been consumed.")
 MSG_DEF(MSG_RESPONSE_INVALID_STATUSTEXT_ERROR, 0, JSEXN_TYPEERR, "Response statusText may not contain newline or carriage return.")
 MSG_DEF(MSG_FETCH_FAILED, 0, JSEXN_TYPEERR, "NetworkError when attempting to fetch resource.")
 MSG_DEF(MSG_NO_BODY_ALLOWED_FOR_GET_AND_HEAD, 0, JSEXN_TYPEERR, "HEAD or GET Request cannot have a body.")
@@ -71,3 +71,4 @@
 MSG_DEF(MSG_INVALID_TRANSFORM_ANGLE_ERROR, 0, JSEXN_RANGEERR, "Invalid transform angle.")
 MSG_DEF(MSG_INVALID_RESPONSE_STATUSCODE_ERROR, 0, JSEXN_RANGEERR, "Invalid response status code.")
 MSG_DEF(MSG_INVALID_REDIRECT_STATUSCODE_ERROR, 0, JSEXN_RANGEERR, "Invalid redirect status code.")
+MSG_DEF(MSG_RESPONSE_URL_IS_NULL, 0, JSEXN_TYPEERR, "Cannot set Response.finalURL when Response.url is null.")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Exceptions.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Exceptions.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/Exceptions.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/Exceptions.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -88,6 +88,12 @@
 bool
 Throw(JSContext* aCx, nsresult aRv, const char* aMessage)
 {
+  if (aRv == NS_ERROR_UNCATCHABLE_EXCEPTION) {
+    // Nuke any existing exception on aCx, to make sure we're uncatchable.
+    JS_ClearPendingException(aCx);
+    return false;
+  }
+
   if (JS_IsExceptionPending(aCx)) {
     // Don't clobber the existing exception.
     return false;
@@ -128,6 +134,8 @@
 void
 ThrowAndReport(nsPIDOMWindow* aWindow, nsresult aRv, const char* aMessage)
 {
+  MOZ_ASSERT(aRv != NS_ERROR_UNCATCHABLE_EXCEPTION,
+             "Doesn't make sense to report uncatchable exceptions!");
   AutoJSAPI jsapi;
   if (NS_WARN_IF(!jsapi.InitWithLegacyErrorReporting(aWindow))) {
     return;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/JSSlots.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/JSSlots.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/JSSlots.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/JSSlots.h	2015-02-28 15:03:05.000000000 +0000
@@ -26,8 +26,7 @@
 #define DOM_INTERFACE_SLOTS_BASE 0
 
 // Interface prototype objects store a number of reserved slots equal to
-// DOM_INTERFACE_PROTO_SLOTS_BASE or DOM_INTERFACE_PROTO_SLOTS_BASE + 1 if a
-// slot for the unforgeable holder is needed.
+// DOM_INTERFACE_PROTO_SLOTS_BASE.
 #define DOM_INTERFACE_PROTO_SLOTS_BASE 0
 
 #endif /* mozilla_dom_DOMSlots_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/mochitest.ini	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/mochitest.ini	2015-02-28 15:03:05.000000000 +0000
@@ -58,3 +58,5 @@
 [test_promise_rejections_from_jsimplemented.html]
 skip-if = debug == false
 [test_worker_UnwrapArg.html]
+[test_unforgeablesonexpando.html]
+[test_crossOriginWindowSymbolAccess.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/TestCodeGen.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/TestCodeGen.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/TestCodeGen.webidl	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/TestCodeGen.webidl	2015-02-28 15:03:05.000000000 +0000
@@ -960,6 +960,7 @@
   unrestricted double  nanUrDouble = NaN;
 
   (float or DOMString) floatOrString = "str";
+  (float or DOMString)? nullableFloatOrString = "str";
   (object or long) objectOrLong;
 #ifdef DEBUG
   (EventInit or long) eventInitOrLong;
@@ -972,7 +973,16 @@
   (CustomEventInit or long) eventInitOrLongWithDefaultValue2 = null;
   (EventInit or long) eventInitOrLongWithDefaultValue3 = 5;
   (CustomEventInit or long) eventInitOrLongWithDefaultValue4 = 5;
+  (EventInit or long)? nullableEventInitOrLongWithDefaultValue = null;
+  (CustomEventInit or long)? nullableEventInitOrLongWithDefaultValue2 = null;
+  (EventInit or long)? nullableEventInitOrLongWithDefaultValue3 = 5;
+  (CustomEventInit or long)? nullableEventInitOrLongWithDefaultValue4 = 5;
   (sequence<object> or long) objectSequenceOrLong;
+  (sequence<object> or long) objectSequenceOrLongWithDefaultValue1 = 1;
+  (sequence<object> or long) objectSequenceOrLongWithDefaultValue2 = [];
+  (sequence<object> or long)? nullableObjectSequenceOrLong;
+  (sequence<object> or long)? nullableObjectSequenceOrLongWithDefaultValue1 = 1;
+  (sequence<object> or long)? nullableObjectSequenceOrLongWithDefaultValue2 = [];
 #endif
 
   ArrayBuffer arrayBuffer;
@@ -990,6 +1000,8 @@
 
   required long requiredLong;
   required object requiredObject;
+
+  CustomEventInit customEventInit;
 };
 
 dictionary ParentDict : GrandparentDict {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/test_crossOriginWindowSymbolAccess.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/test_crossOriginWindowSymbolAccess.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/test_crossOriginWindowSymbolAccess.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/test_crossOriginWindowSymbolAccess.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for accessing symbols on a cross-origin window</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<iframe src="http://www1.w3c-test.org/common/blank.html"></iframe>
+<script>
+async_test(function (t) {
+  window.addEventListener("load", t.step_func(
+    function() {
+      assert_equals(document.querySelector("iframe").contentDocument, null, "Should have a crossorigin frame");
+      assert_throws(new Error(), function() {
+        frames[0][Symbol.iterator];
+      }, "Should throw exception on cross-origin Window symbol-named get");
+      assert_throws(new Error(), function() {
+        frames[0].location[Symbol.iterator];
+      }, "Should throw exception on cross-origin Location symbol-named get");
+      t.done();
+    }
+  ));
+}, "Check Symbol access on load");
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/test_unforgeablesonexpando.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/test_unforgeablesonexpando.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/test/test_unforgeablesonexpando.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/test/test_unforgeablesonexpando.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for making sure named getters don't override the unforgeable location on HTMLDocument</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<img name="location">
+<script>
+test(function() {
+  assert_equals(document.location, window.location,
+                'The <img name="location"> should not override the location getter');
+}, "document.location is the right thing");
+test(function() {
+  var doc = new DOMParser().parseFromString("<img name='location'>", "text/html");
+  assert_equals(doc.location, null,
+                'The <img name="location"> should not override the location getter on a data document');
+}, "document.location is the right thing on non-rendered document");
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/ToJSValue.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/ToJSValue.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bindings/ToJSValue.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bindings/ToJSValue.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -66,6 +66,8 @@
           JS::MutableHandle<JS::Value> aValue)
 {
   MOZ_ASSERT(aArgument.Failed());
+  MOZ_ASSERT(!aArgument.IsUncatchableException(),
+             "Doesn't make sense to convert uncatchable exception to a JS value!");
   AutoForceSetExceptionOnContext forceExn(aCx);
   DebugOnly<bool> throwResult = ThrowMethodFailedWithDetails(aCx, aArgument, "", "");
   MOZ_ASSERT(!throwResult);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -335,6 +335,9 @@
   {
     BT_WARNING("BluetoothAvrcpInterface::Cleanup failed: %d",
                (int)aStatus);
+
+    sBtAvrcpInterface = nullptr;
+
     if (mRes) {
       if (aStatus == STATUS_UNSUPPORTED) {
         /* Not all versions of Bluedroid support AVRCP. So if the
@@ -371,6 +374,9 @@
   {
     BT_WARNING("BluetoothA2dpInterface::Cleanup failed: %d",
                (int)aStatus);
+
+    sBtA2dpInterface = nullptr;
+
     if (mRes) {
       mRes->OnError(NS_ERROR_FAILURE);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -395,7 +395,7 @@
   nsresult rv = mModule->RegisterModule(BluetoothDaemonA2dpModule::SERVICE_ID,
     0x00, BluetoothDaemonA2dpModule::MAX_NUM_CLIENTS, res);
   if (NS_FAILED(rv) && aRes) {
-    DispatchError(aRes, STATUS_FAIL);
+    DispatchError(aRes, rv);
   }
 }
 
@@ -443,8 +443,12 @@
 BluetoothDaemonA2dpInterface::Cleanup(
   BluetoothA2dpResultHandler* aRes)
 {
-  mModule->UnregisterModule(BluetoothDaemonA2dpModule::SERVICE_ID,
-                            new CleanupResultHandler(mModule, aRes));
+  nsresult rv = mModule->UnregisterModule(
+    BluetoothDaemonA2dpModule::SERVICE_ID,
+    new CleanupResultHandler(mModule, aRes));
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Connect / Disconnect */
@@ -455,7 +459,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ConnectCmd(aBdAddr, aRes);
+  nsresult rv = mModule->ConnectCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -464,7 +471,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->DisconnectCmd(aBdAddr, aRes);
+  nsresult rv = mModule->DisconnectCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -477,4 +487,16 @@
     ConstantInitOp1<BluetoothStatus>(aStatus));
 }
 
+void
+BluetoothDaemonA2dpInterface::DispatchError(
+  BluetoothA2dpResultHandler* aRes, nsresult aRv)
+{
+  BluetoothStatus status;
+
+  if (NS_WARN_IF(NS_FAILED(Convert(aRv, status)))) {
+    status = STATUS_FAIL;
+  }
+  DispatchError(aRes, status);
+}
+
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h	2015-02-28 15:03:05.000000000 +0000
@@ -155,6 +155,7 @@
 private:
   void DispatchError(BluetoothA2dpResultHandler* aRes,
                      BluetoothStatus aStatus);
+  void DispatchError(BluetoothA2dpResultHandler* aRes, nsresult aRv);
 
   BluetoothDaemonA2dpModule* mModule;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -893,7 +893,7 @@
     BluetoothDaemonAvrcpModule::MAX_NUM_CLIENTS, 0x00, res);
 
   if (NS_FAILED(rv) && aRes) {
-    DispatchError(aRes, STATUS_FAIL);
+    DispatchError(aRes, rv);
   }
 }
 
@@ -943,8 +943,12 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->UnregisterModule(BluetoothDaemonAvrcpModule::SERVICE_ID,
-                            new CleanupResultHandler(mModule, aRes));
+  nsresult rv = mModule->UnregisterModule(
+    BluetoothDaemonAvrcpModule::SERVICE_ID,
+    new CleanupResultHandler(mModule, aRes));
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -954,7 +958,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->GetPlayStatusRspCmd(aPlayStatus, aSongLen, aSongPos, aRes);
+  nsresult rv = mModule->GetPlayStatusRspCmd(aPlayStatus, aSongLen,
+                                             aSongPos, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -964,7 +972,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ListPlayerAppAttrRspCmd(aNumAttr, aPAttrs, aRes);
+  nsresult rv = mModule->ListPlayerAppAttrRspCmd(aNumAttr, aPAttrs, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -973,7 +984,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ListPlayerAppValueRspCmd(aNumVal, aPVals, aRes);
+  nsresult rv = mModule->ListPlayerAppValueRspCmd(aNumVal, aPVals, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -983,7 +997,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->GetPlayerAppValueRspCmd(aNumAttrs, aIds, aValues, aRes);
+  nsresult rv = mModule->GetPlayerAppValueRspCmd(aNumAttrs, aIds,
+                                                 aValues, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -993,7 +1011,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->GetPlayerAppAttrTextRspCmd(aNumAttr, aIds, aTexts, aRes);
+  nsresult rv = mModule->GetPlayerAppAttrTextRspCmd(aNumAttr, aIds,
+                                                    aTexts, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1003,7 +1025,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->GetPlayerAppValueTextRspCmd(aNumVal, aIds, aTexts, aRes);
+  nsresult rv = mModule->GetPlayerAppValueTextRspCmd(aNumVal, aIds,
+                                                     aTexts, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1013,7 +1039,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->GetElementAttrRspCmd(aNumAttr, aAttr, aRes);
+  nsresult rv = mModule->GetElementAttrRspCmd(aNumAttr, aAttr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1022,7 +1051,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->SetPlayerAppValueRspCmd(aRspStatus, aRes);
+  nsresult rv = mModule->SetPlayerAppValueRspCmd(aRspStatus, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1034,7 +1066,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->RegisterNotificationRspCmd(aEvent, aType, aParam, aRes);
+  nsresult rv = mModule->RegisterNotificationRspCmd(aEvent, aType,
+                                                    aParam, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1043,7 +1079,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->SetVolumeCmd(aVolume, aRes);
+  nsresult rv = mModule->SetVolumeCmd(aVolume, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1056,4 +1095,16 @@
     ConstantInitOp1<BluetoothStatus>(aStatus));
 }
 
+void
+BluetoothDaemonAvrcpInterface::DispatchError(
+  BluetoothAvrcpResultHandler* aRes, nsresult aRv)
+{
+  BluetoothStatus status;
+
+  if (NS_WARN_IF(NS_FAILED(Convert(aRv, status)))) {
+    status = STATUS_FAIL;
+  }
+  DispatchError(aRes, status);
+}
+
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h	2015-02-28 15:03:05.000000000 +0000
@@ -346,6 +346,7 @@
 private:
   void DispatchError(BluetoothAvrcpResultHandler* aRes,
                      BluetoothStatus aStatus);
+  void DispatchError(BluetoothAvrcpResultHandler* aRes, nsresult aRv);
 
   BluetoothDaemonAvrcpModule* mModule;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1512,7 +1512,7 @@
     aMaxNumClients, res);
 
   if (NS_FAILED(rv) && aRes) {
-    DispatchError(aRes, STATUS_FAIL);
+    DispatchError(aRes, rv);
   }
 }
 
@@ -1532,6 +1532,7 @@
   {
     MOZ_ASSERT(NS_IsMainThread());
 
+    BT_LOGR("%s:%d", __func__, __LINE__);
     if (mRes) {
       mRes->OnError(aStatus);
     }
@@ -1541,6 +1542,7 @@
   {
     MOZ_ASSERT(NS_IsMainThread());
 
+    BT_LOGR("%s:%d", __func__, __LINE__);
     // Clear notification handler _after_ module has been
     // unregistered. While unregistering the module, we might
     // still receive notifications.
@@ -1560,8 +1562,14 @@
 BluetoothDaemonHandsfreeInterface::Cleanup(
   BluetoothHandsfreeResultHandler* aRes)
 {
-  mModule->UnregisterModule(BluetoothDaemonHandsfreeModule::SERVICE_ID,
-                            new CleanupResultHandler(mModule, aRes));
+  BT_LOGR("%s:%d", __func__, __LINE__);
+  nsresult rv = mModule->UnregisterModule(
+    BluetoothDaemonHandsfreeModule::SERVICE_ID,
+    new CleanupResultHandler(mModule, aRes));
+  BT_LOGR("%s:%d", __func__, __LINE__);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Connect / Disconnect */
@@ -1572,7 +1580,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ConnectCmd(aBdAddr, aRes);
+  nsresult rv = mModule->ConnectCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1581,7 +1592,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->DisconnectCmd(aBdAddr, aRes);
+  nsresult rv = mModule->DisconnectCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1590,7 +1604,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ConnectAudioCmd(aBdAddr, aRes);
+  nsresult rv = mModule->ConnectAudioCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1599,7 +1616,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->DisconnectAudioCmd(aBdAddr, aRes);
+  nsresult rv = mModule->DisconnectAudioCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Voice Recognition */
@@ -1610,7 +1630,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->StartVoiceRecognitionCmd(aBdAddr, aRes);
+  nsresult rv = mModule->StartVoiceRecognitionCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1619,7 +1642,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->StopVoiceRecognitionCmd(aBdAddr, aRes);
+  nsresult rv = mModule->StopVoiceRecognitionCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Volume */
@@ -1631,7 +1657,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->VolumeControlCmd(aType, aVolume, aBdAddr, aRes);
+  nsresult rv = mModule->VolumeControlCmd(aType, aVolume, aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Device status */
@@ -1644,8 +1673,12 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->DeviceStatusNotificationCmd(aNtkState, aSvcType, aSignal,
-                                       aBattChg, aRes);
+  nsresult rv = mModule->DeviceStatusNotificationCmd(aNtkState, aSvcType,
+                                                     aSignal, aBattChg,
+                                                     aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Responses */
@@ -1657,7 +1690,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->CopsResponseCmd(aCops, aBdAddr, aRes);
+  nsresult rv = mModule->CopsResponseCmd(aCops, aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1669,8 +1705,12 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->CindResponseCmd(aSvc, aNumActive, aNumHeld, aCallSetupState,
-                           aSignal, aRoam, aBattChg, aBdAddr, aRes);
+  nsresult rv = mModule->CindResponseCmd(aSvc, aNumActive, aNumHeld,
+                                         aCallSetupState, aSignal,
+                                         aRoam, aBattChg, aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1680,7 +1720,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->FormattedAtResponseCmd(aRsp, aBdAddr, aRes);
+  nsresult rv = mModule->FormattedAtResponseCmd(aRsp, aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1690,7 +1733,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->AtResponseCmd(aResponseCode, aErrorCode, aBdAddr, aRes);
+  nsresult rv = mModule->AtResponseCmd(aResponseCode, aErrorCode,
+                                       aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1706,8 +1753,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ClccResponseCmd(aIndex, aDir, aState, aMode, aMpty, aNumber,
-                           aType, aBdAddr, aRes);
+  nsresult rv = mModule->ClccResponseCmd(aIndex, aDir, aState, aMode, aMpty,
+                                         aNumber, aType, aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Phone State */
@@ -1722,8 +1772,12 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->PhoneStateChangeCmd(aNumActive, aNumHeld, aCallSetupState, aNumber,
-                               aType, aRes);
+  nsresult rv = mModule->PhoneStateChangeCmd(aNumActive, aNumHeld,
+                                             aCallSetupState, aNumber,
+                                             aType, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Wide Band Speech */
@@ -1735,7 +1789,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ConfigureWbsCmd(aBdAddr, aConfig, aRes);
+  nsresult rv = mModule->ConfigureWbsCmd(aBdAddr, aConfig, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -1748,4 +1805,16 @@
     ConstantInitOp1<BluetoothStatus>(aStatus));
 }
 
+void
+BluetoothDaemonHandsfreeInterface::DispatchError(
+  BluetoothHandsfreeResultHandler* aRes, nsresult aRv)
+{
+  BluetoothStatus status;
+
+  if (NS_WARN_IF(NS_FAILED(Convert(aRv, status)))) {
+    status = STATUS_FAIL;
+  }
+  DispatchError(aRes, status);
+}
+
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h	2015-02-28 15:03:05.000000000 +0000
@@ -472,6 +472,7 @@
 private:
   void DispatchError(BluetoothHandsfreeResultHandler* aRes,
                      BluetoothStatus aStatus);
+  void DispatchError(BluetoothHandsfreeResultHandler* aRes, nsresult aRv);
 
   BluetoothDaemonHandsfreeModule* mModule;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1893,7 +1893,15 @@
 BluetoothDaemonInterface::OnDisconnect(enum Channel aChannel)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!mResultHandlerQ.IsEmpty());
+
+  if (mResultHandlerQ.IsEmpty()) {
+    if (sNotificationHandler) {
+      // Bluetooth daemon crashed; clear state
+      sNotificationHandler->AdapterStateChangedNotification(false);
+      sNotificationHandler = nullptr;
+    }
+    return;
+  }
 
   switch (aChannel) {
     case CMD_CHANNEL:
@@ -2194,19 +2202,31 @@
   mResultHandlerQ.AppendElement(aRes);
 
   // Cleanup, step 1: Unregister Socket module
-  mProtocol->UnregisterModuleCmd(0x02, new CleanupResultHandler(this));
+  nsresult rv = mProtocol->UnregisterModuleCmd(
+    0x02, new CleanupResultHandler(this));
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::Enable(BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>(mProtocol)->EnableCmd(aRes);
+  nsresult rv =
+    static_cast<BluetoothDaemonCoreModule*>(mProtocol)->EnableCmd(aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::Disable(BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>(mProtocol)->DisableCmd(aRes);
+  nsresult rv =
+    static_cast<BluetoothDaemonCoreModule*>(mProtocol)->DisableCmd(aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Adapter Properties */
@@ -2214,24 +2234,33 @@
 void
 BluetoothDaemonInterface::GetAdapterProperties(BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->GetAdapterPropertiesCmd(aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::GetAdapterProperty(const nsAString& aName,
                                              BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->GetAdapterPropertyCmd(aName, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::SetAdapterProperty(
   const BluetoothNamedValue& aProperty, BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->SetAdapterPropertyCmd(aProperty, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Remote Device Properties */
@@ -2240,8 +2269,11 @@
 BluetoothDaemonInterface::GetRemoteDeviceProperties(
   const nsAString& aRemoteAddr, BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->GetRemoteDevicePropertiesCmd(aRemoteAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -2249,8 +2281,11 @@
   const nsAString& aRemoteAddr, const nsAString& aName,
   BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->GetRemoteDevicePropertyCmd(aRemoteAddr, aName, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -2258,8 +2293,11 @@
   const nsAString& aRemoteAddr, const BluetoothNamedValue& aProperty,
   BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->SetRemoteDevicePropertyCmd(aRemoteAddr, aProperty, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Remote Services */
@@ -2269,16 +2307,22 @@
                                                  const uint8_t aUuid[16],
                                                  BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>(
-    mProtocol)->GetRemoteServiceRecordCmd(aRemoteAddr, aUuid, aRes);
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->GetRemoteServiceRecordCmd(aRemoteAddr, aUuid, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::GetRemoteServices(const nsAString& aRemoteAddr,
                                             BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>(
-    mProtocol)->GetRemoteServicesCmd(aRemoteAddr, aRes);
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->GetRemoteServicesCmd(aRemoteAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Discovery */
@@ -2286,14 +2330,21 @@
 void
 BluetoothDaemonInterface::StartDiscovery(BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>(mProtocol)->StartDiscoveryCmd(aRes);
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
+    (mProtocol)->StartDiscoveryCmd(aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::CancelDiscovery(BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->CancelDiscoveryCmd(aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Bonds */
@@ -2303,24 +2354,33 @@
                                      BluetoothTransport aTransport,
                                      BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->CreateBondCmd(aBdAddr, aTransport, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::RemoveBond(const nsAString& aBdAddr,
                                      BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->RemoveBondCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
 BluetoothDaemonInterface::CancelBond(const nsAString& aBdAddr,
                                      BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->CancelBondCmd(aBdAddr, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Connection */
@@ -2339,8 +2399,11 @@
                                    const nsAString& aPinCode,
                                    BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->PinReplyCmd(aBdAddr, aAccept, aPinCode, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -2349,8 +2412,11 @@
                                    bool aAccept, uint32_t aPasskey,
                                    BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->SspReplyCmd(aBdAddr, aVariant, aAccept, aPasskey, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* DUT Mode */
@@ -2359,8 +2425,11 @@
 BluetoothDaemonInterface::DutModeConfigure(bool aEnable,
                                            BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->DutModeConfigureCmd(aEnable, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -2368,8 +2437,11 @@
                                       uint8_t aLen,
                                       BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->DutModeSendCmd(aOpcode, aBuf, aLen, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* LE Mode */
@@ -2379,8 +2451,11 @@
                                      uint8_t aLen,
                                      BluetoothResultHandler* aRes)
 {
-  static_cast<BluetoothDaemonCoreModule*>
+  nsresult rv = static_cast<BluetoothDaemonCoreModule*>
     (mProtocol)->LeTestModeCmd(aOpcode, aBuf, aLen, aRes);
+  if (NS_FAILED(rv)) {
+    DispatchError(aRes, rv);
+  }
 }
 
 /* Energy Information */
@@ -2401,6 +2476,18 @@
     ConstantInitOp1<BluetoothStatus>(aStatus));
 }
 
+void
+BluetoothDaemonInterface::DispatchError(BluetoothResultHandler* aRes,
+                                        nsresult aRv)
+{
+  BluetoothStatus status;
+
+  if (NS_WARN_IF(NS_FAILED(Convert(aRv, status)))) {
+    status = STATUS_FAIL;
+  }
+  DispatchError(aRes, status);
+}
+
 // Profile Interfaces
 //
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonInterface.h	2015-02-28 15:03:05.000000000 +0000
@@ -135,6 +135,7 @@
 
 private:
   void DispatchError(BluetoothResultHandler* aRes, BluetoothStatus aStatus);
+  void DispatchError(BluetoothResultHandler* aRes, nsresult aRv);
 
   nsCString mListenSocketName;
   nsRefPtr<BluetoothDaemonListenSocket> mListenSocket;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -315,8 +315,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ListenCmd(aType, aServiceName, aServiceUuid, aChannel,
-                     aEncrypt, aAuth, aRes);
+  nsresult rv = mModule->ListenCmd(aType, aServiceName, aServiceUuid,
+                                   aChannel, aEncrypt, aAuth, aRes);
+  if (NS_FAILED(rv))  {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -329,7 +332,11 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->ConnectCmd(aBdAddr, aType, aUuid, aChannel, aEncrypt, aAuth, aRes);
+  nsresult rv = mModule->ConnectCmd(aBdAddr, aType, aUuid, aChannel,
+                                    aEncrypt, aAuth, aRes);
+  if (NS_FAILED(rv))  {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -338,7 +345,10 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->AcceptCmd(aFd, aRes);
+  nsresult rv = mModule->AcceptCmd(aFd, aRes);
+  if (NS_FAILED(rv))  {
+    DispatchError(aRes, rv);
+  }
 }
 
 void
@@ -346,7 +356,32 @@
 {
   MOZ_ASSERT(mModule);
 
-  mModule->CloseCmd(aRes);
+  nsresult rv = mModule->CloseCmd(aRes);
+  if (NS_FAILED(rv))  {
+    DispatchError(aRes, rv);
+  }
+}
+
+void
+BluetoothDaemonSocketInterface::DispatchError(
+  BluetoothSocketResultHandler* aRes, BluetoothStatus aStatus)
+{
+  BluetoothResultRunnable1<BluetoothSocketResultHandler, void,
+                           BluetoothStatus, BluetoothStatus>::Dispatch(
+    aRes, &BluetoothSocketResultHandler::OnError,
+    ConstantInitOp1<BluetoothStatus>(aStatus));
+}
+
+void
+BluetoothDaemonSocketInterface::DispatchError(
+  BluetoothSocketResultHandler* aRes, nsresult aRv)
+{
+  BluetoothStatus status;
+
+  if (NS_WARN_IF(NS_FAILED(Convert(aRv, status)))) {
+    status = STATUS_FAIL;
+  }
+  DispatchError(aRes, status);
 }
 
 END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h	2015-02-28 15:03:05.000000000 +0000
@@ -113,6 +113,10 @@
   void Close(BluetoothSocketResultHandler* aRes);
 
 private:
+  void DispatchError(BluetoothSocketResultHandler* aRes,
+                     BluetoothStatus aStatus);
+  void DispatchError(BluetoothSocketResultHandler* aRes, nsresult aRv);
+
   BluetoothDaemonSocketModule* mModule;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -77,6 +77,11 @@
                              const char16_t* aData)
 {
   MOZ_ASSERT(sBluetoothOppManager);
+  // if state of any volume was changed
+  if (!strcmp(aTopic, NS_VOLUME_STATE_CHANGED)) {
+    HandleVolumeStateChanged(aSubject);
+    return NS_OK; 
+  }
 
   if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
     HandleShutdown();
@@ -204,6 +209,10 @@
   if (NS_FAILED(obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID))) {
     BT_WARNING("Failed to remove shutdown observer!");
   }
+
+  if (NS_FAILED(obs->RemoveObserver(this, NS_VOLUME_STATE_CHANGED))) {
+    BT_WARNING("Failed to remove volume observer!");
+  }
 }
 
 bool
@@ -216,6 +225,11 @@
     return false;
   }
 
+  if (NS_FAILED(obs->AddObserver(this, NS_VOLUME_STATE_CHANGED, false))) {
+    BT_WARNING("Failed to add ns volume observer!");
+    return false;
+  }
+
   /**
    * We don't start listening here as BluetoothServiceBluedroid calls Listen()
    * immediately when BT stops.
@@ -283,6 +297,40 @@
   sBluetoothOppManager = nullptr;
 }
 
+void
+BluetoothOppManager::HandleVolumeStateChanged(nsISupports* aSubject)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // We will disconnect OPP connection no matter which volume becomes non
+  // STATE_MOUNTED, since user may select files scattered in multiple volumes
+  // in a single transfer, (e.g., user selects 2 files to transfer, one is in
+  // internal volume and the other is in external volume).
+
+  if (!mConnected) {
+    return;
+  }
+
+  // get volume interface and state
+  nsCOMPtr<nsIVolume> vol = do_QueryInterface(aSubject);
+  if (!vol) {
+    return;
+  }
+  int32_t state;
+  vol->GetState(&state);
+  if (nsIVolume::STATE_MOUNTED != state) {
+    // Here is for unexpected physical removal of any storage.
+    // By checking the volume state change, we should release the unavailable
+    // storage to prevent being killed by vold.
+    // Disconnect any connected OPP connection since volume state becomes
+    // non STATE_MOUNTED. Then |OnSocketDisconnect| would also be called to
+    // handle remaining files during send(|DiscardBlobsToSend|) or
+    // receive(|DeleteReceivedFile|).
+    BT_LOGR("Volume state is not STATE_MOUNTED. Abort any ongoing OPP connection.");
+    Disconnect(nullptr);
+  }
+}
+
 bool
 BluetoothOppManager::Listen()
 {
@@ -1099,7 +1147,9 @@
 void
 BluetoothOppManager::SendConnectRequest()
 {
-  if (mConnected) return;
+  if (mConnected) {
+    return;
+  }
 
   // Section 3.3.1 "Connect", IrOBEX 1.2
   // [opcode:1][length:2][version:1][flags:1][MaxPktSizeWeCanReceive:2]
@@ -1119,7 +1169,9 @@
 BluetoothOppManager::SendPutHeaderRequest(const nsAString& aFileName,
                                           int aFileSize)
 {
-  if (!mConnected) return;
+  if (!mConnected) {
+    return;
+  }
 
   uint8_t* req = new uint8_t[mRemoteMaxPacketLength];
 
@@ -1150,7 +1202,10 @@
 BluetoothOppManager::SendPutRequest(uint8_t* aFileBody,
                                     int aFileBodyLength)
 {
-  if (!mConnected) return;
+  if (!mConnected) {
+    return;
+  }
+
   int packetLeftSpace = mRemoteMaxPacketLength - kPutRequestHeaderSize;
   if (aFileBodyLength > packetLeftSpace) {
     BT_WARNING("Not allowed such a small MaxPacketLength value");
@@ -1174,7 +1229,9 @@
 void
 BluetoothOppManager::SendPutFinalRequest()
 {
-  if (!mConnected) return;
+  if (!mConnected) {
+    return;
+  }
 
   /**
    * Section 2.2.9, "End-of-Body", IrObex 1.2
@@ -1197,7 +1254,9 @@
 void
 BluetoothOppManager::SendDisconnectRequest()
 {
-  if (!mConnected) return;
+  if (!mConnected) {
+    return;
+  }
 
   // Section 3.3.2 "Disconnect", IrOBEX 1.2
   // [opcode:1][length:2][Headers:var]
@@ -1230,7 +1289,9 @@
 void
 BluetoothOppManager::ReplyToConnect()
 {
-  if (mConnected) return;
+  if (mConnected) {
+    return;
+  }
 
   // Section 3.3.1 "Connect", IrOBEX 1.2
   // [opcode:1][length:2][version:1][flags:1][MaxPktSizeWeCanReceive:2]
@@ -1249,7 +1310,9 @@
 void
 BluetoothOppManager::ReplyToDisconnectOrAbort()
 {
-  if (!mConnected) return;
+  if (!mConnected) {
+    return;
+  }
 
   // Section 3.3.2 "Disconnect" and Section 3.3.5 "Abort", IrOBEX 1.2
   // The format of response packet of "Disconnect" and "Abort" are the same
@@ -1263,7 +1326,9 @@
 void
 BluetoothOppManager::ReplyToPut(bool aFinal, bool aContinue)
 {
-  if (!mConnected) return;
+  if (!mConnected) {
+    return;
+  }
 
   // The received length can be reset here because this is where we reply to a
   // complete put packet.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothOppManager.h	2015-02-28 15:03:05.000000000 +0000
@@ -77,6 +77,7 @@
   BluetoothOppManager();
   bool Init();
   void HandleShutdown();
+  void HandleVolumeStateChanged(nsISupports* aSubject);
 
   void StartFileTransfer();
   void StartSendingNextFile();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -310,7 +310,8 @@
 
     BT_LOGR("BluetoothInterface::Disable failed: %d", aStatus);
 
-    BluetoothService::AcknowledgeToggleBt(true);
+    // Always make progress; even on failures
+    BluetoothService::AcknowledgeToggleBt(false);
   }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/bluedroid/hfp/BluetoothHfpManager.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -432,6 +432,9 @@
   void OnError(BluetoothStatus aStatus) MOZ_OVERRIDE
   {
     BT_WARNING("BluetoothHandsfreeInterface::Cleanup failed: %d", (int)aStatus);
+
+    sBluetoothHfpInterface = nullptr;
+
     if (mRes) {
       mRes->OnError(NS_ERROR_FAILURE);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,28 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* 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/. */
+
+#include "BluetoothInterfaceHelpers.h"
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+//
+// Conversion
+//
+
+nsresult
+Convert(nsresult aIn, BluetoothStatus& aOut)
+{
+  if (NS_SUCCEEDED(aIn)) {
+    aOut = STATUS_SUCCESS;
+  } else if (aIn == NS_ERROR_OUT_OF_MEMORY) {
+    aOut = STATUS_NOMEM;
+  } else {
+    aOut = STATUS_FAIL;
+  }
+  return NS_OK;
+}
+
+END_BLUETOOTH_NAMESPACE
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/BluetoothInterfaceHelpers.h	2015-02-28 15:03:05.000000000 +0000
@@ -13,6 +13,13 @@
 BEGIN_BLUETOOTH_NAMESPACE
 
 //
+// Conversion
+//
+
+nsresult
+Convert(nsresult aIn, BluetoothStatus& aOut);
+
+//
 // Result handling
 //
 // The classes of type |BluetoothResultRunnable[0..3]| transfer
@@ -49,6 +56,9 @@
   static void
   Dispatch(Obj* aObj, Res (Obj::*aMethod)(), const InitOp& aInitOp)
   {
+    if (!aObj) {
+      return; // silently return if no result runnable has been given
+    }
     nsRefPtr<SelfType> runnable = Create(aObj, aMethod, aInitOp);
     if (!runnable) {
       BT_LOGR("BluetoothResultRunnable0::Create failed");
@@ -108,6 +118,9 @@
   static void
   Dispatch(Obj* aObj, Res (Obj::*aMethod)(Arg1), const InitOp& aInitOp)
   {
+    if (!aObj) {
+      return; // silently return if no result runnable has been given
+    }
     nsRefPtr<SelfType> runnable = Create(aObj, aMethod, aInitOp);
     if (!runnable) {
       BT_LOGR("BluetoothResultRunnable1::Create failed");
@@ -174,6 +187,9 @@
   Dispatch(Obj* aObj, Res (Obj::*aMethod)(Arg1, Arg2, Arg3),
            const InitOp& aInitOp)
   {
+    if (!aObj) {
+      return; // silently return if no result runnable has been given
+    }
     nsRefPtr<SelfType> runnable = Create(aObj, aMethod, aInitOp);
     if (!runnable) {
       BT_LOGR("BluetoothResultRunnable3::Create failed");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth/moz.build	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth/moz.build	2015-02-28 15:03:05.000000000 +0000
@@ -10,6 +10,7 @@
         'BluetoothDevice.cpp',
         'BluetoothHidManager.cpp',
         'BluetoothInterface.cpp',
+        'BluetoothInterfaceHelpers.cpp',
         'BluetoothManager.cpp',
         'BluetoothProfileController.cpp',
         'BluetoothPropertyContainer.cpp',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth2/BluetoothPairingListener.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth2/BluetoothPairingListener.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth2/BluetoothPairingListener.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth2/BluetoothPairingListener.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -50,23 +50,21 @@
 }
 
 void
-BluetoothPairingListener::DispatchPairingEvent(BluetoothDevice* aDevice,
+BluetoothPairingListener::DispatchPairingEvent(const nsAString& aName,
+                                               const nsAString& aAddress,
                                                const nsAString& aPasskey,
                                                const nsAString& aType)
 {
-  MOZ_ASSERT(aDevice && !aType.IsEmpty());
-
-  nsString address;
-  aDevice->GetAddress(address);
+  MOZ_ASSERT(!aName.IsEmpty() && !aAddress.IsEmpty() && !aType.IsEmpty());
 
   nsRefPtr<BluetoothPairingHandle> handle =
     BluetoothPairingHandle::Create(GetOwner(),
-                                   address,
+                                   aAddress,
                                    aType,
                                    aPasskey);
 
   BluetoothPairingEventInit init;
-  init.mDevice = aDevice;
+  init.mDeviceName = aName;
   init.mHandle = handle;
 
   nsRefPtr<BluetoothPairingEvent> event =
@@ -96,20 +94,13 @@
                arr[2].value().type() == BluetoothValue::TnsString && // passkey
                arr[3].value().type() == BluetoothValue::TnsString);  // type
 
-    nsString deviceAddress = arr[0].value().get_nsString();
-    nsString deviceName = arr[1].value().get_nsString();
+    nsString address = arr[0].value().get_nsString();
+    nsString name = arr[1].value().get_nsString();
     nsString passkey = arr[2].value().get_nsString();
     nsString type = arr[3].value().get_nsString();
 
-    // Create a temporary device with deviceAddress and deviceName
-    InfallibleTArray<BluetoothNamedValue> props;
-    BT_APPEND_NAMED_VALUE(props, "Address", deviceAddress);
-    BT_APPEND_NAMED_VALUE(props, "Name", deviceName);
-    nsRefPtr<BluetoothDevice> device =
-      BluetoothDevice::Create(GetOwner(), props);
-
     // Notify pairing listener of pairing requests
-    DispatchPairingEvent(device, passkey, type);
+    DispatchPairingEvent(name, address, passkey, type);
   } else {
     BT_WARNING("Not handling pairing listener signal: %s",
                NS_ConvertUTF16toUTF8(aData.name()).get());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth2/BluetoothPairingListener.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth2/BluetoothPairingListener.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/bluetooth2/BluetoothPairingListener.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/bluetooth2/BluetoothPairingListener.h	2015-02-28 15:03:05.000000000 +0000
@@ -25,7 +25,8 @@
   static already_AddRefed<BluetoothPairingListener>
     Create(nsPIDOMWindow* aWindow);
 
-  void DispatchPairingEvent(BluetoothDevice* aDevice,
+  void DispatchPairingEvent(const nsAString& aName,
+                            const nsAString& aAddress,
                             const nsAString& aPasskey,
                             const nsAString& aType);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/broadcastchannel/BroadcastChannel.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/broadcastchannel/BroadcastChannel.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/broadcastchannel/BroadcastChannel.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/broadcastchannel/BroadcastChannel.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -335,7 +335,7 @@
 
   virtual bool Notify(JSContext* aCx, workers::Status aStatus) MOZ_OVERRIDE
   {
-    if (aStatus >= Canceling) {
+    if (aStatus >= Closing) {
       mChannel->Shutdown();
     }
 
@@ -636,13 +636,6 @@
 {
   mState = StateClosed;
 
-  // If shutdown() is called we have to release the reference if we still keep
-  // it.
-  if (mIsKeptAlive) {
-    mIsKeptAlive = false;
-    Release();
-  }
-
   if (mWorkerFeature) {
     WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
     workerPrivate->RemoveFeature(workerPrivate->GetJSContext(), mWorkerFeature);
@@ -657,6 +650,13 @@
 
     mActor = nullptr;
   }
+
+  // If shutdown() is called we have to release the reference if we still keep
+  // it.
+  if (mIsKeptAlive) {
+    mIsKeptAlive = false;
+    Release();
+  }
 }
 
 EventHandlerNonNull*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/BrowserElementChildPreload.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/BrowserElementChildPreload.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/BrowserElementChildPreload.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/BrowserElementChildPreload.js	2015-02-28 15:03:06.000000000 +0000
@@ -816,21 +816,26 @@
   },
 
   _getSystemCtxMenuData: function(elem) {
+    let documentURI = 
+      docShell.QueryInterface(Ci.nsIWebNavigation).currentURI.spec;
     if ((elem instanceof Ci.nsIDOMHTMLAnchorElement && elem.href) ||
         (elem instanceof Ci.nsIDOMHTMLAreaElement && elem.href)) {
       return {uri: elem.href,
+              documentURI: documentURI,
               text: elem.textContent.substring(0, kLongestReturnedString)};
     }
     if (elem instanceof Ci.nsIImageLoadingContent && elem.currentURI) {
-      return {uri: elem.currentURI.spec};
+      return {uri: elem.currentURI.spec, documentURI: documentURI};
     }
     if (elem instanceof Ci.nsIDOMHTMLImageElement) {
-      return {uri: elem.src};
+      return {uri: elem.src, documentURI: documentURI};
     }
     if (elem instanceof Ci.nsIDOMHTMLMediaElement) {
       let hasVideo = !(elem.readyState >= elem.HAVE_METADATA &&
                        (elem.videoWidth == 0 || elem.videoHeight == 0));
-      return {uri: elem.currentSrc || elem.src, hasVideo: hasVideo};
+      return {uri: elem.currentSrc || elem.src,
+              hasVideo: hasVideo,
+              documentURI: documentURI};
     }
     if (elem instanceof Ci.nsIDOMHTMLInputElement &&
         elem.hasAttribute("name")) {
@@ -847,6 +852,7 @@
             ? parent.getAttribute("method").toLowerCase()
             : "get";
           return {
+            documentURI: documentURI,
             action: actionHref,
             method: method,
             name: elem.getAttribute("name"),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/BrowserElementParent.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/BrowserElementParent.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/BrowserElementParent.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/BrowserElementParent.js	2015-02-28 15:03:06.000000000 +0000
@@ -539,7 +539,24 @@
     return this._frameLoader.visible;
   },
 
+  getChildProcessOffset: function() {
+    let offset = { x: 0, y: 0 };
+    let tabParent = this._frameLoader.tabParent;
+    if (tabParent) {
+      let offsetX = {};
+      let offsetY = {};
+      tabParent.getChildProcessOffset(offsetX, offsetY);
+      offset.x = offsetX.value;
+      offset.y = offsetY.value;
+    }
+    return offset;
+  },
+
   sendMouseEvent: defineNoReturnMethod(function(type, x, y, button, clickCount, modifiers) {
+    let offset = this.getChildProcessOffset();
+    x += offset.x;
+    y += offset.y;
+
     this._sendAsyncMsg("send-mouse-event", {
       "type": type,
       "x": x,
@@ -567,6 +584,13 @@
                                  count,
                                  modifiers);
     } else {
+      let offset = this.getChildProcessOffset();
+      for (var i = 0; i < touchesX.length; i++) {
+        touchesX[i] += offset.x;
+      }
+      for (var i = 0; i < touchesY.length; i++) {
+        touchesY[i] += offset.y;
+      }
       this._sendAsyncMsg("send-touch-event", {
         "type": type,
         "identifiers": identifiers,
@@ -619,18 +643,19 @@
     if (!this._isAlive()) {
       return null;
     }
-    let ioService =
-      Cc['@mozilla.org/network/io-service;1'].getService(Ci.nsIIOService);
-    let uri = ioService.newURI(_url, null, null);
+    
+    let uri = Services.io.newURI(_url, null, null);
     let url = uri.QueryInterface(Ci.nsIURL);
 
+    debug('original _options = ' + uneval(_options));
+
     // Ensure we have _options, we always use it to send the filename.
     _options = _options || {};
     if (!_options.filename) {
       _options.filename = url.fileName;
     }
 
-    debug('_options = ' + uneval(_options));
+    debug('final _options = ' + uneval(_options));
 
     // Ensure we have a filename.
     if (!_options.filename) {
@@ -708,7 +733,37 @@
                                              Ci.nsIRequestObserver])
     };
 
-    let channel = ioService.newChannelFromURI(url);
+    // If we have a URI we'll use it to get the triggering principal to use, 
+    // if not available a null principal is acceptable.
+    let referrer = null;
+    let principal = null;
+    if (_options.referrer) {
+      // newURI can throw on malformed URIs.
+      try {
+        referrer = Services.io.newURI(_options.referrer, null, null);
+      }
+      catch(e) {
+        debug('Malformed referrer -- ' + e);
+      }
+      // This simply returns null if there is no principal available
+      // for the requested uri. This is an acceptable fallback when
+      // calling newChannelFromURI2.
+      principal = 
+        Services.scriptSecurityManager.getAppCodebasePrincipal(
+          referrer, 
+          this._frameLoader.loadContext.appId, 
+          this._frameLoader.loadContext.isInBrowserElement);
+    }
+
+    debug('Using principal? ' + !!principal);
+
+    let channel = 
+      Services.io.newChannelFromURI2(url,
+                                     null,       // No document. 
+                                     principal,  // Loading principal
+                                     principal,  // Triggering principal
+                                     Ci.nsILoadInfo.SEC_NORMAL,
+                                     Ci.nsIContentPolicy.TYPE_OTHER);
 
     // XXX We would set private browsing information prior to calling this.
     channel.notificationCallbacks = interfaceRequestor;
@@ -725,8 +780,8 @@
     channel.loadFlags |= flags;
 
     if (channel instanceof Ci.nsIHttpChannel) {
-      debug('Setting HTTP referrer = ' + this._window.document.documentURIObject);
-      channel.referrer = this._window.document.documentURIObject;
+      debug('Setting HTTP referrer = ' + (referrer && referrer.spec)); 
+      channel.referrer = referrer;
       if (channel instanceof Ci.nsIHttpChannelInternal) {
         channel.forceAllowThirdPartyCookie = true;
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/mochitest/browserElement_SendEvent.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/mochitest/browserElement_SendEvent.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/mochitest/browserElement_SendEvent.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/mochitest/browserElement_SendEvent.js	2015-02-28 15:03:06.000000000 +0000
@@ -12,9 +12,26 @@
   var iframe = document.createElement("iframe");
   iframe.setAttribute('mozbrowser', 'true');
   document.body.appendChild(iframe);
+  var x = 10;
+  var y = 10;
+  // First we force a reflow so that getChildProcessOffset actually returns
+  // meaningful data.
+  iframe.getBoundingClientRect();
+  // We need to make sure the event coordinates are actually inside the iframe,
+  // relative to the chome window.
+  var tabParent = SpecialPowers.wrap(iframe)
+                  .QueryInterface(SpecialPowers.Ci.nsIFrameLoaderOwner)
+                  .frameLoader.tabParent;
+  if (tabParent) {
+    let offsetX = {};
+    let offsetY = {};
+    tabParent.getChildProcessOffset(offsetX, offsetY);
+    x -= offsetX.value;
+    y -= offsetY.value;
+  }
 
   iframe.addEventListener("mozbrowserloadend", function onloadend(e) {
-    iframe.sendMouseEvent("mousedown", 10, 10, 0, 1, 0);
+    iframe.sendMouseEvent("mousedown", x, y, 0, 1, 0);
   });
 
   iframe.addEventListener("mozbrowserlocationchange", function onlocchange(e) {
@@ -24,11 +41,11 @@
     switch (a.hash) {
       case "#mousedown":
         ok(true, "Receive a mousedown event.");
-        iframe.sendMouseEvent("mousemove", 10, 10, 0, 0, 0);
+        iframe.sendMouseEvent("mousemove", x, y, 0, 0, 0);
         break;
       case "#mousemove":
         ok(true, "Receive a mousemove event.");
-        iframe.sendMouseEvent("mouseup", 10, 10, 0, 1, 0);
+        iframe.sendMouseEvent("mouseup", x, y, 0, 1, 0);
         break;
       case "#mouseup":
         ok(true, "Receive a mouseup event.");
@@ -36,7 +53,7 @@
       case "#click":
         ok(true, "Receive a click event.");
         if (SpecialPowers.getIntPref("dom.w3c_touch_events.enabled") != 0) {
-          iframe.sendTouchEvent("touchstart", [1], [10], [10], [2], [2],
+          iframe.sendTouchEvent("touchstart", [1], [x], [y], [2], [2],
                                 [20], [0.5], 1, 0);
         } else {
           iframe.removeEventListener('mozbrowserlocationchange', onlocchange);
@@ -45,16 +62,16 @@
         break;
       case "#touchstart":
         ok(true, "Receive a touchstart event.");
-        iframe.sendTouchEvent("touchmove", [1], [10], [10], [2], [2],
+        iframe.sendTouchEvent("touchmove", [1], [x], [y], [2], [2],
                               [20], [0.5], 1, 0);
       case "#touchmove":
         ok(true, "Receive a touchmove event.");
-        iframe.sendTouchEvent("touchend", [1], [10], [10], [2], [2],
+        iframe.sendTouchEvent("touchend", [1], [x], [y], [2], [2],
                               [20], [0.5], 1, 0);
         break;
       case "#touchend":
         ok(true, "Receive a touchend event.");
-        iframe.sendTouchEvent("touchcancel", [1], [10], [10], [2], [2],
+        iframe.sendTouchEvent("touchcancel", [1], [x], [y], [2], [2],
                               [20], [0.5], 1, 0);
         iframe.removeEventListener('mozbrowserlocationchange', onlocchange);
         SimpleTest.finish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/mochitest/priority/test_Preallocated.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/mochitest/priority/test_Preallocated.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/browser-element/mochitest/priority/test_Preallocated.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/browser-element/mochitest/priority/test_Preallocated.html	2015-02-28 15:03:06.000000000 +0000
@@ -36,13 +36,6 @@
   }
 
   cleanedUp = true;
-
-  if (preallocationEnabledPref === null) {
-    SpecialPowers.clearUserPref('dom.ipc.processPrelaunch.enabled');
-  } else {
-    SpecialPowers.setBoolPref('dom.ipc.processPrelaunch.enabled',
-                              preallocationEnabledPref);
-  }
 }
 
 // Even if this test times out, we still want to run cleanUp so as to set the
@@ -68,12 +61,11 @@
       SimpleTest.finish();
     });
   });
-
-  // Setting this pref to true should cause us to prelaunch a process.
-  SpecialPowers.setBoolPref('dom.ipc.processPrelaunch.enabled', true);
 }
-
-addEventListener('testready', runTest);
+// Setting this pref to true should cause us to prelaunch a process.
+addEventListener('testready', function() {
+  SpecialPowers.pushPrefEnv({'set':[["dom.ipc.processPrelaunch.enabled",true]]},runTest);
+});
 </script>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html	2015-02-28 15:03:06.000000000 +0000
@@ -8,7 +8,6 @@
 SimpleTest.waitForExplicitFinish();
 const Cc = SpecialPowers.Cc;
 const Cr = SpecialPowers.Cr;
-SpecialPowers.setBoolPref("canvas.path.enabled", true);
 
 function isPixel(ctx, x,y, r,g,b,a, d) {
 	var pos = x + "," + y;
@@ -67,7 +66,9 @@
  SimpleTest.finish();
 }
 
-addLoadEvent(runTests);
+addLoadEvent(function() {
+  SpecialPowers.pushPrefEnv({"set":[["canvas.path.enabled", true]]}, runTests)
+});
 
 // Don't leak the world via the Path2D reference to its window.
 document.all;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/test_canvas_path.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/test_canvas_path.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/test_canvas_path.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/test_canvas_path.html	2015-02-28 15:03:06.000000000 +0000
@@ -8,7 +8,6 @@
 SimpleTest.waitForExplicitFinish();
 const Cc = SpecialPowers.Cc;
 const Cr = SpecialPowers.Cr;
-SpecialPowers.setBoolPref("canvas.path.enabled", true);
 
 function isPixel(ctx, x,y, c, d) {
   var pos = x + "," + y;
@@ -434,11 +433,12 @@
   ok(false, "unexpected exception thrown in: test_addpath_canvas");
   throw e;
  }
- SpecialPowers.setBoolPref("canvas.path.enabled", false);
  SimpleTest.finish();
 }
 
-addLoadEvent(runTests);
+addLoadEvent(function() {
+  SpecialPowers.pushPrefEnv({"set":[["canvas.path.enabled", true]]}, runTests);
+});
 
 // Don't leak the world via the Path2D reference to its window.
 document.all;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/test_hitregion_canvas.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/test_hitregion_canvas.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/test_hitregion_canvas.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/test_hitregion_canvas.html	2015-02-28 15:03:06.000000000 +0000
@@ -8,8 +8,6 @@
 SimpleTest.waitForExplicitFinish();
 const Cc = SpecialPowers.Cc;
 const Cr = SpecialPowers.Cr;
-SpecialPowers.setBoolPref("canvas.hitregions.enabled", true);
-
 </script>
 
 <p>Canvas test: hit regions</p>
@@ -78,9 +76,9 @@
   ok(false, "unexpected exception thrown in: test_hitregions");
  }
  SimpleTest.finish();
- SpecialPowers.setBoolPref("canvas.hitregions.enabled", false);
 }
 
-addLoadEvent(runTests);
-
+addLoadEvent(function() {
+  SpecialPowers.pushPrefEnv({"set":[["canvas.hitregions.enabled", true]]}, runTests);
+});
 </script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py	2015-02-28 15:03:07.000000000 +0000
@@ -36,7 +36,7 @@
 
 GENERATED_HEADER = '''
 # This is a GENERATED FILE. Do not edit it directly.
-# Regenerated it by using `python generate-wrapper-and-manifest.py`.
+# Regenerated it by using `python generate-wrappers-and-manifest.py`.
 # Mark skipped tests in mochitest-errata.ini.
 # Mark failing tests in mochi-single.html.
 '''.strip()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-conformance/mochitest-errata.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-conformance/mochitest-errata.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-conformance/mochitest-errata.ini	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-conformance/mochitest-errata.ini	2015-02-28 15:03:07.000000000 +0000
@@ -5,7 +5,8 @@
 # 'B2G Desktop Linux' fails to create WebGL contexts.
 # Also skip B2G for now, until we get a handle on the longer tail of emulator
 # bugs.
-skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g'))
+# Bug 1136181 disabled on B2G Desktop and Mulet for intermittent failures
+skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet'))
 
 ########################################################################
 # All
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/_webgl-conformance.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/_webgl-conformance.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/_webgl-conformance.ini	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/_webgl-conformance.ini	2015-02-28 15:03:06.000000000 +0000
@@ -1,10 +1,10 @@
 # This is a GENERATED FILE. Do not edit it directly.
-# Regenerated it by using `python generate-wrapper-and-manifest.py`.
+# Regenerated it by using `python generate-wrappers-and-manifest.py`.
 # Mark skipped tests in mochitest-errata.ini.
 # Mark failing tests in mochi-single.html.
 
 [DEFAULT]
-skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g'))
+skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet')) # Bug 1136181 disabled on B2G Desktop and Mulet for intermittent failures
 
 support-files = webgl-conformance/../webgl-mochitest/driver-info.js
                 webgl-conformance/always-fail.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_color_buffer_float.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_color_buffer_float.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_color_buffer_float.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-mochitest/test_webgl_color_buffer_float.html	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,486 @@
+<html>
+  <head>
+    <meta charset='UTF-8'>
+    <script src='/tests/SimpleTest/SimpleTest.js'></script>
+    <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
+  </head>
+  <body>
+<script id='vs' type='x-shader/x-vertex'>
+
+attribute vec2 aVertCoord;
+
+void main(void) {
+  gl_Position = vec4(aVertCoord, 0.0, 1.0);
+}
+
+</script>
+<script id='fs' type='x-shader/x-fragment'>
+
+precision mediump float; // 💩
+
+uniform vec4 uFragColor;
+
+void main(void) {
+  gl_FragColor = uFragColor;
+}
+
+</script>
+
+<canvas id='c' width='200' height='200'></canvas>
+
+<script>
+
+function GetGLSLByElemId(elemId) {
+  var elem = document.getElementById(elemId);
+  if (!elem)
+    throw 'Bad `elemId`: ' + elemId;
+
+  return elem.innerHTML.trim();
+}
+
+function ProgramByElemIds(gl, vsId, fsId) {
+  var vs = gl.createShader(gl.VERTEX_SHADER);
+  gl.shaderSource(vs, GetGLSLByElemId(vsId));
+  gl.compileShader(vs);
+
+  var fs = gl.createShader(gl.FRAGMENT_SHADER);
+  gl.shaderSource(fs, GetGLSLByElemId(fsId));
+  gl.compileShader(fs);
+
+  var prog = gl.createProgram();
+  gl.attachShader(prog, vs);
+  gl.attachShader(prog, fs);
+
+  gl.linkProgram(prog);
+
+  var success = gl.getProgramParameter(prog, gl.LINK_STATUS);
+  if (success)
+      return prog;
+
+  console.log('Error linking program for \'' + vsId + '\' and \'' + fsId + '\'.');
+  console.log('\nLink log: ' + gl.getProgramInfoLog(prog));
+  console.log('\nVert shader log: ' + gl.getShaderInfoLog(vs));
+  console.log('\nFrag shader log: ' + gl.getShaderInfoLog(fs));
+  return null;
+}
+
+var RGBA = 0x1908;
+var UNSIGNED_BYTE = 0x1401;
+var FLOAT = 0x1406;
+var HALF_FLOAT_OES = 0x8D61;
+var HALF_FLOAT = 0x140B;
+var RGBA4 = 0x8056;
+var RGBA8 = 0x8058;
+var RGBA32F = 0x8814;
+var RGBA16F = 0x881A;
+
+function EnumName(val) {
+  switch (val) {
+    case RGBA:
+      return 'RGBA';
+    case UNSIGNED_BYTE:
+      return 'UNSIGNED_BYTE';
+    case FLOAT:
+      return 'FLOAT';
+    case HALF_FLOAT_OES:
+      return 'HALF_FLOAT_OES';
+    case HALF_FLOAT:
+      return 'HALF_FLOAT';
+    case RGBA4:
+      return 'RGBA4';
+    case RGBA32F:
+      return 'RGBA32F';
+    default:
+      throw 'Unknown enum: 0x' + val.toString(16);
+  }
+}
+
+var gl;
+
+function RGBAToString(arr) {
+  return '[' + arr[0].toPrecision(4) + ', ' +
+               arr[1].toPrecision(4) + ', ' +
+               arr[2].toPrecision(4) + ', ' +
+               arr[3].toPrecision(4) + ']';
+}
+
+function TestScreenColor(gl, isFBFloat, r, g, b, a) {
+  var readType = isFBFloat ? FLOAT : UNSIGNED_BYTE;
+
+  var arr;
+  switch (readType) {
+    case gl.UNSIGNED_BYTE:
+      arr = new Uint8Array(4);
+      break;
+
+    case gl.FLOAT:
+      arr = new Float32Array(4);
+      break;
+
+    default:
+      throw 'Bad `readType`.';
+  }
+
+  gl.readPixels(0, 0, 1, 1, gl.RGBA, readType, arr);
+
+  var err = gl.getError();
+  ok(err == 0, 'Should be no errors.');
+  if (err)
+    return;
+
+  var floatArr;
+  switch (readType) {
+    case gl.UNSIGNED_BYTE:
+      floatArr = new Float32Array(4);
+      floatArr[0] = arr[0] / 255.0;
+      floatArr[1] = arr[1] / 255.0;
+      floatArr[2] = arr[2] / 255.0;
+      floatArr[3] = arr[3] / 255.0;
+      break;
+
+    case gl.FLOAT:
+      floatArr = arr;
+      break;
+
+    default:
+      throw 'Bad `readType`.';
+  }
+
+  var testText = RGBAToString(floatArr);
+  var refText = RGBAToString([r, g, b, a]);
+
+  var eps = 1.0 / 255.0;
+  var isSame = (Math.abs(floatArr[0] - r) < eps &&
+                Math.abs(floatArr[1] - g) < eps &&
+                Math.abs(floatArr[2] - b) < eps &&
+                Math.abs(floatArr[3] - a) < eps);
+
+  ok(isSame, 'Should be ' + refText + ', was ' + testText + ',');
+}
+
+function TestReadFormat(gl, isFBFloat, format, type) {
+  var err = gl.getError();
+  if (err) {
+    ok(false, 'Should be no error at start of TestReadFormat(). (0x' + err.toString(16) + ')');
+    return;
+  }
+  var implFormat = gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_FORMAT);
+  var implType = gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_TYPE);
+
+  var err = gl.getError();
+  if (err) {
+    ok(false, 'Should be no error at start2 of TestReadFormat(). (0x' + err.toString(16) + ')');
+    return;
+  }
+
+  var defaultReadType = isFBFloat ? FLOAT : UNSIGNED_BYTE;
+
+  var formatOk = (format == gl.RGBA &&
+                  type == defaultReadType);
+
+  if (format == implFormat &&
+      type == implType)
+  {
+    formatOk = true;
+  }
+
+  var w = 1;
+  var h = 1;
+  var channels = 4;
+  var arrSize = w * h * channels;
+
+  var arr;
+  switch (type) {
+    case UNSIGNED_BYTE:
+      arr = new Uint8Array(arrSize);
+      break;
+
+    case FLOAT:
+      arr = new Float32Array(arrSize);
+      break;
+
+    case HALF_FLOAT_OES:
+    case HALF_FLOAT:
+      arr = new Uint16Array(arrSize);
+      break;
+
+    default:
+      throw 'Bad `type`: 0x' + type.toString(16);
+  }
+
+  gl.readPixels(0, 0, 1, 1, format, type, arr);
+  var wasOk = gl.getError() == 0;
+
+  var text = 'Should ' + (formatOk ? '' : 'not ') + 'allow reading with ' +
+             EnumName(format) + '/' + EnumName(type) + '.'
+  ok(wasOk == formatOk, text);
+}
+
+function TestError(gl, expectedErr, descText) {
+  var err = gl.getError();
+
+  while (gl.getError()) {}
+
+  ok(err == expectedErr,
+     descText + ': Error should be 0x' + expectedErr.toString(16) + ', was 0x' +
+     err.toString(16) + '.');
+
+  return err;
+}
+
+function AttachRBToCurFB(gl, sizedFormat) {
+  var isSupported;
+  switch (sizedFormat) {
+  case RGBA4:
+    isSupported = true;
+    break;
+
+  case RGBA16F:
+    isSupported = !!gl.getExtension('EXT_color_buffer_half_float');
+    break;
+
+  case RGBA32F:
+    isSupported = !!gl.getExtension('WEBGL_color_buffer_float');
+    break;
+
+  default:
+    throw 'Bad `sizedFormat`.';
+  }
+
+  var rb = gl.createRenderbuffer();
+  gl.bindRenderbuffer(gl.RENDERBUFFER, rb);
+  gl.renderbufferStorage(gl.RENDERBUFFER, sizedFormat, 1, 1);
+
+  var correctError = isSupported ? 0 : gl.INVALID_ENUM;
+  var err = TestError(gl, correctError, 'RB specification with supported format');
+  if (err)
+    return false;
+
+  gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.RENDERBUFFER, rb);
+
+  var status = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
+  var isComplete = (status == gl.FRAMEBUFFER_COMPLETE);
+  ok(isComplete, 'Framebuffer should be complete after RB attachment.');
+  return isComplete;
+}
+
+function AttachTexToCurFB(gl, sizedFormat) {
+  var canCreate;
+  var isAttachGuaranteed;
+  var format;
+  var type;
+
+  switch (sizedFormat) {
+  case RGBA8:
+    canCreate = true;
+    isAttachGuaranteed = true;
+    format = RGBA;
+    type = UNSIGNED_BYTE;
+    break;
+
+  case RGBA16F:
+    canCreate = !!gl.getExtension('OES_texture_half_float');
+    isAttachGuaranteed = !!gl.getExtension('EXT_color_buffer_half_float');
+    format = RGBA;
+    type = HALF_FLOAT_OES;
+    break;
+
+  case RGBA32F:
+    canCreate = !!gl.getExtension('OES_texture_float');
+    isAttachGuaranteed = !!gl.getExtension('WEBGL_color_buffer_float');
+    format = RGBA;
+    type = FLOAT;
+    break;
+
+  default:
+    throw 'Bad `sizedFormat`.';
+  }
+
+  var tex = gl.createTexture();
+  gl.bindTexture(gl.TEXTURE_2D, tex);
+  gl.texImage2D(gl.TEXTURE_2D, 0, format, 1, 1, 0, format, type, null);
+
+  var correctError = canCreate ? 0 : gl.INVALID_ENUM;
+  var err = TestError(gl, correctError, 'Tex specification with supported format');
+  if (err)
+    return false;
+
+  gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, tex, 0);
+
+  var status = gl.checkFramebufferStatus(gl.FRAMEBUFFER);
+  var isComplete = (status == gl.FRAMEBUFFER_COMPLETE);
+
+  if (!isAttachGuaranteed && !isComplete)
+    todo(false, 'Framebuffer needn\'t be complete after tex attachment.');
+  else
+    ok(isComplete, 'Framebuffer should be complete after tex attachment.');
+
+  return isComplete;
+}
+
+function IsFormatFloat(sizedFormat) {
+  switch (sizedFormat) {
+  case RGBA4:
+  case RGBA8:
+    return false;
+
+  case RGBA16F:
+  case RGBA32F:
+    return true;
+
+  default:
+    throw 'Bad `sizedFormat`.';
+  }
+}
+
+function TestType(gl, prog, isTex, sizedFormat) {
+  TestError(gl, 0, 'At start of TestRB()');
+
+  var isAttached = isTex ? AttachTexToCurFB(gl, sizedFormat)
+                         : AttachRBToCurFB(gl, sizedFormat);
+  if (!isAttached)
+    return;
+
+  var isFormatFloat = IsFormatFloat(sizedFormat);
+
+  TestReadFormat(gl, isFormatFloat, gl.RGBA, gl.UNSIGNED_BYTE);
+  TestReadFormat(gl, isFormatFloat, gl.RGBA, gl.FLOAT);
+  TestReadFormat(gl, isFormatFloat, gl.RGBA, HALF_FLOAT);
+  TestReadFormat(gl, isFormatFloat, gl.RGBA, HALF_FLOAT_OES);
+
+  //////////////////////////////////////
+
+  ok(true, 'Drawing:');
+
+  gl.clearColor(0.0, 1.5, 0.5, 1.0);
+  gl.clear(gl.COLOR_BUFFER_BIT);
+
+  if (isFormatFloat)
+    TestScreenColor(gl, isFormatFloat, 0, 1.5, 0.5, 1);
+  else
+    TestScreenColor(gl, isFormatFloat, 0, 1, 0.5, 1);
+
+  ////////
+
+  ok(true, 'Clearing:');
+
+  gl.uniform4f(prog.uFragColor, 0, 0.5, 1.5, 1);
+  gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
+
+  if (isFormatFloat)
+    TestScreenColor(gl, isFormatFloat, 0, 0.5, 1.5, 1);
+  else
+    TestScreenColor(gl, isFormatFloat, 0, 0.5, 1.0, 1);
+
+  ////////
+
+  ok(true, 'Blending:');
+
+  gl.enable(gl.BLEND);
+  gl.blendFunc(gl.CONSTANT_COLOR, gl.ZERO);
+  gl.blendColor(0, 10, 0.1, 1);
+
+  gl.uniform4f(prog.uFragColor, 0, 0.5, 15.0, 1);
+  gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
+
+  if (isFormatFloat)
+    TestScreenColor(gl, isFormatFloat, 0, 5.0, 1.5, 1);
+  else
+    TestScreenColor(gl, isFormatFloat, 0, 0.5, 0.1, 1);
+
+  gl.disable(gl.BLEND);
+
+  //////////////////////////////////////
+}
+
+// Give ourselves a scope to return early from:
+(function() {
+  var canvas = document.getElementById('c');
+  var attribs = {
+    antialias: false,
+    depth: false,
+  };
+  gl = canvas.getContext('experimental-webgl', attribs);
+  if (!gl) {
+    todo(false, 'WebGL is unavailable.');
+    return;
+  }
+
+  var cbf = gl.getExtension('WEBGL_color_buffer_float');
+  var cbhf = gl.getExtension('EXT_color_buffer_half_float');
+
+  //////////////////////////////////////
+
+  gl.viewport(0, 0, 1, 1);
+
+  var prog = ProgramByElemIds(gl, 'vs', 'fs');
+  ok(prog, 'Program should link.');
+  if (!prog)
+    return;
+
+  prog.aVertCoord = gl.getAttribLocation(prog, 'aVertCoord');
+  prog.uFragColor = gl.getUniformLocation(prog, 'uFragColor');
+
+  gl.useProgram(prog);
+
+  var arr = new Float32Array([
+    -1, -1,
+     1, -1,
+    -1,  1,
+     1,  1,
+  ]);
+  var vb = gl.createBuffer();
+  gl.bindBuffer(gl.ARRAY_BUFFER, vb);
+  gl.bufferData(gl.ARRAY_BUFFER, arr, gl.STATIC_DRAW);
+
+  gl.enableVertexAttribArray(0);
+  gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
+
+  //////////////////////////////////////
+
+  var fb = gl.createFramebuffer();
+  gl.bindFramebuffer(gl.FRAMEBUFFER, fb);
+
+  error = gl.getError();
+  ok(error == 0, 'Should be no errors after setup. (0x' + error.toString(16) + ')');
+
+  //////////////////////////////////////
+  ok(true, '---------------------------------------------------------------------------');
+  ok(true, 'RGBA8 texture');
+  TestType(gl, prog, true, RGBA8);
+
+  ok(true, '---------------------------------------------------------------------------');
+  ok(true, 'RGBA16F texture');
+  TestType(gl, prog, true, RGBA16F);
+
+  ok(true, '---------------------------------------------------------------------------');
+  ok(true, 'RGBA32F texture');
+  TestType(gl, prog, true, RGBA32F);
+
+  ////////
+
+  ok(true, '---------------------------------------------------------------------------');
+  ok(true, 'RGBA4 renderbuffer');
+  TestType(gl, prog, false, RGBA4);
+
+  ok(true, '---------------------------------------------------------------------------');
+  ok(true, 'RGBA16F renderbuffer');
+  TestType(gl, prog, false, RGBA16F);
+
+  ok(true, '---------------------------------------------------------------------------');
+  ok(true, 'RGBA32F renderbuffer');
+  TestType(gl, prog, false, RGBA32F);
+
+  ok(true, '---------------------------------------------------------------------------');
+  //////////////////////////////////////
+
+  error = gl.getError();
+  ok(error == 0, 'Should be no errors after test.');
+
+  ok(true, 'TEST COMPLETE');
+})();
+
+</script>
+
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/test/webgl-mochitest.ini	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/test/webgl-mochitest.ini	2015-02-28 15:03:07.000000000 +0000
@@ -22,6 +22,8 @@
 [webgl-mochitest/test_texsubimage_float.html]
 [webgl-mochitest/test_webgl_available.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
+#[webgl-mochitest/test_webgl_color_buffer_float.html]
+# We haven't cleaned up the Try results yet, but let's get this on the books first.
 [webgl-mochitest/test_webgl_conformance.html]
 skip-if = buildapp == 'mulet' || toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [webgl-mochitest/test_webgl_request_context.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGL2ContextFramebuffers.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGL2ContextFramebuffers.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGL2ContextFramebuffers.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGL2ContextFramebuffers.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -459,12 +459,45 @@
 void
 WebGL2Context::ReadBuffer(GLenum mode)
 {
-    MOZ_CRASH("Not Implemented.");
+    if (IsContextLost())
+        return;
+
+    MakeContextCurrent();
+
+    if (mBoundReadFramebuffer) {
+        bool isColorAttachment = (mode >= LOCAL_GL_COLOR_ATTACHMENT0 &&
+                                  mode <= LastColorAttachment());
+        if (mode != LOCAL_GL_NONE &&
+            !isColorAttachment)
+        {
+            ErrorInvalidEnumInfo("readBuffer: If READ_FRAMEBUFFER is non-null,"
+                                 " `mode` must be COLOR_ATTACHMENTN or NONE."
+                                 " Was:", mode);
+            return;
+        }
+
+        gl->fReadBuffer(mode);
+        return;
+    }
+
+    // Operating on the default framebuffer.
+
+    if (mode != LOCAL_GL_NONE &&
+        mode != LOCAL_GL_BACK)
+    {
+        ErrorInvalidEnumInfo("readBuffer: If READ_FRAMEBUFFER is null, `mode`"
+                             " must be BACK or NONE. Was:", mode);
+        return;
+    }
+
+    gl->Screen()->SetReadBuffer(mode);
 }
 
 void
-WebGL2Context::RenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat,
+WebGL2Context::RenderbufferStorageMultisample(GLenum target, GLsizei samples,
+                                              GLenum internalFormat,
                                               GLsizei width, GLsizei height)
 {
-    MOZ_CRASH("Not Implemented.");
+    RenderbufferStorage_base("renderbufferStorageMultisample", target, samples,
+                              internalFormat, width, height);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContext.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContext.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContext.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContext.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -203,6 +203,7 @@
 WebGLContext::WebGLContext()
     : WebGLContextUnchecked(nullptr)
     , mBypassShaderValidation(false)
+    , mGLMaxSamples(1)
     , mNeedsFakeNoAlpha(false)
 {
     mGeneration = 0;
@@ -1721,6 +1722,7 @@
     {
         ScopedBindFramebuffer autoFB(gl, 0);
         ClearBackbufferIfNeeded();
+        // TODO: Save, override, then restore glReadBuffer if present.
         ReadPixelsIntoDataSurface(gl, surf);
     }
 
@@ -1850,6 +1852,12 @@
     return ok;
 }
 
+size_t mozilla::RoundUpToMultipleOf(size_t value, size_t multiple)
+{
+    size_t overshoot = value + multiple - 1;
+    return overshoot - (overshoot % multiple);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 WebGLContext::ScopedMaskWorkaround::ScopedMaskWorkaround(WebGLContext& webgl)
@@ -1873,6 +1881,7 @@
                               mWebGL.mColorWriteMask[3]);
     }
 }
+
 ////////////////////////////////////////////////////////////////////////////////
 // XPCOM goop
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextFramebufferOperations.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextFramebufferOperations.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextFramebufferOperations.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextFramebufferOperations.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -49,8 +49,8 @@
     mShouldPresent = true;
 }
 
-static GLclampf
-GLClampFloat(GLclampf val)
+static GLfloat
+GLClampFloat(GLfloat val)
 {
     if (val < 0.0)
         return 0.0;
@@ -62,18 +62,28 @@
 }
 
 void
-WebGLContext::ClearColor(GLclampf r, GLclampf g,
-                             GLclampf b, GLclampf a)
+WebGLContext::ClearColor(GLfloat r, GLfloat g, GLfloat b, GLfloat a)
 {
     if (IsContextLost())
         return;
 
     MakeContextCurrent();
-    mColorClearValue[0] = GLClampFloat(r);
-    mColorClearValue[1] = GLClampFloat(g);
-    mColorClearValue[2] = GLClampFloat(b);
-    mColorClearValue[3] = GLClampFloat(a);
+
+    const bool supportsFloatColorBuffers = (IsExtensionEnabled(WebGLExtensionID::EXT_color_buffer_half_float) ||
+                                            IsExtensionEnabled(WebGLExtensionID::WEBGL_color_buffer_float));
+    if (!supportsFloatColorBuffers) {
+        r = GLClampFloat(r);
+        g = GLClampFloat(g);
+        b = GLClampFloat(b);
+        a = GLClampFloat(a);
+    }
+
     gl->fClearColor(r, g, b, a);
+
+    mColorClearValue[0] = r;
+    mColorClearValue[1] = g;
+    mColorClearValue[2] = b;
+    mColorClearValue[3] = a;
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextGL.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextGL.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextGL.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextGL.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -1863,6 +1863,84 @@
     return false;
 }
 
+static void
+ReadPixelsAndConvert(gl::GLContext* gl, GLint x, GLint y, GLsizei width, GLsizei height,
+                     GLenum readFormat, GLenum readType, size_t pixelStorePackAlignment,
+                     GLenum destFormat, GLenum destType, void* destBytes)
+{
+    if (readFormat == destFormat && readType == destType) {
+        gl->fReadPixels(x, y, width, height, destFormat, destType, destBytes);
+        return;
+    }
+
+    if (readFormat == LOCAL_GL_RGBA &&
+        readType == LOCAL_GL_HALF_FLOAT &&
+        destFormat == LOCAL_GL_RGBA &&
+        destType == LOCAL_GL_FLOAT)
+    {
+        size_t readBytesPerPixel = sizeof(uint16_t) * 4;
+        size_t destBytesPerPixel = sizeof(float) * 4;
+
+        size_t readBytesPerRow = readBytesPerPixel * width;
+
+        size_t readStride = RoundUpToMultipleOf(readBytesPerRow, pixelStorePackAlignment);
+        size_t destStride = RoundUpToMultipleOf(destBytesPerPixel * width,
+                                                pixelStorePackAlignment);
+
+        size_t bytesNeeded = ((height - 1) * readStride) + readBytesPerRow;
+        UniquePtr<uint8_t[]> readBuffer(new uint8_t[bytesNeeded]);
+
+        gl->fReadPixels(x, y, width, height, readFormat, readType, readBuffer.get());
+
+        size_t channelsPerRow = width * 4;
+        for (size_t j = 0; j < (size_t)height; j++) {
+            uint16_t* src = (uint16_t*)(readBuffer.get()) + j*readStride;
+            float* dst = (float*)(destBytes) + j*destStride;
+
+            uint16_t* srcEnd = src + channelsPerRow;
+            while (src != srcEnd) {
+                *dst = unpackFromFloat16(*src);
+
+                ++src;
+                ++dst;
+            }
+        }
+
+        return;
+    }
+
+    MOZ_CRASH("bad format/type");
+}
+
+static bool
+IsFormatAndTypeUnpackable(GLenum format, GLenum type)
+{
+    switch (type) {
+    case LOCAL_GL_UNSIGNED_BYTE:
+    case LOCAL_GL_FLOAT:
+    case LOCAL_GL_HALF_FLOAT:
+    case LOCAL_GL_HALF_FLOAT_OES:
+        switch (format) {
+        case LOCAL_GL_ALPHA:
+        case LOCAL_GL_RGB:
+        case LOCAL_GL_RGBA:
+            return true;
+        default:
+            return false;
+        }
+
+    case LOCAL_GL_UNSIGNED_SHORT_4_4_4_4:
+    case LOCAL_GL_UNSIGNED_SHORT_5_5_5_1:
+        return format == LOCAL_GL_RGBA;
+
+    case LOCAL_GL_UNSIGNED_SHORT_5_6_5:
+        return format == LOCAL_GL_RGB;
+
+    default:
+        return false;
+    }
+}
+
 void
 WebGLContext::ReadPixels(GLint x, GLint y, GLsizei width,
                          GLsizei height, GLenum format,
@@ -1883,59 +1961,61 @@
     if (pixels.IsNull())
         return ErrorInvalidValue("readPixels: null destination buffer");
 
+    if (!IsFormatAndTypeUnpackable(format, type))
+        return ErrorInvalidEnum("readPixels: Bad format or type.");
+
     const WebGLRectangleObject* framebufferRect = CurValidReadFBRectObject();
     GLsizei framebufferWidth = framebufferRect ? framebufferRect->Width() : 0;
     GLsizei framebufferHeight = framebufferRect ? framebufferRect->Height() : 0;
 
-    uint32_t channels = 0;
+    int channels = 0;
 
     // Check the format param
     switch (format) {
-        case LOCAL_GL_ALPHA:
-            channels = 1;
-            break;
-        case LOCAL_GL_RGB:
-            channels = 3;
-            break;
-        case LOCAL_GL_RGBA:
-            channels = 4;
-            break;
-        default:
-            return ErrorInvalidEnum("readPixels: Bad format");
+    case LOCAL_GL_ALPHA:
+        channels = 1;
+        break;
+    case LOCAL_GL_RGB:
+        channels = 3;
+        break;
+    case LOCAL_GL_RGBA:
+        channels = 4;
+        break;
+    default:
+        MOZ_CRASH("bad `format`");
     }
 
-    uint32_t bytesPerPixel = 0;
-    int requiredDataType = 0;
 
     // Check the type param
-    bool isReadTypeValid = false;
-    bool isReadTypeFloat = false;
+    int bytesPerPixel;
+    int requiredDataType;
     switch (type) {
-        case LOCAL_GL_UNSIGNED_BYTE:
-            isReadTypeValid = true;
-            bytesPerPixel = 1*channels;
-            requiredDataType = js::Scalar::Uint8;
-            break;
-        case LOCAL_GL_UNSIGNED_SHORT_4_4_4_4:
-        case LOCAL_GL_UNSIGNED_SHORT_5_5_5_1:
-        case LOCAL_GL_UNSIGNED_SHORT_5_6_5:
-            isReadTypeValid = true;
-            bytesPerPixel = 2;
-            requiredDataType = js::Scalar::Uint16;
-            break;
-        case LOCAL_GL_FLOAT:
-            if (IsExtensionEnabled(WebGLExtensionID::WEBGL_color_buffer_float) ||
-                IsExtensionEnabled(WebGLExtensionID::EXT_color_buffer_half_float))
-            {
-                isReadTypeValid = true;
-                isReadTypeFloat = true;
-                bytesPerPixel = 4*channels;
-                requiredDataType = js::Scalar::Float32;
-            }
-            break;
+    case LOCAL_GL_UNSIGNED_BYTE:
+        bytesPerPixel = 1*channels;
+        requiredDataType = js::Scalar::Uint8;
+        break;
+
+    case LOCAL_GL_UNSIGNED_SHORT_4_4_4_4:
+    case LOCAL_GL_UNSIGNED_SHORT_5_5_5_1:
+    case LOCAL_GL_UNSIGNED_SHORT_5_6_5:
+        bytesPerPixel = 2;
+        requiredDataType = js::Scalar::Uint16;
+        break;
+
+    case LOCAL_GL_FLOAT:
+        bytesPerPixel = 4*channels;
+        requiredDataType = js::Scalar::Float32;
+        break;
+
+    case LOCAL_GL_HALF_FLOAT:
+    case LOCAL_GL_HALF_FLOAT_OES:
+        bytesPerPixel = 2*channels;
+        requiredDataType = js::Scalar::Uint16;
+        break;
+
+    default:
+        MOZ_CRASH("bad `type`");
     }
-    if (!isReadTypeValid)
-        return ErrorInvalidEnum("readPixels: Bad type", type);
 
     const ArrayBufferView& pixbuf = pixels.Value();
     int dataType = JS_GetArrayBufferViewType(pixbuf.Obj());
@@ -1970,66 +2050,56 @@
         return rv.Throw(NS_ERROR_OUT_OF_MEMORY);
     }
 
-    bool isSourceTypeFloat = false;
-    if (mBoundReadFramebuffer &&
-        mBoundReadFramebuffer->ColorAttachmentCount() &&
-        mBoundReadFramebuffer->ColorAttachment(0).IsDefined())
-    {
-        isSourceTypeFloat = mBoundReadFramebuffer->ColorAttachment(0).IsReadableFloat();
-    }
-
-    if (isReadTypeFloat != isSourceTypeFloat)
-        return ErrorInvalidOperation("readPixels: Invalid type floatness");
-
-    // Check the format and type params to assure they are an acceptable pair (as per spec)
     MakeContextCurrent();
 
+    bool isSourceTypeFloat;
     if (mBoundReadFramebuffer) {
-        // prevent readback of arbitrary video memory through uninitialized renderbuffers!
-        if (!mBoundReadFramebuffer->CheckAndInitializeAttachments())
-            return ErrorInvalidFramebufferOperation("readPixels: incomplete framebuffer");
-
-        GLenum readPlaneBits = LOCAL_GL_COLOR_BUFFER_BIT;
-        if (!mBoundReadFramebuffer->HasCompletePlanes(readPlaneBits)) {
-            return ErrorInvalidOperation("readPixels: Read source attachment doesn't have the"
-                                         " correct color/depth/stencil type.");
-        }
+        TexInternalFormat srcFormat;
+        if (!mBoundReadFramebuffer->ValidateForRead("readPixels", &srcFormat))
+            return;
+
+        MOZ_ASSERT(srcFormat != LOCAL_GL_NONE);
+        TexType type = TypeFromInternalFormat(srcFormat);
+        isSourceTypeFloat = (type == LOCAL_GL_FLOAT ||
+                             type == LOCAL_GL_HALF_FLOAT);
     } else {
-      ClearBackbufferIfNeeded();
+        ClearBackbufferIfNeeded();
+
+        isSourceTypeFloat = false;
     }
 
-    bool isFormatAndTypeValid = false;
+    // Check the format and type params to assure they are an acceptable pair (as per spec)
+
+    const GLenum mainReadFormat = LOCAL_GL_RGBA;
+    const GLenum mainReadType = isSourceTypeFloat ? LOCAL_GL_FLOAT
+                                                  : LOCAL_GL_UNSIGNED_BYTE;
+
+    GLenum auxReadFormat = mainReadFormat;
+    GLenum auxReadType = mainReadType;
 
     // OpenGL ES 2.0 $4.3.1 - IMPLEMENTATION_COLOR_READ_{TYPE/FORMAT} is a valid
     // combination for glReadPixels().
     if (gl->IsSupported(gl::GLFeature::ES2_compatibility)) {
-        GLenum implType = 0;
-        GLenum implFormat = 0;
-
-        gl->fGetIntegerv(LOCAL_GL_IMPLEMENTATION_COLOR_READ_TYPE,
-                         reinterpret_cast<GLint*>(&implType));
         gl->fGetIntegerv(LOCAL_GL_IMPLEMENTATION_COLOR_READ_FORMAT,
-                         reinterpret_cast<GLint*>(&implFormat));
-
-        if (type == implType && format == implFormat) {
-            isFormatAndTypeValid = true;
-        }
-    }
-
-    switch (format) {
-        case LOCAL_GL_RGBA: {
-            switch (type) {
-                case LOCAL_GL_UNSIGNED_BYTE:
-                case LOCAL_GL_FLOAT:
-                    isFormatAndTypeValid = true;
-                    break;
-            }
-            break;
-        }
+                         reinterpret_cast<GLint*>(&auxReadFormat));
+        gl->fGetIntegerv(LOCAL_GL_IMPLEMENTATION_COLOR_READ_TYPE,
+                         reinterpret_cast<GLint*>(&auxReadType));
     }
 
-    if (!isFormatAndTypeValid) {
+    const bool mainMatches = (format == mainReadFormat && type == mainReadType);
+    const bool auxMatches = (format == auxReadFormat && type == auxReadType);
+    const bool isValid = mainMatches || auxMatches;
+    if (!isValid)
         return ErrorInvalidOperation("readPixels: Invalid format/type pair");
+
+    GLenum readType = type;
+    if (gl->WorkAroundDriverBugs() && gl->IsANGLE()) {
+        if (type == LOCAL_GL_FLOAT &&
+            auxReadFormat == format &&
+            auxReadType == LOCAL_GL_HALF_FLOAT)
+        {
+            readType = auxReadType;
+        }
     }
 
     // Now that the errors are out of the way, on to actually reading
@@ -2040,7 +2110,10 @@
 
     if (CanvasUtils::CheckSaneSubrectSize(x, y, width, height, framebufferWidth, framebufferHeight)) {
         // the easy case: we're not reading out-of-range pixels
-        gl->fReadPixels(x, y, width, height, format, type, data);
+
+        // Effectively: gl->fReadPixels(x, y, width, height, format, type, dest);
+        ReadPixelsAndConvert(gl, x, y, width, height, format, readType,
+                             mPixelStorePackAlignment, format, type, data);
     } else {
         // the rectangle doesn't fit entirely in the bound buffer. We then have to set to zero the part
         // of the buffer that correspond to out-of-range pixels. We don't want to rely on system OpenGL
@@ -2089,8 +2162,11 @@
         if (!subrect_data)
             return ErrorOutOfMemory("readPixels: subrect_data");
 
-        gl->fReadPixels(subrect_x, subrect_y, subrect_width, subrect_height,
-                        format, type, subrect_data.get());
+        // Effectively: gl->fReadPixels(subrect_x, subrect_y, subrect_width,
+        //                              subrect_height, format, type, subrect_data.get());
+        ReadPixelsAndConvert(gl, subrect_x, subrect_y, subrect_width, subrect_height,
+                             format, readType, mPixelStorePackAlignment, format, type,
+                             subrect_data.get());
 
         // notice that this for loop terminates because we already checked that subrect_height is at most height
         for (GLint y_inside_subrect = 0; y_inside_subrect < subrect_height; ++y_inside_subrect) {
@@ -2128,96 +2204,157 @@
 }
 
 void
-WebGLContext::RenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
+WebGLContext::RenderbufferStorage_base(const char* funcName, GLenum target,
+                                       GLsizei samples,
+                                       GLenum internalFormat, GLsizei width,
+                                       GLsizei height)
 {
     if (IsContextLost())
         return;
 
-    if (!mBoundRenderbuffer)
-        return ErrorInvalidOperation("renderbufferStorage called on renderbuffer 0");
+    if (!mBoundRenderbuffer) {
+        ErrorInvalidOperation("%s: Called on renderbuffer 0.", funcName);
+        return;
+    }
 
-    if (target != LOCAL_GL_RENDERBUFFER)
-        return ErrorInvalidEnumInfo("renderbufferStorage: target", target);
+    if (target != LOCAL_GL_RENDERBUFFER) {
+        ErrorInvalidEnumInfo("`target`", funcName, target);
+        return;
+    }
 
-    if (width < 0 || height < 0)
-        return ErrorInvalidValue("renderbufferStorage: width and height must be >= 0");
+    if (samples < 0 || samples > mGLMaxSamples) {
+        ErrorInvalidValue("%s: `samples` is out of the valid range.", funcName);
+        return;
+    }
+
+    if (width < 0 || height < 0) {
+        ErrorInvalidValue("%s: Width and height must be >= 0.", funcName);
+        return;
+    }
+
+    if (width > mGLMaxRenderbufferSize || height > mGLMaxRenderbufferSize) {
+        ErrorInvalidValue("%s: Width or height exceeds maximum renderbuffer"
+                          " size.", funcName);
+        return;
+    }
+
+    bool isFormatValid = false;
+    switch (internalFormat) {
+    case LOCAL_GL_RGBA4:
+    case LOCAL_GL_RGB5_A1:
+    case LOCAL_GL_RGB565:
+    case LOCAL_GL_DEPTH_COMPONENT16:
+    case LOCAL_GL_STENCIL_INDEX8:
+    case LOCAL_GL_DEPTH_STENCIL:
+        isFormatValid = true;
+        break;
+
+    case LOCAL_GL_SRGB8_ALPHA8_EXT:
+        if (IsExtensionEnabled(WebGLExtensionID::EXT_sRGB))
+            isFormatValid = true;
+        break;
 
-    if (width > mGLMaxRenderbufferSize || height > mGLMaxRenderbufferSize)
-        return ErrorInvalidValue("renderbufferStorage: width or height exceeds maximum renderbuffer size");
+    case LOCAL_GL_RGB16F:
+    case LOCAL_GL_RGBA16F:
+        if (IsExtensionEnabled(WebGLExtensionID::OES_texture_half_float) &&
+            IsExtensionEnabled(WebGLExtensionID::EXT_color_buffer_half_float))
+        {
+            isFormatValid = true;
+        }
+        break;
+
+    case LOCAL_GL_RGB32F:
+    case LOCAL_GL_RGBA32F:
+        if (IsExtensionEnabled(WebGLExtensionID::OES_texture_float) &&
+            IsExtensionEnabled(WebGLExtensionID::WEBGL_color_buffer_float))
+        {
+            isFormatValid = true;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    if (!isFormatValid) {
+        ErrorInvalidEnumInfo("`internalFormat`", funcName, internalFormat);
+        return;
+    }
 
     // certain OpenGL ES renderbuffer formats may not exist on desktop OpenGL
-    GLenum internalformatForGL = internalformat;
+    GLenum internalFormatForGL = internalFormat;
 
-    switch (internalformat) {
+    switch (internalFormat) {
     case LOCAL_GL_RGBA4:
     case LOCAL_GL_RGB5_A1:
         // 16-bit RGBA formats are not supported on desktop GL
-        if (!gl->IsGLES()) internalformatForGL = LOCAL_GL_RGBA8;
+        if (!gl->IsGLES())
+            internalFormatForGL = LOCAL_GL_RGBA8;
         break;
+
     case LOCAL_GL_RGB565:
         // the RGB565 format is not supported on desktop GL
-        if (!gl->IsGLES()) internalformatForGL = LOCAL_GL_RGB8;
+        if (!gl->IsGLES())
+            internalFormatForGL = LOCAL_GL_RGB8;
         break;
+
     case LOCAL_GL_DEPTH_COMPONENT16:
         if (!gl->IsGLES() || gl->IsExtensionSupported(gl::GLContext::OES_depth24))
-            internalformatForGL = LOCAL_GL_DEPTH_COMPONENT24;
+            internalFormatForGL = LOCAL_GL_DEPTH_COMPONENT24;
         else if (gl->IsExtensionSupported(gl::GLContext::OES_packed_depth_stencil))
-            internalformatForGL = LOCAL_GL_DEPTH24_STENCIL8;
-        break;
-    case LOCAL_GL_STENCIL_INDEX8:
+            internalFormatForGL = LOCAL_GL_DEPTH24_STENCIL8;
         break;
+
     case LOCAL_GL_DEPTH_STENCIL:
         // We emulate this in WebGLRenderbuffer if we don't have the requisite extension.
-        internalformatForGL = LOCAL_GL_DEPTH24_STENCIL8;
-        break;
-    case LOCAL_GL_SRGB8_ALPHA8_EXT:
-        break;
-    case LOCAL_GL_RGB16F:
-    case LOCAL_GL_RGBA16F: {
-        bool hasExtensions = IsExtensionEnabled(WebGLExtensionID::OES_texture_half_float) &&
-                             IsExtensionEnabled(WebGLExtensionID::EXT_color_buffer_half_float);
-        if (!hasExtensions)
-            return ErrorInvalidEnumInfo("renderbufferStorage: internalformat", internalformat);
-        break;
-    }
-    case LOCAL_GL_RGB32F:
-    case LOCAL_GL_RGBA32F: {
-        bool hasExtensions = IsExtensionEnabled(WebGLExtensionID::OES_texture_float) &&
-                             IsExtensionEnabled(WebGLExtensionID::WEBGL_color_buffer_float);
-        if (!hasExtensions)
-            return ErrorInvalidEnumInfo("renderbufferStorage: internalformat", internalformat);
+        internalFormatForGL = LOCAL_GL_DEPTH24_STENCIL8;
         break;
-    }
+
     default:
-        return ErrorInvalidEnumInfo("renderbufferStorage: internalformat", internalformat);
+        break;
     }
 
+    // Validation complete.
+
     MakeContextCurrent();
 
-    bool sizeChanges = width != mBoundRenderbuffer->Width() ||
-                       height != mBoundRenderbuffer->Height() ||
-                       internalformat != mBoundRenderbuffer->InternalFormat();
-    if (sizeChanges) {
+    bool willRealloc = samples != mBoundRenderbuffer->Samples() ||
+                       internalFormat != mBoundRenderbuffer->InternalFormat() ||
+                       width != mBoundRenderbuffer->Width() ||
+                       height != mBoundRenderbuffer->Height();
+
+    if (willRealloc) {
         // Invalidate framebuffer status cache
         mBoundRenderbuffer->NotifyFBsStatusChanged();
         GetAndFlushUnderlyingGLErrors();
-        mBoundRenderbuffer->RenderbufferStorage(internalformatForGL, width, height);
+        mBoundRenderbuffer->RenderbufferStorage(samples, internalFormatForGL,
+                                                width, height);
         GLenum error = GetAndFlushUnderlyingGLErrors();
         if (error) {
-            GenerateWarning("renderbufferStorage generated error %s", ErrorName(error));
+            GenerateWarning("%s generated error %s", funcName,
+                            ErrorName(error));
             return;
         }
     } else {
-        mBoundRenderbuffer->RenderbufferStorage(internalformatForGL, width, height);
+        mBoundRenderbuffer->RenderbufferStorage(samples, internalFormatForGL,
+                                                width, height);
     }
 
-    mBoundRenderbuffer->SetInternalFormat(internalformat);
-    mBoundRenderbuffer->SetInternalFormatForGL(internalformatForGL);
+    mBoundRenderbuffer->SetSamples(samples);
+    mBoundRenderbuffer->SetInternalFormat(internalFormat);
+    mBoundRenderbuffer->SetInternalFormatForGL(internalFormatForGL);
     mBoundRenderbuffer->setDimensions(width, height);
     mBoundRenderbuffer->SetImageDataStatus(WebGLImageDataStatus::UninitializedImageData);
 }
 
 void
+WebGLContext::RenderbufferStorage(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height)
+{
+    RenderbufferStorage_base("renderbufferStorage", target, 0,
+                             internalFormat, width, height);
+}
+
+void
 WebGLContext::Scissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
     if (IsContextLost())
@@ -3541,7 +3678,7 @@
 }
 
 void
-WebGLContext::BlendColor(GLclampf r, GLclampf g, GLclampf b, GLclampf a) {
+WebGLContext::BlendColor(GLfloat r, GLfloat g, GLfloat b, GLfloat a) {
     if (IsContextLost())
         return;
     MakeContextCurrent();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContext.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContext.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContext.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContext.h	2015-02-28 15:03:06.000000000 +0000
@@ -254,7 +254,9 @@
     void ErrorInvalidOperation(const char* fmt = 0, ...);
     void ErrorInvalidValue(const char* fmt = 0, ...);
     void ErrorInvalidFramebufferOperation(const char* fmt = 0, ...);
-    void ErrorInvalidEnumInfo(const char* info, GLenum enumvalue);
+    void ErrorInvalidEnumInfo(const char* info, GLenum enumValue);
+    void ErrorInvalidEnumInfo(const char* info, const char* funcName,
+                              GLenum enumValue);
     void ErrorOutOfMemory(const char* fmt = 0, ...);
 
     const char* ErrorName(GLenum error);
@@ -531,6 +533,11 @@
                     ErrorResult& rv);
     void RenderbufferStorage(GLenum target, GLenum internalFormat,
                              GLsizei width, GLsizei height);
+protected:
+    void RenderbufferStorage_base(const char* funcName, GLenum target,
+                                  GLsizei samples, GLenum internalformat,
+                                  GLsizei width, GLsizei height);
+public:
     void SampleCoverage(GLclampf value, WebGLboolean invert);
     void Scissor(GLint x, GLint y, GLsizei width, GLsizei height);
     void ShaderSource(WebGLShader* shader, const nsAString& source);
@@ -1085,9 +1092,7 @@
                                               GLenum pname);
 
     // Returns x rounded to the next highest multiple of y.
-    static CheckedUint32 RoundedToNextMultipleOf(CheckedUint32 x,
-                                                 CheckedUint32 y)
-    {
+    static CheckedUint32 RoundedToNextMultipleOf(CheckedUint32 x, CheckedUint32 y) {
         return ((x + y - 1) / y) * y;
     }
 
@@ -1146,8 +1151,9 @@
     int32_t mGLMaxVertexUniformVectors;
     int32_t mGLMaxColorAttachments;
     int32_t mGLMaxDrawBuffers;
-    GLuint  mGLMaxTransformFeedbackSeparateAttribs;
+    uint32_t  mGLMaxTransformFeedbackSeparateAttribs;
     GLuint  mGLMaxUniformBufferBindings;
+    GLsizei mGLMaxSamples;
 
 public:
     GLuint MaxVertexAttribs() const {
@@ -1422,6 +1428,10 @@
 
     uint32_t mMaxFramebufferColorAttachments;
 
+    GLenum LastColorAttachment() const {
+        return LOCAL_GL_COLOR_ATTACHMENT0 + mMaxFramebufferColorAttachments - 1;
+    }
+
     bool ValidateFramebufferTarget(GLenum target, const char* const info);
 
     WebGLRefPtr<WebGLFramebuffer> mBoundDrawFramebuffer;
@@ -1681,6 +1691,8 @@
     WebGLContext* mWebGL;
 };
 
+size_t RoundUpToMultipleOf(size_t value, size_t multiple);
+
 } // namespace mozilla
 
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextState.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextState.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextState.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextState.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -266,6 +266,16 @@
             return JS::NumberValue(uint32_t(i));
         }
         case LOCAL_GL_IMPLEMENTATION_COLOR_READ_TYPE: {
+            if (mBoundReadFramebuffer) {
+                FBStatus status = mBoundReadFramebuffer->CheckFramebufferStatus();
+                if (status != LOCAL_GL_FRAMEBUFFER_COMPLETE) {
+                    ErrorInvalidOperation("getParameter: Read framebuffer must be"
+                                          " complete before querying"
+                                          " IMPLEMENTATION_COLOR_READ_TYPE.");
+                    return JS::NullValue();
+                }
+            }
+
             GLint i = 0;
             if (gl->IsSupported(gl::GLFeature::ES2_compatibility)) {
                 gl->fGetIntegerv(pname, &i);
@@ -275,6 +285,16 @@
             return JS::NumberValue(uint32_t(i));
         }
         case LOCAL_GL_IMPLEMENTATION_COLOR_READ_FORMAT: {
+            if (mBoundReadFramebuffer) {
+                FBStatus status = mBoundReadFramebuffer->CheckFramebufferStatus();
+                if (status != LOCAL_GL_FRAMEBUFFER_COMPLETE) {
+                    ErrorInvalidOperation("getParameter: Read framebuffer must be"
+                                          " complete before querying"
+                                          " IMPLEMENTATION_COLOR_READ_FORMAT.");
+                    return JS::NullValue();
+                }
+            }
+
             GLint i = 0;
             if (gl->IsSupported(gl::GLFeature::ES2_compatibility)) {
                 gl->fGetIntegerv(pname, &i);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextUtils.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextUtils.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -501,12 +501,23 @@
 }
 
 void
-WebGLContext::ErrorInvalidEnumInfo(const char* info, GLenum enumvalue)
+WebGLContext::ErrorInvalidEnumInfo(const char* info, GLenum enumValue)
 {
     nsCString name;
-    EnumName(enumvalue, &name);
+    EnumName(enumValue, &name);
 
-    return ErrorInvalidEnum("%s: invalid enum value %s", info, name.get());
+    return ErrorInvalidEnum("%s: invalid enum value %s", info, name.BeginReading());
+}
+
+void
+WebGLContext::ErrorInvalidEnumInfo(const char* info, const char* funcName,
+                                   GLenum enumValue)
+{
+    nsCString name;
+    EnumName(enumValue, &name);
+
+    ErrorInvalidEnum("%s: %s: Invalid enum: 0x%04x (%s).", funcName, info,
+                     enumValue, name.BeginReading());
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextValidate.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextValidate.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLContextValidate.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLContextValidate.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -1286,25 +1286,11 @@
     GLenum fboFormat = mOptions.alpha ? LOCAL_GL_RGBA : LOCAL_GL_RGB;
 
     if (mBoundReadFramebuffer) {
-        if (!mBoundReadFramebuffer->CheckAndInitializeAttachments()) {
-            ErrorInvalidFramebufferOperation("%s: Incomplete framebuffer.",
-                                             InfoFrom(func, dims));
+        TexInternalFormat srcFormat;
+        if (!mBoundReadFramebuffer->ValidateForRead(InfoFrom(func, dims), &srcFormat))
             return false;
-        }
-
-        GLenum readPlaneBits = LOCAL_GL_COLOR_BUFFER_BIT;
-        if (!mBoundReadFramebuffer->HasCompletePlanes(readPlaneBits)) {
-            ErrorInvalidOperation("%s: Read source attachment doesn't have the"
-                                  " correct color/depth/stencil type.",
-                                  InfoFrom(func, dims));
-            return false;
-        }
-
-        // Get the correct format for the framebuffer, as it's not the default one.
-        const WebGLFramebuffer::Attachment& color0 =
-            mBoundReadFramebuffer->GetAttachment(LOCAL_GL_COLOR_ATTACHMENT0);
 
-        fboFormat = mBoundReadFramebuffer->GetFormatForAttachment(color0);
+        fboFormat = srcFormat.get();
     }
 
     // Make sure the format of the framebuffer is a superset of the format
@@ -1818,12 +1804,16 @@
         mGLMaxRenderbufferSize = MINVALUE_GL_MAX_RENDERBUFFER_SIZE;
         mGLMaxTextureImageUnits = MINVALUE_GL_MAX_TEXTURE_IMAGE_UNITS;
         mGLMaxVertexTextureImageUnits = MINVALUE_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS;
+        mGLMaxSamples = 1;
     } else {
         gl->fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &mGLMaxTextureSize);
         gl->fGetIntegerv(LOCAL_GL_MAX_CUBE_MAP_TEXTURE_SIZE, &mGLMaxCubeMapTextureSize);
         gl->fGetIntegerv(LOCAL_GL_MAX_RENDERBUFFER_SIZE, &mGLMaxRenderbufferSize);
         gl->fGetIntegerv(LOCAL_GL_MAX_TEXTURE_IMAGE_UNITS, &mGLMaxTextureImageUnits);
         gl->fGetIntegerv(LOCAL_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &mGLMaxVertexTextureImageUnits);
+
+        if (!gl->GetPotentialInteger(LOCAL_GL_MAX_SAMPLES, (GLint*)&mGLMaxSamples))
+            mGLMaxSamples = 1;
     }
 
     // Calculate log2 of mGLMaxTextureSize and mGLMaxCubeMapTextureSize
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -26,7 +26,8 @@
     gl::GLContext* gl = webgl->GL();
 
     // ANGLE doesn't support ReadPixels from a RGBA16F with RGBA/FLOAT.
-    return gl->IsSupported(gl::GLFeature::renderbuffer_color_half_float);
+    return gl->IsSupported(gl::GLFeature::renderbuffer_color_half_float) ||
+           gl->IsANGLE();
 }
 
 IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionColorBufferHalfFloat)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLFramebuffer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLFramebuffer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLFramebuffer.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLFramebuffer.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -28,6 +28,7 @@
     , mDepthAttachment(LOCAL_GL_DEPTH_ATTACHMENT)
     , mStencilAttachment(LOCAL_GL_STENCIL_ATTACHMENT)
     , mDepthStencilAttachment(LOCAL_GL_DEPTH_STENCIL_ATTACHMENT)
+    , mReadBufferMode(LOCAL_GL_COLOR_ATTACHMENT0)
 {
     mContext->mFramebuffers.insertBack(this);
 
@@ -128,6 +129,7 @@
     MOZ_ASSERT(internalformat != LOCAL_GL_NONE);
     TexType type = TypeFromInternalFormat(internalformat);
     return type == LOCAL_GL_FLOAT ||
+           type == LOCAL_GL_HALF_FLOAT_OES ||
            type == LOCAL_GL_HALF_FLOAT;
 }
 
@@ -802,6 +804,7 @@
     // Ok, attach our chosen flavor of {DEPTH, STENCIL, DEPTH_STENCIL}.
     FinalizeAttachments();
 
+    // TODO: This should not be unconditionally GL_FRAMEBUFFER.
     mStatus = mContext->gl->fCheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER);
     return mStatus;
 }
@@ -977,6 +980,38 @@
     FinalizeDrawAndReadBuffers(gl, ColorAttachment(0).IsDefined());
 }
 
+bool
+WebGLFramebuffer::ValidateForRead(const char* info, TexInternalFormat* const out_format)
+{
+    if (mReadBufferMode == LOCAL_GL_NONE) {
+        mContext->ErrorInvalidOperation("%s: Read buffer mode must not be"
+                                        " NONE.", info);
+        return false;
+    }
+
+    const auto& attachment = GetAttachment(mReadBufferMode);
+
+    if (!CheckAndInitializeAttachments()) {
+        mContext->ErrorInvalidFramebufferOperation("readPixels: incomplete framebuffer");
+        return false;
+    }
+
+    GLenum readPlaneBits = LOCAL_GL_COLOR_BUFFER_BIT;
+    if (!HasCompletePlanes(readPlaneBits)) {
+        mContext->ErrorInvalidOperation("readPixels: Read source attachment doesn't have the"
+                                        " correct color/depth/stencil type.");
+        return false;
+    }
+
+    if (!attachment.IsDefined()) {
+        mContext->ErrorInvalidOperation("readPixels: ");
+        return false;
+    }
+
+    *out_format = attachment.EffectiveInternalFormat();
+    return true;
+}
+
 inline void
 ImplCycleCollectionUnlink(mozilla::WebGLFramebuffer::Attachment& field)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLFramebuffer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLFramebuffer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLFramebuffer.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLFramebuffer.h	2015-02-28 15:03:06.000000000 +0000
@@ -174,6 +174,8 @@
 
     void NotifyAttachableChanged() const;
 
+    bool ValidateForRead(const char* info, TexInternalFormat* const out_format);
+
 private:
     ~WebGLFramebuffer() {
         DeleteOnce();
@@ -187,6 +189,7 @@
     Attachment mDepthAttachment;
     Attachment mStencilAttachment;
     Attachment mDepthStencilAttachment;
+    GLenum mReadBufferMode;
 };
 
 } // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLRenderbuffer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLRenderbuffer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLRenderbuffer.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLRenderbuffer.cpp	2015-02-28 15:03:06.000000000 +0000
@@ -54,6 +54,7 @@
     , mInternalFormat(0)
     , mInternalFormatForGL(0)
     , mImageDataStatus(WebGLImageDataStatus::NoImageData)
+    , mSamples(1)
 {
     mContext->MakeContextCurrent();
 
@@ -156,11 +157,30 @@
     mContext->gl->fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, mPrimaryRB);
 }
 
+static void
+RenderbufferStorageMaybeMultisample(gl::GLContext* gl, GLsizei samples,
+                                    GLenum internalFormat, GLsizei width,
+                                    GLsizei height)
+{
+    MOZ_ASSERT_IF(samples >= 1, gl->IsSupported(gl::GLFeature::framebuffer_multisample));
+    MOZ_ASSERT(samples >= 0);
+    MOZ_ASSERT(samples <= gl->MaxSamples());
+
+    if (samples > 0) {
+        gl->fRenderbufferStorageMultisample(LOCAL_GL_RENDERBUFFER, samples,
+                                            internalFormat, width, height);
+    } else {
+        gl->fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, internalFormat, width,
+                                 height);
+    }
+}
+
 void
-WebGLRenderbuffer::RenderbufferStorage(GLenum internalFormat, GLsizei width,
-                                       GLsizei height) const
+WebGLRenderbuffer::RenderbufferStorage(GLsizei samples, GLenum internalFormat,
+                                       GLsizei width, GLsizei height) const
 {
     gl::GLContext* gl = mContext->gl;
+    MOZ_ASSERT(samples >= 0 && samples <= 256); // Sanity check.
 
     GLenum primaryFormat = internalFormat;
     GLenum secondaryFormat = 0;
@@ -170,7 +190,8 @@
         secondaryFormat = LOCAL_GL_STENCIL_INDEX8;
     }
 
-    gl->fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, primaryFormat, width, height);
+    RenderbufferStorageMaybeMultisample(gl, samples, primaryFormat, width,
+                                        height);
 
     if (!mSecondaryRB) {
         MOZ_ASSERT(!secondaryFormat);
@@ -182,9 +203,10 @@
     // non-depth-stencil attachment point.
     gl::ScopedBindRenderbuffer autoRB(gl, mSecondaryRB);
     if (secondaryFormat) {
-        gl->fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, secondaryFormat, width, height);
+        RenderbufferStorageMaybeMultisample(gl, samples, secondaryFormat, width,
+                                            height);
     } else {
-        gl->fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, LOCAL_GL_RGBA4, 1, 1);
+        RenderbufferStorageMaybeMultisample(gl, samples, LOCAL_GL_RGBA4, 1, 1);
     }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLRenderbuffer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLRenderbuffer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLRenderbuffer.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLRenderbuffer.h	2015-02-28 15:03:06.000000000 +0000
@@ -38,6 +38,9 @@
         mImageDataStatus = x;
     }
 
+    GLsizei Samples() const { return mSamples; }
+    void SetSamples(GLsizei samples) { mSamples = samples; }
+
     GLenum InternalFormat() const { return mInternalFormat; }
     void SetInternalFormat(GLenum internalFormat) {
         mInternalFormat = internalFormat;
@@ -55,8 +58,8 @@
     }
 
     void BindRenderbuffer() const;
-    void RenderbufferStorage(GLenum internalFormat, GLsizei width,
-                             GLsizei height) const;
+    void RenderbufferStorage(GLsizei samples, GLenum internalFormat,
+                             GLsizei width, GLsizei height) const;
     void FramebufferRenderbuffer(FBAttachment attachment) const;
     // Only handles a subset of `pname`s.
     GLint GetRenderbufferParameter(RBTarget target, RBParam pname) const;
@@ -76,6 +79,7 @@
     GLenum mInternalFormat;
     GLenum mInternalFormatForGL;
     WebGLImageDataStatus mImageDataStatus;
+    GLsizei mSamples;
 
     friend class WebGLFramebuffer;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLTexelConversions.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLTexelConversions.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/canvas/WebGLTexelConversions.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/canvas/WebGLTexelConversions.h	2015-02-28 15:03:06.000000000 +0000
@@ -105,7 +105,7 @@
     uint16_t exp = (v >> 10) & 0x001F;
     uint16_t mantissa = v & 0x03FF;
 
-    if (exp) {
+    if (!exp) {
         // Handle denormalized numbers
         // Adapted from: OpenGL ES 2.0 Programming Guide Appx.
         // Converting Float to Half-Float
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_app_install.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_app_install.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_app_install.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_app_install.html	2015-02-28 15:03:07.000000000 +0000
@@ -14,7 +14,7 @@
 
   var gBaseURL = 'http://test/tests/dom/datastore/tests/';
   var gHostedManifestURL = gBaseURL + 'file_app.sjs?testToken=file_app_install.html';
-  var gGenerator = runTest();
+  var gGenerator;
 
   SpecialPowers.pushPermissions(
     [{ "type": "browser", "allow": 1, "context": document },
@@ -25,11 +25,12 @@
                                          ["dom.datastore.sysMsgOnChangeShortTimeoutSec", 1],
                                          ["dom.datastore.sysMsgOnChangeLongTimeoutSec", 3],
                                          ["dom.testing.ignore_ipc_principal", true],
-                                         ["dom.testing.datastore_enabled_for_hosted_apps", true]]}, function() {
-
+                                         ["dom.testing.datastore_enabled_for_hosted_apps", true],
+					 ["dom.mozBrowserFramesEnabled", true]]}, function() {
         if (SpecialPowers.isMainProcess()) {
           SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
         }
+        gGenerator = runTest();
         gGenerator.next(); });
     });
 
@@ -49,8 +50,6 @@
     is(typeof navigator.getDataStores, "function", "getDataStores exists and it's a function");
 
     SpecialPowers.setAllAppsLaunchable(true);
-    SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-
     SpecialPowers.autoConfirmAppInstall(continueTest);
     yield undefined;
 
@@ -102,7 +101,6 @@
   }
 
   function finish() {
-    SpecialPowers.clearUserPref("dom.mozBrowserFramesEnabled");
     SimpleTest.finish();
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_arrays.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_arrays.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_arrays.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_arrays.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_basic.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_basic.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_basic.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_basic.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_basic_worker.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_basic_worker.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_basic_worker.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_basic_worker.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest)
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug1008044.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug1008044.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug1008044.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug1008044.html	2015-02-28 15:03:07.000000000 +0000
@@ -90,8 +90,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug1058108.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug1058108.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug1058108.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug1058108.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug924104.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug924104.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug924104.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug924104.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug957086.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug957086.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug957086.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug957086.html	2015-02-28 15:03:07.000000000 +0000
@@ -94,8 +94,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug976311.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug976311.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_bug976311.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_bug976311.html	2015-02-28 15:03:07.000000000 +0000
@@ -94,8 +94,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_certifiedApp.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_certifiedApp.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_certifiedApp.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_certifiedApp.html	2015-02-28 15:03:07.000000000 +0000
@@ -96,8 +96,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_duplicate.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_duplicate.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_duplicate.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_duplicate.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_keys.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_keys.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_keys.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_keys.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_oop_events.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_oop_events.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_oop_events.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_oop_events.html	2015-02-28 15:03:07.000000000 +0000
@@ -118,8 +118,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_oop.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_oop.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_oop.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_oop.html	2015-02-28 15:03:07.000000000 +0000
@@ -90,8 +90,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_readonly.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_readonly.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_readonly.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_readonly.html	2015-02-28 15:03:07.000000000 +0000
@@ -11,13 +11,15 @@
   <script type="application/javascript;version=1.7">
   var gHostedManifestURL = 'http://test/tests/dom/datastore/tests/file_app.sjs?testToken=file_readonly.html';
   var gHostedManifestURL2 = 'http://example.com/tests/dom/datastore/tests/file_app.sjs?testToken=file_readonly.html&template=file_app2.template.webapp';
-  var gGenerator = runTest();
-
-  SpecialPowers.pushPermissions(
-    [{ "type": "browser", "allow": 1, "context": document },
-     { "type": "embed-apps", "allow": 1, "context": document },
-     { "type": "webapps-manage", "allow": 1, "context": document }],
-    function() { gGenerator.next() });
+  var gGenerator;
+  SpecialPowers.pushPrefEnv({"set": [["dom.mozBrowserFramesEnabled", true]]}, function() {
+    gGenerator = runTest();
+    SpecialPowers.pushPermissions(
+      [{ "type": "browser", "allow": 1, "context": document },
+       { "type": "embed-apps", "allow": 1, "context": document },
+       { "type": "webapps-manage", "allow": 1, "context": document }],
+       function() { gGenerator.next() });
+  });
 
   function continueTest() {
     try { gGenerator.next(); }
@@ -35,8 +37,6 @@
     }
 
     SpecialPowers.setAllAppsLaunchable(true);
-    SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-
     SpecialPowers.autoConfirmAppInstall(continueTest);
     yield undefined;
 
@@ -98,7 +98,6 @@
   }
 
   function finish() {
-    SpecialPowers.clearUserPref("dom.mozBrowserFramesEnabled");
     SimpleTest.finish();
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_sync.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_sync.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_sync.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_sync.html	2015-02-28 15:03:07.000000000 +0000
@@ -88,8 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_sync_worker.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_sync_worker.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_sync_worker.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_sync_worker.html	2015-02-28 15:03:07.000000000 +0000
@@ -88,8 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest)
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_transactions.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_transactions.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_transactions.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_transactions.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_worker_close.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_worker_close.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/datastore/tests/test_worker_close.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/datastore/tests/test_worker_close.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,8 +89,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTest();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/DownloadsAPI.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/DownloadsAPI.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/DownloadsAPI.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/DownloadsAPI.js	2015-02-28 15:03:07.000000000 +0000
@@ -21,6 +21,12 @@
                                    "@mozilla.org/telephony/volume-service;1",
                                     "nsIVolumeService");
 
+/**
+  * The content process implementations of navigator.mozDownloadManager and its
+  * DOMDownload download objects.  Uses DownloadsIPC.jsm to communicate with
+  * DownloadsAPI.jsm in the parent process.
+  */
+
 function debug(aStr) {
 #ifdef MOZ_DEBUG
   dump("-*- DownloadsAPI.js : " + aStr + "\n");
@@ -40,6 +46,15 @@
     this.initDOMRequestHelper(aWindow,
                               ["Downloads:Added",
                                "Downloads:Removed"]);
+
+    // Get the manifest URL if this is an installed app
+    let appsService = Cc["@mozilla.org/AppsService;1"]
+                        .getService(Ci.nsIAppsService);
+    let principal = aWindow.document.nodePrincipal;
+    // This returns the empty string if we're not an installed app.  Coerce to
+    // null.
+    this._manifestURL = appsService.getManifestURLByLocalId(principal.appId) ||
+                          null;
   },
 
   uninit: function() {
@@ -79,23 +94,8 @@
 
   clearAllDone: function() {
     debug("clearAllDone()");
-    return this.createPromise(function (aResolve, aReject) {
-      DownloadsIPC.clearAllDone().then(
-        function(aDownloads) {
-          // Turn the list of download objects into DOM objects and
-          // send them.
-          let array = new this._window.Array();
-          for (let id in aDownloads) {
-            let dom = createDOMDownloadObject(this._window, aDownloads[id]);
-            array.push(this._prepareForContent(dom));
-          }
-          aResolve(array);
-        }.bind(this),
-        function() {
-          aReject("ClearAllDoneError");
-        }
-      );
-    }.bind(this));
+    // This is a void function; we just kick it off.  No promises, etc.
+    DownloadsIPC.clearAllDone();
   },
 
   remove: function(aDownload) {
@@ -121,6 +121,67 @@
     }.bind(this));
   },
 
+  adoptDownload: function(aAdoptDownloadDict) {
+    // Our AdoptDownloadDict only includes simple types, which WebIDL enforces.
+    // We have no object/any types so we do not need to worry about invoking
+    // JSON.stringify (and it inheriting our security privileges).
+    debug("adoptDownload");
+    return this.createPromise(function (aResolve, aReject) {
+      if (!aAdoptDownloadDict) {
+        debug("Download dictionary is required!");
+        aReject("InvalidDownload");
+        return;
+      }
+      if (!aAdoptDownloadDict.storageName || !aAdoptDownloadDict.storagePath ||
+          !aAdoptDownloadDict.contentType) {
+        debug("Missing one of: storageName, storagePath, contentType");
+        aReject("InvalidDownload");
+        return;
+      }
+
+      // Convert storageName/storagePath to a local filesystem path.
+      let volume;
+      // getVolumeByName throws if you give it something it doesn't like
+      // because XPConnect converts the NS_ERROR_NOT_AVAILABLE to an
+      // exception.  So catch it.
+      try {
+        volume = volumeService.getVolumeByName(aAdoptDownloadDict.storageName);
+      } catch (ex) {}
+      if (!volume) {
+        debug("Invalid storage name: " + aAdoptDownloadDict.storageName);
+        aReject("InvalidDownload");
+        return;
+      }
+      let computedPath = volume.mountPoint + '/' +
+                           aAdoptDownloadDict.storagePath;
+      // We validate that there is actually a file at the given path in the
+      // parent process in DownloadsAPI.js because that's where the file
+      // access would actually occur either way.
+
+      // Create a DownloadsAPI.jsm 'jsonDownload' style representation.
+      let jsonDownload = {
+        url: aAdoptDownloadDict.url,
+        path: computedPath,
+        contentType: aAdoptDownloadDict.contentType,
+        startTime: aAdoptDownloadDict.startTime.valueOf() || Date.now(),
+        sourceAppManifestURL: this._manifestURL
+      };
+
+      DownloadsIPC.adoptDownload(jsonDownload).then(
+        function(aResult) {
+          let domDownload = createDOMDownloadObject(this._window, aResult);
+          aResolve(this._prepareForContent(domDownload));
+        }.bind(this),
+        function(aResult) {
+          // This will be one of: AdoptError (generic catch-all),
+          // AdoptNoSuchFile, AdoptFileIsDirectory
+          aReject(aResult.error);
+        }
+      );
+    }.bind(this));
+  },
+
+
   /**
     * Turns a chrome download object into a content accessible one.
     * When we have __DOM_IMPL__ available we just use that, otherwise
@@ -295,6 +356,11 @@
     }
   },
 
+  /**
+    * Initialize a DOMDownload instance for the given window using the
+    * 'jsonDownload' serialized format of the download encoded by
+    * DownloadsAPI.jsm.
+    */
   _init: function(aWindow, aDownload) {
     this._window = aWindow;
     this.id = aDownload.id;
@@ -314,12 +380,13 @@
     }
 
     let props = ["totalBytes", "currentBytes", "url", "path", "storageName",
-                 "storagePath", "state", "contentType", "startTime"];
+                 "storagePath", "state", "contentType", "startTime",
+                 "sourceAppManifestURL"];
     let changed = false;
     let changedProps = {};
 
     props.forEach((prop) => {
-      if (aDownload[prop] && (aDownload[prop] != this[prop])) {
+      if (prop in aDownload && (aDownload[prop] != this[prop])) {
         this[prop] = aDownload[prop];
         changedProps[prop] = changed = true;
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/DownloadsAPI.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/DownloadsAPI.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/DownloadsAPI.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/DownloadsAPI.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -13,11 +13,19 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Downloads.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/osfile.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
                                    "@mozilla.org/parentprocessmessagemanager;1",
                                    "nsIMessageBroadcaster");
 
+/**
+  * Parent process logic that services download API requests from the
+  * DownloadAPI.js instances in content processeses.  The actual work of managing
+  * downloads is done by Toolkit's Downloads.jsm.  This module is loaded by B2G's
+  * shell.js
+  */
+
 function debug(aStr) {
 #ifdef MOZ_DEBUG
   dump("-*- DownloadsAPI.jsm : " + aStr + "\n");
@@ -49,7 +57,8 @@
      "Downloads:ClearAllDone",
      "Downloads:Remove",
      "Downloads:Pause",
-     "Downloads:Resume"].forEach((msgName) => {
+     "Downloads:Resume",
+     "Downloads:Adopt"].forEach((msgName) => {
       ppmm.addMessageListener(msgName, this);
     });
 
@@ -92,7 +101,9 @@
       url: aDownload.source.url,
       path: aDownload.target.path,
       contentType: aDownload.contentType,
-      startTime: aDownload.startTime.getTime()
+      startTime: aDownload.startTime.getTime(),
+      sourceAppManifestURL: aDownload._unknownProperties &&
+                              aDownload._unknownProperties.sourceAppManifestURL
     };
 
     if (aDownload.error) {
@@ -165,6 +176,9 @@
     case "Downloads:Resume":
       this.resume(aMessage.data, aMessage.target);
       break;
+    case "Downloads:Adopt":
+      this.adoptDownload(aMessage.data, aMessage.target);
+      break;
     default:
       debug("Invalid message: " + aMessage.name);
     }
@@ -186,17 +200,9 @@
 
   clearAllDone: function(aData, aMm) {
     debug("clearAllDone called!");
-    let self = this;
     Task.spawn(function () {
       let list = yield Downloads.getList(Downloads.ALL);
-      yield list.removeFinished();
-      list = yield Downloads.getList(Downloads.ALL);
-      let downloads = yield list.getAll();
-      let res = [];
-      downloads.forEach((aDownload) => {
-        res.push(self.jsonDownload(aDownload));
-      });
-      aMm.sendAsyncMessage("Downloads:ClearAllDone:Return", res);
+      list.removeFinished();
     }).then(null, Components.utils.reportError);
   },
 
@@ -262,6 +268,97 @@
                            aData, "ResumeError");
       }
     );
+  },
+
+  /**
+    * Receive a download to adopt in the same representation we produce from
+    * our "jsonDownload" normalizer and add it to the list of downloads.
+    */
+  adoptDownload: function(aData, aMm) {
+    let adoptJsonRep = aData.jsonDownload;
+    debug("adoptDownload " + uneval(adoptJsonRep));
+
+    Task.spawn(function* () {
+      // Verify that the file exists on disk.  This will result in a rejection
+      // if the file does not exist.  We will also use this information for the
+      // file size to avoid weird inconsistencies.  We ignore the filesystem
+      // timestamp in favor of whatever the caller is telling us.
+      let fileInfo = yield OS.File.stat(adoptJsonRep.path);
+
+      // We also require that the file is not a directory.
+      if (fileInfo.isDir) {
+        throw new Error("AdoptFileIsDirectory");
+      }
+
+      // We need to create a Download instance to add to the list.  Create a
+      // serialized representation and then from there the instance.
+      let serializedRep = {
+        // explicit initializations in toSerializable
+        source: {
+          url: adoptJsonRep.url
+          // This is where isPrivate would go if adoption supported private
+          // browsing.
+        },
+        target: {
+          path: adoptJsonRep.path,
+        },
+        startTime: adoptJsonRep.startTime,
+        // kPlainSerializableDownloadProperties propagations
+        succeeded: true, // (all adopted downloads are required to be completed)
+        totalBytes: fileInfo.size,
+        contentType: adoptJsonRep.contentType,
+        // unknown properties added/used by the DownloadsAPI
+        currentBytes: fileInfo.size,
+        sourceAppManifestURL: adoptJsonRep.sourceAppManifestURL
+      };
+
+      let download = yield Downloads.createDownload(serializedRep);
+
+      // The ALL list is a DownloadCombinedList instance that combines the
+      // PUBLIC (persisted to disk) and PRIVATE (ephemeral) download lists..
+      // When we call add on it, it dispatches to the appropriate list based on
+      // the 'isPrivate' field of the source.  (Which we don't initialize and
+      // defaults to false.)
+      let allDownloadList = yield Downloads.getList(Downloads.ALL);
+
+      // This add will automatically notify all views of the added download,
+      // including DownloadsAPI instances and the DownloadAutoSaveView that's
+      // subscribed to the PUBLIC list and will save the download.
+      yield allDownloadList.add(download);
+
+      debug("download adopted");
+      // The notification above occurred synchronously, and so we will have
+      // already dispatched an added notification for our download to the child
+      // process in question.  As such, we only need to relay the download id
+      // since the download will already have been cached.
+      return download;
+    }.bind(this)).then(
+      (download) => {
+        sendPromiseMessage(aMm, "Downloads:Adopt:Return",
+                           {
+                             id: this.downloadId(download),
+                             promiseId: aData.promiseId
+                           });
+      },
+      (ex) => {
+        let reportAs = "AdoptError";
+        // Provide better error codes for expected errors.
+        if (ex instanceof OS.File.Error && ex.becauseNoSuchFile) {
+          reportAs = "AdoptNoSuchFile";
+        } else if (ex.message === "AdoptFileIsDirectory") {
+          reportAs = ex.message;
+        } else {
+          // Anything else is unexpected and should be reported to help track
+          // down what's going wrong.
+          debug("unexpected download error: " + ex);
+          Cu.reportError(ex);
+        }
+        sendPromiseMessage(aMm, "Downloads:Adopt:Return",
+                           {
+                             promiseId: aData.promiseId
+                           },
+                           reportAs);
+    });
   }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/DownloadsIPC.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/DownloadsIPC.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/DownloadsIPC.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/DownloadsIPC.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -36,10 +36,10 @@
                      "Downloads:Removed",
                      "Downloads:Changed",
                      "Downloads:GetList:Return",
-                     "Downloads:ClearAllDone:Return",
                      "Downloads:Remove:Return",
                      "Downloads:Pause:Return",
-                     "Downloads:Resume:Return"];
+                     "Downloads:Resume:Return",
+                     "Downloads:Adopt:Return"];
 
 this.DownloadsIPC = {
   downloads: {},
@@ -54,7 +54,6 @@
     // We need to get the list of current downloads.
     this.ready = false;
     this.getListPromises = [];
-    this.clearAllPromises = [];
     this.downloadPromises = {};
     cpmm.sendAsyncMessage("Downloads:GetList", {});
     this._promiseId = 0;
@@ -93,12 +92,6 @@
         }
         this.ready = true;
         break;
-      case "Downloads:ClearAllDone:Return":
-        this._updateDownloadsArray(download);
-        this.clearAllPromises.forEach(aPromise =>
-                                      aPromise.resolve(this.downloads));
-        this.clearAllPromises.length = 0;
-        break;
       case "Downloads:Added":
         this.downloads[download.id] = download;
         this.notifyChanges(download.id);
@@ -139,6 +132,7 @@
       case "Downloads:Remove:Return":
       case "Downloads:Pause:Return":
       case "Downloads:Resume:Return":
+      case "Downloads:Adopt:Return":
         if (this.downloadPromises[download.promiseId]) {
           if (!download.error) {
             this.downloadPromises[download.promiseId].resolve(download);
@@ -167,14 +161,11 @@
   },
 
   /**
-    * Returns a promise that is resolved with the list of current downloads.
-    */
+   * Void function to trigger removal of completed downloads.
+   */
   clearAllDone: function() {
     debug("clearAllDone");
-    let deferred = Promise.defer();
-    this.clearAllPromises.push(deferred);
     cpmm.sendAsyncMessage("Downloads:ClearAllDone", {});
-    return deferred.promise;
   },
 
   promiseId: function() {
@@ -211,6 +202,16 @@
     return deferred.promise;
   },
 
+  adoptDownload: function(aJsonDownload) {
+    debug("adoptDownload");
+    let deferred = Promise.defer();
+    let pId = this.promiseId();
+    this.downloadPromises[pId] = deferred;
+    cpmm.sendAsyncMessage("Downloads:Adopt",
+                          { jsonDownload: aJsonDownload, promiseId: pId });
+    return deferred.promise;
+  },
+
   observe: function(aSubject, aTopic, aData) {
     if (aTopic == "xpcom-shutdown") {
       ipcMessages.forEach((aMessage) => {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/clear_all_done_helper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/clear_all_done_helper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/clear_all_done_helper.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/clear_all_done_helper.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,67 @@
+/**
+ * A helper to clear out the existing downloads known to the mozDownloadManager
+ * / downloads.js.
+ *
+ * It exists because previously mozDownloadManager.clearAllDone() thought that
+ * when it returned that all the completed downloads would be cleared out.  It
+ * was wrong and this led to various intermittent test failurse.  In discussion
+ * on https://bugzil.la/979446#c13 and onwards, it was decided that
+ * clearAllDone() was in the wrong and that the jsdownloads API it depends on
+ * was not going to change to make it be in the right.
+ *
+ * The existing uses of clearAllDone() in tests seemed to be about:
+ * - Exploding if there was somehow still a download in progress
+ * - Clearing out the download list at the start of a test so that calls to
+ *   getDownloads() wouldn't have to worry about existing downloads, etc.
+ *
+ * From discussion, the right way to handle clearing is to wait for the expected
+ * removal events to occur for the existing downloads.  So that's what we do.
+ * We still generate a test failure if there are any in-progress downloads.
+ *
+ * @param {Boolean} [getDownloads=false]
+ *   If true, invoke getDownloads after clearing the download list and return
+ *   its value.
+ */
+function clearAllDoneHelper(getDownloads) {
+  var clearedPromise = new Promise(function(resolve, reject) {
+    function gotDownloads(downloads) {
+      // If there are no downloads, we're already done.
+      if (downloads.length === 0) {
+        resolve();
+        return;
+      }
+
+      // Track the set of expected downloads that will be finalized.
+      var expectedIds = new Set();
+      function changeHandler(evt) {
+        var download = evt.download;
+        if (download.state === "finalized") {
+          expectedIds.delete(download.id);
+          if (expectedIds.size === 0) {
+            resolve();
+          }
+        }
+      }
+      downloads.forEach(function(download) {
+        if (download.state === "downloading") {
+          ok(false, "A download is still active: " + download.path);
+          reject("Active download");
+        }
+        download.onstatechange = changeHandler;
+        expectedIds.add(download.id);
+      });
+      navigator.mozDownloadManager.clearAllDone();
+    }
+    function gotBadNews(err) {
+      ok(false, "Problem clearing all downloads: " + err);
+      reject(err);
+    }
+    navigator.mozDownloadManager.getDownloads().then(gotDownloads, gotBadNews);
+ });
+ if (!getDownloads) {
+   return clearedPromise;
+ }
+ return clearedPromise.then(function() {
+   return navigator.mozDownloadManager.getDownloads();
+ });
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/common_app.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/common_app.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/common_app.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/common_app.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,19 @@
+function is(a, b, msg) {
+  alert((a === b ? 'OK' : 'KO') + ' ' + a + ' should equal ' + b + ': ' + msg);
+}
+
+function ok(a, msg) {
+  alert((a ? 'OK' : 'KO')+ ' ' + msg);
+}
+
+function info(msg) {
+  alert('INFO ' + msg);
+}
+
+function cbError() {
+  alert('KO error');
+}
+
+function finish() {
+  alert('DONE');
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/file_app.sjs thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/file_app.sjs
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/file_app.sjs	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/file_app.sjs	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,55 @@
+var gBasePath = "tests/dom/downloads/tests/";
+var gTemplate = "file_app.template.webapp";
+
+function handleRequest(request, response) {
+  var query = getQuery(request);
+
+  var testToken = query.testToken || '';
+  var appType = query.appType || 'web';
+
+  var template = gBasePath + gTemplate;
+  response.setHeader("Content-Type", "application/x-web-app-manifest+json", false);
+  var body = readTemplate(template)
+               .replace(/TESTTOKEN/g, testToken)
+               .replace(/APPTYPE/g, appType);
+  response.write();
+}
+
+// Copy-pasted incantations. There ought to be a better way to synchronously read
+// a file into a string, but I guess we're trying to discourage that.
+function readTemplate(path) {
+  var file = Components.classes["@mozilla.org/file/directory_service;1"].
+                        getService(Components.interfaces.nsIProperties).
+                        get("CurWorkD", Components.interfaces.nsILocalFile);
+  var fis  = Components.classes['@mozilla.org/network/file-input-stream;1'].
+                        createInstance(Components.interfaces.nsIFileInputStream);
+  var cis = Components.classes["@mozilla.org/intl/converter-input-stream;1"].
+                       createInstance(Components.interfaces.nsIConverterInputStream);
+  var split = path.split("/");
+  for(var i = 0; i < split.length; ++i) {
+    file.append(split[i]);
+  }
+  fis.init(file, -1, -1, false);
+  cis.init(fis, "UTF-8", 0, 0);
+
+  var data = "";
+  let (str = {}) {
+    let read = 0;
+    do {
+      read = cis.readString(0xffffffff, str); // read as much as we can and put it in str.value
+      data += str.value;
+    } while (read != 0);
+  }
+  cis.close();
+  return data;
+}
+
+function getQuery(request) {
+  var query = {};
+  request.queryString.split('&').forEach(function (val) {
+    var [name, value] = val.split('=');
+    query[name] = unescape(value);
+  });
+  return query;
+}
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/file_app.template.webapp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/file_app.template.webapp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/file_app.template.webapp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/file_app.template.webapp	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,7 @@
+{
+  "name": "Really Rapid Release (hosted)",
+  "description": "Updated even faster than <a href='http://mozilla.org'>Firefox</a>, just to annoy slashdotters.",
+  "type": "APPTYPE",
+  "launch_path": "/tests/dom/downloads/tests/TESTTOKEN",
+  "icons": { "128": "default_icon" }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/mochitest.ini	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/mochitest.ini	2015-02-28 15:03:07.000000000 +0000
@@ -1,12 +1,24 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' # bug 979446, frequent failures
+# The actual requirement for mozDownloadManager is MOZ_GONK because of
+# the nsIVolumeService dependency.  Until https://bugzil.la/1130264 is
+# addressed, there is no way for mulet to run these tests.
+run-if = toolkit == 'gonk'
 support-files =
   serve_file.sjs
+  clear_all_done_helper.js
+  file_app.template.webapp
+  file_app.sjs
+  common_app.js
+  shim_app_as_test.js
+  shim_app_as_test_chrome.js
+  testapp_downloads_adopt_download.html
+  testapp_downloads_adopt_download.js
+  testapp_downloads_adopt_download.manifest
 
 [test_downloads_navigator_object.html]
 [test_downloads_basic.html]
 [test_downloads_large.html]
+[test_downloads_adopt_download.html]
 [test_downloads_bad_file.html]
 [test_downloads_pause_remove.html]
 [test_downloads_pause_resume.html]
-skip-if = toolkit=='gonk' # b2g(bug 947167) b2g-debug(bug 947167)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/shim_app_as_test_chrome.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/shim_app_as_test_chrome.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/shim_app_as_test_chrome.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/shim_app_as_test_chrome.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,178 @@
+/**
+ * This is the chrome helper for shim_app_as_test.js.  Its load is triggered by
+ * shim_app_as_test.js by a call to SpecialPowers.loadChromeScript and runs
+ * in the parent process in a sandbox created with the system principal.  (Which
+ * seems like it can never get collected because it's reachable via the
+ * apparently singleton SpecialPowersObserverAPI instance and there's no logic
+ * to support reaping.  Wuh-oh.)
+ *
+ * It exists to help install fake privileged/certified applications.  It needs
+ * to exist because:
+ * - We need to poke at DOMApplicationRegistry directly.
+ * - By using SpecialPowers.loadChromeScript we are able to ensure this file
+ *   is run in the parent process.  This is important because
+ *   DOMApplicationRegistry only lives in the parent process!
+ * - By running entirely in a chrome privileged compartment, we avoid crazy
+ *   wrapper problems that we would otherwise face with our shenanigans of
+ *   directly meddling with DOMApplicationRegistry.  (And hopefully save
+ *   anyone changing DOMApplicationRegistry from frustration/hating us if
+ *   things were just barely working.)
+ * - Bug 1097479 means that embed-webapps doesn't work when the content process
+ *   that is telling us to do things is itself OOP.  So it falls upon us to
+ *   handle the running of the app by creating a sibling mozbrowser/mozapp
+ *   iframe to the one running the mochitests.
+ *
+ * Note that in this file we try to do *only* those things that can't otherwise
+ * be cleanly done using SpecialPowers.
+ *
+ * Want to better understand our execution context?  Check out
+ * SpecialPowersObserverAPI.js and search on SPLoadChromeScript.
+ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const CC = Components.Constructor;
+
+Cu.import('resource://gre/modules/Webapps.jsm'); // for DOMApplicationRegistry
+Cu.import('resource://gre/modules/AppsUtils.jsm'); // for AppUtils
+Cu.import('resource://gre/modules/Services.jsm'); // for AppUtils
+
+// Yes, you would think there was something like this already exposed easily
+// in a JSM somewhere.  No.
+function fetchManifest(manifestURL) {
+  return new Promise(function(resolve, reject) {
+    let xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
+                .createInstance(Ci.nsIXMLHttpRequest);
+    xhr.open("GET", manifestURL, true);
+    xhr.responseType = "json";
+
+    xhr.addEventListener("load", function() {
+      if (xhr.status == 200) {
+        resolve(xhr.response);
+      } else {
+        reject();
+      }
+    });
+
+    xhr.addEventListener("error", function() {
+      reject();
+    });
+
+    xhr.send(null);
+  });
+}
+
+/**
+ * Install an app using confirmInstall using pre-chewed data.  This avoids the
+ * check in the normal installApp flow that gets all judgemental about the
+ * installation of privileged and certified apps.
+ */
+function installApp(req) {
+  fetchManifest(req.manifestURL).then(function(manifestObj) {
+    var data = {
+      // cloneAppObj normalizes the representation for us
+      app: AppsUtils.cloneAppObject({
+        installOrigin: req.origin,
+        origin: req.origin,
+        manifestURL: req.manifestURL,
+        appStatus: AppsUtils.getAppManifestStatus(manifestObj),
+        receipts: [],
+        categories: []
+      }),
+
+      from: req.origin, // unused?
+      oid: 0, // unused?
+      requestID: 0, // unused-ish
+      appId: 0, // unused
+      isBrowser: false,
+      isPackage: false, // used
+      // magic to auto-ack... don't think we care about this...
+      forceSuccessAck: false
+      // stuff that probably doesn't matter: 'mm', 'apkInstall',
+    };
+    // cloneAppObject does not propagate the manifest
+    data.app.manifest = manifestObj;
+
+    return DOMApplicationRegistry.confirmInstall(data).then(
+      function() {
+        var appId =
+          DOMApplicationRegistry.getAppLocalIdByManifestURL(req.manifestURL);
+        // act like this is a privileged app having all of its permissions
+        // authorized at first run.
+        DOMApplicationRegistry.updatePermissionsForApp(
+          appId,
+          /* preinstalled */ true,
+          /* system update? */ true);
+
+        sendAsyncMessage(
+          'installed',
+          {
+            appId: appId,
+            manifestURL: req.manifestURL,
+            manifest: manifestObj
+          });
+      },
+      function(err) {
+        sendAsyncMessage('installed', false);
+      });
+  });
+}
+
+function uninstallApp(appInfo) {
+  DOMApplicationRegistry.uninstall(appInfo.manifestURL).then(
+    function() {
+      sendAsyncMessage('uninstalled', true);
+    },
+    function() {
+      sendAsyncMessage('uninstalled', false);
+    });
+}
+
+var activeIframe = null;
+
+/**
+ * Run our app in a sibling mozbrowser/mozapp iframe to the mochitest iframe.
+ * This is needed because we can't nest mozbrowser/mozapp iframes inside our
+ * already-OOP iframe until bug 1097479 is resolved.
+ */
+function runApp(appInfo) {
+  let shellDomWindow = Services.wm.getMostRecentWindow('navigator:browser');
+  let sysAppFrame = shellDomWindow.document.body.querySelector('#systemapp');
+  let sysAppDoc = sysAppFrame.contentDocument;
+
+  let siblingFrame = sysAppDoc.body.querySelector('#test-container');
+
+  let ifr = activeIframe = sysAppDoc.createElement('iframe');
+  ifr.setAttribute('mozbrowser', 'true');
+  ifr.setAttribute('remote', 'true');
+  ifr.setAttribute('mozapp', appInfo.manifestURL);
+
+  ifr.addEventListener('mozbrowsershowmodalprompt', function(evt) {
+    var message = evt.detail.message;
+    // only send the message as long as we haven't been told to clean up.
+    if (activeIframe) {
+      sendAsyncMessage('appMessage', message);
+    }
+  }, false);
+  ifr.addEventListener('mozbrowsererror', function(evt) {
+    if (activeIframe) {
+      sendAsyncMessage('appError', { message: '' + evt.detail });
+    }
+  });
+
+  ifr.setAttribute('src', appInfo.manifest.launch_path);
+  siblingFrame.parentElement.appendChild(ifr);
+}
+
+function closeApp() {
+  if (activeIframe) {
+    activeIframe.parentElement.removeChild(activeIframe);
+    activeIframe = null;
+  }
+}
+
+addMessageListener('install', installApp);
+addMessageListener('uninstall', uninstallApp);
+addMessageListener('run', runApp);
+addMessageListener('close', closeApp);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/shim_app_as_test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/shim_app_as_test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/shim_app_as_test.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/shim_app_as_test.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,210 @@
+/**
+ * Support logic to run a test file as an installed app.  This file is derived
+ * from dom/requestsync/tests/test_basic_app.html but uses
+ * DOMApplicationRegistry in a chrome script (shim_app_as_test_chrome.js) to
+ * directly install the apps instead of mozApps.install because mozApps.install
+ * can't install privileged/certified apps.  (This is the same mechanism used by
+ * the Firefox OS Gaia email app's backend test runner.)
+ *
+ * You really only want to do this if your test cares about the app's origin
+ * or you REALLY want to double-check AvailableIn and other WebIDL-provided
+ * security mechanisms.
+ *
+ * If you trust WebIDL, your life may be made significantly easier by just
+ * setting the pref "dom.ignore_webidl_scope_checks" to true, which makes
+ * BindingUtils.cpp's IsInPrivilegedApp and IsInCertifiedApp return true no
+ * matter what *on the main thread*.  You are potentially out of luck on
+ * workers since at the time of writing this since the values stored on
+ * WorkerPrivateParent are based on the app status and ignore the pref.
+ *
+ * TO USE THIS:
+ *
+ * Make sure you have the usual header boilerplate:
+ *   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+ *   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+ *
+ * You also want to add this file!
+ *   <script type="application/javascript" src="shim_app_as_test.js"></script>
+ *
+ * In your script body, issue a call like so:
+ * runAppTest({
+ *   appFile: 'testapp_downloads_adopt_download.html',
+ *   appManifest: 'testapp_downloads_adopt_download.manifest',
+ *   appType: 'certified',
+ *   extraPrefs: {
+ *     set: [["dom.mozDownloads.enabled", true]]
+ *   }
+ * });
+ *
+ * You shouldn't be adding other stuff to that file.  Instead, you want
+ * everything in your testapp_*.html file.  And you probably just want to copy
+ * and paste from an existing one of those...
+ */
+
+  var gManifestURL;
+  var gApp;
+  var gOptions;
+
+  // Load the chrome script.
+  var gChromeHelper = SpecialPowers.loadChromeScript(
+                        SimpleTest.getTestFileURL('shim_app_as_test_chrome.js'));
+
+  function installApp() {
+    info("installing app");
+    var useOrigin = document.location.origin;
+    gChromeHelper.sendAsyncMessage(
+      'install',
+      {
+        origin: useOrigin,
+        manifestURL: SimpleTest.getTestFileURL(gOptions.appManifest),
+      });
+  }
+
+  function installedApp(appInfo) {
+    gApp = appInfo;
+    ok(!!appInfo, 'installed app');
+    runTests();
+  }
+  gChromeHelper.addMessageListener('installed', installedApp);
+
+  function uninstallApp() {
+    info('uninstalling app');
+    gChromeHelper.sendAsyncMessage('uninstall', gApp);
+  }
+
+  function uninstalledApp(success) {
+    ok(success, 'uninstalled app');
+    runTests();
+  }
+  gChromeHelper.addMessageListener('uninstalled', uninstalledApp);
+
+  function testApp() {
+    var cleanupFrame;
+    var handleTestMessage = function(message) {
+      if (/^OK/.exec(message)) {
+        ok(true, "Message from app: " + message);
+      } else if (/^KO/.exec(message)) {
+        ok(false, "Message from app: " + message);
+      } else if (/^INFO/.exec(message)) {
+        info("Message from app: " + message.substring(5));
+      } else if (/^DONE$/.exec(message)) {
+        ok(true, "Messaging from app complete");
+        cleanupFrame();
+        runTests();
+      }
+    };
+
+    // Bug 1097479 means that embed-webapps does not work if you are already
+    // OOP, as we are for b2g.  So we need to have the chrome script run our
+    // app in a sibling iframe to the one we're living in.  When that bug is
+    // fixed or we are run in a non-b2g context, we can set this value to false
+    // or otherwise conditionalize based on behaviour.
+    var needSiblingIframeHack = true;
+
+    if (needSiblingIframeHack) {
+      gChromeHelper.sendAsyncMessage('run', gApp);
+
+      gChromeHelper.addMessageListener('appMessage', handleTestMessage);
+      gChromeHelper.addMessageListener('appError', function(data) {
+        ok(false, "Error in app frame: " + data.message);
+      });
+
+      cleanupFrame = function() {
+        gChromeHelper.sendAsyncMessage('close', {});
+      };
+    } else {
+      var ifr = document.createElement('iframe');
+      ifr.setAttribute('mozbrowser', 'true');
+      ifr.setAttribute('mozapp', gApp.manifestURL);
+
+      cleanupFrame = function() {
+        ifr.removeEventListener('mozbrowsershowmodalprompt', listener);
+        domParent.removeChild(ifr);
+      };
+
+      // Set us up to listen for messages from the app.
+      var listener = function(e) {
+        var message = e.detail.message; // e.detail.message;
+        handleTestMessage(message);
+      };
+
+      // This event is triggered when the app calls "alert".
+      ifr.addEventListener('mozbrowsershowmodalprompt', listener, false);
+      ifr.addEventListener('mozbrowsererror', function(evt) {
+        ok(false, "Error in app frame: " + evt.detail);
+      });
+
+      ifr.setAttribute('src', gApp.manifest.launch_path);
+      var domParent = document.getElementById('content');
+      if (!domParent) {
+        document.createElement('div');
+        document.body.insertBefore(domParent, document.body.firstChild);
+      }
+      domParent.appendChild(ifr);
+    }
+  }
+
+  var tests = [
+    // Permissions
+    function() {
+      info("pushing permissions");
+      SpecialPowers.pushPermissions(
+        [{ "type": "browser", "allow": 1, "context": document },
+         { "type": "embed-apps", "allow": 1, "context": document },
+         { "type": "webapps-manage", "allow": 1, "context": document }
+        ],
+        runTests);
+    },
+
+    // Preferences
+    function() {
+      info("pushing preferences: " + gOptions.extraPrefs.set);
+      SpecialPowers.pushPrefEnv({
+        "set": gOptions.extraPrefs.set
+      }, runTests);
+    },
+
+    function() {
+      info("enabling use of mozbrowser");
+      //SpecialPowers.setAllAppsLaunchable(true);
+      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
+      runTests();
+    },
+
+    // No confirmation needed when an app is installed
+    function() {
+      SpecialPowers.autoConfirmAppInstall(function() {
+        SpecialPowers.autoConfirmAppUninstall(runTests);
+      });
+    },
+
+    // Installing the app
+    installApp,
+
+    // Run tests in app
+    testApp,
+
+    // Uninstall the app
+    uninstallApp,
+  ];
+
+  function runTests() {
+    if (!tests.length) {
+      ok(true, 'DONE!');
+      SimpleTest.finish();
+      return;
+    }
+
+    var test = tests.shift();
+    test();
+  }
+
+  SimpleTest.waitForExplicitFinish();
+
+  function runAppTest(options) {
+    gOptions = options;
+    var href = document.location.href;
+    gManifestURL = href.substring(0, href.lastIndexOf('/') + 1) +
+      options.appManifest;
+    runTests();
+  }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.html	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script type="application/javascript" src="common_app.js"></script>
+  <meta charset="utf-8">
+</head>
+<body>
+<div id="blah">initial text</div>
+<pre id="test">
+<!-- because of certified CSP, this code must NOT be inline -->
+<script class="testbody" type="text/javascript;version=1.7" src="testapp_downloads_adopt_download.js"></script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,218 @@
+/**
+ * Test the adoptDownload API.  Specifically, we expect that when we call
+ * adoptDownload with a valid payload that:
+ * - The method will be resolved with a valid, fully populated DOMDownload
+ *   instance, including an id.
+ * - An ondownloadstart notification will be generated and the DOMDownload
+ *   instance it receives will be logically equivalent.
+ *
+ * We also explicitly verify that invalid adoptDownload payloads result in a
+ * rejection and that no download is added.
+ *
+ * This test explicitly does not test that the download is correctly persisted
+ * to the database.  This is done because Downloads.jsm does not provide a means
+ * of safely restarting itself, so Firefox would need to be restarted.  Because
+ * the adoptDownload code is using the Downloads API in a straightforward
+ * manner, it's not considered likely this would regress, and certainly not
+ * considered worth the automated testing overhead of a restart.
+ */
+
+function checkInvalidResult(dict, expectedErr, explanation) {
+  navigator.mozDownloadManager.ondownloadstart = function() {
+    ok(false, "No download should have been added!");
+  };
+  navigator.mozDownloadManager.adoptDownload(dict).then(
+    function() {
+      ok(false, "Invalid adoptDownload did not reject!");
+      runTests();
+    },
+    function(rejectedWith) {
+      is(rejectedWith, expectedErr, explanation + " rejection value");
+      runTests();
+    });
+}
+
+// Pick a date that Date.now() could not possibly return by picking a date in
+// the past.  (We want to make sure the date we provide works.)
+var arbitraryDate = new Date(Date.now() - 60000);
+
+var blobContents = new Uint8Array(256);
+var memBlob = new Blob([blobContents], { type: 'application/octet-stream' });
+var blobStorageName;
+var blobStoragePath = 'blobby.blob';
+
+function checkAdoptedDownload(download, validPayload) {
+  is(download.totalBytes, memBlob.size, 'size');
+  is(download.url, validPayload.url, 'url');
+  // The filesystem path is not practical to check since we can't hard-code it
+  // and the only way to check is to effectively duplicate the logic in
+  // DownloadsAPI.js.  The good news, however, is that the value is
+  // round-tripped from storageName/storagePath to path and back again, and we
+  // also verify the file exists on disk, so we can be reasonably confident this
+  // is correct.  We output it to aid in debugging if things should break,
+  // of course.
+  info('path (not checked): ' + download.path);
+  is(download.storageName, validPayload.storageName, 'storageName');
+  is(download.storagePath, validPayload.storagePath, 'storagePath');
+  is(download.state, 'succeeded', 'state');
+  is(download.contentType, validPayload.contentType, 'contentType');
+  is(download.startTime.valueOf(), arbitraryDate.valueOf(), 'startTime');
+  is(download.sourceAppManifestURL,
+     'http://mochi.test:8888/' +
+       'tests/dom/downloads/tests/testapp_downloads_adopt_download.manifest',
+    'app manifest');
+};
+
+var tests = [
+  function saveBlobToDeviceStorage() {
+    // Only sdcard can handle arbitrary MIME types and is guaranteed to be a
+    // thing.
+    var storage = navigator.getDeviceStorage('sdcard');
+    // We used the non-array helper, so the name we get may be different than
+    // what we asked for.
+    blobStorageName = storage.storageName;
+    ok(!!storage, 'have storage');
+    var req = storage.addNamed(memBlob, blobStoragePath);
+    req.onerror = function() {
+      ok(false, 'problem saving blob to storage: ' + req.error.name);
+    };
+    req.onsuccess = function(evt) {
+      ok(true, 'saved blob: ' + evt.target.result);
+      runTests();
+    };
+  },
+  function addValid() {
+      var validPayload = {
+        // All currently expected consumers are unable to provide a valid URL, and
+        // as a result need to provide an empty string.
+        url: "",
+        storageName: blobStorageName,
+        storagePath: blobStoragePath,
+        contentType: memBlob.type,
+        startTime: arbitraryDate
+      };
+    // Wrap the notification in a check so we can force our logic to be
+    // consistently ordered in the test even if it's not in reality.
+    var notifiedPromise = new Promise(function(resolve, reject) {
+      navigator.mozDownloadManager.ondownloadstart = function(evt) {
+        resolve(evt.download);
+      };
+    });
+
+    // Start the download
+    navigator.mozDownloadManager.adoptDownload(validPayload).then(
+      function(apiDownload) {
+        checkAdoptedDownload(apiDownload, validPayload);
+        ok(!!apiDownload.id, "Need a download id!");
+        notifiedPromise.then(function(notifiedDownload) {
+          checkAdoptedDownload(notifiedDownload, validPayload);
+          is(apiDownload.id, notifiedDownload.id,
+             "Notification should be for the download we adopted");
+          runTests();
+        });
+      },
+      function() {
+        ok(false, "adoptDownload should not have rejected");
+        runTests();
+      });
+  },
+
+  function dictionaryNotProvided() {
+    checkInvalidResult(undefined, "InvalidDownload");
+  },
+  // Missing fields immediately result in rejection with InvalidDownload
+  function missingStorageName() {
+    checkInvalidResult({
+      url: "",
+      // no storageName
+      storagePath: "relpath/filename.txt",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "missing storage name");
+  },
+  function nullStorageName() {
+    checkInvalidResult({
+      url: "",
+      storageName: null,
+      storagePath: "relpath/filename.txt",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "null storage name");
+  },
+  function missingStoragePath() {
+    checkInvalidResult({
+      url: "",
+      storageName: blobStorageName,
+      // no storagePath
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "missing storage path");
+  },
+  function nullStoragePath() {
+    checkInvalidResult({
+      url: "",
+      storageName: blobStorageName,
+      storagePath: null,
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "null storage path");
+  },
+  function missingContentType() {
+    checkInvalidResult({
+      url: "",
+      storageName: "sdcard",
+      storagePath: "relpath/filename.txt",
+      // no contentType
+      startTime: arbitraryDate
+    }, "InvalidDownload", "missing content type");
+  },
+  function nullContentType() {
+    checkInvalidResult({
+      url: "",
+      storageName: "sdcard",
+      storagePath: "relpath/filename.txt",
+      contentType: null,
+      startTime: arbitraryDate
+    }, "InvalidDownload", "null content type");
+  },
+  // Incorrect storage names are likewise immediately invalidated
+  function invalidStorageName() {
+    checkInvalidResult({
+      url: "",
+      storageName: "ALMOST CERTAINLY DOES NOT EXIST",
+      storagePath: "relpath/filename.txt",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "InvalidDownload", "invalid storage name");
+  },
+  // The existence of the file is validated in the parent process
+  function legitStorageInvalidPath() {
+    checkInvalidResult({
+      url: "",
+      storageName: blobStorageName,
+      storagePath: "ALMOST CERTAINLY DOES NOT EXIST",
+      contentType: "text/plain",
+      startTime: arbitraryDate
+    }, "AdoptNoSuchFile", "invalid path");
+  },
+  function allDone() {
+    // Just in case, make sure no other mochitest could mess with us after we've
+    // finished.
+    navigator.mozDownloadManager.ondownloadstart = null;
+    runTests();
+  }
+];
+
+function runTests() {
+  if (!tests.length) {
+    finish();
+    return;
+  }
+
+  var test = tests.shift();
+  if (test.name) {
+    info('starting test: ' + test.name);
+  }
+  test();
+}
+runTests();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.manifest thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.manifest
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.manifest	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/testapp_downloads_adopt_download.manifest	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,10 @@
+{
+  "name": "Downloads certified test fake app",
+  "description": "Test",
+  "launch_path": "http://mochi.test:8888/tests/dom/downloads/tests/testapp_downloads_adopt_download.html",
+  "type": "certified",
+  "permissions": {
+    "device-storage:sdcard":{ "access": "readcreate" },
+    "downloads": {}
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_adopt_download.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_adopt_download.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_adopt_download.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_adopt_download.html	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=825318
+-->
+<head>
+  <title>Test for Bug 825318 mozDownloadManager.adoptDownload</title>
+  <script type="application/javascript;version=1.7" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript;version=1.7" src="shim_app_as_test.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=825318">Mozilla Bug 825318</a>
+<p id="display"></p>
+<div id="content">
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript;version=1.7">
+
+runAppTest({
+  appFile: 'testapp_downloads_adopt_download.html',
+  appManifest: 'testapp_downloads_adopt_download.manifest',
+  appType: 'certified',
+  extraPrefs: {
+    set: [["dom.mozDownloads.enabled", true]]
+  }
+});
+
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_basic.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_basic.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_basic.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_basic.html	2015-02-28 15:03:07.000000000 +0000
@@ -72,6 +72,10 @@
     is(download.currentBytes, 1024, "Download current size is 1024 bytes");
     SimpleTest.finish();
   } else if (download.state === "downloading") {
+    // Note that this case may or may not trigger, depending on whether the
+    // download is initially reported with 0 bytes (we should happen) or with
+    // 1024 bytes (we should not happen).  If we do happen, an additional 8
+    // TEST-PASS events should be logged.
     ok(download.currentBytes > lastKnownCurrentBytes,
        "Download current size is larger than last download change event");
     lastKnownCurrentBytes = download.currentBytes;
@@ -84,7 +88,8 @@
   var download = evt.download;
   checkConsistentDownloadAttributes(download);
 
-  is(download.currentBytes, 0, "Download current size is zero");
+  // We used to check that the currentBytes was 0.  This was incorrect.  It
+  // is very common to first hear about the download already at 1024 bytes.
   is(download.state, "downloading", "Download state is downloading");
 
   download.onstatechange = downloadChange;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_large.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_large.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_large.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_large.html	2015-02-28 15:03:07.000000000 +0000
@@ -7,6 +7,7 @@
   <title>Test for Bug 938023 Downloads API</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="clear_all_done_helper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -46,7 +47,7 @@
 
 function getDownloads(downloads) {
   ok(downloads.length == 1, "One downloads after getDownloads");
-  navigator.mozDownloadManager.clearAllDone().then(clearAllDone, error);
+  clearAllDoneHelper(true).then(clearAllDone, error);
 }
 
 function clearAllDone(downloads) {
@@ -76,7 +77,7 @@
     SpecialPowers.pushPermissions([
       {type: "downloads", allow: true, context: document}
     ], function() {
-      navigator.mozDownloadManager.clearAllDone().then(next, error);
+      clearAllDoneHelper(true).then(next, error);
     });
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_pause_remove.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_pause_remove.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_pause_remove.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_pause_remove.html	2015-02-28 15:03:07.000000000 +0000
@@ -7,6 +7,7 @@
   <title>Test for Bug 938023 Downloads API</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="clear_all_done_helper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -83,7 +84,7 @@
     SpecialPowers.pushPermissions([
       {type: "downloads", allow: true, context: document}
     ], function() {
-      navigator.mozDownloadManager.clearAllDone().then(next, error);
+      clearAllDoneHelper(true).then(next, error);
     });
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_pause_resume.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_pause_resume.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/downloads/tests/test_downloads_pause_resume.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/downloads/tests/test_downloads_pause_resume.html	2015-02-28 15:03:07.000000000 +0000
@@ -7,6 +7,7 @@
   <title>Test for Bug 938023 Downloads API</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="clear_all_done_helper.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -54,8 +55,7 @@
 
 function checkResumeSucceeded(download) {
   ok(download.state == "succeeded", "Download resumed successfully.");
-  navigator.mozDownloadManager.clearAllDone()
-             .then(checkDownloadList, error);
+  clearAllDoneHelper(true).then(checkDownloadList, error);
 }
 
 function downloadChange(evt) {
@@ -85,7 +85,7 @@
     SpecialPowers.pushPermissions([
       {type: "downloads", allow: true, context: document}
     ], function() {
-      navigator.mozDownloadManager.clearAllDone().then(next, error);
+      clearAllDoneHelper(true).then(next, error);
     });
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/encoding/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/encoding/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/encoding/Makefile.in	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/encoding/Makefile.in	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/.
-
-include $(topsrcdir)/config/rules.mk
-
-PROPS2ARRAYS = $(topsrcdir)/intl/locale/props2arrays.py
-labelsencodings.properties.h: $(PROPS2ARRAYS) labelsencodings.properties
-	$(PYTHON) $^ $@
-localesfallbacks.properties.h: $(PROPS2ARRAYS) localesfallbacks.properties
-	$(PYTHON) $^ $@
-domainsfallbacks.properties.h: $(PROPS2ARRAYS) domainsfallbacks.properties
-	$(PYTHON) $^ $@
-encodingsgroups.properties.h: $(PROPS2ARRAYS) encodingsgroups.properties
-	$(PYTHON) $^ $@
-nonparticipatingdomains.properties.h: $(PROPS2ARRAYS) nonparticipatingdomains.properties
-	$(PYTHON) $^ $@
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/encoding/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/encoding/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/encoding/moz.build	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/encoding/moz.build	2015-02-28 15:03:07.000000000 +0000
@@ -25,13 +25,22 @@
     '/intl/locale',
 ]
 
-GENERATED_FILES += [
-    'domainsfallbacks.properties.h',
-    'encodingsgroups.properties.h',
-    'labelsencodings.properties.h',
-    'localesfallbacks.properties.h',
-    'nonparticipatingdomains.properties.h',
-]
+props2arrays = TOPSRCDIR + '/intl/locale/props2arrays.py'
+prefixes = (
+    'domainsfallbacks',
+    'encodingsgroups',
+    'labelsencodings',
+    'localesfallbacks',
+    'nonparticipatingdomains',
+)
+
+for prefix in prefixes:
+    input_file = prefix + '.properties'
+    header = prefix + '.properties.h'
+    GENERATED_FILES += [header]
+    props = GENERATED_FILES[header]
+    props.script = props2arrays
+    props.inputs = [input_file]
 
 MOCHITEST_MANIFESTS += [
     'test/mochitest.ini',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/DataContainerEvent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/DataContainerEvent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/DataContainerEvent.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/DataContainerEvent.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -16,8 +16,9 @@
                                        WidgetEvent* aEvent)
   : Event(aOwner, aPresContext, aEvent)
 {
-  if (mOwner) {
-    if (nsIDocument* doc = mOwner->GetExtantDoc()) {
+  nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(mOwner);
+  if (win) {
+    if (nsIDocument* doc = win->GetExtantDoc()) {
       doc->WarnOnceAbout(nsIDocument::eDataContainerEvent);
     }
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/Event.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/Event.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/Event.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/Event.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -1026,7 +1026,11 @@
       return 0.0;
     }
 
-    nsPerformance* perf = mOwner->GetPerformance();
+    nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(mOwner);
+    if (NS_WARN_IF(!win)) {
+      return 0.0;
+    }
+    nsPerformance* perf = win->GetPerformance();
     if (NS_WARN_IF(!perf)) {
       return 0.0;
     }
@@ -1049,8 +1053,9 @@
 bool
 Event::GetPreventDefault() const
 {
-  if (mOwner) {
-    if (nsIDocument* doc = mOwner->GetExtantDoc()) {
+  nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(mOwner));
+  if (win) {
+    if (nsIDocument* doc = win->GetExtantDoc()) {
       doc->WarnOnceAbout(nsIDocument::eGetPreventDefault);
     }
   }
@@ -1130,23 +1135,23 @@
 
   nsCOMPtr<nsINode> n = do_QueryInterface(aOwner);
   if (n) {
-    mOwner = do_QueryInterface(n->OwnerDoc()->GetScopeObject());
+    mOwner = n->OwnerDoc()->GetScopeObject();
     return;
   }
 
   nsCOMPtr<nsPIDOMWindow> w = do_QueryInterface(aOwner);
   if (w) {
     if (w->IsOuterWindow()) {
-      mOwner = w->GetCurrentInnerWindow();
+      mOwner = do_QueryInterface(w->GetCurrentInnerWindow());
     } else {
-      mOwner.swap(w);
+      mOwner = do_QueryInterface(w);
     }
     return;
   }
 
   nsCOMPtr<DOMEventTargetHelper> eth = do_QueryInterface(aOwner);
   if (eth) {
-    mOwner = eth->GetOwner();
+    mOwner = eth->GetParentObject();
     return;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/Event.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/Event.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/Event.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/Event.h	2015-02-28 15:03:07.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsIScriptGlobalObject.h"
 #include "Units.h"
 #include "js/TypeDecls.h"
+#include "nsIGlobalObject.h"
 
 class nsIContent;
 class nsIDOMEventTarget;
@@ -63,15 +64,6 @@
                        WidgetEvent* aEvent);
 
 public:
-  void GetParentObject(nsIScriptGlobalObject** aParentObject)
-  {
-    if (mOwner) {
-      CallQueryInterface(mOwner, aParentObject);
-    } else {
-      *aParentObject = nullptr;
-    }
-  }
-
   static Event* FromSupports(nsISupports* aSupports)
   {
     nsIDOMEvent* event =
@@ -93,7 +85,7 @@
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Event)
 
-  nsISupports* GetParentObject()
+  nsIGlobalObject* GetParentObject()
   {
     return mOwner;
   }
@@ -274,7 +266,7 @@
   mozilla::WidgetEvent*       mEvent;
   nsRefPtr<nsPresContext>     mPresContext;
   nsCOMPtr<EventTarget>       mExplicitOriginalTarget;
-  nsCOMPtr<nsPIDOMWindow>     mOwner; // nsPIDOMWindow for now.
+  nsCOMPtr<nsIGlobalObject>   mOwner;
   bool                        mEventIsInternal;
   bool                        mPrivateDataDuplicated;
   bool                        mIsMainThreadEvent;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/KeyboardEvent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/KeyboardEvent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/KeyboardEvent.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/KeyboardEvent.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -267,10 +267,16 @@
   internalEvent->location = aParam.mLocation;
   internalEvent->mIsRepeat = aParam.mRepeat;
   internalEvent->mIsComposing = aParam.mIsComposing;
-  internalEvent->mKeyNameIndex = KEY_NAME_INDEX_USE_STRING;
-  internalEvent->mCodeNameIndex = CODE_NAME_INDEX_USE_STRING;
-  internalEvent->mKeyValue = aParam.mKey;
-  internalEvent->mCodeValue = aParam.mCode;
+  internalEvent->mKeyNameIndex =
+    WidgetKeyboardEvent::GetKeyNameIndex(aParam.mKey);
+  if (internalEvent->mKeyNameIndex == KEY_NAME_INDEX_USE_STRING) {
+    internalEvent->mKeyValue = aParam.mKey;
+  }
+  internalEvent->mCodeNameIndex =
+    WidgetKeyboardEvent::GetCodeNameIndex(aParam.mCode);
+  if (internalEvent->mCodeNameIndex == CODE_NAME_INDEX_USE_STRING) {
+    internalEvent->mCodeValue = aParam.mCode;
+  }
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/KeyNameList.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/KeyNameList.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/KeyNameList.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/KeyNameList.h	2015-02-28 15:03:07.000000000 +0000
@@ -30,6 +30,7 @@
  *****************************************************************************/
 DEFINE_KEYNAME_INTERNAL(PrintableKey, "MozPrintableKey")
 DEFINE_KEYNAME_INTERNAL(HomeScreen, "MozHomeScreen")
+DEFINE_KEYNAME_INTERNAL(CameraFocusAdjust, "MozCameraFocusAdjust")
 
 /******************************************************************************
  * Modifier Keys
@@ -39,7 +40,7 @@
 DEFINE_KEYNAME_WITH_SAME_NAME(CapsLock)
 DEFINE_KEYNAME_WITH_SAME_NAME(Control)
 DEFINE_KEYNAME_WITH_SAME_NAME(Fn)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FnLock)
+DEFINE_KEYNAME_WITH_SAME_NAME(FnLock)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Hyper)
 DEFINE_KEYNAME_WITH_SAME_NAME(Meta)
 DEFINE_KEYNAME_WITH_SAME_NAME(NumLock)
@@ -48,13 +49,13 @@
 DEFINE_KEYNAME_WITH_SAME_NAME(Shift)
 // DEFINE_KEYNAME_WITH_SAME_NAME(Super)
 DEFINE_KEYNAME_WITH_SAME_NAME(Symbol)
-// DEFINE_KEYNAME_WITH_SAME_NAME(SymbolLock)
+DEFINE_KEYNAME_WITH_SAME_NAME(SymbolLock)
 
 /******************************************************************************
  * Whitespace Keys
  *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(Enter)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Separator)
+DEFINE_KEYNAME_WITH_SAME_NAME(Separator)
 DEFINE_KEYNAME_WITH_SAME_NAME(Tab)
 
 /******************************************************************************
@@ -89,7 +90,7 @@
  * UI Keys
  *****************************************************************************/
 DEFINE_KEYNAME_WITH_SAME_NAME(Accept)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Again)
+DEFINE_KEYNAME_WITH_SAME_NAME(Again)
 DEFINE_KEYNAME_WITH_SAME_NAME(Attn)
 DEFINE_KEYNAME_WITH_SAME_NAME(Cancel)
 DEFINE_KEYNAME_WITH_SAME_NAME(ContextMenu)
@@ -99,7 +100,7 @@
 DEFINE_KEYNAME_WITH_SAME_NAME(Help)
 DEFINE_KEYNAME_WITH_SAME_NAME(Pause)
 DEFINE_KEYNAME_WITH_SAME_NAME(Play)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Props)
+DEFINE_KEYNAME_WITH_SAME_NAME(Props)
 DEFINE_KEYNAME_WITH_SAME_NAME(Select)
 DEFINE_KEYNAME_WITH_SAME_NAME(ZoomIn)
 DEFINE_KEYNAME_WITH_SAME_NAME(ZoomOut)
@@ -134,10 +135,10 @@
 DEFINE_KEYNAME_WITH_SAME_NAME(GroupNext)
 DEFINE_KEYNAME_WITH_SAME_NAME(GroupPrevious)
 DEFINE_KEYNAME_WITH_SAME_NAME(ModeChange)
-// DEFINE_KEYNAME_WITH_SAME_NAME(NextCandidate)
+DEFINE_KEYNAME_WITH_SAME_NAME(NextCandidate)
 DEFINE_KEYNAME_WITH_SAME_NAME(NonConvert)
 DEFINE_KEYNAME_WITH_SAME_NAME(PreviousCandidate)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Process)
+DEFINE_KEYNAME_WITH_SAME_NAME(Process)
 DEFINE_KEYNAME_WITH_SAME_NAME(SingleCandidate)
 
 /******************************************************************************
@@ -199,10 +200,10 @@
 DEFINE_KEYNAME_WITH_SAME_NAME(F33)
 DEFINE_KEYNAME_WITH_SAME_NAME(F34)
 DEFINE_KEYNAME_WITH_SAME_NAME(F35)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Soft1)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Soft2)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Soft3)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
+DEFINE_KEYNAME_WITH_SAME_NAME(Soft1)
+DEFINE_KEYNAME_WITH_SAME_NAME(Soft2)
+DEFINE_KEYNAME_WITH_SAME_NAME(Soft3)
+DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
 
 /******************************************************************************
  * Multimedia Keys
@@ -273,13 +274,13 @@
 /******************************************************************************
  * Media Controller Keys
  *****************************************************************************/
-// DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceLeft)
-// DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceRight)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceLeft)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceRight)
 DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostDown)
 DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostUp)
-// DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderFront)
-// DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderRear)
-// DEFINE_KEYNAME_WITH_SAME_NAME(AudioSurroundModeNext)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderFront)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderRear)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioSurroundModeNext)
 DEFINE_KEYNAME_WITH_SAME_NAME(AVRInput)
 DEFINE_KEYNAME_WITH_SAME_NAME(AVRPower)
 DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
@@ -288,68 +289,68 @@
 DEFINE_KEYNAME_WITH_SAME_NAME(ColorF1Green)
 DEFINE_KEYNAME_WITH_SAME_NAME(ColorF2Yellow)
 DEFINE_KEYNAME_WITH_SAME_NAME(ColorF3Blue)
-// DEFINE_KEYNAME_WITH_SAME_NAME(ColorF4Grey)
-// DEFINE_KEYNAME_WITH_SAME_NAME(ColorF5Brown)
-// DEFINE_KEYNAME_WITH_SAME_NAME(ClosedCaptionToggle)
+DEFINE_KEYNAME_WITH_SAME_NAME(ColorF4Grey)
+DEFINE_KEYNAME_WITH_SAME_NAME(ColorF5Brown)
+DEFINE_KEYNAME_WITH_SAME_NAME(ClosedCaptionToggle)
 DEFINE_KEYNAME_WITH_SAME_NAME(Dimmer)
-// DEFINE_KEYNAME_WITH_SAME_NAME(DisplaySwap)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear0)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear1)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear2)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear3)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall0)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall1)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall2)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall3)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore0)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore1)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore2)
-// DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore3)
+DEFINE_KEYNAME_WITH_SAME_NAME(DisplaySwap)
+DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear0)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear1)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear2)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear3)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall0)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall1)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall2)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall3)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore0)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore1)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore2)
+DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteStore3)
 DEFINE_KEYNAME_WITH_SAME_NAME(Guide)
-// DEFINE_KEYNAME_WITH_SAME_NAME(GuideNextDay)
-// DEFINE_KEYNAME_WITH_SAME_NAME(GuidePreviousDay)
+DEFINE_KEYNAME_WITH_SAME_NAME(GuideNextDay)
+DEFINE_KEYNAME_WITH_SAME_NAME(GuidePreviousDay)
 DEFINE_KEYNAME_WITH_SAME_NAME(Info)
-// DEFINE_KEYNAME_WITH_SAME_NAME(InstantReplay)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Link)
-// DEFINE_KEYNAME_WITH_SAME_NAME(ListProgram)
-// DEFINE_KEYNAME_WITH_SAME_NAME(LiveContent)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Lock)
-// DEFINE_KEYNAME_WITH_SAME_NAME(MediaApps)
+DEFINE_KEYNAME_WITH_SAME_NAME(InstantReplay)
+DEFINE_KEYNAME_WITH_SAME_NAME(Link)
+DEFINE_KEYNAME_WITH_SAME_NAME(ListProgram)
+DEFINE_KEYNAME_WITH_SAME_NAME(LiveContent)
+DEFINE_KEYNAME_WITH_SAME_NAME(Lock)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaApps)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaFastForward)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaLast)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaPause)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlay)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaRecord)
 DEFINE_KEYNAME_WITH_SAME_NAME(MediaRewind)
-// DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkip)
-// DEFINE_KEYNAME_WITH_SAME_NAME(NextFavoriteChannel)
-// DEFINE_KEYNAME_WITH_SAME_NAME(NextUserProfile)
-// DEFINE_KEYNAME_WITH_SAME_NAME(OnDemand)
-// DEFINE_KEYNAME_WITH_SAME_NAME(PinPDown)
-// DEFINE_KEYNAME_WITH_SAME_NAME(PinPMove)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkip)
+DEFINE_KEYNAME_WITH_SAME_NAME(NextFavoriteChannel)
+DEFINE_KEYNAME_WITH_SAME_NAME(NextUserProfile)
+DEFINE_KEYNAME_WITH_SAME_NAME(OnDemand)
+DEFINE_KEYNAME_WITH_SAME_NAME(PinPDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(PinPMove)
 DEFINE_KEYNAME_WITH_SAME_NAME(PinPToggle)
-// DEFINE_KEYNAME_WITH_SAME_NAME(PinPUp)
-// DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedDown)
-// DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedReset)
-// DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedUp)
+DEFINE_KEYNAME_WITH_SAME_NAME(PinPUp)
+DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedReset)
+DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedUp)
 DEFINE_KEYNAME_WITH_SAME_NAME(RandomToggle)
-// DEFINE_KEYNAME_WITH_SAME_NAME(RcLowBattery)
-// DEFINE_KEYNAME_WITH_SAME_NAME(RecordSpeedNext)
-// DEFINE_KEYNAME_WITH_SAME_NAME(RfBypass)
-// DEFINE_KEYNAME_WITH_SAME_NAME(ScanChannelsToggle)
-// DEFINE_KEYNAME_WITH_SAME_NAME(ScreenModeNext)
+DEFINE_KEYNAME_WITH_SAME_NAME(RcLowBattery)
+DEFINE_KEYNAME_WITH_SAME_NAME(RecordSpeedNext)
+DEFINE_KEYNAME_WITH_SAME_NAME(RfBypass)
+DEFINE_KEYNAME_WITH_SAME_NAME(ScanChannelsToggle)
+DEFINE_KEYNAME_WITH_SAME_NAME(ScreenModeNext)
 DEFINE_KEYNAME_WITH_SAME_NAME(Settings)
-// DEFINE_KEYNAME_WITH_SAME_NAME(SplitScreenToggle)
+DEFINE_KEYNAME_WITH_SAME_NAME(SplitScreenToggle)
 DEFINE_KEYNAME_WITH_SAME_NAME(STBInput)
 DEFINE_KEYNAME_WITH_SAME_NAME(STBPower)
 DEFINE_KEYNAME_WITH_SAME_NAME(Subtitle)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Teletext)
+DEFINE_KEYNAME_WITH_SAME_NAME(Teletext)
 DEFINE_KEYNAME_WITH_SAME_NAME(TV)
 DEFINE_KEYNAME_WITH_SAME_NAME(TVInput)
 DEFINE_KEYNAME_WITH_SAME_NAME(TVPower)
 DEFINE_KEYNAME_WITH_SAME_NAME(VideoModeNext)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Wink)
+DEFINE_KEYNAME_WITH_SAME_NAME(Wink)
 DEFINE_KEYNAME_WITH_SAME_NAME(ZoomToggle)
 
 #undef DEFINE_KEYNAME_WITH_SAME_NAME
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/PhysicalKeyCodeNameList.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/PhysicalKeyCodeNameList.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/PhysicalKeyCodeNameList.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/PhysicalKeyCodeNameList.h	2015-02-28 15:03:07.000000000 +0000
@@ -42,7 +42,7 @@
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Digit9)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Equal)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(IntlBackslash)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(IntlHash)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(IntlHash)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(IntlRo)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(IntlYen)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(KeyA)
@@ -97,9 +97,9 @@
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(KanaMode)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang1)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang2)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang3)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang4)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang5)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang3)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang4)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Lang5)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NonConvert)
 
 // Control pad section
@@ -131,21 +131,21 @@
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(Numpad9)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadAdd)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadBackspace)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadClear)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadClearEntry)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadClear)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadClearEntry)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadComma)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadDecimal)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadDivide)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadEnter)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadEqual)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryAdd)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryClear)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryRecall)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryStore)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryAdd)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryClear)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryRecall)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemoryStore)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMemorySubtract)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadMultiply)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadParenLeft)
-// DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadParenRight)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadParenLeft)
+DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadParenRight)
 DEFINE_PHYSICAL_KEY_CODE_NAME_WITH_SAME_NAME(NumpadSubtract)
 
 // Function section
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_all_synthetic_events.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_all_synthetic_events.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_all_synthetic_events.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_all_synthetic_events.html	2015-02-28 15:03:07.000000000 +0000
@@ -393,14 +393,6 @@
                                                          return new RTCPeerConnectionIceEvent(aName, aProps);
                                                        },
                                              },
-  RTCPeerConnectionIdentityEvent:            { create: function (aName, aProps) {
-                                                         return new RTCPeerConnectionIdentityEvent(aName, aProps);
-                                                       },
-                                             },
-  RTCPeerConnectionIdentityErrorEvent:       { create: function (aName, aProps) {
-                                                         return new RTCPeerConnectionIdentityErrorEvent(aName, aProps);
-                                                       },
-                                             },
   ScrollAreaEvent:                           { create: function (aName, aProps) {
                                                          var e = document.createEvent("scrollareaevent");
                                                          e.initScrollAreaEvent(aName, aProps.bubbles, aProps.cancelable,
@@ -561,7 +553,7 @@
     continue;
   }
   if (typeof(event.getModifierState) == "function") {
-    const kModifiers = [ "Shift", "Control", "Alt", "AltGr", "Meta", "CapsLock", "ScrollLock", "NumLock", "OS", "Fn", "SymbolLock" ];
+    const kModifiers = [ "Shift", "Control", "Alt", "AltGr", "Meta", "CapsLock", "ScrollLock", "NumLock", "OS", "Fn", "FnLock", "Symbol", "SymbolLock" ];
     for (var j = 0; j < kModifiers.length; j++) {
       ok(true, "Calling " + props[i] + ".getModifierState(" + kModifiers[j] + ")...");
       var modifierState = event.getModifierState(kModifiers[j]);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug422132.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug422132.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug422132.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug422132.html	2015-02-28 15:03:07.000000000 +0000
@@ -26,7 +26,11 @@
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
-SimpleTest.waitForFocus(runTests, window);
+SimpleTest.waitForFocus(function() {
+  SpecialPowers.pushPrefEnv({
+    "set":[["general.smoothScroll", false],
+           ["mousewheel.min_line_scroll_amount", 1],
+           ["mousewheel.transaction.timeout", 100000]]}, runTests)}, window);
 
 function hitEventLoop(aFunc, aTimes)
 {
@@ -39,10 +43,6 @@
 
 function runTests()
 {
-  SpecialPowers.setBoolPref("general.smoothScroll", false);
-  SpecialPowers.setIntPref("mousewheel.min_line_scroll_amount", 1);
-  SpecialPowers.setIntPref("mousewheel.transaction.timeout", 100000);
-
   var target = document.getElementById("target");
 
   var scrollLeft = target.scrollLeft;
@@ -81,9 +81,6 @@
              "not scrolled to right by 0.5 line delta value with pending 0.5 line delta");
           ok(target.scrollTop > scrollTop,
              "not scrolled to bottom by 0.5 line delta value with pending 0.5 line delta");
-          SpecialPowers.clearUserPref("general.smoothScroll");
-          SpecialPowers.clearUserPref("mousewheel.min_line_scroll_amount");
-          SpecialPowers.clearUserPref("mousewheel.transaction.timeout");
           SimpleTest.finish();
         }, 20);
       }, 20);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug563329.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug563329.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug563329.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug563329.html	2015-02-28 15:03:07.000000000 +0000
@@ -38,9 +38,6 @@
 }
 
 function doTest() {
-  // Enable context menus
-  SpecialPowers.setBoolPref("ui.click_hold_context_menus", true);
-
   target = document.getElementById("testTarget");
 
   document.documentElement.addEventListener("contextmenu", function() {
@@ -66,29 +63,18 @@
   var duration = 50;
 
   // Change click hold delay
-  SpecialPowers.setIntPref("ui.click_hold_context_menus.delay", duration);
-
-  synthesizeMouse(target, 0, 0, {type: "mousedown"});
+  SpecialPowers.pushPrefEnv({"set":[["ui.click_hold_context_menus.delay", duration]]}, function() { synthesizeMouse(target, 0, 0, {type: "mousedown"}); });
 }
 
 function finishTest() {
   synthesizeKey("VK_ESCAPE", {}, window);
-  try {
-    SpecialPowers.clearUserPref("ui.click_hold_context_menus");
-  }
-  catch(e) {}
-
-  try {
-    SpecialPowers.clearUserPref("ui.click_hold_context_menus.delay");
-  }
-  catch(e) {}
-
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
-addLoadEvent(doTest);
-
+addLoadEvent(function() {
+  SpecialPowers.pushPrefEnv({"set":[["ui.click_hold_context_menus", true]]}, doTest);
+});
 </script>
 </pre>
 <span id="testTarget" style="border: 1px solid black;">testTarget</span>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug574663.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug574663.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug574663.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug574663.html	2015-02-28 15:03:07.000000000 +0000
@@ -60,7 +60,6 @@
       if (!outstandingTests.length) {
         winUtils.restoreNormalRefresh();
         win.close();
-        clearPrefs();
         SimpleTest.finish();
         return;
       }
@@ -98,27 +97,12 @@
   }, win);
 }
 
-function initPrefs()
-{
-  SpecialPowers.setBoolPref("general.smoothScroll", false);
-  // Disables the app level scroll acceleration
-  SpecialPowers.setIntPref("mousewheel.acceleration.start", -1);
-  SpecialPowers.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
-  // Enable zooming for ctrl-scrolling
-  SpecialPowers.setIntPref("mousewheel.with_control.action", 3);
-}
-
-function clearPrefs()
-{
-  SpecialPowers.clearUserPref("general.smoothScroll");
-  SpecialPowers.clearUserPref("mousewheel.acceleration.start");
-  SpecialPowers.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
-  SpecialPowers.clearUserPref("mousewheel.with_control.action");
-}
-
-window.onload = function () {
-  initPrefs();
-  SimpleTest.executeSoon(runTest);
+window.onload = function() {
+  SpecialPowers.pushPrefEnv({
+    "set":[["general.smoothScroll", false],
+           ["mousewheel.acceleration.start", -1],
+           ["mousewheel.system_scroll_override_on_root_content.enabled", false],
+           ["mousewheel.with_control.action", 3]]}, runTest);
 }
 
 SimpleTest.waitForExplicitFinish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug607464.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug607464.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug607464.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug607464.html	2015-02-28 15:03:07.000000000 +0000
@@ -63,33 +63,17 @@
            "Pixel scrolling should have finished after one refresh driver iteration. " +
            "We shouldn't be scrolling smoothly, even though the pref is set.");
         win.close();
-        clearPrefs();
         SimpleTest.finish();
       });
     });
   }, win);
 }
 
-function initPrefs()
-{
-  // Disables the app level scroll acceleration
-  SpecialPowers.setIntPref("mousewheel.acceleration.start", -1);
-  SpecialPowers.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
-
-  // Enables smooth scrolling
-  SpecialPowers.setBoolPref("general.smoothScroll", true);
-}
-
-function clearPrefs()
-{
-  SpecialPowers.clearUserPref("mousewheel.acceleration.start");
-  SpecialPowers.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
-  SpecialPowers.clearUserPref("general.smoothScroll");
-}
-
-window.onload = function () {
-  initPrefs();
-  SimpleTest.executeSoon(runTest);
+window.onload = function() {
+  SpecialPowers.pushPrefEnv({
+    "set":[["general.smoothScroll", true],
+           ["mousewheel.acceleration.start", -1],
+           ["mousewheel.system_scroll_override_on_root_content.enabled", false]]}, runTest);
 }
 
 SimpleTest.waitForExplicitFinish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug822898.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug822898.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_bug822898.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_bug822898.html	2015-02-28 15:03:07.000000000 +0000
@@ -330,26 +330,14 @@
   tests.push(testPointerEventCTORS());
 
   tests.push(function() {
-    clearPrefs();
     SimpleTest.finish();
   });
 
   nextTest();
 }
 
-function initPrefs()
-{
-  SpecialPowers.setBoolPref("dom.w3c_pointer_events.enabled", true);      // Enable Pointer Events
-}
-
-function clearPrefs()
-{
-  SpecialPowers.clearUserPref("dom.w3c_pointer_events.enabled");      // Disable Pointer Events
-}
-
-window.onload = function () {
-  initPrefs();
-  SimpleTest.executeSoon(runTests);
+window.onload = function() {
+  SpecialPowers.pushPrefEnv({"set":[["dom.w3c_pointer_events.enabled", true]]}, runTests);
 }
 
 SimpleTest.waitForExplicitFinish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_dom_keyboard_event.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_dom_keyboard_event.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_dom_keyboard_event.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_dom_keyboard_event.html	2015-02-28 15:03:07.000000000 +0000
@@ -74,7 +74,7 @@
   ];
 
   const kOtherModifierName = [
-    "CapsLock", "NumLock", "ScrollLock", "SymbolLock", "Fn", "OS", "AltGraph"
+    "CapsLock", "NumLock", "ScrollLock", "Symbol", "SymbolLock", "Fn", "FnLock", "OS", "AltGraph"
   ];
 
   const kInvalidModifierName = [
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_dom_mouse_event.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_dom_mouse_event.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/test/test_dom_mouse_event.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/test/test_dom_mouse_event.html	2015-02-28 15:03:07.000000000 +0000
@@ -81,7 +81,7 @@
   ];
 
   const kOtherModifierName = [
-    "CapsLock", "NumLock", "ScrollLock", "SymbolLock", "Fn", "OS", "AltGraph"
+    "CapsLock", "NumLock", "ScrollLock", "Symbol", "SymbolLock", "Fn", "FnLock", "OS", "AltGraph"
   ];
 
   const kInvalidModifierName = [
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/UIEvent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/UIEvent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/events/UIEvent.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/events/UIEvent.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -403,10 +403,12 @@
   { MODIFIER_CAPSLOCK,   NS_DOM_KEYNAME_CAPSLOCK },
   { MODIFIER_CONTROL,    NS_DOM_KEYNAME_CONTROL },
   { MODIFIER_FN,         NS_DOM_KEYNAME_FN },
+  { MODIFIER_FNLOCK,     NS_DOM_KEYNAME_FNLOCK },
   { MODIFIER_META,       NS_DOM_KEYNAME_META },
   { MODIFIER_NUMLOCK,    NS_DOM_KEYNAME_NUMLOCK },
   { MODIFIER_SCROLLLOCK, NS_DOM_KEYNAME_SCROLLLOCK },
   { MODIFIER_SHIFT,      NS_DOM_KEYNAME_SHIFT },
+  { MODIFIER_SYMBOL,     NS_DOM_KEYNAME_SYMBOL },
   { MODIFIER_SYMBOLLOCK, NS_DOM_KEYNAME_SYMBOLLOCK },
   { MODIFIER_OS,         NS_DOM_KEYNAME_OS }
 };
@@ -450,46 +452,7 @@
 {
   WidgetInputEvent* inputEvent = mEvent->AsInputEvent();
   MOZ_ASSERT(inputEvent, "mEvent must be WidgetInputEvent or derived class");
-  if (aKey.EqualsLiteral("Accel")) {
-    return inputEvent->IsAccel();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_SHIFT)) {
-    return inputEvent->IsShift();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_CONTROL)) {
-    return inputEvent->IsControl();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_META)) {
-    return inputEvent->IsMeta();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_ALT)) {
-    return inputEvent->IsAlt();
-  }
-
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_ALTGRAPH)) {
-    return inputEvent->IsAltGraph();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_OS)) {
-    return inputEvent->IsOS();
-  }
-
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_CAPSLOCK)) {
-    return inputEvent->IsCapsLocked();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_NUMLOCK)) {
-    return inputEvent->IsNumLocked();
-  }
-
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_FN)) {
-    return inputEvent->IsFn();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_SCROLLLOCK)) {
-    return inputEvent->IsScrollLocked();
-  }
-  if (aKey.EqualsLiteral(NS_DOM_KEYNAME_SYMBOLLOCK)) {
-    return inputEvent->IsSymbolLocked();
-  }
-  return false;
+  return ((inputEvent->modifiers & WidgetInputEvent::GetModifier(aKey)) != 0);
 }
 
 } // namespace dom
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Fetch.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Fetch.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Fetch.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Fetch.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -866,6 +866,11 @@
 template
 FetchBody<Response>::FetchBody();
 
+template <class Derived>
+FetchBody<Derived>::~FetchBody()
+{
+}
+
 // Returns true if addref succeeded.
 // Always succeeds on main thread.
 // May fail on worker if RegisterFeature() fails. In that case, it will release
@@ -1159,7 +1164,7 @@
 {
   mConsumeType = aType;
   if (BodyUsed()) {
-    aRv.ThrowTypeError(MSG_REQUEST_BODY_CONSUMED_ERROR);
+    aRv.ThrowTypeError(MSG_FETCH_BODY_CONSUMED_ERROR);
     return nullptr;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/FetchDriver.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/FetchDriver.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/FetchDriver.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/FetchDriver.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -517,9 +517,11 @@
 FetchDriver::BeginAndGetFilteredResponse(InternalResponse* aResponse)
 {
   MOZ_ASSERT(aResponse);
-  nsAutoCString reqURL;
-  mRequest->GetURL(reqURL);
-  aResponse->SetUrl(reqURL);
+  if (!aResponse->FinalURL()) {
+    nsAutoCString reqURL;
+    mRequest->GetURL(reqURL);
+    aResponse->SetUrl(reqURL);
+  }
 
   // FIXME(nsm): Handle mixed content check, step 7 of fetch.
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Fetch.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Fetch.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Fetch.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Fetch.h	2015-02-28 15:03:07.000000000 +0000
@@ -99,7 +99,7 @@
 class FetchBody {
 public:
   bool
-  BodyUsed() { return mBodyUsed; }
+  BodyUsed() const { return mBodyUsed; }
 
   already_AddRefed<Promise>
   ArrayBuffer(ErrorResult& aRv)
@@ -135,6 +135,12 @@
   void
   CancelPump();
 
+  void
+  SetBodyUsed()
+  {
+    mBodyUsed = true;
+  }
+
   // Always set whenever the FetchBody is created on the worker thread.
   workers::WorkerPrivate* mWorkerPrivate;
 
@@ -145,15 +151,7 @@
 protected:
   FetchBody();
 
-  virtual ~FetchBody()
-  {
-  }
-
-  void
-  SetBodyUsed()
-  {
-    mBodyUsed = true;
-  }
+  virtual ~FetchBody();
 
   void
   SetMimeType(ErrorResult& aRv);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalRequest.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalRequest.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalRequest.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalRequest.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include "nsIContentPolicy.h"
 #include "nsIDocument.h"
+#include "nsStreamUtils.h"
 
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/ScriptSettings.h"
@@ -43,6 +44,53 @@
   return copy.forget();
 }
 
+already_AddRefed<InternalRequest>
+InternalRequest::Clone()
+{
+  nsRefPtr<InternalRequest> clone = new InternalRequest(*this);
+
+  if (!mBodyStream) {
+    return clone.forget();
+  }
+
+  nsCOMPtr<nsIInputStream> clonedBody;
+  nsCOMPtr<nsIInputStream> replacementBody;
+
+  nsresult rv = NS_CloneInputStream(mBodyStream, getter_AddRefs(clonedBody),
+                                    getter_AddRefs(replacementBody));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return nullptr; }
+
+  clone->mBodyStream.swap(clonedBody);
+  if (replacementBody) {
+    mBodyStream.swap(replacementBody);
+  }
+
+  return clone.forget();
+}
+
+InternalRequest::InternalRequest(const InternalRequest& aOther)
+  : mMethod(aOther.mMethod)
+  , mURL(aOther.mURL)
+  , mHeaders(new InternalHeaders(*aOther.mHeaders))
+  , mContentPolicyType(aOther.mContentPolicyType)
+  , mReferrer(aOther.mReferrer)
+  , mMode(aOther.mMode)
+  , mCredentialsMode(aOther.mCredentialsMode)
+  , mResponseTainting(aOther.mResponseTainting)
+  , mCacheMode(aOther.mCacheMode)
+  , mAuthenticationFlag(aOther.mAuthenticationFlag)
+  , mForceOriginHeader(aOther.mForceOriginHeader)
+  , mPreserveContentCodings(aOther.mPreserveContentCodings)
+  , mSameOriginDataURL(aOther.mSameOriginDataURL)
+  , mSandboxedStorageAreaURLs(aOther.mSandboxedStorageAreaURLs)
+  , mSkipServiceWorker(aOther.mSkipServiceWorker)
+  , mSynchronous(aOther.mSynchronous)
+  , mUnsafeRequest(aOther.mUnsafeRequest)
+  , mUseURLCredentials(aOther.mUseURLCredentials)
+{
+  // NOTE: does not copy body stream... use the fallible Clone() for that
+}
+
 InternalRequest::~InternalRequest()
 {
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalRequest.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalRequest.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalRequest.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalRequest.h	2015-02-28 15:03:07.000000000 +0000
@@ -67,28 +67,7 @@
   {
   }
 
-  explicit InternalRequest(const InternalRequest& aOther)
-    : mMethod(aOther.mMethod)
-    , mURL(aOther.mURL)
-    , mHeaders(aOther.mHeaders)
-    , mBodyStream(aOther.mBodyStream)
-    , mContentPolicyType(aOther.mContentPolicyType)
-    , mReferrer(aOther.mReferrer)
-    , mMode(aOther.mMode)
-    , mCredentialsMode(aOther.mCredentialsMode)
-    , mResponseTainting(aOther.mResponseTainting)
-    , mCacheMode(aOther.mCacheMode)
-    , mAuthenticationFlag(aOther.mAuthenticationFlag)
-    , mForceOriginHeader(aOther.mForceOriginHeader)
-    , mPreserveContentCodings(aOther.mPreserveContentCodings)
-    , mSameOriginDataURL(aOther.mSameOriginDataURL)
-    , mSandboxedStorageAreaURLs(aOther.mSandboxedStorageAreaURLs)
-    , mSkipServiceWorker(aOther.mSkipServiceWorker)
-    , mSynchronous(aOther.mSynchronous)
-    , mUnsafeRequest(aOther.mUnsafeRequest)
-    , mUseURLCredentials(aOther.mUseURLCredentials)
-  {
-  }
+  already_AddRefed<InternalRequest> Clone();
 
   void
   GetMethod(nsCString& aMethod) const
@@ -293,6 +272,9 @@
   GetRequestConstructorCopy(nsIGlobalObject* aGlobal, ErrorResult& aRv) const;
 
 private:
+  // Does not copy mBodyStream.  Use fallible Clone() for complete copy.
+  explicit InternalRequest(const InternalRequest& aOther);
+
   ~InternalRequest();
 
   nsCString mMethod;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalResponse.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalResponse.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalResponse.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalResponse.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -8,12 +8,14 @@
 #include "nsIDOMFile.h"
 
 #include "mozilla/dom/InternalHeaders.h"
+#include "nsStreamUtils.h"
 
 namespace mozilla {
 namespace dom {
 
 InternalResponse::InternalResponse(uint16_t aStatus, const nsACString& aStatusText)
   : mType(ResponseType::Default)
+  , mFinalURL(false)
   , mStatus(aStatus)
   , mStatusText(aStatusText)
   , mHeaders(new InternalHeaders(HeadersGuardEnum::Response))
@@ -21,18 +23,43 @@
 }
 
 // Headers are not copied since BasicResponse and CORSResponse both need custom
-// header handling.
+// header handling.  Body is not copied as it cannot be shared directly.
 InternalResponse::InternalResponse(const InternalResponse& aOther)
   : mType(aOther.mType)
   , mTerminationReason(aOther.mTerminationReason)
   , mURL(aOther.mURL)
+  , mFinalURL(aOther.mFinalURL)
   , mStatus(aOther.mStatus)
   , mStatusText(aOther.mStatusText)
-  , mBody(aOther.mBody)
   , mContentType(aOther.mContentType)
 {
 }
 
+already_AddRefed<InternalResponse>
+InternalResponse::Clone()
+{
+  nsRefPtr<InternalResponse> clone = new InternalResponse(*this);
+  clone->mHeaders = new InternalHeaders(*mHeaders);
+
+  if (!mBody) {
+    return clone.forget();
+  }
+
+  nsCOMPtr<nsIInputStream> clonedBody;
+  nsCOMPtr<nsIInputStream> replacementBody;
+
+  nsresult rv = NS_CloneInputStream(mBody, getter_AddRefs(clonedBody),
+                                    getter_AddRefs(replacementBody));
+  if (NS_WARN_IF(NS_FAILED(rv))) { return nullptr; }
+
+  clone->mBody.swap(clonedBody);
+  if (replacementBody) {
+    mBody.swap(replacementBody);
+  }
+
+  return clone.forget();
+}
+
 // static
 already_AddRefed<InternalResponse>
 InternalResponse::BasicResponse(InternalResponse* aInner)
@@ -41,6 +68,7 @@
   nsRefPtr<InternalResponse> basic = new InternalResponse(*aInner);
   basic->mType = ResponseType::Basic;
   basic->mHeaders = InternalHeaders::BasicHeaders(aInner->mHeaders);
+  basic->mBody.swap(aInner->mBody);
   return basic.forget();
 }
 
@@ -52,6 +80,7 @@
   nsRefPtr<InternalResponse> cors = new InternalResponse(*aInner);
   cors->mType = ResponseType::Cors;
   cors->mHeaders = InternalHeaders::CORSHeaders(aInner->mHeaders);
+  cors->mBody.swap(aInner->mBody);
   return cors.forget();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalResponse.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalResponse.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/InternalResponse.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/InternalResponse.h	2015-02-28 15:03:07.000000000 +0000
@@ -25,6 +25,8 @@
 
   InternalResponse(uint16_t aStatus, const nsACString& aStatusText);
 
+  already_AddRefed<InternalResponse> Clone();
+
   static already_AddRefed<InternalResponse>
   NetworkError()
   {
@@ -76,6 +78,18 @@
     mURL.Assign(aURL);
   }
 
+  bool
+  FinalURL() const
+  {
+    return mFinalURL;
+  }
+
+  void
+  SetFinalURL(bool aFinalURL)
+  {
+    mFinalURL = aFinalURL;
+  }
+
   uint16_t
   GetStatus() const
   {
@@ -113,13 +127,14 @@
   ~InternalResponse()
   { }
 
-  // Used to create filtered responses.
-  // Does not copy headers.
+  // Used to create filtered and cloned responses.
+  // Does not copy headers or body stream.
   explicit InternalResponse(const InternalResponse& aOther);
 
   ResponseType mType;
   nsCString mTerminationReason;
   nsCString mURL;
+  bool mFinalURL;
   const uint16_t mStatus;
   const nsCString mStatusText;
   nsRefPtr<InternalHeaders> mHeaders;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Request.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Request.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Request.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Request.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -63,7 +63,7 @@
     inputReq->GetBody(getter_AddRefs(body));
     if (body) {
       if (inputReq->BodyUsed()) {
-        aRv.ThrowTypeError(MSG_REQUEST_BODY_CONSUMED_ERROR);
+        aRv.ThrowTypeError(MSG_FETCH_BODY_CONSUMED_ERROR);
         return nullptr;
       } else {
         inputReq->SetBodyUsed();
@@ -255,12 +255,20 @@
 }
 
 already_AddRefed<Request>
-Request::Clone() const
+Request::Clone(ErrorResult& aRv) const
 {
-  // FIXME(nsm): Bug 1073231. This is incorrect, but the clone method isn't
-  // well defined yet.
-  nsRefPtr<Request> request = new Request(mOwner,
-                                          new InternalRequest(*mRequest));
+  if (BodyUsed()) {
+    aRv.ThrowTypeError(MSG_FETCH_BODY_CONSUMED_ERROR);
+    return nullptr;
+  }
+
+  nsRefPtr<InternalRequest> ir = mRequest->Clone();
+  if (!ir) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
+  nsRefPtr<Request> request = new Request(mOwner, ir);
   return request.forget();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Request.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Request.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Request.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Request.h	2015-02-28 15:03:07.000000000 +0000
@@ -115,7 +115,7 @@
   }
 
   already_AddRefed<Request>
-  Clone() const;
+  Clone(ErrorResult& aRv) const;
 
   already_AddRefed<InternalRequest>
   GetInternalRequest();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Response.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Response.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Response.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Response.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -190,19 +190,23 @@
   return r.forget();
 }
 
-// FIXME(nsm): Bug 1073231: This is currently unspecced!
 already_AddRefed<Response>
-Response::Clone()
+Response::Clone(ErrorResult& aRv) const
 {
-  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(mOwner);
-  nsRefPtr<Response> response = new Response(global, mInternalResponse);
+  if (BodyUsed()) {
+    aRv.ThrowTypeError(MSG_FETCH_BODY_CONSUMED_ERROR);
+    return nullptr;
+  }
+
+  nsRefPtr<InternalResponse> ir = mInternalResponse->Clone();
+  nsRefPtr<Response> response = new Response(mOwner, ir);
   return response.forget();
 }
 
 void
 Response::SetBody(nsIInputStream* aBody)
 {
-  // FIXME(nsm): Do we flip bodyUsed here?
+  MOZ_ASSERT(!BodyUsed());
   mInternalResponse->SetBody(aBody);
 }
 
@@ -215,5 +219,18 @@
 
   return mHeaders;
 }
+
+void
+Response::SetFinalURL(bool aFinalURL, ErrorResult& aRv)
+{
+  nsCString url;
+  mInternalResponse->GetUrl(url);
+  if (url.IsEmpty()) {
+    aRv.ThrowTypeError(MSG_RESPONSE_URL_IS_NULL);
+    return;
+  }
+
+  mInternalResponse->SetFinalURL(aFinalURL);
+}
 } // namespace dom
 } // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Response.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Response.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/fetch/Response.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/fetch/Response.h	2015-02-28 15:03:07.000000000 +0000
@@ -56,6 +56,15 @@
     aUrl.AsAString() = NS_ConvertUTF8toUTF16(url);
   }
 
+  bool
+  GetFinalURL(ErrorResult& aRv) const
+  {
+    return mInternalResponse->FinalURL();
+  }
+
+  void
+  SetFinalURL(bool aFinalURL, ErrorResult& aRv);
+
   uint16_t
   Status() const
   {
@@ -103,7 +112,7 @@
   }
 
   already_AddRefed<Response>
-  Clone();
+  Clone(ErrorResult& aRv) const;
 
   void
   SetBody(nsIInputStream* aBody);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/geolocation/nsGeolocationSettings.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/geolocation/nsGeolocationSettings.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/geolocation/nsGeolocationSettings.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/geolocation/nsGeolocationSettings.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -247,35 +247,29 @@
   JS::AutoIdArray ids(cx, JS_Enumerate(cx, obj));
 
   // if we get no ids then the exception list is empty and we can return here.
-  if (!ids)
+  if (!ids) {
       return;
+  }
 
   // go through all of the objects in the exceptions dictionary
   for (size_t i = 0; i < ids.length(); i++) {
     JS::RootedId id(cx);
     id = ids[i];
 
-    JS::RootedValue v(cx);
-    if (!JS_IdToValue(cx, id, &v) || !v.isString())
-      continue;
-
-    JS::RootedString str(cx, v.toString());
-    if (!str)
-      continue;
-
-    // get the origin for the app
-    nsString origin;
-    if (!AssignJSString(cx, origin, str))
-      continue;
-
     // if it is an app that is always precise, skip it
-    if (mAlwaysPreciseApps.Contains(origin))
+    nsAutoJSString origin;
+    if (!origin.init(cx, id)) {
+      continue;
+    }
+    if (mAlwaysPreciseApps.Contains(origin)) {
       continue;
+    }
 
     // get the app setting object
     JS::RootedValue propertyValue(cx);
-    if (!JS_GetPropertyById(cx, obj, id, &propertyValue) || !propertyValue.isObject())
+    if (!JS_GetPropertyById(cx, obj, id, &propertyValue) || !propertyValue.isObject()) {
       continue;
+    }
     JS::RootedObject settingObj(cx, &propertyValue.toObject());
 
     GeolocationSetting *settings = new GeolocationSetting(origin);
@@ -316,10 +310,17 @@
   // clear the list of apps that are always precise
   mAlwaysPreciseApps.Clear();
 
-  AutoJSAPI jsapi;
-  jsapi.Init();
-  JSContext* cx = jsapi.cx();
-  JS::Rooted<JSObject*> obj(cx, &aVal.toObject());
+  // root the object and get the global
+  JS::Rooted<JSObject*> obj(nsContentUtils::RootingCx(), &aVal.toObject());
+  MOZ_ASSERT(obj);
+  nsIGlobalObject* global = xpc::NativeGlobal(obj);
+  NS_ENSURE_TRUE_VOID(global && global->GetGlobalJSObject());
+
+  // the spec requires calling getters when accessing array by index
+  AutoEntryScript aes(global);
+  aes.TakeOwnershipOfErrorReporting();
+  JSContext *cx = aes.cx();
+
   if (!JS_IsArrayObject(cx, obj)) {
     return;
   }
@@ -337,8 +338,8 @@
       continue;
     }
 
-    nsString origin;
-    if (!AssignJSString(cx, origin, value.toString())) {
+    nsAutoJSString origin;
+    if (!origin.init(cx, value)) {
       continue;
     }
 
@@ -351,15 +352,11 @@
 }
 
 
-
 void
 GeolocationSetting::HandleTypeChange(const JS::Value& aVal)
 {
-  AutoJSAPI jsapi;
-  jsapi.Init();
-  JSContext* cx = jsapi.cx();
-  nsString str;
-  if (!aVal.isString() || !AssignJSString(cx, str, aVal.toString())) {
+  nsAutoJSString str;
+  if (!str.init(aVal)) {
     return;
   }
 
@@ -433,28 +430,29 @@
 void
 GeolocationSetting::HandleFixedCoordsChange(const JS::Value& aVal)
 {
-  AutoJSAPI jsapi;
-  jsapi.Init();
-  JSContext* cx = jsapi.cx();
-  nsString str;
-  if (!aVal.isString() || !AssignJSString(cx, str, aVal.toString()) || str.IsEmpty()) {
-    return;
+  nsAutoJSString str;
+  if (!str.init(aVal)) {
+      return;
   }
 
   // parse the string and store the global lat/lon
-  // the @ character is present in the GPS coord strings we receive
+  // the string is in the form of @1.2345,6.7890
+  // check for leading '@' and a comma in the middle
   int32_t const comma = str.Find(",");
   if ( (str.CharAt(0) != '@') || (comma == -1) ) {
     return;
   }
 
+  // pull the lat and lon out of the string and convert to doubles
   nsresult rv;
-  nsString slat(Substring(str, 1, comma));
+  nsString slat(Substring(str, 1, comma - 1));
   nsString slon(Substring(str, comma + 1));
   double lat = slat.ToDouble(&rv);
   NS_ENSURE_SUCCESS(rv,);
   double lon = slon.ToDouble(&rv);
   NS_ENSURE_SUCCESS(rv,);
+
+  // store the values
   mLatitude = lat;
   mLongitude = lon;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAnchorElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAnchorElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAnchorElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAnchorElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -92,7 +92,7 @@
 }
 
 void
-HTMLAnchorElement::GetItemValueText(nsAString& aValue)
+HTMLAnchorElement::GetItemValueText(DOMString& aValue)
 {
   GetHref(aValue);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAnchorElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAnchorElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAnchorElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAnchorElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -105,7 +105,7 @@
   {
     SetHTMLAttr(nsGkAtoms::target, aValue, rv);
   }
-  void GetDownload(nsString& aValue)
+  void GetDownload(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::download, aValue);
   }
@@ -118,7 +118,7 @@
   {
     SetHTMLAttr(nsGkAtoms::ping, aValue, rv);
   }
-  void GetRel(nsString& aValue)
+  void GetRel(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::rel, aValue);
   }
@@ -127,7 +127,7 @@
     SetHTMLAttr(nsGkAtoms::rel, aValue, rv);
   }
   nsDOMTokenList* RelList();
-  void GetHreflang(nsString& aValue)
+  void GetHreflang(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::hreflang, aValue);
   }
@@ -135,7 +135,7 @@
   {
     SetHTMLAttr(nsGkAtoms::hreflang, aValue, rv);
   }
-  void GetType(nsString& aValue)
+  void GetType(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::type, aValue);
   }
@@ -179,7 +179,7 @@
   using Link::SetHash;
 
   // The XPCOM URI decomposition attributes are fine for us
-  void GetCoords(nsString& aValue)
+  void GetCoords(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::coords, aValue);
   }
@@ -187,7 +187,7 @@
   {
     SetHTMLAttr(nsGkAtoms::coords, aValue, rv);
   }
-  void GetCharset(nsString& aValue)
+  void GetCharset(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::charset, aValue);
   }
@@ -195,7 +195,7 @@
   {
     SetHTMLAttr(nsGkAtoms::charset, aValue, rv);
   }
-  void GetName(nsString& aValue)
+  void GetName(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::name, aValue);
   }
@@ -203,7 +203,7 @@
   {
     SetHTMLAttr(nsGkAtoms::name, aValue, rv);
   }
-  void GetRev(nsString& aValue)
+  void GetRev(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::rev, aValue);
   }
@@ -211,7 +211,7 @@
   {
     SetHTMLAttr(nsGkAtoms::rev, aValue, rv);
   }
-  void GetShape(nsString& aValue)
+  void GetShape(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::shape, aValue);
   }
@@ -227,7 +227,7 @@
 protected:
   virtual ~HTMLAnchorElement();
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
   virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
   nsRefPtr<nsDOMTokenList > mRelList;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAreaElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAreaElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAreaElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAreaElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -67,7 +67,7 @@
 }
 
 void
-HTMLAreaElement::GetItemValueText(nsAString& aValue)
+HTMLAreaElement::GetItemValueText(DOMString& aValue)
 {
   GetHref(aValue);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAreaElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAreaElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLAreaElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLAreaElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -117,7 +117,7 @@
     SetHTMLAttr(nsGkAtoms::ping, aPing, aError);
   }
   
-  void GetRel(nsString& aValue)
+  void GetRel(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::rel, aValue);
   }
@@ -180,7 +180,7 @@
 
   virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
   nsRefPtr<nsDOMTokenList > mRelList;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLBodyElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLBodyElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLBodyElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLBodyElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -210,9 +210,9 @@
 NS_IMETHODIMP
 HTMLBodyElement::GetBackground(nsAString& aBackground)
 {
-  nsString background;
+  DOMString background;
   GetBackground(background);
-  aBackground = background;
+  background.ToString(aBackground);
   return NS_OK;
 }
 
@@ -227,9 +227,9 @@
 NS_IMETHODIMP
 HTMLBodyElement::GetVLink(nsAString& aVLink)
 {
-  nsString vLink;
+  DOMString vLink;
   GetVLink(vLink);
-  aVLink = vLink;
+  vLink.ToString(aVLink);
   return NS_OK;
 }
 
@@ -244,9 +244,9 @@
 NS_IMETHODIMP
 HTMLBodyElement::GetALink(nsAString& aALink)
 {
-  nsString aLink;
+  DOMString aLink;
   GetALink(aLink);
-  aALink = aLink;
+  aLink.ToString(aALink);
   return NS_OK;
 }
 
@@ -261,9 +261,9 @@
 NS_IMETHODIMP
 HTMLBodyElement::GetLink(nsAString& aLink)
 {
-  nsString link;
+  DOMString link;
   GetLink(link);
-  aLink = link;
+  link.ToString(aLink);
   return NS_OK;
 }
 
@@ -278,9 +278,9 @@
 NS_IMETHODIMP
 HTMLBodyElement::GetText(nsAString& aText)
 {
-  nsString text;
+  DOMString text;
   GetText(text);
-  aText = text;
+  text.ToString(aText);
   return NS_OK;
 }
 
@@ -295,9 +295,9 @@
 NS_IMETHODIMP
 HTMLBodyElement::GetBgColor(nsAString& aBgColor)
 {
-  nsString bgColor;
+  DOMString bgColor;
   GetBgColor(bgColor);
-  aBgColor = bgColor;
+  bgColor.ToString(aBgColor);
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLBodyElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLBodyElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLBodyElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLBodyElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -68,7 +68,7 @@
 #undef WINDOW_EVENT_HELPER
 #undef EVENT
 
-  void GetText(nsString& aText)
+  void GetText(DOMString& aText)
   {
     GetHTMLAttr(nsGkAtoms::text, aText);
   }
@@ -76,7 +76,7 @@
   {
     SetHTMLAttr(nsGkAtoms::text, aText, aError);
   }
-  void GetLink(nsString& aLink)
+  void GetLink(DOMString& aLink)
   {
     GetHTMLAttr(nsGkAtoms::link, aLink);
   }
@@ -84,7 +84,7 @@
   {
     SetHTMLAttr(nsGkAtoms::link, aLink, aError);
   }
-  void GetVLink(nsString& aVLink)
+  void GetVLink(DOMString& aVLink)
   {
     GetHTMLAttr(nsGkAtoms::vlink, aVLink);
   }
@@ -92,7 +92,7 @@
   {
     SetHTMLAttr(nsGkAtoms::vlink, aVLink, aError);
   }
-  void GetALink(nsString& aALink)
+  void GetALink(DOMString& aALink)
   {
     GetHTMLAttr(nsGkAtoms::alink, aALink);
   }
@@ -100,7 +100,7 @@
   {
     SetHTMLAttr(nsGkAtoms::alink, aALink, aError);
   }
-  void GetBgColor(nsString& aBgColor)
+  void GetBgColor(DOMString& aBgColor)
   {
     GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
   }
@@ -108,7 +108,7 @@
   {
     SetHTMLAttr(nsGkAtoms::bgcolor, aBgColor, aError);
   }
-  void GetBackground(nsString& aBackground)
+  void GetBackground(DOMString& aBackground)
   {
     GetHTMLAttr(nsGkAtoms::background, aBackground);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLDataElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLDataElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLDataElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLDataElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -30,7 +30,7 @@
 }
 
 void
-HTMLDataElement::GetItemValueText(nsAString& text)
+HTMLDataElement::GetItemValueText(DOMString& text)
 {
   GetValue(text);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLDataElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLDataElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLDataElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLDataElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -20,7 +20,7 @@
   explicit HTMLDataElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // HTMLDataElement WebIDL
-  void GetValue(nsAString& aValue)
+  void GetValue(DOMString& aValue)
   {
     GetHTMLAttr(nsGkAtoms::value, aValue);
   }
@@ -30,7 +30,7 @@
     SetHTMLAttr(nsGkAtoms::value, aValue, aError);
   }
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
   virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLDivElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLDivElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLDivElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLDivElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -27,9 +27,9 @@
   // nsIDOMHTMLDivElement
   NS_IMETHOD GetAlign(nsAString& aAlign) MOZ_OVERRIDE
   {
-    nsString align;
+    DOMString align;
     GetAlign(align);
-    aAlign = align;
+    align.ToString(aAlign);
     return NS_OK;
   }
   NS_IMETHOD SetAlign(const nsAString& aAlign) MOZ_OVERRIDE
@@ -39,7 +39,7 @@
     return rv.ErrorCode();
   }
 
-  void GetAlign(nsString& aAlign)
+  void GetAlign(DOMString& aAlign)
   {
     GetHTMLAttr(nsGkAtoms::align, aAlign);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLFontElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLFontElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLFontElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLFontElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -19,7 +19,7 @@
   {
   }
 
-  void GetColor(nsString& aColor)
+  void GetColor(DOMString& aColor)
   {
     GetHTMLAttr(nsGkAtoms::color, aColor);
   }
@@ -27,7 +27,7 @@
   {
     SetHTMLAttr(nsGkAtoms::color, aColor, aError);
   }
-  void GetFace(nsString& aFace)
+  void GetFace(DOMString& aFace)
   {
     GetHTMLAttr(nsGkAtoms::face, aFace);
   }
@@ -35,7 +35,7 @@
   {
     SetHTMLAttr(nsGkAtoms::face, aFace, aError);
   }
-  void GetSize(nsString& aSize)
+  void GetSize(DOMString& aSize)
   {
     GetHTMLAttr(nsGkAtoms::size, aSize);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLFrameSetElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLFrameSetElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLFrameSetElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLFrameSetElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -39,9 +39,9 @@
 NS_IMETHODIMP
 HTMLFrameSetElement::GetCols(nsAString& aCols)
 {
-  nsString cols;
+  DOMString cols;
   GetCols(cols);
-  aCols = cols;
+  cols.ToString(aCols);
   return NS_OK;
 }
 
@@ -56,9 +56,9 @@
 NS_IMETHODIMP
 HTMLFrameSetElement::GetRows(nsAString& aRows)
 {
-  nsString rows;
+  DOMString rows;
   GetRows(rows);
-  aRows = rows;
+  rows.ToString(aRows);
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLFrameSetElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLFrameSetElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLFrameSetElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLFrameSetElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -63,7 +63,7 @@
   // nsIDOMHTMLFrameSetElement
   NS_DECL_NSIDOMHTMLFRAMESETELEMENT
 
-  void GetCols(nsString& aCols)
+  void GetCols(DOMString& aCols)
   {
     GetHTMLAttr(nsGkAtoms::cols, aCols);
   }
@@ -71,7 +71,7 @@
   {
     SetHTMLAttr(nsGkAtoms::cols, aCols, aError);
   }
-  void GetRows(nsString& aRows)
+  void GetRows(DOMString& aRows)
   {
     GetHTMLAttr(nsGkAtoms::rows, aRows);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLIFrameElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLIFrameElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLIFrameElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLIFrameElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -46,7 +46,7 @@
 NS_IMPL_STRING_ATTR(HTMLIFrameElement, Srcdoc, srcdoc)
 
 void
-HTMLIFrameElement::GetItemValueText(nsAString& aValue)
+HTMLIFrameElement::GetItemValueText(DOMString& aValue)
 {
   GetSrc(aValue);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLIFrameElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLIFrameElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLIFrameElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLIFrameElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -177,7 +177,7 @@
 protected:
   virtual ~HTMLIFrameElement();
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
 
   virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLImageElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLImageElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLImageElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLImageElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -181,7 +181,7 @@
 }
 
 void
-HTMLImageElement::GetItemValueText(nsAString& aValue)
+HTMLImageElement::GetItemValueText(DOMString& aValue)
 {
   GetSrc(aValue);
 }
@@ -585,7 +585,7 @@
     UpdateFormOwner();
   }
 
-  bool addedToPicture = aParent && aParent->Tag() == nsGkAtoms::picture &&
+  bool addedToPicture = aParent && aParent->IsHTML(nsGkAtoms::picture) &&
                         HTMLPictureElement::IsPictureEnabled();
   if (addedToPicture) {
     QueueImageLoadTask();
@@ -887,8 +887,8 @@
     return false;
   }
 
-  nsINode *parent = nsINode::GetParentNode();
-  return (parent && parent->Tag() == nsGkAtoms::picture);
+  Element *parent = nsINode::GetParentElement();
+  return (parent && parent->IsHTML(nsGkAtoms::picture));
 }
 
 bool
@@ -1043,10 +1043,10 @@
   nsIContent *currentSource =
     mResponsiveSelector ? mResponsiveSelector->Content() : nullptr;
   bool pictureEnabled = HTMLPictureElement::IsPictureEnabled();
-  nsINode *parent = pictureEnabled ? this->nsINode::GetParentNode() : nullptr;
+  Element *parent = pictureEnabled ? nsINode::GetParentElement() : nullptr;
 
   nsINode *candidateSource = nullptr;
-  if (parent && parent->Tag() == nsGkAtoms::picture) {
+  if (parent && parent->IsHTML(nsGkAtoms::picture)) {
     // Walk source nodes previous to ourselves
     candidateSource = parent->GetFirstChild();
   } else {
@@ -1075,7 +1075,8 @@
         mResponsiveSelector = nullptr;
       }
       break;
-    } else if (candidateSource->Tag() == nsGkAtoms::source &&
+    } else if (candidateSource->IsElement() &&
+               candidateSource->AsElement()->IsHTML(nsGkAtoms::source) &&
                TryCreateResponsiveSelector(candidateSource->AsContent())) {
       // This led to a valid source, stop
       break;
@@ -1108,10 +1109,10 @@
 
   bool pictureEnabled = HTMLPictureElement::IsPictureEnabled();
   // Skip if this is not a <source> with matching media query
-  bool isSourceTag = aSourceNode->Tag() == nsGkAtoms::source;
+  bool isSourceTag = aSourceNode->IsHTML(nsGkAtoms::source);
   if (isSourceTag) {
-    DebugOnly<nsINode *> parent(nsINode::GetParentNode());
-    MOZ_ASSERT(parent && parent->Tag() == nsGkAtoms::picture);
+    DebugOnly<Element *> parent(nsINode::GetParentElement());
+    MOZ_ASSERT(parent && parent->IsHTML(nsGkAtoms::picture));
     MOZ_ASSERT(IsPreviousSibling(aSourceNode, this));
     MOZ_ASSERT(pictureEnabled);
 
@@ -1126,7 +1127,7 @@
         !SupportedPictureSourceType(type)) {
       return false;
     }
-  } else if (aSourceNode->Tag() == nsGkAtoms::img) {
+  } else if (aSourceNode->IsHTML(nsGkAtoms::img)) {
     // Otherwise this is the <img> tag itself
     MOZ_ASSERT(aSourceNode == this);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLImageElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLImageElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLImageElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLImageElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -311,7 +311,7 @@
                                    const nsAString *aSizes = nullptr);
 
   CSSIntPoint GetXY();
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
   virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
   void UpdateFormOwner();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLegendElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLegendElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLegendElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLegendElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -67,7 +67,7 @@
 
   already_AddRefed<HTMLFormElement> GetForm();
 
-  void GetAlign(nsAString& aAlign)
+  void GetAlign(DOMString& aAlign)
   {
     GetHTMLAttr(nsGkAtoms::align, aAlign);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLIElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLIElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLIElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLIElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -38,7 +38,7 @@
   virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const MOZ_OVERRIDE;
 
   // WebIDL API
-  void GetType(nsString& aType)
+  void GetType(DOMString& aType)
   {
     GetHTMLAttr(nsGkAtoms::type, aType);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLinkElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLinkElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLinkElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLinkElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -119,7 +119,7 @@
 NS_IMPL_STRING_ATTR(HTMLLinkElement, Type, type)
 
 void
-HTMLLinkElement::GetItemValueText(nsAString& aValue)
+HTMLLinkElement::GetItemValueText(DOMString& aValue)
 {
   GetHref(aValue);
 }
@@ -275,7 +275,7 @@
     return;
   }
 
-  if (!nsStyleLinkElement::IsImportEnabled(NodePrincipal())) {
+  if (!nsStyleLinkElement::IsImportEnabled()) {
     // For now imports are hidden behind a pref...
     return;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLinkElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLinkElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLLinkElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLLinkElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -161,7 +161,7 @@
   virtual CORSMode GetCORSMode() const MOZ_OVERRIDE;
 protected:
   // nsGenericHTMLElement
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
   nsRefPtr<nsDOMTokenList > mRelList;
 private:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMediaElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMediaElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMediaElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMediaElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -85,6 +85,7 @@
 #include "mozilla/dom/VideoTrackList.h"
 #include "mozilla/dom/TextTrack.h"
 #include "nsIContentPolicy.h"
+#include "mozilla/Telemetry.h"
 
 #include "ImageContainer.h"
 #include "nsRange.h"
@@ -2140,7 +2141,7 @@
 }
 
 void
-HTMLMediaElement::GetItemValueText(nsAString& aValue)
+HTMLMediaElement::GetItemValueText(DOMString& aValue)
 {
   // Can't call GetSrc because we don't have a JSContext
   GetURIAttr(nsGkAtoms::src, nullptr, aValue);
@@ -2548,11 +2549,61 @@
   return rv;
 }
 
+void
+HTMLMediaElement::ReportMSETelemetry()
+{
+  // Report telemetry for videos when a page is unloaded. We
+  // want to know data on what state the video is at when
+  // the user has exited.
+  enum UnloadedState {
+    ENDED = 0,
+    PAUSED = 1,
+    STALLED = 2,
+    SEEKING = 3,
+    OTHER = 4
+  };
+
+  UnloadedState state = OTHER;
+  if (Seeking()) {
+    state = SEEKING;
+  }
+  else if (Ended()) {
+    state = ENDED;
+  }
+  else if (Paused()) {
+    state = PAUSED;
+  }
+  else {
+    // For buffering we check if the current playback position is at the end
+    // of a buffered range, within a margin of error. We also consider to be
+    // buffering if the last frame status was buffering and the ready state is
+    // HAVE_CURRENT_DATA to account for times where we are in a buffering state
+    // regardless of what actual data we have buffered.
+    bool stalled = false;
+    nsRefPtr<TimeRanges> ranges = Buffered();
+    const double errorMargin = 0.05;
+    double t = CurrentTime();
+    TimeRanges::index_type index = ranges->Find(t, errorMargin);
+    ErrorResult ignore;
+    stalled = index != TimeRanges::NoIndex &&
+              (ranges->End(index, ignore) - t) < errorMargin;
+    stalled |= mLastNextFrameStatus == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_BUFFERING &&
+                                       mReadyState == HTMLMediaElement::HAVE_CURRENT_DATA;
+    if (stalled) {
+      state = STALLED;
+    }
+  }
+
+  Telemetry::Accumulate(Telemetry::VIDEO_MSE_UNLOAD_STATE, state);
+  LOG(PR_LOG_DEBUG, ("%p VIDEO_MSE_UNLOAD_STATE = %d", this, state));
+}
+
 void HTMLMediaElement::UnbindFromTree(bool aDeep,
                                       bool aNullParent)
 {
-  if (!mPaused && mNetworkState != nsIDOMHTMLMediaElement::NETWORK_EMPTY)
+  if (!mPaused && mNetworkState != nsIDOMHTMLMediaElement::NETWORK_EMPTY) {
     Pause();
+  }
 
   mElementInTreeState = ELEMENT_NOT_INTREE_HAD_INTREE;
 
@@ -3701,6 +3752,10 @@
   if (aPauseElement != mPausedForInactiveDocumentOrChannel) {
     mPausedForInactiveDocumentOrChannel = aPauseElement;
     if (aPauseElement) {
+      if (mMediaSource) {
+        ReportMSETelemetry();
+      }
+
 #ifdef MOZ_EME
       // For EME content, force destruction of the CDM client (and CDM
       // instance if this is the last client for that CDM instance) and
@@ -3742,11 +3797,21 @@
   }
 }
 
-void HTMLMediaElement::NotifyOwnerDocumentActivityChanged()
+bool HTMLMediaElement::IsBeingDestroyed()
 {
   nsIDocument* ownerDoc = OwnerDoc();
+  nsIDocShell* docShell = ownerDoc ? ownerDoc->GetDocShell() : nullptr;
+  bool isBeingDestroyed = false;
+  if (docShell) {
+    docShell->IsBeingDestroyed(&isBeingDestroyed);
+  }
+  return isBeingDestroyed;
+}
 
-  if (mDecoder) {
+void HTMLMediaElement::NotifyOwnerDocumentActivityChanged()
+{
+  nsIDocument* ownerDoc = OwnerDoc();
+  if (mDecoder && !IsBeingDestroyed()) {
     mDecoder->SetElementVisibility(!ownerDoc->Hidden());
     mDecoder->NotifyOwnerActivityChanged();
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMediaElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMediaElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMediaElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMediaElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -620,6 +620,11 @@
     return FinishDecoderSetup(aDecoder, aStream, nullptr, nullptr);
   }
 
+  // Returns true if the media element is being destroyed. Used in
+  // dormancy checks to prevent dormant processing for an element
+  // that will soon be gone.
+  bool IsBeingDestroyed();
+
 protected:
   virtual ~HTMLMediaElement();
 
@@ -627,7 +632,7 @@
   class MediaStreamTracksAvailableCallback;
   class StreamListener;
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
 
   class WakeLockBoolWrapper {
@@ -963,6 +968,8 @@
     return isPaused;
   }
 
+  void ReportMSETelemetry();
+
   // Check the permissions for audiochannel.
   bool CheckAudioChannelPermissions(const nsAString& aType);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMetaElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMetaElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMetaElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMetaElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -36,7 +36,7 @@
 NS_IMPL_STRING_ATTR(HTMLMetaElement, Scheme, scheme)
 
 void
-HTMLMetaElement::GetItemValueText(nsAString& aValue)
+HTMLMetaElement::GetItemValueText(DOMString& aValue)
 {
   GetContent(aValue);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMetaElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMetaElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLMetaElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLMetaElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -64,7 +64,7 @@
 protected:
   virtual ~HTMLMetaElement();
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLModElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLModElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLModElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLModElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -28,7 +28,7 @@
   {
     SetHTMLAttr(nsGkAtoms::cite, aCite, aRv);
   }
-  void GetDateTime(nsAString& aDateTime)
+  void GetDateTime(DOMString& aDateTime)
   {
     GetHTMLAttr(nsGkAtoms::datetime, aDateTime);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLObjectElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLObjectElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLObjectElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLObjectElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -20,6 +20,10 @@
 #include "nsNPAPIPluginInstance.h"
 #include "nsIWidget.h"
 #include "nsContentUtils.h"
+#ifdef XP_MACOSX
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/dom/Event.h"
+#endif
 
 namespace mozilla {
 namespace dom {
@@ -64,7 +68,7 @@
 
   // If we're already in a document, we need to trigger the load
   // Otherwise, BindToTree takes care of that.
-  if (IsInDoc()) {
+  if (IsInComposedDoc()) {
     StartObjectLoad(aHaveNotified);
   }
 }
@@ -104,6 +108,55 @@
 // nsIConstraintValidation
 NS_IMPL_NSICONSTRAINTVALIDATION(HTMLObjectElement)
 
+#ifdef XP_MACOSX
+
+static nsIWidget* GetWidget(Element* aElement)
+{
+  nsIWidget* retval = NULL;
+  nsIFrame* frame = aElement->GetPrimaryFrame();
+  if (frame) {
+    retval = frame->GetNearestWidget();
+  }
+  return retval;
+}
+
+static void OnFocusBlurPlugin(Element* aElement, bool aFocus)
+{
+  nsIWidget* widget = GetWidget(aElement);
+  if (widget) {
+    bool value = aFocus;
+    widget->SetPluginFocused(value);
+  }
+}
+
+void
+HTMLObjectElement::HandleFocusBlurPlugin(Element* aElement,
+                                         WidgetEvent* aEvent)
+{
+  if (!aEvent->mFlags.mIsTrusted) {
+    return;
+  }
+  switch (aEvent->message) {
+    case NS_FOCUS_CONTENT: {
+      OnFocusBlurPlugin(aElement, true);
+      break;
+    }
+    case NS_BLUR_CONTENT: {
+      OnFocusBlurPlugin(aElement, false);
+      break;
+    }
+  }
+}
+
+NS_IMETHODIMP
+HTMLObjectElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
+{
+  HandleFocusBlurPlugin(this, aVisitor.mEvent);
+  return NS_OK;
+}
+
+#endif // #ifdef XP_MACOSX
+
 NS_IMETHODIMP
 HTMLObjectElement::GetForm(nsIDOMHTMLFormElement **aForm)
 {
@@ -111,7 +164,7 @@
 }
 
 void
-HTMLObjectElement::GetItemValueText(nsAString& aValue)
+HTMLObjectElement::GetItemValueText(DOMString& aValue)
 {
   GetData(aValue);
 }
@@ -178,7 +231,7 @@
   // We also don't want to start loading the object when we're not yet in
   // a document, just in case that the caller wants to set additional
   // attributes before inserting the node into the document.
-  if (aNotify && IsInDoc() && mIsDoneAddingChildren &&
+  if (aNotify && IsInComposedDoc() && mIsDoneAddingChildren &&
       aNameSpaceID == kNameSpaceID_None && aName == nsGkAtoms::data) {
     return LoadObject(aNotify, true);
   }
@@ -195,7 +248,7 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   // See comment in SetAttr
-  if (aNotify && IsInDoc() && mIsDoneAddingChildren &&
+  if (aNotify && IsInComposedDoc() && mIsDoneAddingChildren &&
       aNameSpaceID == kNameSpaceID_None && aAttribute == nsGkAtoms::data) {
     return LoadObject(aNotify, true);
   }
@@ -407,7 +460,7 @@
 {
   // BindToTree can call us asynchronously, and we may be removed from the tree
   // in the interim
-  if (!IsInDoc() || !OwnerDoc()->IsActive()) {
+  if (!IsInComposedDoc() || !OwnerDoc()->IsActive()) {
     return;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLObjectElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLObjectElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLObjectElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLObjectElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -30,6 +30,12 @@
 
   virtual int32_t TabIndexDefault() MOZ_OVERRIDE;
 
+#ifdef XP_MACOSX
+  // nsIDOMEventTarget
+  NS_IMETHOD PostHandleEvent(EventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
+  static void HandleFocusBlurPlugin(Element* aElement, WidgetEvent* aEvent);
+#endif
+
   // Element
   virtual bool IsInteractiveHTMLContent() const MOZ_OVERRIDE;
 
@@ -235,7 +241,7 @@
    */
   bool IsFocusableForTabIndex();
   
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
 
   virtual ~HTMLObjectElement();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSharedListElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSharedListElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSharedListElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSharedListElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -58,7 +58,7 @@
   {
     SetHTMLIntAttr(nsGkAtoms::start, aStart, rv);
   }
-  void GetType(nsString& aType)
+  void GetType(DOMString& aType)
   {
     GetHTMLAttr(nsGkAtoms::type, aType);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSharedObjectElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSharedObjectElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSharedObjectElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSharedObjectElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -17,6 +17,11 @@
 #include "nsIScriptError.h"
 #include "nsIWidget.h"
 #include "nsContentUtils.h"
+#ifdef XP_MACOSX
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/dom/Event.h"
+#include "mozilla/dom/HTMLObjectElement.h"
+#endif
 
 NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(SharedObject)
 
@@ -36,7 +41,7 @@
 }
 
 void
-HTMLSharedObjectElement::GetItemValueText(nsAString& aValue)
+HTMLSharedObjectElement::GetItemValueText(DOMString& aValue)
 {
   if (mNodeInfo->Equals(nsGkAtoms::applet)) {
     nsGenericHTMLElement::GetItemValueText(aValue);
@@ -75,7 +80,7 @@
 
     // If we're already in a document, we need to trigger the load
     // Otherwise, BindToTree takes care of that.
-    if (IsInDoc()) {
+    if (IsInComposedDoc()) {
       StartObjectLoad(aHaveNotified);
     }
   }
@@ -108,6 +113,17 @@
 
 NS_IMPL_ELEMENT_CLONE(HTMLSharedObjectElement)
 
+#ifdef XP_MACOSX
+
+NS_IMETHODIMP
+HTMLSharedObjectElement::PostHandleEvent(EventChainPostVisitor& aVisitor)
+{
+  HTMLObjectElement::HandleFocusBlurPlugin(this, aVisitor.mEvent);
+  return NS_OK;
+}
+
+#endif // #ifdef XP_MACOSX
+
 nsresult
 HTMLSharedObjectElement::BindToTree(nsIDocument *aDocument,
                                     nsIContent *aParent,
@@ -164,7 +180,7 @@
   // We also don't want to start loading the object when we're not yet in
   // a document, just in case that the caller wants to set additional
   // attributes before inserting the node into the document.
-  if (aNotify && IsInDoc() && mIsDoneAddingChildren &&
+  if (aNotify && IsInComposedDoc() && mIsDoneAddingChildren &&
       aNameSpaceID == kNameSpaceID_None && aName == URIAttrName()) {
     return LoadObject(aNotify, true);
   }
@@ -297,7 +313,7 @@
 {
   // BindToTree can call us asynchronously, and we may be removed from the tree
   // in the interim
-  if (!IsInDoc() || !OwnerDoc()->IsActive()) {
+  if (!IsInComposedDoc() || !OwnerDoc()->IsActive()) {
     return;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSharedObjectElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSharedObjectElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSharedObjectElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSharedObjectElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -32,6 +32,11 @@
 
   virtual int32_t TabIndexDefault() MOZ_OVERRIDE;
 
+#ifdef XP_MACOSX
+  // nsIDOMEventTarget
+  NS_IMETHOD PostHandleEvent(EventChainPostVisitor& aVisitor) MOZ_OVERRIDE;
+#endif
+
   // nsIDOMHTMLAppletElement
   NS_DECL_NSIDOMHTMLAPPLETELEMENT
 
@@ -206,7 +211,7 @@
   // always true for <embed>, per the documentation in nsIContent.h.
   bool mIsDoneAddingChildren;
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
 
   virtual JSObject* WrapNode(JSContext *aCx) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSourceElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSourceElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSourceElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSourceElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -121,7 +121,7 @@
 }
 
 void
-HTMLSourceElement::GetItemValueText(nsAString& aValue)
+HTMLSourceElement::GetItemValueText(DOMString& aValue)
 {
   GetSrc(aValue);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSourceElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSourceElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLSourceElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLSourceElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -60,7 +60,7 @@
     SetHTMLAttr(nsGkAtoms::src, aSrc, rv);
   }
 
-  void GetType(nsString& aType)
+  void GetType(DOMString& aType)
   {
     GetHTMLAttr(nsGkAtoms::type, aType);
   }
@@ -69,7 +69,7 @@
     SetHTMLAttr(nsGkAtoms::type, aType, rv);
   }
 
-  void GetSrcset(nsString& aSrcset)
+  void GetSrcset(DOMString& aSrcset)
   {
     GetHTMLAttr(nsGkAtoms::srcset, aSrcset);
   }
@@ -78,7 +78,7 @@
     SetHTMLAttr(nsGkAtoms::srcset, aSrcset, rv);
   }
 
-  void GetSizes(nsString& aSizes)
+  void GetSizes(DOMString& aSizes)
   {
     GetHTMLAttr(nsGkAtoms::sizes, aSizes);
   }
@@ -87,7 +87,7 @@
     SetHTMLAttr(nsGkAtoms::sizes, aSizes, rv);
   }
 
-  void GetMedia(nsString& aMedia)
+  void GetMedia(DOMString& aMedia)
   {
     GetHTMLAttr(nsGkAtoms::media, aMedia);
   }
@@ -102,7 +102,7 @@
   virtual JSObject* WrapNode(JSContext* aCx) MOZ_OVERRIDE;
 
 protected:
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
 
   virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsIAtom* aName,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableCaptionElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableCaptionElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableCaptionElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableCaptionElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -28,7 +28,7 @@
   // nsIDOMHTMLTableCaptionElement
   NS_DECL_NSIDOMHTMLTABLECAPTIONELEMENT
 
-  void GetAlign(nsString& aAlign)
+  void GetAlign(DOMString& aAlign)
   {
     GetHTMLAttr(nsGkAtoms::align, aAlign);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableCellElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableCellElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableCellElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableCellElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -127,9 +127,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetAbbr(nsAString& aAbbr)
 {
-  nsString abbr;
+  DOMString abbr;
   GetAbbr(abbr);
-  aAbbr = abbr;
+  abbr.ToString(aAbbr);
   return NS_OK;
 }
 
@@ -144,9 +144,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetAxis(nsAString& aAxis)
 {
-  nsString axis;
+  DOMString axis;
   GetAxis(axis);
-  aAxis = axis;
+  axis.ToString(aAxis);
   return NS_OK;
 }
 
@@ -161,9 +161,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetAlign(nsAString& aAlign)
 {
-  nsString align;
+  DOMString align;
   GetAlign(align);
-  aAlign = align;
+  align.ToString(aAlign);
   return NS_OK;
 }
 
@@ -178,9 +178,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetVAlign(nsAString& aVAlign)
 {
-  nsString vAlign;
+  DOMString vAlign;
   GetVAlign(vAlign);
-  aVAlign = vAlign;
+  vAlign.ToString(aVAlign);
   return NS_OK;
 }
 
@@ -195,9 +195,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetCh(nsAString& aCh)
 {
-  nsString ch;
+  DOMString ch;
   GetCh(ch);
-  aCh = ch;
+  ch.ToString(aCh);
   return NS_OK;
 }
 
@@ -212,9 +212,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetChOff(nsAString& aChOff)
 {
-  nsString chOff;
+  DOMString chOff;
   GetChOff(chOff);
-  aChOff = chOff;
+  chOff.ToString(aChOff);
   return NS_OK;
 }
 
@@ -229,9 +229,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetBgColor(nsAString& aBgColor)
 {
-  nsString bgColor;
+  DOMString bgColor;
   GetBgColor(bgColor);
-  aBgColor = bgColor;
+  bgColor.ToString(aBgColor);
   return NS_OK;
 }
 
@@ -246,9 +246,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetHeight(nsAString& aHeight)
 {
-  nsString height;
+  DOMString height;
   GetHeight(height);
-  aHeight = height;
+  height.ToString(aHeight);
   return NS_OK;
 }
 
@@ -263,9 +263,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetWidth(nsAString& aWidth)
 {
-  nsString width;
+  DOMString width;
   GetWidth(width);
-  aWidth = width;
+  width.ToString(aWidth);
   return NS_OK;
 }
 
@@ -295,9 +295,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetScope(nsAString& aScope)
 {
-  nsString scope;
+  DOMString scope;
   GetScope(scope);
-  aScope = scope;
+  scope.ToString(aScope);
   return NS_OK;
 }
 
@@ -312,9 +312,9 @@
 NS_IMETHODIMP
 HTMLTableCellElement::GetHeaders(nsAString& aHeaders)
 {
-  nsString headers;
+  DOMString headers;
   GetHeaders(headers);
-  aHeaders = headers;
+  headers.ToString(aHeaders);
   return NS_OK;
 }
 
@@ -349,7 +349,7 @@
 }
 
 void
-HTMLTableCellElement::GetAlign(nsString& aValue)
+HTMLTableCellElement::GetAlign(DOMString& aValue)
 {
   if (!GetAttr(kNameSpaceID_None, nsGkAtoms::align, aValue)) {
     // There's no align attribute, ask the row for the alignment.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableCellElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableCellElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableCellElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableCellElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -49,7 +49,7 @@
     SetHTMLIntAttr(nsGkAtoms::rowspan, aRowSpan, aError);
   }
   //already_AddRefed<nsDOMSettableTokenList> Headers() const;
-  void GetHeaders(nsString& aHeaders)
+  void GetHeaders(DOMString& aHeaders)
   {
     GetHTMLAttr(nsGkAtoms::headers, aHeaders);
   }
@@ -59,7 +59,7 @@
   }
   int32_t CellIndex() const;
 
-  void GetAbbr(nsString& aAbbr)
+  void GetAbbr(DOMString& aAbbr)
   {
     GetHTMLAttr(nsGkAtoms::abbr, aAbbr);
   }
@@ -67,7 +67,7 @@
   {
     SetHTMLAttr(nsGkAtoms::abbr, aAbbr, aError);
   }
-  void GetScope(nsString& aScope)
+  void GetScope(DOMString& aScope)
   {
     GetHTMLAttr(nsGkAtoms::scope, aScope);
   }
@@ -75,12 +75,12 @@
   {
     SetHTMLAttr(nsGkAtoms::scope, aScope, aError);
   }
-  void GetAlign(nsString& aAlign);
+  void GetAlign(DOMString& aAlign);
   void SetAlign(const nsAString& aAlign, ErrorResult& aError)
   {
     SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
   }
-  void GetAxis(nsString& aAxis)
+  void GetAxis(DOMString& aAxis)
   {
     GetHTMLAttr(nsGkAtoms::axis, aAxis);
   }
@@ -88,7 +88,7 @@
   {
     SetHTMLAttr(nsGkAtoms::axis, aAxis, aError);
   }
-  void GetHeight(nsString& aHeight)
+  void GetHeight(DOMString& aHeight)
   {
     GetHTMLAttr(nsGkAtoms::height, aHeight);
   }
@@ -96,7 +96,7 @@
   {
     SetHTMLAttr(nsGkAtoms::height, aHeight, aError);
   }
-  void GetWidth(nsString& aWidth)
+  void GetWidth(DOMString& aWidth)
   {
     GetHTMLAttr(nsGkAtoms::width, aWidth);
   }
@@ -104,7 +104,7 @@
   {
     SetHTMLAttr(nsGkAtoms::width, aWidth, aError);
   }
-  void GetCh(nsString& aCh)
+  void GetCh(DOMString& aCh)
   {
     GetHTMLAttr(nsGkAtoms::_char, aCh);
   }
@@ -112,7 +112,7 @@
   {
     SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
   }
-  void GetChOff(nsString& aChOff)
+  void GetChOff(DOMString& aChOff)
   {
     GetHTMLAttr(nsGkAtoms::charoff, aChOff);
   }
@@ -128,7 +128,7 @@
   {
     SetHTMLBoolAttr(nsGkAtoms::nowrap, aNoWrap, aError);
   }
-  void GetVAlign(nsString& aVAlign)
+  void GetVAlign(DOMString& aVAlign)
   {
     GetHTMLAttr(nsGkAtoms::valign, aVAlign);
   }
@@ -136,7 +136,7 @@
   {
     SetHTMLAttr(nsGkAtoms::valign, aVAlign, aError);
   }
-  void GetBgColor(nsString& aBgColor)
+  void GetBgColor(DOMString& aBgColor)
   {
     GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableColElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableColElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableColElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableColElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -29,7 +29,7 @@
     SetHTMLIntAttr(nsGkAtoms::span, aSpan, aError);
   }
 
-  void GetAlign(nsString& aAlign)
+  void GetAlign(DOMString& aAlign)
   {
     GetHTMLAttr(nsGkAtoms::align, aAlign);
   }
@@ -37,7 +37,7 @@
   {
     SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
   }
-  void GetCh(nsString& aCh)
+  void GetCh(DOMString& aCh)
   {
     GetHTMLAttr(nsGkAtoms::_char, aCh);
   }
@@ -45,7 +45,7 @@
   {
     SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
   }
-  void GetChOff(nsString& aChOff)
+  void GetChOff(DOMString& aChOff)
   {
     GetHTMLAttr(nsGkAtoms::charoff, aChOff);
   }
@@ -53,7 +53,7 @@
   {
     SetHTMLAttr(nsGkAtoms::charoff, aChOff, aError);
   }
-  void GetVAlign(nsString& aVAlign)
+  void GetVAlign(DOMString& aVAlign)
   {
     GetHTMLAttr(nsGkAtoms::valign, aVAlign);
   }
@@ -61,7 +61,7 @@
   {
     SetHTMLAttr(nsGkAtoms::valign, aVAlign, aError);
   }
-  void GetWidth(nsString& aWidth)
+  void GetWidth(DOMString& aWidth)
   {
     GetHTMLAttr(nsGkAtoms::width, aWidth);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -96,7 +96,7 @@
                                                    ErrorResult& aError);
   void DeleteRow(int32_t aIndex, ErrorResult& aError);
 
-  void GetAlign(nsString& aAlign)
+  void GetAlign(DOMString& aAlign)
   {
     GetHTMLAttr(nsGkAtoms::align, aAlign);
   }
@@ -104,7 +104,7 @@
   {
     SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
   }
-  void GetBorder(nsString& aBorder)
+  void GetBorder(DOMString& aBorder)
   {
     GetHTMLAttr(nsGkAtoms::border, aBorder);
   }
@@ -112,7 +112,7 @@
   {
     SetHTMLAttr(nsGkAtoms::border, aBorder, aError);
   }
-  void GetFrame(nsString& aFrame)
+  void GetFrame(DOMString& aFrame)
   {
     GetHTMLAttr(nsGkAtoms::frame, aFrame);
   }
@@ -120,7 +120,7 @@
   {
     SetHTMLAttr(nsGkAtoms::frame, aFrame, aError);
   }
-  void GetRules(nsString& aRules)
+  void GetRules(DOMString& aRules)
   {
     GetHTMLAttr(nsGkAtoms::rules, aRules);
   }
@@ -132,11 +132,15 @@
   {
     GetHTMLAttr(nsGkAtoms::summary, aSummary);
   }
+  void GetSummary(DOMString& aSummary)
+  {
+    GetHTMLAttr(nsGkAtoms::summary, aSummary);
+  }
   void SetSummary(const nsAString& aSummary, ErrorResult& aError)
   {
     SetHTMLAttr(nsGkAtoms::summary, aSummary, aError);
   }
-  void GetWidth(nsString& aWidth)
+  void GetWidth(DOMString& aWidth)
   {
     GetHTMLAttr(nsGkAtoms::width, aWidth);
   }
@@ -144,7 +148,7 @@
   {
     SetHTMLAttr(nsGkAtoms::width, aWidth, aError);
   }
-  void GetBgColor(nsString& aBgColor)
+  void GetBgColor(DOMString& aBgColor)
   {
     GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
   }
@@ -152,7 +156,7 @@
   {
     SetHTMLAttr(nsGkAtoms::bgcolor, aBgColor, aError);
   }
-  void GetCellPadding(nsString& aCellPadding)
+  void GetCellPadding(DOMString& aCellPadding)
   {
     GetHTMLAttr(nsGkAtoms::cellpadding, aCellPadding);
   }
@@ -160,7 +164,7 @@
   {
     SetHTMLAttr(nsGkAtoms::cellpadding, aCellPadding, aError);
   }
-  void GetCellSpacing(nsString& aCellSpacing)
+  void GetCellSpacing(DOMString& aCellSpacing)
   {
     GetHTMLAttr(nsGkAtoms::cellspacing, aCellSpacing);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableRowElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableRowElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableRowElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableRowElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -37,7 +37,7 @@
     InsertCell(int32_t aIndex, ErrorResult& aError);
   void DeleteCell(int32_t aValue, ErrorResult& aError);
 
-  void GetAlign(nsString& aAlign)
+  void GetAlign(DOMString& aAlign)
   {
     GetHTMLAttr(nsGkAtoms::align, aAlign);
   }
@@ -45,7 +45,7 @@
   {
     SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
   }
-  void GetCh(nsString& aCh)
+  void GetCh(DOMString& aCh)
   {
     GetHTMLAttr(nsGkAtoms::_char, aCh);
   }
@@ -53,7 +53,7 @@
   {
     SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
   }
-  void GetChOff(nsString& aChOff)
+  void GetChOff(DOMString& aChOff)
   {
     GetHTMLAttr(nsGkAtoms::charoff, aChOff);
   }
@@ -61,7 +61,7 @@
   {
     SetHTMLAttr(nsGkAtoms::charoff, aChOff, aError);
   }
-  void GetVAlign(nsString& aVAlign)
+  void GetVAlign(DOMString& aVAlign)
   {
     GetHTMLAttr(nsGkAtoms::valign, aVAlign);
   }
@@ -69,7 +69,7 @@
   {
     SetHTMLAttr(nsGkAtoms::valign, aVAlign, aError);
   }
-  void GetBgColor(nsString& aBgColor)
+  void GetBgColor(DOMString& aBgColor)
   {
     GetHTMLAttr(nsGkAtoms::bgcolor, aBgColor);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableSectionElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableSectionElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTableSectionElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTableSectionElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -29,7 +29,7 @@
     InsertRow(int32_t aIndex, ErrorResult& aError);
   void DeleteRow(int32_t aValue, ErrorResult& aError);
 
-  void GetAlign(nsString& aAlign)
+  void GetAlign(DOMString& aAlign)
   {
     GetHTMLAttr(nsGkAtoms::align, aAlign);
   }
@@ -37,7 +37,7 @@
   {
     SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
   }
-  void GetCh(nsString& aCh)
+  void GetCh(DOMString& aCh)
   {
     GetHTMLAttr(nsGkAtoms::_char, aCh);
   }
@@ -45,7 +45,7 @@
   {
     SetHTMLAttr(nsGkAtoms::_char, aCh, aError);
   }
-  void GetChOff(nsString& aChOff)
+  void GetChOff(DOMString& aChOff)
   {
     GetHTMLAttr(nsGkAtoms::charoff, aChOff);
   }
@@ -53,7 +53,7 @@
   {
     SetHTMLAttr(nsGkAtoms::charoff, aChOff, aError);
   }
-  void GetVAlign(nsString& aVAlign)
+  void GetVAlign(DOMString& aVAlign)
   {
     GetHTMLAttr(nsGkAtoms::valign, aVAlign);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTimeElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTimeElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTimeElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTimeElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -32,7 +32,7 @@
 }
 
 void
-HTMLTimeElement::GetItemValueText(nsAString& text)
+HTMLTimeElement::GetItemValueText(DOMString& text)
 {
   if (HasAttr(kNameSpaceID_None, nsGkAtoms::datetime)) {
     GetDateTime(text);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTimeElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTimeElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTimeElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTimeElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -21,7 +21,7 @@
   virtual ~HTMLTimeElement();
 
   // HTMLTimeElement WebIDL
-  void GetDateTime(nsAString& aDateTime)
+  void GetDateTime(DOMString& aDateTime)
   {
     GetHTMLAttr(nsGkAtoms::datetime, aDateTime);
   }
@@ -31,7 +31,7 @@
     SetHTMLAttr(nsGkAtoms::datetime, aDateTime, aError);
   }
 
-  virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
+  virtual void GetItemValueText(DOMString& text) MOZ_OVERRIDE;
   virtual void SetItemValueText(const nsAString& text) MOZ_OVERRIDE;
   virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTrackElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTrackElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/HTMLTrackElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/HTMLTrackElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -93,11 +93,9 @@
   virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const MOZ_OVERRIDE;
 
   // For Track, ItemValue reflects the src attribute
-  virtual void GetItemValueText(nsAString& aText) MOZ_OVERRIDE
+  virtual void GetItemValueText(DOMString& aText) MOZ_OVERRIDE
   {
-    DOMString value;
-    GetSrc(value);
-    value.ToString(aText);
+    GetSrc(aText);
   }
   virtual void SetItemValueText(const nsAString& aText) MOZ_OVERRIDE
   {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsFormSubmission.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsFormSubmission.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsFormSubmission.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsFormSubmission.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -38,6 +38,7 @@
 #include "nsContentUtils.h"
 
 #include "mozilla/dom/EncodingUtils.h"
+#include "mozilla/dom/File.h"
 
 using namespace mozilla;
 using mozilla::dom::EncodingUtils;
@@ -78,7 +79,7 @@
   virtual nsresult AddNameValuePair(const nsAString& aName,
                                     const nsAString& aValue);
   virtual nsresult AddNameFilePair(const nsAString& aName,
-                                   nsIDOMBlob* aBlob,
+                                   File* aBlob,
                                    const nsString& aFilename);
   virtual nsresult GetEncodedSubmission(nsIURI* aURI,
                                         nsIInputStream** aPostDataStream);
@@ -165,7 +166,7 @@
 
 nsresult
 nsFSURLEncoded::AddNameFilePair(const nsAString& aName,
-                                nsIDOMBlob* aBlob,
+                                File* aBlob,
                                 const nsString& aFilename)
 {
   if (!mWarnedFileControl) {
@@ -174,9 +175,8 @@
   }
 
   nsAutoString filename;
-  nsCOMPtr<nsIDOMFile> file = do_QueryInterface(aBlob);
-  if (file) {
-    file->GetName(filename);
+  if (aBlob && aBlob->IsFile()) {
+    aBlob->GetName(filename);
   }
 
   return AddNameValuePair(aName, filename);
@@ -441,7 +441,7 @@
 
 nsresult
 nsFSMultipartFormData::AddNameFilePair(const nsAString& aName,
-                                       nsIDOMBlob* aBlob,
+                                       File* aBlob,
                                        const nsString& aFilename)
 {
   // Encode the control name
@@ -459,9 +459,8 @@
     } else {
       // Get and encode the filename
       nsAutoString filename16;
-      nsCOMPtr<nsIDOMFile> file = do_QueryInterface(aBlob);
-      if (file) {
-        rv = file->GetName(filename16);
+      if (aBlob->IsFile()) {
+        rv = aBlob->GetName(filename16);
         NS_ENSURE_SUCCESS(rv, rv);
       }
 
@@ -469,7 +468,7 @@
         filename16.AssignLiteral("blob");
       } else {
         nsAutoString filepath16;
-        rv = file->GetPath(filepath16);
+        rv = aBlob->GetPath(filepath16);
         NS_ENSURE_SUCCESS(rv, rv);
         if (!filepath16.IsEmpty()) {
           // File.path includes trailing "/"
@@ -598,7 +597,7 @@
   virtual nsresult AddNameValuePair(const nsAString& aName,
                                     const nsAString& aValue);
   virtual nsresult AddNameFilePair(const nsAString& aName,
-                                   nsIDOMBlob* aBlob,
+                                   File* aBlob,
                                    const nsString& aFilename);
   virtual nsresult GetEncodedSubmission(nsIURI* aURI,
                                         nsIInputStream** aPostDataStream);
@@ -622,13 +621,12 @@
 
 nsresult
 nsFSTextPlain::AddNameFilePair(const nsAString& aName,
-                               nsIDOMBlob* aBlob,
+                               File* aBlob,
                                const nsString& aFilename)
 {
   nsAutoString filename;
-  nsCOMPtr<nsIDOMFile> file = do_QueryInterface(aBlob);
-  if (file) {
-    file->GetName(filename);
+  if (aBlob && aBlob->IsFile()) {
+    aBlob->GetName(filename);
   }
 
   AddNameValuePair(aName, filename);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsFormSubmission.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsFormSubmission.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsFormSubmission.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsFormSubmission.h	2015-02-28 15:03:07.000000000 +0000
@@ -20,7 +20,12 @@
 class nsIRequest;
 class nsISaveAsCharset;
 class nsIMultiplexInputStream;
-class nsIDOMBlob;
+
+namespace mozilla {
+namespace dom {
+class File;
+} // namespace dom
+} // namespace mozilla
 
 /**
  * Class for form submissions; encompasses the function to call to submit as
@@ -51,9 +56,9 @@
    * @param aFilename the filename to be used (not void)
    */
   virtual nsresult AddNameFilePair(const nsAString& aName,
-                                   nsIDOMBlob* aBlob,
+                                   mozilla::dom::File* aBlob,
                                    const nsString& aFilename) = 0;
-  
+
   /**
    * Reports whether the instance supports AddIsindex().
    *
@@ -161,7 +166,7 @@
   virtual nsresult AddNameValuePair(const nsAString& aName,
                                     const nsAString& aValue) MOZ_OVERRIDE;
   virtual nsresult AddNameFilePair(const nsAString& aName,
-                                   nsIDOMBlob* aBlob,
+                                   mozilla::dom::File* aBlob,
                                    const nsString& aFilename) MOZ_OVERRIDE;
   virtual nsresult GetEncodedSubmission(nsIURI* aURI,
                                         nsIInputStream** aPostDataStream) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsGenericHTMLElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsGenericHTMLElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsGenericHTMLElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsGenericHTMLElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -3034,7 +3034,7 @@
     return;
   }
 
-  nsString string;
+  DOMString string;
   GetItemValueText(string);
   if (!xpc::NonVoidStringToJsval(aCx, string, aRetval)) {
     aError.Throw(NS_ERROR_FAILURE);
@@ -3055,9 +3055,11 @@
   if (ItemScope()) {
     out->SetAsISupports(static_cast<nsIContent*>(this));
   } else {
-    nsAutoString string;
+    DOMString string;
     GetItemValueText(string);
-    out->SetAsAString(string);
+    nsString xpcomString;
+    string.ToString(xpcomString);
+    out->SetAsAString(xpcomString);
   }
 
   out.forget(aValue);
@@ -3098,7 +3100,7 @@
 }
 
 void
-nsGenericHTMLElement::GetItemValueText(nsAString& text)
+nsGenericHTMLElement::GetItemValueText(DOMString& text)
 {
   ErrorResult rv;
   GetTextContentInternal(text, rv);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsGenericHTMLElement.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsGenericHTMLElement.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsGenericHTMLElement.h	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsGenericHTMLElement.h	2015-02-28 15:03:07.000000000 +0000
@@ -68,7 +68,7 @@
   // From Element
   nsresult CopyInnerTo(mozilla::dom::Element* aDest);
 
-  void GetTitle(nsString& aTitle)
+  void GetTitle(mozilla::dom::DOMString& aTitle)
   {
     GetHTMLAttr(nsGkAtoms::title, aTitle);
   }
@@ -77,7 +77,7 @@
     SetHTMLAttr(nsGkAtoms::title, aTitle);
     return NS_OK;
   }
-  void GetLang(nsString& aLang)
+  void GetLang(mozilla::dom::DOMString& aLang)
   {
     GetHTMLAttr(nsGkAtoms::lang, aLang);
   }
@@ -86,7 +86,7 @@
     SetHTMLAttr(nsGkAtoms::lang, aLang);
     return NS_OK;
   }
-  void GetDir(nsString& aDir)
+  void GetDir(mozilla::dom::DOMString& aDir)
   {
     GetHTMLEnumAttr(nsGkAtoms::dir, aDir);
   }
@@ -296,7 +296,7 @@
 
   // These methods are used to implement element-specific behavior of Get/SetItemValue
   // when an element has @itemprop but no @itemscope.
-  virtual void GetItemValueText(nsAString& text);
+  virtual void GetItemValueText(mozilla::dom::DOMString& text);
   virtual void SetItemValueText(const nsAString& text);
 public:
   virtual already_AddRefed<mozilla::dom::UndoManager> GetUndoManager() MOZ_OVERRIDE;
@@ -318,21 +318,21 @@
   NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
 
   NS_IMETHOD GetTitle(nsAString& aTitle) MOZ_FINAL MOZ_OVERRIDE {
-    nsString title;
+    mozilla::dom::DOMString title;
     GetTitle(title);
-    aTitle.Assign(title);
+    title.ToString(aTitle);
     return NS_OK;
   }
   NS_IMETHOD GetLang(nsAString& aLang) MOZ_FINAL MOZ_OVERRIDE {
-    nsString lang;
+    mozilla::dom::DOMString lang;
     GetLang(lang);
-    aLang.Assign(lang);
+    lang.ToString(aLang);
     return NS_OK;
   }
   NS_IMETHOD GetDir(nsAString& aDir) MOZ_FINAL MOZ_OVERRIDE {
-    nsString dir;
+    mozilla::dom::DOMString dir;
     GetDir(dir);
-    aDir.Assign(dir);
+    dir.ToString(aDir);
     return NS_OK;
   }
   NS_IMETHOD SetDir(const nsAString& aDir) MOZ_FINAL MOZ_OVERRIDE {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsGenericHTMLFrameElement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsGenericHTMLFrameElement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsGenericHTMLFrameElement.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsGenericHTMLFrameElement.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -131,7 +131,7 @@
 void
 nsGenericHTMLFrameElement::EnsureFrameLoader()
 {
-  if (!IsInDoc() || mFrameLoader || mFrameLoaderCreationDisallowed) {
+  if (!IsInComposedDoc() || mFrameLoader || mFrameLoaderCreationDisallowed) {
     // If frame loader is there, we just keep it around, cached
     return;
   }
@@ -221,7 +221,7 @@
                                                  aCompileEventHandlers);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (aDocument) {
+  if (IsInComposedDoc()) {
     NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
                  "Missing a script blocker!");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsHTMLDNSPrefetch.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsHTMLDNSPrefetch.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/nsHTMLDNSPrefetch.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/nsHTMLDNSPrefetch.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -311,21 +311,29 @@
       // Only prefetch here if request was deferred and deferral not cancelled
       if (link && link->HasDeferredDNSPrefetchRequest()) {
         nsCOMPtr<nsIURI> hrefURI(link ? link->GetURI() : nullptr);
-        if (hrefURI)
+        bool isLocalResource = false;
+        nsresult rv;
+
+        hostName.Truncate();
+        if (hrefURI) {
           hrefURI->GetAsciiHost(hostName);
+          rv = NS_URIChainHasFlags(hrefURI,
+                                   nsIProtocolHandler::URI_IS_LOCAL_RESOURCE,
+                                   &isLocalResource);
+        }
 
-        if (!hostName.IsEmpty()) {
+        if (!hostName.IsEmpty() && NS_SUCCEEDED(rv) && !isLocalResource) {
           if (IsNeckoChild()) {
             gNeckoChild->SendHTMLDNSPrefetch(NS_ConvertUTF8toUTF16(hostName),
                                            mEntries[mTail].mFlags);
           } else {
             nsCOMPtr<nsICancelable> tmpOutstanding;
 
-            nsresult rv = sDNSService->AsyncResolve(hostName, 
-                                    mEntries[mTail].mFlags
-                                    | nsIDNSService::RESOLVE_SPECULATE,
-                                    sDNSListener, nullptr,
-                                    getter_AddRefs(tmpOutstanding));
+            rv = sDNSService->AsyncResolve(hostName,
+                                           mEntries[mTail].mFlags
+                                           | nsIDNSService::RESOLVE_SPECULATE,
+                                           sDNSListener, nullptr,
+                                           getter_AddRefs(tmpOutstanding));
             // Tell link that deferred prefetch was requested
             if (NS_SUCCEEDED(rv))
               link->OnDNSPrefetchRequested();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/file_fullscreen-api.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/file_fullscreen-api.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/file_fullscreen-api.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/file_fullscreen-api.html	2015-02-28 15:03:07.000000000 +0000
@@ -50,10 +50,6 @@
   synthesizeMouseAtCenter(element, {});
 }
 
-function setRequireTrustedContext(value) {
-  opener.SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", value);
-}
-
 function fullScreenElement() {
   return document.getElementById('full-screen-element');
 }
@@ -213,10 +209,10 @@
 
 function exit4(event) {
   ok(!document.mozFullScreen, "38. Should be back in non-full-screen mode (fifth time)");
-  setRequireTrustedContext(true);
-
-  addFullscreenErrorContinuation(error2);
-  fullScreenElement().mozRequestFullScreen();
+  SpecialPowers.pushPrefEnv({"set":[["full-screen-api.allow-trusted-requests-only", true]]}, function() {
+    addFullscreenErrorContinuation(error2);
+    fullScreenElement().mozRequestFullScreen();
+  });
 }
 
 function error2(event) {
@@ -237,22 +233,22 @@
 
 function exit5(event) {
   ok(!document.mozFullScreen, "Should have left full-screen mode (last time).");
-  setRequireTrustedContext(false);
-
-  SpecialPowers.setBoolPref("full-screen-api.enabled", false);
-  is(document.mozFullScreenEnabled, false, "document.mozFullScreenEnabled should be false if full-screen-api.enabled is false");
-
-  addFullscreenErrorContinuation(error3);
-  fullScreenElement().mozRequestFullScreen();
+  SpecialPowers.pushPrefEnv({
+    "set":[["full-screen-api.allow-trusted-requests-only", false],
+           ["full-screen-api.enabled", false]]}, function() {
+              is(document.mozFullScreenEnabled, false, "document.mozFullScreenEnabled should be false if full-screen-api.enabled is false");
+              addFullscreenErrorContinuation(error3);
+              fullScreenElement().mozRequestFullScreen();
+  });
 }
 
 function error3(event) {
   ok(!document.mozFullScreen, "Should still be in normal mode, because pref is not enabled.");
 
-  SpecialPowers.setBoolPref("full-screen-api.enabled", true);
-  is(document.mozFullScreenEnabled, true, "document.mozFullScreenEnabled should be true if full-screen-api.enabled is true");
-
-  opener.nextTest();
+  SpecialPowers.pushPrefEnv({"set":[["full-screen-api.enabled", true]]}, function() {
+    is(document.mozFullScreenEnabled, true, "document.mozFullScreenEnabled should be true if full-screen-api.enabled is true");
+    opener.nextTest();
+  });
 }
 
 function begin() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/file_fullscreen-denied.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/file_fullscreen-denied.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/file_fullscreen-denied.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/file_fullscreen-denied.html	2015-02-28 15:03:07.000000000 +0000
@@ -42,16 +42,18 @@
 
   // Request full-screen from a non trusted context (this script isn't a user
   // generated event!).
-  SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", true);
-  addFullscreenErrorContinuation(
-    function() {
-      ok(!document.mozFullScreen, "Should not grant request in non-trusted context");
-      // Test requesting full-screen mode in a long-running user-generated event handler.
-      // The request in the key handler should not be granted.
-      window.addEventListener("keypress", keyHandler, false);
-      synthesizeKey("VK_A", {});
-    });
-  document.body.mozRequestFullScreen();
+  SpecialPowers.pushPrefEnv({"set":[["full-screen-api.allow-trusted-requests-only", true]]}, startTest);
+  function startTest() {
+    addFullscreenErrorContinuation(
+      function() {
+        ok(!document.mozFullScreen, "Should not grant request in non-trusted context");
+        // Test requesting full-screen mode in a long-running user-generated event handler.
+        // The request in the key handler should not be granted.
+        window.addEventListener("keypress", keyHandler, false);
+        synthesizeKey("VK_A", {});
+      });
+    document.body.mozRequestFullScreen();
+ }
 }
 
 function keyHandler(event) {
@@ -69,14 +71,14 @@
 
       // Disable the requirement for trusted contexts only, so the tests are easier
       // to write.
-      SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false);
-
-      // Create an iframe without a allowfullscreen attribute, whose contents requests
-      // full-screen. The request should be denied, and we should not receive a fullscreenchange
-      // event in this document.
-      var iframe = document.createElement("iframe");
-      iframe.src = "file_fullscreen-denied-inner.html";
-      document.body.appendChild(iframe);
+      SpecialPowers.pushPrefEnv({"set":[["full-screen-api.allow-trusted-requests-only", false]]}, function() {
+        // Create an iframe without a allowfullscreen attribute, whose contents requests
+        // full-screen. The request should be denied, and we should not receive a fullscreenchange
+        // event in this document.
+        var iframe = document.createElement("iframe");
+        iframe.src = "file_fullscreen-denied-inner.html";
+        document.body.appendChild(iframe);
+      });
     });
   document.body.mozRequestFullScreen();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/file_fullscreen-esc-context-menu.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/file_fullscreen-esc-context-menu.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/file_fullscreen-esc-context-menu.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/file_fullscreen-esc-context-menu.html	2015-02-28 15:03:07.000000000 +0000
@@ -56,12 +56,12 @@
   ok(contextMenu, "Got context menu XUL");
 
   addFullscreenChangeContinuation("enter", fullscreenEntered);
-  SpecialPowers.setBoolPref("full-screen-api.approval-required", false);
-  document.body.mozRequestFullScreen();
+  SpecialPowers.pushPrefEnv({"set":[["full-screen-api.approval-required", false]]}, function() {
+    document.body.mozRequestFullScreen();
+  });
 }
 
 function finish() {
-  SpecialPowers.clearUserPref("full-screen-api.approval-required");
   opener.nextTest();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_formnovalidate_attribute.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_formnovalidate_attribute.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_formnovalidate_attribute.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_formnovalidate_attribute.html	2015-02-28 15:03:07.000000000 +0000
@@ -72,7 +72,8 @@
     ok(true, "formnovalidate should not apply on if not set on the submit " +
              "control used for the submission");
     var c = document.getElementById('c');
-    c.focus(); synthesizeKey("VK_RETURN", {type: "keypress"});
+    c.focus();
+    synthesizeKey("KEY_Enter", { code: "Enter" });
   }, false);
 
   document.getElementById('c').addEventListener("invalid", function(aEvent) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_event.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_event.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_event.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_event.html	2015-02-28 15:03:07.000000000 +0000
@@ -189,15 +189,11 @@
     if (isDesktop) { // up/down arrow keys not supported on android/b2g
       number.value = "";
       number.focus();
-      synthesizeKey("VK_UP", {});
+      synthesizeKey("KEY_ArrowUp", { code: "ArrowUp" });
       is(numberInput, 1, "input event should be dispatched for up/down arrow key keypress");
       is(number.value, 1, "sanity check value of number control after keypress");
 
-      synthesizeKey("VK_DOWN", { type: "keydown" });
-      synthesizeKey("VK_DOWN", { type: "keypress" });
-      synthesizeKey("VK_DOWN", { type: "keypress" });
-      synthesizeKey("VK_DOWN", { type: "keypress" });
-      synthesizeKey("VK_DOWN", { type: "keyup" });
+      synthesizeKey("KEY_ArrowDown", { code: "ArrowDown", repeat: 3 });
       is(numberInput, 4, "input event should be dispatched for each up/down arrow key keypress event, even when rapidly repeated");
       is(number.value, -2, "sanity check value of number control after multiple keydown events");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_number_key_events.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_number_key_events.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_number_key_events.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_number_key_events.html	2015-02-28 15:03:07.000000000 +0000
@@ -25,15 +25,13 @@
  * key events while it is in various states.
  **/
 SimpleTest.waitForExplicitFinish();
-
 // Turn off Spatial Navigation because it hijacks arrow keydown events:
-SpecialPowers.setBoolPref("snav.enabled", false);
-
 SimpleTest.waitForFocus(function() {
-  test();
-  SimpleTest.finish();
+  SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, function() {
+    test();
+    SimpleTest.finish();
+  });
 });
-
 const defaultMinimum = "NaN";
 const defaultMaximum = "NaN";
 const defaultStep = 1;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_radio_radiogroup.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_radio_radiogroup.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_radio_radiogroup.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_radio_radiogroup.html	2015-02-28 15:03:07.000000000 +0000
@@ -41,28 +41,33 @@
 </form>
 <script class="testbody" type="text/javascript">
 /** Test for Bug 343444 **/
-document.getElementById("start").focus();
-var count=0;
-while (count < 2) {
-  sendKey("DOWN");
-  is(document.activeElement.type, "radio", "radioGroup should ignore non-radio input fields");
-  if (document.activeElement.id == "start") {
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, startTest);
+function startTest() {
+  document.getElementById("start").focus();
+  var count=0;
+  while (count < 2) {
+    sendKey("DOWN");
+    is(document.activeElement.type, "radio", "radioGroup should ignore non-radio input fields");
+    if (document.activeElement.id == "start") {
+      count++;
+    }
+  }
+
+  document.getElementById("start2").focus();
+  count = 0;
+  while (count < 3) {
+    is(document.activeElement.name, "testtwo",
+       "radioGroup should only contain elements with the same @name")
+    sendKey("DOWN");
     count++;
   }
-}
 
-document.getElementById("start2").focus();
-count = 0;
-while (count < 3) {
-  is(document.activeElement.name, "testtwo",
-     "radioGroup should only contain elements with the same @name")
+  document.getElementById("start3").focus();
   sendKey("DOWN");
-  count++;
+  is(document.activeElement.name, "testthree", "we don't have an infinite-loop");
+  SimpleTest.finish();
 }
-
-document.getElementById("start3").focus();
-sendKey("DOWN");
-is(document.activeElement.name, "testthree", "we don't have an infinite-loop");
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_range_key_events.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_range_key_events.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_range_key_events.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_range_key_events.html	2015-02-28 15:03:07.000000000 +0000
@@ -26,11 +26,11 @@
 SimpleTest.waitForExplicitFinish();
 
 // Turn off Spatial Navigation because it hijacks arrow keydown events:
-SpecialPowers.setBoolPref("snav.enabled", false);
-
 SimpleTest.waitForFocus(function() {
-  test();
-  SimpleTest.finish();
+  SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, function() {
+    test();
+    SimpleTest.finish();
+  });
 });
 
 const defaultMinimum = 0;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_range_rounding.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_range_rounding.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_input_range_rounding.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_input_range_rounding.html	2015-02-28 15:03:07.000000000 +0000
@@ -26,13 +26,12 @@
  * ugly rounding errors.
  **/
 SimpleTest.waitForExplicitFinish();
-
-// Turn off spatial navigation because it hijacks arrow keydown events:
-SpecialPowers.setBoolPref("snav.enabled", false);
-
+// Turn off Spatial Navigation because it hijacks arrow keydown events:
 SimpleTest.waitForFocus(function() {
-  test();
-  SimpleTest.finish();
+  SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, function() {
+    test();
+    SimpleTest.finish();
+  });
 });
 
 /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_novalidate_attribute.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_novalidate_attribute.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_novalidate_attribute.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_novalidate_attribute.html	2015-02-28 15:03:07.000000000 +0000
@@ -48,7 +48,8 @@
   aEvent.target.removeEventListener("submit", arguments.callee, false);
   ok(true, "novalidate has been correctly used for second form");
   var c = document.getElementById('c');
-  c.focus(); synthesizeKey("VK_RETURN", {type: "keypress"});
+  c.focus();
+  synthesizeKey("KEY_Enter", { code: "Enter" });
 }, false);
 
 document.forms[2].addEventListener("submit", function(aEvent) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_radio_in_label.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_radio_in_label.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_radio_in_label.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_radio_in_label.html	2015-02-28 15:03:07.000000000 +0000
@@ -23,28 +23,31 @@
 <script class="testbody" type="text/javascript">
 
 /** Test for Bug 229925 **/
+SimpleTest.waitForExplicitFinish();
 var r1 = document.getElementById("r1");
 var r2 = document.getElementById("r2");
 var s1 = document.getElementById("s1");
+SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, startTest);
+function startTest() {
+  r1.click();
+  ok(r1.checked,
+     "The first radio input element should be checked by clicking the element");
+  r2.click();
+  ok(r2.checked,
+     "The second radio input element should be checked by clicking the element");
+  s1.click();
+  ok(r1.checked,
+     "The first radio input element should be checked by clicking other element");
 
-r1.click();
-ok(r1.checked,
-   "The first radio input element should be checked by clicking the element");
-r2.click();
-ok(r2.checked,
-   "The second radio input element should be checked by clicking the element");
-s1.click();
-ok(r1.checked,
-   "The first radio input element should be checked by clicking other element");
-
-r1.focus();
-synthesizeKey("VK_LEFT", {});
-ok(r2.checked,
-   "The second radio input element should be checked by key");
-synthesizeKey("VK_LEFT", {});
-ok(r1.checked,
-   "The first radio input element should be checked by key");
-
+  r1.focus();
+  synthesizeKey("VK_LEFT", {});
+  ok(r2.checked,
+     "The second radio input element should be checked by key");
+  synthesizeKey("VK_LEFT", {});
+  ok(r1.checked,
+     "The first radio input element should be checked by key");
+  SimpleTest.finish();
+}
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_valueAsDate_pref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_valueAsDate_pref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/forms/test_valueAsDate_pref.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/forms/test_valueAsDate_pref.html	2015-02-28 15:03:07.000000000 +0000
@@ -20,16 +20,17 @@
     var state = states.shift();
 
     if (state == 'end') {
-      SpecialPowers.setBoolPref("dom.experimental_forms", pref);
       SimpleTest.finish();
       return;
     }
 
-    SpecialPowers.setBoolPref("dom.experimental_forms", state === 'true');
-    iframe.src = 'data:text/html,<script>' +
+    SpecialPowers.pushPrefEnv({"set":[["dom.experimental_forms", state === 'true']]}, 
+      function() {
+        iframe.src = 'data:text/html,<script>' +
                  'parent.is("valueAsDate" in document.createElement("input"), ' +
                  state + ', "valueAsDate presence state should be ' + state + '");' +
                  '<\/script>'
+     });
   }
 
   </script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug369370.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug369370.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug369370.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug369370.html	2015-02-28 15:03:07.000000000 +0000
@@ -89,17 +89,18 @@
         is(kidDoc.body.scrollTop,   0, "Checking scrollTop");
 
         kidWin.close();
-        SpecialPowers.clearUserPref("browser.enable_automatic_image_resizing");
         SimpleTest.finish();
     }
+    var kidWin;
+    var kidDoc;
 
     SimpleTest.waitForExplicitFinish();
-    SpecialPowers.setBoolPref("browser.enable_automatic_image_resizing", true);
-
-    var kidWin = window.open("bug369370-popup.png", "bug369370", "width=400,height=300");
-    var kidDoc; // will init onload
-    ok(kidWin, "opened child window");
-    kidWin.onload = childLoaded;
+    SpecialPowers.pushPrefEnv({"set":[["browser.enable_automatic_image_resizing", true]]}, function() {
+       kidWin = window.open("bug369370-popup.png", "bug369370", "width=400,height=300");
+       // will init onload
+       ok(kidWin, "opened child window");
+       kidWin.onload = childLoaded;
+    });
   </script>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug561636.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug561636.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug561636.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug561636.html	2015-02-28 15:03:07.000000000 +0000
@@ -107,7 +107,8 @@
   document.getElementById('a').click();
   document.getElementById('b').click();
   var c = document.getElementById('c');
-  c.focus(); synthesizeKey("VK_RETURN", {type: "keypress"});
+  c.focus();
+  synthesizeKey("KEY_Enter", { code: "Enter" });
   document.getElementById('s2').click();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug633058.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug633058.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug633058.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug633058.html	2015-02-28 15:03:07.000000000 +0000
@@ -23,9 +23,10 @@
 SimpleTest.waitForExplicitFinish();
 
 // Turn off Spatial Navigation so that the 'keypress' event fires.
-SpecialPowers.setBoolPref('snav.enabled', false);
-
 SimpleTest.waitForFocus(function() {
+  SpecialPowers.pushPrefEnv({"set":[['snav.enabled', false]]}, startTest);
+});
+function startTest() {
   var nbExpectedKeyPress = 8;
   var inputGotKeyPress = 0;
   var divGotKeyPress = 0;
@@ -60,8 +61,7 @@
     synthesizeKey('VK_RETURN', {});
   }, false);
   input.focus();
-});
-
+}
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug674558.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug674558.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_bug674558.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_bug674558.html	2015-02-28 15:03:07.000000000 +0000
@@ -22,9 +22,10 @@
 
 // Turn off spatial navigation because it hijacks VK_RIGHT and VK_LEFT keydown
 // events.
-SpecialPowers.setBoolPref("snav.enabled", false);
-
 SimpleTest.waitForFocus(function() {
+  SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, startTest);
+});
+function startTest() {
   function textAreaCtor() {
     return document.createElement("textarea");
   }
@@ -42,7 +43,7 @@
   }
 
   SimpleTest.finish();
-});
+}
 
 function test(ctor) {
   var elem = ctor();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_formData.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_formData.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_formData.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_formData.html	2015-02-28 15:03:07.000000000 +0000
@@ -14,7 +14,90 @@
 <script type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
-function runTest() {
+function testHas() {
+  var f = new FormData();
+  f.append("foo", "bar");
+  f.append("another", "value");
+  ok(f.has("foo"), "has() on existing name should be true.");
+  ok(f.has("another"), "has() on existing name should be true.");
+  ok(!f.has("nonexistent"), "has() on non-existent name should be false.");
+}
+
+function testGet() {
+  var f = new FormData();
+  f.append("foo", "bar");
+  f.append("foo", "bar2");
+  f.append("blob", new Blob(["hey"], { type: 'text/plain' }));
+  f.append("file", new File(["hey"], 'testname',  {type: 'text/plain'}));
+
+  is(f.get("foo"), "bar", "get() on existing name should return first value");
+  ok(f.get("blob") instanceof Blob, "get() on existing name should return first value");
+  is(f.get("blob").type, 'text/plain', "get() on existing name should return first value");
+  ok(f.get("file") instanceof File, "get() on existing name should return first value");
+  is(f.get("file").name, 'testname', "get() on existing name should return first value");
+
+  is(f.get("nonexistent"), null, "get() on non-existent name should return null.");
+}
+
+function testGetAll() {
+  var f = new FormData();
+  f.append("other", "value");
+  f.append("foo", "bar");
+  f.append("foo", "bar2");
+  f.append("foo", new Blob(["hey"], { type: 'text/plain' }));
+
+  var arr = f.getAll("foo");
+  is(arr.length, 3, "getAll() should retrieve all matching entries.");
+  is(arr[0], "bar", "values should match and be in order");
+  is(arr[1], "bar2", "values should match and be in order");
+  ok(arr[2] instanceof Blob, "values should match and be in order");
+
+  is(f.get("nonexistent"), null, "get() on non-existent name should return null.");
+}
+
+function testDelete() {
+  var f = new FormData();
+  f.append("other", "value");
+  f.append("foo", "bar");
+  f.append("foo", "bar2");
+  f.append("foo", new Blob(["hey"], { type: 'text/plain' }));
+
+  ok(f.has("foo"), "has() on existing name should be true.");
+  f.delete("foo");
+  ok(!f.has("foo"), "has() on deleted name should be false.");
+  is(f.getAll("foo").length, 0, "all entries should be deleted.");
+
+  is(f.getAll("other").length, 1, "other names should still be there.");
+  f.delete("other");
+  is(f.getAll("other").length, 0, "all entries should be deleted.");
+}
+
+function testSet() {
+  var f = new FormData();
+
+  f.set("other", "value");
+  ok(f.has("other"), "set() on new name should be similar to append()");
+  is(f.getAll("other").length, 1, "set() on new name should be similar to append()");
+
+  f.append("other", "value2");
+  is(f.getAll("other").length, 2, "append() should not replace existing entries.");
+
+  f.append("foo", "bar");
+  f.append("other", "value3");
+  f.append("other", "value3");
+  f.append("other", "value3");
+  is(f.getAll("other").length, 5, "append() should not replace existing entries.");
+
+  f.set("other", "value4");
+  is(f.getAll("other").length, 1, "set() should replace existing entries.");
+  is(f.getAll("other")[0], "value4", "set() should replace existing entries.");
+}
+
+function testIterate() {
+  todo(false, "Implement this in Bug 1085284.");
+}
+
+function testSend() {
     var xhr = new XMLHttpRequest();
     xhr.open("POST", "form_submit_server.sjs");
     xhr.onload = function () {
@@ -62,6 +145,17 @@
     xhr.send(fd);
 }
 
+function runTest() {
+  testHas();
+  testGet();
+  testGetAll();
+  testDelete();
+  testSet();
+  testIterate();
+  // Finally, send an XHR and verify the response matches.
+  testSend();
+}
+
 runTest()
 </script>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_fullscreen-api.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_fullscreen-api.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/html/test/test_fullscreen-api.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/html/test/test_fullscreen-api.html	2015-02-28 15:03:07.000000000 +0000
@@ -22,14 +22,6 @@
 <script type="application/javascript">
 
 /** Tests for Bug 545812 **/
-
-// Ensure the full-screen api is enabled, and will be disabled on test exit.
-SpecialPowers.setBoolPref("full-screen-api.enabled", true);
-
-// Disable the requirement for trusted contexts only, so the tests are easier
-// to write.
-SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false);
-
 SimpleTest.requestFlakyTimeout("untriaged");
 
 // Run the tests which go full-screen in new windows, as mochitests normally
@@ -94,8 +86,6 @@
     }, false);
     gTestIndex++;
   } else {
-    SpecialPowers.clearUserPref("full-screen-api.enabled");
-    SpecialPowers.clearUserPref("full-screen-api.allow-trusted-requests-only");
     SimpleTest.finish();
   }
 }
@@ -108,11 +98,16 @@
   } catch (e) {
   }
   is(window.fullScreen, false, "Shouldn't be able to set window fullscreen from content");
-
-  addLoadEvent(nextTest);
+  // Ensure the full-screen api is enabled, and will be disabled on test exit.
+  // Disable the requirement for trusted contexts only, so the tests are easier
+  // to write
+  addLoadEvent(function() {
+    SpecialPowers.pushPrefEnv({
+      "set":[["full-screen-api.enabled", true],
+             ["full-screen-api.allow-trusted-requests-only", false]]}, nextTest);
+  });
   SimpleTest.waitForExplicitFinish();
 }
-
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/imptests/failures/html/js/builtins/test_WeakMap.prototype-properties.html.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/imptests/failures/html/js/builtins/test_WeakMap.prototype-properties.html.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/imptests/failures/html/js/builtins/test_WeakMap.prototype-properties.html.json	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/imptests/failures/html/js/builtins/test_WeakMap.prototype-properties.html.json	2015-02-28 15:03:07.000000000 +0000
@@ -2,7 +2,6 @@
   "WeakMap.prototype.clear.length": true,
   "WeakMap.prototype.delete.length": true,
   "WeakMap.prototype.get.length": true,
-  "WeakMap.prototype.get: return undefined": true,
   "WeakMap.prototype.has.length": true,
   "WeakMap.prototype.set.length": true
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/imptests/testharness.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/imptests/testharness.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/imptests/testharness.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/imptests/testharness.js	2015-02-28 15:03:07.000000000 +0000
@@ -836,6 +836,24 @@
     }
     expose(assert_greater_than, "assert_greater_than");
 
+    function assert_between_exclusive(actual, lower, upper, description)
+    {
+        /*
+         * Test if a primitive number is between two others
+         */
+        assert(typeof actual === "number",
+               "assert_between_exclusive", description,
+               "expected a number but got a ${type_actual}",
+               {type_actual:typeof actual});
+
+        assert(actual > lower && actual < upper,
+               "assert_between_exclusive", description,
+               "expected a number greater than ${lower} " +
+               "and less than ${upper} but got ${actual}",
+               {lower:lower, upper:upper, actual:actual});
+    }
+    expose(assert_between_exclusive, "assert_between_exclusive");
+
     function assert_less_than_equal(actual, expected, description)
     {
         /*
@@ -870,6 +888,24 @@
     }
     expose(assert_greater_than_equal, "assert_greater_than_equal");
 
+    function assert_between_inclusive(actual, lower, upper, description)
+    {
+        /*
+         * Test if a primitive number is between to two others or equal to either of them
+         */
+        assert(typeof actual === "number",
+               "assert_between_inclusive", description,
+               "expected a number but got a ${type_actual}",
+               {type_actual:typeof actual});
+
+        assert(actual >= lower && actual <= upper,
+               "assert_between_inclusive", description,
+               "expected a number greater than or equal to ${lower} " +
+               "and less than or equal to ${upper} but got ${actual}",
+               {lower:lower, upper:upper, actual:actual});
+    }
+    expose(assert_between_inclusive, "assert_between_inclusive");
+
     function assert_regexp_match(actual, expected, description) {
         /*
          * Test if a string (actual) matches a regexp (expected)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/indexedDB/IDBObjectStore.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/indexedDB/IDBObjectStore.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/indexedDB/IDBObjectStore.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/indexedDB/IDBObjectStore.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -223,7 +223,7 @@
 
   if (JS_GetClass(aObj) == IDBObjectStore::DummyPropClass()) {
     MOZ_ASSERT(!cloneWriteInfo->mOffsetToKeyProp);
-    cloneWriteInfo->mOffsetToKeyProp = js_GetSCOffset(aWriter);
+    cloneWriteInfo->mOffsetToKeyProp = js::GetSCOffset(aWriter);
 
     uint64_t value = 0;
     // Omit endian swap
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/inputmethod/forms.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/inputmethod/forms.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/inputmethod/forms.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/inputmethod/forms.js	2015-02-28 15:03:07.000000000 +0000
@@ -1307,7 +1307,7 @@
     if (!this._isStarted) {
       return;
     }
-    this._textInputProcessor.commitComposition(text ? text : "");
+    this._textInputProcessor.commitCompositionWith(text ? text : "");
     this._isStarted = false;
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsIDOMWindowUtils.idl	2015-02-28 15:03:07.000000000 +0000
@@ -50,7 +50,7 @@
 interface nsIJSRAIIHelper;
 interface nsIContentPermissionRequest;
 
-[scriptable, uuid(c8b21a1e-a69c-11e4-801f-0f8dde75d4c2)]
+[scriptable, uuid(6eaf87a1-b252-4c4e-a2fc-318120680335)]
 interface nsIDOMWindowUtils : nsISupports {
 
   /**
@@ -261,10 +261,12 @@
   const long MODIFIER_ALTGRAPH   = 0x0010;
   const long MODIFIER_CAPSLOCK   = 0x0020;
   const long MODIFIER_FN         = 0x0040;
-  const long MODIFIER_NUMLOCK    = 0x0080;
-  const long MODIFIER_SCROLLLOCK = 0x0100;
-  const long MODIFIER_SYMBOLLOCK = 0x0200;
-  const long MODIFIER_OS         = 0x0400;
+  const long MODIFIER_FNLOCK     = 0x0080;
+  const long MODIFIER_NUMLOCK    = 0x0100;
+  const long MODIFIER_SCROLLLOCK = 0x0200;
+  const long MODIFIER_SYMBOL     = 0x0400;
+  const long MODIFIER_SYMBOLLOCK = 0x0800;
+  const long MODIFIER_OS         = 0x1000;
 
   /** Synthesize a mouse event. The event types supported are:
    *    mousedown, mouseup, mousemove, mouseover, mouseout, contextmenu,
@@ -1246,14 +1248,6 @@
                                            in AString aPropertyName);
 
   /**
-   * Returns the parent of obj.
-   *
-   * @param obj The JavaScript object whose parent is to be gotten.
-   * @return the parent.
-   */
-  [implicit_jscontext] jsval getParent(in jsval obj);
-
-  /**
    * Get the id of the outer window of this window.  This will never throw.
    */
   readonly attribute unsigned long long outerWindowID;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsIServiceWorkerManager.idl	2015-02-28 15:03:07.000000000 +0000
@@ -6,6 +6,7 @@
 #include "domstubs.idl"
 
 interface nsIDocument;
+interface nsIInterceptedChannel;
 interface nsIPrincipal;
 interface nsIURI;
 
@@ -18,7 +19,7 @@
   [noscript] void UnregisterFailed();
 };
 
-[builtinclass, uuid(861b55e9-d6ac-47cf-a528-8590e9b44de6)]
+[builtinclass, uuid(464882c8-81c0-4620-b9c4-44c12085b65b)]
 interface nsIServiceWorkerManager : nsISupports
 {
   /**
@@ -51,6 +52,15 @@
   // Remove ready pending Promise
   void removeReadyPromise(in nsIDOMWindow aWindow);
 
+  // Returns true if a ServiceWorker is available for the scope of aURI.
+  bool isAvailableForURI(in nsIURI aURI);
+
+  // Returns true if a given document is currently controlled by a ServiceWorker
+  bool isControlled(in nsIDocument aDocument);
+
+  // Cause a fetch event to be dispatched to the worker global associated with the given document.
+  void dispatchFetchEvent(in nsIDocument aDoc, in nsIInterceptedChannel aChannel);
+
   // aTarget MUST be a ServiceWorkerRegistration.
   [noscript] void AddRegistrationEventListener(in DOMString aScope, in nsIDOMEventTarget aTarget);
   [noscript] void RemoveRegistrationEventListener(in DOMString aScope, in nsIDOMEventTarget aTarget);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsITabParent.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsITabParent.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsITabParent.idl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsITabParent.idl	2015-02-28 15:03:07.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "domstubs.idl"
 
-[scriptable, uuid(30361a5b-a3b8-4dbc-b464-e08761abb123)]
+[scriptable, uuid(b19038ba-0d75-40d2-be35-742e26d33bf9)]
 interface nsITabParent : nsISupports
 {
   void injectTouchEvent(in AString aType,
@@ -19,6 +19,8 @@
                         in uint32_t count,
                         in long aModifiers);
 
+  void getChildProcessOffset(out int32_t aCssX, out int32_t aCssY);
+
   readonly attribute boolean useAsyncPanZoom;
 
   void setIsDocShellActive(in bool aIsActive);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsITextInputProcessor.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsITextInputProcessor.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/interfaces/base/nsITextInputProcessor.idl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/interfaces/base/nsITextInputProcessor.idl	2015-02-28 15:03:07.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "nsISupports.idl"
 
+interface nsIDOMKeyEvent;
 interface nsIDOMWindow;
 interface nsITextInputProcessorCallback;
 
@@ -27,6 +28,10 @@
  *   if (!TIP.beginInputTransaction(window, callback)) {
  *     return; // You failed to get the rights to make composition
  *   }
+ *   // Create a keyboard event if the following compositionc change is caused
+ *   // by a key event.
+ *   var keyEvent =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   // Set new composition string first
  *   TIP.setPendingCompositionString("some-words-are-inputted");
  *   // Set clause information.
@@ -34,13 +39,17 @@
  *   // Set caret position, this is optional.
  *   TIP.setCaretInPendingComposition(23);
  *   // Flush the pending composition
- *   if (!TIP.flushPendingComposition()) {
+ *   if (!TIP.flushPendingComposition(keyEvent)) {
  *     // If it returns false, it fails to start composition.
  *     return;
  *   }
  *
  * Example #2 JS-IME can separate composition string to two or more clauses:
  *
+ *   // Create a keyboard event if the following compositionc change is caused
+ *   // by a key event.
+ *   var keyEvent =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   // First, set composition string again
  *   TIP.setPendingCompositionString("some-words-are-inputted");
  *   // Then, if "are" is selected to convert, there are 3 clauses:
@@ -51,64 +60,210 @@
  *   TIP.setCaretInPendingComposition(11);
  *   // Flush the pending composition.  Note that if there is a composition,
  *   // flushPendingComposition() won't return false.
- *   TIP.flushPendingComposition();
+ *   TIP.flushPendingComposition(keyEvent);
  *
  * Example #3 JS-IME can commit composition with specific string with this:
  *
+ *   // Create a keyboard event if the following compositionc change is caused
+ *   // by a key event.
+ *   var keyEvent1 =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   // First, there is a composition.
  *   TIP.setPendingCompositionString("some-words-directly-inputted");
  *   TIP.appendClauseToPendingComposition(28, TIP.ATTR_RAW_CLAUSE);
- *   TIP.flushPendingComposition();
+ *   TIP.flushPendingComposition(keyEvent1);
+ *   // Create a keyboard event if the following commit composition is caused
+ *   // by a key event.
+ *   var keyEvent2 =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   // This is useful when user selects a commit string from candidate list UI
  *   // which is provided by JS-IME.
- *   TIP.commitComposition("selected-words-from-candidate-list");
+ *   TIP.commitCompositionWith("selected-words-from-candidate-list", keyEvent2);
  *
  * Example #4 JS-IME can commit composition with the last composition string
  *            without specifying commit string:
  *
+ *   // Create a keyboard event if the following compositionc change is caused
+ *   // by a key event.
+ *   var keyEvent1 =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   // First, there is a composition.
  *   TIP.setPendingCompositionString("some-words-will-be-commited");
  *   TIP.appendClauseToPendingComposition(27, TIP.ATTR_RAW_CLAUSE);
- *   TIP.flushPendingComposition();
+ *   TIP.flushPendingComposition(keyEvent1);
+ *   // Create a keyboard event if the following commit is caused by a key
+ *   // event.
+ *   var keyEvent2 =
+ *     new KeyboardEvent("", { key: "Enter", code: "Enter",
+                               keyCode: KeyboardEvent.DOM_VK_RETURN });
  *   // This is useful when user just type Enter key.
- *   TIP.commitComposition();
+ *   TIP.commitComposition(keyEvent2);
  *
  * Example #5 JS-IME can cancel composition with this:
  *
+ *   // Create a keyboard event if the following composition change is caused
+ *   // by a key event.
+ *   var keyEvent1 =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   // First, there is a composition.
  *   TIP.setPendingCompositionString("some-words-will-be-canceled");
  *   TIP.appendClauseToPendingComposition(27, TIP.ATTR_RAW_CLAUSE);
- *   TIP.flushPendingComposition();
+ *   TIP.flushPendingComposition(keyEvent1);
+ *   // Create a keyboard event if the following canceling composition is
+ *   // caused by a key event.
+ *   var keyEvent2 =
+ *     new KeyboardEvent("", { key: "Escape", code: "Escape",
+                               keyCode: KeyboardEvent.DOM_VK_ESCAPE });
  *   // This is useful when user doesn't want to commit the composition.
- *   // FYI: This is same as TIP.commitComposition("") for now.
- *   TIP.cancelComposition();
+ *   // FYI: This is same as TIP.commitCompositionWith("") for now.
+ *   TIP.cancelComposition(keyEvent2);
  *
- * Example #6 JS-IME can insert text only with commitComposition():
+ * Example #6 JS-IME can insert text only with commitCompositionWith():
  *
+ *   // Create a keyboard event if the following inserting text is caused by a
+ *   // key event.
+ *   var keyEvent1 =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   if (!TIP.beginInputTransaction(window, callback)) {
  *     return; // You failed to get the rights to make composition
  *   }
- *   TIP.commitComposition("Some words");
+ *   TIP.commitCompositionWith("Some words", keyEvent1);
  *
  * Example #7 JS-IME can start composition explicitly:
  *
  *   if (!TIP.beginInputTransaction(window, callback)) {
  *     return; // You failed to get the rights to make composition
  *   }
+ *   // Create a keyboard event if the following starting composition is caused
+ *   // by a key event.
+ *   var keyEvent1 =
+ *     new KeyboardEvent("", { key: "foo", code: "bar", keyCode: buzz });
  *   // If JS-IME don't want to show composing string in the focused editor,
  *   // JS-IME can dispatch only compositionstart event with this.
- *   if (!TIP.startComposition()) {
+ *   if (!TIP.startComposition(keyEvent1)) {
  *     // Failed to start composition.
  *     return;
  *   }
  *   // And when user selects a result from UI of JS-IME, commit with it.
- *   TIP.commitComposition("selected-words");
+ *   // Then, the key event should be null.
+ *   TIP.commitCompositionWith("selected-words");
+ *
+ * Example #8 JS-IME or JS-Keyboard should dispatch key events even during
+ *            composition (non-printable key case):
+ *
+ *   if (!TIP.beginInputTransaction(window, callback)) {
+ *     return; // You failed to get the rights to dispatch key events
+ *   }
+ *
+ *   // You don't need to specify .keyCode value if it's non-printable key
+ *   // because it can be computed from .key value.
+ *   // If you specify non-zero value to .keyCode, it'll be used.
+ *   var keyEvent = new KeyboardEvent("", { code: "Enter", key: "Enter" });
+ *   if (TIP.keydown(keyEvent)) {
+ *     // Handle its default action
+ *   }
+ *
+ *   // Even if keydown event was consumed, keyup event should be dispatched.
+ *   if (TIP.keyup(keyEvent)) {
+ *     // Handle its default action
+ *   }
+ *
+ * Example #9 JS-IME or JS-Keyboard should dispatch key events even during
+ *            composition (printable key case):
+ *
+ *   if (!TIP.beginInputTransaction(window, callback)) {
+ *     return; // You failed to get the rights to dispatch key events
+ *   }
+ *
+ *   // You need to specify .keyCode value if it's printable key.
+ *   // The rules of .keyCode value is documented in MDN:
+ *   //   https://developer.mozilla.org/docs/Web/API/KeyboardEvent.keyCode
+ *   //
+ *   //   #1 If the key location is DOM_KEY_LOCATION_NUMPAD and NumLock is
+ *   //      active, you should specify DOM_VK_NUMPAD[0-9], DOM_VK_MULTIPLY,
+ *   //      DOM_VK_ADD, DOM_VK_SEPARATOR, DOM_VK_SUBTRACT, DOM_VK_DECIMAL or
+ *   //      DOM_VK_DIVIDE.
+ *   //   #2 If the key is Spacebar, use DOM_VK_SPACE.
+ *   //
+ *   //   Following rules are printable keys in DOM_KEY_LOCATION_STANDARD.
+ *   //   .keyCode value for a key shouldn't be changed by modifier states:
+ *   //     #1 If the key can input [0-9] with any modifier state (except
+ *   //        NumLock state), the value should be DOM_VK_[0-9].
+ *   //     #2 Otherwise, and if the key inputs an ASCII alphabet with no
+ *   //        active modifiers, use DOM_VK_[A-Z].
+ *   //     #3 Otherwise, and if the key inputs an ASCII alphabet with no
+ *   //        active modifiers except Shift key state, use DOM_VK_[A-Z] for
+ *   //        the shifted character.  E.g., if a key causes non-alphabet
+ *   //        character such as "@" or a Unicode character without Shift key
+ *   //        but "a" is inputted when Shift key is pressed, the proper
+ *   //        keyCode is DOM_VK_A.
+ *   //     #4 Otherwise, and if the key inputs another ASCII character with
+ *   //        no modifier states, use a proper value for the character.  E.g.,
+ *   //        if the key inputs "*" without Shift key state, it should be
+ *   //        DOM_VK_ASTERISK.
+ *   //     #5 Otherwise, and if the key inputs another ASCII character with
+ *   //        Shift key state, use a proper value for the character.  E.g.,
+ *   //        if a key causes a Unicode character without Shift key but "&"
+ *   //        is inputted when Shift key is pressed, the proper keyCode is
+ *   //        DOM_VK_AMPERSAND.
+ *   //     See above document for the other cases.
+ *   //
+ *   // NOTE: If the software keyboard is 10-key like simple phone,
+ *   //       We don't have common rules to decide its .keyCode value.
+ *   //       Above rules should be used when the JS-Keyboard emulates PC
+ *   //       keyboard.
+ *   // .key value should be inputting character by the key with current
+ *   // modifier state.
+ *   // .code value should be empty string if the JS-Keyboard isn't emulating
+ *   // physical keyboard.  Otherwise, use same value with physical keyboard's
+ *   // same key.
+ *   var keyEvent = new KeyboardEvent("", { code: "KeyA", key: "a",
+ *                                          keyCode: KeyboardEvent.DOM_VK_A });
+ *   if (TIP.keydown(keyEvent)) {
+ *     // Handle its default action
+ *   }
+ *
+ *   // Even if keydown event was consumed, keyup event should be dispatched.
+ *   if (TIP.keyup(keyEvent)) {
+ *     // Handle its default action
+ *   }
+ *
+ * Example #10 JS-Keyboard doesn't need to initialize modifier states at
+ *             calling either keydown() or keyup().
+ *
+ *   // Neither beginInputTransaction() nor beginInputTransactionForTests()
+ *   // resets modifier state.
+ *   if (!TIP.beginInputTransaction(window, callback)) {
+ *     return; // You failed to get the rights to dispatch key events
+ *   }
+ *
+ *   var leftShift = new KeyboardEvent("", { code: "ShiftLeft", key: "Shift" });
+ *
+ *   // This causes following key events will be shifted automatically.
+ *   TIP.keydown(leftShift);
+ *
+ *   var rightShift =
+ *     new KeyboardEvent("", { code: "ShiftRight", key: "Shift" });
+ *
+ *   TIP.keydown(rightShift);
+ *
+ *   // keyup of one of shift key doesn't cause inactivating "Shift" state.
+ *   TIP.keyup(rightShift);
+ *
+ *   // This causes inactivating "Shift" state completely.
+ *   TIP.keyup(leftShift);
  */
 
-[scriptable, builtinclass, uuid(512f1efe-9e0f-48a4-b423-3936ef948f34)]
+[scriptable, builtinclass, uuid(6617a9f6-3e16-4086-9e1e-c8a6c5d505c7)]
 interface nsITextInputProcessor : nsISupports
 {
   /**
+   * Returns true if this instance was dispatched compositionstart but hasn't
+   * dispatched compositionend yet.
+   */
+  readonly attribute boolean hasComposition;
+
+  /**
    * When you create an instance, you must call beginInputTransaction() first
    * except when you created the instance for automated tests.
    *
@@ -146,11 +301,18 @@
    * when compositionstart has already been dispatched, this throws an
    * exception.
    *
+   * @param aKeyboardEvent  Key event which causes starting composition.
+   *                        If its type value is "keydown", this method
+   *                        dispatches only keydown event first.  Otherwise,
+   *                        dispatches keydown first and keyup at last.
+   * @param aKeyFlags       See KEY_* constants.
    * @return                Returns true if composition starts normally.
    *                        Otherwise, returns false because it might be
    *                        canceled by the web application.
    */
-  boolean startComposition();
+  [optional_argc]
+    boolean startComposition([optional] in nsIDOMKeyEvent aKeyboardEvent,
+                             [optional] in unsigned long aKeyFlags);
 
   /**
    * Set new composition string.  Pending composition will be flushed by
@@ -158,7 +320,7 @@
    * string isn't empty, you need to call appendClauseToPendingComposition() to
    * fill all characters of aString with one or more clauses before flushing.
    * Note that if you need to commit or cancel composition, use
-   * commitComposition() or cancelComposition().
+   * commitComposition(), commitCompositionWith() or cancelComposition().
    */
   void setPendingCompositionString(in DOMString aString);
 
@@ -227,26 +389,47 @@
    * string or caret offset is larger than the composition string length, this
    * throws an exception.
    *
+   * @param aKeyboardEvent  Key event which causes the composition string.
+   *                        If its type value is "keydown", this method
+   *                        dispatches only keydown event first.  Otherwise,
+   *                        dispatches keydown first and keyup at last.
+   * @param aKeyFlags       See KEY_* constants.
    * @return                Returns true if there is a composition already or
    *                        starting composition automatically.
    *                        Otherwise, i.e., if it cannot start composition
    *                        automatically, e.g., canceled by web apps, returns
    *                        false.
    */
-  boolean flushPendingComposition();
+  [optional_argc]
+    boolean flushPendingComposition(
+      [optional] in nsIDOMKeyEvent aKeyboardEvent,
+      [optional] in unsigned long aKeyFlags);
 
   /**
-   * commitComposition() will commit composition.
-   * If there is a composition which is started by the instance, this commits
-   * the composition.  Otherwise, throws an exception.
-   *
-   * Note that if you tries to commit composition without specifying commit
-   * string when there is no composition, this throws an exception.
+   * commitComposition() will commit composition with the last composition
+   * string.  If there is no composition, this will throw an exception.
    *
-   * @param aCommitString   This is optional.  If this is not specified,
-   *                        composition will be committed with the last
-   *                        composing string.  Otherwise, committed with
-   *                        the specified string.
+   * @param aKeyboardEvent  Key event which causes the commit composition.
+   *                        If its type value is "keydown", this method
+   *                        dispatches only keydown event first.  Otherwise,
+   *                        dispatches keydown first and keyup at last.
+   * @param aKeyFlags       See KEY_* constants.
+   */
+  [optional_argc]
+    void commitComposition([optional] in nsIDOMKeyEvent aKeyboardEvent,
+                           [optional] in unsigned long aKeyFlags);
+
+  /**
+   * commitCompositionWith() will commit composition with the specific string.
+   * If there is no composition, this will start composition and commit it
+   * with the specified string.
+   *
+   * @param aCommitString   The string to be committed.
+   * @param aKeyboardEvent  Key event which causes the commit composition.
+   *                        If its type value is "keydown", this method
+   *                        dispatches only keydown event first.  Otherwise,
+   *                        dispatches keydown first and keyup at last.
+   * @param aKeyFlags       See KEY_* constants.
    * @return                Returns true if there is a composition already or
    *                        starting composition automatically.
    *                        Otherwise, i.e., if it cannot start composition
@@ -254,7 +437,9 @@
    *                        false.
    */
   [optional_argc]
-    boolean commitComposition([optional] in DOMString aCommitString);
+    boolean commitCompositionWith(in DOMString aCommitString,
+                                  [optional] in nsIDOMKeyEvent aKeyboardEvent,
+                                  [optional] in unsigned long aKeyFlags);
 
   /**
    * cancelComposition() will cancel composition.  This is for now the same as
@@ -264,8 +449,122 @@
    *
    * Note that if you tries to cancel composition when there is no composition,
    * this throws an exception.
+   *
+   * @param aKeyboardEvent  Key event which causes the canceling composition.
+   *                        If its type value is "keydown", this method
+   *                        dispatches only keydown event first.  Otherwise,
+   *                        dispatches keydown first and keyup at last.
+   * @param aKeyFlags       See KEY_* constants.
+   */
+  [optional_argc]
+    void cancelComposition([optional] in nsIDOMKeyEvent aKeyboardEvent,
+                           [optional] in unsigned long aKeyFlags);
+
+  // Specifying KEY_DEFAULT_PREVENTED can dispatch key events whose
+  // defaultPrevented are true.  Note that if this is specified, keypress event
+  // won't be fired.
+  const unsigned long KEY_DEFAULT_PREVENTED                        = 0x00000001;
+  // If KEY_NON_PRINTABLE_KEY is specified and the .key value isn't valid
+  // key name, the methods will throws an exception.  In other words, this
+  // flag prevents to dispatch key events with wrong key values and to cause
+  // such key events input the key values as text.
+  const unsigned long KEY_NON_PRINTABLE_KEY                        = 0x00000002;
+  // If KEY_FORCE_PRINTABLE_KEY is specified and even if the .key value is a
+  // registered key name, it's treated as inputting text value.
+  const unsigned long KEY_FORCE_PRINTABLE_KEY                      = 0x00000004;
+  // If KEY_KEEP_KEY_LOCATION_STANDARD is specified when its .location is not
+  // initialized or initialized with 0, the value isn't computed with .code
+  // value.  Note that if .location is initialized with non-zero value,
+  // this flag causes throwing an exception.
+  // NOTE: This is not recommended to use except for tests.
+  const unsigned long KEY_KEEP_KEY_LOCATION_STANDARD               = 0x00000008;
+  // If KEY_KEEP_KEYCODE_ZERO is specified when its .keyCode is not initialized
+  // or initialized with 0, the value isn't computed with .key value when it
+  // represents non-printable key.  Note that if .keyCode is initialized with
+  // non-zero value, this flag causes throwing an exception.
+  const unsigned long KEY_KEEP_KEYCODE_ZERO                        = 0x00000010;
+  // If KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT is specified when the key event is
+  // a modifier key's, keydown() and keyup() only modifies its modifier state
+  // without dispatching key events.  This is useful for testing odd behavior
+  // or emulating legacy API behavior.
+  const unsigned long KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT         = 0x00000020;
+
+  /**
+   * keydown() may dispatch a keydown event and some keypress events if
+   * preceding keydown event isn't consumed and they are necessary.
+   * Note that even if this is called during composition, key events may not
+   * be dispatched.  In this case, this returns false.
+   *
+   * You should initialize at least .key value and .code value of the event.
+   * Additionally, if you try to emulate a printable key, .keyCode value should
+   * be specified if there is proper key value.  See the comment of above
+   * example how to decide .keyCode value of a printable key.  On the other
+   * hand, .keyCode value is automatically computed when you try to emulate
+   * non-printable key.  However, if you try to emulate physical keyboard of
+   * desktop platform, you need to specify proper value explicitly because
+   * the mapping table of this API isn't enough to emulate the behavior of
+   * Gecko for desktop platforms.
+   *
+   * NOTE: Even if this has composition, JS-Keyboard should call keydown() and
+   *       keyup().  Although, with the default preferences and normal
+   *       conditions, DOM key events won't be fired during composition.
+   *       However, they MAY be dispatched for some reasons, e.g., the web
+   *       content listens only key events, or if the standard DOM event spec
+   *       will be changed in the future.
+   *
+   * @param aKeyboardEvent  Must be a keyboard event which should be dispatched
+   *                        as a keydown event and keypress events.
+   *                        #1 Note that you don't need to set charCode value
+   *                        because it's computed from its key value.
+   *                        #2 If code value is set properly and location value
+   *                        isn't specified (i.e., 0), the location value will
+   *                        be guessed from the code value.
+   *                        #3 Non-defined code names are not allowed. If your
+   *                        key isn't registered, file a bug. If your key isn't
+   *                        defined by any standards, use "" (empty string).
+   *                        #4 .keyCode is guessed from .key value if the key
+   *                        name is registered and .keyCode isn't initialized.
+   *                        #5 modifier key states, e.g., .shiftKey, are
+   *                        ignored.  Instead, modifier states are managed by
+   *                        each instance and set automatically.
+   * @param aKeyFlags       Special flags.  The values can be some of KEY_*
+   *                        constants.
+   * @return                true if neither the keydown event or following
+   *                        keypress events is *not* consumed.
+   *                        Otherwise, i.e., preventDefault() is called, false.
+   */
+  [optional_argc]
+    boolean keydown(in nsIDOMKeyEvent aKeyboardEvent,
+                    [optional] in unsigned long aKeyFlags);
+
+  /**
+   * Similar to keydown(), but this dispatches only a keyup event.
+   */
+  [optional_argc]
+    boolean keyup(in nsIDOMKeyEvent aKeyboardEvent,
+                  [optional] in unsigned long aKeyFlags);
+
+  /**
+   * getModifierState() returns modifier state managed by this instance.
+   *
+   * @param aModifier       One of modifier key names.  This doesn't support
+   *                        virtual modifiers like "Accel".
+   * @return                true if the modifier key is active.  Otherwise,
+   *                        false.
+   */
+  boolean getModifierState(in DOMString aModifierKey);
+
+  /**
+   * shareModifierStateOf() makes the instance shares modifier state of
+   * another instance.  When this is called, the instance refers the modifier
+   * state of another instance.  After that, changes to either this and the
+   * other instance's modifier state is synchronized.
+   *
+   * @param aOther          Another instance which will be referred by the
+   *                        instance.  If this is null, the instance restarts
+   *                        to manage modifier state independently.
    */
-  void cancelComposition();
+  void shareModifierStateOf(in nsITextInputProcessor aOther);
 };
 
 %{C++
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentBridgeChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentBridgeChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentBridgeChild.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentBridgeChild.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -13,7 +13,6 @@
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 
-using namespace base;
 using namespace mozilla::ipc;
 using namespace mozilla::jsipc;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentBridgeParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentBridgeParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentBridgeParent.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentBridgeParent.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -9,7 +9,6 @@
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
 #include "nsXULAppAPI.h"
 
-using namespace base;
 using namespace mozilla::ipc;
 using namespace mozilla::jsipc;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentChild.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentChild.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -31,6 +31,7 @@
 #include "mozilla/dom/DOMStorageIPC.h"
 #include "mozilla/dom/ExternalHelperAppChild.h"
 #include "mozilla/dom/PCrashReporterChild.h"
+#include "mozilla/dom/ProcessGlobal.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/asmjscache/AsmJSCache.h"
 #include "mozilla/dom/asmjscache/PAsmJSCacheEntryChild.h"
@@ -92,6 +93,8 @@
 #include "nsISpellChecker.h"
 #include "nsClipboardProxy.h"
 #include "nsISystemMessageCache.h"
+#include "nsDirectoryServiceUtils.h"
+#include "nsDirectoryServiceDefs.h"
 
 #include "IHistory.h"
 #include "nsNetUtil.h"
@@ -172,7 +175,6 @@
 #include "mozilla/net/NeckoMessageUtils.h"
 #include "mozilla/RemoteSpellCheckEngineChild.h"
 
-using namespace base;
 using namespace mozilla;
 using namespace mozilla::docshell;
 using namespace mozilla::dom::bluetooth;
@@ -1081,8 +1083,11 @@
 #endif
 
 #if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
+
+#include <stdlib.h>
+
 static bool
-GetAppPaths(nsCString &aAppPath, nsCString &aAppBinaryPath)
+GetAppPaths(nsCString &aAppPath, nsCString &aAppBinaryPath, nsCString &aAppDir)
 {
   nsAutoCString appPath;
   nsAutoCString appBinaryPath(
@@ -1112,6 +1117,23 @@
     return false;
   }
 
+  nsCOMPtr<nsIFile> appDir;
+  nsCOMPtr<nsIProperties> dirSvc =
+    do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
+  if (!dirSvc) {
+    return false;
+  }
+  rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR,
+                   NS_GET_IID(nsIFile), getter_AddRefs(appDir));
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+  bool exists;
+  rv = appDir->Exists(&exists);
+  if (NS_FAILED(rv) || !exists) {
+    return false;
+  }
+
   bool isLink;
   app->IsSymlink(&isLink);
   if (isLink) {
@@ -1125,6 +1147,12 @@
   } else {
     appBinary->GetNativePath(aAppBinaryPath);
   }
+  appDir->IsSymlink(&isLink);
+  if (isLink) {
+    appDir->GetNativeTarget(aAppDir);
+  } else {
+    appDir->GetNativePath(aAppDir);
+  }
 
   return true;
 }
@@ -1132,8 +1160,8 @@
 static void
 StartMacOSContentSandbox()
 {
-  nsAutoCString appPath, appBinaryPath;
-  if (!GetAppPaths(appPath, appBinaryPath)) {
+  nsAutoCString appPath, appBinaryPath, appDir;
+  if (!GetAppPaths(appPath, appBinaryPath, appDir)) {
     MOZ_CRASH("Error resolving child process path");
   }
 
@@ -1141,6 +1169,7 @@
   info.type = MacSandboxType_Content;
   info.appPath.Assign(appPath);
   info.appBinaryPath.Assign(appBinaryPath);
+  info.appDir.Assign(appDir);
 
   nsAutoCString err;
   if (!mozilla::StartMacSandbox(info, err)) {
@@ -1915,12 +1944,20 @@
 }
 
 bool
+ContentChild::RecvLoadProcessScript(const nsString& aURL)
+{
+    ProcessGlobal* global = ProcessGlobal::Get();
+    global->LoadScript(aURL);
+    return true;
+}
+
+bool
 ContentChild::RecvAsyncMessage(const nsString& aMsg,
                                const ClonedMessageData& aData,
                                InfallibleTArray<CpowEntry>&& aCpows,
                                const IPC::Principal& aPrincipal)
 {
-    nsRefPtr<nsFrameMessageManager> cpm = nsFrameMessageManager::sChildProcessManager;
+    nsRefPtr<nsFrameMessageManager> cpm = nsFrameMessageManager::GetChildProcessManager();
     if (cpm) {
         StructuredCloneData cloneData = ipc::UnpackClonedMessageDataForChild(aData);
         CrossProcessCpowHolder cpows(this, aCpows);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentChild.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentChild.h	2015-02-28 15:03:07.000000000 +0000
@@ -304,6 +304,8 @@
     virtual bool RecvNotifyAlertsObserver(const nsCString& aType,
                                           const nsString& aData) MOZ_OVERRIDE;
 
+    virtual bool RecvLoadProcessScript(const nsString& aURL) MOZ_OVERRIDE;
+
     virtual bool RecvAsyncMessage(const nsString& aMsg,
                                   const ClonedMessageData& aData,
                                   InfallibleTArray<CpowEntry>&& aCpows,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentParent.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentParent.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -4180,6 +4180,14 @@
 }
 
 bool
+ContentParent::DoLoadMessageManagerScript(const nsAString& aURL,
+                                          bool aRunInGlobalScope)
+{
+    MOZ_ASSERT(!aRunInGlobalScope);
+    return SendLoadProcessScript(nsString(aURL));
+}
+
+bool
 ContentParent::DoSendAsyncMessage(JSContext* aCx,
                                   const nsAString& aMessage,
                                   const mozilla::dom::StructuredCloneData& aData,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/ContentParent.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/ContentParent.h	2015-02-28 15:03:07.000000000 +0000
@@ -169,6 +169,8 @@
     /**
      * MessageManagerCallback methods that we override.
      */
+    virtual bool DoLoadMessageManagerScript(const nsAString& aURL,
+                                            bool aRunInGlobalScope) MOZ_OVERRIDE;
     virtual bool DoSendAsyncMessage(JSContext* aCx,
                                     const nsAString& aMessage,
                                     const mozilla::dom::StructuredCloneData& aData,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/CrashReporterParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/CrashReporterParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/CrashReporterParent.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/CrashReporterParent.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -17,8 +17,6 @@
 #include "nsThreadUtils.h"
 #endif
 
-using namespace base;
-
 namespace mozilla {
 namespace dom {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/nsIContentChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/nsIContentChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/nsIContentChild.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/nsIContentChild.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -113,7 +113,7 @@
                                   InfallibleTArray<CpowEntry>&& aCpows,
                                   const IPC::Principal& aPrincipal)
 {
-  nsRefPtr<nsFrameMessageManager> cpm = nsFrameMessageManager::sChildProcessManager;
+  nsRefPtr<nsFrameMessageManager> cpm = nsFrameMessageManager::GetChildProcessManager();
   if (cpm) {
     StructuredCloneData cloneData = ipc::UnpackClonedMessageDataForChild(aData);
     CrossProcessCpowHolder cpows(this, aCpows);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PBrowser.ipdl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PBrowser.ipdl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PBrowser.ipdl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PBrowser.ipdl	2015-02-28 15:03:07.000000000 +0000
@@ -31,7 +31,6 @@
 using struct mozilla::layers::ScrollableLayerGuid from "FrameMetrics.h";
 using struct mozilla::layers::ZoomConstraints from "FrameMetrics.h";
 using FrameMetrics::ViewID from "FrameMetrics.h";
-using mozilla::layout::ScrollingBehavior from "mozilla/layout/RenderFrameUtils.h";
 using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
 using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
 using nscolor from "nsColor.h";
@@ -281,6 +280,28 @@
                         returns (bool noCompositionEvent, nsString composition);
 
     /**
+     * Tells chrome to start plugin IME.  If this results in a string getting
+     * committed, the result is in aCommitted (otherwise aCommitted is empty).
+     *
+     * aKeyboardEvent     The event with which plugin IME is to be started
+     * panelX and panelY  Location in screen coordinates of the IME input panel
+     *                    (should be just under the plugin)
+     * aCommitted         The string committed during IME -- otherwise empty
+     */
+    prio(urgent) sync StartPluginIME(WidgetKeyboardEvent aKeyboardEvent,
+                                     int32_t panelX, int32_t panelY)
+                                     returns (nsString aCommitted);
+
+    /**
+     * Tells chrome (and specifically the appropriate widget) whether or not
+     * a plugin (inside the widget) has the keyboard focus.  Should be sent
+     * when the keyboard focus changes too or from a plugin.
+     *
+     * aFocused  Whether or not a plugin is focused
+     */
+    prio(urgent) async SetPluginFocused(bool aFocused);
+
+    /**
      * Request that the parent process move focus to the browser's frame. If
      * canRaise is true, the window can be raised if it is inactive.
      */
@@ -452,8 +473,7 @@
     async RemotePaintIsReady();
 
     sync GetRenderFrameInfo(PRenderFrame aRenderFrame)
-        returns (ScrollingBehavior scrolling,
-                 TextureFactoryIdentifier textureFactoryIdentifier,
+        returns (TextureFactoryIdentifier textureFactoryIdentifier,
                  uint64_t layersId);
 
     /**
@@ -474,7 +494,6 @@
      */
     Show(nsIntSize size,
          ShowInfo info,
-         ScrollingBehavior scrolling,
          TextureFactoryIdentifier textureFactoryIdentifier,
          uint64_t layersId,
          nullable PRenderFrame renderFrame,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PContent.ipdl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PContent.ipdl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PContent.ipdl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PContent.ipdl	2015-02-28 15:03:07.000000000 +0000
@@ -553,6 +553,8 @@
      */
     async Shutdown();
 
+    async LoadProcessScript(nsString url);
+
 parent:
     /**
      * Tell the parent process a new accessible document has been created.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PPluginWidget.ipdl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PPluginWidget.ipdl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PPluginWidget.ipdl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PPluginWidget.ipdl	2015-02-28 15:03:07.000000000 +0000
@@ -48,12 +48,10 @@
 
 child:
   /**
-   * Sent from content when a plugin is unloaded via layout. We shut down
-   * some things in response to this so that we don't end up firing async
-   * msgs after the child is destroyed. We know that after this call
-   * the child actor may not be on the other side.
+   * Event indicating the parent is shutting down.
+   * aWhichSide - indicates which side intititated the shutdown.
    */
-  async ParentShutdown();
+  async ParentShutdown(uint16_t aWhichSide);
 
   /**
    * Requests a full update of the plugin window.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PTabContext.ipdlh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PTabContext.ipdlh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/PTabContext.ipdlh	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/PTabContext.ipdlh	2015-02-28 15:03:07.000000000 +0000
@@ -7,8 +7,6 @@
 include protocol PBrowser;
 include PBrowserOrId;
 
-using mozilla::layout::ScrollingBehavior from "mozilla/layout/RenderFrameUtils.h";
-
 namespace mozilla {
 namespace dom {
 
@@ -70,7 +68,6 @@
 
 struct IPCTabContext {
   IPCTabAppBrowserContext appBrowserContext;
-  ScrollingBehavior scrollingBehavior;
 };
 
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabChild.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabChild.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -14,7 +14,6 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/EventListenerManager.h"
-#include "mozilla/IntentionalCrash.h"
 #include "mozilla/dom/workers/ServiceWorkerManager.h"
 #include "mozilla/dom/indexedDB/PIndexedDBPermissionRequestChild.h"
 #include "mozilla/plugins/PluginWidgetChild.h"
@@ -268,7 +267,7 @@
 bool
 TabChildBase::HandlePossibleViewportChange(const ScreenIntSize& aOldScreenSize)
 {
-  if (!IsAsyncPanZoomEnabled()) {
+  if (!gfxPrefs::AsyncPanZoomEnabled()) {
     return false;
   }
 
@@ -557,12 +556,6 @@
     return newMetrics;
 }
 
-bool
-TabChildBase::IsAsyncPanZoomEnabled()
-{
-    return mScrolling == ASYNC_PAN_ZOOM;
-}
-
 NS_IMETHODIMP
 ContentListener::HandleEvent(nsIDOMEvent* aEvent)
 {
@@ -908,7 +901,7 @@
       }
     }
   } else if (!strcmp(aTopic, BEFORE_FIRST_PAINT)) {
-    if (IsAsyncPanZoomEnabled()) {
+    if (gfxPrefs::AsyncPanZoomEnabled()) {
       nsCOMPtr<nsIDocument> subject(do_QueryInterface(aSubject));
       nsCOMPtr<nsIDocument> doc(GetDocument());
 
@@ -963,7 +956,7 @@
                            nsIURI *aLocation,
                            uint32_t aFlags)
 {
-  if (!IsAsyncPanZoomEnabled()) {
+  if (!gfxPrefs::AsyncPanZoomEnabled()) {
     return NS_OK;
   }
 
@@ -1438,7 +1431,7 @@
   context.opener() = openerTabId;
   context.isBrowserElement() = IsBrowserElement();
 
-  IPCTabContext ipcContext(context, mScrolling);
+  IPCTabContext ipcContext(context);
 
   TabId tabId;
   cc->SendAllocateTabId(openerTabId,
@@ -1456,7 +1449,7 @@
   unused << Manager()->SendPBrowserConstructor(
       // We release this ref in DeallocPBrowserChild
       nsRefPtr<TabChild>(newChild).forget().take(),
-      tabId, IPCTabContext(context, mScrolling), aChromeFlags,
+      tabId, IPCTabContext(context), aChromeFlags,
       cc->GetID(), cc->IsForApp(), cc->IsForBrowser());
 
   nsAutoCString spec;
@@ -1518,12 +1511,10 @@
     return NS_ERROR_ABORT;
   }
 
-  ScrollingBehavior scrolling = DEFAULT_SCROLLING;
   TextureFactoryIdentifier textureFactoryIdentifier;
   uint64_t layersId = 0;
   PRenderFrameChild* renderFrame = newChild->SendPRenderFrameConstructor();
   newChild->SendGetRenderFrameInfo(renderFrame,
-                                   &scrolling,
                                    &textureFactoryIdentifier,
                                    &layersId);
   if (layersId == 0) { // if renderFrame is invalid.
@@ -1533,7 +1524,7 @@
 
   // Unfortunately we don't get a window unless we've shown the frame.  That's
   // pretty bogus; see bug 763602.
-  newChild->DoFakeShow(scrolling, textureFactoryIdentifier, layersId, renderFrame);
+  newChild->DoFakeShow(textureFactoryIdentifier, layersId, renderFrame);
 
   for (size_t i = 0; i < frameScripts.Length(); i++) {
     FrameScriptInfo& info = frameScripts[i];
@@ -1855,13 +1846,12 @@
 }
 
 void
-TabChild::DoFakeShow(const ScrollingBehavior& aScrolling,
-                     const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+TabChild::DoFakeShow(const TextureFactoryIdentifier& aTextureFactoryIdentifier,
                      const uint64_t& aLayersId,
                      PRenderFrameChild* aRenderFrame)
 {
   ShowInfo info(EmptyString(), false, false, 0, 0);
-  RecvShow(nsIntSize(0, 0), info, aScrolling, aTextureFactoryIdentifier,
+  RecvShow(nsIntSize(0, 0), info, aTextureFactoryIdentifier,
            aLayersId, aRenderFrame, mParentIsActive);
   mDidFakeShow = true;
 }
@@ -1961,7 +1951,6 @@
 bool
 TabChild::RecvShow(const nsIntSize& aSize,
                    const ShowInfo& aInfo,
-                   const ScrollingBehavior& aScrolling,
                    const TextureFactoryIdentifier& aTextureFactoryIdentifier,
                    const uint64_t& aLayersId,
                    PRenderFrameChild* aRenderFrame,
@@ -1981,7 +1970,7 @@
         return false;
     }
 
-    if (!InitRenderingState(aScrolling, aTextureFactoryIdentifier, aLayersId, aRenderFrame)) {
+    if (!InitRenderingState(aTextureFactoryIdentifier, aLayersId, aRenderFrame)) {
         // We can fail to initialize our widget if the <browser
         // remote> has already been destroyed, and we couldn't hook
         // into the parent-process's layer system.  That's not a fatal
@@ -2178,7 +2167,7 @@
                               const ScrollableLayerGuid& aGuid,
                               const uint64_t& aInputBlockId)
 {
-  if (IsAsyncPanZoomEnabled()) {
+  if (gfxPrefs::AsyncPanZoomEnabled()) {
     nsCOMPtr<nsIDocument> document(GetDocument());
     APZCCallbackHelper::SendSetTargetAPZCNotification(WebWidget(), document, aEvent, aGuid,
         aInputBlockId, mSetTargetAPZCCallback);
@@ -2188,7 +2177,7 @@
   event.widget = mWidget;
   APZCCallbackHelper::DispatchWidgetEvent(event);
 
-  if (IsAsyncPanZoomEnabled()) {
+  if (gfxPrefs::AsyncPanZoomEnabled()) {
     mAPZEventState->ProcessWheelEvent(event, aGuid, aInputBlockId);
   }
   return true;
@@ -2362,7 +2351,7 @@
   APZCCallbackHelper::ApplyCallbackTransform(localEvent, aGuid,
       mWidget->GetDefaultScale(), GetPresShellResolution());
 
-  if (localEvent.message == NS_TOUCH_START && IsAsyncPanZoomEnabled()) {
+  if (localEvent.message == NS_TOUCH_START && gfxPrefs::AsyncPanZoomEnabled()) {
     nsCOMPtr<nsIDocument> document = GetDocument();
     APZCCallbackHelper::SendSetTargetAPZCNotification(WebWidget(), document,
         localEvent, aGuid, aInputBlockId, mSetTargetAPZCCallback);
@@ -2371,7 +2360,7 @@
   // Dispatch event to content (potentially a long-running operation)
   nsEventStatus status = APZCCallbackHelper::DispatchWidgetEvent(localEvent);
 
-  if (!IsAsyncPanZoomEnabled()) {
+  if (!gfxPrefs::AsyncPanZoomEnabled()) {
     UpdateTapState(localEvent, status);
     return true;
   }
@@ -2618,7 +2607,7 @@
     // error.
     return true;
 
-  LoadFrameScriptInternal(aURL, aRunInGlobalScope);
+  LoadScriptInternal(aURL, aRunInGlobalScope);
   return true;
 }
 
@@ -2769,7 +2758,7 @@
     nsISupports* scopeSupports = NS_ISUPPORTS_CAST(EventTarget*, scope);
 
     NS_NAMED_LITERAL_CSTRING(globalId, "outOfProcessTabChildGlobal");
-    NS_ENSURE_TRUE(InitTabChildGlobalInternal(scopeSupports, globalId), false);
+    NS_ENSURE_TRUE(InitChildGlobalInternal(scopeSupports, globalId), false);
 
     scope->Init();
 
@@ -2794,8 +2783,7 @@
 }
 
 bool
-TabChild::InitRenderingState(const ScrollingBehavior& aScrolling,
-                             const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+TabChild::InitRenderingState(const TextureFactoryIdentifier& aTextureFactoryIdentifier,
                              const uint64_t& aLayersId,
                              PRenderFrameChild* aRenderFrame)
 {
@@ -2808,7 +2796,6 @@
     }
 
     MOZ_ASSERT(aLayersId != 0);
-    mScrolling = aScrolling;
     mTextureFactoryIdentifier = aTextureFactoryIdentifier;
 
     // Pushing layers transactions directly to a separate
@@ -3203,6 +3190,9 @@
 NS_IMETHODIMP_(bool)
 TabChildGlobal::MarkForCC()
 {
+  if (mTabChild) {
+    mTabChild->MarkScopesForCC();
+  }
   return mMessageManager ? mMessageManager->MarkForCC() : false;
 }
 
@@ -3218,13 +3208,6 @@
 }
 
 NS_IMETHODIMP
-TabChildGlobal::PrivateNoteIntentionalCrash()
-{
-    mozilla::NoteIntentionalCrash("tab");
-    return NS_OK;
-}
-
-NS_IMETHODIMP
 TabChildGlobal::GetDocShell(nsIDocShell** aDocShell)
 {
   *aDocShell = nullptr;
@@ -3235,20 +3218,6 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-TabChildGlobal::Btoa(const nsAString& aBinaryData,
-                     nsAString& aAsciiBase64String)
-{
-  return nsContentUtils::Btoa(aBinaryData, aAsciiBase64String);
-}
-
-NS_IMETHODIMP
-TabChildGlobal::Atob(const nsAString& aAsciiString,
-                     nsAString& aBinaryData)
-{
-  return nsContentUtils::Atob(aAsciiString, aBinaryData);
-}
-
 JSContext*
 TabChildGlobal::GetJSContextForEventHandlers()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabChild.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabChild.h	2015-02-28 15:03:07.000000000 +0000
@@ -76,6 +76,7 @@
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(TabChildGlobal, DOMEventTargetHelper)
   NS_FORWARD_SAFE_NSIMESSAGELISTENERMANAGER(mMessageManager)
   NS_FORWARD_SAFE_NSIMESSAGESENDER(mMessageManager)
+  NS_FORWARD_SAFE_NSIMESSAGEMANAGERGLOBAL(mMessageManager)
   NS_IMETHOD SendSyncMessage(const nsAString& aMessageName,
                              JS::Handle<JS::Value> aObject,
                              JS::Handle<JS::Value> aRemote,
@@ -104,15 +105,6 @@
   }
   NS_IMETHOD GetContent(nsIDOMWindow** aContent) MOZ_OVERRIDE;
   NS_IMETHOD GetDocShell(nsIDocShell** aDocShell) MOZ_OVERRIDE;
-  NS_IMETHOD Dump(const nsAString& aStr) MOZ_OVERRIDE
-  {
-    return mMessageManager ? mMessageManager->Dump(aStr) : NS_OK;
-  }
-  NS_IMETHOD PrivateNoteIntentionalCrash() MOZ_OVERRIDE;
-  NS_IMETHOD Btoa(const nsAString& aBinaryData,
-                  nsAString& aAsciiBase64String) MOZ_OVERRIDE;
-  NS_IMETHOD Atob(const nsAString& aAsciiString,
-                  nsAString& aBinaryData) MOZ_OVERRIDE;
 
   nsresult AddEventListener(const nsAString& aType,
                             nsIDOMEventListener* aListener,
@@ -173,7 +165,7 @@
 // It make sense to place in this class all helper functions, and functionality which could be shared between
 // Cross-process/Cross-thread implmentations.
 class TabChildBase : public nsISupports,
-                     public nsFrameScriptExecutor,
+                     public nsMessageManagerScriptExecutor,
                      public ipc::MessageManagerCallback
 {
 public:
@@ -185,7 +177,6 @@
     virtual nsIWebNavigation* WebNavigation() const = 0;
     virtual nsIWidget* WebWidget() = 0;
     nsIPrincipal* GetPrincipal() { return mPrincipal; }
-    bool IsAsyncPanZoomEnabled();
     // Recalculates the display state, including the CSS
     // viewport. This should be called whenever we believe the
     // viewport data on a document may have changed. If it didn't
@@ -230,7 +221,6 @@
     nsRefPtr<TabChildGlobal> mTabChildGlobal;
     ScreenIntSize mInnerSize;
     mozilla::layers::FrameMetrics mLastRootMetrics;
-    mozilla::layout::ScrollingBehavior mScrolling;
     nsCOMPtr<nsIWebBrowserChrome3> mWebBrowserChrome;
 };
 
@@ -251,7 +241,6 @@
 {
     typedef mozilla::dom::ClonedMessageData ClonedMessageData;
     typedef mozilla::layout::RenderFrameChild RenderFrameChild;
-    typedef mozilla::layout::ScrollingBehavior ScrollingBehavior;
     typedef mozilla::layers::APZEventState APZEventState;
     typedef mozilla::layers::SetTargetAPZCCallback SetTargetAPZCCallback;
 
@@ -321,7 +310,6 @@
                                          MOZ_OVERRIDE;
     virtual bool RecvShow(const nsIntSize& aSize,
                           const ShowInfo& aInfo,
-                          const ScrollingBehavior& aScrolling,
                           const TextureFactoryIdentifier& aTextureFactoryIdentifier,
                           const uint64_t& aLayersId,
                           PRenderFrameChild* aRenderFrame,
@@ -545,16 +533,14 @@
 
     enum FrameScriptLoading { DONT_LOAD_SCRIPTS, DEFAULT_LOAD_SCRIPTS };
     bool InitTabChildGlobal(FrameScriptLoading aScriptLoading = DEFAULT_LOAD_SCRIPTS);
-    bool InitRenderingState(const ScrollingBehavior& aScrolling,
-                            const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+    bool InitRenderingState(const TextureFactoryIdentifier& aTextureFactoryIdentifier,
                             const uint64_t& aLayersId,
                             PRenderFrameChild* aRenderFrame);
     void DestroyWindow();
     void SetProcessNameToAppName();
 
     // Call RecvShow(nsIntSize(0, 0)) and block future calls to RecvShow().
-    void DoFakeShow(const ScrollingBehavior& aScrolling,
-                    const TextureFactoryIdentifier& aTextureFactoryIdentifier,
+    void DoFakeShow(const TextureFactoryIdentifier& aTextureFactoryIdentifier,
                     const uint64_t& aLayersId,
                     PRenderFrameChild* aRenderFrame);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabContext.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabContext.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabContext.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabContext.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -24,7 +24,6 @@
   : mInitialized(false)
   , mOwnAppId(NO_APP_ID)
   , mContainingAppId(NO_APP_ID)
-  , mScrollingBehavior(DEFAULT_SCROLLING)
   , mIsBrowser(false)
 {
 }
@@ -156,8 +155,7 @@
 
 bool
 TabContext::SetTabContextForAppFrame(mozIApplication* aOwnApp,
-                                     mozIApplication* aAppFrameOwnerApp,
-                                     ScrollingBehavior aRequestedBehavior)
+                                     mozIApplication* aAppFrameOwnerApp)
 {
   NS_ENSURE_FALSE(mInitialized, false);
 
@@ -181,15 +179,13 @@
   mIsBrowser = false;
   mOwnAppId = ownAppId;
   mContainingAppId = containingAppId;
-  mScrollingBehavior = aRequestedBehavior;
   mOwnApp = aOwnApp;
   mContainingApp = aAppFrameOwnerApp;
   return true;
 }
 
 bool
-TabContext::SetTabContextForBrowserFrame(mozIApplication* aBrowserFrameOwnerApp,
-                                         ScrollingBehavior aRequestedBehavior)
+TabContext::SetTabContextForBrowserFrame(mozIApplication* aBrowserFrameOwnerApp)
 {
   NS_ENSURE_FALSE(mInitialized, false);
 
@@ -204,18 +200,16 @@
   mIsBrowser = true;
   mOwnAppId = NO_APP_ID;
   mContainingAppId = containingAppId;
-  mScrollingBehavior = aRequestedBehavior;
   mContainingApp = aBrowserFrameOwnerApp;
   return true;
 }
 
 bool
-TabContext::SetTabContextForNormalFrame(ScrollingBehavior aRequestedBehavior)
+TabContext::SetTabContextForNormalFrame()
 {
   NS_ENSURE_FALSE(mInitialized, false);
 
   mInitialized = true;
-  mScrollingBehavior = aRequestedBehavior;
   return true;
 }
 
@@ -223,12 +217,10 @@
 TabContext::AsIPCTabContext() const
 {
   if (mIsBrowser) {
-    return IPCTabContext(BrowserFrameIPCTabContext(mContainingAppId),
-                         mScrollingBehavior);
+    return IPCTabContext(BrowserFrameIPCTabContext(mContainingAppId));
   }
 
-  return IPCTabContext(AppFrameIPCTabContext(mOwnAppId, mContainingAppId),
-                       mScrollingBehavior);
+  return IPCTabContext(AppFrameIPCTabContext(mOwnAppId, mContainingAppId));
 }
 
 static already_AddRefed<mozIApplication>
@@ -342,12 +334,10 @@
 
   bool rv;
   if (isBrowser) {
-    rv = mTabContext.SetTabContextForBrowserFrame(containingApp,
-                                                  aParams.scrollingBehavior());
+    rv = mTabContext.SetTabContextForBrowserFrame(containingApp);
   } else {
     rv = mTabContext.SetTabContextForAppFrame(ownApp,
-                                              containingApp,
-                                              aParams.scrollingBehavior());
+                                              containingApp);
   }
 
   if (!rv) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabContext.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabContext.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabContext.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabContext.h	2015-02-28 15:03:07.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_TabContext_h
 #define mozilla_dom_TabContext_h
 
-#include "mozilla/layout/RenderFrameUtils.h"
 #include "mozIApplication.h"
 #include "nsCOMPtr.h"
 
@@ -30,9 +29,6 @@
  */
 class TabContext
 {
-protected:
-  typedef mozilla::layout::ScrollingBehavior ScrollingBehavior;
-
 public:
   TabContext();
 
@@ -106,11 +102,6 @@
   already_AddRefed<mozIApplication> GetOwnOrContainingApp() const;
   bool HasOwnOrContainingApp() const;
 
-  /**
-   * Return the requested scrolling behavior for this frame.
-   */
-  ScrollingBehavior GetScrollingBehavior() const { return mScrollingBehavior; }
-
 protected:
   friend class MaybeInvalidTabContext;
 
@@ -133,20 +124,18 @@
    * given app.  Either or both apps may be null.
    */
   bool SetTabContextForAppFrame(mozIApplication* aOwnApp,
-                                mozIApplication* aAppFrameOwnerApp,
-                                ScrollingBehavior aRequestedBehavior);
+                                mozIApplication* aAppFrameOwnerApp);
 
   /**
    * Set this TabContext to be a browser frame inside the given app (which may
    * be null).
    */
-  bool SetTabContextForBrowserFrame(mozIApplication* aBrowserFrameOwnerApp,
-                                    ScrollingBehavior aRequestedBehavior);
+  bool SetTabContextForBrowserFrame(mozIApplication* aBrowserFrameOwnerApp);
 
   /**
    * Set this TabContext to be a normal non-browser non-app frame.
    */
-  bool SetTabContextForNormalFrame(ScrollingBehavior aRequestedBehavior);
+  bool SetTabContextForNormalFrame();
 
 private:
   /**
@@ -179,11 +168,6 @@
   uint32_t mContainingAppId;
 
   /**
-   * The requested scrolling behavior for this frame.
-   */
-  ScrollingBehavior mScrollingBehavior;
-
-  /**
    * Does this TabContext correspond to a browser element?
    *
    * If this is true, mOwnApp must be null.
@@ -204,23 +188,20 @@
     return TabContext::SetTabContext(aContext);
   }
 
-  bool SetTabContextForAppFrame(mozIApplication* aOwnApp, mozIApplication* aAppFrameOwnerApp,
-                                ScrollingBehavior aRequestedBehavior)
+  bool SetTabContextForAppFrame(mozIApplication* aOwnApp,
+                                mozIApplication* aAppFrameOwnerApp)
   {
-    return TabContext::SetTabContextForAppFrame(aOwnApp, aAppFrameOwnerApp,
-                                                aRequestedBehavior);
+    return TabContext::SetTabContextForAppFrame(aOwnApp, aAppFrameOwnerApp);
   }
 
-  bool SetTabContextForBrowserFrame(mozIApplication* aBrowserFrameOwnerApp,
-                                    ScrollingBehavior aRequestedBehavior)
+  bool SetTabContextForBrowserFrame(mozIApplication* aBrowserFrameOwnerApp)
   {
-    return TabContext::SetTabContextForBrowserFrame(aBrowserFrameOwnerApp,
-                                                    aRequestedBehavior);
+    return TabContext::SetTabContextForBrowserFrame(aBrowserFrameOwnerApp);
   }
 
-  bool SetTabContextForNormalFrame(ScrollingBehavior aRequestedBehavior)
+  bool SetTabContextForNormalFrame()
   {
-    return TabContext::SetTabContextForNormalFrame(aRequestedBehavior);
+    return TabContext::SetTabContextForNormalFrame();
   }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabParent.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabParent.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -805,7 +805,6 @@
         return;
     }
 
-    ScrollingBehavior scrolling = UseAsyncPanZoom() ? ASYNC_PAN_ZOOM : DEFAULT_SCROLLING;
     TextureFactoryIdentifier textureFactoryIdentifier;
     uint64_t layersId = 0;
     bool success = false;
@@ -819,7 +818,6 @@
         if (frameLoader) {
           renderFrame =
               new RenderFrameParent(frameLoader,
-                                    scrolling,
                                     &textureFactoryIdentifier,
                                     &layersId,
                                     &success);
@@ -842,7 +840,7 @@
       info = ShowInfo(name, allowFullscreen, isPrivate, mDPI, mDefaultScale.scale);
     }
 
-    unused << SendShow(size, info, scrolling, textureFactoryIdentifier,
+    unused << SendShow(size, info, textureFactoryIdentifier,
                        layersId, renderFrame, aParentIsActive);
 }
 
@@ -1160,23 +1158,21 @@
   return SendRealMouseButtonEvent(event);
 }
 
-CSSPoint TabParent::AdjustTapToChildWidget(const CSSPoint& aPoint)
+LayoutDeviceToCSSScale
+TabParent::GetLayoutDeviceToCSSScale()
 {
   nsCOMPtr<nsIContent> content = do_QueryInterface(mFrameElement);
+  nsIDocument* doc = (content ? content->OwnerDoc() : nullptr);
+  nsIPresShell* shell = (doc ? doc->GetShell() : nullptr);
+  nsPresContext* ctx = (shell ? shell->GetPresContext() : nullptr);
+  return LayoutDeviceToCSSScale(ctx
+    ? (float)ctx->AppUnitsPerDevPixel() / nsPresContext::AppUnitsPerCSSPixel()
+    : 0.0f);
+}
 
-  if (!content || !content->OwnerDoc()) {
-    return aPoint;
-  }
-
-  nsIDocument* doc = content->OwnerDoc();
-  if (!doc || !doc->GetShell()) {
-    return aPoint;
-  }
-  nsPresContext* presContext = doc->GetShell()->GetPresContext();
-
-  return aPoint + CSSPoint(
-    presContext->DevPixelsToFloatCSSPixels(mChildProcessOffsetAtTouchStart.x),
-    presContext->DevPixelsToFloatCSSPixels(mChildProcessOffsetAtTouchStart.y));
+CSSPoint TabParent::AdjustTapToChildWidget(const CSSPoint& aPoint)
+{
+  return aPoint + (LayoutDevicePoint(mChildProcessOffsetAtTouchStart) * GetLayoutDeviceToCSSScale());
 }
 
 bool TabParent::SendHandleSingleTap(const CSSPoint& aPoint, const ScrollableLayerGuid& aGuid)
@@ -1759,6 +1755,18 @@
   return true;
 }
 
+NS_IMETHODIMP
+TabParent::GetChildProcessOffset(int32_t* aOutCssX, int32_t* aOutCssY)
+{
+  NS_ENSURE_ARG(aOutCssX);
+  NS_ENSURE_ARG(aOutCssY);
+  CSSPoint offset = LayoutDevicePoint(GetChildProcessOffset())
+      * GetLayoutDeviceToCSSScale();
+  *aOutCssX = offset.x;
+  *aOutCssY = offset.y;
+  return NS_OK;
+}
+
 LayoutDeviceIntPoint
 TabParent::GetChildProcessOffset()
 {
@@ -2094,6 +2102,33 @@
 }
 
 bool
+TabParent::RecvStartPluginIME(const WidgetKeyboardEvent& aKeyboardEvent,
+                              const int32_t& aPanelX, const int32_t& aPanelY,
+                              nsString* aCommitted)
+{
+  nsCOMPtr<nsIWidget> widget = GetWidget();
+  if (!widget) {
+    return true;
+  }
+  widget->StartPluginIME(aKeyboardEvent,
+                         (int32_t&)aPanelX, 
+                         (int32_t&)aPanelY,
+                         *aCommitted);
+  return true;
+}
+
+bool
+TabParent::RecvSetPluginFocused(const bool& aFocused)
+{
+  nsCOMPtr<nsIWidget> widget = GetWidget();
+  if (!widget) {
+    return true;
+  }
+  widget->SetPluginFocused((bool&)aFocused);
+  return true;
+}
+
+bool
 TabParent::RecvGetInputContext(int32_t* aIMEEnabled,
                                int32_t* aIMEOpen,
                                intptr_t* aNativeIMEContext)
@@ -2297,14 +2332,12 @@
 {
   MOZ_ASSERT(ManagedPRenderFrameParent().IsEmpty());
   nsRefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
-  ScrollingBehavior scrolling = UseAsyncPanZoom() ? ASYNC_PAN_ZOOM : DEFAULT_SCROLLING;
   TextureFactoryIdentifier textureFactoryIdentifier;
   uint64_t layersId = 0;
   bool success = false;
   if(frameLoader) {
     PRenderFrameParent* renderFrame = 
       new RenderFrameParent(frameLoader,
-                            scrolling,
                             &textureFactoryIdentifier,
                             &layersId,
                             &success);
@@ -2325,12 +2358,10 @@
 
 bool
 TabParent::RecvGetRenderFrameInfo(PRenderFrameParent* aRenderFrame,
-                                  ScrollingBehavior* aScrolling,
                                   TextureFactoryIdentifier* aTextureFactoryIdentifier,
                                   uint64_t* aLayersId)
 {
   RenderFrameParent* renderFrame = static_cast<RenderFrameParent*>(aRenderFrame);
-  *aScrolling = renderFrame->UseAsyncPanZoom() ? ASYNC_PAN_ZOOM : DEFAULT_SCROLLING;
   renderFrame->GetTextureFactoryIdentifier(aTextureFactoryIdentifier);
   *aLayersId = renderFrame->GetLayersId();
   return true;
@@ -2392,14 +2423,6 @@
   return widget.forget();
 }
 
-bool
-TabParent::UseAsyncPanZoom()
-{
-  bool usingOffMainThreadCompositing = !!CompositorParent::CompositorLoop();
-  return (usingOffMainThreadCompositing && gfxPrefs::AsyncPanZoomEnabled() &&
-          GetScrollingBehavior() == ASYNC_PAN_ZOOM);
-}
-
 void
 TabParent::ApzAwareEventRoutingToChild(ScrollableLayerGuid* aOutTargetGuid,
                                        uint64_t* aOutInputBlockId)
@@ -2581,7 +2604,7 @@
 NS_IMETHODIMP
 TabParent::GetUseAsyncPanZoom(bool* useAsyncPanZoom)
 {
-  *useAsyncPanZoom = UseAsyncPanZoom();
+  *useAsyncPanZoom = gfxPrefs::AsyncPanZoomEnabled();
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/TabParent.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/TabParent.h	2015-02-28 15:03:08.000000000 +0000
@@ -66,7 +66,6 @@
                 , public TabContext
 {
     typedef mozilla::dom::ClonedMessageData ClonedMessageData;
-    typedef mozilla::layout::ScrollingBehavior ScrollingBehavior;
 
     virtual ~TabParent();
 
@@ -192,6 +191,11 @@
     virtual bool RecvEndIMEComposition(const bool& aCancel,
                                        bool* aNoCompositionEvent,
                                        nsString* aComposition) MOZ_OVERRIDE;
+    virtual bool RecvStartPluginIME(const WidgetKeyboardEvent& aKeyboardEvent,
+                                    const int32_t& aPanelX,
+                                    const int32_t& aPanelY,
+                                    nsString* aCommitted) MOZ_OVERRIDE;
+    virtual bool RecvSetPluginFocused(const bool& aFocused) MOZ_OVERRIDE;
     virtual bool RecvGetInputContext(int32_t* aIMEEnabled,
                                      int32_t* aIMEOpen,
                                      intptr_t* aNativeIMEContext) MOZ_OVERRIDE;
@@ -264,6 +268,7 @@
     bool MapEventCoordinatesForChildProcess(mozilla::WidgetEvent* aEvent);
     void MapEventCoordinatesForChildProcess(const LayoutDeviceIntPoint& aOffset,
                                             mozilla::WidgetEvent* aEvent);
+    LayoutDeviceToCSSScale GetLayoutDeviceToCSSScale();
 
     virtual bool RecvRequestNativeKeyBindings(const mozilla::WidgetKeyboardEvent& aEvent,
                                               MaybeNativeKeyBinding* aBindings) MOZ_OVERRIDE;
@@ -394,7 +399,6 @@
     virtual bool RecvRemotePaintIsReady() MOZ_OVERRIDE;
 
     virtual bool RecvGetRenderFrameInfo(PRenderFrameParent* aRenderFrame,
-                                        ScrollingBehavior* aScrolling,
                                         TextureFactoryIdentifier* aTextureFactoryIdentifier,
                                         uint64_t* aLayersId) MOZ_OVERRIDE;
 
@@ -447,9 +451,6 @@
 
     CSSPoint AdjustTapToChildWidget(const CSSPoint& aPoint);
 
-    // When true, we create a pan/zoom controller for our frame and
-    // notify it of input events targeting us.
-    bool UseAsyncPanZoom();
     // Update state prior to routing an APZ-aware event to the child process.
     // |aOutTargetGuid| will contain the identifier
     // of the APZC instance that handled the event. aOutTargetGuid may be
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/tests/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/tests/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/tests/mochitest.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/tests/mochitest.ini	2015-02-28 15:03:08.000000000 +0000
@@ -4,6 +4,8 @@
 [test_blob_sliced_from_parent_process.html]
 # This test is only supposed to run in the main process.
 skip-if = buildapp == 'b2g' || buildapp == 'mulet' || e10s
+[test_cpow_cookies.html]
+skip-if = buildapp == 'b2g' || buildapp == 'mulet'
 [test_NuwaProcessCreation.html]
 skip-if = toolkit != 'gonk'
 [test_NuwaProcessDeadlock.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/tests/test_cpow_cookies.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/tests/test_cpow_cookies.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/ipc/tests/test_cpow_cookies.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/ipc/tests/test_cpow_cookies.html	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for recursive CPOW-getting-cookie bug</title>
+  <script type="application/javascript"
+          src="/tests/SimpleTest/SimpleTest.js">
+  </script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+
+  <script type="application/javascript;version=1.8">
+    "use strict";
+
+    SimpleTest.waitForExplicitFinish();
+
+    const childFrameURL =
+      "data:text/html,<!DOCTYPE HTML><html><body></body></html>";
+
+    function childFrameScript() {
+      "use strict";
+
+      const Ci = Components.interfaces;
+
+      function test1(message) {
+        // NB: This is a no-op because we're a data: document with a null
+        // principal.
+        content.document.cookie = "a=b";
+        message.target.sendAsyncMessage("testCPOWCookies:test1Finished", { pass: true });
+      }
+
+      addMessageListener("testCPOWCookies:test1", function(message) {
+        test1(message);
+      });
+    }
+
+    let test;
+    function* testStructure(mm) {
+      let lastResult;
+
+      function testDone(msg) {
+        test.next(msg.data);
+      }
+
+      mm.addMessageListener("testCPOWCookies:test1Finished", testDone);
+
+      mm.sendAsyncMessage("testCPOWCookies:test1", {});
+      lastResult = yield;
+      ok(lastResult.pass, "got the right answer and didn't crash");
+
+      SimpleTest.finish();
+    }
+
+    function runTests() {
+      info("Browser prefs set.");
+
+      let iframe = document.createElement("iframe");
+      SpecialPowers.wrap(iframe).mozbrowser = true;
+      iframe.id = "iframe";
+      iframe.src = childFrameURL;
+
+      iframe.addEventListener("mozbrowserloadend", function() {
+        info("Got iframe load event.");
+        let mm = SpecialPowers.getBrowserFrameMessageManager(iframe);
+        mm.loadFrameScript("data:,(" + encodeURI(childFrameScript.toString()) + ")();",
+                           false);
+
+        test = testStructure(mm);
+        test.next();
+      });
+
+      document.body.appendChild(iframe);
+    }
+
+    addEventListener("load", function() {
+      info("Got load event.");
+
+      SpecialPowers.addPermission("browser", true, document);
+      SpecialPowers.pushPrefEnv({
+        "set": [
+          ["dom.ipc.browser_frames.oop_by_default", true],
+          ["dom.mozBrowserFramesEnabled", true],
+          ["browser.pagethumbnails.capturing_disabled", true]
+        ]
+      }, runTests);
+    });
+  </script>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/locales/en-US/chrome/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/locales/en-US/chrome/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/locales/en-US/chrome/appstrings.properties	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/locales/en-US/chrome/appstrings.properties	2015-02-28 15:03:08.000000000 +0000
@@ -33,3 +33,4 @@
 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.
+sslv3Used=The safety of your data on %S could not be guaranteed because it uses SSLv3, a broken security protocol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/locales/en-US/chrome/dom/dom.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/locales/en-US/chrome/dom/dom.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/locales/en-US/chrome/dom/dom.properties	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/locales/en-US/chrome/dom/dom.properties	2015-02-28 15:03:08.000000000 +0000
@@ -153,8 +153,6 @@
 ImplicitMetaViewportTagFallback=No meta-viewport tag found. Please explicitly specify one to prevent unexpected behavioural changes in future versions. For more help https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag
 # LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
 DataContainerEventWarning=Use of DataContainerEvent is deprecated. Use CustomEvent instead.
-# LOCALIZATION NOTE: Do not translate "sendAsBinary" or "send(Blob data)"
-SendAsBinaryWarning=The non-standard sendAsBinary method is deprecated and will soon be removed. Use the standard send(Blob data) method instead.
 # LOCALIZATION NOTE: Do not translate "window.controllers"
 Window_ControllersWarning=window.controllers is deprecated. Do not use it for UA detection.
 ImportXULIntoContentWarning=Importing XUL nodes into a content document is deprecated. This functionality may be removed soon.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/locales/en-US/chrome/plugins.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/locales/en-US/chrome/plugins.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/locales/en-US/chrome/plugins.properties	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/locales/en-US/chrome/plugins.properties	2015-02-28 15:03:08.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (plugins.properties):
-#    Those strings are inserted into an HTML page, so you all HTML characters
+#    Those strings are inserted into an HTML page, so all HTML characters
 #    have to be escaped in a way that they show up correctly in HTML!
 
 title_label=About Plugins
@@ -21,6 +21,8 @@
 suffixes_label=Suffixes
 
 # GMP Plugins
+gmp_license_info=License information
+
 openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc.
 openH264_description=Play back web video and use video chats.
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/DOMMediaStream.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/DOMMediaStream.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/DOMMediaStream.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/DOMMediaStream.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -5,6 +5,8 @@
 
 #include "DOMMediaStream.h"
 #include "nsContentUtils.h"
+#include "nsServiceManagerUtils.h"
+#include "nsIUUIDGenerator.h"
 #include "mozilla/dom/MediaStreamBinding.h"
 #include "mozilla/dom/LocalMediaStreamBinding.h"
 #include "mozilla/dom/AudioNode.h"
@@ -146,6 +148,20 @@
     mStream(nullptr), mHintContents(0), mTrackTypesAvailable(0),
     mNotifiedOfMediaStreamGraphShutdown(false), mCORSMode(CORS_NONE)
 {
+  nsresult rv;
+  nsCOMPtr<nsIUUIDGenerator> uuidgen =
+    do_GetService("@mozilla.org/uuid-generator;1", &rv);
+
+  if (NS_SUCCEEDED(rv) && uuidgen) {
+    nsID uuid;
+    memset(&uuid, 0, sizeof(uuid));
+    rv = uuidgen->GenerateUUIDInPlace(&uuid);
+    if (NS_SUCCEEDED(rv)) {
+      char buffer[NSID_LENGTH];
+      uuid.ToProvidedString(buffer);
+      mID = NS_ConvertASCIItoUTF16(buffer);
+    }
+  }
 }
 
 DOMMediaStream::~DOMMediaStream()
@@ -183,6 +199,12 @@
 }
 
 void
+DOMMediaStream::GetId(nsAString& aID) const
+{
+  aID = mID;
+}
+
+void
 DOMMediaStream::GetAudioTracks(nsTArray<nsRefPtr<AudioStreamTrack> >& aTracks)
 {
   for (uint32_t i = 0; i < mTracks.Length(); ++i) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/DOMMediaStream.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/DOMMediaStream.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/DOMMediaStream.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/DOMMediaStream.h	2015-02-28 15:03:08.000000000 +0000
@@ -95,6 +95,8 @@
   // WebIDL
   double CurrentTime();
 
+  void GetId(nsAString& aID) const;
+
   void GetAudioTracks(nsTArray<nsRefPtr<AudioStreamTrack> >& aTracks);
   void GetVideoTracks(nsTArray<nsRefPtr<VideoStreamTrack> >& aTracks);
   void GetTracks(nsTArray<nsRefPtr<MediaStreamTrack> >& aTracks);
@@ -178,6 +180,10 @@
    */
   void NotifyStreamStateChanged();
 
+  // Webrtc allows the remote side to name a stream whatever it wants, and we
+  // need to surface this to content.
+  void AssignId(const nsAString& aID) { mID = aID; }
+
   // Indicate what track types we eventually expect to add to this stream
   enum {
     HINT_CONTENTS_AUDIO = 1 << 0,
@@ -293,6 +299,8 @@
 
   nsTArray<nsAutoPtr<OnTracksAvailableCallback> > mRunOnTracksAvailable;
 
+  nsString mID;
+
   // Keep these alive until the stream finishes
   nsTArray<nsCOMPtr<nsISupports> > mConsumersToKeepAlive;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/CDMCallbackProxy.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/CDMCallbackProxy.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/CDMCallbackProxy.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/CDMCallbackProxy.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -13,7 +13,7 @@
 #include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
 #include "MainThreadUtils.h"
-#include "EMELog.h"
+#include "mozilla/EMEUtils.h"
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/CDMCaps.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/CDMCaps.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/CDMCaps.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/CDMCaps.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -4,8 +4,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 "CDMCaps.h"
-#include "EMELog.h"
+#include "mozilla/CDMCaps.h"
+#include "mozilla/EMEUtils.h"
 #include "nsThreadUtils.h"
 #include "SamplesWaitingForKey.h"
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/CDMProxy.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/CDMProxy.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/CDMProxy.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/CDMProxy.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -12,7 +12,7 @@
 #include "nsContentCID.h"
 #include "nsServiceManagerUtils.h"
 #include "MainThreadUtils.h"
-#include "mozilla/EMELog.h"
+#include "mozilla/EMEUtils.h"
 #include "nsIConsoleService.h"
 #include "prenv.h"
 #include "mozilla/PodOperations.h"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMELog.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMELog.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMELog.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMELog.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/* -*- 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 "EMELog.h"
-
-namespace mozilla {
-
-#ifdef PR_LOGGING
-
-PRLogModuleInfo* GetEMELog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("EME");
-  }
-  return log;
-}
-
-PRLogModuleInfo* GetEMEVerboseLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("EMEV");
-  }
-  return log;
-}
-
-#endif
-
-} // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMELog.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMELog.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMELog.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMELog.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* -*- 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 EME_LOG_H_
-#define EME_LOG_H_
-
-#include "prlog.h"
-
-namespace mozilla {
-
-#ifdef PR_LOGGING
-
-  #ifndef EME_LOG
-    PRLogModuleInfo* GetEMELog();
-    #define EME_LOG(...) PR_LOG(GetEMELog(), PR_LOG_DEBUG, (__VA_ARGS__))
-  #endif
-
-  #ifndef EME_VERBOSE_LOG
-    PRLogModuleInfo* GetEMEVerboseLog();
-    #define EME_VERBOSE_LOG(...) PR_LOG(GetEMEVerboseLog(), PR_LOG_DEBUG, (__VA_ARGS__))
-  #else
-    #ifndef EME_LOG
-      #define EME_LOG(...)
-    #endif
-
-    #ifndef EME_VERBOSE_LOG
-      #define EME_VERBOSE_LOG(...)
-    #endif
-  #endif
-
-#else
-
-  #ifndef EME_LOG
-    #define EME_LOG(...)
-  #endif
-
-  #ifndef EME_VERBOSE_LOG
-    #define EME_VERBOSE_LOG(...)
-  #endif
-
-#endif // PR_LOGGING
-
-} // namespace mozilla
-
-#endif // EME_LOG_H_
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMEUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMEUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMEUtils.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMEUtils.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,116 @@
+/* -*- 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/EMEUtils.h"
+
+namespace mozilla {
+
+#ifdef PR_LOGGING
+
+PRLogModuleInfo* GetEMELog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("EME");
+  }
+  return log;
+}
+
+PRLogModuleInfo* GetEMEVerboseLog() {
+  static PRLogModuleInfo* log = nullptr;
+  if (!log) {
+    log = PR_NewLogModule("EMEV");
+  }
+  return log;
+}
+
+#endif
+
+static bool
+ContainsOnlyDigits(const nsAString& aString)
+{
+  nsAString::const_iterator iter, end;
+  aString.BeginReading(iter);
+  aString.EndReading(end);
+  while (iter != end) {
+    char16_t ch = *iter;
+    if (ch < '0' || ch > '9') {
+      return false;
+    }
+    iter++;
+  }
+  return true;
+}
+
+static bool
+ParseKeySystem(const nsAString& aExpectedKeySystem,
+               const nsAString& aInputKeySystem,
+               int32_t& aOutCDMVersion)
+{
+  if (!StringBeginsWith(aInputKeySystem, aExpectedKeySystem)) {
+    return false;
+  }
+
+  if (aInputKeySystem.Length() > aExpectedKeySystem.Length() + 8) {
+    // Allow up to 8 bytes for the ".version" field. 8 bytes should
+    // be enough for any versioning scheme...
+    NS_WARNING("Input KeySystem including was suspiciously long");
+    return false;
+  }
+
+  const char16_t* versionStart = aInputKeySystem.BeginReading() + aExpectedKeySystem.Length();
+  const char16_t* end = aInputKeySystem.EndReading();
+  if (versionStart == end) {
+    // No version supplied with keysystem.
+    aOutCDMVersion = NO_CDM_VERSION;
+    return true;
+  }
+  if (*versionStart != '.') {
+    // version not in correct format.
+    NS_WARNING("EME keySystem version string not prefixed by '.'");
+    return false;
+  }
+  versionStart++;
+  const nsAutoString versionStr(Substring(versionStart, end));
+  if (!ContainsOnlyDigits(versionStr)) {
+    NS_WARNING("Non-digit character in EME keySystem string's version suffix");
+    return false;
+  }
+  nsresult rv;
+  int32_t version = versionStr.ToInteger(&rv);
+  if (NS_FAILED(rv) || version < 0) {
+    NS_WARNING("Invalid version in EME keySystem string");
+    return false;
+  }
+  aOutCDMVersion = version;
+
+  return true;
+}
+
+static const char16_t* sKeySystems[] = {
+  MOZ_UTF16("org.w3.clearkey"),
+  MOZ_UTF16("com.adobe.access"),
+  MOZ_UTF16("com.adobe.primetime"),
+};
+
+bool
+ParseKeySystem(const nsAString& aInputKeySystem,
+               nsAString& aOutKeySystem,
+               int32_t& aOutCDMVersion)
+{
+  for (const char16_t* keySystem : sKeySystems) {
+    int32_t minCDMVersion = NO_CDM_VERSION;
+    if (ParseKeySystem(nsDependentString(keySystem),
+                       aInputKeySystem,
+                       minCDMVersion)) {
+      aOutKeySystem = keySystem;
+      aOutCDMVersion = minCDMVersion;
+      return true;
+    }
+  }
+  return false;
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMEUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMEUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/EMEUtils.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/EMEUtils.h	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,69 @@
+/* -*- 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 EME_LOG_H_
+#define EME_LOG_H_
+
+#include "prlog.h"
+#include "nsString.h"
+
+namespace mozilla {
+
+#ifdef PR_LOGGING
+
+  #ifndef EME_LOG
+    PRLogModuleInfo* GetEMELog();
+    #define EME_LOG(...) PR_LOG(GetEMELog(), PR_LOG_DEBUG, (__VA_ARGS__))
+  #endif
+
+  #ifndef EME_VERBOSE_LOG
+    PRLogModuleInfo* GetEMEVerboseLog();
+    #define EME_VERBOSE_LOG(...) PR_LOG(GetEMEVerboseLog(), PR_LOG_DEBUG, (__VA_ARGS__))
+  #else
+    #ifndef EME_LOG
+      #define EME_LOG(...)
+    #endif
+
+    #ifndef EME_VERBOSE_LOG
+      #define EME_VERBOSE_LOG(...)
+    #endif
+  #endif
+
+#else
+
+  #ifndef EME_LOG
+    #define EME_LOG(...)
+  #endif
+
+  #ifndef EME_VERBOSE_LOG
+    #define EME_VERBOSE_LOG(...)
+  #endif
+
+#endif // PR_LOGGING
+
+#define NO_CDM_VERSION -1
+
+// Checks a keySystem string against a whitelist, and determines whether
+// the keySystem is in the whitelist, and extracts the requested minimum
+// CDM version.
+//
+// Format of EME keysystems:
+// com.domain.keysystem[.minVersionAsInt]
+// i.e. org.w3.clearkey, com.adobe.primetime.7
+//
+// Returns true if aKeySystem contains a valid keySystem which we support,
+// false otherwise.
+//
+// On success, aOutKeySystem contains the keySystem string stripped of the
+// min version number, and aOutMinCDMVersion contains the min version number
+// if present. If it was not present, aOutMinCDMVersion is NO_CDM_VERSION.
+bool ParseKeySystem(const nsAString& aKeySystem,
+                    nsAString& aOutKeySystem,
+                    int32_t& aOutMinCDMVersion);
+
+} // namespace mozilla
+
+#endif // EME_LOG_H_
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/MediaKeys.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/MediaKeys.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/MediaKeys.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/MediaKeys.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -13,7 +13,7 @@
 #include "mozilla/dom/DOMException.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/CDMProxy.h"
-#include "mozilla/EMELog.h"
+#include "mozilla/EMEUtils.h"
 #include "nsContentUtils.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "mozilla/Preferences.h"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/MediaKeySystemAccess.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/MediaKeySystemAccess.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/MediaKeySystemAccess.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/MediaKeySystemAccess.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -20,6 +20,7 @@
 #include "VideoUtils.h"
 #include "mozilla/Services.h"
 #include "nsIObserverService.h"
+#include "mozilla/EMEUtils.h"
 
 namespace mozilla {
 namespace dom {
@@ -80,8 +81,6 @@
   if (!aTag.IsEmpty()) {
     tags.AppendElement(aTag);
   }
-  // Note: EME plugins need a non-null nodeId here, as they must
-  // not be shared across origins.
   bool hasPlugin = false;
   if (NS_FAILED(aGMPService->HasPluginForAPI(aAPI,
                                              &tags,
@@ -91,9 +90,37 @@
   return hasPlugin;
 }
 
+static MediaKeySystemStatus
+EnsureMinCDMVersion(mozIGeckoMediaPluginService* aGMPService,
+                    const nsAString& aKeySystem,
+                    int32_t aMinCdmVersion)
+{
+  if (aMinCdmVersion == NO_CDM_VERSION) {
+    return MediaKeySystemStatus::Available;
+  }
+
+  nsTArray<nsCString> tags;
+  tags.AppendElement(NS_ConvertUTF16toUTF8(aKeySystem));
+  nsAutoCString versionStr;
+  if (NS_FAILED(aGMPService->GetPluginVersionForAPI(NS_LITERAL_CSTRING(GMP_API_DECRYPTOR),
+                                                    &tags,
+                                                    versionStr))) {
+    return MediaKeySystemStatus::Error;
+  }
+
+  nsresult rv;
+  int32_t version = versionStr.ToInteger(&rv);
+  if (NS_FAILED(rv) || version < 0 || aMinCdmVersion > version) {
+    return MediaKeySystemStatus::Cdm_insufficient_version;
+  }
+
+  return MediaKeySystemStatus::Available;
+}
+
 /* static */
 MediaKeySystemStatus
-MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem)
+MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem,
+                                         int32_t aMinCdmVersion)
 {
   MOZ_ASSERT(Preferences::GetBool("media.eme.enabled", false));
   nsCOMPtr<mozIGeckoMediaPluginService> mps =
@@ -111,7 +138,7 @@
                     NS_LITERAL_CSTRING(GMP_API_DECRYPTOR))) {
       return MediaKeySystemStatus::Cdm_not_installed;
     }
-    return MediaKeySystemStatus::Available;
+    return EnsureMinCDMVersion(mps, aKeySystem, aMinCdmVersion);
   }
 
 #ifdef XP_WIN
@@ -129,7 +156,7 @@
                     NS_LITERAL_CSTRING(GMP_API_DECRYPTOR))) {
       return MediaKeySystemStatus::Cdm_not_installed;
     }
-    return MediaKeySystemStatus::Available;
+    return EnsureMinCDMVersion(mps, aKeySystem, aMinCdmVersion);
   }
 #endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/MediaKeySystemAccess.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/MediaKeySystemAccess.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/MediaKeySystemAccess.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/MediaKeySystemAccess.h	2015-02-28 15:03:08.000000000 +0000
@@ -44,7 +44,8 @@
 
   already_AddRefed<Promise> CreateMediaKeys(ErrorResult& aRv);
 
-  static MediaKeySystemStatus GetKeySystemStatus(const nsAString& aKeySystem);
+  static MediaKeySystemStatus GetKeySystemStatus(const nsAString& aKeySystem,
+                                                 int32_t aMinCdmVersion);
 
   static bool IsSupported(const nsAString& aKeySystem,
                           const Sequence<MediaKeySystemOptions>& aOptions);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/eme/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/eme/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -18,14 +18,14 @@
     'CDMCallbackProxy.h',
     'CDMCaps.h',
     'CDMProxy.h',
-    'EMELog.h'
+    'EMEUtils.h'
 ]
 
 UNIFIED_SOURCES += [
     'CDMCallbackProxy.cpp',
     'CDMCaps.cpp',
     'CDMProxy.cpp',
-    'EMELog.cpp',
+    'EMEUtils.cpp',
     'MediaEncryptedEvent.cpp',
     'MediaKeyError.cpp',
     'MediaKeyMessageEvent.cpp',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/android/AndroidDecoderModule.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -205,7 +205,7 @@
     jni::Object::LocalRef buffer(env);
     NS_ENSURE_SUCCESS_VOID(aFormat->GetByteBuffer(NS_LITERAL_STRING("csd-0"), &buffer));
 
-    if (!buffer) {
+    if (!buffer && aConfig.audio_specific_config->Length() >= 2) {
       csd0[0] = (*aConfig.audio_specific_config)[0];
       csd0[1] = (*aConfig.audio_specific_config)[1];
 
@@ -364,6 +364,29 @@
     break; \
   }
 
+nsresult MediaCodecDataDecoder::GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer)
+{
+  bool retried = false;
+  while (!*buffer) {
+    *buffer = jni::Object::LocalRef::Adopt(env->GetObjectArrayElement(mInputBuffers.Get(), index));
+    if (!*buffer) {
+      if (!retried) {
+        // Reset the input buffers and then try again
+        nsresult res = ResetInputBuffers();
+        if (NS_FAILED(res)) {
+          return res;
+        }
+        retried = true;
+      } else {
+        // We already tried resetting the input buffers, return an error
+        return NS_ERROR_FAILURE;
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
 void MediaCodecDataDecoder::DecoderLoop()
 {
   bool outputDone = false;
@@ -433,8 +456,10 @@
       HANDLE_DECODER_ERROR();
 
       if (inputIndex >= 0) {
-        auto buffer = jni::Object::LocalRef::Adopt(
-            frame.GetEnv()->GetObjectArrayElement(mInputBuffers.Get(), inputIndex));
+        jni::Object::LocalRef buffer(frame.GetEnv());
+        res = GetInputBuffer(frame.GetEnv(), inputIndex, &buffer);
+        HANDLE_DECODER_ERROR();
+
         void* directBuffer = frame.GetEnv()->GetDirectBufferAddress(buffer.Get());
 
         MOZ_ASSERT(frame.GetEnv()->GetDirectBufferCapacity(buffer.Get()) >= sample->size,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/android/AndroidDecoderModule.h	2015-02-28 15:03:08.000000000 +0000
@@ -92,6 +92,7 @@
   nsresult ResetOutputBuffers();
 
   void DecoderLoop();
+  nsresult GetInputBuffer(JNIEnv* env, int index, jni::Object::LocalRef* buffer);
   virtual void ClearQueue();
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleDecoderModule.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -64,7 +64,7 @@
   bool haveVideoToolbox = AppleVTLinker::Link();
   sIsVTAvailable = haveCoreMedia && haveVideoToolbox;
 
-  sIsVTHWAvailable = AppleVTLinker::skPropHWAccel != nullptr;
+  sIsVTHWAvailable = AppleVTLinker::skPropEnableHWAccel != nullptr;
 
   if (sIsVDAAvailable) {
     AppleVDALinker::Unlink();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTDecoder.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -305,6 +305,20 @@
     return NS_ERROR_FAILURE;
   }
 
+  if (AppleVTLinker::skPropUsingHWAccel) {
+    CFBooleanRef isUsingHW = nullptr;
+    rv = VTSessionCopyProperty(mSession,
+                               AppleVTLinker::skPropUsingHWAccel,
+                               kCFAllocatorDefault,
+                               &isUsingHW);
+    if (rv != noErr) {
+      LOG("AppleVTDecoder: system doesn't support hardware acceleration");
+    }
+    LOG("AppleVTDecoder: %s hardware accelerated decoding",
+        (rv == noErr && isUsingHW == kCFBooleanTrue) ? "using" : "not using");
+  } else {
+    LOG("AppleVTDecoder: couldn't determine hardware acceleration status.");
+  }
   return NS_OK;
 }
 
@@ -356,11 +370,11 @@
 CFDictionaryRef
 AppleVTDecoder::CreateDecoderSpecification()
 {
-  if (!AppleVTLinker::skPropHWAccel) {
+  if (!AppleVTLinker::skPropEnableHWAccel) {
     return nullptr;
   }
 
-  const void* specKeys[] = { AppleVTLinker::skPropHWAccel };
+  const void* specKeys[] = { AppleVTLinker::skPropEnableHWAccel };
   const void* specValues[] = { kCFBooleanTrue };
   static_assert(ArrayLength(specKeys) == ArrayLength(specValues),
                 "Non matching keys/values array size");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTFunctions.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTFunctions.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTFunctions.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTFunctions.h	2015-02-28 15:03:08.000000000 +0000
@@ -10,3 +10,5 @@
 LINK_FUNC(VTDecompressionSessionDecodeFrame)
 LINK_FUNC(VTDecompressionSessionInvalidate)
 LINK_FUNC(VTDecompressionSessionWaitForAsynchronousFrames)
+LINK_FUNC(VTSessionCopyProperty)
+LINK_FUNC(VTSessionCopySupportedPropertyDictionary)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTLinker.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTLinker.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTLinker.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTLinker.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -25,7 +25,8 @@
 
 void* AppleVTLinker::sLink = nullptr;
 nsrefcnt AppleVTLinker::sRefCount = 0;
-CFStringRef AppleVTLinker::skPropHWAccel = nullptr;
+CFStringRef AppleVTLinker::skPropEnableHWAccel = nullptr;
+CFStringRef AppleVTLinker::skPropUsingHWAccel = nullptr;
 
 #define LINK_FUNC(func) typeof(func) func;
 #include "AppleVTFunctions.h"
@@ -69,8 +70,10 @@
 #undef LINK_FUNC
 
   // Will only resolve in 10.9 and later.
-  skPropHWAccel =
+  skPropEnableHWAccel =
     GetIOConst("kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder");
+  skPropUsingHWAccel =
+    GetIOConst("kVTDecompressionPropertyKey_UsingHardwareAcceleratedVideoDecoder");
 
   LOG("Loaded VideoToolbox framework.");
   sLinkStatus = LinkStatus_SUCCEEDED;
@@ -97,7 +100,8 @@
     LOG("Unlinking VideoToolbox framework.");
     dlclose(sLink);
     sLink = nullptr;
-    skPropHWAccel = nullptr;
+    skPropEnableHWAccel = nullptr;
+    skPropUsingHWAccel = nullptr;
     sLinkStatus = LinkStatus_INIT;
   }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTLinker.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTLinker.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/AppleVTLinker.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/AppleVTLinker.h	2015-02-28 15:03:08.000000000 +0000
@@ -22,7 +22,8 @@
 public:
   static bool Link();
   static void Unlink();
-  static CFStringRef skPropHWAccel;
+  static CFStringRef skPropEnableHWAccel;
+  static CFStringRef skPropUsingHWAccel;
 
 private:
   static void* sLink;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h	2015-02-28 15:03:08.000000000 +0000
@@ -26,6 +26,7 @@
   kVTDecodeInfo_FrameDropped = 1UL << 1,
 };
 
+typedef CFTypeRef VTSessionRef;
 typedef struct OpaqueVTDecompressionSession* VTDecompressionSessionRef;
 typedef void (*VTDecompressionOutputCallback)(
     void*,
@@ -70,4 +71,18 @@
     VTDecompressionSessionRef
 );
 
+OSStatus
+VTSessionCopyProperty(
+    VTSessionRef,
+    CFStringRef,
+    CFAllocatorRef,
+    void*
+);
+
+OSStatus
+VTSessionCopySupportedPropertyDictionary(
+    VTSessionRef,
+    CFDictionaryRef*
+);
+
 #endif // mozilla_VideoToolbox_VideoToolbox_h
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -247,4 +247,14 @@
   }
 }
 
+nsresult
+GonkAudioDecoderManager::Flush()
+{
+  GonkDecoderManager::Flush();
+  status_t err = mDecoder->flush();
+  if (err != OK) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
 } // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/gonk/GonkAudioDecoderManager.h	2015-02-28 15:03:08.000000000 +0000
@@ -32,6 +32,8 @@
   virtual nsresult Output(int64_t aStreamOffset,
                           nsRefPtr<MediaData>& aOutput) MOZ_OVERRIDE;
 
+  virtual nsresult Flush() MOZ_OVERRIDE;
+
 protected:
   virtual bool PerformFormatSpecificProcess(mp4_demuxer::MP4Sample* aSample) MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -234,7 +234,7 @@
   // it's executing at all. Note the MP4Reader ignores all output while
   // flushing.
   mTaskQueue->Flush();
-
+  mDrainComplete = false;
   return mManager->Flush();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/SharedDecoderManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/SharedDecoderManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/SharedDecoderManager.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/SharedDecoderManager.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -196,8 +196,10 @@
 {
   if (mManager->mActiveProxy == this) {
     return mManager->mDecoder->Drain();
+  } else {
+    mCallback->DrainComplete();
+    return NS_OK;
   }
-  return NS_OK;
 }
 
 nsresult
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -234,6 +234,10 @@
 HRESULT
 WMFVideoMFTManager::Input(mp4_demuxer::MP4Sample* aSample)
 {
+  if (!mDecoder) {
+    // This can happen during shutdown.
+    return E_FAIL;
+  }
   if (mStreamType != VP8 && mStreamType != VP9) {
     // We must prepare samples in AVC Annex B.
     if (!mp4_demuxer::AnnexB::ConvertSampleToAnnexB(aSample)) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPParent.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPParent.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -1002,6 +1002,12 @@
   mNodeId = aNodeId;
 }
 
+const nsCString&
+GMPParent::GetVersion() const
+{
+  return mVersion;
+}
+
 bool
 GMPParent::RecvAsyncShutdownRequired()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPParent.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPParent.h	2015-02-28 15:03:08.000000000 +0000
@@ -115,6 +115,8 @@
   void SetNodeId(const nsACString& aNodeId);
   const nsACString& GetNodeId() const { return mNodeId; }
 
+  const nsCString& GetVersion() const;
+
   // Returns true if a plugin can be or is being used across multiple NodeIds.
   bool CanBeSharedCrossNodeIds() const;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPService.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPService.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -673,13 +673,34 @@
 };
 
 NS_IMETHODIMP
-GeckoMediaPluginService::HasPluginForAPI(const nsACString& aAPI,
-                                         nsTArray<nsCString>* aTags,
-                                         bool* aResult)
+GeckoMediaPluginService::GetPluginVersionForAPI(const nsACString& aAPI,
+                                                nsTArray<nsCString>* aTags,
+                                                nsACString& aOutVersion)
 {
   NS_ENSURE_ARG(aTags && aTags->Length() > 0);
-  NS_ENSURE_ARG(aResult);
 
+  nsresult rv = EnsurePluginsOnDiskScanned();
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to load GMPs from disk.");
+    return rv;
+  }
+
+  {
+    MutexAutoLock lock(mMutex);
+    nsCString api(aAPI);
+    GMPParent* gmp = FindPluginForAPIFrom(0, api, *aTags, nullptr);
+    if (!gmp) {
+      return NS_ERROR_FAILURE;
+    }
+    aOutVersion = gmp->GetVersion();
+  }
+
+  return NS_OK;
+}
+
+nsresult
+GeckoMediaPluginService::EnsurePluginsOnDiskScanned()
+{
   const char* env = nullptr;
   if (!mScannedPluginOnDisk && (env = PR_GetEnv("MOZ_GMP_PATH")) && *env) {
     // We have a MOZ_GMP_PATH environment variable which may specify the
@@ -693,11 +714,28 @@
     MOZ_ASSERT(mScannedPluginOnDisk, "Should have scanned MOZ_GMP_PATH by now");
   }
 
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+GeckoMediaPluginService::HasPluginForAPI(const nsACString& aAPI,
+                                         nsTArray<nsCString>* aTags,
+                                         bool* aOutHavePlugin)
+{
+  NS_ENSURE_ARG(aTags && aTags->Length() > 0);
+  NS_ENSURE_ARG(aOutHavePlugin);
+
+  nsresult rv = EnsurePluginsOnDiskScanned();
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to load GMPs from disk.");
+    return rv;
+  }
+
   {
     MutexAutoLock lock(mMutex);
     nsCString api(aAPI);
     GMPParent* gmp = FindPluginForAPIFrom(0, api, *aTags, nullptr);
-    *aResult = (gmp != nullptr);
+    *aOutHavePlugin = (gmp != nullptr);
   }
 
   return NS_OK;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPService.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPService.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/GMPService.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/GMPService.h	2015-02-28 15:03:08.000000000 +0000
@@ -90,6 +90,7 @@
   void ReAddOnGMPThread(nsRefPtr<GMPParent>& aOld);
 private:
   GMPParent* ClonePlugin(const GMPParent* aOriginal);
+  nsresult EnsurePluginsOnDiskScanned();
 
   class PathRunnable : public nsRunnable
   {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gmp/mozIGeckoMediaPluginService.idl	2015-02-28 15:03:08.000000000 +0000
@@ -26,7 +26,7 @@
 [ptr] native GMPDecryptorProxy(GMPDecryptorProxy);
 [ptr] native GMPAudioDecoderProxy(GMPAudioDecoderProxy);
 
-[scriptable, uuid(4aaf58d3-181f-4325-9a2f-41172d995a70)]
+[scriptable, uuid(56cc105f-dd27-4752-83e0-371908edba04)]
 interface mozIGeckoMediaPluginService : nsISupports
 {
 
@@ -43,6 +43,14 @@
   boolean hasPluginForAPI(in ACString api, in TagArray tags);
 
   /**
+   * Get the version of the plugin that supports the specified tags.
+   * Callable on any thread
+   */
+  [noscript]
+  ACString getPluginVersionForAPI(in ACString api,
+                                  in TagArray tags);
+
+  /**
    * Get a video decoder that supports the specified tags.
    * The array of tags should at least contain a codec tag, and optionally
    * other tags such as for EME keysystem.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gstreamer/GStreamerFormatHelper.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gstreamer/GStreamerFormatHelper.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gstreamer/GStreamerFormatHelper.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gstreamer/GStreamerFormatHelper.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -224,25 +224,15 @@
 }
 
 /* static */ bool
-GStreamerFormatHelper::IsPluginFeatureBlacklisted(GstPluginFeature *aFeature,
-                                                  FactoryType aTypes)
+GStreamerFormatHelper::IsPluginFeatureBlacklisted(GstPluginFeature *aFeature)
 {
   if (!IsBlacklistEnabled()) {
     return false;
   }
 
-  const gchar *className =
-    gst_element_factory_get_klass(GST_ELEMENT_FACTORY_CAST(aFeature));
-
   const gchar *factoryName =
     gst_plugin_feature_get_name(aFeature);
 
-  if ((!(aTypes & FactoryTypeDecoder) && strstr(className, "Decoder")) ||
-      (!(aTypes & FactoryTypeDemuxer) && strstr(className, "Demuxer")) ||
-      (!(aTypes & FactoryTypeParser) && strstr(className, "Parser"))) {
-    return false;
-  }
-
   for (unsigned int i = 0; i < G_N_ELEMENTS(sPluginBlacklist); i++) {
     if (!strcmp(factoryName, sPluginBlacklist[i])) {
       return true;
@@ -258,8 +248,16 @@
     return FALSE;
   }
 
-  return !GStreamerFormatHelper::IsPluginFeatureBlacklisted(aFeature,
-                                                            (FactoryType)(FactoryTypeDecoder|FactoryTypeDemuxer));
+  const gchar *className =
+    gst_element_factory_get_klass(GST_ELEMENT_FACTORY_CAST(aFeature));
+
+  if (!strstr(className, "Decoder") && !strstr(className, "Demux")) {
+    return FALSE;
+  }
+
+  return
+    gst_plugin_feature_get_rank(aFeature) >= GST_RANK_MARGINAL &&
+    !GStreamerFormatHelper::IsPluginFeatureBlacklisted(aFeature);
 }
 
 /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gstreamer/GStreamerFormatHelper.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gstreamer/GStreamerFormatHelper.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gstreamer/GStreamerFormatHelper.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gstreamer/GStreamerFormatHelper.h	2015-02-28 15:03:08.000000000 +0000
@@ -13,13 +13,6 @@
 
 namespace mozilla {
 
-enum FactoryType {
-  FactoryTypeDecoder  = 1 << 0,
-  FactoryTypeDemuxer  = 1 << 1,
-  FactoryTypeParser   = 1 << 2,
-  FactoryTypeAll      = FactoryTypeDecoder|FactoryTypeDemuxer|FactoryTypeParser
-};
-
 class GStreamerFormatHelper {
   /* This class can be used to query the GStreamer registry for the required
    * demuxers/decoders from nsHTMLMediaElement::CanPlayType.
@@ -37,8 +30,7 @@
     bool CanHandleCodecCaps(GstCaps* aCaps);
 
     static bool IsBlacklistEnabled();
-    static bool IsPluginFeatureBlacklisted(GstPluginFeature *aFeature,
-                                           FactoryType aTypes = FactoryTypeAll);
+    static bool IsPluginFeatureBlacklisted(GstPluginFeature *aFeature);
 
     static GstCaps* ConvertFormatsToCaps(const char* aMIMEType,
                                          const nsAString* aCodecs);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gtest/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gtest/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gtest/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gtest/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -15,6 +15,11 @@
     'TestWebMBuffered.cpp',
 ]
 
+if CONFIG['MOZ_EME']:
+    SOURCES += [
+        'TestEME.cpp',
+    ]
+
 if CONFIG['MOZ_WEBM_ENCODER']:
     SOURCES += [
         'TestVideoTrackEncoder.cpp',
@@ -25,7 +30,6 @@
 TEST_HARNESS_FILES.gtest += [
     '../test/gizmo-frag.mp4',
     '../test/gizmo.mp4',
-    '../test/short-cenc.mp4',
     'dash_dashinit.mp4',
     'mediasource_test.mp4',
     'test.webm',
@@ -35,6 +39,7 @@
 
 LOCAL_INCLUDES += [
     '/dom/media',
+    '/dom/media/eme',
     '/dom/media/encoder',
     '/dom/media/fmp4',
     '/dom/media/gmp',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gtest/TestEME.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gtest/TestEME.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gtest/TestEME.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gtest/TestEME.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,66 @@
+/* -*- 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 "gtest/gtest.h"
+#include "mozilla/EMEUtils.h"
+
+using namespace std;
+using namespace mozilla;
+
+struct ParseKeySystemTestCase {
+  const char16_t* mInputKeySystemString;
+  int32_t mOutCDMVersion;
+  bool mShouldPass;
+};
+
+const ParseKeySystemTestCase ParseKeySystemTests[] = {
+  {
+    MOZ_UTF16("org.w3.clearkey"),
+    NO_CDM_VERSION,
+    true,
+  }, {
+    MOZ_UTF16("org.w3.clearkey.123"),
+    123,
+    true,
+  }, {
+    MOZ_UTF16("org.w3.clearkey.-1"),
+    NO_CDM_VERSION,
+    false,
+  }, {
+    MOZ_UTF16("org.w3.clearkey.NaN"),
+    NO_CDM_VERSION,
+    false,
+  }, {
+    MOZ_UTF16("org.w3.clearkey.0"),
+    0,
+    true,
+  }, {
+    MOZ_UTF16("org.w3.clearkey.123567890123567890123567890123567890123567890"),
+    NO_CDM_VERSION,
+    false,
+  }, {
+    MOZ_UTF16("org.w3.clearkey.0.1"),
+    NO_CDM_VERSION,
+    false,
+  }
+};
+
+TEST(EME, EMEParseKeySystem) {
+  const nsAutoString clearkey(MOZ_UTF16("org.w3.clearkey"));
+  for (const ParseKeySystemTestCase& test : ParseKeySystemTests) {
+    nsAutoString keySystem;
+    int32_t version;
+    bool rv = ParseKeySystem(nsDependentString(test.mInputKeySystemString),
+                             keySystem,
+                             version);
+    EXPECT_EQ(rv, test.mShouldPass) << "parse should succeed if expected to";
+    if (!test.mShouldPass) {
+      continue;
+    }
+    EXPECT_TRUE(keySystem.Equals(clearkey)) << NS_ConvertUTF16toUTF8(keySystem).get(); //"should extract expected keysystem" << ;
+    EXPECT_EQ(test.mOutCDMVersion, version) << "should extract expected version";
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gtest/TestMP4Demuxer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gtest/TestMP4Demuxer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/gtest/TestMP4Demuxer.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/gtest/TestMP4Demuxer.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -87,67 +87,6 @@
   return res;
 }
 
-TEST(MP4Demuxer, CENC)
-{
-  nsRefPtr<MP4DemuxerBinding> b = new MP4DemuxerBinding("short-cenc.mp4");
-  MonitorAutoLock mon(b->mMonitor);
-  MP4Demuxer* d = b->demuxer;
-
-  EXPECT_TRUE(d->Init());
-
-  const char* video[] = {
-    "1 16 7e571d017e571d017e571d017e571d01 00000000000000000000000000000000 5,686 5,388",
-    "1 16 7e571d017e571d017e571d017e571d01 00000000000000000000000000000044 5,717",
-    "1 16 7e571d017e571d017e571d017e571d01 00000000000000000000000000000071 5,613",
-    "1 16 7e571d017e571d017e571d017e571d01 00000000000000000000000000000098 5,196",
-    "1 16 7e571d017e571d017e571d017e571d01 000000000000000000000000000000a5 5,213",
-    "1 16 7e571d017e571d017e571d017e571d01 000000000000000000000000000000b3 5,213",
-    "1 16 7e571d017e571d017e571d017e571d01 000000000000000000000000000000c1 5,384",
-    "1 16 7e571d017e571d017e571d017e571d01 000000000000000000000000000000d9 5,256",
-    "1 16 7e571d017e571d017e571d017e571d01 000000000000000000000000000000e9 5,245",
-    "1 16 7e571d017e571d017e571d017e571d01 000000000000000000000000000000f9 5,251",
-  };
-
-  MP4Sample* sample;
-  size_t i = 0;
-  while (!!(sample = d->DemuxVideoSample())) {
-    nsCString text = ToCryptoString(sample->crypto);
-    EXPECT_STREQ(video[i++], text.get());
-  }
-  EXPECT_EQ(ArrayLength(video), i);
-
-  const char* audio[] = {
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000000 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000018 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000030 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000048 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000060 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000078 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000090 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 000000000000000000000000000000a8 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 000000000000000000000000000000c0 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 000000000000000000000000000000d8 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 000000000000000000000000000000f0 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000108 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000120 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000138 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000150 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000168 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000180 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 00000000000000000000000000000198 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 000000000000000000000000000001b0 0,371",
-    "1 16 7e571d027e571d027e571d027e571d02 000000000000000000000000000001c8 0,372",
-    "1 16 7e571d027e571d027e571d027e571d02 000000000000000000000000000001e0 0,371",
-  };
-
-  i = 0;
-  while (!!(sample = d->DemuxAudioSample())) {
-    nsCString text = ToCryptoString(sample->crypto);
-    EXPECT_STREQ(audio[i++], text.get());
-  }
-  EXPECT_EQ(ArrayLength(audio), i);
-}
-
 TEST(MP4Demuxer, CENCFrag)
 {
   nsRefPtr<MP4DemuxerBinding> b = new MP4DemuxerBinding("gizmo-frag.mp4");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/IdpProxy.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/IdpProxy.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/IdpProxy.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/IdpProxy.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,272 +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 = ["IdpProxy"];
-
-const {
-  classes: Cc,
-  interfaces: Ci,
-  utils: Cu,
-  results: Cr
-} = Components;
-
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "Sandbox",
-                                  "resource://gre/modules/identity/Sandbox.jsm");
-
-/**
- * An invisible iframe for hosting the idp shim.
- *
- * There is no visible UX here, as we assume the user has already
- * logged in elsewhere (on a different screen in the web site hosting
- * the RTC functions).
- */
-function IdpChannel(uri, messageCallback) {
-  this.sandbox = null;
-  this.messagechannel = null;
-  this.source = uri;
-  this.messageCallback = messageCallback;
-}
-
-IdpChannel.prototype = {
-  /**
-   * Create a hidden, sandboxed iframe for hosting the IdP's js shim.
-   *
-   * @param callback
-   *                (function) invoked when this completes, with an error
-   *                argument if there is a problem, no argument if everything is
-   *                ok
-   */
-  open: function(callback) {
-    if (this.sandbox) {
-      return callback(new Error("IdP channel already open"));
-    }
-
-    let ready = this._sandboxReady.bind(this, callback);
-    this.sandbox = new Sandbox(this.source, ready);
-  },
-
-  _sandboxReady: function(aCallback, aSandbox) {
-    // Inject a message channel into the subframe.
-    try {
-      this.messagechannel = new aSandbox._frame.contentWindow.MessageChannel();
-      Object.defineProperty(
-        aSandbox._frame.contentWindow.wrappedJSObject,
-        "rtcwebIdentityPort",
-        {
-          value: this.messagechannel.port2,
-          configurable: true
-        }
-      );
-    } catch (e) {
-      this.close();
-      aCallback(e); // oops, the IdP proxy overwrote this.. bad
-      return;
-    }
-    this.messagechannel.port1.onmessage = function(msg) {
-      this.messageCallback(msg.data);
-    }.bind(this);
-    this.messagechannel.port1.start();
-    aCallback();
-  },
-
-  send: function(msg) {
-    this.messagechannel.port1.postMessage(msg);
-  },
-
-  close: function IdpChannel_close() {
-    if (this.sandbox) {
-      if (this.messagechannel) {
-        this.messagechannel.port1.close();
-      }
-      this.sandbox.free();
-    }
-    this.messagechannel = null;
-    this.sandbox = null;
-  }
-};
-
-/**
- * A message channel between the RTC PeerConnection and a designated IdP Proxy.
- *
- * @param domain (string) the domain to load up
- * @param protocol (string) Optional string for the IdP protocol
- */
-function IdpProxy(domain, protocol) {
-  IdpProxy.validateDomain(domain);
-  IdpProxy.validateProtocol(protocol);
-
-  this.domain = domain;
-  this.protocol = protocol || "default";
-
-  this._reset();
-}
-
-/**
- * Checks that the domain is only a domain, and doesn't contain anything else.
- * Adds it to a URI, then checks that it matches perfectly.
- */
-IdpProxy.validateDomain = function(domain) {
-  let message = "Invalid domain for identity provider; ";
-  if (!domain || typeof domain !== "string") {
-    throw new Error(message + "must be a non-zero length string");
-  }
-
-  message += "must only have a domain name and optionally a port";
-  try {
-    let ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                    .getService(Components.interfaces.nsIIOService);
-    let uri = ioService.newURI('https://' + domain + '/', null, null);
-
-    // this should trap errors
-    // we could check uri.userPass, uri.path and uri.ref, but there is no need
-    if (uri.hostPort !== domain) {
-      throw new Error(message);
-    }
-  } catch (e if (e.result === Cr.NS_ERROR_MALFORMED_URI)) {
-    throw new Error(message);
-  }
-};
-
-/**
- * Checks that the IdP protocol is sane.  In particular, we don't want someone
- * adding relative paths (e.g., "../../myuri"), which could be used to move
- * outside of /.well-known/ and into space that they control.
- */
-IdpProxy.validateProtocol = function(protocol) {
-  if (!protocol) {
-    return;  // falsy values turn into "default", so they are OK
-  }
-  let message = "Invalid protocol for identity provider; ";
-  if (typeof protocol !== "string") {
-    throw new Error(message + "must be a string");
-  }
-  if (decodeURIComponent(protocol).match(/[\/\\]/)) {
-    throw new Error(message + "must not include '/' or '\\'");
-  }
-};
-
-IdpProxy.prototype = {
-  _reset: function() {
-    this.channel = null;
-    this.ready = false;
-
-    this.counter = 0;
-    this.tracking = {};
-    this.pending = [];
-  },
-
-  isSame: function(domain, protocol) {
-    return this.domain === domain && ((protocol || "default") === this.protocol);
-  },
-
-  /**
-   * Get a sandboxed iframe for hosting the idp-proxy's js. Create a message
-   * channel down to the frame.
-   *
-   * @param errorCallback (function) a callback that will be invoked if there
-   *                is a fatal error starting the proxy
-   */
-  start: function(errorCallback) {
-    if (this.channel) {
-      return;
-    }
-    let well_known = "https://" + this.domain;
-    well_known += "/.well-known/idp-proxy/" + this.protocol;
-    this.channel = new IdpChannel(well_known, this._messageReceived.bind(this));
-    this.channel.open(function(error) {
-      if (error) {
-        this.close();
-        if (typeof errorCallback === "function") {
-          errorCallback(error);
-        }
-      }
-    }.bind(this));
-  },
-
-  /**
-   * Send a message up to the idp proxy. This should be an RTC "SIGN" or
-   * "VERIFY" message. This method adds the tracking 'id' parameter
-   * automatically to the message so that the callback is only invoked for the
-   * response to the message.
-   *
-   * This enqueues the message to send if the IdP hasn't signaled that it is
-   * "READY", and sends the message when it is.
-   *
-   * The caller is responsible for ensuring that a response is received. If the
-   * IdP doesn't respond, the callback simply isn't invoked.
-   */
-  send: function(message, callback) {
-    this.start();
-    if (this.ready) {
-      message.id = "" + (++this.counter);
-      this.tracking[message.id] = callback;
-      this.channel.send(message);
-    } else {
-      this.pending.push({ message: message, callback: callback });
-    }
-  },
-
-  /**
-   * Handle a message from the IdP. This automatically sends if the message is
-   * 'READY' so there is no need to track readiness state outside of this obj.
-   */
-  _messageReceived: function(message) {
-    if (!message) {
-      return;
-    }
-    if (!this.ready && message.type === "READY") {
-      this.ready = true;
-      this.pending.forEach(function(p) {
-        this.send(p.message, p.callback);
-      }, this);
-      this.pending = [];
-    } else if (this.tracking[message.id]) {
-      var callback = this.tracking[message.id];
-      delete this.tracking[message.id];
-      callback(message);
-    } else {
-      let console = Cc["@mozilla.org/consoleservice;1"].
-        getService(Ci.nsIConsoleService);
-      console.logStringMessage("Received bad message from IdP: " +
-                               message.id + ":" + message.type);
-    }
-  },
-
-  /**
-   * Performs cleanup.  The object should be OK to use again.
-   */
-  close: function() {
-    if (!this.channel) {
-      return;
-    }
-
-    // clear out before letting others know in case they do something bad
-    let trackingCopy = this.tracking;
-    let pendingCopy = this.pending;
-
-    this.channel.close();
-    this._reset();
-
-    // dump a message of type "ERROR" in response to all outstanding
-    // messages to the IdP
-    let error = { type: "ERROR", error: "IdP closed" };
-    Object.keys(trackingCopy).forEach(function(k) {
-      trackingCopy[k](error);
-    });
-    pendingCopy.forEach(function(p) {
-      p.callback(error);
-    });
-  },
-
-  toString: function() {
-    return this.domain + '/.../' + this.protocol;
-  }
-};
-
-this.IdpProxy = IdpProxy;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/IdpSandbox.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/IdpSandbox.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/IdpSandbox.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/IdpSandbox.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,240 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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,
+  utils: Cu,
+  results: Cr
+} = Components;
+
+Cu.import('resource://gre/modules/Services.jsm');
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+
+/** This little class ensures that redirects maintain an https:// origin */
+function RedirectHttpsOnly() {}
+
+RedirectHttpsOnly.prototype = {
+  asyncOnChannelRedirect: function(oldChannel, newChannel, flags, callback) {
+    if (newChannel.URI.scheme !== 'https') {
+      callback.onRedirectVerifyCallback(Cr.NS_ERROR_ABORT);
+    } else {
+      callback.onRedirectVerifyCallback(Cr.NS_OK);
+    }
+  },
+
+  getInterface: function(iid) {
+    return this.QueryInterface(iid);
+  },
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannelEventSink])
+};
+
+/** This class loads a resource into a single string. ResourceLoader.load() is
+ * the entry point. */
+function ResourceLoader(res, rej) {
+  this.resolve = res;
+  this.reject = rej;
+  this.data = '';
+}
+
+/** Loads the identified https:// URL.  */
+ResourceLoader.load = function(uri) {
+  return new Promise((resolve, reject) => {
+    let listener = new ResourceLoader(resolve, reject);
+    let ioService = Cc['@mozilla.org/network/io-service;1']
+      .getService(Ci.nsIIOService);
+    let systemPrincipal = Services.scriptSecurityManager.getSystemPrincipal();
+    // the '2' identifies this as a script load
+    let ioChannel = ioService.newChannelFromURI2(uri, null, systemPrincipal,
+                                                 systemPrincipal, 0, 2);
+    ioChannel.notificationCallbacks = new RedirectHttpsOnly();
+    ioChannel.asyncOpen(listener, null);
+  });
+};
+
+ResourceLoader.prototype = {
+  onDataAvailable: function(request, context, input, offset, count) {
+    let stream = Cc['@mozilla.org/scriptableinputstream;1']
+      .createInstance(Ci.nsIScriptableInputStream);
+    stream.init(input);
+    this.data += stream.read(count);
+  },
+
+  onStartRequest: function (request, context) {},
+
+  onStopRequest: function(request, context, status) {
+    if (Components.isSuccessCode(status)) {
+      var statusCode = request.QueryInterface(Ci.nsIHttpChannel).responseStatus;
+      if (statusCode === 200) {
+        this.resolve({ request: request, data: this.data });
+      } else {
+        this.reject(new Error('Non-200 response from server: ' + statusCode));
+      }
+    } else {
+      this.reject(new Error('Load failed: ' + status));
+    }
+  },
+
+  getInterface: function(iid) {
+    return this.QueryInterface(iid);
+  },
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener])
+};
+
+/**
+ * A simple implementation of the WorkerLocation interface.
+ */
+function createLocationFromURI(uri) {
+  return {
+    href: uri.spec,
+    protocol: uri.scheme + ':',
+    host: uri.host + ((uri.port >= 0) ?
+                      (':' + uri.port) : ''),
+    port: uri.port,
+    hostname: uri.host,
+    pathname: uri.path.replace(/[#\?].*/, ''),
+    search: uri.path.replace(/^[^\?]*/, '').replace(/#.*/, ''),
+    hash: uri.hasRef ? ('#' + uri.ref) : '',
+    origin: uri.prePath,
+    toString: function() {
+      return uri.spec;
+    }
+  };
+}
+
+/**
+ * A javascript sandbox for running an IdP.
+ *
+ * @param domain (string) the domain of the IdP
+ * @param protocol (string?) the protocol of the IdP [default: 'default']
+ * @throws if the domain or protocol aren't valid
+ */
+function IdpSandbox(domain, protocol) {
+  this.source = IdpSandbox.createIdpUri(domain, protocol || "default");
+  this.active = null;
+  this.sandbox = null;
+}
+
+IdpSandbox.checkDomain = function(domain) {
+  if (!domain || typeof domain !== 'string') {
+    throw new Error('Invalid domain for identity provider: ' +
+                    'must be a non-zero length string');
+  }
+};
+
+/**
+ * Checks that the IdP protocol is superficially sane.  In particular, we don't
+ * want someone adding relative paths (e.g., '../../myuri'), which could be used
+ * to move outside of /.well-known/ and into space that they control.
+ */
+IdpSandbox.checkProtocol = function(protocol) {
+  let message = 'Invalid protocol for identity provider: ';
+  if (!protocol || typeof protocol !== 'string') {
+    throw new Error(message + 'must be a non-zero length string');
+  }
+  if (decodeURIComponent(protocol).match(/[\/\\]/)) {
+    throw new Error(message + "must not include '/' or '\\'");
+  }
+};
+
+/**
+ * Turns a domain and protocol into a URI.  This does some aggressive checking
+ * to make sure that we aren't being fooled somehow.  Throws on fooling.
+ */
+IdpSandbox.createIdpUri = function(domain, protocol) {
+  IdpSandbox.checkDomain(domain);
+  IdpSandbox.checkProtocol(protocol);
+
+  let message = 'Invalid IdP parameters: ';
+  try {
+    let wkIdp = 'https://' + domain + '/.well-known/idp-proxy/' + protocol;
+    let ioService = Components.classes['@mozilla.org/network/io-service;1']
+                    .getService(Ci.nsIIOService);
+    let uri = ioService.newURI(wkIdp, null, null);
+
+    if (uri.hostPort !== domain) {
+      throw new Error(message + 'domain is invalid');
+    }
+    if (uri.path.indexOf('/.well-known/idp-proxy/') !== 0) {
+      throw new Error(message + 'must produce a /.well-known/idp-proxy/ URI');
+    }
+
+    return uri;
+  } catch (e if (typeof e.result !== 'undefined' &&
+                 e.result === Cr.NS_ERROR_MALFORMED_URI)) {
+    throw new Error(message + 'must produce a valid URI');
+  }
+};
+
+IdpSandbox.prototype = {
+  isSame: function(domain, protocol) {
+    return this.source.spec === IdpSandbox.createIdpUri(domain, protocol).spec;
+  },
+
+  start: function() {
+    if (!this.active) {
+      this.active = ResourceLoader.load(this.source)
+        .then(result => this._createSandbox(result));
+    }
+    return this.active;
+  },
+
+  // Provides the sandbox with some useful facilities.  Initially, this is only
+  // a minimal set; it is far easier to add more as the need arises, than to
+  // take them back if we discover a mistake.
+  _populateSandbox: function(uri) {
+    this.sandbox.location = Cu.cloneInto(createLocationFromURI(uri),
+                                         this.sandbox,
+                                         { cloneFunctions: true });
+  },
+
+  _createSandbox: function(result) {
+    let principal = Services.scriptSecurityManager
+      .getChannelResultPrincipal(result.request);
+
+    this.sandbox = Cu.Sandbox(principal, {
+      sandboxName: 'IdP-' + this.source.host,
+      wantComponents: false,
+      wantExportHelpers: false,
+      wantGlobalProperties: [
+        'indexedDB', 'XMLHttpRequest', 'TextEncoder', 'TextDecoder',
+        'URL', 'URLSearchParams', 'atob', 'btoa', 'Blob', 'crypto',
+        'rtcIdentityProvider'
+      ]
+    });
+    let registrar = this.sandbox.rtcIdentityProvider;
+    if (!Cu.isXrayWrapper(registrar)) {
+      throw new Error('IdP setup failed');
+    }
+
+    // have to use the ultimate URI, not the starting one to avoid
+    // that origin stealing from the one that redirected to it
+    this._populateSandbox(result.request.URI);
+    // putting a javascript version of 1.8 here seems fragile
+    Cu.evalInSandbox(result.data, this.sandbox,
+                     '1.8', result.request.URI.spec, 1);
+
+    if (!registrar.idp) {
+      throw new Error('IdP failed to call rtcIdentityProvider.register()');
+    }
+    return registrar;
+  },
+
+  stop: function() {
+    if (this.sandbox) {
+      Cu.nukeSandbox(this.sandbox);
+    }
+    this.sandbox = null;
+    this.active = null;
+  },
+
+  toString: function() {
+    return this.source.spec;
+  }
+};
+
+this.EXPORTED_SYMBOLS = ['IdpSandbox'];
+this.IdpSandbox = IdpSandbox;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaDecoder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaDecoder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaDecoder.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaDecoder.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -144,6 +144,7 @@
   if (!mDecoderStateMachine ||
       mPlayState == PLAY_STATE_SHUTDOWN ||
       !mOwner->GetVideoFrameContainer() ||
+      (mOwner->GetMediaElement() && mOwner->GetMediaElement()->IsBeingDestroyed()) ||
       !mDecoderStateMachine->IsDormantNeeded())
   {
     return;
@@ -984,8 +985,8 @@
 bool MediaDecoder::IsSeeking() const
 {
   MOZ_ASSERT(NS_IsMainThread());
-  return mPlayState == PLAY_STATE_SEEKING ||
-    (mPlayState == PLAY_STATE_LOADING && mRequestedSeekTarget.IsValid());
+  return !mIsDormant && (mPlayState == PLAY_STATE_SEEKING ||
+    (mPlayState == PLAY_STATE_LOADING && mRequestedSeekTarget.IsValid()));
 }
 
 bool MediaDecoder::IsEnded() const
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaDecoderStateMachine.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaDecoderStateMachine.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaDecoderStateMachine.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaDecoderStateMachine.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -2592,7 +2592,16 @@
     newCurrentTime = mAudioStartTime = seekTime;
   } else if (HasAudio()) {
     AudioData* audio = AudioQueue().PeekFront();
-    newCurrentTime = mAudioStartTime = audio ? audio->mTime : seekTime;
+    // Though we adjust the newCurrentTime in audio-based, and supplemented
+    // by video. For better UX, should NOT bind the slide position to
+    // the first audio data timestamp directly.
+    // While seeking to a position where there's only either audio or video, or
+    // seeking to a position lies before audio or video, we need to check if
+    // seekTime is bounded in suitable duration. See Bug 1112438.
+    int64_t videoStart = video ? video->mTime : seekTime;
+    int64_t audioStart = audio ? audio->mTime : seekTime;
+    newCurrentTime = mAudioStartTime =
+        std::min(std::min(audioStart, videoStart), seekTime);
   } else {
     newCurrentTime = video ? video->mTime : seekTime;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaManager.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaManager.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -99,9 +99,9 @@
 #define LOG(msg)
 #endif
 
-using dom::MediaStreamConstraints;         // Outside API (contains JSObject)
-using dom::MediaTrackConstraintSet;        // Mandatory or optional constraints
-using dom::MediaTrackConstraints;          // Raw mMandatory (as JSObject)
+using dom::MediaStreamConstraints;
+using dom::MediaTrackConstraintSet;
+using dom::MediaTrackConstraints;
 using dom::MediaStreamError;
 using dom::GetUserMediaRequest;
 using dom::Sequence;
@@ -431,46 +431,55 @@
 
 // Reminder: add handling for new constraints both here and in GetSources below!
 
-bool
-VideoDevice::SatisfiesConstraintSets(
+uint32_t
+VideoDevice::GetBestFitnessDistance(
     const nsTArray<const MediaTrackConstraintSet*>& aConstraintSets)
 {
   // Interrogate device-inherent properties first.
   for (size_t i = 0; i < aConstraintSets.Length(); i++) {
     auto& c = *aConstraintSets[i];
-    if (c.mFacingMode.WasPassed()) {
-      auto& value = c.mFacingMode.Value();
-      nsString s;
-      GetFacingMode(s);
-      if (value.IsString()) {
-        if (s != value.GetAsString()) {
-          return false;
+    if (!c.mFacingMode.IsConstrainDOMStringParameters() ||
+        c.mFacingMode.GetAsConstrainDOMStringParameters().mExact.WasPassed()) {
+      nsString deviceFacingMode;
+      GetFacingMode(deviceFacingMode);
+      if (c.mFacingMode.IsString()) {
+        if (c.mFacingMode.GetAsString() != deviceFacingMode) {
+          return UINT32_MAX;
+        }
+      } else if (c.mFacingMode.IsStringSequence()) {
+        if (!c.mFacingMode.GetAsStringSequence().Contains(deviceFacingMode)) {
+          return UINT32_MAX;
         }
       } else {
-        if (!value.GetAsStringSequence().Contains(s)) {
-          return false;
+        auto& exact = c.mFacingMode.GetAsConstrainDOMStringParameters().mExact.Value();
+        if (exact.IsString()) {
+          if (exact.GetAsString() != deviceFacingMode) {
+            return UINT32_MAX;
+          }
+        } else if (!exact.GetAsStringSequence().Contains(deviceFacingMode)) {
+          return UINT32_MAX;
         }
       }
     }
     nsString s;
     GetMediaSource(s);
     if (s != c.mMediaSource) {
-      return false;
+      return UINT32_MAX;
     }
   }
   // Forward request to underlying object to interrogate per-mode capabilities.
-  return GetSource()->SatisfiesConstraintSets(aConstraintSets);
+  return GetSource()->GetBestFitnessDistance(aConstraintSets);
 }
 
 AudioDevice::AudioDevice(MediaEngineAudioSource* aSource)
   : MediaDevice(aSource) {}
 
-bool
-AudioDevice::SatisfiesConstraintSets(
+uint32_t
+AudioDevice::GetBestFitnessDistance(
     const nsTArray<const MediaTrackConstraintSet*>& aConstraintSets)
 {
   // TODO: Add audio-specific constraints
-  return true;
+  return 0;
 }
 
 NS_IMETHODIMP
@@ -961,7 +970,10 @@
   {
     nsTArray<nsRefPtr<typename DeviceType::Source> > sources;
 
-    (engine->*aEnumerate)(aConstraints.mMediaSourceEnumValue, &sources);
+    MediaSourceEnum src = StringToEnum(dom::MediaSourceEnumValues::strings,
+                                       aConstraints.mMediaSource,
+                                       dom::MediaSourceEnum::Other);
+    (engine->*aEnumerate)(src, &sources);
     /**
       * We're allowing multiple tabs to access the same camera for parity
       * with Chrome.  See bug 811757 for some of the issues surrounding
@@ -984,60 +996,24 @@
   // Apply constraints to the list of sources.
 
   auto& c = aConstraints;
-  if (c.mUnsupportedRequirement) {
-    // Check upfront the names of required constraints that are unsupported for
-    // this media-type. The spec requires these to fail, so getting them out of
-    // the way early provides a necessary invariant for the remaining algorithm
-    // which maximizes code-reuse by ignoring constraints of the other type
-    // (specifically, SatisfiesConstraintSets is reused for the advanced algorithm
-    // where the spec requires it to ignore constraints of the other type)
-    return;
-  }
 
-  // Now on to the actual algorithm: First apply required constraints.
+  // First apply top-level constraints.
 
   // Stack constraintSets that pass, starting with the required one, because the
   // whole stack must be re-satisfied each time a capability-set is ruled out
-  // (this avoids storing state and pushing algorithm into the lower-level code).
+  // (this avoids storing state or pushing algorithm into the lower-level code).
   nsTArray<const MediaTrackConstraintSet*> aggregateConstraints;
-  aggregateConstraints.AppendElement(&c.mRequired);
+  aggregateConstraints.AppendElement(&c);
 
   for (uint32_t i = 0; i < candidateSet.Length();) {
-    // Overloading instead of template specialization keeps things local
-    if (!candidateSet[i]->SatisfiesConstraintSets(aggregateConstraints)) {
+    if (candidateSet[i]->GetBestFitnessDistance(aggregateConstraints) == UINT32_MAX) {
       candidateSet.RemoveElementAt(i);
     } else {
       ++i;
     }
   }
 
-  // TODO(jib): Proper non-ordered handling of nonrequired constraints (907352)
-  //
-  // For now, put nonrequired constraints at tail of Advanced list.
-  // This isn't entirely accurate, as order will matter, but few will notice
-  // the difference until we get camera selection and a few more constraints.
-  if (c.mNonrequired.Length()) {
-    if (!c.mAdvanced.WasPassed()) {
-      c.mAdvanced.Construct();
-    }
-    c.mAdvanced.Value().MoveElementsFrom(c.mNonrequired);
-  }
-
-  // Then apply advanced (formerly known as optional) constraints.
-  //
-  // These are only effective when there are multiple sources to pick from.
-  // Spec as-of-this-writing says to run algorithm on "all possible tracks
-  // of media type T that the browser COULD RETURN" (emphasis added).
-  //
-  // We think users ultimately control which devices we could return, so after
-  // determining the webpage's preferred list, we add the remaining choices
-  // to the tail, reasoning that they would all have passed individually,
-  // i.e. if the user had any one of them as their sole device (enabled).
-  //
-  // This avoids users having to unplug/disable devices should a webpage pick
-  // the wrong one (UX-fail). Webpage-preferred devices will be listed first.
-
-  SourceSet tailSet;
+  // Then apply advanced constraints.
 
   if (c.mAdvanced.WasPassed()) {
     auto &array = c.mAdvanced.Value();
@@ -1046,24 +1022,20 @@
       aggregateConstraints.AppendElement(&array[i]);
       SourceSet rejects;
       for (uint32_t j = 0; j < candidateSet.Length();) {
-        if (!candidateSet[j]->SatisfiesConstraintSets(aggregateConstraints)) {
+        if (candidateSet[j]->GetBestFitnessDistance(aggregateConstraints) == UINT32_MAX) {
           rejects.AppendElement(candidateSet[j]);
           candidateSet.RemoveElementAt(j);
         } else {
           ++j;
         }
       }
-      (candidateSet.Length()? tailSet : candidateSet).MoveElementsFrom(rejects);
       if (!candidateSet.Length()) {
+        candidateSet.MoveElementsFrom(rejects);
         aggregateConstraints.RemoveElementAt(aggregateConstraints.Length() - 1);
       }
     }
   }
-
-  // TODO: Proper non-ordered handling of nonrequired constraints (Bug 907352)
-
   aResult.MoveElementsFrom(candidateSet);
-  aResult.MoveElementsFrom(tailSet);
 }
 
 /**
@@ -1228,10 +1200,9 @@
     MOZ_ASSERT(mOnSuccess);
     MOZ_ASSERT(mOnFailure);
     if (IsOn(mConstraints.mVideo)) {
-      VideoTrackConstraintsN constraints(GetInvariant(mConstraints.mVideo));
       nsTArray<nsRefPtr<VideoDevice>> sources;
-      GetSources(backend, constraints, &MediaEngine::EnumerateVideoDevices, sources);
-
+      GetSources(backend, GetInvariant(mConstraints.mVideo),
+                 &MediaEngine::EnumerateVideoDevices, sources);
       if (!sources.Length()) {
         Fail(NS_LITERAL_STRING("NotFoundError"));
         return NS_ERROR_FAILURE;
@@ -1241,10 +1212,9 @@
       LOG(("Selected video device"));
     }
     if (IsOn(mConstraints.mAudio)) {
-      AudioTrackConstraintsN constraints(GetInvariant(mConstraints.mAudio));
       nsTArray<nsRefPtr<AudioDevice>> sources;
-      GetSources(backend, constraints, &MediaEngine::EnumerateAudioDevices, sources);
-
+      GetSources(backend, GetInvariant(mConstraints.mAudio),
+                 &MediaEngine::EnumerateAudioDevices, sources);
       if (!sources.Length()) {
         Fail(NS_LITERAL_STRING("NotFoundError"));
         return NS_ERROR_FAILURE;
@@ -1358,14 +1328,15 @@
     already_AddRefed<nsIGetUserMediaDevicesSuccessCallback> aOnSuccess,
     already_AddRefed<nsIDOMGetUserMediaErrorCallback> aOnFailure,
     uint64_t aWindowId, nsACString& aAudioLoopbackDev,
-    nsACString& aVideoLoopbackDev)
+    nsACString& aVideoLoopbackDev, bool aUseFakeDevices)
     : mConstraints(aConstraints)
     , mOnSuccess(aOnSuccess)
     , mOnFailure(aOnFailure)
     , mManager(MediaManager::GetInstance())
     , mWindowId(aWindowId)
     , mLoopbackAudioDevice(aAudioLoopbackDev)
-    , mLoopbackVideoDevice(aVideoLoopbackDev) {}
+    , mLoopbackVideoDevice(aVideoLoopbackDev)
+    , mUseFakeDevices(aUseFakeDevices) {}
 
   void // NS_IMETHOD
   Run()
@@ -1373,7 +1344,7 @@
     NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
 
     nsRefPtr<MediaEngine> backend;
-    if (mConstraints.mFake)
+    if (mConstraints.mFake || mUseFakeDevices)
       backend = new MediaEngineDefault(mConstraints.mFakeTracks);
     else
       backend = mManager->GetBackend(mWindowId);
@@ -1382,19 +1353,17 @@
 
     ScopedDeletePtr<SourceSet> final(new SourceSet);
     if (IsOn(mConstraints.mVideo)) {
-      VideoTrackConstraintsN constraints(GetInvariant(mConstraints.mVideo));
       nsTArray<nsRefPtr<VideoDevice>> s;
-      GetSources(backend, constraints, &MediaEngine::EnumerateVideoDevices, s,
-                 mLoopbackVideoDevice.get());
+      GetSources(backend, GetInvariant(mConstraints.mVideo),
+                 &MediaEngine::EnumerateVideoDevices, s, mLoopbackVideoDevice.get());
       for (uint32_t i = 0; i < s.Length(); i++) {
         final->AppendElement(s[i]);
       }
     }
     if (IsOn(mConstraints.mAudio)) {
-      AudioTrackConstraintsN constraints(GetInvariant(mConstraints.mAudio));
       nsTArray<nsRefPtr<AudioDevice>> s;
-      GetSources(backend, constraints, &MediaEngine::EnumerateAudioDevices, s,
-                 mLoopbackAudioDevice.get());
+      GetSources(backend, GetInvariant(mConstraints.mAudio),
+                 &MediaEngine::EnumerateAudioDevices, s, mLoopbackAudioDevice.get());
       for (uint32_t i = 0; i < s.Length(); i++) {
         final->AppendElement(s[i]);
       }
@@ -1419,6 +1388,7 @@
   // automated media tests only.
   nsCString mLoopbackAudioDevice;
   nsCString mLoopbackVideoDevice;
+  bool mUseFakeDevices;
 };
 
 MediaManager::MediaManager()
@@ -1628,27 +1598,15 @@
   if (!Preferences::GetBool("media.navigator.video.enabled", true)) {
     c.mVideo.SetAsBoolean() = false;
   }
-
-  if (c.mVideo.IsMediaTrackConstraints() && !privileged) {
-    auto& tc = c.mVideo.GetAsMediaTrackConstraints();
-    // only allow privileged content to set the window id
-    if (tc.mBrowserWindow.WasPassed()) {
-      tc.mBrowserWindow.Construct(-1);
-    }
-
-    if (tc.mAdvanced.WasPassed()) {
-      size_t length = tc.mAdvanced.Value().Length();
-      for (size_t i = 0; i < length; i++) {
-        if (tc.mAdvanced.Value()[i].mBrowserWindow.WasPassed()) {
-          tc.mAdvanced.Value()[i].mBrowserWindow.Construct(-1);
-        }
-      }
-    }
+  bool fake = true;
+  if (!c.mFake &&
+      !Preferences::GetBool("media.navigator.streams.fake", false)) {
+    fake = false;
   }
 
   // Pass callbacks and MediaStreamListener along to GetUserMediaTask.
   nsAutoPtr<GetUserMediaTask> task;
-  if (c.mFake) {
+  if (fake) {
     // Fake stream from default backend.
     task = new GetUserMediaTask(c, onSuccess.forget(),
       onFailure.forget(), windowID, listener, mPrefs, new MediaEngineDefault(c.mFakeTracks));
@@ -1671,12 +1629,37 @@
     privileged = true;
   }
 
-
   if (c.mVideo.IsMediaTrackConstraints()) {
-    auto& tc = c.mVideo.GetAsMediaTrackConstraints();
+    auto& vc = c.mVideo.GetAsMediaTrackConstraints();
     MediaSourceEnum src = StringToEnum(dom::MediaSourceEnumValues::strings,
-                                       tc.mMediaSource,
+                                       vc.mMediaSource,
                                        dom::MediaSourceEnum::Other);
+    if (vc.mAdvanced.WasPassed()) {
+      if (src != dom::MediaSourceEnum::Camera) {
+        // iterate through advanced, forcing mediaSource to match "root"
+        const char *camera = EnumToASCII(dom::MediaSourceEnumValues::strings,
+                                         dom::MediaSourceEnum::Camera);
+        for (MediaTrackConstraintSet& cs : vc.mAdvanced.Value()) {
+          if (cs.mMediaSource.EqualsASCII(camera)) {
+            cs.mMediaSource = vc.mMediaSource;
+          }
+        }
+      }
+    }
+    if (!privileged) {
+      // only allow privileged content to set the window id
+      if (vc.mBrowserWindow.WasPassed()) {
+        vc.mBrowserWindow.Construct(-1);
+      }
+      if (vc.mAdvanced.WasPassed()) {
+        for (MediaTrackConstraintSet& cs : vc.mAdvanced.Value()) {
+          if (cs.mBrowserWindow.WasPassed()) {
+            cs.mBrowserWindow.Construct(-1);
+          }
+        }
+      }
+    }
+
     switch (src) {
     case dom::MediaSourceEnum::Camera:
       break;
@@ -1735,7 +1718,7 @@
 
   // XXX No full support for picture in Desktop yet (needs proper UI)
   if (privileged ||
-      (c.mFake && !Preferences::GetBool("media.navigator.permission.fake"))) {
+      (fake && !Preferences::GetBool("media.navigator.permission.fake"))) {
     MediaManager::GetMessageLoop()->PostTask(FROM_HERE, task.forget());
   } else {
     bool isHTTPS = false;
@@ -1829,12 +1812,14 @@
     Preferences::GetCString("media.audio_loopback_dev");
   nsAdoptingCString loopbackVideoDevice =
     Preferences::GetCString("media.video_loopback_dev");
+  bool useFakeStreams =
+    Preferences::GetBool("media.navigator.streams.fake", false);
 
   MediaManager::GetMessageLoop()->PostTask(FROM_HERE,
     new GetUserMediaDevicesTask(
       aConstraints, onSuccess.forget(), onFailure.forget(),
       (aInnerWindowID ? aInnerWindowID : aWindow->WindowID()),
-      loopbackAudioDevice, loopbackVideoDevice));
+      loopbackAudioDevice, loopbackVideoDevice, useFakeStreams));
 
   return NS_OK;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaManager.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaManager.h	2015-02-28 15:03:08.000000000 +0000
@@ -393,8 +393,6 @@
           NS_ASSERTION(!NS_IsMainThread(), "Never call on main thread");
           nsresult rv;
 
-          source->SetPullEnabled(true);
-
           DOMMediaStream::TrackTypeHints expectedTracks = 0;
           if (mAudioSource) {
             rv = mAudioSource->Start(source, kAudioTrack);
@@ -414,9 +412,14 @@
               return;
             }
           }
+          // Start() queued the tracks to be added synchronously to avoid races
+          source->FinishAddTracks();
 
           mOnTracksAvailableCallback->SetExpectedTracks(expectedTracks);
 
+          source->SetPullEnabled(true);
+          source->AdvanceKnownTracksTime(STREAM_TIME_MAX);
+
           MM_LOG(("started all sources"));
           // Forward mOnTracksAvailableCallback to GetUserMediaNotificationEvent,
           // because mOnTracksAvailableCallback needs to be added to mStream
@@ -520,7 +523,7 @@
   explicit VideoDevice(Source* aSource);
   NS_IMETHOD GetType(nsAString& aType);
   Source* GetSource();
-  bool SatisfiesConstraintSets(
+  uint32_t GetBestFitnessDistance(
     const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets);
 };
 
@@ -532,7 +535,7 @@
   explicit AudioDevice(Source* aSource);
   NS_IMETHOD GetType(nsAString& aType);
   Source* GetSource();
-  bool SatisfiesConstraintSets(
+  uint32_t GetBestFitnessDistance(
     const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets);
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/MediaSourceReader.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/MediaSourceReader.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/MediaSourceReader.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/MediaSourceReader.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -110,8 +110,8 @@
 {
   nsRefPtr<AudioDataPromise> p = mAudioPromise.Ensure(__func__);
   MSE_DEBUGV("");
-  if (!GetAudioReader()) {
-    MSE_DEBUG("called with no audio reader");
+  if (!mAudioTrack) {
+    MSE_DEBUG("called with no audio track");
     mAudioPromise.Reject(DECODE_ERROR, __func__);
     return p;
   }
@@ -130,12 +130,13 @@
                                             &MediaSourceReader::CompleteAudioSeekAndDoRequest,
                                             &MediaSourceReader::CompleteAudioSeekAndRejectPromise));
       break;
-    case SOURCE_ERROR:
+    case SOURCE_NONE:
       if (mLastAudioTime) {
         CheckForWaitOrEndOfStream(MediaData::AUDIO_DATA, mLastAudioTime);
         break;
       }
-      // Fallback to using current reader
+      // Fallback to using first reader
+      mAudioSourceDecoder = mAudioTrack->Decoders()[0];
     default:
       DoAudioRequest();
       break;
@@ -253,8 +254,8 @@
   nsRefPtr<VideoDataPromise> p = mVideoPromise.Ensure(__func__);
   MSE_DEBUGV("RequestVideoData(%d, %lld)",
              aSkipToNextKeyframe, aTimeThreshold);
-  if (!GetVideoReader()) {
-    MSE_DEBUG("called with no video reader");
+  if (!mVideoTrack) {
+    MSE_DEBUG("called with no video track");
     mVideoPromise.Reject(DECODE_ERROR, __func__);
     return p;
   }
@@ -278,12 +279,13 @@
                                            &MediaSourceReader::CompleteVideoSeekAndDoRequest,
                                            &MediaSourceReader::CompleteVideoSeekAndRejectPromise));
       break;
-    case SOURCE_ERROR:
+    case SOURCE_NONE:
       if (mLastVideoTime) {
         CheckForWaitOrEndOfStream(MediaData::VIDEO_DATA, mLastVideoTime);
         break;
       }
-      // Fallback to using current reader.
+      // Fallback to using first reader.
+      mVideoSourceDecoder = mVideoTrack->Decoders()[0];
     default:
       DoVideoRequest();
       break;
@@ -482,7 +484,7 @@
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
   // XXX: Can't handle adding an audio track after ReadMetadata.
   if (!mAudioTrack) {
-    return SOURCE_ERROR;
+    return SOURCE_NONE;
   }
 
   // We first search without the tolerance and then search with it, so that, in
@@ -495,25 +497,31 @@
     newDecoder = SelectDecoder(*aTarget, EOS_FUZZ_US, mAudioTrack->Decoders());
     usedFuzz = true;
   }
-  if (newDecoder && newDecoder != mAudioSourceDecoder) {
+  if (GetAudioReader() && mAudioSourceDecoder != newDecoder) {
     GetAudioReader()->SetIdle();
-    mAudioSourceDecoder = newDecoder;
-    if (usedFuzz) {
-      // A decoder buffered range is continuous. We would have failed the exact
-      // search but succeeded the fuzzy one if our target was shortly before
-      // start time.
-      nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-      newDecoder->GetBuffered(ranges);
-      int64_t startTime = ranges->GetStartTime() * USECS_PER_S;
-      if (*aTarget < startTime) {
-        *aTarget = startTime;
-      }
+  }
+  if (!newDecoder) {
+    mAudioSourceDecoder = nullptr;
+    return SOURCE_NONE;
+  }
+  if (newDecoder == mAudioSourceDecoder) {
+    return SOURCE_EXISTING;
+  }
+  mAudioSourceDecoder = newDecoder;
+  if (usedFuzz) {
+    // A decoder buffered range is continuous. We would have failed the exact
+    // search but succeeded the fuzzy one if our target was shortly before
+    // start time.
+    nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
+    newDecoder->GetBuffered(ranges);
+    int64_t startTime = ranges->GetStartTime() * USECS_PER_S;
+    if (*aTarget < startTime) {
+      *aTarget = startTime;
     }
-    MSE_DEBUGV("switched decoder to %p (fuzz:%d)",
-               mAudioSourceDecoder.get(), usedFuzz);
-    return SOURCE_NEW;
   }
-  return newDecoder ? SOURCE_EXISTING : SOURCE_ERROR;
+  MSE_DEBUGV("switched decoder to %p (fuzz:%d)",
+             mAudioSourceDecoder.get(), usedFuzz);
+  return SOURCE_NEW;
 }
 
 MediaSourceReader::SwitchSourceResult
@@ -522,7 +530,7 @@
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
   // XXX: Can't handle adding a video track after ReadMetadata.
   if (!mVideoTrack) {
-    return SOURCE_ERROR;
+    return SOURCE_NONE;
   }
 
   // We first search without the tolerance and then search with it, so that, in
@@ -535,25 +543,31 @@
     newDecoder = SelectDecoder(*aTarget, EOS_FUZZ_US, mVideoTrack->Decoders());
     usedFuzz = true;
   }
-  if (newDecoder && newDecoder != mVideoSourceDecoder) {
+  if (GetVideoReader() && mVideoSourceDecoder != newDecoder) {
     GetVideoReader()->SetIdle();
-    mVideoSourceDecoder = newDecoder;
-    if (usedFuzz) {
-      // A decoder buffered range is continuous. We would have failed the exact
-      // search but succeeded the fuzzy one if our target was shortly before
-      // start time.
-      nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-      newDecoder->GetBuffered(ranges);
-      int64_t startTime = ranges->GetStartTime() * USECS_PER_S;
-      if (*aTarget < startTime) {
-        *aTarget = startTime;
-      }
+  }
+  if (!newDecoder) {
+    mVideoSourceDecoder = nullptr;
+    return SOURCE_NONE;
+  }
+  if (newDecoder == mVideoSourceDecoder) {
+    return SOURCE_EXISTING;
+  }
+  mVideoSourceDecoder = newDecoder;
+  if (usedFuzz) {
+    // A decoder buffered range is continuous. We would have failed the exact
+    // search but succeeded the fuzzy one if our target was shortly before
+    // start time.
+    nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
+    newDecoder->GetBuffered(ranges);
+    int64_t startTime = ranges->GetStartTime() * USECS_PER_S;
+    if (*aTarget < startTime) {
+      *aTarget = startTime;
     }
-    MSE_DEBUGV("switched decoder to %p (fuzz:%d)",
-               mVideoSourceDecoder.get(), usedFuzz);
-    return SOURCE_NEW;
   }
-  return newDecoder ? SOURCE_EXISTING : SOURCE_ERROR;
+  MSE_DEBUGV("switched decoder to %p (fuzz:%d)",
+             mVideoSourceDecoder.get(), usedFuzz);
+  return SOURCE_NEW;
 }
 
 bool
@@ -796,7 +810,12 @@
 void
 MediaSourceReader::DoAudioSeek()
 {
-  SwitchAudioSource(&mPendingSeekTime);
+  if (SwitchAudioSource(&mPendingSeekTime) == SOURCE_NONE) {
+    // Data we need got evicted since the last time we checked for data
+    // availability. Abort current seek attempt.
+    mWaitingForSeekData = true;
+    return;
+  }
   mAudioSeekRequest.Begin(GetAudioReader()->Seek(GetReaderAudioTime(mPendingSeekTime), 0)
                          ->RefableThen(GetTaskQueue(), __func__, this,
                                        &MediaSourceReader::OnAudioSeekCompleted,
@@ -829,7 +848,12 @@
   // Seek methods since it can deadlock.
   {
     ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-    if (!mWaitingForSeekData || !TrackBuffersContainTime(mPendingSeekTime)) {
+    if (!mWaitingForSeekData) {
+      return;
+    }
+    if (!TrackBuffersContainTime(mPendingSeekTime)) {
+      mVideoSourceDecoder = nullptr;
+      mAudioSourceDecoder = nullptr;
       return;
     }
     mWaitingForSeekData = false;
@@ -856,7 +880,12 @@
 void
 MediaSourceReader::DoVideoSeek()
 {
-  SwitchVideoSource(&mPendingSeekTime);
+  if (SwitchVideoSource(&mPendingSeekTime) == SOURCE_NONE) {
+    // Data we need got evicted since the last time we checked for data
+    // availability. Abort current seek attempt.
+    mWaitingForSeekData = true;
+    return;
+  }
   mVideoSeekRequest.Begin(GetVideoReader()->Seek(GetReaderVideoTime(mPendingSeekTime), 0)
                           ->RefableThen(GetTaskQueue(), __func__, this,
                                         &MediaSourceReader::OnVideoSeekCompleted,
@@ -1085,7 +1114,7 @@
 MediaSourceReader::IsActiveReader(MediaDecoderReader* aReader)
 {
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-  return aReader == GetVideoReader() || aReader == GetAudioReader();
+  return aReader && (aReader == GetVideoReader() || aReader == GetAudioReader());
 }
 
 MediaDecoderReader*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/MediaSourceReader.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/MediaSourceReader.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/MediaSourceReader.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/MediaSourceReader.h	2015-02-28 15:03:08.000000000 +0000
@@ -160,7 +160,7 @@
   // Search can be made using a fuzz factor. Should an approximated value be
   // found instead, aTarget will be updated to the actual target found.
   enum SwitchSourceResult {
-    SOURCE_ERROR = -1,
+    SOURCE_NONE = -1,
     SOURCE_EXISTING = 0,
     SOURCE_NEW = 1,
   };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/ResourceQueue.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/ResourceQueue.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/ResourceQueue.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/ResourceQueue.h	2015-02-28 15:03:08.000000000 +0000
@@ -123,6 +123,16 @@
       SBR_DEBUG("item=%p length=%d offset=%llu",
                 item, item->mData->Length(), mOffset);
       if (item->mData->Length() + mOffset >= aOffset) {
+        if (aOffset <= mOffset) {
+          break;
+        }
+        uint32_t offset = aOffset - mOffset;
+        mOffset += offset;
+        evicted += offset;
+        nsRefPtr<LargeDataBuffer> data = new LargeDataBuffer;
+        data->AppendElements(item->mData->Elements() + offset,
+                             item->mData->Length() - offset);
+        item->mData = data;
         break;
       }
       mOffset += item->mData->Length();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/SourceBuffer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/SourceBuffer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/SourceBuffer.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/SourceBuffer.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -252,16 +252,16 @@
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
   }
+  if (mUpdating) {
+    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return;
+  }
   if (IsNaN(mMediaSource->Duration()) ||
       aStart < 0 || aStart > mMediaSource->Duration() ||
       aEnd <= aStart || IsNaN(aEnd)) {
     aRv.Throw(NS_ERROR_DOM_INVALID_ACCESS_ERR);
     return;
   }
-  if (mUpdating) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-    return;
-  }
   if (mMediaSource->ReadyState() == MediaSourceReadyState::Ended) {
     mMediaSource->SetReadyState(MediaSourceReadyState::Open);
   }
@@ -559,6 +559,16 @@
     mMediaSource->NotifyEvicted(0.0, newBufferStartTime);
   }
 
+  // See if we have enough free space to append our new data.
+  // As we can only evict once we have playable data, we must give a chance
+  // to the DASH player to provide a complete media segment.
+  if (aLength > mEvictionThreshold ||
+      ((mTrackBuffer->GetSize() > mEvictionThreshold - aLength) &&
+       !mTrackBuffer->HasOnlyIncompleteMedia())) {
+    aRv.Throw(NS_ERROR_DOM_QUOTA_EXCEEDED_ERR);
+    return nullptr;
+  }
+
   nsRefPtr<LargeDataBuffer> data = new LargeDataBuffer();
   if (!data->AppendElements(aData, aLength)) {
     aRv.Throw(NS_ERROR_DOM_QUOTA_EXCEEDED_ERR);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html	2015-02-28 15:03:08.000000000 +0000
@@ -19,6 +19,7 @@
     fetchWithXHR("seek.webm", function (arrayBuffer) {
       sb.appendBuffer(new Uint8Array(arrayBuffer, 0, 25223));
       sb.addEventListener("updateend", function () {
+        sb.removeEventListener('updateend', arguments.callee);
         sb.appendBuffer(new Uint8Array(arrayBuffer, 25223));
       });
     });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/TrackBuffer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/TrackBuffer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/TrackBuffer.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/TrackBuffer.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -306,10 +306,7 @@
     return false;
   }
 
-  int64_t totalSize = 0;
-  for (uint32_t i = 0; i < mDecoders.Length(); ++i) {
-    totalSize += mDecoders[i]->GetResource()->GetSize();
-  }
+  int64_t totalSize = GetSize();
 
   int64_t toEvict = totalSize - aThreshold;
   if (toEvict <= 0 || mInitializedDecoders.IsEmpty()) {
@@ -326,7 +323,7 @@
     nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
     decoders[i]->GetBuffered(buffered);
 
-    MSE_DEBUG("decoder=%u/%u threshold=%u toEvict=%lld",
+    MSE_DEBUG("Step1. decoder=%u/%u threshold=%u toEvict=%lld",
               i, decoders.Length(), aThreshold, toEvict);
 
     // To ensure we don't evict data past the current playback position
@@ -334,20 +331,34 @@
     // that point.
     if (aPlaybackTime > MSE_EVICT_THRESHOLD_TIME) {
       double time = aPlaybackTime - MSE_EVICT_THRESHOLD_TIME;
-      int64_t playbackOffset = decoders[i]->ConvertToByteOffset(time);
-      MSE_DEBUG("evicting some bufferedEnd=%f"
-                "aPlaybackTime=%f time=%f, playbackOffset=%lld size=%lld",
-                buffered->GetEndTime(), aPlaybackTime, time,
-                playbackOffset, decoders[i]->GetResource()->GetSize());
-      if (playbackOffset > 0) {
-        toEvict -= decoders[i]->GetResource()->EvictData(playbackOffset,
-                                                         playbackOffset);
+      bool isActive = decoders[i] == mCurrentDecoder ||
+        mParentDecoder->IsActiveReader(decoders[i]->GetReader());
+      if (!isActive && buffered->GetEndTime() < time) {
+        // The entire decoder is contained before our current playback time.
+        // It can be fully evicted.
+        MSE_DEBUG("evicting all bufferedEnd=%f "
+                  "aPlaybackTime=%f time=%f, size=%lld",
+                  buffered->GetEndTime(), aPlaybackTime, time,
+                  decoders[i]->GetResource()->GetSize());
+        toEvict -= decoders[i]->GetResource()->EvictAll();
+      } else {
+        int64_t playbackOffset = decoders[i]->ConvertToByteOffset(time);
+        MSE_DEBUG("evicting some bufferedEnd=%f "
+                  "aPlaybackTime=%f time=%f, playbackOffset=%lld size=%lld",
+                  buffered->GetEndTime(), aPlaybackTime, time,
+                  playbackOffset, decoders[i]->GetResource()->GetSize());
+        if (playbackOffset > 0) {
+          toEvict -= decoders[i]->GetResource()->EvictData(playbackOffset,
+                                                           playbackOffset);
+        }
       }
     }
   }
 
   // Evict all data from decoders we've likely already read from.
   for (uint32_t i = 0; i < decoders.Length() && toEvict > 0; ++i) {
+    MSE_DEBUG("Step2. decoder=%u/%u threshold=%u toEvict=%lld",
+              i, decoders.Length(), aThreshold, toEvict);
     if (mParentDecoder->IsActiveReader(decoders[i]->GetReader())) {
       break;
     }
@@ -396,6 +407,8 @@
   decoders.Sort(DecoderSorter());
 
   for (int32_t i = int32_t(decoders.Length()) - 1; i >= 0 && toEvict > 0; --i) {
+    MSE_DEBUG("Step3. decoder=%u/%u threshold=%u toEvict=%lld",
+              i, decoders.Length(), aThreshold, toEvict);
     if (decoders[i] == playingDecoder || decoders[i] == nextPlayingDecoder ||
         decoders[i] == mCurrentDecoder) {
       continue;
@@ -414,9 +427,15 @@
 
   bool evicted = toEvict < (totalSize - aThreshold);
   if (evicted) {
-    nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
-    mCurrentDecoder->GetBuffered(ranges);
-    *aBufferStartTime = std::max(0.0, ranges->GetStartTime());
+    if (playingDecoder) {
+      nsRefPtr<dom::TimeRanges> ranges = new dom::TimeRanges();
+      playingDecoder->GetBuffered(ranges);
+      *aBufferStartTime = std::max(0.0, ranges->GetStartTime());
+    } else {
+      // We do not currently have data to play yet.
+      // Avoid evicting anymore data to minimize rebuffering time.
+      *aBufferStartTime = 0.0;
+    }
   }
 
   return evicted;
@@ -449,6 +468,30 @@
   }
 }
 
+int64_t
+TrackBuffer::GetSize()
+{
+  int64_t totalSize = 0;
+  for (uint32_t i = 0; i < mInitializedDecoders.Length(); ++i) {
+    totalSize += mInitializedDecoders[i]->GetResource()->GetSize();
+  }
+  return totalSize;
+}
+
+bool
+TrackBuffer::HasOnlyIncompleteMedia()
+{
+  if (!mCurrentDecoder) {
+    return false;
+  }
+  nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
+  mCurrentDecoder->GetBuffered(buffered);
+  MSE_DEBUG("mCurrentDecoder.size=%lld, start=%f end=%f",
+            mCurrentDecoder->GetResource()->GetSize(),
+            buffered->GetStartTime(), buffered->GetEndTime());
+  return mCurrentDecoder->GetResource()->GetSize() && !buffered->Length();
+}
+
 void
 TrackBuffer::EvictBefore(double aTime)
 {
@@ -596,6 +639,10 @@
     MSE_DEBUG("was shut down while reading metadata. Aborting initialization.");
     return;
   }
+  if (mCurrentDecoder != aDecoder) {
+    MSE_DEBUG("append was cancelled. Aborting initialization.");
+    return;
+  }
 
   if (NS_SUCCEEDED(rv) && reader->IsWaitingOnCDMResource()) {
     mWaitingDecoders.AppendElement(aDecoder);
@@ -945,31 +992,52 @@
     // Nothing to remove.
     return false;
   }
-  if (aEnd < bufferedEnd) {
-    // TODO. We only handle trimming.
+
+  if (aStart > bufferedStart && aEnd < bufferedEnd) {
+    // TODO. We only handle trimming and removal from the start.
     NS_WARNING("RangeRemoval unsupported arguments. "
-               "Can only handle trimming");
+               "Can only handle trimming (trim left or trim right");
     return false;
   }
 
   nsTArray<SourceBufferDecoder*> decoders;
   decoders.AppendElements(mInitializedDecoders);
 
-  // Only trimming existing buffers.
-  for (size_t i = 0; i < decoders.Length(); ++i) {
-    decoders[i]->Trim(aStart);
-    if (aStart <= buffered->GetStartTime()) {
-      // We've completely emptied it, can clear the data.
-      int64_t size = decoders[i]->GetResource()->GetSize();
-      decoders[i]->GetResource()->EvictData(size, size);
-      if (decoders[i] == mCurrentDecoder ||
-          mParentDecoder->IsActiveReader(decoders[i]->GetReader())) {
-        continue;
+  if (aStart <= bufferedStart && aEnd < bufferedEnd) {
+    // Evict data from beginning.
+    for (size_t i = 0; i < decoders.Length(); ++i) {
+      nsRefPtr<dom::TimeRanges> buffered = new dom::TimeRanges();
+      decoders[i]->GetBuffered(buffered);
+      if (int64_t(buffered->GetEndTime() * USECS_PER_S) < aEnd) {
+        // Can be fully removed.
+        MSE_DEBUG("remove all bufferedEnd=%f time=%f, size=%lld",
+                  buffered->GetEndTime(), time,
+                  decoders[i]->GetResource()->GetSize());
+        decoders[i]->GetResource()->EvictAll();
+      } else {
+        int64_t offset = decoders[i]->ConvertToByteOffset(aEnd);
+        MSE_DEBUG("removing some bufferedEnd=%f offset=%lld size=%lld",
+                  buffered->GetEndTime(), offset,
+                  decoders[i]->GetResource()->GetSize());
+        if (offset > 0) {
+          decoders[i]->GetResource()->EvictData(offset, offset);
+        }
+      }
+    }
+  } else {
+    // Only trimming existing buffers.
+    for (size_t i = 0; i < decoders.Length(); ++i) {
+      if (aStart <= int64_t(buffered->GetStartTime() * USECS_PER_S)) {
+        // It will be entirely emptied, can clear all data.
+        decoders[i]->GetResource()->EvictAll();
+      } else {
+        decoders[i]->Trim(aStart);
       }
-      MSE_DEBUG("remove empty decoders=%d", i);
-      RemoveDecoder(decoders[i]);
     }
   }
+
+  RemoveEmptyDecoders(decoders);
+
   return true;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/TrackBuffer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/TrackBuffer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/mediasource/TrackBuffer.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/mediasource/TrackBuffer.h	2015-02-28 15:03:08.000000000 +0000
@@ -104,6 +104,13 @@
   // Abort any pending appendBuffer by rejecting any pending promises.
   void AbortAppendData();
 
+  // Return the size used by all decoders managed by this TrackBuffer.
+  int64_t GetSize();
+
+  // Return true if we have a partial media segment being appended that is
+  // currently not playable.
+  bool HasOnlyIncompleteMedia();
+
 #ifdef MOZ_EME
   nsresult SetCDMProxy(CDMProxy* aProxy);
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaStreamGraph.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaStreamGraph.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaStreamGraph.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaStreamGraph.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -535,22 +535,18 @@
     // If this is a AudioNodeStream, force a AudioCallbackDriver.
     if (stream->AsAudioNodeStream()) {
       audioTrackPresent = true;
-    }
-    for (StreamBuffer::TrackIter tracks(stream->GetStreamBuffer(), MediaSegment::AUDIO);
-         !tracks.IsEnded(); tracks.Next()) {
-      audioTrackPresent = true;
+    } else {
+      for (StreamBuffer::TrackIter tracks(stream->GetStreamBuffer(), MediaSegment::AUDIO);
+           !tracks.IsEnded(); tracks.Next()) {
+        audioTrackPresent = true;
+      }
     }
   }
 
   if (!audioTrackPresent &&
       CurrentDriver()->AsAudioCallbackDriver()) {
-    bool started;
-    {
-      MonitorAutoLock mon(mMonitor);
-      started = CurrentDriver()->AsAudioCallbackDriver()->IsStarted();
-    }
-    if (started) {
-      MonitorAutoLock mon(mMonitor);
+    MonitorAutoLock mon(mMonitor);
+    if (CurrentDriver()->AsAudioCallbackDriver()->IsStarted()) {
       if (mLifecycleState == LIFECYCLE_RUNNING) {
         SystemClockDriver* driver = new SystemClockDriver(this);
         CurrentDriver()->SwitchAtNextIteration(driver);
@@ -570,6 +566,12 @@
   }
 #endif
 
+  if (!mStreamOrderDirty) {
+    return;
+  }
+
+  mStreamOrderDirty = false;
+
   // The algorithm for finding cycles is based on Tim Leslie's iterative
   // implementation [1][2] of Pearce's variant [3] of Tarjan's strongly
   // connected components (SCC) algorithm.  There are variations (a) to
@@ -1262,9 +1264,7 @@
   }
   mFrontMessageQueue.Clear();
 
-  if (mStreamOrderDirty) {
-    UpdateStreamOrder();
-  }
+  UpdateStreamOrder();
 
   bool ensureNextIteration = false;
 
@@ -2275,10 +2275,12 @@
 
 void
 SourceMediaStream::AddTrackInternal(TrackID aID, TrackRate aRate, StreamTime aStart,
-                                    MediaSegment* aSegment)
+                                    MediaSegment* aSegment, uint32_t aFlags)
 {
   MutexAutoLock lock(mMutex);
-  TrackData* data = mUpdateTracks.AppendElement();
+  nsTArray<TrackData> *track_data = (aFlags & ADDTRACK_QUEUED) ?
+                                    &mPendingTracks : &mUpdateTracks;
+  TrackData* data = track_data->AppendElement();
   data->mID = aID;
   data->mInputRate = aRate;
   data->mStart = aStart;
@@ -2286,6 +2288,16 @@
   data->mCommands = TRACK_CREATE;
   data->mData = aSegment;
   data->mHaveEnough = false;
+  if (!(aFlags & ADDTRACK_QUEUED) && GraphImpl()) {
+    GraphImpl()->EnsureNextIteration();
+  }
+}
+
+void
+SourceMediaStream::FinishAddTracks()
+{
+  MutexAutoLock lock(mMutex);
+  mUpdateTracks.MoveElementsFrom(mPendingTracks);
   if (GraphImpl()) {
     GraphImpl()->EnsureNextIteration();
   }
@@ -2515,6 +2527,7 @@
     SourceMediaStream::TrackData* data = &mUpdateTracks[i];
     data->mCommands |= TRACK_END;
   }
+  mPendingTracks.Clear();
   FinishWithLockHeld();
   // we will call NotifyEvent() to let GetUserMedia know
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaStreamGraph.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaStreamGraph.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/MediaStreamGraph.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/MediaStreamGraph.h	2015-02-28 15:03:08.000000000 +0000
@@ -720,27 +720,37 @@
   void AddDirectListener(MediaStreamDirectListener* aListener);
   void RemoveDirectListener(MediaStreamDirectListener* aListener);
 
+  enum {
+    ADDTRACK_QUEUED    = 0x01 // Queue track add until FinishAddTracks()
+  };
   /**
    * Add a new track to the stream starting at the given base time (which
    * must be greater than or equal to the last time passed to
    * AdvanceKnownTracksTime). Takes ownership of aSegment. aSegment should
    * contain data starting after aStart.
    */
-  void AddTrack(TrackID aID, StreamTime aStart, MediaSegment* aSegment)
+  void AddTrack(TrackID aID, StreamTime aStart, MediaSegment* aSegment,
+                uint32_t aFlags = 0)
   {
-    AddTrackInternal(aID, GraphRate(), aStart, aSegment);
+    AddTrackInternal(aID, GraphRate(), aStart, aSegment, aFlags);
   }
 
   /**
    * Like AddTrack, but resamples audio from aRate to the graph rate.
    */
   void AddAudioTrack(TrackID aID, TrackRate aRate, StreamTime aStart,
-                     AudioSegment* aSegment)
+                     AudioSegment* aSegment, uint32_t aFlags = 0)
   {
-    AddTrackInternal(aID, aRate, aStart, aSegment);
+    AddTrackInternal(aID, aRate, aStart, aSegment, aFlags);
   }
 
   /**
+   * Call after a series of AddTrack or AddAudioTrack calls to implement
+   * any pending track adds.
+   */
+  void FinishAddTracks();
+
+  /**
    * Append media data to a track. Ownership of aSegment remains with the caller,
    * but aSegment is emptied.
    * Returns false if the data was not appended because no such track exists
@@ -874,7 +884,8 @@
   void ResampleAudioToGraphSampleRate(TrackData* aTrackData, MediaSegment* aSegment);
 
   void AddTrackInternal(TrackID aID, TrackRate aRate,
-                        StreamTime aStart, MediaSegment* aSegment);
+                        StreamTime aStart, MediaSegment* aSegment,
+                        uint32_t aFlags);
 
   TrackData* FindDataForTrack(TrackID aID)
   {
@@ -905,6 +916,7 @@
   // protected by mMutex
   StreamTime mUpdateKnownTracksTime;
   nsTArray<TrackData> mUpdateTracks;
+  nsTArray<TrackData> mPendingTracks;
   nsTArray<nsRefPtr<MediaStreamDirectListener> > mDirectListeners;
   bool mPullEnabled;
   bool mUpdateFinished;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -147,6 +147,7 @@
     'MediaDevices.h',
     'MediaStreamError.h',
     'MediaStreamTrack.h',
+    'RTCIdentityProviderRegistrar.h',
     'TextTrack.h',
     'TextTrackCue.h',
     'TextTrackCueList.h',
@@ -193,6 +194,7 @@
     'MediaTrack.cpp',
     'MediaTrackList.cpp',
     'MP3FrameParser.cpp',
+    'RTCIdentityProviderRegistrar.cpp',
     'RtspMediaResource.cpp',
     'SharedThreadPool.cpp',
     'StreamBuffer.cpp',
@@ -236,7 +238,7 @@
 ]
 
 EXTRA_JS_MODULES.media += [
-    'IdpProxy.jsm',
+    'IdpSandbox.jsm',
     'PeerConnectionIdp.jsm',
     'RTCStatsReport.jsm',
 ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/omx/OmxDecoder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/omx/OmxDecoder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/omx/OmxDecoder.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/omx/OmxDecoder.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -65,7 +65,7 @@
   mAudioChannels(-1),
   mAudioSampleRate(-1),
   mDurationUs(-1),
-  mVideoLastFrameTime(-1),
+  mLastSeekTime(-1),
   mVideoBuffer(nullptr),
   mAudioBuffer(nullptr),
   mIsVideoSeeking(false),
@@ -386,6 +386,10 @@
 
   mNativeWindowClient.clear();
   mNativeWindow.clear();
+
+  // Reset this variable to make the first seek go to the previous keyframe
+  // when resuming
+  mLastSeekTime = -1;
 }
 
 bool OmxDecoder::SetVideoFormat() {
@@ -564,12 +568,13 @@
     MediaSource::ReadOptions::SeekMode seekMode;
     // If the last timestamp of decoded frame is smaller than seekTime,
     // seek to next key frame. Otherwise seek to the previos one.
-    if (mVideoLastFrameTime > aTimeUs || mVideoLastFrameTime == -1) {
+    OD_LOG("SeekTime: %lld, mLastSeekTime:%lld", aTimeUs, mLastSeekTime);
+    if (mLastSeekTime == -1 || mLastSeekTime > aTimeUs) {
       seekMode = MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC;
     } else {
       seekMode = MediaSource::ReadOptions::SEEK_NEXT_SYNC;
     }
-
+    mLastSeekTime = aTimeUs;
     bool findNextBuffer = true;
     while (findNextBuffer) {
       options.setSeekTo(aTimeUs, seekMode);
@@ -675,7 +680,6 @@
     if ((aKeyframeSkip && timeUs < aTimeUs) || length == 0) {
       aFrame->mShouldSkip = true;
     }
-    mVideoLastFrameTime = timeUs;
   }
   else if (err == INFO_FORMAT_CHANGED) {
     // If the format changed, update our cached info.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/omx/OmxDecoder.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/omx/OmxDecoder.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/omx/OmxDecoder.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/omx/OmxDecoder.h	2015-02-28 15:03:08.000000000 +0000
@@ -60,7 +60,7 @@
   int32_t mAudioChannels;
   int32_t mAudioSampleRate;
   int64_t mDurationUs;
-  int64_t mVideoLastFrameTime;
+  int64_t mLastSeekTime;
 
   VideoFrame mVideoFrame;
   AudioFrame mAudioFrame;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/PeerConnectionIdp.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/PeerConnectionIdp.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/PeerConnectionIdp.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/PeerConnectionIdp.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -3,82 +3,78 @@
  * License, v. 2.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.EXPORTED_SYMBOLS = ["PeerConnectionIdp"];
+this.EXPORTED_SYMBOLS = ['PeerConnectionIdp'];
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "IdpProxy",
-  "resource://gre/modules/media/IdpProxy.jsm");
+Cu.import('resource://gre/modules/Services.jsm');
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+XPCOMUtils.defineLazyModuleGetter(this, 'IdpSandbox',
+  'resource://gre/modules/media/IdpSandbox.jsm');
 
 /**
  * Creates an IdP helper.
  *
- * @param window (object) the window object to use for miscellaneous goodies
+ * @param win (object) the window we are working for
  * @param timeout (int) the timeout in milliseconds
- * @param warningFunc (function) somewhere to dump warning messages
- * @param dispatchEventFunc (function) somewhere to dump error events
  */
-function PeerConnectionIdp(window, timeout, warningFunc, dispatchEventFunc) {
-  this._win = window;
+function PeerConnectionIdp(win, timeout) {
+  this._win = win;
   this._timeout = timeout || 5000;
-  this._warning = warningFunc;
-  this._dispatchEvent = dispatchEventFunc;
 
-  this.assertion = null;
   this.provider = null;
+  this._resetAssertion();
 }
 
 (function() {
-  PeerConnectionIdp._mLinePattern = new RegExp("^m=", "m");
+  PeerConnectionIdp._mLinePattern = new RegExp('^m=', 'm');
   // attributes are funny, the 'a' is case sensitive, the name isn't
-  let pattern = "^a=[iI][dD][eE][nN][tT][iI][tT][yY]:(\\S+)";
-  PeerConnectionIdp._identityPattern = new RegExp(pattern, "m");
-  pattern = "^a=[fF][iI][nN][gG][eE][rR][pP][rR][iI][nN][tT]:(\\S+) (\\S+)";
-  PeerConnectionIdp._fingerprintPattern = new RegExp(pattern, "m");
+  let pattern = '^a=[iI][dD][eE][nN][tT][iI][tT][yY]:(\\S+)';
+  PeerConnectionIdp._identityPattern = new RegExp(pattern, 'm');
+  pattern = '^a=[fF][iI][nN][gG][eE][rR][pP][rR][iI][nN][tT]:(\\S+) (\\S+)';
+  PeerConnectionIdp._fingerprintPattern = new RegExp(pattern, 'm');
 })();
 
 PeerConnectionIdp.prototype = {
+  get enabled() {
+    return !!this._idp;
+  },
+
+  _resetAssertion: function() {
+    this.assertion = null;
+    this.idpLoginUrl = null;
+  },
+
   setIdentityProvider: function(provider, protocol, username) {
+    this._resetAssertion();
     this.provider = provider;
-    this.protocol = protocol;
+    this.protocol = protocol || 'default';
     this.username = username;
-    if (this._idpchannel) {
-      if (this._idpchannel.isSame(provider, protocol)) {
-        return;
+    if (this._idp) {
+      if (this._idp.isSame(provider, protocol)) {
+        return; // noop
       }
-      this._idpchannel.close();
+      this._idp.stop();
     }
-    this._idpchannel = new IdpProxy(provider, protocol);
+    this._idp = new IdpSandbox(provider, protocol);
   },
 
-  close: function() {
-    this.assertion = null;
-    this.provider = null;
-    if (this._idpchannel) {
-      this._idpchannel.close();
-      this._idpchannel = null;
-    }
+  // start the IdP and do some error fixup
+  start: function() {
+    return this._idp.start()
+      .catch(e => {
+        throw new this._win.DOMException(e.message, 'IdpError');
+      });
   },
 
-  /**
-   * Generate an error event of the identified type;
-   * and put a little more precise information in the console.
-   */
-  reportError: function(type, message, extra) {
-    let args = {
-      idp: this.provider,
-      protocol: this.protocol
-    };
-    if (extra) {
-      Object.keys(extra).forEach(function(k) {
-        args[k] = extra[k];
-      });
+  close: function() {
+    this._resetAssertion();
+    this.provider = null;
+    this.protocol = null;
+    if (this._idp) {
+      this._idp.stop();
+      this._idp = null;
     }
-    this._warning("RTC identity: " + message, null, 0);
-    let ev = new this._win.RTCPeerConnectionIdentityErrorEvent('idp' + type + 'error', args);
-    this._dispatchEvent(ev);
   },
 
   _getFingerprintsFromSdp: function(sdp) {
@@ -93,6 +89,14 @@
     return Object.keys(fingerprints).map(k => fingerprints[k]);
   },
 
+  _isValidAssertion: function(assertion) {
+    return assertion && assertion.idp &&
+      typeof assertion.idp.domain === 'string' &&
+      (!assertion.idp.protocol ||
+       typeof assertion.idp.protocol === 'string') &&
+      typeof assertion.assertion === 'string';
+  },
+
   _getIdentityFromSdp: function(sdp) {
     // a=identity is session level
     let idMatch;
@@ -101,161 +105,152 @@
       let sessionLevel = sdp.substring(0, mLineMatch.index);
       idMatch = sessionLevel.match(PeerConnectionIdp._identityPattern);
     }
-    if (idMatch) {
-      let assertion = {};
-      try {
-        assertion = JSON.parse(atob(idMatch[1]));
-      } catch (e) {
-        this.reportError("validation",
-                         "invalid identity assertion: " + e);
-      } // for JSON.parse
-      if (typeof assertion.idp === "object" &&
-          typeof assertion.idp.domain === "string" &&
-          typeof assertion.assertion === "string") {
-        return assertion;
-      }
+    if (!idMatch) {
+      return; // undefined === no identity
+    }
 
-      this.reportError("validation", "assertion missing" +
-                       " idp/idp.domain/assertion");
+    let assertion;
+    try {
+      assertion = JSON.parse(atob(idMatch[1]));
+    } catch (e) {
+      throw new this._win.DOMException('invalid identity assertion: ' + e,
+                                       'InvalidSessionDescriptionError');
+    }
+    if (!this._isValidAssertion(assertion)) {
+      throw new this._win.DOMException('assertion missing idp/idp.domain/assertion',
+                                       'InvalidSessionDescriptionError');
     }
-    // undefined!
+    return assertion;
   },
 
   /**
-   * Queues a task to verify the a=identity line the given SDP contains, if any.
+   * Verifies the a=identity line the given SDP contains, if any.
    * If the verification succeeds callback is called with the message from the
    * IdP proxy as parameter, else (verification failed OR no a=identity line in
    * SDP at all) null is passed to callback.
+   *
+   * Note that this only verifies that the SDP is coherent.  We still rely on
+   * the fact that the RTCPeerConnection won't connect to a peer if the
+   * fingerprint of the certificate they offer doesn't appear in the SDP.
    */
-  verifyIdentityFromSDP: function(sdp, origin, callback) {
+  verifyIdentityFromSDP: function(sdp, origin) {
     let identity = this._getIdentityFromSdp(sdp);
     let fingerprints = this._getFingerprintsFromSdp(sdp);
-    // it's safe to use the fingerprint we got from the SDP here,
-    // only because we ensure that there is only one
     if (!identity || fingerprints.length <= 0) {
-      callback(null);
-      return;
+      return this._win.Promise.resolve(); // undefined result = no identity
     }
 
     this.setIdentityProvider(identity.idp.domain, identity.idp.protocol);
-    this._verifyIdentity(identity.assertion, fingerprints, origin, callback);
+    return this._verifyIdentity(identity.assertion, fingerprints, origin);
   },
 
   /**
    * Checks that the name in the identity provided by the IdP is OK.
    *
    * @param name (string) the name to validate
-   * @returns (string) an error message, iff the name isn't good
+   * @throws if the name isn't valid
    */
   _validateName: function(name) {
-    if (typeof name !== "string") {
-      return "name not a string";
+    let error = msg => {
+        throw new this._win.DOMException('assertion name error: ' + msg,
+                                         'IdpError');
+    };
+
+    if (typeof name !== 'string') {
+      error('name not a string');
     }
-    let atIdx = name.indexOf("@");
-    if (atIdx > 0) {
-      // no third party assertions... for now
-      let tail = name.substring(atIdx + 1);
-
-      // strip the port number, if present
-      let provider = this.provider;
-      let providerPortIdx = provider.indexOf(":");
-      if (providerPortIdx > 0) {
-        provider = provider.substring(0, providerPortIdx);
-      }
-      let idnService = Components.classes["@mozilla.org/network/idn-service;1"].
-        getService(Components.interfaces.nsIIDNService);
-      if (idnService.convertUTF8toACE(tail) !==
-          idnService.convertUTF8toACE(provider)) {
-        return "name '" + identity.name +
-            "' doesn't match IdP: '" + this.provider + "'";
-      }
-      return null;
+    let atIdx = name.indexOf('@');
+    if (atIdx <= 0) {
+      error('missing authority in name from IdP');
+    }
+
+    // no third party assertions... for now
+    let tail = name.substring(atIdx + 1);
+
+    // strip the port number, if present
+    let provider = this.provider;
+    let providerPortIdx = provider.indexOf(':');
+    if (providerPortIdx > 0) {
+      provider = provider.substring(0, providerPortIdx);
+    }
+    let idnService = Components.classes['@mozilla.org/network/idn-service;1']
+        .getService(Components.interfaces.nsIIDNService);
+    if (idnService.convertUTF8toACE(tail) !==
+        idnService.convertUTF8toACE(provider)) {
+      error('name "' + identity.name +
+            '" doesn\'t match IdP: "' + this.provider + '"');
     }
-    return "missing authority in name from IdP";
   },
 
-  // we are very defensive here when handling the message from the IdP
-  // proxy so that broken IdPs can only do as little harm as possible.
-  _checkVerifyResponse: function(message, fingerprints) {
-    let warn = msg => {
-      this.reportError("validation",
-                       "assertion validation failure: " + msg);
+  /**
+   * Check the validation response.  We are very defensive here when handling
+   * the message from the IdP proxy.  That way, broken IdPs aren't likely to
+   * cause catastrophic damage.
+   */
+  _checkValidation: function(validation, sdpFingerprints) {
+    let error = msg => {
+      throw new this._win.DOMException('IdP validation error: ' + msg,
+                                       'IdpError');
     };
 
-    let isSubsetOf = (outer, inner, cmp) => {
-      return inner.some(i => {
-        return !outer.some(o => cmp(i, o));
+    if (!this.provider) {
+      error('IdP closed');
+    }
+
+    if (typeof validation !== 'object' ||
+        typeof validation.contents !== 'string' ||
+        typeof validation.identity !== 'string') {
+      error('no payload in validation response');
+    }
+
+    let fingerprints;
+    try {
+      fingerprints = JSON.parse(validation.contents).fingerprint;
+    } catch (e) {
+      error('invalid JSON');
+    }
+
+    let isFingerprint = f =>
+        (typeof f.digest === 'string') &&
+        (typeof f.algorithm === 'string');
+    if (!Array.isArray(fingerprints) || !fingerprints.every(isFingerprint)) {
+      error('fingerprints must be an array of objects' +
+            ' with digest and algorithm attributes');
+    }
+
+    // everything in `innerSet` is found in `outerSet`
+    let isSubsetOf = (outerSet, innerSet, comparator) => {
+      return innerSet.every(i => {
+        return outerSet.some(o => comparator(i, o));
       });
     };
     let compareFingerprints = (a, b) => {
       return (a.digest === b.digest) && (a.algorithm === b.algorithm);
     };
-
-    try {
-      let contents = JSON.parse(message.contents);
-      if (!Array.isArray(contents.fingerprint)) {
-        warn("fingerprint is not an array");
-      } else if (isSubsetOf(contents.fingerprint, fingerprints,
-                            compareFingerprints)) {
-        warn("fingerprints in SDP aren't a subset of those in the assertion");
-      } else {
-        let error = this._validateName(message.identity);
-        if (error) {
-          warn(error);
-        } else {
-          return true;
-        }
-      }
-    } catch(e) {
-      warn("invalid JSON in content");
+    if (!isSubsetOf(fingerprints, sdpFingerprints, compareFingerprints)) {
+      error('the fingerprints must be covered by the assertion');
     }
-    return false;
+    this._validateName(validation.identity);
+    return validation;
   },
 
   /**
-   * Asks the IdP proxy to verify an identity.
+   * Asks the IdP proxy to verify an identity assertion.
    */
-  _verifyIdentity: function(assertion, fingerprints, origin, callback) {
-    function onVerification(message) {
-      if (message && this._checkVerifyResponse(message, fingerprints)) {
-        callback(message);
-      } else {
-        this._warning("RTC identity: assertion validation failure", null, 0);
-        callback(null);
-      }
-    }
-
-    let request = {
-      type: "VERIFY",
-      message: assertion,
-      origin: origin
-    };
-    this._sendToIdp(request, "validation", onVerification.bind(this));
-  },
-
-  /**
-   * Asks the IdP proxy for an identity assertion and, on success, enriches the
-   * given SDP with an a=identity line and calls callback with the new SDP as
-   * parameter. If no IdP is configured the original SDP (without a=identity
-   * line) is passed to the callback.
-   */
-  appendIdentityToSDP: function(sdp, fingerprint, origin, callback) {
-    let onAssertion = function() {
-      callback(this.wrapSdp(sdp), this.assertion);
-    }.bind(this);
-
-    if (!this._idpchannel || this.assertion) {
-      onAssertion();
-      return;
-    }
+  _verifyIdentity: function(assertion, fingerprints, origin) {
+    let p = this.start()
+        .then(idp => this._wrapCrossCompartmentPromise(
+          idp.validateAssertion(assertion, origin)))
+        .then(validation => this._checkValidation(validation, fingerprints));
 
-    this._getIdentityAssertion(fingerprint, origin, onAssertion);
+    return this._applyTimeout(p);
   },
 
   /**
-   * Inserts an identity assertion into the given SDP.
+   * Enriches the given SDP with an `a=identity` line.  getIdentityAssertion()
+   * must have already run successfully, otherwise this does nothing to the sdp.
    */
-  wrapSdp: function(sdp) {
+  addIdentityAttribute: function(sdp) {
     if (!this.assertion) {
       return sdp;
     }
@@ -263,103 +258,83 @@
     // yes, we assume that this matches; if it doesn't something is *wrong*
     let match = sdp.match(PeerConnectionIdp._mLinePattern);
     return sdp.substring(0, match.index) +
-      "a=identity:" + this.assertion + "\r\n" +
+      'a=identity:' + this.assertion + '\r\n' +
       sdp.substring(match.index);
   },
 
-  getIdentityAssertion: function(fingerprint, callback) {
-    if (!this._idpchannel) {
-      this.reportError("assertion", "IdP not set");
-      callback(null);
-      return;
+  /**
+   * Asks the IdP proxy for an identity assertion.  Don't call this unless you
+   * have checked .enabled, or you really like exceptions.  Also, don't call
+   * this when another call is still running, because it's not certain which
+   * call will finish first and the final state will be similarly uncertain.
+   */
+  getIdentityAssertion: function(fingerprint, origin) {
+    if (!this.enabled) {
+      throw new this._win.DOMException(
+        'no IdP set, call setIdentityProvider() to set one', 'InvalidStateError');
     }
 
-    let origin = Cu.getWebIDLCallerPrincipal().origin;
-    this._getIdentityAssertion(fingerprint, origin, callback);
-  },
-
-  _getIdentityAssertion: function(fingerprint, origin, callback) {
-    let [algorithm, digest] = fingerprint.split(" ", 2);
-    let message = {
+    let [algorithm, digest] = fingerprint.split(' ', 2);
+    let content = {
       fingerprint: [{
         algorithm: algorithm,
         digest: digest
       }]
     };
-    let request = {
-      type: "SIGN",
-      message: JSON.stringify(message),
-      username: this.username,
-      origin: origin
-    };
 
-    // catch the assertion, clean it up, warn if absent
-    function trapAssertion(assertion) {
-      if (!assertion) {
-        this._warning("RTC identity: assertion generation failure", null, 0);
-        this.assertion = null;
-      } else {
-        this.assertion = btoa(JSON.stringify(assertion));
-      }
-      callback(this.assertion);
-    }
+    this._resetAssertion();
+    let p = this.start()
+        .then(idp => this._wrapCrossCompartmentPromise(
+          idp.generateAssertion(JSON.stringify(content),
+                                origin, this.username)))
+        .then(assertion => {
+          if (!this._isValidAssertion(assertion)) {
+            throw new this._win.DOMException('IdP generated invalid assertion',
+                                             'IdpError');
+          }
+          // save the base64+JSON assertion, since that is all that is used
+          this.assertion = btoa(JSON.stringify(assertion));
+          return this.assertion;
+        });
 
-    this._sendToIdp(request, "assertion", trapAssertion.bind(this));
+    return this._applyTimeout(p);
   },
 
   /**
-   * Packages a message and sends it to the IdP.
-   * @param request (dictionary) the message to send
-   * @param type (DOMString) the type of message (assertion/validation)
-   * @param callback (function) the function to call with the results
+   * Promises generated by the sandbox need to be very carefully treated so that
+   * they can chain into promises in the `this._win` compartment.  Results need
+   * to be cloned across; errors need to be converted.
    */
-  _sendToIdp: function(request, type, callback) {
-    this._idpchannel.send(request, this._wrapCallback(type, callback));
-  },
-
-  _reportIdpError: function(type, message) {
-    let args = {};
-    let msg = "";
-    if (message.type === "ERROR") {
-      msg = message.error;
-    } else {
-      msg = JSON.stringify(message.message);
-      if (message.type === "LOGINNEEDED") {
-        args.loginUrl = message.loginUrl;
-      }
-    }
-    this.reportError(type, "received response of type '" +
-                     message.type + "' from IdP: " + msg, args);
+  _wrapCrossCompartmentPromise: function(sandboxPromise) {
+    return new this._win.Promise((resolve, reject) => {
+      sandboxPromise.then(
+        result => resolve(Cu.cloneInto(result, this._win)),
+        e => {
+          let message = '' + (e.message || JSON.stringify(e) || 'IdP error');
+          if (e.name === 'IdpLoginError') {
+            if (typeof e.loginUrl === 'string') {
+              this.idpLoginUrl = e.loginUrl;
+            }
+            reject(new this._win.DOMException(message, 'IdpLoginError'));
+          } else {
+            reject(new this._win.DOMException(message, 'IdpError'));
+          }
+        });
+    });
   },
 
   /**
-   * Wraps a callback, adding a timeout and ensuring that the callback doesn't
-   * receive any message other than one where the IdP generated a "SUCCESS"
-   * response.
+   * Wraps a promise, adding a timeout guard on it so that it can't take longer
+   * than the specified time.  Returns a promise that rejects if the timeout
+   * elapses before `p` resolves.
    */
-  _wrapCallback: function(type, callback) {
-    let timeout = this._win.setTimeout(function() {
-      this.reportError(type, "IdP timeout for " + this._idpchannel + " " +
-                       (this._idpchannel.ready ? "[ready]" : "[not ready]"));
-      timeout = null;
-      callback(null);
-    }.bind(this), this._timeout);
-
-    return function(message) {
-      if (!timeout) {
-        return;
-      }
-      this._win.clearTimeout(timeout);
-      timeout = null;
-
-      let content = null;
-      if (message.type === "SUCCESS") {
-        content = message.message;
-      } else {
-        this._reportIdpError(type, message);
-      }
-      callback(content);
-    }.bind(this);
+  _applyTimeout: function(p) {
+    let timeout = new this._win.Promise(
+      r => this._win.setTimeout(r, this._timeout))
+        .then(() => {
+          throw new this._win.DOMException('IdP timed out', 'IdpError');
+        });
+    return this._win.Promise.race([ timeout, p ]);
   }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/PeerConnection.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/PeerConnection.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/PeerConnection.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/PeerConnection.js	2015-02-28 15:03:08.000000000 +0000
@@ -309,7 +309,6 @@
 
   this._localType = null;
   this._remoteType = null;
-  this._peerIdentity = null;
 
   // States
   this._iceGatheringState = this._iceConnectionState = "new";
@@ -387,13 +386,16 @@
   },
 
   _initIdp: function() {
+    this._peerIdentity = new this._win.Promise((resolve, reject) => {
+      this._resolvePeerIdentity = resolve;
+      this._rejectPeerIdentity = reject;
+    });
+    this._lastIdentityValidation = this._win.Promise.resolve();
+
     let prefName = "media.peerconnection.identity.timeout";
     let idpTimeout = Services.prefs.getIntPref(prefName);
-    let warningFunc = this.logWarning.bind(this);
-    this._localIdp = new PeerConnectionIdp(this._win, idpTimeout, warningFunc,
-                                           this.dispatchEvent.bind(this));
-    this._remoteIdp = new PeerConnectionIdp(this._win, idpTimeout, warningFunc,
-                                            this.dispatchEvent.bind(this));
+    this._localIdp = new PeerConnectionIdp(this._win, idpTimeout);
+    this._remoteIdp = new PeerConnectionIdp(this._win, idpTimeout);
   },
 
   // Add a function to the internal operations chain.
@@ -564,6 +566,15 @@
                           });
   },
 
+  _addIdentityAssertion: function(p, origin) {
+    if (this._localIdp.enabled) {
+      return this._localIdp.getIdentityAssertion(this._impl.fingerprint, origin)
+        .then(() => p)
+        .then(sdp => this._localIdp.addIdentityAttribute(sdp));
+    }
+    return p;
+  },
+
   createOffer: function(optionsOrOnSuccess, onError, options) {
     let onSuccess;
     if (typeof optionsOrOnSuccess == "function") {
@@ -572,13 +583,12 @@
       options = optionsOrOnSuccess;
     }
     return this._legacyCatch(onSuccess, onError, () => {
-
       // TODO: Remove old constraint-like RTCOptions support soon (Bug 1064223).
       // Note that webidl bindings make o.mandatory implicit but not o.optional.
       function convertLegacyOptions(o) {
         // Detect (mandatory OR optional) AND no other top-level members.
         let lcy = ((o.mandatory && Object.keys(o.mandatory).length) || o.optional) &&
-                  Object.keys(o).length == (o.mandatory? 1 : 0) + (o.optional? 1 : 0);
+            Object.keys(o).length == (o.mandatory? 1 : 0) + (o.optional? 1 : 0);
         if (!lcy) {
           return false;
         }
@@ -611,21 +621,30 @@
 
       if (options && convertLegacyOptions(options)) {
         this.logWarning(
-            "Mandatory/optional in createOffer options is deprecated! Use " +
+          "Mandatory/optional in createOffer options is deprecated! Use " +
             JSON.stringify(options) + " instead (note the case difference)!",
-            null, 0);
+          null, 0);
       }
-      return this._chain(() => new this._win.Promise((resolve, reject) => {
-        this._onCreateOfferSuccess = resolve;
-        this._onCreateOfferFailure = reject;
-        this._impl.createOffer(options);
-      }));
+
+      let origin = Cu.getWebIDLCallerPrincipal().origin;
+      return this._chain(() => {
+        let p = new this._win.Promise((resolve, reject) => {
+          this._onCreateOfferSuccess = resolve;
+          this._onCreateOfferFailure = reject;
+          this._impl.createOffer(options);
+        });
+        p = this._addIdentityAssertion(p, origin);
+        return p.then(
+          sdp => new this._win.mozRTCSessionDescription({ type: "offer", sdp: sdp }));
+      });
     });
   },
 
   createAnswer: function(onSuccess, onError) {
     return this._legacyCatch(onSuccess, onError, () => {
-      return this._chain(() => new this._win.Promise((resolve, reject) => {
+      let origin = Cu.getWebIDLCallerPrincipal().origin;
+      return this._chain(() => {
+        let p = new this._win.Promise((resolve, reject) => {
         // We give up line-numbers in errors by doing this here, but do all
         // state-checks inside the chain, to support the legacy feature that
         // callers don't have to wait for setRemoteDescription to finish.
@@ -640,10 +659,16 @@
         this._onCreateAnswerSuccess = resolve;
         this._onCreateAnswerFailure = reject;
         this._impl.createAnswer();
-      }));
+        });
+        p = this._addIdentityAssertion(p, origin);
+        return p.then(sdp => {
+          return new this._win.mozRTCSessionDescription({ type: "answer", sdp: sdp });
+        });
+      });
     });
   },
 
+
   setLocalDescription: function(desc, onSuccess, onError) {
     return this._legacyCatch(onSuccess, onError, () => {
       this._localType = desc.type;
@@ -672,6 +697,50 @@
     });
   },
 
+  _validateIdentity: function(sdp, origin) {
+    let expectedIdentity;
+
+    // Only run a single identity verification at a time.  We have to do this to
+    // avoid problems with the fact that identity validation doesn't block the
+    // resolution of setRemoteDescription().
+    let validation = this._lastIdentityValidation
+      .then(() => this._remoteIdp.verifyIdentityFromSDP(sdp, origin))
+      .then(msg => {
+        expectedIdentity = this._impl.peerIdentity;
+        // If this pc has an identity already, then the identity in sdp must match
+        if (expectedIdentity && (!msg || msg.identity !== expectedIdentity)) {
+          this.close();
+          throw new this._win.DOMException(
+            "Peer Identity mismatch, expected: " + expectedIdentity,
+            "IncompatibleSessionDescriptionError");
+        }
+        if (msg) {
+          // Set new identity and generate an event.
+          this._impl.peerIdentity = msg.identity;
+          let assertion = new this._win.RTCIdentityAssertion(
+            this._remoteIdp.provider, msg.identity);
+          this._resolvePeerIdentity(assertion);
+        }
+      })
+      .catch(e => {
+        this._rejectPeerIdentity(e);
+        // If we don't expect a specific peer identity, failure to get a valid
+        // peer identity is not a terminal state, so replace the promise to
+        // allow another attempt.
+        if (!this._impl.peerIdentity) {
+          this._peerIdentity = new this._win.Promise((resolve, reject) => {
+            this._resolvePeerIdentity = resolve;
+            this._rejectPeerIdentity = reject;
+          });
+        }
+        throw e;
+      });
+    this._lastIdentityValidation = validation.catch(() => {});
+
+    // Only wait for IdP validation if we need identity matching
+    return expectedIdentity ? validation : this._win.Promise.resolve();
+  },
+
   setRemoteDescription: function(desc, onSuccess, onError) {
     return this._legacyCatch(onSuccess, onError, () => {
       this._remoteType = desc.type;
@@ -690,42 +759,21 @@
         default:
           throw new this._win.DOMException(
               "Invalid type " + desc.type + " provided to setRemoteDescription",
-              "InvalidParameterError");
+            "InvalidParameterError");
       }
 
-      // Get caller's origin before chaining and pass it in
+      // Get caller's origin before hitting the promise chain
       let origin = Cu.getWebIDLCallerPrincipal().origin;
 
-      return this._chain(() => {
-        let expectedIdentity = this._impl.peerIdentity;
-
-        // Do setRemoteDescription and identity validation in parallel
-        let p = new this._win.Promise((resolve, reject) => {
+      // Do setRemoteDescription and identity validation in parallel
+      return this._chain(() => this._win.Promise.all([
+        new this._win.Promise((resolve, reject) => {
           this._onSetRemoteDescriptionSuccess = resolve;
           this._onSetRemoteDescriptionFailure = reject;
           this._impl.setRemoteDescription(type, desc.sdp);
-        });
-
-        let pp = new Promise(resolve =>
-            this._remoteIdp.verifyIdentityFromSDP(desc.sdp, origin, resolve))
-        .then(msg => {
-          // If this pc has an identity already, then identity in sdp must match
-          if (expectedIdentity && (!msg || msg.identity !== expectedIdentity)) {
-            throw new this._win.DOMException(
-                "Peer Identity mismatch, expected: " + expectedIdentity,
-                "IncompatibleSessionDescriptionError");
-          }
-          if (msg) {
-            // Set new identity and generate an event.
-            this._impl.peerIdentity = msg.identity;
-            this._peerIdentity = new this._win.RTCIdentityAssertion(
-              this._remoteIdp.provider, msg.identity);
-            this.dispatchEvent(new this._win.Event("peeridentity"));
-          }
-        });
-        // Only wait for Idp validation if we need identity matching.
-        return expectedIdentity? this._win.Promise.all([p, pp]).then(() => {}) : p;
-      });
+        }),
+        this._validateIdentity(desc.sdp, origin)
+      ])).then(() => {}); // must return undefined
     });
   },
 
@@ -734,23 +782,11 @@
     this._localIdp.setIdentityProvider(provider, protocol, username);
   },
 
-  _gotIdentityAssertion: function(assertion){
-    let args = { assertion: assertion };
-    let ev = new this._win.RTCPeerConnectionIdentityEvent("identityresult", args);
-    this.dispatchEvent(ev);
-  },
-
   getIdentityAssertion: function() {
-    this._checkClosed();
-
-    var gotAssertion = assertion => {
-      if (assertion) {
-        this._gotIdentityAssertion(assertion);
-      }
-    };
-
-    this._localIdp.getIdentityAssertion(this._impl.fingerprint,
-                                        gotAssertion);
+    let origin = Cu.getWebIDLCallerPrincipal().origin;
+    return this._chain(() => {
+      return this._localIdp.getIdentityAssertion(this._impl.fingerprint, origin);
+    });
   },
 
   updateIce: function(config) {
@@ -888,7 +924,7 @@
       return null;
     }
 
-    sdp = this._localIdp.wrapSdp(sdp);
+    sdp = this._localIdp.addIdentityAttribute(sdp);
     return new this._win.mozRTCSessionDescription({ type: this._localType,
                                                     sdp: sdp });
   },
@@ -904,6 +940,7 @@
   },
 
   get peerIdentity() { return this._peerIdentity; },
+  get idpLoginUrl() { return this._localIdp.idpLoginUrl; },
   get id() { return this._impl.id; },
   set id(s) { this._impl.id = s; },
   get iceGatheringState()  { return this._iceGatheringState; },
@@ -1041,16 +1078,7 @@
   },
 
   onCreateOfferSuccess: function(sdp) {
-    let pc = this._dompc;
-    let fp = pc._impl.fingerprint;
-    let origin = Cu.getWebIDLCallerPrincipal().origin;
-    pc._localIdp.appendIdentityToSDP(sdp, fp, origin, function(sdp, assertion) {
-      if (assertion) {
-        pc._gotIdentityAssertion(assertion);
-      }
-      pc._onCreateOfferSuccess(new pc._win.mozRTCSessionDescription({ type: "offer",
-                                                                      sdp: sdp }));
-    }.bind(this));
+    this._dompc._onCreateOfferSuccess(sdp);
   },
 
   onCreateOfferError: function(code, message) {
@@ -1058,16 +1086,7 @@
   },
 
   onCreateAnswerSuccess: function(sdp) {
-    let pc = this._dompc;
-    let fp = pc._impl.fingerprint;
-    let origin = Cu.getWebIDLCallerPrincipal().origin;
-    pc._localIdp.appendIdentityToSDP(sdp, fp, origin, function(sdp, assertion) {
-      if (assertion) {
-        pc._gotIdentityAssertion(assertion);
-      }
-      pc._onCreateAnswerSuccess(new pc._win.mozRTCSessionDescription({ type: "answer",
-                                                                       sdp: sdp }));
-    }.bind(this));
+    this._dompc._onCreateAnswerSuccess(sdp);
   },
 
   onCreateAnswerError: function(code, message) {
@@ -1266,7 +1285,7 @@
     var pc = this._dompc;
     pc._onReplaceTrackWithTrack = null;
     pc._onReplaceTrackSender = null;
-    pc._onReplaceTrackError(this.newError(message, code));
+    pc._onReplaceTrackFailure(this.newError(message, code));
   },
 
   foundIceCandidate: function(cand) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/RTCIdentityProviderRegistrar.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/RTCIdentityProviderRegistrar.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/RTCIdentityProviderRegistrar.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/RTCIdentityProviderRegistrar.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,88 @@
+/* -*- 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 "RTCIdentityProviderRegistrar.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/dom/RTCIdentityProviderBinding.h"
+#include "nsCycleCollectionParticipant.h"
+
+namespace mozilla {
+namespace dom {
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(RTCIdentityProviderRegistrar)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(RTCIdentityProviderRegistrar)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(RTCIdentityProviderRegistrar)
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(RTCIdentityProviderRegistrar,
+                                      mGlobal, mIdp)
+
+RTCIdentityProviderRegistrar::RTCIdentityProviderRegistrar(
+    nsIGlobalObject* aGlobal)
+    : mGlobal(aGlobal)
+    , mIdp(nullptr)
+{
+  MOZ_COUNT_CTOR(RTCIdentityProviderRegistrar);
+}
+
+RTCIdentityProviderRegistrar::~RTCIdentityProviderRegistrar()
+{
+  MOZ_COUNT_DTOR(RTCIdentityProviderRegistrar);
+}
+
+nsIGlobalObject*
+RTCIdentityProviderRegistrar::GetParentObject() const
+{
+  return mGlobal;
+}
+
+JSObject*
+RTCIdentityProviderRegistrar::WrapObject(JSContext* aCx)
+{
+  return RTCIdentityProviderRegistrarBinding::Wrap(aCx, this);
+}
+
+void
+RTCIdentityProviderRegistrar::Register(RTCIdentityProvider& aIdp)
+{
+  mIdp = &aIdp;
+}
+
+already_AddRefed<RTCIdentityProvider>
+RTCIdentityProviderRegistrar::GetIdp()
+{
+  nsRefPtr<RTCIdentityProvider> idp = mIdp;
+  return idp.forget();
+}
+
+already_AddRefed<Promise>
+RTCIdentityProviderRegistrar::GenerateAssertion(
+  const nsAString& aContents, const nsAString& aOrigin,
+  const Optional<nsAString>& aUsernameHint, ErrorResult& aRv)
+{
+  if (!mIdp) {
+    aRv.Throw(NS_ERROR_NOT_INITIALIZED);
+    return nullptr;
+  }
+  return mIdp->GenerateAssertion(aContents, aOrigin, aUsernameHint, aRv);
+}
+already_AddRefed<Promise>
+RTCIdentityProviderRegistrar::ValidateAssertion(
+  const nsAString& aAssertion, const nsAString& aOrigin, ErrorResult& aRv)
+{
+  if (!mIdp) {
+    aRv.Throw(NS_ERROR_NOT_INITIALIZED);
+    return nullptr;
+  }
+  return mIdp->ValidateAssertion(aAssertion, aOrigin, aRv);
+}
+
+
+
+} // namespace dom
+} // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/RTCIdentityProviderRegistrar.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/RTCIdentityProviderRegistrar.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/RTCIdentityProviderRegistrar.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/RTCIdentityProviderRegistrar.h	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,57 @@
+/* -*- 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/. */
+
+#ifndef RTCIDENTITYPROVIDER_H_
+#define RTCIDENTITYPROVIDER_H_
+
+#include "nsRefPtr.h"
+#include "nsCOMPtr.h"
+#include "nsISupportsImpl.h"
+#include "nsIGlobalObject.h"
+#include "nsWrapperCache.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/BindingDeclarations.h"
+
+namespace mozilla {
+namespace dom {
+
+class RTCIdentityProvider;
+
+class RTCIdentityProviderRegistrar MOZ_FINAL : public nsISupports,
+                                               public nsWrapperCache
+{
+public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(RTCIdentityProviderRegistrar)
+
+  explicit RTCIdentityProviderRegistrar(nsIGlobalObject* aGlobal);
+
+  // As required
+  nsIGlobalObject* GetParentObject() const;
+  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+
+  // setter and getter
+  void Register(RTCIdentityProvider& aIdp);
+  already_AddRefed<RTCIdentityProvider> GetIdp();
+
+  already_AddRefed<Promise>
+  GenerateAssertion(const nsAString& aContents, const nsAString& aOrigin,
+                    const Optional<nsAString>& aUsernameHint, ErrorResult& aRv);
+  already_AddRefed<Promise>
+  ValidateAssertion(const nsAString& assertion, const nsAString& origin,
+                    ErrorResult& aRv);
+
+private:
+  ~RTCIdentityProviderRegistrar();
+
+  nsCOMPtr<nsIGlobalObject> mGlobal;
+  nsRefPtr<RTCIdentityProvider> mIdp;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif /* RTCIDENTITYPROVIDER_H_ */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/manifest.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/manifest.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/manifest.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/manifest.js	2015-02-28 15:03:08.000000000 +0000
@@ -646,29 +646,6 @@
 // Test files for Encrypted Media Extensions
 var gEMETests = [
   {
-    name:"short-cenc.mp4",
-    type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"",
-    keys: {
-      // "keyid" : "key"
-      "7e571d017e571d017e571d017e571d01" : "7e5711117e5711117e5711117e571111",
-      "7e571d027e571d027e571d027e571d02" : "7e5722227e5722227e5722227e572222",
-    },
-    sessionType:"temporary",
-    duration:0.47
-  },
-  {
-    name:"short-cenc.mp4",
-    type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"",
-    keys: {
-      // "keyid" : "key"
-      "7e571d017e571d017e571d017e571d01" : "7e5711117e5711117e5711117e571111",
-      "7e571d027e571d027e571d027e571d02" : "7e5722227e5722227e5722227e572222",
-    },
-    sessionType:"temporary",
-    duration:0.47,
-    crossOrigin:true,
-  },
-  {
     name:"gizmo-frag-cencinit.mp4",
     fragments: [ "gizmo-frag-cencinit.mp4", "gizmo-frag-cenc1.m4s", "gizmo-frag-cenc2.m4s" ],
     type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/mochitest.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/mochitest.ini	2015-02-28 15:03:08.000000000 +0000
@@ -233,7 +233,6 @@
   seek_with_sound.ogg^headers^
   sine.webm
   sine.webm^headers^
-  short-cenc.mp4
   short-video.ogv
   short-video.ogv^headers^
   small-shot-mp3.mp4
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/short-cenc.mp4 and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/short-cenc.mp4 differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/short-cenc.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/short-cenc.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/short-cenc.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/short-cenc.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This XML file describes the encryption applied to short-cenc.mp4. To generate
-  short-cenc, run the following command:
-
-    MP4Box -crypt short-cenc.xml -out short-cenc.mp4 short.mp4
--->
-
-<GPACDRM type="CENC AES-CTR">
-
-  <DRMInfo type="pssh" version="1">
-    <!--
-    SystemID specified in
-    https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html
-    -->
-    <BS ID128="1077efecc0b24d02ace33c1e52e2fb4b" />
-    <!-- Number of KeyIDs = 2 -->
-    <BS bits="32" value="2" />
-    <!-- KeyID -->
-    <BS ID128="0x7e571d017e571d017e571d017e571d01" />
-    <BS ID128="0x7e571d027e571d027e571d027e571d02" />
-  </DRMInfo>
-
-  <CrypTrack trackID="1" isEncrypted="1" IV_size="16" saiSavedBox="senc"
-    first_IV="0x00000000000000000000000000000000">
-    <key KID="0x7e571d017e571d017e571d017e571d01"
-      value="0x7e5711117e5711117e5711117e571111" />
-  </CrypTrack>
-
-  <CrypTrack trackID="2" isEncrypted="1" IV_size="16" saiSavedBox="senc"
-    first_IV="0x00000000000000000000000000000000">
-    <key KID="0x7e571d027e571d027e571d027e571d02"
-      value="0x7e5722227e5722227e5722227e572222" />
-  </CrypTrack>
-
-</GPACDRM>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/test/test_eme_requestKeySystemAccess.html	2015-02-28 15:03:08.000000000 +0000
@@ -266,6 +266,26 @@
     ],
     shouldPass: false,
   },
+  {
+    name: "CDM version less than",
+    keySystem: CLEARKEY_ID + ".0",
+    shouldPass: true
+  },
+  {
+    name: "CDM version equal to",
+    keySystem: CLEARKEY_ID + ".1",
+    shouldPass: true
+  },
+  {
+    name: "CDM version greater than",
+    keySystem: CLEARKEY_ID + ".2",
+    shouldPass: false
+  },
+  {
+    name: "Non-whole number CDM version",
+    keySystem: CLEARKEY_ID + ".0.1",
+    shouldPass: false
+  },
 ];
 
 function beginTest() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/identityevent.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/identityevent.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/identityevent.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/identityevent.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-(function(g) {
-  'use strict';
-
-  g.trapIdentityEvents = target => {
-    var state = {};
-    var identityEvents = ['idpassertionerror', 'idpvalidationerror',
-                          'identityresult', 'peeridentity'];
-    identityEvents.forEach(function(name) {
-      target.addEventListener(name, function(e) {
-        state[name] = e;
-      }, false);
-    });
-    return state;
-  };
-}(this));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>IDP Proxy</title>
-    <script src="idp-proxy.js"></script>
-  </head>
-  <body>
-    Test IDP Proxy
-  </body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,90 @@
+(function(global) {
+  "use strict";
+
+  // rather than create a million different IdP configurations and litter the
+  // world with files all containing near-identical code, let's use the hash/URL
+  // fragment as a way of generating instructions for the IdP
+  var instructions = global.location.hash.replace("#", "").split(":");
+  function is(target) {
+    return function(instruction) {
+      return instruction === target;
+    };
+  }
+
+  function IDPJS() {
+    this.domain = global.location.host;
+    var path = global.location.pathname;
+    this.protocol =
+      path.substring(path.lastIndexOf('/') + 1) + global.location.hash;
+  }
+
+  function borkResult(result) {
+    if (instructions.some(is("throw"))) {
+      throw new Error('Throwing!');
+    }
+    if (instructions.some(is("fail"))) {
+      return Promise.reject(new Error('Failing!'));
+    }
+    if (instructions.some(is("loginerror"))) {
+      return Promise.reject({
+        name: 'IdpLoginError',
+        loginUrl: 'https://example.com/log/in/here'
+      });
+    }
+    if (instructions.some(is("hang"))) {
+      return new Promise(r => {});
+    }
+    dump('idp: result=' + JSON.stringify(result) + '\n');
+    return Promise.resolve(result);
+  };
+
+  IDPJS.prototype = {
+    _selectUsername: function(usernameHint) {
+      var username = "someone@" + this.domain;
+      if (usernameHint) {
+        var at = usernameHint.indexOf("@");
+        if (at < 0) {
+          username = usernameHint + "@" + this.domain;
+        } else if (usernameHint.substring(at + 1) === this.domain) {
+          username = usernameHint;
+        }
+      }
+      return username;
+    },
+
+    generateAssertion: function(payload, origin, usernameHint) {
+      dump('idp: generateAssertion(' + payload + ')\n');
+      var idpDetails = {
+        domain: this.domain,
+        protocol: this.protocol
+      };
+      if (instructions.some(is("bad-assert"))) {
+        idpDetails = {};
+      }
+      return borkResult({
+        idp: idpDetails,
+        assertion: JSON.stringify({
+          username: this._selectUsername(usernameHint),
+          contents: payload
+        })
+      });
+    },
+
+    validateAssertion: function(assertion, origin) {
+      dump('idp: validateAssertion(' + assertion + ')\n');
+      var assertion = JSON.parse(assertion);
+      if (instructions.some(is("bad-validate"))) {
+        assertion.contents = {};
+      }
+      return borkResult({
+          identity: assertion.username,
+          contents: assertion.contents
+        });
+    }
+  };
+
+  if (!instructions.some(is("not_ready"))) {
+    dump('registering idp.js' + global.location.hash + '\n');
+    global.rtcIdentityProvider.register(new IDPJS());
+  }
+}(this));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-min.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-min.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-min.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-min.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,24 @@
+(function(global) {
+  'use strict';
+  // A minimal implementation of the interface.
+  // Though this isn't particularly functional.
+  // This is needed so that we can have a "working" IdP served
+  // from two different locations in the tree.
+  global.rtcIdentityProvider.register({
+    generateAssertion: function(payload, origin, usernameHint) {
+      dump('idp: generateAssertion(' + payload + ')\n');
+      return Promise.resolve({
+        idp: { domain: 'example.com', protocol: 'idp.js' },
+        assertion: 'bogus'
+      });
+    },
+
+    validateAssertion: function(assertion, origin) {
+      dump('idp: validateAssertion(' + assertion + ')\n');
+      return Promise.resolve({
+        identity: 'user@example.com',
+        contents: 'bogus'
+      });
+    }
+  });
+}(this));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-proxy.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-proxy.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-proxy.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-proxy.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-(function(global) {
-  "use strict";
-
-  function IDPJS() {
-    this.domain = window.location.host;
-    var p = window.location.pathname;
-    this.protocol = p.substring(p.lastIndexOf('/') + 1) + window.location.hash;
-    this.username = "someone@" + this.domain;
-    // so rather than create a million different IdP configurations and litter
-    // the world with files all containing near-identical code, let's use the
-    // hash/URL fragment as a way of generating instructions for the IdP
-    this.instructions = window.location.hash.replace("#", "").split(":");
-    this.port = window.rtcwebIdentityPort;
-    this.port.onmessage = this.receiveMessage.bind(this);
-    this.sendResponse({
-      type : "READY"
-    });
-  }
-
-  IDPJS.prototype.getDelay = function() {
-    // instructions in the form "delay123" have that many milliseconds
-    // added before sending the response
-    var delay = 0;
-    function addDelay(instruction) {
-      var m = instruction.match(/^delay(\d+)$/);
-      if (m) {
-        delay += parseInt(m[1], 10);
-      }
-    }
-    this.instructions.forEach(addDelay);
-    return delay;
-  };
-
-  function is(target) {
-    return function(instruction) {
-      return instruction === target;
-    };
-  }
-
-  IDPJS.prototype.sendResponse = function(response) {
-    // we don't touch the READY message unless told to
-    if (response.type === "READY" && !this.instructions.some(is("ready"))) {
-      this.port.postMessage(response);
-      return;
-    }
-
-    // if any instruction is "error", return an error.
-    if (this.instructions.some(is("error"))) {
-      response.type = "ERROR";
-    }
-
-    window.setTimeout(function() {
-      this.port.postMessage(response);
-    }.bind(this), this.getDelay());
-  };
-
-  IDPJS.prototype.receiveMessage = function(ev) {
-    var message = ev.data;
-    switch (message.type) {
-    case "SIGN":
-      if (message.username) {
-        var at = message.username.indexOf("@");
-        if (at < 0) {
-          this.username = message.username + "@" + this.domain;
-        } else if (message.username.substring(at + 1) === this.domain) {
-          this.username = message.username;
-        }
-      }
-      this.sendResponse({
-        type : "SUCCESS",
-        id : message.id,
-        message : {
-          idp : {
-            domain : this.domain,
-            protocol : this.protocol
-          },
-          assertion : JSON.stringify({
-            username : this.username,
-            contents : message.message
-          })
-        }
-      });
-      break;
-
-    case "VERIFY":
-      var payload = JSON.parse(message.message);
-      var contents = payload.contents;
-      if (this.instructions.some(is("bad"))) {
-        contents = {};
-      }
-      this.sendResponse({
-        type : "SUCCESS",
-        id : message.id,
-        message : {
-          identity : payload.username,
-          contents : contents
-        }
-      });
-      break;
-
-    default:
-      this.sendResponse({
-        type : "ERROR",
-        id : message.id,
-        error : JSON.stringify(message)
-      });
-      break;
-    }
-  };
-
-  global.idp = new IDPJS();
-}(this));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,3 @@
+(function() {
+  dump('ERROR\n');
+}());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js^headers^ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js^headers^
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js^headers^	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http.js^headers^	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: http://example.com/.well-known/idp-proxy/idp.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,3 @@
+(function() {
+  dump('ERROR\n');
+}());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js^headers^ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js^headers^
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js^headers^	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-double.js^headers^	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: https://example.com/.well-known/idp-proxy/idp-redirect-https.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,3 @@
+(function() {
+  dump('ERROR\n');
+}());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js^headers^ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js^headers^
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js^headers^	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https.js^headers^	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: https://example.com/.well-known/idp-proxy/idp.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,3 @@
+(function() {
+  dump('ERROR\n');
+}());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js^headers^ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js^headers^
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js^headers^	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-https-odd-path.js^headers^	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: https://example.com/.well-known/idp-min.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,3 @@
+(function() {
+  dump('ERROR\n');
+}());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js^headers^ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js^headers^
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js^headers^	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/idp-redirect-http-trick.js^headers^	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: http://example.com/.well-known/idp-proxy/idp-redirect-https.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/mochitest.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/mochitest.ini	2015-02-28 15:03:08.000000000 +0000
@@ -1,20 +1,30 @@
 [DEFAULT]
-# All tests are disabled on android&b2g due to lack of https support in
-# mochitests (Bug 907770)
-# Tests are also disabled on b2g due to lack of e10s support in WebRTC identity
-# (Bug 975144)
-skip-if = e10s || os == "android" || appname == "b2g"
+# strictContentSandbox - bug 1042735, Android 2.3 - bug 981881
+# won't run on b2g desktop tests - bug 1119993
+# broken HTTPS on b2g emulator - bug 1135339
+skip-if = (os == 'win' && strictContentSandbox) || android_version == '10' || (buildapp == 'b2g' && toolkit != 'gonk') || (buildapp == 'b2g' && toolkit == 'gonk')
 support-files =
-  /.well-known/idp-proxy/idp.html
-  /.well-known/idp-proxy/idp-proxy.js
-  identityevent.js
+  /.well-known/idp-proxy/idp.js
 
 [test_idpproxy.html]
+support-files =
+  /.well-known/idp-proxy/idp-redirect-http.js
+  /.well-known/idp-proxy/idp-redirect-http.js^headers^
+  /.well-known/idp-proxy/idp-redirect-http-trick.js
+  /.well-known/idp-proxy/idp-redirect-http-trick.js^headers^
+  /.well-known/idp-proxy/idp-redirect-https.js
+  /.well-known/idp-proxy/idp-redirect-https.js^headers^
+  /.well-known/idp-proxy/idp-redirect-https-double.js
+  /.well-known/idp-proxy/idp-redirect-https-double.js^headers^
+  /.well-known/idp-proxy/idp-redirect-https-odd-path.js
+  /.well-known/idp-proxy/idp-redirect-https-odd-path.js^headers^
+  /.well-known/idp-min.js
+
+[test_fingerprints.html]
 [test_getIdentityAssertion.html]
 [test_setIdentityProvider.html]
 [test_setIdentityProviderWithErrors.html]
 [test_peerConnection_peerIdentity.html]
-[test_fingerprints.html]
 
 # Bug 950317: Hack for making a cleanup hook after finishing all WebRTC cases
 [../test_zmedia_cleanup.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_fingerprints.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_fingerprints.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_fingerprints.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_fingerprints.html	2015-02-28 15:03:08.000000000 +0000
@@ -6,44 +6,33 @@
 </head>
 <body>
   <script class="testbody" type="application/javascript">
-"use strict";
-var Cu = SpecialPowers.Cu;
-var rtcid = Cu.import("resource://gre/modules/media/IdpProxy.jsm");
-var IdpProxy = rtcid.IdpProxy;
+'use strict';
 
 // here we call the identity provider directly
-function getIdentityAssertion(fingerprints, callback) {
-  var idp;
-  function handleFailure() {
-    ok(false, "Failed to talk to IdP");
-    callback();
-  }
-
-  function handleResponse(response) {
-    var wrappedResponse = SpecialPowers.wrap(response);
-    is(wrappedResponse.type, "SUCCESS",
-       "IdP provided successful response");
-    var assertion = btoa(JSON.stringify(wrappedResponse.message));
-    idp.close();
-    callback(assertion);
-  }
-
-  idp = new IdpProxy("example.com", "idp.html");
-  idp.start(handleFailure);
-  idp.send({
-    type: "SIGN",
-    message: JSON.stringify({ fingerprint: fingerprints })
-  }, handleResponse);
+function getIdentityAssertion(fpArray) {
+  var Cu = SpecialPowers.Cu;
+  var rtcid = Cu.import('resource://gre/modules/media/IdpSandbox.jsm');
+  var sandbox = new rtcid.IdpSandbox('example.com', 'idp.js');
+  return sandbox.start()
+    .then(idp => SpecialPowers.wrap(idp)
+                   .generateAssertion(JSON.stringify({ fingerprint: fpArray }),
+                                      'https://example.com'))
+    .then(assertion => {
+      assertion = SpecialPowers.wrap(assertion);
+      var assertionString = btoa(JSON.stringify(assertion));
+      sandbox.stop();
+      return assertionString;
+    });
 }
 
-// this takes the real fingerprints and makes more
+// This takes a real fingerprint and makes some extra bad ones.
 function makeFingerprints(algo, digest) {
   var fingerprints = [];
   fingerprints.push({ algorithm: algo, digest: digest });
   for (var i = 0; i < 3; ++i) {
     fingerprints.push({
       algorithm: algo,
-      digest: digest.replace(/:./g, ":" + i.toString(16))
+      digest: digest.replace(/:./g, ':' + i.toString(16))
     });
   }
   return fingerprints;
@@ -53,65 +42,71 @@
 var identityRegex = /^a=identity:(\S+)/m;
 
 function fingerprintSdp(fingerprints) {
-  return fingerprints.map(fp => "a=fInGeRpRiNt:" + fp.algorithm +
-                                " " + fp.digest + "\n").join("");
+  return fingerprints.map(fp => 'a=fInGeRpRiNt:' + fp.algorithm +
+                                ' ' + fp.digest + '\n').join('');
 }
 
-// Firefox only uses a single fingerprint
-// that doesn't mean we can't have SDP that describes two
+// Firefox only uses a single fingerprint.
+// That doesn't mean we have it create SDP that describes two.
+// This function synthesizes that SDP and tries to set it.
 function testMultipleFingerprints() {
   // this one fails setRemoteDescription if the identity is not good
   var pcStrict = new mozRTCPeerConnection({ peerIdentity: 'someone@example.com'});
   // this one will be manually tweaked to have two fingerprints
   var pcDouble = new mozRTCPeerConnection({});
 
-  function finished(result, message) {
-    ok(result, message);
-    pcStrict.close();
-    pcDouble.close();
-    SimpleTest.finish();
-  }
+  var offer, match, fingerprints;
 
-  navigator.mozGetUserMedia({ audio: true, fake: true }, function(stream) {
-    ok(stream, "Got fake stream");
-    pcDouble.addStream(stream);
-
-    pcDouble.createOffer(function(offer) {
-      ok(offer, "Got offer");
-      var fp = offer.sdp.match(fingerprintRegex);
-      if (!fp) {
-        finished(false, "No fingerprint in offer SDP");
-        return;
+  var fail = msg =>
+      (e => ok(false, 'error in ' + msg + ': ' +
+               (e.message ? (e.message + '\n' + e.stack) : e)));
+
+  navigator.mediaDevices.getUserMedia({ audio: true, fake: true })
+    .then(stream => {
+      ok(stream, 'Got fake stream');
+      pcDouble.addStream(stream);
+      return pcDouble.createOffer();
+    })
+    .then(o => {
+      offer = o;
+      ok(offer, 'Got offer');
+
+      match = offer.sdp.match(fingerprintRegex);
+      if (!match) {
+        throw new Error('No fingerprint in offer SDP');
       }
+      fingerprints = makeFingerprints(match[1], match[2]);
+      return getIdentityAssertion(fingerprints);
+    })
+    .then(assertion => {
+      ok(assertion, 'Should have assertion');
 
-      var fingerprints = makeFingerprints(fp[1], fp[2]);
-      getIdentityAssertion(fingerprints, function(assertion) {
-        ok(assertion, "Should have assertion");
-
-        var sdp = offer.sdp.slice(0, fp.index) +
-          "a=identity:" + assertion + "\n" +
+      var sdp = offer.sdp.slice(0, match.index) +
+          'a=identity:' + assertion + '\n' +
           fingerprintSdp(fingerprints.slice(1)) +
-          offer.sdp.slice(fp.index);
+          offer.sdp.slice(match.index);
 
-        var desc = new mozRTCSessionDescription({ type: "offer", sdp: sdp });
-        pcStrict.setRemoteDescription(desc, function() {
-          finished(true, "session description was OK");
-        }, function(err) {
-          finished(false, "error setting the session description: " + err);
-        });
-      });
-    }, function(err) {
-      finished(false, "error creating an offer: " + err);
+      var desc = new mozRTCSessionDescription({ type: 'offer', sdp: sdp });
+      return pcStrict.setRemoteDescription(desc);
+    })
+    .then(() => {
+      ok(true, 'Modified fingerprints were accepted');
+    }, error => {
+      var e = SpecialPowers.wrap(error);
+      ok(false, 'error in test: ' +
+         (e.message ? (e.message + '\n' + e.stack) : e));
+    })
+    .then(() => {
+      pcStrict.close();
+      pcDouble.close();
+      SimpleTest.finish();
     });
-  }, function(err) {
-    finished(false, "error getting stream: " + err);
-  });
 }
 
 SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPrefEnv({
-  "set" : [ [ "dom.messageChannel.enabled", true ],
-            [ "media.peerconnection.identity.enabled", true ] ]
+  set: [ [ 'dom.messageChannel.enabled', true ],
+         [ 'media.peerconnection.identity.enabled', true ] ]
 }, testMultipleFingerprints);
 </script>
   </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html	2015-02-28 15:03:08.000000000 +0000
@@ -17,7 +17,13 @@
   // about how the IdP actually works (not good in general, but OK here)
   var assertion = JSON.parse(atob(assertion)).assertion;
   var user = JSON.parse(assertion).username;
-  is(user, identity, "id should be '" + identity + "' is '" + user + "'");
+  is(user, identity, 'id should be "' + identity + '" is "' + user + '"');
+}
+
+function getAssertion(t, instructions, userHint) {
+  t.pcLocal.setIdentityProvider('example.com', 'idp.js' + instructions,
+                                userHint);
+  return t.pcLocal._pc.getIdentityAssertion();
 }
 
 var test;
@@ -26,79 +32,47 @@
   test.setMediaConstraints([{audio: true}], [{audio: true}]);
   test.chain.removeAfter('PC_REMOTE_CHECK_INITIAL_SIGNALINGSTATE');
   test.chain.append([
-    function GET_IDENTITY_ASSERTION_FAILS_WITHOUT_PROVIDER(test) {
-      return new Promise(resolve => {
-        test.pcLocal._pc.onidpassertionerror = function(e) {
-          ok(e, "getIdentityAssertion must fail without provider");
-          resolve();
-        };
-        test.pcLocal._pc.getIdentityAssertion();
-      });
+    function PC_LOCAL_IDENTITY_ASSERTION_FAILS_WITHOUT_PROVIDER(t) {
+      return t.pcLocal._pc.getIdentityAssertion()
+        .then(a => ok(false, 'should fail without provider'),
+              e => ok(e, 'should fail without provider'));
     },
-    function GET_IDENTITY_ASSERTION_FIRES_EVENTUALLY_AND_SUBSEQUENTLY(test) {
-      return new Promise(resolve => {
-        var fired = 0;
-        test.setIdentityProvider(test.pcLocal, 'example.com', 'idp.html');
-        test.pcLocal._pc.onidentityresult = function(e) {
-          fired++;
-          if (fired == 1) {
-            ok(true, "identityresult fired");
-            checkIdentity(e.assertion, 'someone@example.com');
-          } else if (fired == 2) {
-            ok(true, "identityresult fired 2x");
-            checkIdentity(e.assertion, 'someone@example.com');
-            resolve();
-          }
-        };
-        test.pcLocal._pc.onidpassertionerror = function(e) {
-          ok(false, "error event fired");
-          resolve();
-        };
-        test.pcLocal._pc.getIdentityAssertion();
-        test.pcLocal._pc.getIdentityAssertion();
+
+    function PC_LOCAL_GET_TWO_ASSERTIONS(t) {
+      return Promise.all([
+        getAssertion(t, ''),
+        getAssertion(t, '')
+      ]).then(assertions => {
+        is(assertions.length, 2, "Two assertions generated");
+        assertions.forEach(a => checkIdentity(a, 'someone@example.com'));
       });
     },
-    function GET_IDENTITY_ASSERTION_FAILS(test) {
-      return new Promise(resolve => {
-        test.setIdentityProvider(test.pcLocal, 'example.com', 'idp.html#error');
-        test.pcLocal._pc.onidentityresult = function(e) {
-          ok(false, "Should not get an identity result");
-          resolve();
-        };
-        test.pcLocal._pc.onidpassertionerror = function(err) {
-          ok(err, "Got error event from getIdentityAssertion");
-          resolve();
-        };
-        test.pcLocal._pc.getIdentityAssertion();
-      });
+
+    function PC_LOCAL_IDP_FAILS(t) {
+      return getAssertion(t, '#fail')
+        .then(a => ok(false, '#fail should not get an identity result'),
+              e => is(e.name, 'IdpError', '#fail should cause rejection'));
     },
-    function GET_IDENTITY_ASSERTION_IDP_NOT_READY(test) {
-      return new Promise(resolve => {
-        test.setIdentityProvider(test.pcLocal, 'example.com', 'idp.html#error:ready');
-        test.pcLocal._pc.onidentityresult = function(e) {
-          ok(false, "Should not get an identity result");
-          resolve();
-        };
-        test.pcLocal._pc.onidpassertionerror = function(e) {
-          ok(e, "Got error callback from getIdentityAssertion");
-          resolve();
-        };
-        test.pcLocal._pc.getIdentityAssertion();
-      });
+
+    function PC_LOCAL_IDP_LOGIN_ERROR(t) {
+      return getAssertion(t, '#loginerror')
+        .then(a => ok(false, '#loginerror should not work'),
+              e => {
+                is(e.name, 'IdpLoginError', 'name is IdpLoginError');
+                is(t.pcLocal._pc.idpLoginUrl, 'https://example.com/log/in/here',
+                   'got the right login URL from the IdP');
+              });
     },
-    function GET_IDENTITY_ASSERTION_WITH_SPECIFIC_NAME(test) {
-      return new Promise(resolve => {
-        test.setIdentityProvider(test.pcLocal, 'example.com', 'idp.html', 'user@example.com');
-        test.pcLocal._pc.onidentityresult = function(e) {
-          checkIdentity(e.assertion, 'user@example.com');
-          resolve();
-        };
-        test.pcLocal._pc.onidpassertionerror = function(e) {
-          ok(false, "Got error callback from getIdentityAssertion");
-          resolve();
-        };
-        test.pcLocal._pc.getIdentityAssertion();
-      });
+
+    function PC_LOCAL_IDP_NOT_READY(t) {
+      return getAssertion(t, '#not_ready')
+        .then(a => ok(false, '#not_ready should not get an identity result'),
+              e => is(e.name, 'IdpError', '#not_ready should cause rejection'));
+    },
+
+    function PC_LOCAL_ASSERTION_WITH_SPECIFIC_NAME(t) {
+      return getAssertion(t, '', 'user@example.com')
+        .then(a => checkIdentity(a, 'user@example.com'));
     }
   ]);
   test.run();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_idpproxy.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_idpproxy.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_idpproxy.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_idpproxy.html	2015-02-28 15:03:08.000000000 +0000
@@ -8,119 +8,163 @@
   <script class="testbody" type="application/javascript">
 "use strict";
 var Cu = SpecialPowers.Cu;
-var rtcid = Cu.import("resource://gre/modules/media/IdpProxy.jsm");
-var IdpProxy = rtcid.IdpProxy;
-var request = {
-  type: "SIGN",
-  message: "foo"
-};
+var rtcid = Cu.import("resource://gre/modules/media/IdpSandbox.jsm");
+var IdpSandbox = rtcid.IdpSandbox;
+var dummyPayload = JSON.stringify({
+  this: 'is',
+  a: ['stu', 6],
+  obj: null
+});
 
-function test_domain_sandbox(done) {
+function test_domain_sandbox() {
   var diabolical = {
     toString : function() {
-      return "example.com/path";
+      return 'example.com/path';
     }
   };
-  var domains = [ "ex/foo", "user@ex", "user:pass@ex", "ex#foo", "ex?foo",
-                  "", 12, null, diabolical, true ];
+  var domains = [ 'ex/foo', 'user@ex', 'user:pass@ex', 'ex#foo', 'ex?foo',
+                  '', 12, null, diabolical, true ];
   domains.forEach(function(domain) {
     try {
-      var idp = new IdpProxy(domain);
-      ok(false, "IdpProxy didn't catch bad domain: " + domain);
+      var idp = new IdpSandbox(domain);
+      ok(false, 'IdpSandbox allowed a bad domain: ' + domain);
     } catch (e) {
-      var str = (typeof domain === "string") ? domain : typeof domain;
-      ok(true, "Evil domain '" + str + "' raises exception");
+      var str = (typeof domain === 'string') ? domain : typeof domain;
+      ok(true, 'Evil domain "' + str + '" raises exception');
     }
   });
-  done();
 }
 
-function test_protocol_sandbox(done) {
-  var protos = [ "../evil/proto", "..%2Fevil%2Fproto",
-                 "\\evil", "%5cevil", 12, true, {} ];
+function test_protocol_sandbox() {
+  var protos = [ '../evil/proto', '..%2Fevil%2Fproto',
+                 '\\evil', '%5cevil', 12, true, {} ];
   protos.forEach(function(proto) {
     try {
-      var idp = new IdpProxy("example.com", proto);
-      ok(false, "IdpProxy didn't catch bad protocol: " + proto);
+      var idp = new IdpSandbox('example.com', proto);
+      ok(false, 'IdpSandbox allowed a bad protocol: ' + proto);
     } catch (e) {
-      var str = (typeof proto === "string") ? proto : typeof proto;
-      ok(true, "Evil protocol '" + proto + "' raises exception");
+      var str = (typeof proto === 'string') ? proto : typeof proto;
+      ok(true, 'Evil protocol "' + proto + '" raises exception');
     }
   });
-  done();
 }
 
-function handleFailure(done) {
-  function failure(error) {
-    ok(false, "IdP error" + error);
-    done();
-  }
-  return failure;
-}
-
-function test_success_response(done) {
-  var idp;
-  var failure = handleFailure(done);
-
-  function handleResponse(response) {
-    is(SpecialPowers.wrap(response).type, "SUCCESS", "IdP responds with SUCCESS");
-    idp.close();
-    done();
-  }
-
-  idp = new IdpProxy("example.com", "idp.html");
-  idp.start(failure);
-  idp.send(request, handleResponse);
-}
-
-function test_error_response(done) {
-  var idp;
-  var failure = handleFailure(done);
-
-  function handleResponse(response) {
-    is(SpecialPowers.wrap(response).type, "ERROR", "IdP should produce ERROR");
-    idp.close();
-    done();
-  }
-
-  idp = new IdpProxy("example.com", "idp.html#error");
-  idp.start(failure);
-  idp.send(request, handleResponse);
-}
-
-function test_delayed_response(done) {
-  var idp;
-  var failure = handleFailure(done);
-
-  function handleResponse(response) {
-    is(SpecialPowers.wrap(response).type, "SUCCESS",
-       "IdP should handle delayed response");
-    idp.close();
-    done();
-  }
-
-  idp = new IdpProxy("example.com", "idp.html#delay100");
-  idp.start(failure);
-  idp.send(request, handleResponse);
-}
-
-var TESTS = [ test_domain_sandbox, test_protocol_sandbox,
-              test_success_response, test_error_response,
-              test_delayed_response ];
-
-function run_next_test() {
-  if (TESTS.length) {
-    var test = TESTS.shift();
-    test(run_next_test);
-  } else {
-    SimpleTest.finish();
-  }
+function idpName(hash) {
+  return 'idp.js' + (hash ? ('#' + hash) : '');
+}
+
+function makeSandbox(js) {
+  var name = js || idpName();
+  info('Creating a sandbox for the protocol: ' + name);
+  var sandbox = new IdpSandbox('example.com', name);
+  return sandbox.start().then(idp => SpecialPowers.wrap(idp));
+}
+
+function test_generate_assertion() {
+  return makeSandbox()
+    .then(idp => idp.generateAssertion(dummyPayload,
+                                       'https://example.net'))
+    .then(response => {
+      response = SpecialPowers.wrap(response);
+      is(response.idp.domain, 'example.com', 'domain is correct');
+      is(response.idp.protocol, 'idp.js', 'protocol is correct');
+      ok(typeof response.assertion === 'string', 'assertion is present');
+    });
+}
+
+// test that the test IdP can eat its own dogfood; which is the only way to test
+// validateAssertion, since that consumes the output of generateAssertion (in
+// theory, generateAssertion could identify a different IdP domain).
+
+function test_validate_assertion() {
+  return makeSandbox()
+    .then(idp => idp.generateAssertion(dummyPayload,
+                                       'https://example.net', 'user'))
+    .then(assertion => {
+      var wrapped = SpecialPowers.wrap(assertion);
+      return makeSandbox()
+        .then(idp => idp.validateAssertion(wrapped.assertion,
+                                           'https://example.net'));
+    }).then(response => {
+      response = SpecialPowers.wrap(response);
+      is(response.identity, 'user@example.com');
+      is(response.contents, dummyPayload);
+    });
+}
+
+// We don't want to test the #bad or the #hang instructions,
+// errors of the sort those generate aren't handled by the sandbox code.
+function test_assertion_failure(reason) {
+  return () => {
+    return makeSandbox(idpName(reason))
+      .then(idp => idp.generateAssertion('hello', 'example.net'))
+      .then(r => ok(false, 'should not succeed on ' + reason),
+            e => ok(true, 'failed correctly on ' + reason));
+  };
+}
+
+function test_load_failure() {
+  return makeSandbox('non-existent-file')
+    .then(() => ok(false, 'Should fail to load non-existent file'),
+          e => ok(e, 'Should fail to load non-existent file'));
+}
+
+function test_redirect_ok(from) {
+  return () => {
+    return makeSandbox(from)
+      .then(idp => idp.generateAssertion('hello', 'example.net'))
+      .then(r => ok(SpecialPowers.wrap(r).assertion,
+                    'Redirect to https should be OK'));
+  };
+}
+
+function test_redirect_fail(from) {
+  return () => {
+    return makeSandbox(from)
+      .then(() => ok(false, 'Redirect to https should fail'),
+            e => ok(e, 'Redirect to https should fail'));
+  };
+}
+
+function run_all_tests() {
+  [
+    test_domain_sandbox,
+    test_protocol_sandbox,
+    test_generate_assertion,
+    test_validate_assertion,
+
+    // fail of the IdP fails
+    test_assertion_failure('fail'),
+    // fail if the IdP throws
+    test_assertion_failure('throw'),
+    // fail if the IdP is not ready
+    test_assertion_failure('not_ready'),
+
+    test_load_failure(),
+    // Test a redirect to an HTTPS origin, which should be OK
+    test_redirect_ok('idp-redirect-https.js'),
+    // Two redirects is fine too
+    test_redirect_ok('idp-redirect-https-double.js'),
+    // A secure redirect to a path other than /.well-known/idp-proxy/* should
+    // also work fine.
+    test_redirect_ok('idp-redirect-https-odd-path.js'),
+    // A redirect to HTTP is not-cool
+    test_redirect_fail('idp-redirect-http.js'),
+    // Also catch tricks like https->http->https
+    test_redirect_fail('idp-redirect-http-trick.js')
+  ].reduce((p, test) => {
+    return p.then(test)
+      .catch(e => ok(false, test.name + ' failed: ' +
+                     SpecialPowers.wrap(e).message + '\n' +
+                     SpecialPowers.wrap(e).stack));
+  }, Promise.resolve())
+    .then(() => SimpleTest.finish());
 }
 
 SimpleTest.waitForExplicitFinish();
 SpecialPowers.pushPrefEnv({
-  "set" : [ [ "dom.messageChannel.enabled", true ] ]
-}, run_next_test);
+  set: [ [ 'dom.messageChannel.enabled', true ] ]
+}, run_all_tests);
 </script>
   </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html	2015-02-28 15:03:08.000000000 +0000
@@ -35,22 +35,24 @@
     fake: true,
     peerIdentity: id1
   }]);
-  test.setIdentityProvider(test.pcLocal, 'test1.example.com', 'idp.html');
-  test.setIdentityProvider(test.pcRemote, 'test2.example.com', 'idp.html');
+  test.pcLocal.setIdentityProvider('test1.example.com', 'idp.js');
+  test.pcRemote.setIdentityProvider('test2.example.com', 'idp.js');
   test.chain.append([
-
     function PEER_IDENTITY_IS_SET_CORRECTLY(test) {
       // no need to wait to check identity in this case,
       // setRemoteDescription should wait for the IdP to complete
       function checkIdentity(pc, pfx, idp, name) {
-        is(pc.peerIdentity.idp, idp, pfx + "IdP is correct");
-        is(pc.peerIdentity.name, name + "@" + idp, pfx + "identity is correct");
+        return pc.peerIdentity.then(peerInfo => {
+          is(peerInfo.idp, idp, pfx + "IdP check");
+          is(peerInfo.name, name + "@" + idp, pfx + "identity check");
+        });
       }
 
-      checkIdentity(test.pcLocal._pc, "local: ", "test2.example.com", "someone");
-      checkIdentity(test.pcRemote._pc, "remote: ", "test1.example.com", "someone");
+      return Promise.all([
+        checkIdentity(test.pcLocal._pc, "local: ", "test2.example.com", "someone"),
+        checkIdentity(test.pcRemote._pc, "remote: ", "test1.example.com", "someone")
+      ]);
     },
-
     function REMOTE_STREAMS_ARE_RESTRICTED(test) {
       var remoteStream = test.pcLocal._pc.getRemoteStreams()[0];
       return Promise.all([
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProvider.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProvider.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProvider.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProvider.html	2015-02-28 15:03:08.000000000 +0000
@@ -3,7 +3,6 @@
 <head>
   <script type="application/javascript">var scriptRelativePath = "../";</script>
   <script type="application/javascript" src="../pc.js"></script>
-  <script type="application/javascript" src="identityevent.js"></script>
 </head>
 <body>
 <pre id="test">
@@ -13,76 +12,45 @@
     bug: "942367"
   });
 
-var test;
+function checkIdentity(peer, prefix, idp, name) {
+  prefix = prefix + ": ";
+  return peer._pc.peerIdentity.then(peerIdentity => {
+    ok(peerIdentity, prefix + "peerIdentity is set");
+    is(peerIdentity.idp, idp, prefix + "IdP is correct");
+    is(peerIdentity.name, name + "@" + idp, prefix + "identity is correct");
+  });
+}
+
 function theTest() {
-  test = new PeerConnectionTest();
+  var test = new PeerConnectionTest();
   test.setMediaConstraints([{audio: true}], [{audio: true}]);
-  test.setIdentityProvider(test.pcLocal, "test1.example.com", "idp.html", "someone");
-  test.setIdentityProvider(test.pcRemote, "test2.example.com", "idp.html", "someone");
-
-  var localEvents = trapIdentityEvents(test.pcLocal._pc);
-  var remoteEvents = trapIdentityEvents(test.pcRemote._pc);
+  test.pcLocal.setIdentityProvider("test1.example.com", "idp.js", "someone");
+  test.pcRemote.setIdentityProvider("test2.example.com", "idp.js", "someone");
 
   test.chain.append([
-    function PEER_IDENTITY_IS_SET_CORRECTLY(test) {
-      var outstanding = 0;
-      // we have to wait for the identity result in order to get the actual
-      // identity information, since the call will complete before the identity
-      // provider has a chance to finish verifying... that's OK, but it makes
-      // testing more difficult
-
-      function checkOrSetupCheck(pc, prefix, idp, name) {
-        function checkIdentity() {
-          ok(pc.peerIdentity, prefix + "peerIdentity is set");
-          is(pc.peerIdentity.idp, idp, prefix + "IdP is correct");
-          is(pc.peerIdentity.name, name + "@" + idp, prefix + "identity is correct");
-        }
-        if (pc.peerIdentity) {
-          info(prefix + "peerIdentity already set");
-          checkIdentity();
-          return Promise.resolve();
-        }
-
-        return new Promise(resolve => {
-          info(prefix + "setting onpeeridentity handler");
-          pc.onpeeridentity = e => {
-            checkIdentity();
-            resolve();
-          };
-        });
-      }
-
-      return Promise.all([
-        checkOrSetupCheck(test.pcLocal._pc, "local: ", "test2.example.com", "someone"),
-        checkOrSetupCheck(test.pcRemote._pc, "remote: ", "test1.example.com", "someone")
-      ]);
+    function PC_LOCAL_PEER_IDENTITY_IS_SET_CORRECTLY(test) {
+      return checkIdentity(test.pcLocal, "local", "test2.example.com", "someone");
     },
-
-    function CHECK_IDENTITY_EVENTS(test) {
-      ok(!localEvents.idpassertionerror , "No assertion generation errors on local");
-      ok(!remoteEvents.idpassertionerror, "No assertion generation errors on remote");
-      ok(!localEvents.idpvalidationerror, "No assertion validation errors on local");
-      ok(!remoteEvents.idpvalidationerror, "No assertion validation errors on remote");
-      ok(localEvents.identityresult, "local acquired identity assertions");
-      ok(remoteEvents.identityresult, "remote acquired identity assertions");
-      ok(localEvents.peeridentity, "local got peer identity");
-      ok(remoteEvents.peeridentity, "remote got peer identity");
+    function PC_REMOTE_PEER_IDENTITY_IS_SET_CORRECTLY(test) {
+      return checkIdentity(test.pcRemote, "remote", "test1.example.com", "someone");
     },
 
-    function OFFERS_AND_ANSWERS_INCLUDE_IDENTITY(test) {
+    function OFFER_AND_ANSWER_INCLUDES_IDENTITY(test) {
       ok(test.originalOffer.sdp.contains("a=identity"), "a=identity is in the offer SDP");
       ok(test.originalAnswer.sdp.contains("a=identity"), "a=identity is in the answer SDP");
     },
 
-    function DESCRIPTIONS_CONTAIN_IDENTITY(test) {
+    function PC_LOCAL_DESCRIPTIONS_CONTAIN_IDENTITY(test) {
       ok(test.pcLocal.localDescription.sdp.contains("a=identity"),
          "a=identity is in the local copy of the offer");
-      ok(test.pcRemote.localDescription.sdp.contains("a=identity"),
-         "a=identity is in the remote copy of the offer");
       ok(test.pcLocal.remoteDescription.sdp.contains("a=identity"),
          "a=identity is in the local copy of the answer");
+    },
+    function PC_REMOTE_DESCRIPTIONS_CONTAIN_IDENTITY(test) {
+      ok(test.pcRemote.localDescription.sdp.contains("a=identity"),
+                         "a=identity is in the remote copy of the offer");
       ok(test.pcRemote.remoteDescription.sdp.contains("a=identity"),
-         "a=identity is in the remote copy of the answer");
+                         "a=identity is in the remote copy of the answer");
     }
   ]);
   test.run();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html	2015-02-28 15:03:08.000000000 +0000
@@ -3,11 +3,11 @@
 <head>
   <script type="application/javascript">var scriptRelativePath = "../";</script>
   <script type="application/javascript" src="../pc.js"></script>
-  <script type="application/javascript" src="identityevent.js"></script>
 </head>
 <body>
 <pre id="test">
 <script type="application/javascript">
+'use strict';
   createHTML({
     title: "Identity Provider returning errors is handled correctly",
     bug: "942367"
@@ -16,55 +16,36 @@
 runNetworkTest(function () {
   var test = new PeerConnectionTest();
   test.setMediaConstraints([{audio: true}], [{audio: true}]);
-  // first example generates an error
-  test.setIdentityProvider(test.pcLocal, 'example.com', 'idp.html#error', 'nobody');
-  // second generates a bad assertion; which fails to validate
-  test.setIdentityProvider(test.pcRemote, 'example.com', 'idp.html#bad', 'nobody');
-
-  var localEvents = trapIdentityEvents(test.pcLocal._pc);
-  var remoteEvents = trapIdentityEvents(test.pcRemote._pc);
+  // No IdP for local.
+  // Remote generates a bad assertion, but that only fails to validate
+  test.pcRemote.setIdentityProvider('example.com', 'idp.js#bad-validate', 'nobody');
+
+  // Save the peerIdentity promises now, since when they reject they are
+  // replaced and we expect them to be rejected this time
+  var peerIdentityLocal = test.pcLocal._pc.peerIdentity;
+  var peerIdentityRemote = test.pcRemote._pc.peerIdentity;
 
   test.chain.append([
-    function CHECK_IDENTITY_EVENTS(test) {
-      function checkEvents() {
-        ok(localEvents.idpassertionerror, 'local assertion generation should fail (idpassertionerror)');
-        is(localEvents.idpassertionerror.idp, 'example.com', 'event IdP is correct');
-        is(localEvents.idpassertionerror.protocol, 'idp.html#error', 'event IdP protocol is #error');
-        ok(!remoteEvents.idpassertionerror, 'remote assertion generation should succeed (idpassertionerror)');
-        ok(!localEvents.identityresult, 'local assertion generation should fail (identityresult)');
-        ok(remoteEvents.identityresult, 'remote assertion generation should succeed (identityresult)');
-
-        ok(!localEvents.peeridentity, 'no peer identity event for local peer');
-        ok(!remoteEvents.peeridentity, 'no peer identity event for remote peer');
-        ok(localEvents.idpvalidationerror, 'local fails to validate');
-        is(localEvents.idpvalidationerror.idp, 'example.com', 'event IdP is correct');
-        is(localEvents.idpvalidationerror.protocol, 'idp.html#bad', 'event IdP protocol is #bad');
-        ok(!remoteEvents.idpvalidationerror, 'remote doesn\'t even see an assertion');
-
-      }
-
-      // we actually have to wait on this because IdP validation happens asynchronously
-      if (localEvents.idpvalidationerror) {
-        checkEvents();
-        return Promise.resolve();
-      }
-      // have to let the other event handler have a chance to record success
-      // before we run the checks that rely on that recording
-      return new Promise(resolve => {
-        test.pcLocal._pc.onidpvalidationerror = resolve;
-      }).then(checkEvents);
+    function ONLY_REMOTE_SDP_INCLUDES_IDENTITY_ASSERTION(t) {
+      ok(!t.originalOffer.sdp.contains('a=identity'),
+         'a=identity not contained in the offer SDP');
+      ok(t.originalAnswer.sdp.contains('a=identity'),
+         'a=identity is contained in the answer SDP');
     },
-
-    function PEER_IDENTITY_IS_EMPTY(test) {
-      ok(!test.pcLocal._pc.peerIdentity, 'local peerIdentity is not set');
-      ok(!test.pcRemote._pc.peerIdentity, 'remote peerIdentity is not set');
-    },
-
-    function ONLY_REMOTE_SDP_INCLUDES_IDENTITY_ASSERTION(test) {
-      ok(!test.originalOffer.sdp.contains('a=identity'), 'a=identity not contained in the offer SDP');
-      ok(test.originalAnswer.sdp.contains('a=identity'), 'a=identity is contained in the answer SDP');
+    function PEER_IDENTITY_IS_EMPTY(t) {
+      // we are only waiting for the local side to complete
+      // an error on the remote side is immediately fatal though
+      return Promise.race([
+        peerIdentityLocal.then(
+          () => ok(false, t.pcLocal + ' incorrectly received valid peer identity'),
+          e => ok(e, t.pcLocal + ' correctly failed to validate peer identity')),
+        peerIdentityRemote.then(
+          () => ok(false, t.pcRemote + ' incorrecly received a valid peer identity'),
+          e => ok(false, t.pcRemote + ' incorrectly rejected peer identity'))
+      ]);
     }
   ]);
+
   test.run();
 });
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/mochitest.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/mochitest.ini	2015-02-28 15:03:08.000000000 +0000
@@ -105,6 +105,8 @@
 skip-if = toolkit == 'gonk' # b2g (Bug 1059867)
 [test_peerConnection_errorCallbacks.html]
 skip-if = toolkit == 'gonk' # b2g (Bug 1059867)
+[test_peerConnection_forwarding_basicAudioVideoCombined.html]
+skip-if = toolkit == 'gonk' # b2g(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_peerConnection_noTrickleAnswer.html]
 skip-if = toolkit == 'gonk' # b2g (Bug 1059867)
 [test_peerConnection_noTrickleOffer.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/pc.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/pc.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/pc.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/pc.js	2015-02-28 15:03:08.000000000 +0000
@@ -380,11 +380,6 @@
   });
 };
 
-PeerConnectionTest.prototype.setIdentityProvider =
-function(peer, provider, protocol, identity) {
-  peer.setIdentityProvider(provider, protocol, identity);
-};
-
 /**
  * Sets the local description for the specified peer connection instance
  * and automatically handles the failure case.
@@ -736,6 +731,9 @@
  */
 function PeerConnectionWrapper(label, configuration, h264) {
   this.configuration = configuration;
+  if (configuration && configuration.label_suffix) {
+    label = label + "_" + configuration.label_suffix;
+  }
   this.label = label;
   this.whenCreated = Date.now();
 
@@ -851,7 +849,7 @@
   },
 
   setIdentityProvider: function(provider, protocol, identity) {
-      this._pc.setIdentityProvider(provider, protocol, identity);
+    this._pc.setIdentityProvider(provider, protocol, identity);
   },
 
   /**
@@ -926,9 +924,17 @@
         var type = '';
         if (constraints.audio) {
           type = 'audio';
+          stream.getAudioTracks().map(track => {
+            info(this + " gUM local stream " + stream.id +
+              " with audio track " + track.id);
+          });
         }
         if (constraints.video) {
           type += 'video';
+          stream.getVideoTracks().map(track => {
+            info(this + " gUM local stream " + stream.id +
+              " with video track " + track.id);
+          });
         }
         this.attachMedia(stream, type, 'local');
       });
@@ -1119,9 +1125,17 @@
       var type = '';
       if (event.stream.getAudioTracks().length > 0) {
         type = 'audio';
+        event.stream.getAudioTracks().map(track => {
+          info(this + " remote stream " + event.stream.id + " with audio track " +
+               track.id);
+        });
       }
       if (event.stream.getVideoTracks().length > 0) {
         type += 'video';
+        event.stream.getVideoTracks().map(track => {
+          info(this + " remote stream " + event.stream.id + " with video track " +
+            track.id);
+        });
       }
       this.attachMedia(event.stream, type, 'remote');
     });
@@ -1395,11 +1409,9 @@
     var checkSdpForMsids = (desc, streams, side) => {
       streams.forEach(stream => {
         stream.getTracks().forEach(track => {
-          // TODO(bug 1089798): Once DOMMediaStream has an id field, we
-          // should be verifying that the SDP contains
-          // a=msid:<stream-id> <track-id>
-          ok(desc.sdp.match(new RegExp("a=msid:[^ ]+ " + track.id)),
-             side + " SDP contains track id " + track.id );
+          ok(desc.sdp.match(new RegExp("a=msid:" + stream.id + " " + track.id)),
+             this + ": " + side + " SDP contains stream " + stream.id +
+             " and track " + track.id );
         });
       });
     };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/templates.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/templates.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/templates.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/templates.js	2015-02-28 15:03:08.000000000 +0000
@@ -486,14 +486,6 @@
   function PC_REMOTE_CHECK_MEDIA_FLOW_PRESENT(test) {
     return test.pcRemote.checkMediaFlowPresent();
   },
-/* TODO: re-enable when Bug 1095218 lands
-  function PC_LOCAL_CHECK_MSID(test) {
-    test.pcLocal.checkMsids();
-  },
-  function PC_REMOTE_CHECK_MSID(test) {
-    test.pcRemote.checkMsids();
-  },
-*/
   function PC_LOCAL_CHECK_STATS(test) {
     return test.pcLocal.getStats(null).then(stats => {
       test.pcLocal.checkStats(stats, test.steeplechase);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/test_getUserMedia_constraints.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/test_getUserMedia_constraints.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/test_getUserMedia_constraints.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/test_getUserMedia_constraints.html	2015-02-28 15:03:08.000000000 +0000
@@ -15,58 +15,58 @@
 */
 var tests = [
   // Each test here tests a different constraint or codepath.
-  { message: "unknown required constraint on video fails",
-    constraints: { video: { somethingUnknown:0, require:["somethingUnknown"] },
+  { message: "unknown required constraint on video ignored",
+    constraints: { video: { somethingUnknown: { exact: 0 } },
                    fake: true },
-    error: "NotFoundError" },
-  { message: "unknown required constraint on audio fails",
-    constraints: { audio: { somethingUnknown:0, require:["somethingUnknown"] },
+    error: null },
+  { message: "unknown required constraint on audio ignored",
+    constraints: { audio: { somethingUnknown: { exact: 0 } },
                    fake: true },
-    error: "NotFoundError" },
+    error: null },
   { message: "video overconstrained by facingMode fails",
-    constraints: { video: { facingMode:'left', require:["facingMode"] },
+    constraints: { video: { facingMode:{ exact: 'left' } },
                    fake: true },
     error: "NotFoundError" },
   { message: "video overconstrained by facingMode array fails",
-    constraints: { video: { facingMode:['left', 'right'], require:["facingMode"] },
+    constraints: { video: { facingMode:{ exact: ['left', 'right'] } },
                    fake: true },
     error: "NotFoundError" },
-  { message: "audio overconstrained by facingMode fails",
-    constraints: { audio: { facingMode:'left', require:["facingMode"] },
+  { message: "audio overconstrained by facingMode ignored",
+    constraints: { audio: { facingMode: { exact: 'left' } },
                    fake: true },
-    error: "NotFoundError" },
+    error: null },
   { message: "full screensharing requires permission",
-    constraints: { video: { mediaSource:'screen' } },
+    constraints: { video: { mediaSource: 'screen' } },
     error: "PermissionDeniedError" },
   { message: "application screensharing requires permission",
-    constraints: { video: { mediaSource:'application' } },
+    constraints: { video: { mediaSource: 'application' } },
     error: "PermissionDeniedError" },
   { message: "window screensharing requires permission",
-    constraints: { video: { mediaSource:'window' } },
+    constraints: { video: { mediaSource: 'window' } },
     error: "PermissionDeniedError" },
   { message: "browser screensharing requires permission",
-    constraints: { video: { mediaSource:'browser' } },
+    constraints: { video: { mediaSource: 'browser' } },
     error: "PermissionDeniedError" },
   { message: "unknown mediaSource fails",
-    constraints: { video: { mediaSource:'uncle' } },
+    constraints: { video: { mediaSource: 'uncle' } },
     error: "NotFoundError" },
   { message: "Success-path: optional video facingMode + audio ignoring facingMode",
     constraints: { fake: true,
-                   audio: { mediaSource:'microphone',
-                            facingMode:'left',
-                            foo:0,
-                            advanced: [{ facingMode:'environment' },
-                                       { facingMode:'user' },
-                                       { bar:0 }] },
-                   video: { mediaSource:'camera',
-                            facingMode:['left', 'right', 'user', 'environment'],
-                            foo:0,
-                            advanced: [{ facingMode:'environment' },
-                                       { facingMode:['user'] },
-                                       { bar:0 }] } },
+                   audio: { mediaSource: 'microphone',
+                            facingMode: 'left',
+                            foo: 0,
+                            advanced: [{ facingMode: 'environment' },
+                                       { facingMode: 'user' },
+                                       { bar: 0 }] },
+                   video: { mediaSource: 'camera',
+                            foo: 0,
+                            advanced: [{ facingMode: 'environment' },
+                                       { facingMode: ['user'] },
+                                       { facingMode: ['left', 'right', 'user'] },
+                                       { bar: 0 }] } },
     error: null },
   { message: "legacy facingMode ignored",
-    constraints: { video: { mandatory: { facingMode:'left' } }, fake: true },
+    constraints: { video: { mandatory: { facingMode: 'left' } }, fake: true },
     error: null },
 ];
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/test_peerConnection_forwarding_basicAudioVideoCombined.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/test_peerConnection_forwarding_basicAudioVideoCombined.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/tests/mochitest/test_peerConnection_forwarding_basicAudioVideoCombined.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/tests/mochitest/test_peerConnection_forwarding_basicAudioVideoCombined.html	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript;version=1.8">
+  createHTML({
+    bug: "931903",
+    title: "Forwarding a stream from a combined audio/video peerconnection to another"
+  });
+
+runNetworkTest(function() {
+  var gumTest = new PeerConnectionTest();
+
+  var forwardingOptions = { config_local: { label_suffix: "forwarded" },
+                            config_remote: { label_suffix: "forwarded" } };
+  var forwardingTest = new PeerConnectionTest(forwardingOptions);
+
+  gumTest.setMediaConstraints([{audio: true, video: true}], []);
+  forwardingTest.setMediaConstraints([{audio: true, video: true}], []);
+  forwardingTest.chain.replace("PC_LOCAL_GUM", [
+    function PC_FORWARDING_CAPTUREVIDEO(test) {
+      var streams = gumTest.pcRemote._pc.getRemoteStreams();
+      is(streams.length, 1, "One stream to forward");
+      is(streams[0].getTracks().length, 2, "Forwarded stream has 2 tracks");
+      forwardingTest.pcLocal.attachMedia(streams[0], 'audiovideo', 'local');
+      return Promise.resolve();
+    }
+  ]);
+  gumTest.chain.removeAfter("PC_REMOTE_CHECK_MEDIA_FLOW_PRESENT");
+  gumTest.chain.execute()
+    .then(() => forwardingTest.chain.execute())
+    .then(() => gumTest.close())
+    .then(() => forwardingTest.close())
+    .then(() => networkTestFinished());
+});
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webaudio/AnalyserNode.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webaudio/AnalyserNode.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webaudio/AnalyserNode.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webaudio/AnalyserNode.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -66,9 +66,21 @@
 
     MutexAutoLock lock(NodeMutex());
 
-    if (Node() &&
-        aInput.mChannelData.Length() > 0) {
-      nsRefPtr<TransferBuffer> transfer = new TransferBuffer(aStream, aInput);
+    if (Node()) {
+      // If the input is silent, we sill need to send a silent buffer
+      if (aOutput->IsNull()) {
+        AllocateAudioBlock(1, aOutput);
+        float* samples = static_cast<float*>(
+            const_cast<void*>(aOutput->mChannelData[0]));
+        PodZero(samples, WEBAUDIO_BLOCK_SIZE);
+      }
+      uint32_t channelCount = aOutput->mChannelData.Length();
+      for (uint32_t channel = 0; channel < channelCount; ++channel) {
+        float* samples = static_cast<float*>(
+            const_cast<void*>(aOutput->mChannelData[channel]));
+        AudioBlockInPlaceScale(samples, aOutput->mVolume);
+      }
+      nsRefPtr<TransferBuffer> transfer = new TransferBuffer(aStream, *aOutput);
       NS_DispatchToMainThread(transfer);
     }
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webaudio/test/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webaudio/test/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webaudio/test/mochitest.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webaudio/test/mochitest.ini	2015-02-28 15:03:08.000000000 +0000
@@ -26,6 +26,7 @@
   webaudio.js
 
 [test_analyserNode.html]
+[test_analyserScale.html]
 [test_analyserNodeOutput.html]
 [test_analyserNodePassThrough.html]
 [test_AudioBuffer.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webaudio/test/test_analyserScale.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webaudio/test/test_analyserScale.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webaudio/test/test_analyserScale.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webaudio/test/test_analyserScale.html	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test AnalyserNode when the input is scaled </title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="webaudio.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+
+  var context = new AudioContext();
+
+  var gain = context.createGain();
+  var analyser = context.createAnalyser();
+  var osc = context.createOscillator();
+
+
+  osc.connect(gain);
+  gain.connect(analyser);
+
+  osc.start();
+
+  var array = new Uint8Array(analyser.frequencyBinCount);
+
+  function getAnalyserData() {
+    gain.gain.setValueAtTime(currentGain, context.currentTime);
+    analyser.getByteTimeDomainData(array);
+    var inrange = true;
+    var max = -1;
+    for (var i = 0; i < array.length; i++) {
+      if (array[i] > max) {
+        max = Math.abs(array[i] - 128);
+      }
+    }
+    if (max <= currentGain * 128) {
+      ok(true, "Analyser got scaled data for " + currentGain);
+      currentGain = tests.shift();
+      if (currentGain == undefined) {
+        SimpleTest.finish();
+        return;
+      }
+    }
+    requestAnimationFrame(getAnalyserData);
+  }
+
+  var tests = [1.0, 0.5, 0.0];
+  var currentGain = tests.shift();
+  requestAnimationFrame(getAnalyserData);
+});
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -4,10 +4,14 @@
 
 #include "MediaEngineCameraVideoSource.h"
 
+#include <limits>
+
 namespace mozilla {
 
 using namespace mozilla::gfx;
+using dom::OwningLongOrConstrainLongRange;
 using dom::ConstrainLongRange;
+using dom::OwningDoubleOrConstrainDoubleRange;
 using dom::ConstrainDoubleRange;
 using dom::MediaTrackConstraintSet;
 
@@ -20,34 +24,6 @@
 #define LOGFRAME(msg)
 #endif
 
-/* static */ bool
-MediaEngineCameraVideoSource::IsWithin(int32_t n, const ConstrainLongRange& aRange) {
-  return aRange.mMin <= n && n <= aRange.mMax;
-}
-
-/* static */ bool
-MediaEngineCameraVideoSource::IsWithin(double n, const ConstrainDoubleRange& aRange) {
-  return aRange.mMin <= n && n <= aRange.mMax;
-}
-
-/* static */ int32_t
-MediaEngineCameraVideoSource::Clamp(int32_t n, const ConstrainLongRange& aRange) {
-  return std::max(aRange.mMin, std::min(n, aRange.mMax));
-}
-
-/* static */ bool
-MediaEngineCameraVideoSource::AreIntersecting(const ConstrainLongRange& aA, const ConstrainLongRange& aB) {
-  return aA.mMax >= aB.mMin && aA.mMin <= aB.mMax;
-}
-
-/* static */ bool
-MediaEngineCameraVideoSource::Intersect(ConstrainLongRange& aA, const ConstrainLongRange& aB) {
-  MOZ_ASSERT(AreIntersecting(aA, aB));
-  aA.mMin = std::max(aA.mMin, aB.mMin);
-  aA.mMax = std::min(aA.mMax, aB.mMax);
-  return true;
-}
-
 // guts for appending data to the MSG track
 bool MediaEngineCameraVideoSource::AppendToTrack(SourceMediaStream* aSource,
                                                  layers::Image* aImage,
@@ -68,84 +44,246 @@
   return aSource->AppendToTrack(aID, &(segment));
 }
 
-// A special version of the algorithm for cameras that don't list capabilities.
+// Sub-classes (B2G or desktop) should overload one of both of these two methods
+// to provide capabilities
+size_t
+MediaEngineCameraVideoSource::NumCapabilities()
+{
+  return mHardcodedCapabilities.Length();
+}
+
 void
-MediaEngineCameraVideoSource::GuessCapability(
-    const VideoTrackConstraintsN& aConstraints,
-    const MediaEnginePrefs& aPrefs)
+MediaEngineCameraVideoSource::GetCapability(size_t aIndex,
+                                            webrtc::CaptureCapability& aOut)
+{
+  MOZ_ASSERT(aIndex < mHardcodedCapabilities.Length());
+  aOut = mHardcodedCapabilities[aIndex];
+}
+
+// The full algorithm for all cameras. Sources that don't list capabilities
+// need to fake it and hardcode some by populating mHardcodedCapabilities above.
+
+// Fitness distance returned as integer math * 1000. Infinity = UINT32_MAX
+
+template<class ValueType, class ConstrainRange>
+/* static */ uint32_t
+MediaEngineCameraVideoSource::FitnessDistance(ValueType n,
+                                              const ConstrainRange& aRange)
 {
-  LOG(("GuessCapability: prefs: %dx%d @%d-%dfps",
+  if ((aRange.mExact.WasPassed() && aRange.mExact.Value() != n) ||
+      (aRange.mMin.WasPassed() && aRange.mMin.Value() > n) ||
+      (aRange.mMax.WasPassed() && aRange.mMax.Value() < n)) {
+    return UINT32_MAX;
+  }
+  if (!aRange.mIdeal.WasPassed() || n == aRange.mIdeal.Value()) {
+    return 0;
+  }
+  return uint32_t(ValueType((std::abs(n - aRange.mIdeal.Value()) * 1000) /
+                            std::max(std::abs(n), std::abs(aRange.mIdeal.Value()))));
+}
+
+// Binding code doesn't templatize well...
+
+template<>
+/* static */ uint32_t
+MediaEngineCameraVideoSource::FitnessDistance(int32_t n,
+    const OwningLongOrConstrainLongRange& aConstraint)
+{
+  if (aConstraint.IsLong()) {
+    ConstrainLongRange range;
+    range.mIdeal.Construct(aConstraint.GetAsLong());
+    return FitnessDistance(n, range);
+  } else {
+    return FitnessDistance(n, aConstraint.GetAsConstrainLongRange());
+  }
+}
+
+template<>
+/* static */ uint32_t
+MediaEngineCameraVideoSource::FitnessDistance(double n,
+    const OwningDoubleOrConstrainDoubleRange& aConstraint)
+{
+  if (aConstraint.IsDouble()) {
+    ConstrainDoubleRange range;
+    range.mIdeal.Construct(aConstraint.GetAsDouble());
+    return FitnessDistance(n, range);
+  } else {
+    return FitnessDistance(n, aConstraint.GetAsConstrainDoubleRange());
+  }
+}
+
+/*static*/ uint32_t
+MediaEngineCameraVideoSource::GetFitnessDistance(const webrtc::CaptureCapability& aCandidate,
+                                                 const MediaTrackConstraintSet &aConstraints)
+{
+  uint64_t distance =
+    uint64_t(FitnessDistance(int32_t(aCandidate.width), aConstraints.mWidth)) +
+    uint64_t(FitnessDistance(int32_t(aCandidate.height), aConstraints.mHeight)) +
+    uint64_t(FitnessDistance(double(aCandidate.maxFPS), aConstraints.mFrameRate));
+  return uint32_t(std::min(distance, uint64_t(UINT32_MAX)));
+}
+
+// Find best capability by removing inferiors. May leave >1 of equal distance
+
+/* static */ void
+MediaEngineCameraVideoSource::TrimLessFitCandidates(CapabilitySet& set) {
+  uint32_t best = UINT32_MAX;
+  for (auto& candidate : set) {
+    if (best > candidate.mDistance) {
+      best = candidate.mDistance;
+    }
+  }
+  for (size_t i = 0; i < set.Length();) {
+    if (set[i].mDistance > best) {
+      set.RemoveElementAt(i);
+    } else {
+      ++i;
+    }
+  }
+  MOZ_ASSERT(set.Length());
+}
+
+// GetBestFitnessDistance returns the best distance the capture device can offer
+// as a whole, given an accumulated number of ConstraintSets.
+// Ideal values are considered in the first ConstraintSet only.
+// Infinity = UINT32_MAX e.g. device cannot satisfy accumulated ConstraintSets.
+// A finite result may be used to calculate this device's ranking as a choice.
+
+uint32_t
+MediaEngineCameraVideoSource::GetBestFitnessDistance(
+    const nsTArray<const MediaTrackConstraintSet*>& aConstraintSets)
+{
+  size_t num = NumCapabilities();
+
+  CapabilitySet candidateSet;
+  for (size_t i = 0; i < num; i++) {
+    candidateSet.AppendElement(i);
+  }
+
+  bool first = true;
+  for (const MediaTrackConstraintSet* cs : aConstraintSets) {
+    for (size_t i = 0; i < candidateSet.Length();  ) {
+      auto& candidate = candidateSet[i];
+      webrtc::CaptureCapability cap;
+      GetCapability(candidate.mIndex, cap);
+      uint32_t distance = GetFitnessDistance(cap, *cs);
+      if (distance == UINT32_MAX) {
+        candidateSet.RemoveElementAt(i);
+      } else {
+        ++i;
+        if (first) {
+          candidate.mDistance = distance;
+        }
+      }
+    }
+    first = false;
+  }
+  if (!candidateSet.Length()) {
+    return UINT32_MAX;
+  }
+  TrimLessFitCandidates(candidateSet);
+  return candidateSet[0].mDistance;
+}
+
+bool
+MediaEngineCameraVideoSource::ChooseCapability(
+    const dom::MediaTrackConstraints &aConstraints,
+    const MediaEnginePrefs &aPrefs)
+{
+  LOG(("ChooseCapability: prefs: %dx%d @%d-%dfps",
        aPrefs.mWidth, aPrefs.mHeight, aPrefs.mFPS, aPrefs.mMinFPS));
 
-  // In short: compound constraint-ranges and use pref as ideal.
+  size_t num = NumCapabilities();
+
+  CapabilitySet candidateSet;
+  for (size_t i = 0; i < num; i++) {
+    candidateSet.AppendElement(i);
+  }
+
+  // First, filter capabilities by required constraints (min, max, exact).
+
+  for (size_t i = 0; i < candidateSet.Length();) {
+    auto& candidate = candidateSet[i];
+    webrtc::CaptureCapability cap;
+    GetCapability(candidate.mIndex, cap);
+    candidate.mDistance = GetFitnessDistance(cap, aConstraints);
+    if (candidate.mDistance == UINT32_MAX) {
+      candidateSet.RemoveElementAt(i);
+    } else {
+      ++i;
+    }
+  }
 
-  ConstrainLongRange cWidth(aConstraints.mRequired.mWidth);
-  ConstrainLongRange cHeight(aConstraints.mRequired.mHeight);
+  // Filter further with all advanced constraints (that don't overconstrain).
 
   if (aConstraints.mAdvanced.WasPassed()) {
-    const auto& advanced = aConstraints.mAdvanced.Value();
-    for (uint32_t i = 0; i < advanced.Length(); i++) {
-      if (AreIntersecting(cWidth, advanced[i].mWidth) &&
-          AreIntersecting(cHeight, advanced[i].mHeight)) {
-        Intersect(cWidth, advanced[i].mWidth);
-        Intersect(cHeight, advanced[i].mHeight);
+    for (const MediaTrackConstraintSet &cs : aConstraints.mAdvanced.Value()) {
+      CapabilitySet rejects;
+      for (size_t i = 0; i < candidateSet.Length();) {
+        auto& candidate = candidateSet[i];
+        webrtc::CaptureCapability cap;
+        GetCapability(candidate.mIndex, cap);
+        if (GetFitnessDistance(cap, cs) == UINT32_MAX) {
+          rejects.AppendElement(candidate);
+          candidateSet.RemoveElementAt(i);
+        } else {
+          ++i;
+        }
+      }
+      if (!candidateSet.Length()) {
+        candidateSet.MoveElementsFrom(rejects);
       }
     }
   }
-  // Detect Mac HD cams and give them some love in the form of a dynamic default
-  // since that hardware switches between 4:3 at low res and 16:9 at higher res.
-  //
-  // Logic is: if we're relying on defaults in aPrefs, then
-  // only use HD pref when non-HD pref is too small and HD pref isn't too big.
-
-  bool macHD = ((!aPrefs.mWidth || !aPrefs.mHeight) &&
-                mDeviceName.EqualsASCII("FaceTime HD Camera (Built-in)") &&
-                (aPrefs.GetWidth() < cWidth.mMin ||
-                 aPrefs.GetHeight() < cHeight.mMin) &&
-                !(aPrefs.GetWidth(true) > cWidth.mMax ||
-                  aPrefs.GetHeight(true) > cHeight.mMax));
-  int prefWidth = aPrefs.GetWidth(macHD);
-  int prefHeight = aPrefs.GetHeight(macHD);
-
-  // Clamp width and height without distorting inherent aspect too much.
-
-  if (IsWithin(prefWidth, cWidth) == IsWithin(prefHeight, cHeight)) {
-    // If both are within, we get the default (pref) aspect.
-    // If neither are within, we get the aspect of the enclosing constraint.
-    // Either are presumably reasonable (presuming constraints are sane).
-    mCapability.width = Clamp(prefWidth, cWidth);
-    mCapability.height = Clamp(prefHeight, cHeight);
-  } else {
-    // But if only one clips (e.g. width), the resulting skew is undesirable:
-    //       .------------.
-    //       | constraint |
-    //  .----+------------+----.
-    //  |    |            |    |
-    //  |pref|  result    |    |   prefAspect != resultAspect
-    //  |    |            |    |
-    //  '----+------------+----'
-    //       '------------'
-    //  So in this case, preserve prefAspect instead:
-    //  .------------.
-    //  | constraint |
-    //  .------------.
-    //  |pref        |             prefAspect is unchanged
-    //  '------------'
-    //  |            |
-    //  '------------'
-    if (IsWithin(prefWidth, cWidth)) {
-      mCapability.height = Clamp(prefHeight, cHeight);
-      mCapability.width = Clamp((mCapability.height * prefWidth) /
-                                prefHeight, cWidth);
-    } else {
-      mCapability.width = Clamp(prefWidth, cWidth);
-      mCapability.height = Clamp((mCapability.width * prefHeight) /
-                                 prefWidth, cHeight);
+  if (!candidateSet.Length()) {
+    LOG(("failed to find capability match from %d choices",num));
+    return false;
+  }
+
+  // Remaining algorithm is up to the UA.
+
+  TrimLessFitCandidates(candidateSet);
+
+  // Any remaining multiples all have the same distance. A common case of this
+  // occurs when no ideal is specified. Lean toward defaults.
+  {
+    MediaTrackConstraintSet prefs;
+    prefs.mWidth.SetAsLong() = aPrefs.GetWidth();
+    prefs.mHeight.SetAsLong() = aPrefs.GetHeight();
+    prefs.mFrameRate.SetAsDouble() = aPrefs.mMinFPS;
+
+    for (auto& candidate : candidateSet) {
+      webrtc::CaptureCapability cap;
+      GetCapability(candidate.mIndex, cap);
+      candidate.mDistance = GetFitnessDistance(cap, prefs);
     }
+    TrimLessFitCandidates(candidateSet);
   }
-  mCapability.maxFPS = MediaEngine::DEFAULT_VIDEO_FPS;
-  LOG(("chose cap %dx%d @%dfps",
-       mCapability.width, mCapability.height, mCapability.maxFPS));
+
+  // Any remaining multiples all have the same distance, but may vary on
+  // format. Some formats are more desirable for certain use like WebRTC.
+  // E.g. I420 over RGB24 can remove a needless format conversion.
+
+  bool found = false;
+  for (auto& candidate : candidateSet) {
+    webrtc::CaptureCapability cap;
+    GetCapability(candidate.mIndex, cap);
+    if (cap.rawType == webrtc::RawVideoType::kVideoI420 ||
+        cap.rawType == webrtc::RawVideoType::kVideoYUY2 ||
+        cap.rawType == webrtc::RawVideoType::kVideoYV12) {
+      mCapability = cap;
+      found = true;
+      break;
+    }
+  }
+  if (!found) {
+    GetCapability(candidateSet[0].mIndex, mCapability);
+  }
+
+  LOG(("chose cap %dx%d @%dfps codec %d raw %d",
+       mCapability.width, mCapability.height, mCapability.maxFPS,
+       mCapability.codecType, mCapability.rawType));
+  return true;
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineCameraVideoSource.h	2015-02-28 15:03:08.000000000 +0000
@@ -58,7 +58,19 @@
     return NS_ERROR_NOT_IMPLEMENTED;
   }
 
+  uint32_t GetBestFitnessDistance(
+      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) MOZ_OVERRIDE;
+
 protected:
+  struct CapabilityCandidate {
+    explicit CapabilityCandidate(uint8_t index, uint32_t distance = 0)
+    : mIndex(index), mDistance(distance) {}
+
+    size_t mIndex;
+    uint32_t mDistance;
+  };
+  typedef nsTArray<CapabilityCandidate> CapabilitySet;
+
   ~MediaEngineCameraVideoSource() {}
 
   // guts for appending data to the MSG track
@@ -66,15 +78,15 @@
                              layers::Image* aImage,
                              TrackID aID,
                              StreamTime delta);
-
-  static bool IsWithin(int32_t n, const dom::ConstrainLongRange& aRange);
-  static bool IsWithin(double n, const dom::ConstrainDoubleRange& aRange);
-  static int32_t Clamp(int32_t n, const dom::ConstrainLongRange& aRange);
-  static bool AreIntersecting(const dom::ConstrainLongRange& aA,
-                              const dom::ConstrainLongRange& aB);
-  static bool Intersect(dom::ConstrainLongRange& aA, const dom::ConstrainLongRange& aB);
-  void GuessCapability(const VideoTrackConstraintsN& aConstraints,
-                       const MediaEnginePrefs& aPrefs);
+  template<class ValueType, class ConstrainRange>
+  static uint32_t FitnessDistance(ValueType n, const ConstrainRange& aRange);
+  static uint32_t GetFitnessDistance(const webrtc::CaptureCapability& aCandidate,
+                                     const dom::MediaTrackConstraintSet &aConstraints);
+  static void TrimLessFitCandidates(CapabilitySet& set);
+  virtual size_t NumCapabilities();
+  virtual void GetCapability(size_t aIndex, webrtc::CaptureCapability& aOut);
+  bool ChooseCapability(const dom::MediaTrackConstraints &aConstraints,
+                        const MediaEnginePrefs &aPrefs);
 
   // Engine variables.
 
@@ -101,6 +113,7 @@
 
   webrtc::CaptureCapability mCapability; // Doesn't work on OS X.
 
+  nsTArray<webrtc::CaptureCapability> mHardcodedCapabilities; // For OSX & B2G
   nsString mDeviceName;
   nsString mUniqueId;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineDefault.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineDefault.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineDefault.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineDefault.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -69,7 +69,7 @@
 }
 
 nsresult
-MediaEngineDefaultVideoSource::Allocate(const VideoTrackConstraintsN &aConstraints,
+MediaEngineDefaultVideoSource::Allocate(const dom::MediaTrackConstraints &aConstraints,
                                         const MediaEnginePrefs &aPrefs)
 {
   if (mState != kReleased) {
@@ -138,12 +138,11 @@
     return NS_ERROR_FAILURE;
   }
 
-  aStream->AddTrack(aID, 0, new VideoSegment());
-  aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
+  aStream->AddTrack(aID, 0, new VideoSegment(), SourceMediaStream::ADDTRACK_QUEUED);
 
   if (mHasFakeTracks) {
     for (int i = 0; i < kFakeVideoTrackCount; ++i) {
-      aStream->AddTrack(kTrackCount + i, 0, new VideoSegment());
+      aStream->AddTrack(kTrackCount + i, 0, new VideoSegment(), SourceMediaStream::ADDTRACK_QUEUED);
     }
   }
 
@@ -350,7 +349,7 @@
 }
 
 nsresult
-MediaEngineDefaultAudioSource::Allocate(const AudioTrackConstraintsN &aConstraints,
+MediaEngineDefaultAudioSource::Allocate(const dom::MediaTrackConstraints &aConstraints,
                                         const MediaEnginePrefs &aPrefs)
 {
   if (mState != kReleased) {
@@ -389,18 +388,15 @@
 
   // AddTrack will take ownership of segment
   AudioSegment* segment = new AudioSegment();
-  mSource->AddAudioTrack(aID, AUDIO_RATE, 0, segment);
+  mSource->AddAudioTrack(aID, AUDIO_RATE, 0, segment, SourceMediaStream::ADDTRACK_QUEUED);
 
   if (mHasFakeTracks) {
     for (int i = 0; i < kFakeAudioTrackCount; ++i) {
       mSource->AddAudioTrack(kTrackCount + kFakeVideoTrackCount+i,
-                             AUDIO_RATE, 0, new AudioSegment());
+                             AUDIO_RATE, 0, new AudioSegment(), SourceMediaStream::ADDTRACK_QUEUED);
     }
   }
 
-  // We aren't going to add any more tracks
-  mSource->AdvanceKnownTracksTime(STREAM_TIME_MAX);
-
   // Remember TrackID so we can finish later
   mTrackID = aID;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineDefault.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineDefault.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineDefault.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineDefault.h	2015-02-28 15:03:08.000000000 +0000
@@ -40,7 +40,7 @@
   virtual void GetName(nsAString&) MOZ_OVERRIDE;
   virtual void GetUUID(nsAString&) MOZ_OVERRIDE;
 
-  virtual nsresult Allocate(const VideoTrackConstraintsN &aConstraints,
+  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                             const MediaEnginePrefs &aPrefs) MOZ_OVERRIDE;
   virtual nsresult Deallocate() MOZ_OVERRIDE;
   virtual nsresult Start(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
@@ -54,7 +54,7 @@
                           SourceMediaStream *aSource,
                           TrackID aId,
                           StreamTime aDesiredTime) MOZ_OVERRIDE;
-  virtual bool SatisfiesConstraintSets(
+  virtual uint32_t GetBestFitnessDistance(
       const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) MOZ_OVERRIDE
   {
     return true;
@@ -108,7 +108,7 @@
   virtual void GetName(nsAString&) MOZ_OVERRIDE;
   virtual void GetUUID(nsAString&) MOZ_OVERRIDE;
 
-  virtual nsresult Allocate(const AudioTrackConstraintsN &aConstraints,
+  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                             const MediaEnginePrefs &aPrefs) MOZ_OVERRIDE;
   virtual nsresult Deallocate() MOZ_OVERRIDE;
   virtual nsresult Start(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -107,15 +107,51 @@
   }
 }
 
-void
-MediaEngineGonkVideoSource::ChooseCapability(const VideoTrackConstraintsN& aConstraints,
-                                             const MediaEnginePrefs& aPrefs)
+size_t
+MediaEngineGonkVideoSource::NumCapabilities()
 {
-  return GuessCapability(aConstraints, aPrefs);
+  // TODO: Stop hardcoding. Use GetRecorderProfiles+GetProfileInfo (Bug 1128550)
+  //
+  // The camera-selecting constraints algorithm needs a set of capabilities to
+  // work on. In lieu of something better, here are some generic values based on
+  // http://en.wikipedia.org/wiki/Comparison_of_Firefox_OS_devices on Jan 2015.
+  // When unknown, better overdo it with choices to not block legitimate asks.
+  // TODO: Match with actual hardware or add code to query hardware.
+
+  if (mHardcodedCapabilities.IsEmpty()) {
+    const struct { int width, height; } hardcodes[] = {
+      { 800, 1280 },
+      { 720, 1280 },
+      { 600, 1024 },
+      { 540, 960 },
+      { 480, 854 },
+      { 480, 800 },
+      { 320, 480 },
+      { 240, 320 }, // sole mode supported by emulator on try
+    };
+    const int framerates[] = { 15, 30 };
+
+    for (auto& hardcode : hardcodes) {
+      webrtc::CaptureCapability c;
+      c.width = hardcode.width;
+      c.height = hardcode.height;
+      for (int framerate : framerates) {
+        c.maxFPS = framerate;
+        mHardcodedCapabilities.AppendElement(c); // portrait
+      }
+      c.width = hardcode.height;
+      c.height = hardcode.width;
+      for (int framerate : framerates) {
+        c.maxFPS = framerate;
+        mHardcodedCapabilities.AppendElement(c); // landscape
+      }
+    }
+  }
+  return mHardcodedCapabilities.Length();
 }
 
 nsresult
-MediaEngineGonkVideoSource::Allocate(const VideoTrackConstraintsN& aConstraints,
+MediaEngineGonkVideoSource::Allocate(const dom::MediaTrackConstraints& aConstraints,
                                      const MediaEnginePrefs& aPrefs)
 {
   LOG((__FUNCTION__));
@@ -182,7 +218,6 @@
   }
 
   aStream->AddTrack(aID, 0, new VideoSegment());
-  aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
   ReentrantMonitorAutoEnter sync(mCallbackMonitor);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineGonkVideoSource.h	2015-02-28 15:03:08.000000000 +0000
@@ -60,7 +60,7 @@
       Init();
     }
 
-  virtual nsresult Allocate(const VideoTrackConstraintsN &aConstraints,
+  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                             const MediaEnginePrefs &aPrefs) MOZ_OVERRIDE;
   virtual nsresult Deallocate() MOZ_OVERRIDE;
   virtual nsresult Start(SourceMediaStream* aStream, TrackID aID) MOZ_OVERRIDE;
@@ -69,11 +69,6 @@
                           SourceMediaStream* aSource,
                           TrackID aId,
                           StreamTime aDesiredTime) MOZ_OVERRIDE;
-  virtual bool SatisfiesConstraintSets(
-      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets)
-  {
-    return true;
-  }
 
   void OnHardwareStateChange(HardwareState aState, nsresult aReason) MOZ_OVERRIDE;
   void GetRotation();
@@ -109,8 +104,7 @@
   // Initialize the needed Video engine interfaces.
   void Init();
   void Shutdown();
-  void ChooseCapability(const VideoTrackConstraintsN& aConstraints,
-                        const MediaEnginePrefs& aPrefs);
+  size_t NumCapabilities() MOZ_OVERRIDE;
   // Initialize the recording frame (MediaBuffer) callback and Gonk camera.
   // MediaBuffer will transfers to MediaStreamGraph via AppendToTrack.
   nsresult InitDirectMediaBuffer();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngine.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngine.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngine.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngine.h	2015-02-28 15:03:08.000000000 +0000
@@ -18,9 +18,6 @@
 class File;
 }
 
-struct VideoTrackConstraintsN;
-struct AudioTrackConstraintsN;
-
 /**
  * Abstract interface for managing audio and video devices. Each platform
  * must implement a concrete class that will map these classes and methods
@@ -219,10 +216,10 @@
   virtual ~MediaEngineVideoSource() {}
 
   /* This call reserves but does not start the device. */
-  virtual nsresult Allocate(const VideoTrackConstraintsN &aConstraints,
+  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                             const MediaEnginePrefs &aPrefs) = 0;
 
-  virtual bool SatisfiesConstraintSets(
+  virtual uint32_t GetBestFitnessDistance(
       const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) = 0;
 
 protected:
@@ -241,7 +238,7 @@
   virtual ~MediaEngineAudioSource() {}
 
   /* This call reserves but does not start the device. */
-  virtual nsresult Allocate(const AudioTrackConstraintsN &aConstraints,
+  virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
                             const MediaEnginePrefs &aPrefs) = 0;
 protected:
   explicit MediaEngineAudioSource(MediaEngineState aState)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -27,7 +27,6 @@
 namespace mozilla {
 
 using namespace mozilla::gfx;
-using dom::ConstrainLongRange;
 
 NS_IMPL_ISUPPORTS(MediaEngineTabVideoSource, nsIDOMEventListener, nsITimerCallback)
 
@@ -116,45 +115,26 @@
 }
 
 nsresult
-MediaEngineTabVideoSource::Allocate(const VideoTrackConstraintsN& aConstraints,
+MediaEngineTabVideoSource::Allocate(const dom::MediaTrackConstraints& aConstraints,
                                     const MediaEnginePrefs& aPrefs)
 {
+  // windowId and scrollWithPage are not proper constraints, so just read them.
+  // They have no well-defined behavior in advanced, so ignore them there.
 
-  ConstrainLongRange cWidth(aConstraints.mRequired.mWidth);
-  ConstrainLongRange cHeight(aConstraints.mRequired.mHeight);
-
-  mWindowId = aConstraints.mBrowserWindow.WasPassed() ? aConstraints.mBrowserWindow.Value() : -1;
-  bool haveScrollWithPage = aConstraints.mScrollWithPage.WasPassed();
-  mScrollWithPage =  haveScrollWithPage ? aConstraints.mScrollWithPage.Value() : true;
-
-  if (aConstraints.mAdvanced.WasPassed()) {
-    const auto& advanced = aConstraints.mAdvanced.Value();
-    for (uint32_t i = 0; i < advanced.Length(); i++) {
-      if (cWidth.mMax >= advanced[i].mWidth.mMin && cWidth.mMin <= advanced[i].mWidth.mMax &&
-         cHeight.mMax >= advanced[i].mHeight.mMin && cHeight.mMin <= advanced[i].mHeight.mMax) {
-        cWidth.mMin = std::max(cWidth.mMin, advanced[i].mWidth.mMin);
-        cHeight.mMin = std::max(cHeight.mMin, advanced[i].mHeight.mMin);
-        cWidth.mMax = std::min(cWidth.mMax, advanced[i].mWidth.mMax);
-        cHeight.mMax = std::min(cHeight.mMax, advanced[i].mHeight.mMax);
-      }
-
-      if (mWindowId == -1 && advanced[i].mBrowserWindow.WasPassed()) {
-        mWindowId = advanced[i].mBrowserWindow.Value();
-      }
-
-      if (!haveScrollWithPage && advanced[i].mScrollWithPage.WasPassed()) {
-        mScrollWithPage = advanced[i].mScrollWithPage.Value();
-        haveScrollWithPage = true;
-      }
-    }
-  }
-
-  ConstrainLongRange defaultRange;
-
-  mBufWidthMax  = defaultRange.mMax > cWidth.mMax ? cWidth.mMax : aPrefs.GetWidth(false);
-  mBufHeightMax  = defaultRange.mMax > cHeight.mMax ? cHeight.mMax : aPrefs.GetHeight(false);
-
-  mTimePerFrame = aPrefs.mFPS ? 1000 / aPrefs.mFPS : aPrefs.mFPS;
+  mWindowId = aConstraints.mBrowserWindow.WasPassed() ?
+              aConstraints.mBrowserWindow.Value() : -1;
+  mScrollWithPage = aConstraints.mScrollWithPage.WasPassed() ?
+                    aConstraints.mScrollWithPage.Value() : true;
+
+  FlattenedConstraints c(aConstraints);
+
+  mBufWidthMax = c.mWidth.Clamp(c.mWidth.mIdeal.WasPassed() ?
+                                c.mWidth.mIdeal.Value() : aPrefs.GetWidth(false));
+  mBufHeightMax = c.mHeight.Clamp(c.mHeight.mIdeal.WasPassed() ?
+                                  c.mHeight.mIdeal.Value() : aPrefs.GetHeight(false));
+  double frameRate = c.mFrameRate.Clamp(c.mFrameRate.mIdeal.WasPassed() ?
+                                     c.mFrameRate.mIdeal.Value() : aPrefs.mFPS);
+  mTimePerFrame = std::max(10, int(1000.0 / (frameRate > 0? frameRate : 1)));
   return NS_OK;
 }
 
@@ -174,7 +154,6 @@
     runnable = new StartRunnable(this);
   NS_DispatchToMainThread(runnable);
   aStream->AddTrack(aID, 0, new VideoSegment());
-  aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
 
   return NS_OK;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineTabVideoSource.h	2015-02-28 15:03:08.000000000 +0000
@@ -20,7 +20,7 @@
 
     virtual void GetName(nsAString_internal&) MOZ_OVERRIDE;
     virtual void GetUUID(nsAString_internal&) MOZ_OVERRIDE;
-    virtual nsresult Allocate(const VideoTrackConstraintsN &,
+    virtual nsresult Allocate(const dom::MediaTrackConstraints &,
                               const mozilla::MediaEnginePrefs&) MOZ_OVERRIDE;
     virtual nsresult Deallocate() MOZ_OVERRIDE;
     virtual nsresult Start(mozilla::SourceMediaStream*, mozilla::TrackID) MOZ_OVERRIDE;
@@ -32,10 +32,10 @@
     virtual const dom::MediaSourceEnum GetMediaSource() MOZ_OVERRIDE {
       return dom::MediaSourceEnum::Browser;
     }
-    virtual bool SatisfiesConstraintSets(
+    virtual uint32_t GetBestFitnessDistance(
       const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) MOZ_OVERRIDE
     {
-      return true;
+      return 0;
     }
 
     virtual nsresult TakePhoto(PhotoCallback* aCallback) MOZ_OVERRIDE
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -265,7 +265,7 @@
 }
 
 nsresult
-MediaEngineWebRTCAudioSource::Allocate(const AudioTrackConstraintsN &aConstraints,
+MediaEngineWebRTCAudioSource::Allocate(const dom::MediaTrackConstraints &aConstraints,
                                        const MediaEnginePrefs &aPrefs)
 {
   if (mState == kReleased) {
@@ -328,8 +328,8 @@
   }
 
   AudioSegment* segment = new AudioSegment();
-  aStream->AddAudioTrack(aID, SAMPLE_FREQUENCY, 0, segment);
-  aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
+  aStream->AddAudioTrack(aID, SAMPLE_FREQUENCY, 0, segment, SourceMediaStream::ADDTRACK_QUEUED);
+
   // XXX Make this based on the pref.
   aStream->RegisterForAudioMixing();
   LOG(("Start audio for stream %p", aStream));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineWebRTC.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineWebRTC.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineWebRTC.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineWebRTC.h	2015-02-28 15:03:08.000000000 +0000
@@ -89,7 +89,7 @@
     Init();
   }
 
-  virtual nsresult Allocate(const VideoTrackConstraintsN& aConstraints,
+  virtual nsresult Allocate(const dom::MediaTrackConstraints& aConstraints,
                             const MediaEnginePrefs& aPrefs) MOZ_OVERRIDE;
   virtual nsresult Deallocate() MOZ_OVERRIDE;
   virtual nsresult Start(SourceMediaStream*, TrackID) MOZ_OVERRIDE;
@@ -109,9 +109,6 @@
 
   void Refresh(int aIndex);
 
-  bool SatisfiesConstraintSets(
-      const nsTArray<const dom::MediaTrackConstraintSet*>& aConstraintSets) MOZ_OVERRIDE;
-
 protected:
   ~MediaEngineWebRTCVideoSource() { Shutdown(); }
 
@@ -129,10 +126,8 @@
   int mMinFps; // Min rate we want to accept
   dom::MediaSourceEnum mMediaSource; // source of media (camera | application | screen)
 
-  static bool SatisfiesConstraintSet(const dom::MediaTrackConstraintSet& aConstraints,
-                                     const webrtc::CaptureCapability& aCandidate);
-  void ChooseCapability(const VideoTrackConstraintsN& aConstraints,
-                        const MediaEnginePrefs& aPrefs);
+  size_t NumCapabilities() MOZ_OVERRIDE;
+  void GetCapability(size_t aIndex, webrtc::CaptureCapability& aOut) MOZ_OVERRIDE;
 };
 
 class MediaEngineWebRTCAudioSource : public MediaEngineAudioSource,
@@ -165,7 +160,7 @@
   virtual void GetName(nsAString& aName) MOZ_OVERRIDE;
   virtual void GetUUID(nsAString& aUUID) MOZ_OVERRIDE;
 
-  virtual nsresult Allocate(const AudioTrackConstraintsN& aConstraints,
+  virtual nsresult Allocate(const dom::MediaTrackConstraints& aConstraints,
                             const MediaEnginePrefs& aPrefs) MOZ_OVERRIDE;
   virtual nsresult Deallocate() MOZ_OVERRIDE;
   virtual nsresult Start(SourceMediaStream* aStream, TrackID aID) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaEngineWebRTCVideo.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -153,176 +153,53 @@
   }
 }
 
-/*static*/
-bool
-MediaEngineWebRTCVideoSource::SatisfiesConstraintSet(const MediaTrackConstraintSet &aConstraints,
-                                                     const webrtc::CaptureCapability& aCandidate) {
-  if (!MediaEngineCameraVideoSource::IsWithin(aCandidate.width, aConstraints.mWidth) ||
-      !MediaEngineCameraVideoSource::IsWithin(aCandidate.height, aConstraints.mHeight)) {
-    return false;
-  }
-  if (!MediaEngineCameraVideoSource::IsWithin(aCandidate.maxFPS, aConstraints.mFrameRate)) {
-    return false;
-  }
-  return true;
-}
-
-typedef nsTArray<uint8_t> CapabilitySet;
-
-// SatisfiesConstraintSets (plural) answers for the capture device as a whole
-// whether it can satisfy an accumulated number of capabilitySets.
-
-bool
-MediaEngineWebRTCVideoSource::SatisfiesConstraintSets(
-    const nsTArray<const MediaTrackConstraintSet*>& aConstraintSets)
+size_t
+MediaEngineWebRTCVideoSource::NumCapabilities()
 {
-  NS_ConvertUTF16toUTF8 uniqueId(mUniqueId);
-  int num = mViECapture->NumberOfCapabilities(uniqueId.get(), kMaxUniqueIdLength);
-  if (num <= 0) {
-    return true;
-  }
+  NS_ConvertUTF16toUTF8 uniqueId(mUniqueId); // TODO: optimize this?
 
-  CapabilitySet candidateSet;
-  for (int i = 0; i < num; i++) {
-    candidateSet.AppendElement(i);
+  int num = mViECapture->NumberOfCapabilities(uniqueId.get(), kMaxUniqueIdLength);
+  if (num > 0) {
+    return num;
   }
-
-  for (size_t j = 0; j < aConstraintSets.Length(); j++) {
-    for (size_t i = 0; i < candidateSet.Length();  ) {
-      webrtc::CaptureCapability cap;
-      mViECapture->GetCaptureCapability(uniqueId.get(), kMaxUniqueIdLength,
-                                        candidateSet[i], cap);
-      if (!SatisfiesConstraintSet(*aConstraintSets[j], cap)) {
-        candidateSet.RemoveElementAt(i);
-      } else {
-        ++i;
-      }
+  // Mac doesn't support capabilities.
+  //
+  // Hardcode generic desktop capabilities modeled on OSX camera.
+  // Note: Values are empirically picked to be OSX friendly, as on OSX, values
+  // other than these cause the source to not produce.
+
+  if (mHardcodedCapabilities.IsEmpty()) {
+    for (int i = 0; i < 9; i++) {
+      webrtc::CaptureCapability c;
+      c.width = 1920 - i*128;
+      c.height = 1080 - i*72;
+      c.maxFPS = 30;
+      mHardcodedCapabilities.AppendElement(c);
+    }
+    for (int i = 0; i < 16; i++) {
+      webrtc::CaptureCapability c;
+      c.width = 640 - i*40;
+      c.height = 480 - i*30;
+      c.maxFPS = 30;
+      mHardcodedCapabilities.AppendElement(c);
     }
   }
-  return !!candidateSet.Length();
+  return mHardcodedCapabilities.Length();
 }
 
 void
-MediaEngineWebRTCVideoSource::ChooseCapability(
-    const VideoTrackConstraintsN &aConstraints,
-    const MediaEnginePrefs &aPrefs)
+MediaEngineWebRTCVideoSource::GetCapability(size_t aIndex,
+                                            webrtc::CaptureCapability& aOut)
 {
-  NS_ConvertUTF16toUTF8 uniqueId(mUniqueId);
-  int num = mViECapture->NumberOfCapabilities(uniqueId.get(), kMaxUniqueIdLength);
-  if (num <= 0) {
-    // Mac doesn't support capabilities.
-    return GuessCapability(aConstraints, aPrefs);
-  }
-
-  // The rest is the full algorithm for cameras that can list their capabilities.
-
-  LOG(("ChooseCapability: prefs: %dx%d @%d-%dfps",
-       aPrefs.mWidth, aPrefs.mHeight, aPrefs.mFPS, aPrefs.mMinFPS));
-
-  CapabilitySet candidateSet;
-  for (int i = 0; i < num; i++) {
-    candidateSet.AppendElement(i);
-  }
-
-  // Pick among capabilities: First apply required constraints.
-
-  for (uint32_t i = 0; i < candidateSet.Length();) {
-    webrtc::CaptureCapability cap;
-    mViECapture->GetCaptureCapability(uniqueId.get(), kMaxUniqueIdLength,
-                                      candidateSet[i], cap);
-    if (!SatisfiesConstraintSet(aConstraints.mRequired, cap)) {
-      candidateSet.RemoveElementAt(i);
-    } else {
-      ++i;
-    }
-  }
-
-  CapabilitySet tailSet;
-
-  // Then apply advanced (formerly known as optional) constraints.
-
-  if (aConstraints.mAdvanced.WasPassed()) {
-    auto &array = aConstraints.mAdvanced.Value();
-
-    for (uint32_t i = 0; i < array.Length(); i++) {
-      CapabilitySet rejects;
-      for (uint32_t j = 0; j < candidateSet.Length();) {
-        webrtc::CaptureCapability cap;
-        mViECapture->GetCaptureCapability(uniqueId.get(), kMaxUniqueIdLength,
-                                          candidateSet[j], cap);
-        if (!SatisfiesConstraintSet(array[i], cap)) {
-          rejects.AppendElement(candidateSet[j]);
-          candidateSet.RemoveElementAt(j);
-        } else {
-          ++j;
-        }
-      }
-      (candidateSet.Length()? tailSet : candidateSet).MoveElementsFrom(rejects);
-    }
-  }
-
-  if (!candidateSet.Length()) {
-    candidateSet.AppendElement(0);
+  if (!mHardcodedCapabilities.IsEmpty()) {
+    MediaEngineCameraVideoSource::GetCapability(aIndex, aOut);
   }
-
-  int prefWidth = aPrefs.GetWidth();
-  int prefHeight = aPrefs.GetHeight();
-
-  // Default is closest to available capability but equal to or below;
-  // otherwise closest above.  Since we handle the num=0 case above and
-  // take the first entry always, we can never exit uninitialized.
-
-  webrtc::CaptureCapability cap;
-  bool higher = true;
-  for (uint32_t i = 0; i < candidateSet.Length(); i++) {
-    mViECapture->GetCaptureCapability(NS_ConvertUTF16toUTF8(mUniqueId).get(),
-                                      kMaxUniqueIdLength, candidateSet[i], cap);
-    if (higher) {
-      if (i == 0 ||
-          (mCapability.width > cap.width && mCapability.height > cap.height)) {
-        // closer than the current choice
-        mCapability = cap;
-        // FIXME: expose expected capture delay?
-      }
-      if (cap.width <= (uint32_t) prefWidth && cap.height <= (uint32_t) prefHeight) {
-        higher = false;
-      }
-    } else {
-      if (cap.width > (uint32_t) prefWidth || cap.height > (uint32_t) prefHeight ||
-          cap.maxFPS < (uint32_t) aPrefs.mMinFPS) {
-        continue;
-      }
-      if (mCapability.width < cap.width && mCapability.height < cap.height) {
-        mCapability = cap;
-        // FIXME: expose expected capture delay?
-      }
-    }
-    // Same resolution, maybe better format or FPS match
-    if (mCapability.width == cap.width && mCapability.height == cap.height) {
-      // FPS too low
-      if (cap.maxFPS < (uint32_t) aPrefs.mMinFPS) {
-        continue;
-      }
-      // Better match
-      if (cap.maxFPS < mCapability.maxFPS) {
-        mCapability = cap;
-      } else if (cap.maxFPS == mCapability.maxFPS) {
-        // Resolution and FPS the same, check format
-        if (cap.rawType == webrtc::RawVideoType::kVideoI420
-          || cap.rawType == webrtc::RawVideoType::kVideoYUY2
-          || cap.rawType == webrtc::RawVideoType::kVideoYV12) {
-          mCapability = cap;
-        }
-      }
-    }
-  }
-  LOG(("chose cap %dx%d @%dfps codec %d raw %d",
-       mCapability.width, mCapability.height, mCapability.maxFPS,
-       mCapability.codecType, mCapability.rawType));
+  NS_ConvertUTF16toUTF8 uniqueId(mUniqueId); // TODO: optimize this?
+  mViECapture->GetCaptureCapability(uniqueId.get(), kMaxUniqueIdLength, aIndex, aOut);
 }
 
 nsresult
-MediaEngineWebRTCVideoSource::Allocate(const VideoTrackConstraintsN &aConstraints,
+MediaEngineWebRTCVideoSource::Allocate(const dom::MediaTrackConstraints &aConstraints,
                                        const MediaEnginePrefs &aPrefs)
 {
   LOG((__FUNCTION__));
@@ -330,8 +207,9 @@
     // Note: if shared, we don't allow a later opener to affect the resolution.
     // (This may change depending on spec changes for Constraints/settings)
 
-    ChooseCapability(aConstraints, aPrefs);
-
+    if (!ChooseCapability(aConstraints, aPrefs)) {
+      return NS_ERROR_UNEXPECTED;
+    }
     if (mViECapture->AllocateCaptureDevice(NS_ConvertUTF16toUTF8(mUniqueId).get(),
                                            kMaxUniqueIdLength, mCaptureIndex)) {
       return NS_ERROR_FAILURE;
@@ -408,8 +286,7 @@
     mSources.AppendElement(aStream);
   }
 
-  aStream->AddTrack(aID, 0, new VideoSegment());
-  aStream->AdvanceKnownTracksTime(STREAM_TIME_MAX);
+  aStream->AddTrack(aID, 0, new VideoSegment(), SourceMediaStream::ADDTRACK_QUEUED);
 
   if (mState == kStarted) {
     return NS_OK;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaTrackConstraints.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaTrackConstraints.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaTrackConstraints.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaTrackConstraints.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,84 @@
+/* -*- 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 "MediaTrackConstraints.h"
+
+#include <limits>
+
+namespace mozilla {
+
+template<class ValueType>
+template<class ConstrainRange>
+void
+NormalizedConstraintSet::Range<ValueType>::SetFrom(const ConstrainRange& aOther)
+{
+  if (aOther.mIdeal.WasPassed()) {
+    mIdeal.Construct(aOther.mIdeal.Value());
+  }
+  if (aOther.mExact.WasPassed()) {
+    mMin = aOther.mExact.Value();
+    mMax = aOther.mExact.Value();
+  } else {
+    if (aOther.mMin.WasPassed()) {
+      mMin = aOther.mMin.Value();
+    }
+    if (aOther.mMax.WasPassed()) {
+      mMax = aOther.mMax.Value();
+    }
+  }
+}
+
+NormalizedConstraintSet::LongRange::LongRange(
+    const dom::OwningLongOrConstrainLongRange& aOther, bool advanced)
+: Range<int32_t>(1 + INT32_MIN, INT32_MAX) // +1 avoids Windows compiler bug
+{
+  if (aOther.IsLong()) {
+    if (advanced) {
+      mMin = mMax = aOther.GetAsLong();
+    } else {
+      mIdeal.Construct(aOther.GetAsLong());
+    }
+  } else {
+    SetFrom(aOther.GetAsConstrainLongRange());
+  }
+}
+
+NormalizedConstraintSet::DoubleRange::DoubleRange(
+    const dom::OwningDoubleOrConstrainDoubleRange& aOther, bool advanced)
+: Range<double>(-std::numeric_limits<double>::infinity(),
+                std::numeric_limits<double>::infinity())
+{
+  if (aOther.IsDouble()) {
+    if (advanced) {
+      mMin = mMax = aOther.GetAsDouble();
+    } else {
+      mIdeal.Construct(aOther.GetAsDouble());
+    }
+  } else {
+    SetFrom(aOther.GetAsConstrainDoubleRange());
+  }
+}
+
+FlattenedConstraints::FlattenedConstraints(const dom::MediaTrackConstraints& aOther)
+: NormalizedConstraintSet(aOther, false)
+{
+  if (aOther.mAdvanced.WasPassed()) {
+    const auto& advanced = aOther.mAdvanced.Value();
+    for (size_t i = 0; i < advanced.Length(); i++) {
+      NormalizedConstraintSet set(advanced[i], true);
+      // Must only apply compatible i.e. inherently non-overconstraining sets
+      // This rule is pretty much why this code is centralized here.
+      if (mWidth.Intersects(set.mWidth) &&
+          mHeight.Intersects(set.mHeight) &&
+          mFrameRate.Intersects(set.mFrameRate)) {
+        mWidth.Intersect(set.mWidth);
+        mHeight.Intersect(set.mHeight);
+        mFrameRate.Intersect(set.mFrameRate);
+      }
+    }
+  }
+}
+
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaTrackConstraints.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaTrackConstraints.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/MediaTrackConstraints.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/MediaTrackConstraints.h	2015-02-28 15:03:08.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/MediaStreamTrackBinding.h"
+#include "mozilla/dom/MediaTrackConstraintSetBinding.h"
 
 namespace mozilla {
 
@@ -18,8 +19,8 @@
 }
 
 template<class EnumValuesStrings, class Enum>
-static Enum StringToEnum(const EnumValuesStrings& aStrings, const nsAString& aValue,
-                         Enum aDefaultValue) {
+static Enum StringToEnum(const EnumValuesStrings& aStrings,
+                         const nsAString& aValue, Enum aDefaultValue) {
   for (size_t i = 0; aStrings[i].value; i++) {
     if (aValue.EqualsASCII(aStrings[i].value)) {
       return Enum(i);
@@ -28,101 +29,57 @@
   return aDefaultValue;
 }
 
-// Normalized internal version of MediaTrackConstraints to simplify downstream
-// processing. This implementation-only helper is included as needed by both
-// MediaManager (for gUM camera selection) and MediaEngine (for applyConstraints).
+// Helper classes for orthogonal constraints without interdependencies.
+// Instead of constraining values, constrain the constraints themselves.
 
-template<typename T>
-class MediaTrackConstraintsN : public dom::MediaTrackConstraints
+struct NormalizedConstraintSet
 {
-public:
-  typedef T Kind;
-  dom::Sequence<Kind> mRequireN;
-  bool mUnsupportedRequirement;
-  MediaTrackConstraintSet mRequired;
-  dom::Sequence<MediaTrackConstraintSet> mNonrequired;
-  dom::MediaSourceEnum mMediaSourceEnumValue;
-
-  MediaTrackConstraintsN(const dom::MediaTrackConstraints &aOther,
-                         const dom::EnumEntry* aStrings)
-  : dom::MediaTrackConstraints(aOther)
-  , mUnsupportedRequirement(false)
-  , mStrings(aStrings)
+  template<class ValueType>
+  struct Range
   {
-    if (mRequire.WasPassed()) {
-      auto& array = mRequire.Value();
-      for (size_t i = 0; i < array.Length(); i++) {
-        auto value = StringToEnum(mStrings, array[i], Kind::Other);
-        if (value != Kind::Other) {
-          mRequireN.AppendElement(value);
-        } else {
-          mUnsupportedRequirement = true;
-        }
-      }
-    }
-    // treat MediaSource special because it's always required
-    mRequired.mMediaSource = mMediaSource;
+    ValueType mMin, mMax;
+    dom::Optional<ValueType> mIdeal;
+
+    Range(ValueType aMin, ValueType aMax) : mMin(aMin), mMax(aMax) {}
 
-    mMediaSourceEnumValue = StringToEnum(dom::MediaSourceEnumValues::strings,
-                                         mMediaSource,
-                                         dom::MediaSourceEnum::Other);
-    if (mAdvanced.WasPassed()) {
-      if(mMediaSourceEnumValue != dom::MediaSourceEnum::Camera) {
-        // iterate through advanced, forcing mediaSource to match "root"
-        auto& array = mAdvanced.Value();
-        for (uint32_t i = 0; i < array.Length(); i++) {
-          auto& ms = array[i].mMediaSource;
-          if (ms.EqualsASCII(EnumToASCII(dom::MediaSourceEnumValues::strings,
-                                         dom::MediaSourceEnum::Camera))) {
-            ms = mMediaSource;
-          }
-        }
-      }
+    template<class ConstrainRange>
+    void SetFrom(const ConstrainRange& aOther);
+    ValueType Clamp(ValueType n) const { return std::max(mMin, std::min(n, mMax)); }
+    bool Intersects(const Range& aOther) const {
+      return mMax >= aOther.mMin && mMin <= aOther.mMax;
     }
-  }
-protected:
-  MediaTrackConstraintSet& Triage(const Kind kind) {
-    if (mRequireN.IndexOf(kind) != mRequireN.NoIndex) {
-      return mRequired;
-    } else {
-      mNonrequired.AppendElement(MediaTrackConstraintSet());
-      return mNonrequired[mNonrequired.Length()-1];
+    void Intersect(const Range& aOther) {
+      MOZ_ASSERT(Intersects(aOther));
+      mMin = std::max(mMin, aOther.mMin);
+      mMax = std::min(mMax, aOther.mMax);
     }
-  }
-private:
-  const dom::EnumEntry* mStrings;
-};
+  };
 
-struct AudioTrackConstraintsN :
-  public MediaTrackConstraintsN<dom::SupportedAudioConstraints>
-{
-  MOZ_IMPLICIT AudioTrackConstraintsN(const dom::MediaTrackConstraints &aOther)
-  : MediaTrackConstraintsN<dom::SupportedAudioConstraints>(aOther, // B2G ICS compiler bug
-                           dom::SupportedAudioConstraintsValues::strings) {}
+  struct LongRange : public Range<int32_t>
+  {
+    LongRange(const dom::OwningLongOrConstrainLongRange& aOther, bool advanced);
+  };
+
+  struct DoubleRange : public Range<double>
+  {
+    DoubleRange(const dom::OwningDoubleOrConstrainDoubleRange& aOther,
+                bool advanced);
+  };
+
+  // Do you need to add your constraint here? Only if your code uses flattening
+  LongRange mWidth, mHeight;
+  DoubleRange mFrameRate;
+
+  NormalizedConstraintSet(const dom::MediaTrackConstraintSet& aOther,
+                          bool advanced)
+  : mWidth(aOther.mWidth, advanced)
+  , mHeight(aOther.mHeight, advanced)
+  , mFrameRate(aOther.mFrameRate, advanced) {}
 };
 
-struct VideoTrackConstraintsN :
-    public MediaTrackConstraintsN<dom::SupportedVideoConstraints>
+struct FlattenedConstraints : public NormalizedConstraintSet
 {
-  MOZ_IMPLICIT VideoTrackConstraintsN(const dom::MediaTrackConstraints &aOther)
-  : MediaTrackConstraintsN<dom::SupportedVideoConstraints>(aOther,
-                           dom::SupportedVideoConstraintsValues::strings) {
-    if (mFacingMode.WasPassed()) {
-      Triage(Kind::FacingMode).mFacingMode.Construct(mFacingMode.Value());
-    }
-    // Reminder: add handling for new constraints both here & SatisfyConstraintSet
-    Triage(Kind::Width).mWidth = mWidth;
-    Triage(Kind::Height).mHeight = mHeight;
-    Triage(Kind::FrameRate).mFrameRate = mFrameRate;
-    if (mBrowserWindow.WasPassed()) {
-      Triage(Kind::BrowserWindow).mBrowserWindow.Construct(mBrowserWindow.Value());
-    }
-    if (mScrollWithPage.WasPassed()) {
-      Triage(Kind::ScrollWithPage).mScrollWithPage.Construct(mScrollWithPage.Value());
-    }
-    // treat MediaSource special because it's always required
-    mRequired.mMediaSource = mMediaSource;
-  }
+  explicit FlattenedConstraints(const dom::MediaTrackConstraints& aOther);
 };
 
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/media/webrtc/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/media/webrtc/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -21,6 +21,7 @@
         'MediaEngineTabVideoSource.cpp',
         'MediaEngineWebRTCAudio.cpp',
         'MediaEngineWebRTCVideo.cpp',
+        'MediaTrackConstraints.cpp',
     ]
     # MediaEngineWebRTC.cpp needs to be built separately.
     SOURCES += [
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/mobileconnection/gonk/MobileConnectionService.js	2015-02-28 15:03:08.000000000 +0000
@@ -299,6 +299,13 @@
    */
   _selectingNetwork: null,
 
+  /**
+   * The two radio states below stand for the user expectation and the hardware
+   * status, respectively. |radioState| will be updated based on their values.
+   */
+  _expectedRadioState: RIL.GECKO_RADIOSTATE_UNKNOWN,
+  _hardwareRadioState: RIL.GECKO_RADIOSTATE_UNKNOWN,
+
   voice: null,
   data: null,
   networkSelectionMode: Ci.nsIMobileConnection.NETWORK_SELECTION_MODE_UNKNOWN,
@@ -581,12 +588,83 @@
     }
   },
 
-  updateRadioState: function(aRadioState) {
-    if (this.radioState === aRadioState) {
+  updateRadioState: function(aMessage, aCallback = null) {
+    switch (aMessage.msgType) {
+      case "ExpectedRadioState":
+        this._expectedRadioState = aMessage.msgData;
+        break;
+      case "HardwareRadioState":
+        this._hardwareRadioState = aMessage.msgData;
+        break;
+      default:
+        if (DEBUG) this._debug("updateRadioState: Invalid message type");
+        return;
+    }
+
+    if (aMessage.msgType === "ExpectedRadioState" && aCallback &&
+        this._hardwareRadioState === this._expectedRadioState) {
+      // Early resolved
+      aCallback.notifySuccess();
       return;
     }
 
-    this.radioState = aRadioState;
+    let newState;
+    switch (this._expectedRadioState) {
+      case RIL.GECKO_RADIOSTATE_ENABLED:
+        newState = this._hardwareRadioState === this._expectedRadioState ?
+          Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED :
+          Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLING;
+        break;
+
+      case RIL.GECKO_RADIOSTATE_DISABLED:
+        newState = this._hardwareRadioState === this._expectedRadioState ?
+          Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED :
+          Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLING;
+        break;
+
+      default: /* RIL.GECKO_RADIOSTATE_UNKNOWN */
+        switch (this._hardwareRadioState) {
+          case RIL.GECKO_RADIOSTATE_ENABLED:
+            newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED;
+            break;
+          case RIL.GECKO_RADIOSTATE_DISABLED:
+            newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED;
+            break;
+          default: /* RIL.GECKO_RADIOSTATE_UNKNOWN */
+            newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN;
+        }
+    }
+
+    // This update is triggered by underlying layers and the state is UNKNOWN
+    if (aMessage.msgType === "HardwareRadioState" &&
+        aMessage.msgData === RIL.GECKO_RADIOSTATE_UNKNOWN) {
+      // TODO: Find a better way than just setting the radio state to UNKNOWN
+      newState = Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN;
+    }
+
+    if (newState === Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLING ||
+        newState === Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLING) {
+      let action = this._expectedRadioState === RIL.GECKO_RADIOSTATE_ENABLED;
+      this._radioInterface.sendWorkerMessage("setRadioEnabled",
+                                             {enabled: action},
+                                             function(aResponse) {
+        if (!aCallback) {
+          return false;
+        }
+        if (aResponse.errorMsg) {
+          aCallback.notifyError(aResponse.errorMsg);
+          return false;
+        }
+        aCallback.notifySuccess();
+        return false;
+      });
+    }
+
+    if (DEBUG) this._debug("Current Radio State is '" + newState + "'");
+    if (this.radioState === newState) {
+      return;
+    }
+    this.radioState = newState;
     this.deliverListenerEvent("notifyRadioStateChanged");
   },
 
@@ -944,17 +1022,27 @@
   },
 
   setRadioEnabled: function(aEnabled, aCallback) {
-    this._radioInterface.sendWorkerMessage("setRadioEnabled",
-                                           {enabled: aEnabled},
-                                           (function(aResponse) {
-      if (aResponse.errorMsg) {
-        aCallback.notifyError(aResponse.errorMsg);
-        return true;
-      }
+    if (DEBUG) {
+      this._debug("setRadioEnabled: " + aEnabled);
+    }
 
-      aCallback.notifySuccess();
-      return true;
-    }).bind(this));
+    // Before sending a equest to |ril_worker.js|, we should check radioState.
+    switch (this.radioState) {
+      case Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN:
+      case Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED:
+      case Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED:
+        break;
+      default:
+        aCallback.notifyError("InvalidStateError");
+        return;
+    }
+
+    let message = {
+      msgType: "ExpectedRadioState",
+      msgData: (aEnabled ? RIL.GECKO_RADIOSTATE_ENABLED :
+                           RIL.GECKO_RADIOSTATE_DISABLED)
+    };
+    this.updateRadioState(message, aCallback);
   },
 
   getCellInfoList: function(aCallback) {
@@ -1134,7 +1222,11 @@
       debug("notifyRadioStateChanged for " + aClientId + ": " + aRadioState);
     }
 
-    this.getItemByServiceId(aClientId).updateRadioState(aRadioState);
+    let message = {
+      msgType: "HardwareRadioState",
+      msgData: aRadioState
+    };
+    this.getItemByServiceId(aClientId).updateRadioState(message);
   },
 
   notifyNetworkInfoChanged: function(aClientId, aNetworkInfo) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/mobileconnection/tests/marionette/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/mobileconnection/tests/marionette/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/mobileconnection/tests/marionette/head.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/mobileconnection/tests/marionette/head.js	2015-02-28 15:03:08.000000000 +0000
@@ -45,13 +45,14 @@
  * @return A deferred promise.
  */
 function runEmulatorCmdSafe(aCommand) {
+  log("Emulator command: " + aCommand);
   let deferred = Promise.defer();
 
   ++_pendingEmulatorCmdCount;
   runEmulatorCmd(aCommand, function(aResult) {
     --_pendingEmulatorCmdCount;
 
-    ok(true, "Emulator response: " + JSON.stringify(aResult));
+    log("Emulator response: " + JSON.stringify(aResult));
     if (Array.isArray(aResult) &&
         aResult[aResult.length - 1] === "OK") {
       deferred.resolve(aResult);
@@ -718,15 +719,25 @@
  * @return A deferred promise.
  */
 function setRadioEnabledAndWait(aEnabled, aServiceId) {
-  let promises = [];
+  let mobileConn = getMozMobileConnectionByServiceId(aServiceId);
+
+  if (mobileConn.radioState === (aEnabled ? "enabled" : "disabled")) {
+    return Promise.resolve();
+  }
 
-  promises.push(waitForManagerEvent("radiostatechange", aServiceId, function() {
+  let expectedSequence = aEnabled ? ["enabling", "enabled"] :
+                                    ["disabling", "disabled"];
+
+  let p1 = waitForManagerEvent("radiostatechange", aServiceId, function() {
     let mobileConn = getMozMobileConnectionByServiceId(aServiceId);
-    return mobileConn.radioState === aEnabled ? "enabled" : "disabled";
-  }));
-  promises.push(setRadioEnabled(aEnabled, aServiceId));
+    let expectedRadioState = expectedSequence.shift();
+    is(mobileConn.radioState, expectedRadioState, "Check radio state");
+    return expectedSequence.length === 0;
+  });
 
-  return Promise.all(promises);
+  let p2 = setRadioEnabled(aEnabled, aServiceId);
+
+  return Promise.all([p1, p2]);
 }
 
 /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/mobileconnection/tests/marionette/test_mobile_set_radio.js	2015-02-28 15:03:08.000000000 +0000
@@ -4,6 +4,26 @@
 MARIONETTE_TIMEOUT = 60000;
 MARIONETTE_HEAD_JS = "head.js";
 
+function testAutoRestoreRadioState(aEnabled, aServiceId) {
+  return setRadioEnabledAndWait(aEnabled, aServiceId)
+    .then(() => {
+      let expectedSequence = aEnabled ? ["enabling", "enabled"] :
+                                        ["disabling", "disabled"];
+
+      let p1 = waitForManagerEvent("radiostatechange", aServiceId, function() {
+        let mobileConn = getMozMobileConnectionByServiceId(aServiceId);
+        let expectedRadioState = expectedSequence.shift();
+        is(mobileConn.radioState, expectedRadioState, "Check radio state");
+        return expectedSequence.length === 0;
+      });
+
+      let command = "modem radio " + (aEnabled ? "disable" : "enable");
+      let p2 = runEmulatorCmdSafe(command);
+
+      return Promise.all([p1, p2]);
+    });
+}
+
 // Start tests
 startTestCommon(function() {
 
@@ -14,10 +34,17 @@
     })
 
     // Test disabling/enabling radio power.
+    .then(() => log("Test disabling/enabling radio power"))
     .then(() => setRadioEnabledAndWait(false))
     .then(() => setRadioEnabledAndWait(true))
 
+    // Test auto-restore radio state
+    .then(() => log("Test auto-restore radio state"))
+    .then(() => testAutoRestoreRadioState(false))
+    .then(() => testAutoRestoreRadioState(true))
+
     // Test disabling radio when data is connected.
+    .then(() => log("Test disabling radio when data is connected"))
     .then(() => {
       let apnSettings = [[
         {"carrier":"T-Mobile US",
@@ -34,6 +61,7 @@
     })
 
     // Restore test environment.
+    .then(() => log("Restore test environment"))
     .then(() => setDataApnSettings(origApnSettings))
     .then(() => setDataEnabled(false))
     .then(() => setRadioEnabledAndWait(true));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/network/tests/test_networkstats_enabled_no_perm.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/network/tests/test_networkstats_enabled_no_perm.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/network/tests/test_networkstats_enabled_no_perm.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/network/tests/test_networkstats_enabled_no_perm.html	2015-02-28 15:03:08.000000000 +0000
@@ -14,34 +14,36 @@
 
 // Test to ensure NetworkStats is enabled but mozNetworkStats.getAvailableNetworks
 // does not work in content because mozNetworkStats is null when no permission.
-
-SpecialPowers.setBoolPref("dom.mozNetworkStats.enabled", true);
-SpecialPowers.removePermission("networkstats-manage", document);
-
-ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
-   "Preference 'dom.mozNetworkStats.enabled' is true.");
-
-ok(!SpecialPowers.hasPermission("networkstats-manage", document),
-   "Has no permission 'networkstats-manage'.");
-
-ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
-
-is(navigator.mozNetworkStats, null,
-   "mozNetworkStats should be null when no permission.");
-
-var error;
-try {
-  navigator.mozNetworkStats.getAvailableNetworks;
-
-  ok(false,
-  	 "Accessing navigator.mozNetworkStats.getAvailableNetworks should throw!");
-} catch (ex) {
-  error = ex;
+  SimpleTest.waitForExplicitFinish();
+  SpecialPowers.pushPrefEnv({"set": [['dom.mozNetworkStats.enabled', true]]}, runTest);
+  function runTest() {
+    SpecialPowers.removePermission("networkstats-manage", document);
+
+    ok(SpecialPowers.getBoolPref("dom.mozNetworkStats.enabled"),
+      "Preference 'dom.mozNetworkStats.enabled' is true.");
+
+    ok(!SpecialPowers.hasPermission("networkstats-manage", document),
+      "Has no permission 'networkstats-manage'.");
+
+    ok('mozNetworkStats' in navigator, "navigator.mozNetworkStats should exist");
+
+    is(navigator.mozNetworkStats, null,
+      "mozNetworkStats should be null when no permission.");
+
+    var error;
+    try {
+      navigator.mozNetworkStats.getAvailableNetworks;
+
+      ok(false,
+    	   "Accessing navigator.mozNetworkStats.getAvailableNetworks should throw!");
+        } catch (ex) {
+          error = ex;
+        }
+
+   ok(error,
+     "Got an exception accessing navigator.mozNetworkStats.getAvailableNetworks");
+   SimpleTest.finish();
 }
-
-ok(error,
-   "Got an exception accessing navigator.mozNetworkStats.getAvailableNetworks");
-
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/network/tests/test_tcpsocket_enabled_no_perm.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/network/tests/test_tcpsocket_enabled_no_perm.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/network/tests/test_tcpsocket_enabled_no_perm.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/network/tests/test_tcpsocket_enabled_no_perm.html	2015-02-28 15:03:08.000000000 +0000
@@ -16,19 +16,19 @@
   navigator.mozTCPSocket, but mozTCPSocket.open does not work
   in content.
 **/
-SpecialPowers.setBoolPref("dom.mozTCPSocket.enabled", true);
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({"set": [['dom.mozTCPSocket.enabled', true]]}, runTest);
+function runTest() {
+  ok('mozTCPSocket' in navigator, "navigator.mozTCPSocket should be accessible if dom.mozTCPSocket.enabled  is true");
 
-ok('mozTCPSocket' in navigator, "navigator.mozTCPSocket should be accessible if dom.mozTCPSocket.enabled is true");
-
-try {
-  navigator.mozTCPSocket.open('localhost', 80);
-  throw new Error("Error: navigator.mozTCPSocket.open should raise for content that does not have the tcp-socket permission");
-} catch (e) {
-  ok(true, "navigator.mozTCPSocket.open should raise for content that does not have the tcp-socket permission");
+  try {
+    navigator.mozTCPSocket.open('localhost', 80);
+    throw new Error("Error: navigator.mozTCPSocket.open should raise for content that does not have the tcp-socket permission");
+  } catch (e) {
+      ok(true, "navigator.mozTCPSocket.open should raise for content that does not have the tcp-socket permission");
+  }
+  SimpleTest.finish();
 }
-
-SpecialPowers.setBoolPref("dom.mozTCPSocket.enabled", false);
-
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/network/tests/test_tcpsocket_enabled_with_perm.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/network/tests/test_tcpsocket_enabled_with_perm.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/network/tests/test_tcpsocket_enabled_with_perm.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/network/tests/test_tcpsocket_enabled_with_perm.html	2015-02-28 15:03:08.000000000 +0000
@@ -16,15 +16,16 @@
   navigator.mozTCPSocket, and mozTCPSocket.open works when
   the tcp-socket permission has been granted.
 **/
-SpecialPowers.setBoolPref("dom.mozTCPSocket.enabled", true);
-SpecialPowers.addPermission("tcp-socket", true, document);
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({"set": [['dom.mozTCPSocket.enabled', true]]}, runTest);
+function runTest() {
+  SpecialPowers.addPermission("tcp-socket", true, document);
 
-ok('mozTCPSocket' in navigator, "navigator.mozTCPSocket should be accessible if dom.mozTCPSocket.enabled is true");
-
-ok(navigator.mozTCPSocket.open('localhost', 80), "navigator.mozTCPSocket.open should work for content that has the tcp-socket permission");
-
-SpecialPowers.setBoolPref("dom.mozTCPSocket.enabled", false);
+  ok('mozTCPSocket' in navigator, "navigator.mozTCPSocket should be accessible if dom.mozTCPSocket.enabled is true");
 
+  ok(navigator.mozTCPSocket.open('localhost', 80), "navigator.mozTCPSocket.open should work for content that has the tcp-socket permission");
+  SimpleTest.finish();
+}
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsIPluginHost.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsIPluginHost.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsIPluginHost.idl	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsIPluginHost.idl	2015-02-28 15:03:08.000000000 +0000
@@ -27,7 +27,7 @@
   boolean checkWhitelist(in AUTF8String pageURI, in AUTF8String objectURI);
 };
 
-[scriptable, uuid(6034e3a0-365b-48a5-a257-586946ff361e)]
+[scriptable, uuid(d7d5b2e0-105b-4c9d-8558-b6b31f28b7df)]
 interface nsIPluginHost : nsISupports
 {
   /**
@@ -51,6 +51,12 @@
   const uint32_t FLAG_CLEAR_CACHE = 1;
 
   /*
+   * For use with Get*ForType functions
+   */
+  const uint32_t EXCLUDE_NONE     = 0;
+  const uint32_t EXCLUDE_DISABLED = 1 << 0;
+
+  /*
    * Clear site data for a given plugin.
    *
    * @param plugin: the plugin to clear data for, such as one returned by
@@ -106,7 +112,14 @@
 
   nsIPluginPlayPreviewInfo getPlayPreviewInfo(in AUTF8String mimeType);
 
-  ACString getPermissionStringForType(in AUTF8String mimeType);
+  /**
+   * Get the "permission string" for the plugin.  This is a string that can be
+   * passed to the permission manager to see whether the plugin is allowed to
+   * run, for example.  This will typically be based on the plugin's "nice name"
+   * and its blocklist state.
+   */
+  ACString getPermissionStringForType(in AUTF8String mimeType,
+                                      [optional] in uint32_t excludeFlags);
 
   /**
    * Get the nsIPluginTag for this MIME type. This method works with both
@@ -116,16 +129,20 @@
    * @throws NS_ERROR_NOT_AVAILABLE if no plugin is available for this MIME
    *         type.
    */
-  nsIPluginTag getPluginTagForType(in AUTF8String mimeType);
+  nsIPluginTag getPluginTagForType(in AUTF8String mimeType,
+                                   [optional] in uint32_t excludeFlags);
 
   /**
-   * Get the nsIPluginTag state for this MIME type.
+   * Get the nsIPluginTag enabled state for this MIME type.  See
+   * nsIPluginTag.enabledState.
    */
-  unsigned long getStateForType(in AUTF8String mimeType);
+  unsigned long getStateForType(in AUTF8String mimeType,
+                                [optional] in uint32_t excludeFlags);
 
   /**
-   * Get the blocklist state for a MIME type.
+   * Get the blocklist state for a MIME type.  See nsIPluginTag.blocklistState.
    */
-  uint32_t getBlocklistStateForType(in string aMimeType);
+  uint32_t getBlocklistStateForType(in AUTF8String aMimeType,
+                                    [optional] in uint32_t excludeFlags);
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsIPluginTag.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsIPluginTag.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsIPluginTag.idl	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsIPluginTag.idl	2015-02-28 15:03:08.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(231df043-3a32-43c4-aaac-7ad2da81e84f)]
+[scriptable, uuid(32563b21-3c5e-4864-baaa-4e49b90b64f2)]
 interface nsIPluginTag : nsISupports
 {
   // enabledState is stored as one of the following as an integer in prefs,
@@ -20,6 +20,9 @@
   readonly attribute AUTF8String version;
   readonly attribute AUTF8String name;
 
+  // The 'nice' name of this plugin, e.g. 'flash' 'java'
+  readonly attribute AUTF8String niceName;
+
   /**
    * true only if this plugin is "hardblocked" and cannot be enabled.
    */
@@ -30,8 +33,15 @@
    */
   readonly attribute boolean isEnabledStateLocked;
 
+  // If this plugin is capable of being used (not disabled, blocklisted, etc)
+  readonly attribute boolean active;
+
+  // Get a specific nsIBlocklistService::STATE_*
+  readonly attribute unsigned long blocklistState;
+
   readonly attribute boolean disabled;
   readonly attribute boolean clicktoplay;
+  // See the STATE_* values above.
            attribute unsigned long enabledState;
 
   readonly attribute PRTime lastModifiedTime;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsJSNPRuntime.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsJSNPRuntime.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsJSNPRuntime.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsJSNPRuntime.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -1724,7 +1724,7 @@
       return true;
   }
 
-  JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
+  JS_ReportErrorNumber(cx, js::GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
                        JS_GetClass(obj)->name,
                        hint == JSTYPE_VOID
                        ? "primitive type"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsNPAPIPluginInstance.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -277,7 +277,7 @@
   return mStopTime;
 }
 
-nsresult nsNPAPIPluginInstance::Initialize(nsNPAPIPlugin *aPlugin, nsPluginInstanceOwner* aOwner, const char* aMIMEType)
+nsresult nsNPAPIPluginInstance::Initialize(nsNPAPIPlugin *aPlugin, nsPluginInstanceOwner* aOwner, const nsACString& aMIMEType)
 {
   PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("nsNPAPIPluginInstance::Initialize this=%p\n",this));
 
@@ -287,11 +287,8 @@
   mPlugin = aPlugin;
   mOwner = aOwner;
 
-  if (aMIMEType) {
-    mMIMEType = (char*)PR_Malloc(strlen(aMIMEType) + 1);
-    if (mMIMEType) {
-      PL_strcpy(mMIMEType, aMIMEType);
-    }
+  if (!aMIMEType.IsEmpty()) {
+    mMIMEType = ToNewCString(aMIMEType);
   }
 
   return Start();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsNPAPIPluginInstance.h	2015-02-28 15:03:08.000000000 +0000
@@ -81,7 +81,7 @@
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
-  nsresult Initialize(nsNPAPIPlugin *aPlugin, nsPluginInstanceOwner* aOwner, const char* aMIMEType);
+  nsresult Initialize(nsNPAPIPlugin *aPlugin, nsPluginInstanceOwner* aOwner, const nsACString& aMIMEType);
   nsresult Start();
   nsresult Stop();
   nsresult SetWindow(NPWindow* window);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginHost.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginHost.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginHost.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginHost.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -119,7 +119,7 @@
   {                                                                  \
     while (list_) {                                                  \
       type_ temp = list_->mNext_;                                    \
-      list_->mNext_ = nullptr;                                        \
+      list_->mNext_ = nullptr;                                       \
       list_ = temp;                                                  \
     }                                                                \
   }
@@ -500,17 +500,17 @@
 }
 
 nsresult nsPluginHost::PostURL(nsISupports* pluginInst,
-                                    const char* url,
-                                    uint32_t postDataLen,
-                                    const char* postData,
-                                    bool isFile,
-                                    const char* target,
-                                    nsNPAPIPluginStreamListener* streamListener,
-                                    const char* altHost,
-                                    const char* referrer,
-                                    bool forceJSEnabled,
-                                    uint32_t postHeadersLength,
-                                    const char* postHeaders)
+                               const char* url,
+                               uint32_t postDataLen,
+                               const char* postData,
+                               bool isFile,
+                               const char* target,
+                               nsNPAPIPluginStreamListener* streamListener,
+                               const char* altHost,
+                               const char* referrer,
+                               bool forceJSEnabled,
+                               uint32_t postHeadersLength,
+                               const char* postHeaders)
 {
   nsresult rv;
 
@@ -667,11 +667,6 @@
   return res;
 }
 
-nsresult nsPluginHost::Init()
-{
-  return NS_OK;
-}
-
 nsresult nsPluginHost::UnloadPlugins()
 {
   PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("nsPluginHost::UnloadPlugins Called\n"));
@@ -779,7 +774,7 @@
 }
 
 nsresult
-nsPluginHost::InstantiatePluginInstance(const char *aMimeType, nsIURI* aURL,
+nsPluginHost::InstantiatePluginInstance(const nsACString& aMimeType, nsIURI* aURL,
                                         nsObjectLoadingContent *aContent,
                                         nsPluginInstanceOwner** aOwner)
 {
@@ -792,12 +787,12 @@
 
   PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
         ("nsPluginHost::InstantiatePlugin Begin mime=%s, url=%s\n",
-        aMimeType, urlSpec.get()));
+         PromiseFlatCString(aMimeType).get(), urlSpec.get()));
 
   PR_LogFlush();
 #endif
 
-  if (!aMimeType) {
+  if (aMimeType.IsEmpty()) {
     NS_NOTREACHED("Attempting to spawn a plugin with no mime type");
     return NS_ERROR_FAILURE;
   }
@@ -851,7 +846,7 @@
 
   PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
         ("nsPluginHost::InstantiatePlugin Finished mime=%s, rv=%d, url=%s\n",
-        aMimeType, rv, urlSpec2.get()));
+         PromiseFlatCString(aMimeType).get(), rv, urlSpec2.get()));
 
   PR_LogFlush();
 #endif
@@ -885,7 +880,7 @@
   return nullptr;
 }
 
-nsresult nsPluginHost::SetUpPluginInstance(const char *aMimeType,
+nsresult nsPluginHost::SetUpPluginInstance(const nsACString &aMimeType,
                                            nsIURI *aURL,
                                            nsPluginInstanceOwner *aOwner)
 {
@@ -919,7 +914,7 @@
 }
 
 nsresult
-nsPluginHost::TrySetUpPluginInstance(const char *aMimeType,
+nsPluginHost::TrySetUpPluginInstance(const nsACString &aMimeType,
                                      nsIURI *aURL,
                                      nsPluginInstanceOwner *aOwner)
 {
@@ -929,7 +924,7 @@
 
   PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_NORMAL,
         ("nsPluginHost::TrySetupPluginInstance Begin mime=%s, owner=%p, url=%s\n",
-        aMimeType, aOwner, urlSpec.get()));
+         PromiseFlatCString(aMimeType).get(), aOwner, urlSpec.get()));
 
   PR_LogFlush();
 #endif
@@ -948,7 +943,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  nsPluginTag* pluginTag = FindPluginForType(aMimeType, true);
+  nsPluginTag* pluginTag = FindNativePluginForType(aMimeType, true);
 
   NS_ASSERTION(pluginTag, "Must have plugin tag here!");
 
@@ -992,7 +987,7 @@
 
   PR_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
         ("nsPluginHost::TrySetupPluginInstance Finished mime=%s, rv=%d, owner=%p, url=%s\n",
-        aMimeType, rv, aOwner, urlSpec2.get()));
+         PromiseFlatCString(aMimeType).get(), rv, aOwner, urlSpec2.get()));
 
   PR_LogFlush();
 #endif
@@ -1001,70 +996,77 @@
 }
 
 bool
-nsPluginHost::PluginExistsForType(const char* aMimeType)
+nsPluginHost::HavePluginForType(const nsACString & aMimeType,
+                                PluginFilter aFilter)
 {
-  nsPluginTag *plugin = FindPluginForType(aMimeType, false);
-  return nullptr != plugin;
+  bool checkEnabled = aFilter & eExcludeDisabled;
+  return FindNativePluginForType(aMimeType, checkEnabled);
 }
 
 NS_IMETHODIMP
 nsPluginHost::GetPluginTagForType(const nsACString& aMimeType,
+                                  uint32_t aExcludeFlags,
                                   nsIPluginTag** aResult)
 {
-  nsPluginTag* plugin = FindPluginForType(aMimeType.Data(), true);
-  if (!plugin) {
-    plugin = FindPluginForType(aMimeType.Data(), false);
+  bool includeDisabled = !(aExcludeFlags & eExcludeDisabled);
+
+  nsPluginTag *tag = FindNativePluginForType(aMimeType, true);
+
+  // Prefer enabled, but select disabled if none is found
+  if (includeDisabled && !tag) {
+    tag = FindNativePluginForType(aMimeType, false);
   }
-  if (!plugin) {
+
+  if (!tag) {
     return NS_ERROR_NOT_AVAILABLE;
   }
-  NS_ADDREF(*aResult = plugin);
+
+  NS_ADDREF(*aResult = tag);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsPluginHost::GetStateForType(const nsACString &aMimeType, uint32_t* aResult)
-{
-  nsPluginTag *plugin = FindPluginForType(aMimeType.Data(), true);
-  if (!plugin) {
-    plugin = FindPluginForType(aMimeType.Data(), false);
-  }
-  if (!plugin) {
-    return NS_ERROR_UNEXPECTED;
-  }
+nsPluginHost::GetStateForType(const nsACString &aMimeType,
+                              uint32_t aExcludeFlags,
+                              uint32_t* aResult)
+{
+  nsCOMPtr<nsIPluginTag> tag;
+  nsresult rv = GetPluginTagForType(aMimeType, aExcludeFlags,
+                                    getter_AddRefs(tag));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  return plugin->GetEnabledState(aResult);
+  return tag->GetEnabledState(aResult);
 }
 
 NS_IMETHODIMP
-nsPluginHost::GetBlocklistStateForType(const char *aMimeType, uint32_t *aState)
-{
-  nsPluginTag *plugin = FindPluginForType(aMimeType, true);
-  if (!plugin) {
-    plugin = FindPluginForType(aMimeType, false);
-  }
-  if (!plugin) {
-    return NS_ERROR_FAILURE;
-  }
+nsPluginHost::GetBlocklistStateForType(const nsACString &aMimeType,
+                                       uint32_t aExcludeFlags,
+                                       uint32_t *aState)
+{
+  nsCOMPtr<nsIPluginTag> tag;
+  nsresult rv = GetPluginTagForType(aMimeType,
+                                    aExcludeFlags,
+                                    getter_AddRefs(tag));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  *aState = plugin->GetBlocklistState();
-  return NS_OK;
+  return tag->GetBlocklistState(aState);
 }
 
 NS_IMETHODIMP
-nsPluginHost::GetPermissionStringForType(const nsACString &aMimeType, nsACString &aPermissionString)
-{
+nsPluginHost::GetPermissionStringForType(const nsACString &aMimeType,
+                                         uint32_t aExcludeFlags,
+                                         nsACString &aPermissionString)
+{
+  nsCOMPtr<nsIPluginTag> tag;
+  nsresult rv = GetPluginTagForType(aMimeType, aExcludeFlags,
+                                    getter_AddRefs(tag));
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(tag, NS_ERROR_FAILURE);
+
   aPermissionString.Truncate();
   uint32_t blocklistState;
-  nsresult rv = GetBlocklistStateForType(aMimeType.Data(), &blocklistState);
+  rv = tag->GetBlocklistState(&blocklistState);
   NS_ENSURE_SUCCESS(rv, rv);
-  nsPluginTag *tag = FindPluginForType(aMimeType.Data(), true);
-  if (!tag) {
-    tag = FindPluginForType(aMimeType.Data(), false);
-  }
-  if (!tag) {
-    return NS_ERROR_FAILURE;
-  }
 
   if (blocklistState == nsIBlocklistService::STATE_VULNERABLE_UPDATE_AVAILABLE ||
       blocklistState == nsIBlocklistService::STATE_VULNERABLE_NO_UPDATE) {
@@ -1074,45 +1076,23 @@
     aPermissionString.AssignLiteral("plugin:");
   }
 
-  aPermissionString.Append(tag->GetNiceFileName());
-
-  return NS_OK;
-}
-
-// check comma delimitered extensions
-static int CompareExtensions(const char *aExtensionList, const char *aExtension)
-{
-  if (!aExtensionList || !aExtension)
-    return -1;
+  nsCString niceName;
+  rv = tag->GetNiceName(niceName);
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(!niceName.IsEmpty(), NS_ERROR_FAILURE);
 
-  const char *pExt = aExtensionList;
-  const char *pComma = strchr(pExt, ',');
-  if (!pComma)
-    return PL_strcasecmp(pExt, aExtension);
+  aPermissionString.Append(niceName);
 
-  int extlen = strlen(aExtension);
-  while (pComma) {
-    int length = pComma - pExt;
-    if (length == extlen && 0 == PL_strncasecmp(aExtension, pExt, length))
-      return 0;
-    pComma++;
-    pExt = pComma;
-    pComma = strchr(pExt, ',');
-  }
-
-  // the last one
-  return PL_strcasecmp(pExt, aExtension);
+  return NS_OK;
 }
 
-nsresult
-nsPluginHost::IsPluginEnabledForExtension(const char* aExtension,
-                                          const char* &aMimeType)
+bool
+nsPluginHost::HavePluginForExtension(const nsACString & aExtension,
+                                     /* out */ nsACString & aMimeType,
+                                     PluginFilter aFilter)
 {
-  nsPluginTag *plugin = FindPluginEnabledForExtension(aExtension, aMimeType);
-  if (plugin)
-    return NS_OK;
-
-  return NS_ERROR_FAILURE;
+  bool checkEnabled = aFilter & eExcludeDisabled;
+  return FindNativePluginForExtension(aExtension, aMimeType, checkEnabled);
 }
 
 void
@@ -1185,10 +1165,10 @@
 }
 
 nsPluginTag*
-nsPluginHost::FindPluginForType(const char* aMimeType,
-                                bool aCheckEnabled)
+nsPluginHost::FindNativePluginForType(const nsACString & aMimeType,
+                                      bool aCheckEnabled)
 {
-  if (!aMimeType) {
+  if (aMimeType.IsEmpty()) {
     return nullptr;
   }
 
@@ -1198,14 +1178,9 @@
 
   nsPluginTag *plugin = mPlugins;
   while (plugin) {
-    if (!aCheckEnabled || plugin->IsActive()) {
-      int32_t mimeCount = plugin->mMimeTypes.Length();
-      for (int32_t i = 0; i < mimeCount; i++) {
-        if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) {
-          matchingPlugins.AppendElement(plugin);
-          break;
-        }
-      }
+    if ((!aCheckEnabled || plugin->IsActive()) &&
+        plugin->HasMimeType(aMimeType)) {
+      matchingPlugins.AppendElement(plugin);
     }
     plugin = plugin->mNext;
   }
@@ -1214,27 +1189,24 @@
 }
 
 nsPluginTag*
-nsPluginHost::FindPluginEnabledForExtension(const char* aExtension,
-                                            const char*& aMimeType)
+nsPluginHost::FindNativePluginForExtension(const nsACString & aExtension,
+                                           /* out */ nsACString & aMimeType,
+                                           bool aCheckEnabled)
 {
-  if (!aExtension) {
+  if (aExtension.IsEmpty()) {
     return nullptr;
   }
 
   LoadPlugins();
 
   InfallibleTArray<nsPluginTag*> matchingPlugins;
-
+  nsCString matchingMime; // Don't mutate aMimeType unless returning a match
   nsPluginTag *plugin = mPlugins;
+
   while (plugin) {
-    if (plugin->IsActive()) {
-      int32_t variants = plugin->mExtensions.Length();
-      for (int32_t i = 0; i < variants; i++) {
-        // mExtensionsArray[cnt] is a list of extensions separated by commas
-        if (0 == CompareExtensions(plugin->mExtensions[i].get(), aExtension)) {
-          matchingPlugins.AppendElement(plugin);
-          break;
-        }
+    if (!aCheckEnabled || plugin->IsActive()) {
+      if (plugin->HasExtension(aExtension, matchingMime)) {
+        matchingPlugins.AppendElement(plugin);
       }
     }
     plugin = plugin->mNext;
@@ -1245,15 +1217,8 @@
     return nullptr;
   }
 
-  int32_t variants = preferredPlugin->mExtensions.Length();
-  for (int32_t i = 0; i < variants; i++) {
-    // mExtensionsArray[cnt] is a list of extensions separated by commas
-    if (0 == CompareExtensions(preferredPlugin->mExtensions[i].get(), aExtension)) {
-      aMimeType = preferredPlugin->mMimeTypes[i].get();
-      break;
-    }
-  }
-
+  // Re-fetch the matching type because of how FindPreferredPlugin works...
+  preferredPlugin->HasExtension(aExtension, aMimeType);
   return preferredPlugin;
 }
 
@@ -1364,27 +1329,26 @@
   NS_DispatchToMainThread(runnable);
 }
 
-nsresult nsPluginHost::GetPlugin(const char *aMimeType, nsNPAPIPlugin** aPlugin)
+nsresult nsPluginHost::GetPlugin(const nsACString &aMimeType,
+                                 nsNPAPIPlugin** aPlugin)
 {
   nsresult rv = NS_ERROR_FAILURE;
   *aPlugin = nullptr;
 
-  if (!aMimeType)
-    return NS_ERROR_ILLEGAL_VALUE;
-
   // If plugins haven't been scanned yet, do so now
   LoadPlugins();
 
-  nsPluginTag* pluginTag = FindPluginForType(aMimeType, true);
+  nsPluginTag* pluginTag = FindNativePluginForType(aMimeType, true);
   if (pluginTag) {
     rv = NS_OK;
     PLUGIN_LOG(PLUGIN_LOG_BASIC,
     ("nsPluginHost::GetPlugin Begin mime=%s, plugin=%s\n",
-    aMimeType, pluginTag->mFileName.get()));
+     PromiseFlatCString(aMimeType).get(), pluginTag->mFileName.get()));
 
 #ifdef DEBUG
-    if (aMimeType && !pluginTag->mFileName.IsEmpty())
-      printf("For %s found plugin %s\n", aMimeType, pluginTag->mFileName.get());
+    if (!pluginTag->mFileName.IsEmpty())
+      printf("For %s found plugin %s\n",
+             PromiseFlatCString(aMimeType).get(), pluginTag->mFileName.get());
 #endif
 
     rv = EnsurePluginLoaded(pluginTag);
@@ -1398,8 +1362,8 @@
 
   PLUGIN_LOG(PLUGIN_LOG_NORMAL,
   ("nsPluginHost::GetPlugin End mime=%s, rv=%d, plugin=%p name=%s\n",
-  aMimeType, rv, *aPlugin,
-  (pluginTag ? pluginTag->mFileName.get() : "(not found)")));
+   PromiseFlatCString(aMimeType).get(), rv, *aPlugin,
+   (pluginTag ? pluginTag->mFileName.get() : "(not found)")));
 
   return rv;
 }
@@ -1618,6 +1582,7 @@
     return NS_ERROR_NOT_AVAILABLE;
   }
 
+  // FIXME-jsplugins audit casts
   nsPluginTag* tag = static_cast<nsPluginTag*>(plugin);
 
   // We only ensure support for clearing Flash site data for now.
@@ -2000,7 +1965,9 @@
         return NS_ERROR_OUT_OF_MEMORY;
 
       pluginTag->mLibrary = library;
-      uint32_t state = pluginTag->GetBlocklistState();
+      uint32_t state;
+      rv = pluginTag->GetBlocklistState(&state);
+      NS_ENSURE_SUCCESS(rv, rv);
 
       // If the blocklist says it is risky and we have never seen this
       // plugin before, then disable it.
@@ -2027,7 +1994,7 @@
       *aPluginsChanged = true;
     }
 
-    // Avoid adding different versions of the same plugin if they are running 
+    // Avoid adding different versions of the same plugin if they are running
     // in-process, otherwise we risk undefined behaviour.
     if (!nsNPAPIPlugin::RunPluginOOP(pluginTag)) {
       if (HaveSamePlugin(pluginTag)) {
@@ -2454,7 +2421,7 @@
   }
 }
 
-nsresult
+void
 nsPluginHost::UpdatePluginInfo(nsPluginTag* aPluginTag)
 {
   MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
@@ -2465,7 +2432,7 @@
   NS_ITERATIVE_UNREF_LIST(nsRefPtr<nsInvalidPluginTag>, mInvalidPlugins, mNext);
 
   if (!aPluginTag) {
-    return NS_OK;
+    return;
   }
 
   // Update types with category manager
@@ -2477,8 +2444,8 @@
     if (IsTypeInList(aPluginTag->mMimeTypes[i], disableFullPage)) {
       shouldRegister = ePluginUnregister;
     } else {
-      nsPluginTag *plugin = FindPluginForType(aPluginTag->mMimeTypes[i].get(),
-                                              true);
+      nsPluginTag *plugin = FindNativePluginForType(aPluginTag->mMimeTypes[i],
+                                                    true);
       shouldRegister = plugin ? ePluginRegister : ePluginUnregister;
     }
 
@@ -2489,13 +2456,6 @@
     mozilla::services::GetObserverService();
   if (obsService)
     obsService->NotifyObservers(nullptr, "plugin-info-updated", nullptr);
-
-  // Reload instances if needed
-  if (aPluginTag->IsActive()) {
-    return NS_OK;
-  }
-
-  return NS_OK;
 }
 
 /* static */ bool
@@ -3089,7 +3049,7 @@
   if (aURL.Length() <= 0)
     return NS_OK;
 
-  // get the base URI for the plugin to create an absolute url 
+  // get the base URI for the plugin to create an absolute url
   // in case aURL is relative
   nsRefPtr<nsPluginInstanceOwner> owner = aInstance->GetOwner();
   if (owner) {
@@ -3355,7 +3315,7 @@
         oldestInstance->Destroy();
         mInstances.RemoveElement(oldestInstance);
         // TODO: Remove this check once bug 752422 was investigated
-        if (pluginTag) {          
+        if (pluginTag) {
           OnPluginInstanceDestroyed(pluginTag);
         }
       }
@@ -3365,7 +3325,7 @@
     aInstance->Destroy();
     mInstances.RemoveElement(aInstance);
     // TODO: Remove this check once bug 752422 was investigated
-    if (pluginTag) {      
+    if (pluginTag) {
       OnPluginInstanceDestroyed(pluginTag);
     }
   }
@@ -3919,7 +3879,7 @@
   return &mInstances;
 }
 
-void 
+void
 nsPluginHost::DestroyRunningInstances(nsPluginTag* aPluginTag)
 {
   for (int32_t i = mInstances.Length(); i > 0; i--) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginHost.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginHost.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginHost.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginHost.h	2015-02-28 15:03:08.000000000 +0000
@@ -28,7 +28,6 @@
 #include "nsIEffectiveTLDService.h"
 #include "nsIIDNService.h"
 #include "nsCRT.h"
-#include "mozilla/plugins/PluginTypes.h"
 
 #ifdef XP_WIN
 #include "nsIWindowsRegKey.h"
@@ -37,6 +36,7 @@
 namespace mozilla {
 namespace plugins {
 class PluginAsyncSurrogate;
+class PluginTag;
 } // namespace mozilla
 } // namespace plugins
 
@@ -75,7 +75,9 @@
                                public nsITimerCallback,
                                public nsSupportsWeakReference
 {
+  friend class nsPluginTag;
   virtual ~nsPluginHost();
+
 public:
   nsPluginHost();
 
@@ -88,16 +90,26 @@
   NS_DECL_NSIOBSERVER
   NS_DECL_NSITIMERCALLBACK
 
-  nsresult Init();
   nsresult LoadPlugins();
   nsresult UnloadPlugins();
 
-  nsresult SetUpPluginInstance(const char *aMimeType,
+  nsresult SetUpPluginInstance(const nsACString &aMimeType,
                                nsIURI *aURL,
                                nsPluginInstanceOwner *aOwner);
-  bool PluginExistsForType(const char* aMimeType);
 
-  nsresult IsPluginEnabledForExtension(const char* aExtension, const char* &aMimeType);
+  // Acts like a bitfield
+  enum PluginFilter {
+    eExcludeNone     = nsIPluginHost::EXCLUDE_NONE,
+    eExcludeDisabled = nsIPluginHost::EXCLUDE_DISABLED
+  };
+  // FIXME-jsplugins comment about fake
+  bool HavePluginForType(const nsACString & aMimeType,
+                         PluginFilter aFilter = eExcludeDisabled);
+
+  // FIXME-jsplugins what if fake has different extensions
+  bool HavePluginForExtension(const nsACString & aExtension,
+                              /* out */ nsACString & aMimeType,
+                              PluginFilter aFilter = eExcludeDisabled);
 
   void GetPlugins(nsTArray<nsRefPtr<nsPluginTag> >& aPluginArray);
   void FindPluginsForContent(uint32_t aPluginEpoch,
@@ -126,35 +138,39 @@
 
   nsresult FindProxyForURL(const char* url, char* *result);
   nsresult UserAgent(const char **retstring);
-  nsresult ParsePostBufferToFixHeaders(const char *inPostData, uint32_t inPostDataLen,
-                                       char **outPostData, uint32_t *outPostDataLen);
+  nsresult ParsePostBufferToFixHeaders(const char *inPostData,
+                                       uint32_t inPostDataLen,
+                                       char **outPostData,
+                                       uint32_t *outPostDataLen);
   nsresult CreateTempFileToPost(const char *aPostDataURL, nsIFile **aTmpFile);
   nsresult NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow);
 
   void AddIdleTimeTarget(nsIPluginInstanceOwner* objectFrame, bool isVisible);
   void RemoveIdleTimeTarget(nsIPluginInstanceOwner* objectFrame);
 
-  nsresult GetPluginName(nsNPAPIPluginInstance *aPluginInstance, const char** aPluginName);
+  nsresult GetPluginName(nsNPAPIPluginInstance *aPluginInstance,
+                         const char** aPluginName);
   nsresult StopPluginInstance(nsNPAPIPluginInstance* aInstance);
-  nsresult GetPluginTagForInstance(nsNPAPIPluginInstance *aPluginInstance, nsIPluginTag **aPluginTag);
+  nsresult GetPluginTagForInstance(nsNPAPIPluginInstance *aPluginInstance,
+                                   nsIPluginTag **aPluginTag);
 
   nsresult
-  NewPluginURLStream(const nsString& aURL, 
-                     nsNPAPIPluginInstance *aInstance, 
+  NewPluginURLStream(const nsString& aURL,
+                     nsNPAPIPluginInstance *aInstance,
                      nsNPAPIPluginStreamListener *aListener,
                      nsIInputStream *aPostStream = nullptr,
-                     const char *aHeadersData = nullptr, 
+                     const char *aHeadersData = nullptr,
                      uint32_t aHeadersDataLen = 0);
 
   nsresult
-  GetURLWithHeaders(nsNPAPIPluginInstance *pluginInst, 
-                    const char* url, 
+  GetURLWithHeaders(nsNPAPIPluginInstance *pluginInst,
+                    const char* url,
                     const char* target = nullptr,
                     nsNPAPIPluginStreamListener* streamListener = nullptr,
                     const char* altHost = nullptr,
                     const char* referrer = nullptr,
                     bool forceJSEnabled = false,
-                    uint32_t getHeadersLength = 0, 
+                    uint32_t getHeadersLength = 0,
                     const char* getHeaders = nullptr);
 
   nsresult
@@ -162,15 +178,11 @@
                          const char* aURL);
 
   nsresult
-  AddHeadersToChannel(const char *aHeadersData, uint32_t aHeadersDataLen, 
+  AddHeadersToChannel(const char *aHeadersData, uint32_t aHeadersDataLen,
                       nsIChannel *aGenericChannel);
 
   static nsresult GetPluginTempDir(nsIFile **aDir);
 
-  // Writes updated plugins settings to disk and unloads the plugin
-  // if it is now disabled
-  nsresult UpdatePluginInfo(nsPluginTag* aPluginTag);
-
   // Helper that checks if a type is whitelisted in plugin.allowed_types.
   // Always returns true if plugin.allowed_types is not set
   static bool IsTypeWhitelisted(const char *aType);
@@ -202,14 +214,12 @@
 
   nsTArray< nsRefPtr<nsNPAPIPluginInstance> > *InstanceArray();
 
-  void DestroyRunningInstances(nsPluginTag* aPluginTag);
-
   // Return the tag for |aLibrary| if found, nullptr if not.
   nsPluginTag* FindTagForLibrary(PRLibrary* aLibrary);
 
   // The last argument should be false if we already have an in-flight stream
   // and don't need to set up a new stream.
-  nsresult InstantiatePluginInstance(const char *aMimeType, nsIURI* aURL,
+  nsresult InstantiatePluginInstance(const nsACString& aMimeType, nsIURI* aURL,
                                      nsObjectLoadingContent *aContent,
                                      nsPluginInstanceOwner** aOwner);
 
@@ -218,7 +228,7 @@
 
   nsPluginTag* PluginWithId(uint32_t aId);
 
-  nsresult GetPlugin(const char *aMimeType, nsNPAPIPlugin** aPlugin);
+  nsresult GetPlugin(const nsACString &aMimeType, nsNPAPIPlugin** aPlugin);
   nsresult GetPluginForContentProcess(uint32_t aPluginId, nsNPAPIPlugin** aPlugin);
   void NotifyContentModuleDestroyed(uint32_t aPluginId);
 
@@ -231,19 +241,27 @@
 private:
   friend class nsPluginUnloadRunnable;
 
-  nsresult
-  TrySetUpPluginInstance(const char *aMimeType, nsIURI *aURL, nsPluginInstanceOwner *aOwner);
+  void DestroyRunningInstances(nsPluginTag* aPluginTag);
 
+  // Writes updated plugins settings to disk and unloads the plugin
+  // if it is now disabled. Should only be called by the plugin tag in question
+  void UpdatePluginInfo(nsPluginTag* aPluginTag);
+
+  nsresult TrySetUpPluginInstance(const nsACString &aMimeType, nsIURI *aURL,
+                                  nsPluginInstanceOwner *aOwner);
+
+  // FIXME-jsplugins comment here about when things may be fake
   nsPluginTag*
   FindPreferredPlugin(const InfallibleTArray<nsPluginTag*>& matches);
 
   // Return an nsPluginTag for this type, if any.  If aCheckEnabled is
   // true, only enabled plugins will be returned.
-  nsPluginTag*
-  FindPluginForType(const char* aMimeType, bool aCheckEnabled);
+  nsPluginTag* FindNativePluginForType(const nsACString & aMimeType,
+                                       bool aCheckEnabled);
 
-  nsPluginTag*
-  FindPluginEnabledForExtension(const char* aExtension, const char* &aMimeType);
+  nsPluginTag* FindNativePluginForExtension(const nsACString & aExtension,
+                                            /* out */ nsACString & aMimeType,
+                                            bool aCheckEnabled);
 
   nsresult
   FindStoppedPluginForURL(nsIURI* aURL, nsIPluginInstanceOwner *aOwner);
@@ -253,6 +271,7 @@
   nsresult
   FindPlugins(bool aCreatePluginList, bool * aPluginsChanged);
 
+  // FIXME revisit, no ns prefix
   // Registers or unregisters the given mime type with the category manager
   // (performs no checks - see UpdateCategoryManager)
   enum nsRegisterType { ePluginRegister, ePluginUnregister };
@@ -287,10 +306,10 @@
 
   // Checks to see if a tag object is in our list of live tags.
   bool IsLiveTag(nsIPluginTag* tag);
-  
+
   // Checks our list of live tags for an equivalent tag.
   nsPluginTag* HaveSamePlugin(const nsPluginTag * aPluginTag);
-    
+
   // Returns the first plugin at |path|
   nsPluginTag* FirstPluginWithPath(const nsCString& path);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginInstanceOwner.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -1837,19 +1837,30 @@
     {
       WidgetKeyboardEvent* keyEvent = anEvent->AsKeyboardEvent();
 
-      cocoaEvent.data.key.keyCode = keyEvent->mNativeKeyCode;
-      cocoaEvent.data.key.isARepeat = keyEvent->mIsRepeat;
-      cocoaEvent.data.key.modifierFlags = keyEvent->mNativeModifierFlags;
-      const char16_t* nativeChars = keyEvent->mNativeCharacters.get();
-      cocoaEvent.data.key.characters =
-        (NPNSString*)::CFStringCreateWithCharacters(NULL,
-                                                    reinterpret_cast<const UniChar*>(nativeChars),
-                                                    keyEvent->mNativeCharacters.Length());
-      const char16_t* nativeCharsIgnoringModifiers = keyEvent->mNativeCharactersIgnoringModifiers.get();
-      cocoaEvent.data.key.charactersIgnoringModifiers =
-        (NPNSString*)::CFStringCreateWithCharacters(NULL,
-                                                    reinterpret_cast<const UniChar*>(nativeCharsIgnoringModifiers),
-                                                    keyEvent->mNativeCharactersIgnoringModifiers.Length());
+      // That keyEvent->mPluginTextEventString is non-empty is a signal that we should
+      // create a text event for the plugin, instead of a key event.
+      if ((anEvent->message == NS_KEY_DOWN) && !keyEvent->mPluginTextEventString.IsEmpty()) {
+        cocoaEvent.type = NPCocoaEventTextInput;
+        const char16_t* pluginTextEventString = keyEvent->mPluginTextEventString.get();
+        cocoaEvent.data.text.text = (NPNSString*)
+          ::CFStringCreateWithCharacters(NULL,
+                                         reinterpret_cast<const UniChar*>(pluginTextEventString),
+                                         keyEvent->mPluginTextEventString.Length());
+      } else {
+        cocoaEvent.data.key.keyCode = keyEvent->mNativeKeyCode;
+        cocoaEvent.data.key.isARepeat = keyEvent->mIsRepeat;
+        cocoaEvent.data.key.modifierFlags = keyEvent->mNativeModifierFlags;
+        const char16_t* nativeChars = keyEvent->mNativeCharacters.get();
+        cocoaEvent.data.key.characters = (NPNSString*)
+          ::CFStringCreateWithCharacters(NULL,
+                                         reinterpret_cast<const UniChar*>(nativeChars),
+                                         keyEvent->mNativeCharacters.Length());
+        const char16_t* nativeCharsIgnoringModifiers = keyEvent->mNativeCharactersIgnoringModifiers.get();
+        cocoaEvent.data.key.charactersIgnoringModifiers = (NPNSString*)
+          ::CFStringCreateWithCharacters(NULL,
+                                         reinterpret_cast<const UniChar*>(nativeCharsIgnoringModifiers),
+                                         keyEvent->mNativeCharactersIgnoringModifiers.Length());
+      }
       break;
     }
     case NS_FOCUS_CONTENT:
@@ -1921,58 +1932,39 @@
     return nsEventStatus_eIgnore;
   }
 
-  if (cocoaEvent.type == NPCocoaEventKeyDown) {
-    ComplexTextInputPanel* ctiPanel = ComplexTextInputPanel::GetSharedComplexTextInputPanel();
-    if (ctiPanel && ctiPanel->IsInComposition()) {
-      nsAutoString outText;
-      ctiPanel->InterpretKeyEvent(&cocoaEvent, outText);
-      if (!outText.IsEmpty()) {
-        CFStringRef cfString = ::CFStringCreateWithCharacters(kCFAllocatorDefault,
-                                                              reinterpret_cast<const UniChar*>(outText.get()),
-                                                              outText.Length());
+  if (cocoaEvent.type == NPCocoaEventTextInput) {
+    mInstance->HandleEvent(&cocoaEvent, nullptr);
+    return nsEventStatus_eConsumeNoDefault;
+  }
 
+  int16_t response = kNPEventNotHandled;
+  mInstance->HandleEvent(&cocoaEvent,
+                         &response,
+                         NS_PLUGIN_CALL_SAFE_TO_REENTER_GECKO);
+  if ((response == kNPEventStartIME) && (cocoaEvent.type == NPCocoaEventKeyDown)) {
+    nsIWidget* widget = mPluginFrame->GetNearestWidget();
+    if (widget) {
+      const WidgetKeyboardEvent* keyEvent = anEvent.AsKeyboardEvent();
+      double screenX, screenY;
+      ConvertPoint(0.0, mPluginFrame->GetScreenRect().height,
+                   NPCoordinateSpacePlugin, &screenX, &screenY,
+                   NPCoordinateSpaceScreen);
+      nsAutoString outText;
+      if (NS_SUCCEEDED(widget->StartPluginIME(*keyEvent, screenX, screenY, outText)) &&
+          !outText.IsEmpty()) {
+        CFStringRef cfString =
+          ::CFStringCreateWithCharacters(kCFAllocatorDefault,
+                                         reinterpret_cast<const UniChar*>(outText.get()),
+                                         outText.Length());
         NPCocoaEvent textEvent;
         InitializeNPCocoaEvent(&textEvent);
         textEvent.type = NPCocoaEventTextInput;
         textEvent.data.text.text = (NPNSString*)cfString;
-
         mInstance->HandleEvent(&textEvent, nullptr);
       }
-      return nsEventStatus_eConsumeNoDefault;
     }
   }
 
-  int16_t response = kNPEventNotHandled;
-  mInstance->HandleEvent(&cocoaEvent,
-                         &response,
-                         NS_PLUGIN_CALL_SAFE_TO_REENTER_GECKO);
-  if (response == kNPEventStartIME) {
-    nsAutoString outText;
-    ComplexTextInputPanel* ctiPanel = ComplexTextInputPanel::GetSharedComplexTextInputPanel();
-
-    // Place ctiPanel by passing the coordinates of the bottom-left of the plugin,
-    // in screen-coordinates.
-    double screenX, screenY;
-    ConvertPoint(0.0, mPluginFrame->GetScreenRect().height, NPCoordinateSpacePlugin,
-                 &screenX, &screenY, NPCoordinateSpaceScreen);
-
-    ctiPanel->PlacePanel(screenX, screenY);
-    ctiPanel->InterpretKeyEvent(&cocoaEvent, outText);
-
-    if (!outText.IsEmpty()) {
-      CFStringRef cfString = ::CFStringCreateWithCharacters(kCFAllocatorDefault,
-                                                            reinterpret_cast<const UniChar*>(outText.get()),
-                                                            outText.Length());
-
-      NPCocoaEvent textEvent;
-      InitializeNPCocoaEvent(&textEvent);
-      textEvent.type = NPCocoaEventTextInput;
-      textEvent.data.text.text = (NPNSString*)cfString;
-
-      mInstance->HandleEvent(&textEvent, nullptr);
-     }
-  }
-
   bool handled = (response == kNPEventHandled || response == kNPEventStartIME);
   bool leftMouseButtonDown = (anEvent.message == NS_MOUSE_BUTTON_DOWN) &&
                              (anEvent.AsMouseEvent()->button == WidgetMouseEvent::eLeftButton);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginTags.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginTags.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginTags.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginTags.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -15,6 +15,7 @@
 #include "nsIPlatformCharset.h"
 #include "nsPluginLogging.h"
 #include "nsNPAPIPlugin.h"
+#include "nsCharSeparatedTokenizer.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/unused.h"
 #include <cctype>
@@ -34,15 +35,65 @@
 static const char kPrefDefaultEnabledState[] = "plugin.default.state";
 static const char kPrefDefaultEnabledStateXpi[] = "plugin.defaultXpi.state";
 
-inline char* new_str(const char* str)
+// check comma delimited extensions
+static bool ExtensionInList(const nsCString& aExtensionList,
+                            const nsACString& aExtension)
+{
+  nsCCharSeparatedTokenizer extensions(aExtensionList, ',');
+  while (extensions.hasMoreTokens()) {
+    const nsCSubstring& extension = extensions.nextToken();
+    if (extension.Equals(aExtension, nsCaseInsensitiveCStringComparator())) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// Search for an extension in an extensions array, and return its
+// matching mime type
+static bool SearchExtensions(const nsTArray<nsCString> & aExtensions,
+                             const nsTArray<nsCString> & aMimeTypes,
+                             const nsACString & aFindExtension,
+                             nsACString & aMatchingType)
+{
+  uint32_t mimes = aMimeTypes.Length();
+  MOZ_ASSERT(mimes == aExtensions.Length(),
+             "These arrays should have matching elements");
+
+  aMatchingType.Truncate();
+
+  for (uint32_t i = 0; i < mimes; i++) {
+    if (ExtensionInList(aExtensions[i], aFindExtension)) {
+      aMatchingType = aMimeTypes[i];
+      return true;
+    }
+  }
+
+  return false;
+}
+
+static nsCString
+MakeNiceFileName(const nsCString & aFileName)
 {
-  if (str == nullptr)
-    return nullptr;
-  
-  char* result = new char[strlen(str) + 1];
-  if (result != nullptr)
-    return strcpy(result, str);
-  return result;
+  nsCString niceName = aFileName;
+  int32_t niceNameLength = aFileName.RFind(".");
+  NS_ASSERTION(niceNameLength != kNotFound, "aFileName doesn't have a '.'?");
+  while (niceNameLength > 0) {
+    char chr = aFileName[niceNameLength - 1];
+    if (!std::isalpha(chr))
+      niceNameLength--;
+    else
+      break;
+  }
+
+  // If it turns out that niceNameLength <= 0, we'll fall back and use the
+  // entire aFileName (which we've already taken care of, a few lines back).
+  if (niceNameLength > 0) {
+    niceName.Truncate(niceNameLength);
+  }
+
+  ToLowerCase(niceName);
+  return niceName;
 }
 
 static nsCString
@@ -58,6 +109,27 @@
   return pref;
 }
 
+static nsresult
+CStringArrayToXPCArray(nsTArray<nsCString> & aArray,
+                       uint32_t* aCount,
+                       char16_t*** aResults)
+{
+  uint32_t count = aArray.Length();
+  if (!count) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  *aResults =
+    static_cast<char16_t**>(nsMemory::Alloc(count * sizeof(**aResults)));
+  *aCount = count;
+
+  for (uint32_t i = 0; i < count; i++) {
+    (*aResults)[i] = ToNewUnicode(NS_ConvertUTF8toUTF16(aArray[i]));
+  }
+
+  return NS_OK;
+}
+
 static nsCString
 GetStatePrefNameForPlugin(nsPluginTag* aTag)
 {
@@ -82,7 +154,6 @@
     mFullPath(aPluginInfo->fFullPath),
     mVersion(aPluginInfo->fVersion),
     mLastModifiedTime(aLastModifiedTime),
-    mNiceFileName(),
     mCachedBlocklistState(nsIBlocklistService::STATE_NOT_BLOCKED),
     mCachedBlocklistStateValid(false),
     mIsFromExtension(fromExtension)
@@ -118,7 +189,6 @@
     mFullPath(aFullPath),
     mVersion(aVersion),
     mLastModifiedTime(aLastModifiedTime),
-    mNiceFileName(),
     mCachedBlocklistState(nsIBlocklistService::STATE_NOT_BLOCKED),
     mCachedBlocklistStateValid(false),
     mIsFromExtension(fromExtension)
@@ -266,7 +336,7 @@
   NS_ENSURE_SUCCESS(rv, rv);
   buffer.SetLength(outUnicodeLen);
   CopyUTF16toUTF8(buffer, aString);
-  
+
   return NS_OK;
 }
 #endif
@@ -277,7 +347,7 @@
   return NS_OK;
 #else
   nsresult rv;
-  
+
   nsCOMPtr<nsIPlatformCharset> pcs =
   do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -359,6 +429,13 @@
   return IsEnabled() && !IsBlocklisted();
 }
 
+NS_IMETHODIMP
+nsPluginTag::GetActive(bool *aResult)
+{
+  *aResult = IsActive();
+  return NS_OK;
+}
+
 bool
 nsPluginTag::IsEnabled()
 {
@@ -376,7 +453,9 @@
 bool
 nsPluginTag::IsBlocklisted()
 {
-  return GetBlocklistState() == nsIBlocklistService::STATE_BLOCKED;
+  uint32_t blocklistState;
+  nsresult rv = GetBlocklistState(&blocklistState);
+  return NS_FAILED(rv) || blocklistState == nsIBlocklistService::STATE_BLOCKED;
 }
 
 NS_IMETHODIMP
@@ -476,52 +555,19 @@
 NS_IMETHODIMP
 nsPluginTag::GetMimeTypes(uint32_t* aCount, char16_t*** aResults)
 {
-  uint32_t count = mMimeTypes.Length();
-  *aResults = static_cast<char16_t**>
-                         (nsMemory::Alloc(count * sizeof(**aResults)));
-  if (!*aResults)
-    return NS_ERROR_OUT_OF_MEMORY;
-  *aCount = count;
-
-  for (uint32_t i = 0; i < count; i++) {
-    (*aResults)[i] = ToNewUnicode(NS_ConvertUTF8toUTF16(mMimeTypes[i]));
-  }
-
-  return NS_OK;
+  return CStringArrayToXPCArray(mMimeTypes, aCount, aResults);
 }
 
 NS_IMETHODIMP
 nsPluginTag::GetMimeDescriptions(uint32_t* aCount, char16_t*** aResults)
 {
-  uint32_t count = mMimeDescriptions.Length();
-  *aResults = static_cast<char16_t**>
-                         (nsMemory::Alloc(count * sizeof(**aResults)));
-  if (!*aResults)
-    return NS_ERROR_OUT_OF_MEMORY;
-  *aCount = count;
-
-  for (uint32_t i = 0; i < count; i++) {
-    (*aResults)[i] = ToNewUnicode(NS_ConvertUTF8toUTF16(mMimeDescriptions[i]));
-  }
-
-  return NS_OK;
+  return CStringArrayToXPCArray(mMimeDescriptions, aCount, aResults);
 }
 
 NS_IMETHODIMP
 nsPluginTag::GetExtensions(uint32_t* aCount, char16_t*** aResults)
 {
-  uint32_t count = mExtensions.Length();
-  *aResults = static_cast<char16_t**>
-                         (nsMemory::Alloc(count * sizeof(**aResults)));
-  if (!*aResults)
-    return NS_ERROR_OUT_OF_MEMORY;
-  *aCount = count;
-
-  for (uint32_t i = 0; i < count; i++) {
-    (*aResults)[i] = ToNewUnicode(NS_ConvertUTF8toUTF16(mExtensions[i]));
-  }
-
-  return NS_OK;
+  return CStringArrayToXPCArray(mExtensions, aCount, aResults);
 }
 
 bool
@@ -571,27 +617,17 @@
     return mNiceFileName;
   }
 
-  mNiceFileName.Assign(mFileName);
-  int32_t niceNameLength = mFileName.RFind(".");
-  NS_ASSERTION(niceNameLength != kNotFound, "mFileName doesn't have a '.'?");
-  while (niceNameLength > 0) {
-    char chr = mFileName[niceNameLength - 1];
-    if (!std::isalpha(chr))
-      niceNameLength--;
-    else
-      break;
-  }
-
-  // If it turns out that niceNameLength <= 0, we'll fall back and use the
-  // entire mFileName (which we've already taken care of, a few lines back)
-  if (niceNameLength > 0) {
-    mNiceFileName.Truncate(niceNameLength);
-  }
-
-  ToLowerCase(mNiceFileName);
+  mNiceFileName = MakeNiceFileName(mFileName);
   return mNiceFileName;
 }
 
+NS_IMETHODIMP
+nsPluginTag::GetNiceName(nsACString & aResult)
+{
+  aResult = GetNiceFileName();
+  return NS_OK;
+}
+
 void nsPluginTag::ImportFlagsToPrefs(uint32_t flags)
 {
   if (!(flags & NS_PLUGIN_FLAG_ENABLED)) {
@@ -599,16 +635,20 @@
   }
 }
 
-uint32_t
-nsPluginTag::GetBlocklistState()
+NS_IMETHODIMP
+nsPluginTag::GetBlocklistState(uint32_t *aResult)
 {
   if (mCachedBlocklistStateValid) {
-    return mCachedBlocklistState;
+    *aResult = mCachedBlocklistState;
+    return NS_OK;
   }
 
-  nsCOMPtr<nsIBlocklistService> blocklist = do_GetService("@mozilla.org/extensions/blocklist;1");
+  nsCOMPtr<nsIBlocklistService> blocklist =
+    do_GetService("@mozilla.org/extensions/blocklist;1");
+
   if (!blocklist) {
-    return nsIBlocklistService::STATE_NOT_BLOCKED;
+    *aResult = nsIBlocklistService::STATE_NOT_BLOCKED;
+    return NS_OK;
   }
 
   // The EmptyString()s are so we use the currently running application
@@ -616,13 +656,29 @@
   uint32_t state;
   if (NS_FAILED(blocklist->GetPluginBlocklistState(this, EmptyString(),
                                                    EmptyString(), &state))) {
-    return nsIBlocklistService::STATE_NOT_BLOCKED;
+    *aResult = nsIBlocklistService::STATE_NOT_BLOCKED;
+    return NS_OK;
   }
 
   MOZ_ASSERT(state <= UINT16_MAX);
   mCachedBlocklistState = (uint16_t) state;
   mCachedBlocklistStateValid = true;
-  return state;
+  *aResult = state;
+  return NS_OK;
+}
+
+bool
+nsPluginTag::HasMimeType(const nsACString & aMimeType) const
+{
+  return mMimeTypes.Contains(aMimeType,
+                             nsCaseInsensitiveCStringArrayComparator());
+}
+
+bool
+nsPluginTag::HasExtension(const nsACString & aExtension,
+                          nsACString & aMatchingType) const
+{
+  return SearchExtensions(mExtensions, mMimeTypes, aExtension, aMatchingType);
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginTags.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginTags.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/base/nsPluginTags.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/base/nsPluginTags.h	2015-02-28 15:03:08.000000000 +0000
@@ -106,9 +106,17 @@
   int64_t       mLastModifiedTime;
   nsCOMPtr<nsITimer> mUnloadTimer;
 
-  uint32_t      GetBlocklistState();
   void          InvalidateBlocklistState();
 
+  // Returns true if this plugin claims it supports this MIME type.  The
+  // comparison is done ASCII-case-insensitively.
+  bool          HasMimeType(const nsACString & aMimeType) const;
+  // Returns true if this plugin claims it supports the given extension.  In hat
+  // case, aMatchingType is set to the MIME type the plugin claims corresponds
+  // to this extension.  Again, the extension is done ASCII-case-insensitively.
+  bool          HasExtension(const nsACString & aExtension,
+                             /* out */ nsACString & aMatchingType) const;
+
 private:
   virtual ~nsPluginTag();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/BrowserStreamParent.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -72,11 +72,7 @@
   }
 
   if (error != NPERR_NO_ERROR) {
-    // streamListener was suspended during async init. We must resume the stream
-    // request prior to calling _destroystream for cleanup to work correctly.
-    streamListener->ResumeRequest();
-    // We need to clean up the stream
-    parent::_destroystream(mNPP->GetNPP(), mStream, NPRES_DONE);
+    surrogate->DestroyAsyncStream(mStream);
     unused << PBrowserStreamParent::Send__delete__(this);
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -358,15 +358,33 @@
 {
 }
 
-/* static */ bool
-PluginAsyncSurrogate::SetStreamType(NPStream* aStream, uint16_t aStreamType)
+/* static */ nsNPAPIPluginStreamListener*
+PluginAsyncSurrogate::GetStreamListener(NPStream* aStream)
 {
   nsNPAPIStreamWrapper* wrapper =
     reinterpret_cast<nsNPAPIStreamWrapper*>(aStream->ndata);
   if (!wrapper) {
-    return false;
+    return nullptr;
   }
-  nsNPAPIPluginStreamListener* streamListener = wrapper->GetStreamListener();
+  return wrapper->GetStreamListener();
+}
+
+void
+PluginAsyncSurrogate::DestroyAsyncStream(NPStream* aStream)
+{
+  MOZ_ASSERT(aStream);
+  nsNPAPIPluginStreamListener* streamListener = GetStreamListener(aStream);
+  MOZ_ASSERT(streamListener);
+  // streamListener was suspended during async init. We must resume the stream
+  // request prior to calling _destroystream for cleanup to work correctly.
+  streamListener->ResumeRequest();
+  parent::_destroystream(mInstance, aStream, NPRES_DONE);
+}
+
+/* static */ bool
+PluginAsyncSurrogate::SetStreamType(NPStream* aStream, uint16_t aStreamType)
+{
+  nsNPAPIPluginStreamListener* streamListener = GetStreamListener(aStream);
   if (!streamListener) {
     return false;
   }
@@ -433,6 +451,12 @@
     mozilla::ipc::MessageChannel* contentChannel = cp->GetIPCChannel();
     MOZ_ASSERT(contentChannel);
     while (!mParent->mNPInitialized) {
+      if (mParent->mShutdown) {
+        // Since we are pumping the message channel for events, it may be
+        // possible for module initialization to fail during this loop. We must
+        // return false if this happens or else we'll be permanently stuck.
+        return false;
+      }
       result = contentChannel->WaitForIncomingMessage();
       if (!result) {
         return result;
@@ -442,6 +466,12 @@
   mozilla::ipc::MessageChannel* channel = mParent->GetIPCChannel();
   MOZ_ASSERT(channel);
   while (!mAcceptCalls) {
+    if (mInitCancelled) {
+      // Since we are pumping the message channel for events, it may be
+      // possible for plugin instantiation to fail during this loop. We must
+      // return false if this happens or else we'll be permanently stuck.
+      return false;
+    }
     result = channel->WaitForIncomingMessage();
     if (!result) {
       break;
@@ -474,7 +504,7 @@
   // Clean up any pending NewStream requests
   for (uint32_t i = 0, len = mPendingNewStreamCalls.Length(); i < len; ++i) {
     PendingNewStreamCall& curPendingCall = mPendingNewStreamCalls[i];
-    parent::_destroystream(mInstance, curPendingCall.mStream, NPRES_DONE);
+    DestroyAsyncStream(curPendingCall.mStream);
   }
   mPendingNewStreamCalls.Clear();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginAsyncSurrogate.h	2015-02-28 15:03:08.000000000 +0000
@@ -79,6 +79,7 @@
   void AsyncCallArriving();
 
   void NotifyAsyncInitFailed();
+  void DestroyAsyncStream(NPStream* aStream);
 
 private:
   explicit PluginAsyncSurrogate(PluginModuleParent* aParent);
@@ -117,6 +118,7 @@
                                   uint32_t* aCount);
   static bool ScriptableConstruct(NPObject* aObject, const NPVariant* aArgs,
                                   uint32_t aArgCount, NPVariant* aResult);
+  static nsNPAPIPluginStreamListener* GetStreamListener(NPStream* aStream);
 
 private:
   struct PendingNewStreamCall
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginInstanceParent.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -1704,14 +1704,10 @@
     }
 
     nsPluginInstanceOwner* owner = GetOwner();
-    if (!owner) {
-        // This is possible in async plugin land; the instance may outlive
-        // the owner
-        return true;
-    }
-
-    if (aResult != NPERR_NO_ERROR) {
-        owner->NotifyHostAsyncInitFailed();
+    // It is possible for a plugin instance to outlive its owner when async
+    // plugin init is turned on, so we need to handle that case.
+    if (aResult != NPERR_NO_ERROR || !owner) {
+        mSurrogate->NotifyAsyncInitFailed();
         return true;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginModuleParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginModuleParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginModuleParent.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginModuleParent.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -97,6 +97,7 @@
                               bool aForceBridgeNow,
                               nsresult* rv)
 {
+    PluginModuleChromeParent::ClearInstantiationFlag();
     nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
     nsRefPtr<nsNPAPIPlugin> plugin;
     *rv = host->GetPluginForContentProcess(aPluginId, getter_AddRefs(plugin));
@@ -105,7 +106,8 @@
     }
     PluginModuleChromeParent* chromeParent = static_cast<PluginModuleChromeParent*>(plugin->GetLibrary());
     chromeParent->SetContentParent(aContentParent);
-    if (!aForceBridgeNow && chromeParent->IsStartingAsync()) {
+    if (!aForceBridgeNow && chromeParent->IsStartingAsync() &&
+        PluginModuleChromeParent::DidInstantiate()) {
         // We'll handle the bridging asynchronously
         return true;
     }
@@ -415,7 +417,9 @@
         return nullptr;
     }
     parent->mIsFlashPlugin = aPluginTag->mIsFlashPlugin;
-    parent->mIsBlocklisted = aPluginTag->GetBlocklistState() != 0;
+    uint32_t blocklistState;
+    nsresult rv = aPluginTag->GetBlocklistState(&blocklistState);
+    parent->mIsBlocklisted = NS_FAILED(rv) || blocklistState != 0;
     if (!parent->mIsStartingAsync) {
         int32_t launchTimeoutSecs = Preferences::GetInt(kLaunchTimeoutPref, 0);
         if (!parent->mSubprocess->WaitUntilConnected(launchTimeoutSecs * 1000)) {
@@ -561,6 +565,8 @@
     Preferences::UnregisterCallback(TimeoutChanged, kContentTimeoutPref, this);
 }
 
+bool PluginModuleChromeParent::sInstantiated = false;
+
 PluginModuleChromeParent::PluginModuleChromeParent(const char* aFilePath, uint32_t aPluginId)
     : PluginModuleParent(true)
     , mSubprocess(new PluginProcessParent(aFilePath))
@@ -588,6 +594,7 @@
     , mIsFlashPlugin(false)
 {
     NS_ASSERTION(mSubprocess, "Out of memory!");
+    sInstantiated = true;
 
     RegisterSettingsCallbacks();
 
@@ -897,6 +904,13 @@
 bool
 PluginModuleChromeParent::ShouldContinueFromReplyTimeout()
 {
+    if (mIsFlashPlugin) {
+        MessageLoop::current()->PostTask(
+            FROM_HERE,
+            mTaskFactory.NewRunnableMethod(
+                &PluginModuleChromeParent::NotifyFlashHang));
+    }
+
 #ifdef XP_WIN
     if (LaunchHangUI()) {
         return true;
@@ -1280,6 +1294,15 @@
 }
 
 void
+PluginModuleParent::NotifyFlashHang()
+{
+    nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
+    if (obs) {
+        obs->NotifyObservers(nullptr, "flash-plugin-hang", nullptr);
+    }
+}
+
+void
 PluginModuleParent::NotifyPluginCrashed()
 {
     if (!OkToCleanup()) {
@@ -1366,7 +1389,7 @@
 
 NPError
 PluginModuleParent::NPP_Destroy(NPP instance,
-                                NPSavedData** /*saved*/)
+                                NPSavedData** saved)
 {
     // FIXME/cjones:
     //  (1) send a "destroy" message to the child
@@ -1375,7 +1398,12 @@
     //  (4) free parent
 
     PLUGIN_LOG_DEBUG_FUNCTION;
-    PluginInstanceParent* parentInstance = PluginInstanceParent::Cast(instance);
+    PluginAsyncSurrogate* surrogate = nullptr;
+    PluginInstanceParent* parentInstance =
+        PluginInstanceParent::Cast(instance, &surrogate);
+    if (surrogate && (!parentInstance || parentInstance->UseSurrogate())) {
+        return surrogate->NPP_Destroy(saved);
+    }
 
     if (!parentInstance)
         return NPERR_NO_ERROR;
@@ -1626,6 +1654,8 @@
         Close();
     }
 
+    mShutdown = true;
+
     if (mIsStartingAsync) {
         /* If we've failed then we need to enumerate any pending NPP_New calls
            and clean them up. */
@@ -1752,13 +1782,18 @@
         return NS_ERROR_FAILURE;
     }
 
+    *error = NPERR_NO_ERROR;
     if (mIsStartingAsync) {
-        PluginAsyncSurrogate::NP_GetEntryPoints(pFuncs);
+        if (GetIPCChannel()->CanSend()) {
+            // We're already connected, so we may call this immediately.
+            RecvNP_InitializeResult(*error);
+        } else {
+            PluginAsyncSurrogate::NP_GetEntryPoints(pFuncs);
+        }
     } else {
         SetPluginFuncs(pFuncs);
     }
 
-    *error = NPERR_NO_ERROR;
     return NS_OK;
 }
 
@@ -1874,6 +1909,22 @@
     return NS_OK;
 }
 
+#if defined(XP_WIN) || defined(XP_MACOSX)
+
+nsresult
+PluginModuleContentParent::NP_Initialize(NPNetscapeFuncs* bFuncs, NPError* error)
+{
+    PLUGIN_LOG_DEBUG_METHOD;
+    nsresult rv = PluginModuleParent::NP_Initialize(bFuncs, error);
+    if (mIsStartingAsync && GetIPCChannel()->CanSend()) {
+        // We're already connected, so we may call this immediately.
+        RecvNP_InitializeResult(*error);
+    }
+    return rv;
+}
+
+#endif
+
 nsresult
 PluginModuleChromeParent::NP_Initialize(NPNetscapeFuncs* bFuncs, NPError* error)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginModuleParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginModuleParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginModuleParent.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginModuleParent.h	2015-02-28 15:03:08.000000000 +0000
@@ -259,6 +259,7 @@
     void InitAsyncSurrogates();
 
 protected:
+    void NotifyFlashHang();
     void NotifyPluginCrashed();
     void OnInitFailure();
 
@@ -314,6 +315,10 @@
 
     virtual ~PluginModuleContentParent();
 
+#if defined(XP_WIN) || defined(XP_MACOSX)
+    nsresult NP_Initialize(NPNetscapeFuncs* bFuncs, NPError* error) MOZ_OVERRIDE;
+#endif
+
   private:
     virtual bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE;
     virtual void OnExitedSyncSend() MOZ_OVERRIDE;
@@ -341,6 +346,14 @@
     static PluginLibrary* LoadModule(const char* aFilePath, uint32_t aPluginId,
                                      nsPluginTag* aPluginTag);
 
+    /**
+     * The following two functions are called by SetupBridge to determine
+     * whether an existing plugin module was reused, or whether a new module
+     * was instantiated by the plugin host.
+     */
+    static void ClearInstantiationFlag() { sInstantiated = false; }
+    static bool DidInstantiate() { return sInstantiated; }
+
     virtual ~PluginModuleChromeParent();
 
     void TerminateChildProcess(MessageLoop* aMsgLoop);
@@ -517,6 +530,7 @@
     nsCOMPtr<nsIObserver> mOfflineObserver;
     bool mIsFlashPlugin;
     bool mIsBlocklisted;
+    static bool sInstantiated;
 };
 
 } // namespace plugins
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetChild.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetChild.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/plugins/PluginWidgetChild.h"
+#include "mozilla/plugins/PluginWidgetParent.h"
 #include "PluginWidgetProxy.h"
 #include "mozilla/DebugOnly.h"
 #include "nsDebug.h"
@@ -12,6 +13,9 @@
 using mozilla::plugins::PluginInstanceParent;
 #endif
 
+#define PWLOG(...)
+// #define PWLOG(...) printf_stderr(__VA_ARGS__)
+
 namespace mozilla {
 namespace plugins {
 
@@ -26,35 +30,43 @@
   MOZ_COUNT_DTOR(PluginWidgetChild);
 }
 
-/*
- * Tear down scenarios
- * layout (plugin content unloading):
- *  - PluginWidgetProxy nsIWidget Destroy()
- *  - PluginWidgetProxy->PluginWidgetChild->SendDestroy()
- *  - PluginWidgetParent::RecvDestroy(), sends async Destroyed() to PluginWidgetChild
- *  - PluginWidgetChild::RecvDestroyed() calls Send__delete__()
- *  - PluginWidgetParent::ActorDestroy() called in response to __delete__.
- * PBrowser teardown (tab closing):
- *  - PluginWidgetParent::ParentDestroy() called by TabParent::Destroy()
- *  - PluginWidgetParent::ActorDestroy()
- *  - PluginWidgetParent::~PluginWidgetParent() in response to PBrowserParent::DeallocSubtree()
- *  - PluginWidgetChild::ActorDestroy() from PPluginWidgetChild::DestroySubtree
- *  - ~PluginWidgetChild() in response to PBrowserChild::DeallocSubtree()
- **/
+// Called by the proxy widget when it is destroyed by layout. Only gets
+// called once.
+void
+PluginWidgetChild::ProxyShutdown()
+{
+  PWLOG("PluginWidgetChild::ProxyShutdown()\n");
+  if (mWidget) {
+    SendDestroy();
+    mWidget = nullptr;
+  }
+}
 
 void
-PluginWidgetChild::ActorDestroy(ActorDestroyReason aWhy)
+PluginWidgetChild::KillWidget()
 {
+  PWLOG("PluginWidgetChild::KillWidget()\n");
   if (mWidget) {
     mWidget->ChannelDestroyed();
   }
   mWidget = nullptr;
 }
 
+void
+PluginWidgetChild::ActorDestroy(ActorDestroyReason aWhy)
+{
+  PWLOG("PluginWidgetChild::ActorDestroy()\n");
+  KillWidget();
+}
+
 bool
-PluginWidgetChild::RecvParentShutdown()
+PluginWidgetChild::RecvParentShutdown(const uint16_t& aType)
 {
-  Send__delete__(this);
+  PWLOG("PluginWidgetChild::RecvParentShutdown()\n");
+  KillWidget();
+  if (aType == PluginWidgetParent::CONTENT) {
+    Send__delete__(this);
+  }
   return true;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetChild.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetChild.h	2015-02-28 15:03:08.000000000 +0000
@@ -21,7 +21,15 @@
 
   virtual bool RecvUpdateWindow(const uintptr_t& aChildId) MOZ_OVERRIDE;
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
-  virtual bool RecvParentShutdown() MOZ_OVERRIDE;
+  virtual bool RecvParentShutdown(const uint16_t& aType) MOZ_OVERRIDE;
+
+  void SetWidget(mozilla::widget::PluginWidgetProxy* aWidget) {
+    mWidget = aWidget;
+  }
+  void ProxyShutdown();
+
+private:
+  void KillWidget();
 
   mozilla::widget::PluginWidgetProxy* mWidget;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetParent.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetParent.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -41,8 +41,23 @@
   }                                                           \
 }
 
-PluginWidgetParent::PluginWidgetParent() :
-  mActorDestroyed(false)
+/*
+ * Tear down scenarios
+ * layout (plugin content unloading):
+ *  - PluginWidgetProxy::Destroy() calls PluginWidgetChild::ProxyShutdown(), calls SendDestroy()
+ *  - PluginWidgetParent::RecvDestroy(), sends async ParentShutdown(CONTENT)
+ *  - PluginWidgetChild::RecvParentShutdown(CONTENT), calls Send__delete__()
+ *  - PluginWidgetParent::ActorDestroy() called in response to __delete__
+ * PBrowser teardown (tab closing):
+ *  - PluginWidgetParent::ParentDestroy() called by TabParent::Destroy(), sends async ParentShutdown(TAB_CLOSURE)
+ *  - PluginWidgetChild::RecvParentShutdown(TAB_CLOSURE) (PluginWidgetProxy disabled)
+ *  - PluginWidgetParent::ActorDestroy()
+ *  - PluginWidgetParent::~PluginWidgetParent() in response to PBrowserParent::DeallocSubtree()
+ *  - PluginWidgetChild::ActorDestroy() from PPluginWidgetChild::DestroySubtree
+ *  - ~PluginWidgetChild() in response to PBrowserChild::DeallocSubtree()
+ **/
+
+PluginWidgetParent::PluginWidgetParent()
 {
   PWLOG("PluginWidgetParent::PluginWidgetParent()\n");
   MOZ_COUNT_CTOR(PluginWidgetParent);
@@ -177,41 +192,40 @@
 }
 
 void
+PluginWidgetParent::Shutdown(ShutdownType aType)
+{
+  if (mWidget) {
+    mWidget->UnregisterPluginWindowForRemoteUpdates();
+    DebugOnly<nsresult> rv = mWidget->Destroy();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "widget destroy failure");
+    mWidget = nullptr;
+    unused << SendParentShutdown(aType);
+  }
+}
+
+void
 PluginWidgetParent::ActorDestroy(ActorDestroyReason aWhy)
 {
-  mActorDestroyed = true;
   PWLOG("PluginWidgetParent::ActorDestroy()\n");
 }
 
 // Called by TabParent's Destroy() in response to an early tear down (Early
 // in that this is happening before layout in the child has had a chance
-// to destroy the child widget.) when the tab is closing. We will not receive
-// RecvDestroy here.
+// to destroy the child widget.) when the tab is closing.
 void
 PluginWidgetParent::ParentDestroy()
 {
-  if (mActorDestroyed || !mWidget) {
-    return;
-  }
   PWLOG("PluginWidgetParent::ParentDestroy()\n");
-  mWidget->UnregisterPluginWindowForRemoteUpdates();
-  DebugOnly<nsresult> rv = mWidget->Destroy();
-  NS_ASSERTION(NS_SUCCEEDED(rv), "widget destroy failure");
-  mWidget = nullptr;
-  mActorDestroyed = true;
-  return;
+  Shutdown(TAB_CLOSURE);
 }
 
 // Called by the child when a plugin is torn down within a tab
-// normally.
+// normally. Messages back via ParentShutdown().
 bool
 PluginWidgetParent::RecvDestroy()
 {
-  bool destroyed = mActorDestroyed;
-  ParentDestroy();
-  if (!destroyed) {
-    unused << SendParentShutdown();
-  }
+  PWLOG("PluginWidgetParent::RecvDestroy()\n");
+  Shutdown(CONTENT);
   return true;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/ipc/PluginWidgetParent.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/ipc/PluginWidgetParent.h	2015-02-28 15:03:08.000000000 +0000
@@ -32,7 +32,6 @@
    */
   static void SendAsyncUpdate(nsIWidget* aWidget);
 
-public:
   PluginWidgetParent();
   virtual ~PluginWidgetParent();
 
@@ -43,7 +42,7 @@
   virtual bool RecvGetNativePluginPort(uintptr_t* value) MOZ_OVERRIDE;
 
   // Helper for compositor checks on the channel
-  bool ActorDestroyed() { return mActorDestroyed; }
+  bool ActorDestroyed() { return !mWidget; }
 
   // Called by PBrowser when it receives a Destroy() call from the child.
   void ParentDestroy();
@@ -54,12 +53,22 @@
 private:
   // The tab our connection is associated with.
   mozilla::dom::TabParent* GetTabParent();
+
+public:
+  // Identifies the side of the connection that initiates shutdown.
+  enum ShutdownType {
+    TAB_CLOSURE = 1,
+    CONTENT     = 2
+  };
+
+private:
+  void Shutdown(ShutdownType aType);
+
   // The chrome side native widget.
   nsCOMPtr<nsIWidget> mWidget;
 #if defined(MOZ_WIDGET_GTK)
   nsAutoPtr<nsPluginNativeWindowGtk> mWrapper;
 #endif
-  bool mActorDestroyed;
 };
 
 } // namespace plugins
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/mochitest/test_bug854082.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/mochitest/test_bug854082.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/mochitest/test_bug854082.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/mochitest/test_bug854082.html	2015-02-28 15:03:09.000000000 +0000
@@ -28,14 +28,11 @@
     o.style.display = "none";
     // Access clientTop to force layout flush
     o.clientTop;
+    ok(true, "Setter called and did not crash");
+    SimpleTest.finish();
     setterCalled = true;
   });
   document.body.appendChild(o);
-
-  SimpleTest.executeSoon(function() {
-    ok(setterCalled, "Setter called and did not crash");
-    SimpleTest.finish();
-  });
 </script>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-1.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-1.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,12 +1,16 @@
 <!DOCTYPE html>
-<html>
-<body style="margin:0">
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body style="margin:0" onLoad="forceLoadPlugin('p1')">
 <object type="application/x-test" drawmode="solid" color="ff00ff00"
         style="width:200px; height:200px; display:block; margin:90px 80px;
                outline:5px dashed blue;
                background:cyan;
                border:dotted black; border-width:4px 8px 4px 8px;
-               padding:3px 1px;">
+               padding:3px 1px;" id="p1">
 </object>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-2.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-2.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,12 +1,17 @@
 <!DOCTYPE html>
-<html>
-<body style="margin:0">
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body style="margin:0" onLoad="forceLoadPlugin('plugin')">
 <object type="application/x-test"
         style="width:200px; height:200px; display:block; margin:90px 80px;
                outline:5px dashed blue;
                background:cyan;
                border:dotted black; border-width:4px 8px 4px 8px;
-               padding:3px 1px;">
+               padding:3px 1px;"
+        id="plugin">
 </object>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-2-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-2-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-2-ref.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-2-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,10 +1,17 @@
 <!DOCTYPE html>
-<html>
-<body style="margin:0">
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body style="margin:0" onLoad="forceLoadPlugin('plugin')">
 <div style="width:184px; height:192px; margin:90px 80px; outline:5px dashed blue;
             border:dotted black; border-width:4px 8px 4px 8px;
             background:cyan;">
-  <object style="margin:3px 1px; height:186px; width:182px; display:block;" type="application/x-test"></object>
+  <object style="margin:3px 1px; height:186px; width:182px; display:block;"
+          type="application/x-test"
+          id="plugin">
+  </object>
 </div>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-3.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-3.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/border-padding-3.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/border-padding-3.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
-<body style="margin:0">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body style="margin:0" onLoad="forceLoadPlugin('plugin', true)">
 <object type="application/x-test" id="plugin"
         drawmode="solid" color="00000000"
         style="width:200px; height:200px; display:block; margin:90px 80px;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-alpha-opacity.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-alpha-opacity.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-alpha-opacity.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-alpha-opacity.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html class="reftest-wait">
 <head>
 <style type="text/css">
 #one {
@@ -18,8 +18,10 @@
   background-color: rgb(255,0,0);
 }
 </style>
+<script src="utils.js">
+</script>
 </head>
-<body>
+<body onLoad="forceLoadPlugin('one')">
 <div id="two"></div>
 <embed id="one" type="application/x-test" width="400" height="400" drawmode="solid" color="FFa0a0a0"></embed>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-alpha-zindex.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-alpha-zindex.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-alpha-zindex.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-alpha-zindex.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html class="reftest-wait">
 <head>
 <style type="text/css">
 #one {
@@ -15,10 +15,12 @@
   background-color: rgb(255,0,0);
 }
 </style>
+<script src="utils.js">
+</script>
 </head>
-<body>
+<body onLoad="forceLoadPlugin('one')">
 <div id="two"></div>
-<embed id="one" type="application/x-test" width="400" height="400" drawmode="solid" color="9900FF00"></embed>
+<embed id="one" type="application/x-test" width="400" height="400" drawmode="solid" color="9900FF00" id="p1"></embed>
 </body>
 </html>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-background.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-background.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-background.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-background.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
-<html>
+<html class="reftest-wait">
 <head>
   <link rel="stylesheet" type="text/css" href="plugin-background.css"></link>
 </head>
-<body>
+<script src="utils.js">
+</script>
+<body onLoad="forceLoadPlugin('plugin')">
   <div id="bad">Test some plugin stuff.</div>
   <div id="good"></div>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-busy-alpha-zindex.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-busy-alpha-zindex.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-busy-alpha-zindex.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-busy-alpha-zindex.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html class="reftest-wait">
 <head>
   <style type="text/css">
 #one {
@@ -27,6 +27,8 @@
   z-index:1;
 }
   </style>
+  <script src="utils.js" type="text/javascript">
+  </script>
   <script type="text/javascript">
 function paintCanvas() {
   var canvas = document.getElementById("two");
@@ -34,10 +36,15 @@
   ctx.fillStyle = "rgba(255,0,0, 0.6)";
   ctx.fillRect(0,0, 200,200);
 }
+
+  function doTest() {
+    paintCanvas();
+    forceLoadPlugin(['one', 'four']);
+  }
   </script>
 </style>
 </head>
-<body onload="paintCanvas();">
+<body onload="doTest();">
   <embed id="four" type="application/x-test" width="200" height="200"
          drawmode="solid" color="FFFF0000"></embed>
   <div id="three"></div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-canvas-alpha-zindex.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-canvas-alpha-zindex.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-canvas-alpha-zindex.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-canvas-alpha-zindex.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html class="reftest-wait">
 <head>
   <style type="text/css">
 #one {
@@ -16,6 +16,8 @@
   z-index:0;
 }
   </style>
+  <script src="utils.js" type="text/javascript">
+  </script>
   <script type="text/javascript">
 function paintCanvas() {
   var canvas = document.getElementById("two");
@@ -23,10 +25,15 @@
   ctx.fillStyle = "rgb(255,0,0)";
   ctx.fillRect(0,0, 200,200);
 }
+
+  function doTest() {
+    paintCanvas();
+    forceLoadPlugin('one');
+  }
   </script>
 </style>
 </head>
-<body onload="paintCanvas();">
+<body onload="doTest()">
   <canvas width="200" height="200" id="two"></canvas>
   <embed id="one" type="application/x-test" width="400" height="400" drawmode="solid" color="9900FF00"></embed>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-sanity.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-sanity.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-sanity.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-sanity.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,10 +1,13 @@
 <!doctype html>
-<html><head>
+<html class="reftest-wait">
+<head>
 <title>Plugin boxes</title>
+<script src="utils.js">
+</script>
 </head>
-<body>
-<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FFFF0000"></embed> <!-- red -->
-<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FF00FF00"></embed> <!-- green -->
-<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FF0000FF"></embed> <!-- blue -->
-<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FF999999"></embed> <!-- gray -->
+<body onLoad="forceLoadPlugin(['p1', 'p2', 'p3', 'p4'])">
+<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FFFF0000" id="p1"></embed> <!-- red -->
+<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FF00FF00" id="p2"></embed> <!-- green -->
+<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FF0000FF" id="p3"></embed> <!-- blue -->
+<embed type="application/x-test" width="400" height="400" drawmode="solid" color="FF999999" id="p4"></embed> <!-- gray -->
 </body></html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-1.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-1.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,6 +1,10 @@
 <!DOCTYPE HTML>
-<html>
-<body>
-<embed type="application/x-test" style="-moz-transform:scale(1)"></embed>
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p')">
+<embed type="application/x-test" style="-moz-transform:scale(1)" id="p"></embed>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-1-ref.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-1-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,6 +1,10 @@
 <!DOCTYPE HTML>
-<html>
-<body>
-<embed type="application/x-test"></embed>
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p')">
+<embed type="application/x-test" id="p"></embed>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-2.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-2.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,8 +1,13 @@
 <!DOCTYPE HTML>
-<html>
-<body>
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('one')">
 <embed type="application/x-test" drawmode="solid" color="FF00FF00"
        style="width:100px; height:100px; -moz-transform-origin:top left;
-              -moz-transform:scale(2); display:block"></embed>
+       -moz-transform:scale(2); display:block"
+       id="one"></embed>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-alpha-zindex.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-alpha-zindex.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/plugin-transform-alpha-zindex.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/plugin-transform-alpha-zindex.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html class="reftest-wait">
 <head>
 <style type="text/css">
 #one {
@@ -17,8 +17,10 @@
   -moz-transform: translate(100px,100px);
 }
 </style>
+<script src="utils.js">
+</script>
 </head>
-<body>
+<body onLoad="forceLoadPlugin('one')">
   <div id="two"></div>
   <embed id="one" type="application/x-test" width="400" height="400" drawmode="solid" color="9900FF00"></embed>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/shrink-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/shrink-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/shrink-1.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/shrink-1.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <head>
+  <script src="utils.js">
+  </script>
   <script>
 function doShrink()
 {
@@ -15,7 +17,7 @@
 document.addEventListener("MozReftestInvalidate", doShrink, false);
   </script>
 </head>
-<body>
+<body onLoad="forceLoadPlugin('plugin', true)">
   <embed id="plugin" type="application/x-test"
          width="300" height="500">
   </embed>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/shrink-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/shrink-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/shrink-1-ref.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/shrink-1-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
-<html>
+<html class="reftest-wait">
 <head>
+<script src="utils.js">
+</script>
 </head>
-<body>
+<body onLoad="forceLoadPlugin('plugin')">
   <embed id="plugin" type="application/x-test"
          width="50px" height="40px">
   </embed>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/update-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/update-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/update-1.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/update-1.html	2015-02-28 15:03:09.000000000 +0000
@@ -2,6 +2,8 @@
 <html class="reftest-wait">
 <head>
   <title>Test for bugs 807728 and 810426</title>
+  <script src="utils.js">
+  </script>
   <script>
 function start()
 {
@@ -49,7 +51,7 @@
 document.addEventListener("MozReftestInvalidate", start, false);
   </script>
 </head>
-<body>
+<body onLoad="forceLoadPlugin('plugin', true)">
   <embed id="plugin" type="application/x-test"
          drawmode="solid" color="FF000000" width="30" height="50">
   </embed>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/update-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/update-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/update-1-ref.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/update-1-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
-<html>
-<body>
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('plugin')">
   <embed id="plugin" type="application/x-test"
          drawmode="solid" color="FFFF0000" width="30" height="50">
   </embed>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/utils.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/utils.js	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,18 @@
+function forceLoadPluginElement(id) {
+  var e = document.getElementById(id);
+  var found = e.pluginFoundElement;
+}
+
+function forceLoadPlugin(ids, skipRemoveAttribute) {
+  if (Array.isArray(ids)) {
+    ids.forEach(function(element, index, array) {
+      forceLoadPluginElement(element);
+    });
+  } else {
+    forceLoadPluginElement(ids);
+  }
+  if (skipRemoveAttribute) {
+    return;
+  }
+  document.documentElement.removeAttribute("class");
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-clipping-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-clipping-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-clipping-1.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-clipping-1.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,11 +1,15 @@
-<html>
-<body>
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p1')">
 <div style="width:100px; height:100px; overflow:hidden;">
   <embed type="application/x-test" style="width:200px;"></embed>
 </div>
 <div style="width:100px; height:100px; overflow:hidden;">
   <embed type="application/x-test" style="width:200px;"
-         drawmode="solid" color="ff00ff00"></embed>
+         drawmode="solid" color="ff00ff00" id="p1"></embed>
 </div>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-clipping-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-clipping-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-clipping-1-ref.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-clipping-1-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,8 +1,12 @@
-<html>
-<body>
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p1')">
 <div style="width:100px; height:100px; overflow:auto;">
   <div style="width:100px; height:100px; overflow:hidden;">
-    <embed type="application/x-test" style="width:200px;"></embed>
+    <embed type="application/x-test" style="width:200px;" id="p1"></embed>
   </div>
 </div>
 <div style="width:100px; height:100px; background-color:lime;"></div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-layers.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-layers.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-layers.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-layers.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,11 +1,15 @@
 <!DOCTYPE html>
-<html>
-<body>
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin(['p1', 'p2'])">
   <div style="width:200px; height:200px; overflow:hidden; position:absolute; z-index:1">
-    <embed type="application/x-test" style="width:200px; height:200px;">
+    <embed type="application/x-test" style="width:200px; height:200px;" id="p1">
   </div>
   <div style="width:200px; height:100px; overflow:hidden; position:absolute; z-index:2">
-    <embed type="application/x-test" style="width:200px; height:200px;">
+    <embed type="application/x-test" style="width:200px; height:200px;" id="p2">
   </div>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-layers-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-layers-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/plugins/test/reftest/windowless-layers-ref.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/plugins/test/reftest/windowless-layers-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
-<html>
-<body>
-  <embed type="application/x-test" style="width:200px; height:200px;">
+<html class="reftest-wait">
+<head>
+<script src="utils.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p1')">
+  <embed type="application/x-test" style="width:200px; height:200px;" id="p1">
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/promise/Promise.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/promise/Promise.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/promise/Promise.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/promise/Promise.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -283,6 +283,32 @@
   NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(Promise)
+  if (tmp->IsBlack()) {
+    if (tmp->mResult.isObject()) {
+      JS::ExposeObjectToActiveJS(&(tmp->mResult.toObject()));
+    }
+    if (tmp->mAllocationStack) {
+      JS::ExposeObjectToActiveJS(tmp->mAllocationStack);
+    }
+    if (tmp->mRejectionStack) {
+      JS::ExposeObjectToActiveJS(tmp->mRejectionStack);
+    }
+    if (tmp->mFullfillmentStack) {
+      JS::ExposeObjectToActiveJS(tmp->mFullfillmentStack);
+    }
+    return true;
+  }
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_END
+
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_BEGIN(Promise)
+  return tmp->IsBlackAndDoesNotNeedTracing(tmp);
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_END
+
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(Promise)
+  return tmp->IsBlack();
+NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
+
 NS_IMPL_CYCLE_COLLECTING_ADDREF(Promise)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(Promise)
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/promise/Promise.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/promise/Promise.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/promise/Promise.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/promise/Promise.h	2015-02-28 15:03:09.000000000 +0000
@@ -75,7 +75,7 @@
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_PROMISE_IID)
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Promise)
+  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(Promise)
   MOZ_DECLARE_REFCOUNTED_TYPENAME(Promise)
 
   // Promise creation tries to create a JS reflector for the Promise, so is
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/push/PushService.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/push/PushService.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/push/PushService.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/push/PushService.jsm	2015-02-28 15:03:09.000000000 +0000
@@ -52,6 +52,8 @@
 const kCHILD_PROCESS_MESSAGES = ["Push:Register", "Push:Unregister",
                                  "Push:Registrations"];
 
+const kWS_MAX_WENTDOWN = 2;
+
 // This is a singleton
 this.PushDB = function PushDB() {
   debug("PushDB()");
@@ -65,7 +67,7 @@
   __proto__: IndexedDBHelper.prototype,
 
   upgradeSchema: function(aTransaction, aDb, aOldVersion, aNewVersion) {
-    debug("PushDB.upgradeSchema()")
+    debug("PushDB.upgradeSchema()");
 
     let objectStore = aDb.createObjectStore(kPUSHDB_STORE_NAME,
                                             { keyPath: "channelID" });
@@ -482,6 +484,12 @@
   _upperLimit: 0,
 
   /**
+   * Count the times WebSocket goes down without receiving Pings
+   * so we can re-enable the ping recalculation algorithm
+   */
+  _wsWentDownCounter: 0,
+
+  /**
    * Sends a message to the Push Server through an open websocket.
    * typeof(msg) shall be an object
    */
@@ -678,6 +686,11 @@
       return;
     }
 
+    if (!wsWentDown) {
+      debug('Setting websocket down counter to 0');
+      this._wsWentDownCounter = 0;
+    }
+
     if (!this._recalculatePing && !wsWentDown) {
       debug('We do not need to recalculate the ping now, based on previous data');
       return;
@@ -722,6 +735,24 @@
 
     let nextPingInterval;
     let lastTriedPingInterval = prefs.get('pingInterval');
+
+    if (!this._recalculatePing && wsWentDown) {
+      debug('Websocket disconnected without ping adaptative algorithm running');
+      this._wsWentDownCounter++;
+      if (this._wsWentDownCounter > kWS_MAX_WENTDOWN) {
+        debug('Too many disconnects. Reenabling ping adaptative algoritm');
+        this._wsWentDownCounter = 0;
+        this._recalculatePing = true;
+        this._lastGoodPingInterval = Math.floor(lastTriedPingInterval / 2);
+        nextPingInterval = this._lastGoodPingInterval;
+        prefs.set('pingInterval', nextPingInterval);
+        this._save(ns, nextPingInterval);
+        return;
+      }
+
+      debug('We do not need to recalculate the ping, based on previous data');
+    }
+
     if (wsWentDown) {
       debug('The WebSocket was disconnected, calculating next ping');
 
@@ -770,6 +801,10 @@
     debug('Setting the pingInterval to ' + nextPingInterval);
     prefs.set('pingInterval', nextPingInterval);
 
+    this._save(ns, nextPingInterval);
+  },
+
+  _save: function(ns, nextPingInterval){
     //Save values for our current network
     if (ns.ip) {
       prefs.set('pingInterval.mobile', nextPingInterval);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/requestsync/tests/test_basic_app.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/requestsync/tests/test_basic_app.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/requestsync/tests/test_basic_app.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/requestsync/tests/test_basic_app.html	2015-02-28 15:03:09.000000000 +0000
@@ -90,8 +90,7 @@
       }
 
       SpecialPowers.setAllAppsLaunchable(true);
-      SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-      runTests();
+      SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTests);
     },
 
     // No confirmation needed when an app is installed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/security/nsMixedContentBlocker.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/security/nsMixedContentBlocker.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/security/nsMixedContentBlocker.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/security/nsMixedContentBlocker.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsIContentViewer.h"
 #include "nsIChannel.h"
 #include "nsIHttpChannel.h"
+#include "nsIParentChannel.h"
 #include "mozilla/Preferences.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsISecureBrowserUI.h"
@@ -214,6 +215,16 @@
     return NS_ERROR_FAILURE;
   }
 
+  // If we are in the parent process in e10s, we don't have access to the
+  // document node, and hence ShouldLoad will fail when we try to get
+  // the docShell.  If that's the case, ignore mixed content checks
+  // on redirects in the parent.  Let the child check for mixed content.
+  nsCOMPtr<nsIParentChannel> is_ipc_channel;
+  NS_QueryNotificationCallbacks(aNewChannel, is_ipc_channel);
+  if (is_ipc_channel) {
+    return NS_OK;
+  }
+
   nsresult rv;
   nsCOMPtr<nsIURI> oldUri;
   rv = aOldChannel->GetURI(getter_AddRefs(oldUri));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/smil/nsSMILAnimationController.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/smil/nsSMILAnimationController.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/smil/nsSMILAnimationController.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/smil/nsSMILAnimationController.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -832,7 +832,7 @@
   // Element::GetSMILOverrideStyleRule (via nsSMILCSSProperty objects),
   // and mIsCSS false means the rules are nsSMILMappedAttribute objects
   // returned from nsSVGElement::GetAnimatedContentStyleRule.
-  nsRestyleHint rshint = key.mIsCSS ? eRestyle_StyleAttribute
+  nsRestyleHint rshint = key.mIsCSS ? eRestyle_StyleAttribute_Animations
                                     : eRestyle_SVGAttrAnimations;
   restyleTracker->AddPendingRestyle(key.mElement, rshint, nsChangeHint(0));
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/svg/SVGPathData.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/svg/SVGPathData.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/svg/SVGPathData.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/svg/SVGPathData.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -537,9 +537,9 @@
 }
 
 static float
-AngleOfVectorF(const Point& aVector)
+AngleOfVector(const Point& cp1, const Point& cp2)
 {
-  return static_cast<float>(AngleOfVector(aVector));
+  return static_cast<float>(AngleOfVector(cp1 - cp2));
 }
 
 void
@@ -573,7 +573,7 @@
     {
     case PATHSEG_CLOSEPATH:
       segEnd = pathStart;
-      segStartAngle = segEndAngle = AngleOfVectorF(segEnd - segStart);
+      segStartAngle = segEndAngle = AngleOfVector(segEnd, segStart);
       break;
 
     case PATHSEG_MOVETO_ABS:
@@ -586,7 +586,7 @@
       pathStart = segEnd;
       // If authors are going to specify multiple consecutive moveto commands
       // with markers, me might as well make the angle do something useful:
-      segStartAngle = segEndAngle = AngleOfVectorF(segEnd - segStart);
+      segStartAngle = segEndAngle = AngleOfVector(segEnd, segStart);
       i += 2;
       break;
 
@@ -597,7 +597,7 @@
       } else {
         segEnd = segStart + Point(mData[i], mData[i+1]);
       }
-      segStartAngle = segEndAngle = AngleOfVectorF(segEnd - segStart);
+      segStartAngle = segEndAngle = AngleOfVector(segEnd, segStart);
       i += 2;
       break;
 
@@ -615,14 +615,10 @@
         segEnd = segStart + Point(mData[i+4], mData[i+5]);
       }
       prevCP = cp2;
-      if (cp1 == segStart) {
-        cp1 = cp2;
-      }
-      if (cp2 == segEnd) {
-        cp2 = cp1;
-      }
-      segStartAngle = AngleOfVectorF(cp1 - segStart);
-      segEndAngle = AngleOfVectorF(segEnd - cp2);
+      segStartAngle =
+        AngleOfVector(cp1 == segStart ? (cp1 == cp2 ? segEnd : cp2) : cp1, segStart);
+      segEndAngle =
+        AngleOfVector(segEnd, cp2 == segEnd ? (cp1 == cp2 ? segStart : cp1) : cp2);
       i += 6;
       break;
     }
@@ -630,7 +626,7 @@
     case PATHSEG_CURVETO_QUADRATIC_ABS:
     case PATHSEG_CURVETO_QUADRATIC_REL:
     {
-      Point cp1, cp2; // control points
+      Point cp1; // control point
       if (segType == PATHSEG_CURVETO_QUADRATIC_ABS) {
         cp1 = Point(mData[i], mData[i+1]);
         segEnd = Point(mData[i+2], mData[i+3]);
@@ -639,8 +635,8 @@
         segEnd = segStart + Point(mData[i+2], mData[i+3]);
       }
       prevCP = cp1;
-      segStartAngle = AngleOfVectorF(cp1 - segStart);
-      segEndAngle = AngleOfVectorF(segEnd - cp1);
+      segStartAngle = AngleOfVector(cp1 == segStart ? segEnd : cp1, segStart);
+      segEndAngle = AngleOfVector(segEnd, cp1 == segEnd ? segStart : cp1);
       i += 4;
       break;
     }
@@ -680,7 +676,7 @@
 
       if (rx == 0.0 || ry == 0.0) {
         // F.6.6 step 1 - straight line or coincidental points
-        segStartAngle = segEndAngle = AngleOfVectorF(segEnd - segStart);
+        segStartAngle = segEndAngle = AngleOfVector(segEnd, segStart);
         i += 7;
         break;
       }
@@ -755,7 +751,7 @@
       } else {
         segEnd = segStart + Point(mData[i++], 0.0f);
       }
-      segStartAngle = segEndAngle = AngleOfVectorF(segEnd - segStart);
+      segStartAngle = segEndAngle = AngleOfVector(segEnd, segStart);
       break;
 
     case PATHSEG_LINETO_VERTICAL_ABS:
@@ -765,7 +761,7 @@
       } else {
         segEnd = segStart + Point(0.0f, mData[i++]);
       }
-      segStartAngle = segEndAngle = AngleOfVectorF(segEnd - segStart);
+      segStartAngle = segEndAngle = AngleOfVector(segEnd, segStart);
       break;
 
     case PATHSEG_CURVETO_CUBIC_SMOOTH_ABS:
@@ -782,14 +778,10 @@
         segEnd = segStart + Point(mData[i+2], mData[i+3]);
       }
       prevCP = cp2;
-      if (cp1 == segStart) {
-        cp1 = cp2;
-      }
-      if (cp2 == segEnd) {
-        cp2 = cp1;
-      }
-      segStartAngle = AngleOfVectorF(cp1 - segStart);
-      segEndAngle = AngleOfVectorF(segEnd - cp2);
+      segStartAngle =
+        AngleOfVector(cp1 == segStart ? (cp1 == cp2 ? segEnd : cp2) : cp1, segStart);
+      segEndAngle =
+        AngleOfVector(segEnd, cp2 == segEnd ? (cp1 == cp2 ? segStart : cp1) : cp2);
       i += 4;
       break;
     }
@@ -799,15 +791,14 @@
     {
       Point cp1 = SVGPathSegUtils::IsQuadraticType(prevSegType) ?
                        segStart * 2 - prevCP : segStart;
-      Point cp2;
       if (segType == PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS) {
         segEnd = Point(mData[i], mData[i+1]);
       } else {
         segEnd = segStart + Point(mData[i], mData[i+1]);
       }
       prevCP = cp1;
-      segStartAngle = AngleOfVectorF(cp1 - segStart);
-      segEndAngle = AngleOfVectorF(segEnd - cp1);
+      segStartAngle = AngleOfVector(cp1 == segStart ? segEnd : cp1, segStart);
+      segEndAngle = AngleOfVector(segEnd, cp1 == segEnd ? segStart : cp1);
       i += 2;
       break;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/RadioInterfaceLayer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/RadioInterfaceLayer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/RadioInterfaceLayer.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/RadioInterfaceLayer.js	2015-02-28 15:03:09.000000000 +0000
@@ -482,18 +482,6 @@
       return false;
     },
 
-    _isValidStateForSetRadioEnabled: function(radioState) {
-      return radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED ||
-             radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED;
-    },
-
-    _isDummyForSetRadioEnabled: function(radioState, data) {
-      return (radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED &&
-              data.enabled) ||
-             (radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED &&
-              !data.enabled);
-    },
-
     _handleMessage: function(message) {
       if (DEBUG) debug("RadioControl: handleMessage: " + JSON.stringify(message));
       let clientId = message.clientId || 0;
@@ -501,19 +489,6 @@
         gMobileConnectionService.getItemByServiceId(clientId);
       let radioState = connection && connection.radioState;
 
-      if (!this._isValidStateForSetRadioEnabled(radioState)) {
-        message.data.errorMsg = "InvalidStateError";
-        message.callback(message.data);
-        this._processNextMessage();
-        return;
-      }
-
-      if (this._isDummyForSetRadioEnabled(radioState, message.data)) {
-        message.callback(message.data);
-        this._processNextMessage();
-        return;
-      }
-
       if (message.data.enabled) {
         if (this._isRadioAbleToEnableAtClient(clientId)) {
           this._setRadioEnabledInternal(message);
@@ -563,19 +538,15 @@
       let enabled = message.data.enabled || false;
       let radioInterface = _ril.getRadioInterface(clientId);
 
-      this.notifyRadioStateChanged(clientId,
-                                   enabled ? Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLING
-                                           : Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLING);
       radioInterface.workerMessenger.send("setRadioEnabled", message.data,
                                           (function(response) {
         if (response.errorMsg) {
-          // Request fails. Rollback to the original radioState.
+          // If request fails, set current radio state to unknown, since we will
+          // handle it in |mobileConnectionService|.
           this.notifyRadioStateChanged(clientId,
-                                       enabled ? Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED
-                                               : Ci.nsIMobileConnection.MOBILE_RADIO_STATE_ENABLED);
+                                       Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN);
         }
-        message.callback(response);
-        return false;
+        return message.callback(response);
       }).bind(this));
     },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/ril_consts.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/ril_consts.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/ril_consts.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/ril_consts.js	2015-02-28 15:03:09.000000000 +0000
@@ -2590,10 +2590,8 @@
 
 // See nsIMobileConnection::MOBILE_RADIO_STATE_*
 this.GECKO_RADIOSTATE_UNKNOWN   = -1;
-this.GECKO_RADIOSTATE_ENABLING  = 0;
-this.GECKO_RADIOSTATE_ENABLED   = 1;
-this.GECKO_RADIOSTATE_DISABLING = 2;
-this.GECKO_RADIOSTATE_DISABLED  = 3;
+this.GECKO_RADIOSTATE_ENABLED   = 0;
+this.GECKO_RADIOSTATE_DISABLED  = 1;
 
 // Only used in ril_worker.js
 this.GECKO_CARDSTATE_UNINITIALIZED = 4294967294; // UINT32_MAX - 1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/ril_worker.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/ril_worker.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/ril_worker.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/ril_worker.js	2015-02-28 15:03:09.000000000 +0000
@@ -6462,12 +6462,15 @@
 RilObject.prototype[UNSOLICITED_RESPONSE_RADIO_STATE_CHANGED] = function UNSOLICITED_RESPONSE_RADIO_STATE_CHANGED() {
   let radioState = this.context.Buf.readInt32();
   let newState;
-  if (radioState == RADIO_STATE_UNAVAILABLE) {
-    newState = GECKO_RADIOSTATE_UNKNOWN;
-  } else if (radioState == RADIO_STATE_OFF) {
-    newState = GECKO_RADIOSTATE_DISABLED;
-  } else {
-    newState = GECKO_RADIOSTATE_ENABLED;
+  switch (radioState) {
+    case RADIO_STATE_UNAVAILABLE:
+      newState = GECKO_RADIOSTATE_UNKNOWN;
+      break;
+    case RADIO_STATE_OFF:
+      newState = GECKO_RADIOSTATE_DISABLED;
+      break;
+    default:
+      newState = GECKO_RADIOSTATE_ENABLED;
   }
 
   if (DEBUG) {
@@ -6479,27 +6482,27 @@
   }
 
   switch (radioState) {
-  case RADIO_STATE_SIM_READY:
-  case RADIO_STATE_SIM_NOT_READY:
-  case RADIO_STATE_SIM_LOCKED_OR_ABSENT:
-    this._isCdma = false;
-    this._waitingRadioTech = false;
-    break;
-  case RADIO_STATE_RUIM_READY:
-  case RADIO_STATE_RUIM_NOT_READY:
-  case RADIO_STATE_RUIM_LOCKED_OR_ABSENT:
-  case RADIO_STATE_NV_READY:
-  case RADIO_STATE_NV_NOT_READY:
-    this._isCdma = true;
-    this._waitingRadioTech = false;
-    break;
-  case RADIO_STATE_ON: // RIL v7
-    // This value is defined in RIL v7, we will retrieve radio tech by another
-    // request. We leave _isCdma untouched, and it will be set once we get the
-    // radio technology.
-    this._waitingRadioTech = true;
-    this.getVoiceRadioTechnology();
-    break;
+    case RADIO_STATE_SIM_READY:
+    case RADIO_STATE_SIM_NOT_READY:
+    case RADIO_STATE_SIM_LOCKED_OR_ABSENT:
+      this._isCdma = false;
+      this._waitingRadioTech = false;
+      break;
+    case RADIO_STATE_RUIM_READY:
+    case RADIO_STATE_RUIM_NOT_READY:
+    case RADIO_STATE_RUIM_LOCKED_OR_ABSENT:
+    case RADIO_STATE_NV_READY:
+    case RADIO_STATE_NV_NOT_READY:
+      this._isCdma = true;
+      this._waitingRadioTech = false;
+      break;
+    case RADIO_STATE_ON: // RIL v7
+      // This value is defined in RIL v7, we will retrieve radio tech by another
+      // request. We leave _isCdma untouched, and it will be set once we get the
+      // radio technology.
+      this._waitingRadioTech = true;
+      this.getVoiceRadioTechnology();
+      break;
   }
 
   if ((this.radioState == GECKO_RADIOSTATE_UNKNOWN ||
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/header_helpers.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/header_helpers.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/header_helpers.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/header_helpers.js	2015-02-28 15:03:09.000000000 +0000
@@ -191,36 +191,3 @@
 
   return bytes;
 }
-
-/**
- * Test whether specified function throws exception with expected
- * result.
- *
- * @param func
- *        Function to be tested.
- * @param message
- *        Message of expected exception. <code>null</code> for no throws.
- * @param stack
- *        Optional stack object to be printed. <code>null</code> for
- *        Components#stack#caller.
- */
-function do_check_throws(func, message, stack)
-{
-  if (!stack)
-    stack = Components.stack.caller;
-
-  try {
-    func();
-  } catch (exc) {
-    if (exc.message === message) {
-      return;
-    }
-    do_throw("expecting exception '" + message
-             + "', caught '" + exc.message + "'", stack);
-  }
-
-  if (message) {
-    do_throw("expecting exception '" + message + "', none thrown", stack);
-  }
-}
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_barring_password.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_barring_password.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_barring_password.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_barring_password.js	2015-02-28 15:03:09.000000000 +0000
@@ -18,16 +18,16 @@
   function do_test(facility, pin, newPin) {
     buf.sendParcel = function fakeSendParcel () {
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_CHANGE_BARRING_PASSWORD);
+      equal(this.readInt32(), REQUEST_CHANGE_BARRING_PASSWORD);
 
       // Token : we don't care.
       this.readInt32();
 
       let parcel = this.readStringList();
-      do_check_eq(parcel.length, 3);
-      do_check_eq(parcel[0], facility);
-      do_check_eq(parcel[1], pin);
-      do_check_eq(parcel[2], newPin);
+      equal(parcel.length, 3);
+      equal(parcel[0], facility);
+      equal(parcel[1], pin);
+      equal(parcel[2], newPin);
     };
 
     let options = {facility: facility, pin: pin, newPin: newPin};
@@ -43,9 +43,9 @@
   let barringPasswordOptions;
   let worker = newWorker({
     postMessage: function(message) {
-      do_check_eq(barringPasswordOptions.pin, PIN);
-      do_check_eq(barringPasswordOptions.newPin, NEW_PIN);
-      do_check_eq(message.errorMsg, GECKO_ERROR_SUCCESS);
+      equal(barringPasswordOptions.pin, PIN);
+      equal(barringPasswordOptions.newPin, NEW_PIN);
+      equal(message.errorMsg, GECKO_ERROR_SUCCESS);
     }
   });
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_buf.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_buf.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_buf.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_buf.js	2015-02-28 15:03:09.000000000 +0000
@@ -50,10 +50,12 @@
 add_test_incoming_parcel(null,
   function test_normal_parcel_handling() {
     let self = this;
-    do_check_throws(function normal_handler() {
+    try {
       // reads exactly the same size, should not throw anything.
       self.context.Buf.readInt32();
-    });
+    } catch (e) {
+      ok(false, "Got exception: " + e);
+    }
   }
 );
 
@@ -61,10 +63,12 @@
 add_test_incoming_parcel(null,
   function test_parcel_under_read() {
     let self = this;
-    do_check_throws(function under_read_handler() {
+    try {
       // reads less than parcel size, should not throw.
       self.context.Buf.readUint16();
-    });
+    } catch (e) {
+      ok(false, "Got exception: " + e);
+    }
   }
 );
 
@@ -78,7 +82,7 @@
       buf.readUint8();
     }
 
-    do_check_throws(function over_read_handler() {
+    throws(function over_read_handler() {
       // reads more than parcel size, should throw an error.
       buf.readUint8();
     },"Trying to read data beyond the parcel end!");
@@ -133,14 +137,14 @@
   let p1 = pA.subarray(0, pA.length - 1);
   worker.onRILMessage(0, p1);
   // The parcel should not have been processed.
-  do_check_eq(buf.readAvailable, 0);
+  equal(buf.readAvailable, 0);
   // buf.currentParcelSize should have been set because incoming data has more
   // than 4 octets.
-  do_check_eq(buf.currentParcelSize, pA_parcelSize);
+  equal(buf.currentParcelSize, pA_parcelSize);
   // buf.readIncoming should contains remaining unconsumed octets count.
-  do_check_eq(buf.readIncoming, p1.length - buf.PARCEL_SIZE_SIZE);
+  equal(buf.readIncoming, p1.length - buf.PARCEL_SIZE_SIZE);
   // buf.incomingWriteIndex should be ready to accept the last octet.
-  do_check_eq(buf.incomingWriteIndex, p1.length);
+  equal(buf.incomingWriteIndex, p1.length);
 
   // Second, send the last octet of pA and whole pB. The Buf should now expand
   // to cover both pA & pB.
@@ -149,13 +153,13 @@
   p2.set(pB, 1);
   worker.onRILMessage(0, p2);
   // The parcels should have been both consumed.
-  do_check_eq(buf.readAvailable, 0);
+  equal(buf.readAvailable, 0);
   // No parcel data remains.
-  do_check_eq(buf.currentParcelSize, 0);
+  equal(buf.currentParcelSize, 0);
   // No parcel data remains.
-  do_check_eq(buf.readIncoming, 0);
+  equal(buf.readIncoming, 0);
   // The Buf should now expand to cover both pA & pB.
-  do_check_eq(buf.incomingWriteIndex, pA.length + pB.length);
+  equal(buf.incomingWriteIndex, pA.length + pB.length);
 
   // end of incoming parcel's trip, let's do next test.
   run_next_test();
@@ -167,15 +171,15 @@
     let buf = this.context.Buf;
 
     let u8array = buf.readUint8Array(1);
-    do_check_eq(u8array instanceof Uint8Array, true);
-    do_check_eq(u8array.length, 1);
-    do_check_eq(buf.readAvailable, 3);
+    equal(u8array instanceof Uint8Array, true);
+    equal(u8array.length, 1);
+    equal(buf.readAvailable, 3);
 
     u8array = buf.readUint8Array(2);
-    do_check_eq(u8array.length, 2);
-    do_check_eq(buf.readAvailable, 1);
+    equal(u8array.length, 2);
+    equal(buf.readAvailable, 1);
 
-    do_check_throws(function over_read_handler() {
+    throws(function over_read_handler() {
       // reads more than parcel size, should throw an error.
       u8array = buf.readUint8Array(2);
     }, "Trying to read data beyond the parcel end!");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cdma_info_rec.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cdma_info_rec.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cdma_info_rec.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cdma_info_rec.js	2015-02-28 15:03:09.000000000 +0000
@@ -59,7 +59,7 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].display, "Test Info");
+  equal(records[0].display, "Test Info");
 
   run_next_test();
 });
@@ -79,7 +79,7 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].display, "Test Extended Info");
+  equal(records[0].display, "Test Extended Info");
 
   run_next_test();
 });
@@ -102,8 +102,8 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].display, "Test Info 1");
-  do_check_eq(records[1].display, "Test Info 2");
+  equal(records[0].display, "Test Info 1");
+  equal(records[1].display, "Test Info 2");
 
   run_next_test();
 });
@@ -126,8 +126,8 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].display, "Test Info 1");
-  do_check_eq(records[1].display, "Test Info 2");
+  equal(records[0].display, "Test Info 1");
+  equal(records[1].display, "Test Info 2");
 
   run_next_test();
 });
@@ -147,9 +147,9 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].signal.type, 0x00);
-  do_check_eq(records[0].signal.alertPitch, 0x01);
-  do_check_eq(records[0].signal.signal, 0x03);
+  equal(records[0].signal.type, 0x00);
+  equal(records[0].signal.alertPitch, 0x01);
+  equal(records[0].signal.signal, 0x03);
 
   run_next_test();
 });
@@ -169,7 +169,7 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records.length, 0);
+  equal(records.length, 0);
 
   run_next_test();
 });
@@ -189,10 +189,10 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].lineControl.polarityIncluded, 1);
-  do_check_eq(records[0].lineControl.toggle, 0);
-  do_check_eq(records[0].lineControl.reverse, 1);
-  do_check_eq(records[0].lineControl.powerDenial, 255);
+  equal(records[0].lineControl.polarityIncluded, 1);
+  equal(records[0].lineControl.toggle, 0);
+  equal(records[0].lineControl.reverse, 1);
+  equal(records[0].lineControl.powerDenial, 255);
 
   run_next_test();
 });
@@ -209,7 +209,7 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].clirCause, 1);
+  equal(records[0].clirCause, 1);
 
   run_next_test();
 });
@@ -227,8 +227,8 @@
   let helper = context.CdmaPDUHelper;
   let records = helper.decodeInformationRecord();
 
-  do_check_eq(records[0].audioControl.upLink, 1);
-  do_check_eq(records[0].audioControl.downLink, 255);
+  equal(records[0].audioControl.upLink, 1);
+  equal(records[0].audioControl.downLink, 255);
 
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast_config.js	2015-02-28 15:03:09.000000000 +0000
@@ -36,8 +36,8 @@
     setup(isCdma);
     context.RIL.setCellBroadcastDisabled({disabled: true});
     // Makesure that request parcel is sent out.
-    do_check_neq(parcelTypes.indexOf(expectedRequest), -1);
-    do_check_eq(context.RIL.cellBroadcastDisabled, true);
+    notEqual(parcelTypes.indexOf(expectedRequest), -1);
+    equal(context.RIL.cellBroadcastDisabled, true);
   }
 
   test(false, REQUEST_GSM_SMS_BROADCAST_ACTIVATION);
@@ -81,14 +81,14 @@
 
       found = true;
       // Check parcel. Data start from 4th word (32bit)
-      do_check_eq(u32Parcel.slice(3).toString(), expected);
+      equal(u32Parcel.slice(3).toString(), expected);
     };
 
     context.RIL._isCdma = isCdma;
     context.RIL.setSmsBroadcastConfig(configs);
 
     // Makesure that request parcel is sent out.
-    do_check_true(found);
+    ok(found);
   }
 
   // (GSM) RIL writes the following data to outgoing parcel:
@@ -121,7 +121,7 @@
     context.RIL._isCdma = isCdma;
     context.RIL.cellBroadcastConfigs = configs;
     context.RIL._mergeAllCellBroadcastConfigs();
-    do_check_eq(context.RIL.mergedCellBroadcastConfig.toString(), expected);
+    equal(context.RIL.mergedCellBroadcastConfig.toString(), expected);
   }
 
   let configs = {
@@ -155,8 +155,8 @@
     let options = { searchList: aSearchList };
     context.RIL.setCellBroadcastSearchList(options);
     // Enforce the MMI result to string for comparison.
-    do_check_eq("" + context.RIL.cellBroadcastConfigs.MMI, aExpected);
-    do_check_eq(options.success, true);
+    equal("" + context.RIL.cellBroadcastConfigs.MMI, aExpected);
+    equal(options.success, true);
   }
 
   let searchListStr = "1,2,3,4";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cellbroadcast.js	2015-02-28 15:03:09.000000000 +0000
@@ -34,15 +34,15 @@
 
 add_test(function test_ril_consts_cellbroadcast_misc() {
   // Must be 16 for indexing.
-  do_check_eq(CB_DCS_LANG_GROUP_1.length, 16);
-  do_check_eq(CB_DCS_LANG_GROUP_2.length, 16);
+  equal(CB_DCS_LANG_GROUP_1.length, 16);
+  equal(CB_DCS_LANG_GROUP_2.length, 16);
 
   // Array length must be even.
-  do_check_eq(CB_NON_MMI_SETTABLE_RANGES.length & 0x01, 0);
+  equal(CB_NON_MMI_SETTABLE_RANGES.length & 0x01, 0);
   for (let i = 0; i < CB_NON_MMI_SETTABLE_RANGES.length;) {
     let from = CB_NON_MMI_SETTABLE_RANGES[i++];
     let to = CB_NON_MMI_SETTABLE_RANGES[i++];
-    do_check_eq(from < to, true);
+    equal(from < to, true);
   }
 
   run_next_test();
@@ -67,11 +67,11 @@
     let msg = {};
     context.GsmPDUHelper.readCbDataCodingScheme(msg);
 
-    do_check_eq(msg.dcs, dcs);
-    do_check_eq(msg.encoding, encoding);
-    do_check_eq(msg.language, language);
-    do_check_eq(msg.hasLanguageIndicator, hasLanguageIndicator);
-    do_check_eq(msg.messageClass, messageClass);
+    equal(msg.dcs, dcs);
+    equal(msg.encoding, encoding);
+    equal(msg.language, language);
+    equal(msg.hasLanguageIndicator, hasLanguageIndicator);
+    equal(msg.messageClass, messageClass);
   }
 
   function test_dcs_throws(dcs) {
@@ -79,7 +79,7 @@
       return dcs;
     };
 
-    do_check_throws(function() {
+    throws(function() {
       context.GsmPDUHelper.readCbDataCodingScheme({});
     }, "Unsupported CBS data coding scheme: " + dcs);
   }
@@ -189,15 +189,15 @@
     };
     context.GsmPDUHelper.readGsmCbData(msg, options[3].length);
 
-    do_check_eq(msg.body, expected[0]);
-    do_check_eq(msg.data == null, expected[1] == null);
+    equal(msg.body, expected[0]);
+    equal(msg.data == null, expected[1] == null);
     if (expected[1] != null) {
-      do_check_eq(msg.data.length, expected[1].length);
+      equal(msg.data.length, expected[1].length);
       for (let i = 0; i < expected[1].length; i++) {
-        do_check_eq(msg.data[i], expected[1][i]);
+        equal(msg.data[i], expected[1][i]);
       }
     }
-    do_check_eq(msg.language, expected[2]);
+    equal(msg.language, expected[2]);
   }
 
   // We're testing Cell Broadcast message body with all zeros octet stream. As
@@ -249,7 +249,7 @@
   let ril = context.RIL;
 
   function test(from, to, expected) {
-    do_check_eq(expected, ril._checkCellBroadcastMMISettable(from, to));
+    equal(expected, ril._checkCellBroadcastMMISettable(from, to));
   }
 
   test(-2, -1, false);
@@ -301,7 +301,7 @@
 
   function test(olist, from, to, expected) {
     let result = ril._mergeCellBroadcastConfigs(olist, from, to);
-    do_check_eq(JSON.stringify(expected), JSON.stringify(result));
+    equal(JSON.stringify(expected), JSON.stringify(result));
   }
 
   test(null, 0, 1, [0, 1]);
@@ -488,8 +488,8 @@
                            hexStringToParcelByteArrayData(pdu)));
 
     let postedMessage = workerHelper.postedMessage;
-    do_check_eq("cellbroadcast-received", postedMessage.rilMessageType);
-    do_check_eq(postedMessage.fullBody.length,
+    equal("cellbroadcast-received", postedMessage.rilMessageType);
+    equal(postedMessage.fullBody.length,
                 aNumOfPages * CB_MAX_CONTENT_PER_PAGE_7BIT);
   }
 
@@ -534,11 +534,11 @@
                            hexStringToParcelByteArrayData(pdu)));
 
     let postedMessage = workerHelper.postedMessage;
-    do_check_eq("cellbroadcast-received", postedMessage.rilMessageType);
-    do_check_eq(postedMessage.fullData.length,
+    equal("cellbroadcast-received", postedMessage.rilMessageType);
+    equal(postedMessage.fullData.length,
                 aNumOfPages * CB_UMTS_MESSAGE_PAGE_SIZE);
     for (let i = 0; i < postedMessage.fullData.length; i++) {
-      do_check_eq(postedMessage.fullData[i], 255);
+      equal(postedMessage.fullData[i], 255);
     }
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cf.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cf.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cf.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cf.js	2015-02-28 15:03:09.000000000 +0000
@@ -23,7 +23,7 @@
 add_test(function test_toaFromString_empty() {
   let retval = toaFromString("");
 
-  do_check_eq(retval, TOA_UNKNOWN);
+  equal(retval, TOA_UNKNOWN);
 
   run_next_test();
 });
@@ -31,7 +31,7 @@
 add_test(function test_toaFromString_undefined() {
   let retval = toaFromString();
 
-  do_check_eq(retval, TOA_UNKNOWN);
+  equal(retval, TOA_UNKNOWN);
 
   run_next_test();
 });
@@ -39,7 +39,7 @@
 add_test(function test_toaFromString_unknown() {
   let retval = toaFromString("666222333");
 
-  do_check_eq(retval, TOA_UNKNOWN);
+  equal(retval, TOA_UNKNOWN);
 
   run_next_test();
 });
@@ -47,7 +47,7 @@
 add_test(function test_toaFromString_international() {
   let retval = toaFromString("+34666222333");
 
-  do_check_eq(retval, TOA_INTERNATIONAL);
+  equal(retval, TOA_INTERNATIONAL);
 
   run_next_test();
 });
@@ -73,8 +73,8 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
+  equal(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -122,13 +122,13 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
-  do_check_true(Array.isArray(postedMessage.rules));
+  equal(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
+  ok(Array.isArray(postedMessage.rules));
   do_print(postedMessage.rules.length);
-  do_check_eq(postedMessage.rules.length, 1);
-  do_check_true(postedMessage.rules[0].active);
-  do_check_eq(postedMessage.rules[0].reason, CALL_FORWARD_REASON_UNCONDITIONAL);
-  do_check_eq(postedMessage.rules[0].number, "+34666222333");
+  equal(postedMessage.rules.length, 1);
+  ok(postedMessage.rules[0].active);
+  equal(postedMessage.rules[0].reason, CALL_FORWARD_REASON_UNCONDITIONAL);
+  equal(postedMessage.rules[0].number, "+34666222333");
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_clip.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_clip.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_clip.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_clip.js	2015-02-28 15:03:09.000000000 +0000
@@ -30,9 +30,9 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
-  do_check_eq(postedMessage.provisioned, 1);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
+  equal(postedMessage.provisioned, 1);
   run_next_test();
 });
 
@@ -59,7 +59,7 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, "GenericFailure");
-  do_check_false(postedMessage.success);
+  equal(postedMessage.errorMsg, "GenericFailure");
+  ok(!postedMessage.success);
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_clir.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_clir.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_clir.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_clir.js	2015-02-28 15:03:09.000000000 +0000
@@ -34,8 +34,8 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -58,8 +58,8 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, "GenericFailure");
-  do_check_false(postedMessage.success);
+  equal(postedMessage.errorMsg, "GenericFailure");
+  ok(!postedMessage.success);
 
   run_next_test();
 });
@@ -90,10 +90,10 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
-  do_check_eq(postedMessage.n, 0);
-  do_check_eq(postedMessage.m, 1);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
+  equal(postedMessage.n, 0);
+  equal(postedMessage.m, 1);
   run_next_test();
 });
 
@@ -123,7 +123,7 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, "GenericFailure");
-  do_check_false(postedMessage.success);
+  equal(postedMessage.errorMsg, "GenericFailure");
+  ok(!postedMessage.success);
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cw.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cw.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_cw.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_cw.js	2015-02-28 15:03:09.000000000 +0000
@@ -24,8 +24,8 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -47,8 +47,8 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, "GenericFailure");
-  do_check_false(postedMessage.success);
+  equal(postedMessage.errorMsg, "GenericFailure");
+  ok(!postedMessage.success);
 
   run_next_test();
 });
@@ -77,10 +77,10 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
-  do_check_eq(postedMessage.length, 1);
-  do_check_true(postedMessage.enabled);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
+  equal(postedMessage.length, 1);
+  ok(postedMessage.enabled);
   run_next_test();
 });
 
@@ -108,9 +108,9 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
-  do_check_eq(postedMessage.length, 1);
-  do_check_false(postedMessage.enabled);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
+  equal(postedMessage.length, 1);
+  ok(!postedMessage.enabled);
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_ecm.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_ecm.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_ecm.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_ecm.js	2015-02-28 15:03:09.000000000 +0000
@@ -17,17 +17,17 @@
 function setTimeout(callback, timeoutMs) {
   timeoutCallback = callback;
   timeoutDelayMs = timeoutMs;
-  do_check_eq(timeoutMs, TIMEOUT_VALUE);
+  equal(timeoutMs, TIMEOUT_VALUE);
   return TIMER_ID;
 }
 
 function clearTimeout(timeoutId) {
-  do_check_eq(timeoutId, TIMER_ID);
+  equal(timeoutId, TIMER_ID);
   timeoutCallback = null;
 }
 
 function fireTimeout() {
-  do_check_neq(timeoutCallback, null);
+  notEqual(timeoutCallback, null);
   if (timeoutCallback) {
     timeoutCallback();
     timeoutCallback = null;
@@ -45,15 +45,15 @@
     let postedMessage = workerHelper.postedMessage;
 
     // Should store the mode.
-    do_check_eq(context.RIL._isInEmergencyCbMode, true);
+    equal(context.RIL._isInEmergencyCbMode, true);
 
     // Should notify change.
-    do_check_eq(postedMessage.rilMessageType, "emergencyCbModeChange");
-    do_check_eq(postedMessage.active, true);
-    do_check_eq(postedMessage.timeoutMs, TIMEOUT_VALUE);
+    equal(postedMessage.rilMessageType, "emergencyCbModeChange");
+    equal(postedMessage.active, true);
+    equal(postedMessage.timeoutMs, TIMEOUT_VALUE);
 
     // Should start timer.
-    do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
+    equal(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
   }
 
   run_next_test();
@@ -69,14 +69,14 @@
   let postedMessage = workerHelper.postedMessage;
 
   // Should store the mode.
-  do_check_eq(context.RIL._isInEmergencyCbMode, false);
+  equal(context.RIL._isInEmergencyCbMode, false);
 
   // Should notify change.
-  do_check_eq(postedMessage.rilMessageType, "emergencyCbModeChange");
-  do_check_eq(postedMessage.active, false);
+  equal(postedMessage.rilMessageType, "emergencyCbModeChange");
+  equal(postedMessage.active, false);
 
   // Should clear timer.
-  do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, null);
+  equal(context.RIL._exitEmergencyCbModeTimeoutID, null);
 
   run_next_test();
 });
@@ -87,8 +87,8 @@
   let context = worker.ContextPool._contexts[0];
 
   context.RIL[UNSOLICITED_ENTER_EMERGENCY_CALLBACK_MODE]();
-  do_check_eq(context.RIL._isInEmergencyCbMode, true);
-  do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
+  equal(context.RIL._isInEmergencyCbMode, true);
+  equal(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
 
   let parcelTypes = [];
   context.Buf.newParcel = function(type, options) {
@@ -99,10 +99,10 @@
   fireTimeout();
 
   // Should clear timeout event.
-  do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, null);
+  equal(context.RIL._exitEmergencyCbModeTimeoutID, null);
 
   // Check indeed sent out REQUEST_EXIT_EMERGENCY_CALLBACK_MODE.
-  do_check_neq(parcelTypes.indexOf(REQUEST_EXIT_EMERGENCY_CALLBACK_MODE), -1);
+  notEqual(parcelTypes.indexOf(REQUEST_EXIT_EMERGENCY_CALLBACK_MODE), -1);
 
   run_next_test();
 });
@@ -113,8 +113,8 @@
   let context = worker.ContextPool._contexts[0];
 
   context.RIL[UNSOLICITED_ENTER_EMERGENCY_CALLBACK_MODE]();
-  do_check_eq(context.RIL._isInEmergencyCbMode, true);
-  do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
+  equal(context.RIL._isInEmergencyCbMode, true);
+  equal(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
 
   let parcelTypes = [];
   context.Buf.newParcel = function(type, options) {
@@ -127,10 +127,10 @@
                     isDialEmergency: false});
 
   // Should clear timeout event.
-  do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, null);
+  equal(context.RIL._exitEmergencyCbModeTimeoutID, null);
 
   // Check indeed sent out REQUEST_EXIT_EMERGENCY_CALLBACK_MODE.
-  do_check_neq(parcelTypes.indexOf(REQUEST_EXIT_EMERGENCY_CALLBACK_MODE), -1);
+  notEqual(parcelTypes.indexOf(REQUEST_EXIT_EMERGENCY_CALLBACK_MODE), -1);
 
   run_next_test();
 });
@@ -141,8 +141,8 @@
   let context = worker.ContextPool._contexts[0];
 
   context.RIL[UNSOLICITED_ENTER_EMERGENCY_CALLBACK_MODE]();
-  do_check_eq(context.RIL._isInEmergencyCbMode, true);
-  do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
+  equal(context.RIL._isInEmergencyCbMode, true);
+  equal(context.RIL._exitEmergencyCbModeTimeoutID, TIMER_ID);
 
   let parcelTypes = [];
   context.Buf.newParcel = function(type, options) {
@@ -157,13 +157,13 @@
   let postedMessage = workerHelper.postedMessage;
 
   // Should clear timeout event.
-  do_check_eq(context.RIL._exitEmergencyCbModeTimeoutID, null);
+  equal(context.RIL._exitEmergencyCbModeTimeoutID, null);
 
   // Check indeed sent out REQUEST_EXIT_EMERGENCY_CALLBACK_MODE.
-  do_check_neq(parcelTypes.indexOf(REQUEST_EXIT_EMERGENCY_CALLBACK_MODE), -1);
+  notEqual(parcelTypes.indexOf(REQUEST_EXIT_EMERGENCY_CALLBACK_MODE), -1);
 
   // Send back the response.
-  do_check_eq(postedMessage.rilMessageType, "exitEmergencyCbMode");
+  equal(postedMessage.rilMessageType, "exitEmergencyCbMode");
 
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_BerTlvHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_BerTlvHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_BerTlvHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_BerTlvHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -35,13 +35,13 @@
   let berTlv = berHelper.decode(tag_test.length);
   let iter = Iterator(berTlv.value);
   let tlv = berHelper.searchForNextTag(BER_FCP_FILE_DESCRIPTOR_TAG, iter);
-  do_check_eq(tlv.value.fileStructure, UICC_EF_STRUCTURE[EF_STRUCTURE_TRANSPARENT]);
+  equal(tlv.value.fileStructure, UICC_EF_STRUCTURE[EF_STRUCTURE_TRANSPARENT]);
 
   tlv = berHelper.searchForNextTag(BER_FCP_FILE_IDENTIFIER_TAG, iter);
-  do_check_eq(tlv.value.fileId, 0x2FE2);
+  equal(tlv.value.fileId, 0x2FE2);
 
   tlv = berHelper.searchForNextTag(BER_FCP_FILE_SIZE_DATA_TAG, iter);
-  do_check_eq(tlv.value.fileSizeData, 0x0A);
+  equal(tlv.value.fileSizeData, 0x0A);
 
   run_next_test();
 });
@@ -73,15 +73,15 @@
   let berTlv = berHelper.decode(tag_test.length);
   let iter = Iterator(berTlv.value);
   let tlv = berHelper.searchForNextTag(BER_FCP_FILE_DESCRIPTOR_TAG, iter);
-  do_check_eq(tlv.value.fileStructure, UICC_EF_STRUCTURE[EF_STRUCTURE_LINEAR_FIXED]);
-  do_check_eq(tlv.value.recordLength, 0x1A);
-  do_check_eq(tlv.value.numOfRecords, 0x01);
+  equal(tlv.value.fileStructure, UICC_EF_STRUCTURE[EF_STRUCTURE_LINEAR_FIXED]);
+  equal(tlv.value.recordLength, 0x1A);
+  equal(tlv.value.numOfRecords, 0x01);
 
   tlv = berHelper.searchForNextTag(BER_FCP_FILE_IDENTIFIER_TAG, iter);
-  do_check_eq(tlv.value.fileId, 0x6F40);
+  equal(tlv.value.fileId, 0x6F40);
 
   tlv = berHelper.searchForNextTag(BER_FCP_FILE_SIZE_DATA_TAG, iter);
-  do_check_eq(tlv.value.fileSizeData, 0x1A);
+  equal(tlv.value.fileSizeData, 0x1A);
 
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardLock.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardLock.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardLock.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardLock.js	2015-02-28 15:03:09.000000000 +0000
@@ -25,19 +25,19 @@
 
     buf.sendParcel = function fakeSendParcel() {
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_QUERY_FACILITY_LOCK)
+      equal(this.readInt32(), REQUEST_QUERY_FACILITY_LOCK)
 
       // Token : we don't care.
       this.readInt32();
 
       // Data
       let parcel = this.readStringList();
-      do_check_eq(parcel.length, ril.v5Legacy ? 3 : 4);
-      do_check_eq(parcel[0], GECKO_CARDLOCK_TO_FACILITY[aLock]);
-      do_check_eq(parcel[1], "");
-      do_check_eq(parcel[2], serviceClass.toString());
+      equal(parcel.length, ril.v5Legacy ? 3 : 4);
+      equal(parcel[0], GECKO_CARDLOCK_TO_FACILITY[aLock]);
+      equal(parcel[1], "");
+      equal(parcel[2], serviceClass.toString());
       if (!ril.v5Legacy) {
-        do_check_eq(parcel[3], ril.aid);
+        equal(parcel[3], ril.aid);
       }
     };
 
@@ -64,16 +64,16 @@
 
   // Test SIM
   RIL.appType = CARD_APPTYPE_SIM;
-  do_check_eq(ICCFileHelper.getEFPath(ICC_EF_SPDI),
+  equal(ICCFileHelper.getEFPath(ICC_EF_SPDI),
               EF_PATH_MF_SIM + EF_PATH_DF_GSM);
-  do_check_eq(ICCFileHelper.getEFPath(ICC_EF_SPN),
+  equal(ICCFileHelper.getEFPath(ICC_EF_SPN),
               EF_PATH_MF_SIM + EF_PATH_DF_GSM);
 
   // Test USIM
   RIL.appType = CARD_APPTYPE_USIM;
-  do_check_eq(ICCFileHelper.getEFPath(ICC_EF_SPDI),
+  equal(ICCFileHelper.getEFPath(ICC_EF_SPDI),
               EF_PATH_MF_SIM + EF_PATH_ADF_USIM);
-  do_check_eq(ICCFileHelper.getEFPath(ICC_EF_SPDI),
+  equal(ICCFileHelper.getEFPath(ICC_EF_SPDI),
               EF_PATH_MF_SIM + EF_PATH_ADF_USIM);
   run_next_test();
 });
@@ -96,20 +96,20 @@
 
     buf.sendParcel = function fakeSendParcel() {
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_SET_FACILITY_LOCK);
+      equal(this.readInt32(), REQUEST_SET_FACILITY_LOCK);
 
       // Token : we don't care
       this.readInt32();
 
       // Data
       let parcel = this.readStringList();
-      do_check_eq(parcel.length, ril.v5Legacy ? 4 : 5);
-      do_check_eq(parcel[0], GECKO_CARDLOCK_TO_FACILITY[aLock]);
-      do_check_eq(parcel[1], aEnabled ? "1" : "0");
-      do_check_eq(parcel[2], aPassword);
-      do_check_eq(parcel[3], serviceClass.toString());
+      equal(parcel.length, ril.v5Legacy ? 4 : 5);
+      equal(parcel[0], GECKO_CARDLOCK_TO_FACILITY[aLock]);
+      equal(parcel[1], aEnabled ? "1" : "0");
+      equal(parcel[2], aPassword);
+      equal(parcel[3], serviceClass.toString());
       if (!ril.v5Legacy) {
-        do_check_eq(parcel[4], ril.aid);
+        equal(parcel[4], ril.aid);
       }
     };
 
@@ -144,18 +144,18 @@
 
     buf.sendParcel = function fakeSendParcel() {
       // Request Type.
-      do_check_eq(this.readInt32(), GECKO_CARDLOCK_TO_REQUEST[aLock]);
+      equal(this.readInt32(), GECKO_CARDLOCK_TO_REQUEST[aLock]);
 
       // Token : we don't care
       this.readInt32();
 
       // Data
       let parcel = this.readStringList();
-      do_check_eq(parcel.length, ril.v5Legacy ? 2 : 3);
-      do_check_eq(parcel[0], aPassword);
-      do_check_eq(parcel[1], aNewPassword);
+      equal(parcel.length, ril.v5Legacy ? 2 : 3);
+      equal(parcel[0], aPassword);
+      equal(parcel[1], aNewPassword);
       if (!ril.v5Legacy) {
-        do_check_eq(parcel[2], ril.aid);
+        equal(parcel[2], ril.aid);
       }
     };
 
@@ -189,17 +189,17 @@
 
     buf.sendParcel = function fakeSendParcel() {
       // Request Type.
-      do_check_eq(this.readInt32(), GECKO_CARDLOCK_TO_REQUEST[aLock]);
+      equal(this.readInt32(), GECKO_CARDLOCK_TO_REQUEST[aLock]);
 
       // Token : we don't care
       this.readInt32();
 
       // Data
       let parcel = this.readStringList();
-      do_check_eq(parcel.length, ril.v5Legacy ? 1 : 2);
-      do_check_eq(parcel[0], aPassword);
+      equal(parcel.length, ril.v5Legacy ? 1 : 2);
+      equal(parcel[0], aPassword);
       if (!ril.v5Legacy) {
-        do_check_eq(parcel[1], ril.aid);
+        equal(parcel[1], ril.aid);
       }
     };
 
@@ -233,18 +233,18 @@
 
     buf.sendParcel = function fakeSendParcel() {
       // Request Type.
-      do_check_eq(this.readInt32(), GECKO_CARDLOCK_TO_REQUEST[aLock]);
+      equal(this.readInt32(), GECKO_CARDLOCK_TO_REQUEST[aLock]);
 
       // Token : we don't care
       this.readInt32();
 
       // Data
       let parcel = this.readStringList();
-      do_check_eq(parcel.length, ril.v5Legacy ? 2 : 3);
-      do_check_eq(parcel[0], aPassword);
-      do_check_eq(parcel[1], aNewPin);
+      equal(parcel.length, ril.v5Legacy ? 2 : 3);
+      equal(parcel[0], aPassword);
+      equal(parcel[1], aNewPin);
       if (!ril.v5Legacy) {
-        do_check_eq(parcel[2], ril.aid);
+        equal(parcel[2], ril.aid);
       }
     };
 
@@ -273,15 +273,15 @@
   function do_test(aPassword) {
     buf.sendParcel = function fakeSendParcel() {
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_ENTER_NETWORK_DEPERSONALIZATION_CODE);
+      equal(this.readInt32(), REQUEST_ENTER_NETWORK_DEPERSONALIZATION_CODE);
 
       // Token : we don't care
       this.readInt32();
 
       // Data
       let parcel = this.readStringList();
-      do_check_eq(parcel.length, 1);
-      do_check_eq(parcel[0], aPassword);
+      equal(parcel.length, 1);
+      equal(parcel[0], aPassword);
     };
 
     ril.iccUnlockCardLock({
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardState.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardState.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardState.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_CardState.js	2015-02-28 15:03:09.000000000 +0000
@@ -28,7 +28,7 @@
 
     ril._isCdma = isCdma;
     ril._processICCStatus(iccStatus);
-    do_check_eq(ril.cardState, geckoCardState);
+    equal(ril.cardState, geckoCardState);
   }
 
   // Test GSM personalization state.
@@ -117,7 +117,7 @@
     };
 
     ril._processICCStatus(iccStatus);
-    do_check_eq(ril.cardState, geckoCardState);
+    equal(ril.cardState, geckoCardState);
   }
 
   testCardAppState(CARD_APPSTATE_ILLEGAL,
@@ -159,7 +159,7 @@
     };
 
     ril._processICCStatus(iccStatus);
-    do_check_eq(ril.cardState, Ci.nsIIccProvider.CARD_STATE_PERMANENT_BLOCKED);
+    equal(ril.cardState, Ci.nsIIccProvider.CARD_STATE_PERMANENT_BLOCKED);
   }
 
   testPermanentBlocked(1,
@@ -202,9 +202,9 @@
   ril._processICCStatus(iccStatus);
 
   // Should read icc id event if the app index is -1.
-  do_check_eq(ril.iccInfo.iccid, ICCID);
+  equal(ril.iccInfo.iccid, ICCID);
   // cardState is "unknown" if the app index is -1.
-  do_check_eq(ril.cardState, GECKO_CARDSTATE_UNKNOWN);
+  equal(ril.cardState, GECKO_CARDSTATE_UNKNOWN);
 
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_GsmPDUHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_GsmPDUHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_GsmPDUHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_GsmPDUHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -21,13 +21,13 @@
   helper.writeTimestamp(dateInput);
   dateOutput.setTime(helper.readTimestamp());
 
-  do_check_eq(dateInput.getFullYear(), dateOutput.getFullYear());
-  do_check_eq(dateInput.getMonth(), dateOutput.getMonth());
-  do_check_eq(dateInput.getDate(), dateOutput.getDate());
-  do_check_eq(dateInput.getHours(), dateOutput.getHours());
-  do_check_eq(dateInput.getMinutes(), dateOutput.getMinutes());
-  do_check_eq(dateInput.getSeconds(), dateOutput.getSeconds());
-  do_check_eq(dateInput.getTimezoneOffset(), dateOutput.getTimezoneOffset());
+  equal(dateInput.getFullYear(), dateOutput.getFullYear());
+  equal(dateInput.getMonth(), dateOutput.getMonth());
+  equal(dateInput.getDate(), dateOutput.getDate());
+  equal(dateInput.getHours(), dateOutput.getHours());
+  equal(dateInput.getMinutes(), dateOutput.getMinutes());
+  equal(dateInput.getSeconds(), dateOutput.getSeconds());
+  equal(dateInput.getTimezoneOffset(), dateOutput.getTimezoneOffset());
 
   // 2034-01-23 12:34:56 -0800 GMT
   let time = Date.UTC(2034, 1, 23, 12, 34, 56);
@@ -36,13 +36,13 @@
   helper.writeTimestamp(dateInput);
   dateOutput.setTime(helper.readTimestamp());
 
-  do_check_eq(dateInput.getFullYear(), dateOutput.getFullYear());
-  do_check_eq(dateInput.getMonth(), dateOutput.getMonth());
-  do_check_eq(dateInput.getDate(), dateOutput.getDate());
-  do_check_eq(dateInput.getHours(), dateOutput.getHours());
-  do_check_eq(dateInput.getMinutes(), dateOutput.getMinutes());
-  do_check_eq(dateInput.getSeconds(), dateOutput.getSeconds());
-  do_check_eq(dateInput.getTimezoneOffset(), dateOutput.getTimezoneOffset());
+  equal(dateInput.getFullYear(), dateOutput.getFullYear());
+  equal(dateInput.getMonth(), dateOutput.getMonth());
+  equal(dateInput.getDate(), dateOutput.getDate());
+  equal(dateInput.getHours(), dateOutput.getHours());
+  equal(dateInput.getMinutes(), dateOutput.getMinutes());
+  equal(dateInput.getSeconds(), dateOutput.getSeconds());
+  equal(dateInput.getTimezoneOffset(), dateOutput.getTimezoneOffset());
 
   run_next_test();
 });
@@ -58,22 +58,22 @@
   // 23
   let number = 23;
   let octet = helper.BCDToOctet(number);
-  do_check_eq(helper.octetToBCD(octet), number);
+  equal(helper.octetToBCD(octet), number);
 
   // 56
   number = 56;
   octet = helper.BCDToOctet(number);
-  do_check_eq(helper.octetToBCD(octet), number);
+  equal(helper.octetToBCD(octet), number);
 
   // 0x23
   octet = 0x23;
   number = helper.octetToBCD(octet);
-  do_check_eq(helper.BCDToOctet(number), octet);
+  equal(helper.BCDToOctet(number), octet);
 
   // 0x56
   octet = 0x56;
   number = helper.octetToBCD(octet);
-  do_check_eq(helper.BCDToOctet(number), octet);
+  equal(helper.BCDToOctet(number), octet);
 
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCContactHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCContactHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCContactHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCContactHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -17,7 +17,7 @@
 
   function do_test(options, expectedErrorMsg) {
     ril.sendChromeMessage = function(message) {
-      do_check_eq(message.errorMsg, expectedErrorMsg);
+      equal(message.errorMsg, expectedErrorMsg);
     }
     ril.readICCContacts(options);
   }
@@ -51,7 +51,7 @@
 
   function do_test(options, expectedErrorMsg) {
     ril.sendChromeMessage = function(message) {
-      do_check_eq(message.errorMsg, expectedErrorMsg);
+      equal(message.errorMsg, expectedErrorMsg);
     }
     ril.updateICCContact(options);
   }
@@ -371,7 +371,7 @@
 
     let onerror = function onerror(errorMsg) {
       do_print("readICCContacts failed: " + errorMsg);
-      do_check_true(false);
+      ok(false);
     };
 
     contactHelper.readICCContacts(aTestData.simType, aTestData.contactType, onsuccess, onerror);
@@ -438,49 +438,49 @@
 
     recordHelper.updateADNLike = function(fileId, contact, pin2, onsuccess, onerror) {
       if (aContactType === GECKO_CARDCONTACT_TYPE_FDN) {
-        do_check_eq(fileId, ICC_EF_FDN);
+        equal(fileId, ICC_EF_FDN);
       } else if (aContactType === GECKO_CARDCONTACT_TYPE_ADN) {
-        do_check_eq(fileId, ICC_EF_ADN);
+        equal(fileId, ICC_EF_ADN);
       }
-      do_check_eq(pin2, aPin2);
-      do_check_eq(contact.alphaId, aContact.alphaId);
-      do_check_eq(contact.number, aContact.number);
+      equal(pin2, aPin2);
+      equal(contact.alphaId, aContact.alphaId);
+      equal(contact.number, aContact.number);
       onsuccess();
     };
 
     recordHelper.readIAP = function(fileId, recordNumber, onsuccess, onerror) {
-      do_check_eq(fileId, IAP_FILE_ID);
-      do_check_eq(recordNumber, ADN_RECORD_ID);
+      equal(fileId, IAP_FILE_ID);
+      equal(recordNumber, ADN_RECORD_ID);
       onsuccess((aHaveIapIndex) ? [EMAIL_RECORD_ID, ANR0_RECORD_ID]
                                 : [0xff, 0xff]);
     };
 
     recordHelper.updateIAP = function(fileId, recordNumber, iap, onsuccess, onerror) {
-      do_check_eq(fileId, IAP_FILE_ID);
-      do_check_eq(recordNumber, ADN_RECORD_ID);
+      equal(fileId, IAP_FILE_ID);
+      equal(recordNumber, ADN_RECORD_ID);
       onsuccess();
     };
 
     recordHelper.updateEmail = function(pbr, recordNumber, email, adnRecordId, onsuccess, onerror) {
-      do_check_eq(pbr.email.fileId, EMAIL_FILE_ID);
+      equal(pbr.email.fileId, EMAIL_FILE_ID);
       if (pbr.email.fileType === ICC_USIM_TYPE1_TAG) {
-        do_check_eq(recordNumber, ADN_RECORD_ID);
+        equal(recordNumber, ADN_RECORD_ID);
       } else if (pbr.email.fileType === ICC_USIM_TYPE2_TAG) {
-        do_check_eq(recordNumber, EMAIL_RECORD_ID);
+        equal(recordNumber, EMAIL_RECORD_ID);
       }
-      do_check_eq(email, aContact.email);
+      equal(email, aContact.email);
       onsuccess();
     };
 
     recordHelper.updateANR = function(pbr, recordNumber, number, adnRecordId, onsuccess, onerror) {
-      do_check_eq(pbr.anr0.fileId, ANR0_FILE_ID);
+      equal(pbr.anr0.fileId, ANR0_FILE_ID);
       if (pbr.anr0.fileType === ICC_USIM_TYPE1_TAG) {
-        do_check_eq(recordNumber, ADN_RECORD_ID);
+        equal(recordNumber, ADN_RECORD_ID);
       } else if (pbr.anr0.fileType === ICC_USIM_TYPE2_TAG) {
-        do_check_eq(recordNumber, ANR0_RECORD_ID);
+        equal(recordNumber, ANR0_RECORD_ID);
       }
       if (Array.isArray(aContact.anr)) {
-        do_check_eq(number, aContact.anr[0]);
+        equal(number, aContact.anr[0]);
       }
       onsuccess();
     };
@@ -506,7 +506,7 @@
     };
 
     contactHelper.updateICCContact(aSimType, aContactType, aContact, aPin2, onsuccess, onerror);
-    do_check_true(isSuccess);
+    ok(isSuccess);
   }
 
   let contacts = [
@@ -619,12 +619,12 @@
   };
 
   recordHelper.updateEmail = function(pbr, recordNumber, email, adnRecordId, onsuccess, onerror) {
-    do_check_true(email == null);
+    ok(email == null);
     onsuccess();
   };
 
   recordHelper.updateANR = function(pbr, recordNumber, number, adnRecordId, onsuccess, onerror) {
-    do_check_true(number == null);
+    ok(number == null);
     onsuccess();
   };
 
@@ -651,12 +651,12 @@
     };
 
     let successCb = function() {
-      do_check_true(true);
+      ok(true);
     };
 
     let errorCb = function(errorMsg) {
       do_print(errorMsg);
-      do_check_true(false);
+      ok(false);
     };
 
     contactHelper.updateICCContact(CARD_APPTYPE_USIM,
@@ -693,13 +693,13 @@
   };
 
   let successCb = function(pbrIndex, recordId) {
-    do_check_eq(pbrIndex, PBR_INDEX);
+    equal(pbrIndex, PBR_INDEX);
     records[recordId] = {};
   };
 
   let errorCb = function(errorMsg) {
     do_print(errorMsg);
-    do_check_true(false);
+    ok(false);
   };
 
   for (let i = 0; i < MAX_RECORDS; i++) {
@@ -708,15 +708,15 @@
                                      successCb, errorCb);
   }
   // The 1st element, records[0], is null.
-  do_check_eq(records.length - 1, MAX_RECORDS);
+  equal(records.length - 1, MAX_RECORDS);
 
   // Now the EF is full, so finding a free one should result failure.
   successCb = function(pbrIndex, recordId) {
-    do_check_true(false);
+    ok(false);
   };
 
   errorCb = function(errorMsg) {
-    do_check_true(errorMsg === "No free record found.");
+    ok(errorMsg === "No free record found.");
   };
   contactHelper.findFreeICCContact(CARD_APPTYPE_SIM, GECKO_CARDCONTACT_TYPE_ADN,
                                    successCb, errorCb);
@@ -756,12 +756,12 @@
   };
 
   let successCb = function(pbrIndex, recordId) {
-    do_check_eq(pbrIndex, 0);
+    equal(pbrIndex, 0);
     pbrs[pbrIndex].adn.records[recordId] = {};
   };
 
   let errorCb = function(errorMsg) {
-    do_check_true(false);
+    ok(false);
   };
 
   contactHelper.findFreeICCContact(CARD_APPTYPE_USIM,
@@ -771,8 +771,8 @@
   // Now the EF_ADN in the 1st phonebook set is full, so the next free contact
   // will come from the 2nd phonebook set.
   successCb = function(pbrIndex, recordId) {
-    do_check_eq(pbrIndex, 1);
-    do_check_eq(recordId, 1);
+    equal(pbrIndex, 1);
+    equal(recordId, 1);
   }
   contactHelper.findFreeICCContact(CARD_APPTYPE_USIM,
                                    GECKO_CARDCONTACT_TYPE_ADN,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCIOHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCIOHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCIOHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCIOHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -18,12 +18,12 @@
 
   io.getResponse = function fakeGetResponse(options) {
     // When recordSize is provided, loadLinearFixedEF should call iccIO directly.
-    do_check_true(false);
+    ok(false);
     run_next_test();
   };
 
   ril.iccIO = function fakeIccIO(options) {
-    do_check_true(true);
+    ok(true);
     run_next_test();
   };
 
@@ -40,13 +40,13 @@
   let io = context.ICCIOHelper;
 
   io.getResponse = function fakeGetResponse(options) {
-    do_check_true(true);
+    ok(true);
     run_next_test();
   };
 
   ril.iccIO = function fakeIccIO(options) {
     // When recordSize is not provided, loadLinearFixedEF should call getResponse.
-    do_check_true(false);
+    ok(false);
     run_next_test();
   };
 
@@ -65,7 +65,7 @@
     let called = false;
     function errorCb(errorMsg) {
       called = true;
-      do_check_eq(errorMsg, expectedErrorMsg);
+      equal(errorMsg, expectedErrorMsg);
     }
 
     // Write sw1 and sw2 to buffer.
@@ -78,7 +78,7 @@
                                     onerror: errorCb});
 
     // onerror callback should be triggered.
-    do_check_true(called);
+    ok(called);
   }
 
   let TEST_DATA = [
@@ -126,7 +126,7 @@
                    structure: EF_STRUCTURE_TRANSPARENT};
     iccioHelper.processICCIOGetResponse(options);
 
-    do_check_eq(options.fileSize, 0x0A);
+    equal(options.fileSize, 0x0A);
   }
 
   run_next_test();
@@ -164,9 +164,9 @@
                    structure: EF_STRUCTURE_LINEAR_FIXED};
     iccioHelper.processICCIOGetResponse(options);
 
-    do_check_eq(options.fileSize, 0x1A);
-    do_check_eq(options.recordSize, 0x1A);
-    do_check_eq(options.totalRecords, 0x01);
+    equal(options.fileSize, 0x1A);
+    equal(options.recordSize, 0x1A);
+    equal(options.totalRecords, 0x01);
   }
 
   run_next_test();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCPDUHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCPDUHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCPDUHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCPDUHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -24,7 +24,7 @@
   for (let i = 0; i < ffLen; i++) {
     helper.writeHexOctet(0xff);
   }
-  do_check_eq(iccHelper.readICCUCS2String(0x80, (2 * text.length) + ffLen), text);
+  equal(iccHelper.readICCUCS2String(0x80, (2 * text.length) + ffLen), text);
 
   // 0x81
   let array = [0x08, 0xd2, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61, 0xca,
@@ -33,7 +33,7 @@
   for (let i = 0; i < len; i++) {
     helper.writeHexOctet(array[i]);
   }
-  do_check_eq(iccHelper.readICCUCS2String(0x81, len), "Mozilla\u694a");
+  equal(iccHelper.readICCUCS2String(0x81, len), "Mozilla\u694a");
 
   // 0x82
   let array2 = [0x08, 0x69, 0x00, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61,
@@ -42,7 +42,7 @@
   for (let i = 0; i < len2; i++) {
     helper.writeHexOctet(array2[i]);
   }
-  do_check_eq(iccHelper.readICCUCS2String(0x82, len2), "Mozilla\u694a");
+  equal(iccHelper.readICCUCS2String(0x82, len2), "Mozilla\u694a");
 
   run_next_test();
 });
@@ -66,7 +66,7 @@
   };
 
   for (let i = 0; i < str.length; i++) {
-    do_check_eq(str.substring(0, i - 1), // -1 for the TON
+    equal(str.substring(0, i - 1), // -1 for the TON
                 iccHelper.readDiallingNumber(i));
   }
 
@@ -104,10 +104,10 @@
     helper.writeHexOctet(0xff);
   }
 
-  do_check_eq(iccHelper.read8BitUnpackedToString(PDU_NL_EXTENDED_ESCAPE),
+  equal(iccHelper.read8BitUnpackedToString(PDU_NL_EXTENDED_ESCAPE),
               langTable.substring(0, PDU_NL_EXTENDED_ESCAPE));
-  do_check_eq(iccHelper.read8BitUnpackedToString(2), " ");
-  do_check_eq(iccHelper.read8BitUnpackedToString(langTable.length -
+  equal(iccHelper.read8BitUnpackedToString(2), " ");
+  equal(iccHelper.read8BitUnpackedToString(langTable.length -
                                               PDU_NL_EXTENDED_ESCAPE - 1 + ffLen),
               langTable.substring(PDU_NL_EXTENDED_ESCAPE + 1));
 
@@ -118,19 +118,19 @@
   }
 
   // Read string before RESERVED_CONTROL.
-  do_check_eq(iccHelper.read8BitUnpackedToString(PDU_NL_RESERVED_CONTROL  * 2),
+  equal(iccHelper.read8BitUnpackedToString(PDU_NL_RESERVED_CONTROL  * 2),
               langShiftTable.substring(0, PDU_NL_RESERVED_CONTROL));
   // ESCAPE + RESERVED_CONTROL will become ' '.
-  do_check_eq(iccHelper.read8BitUnpackedToString(2), " ");
+  equal(iccHelper.read8BitUnpackedToString(2), " ");
   // Read string between RESERVED_CONTROL and EXTENDED_ESCAPE.
-  do_check_eq(iccHelper.read8BitUnpackedToString(
+  equal(iccHelper.read8BitUnpackedToString(
                 (PDU_NL_EXTENDED_ESCAPE - PDU_NL_RESERVED_CONTROL - 1)  * 2),
               langShiftTable.substring(PDU_NL_RESERVED_CONTROL + 1,
                                        PDU_NL_EXTENDED_ESCAPE));
   // ESCAPE + ESCAPE will become ' '.
-  do_check_eq(iccHelper.read8BitUnpackedToString(2), " ");
+  equal(iccHelper.read8BitUnpackedToString(2), " ");
   // Read remaining string.
-  do_check_eq(iccHelper.read8BitUnpackedToString(
+  equal(iccHelper.read8BitUnpackedToString(
                 (langShiftTable.length - PDU_NL_EXTENDED_ESCAPE - 1)  * 2),
               langShiftTable.substring(PDU_NL_EXTENDED_ESCAPE + 1));
 
@@ -157,18 +157,18 @@
   iccHelper.writeStringTo8BitUnpacked(langTable.length + ffLen, langTable);
 
   for (let i = 0; i < langTable.length; i++) {
-    do_check_eq(helper.readHexOctet(), i);
+    equal(helper.readHexOctet(), i);
   }
 
   for (let i = 0; i < ffLen; i++) {
-    do_check_eq(helper.readHexOctet(), 0xff);
+    equal(helper.readHexOctet(), 0xff);
   }
 
   // Test 2, write GSM extended alphabets.
   str = "\u000c\u20ac";
   iccHelper.writeStringTo8BitUnpacked(4, str);
 
-  do_check_eq(iccHelper.read8BitUnpackedToString(4), str);
+  equal(iccHelper.read8BitUnpackedToString(4), str);
 
   // Test 3, write GSM and GSM extended alphabets.
   // \u000c, \u20ac are from gsm extended alphabets.
@@ -181,7 +181,7 @@
   // "Totally 7 octets are to be written."
   iccHelper.writeStringTo8BitUnpacked(7, str);
 
-  do_check_eq(iccHelper.read8BitUnpackedToString(7), str);
+  equal(iccHelper.read8BitUnpackedToString(7), str);
 
   run_next_test();
 });
@@ -202,26 +202,26 @@
   iccHelper.writeStringTo8BitUnpacked(3, langTable.substring(0, 4));
   helper.writeHexOctet(0xff); // dummy octet.
   for (let i = 0; i < 3; i++) {
-    do_check_eq(helper.readHexOctet(), i);
+    equal(helper.readHexOctet(), i);
   }
-  do_check_false(helper.readHexOctet() == 4);
+  ok(helper.readHexOctet() != 4);
 
   // \u000c is GSM extended alphabet, 2 octets.
   // \u00a3 is GSM alphabet, 1 octet.
   let str = "\u000c\u00a3";
   iccHelper.writeStringTo8BitUnpacked(3, str);
-  do_check_eq(iccHelper.read8BitUnpackedToString(3), str);
+  equal(iccHelper.read8BitUnpackedToString(3), str);
 
   str = "\u00a3\u000c";
   iccHelper.writeStringTo8BitUnpacked(3, str);
-  do_check_eq(iccHelper.read8BitUnpackedToString(3), str);
+  equal(iccHelper.read8BitUnpackedToString(3), str);
 
   // 2 GSM extended alphabets cost 4 octets, but maximum is 3, so only the 1st
   // alphabet can be written.
   str = "\u000c\u000c";
   iccHelper.writeStringTo8BitUnpacked(3, str);
   helper.writeHexOctet(0xff); // dummy octet.
-  do_check_eq(iccHelper.read8BitUnpackedToString(4), str.substring(0, 1));
+  equal(iccHelper.read8BitUnpackedToString(4), str.substring(0, 1));
 
   run_next_test();
 });
@@ -244,28 +244,28 @@
   for (let i = 0; i < ffLen; i++) {
     helper.writeHexOctet(0xff);
   }
-  do_check_eq(iccHelper.readAlphaIdentifier(1 + (2 * text.length) + ffLen), text);
+  equal(iccHelper.readAlphaIdentifier(1 + (2 * text.length) + ffLen), text);
 
   // UCS2: 0x81
   let array = [0x81, 0x08, 0xd2, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61, 0xca, 0xff, 0xff];
   for (let i = 0; i < array.length; i++) {
     helper.writeHexOctet(array[i]);
   }
-  do_check_eq(iccHelper.readAlphaIdentifier(array.length), "Mozilla\u694a");
+  equal(iccHelper.readAlphaIdentifier(array.length), "Mozilla\u694a");
 
   // UCS2: 0x82
   let array2 = [0x82, 0x08, 0x69, 0x00, 0x4d, 0x6f, 0x7a, 0x69, 0x6c, 0x6c, 0x61, 0xca, 0xff, 0xff];
   for (let i = 0; i < array2.length; i++) {
     helper.writeHexOctet(array2[i]);
   }
-  do_check_eq(iccHelper.readAlphaIdentifier(array2.length), "Mozilla\u694a");
+  equal(iccHelper.readAlphaIdentifier(array2.length), "Mozilla\u694a");
 
   // GSM 8 Bit Unpacked
   const langTable = PDU_NL_LOCKING_SHIFT_TABLES[PDU_NL_IDENTIFIER_DEFAULT];
   for (let i = 0; i < PDU_NL_EXTENDED_ESCAPE; i++) {
     helper.writeHexOctet(i);
   }
-  do_check_eq(iccHelper.readAlphaIdentifier(PDU_NL_EXTENDED_ESCAPE),
+  equal(iccHelper.readAlphaIdentifier(PDU_NL_EXTENDED_ESCAPE),
               langTable.substring(0, PDU_NL_EXTENDED_ESCAPE));
 
   run_next_test();
@@ -284,36 +284,36 @@
 
   // Removal
   iccHelper.writeAlphaIdentifier(10, null);
-  do_check_eq(iccHelper.readAlphaIdentifier(10), "");
+  equal(iccHelper.readAlphaIdentifier(10), "");
 
   // GSM 8 bit
   let str = "Mozilla";
   iccHelper.writeAlphaIdentifier(str.length + ffLen, str);
-  do_check_eq(iccHelper.readAlphaIdentifier(str.length + ffLen), str);
+  equal(iccHelper.readAlphaIdentifier(str.length + ffLen), str);
 
   // UCS2
   str = "Mozilla\u694a";
   iccHelper.writeAlphaIdentifier(str.length * 2 + ffLen, str);
   // * 2 for each character will be encoded to UCS2 alphabets.
-  do_check_eq(iccHelper.readAlphaIdentifier(str.length * 2 + ffLen), str);
+  equal(iccHelper.readAlphaIdentifier(str.length * 2 + ffLen), str);
 
   // Test with maximum octets written.
   // 1 coding scheme (0x80) and 1 UCS2 character, total 3 octets.
   str = "\u694a";
   iccHelper.writeAlphaIdentifier(3, str);
-  do_check_eq(iccHelper.readAlphaIdentifier(3), str);
+  equal(iccHelper.readAlphaIdentifier(3), str);
 
   // 1 coding scheme (0x80) and 2 UCS2 characters, total 5 octets.
   // numOctets is limited to 4, so only 1 UCS2 character can be written.
   str = "\u694a\u694a";
   iccHelper.writeAlphaIdentifier(4, str);
   helper.writeHexOctet(0xff); // dummy octet.
-  do_check_eq(iccHelper.readAlphaIdentifier(5), str.substring(0, 1));
+  equal(iccHelper.readAlphaIdentifier(5), str.substring(0, 1));
 
   // Write 0 octet.
   iccHelper.writeAlphaIdentifier(0, "1");
   helper.writeHexOctet(0xff); // dummy octet.
-  do_check_eq(iccHelper.readAlphaIdentifier(1), "");
+  equal(iccHelper.readAlphaIdentifier(1), "");
 
   run_next_test();
 });
@@ -346,10 +346,10 @@
 
     let contactR = iccHelper.readAlphaIdDiallingNumber(recordSize);
     if (contact.alphaId == "" && contact.number == "") {
-      do_check_eq(contactR, null);
+      equal(contactR, null);
     } else {
-      do_check_eq(contactR.alphaId, contact.alphaId);
-      do_check_eq(contactR.number, contact.number);
+      equal(contactR.alphaId, contact.alphaId);
+      equal(contactR.number, contact.number);
     }
   }
 
@@ -377,8 +377,8 @@
                                     contactW.number);
 
   let contactR = helper.readAlphaIdDiallingNumber(recordSize);
-  do_check_eq(contactW.alphaId, contactR.alphaId);
-  do_check_eq(contactW.number, contactR.number);
+  equal(contactW.alphaId, contactR.alphaId);
+  equal(contactW.number, contactR.number);
 
   // Write a contact with alphaId encoded in UCS2 and number has '+'.
   let contactUCS2 = {
@@ -388,13 +388,13 @@
   helper.writeAlphaIdDiallingNumber(recordSize, contactUCS2.alphaId,
                                     contactUCS2.number);
   contactR = helper.readAlphaIdDiallingNumber(recordSize);
-  do_check_eq(contactUCS2.alphaId, contactR.alphaId);
-  do_check_eq(contactUCS2.number, contactR.number);
+  equal(contactUCS2.alphaId, contactR.alphaId);
+  equal(contactUCS2.number, contactR.number);
 
   // Write a null contact (Removal).
   helper.writeAlphaIdDiallingNumber(recordSize);
   contactR = helper.readAlphaIdDiallingNumber(recordSize);
-  do_check_eq(contactR, null);
+  equal(contactR, null);
 
   // Write a longer alphaId/dialling number
   // Dialling Number : Maximum 20 digits(10 octets).
@@ -408,16 +408,16 @@
   helper.writeAlphaIdDiallingNumber(recordSize, longContact.alphaId,
                                     longContact.number);
   contactR = helper.readAlphaIdDiallingNumber(recordSize);
-  do_check_eq(contactR.alphaId, "AAAAAAAAABBBBBBBBB");
-  do_check_eq(contactR.number, "12345678901234567890");
+  equal(contactR.alphaId, "AAAAAAAAABBBBBBBBB");
+  equal(contactR.number, "12345678901234567890");
 
   // Add '+' to number and test again.
   longContact.number = "+123456789012345678901234567890";
   helper.writeAlphaIdDiallingNumber(recordSize, longContact.alphaId,
                                     longContact.number);
   contactR = helper.readAlphaIdDiallingNumber(recordSize);
-  do_check_eq(contactR.alphaId, "AAAAAAAAABBBBBBBBB");
-  do_check_eq(contactR.number, "+12345678901234567890");
+  equal(contactR.alphaId, "AAAAAAAAABBBBBBBBB");
+  equal(contactR.number, "+12345678901234567890");
 
   run_next_test();
 });
@@ -434,18 +434,18 @@
   let number = "+123456";
   let len = 4;
   helper.writeDiallingNumber(number);
-  do_check_eq(helper.readDiallingNumber(len), number);
+  equal(helper.readDiallingNumber(len), number);
 
   // without +
   number = "987654";
   len = 4;
   helper.writeDiallingNumber(number);
-  do_check_eq(helper.readDiallingNumber(len), number);
+  equal(helper.readDiallingNumber(len), number);
 
   number = "9876543";
   len = 5;
   helper.writeDiallingNumber(number);
-  do_check_eq(helper.readDiallingNumber(len), number);
+  equal(helper.readDiallingNumber(len), number);
 
   run_next_test();
 });
@@ -513,9 +513,9 @@
     expectedNumber = expectedNumber || number;
     iccHelper.writeNumberWithLength(number);
     let numLen = helper.readHexOctet();
-    do_check_eq(expectedNumber, iccHelper.readDiallingNumber(numLen));
+    equal(expectedNumber, iccHelper.readDiallingNumber(numLen));
     for (let i = 0; i < (ADN_MAX_BCD_NUMBER_BYTES - numLen); i++) {
-      do_check_eq(0xff, helper.readHexOctet());
+      equal(0xff, helper.readHexOctet());
     }
   }
 
@@ -539,7 +539,7 @@
   // null
   iccHelper.writeNumberWithLength(null);
   for (let i = 0; i < (ADN_MAX_BCD_NUMBER_BYTES + 1); i++) {
-    do_check_eq(0xff, helper.readHexOctet());
+    equal(0xff, helper.readHexOctet());
   }
 
   run_next_test();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCRecordHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCRecordHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCRecordHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCRecordHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -52,13 +52,13 @@
   };
 
   let successCb = function successCb(pbrs) {
-    do_check_eq(pbrs[0].adn.fileId, 0x4f3a);
-    do_check_eq(pbrs.length, 1);
+    equal(pbrs[0].adn.fileId, 0x4f3a);
+    equal(pbrs.length, 1);
   };
 
   let errorCb = function errorCb(errorMsg) {
     do_print("Reading EF_PBR failed, msg = " + errorMsg);
-    do_check_true(false);
+    ok(false);
   };
 
   record.readPBR(successCb, errorCb);
@@ -69,7 +69,7 @@
     ifLoadEF = true;
   }
   record.readPBR(successCb, errorCb);
-  do_check_false(ifLoadEF);
+  ok(!ifLoadEF);
 
   run_next_test();
 });
@@ -117,13 +117,13 @@
 
     // fileId and recordNumber are dummy arguments.
     record.readEmail(fileId, type, recordNumber, function(email) {
-      do_check_eq(email, expectedResult);
+      equal(email, expectedResult);
     });
   };
 
   doTestReadEmail(ICC_USIM_TYPE1_TAG, "email@mozilla.com$#");
   doTestReadEmail(ICC_USIM_TYPE2_TAG, "email@mozilla.com");
-  do_check_eq(record._emailRecordSize, recordSize);
+  equal(record._emailRecordSize, recordSize);
 
   run_next_test();
 });
@@ -164,29 +164,29 @@
       count++;
 
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_SIM_IO);
+      equal(this.readInt32(), REQUEST_SIM_IO);
 
       // Token : we don't care
       this.readInt32();
 
       // command.
-      do_check_eq(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
+      equal(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
 
       // fileId.
-      do_check_eq(this.readInt32(), fileId);
+      equal(this.readInt32(), fileId);
 
       // pathId.
-      do_check_eq(this.readString(),
+      equal(this.readString(),
                   EF_PATH_MF_SIM + EF_PATH_DF_TELECOM + EF_PATH_DF_PHONEBOOK);
 
       // p1.
-      do_check_eq(this.readInt32(), recordNumber);
+      equal(this.readInt32(), recordNumber);
 
       // p2.
-      do_check_eq(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
+      equal(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
 
       // p3.
-      do_check_eq(this.readInt32(), recordSize);
+      equal(this.readInt32(), recordSize);
 
       // data.
       let strLen = this.readInt32();
@@ -195,14 +195,14 @@
         email = iccHelper.read8BitUnpackedToString(recordSize);
       } else {
         email = iccHelper.read8BitUnpackedToString(recordSize - 2);
-        do_check_eq(pduHelper.readHexOctet(), pbr.adn.sfi);
-        do_check_eq(pduHelper.readHexOctet(), expectedAdnRecordId);
+        equal(pduHelper.readHexOctet(), pbr.adn.sfi);
+        equal(pduHelper.readHexOctet(), expectedAdnRecordId);
       }
       this.readStringDelimiter(strLen);
-      do_check_eq(email, expectedEmail);
+      equal(email, expectedEmail);
 
       // pin2.
-      do_check_eq(this.readString(), null);
+      equal(this.readString(), null);
 
       if (!ril.v5Legacy) {
         // AID. Ignore because it's from modem.
@@ -262,12 +262,12 @@
 
     // fileId and recordNumber are dummy arguments.
     record.readANR(fileId, fileType, recordNumber, function(anr) {
-      do_check_eq(anr, expectedResult);
+      equal(anr, expectedResult);
     });
   };
 
   doTestReadAnr(ICC_USIM_TYPE1_TAG, "0123456");
-  do_check_eq(record._anrRecordSize, recordSize);
+  equal(record._anrRecordSize, recordSize);
 
   run_next_test();
 });
@@ -308,47 +308,47 @@
       count++;
 
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_SIM_IO);
+      equal(this.readInt32(), REQUEST_SIM_IO);
 
       // Token : we don't care
       this.readInt32();
 
       // command.
-      do_check_eq(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
+      equal(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
 
       // fileId.
-      do_check_eq(this.readInt32(), fileId);
+      equal(this.readInt32(), fileId);
 
       // pathId.
-      do_check_eq(this.readString(),
+      equal(this.readString(),
                   EF_PATH_MF_SIM + EF_PATH_DF_TELECOM + EF_PATH_DF_PHONEBOOK);
 
       // p1.
-      do_check_eq(this.readInt32(), recordNumber);
+      equal(this.readInt32(), recordNumber);
 
       // p2.
-      do_check_eq(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
+      equal(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
 
       // p3.
-      do_check_eq(this.readInt32(), recordSize);
+      equal(this.readInt32(), recordSize);
 
       // data.
       let strLen = this.readInt32();
       // EF_AAS, ignore.
       pduHelper.readHexOctet();
-      do_check_eq(iccHelper.readNumberWithLength(), expectedANR);
+      equal(iccHelper.readNumberWithLength(), expectedANR);
       // EF_CCP, ignore.
       pduHelper.readHexOctet();
       // EF_EXT1, ignore.
       pduHelper.readHexOctet();
       if (pbr.anr0.fileType === ICC_USIM_TYPE2_TAG) {
-        do_check_eq(pduHelper.readHexOctet(), pbr.adn.sfi);
-        do_check_eq(pduHelper.readHexOctet(), expectedAdnRecordId);
+        equal(pduHelper.readHexOctet(), pbr.adn.sfi);
+        equal(pduHelper.readHexOctet(), expectedAdnRecordId);
       }
       this.readStringDelimiter(strLen);
 
       // pin2.
-      do_check_eq(this.readString(), null);
+      equal(this.readString(), null);
 
       if (!ril.v5Legacy) {
         // AID. Ignore because it's from modem.
@@ -406,14 +406,14 @@
 
     let successCb = function successCb(iap) {
       for (let i = 0; i < iap.length; i++) {
-        do_check_eq(expectedIAP[i], iap[i]);
+        equal(expectedIAP[i], iap[i]);
       }
       run_next_test();
     }.bind(this);
 
     let errorCb = function errorCb(errorMsg) {
       do_print(errorMsg);
-      do_check_true(false);
+      ok(false);
       run_next_test();
     }.bind(this);
 
@@ -453,39 +453,39 @@
   function do_test(expectedIAP) {
     buf.sendParcel = function() {
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_SIM_IO);
+      equal(this.readInt32(), REQUEST_SIM_IO);
 
       // Token : we don't care
       this.readInt32();
 
       // command.
-      do_check_eq(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
+      equal(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
 
       // fileId.
-      do_check_eq(this.readInt32(), fileId);
+      equal(this.readInt32(), fileId);
 
       // pathId.
-      do_check_eq(this.readString(),
+      equal(this.readString(),
                   EF_PATH_MF_SIM + EF_PATH_DF_TELECOM + EF_PATH_DF_PHONEBOOK);
 
       // p1.
-      do_check_eq(this.readInt32(), recordNumber);
+      equal(this.readInt32(), recordNumber);
 
       // p2.
-      do_check_eq(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
+      equal(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
 
       // p3.
-      do_check_eq(this.readInt32(), recordSize);
+      equal(this.readInt32(), recordSize);
 
       // data.
       let strLen = this.readInt32();
       for (let i = 0; i < recordSize; i++) {
-        do_check_eq(expectedIAP[i], pduHelper.readHexOctet());
+        equal(expectedIAP[i], pduHelper.readHexOctet());
       }
       this.readStringDelimiter(strLen);
 
       // pin2.
-      do_check_eq(this.readString(), null);
+      equal(this.readString(), null);
 
       if (!ril.v5Legacy) {
         // AID. Ignore because it's from modem.
@@ -528,39 +528,39 @@
 
   buf.sendParcel = function() {
     // Request Type.
-    do_check_eq(this.readInt32(), REQUEST_SIM_IO);
+    equal(this.readInt32(), REQUEST_SIM_IO);
 
     // Token : we don't care
     this.readInt32();
 
     // command.
-    do_check_eq(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
+    equal(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
 
     // fileId.
-    do_check_eq(this.readInt32(), fileId);
+    equal(this.readInt32(), fileId);
 
     // pathId.
-    do_check_eq(this.readString(), EF_PATH_MF_SIM + EF_PATH_DF_TELECOM);
+    equal(this.readString(), EF_PATH_MF_SIM + EF_PATH_DF_TELECOM);
 
     // p1.
-    do_check_eq(this.readInt32(), 1);
+    equal(this.readInt32(), 1);
 
     // p2.
-    do_check_eq(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
+    equal(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
 
     // p3.
-    do_check_eq(this.readInt32(), 0x20);
+    equal(this.readInt32(), 0x20);
 
     // data.
     let contact = pdu.readAlphaIdDiallingNumber(0x20);
-    do_check_eq(contact.alphaId, "test");
-    do_check_eq(contact.number, "123456");
+    equal(contact.alphaId, "test");
+    equal(contact.number, "123456");
 
     // pin2.
     if (fileId == ICC_EF_ADN) {
-      do_check_eq(this.readString(), null);
+      equal(this.readString(), null);
     } else {
-      do_check_eq(this.readString(), "1111");
+      equal(this.readString(), "1111");
     }
 
     if (!ril.v5Legacy) {
@@ -631,12 +631,12 @@
   recordHelper.findFreeRecordId(
     fileId,
     function(recordId) {
-      do_check_eq(recordId, 2);
+      equal(recordId, 2);
       run_next_test();
     }.bind(this),
     function(errorMsg) {
       do_print(errorMsg);
-      do_check_true(false);
+      ok(false);
       run_next_test();
     }.bind(this));
 });
@@ -663,15 +663,15 @@
 
   RIL.appType = CARD_APPTYPE_SIM;
   iccRecord.fetchICCRecords();
-  do_check_eq(fetchTag, 0x01);
+  equal(fetchTag, 0x01);
 
   RIL.appType = CARD_APPTYPE_RUIM;
   iccRecord.fetchICCRecords();
-  do_check_eq(fetchTag, 0x02);
+  equal(fetchTag, 0x02);
 
   RIL.appType = CARD_APPTYPE_USIM;
   iccRecord.fetchICCRecords();
-  do_check_eq(fetchTag, 0x01);
+  equal(fetchTag, 0x01);
 
   run_next_test();
 });
@@ -711,7 +711,7 @@
 
     record.readICCID();
 
-    do_check_eq(ril.iccInfo.iccid, expectedICCID);
+    equal(ril.iccInfo.iccid, expectedICCID);
   }
 
   // Invalid value 0xE at high nibbile + low nibbile contains 0xF.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_ICCUtilsHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -19,9 +19,9 @@
   function test_table(sst, geckoService, simEnabled, usimEnabled) {
     RIL.iccInfoPrivate.sst = sst;
     RIL.appType = CARD_APPTYPE_SIM;
-    do_check_eq(ICCUtilsHelper.isICCServiceAvailable(geckoService), simEnabled);
+    equal(ICCUtilsHelper.isICCServiceAvailable(geckoService), simEnabled);
     RIL.appType = CARD_APPTYPE_USIM;
-    do_check_eq(ICCUtilsHelper.isICCServiceAvailable(geckoService), usimEnabled);
+    equal(ICCUtilsHelper.isICCServiceAvailable(geckoService), usimEnabled);
   }
 
   test_table([0x08], "ADN", true, false);
@@ -41,9 +41,9 @@
   const langTable = PDU_NL_LOCKING_SHIFT_TABLES[PDU_NL_IDENTIFIER_DEFAULT];
   const langShiftTable = PDU_NL_SINGLE_SHIFT_TABLES[PDU_NL_IDENTIFIER_DEFAULT];
 
-  do_check_eq(ICCUtilsHelper.isGsm8BitAlphabet(langTable), true);
-  do_check_eq(ICCUtilsHelper.isGsm8BitAlphabet(langShiftTable), true);
-  do_check_eq(ICCUtilsHelper.isGsm8BitAlphabet("\uaaaa"), false);
+  equal(ICCUtilsHelper.isGsm8BitAlphabet(langTable), true);
+  equal(ICCUtilsHelper.isGsm8BitAlphabet(langShiftTable), true);
+  equal(ICCUtilsHelper.isGsm8BitAlphabet("\uaaaa"), false);
 
   run_next_test();
 });
@@ -93,14 +93,14 @@
   ];
 
   let pbr = context.ICCUtilsHelper.parsePbrTlvs(pbrTlvs);
-  do_check_eq(pbr.adn.fileId, 0x4F3a);
-  do_check_eq(pbr.iap.fileId, 0x4F25);
-  do_check_eq(pbr.pbc.fileId, 0x4F09);
-  do_check_eq(pbr.email.fileId, 0x4F50);
-  do_check_eq(pbr.anr0.fileId, 0x4f11);
-  do_check_eq(pbr.anr1.fileId, 0x4f12);
-  do_check_eq(pbr.ccp1.fileId, 0x4F3D);
-  do_check_eq(pbr.ext1.fileId, 0x4F4A);
+  equal(pbr.adn.fileId, 0x4F3a);
+  equal(pbr.iap.fileId, 0x4F25);
+  equal(pbr.pbc.fileId, 0x4F09);
+  equal(pbr.email.fileId, 0x4F50);
+  equal(pbr.anr0.fileId, 0x4f11);
+  equal(pbr.anr1.fileId, 0x4f12);
+  equal(pbr.ccp1.fileId, 0x4F3D);
+  equal(pbr.ext1.fileId, 0x4F4A);
 
   run_next_test();
 });
@@ -117,12 +117,12 @@
     let result = helper.parseMccMncFromImsi(imsi, mncLength);
 
     if (!imsi) {
-      do_check_eq(result, null);
+      equal(result, null);
       return;
     }
 
-    do_check_eq(result.mcc, expectedMcc);
-    do_check_eq(result.mnc, expectedMnc);
+    equal(result.mcc, expectedMcc);
+    equal(result.mnc, expectedMnc);
   }
 
   // Test the imsi is null.
@@ -153,10 +153,10 @@
                                                       operatorData.lac);
 
     if (expectedResult == null) {
-      do_check_eq(result, expectedResult);
+      equal(result, expectedResult);
     } else {
-      do_check_eq(result.fullName, expectedResult.longName);
-      do_check_eq(result.shortName, expectedResult.shortName);
+      equal(result.fullName, expectedResult.longName);
+      equal(result.shortName, expectedResult.shortName);
     }
   }
 
@@ -311,7 +311,7 @@
     RIL.iccInfoPrivate.cphsSt.set(cphsSt);
 
     for (let service in GECKO_ICC_SERVICES.cphs) {
-      do_check_eq(ICCUtilsHelper.isCphsServiceAvailable(service),
+      equal(ICCUtilsHelper.isCphsServiceAvailable(service),
                   geckoService == service);
     }
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_IconLoader.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_IconLoader.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_IconLoader.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_IconLoader.js	2015-02-28 15:03:09.000000000 +0000
@@ -364,17 +364,17 @@
 
     let onsuccess = function(icons) {
       // Query one record at a time.
-      do_check_eq(icons.length, 1);
-      do_check_eq(icons[0].length, expected.length);
+      equal(icons.length, 1);
+      equal(icons[0].length, expected.length);
       for (let i = 0; i < icons[0].length; i++) {
         // Read the i_th image of the record.
         let icon = icons[0][i];
         let exp = expected[i];
-        do_check_eq(icon.width, exp.width);
-        do_check_eq(icon.height, exp.height);
-        do_check_eq(icon.pixels.length, exp.pixels.length);
+        equal(icon.width, exp.width);
+        equal(icon.height, exp.height);
+        equal(icon.pixels.length, exp.pixels.length);
         for (let j = 0; j < icon.pixels.length; j++) {
-          do_check_eq(icon.pixels[j], exp.pixels[j]);
+          equal(icon.pixels[j], exp.pixels[j]);
         }
       }
     };
@@ -746,17 +746,17 @@
     };
 
     let onsuccess = function(icons) {
-      do_check_eq(icons.length, test_data.expected.length);
+      equal(icons.length, test_data.expected.length);
       for (let i = 0; i < icons.length; i++) {
         for (let j = 0; j < icons[i].length; j++) {
           // Read the j_th image from the i_th record.
           let icon = icons[i][j];
           let expected = test_data.expected[i][j];
-          do_check_eq(icon.width, expected.width);
-          do_check_eq(icon.height, expected.height);
-          do_check_eq(icon.pixels.length, expected.pixels.length);
+          equal(icon.width, expected.width);
+          equal(icon.height, expected.height);
+          equal(icon.pixels.length, expected.pixels.length);
           for (let k = 0; k < icon.pixels.length; k++) {
-            do_check_eq(icon.pixels[k], expected.pixels[k]);
+            equal(icon.pixels[k], expected.pixels[k]);
           }
         }
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_icc_SimRecordHelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -46,8 +46,8 @@
 
     record.readAD();
 
-    do_check_eq(ril.iccInfo.mcc, expectedMcc);
-    do_check_eq(ril.iccInfo.mnc, expectedMnc);
+    equal(ril.iccInfo.mcc, expectedMcc);
+    equal(ril.iccInfo.mnc, expectedMnc);
   }
 
   do_test(undefined, "466923202422409", "466", "92" );
@@ -140,7 +140,7 @@
 
       if (testEf.length !== 0) {
         do_print("Un-handled EF: " + JSON.stringify(testEf));
-        do_check_true(false);
+        ok(false);
       }
     };
 
@@ -196,7 +196,7 @@
     for (let i = 0; i < expectCalled.length; i++ ) {
       if (ifCalled[i] != expectCalled[i]) {
         do_print(expectCalled[i] + " is not called.");
-        do_check_true(false);
+        ok(false);
       }
     }
   }
@@ -263,9 +263,9 @@
     buildMwisData(isActive, msgCount);
     recordHelper.readMWIS();
 
-    do_check_eq("iccmwis", postedMessage.rilMessageType);
-    do_check_eq(isActive, postedMessage.mwi.active);
-    do_check_eq((isActive) ? msgCount : 0, postedMessage.mwi.msgCount);
+    equal("iccmwis", postedMessage.rilMessageType);
+    equal(isActive, postedMessage.mwi.active);
+    equal((isActive) ? msgCount : 0, postedMessage.mwi.msgCount);
   }
 
   do_test(true, GECKO_VOICEMAIL_MESSAGE_COUNT_UNKNOWN);
@@ -319,41 +319,41 @@
       isUpdated = true;
 
       // Request Type.
-      do_check_eq(this.readInt32(), REQUEST_SIM_IO);
+      equal(this.readInt32(), REQUEST_SIM_IO);
 
       // Token : we don't care
       this.readInt32();
 
       // command.
-      do_check_eq(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
+      equal(this.readInt32(), ICC_COMMAND_UPDATE_RECORD);
 
       // fileId.
-      do_check_eq(this.readInt32(), ICC_EF_MWIS);
+      equal(this.readInt32(), ICC_EF_MWIS);
 
       // pathId.
-      do_check_eq(this.readString(),
+      equal(this.readString(),
                   EF_PATH_MF_SIM + ((ril.appType === CARD_APPTYPE_USIM) ? EF_PATH_ADF_USIM : EF_PATH_DF_GSM));
 
       // p1.
-      do_check_eq(this.readInt32(), recordNum);
+      equal(this.readInt32(), recordNum);
 
       // p2.
-      do_check_eq(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
+      equal(this.readInt32(), READ_RECORD_ABSOLUTE_MODE);
 
       // p3.
-      do_check_eq(this.readInt32(), recordSize);
+      equal(this.readInt32(), recordSize);
 
       // data.
       let strLen = this.readInt32();
-      do_check_eq(recordSize * 2, strLen);
+      equal(recordSize * 2, strLen);
       let expectedMwis = buildMwisData();
       for (let i = 0; i < recordSize; i++) {
-        do_check_eq(expectedMwis[i], pduHelper.readHexOctet());
+        equal(expectedMwis[i], pduHelper.readHexOctet());
       }
       this.readStringDelimiter(strLen);
 
       // pin2.
-      do_check_eq(this.readString(), null);
+      equal(this.readString(), null);
 
       if (!ril.v5Legacy) {
         // AID. Ignore because it's from modem.
@@ -361,12 +361,12 @@
       }
     };
 
-    do_check_false(isUpdated);
+    ok(!isUpdated);
 
     recordHelper.updateMWIS({ active: isActive,
                               msgCount: count });
 
-    do_check_true((ril.iccInfoPrivate.mwis) ? isUpdated : !isUpdated);
+    ok((ril.iccInfoPrivate.mwis) ? isUpdated : !isUpdated);
   }
 
   do_test(true, GECKO_VOICEMAIL_MESSAGE_COUNT_UNKNOWN);
@@ -485,10 +485,10 @@
 
     let postedMessage = workerHelper.postedMessage;
 
-    do_check_eq("sms-received", postedMessage.rilMessageType);
-    do_check_eq("+0123456789", postedMessage.SMSC);
-    do_check_eq("+9876543210", postedMessage.sender);
-    do_check_eq("How are you?", postedMessage.body);
+    equal("sms-received", postedMessage.rilMessageType);
+    equal("+0123456789", postedMessage.SMSC);
+    equal("+9876543210", postedMessage.sender);
+    equal("How are you?", postedMessage.body);
   }
 
   do_test();
@@ -534,8 +534,8 @@
 
     record.readSPDI();
 
-    do_check_eq(ril.iccInfo.isDisplayNetworkNameRequired, true);
-    do_check_eq(ril.iccInfo.isDisplaySpnRequired, false);
+    equal(ril.iccInfo.isDisplayNetworkNameRequired, true);
+    equal(ril.iccInfo.isDisplaySpnRequired, false);
   }
 
   function do_test_spn(displayCondition,
@@ -566,8 +566,8 @@
 
     record.readSPN();
 
-    do_check_eq(ril.iccInfo.isDisplayNetworkNameRequired, expectedPlmnNameDisplay);
-    do_check_eq(ril.iccInfo.isDisplaySpnRequired, expectedSpnDisplay);
+    equal(ril.iccInfo.isDisplayNetworkNameRequired, expectedPlmnNameDisplay);
+    equal(ril.iccInfo.isDisplaySpnRequired, expectedSpnDisplay);
   }
 
   // Create empty operator object.
@@ -758,17 +758,17 @@
     };
 
     let onsuccess = function(icons) {
-      do_check_eq(icons.length, expected.length);
+      equal(icons.length, expected.length);
       for (let i = 0; i < icons.length; i++) {
         let icon = icons[i];
         let exp = expected[i];
-        do_check_eq(icon.width, exp.width);
-        do_check_eq(icon.height, exp.height);
-        do_check_eq(icon.codingScheme, exp.codingScheme);
+        equal(icon.width, exp.width);
+        equal(icon.height, exp.height);
+        equal(icon.codingScheme, exp.codingScheme);
 
-        do_check_eq(icon.body.length, exp.body.length);
+        equal(icon.body.length, exp.body.length);
         for (let j = 0; j < icon.body.length; j++) {
-          do_check_eq(icon.body[j], exp.body[j]);
+          equal(icon.body[j], exp.body[j]);
         }
       }
     };
@@ -839,12 +839,12 @@
 
     let onsuccess = function() {
       do_print("onsuccess shouldn't be called.");
-      do_check_true(false);
+      ok(false);
     };
 
     let onerror = function() {
       do_print("onerror called as expected.");
-      do_check_true(true);
+      ok(true);
     };
 
     record.readIMG(0, onsuccess, onerror);
@@ -908,12 +908,12 @@
 
   let onsuccess = function() {
     do_print("onsuccess shouldn't be called.");
-    do_check_true(false);
+    ok(false);
   };
 
   let onerror = function() {
     do_print("onerror called as expected.");
-    do_check_true(true);
+    ok(true);
   };
 
   record.readIMG(0, onsuccess, onerror);
@@ -957,12 +957,12 @@
 
     let onsuccess = function() {
       do_print("onsuccess shouldn't be called.");
-      do_check_true(false);
+      ok(false);
     };
 
     let onerror = function() {
       do_print("onerror called as expected.");
-      do_check_true(true);
+      ok(true);
     };
 
     record.readIMG(0, onsuccess, onerror);
@@ -1109,22 +1109,22 @@
     };
 
     let onsuccess = function(icons) {
-      do_check_eq(icons.length, expected.length);
+      equal(icons.length, expected.length);
       for (let i = 0; i < icons.length; i++) {
         let icon = icons[i];
         let exp = expected[i];
-        do_check_eq(icon.width, exp.width);
-        do_check_eq(icon.height, exp.height);
-        do_check_eq(icon.codingScheme, exp.codingScheme);
+        equal(icon.width, exp.width);
+        equal(icon.height, exp.height);
+        equal(icon.codingScheme, exp.codingScheme);
 
-        do_check_eq(icon.body.length, exp.body.length);
+        equal(icon.body.length, exp.body.length);
         for (let j = 0; j < icon.body.length; j++) {
-          do_check_eq(icon.body[j], exp.body[j]);
+          equal(icon.body[j], exp.body[j]);
         }
 
-        do_check_eq(icon.clut.length, exp.clut.length);
+        equal(icon.clut.length, exp.clut.length);
         for (let j = 0; j < icon.clut.length; j++) {
-          do_check_eq(icon.clut[j], exp.clut[j]);
+          equal(icon.clut[j], exp.clut[j]);
         }
       }
     };
@@ -1274,22 +1274,22 @@
     };
 
     let onsuccess = function(icons) {
-      do_check_eq(icons.length, expected.length);
+      equal(icons.length, expected.length);
       for (let i = 0; i < icons.length; i++) {
         let icon = icons[i];
         let exp = expected[i];
-        do_check_eq(icon.width, exp.width);
-        do_check_eq(icon.height, exp.height);
-        do_check_eq(icon.codingScheme, exp.codingScheme);
+        equal(icon.width, exp.width);
+        equal(icon.height, exp.height);
+        equal(icon.codingScheme, exp.codingScheme);
 
-        do_check_eq(icon.body.length, exp.body.length);
+        equal(icon.body.length, exp.body.length);
         for (let j = 0; j < icon.body.length; j++) {
-          do_check_eq(icon.body[j], exp.body[j]);
+          equal(icon.body[j], exp.body[j]);
         }
 
-        do_check_eq(icon.clut.length, exp.clut.length);
+        equal(icon.clut.length, exp.clut.length);
         for (let j = 0; j < icon.clut.length; j++) {
-          do_check_eq(icon.clut[j], exp.clut[j]);
+          equal(icon.clut[j], exp.clut[j]);
         }
       }
     };
@@ -1346,15 +1346,15 @@
     recordHelper.readCphsInfo(() => { onsuccess = true; },
                               () => { onerror = true; });
 
-    do_check_true((cphsSt) ? onsuccess : onerror);
-    do_check_false((cphsSt) ? onerror : onsuccess);
+    ok((cphsSt) ? onsuccess : onerror);
+    ok(!((cphsSt) ? onerror : onsuccess));
     if (cphsSt) {
-      do_check_eq(RIL.iccInfoPrivate.cphsSt.length, cphsSt.length);
+      equal(RIL.iccInfoPrivate.cphsSt.length, cphsSt.length);
       for (let i = 0; i < cphsSt.length; i++) {
-        do_check_eq(RIL.iccInfoPrivate.cphsSt[i], cphsSt[i]);
+        equal(RIL.iccInfoPrivate.cphsSt[i], cphsSt[i]);
       }
     } else {
-      do_check_eq(RIL.iccInfoPrivate.cphsSt, cphsSt);
+      equal(RIL.iccInfoPrivate.cphsSt, cphsSt);
     }
   }
 
@@ -1439,9 +1439,9 @@
     delete RIL.iccInfoPrivate.mbdn;
     recordHelper[funcName]();
 
-    do_check_eq("iccmbdn", postedMessage.rilMessageType);
-    do_check_eq("Voicemail", postedMessage.alphaId);
-    do_check_eq("111", postedMessage.number);
+    equal("iccmbdn", postedMessage.rilMessageType);
+    equal("Voicemail", postedMessage.alphaId);
+    equal("111", postedMessage.number);
   }
 
   do_test("readMBDN");
@@ -1498,8 +1498,8 @@
 
   recordHelper.readMBDN();
 
-  do_check_eq(RIL.iccInfoPrivate.mbdn, undefined);
-  do_check_true(isRecovered);
+  equal(RIL.iccInfoPrivate.mbdn, undefined);
+  ok(isRecovered);
 
   run_next_test();
 });
@@ -1554,7 +1554,7 @@
 
     record.readPNN();
 
-    do_check_eq(ril.iccInfoPrivate.PNN[0].fullName, expectedResult);
+    equal(ril.iccInfoPrivate.PNN[0].fullName, expectedResult);
     // Reset PNN info for next test
     ril.iccInfoPrivate.PNN = null;
   }
@@ -1630,15 +1630,15 @@
 
     record.readPNN();
 
-    do_check_eq(test_data.length, ril.iccInfoPrivate.PNN.length);
+    equal(test_data.length, ril.iccInfoPrivate.PNN.length);
     for (let i = 0; i < test_data.length; i++) {
       if (test_data[i].expectedResult) {
-        do_check_eq(test_data[i].expectedResult.fullName,
+        equal(test_data[i].expectedResult.fullName,
                     ril.iccInfoPrivate.PNN[i].fullName);
-        do_check_eq(test_data[i].expectedResult.shortName,
+        equal(test_data[i].expectedResult.shortName,
                     ril.iccInfoPrivate.PNN[i].shortName);
       } else {
-        do_check_eq(test_data[i].expectedResult, ril.iccInfoPrivate.PNN[i]);
+        equal(test_data[i].expectedResult, ril.iccInfoPrivate.PNN[i]);
       }
     }
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_mmi_cf.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_mmi_cf.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_mmi_cf.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_mmi_cf.js	2015-02-28 15:03:09.000000000 +0000
@@ -37,8 +37,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
 }
 
 add_test(function test_sendMMI_call_forwarding_activation() {
@@ -85,13 +85,13 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.success);
-  do_check_true(Array.isArray(postedMessage.rules));
-  do_check_eq(postedMessage.rules.length, 1);
-  do_check_true(postedMessage.rules[0].active);
-  do_check_eq(postedMessage.rules[0].reason, CALL_FORWARD_REASON_UNCONDITIONAL);
-  do_check_eq(postedMessage.rules[0].number, "+34666222333");
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.success);
+  ok(Array.isArray(postedMessage.rules));
+  equal(postedMessage.rules.length, 1);
+  ok(postedMessage.rules[0].active);
+  equal(postedMessage.rules[0].reason, CALL_FORWARD_REASON_UNCONDITIONAL);
+  equal(postedMessage.rules[0].number, "+34666222333");
   run_next_test();
 });
 
@@ -115,8 +115,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, GECKO_ERROR_GENERIC_FAILURE);
-  do_check_false(postedMessage.success);
+  equal(postedMessage.errorMsg, GECKO_ERROR_GENERIC_FAILURE);
+  ok(!postedMessage.success);
 
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_mmi.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_mmi.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_mmi.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_mmi.js	2015-02-28 15:03:09.000000000 +0000
@@ -32,8 +32,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(postedMessage.rilMessageType, "sendMMI");
-  do_check_eq(postedMessage.errorMsg, error);
+  equal(postedMessage.rilMessageType, "sendMMI");
+  equal(postedMessage.errorMsg, error);
 }
 
 /**
@@ -65,10 +65,10 @@
   context.RIL.sendMMI({mmi: {fullMMI: "**"}});
 
   let postedMessage = workerhelper.postedMessage;
-  do_check_eq(ussdOptions.ussd, "**");
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
-  do_check_true(context.RIL._ussdSession);
+  equal(ussdOptions.ussd, "**");
+  equal (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
+  ok(context.RIL._ussdSession);
 
   run_next_test();
 });
@@ -90,8 +90,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
+  equal (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -141,8 +141,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
+  equal (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -192,8 +192,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
+  equal (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -243,8 +243,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
+  equal (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -294,9 +294,9 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_neq(mmiOptions.mmi, null);
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
+  notEqual(mmiOptions.mmi, null);
+  equal (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
 
   run_next_test();
 });
@@ -318,9 +318,9 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_neq(mmiOptions.mmi, null);
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_RADIO_NOT_AVAILABLE);
-  do_check_false(postedMessage.success);
+  notEqual(mmiOptions.mmi, null);
+  equal (postedMessage.errorMsg, GECKO_ERROR_RADIO_NOT_AVAILABLE);
+  ok(!postedMessage.success);
 
   run_next_test();
 });
@@ -347,11 +347,11 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_true(postedMessage.success);
-  do_check_true(postedMessage.enabled);
-  do_check_eq(postedMessage.statusMessage,  MMI_SM_KS_SERVICE_ENABLED_FOR);
-  do_check_true(Array.isArray(postedMessage.additionalInformation));
-  do_check_eq(postedMessage.additionalInformation[0], "serviceClassVoice");
+  ok(postedMessage.success);
+  ok(postedMessage.enabled);
+  equal(postedMessage.statusMessage,  MMI_SM_KS_SERVICE_ENABLED_FOR);
+  ok(Array.isArray(postedMessage.additionalInformation));
+  equal(postedMessage.additionalInformation[0], "serviceClassVoice");
 
   run_next_test();
 });
@@ -377,9 +377,9 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(mmiOptions.procedure, MMI_PROCEDURE_ACTIVATION);
-  do_check_true(postedMessage.success);
-  do_check_eq(postedMessage.statusMessage,  MMI_SM_KS_SERVICE_ENABLED);
+  equal(mmiOptions.procedure, MMI_PROCEDURE_ACTIVATION);
+  ok(postedMessage.success);
+  equal(postedMessage.statusMessage,  MMI_SM_KS_SERVICE_ENABLED);
 
   run_next_test();
 });
@@ -405,9 +405,9 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(mmiOptions.procedure, MMI_PROCEDURE_DEACTIVATION);
-  do_check_true(postedMessage.success);
-  do_check_eq(postedMessage.statusMessage,  MMI_SM_KS_SERVICE_DISABLED);
+  equal(mmiOptions.procedure, MMI_PROCEDURE_DEACTIVATION);
+  ok(postedMessage.success);
+  equal(postedMessage.statusMessage,  MMI_SM_KS_SERVICE_DISABLED);
 
   run_next_test();
 });
@@ -436,10 +436,10 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(ussdOptions.ussd, "**123#");
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
-  do_check_true(context.RIL._ussdSession);
+  equal(ussdOptions.ussd, "**123#");
+  equal (postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
+  ok(context.RIL._ussdSession);
 
   run_next_test();
 });
@@ -462,10 +462,10 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(ussdOptions.ussd, "**123#");
-  do_check_eq (postedMessage.errorMsg, GECKO_ERROR_GENERIC_FAILURE);
-  do_check_false(postedMessage.success);
-  do_check_false(context.RIL._ussdSession);
+  equal(ussdOptions.ussd, "**123#");
+  equal (postedMessage.errorMsg, GECKO_ERROR_GENERIC_FAILURE);
+  ok(!postedMessage.success);
+  ok(!context.RIL._ussdSession);
 
   run_next_test();
 });
@@ -486,8 +486,8 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
+  equal(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
 }
 
 add_test(function test_sendMMI_call_waiting_activation() {
@@ -539,9 +539,9 @@
 
   let postedMessage = workerhelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
-  do_check_true(postedMessage.success);
-  do_check_eq(postedMessage.length, 2);
-  do_check_true(postedMessage.enabled);
+  equal(postedMessage.errorMsg, GECKO_ERROR_SUCCESS);
+  ok(postedMessage.success);
+  equal(postedMessage.length, 2);
+  ok(postedMessage.enabled);
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_ruim.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_ruim.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_ruim.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_ruim.js	2015-02-28 15:03:09.000000000 +0000
@@ -18,7 +18,7 @@
 
   function test_table(cst, geckoService, enabled) {
     context.RIL.iccInfoPrivate.cst = cst;
-    do_check_eq(context.ICCUtilsHelper.isICCServiceAvailable(geckoService),
+    equal(context.ICCUtilsHelper.isICCServiceAvailable(geckoService),
                 enabled);
   }
 
@@ -40,7 +40,7 @@
   let ICCFileHelper = context.ICCFileHelper;
 
   RIL.appType = CARD_APPTYPE_RUIM;
-  do_check_eq(ICCFileHelper.getEFPath(ICC_EF_CSIM_CST),
+  equal(ICCFileHelper.getEFPath(ICC_EF_CSIM_CST),
               EF_PATH_MF_SIM + EF_PATH_DF_CDMA);
 
   run_next_test();
@@ -76,7 +76,7 @@
     for (let i = 0; i < expectCalled.length; i++ ) {
       if (ifCalled[i] != expectCalled[i]) {
         do_print(expectCalled[i] + " is not called.");
-        do_check_true(false);
+        ok(false);
       }
     }
   }
@@ -98,7 +98,7 @@
   function testDecodeImsiValue(encoded, length, expect) {
     let decoded = context.RuimRecordHelper.decodeIMSIValue(encoded, length);
 
-    do_check_eq(expect, decoded);
+    equal(expect, decoded);
   }
 
   testDecodeImsiValue( 99, 2, "00");
@@ -150,7 +150,7 @@
     context.RuimRecordHelper.getIMSI_M();
     let imsi = context.RIL.iccInfoPrivate.imsi;
 
-    do_check_eq(expectedImsi, imsi)
+    equal(expectedImsi, imsi)
   }
 
   let imsi_1 = "466050081062861";
@@ -198,11 +198,11 @@
     context.RuimRecordHelper.readCDMAHome();
     let cdmaHome = context.RIL.cdmaHome;
     for (let i = 0; i < expectedSystemIds.length; i++) {
-      do_check_eq(cdmaHome.systemId[i], expectedSystemIds[i]);
-      do_check_eq(cdmaHome.networkId[i], expectedNetworkIds[i]);
+      equal(cdmaHome.systemId[i], expectedSystemIds[i]);
+      equal(cdmaHome.networkId[i], expectedNetworkIds[i]);
     }
-    do_check_eq(cdmaHome.systemId.length, expectedSystemIds.length);
-    do_check_eq(cdmaHome.networkId.length, expectedNetworkIds.length);
+    equal(cdmaHome.systemId.length, expectedSystemIds.length);
+    equal(cdmaHome.networkId.length, expectedNetworkIds.length);
   }
 
   testCdmaHome([13505], [65535]);
@@ -239,8 +239,8 @@
     };
 
     context.RuimRecordHelper.readSPN();
-    do_check_eq(context.RIL.iccInfo.spn, expectedSpn);
-    do_check_eq(context.RIL.iccInfoPrivate.spnDisplayCondition,
+    equal(context.RIL.iccInfo.spn, expectedSpn);
+    equal(context.RIL.iccInfoPrivate.spnDisplayCondition,
                 expectedDisplayCondition);
   }
 
@@ -287,9 +287,9 @@
   RIL._isCdma = true;
 
   // Test updateDisplayCondition runs before any of SIM file is ready.
-  do_check_eq(ICCUtilsHelper.updateDisplayCondition(), true);
-  do_check_eq(RIL.iccInfo.isDisplayNetworkNameRequired, true);
-  do_check_eq(RIL.iccInfo.isDisplaySpnRequired, false);
+  equal(ICCUtilsHelper.updateDisplayCondition(), true);
+  equal(RIL.iccInfo.isDisplayNetworkNameRequired, true);
+  equal(RIL.iccInfo.isDisplaySpnRequired, false);
 
   // Test with value.
   function testDisplayCondition(ruimDisplayCondition,
@@ -307,9 +307,9 @@
       cdmaNetworkId: currentNetworkId
     };
 
-    do_check_eq(ICCUtilsHelper.updateDisplayCondition(), expectUpdateDisplayCondition);
-    do_check_eq(RIL.iccInfo.isDisplayNetworkNameRequired, false);
-    do_check_eq(RIL.iccInfo.isDisplaySpnRequired, expectIsDisplaySPNRequired);
+    equal(ICCUtilsHelper.updateDisplayCondition(), expectUpdateDisplayCondition);
+    equal(RIL.iccInfo.isDisplayNetworkNameRequired, false);
+    equal(RIL.iccInfo.isDisplaySpnRequired, expectIsDisplaySPNRequired);
   };
 
   // SPN is not required when ruimDisplayCondition is false.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdma.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdma.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdma.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdma.js	2015-02-28 15:03:09.000000000 +0000
@@ -213,20 +213,20 @@
     let postedMessage = workerHelper.postedMessage;
 
     // Check if pending token is removed.
-    do_check_true((errorClass === 2) ? !!sentSmsMap[msgId] : !sentSmsMap[msgId]);
+    ok((errorClass === 2) ? !!sentSmsMap[msgId] : !sentSmsMap[msgId]);
 
     // Check the response message accordingly.
     if (errorClass === -1) {
       // Check if the report is treated as normal incoming SMS
-      do_check_eq("sms-received", postedMessage.rilMessageType);
+      equal("sms-received", postedMessage.rilMessageType);
     } else if (errorClass === 2) {
       // Do nothing.
     } else {
       // Check Delivery Status
       if (errorClass === 0) {
-        do_check_eq(postedMessage.deliveryStatus, GECKO_SMS_DELIVERY_STATUS_SUCCESS);
+        equal(postedMessage.deliveryStatus, GECKO_SMS_DELIVERY_STATUS_SUCCESS);
       } else {
-        do_check_eq(postedMessage.deliveryStatus, GECKO_SMS_DELIVERY_STATUS_ERROR);
+        equal(postedMessage.deliveryStatus, GECKO_SMS_DELIVERY_STATUS_ERROR);
       }
     }
   }
@@ -283,12 +283,12 @@
 
     do_print("fullDataHexString: " + fullDataHexString);
 
-    do_check_eq("sms-received", postedMessage.rilMessageType);
-    do_check_eq(PDU_CDMA_MSG_TELESERIVCIE_ID_WAP, postedMessage.teleservice);
-    do_check_eq(orig_address, postedMessage.sender);
-    do_check_eq(0x23F0, postedMessage.header.originatorPort);
-    do_check_eq(0x0B84, postedMessage.header.destinationPort);
-    do_check_eq(fullDataHexString, bytesToHexString(postedMessage.data));
+    equal("sms-received", postedMessage.rilMessageType);
+    equal(PDU_CDMA_MSG_TELESERIVCIE_ID_WAP, postedMessage.teleservice);
+    equal(orig_address, postedMessage.sender);
+    equal(0x23F0, postedMessage.header.originatorPort);
+    equal(0x0B84, postedMessage.header.destinationPort);
+    equal(fullDataHexString, bytesToHexString(postedMessage.data));
   }
 
   // Verify Single WAP PDU
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdmapduhelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdmapduhelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdmapduhelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_cdmapduhelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -29,10 +29,10 @@
 
   let expectedDataBuffer = [PDU_CDMA_MSG_USERDATA_REPLY_OPTION, 0x01, 0x40];
 
-  do_check_eq(testDataBuffer.length, expectedDataBuffer.length);
+  equal(testDataBuffer.length, expectedDataBuffer.length);
 
   for (let i = 0; i < expectedDataBuffer.length; i++) {
-    do_check_eq(testDataBuffer[i], expectedDataBuffer[i]);
+    equal(testDataBuffer[i], expectedDataBuffer[i]);
   }
 
   run_next_test();
@@ -58,8 +58,8 @@
     context.BitBufferHelper.startRead(testDataBuffer);
     let result = helper.decodeUserDataMsgStatus();
 
-    do_check_eq(result.errorClass, octet >>> 6);
-    do_check_eq(result.msgStatus, octet & 0x3F);
+    equal(result.errorClass, octet >>> 6);
+    equal(result.msgStatus, octet & 0x3F);
   }
 
   // 00|000000: no error|Message accepted
@@ -93,7 +93,7 @@
   function test_decodePDUMsg(testDataBuffer, expected, encoding, msgType, msgBodySize) {
     context.BitBufferHelper.startRead(testDataBuffer);
     let result = helper.decodeCdmaPDUMsg(encoding, msgType, msgBodySize);
-    do_check_eq(result, expected);
+    equal(result, expected);
   }
 
   // Shift-JIS has 1 byte and 2 byte code for one character and has some types of characters:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_gsmpduhelper.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_gsmpduhelper.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_gsmpduhelper.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_gsmpduhelper.js	2015-02-28 15:03:09.000000000 +0000
@@ -30,14 +30,14 @@
     let msg = {};
     helper.readDataCodingScheme(msg);
 
-    do_check_eq(msg.dcs, dcs);
-    do_check_eq(msg.encoding, encoding);
-    do_check_eq(msg.messageClass, messageClass);
-    do_check_eq(msg.mwi == null, mwi == null);
+    equal(msg.dcs, dcs);
+    equal(msg.encoding, encoding);
+    equal(msg.messageClass, messageClass);
+    equal(msg.mwi == null, mwi == null);
     if (mwi != null) {
-      do_check_eq(msg.mwi.active, mwi.active);
-      do_check_eq(msg.mwi.discard, mwi.discard);
-      do_check_eq(msg.mwi.msgCount, mwi.msgCount);
+      equal(msg.mwi.active, mwi.active);
+      equal(msg.mwi.discard, mwi.discard);
+      equal(msg.mwi.msgCount, mwi.msgCount);
     }
   }
 
@@ -179,7 +179,7 @@
       helper.resetOctetWritten();
       helper.writeStringAsSeptets(str, paddingBits, PDU_NL_IDENTIFIER_DEFAULT,
                                   PDU_NL_IDENTIFIER_DEFAULT);
-      do_check_eq(Math.ceil(((len * 7) + paddingBits) / 8),
+      equal(Math.ceil(((len * 7) + paddingBits) / 8),
                   helper.octetsWritten);
     }
   }
@@ -217,7 +217,7 @@
     }
     let length = helper.readHexOctet();
     let parsedAddr = helper.readAddress(length);
-    do_check_eq(parsedAddr, addrString);
+    equal(parsedAddr, addrString);
   }
 
   // For AlphaNumeric
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms.js	2015-02-28 15:03:09.000000000 +0000
@@ -142,7 +142,7 @@
       },
       postMessage: function(message) {
         do_print("fullBody: " + message.fullBody);
-        do_check_eq(expected, message.fullBody)
+        equal(expected, message.fullBody)
       }
     });
 
@@ -247,7 +247,7 @@
     //
     // If we have additional 6(type, len, langIndex, type len, langShiftIndex)
     // octets here, then bug 809553 is not fixed.
-    do_check_eq(this.outgoingIndex, 57);
+    equal(this.outgoingIndex, 57);
 
     run_next_test();
   };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_nl_tables.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_nl_tables.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_nl_tables.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_nl_tables.js	2015-02-28 15:03:09.000000000 +0000
@@ -24,13 +24,13 @@
     let table = PDU_NL_LOCKING_SHIFT_TABLES[lst];
 
     // Make sure table length is 128, or it will break table lookup algorithm.
-    do_check_eq(table.length, 128);
+    equal(table.length, 128);
 
     // Make sure special values are preserved.
-    do_check_eq(table[PDU_NL_EXTENDED_ESCAPE], ESCAPE);
-    do_check_eq(table[PDU_NL_LINE_FEED], LF);
-    do_check_eq(table[PDU_NL_CARRIAGE_RETURN], CR);
-    do_check_eq(table[PDU_NL_SPACE], SP);
+    equal(table[PDU_NL_EXTENDED_ESCAPE], ESCAPE);
+    equal(table[PDU_NL_LINE_FEED], LF);
+    equal(table[PDU_NL_CARRIAGE_RETURN], CR);
+    equal(table[PDU_NL_SPACE], SP);
   }
 
   run_next_test();
@@ -43,12 +43,12 @@
     let table = PDU_NL_SINGLE_SHIFT_TABLES[sst];
 
     // Make sure table length is 128, or it will break table lookup algorithm.
-    do_check_eq(table.length, 128);
+    equal(table.length, 128);
 
     // Make sure special values are preserved.
-    do_check_eq(table[PDU_NL_EXTENDED_ESCAPE], ESCAPE);
-    do_check_eq(table[PDU_NL_PAGE_BREAK], FF);
-    do_check_eq(table[PDU_NL_RESERVED_CONTROL], RESCTL);
+    equal(table[PDU_NL_EXTENDED_ESCAPE], ESCAPE);
+    equal(table[PDU_NL_PAGE_BREAK], FF);
+    equal(table[PDU_NL_RESERVED_CONTROL], RESCTL);
   }
 
   run_next_test();
@@ -64,12 +64,12 @@
              + to.charCodeAt(0).toString(16) + "\"");
 
     // Make sure "from" is not in default table
-    do_check_eq(defaultTable.indexOf(from), -1);
-    do_check_eq(defaultShiftTable.indexOf(from), -1);
+    equal(defaultTable.indexOf(from), -1);
+    equal(defaultShiftTable.indexOf(from), -1);
     // Make sure "to" is in default table
     if ((defaultTable.indexOf(to) < 0)
         && (defaultShiftTable.indexOf(to) < 0)) {
-      do_check_eq(false, true);
+      equal(false, true);
     }
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js	2015-02-28 15:03:09.000000000 +0000
@@ -42,7 +42,7 @@
   };
 
   function do_check_calc(str, expectedCalcLen, lst, sst, strict7BitEncoding, strToWrite) {
-    do_check_eq(expectedCalcLen,
+    equal(expectedCalcLen,
                 gSmsSegmentHelper
                   .countGsm7BitSeptets(str,
                                        PDU_NL_LOCKING_SHIFT_TABLES[lst],
@@ -52,7 +52,7 @@
     helper.resetOctetWritten();
     strToWrite = strToWrite || str;
     helper.writeStringAsSeptets(strToWrite, 0, lst, sst);
-    do_check_eq(Math.ceil(expectedCalcLen * 7 / 8), helper.octetsWritten);
+    equal(Math.ceil(expectedCalcLen * 7 / 8), helper.octetsWritten);
   }
 
   // Test calculation encoded message length using both locking/single shift tables.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_ssn.js	2015-02-28 15:03:09.000000000 +0000
@@ -67,9 +67,9 @@
     context.RIL._processSuppSvcNotification(notificationInfo);
 
     let postedMessage = workerHelper.postedMessage;
-    do_check_eq(postedMessage.rilMessageType, 'suppSvcNotification');
-    do_check_eq(postedMessage.notification, resultNotification);
-    do_check_eq(postedMessage.callIndex, resultCallIndex);
+    equal(postedMessage.rilMessageType, 'suppSvcNotification');
+    equal(postedMessage.notification, resultNotification);
+    equal(postedMessage.callIndex, resultCallIndex);
 
     // Clear all existed calls.
     context.RIL._processCalls({});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_stk.js	2015-02-28 15:03:09.000000000 +0000
@@ -62,7 +62,7 @@
 
   context.RIL._processICCStatus(iccStatus);
 
-  do_check_eq(profileSend, false);
+  equal(profileSend, false);
 
   run_next_test();
 });
@@ -81,7 +81,7 @@
   buf.seekIncoming(8);
   let profile = buf.readString();
   for (let i = 0; i < STK_SUPPORTED_TERMINAL_PROFILE.length; i++) {
-    do_check_eq(parseInt(profile.substring(2 * i, 2 * i + 2), 16),
+    equal(parseInt(profile.substring(2 * i, 2 * i + 2), 16),
                 STK_SUPPORTED_TERMINAL_PROFILE[i]);
   }
 
@@ -99,7 +99,7 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
+    equal(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
 
     // Token : we don't care
     this.readInt32();
@@ -108,34 +108,34 @@
     //                      TLV_DEVICE_ID_SIZE(4) +
     //                      TLV_RESULT_SIZE(3) +
     //                      TEXT LENGTH(10))
-    do_check_eq(this.readInt32(), 44);
+    equal(this.readInt32(), 44);
 
     // Command Details, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 3);
-    do_check_eq(pduHelper.readHexOctet(), 0x01);
-    do_check_eq(pduHelper.readHexOctet(), STK_CMD_PROVIDE_LOCAL_INFO);
-    do_check_eq(pduHelper.readHexOctet(), STK_LOCAL_INFO_NNA);
+    equal(pduHelper.readHexOctet(), 3);
+    equal(pduHelper.readHexOctet(), 0x01);
+    equal(pduHelper.readHexOctet(), STK_CMD_PROVIDE_LOCAL_INFO);
+    equal(pduHelper.readHexOctet(), STK_LOCAL_INFO_NNA);
 
     // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     // Result
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_RESULT_OK);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_RESULT_OK);
 
     // Text
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 8);
-    do_check_eq(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_7BIT_PACKED);
-    do_check_eq(pduHelper.readSeptetsToString(7, 0, PDU_NL_IDENTIFIER_DEFAULT,
+    equal(pduHelper.readHexOctet(), 8);
+    equal(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_7BIT_PACKED);
+    equal(pduHelper.readSeptetsToString(7, 0, PDU_NL_IDENTIFIER_DEFAULT,
                 PDU_NL_IDENTIFIER_DEFAULT), "Mozilla");
 
     run_next_test();
@@ -170,7 +170,7 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
+    equal(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
 
     // Token : we don't care
     this.readInt32();
@@ -179,33 +179,33 @@
     //                      TLV_DEVICE_ID_SIZE(4) +
     //                      TLV_RESULT_SIZE(3) +
     //                      TEXT LENGTH(3))
-    do_check_eq(this.readInt32(), 30);
+    equal(this.readInt32(), 30);
 
     // Command Details, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 3);
-    do_check_eq(pduHelper.readHexOctet(), 0x01);
-    do_check_eq(pduHelper.readHexOctet(), STK_CMD_GET_INPUT);
-    do_check_eq(pduHelper.readHexOctet(), 0x00);
+    equal(pduHelper.readHexOctet(), 3);
+    equal(pduHelper.readHexOctet(), 0x01);
+    equal(pduHelper.readHexOctet(), STK_CMD_GET_INPUT);
+    equal(pduHelper.readHexOctet(), 0x00);
 
     // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     // Result
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_RESULT_OK);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_RESULT_OK);
 
     // Text
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_8BIT);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_8BIT);
 
     run_next_test();
   };
@@ -252,7 +252,7 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
+    equal(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
 
     // Token : we don't care
     this.readInt32();
@@ -261,36 +261,36 @@
     //                       TLV_DEVICE_ID_SIZE(4) +
     //                       TLV_RESULT_SIZE(3) +
     //                       TEXT LENGTH(164))
-    do_check_eq(this.readInt32(), 352);
+    equal(this.readInt32(), 352);
 
     // Command Details, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 3);
-    do_check_eq(pduHelper.readHexOctet(), 0x01);
-    do_check_eq(pduHelper.readHexOctet(), STK_CMD_GET_INPUT);
-    do_check_eq(pduHelper.readHexOctet(), 0x00);
+    equal(pduHelper.readHexOctet(), 3);
+    equal(pduHelper.readHexOctet(), 0x01);
+    equal(pduHelper.readHexOctet(), STK_CMD_GET_INPUT);
+    equal(pduHelper.readHexOctet(), 0x00);
 
     // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     // Result
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_RESULT_OK);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_RESULT_OK);
 
     // Text
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
                                           COMPREHENSIONTLV_FLAG_CR);
     // C-TLV Length Encoding: 161 = 0x81 0xA1
-    do_check_eq(pduHelper.readHexOctet(), 0x81);
-    do_check_eq(pduHelper.readHexOctet(), 0xA1);
-    do_check_eq(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_8BIT);
-    do_check_eq(iccPduHelper.read8BitUnpackedToString(160), TEST_TEXT_STRING);
+    equal(pduHelper.readHexOctet(), 0x81);
+    equal(pduHelper.readHexOctet(), 0xA1);
+    equal(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_8BIT);
+    equal(iccPduHelper.read8BitUnpackedToString(160), TEST_TEXT_STRING);
 
     run_next_test();
   };
@@ -326,7 +326,7 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
+    equal(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
 
     // Token : we don't care
     this.readInt32();
@@ -335,33 +335,33 @@
     //                       TLV_DEVICE_ID_SIZE(4) +
     //                       TLV_RESULT_SIZE(3) +
     //                       DURATION(4))
-    do_check_eq(this.readInt32(), 32);
+    equal(this.readInt32(), 32);
 
     // Command Details, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 3);
-    do_check_eq(pduHelper.readHexOctet(), 0x01);
-    do_check_eq(pduHelper.readHexOctet(), STK_CMD_GET_INKEY);
-    do_check_eq(pduHelper.readHexOctet(), 0x00);
+    equal(pduHelper.readHexOctet(), 3);
+    equal(pduHelper.readHexOctet(), 0x01);
+    equal(pduHelper.readHexOctet(), STK_CMD_GET_INKEY);
+    equal(pduHelper.readHexOctet(), 0x00);
 
     // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     // Result
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_RESULT_NO_RESPONSE_FROM_USER);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_RESULT_NO_RESPONSE_FROM_USER);
 
     // Duration, Type-Length-Value(Time unit, Time interval)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DURATION);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_TIME_UNIT_SECOND);
-    do_check_eq(pduHelper.readHexOctet(), 10);
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DURATION);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_TIME_UNIT_SECOND);
+    equal(pduHelper.readHexOctet(), 10);
 
     run_next_test();
   };
@@ -396,7 +396,7 @@
 
     buf.sendParcel = function() {
       // Type
-      do_check_eq(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
+      equal(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
 
       // Token : we don't care
       this.readInt32();
@@ -405,34 +405,34 @@
       //                      TLV_DEVICE_ID_SIZE(4) +
       //                      TLV_RESULT_SIZE(3) +
       //                      TEXT LENGTH(4))
-      do_check_eq(this.readInt32(), 32);
+      equal(this.readInt32(), 32);
 
       // Command Details, Type-Length-Value
-      do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
+      equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
                                             COMPREHENSIONTLV_FLAG_CR);
-      do_check_eq(pduHelper.readHexOctet(), 3);
-      do_check_eq(pduHelper.readHexOctet(), 0x01);
-      do_check_eq(pduHelper.readHexOctet(), STK_CMD_GET_INKEY);
-      do_check_eq(pduHelper.readHexOctet(), 0x04);
+      equal(pduHelper.readHexOctet(), 3);
+      equal(pduHelper.readHexOctet(), 0x01);
+      equal(pduHelper.readHexOctet(), STK_CMD_GET_INKEY);
+      equal(pduHelper.readHexOctet(), 0x04);
 
       // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-      do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
-      do_check_eq(pduHelper.readHexOctet(), 2);
-      do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-      do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+      equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
+      equal(pduHelper.readHexOctet(), 2);
+      equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+      equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
       // Result
-      do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
+      equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
                                             COMPREHENSIONTLV_FLAG_CR);
-      do_check_eq(pduHelper.readHexOctet(), 1);
-      do_check_eq(pduHelper.readHexOctet(), STK_RESULT_OK);
+      equal(pduHelper.readHexOctet(), 1);
+      equal(pduHelper.readHexOctet(), STK_RESULT_OK);
 
       // Yes/No response
-      do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
+      equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_TEXT_STRING |
                                             COMPREHENSIONTLV_FLAG_CR);
-      do_check_eq(pduHelper.readHexOctet(), 2);
-      do_check_eq(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_8BIT);
-      do_check_eq(pduHelper.readHexOctet(), isYesNo ? 0x01 : 0x00);
+      equal(pduHelper.readHexOctet(), 2);
+      equal(pduHelper.readHexOctet(), STK_TEXT_CODING_GSM_8BIT);
+      equal(pduHelper.readHexOctet(), isYesNo ? 0x01 : 0x00);
     };
 
     let response = {
@@ -471,7 +471,7 @@
 
     buf.sendParcel = function() {
       // Type
-      do_check_eq(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
+      equal(this.readInt32(), REQUEST_STK_SEND_TERMINAL_RESPONSE);
 
       // Token : we don't care
       this.readInt32();
@@ -479,28 +479,28 @@
       // Data Length 26 = 2 * (TLV_COMMAND_DETAILS_SIZE(5) +
       //                       TLV_DEVICE_ID_SIZE(4) +
       //                       TLV_RESULT_SIZE(4))
-      do_check_eq(this.readInt32(), 26);
+      equal(this.readInt32(), 26);
 
       // Command Details, Type-Length-Value(commandNumber, typeOfCommand, commandQualifier)
-      do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
+      equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_COMMAND_DETAILS |
                                             COMPREHENSIONTLV_FLAG_CR);
-      do_check_eq(pduHelper.readHexOctet(), 3);
-      do_check_eq(pduHelper.readHexOctet(), 0x01);
-      do_check_eq(pduHelper.readHexOctet(), STK_CMD_DISPLAY_TEXT);
-      do_check_eq(pduHelper.readHexOctet(), 0x01);
+      equal(pduHelper.readHexOctet(), 3);
+      equal(pduHelper.readHexOctet(), 0x01);
+      equal(pduHelper.readHexOctet(), STK_CMD_DISPLAY_TEXT);
+      equal(pduHelper.readHexOctet(), 0x01);
 
       // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-      do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
-      do_check_eq(pduHelper.readHexOctet(), 2);
-      do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-      do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+      equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID);
+      equal(pduHelper.readHexOctet(), 2);
+      equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+      equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
       // Result, Type-Length-Value(General result, Additional information on result)
-      do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
+      equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_RESULT |
                                             COMPREHENSIONTLV_FLAG_CR);
-      do_check_eq(pduHelper.readHexOctet(), 2);
-      do_check_eq(pduHelper.readHexOctet(), STK_RESULT_TERMINAL_CRNTLY_UNABLE_TO_PROCESS);
-      do_check_eq(pduHelper.readHexOctet(), aInfo);
+      equal(pduHelper.readHexOctet(), 2);
+      equal(pduHelper.readHexOctet(), STK_RESULT_TERMINAL_CRNTLY_UNABLE_TO_PROCESS);
+      equal(pduHelper.readHexOctet(), aInfo);
     };
 
     let response = {
@@ -545,23 +545,23 @@
   tlvHelper.writeLocationInfoTlv(loc);
 
   let tag = pduHelper.readHexOctet();
-  do_check_eq(tag, COMPREHENSIONTLV_TAG_LOCATION_INFO |
+  equal(tag, COMPREHENSIONTLV_TAG_LOCATION_INFO |
                    COMPREHENSIONTLV_FLAG_CR);
 
   let length = pduHelper.readHexOctet();
-  do_check_eq(length, 9);
+  equal(length, 9);
 
   let mcc_mnc = pduHelper.readSwappedNibbleBcdString(3);
-  do_check_eq(mcc_mnc, "46692");
+  equal(mcc_mnc, "46692");
 
   let lac = (pduHelper.readHexOctet() << 8) | pduHelper.readHexOctet();
-  do_check_eq(lac, 10291);
+  equal(lac, 10291);
 
   let cellId = (pduHelper.readHexOctet() << 24) |
                (pduHelper.readHexOctet() << 16) |
                (pduHelper.readHexOctet() << 8)  |
                (pduHelper.readHexOctet());
-  do_check_eq(cellId, 19072823);
+  equal(cellId, 19072823);
 
   // Test with 1-digit mnc, and gsmCellId obtained from GSM network.
   loc = {
@@ -573,20 +573,20 @@
   tlvHelper.writeLocationInfoTlv(loc);
 
   tag = pduHelper.readHexOctet();
-  do_check_eq(tag, COMPREHENSIONTLV_TAG_LOCATION_INFO |
+  equal(tag, COMPREHENSIONTLV_TAG_LOCATION_INFO |
                    COMPREHENSIONTLV_FLAG_CR);
 
   length = pduHelper.readHexOctet();
-  do_check_eq(length, 7);
+  equal(length, 7);
 
   mcc_mnc = pduHelper.readSwappedNibbleBcdString(3);
-  do_check_eq(mcc_mnc, "46602");
+  equal(mcc_mnc, "46602");
 
   lac = (pduHelper.readHexOctet() << 8) | pduHelper.readHexOctet();
-  do_check_eq(lac, 10291);
+  equal(lac, 10291);
 
   cellId = (pduHelper.readHexOctet() << 8) | (pduHelper.readHexOctet());
-  do_check_eq(cellId, 65534);
+  equal(cellId, 65534);
 
   // Test with 3-digit mnc, and gsmCellId obtained from GSM network.
   loc = {
@@ -598,20 +598,20 @@
   tlvHelper.writeLocationInfoTlv(loc);
 
   tag = pduHelper.readHexOctet();
-  do_check_eq(tag, COMPREHENSIONTLV_TAG_LOCATION_INFO |
+  equal(tag, COMPREHENSIONTLV_TAG_LOCATION_INFO |
                    COMPREHENSIONTLV_FLAG_CR);
 
   length = pduHelper.readHexOctet();
-  do_check_eq(length, 7);
+  equal(length, 7);
 
   mcc_mnc = pduHelper.readSwappedNibbleBcdString(3);
-  do_check_eq(mcc_mnc, "466222");
+  equal(mcc_mnc, "466222");
 
   lac = (pduHelper.readHexOctet() << 8) | pduHelper.readHexOctet();
-  do_check_eq(lac, 10291);
+  equal(lac, 10291);
 
   cellId = (pduHelper.readHexOctet() << 8) | (pduHelper.readHexOctet());
-  do_check_eq(cellId, 65534);
+  equal(cellId, 65534);
 
   run_next_test();
 });
@@ -627,13 +627,13 @@
 
   tlvHelper.writeCauseTlv(RIL_ERROR_TO_GECKO_ERROR[ERROR_GENERIC_FAILURE]);
   let tag = pduHelper.readHexOctet();
-  do_check_eq(tag, COMPREHENSIONTLV_TAG_CAUSE | COMPREHENSIONTLV_FLAG_CR);
+  equal(tag, COMPREHENSIONTLV_TAG_CAUSE | COMPREHENSIONTLV_FLAG_CR);
   let len = pduHelper.readHexOctet();
-  do_check_eq(len, 2);  // We have one cause.
+  equal(len, 2);  // We have one cause.
   let standard = pduHelper.readHexOctet();
-  do_check_eq(standard, 0x60);
+  equal(standard, 0x60);
   let cause = pduHelper.readHexOctet();
-  do_check_eq(cause, 0x80 | ERROR_GENERIC_FAILURE);
+  equal(cause, 0x80 | ERROR_GENERIC_FAILURE);
 
   run_next_test();
 });
@@ -647,16 +647,16 @@
   let tlvHelper = context.ComprehensionTlvHelper;
 
   let length = 0x70;
-  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 1);
+  equal(tlvHelper.getSizeOfLengthOctets(length), 1);
 
   length = 0x80;
-  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 2);
+  equal(tlvHelper.getSizeOfLengthOctets(length), 2);
 
   length = 0x180;
-  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 3);
+  equal(tlvHelper.getSizeOfLengthOctets(length), 3);
 
   length = 0x18000;
-  do_check_eq(tlvHelper.getSizeOfLengthOctets(length), 4);
+  equal(tlvHelper.getSizeOfLengthOctets(length), 4);
 
   run_next_test();
 });
@@ -672,25 +672,25 @@
 
   let length = 0x70;
   tlvHelper.writeLength(length);
-  do_check_eq(pduHelper.readHexOctet(), length);
+  equal(pduHelper.readHexOctet(), length);
 
   length = 0x80;
   tlvHelper.writeLength(length);
-  do_check_eq(pduHelper.readHexOctet(), 0x81);
-  do_check_eq(pduHelper.readHexOctet(), length);
+  equal(pduHelper.readHexOctet(), 0x81);
+  equal(pduHelper.readHexOctet(), length);
 
   length = 0x180;
   tlvHelper.writeLength(length);
-  do_check_eq(pduHelper.readHexOctet(), 0x82);
-  do_check_eq(pduHelper.readHexOctet(), (length >> 8) & 0xff);
-  do_check_eq(pduHelper.readHexOctet(), length & 0xff);
+  equal(pduHelper.readHexOctet(), 0x82);
+  equal(pduHelper.readHexOctet(), (length >> 8) & 0xff);
+  equal(pduHelper.readHexOctet(), length & 0xff);
 
   length = 0x18000;
   tlvHelper.writeLength(length);
-  do_check_eq(pduHelper.readHexOctet(), 0x83);
-  do_check_eq(pduHelper.readHexOctet(), (length >> 16) & 0xff);
-  do_check_eq(pduHelper.readHexOctet(), (length >> 8) & 0xff);
-  do_check_eq(pduHelper.readHexOctet(), length & 0xff);
+  equal(pduHelper.readHexOctet(), 0x83);
+  equal(pduHelper.readHexOctet(), (length >> 16) & 0xff);
+  equal(pduHelper.readHexOctet(), (length >> 8) & 0xff);
+  equal(pduHelper.readHexOctet(), length & 0xff);
 
   run_next_test();
 });
@@ -731,7 +731,7 @@
   let ctlvs = berTlv.value;
   let ctlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
   let cmdDetails = ctlv.value;
-  do_check_eq(cmdDetails.typeOfCommand, testTypeOfCommand);
+  equal(cmdDetails.typeOfCommand, testTypeOfCommand);
 
   stkFactory.createParam(cmdDetails, ctlvs, (aResult) => {
     cmdDetails.options = aResult;
@@ -766,19 +766,19 @@
   let selectedCtlvs =
       stkHelper.searchForSelectedTags(berTlv.value, [COMPREHENSIONTLV_TAG_ALPHA_ID]);
   let tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
-  do_check_eq(tlv.value.identifier, "alpha id 1");
+  equal(tlv.value.identifier, "alpha id 1");
 
   tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
-  do_check_eq(tlv.value.identifier, "alpha id 2");
+  equal(tlv.value.identifier, "alpha id 2");
 
   tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
-  do_check_eq(tlv.value.identifier, "alpha id 3");
+  equal(tlv.value.identifier, "alpha id 3");
 
   tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
-  do_check_eq(tlv.value.identifier, "alpha id 4");
+  equal(tlv.value.identifier, "alpha id 4");
 
   tlv = selectedCtlvs.retrieve(COMPREHENSIONTLV_TAG_ALPHA_ID);
-  do_check_eq(tlv.value.identifier, "alpha id 5");
+  equal(tlv.value.identifier, "alpha id 5");
 
   run_next_test();
 });
@@ -800,7 +800,7 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let stkHelper = context.StkProactiveCmdHelper;
       let ctlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_FILE_LIST, ctlvs);
-      do_check_eq(ctlv.value.fileList, "3F002FE2");
+      equal(ctlv.value.fileList, "3F002FE2");
     }
   });
 
@@ -827,12 +827,12 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let playTone = cmdDetails.options;
 
-      do_check_eq(playTone.text, "Dial Tone");
-      do_check_eq(playTone.tone, STK_TONE_TYPE_DIAL_TONE);
-      do_check_eq(playTone.duration.timeUnit, STK_TIME_UNIT_SECOND);
-      do_check_eq(playTone.duration.timeInterval, 5);
-      do_check_eq(playTone.iconSelfExplanatory, true);
-      do_check_eq(playTone.icons, 1);
+      equal(playTone.text, "Dial Tone");
+      equal(playTone.tone, STK_TONE_TYPE_DIAL_TONE);
+      equal(playTone.duration.timeUnit, STK_TIME_UNIT_SECOND);
+      equal(playTone.duration.timeInterval, 5);
+      equal(playTone.iconSelfExplanatory, true);
+      equal(playTone.icons, 1);
     }
   });
 
@@ -856,8 +856,8 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let interval = cmdDetails.options;
 
-      do_check_eq(interval.timeUnit, STK_TIME_UNIT_SECOND);
-      do_check_eq(interval.timeInterval, 0x14);
+      equal(interval.timeUnit, STK_TIME_UNIT_SECOND);
+      equal(interval.timeInterval, 0x14);
     }
   });
 
@@ -884,9 +884,9 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let textMsg = cmdDetails.options;
 
-      do_check_eq(textMsg.text, "Saldo 2.04 E. Validez 20/05/13. ");
-      do_check_eq(textMsg.iconSelfExplanatory, true);
-      do_check_eq(textMsg.icons, 1);
+      equal(textMsg.text, "Saldo 2.04 E. Validez 20/05/13. ");
+      equal(textMsg.iconSelfExplanatory, true);
+      equal(textMsg.icons, 1);
     }
   });
 
@@ -910,10 +910,10 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let event = cmdDetails.options;
 
-      do_check_eq(Array.isArray(event.eventList), true);
+      equal(Array.isArray(event.eventList), true);
 
       for (let i = 0; i < event.eventList.length; i++) {
-        do_check_eq(event.eventList[i], i);
+        equal(event.eventList[i], i);
       }
     }
   });
@@ -941,17 +941,17 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let input = cmdDetails.options;
 
-      do_check_eq(input.text, "Text");
-      do_check_eq(input.isAlphabet, true);
-      do_check_eq(input.isUCS2, true);
-      do_check_eq(input.hideInput, true);
-      do_check_eq(input.isPacked, true);
-      do_check_eq(input.isHelpAvailable, true);
-      do_check_eq(input.minLength, 0x01);
-      do_check_eq(input.maxLength, 0x10);
-      do_check_eq(input.defaultText, "Default");
-      do_check_eq(input.iconSelfExplanatory, true);
-      do_check_eq(input.icons, 1);
+      equal(input.text, "Text");
+      equal(input.isAlphabet, true);
+      equal(input.isUCS2, true);
+      equal(input.hideInput, true);
+      equal(input.isPacked, true);
+      equal(input.isHelpAvailable, true);
+      equal(input.minLength, 0x01);
+      equal(input.maxLength, 0x10);
+      equal(input.defaultText, "Default");
+      equal(input.iconSelfExplanatory, true);
+      equal(input.icons, 1);
     }
   });
 
@@ -970,10 +970,10 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let input = cmdDetails.options;
 
-      do_check_eq(input.text, null);
-      do_check_eq(input.minLength, 0x01);
-      do_check_eq(input.maxLength, 0x10);
-      do_check_eq(input.defaultText, null);
+      equal(input.text, null);
+      equal(input.minLength, 0x01);
+      equal(input.maxLength, 0x10);
+      equal(input.defaultText, null);
     }
   });
 
@@ -1003,9 +1003,9 @@
   let berTlv = berHelper.decode(more_time_1.length);
   let ctlvs = berTlv.value;
   let tlv = stkHelper.searchForTag(COMPREHENSIONTLV_TAG_COMMAND_DETAILS, ctlvs);
-  do_check_eq(tlv.value.commandNumber, 0x01);
-  do_check_eq(tlv.value.typeOfCommand, STK_CMD_MORE_TIME);
-  do_check_eq(tlv.value.commandQualifier, 0x00);
+  equal(tlv.value.commandNumber, 0x01);
+  equal(tlv.value.typeOfCommand, STK_CMD_MORE_TIME);
+  equal(tlv.value.commandQualifier, 0x00);
 
   run_next_test();
 });
@@ -1034,25 +1034,25 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let menu = cmdDetails.options;
 
-      do_check_eq(menu.title, "Title");
-      do_check_eq(menu.iconSelfExplanatory, true);
-      do_check_eq(menu.icons, 1);
-      do_check_eq(menu.items[0].identifier, 1);
-      do_check_eq(menu.items[0].text, "item 1");
-      do_check_eq(menu.items[0].iconSelfExplanatory, true);
-      do_check_eq(menu.items[0].icons, 1);
-      do_check_eq(menu.items[1].identifier, 2);
-      do_check_eq(menu.items[1].text, "item 2");
-      do_check_eq(menu.items[1].iconSelfExplanatory, true);
-      do_check_eq(menu.items[1].icons, 2);
-      do_check_eq(menu.items[2].identifier, 3);
-      do_check_eq(menu.items[2].text, "item 3");
-      do_check_eq(menu.items[2].iconSelfExplanatory, true);
-      do_check_eq(menu.items[2].icons, 3);
-      do_check_eq(menu.nextActionList[0], STK_CMD_SET_UP_CALL);
-      do_check_eq(menu.nextActionList[1], STK_CMD_LAUNCH_BROWSER);
-      do_check_eq(menu.nextActionList[2], STK_CMD_PLAY_TONE);
-      do_check_eq(menu.defaultItem, 0x00);
+      equal(menu.title, "Title");
+      equal(menu.iconSelfExplanatory, true);
+      equal(menu.icons, 1);
+      equal(menu.items[0].identifier, 1);
+      equal(menu.items[0].text, "item 1");
+      equal(menu.items[0].iconSelfExplanatory, true);
+      equal(menu.items[0].icons, 1);
+      equal(menu.items[1].identifier, 2);
+      equal(menu.items[1].text, "item 2");
+      equal(menu.items[1].iconSelfExplanatory, true);
+      equal(menu.items[1].icons, 2);
+      equal(menu.items[2].identifier, 3);
+      equal(menu.items[2].text, "item 3");
+      equal(menu.items[2].iconSelfExplanatory, true);
+      equal(menu.items[2].icons, 3);
+      equal(menu.nextActionList[0], STK_CMD_SET_UP_CALL);
+      equal(menu.nextActionList[1], STK_CMD_LAUNCH_BROWSER);
+      equal(menu.nextActionList[2], STK_CMD_PLAY_TONE);
+      equal(menu.defaultItem, 0x00);
     }
   });
 
@@ -1074,17 +1074,17 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let menu = cmdDetails.options;
 
-      do_check_eq(menu.title, "Title");
-      do_check_eq(menu.items[0].identifier, 1);
-      do_check_eq(menu.items[0].text, "item 1");
-      do_check_eq(menu.items[1].identifier, 2);
-      do_check_eq(menu.items[1].text, "item 2");
-      do_check_eq(menu.items[2].identifier, 3);
-      do_check_eq(menu.items[2].text, "item 3");
-      do_check_eq(menu.nextActionList[0], STK_NEXT_ACTION_NULL);
-      do_check_eq(menu.nextActionList[1], STK_CMD_LAUNCH_BROWSER);
-      do_check_eq(menu.nextActionList[2], STK_NEXT_ACTION_END_PROACTIVE_SESSION);
-      do_check_eq(menu.defaultItem, 0x02);
+      equal(menu.title, "Title");
+      equal(menu.items[0].identifier, 1);
+      equal(menu.items[0].text, "item 1");
+      equal(menu.items[1].identifier, 2);
+      equal(menu.items[1].text, "item 2");
+      equal(menu.items[2].identifier, 3);
+      equal(menu.items[2].text, "item 3");
+      equal(menu.nextActionList[0], STK_NEXT_ACTION_NULL);
+      equal(menu.nextActionList[1], STK_CMD_LAUNCH_BROWSER);
+      equal(menu.nextActionList[2], STK_NEXT_ACTION_END_PROACTIVE_SESSION);
+      equal(menu.defaultItem, 0x02);
     }
   });
 
@@ -1114,24 +1114,24 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let menu = cmdDetails.options;
 
-      do_check_eq(menu.title, "Title");
-      do_check_eq(menu.iconSelfExplanatory, true);
-      do_check_eq(menu.icons, 1);
-      do_check_eq(menu.items[0].identifier, 1);
-      do_check_eq(menu.items[0].text, "item 1");
-      do_check_eq(menu.items[0].iconSelfExplanatory, true);
-      do_check_eq(menu.items[0].icons, 1);
-      do_check_eq(menu.items[1].identifier, 2);
-      do_check_eq(menu.items[1].text, "item 2");
-      do_check_eq(menu.items[1].iconSelfExplanatory, true);
-      do_check_eq(menu.items[1].icons, 2);
-      do_check_eq(menu.items[2].identifier, 3);
-      do_check_eq(menu.items[2].text, "item 3");
-      do_check_eq(menu.items[2].iconSelfExplanatory, true);
-      do_check_eq(menu.items[2].icons, 3);
-      do_check_eq(menu.nextActionList[0], STK_CMD_SET_UP_CALL);
-      do_check_eq(menu.nextActionList[1], STK_CMD_LAUNCH_BROWSER);
-      do_check_eq(menu.nextActionList[2], STK_CMD_PLAY_TONE);
+      equal(menu.title, "Title");
+      equal(menu.iconSelfExplanatory, true);
+      equal(menu.icons, 1);
+      equal(menu.items[0].identifier, 1);
+      equal(menu.items[0].text, "item 1");
+      equal(menu.items[0].iconSelfExplanatory, true);
+      equal(menu.items[0].icons, 1);
+      equal(menu.items[1].identifier, 2);
+      equal(menu.items[1].text, "item 2");
+      equal(menu.items[1].iconSelfExplanatory, true);
+      equal(menu.items[1].icons, 2);
+      equal(menu.items[2].identifier, 3);
+      equal(menu.items[2].text, "item 3");
+      equal(menu.items[2].iconSelfExplanatory, true);
+      equal(menu.items[2].icons, 3);
+      equal(menu.nextActionList[0], STK_CMD_SET_UP_CALL);
+      equal(menu.nextActionList[1], STK_CMD_LAUNCH_BROWSER);
+      equal(menu.nextActionList[2], STK_CMD_PLAY_TONE);
     }
   });
 
@@ -1152,16 +1152,16 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let menu = cmdDetails.options;
 
-      do_check_eq(menu.title, "Title");
-      do_check_eq(menu.items[0].identifier, 1);
-      do_check_eq(menu.items[0].text, "item 1");
-      do_check_eq(menu.items[1].identifier, 2);
-      do_check_eq(menu.items[1].text, "item 2");
-      do_check_eq(menu.items[2].identifier, 3);
-      do_check_eq(menu.items[2].text, "item 3");
-      do_check_eq(menu.nextActionList[0], STK_NEXT_ACTION_END_PROACTIVE_SESSION);
-      do_check_eq(menu.nextActionList[1], STK_NEXT_ACTION_NULL);
-      do_check_eq(menu.nextActionList[2], STK_NEXT_ACTION_NULL);
+      equal(menu.title, "Title");
+      equal(menu.items[0].identifier, 1);
+      equal(menu.items[0].text, "item 1");
+      equal(menu.items[1].identifier, 2);
+      equal(menu.items[1].text, "item 2");
+      equal(menu.items[2].identifier, 3);
+      equal(menu.items[2].text, "item 3");
+      equal(menu.nextActionList[0], STK_NEXT_ACTION_END_PROACTIVE_SESSION);
+      equal(menu.nextActionList[1], STK_NEXT_ACTION_NULL);
+      equal(menu.nextActionList[2], STK_NEXT_ACTION_NULL);
     }
   });
 
@@ -1189,13 +1189,13 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let setupCall = cmdDetails.options;
 
-      do_check_eq(setupCall.address, "012340123456,1,2");
-      do_check_eq(setupCall.confirmMessage.text, "Disconnect");
-      do_check_eq(setupCall.confirmMessage.iconSelfExplanatory, true);
-      do_check_eq(setupCall.confirmMessage.icons, 1);
-      do_check_eq(setupCall.callMessage.text, "Message");
-      do_check_eq(setupCall.callMessage.iconSelfExplanatory, false);
-      do_check_eq(setupCall.callMessage.icons, 2);
+      equal(setupCall.address, "012340123456,1,2");
+      equal(setupCall.confirmMessage.text, "Disconnect");
+      equal(setupCall.confirmMessage.iconSelfExplanatory, true);
+      equal(setupCall.confirmMessage.icons, 1);
+      equal(setupCall.callMessage.text, "Message");
+      equal(setupCall.callMessage.iconSelfExplanatory, false);
+      equal(setupCall.callMessage.icons, 2);
     }
   });
 
@@ -1219,12 +1219,12 @@
     typeOfCommand: STK_CMD_TIMER_MANAGEMENT,
     icons: null,
     testFunc: (context, cmdDetails, ctlvs) => {
-      do_check_eq(cmdDetails.commandQualifier, STK_TIMER_START);
+      equal(cmdDetails.commandQualifier, STK_TIMER_START);
 
       let timer = cmdDetails.options;
 
-      do_check_eq(timer.timerId, 0x01);
-      do_check_eq(timer.timerValue, (0x01 * 60 * 60) + (0x02 * 60) + 0x03);
+      equal(timer.timerId, 0x01);
+      equal(timer.timerValue, (0x01 * 60 * 60) + (0x02 * 60) + 0x03);
     }
   });
 
@@ -1240,12 +1240,12 @@
     typeOfCommand: STK_CMD_TIMER_MANAGEMENT,
     icons: null,
     testFunc: (context, cmdDetails, ctlvs) => {
-      do_check_eq(cmdDetails.commandQualifier, STK_TIMER_DEACTIVATE);
+      equal(cmdDetails.commandQualifier, STK_TIMER_DEACTIVATE);
 
       let timer = cmdDetails.options;
 
-      do_check_eq(timer.timerId, 0x01);
-      do_check_true(timer.timerValue === undefined);
+      equal(timer.timerId, 0x01);
+      ok(timer.timerValue === undefined);
     }
   });
 
@@ -1274,10 +1274,10 @@
     typeOfCommand: STK_CMD_PROVIDE_LOCAL_INFO,
     icons: null,
     testFunc: (context, cmdDetails, ctlvs) => {
-      do_check_eq(cmdDetails.commandQualifier, STK_LOCAL_INFO_IMEI);
+      equal(cmdDetails.commandQualifier, STK_LOCAL_INFO_IMEI);
 
       let provideLocalInfo = cmdDetails.options;
-      do_check_eq(provideLocalInfo.localInfoType, STK_LOCAL_INFO_IMEI);
+      equal(provideLocalInfo.localInfoType, STK_LOCAL_INFO_IMEI);
     }
   });
 
@@ -1292,10 +1292,10 @@
     typeOfCommand: STK_CMD_PROVIDE_LOCAL_INFO,
     icons: null,
     testFunc: (context, cmdDetails, ctlvs) => {
-      do_check_eq(cmdDetails.commandQualifier, STK_LOCAL_INFO_DATE_TIME_ZONE);
+      equal(cmdDetails.commandQualifier, STK_LOCAL_INFO_DATE_TIME_ZONE);
 
       let provideLocalInfo = cmdDetails.options;
-      do_check_eq(provideLocalInfo.localInfoType, STK_LOCAL_INFO_DATE_TIME_ZONE);
+      equal(provideLocalInfo.localInfoType, STK_LOCAL_INFO_DATE_TIME_ZONE);
     }
   });
 
@@ -1327,7 +1327,7 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let bipMsg = cmdDetails.options;
 
-      do_check_eq(bipMsg.text, "Open");
+      equal(bipMsg.text, "Open");
     }
   });
 
@@ -1345,7 +1345,7 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let bipMsg = cmdDetails.options;
 
-      do_check_eq(bipMsg.text, "Close");
+      equal(bipMsg.text, "Close");
     }
   });
 
@@ -1363,7 +1363,7 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let bipMsg = cmdDetails.options;
 
-      do_check_eq(bipMsg.text, "Receive");
+      equal(bipMsg.text, "Receive");
     }
   });
 
@@ -1381,7 +1381,7 @@
     testFunc: (context, cmdDetails, ctlvs) => {
       let bipMsg = cmdDetails.options;
 
-      do_check_eq(bipMsg.text, "Send");
+      equal(bipMsg.text, "Send");
     }
   });
 
@@ -1399,7 +1399,7 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
+    equal(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
 
     // Token : we don't care
     this.readInt32();
@@ -1408,48 +1408,48 @@
     //                      TLV_EVENT_LIST_SIZE(3) +
     //                      TLV_LOCATION_STATUS_SIZE(3) +
     //                      TLV_LOCATION_INFO_GSM_SIZE(9))
-    do_check_eq(this.readInt32(), 42);
+    equal(this.readInt32(), 42);
 
     // BER tag
-    do_check_eq(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
+    equal(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
 
     // BER length, 19 = TLV_DEVICE_ID_SIZE(4) +
     //                  TLV_EVENT_LIST_SIZE(3) +
     //                  TLV_LOCATION_STATUS_SIZE(3) +
     //                  TLV_LOCATION_INFO_GSM_SIZE(9)
-    do_check_eq(pduHelper.readHexOctet(), 19);
+    equal(pduHelper.readHexOctet(), 19);
 
     // Event List, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_LOCATION_STATUS);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_EVENT_TYPE_LOCATION_STATUS);
 
     // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     // Location Status, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LOCATION_STATUS |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LOCATION_STATUS |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_SERVICE_STATE_NORMAL);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_SERVICE_STATE_NORMAL);
 
     // Location Info, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LOCATION_INFO |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LOCATION_INFO |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 7);
+    equal(pduHelper.readHexOctet(), 7);
 
-    do_check_eq(pduHelper.readHexOctet(), 0x21); // MCC + MNC
-    do_check_eq(pduHelper.readHexOctet(), 0x63);
-    do_check_eq(pduHelper.readHexOctet(), 0x54);
-    do_check_eq(pduHelper.readHexOctet(), 0); // LAC
-    do_check_eq(pduHelper.readHexOctet(), 0);
-    do_check_eq(pduHelper.readHexOctet(), 0); // Cell ID
-    do_check_eq(pduHelper.readHexOctet(), 0);
+    equal(pduHelper.readHexOctet(), 0x21); // MCC + MNC
+    equal(pduHelper.readHexOctet(), 0x63);
+    equal(pduHelper.readHexOctet(), 0x54);
+    equal(pduHelper.readHexOctet(), 0); // LAC
+    equal(pduHelper.readHexOctet(), 0);
+    equal(pduHelper.readHexOctet(), 0); // Cell ID
+    equal(pduHelper.readHexOctet(), 0);
 
     run_next_test();
   };
@@ -1483,7 +1483,7 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
+    equal(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
 
     // Token : we don't care
     this.readInt32();
@@ -1491,33 +1491,33 @@
     // Data Size, 26 = 2 * (2 + TLV_DEVICE_ID_SIZE(4) +
     //                      TLV_EVENT_LIST_SIZE(3) +
     //                      TLV_LANGUAGE(4))
-    do_check_eq(this.readInt32(), 26);
+    equal(this.readInt32(), 26);
 
     // BER tag
-    do_check_eq(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
+    equal(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
 
     // BER length, 19 = TLV_DEVICE_ID_SIZE(4) +
     //                  TLV_EVENT_LIST_SIZE(3) +
     //                  TLV_LANGUAGE(4)
-    do_check_eq(pduHelper.readHexOctet(), 11);
+    equal(pduHelper.readHexOctet(), 11);
 
     // Event List, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_LANGUAGE_SELECTION);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_EVENT_TYPE_LANGUAGE_SELECTION);
 
     // Device Identifies, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     // Language, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LANGUAGE);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(iccHelper.read8BitUnpackedToString(2), "zh");
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_LANGUAGE);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(iccHelper.read8BitUnpackedToString(2), "zh");
 
     run_next_test();
   };
@@ -1542,32 +1542,32 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
+    equal(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
 
     // Token : we don't care
     this.readInt32();
 
     // Data Size, 18 = 2 * (2 + TLV_DEVICE_ID_SIZE(4) + TLV_EVENT_LIST_SIZE(3))
-    do_check_eq(this.readInt32(), 18);
+    equal(this.readInt32(), 18);
 
     // BER tag
-    do_check_eq(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
+    equal(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
 
     // BER length, 7 = TLV_DEVICE_ID_SIZE(4) + TLV_EVENT_LIST_SIZE(3)
-    do_check_eq(pduHelper.readHexOctet(), 7);
+    equal(pduHelper.readHexOctet(), 7);
 
     // Event List, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_USER_ACTIVITY);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_EVENT_TYPE_USER_ACTIVITY);
 
     // Device Identities, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     run_next_test();
   };
@@ -1591,32 +1591,32 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
+    equal(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
 
     // Token : we don't care
     this.readInt32();
 
     // Data Size, 18 = 2 * (2 + TLV_DEVICE_ID_SIZE(4) + TLV_EVENT_LIST_SIZE(3))
-    do_check_eq(this.readInt32(), 18);
+    equal(this.readInt32(), 18);
 
     // BER tag
-    do_check_eq(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
+    equal(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
 
     // BER length, 7 = TLV_DEVICE_ID_SIZE(4) + TLV_EVENT_LIST_SIZE(3)
-    do_check_eq(pduHelper.readHexOctet(), 7);
+    equal(pduHelper.readHexOctet(), 7);
 
     // Event List, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_IDLE_SCREEN_AVAILABLE);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_EVENT_TYPE_IDLE_SCREEN_AVAILABLE);
 
     // Device Identities, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_DISPLAY);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_DISPLAY);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     run_next_test();
   };
@@ -1640,40 +1640,40 @@
 
   buf.sendParcel = function() {
     // Type
-    do_check_eq(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
+    equal(this.readInt32(), REQUEST_STK_SEND_ENVELOPE_COMMAND);
 
     // Token : we don't care
     this.readInt32();
 
     // Data Size, 24 = 2 * ( 2+TLV_DEVICE_ID(4)+TLV_EVENT_LIST_SIZE(3)
     //                        +TLV_BROWSER_TERMINATION_CAUSE(3) )
-    do_check_eq(this.readInt32(), 24);
+    equal(this.readInt32(), 24);
 
     // BER tag
-    do_check_eq(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
+    equal(pduHelper.readHexOctet(), BER_EVENT_DOWNLOAD_TAG);
 
     // BER length, 10 = TLV_DEVICE_ID(4)+TLV_EVENT_LIST_SIZE(3)
     //                  ++TLV_BROWSER_TERMINATION_CAUSE(3)
-    do_check_eq(pduHelper.readHexOctet(), 10);
+    equal(pduHelper.readHexOctet(), 10);
 
     // Event List, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_EVENT_LIST |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_EVENT_TYPE_BROWSER_TERMINATION);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_EVENT_TYPE_BROWSER_TERMINATION);
 
     // Device Identities, Type-Length-Value(Source ID-Destination ID)
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_DEVICE_ID |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 2);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
-    do_check_eq(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
+    equal(pduHelper.readHexOctet(), 2);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_ME);
+    equal(pduHelper.readHexOctet(), STK_DEVICE_ID_SIM);
 
     // Browser Termination Case, Type-Length-Value
-    do_check_eq(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_BROWSER_TERMINATION_CAUSE |
+    equal(pduHelper.readHexOctet(), COMPREHENSIONTLV_TAG_BROWSER_TERMINATION_CAUSE |
                                           COMPREHENSIONTLV_FLAG_CR);
-    do_check_eq(pduHelper.readHexOctet(), 1);
-    do_check_eq(pduHelper.readHexOctet(), STK_BROWSER_TERMINATION_CAUSE_USER);
+    equal(pduHelper.readHexOctet(), 1);
+    equal(pduHelper.readHexOctet(), STK_BROWSER_TERMINATION_CAUSE_USER);
 
     run_next_test();
   };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_voiceprivacy.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_voiceprivacy.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/gonk/tests/test_ril_worker_voiceprivacy.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/gonk/tests/test_ril_worker_voiceprivacy.js	2015-02-28 15:03:09.000000000 +0000
@@ -24,7 +24,7 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
+  equal(postedMessage.errorMsg, undefined);
 
   run_next_test();
 });
@@ -46,7 +46,7 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, "GenericFailure");
+  equal(postedMessage.errorMsg, "GenericFailure");
 
   run_next_test();
 });
@@ -70,8 +70,8 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_true(postedMessage.enabled);
+  equal(postedMessage.errorMsg, undefined);
+  ok(postedMessage.enabled);
   run_next_test();
 });
 
@@ -94,7 +94,7 @@
 
   let postedMessage = workerHelper.postedMessage;
 
-  do_check_eq(postedMessage.errorMsg, undefined);
-  do_check_false(postedMessage.enabled);
+  equal(postedMessage.errorMsg, undefined);
+  ok(!postedMessage.enabled);
   run_next_test();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/OSFileConstants.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/OSFileConstants.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/system/OSFileConstants.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/system/OSFileConstants.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -800,7 +800,7 @@
       return &val.toObject();
     }
 
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, js::GetErrorMessage, nullptr,
       JSMSG_UNEXPECTED_TYPE, aProperty, "not an object");
     return nullptr;
   }
@@ -839,7 +839,7 @@
     // |gInitialized == true| but |gPaths == nullptr|. We cannot
     // |MOZ_ASSERT| this, as this would kill precompile_cache.js,
     // so we simply return an error.
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, js::GetErrorMessage, nullptr,
       JSMSG_CANT_OPEN, "OSFileConstants", "initialization has failed");
     return false;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/ajax/offline/test_lowDeviceStorage.html	2015-02-28 15:03:09.000000000 +0000
@@ -42,11 +42,11 @@
     updateStateChanged: function (aUpdate, aState) {
       switch(aState) {
         case Ci.nsIOfflineCacheUpdateObserver.STATE_ERROR:
-          aUpdate.removeObserver(this);
           errorReceived = true;
           OfflineTest.ok(true, "Expected error. Update canceled");
         break;
         case Ci.nsIOfflineCacheUpdateObserver.STATE_FINISHED:
+          aUpdate.removeObserver(this);
           OfflineTest.ok(errorReceived,
                          "Finished after receiving the expected error");
           finish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/bugs/test_bug265203.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/bugs/test_bug265203.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/bugs/test_bug265203.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/bugs/test_bug265203.html	2015-02-28 15:03:09.000000000 +0000
@@ -40,11 +40,6 @@
 <script type="application/javascript">
 
 /** Test for Bug 265203 **/
-
-// Turn off spatial navigation because it hijacks VK_RIGHT and VK_LEFT keydown
-// events
-SpecialPowers.setBoolPref("snav.enabled", false);
-
 var gTestStarted = false;
 var expectedResult = [ null, 0, null ];
 var nextTest;
@@ -101,8 +96,9 @@
   if (gTestStarted)
     return;
   gTestStarted = true;
-
-  SpecialPowers.pushPrefEnv({"set": [["accessibility.browsewithcaret", true]]}, test0);
+  // Turn off spatial navigation because it hijacks VK_RIGHT and VK_LEFT keydown
+  // events
+  SpecialPowers.pushPrefEnv({"set": [["accessibility.browsewithcaret", true], ["snav.enabled", false]]}, test0);
 }
 
 SimpleTest.waitForExplicitFinish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/chrome/test_clipboard_events_chrome.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/chrome/test_clipboard_events_chrome.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/chrome/test_clipboard_events_chrome.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/chrome/test_clipboard_events_chrome.html	2015-02-28 15:03:09.000000000 +0000
@@ -12,9 +12,10 @@
 SimpleTest.waitForExplicitFinish();
 function runTest()
 {
-  SpecialPowers.setBoolPref("dom.event.clipboardevents.enabled", false);
-  window.open("data:text/html,<body onload='window.opener.doChecks(this)'><input id='i' value='Sample Text'></body>",
-              "_blank", "chrome,width=200,height=200");
+  SpecialPowers.pushPrefEnv({"set": [['dom.event.clipboardevents.enabled', false]]}, function() {
+    window.open("data:text/html,<body onload='window.opener.doChecks(this)'><input id='i' value='Sample Text'></body>",
+                "_blank", "chrome,width=200,height=200");
+  });
 }
 
 var event_fired = false;
@@ -49,7 +50,6 @@
     is(textbox.value, "STeText", "paste changed text when preference is disabled");
     ok(event_fired, "paste event fired when preference is disabled")
 
-    SpecialPowers.clearUserPref("dom.event.clipboardevents.enabled");
     win.close();
     SimpleTest.finish();
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/chrome/test_MozEnteredDomFullscreen_event.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/chrome/test_MozEnteredDomFullscreen_event.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/chrome/test_MozEnteredDomFullscreen_event.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/chrome/test_MozEnteredDomFullscreen_event.xul	2015-02-28 15:03:09.000000000 +0000
@@ -13,11 +13,8 @@
 
 // Ensure the full-screen api is enabled, and will be disabled on test exit.
 var gPrevEnabled = SpecialPowers.getBoolPref("full-screen-api.enabled");
-SpecialPowers.setBoolPref("full-screen-api.enabled", true);
-
 var gPrevTrusted = SpecialPowers.getBoolPref("full-screen-api.allow-trusted-requests-only");
-SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", false);
-
+var newwindow;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
@@ -35,13 +32,16 @@
                   .getNoAppCodebasePrincipal(uri);
 pm.removeFromPrincipal(principal, "fullscreen");
 
-newwindow = window.open("MozEnteredDomFullscreen_chrome.xul", "_blank","chrome,resizable=yes,width=400,height=400");
+SpecialPowers.pushPrefEnv({"set": [['full-screen-api.enabled', true],
+                                   ['full-screen-api.allow-trusted-requests-only', false]]}, setup);
+
+function setup() {
+   newwindow = window.open("MozEnteredDomFullscreen_chrome.xul", "_blank","chrome,resizable=yes,width=400,height=400");
+}
 
 function done()
 {
   newwindow.close();
-  SpecialPowers.setBoolPref("full-screen-api.enabled", gPrevEnabled);
-  SpecialPowers.setBoolPref("full-screen-api.allow-trusted-requests-only", gPrevTrusted);
   SimpleTest.finish();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/mochitest.ini	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/mochitest.ini	2015-02-28 15:03:11.000000000 +0000
@@ -47,6 +47,8 @@
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 [test_bug653364.html]
 [test_bug861217.html]
+[test_bug1077002.html]
+run-if = e10s
 [test_clientRects.html]
 [test_clipboard_events.html]
 skip-if = e10s || buildapp == 'b2g' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_bug1077002.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_bug1077002.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_bug1077002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_bug1077002.html	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1077002
+-->
+<head>
+  <title>Test for Bug 1077002</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank"
+    href="https://bugzilla.mozilla.org/show_bug.cgi?id=1077002">Mozilla Bug 1077002</a>
+<p id="display"></p>
+<div id="content">
+  <iframe id="frame" style="height:100px; width:100px; border:0"></iframe>
+  <div id="status" style="display: none"></div>
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.7">
+
+/** Test for Bug 1077002 **/
+
+try {
+    // NB: This test runs in e10s only. In e10s showModalDialog should only
+    // ever throw NS_ERROR_NOT_AVAILABLE.
+    window.showModalDialog("http://example.org");
+} catch (e) {
+    is(e.name, "NS_ERROR_NOT_AVAILABLE", "throw the correct error message");
+}
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_clipboard_events.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_clipboard_events.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_clipboard_events.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_clipboard_events.html	2015-02-28 15:03:11.000000000 +0000
@@ -679,4 +679,3 @@
 </pre>
 </body>
 </html>
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_interfaces.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_interfaces.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_interfaces.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_interfaces.html	2015-02-28 15:03:11.000000000 +0000
@@ -88,6 +88,7 @@
     {name: "Atomics", nightly: true},
     "StopIteration",
     "String",
+    "Symbol",
     "SyntaxError",
     {name: "TypedObject", nightly: true},
     "TypeError",
@@ -102,12 +103,6 @@
 // IMPORTANT: Do not change the list above without review from
 //            a JavaScript Engine peer!
 
-// Symbol is conditionally defined.
-// If it's defined, insert "Symbol" before "SyntaxError".
-if (typeof Symbol === "function") {
-  ecmaGlobals.splice(ecmaGlobals.indexOf("SyntaxError"), 0, "Symbol");
-}
-
 // IMPORTANT: Do not change the list below without review from a DOM peer,
 //            except to remove items from it!
 //
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_vibrator.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_vibrator.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/general/test_vibrator.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/general/test_vibrator.html	2015-02-28 15:03:11.000000000 +0000
@@ -12,6 +12,7 @@
      navigator.vibrate throws an exception where appropriate. -->
 
 <script class="testbody" type="text/javascript;version=1.7">
+SimpleTest.waitForExplicitFinish();
 var result;
 function expectFailure(param) {
   result = navigator.vibrate(param);
@@ -23,7 +24,7 @@
   is(result, true, 'vibrate(' + param + ') must succeed.');
 }
 
-function tests() {
+function tests(aEnabled) {
   // Some edge cases that the bindings should handle for us.
   expectSuccess(null);
   expectSuccess(undefined);
@@ -68,24 +69,18 @@
     navigator.vibrate([100, 100]);
   }
   ok(true, "Didn't crash after issuing a lot of vibrate() calls.");
+  if(!aEnabled)
+    SimpleTest.finish();
 }
 
-var origVibratorEnabled = SpecialPowers.getBoolPref('dom.vibrator.enabled');
-
 // Test with the vibrator pref enabled.
-try {
-  SpecialPowers.setBoolPref('dom.vibrator.enabled', true);
-  tests();
-
-  // Everything should be the same when the vibrator is disabled -- in
-  // particular, a disabled vibrator shouldn't eat failures we'd otherwise
-  // observe.
-  SpecialPowers.setBoolPref('dom.vibrator.enabled', false);
-  tests();
-}
-finally {
-  SpecialPowers.setBoolPref('dom.vibrator.enabled', origVibratorEnabled);
-}
+SpecialPowers.pushPrefEnv({"set": [['dom.vibrator.enabled', true]]}, function() {
+  tests(true);
+  SpecialPowers.pushPrefEnv({"set": [['dom.vibrator.enabled', false]]}, tests(false));
+});
+// Everything should be the same when the vibrator is disabled -- in
+// particular, a disabled vibrator shouldn't eat failures we'd otherwise
+// observe.
 
 </script>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/localstorage/test_appIsolation.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/localstorage/test_appIsolation.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/localstorage/test_appIsolation.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/localstorage/test_appIsolation.html	2015-02-28 15:03:11.000000000 +0000
@@ -12,18 +12,6 @@
 var fileTestOnCurrentOrigin = (location.protocol + "//" + location.host + location.pathname)
                               .replace("test_a", "frameA");
 
-var previousPrefs = {
-  mozBrowserFramesEnabled: undefined,
-};
-
-try {
-  previousPrefs.mozBrowserFramesEnabled = SpecialPowers.getBoolPref('dom.mozBrowserFramesEnabled');
-} catch(e)
-{
-}
-
-SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
-
 SpecialPowers.addPermission("browser", true, window.document);
 SpecialPowers.addPermission("embed-apps", true, window.document);
 
@@ -110,10 +98,6 @@
           SpecialPowers.removePermission("browser", window.document);
           SpecialPowers.removePermission("embed-apps", window.document);
 
-          if (previousPrefs.mozBrowserFramesEnabled !== undefined) {
-            SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', previousPrefs.mozBrowserFramesEnabled);
-          }
-
           SimpleTest.finish();
         } else {
           gTestRunner.next();
@@ -131,6 +115,10 @@
 
 var gTestRunner = runTest();
 
+addLoadEvent(function() {
+  SpecialPowers.pushPrefEnv({"set": [['dom.mozBrowserFramesEnabled', true]]}, startTest);
+});
+
 function startTest()
 {
   is(localStorage.getItem("0"), null, "no data");
@@ -139,9 +127,6 @@
 
   gTestRunner.next();
 }
-
-addLoadEvent(startTest);
-
 </script>
 
 </head>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/webapps/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/webapps/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/webapps/head.js	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/webapps/head.js	2015-02-28 15:03:11.000000000 +0000
@@ -54,6 +54,38 @@
   popupPanel.addEventListener("popupshown", onPopupShown, false);
 }
 
+function promiseNoPopup() {
+  var Ci = SpecialPowers.Ci;
+
+  var popupNotifications = SpecialPowers.wrap(window).top.
+                           QueryInterface(Ci.nsIInterfaceRequestor).
+                           getInterface(Ci.nsIWebNavigation).
+                           QueryInterface(Ci.nsIDocShell).
+                           chromeEventHandler.ownerDocument.defaultView.
+                           PopupNotifications;
+
+  return new Promise((resolve) => {
+    var tries = 0;
+    var interval = setInterval(function() {
+      if (tries >= 30) {
+        ok(true, "The webapps-install notification didn't appear");
+        moveOn();
+      }
+
+      if (popupNotifications.getNotification("webapps-install")) {
+        ok(false, "Found the webapps-install notification");
+        moveOn();
+      }
+      tries++;
+    }, 100);
+
+    var moveOn = () => {
+      clearInterval(interval);
+      resolve();
+    };
+  });
+}
+
 // We need to mock the Alerts service, otherwise the alert that is shown
 // at the end of an installation makes the test leak the app's icon.
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/webapps/test_bug_771294.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/webapps/test_bug_771294.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/webapps/test_bug_771294.xul	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/webapps/test_bug_771294.xul	2015-02-28 15:03:11.000000000 +0000
@@ -24,40 +24,22 @@
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PopupNotifications.jsm");
 
-let blocked = true;
-
-function blockedListener() {
-  blocked = false;
-}
-
-let panel = window.top.QueryInterface(Ci.nsIInterfaceRequestor)
-                  .getInterface(Ci.nsIWebNavigation)
-                  .QueryInterface(Ci.nsIDocShell)
-                  .chromeEventHandler.ownerDocument.defaultView
-                  .PopupNotifications.panel;
-
-panel.addEventListener("popupshowing", blockedListener, false);
-
-Services.obs.addObserver(
-  function observeInstalling() {
-    Services.obs.removeObserver(observeInstalling, "webapps-ask-install");
-    // Spin the event loop before running the test to give the registry time
-    // to process the install request and (hopefully not) show the doorhanger.
-    setTimeout(function verify() {
-      ok(blocked, "Install panel was blocked after immediate redirect");
-      panel.removeEventListener("popupshowing", blockedListener);
-      SimpleTest.finish();
-    }, 0);
-  },
-  "webapps-ask-install",
-  false
-);
-
+let PopupNotifications = window.top.QueryInterface(Ci.nsIInterfaceRequestor)
+                                   .getInterface(Ci.nsIWebNavigation)
+                                   .QueryInterface(Ci.nsIDocShell)
+                                   .chromeEventHandler.ownerDocument.defaultView
+                                   .PopupNotifications;
+addEventListener("DOMContentLoaded", () => {
+  let iframe = document.getElementById("iframe");
+  iframe.addEventListener("load", function(e) {
+    promiseNoPopup().then(SimpleTest.finish);
+  });
+});
 </script>
 
   <!-- Load a page that initiates an app installation and then immediately
      - redirects to a page at a different origin.  We can't do this directly
      - inside this test page, because that would cause the test to hang. -->
-  <iframe src="http://test/chrome/dom/tests/mochitest/webapps/install_and_redirect_helper.xul"/>
+  <iframe id="iframe" src="http://test/chrome/dom/tests/mochitest/webapps/install_and_redirect_helper.xul"/>
 
 </window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/webcomponents/test_unresolved_pseudo_class.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/webcomponents/test_unresolved_pseudo_class.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tests/mochitest/webcomponents/test_unresolved_pseudo_class.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tests/mochitest/webcomponents/test_unresolved_pseudo_class.html	2015-02-28 15:03:11.000000000 +0000
@@ -88,7 +88,7 @@
 del.setAttribute("is", "foobar");
 par.appendChild(del);
 is(getComputedStyle(del).color, "rgb(0, 0, 255)", "del - color (after reappend)");
-var Del = document.registerElement('x-del', { prototype: Object.create(HTMLSpanElement.prototype) });
+var Del = document.registerElement('x-del', { extends: 'span', prototype: Object.create(HTMLSpanElement.prototype) });
 // [is="x-del"] will not match any longer so the rule of span will apply
 is(getComputedStyle(del).color, "rgb(0, 255, 0)", "del - color (after registerElement)");
 // but the element should have been upgraded:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tv/test/mochitest/test_tv_non_permitted_app.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tv/test/mochitest/test_tv_non_permitted_app.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/tv/test/mochitest/test_tv_non_permitted_app.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/tv/test/mochitest/test_tv_non_permitted_app.html	2015-02-28 15:03:11.000000000 +0000
@@ -14,14 +14,13 @@
 
 var tests = [
   function() {
-    SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true]]}, function() {
+    SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true],["dom.mozBrowserFramesEnabled", true]]}, function() {
       SpecialPowers.pushPermissions(
         [{ "type": "browser", "allow": true, "context": document },
          { "type": "embed-apps", "allow": true, "context": document },
          { "type": "webapps-manage", "allow": true, "context": document }],
         function() {
           SpecialPowers.setAllAppsLaunchable(true);
-          SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
           // No confirmation needed when an app is installed and uninstalled.
           SpecialPowers.autoConfirmAppInstall(() => {
             SpecialPowers.autoConfirmAppUninstall(runTest);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/AnimationPlayer.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/AnimationPlayer.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/AnimationPlayer.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/AnimationPlayer.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -20,7 +20,7 @@
   readonly attribute Animation? source;
   readonly attribute AnimationTimeline timeline;
   [BinaryName="startTimeAsDouble"]
-  readonly attribute double? startTime;
+  attribute double? startTime;
   [BinaryName="currentTimeAsDouble"]
   readonly attribute double? currentTime;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Apps.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Apps.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Apps.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Apps.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -11,7 +11,7 @@
 
 dictionary LanguageDesc {
   DOMString target;
-  DOMString version;
+  long revision;
   DOMString name;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/BluetoothPairingEvent.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/BluetoothPairingEvent.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/BluetoothPairingEvent.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/BluetoothPairingEvent.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -9,12 +9,12 @@
              optional BluetoothPairingEventInit eventInitDict)]
 interface BluetoothPairingEvent : Event
 {
-  readonly attribute BluetoothDevice        device;
+  readonly attribute DOMString              deviceName;
   readonly attribute BluetoothPairingHandle handle;
 };
 
 dictionary BluetoothPairingEventInit : EventInit
 {
-  required BluetoothDevice        device;
+  required DOMString              deviceName;
   required BluetoothPairingHandle handle;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/BrowserElement.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/BrowserElement.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/BrowserElement.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/BrowserElement.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -8,6 +8,7 @@
 
 dictionary BrowserElementDownloadOptions {
   DOMString? filename;
+  DOMString? referrer;
 };
 
 [NoInterfaceObject]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Clients.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Clients.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Clients.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Clients.webidl	2015-02-28 15:03:11.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/.
+ *
+ * The origin of this IDL file is
+ * http://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html
+ *
+ */
+
+[Exposed=ServiceWorker]
+interface Clients {
+  // A list of client objects, identifiable by ID, that correspond to windows
+  // (or workers) that are "controlled" by this SW
+  [Throws]
+  Promise<sequence<Client>?> matchAll(optional ClientQueryOptions options);
+};
+
+dictionary ClientQueryOptions {
+  boolean includeUncontrolled = false;
+  ClientType type = "window";
+};
+
+enum ClientType {
+  "window",
+  "worker",
+  "sharedworker",
+  "all"
+};
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Client.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Client.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Client.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Client.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,17 @@
+/* -*- 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/.
+ *
+ * The origin of this IDL file is
+ * http://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html
+ *
+ */
+
+[Exposed=ServiceWorker]
+interface Client {
+  readonly attribute unsigned long id;
+
+  [Throws]
+  void postMessage(any message, optional sequence<Transferable> transfer);
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Constraints.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Constraints.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Constraints.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Constraints.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -29,11 +29,25 @@
 };
 
 dictionary ConstrainLongRange {
-    long min = -2147483647; // +1 works around windows compiler bug
-    long max = 2147483647;
+    long min;
+    long max;
+    long exact;
+    long ideal;
 };
 
 dictionary ConstrainDoubleRange {
-    unrestricted double min = -Infinity;
-    unrestricted double max = Infinity;
+    double min;
+    double max;
+    double exact;
+    double ideal;
+};
+
+dictionary ConstrainBooleanParameters {
+    boolean exact;
+    boolean ideal;
+};
+
+dictionary ConstrainDOMStringParameters {
+    (DOMString or sequence<DOMString>) exact;
+    (DOMString or sequence<DOMString>) ideal;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Downloads.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Downloads.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Downloads.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Downloads.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -36,10 +36,32 @@
   [UnsafeInPrerendering]
   Promise<DOMDownload> remove(DOMDownload download);
 
-  // Removes all the completed downloads from the set.  Returns an
-  // array of the completed downloads that were removed.
+  // Removes all completed downloads.  This kicks off an asynchronous process
+  // that will eventually complete, but will not have completed by the time this
+  // method returns.  If you care about the side-effects of this method, know
+  // that each existing download will have its onstatechange method invoked and
+  // will have a new state of "finalized".  (After the download is finalized, no
+  // further events will be generated on it.)
   [UnsafeInPrerendering]
-  Promise<sequence<DOMDownload>> clearAllDone();
+  void clearAllDone();
+
+  // Add completed downloads from applications that must perform the download
+  // process themselves. For example, email.  The method is resolved with a
+  // fully populated DOMDownload instance on success, or rejected in the
+  // event all required options were not provided.
+  //
+  // The adopted download will also be reported via the ondownloadstart event
+  // handler.
+  //
+  // Applications must currently be certified to use this, but it could be
+  // widened at a later time.
+  //
+  // Note that "download" is not actually optional, but WebIDL requires that it
+  // be marked as such because it is not followed by a required argument.  The
+  // promise will be rejected if the dictionary is omitted or the specified
+  // file does not exist on disk.
+  [AvailableIn=CertifiedApps]
+  Promise<DOMDownload> adoptDownload(optional AdoptDownloadDict download);
 
   // Fires when a new download starts.
   attribute EventHandler ondownloadstart;
@@ -59,7 +81,9 @@
   readonly attribute DOMString url;
 
   // The full path in local storage where the file will end up once the download
-  // is complete.
+  // is complete. This is equivalent to the concatenation of the 'storagePath'
+  // to the 'mountPoint' of the nsIVolume associated with the 'storageName'
+  // (with delimiter).
   readonly attribute DOMString path;
 
   // The DeviceStorage volume name on which the file is being downloaded.
@@ -69,7 +93,10 @@
   // downloaded.
   readonly attribute DOMString storagePath;
 
-  // The state of the download.
+  // The state of the download.  One of: downloading, stopped, succeeded, or
+  // finalized.  A finalized download is a download that has been removed /
+  // cleared and is no longer tracked by the download manager and will not
+  // receive any further onstatechange updates.
   readonly attribute DownloadState state;
 
   // The mime type for this resource.
@@ -82,6 +109,10 @@
   // download (eg. in different windows) will have the same id.
   readonly attribute DOMString id;
 
+  // The manifestURL of the application that added this download. Only used for
+  // downloads added via the adoptDownload API call.
+  readonly attribute DOMString? sourceAppManifestURL;
+
   // A DOM error object, that will be not null when a download is stopped
   // because something failed.
   readonly attribute DOMError? error;
@@ -100,3 +131,41 @@
   // - when the state and/or error attributes change.
   attribute EventHandler onstatechange;
 };
+
+// Used to initialize the DOMDownload object for adopted downloads.
+// fields directly maps to the DOMDownload fields.
+dictionary AdoptDownloadDict {
+  // The URL of this resource if there is one available. An empty string if
+  // the download is not accessible via URL. An empty string is chosen over
+  // null so that existinc code does not need to null-check but the value is
+  // still falsey.  (Note: If you do have a usable URL, you should probably not
+  // be using the adoptDownload API and instead be initiating downloads the
+  // normal way.)
+  DOMString url;
+
+  // The storageName of the DeviceStorage instance the file was saved to.
+  // Required but marked as optional so the bindings don't auto-coerce the value
+  // null to "null".
+  DOMString? storageName;
+  // The path of the file within the DeviceStorage instance named by
+  // 'storageName'.  This is used to automatically compute the 'path' of the
+  // download.  Note that when DeviceStorage gives you a path to a file, the
+  // first path segment is the name of the specific device storage and you do
+  // *not* want to include this.  For example, if DeviceStorage tells you the
+  // file has a path of '/sdcard1/actual/path/file.ext', then the storageName
+  // should be 'sdcard1' and the storagePath should be 'actual/path/file.ext'.
+  //
+  // The existence of the file will be validated will be validated with stat()
+  // and the size the file-system tells us will be what we use.
+  //
+  // Required but marked as optional so the bindings don't auto-coerce the value
+  // null to "null".
+  DOMString? storagePath;
+
+  // The mime type for this resource.  Required, but marked as optional because
+  // WebIDL otherwise auto-coerces the value null to "null".
+  DOMString? contentType;
+
+  // The time the download was started. If omitted, the current time is used.
+  Date? startTime;
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/EventTarget.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/EventTarget.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/EventTarget.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/EventTarget.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -43,6 +43,6 @@
 // chrome easier.  This returns the window which can be used to create
 // events to fire at this EventTarget, or null if there isn't one.
 partial interface EventTarget {
-  [ChromeOnly]
+  [ChromeOnly, Exposed=Window]
   readonly attribute WindowProxy? ownerGlobal;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/FetchEvent.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/FetchEvent.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/FetchEvent.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/FetchEvent.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,27 @@
+/* -*- 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 FetchEventInit eventInitDict),
+ Func="mozilla::dom::workers::ServiceWorkerVisible",
+ Exposed=(ServiceWorker)]
+interface FetchEvent : Event {
+  readonly attribute Request request;
+  readonly attribute Client client; // The window issuing the request.
+  readonly attribute boolean isReload;
+
+  [Throws] void respondWith(Promise<Response> r);
+  Promise<Response> forwardTo(USVString url);
+  Promise<Response> default();
+};
+
+dictionary FetchEventInit : EventInit {
+  Request request;
+  Client client;
+  boolean isReload;
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/FormData.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/FormData.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/FormData.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/FormData.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -7,8 +7,17 @@
  * http://xhr.spec.whatwg.org
  */
 
+typedef (File or USVString) FormDataEntryValue;
+
 [Constructor(optional HTMLFormElement form)]
 interface FormData {
-  void append(DOMString name, Blob value, optional DOMString filename);
-  void append(DOMString name, DOMString value);
+  void append(USVString name, Blob value, optional USVString filename);
+  void append(USVString name, USVString value);
+  void delete(USVString name);
+  FormDataEntryValue? get(USVString name);
+  sequence<FormDataEntryValue> getAll(USVString name);
+  boolean has(USVString name);
+  void set(USVString name, Blob value, optional USVString filename);
+  void set(USVString name, USVString value);
+  // iterable<USVString, FormDataEntryValue>; - Bug 1127703
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaKeysRequestStatus.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaKeysRequestStatus.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaKeysRequestStatus.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaKeysRequestStatus.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -10,6 +10,7 @@
   "cdm-disabled",
   "cdm-not-supported",
   "cdm-not-installed",
+  "cdm-insufficient-version",
   "cdm-created",
   "error"
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaStreamTrack.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaStreamTrack.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaStreamTrack.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaStreamTrack.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -11,7 +11,6 @@
  */
 
 dictionary MediaTrackConstraints : MediaTrackConstraintSet {
-    sequence<DOMString> require;
     sequence<MediaTrackConstraintSet> advanced;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaStream.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaStream.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaStream.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaStream.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -28,7 +28,7 @@
 };
 
 interface MediaStream : EventTarget {
-    // readonly attribute DOMString    id;
+    readonly attribute DOMString    id;
     sequence<AudioStreamTrack> getAudioTracks();
     sequence<VideoStreamTrack> getVideoTracks();
     sequence<MediaStreamTrack> getTracks();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaTrackConstraintSet.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaTrackConstraintSet.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/MediaTrackConstraintSet.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/MediaTrackConstraintSet.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -23,9 +23,9 @@
 };
 
 dictionary MediaTrackConstraintSet {
-    ConstrainLongRange width;
-    ConstrainLongRange height;
-    ConstrainDoubleRange frameRate;
+    ConstrainLong width;
+    ConstrainLong height;
+    ConstrainDouble frameRate;
     ConstrainDOMString facingMode;
     DOMString mediaSource = "camera";
     long long browserWindow;
@@ -34,4 +34,5 @@
 
 typedef (long or ConstrainLongRange) ConstrainLong;
 typedef (double or ConstrainDoubleRange) ConstrainDouble;
-typedef (DOMString or sequence<DOMString>) ConstrainDOMString;
+typedef (boolean or ConstrainBooleanParameters) ConstrainBoolean;
+typedef (DOMString or sequence<DOMString> or ConstrainDOMStringParameters) ConstrainDOMString;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/moz.build	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -70,6 +70,8 @@
     'CharacterData.webidl',
     'ChildNode.webidl',
     'ChromeNotifications.webidl',
+    'Client.webidl',
+    'Clients.webidl',
     'ClipboardEvent.webidl',
     'CommandEvent.webidl',
     'Comment.webidl',
@@ -132,6 +134,7 @@
     'EventTarget.webidl',
     'ExtendableEvent.webidl',
     'Fetch.webidl',
+    'FetchEvent.webidl',
     'File.webidl',
     'FileList.webidl',
     'FileMode.webidl',
@@ -353,6 +356,7 @@
     'RTCConfiguration.webidl',
     'RTCIceCandidate.webidl',
     'RTCIdentityAssertion.webidl',
+    'RTCIdentityProvider.webidl',
     'RTCPeerConnection.webidl',
     'RTCPeerConnectionStatic.webidl',
     'RTCRtpReceiver.webidl',
@@ -365,8 +369,6 @@
     'ScrollBoxObject.webidl',
     'Selection.webidl',
     'ServiceWorker.webidl',
-    'ServiceWorkerClient.webidl',
-    'ServiceWorkerClients.webidl',
     'ServiceWorkerContainer.webidl',
     'ServiceWorkerGlobalScope.webidl',
     'ServiceWorkerRegistration.webidl',
@@ -737,8 +739,6 @@
     'RecordErrorEvent.webidl',
     'RTCDataChannelEvent.webidl',
     'RTCPeerConnectionIceEvent.webidl',
-    'RTCPeerConnectionIdentityErrorEvent.webidl',
-    'RTCPeerConnectionIdentityEvent.webidl',
     'ScrollViewChangeEvent.webidl',
     'SelectionStateChangedEvent.webidl',
     'StyleRuleChangeEvent.webidl',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Navigator.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Navigator.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Navigator.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Navigator.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -420,3 +420,10 @@
                               optional sequence<MediaKeySystemOptions> supportedConfigurations);
 };
 #endif
+
+#ifdef NIGHTLY_BUILD
+partial interface Navigator {
+  [Func="Navigator::IsE10sEnabled"]
+  readonly attribute boolean mozE10sEnabled;
+};
+#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Request.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Request.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Request.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Request.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -23,7 +23,8 @@
   readonly attribute RequestCredentials credentials;
   readonly attribute RequestCache cache;
 
-  [NewObject] Request clone();
+  [Throws,
+   NewObject] Request clone();
 
   // Bug 1124638 - Allow chrome callers to set the context.
   [ChromeOnly]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Response.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Response.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/Response.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/Response.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -18,12 +18,15 @@
   readonly attribute ResponseType type;
 
   readonly attribute USVString url;
+  [Throws]
+           attribute boolean finalURL;
   readonly attribute unsigned short status;
   readonly attribute boolean ok;
   readonly attribute ByteString statusText;
   [SameObject] readonly attribute Headers headers;
 
-  [NewObject] Response clone();
+  [Throws,
+   NewObject] Response clone();
 };
 Response implements Body;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCIdentityProvider.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCIdentityProvider.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCIdentityProvider.webidl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCIdentityProvider.webidl	2015-02-28 15:03:11.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/.
+ *
+ * http://w3c.github.io/webrtc-pc/ (with https://github.com/w3c/webrtc-pc/pull/178)
+ */
+
+[NoInterfaceObject]
+interface RTCIdentityProviderRegistrar {
+  void register(RTCIdentityProvider idp);
+
+  /* The IdP that was passed to register() to chrome code, if any. */
+  [ChromeOnly]
+  readonly attribute RTCIdentityProvider? idp;
+  /* The following two chrome-only functions forward to the corresponding
+   * function on the registered IdP.  This is necessary because the
+   * JS-implemented WebIDL can't see these functions on `idp` above, chrome JS
+   * gets an Xray onto the content code that suppresses functions, see
+   * https://developer.mozilla.org/en-US/docs/Xray_vision#Xrays_for_JavaScript_objects
+   */
+  /* Forward to idp.generateAssertion() */
+  [ChromeOnly, Throws]
+  Promise<RTCIdentityAssertionResult>
+  generateAssertion(DOMString contents, DOMString origin,
+                    optional DOMString usernameHint);
+  /* Forward to idp.validateAssertion() */
+  [ChromeOnly, Throws]
+  Promise<RTCIdentityValidationResult>
+  validateAssertion(DOMString assertion, DOMString origin);
+};
+
+callback interface RTCIdentityProvider {
+  Promise<RTCIdentityAssertionResult>
+  generateAssertion(DOMString contents, DOMString origin,
+                    optional DOMString usernameHint);
+  Promise<RTCIdentityValidationResult>
+  validateAssertion(DOMString assertion, DOMString origin);
+};
+
+dictionary RTCIdentityAssertionResult {
+  required RTCIdentityProviderDetails idp;
+  required DOMString assertion;
+};
+
+dictionary RTCIdentityProviderDetails {
+  required DOMString domain;
+  DOMString protocol = "default";
+};
+
+dictionary RTCIdentityValidationResult {
+  required DOMString identity;
+  required DOMString contents;
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCPeerConnectionIdentityErrorEvent.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCPeerConnectionIdentityErrorEvent.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCPeerConnectionIdentityErrorEvent.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCPeerConnectionIdentityErrorEvent.webidl	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +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/.
- *
- * Proposed only, not in spec yet:
- * http://lists.w3.org/Archives/Public/public-webrtc/2013Dec/0104.html
- */
-
-dictionary RTCPeerConnectionIdentityErrorEventInit : EventInit {
-  DOMString idp = "";
-  DOMString protocol = "";
-  DOMString? loginUrl = null;
-};
-
-[ChromeOnly,
- Constructor(DOMString type,
-             optional RTCPeerConnectionIdentityErrorEventInit eventInitDict)]
-interface RTCPeerConnectionIdentityErrorEvent : Event {
-  readonly attribute DOMString idp;
-  readonly attribute DOMString protocol;
-  readonly attribute DOMString? loginUrl;
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCPeerConnectionIdentityEvent.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCPeerConnectionIdentityEvent.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCPeerConnectionIdentityEvent.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCPeerConnectionIdentityEvent.webidl	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +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/.
- *
- * Proposed only, not in spec yet:
- * http://lists.w3.org/Archives/Public/public-webrtc/2013Dec/0104.html
- */
-
-dictionary RTCPeerConnectionIdentityEventInit : EventInit {
-  DOMString? assertion = null;
-};
-
-[ChromeOnly,
- Constructor(DOMString type,
-             optional RTCPeerConnectionIdentityEventInit eventInitDict)]
-interface RTCPeerConnectionIdentityEvent : Event {
-  readonly attribute DOMString? assertion;
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCPeerConnection.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCPeerConnection.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/RTCPeerConnection.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/RTCPeerConnection.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -83,7 +83,7 @@
                             optional DOMString protocol,
                             optional DOMString username);
   [Pref="media.peerconnection.identity.enabled"]
-  void getIdentityAssertion();
+  Promise<DOMString> getIdentityAssertion();
   Promise<mozRTCSessionDescription> createOffer (optional RTCOfferOptions options);
   Promise<mozRTCSessionDescription> createAnswer ();
   Promise<void> setLocalDescription (mozRTCSessionDescription description);
@@ -96,7 +96,9 @@
   readonly attribute RTCIceGatheringState iceGatheringState;
   readonly attribute RTCIceConnectionState iceConnectionState;
   [Pref="media.peerconnection.identity.enabled"]
-  readonly attribute RTCIdentityAssertion? peerIdentity;
+  readonly attribute Promise<RTCIdentityAssertion> peerIdentity;
+  [Pref="media.peerconnection.identity.enabled"]
+  readonly attribute DOMString? idpLoginUrl;
 
   [ChromeOnly]
   attribute DOMString id;
@@ -138,14 +140,6 @@
   RTCDataChannel createDataChannel (DOMString label,
                                     optional RTCDataChannelInit dataChannelDict);
   attribute EventHandler ondatachannel;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onidentityresult;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onpeeridentity;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onidpassertionerror;
-  [Pref="media.peerconnection.identity.enabled"]
-  attribute EventHandler onidpvalidationerror;
 };
 
 // Legacy callback API
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerClients.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerClients.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerClients.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerClients.webidl	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +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/.
- *
- * The origin of this IDL file is
- * http://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html
- *
- */
-
-[Exposed=ServiceWorker]
-interface ServiceWorkerClients {
-  // A list of client objects, identifiable by ID, that correspond to windows
-  // (or workers) that are "controlled" by this SW
-  [Throws]
-  Promise<sequence<ServiceWorkerClient>?> getServiced();
-  [Throws]
-  Promise<any> reloadAll();
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerClient.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerClient.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerClient.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerClient.webidl	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +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/.
- *
- * The origin of this IDL file is
- * http://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html
- *
- */
-
-[Exposed=ServiceWorker]
-interface ServiceWorkerClient {
-  readonly attribute unsigned long id;
-
-  [Throws]
-  void postMessage(any message, optional sequence<Transferable> transfer);
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerContainer.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerContainer.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerContainer.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerContainer.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -32,6 +32,7 @@
   attribute EventHandler oncontrollerchange;
   attribute EventHandler onreloadpage;
   attribute EventHandler onerror;
+  attribute EventHandler onmessage;
 };
 
 // Testing only.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/ServiceWorkerGlobalScope.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -16,7 +16,7 @@
   // FIXME(nsm): Bug 982725
   // readonly attribute CacheList caches;
 
-  readonly attribute ServiceWorkerClients clients;
+  readonly attribute Clients clients;
 
   [Unforgeable] readonly attribute DOMString scope;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/SourceBuffer.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/SourceBuffer.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/SourceBuffer.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/SourceBuffer.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -40,5 +40,5 @@
   [Throws]
   void abort();
   [Throws]
-  void remove(double start, double end);
+  void remove(double start, unrestricted double end);
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/WebGLRenderingContext.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/WebGLRenderingContext.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/WebGLRenderingContext.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/WebGLRenderingContext.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -520,7 +520,7 @@
     void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
     void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
     void bindTexture(GLenum target, WebGLTexture? texture);
-    void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+    void blendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
     void blendEquation(GLenum mode);
     void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
     void blendFunc(GLenum sfactor, GLenum dfactor);
@@ -535,7 +535,7 @@
 
     [WebGLHandlesContextLoss] GLenum checkFramebufferStatus(GLenum target);
     void clear(GLbitfield mask);
-    void clearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+    void clearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
     void clearDepth(GLclampf depth);
     void clearStencil(GLint s);
     void colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/XMLHttpRequest.webidl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/XMLHttpRequest.webidl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/webidl/XMLHttpRequest.webidl	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/webidl/XMLHttpRequest.webidl	2015-02-28 15:03:11.000000000 +0000
@@ -140,8 +140,6 @@
   [ChromeOnly, Exposed=Window]
   readonly attribute MozChannel? channel;
 
-  [Throws]
-  void sendAsBinary(DOMString body);
   [Throws, ChromeOnly, Exposed=Window]
   any getInterface(IID iid);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/RuntimeService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/RuntimeService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/RuntimeService.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/RuntimeService.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -2260,7 +2260,9 @@
 
   WorkerPrivate::LoadInfo loadInfo;
   nsresult rv = WorkerPrivate::GetLoadInfo(cx, window, nullptr, aScriptURL,
-                                           false, &loadInfo);
+                                           false,
+                                           WorkerPrivate::OverrideLoadGroup,
+                                           &loadInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return CreateSharedWorkerFromLoadInfo(cx, &loadInfo, aScriptURL, aName, aType,
@@ -2314,6 +2316,11 @@
     NS_ENSURE_TRUE(workerPrivate, rv.ErrorCode());
 
     created = true;
+  } else {
+    // If we're attaching to an existing SharedWorker private, then we
+    // must update the overriden load group to account for our document's
+    // load group.
+    workerPrivate->UpdateOverridenLoadGroup(aLoadInfo->mLoadGroup);
   }
 
   nsRefPtr<SharedWorker> sharedWorker = new SharedWorker(window, workerPrivate);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerClient.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerClient.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerClient.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerClient.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -5,12 +5,13 @@
  */
 
 #include "ServiceWorkerClient.h"
+#include "ServiceWorkerContainer.h"
 
 #include "mozilla/dom/MessageEvent.h"
 #include "nsGlobalWindow.h"
 #include "WorkerPrivate.h"
 
-#include "mozilla/dom/ServiceWorkerClientBinding.h"
+#include "mozilla/dom/ClientBinding.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -29,7 +30,7 @@
 JSObject*
 ServiceWorkerClient::WrapObject(JSContext* aCx)
 {
-  return ServiceWorkerClientBinding::Wrap(aCx, this);
+  return ClientBinding::Wrap(aCx, this);
 }
 
 namespace {
@@ -59,16 +60,23 @@
       return NS_ERROR_FAILURE;
     }
 
+    ErrorResult result;
+    dom::Navigator* navigator = window->GetNavigator(result);
+    if (NS_WARN_IF(result.Failed())) {
+      return result.ErrorCode();
+    }
+
+    nsRefPtr<ServiceWorkerContainer> container = navigator->ServiceWorker();
     AutoJSAPI jsapi;
     jsapi.Init(window);
     JSContext* cx = jsapi.cx();
 
-    return DispatchDOMEvent(cx, window);
+    return DispatchDOMEvent(cx, container);
   }
 
 private:
   NS_IMETHOD
-  DispatchDOMEvent(JSContext* aCx, nsGlobalWindow* aTargetWindow)
+  DispatchDOMEvent(JSContext* aCx, ServiceWorkerContainer* aTargetContainer)
   {
     AssertIsOnMainThread();
 
@@ -84,7 +92,7 @@
       return NS_ERROR_FAILURE;
     }
 
-    nsCOMPtr<nsIDOMMessageEvent> event = new MessageEvent(aTargetWindow,
+    nsCOMPtr<nsIDOMMessageEvent> event = new MessageEvent(aTargetContainer,
                                                           nullptr, nullptr);
     nsresult rv =
       event->InitMessageEvent(NS_LITERAL_STRING("message"),
@@ -101,7 +109,7 @@
 
     event->SetTrusted(true);
     bool status = false;
-    aTargetWindow->DispatchEvent(event, &status);
+    aTargetContainer->DispatchEvent(event, &status);
 
     if (!status) {
       return NS_ERROR_FAILURE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerClients.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerClients.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerClients.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerClients.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -3,6 +3,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 "mozilla/dom/Promise.h"
+
 #include "ServiceWorkerClient.h"
 #include "ServiceWorkerClients.h"
 #include "ServiceWorkerManager.h"
@@ -11,9 +13,6 @@
 #include "WorkerRunnable.h"
 #include "WorkerScope.h"
 
-#include "mozilla/dom/Promise.h"
-#include "mozilla/dom/ServiceWorkerClientsBinding.h"
-
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::dom::workers;
@@ -36,7 +35,7 @@
 JSObject*
 ServiceWorkerClients::WrapObject(JSContext* aCx)
 {
-  return ServiceWorkerClientsBinding::Wrap(aCx, this);
+  return ClientsBinding::Wrap(aCx, this);
 }
 
 namespace {
@@ -45,7 +44,7 @@
 // keeping the worker alive.
 class PromiseHolder MOZ_FINAL : public WorkerFeature
 {
-  friend class GetServicedRunnable;
+  friend class MatchAllRunnable;
 
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PromiseHolder)
 
@@ -188,15 +187,15 @@
 
 };
 
-class GetServicedRunnable MOZ_FINAL : public nsRunnable
+class MatchAllRunnable MOZ_FINAL : public nsRunnable
 {
   WorkerPrivate* mWorkerPrivate;
   nsRefPtr<PromiseHolder> mPromiseHolder;
   nsCString mScope;
 public:
-  GetServicedRunnable(WorkerPrivate* aWorkerPrivate,
-                      PromiseHolder* aPromiseHolder,
-                      const nsCString& aScope)
+  MatchAllRunnable(WorkerPrivate* aWorkerPrivate,
+                   PromiseHolder* aPromiseHolder,
+                   const nsCString& aScope)
     : mWorkerPrivate(aWorkerPrivate),
       mPromiseHolder(aPromiseHolder),
       mScope(aScope)
@@ -219,7 +218,7 @@
     nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
     nsAutoPtr<nsTArray<uint64_t>> result(new nsTArray<uint64_t>());
 
-    swm->GetServicedClients(mScope, result);
+    swm->GetAllClients(mScope, result);
     nsRefPtr<ResolvePromiseWorkerRunnable> r =
       new ResolvePromiseWorkerRunnable(mWorkerPrivate, mPromiseHolder, result);
 
@@ -244,7 +243,8 @@
 } // anonymous namespace
 
 already_AddRefed<Promise>
-ServiceWorkerClients::GetServiced(ErrorResult& aRv)
+ServiceWorkerClients::MatchAll(const ClientQueryOptions& aOptions,
+                               ErrorResult& aRv)
 {
   WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
   MOZ_ASSERT(workerPrivate);
@@ -253,6 +253,11 @@
   nsString scope;
   mWorkerScope->GetScope(scope);
 
+  if (aOptions.mIncludeUncontrolled || aOptions.mType != ClientType::Window) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
   nsRefPtr<Promise> promise = Promise::Create(mWorkerScope, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
@@ -265,10 +270,10 @@
     return promise.forget();
   }
 
-  nsRefPtr<GetServicedRunnable> r =
-    new GetServicedRunnable(workerPrivate,
-                            promiseHolder,
-                            NS_ConvertUTF16toUTF8(scope));
+  nsRefPtr<MatchAllRunnable> r =
+    new MatchAllRunnable(workerPrivate,
+                         promiseHolder,
+                         NS_ConvertUTF16toUTF8(scope));
   nsresult rv = NS_DispatchToMainThread(r);
 
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -277,16 +282,3 @@
 
   return promise.forget();
 }
-
-// FIXME(catalinb): Bug 1045257 - Implement ReloadAll
-already_AddRefed<Promise>
-ServiceWorkerClients::ReloadAll(ErrorResult& aRv)
-{
-  nsRefPtr<Promise> promise = Promise::Create(mWorkerScope, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-  promise->MaybeReject(NS_ERROR_NOT_AVAILABLE);
-  return promise.forget();
-}
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerClients.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerClients.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerClients.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerClients.h	2015-02-28 15:03:11.000000000 +0000
@@ -9,16 +9,14 @@
 
 #include "nsAutoPtr.h"
 #include "nsWrapperCache.h"
+
 #include "mozilla/dom/WorkerScope.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/ClientsBinding.h"
+#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
-
-class ErrorResult;
-
 namespace dom {
-
-class Promise;
-
 namespace workers {
 
 class ServiceWorkerClients MOZ_FINAL : public nsISupports,
@@ -30,12 +28,14 @@
 
   explicit ServiceWorkerClients(ServiceWorkerGlobalScope* aWorkerScope);
 
-  already_AddRefed<Promise> GetServiced(ErrorResult& aRv);
-  already_AddRefed<Promise> ReloadAll(ErrorResult& aRv);
+  already_AddRefed<Promise>
+  MatchAll(const ClientQueryOptions& aOptions, ErrorResult& aRv);
 
-  JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  JSObject*
+  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
 
-  ServiceWorkerGlobalScope* GetParentObject() const
+  ServiceWorkerGlobalScope*
+  GetParentObject() const
   {
     return mWorkerScope;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerContainer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerContainer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerContainer.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerContainer.h	2015-02-28 15:03:11.000000000 +0000
@@ -31,6 +31,7 @@
   IMPL_EVENT_HANDLER(controllerchange)
   IMPL_EVENT_HANDLER(reloadpage)
   IMPL_EVENT_HANDLER(error)
+  IMPL_EVENT_HANDLER(message)
 
   explicit ServiceWorkerContainer(nsPIDOMWindow* aWindow);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerEvents.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerEvents.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerEvents.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerEvents.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -5,9 +5,20 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ServiceWorkerEvents.h"
+#include "ServiceWorkerClient.h"
 
+#include "nsINetworkInterceptController.h"
+#include "nsIOutputStream.h"
 #include "nsContentUtils.h"
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
+#include "nsStreamUtils.h"
+#include "nsNetCID.h"
 
+#include "mozilla/dom/FetchEventBinding.h"
+#include "mozilla/dom/PromiseNativeHandler.h"
+#include "mozilla/dom/Request.h"
+#include "mozilla/dom/Response.h"
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/dom/workers/bindings/ServiceWorker.h"
 
@@ -15,6 +26,271 @@
 
 BEGIN_WORKERS_NAMESPACE
 
+FetchEvent::FetchEvent(EventTarget* aOwner)
+: Event(aOwner, nullptr, nullptr)
+, mWindowId(0)
+, mIsReload(false)
+, mWaitToRespond(false)
+{
+}
+
+FetchEvent::~FetchEvent()
+{
+}
+
+void
+FetchEvent::PostInit(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
+                     nsMainThreadPtrHandle<ServiceWorker>& aServiceWorker,
+                     uint64_t aWindowId)
+{
+  mChannel = aChannel;
+  mServiceWorker = aServiceWorker;
+  mWindowId = aWindowId;
+}
+
+/*static*/ already_AddRefed<FetchEvent>
+FetchEvent::Constructor(const GlobalObject& aGlobal,
+                        const nsAString& aType,
+                        const FetchEventInit& aOptions,
+                        ErrorResult& aRv)
+{
+  nsRefPtr<EventTarget> owner = do_QueryObject(aGlobal.GetAsSupports());
+  MOZ_ASSERT(owner);
+  nsRefPtr<FetchEvent> e = new FetchEvent(owner);
+  bool trusted = e->Init(owner);
+  e->InitEvent(aType, aOptions.mBubbles, aOptions.mCancelable);
+  e->SetTrusted(trusted);
+  e->mRequest = aOptions.mRequest.WasPassed() ?
+      &aOptions.mRequest.Value() : nullptr;
+  e->mIsReload = aOptions.mIsReload.WasPassed() ?
+      aOptions.mIsReload.Value() : false;
+  e->mClient = aOptions.mClient.WasPassed() ?
+      &aOptions.mClient.Value() : nullptr;
+  return e.forget();
+}
+
+namespace {
+
+class CancelChannelRunnable MOZ_FINAL : public nsRunnable
+{
+  nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
+public:
+  explicit CancelChannelRunnable(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel)
+    : mChannel(aChannel)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    nsresult rv = mChannel->Cancel();
+    NS_ENSURE_SUCCESS(rv, rv);
+    return NS_OK;
+  }
+};
+
+class FinishResponse MOZ_FINAL : public nsRunnable
+{
+  nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
+public:
+  explicit FinishResponse(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel)
+    : mChannel(aChannel)
+  {
+  }
+
+  NS_IMETHOD
+      Run()
+  {
+    AssertIsOnMainThread();
+    nsresult rv = mChannel->FinishSynthesizedResponse();
+    NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Failed to finish synthesized response");
+    return rv;
+  }
+};
+
+class RespondWithHandler MOZ_FINAL : public PromiseNativeHandler
+{
+  nsMainThreadPtrHandle<nsIInterceptedChannel> mInterceptedChannel;
+  nsMainThreadPtrHandle<ServiceWorker> mServiceWorker;
+public:
+  RespondWithHandler(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
+                     nsMainThreadPtrHandle<ServiceWorker>& aServiceWorker)
+    : mInterceptedChannel(aChannel)
+    , mServiceWorker(aServiceWorker)
+  {
+  }
+
+  void ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
+
+  void RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) MOZ_OVERRIDE;
+
+  void CancelRequest();
+};
+
+struct RespondWithClosure
+{
+  nsMainThreadPtrHandle<nsIInterceptedChannel> mInterceptedChannel;
+
+  explicit RespondWithClosure(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel)
+    : mInterceptedChannel(aChannel)
+  {
+  }
+};
+
+void RespondWithCopyComplete(void* aClosure, nsresult aStatus)
+{
+  nsAutoPtr<RespondWithClosure> data(static_cast<RespondWithClosure*>(aClosure));
+  nsCOMPtr<nsIRunnable> event;
+  if (NS_SUCCEEDED(aStatus)) {
+    event = new FinishResponse(data->mInterceptedChannel);
+  } else {
+    event = new CancelChannelRunnable(data->mInterceptedChannel);
+  }
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(event)));
+}
+
+class MOZ_STACK_CLASS AutoCancel
+{
+  nsRefPtr<RespondWithHandler> mOwner;
+
+public:
+  explicit AutoCancel(RespondWithHandler* aOwner)
+    : mOwner(aOwner)
+  {
+  }
+
+  ~AutoCancel()
+  {
+    if (mOwner) {
+      mOwner->CancelRequest();
+    }
+  }
+
+  void Reset()
+  {
+    mOwner = nullptr;
+  }
+};
+
+void
+RespondWithHandler::ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue)
+{
+  AutoCancel autoCancel(this);
+
+  if (!aValue.isObject()) {
+    return;
+  }
+
+  nsRefPtr<Response> response;
+  nsresult rv = UNWRAP_OBJECT(Response, &aValue.toObject(), response);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  nsCOMPtr<nsIInputStream> body;
+  response->GetBody(getter_AddRefs(body));
+  if (NS_WARN_IF(!body) || NS_WARN_IF(response->BodyUsed())) {
+    return;
+  }
+  response->SetBodyUsed();
+
+  nsCOMPtr<nsIOutputStream> responseBody;
+  rv = mInterceptedChannel->GetResponseBody(getter_AddRefs(responseBody));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  nsAutoPtr<RespondWithClosure> closure(new RespondWithClosure(mInterceptedChannel));
+
+  nsCOMPtr<nsIEventTarget> stsThread = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
+  if (NS_WARN_IF(!stsThread)) {
+    return;
+  }
+  rv = NS_AsyncCopy(body, responseBody, stsThread, NS_ASYNCCOPY_VIA_READSEGMENTS, 4096,
+                    RespondWithCopyComplete, closure.forget());
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  autoCancel.Reset();
+}
+
+void
+RespondWithHandler::RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue)
+{
+  CancelRequest();
+}
+
+void
+RespondWithHandler::CancelRequest()
+{
+  nsCOMPtr<nsIRunnable> runnable = new CancelChannelRunnable(mInterceptedChannel);
+  NS_DispatchToMainThread(runnable);
+}
+
+} // anonymous namespace
+
+void
+FetchEvent::RespondWith(Promise& aPromise, ErrorResult& aRv)
+{
+  if (mWaitToRespond) {
+    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return;
+  }
+
+  mWaitToRespond = true;
+  nsRefPtr<RespondWithHandler> handler = new RespondWithHandler(mChannel, mServiceWorker);
+  aPromise.AppendNativeHandler(handler);
+}
+
+already_AddRefed<ServiceWorkerClient>
+FetchEvent::Client()
+{
+  if (!mClient) {
+    mClient = new ServiceWorkerClient(GetParentObject(), mWindowId);
+  }
+  nsRefPtr<ServiceWorkerClient> client = mClient;
+  return client.forget();
+}
+
+already_AddRefed<Promise>
+FetchEvent::ForwardTo(const nsAString& aUrl)
+{
+  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetParentObject());
+  MOZ_ASSERT(global);
+  ErrorResult result;
+  nsRefPtr<Promise> promise = Promise::Create(global, result);
+  if (NS_WARN_IF(result.Failed())) {
+    return nullptr;
+  }
+
+  promise->MaybeReject(NS_ERROR_NOT_AVAILABLE);
+  return promise.forget();
+}
+
+already_AddRefed<Promise>
+FetchEvent::Default()
+{
+  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetParentObject());
+  MOZ_ASSERT(global);
+  ErrorResult result;
+  nsRefPtr<Promise> promise = Promise::Create(global, result);
+  if (result.Failed()) {
+    return nullptr;
+  }
+
+  promise->MaybeReject(NS_ERROR_NOT_AVAILABLE);
+  return promise.forget();
+}
+
+NS_IMPL_ADDREF_INHERITED(FetchEvent, Event)
+NS_IMPL_RELEASE_INHERITED(FetchEvent, Event)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(FetchEvent)
+NS_INTERFACE_MAP_END_INHERITING(Event)
+
+NS_IMPL_CYCLE_COLLECTION_INHERITED(FetchEvent, Event, mRequest, mClient)
+
 ExtendableEvent::ExtendableEvent(EventTarget* aOwner)
   : Event(aOwner, nullptr, nullptr)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerEvents.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerEvents.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerEvents.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerEvents.h	2015-02-28 15:03:11.000000000 +0000
@@ -8,12 +8,87 @@
 
 #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 "nsProxyRelease.h"
+
+class nsIInterceptedChannel;
+
+namespace mozilla {
+namespace dom {
+  class Request;
+} // namespace dom
+} // namespace mozilla
 
 BEGIN_WORKERS_NAMESPACE
 
 class ServiceWorker;
+class ServiceWorkerClient;
+
+class FetchEvent MOZ_FINAL : public Event
+{
+  nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
+  nsMainThreadPtrHandle<ServiceWorker> mServiceWorker;
+  nsRefPtr<ServiceWorkerClient> mClient;
+  nsRefPtr<Request> mRequest;
+  uint64_t mWindowId;
+  bool mIsReload;
+  bool mWaitToRespond;
+protected:
+  explicit FetchEvent(EventTarget* aOwner);
+  ~FetchEvent();
+
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(FetchEvent, Event)
+  NS_FORWARD_TO_EVENT
+
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
+  {
+    return FetchEventBinding::Wrap(aCx, this);
+  }
+
+  void PostInit(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
+                nsMainThreadPtrHandle<ServiceWorker>& aServiceWorker,
+                uint64_t aWindowId);
+
+  static already_AddRefed<FetchEvent>
+  Constructor(const GlobalObject& aGlobal,
+              const nsAString& aType,
+              const FetchEventInit& aOptions,
+              ErrorResult& aRv);
+
+  bool
+  WaitToRespond() const
+  {
+    return mWaitToRespond;
+  }
+
+  Request*
+  Request_() const
+  {
+    return mRequest;
+  }
+
+  already_AddRefed<ServiceWorkerClient>
+  Client();
+
+  bool
+  IsReload() const
+  {
+    return mIsReload;
+  }
+
+  void
+  RespondWith(Promise& aPromise, ErrorResult& aRv);
+
+  already_AddRefed<Promise>
+  ForwardTo(const nsAString& aUrl);
+
+  already_AddRefed<Promise>
+  Default();
+};
 
 class ExtendableEvent : public Event
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerManager.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerManager.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -11,7 +11,10 @@
 #include "nsIStreamLoader.h"
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
+#include "nsIHttpHeaderVisitor.h"
+#include "nsINetworkInterceptController.h"
 #include "nsPIDOMWindow.h"
+#include "nsDebug.h"
 
 #include "jsapi.h"
 
@@ -19,9 +22,13 @@
 #include "mozilla/dom/BindingUtils.h"
 #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"
+#include "mozilla/dom/Request.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
@@ -420,7 +427,7 @@
   }
 
   bool
-  WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
+  WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) MOZ_OVERRIDE
   {
     aWorkerPrivate->AssertIsOnWorkerThread();
     if (aWorkerPrivate->WorkerScriptExecutedSuccessfully()) {
@@ -2121,6 +2128,267 @@
   return NS_OK;
 }
 
+class FetchEventRunnable : public WorkerRunnable
+                         , public nsIHttpHeaderVisitor {
+  nsMainThreadPtrHandle<nsIInterceptedChannel> mInterceptedChannel;
+  nsMainThreadPtrHandle<ServiceWorker> mServiceWorker;
+  nsTArray<nsCString> mHeaderNames;
+  nsTArray<nsCString> mHeaderValues;
+  uint64_t mWindowId;
+  nsCString mSpec;
+  nsCString mMethod;
+  bool mIsReload;
+public:
+  FetchEventRunnable(WorkerPrivate* aWorkerPrivate,
+                     nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel,
+                     nsMainThreadPtrHandle<ServiceWorker>& aServiceWorker,
+                     uint64_t aWindowId)
+    : WorkerRunnable(aWorkerPrivate, WorkerThreadModifyBusyCount)
+    , mInterceptedChannel(aChannel)
+    , mServiceWorker(aServiceWorker)
+    , mWindowId(aWindowId)
+  {
+    MOZ_ASSERT(aWorkerPrivate);
+  }
+
+  NS_DECL_ISUPPORTS_INHERITED
+
+  NS_IMETHOD
+  VisitHeader(const nsACString& aHeader, const nsACString& aValue) MOZ_OVERRIDE
+  {
+    mHeaderNames.AppendElement(aHeader);
+    mHeaderValues.AppendElement(aValue);
+    return NS_OK;
+  }
+
+  nsresult
+  Init()
+  {
+    nsCOMPtr<nsIChannel> channel;
+    nsresult rv = mInterceptedChannel->GetChannel(getter_AddRefs(channel));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIURI> uri;
+    rv = channel->GetURI(getter_AddRefs(uri));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = uri->GetSpec(mSpec);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel);
+    NS_ENSURE_TRUE(httpChannel, NS_ERROR_NOT_AVAILABLE);
+
+    rv = httpChannel->GetRequestMethod(mMethod);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    uint32_t loadFlags;
+    rv = channel->GetLoadFlags(&loadFlags);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    //TODO(jdm): we should probably include reload-ness in the loadinfo or as a separate load flag
+    mIsReload = false;
+
+    rv = httpChannel->VisitRequestHeaders(this);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+  bool
+  WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(aWorkerPrivate);
+    return DispatchFetchEvent(aCx, aWorkerPrivate);
+  }
+
+private:
+  ~FetchEventRunnable() {}
+
+  class ResumeRequest MOZ_FINAL : public nsRunnable {
+    nsMainThreadPtrHandle<nsIInterceptedChannel> mChannel;
+  public:
+    explicit ResumeRequest(nsMainThreadPtrHandle<nsIInterceptedChannel>& aChannel)
+      : mChannel(aChannel)
+    {
+    }
+
+    NS_IMETHOD Run()
+    {
+      AssertIsOnMainThread();
+      nsresult rv = mChannel->ResetInterception();
+      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Failed to resume intercepted network request");
+      return rv;
+    }
+  };
+
+  bool
+  DispatchFetchEvent(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
+  {
+    MOZ_ASSERT(aCx);
+    MOZ_ASSERT(aWorkerPrivate);
+    MOZ_ASSERT(aWorkerPrivate->IsServiceWorker());
+    GlobalObject globalObj(aCx, aWorkerPrivate->GlobalScope()->GetWrapper());
+
+    RequestOrUSVString requestInfo;
+    *requestInfo.SetAsUSVString().ToAStringPtr() = NS_ConvertUTF8toUTF16(mSpec);
+
+    RootedDictionary<RequestInit> reqInit(aCx);
+    reqInit.mMethod.Construct(mMethod);
+
+    nsRefPtr<InternalHeaders> internalHeaders = new InternalHeaders(HeadersGuardEnum::Request);
+    MOZ_ASSERT(mHeaderNames.Length() == mHeaderValues.Length());
+    for (uint32_t i = 0; i < mHeaderNames.Length(); i++) {
+      ErrorResult rv;
+      internalHeaders->Set(mHeaderNames[i], mHeaderValues[i], rv);
+      if (NS_WARN_IF(rv.Failed())) {
+        return false;
+      }
+    }
+
+    nsRefPtr<Headers> headers = new Headers(globalObj.GetAsSupports(), internalHeaders);
+    reqInit.mHeaders.Construct();
+    reqInit.mHeaders.Value().SetAsHeaders() = headers;
+
+    //TODO(jdm): set request body
+    //TODO(jdm): set request same-origin mode and credentials
+
+    ErrorResult rv;
+    nsRefPtr<Request> request = Request::Constructor(globalObj, requestInfo, reqInit, rv);
+    if (NS_WARN_IF(rv.Failed())) {
+      return false;
+    }
+
+    RootedDictionary<FetchEventInit> init(aCx);
+    init.mRequest.Construct();
+    init.mRequest.Value() = request;
+    init.mBubbles = false;
+    init.mCancelable = true;
+    init.mIsReload.Construct(mIsReload);
+    nsRefPtr<FetchEvent> event =
+      FetchEvent::Constructor(globalObj, NS_LITERAL_STRING("fetch"), init, rv);
+    if (NS_WARN_IF(rv.Failed())) {
+      return false;
+    }
+
+    event->PostInit(mInterceptedChannel, mServiceWorker, mWindowId);
+    event->SetTrusted(true);
+
+    nsRefPtr<EventTarget> target = do_QueryObject(aWorkerPrivate->GlobalScope());
+    nsresult rv2 = target->DispatchDOMEvent(nullptr, event, nullptr, nullptr);
+    if (NS_WARN_IF(NS_FAILED(rv2)) || !event->WaitToRespond()) {
+      nsCOMPtr<nsIRunnable> runnable = new ResumeRequest(mInterceptedChannel);
+      MOZ_ALWAYS_TRUE(NS_SUCCEEDED(NS_DispatchToMainThread(runnable)));
+    }
+    return true;
+  }
+};
+
+NS_IMPL_ISUPPORTS_INHERITED(FetchEventRunnable, WorkerRunnable, nsIHttpHeaderVisitor)
+
+NS_IMETHODIMP
+ServiceWorkerManager::DispatchFetchEvent(nsIDocument* aDoc, nsIInterceptedChannel* aChannel)
+{
+  MOZ_ASSERT(aChannel);
+  nsCOMPtr<nsISupports> serviceWorker;
+
+  bool isNavigation = false;
+  nsresult rv = aChannel->GetIsNavigation(&isNavigation);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!isNavigation) {
+    MOZ_ASSERT(aDoc);
+    rv = GetDocumentController(aDoc->GetInnerWindow(), getter_AddRefs(serviceWorker));
+  } else {
+    nsCOMPtr<nsIChannel> internalChannel;
+    rv = aChannel->GetChannel(getter_AddRefs(internalChannel));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIURI> uri;
+    rv = internalChannel->GetURI(getter_AddRefs(uri));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsRefPtr<ServiceWorkerRegistrationInfo> registration =
+      GetServiceWorkerRegistrationInfo(uri);
+    // This should only happen if IsAvailableForURI() returned true.
+    MOZ_ASSERT(registration);
+    MOZ_ASSERT(registration->mActiveWorker);
+
+    nsRefPtr<ServiceWorker> sw;
+    rv = CreateServiceWorker(registration->mPrincipal,
+                             registration->mActiveWorker->ScriptSpec(),
+                             registration->mScope,
+                             getter_AddRefs(sw));
+    serviceWorker = sw.forget();
+  }
+
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  nsMainThreadPtrHandle<nsIInterceptedChannel> handle(
+    new nsMainThreadPtrHolder<nsIInterceptedChannel>(aChannel, false));
+
+  uint64_t windowId = aDoc ? aDoc->GetInnerWindow()->WindowID() : 0;
+
+  nsRefPtr<ServiceWorker> sw = static_cast<ServiceWorker*>(serviceWorker.get());
+  nsMainThreadPtrHandle<ServiceWorker> serviceWorkerHandle(
+    new nsMainThreadPtrHolder<ServiceWorker>(sw));
+
+  nsRefPtr<FetchEventRunnable> event =
+    new FetchEventRunnable(sw->GetWorkerPrivate(), handle, serviceWorkerHandle, windowId);
+  rv = event->Init();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  AutoJSAPI api;
+  api.Init();
+  if (NS_WARN_IF(!event->Dispatch(api.cx()))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ServiceWorkerManager::IsAvailableForURI(nsIURI* aURI, bool* aIsAvailable)
+{
+  MOZ_ASSERT(aURI);
+  MOZ_ASSERT(aIsAvailable);
+  nsRefPtr<ServiceWorkerRegistrationInfo> registration =
+    GetServiceWorkerRegistrationInfo(aURI);
+  *aIsAvailable = registration && registration->mActiveWorker;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+ServiceWorkerManager::IsControlled(nsIDocument* aDoc, bool* aIsControlled)
+{
+  MOZ_ASSERT(aDoc);
+  MOZ_ASSERT(aIsControlled);
+  nsRefPtr<ServiceWorkerRegistrationInfo> registration;
+  nsresult rv = GetDocumentRegistration(aDoc, getter_AddRefs(registration));
+  NS_ENSURE_SUCCESS(rv, rv);
+  *aIsControlled = !!registration;
+  return NS_OK;
+}
+
+nsresult
+ServiceWorkerManager::GetDocumentRegistration(nsIDocument* aDoc,
+                                              ServiceWorkerRegistrationInfo** aRegistrationInfo)
+{
+  nsRefPtr<ServiceWorkerRegistrationInfo> registration;
+  if (!mControlledDocuments.Get(aDoc, getter_AddRefs(registration))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // If the document is controlled, the current worker MUST be non-null.
+  if (!registration->mActiveWorker) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  registration.forget(aRegistrationInfo);
+  return NS_OK;
+}
+
 /*
  * The .controller is for the registration associated with the document when
  * the document was loaded.
@@ -2137,21 +2405,16 @@
   nsCOMPtr<nsIDocument> doc = window->GetExtantDoc();
 
   nsRefPtr<ServiceWorkerRegistrationInfo> registration;
-  if (!mControlledDocuments.Get(doc, getter_AddRefs(registration))) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // If the document is controlled, the current worker MUST be non-null.
-  if (!registration->mActiveWorker) {
-    return NS_ERROR_NOT_AVAILABLE;
+  nsresult rv = GetDocumentRegistration(doc, getter_AddRefs(registration));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
   }
 
-
   nsRefPtr<ServiceWorker> serviceWorker;
-  nsresult rv = CreateServiceWorkerForWindow(window,
-                                             registration->mActiveWorker->ScriptSpec(),
-                                             registration->mScope,
-                                             getter_AddRefs(serviceWorker));
+  rv = CreateServiceWorkerForWindow(window,
+                                    registration->mActiveWorker->ScriptSpec(),
+                                    registration->mScope,
+                                    getter_AddRefs(serviceWorker));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -2220,10 +2483,7 @@
   //  - use remote tabs = false
   // Alternatively we could persist the original load group values and use
   // them here.
-  rv = NS_NewLoadGroup(getter_AddRefs(info.mLoadGroup), info.mPrincipal);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  WorkerPrivate::OverrideLoadInfoLoadGroup(info);
 
   nsRefPtr<ServiceWorker> serviceWorker;
   RuntimeService* rs = RuntimeService::GetOrCreateService();
@@ -2374,8 +2634,8 @@
 } // anonymous namespace
 
 void
-ServiceWorkerManager::GetServicedClients(const nsCString& aScope,
-                                     nsTArray<uint64_t>* aControlledDocuments)
+ServiceWorkerManager::GetAllClients(const nsCString& aScope,
+                                    nsTArray<uint64_t>* aControlledDocuments)
 {
   nsRefPtr<ServiceWorkerRegistrationInfo> registration = GetRegistration(aScope);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/ServiceWorkerManager.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/ServiceWorkerManager.h	2015-02-28 15:03:11.000000000 +0000
@@ -380,8 +380,8 @@
               uint32_t aFlags);
 
   void
-  GetServicedClients(const nsCString& aScope,
-                     nsTArray<uint64_t>* aControlledDocuments);
+  GetAllClients(const nsCString& aScope,
+                nsTArray<uint64_t>* aControlledDocuments);
 
   static already_AddRefed<ServiceWorkerManager>
   GetInstance();
@@ -399,6 +399,9 @@
   nsresult
   Update(ServiceWorkerRegistrationInfo* aRegistration);
 
+  nsresult
+  GetDocumentRegistration(nsIDocument* aDoc, ServiceWorkerRegistrationInfo** aRegistrationInfo);
+
   NS_IMETHOD
   CreateServiceWorkerForWindow(nsPIDOMWindow* aWindow,
                                const nsACString& aScriptSpec,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/fetch/worker_test_request.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/fetch/worker_test_request.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/fetch/worker_test_request.js	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/fetch/worker_test_request.js	2015-02-28 15:03:11.000000000 +0000
@@ -27,21 +27,70 @@
 }
 
 function testClone() {
-  var req = (new Request("./cloned_request.txt", {
+  var orig = new Request("./cloned_request.txt", {
               method: 'POST',
               headers: { "Content-Length": 5 },
               body: "Sample body",
               mode: "same-origin",
               credentials: "same-origin",
-            })).clone();
-  ok(req.method === "POST", "Request method is POST");
-  ok(req.headers instanceof Headers, "Request should have non-null Headers object");
-  is(req.headers.get('content-length'), "5", "Request content-length should be 5.");
-  ok(req.url === (new URL("./cloned_request.txt", self.location.href)).href,
+            });
+  var clone = orig.clone();
+  ok(clone.method === "POST", "Request method is POST");
+  ok(clone.headers instanceof Headers, "Request should have non-null Headers object");
+
+  is(clone.headers.get('content-length'), "5", "Response content-length should be 5.");
+  orig.headers.set('content-length', 6);
+  is(clone.headers.get('content-length'), "5", "Request content-length should be 5.");
+
+  ok(clone.url === (new URL("./cloned_request.txt", self.location.href)).href,
        "URL should be resolved with entry settings object's API base URL");
-  ok(req.referrer === "about:client", "Default referrer is `client` which serializes to about:client.");
-  ok(req.mode === "same-origin", "Request mode is same-origin");
-  ok(req.credentials === "same-origin", "Default credentials is same-origin");
+  ok(clone.referrer === "about:client", "Default referrer is `client` which serializes to about:client.");
+  ok(clone.mode === "same-origin", "Request mode is same-origin");
+  ok(clone.credentials === "same-origin", "Default credentials is same-origin");
+
+  ok(!orig.bodyUsed, "Original body is not consumed.");
+  ok(!clone.bodyUsed, "Clone body is not consumed.");
+
+  var origBody = null;
+  var clone2 = null;
+  return orig.text().then(function (body) {
+    origBody = body;
+    is(origBody, "Sample body", "Original body string matches");
+    ok(orig.bodyUsed, "Original body is consumed.");
+    ok(!clone.bodyUsed, "Clone body is not consumed.");
+
+    try {
+      orig.clone()
+      ok(false, "Cannot clone Request whose body is already consumed");
+    } catch (e) {
+      is(e.name, "TypeError", "clone() of consumed body should throw TypeError");
+    }
+
+    clone2 = clone.clone();
+    return clone.text();
+  }).then(function (body) {
+    is(body, origBody, "Clone body matches original body.");
+    ok(clone.bodyUsed, "Clone body is consumed.");
+
+    try {
+      clone.clone()
+      ok(false, "Cannot clone Request whose body is already consumed");
+    } catch (e) {
+      is(e.name, "TypeError", "clone() of consumed body should throw TypeError");
+    }
+
+    return clone2.text();
+  }).then(function (body) {
+    is(body, origBody, "Clone body matches original body.");
+    ok(clone2.bodyUsed, "Clone body is consumed.");
+
+    try {
+      clone2.clone()
+      ok(false, "Cannot clone Request whose body is already consumed");
+    } catch (e) {
+      is(e.name, "TypeError", "clone() of consumed body should throw TypeError");
+    }
+  });
 }
 
 function testUsedRequest() {
@@ -266,7 +315,6 @@
   var done = function() { postMessage({ type: 'finish' }) }
 
   testDefaultCtor();
-  testClone();
   testSimpleUrlParse();
   testUrlFragment();
   testMethod();
@@ -278,6 +326,7 @@
     .then(testBodyUsed)
     .then(testBodyExtraction)
     .then(testUsedRequest)
+    .then(testClone())
     // Put more promise based tests here.
     .then(done)
     .catch(function(e) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/fetch/worker_test_response.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/fetch/worker_test_response.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/fetch/worker_test_response.js	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/fetch/worker_test_response.js	2015-02-28 15:03:11.000000000 +0000
@@ -18,15 +18,63 @@
 }
 
 function testClone() {
-  var res = (new Response("This is a body", {
+  var orig = new Response("This is a body", {
               status: 404,
               statusText: "Not Found",
               headers: { "Content-Length": 5 },
-            })).clone();
-  is(res.status, 404, "Response status is 404");
-  is(res.statusText, "Not Found", "Response statusText is POST");
-  ok(res.headers instanceof Headers, "Response should have non-null Headers object");
-  is(res.headers.get('content-length'), "5", "Response content-length should be 5.");
+            });
+  var clone = orig.clone();
+  is(clone.status, 404, "Response status is 404");
+  is(clone.statusText, "Not Found", "Response statusText is POST");
+  ok(clone.headers instanceof Headers, "Response should have non-null Headers object");
+
+  is(clone.headers.get('content-length'), "5", "Response content-length should be 5.");
+  orig.headers.set('content-length', 6);
+  is(clone.headers.get('content-length'), "5", "Response content-length should be 5.");
+
+  ok(!orig.bodyUsed, "Original body is not consumed.");
+  ok(!clone.bodyUsed, "Clone body is not consumed.");
+
+  var origBody = null;
+  var clone2 = null;
+  return orig.text().then(function (body) {
+    origBody = body;
+    is(origBody, "This is a body", "Original body string matches");
+    ok(orig.bodyUsed, "Original body is consumed.");
+    ok(!clone.bodyUsed, "Clone body is not consumed.");
+
+    try {
+      orig.clone()
+      ok(false, "Cannot clone Response whose body is already consumed");
+    } catch (e) {
+      is(e.name, "TypeError", "clone() of consumed body should throw TypeError");
+    }
+
+    clone2 = clone.clone();
+    return clone.text();
+  }).then(function (body) {
+    is(body, origBody, "Clone body matches original body.");
+    ok(clone.bodyUsed, "Clone body is consumed.");
+
+    try {
+      clone.clone()
+      ok(false, "Cannot clone Response whose body is already consumed");
+    } catch (e) {
+      is(e.name, "TypeError", "clone() of consumed body should throw TypeError");
+    }
+
+    return clone2.text();
+  }).then(function (body) {
+    is(body, origBody, "Clone body matches original body.");
+    ok(clone2.bodyUsed, "Clone body is consumed.");
+
+    try {
+      clone2.clone()
+      ok(false, "Cannot clone Response whose body is already consumed");
+    } catch (e) {
+      is(e.name, "TypeError", "clone() of consumed body should throw TypeError");
+    }
+  });
 }
 
 function testRedirect() {
@@ -66,6 +114,25 @@
   ok(!r4.ok, "Response with status 302 should have ok false");
 }
 
+// It is not possible to test setting finalURL until we have ServiceWorker
+// interception. This is because synthetic Responses do not have a url, the url
+// is set based on the request, so a SW could initiate a fetch() on behalf of
+// a client and set the resulting Response's finalURL before returning it to
+// the client, in which case the "set response's url to request's url" from the
+// client's point of view would not happen. A test for this will be added by
+// Bug 1134352.
+function testFinalURL() {
+  var r1 = new Response();
+  ok(!r1.finalURL, "Response.finalURL is false by default.");
+
+  try {
+    r1.finalURL = true;
+    ok(false, "Setting Response.finalURL of Response with null url should fail.");
+  } catch(e) {
+    ok(true, "Setting Response.finalURL of Response with null url should fail.");
+  }
+}
+
 function testBodyUsed() {
   var res = new Response("Sample body");
   ok(!res.bodyUsed, "bodyUsed is initially false.");
@@ -150,14 +217,15 @@
   var done = function() { postMessage({ type: 'finish' }) }
 
   testDefaultCtor();
-  testClone();
   testRedirect();
   testOk();
+  testFinalURL();
 
   Promise.resolve()
     .then(testBodyCreation)
     .then(testBodyUsed)
     .then(testBodyExtraction)
+    .then(testClone)
     // Put more promise based tests here.
     .then(done)
     .catch(function(e) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch/fetch_tests.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch/fetch_tests.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch/fetch_tests.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch/fetch_tests.js	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,54 @@
+function fetch(name, onload, onerror, headers) {
+  expectAsyncResult();
+
+  onload = onload || function() {
+    my_ok(false, "XHR load should not complete successfully");
+    finish();
+  };
+  onerror = onerror || function() {
+    my_ok(false, "XHR load should be intercepted successfully");
+    finish();
+  };
+
+  var x = new XMLHttpRequest();
+  x.open('GET', name, true);
+  x.onload = function() { onload(x) };
+  x.onerror = function() { onerror(x) };
+  headers = headers || [];
+  headers.forEach(function(header) {
+    x.setRequestHeader(header[0], header[1]);
+  });
+  x.send();
+}
+
+fetch('synthesized.txt', function(xhr) {
+  my_ok(xhr.status == 200, "load should be successful");
+  my_ok(xhr.responseText == "synthesized response body", "load should have synthesized response");
+  finish();
+});
+
+fetch('ignored.txt', function(xhr) {
+  my_ok(xhr.status == 404, "load should be uninterrupted");
+  finish();
+});
+
+fetch('rejected.txt', null, function(xhr) {
+  my_ok(xhr.status == 0, "load should not complete");
+  finish();
+});
+
+fetch('nonresponse.txt', null, function(xhr) {
+  my_ok(xhr.status == 0, "load should not complete");
+  finish();
+});
+
+fetch('nonresponse2.txt', null, function(xhr) {
+  my_ok(xhr.status == 0, "load should not complete");
+  finish();
+});
+
+fetch('headers.txt', function(xhr) {
+  my_ok(xhr.status == 200, "load should be successful");
+  my_ok(xhr.responseText == "1", "request header checks should have passed");
+  finish();
+}, null, [["X-Test1", "header1"], ["X-Test2", "header2"]]);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch/fetch_worker_script.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch/fetch_worker_script.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch/fetch_worker_script.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch/fetch_worker_script.js	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,29 @@
+function my_ok(v, msg) {
+  postMessage({type: "ok", value: v, msg: msg});
+}
+
+function finish() {
+  postMessage('finish');
+}
+
+function expectAsyncResult() {
+  postMessage('expect');
+}
+
+expectAsyncResult();
+try {
+  var success = false;
+  importScripts("nonexistent_imported_script.js");
+} catch(x) {
+}
+
+my_ok(success, "worker imported script should be intercepted");
+finish();
+
+function check_intercepted_script() {
+  success = true;
+}
+
+importScripts('fetch_tests.js')
+
+finish(); //corresponds to the gExpected increment before creating this worker
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch/index.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch/index.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch/index.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch/index.html	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,147 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 94048 - test install event.</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" style="display: none"></div>
+<div id="style-test" style="background-color: white"></div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+  function my_ok(result, msg) {
+    window.opener.postMessage({status: "ok", result: result, message: msg}, "*");
+  }
+
+  function check_intercepted_script() {
+    document.getElementById('intercepted-script').test_result =
+      document.currentScript == document.getElementById('intercepted-script');
+  }
+
+  function fetch(name, onload, onerror, headers) {
+    gExpected++;
+
+    onload = onload || function() {
+      my_ok(false, "load should not complete successfully");
+      finish();
+    };
+    onerror = onerror || function() {
+      my_ok(false, "load should be intercepted successfully");
+      finish();
+    };
+
+    var x = new XMLHttpRequest();
+    x.open('GET', name, true);
+    x.onload = function() { onload(x) };
+    x.onerror = function() { onerror(x) };
+    headers = headers || [];
+    headers.forEach(function(header) {
+      x.setRequestHeader(header[0], header[1]);
+    });
+    x.send();
+  }
+
+  var gExpected = 0;
+  var gEncountered = 0;
+  function finish() {
+    gEncountered++;
+    if (gEncountered == gExpected) {
+      window.opener.postMessage({status: "done"}, "*");
+    }
+  }
+
+  function test_onload(creator, complete) {
+    gExpected++;
+    var elem = creator();
+    elem.onload = function() {
+      complete.call(elem);
+      finish();
+    };
+    elem.onerror = function() {
+      my_ok(false, elem.tagName + " load should complete successfully");
+      finish();
+    };
+    document.body.appendChild(elem);
+  }
+
+  function expectAsyncResult() {
+    gExpected++;
+  }
+
+  my_ok(navigator.serviceWorker.controller != null, "should be controlled");
+</script>
+<script src="fetch_tests.js"></script>
+<script>
+  test_onload(function() {
+    var elem = document.createElement('img');
+    elem.src = "nonexistent_image.gifs";
+    elem.id = 'intercepted-img';
+    return elem;
+  }, function() {
+    my_ok(this.complete, "image should be complete");
+    my_ok(this.naturalWidth == 1 && this.naturalHeight == 1, "image should be 1x1 gif");
+  });
+
+  test_onload(function() {
+    var elem = document.createElement('script');
+    elem.id = 'intercepted-script';
+    elem.src = "nonexistent_script.js";
+    return elem;
+  }, function() {
+    my_ok(this.test_result, "script load should be intercepted");
+  });
+
+  test_onload(function() {
+    var elem = document.createElement('link');
+    elem.href = "nonexistent_stylesheet.css";
+    elem.rel = "stylesheet";
+    return elem;
+  }, function() {
+    var styled = document.getElementById('style-test');
+    my_ok(window.getComputedStyle(styled).backgroundColor == 'rgb(0, 0, 0)',
+          "stylesheet load should be intercepted");
+  });
+
+  test_onload(function() {
+    var elem = document.createElement('iframe');
+    elem.id = 'intercepted-iframe';
+    elem.src = "nonexistent_page.html";
+    return elem;
+  }, function() {
+    my_ok(this.test_result, "iframe load should be intercepted");
+  });
+
+  gExpected++;
+  var worker = new Worker('nonexistent_worker_script.js');
+  worker.onmessage = function(e) {
+    my_ok(e.data == "worker-intercept-success", "worker load intercepted");
+    finish();
+  };
+  worker.onerror = function() {
+    my_ok(false, "worker load should be intercepted");
+  };
+
+  gExpected++;
+  var worker = new Worker('fetch_worker_script.js');
+  worker.onmessage = function(e) {
+    if (e.data == "finish") {
+      finish();
+    } else if (e.data == "expect") {
+      gExpected++;
+    } else if (e.data.type == "ok") {
+      my_ok(e.data.value, e.data.msg);
+    }
+  };
+  worker.onerror = function() {
+    my_ok(false, "worker should not cause any errors");
+  };
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch_event_worker.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch_event_worker.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/fetch_event_worker.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/fetch_event_worker.js	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,86 @@
+onfetch = function(ev) {
+  if (ev.request.url.contains("synthesized.txt")) {
+    var p = new Promise(function(resolve) {
+      var r = new Response("synthesized response body", {});
+      resolve(r);
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("ignored.txt")) {
+  }
+
+  else if (ev.request.url.contains("rejected.txt")) {
+    var p = new Promise(function(resolve, reject) {
+      reject();
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("nonresponse.txt")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve(5);
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("nonresponse2.txt")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve({});
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("headers.txt")) {
+    var p = new Promise(function(resolve, reject) {
+      var ok = true;
+      ok &= ev.request.headers.get("X-Test1") == "header1";
+      ok &= ev.request.headers.get("X-Test2") == "header2";
+      var r = new Response(ok.toString(), {});
+      resolve(r);
+    });
+    ev.respondWith(p);    
+  }
+
+  else if (ev.request.url.contains("nonexistent_image.gif")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve(new Response(atob("R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs"), {}));
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("nonexistent_script.js")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve(new Response("check_intercepted_script();", {}));
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("nonexistent_stylesheet.css")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve(new Response("#style-test { background-color: black !important; }", {}));
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("nonexistent_page.html")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve(new Response("<script>window.frameElement.test_result = true;</script>", {}));
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("nonexistent_worker_script.js")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve(new Response("postMessage('worker-intercept-success')", {}));
+    });
+    ev.respondWith(p);
+  }
+
+  else if (ev.request.url.contains("nonexistent_imported_script.js")) {
+    var p = new Promise(function(resolve, reject) {
+      resolve(new Response("check_intercepted_script();", {}));
+    });
+    ev.respondWith(p);
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/get_serviced_worker.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/get_serviced_worker.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/get_serviced_worker.js	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/get_serviced_worker.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-function loop() {
-  self.clients.getServiced().then(function(result) {
-    setTimeout(loop, 0);
-  });
-}
-
-onactivate = function(e) {
-  // spam getServiced until the worker is closed.
-  loop();
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/match_all_worker.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/match_all_worker.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/match_all_worker.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/match_all_worker.js	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,10 @@
+function loop() {
+  self.clients.matchAll().then(function(result) {
+    setTimeout(loop, 0);
+  });
+}
+
+onactivate = function(e) {
+  // spam matchAll until the worker is closed.
+  loop();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/message_posting_worker.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/message_posting_worker.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/message_posting_worker.js	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/message_posting_worker.js	2015-02-28 15:03:11.000000000 +0000
@@ -1,5 +1,5 @@
 onmessage = function(e) {
-  self.clients.getServiced().then(function(res) {
+  self.clients.matchAll().then(function(res) {
     if (!res.length) {
       dump("ERROR: no clients are currently controlled.\n");
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/mochitest.ini	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/mochitest.ini	2015-02-28 15:03:11.000000000 +0000
@@ -4,6 +4,7 @@
   worker.js
   worker2.js
   worker3.js
+  fetch_event_worker.js
   parse_error_worker.js
   activate_event_error_worker.js
   install_event_worker.js
@@ -16,15 +17,19 @@
   workerUpdate/update.html
   sw_clients/simple.html
   sw_clients/service_worker_controlled.html
-  get_serviced_worker.js
+  match_all_worker.js
   worker_unregister.js
   worker_update.js
   message_posting_worker.js
+  fetch/index.html
+  fetch/fetch_worker_script.js
+  fetch/fetch_tests.js
 
 [test_unregister.html]
 skip-if = true # Bug 1133805
 [test_installation_simple.html]
-[test_get_serviced.html]
+[test_fetch_event.html]
+[test_match_all.html]
 [test_install_event.html]
 [test_navigator.html]
 [test_scopes.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/sw_clients/service_worker_controlled.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/sw_clients/service_worker_controlled.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/sw_clients/service_worker_controlled.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/sw_clients/service_worker_controlled.html	2015-02-28 15:03:11.000000000 +0000
@@ -7,7 +7,7 @@
 <head>
   <title>controlled page</title>
   <!--
-    Paged controlled by a service worker for testing getServiced().
+    Paged controlled by a service worker for testing matchAll().
     See bug 982726, 1058311.
   -->
 <script class="testbody" type="text/javascript">
@@ -26,7 +26,7 @@
     });
   }
 
-  window.onmessage = function(msg) {
+  navigator.serviceWorker.onmessage = function(msg) {
     // forward message to the test page.
     parent.postMessage(msg.data, "*");
   };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/sw_clients/simple.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/sw_clients/simple.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/sw_clients/simple.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/sw_clients/simple.html	2015-02-28 15:03:11.000000000 +0000
@@ -5,7 +5,7 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-  <title>Bug 982726 - test get_serviced not crashing</title>
+  <title>Bug 982726 - test match_all not crashing</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/test_fetch_event.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/test_fetch_event.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/test_fetch_event.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/test_fetch_event.html	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,62 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 94048 - test install event.</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" style="display: none"></div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+  SimpleTest.requestCompleteLog();
+
+  function simpleRegister() {
+    var p = navigator.serviceWorker.register("fetch_event_worker.js", { scope: "./fetch" });
+    return p;
+  }
+
+  function testController() {
+    var p = new Promise(function(resolve, reject) {
+      window.onmessage = function(e) {
+        if (e.data.status == "ok") {
+          ok(e.data.result, e.data.message);
+        } else if (e.data.status == "done") {
+          window.onmessage = null;
+          w.close();
+          resolve();
+        }
+      }
+    });
+
+    var w = window.open("fetch/index.html");
+    return p;
+  }
+
+  function runTest() {
+    simpleRegister()
+      .then(testController)
+      .then(function() {
+        SimpleTest.finish();
+      }).catch(function(e) {
+        ok(false, "Some test failed with error " + e);
+        SimpleTest.finish();
+      });
+  }
+
+  SimpleTest.waitForExplicitFinish();
+  SpecialPowers.pushPrefEnv({"set": [
+    ["dom.serviceWorkers.enabled", true],
+    ["dom.serviceWorkers.testing.enabled", true],
+    ["dom.fetch.enabled", true]
+  ]}, runTest);
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/test_get_serviced.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/test_get_serviced.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/test_get_serviced.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/test_get_serviced.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Bug 982726 - test get_serviced not crashing</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" style="display: none"></div>
-<pre id="test"></pre>
-<script class="testbody" type="text/javascript">
-  // get_serviced_worker will call getServiced until the worker shuts down.
-  // Test passes if the browser doesn't crash on leaked promise objects.
-  var registration;
-  var content;
-  var iframe;
-
-  function simpleRegister() {
-    return navigator.serviceWorker.register("get_serviced_worker.js",
-                                            { scope: "./sw_clients/" })
-      .then((swr) => registration = swr);
-  }
-
-  function closeAndUnregister() {
-    content.removeChild(iframe);
-
-    return registration.unregister().then(function(result) {
-      ok(result, "Unregister should return true.");
-    });
-  }
-
-  function openClient() {
-    var p = new Promise(function(resolve, reject) {
-      window.onmessage = function(e) {
-        if (e.data === "READY") {
-          resolve();
-        }
-      }
-    });
-
-    content = document.getElementById("content");
-    ok(content, "Parent exists.");
-
-    iframe = document.createElement("iframe");
-    iframe.setAttribute('src', "sw_clients/simple.html");
-    content.appendChild(iframe);
-
-    return p;
-  }
-
-  function runTest() {
-    simpleRegister()
-      .then(openClient)
-      .then(closeAndUnregister)
-      .catch(function(e) {
-        ok(false, "Some test failed with error " + e);
-      }).then(function() {
-        ok(true, "Didn't crash on resolving getServiced promises while worker shuts down.");
-        SimpleTest.finish();
-      });
-  }
-
-  SimpleTest.waitForExplicitFinish();
-  SpecialPowers.pushPrefEnv({"set": [
-    ["dom.serviceWorkers.enabled", true],
-    ["dom.serviceWorkers.testing.enabled", true]
-  ]}, runTest);
-</script>
-</pre>
-</body>
-</html>
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/test_match_all.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/test_match_all.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/serviceworkers/test_match_all.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/serviceworkers/test_match_all.html	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,77 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 982726 - test match_all not crashing</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" style="display: none"></div>
+<pre id="test"></pre>
+<script class="testbody" type="text/javascript">
+  // match_all_worker will call matchAll until the worker shuts down.
+  // Test passes if the browser doesn't crash on leaked promise objects.
+  var registration;
+  var content;
+  var iframe;
+
+  function simpleRegister() {
+    return navigator.serviceWorker.register("match_all_worker.js",
+                                            { scope: "./sw_clients/" })
+      .then((swr) => registration = swr);
+  }
+
+  function closeAndUnregister() {
+    content.removeChild(iframe);
+
+    return registration.unregister().then(function(result) {
+      ok(result, "Unregister should return true.");
+    });
+  }
+
+  function openClient() {
+    var p = new Promise(function(resolve, reject) {
+      window.onmessage = function(e) {
+        if (e.data === "READY") {
+          resolve();
+        }
+      }
+    });
+
+    content = document.getElementById("content");
+    ok(content, "Parent exists.");
+
+    iframe = document.createElement("iframe");
+    iframe.setAttribute('src', "sw_clients/simple.html");
+    content.appendChild(iframe);
+
+    return p;
+  }
+
+  function runTest() {
+    simpleRegister()
+      .then(openClient)
+      .then(closeAndUnregister)
+      .catch(function(e) {
+        ok(false, "Some test failed with error " + e);
+      }).then(function() {
+        ok(true, "Didn't crash on resolving matchAll promises while worker shuts down.");
+        SimpleTest.finish();
+      });
+  }
+
+  SimpleTest.waitForExplicitFinish();
+  SpecialPowers.pushPrefEnv({"set": [
+    ["dom.serviceWorkers.enabled", true],
+    ["dom.serviceWorkers.testing.enabled", true]
+  ]}, runTest);
+</script>
+</pre>
+</body>
+</html>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/test_worker_interfaces.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/test_worker_interfaces.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/test/test_worker_interfaces.js	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/test/test_worker_interfaces.js	2015-02-28 15:03:11.000000000 +0000
@@ -62,6 +62,7 @@
     {name: "Atomics", nightly: true},
     "StopIteration",
     "String",
+    "Symbol",
     "SyntaxError",
     {name: "TypedObject", nightly: true},
     "TypeError",
@@ -76,12 +77,6 @@
 // IMPORTANT: Do not change the list above without review from
 //            a JavaScript Engine peer!
 
-// Symbol is conditionally defined.
-// If it's defined, insert "Symbol" before "SyntaxError".
-if (typeof Symbol === "function") {
-  ecmaGlobals.splice(ecmaGlobals.indexOf("SyntaxError"), 0, "Symbol");
-}
-
 // IMPORTANT: Do not change the list below without review from a DOM peer!
 var interfaceNamesInGlobalScope =
   [
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/WorkerPrivate.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/WorkerPrivate.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/WorkerPrivate.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/WorkerPrivate.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -15,16 +15,19 @@
 #include "nsIDOMMessageEvent.h"
 #include "nsIDocument.h"
 #include "nsIDocShell.h"
+#include "nsIInterfaceRequestor.h"
 #include "nsIMemoryReporter.h"
 #include "nsIPermissionManager.h"
 #include "nsIScriptError.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsITabChild.h"
 #include "nsITextToSubURI.h"
 #include "nsIThreadInternal.h"
 #include "nsITimer.h"
 #include "nsIURI.h"
 #include "nsIURL.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsIWorkerDebugger.h"
 #include "nsIXPConnect.h"
 #include "nsPerformance.h"
@@ -704,13 +707,16 @@
 {
   nsTArray<nsCOMPtr<nsISupports>> mDoomed;
   nsTArray<nsCString> mHostObjectURIs;
+  nsCOMPtr<nsILoadGroup> mLoadGroupToCancel;
 
 public:
   MainThreadReleaseRunnable(nsTArray<nsCOMPtr<nsISupports>>& aDoomed,
-                            nsTArray<nsCString>& aHostObjectURIs)
+                            nsTArray<nsCString>& aHostObjectURIs,
+                            nsCOMPtr<nsILoadGroup>& aLoadGroupToCancel)
   {
     mDoomed.SwapElements(aDoomed);
     mHostObjectURIs.SwapElements(aHostObjectURIs);
+    mLoadGroupToCancel.swap(aLoadGroupToCancel);
   }
 
   NS_DECL_ISUPPORTS_INHERITED
@@ -718,6 +724,11 @@
   NS_IMETHOD
   Run() MOZ_OVERRIDE
   {
+    if (mLoadGroupToCancel) {
+      mLoadGroupToCancel->Cancel(NS_BINDING_ABORTED);
+      mLoadGroupToCancel = nullptr;
+    }
+
     mDoomed.Clear();
 
     for (uint32_t index = 0; index < mHostObjectURIs.Length(); index++) {
@@ -761,6 +772,9 @@
   virtual bool
   WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) MOZ_OVERRIDE
   {
+    nsCOMPtr<nsILoadGroup> loadGroupToCancel;
+    mFinishedWorker->ForgetOverridenLoadGroup(loadGroupToCancel);
+
     nsTArray<nsCOMPtr<nsISupports>> doomed;
     mFinishedWorker->ForgetMainThreadObjects(doomed);
 
@@ -768,7 +782,7 @@
     mFinishedWorker->StealHostObjectURIs(hostObjectURIs);
 
     nsRefPtr<MainThreadReleaseRunnable> runnable =
-      new MainThreadReleaseRunnable(doomed, hostObjectURIs);
+      new MainThreadReleaseRunnable(doomed, hostObjectURIs, loadGroupToCancel);
     if (NS_FAILED(NS_DispatchToMainThread(runnable))) {
       NS_WARNING("Failed to dispatch, going to leak!");
     }
@@ -816,6 +830,9 @@
 
     runtime->UnregisterWorker(cx, mFinishedWorker);
 
+    nsCOMPtr<nsILoadGroup> loadGroupToCancel;
+    mFinishedWorker->ForgetOverridenLoadGroup(loadGroupToCancel);
+
     nsTArray<nsCOMPtr<nsISupports> > doomed;
     mFinishedWorker->ForgetMainThreadObjects(doomed);
 
@@ -823,7 +840,7 @@
     mFinishedWorker->StealHostObjectURIs(hostObjectURIs);
 
     nsRefPtr<MainThreadReleaseRunnable> runnable =
-      new MainThreadReleaseRunnable(doomed, hostObjectURIs);
+      new MainThreadReleaseRunnable(doomed, hostObjectURIs, loadGroupToCancel);
     if (NS_FAILED(NS_DispatchToCurrentThread(runnable))) {
       NS_WARNING("Failed to dispatch, going to leak!");
     }
@@ -1983,6 +2000,129 @@
 };
 
 template <class Derived>
+class WorkerPrivateParent<Derived>::InterfaceRequestor MOZ_FINAL
+  : public nsIInterfaceRequestor
+{
+  NS_DECL_ISUPPORTS
+
+public:
+  InterfaceRequestor(nsIPrincipal* aPrincipal, nsILoadGroup* aLoadGroup)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(aPrincipal);
+
+    // Look for an existing LoadContext.  This is optional and it's ok if
+    // we don't find one.
+    nsCOMPtr<nsILoadContext> baseContext;
+    if (aLoadGroup) {
+      nsCOMPtr<nsIInterfaceRequestor> callbacks;
+      aLoadGroup->GetNotificationCallbacks(getter_AddRefs(callbacks));
+      if (callbacks) {
+        callbacks->GetInterface(NS_GET_IID(nsILoadContext),
+                                getter_AddRefs(baseContext));
+      }
+    }
+
+    mLoadContext = new LoadContext(aPrincipal, baseContext);
+  }
+
+  void
+  MaybeAddTabChild(nsILoadGroup* aLoadGroup)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    if (!aLoadGroup) {
+      return;
+    }
+
+    nsCOMPtr<nsIInterfaceRequestor> callbacks;
+    aLoadGroup->GetNotificationCallbacks(getter_AddRefs(callbacks));
+    if (!callbacks) {
+      return;
+    }
+
+    nsCOMPtr<nsITabChild> tabChild;
+    callbacks->GetInterface(NS_GET_IID(nsITabChild), getter_AddRefs(tabChild));
+    if (!tabChild) {
+      return;
+    }
+
+    // Use weak references to the tab child.  Holding a strong reference will
+    // not prevent an ActorDestroy() from being called on the TabChild.
+    // Therefore, we should let the TabChild destroy itself as soon as possible.
+    mTabChildList.AppendElement(do_GetWeakReference(tabChild));
+  }
+
+  NS_IMETHOD
+  GetInterface(const nsIID& aIID, void** aSink) MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(mLoadContext);
+
+    if (aIID.Equals(NS_GET_IID(nsILoadContext))) {
+      nsCOMPtr<nsILoadContext> ref = mLoadContext;
+      ref.forget(aSink);
+      return NS_OK;
+    }
+
+    // If we still have an active nsITabChild, then return it.  Its possible,
+    // though, that all of the TabChild objects have been destroyed.  In that
+    // case we return NS_NOINTERFACE.
+    if(aIID.Equals(NS_GET_IID(nsITabChild))) {
+      nsCOMPtr<nsITabChild> tabChild = GetAnyLiveTabChild();
+      if (!tabChild) {
+        return NS_NOINTERFACE;
+      }
+      tabChild.forget(aSink);
+      return NS_OK;
+    }
+
+    return NS_NOINTERFACE;
+  }
+
+private:
+  ~InterfaceRequestor() { }
+
+  already_AddRefed<nsITabChild>
+  GetAnyLiveTabChild()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    // Search our list of known TabChild objects for one that still exists.
+    while (!mTabChildList.IsEmpty()) {
+      nsCOMPtr<nsITabChild> tabChild =
+        do_QueryReferent(mTabChildList.LastElement());
+
+      // Does this tab child still exist?  If so, return it.  We are done.
+      if (tabChild) {
+        return tabChild.forget();
+      }
+
+      // Otherwise remove the stale weak reference and check the next one
+      mTabChildList.RemoveElementAt(mTabChildList.Length() - 1);
+    }
+
+    return nullptr;
+  }
+
+  nsCOMPtr<nsILoadContext> mLoadContext;
+
+  // Array of weak references to nsITabChild.  We do not want to keep TabChild
+  // actors alive for long after their ActorDestroy() methods are called.
+  nsTArray<nsWeakPtr> mTabChildList;
+};
+
+template <class Derived>
+NS_IMPL_ADDREF(WorkerPrivateParent<Derived>::InterfaceRequestor)
+
+template <class Derived>
+NS_IMPL_RELEASE(WorkerPrivateParent<Derived>::InterfaceRequestor)
+
+template <class Derived>
+NS_IMPL_QUERY_INTERFACE(WorkerPrivateParent<Derived>::InterfaceRequestor,
+                        nsIInterfaceRequestor)
+
+template <class Derived>
 class WorkerPrivateParent<Derived>::EventTarget MOZ_FINAL
   : public nsIEventTarget
 {
@@ -2835,13 +2975,29 @@
 
 template <class Derived>
 void
+WorkerPrivateParent<Derived>::ForgetOverridenLoadGroup(
+                                          nsCOMPtr<nsILoadGroup>& aLoadGroupOut)
+{
+  AssertIsOnParentThread();
+
+  // If we're not overriden, then do nothing here.  Let the load group get
+  // handled in ForgetMainThreadObjects().
+  if (!mLoadInfo.mInterfaceRequestor) {
+    return;
+  }
+
+  mLoadInfo.mLoadGroup.swap(aLoadGroupOut);
+}
+
+template <class Derived>
+void
 WorkerPrivateParent<Derived>::ForgetMainThreadObjects(
                                       nsTArray<nsCOMPtr<nsISupports> >& aDoomed)
 {
   AssertIsOnParentThread();
   MOZ_ASSERT(!mMainThreadObjectsForgotten);
 
-  static const uint32_t kDoomedCount = 8;
+  static const uint32_t kDoomedCount = 9;
 
   aDoomed.SetCapacity(kDoomedCount);
 
@@ -2853,6 +3009,7 @@
   SwapToISupportsArray(mLoadInfo.mChannel, aDoomed);
   SwapToISupportsArray(mLoadInfo.mCSP, aDoomed);
   SwapToISupportsArray(mLoadInfo.mLoadGroup, aDoomed);
+  SwapToISupportsArray(mLoadInfo.mInterfaceRequestor, aDoomed);
   // Before adding anything here update kDoomedCount above!
 
   MOZ_ASSERT(aDoomed.Length() == kDoomedCount);
@@ -3632,6 +3789,16 @@
 }
 
 template <class Derived>
+void
+WorkerPrivateParent<Derived>::UpdateOverridenLoadGroup(nsILoadGroup* aBaseLoadGroup)
+{
+  AssertIsOnMainThread();
+
+  // The load group should have been overriden at init time.
+  mLoadInfo.mInterfaceRequestor->MaybeAddTabChild(aBaseLoadGroup);
+}
+
+template <class Derived>
 NS_IMPL_ADDREF_INHERITED(WorkerPrivateParent<Derived>, DOMEventTargetHelper)
 
 template <class Derived>
@@ -4062,7 +4229,8 @@
     stackLoadInfo.emplace();
 
     nsresult rv = GetLoadInfo(aCx, nullptr, parent, aScriptURL,
-                              aIsChromeWorker, stackLoadInfo.ptr());
+                              aIsChromeWorker, InheritLoadGroup,
+                              stackLoadInfo.ptr());
     if (NS_FAILED(rv)) {
       scriptloader::ReportLoadError(aCx, aScriptURL, rv, !parent);
       aRv.Throw(rv);
@@ -4117,7 +4285,9 @@
 nsresult
 WorkerPrivate::GetLoadInfo(JSContext* aCx, nsPIDOMWindow* aWindow,
                            WorkerPrivate* aParent, const nsAString& aScriptURL,
-                           bool aIsChromeWorker, LoadInfo* aLoadInfo)
+                           bool aIsChromeWorker,
+                           LoadGroupBehavior aLoadGroupBehavior,
+                           LoadInfo* aLoadInfo)
 {
   using namespace mozilla::dom::workers::scriptloader;
   using mozilla::dom::indexedDB::IDBFactory;
@@ -4350,10 +4520,8 @@
       loadInfo.mReportCSPViolations = false;
     }
 
-    if (!loadInfo.mLoadGroup) {
-      rv = NS_NewLoadGroup(getter_AddRefs(loadInfo.mLoadGroup),
-                           loadInfo.mPrincipal);
-      NS_ENSURE_SUCCESS(rv, rv);
+    if (!loadInfo.mLoadGroup || aLoadGroupBehavior == OverrideLoadGroup) {
+      OverrideLoadInfoLoadGroup(loadInfo);
     }
     MOZ_ASSERT(NS_LoadGroupMatchesPrincipal(loadInfo.mLoadGroup,
                                             loadInfo.mPrincipal));
@@ -4373,6 +4541,26 @@
   return NS_OK;
 }
 
+// static
+void
+WorkerPrivate::OverrideLoadInfoLoadGroup(LoadInfo& aLoadInfo)
+{
+  MOZ_ASSERT(!aLoadInfo.mInterfaceRequestor);
+
+  aLoadInfo.mInterfaceRequestor = new InterfaceRequestor(aLoadInfo.mPrincipal,
+                                                         aLoadInfo.mLoadGroup);
+  aLoadInfo.mInterfaceRequestor->MaybeAddTabChild(aLoadInfo.mLoadGroup);
+
+  nsCOMPtr<nsILoadGroup> loadGroup =
+    do_CreateInstance(NS_LOADGROUP_CONTRACTID);
+
+  nsresult rv =
+    loadGroup->SetNotificationCallbacks(aLoadInfo.mInterfaceRequestor);
+  MOZ_ALWAYS_TRUE(NS_SUCCEEDED(rv));
+
+  aLoadInfo.mLoadGroup = loadGroup.forget();
+}
+
 void
 WorkerPrivate::DoRunLoop(JSContext* aCx)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/WorkerPrivate.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/WorkerPrivate.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/WorkerPrivate.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/WorkerPrivate.h	2015-02-28 15:03:11.000000000 +0000
@@ -132,6 +132,7 @@
   class SynchronizeAndResumeRunnable;
 
 protected:
+  class InterfaceRequestor;
   class EventTarget;
   friend class EventTarget;
 
@@ -163,6 +164,9 @@
     nsCOMPtr<nsIChannel> mChannel;
     nsCOMPtr<nsILoadGroup> mLoadGroup;
 
+    // Only set if we have a custom overriden load group
+    nsRefPtr<InterfaceRequestor> mInterfaceRequestor;
+
     nsAutoPtr<PrincipalInfo> mPrincipalInfo;
     nsCString mDomain;
 
@@ -207,6 +211,9 @@
       MOZ_ASSERT(!mLoadGroup);
       aOther.mLoadGroup.swap(mLoadGroup);
 
+      MOZ_ASSERT(!mInterfaceRequestor);
+      aOther.mInterfaceRequestor.swap(mInterfaceRequestor);
+
       MOZ_ASSERT(!mPrincipalInfo);
       mPrincipalInfo = aOther.mPrincipalInfo.forget();
 
@@ -394,6 +401,9 @@
   ModifyBusyCount(JSContext* aCx, bool aIncrease);
 
   void
+  ForgetOverridenLoadGroup(nsCOMPtr<nsILoadGroup>& aLoadGroupOut);
+
+  void
   ForgetMainThreadObjects(nsTArray<nsCOMPtr<nsISupports> >& aDoomed);
 
   void
@@ -763,6 +773,9 @@
   void
   StealHostObjectURIs(nsTArray<nsCString>& aArray);
 
+  void
+  UpdateOverridenLoadGroup(nsILoadGroup* aBaseLoadGroup);
+
   IMPL_EVENT_HANDLER(message)
   IMPL_EVENT_HANDLER(error)
 
@@ -921,10 +934,19 @@
   static bool
   WorkerAvailable(JSContext* /* unused */, JSObject* /* unused */);
 
+  enum LoadGroupBehavior
+  {
+    InheritLoadGroup,
+    OverrideLoadGroup
+  };
+
   static nsresult
   GetLoadInfo(JSContext* aCx, nsPIDOMWindow* aWindow, WorkerPrivate* aParent,
               const nsAString& aScriptURL, bool aIsChromeWorker,
-              LoadInfo* aLoadInfo);
+              LoadGroupBehavior aLoadGroupBehavior, LoadInfo* aLoadInfo);
+
+  static void
+  OverrideLoadInfoLoadGroup(LoadInfo& aLoadInfo);
 
   WorkerDebugger*
   Debugger() const
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/WorkerScope.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/WorkerScope.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/WorkerScope.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/WorkerScope.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -457,7 +457,7 @@
 bool
 GetterOnlyJSNative(JSContext* aCx, unsigned aArgc, JS::Value* aVp)
 {
-  JS_ReportErrorNumber(aCx, js_GetErrorMessage, nullptr, JSMSG_GETTER_ONLY);
+  JS_ReportErrorNumber(aCx, js::GetErrorMessage, nullptr, JSMSG_GETTER_ONLY);
   return false;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/XMLHttpRequest.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/XMLHttpRequest.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/XMLHttpRequest.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/XMLHttpRequest.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -32,9 +32,6 @@
 using namespace mozilla::dom;
 USING_WORKERS_NAMESPACE
 
-// XXX Need to figure this out...
-#define UNCATCHABLE_EXCEPTION NS_ERROR_OUT_OF_MEMORY
-
 /**
  *  XMLHttpRequest in workers
  *
@@ -1907,7 +1904,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -1944,7 +1941,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -1967,7 +1964,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -1993,7 +1990,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2020,7 +2017,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2047,7 +2044,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return nullptr;
   }
 
@@ -2069,7 +2066,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2091,7 +2088,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2117,7 +2114,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2163,7 +2160,7 @@
   JSContext* cx = mWorkerPrivate->GetJSContext();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2217,20 +2214,13 @@
 }
 
 void
-XMLHttpRequest::SendAsBinary(const nsAString& aBody, ErrorResult& aRv)
-{
-  NS_NOTYETIMPLEMENTED("Implement me!");
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-  return;
-}
-
-void
 XMLHttpRequest::Abort(ErrorResult& aRv)
 {
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
+    return;
   }
 
   if (!mProxy) {
@@ -2258,7 +2248,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2285,7 +2275,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2311,7 +2301,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
@@ -2342,7 +2332,7 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 
   if (mCanceled) {
-    aRv.Throw(UNCATCHABLE_EXCEPTION);
+    aRv.ThrowUncatchableException();
     return;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/XMLHttpRequest.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/XMLHttpRequest.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/workers/XMLHttpRequest.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/workers/XMLHttpRequest.h	2015-02-28 15:03:11.000000000 +0000
@@ -179,9 +179,6 @@
   Send(const ArrayBufferView& aBody, ErrorResult& aRv);
 
   void
-  SendAsBinary(const nsAString& aBody, ErrorResult& aRv);
-
-  void
   Abort(ErrorResult& aRv);
 
   void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/xbl/nsXBLBinding.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/xbl/nsXBLBinding.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/xbl/nsXBLBinding.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/xbl/nsXBLBinding.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -916,6 +916,8 @@
   // content, and the Window for chrome (whether add-ons are involved or not).
   JS::Rooted<JSObject*> scope(cx, xpc::GetXBLScopeOrGlobal(cx, proto));
   NS_ENSURE_TRUE(scope, nullptr);
+  MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(scope) == scope);
+
   JS::Rooted<JSObject*> wrappedProto(cx, proto);
   JSAutoCompartment ac(cx, scope);
   if (!JS_WrapObject(cx, &wrappedProto)) {
@@ -939,7 +941,7 @@
 
   // We don't have an entry. Create one and stick it in the map.
   JS::Rooted<JSObject*> entry(cx);
-  entry = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr(), scope);
+  entry = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
   if (!entry) {
     return nullptr;
   }
@@ -1013,7 +1015,7 @@
     // We need to create the prototype. First, enter the compartment where it's
     // going to live, and create it.
     JSAutoCompartment ac2(cx, global);
-    proto = JS_NewObjectWithGivenProto(cx, &gPrototypeJSClass, parent_proto, global);
+    proto = JS_NewObjectWithGivenProto(cx, &gPrototypeJSClass, parent_proto);
     if (!proto) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/xbl/nsXBLProtoImpl.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/xbl/nsXBLProtoImpl.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/xbl/nsXBLProtoImpl.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/xbl/nsXBLProtoImpl.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -87,6 +87,7 @@
     GetGlobalForObjectCrossCompartment(targetClassObject));
   JS::Rooted<JSObject*> scopeObject(cx, xpc::GetScopeForXBLExecution(cx, globalObject, addonId));
   NS_ENSURE_TRUE(scopeObject, NS_ERROR_OUT_OF_MEMORY);
+  MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(scopeObject) == scopeObject);
   JSAutoCompartment ac(cx, scopeObject);
 
   // Determine the appropriate property holder.
@@ -112,7 +113,7 @@
   } else if (scopeObject != globalObject) {
 
     // This is just a property holder, so it doesn't need any special JSClass.
-    propertyHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr(), scopeObject);
+    propertyHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
     NS_ENSURE_TRUE(propertyHolder, NS_ERROR_OUT_OF_MEMORY);
 
     // Define it as a property on the scopeObject, using the same name used on
@@ -245,9 +246,8 @@
     return NS_ERROR_FAILURE;
   jsapi.TakeOwnershipOfErrorReporting();
   JSContext* cx = jsapi.cx();
-  JS::Rooted<JSObject*> compilationGlobal(cx, xpc::CompilationScope());
 
-  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr(), compilationGlobal);
+  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
   if (!mPrecompiledMemberHolder)
     return NS_ERROR_OUT_OF_MEMORY;
 
@@ -366,8 +366,7 @@
   AssertInCompilationScope();
   AutoJSContext cx;
   // Set up a class object first so that deserialization is possible
-  JS::Rooted<JSObject*> global(cx, JS::CurrentGlobalOrNull(cx));
-  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr(), global);
+  mPrecompiledMemberHolder = JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
   if (!mPrecompiledMemberHolder)
     return NS_ERROR_OUT_OF_MEMORY;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/xul/test/test_bug757137.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/xul/test/test_bug757137.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/dom/xul/test/test_bug757137.xul	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/dom/xul/test/test_bug757137.xul	2015-02-28 15:03:11.000000000 +0000
@@ -21,14 +21,6 @@
 // |window| synchronously from here.  Out-of-process docshell creation
 // for mozbrowser haves entirely differently.
 // XXX why doesn't pushPrefEnv() work here?
-var ipcTabsWereDisabled;
-try {
-  ipcTabsWereDisabled = SpecialPowers.getBoolPref("dom.ipc.tabs.disabled");
-} catch (e) {
-  ipcTabsWereDisabled = undefined;
-}
-SpecialPowers.setBoolPref("dom.ipc.tabs.disabled", true);
-
 var otherWindow = window.open("window_bug757137.xul", "", "chrome");
 ok(chromeWindowInterface !== null, 'nsIDOMChromeWindow interface is defined');
 var otherChromeWindow = null;
@@ -39,25 +31,22 @@
 }
 ok(otherChromeWindow !== null, 'XUL window should QI to ChromeWindow');
 
-otherWindow.onload = function () {
-  var w = otherWindow.document.getElementById('f').contentWindow;
-  ok(w !== null, 'got the |window| for a mozbrowser iframe');
-  var chromeWindow = null;
-  try {
-    var chromeWindow = w.QueryInterface(chromeWindowInterface);
-  } catch(e) { }
-  ok(chromeWindow === null, 'mozbrowser iframe should not get ChromeWindow');
+SpecialPowers.pushPrefEnv({"set":[["dom.ipc.tabs.disabled", true]]}, startTest);
 
-  otherWindow.close();
-  SimpleTest.waitForFocus(function() {
-    if (ipcTabsWereDisabled !== undefined) {
-      SpecialPowers.setBoolPref("dom.ipc.tabs.disabled", ipcTabsWereDisabled);
-    } else {
-      SpecialPowers.clearUserPref("dom.ipc.tabs.disabled");
-    }
-    SimpleTest.finish();
-  });
-};
+function startTest() {
+  otherWindow.onload = function () {
+    var w = otherWindow.document.getElementById('f').contentWindow;
+    ok(w !== null, 'got the |window| for a mozbrowser iframe');
+    var chromeWindow = null;
+    try {
+      var chromeWindow = w.QueryInterface(chromeWindowInterface);
+    } catch(e) { }
+      ok(chromeWindow === null, 'mozbrowser iframe should not get ChromeWindow');
+
+    otherWindow.close();
+    SimpleTest.waitForFocus(SimpleTest.finish);
+ };
+}
 </script>
 
 </window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/composer/test/test_bug519928.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/composer/test/test_bug519928.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/composer/test/test_bug519928.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/composer/test/test_bug519928.html	2015-02-28 15:03:11.000000000 +0000
@@ -19,8 +19,8 @@
 
 var iframe = document.getElementById("load-frame");
 
-function enableJS() allowJS(true, iframe);
-function disableJS() allowJS(false, iframe);
+function enableJS() { allowJS(true, iframe); }
+function disableJS() { allowJS(false, iframe); }
 function allowJS(allow, frame) {
   SpecialPowers.wrap(frame.contentWindow)
                .QueryInterface(SpecialPowers.Ci.nsIInterfaceRequestor)
@@ -28,6 +28,7 @@
                .QueryInterface(SpecialPowers.Ci.nsIDocShell)
                .allowJavascript = allow;
 }
+
 function expectJSAllowed(allowed, testCondition, callback) {
   window.ICanRunMyJS = false;
   var self_ = window;
@@ -49,8 +50,8 @@
 
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
-  var enterDesignMode = function() document.designMode = "on";
-  var leaveDesignMode = function() document.designMode = "off";
+  var enterDesignMode = function() { document.designMode = "on"; };
+  var leaveDesignMode = function() { document.designMode = "off"; };
   expectJSAllowed(false, disableJS, function() {
     expectJSAllowed(true, enableJS, function() {
       expectJSAllowed(true, enterDesignMode, function() {
@@ -59,8 +60,8 @@
             expectJSAllowed(false, enterDesignMode, function() {
               expectJSAllowed(false, leaveDesignMode, function() {
                 expectJSAllowed(true, enableJS, function() {
-                  enterDesignMode = function() iframe.contentDocument.designMode = "on";
-                  leaveDesignMode = function() iframe.contentDocument.designMode = "off";
+                  enterDesignMode = function() { iframe.contentDocument.designMode = "on"; };
+                  leaveDesignMode = function() { iframe.contentDocument.designMode = "off"; };
                   expectJSAllowed(false, disableJS, function() {
                     expectJSAllowed(true, enableJS, function() {
                       expectJSAllowed(true, enterDesignMode, function() {
@@ -120,4 +121,3 @@
 </pre>
 </body>
 </html>
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsEditor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsEditor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsEditor.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsEditor.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -3561,7 +3561,7 @@
   *aStartNode = nullptr;
   *aStartOffset = 0;
 
-  NS_ENSURE_TRUE(aSelection->GetRangeCount(), NS_ERROR_FAILURE);
+  NS_ENSURE_TRUE(aSelection->RangeCount(), NS_ERROR_FAILURE);
 
   const nsRange* range = aSelection->GetRangeAt(0);
   NS_ENSURE_TRUE(range, NS_ERROR_FAILURE);
@@ -3608,7 +3608,7 @@
   *aEndNode = nullptr;
   *aEndOffset = 0;
 
-  NS_ENSURE_TRUE(aSelection->GetRangeCount(), NS_ERROR_FAILURE);
+  NS_ENSURE_TRUE(aSelection->RangeCount(), NS_ERROR_FAILURE);
 
   const nsRange* range = aSelection->GetRangeAt(0);
   NS_ENSURE_TRUE(range, NS_ERROR_FAILURE);
@@ -4162,7 +4162,7 @@
   // allocate the out-param transaction
   nsRefPtr<EditAggregateTxn> aggTxn = new EditAggregateTxn();
 
-  for (int32_t rangeIdx = 0; rangeIdx < selection->GetRangeCount(); ++rangeIdx) {
+  for (uint32_t rangeIdx = 0; rangeIdx < selection->RangeCount(); ++rangeIdx) {
     nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
     NS_ENSURE_STATE(range);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsHTMLEditor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsHTMLEditor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsHTMLEditor.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsHTMLEditor.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -3275,7 +3275,7 @@
   // Per the editing spec as of June 2012: we have to have a selection whose
   // start and end nodes are editable, and which share an ancestor editing
   // host.  (Bug 766387.)
-  *aIsSelectionEditable = selection->GetRangeCount() &&
+  *aIsSelectionEditable = selection->RangeCount() &&
                           selection->GetAnchorNode()->IsEditable() &&
                           selection->GetFocusNode()->IsEditable();
 
@@ -4547,7 +4547,7 @@
   {
     // loop thru the ranges in the selection
     nsAutoString bgcolor; bgcolor.AssignLiteral("bgcolor");
-    uint32_t rangeCount = selection->GetRangeCount();
+    uint32_t rangeCount = selection->RangeCount();
     for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
       nsCOMPtr<nsIDOMNode> cachedBlockParent = nullptr;
       nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsHTMLEditorStyle.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsHTMLEditorStyle.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsHTMLEditorStyle.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsHTMLEditorStyle.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -144,7 +144,7 @@
   NS_ENSURE_SUCCESS(res, res);
   if (!cancel && !handled) {
     // loop thru the ranges in the selection
-    uint32_t rangeCount = selection->GetRangeCount();
+    uint32_t rangeCount = selection->RangeCount();
     for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
       nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
 
@@ -1369,7 +1369,7 @@
   if (!cancel && !handled)
   {
     // loop thru the ranges in the selection
-    uint32_t rangeCount = selection->GetRangeCount();
+    uint32_t rangeCount = selection->RangeCount();
     for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
       nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
       if (aProperty == nsGkAtoms::name) {
@@ -1542,7 +1542,7 @@
   nsAutoTxnsConserveSelection dontSpazMySelection(this);
 
   // loop thru the ranges in the selection
-  uint32_t rangeCount = selection->GetRangeCount();
+  uint32_t rangeCount = selection->RangeCount();
   for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
     nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsHTMLEditRules.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsHTMLEditRules.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsHTMLEditRules.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsHTMLEditRules.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -315,7 +315,7 @@
     nsRefPtr<Selection> selection = mHTMLEditor->GetSelection();
 
     // get the selection location
-    NS_ENSURE_STATE(selection->GetRangeCount());
+    NS_ENSURE_STATE(selection->RangeCount());
     mRangeItem->startNode = selection->GetRangeAt(0)->GetStartParent();
     mRangeItem->startOffset = selection->GetRangeAt(0)->StartOffset();
     mRangeItem->endNode = selection->GetRangeAt(0)->GetEndParent();
@@ -582,7 +582,7 @@
   if (!aSelection) {
     return NS_OK;
   }
-  NS_ENSURE_TRUE(aSelection->GetRangeCount(), NS_OK);
+  NS_ENSURE_TRUE(aSelection->RangeCount(), NS_OK);
 
   nsRefPtr<nsRange> range = aSelection->GetRangeAt(0);
   nsCOMPtr<nsINode> selStartNode = range->GetStartParent();
@@ -2425,7 +2425,7 @@
         // except table elements.
         join = true;
 
-        uint32_t rangeCount = aSelection->GetRangeCount();
+        uint32_t rangeCount = aSelection->RangeCount();
         for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
           nsRefPtr<nsRange> range = aSelection->GetRangeAt(rangeIdx);
 
@@ -6050,7 +6050,7 @@
   // is only in part of it.  used by list item dialog.
   if (aEntireList)
   {       
-    uint32_t rangeCount = selection->GetRangeCount();
+    uint32_t rangeCount = selection->RangeCount();
     for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
       nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
       nsCOMPtr<nsIDOMNode> commonParent, parent, tmp;
@@ -7519,7 +7519,7 @@
   NS_ENSURE_STATE(mHTMLEditor);
   nsRefPtr<Selection> selection = mHTMLEditor->GetSelection();
   MOZ_ASSERT(selection);
-  if (!selection->GetRangeCount()) {
+  if (!selection->RangeCount()) {
     // Nothing to do
     return NS_OK;
   }
@@ -8179,7 +8179,7 @@
   nsRefPtr<Selection> selection = mHTMLEditor->GetSelection();
   NS_ENSURE_STATE(selection);
   
-  uint32_t rangeCount = selection->GetRangeCount();
+  uint32_t rangeCount = selection->RangeCount();
   for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
     nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
     nsCOMPtr<nsIDOMNode> startParent, endParent;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsSelectionState.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsSelectionState.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsSelectionState.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsSelectionState.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -55,7 +55,7 @@
 {
   MOZ_ASSERT(aSel);
   int32_t arrayCount = mArray.Length();
-  int32_t rangeCount = aSel->GetRangeCount();
+  int32_t rangeCount = aSel->RangeCount();
 
   // if we need more items in the array, new them
   if (arrayCount < rangeCount) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsTableEditor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsTableEditor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/nsTableEditor.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/nsTableEditor.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -2956,7 +2956,7 @@
   nsRefPtr<Selection> selection = GetSelection();
   NS_ENSURE_TRUE(selection, NS_ERROR_FAILURE);
 
-  int32_t rangeCount = selection->GetRangeCount();
+  int32_t rangeCount = selection->RangeCount();
 
   // Don't even try if index exceeds range count
   if (mSelectedCellIndex >= rangeCount) 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug484181.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug484181.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug484181.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug484181.html	2015-02-28 15:03:11.000000000 +0000
@@ -7,13 +7,13 @@
   <title>Test for Bug 484181</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>  
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=484181">Mozilla Bug 484181</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script type="application/javascript">
@@ -38,7 +38,7 @@
 function getSpellCheckSelection() {
   var editor = getEditor();
   var selcon = editor.selectionController;
-  return selcon.getSelection(selcon.SELECTION_SPELLCHECK);  
+  return selcon.getSelection(selcon.SELECTION_SPELLCHECK);
 }
 
 function append(str) {
@@ -63,10 +63,10 @@
   onSpellCheck(edit, function () {
     is(isSpellingCheckOk(), true, "All misspellings before editing are accounted for.");
 
-    append(" becaz I'm a lolcat!");
+    append(" becaz I'm a lulcat!");
     onSpellCheck(edit, function () {
       gMisspeltWords.push("becaz");
-      gMisspeltWords.push("lolcat");
+      gMisspeltWords.push("lulcat");
       is(isSpellingCheckOk(), true, "All misspellings after typing are accounted for.");
 
       SimpleTest.finish();
@@ -78,12 +78,12 @@
 
   var sel = getSpellCheckSelection();
   var numWords = sel.rangeCount;
-  
+
   is(numWords, gMisspeltWords.length, "Correct number of misspellings and words.");
-  
-  if (numWords != gMisspeltWords.length) 
+
+  if (numWords != gMisspeltWords.length)
     return false;
-  
+
   for (var i=0; i<numWords; i++) {
     var word = sel.getRangeAt(i);
     is (word, gMisspeltWords[i], "Misspelling is what we think it is.");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug520189.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug520189.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug520189.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug520189.html	2015-02-28 15:03:11.000000000 +0000
@@ -119,175 +119,175 @@
     isIFrame: true,
     payload: dataPayload,
     iframeCount: 0,
-    rootElement: function() document.getElementById("a").contentDocument.documentElement
+    rootElement() { return document.getElementById("a").contentDocument.documentElement; },
   },
   {
     id: "b",
     isIFrame: true,
     payload: jsPayload,
     iframeCount: 0,
-    rootElement: function() document.getElementById("b").contentDocument.documentElement
+    rootElement() { return document.getElementById("b").contentDocument.documentElement; },
   },
   {
     id: "c",
     isIFrame: true,
     payload: httpPayload,
     iframeCount: 0,
-    rootElement: function() document.getElementById("c").contentDocument.documentElement
+    rootElement() { return document.getElementById("c").contentDocument.documentElement; },
   },
   {
     id: "g",
     isIFrame: true,
     payload: scriptPayload,
-    rootElement: function() document.getElementById("g").contentDocument.documentElement,
+    rootElement() { return document.getElementById("g").contentDocument.documentElement; },
     iframeCount: 0
   },
   {
     id: "h",
     isIFrame: true,
     payload: scriptExternalPayload,
-    rootElement: function() document.getElementById("h").contentDocument.documentElement,
+    rootElement() { return document.getElementById("h").contentDocument.documentElement; },
     iframeCount: 0
   },
   {
     id: "d",
     payload: dataPayload,
     iframeCount: 0,
-    rootElement: function() document.getElementById("d")
+    rootElement() { return document.getElementById("d"); },
   },
   {
     id: "e",
     payload: jsPayload,
     iframeCount: 0,
-    rootElement: function() document.getElementById("e")
+    rootElement() { return document.getElementById("e"); },
   },
   {
     id: "f",
     payload: httpPayload,
     iframeCount: 0,
-    rootElement: function() document.getElementById("f")
+    rootElement() { return document.getElementById("f"); },
   },
   {
     id: "i",
     payload: scriptPayload,
-    rootElement: function() document.getElementById("i"),
+    rootElement() { return document.getElementById("i"); },
     iframeCount: 0
   },
   {
     id: "j",
     payload: scriptExternalPayload,
-    rootElement: function() document.getElementById("j"),
+    rootElement() { return document.getElementById("j"); },
     iframeCount: 0
   },
   {
     id: "k",
     isIFrame: true,
     payload: validStyle1Payload,
-    rootElement: function() document.getElementById("k").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("style"), -1, "Should have retained style")
+    rootElement() { return document.getElementById("k").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("style"), -1, "Should have retained style"); },
   },
   {
     id: "l",
     payload: validStyle1Payload,
-    rootElement: function() document.getElementById("l"),
-    checkResult: function(html) isnot(html.indexOf("style"), -1, "Should have retained style")
+    rootElement() { return document.getElementById("l"); },
+    checkResult(html) { isnot(html.indexOf("style"), -1, "Should have retained style"); },
   },
   {
     id: "m",
     isIFrame: true,
     payload: validStyle2Payload,
-    rootElement: function() document.getElementById("m").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("style"), -1, "Should have retained style")
+    rootElement() { return document.getElementById("m").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("style"), -1, "Should have retained style"); },
   },
   {
     id: "n",
     payload: validStyle2Payload,
-    rootElement: function() document.getElementById("n"),
-    checkResult: function(html) isnot(html.indexOf("style"), -1, "Should have retained style")
+    rootElement() { return document.getElementById("n"); },
+    checkResult(html) { isnot(html.indexOf("style"), -1, "Should have retained style"); },
   },
   {
     id: "o",
     isIFrame: true,
     payload: invalidStyle1Payload,
-    rootElement: function() document.getElementById("o").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("binding"), -1, "Should not have retained the binding style")
+    rootElement() { return document.getElementById("o").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("binding"), -1, "Should not have retained the binding style"); },
   },
   {
     id: "p",
     payload: invalidStyle1Payload,
-    rootElement: function() document.getElementById("p"),
-    checkResult: function(html) is(html.indexOf("binding"), -1, "Should not have retained the binding style")
+    rootElement() { return document.getElementById("p"); },
+    checkResult(html) { is(html.indexOf("binding"), -1, "Should not have retained the binding style"); },
   },
   {
     id: "q",
     isIFrame: true,
     payload: invalidStyle2Payload,
-    rootElement: function() document.getElementById("q").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("binding"), -1, "Should not have retained the binding style")
+    rootElement() { return document.getElementById("q").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("binding"), -1, "Should not have retained the binding style"); },
   },
   {
     id: "r",
     payload: invalidStyle2Payload,
-    rootElement: function() document.getElementById("r"),
-    checkResult: function(html) is(html.indexOf("binding"), -1, "Should not have retained the binding style")
+    rootElement() { return document.getElementById("r"); },
+    checkResult(html) { is(html.indexOf("binding"), -1, "Should not have retained the binding style"); },
   },
   {
     id: "s",
     isIFrame: true,
     payload: invalidStyle1Payload,
-    rootElement: function() document.getElementById("s").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("xxx"), -1, "Should not have retained the import style")
+    rootElement() { return document.getElementById("s").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("xxx"), -1, "Should not have retained the import style"); },
   },
   {
     id: "t",
     payload: invalidStyle1Payload,
-    rootElement: function() document.getElementById("t"),
-    checkResult: function(html) is(html.indexOf("xxx"), -1, "Should not have retained the import style")
+    rootElement() { return document.getElementById("t"); },
+    checkResult(html) { is(html.indexOf("xxx"), -1, "Should not have retained the import style"); },
   },
   {
     id: "u",
     isIFrame: true,
     payload: invalidStyle2Payload,
-    rootElement: function() document.getElementById("u").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("xxx"), -1, "Should not have retained the import style")
+    rootElement() { return document.getElementById("u").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("xxx"), -1, "Should not have retained the import style"); },
   },
   {
     id: "v",
     payload: invalidStyle2Payload,
-    rootElement: function() document.getElementById("v"),
-    checkResult: function(html) is(html.indexOf("xxx"), -1, "Should not have retained the import style")
+    rootElement() { return document.getElementById("v"); },
+    checkResult(html) { is(html.indexOf("xxx"), -1, "Should not have retained the import style"); },
   },
   {
     id: "w",
     isIFrame: true,
     payload: validStyle3Payload,
-    rootElement: function() document.getElementById("w").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should have retained the font-face style")
+    rootElement() { return document.getElementById("w").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should have retained the font-face style"); },
   },
   {
     id: "x",
     payload: validStyle3Payload,
-    rootElement: function() document.getElementById("x"),
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should have retained the font-face style")
+    rootElement() { return document.getElementById("x"); },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should have retained the font-face style"); },
   },
   {
     id: "y",
     isIFrame: true,
     payload: invalidStyle5Payload,
-    rootElement: function() document.getElementById("y").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should not have retained the font-face style")
+    rootElement() { return document.getElementById("y").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should not have retained the font-face style"); },
   },
   {
     id: "z",
     payload: invalidStyle5Payload,
-    rootElement: function() document.getElementById("z"),
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should not have retained the font-face style")
+    rootElement() { return document.getElementById("z"); },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should not have retained the font-face style"); },
   },
   {
     id: "aa",
     isIFrame: true,
     payload: nestedStylePayload,
-    rootElement: function() document.getElementById("aa").contentDocument.documentElement,
+    rootElement() { return document.getElementById("aa").contentDocument.documentElement; },
     checkResult: function(html, text) {
       is(html.indexOf("binding-1"), -1, "Should not have retained the binding-1 style");
       isnot(text.indexOf("#bar2"), -1, "Should have retained binding-2 as text content");
@@ -297,7 +297,7 @@
   {
     id: "bb",
     payload: nestedStylePayload,
-    rootElement: function() document.getElementById("bb"),
+    rootElement() { return document.getElementById("bb"); },
     checkResult: function(html, text) {
       is(html.indexOf("binding-1"), -1, "Should not have retained the binding-1 style");
       isnot(text.indexOf("#bar2"), -1, "Should have retained binding-2 as text content");
@@ -308,73 +308,73 @@
     id: "cc",
     isIFrame: true,
     payload: validStyle4Payload,
-    rootElement: function() document.getElementById("cc").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should have retained the namespace style")
+    rootElement() { return document.getElementById("cc").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should have retained the namespace style"); },
   },
   {
     id: "dd",
     payload: validStyle4Payload,
-    rootElement: function() document.getElementById("dd"),
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should have retained the namespace style")
+    rootElement() { return document.getElementById("dd"); },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should have retained the namespace style"); },
   },
   {
     id: "ee",
     isIFrame: true,
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("ee").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should not have retained the namespace style")
+    rootElement() { return document.getElementById("ee").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should not have retained the namespace style"); },
   },
   {
     id: "ff",
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("ff"),
-    checkResult: function(html) isnot(html.indexOf("xxx"), -1, "Should not have retained the namespace style")
+    rootElement() { return document.getElementById("ff"); },
+    checkResult(html) { isnot(html.indexOf("xxx"), -1, "Should not have retained the namespace style"); },
   },
   {
     id: "gg",
     isIFrame: true,
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("gg").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image")
+    rootElement() { return document.getElementById("gg").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image"); },
   },
   {
     id: "hh",
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("hh"),
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image")
+    rootElement() { return document.getElementById("hh"); },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image"); },
   },
   {
     id: "ii",
     isIFrame: true,
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("ii").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image")
+    rootElement() { return document.getElementById("ii").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image"); },
   },
   {
     id: "jj",
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("jj"),
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image")
+    rootElement() { return document.getElementById("jj"); },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image"); },
   },
   {
     id: "kk",
     isIFrame: true,
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("kk").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image")
+    rootElement() { return document.getElementById("kk").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image"); },
   },
   {
     id: "ll",
     payload: invalidStyle6Payload,
-    rootElement: function() document.getElementById("ll"),
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image")
+    rootElement() { return document.getElementById("ll"); },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the src attribute for the image"); },
   },
   {
     id: "mm",
     isIFrame: true,
     indirectPaste: true,
     payload: invalidStyle7Payload,
-    rootElement: function() document.getElementById("mm").contentDocument.documentElement,
+    rootElement() { return document.getElementById("mm").contentDocument.documentElement; },
     checkResult: function(html) {
       is(html.indexOf("xxx"), -1, "Should not have retained the title text");
       isnot(html.indexOf("foo"), -1, "Should have retained the body text");
@@ -384,7 +384,7 @@
     id: "nn",
     indirectPaste: true,
     payload: invalidStyle7Payload,
-    rootElement: function() document.getElementById("nn"),
+    rootElement() { return document.getElementById("nn"); },
     checkResult: function(html) {
       is(html.indexOf("xxx"), -1, "Should not have retained the title text");
       isnot(html.indexOf("foo"), -1, "Should have retained the body text");
@@ -394,143 +394,143 @@
     id: "oo",
     isIFrame: true,
     payload: validDataFooPayload,
-    rootElement: function() document.getElementById("oo").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the data-bar attribute")
+    rootElement() { return document.getElementById("oo").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the data-bar attribute"); },
   },
   {
     id: "pp",
     payload: validDataFooPayload,
-    rootElement: function() document.getElementById("pp"),
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the data-bar attribute")
+    rootElement() { return document.getElementById("pp"); },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the data-bar attribute"); },
   },
   {
     id: "qq",
     isIFrame: true,
     payload: validDataFoo2Payload,
-    rootElement: function() document.getElementById("qq").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the _bar attribute")
+    rootElement() { return document.getElementById("qq").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the _bar attribute"); },
   },
   {
     id: "rr",
     payload: validDataFoo2Payload,
-    rootElement: function() document.getElementById("rr"),
-    checkResult: function(html) isnot(html.indexOf("bar"), -1, "Should have retained the _bar attribute")
+    rootElement() { return document.getElementById("rr"); },
+    checkResult(html) { isnot(html.indexOf("bar"), -1, "Should have retained the _bar attribute"); },
   },
   {
     id: "ss",
     isIFrame: true,
     payload: invalidStyle8Payload,
-    rootElement: function() document.getElementById("ss").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("@-moz-document"), -1, "Should not have retained the @-moz-document rule")
+    rootElement() { return document.getElementById("ss").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("@-moz-document"), -1, "Should not have retained the @-moz-document rule"); },
   },
   {
     id: "tt",
     payload: invalidStyle8Payload,
-    rootElement: function() document.getElementById("tt"),
-    checkResult: function(html) is(html.indexOf("@-moz-document"), -1, "Should not have retained the @-moz-document rule")
+    rootElement() { return document.getElementById("tt"); },
+    checkResult(html) { is(html.indexOf("@-moz-document"), -1, "Should not have retained the @-moz-document rule"); },
   },
   {
     id: "uu",
     isIFrame: true,
     payload: invalidStyle9Payload,
-    rootElement: function() document.getElementById("uu").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("@-moz-keyframes"), -1, "Should not have retained the @-moz-keyframes rule")
+    rootElement() { return document.getElementById("uu").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("@-moz-keyframes"), -1, "Should not have retained the @-moz-keyframes rule"); },
   },
   {
     id: "vv",
     payload: invalidStyle9Payload,
-    rootElement: function() document.getElementById("vv"),
-    checkResult: function(html) is(html.indexOf("@-moz-keyframes"), -1, "Should not have retained the @-moz-keyframes rule")
+    rootElement() { return document.getElementById("vv"); },
+    checkResult(html) { is(html.indexOf("@-moz-keyframes"), -1, "Should not have retained the @-moz-keyframes rule"); },
   },
   {
     id: "sss",
     payload: svgPayload,
-    rootElement: function() document.getElementById("sss"),
-    checkResult: function(html) isnot(html.indexOf("svgtitle"), -1, "Should have retained SVG title")
+    rootElement() { return document.getElementById("sss"); },
+    checkResult(html) { isnot(html.indexOf("svgtitle"), -1, "Should have retained SVG title"); },
   },
   {
     id: "ssss",
     isIFrame: true,
     payload: svgPayload,
-    rootElement: function() document.getElementById("ssss").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("svgtitle"), -1, "Should have retained SVG title")
+    rootElement() { return document.getElementById("ssss").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("svgtitle"), -1, "Should have retained SVG title"); },
   },
   {
     id: "ttt",
     payload: svg2Payload,
-    rootElement: function() document.getElementById("ttt"),
-    checkResult: function(html) is(html.indexOf("bogussvg"), -1, "Should have dropped bogussvg element")
+    rootElement() { return document.getElementById("ttt"); },
+    checkResult(html) { is(html.indexOf("bogussvg"), -1, "Should have dropped bogussvg element"); },
   },
   {
     id: "tttt",
     isIFrame: true,
     payload: svg2Payload,
-    rootElement: function() document.getElementById("tttt").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("bogussvg"), -1, "Should have dropped bogussvg element")
+    rootElement() { return document.getElementById("tttt").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("bogussvg"), -1, "Should have dropped bogussvg element"); },
   },
   {
     id: "uuu",
     payload: mathPayload,
-    rootElement: function() document.getElementById("uuu"),
-    checkResult: function(html) is(html.indexOf("bogusmath"), -1, "Should have dropped bogusmath element")
+    rootElement() { return document.getElementById("uuu"); },
+    checkResult(html) { is(html.indexOf("bogusmath"), -1, "Should have dropped bogusmath element"); },
   },
   {
     id: "uuuu",
     isIFrame: true,
     payload: mathPayload,
-    rootElement: function() document.getElementById("uuuu").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("bogusmath"), -1, "Should have dropped bogusmath element")
+    rootElement() { return document.getElementById("uuuu").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("bogusmath"), -1, "Should have dropped bogusmath element"); },
   },
   {
     id: "vvv",
     payload: math2Payload,
-    rootElement: function() document.getElementById("vvv"),
-    checkResult: function(html) is(html.indexOf("yyy.css"), -1, "Should have dropped MathML style element")
+    rootElement() { return document.getElementById("vvv"); },
+    checkResult(html) { is(html.indexOf("yyy.css"), -1, "Should have dropped MathML style element"); },
   },
   {
     id: "vvvv",
     isIFrame: true,
     payload: math2Payload,
-    rootElement: function() document.getElementById("vvvv").contentDocument.documentElement,
-    checkResult: function(html) is(html.indexOf("yyy.css"), -1, "Should have dropped MathML style element")
+    rootElement() { return document.getElementById("vvvv").contentDocument.documentElement; },
+    checkResult(html) { is(html.indexOf("yyy.css"), -1, "Should have dropped MathML style element"); },
   },
   {
     id: "www",
     payload: math3Payload,
-    rootElement: function() document.getElementById("www"),
-    checkResult: function(html) isnot(html.indexOf("<mi"), -1, "Should not have dropped MathML mi element")
+    rootElement() { return document.getElementById("www"); },
+    checkResult(html) { isnot(html.indexOf("<mi"), -1, "Should not have dropped MathML mi element"); },
   },
   {
     id: "wwww",
     isIFrame: true,
     payload: math3Payload,
-    rootElement: function() document.getElementById("wwww").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("<mi"), -1, "Should not have dropped MathML mi element")
+    rootElement() { return document.getElementById("wwww").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("<mi"), -1, "Should not have dropped MathML mi element"); },
   },
   {
     id: "xxx",
     payload: videoPayload,
-    rootElement: function() document.getElementById("xxx"),
-    checkResult: function(html) isnot(html.indexOf("controls="), -1, "Should have added the controls attribute")
+    rootElement() { return document.getElementById("xxx"); },
+    checkResult(html) { isnot(html.indexOf("controls="), -1, "Should have added the controls attribute"); },
   },
   {
     id: "xxxx",
     isIFrame: true,
     payload: videoPayload,
-    rootElement: function() document.getElementById("xxxx").contentDocument.documentElement,
-    checkResult: function(html) isnot(html.indexOf("controls="), -1, "Should have added the controls attribute")
+    rootElement() { return document.getElementById("xxxx").contentDocument.documentElement; },
+    checkResult(html) { isnot(html.indexOf("controls="), -1, "Should have added the controls attribute"); },
   },
   {
     id: "yyy",
     payload: microdataPayload,
-    rootElement: function() document.getElementById("yyy"),
+    rootElement() { return document.getElementById("yyy"); },
     checkResult: function(html) { is(html.indexOf("name"), -1, "Should have dropped name."); is(html.indexOf("rel"), -1, "Should have dropped rel."); isnot(html.indexOf("itemprop"), -1, "Should not have dropped itemprop."); }
   },
   {
     id: "yyyy",
     isIFrame: true,
     payload: microdataPayload,
-    rootElement: function() document.getElementById("yyyy").contentDocument.documentElement,
+    rootElement() { return document.getElementById("yyyy").contentDocument.documentElement; },
     checkResult: function(html) { is(html.indexOf("name"), -1, "Should have dropped name."); is(html.indexOf("rel"), -1, "Should have dropped rel."); isnot(html.indexOf("itemprop"), -1, "Should not have dropped itemprop."); }
   }
 ];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug549262.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug549262.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug549262.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug549262.html	2015-02-28 15:03:11.000000000 +0000
@@ -20,7 +20,6 @@
 /** Test for Bug 549262 **/
 
 var smoothScrollPref = "general.smoothScroll";
-SpecialPowers.setBoolPref(smoothScrollPref, false);
 SimpleTest.waitForExplicitFinish();
 var win = window.open("file_bug549262.html", "_blank", 
                       "width=600,height=600,scrollbars=yes");
@@ -30,8 +29,10 @@
 function step() {
   cwu.advanceTimeAndRefresh(100);
 }
-
 SimpleTest.waitForFocus(function() {
+  SpecialPowers.pushPrefEnv({"set":[[smoothScrollPref, false]]}, startTest);
+}, win);
+function startTest() {
   // Make sure that pressing Space when a contenteditable element is not focused
   // will scroll the page.
   var ed = win.document.getElementById("editor");
@@ -121,12 +122,10 @@
   is(win.getSelection().focusOffset, ed.textContent.length, "Selection should be moved to the end");
 
   win.close();
-  SpecialPowers.clearUserPref(smoothScrollPref);
   cwu.restoreNormalRefresh();
 
   SimpleTest.finish();
-}, win);
-
+}
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug578771.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug578771.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug578771.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug578771.html	2015-02-28 15:03:11.000000000 +0000
@@ -26,9 +26,6 @@
       /** Test for Bug 578771 **/
       SimpleTest.waitForExplicitFinish();
 
-      // Avoid platform selection differences
-      SpecialPowers.setBoolPref("layout.word_select.eat_space_to_next_word", false);
-
       function testElem(elem, elemTag) {
         var ce = document.getElementById("ce");
         ce.focus();
@@ -42,17 +39,20 @@
         ok(elem.selectionStart == 0 && elem.selectionEnd == 14,
            "Triple-clicking on another " + elemTag + " works correctly");
       }
-
+      // Avoid platform selection differences
       SimpleTest.waitForFocus(function() {
-        var input = document.getElementById("ip");
-        testElem(input, "input");
+         SpecialPowers.pushPrefEnv({"set":[["layout.word_select.eat_space_to_next_word", false]]}, startTest);
+      });
 
-        var textarea = document.getElementById("ta");
-        testElem(textarea, "textarea");
+      function startTest() {
+         var input = document.getElementById("ip");
+         testElem(input, "input");
 
-        SpecialPowers.clearUserPref("layout.word_select.eat_space_to_next_word");
-        SimpleTest.finish();
-      });
+         var textarea = document.getElementById("ta");
+         testElem(textarea, "textarea");
+
+         SimpleTest.finish();
+      }
    </script>
   </pre>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug596001.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug596001.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug596001.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug596001.html	2015-02-28 15:03:11.000000000 +0000
@@ -34,7 +34,7 @@
     function() {
       dst.focus();
       var inputReceived = false;
-      dst.addEventListener("input", function() inputReceived = true, false);
+      dst.addEventListener("input", function() { inputReceived = true; }, false);
       synthesizeKey("v", {accelKey: true});
       ok(inputReceived, "An input event should be raised");
       is(dst.value, prefix + src.value, "The value should be pasted verbatim");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug596333.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug596333.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug596333.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug596333.html	2015-02-28 15:03:11.000000000 +0000
@@ -71,10 +71,10 @@
 
   gMisspeltWords = ["haz", "cheezburger"];
   is(isSpellingCheckOk(), true, "All misspellings before editing are accounted for.");
-  append(" becaz I'm a lolcat!");
+  append(" becaz I'm a lulcat!");
   onSpellCheck(edit, function () {
     gMisspeltWords.push("becaz");
-    gMisspeltWords.push("lolcat");
+    gMisspeltWords.push("lulcat");
     is(isSpellingCheckOk(), true, "All misspellings after typing are accounted for.");
 
     // Now, type an invalid word, and instead of hitting "space" at the end, just blur
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug625452.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug625452.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug625452.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug625452.html	2015-02-28 15:03:11.000000000 +0000
@@ -23,7 +23,7 @@
 addLoadEvent(function() {
   var i = document.querySelector("input");
   var inputCount = 0;
-  i.addEventListener("input", function() inputCount++, false);
+  i.addEventListener("input", function() { inputCount++; }, false);
 
   // test cut
   i.focus();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug640321.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug640321.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug640321.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug640321.html	2015-02-28 15:03:11.000000000 +0000
@@ -87,8 +87,6 @@
     const needlessGrowth = preserveRatio ? 1 : 0;
     const reversedGrowth = preserveRatio ? -1 : 1;
 
-    SpecialPowers.setBoolPref("editor.resizing.preserve_ratio", preserveRatio);
-
     // top resizer
     testResizer(W/2,   0, -10, -10,   0,  10);
     testResizer(W/2,   0, -10,   0,   0,   0);
@@ -176,15 +174,15 @@
     testResizer(  0,   0,  10, -10, -10 * reversedGrowth,  10);
     testResizer(  0,   0,  10,   0, -10 * ignoredGrowth,   0);
     testResizer(  0,   0,  10,  10, -10, -10);
-
-    SpecialPowers.clearUserPref("editor.resizing.preserve_ratio");
-  }
-
-  runTests(false);
-  runTests(true);
-
-  SimpleTest.finish();
-});
+ }
+ SpecialPowers.pushPrefEnv({"set": [["editor.resizing.preserve_ratio", false]]}, function() {
+     runTests(false);
+     SpecialPowers.pushPrefEnv({"set": [["editor.resizing.preserve_ratio", true]]}, function() {
+       runTests(true);
+       SimpleTest.finish();
+     });
+   });
+ });
 
 </script>
 </pre>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug645914.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug645914.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug645914.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug645914.html	2015-02-28 15:03:11.000000000 +0000
@@ -22,10 +22,11 @@
 /** Test for Bug 645914 **/
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
+  SpecialPowers.pushPrefEnv({"set":[["layout.word_select.eat_space_to_next_word", true],
+                                    ["browser.triple_click_selects_paragraph", false]]}, startTest);
+});
+function startTest() {
   var textarea = document.querySelector("textarea");
-  SpecialPowers.setBoolPref("layout.word_select.eat_space_to_next_word", true);
-  SpecialPowers.setBoolPref("browser.triple_click_selects_paragraph", false);
-
   textarea.selectionStart = textarea.selectionEnd = 0;
 
   // Simulate a double click on foo
@@ -54,11 +55,8 @@
   is(textarea.selectionStart, 0, "The start of the selection should be at the beginning of the text");
   is(textarea.selectionEnd, textarea.value.length, "The end of the selection should be the end of the paragraph");
 
-  SpecialPowers.clearUserPref("layout.word_select.eat_space_to_next_word");
-  SpecialPowers.clearUserPref("browser.triple_click_selects_paragraph");
   SimpleTest.finish();
-});
-
+}
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug674770-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug674770-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug674770-1.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug674770-1.html	2015-02-28 15:03:11.000000000 +0000
@@ -24,7 +24,9 @@
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
-  SpecialPowers.setBoolPref("middlemouse.paste", true);
+  SpecialPowers.pushPrefEnv({"set":[["middlemouse.paste", true]]}, startTest);
+});
+function startTest() {
   localStorage.removeItem("clicked");
   window.linkWasClicked = false;
 
@@ -48,11 +50,10 @@
       ok(!window.linkWasClicked, "The click operation shouldn't work in the contenteditable area");
 
       localStorage.removeItem("clicked");
-      SpecialPowers.clearUserPref("middlemouse.paste");
       SimpleTest.finish();
     }, 100);
   }, 100);
-});
+}
 
 function hitEventLoop(func, times) {
   if (times > 0) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug674770-2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug674770-2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug674770-2.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug674770-2.html	2015-02-28 15:03:11.000000000 +0000
@@ -47,11 +47,11 @@
 // NOTE: tests need to check the result *after* the content is actually
 //       modified.  Sometimes, the modification is delayed. Therefore, there
 //       are a lot of functions and SimpleTest.executeSoon()s.
-
 SimpleTest.waitForFocus(function() {
-  SpecialPowers.setBoolPref("middlemouse.contentLoadURL", false);
-  SpecialPowers.setBoolPref("middlemouse.paste", true);
-
+  SpecialPowers.pushPrefEnv({"set":[["middlemouse.contentLoadURL", false],
+                                    ["middlemouse.paste", true]]}, startTest);
+});
+function startTest() {
   frameWindow = iframe.contentWindow;
   frameDocument = iframe.contentDocument;
 
@@ -62,27 +62,24 @@
   var text = frameDocument.getElementById("text");
 
   text.focus();
-
-  SimpleTest.executeSoon(function() {
-    if (navigator.platform.indexOf("Linux") == 0) {
-      synthesizeKey("a", { altKey: true }, frameWindow);
-    } else {
-      synthesizeKey("a", { accelKey: true }, frameWindow);
-    }
-    // Windows and Mac don't have primary selection, we should copy the text to
-    // the global clipboard.
-    if (!SpecialPowers.supportsSelectionClipboard()) {
-      SimpleTest.waitForClipboard("pasted",
-        function() { synthesizeKey("c", { accelKey: true }, frameWindow); },
-        function() { SimpleTest.executeSoon(runInputTests1) },
-        cleanup);
-    } else {
-      // Otherwise, don't call waitForClipboard since it breaks primary
-      // selection.
-      runInputTests1();
-    }
-  });
-});
+  if (navigator.platform.indexOf("Linux") == 0) {
+    synthesizeKey("a", { altKey: true }, frameWindow);
+  } else {
+    synthesizeKey("a", { accelKey: true }, frameWindow);
+  }
+  // Windows and Mac don't have primary selection, we should copy the text to
+  // the global clipboard.
+  if (!SpecialPowers.supportsSelectionClipboard()) {
+    SimpleTest.waitForClipboard("pasted",
+      function() { synthesizeKey("c", { accelKey: true }, frameWindow); },
+      function() { SimpleTest.executeSoon(runInputTests1) },
+      cleanup);
+  } else {
+    // Otherwise, don't call waitForClipboard since it breaks primary
+    // selection.
+    runInputTests1();
+  }
+}
 
 function runInputTests1()
 {
@@ -389,9 +386,6 @@
 
 function cleanup()
 {
-  SpecialPowers.clearUserPref("middlemouse.contentLoadURL");
-  SpecialPowers.clearUserPref("middlemouse.paste");
-
   SimpleTest.finish();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug795785.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug795785.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_bug795785.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_bug795785.html	2015-02-28 15:03:11.000000000 +0000
@@ -29,10 +29,9 @@
 
 // Turn off spatial navigation because it hijacks arrow key events and VK_RETURN
 // events.
-SpecialPowers.setBoolPref("snav.enabled", false);
-
-SimpleTest.waitForFocus(runTests);
-
+SimpleTest.waitForFocus(function() {
+  SpecialPowers.pushPrefEnv({"set":[["snav.enabled", false]]}, runTests);
+});
 var textarea = document.getElementById("textarea");
 var div = document.getElementById("div");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_CF_HTML_clipboard.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_CF_HTML_clipboard.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_CF_HTML_clipboard.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_CF_HTML_clipboard.html	2015-02-28 15:03:11.000000000 +0000
@@ -45,7 +45,7 @@
 
     var flavors = [CF_HTML];
     if (!cb.hasDataMatchingFlavors(flavors, flavors.length, cb.kGlobalClipboard)) {
-      setTimeout(function() copyCF_HTML_worker(success, failure), 100);
+      setTimeout(function() { copyCF_HTML_worker(success, failure); }, 100);
       return;
     }
 
@@ -59,7 +59,7 @@
       trans.getTransferData(CF_HTML, data, {});
       data = SpecialPowers.wrap(data).value.QueryInterface(Ci.nsISupportsCString).data;
     } catch (e) {
-      setTimeout(function() copyCF_HTML_worker(success, failure), 100);
+      setTimeout(function() { copyCF_HTML_worker(success, failure); }, 100);
       return;
     }
     success();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_htmleditor_keyevent_handling.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_htmleditor_keyevent_handling.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_htmleditor_keyevent_handling.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_htmleditor_keyevent_handling.html	2015-02-28 15:03:11.000000000 +0000
@@ -127,34 +127,6 @@
     aElement.focus();
     is(SpecialPowers.unwrap(fm.focusedElement), aElement, aDescription + "failed to move focus");
 
-    // Modifier keys:
-    //   Basically, modifier keys shouldn't cause keypress event.  However,
-    //   even if it were dispatched by widget's bug, editor should consume
-    //   it when editor is editable.
-    reset("");
-    synthesizeKey("VK_META", { type: "keypress" });
-    check(aDescription + "Meta", true, true, !aIsReadonly);
-
-    reset("");
-    synthesizeKey("VK_WIN", { type: "keypress" });
-    check(aDescription + "OS", true, true, !aIsReadonly);
-
-    reset("");
-    synthesizeKey("VK_SHIFT", { type: "keypress" });
-    check(aDescription + "Shift", true, true, !aIsReadonly);
-
-    reset("");
-    synthesizeKey("VK_CONTROL", { type: "keypress" });
-    check(aDescription + "Control", true, true, !aIsReadonly);
-
-    // Alt key press event installs menubar key event listener, so,
-    // we should pass Alt key testing on Windows and Linux.
-    if (!kIsWin && !kIsLinux) {
-      reset("");
-      synthesizeKey("VK_ALT", { type: "keypress" });
-      check(aDescription + "Alt", true, true, !aIsReadonly);
-    }
-
     // Backspace key:
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable, it consumes backspace and shift+backspace.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_texteditor_keyevent_handling.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_texteditor_keyevent_handling.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/tests/test_texteditor_keyevent_handling.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/tests/test_texteditor_keyevent_handling.html	2015-02-28 15:03:11.000000000 +0000
@@ -113,34 +113,6 @@
     aElement.focus();
     is(SpecialPowers.unwrap(fm.focusedElement), aElement, aDescription + "failed to move focus");
 
-    // Modifier keys:
-    //   Basically, modifier keys shouldn't cause keypress event.  However,
-    //   even if it were dispatched by widget's bug, editor should consume
-    //   it when editor is editable.
-    reset("");
-    synthesizeKey("VK_META", { type: "keypress" });
-    check(aDescription + "Meta", true, true, !aIsReadonly);
-
-    reset("");
-    synthesizeKey("VK_WIN", { type: "keypress" });
-    check(aDescription + "OS", true, true, !aIsReadonly);
-
-    reset("");
-    synthesizeKey("VK_SHIFT", { type: "keypress" });
-    check(aDescription + "Shift", true, true, !aIsReadonly);
-
-    reset("");
-    synthesizeKey("VK_CONTROL", { type: "keypress" });
-    check(aDescription + "Control", true, true, !aIsReadonly);
-
-    // Alt key press event installs menubar key event listener, so,
-    // we should pass Alt key testing on Windows and Linux.
-    if (!kIsWin && !kIsLinux) {
-      reset("");
-      synthesizeKey("VK_ALT", { type: "keypress" });
-      check(aDescription + "Alt", true, true, !aIsReadonly);
-    }
-
     // Backspace key:
     //   If editor is readonly, it doesn't consume.
     //   If editor is editable, it consumes backspace and shift+backspace.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/TypeInState.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/TypeInState.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/editor/libeditor/TypeInState.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/editor/libeditor/TypeInState.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -86,7 +86,7 @@
   nsRefPtr<Selection> selection = static_cast<Selection*>(aSelection);
 
   if (aSelection) {
-    int32_t rangeCount = selection->GetRangeCount();
+    int32_t rangeCount = selection->RangeCount();
 
     if (selection->Collapsed() && rangeCount) {
       nsCOMPtr<nsIDOMNode> selNode;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/embedding/components/printingui/mac/nsPrintProgress.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/embedding/components/printingui/mac/nsPrintProgress.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/embedding/components/printingui/mac/nsPrintProgress.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/embedding/components/printingui/mac/nsPrintProgress.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -42,55 +42,21 @@
                                                   nsIObserver *openDialogObserver,
                                                   bool *notifyOnOpen)
 {
-  m_observer = openDialogObserver;
-
-  nsresult rv = NS_ERROR_FAILURE;
-  
-  if (m_dialog)
-    return NS_ERROR_ALREADY_INITIALIZED;
-  
-  if (!dialogURL || !*dialogURL)
-    return NS_ERROR_INVALID_ARG;
-
-  if (parent)
-  {
-    // Set up window.arguments[0]...
-    nsCOMPtr<nsISupportsArray> array;
-    rv = NS_NewISupportsArray(getter_AddRefs(array));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsISupportsInterfacePointer> ifptr =
-      do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-    
-    ifptr->SetData(static_cast<nsIPrintProgress*>(this));
-    ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress));
-
-    array->AppendElement(ifptr);
-
-    array->AppendElement(parameters);
-
-    // Open the dialog.
-    nsCOMPtr<nsIDOMWindow> newWindow;
-    rv = parent->OpenDialog(NS_ConvertASCIItoUTF16(dialogURL),
-                            NS_LITERAL_STRING("_blank"),
-                            NS_LITERAL_STRING("chrome,titlebar,dependent,centerscreen"),
-                            array, getter_AddRefs(newWindow));
-    if (NS_SUCCEEDED(rv)) {
-      *notifyOnOpen = true;
-    }
-  }
-
-  return rv;
+  MOZ_ASSERT_UNREACHABLE("The nsPrintingPromptService::ShowProgress "
+                         "implementation for OS X returns "
+                         "NS_ERROR_NOT_IMPLEMENTED, so we should never get "
+                         "here.");
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* void closeProgressDialog (in boolean forceClose); */
 NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(bool forceClose)
 {
-  m_closeProgress = true;
-  // XXX Casting bool to nsresult
-  return OnStateChange(nullptr, nullptr, nsIWebProgressListener::STATE_STOP,
-                       static_cast<nsresult>(forceClose));
+  MOZ_ASSERT_UNREACHABLE("The nsPrintingPromptService::ShowProgress "
+                         "implementation for OS X returns "
+                         "NS_ERROR_NOT_IMPLEMENTED, so we should never get "
+                         "here.");
+  return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 /* nsIPrompt GetPrompter (); */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/embedding/components/printingui/unixshared/nsPrintProgress.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/embedding/components/printingui/unixshared/nsPrintProgress.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/embedding/components/printingui/unixshared/nsPrintProgress.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/embedding/components/printingui/unixshared/nsPrintProgress.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -6,10 +6,16 @@
 #include "nsPrintProgress.h"
 
 #include "nsIBaseWindow.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeOwner.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsISupportsArray.h"
+#include "nsIXULWindow.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIComponentManager.h"
+#include "nsPIDOMWindow.h"
+
 
 NS_IMPL_ADDREF(nsPrintProgress)
 NS_IMPL_RELEASE(nsPrintProgress)
@@ -71,12 +77,29 @@
 
     array->AppendElement(parameters);
 
+    // We will set the opener of the dialog to be the nsIDOMWindow for the
+    // browser XUL window itself, as opposed to the content. That way, the
+    // progress window has access to the opener.
+    nsCOMPtr<nsPIDOMWindow> pParentWindow = do_QueryInterface(parent);
+    NS_ENSURE_STATE(pParentWindow);
+
+    nsCOMPtr<nsIDocShell> docShell = pParentWindow->GetDocShell();
+    NS_ENSURE_STATE(docShell);
+
+    nsCOMPtr<nsIDocShellTreeOwner> owner;
+    docShell->GetTreeOwner(getter_AddRefs(owner));
+
+    nsCOMPtr<nsIXULWindow> ownerXULWindow = do_GetInterface(owner);
+    nsCOMPtr<nsIDOMWindow> ownerWindow = do_GetInterface(ownerXULWindow);
+    NS_ENSURE_STATE(ownerWindow);
+
     // Open the dialog.
     nsCOMPtr<nsIDOMWindow> newWindow;
-    rv = parent->OpenDialog(NS_ConvertASCIItoUTF16(dialogURL),
-                            NS_LITERAL_STRING("_blank"),
-                            NS_LITERAL_STRING("chrome,titlebar,dependent,centerscreen"),
-                            array, getter_AddRefs(newWindow));
+
+    rv = ownerWindow->OpenDialog(NS_ConvertASCIItoUTF16(dialogURL),
+                                 NS_LITERAL_STRING("_blank"),
+                                 NS_LITERAL_STRING("chrome,titlebar,dependent,centerscreen"),
+                                 array, getter_AddRefs(newWindow));
   }
 
   return rv;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/embedding/components/printingui/win/nsPrintProgress.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/embedding/components/printingui/win/nsPrintProgress.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/embedding/components/printingui/win/nsPrintProgress.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/embedding/components/printingui/win/nsPrintProgress.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -6,11 +6,16 @@
 #include "nsPrintProgress.h"
 
 #include "nsIBaseWindow.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeOwner.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsISupportsArray.h"
+#include "nsIXULWindow.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
+#include "nsPIDOMWindow.h"
 
 #if 0
 NS_IMPL_ADDREF(nsPrintProgress)
@@ -100,12 +105,28 @@
 
     array->AppendElement(parameters);
 
+    // We will set the opener of the dialog to be the nsIDOMWindow for the
+    // browser XUL window itself, as opposed to the content. That way, the
+    // progress window has access to the opener.
+    nsCOMPtr<nsPIDOMWindow> pParentWindow = do_QueryInterface(parent);
+    NS_ENSURE_STATE(pParentWindow);
+
+    nsCOMPtr<nsIDocShell> docShell = pParentWindow->GetDocShell();
+    NS_ENSURE_STATE(docShell);
+
+    nsCOMPtr<nsIDocShellTreeOwner> owner;
+    docShell->GetTreeOwner(getter_AddRefs(owner));
+
+    nsCOMPtr<nsIXULWindow> ownerXULWindow = do_GetInterface(owner);
+    nsCOMPtr<nsIDOMWindow> ownerWindow = do_GetInterface(ownerXULWindow);
+    NS_ENSURE_STATE(ownerWindow);
+
     // Open the dialog.
     nsCOMPtr<nsIDOMWindow> newWindow;
-    rv = parent->OpenDialog(NS_ConvertASCIItoUTF16(dialogURL),
-                            NS_LITERAL_STRING("_blank"),
-                            NS_LITERAL_STRING("chrome,titlebar,dependent,centerscreen"),
-                            array, getter_AddRefs(newWindow));
+    rv = ownerWindow->OpenDialog(NS_ConvertASCIItoUTF16(dialogURL),
+                                 NS_LITERAL_STRING("_blank"),
+                                 NS_LITERAL_STRING("chrome,titlebar,dependent,centerscreen"),
+                                 array, getter_AddRefs(newWindow));
   }
 
   return rv;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/cookie/test/test_permissionmanager_app_isolation.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/cookie/test/test_permissionmanager_app_isolation.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/cookie/test/test_permissionmanager_app_isolation.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/cookie/test/test_permissionmanager_app_isolation.html	2015-02-28 15:03:11.000000000 +0000
@@ -22,7 +22,7 @@
 
 var Ci = Components.interfaces;
 var Cc = Components.classes;
-
+var gTestRunner;
 SimpleTest.waitForExplicitFinish();
 
 var permManager = Cc["@mozilla.org/permissionmanager;1"]
@@ -30,18 +30,6 @@
 
 const gPermName = 'foobar';
 
-var previousPrefs = {
-  mozBrowserFramesEnabled: undefined,
-};
-
-try {
-  previousPrefs.mozBrowserFramesEnabled = SpecialPowers.getBoolPref('dom.mozBrowserFramesEnabled');
-} catch(e)
-{
-}
-
-SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
-
 // We use http://test/ as url so all apps use the same url and app isolation is
 // more obvious.
 var gData = [
@@ -140,11 +128,7 @@
 
         i++;
         if (i >= gData.length) {
-          if (previousPrefs.mozBrowserFramesEnabled !== undefined) {
-            SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', previousPrefs.mozBrowserFramesEnabled);
-          }
-
-          SimpleTest.finish();
+           SimpleTest.finish();
         } else {
           gTestRunner.next();
         }
@@ -159,9 +143,11 @@
   }
 }
 
-var gTestRunner = runTest();
-gTestRunner.next();
-
+SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]},
+  function() {
+    gTestRunner = runTest();
+    gTestRunner.next();
+});
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/gio/nsGIOProtocolHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/gio/nsGIOProtocolHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/gio/nsGIOProtocolHandler.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/gio/nsGIOProtocolHandler.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -1063,33 +1063,12 @@
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  // Bug 1087720 (and Bug 1099296):
-  // Once all callsites have been updated to call NewChannel2() instead of NewChannel()
-  // we should have a non-null loadInfo consistently. Until then we have to brach on the
-  // loadInfo and provide default arguments to create a NewInputStreamChannel.
-  if (aLoadInfo) {
-    rv = NS_NewInputStreamChannelInternal(aResult,
-                                          aURI,
-                                          stream,
-                                          NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE),
-                                          EmptyCString(), // aContentCharset
-                                          aLoadInfo);
-  }
-  else {
-    nsCOMPtr<nsIPrincipal> nullPrincipal =
-      do_CreateInstance("@mozilla.org/nullprincipal;1", &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // start out assuming an unknown content-type.  we'll set the content-type
-    // to something better once we open the URI.
-    rv = NS_NewInputStreamChannel(aResult,
-                                  aURI,
-                                  stream,
-                                  nullPrincipal,
-                                  nsILoadInfo::SEC_NORMAL,
-                                  nsIContentPolicy::TYPE_OTHER,
-                                  NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE));
-  }
+  rv = NS_NewInputStreamChannelInternal(aResult,
+                                        aURI,
+                                        stream,
+                                        NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE),
+                                        EmptyCString(), // aContentCharset
+                                        aLoadInfo);
   if (NS_SUCCEEDED(rv)) {
     stream->SetChannel(*aResult);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties	2015-02-19 00:42:28.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties	2015-02-28 15:03:20.000000000 +0000
@@ -1302,7 +1302,7 @@
 msg.fonts.family.pick  = Enter the font family you wish to use:
 msg.fonts.size.fmt     = Font size is %Spt
 msg.fonts.size.default = Font size is default
-msg.fonts.size.pick    = Enter the font size you wish to use:
+msg.fonts.size.pick    = Enter the font size you wish to use. Note: Non-numeric inputs will result in the default size.
 
 msg.supports.chanTypes = Supported channel types: %S"
 msg.supports.chanModesA = Supported channel modes (A: lists): %S"
@@ -1536,7 +1536,7 @@
 pref.font.family.label          = Font Family
 pref.font.family.help           = Selects the font in which ChatZilla will display messages. The value "default" will use your global font family; "serif", "sans-serif" and "monospace" will use your global font settings; other values will be treated as font names.
 pref.font.size.label            = Font Size (pt)
-pref.font.size.help             = Selects the font size you want ChatZilla to display messages with. The value 0 will use your global font size, and other values will be interpreted as the size in points (pt).
+pref.font.size.help             = Selects the integer font size you want ChatZilla to display messages with. The value 0 will use your global font size, and other integer values will be interpreted as the size in points (pt).
 pref.guessCommands.label        = Guess unknown commands
 pref.guessCommands.help         = If you enter a command (starts with "/") that ChatZilla doesn't understand, then it can try "guessing" by sending the command to the server. You can turn this off if you don't want ChatZilla to try this.
 pref.hasPrefs.label             = Object has prefs
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/irc/xul/content/commands.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/irc/xul/content/commands.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/irc/xul/content/commands.js	2015-02-19 00:42:28.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/irc/xul/content/commands.js	2015-02-28 15:03:20.000000000 +0000
@@ -3979,7 +3979,10 @@
                     break;
 
                 default:
-                    val = Number(val);
+                    if (isNaN(val))
+                        val = 0;
+                    else
+                        val = Number(val);
             }
             // Save the new value.
             view.prefs[pref] = val;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/irc/xul/content/config.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/irc/xul/content/config.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/irc/xul/content/config.js	2015-02-19 00:42:28.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/irc/xul/content/config.js	2015-02-28 15:03:20.000000000 +0000
@@ -575,6 +575,8 @@
             
             this.edit = document.createElement("textbox");
             this.edit.setAttribute("size", "5");
+            this.edit.setAttribute("type", "number");
+            this.edit.setAttribute("min", "-1");
             
             editCont = document.createElement("hbox");
             editCont.flex = 1000;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/spellcheck/locales/en-US/hunspell/dictionary-sources/upstream-hunspell.diff	2015-02-28 15:03:12.000000000 +0000
@@ -2,151 +2,233 @@
 < 51247
 ---
 > 57065
-30c30
-< ABC/SM
+34c34
+< ACLU
 ---
-> ABC/M
-77a78,79
-> Aaren/M
-> Aarika/M
-79c81,84
+> ACLU/M
+44c44
+< AFC
+---
+> AFC/M
+54a55
+> AMD/M
+56c57
+< ANZUS
+---
+> ANZUS/M
+58c59
+< AP
+---
+> AP/M
+72c73
+< AWACS
+---
+> AWACS/M
+78,80c79,91
+< Aaron
 < Abbas
+< Abbasid
 ---
+> Aaren/M
+> Aarika/M
+> Aaron/M
 > Ab/M
 > Abagael/M
 > Abagail/M
 > Abba/S
-80a86,90
+> Abbasid/M
 > Abbe/M
 > Abbey/M
 > Abbi/M
 > Abbie/M
 > Abbot/M
-82a93,94
+82a94,95
 > Abbye/M
 > Abdel/M
-89a102,103
+86c99
+< Abelard
+---
+> Abelard/M
+89a103,104
 > Abeu/M
 > Abey/M
-90a105,106
+91,92c106,110
+< Abigail
+< Abilene
+---
 > Abie/M
 > Abigael/M
-91a108
+> Abigail/M
 > Abigale/M
-94a112
+> Abilene/M
+94a113
 > Abra/M
-95a114
+95a115
 > Abrahan/M
-96a116,117
+96a117,118
 > Abramo/M
 > Abran/M
-119a141
+98c120
+< Abuja
+---
+> Abuja/M
+109c131
+< Achernar
+---
+> Achernar/M
+116,118c138,140
+< Actaeon
+< Acton
+< Acts
+---
+> Actaeon/M
+> Acton/M
+> Acts/M
+119a142
 > Ad/MN
-120a143,145
+120a144,146
 > Adah/M
 > Adair/M
 > Adaline/M
-121a147
+121a148,149
 > Adamo/M
-124a151,152
+> Adams/M
+123c151
+< Adana
+---
+> Adana/M
+125c153,155
+< Addams
+---
 > Adara/M
 > Adda/M
-126a155,156
+> Addams/M
+126a157,158
 > Addi/M
 > Addia/M
-128a159,161
+128c160,163
+< Addison
+---
+> Addison/M
 > Addy/M
 > Ade/M
 > Adel/M
-129a163
+129a165
 > Adelaida/M
-130a165
+130a167
 > Adelbert/M
-131a167,170
+131a169,172
 > Adelheid/M
 > Adelice/M
 > Adelina/M
 > Adelind/M
-132a172,173
+132a174,175
 > Adella/M
 > Adelle/M
-133a175
+134c177,180
+< Adenauer
+---
 > Adena/M
-134a177,178
+> Adenauer/M
 > Adey/M
 > Adham/M
-135a180,181
+135a182,183
 > Adi/M
 > Adiana/M
-136a183
+136a185
 > Adina/M
-139a187
+140c189,190
+< Adler
+---
 > Adlai/M
-142a191
+> Adler/M
+142a193
 > Ado/M
-145a195,197
+145a197,199
 > Adolphe/M
 > Adolpho/M
 > Adolphus/M
-146a199,203
+146a201,205
 > Adora/M
 > Adore/M
 > Adoree/M
 > Adorne/M
 > Adrea/M
-147a205
+148c207,208
+< Adrian
+---
 > Adria/MX
-149a208,211
+> Adrian/M
+149a210,213
 > Adriane/M
 > Adrianna/M
 > Adrianne/M
 > Adriano/M
-150a213,214
+150a215,216
 > Adrien/M
 > Adriena/M
-159a224,226
+159a226,228
 > Aeriel/M
 > Aeriela/M
 > Aeriell/M
-173a241
+164a234
+> Afghani/M
+173c243,244
+< Afrocentrism
+---
+> Afrocentrism/M
 > Afton/M
-174a243
+174a246
 > Agace/M
-178a248
+178a251
 > Agata/M
-179a250,251
+180,182c253,263
+< Aggie
+< Aglaia
+< Agnes
+---
 > Agathe/M
 > Aggi/M
-180a253
+> Aggie/M
 > Aggy/M
-181a255,256
+> Aglaia/M
 > Agna/M
 > Agnella/M
-182a258,260
+> Agnes/M
 > Agnese/M
 > Agnesse/M
 > Agneta/M
-184a263,264
+185,186c266,270
+< Agra
+< Agricola
+---
 > Agnola/M
 > Agosto/M
-185a266
+> Agra/M
 > Agretha/M
-189a271
+> Agricola/M
+189a274
 > Aguie/M
-192a275,276
+192a278,279
 > Aguistin/M
 > Aguste/M
-194a279
+194a282
 > Aharon/M
-200a286,287
+196c284
+< Ahmadabad
+---
+> Ahmadabad/M
+201c289,295
+< Aiken
+---
 > Aidan/M
 > Aigneis/M
-201a289,292
+> Aiken/M
 > Aila/M
 > Ailbert/M
 > Aile/M
 > Ailee/M
-202a294,300
+202a297,303
 > Ailene/M
 > Ailey/M
 > Aili/SM
@@ -154,90 +236,149 @@
 > Ailsun/M
 > Ailyn/M
 > Aime/M
-203a302,306
+204c305,310
+< Ainu
+---
 > Aimil/M
 > Aindrea/M
 > Ainslee/M
 > Ainsley/M
 > Ainslie/M
-207a311
+> Ainu/M
+206c312
+< Aisha
+---
+> Aisha/M
+208c314,315
+< Akbar
+---
 > Ajay/M
-210a315
+> Akbar/M
+210,211c317,319
+< Akihito
+< Akita
+---
+> Akihito/M
 > Akim/M
-214a320
+> Akita/M
+213c321
+< Akkad
+---
+> Akkad/M
+214a323
 > Aksel/M
-220a327,330
+220a330,333
 > Alain/M
 > Alaine/M
 > Alair/M
 > Alameda/M
-224a335,340
+224a338,343
 > Alanah/M
 > Aland/M
 > Alane/M
 > Alanna/M
 > Alano/M
 > Alanson/M
-225a342
+226c345,347
+< Alaric
+---
 > Alard/M
-226a344
+> Alaric/M
 > Alasdair/M
-228a347,350
+229c350,354
+< Alba
+---
 > Alastair/M
 > Alasteir/M
 > Alaster/M
 > Alayne/M
-233a356
+> Alba/M
+233c358,359
+< Albee
+---
+> Albee/M
 > Alberik/M
-237a361,362
+235c361
+< Albert
+---
+> Albert/M
+237a364,365
 > Albertina/M
 > Albertine/M
-238a364
+239,240c367,370
+< Albigensian
+< Albion
+---
 > Albie/M
-239a366
+> Albigensian/M
 > Albina/M
-241a369
+> Albion/M
+241a372
 > Albrecht/M
-255a384,385
+243,245c374,376
+< Alcatraz
+< Alcestis
+< Alcibiades
+---
+> Alcatraz/M
+> Alcestis/M
+> Alcibiades/M
+249,252c380,383
+< Alcott
+< Alcuin
+< Alcyone
+< Aldan
+---
+> Alcott/M
+> Alcuin/M
+> Alcyone/M
+> Aldan/M
+254c385
+< Alden
+---
+> Alden/M
+255a387,388
 > Aldin/M
 > Aldis/M
-256a387,391
+256a390,394
 > Aldon/M
 > Aldous/M
 > Aldric/M
 > Aldrich/M
 > Aldridge/M
-257a393,394
+257a396,397
 > Aldus/M
 > Aldwin/M
-258a396,399
+258a399,402
 > Alecia/M
 > Aleda/M
 > Aleece/M
 > Aleen/M
-260a402
+260a405
 > Alejandrina/M
-261a404,405
+261a407,408
 > Alejoa/M
 > Aleksandr/M
-262a407,408
+262a410,411
 > Alena/M
 > Alene/M
-263a410,413
+263a413,416
 > Alessandra/M
 > Alessandro/M
 > Aleta/M
 > Alethea/M
-266a417
+266a420
 > Alexa/M
-267a419
+268c422,424
+< Alexandra
+---
 > Alexandr/M
-268a421
+> Alexandra/M
 > Alexandre/M
-270a424,425
+270a427,428
 > Alexandrina/M
 > Alexandro/MS
-272c427,436
+272c430,440
 < Alexis
 ---
 > Alexi/MS
@@ -245,90 +386,136 @@
 > Alexina/M
 > Alexine/M
 > Alexio/M
+> Alexis/M
 > Alf/M
 > Alfi/M
 > Alfie/M
 > Alfons/M
 > Alfonse/M
-278a443
+276c444
+< Alfred
+---
+> Alfred/M
+278c446,447
+< Alfredo
+---
+> Alfredo/M
 > Alfy/M
-282a448
+280c449
+< Alger
+---
+> Alger/M
+282a452
 > Algernon/M
-290c456,459
+288c458
+< Alhambra
+---
+> Alhambra/M
+290c460,463
 < Ali
 ---
-> Ali/S
+> Ali/SM
 > Alia/M
 > Alic/M
 > Alica/M
-291a461
+291a465
 > Alicea/M
-292a463,466
+292a467,470
 > Alick/M
 > Alida/M
 > Alidia/M
 > Alie/M
-293a468,470
+293a472,474
 > Alika/M
 > Alikee/M
 > Alina/M
-296a474
+296a478
 > Alisander/M
-300a479,482
+300a483,486
 > Alister/M
 > Alisun/M
 > Alix/M
 > Aliza/M
-301a484
+301a488
 > Alla/M
-304a488,490
+303c490
+< Allahabad
+---
+> Allahabad/M
+304a492,494
 > Allard/M
 > Allayne/M
 > Alleen/M
-309a496
+306c496
+< Allegheny/S
+---
+> Allegheny/SM
+308c498
+< Allen
+---
+> Allen/M
+310c500,503
+< Allentown
+---
 > Allene/M
-310a498,499
+> Allentown/M
 > Alley/M
 > Alleyn/M
-313a503,506
+313a507,510
 > Allissa/M
 > Allister/M
 > Allistir/M
 > Allix/M
-314a508,512
+314a512,516
 > Allsun/M
 > Allx/M
 > Ally/SM
 > Allyce/M
 > Allyn/M
-318a517,519
+318a521,523
 > Almeda/M
 > Almeria/M
 > Almeta/M
-319a521,522
+319a525,526
 > Almira/M
 > Almire/M
-323a527,531
+323a531,535
 > Aloin/M
 > Aloise/M
 > Aloisia/M
 > Alon/M
 > Alonso/M
-324a533,534
+324a537,538
 > Aloysia/M
 > Aloysius/M
-333a544
+331c545
+< Alpine
+---
+> Alpine/M
+333a548
 > Alric/M
-348a560,561
+338c553
+< Alta
+---
+> Alta/M
+341,342c556,557
+< Altair
+< Altamira
+---
+> Altair/M
+> Altamira/M
+349c564,567
+< Alva
+---
 > Aluin/M
 > Aluino/M
-349a563
+> Alva/M
 > Alvan/M
-352a567,569
+352a571,573
 > Alvera/M
 > Alverta/M
 > Alvie/M
-353a571,577
+353a575,581
 > Alvina/M
 > Alvinia/M
 > Alvira/M
@@ -336,35 +523,42 @@
 > Alvy/M
 > Alwin/M
 > Alwyn/M
-354a579,584
+354a583,588
 > Alyda/M
 > Alyosha/M
 > Alys/M
 > Alysa/M
 > Alyse/M
 > Alysia/M
-355a586
+355a590
 > Alyss
-358a590,591
+358a594,595
 > Amabel/M
 > Amabelle/M
-360a594,596
+360a598,600
 > Amalea/M
 > Amalee/M
 > Amaleta/M
-361a598,600
+361a602,604
 > Amalie/M
 > Amalita/M
 > Amalle/M
-362a602,606
+363c606,611
+< Amarillo
+---
 > Amandi/M
 > Amandie/M
 > Amandy/M
 > Amara/M
 > Amargo/M
-364a609
+> Amarillo/M
+364a613
 > Amata/M
-369c614,624
+366c615
+< Amati
+---
+> Amati/M
+369c618,628
 < Amber/M
 ---
 > Amber/MY
@@ -378,208 +572,371 @@
 > Ambur/M
 > Amby/M
 > Ame/M
-370a626,629
+370a630,633
 > Amelie/M
 > Amelina/M
 > Ameline/M
 > Amelita/M
-379a639
+373c636
+< Amerasian
+---
+> Amerasian/M
+379a643
 > Amerigo/M
-381a642
+381a646
 > Amery/M
-384a646
+384c649,650
+< Amherst
+---
+> Amherst/M
 > Ami/M
-386a649,650
+386a653,654
 > Amii/M
 > Amil/M
-387a652,654
+387a656,658
 > Amitie/M
 > Amity/M
 > Ammamaria/M
-389a657
+390c661,662
+< Amos
+---
 > Amory/M
-399a668
+> Amos/M
+393c665
+< Amritsar
+---
+> Amritsar/M
+395,396c667,668
+< Amtrak
+< Amundsen
+---
+> Amtrak/M
+> Amundsen/M
+399a672
 > Amye/M
-400a670
+400a674
 > Anabal/M
-402a673,674
+402a677,678
 > Anabella/M
 > Anabelle/M
-406a679,682
+404,405c680,681
+< Anacreon
+< Anaheim
+---
+> Anacreon/M
+> Anaheim/M
+406a683,686
 > Analiese/M
 > Analise/M
 > Anallese/M
 > Anallise/M
-409a686,689
+408,409c688,693
+< Anasazi
+< Anastasia
+---
+> Anasazi/M
+> Anastasia/M
 > Anastasie/M
 > Anastassia/M
 > Anatol/M
 > Anatola/M
-412a693
+413c697,699
+< Anaxagoras
+---
 > Anatollo/M
-413a695
+> Anaxagoras/M
 > Ancell/M
-418a701,704
+416,418c702,708
+< Andalusian
+< Andaman
+< Andean
+---
+> Andalusian/M
+> Andaman/M
+> Andean/M
 > Andee/M
 > Andeee/M
 > Anderea/M
 > Anders/N
-421a708,710
+420c710
+< Anderson
+---
+> Anderson/M
+421a712,714
 > Andi/M
 > Andie/M
 > Andonis/M
-423a713
+423a717
 > Andra/MS
-425c715,717
+425c719,721
 < Andrea/M
 ---
 > Andrea/SM
 > Andreana/M
 > Andree/M
-427a720
+427a724
 > Andrej/M
-428a722,724
+428a726,728
 > Andrey/M
 > Andria/M
 > Andriana/M
-429a726,727
+430c730,733
+< Andromache
+---
 > Andriette/M
-> Andris
-432a731,732
+> Andris/M
+> Android/M
+> Andromache/M
+432c735,737
+< Andropov
+---
+> Andropov/M
 > Andros
 > Andrus/M
-433a734,738
+434c739,745
+< Angara
+---
 > Anestassia/M
 > Anet/M
 > Anett/M
 > Anetta/M
 > Anette/M
-434a740
+> Angara/M
 > Ange/M
-436a743,744
+436a748,749
 > Angele/M
 > Angeli/M
-439a748
+438,439c751,753
+< Angelica
+< Angelico
+---
+> Angelica/M
+> Angelico/M
 > Angelika/M
-443a753
+443a758
 > Angelle/M
-447a758
+445c760
+< Angelou
+---
+> Angelou/M
+448c763,764
+< Angkor
+---
 > Angil/M
-455c766
+> Angkor/M
+450c766
+< Anglia
+---
+> Anglia/M
+455,458c771,774
 < Anglicize
+< Anglo
+< Anglophil
+< Anglophile
 ---
 > Anglicize/DSG
-465a777,778
+> Anglo/M
+> Anglophil/M
+> Anglophile/M
+463c779
+< Angstrom
+---
+> Angstrom/M
+465a782,783
 > Angy/M
 > Ania/M
-467a781,782
+467a786,787
 > Anica/M
 > Anissa/M
-468a784,786
+468a789,791
 > Anitra/M
 > Anjanette/M
 > Anjela/M
-471a790
+471c794,795
+< Anna
+---
+> Anna/M
 > Annabal/M
-472a792,794
+472a797,799
 > Annabela/M
 > Annabell/M
 > Annabella/M
-473a796,800
+473a801,805
 > Annadiana/M
 > Annadiane/M
 > Annalee/M
 > Annaliese/M
 > Annalise/M
-474a802,803
+474a807,808
 > Annamaria/M
 > Annamarie/M
-477a807,811
+477c811,816
+< Anne
+---
+> Anne/M
 > Annecorinne/M
 > Anneliese/M
 > Annelise/M
 > Annemarie/M
 > Annetta/M
-478a813,814
+478a818,819
 > Anni/SM
 > Annice/M
-479a816,817
+479a821,822
 > Annissa/M
 > Annmaria/M
-480a819,820
+480a824,825
 > Annnora/M
 > Annora/M
-481a822
+482,483c827,832
+< Anouilh
+< Anselm
+---
 > Anny/M
-482a824,825
+> Anouilh/M
 > Ansel/M
 > Ansell/M
-483a827
+> Anselm/M
 > Anselma/M
-485a830,832
+486c835,838
+< Antaeus
+---
 > Ansley/M
 > Anson/M
 > Anstice/M
-490a838,841
+> Antaeus/M
+491c843,848
+< Anthony
+---
 > Anthe/M
 > Anthea/M
 > Anthia/M
 > Anthiathia/M
-497a849
+> Anthony/M
+> Anthropocene
+493c850
+< Antietam
+---
+> Antietam/M
+496c853
+< Antillean
+---
+> Antillean/M
+498c855,856
+< Antioch
+---
 > Antin/M
-504c856
+> Antioch/M
+503,504c861,862
+< Antoinette
 < Anton/M
 ---
+> Antoinette/M
 > Anton/MS
-505a858,860
+505a864,866
 > Antonella/M
 > Antonetta/M
 > Antoni/M
-506a862,866
+507c868,873
+< Antoninus
+---
 > Antonie/M
 > Antonietta/M
 > Antonin/M
 > Antonina/M
 > Antonino/M
-513a874,875
+> Antoninus/M
+509c875
+< Antonius
+---
+> Antonius/M
+514c880,882
+< Anzac
+---
 > Any/M
 > Anya/M
-530a893
+> Anzac/M
+517c885,886
+< Apennines
+---
+> Apatosaurus/M
+> Apennines/M
+519c888
+< Apia
+---
+> Apia/M
+522c891
+< Apollinaire
+---
+> Apollinaire/M
+524c893
+< Apollonian
+---
+> Apollonian/M
+529,531c898,901
+< Appleseed
+< Appleton
+< Appomattox
+---
+> Appleseed/M
+> Appleton/M
 > Appolonia/M
-533a897
+> Appomattox/M
+534c904,905
+< Apuleius
+---
 > Aprilette/M
-541c905
+> Apuleius/M
+537c908
+< Aquila
+---
+> Aquila/M
+541c912
 < Ar/M
 ---
 > Ar/MY
-543a908,912
+543a915,919
 > Arabel/M
 > Arabela/M
 > Arabele/M
 > Arabella/M
 > Arabelle/M
-552a922
+548c924
+< Araby
+---
+> Araby/M
+552a929
 > Araldo/M
-563a934,936
+564c941,944
+< Archean
+---
 > Arch/R
 > Archaimbaud/M
 > Archambault/M
-565a939,940
+> Archean/M
+565a946,947
 > Archibaldo/M
 > Archibold/M
-567a943
+567c949,950
+< Archimedes
+---
+> Archimedes/M
 > Archy/M
-569a946
+569a953
 > Arda/MH
-570a948
+570a955
 > Ardath/M
-571a950,954
+572,574c957,976
+< Arden
+< Arequipa
+< Ares
+---
 > Ardeen/M
 > Ardelia/M
 > Ardelis/M
 > Ardella/M
 > Ardelle/M
-572a956,966
+> Arden/M
 > Ardene/M
 > Ardenia/M
 > Ardine/M
@@ -591,30 +948,61 @@
 > Ardys
 > Ardyth/M
 > Arel/M
-574a969
+> Arequipa/M
+> Ares/M
 > Aretha/M
-582a978
+579c981
+< Argo/S
+---
+> Argo/SM
+581a984
+> Argos/M
+582a986
 > Ari/M
-583a980
+583a988
 > Ariana/M
-584a982,983
+585c990,995
+< Ariel
+---
 > Aridatha/M
 > Arie/SM
-585a985,987
+> Ariel/M
 > Ariela/M
 > Ariella/M
 > Arielle/M
-586a989,990
+587c997,999
+< Ariosto
+---
 > Arin/M
 > Ario/M
-603a1008,1013
+> Ariosto/M
+589c1001
+< Aristides
+---
+> Aristides/M
+594c1006
+< Ariz
+---
+> Ariz/M
+598,599c1010,1011
+< Arjuna
+< Ark
+---
+> Arjuna/M
+> Ark/M
+602,603c1014,1021
+< Arkhangelsk
+< Arkwright
+---
+> Arkhangelsk/M
+> Arkwright/M
 > Arlan/M
 > Arlana/M
 > Arlee/M
 > Arleen/M
 > Arlen/M
 > Arlena/M
-604a1015,1023
+604a1023,1031
 > Arleta/M
 > Arlette/M
 > Arley/M
@@ -624,91 +1012,179 @@
 > Arlin/M
 > Arlina/M
 > Arlinda/M
-606a1026,1029
+606c1033,1037
+< Arlington
+---
+> Arlington/M
 > Arluene/M
 > Arly/M
 > Arlyn/M
 > Arlyne/M
-608a1032
+608a1040
 > Arman/M
-613a1038
+613a1046
 > Armin/M
-617a1043,1044
+617a1051,1052
 > Arnaldo/M
-> Arne
-618a1046
+> Arne/M
+619c1054,1057
+< Arnhem
+---
 > Arney/M
-619a1048,1049
+> Arnhem/M
 > Arni/M
 > Arnie/M
-621a1052,1053
+621c1059,1061
+< Arnold
+---
+> Arnold/M
 > Arnoldo/M
 > Arnuad/M
-622a1055
+622a1063
 > Arny/M
-624a1058
+624c1065,1066
+< Arrhenius
+---
+> Arrhenius/M
 > Arri/M
-626a1061
+626a1069
 > Artair/M
-627a1063,1064
+627a1071,1072
 > Arte/M
-> Artemas
-628a1066,1067
+> Artemas/M
+628a1074,1075
 > Artemus/M
 > Arther/M
-631a1071
+630c1077
+< Arthurian
+---
+> Arthurian/M
+631a1079
 > Artur/M
-632a1073,1074
+632a1081,1082
 > Artus/M
 > Arty/M
-633a1076,1079
+633a1084,1087
 > Arv/M
 > Arvie/M
 > Arvin/M
 > Arvy/M
-634a1081,1082
+634a1089,1091
 > Aryn/M
+> As/M
 > Asa/M
-637a1086
+638,641c1095,1103
+< Asgard
+< Ashanti
+< Ashcroft
+< Ashe
+---
 > Ase/M
-638a1088
+> Asgard/M
 > Ash/MRY
-639a1090,1091
+> Ashanti/M
 > Ashbey/M
 > Ashby/M
-641c1093,1094
-< Ashe
----
+> Ashcroft/M
 > Ashe/Y
 > Ashely/M
-642a1096,1097
+642a1105,1106
 > Ashia/M
 > Ashien/M
-643a1099
+644c1108,1109
+< Ashkenazim
+---
 > Ashil/M
-645a1102,1103
+> Ashkenazim/M
+645a1111,1112
 > Ashla/M
 > Ashlan/M
-646a1105,1106
+646a1114,1115
 > Ashleigh/M
 > Ashlen/M
-647a1108,1111
+647a1117,1120
 > Ashli/M
 > Ashlie/M
 > Ashlin/M
 > Ashly/M
-648a1113
-> Ashton
-672a1138
+649c1122,1123
+< Ashurbanipal
+---
+> Ashton/M
+> Ashurbanipal/M
+650a1125
+> Asiago
+653,655c1128,1130
+< Asimov
+< Asmara
+< Asoka
+---
+> Asimov/M
+> Asmara/M
+> Asoka/M
+657a1133
+> Asperger/M
+659c1135
+< Asquith
+---
+> Asquith/M
+664c1140
+< Assisi
+---
+> Assisi/M
+667c1143
+< Astaire
+---
+> Astaire/M
+670,675c1146,1154
+< Aston
+< Astor
+< Astoria
+< Astrakhan
+< AstroTurf
+< Asturias
+---
+> Aston/M
+> Astor/M
+> Astoria/M
 > Astra/M
-673a1140,1141
+> Astrakhan/M
 > Astrid/M
 > Astrix/M
-695c1163
+> AstroTurf/M
+> Asturias/M
+680,681c1159,1160
+< Atahualpa
+< Atalanta
+---
+> Atahualpa/M
+> Atalanta/M
+693c1172
+< Atkinson
+---
+> Atkinson/M
+695c1174
 < Atlantes
 ---
 > Atlante/SM
-710a1179,1185
+699,700c1178,1179
+< Atman
+< Atreus
+---
+> Atman/M
+> Atreus/M
+706c1185
+< Attlee
+---
+> Attlee/M
+708c1187
+< Attucks
+---
+> Attucks/M
+711,712c1190,1200
+< Aubrey
+< Auckland
+---
 > Aube
 > Auberon/M
 > Aubert/M
@@ -716,577 +1192,1220 @@
 > Aubine/M
 > Aubree/M
 > Aubrette/M
-711a1187,1188
+> Aubrey/M
 > Aubrie/M
 > Aubry/M
-714a1192
+> Auckland/M
+714a1203
 > Audie/M
-716a1195
+716a1206
 > Audre/M
-717a1197,1199
+718c1208,1212
+< Audubon
+---
 > Audrie/M
 > Audry/M
 > Audrye/M
-718a1201
+> Audubon/M
 > Audy/M
-720a1204
+720,721c1214,1216
+< Augean
+< Augsburg
+---
+> Augean/M
 > Augie/M
-724a1209,1211
+> Augsburg/M
+724c1219,1222
+< Augustan
+---
+> Augustan/M
 > Auguste/M
 > Augustin/M
 > Augustina/M
-726a1214
+726a1225
 > Augusto/M
-727a1216,1218
+728c1227,1233
+< Aurangzeb
+---
 > Augy/M
 > Aundrea/M
 > Aura/M
-728a1220,1222
+> Aurangzeb/M
 > Aurea/M
 > Aurel/M
 > Aurelea/M
-729a1224
+729a1235
 > Aurelie/M
-732a1228,1229
+731c1237
+< Aurelius
+---
+> Aurelius/M
+732a1239,1240
 > Auria/M
 > Aurie/M
-733a1231,1233
+733a1242,1244
 > Aurilia/M
 > Aurlie/M
 > Auroora/M
-734a1235,1236
+735c1246,1248
+< Auschwitz
+---
 > Aurore/M
 > Aurthur/M
-739a1242,1243
+> Auschwitz/M
+737c1250
+< Austen
+---
+> Austen/M
+739a1253,1254
 > Austina/M
 > Austine/M
-753a1258
+741c1256
+< Australasian
+---
+> Australasian/M
+744c1259
+< Australoid
+---
+> Australoid/M
+752,756c1267,1275
+< Avalon
+< Ave
+< Aventine
+< Avernus
+< Averroes
+---
+> Avalon/M
+> Ave/M
 > Aveline/M
-754a1260,1262
+> Aventine/M
 > Averell/M
 > Averil/M
 > Averill/M
-757a1266
+> Avernus/M
+> Averroes/M
+757a1277
 > Averyl/M
-759a1269,1271
+759,760c1279,1283
+< Avicenna
+< Avignon
+---
+> Avicenna/M
 > Avictor/M
 > Avie/M
 > Avigdor/M
-763a1276,1277
+> Avignon/M
+763,767c1286,1299
+< Avis
+< Avogadro
+< Avon
+< Axis
+< Axum
+---
+> Avis/M
 > Aviva/M
 > Avivah/M
-765a1280,1286
+> Avogadro/M
+> Avon/M
 > Avram/M
 > Avril/M
 > Avrit/M
 > Avrom/M
 > Ax/M
 > Axe/M
-> Axel
-769a1291,1292
+> Axel/M
+> Axis/M
+> Axum/M
+769,770c1301,1306
+< Ayers
+< Aymara
+---
+> Ayers/M
 > Aylmar/M
 > Aylmer/M
-770a1294,1295
+> Aymara/M
 > Aymer/M
 > Ayn/M
-813a1339
+772c1308
+< Ayurveda
+---
+> Ayurveda/M
+776c1312
+< Azazel
+---
+> Azazel/M
+780c1316
+< Azov
+---
+> Azov/M
+788,789c1324,1325
+< BBB
+< BBC
+---
+> BBB/M
+> BBC/M
+793a1330
+> BFF
+801c1338
+< BP
+---
+> BP/M
+806c1343
+< BSD/S
+---
+> BSD/SM
+813c1350,1351
+< Baathist
+---
+> Baathist/M
 > Bab/SM
-814a1341,1342
+815,816c1353,1358
+< Babbage
+< Babbitt
+---
 > Babara/M
 > Babb/M
-815a1344,1345
+> Babbage/M
 > Babbette/M
 > Babbie/M
-817a1348,1349
+> Babbitt/M
+817a1360,1361
 > Babette/M
 > Babita/M
-847a1380
+823c1367
+< Bacardi
+---
+> Bacardi/M
+830,831c1374,1375
+< Bactria
+< Baden
+---
+> Bactria/M
+> Baden/M
+834c1378
+< Baez
+---
+> Baez/M
+836c1380
+< Baggies
+---
+> Baggies/M
+838,840c1382,1384
+< Baguio
+< Baha'i
+< Baha'ullah
+---
+> Baguio/M
+> Baha'i/M
+> Baha'ullah/M
+845c1389
+< Bahia
+---
+> Bahia/M
+847c1391,1392
+< Baikal
+---
+> Baikal/M
 > Bail/M
-848a1382,1384
+849c1394,1397
+< Baird
+---
 > Bailie/M
 > Baillie/M
 > Baily/M
-857a1394
+> Baird/M
+851,852c1399,1400
+< Baker
+< Bakersfield
+---
+> Baker/M
+> Bakersfield/M
+854,857c1402,1406
+< Bakunin
+< Balanchine
+< Balaton
+< Balboa
+---
+> Bakunin/M
+> Balanchine/M
+> Balaton/M
+> Balboa/M
 > Bald/MR
-858a1396
+858a1408
 > Balduin/M
-859a1398
+859a1410
 > Bale/M
-874a1414,1416
+861c1412
+< Balfour
+---
+> Balfour/M
+864,866c1415,1417
+< Balkan/S
+< Balkhash
+< Ball
+---
+> Balkan/SM
+> Balkhash/M
+> Ball/M
+868c1419
+< Balthazar
+---
+> Balthazar/M
+871c1422
+< Baluchistan
+---
+> Baluchistan/M
+874a1426,1428
 > Bambie/M
 > Bamby/M
 > Ban/M
-886c1428,1429
+878c1432
+< Bangalore
+---
+> Bangalore/M
+882c1436
+< Bangor
+---
+> Bangor/M
+885,886c1439,1441
+< Banjul
 < Banks
 ---
+> Banjul/M
 > Bank/SM
 > Banky/M
-893a1437
+888,889c1443,1444
+< Bannister
+< Banting
+---
+> Bannister/M
+> Banting/M
+894c1449,1450
+< Barabbas
+---
 > Bar/H
-895a1440,1442
+> Barabbas/M
+895a1452,1454
 > Barb/MR
 > Barbabas/M
 > Barbabra/M
-898a1446
+898a1458
 > Barbaraanne/M
-901a1450
+902,903c1462,1468
+< Barber
+< Barbie
+---
 > Barbe/M
-902a1452,1455
+> Barber/M
 > Barbee/M
 > Barbette/M
 > Barbey/M
 > Barbi/M
-906a1460
+> Barbie/M
+906a1472
 > Barby/M
-908a1463,1464
+908a1475,1476
 > Bard/M
 > Barde/M
-910a1467
+910a1479
 > Bari/M
-913a1471
+914c1483,1485
+< Barnabas
+---
 > Barn/M
-914a1473
+> Barnabas/M
 > Barnabe/M
-917a1477
+916,918c1487,1490
+< Barnard
+< Barnaul
+< Barnes
+---
+> Barnard/M
+> Barnaul/M
 > Barnebas/M
-920a1481
+> Barnes/M
+921,922c1493,1497
+< Barnum
+< Baroda
+---
 > Barnie/M
-921a1483
+> Barnum/M
 > Barny/M
-922a1485
+> Baroda/M
 > Baron/M
-927a1491
+924c1499
+< Barquisimeto
+---
+> Barquisimeto/M
+926c1501
+< Barranquilla
+---
+> Barranquilla/M
+927a1503
 > Barret/M
-928a1493
+928a1505
 > Barri/MS
-933a1499
+931,934c1508,1513
+< Barry
+< Barrymore
+< Bart
+< Barth/S
+---
+> Barry/M
+> Barrymore/M
+> Bart/M
 > Bartel/M
-934a1501
+> Barth/SM
 > Barthel/M
-935a1503,1505
+936,941c1515,1532
+< Bartholomew
+< Bartlett
+< Bartok
+< Barton
+< Baruch
+< Baryshnikov
+---
 > Bartholemy/M
 > Bartholomeo/M
 > Bartholomeus/M
-936a1507,1508
+> Bartholomew/M
 > Bartie/M
 > Bartlet/M
-938a1511,1512
+> Bartlett/M
+> Bartok/M
 > Bartolemo/M
 > Bartolomeo/M
-939a1514,1515
+> Barton/M
 > Bartram/M
 > Barty/M
-940a1517,1518
+> Baruch/M
 > Bary/M
 > Baryram/M
-941a1520
+> Baryshnikov/M
 > Base/M
-943a1523
+944,946c1535,1541
+< Basic
+< Basie
+< Basil
+---
 > Basia/M
-946a1527,1529
+> Basic/M
+> Basie/M
+> Basil/M
 > Basile/M
 > Basilio/M
 > Basilius/M
-950a1534,1535
+948c1543
+< Basra
+---
+> Basra/M
+950a1546,1547
 > Bastian/M
 > Bastien/M
-952a1538
+952a1550
 > Bat/M
-954a1541
+954,956c1552,1555
+< Bates
+< Bathsheba
+< Batista
+---
+> Bates/M
 > Batholomew/M
-957a1545
+> Bathsheba/M
+> Batista/M
+957a1557
 > Batsheva/M
-960a1549
+960a1561
 > Baudoin/M
-966a1556,1557
+962c1563
+< Bauer
+---
+> Bauer/M
+964c1565
+< Baum
+---
+> Baum/M
+966a1568,1569
 > Bax
 > Baxie/M
-967a1559,1560
+967a1571,1572
 > Baxy/M
 > Bay/MR
-968a1562
+968a1574
 > Bayard
-977a1572
+970,971c1576,1577
+< Bayes
+< Bayesian
+---
+> Bayes/M
+> Bayesian/M
+975c1581
+< Bayreuth
+---
+> Bayreuth/M
+977a1584
 > Bea/M
-979a1575,1576
+979c1586,1588
+< Beadle
+---
+> Beadle/M
 > Beale/M
 > Bealle/M
-980a1578
+980a1590
 > Bear/M
-984a1583
+983c1593
+< Beardsley
+---
+> Beardsley/M
+984a1595
 > Bearnard/M
-988a1588
+988a1600
 > Beatrisa/M
-997a1598,1599
+992c1604
+< Beaufort
+---
+> Beaufort/M
+995c1607
+< Beaumont
+---
+> Beaumont/M
+997c1609,1611
+< Beauvoir
+---
+> Beauvoir/M
 > Bebe/M
 > Becca/M
-999a1602
+999a1614
 > Becka/M
-1002a1606,1607
+1002a1618,1619
 > Becki/M
 > Beckie/M
-1006a1612
+1004,1005c1621,1622
+< Becquerel
+< Bede
+---
+> Becquerel/M
+> Bede/M
+1006a1624
 > Bee/M
-1018a1625
+1008c1626
+< Beecher
+---
+> Beecher/M
+1011c1629
+< Beerbohm
+---
+> Beerbohm/M
+1014,1017c1632,1635
+< Begin
+< Behan
+< Behring
+< Beiderbecke
+---
+> Begin/M
+> Behan/M
+> Behring/M
+> Beiderbecke/M
+1018a1637
 > Beilul/M
-1019a1627
+1019a1639
 > Beitris/M
-1020a1629,1630
+1020a1641,1642
 > Bekki/M
 > Bel/M
-1029a1640,1641
+1026c1648
+< Belg
+---
+> Belg/M
+1029a1652,1653
 > Belia/M
 > Belicia/M
-1030a1643
+1030a1655
 > Belita/M
-1034a1648
+1034a1660
 > Bellanca/M
-1035a1650
+1036,1038c1662,1666
+< Belleek
+< Bellini
+< Bellow
+---
 > Belle/M
-1036a1652
+> Belleek/M
 > Bellina/M
-1044a1661
+> Bellini/M
+> Bellow/M
+1040c1668
+< Belmopan
+---
+> Belmopan/M
+1044c1672,1673
+< Beltane
+---
+> Beltane/M
 > Beltran/M
-1045a1663,1664
+1045a1675,1676
 > Belva/M
 > Belvia/M
-1050a1670,1672
+1050a1682,1684
 > Bendick/M
 > Bendicty/M
 > Bendite/M
-1051a1674,1676
+1051a1686,1688
 > Benedetta/M
 > Benedetto/M
 > Benedick/M
-1052a1678
+1052a1690
 > Benedicta/M
-1053a1680,1682
+1053a1692,1694
 > Benedicto/M
 > Benedikt/M
 > Benedikta/M
-1055a1685
+1055c1696,1697
+< Benet
+---
+> Benet/M
 > Benetta/M
-1059a1690,1691
+1059a1702,1703
 > Bengt/M
 > Beniamino/M
-1063a1696
+1064,1065c1708,1715
+< Benjamin
+< Bennett
+---
 > Benjamen/M
-1064a1698,1701
+> Benjamin/M
 > Benji/M
 > Benjie/M
 > Benjy/M
 > Benn/M
-1065a1703
+> Bennett/M
 > Benni/M
-1067a1706,1707
+1067a1718,1719
 > Benoit/M
 > Benoite/M
-1068a1709
+1069,1072c1721,1727
+< Bentham
+< Bentley
+< Benton
+< Benz
+---
 > Bent/M
-1069a1711
+> Bentham/M
 > Bentlee/M
-1071a1714
+> Bentley/M
+> Benton/M
 > Benyamin/M
-1074a1718
+> Benz/M
+1074c1729,1730
+< Beowulf
+---
+> Beowulf/M
 > Ber/MG
-1076a1721
+1076a1733
 > Beret
-1081a1727
+1078c1735
+< Berg/NR
+---
+> Berg/MNR
+1081,1085c1738,1745
+< Bergerac
+< Bergman
+< Bergson
+< Beria
+< Bering
+---
+> Bergerac/M
 > Berget/M
-1085a1732,1733
+> Bergman/M
+> Bergson/M
+> Beria/M
+> Bering/M
 > Berk/MY
 > Berke/M
-1086a1735,1737
+1086a1747,1749
 > Berkie/M
 > Berkley/M
 > Berkly/M
-1087a1739
+1087a1751
 > Berky/M
-1096a1749,1750
+1091c1755
+< Berlioz
+---
+> Berlioz/M
+1097c1761,1764
+< Bernadette
+---
 > Berna/M
 > Bernadene/M
-1097a1752
+> Bernadette/M
 > Bernadina/M
-1100a1756,1757
+1100c1767,1769
+< Bernard
+---
+> Bernard/M
 > Bernardina/M
 > Bernardine
-1101a1759
+1101a1771
 > Bernarr/M
-1104c1762
+1104c1774
 < Berne/M
 ---
 > Bernelle/M
-1105a1764,1767
+1106c1776,1781
+< Bernhardt
+---
 > Bernete/M
 > Bernetta/M
 > Bernette/M
 > Bernhard/M
-1106a1769
+> Bernhardt/M
 > Berni/M
-1109a1773
+1109,1111c1784,1788
+< Bernini
+< Bernoulli
+< Bernstein
+---
+> Bernini/M
 > Bernita/M
-1111a1776
+> Bernoulli/M
+> Bernstein/M
 > Berny/M
-1112a1778,1779
+1113c1790,1792
+< Berry
+---
 > Berri/M
 > Berrie/M
-1115a1783
+> Berry/M
+1115a1795
 > Berte/M
-1117a1786,1787
+1117a1798,1799
 > Berthe/M
 > Berti/M
-1119a1790,1792
+1119a1802,1804
 > Bertina/M
 > Bertine/M
 > Berton/M
-1121a1795,1796
+1121a1807,1808
 > Bertrando/M
 > Berty/M
-1122a1798
+1123,1125c1810,1813
+< Berzelius
+< Bess
+< Bessel
+---
 > Beryle/M
-1127a1804
+> Berzelius/M
+> Bess/M
+> Bessel/M
+1127c1815,1816
+< Bessie
+---
+> Bessie/M
 > Bessy/M
-1130a1808
+1131,1133c1820,1825
+< Bethany
+< Bethe
+< Bethesda
+---
 > Bethanne/M
-1132a1811
+> Bethany/M
+> Bethe/M
 > Bethena/M
-1133a1813
+> Bethesda/M
 > Bethina/M
-1135a1816
+1135c1827,1828
+< Bethune
+---
+> Bethune/M
 > Betsey/M
-1136a1818
+1136a1830
 > Betta/M
-1137a1820,1822
+1137a1832,1834
 > Betteann/M
 > Betteanne/M
 > Betti
-1138a1824,1825
+1138a1836,1837
 > Bettina/M
 > Bettine/M
-1141a1829,1831
+1141c1840,1843
+< Beulah
+---
+> Beulah/M
 > Bevan
 > Beverie/M
 > Beverlee/M
-1142a1833
+1142a1845
 > Beverlie/M
-1143a1835,1837
+1144,1145c1847,1851
+< Beyer
+< Bhopal
+---
 > Bevin
 > Bevon/M
 > Bevvy/M
-1151a1846
+> Beyer/M
+> Bhopal/M
+1150c1856
+< Bialystok
+---
+> Bialystok/M
+1151a1858
 > Bianka/M
-1152a1848,1851
+1152a1860,1863
 > Bibbie/M
 > Bibby/M
 > Bibbye/M
 > Bibi/M
-1155a1855
+1156c1867,1869
+< Biddle
+---
 > Biddie/M
-1156a1857
+> Biddle/M
 > Biddy/M
-1157a1859
+1158c1871,1872
+< Bierce
+---
 > Bidget/M
-1161a1864
+> Bierce/M
+1162c1876,1877
+< Bilbao
+---
 > Bil/MY
-1163a1867
+> Bilbao/M
+1163a1879
 > Bili/M
-1164a1869
+1164a1881
 > Billi/M
-1167a1873
+1167a1885
 > Billye/M
-1168a1875,1879
+1168a1887,1891
 > Bink/M
 > Binky/M
 > Binni/M
 > Binnie/M
 > Binny/M
-1169a1881
+1170c1893,1895
+< Bird
+---
 > Birch/M
-1170a1883
+> Bird/M
 > Birdie/M
-1171a1885,1887
+1172c1897,1900
+< Birkenstock
+---
 > Birgit/M
 > Birgitta/M
 > Birk/M
-1174a1891
+> Birkenstock/M
+1175c1903,1904
+< Biscay
+---
 > Biron/M
-1183a1901
+> Biscay/M
+1177c1906
+< Bishkek
+---
+> Bishkek/M
+1183c1912,1914
+< Bizet
+---
+> BitTorrent/M
+> Bizet/M
 > Bjorn/M
-1197a1916
+1190c1921
+< Blackfeet
+---
+> Blackfeet/M
+1194,1195c1925,1926
+< Blackstone
+< Blackwell
+---
+> Blackstone/M
+> Blackwell/M
+1198c1929,1932
+< Blake
+---
 > Blaire/M
-1198a1918,1919
+> Blake/M
 > Blakelee/M
 > Blakeley/M
-1199a1921,1922
+1199a1934,1935
 > Blanch/M
 > Blancha/M
-1201a1925
+1201a1938
 > Blane/M
-1205a1930
+1205c1942,1943
+< Blavatsky
+---
+> Blavatsky/M
 > Blayne/M
-1208a1934,1939
+1209c1947,1953
+< Bloch
+---
 > Blinni/M
 > Blinnie/M
 > Blinny/M
 > Bliss
 > Blisse/M
 > Blithe/M
-1212a1944,1945
+> Bloch/M
+1212a1957,1958
 > Blondell/M
 > Blondelle/M
-1213a1947
+1213a1960
 > Blondy/M
-1221a1956
+1215c1962,1963
+< Bloomfield
+---
+> Bloomer/M
+> Bloomfield/M
+1217c1965,1966
+< Bloomsbury
+---
+> Bloomsbury/M
+> Blu
+1221a1971
 > Bo/MRZ
-1224a1960,1962
+1224a1975,1977
 > Bobbe/M
 > Bobbee/M
 > Bobbette/M
-1228a1967,1971
+1229c1982,1987
+< Boccaccio
+---
 > Bobbye/M
 > Bobette/M
 > Bobina/M
 > Bobine/M
 > Bobinette/M
-1237a1981
+> Boccaccio/M
+1234c1992
+< Boeotian
+---
+> Boeotian/M
+1236c1994
+< Boethius
+---
+> Boethius/M
+1237a1996
 > Bogey/M
-1241a1986
+1239c1998
+< Bohemia
+---
+> Bohemia/M
+1241c2000,2001
+< Bohr
+---
+> Bohr/M
 > Boigie/M
-1259a2005,2008
+1251,1252c2011,2012
+< Bolshevism
+< Bolshevist
+---
+> Bolshevism/M
+> Bolshevist/M
+1254,1255c2014,2015
+< Bolton
+< Boltzmann
+---
+> Bolton/M
+> Boltzmann/M
+1257,1258c2017,2018
+< Bonaparte
+< Bonaventure
+---
+> Bonaparte/M
+> Bonaventure/M
+1259a2020,2023
 > Bondie/M
 > Bondon/M
 > Bondy/M
 > Bone/M
-1263a2013
+1261c2025
+< Boniface
+---
+> Boniface/M
+1263a2028
 > Bonnee/M
-1265a2016,2017
+1265a2031,2032
 > Bonni/M
 > Bonnibelle/M
-1266a2019
-> Bonny
-1271a2025,2028
+1266a2034
+> Bonny/M
+1270c2038
+< Boolean
+---
+> Boolean/M
+1271a2040,2043
 > Boonie/M
 > Boony/M
 > Boot/M
 > Boote/MS
-1273a2031,2032
+1273c2045,2047
+< Booth
+---
+> Booth/M
 > Boothe/M
 > Bord/MN
-1275a2035
+1275a2050
 > Bordie/M
-1276a2037
+1276a2052
 > Bordy/M
-1304a2066
+1279,1282c2055,2058
+< Borges
+< Borgia
+< Borglum
+< Boris
+---
+> Borges/M
+> Borgia/M
+> Borglum/M
+> Boris/M
+1285c2061
+< Born
+---
+> Born/M
+1288c2064
+< Borodin
+---
+> Borodin/M
+1290,1291c2066,2067
+< Bosch
+< Bose
+---
+> Bosch/M
+> Bose/M
+1293c2069
+< Bosnian
+---
+> Bosnian/M
+1296,1297c2072,2074
+< Bostonian
+< Boswell
+---
+> Bostonian/M
+> Boswell/M
+> Botox
+1299,1301c2076,2078
+< Botticelli
+< Boudicca
+< Boulder
+---
+> Botticelli/M
+> Boudicca/M
+> Boulder/M
+1305c2082,2083
+< Bournemouth
+---
 > Bourke/M
-1313a2076,2079
+> Bournemouth/M
+1310c2088
+< Bowers
+---
+> Bowers/M
+1312c2090
+< Bowie
+---
+> Bowie/M
+1314c2092,2096
+< Boyd
+---
 > Boy/MR
 > Boyce/M
 > Boycey/M
 > Boycie/M
-1317c2083
+> Boyd/M
+1316,1317c2098,2099
+< Boyle
 < Br/MT
 ---
+> Boyle/M
 > Br/MNT
-1318a2085
+1319c2101,2102
+< Bradbury
+---
 > Bradan/M
-1320a2088,2089
+> Bradbury/M
+1321,1322c2104,2107
+< Bradford
+< Bradley
+---
 > Brade/M
 > Braden/M
-1323a2093
+> Bradford/M
+> Bradley/M
+1323a2109
 > Bradney/M
-1339a2110
+1326c2112
+< Brady
+---
+> Brady/M
+1328c2114
+< Brahe
+---
+> Brahe/M
+1332,1333c2118,2119
+< Brahmanee
+< Brahmani
+---
+> Brahmanee/M
+> Brahmani/M
+1339a2126
 > Bram/M
-1341a2113
+1341a2129
 > Brana/M
-1342a2115,2118
+1343c2131,2135
+< Brandeis
+---
 > Brand/MNR
 > Brandais/M
 > Brande/M
 > Brandea/M
-1345a2122
+> Brandeis/M
+1345c2137,2138
+< Brandenburg
+---
+> Brandenburg/M
 > Brander/M
-1346a2124
+1346a2140
 > Brandice/M
-1347a2126
+1348c2142,2143
+< Brando
+---
 > Brandise/M
-1350a2130
+> Brando/M
+1350c2145,2146
+< Brandt
+---
+> Brandt/M
 > Brandtr/M
-1351a2132,2133
+1351a2148,2149
 > Brandyn/M
 > Brannon/M
-1352a2135
+1353c2151,2152
+< Braque
+---
 > Brantley/M
-1362a2146,2147
+> Braque/M
+1355c2154
+< Bratislava
+---
+> Bratislava/M
+1362a2162,2163
 > Breanne/M
 > Brear/M
-1365a2151,2152
+1364c2165
+< Brecht
+---
+> Brecht/M
+1366c2167,2171
+< Bremen
+---
 > Bree/M
 > Breena/M
-1366a2154,2155
+> Bremen/M
 > Bren/M
 > Brena/M
-1368a2158,2163
+1368a2174,2179
 > Brenden/M
 > Brendin/M
 > Brendis/M
 > Brendon/M
 > Brenn/MNR
 > Brenna/M
-1369a2165
+1369a2181
 > Brennen/M
-1376a2173
+1372a2185
+> Brest/M
+1376a2190
 > Brew/MR
-1379a2177
+1378,1379c2192,2194
+< Brewster
+< Brezhnev
+---
+> Brewster/M
+> Brezhnev/M
 > Bria/M
-1382a2181,2183
+1382a2198,2200
 > Brianne/M
 > Briano/M
 > Briant/M
-1384a2186
+1384a2203
 > Bride/M
-1393c2195,2200
+1387c2206
+< Bridges
+---
+> Bridges/M
+1389c2208
+< Bridgetown
+---
+> Bridgetown/M
+1392,1395c2211,2219
+< Bridgman
 < Brie/SM
+< Brigadoon
+< Briggs
 ---
+> Bridgman/M
 > Bridie/M
 > Brie/RSM
 > Brien/M
 > Brier/M
 > Brietta/M
-> Brig
-1395c2202
-< Briggs
----
+> Brig/M
+> Brigadoon/M
 > Brigg/MS
-1399a2207,2209
+1397c2221
+< Bright
+---
+> Bright/M
+1399a2224,2226
 > Brigida/M
 > Brigit/M
 > Brigitta/M
-1401a2212,2213
+1401c2228,2230
+< Brillo
+---
+> Brillo/M
 > Brina/M
 > Briney/M
-1402a2215,2218
+1402a2232,2235
 > Brinn/M
 > Brinna/M
 > Briny/M
 > Brion/M
-1405a2222
+1405a2239
 > Brita/M
-1413a2231
+1407,1408c2241,2242
+< Britannia
+< Britannic
+---
+> Britannia/M
+> Britannic/M
+1413a2248
 > Britni/M
-1415a2234,2237
+1415a2251,2254
 > Britta/M
 > Brittan/M
 > Brittaney/M
 > Brittani/M
-1416a2239,2241
+1416a2256,2259
 > Britte/M
+> Britten/M
 > Britteny/M
 > Brittne/M
-1417a2243,2245
+1418c2261,2264
+< Brno
+---
 > Brittni/M
 > Brnaba/M
 > Brnaby/M
-1422a2251,2260
+> Brno/M
+1421c2267
+< Brobdingnagian
+---
+> Brobdingnagian/M
+1422a2269,2278
 > Brockie/M
 > Brocky/M
 > Brod/M
@@ -1297,493 +2416,989 @@
 > Brodie/M
 > Brody/M
 > Brok/M
-1423a2262,2264
+1423a2280,2282
 > Bron/M
 > Bronnie/M
 > Bronny/M
-1426a2268
+1425c2284,2285
+< Bronte
+---
+> Bronte/M
+> Brontosaurus
+1427c2287,2288
+< Brooke
+---
 > Brook/MS
-1429d2270
+> Brooke/M
+1429c2290
 < Brooks
-1430a2272
+---
+> Brooks/M
+1431,1432c2292,2294
+< Brown/G
+< Browne
+---
 > Brose/M
-1438a2281
+> Brown/MG
+> Browne/M
+1435,1437c2297,2300
+< Brownshirt
+< Brownsville
+< Brubeck
+---
+> Browning/M
+> Brownshirt/M
+> Brownsville/M
+> Brubeck/M
+1439,1441c2302,2306
+< Bruckner
+< Bruegel
+< Brueghel
+---
 > Brucie/M
-1441a2285
+> Bruckner/M
+> Bruegel/M
+> Brueghel/M
 > Bruis/M
-1445a2290
+1445c2310,2311
+< Brunelleschi
+---
+> Brunelleschi/M
 > Brunhilda/M
-1452a2298
+1447c2313
+< Bruno
+---
+> Bruno/M
+1452,1453c2318,2321
+< Bryan
+< Bryant
+---
+> Bryan/M
 > Bryana/M
-1453a2300
+> Bryant/M
 > Bryanty/M
-1454a2302,2306
+1454a2323,2327
 > Bryn/M
 > Bryna/M
 > Brynn/MR
 > Brynna/M
 > Brynne/M
-1464a2317
+1459c2332
+< Buber
+---
+> Buber/M
+1464,1465c2337,2339
+< Buck
+< Buckingham
+---
+> Buck/M
 > Buckie/M
-1467a2321
+> Buckingham/M
+1467a2342
 > Bucky/M
-1469a2324
+1469a2345
 > Budd/M
-1472a2328
+1472a2349
 > Buddie/M
-1479d2334
+1479d2355
 < Bugzilla/M
-1480a2336
+1480a2357
 > Buiron/M
-1499a2356,2358
+1482,1487c2359,2364
+< Bukhara
+< Bukharin
+< Bulawayo
+< Bulfinch
+< Bulganin
+< Bulgar
+---
+> Bukhara/M
+> Bukharin/M
+> Bulawayo/M
+> Bulfinch/M
+> Bulganin/M
+> Bulgar/M
+1495c2372
+< Bunche
+---
+> Bunche/M
+1497,1498c2374,2375
+< Bundestag
+< Bunin
+---
+> Bundestag/M
+> Bunin/M
+1500c2377,2380
+< Bunsen
+---
 > Bunni/M
 > Bunnie/M
 > Bunny/M
-1505a2365
+> Bunsen/M
+1503c2383
+< Burbank
+---
+> Burbank/M
+1505a2386
 > Burg/MR
-1510a2371
-> Burk/SM
-1512d2372
+1507c2388
+< Burgess
+---
+> Burgess/M
+1509c2390
+< Burgundian
+---
+> Burgundian/M
+1511,1512c2392,2394
+< Burke
 < Burks
-1513a2374
+---
+> Burk/SM
+> Burke/M
+> Burks/M
+1513a2396
 > Burlie/M
-1516a2378,2379
+1517,1520c2400,2405
+< Burnett
+< Burns
+< Burnside
+< Burr
+---
 > Burnaby/M
 > Burnard/M
-1524a2388
+> Burnett/M
+> Burns/M
+> Burnside/M
+> Burr/M
+1522,1523c2407,2408
+< Burroughs
+< Bursa
+---
+> Burroughs/M
+> Bursa/M
+1524a2410
 > Burtie/M
-1525a2390
+1525a2412
 > Burty/M
-1531a2397
+1530c2417
+< Bushido
+---
+> Bushido/M
+1531a2419
 > Butch/M
-1537a2404,2406
+1538,1540c2426,2433
+< Byrd
+< Byron
+< Byronic
+---
 > Byram/M
 > Byran/M
 > Byrann/M
-1538a2408,2409
+> Byrd/M
 > Byrle/M
 > Byrom/M
-1543c2414
+> Byron/M
+> Byronic/M
+1543c2436
 < C/SM
 ---
 > C/SMDY
-1559c2430
+1553c2446
+< CBS
+---
+> CBS/M
+1559c2452
 < CEO/M
 ---
 > CEO/MS
-1561c2432
+1561c2454
 < CFC/M
 ---
 > CFC/MS
-1588a2460,2463
+1565c2458
+< CNN
+---
+> CNN/M
+1580a2474
+> CVS/M
+1585,1586c2479,2480
+< Cabot
+< Cabral
+---
+> Cabot/M
+> Cabral/M
+1588c2482,2486
+< Cabrini
+---
+> Cabrini/M
 > Cacilia/M
 > Cacilie/M
 > Cad/M
 > Caddric/M
-1598a2474
+1590c2488
+< Cadillac
+---
+> Cadillac/M
+1593c2491
+< Caerphilly
+---
+> Caerphilly/M
+1596c2494
+< Cage
+---
+> Cage/M
+1599c2497,2498
+< Caiaphas
+---
 > Cahra/M
-1600a2477
+> Caiaphas/M
+1600a2500
 > Cairistiona/M
-1602a2480
+1602a2503
 > Caitrin/M
-1605c2483
+1605,1606c2506,2507
 < Cal
+< Calais
+---
+> Cal/YM
+> Calais/M
+1610c2511,2512
+< Caldwell
 ---
-> Cal/Y
-1610a2489
+> Caldwell/M
 > Cale/M
-1616a2496
+1612c2514
+< Caledonia
+---
+> Caledonia/M
+1614,1616c2516,2519
+< Calhoun
+< Cali
+< Caliban
+---
+> Calhoun/M
+> Cali/M
+> Caliban/M
 > Calida/M
-1620a2501
+1620,1621c2523,2525
+< Caligula
+< Callaghan
+---
+> Caligula/M
 > Calla/MS
-1624c2505,2508
+> Callaghan/M
+1623,1624c2527,2532
+< Callao
 < Callas
 ---
+> Callao/M
+> Callas/M
 > Callean/M
 > Calley/M
 > Calli/M
 > Callida/M
-1627a2512
+1627a2536
 > Cally/M
-1628a2514
+1628a2538
 > Calv/M
-1634a2521,2522
+1630c2540
+< Calvert
+---
+> Calvert/M
+1634a2545,2546
 > Calypso
 > Cam
-1635a2524
+1635a2548
 > Camala/M
-1641a2531,2532
+1642c2555,2557
+< Camelopardalis
+---
 > Camella/M
 > Camellia/M
-1647a2539,2542
+> Camelopardalis/M
+1647a2563,2566
 > Camey/M
 > Cami/M
 > Camila/M
 > Camile/M
-1649a2545,2547
+1649a2569,2571
 > Cammi/M
 > Cammie/M
 > Cammy/M
-1670a2569
+1652,1654c2574,2576
+< Campbell
+< Campinas
+< Campos
+---
+> Campbell/M
+> Campinas/M
+> Campos/M
+1656,1657c2578,2579
+< Camus
+< Can
+---
+> Camus/M
+> Can/M
+1664c2586
+< Canaletto
+---
+> Canaletto/M
+1666c2588
+< Canaveral
+---
+> Canaveral/M
+1670a2593
 > Candi/MS
-1671a2571
+1671a2595
 > Candida/M
-1672a2573,2574
+1672a2597,2598
 > Candie/M
 > Candra/M
-1699a2602
+1677c2603
+< Canopus
+---
+> Canopus/M
+1679c2605
+< Canterbury
+---
+> Canterbury/M
+1685,1686c2611,2612
+< Canute
+< Capablanca
+---
+> Canute/M
+> Capablanca/M
+1689,1690c2615,2616
+< Capet
+< Capetian
+---
+> Capet/M
+> Capetian/M
+1695,1697c2621,2623
+< Capitoline
+< Capone
+< Capote
+---
+> Capitoline/M
+> Capone/M
+> Capote/M
+1699a2626
 > Caprice/M
-1703a2607
+1702c2629
+< Capuchin
+---
+> Capuchin/M
+1703a2631
 > Car/MNY
-1706a2611
+1705c2633
+< Caracalla
+---
+> Caracalla/M
+1707c2635,2636
+< Caravaggio
+---
 > Caralie/M
-1710a2616
+> Caravaggio/M
+1710c2639,2640
+< Carborundum
+---
+> Carborundum/M
 > Carce/M
-1714a2621,2626
+1715c2645,2653
+< Carey
+---
 > Care/M
 > Caren/M
 > Carena/M
 > Caresa/M
 > Caressa/M
 > Caresse/M
-1715a2628,2629
+> Carey/M
 > Cari/M
 > Caria
-1717a2632,2635
+1718c2656,2662
+< Carina
+---
 > Carie/M
 > Caril/M
 > Carilyn/M
 > Carin/M
-1718a2637,2638
+> Carina/M
 > Carine/M
 > Cariotta/M
-1720c2640,2642
+1720c2664,2666
 < Carl/M
 ---
 > Carita/M
 > Caritta/M
 > Carl/GMN
-1721a2644,2646
+1721a2668,2670
 > Carlee/M
 > Carleen/M
 > Carlen/M
-1722a2648,2650
+1722a2672,2674
 > Carleton/M
 > Carley/M
 > Carlie/M
-1723a2652,2655
+1723a2676,2679
 > Carlina/M
 > Carline/M
 > Carling/M
 > Carlita/M
-1724a2657,2658
-> Carlota
+1725c2681,2684
+< Carlsbad
+---
+> Carlos/M
+> Carlota/M
 > Carlotta/M
-1728a2663
+> Carlsbad/M
+1727c2686
+< Carlton
+---
+> Carlton/M
+1729c2688,2694
+< Carlyle
+---
 > Carlye/M
-1729a2665,2669
+> Carlyle/M
 > Carlyn/M
 > Carlynn/M
 > Carlynne/M
 > Carma/M
-> Carmel
-1730a2671,2673
+> Carmel/M
+1730a2696,2698
 > Carmelia/M
 > Carmelina/M
 > Carmelita/M
-1731a2675
+1731a2700
 > Carmelle/M
-1733a2678
+1733a2703
 > Carmencita/M
-1734a2680
+1734a2705
 > Carmina/M
-1735a2682,2683
+1736c2707,2709
+< Carnap
+---
 > Carmita/M
 > Carmon/M
-1740a2689,2690
+> Carnap/M
+1740c2713,2715
+< Carnot
+---
+> Carnot/M
 > Carny/M
 > Caro/M
-1741a2692,2694
+1741a2717,2719
 > Carola/M
 > Carolan/M
 > Carolann/M
-1742a2696,2697
+1743,1745c2721,2725
+< Carolina
+< Caroline
+< Carolingian
+---
 > Carolee/M
 > Carolin/M
-1746a2702,2703
+> Carolina/M
+> Caroline/M
+> Carolingian/M
+1746a2727,2728
 > Caroljean/M
 > Carolus/M
-1747a2705,2707
+1747a2730,2732
 > Carolyne/M
 > Carolynn/M
 > Caron/M
-1752c2712,2714
-< Carrie/RM
+1749c2734,2735
+< Carpenter
 ---
+> Carpathians/M
+> Carpenter/M
+1751a2738,2739
 > Carree/M
 > Carri/MR
-> Carrie/M
-1754a2717,2718
+1754a2743,2744
 > Carrissa/M
 > Carrol/M
-1755a2720
+1756c2746,2748
+< Carson
+---
 > Carry/M
-1756a2722
+> Carson/M
 > Cart/MR
-1765a2732,2733
+1758c2750
+< Cartesian
+---
+> Cartesian/M
+1761,1765c2753,2759
+< Cartier
+< Cartwright
+< Caruso
+< Carver
+< Cary
+---
+> Cartier/M
+> Cartwright/M
+> Caruso/M
+> Carver/M
+> Cary/M
 > Caryl/M
 > Caryn/M
-1769a2738
+1767c2761
+< Casals
+---
+> Casals/M
+1769a2764
 > Casar/M
-1773a2743,2744
+1773c2768,2770
+< Cash
+---
+> Cash/M
 > Casi/M
 > Casie/M
-1775a2747
+1775,1776c2772,2775
+< Caspar
+< Caspian
+---
+> Caspar/M
 > Casper/M
-1776a2749
+> Caspian/M
 > Cass/M
-1777a2751,2752
+1778c2777,2782
+< Cassatt
+---
 > Cassandre/M
 > Cassandry/M
-1778a2754,2756
+> Cassatt/M
 > Cassaundra/M
 > Cassey/M
 > Cassi/M
-1781a2760,2761
+1781a2786,2787
 > Cassondra/M
 > Cassy/M
-1791a2772
+1785c2791
+< Castlereagh
+---
+> Castlereagh/M
+1788c2794
+< Castro
+---
+> Castro/M
+1791a2798
 > Catarina/M
-1792a2774,2775
+1792a2800,2801
 > Cate/M
 > Caterina/M
-1793a2777,2779
+1793a2803,2805
 > Catha/M
 > Catharina/M
 > Catharine/M
-1795c2781,2784
+1795c2807,2811
 < Cather
 ---
 > Cathe/MR
 > Cathee/M
+> Cather/M
 > Catherin/M
 > Catherina/M
-1796a2786,2787
+1796a2813,2814
 > Cathi/M
 > Cathie/M
-1797a2789
+1797a2816
 > Cathlene/M
-1799a2792,2793
+1799a2819,2820
 > Cathrin/M
 > Cathrine/M
-1801a2796,2798
+1802,1803c2823,2833
+< Catiline
+< Cato
+---
 > Cathyleen/M
 > Cati/M
 > Catie/M
-1802a2800,2803
+> Catiline/M
 > Catina/M
 > Catlaina/M
 > Catlee/M
 > Catlin/M
-1803a2805,2806
+> Cato/M
 > Catrina/M
 > Catriona/M
-1807a2811
+1806,1807c2836,2838
+< Catt
+< Catullus
+---
+> Catt/M
+> Catullus/M
 > Caty/M
-1814a2819
+1811,1815c2842,2848
+< Cauchy
+< Cavendish
+< Cavour
+< Caxton
+< Cayenne
+---
+> Cauchy/M
+> Cavendish/M
+> Cavour/M
+> Caxton/M
 > Caye/M
-1815a2821
+> Cayenne/M
 > Cayla/M
-1818a2825,2826
+1818a2852,2853
 > Caz/M
 > Cazzie/M
-1819a2828
+1819a2855
 > Cchaddie/M
-1824a2834
+1824a2861
 > Cece/M
-1827a2838
+1826c2863
+< Cecil
+---
+> Cecil/M
+1828c2865,2869
+< Cecilia
+---
 > Ceciley/M
-1828a2840,2842
+> Cecilia/M
 > Cecilio/M
 > Cecilius/M
 > Cecilla/M
-1829a2844
+1829a2871
 > Ced/M
-1830a2846,2849
+1830a2873,2876
 > Ceil/M
 > Cele/M
 > Celene/M
 > Celesta/M
-1832a2852,2856
+1832a2879,2883
 > Celestia/M
 > Celestina/M
 > Celestine/M
 > Celestyn/M
 > Celestyna/M
-1833a2858
+1833a2885
 > Celie/M
-1834a2860,2865
+1835,1836c2887,2895
+< Cellini
+< Celsius
+---
 > Celinda/M
 > Celine/M
 > Celinka/M
 > Celisse/M
 > Celka/M
 > Celle/M
-1835a2867
+> Cellini/M
 > Cello/M
-1850a2883
+> Celsius/M
+1843c2902
+< Cepheid
+---
+> Cepheid/M
+1846c2905
+< Cerenkov
+---
+> Cerenkov/M
+1850a2910
 > Cesare/M
-1851a2885
+1852c2912,2913
+< Cesarian
+---
 > Cesaro/M
-1853a2888
+> Cesarian/M
+1854c2915,2916
+< Cetus
+---
 > Cesya/M
-1860c2895
+> Cetus/M
+1857c2919
+< Cezanne
+---
+> Cezanne/M
+1859,1860c2921,2922
+< Ch'in
 < Ch/N
 ---
+> Ch'in/M
 > Ch/NRS
-1862a2898,2900
+1862a2925,2927
 > Chadd/M
 > Chaddie/M
 > Chaddy/M
-1865a2904
+1864,1865c2929,2931
+< Chadwick
+< Chagall
+---
+> Chadwick/M
+> Chagall/M
 > Chaim/M
-1870a2910
+1869c2935
+< Chaldean
+---
+> Chaldean/M
+1871,1874c2937,2941
+< Chamberlain
+< Chambers
+< Champlain
+< Champollion
+---
 > Chalmers
-1877a2918,2920
+> Chamberlain/M
+> Chambers/M
+> Champlain/M
+> Champollion/M
+1878,1879c2945,2949
+< Chandigarh
+< Chandler
+---
 > Chancey/M
 > Chanda/M
 > Chandal/M
-1883a2927
+> Chandigarh/M
+> Chandler/M
+1882c2952
+< Chandragupta
+---
+> Chandragupta/M
+1884c2954,2955
+< Chanel
+---
 > Chane/M
-1888a2933,2935
+> Chanel/M
+1887,1889c2958,2963
+< Changchun
+< Changsha
+< Chantilly
+---
+> Changchun/M
+> Changsha/M
 > Channa/M
 > Chantal/M
 > Chantalle/M
-1895a2943
+> Chantilly/M
+1892,1893c2966,2967
+< Chaplin
+< Chapman
+---
+> Chaplin/M
+> Chapman/M
+1895a2970
 > Chara
-1897a2946,2952
+1897a2973,2979
 > Charil/M
 > Charin/M
 > Chariot/M
-> Charis
+> Charis/M
 > Charissa/M
 > Charisse/M
 > Charita/M
-1898a2954,2956
+1898a2981,2983
 > Charla/M
 > Charlean/M
 > Charleen/M
-1899a2958
+1899a2985
 > Charlena/M
-1904a2964,2966
+1903,1904c2989,2993
+< Charley
+< Charlie
+---
+> Charley/M
+> Charlie/M
 > Charline/M
 > Charlot/M
 > Charlotta/M
-1906a2969,2970
-> Charlton
+1906a2996,2997
+> Charlton/M
 > Charmain/M
-1907a2972,2973
+1907a2999,3000
 > Charmane/M
 > Charmian/M
-1908a2975,2977
+1908a3002,3004
 > Charmine/M
 > Charmion/M
 > Charo/M
-1913a2983,2984
+1912c3008
+< Chartres
+---
+> Chartres/M
+1914c3010,3012
+< Chase
+---
 > Charyl/M
-> Chas
-1915a2987
+> Chas/M
+> Chase/M
+1915a3014
 > Chastity/M
-1921a2994
+1920c3019
+< Chatterton
+---
+> Chatterton/M
+1921a3021
 > Chaunce/M
-1935a3009
+1923c3023
+< Chautauqua
+---
+> Chautauqua/M
+1927c3027
+< Chechen
+---
+> Chechen/M
+1929c3029
+< Cheddar
+---
+> Cheddar/M
+1933c3033
+< Cheever
+---
+> Cheever/M
+1936c3036,3040
+< Chelsea
+---
 > Chelsae/M
-1936a3011,3013
+> Chelsea/M
 > Chelsey/M
 > Chelsie/M
 > Chelsy/M
-1942a3020,3021
+1942c3046,3048
+< Cheops
+---
+> Cheops/M
 > Chere/M
 > Cherey/M
-1943a3023,3025
+1943a3050,3052
 > Cherianne/M
 > Cherice/M
 > Cherida/M
-1944a3027,3032
+1944a3054,3059
 > Cherilyn/M
 > Cherilynn/M
 > Cherin/M
 > Cherise/M
 > Cherish/M
 > Cherlyn/M
-1948a3037,3038
+1948a3064,3065
 > Cherri/M
 > Cherrita/M
-1949a3040,3041
+1949a3067,3068
 > Chery/M
 > Cherye/M
-1952a3045
+1951,1952c3070,3072
+< Chesapeake
+< Cheshire
+---
+> Chesapeake/M
+> Cheshire/M
 > Cheslie/M
-1955a3049,3051
+1954,1956c3074,3079
+< Chesterfield
+< Chesterton
+< Chevalier
+---
+> Chesterfield/M
+> Chesterton/M
 > Cheston/M
 > Chet/M
 > Chev/M
-1963a3060
+> Chevalier/M
+1964,1965c3087,3090
+< Chiba
+< Chibcha
+---
 > Chiarra/M
-1965a3063
+> Chiba/M
+> Chibcha/M
 > Chic/M
-1969a3068
+1967,1969c3092,3095
+< Chicagoan
+< Chicana
+< Chicano
+---
+> Chicagoan/M
+> Chicana/M
+> Chicano/M
 > Chick/M
-1970a3070,3071
+1970a3097,3098
 > Chickie/M
 > Chicky/M
-1971a3073
+1971a3100
 > Chico/M
-1974a3077
+1974a3104
 > Chilton/M
-1982a3086
+1980c3110
+< Chinatown
+---
+> Chinatown/M
+1982a3113
 > Chip/M
-1985a3090
+1985a3117
 > Chiquia/M
-1991a3097
+1987c3119
+< Chirico
+---
+> Chirico/M
+1990c3122
+< Chittagong
+---
+> Chittagong/M
+1992c3124,3127
+< Chloe
+---
 > Chlo/M
-1992a3099,3100
+> Chloe/M
 > Chloette/M
 > Chloris/M
-2001c3109,3112
+1994,1995c3129,3130
+< Chomsky
+< Chongqing
+---
+> Chomsky/M
+> Chongqing/M
+1998c3133
+< Chou
+---
+> Chou/M
+2001c3136,3139
 < Christ/MS
 ---
 > Chrisse/M
 > Chrissie/M
 > Chrissy/M
 > Christ/MNS
-2002a3114,3118
+2003,2004c3141,3150
+< Christchurch
+< Christendom/SM
+---
 > Christabel/M
 > Christabella/M
 > Christal/M
 > Christalle/M
 > Christan/M
-2003a3120,3122
+> Christchurch/M
 > Christean/M
 > Christel/M
 > Christen/M
-2007a3127,3128
+> Christendom/MS
+2007a3154,3155
 > Christiana/M
 > Christiane/M
-2009c3130,3131
+2009,2011c3157,3161
 < Christianize
+< Christie
+< Christina
 ---
 > Christianize/DSG
 > Christiano/M
-2010a3133
+> Christie/M
 > Christin/M
-2016a3140,3141
+> Christina/M
+2016a3167,3168
 > Christoffer/M
 > Christoforo/M
-2017a3143,3144
+2017a3170,3171
 > Christoph/MR
-> Christophe
-2019c3146,3150
+> Christophe/M
+2019c3173,3177
 < Christy
 ---
 > Christophorus/M
@@ -1791,43 +3406,74 @@
 > Christye/M
 > Christyna/M
 > Chrisy/M
-2020a3152,3153
+2020a3179,3180
 > Chrotoem/M
 > Chrysa/M
-2023a3157,3159
+2022c3182
+< Chrysostom
+---
+> Chrysostom/M
+2023a3184,3186
 > Chryste/M
 > Chrystel/M
 > Chucho/M
-2033a3170
+2025,2026c3188,3189
+< Chukchi
+< Chumash
+---
+> Chukchi/M
+> Chumash/M
+2029c3192
+< Church
+---
+> Church/M
+2033c3196,3197
+< Ci
+---
+> Ci/M
 > Cicely/M
-2034a3172
+2035c3199,3202
+< Cid
+---
 > Cicily/M
-2035a3174,3175
+> Cid/M
 > Ciel/M
 > Cilka/M
-2037a3178,3180
+2037c3204,3207
+< Cincinnati
+---
+> Cincinnati/M
 > Cinda/M
 > Cindee/M
 > Cindelyn/M
-2038a3182,3184
+2038a3209,3211
 > Cindi/M
 > Cindie/M
 > Cindra/M
-2041a3188
+2041c3214,3215
+< Cinerama
+---
+> Cinerama/M
 > Cinnamon/M
-2043a3191,3193
+2043a3218,3220
 > Cirillo/M
 > Cirilo/M
 > Ciro/M
-2044a3195,3196
+2044a3222,3223
 > Cissiee/M
 > Cissy/M
-2048a3201
+2048a3228
 > Claiborn/M
-2056a3210,3211
+2057c3237,3239
+< Clare
+---
 > Clarabelle/M
 > Clarance/M
-2059a3215,3221
+> Clare/M
+2059c3241,3248
+< Clarendon
+---
+> Clarendon/M
 > Claresta/M
 > Clareta/M
 > Claretta/M
@@ -1835,144 +3481,295 @@
 > Clarey/M
 > Clari/M
 > Claribel/M
-2060a3223,3225
+2060a3250,3252
 > Clarie/M
 > Clarinda/M
 > Clarine/M
-2061a3227,3228
+2062c3254,3256
+< Clark
+---
 > Clarisse/M
 > Clarita/M
-2063a3231
+> Clark/M
+2063a3258
 > Clary/M
-2064a3233,3235
+2064a3260,3262
 > Claudell/M
 > Claudelle/M
 > Claudetta/M
-2066a3238,3241
+2066a3265,3268
 > Claudian/M
 > Claudianus/M
 > Claudie/M
 > Claudina/M
-2073a3249,3252
+2071,2073c3273,3279
+< Clausewitz
+< Clausius
+< Clay
+---
+> Clausewitz/M
+> Clausius/M
+> Clay/M
 > Clayborn/M
 > Clayborne/M
 > Claybourne/M
 > Clayson/M
-2074a3254
+2074a3281
 > Clea/M
-2075a3256
+2075a3283
 > Cleavland/M
-2076a3258
+2077c3285,3287
+< Clemenceau
+---
 > Clemence/M
-2078a3261,3263
+> Clemenceau/M
+> Clemens/M
+2078a3289,3292
 > Clemente/M
+> Clementes/M
 > Clementia/M
 > Clementina/M
-2079a3265,3267
+2080c3294,3297
+< Clemons
+---
 > Clementius/M
 > Clemmie/M
 > Clemmy/M
-2082a3271
-> Cleon
-2083a3273,3277
+> Clemons/M
+2082a3300
+> Cleon/M
+2083a3302,3306
 > Clerc/M
 > Clerissa/M
-> Cletis
+> Cletis/M
 > Cletus/M
 > Cleve/M
-2084a3279,3280
+2084a3308,3309
 > Clevey/M
 > Clevie/M
-2088a3285
+2087c3312
+< Clifford
+---
+> Clifford/M
+2088a3314
 > Clim/M
-2092a3290,3291
+2092a3319,3321
+> Clive/M
 > Clo/M
 > Cloe/M
-2093a3293
+2093a3323
 > Cloris/M
-2095a3296
+2094a3325
+> Closure/M
+2095a3327
 > Clotilda/M
-2097a3299
+2098c3330,3331
+< Clyde
+---
 > Cly/M
-2100a3303,3304
+> Clyde/M
+2100c3333,3335
+< Clytemnestra
+---
+> Clytemnestra/M
 > Clyve/M
 > Clywd/M
-2103c3307,3308
+2103c3338,3339
 < Co/M
 ---
 > Co/SM
 > Cob/M
-2105a3311,3312
+2105,2108c3341,3346
+< Cobb
+< Cochabamba
+< Cochin
+< Cochise
+---
+> Cobb/M
 > Cobbie/M
 > Cobby/M
-2112a3320,3322
+> Cochabamba/M
+> Cochin/M
+> Cochise/M
+2111c3349
+< Cocteau
+---
+> Cocteau/M
+2113c3351,3354
+< Cody
+---
 > Codee/M
 > Codi/M
 > Codie/M
-2118a3329
+> Cody/M
+2116,2119c3357,3361
+< Cohan
+< Cohen
+< Coimbatore
+< Cointreau
+---
+> Cohan/M
+> Cohen/M
+> Coimbatore/M
 > Cointon/M
-2121a3333,3334
+> Cointreau/M
+2121c3363,3365
+< Col
+---
+> Col/M
 > Colan/M
-> Colas
-2126a3340
+> Colas/M
+2123,2124c3367,3368
+< Colby
+< Cole
+---
+> Colby/M
+> Cole/M
+2126a3371
 > Colene/M
-2127a3342,3343
-> Colet
+2128c3373,3375
+< Colette
+---
+> Colet/M
 > Coletta/M
-2132a3349,3352
+> Colette/M
+2132a3380,3383
 > Collen/M
 > Collete/M
 > Collette/M
 > Collie/M
-2134a3355,3357
+2134a3386,3389
+> Collins/M
 > Colline/M
 > Colly/RM
 > Colman/M
-2150a3374
+2145c3400
+< Colosseum
+---
+> Colosseum/M
+2147c3402
+< Coltrane
+---
+> Coltrane/M
+2149c3404
+< Columbine
+---
+> Columbine/M
+2150a3406
 > Colver/M
-2167a3392
+2155,2156c3411,3412
+< Comintern
+< Commons
+---
+> Comintern/M
+> Commons/M
+2161c3417
+< Como
+---
+> Como/M
+2165c3421
+< Compton
+---
+> Compton/M
+2167c3423,3424
+< Comte
+---
+> Comte/M
 > Con
-2169a3395
+2170c3427,3428
+< Concepcion
+---
 > Conant/M
-2171a3398,3399
+> Concepcion/M
+2171a3430,3431
 > Concettina/M
 > Conchita/M
-2173a3402
+2173,2175c3433,3436
+< Concorde
+< Condillac
+< Condorcet
+---
+> Concorde/M
 > Concordia/M
-2195a3425,3426
+> Condillac/M
+> Condorcet/M
+2182c3443
+< Cong
+---
+> Cong/M
+2189c3450
+< Congreve
+---
+> Congreve/M
+2191c3452
+< Conn/R
+---
+> Conn/MR
+2193c3454
+< Connemara
+---
+> Connemara/M
+2195a3457,3458
 > Conney/M
 > Conni/M
-2198c3429,3430
+2198,2199c3461,3466
 < Connors
+< Conrad
 ---
 > Connor/SM
+> Connors/M
 > Conny/M
-2199a3432,3433
+> Conrad/M
 > Conrade/M
 > Conrado/M
-2200a3435,3436
+2200a3468,3469
 > Conroy/M
 > Consalve/M
-2201a3438
+2202,2204c3471,3481
+< Constable
+< Constance
+< Constantine
+---
 > Consolata/M
-2203a3441,3446
+> Constable/M
+> Constance/M
 > Constancia/M
 > Constancy/M
 > Constanta/M
 > Constantia
 > Constantin/M
 > Constantina/M
-2204a3448
+> Constantine/M
 > Constantino/M
-2206a3451
+2206a3484
 > Consuela/M
-2213a3459
+2209c3487
+< Continental
+---
+> Continental/M
+2211,2212c3489,3490
+< Conway
+< Cook
+---
+> Conway/M
+> Cook/M
+2213a3492
 > Cookie/M
-2216c3462
+2216c3495
 < Cooper
 ---
 > Coop/MR
-2230a3477,3489
+2222c3501
+< Copernican
+---
+> Copernican/M
+2224,2225c3503,3504
+< Copland
+< Copley
+---
+> Copland/M
+> Copley/M
+2230a3510,3522
 > Corabel/M
 > Corabella/M
 > Corabelle/M
@@ -1984,15 +3781,18 @@
 > Corbett/M
 > Corbie/M
 > Corbin/M
-> Corby
+> Corby/M
 > Cord/M
-2231a3491,3495
+2232c3524,3529
+< Cordilleras
+---
 > Cordelie/M
 > Cordell/M
 > Cordey/M
 > Cordi/M
 > Cordie/M
-2233a3498,3505
+> Cordilleras/M
+2233a3531,3538
 > Cordula/M
 > Cordy/M
 > Coreen/M
@@ -2001,71 +3801,156 @@
 > Corene/M
 > Coretta/M
 > Corette/M
-2235a3508,3510
+2235c3540,3543
+< Corfu
+---
+> Corfu/M
 > Cori/M
 > Corie/M
 > Corilla/M
-2237a3513
+2237a3546
 > Corinna/M
-2242a3519,3520
+2240,2241c3549,3551
+< Corinthian/SM
+< Coriolanus
+---
+> Corinthian/MS
+> Corinthians/M
+> Coriolanus/M
+2243c3553,3555
+< Cork
+---
 > Coriss/M
 > Corissa/M
-2244a3523,3524
+> Cork/M
+2244a3557,3558
 > Corliss/M
 > Corly/M
-2245a3526
+2246c3560,3562
+< Corneille
+---
 > Cornall/M
-2246a3528
+> Corneille/M
 > Cornela/M
-2249a3532,3534
+2249a3566,3568
 > Cornelle/M
 > Corney/M
 > Cornie/M
-2253a3539
+2253,2255c3572,3575
+< Cornwallis
+< Coronado
+< Corot
+---
+> Cornwallis/M
 > Corny/M
-2257a3544,3549
+> Coronado/M
+> Corot/M
+2257c3577,3583
+< Correggio
+---
+> Correggio/M
 > Correna/M
 > Correy/M
 > Corri/M
 > Corrianne/M
 > Corrie/M
 > Corrina/M
-2258a3551,3552
+2258a3585,3586
 > Corrinne/M
 > Corry/M
-2260a3555
+2260c3588,3589
+< Corsican
+---
+> Corsican/M
 > Cort/M
-2262a3558
+2262a3592
 > Cortie/M
-2263a3560,3561
+2263a3594,3595
 > Cortney/M
 > Corty/M
-2268a3567,3571
+2269c3601,3608
+< Cossack
+---
 > Cosetta/M
 > Cosette/M
 > Cosimo/M
 > Cosme/M
 > Cosmo/M
-2269a3573,3574
+> Cossack/M
 > Costa/M
 > Costanza/M
-2281a3587,3589
+2274c3613
+< Cotonou
+---
+> Cotonou/M
+2278c3617
+< Coulomb
+---
+> Coulomb/M
+2280,2281c3619,3623
+< Couperin
+< Courbet
+---
+> Couperin/M
+> Courbet/M
 > Court/M
 > Courtenay/M
 > Courtnay/M
-2289a3598
+2283c3625
+< Cousteau
+---
+> Cousteau/M
+2285,2288c3627,3630
+< Coward
+< Cowley
+< Cowper
+< Cox
+---
+> Coward/M
+> Cowley/M
+> Cowper/M
+> Cox/M
+2289a3632
 > Cozmo/M
-2294a3604,3605
+2293c3636
+< Crabbe
+---
+> Crabbe/M
+2295,2298c3638,3643
+< Craig
+< Cranach
+< Crane
+< Cranmer
+---
 > Craggie/M
 > Craggy/M
-2307a3619,3620
+> Craig/M
+> Cranach/M
+> Crane/M
+> Cranmer/M
+2307a3653,3654
 > Creigh/M
 > Creight/M
-2318a3632
+2310c3657,3658
+< Creon
+---
+> Creon/M
+> Cressida/M
+2315,2316c3663,3664
+< Crichton
+< Crick
+---
+> Crichton/M
+> Crick/M
+2318,2319c3666,3669
+< Crimean
+< Criollo
+---
+> Crimean/M
 > Crin/M
-2319a3634
+> Criollo/M
 > Cris/M
-2320a3636,3646
+2320a3671,3681
 > Crissie/M
 > Crissy/M
 > Crista/M
@@ -2077,46 +3962,97 @@
 > Cristiano/M
 > Cristie/M
 > Cristin/M
-2321a3648,3651
+2321a3683,3686
 > Cristine/M
 > Cristionna/M
 > Cristobal/M
 > Cristy/M
-2345a3676
+2325,2327c3690,3692
+< Croce
+< Crockett
+< Croesus
+---
+> Croce/M
+> Crockett/M
+> Croesus/M
+2329c3694
+< Cromwellian
+---
+> Cromwellian/M
+2333,2335c3698,3700
+< Crookes
+< Crosby
+< Cross
+---
+> Crookes/M
+> Crosby/M
+> Cross/M
+2339c3704
+< Cruikshank
+---
+> Cruikshank/M
+2341c3706
+< Crusades
+---
+> Crusades/M
+2345a3711
 > Crysta/M
-2346a3678
+2346a3713
 > Crystie/M
-2349a3682
+2349c3716,3717
+< Ctesiphon
+---
+> Ctesiphon/M
 > Cthrine/M
-2356a3690,3691
+2355,2356c3723,3726
+< Cuisinart
+< Culbertson
+---
+> Cuisinart/M
+> Culbertson/M
 > Cull/MN
 > Cullan/M
-2357a3693,3697
+2357a3728,3732
 > Culley/M
 > Cullie/M
 > Cullin/M
 > Cully/M
 > Culver/M
-2363a3704
+2359c3734
+< Cummings
+---
+> Cummings/M
+2364,2365c3739,3745
+< Curie
+< Curitiba
+---
 > Curcio/M
-2365a3707,3710
+> Curie/M
+> Curitiba/M
 > Curr/M
 > Curran/M
 > Currey/M
 > Currie/MR
-2367c3712
+2367c3747
 < Curry/R
 ---
-> Curry
-2368a3714
+> Curry/RM
+2368a3749
 > Curtice/M
-2372a3719,3720
+2370c3751
+< Custer
+---
+> Custer/M
+2372c3753,3755
+< Cuzco
+---
+> Cuzco/M
 > Cy
 > Cyb/M
-2373a3722,3723
+2373a3757,3758
 > Cybil/M
 > Cybill/M
-2378a3729,3735
+2378a3764,3770
 > Cymbre/M
 > Cynde/M
 > Cyndi/M
@@ -2124,31 +4060,50 @@
 > Cyndie/M
 > Cyndy/M
 > Cynthea/M
-2379a3737,3738
+2379a3772,3773
 > Cynthie/M
 > Cynthy/M
-2384a3744,3745
+2384c3778,3780
+< Cyril
+---
+> Cyril/M
 > Cyrill/M
 > Cyrille/M
-2385a3747
+2386c3782,3783
+< Cyrus
+---
 > Cyrillus/M
-2393c3755,3756
+> Cyrus/M
+2390c3787
+< Czechoslovakian/MS
+---
+> Czechoslovakian/SM
+2392,2393c3789,3791
+< Czerny
 < D/M
 ---
+> Czerny/M
 > D'Arcy
 > D/MN
-2418a3782
+2405a3804
+> DHS
+2407a3807
+> DMCA
+2418a3819
 > DRM
-2422a3787
-> DVR/S
-2424a3790
+2422a3824
+> DVR/SM
+2424a3827
 > Dacey/M
-2425a3792,3793
+2425a3829,3830
 > Dacia
 > Dacie/M
-2426a3795
+2426a3832
 > Dacy/M
-2429a3799,3805
+2430,2431c3836,3845
+< Daguerre
+< Dagwood
+---
 > Dael/M
 > Daffi/M
 > Daffie/M
@@ -2156,221 +4111,382 @@
 > Dag/M
 > Dagmar/M
 > Dagny/M
-2431a3808
+> Daguerre/M
+> Dagwood/M
 > Dahlia/M
-2432a3810
+2432a3847
 > Daile/M
-2433a3812,3814
+2434c3849,3852
+< Daisy
+---
 > Daisey/M
 > Daisi/M
 > Daisie/M
-2437a3819
+> Daisy/M
+2437,2438c3855,3859
+< Dakotan
+< Dale
+---
+> Dakotan/M
 > Dal/M
-2438a3821
+> Dalai
+> Dale/M
 > Dalenna/M
-2440c3823,3824
+2440c3861,3862
 < Dali
 ---
 > Dali/S
 > Dalia/M
-2441a3826,3827
+2441a3864,3865
 > Dalila/M
 > Dall/M
-2442a3829,3830
+2442a3867,3868
 > Dalli/MS
 > Dallon/M
-2444a3833,3835
+2444a3871,3873
 > Daloris/M
 > Dalston/M
 > Dalt/M
-2445a3837,3838
+2445a3875,3876
 > Damara/M
 > Damaris/M
-2448a3842
+2447c3878
+< Dame/N
+---
+> Dame/MN
+2449c3880,3881
+< Damien
+---
 > Damiano/M
-2450a3845
+> Damien/M
+2451c3883,3884
+< Damocles
+---
 > Damita/M
-2457a3853,3855
+> Damocles/M
+2453c3886
+< Dan
+---
+> Dan/M
+2455c3888
+< Danae
+---
+> Danae/M
+2457c3890,3893
+< Danelaw
+---
+> Danelaw/M
 > Danell/M
 > Danella/M
 > Danette/M
-2458a3857,3858
+2458a3895,3896
 > Dani/M
 > Dania/M
-2459a3860,3862
+2459a3898,3900
 > Danica/M
 > Danice/M
 > Danie/M
-2460a3864,3866
+2460a3902,3905
 > Daniela/M
 > Daniele/M
+> Daniels/M
 > Daniella/M
-2461a3868,3869
+2461a3907,3908
 > Danika/M
 > Danila/M
-2462a3871,3875
+2462a3910,3914
 > Danit/M
 > Danita/M
 > Danna/M
 > Dannel/M
 > Danni/M
-2464a3878
+2464a3917
 > Dannye/M
-2469a3884,3888
+2467c3920
+< Danton
+---
+> Danton/M
+2469c3922,3927
+< Danubian
+---
+> Danubian/M
 > Danya/M
 > Danyelle/M
 > Danyette/M
 > Daphene/M
 > Daphna/M
-2470a3890,3894
+2470a3929,3933
 > Dar/MNH
 > Dara/M
 > Darb/M
 > Darbee/M
 > Darbie/M
-2471a3896,3899
+2471a3935,3938
 > Darcee/M
 > Darcey/M
 > Darci/M
 > Darcie/M
-2472a3901
+2472a3940
 > Darda/M
-2474a3904,3906
+2474c3942,3945
+< Dare
+---
+> Dare/M
 > Dareen/M
 > Darell/M
 > Darelle/M
-2476a3909,3912
+2476c3947,3951
+< Darfur
+---
+> Darfur/M
 > Dari/M
 > Daria/M
 > Darice/M
 > Darill/M
-2481a3918
+2479,2480c3954,3955
+< Darius
+< Darjeeling
+---
+> Darius/M
+> Darjeeling/M
+2481a3957
 > Darleen/M
-2482a3920
+2482a3959
 > Darline/M
-2483a3922,3924
+2483a3961,3963
 > Darlleen/M
 > Darn/M
 > Darnall/M
-2484a3926
+2484a3965
 > Daron/M
-2486a3929
+2486a3968
 > Darrelle/M
-2487a3931
+2487a3970
 > Darrick/M
-2490a3935,3936
+2489c3972
+< Darrow
+---
+> Darrow/M
+2490a3974,3975
 > Darsey/M
 > Darsie/M
-2498a3945
+2492,2493c3977,3978
+< Dartmoor
+< Dartmouth
+---
+> Dartmoor/M
+> Dartmouth/M
+2496c3981
+< Darwinian
+---
+> Darwinian/M
+2498a3984
 > Darya/M
-2499a3947,3952
+2499a3986,3991
 > Daryle/M
 > Daryn/M
 > Dasha/M
 > Dasi/M
 > Dasie/M
 > Dasya/M
-2500a3954
+2500a3993
 > Datha/M
-2502a3957,3958
+2502,2503c3995,3998
+< Daumier
+< Davao
+---
+> Daumier/M
 > Daune/M
 > Dav/MN
-2504a3961,3962
+> Davao/M
+2505c4000,4004
+< Davenport
+---
 > Daveen/M
 > Daven/M
-2505a3964,3965
+> Davenport/M
 > Daveta/M
 > Davey/M
-2506a3967,3969
+2506a4006,4008
 > Davida/M
 > Davidde/M
 > Davide/M
-2507a3971,3974
+2508,2510c4010,4017
+< Davis
+< Davy/S
+< Dawes
+---
 > Davie/MS
+> Davies/M
 > Davin/M
 > Davina/M
 > Davine/M
-2511a3979
+> Davis/M
+> Davy/SM
+> Dawes/M
+2512,2515c4019,4027
+< Dawson
+< Day
+< Dayan
+< Dayton
+---
 > Dawna/M
-2514a3983,3984
+> Dawson/M
+> Day/M
+> Dayan/M
 > Dayle/M
 > Dayna/M
-2515a3986,3987
+> Dayton/M
 > Ddene/M
 > De/RSMN
-2516a3989
+2516a4029
 > DeKalb/M
-2520a3994
+2518c4031
+< Dean
+---
+> Dean/M
+2520a4034
 > Deane/M
-2523a3998,3999
+2523a4038,4039
 > Deb/SM
 > Debbi/M
-2525a4002,4004
+2525a4042,4044
 > Debee/M
 > Debera/M
 > Debi/M
-2526a4006
+2526a4046
 > Debor/M
-2540c4020,4021
+2528c4048
+< Deborah
+---
+> Deborah/M
+2531,2532c4051,4052
+< Debs
+< Debussy
+---
+> Debs/M
+> Debussy/M
+2536c4056
+< Decatur
+---
+> Decatur/M
+2538c4058
+< Deccan
+---
+> Deccan/M
+2540c4060,4061
 < Decker
 ---
 > Deck/MR
 > Dede/M
-2541a4023,4024
+2542c4063,4068
+< Dee
+---
 > Dedie/M
 > Dedra/M
-2542a4026,4028
+> Dee/M
 > Deeann/M
 > Deeanne/M
 > Deedee/M
-2543a4030
+2543a4070
 > Deerdre/M
-2544a4032
+2545,2546c4072,4075
+< Defoe
+< Degas
+---
 > Deeyn/M
-2546a4035
+> Defoe/M
+> Degas/M
 > Dehlia/M
-2548a4038
+2548,2550c4077,4080
+< Deimos
+< Deirdre
+< Deity
+---
+> Deimos/M
 > Deina/M
-2552c4042,4043
+> Deirdre/M
+> Deity/M
+2552,2553c4082,4084
 < Del
+< Delacroix
 ---
-> Del/Y
+> Del/YM
 > Dela/M
-2554a4046
+> Delacroix/M
+2554a4086
 > Delainey/M
-2559a4052,4053
+2558c4090
+< Delawarean/MS
+---
+> Delawarean/SM
+2559a4092,4093
 > Delcina/M
 > Delcine/M
-2565a4060
+2561c4095
+< Delgado
+---
+> Delgado/M
+2564c4098
+< Delibes
+---
+> Delibes/M
+2565a4100
 > Delila/M
-2567a4063
+2567,2568c4102,4104
+< Delilahs
+< Delius
+---
+> Delilahs/M
 > Delinda/M
-2570a4067
+> Delius/M
+2570a4107
 > Delly/M
-2574a4072,4074
+2574c4111,4114
+< Delmonico
+---
+> Delmonico/M
 > Delmor/M
 > Delmore/M
 > Delora/M
-2575a4076
+2575a4116
 > Deloria/M
-2578a4080,4081
+2578c4119,4121
+< Delphic
+---
+> Delphic/M
 > Delphine/M
 > Delphinia/M
-2584a4088,4091
+2580c4123
+< Delta
+---
+> Delta/M
+2584a4128,4131
 > Demetra/M
 > Demetre/M
 > Demetri/SM
 > Demetria/M
-2590a4098
+2589c4136
+< Democritus
+---
+> Democritus/M
+2591c4138,4139
+< Dempsey
+---
 > Demott/M
-2593a4102
+> Dempsey/M
+2594c4142,4143
+< Deneb
+---
 > Dene
-2597c4106,4107
+> Deneb/M
+2597c4146,4148
 < Denis
 ---
 > Deni/SM
 > Denice/M
-2600c4110,4115
+> Denis/M
+2600c4151,4157
 < Dennis
 ---
 > Denna/M
@@ -2378,156 +4494,276 @@
 > Denney/M
 > Denni/MS
 > Dennie/M
+> Dennis/M
 > Dennison/M
-2602a4118,4120
+2602a4160,4162
 > Deny/M
-> Denys
+> Denys/M
 > Denyse/M
-2603a4122
+2603a4164
 > Deonne/M
-2604a4124
+2605c4166,4167
+< Derby
+---
 > Der/M
-2607a4128,4130
+> Derby/M
+2607a4170,4172
 > Derk/M
 > Dermot/M
 > Derrek/M
-2609a4133,4138
+2609a4175,4180
 > Derrik/M
 > Derril/M
 > Derron/M
-> Derry
+> Derry/M
 > Derward/M
 > Derwin/M
-2611a4141,4142
+2611a4183,4184
 > Desi/M
 > Desirae/M
-2612a4144
+2612a4186
 > Desiri/M
-2613a4146
+2613a4188
 > Desmund/M
-2616a4150,4152
+2616a4192,4194
 > Dev/M
 > Deva/M
 > Devan/M
-2620a4157,4161
+2620a4199,4203
 > Devina/M
 > Devinne/M
 > Devland/M
 > Devlen/M
 > Devlin/M
-2621a4163
+2621a4205
 > Devondra/M
-2622a4165,4170
+2622a4207,4212
 > Devonna/M
 > Devonne/M
 > Devora/M
 > Devy/M
 > Dew/M
 > Dewain/M
-2625a4174
+2625a4216
 > Dewie/M
-2626a4176
+2626a4218
 > Dex/M
-2628a4179
+2628c4220,4221
+< Dexter
+---
+> Dexter/M
 > Dhabi
-2634a4186
+2631c4224
+< Di/S
+---
+> Di/S/M
+2633,2634c4226,4228
+< DiMaggio
+< Diaghilev
+---
+> DiMaggio/M
+> Diaghilev/M
 > Diahann/M
-2635a4188
+2635a4230
 > Dian/M
-2636a4190
+2636a4232
 > Diandra/M
-2637a4192
+2637a4234
 > Dianemarie/M
-2640a4196,4197
+2640a4238,4239
 > Diannne/M
 > Diarmid/M
-2646a4204
+2643,2644c4242,4244
+< Diaz
+< Dick/X
+---
+> Diaz/M
+> Dick/XM
+> Dickens/M
+2647c4247,4248
+< Dickinson
+---
 > Dickie/M
-2648a4207
+> Dickinson/M
+2648a4250
 > Dicky/M
-2650a4210
+2650c4252,4253
+< Diderot
+---
+> Diderot/M
 > Didi/M
-2655a4216,4217
+2653c4256
+< Diefenbaker
+---
+> Diefenbaker/M
+2655a4259,4260
 > Diena/M
 > Dierdre/M
-2656a4219
+2657c4262,4263
+< Dietrich
+---
 > Dieter/M
-2659a4223
+> Dietrich/M
+2659c4265,4266
+< Dijon
+---
+> Dijon/M
 > Dilan/M
-2660a4225
+2660a4268
 > Dill/M
-2661a4227
+2661a4270
 > Dillie/M
-2663a4230,4232
+2663a4273,4275
 > Dilly/M
 > Dimitri/M
 > Dimitry/M
-2665a4235,4236
+2665c4277,4279
+< Dinah
+---
+> Dinah/M
 > Dinnie/M
 > Dinny/M
-2669a4241,4243
-> Dione
+2667,2668c4281,4282
+< Diocletian
+< Diogenes
+---
+> Diocletian/M
+> Diogenes/M
+2669a4284,4286
+> Dione/M
 > Dionis/M
 > Dionisio/M
-2683a4258
+2671c4288
+< Dionysian
+---
+> Dionysian/M
+2674c4291
+< Dior
+---
+> Dior/M
+2677,2678c4294,4295
+< Dirac
+< Dirichlet
+---
+> Dirac/M
+> Dirichlet/M
+2681,2683c4298,4301
+< Disney
+< Disneyland
+< Disraeli
+---
+> Disney/M
+> Disneyland/M
+> Disraeli/M
 > Dita/M
-2697a4273
+2686c4304
+< Dix
+---
+> Dix/M
+2688c4306
+< Dixiecrat
+---
+> Dixiecrat/M
+2695c4313
+< Dnepropetrovsk
+---
+> Dnepropetrovsk/M
+2697c4315,4316
+< Dniester
+---
+> Dniester/M
 > Dniren/M
-2702a4279
+2700c4319
+< Dobro
+---
+> Dobro/M
+2702a4322
 > Dode/M
-2704a4282,4283
+2704a4325,4326
 > Dodi/M
 > Dodie/M
-2706a4286
+2707c4329,4330
+< Doe
+---
 > Dody/M
-2710a4291,4294
+> Doe/M
+2709c4332
+< Dolby
+---
+> Dolby/M
+2710a4334,4337
 > Dolf/M
 > Doll/M
 > Dolley/M
 > Dolli/M
-2713a4298,4303
+2713a4341,4346
 > Dolorita/SM
 > Dolph/M
 > Dom
 > Domenic/M
 > Domenico/M
 > Domeniga/M
-2714a4305
+2714a4348
 > Dominga/M
-2716a4308
+2717c4351,4352
+< Dominic
+---
 > Domini/M
-2720a4313
+> Dominic/M
+2720a4356
 > Dominik/M
-2724a4318
+2723c4359
+< Domitian
+---
+> Domitian/M
+2725c4361,4362
+< Dona
+---
 > Don't
-2726a4321
+> Dona/M
+2726a4364
 > Donal/M
-2728a4324,4325
+2729c4367,4373
+< Donatello
+---
 > Donall/M
 > Donalt/M
-2729a4327,4330
+> Donatello/M
 > Donaugh/M
 > Donavon/M
 > Donella/M
 > Donelle/M
-2730a4332,4335
+2730a4375,4378
 > Donetta/M
 > Donia/M
 > Donica/M
 > Donielle/M
-2733a4339
+2733c4381,4382
+< Donna
+---
+> Donna/M
 > Donnamarie/M
-2736a4343
+2736a4386
 > Donni/M
-2744a4352,4356
+2741c4391
+< Doolittle
+---
+> Doolittle/M
+2743c4393
+< Doppler
+---
+> Doppler/M
+2745c4395,4401
+< Dorcas
+---
 > Doralia/M
 > Doralin/M
 > Doralyn/M
 > Doralynn/M
 > Doralynne/M
-2745a4358
+> Dorcas/M
 > Dore/M
-2746a4360,4369
+2746a4403,4412
 > Dorelia/M
 > Dorella/M
 > Dorelle/M
@@ -2538,72 +4774,131 @@
 > Dorey/M
 > Dori/SM
 > Doria/M
-2748a4372,4374
+2748a4415,4417
 > Dorice/M
 > Dorie/M
 > Dorine/M
-2749a4376,4378
+2749a4419,4421
 > Dorisa/M
 > Dorise/M
 > Dorita/M
-2750a4380,4384
+2750a4423,4427
 > Doro/M
 > Dorolice/M
 > Dorolisa/M
 > Dorotea/M
 > Doroteya/M
-2751a4386
+2751a4429
 > Dorothee/M
-2752a4388,4391
+2753c4431,4435
+< Dorset
+---
 > Dorree/M
 > Dorri/SM
 > Dorrie/M
 > Dorry/M
-2754a4394
+> Dorset/M
+2754a4437
 > Dorthea/M
-2756a4397,4398
+2756c4439,4441
+< Dortmund
+---
+> Dortmund/M
 > Dory/M
 > Dosi/M
-2759a4402
+2759a4445
 > Doti/M
-2760a4404,4406
+2760a4447,4449
 > Dotti/M
 > Dottie/M
 > Dotty/M
-2764a4411
+2765,2767c4454,4459
+< Douglas
+< Douglass
+< Douro
+---
 > Dougie/M
-2766a4414
+> Douglas/M
+> Douglass/M
 > Dougy/M
-2767a4416
+> Douro/M
 > Dov/MR
-2771a4421
+2769,2770c4461,4462
+< Dow
+< Downs
+---
+> Dow/M
+> Downs/M
+2772c4464,4465
+< Doyle
+---
 > Doy/M
-2781a4432,4434
+> Doyle/M
+2775c4468
+< Draconian
+---
+> Draconian/M
+2777c4470
+< Drake
+---
+> Drake/M
+2779c4472
+< Drambuie
+---
+> Drambuie/M
+2782c4475,4478
+< Dreiser
+---
 > Dre/M
 > Dreddy/M
 > Dredi/M
-2786a4440,4446
+> Dreiser/M
+2786a4483,4490
 > Drona/M
+> Dropbox/M
 > Dru/M
 > Druci/M
 > Drucie/M
 > Drucill/M
 > Drucy/M
 > Drud/M
-2787a4448,4452
+2787a4492,4496
 > Drugi/M
 > Drusi/M
 > Drusie/M
 > Drusilla/M
 > Drusy/M
-2799a4465
+2789c4498
+< Dryden
+---
+> Dryden/M
+2792c4501
+< DuPont
+---
+> DuPont/M
+2794c4503
+< Dubai
+---
+> Dubai/M
+2799,2800c4508,4512
+< Duchamp
+< Dudley
+---
+> Duchamp/M
 > Dud/M
-2800a4467,4468
+> Dudley/M
 > Duff/M
 > Duffie/M
-2801a4470
+2802c4514,4515
+< Duisburg
+---
 > Dugald/M
-2803a4473,4484
+> Duisburg/M
+2804,2806c4517,4532
+< Dulles
+< Duluth
+< Dumas
+---
 > Dukey/M
 > Dukie/M
 > Duky/M
@@ -2616,143 +4911,248 @@
 > Dulcine/M
 > Dulcinea/M
 > Dulcy/M
-2804a4486
+> Dulles/M
 > Dulsea/M
-2809a4492
+> Duluth/M
+> Dumas/M
+2809,2814c4535,4542
+< Dumpster
+< Dunant
+< Dunbar
+< Duncan
+< Dundee
+< Dunedin
+---
+> Dumpster/M
 > Dun/M
-2811a4495
+> Dunant/M
+> Dunbar/M
 > Dunc/M
-2818a4503,4504
-> Dunstan
+> Duncan/M
+> Dundee/M
+> Dunedin/M
+2818a4547,4548
+> Dunstan/M
 > Dur/R
-2820a4507
+2820a4551
 > Durand/M
-2829a4517
+2823,2824c4554,4555
+< Durban
+< Durer
+---
+> Durban/M
+> Durer/M
+2827,2828c4558,4559
+< Durkheim
+< Duroc
+---
+> Durkheim/M
+> Duroc/M
+2829a4561
 > Durward/M
-2842a4531
+2838c4570
+< Dutchmen
+---
+> Dutchmen/M
+2840,2842c4572,4575
+< Duvalier
+< Dvina
+< Dvorak
+---
+> Duvalier/M
+> Dvina/M
+> Dvorak/M
 > Dwain/M
-2845a4535,4540
+2845a4579,4584
 > Dyan/M
 > Dyana/M
 > Dyane/M
 > Dyann/M
 > Dyanna/M
 > Dyanne/M
-2847a4543,4544
+2847a4587,4588
 > Dyna/M
 > Dynah/M
-2851c4548
+2850,2851c4591,4592
+< Dzungaria
 < E/SM
 ---
+> Dzungaria/M
 > E/SMY
-2853a4551
+2853a4595
 > ECMAScript/M
-2879a4578,4582
+2874c4616
+< ESPN
+---
+> ESPN/M
+2880,2881c4622,4632
+< Eakins
+< Earhart
+---
+> EULA/M
 > Eachelle/M
 > Eada/M
 > Eadie/M
 > Eadith/M
 > Eadmund/M
-2880a4584,4586
+> Eakins/M
 > Eal/M
 > Ealasaid/M
 > Eamon/M
-2884a4591
+> Earhart/M
+2884a4636
 > Earlie/M
-2885a4593
+2885a4638
 > Early/M
-2890a4599,4600
+2890a4644,4645
 > Eartha/M
 > Earvin/M
-2896a4607,4609
+2894c4649
+< Eastman
+---
+> Eastman/M
+2896a4652,4654
 > Eb/MN
 > Eba/M
 > Ebba/M
-2898a4612,4614
+2899,2900c4657,4663
+< Ebert
+< Ebola
+---
 > Ebeneser/M
 > Ebenezer/M
 > Eberhard/M
-2899a4616
+> Ebert/M
 > Eberto/M
-2900a4618
+> Ebola/M
 > Ebonee/M
-2904a4623
+2904c4667,4668
+< Ecclesiastes
+---
+> Ecclesiastes/M
 > Ecma/M
-2911a4631
+2910c4674
+< Ecuadorian/MS
+---
+> Ecuadorian/SM
+2911a4676
 > Eda/M
-2912a4633,4634
+2913c4678,4681
+< Edda
+---
 > Edan/M
 > Edd/M
-2913a4636
+> Edda/M
 > Eddi/M
-2916a4640,4642
+2916a4685,4687
 > Ede
 > Edee/M
 > Edeline/M
-2918a4645
+2918c4689,4690
+< Edgar
+---
+> Edgar/M
 > Edgard/M
-2919a4647,4650
+2919a4692,4695
 > Edi/MH
 > Edie/M
 > Edik/M
 > Edin/M
-2921a4653
+2921a4698
 > Edita/M
-2922a4655,4659
+2922a4700,4704
 > Editha/M
 > Edithe/M
 > Ediva/M
 > Edlin/M
 > Edmon/M
-2926a4664
+2927c4709,4711
+< Edsel
+---
 > Edouard/M
-2927a4666
+> Edsel/M
 > Eduard/M
-2928a4668,4669
+2928a4713,4714
 > Eduino/M
 > Edvard/M
-2933a4675,4677
+2932c4718,4719
+< Edwin
+---
+> Edwards/M
+> Edwin/M
+2933a4721,4723
 > Edy/M
 > Edyth/M
 > Edythe/M
-2936a4681
+2936a4727
 > Efrem/M
-2937a4683,4684
+2937a4729,4730
 > Egan/M
 > Egbert
-2938a4686,4687
+2938a4732,4733
 > Egon/M
 > Egor/M
-2946a4696,4697
+2943,2945c4738,4740
+< Ehrlich
+< Eichmann
+< Eiffel
+---
+> Ehrlich/M
+> Eichmann/M
+> Eiffel/M
+2946a4742,4743
 > Eilis/M
 > Eimile/M
-2948a4700
+2948a4746
 > Eirena/M
-2951a4704,4706
+2950c4748
+< Eisenstein
+---
+> Eisenstein/M
+2952,2953c4750,4756
+< Elaine
+< Elam
+---
 > Ekaterina/M
 > El/Y
 > Elaina/M
-2953a4709,4710
+> Elaine/M
+> Elam/M
 > Elana/M
 > Elane/M
-2954a4712
+2954a4758
 > Elayne/M
-2958a4717,4719
+2956c4760
+< Elba
+---
+> Elba/M
+2958,2959c4762,4768
+< Elbert
+< Elbrus
+---
+> Elbert/M
 > Elberta/M
 > Elbertina/M
 > Elbertine/M
-2959a4721,4722
+> Elbrus/M
 > Elden/M
 > Eldin/M
-2960a4724,4725
+2961c4770,4772
+< Eldorado
+---
 > Eldredge/M
 > Eldridge/M
-2962a4728,4729
+> Eldorado/M
+2962a4774,4775
 > Eleanora/M
 > Eleanore/M
-2964a4732
+2964a4778
 > Eleen/M
-2965a4734,4743
+2966,2968c4780,4798
+< Elgar
+< Eli
+< Elias
+---
 > Elene/M
 > Eleni/M
 > Elenore/M
@@ -2763,41 +5163,60 @@
 > Elfrida/M
 > Elfrieda/M
 > Elga/M
-2968c4746,4751
-< Elias
----
-> Elia/S
+> Elgar/M
+> Eli/M
+> Elia/S/M
 > Elianora/M
 > Elianore/M
+> Elias/M
 > Elicia/M
 > Elie/M
 > Elihu/M
-2970a4754
+2971c4801,4802
+< Eliot
+---
 > Elinore/M
-2972a4757
+> Eliot/M
+2973c4804,4806
+< Elisabeth
+---
 > Elisabet/M
-2973a4759
+> Elisabeth/M
 > Elisabetta/M
-2976a4763,4764
+2976c4809,4811
+< Elisha
+---
+> Elisha/M
 > Elissa/M
 > Elita/M
-2977a4766
+2977a4813
 > Elizabet/M
-2979a4769,4770
+2979c4815,4817
+< Elizabethan/MS
+---
+> Elizabethan/SM
 > Elka/M
 > Elke/M
-2980a4772,4774
+2980a4819,4821
 > Elladine/M
 > Ellary/M
 > Elle/M
-2981a4776,4778
+2981a4823,4825
 > Ellene/M
 > Ellerey/M
 > Ellery/M
-2982a4780,4781
+2982a4827,4828
 > Ellette/M
 > Elli/SM
-2988a4788,4794
+2984c4830
+< Ellington
+---
+> Ellington/M
+2987c4833
+< Ellis
+---
+> Ellis/M
+2988a4835,4841
 > Ellissa/M
 > Ellswerth/M
 > Ellsworth/M
@@ -2805,53 +5224,63 @@
 > Elly/M
 > Ellyn/M
 > Ellynn/M
-2990a4797
+2990a4844
 > Elmira/M
-2991a4799,4801
+2991a4846,4848
 > Elmore/M
 > Elna/MH
 > Elnar/M
-2993a4804
+2994c4851,4853
+< Elohim
+---
 > Elnore/M
-2994a4806
+> Elohim/M
 > Eloisa/M
-2995a4808,4809
+2995a4855,4856
 > Elonore/M
 > Elora/M
-2998a4813,4817
+2998a4860,4864
 > Elsbeth/M
 > Else/M
 > Elset/M
 > Elsey/M
 > Elsi/M
-3000a4820,4823
+3000c4866,4870
+< Elsinore
+---
+> Elsinore/M
 > Elspeth/M
 > Elston/M
 > Elsworth/M
 > Elsy/M
-3004a4828
+3004a4875
 > Elvera/M
-3006a4831
+3006a4878
 > Elvina/M
-3008a4834,4836
+3008a4881,4883
 > Elvyn/M
 > Elwin/M
 > Elwira/M
-3010a4839,4841
+3010a4886,4888
 > Elwyn/M
 > Elyn/M
 > Elyse/M
-3011a4843,4844
+3012c4890,4892
+< Elysian
+---
 > Elysha/M
-> Elysia
-3013a4847,4849
+> Elysia/M
+> Elysian/M
+3013a4894,4896
 > Elyssa/M
 > Em/M
 > Ema/M
-3014a4851,4852
+3014a4898,4899
 > Emalee/M
 > Emalia/M
-3015a4854,4862
+3016c4901,4910
+< Emerson
+---
 > Emanuele/M
 > Emelda/M
 > Emelen/M
@@ -2861,81 +5290,142 @@
 > Emelita/M
 > Emelyne/M
 > Emera/M
-3019a4867,4868
+> Emerson/M
+3019a4914,4915
 > Emilee/M
 > Emili/M
-3020a4870,4871
+3020a4917,4918
 > Emilie/M
 > Emiline/M
-3024a4876,4879
+3024a4923,4926
 > Emlen/M
 > Emlyn/M
 > Emlynn/M
 > Emlynne/M
-3025a4881,4885
+3026c4928,4937
+< Emmanuel
+---
 > Emmalee/M
 > Emmaline/M
 > Emmalyn/M
 > Emmalynn/M
 > Emmalynne/M
-3026a4887,4890
+> Emmanuel/M
 > Emmeline/M
 > Emmerich/M
 > Emmery/M
 > Emmet/M
-3027a4892,4896
+3028c4939,4946
+< Emmy
+---
 > Emmey/M
 > Emmi/M
 > Emmie/M
 > Emmit/M
 > Emmott/M
-3028a4898,4899
+> Emmy/M
 > Emmye/M
 > Emogene/M
-3029a4901,4902
+3029a4948,4949
 > Emyle/M
 > Emylee/M
-3032a4906
+3031,3032c4951,4953
+< Endymion
+< Eng
+---
+> Endymion/M
+> Eng/M
 > Engelbert/M
-3034a4909
+3034a4956
 > Englebert/M
-3039a4915
+3037c4959
+< Englishmen
+---
+> Englishmen/M
+3040c4962,4963
+< Enid
+---
 > Engracia/M
-3043a4920
-> Ennis
-3045a4923,4924
+> Enid/M
+3044,3045c4967,4971
+< Enoch
+< Enos
+---
+> Ennis/M
+> Enoch/M
+> Enos/M
 > Enrica/M
 > Enrichetta/M
-3046a4926
+3046a4973
 > Enrika/M
-3047a4928
+3047a4975
 > Enriqueta/M
-3050a4932,4933
+3050a4979,4980
 > Eolanda/M
 > Eolande/M
-3054a4938,4939
+3053,3056c4983,4988
+< Ephesus
+< Ephraim
+< Epictetus
+< Epicurean
+---
+> Ephesus/M
+> Ephraim/M
 > Ephrayim/M
 > Ephrem/M
-3067a4953
+> Epictetus/M
+> Epicurean/M
+3063c4995
+< Epsom
+---
+> Epsom/M
+3065,3066c4997,4998
+< Epstein
+< Equuleus
+---
+> Epstein/M
+> Equuleus/M
+3067a5000
 > Eran/M
-3068a4955
+3068a5002
 > Erastus/M
-3070a4958
+3070a5005
 > Erda/M
-3072a4961,4962
+3072c5007,5009
+< Erector
+---
+> Erector/M
 > Erek/M
 > Erena/M
-3074a4965
+3074c5011,5012
+< Erhard
+---
+> Erhard/M
 > Erhart/M
-3077a4969
+3077a5016
 > Ericha/M
-3088a4981,4983
+3081,3084c5020,5023
+< Ericson
+< Ericsson
+< Eridanus
+< Erie
+---
+> Ericson/M
+> Ericsson/M
+> Eridanus/M
+> Erie/M
+3087,3088c5026,5030
+< Eriksson
+< Erin
+---
+> Eriksson/M
+> Erin/M
 > Erina/M
 > Erinn/M
 > Erinna/M
-3091a4987
+3091a5034
 > Erl/M
-3093a4990,4996
+3093a5037,5043
 > Ermanno/M
 > Ermengarde/M
 > Ermentrude/M
@@ -2943,107 +5433,155 @@
 > Ermina/M
 > Erminia/M
 > Erminie/M
-3094a4998
+3094a5045
 > Ernaline/M
-3095a5000
+3095a5047
 > Ernesta/M
-3097a5003
+3097a5050
 > Ernestus/M
-3099a5006
+3099c5052,5053
+< Ernst
+---
+> Ernst/M
 > Erny/M
-3100a5008
+3100a5055
 > Errick/M
-3101a5010
+3101a5057
 > Erroll/M
-3102a5012,5014
-> Erskine
+3102a5059,5061
+> Erskine/M
 > Ertha/M
 > Erv/M
-3104a5017
+3104a5064
 > Eryn/M
-3108a5022
-> Esdras
-3109a5024,5026
+3108c5068,5069
+< Escondido
+---
+> Escondido/M
+> Esdras/M
+3109a5071,5073
 > Esma/M
 > Esmaria/M
 > Esme/M
-3115a5033,5034
+3115a5080,5081
 > Esra/M
 > Essa/M
-3120a5040,5041
+3117,3119c5083,5085
+< Essene
+< Essequibo
+< Essex
+---
+> Essene/M
+> Essequibo/M
+> Essex/M
+3120a5087,5088
 > Essy/M
 > Esta/M
-3122a5044
+3122a5091
 > Estel/M
-3123a5046,5047
+3123a5093,5094
 > Estele/M
 > Estell/M
-3128a5053
+3128c5099,5100
+< Estes
+---
+> Estes/M
 > Estevan/M
-3132a5058,5060
+3132a5105,5107
 > Estrella/M
 > Estrellita/M
 > Etan/M
-3133a5062
+3133a5109
 > Ethe/M
-3134a5064,5068
-> Ethelbert
+3134a5111,5115
+> Ethelbert/M
 > Ethelda/M
 > Ethelin/M
 > Ethelind/M
 > Etheline/M
-3135a5070
+3136c5117,5118
+< Ethernet
+---
 > Ethelyn/M
-3138a5074,5075
+> Ethernet/M
+3138a5121,5122
 > Ethyl/M
 > Etienne/M
-3143a5081,5084
+3140,3142c5124,5126
+< Eton
+< Etruria
+< Etruscan
+---
+> Eton/M
+> Etruria/M
+> Etruscan/M
+3143a5128,5131
 > Etti/M
 > Ettie/M
 > Ettore/M
 > Etty/M
-3148a5090,5092
+3149c5137,5140
+< Eugene
+---
 > Eudora/M
 > Euell/M
 > Eugen/M
-3152a5097,5098
+> Eugene/M
+3152a5144,5145
 > Eugenius/M
 > Eugine/M
-3153a5100
+3154c5147,5148
+< Euler
+---
 > Eulalie/M
-3156a5104
+> Euler/M
+3156a5151
 > Euphemia/M
-3166a5115
+3161,3162c5156,5157
+< Euripides
+< Eurodollar/MS
+---
+> Euripides/M
+> Eurodollar/SM
+3166a5162
 > Eustace/M
-3167a5117
+3167a5164
 > Eustacia/M
-3168a5119
+3168a5166
 > Ev/MN
-3169a5121
+3169a5168
 > Evaleen/M
-3170a5123
+3170a5170
 > Evangelia/M
-3171a5125
+3171a5172
 > Evangelin/M
-3174a5129,5130
+3174,3175c5175,5179
+< Evangelist
+< Evansville
+---
+> Evangelist/M
 > Evania/M
 > Evanne/M
-3176a5133,5136
+> Evans/M
+> Evansville/M
+3177c5181,5186
+< Evelyn
+---
 > Eveleen/M
 > Evelin/M
 > Evelina/M
 > Eveline/M
-3177a5138
+> Evelyn/M
 > Even/M
-3179a5141,5142
+3179a5189,5190
 > Everard/M
 > Evered/M
-3184a5148
+3184a5196
 > Evey/M
-3185a5150,5151
+3185a5198,5199
 > Evie/M
 > Evin/M
-3186a5153,5162
+3186a5201,5210
 > Evonne/M
 > Evvie/M
 > Evvy/M
@@ -3054,38 +5592,68 @@
 > Ewart/M
 > Ewell/M
 > Ewen/M
-3196a5173,5174
+3192c5216
+< Exercycle
+---
+> Exercycle/M
+3197c5221,5223
+< Eyre
+---
 > Eyde/M
 > Eydie/M
-3198a5177
+> Eyre/M
+3199,3200c5225,5231
+< Ezekiel
+< Ezra
+---
 > Ezechiel/M
-3199a5179,5181
+> Ezekiel/M
 > Ezequiel/M
 > Eziechiele/M
 > Ezmeralda/M
-3200a5183
+> Ezra/M
 > Ezri/M
-3224a5208,5209
+3218a5250
+> FSF/M
+3225c5257,5259
+< Faberge
+---
 > Fabe/RM
 > Faber/M
-3226a5212,5215
+> Faberge/M
+3226a5261,5264
 > Fabiano/M
 > Fabien/M
 > Fabio/M
 > Fae/M
-3231a5221,5222
+3228c5266
+< Fafnir
+---
+> Fafnir/M
+3231,3232c5269,5275
+< Fahrenheit
+< Fairbanks
+---
+> Fahrenheit/M
 > Faina/M
 > Fair/M
-3232a5224,5226
+> Fairbanks/M
 > Fairfax
 > Fairleigh/M
 > Fairlie/M
-3236a5231
+3234,3236c5277,5280
+< Faisalabad
+< Faith
+< Falasha
+---
+> Faisalabad/M
+> Faith/M
+> Falasha/M
 > Falito/M
-3237a5233,5234
+3237a5282,5283
 > Falkner
 > Fallon/M
-3240a5238,5245
+3240a5287,5294
 > Fan
 > Fanchette/M
 > Fanchon/M
@@ -3094,266 +5662,506 @@
 > Fanechka/M
 > Fania/M
 > Fanni/M
-3242a5248,5250
+3242a5297,5299
 > Fanya/M
 > Far/MY
 > Fara/M
-3243a5252,5253
+3243a5301,5302
 > Farah/M
 > Farand/M
-3244a5255,5258
+3244a5304,5307
 > Farica/M
 > Farlay/M
 > Farlee/M
 > Farleigh/M
-3245a5260,5261
+3246,3247c5309,5315
+< Farmer
+< Farragut
+---
 > Farlie/M
 > Farly/M
-3246a5263,5264
+> Farmer/M
 > Farr/M
 > Farra/M
-3247a5266
+> Farragut/M
 > Farrah/M
-3248a5268,5269
+3248a5317,5318
 > Farrand/M
 > Farrel/M
-3249a5271
+3249a5320
 > Farris/M
-3261a5284,5285
+3256c5327
+< Fates
+---
+> Fates/M
+3258,3259c5329,5330
+< Fatima
+< Fatimid
+---
+> Fatima/M
+> Fatimid/M
+3261c5332,5334
+< Faulknerian
+---
+> Faulknerian/M
 > Faun/M
 > Faunie/M
-3264a5289,5290
+3264a5338,5339
 > Faustina/M
 > Faustine/M
-3267a5294,5297
+3267c5342,5346
+< Fawkes
+---
+> Fawkes/M
 > Fawn/M
 > Fawne/M
 > Fawnia/M
 > Fax/M
-3268a5299
+3268a5348
 > Faydra/M
-3269a5301,5305
+3269a5350,5354
 > Fayette/M
 > Fayina/M
 > Fayre/M
 > Fayth/M
 > Faythe/M
-3276a5313
+3274c5359
+< FedEx
+---
+> FedEx/M
+3276a5362
 > Federica/M
-3277a5315,5316
+3277a5364,5366
 > Fedora/M
+> Feds/M
 > Fee/M
-3278a5318,5319
+3278a5368,5369
 > Felic/M
 > Felicdad/M
-3280a5322
+3280a5372
 > Felicio/M
-3281a5324,5327
+3281a5374,5377
 > Felicle/M
 > Felike/M
 > Feliks/M
 > Felipa/M
-3282a5329,5330
+3282a5379,5380
 > Felisha/M
 > Felita/M
-3283a5332,5333
+3284,3285c5382,5388
+< Fellini
+< Fenian
+---
 > Feliza/M
 > Felizio/M
-3284a5335
+> Fellini/M
 > Fenelia/M
-3285a5337,5338
+> Fenian/M
 > Feodor/M
 > Feodora/M
-3286a5340,5341
+3287,3288c5390,5396
+< Ferdinand
+< Fergus
+---
 > Ferd/M
 > Ferdie/M
-3287a5343,5345
+> Ferdinand/M
 > Ferdinanda/M
 > Ferdinande/M
 > Ferdy/M
-3293a5352,5353
+> Fergus/M
+3292c5400
+< Fermi
+---
+> Fermi/M
+3293a5402,5403
 > Fernanda/M
 > Fernande/M
-3294a5355
+3294a5405
 > Fernandina/M
-3295a5357
+3295a5407
 > Ferne/M
-3297a5360
+3297a5410
 > Ferrel/M
-3299a5363
+3299c5412,5413
+< Ferris
+---
+> Ferris/M
 > Fey/M
-3301a5366,5367
+3301c5415,5417
+< Fez
+---
+> Fez/M
 > Fiann/M
 > Fianna
-3306a5373,5376
+3303c5419
+< Fiberglas
+---
+> Fiberglas/M
+3305c5421
+< Fichte
+---
+> Fichte/M
+3306a5423,5426
 > Fidela/M
 > Fidelia/M
 > Fidelio/M
 > Fidelity/M
-3308,3309c5378,5381
+3308,3309c5428,5433
 < Fielding
 < Fields
 ---
 > Fidole/M
 > Field/GS
+> Fielding/M
+> Fields/M
 > Fifi/M
 > Fifine/M
-3313a5386,5391
+3313a5438,5443
 > Filbert/M
 > Filberte/M
 > Filberto/M
 > Filia/M
 > Filide/M
 > Filip/M
-3314a5393,5394
+3314a5445,5446
 > Filippa/M
 > Filippo/M
-3315a5396,5397
+3316c5448,5452
+< Filofax
+---
 > Filmer/M
 > Filmore/M
-3316a5399,5400
+> Filofax/M
 > Fin
 > Fina/M
-3317a5402,5403
+3317a5454,5455
 > Findlay/M
 > Findley/M
-3318a5405
+3318a5457
 > Finlay/M
-3325c5412,5414
+3325c5464,5466
 < Firefox/M
 ---
 > Fionna/M
 > Fionnula/M
 > Fiorenze/M
-3330a5420
+3327,3328c5468,5469
+< Fischer
+< Fisher
+---
+> Fischer/M
+> Fisher/M
+3331c5472,5473
+< Fitzgerald
+---
 > Fitz/M
-3342c5432
+> Fitzgerald/M
+3340c5482
+< Flaubert
+---
+> Flaubert/M
+3342c5484,5485
 < Fleming
 ---
 > Flem/G
-3344c5434,5439
+> Fleming/M
+3344,3346c5487,5495
 < Fletcher
+< Flint
+< Flintstones
 ---
 > Flemming/M
 > Fletch/MR
+> Fletcher/M
 > Fleur/M
 > Fleurette/M
 > Flin/M
 > Flinn/M
-3347a5443
+> Flint/M
+> Flintstones/M
+3348c5497,5501
+< Flora
+---
 > Flor/M
-3348a5445,5447
+> Flora/M
 > Florance/M
 > Flore/SM
 > Florella/M
-3349a5449,5450
+3350,3351c5503,5511
+< Florentine
+< Flores
+---
 > Florencia/M
 > Florentia/M
-3351a5453,5457
+> Florentine/M
+> Flores/M
 > Florenza/M
 > Florette/M
 > Flori/SM
 > Floria/M
 > Florian/M
-3354a5461,5463
+3353c5513
+< Floridan
+---
+> Floridan/M
+3354a5515,5517
 > Florie/M
 > Florina/M
 > Florinda/M
-3355a5465,5467
+3355a5519,5521
 > Florri/M
 > Florrie/M
 > Florry/M
-3357a5470
+3357a5524
 > Flossi/M
-3358a5472
+3359,3360c5526,5529
+< Flowers
+< Floyd
+---
 > Flossy/M
-3360a5475
+> Flowers/M
+> Floyd/M
 > Flss/M
-3369a5485,5488
+3363,3369c5532,5542
+< Foch
+< Fokker
+< Foley
+< Folgers
+< Folsom
+< Fomalhaut
+< Fonda
+---
+> Foch/M
+> Fokker/M
+> Foley/M
+> Folgers/M
+> Folsom/M
+> Fomalhaut/M
+> Fonda/M
 > Fons
 > Fonsie/M
 > Fonz/M
 > Fonzie/M
-3378c5497,5498
+3371c5544
+< Forbes
+---
+> Forbes/M
+3378,3380c5551,5555
 < Forrest
+< Forster
+< Fortaleza
 ---
 > Forrest/R
 > Forrester/M
-3380a5501
+> Forster/M
+> Fortaleza/M
 > Foss/M
-3392c5513
+3382c5557
+< Foster
+---
+> Foster/M
+3384,3385c5559,5560
+< Foucault
+< Fourier
+---
+> Foucault/M
+> Fourier/M
+3388c5563
+< Fowler
+---
+> Fowler/M
+3391,3392c5566,5567
+< Fragonard
 < Fran/M
 ---
+> Fragonard/M
 > Fran/SM
-3393a5515
+3393a5569
 > Francene/M
-3394a5517,5518
+3394a5571,5572
 > Francesco/M
 > Franchot/M
-3399a5524,5525
+3396c5574
+< Francis
+---
+> Francis/M
+3398c5576
+< Franciscan/SM
+---
+> Franciscan/MS
+3400,3401c5578,5583
+< Franck
+< Franco
+---
 > Franciska/M
 > Franciskus/M
-3400a5527,5528
+> Franck/M
 > Francklin/M
 > Francklyn/M
-3403a5532
+> Franco/M
+3404c5586,5587
+< Franglais
+---
 > Francyne/M
-3412a5542,5545
+> Franglais/M
+3407c5590
+< Frankenstein
+---
+> Frankenstein/M
+3411,3412c5594,5600
+< Frankish
+< Franklin
+---
+> Frankish/M
+> Franklin/M
 > Franklyn/M
+> Franks/M
 > Franky/M
 > Franni/M
 > Frannie/M
-3414c5547,5551
+3414,3415c5602,5609
 < Franz/M
+< Fraser
 ---
 > Fransisco/M
 > Frants/M
 > Franz/MN
 > Franzen/M
 > Frasco/M
-3415a5553,5554
+> Fraser/M
 > Frasier/M
 > Frasquito/M
-3417a5557,5558
+3417a5612,5613
 > Frayda/M
 > Fraze/RM
-3420a5562
+3420a5617
 > Freddi/M
-3422a5565,5566
+3422a5620,5621
 > Fredek/M
 > Fredelia/M
-3423a5568,5569
+3424c5623,5627
+< Frederick
+---
 > Frederica/M
 > Frederich/M
-3424a5571,5572
+> Frederick/M
 > Fredericka/M
 > Frederico/M
-3425a5574,5579
+3425a5629,5634
 > Frederigo/M
 > Frederik/M
 > Frederique/M
 > Fredi/M
 > Fredia/M
 > Fredra/M
-3427a5582,5585
+3427a5637,5640
 > Fredrika/M
 > Free/M
 > Freedman/M
 > Freeland/M
-3430a5589
+3430a5644
 > Freemon/M
-3449a5609
+3433c5647
+< Fremont
+---
+> Fremont/M
+3436c5650
+< Frenchmen
+---
+> Frenchmen/M
+3438,3439c5652,5653
+< Frenchwomen
+< Freon
+---
+> Frenchwomen/M
+> Freon/M
+3443c5657
+< Freudian
+---
+> Freudian/M
+3449,3450c5663,5667
+< Friedan
+< Friedman
+---
+> Friedan/M
 > Friederike/M
-3450a5611,5612
-> Friedrich
+> Friedman/M
+> Friedrich/M
 > Friedrick/M
-3481a5644
+3453,3455c5670,5672
+< Frigidaire
+< Frisbee
+< Frisco
+---
+> Frigidaire/M
+> Frisbee/M
+> Frisco/M
+3459,3462c5676,5679
+< Frobisher
+< Froissart
+< Fromm
+< Fronde
+---
+> Frobisher/M
+> Froissart/M
+> Fromm/M
+> Fronde/M
+3465c5682
+< Frostbelt
+---
+> Frostbelt/M
+3467c5684
+< Fry
+---
+> Fry/M
+3470,3471c5687,5688
+< Fuentes
+< Fugger
+---
+> Fuentes/M
+> Fugger/M
+3476a5694
+> Fukuyama/M
+3478,3480c5696,5698
+< Fulbright
+< Fuller
+< Fullerton
+---
+> Fulbright/M
+> Fuller/M
+> Fullerton/M
+3482,3483c5700,5702
+< Funafuti
+< Fundy
+---
 > Fulvia/M
-3498c5661
+> Funafuti/M
+> Fundy/M
+3486c5705
+< Fushun
+---
+> Fushun/M
+3488c5707
+< Fuzzbuster
+---
+> Fuzzbuster/M
+3498c5717
 < GHz
 ---
 > GHz/M
-3513a5677,5684
+3499a5719
+> GIF
+3501c5721
+< GM
+---
+> GM/M
+3504a5725
+> GNU/M
+3508a5730,5731
+> GPS
+> GPU
+3513a5737,5745
 > Gabbey/M
 > Gabbi/M
 > Gabbie/M
@@ -3362,58 +6170,123 @@
 > Gabey/M
 > Gabi/M
 > Gabie/M
-3518a5690,5692
+> Gable/M
+3517c5749
+< Gabriel
+---
+> Gabriel/M
+3518a5751,5753
 > Gabriele/M
 > Gabriell/M
 > Gabriella/M
-3519a5694,5697
+3519a5755,5758
 > Gabriellia/M
 > Gabriello/M
 > Gabrila/M
 > Gaby/M
-3522a5701
+3521c5760
+< Gaddafi
+---
+> Gaddafi/M
+3522a5762
 > Gae/M
-3524a5704
+3524a5765
 > Gaelan/M
-3528a5709
+3526,3527c5767,5769
+< Gagarin
+< Gage
+---
+> Gagarin/M
+> Gage/M
+> Gaia/M
+3528a5771
 > Gaile/M
-3531a5713
+3531a5775
 > Gal/N
-3544a5727
+3534,3536c5778,5780
+< Galatea
+< Galatia
+< Galatians
+---
+> Galatea/M
+> Galatia/M
+> Galatians/M
+3538c5782
+< Galbraith
+---
+> Galbraith/M
+3540,3541c5784,5785
+< Galen
+< Galibi
+---
+> Galen/M
+> Galibi/M
+3543c5787
+< Galilee
+---
+> Galilee/M
+3544a5789
 > Galina/M
-3546a5730
+3546a5792
 > Gallard/M
-3554a5739
+3548c5794
+< Gallic
+---
+> Gallic/M
+3552c5798
+< Gallup
+---
+> Gallup/M
+3554,3555c5800,5803
+< Galsworthy
+< Galvani
+---
+> Galsworthy/M
 > Galvan/M
-3555a5741
+> Galvani/M
 > Galven/M
-3556a5743
+3557,3558c5805,5808
+< Gama
+< Gamay
+---
 > Galvin/M
-3557a5745
+> Gama/M
 > Gamaliel/M
-3562a5751
+> Gamay/M
+3562a5813
 > Gan/M
-3567a5757,5759
+3564c5815
+< Gandhian
+---
+> Gandhian/M
+3567a5819,5821
 > Gannie/M
 > Gannon/M
 > Ganny/M
-3570a5763,5764
+3571c5825,5827
+< Garbo
+---
 > Gar/MH
 > Garald/M
-3572a5767,5770
+> Garbo/M
+3572a5829,5832
 > Gard
 > Gardener/M
 > Gardie/M
 > Gardiner
-3573a5772,5774
+3573a5834,5836
 > Gardy/M
 > Gare/MH
 > Garek/M
-3574a5776
+3574a5838
 > Garey/M
-3578a5781
+3579,3580c5843,5852
+< Garland
+< Garner
+---
 > Garik/M
-3580a5784,5790
+> Garland/M
+> Garner/M
 > Garnet/M
 > Garnette/M
 > Garold/M
@@ -3421,41 +6294,62 @@
 > Garrek/M
 > Garret/M
 > Garreth/M
-3582a5793
+3582,3583c5854,5858
+< Garrick
+< Garrison
+---
+> Garrick/M
 > Garrik/M
-3583a5795,5796
+> Garrison/M
 > Garrot/M
 > Garrott/M
-3585a5799
+3586,3587c5861,5867
+< Garvey
+< Gary
+---
 > Garv/M
-3586a5801,5804
+> Garvey/M
 > Garvin/M
 > Garvy/M
 > Garwin/M
 > Garwood/M
-3589a5808,5811
-> Gaspar
+> Gary/M
+3590,3591c5870,5876
+< Gasser
+< Gates
+---
+> Gaspar/M
 > Gaspard/M
 > Gasparo/M
 > Gasper/M
-3590a5813
+> Gasser/M
 > Gaston/M
-3598a5822
+> Gates/M
+3598a5884
 > Gaultiero/M
-3601a5826
+3600c5886
+< Gaussian
+---
+> Gaussian/M
+3602c5888,5892
+< Gautier
+---
 > Gauthier/M
-3602a5828,5830
+> Gautier/M
 > Gav/MN
 > Gavan/M
 > Gaven/M
-3603a5832,5833
+3603a5894,5895
 > Gavra/M
 > Gavrielle/M
-3604a5835
-> Gawen/M
-3606c5837,5847
+3605,3608c5897,5912
+< Gay
 < Gayle/M
+< Gaza
+< Gaziantep
 ---
+> Gawen/M
+> Gay/M
 > Gaye/M
 > Gayel/M
 > Gayelord/M
@@ -3467,16 +6361,23 @@
 > Gaylor/M
 > Gaylord/M
 > Gaynor/M
-3608a5850
+> Gaza/M
+> Gaziantep/M
 > Gbps
-3611a5854,5855
+3611a5916,5917
 > Gearalt/M
 > Gearard/M
-3618a5863
+3615c5921
+< Gehrig
+---
+> Gehrig/M
+3618a5925
 > Gelya/M
-3626a5872
+3619a5927
+> Gen/M
+3626a5935
 > Genevra/M
-3627a5874,5880
+3627a5937,5943
 > Genia/M
 > Genna/M
 > Genni/M
@@ -3484,38 +6385,46 @@
 > Gennifer/M
 > Genny/M
 > Geno/M
-3628a5882
+3628a5945
 > Genovera/M
-3631a5886
+3630c5947
+< Gentoo
+---
+> Gentoo/M
+3631a5949
 > Genvieve/M
-3632a5888
+3632a5951
 > Geoff/M
-3633a5890,5893
+3633a5953,5956
 > Geoffry/M
 > Georas/M
 > Geordie
 > Georg/M
-3634a5895,5898
+3634a5958,5961
 > Georgeanna/M
 > Georgeanne/M
 > Georgena/M
 > Georgeta/M
-3635a5900
+3636c5963,5965
+< Georgette
+---
 > Georgetta/M
-3636a5902
+> Georgette/M
 > Georgi/M
-3638a5905,5908
+3638a5968,5971
 > Georgiana/M
 > Georgianna/M
 > Georgianne/M
 > Georgie/M
-3639a5910,5911
+3639a5973,5975
 > Georgine/M
 > Georgy/M
-3640a5913
+> Ger/M
+3640a5977
 > Geralda/M
-3644a5918,5927
+3644a5982,5992
 > Gerda/M
+> Gere/M
 > Gerek/M
 > Gerhard/M
 > Gerhardine/M
@@ -3525,37 +6434,61 @@
 > Gerianne/M
 > Gerick/M
 > Gerik/M
-3645a5929,5931
+3645a5994,5996
 > Gerladina/M
 > Germain/M
 > Germaine/M
-3646a5933
+3646a5998
 > Germana/M
-3648a5936,5937
+3649c6001,6007
+< Geronimo
+---
 > Germayne/M
 > Gerome/M
-3649a5939,5942
+> Geronimo/M
 > Gerrard/M
 > Gerri/M
 > Gerrie/M
 > Gerrilee/M
-3651a5945,5950
+3651c6009,6015
+< Gershwin
+---
+> Gershwin/M
 > Gert/M
 > Gerta/M
 > Gerti/M
 > Gertie/M
 > Gertrud/M
 > Gertruda/M
-3652a5952,5954
+3652a6017,6019
 > Gertrudis/M
 > Gerty/M
 > Gery/M
-3663a5966
+3654,3655c6021,6022
+< Gethsemane
+< Getty
+---
+> Gethsemane/M
+> Getty/M
+3657c6024
+< Gewurztraminer
+---
+> Gewurztraminer/M
+3661c6028
+< Ghats
+---
+> Ghats/M
+3663c6030,6031
+< Ghent
+---
+> Ghent/M
 > Gherardo/M
-3664a5968,5969
+3665c6033,6042
+< Giacometti
+---
 > Giacinta/M
 > Giacobo/M
-3665a5971,5977
+> Giacometti/M
 > Giacomo/M
 > Giacopo/M
 > Gian/M
@@ -3563,14 +6496,28 @@
 > Gianina/M
 > Gianna/M
 > Gianni/M
-3667a5980,5983
+3668,3669c6045,6051
+< Gibbon
+< Gibbs
+---
 > Giavani/M
 > Gib/M
 > Gibb/SM
 > Gibbie/M
-3669a5986
+> Gibbon/M
+> Gibbs/M
 > Gibby/M
-3676c5993,6000
+3671,3674c6053,6056
+< Gibson
+< Gide
+< Gideon
+< Gielgud
+---
+> Gibson/M
+> Gide/M
+> Gideon/M
+> Gielgud/M
+3676c6058,6065
 < Gil/M
 ---
 > Giff/MR
@@ -3581,189 +6528,405 @@
 > Giffy/M
 > Gigi/M
 > Gil/MY
-3678a6003,6006
+3678a6068,6071
 > Gilberta/M
 > Gilberte/M
 > Gilbertina/M
-> Gilbertine
-3679a6008
+> Gilbertine/M
+3679a6073
 > Gilburt/M
-3682a6012
+3682,3686c6076,6083
+< Gilead
+< Giles
+< Gilgamesh
+< Gill
+< Gillespie
+---
+> Gilead/M
 > Gilemette/M
-3685a6016,6017
+> Giles/M
+> Gilgamesh/M
+> Gill/M
 > Gillan/M
-> Gilles
-3687a6020
+> Gilles/M
+> Gillespie/M
+3687a6085
 > Gilli/M
-3689a6023
+3689a6088
 > Gillie/M
-3690a6025
+3690a6090
 > Gilly/M
-3692a6028,6029
+3692a6093,6094
 > Ginelle/M
 > Ginevra/M
-3694a6032,6034
+3694a6097,6099
 > Ginni/M
 > Ginnie/M
 > Ginnifer/M
-3699a6040,6043
+3697c6102
+< Ginsberg
+---
+> Ginsberg/M
+3700,3701c6105,6111
+< Giorgione
+< Giotto
+---
 > Giordano/M
 > Giorgi/M
 > Giorgia/M
 > Giorgio/M
-3701a6046
+> Giorgione/M
+> Giotto/M
 > Giovanna/M
-3703a6049,6051
+3704c6114,6121
+< Giraudoux
+---
 > Giralda/M
 > Giraldo/M
-> Giraud
-3704a6053,6056
+> Giraud/M
+> Giraudoux/M
 > Gisela/M
 > Giselbert/M
 > Gisele/M
 > Gisella/M
-3706a6059,6060
+3706c6123,6126
+< Gish
+---
+> Gish/M
+> GitHub/M
 > Giuditta/M
 > Giulia/M
-3707a6062,6063
+3707a6128,6129
 > Giulietta/M
 > Giulio/M
-3708a6065,6067
+3708a6131,6133
 > Giustina/M
 > Giustino/M
 > Giusto/M
-3709a6069
+3709a6135
 > Gizela/M
-3710a6071,6072
+3710a6137,6138
 > Glad/M
 > Gladi/M
-3719a6082
+3712,3713c6140,6141
+< Gladys
+< Glaser
+---
+> Gladys/M
+> Glaser/M
+3719a6148
 > Gleda/M
-3722a6086,6088
+3722a6152,6154
 > Glenden/M
 > Glendon/M
 > Glenine/M
-3725a6092,6094
+3726,3727c6158,6165
+< Gloria
+< Gloucester
+---
 > Glennie/M
 > Glennis/M
 > Glori/M
-3726a6096,6098
+> Gloria/M
 > Gloriana/M
 > Gloriane/M
 > Glory/M
-3728a6101,6106
+> Gloucester/M
+3729c6167,6173
+< Gnostic
+---
 > Glyn/M
 > Glynda/M
 > Glynis/M
 > Glynn/M
 > Glynnis/M
 > Gnni/M
-3734a6113
+> Gnostic/M
+3731c6175,6176
+< Goa
+---
+> GnuPG
+> Goa/M
+3734,3735c6179,6182
+< Godard
+< Goddard
+---
+> Godard/M
 > Godart/M
-3735a6115
+> Goddard/M
 > Goddart/M
-3736a6117,6119
+3736a6184,6186
 > Godfree/M
 > Godfrey/M
 > Godfry/M
-3742a6126
-> Godwin
-3754a6139
+3741,3742c6191,6193
+< Godthaab
+< Godunov
+---
+> Godthaab/M
+> Godunov/M
+> Godwin/M
+3744,3745c6195,6196
+< Goebbels
+< Goering
+---
+> Goebbels/M
+> Goering/M
+3749,3750c6200,6201
+< Gog
+< Gogol
+---
+> Gog/M
+> Gogol/M
+3753c6204
+< Golconda
+---
+> Golconda/M
+3754a6206
 > Goldarina/M
-3756a6142,6143
+3756a6209,6210
 > Goldi/M
 > Goldia/M
-3758a6146
+3759c6213,6214
+< Golding
+---
 > Goldina/M
-3763a6152
+> Golding/M
+3761c6216
+< Goldsmith
+---
+> Goldsmith/M
+3763,3764c6218,6220
+< Goldwyn
+< Golgi
+---
+> Goldwyn/M
 > Goldy/M
-3774a6164
+> Golgi/M
+3766c6222
+< Goliath
+---
+> Goliath/M
+3769,3770c6225,6226
+< Gompers
+< Gomulka
+---
+> Gompers/M
+> Gomulka/M
+3772c6228
+< Gonzales
+---
+> Gonzales/M
+3774a6231
 > Goober/M
-3784a6175,6176
+3777c6234
+< Goodman
+---
+> Goodman/M
+3781c6238
+< Goodyear
+---
+> Goodyear/M
+3785c6242,6246
+< Gorbachev
+---
 > Goran/M
 > Goraud/M
-3785a6178,6179
+> Gorbachev/M
 > Gordan/M
 > Gorden/M
-3786a6181
+3787,3789c6248,6252
+< Gordimer
+< Gordon
+< Gore
+---
 > Gordie/M
-3788a6184
+> Gordimer/M
+> Gordon/M
 > Gordy/M
-3799a6196
+> Gore/M
+3792c6255
+< Gorgas
+---
+> Gorgas/M
+3799c6262,6263
+< Gotham
+---
+> Gotham/M
 > Gothart/M
-3801a6199
+3801a6266
 > Gottfried/M
-3811a6210
+3803,3804c6268,6269
+< Gould
+< Gounod
+---
+> Gould/M
+> Gounod/M
+3806c6271
+< Goya
+---
+> Goya/M
+3809,3810c6274,6275
+< Gracchus
+< Grace
+---
+> Gracchus/M
+> Grace/M
+3811a6277
 > Gracia/M
-3813a6213,6214
+3813a6280,6281
 > Gradeigh/M
 > Gradey/M
-3814a6216,6217
+3814a6283,6284
 > Graehme/M
 > Graeme/M
-3818a6222
+3817,3821c6287,6294
+< Graham
+< Grahame
+< Grail
+< Grammy
+< Grampians
+---
+> Graham/M
+> Grahame/M
 > Graig/M
-3819a6224
+> Grail/M
 > Gram/M
-3821a6227
+> Grammy/M
+> Grampians/M
 > Gran/M
-3822a6229,6231
+3822a6296,6298
 > Grange/R
 > Grannie/M
 > Granny/M
-3823a6233,6236
+3824,3827c6300,6312
+< Grass
+< Graves
+< Gray
+< Grecian
+---
 > Grantham/M
 > Granthem/M
 > Grantley/M
 > Granville/M
-3824a6238,6240
+> Grass/M
 > Grata/M
 > Gratia/M
 > Gratiana/M
-3826a6243,6244
+> Graves/M
+> Gray/M
 > Grayce/M
 > Grazia/M
-3842a6261,6264
+> Grecian/M
+3830c6315
+< Greeley
+---
+> Greeley/M
+3832c6317
+< Greene
+---
+> Greene/M
+3843c6328,6332
+< Gregorian
+---
 > Greggory/M
 > Gregoire/M
 > Gregoor/M
 > Gregor/M
-3844a6267
+> Gregorian/M
+3844a6334
 > Gregorius/M
-3850a6274
+3848,3851c6338,6342
+< Grenadines
+< Grendel
+< Grenoble
+< Gresham
+---
+> Grenadines/M
+> Grendel/M
+> Grenoble/M
 > Grenville
-3852a6277
+> Gresham/M
+3852a6344
 > Gretal/M
-3853a6279
+3853a6346
 > Grete/M
-3854a6281,6283
+3854a6348,6350
 > Grethel/M
 > Gretna/M
 > Gretta/M
-3857a6287,6289
+3856,3857c6352,6356
+< Grey
+< Grieg
+---
+> Grey/M
+> Grieg/M
 > Grier/M
 > Griff/M
 > Griffie/M
-3859a6292
+3859,3860c6358,6360
+< Griffith
+< Grimes
+---
+> Griffith/M
 > Griffy/M
-3863a6297,6300
+> Grimes/M
+3863,3864c6363,6368
+< Gris
+< Gromyko
+---
+> Gris/M
 > Griselda
 > Grissel/M
 > Griswold/M
 > Griz/M
-3868a6306
+> Gromyko/M
+3866,3868c6370,6373
+< Gross
+< Grosz
+< Grotius
+---
+> Gross/M
+> Grosz/M
+> Grotius/M
 > Grove/RM
-3881a6320
+3870c6375
+< Grozny
+---
+> Grozny/M
+3872c6377
+< Grundy
+---
+> Grundy/M
+3878c6383
+< Guadalquivir
+---
+> Guadalquivir/M
+3881a6387
 > Gualterio/M
-3892a6332,6334
+3889c6395
+< Guatemalan/SM
+---
+> Guatemalan/MS
+3892c6398,6401
+< Guelph
+---
+> Guelph/M
 > Guendolen/M
 > Guenevere/M
 > Guenna/M
-3897a6340,6342
+3895,3897c6404,6409
+< Guerrero
+< Guevara
+< Guggenheim
+---
+> Guerrero/M
+> Guevara/M
+> Guggenheim/M
 > Guglielma/M
 > Guglielmo/M
 > Gui/M
-3899c6344,6348
+3899c6411,6415
 < Guido
 ---
 > Guido/M
@@ -3771,16 +6934,31 @@
 > Guillaume/M
 > Guillema/M
 > Guillemette/M
-3903a6353
+3903a6420
 > Guinna/M
-3912a6363,6368
+3905,3906c6422,6423
+< Guiyang
+< Guizot
+---
+> Guiyang/M
+> Guizot/M
+3909,3910c6426,6427
+< Gujranwala
+< Gullah
+---
+> Gujranwala/M
+> Gullah/M
+3913c6430,6436
+< Gunther
+---
 > Gun/M
 > Gunar/M
 > Gunilla/M
 > Gunner/M
 > Guntar/M
 > Gunter
-3917a6374,6380
+> Gunther/M
+3917a6441,6447
 > Gusella/M
 > Guss
 > Gussi/M
@@ -3788,20 +6966,27 @@
 > Gussy/M
 > Gusta/M
 > Gustaf/M
-3918a6382
+3918a6449
 > Gustave/M
-3920a6385,6387
+3921,3922c6452,6458
+< Gutenberg
+< Guthrie
+---
 > Gusti/M
 > Gustie/M
 > Gusty/M
-3921a6389
+> Gutenberg/M
 > Guthrey/M
-3922a6391
+> Guthrie/M
 > Guthry/M
-3929a6399,6400
+3928c6464
+< Gwalior
+---
+> Gwalior/M
+3929a6466,6467
 > Gwendolen/M
 > Gwendolin/M
-3931a6403,6410
+3931a6470,6477
 > Gweneth/M
 > Gwenette/M
 > Gwenneth/M
@@ -3810,151 +6995,319 @@
 > Gwenny/M
 > Gwenora/M
 > Gwenore/M
-3932a6412,6413
+3932a6479,6480
 > Gwyneth/M
 > Gwynne/M
-3954a6436
+3935c6483,6485
+< HBO
+---
+> HBO/M
+> HDD
+> HDMI
+3954a6505
 > HTTPS
-3959a6442
+3956c6507
+< Ha
+---
+> Ha/M
+3958c6509
+< Habakkuk
+---
+> Habakkuk/M
+3959a6511
 > Had/M
-3961a6445,6448
+3961a6514,6517
 > Hadlee/M
 > Hadleigh/M
 > Hadley/M
 > Hadria/M
-3963a6451
+3964,3965c6520,6523
+< Hagar
+< Haggai
+---
 > Hagan/M
-3964a6453
-> Hagen
-3970a6460,6462
+> Hagar/M
+> Hagen/M
+> Haggai/M
+3967,3968c6525,6526
+< Hague
+< Hahn
+---
+> Hague/M
+> Hahn/M
+3971c6529,6532
+< Haiphong
+---
 > Hailee/M
 > Hailey/M
 > Haily/M
-3973a6466,6467
+> Haiphong/M
+3973a6535,6536
 > Hakeem/M
 > Hakim/M
-3976c6470
+3975,3979c6538,6544
+< Hakluyt
 < Hal/SM
+< Haldane
+< Hale
+< Haleakala
 ---
+> Hakluyt/M
 > Hal/SMY
-3979a6474,6475
+> Haldane/M
+> Hale/M
+> Haleakala/M
 > Haleigh/M
 > Halette/M
-3980a6477,6478
+3980a6546,6547
 > Hali/M
 > Halie/M
-3981a6480
+3982,3983c6549,6552
+< Hall
+< Halley
+---
 > Halimeda/M
-3983a6483
+> Hall/M
+> Halley/M
 > Halli/M
-3987d6486
+3987d6555
 < Hallowe'en
-3989a6489,6490
+3989c6557,6559
+< Hallstatt
+---
+> Hallstatt/M
 > Hallsy/M
 > Hally/M
-3991a6493
+3991c6561,6562
+< Halsey
+---
+> Halsey/M
 > Halsy/M
-3994a6497
+3995c6566,6569
+< Hamhung
+---
 > Hamel/M
-3995a6499,6500
+> Hamhung/M
 > Hamid/M
 > Hamil/M
-3999a6505
+3999c6573,6574
+< Hamiltonian
+---
+> Hamiltonian/M
 > Hamish/M
-4000a6507
+4001c6576,6577
+< Hamlet
+---
 > Hamlen/M
-4002a6510
+> Hamlet/M
+4003,4004c6579,6581
+< Hammarskjold
+< Hammerstein
+---
 > Hammad/M
-4007a6516
+> Hammarskjold/M
+> Hammerstein/M
+4006,4007c6583,6585
+< Hammond
+< Hammurabi
+---
+> Hammond/M
+> Hammurabi/M
 > Hamnet/M
-4011a6521,6522
+4009,4012c6587,6592
+< Hampton
+< Hamsun
+< Han/S
+< Hancock
+---
+> Hampton/M
+> Hamsun/M
+> Han/S/M
 > Hana/M
 > Hanan/M
-4020c6531,6532
+> Hancock/M
+4014c6594
+< Handy
+---
+> Handy/M
+4020c6600,6601
 < Hannah
 ---
 > Hannah/M
 > Hanni/SM
-4021a6534,6535
+4021a6603,6604
 > Hannie/M
 > Hanny/M
-4026a6541
+4024a6608
+> Hans/MN
+4026a6611
 > Hansiain/M
-4029d6543
+4029d6613
 < Hanukah/M
-4031a6546
+4031a6616
 > Happy/M
-4032a6548
+4032a6618
 > Harald/M
-4033a6550
+4034c6620,6622
+< Harbin
+---
 > Harbert/M
-4034a6552
+> Harbin/M
 > Harcourt/M
-4039a6558
+4037,4038c6625,6626
+< Hardy
+< Hargreaves
+---
+> Hardy/M
+> Hargreaves/M
+4039a6628
 > Harland/M
-4040a6560,6561
+4041,4043c6630,6638
+< Harlequin
+< Harley
+< Harlow
+---
 > Harlen/M
 > Harlene/M
-4042a6564,6566
+> Harlequin/M
+> Harley/M
 > Harli/M
 > Harlie/M
 > Harlin/M
-4043a6568
+> Harlow/M
 > Harman/M
-4044a6570,6572
+4044a6640,6642
 > Harmonia/M
 > Harmonie/M
 > Harmony/M
-4045a6574,6575
+4045a6644,6645
 > Haroun/M
 > Harp/MR
-4048a6579,6580
+4048a6649,6650
 > Harri/SM
 > Harrie/M
-4050a6583,6584
+4050a6653,6654
 > Harrietta/M
 > Harriette/M
-4052c6586,6587
+4052c6656,6658
 < Harris
 ---
 > Harriot/M
 > Harriott/M
-4059a6595
-> Hartley
-4061a6598,6599
+> Harris/M
+4055c6661
+< Harrods
+---
+> Harrods/M
+4057,4058c6663,6664
+< Hart
+< Harte
+---
+> Hart/M
+> Harte/M
+4059a6666
+> Hartley/M
+4061a6669,6670
 > Hartwell/M
 > Harv/M
-4063a6602,6603
+4063c6672,6674
+< Harvey
+---
+> Harvey/M
 > Harwell/M
 > Harwilll/M
-4064a6605,6606
+4065c6676,6682
+< Hasidim
+---
 > Hasheem/M
 > Hashim/M
-4065a6608,6611
+> Hasidim/M
 > Haskel/M
 > Haskell/M
 > Haslett/M
 > Hastie/M
-4066a6613
+4067,4068c6684,6686
+< Hatfield
+< Hathaway
+---
 > Hasty/M
-4070a6618
+> Hatfield/M
+> Hathaway/M
+4070c6688,6689
+< Hatteras
+---
+> Hatteras/M
 > Hatti/M
-4071a6620
+4071a6691
 > Hatty/M
-4077a6627
+4076,4077c6696,6698
+< Havarti
+< Havel
+---
+> Havarti/M
+> Havel/M
 > Haven/M
-4088a6639
+4079c6700
+< Haw
+---
+> Haw/M
+4082,4083c6703,6704
+< Hawking
+< Hawkins
+---
+> Hawking/M
+> Hawkins/M
+4085c6706
+< Hawthorne
+---
+> Hawthorne/M
+4088a6710
 > Haydon/M
-4089a6641
+4090,4091c6712,6715
+< Haynes
+< Hayward
+---
 > Hayley/M
-4093a6646,6647
+> Haynes/M
+> Hays/M
+> Hayward/M
+4093a6718,6719
 > Hayyim/M
 > Haze/M
-4094a6649
+4095c6721,6722
+< Hazlitt
+---
 > Hazlett/M
-4097a6653
+> Hazlitt/M
+4098,4099c6725,6727
+< Hearst
+< Heath/R
+---
 > Heall/M
-4112a6669,6678
+> Hearst/M
+> Heath/MR
+4102c6730
+< Heaviside
+---
+> Heaviside/M
+4104c6732
+< Hebe
+---
+> Hebe/M
+4106c6734
+< Hebraic
+---
+> Hebraic/M
+4108a6737
+> Hebrews/M
+4110c6739
+< Hecate
+---
+> Hecate/M
+4112c6741,6751
+< Hecuba
+---
+> Hecuba/M
 > Heda/M
 > Hedda/M
 > Heddi/M
@@ -3965,120 +7318,248 @@
 > Hedwig/M
 > Hedwiga/M
 > Hedy/M
-4117a6684
+4116,4119c6755,6759
+< Hegelian
+< Hegira
+< Heidegger
+< Heidelberg
+---
+> Hegelian/M
+> Hegira/M
 > Heida/M
-4120a6688
+> Heidegger/M
+> Heidelberg/M
+4121c6761,6762
+< Heifetz
+---
 > Heidie/M
-4122a6691
+> Heifetz/M
+4123c6764,6765
+< Heine
+---
 > Heindrick/M
-4126a6696,6697
+> Heine/M
+4127,4128c6769,6772
+< Heinz
+< Heisenberg
+---
 > Heinrick/M
 > Heinrik/M
-4130c6701,6703
+> Heinz/M
+> Heisenberg/M
+4130c6774,6776
 < Hejira
 ---
 > Hejira/MS
 > Helaina/M
 > Helaine/M
-4133a6707
+4133a6780
 > Helenka/M
-4134a6709
+4135,4136c6782,6784
+< Helicon
+< Heliopolis
+---
 > Helge/M
-4145c6720,6721
+> Helicon/M
+> Heliopolis/M
+4143,4145c6791,6794
+< Hellenistic
+< Hellenization
 < Hellenize
 ---
+> Hellenistic/M
+> Hellenization/M
 > Hellenize/DSG
-> Heller
-4146a6723
+> Heller/M
+4147c6796,6797
+< Hellman
+---
 > Helli/M
-4149a6727
+> Hellman/M
+4149a6800
 > Helsa/M
-4151a6730
+4151a6803
 > Helvetica
-4152a6732
+4152a6805
 > Helyn/M
-4156c6736,6738
+4156,4158c6809,6814
 < Hendricks
+< Hendrix
+< Henley
 ---
 > Hendrick/MS
 > Hendrik/M
 > Hendrika/M
-4157a6740
+> Hendrix/M
 > Henka/M
-4160a6744,6745
+> Henley/M
+4160a6817,6818
 > Henrie/M
 > Henrieta/M
-4161a6747,6748
+4161a6820,6821
 > Henriette/M
 > Henrik/M
-4162a6750
+4162a6823
 > Henryetta/M
-4166a6755
+4165c6826
+< Hepburn
+---
+> Hepburn/M
+4167c6828,6829
+< Hepplewhite
+---
 > Hephzibah/M
-4171a6761
+> Hepplewhite/M
+4170c6832
+< Heraclitus
+---
+> Heraclitus/M
+4172,4173c6834,6839
+< Herbart
+< Herbert
+---
 > Herb/M
-4173a6764,6766
+> Herbart/M
+> Herbert/M
 > Herbie/M
 > Herby/M
 > Herc/M
-4174a6768
+4175c6841,6842
+< Herculean
+---
 > Hercule/MS
-4176a6771
+> Herculean/M
+4177c6844,6845
+< Herder
+---
 > Herculie/M
-4181a6777
+> Herder/M
+4179c6847
+< Herero
+---
+> Herero/M
+4182c6850,6851
+< Hermaphroditus
+---
 > Hermann/M
-4183a6780,6783
+> Hermaphroditus/M
+4183a6853,6856
 > Hermia/M
 > Hermie/M
 > Hermina/M
 > Hermine/M
-4184a6785
+4185c6858,6859
+< Hermitage
+---
 > Hermione/M
-4186a6788
+> Hermitage/M
+4186a6861
 > Hermon
-4187a6790
+4187a6863
 > Hermy/M
-4188a6792
+4188a6865
 > Hernando/M
-4190a6795
+4190a6868
 > Herold/M
-4194a6800
+4193c6871
+< Herrick
+---
+> Herrick/M
+4195c6873,6874
+< Herschel
+---
 > Hersch/M
-4196a6803
+> Herschel/M
+4196a6876
 > Hersh/M
-4198a6806,6807
+4198a6879,6880
 > Herta/M
 > Hertha/M
-4200a6810,6811
+4201,4202c6883,6886
+< Herzegovina
+< Herzl
+---
 > Herve/M
 > Hervey/M
-4209a6821,6822
+> Herzegovina/M
+> Herzl/M
+4204,4208c6888,6892
+< Hesiod
+< Hesperus
+< Hess
+< Hesse
+< Hessian
+---
+> Hesiod/M
+> Hesperus/M
+> Hess/M
+> Hesse/M
+> Hessian/M
+4209a6894,6895
 > Hesther/M
 > Hestia/M
-4210a6824
+4210a6897
 > Hetti/M
-4211a6826,6831
+4211a6899,6904
 > Hetty/M
 > Hew/M
 > Hewe/M
 > Hewet/M
 > Hewett/M
 > Hewie/M
-4219a6840
+4214,4215c6907,6908
+< Heyerdahl
+< Heywood
+---
+> Heyerdahl/M
+> Heywood/M
+4217c6910
+< Hezekiah
+---
+> Hezekiah/M
+4220c6913,6914
+< Hialeah
+---
 > Hi/M
-4233a6855
+> Hialeah/M
+4225c6919
+< Hickok
+---
+> Hickok/M
+4227c6921
+< Hieronymus
+---
+> Hieronymus/M
+4230c6924
+< Highlander/MS
+---
+> Highlander/SM
+4233a6928
 > Hilarius/M
-4236a6859,6861
+4235c6930
+< Hilbert
+---
+> Hilbert/M
+4237c6932,6938
+< Hildebrand
+---
 > Hildagard/M
 > Hildagarde/M
 > Hilde/M
-4237a6863,6865
+> Hildebrand/M
 > Hildegaard/M
 > Hildegarde/M
 > Hildy/M
-4239a6868
+4239,4242c6940,6951
+< Hill
+< Hillary
+< Hillel
+< Hilton
+---
+> Hill/M
 > Hillard/M
-4241a6871,6877
+> Hillary/M
+> Hillel/M
 > Hillery/M
 > Hilliard
 > Hilliary/M
@@ -4086,155 +7567,415 @@
 > Hillier/M
 > Hilly/RM
 > Hillyer/M
-4246a6883
+> Hilton/M
+4244,4245c6953,6954
+< Himalayan
+< Himmler
+---
+> Himalayan/M
+> Himmler/M
+4247,4249c6956,6959
+< Hindemith
+< Hindenburg
+< Hindi
+---
 > Hinda/M
-4255a6893
+> Hindemith/M
+> Hindenburg/M
+> Hindi/M
+4254c6964
+< Hines
+---
+> Hines/M
+4256c6966,6967
+< Hipparchus
+---
 > Hinze/M
-4262a6901
+> Hipparchus/M
+4258,4259c6969,6970
+< Hippocratic
+< Hiram
+---
+> Hippocratic/M
+> Hiram/M
+4261c6972
+< Hirohito
+---
+> Hirohito/M
+4262a6974
 > Hirsch/M
-4271a6911
+4267c6979
+< Hitchcock
+---
+> Hitchcock/M
+4270c6982
+< Hmong
+---
+> Hmong/M
+4271a6984
 > Hobard/M
-4274a6915,6916
+4273,4274c6986,6989
+< Hobbes
+< Hobbs
+---
+> Hobbes/M
+> Hobbs/M
 > Hobey/M
 > Hobie/M
-4277a6920
+4277c6992,6994
+< Hodgkin
+---
+> Hodges/M
+> Hodgkin/M
 > Hoebart/M
-4301a6945
+4283c7000
+< Hogarth
+---
+> Hogarth/M
+4285,4286c7002,7003
+< Hohenlohe
+< Hohenstaufen
+---
+> Hohenlohe/M
+> Hohenstaufen/M
+4289c7006
+< Hohokam
+---
+> Hohokam/M
+4291,4292c7008,7009
+< Hokusai
+< Holbein
+---
+> Hokusai/M
+> Holbein/M
+4296c7013
+< Holiday
+---
+> Holiday/M
+4301a7019,7020
 > Holli/SM
-4303d6946
+> Hollis/M
+4303d7021
 < Hollis
-4305a6949
+4305c7023,7024
+< Holly
+---
+> Holly/M
 > Hollyanne/M
-4314a6959
+4309c7028
+< Holocaust
+---
+> Holocaust/M
+4311c7030
+< Holst
+---
+> Holst/M
+4313c7032
+< Holt
+---
+> Holt/M
+4315c7034,7036
+< Homeric
+---
 > Homere/M
-4315a6961
+> Homeric/M
 > Homerus/M
-4320a6967
+4320a7042
 > Honey/M
-4324c6971,6972
+4322c7044,7045
+< Honiara
+---
+> Hong/M
+> Honiara/M
+4324c7047,7048
 < Honorable
 ---
 > Honor/B
 > Honoria/M
-4338a6987
+4326,4327c7050,7052
+< Hood
+< Hooke/R
+---
+> Hood/M
+> Hooke/RM
+> Kooker/M
+4332c7057
+< Hope
+---
+> Hope/M
+4335,4337c7060,7062
+< Hopkins
+< Hopper
+< Horace
+---
+> Hopkins/M
+> Hopper/M
+> Horace/M
+4338a7064
 > Horatia/M
-4339a6989
+4339a7066
 > Horatius/M
-4345a6996,7000
+4341,4342c7068,7069
+< Hormuz
+< Horn
+---
+> Hormuz/M
+> Horn/M
+4345,4346c7072,7078
+< Horowitz
+< Horthy
+---
+> Horowitz/M
 > Horst/M
 > Hort/MN
 > Horten/M
 > Hortense
 > Hortensia/M
-4361a7017,7018
+> Horthy/M
+4353,4355c7085,7087
+< Houdini
+< House
+< Housman
+---
+> Houdini/M
+> House/M
+> Housman/M
+4359,4360c7091,7092
+< Howard
+< Howe
+---
+> Howard/M
+> Howe/M
+4361a7094,7095
 > Howey/M
 > Howie/M
-4363a7021
+4363c7097,7098
+< Hoyle
+---
+> Hoyle/M
 > Hoyt/M
-4368a7027
+4366,4367c7101,7102
+< Huang
+< Hubbard
+---
+> Huang/M
+> Hubbard/M
+4368a7104
 > Hube/RM
-4370a7030,7032
+4370a7107,7109
 > Huberto/M
 > Hubey/M
 > Hubie/M
-4379a7042,7043
+4378c7117
+< Huggins
+---
+> Huggins/M
+4379a7119,7121
+> Hughes/M
 > Hughie
 > Hugibert/M
-4381a7046
+4382c7124,7125
+< Hui
+---
 > Hugues/M
-4383a7049
+> Hui/M
+4383a7127
 > Hulda/M
-4384a7051
+4384a7129
 > Humbert/M
-4387a7055,7057
+4386,4387c7131,7135
+< Humboldt
+< Hume
+---
+> Humboldt/M
+> Hume/M
 > Humfrey/M
 > Humfrid/M
 > Humfried/M
-4391a7062
+4389,4390c7137,7138
+< Humphrey
+< Humvee
+---
+> Humphrey/M
+> Humvee/M
+4392c7140,7141
+< Hung
+---
 > Hunfredo/M
-4398a7070
+> Hung/M
+4396c7145
+< Hunt/R
+---
+> Hunt/MR
+4398a7148
 > Huntlee/M
-4400a7073,7074
+4400c7150,7152
+< Huntsville
+---
+> Huntsville/M
 > Hurlee/M
 > Hurleigh/M
-4404a7079
+4402c7154
+< Huron
+---
+> Huron/M
+4404,4409c7156,7162
+< Hus
+< Hussein
+< Husserl
+< Hussite
+< Huston
+< Hutchinson
+---
+> Hus/M
 > Husein/M
-4413a7089,7094
+> Hussein/M
+> Husserl/M
+> Hussite/M
+> Huston/M
+> Hutchinson/M
+4411c7164
+< Hutu
+---
+> Hutu/M
+4413c7166,7172
+< Huygens
+---
+> Huygens/M
 > Hy/M
 > Hyacinth/M
 > Hyacintha/M
 > Hyacinthe/M
 > Hyacinthia/M
 > Hyacinthie/M
-4414a7096
+4415,4416c7174,7176
+< Hyde
+< Hyderabad
+---
 > Hyatt/M
-4417a7100
+> Hyde/M
+> Hyderabad/M
+4417a7178
 > Hyman/M
-4418a7102,7103
+4418a7180,7181
 > Hymie
 > Hynda/M
-4455a7141
+4432a7196
+> IDE
+4433a7198,7199
+> IED
+> IEEE
+4443a7210
+> IP
+4446a7214
+> IRC
+4449c7217,7218
+< ISO
+---
+> ISO/M
+> ISP
+4452a7222
+> IVF
+4455a7226
 > Iain/M
-4456a7143
+4456a7228
 > Ianthe/M
-4458a7146,7147
+4458c7230,7232
+< Ibadan
+---
+> Ibadan/M
 > Ibbie/M
 > Ibby/M
-4463a7153
+4460,4461c7234,7235
+< Iberian
+< Ibiza
+---
+> Iberian/M
+> Ibiza/M
+4463c7237,7238
+< Ibo
+---
+> Ibo/M
 > Ibrahim/M
-4470a7161
+4471c7246,7247
+< Ida
+---
 > Ichabod/M
-4474a7166,7171
+> Ida/M
+4475c7251,7260
+< Ieyasu
+---
 > Idalia/M
 > Idalina/M
 > Idaline/M
 > Idell/M
 > Idelle/M
 > Idette/M
-4475a7173,7175
+> Ieyasu/M
 > Iggie/M
 > Iggy/M
 > Ignace/M
-4476a7177
+4477c7262,7265
+< Ignatius
+---
 > Ignacius/M
-4477a7179,7180
+> Ignatius/M
 > Ignaz/M
 > Ignazio/M
-4483c7186,7187
+4483,4485c7271,7278
 < Ikea/M
+< Ikhnaton
+< Ila
 ---
 > IKEA/M
 > Ikey/M
-4485a7190,7193
+> Ikhnaton/M
+> Ila/M
 > Ilaire/M
 > Ilario/M
 > Ileana/M
 > Ileane/M
-4487a7196,7197
+4487a7281,7282
 > Ilise/M
 > Ilka/M
-4488a7199
+4488a7284
 > Illa/M
-4491a7203,7207
+4491c7287,7292
+< Illuminati
+---
+> Illuminati/M
 > Ilsa/M
 > Ilse/M
 > Ilysa/M
 > Ilyse/M
 > Ilyssa/M
-4495a7212
+4495a7297
 > Immanuel
-4496a7214
+4496a7299
 > Imogen/M
-4497a7216
+4497a7301
 > Imojean/M
-4499c7218
+4499c7303
 < In/M
 ---
 > In/MP
-4522a7242,7243
+4512a7317
+> Indies/M
+4515c7320
+< Indochinese
+---
+> Indochinese/M
+4518c7323
+< Indore
+---
+> Indore/M
+4522c7327,7329
+< Ines
+---
+> Ines/M
 > Inesita/M
 > Inessa/M
-4524c7245,7256
+4524c7331,7342
 < Inge
 ---
 > Inga/M
@@ -4242,147 +7983,282 @@
 > Ingaborg/M
 > Ingamar/M
 > Ingar/M
-> Inge/R
+> Inge/RM
 > Ingeberg/M
 > Ingeborg/M
 > Ingelbert/M
 > Ingemar/M
 > Inger/M
 > Inglebert/M
-4525a7258,7260
+4525a7344,7346
 > Inglis/M
 > Ingmar/M
 > Ingra/M
-4528a7264,7269
+4527c7348
+< Ingres
+---
+> Ingres/M
+4528a7350,7355
 > Ingrim/M
 > Ingunna/M
 > Inigo/M
 > Inna/M
 > Inness/M
 > Innis/M
-4543a7285,7287
+4532c7359
+< Inquisition
+---
+> Inquisition/M
+4533a7361
+> Instagram/M
+4536c7364
+< Intelsat
+---
+> Intelsat/M
+4538,4539c7366,7367
+< Internet/S
+< Interpol
+---
+> Internet/SM
+> Interpol/M
+4544c7372,7375
+< Ionesco
+---
 > Iolande/M
 > Iolanthe/M
 > Iona
-4546a7291,7293
+> Ionesco/M
+4546a7378,7380
 > Iorgo/MS
 > Iormina/M
 > Iosep/M
-4560a7308
+4549c7383
+< Iphigenia
+---
+> Iphigenia/M
+4552,4553c7386,7387
+< Iqbal
+< Iquitos
+---
+> Iqbal/M
+> Iquitos/M
+4561,4562c7395,7398
+< Irene
+< Iris
+---
 > Irena/M
-4561a7310
+> Irene/M
 > Irina/M
-4567a7317
+> Iris/M
+4565c7401
+< Irishmen
+---
+> Irishmen/M
+4567,4568c7403,7405
+< Irishwomen
+< Irkutsk
+---
+> Irishwomen/M
 > Irita/M
-4573a7324
+> Irkutsk/M
+4572c7409
+< Irrawaddy
+---
+> Irrawaddy/M
+4573a7411
 > Irv/MG
-4577a7329,7330
+4575,4576c7413,7414
+< Irvine
+< Irving
+---
+> Irvine/M
+> Irving/M
+4577a7416,7417
 > Irwinn/M
 > Isa
-4578a7332
+4578a7419
 > Isaak/M
-4579a7334
+4580c7421,7422
+< Isabella
+---
 > Isabelita/M
-4581a7337,7342
+> Isabella/M
+4582,4585c7424,7435
+< Isaiah
+< Iscariot
+< Isfahan
+< Isherwood
+---
 > Isac/M
 > Isacco/M
 > Isador/M
 > Isadora/M
 > Isadore/M
 > Isahella/M
-4582a7344
+> Isaiah/M
 > Isak/M
-4583a7346
+> Iscariot/M
 > Iseabal/M
-4589a7353,7357
+> Isfahan/M
+> Isherwood/M
+4587c7437
+< Ishmael
+---
+> Ishmael/M
+4589a7440,7444
 > Isiahi/M
 > Isidor/M
 > Isidora/M
 > Isidore/M
 > Isidoro/M
-4598a7367
+4594c7449
+< Islamic
+---
+> Islamic/M
+4596c7451
+< Islamist
+---
+> Islamist/M
+4599c7454,7455
+< Isolde
+---
 > Isobel/M
-4606a7376,7379
+> Isolde/M
+4604c7460
+< Israelite
+---
+> Israelite/M
+4606c7462,7466
+< Issachar
+---
+> Issachar/M
 > Issi/M
 > Issiah/M
 > Issie/M
 > Issy/M
-4615a7389
+4616,4618c7476,7479
+< Ithaca
+< Ithacan
+< Ito
+---
 > Itch/M
-4622c7396,7403
+> Ithaca/M
+> Ithacan/M
+> Ito/M
+4620c7481
+< Ivan
+---
+> Ivan/M
+4622c7483,7491
 < Ives
 ---
 > Ivar/M
 > Ive/RSM
 > Iver/M
+> Ives/M
 > Ivett/M
 > Ivette/M
 > Ivie/M
 > Ivonne/M
 > Ivor/M
-4627a7409,7410
+4625c7494
+< Ivy
+---
+> Ivy/M
+4627a7497,7498
 > Izabel/M
 > Izak/M
-4634c7417,7418
+4630,4631c7501,7502
+< Izhevsk
+< Izmir
+---
+> Izhevsk/M
+> Izmir/M
+4634c7505,7506
 < J/MD
 ---
 > Izzy/M
 > J/MDNX
-4639a7424,7429
+4640c7512,7520
+< Jack
+---
 > Jabez/M
 > Jacenta/M
 > Jacinda/M
 > Jacinta/M
 > Jacintha/M
 > Jacinthe/M
-4640a7431,7432
+> Jack/M
 > Jackelyn/M
 > Jacki/M
-4641a7434
+4641a7522
 > Jacklin/M
-4642a7436,7437
+4642a7524,7525
 > Jackquelin/M
 > Jackqueline/M
-4646a7442
+4644c7527
+< Jacksonian
+---
+> Jacksonian/M
+4646a7530
 > Jaclin/M
-4652a7449
+4650c7534
+< Jacobi
+---
+> Jacobi/M
+4652a7537,7538
 > Jacobo/M
-4654a7452
+> Jacobs/M
+4654c7540,7541
+< Jacquard
+---
+> Jacquard/M
 > Jacquelin/M
-4656a7455,7457
+4657,4658c7544,7556
+< Jacques
+< Jacuzzi
+---
 > Jacquelynn/M
 > Jacquenetta/M
 > Jacquenette/M
-4657a7459,7462
+> Jacques/M
 > Jacquetta/M
 > Jacquette/M
 > Jacqui/M
 > Jacquie/M
-4658a7464,7467
+> Jacuzzi/M
 > Jacynth/M
 > Jada/M
 > Jade/M
 > Jae/M
-4663a7473
+4664c7562,7564
+< Jain
+---
 > Jaimie/M
-4664a7475
+> Jain/M
 > Jaine/M
-4668a7480,7481
+4666c7566
+< Jaipur
+---
+> Jaipur/M
+4668a7569,7570
 > Jakie/M
 > Jakob/M
-4676a7490
-> Jameson
-4677a7492,7493
+4677c7579,7582
+< Jamestown
+---
+> Jameson/M
+> Jamestown/M
 > Jamesy/M
 > Jamey/M
-4679a7496,7501
+4679a7585,7590
 > Jamil/M
 > Jamill/M
 > Jamima/M
 > Jamison/M
 > Jammal/M
 > Jammie/M
-4683c7505,7514
+4683c7594,7603
 < Jane
 ---
 > Janaya/M
@@ -4395,9 +8271,9 @@
 > Janek/M
 > Janel/M
 > Janela/M
-4684a7516
+4684a7605
 > Janella/M
-4686c7518,7523
+4686c7607,7612
 < Janet
 ---
 > Janene/M
@@ -4406,26 +8282,26 @@
 > Janet/M
 > Janeta/M
 > Janetta/M
-4687a7525,7527
+4687a7614,7616
 > Janeva/M
 > Janey/M
 > Jania/M
-4689a7530,7531
+4689a7619,7620
 > Janifer/M
-> Janina
-4692a7535
+> Janina/M
+4692a7624
 > Janith/M
-4693a7537
+4693a7626
 > Janka/M
-4694a7539,7540
+4694a7628,7629
 > Jannel/M
 > Jannelle/M
-4695a7542,7543
+4695a7631,7632
 > Janos/M
 > Janot/M
-4699a7548
+4699a7637
 > Jany/M
-4702a7552,7559
+4702a7641,7648
 > Jaquelin/M
 > Jaquelyn/M
 > Jaquenetta/M
@@ -4434,56 +8310,84 @@
 > Jarad/M
 > Jard/M
 > Jareb/M
-4703a7561,7562
+4704c7650,7653
+< Jarlsberg
+---
 > Jarib/M
 > Jarid/M
-4704a7564
+> Jarlsberg/M
 > Jarrad/M
-4705a7566
+4705a7655
 > Jarret/M
-4706a7568
+4706a7657
 > Jarrid/M
-4708a7571,7574
+4708a7660,7663
 > Jase/M
 > Jasen/M
 > Jasmin/M
 > Jasmina/M
-4711a7578
+4712c7667,7668
+< Jataka
+---
 > Jasun/M
-4714d7580
+> Jataka/M
+4714d7669
 < JavaScript/M
-4721a7588,7591
+4717,4718c7672,7673
+< Jaxartes
+< Jay
+---
+> Jaxartes/M
+> Jay/M
+4721c7676,7681
+< Jaycee/S
+---
+> Jaycee/MS
+> Jaycees/M
 > Jaye/M
 > Jayme/M
 > Jaymee/M
 > Jaymie/M
-4722a7593
+4722a7683
 > Jaynell/M
-4723a7595,7596
+4723a7685,7686
 > Jazmin/M
 > Jdavie/M
-4724a7598,7600
+4724a7688,7690
 > Jeana/M
 > Jeane/M
 > Jeanelle/M
-4727a7604
+4727a7694
 > Jeanna/M
-4731a7609
+4731a7699
 > Jecho/M
-4732a7611,7613
+4732a7701,7703
 > Jedd/M
 > Jeddy/M
 > Jedediah/M
-4733a7615
+4734c7705,7706
+< Jeep
+---
 > Jedidiah/M
-4740a7623
+> Jeep/M
+4739c7711
+< Jeffersonian
+---
+> Jeffersonian/M
+4741c7713,7714
+< Jeffrey
+---
 > Jeffie/M
-4742a7626,7627
+> Jeffrey/M
+4743c7716,7718
+< Jehoshaphat
+---
 > Jeffy/M
 > Jehanna/M
-4744a7630
-> Jehu
-4745a7632,7644
+> Jehoshaphat/M
+4744a7720
+> Jehu/M
+4745a7722,7734
 > Jelene/M
 > Jemie/M
 > Jemima/M
@@ -4497,115 +8401,166 @@
 > Jeni/M
 > Jenica/M
 > Jeniece/M
-4746a7646,7648
+4747c7736,7740
+< Jenkins
+---
 > Jeniffer/M
 > Jenilee/M
 > Jenine/M
-4747a7650
+> Jenkins/M
 > Jenn/MRJ
-4749c7652,7655
+4749c7742,7746
 < Jenner
 ---
 > Jennee/M
+> Jenner/M
 > Jennette/M
 > Jenni/M
 > Jennica/M
-4751a7658,7659
+4751a7749,7750
 > Jennilee/M
 > Jennine/M
-4753a7662
+4753a7753
 > Jeno/M
-4755a7665
+4755c7755,7756
+< Jephthah
+---
+> Jephthah/M
 > Jerad/M
-4756a7667,7671
+4756a7758,7762
 > Jeralee/M
 > Jeramey/M
 > Jeramie/M
 > Jere/M
 > Jereme/M
-4758a7674,7675
+4758c7764,7766
+< Jeremiahs
+---
+> Jeremiahs/M
 > Jeremias/M
 > Jeremie/M
-4761a7679
+4761a7770
 > Jermain/M
-4762a7681
+4763c7772,7773
+< Jeroboam
+---
 > Jermayne/M
-4765a7685
+> Jeroboam/M
+4765c7775,7776
+< Jerome
+---
+> Jerome/M
 > Jeromy/M
-4766a7687,7690
+4766a7778,7781
 > Jerrie/M
 > Jerrilee/M
 > Jerrilyn/M
 > Jerrine/M
-4768a7693
+4768a7784
 > Jerrome/M
-4769a7695
+4769a7786
 > Jerrylee/M
-4771a7698
+4771a7789
 > Jervis/M
-4772a7700,7704
+4773c7791,7800
+< Jesse
+---
 > Jessa/M
 > Jessalin/M
 > Jessalyn/M
 > Jessamine/M
 > Jessamyn/M
-4773a7706,7709
+> Jesse/M
 > Jessee/M
 > Jesselyn/M
 > Jessey/M
 > Jessi/M
-4775a7712,7713
+4775a7803,7804
 > Jessika/M
 > Jessy/M
-4777a7716,7717
+4777,4778c7806,7809
+< Jesus
+< Jetway
+---
+> Jesus/M
 > Jeth/M
-> Jethro
-4781a7722
+> Jethro/M
+> Jetway/M
+4781a7813
 > Jewelle/M
-4788a7730,7735
+4784c7816
+< Jewry
+---
+> Jewry/M
+4786,4788c7818,7826
+< Jidda
+< Jilin
+< Jill
+---
+> Jidda/M
+> Jilin/M
+> Jill/M
 > Jillana/M
 > Jillane/M
 > Jillayne/M
 > Jilleen/M
 > Jillene/M
 > Jilli/M
-4789a7737,7738
+4789a7828,7829
 > Jillie/M
 > Jilly/M
-4798c7747,7748
+4794,4795c7834,7835
+< Jinan
+< Jinnah
+---
+> Jinan/M
+> Jinnah/M
+4797,4799c7837,7843
+< Jivaro
 < Jo/M
+< Joan
 ---
+> Jivaro/M
 > Jo/MY
-> Joachim
-4799a7750,7752
+> Joachim/M
+> Joan/M
 > Joana/M
 > Joane/M
 > Joanie/M
-4802c7755
+4802c7846
 < Joanne/M
 ---
 > Joanne/SM
-4804a7758,7764
+4805c7849,7859
+< Jocasta
+---
 > Jobey/M
 > Jobi/M
 > Jobie/M
 > Jobina/M
+> Jobs/M
 > Joby/M
 > Jobye/M
 > Jobyna/M
-4805a7766,7767
+> Jocasta/M
 > Jocelin/M
 > Joceline/M
-4806a7769
+4807,4808c7861,7865
+< Jock
+< Jockey
+---
 > Jocelyne/M
-4808a7772,7773
+> Jock/M
+> Jockey/M
 > Jocko/M
 > Jodee/M
-4813c7778,7788
+4812,4813c7869,7880
+< Joe
 < Joel
 ---
+> Joe/M
 > Joeann/M
-> Joel/Y
+> Joel/YM
 > Joela/M
 > Joelie/M
 > Joell/MN
@@ -4615,174 +8570,277 @@
 > Joelly/M
 > Joellyn/M
 > Joelynn/M
-4814a7790
+4814a7882
 > Joete/M
-4816a7793
+4816a7885
 > Johan/M
-4818a7796
+4819c7888,7889
+< Johannes
+---
 > Johannah/M
-4821a7800,7801
+> Johannes/M
+4821a7892,7893
 > Johna/MH
 > Johnath/M
-4823a7804
+4823a7896
 > Johnette/M
-4824a7806
+4825c7898,7899
+< Johnnie
+---
 > Johnna/M
-4828a7811,7815
+> Johnnie/M
+4826a7901
+> Johns/M
+4828a7904,7908
 > Johny/M
 > Joice/M
 > Jojo/M
 > Jolee/M
 > Joleen/M
-4829a7817,7819
+4829a7910,7912
 > Joletta/M
 > Joli/M
 > Jolie/M
-4830a7821
+4831c7914,7918
+< Jolson
+---
 > Joline/M
-4831a7823,7825
+> Jolson/M
 > Joly/M
 > Jolyn/M
 > Jolynn/M
-4838,4839c7832,7835
+4834,4835c7921,7922
+< Jonahs
+< Jonas
+---
+> Jonahs/M
+> Jonas/M
+4838,4841c7925,7932
 < Jones
 < Joni/M
+< Jonson
+< Joplin
 ---
 > Jone/SM
+> Jones/M
 > Jonell/M
 > Joni/SM
 > Jonie/M
-4841a7838
+> Jonson/M
+> Joplin/M
 > Jordain/M
-4842a7840
+4842a7934
 > Jordana/M
-4843a7842,7845
+4843a7936,7939
 > Jordanna/M
 > Jordon/M
 > Jorey/M
 > Jorgan/M
-4844a7847,7852
+4844a7941,7946
 > Jori/M
 > Jorie/M
 > Jorrie/M
 > Jorry/M
 > Jory/M
 > Joscelin/M
-4845a7854
+4845a7948
 > Josee/M
-4848a7858
+4848a7952
 > Joseito/M
-4849a7860,7861
+4850,4851c7954,7957
+< Josephine
+< Josephs
+---
 > Josepha/M
 > Josephina/M
-4853a7866
+> Josephine/M
+> Josephs/M
+4853,4854c7959,7962
+< Josephus
+< Josh
+---
+> Josephus/M
 > Josey/M
-4854a7868
+> Josh/M
 > Joshia/M
-4855a7870,7871
+4856c7964,7967
+< Josiah
+---
 > Joshuah/M
 > Josi/M
-4856a7873
+> Josiah/M
 > Josias/M
-4857a7875
+4857a7969
 > Josselyn/M
-4858a7877
+4859c7971,7974
+< Joule
+---
 > Josy/M
-4859a7879,7880
+> Joule/M
 > Jourdain/M
 > Jourdan/M
-4862a7884,7886
+4861c7976
+< Jovian
+---
+> Jovian/M
+4863,4864c7978,7984
+< Joyce
+< Joycean
+---
 > Joya/M
 > Joyan/M
 > Joyann/M
-4864a7889,7890
+> Joyce/M
+> Joycean/M
 > Joycelin/M
 > Joye/M
-4865a7892
+4865a7986
 > Jozef/M
-4867a7895
+4867a7989
 > Jsandye/M
-4872a7901
+4872,4873c7994,7997
+< Jubal
+< Judah
+---
+> Jubal/M
 > Jud
-4881a7911,7912
+> Judaeo
+> Judah/M
+4879,4880c8003,8004
+< Jude
+< Judea
+---
+> Jude/M
+> Judea/M
+4881a8006,8007
 > Judi/MH
 > Judie/M
-4882a7914,7915
+4882a8009,8010
 > Juditha/M
 > Judon/M
-4884a7918
+4884c8012,8013
+< Judy
+---
+> Judy/M
 > Judye/M
-4885a7920
+4885a8015
 > Juieta/M
-4887c7922,7924
+4887c8017,8020
 < Jules
 ---
 > Jule/SM
+> Jules/M
 > Julee/M
 > Juli/M
-4890a7928,7930
+4889,4890c8022,8026
+< Julian
+< Juliana
+---
+> Julian/M
+> Juliana/M
 > Juliane/M
 > Juliann/M
 > Julianna/M
-4892a7933
+4893c8029,8032
+< Juliet
+---
 > Julienne/M
-4893a7935,7936
+> Juliet/M
 > Julieta/M
 > Julietta/M
-4894a7938,7939
+4894a8034,8035
 > Julina/M
 > Juline/M
-4895a7941,7942
+4895a8037,8038
 > Julissa/M
 > Julita/M
-4901a7949
+4899c8042
+< Jun
+---
+> Jun/M
+4901a8045
 > Junette/M
-4904a7953,7955
+4903,4904c8047,8051
+< Jungfrau
+< Jungian
+---
+> Jungfrau/M
+> Jungian/M
 > Junia/M
 > Junie/M
 > Junina/M
-4910a7962
+4910a8058
 > Justen/M
-4912a7965
+4912a8061
 > Justina/M
-4914a7968,7971
+4914a8064,8067
 > Justinn/M
 > Justino/M
 > Justis/M
 > Justus/M
-4917c7974,7975
+4916,4917c8069,8071
+< Juvenal
 < K/SMNGJ
 ---
+> Juvenal/M
 > Jyoti/M
 > K/SMNRGJ
-4929a7988,7991
+4921c8075
+< KGB
+---
+> KGB/M
+4928c8082
+< Kaaba
+---
+> Kaaba/M
+4929a8084,8087
 > Kacey/M
 > Kacie/M
 > Kacy/M
 > Kaela/M
-4932a7995,7996
+4931,4932c8089,8092
+< Kafkaesque
+< Kagoshima
+---
+> Kafkaesque/M
+> Kagoshima/M
 > Kahaleel/M
 > Kahlil/M
-4933a7998,7999
+4934c8094,8101
+< Kaifeng
+---
 > Kai/M
 > Kaia/M
-4934a8001,8005
+> Kaifeng/M
 > Kaila/M
 > Kaile/M
 > Kailey/M
 > Kain/M
 > Kaine/M
-4936a8008,8012
+4936a8104,8108
 > Kaitlyn/M
 > Kaitlynn/M
 > Kaja/M
 > Kakalina/M
 > Kala/M
-4940a8017,8019
+4938,4939c8110,8111
+< Kalamazoo
+< Kalashnikov
+---
+> Kalamazoo/M
+> Kalashnikov/M
+4941,4942c8113,8117
+< Kalevala
+< Kalgoorlie
+---
 > Kale/M
 > Kaleb/M
 > Kaleena/M
-4943a8023,8031
+> Kalevala/M
+> Kalgoorlie/M
+4944c8119,8129
+< Kalmyk
+---
 > Kalie/M
 > Kalil/M
 > Kalila/M
@@ -4792,38 +8850,70 @@
 > Kalle/M
 > Kalli/M
 > Kally/M
-4944a8033
+> Kalmyk/M
 > Kalvin/M
-4947a8037,8040
+4946c8131
+< Kamchatka
+---
+> Kamchatka/M
+4947a8133,8136
 > Kameko/M
 > Kamila/M
 > Kamilah/M
 > Kamillah/M
-4951a8045
+4950c8139
+< Kan/S
+---
+> Kan/SM
+4952,4953c8141,8144
+< Kandahar
+< Kandinsky
+---
 > Kandace/M
-4953a8048
+> Kandahar/M
+> Kandinsky/M
 > Kandy
-4954a8050
+4954a8146
 > Kania/M
-4961a8058
+4956,4957c8148,8149
+< Kano
+< Kanpur
+---
+> Kano/M
+> Kanpur/M
+4959c8151
+< Kansas
+---
+> Kansas/M
+4961,4962c8153,8155
+< Kantian
+< Kaohsiung
+---
+> Kantian/M
 > Kanya/M
-4967a8065,8066
+> Kaohsiung/M
+4966,4967c8159,8162
+< Karaganda
+< Karakorum
+---
+> Karaganda/M
+> Karakorum/M
 > Karalee/M
 > Karalynn/M
-4968a8068,8069
+4968a8164,8165
 > Kare/M
 > Karee/M
-4969a8071
+4969a8167
 > Karel/M
-4970a8073
+4970a8169
 > Karena/M
-4972a8076,8080
+4972a8172,8176
 > Karia/M
 > Karie/M
 > Karil/M
 > Karilynn/M
 > Karim/M
-4975c8083,8088
+4975c8179,8184
 < Karl/M
 ---
 > Karine/M
@@ -4832,7 +8922,7 @@
 > Karissa/M
 > Karita/M
 > Karl/MNX
-4976a8090,8097
+4976a8186,8193
 > Karlan/M
 > Karlee/M
 > Karleen/M
@@ -4841,7 +8931,7 @@
 > Karlie/M
 > Karlik/M
 > Karlis
-4978c8099,8106
+4978c8195,8202
 < Karo/M
 ---
 > Karlotta/M
@@ -4852,7 +8942,7 @@
 > Karna/M
 > Karney/M
 > Karo/MY
-4979a8108,8115
+4979a8204,8211
 > Karola/M
 > Karole/M
 > Karolina/M
@@ -4861,14 +8951,14 @@
 > Karon/M
 > Karrah/M
 > Karrie/M
-4980a8117,8120
+4980a8213,8216
 > Karry/M
 > Kary/M
 > Karyl/M
 > Karylin/M
-4984a8125
+4984a8221
 > Kaspar/M
-4985a8127,8136
+4985a8223,8232
 > Kasper/M
 > Kass
 > Kassandra/M
@@ -4879,57 +8969,80 @@
 > Kat/M
 > Kata/M
 > Katalin/M
-4986a8138
+4986a8234
 > Katee/M
-4987a8140,8145
+4987a8236,8241
 > Katerina/M
 > Katerine/M
 > Katey/M
 > Kath/M
 > Katha/M
 > Katharina/M
-4988a8147,8149
+4988a8243,8245
 > Katharyn/M
 > Kathe/M
 > Katherina/M
-4990a8152
+4991c8248,8249
+< Kathiawar
+---
 > Kathi/M
-4993a8156
+> Kathiawar/M
+4993a8252
 > Kathlin/M
-4996a8160
+4996a8256
 > Kathryne/M
-4997a8162,8163
+4997a8258,8259
 > Kathye/M
 > Kati/M
-4999a8166,8169
+5000c8262,8266
+< Katmai
+---
 > Katine/M
 > Katinka/M
 > Katleen/M
 > Katlin/M
-5003a8174,8179
+> Katmai/M
+5002c8268
+< Katowice
+---
+> Katowice/M
+5003a8270,8275
 > Katrine
 > Katrinka/M
 > Katti/M
 > Kattie/M
 > Katuscha/M
 > Katusha/M
-5004a8181
+5004a8277
 > Katya/M
-5011a8189
+5010,5011c8283,8285
+< Kawasaki
+< Kay
+---
+> Kawasaki/M
+> Kay/M
 > Kaycee/M
-5013a8192,8197
+5013a8288,8293
 > Kayle/M
 > Kaylee/M
 > Kayley/M
 > Kaylil/M
 > Kaylyn/M
 > Kayne/M
-5019a8204,8207
+5018c8298
+< Kazantzakis
+---
+> Kazantzakis/M
+5019a8300,8303
 > Kean
 > Keane/M
 > Kearney/M
 > Keary/M
-5022a8211,8217
+5021c8305
+< Keats
+---
+> Keats/M
+5022a8307,8313
 > Keefe/RM
 > Keefer/M
 > Keelby/M
@@ -4937,11 +9050,16 @@
 > Keelia/M
 > Keely/M
 > Keen/M
-5023a8219
+5024c8315,8316
+< Keewatin
+---
 > Keene/M
-5025a8222
+> Keewatin/M
+5025a8318
 > Keir/M
-5027a8225,8234
+5028c8321,8331
+< Keller
+---
 > Kelbee/M
 > Kelby/M
 > Kelcey/M
@@ -4952,51 +9070,82 @@
 > Kelila/M
 > Kellby/M
 > Kellen/M
-5030a8238
+> Keller/M
+5030a8334
 > Kellia/M
-5031a8240
+5032,5033c8336,8340
+< Kellogg
+< Kelly
+---
 > Kellina/M
-5032a8242
+> Kellogg/M
 > Kellsie/M
-5033a8244
+> Kelly/M
 > Kellyann/M
-5034a8246,8247
+5034a8342,8343
 > Kelsi/M
 > Kelsy/M
-5036a8250
+5036,5037c8345,8347
+< Kelvin
+< Kemerovo
+---
+> Kelvin/M
 > Kelwin/M
-5039a8254
+> Kemerovo/M
+5039c8349,8351
+< Kempis
+---
+> Kempis/M
+> Ken/M
 > Kendal/M
-5040a8256
+5040a8353
 > Kendell/M
-5042c8258,8259
+5042c8355,8356
 < Kendrick/M
 ---
 > Kendre/M
 > Kendrick/MS
-5043a8261,8262
+5043a8358,8359
 > Kenn/M
 > Kenna/M
-5046a8266,8267
+5046a8363,8364
 > Kennett/M
 > Kennie/M
-5048a8270
+5048a8367
 > Kenon/M
-5059a8282,8283
+5051c8370
+< Kentuckian/SM
+---
+> Kentuckian/MS
+5055c8374
+< Kenyatta
+---
+> Kenyatta/M
+5059a8379,8380
 > Ker/M
 > Kerby/M
-5061a8286,8289
+5061a8383,8386
 > Keriann/M
 > Kerianne/M
 > Kerk/M
 > Kermie/M
-5062a8291
+5063,5065c8388,8391
+< Kern
+< Kerouac
+< Kerr
+---
 > Kermy/M
-5066a8296,8298
+> Kern/M
+> Kerouac/M
+> Kerr/M
+5067,5068c8393,8409
+< Kerry
+< Kettering
+---
 > Kerrie/M
 > Kerrill/M
 > Kerrin/M
-5067a8300,8306
+> Kerry/M
 > Kerstin/M
 > Kerwin/M
 > Kerwinn/M
@@ -5004,46 +9153,80 @@
 > Keslie/M
 > Kessia/M
 > Kessiah/M
-5068a8308,8312
+> Kettering/M
 > Ketti/M
 > Kettie/M
 > Ketty/M
 > Kev/MN
 > Kevan/M
-5070a8315
+5071c8412,8414
+< Kevlar
+---
 > Kevina/M
-5071a8317
+> Kevlar/M
 > Kevon/M
-5072a8319
+5073,5074c8416,8418
+< Kewpie
+< Key
+---
 > Kevyn/M
-5079a8327
+> Kewpie/M
+> Key/M
+5076,5078c8420,8422
+< Keynesian
+< Khabarovsk
+< Khachaturian
+---
+> Keynesian/M
+> Khabarovsk/M
+> Khachaturian/M
+5079a8424
 > Khalil/M
-5094a8343,8345
+5090,5091c8435,8436
+< Khrushchev
+< Khufu
+---
+> Khrushchev/M
+> Khufu/M
+5095c8440,8443
+< Kickapoo
+---
 > Ki/M
 > Kiah/M
 > Kial/M
-5097a8349,8350
+> Kickapoo/M
+5097,5098c8445,8449
+< Kiel
+< Kierkegaard
+---
+> Kiel/M
 > Kiele/M
 > Kienan/M
-5098a8352
+> Kierkegaard/M
 > Kiersten/M
-5101a8356
+5102,5103c8453,8458
+< Kikuyu
+< Kilauea
+---
 > Kikelia/M
-5103a8359,8361
+> Kikuyu/M
+> Kilauea/M
 > Kile/M
 > Kiley/M
 > Kilian/M
-5104a8363,8365
+5104a8460,8462
 > Killian/M
 > Killie/M
 > Killy/M
-5106a8368,8370
+5107c8465,8469
+< Kimberley
+---
 > Kimball/M
 > Kimbell/M
 > Kimberlee/M
-5107a8372
+> Kimberley/M
 > Kimberli/M
-5108a8374,8381
+5108a8471,8478
 > Kimberlyn/M
 > Kimble/M
 > Kimbra/M
@@ -5052,20 +9235,23 @@
 > Kimmy/M
 > Kin/M
 > Kincaid/M
-5109a8383,8384
+5109a8480,8481
 > Kingsley
 > Kingsly/M
-5112c8387,8388
+5112c8484,8485
 < Kinko's
 ---
 > Kinko/M
 > Kinna/M
-5113a8390,8391
+5114c8487,8489
+< Kinsey
+---
 > Kinnie/M
 > Kinny/M
-5115a8394
+> Kinsey/M
+5115a8491
 > Kinsley/M
-5118a8398,8405
+5118a8495,8502
 > Kipp/MR
 > Kippar/M
 > Kipper/M
@@ -5074,321 +9260,634 @@
 > Kira/M
 > Kirbee/M
 > Kirbie/M
-5124a8412
+5120c8504
+< Kirchhoff
+---
+> Kirchhoff/M
+5124a8509
 > Kiri/M
-5131a8420,8423
+5127c8512
+< Kirk
+---
+> Kirk/M
+5130c8515
+< Kirov
+---
+> Kirov/M
+5132c8517,8521
+< Kisangani
+---
 > Kirsteni/M
 > Kirsti/M
 > Kirstin/M
 > Kirstyn/M
-5134a8427,8429
+> Kisangani/M
+5135c8524,8527
+< Kissinger
+---
 > Kissee/M
 > Kissiah/M
 > Kissie/M
-5138a8434,8435
+> Kissinger/M
+5138c8530,8532
+< Kitchener
+---
+> Kitchener/M
 > Kitti/M
 > Kittie/M
-5140a8438,8439
+5140c8534,8536
+< Kiwanis
+---
+> Kiwanis/M
 > Kizzee/M
 > Kizzie/M
-5142a8442,8444
+5142a8539,8541
 > Klara/M
 > Klarika/M
 > Klarrisa/M
-5146a8449,8452
+5144c8543
+< Klee
+---
+> Klee/M
+5147,5148c8546,8551
+< Klimt
+< Kline
+---
 > Klemens/M
 > Klement/M
 > Kleon/M
 > Kliment/M
-5172a8479
+> Klimt/M
+> Kline/M
+5155c8558
+< Knickerbocker
+---
+> Knickerbocker/M
+5157c8560
+< Knight
+---
+> Knight/M
+5159,5162c8562,8565
+< Knossos
+< Knowles
+< Knox
+< Knoxville
+---
+> Knossos/M
+> Knowles/M
+> Knox/M
+> Knoxville/M
+5166,5167c8569,8570
+< Kobe
+< Koch
+---
+> Kobe/M
+> Koch/M
+5172a8576
 > Koenraad/M
-5183a8491,8495
+5179c8583
+< Kolyma
+---
+> Kolyma/M
+5183a8588,8592
 > Konstance/M
 > Konstantin/M
 > Konstantine/M
 > Konstanze/M
 > Koo/M
-5185a8498,8500
+5185a8595,8597
 > Kora/M
 > Koral/M
 > Koralle/M
-5187a8503,8504
+5187a8600,8601
 > Kordula/M
 > Kore/M
-5189a8507,8512
+5189a8604,8609
 > Korella/M
 > Koren/M
 > Koressa/M
 > Korey/M
 > Kori/M
 > Korie/M
-5190a8514,8517
+5190a8611,8614
 > Korney/M
 > Korrie/M
 > Korry/M
 > Kort/M
-5212a8540
+5192,5195c8616,8619
+< Korzybski
+< Kosciusko
+< Kossuth
+< Kosygin
+---
+> Korzybski/M
+> Kosciusko/M
+> Kossuth/M
+> Kosygin/M
+5197c8621
+< Kowloon
+---
+> Kowloon/M
+5204,5207c8628,8631
+< Krasnodar
+< Krasnoyarsk
+< Krebs
+< Kremlin
+---
+> Krasnodar/M
+> Krasnoyarsk/M
+> Krebs/M
+> Kremlin/M
+5212a8637
 > Krisha/M
-5213a8542
+5213a8639
 > Krishnah/M
-5214a8544,8546
+5214a8641,8643
 > Krispin/M
 > Krissie/M
 > Krissy/M
-5215a8548,8551
+5215a8645,8648
 > Kristal/M
 > Kristan/M
 > Kriste/M
 > Kristel/M
-5217c8553,8554
+5217c8650,8651
 < Kristi/M
 ---
 > Kristi/MN
 > Kristian/M
-5218a8556
+5218a8653
 > Kristien/M
-5221a8560,8564
+5221a8657,8661
 > Kristo/SM
 > Kristofer/M
 > Kristoffer/M
 > Kristofor/M
 > Kristoforo/M
-5223a8567
+5223a8664
 > Kristyn/M
-5230a8575
+5227,5230c8668,8672
+< Kropotkin
+< Kruger
+< Krugerrand
+< Krupp
+---
+> Kropotkin/M
+> Kruger/M
+> Krugerrand/M
+> Krupp/M
 > Krysta/M
-5231a8577,8579
+5231a8674,8676
 > Krystalle/M
 > Krystle/M
 > Krystyna/M
-5259a8608
+5234c8679
+< Kubrick
+---
+> Kubrick/M
+5236c8681
+< Kuibyshev
+---
+> Kuibyshev/M
+5238,5240c8683,8685
+< Kunming
+< Kuomintang
+< Kurd
+---
+> Kunming/M
+> Kuomintang/M
+> Kurd/M
+5242c8687
+< Kurdistan
+---
+> Kurdistan/M
+5244c8689
+< Kurosawa
+---
+> Kurosawa/M
+5248c8693
+< Kutuzov
+---
+> Kutuzov/M
+5256c8701
+< Kwangju
+---
+> Kwangju/M
+5259c8704,8705
+< Ky/H
+---
+> Ky/MH
 > Kyla/M
-5260a8610,8615
+5260a8707,8712
 > Kylen/M
 > Kylie/M
 > Kylila/M
 > Kylynn/M
 > Kym/M
 > Kynthia/M
-5262a8618
+5262c8714,8715
+< Kyrgyzstan
+---
+> Kyrgyzstan/M
 > Kyrstin/M
-5277c8633
+5264c8717
+< L'Amour
+---
+> L'Amour/M
+5266,5267c8719,8720
+< L'Oreal
+< L'Ouverture
+---
+> L'Oreal/M
+> L'Ouverture/M
+5277c8730,8732
 < LG
 ---
 > LG/M
-5295a8652
+> LGBT
+> LGBTQ
+5290c8745
+< La/M
+---
+> La/SM
+5292c8747
+< Laban
+---
+> Laban/M
+5295a8751
 > Lacee/M
-5297a8655
+5297a8754
 > Lacie/M
-5302a8661
+5299c8756
+< Ladoga
+---
+> Ladoga/M
+5301c8758
+< Lady
+---
+> Lady/M
+5303c8760,8761
+< Lafayette
+---
 > Laetitia/M
-5308a8668,8670
+> Lafayette/M
+5306,5309c8764,8770
+< Lagrange
+< Lagrangian
+< Lahore
+< Laius
+---
+> Lagrange/M
+> Lagrangian/M
+> Lahore/M
 > Laina/M
 > Lainey/M
 > Laird/M
-5315a8678
+> Laius/M
+5314c8775
+< Lakota
+---
+> Lakota/M
+5315a8777
 > Lalo/M
-5324a8688,8689
+5319,5321c8781,8783
+< Lamaze
+< Lamb
+< Lambert
+---
+> Lamaze/M
+> Lamb/M
+> Lambert/M
+5323c8785
+< Lambrusco
+---
+> Lambrusco/M
+5324a8787,8788
 > Lammond/M
 > Lamond/M
-5326a8692
+5326a8791
 > Lanae/M
-5337a8704,8705
+5328c8793
+< Lancashire
+---
+> Lancashire/M
+5332c8797
+< Land
+---
+> Land/M
+5335c8800
+< Landsat
+---
+> Landsat/M
+5338c8803,8805
+< Lang
+---
 > Lanette/M
 > Laney/M
-5342a8711,8718
+> Lang/M
+5340,5342c8807,8818
+< Langland
+< Langley
+< Langmuir
+---
+> Langland/M
+> Langley/M
+> Langmuir/M
 > Langsdon/M
 > Langston/M
 > Lani/M
 > Lanie/M
 > Lanita/M
+> Lankan/M
 > Lanna/M
 > Lanni/M
 > Lannie/M
-5352a8729
+5346a8823
+> Laos/M
+5349c8826
+< Laplace
+---
+> Laplace/M
+5352a8830
 > Laraine/M
-5355a8733,8738
+5355,5356c8833,8840
+< Laredo
+< Larousse
+---
+> Laredo/M
 > Lari/M
 > Larina/M
 > Larine/M
 > Larisa/M
 > Larissa/M
 > Lark/M
-5360a8744
+> Larousse/M
+5358c8842
+< Lars/N
+---
+> Lars/MN
+5360a8845
 > Laryssa/M
-5366a8751
+5365c8850
+< Lat
+---
+> Lat/M
+5366a8852
 > Latashia/M
-5367a8753
+5367a8854
 > Latia/M
-5373a8760,8761
+5373a8861,8862
 > Latrena/M
 > Latrina/M
-5378a8767,8768
+5377,5379c8866,8871
+< Laud/R
+< Laue
+< Laundromat
+---
+> Laud/MR
+> Lauder/M
+> Laue/M
 > Laughton
 > Launce/M
-5380a8771,8773
+> Laundromat/M
+5380a8873,8875
 > Lauraine/M
 > Laural/M
 > Lauralee/M
-5381a8775,8777
+5381a8877,8879
 > Laure/M
 > Lauree/M
 > Laureen/M
-5383c8779,8781
+5383c8881,8883
 < Lauren/M
 ---
 > Laurella/M
 > Lauren/SM
 > Laurena/M
-5384a8783
+5384a8885
 > Laurene/M
-5385a8785,8786
+5385a8887,8888
 > Lauretta/M
 > Laurette/M
-5386a8788,8789
+5386a8890,8891
 > Laurianne/M
 > Laurice/M
-5387a8791,8792
+5388c8893,8896
+< Laval
+---
 > Lauritz/M
 > Lauryn/M
-5388a8794
+> Laval/M
 > Lavena/M
-5389a8796
+5389a8898
 > Laverna/M
-5390a8798,8800
+5391c8900,8903
+< Lavoisier
+---
 > Lavina/M
 > Lavinia/M
 > Lavinie/M
-5392a8803
+> Lavoisier/M
+5392a8905
 > Law
-5394a8806
+5394,5396c8907,8912
+< Lawrence
+< Lawson
+< Layamon
+---
+> Lawrence/M
 > Lawry/M
-5395a8808,8809
+> Lawson/M
 > Lawton/M
 > Lay/M
-5397a8812,8816
+> Layamon/M
+5397a8914,8918
 > Layne/M
 > Layney/M
 > Layton/M
 > Lazar/M
 > Lazare/M
-5400c8819
+5400c8921
 < Le/SM
 ---
 > Le/SMN
-5407a8827
+5403,5404c8924,8925
+< Leadbelly
+< Leah
+---
+> Leadbelly/M
+> Leah/M
+5407c8928,8929
+< Leander
+---
+> Leander/M
 > Leandra/M
-5410a8831,8832
+5410a8933,8934
 > Leanor/M
 > Leanora/M
-5416a8839
+5414c8938
+< Leavenworth
+---
+> Leavenworth/M
+5416a8941
 > Lebbie/M
-5421a8845,8846
+5419c8944
+< Leda
+---
+> Leda/M
+5421a8947,8948
 > Leeann/M
 > Leeanne/M
-5422a8848,8853
+5423c8950,8956
+< Leeuwenhoek
+---
 > Leela/M
 > Leelah/M
 > Leeland/M
 > Leena/M
 > Leesa/M
 > Leese/M
-5425a8857
+> Leeuwenhoek/M
+5426c8959,8960
+< Legendre
+---
 > Lefty/M
-5429a8862
+> Legendre/M
+5428c8962
+< Leghorn
+---
+> Leghorn/M
+5429a8964
 > Legra/M
-5431a8865
+5431a8967
 > Leia/M
-5436a8871,8872
+5436c8972,8974
+< Leigh
+---
+> Leigh/M
 > Leigha/M
 > Leighton/M
-5437a8874
+5437a8976
 > Leilah/M
-5438a8876,8877
+5438a8978,8979
 > Leisha/M
 > Lek/M
-5439a8879
+5439a8981
 > Lelah/M
-5441a8882
+5441a8984
 > Lem/M
-5442a8884,8886
+5442a8986,8988
 > Lemar/M
 > Lemmie/M
 > Lemmy/M
-5447a8892,8894
+5447a8994,8996
 > Lenci/M
 > Lenee/M
 > Lenette/M
-5451a8899,8902
+5451c9000,9004
+< Leninist
+---
+> Leninist/M
 > Lenka/M
 > Lenna/M
 > Lennard/M
 > Lennie/M
-5459a8911,8912
+5458a9012
+> Lenten/M
+5459a9014,9015
 > Leodora/M
 > Leoine/M
-5460a8914
+5461c9017,9018
+< Leon
+---
 > Leoline/M
-5462a8917
+> Leon/M
+5462a9020
 > Leonanie/M
-5465a8921
+5465c9023,9024
+< Leoncavallo
+---
+> Leoncavallo/M
 > Leone/M
-5466a8923,8925
+5467c9026,9029
+< Leonid
+---
 > Leonelle/M
 > Leonerd/M
 > Leonhard/M
-5468a8928
+> Leonid/M
+5468a9031
 > Leonie/M
-5469a8930,8933
+5469a9033,9036
 > Leonora/M
 > Leonore/M
 > Leontine/M
 > Leontyne/M
-5471a8936
+5472c9039,9040
+< Lepidus
+---
 > Leora/M
-5475a8941
+> Lepidus/M
+5475c9043,9044
+< Lerner
+---
+> Lerner/M
 > Leroi/M
-5477a8944
+5476a9046
+> Les/M
+5477a9048
 > Leshia/M
-5478a8946
+5478a9050
 > Lesli/M
-5479a8948
+5479a9052
 > Lesly/M
-5484a8954
+5481c9054
+< Lesseps
+---
+> Lesseps/M
+5484a9058
 > Lesya/M
-5487a8958
+5487a9062
 > Lethia/M
-5488a8960
+5488a9064
 > Letisha/M
-5489a8962,8963
+5489a9066,9067
 > Letizia/M
 > Letta/M
-5490a8965,8969
+5490a9069,9073
 > Letti/M
 > Lettie/M
 > Letty/M
 > Leupold/M
 > Lev
-5492a8972
+5492a9076
 > Levey/M
-5494a8975
+5494c9078,9079
+< Leviathan
+---
+> Leviathan/M
 > Levin/M
-5497a8979
+5497a9083
 > Levon/M
-5499a8982,8983
-> Lewes
+5499a9086,9087
+> Lewes/M
 > Lewie/M
-5501a8986,8989
+5501c9089,9093
+< Lewis
+---
+> Lewis/M
 > Lewiss
 > Lexi/SM
 > Lexie/M
 > Lexine/M
-5503a8992,8995
+5503a9096,9099
 > Lexy/M
 > Leyla/M
 > Lezley/M
 > Lezlie/M
-5506a8999,9009
+5507c9103,9114
+< Libby
+---
 > Lia/M
 > Liam/M
 > Lian/M
@@ -5400,15 +9899,28 @@
 > Libbey/M
 > Libbi/M
 > Libbie/M
-5515a9019
+> Libby/M
+5511a9119
+> LibreOffice/M
+5516c9124,9126
+< Lichtenstein
+---
 > Licha/M
-5516a9021
+> Lichtenstein/M
 > Lida/M
-5522a9028
+5518c9128
+< Lie
+---
+> Lie/M
+5520c9130
+< Liebfraumilch
+---
+> Liebfraumilch/M
+5522a9133
 > Lief/M
-5523a9030
+5523a9135
 > Liesa/M
-5525,5526c9032,9035
+5525,5526c9137,9140
 < Lila/M
 < Lilia/M
 ---
@@ -5416,47 +9928,85 @@
 > Lila/SM
 > Lilah/M
 > Lilia/MS
-5528a9038
+5528a9143
 > Liliane/M
-5530a9041
+5530,5531c9145,9148
+< Liliuokalani
+< Lille
+---
+> Liliuokalani/M
 > Lilla/M
-5531a9043
+> Lille/M
 > Lilli/MS
-5535a9048
+5535c9152,9153
+< Lilliputian/SM
+---
+> Lilliputian/MS
 > Lilllie/M
-5538a9052
+5538a9157
 > Lilyan/M
-5547a9062
+5542,5543c9161,9162
+< Limburger
+< Limoges
+---
+> Limburger/M
+> Limoges/M
+5547a9167
 > Linc/M
-5551a9067,9069
+5549c9169
+< Lind
+---
+> Lind/M
+5551,5554c9171,9184
+< Lindbergh
+< Lindsay
+< Lindsey
+< Lindy
+---
+> Lindbergh/M
 > Lindi/M
 > Lindie/M
 > Lindon/M
-5553a9072
+> Lindsay/M
+> Lindsey/M
 > Lindsy/M
-5554a9074,9079
+> Lindy/M
 > Linea/M
 > Linell/M
 > Linet/M
 > Linette/M
 > Link/M
 > Linn/M
-5555a9081,9085
+5556c9186,9191
+< Linotype
+---
 > Linnea/M
 > Linnell/M
 > Linnet/M
 > Linnie/M
 > Linoel/M
-5560a9091
+> Linotype/M
+5559c9194
+< Linux/S
+---
+> Linux/MS
+5560a9196
 > Linzy/M
-5561a9093
+5562,5564c9198,9201
+< Lipizzaner
+< Lippi
+< Lippmann
+---
 > Lionello/M
-5566a9099
+> Lipizzaner/M
+> Lippi/M
+> Lippmann/M
+5566a9204
 > Lira/M
-5567a9101,9102
+5567a9206,9207
 > Lisabeth/M
 > Lisbeth/M
-5568a9104,9110
+5568a9209,9215
 > Lise/M
 > Lisetta/M
 > Lisette/M
@@ -5464,172 +10014,292 @@
 > Lishe/M
 > Lisle/M
 > Lissa/M
-5569a9112,9114
+5569a9217,9219
 > Lissi/M
 > Lissie/M
 > Lissy/M
-5573a9119
+5573c9223,9224
+< Liszt
+---
+> Liszt/M
 > Lita/M
-5577a9124,9126
+5577a9229,9231
 > Liuka/M
 > Liv/M
 > Liva/M
-5583a9133,9135
+5579c9233
+< Liverpudlian/MS
+---
+> Liverpudlian/SM
+5581,5582c9235,9236
+< Livingston
+< Livingstone
+---
+> Livingston/M
+> Livingstone/M
+5584c9238,9241
+< Livy
+---
 > Livvie/M
 > Livvy/M
 > Livvyy/M
-5586a9139,9141
+> Livy/M
+5586a9244,9246
 > Lizabeth/M
 > Lizbeth/M
 > Lizette/M
-5591a9147
+5590,5591c9250,9252
+< Llewellyn
+< Lloyd
+---
+> Llewellyn/M
+> Lloyd/M
 > Llywellyn/M
-5595a9152
+5594,5595c9255,9257
+< Lobachevsky
+< Lochinvar
+---
+> Lobachevsky/M
+> Lochinvar/M
 > Lock/M
-5600a9158
+5597c9259
+< Lockean
+---
+> Lockean/M
+5600c9262,9263
+< Lodge
+---
+> Lodge/M
 > Lodovico/M
-5601a9160
+5602,5603c9265,9267
+< Loewe
+< Loewi
+---
 > Loella/M
-5608a9168
+> Loewe/M
+> Loewi/M
+5606c9270
+< Lohengrin
+---
+> Lohengrin/M
+5608a9273
 > Loise/M
-5610a9171
+5611,5612c9276,9278
+< Lolita
+< Lollard
+---
 > Loleta/M
-5613a9175
+> Lolita/M
+> Lollard/M
+5613a9280
 > Lolly/M
-5618a9181
+5618a9286
 > Lona/M
-5620a9184
+5621c9289,9290
+< Long
+---
 > Lonee/M
-5624a9189,9192
+> Long/M
+5624a9294,9297
 > Loni/M
 > Lonna/M
 > Lonnard/M
 > Lonni/M
-5625a9194
+5625a9299
 > Lonny/M
-5627a9197
+5627a9302
 > Lorain/M
-5628a9199,9202
+5628a9304,9307
 > Loralee/M
 > Loralie/M
 > Loralyn/M
 > Lorant/M
-5630a9205,9206
+5630a9310,9311
 > Loree/M
 > Loreen/M
-5632c9208,9209
+5632c9313,9314
 < Loren
 ---
 > Lorelle/M
-> Loren/S
-5636a9214
+> Loren/SM
+5635,5636c9317,9319
+< Lorentz
+< Lorenz
+---
+> Lorentz/M
+> Lorenz/M
 > Lorenza/M
-5638a9217
+5638a9322
 > Lorette/M
-5639a9219,9221
+5639a9324,9326
 > Loria/M
 > Lorianna/M
 > Lorianne/M
-5640a9223,9228
+5640a9328,9333
 > Lorilee/M
 > Lorilyn/M
 > Lorin/M
 > Lorinda/M
 > Lorine/M
 > Lorita/M
-5641a9230
+5641a9335
 > Lorne/M
-5642a9232
+5642a9337
 > Lorrayne/M
-5643a9234
+5643a9339
 > Lorri/M
-5644a9236,9238
+5644a9341,9344
 > Lorrin/M
 > Lorry/M
 > Lory/M
-5645a9240
+> Los
+5645a9346
 > Lothaire/M
-5647a9243,9245
+5647a9349,9351
 > Lotta/M
 > Lotte/M
 > Lotti/M
-5648a9247
+5648a9353
 > Lotty/M
-5654a9254
+5652c9357
+< Louis
+---
+> Louis/M
+5654a9360
 > Louisette/M
-5659a9260
+5659c9365,9366
+< Lourdes
+---
+> Lourdes/M
 > Loutitia/M
-5663a9265
+5663c9370,9371
+< Lovelace
+---
+> Lovelace/M
 > Lovell
-5668a9271,9272
+5665c9373
+< Lowell
+---
+> Lowell/M
+5668a9377,9378
 > Lowrance/M
 > Loy/M
-5670a9275
+5671c9381,9382
+< Loyola
+---
 > Loydie/M
-5681c9286,9287
+> Loyola/M
+5678,5681c9389,9394
+< Lubavitcher
+< Lubbock
+< Lubumbashi
 < Lucas
 ---
+> Lubavitcher/M
+> Lubbock/M
+> Lubumbashi/M
 > Luca/SM
 > Lucais/M
-5683c9289,9291
+> Lucas/M
+5683,5684c9396,9400
 < Lucia/M
+< Lucian
 ---
 > Lucho/M
 > Luci/MN
 > Lucia/MS
-5684a9293
+> Lucian/M
 > Luciana/M
-5685a9295
+5685a9402
 > Lucie/M
-5686a9297
+5686a9404
 > Lucienne/M
-5687a9299
+5687a9406
 > Lucila/M
-5688a9301
+5688a9408
 > Lucilia/M
-5689a9303
+5689a9410
 > Lucina
-5690a9305
+5690a9412
 > Lucine/M
-5691a9307
+5691a9414
 > Lucita/M
-5694a9311
+5695,5696c9418,9420
+< Lucretia
+< Lucretius
+---
 > Lucky/M
-5699a9317,9319
+> Lucretia/M
+> Lucretius/M
+5699c9423,9426
+< Ludhiana
+---
+> Ludhiana/M
 > Ludovico/M
 > Ludovika/M
 > Ludvig/M
-5701a9322
+5701a9429
 > Luelle/M
-5708a9330,9331
+5703c9431
+< Luftwaffe
+---
+> Luftwaffe/M
+5708a9437,9438
 > Luise/M
 > Lukas/M
-5710a9334
+5711c9441,9442
+< Lully
+---
 > Lulita/M
-5717a9342,9343
+> Lully/M
+5716c9447
+< Lupercalia
+---
+> Lupercalia/M
+5717a9449,9450
 > Lura/M
 > Lurette/M
-5718a9345,9348
+5718a9452,9455
 > Lurleen/M
 > Lurlene/M
 > Lurline/M
 > Lusa/M
-5720a9351
+5720a9458
 > Lutero/M
-5731a9363
+5731c9469,9470
+< Lvov
+---
+> Lvov/M
 > Ly/MY
-5735a9368
+5734,5736c9473,9476
+< Lycra
+< Lycurgus
+< Lydia
+---
+> Lycra/M
+> Lycurgus/M
 > Lyda/M
-5737a9371,9372
+> Lydia/M
+5738c9478,9480
+< Lyell
+---
 > Lydie/M
 > Lydon/M
-5742a9378
+> Lyell/M
+5740c9482
+< Lyly
+---
+> Lyly/M
+5743c9485,9486
+< Lynch
+---
 > Lyn/M
-5744a9381,9383
+> Lynch/M
+5744a9488,9490
 > Lynde/M
 > Lyndel/M
 > Lyndell/M
-5745a9385,9391
+5745a9492,9498
 > Lyndsay/M
 > Lyndsey/M
 > Lyndsie/M
@@ -5637,158 +10307,336 @@
 > Lynea/M
 > Lynelle/M
 > Lynett/M
-5747a9394
+5747c9500,9501
+< Lynn
+---
+> Lynn/M
 > Lynna/M
-5748a9396,9400
+5748a9503,9507
 > Lynnea/M
 > Lynnell/M
 > Lynnelle/M
 > Lynnet/M
 > Lynnett/M
-5749a9402
+5749a9509
 > Lynsey/M
-5754a9408
+5750a9511
+> Lyons/M
+5752c9513
+< Lysenko
+---
+> Lysenko/M
+5754a9516
 > Lyssa/M
-5768c9422
-< MHz
+5778a9541
+> MOOC
+5786c9549
+< MTV
 ---
-> MHz/M
-5789a9444
+> MTV/M
+5789a9553
 > Mab
-5790a9446
+5790a9555
 > Mabelle/M
-5818a9475
+5793c9558
+< MacArthur
+---
+> MacArthur/M
+5795c9560
+< MacDonald
+---
+> MacDonald/M
+5798,5799c9563,9564
+< Macaulay
+< Macbeth
+---
+> Macaulay/M
+> Macbeth/M
+5802c9567
+< Mace
+---
+> Mace/M
+5806c9571
+< Mach
+---
+> Mach/M
+5808c9573
+< Machiavellian
+---
+> Machiavellian/M
+5814,5816c9579,9581
+< Mackinaw
+< Macmillan
+< Macon
+---
+> Mackinaw/M
+> Macmillan/M
+> Macon/M
+5818a9584
 > Mada/M
-5820a9478,9480
+5820a9587,9589
 > Madalena/M
 > Madalyn/M
 > Maddalena/M
-5821a9482,9483
+5821a9591,9592
 > Maddi/M
 > Maddie/M
-5822a9485
+5822a9594
 > Maddy/M
-5823a9487,9488
+5823a9596,9597
 > Madel/M
 > Madelaine/M
-5824a9490,9493
+5824a9599,9602
 > Madelena/M
 > Madelene/M
 > Madelin/M
 > Madelina/M
-5825a9495,9497
+5825a9604,9606
 > Madella/M
 > Madelle/M
 > Madelon/M
-5828a9501,9502
+5828a9610,9611
 > Madlen/M
 > Madlin/M
-5832a9507
+5832a9616
 > Mady/M
-5833a9509
+5833a9618
 > Maegan/M
-5836a9513,9516
+5836,5837c9621,9626
+< Mafioso
+< Magdalena
+---
+> Mafioso/M
 > Mag/M
 > Magda/M
 > Magdaia/M
 > Magdalen
-5840a9521,9522
+> Magdalena/M
+5840c9629,9631
+< Magellanic
+---
+> Magellanic/M
 > Maggee/M
 > Maggi/M
-5841a9524
+5841a9633
 > Maggy/M
-5845a9529
+5845,5846c9637,9639
+< Magnitogorsk
+< Magog
+---
+> Magnitogorsk/M
 > Magnum
-5852a9537,9538
+> Magog/M
+5848c9641
+< Magritte
+---
+> Magritte/M
+5852a9646,9647
 > Mahala/M
 > Mahalia/M
-5860a9547,9548
+5857c9652
+< Mahdi
+---
+> Mahdi/M
+5860c9655,9657
+< Mahler
+---
+> Mahler/M
 > Mahmoud/M
 > Mahmud/M
-5862a9551,9552
+5862a9660,9661
 > Maia/M
 > Maible/M
-5863a9554,9555
+5863a9663,9664
 > Maiga/M
 > Maighdiln/M
-5870a9563,9565
+5865,5866c9666,9667
+< Mailer
+< Maillol
+---
+> Mailer/M
+> Maillol/M
+5868c9669
+< Maimonides
+---
+> Maimonides/M
+5870a9672,9674
 > Mair/M
 > Maire/M
 > Maisey/M
-5871a9567,9568
+5871a9676,9677
 > Maison/M
 > Maitilde/M
-5873a9571
+5873a9680
 > Maje/M
-5879a9578,9579
+5875c9682
+< Major
+---
+> Major/M
+5877c9684
+< Majuro
+---
+> Majuro/M
+5879c9686,9688
+< Maker
+---
+> Maker/M
 > Mal
 > Mala/M
-5885a9586
+5882,5885c9691,9695
+< Malacca
+< Malachi
+< Malagasy
+< Malamud
+---
+> Malacca/M
+> Malachi/M
+> Malagasy/M
+> Malamud/M
 > Malanie/M
-5894a9596
+5895c9705,9706
+< Malcolm
+---
 > Malchy/M
-5900a9603
+> Malcolm/M
+5901c9712,9714
+< Mali
+---
 > Malena/M
-5901a9605
+> Mali/M
 > Malia/M
-5903a9608
+5903a9717
 > Malina/M
-5904a9610
+5905,5906c9719,9724
+< Malinowski
+< Mallarme
+---
 > Malinde/M
-5905a9612,9613
+> Malinowski/M
 > Malissa/M
 > Malissia/M
-5906a9615
+> Mallarme/M
 > Mallissa/M
-5907a9617
+5907a9726
 > Mallorie/M
-5909a9620
+5909a9729
 > Malorie/M
-5916a9628,9632
+5912c9732
+< Malraux
+---
+> Malraux/M
+5917,5918c9737,9743
+< Mameluke
+< Mamet
+---
 > Malva/M
 > Malvin/M
 > Malvina/M
 > Malynda/M
 > Mame/M
-5932a9649
+> Mameluke/M
+> Mamet/M
+5925c9750
+< Manasseh
+---
+> Manasseh/M
+5930c9755
+< Manchurian
+---
+> Manchurian/M
+5932a9758
 > Manda/M
-5934a9652
+5935,5937c9761,9766
+< Mandela
+< Mandelbrot
+< Mandingo
+---
 > Mandel/M
-5936a9655,9656
+> Mandela/M
+> Mandelbrot/M
 > Mandi/M
 > Mandie/M
-5938a9659
+> Mandingo/M
+5938a9768
 > Mandriva/M
-5950a9672,9676
+5940c9770
+< Manet
+---
+> Manet/M
+5943,5944c9773,9774
+< Mani
+< Manichean
+---
+> Mani/M
+> Manichean/M
+5949c9779
+< Mann/G
+---
+> Mann/GM
+5951c9781,9787
+< Mansfield
+---
 > Mannie/M
+> Manning/M
 > Manny/M
 > Mano/M
 > Manolo/M
 > Manon/M
-5957a9684
+> Mansfield/M
+5953c9789
+< Mantegna
+---
+> Mantegna/M
+5957a9794
 > Manya/M
-5964c9691
+5964c9801
 < Mar/SM
 ---
 > Mar/SMN
-5965a9693
+5966,5967c9803,9805
+< Maracaibo
+< Marat
+---
 > Marabel/M
-5973a9702,9703
+> Maracaibo/M
+> Marat/M
+5971,5972c9809,9810
+< Marc
+< Marceau
+---
+> Marc/M
+> Marceau/M
+5973a9812,9813
 > Marcela/M
 > Marcelia/M
-5975a9706,9710
+5975a9816,9820
 > Marcelle/M
 > Marcellina/M
 > Marcelline/M
 > Marcello/M
 > Marcellus
-5977a9713,9714
+5977a9823,9824
 > Marchall/M
 > Marchelle/M
-5981a9719,9720
+5980c9827
+< Marciano
+---
+> Marciano/M
+5981a9829,9830
 > Marcile/M
 > Marcille/M
-5987a9727,9733
+5983c9832
+< Marconi
+---
+> Marconi/M
+5985c9834
+< Marcuse
+---
+> Marcuse/M
+5988,5989c9837,9851
+< Margaret
+< Margarita
+---
 > Mareah/M
 > Maren/M
 > Marena/M
@@ -5796,46 +10644,54 @@
 > Marga/M
 > Margalit/M
 > Margalo/M
-5988a9735,9740
+> Margaret/M
 > Margareta/M
 > Margarete/M
 > Margaretha/M
 > Margarethe/M
 > Margaretta/M
 > Margarette/M
-5990a9743
+> Margarita/M
+5990a9853
 > Margaux
-5991a9745
+5991a9855
 > Margeaux/M
-5992a9747,9749
+5992a9857,9859
 > Marget/M
 > Margette/M
 > Margi/M
-5993a9751
+5993a9861
 > Margit/M
-5994a9753
+5994a9863
 > Margot/M
-5997a9757
+5997a9867
 > Margy/M
-5999a9760
+6000c9870,9871
+< Marian
+---
 > Mariam/M
-6001a9763,9764
+> Marian/M
+6002c9873,9876
+< Marianne
+---
+> Marianas/M
 > Mariann/M
 > Marianna/M
-6004a9768,9770
+> Marianne/M
+6004a9879,9881
 > Maribelle/M
 > Maribeth/M
 > Marice/M
-6005a9772
+6005a9883
 > Maridel/M
-6006a9774,9779
+6006a9885,9890
 > Marieann/M
 > Mariejeanne/M
 > Mariel/M
 > Mariele/M
 > Marielle/M
 > Mariellen/M
-6007a9781,9788
+6007a9892,9899
 > Mariette/M
 > Marigold/M
 > Marijn/M
@@ -5844,225 +10700,410 @@
 > Marilee/M
 > Marilin/M
 > Marillin/M
-6011a9793
+6009c9901
+< Marin
+---
+> Marin/M
+6011a9904
 > Marinna/M
-6013a9796
+6013a9907,9908
 > Mariquilla/M
-6014a9798
+> Maris/M
+6014a9910
 > Mariska/M
-6016a9801
+6017c9913,9915
+< Maritain
+---
 > Marita/M
-6017a9803
+> Maritain/M
 > Maritsa
-6020a9807,9812
+6020c9918,9924
+< Marius
+---
+> Marius/M
 > Mariya/M
 > Marj/M
 > Marja/M
 > Marje/M
 > Marji/M
 > Marjie/M
-6022a9815
+6022a9927
 > Marjy/M
-6024a9818
+6025,6026c9930,9935
+< Markham
+< Markov
+---
 > Marketa/M
-6025a9820
-> Markos
-6026a9822
+> Markham/M
+> Markos/M
+> Markov/M
+> Marks/M
 > Markus/M
-6027a9824
+6027a9937
 > Marlane/M
-6029a9827,9830
+6029c9939,9943
+< Marlborough
+---
+> Marlborough/M
 > Marleah/M
 > Marlee/M
 > Marleen/M
 > Marlena/M
-6031a9833
+6032c9946,9949
+< Marlin
+---
 > Marlie/M
-6032a9835,9836
+> Marlin/M
 > Marline/M
 > Marlo/M
-6033a9838
+6034c9951,9954
+< Marlowe
+---
 > Marlow/M
-6034a9840,9841
+> Marlowe/M
 > Marlyn/M
 > Marmaduke/M
-6035a9843
+6036,6037c9956,9962
+< Marne
+< Maronite
+---
 > Marna/M
-6036a9845,9848
+> Marne/M
 > Marney/M
 > Marni/M
 > Marnia/M
 > Marnie/M
-6044a9857
+> Maronite/M
+6040c9965
+< Marquette
+---
+> Marquette/M
+6042c9967
+< Marquis
+---
+> Marquis/M
+6044a9970
 > Marrilee/M
-6045a9859,9860
+6045a9972,9973
 > Marris/M
 > Marrissa/M
-6051a9867
+6049a9978
+> Marseilles/M
+6051a9981
 > Marshal/M
-6052a9869,9870
+6052a9983,9984
 > Marsiella/M
 > Mart/MN
-6053a9872
+6054,6056c9986,9995
+< Martel
+< Martha
+< Martial
+---
 > Martainn/M
-6054a9874,9876
+> Martel/M
 > Martelle/M
 > Marten/M
 > Martguerita/M
-6055a9878,9880
+> Martha/M
 > Marthe/M
 > Marthena/M
 > Marti/M
-6057a9883,9884
+> Martial/M
+6058c9997,9999
+< Martin
+---
 > Martica/M
 > Martie/M
-6061a9889,9890
+> Martin/M
+6061a10003,10004
 > Martino/M
 > Martita/M
-6062a9892,9894
+6062a10006,10008
 > Martyn/M
 > Martynne/M
 > Marv/MN
-6063a9896
+6063a10010
 > Marve/M
-6064a9898
+6065c10012,10014
+< Marvin
+---
 > Marven/M
-6065a9900
+> Marvin/M
 > Marwin/M
-6070a9906
+6070a10020
 > Marya/M
-6071a9908
+6071a10022
 > Maryanna/M
-6072a9910,9911
+6072a10024,10025
 > Marybelle/M
 > Marybeth/M
-6073a9913,9915
+6073a10027,10029
 > Maryjane/M
 > Maryjo/M
 > Maryl/M
-6074a9917,9919
+6074a10031,10034
+> Marylander/M
 > Marylee/M
 > Marylin/M
 > Marylinda/M
-6075a9921,9924
+6075a10036,10039
 > Marylynne/M
 > Maryrose/M
 > Marys
 > Marysa/M
-6082a9932
+6078,6080c10042,10044
+< Masaryk
+< Mascagni
+< Masefield
+---
+> Masaryk/M
+> Mascagni/M
+> Masefield/M
+6082a10047
 > Masha/M
-6091a9942,9943
+6085c10050
+< Masonic
+---
+> Masonic/M
+6088,6091c10053,10058
+< Massachusetts
+< Massasoit
+< Massenet
+< Massey
+---
+> Massachusetts/M
+> Massasoit/M
+> Massenet/M
+> Massey/M
 > Massimiliano/M
 > Massimo/M
-6094c9946,9949
+6092a10060
+> Masters/M
+6094c10062,10066
 < Mather
 ---
 > Mata/M
 > Matelda/M
 > Mateo/M
 > Mathe/MR
-6096a9952
+> Mather/M
+6095a10068
+> Mathews/M
+6097,6101c10070,10079
+< Mathias
+< Mathis
+< Matilda
+< Matisse
+< Matt
+---
 > Mathian/M
-6097a9954,9955
+> Mathias/M
 > Mathilda/M
 > Mathilde/M
-6098a9957
+> Mathis/M
 > Matias/M
-6099a9959
+> Matilda/M
 > Matilde/M
-6102a9963
+> Matisse/M
+> Matt/M
+6102a10081
 > Matteo/M
-6103a9965,9966
+6103a10083,10084
 > Matthaeus/M
 > Mattheus/M
-6105a9969,9973
+6105c10086,10092
+< Matthias
+---
+> Matthews/M
+> Matthias/M
 > Matthieu/M
 > Matthiew/M
 > Matthus/M
 > Matti/M
 > Mattias/M
-6106a9975
+6106a10094
 > Matty/M
-6108a9978
+6109c10097,10098
+< Maugham
+---
 > Maudie/M
-6112a9983
+> Maugham/M
+6111c10100
+< Maupassant
+---
+> Maupassant/M
+6112a10102
 > Maure/M
-6113a9985,9986
+6114,6115c10104,10107
+< Mauriac
+< Maurice
+---
 > Maureene/M
 > Maurene/M
-6116a9990
+> Mauriac/M
+> Maurice/M
+6116a10109
 > Maurie/M
-6117a9992,9993
+6117a10111,10112
 > Maurise/M
 > Maurita/M
-6121a9998,10000
+6119c10114
+< Mauritanian/MS
+---
+> Mauritanian/SM
+6121a10117,10119
 > Maurits/M
 > Maurizia/M
 > Maurizio/M
-6123a10003
+6123c10121,10122
+< Maurois
+---
+> Maurois/M
 > Maury
-6126a10007
+6125c10124
+< Mauser
+---
+> Mauser/M
+6126a10126
 > Mavra/M
-6127a10009,10011
+6128c10128,10134
+< Maximilian
+---
 > Maxi/M
 > Maxie/M
 > Maxim
-6128a10013,10015
+> Maximilian/M
 > Maximilianus/M
 > Maximilien/M
 > Maximo/M
-6130a10018
+6130c10136,10137
+< Maxwell
+---
+> Maxwell/M
 > Maxy/M
-6133a10022,10023
+6134c10141,10144
+< Mayfair
+---
 > Maybelle/M
 > Maye/M
-6136a10027,10028
+> Mayer/M
+> Mayfair/M
+6137c10147,10150
+< Mayo
+---
 > Mayne/M
 > Maynord/M
-6137a10030
+> Mayo/M
 > Mayor/M
-6203a10097
+6139a10153
+> Mays/M
+6142c10156
+< Mazarin
+---
+> Mazarin/M
+6144c10158
+< Mazda
+---
+> Mazda/M
+6154c10168
+< McCarthy
+---
+> McCarthy/M
+6159c10173
+< McClellan
+---
+> McClellan/M
+6162,6163c10176,10177
+< McCormick
+< McCoy
+---
+> McCormick/M
+> McCoy/M
+6200,6202c10214,10216
+< Mead
+< Meade
+< Meadows
+---
+> Mead/M
+> Meade/M
+> Meadows/M
+6203a10218
 > Meaghan/M
-6204a10099
+6204a10220
 > Meara/M
-6205a10101
+6206c10222,10223
+< Medan
+---
 > Mechelle/M
-6216c10112
+> Medan/M
+6208,6209c10225,10226
+< Medellin
+< Media
+---
+> Medellin/M
+> Media/M
+6212,6214c10229,10231
+< Medici
+< Medina
+< Mediterranean/SM
+---
+> Medici/M
+> Medina/M
+> Mediterranean/MS
+6216c10233
 < Meg/M
 ---
 > Meg/MN
-6217a10114,10117
+6217a10235,10238
 > Megen/M
 > Meggi/M
 > Meggie/M
 > Meggy/M
-6218a10119,10121
+6218a10240,10242
 > Meghann/M
 > Mehetabel/M
 > Mei/MR
-6225c10128,10130
+6222c10246
+< Meir
+---
+> Meir/M
+6225c10249,10251
 < Mel/M
 ---
 > Mel/MY
 > Mela/M
 > Melamie/M
-6227a10133
+6227c10253,10254
+< Melanesian
+---
+> Melanesian/M
 > Melania/M
-6228a10135,10136
+6229c10256,10258
+< Melba
+---
 > Melantha/M
 > Melany/M
-6233a10142,10145
+> Melba/M
+6231,6232c10260,10261
+< Melchior
+< Melchizedek
+---
+> Melchior/M
+> Melchizedek/M
+6233a10263,10266
 > Melesa/M
 > Melessa/M
 > Melicent/M
 > Melina/M
-6234a10147
+6234a10268
 > Melinde/M
-6236a10150,10152
+6236a10271,10273
 > Melisandra/M
 > Melisenda/M
 > Melisent/M
-6237a10154,10162
+6238c10275,10288
+< Mellon
+---
 > Melisse/M
 > Melita/M
 > Melitta/M
@@ -6072,31 +11113,77 @@
 > Mellie/M
 > Mellisa/M
 > Mellisent/M
-6238a10164,10167
+> Mellon/M
 > Melloney/M
 > Melly/M
 > Melodee/M
 > Melodie/M
-6239a10169,10171
+6239a10290,10292
 > Melonie/M
 > Melony/M
 > Melosa/M
-6244a10177
+6245c10298,10299
+< Memling
+---
 > Melvyn/M
-6247a10181
+> Memling/M
+6247,6249c10301,10304
+< Menander
+< Mencius
+< Mencken
+---
+> Menander/M
 > Menard/M
-6254a10189
+> Mencius/M
+> Mencken/M
+6252,6253c10307,10308
+< Mendelian
+< Mendelssohn
+---
+> Mendelian/M
+> Mendelssohn/M
+6254a10310
 > Mendie/M
-6256a10192
+6256c10312,10313
+< Mendoza
+---
+> Mendoza/M
 > Mendy/M
-6277a10214
+6259c10316
+< Menes
+---
+> Menes/M
+6267,6268c10324,10325
+< Menotti
+< Mensa
+---
+> Menotti/M
+> Mensa/M
+6271,6272c10328,10329
+< Menzies
+< Mephistopheles
+---
+> Menzies/M
+> Mephistopheles/M
+6275,6276c10332,10333
+< Mercator
+< Mercedes
+---
+> Mercator/M
+> Mercedes/M
+6278c10335,10337
+< Mercia
+---
 > Merci/M
-6278a10216
+> Mercia/M
 > Mercie/M
-6281a10220,10221
+6282,6283c10341,10356
+< Meredith
+< Merino
+---
 > Mercy/M
 > Meredeth/M
-6282a10223,10230
+> Meredith/M
 > Meredithe/M
 > Merell/M
 > Meridel/M
@@ -6105,361 +11192,770 @@
 > Merilee/M
 > Merill/M
 > Merilyn/M
-6283a10232,10235
+> Merino/M
 > Meris
 > Merissa/M
 > Merl/M
 > Merla/M
-6285a10238,10239
+6286,6287c10359,10366
+< Merlot
+< Merovingian
+---
 > Merlina/M
 > Merline/M
-6286a10241,10242
+> Merlot/M
 > Merna/M
 > Merola/M
-6287a10244,10245
+> Merovingian/M
 > Merralee/M
 > Merrel/M
-6289a10248,10253
+6289a10369,10374
 > Merridie/M
 > Merrie/M
 > Merrielle/M
 > Merrile/M
 > Merrilee/M
 > Merrili/M
-6290a10255
+6290a10376
 > Merrily/M
-6292a10258,10259
+6292a10379,10380
 > Merry/M
 > Mersey
-6294a10262
+6294c10382,10383
+< Merton
+---
+> Merton/M
 > Merv/M
-6295a10264,10266
+6296c10385,10388
+< Mesa
+---
 > Merwin/M
 > Merwyn/M
 > Meryl/M
-6329a10301,10302
+> Mesa/M
+6300c10392
+< Mesolithic
+---
+> Mesolithic/M
+6305c10397
+< Messiaen
+---
+> Messiaen/M
+6314,6315c10406,10407
+< Methuselah
+< Metternich
+---
+> Methuselah/M
+> Metternich/M
+6318c10410
+< Mexicali
+---
+> Mexicali/M
+6322c10414,10415
+< Meyerbeer
+---
+> Meyerbeer/M
+> Meyers/M
+6326c10419
+< MiG
+---
+> MiG/M
+6330,6333c10423,10432
+< Micah
+< Micawber
+< Mich
+< Michael
+---
 > Mic
 > Micaela/M
-6333a10307,10310
+> Micah/M
+> Micawber/M
+> Mich/M
+> Michael/M
 > Michaela/M
 > Michaelina/M
 > Michaeline/M
 > Michaella/M
-6334a10312,10314
+6334a10434,10436
 > Michail/M
 > Michal/M
 > Michale/M
-6335a10316
+6335a10438
 > Micheil/M
-6339a10321,10323
+6339a10443,10445
 > Michelina/M
 > Micheline/M
 > Michell/M
-6347a10332
+6342c10448
+< Michelson
+---
+> Michelson/M
+6344c10450
+< Michigander/SM
+---
+> Michigander/MS
+6347a10454
 > Micki/M
-6357a10343
+6352c10459
+< Micronesian
+---
+> Micronesian/M
+6355c10462
+< Middleton
+---
+> Middleton/M
+6358c10465,10466
+< Midland/S
+---
 > Midge/M
-6361a10348,10349
+> Midland/MS
+6361c10469,10471
+< Midwestern/R
+---
+> Midwestern/MR
 > Mignon/M
 > Mignonne/M
-6362a10351,10354
+6362a10473,10476
 > Miguela/M
 > Miguelita/M
 > Mikael/M
 > Mikaela/M
-6363a10356,10357
+6363a10478,10479
 > Mikel/M
 > Mikey/M
-6364a10359,10360
+6364a10481,10482
 > Mikkel/M
 > Mikol/M
-6365a10362
+6365a10484
 > Mil/MY
-6370c10367,10369
+6370c10489,10492
 < Miles
 ---
 > Mildrid/M
 > Mile/SM
+> Miles/M
 > Milena/M
-6371a10371,10373
+6371a10494,10496
 > Milicent/M
 > Milissent/M
 > Milka/M
-6376a10379
+6373c10498
+< Mill/SR
+---
+> Mill/SMR
+6375,6376c10500,10503
+< Millay
+< Millet
+---
+> Millay/M
+> Miller/M
+> Millet/M
 > Milli/M
-6379a10383,10384
+6379,6380c10506,10510
+< Millikan
+< Milne
+---
+> Millikan/M
 > Millisent/M
 > Milly/M
-6383a10389
+> Mills/M
+> Milne/M
+6384,6386c10514,10518
+< Miltiades
+< Milton
+< Miltonic
+---
 > Milt/M
-6384a10391
+> Miltiades/M
 > Miltie/M
-6387a10395
+> Milton/M
+> Miltonic/M
+6387a10520
 > Milty/M
-6388a10397
+6388a10522
 > Milzie/M
-6391c10400,10401
+6391c10525,10526
 < Min/M
 ---
 > Min/MR
 > Mina/M
-6392a10403
+6393c10528,10529
+< Mindanao
+---
 > Minda/M
-6395a10407
+> Mindanao/M
+6395a10532
 > Miner/M
-6396a10409,10410
+6396a10534,10536
 > Minetta/M
 > Minette/M
-6398a10413,10415
+> Ming/M
+6398a10539,10541
 > Minna
 > Minnaminnie/M
 > Minne/M
-6402a10420
+6402a10546
 > Minni/M
-6403a10422,10423
+6403a10548,10549
 > Minnnie/M
 > Minny/M
-6405a10426
+6405a10552
 > Minor/M
-6410a10432
+6410a10558
 > Minta/M
-6414a10437
+6412c10560
+< Minuit
+---
+> Minuit/M
+6414a10563
 > Miquela/M
-6417a10441,10443
+6417c10566,10569
+< Mirabeau
+---
+> Mirabeau/M
 > Mirabel/M
 > Mirabella/M
 > Mirabelle/M
-6418a10445
+6419c10571,10576
+< Miranda
+---
 > Miran/M
-6419a10447,10450
+> Miranda/M
 > Mireielle/M
 > Mireille/M
 > Mirella/M
 > Mirelle/M
-6421a10453,10454
+6422c10579,10581
+< Miro
+---
 > Mirilla/M
 > Mirna/M
-6423a10457,10458
+> Miro/M
+6424c10583,10585
+< Miskito
+---
 > Mischa/M
 > Misha/M
-6425a10461
+> Miskito/M
+6426c10587,10588
+< Mississauga
+---
 > Missie/M
-6433a10470
+> Mississauga/M
+6432c10594
+< Mistassini
+---
+> Mistassini/M
+6433a10596
 > Misti
-6436a10474
+6436a10600
 > Mitchael/M
-6457a10496,10498
+6438c10602
+< Mitchell
+---
+> Mitchell/M
+6446,6447c10610,10611
+< Mixtec
+< Mizar
+---
+> Mixtec/M
+> Mizar/M
+6458,6459c10622,10627
+< Modesto
+< Modigliani
+---
 > Modesta/M
 > Modestia/M
 > Modestine/M
-6458a10500
+> Modesto/M
 > Modesty/M
-6469a10512,10513
+> Modigliani/M
+6462c10630
+< Mogadishu
+---
+> Mogadishu/M
+6469c10637,10639
+< Mohammedanism/MS
+---
+> Mohammedanism/SM
 > Mohandas/M
 > Mohandis/M
-6475a10520
-> Moina/M
-6477c10522
+6476,6477c10646,10649
+< Moira
 < Moises
 ---
+> Moina/M
+> Moira/M
 > Moise/MS
-6478a10524
+> Moises/M
+6478a10651
 > Moishe/M
-6486a10533,10534
+6485c10658
+< Molina
+---
+> Molina/M
+6486a10660,10661
 > Mollee/M
 > Molli/M
-6494a10543
+6493c10668
+< Moluccas
+---
+> Moluccas/M
+6494a10670
 > Mommy/M
-6498a10548
+6498a10675
 > Monah/M
-6510a10561
+6501c10678
+< Mondrian
+---
+> Mondrian/M
+6504c10681
+< Monet
+---
+> Monet/M
+6510a10688
 > Monika/M
-6514a10566
+6513,6514c10691,10693
+< Monmouth
+< Monongahela
+---
+> Monmouth/M
+> Monongahela/M
 > Monro/M
-6535a10588
+6519,6521c10698,10700
+< Mont
+< Montague
+< Montaigne
+---
+> Mont/M
+> Montague/M
+> Montaigne/M
+6524c10703
+< Montcalm
+---
+> Montcalm/M
+6526c10705
+< Montenegrin
+---
+> Montenegrin/M
+6528,6531c10707,10710
+< Monterrey
+< Montesquieu
+< Montessori
+< Monteverdi
+---
+> Monterrey/M
+> Montesquieu/M
+> Montessori/M
+> Monteverdi/M
+6534c10713
+< Montgolfier
+---
+> Montgolfier/M
+6535a10715
 > Monti/M
-6549a10603
+6539c10719
+< Montrachet
+---
+> Montrachet/M
+6543,6544c10723,10724
+< Moody
+< Moog
+---
+> Moody/M
+> Moog/M
+6548c10728
+< Moore
+---
+> Moore/M
+6549a10730
 > Mora/M
-6553a10608,10609
+6552,6555c10733,10741
+< Moravia
+< Moravian
+< Mordred
+< More
+---
+> Moravia/M
+> Moravian/M
 > Mord/M
 > Mordecai
-6554a10611
+> Mordred/M
 > Mordy/M
-6555a10613,10614
+> More/M
 > Moreen/M
 > Morena/M
-6556a10616
+6556a10743
 > Morey/M
-6557a10618,10623
+6557a10745,10750
 > Morgana/M
 > Morganica/M
 > Morganne/M
 > Morgen/M
 > Morgun/M
 > Moria/M
-6558a10625
+6558a10752
 > Morie/M
-6560a10628
+6560a10755
 > Morissa/M
-6561a10630,10631
+6562c10757,10760
+< Morley
+---
 > Moritz/M
 > Morlee/M
-6562a10633
+> Morley/M
 > Morly/M
-6564a10636
+6565c10763,10764
+< Moro
+---
 > Morna/M
-6570a10643
+> Moro/M
+6568c10767
+< Moroni
+---
+> Moroni/M
+6571,6572c10770,10772
+< Morris
+< Morrison
+---
 > Morrie/M
-6573a10647
+> Morris/M
+> Morrison/M
+6573a10774
 > Morry/M
-6575c10649,10651
+6575,6576c10776,10779
 < Mort/M
+< Mortimer
 ---
 > Mort/MN
 > Morten/M
 > Mortie/M
-6577a10654
+> Mortimer/M
+6577a10781
 > Morty/M
-6579a10657
+6580c10784,10785
+< Moseley
+---
 > Mose/SM
-6582a10661
+> Moseley/M
+6582a10788
 > Moshe/M
-6596a10676,10677
+6585c10791
+< Mosul
+---
+> Mosul/M
+6589,6591c10795,10797
+< Mott
+< Mount
+< Mountbatten
+---
+> Mott/M
+> Mount/M
+> Mountbatten/M
+6593c10799
+< Moussorgsky
+---
+> Moussorgsky/M
+6596a10803,10804
 > Moyna/M
 > Moyra/M
-6600c10681,10683
+6600c10808,10810
 < Mozilla/M
 ---
 > Mozelle/M
 > Mozes/M
 > Mozillian/SM
-6608a10692,10694
+6608a10819,10821
 > Muffin/M
 > Mufi/M
 > Mufinella/M
-6613a10700
+6611c10824
+< Muhammadan/SM
+---
+> Muhammadan/MS
+6613c10826,10827
+< Muir
+---
+> Muir/M
 > Muire/M
-6628a10716
+6620c10834
+< Mullins
+---
+> Mullins/M
+6622c10836
+< Multan
+---
+> Multan/M
+6625,6626c10839,10840
+< Mumford
+< Munch
+---
+> Mumford/M
+> Munch/M
+6628a10843
 > Munmro/M
-6630a10719
+6630,6631c10845,10847
+< Munro
+< Munster
+---
+> Munro/M
 > Munroe/M
-6637a10727,10729
+> Munster/M
+6634c10850
+< Murat
+---
+> Murat/M
+6637c10853,10856
+< Murdoch
+---
+> Murdoch/M
 > Murdock/M
 > Mureil/M
 > Murial/M
-6638a10731
+6639c10858,10859
+< Murillo
+---
 > Murielle/M
-6645a10739,10740
+> Murillo/M
+6641,6642c10861,10862
+< Murmansk
+< Murphy
+---
+> Murmansk/M
+> Murphy/M
+6645c10865,10867
+< Murrumbidgee
+---
+> Murrumbidgee/M
 > Murry/M
 > Murvyn/M
-6657a10753
+6655c10877
+< Mussorgsky
+---
+> Mussorgsky/M
+6657c10879,10880
+< Muzak
+---
+> Muzak/M
 > My/M
-6659a10756,10757
+6659a10883,10884
 > Myca/M
 > Mycah/M
-6662c10760,10761
+6661,6662c10886,10889
+< Mycenaean
 < Myers
 ---
+> Mycenaean/M
 > Mychal/M
 > Myer/SM
-6664a10764
+> Myers/M
+6664a10892
 > Mylo/M
-6665a10766,10767
+6665a10894,10895
 > Myrah/M
 > Myranda/M
-6666a10769,10772
+6666a10897,10900
 > Myriam/M
 > Myrilla/M
 > Myrle/M
 > Myrlene/M
-6668a10775,10778
+6668c10902,10906
+< Myron
+---
+> Myron/M
 > Myrta/M
 > Myrtia/M
 > Myrtice/M
 > Myrtie/M
-6669a10780,10781
+6670c10908,10911
+< Mysore
+---
 > Myrvyn/M
 > Myrwyn/M
-6670a10783
+> Mysore/M
 > MySpell/M
-6720a10834,10836
+6674,6675c10915,10916
+< NAACP
+< NAFTA
+---
+> NAACP/M
+> NAFTA/M
+6681,6682c10922,10923
+< NBA
+< NBC
+---
+> NBA/M
+> NBC/M
+6685c10926
+< NCAA
+---
+> NCAA/M
+6692c10933
+< NFL
+---
+> NFL/M
+6694c10935
+< NHL
+---
+> NHL/M
+6703c10944
+< NPR
+---
+> NPR/M
+6707a10949
+> NSA/M
+6720,6721c10962,10966
+< Nabokov
+< Nader
+---
+> Nabokov/M
 > Nada/M
 > Nadean/M
 > Nadeen/M
-6723a10840,10842
+> Nader/M
+6723a10969,10971
 > Nadiya/M
 > Nady/M
 > Nadya/M
-6733a10853
+6725,6727c10973,10975
+< Nagoya
+< Nagpur
+< Nagy
+---
+> Nagoya/M
+> Nagpur/M
+> Nagy/M
+6729c10977
+< Nahum
+---
+> Nahum/M
+6733a10982
 > Nalani/M
-6738a10859
+6739,6741c10988,10998
+< Nanak
+< Nanchang
+< Nancy
+---
 > Nana/M
-6739a10861,10864
+> Nanak/M
 > Nananne/M
 > Nance/M
 > Nancee/M
 > Nancey/M
-6740a10866,10867
+> Nanchang/M
 > Nanci/M
 > Nancie/M
-6741a10869
+> Nancy/M
 > Nanete/M
-6742a10871,10873
+6742a11000,11002
 > Nani/M
 > Nanice/M
 > Nanine/M
-6744a10876,10877
+6744a11005,11006
 > Nannette/M
 > Nanni/M
-6745a10879,10880
+6745a11008,11009
 > Nanny/M
 > Nanon/M
-6749a10885
+6747c11011
+< Nansen
+---
+> Nansen/M
+6749a11014
 > Naoma/M
-6750a10887
+6750a11016
 > Nap/M
-6755a10893,10894
+6755c11021,11023
+< Napoleonic
+---
+> Napoleonic/M
 > Nappie/M
 > Nappy/M
-6756a10896
+6756a11025
 > Nara
-6757a10898,10899
+6757a11027,11028
 > Nari/M
 > Nariko/M
-6767a10910,10914
+6761,6763c11032,11034
+< Narragansett
+< Nash
+< Nashua
+---
+> Narragansett/M
+> Nash/M
+> Nashua/M
+6767a11039,11043
 > Nata/M
 > Natal/M
 > Natala/M
 > Natale/M
 > Natalee/M
-6769a10917,10920
+6769a11046,11049
 > Natalina/M
 > Nataline/M
 > Natalya/M
 > Nataniel/M
-6770a10922
+6771c11051,11052
+< Natchez
+---
 > Natassia/M
-6772a10925,10926
+> Natchez/M
+6773c11054,11059
+< Nathan/S
+---
 > Nathalia/M
 > Nathalie/M
-6773a10928,10929
+> Nathan/SM
+> Nathans/M
 > Nathanael
 > Nathanial/M
-6774a10931
+6774a11061,11062
 > Nathanil/M
-6775a10933
+> Nation/M
+6775a11064
 > Natividad/M
-6776a10935,10936
+6776a11066,11067
 > Natka/M
 > Natty/M
-6800a10961,10966
+6778c11069
+< Naugahyde
+---
+> Naugahyde/M
+6780c11071
+< Nautilus
+---
+> Nautilus/M
+6784c11075
+< Navarre
+---
+> Navarre/M
+6788,6790c11079,11081
+< Nazarene
+< Nazareth
+< Nazca
+---
+> Nazarene/M
+> Nazareth/M
+> Nazca/M
+6801,6802c11092,11099
+< Neanderthal/MS
+< Neapolitan
+---
 > Neala/M
 > Neale/M
 > Neall/M
 > Nealon/M
 > Nealson/M
 > Nealy/M
-6808a10975,10982
+> Neanderthal/SM
+> Neapolitan/M
+6807c11104
+< Nebuchadnezzar
+---
+> Nebuchadnezzar/M
+6809c11106,11114
+< Nefertiti
+---
 > Neda/M
 > Nedda/M
 > Neddie/M
@@ -6468,7 +11964,14 @@
 > Neel/M
 > Neely/M
 > Nefen/M
-6818c10992,10997
+> Nefertiti/M
+6814a11120
+> Negros/M
+6816c11122
+< Nehemiah
+---
+> Nehemiah/M
+6818c11124,11129
 < Neil/M
 ---
 > Neil/SM
@@ -6477,18 +11980,31 @@
 > Neill/M
 > Neilla/M
 > Neille/M
-6819a10999,11000
+6819a11131,11132
 > Nelia/M
 > Nelie/M
-6820a11002,11003
+6820a11134,11135
 > Nelle/M
 > Nelli/M
-6822a11006
+6822a11138
 > Nels/N
-6834a11019,11020
+6824c11140
+< Nelson
+---
+> Nelson/M
+6827c11143
+< Neogene
+---
+> Neogene/M
+6834,6836c11150,11161
+< Nerf
+< Nero
+< Neruda
+---
+> Nerf/M
 > Nerissa/M
 > Nerita/M
-6835a11022,11028
+> Nero/M
 > Neron/M
 > Nert/M
 > Nerta/M
@@ -6496,268 +12012,513 @@
 > Nerti/M
 > Nertie/M
 > Nerty/M
-6837a11031
+> Neruda/M
+6838c11163,11169
+< Nesselrode
+---
 > Nessa/M
-6838a11033,11037
+> Nesselrode/M
 > Nessi/M
 > Nessie/M
 > Nessy/M
 > Nesta/M
 > Nester/M
-6844c11043,11044
+6841,6844c11172,11177
+< Nestorius
+< Netherlander/MS
+< Netherlands
 < Netscape/M
 ---
+> Nestorius/M
+> Netflix/M
+> Netherlander/SM
+> Netherlands/M
 > Netta/M
 > Netti/M
-6845a11046,11047
+6845a11179,11180
 > Nettle/M
 > Netty/M
-6851a11054,11057
+6847,6848c11182,11183
+< Nev
+< Neva
+---
+> Nev/M
+> Neva/M
+6851a11187,11190
 > Nevil/M
 > Nevile/M
 > Neville/M
 > Nevin/MS
-6852a11059
+6852a11192
 > Nevsa/M
-6862a11070
+6857c11197
+< Newman
+---
+> Newman/M
+6862c11202,11203
+< Nexis
+---
+> Nexis/M
 > Neysa/M
-6866a11075,11076
+6865c11206
+< Ni
+---
+> Ni/M
+6866a11208,11209
 > Nial/M
 > Niall/M
-6875a11086
+6868,6869c11211,11212
+< Nibelung
+< Nicaea
+---
+> Nibelung/M
+> Nicaea/M
+6874c11217
+< Nicene
+---
+> Nicene/M
+6876c11219,11221
+< Nicholas
+---
 > Nichol/SM
-6878c11089
+> Nichols/M
+> Nicholas/M
+6878,6879c11223,11224
 < Nichols
+< Nicholson
 ---
 > Nicholle/M
-6881a11093,11095
+> Nicholson/M
+6882,6883c11227,11237
+< Nicklaus
+< Nickolas
+---
 > Nickey/M
 > Nicki/M
 > Nickie/M
-6883c11097,11102
-< Nickolas
----
+> Nicklaus/M
 > Nicko/M
 > Nickola/SM
 > Nickolai/M
+> Nickolas/M
 > Nickolaus/M
 > Nicky/M
 > Nico/M
-6885a11105
+6885c11239,11240
+< Nicodemus
+---
+> Nicodemus/M
 > Nicol/M
-6886a11107
+6886a11242,11243
 > Nicolai/S
-6887a11109,11114
+> Nicolas/M
+6887a11245,11250
 > Nicolea/M
 > Nicolette/M
 > Nicoli/SM
 > Nicolina/M
 > Nicoline/M
 > Nicolle/M
-6890c11117,11118
+6890,6891c11253,11256
 < Nielsen
+< Nietzsche
 ---
 > Niel/SM
 > Niels/N
-6899a11128
+> Nielsen/M
+> Nietzsche/M
+6899c11264,11265
+< Nijinsky
+---
+> Nijinsky/M
 > Nikaniki/M
-6900a11130
+6900a11267
 > Niki/M
-6903a11134,11136
+6902c11269
+< Nikkei
+---
+> Nikkei/M
+6903a11271,11273
 > Nikkie/M
 > Niko/SM
 > Nikola/SM
-6904a11138,11139
+6904a11275,11276
 > Nikolaos/M
 > Nikolaus/M
-6905a11141,11143
+6905a11278,11280
 > Nikoletta/M
 > Nikolia/M
 > Nikolos/M
-6907c11145,11147
+6907,6909c11282,11286
 < Nile/M
+< Nimitz
+< Nimrod
 ---
 > Nil/SM
 > Nile/SM
 > Nilson/M
-6910a11151,11152
+> Nimitz/M
+> Nimrod/M
+6910a11288,11289
 > Ninetta/M
 > Ninette/M
-6911a11154,11156
+6912,6913c11291,11295
+< Nintendo
+< Niobe
+---
 > Ninnetta/M
 > Ninnette/M
 > Ninon/M
-6919a11165
+> Nintendo/M
+> Niobe/M
+6917c11299
+< Nirvana
+---
+> Nirvana/M
+6919c11301,11302
+< Nisei
+---
+> Nisei/M
 > Nissa/M
-6920a11167,11169
+6920a11304,11306
 > Nisse/M
 > Nissie/M
 > Nissy/M
-6922a11172,11173
+6922a11309,11310
 > Niven/M
 > Nixie
-6926a11178
+6924c11312
+< Nkrumah
+---
+> Nkrumah/M
+6926a11315
 > Noach/M
-6927a11180,11183
+6928c11317,11321
+< Nobel
+---
 > Noak/M
 > Noam/M
 > Noami/M
 > Nobe/M
-6929a11186
+> Nobel/M
+6929a11323
 > Nobie/M
-6930a11188
+6930a11325
 > Noby/M
-6932a11191,11193
+6932a11328,11330
 > Noelani/M
 > Noell/M
 > Noella/M
-6933a11195,11196
+6933a11332,11333
 > Noellyn/M
 > Noelyn/M
-6938a11202,11207
+6939c11339,11346
+< Nome
+---
 > Nolana/M
 > Noland/M
 > Nolie/M
 > Noll/M
 > Nollie/M
 > Nolly/M
-6939a11209
+> Nome/M
 > Nomi/M
-6940a11211,11215
+6940a11348,11352
 > Nonah/M
 > Noni/M
 > Nonie/M
 > Nonna/M
 > Nonnah/M
-6942a11218
+6942a11355
 > Norah/M
-6944a11221,11222
+6944a11358,11359
 > Norbie/M
 > Norby/M
-6945a11224
+6945a11361
 > Norean/M
-6946a11226
+6946a11363
 > Norene/M
-6948a11229,11230
+6949c11366,11368
+< Norma
+---
 > Norina/M
 > Norine/M
-6952a11235,11236
-> Normie/M
-> Normy/M
-6954c11238,11240
+> Norma/M
+6953,6954c11372,11378
+< Norplant
 < Norris
 ---
+> Normie/M
+> Normy/M
+> Norplant/M
 > Norri/MS
 > Norrie/M
+> Norris/M
 > Norry/M
-6973a11260
+6957c11381
+< Norsemen
+---
+> Norsemen/M
+6959c11383
+< Northampton
+---
+> Northampton/M
+6971c11395
+< Norwich
+---
+> Norwich/M
+6973,6974c11397,11399
+< Nostradamus
+< Nottingham
+---
+> Nostradamus/M
 > Notre
-6979a11267
+> Nottingham/M
+6979a11405
 > Novelia/M
-6985a11274
+6981c11407
+< Novgorod
+---
+> Novgorod/M
+6984c11410
+< Novokuznetsk
+---
+> Novokuznetsk/M
+6985a11412
 > Nowell/M
-7001a11291,11292
+6990,6992c11417,11419
+< Nubia
+< Nubian
+< Nukualofa
+---
+> Nubia/M
+> Nubian/M
+> Nukualofa/M
+6997,6998c11424,11425
+< Nuremberg
+< Nureyev
+---
+> Nuremberg/M
+> Nureyev/M
+7001a11429,11430
 > Nydia/M
 > Nye/M
-7002a11294
+7003,7014c11432,11444
+< O'Brien
+< O'Casey
+< O'Connell
+< O'Connor
+< O'Donnell
+< O'Hara
+< O'Higgins
+< O'Keeffe
+< O'Neil
+< O'Neill
+< O'Rourke
+< O'Toole
+---
 > Nyssa/M
-7042c11334
+> O'Brien/M
+> O'Casey/M
+> O'Connell/M
+> O'Connor/M
+> O'Donnell/M
+> O'Hara/M
+> O'Higgins/M
+> O'Keeffe/M
+> O'Neil/M
+> O'Neill/M
+> O'Rourke/M
+> O'Toole/M
+7025c11455
+< OK/SM
+---
+> OK/SMDG
+7039,7040c11469,11470
+< Oakley
+< Oates
+---
+> Oakley/M
+> Oates/M
+7042,7043c11472,11476
 < Ob/M
+< Obadiah
 ---
 > Ob/MD
-7043a11336,11338
+> Obadiah/M
 > Obadias/M
 > Obed/M
 > Obediah/M
-7046a11342,11344
+7044a11478
+> Obamacare
+7046,7049c11480,11486
+< Oberon
+< Occam
+< Occident
+< Occidental/SM
+---
+> Oberon/M
 > Obidiah/M
 > Obie
 > Oby/M
-7057a11356
+> Occam/M
+> Occident/M
+> Occidental/MS
+7055c11492
+< Octavia
+---
+> Octavia/M
+7057a11495
 > Octavius/M
-7058a11358,11361
+7058a11497,11500
 > Ode/RM
 > Odele/M
 > Odelia/M
 > Odelinda/M
-7059a11363,11364
+7059a11502,11503
 > Odella/M
 > Odelle/M
-7062a11368,11373
+7062c11506,11512
+< Odets
+---
+> Odets/M
 > Odetta/M
 > Odette/M
 > Odey/M
 > Odie/M
 > Odilia/M
 > Odille/M
-7064a11376
+7064a11515
 > Odo/M
-7065a11378
+7065a11517
 > Ody/M
-7071a11385
+7068c11520
+< Oedipal
+---
+> Oedipal/M
+7072c11524,11525
+< Offenbach
+---
 > Ofella/M
-7073a11388
+> Offenbach/M
+7074c11527,11529
+< Ogbomosho
+---
 > Ofilia/M
-7074a11390
+> Ogbomosho/M
 > Ogdan/M
-7075a11392
+7075a11531
 > Ogdon/M
-7094a11412
+7077c11533
+< Oglethorpe
+---
+> Oglethorpe/M
+7084,7086c11540,11542
+< Okeechobee
+< Okefenokee
+< Okhotsk
+---
+> Okeechobee/M
+> Okefenokee/M
+> Okhotsk/M
+7091,7092c11547,11548
+< Oklahoman
+< Oktoberfest
+---
+> Oklahoman/M
+> Oktoberfest/M
+7094a11551
 > Olag/M
-7100a11419
+7097c11554
+< Oldenburg
+---
+> Oldenburg/M
+7100a11558
 > Ole/MV
-7102a11422,11423
+7102a11561,11562
 > Olenka/M
 > Olenolin/M
-7103a11425
+7103a11564
 > Olia/M
-7104a11427
+7104a11566
 > Olimpia/M
-7106a11430,11431
+7106a11569,11571
+> Oliver/M
 > Olivero/M
 > Olivette/M
-7109c11434,11436
+7109c11574,11576
 < Olivier
 ---
 > Olivie/MR
 > Oliviero/M
 > Oliy/M
-7110a11438
+7111c11578,11579
+< Olmec
+---
 > Olly/M
-7114a11443,11446
+> Olmec/M
+7114a11583,11586
 > Olva/M
 > Olvan/M
 > Olwen/M
 > Olympe/M
-7118a11451
+7118c11590,11592
+< Olympic/S
+---
+> Olympic/SM
+> Olympics/M
 > Olympie/M
-7125a11459
+7124c11598
+< Omayyad
+---
+> Omayyad/M
+7125a11600
 > Omero/M
-7128a11463
+7128c11603,11604
+< Onassis
+---
+> Onassis/M
 > Ondrea/M
-7132a11468,11470
+7130c11606
+< Onega
+---
+> Onega/M
+7132a11609,11611
 > Onfre/M
 > Onfroi/M
 > Onida/M
-7134a11473
+7134a11614
 > Onofredo/M
-7139a11479
+7139a11620
 > Oona/M
-7141a11482,11483
+7141a11623,11624
 > Opalina/M
 > Opaline/M
-7143a11486
+7142a11626
+> OpenOffice/M
+7144c11628,11629
+< Ophiuchus
+---
 > Ophelie/M
-7148a11492,11496
+> Ophiuchus/M
+7148a11634,11638
 > Oralee/M
 > Oralia/M
 > Oralie/M
 > Oralla/M
 > Oralle/M
-7151a11500,11501
+7150c11640
+< Orange
+---
+> Orange/M
+7151a11642,11643
 > Orazio/M
 > Orbadiah/M
-7157a11508,11514
+7158,7160c11650,11660
+< Oreo
+< Orestes
+< Orient
+---
 > Orel
 > Orelee/M
 > Orelia/M
@@ -6765,14 +12526,18 @@
 > Orella/M
 > Orelle/M
 > Oren/M
-7159a11517
+> Oreo/M
+> Orestes/M
 > Oriana/M
-7167a11526,11527
+> Orient/M
+7167a11668,11669
 > Orlan/M
 > Orland/M
-7174c11534,11540
+7173,7174c11675,11682
+< Orphic
 < Orr/M
 ---
+> Orphic/M
 > Orr/MN
 > Orran/M
 > Orren/M
@@ -6780,348 +12545,920 @@
 > Orsa/M
 > Orsola/M
 > Orson/M
-7175a11542
+7175a11684
 > Ortensia/M
-7177a11545,11546
+7177a11687,11688
 > Orton/M
 > Orv/M
-7186a11556,11557
+7180,7181c11691,11693
+< Orwell
+< Orwellian
+---
+> Orwell/M
+> Orwellian/M
+> Os/M
+7186c11698,11700
+< Osborne
+---
+> Osborne/M
 > Osbourn/M
 > Osbourne/M
-7194a11566,11568
+7188c11702
+< Osceola
+---
+> Osceola/M
+7190c11704
+< Oshawa
+---
+> Oshawa/M
+7194a11709,11711
 > Osmond/M
 > Osmund/M
 > Ossie/M
-7198a11573,11577
+7196c11713
+< Ostwald
+---
+> Ostwald/M
+7198a11716,11720
 > Oswell/M
 > Otes
 > Otha/M
 > Othelia/M
 > Othella/M
-7199a11579,11581
+7199a11722,11724
 > Othilia/M
 > Othilie/M
 > Otho/M
-7201a11584
+7202,7204c11727,11730
+< Otto
+< Ottoman
+< Ouagadougou
+---
 > Ottilie/M
-7217a11601
+> Otto/M
+> Ottoman/M
+> Ouagadougou/M
+7206,7207c11732,11734
+< Ovid
+< Owen/S
+---
+> Ovid/M
+> Owen/SM
+> Owens/M
+7209c11736
+< Oxnard
+---
+> Oxnard/M
+7211c11738
+< Oxus
+---
+> Oxus/M
+7213c11740
+< Oz
+---
+> Oz/M
+7217a11745
 > Ozzy/M
-7264a11649,11651
+7226a11755
+> PCMCIA
+7234a11764
+> PGP
+7237c11767
+< PLO
+---
+> PLO/M
+7250c11780
+< PTA
+---
+> PTA/M
+7264a11795,11797
 > Packston/M
 > Paco/M
 > Pacorro/M
-7265a11653,11654
+7266c11799,11803
+< Paderewski
+---
 > Paddie/M
 > Paddy/M
-7266a11656,11657
+> Paderewski/M
 > Padget/M
 > Padgett/M
-7267a11659,11661
+7268,7269c11805,11809
+< Paganini
+< Page
+---
 > Padraic/M
 > Padraig/M
 > Padriac/M
-7272a11667
+> Paganini/M
+> Page/M
+7271c11811
+< Pahlavi
+---
+> Pahlavi/M
+7273c11813,11814
+< Paine
+---
 > Pail/M
-7288a11684
+> Paine/M
+7278c11819
+< Palembang
+---
+> Palembang/M
+7280,7281c11821,11822
+< Paleogene
+< Paleolithic
+---
+> Paleogene/M
+> Paleolithic/M
+7286,7287c11827,11828
+< Palestrina
+< Paley
+---
+> Palestrina/M
+> Paley/M
+7288a11830
 > Palin/MS
-7289a11686
-> Pall/M
-7291c11688
+7290,7292c11832,11835
+< Palladio
 < Palmer
+< Palmerston
 ---
+> Pall/M
+> Palladio/M
 > Palm/MR
-7294a11692
+> Palmerston/M
+7294a11838
 > Paloma/M
-7297a11696,11697
+7298,7299c11842,11848
+< Pamirs
+< Pampers
+---
 > Pamelina/M
 > Pamella/M
-7298a11699,11701
+> Pamirs/M
 > Pammi/M
 > Pammie/M
 > Pammy/M
-7303a11707,11708
+> Pampers/M
+7303a11853,11854
 > Panchito/M
 > Pancho/M
-7307a11713
+7306c11857
+< Pankhurst
+---
+> Pankhurst/M
+7307a11859
 > Pansie/M
-7312a11719,11724
+7309c11861
+< Pantagruel
+---
+> Pantagruel/M
+7311c11863
+< Pantheon
+---
+> Pantheon/M
+7313,7314c11865,11872
+< Paracelsus
+< Paraclete
+---
 > Paola/M
 > Paolina/M
 > Paolo/M
 > Papagena/M
 > Papageno/M
 > Paquito/M
-7325a11738
+> Paracelsus/M
+> Paraclete/M
+7317a11876
+> Paralympic/S
+7322c11881
+< Pareto
+---
+> Pareto/M
+7325c11884,11886
+< Park/SR
+---
+> Park/SMR
 > Parke/M
-7335a11749,11750
+> Parker/M
+7327,7328c11888,11890
+< Parkman
+< Parliament
+---
+> Parkman/M
+> Parks/M
+> Parliament/M
+7331,7333c11893,11895
+< Parnell
+< Parr
+< Parrish
+---
+> Parnell/M
+> Parr/M
+> Parrish/M
+7335a11898,11899
 > Parrnell/M
 > Parry
-7341a11757
+7337c11901
+< Parsons
+---
+> Parsons/M
+7341a11906
 > Pascale/M
-7347c11763
+7345c11910
+< Pasternak
+---
+> Pasternak/M
+7347c11912
 < Pat
 ---
-> Pat/N
-7351a11768
+> Pat/NM
+7349c11914
+< Patagonian
+---
+> Patagonian/M
+7352,7353c11917,11923
+< Paterson
+< Patna
+---
 > Paten/M
-7352a11770,11771
+> Paterson/M
 > Patience/M
 > Patin/M
-7353a11773,11774
+> Patna/M
 > Paton
 > Patric/M
-7356a11778
+7356a11927
 > Patricio/M
-7357a11780,11782
+7357a11929,11931
 > Patrizia/M
 > Patrizio/M
 > Patrizius/M
-7358a11784
+7358a11933
 > Patten/M
-7360a11787,11788
+7360,7361c11935,11938
+< Patti
+< Patton
+---
+> Patti/M
 > Pattie/M
 > Pattin/M
-7364a11793,11794
+> Patton/M
+7364a11942,11943
 > Paule/M
 > Pauletta/M
-7366a11797,11798
+7366,7368c11945,11956
+< Pauli
+< Pauline
+< Pavarotti
+---
+> Pauli/M
 > Paulie/M
 > Paulina/M
-7367a11800,11802
+> Pauline/M
+> Pauling/M
 > Paulita/M
 > Paulo/M
 > Pauly/M
-7368a11804,11806
+> Pavarotti/M
 > Pavel/M
 > Pavia/M
 > Pavla/M
-7372a11811,11812
+7370,7371c11958,11959
+< Pavlova
+< Pavlovian
+---
+> Pavlova/M
+> Pavlovian/M
+7372a11961,11962
 > Paxon/M
 > Paxton
-7375c11815
-< Paypal/M
----
+7375a11966
 > Payton/M
-7379a11820
+7380c11971,11973
+< Peale
+---
 > Peadar/M
-7380a11822
+> Peale/M
 > Pearce/M
-7381a11824,11825
+7381a11975,11976
 > Pearla/M
 > Pearle/M
-7382a11827
+7382a11978
 > Pearline/M
-7384a11830
+7384,7385c11980,11982
+< Peary
+< Pechora
+---
+> Peary/M
 > Pebrook/M
-7388a11835
+> Pechora/M
+7388a11986
 > Peder/M
-7392a11840,11842
+7392a11991,11993
 > Pegeen/M
 > Peggi/M
 > Peggie/M
-7395a11846
+7394c11995
+< Pei
+---
+> Pei/M
+7395a11997
 > Peirce/M
-7405c11856
+7402a12005
+> Pen/M
+7405,7406c12008,12009
 < Penelope/M
+< Penn
 ---
 > Penelopa/M
-7408a11860,11861
+> Penn/M
+7408a12012,12013
 > Penni/M
 > Pennie/M
-7413a11867
+7411c12016
+< Pennsylvanian/SM
+---
+> Pennsylvanian/MS
+7413a12019
 > Penrod/M
-7422a11877,11879
+7422c12028,12031
+< Peoria
+---
+> Peoria/M
 > Pepe/M
 > Pepi/M
 > Pepillo/M
-7423a11881,11882
+7423a12033,12034
 > Pepita/M
 > Pepito/M
-7426a11886
+7425,7429c12036,12041
+< Pepys
+< Pequot
+< Percheron
+< Percival
+< Percy
+---
+> Pepys/M
+> Pequot/M
 > Perceval
-7431a11892,11894
+> Percheron/M
+> Percival/M
+> Percy/M
+7432,7434c12044,12049
+< Periclean
+< Pericles
+< Perkins
+---
 > Peri/M
 > Peria/M
 > Perice/M
-7434c11897
-< Perkins
----
+> Periclean/M
+> Pericles/M
 > Perkin/MS
-7435a11899,11900
+7435a12051,12052
 > Perla/M
 > Perle/M
-7438a11904
+7438a12056
 > Pernell/M
-7441a11908,11910
+7440c12058
+< Peron
+---
+> Peron/M
+7442,7443c12060,12065
+< Perry/R
+< Perseid
+---
 > Perren/M
 > Perri/M
+> Perrier/M
 > Perrine/M
-7449a11919
+> Perry/RM
+> Perseid/M
+7447c12069
+< Pershing
+---
+> Pershing/M
+7449a12072
 > Persis
-7453a11924,11925
+7453c12076,12078
+< Peshawar
+---
+> Peshawar/M
 > Pet
 > Peta/M
-7458a11931,11933
+7456a12082
+> Perters/MN
+7459c12085,12088
+< Petra
+---
 > Peterus/M
 > Petey/M
 > Petr/M
-7460a11936,11940
+> Petra/M
+7460a12090,12094
 > Petrina/M
 > Petronella/M
 > Petronia/M
 > Petronilla/M
 > Petronille/M
-7461a11942
+7461a12096
 > Petunia/M
-7462a11944,11945
+7462a12098,12099
 > Peyter/M
 > Peyton/M
-7467a11951
+7466c12103
+< Phaedra
+---
+> Phaedra/M
+7468c12105,12106
+< Phanerozoic
+---
 > Phaidra/M
-7473a11958,11959
+> Phanerozoic/M
+7473a12112,12113
 > Phebe
 > Phedra/M
-7474a11961
+7474a12115
 > Phelia/M
-7478a11966
+7476,7477c12117,12118
+< Phidias
+< Phil/Y
+---
+> Phidias/M
+> Phil/MY
+7478a12120
 > Philbert/M
-7481a11970,11971
+7480,7481c12122,12125
+< Philemon
+< Philip/S
+---
+> Philemon/M
+> Philip/MS
 > Philipa/M
 > Philippa/M
-7484a11975
+7483c12127
+< Philippians
+---
+> Philippians/M
+7485,7486c12129,12135
+< Philistine
+< Phillip/S
+---
+> Philippines/M
 > Philis/M
-7485a11977,11978
+> Philistine/M
 > Phillida/M
 > Phillie/M
-7487a11981,11983
+> Phillip/SM
+> Phillips/M
+7487a12137,12139
 > Phillipe/M
 > Phillipp/M
 > Phillis/M
-7488a11985,11987
+7488a12141,12143
 > Philomena/M
 > Phineas/M
 > Phip/M
-7494a11994,11995
+7490c12145
+< Phobos
+---
+> Phobos/M
+7494a12150,12151
 > Photoshopped
 > Photoshopping
-7498a12000,12001
+7498a12156,12157
 > Phylis/M
 > Phyllida/M
-7499a12003,12005
+7499a12159,12161
 > Phyllys/M
 > Phylys/M
 > Pia/M
-7509a12016
+7504c12166
+< Piccadilly
+---
+> Piccadilly/M
+7506c12168
+< Pickett
+---
+> Pickett/M
+7509c12171,12172
+< Pict
+---
+> Pict/M
 > Pictor
-7510a12018
+7510a12174
 > Pier/M
-7511a12020
+7511a12176
 > Pierette/M
-7512a12022
+7512a12178
 > Pierrette/M
-7513a12024,12029
+7513a12180,12185
 > Pierson/M
 > Pieter/M
 > Pietra/M
 > Pietrek/M
 > Pietro/M
 > Piggy/M
-7520a12037,12038
+7516,7518c12188,12191
+< Pilate/S
+< Pilcomayo
+< Pilgrim/S
+---
+> Pilate/MS
+> Pilates/M
+> Pilcomayo/M
+> Pilgrim/SM
+7520a12194,12195
 > Pincas/M
 > Pinchas/M
-7527a12046,12049
+7523c12198
+< Pinkerton
+---
+> Pinkerton/M
+7526c12201
+< Pinter
+---
+> Pinter/M
+7527a12203,12206
 > Piotr/M
 > Pip/MR
 > Piper/M
 > Pippa/M
-7528a12051,12052
+7529,7531c12208,12212
+< Piraeus
+< Pirandello
+< Pisa
+---
 > Pippo/M
 > Pippy/M
-7559c12083
+> Piraeus/M
+> Pirandello/M
+> Pisa/M
+7533c12214
+< Pisistratus
+---
+> Pisistratus/M
+7536c12217,12218
+< Pitt/S
+---
+> Pitt/SM
+> Pitts/M
+7540c12222
+< Pizarro
+---
+> Pizarro/M
+7544c12226
+< Planck
+---
+> Planck/M
+7549c12231
+< Plath
+---
+> Plath/M
+7559c12241
 < Pleiades's
 ---
 > Pleiades/M
-7620a12145
+7562c12244
+< Pliny
+---
+> Pliny/M
+7571c12253,12254
+< Podgorica
+---
+> Poconos/M
+> Podgorica/M
+7573,7574c12256,12257
+< Podunk
+< Poe
+---
+> Podunk/M
+> Poe/M
+7582c12265
+< Pol/Y
+---
+> Pol/MY
+7589c12272
+< Politburo
+---
+> Politburo/M
+7592c12275
+< Pollock
+---
+> Pollock/M
+7595c12278
+< Pollyanna
+---
+> Pollyanna/M
+7601,7602c12284,12285
+< Polyphemus
+< Pomerania
+---
+> Polyphemus/M
+> Pomerania/M
+7604,7605c12287,12288
+< Pomona
+< Pompadour
+---
+> Pomona/M
+> Pompadour/M
+7609,7610c12292,12293
+< Ponce
+< Pontchartrain
+---
+> Ponce/M
+> Pontchartrain/M
+7612c12295
+< Pontianak
+---
+> Pontianak/M
+7615,7616c12298,12299
+< Poona
+< Pope
+---
+> Poona/M
+> Pope/M
+7618c12301
+< Popocatepetl
+---
+> Popocatepetl/M
+7621c12304,12305
+< Popsicle
+---
 > Poppy/M
-7626a12152
+> Popsicle/M
+7625c12309,12310
+< Port/R
+---
+> Port/MR
+> Porter/M
+7626a12312
 > Portie/M
-7631a12158
+7629c12315
+< Portsmouth
+---
+> Portsmouth/M
+7631a12318
 > Porty/M
-7639a12167
+7634c12321
+< Potemkin
+---
+> Potemkin/M
+7636c12323
+< Potsdam
+---
+> Potsdam/M
+7638c12325
+< Potter
+---
+> Potter/M
+7640,7641c12327,12329
+< Pound
+< Poussin
+---
 > Poul/M
-7647c12175
+> Pound/M
+> Poussin/M
+7642a12331
+> PowerPC/M
+7644c12333
+< Powers
+---
+> Powers/M
+7647c12336
 < Pr/M
 ---
 > Pr/MN
-7661a12190
+7650c12339
+< Praetorian
+---
+> Praetorian/M
+7653c12342
+< Prakrit
+---
+> Prakrit/M
+7657c12346
+< Praxiteles
+---
+> Praxiteles/M
+7661a12351
 > Pren/M
-7662a12192
+7662a12353
 > Prent/M
-7663a12194
+7663a12355
 > Prentiss/M
-7679a12211,12214
+7665,7666c12357,12358
+< Presbyterian/MS
+< Presbyterianism/SM
+---
+> Presbyterian/SM
+> Presbyterianism/MS
+7669,7670c12361,12362
+< Presley
+< Preston
+---
+> Presley/M
+> Preston/M
+7674,7675c12366,12367
+< Price
+< Priestley
+---
+> Price/M
+> Priestley/M
+7679a12372,12375
 > Prinz
 > Pris
 > Prisca/M
 > Priscella/M
-7680a12216
+7680a12377
 > Prissie/M
-7707a12244
+7683c12380
+< Procrustean
+---
+> Procrustean/M
+7689,7690c12386,12387
+< Prokofiev
+< Promethean
+---
+> Prokofiev/M
+> Promethean/M
+7695c12392
+< Protagoras
+---
+> Protagoras/M
+7698c12395
+< Protestantism/MS
+---
+> Protestantism/SM
+7705,7706c12402,12403
+< Providence/MS
+< Provo
+---
+> Providence/SM
+> Provo/M
+7707a12405
 > Pru/M
-7709a12247,12249
+7709a12408,12410
 > Prudi/M
 > Prudy/M
 > Prue/M
-7713a12254
+7713c12414,12415
+< Prut
+---
+> Prut/M
 > Pryce/M
-7727a12269
+7715c12417
+< Psalms
+---
+> Psalms/M
+7720c12422
+< Ptolemaic
+---
+> Ptolemaic/M
+7723,7724c12425,12426
+< Puccini
+< Puck
+---
+> Puccini/M
+> Puck/M
+7726,7727c12428,12431
+< Puebla
+< Pueblo
+---
+> Puebla/M
+> Pueblo/M
+> Puerto
 > Puff/M
-7751a12294
+7730,7731c12434,12435
+< Pulaski
+< Pulitzer
+---
+> Pulaski/M
+> Pulitzer/M
+7733c12437
+< Punch
+---
+> Punch/M
+7737,7738c12441,12442
+< Purana
+< Purcell
+---
+> Purana/M
+> Purcell/M
+7743,7744c12447,12448
+< Puritan
+< Puritanism/SM
+---
+> Puritan/M
+> Puritanism/MS
+7747,7748c12451,12452
+< Pusey
+< Pushkin
+---
+> Pusey/M
+> Pushkin/M
+7751c12455,12456
+< Putnam
+---
+> Putnam/M
 > Putnem/M
-7793a12337
+7757c12462
+< Pym
+---
+> Pym/M
+7763c12468
+< Pyrrhic
+---
+> Pyrrhic/M
+7765,7766c12470,12471
+< Pythagorean
+< Pythias
+---
+> Pythagorean/M
+> Pythias/M
+7778c12483
+< Qingdao
+---
+> Qingdao/M
+7785c12490
+< Quasimodo
+---
+> Quasimodo/M
+7791c12496
+< Quebecois
+---
+> Quebecois/M
+7793c12498,12499
+< Queen/S
+---
+> Queen/MS
 > Queenie/M
-7795a12340
+7795a12502
 > Quent/M
-7796a12342
+7796a12504
 > Querida/M
-7798a12345,12347
+7798a12507,12509
 > Quill/M
 > Quillan/M
 > Quincey/M
-7799a12349
+7800c12511,12515
+< Quinn
+---
 > Quinlan/M
-7800a12351,12353
+> Quinn/M
 > Quint/M
 > Quinta/M
 > Quintana/M
-7801a12355,12357
+7801a12517,12519
 > Quintilla/M
 > Quintin/M
 > Quintina/M
-7802a12359
+7803c12521,12522
+< Quirinal
+---
 > Quintus/M
-7811c12368
+> Quirinal/M
+7806c12525
+< Quixote
+---
+> Quixote/M
+7808,7809c12527,12528
+< Qumran
+< Quonset
+---
+> Qumran/M
+> Quonset/M
+7811c12530
 < R/MD
 ---
 > R/MGD
-7841a12399
+7841a12561
 > Rab/M
-7842a12401
+7842a12563
 > Rabbi/M
-7844a12404
+7844c12565,12566
+< Rabelaisian
+---
+> Rabelaisian/M
 > Rabi
-7847a12408
+7847a12570
 > Rachele/M
-7850a12412
+7849c12572
+< Rachmaninoff
+---
+> Rachmaninoff/M
+7850a12574
 > Rad/M
-7851a12414,12415
+7851a12576,12577
 > Raddie/M
 > Raddy/M
-7852a12417,12419
+7852a12579,12581
 > Raeann/M
 > Raf/M
 > Rafa/M
-7853a12421,12430
+7853a12583,12592
 > Rafaela/M
 > Rafaelia/M
 > Rafaelita/M
@@ -7132,10 +13469,12 @@
 > Raffaello/M
 > Raffarty/M
 > Rafferty/M
-7854a12432,12433
+7854a12594,12595
 > Rafi/M
 > Ragnar/M
-7855a12435,12442
+7856c12597,12606
+< Rainier
+---
 > Rahal/M
 > Rahel/M
 > Raimondo/M
@@ -7144,236 +13483,374 @@
 > Raina/M
 > Raine/MR
 > Rainer/M
-7856a12444
+> Rainier/M
 > Rakel/M
-7857a12446,12447
+7857a12608,12609
 > Ralf/M
 > Ralina/M
-7858a12449
+7858a12611
 > Ram
-7869a12461
+7862c12615
+< Ramakrishna
+---
+> Ramakrishna/M
+7864c12617
+< Ramayana
+---
+> Ramayana/M
+7870,7872c12623,12626
+< Ramos
+< Ramsay
+< Ramses
+---
 > Ramonda/M
-7873a12466,12468
+> Ramos/M
+> Ramsay/M
+> Ramses/M
+7874c12628,12632
+< Rand
+---
 > Rana/M
 > Rance/M
 > Rancell/M
-7874a12470
+> Rand/M
 > Randa/M
-7876a12473
+7876a12635
 > Randee/M
-7877a12475
+7877a12637
 > Randene/M
-7878a12477,12478
+7878a12639,12640
 > Randie/M
 > Randolf/M
-7880a12481
+7880a12643
 > Ranee/M
-7881a12483,12486
+7882c12645,12649
+< Rankin
+---
 > Rani/M
 > Rania/M
 > Ranice/M
 > Ranique/M
-7883a12489,12491
+> Rankin/M
+7883a12651,12653
 > Ranna/M
 > Ransell/M
 > Ransom/M
-7885a12494
+7885c12655,12656
+< Raphael
+---
+> Raphael/M
 > Raphaela/M
-7887a12497
+7887a12659
 > Raquela/M
-7889a12500,12501
+7889a12662,12663
 > Rasia/M
 > Rasla/M
-7897a12510,12513
+7891c12665,12666
+< Rasputin
+---
+> Rasputin/M
+> Rasta
+7893a12669
+> Rastafarianism
+7897,7899c12673,12680
+< Ravel
+< Rawalpindi
+< Ray
+---
+> Ravel/M
 > Raven/M
 > Ravi/M
 > Ravid/M
 > Raviv/M
-7898a12515
+> Rawalpindi/M
 > Rawley/M
-7901a12519,12520
+> Ray/M
+7902c12683,12685
+< Rayleigh
+---
 > Raychel/M
 > Raye/M
-7903a12523
+> Rayleigh/M
+7903a12687
 > Raymund/M
-7904a12525,12530
+7904a12689,12694
 > Rayna/M
 > Raynard/M
 > Raynell/M
 > Rayner/M
 > Raynor/M
 > Rayshell/M
-7907a12534,12536
+7907a12698,12700
 > Rea/M
 > Read/GM
 > Reade
-7910a12540
+7911c12704,12706
+< Realtor
+---
 > Reagen/M
-7911a12542
+> Realtor/M
 > Reamonn/M
-7914c12545,12549
+7914,7915c12709,12715
 < Rebecca
+< Rebekah
 ---
 > Rebbecca/M
 > Rebe/M
 > Rebeca/M
 > Rebecka/M
 > Rebeka/M
-7915a12551
+> Rebekah/M
 > Rebekkah/M
-7918a12555
+7918a12719
 > Redd/M
-7922a12560,12561
+7922c12723,12725
+< Redmond
+---
+> Redmond/M
 > Ree/DSM
 > Reeba/M
-7923a12563
+7923a12727
 > Reece/M
-7924a12565
+7924a12729
 > Reena/M
-7925a12567,12568
+7926c12731,12733
+< Reeves
+---
 > Reeta/M
 > Reeva/M
-7928a12572,12575
+> Reeves/M
+7928a12736,12739
 > Reg/N
 > Regan/M
 > Regen/M
 > Reggi/MS
-7929a12577
+7929a12741
 > Reggy/M
-7932a12581,12582
+7931c12743
+< Reginae
+---
+> Reginae/M
+7932a12745,12746
 > Reginauld/M
 > Regine/M
-7937c12587,12590
+7935c12749
+< Rehnquist
+---
+> Rehnquist/M
+7937c12751,12755
 < Reid
 ---
-> Reid/R
+> Reichstag/M
+> Reid/RM
 > Reidar/M
 > Reider/M
 > Reiko/M
-7939c12592,12596
+7939,7940c12757,12762
 < Reinaldo/M
+< Reinhardt
 ---
 > Reina/M
 > Reinald/M
 > Reinaldo/SM
 > Reine/M
 > Reinhard/M
-7941a12599,12603
+> Reinhardt/M
+7942c12764,12769
+< Remarque
+---
 > Reinold/M
 > Reinwald/M
 > Rem/M
 > Remanence/S
 > Remanent
-7945a12608
+> Remarque/M
+7944c12771
+< Remington
+---
+> Remington/M
+7945a12773
 > Remy/M
-7946a12610,12611
+7946a12775,12776
 > Renado/M
 > Renae/M
-7947a12613,12614
+7947a12778,12779
 > Renaldo/M
 > Renard/M
-7948a12616,12619
+7948a12781,12784
 > Renata/M
 > Renate/M
 > Renato/M
 > Renaud/M
-7951a12623,12626
+7951a12788,12791
 > Renell/M
 > Renelle/M
 > Renie/M
 > Rennie/M
-7961a12637,12639
+7953c12793
+< Renoir
+---
+> Renoir/M
+7962,7964c12802,12807
+< Reuben
+< Reunion
+< Reuters
+---
 > Reta/M
 > Retha/M
 > Reube/M
-7965a12644
+> Reuben/M
+> Reunion/M
+> Reuters/M
+7965a12809
 > Reuven/M
-7970a12650
+7968a12813
+> Revelations/M
+7970a12816
 > Revkah/M
-7972a12653
+7972,7973c12818,12820
+< Rex
+< Reyes
+---
+> Rex/M
 > Rey/M
-7977c12658,12659
+> Reyes/M
+7977c12824,12826
 < Reynolds
 ---
 > Reynard/M
 > Reynold/MS
-7980a12663
+> Reynolds/M
+7980,7981c12829,12831
+< Rhea
+< Rhee
+---
+> Rhea/M
 > Rheba/M
-7983a12667,12671
+> Rhee/M
+7983c12833,12838
+< Rhenish
+---
+> Rhenish/M
 > Rheta/M
 > Rhett/M
 > Rhetta/M
 > Rhiamon/M
 > Rhianna/M
-7984a12673
+7984a12840
 > Rhianon/M
-7987a12677
-> Rhode
-7990a12681,12684
+7988c12844,12845
+< Rhodes
+---
+> Rhode/M
+> Rhodes/M
+7990a12848,12851
 > Rhodia/M
 > Rhodie/M
 > Rhody/M
 > Rhona/M
-7992a12687,12690
+7993,7995c12854,12865
+< Ribbentrop
+< Ricardo
+< Rice
+---
 > Rhys/M
 > Riane/M
 > Riannon/M
 > Rianon/M
-7993a12692,12694
+> Ribbentrop/M
 > Ric/M
 > Rica/M
 > Ricard/M
-7994a12696,12697
+> Ricardo/M
 > Ricca/M
 > Riccardo/M
-7997a12701
+> Rice/M
+7997,7998c12867,12871
+< Richard/S
+< Richardson
+---
+> Richard/MS
+> Richards/M
 > Richardo/M
-7998a12703
+> Richardson/M
 > Richart/M
-8001a12707
+8002,8003c12875,12879
+< Richter
+< Richthofen
+---
 > Richmound/M
-8003a12710,12711
+> Richter/M
+> Richthofen/M
 > Richy/M
 > Rici/M
-8004a12713
+8004a12881
 > Rickard/M
-8005a12715
+8005a12883
 > Rickert/M
-8006a12717
+8006a12885
 > Ricki/M
-8010a12722
+8008c12887
+< Rickover
+---
+> Rickover/M
+8010a12890
 > Ricoriki/M
-8022a12735,12737
+8012c12892
+< Ride
+---
+> Ride/M
+8023,8025c12903,12911
+< Riley
+< Rilke
+< Rimbaud
+---
 > Rik/M
 > Riki/M
 > Rikki/M
-8025a12741,12743
+> Riley/M
+> Rilke/M
+> Rimbaud/M
 > Rina/M
 > Rinaldo/M
 > Ring/M
-8028a12747,12749
+8029,8030c12915,12921
+< Ripley
+< Risorgimento
+---
+> Rios/M
 > Riobard/M
 > Riordan/M
 > Rip/M
-8029a12751
+> Ripley/M
 > Risa/M
-8032a12755
+> Risorgimento/M
+8032a12924
 > Ritchie/M
-8034c12757,12758
+8034,8036c12926,12930
 < Rivas
+< Rivera
+< Rivers
 ---
 > Riva/SM
+> Rivas/M
 > Rivalee/M
-8037a12762
+> Rivera/M
+> Rivers/M
+8037a12932
 > Rivi/M
-8038a12764,12765
+8038a12934,12935
 > Rivkah/M
 > Rivy/M
-8042a12770,12772
+8040c12937
+< Rizal
+---
+> Rizal/M
+8042a12940,12942
 > Roana/M
 > Roanna/M
 > Roanne/M
-8044c12774,12778
+8044c12944,12948
 < Rob/M
 ---
 > Roarke/M
@@ -7381,167 +13858,258 @@
 > Robb/M
 > Robbert/M
 > Robbi/M
-8047a12782,12785
+8046a12951
+> Robbins/M
+8047a12953,12956
 > Robbyn/M
 > Robena/M
 > Robenia/M
 > Robers/M
-8055a12794,12799
+8051a12961
+> Roberts/M
+8053,8054c12963,12964
+< Robeson
+< Robespierre
+---
+> Robeson/M
+> Robespierre/M
+8056c12966,12972
+< Robinson
+---
 > Robina/M
 > Robinet/M
 > Robinett/M
 > Robinetta/M
 > Robinette/M
 > Robinia/M
-8060a12805
+> Robinson/M
+8059c12975
+< Robson
+---
+> Robson/M
+8060a12977
 > Roby/M
-8062a12808
+8062a12980
 > Roch/M
-8065a12812,12813
+8065a12984,12985
 > Rochell/M
 > Rochella/M
-8067a12816
+8068,8070c12988,12993
+< Rock
+< Rockefeller
+< Rockford
+---
 > Rochette/M
-8069a12819
+> Rock/M
+> Rockefeller/M
 > Rockey/M
-8070a12821
+> Rockford/M
 > Rockie/M
-8075a12827,12828
+8073c12996
+< Rockwell
+---
+> Rockwell/M
+8075a12999,13000
 > Roda/M
 > Rodd/M
-8076a12830,12833
+8076a13002,13005
 > Roddie/M
 > Roddy/M
 > Roderic/M
 > Roderich/M
-8077a12835,12836
+8077a13007,13008
 > Roderigo/M
 > Rodge/MZR
-8078a12838,12840
+8079,8080c13010,13016
+< Rodin
+< Rodney
+---
+> Rodgers/M
 > Rodham/M
 > Rodi/M
 > Rodie/M
-8079a12842
+> Rodin/M
 > Rodina/M
-8081a12845,12846
+> Rodney/M
+8081a13018,13019
 > Rodolph/M
 > Rodolphe/M
-8084a12850
+8084a13023
 > Rodrique/M
-8087a12854
+8087a13027,13029
 > Rog/MRZ
-8089c12856
+> Roger/MS
+> Rogers/M
+8089c13031
 < Roger/S
 ---
 > Rogerio/M
-8090a12858
+8090a13033
 > Roi/SM
-8094a12863
+8091a13035
+> Roku/M
+8093c13037
+< Roland
+---
+> Roland/M
+8094a13039
 > Roldan/M
-8095a12865,12867
+8096,8099c13041,13051
+< Rolland
+< Rollerblade
+< Rollins
+< Rolodex
+---
 > Roley/M
 > Rolf
 > Rolfe/M
-8098c12870,12872
-< Rollins
----
+> Rolland/M
+> Rollerblade/M
 > Rollie/M
 > Rollin/MS
+> Rollins/M
 > Rollo
-8099a12874
+> Rolodex/M
 > Rolph/M
-8101a12877,12878
+8101a13054,13055
 > Roma/M
 > Romain/M
-8116a12894,12896
+8106c13060
+< Romano
+---
+> Romano/M
+8108c13062,13063
+< Romansh
+---
+> Romans/M
+> Romansh/M
+8113c13068
+< Romeo
+---
+> Romeo/M
+8116c13071,13074
+< Romney
+---
+> Romney/M
 > Romola/M
 > Romona/M
 > Romonda/M
-8117a12898
+8117a13076
 > Romy/M
-8118a12900
+8118a13078
 > Rona/M
-8119a12902
+8119a13080
 > Ronalda/M
-8120a12904,12907
+8120a13082,13085
 > Ronica/M
 > Ronna/M
 > Ronni/M
 > Ronnica/M
-8124a12912,12913
+8124a13090,13091
 > Roobbie/M
 > Roomba/MS
-8128a12918,12921
+8129c13096,13100
+< Rorschach
+---
 > Rora/M
 > Rori/M
 > Rorie/M
 > Rorke/M
-8130a12924
+> Rorschach/M
+8130a13102
 > Ros
-8131a12926,12929
+8131a13104,13107
 > Rosabel/M
 > Rosabella/M
 > Rosabelle/M
 > Rosaleen/M
-8132a12931
+8132a13109
 > Rosalia/M
-8135a12935,12936
+8135a13113,13114
 > Rosalinde/M
 > Rosaline/M
-8136a12938,12941
+8136a13116,13119
 > Rosalynd/M
 > Rosamond/M
 > Rosamund/M
 > Rosana/M
-8139a12945
+8139c13122,13123
+< Rosario
+---
+> Rosario/M
 > Rosco/M
-8142a12949,12950
+8142a13127,13128
 > Roseanna/M
 > Roseanne/M
-8144a12953,12955
+8144a13131,13133
 > Roselia/M
 > Roselin/M
 > Roseline/M
-8145a12957,12958
+8145a13135,13136
 > Roselle/M
 > Rosemaria/M
-8147a12961
+8147a13139
 > Rosemonde/M
-8149a12964
+8149a13142
 > Rosene/M
-8151a12967,12968
+8151,8152c13144,13147
+< Rosetta
+< Rosicrucian
+---
+> Rosetta/M
 > Rosette/M
 > Roshelle/M
-8153a12971,12972
+> Rosicrucian/M
+8153a13149,13150
 > Rosina/M
 > Rosita/M
-8154a12974
+8154a13152
 > Rosmunda/M
-8156a12977
+8156a13155
 > Rossie/M
-8157a12979
+8158c13157,13158
+< Rostand
+---
 > Rossy/M
-8161a12984
+> Rostand/M
+8161a13162
 > Rosy/M
-8170a12994
+8164,8165c13165,13166
+< Rothko
+< Rothschild
+---
+> Rothko/M
+> Rothschild/M
+8168c13169
+< Rouault
+---
+> Rouault/M
+8170a13172
 > Rouvin/M
-8171a12996,12997
+8172c13174,13178
+< Rowe
+---
+> Rover/M
 > Row/MN
 > Rowan/M
-8172a12999
+> Rowe/M
 > Rowen/M
-8175a13003,13006
+8175a13182,13185
 > Rowney/M
 > Roxana/M
 > Roxane/M
 > Roxanna/M
-8176a13008
+8176a13187
 > Roxi/M
-8177a13010
+8177a13189
 > Roxine/M
-8180a13014
+8180,8181c13192,13203
+< Royal
+< Royce
+---
+> Royal/M
 > Royall/M
-8181a13016,13024
+> Royce/M
 > Roz/M
 > Rozalie/M
 > Rozalin/M
@@ -7551,229 +14119,560 @@
 > Roze/M
 > Rozele/M
 > Rozella/M
-8182a13026,13027
+8182a13205,13206
 > Rozina/M
 > Rriocard/M
-8186a13032
+8186a13211
 > Rube/M
-8187a13034,13036
+8187a13213,13216
+> Rubens/M
 > Rubetta/M
 > Rubi/M
 > Rubia/M
-8188a13038
+8188a13218
 > Rubie/M
-8190a13041
+8191c13221,13222
+< Rubinstein
+---
 > Rubina/M
-8193a13045,13049
+> Rubinstein/M
+8194c13225,13231
+< Rudolf
+---
 > Rudd/M
 > Ruddie/M
 > Ruddy/M
 > Rudie/M
 > Rudiger/M
-8194a13051
+> Rudolf/M
 > Rudolfo/M
-8197a13055
+8197a13235
 > Rufe/M
-8199a13058
+8199a13238
 > Ruggiero/M
-8209a13069,13072
+8207,8208c13246,13247
+< Runnymede
+< Runyon
+---
+> Runnymede/M
+> Runyon/M
+8209a13249,13252
 > Ruperta/M
 > Ruperto/M
 > Ruprecht/M
 > Rurik
-8220a13084,13085
+8213,8214c13256,13257
+< Ruskin
+< Russ
+---
+> Ruskin/M
+> Russ/M
+8220a13264,13265
 > Rustie/M
 > Rustin/M
-8223c13088
+8223c13268
 < Rutgers
 ---
 > Rutger/MS
-8224a13090,13092
+8225c13270,13274
+< Rutherford
+---
 > Ruthann/M
 > Ruthanne/M
 > Ruthe/M
-8225a13094
+> Rutherford/M
 > Ruthi/M
-8226a13096
+8226a13276
 > Ruthy/M
-8227a13098,13100
+8227a13278,13280
 > Rutter/M
 > Ruttger/M
 > Ruy/M
-8233a13107,13108
+8233a13287,13288
 > Ryann/M
 > Rycca/M
-8235a13111,13112
+8235c13290,13292
+< Ryder
+---
+> Ryder/M
 > Ryley/M
 > Ryon/M
-8237c13114,13115
+8237c13294,13295
 < S/MN
 ---
 > Ryun/M
 > S/MNY
-8285a13164
+8253c13311
+< SEC
+---
+> SEC/M
+8266a13325
+> SQL
+8277c13336
+< SUSE
+---
+> SUSE/M
+8278a13338
+> SVN/M
+8283,8284c13343,13344
+< Saar
+< Saarinen
+---
+> Saar/M
+> Saarinen/M
+8285a13346
 > Saba/M
-8291a13171
+8289c13350
+< Sabin
+---
+> Sabin/M
+8291a13353
 > Sabra
-8295a13176
+8294c13356
+< Sacajawea
+---
+> Sacajawea/M
+8295a13358
 > Sacha/M
-8297a13179
+8298c13361,13362
+< Sadat
+---
 > Sada/M
-8301a13184
+> Sadat/M
+8300c13364
+< Sadducee
+---
+> Sadducee/M
+8301a13366
 > Sadella/M
-8303a13187
+8304c13369,13370
+< Safavid
+---
 > Sadye/M
-8311a13196
+> Safavid/M
+8311c13377,13378
+< Sahel
+---
+> Sahel/M
 > Saidee/M
-8322a13208
+8314c13381
+< Sakai
+---
+> Sakai/M
+8317c13384
+< Sakharov
+---
+> Sakharov/M
+8319,8323c13386,13391
+< Saks
+< Sal/Y
+< Saladin
+< Salado
+< Salamis
+---
+> Saks/M
+> Sal/MY
+> Saladin/M
+> Salado/M
 > Salaidh/M
-8325a13212
+> Salamis/M
+8325a13394
 > Saleem/M
-8327a13215
+8328,8329c13397,13399
+< Salinas
+< Salinger
+---
 > Salim/M
-8332a13221,13222
+> Salinas/M
+> Salinger/M
+8332c13402,13404
+< Salk
+---
+> Salk/M
 > Sallee/M
 > Salli/M
-8335a13226,13229
+8334c13406
+< Sallust
+---
+> Sallust/M
+8335a13408,13411
 > Sallyann/M
 > Sallyanne/M
 > Salmon/M
 > Saloma/M
-8336a13231,13234
+8336a13413,13416
 > Salomi/M
 > Salomo/M
 > Salomon/M
 > Salomone/M
-8343a13242
+8343a13424
 > Salvidor/M
-8349a13249
+8346c13427
+< Sam
+---
+> Sam/M
+8349c13430,13431
+< Samara
+---
+> Samara/M
 > Samaria
-8362a13263
+8359c13441
+< Samson
+---
+> Samson/M
+8362c13444,13445
+< Samuel
+---
+> Samuel/M
 > Samuele/M
-8371a13273,13277
+8364c13447
+< San
+---
+> San/M
+8371,8372c13454,13462
+< Sandburg
+< Sandinista
+---
+> Sandburg/M
 > Sande/MZR
 > Sander/M
+> Sanders/M
 > Sanderson/M
 > Sandi/M
 > Sandie/M
-8372a13279
+> Sandinista/M
 > Sandor/M
-8374a13282
+8374a13465
 > Sandro/M
-8375a13284
+8375a13467
 > Sandye/M
-8382a13292,13293
+8377c13469
+< Sanforized
+---
+> Sanforized/M
+8379c13471
+< Sanhedrin
+---
+> Sanhedrin/M
+8383c13475,13477
+< Santa
+---
 > Sanson/M
 > Sansone/M
-8388a13300,13301
-> Sapphira
+> Santa/M
+8385,8386c13479,13480
+< Santayana
+< Santeria
+---
+> Santayana/M
+> Santeria/M
+8388c13482,13484
+< Santos
+---
+> Santos/M
+> Sapphira/M
 > Sapphire/M
-8391a13305
+8391a13488
 > Saraann/M
-8394a13309
+8394a13492
 > Sarajane/M
-8400a13316,13319
+8400a13499,13502
 > Saree/M
 > Sarena/M
 > Sarene/M
 > Sarette/M
-8401a13321
+8402c13504,13505
+< Sargent
+---
 > Sarge/M
-8403a13324,13327
+> Sargent/M
+8403a13507,13510
 > Sari/M
 > Sarina/M
 > Sarine/M
 > Sarita/M
-8407a13332
+8406,8407c13513,13515
+< Sarto
+< Sartre
+---
+> Sarto/M
+> Sartre/M
 > Sascha/M
-8408a13334
+8408a13517
 > Sashenka/M
-8422a13349
+8413,8414c13522,13523
+< Sassanian
+< Sassoon
+---
+> Sassanian/M
+> Sassoon/M
+8422a13532
 > Saudra/M
-8424c13351,13353
+8424c13534,13537
 < Saunders
 ---
 > Sauncho/M
 > Saunder/MS
+> Saunders/M
 > Saunderson/M
-8427a13357
+8426c13539
+< Saussure
+---
+> Saussure/M
+8428c13541,13543
+< Savage
+---
+> Sauternes
 > Sauveur/M
-8429a13360
+> Savage/M
+8429a13545
 > Savina/M
-8433a13365
+8431,8432c13547,13548
+< Savonarola
+< Savoy
+---
+> Savonarola/M
+> Savoy/M
+8433a13550
 > Saw/M
-8434a13367,13369
+8434a13552,13554
 > Sawyere/M
 > Sax
 > Saxe/M
-8437c13372,13374
+8437c13557,13560
 < Sayers
 ---
 > Say/MRZ
 > Sayer/MS
+> Sayers/M
 > Sayre/MS
-8444a13382
+8442,8445c13565,13571
+< Scandinavian/SM
+< Scaramouch
+< Scarborough
+< Scarlatti
+---
+> Scandinavian/MS
+> Scaramouch/M
+> Scarborough/M
 > Scarface/M
-8445a13384,13385
+> Scarlatti/M
 > Scarlet/M
 > Scarlett/M
-8498a13439
+8449c13575
+< Schelling
+---
+> Schelling/M
+8453c13579
+< Schiller
+---
+> Schiller/M
+8456c13582
+< Schliemann
+---
+> Schliemann/M
+8458,8459c13584,13585
+< Schmidt
+< Schnabel
+---
+> Schmidt/M
+> Schnabel/M
+8463c13589
+< Schopenhauer
+---
+> Schopenhauer/M
+8467c13593
+< Schubert
+---
+> Schubert/M
+8470c13596
+< Schumann
+---
+> Schumann/M
+8477c13603
+< Schweitzer
+---
+> Schweitzer/M
+8481a13608
+> Scientologist/SM
+8490c13617
+< Scotchmen
+---
+> Scotchmen/M
+8492c13619,13620
+< Scotchwomen
+---
+> Scotchwomen/M
+> Scotia/M
+8495c13623
+< Scotsmen
+---
+> Scotsmen/M
+8497,8498c13625,13627
+< Scotswomen
+< Scott
+---
+> Scotswomen/M
+> Scott/M
 > Scotti/M
-8518a13460
+8501c13630
+< Scottsdale
+---
+> Scottsdale/M
+8505,8506c13634,13635
+< Scranton
+< Scriabin
+---
+> Scranton/M
+> Scriabin/M
+8509c13638
+< Scrooge
+---
+> Scrooge/M
+8511c13640
+< Scud
+---
+> Scud/M
+8514,8515c13643,13644
+< Scythia
+< Scythian
+---
+> Scythia/M
+> Scythian/M
+8517c13646
+< Seaborg
+---
+> Seaborg/M
+8518a13648
 > Seamus/M
-8519a13462
+8519a13650
 > Seana/M
-8522a13466,13467
+8522a13654,13655
 > Sebastiano/M
 > Sebastien/M
-8528a13474
+8528a13662
 > See/M
-8537a13484,13485
+8529a13664
+> Seeger/M
+8537a13673,13674
 > Seka/M
 > Sela/M
-8538a13487
+8538a13676
 > Selby/M
-8540a13490,13491
+8541c13679,13681
+< Seleucid
+---
 > Selene/M
 > Selestina/M
-8542a13494,13496
+> Seleucid/M
+8542a13683,13685
 > Selia/M
 > Selie/M
 > Selig/M
-8543a13498,13500
+8544c13687,13690
+< Seljuk
+---
 > Selina/M
 > Selinda/M
 > Seline/M
-8545a13503,13504
+> Seljuk/M
+8545a13692,13693
 > Sella/M
 > Selle/MZ
-8554a13514
+8549c13697
+< Semarang
+---
+> Semarang/M
+8551c13699
+< Semiramis
+---
+> Semiramis/M
+8554c13702,13703
+< Semtex
+---
+> Semtex/M
 > Sena/M
-8567a13528
+8557c13706
+< Sendai
+---
+> Sendai/M
+8561,8563c13710,13712
+< Senghor
+< Senior
+< Sennacherib
+---
+> Senghor/M
+> Senior/M
+> Sennacherib/M
+8567c13716,13717
+< Sephardi
+---
+> Sephardi/M
 > Sephira/M
-8571a13533
+8571,8572c13721,13724
+< Septuagint/SM
+< Sequoya
+---
+> Septuagint/MS
+> sequinned
 > sequitur
-8576a13539
+> Sequoya/M
+8576a13729
 > Serene
-8577a13541,13542
+8577a13731,13732
 > Serge/M
 > Sergeant/M
-8578a13544
+8578a13734
 > Sergent/M
-8585a13552
+8580c13736
+< Serpens
+---
+> Serpens/M
+8585,8587c13741,13744
+< Seton
+< Seurat
+< Seuss
+---
+> Seton/M
 > Seumas/M
-8600a13568,13569
+> Seurat/M
+> Seuss/M
+8589,8590c13746,13747
+< Severn
+< Severus
+---
+> Severn/M
+> Severus/M
+8592,8594c13749,13751
+< Sevres
+< Seward
+< Sextans
+---
+> Sevres/M
+> Seward/M
+> Sextans/M
+8597c13754
+< Seyfert
+---
+> Seyfert/M
+8600c13757,13759
+< Shackleton
+---
+> Shackleton/M
 > Shadow/M
 > Shae/M
-8601a13571,13572
+8601a13761,13762
 > Shaina/M
 > Shaine/M
-8605a13577,13580
+8605c13766,13770
+< Shakespearean
+---
+> Shakespearean/M
 > Shalna/M
 > Shalne/M
 > Shalom/M
 > Shamus/M
-8606a13582,13588
+8606a13772,13778
 > Shanan/M
 > Shanda/M
 > Shandee/M
@@ -7781,36 +14680,46 @@
 > Shandie/M
 > Shandra/M
 > Shandy/M
-8608a13591,13592
+8608a13781,13782
 > Shani/M
 > Shanie/M
-8610a13595,13597
+8611,8612c13785,13792
+< Shannon
+< Shantung
+---
 > Shannah/M
 > Shannan/M
 > Shannen/M
-8611a13599,13601
+> Shannon/M
 > Shanon/M
 > Shanta/M
 > Shantee/M
-8613a13604,13605
+> Shantung/M
+8614,8615c13794,13798
+< Shari
+< Shari'a
+---
 > Shara/M
 > Sharai/M
-8615a13608
+> Shari/M
+> Shari'a/M
 > Sharia/M
-8616a13610,13613
+8616a13800,13803
 > Sharity/M
 > Sharl/M
 > Sharla/M
 > Sharleen/M
-8617a13615
+8618c13805,13807
+< Sharon
+---
 > Sharline/M
-8618a13617
+> Sharon/M
 > Sharona/M
-8621a13621
+8621a13811
 > Sharyl/M
-8622a13623
+8622a13813
 > Shaughn/M
-8631a13633,13639
+8631a13823,13829
 > Shay/M
 > Shayla/M
 > Shaylah/M
@@ -7818,74 +14727,130 @@
 > Shaylynn/M
 > Shayna/M
 > Shayne/M
-8635a13644,13646
+8634c13832
+< Sheba
+---
+> Sheba/M
+8635a13834,13836
 > Sheela/M
 > Sheelagh/M
 > Sheelah/M
-8636a13648
+8636a13838
 > Sheeree/M
-8637a13650,13651
+8637a13840,13841
 > Sheff/M
 > Sheffie/M
-8638a13653
+8638a13843
 > Sheffy/M
-8639a13655,13660
+8639a13845,13850
 > Sheilah/M
 > Shel/MY
 > Shela/M
 > Shelagh/M
 > Shelba/M
 > Shelbi/M
-8640a13662
+8640a13852
 > Shelden/M
-8644a13667,13668
+8644c13856,13858
+< Shelley
+---
+> Shelley/M
 > Shelli/M
 > Shellie/M
-8646a13671,13672
+8647c13861,13863
+< Shenandoah
+---
 > Shem/M
 > Shena/M
-8649a13676
+> Shenandoah/M
+8649c13865,13866
+< Sheol
+---
+> Sheol/M
 > Shep/M
-8652a13680,13681
+8652a13870,13871
 > Shepperd/M
 > Sher/M
-8657a13687,13690
+8657,8660c13876,13887
+< Sheridan
+< Sherlock
+< Sherman
+< Sherpa
+---
+> Sheridan/M
 > Sherie/M
 > Sherill/M
 > Sherilyn/M
 > Sherline/M
-8658a13692,13693
+> Sherlock/M
 > Sherlocke/M
 > Sherm/M
-8659a13695,13696
+> Sherman/M
 > Shermie/M
 > Shermy/M
-8663a13701
+> Sherpa/M
+8664c13891,13894
+< Sherwood
+---
 > Sherwin/M
-8664a13703,13704
+> Sherwood/M
 > Sherwynd/M
 > Sherye/M
-8675a13716
+8666a13897
+> Shetlands/M
+8669c13900
+< Shi'ite
+---
+> Shi'ite/M
+8672c13903
+< Shijiazhuang
+---
+> Shijiazhuang/M
+8674c13905
+< Shillong
+---
+> Shillong/M
+8675a13907
 > Shina/M
-8678a13720
+8678a13911
 > Shir/M
-8679a13722,13725
+8679a13913,13916
 > Shirl/M
 > Shirlee/M
 > Shirleen/M
 > Shirlene/M
-8680a13727
+8680a13918
 > Shirline/M
-8682a13730
+8682a13921
 > Sholom/M
-8684a13733,13734
+8684c13923,13925
+< Shorthorn
+---
+> Shorthorn/M
 > Shoshana/M
 > Shoshanna/M
-8692a13743,13745
+8689,8691c13930,13932
+< Shreveport
+< Shriner
+< Shropshire
+---
+> Shreveport/M
+> Shriner/M
+> Shropshire/M
+8693c13934,13937
+< Shylock
+---
 > Shurlock/M
 > Shurlocke/M
 > Shurwood/M
-8698a13752,13758
+> Shylock/M
+8695c13939
+< Si
+---
+> Si/M
+8699c13943,13952
+< Sibelius
+---
 > Siana/M
 > Sianna/M
 > Sib/M
@@ -7893,245 +14858,568 @@
 > Sibby/M
 > Sibeal/M
 > Sibel/M
-8699a13760,13761
+> Sibelius/M
 > Sibella/M
 > Sibelle/M
-8701a13764,13765
+8702c13955,13959
+< Sibyl
+---
 > Sibilla/M
 > Sibley/M
-8702a13767,13768
+> Sibyl/M
 > Sibylla/M
 > Sibylle/M
-8706a13773
+8707,8709c13964,13970
+< Sidney
+< Siegfried
+< Siemens
+---
 > Sidnee/M
-8707a13775,13777
+> Sidney/M
 > Sidoney/M
 > Sidonia/M
 > Sidonnie/M
-8711a13782,13787
+> Siegfried/M
+> Siemens/M
+8712,8714c13973,13984
+< Sigismund
+< Sigmund
+< Sigurd
+---
 > Siffre/M
 > Sig
 > Sigfrid/M
 > Sigfried/M
 > Sigismond/M
 > Sigismondo/M
-8712a13789
+> Sigismund/M
 > Sigismundo/M
-8713a13791
+> Sigmund/M
 > Sigrid/M
-8714a13793
+> Sigurd/M
 > Sigvard/M
-8722a13802,13803
+8719,8721c13989,13991
+< Sikkim
+< Sikkimese
+< Sikorsky
+---
+> Sikkim/M
+> Sikkimese/M
+> Sikorsky/M
+8722a13993,13994
 > Sile/M
 > Sileas/M
-8725a13807,13812
+8725a13998,14003
 > Silvain/M
 > Silvan/M
 > Silvana/M
 > Silvano/M
 > Silvanus/M
 > Silvester/M
-8726a13814,13816
+8726a14005,14007
 > Silvie/M
 > Silvio/M
 > Sim/SM
-8727a13818
+8728c14009,14011
+< Simmental
+---
 > Simeon/M
-8728a13820
+> Simmental/M
 > Simmonds/M
-8730a13823
+8730c14013,14014
+< Simon
+---
+> Simon/M
 > Simona/M
-8731a13825,13826
+8731a14016,14017
 > Simonette/M
 > Simonne/M
-8736a13832
+8733c14019,14020
+< Sims
+---
+> Simpsons/M
+> Sims/M
+8735,8736c14022,14025
+< Sinatra
+< Sinclair
+---
+> Sinatra/M
+> Sinbad/M
+> Sinclair/M
 > Sinclare/M
-8737a13834
+8737a14027
 > Sindee/M
-8745a13843
+8741c14031
+< Singer
+---
+> Singer/M
+8745a14036
 > Siobhan/M
-8746a13845
+8746a14038
 > Siouxie/M
-8748a13848,13851
+8748a14041,14044
 > Sisely/M
 > Sisile/M
 > Sissie/M
 > Sissy/M
-8752a13856
+8750,8751c14046,14047
+< Sistine
+< Sisyphean
+---
+> Sistine/M
+> Sisyphean/M
+8752a14049
 > Siusan/M
-8754a13859
+8754a14052
 > Siward/M
-8755a13861,13862
+8755a14054,14055
 > Skell/M
 > Skelly/M
-8756a13864,13867
+8756a14057,14060
 > Skip/M
 > Skipp/MR
 > Skipper/M
 > Skippie/M
-8757a13869
+8758,8759c14062,14065
+< Skopje
+< Skye
+---
 > Skipton/M
-8758a13871
+> Skopje/M
 > Sky/M
-8760a13874,13875
+> Skye/M
+8760a14067,14068
 > Skylar/M
 > Skyler/M
-8762a13878
+8762a14071
 > Slade/M
-8778a13895
+8769c14078
+< Sloan
+---
+> Sloan/M
+8773c14082
+< Slovakia
+---
+> Slovakia/M
+8778a14088
 > Sly/M
-8785a13903
+8781c14091
+< Smetana
+---
+> Smetana/M
+8783,8784c14093,14094
+< Smith
+< Smithson
+---
+> Smith/M
+> Smithson/M
+8785a14096
 > Smitty/M
-8809a13928
-> Sofie/M
-8811c13930
+8787,8789c14098,14100
+< Smolensk
+< Smollett
+< Smuts
+---
+> Smolensk/M
+> Smollett/M
+> Smuts/M
+8799,8800c14110,14111
+< Snow
+< Snowbelt
+---
+> Snow/M
+> Snowbelt/M
+8806,8807c14117,14118
+< Socratic
+< Soddy
+---
+> Socratic/M
+> Soddy/M
+8810,8811c14121,14123
+< Soho
 < Sol/M
 ---
+> Sofie/M
+> Soho/M
 > Sol/MY
-8812a13932,13933
+8813,8815c14125,14129
+< Solomon
+< Solon
+< Solzhenitsyn
+---
 > Sollie/M
 > Solly/M
-8818a13940
+> Solomon/M
+> Solon/M
+> Solzhenitsyn/M
+8818a14133
 > Somerset
-8827a13950,13952
+8822c14137
+< Sondheim
+---
+> Sondheim/M
+8827a14143,14145
 > Sonni/M
 > Sonnie/M
 > Sonnnie/M
-8832a13958,13959
+8833c14151,14153
+< Sophia
+---
 > Sophey/M
 > Sophi/M
-8836a13964
+> Sophia/M
+8835,8836c14155,14157
+< Sophoclean
+< Sophocles
+---
+> Sophoclean/M
+> Sophocles/M
 > Sophronia/M
-8838a13967
+8838a14160
 > Sorcha/M
-8839a13969
+8839a14162
 > Sosanna/M
-8847c13977
+8844c14167
+< Southampton
+---
+> Southampton/M
+8847,8848c14170,14171
 < Southerner/M
+< Southey
 ---
 > Southerner/SM
-8875a14006
+> Southey/M
+8851c14174
+< Soviet
+---
+> Soviet/M
+8854c14177
+< Soyuz
+---
+> Soyuz/M
+8857c14180
+< Spackle
+---
+> Spackle/M
+8865c14188
+< Sparks
+---
+> Sparks/M
+8867c14190
+< Spartacus
+---
+> Spartacus/M
+8870c14193
+< Spears
+---
+> Spears/M
+8872,8873c14195,14197
+< Spence/R
+< Spencerian
+---
+> Spence/RM
+> Spencer/M
+> Spencerian/M
+8875c14199,14200
+< Spenglerian
+---
+> Spenglerian/M
 > Spense/RM
-8881a14013
+8877c14202
+< Spenserian
+---
+> Spenserian/M
+8881a14207
 > Spike/M
-8903a14036,14037
+8883c14209
+< Spinoza
+---
+> Spinoza/M
+8889,8890c14215,14216
+< Spock
+< Spokane
+---
+> Spock/M
+> Spokane/M
+8895c14221
+< Sputnik
+---
+> Sputnik/M
+8897c14223
+< Squanto
+---
+> Squanto/M
+8900c14226
+< Srinagar
+---
+> Srinagar/M
+8903a14230,14231
 > Stace/M
 > Stacee/M
-8905a14040
+8905a14234
 > Stacia/M
-8908a14044,14045
+8909,8910c14238,14242
+< Stafford
+< StairMaster
+---
 > Stafani/M
 > Staffard/M
-8909a14047
+> Stafford/M
 > Staford/M
-8916c14054,14055
+> StairMaster/M
+8913c14245
+< Stalinist
+---
+> Stalinist/M
+8915,8917c14247,14251
+< Stamford
 < Stan/M
+< Standish
 ---
+> Stamford/M
 > Stan/MY
 > Standford/M
-8917a14057
+> Standish/M
 > Stanfield/M
-8918a14059,14060
+8919,8921c14253,14261
+< Stanislavsky
+< Stanley
+< Stanton
+---
 > Stanislas/M
 > Stanislaus/M
-8919a14062,14063
+> Stanislavsky/M
 > Stanislaw/M
 > Stanleigh/M
-8920a14065
+> Stanley/M
 > Stanly/M
-8921a14067
+> Stanton/M
 > Stanwood/M
-8922a14069
+8923,8924c14263,14265
+< Starbucks
+< Stark
+---
 > Star/M
-8925a14073,14075
+> Starbucks/M
+> Stark/M
+8925a14267,14269
 > Starla/M
 > Starlene/M
 > Starlin/M
-8929a14080
+8929a14274
 > Stavro/MS
-8933a14085,14086
+8933c14278,14280
+< Steadicam
+---
+> Steadicam/M
 > Stearn/M
 > Stearne/M
-8934a14088
+8934a14282
 > Stefa/M
-8935a14090
+8935a14284
 > Stefania/M
-8936a14092,14096
+8937,8938c14286,14292
+< Stein/R
+< Steinbeck
+---
 > Stefano/M
 > Steffane/M
 > Steffen/M
 > Steffi/M
 > Steffie/M
-8944a14105
+> Stein/MR
+> Steinbeck/M
+8939a14294
+> Steiner/M
+8942,8943c14297,14298
+< Stella
+< Stendhal
+---
+> Stella/M
+> Stendhal/M
+8944a14300
 > Stepha/M
-8945a14107,14108
+8945a14302,14303
 > Stephana/M
 > Stephani/M
-8946a14110,14111
+8947,8948c14305,14313
+< Stephen/S
+< Stephenson
+---
 > Stephannie/M
 > Stephanus/M
-8947a14113
+> Stephen/MS
 > Stephenie/M
-8948a14115,14117
+> Stephens/M
+> Stephenson/M
 > Stephi/M
 > Stephie/M
 > Stephine/M
-8952a14122
+8950c14315
+< Stern
+---
+> Stern/M
+8952c14317,14318
+< Sterno
+---
+> Sterno/M
 > Stesha/M
-8954a14125
+8954a14321
 > Stevana/M
-8956a14128
+8957c14324,14326
+< Stevenson
+---
 > Stevena/M
-8958a14131,14132
+> Stevens/M
+> Stevenson/M
+8958a14328,14329
 > Stevy/M
 > Steward/M
-8960a14135,14136
+8960a14332,14333
 > Stillman/M
 > Stillmann/M
-8963a14140
+8964c14337,14338
+< Stirling
+---
 > Stinky/M
-8967a14145
+> Stirling/M
+8967c14341,14342
+< Stockton
+---
+> Stockton/M
 > Stoddard/M
-8975a14154,14157
+8973,8974c14348,14349
+< Stone
+< Stonehenge
+---
+> Stone/M
+> Stonehenge/M
+8976,8977c14351,14356
+< Stout
+< Stowe
+---
 > Storm/M
 > Stormi/M
 > Stormie/M
 > Stormy/M
-9007a14190
+> Stout/M
+> Stowe/M
+8980,8982c14359,14361
+< Stradivarius
+< Strasbourg
+< Strauss
+---
+> Stradivarius/M
+> Strasbourg/M
+> Strauss/M
+8986,8987c14365,14366
+< Strindberg
+< Stromboli
+---
+> Strindberg/M
+> Stromboli/M
+8993,8994c14372,14373
+< Stuyvesant
+< Stygian
+---
+> Stuyvesant/M
+> Stygian/M
+9000c14379
+< Sucre
+---
+> Sucre/M
+9007,9012c14386,14392
+< Sue
+< Suetonius
+< Suez
+< Suffolk
+< Sufi
+< Sufism
+---
+> Sue/M
 > Suellen/M
-9015a14199,14200
+> Suetonius/M
+> Suez/M
+> Suffolk/M
+> Sufi/M
+> Sufism/M
+9015c14395,14397
+< Sukarno
+---
+> Sukarno/M
 > Sukey/M
 > Suki/M
-9018a14204
+9018a14401
 > Sula/M
-9022a14209
+9022a14406
 > Sully
-9039a14227
+9027a14412
+> Summers/M
+9029c14414
+< Sumter
+---
+> Sumter/M
+9034c14419
+< Sundas
+---
+> Sundas/M
+9036c14421
+< Sung
+---
+> Sung/M
+9040c14425,14427
+< Sunnyvale
+---
 > Sunny/M
-9040a14229
+> Sunnyvale/M
 > Sunshine/M
-9055a14245,14246
+9044c14431
+< Superior
+---
+> Superior/M
+9048,9049c14435,14436
+< Surabaya
+< Surat
+---
+> Surabaya/M
+> Surat/M
+9056c14443,14446
+< Susanna
+---
 > Susanetta/M
 > Susann/M
-9056a14248
+> Susanna/M
 > Susannah/M
-9057a14250,14251
+9057a14448,14449
 > Susette/M
 > Susi/M
-9060a14255,14256
+9060c14452,14454
+< Sussex
+---
+> Sussex/M
 > Susy/M
 > Sutherlan/M
-9064a14261,14262
+9064a14459,14460
 > Suzann/M
 > Suzanna/M
-9067a14266,14267
+9067a14464,14465
 > Suzi/M
 > Suzie/M
-9071a14272
+9072c14470,14471
+< Svengali
+---
 > Svend/M
-9087a14289
+> Svengali/M
+9076c14475
+< Swanee
+---
+> Swanee/M
+9087c14486,14487
+< Sweet
+---
+> Sweet/M
 > Swen/M
-9094a14297,14303
+9094a14495,14501
 > Sybila/M
 > Sybilla/M
 > Sybille/M
@@ -8139,19 +15427,32 @@
 > Syd/M
 > Sydel/M
 > Sydelle/M
-9096a14306,14307
+9096a14504,14505
 > Sylas/M
 > Sylvan/M
-9099a14311,14312
+9100c14509,14511
+< Synge
+---
 > Syman/M
 > Symon/M
-9120a14334
+> Synge/M
+9103c14514
+< Syriac
+---
+> Syriac/M
+9108c14519
+< T'ang
+---
+> T'ang/M
+9110a14522
+> TARP
+9120a14533
 > TEirtza/M
-9121a14336
+9121a14535
 > THz/M
-9135a14351
+9135a14550
 > Tab/MR
-9137a14354,14360
+9137a14553,14559
 > Tabb/M
 > Tabbatha/M
 > Tabbi/M
@@ -8159,11 +15460,15 @@
 > Tabbitha/M
 > Tabby/M
 > Taber/M
-9138a14362
+9138a14561
 > Tabina/M
-9139a14364
+9139a14563
 > Tabor
-9143a14369,14375
+9141c14565
+< Tacitus
+---
+> Tacitus/M
+9143a14568,14574
 > Tadd/M
 > Taddeo/M
 > Taddeusz/M
@@ -8171,245 +15476,458 @@
 > Tadeo/M
 > Tades
 > Tadio/M
-9147a14380
+9147c14578,14579
+< Taejon
+---
+> Taejon/M
 > Taffy/M
-9155a14389
+9150c14582
+< Tagore
+---
+> Tagore/M
+9154c14586
+< Tahoe
+---
+> Tahoe/M
+9155a14588
 > Tailor/M
-9159a14394,14395
+9159c14592,14594
+< Taiping
+---
+> Taiping/M
 > Tait/M
 > Taite/M
-9164a14401
+9162c14597
+< Taiyuan
+---
+> Taiyuan/M
+9165c14600,14602
+< Talbot
+---
 > Talbert/M
-9165a14403
+> Talbot/M
 > Talia/M
-9171a14410,14411
+9167c14604
+< Taliesin
+---
+> Taliesin/M
+9171a14609,14610
 > Tallia/M
 > Tallie/M
-9172a14413,14415
+9172a14612,14614
 > Tallou/M
 > Tallulah/M
 > Tally/M
-9175a14419,14422
+9175a14618,14621
 > Talya/M
 > Talyah/M
 > Tam/M
 > Tamar/M
-9176a14424,14426
+9176a14623,14625
 > Tamarah/M
 > Tamarra/M
 > Tamas
-9181a14432
+9181a14631
 > Tamiko/M
-9182a14434
+9182a14633
 > Tamma/M
-9183a14436
+9183a14635
 > Tammara/M
-9189a14443
+9189a14642
 > Tamqrah/M
-9191a14446,14447
+9191,9193c14644,14651
+< Tamworth
+< Tancred
+< Taney
+---
+> Tamworth/M
 > Tan
 > Tana
-9192a14449,14451
+> Tancred/M
 > Tandi/M
 > Tandie/M
 > Tandy/M
-9196a14456,14457
+> Taney/M
+9196c14654,14656
+< Tangshan
+---
+> Tangshan/M
 > Tanhya/M
 > Tani/M
-9198a14460,14461
+9198a14659,14660
 > Tanitansy/M
 > Tann/MR
-9199a14463
+9199a14662
 > Tanney/M
-9200a14465,14467
+9200a14664,14666
 > Tannie/M
 > Tanny/M
 > Tansy/M
-9208a14476
+9208a14675
 > Tarah/M
-9216a14485,14487
+9214c14681
+< Tarim
+---
+> Tarim/M
+9216c14683,14686
+< Tarkington
+---
+> Tarkington/M
 > Tarra/M
 > Tarrah/M
 > Tarrance/M
-9219a14491
+9218,9219c14688,14690
+< Tartary
+< Tartuffe
+---
+> Tartary/M
+> Tartuffe/M
 > Taryn/M
-9222a14495
+9223c14694,14695
+< Tasman
+---
 > Tasia/M
-9228a14502,14503
+> Tasman/M
+9225,9226c14697,14698
+< Tasmanian
+< Tass
+---
+> Tasmanian/M
+> Tass/M
+9228,9229c14700,14703
+< Tate
+< Tatum
+---
+> Tate/M
 > Tatiana/M
 > Tatiania/M
-9231a14507,14508
+> Tatum/M
+9231c14705,14707
+< Tawney
+---
+> Tawney/M
 > Tawnya/M
 > Tawsha/M
-9239a14517
+9236c14712
+< Tchaikovsky
+---
+> Tchaikovsky/M
+9239a14716
 > Teador/M
-9243a14522,14525
+9241c14718
+< Technicolor
+---
+> Technicolor/M
+9243a14721,14724
 > Tedd/M
 > Tedda/M
 > Teddi/M
 > Teddie/M
-9244a14527,14532
+9244a14726,14731
 > Tedi/M
 > Tedie/M
 > Tedman/M
 > Tedmund/M
 > Tedra/M
 > Teena/M
-9255a14544
+9250,9252c14737,14739
+< TelePrompter
+< Telemachus
+< Telemann
+---
+> TelePrompter/M
+> Telemachus/M
+> Telemann/M
+9254a14742
+> Teller/M
+9255a14744
 > Temp/M
-9257a14547,14548
+9258c14747,14749
+< Tenn
+---
 > Temple/M
 > Templeton/M
-9262a14554,14558
+> Tenn/M
+9261c14752
+< Tennyson
+---
+> Tennyson/M
+9262a14754,14758
 > Teodoor/M
 > Teodor/M
 > Teodora/M
 > Teodorico/M
 > Teodoro/M
-9263a14560
+9264c14760,14762
+< Terence
+---
 > Tera/M
-9264a14562
+> Terence/M
 > Terencio/M
-9265a14564
+9266c14764,14768
+< Tereshkova
+---
 > Terese/M
-9266a14566,14568
+> Tereshkova/M
 > Teresina
 > Teresita/M
 > Teressa/M
-9267a14570
+9267a14770
 > Teriann/M
-9273a14577
+9273a14777
 > Terrel/M
-9277a14582,14583
+9277a14782,14783
 > Terrijo/M
 > Terrill/M
-9280a14587,14588
+9280c14786,14788
+< Terry
+---
+> Terry/M
 > Terrye/M
 > Tersina/M
-9281a14590
+9282,9283c14790,14792
+< Tesla
+< Tess
+---
 > Terza/M
-9284a14594
+> Tesla/M
+> Tess/M
+9284a14794
 > Tessi/M
-9285a14596
+9285a14796
 > Tessy/M
-9296a14608
+9288c14799
+< Tetons
+---
+> Tetons/M
+9290c14801
+< Teutonic
+---
+> Teutonic/M
+9292c14803
+< Tex
+---
+> Tex/M
+9297c14808,14809
+< Thackeray
+---
 > Thacher/M
-9299a14612,14613
+> Thackeray/M
+9299c14811,14813
+< Thaddeus
+---
+> Thaddeus/M
 > Thaddus/M
 > Thadeus/M
-9301a14616,14617
+9302c14816,14818
+< Thales
+---
 > Thain/M
 > Thaine/M
-9304a14621
+> Thales/M
+9304a14821
 > Thane/M
-9310c14627,14630
+9306,9307c14823,14824
+< Thanksgiving/SM
+< Thant
+---
+> Thanksgiving/MS
+> Thant/M
+9310c14827,14831
 < Thatcher
 ---
 > Thatch/MR
+> Thatcher/M
 > Thatcherism
 > Thaxter/M
 > Thayne/M
-9311a14632,14633
+9311a14833,14834
 > Theadora/M
 > Thebault/M
-9312a14635,14637
+9312a14836,14838
 > Theda/M
 > Thedric/M
 > Thedrick/M
-9313a14639
+9313a14840
 > Thekla/M
-9315a14642,14644
+9315,9317c14842,14848
+< Themistocles
+< Theocritus
+< Theodora
+---
+> Themistocles/M
 > The
 > Theo/M
 > Theobald/M
-9316a14646
+> Theocritus/M
 > Theodor/M
-9319a14650
+> Theodora/M
+9319a14851
 > Theodosia/M
-9324a14656,14659
+9321,9323c14853,14855
+< Theosophy
+< Theravada
+< Theresa
+---
+> Theosophy/M
+> Theravada/M
+> Theresa/M
+9324a14857,14860
 > Theresina/M
 > Theresita/M
 > Theressa/M
 > Therine/M
-9333a14669,14671
+9329c14865
+< Thespian
+---
+> Thespian/M
+9331c14867
+< Thessalonian/S
+---
+> Thessalonian/SM
+9333a14870,14872
 > Thia/M
 > Thibaud/M
 > Thibaut/M
-9336a14675,14676
+9335c14874
+< Thimbu
+---
+> Thimbu/M
+9336a14876,14877
 > Thom/M
 > Thoma/SM
-9337a14678,14681
+9337a14879,14882
 > Thomasa/M
 > Thomasin/M
 > Thomasina/M
 > Thomasine/M
-9344a14689,14692
+9339,9341c14884,14886
+< Thomistic
+< Thompson
+< Thomson
+---
+> Thomistic/M
+> Thompson/M
+> Thomson/M
+9344a14890,14893
 > Thorin/M
 > Thorn
 > Thorndike
 > Thornie/M
-9345a14694
+9346,9347c14895,14900
+< Thoroughbred
+< Thorpe
+---
 > Thorny/M
-9347a14697,14699
+> Thoroughbred/M
+> Thorpe/M
 > Thorstein/M
 > Thorsten/M
 > Thorvald/M
-9354d14705
+9354d14906
 < Thunderbird/M
-9359a14711,14712
+9356c14908
+< Thurber
+---
+> Thurber/M
+9359a14912,14913
 > Thurstan/M
 > Thurston/M
-9367a14721
+9365c14919
+< Tiberius
+---
+> Tiberius/M
+9367a14922
 > Tibold/M
-9370a14725,14727
+9369c14924
+< Ticonderoga
+---
+> Ticonderoga/M
+9370a14926,14928
 > Tiebold/M
 > Tiebout/M
 > Tiena/M
-9372a14730,14734
+9373c14931,14939
+< Tiffany
+---
 > Tierney/M
 > Tiertza/M
 > Tiff/M
 > Tiffani/M
 > Tiffanie/M
-9373a14736,14738
+> Tiffany/M
 > Tiffi/M
 > Tiffie/M
 > Tiffy/M
-9375a14741,14745
+9376c14942,14948
+< Tillich
+---
 > Tilda/M
 > Tildi/M
 > Tildie/M
 > Tildy/M
 > Tiler/M
-9376a14747
+> Tillich/M
 > Tillie/M
-9377a14749
+9378c14950,14951
+< Tilsit
+---
 > Tilly/M
-9381a14754,14756
+> Tilsit/M
+9381a14955,14957
 > Timi/M
 > Timmi/M
 > Timmie/M
-9382a14758
+9382a14959
 > Timofei/M
-9384a14761,14764
+9384,9385c14961,14966
+< Timor
+< Timothy
+---
+> Timor/M
 > Timoteo/M
 > Timothea/M
 > Timothee/M
 > Timotheus/M
-9388a14769
+> Timothy/M
+9388a14970
 > Tine/M
-9393a14775,14777
+9391c14973
+< Tinkertoy
+---
+> Tinkertoy/M
+9393c14975,14978
+< Tintoretto
+---
+> Tintoretto/M
 > Tiphani/M
 > Tiphanie/M
 > Tiphany/M
-9400a14785,14786
+9395c14980
+< Tipperary
+---
+> Tipperary/M
+9400a14986,14987
 > Tirrell/M
 > Tish/M
-9408c14794
+9404,9405c14991,14992
+< Titania
+< Titanic
+---
+> Titania/M
+> Titanic/M
+9408,9409c14995,14996
 < Tito/M
+< Titus
 ---
 > Tito/SM
-9414a14801,14807
+> Titus/M
+9415,9418c15002,15013
+< Tobit
+< Toby
+< Tocantins
+< Tocqueville
+---
 > Tobe/M
 > Tobey
 > Tobi/M
@@ -8417,147 +15935,316 @@
 > Tobias/M
 > Tobie/M
 > Tobin/M
-9416a14810
+> Tobit/M
+> Toby/M
 > Tobye/M
-9420a14815,14816
+> Tocantins/M
+> Tocqueville/M
+9420c15015,15017
+< Todd
+---
+> Todd/M
 > Toddie/M
 > Toddy/M
-9422a14819,14820
+9423c15020,15022
+< Tojo
+---
 > Toiboid/M
 > Toinette/M
-9434c14832,14835
+> Tojo/M
+9425c15024
+< Tokugawa
+---
+> Tokugawa/M
+9429c15028
+< Tolkien
+---
+> Tolkien/M
+9431c15030
+< Toltec
+---
+> Toltec/M
+9434c15033,15037
 < Tomas
 ---
 > Toma/SM
+> Tomas/M
 > Tomasina/M
 > Tomasine/M
 > Tomaso/M
-9435a14837,14839
+9435a15039,15041
 > Tome/M
 > Tomi/M
 > Tomkin/M
-9436a14841
+9436a15043
 > Tommi/M
-9444a14850,14851
+9438c15045
+< Tommy
+---
+> Tommy/M
+9440c15047
+< Tomsk
+---
+> Tomsk/M
+9444a15052,15053
 > Tonie/M
 > Tonnie/M
-9447a14855,14856
+9446c15055
+< Tony
+---
+> Tony/M
+9447a15057,15058
 > Tonye/M
 > Tootsie/M
-9451a14861,14865
+9451a15063,15067
 > Tore/M
 > Torey/M
 > Tori/M
 > Torie/M
 > Torin/M
-9453a14868
+9453,9456c15069,15076
+< Torquemada
+< Torrance
+< Torrens
+< Torres
+---
+> Torquemada/M
 > Torr/MX
-9454a14870,14871
+> Torrance/M
 > Torre/SM
 > Torrence/M
-9456a14874
+> Torrens/M
+> Torres/M
 > Torrey/M
-9457a14876,14878
+9458,9459c15078,15082
+< Tortola
+< Tortuga
+---
 > Torrie/M
 > Torrin/M
 > Torry/M
-9466a14888,14890
+> Tortola/M
+> Tortuga/M
+9463c15086
+< Toscanini
+---
+> Toscanini/M
+9466,9467c15089,15095
+< Toulouse
+< Townes
+---
+> Toulouse/M
 > Tova/M
 > Tove/M
 > Town/M
-9467a14892,14893
+> Townes/M
 > Towney/M
 > Townie/M
-9468a14895
+9468a15097
 > Towny/M
-9471a14899,14900
+9471a15101,15102
 > Trace/M
 > Tracee/M
-9483a14913
+9478c15109
+< Trajan
+---
+> Trajan/M
+9480c15111
+< Transcaucasia
+---
+> Transcaucasia/M
+9482c15113,15114
+< Transylvania
+---
+> Transylvania/M
+> Transylvanian/M
+9483a15116
 > Traver/MS
-9485a14916
+9485a15119
 > Travus/M
-9487a14919
+9487c15121,15122
+< Treblinka
+---
+> Treblinka/M
 > Trefor/M
-9488a14921,14924
+9488a15124,15127
 > Tremain/M
 > Tremaine/M
 > Tremayne/M
 > Trenna/M
-9490a14927,14931
+9491c15130,15136
+< Trevelyan
+---
 > Tresa/M
 > Trescha/M
 > Tressa/M
 > Trev/MR
 > Trevar/M
-9491a14933
+> Trevelyan/M
 > Trever/M
-9504a14947
+9499c15144
+< Trieste
+---
+> Trieste/M
+9505c15150,15151
+< Tripitaka
+---
 > Trip/M
-9506a14950
+> Tripitaka/M
+9506a15153
 > Tripp/M
-9507a14952,14953
+9507a15155,15156
 > Tris
 > Trish/M
-9508a14955,14956
+9508a15158,15159
 > Trista/M
 > Tristam/M
-9510a14959,14962
+9510a15162,15165
 > Trix/M
 > Trixi/M
 > Trixie/M
 > Trixy/M
-9518a14971
+9511a15167
+> Troilus/M
+9513c15169
+< Trollope
+---
+> Trollope/M
+9516c15172
+< Trotsky
+---
+> Trotsky/M
+9518a15175
 > Trstram/M
-9519a14973,14974
+9520c15177,15182
+< Trudeau
+---
 > Truda/M
 > Trude/M
-9520a14976,14978
+> Trudeau/M
 > Trudey/M
 > Trudi/M
 > Trudie/M
-9521a14980
+9521a15184
 > Trueman/M
-9523a14983,14984
+9523c15186,15188
+< Trujillo
+---
+> Trujillo/M
 > Trula/M
 > Trumaine/M
-9524a14986
+9524a15190
 > Trumann/M
-9537a15000
+9527c15193
+< Truth
+---
+> Truth/M
+9534c15200
+< Tu
+---
+> Tu/M
+9537c15203,15204
+< Tubman
+---
+> Tubman/M
 > Tuck/R
-9538a15002,15003
+9538a15206,15207
 > Tuckie/M
 > Tucky/M
-9546a15012,15013
+9546a15216,15217
 > Tulley/M
 > Tully/M
-9590a15058
+9557c15228
+< Tupperware
+---
+> Tupperware/M
+9559c15230
+< Turgenev
+---
+> Turgenev/M
+9568,9569c15239,15240
+< Turner
+< Turpin
+---
+> Turner/M
+> Turpin/M
+9578,9579c15249,15250
+< Tutankhamen
+< Tutsi
+---
+> Tutankhamen/M
+> Tutsi/M
+9583,9584c15254,15255
+< Twain
+< Tweed
+---
+> Twain/M
+> Tweed/M
+9588c15259,15260
+< Twinkies
+---
+> Twinkies/M
+> Twitter/M
+9590a15263
 > Twyla/M
-9591a15060,15062
+9592c15265,15269
+< Tycho
+---
 > Tybalt/M
 > Tybi/M
 > Tybie/M
-9592a15064
+> Tycho/M
 > Tye/M
-9594a15067,15069
+9595,9597c15272,15278
+< Tyndale
+< Tyndall
+< Tyre
+---
 > Tymon/M
 > Tymothy/M
 > Tynan/M
-9596a15072
+> Tyndale/M
+> Tyndall/M
 > Tyne/M
-9601a15078
+> Tyre/M
+9601c15282,15283
+< Tyrone
+---
+> Tyrone/M
 > Tyrus/M
-9609a15087
+9609a15292
 > UI/MS
-9638a15117
+9617,9618c15300,15301
+< UPI
+< UPS
+---
+> UPI/M
+> UPS/M
+9622a15306
+> USB
+9624c15308
+< USDA
+---
+> USDA/M
+9635c15319
+< Ubangi
+---
+> Ubangi/M
+9637c15321
+< Ucayali
+---
+> Ucayali/M
+9639c15323,15325
+< Udall
+---
 > Udale/M
-9639a15119
+> Udall/M
 > Udell/M
-9642a15123
+9642a15329
 > Ugo/M
-9646a15128
+9646a15334
 > Ula/M
-9647a15130,15140
+9647a15336,15346
 > Ulberto/M
 > Ulick/M
 > Ulises/M
@@ -8569,238 +16256,500 @@
 > Ulrika/M
 > Ulrikaumeko/M
 > Ulrike/M
-9651a15145
+9650c15349
+< Ulyanovsk
+---
+> Ulyanovsk/M
+9651a15351
 > Umberto/M
-9652a15147,15148
+9652a15353,15354
 > Umeko/M
 > Una/M
-9672a15169
+9654c15356
+< Ungava
+---
+> Ungava/M
+9665,9666c15367,15368
+< Upanishads
+< Updike
+---
+> Upanishads/M
+> Updike/M
+9669,9670c15371,15373
+< Ur
+< Ural/S
+---
+> Ur/M
+> Ural/SM
+> Urals/M
+9672a15376
 > Urbain/M
-9673a15171,15172
+9673a15378,15379
 > Urbano/M
 > Urbanus/M
-9675a15175
+9675,9679c15381,15386
+< Urey
+< Uriah
+< Uriel
+< Uris
+< Urquhart
+---
+> Urey/M
 > Uri/SM
-9680a15181,15183
+> Uriah/M
+> Uriel/M
+> Uris/M
+> Urquhart/M
+9681,9682c15388,15393
+< Ursula
+< Ursuline
+---
 > Ursala/M
 > Ursola/M
 > Urson/M
-9681a15185
+> Ursula/M
 > Ursulina/M
-9687a15192
+> Ursuline/M
+9685c15396
+< Urumqi
+---
+> Urumqi/M
+9687c15398,15399
+< Ustinov
+---
+> Ustinov/M
 > Uta/M
-9723a15229,15230
+9723c15435,15437
+< Va
+---
+> Va/M
 > Vachel/M
 > Vaclav/M
-9726c15233,15236
+9726c15440,15443
 < Val/M
 ---
 > Vail/M
 > Val/MY
 > Valaree/M
 > Valaria/M
-9727a15238
+9727a15445
 > Valdemar/M
-9728a15240,15241
+9728a15447,15448
 > Vale/M
 > Valeda/M
-9729a15243,15244
+9729a15450,15451
 > Valene/M
 > Valenka/M
-9730a15246,15247
+9730a15453,15454
 > Valentia/M
 > Valentijn/M
-9731a15249
+9731a15456
 > Valentina/M
-9734a15253
+9733c15458
+< Valentino
+---
+> Valentino/M
+9734a15460
 > Valera
-9738a15258
+9738c15464,15465
+< Valery
+---
+> Valery/M
 > Valerye/M
-9739a15260,15261
+9739a15467,15468
 > Valida/M
 > Valina/M
-9741a15264
+9741a15471
 > Valle/M
-9743a15267,15270
+9744c15474,15478
+< Valois
+---
 > Valli/M
 > Vallie/M
 > Vally/M
 > Valma/M
-9745a15273
+> Valois/M
+9745a15480
 > Valry/M
-9749a15278
+9747,9748c15482,15483
+< Van
+< Vance
+---
+> Van/M
+> Vance/M
+9749a15485
 > Vanda/M
-9754a15284,15288
+9751,9752c15487,15488
+< Vanderbilt
+< Vandyke
+---
+> Vanderbilt/M
+> Vandyke/M
+9754a15491,15495
 > Vania/M
 > Vanna/M
 > Vanni/M
 > Vannie/M
 > Vanny/M
-9755a15290
+9755a15497
 > Vanya/M
-9760a15296,15297
+9757,9759c15499,15501
+< Varanasi
+< Varese
+< Vargas
+---
+> Varanasi/M
+> Varese/M
+> Vargas/M
+9760a15503,15504
 > Vasili/MS
 > Vasily/M
-9762a15300,15301
+9762a15507,15508
 > Vassili/M
 > Vassily/M
-9780a15320
+9764,9765c15510,15511
+< Vauban
+< Vaughan
+---
+> Vauban/M
+> Vaughan/M
+9770c15516
+< Vedanta
+---
+> Vedanta/M
+9772a15519
+> Vegas/M
+9774c15521
+< Vela
+---
+> Vela/M
+9776c15523
+< Velazquez
+---
+> Velazquez/M
+9780a15528
 > Velvet/M
-9784a15325
+9784a15533
 > Venita/M
-9790a15332
+9788c15537
+< Venusian
+---
+> Venusian/M
+9791,9792c15540,15542
+< Verde
+< Verdi
+---
 > Veradis
-9793a15336,15339
+> Verde/M
+> Verdi/M
+9793a15544,15547
 > Vere/M
 > Verena/M
 > Verene/M
 > Verge/M
-9794a15341,15344
+9794a15549,15552
 > Veriee/M
 > Verile/M
 > Verina/M
 > Verine/M
-9795a15346
+9795a15554
 > Verla/M
-9800c15351
+9797c15556
+< Vermeer
+---
+> Vermeer/M
+9800c15559
 < Vern/M
 ---
 > Vern/MN
-9802a15354,15356
+9802c15561,15564
+< Verne
+---
+> Verne/M
 > Vernen/M
 > Verney/M
 > Vernice/M
-9803a15358
+9803a15566
 > Vernor/M
-9806a15362,15364
+9805,9806c15568,15572
+< Veronese
+< Veronica
+---
+> Veronese/M
+> Veronica/M
 > Veronika/M
 > Veronike/M
 > Veronique
-9813a15372,15373
+9809c15575
+< Vespasian
+---
+> Vespasian/M
+9813a15580,15581
 > Vevay/M
 > Vi/M
-9818a15379
+9815,9816c15583,15584
+< Viagra
+< Vic
+---
+> Viagra/M
+> Vic/M
+9818c15586,15587
+< Vichy
+---
+> Vichy/M
 > Vick/M
-9822a15384
+9822c15591,15592
+< Vicky
+---
+> Vicky/M
 > Victoir/M
-9827a15390
+9827a15598
 > Vida/M
-9828a15392,15393
+9828a15600,15601
 > Vidovic/M
 > Vidovik/M
-9837a15403
+9830c15603
+< Viennese
+---
+> Viennese/M
+9832,9833c15605,15606
+< Vietcong
+< Vietminh
+---
+> Vietcong/M
+> Vietminh/M
+9837a15611
 > Viki/M
-9838a15405,15406
+9838a15613,15614
 > Vikki/M
 > Vikky/M
-9839a15408
+9840c15616,15617
+< Villa
+---
 > Vilhelmina/M
-9845a15415,15416
+> Villa/M
+9842c15619
+< Villon
+---
+> Villon/M
+9845a15623,15624
 > Vin/M
 > Vina/M
-9847c15418,15420
+9847c15626,15628
 < Vincent/M
 ---
 > Vincent/MS
 > Vincenty/M
 > Vincenz/M
-9848a15422,15425
+9848a15630,15633
 > Vinita/M
 > Vinni/M
 > Vinnie/M
 > Vinny/M
-9850a15428,15429
+9850a15636,15637
 > Violante/M
 > Viole/M
-9851a15431,15433
+9851a15639,15641
 > Violetta/M
 > Violette/M
 > Virge/M
-9853a15436,15437
+9853a15644,15645
 > Virgilio/M
 > Virgina/M
-9855a15440
+9855a15648
 > Virginie/M
-9863a15449,15451
+9859c15652
+< Visayans
+---
+> Visayans/M
+9863a15657,15659
 > Vita/M
 > Vite/M
 > Vitia/M
-9865a15454,15456
+9865a15662,15664
 > Vitoria
 > Vittoria/M
 > Vittorio/M
-9866a15458,15459
+9867c15666,15668
+< Vivaldi
+---
 > Viv/M
 > Viva/M
-9868a15462,15463
+> Vivaldi/M
+9869c15670,15678
+< Vivian
+---
 > Vivi/MN
 > Vivia/M
-9869a15465,15470
+> Vivian/M
 > Viviana/M
 > Vivianna/M
 > Vivianne/M
 > Vivie/M
 > Vivien/M
 > Viviene/M
-9870a15472,15474
+9870a15680,15682
 > Viviyan/M
 > Vivyan/M
 > Vivyanne/M
-9871a15476
+9872c15684,15685
+< Vladimir
+---
 > Vladamir/M
-9885a15491
+> Vladimir/M
+9874c15687
+< Vlaminck
+---
+> Vlaminck/M
+9883c15696
+< Volta
+---
+> Volta/M
+9885a15699
 > Von/M
-9887a15494,15496
+9888c15702,15705
+< Voronezh
+---
 > Vonni/M
 > Vonnie/M
 > Vonny/M
-9895a15505
+> Voronezh/M
+9895a15713
 > Vyky/M
-9899c15509
+9899c15717
 < WASP/M
 ---
 > WASP/SM
-9917a15528
+9903a15722
+> WMD
+9906a15726
+> WTO
+9916,9917c15736,15738
+< Waco
+< Wade
+---
+> Waco/M
+> Wade/M
 > Wadsworth/M
-9921a15533,15535
+9919,9921c15740,15745
+< Wagnerian
+< Wahhabi
+< Waikiki
+---
+> Wagnerian/M
+> Wahhabi/M
+> Waikiki/M
 > Wain/M
 > Wainwright/M
 > Wait/MR
-9922a15537
+9922a15747
 > Waiter/M
-9923a15539
+9924c15749,15750
+< Waksman
+---
 > Wakefield
-9930a15547
+> Waksman/M
+9928,9929c15754,15755
+< Waldensian
+< Waldheim
+---
+> Waldensian/M
+> Waldheim/M
+9930a15757
 > Waldon/M
-9938a15556,15557
+9933c15760
+< Walesa
+---
+> Walesa/M
+9936c15763
+< Walkman
+---
+> Walkman/M
+9938,9941c15765,15775
+< Wallace
+< Wallenstein
+< Wallis
+< Walloon
+---
+> Wallace/M
 > Wallache/M
 > Wallas/M
-9939a15559
+> Wallenstein/M
 > Wallie/M
-9940a15561
+> Wallis/M
 > Walliw/M
-9941a15563
+> Walloon/M
+> Walls/M
 > Wally/M
-9945a15568
+> Walmart/M
+9943c15777
+< Walpurgisnacht
+---
+> Walpurgisnacht/M
+9945a15780,15782
+> Walter/M
+> Walters/M
 > Walther/M
-9946a15570
+9946a15784
 > Waly/M
-9948a15573,15575
+9948a15787,15789
 > Wandie/M
 > Wandis/M
 > Waneta/M
-9949a15577
+9949a15791
 > Wanids/M
-9951c15579,15580
+9951c15793,15794
 < Ward
 ---
-> Ward/N
+> Ward/NM
 > Warde/M
-9963d15591
+9953c15796
+< Warhol
+---
+> Warhol/M
+9956c15799
+< Warren
+---
+> Warren/M
+9958c15801
+< Warwick
+---
+> Warwick/M
+9960c15803
+< Wash
+---
+> Wash/M
+9962,9967c15805,15810
+< Washingtonian/SM
 < Wasp
-9964a15593
+< Wassermann
+< Waterbury
+< Waterford
+< Watergate
+---
+> Washingtonian/MS
+> Wassermann/M
 > Wat/MZ
-9976a15606,15613
+> Waterbury/M
+> Waterford/M
+> Watergate/M
+9970,9975c15813,15818
+< Watkins
+< Watson
+< Watt/S
+< Watteau
+< Watusi
+< Waugh
+---
+> Watkins/M
+> Watson/M
+> Watt/SM
+> Watteau/M
+> Watusi/M
+> Waugh/M
+9977c15820,15828
+< Wayne
+---
 > Waverley/M
 > Waverly/M
 > Way/M
@@ -8809,208 +16758,478 @@
 > Waylen/M
 > Waylin/M
 > Waylon/M
-9989a15627,15628
+> Wayne/M
+9979,9980c15830,15832
+< Web/R
+< Webb
+---
+> Web/MR
+> Webb/M
+> Weber/M
+9985c15837
+< Wedgwood
+---
+> Wedgwood/M
+9988c15840
+< Wehrmacht
+---
+> Wehrmacht/M
+9989a15842,15843
 > Weidar/M
 > Weider/M
-9995a15635,15636
+9995c15849,15851
+< Weizmann
+---
+> Weizmann/M
 > Welbie/M
 > Welby/M
-10006a15648,15651
+10000c15856
+< Welles
+---
+> Welles/M
+10002c15858
+< Wells
+---
+> Wells/M
+10005c15861
+< Welshmen
+---
+> Welshmen/M
+10006a15863,15866
 > Wenda/M
 > Wendall/M
 > Wendel/M
 > Wendeline/M
-10008a15654
+10008a15869
 > Wendie/M
-10009a15656,15661
+10009a15871,15876
 > Wendye/M
 > Wenona/M
 > Wenonah/M
 > Werner/M
 > Wernher/M
 > Wes
-10015a15668,15669
+10013c15880
+< Wessex
+---
+> Wessex/M
+10015a15883,15884
 > Westbrook/M
 > Westbrooke/M
-10017a15672,15673
+10017,10018c15886,15889
+< Westinghouse
+< Westminster
+---
+> Westinghouse/M
 > Westleigh/M
 > Westley/M
-10021a15678
+> Westminster/M
+10020c15891
+< Westphalia
+---
+> Westphalia/M
+10021a15893
 > Weylin/M
-10031a15689
+10023c15895
+< Wharton
+---
+> Wharton/M
+10031,10032c15903,15906
+< Whistler
+< Whitaker
+---
+> Whistler/M
 > Whit
-10032a15691
+> Whitaker/M
 > Whitby/M
-10043a15703
+10035,10036c15909,15910
+< Whitehall
+< Whitehead
+---
+> Whitehall/M
+> Whitehead/M
+10041c15915
+< Whitman
+---
+> Whitman/M
+10043,10045c15917,15921
+< Whitsunday/SM
+< Whittier
+< Wicca
+---
+> Whitsunday/MS
 > Whittaker/M
-10044a15705
+> Whittier/M
 > Wiatt/M
-10057a15719
+> Wicca/M
+10050c15926
+< Wiggins
+---
+> Wiggins/M
+10052a15929
+> Wikileaks
+10054c15931
+< Wilberforce
+---
+> Wilberforce/M
+10057a15935
 > Wilburt/M
-10060a15723,15726
+10060,10061c15938,15944
+< Wilde/R
+< Wiles
+---
+> Wilde/MR
+> Wilder/M
 > Wilden/M
 > Wildon/M
 > Wileen/M
 > Wilek/M
-10065a15732
+> Wiles/M
+10065a15949
 > Wilfrid/M
-10067a15735,15736
+10067a15952,15953
 > Wilhelmine
 > Wilie/M
-10073a15743
+10069,10070c15955,15956
+< Wilkes
+< Wilkins
+---
+> Wilkes/M
+> Wilkins/M
+10073a15960
 > Willabella/M
-10074a15745
+10075,10078c15962,15973
+< Willard
+< Willemstad
+< William/S
+< Williamson
+---
 > Willamina/M
-10075a15747,15748
+> Willard/M
 > Willdon/M
 > Willem/M
-10076a15750,15753
+> Willemstad/M
 > Willetta/M
 > Willette/M
 > Willey/M
 > Willi/MS
-10080a15758
+> William/SM
+> Williams/M
+> Williamson/M
+10080c15975,15976
+< Willis
+---
+> Willis/M
 > Willow/M
-10081a15760
+10081a15978
 > Willyt/M
-10082a15762
+10082a15980
 > Wilmar/M
-10083a15764
+10083a15982
 > Wilmette/M
-10084a15766,15768
+10084a15984,15986
 > Wilona/M
 > Wilone/M
 > Wilow/M
-10086a15771
+10086c15988,15989
+< Wilsonian
+---
+> Wilsonian/M
 > Wilt/M
-10089a15775
+10089a15993
 > Win/M
-10093a15780
+10091,10092c15995,15996
+< Winchester/S
+< Windbreaker
+---
+> Winchester/MS
+> Windbreaker/M
+10094,10095c15998,16000
+< Windhoek
+< Windows
+---
 > Windham/M
-10097a15785
+> Windhoek/M
+> Windows/M
+10097a16003
 > Windy/M
-10098a15787
+10098a16005
 > Winfield/M
-10100a15790,15791
+10100a16008,16009
 > Wini/M
 > Winifield/M
-10102a15794,15797
+10102a16012,16015
 > Winn/M
 > Winna/M
 > Winnah/M
 > Winne/M
-10103a15799
+10104c16017,16019
+< Winnie
+---
 > Winni/M
-10104a15801
+> Winnie/M
 > Winnifred/M
-10105a15803,15806
+10105a16021,16024
 > Winny/M
 > Winona/M
 > Winonah/M
 > Winslow/M
-10113a15815
+10107c16026
+< Winters
+---
+> Winters/M
+10112c16031
+< Wisconsinite/SM
+---
+> Wisconsinite/MS
+10113a16033
 > Wit/M
-10115a15818,15819
+10116c16036,16038
+< Witwatersrand
+---
 > Wittie/M
 > Witty/M
-10123a15828,15829
+> Witwatersrand/M
+10120,10122c16042,16044
+< Wolf
+< Wolfe
+< Wolff
+---
+> Wolf/M
+> Wolfe/M
+> Wolff/M
+10124c16046,16048
+< Wollongong
+---
 > Wolfie/M
 > Wolfy/M
-10133a15840,15841
+> Wollongong/M
+10126c16050
+< Wolsey
+---
+> Wolsey/M
+10128c16052
+< Wonder
+---
+> Wonder/M
+10131c16055
+< Wood/S
+---
+> Wood/SM
+10133a16058,16059
 > Woodie/M
 > Woodman
-10136a15845
+10134a16061
+> Woods/M
+10137c16064,16065
+< Woolf
+---
 > Woody/M
-10144a15854
+> Woolf/M
+10140c16068
+< Woolworth
+---
+> Woolworth/M
+10144c16072,16073
+< Worcestershire
+---
+> Worcestershire/M
 > Worden/M
-10147a15858,15860
+10147c16076,16079
+< Worms
+---
+> Worms/M
 > Worth
 > Worthington/M
 > Worthy/M
-10153a15867
+10153,10154c16085,16087
+< Wren
+< Wright
+---
+> Wren/M
 > Wrennie/M
-10159a15874
+> Wright/M
+10158c16091
+< Wuhan
+---
+> Wuhan/M
+10160c16093,16094
+< Wyatt
+---
 > Wyatan/M
-10163c15878
+> Wyatt/M
+10163c16097,16098
 < Wyeth
 ---
 > Wye/H
-10164a15880,15882
+> Wyeth/M
+10164a16100,16102
 > Wylma/M
 > Wyn/M
 > Wyndham/M
-10165a15884,15886
+10165a16104,16106
 > Wynne/M
 > Wynnie/M
 > Wynny/M
-10177a15899
+10168c16109
+< Wyomingite/MS
+---
+> Wyomingite/SM
+10175,10177c16116,16119
+< Xanadu
+< Xanthippe
+< Xavier
+---
+> Xanadu/M
+> Xanthippe/M
+> Xavier/M
 > Xaviera/M
-10178a15901
+10178a16121
 > Xena/M
-10181a15905
+10181c16124,16125
+< Xenophon
+---
+> Xenophon/M
 > Xenos
-10183a15908
+10183c16127,16128
+< Xerxes
+---
+> Xerxes/M
 > Xever/M
-10188a15914
+10185c16130
+< Xi'an
+---
+> Xi'an/M
+10188c16133,16134
+< Ximenes
+---
+> Ximenes/M
 > Ximenez/M
-10193a15920,15922
+10193a16140,16142
 > Xylia/M
 > Xylina/M
 > Xymenes/M
-10209a15939
+10195c16144
+< YMCA
+---
+> YMCA/M
+10199c16148
+< YWCA
+---
+> YWCA/M
+10206c16155
+< Yakima
+---
+> Yakima/M
+10208c16157
+< Yakutsk
+---
+> Yakutsk/M
+10209a16159
 > Yalonda/M
-10215a15946,15949
+10215,10216c16165,16170
+< Yamoussoukro
+< Yang
+---
+> Yamoussoukro/M
 > Yanaton/M
 > Yance/M
 > Yancey/M
 > Yancy/M
-10223a15958,15959
+> Yang/M
+10223c16177,16179
+< Yaqui
+---
+> Yaqui/M
 > Yard/M
 > Yardley/M
-10225a15962,15963
+10225c16181,16183
+< Yaroslavl
+---
+> Yaroslavl/M
 > Yasmeen/M
 > Yasmin/M
-10230a15969,15970
+10227c16185
+< Yates
+---
+> Yates/M
+10231,10232c16189,16193
+< Yekaterinburg
+< Yellowknife
+---
 > Yehudi/M
 > Yehudit/M
-10231a15972
+> Yekaterinburg/M
 > Yelena/M
-10241a15983,15986
+> Yellowknife/M
+10234c16195
+< Yeltsin
+---
+> Yeltsin/M
+10239c16200
+< Yerevan
+---
+> Yerevan/M
+10241a16203,16206
 > Yetta/M
 > Yettie/M
 > Yetty/M
 > Yevette/M
-10245a15991,15992
+10243c16208
+< Yggdrasil
+---
+> Yggdrasil/M
+10245a16211,16212
 > Ynes/M
 > Ynez/M
-10250a15998,16000
+10249c16216
+< Yokohama
+---
+> Yokohama/M
+10250a16218,16220
 > Yolande/M
 > Yolane/M
 > Yolanthe/M
-10253c16003,16007
+10252,10254c16222,16228
+< Yonkers
 < York/M
+< Yorkie
 ---
+> Yonkers/M
 > Yooper/MS
 > Yorgo/MS
 > York/MR
 > Yorke/M
 > Yorker/M
-10258a16013,16014
+> Yorkie/M
+10258a16233,16234
 > Yoshi/M
 > Yoshiko/M
-10262a16019
+10261,10262c16237,16239
+< Young
+< Youngstown
+---
+> Young/M
+> Youngstown/M
 > Yovonnda/M
-10264a16022
+10264c16241,16242
+< Ypsilanti
+---
+> Ypsilanti/M
 > Ysabel/M
-10271a16030
+10267c16245
+< Yugo
+---
+> Yugo/M
+10271a16250
 > Yul/M
-10273a16033
+10273a16253
 > Yulma/M
-10276a16037
+10276a16257
 > Yurik/M
-10278a16040
+10278a16260
 > Yvon/M
-10280c16042,16047
+10280c16262,16267
 < Z/SMNXT
 ---
 > Yvor/M
@@ -9019,24 +17238,42 @@
 > Zaccaria/M
 > Zach
 > Zacharia/SM
-10281a16049
+10281a16269
 > Zacharie/M
-10282a16051
+10282a16271
 > Zacherie/M
-10283a16053,16054
+10283a16273,16274
 > Zack/M
 > Zackariah/M
-10284a16056
+10284a16276
 > Zahara/M
-10286a16059
+10286a16279
 > Zak/M
-10292a16066
+10290c16283
+< Zamboni
+---
+> Zamboni/M
+10292c16285,16286
+< Zamora
+---
+> Zamora/M
 > Zandra/M
-10293a16068
+10293a16288
 > Zaneta/M
-10300a16076
+10296,10298c16291,16293
+< Zapata
+< Zaporozhye
+< Zapotec
+---
+> Zapata/M
+> Zaporozhye/M
+> Zapotec/M
+10300a16296
 > Zarah/M
-10301a16078,16084
+10302,10303c16298,16309
+< Zebedee
+< Zechariah
+---
 > Zared/M
 > Zaria/M
 > Zarla/M
@@ -9044,31 +17281,60 @@
 > Zealand/M
 > Zeb/M
 > Zebadiah/M
-10302a16086,16087
+> Zebedee/M
 > Zebulen/M
 > Zebulon/M
-10303a16089
+> Zechariah/M
 > Zed/M
-10307a16094
+10308c16314,16315
+< Zelig
+---
 > Zelda/M
-10310a16098
+> Zelig/M
+10310a16318
 > Zena/M
-10311a16100
+10311a16320
 > Zenia/M
-10315a16105
+10313,10314c16322,16323
+< Zephaniah
+< Zephyrus
+---
+> Zephaniah/M
+> Zephyrus/M
+10315a16325
 > Zerk/M
-10321a16112
+10319c16329
+< Zhengzhou
+---
+> Zhengzhou/M
+10321c16331,16332
+< Zhukov
+---
+> Zhukov/M
 > Zia/M
-10325a16117
+10323c16334
+< Ziegfeld
+---
+> Ziegfeld/M
+10325a16337
 > Zilvia/M
-10333a16126,16127
+10333c16345,16347
+< Ziploc
+---
+> Ziploc/M
 > Zita/M
 > Zitella/M
-10336a16131
+10337,10338c16351,16354
+< Zollverein
+< Zoloft
+---
 > Zollie/M
-10337a16133
+> Zollverein/M
 > Zolly/M
-10339a16136,16143
+> Zoloft/M
+10340c16356,16364
+< Zorn
+---
 > Zonda/M
 > Zondra/M
 > Zonnya/M
@@ -9077,728 +17343,903 @@
 > Zorana/M
 > Zorina/M
 > Zorine/M
-10346a16151
+> Zorn/M
+10347c16371,16372
+< Zsigmondy
+---
 > Zsazsa/M
-10350a16156
+> Zsigmondy/M
+10350a16376
 > Zulema/M
-10354a16161
+10353c16379
+< Zuni
+---
+> Zuni/M
+10354a16381
 > Zuzana/M
-10460a16268
+10356c16383
+< Zworykin
+---
+> Zworykin/M
+10391a16419
+> abductee/MS
+10460a16489
 > abridgement/MS
-10488a16297,16298
+10488a16518,16519
 > absorbance/S
 > absorbancy/M
-10516,10517c16326
+10516,10517c16547
 < abuse's
 < abuse/EGVDS
 ---
 > abuse/EGVDSM
-10665a16475
+10665a16696
 > acknowledgement/MS
-10709,10710c16519
+10709,10710c16740
 < act's
 < act/ASDGV
 ---
 > act/ASDGVM
-10721,10722c16530
+10721,10722c16751
 < active's
 < active/IKY
 ---
 > active/IKYSM
-10724d16531
+10724d16752
 < actives
-10727,10728c16534
+10727,10728c16755
 < activity's/I
 < activity/AS
 ---
 > activity/ASIM
-10774,10775c16580
+10774,10775c16801
 < address's
 < address/AGDS
 ---
 > address/AGDSM
-10824c16629
+10824c16850
 < admin/S
 ---
 > admin/MS
-10936a16742
+10936a16963
 > advocator/SM
-10937a16744
+10937a16965
 > adware/MS
-10979,10980c16786
+10939c16967
+< adze/M
+---
+> adze/SM
+10948c16976
+< aerie/M
+---
+> aerie/MS
+10967c16995
+< aesthete/S
+---
+> aesthete/MS
+10979,10980c17007
 < affect's
 < affect/EGVDS
 ---
 > affect/EGVDSM
-10990,10991c16796
+10990,10991c17017
 < affiliate's
 < affiliate/EGNDS
 ---
 > affiliate/EGNDSM
-11045c16850
+11045c17071
 < afterward
 ---
 > afterward/S
-11073a16879
+11073a17100
 > aggregator/SM
-11393d17198
+11393d17419
 < altho
-11579a17385
-> analyses
-11631c17437
+11579a17606
+> analyses/A
+11631c17658
 < anecdotal
 ---
 > anecdotal/Y
-11750a17557,17558
+11750a17778,17779
 > anonymization/SM
 > anonymize/DSG
-11804c17612
+11804c17833
 < anthropomorphizing
 ---
 > anthropomorphize/DSG
-11931a17740
-> apatosaurus/M
-11983c17792
+11983c18012
 < app/S
 ---
 > app/MS
-12035,12036c17844
+12035,12036c18064
 < appointment's/A
 < appointment/ESM
 ---
 > appointment/ESMA
-12135a17944,17945
+12135a18164,18165
 > archaeoastronomy/M
 > archaeologic
-12137a17948,17950
+12137a18168,18170
 > archaeology/M
 > archaeomagnetic
 > archaeomagnetism
-12152c17965
+12152c18185
 < archeological
 ---
 > archeological/Y
-12214,12215c18027
+12214,12215c18247
 < arm's
 < arm/EAGDS
 ---
 > arm/EAGDSM
-12255,12256c18067
+12255,12256c18287
 < arrangement's/E
 < arrangement/ASM
 ---
 > arrangement/ASME
-12427,12428c18238
+12427,12428c18458
 < assign's
 < assign/ALGDS
 ---
 > assign/ALGDSM
-12432c18242
+12432c18462
 < assignees
 ---
 > assignee/MS
-12446,12447c18256
+12446,12447c18476
 < associate's
 < associate/EDSGNV
 ---
 > associate/EDSGNVM
-12491a18301,18303
+12491a18521,18523
 > astroarchaeology/SM
 > astrobiology/M
 > astrobleme/S
-12518a18331
+12518a18551
 > asynchronicity
-12584,12585c18397
+12584,12585c18617
 < attempt's
 < attempt/ASDG
 ---
 > attempt/ASDGM
-12685c18497
+12685c18717
 < auteur
 ---
 > auteur/MS
-12713a18526
+12713a18746
 > autocomplete/S
-12754a18568
+12754a18788
 > avant-garde
-12827d18640
+12803a18838
+> awardee/S
+12827d18861
 < awol
-12829a18643
+12829a18864
 > axe/M
-12969c18783
+12969c19004
 < badge/MZDRS
 ---
 > badge/MZDRSG
-13018,13019c18832
+13018,13019c19053
 < balance's
 < balance/UDSG
 ---
 > balance/UDSGM
-13079,13080c18892
+13079,13080c19113
 < band's
 < band/ESGD
 ---
 > band/ESGDM
-13149,13150c18961
+13149,13150c19182
 < bar's
 < bar/ECUTS
 ---
 > bar/ECUTSM
-13195,13196c19006
+13195,13196c19227
 < bark's
 < bark/CSGD
 ---
 > bark/CSGDM
-13249,13250c19059
+13249,13250c19280
 < base's
 < base/CDRSLTG
 ---
 > base/CDRSLTGM
-13843,13844c19652
+13259a19290
+> baser
+13505a19537
+> begat
+13736a19769
+> biased/U
+13815a19849
+> bilirubin
+13843,13844c19877
 < bind's
 < bind/AUGS
 ---
 > bind/AUGSM
-13864a19673
+13864a19898
 > biodiesel/M
-14118,14119c19927
+13931c19965
+< birth/GMD
+---
+> birth/ZGMDR
+13932a19967
+> birther/M
+13956a19992
+> bitcoin/SM
+13980c20016
+< bl/D
+---
+> bl/DG
+14118,14119c20154
 < block's
 < block/UGDS
 ---
 > block/UGDSM
-14179a19988,19990
+14179a20215,20217
 > bloviate/SGD
 > bloviation
 > bloviator/SM
-14210d20020
+14210d20247
 < blueing's
-14356,14357c20166
+14356,14357c20393
 < bolt's
 < bolt/USGD
 ---
 > bolt/USGDM
-14434a20244
+14390a20427
+> boneyard
+14400a20438
+> bonobo/MS
+14434a20473
 > bookselling
-14455,14456c20265
+14455,14456c20494
 < boot's
 < boot/ASGD
 ---
 > boot/ASGDM
-14501,14502c20310
+14501,14502c20539
 < bosom's
 < bosom/US
 ---
 > bosom/USM
-14522a20331
+14522a20560
 > botnet/MS
-14785,14786c20594
+14608a20647
+> bpm
+14785,14786c20824
 < brief's
 < brief/CSDTGJ
 ---
 > brief/CSDTGJM
-14841c20649
+14841c20879
 < broadcast/AMGS
 ---
 > broadcast/AMGSD
-14956,14957c20764
+14956,14957c20994
 < buckle's
 < buckle/UDSG
 ---
 > buckle/UDSGM
-14986,14987c20793
+14966a21004
+> buckyball/SM
+14986,14987c21024
 < bug's
 < bug/CS
 ---
 > bug/CSM
-15039,15040c20845
+15001a21039
+> builtin
+15039,15040c21077
 < bullshitter's
 < bullshitter/S!
 ---
 > bullshitter/SM!
-15078,15079c20883
+15078,15079c21115
 < bunk's
 < bunk/CDGS
 ---
 > bunk/CDGSM
-15093,15094c20897
+15093,15094c21129
 < burden's
 < burden/USGD
 ---
 > burden/USGDM
-15211,15212c21014
+15135a21171
+> burqa/S
+15199a21236
+> buttercream
+15211,15212c21248
 < button's
 < button/USDG
 ---
 > button/USDGM
-15230d21031
+15224a21261
+> buzzkill/SM
+15230d21266
 < byelaw/SM
-15383d21183
+15286a21323
+> caddie/MDS
+15310a21348,21349
+> cagier
+> cagiest
+15383d21421
 < callisthenics/M
-15430,15431c21230
+15430,15431c21468
 < camp's
 < camp/CSTGD
 ---
 > camp/CSTGDM
-15460a21260,21262
+15460a21498,21500
 > cancelled/U
 > canceller/M
 > cancelling
-15518,15519c21320
+15518,15519c21558
 < cant's
 < cant/CZRDGS
 ---
 > cant/CZRDGSM
-15559a21361
+15559a21599
 > capita
-15609c21411
+15609c21649
 < caravanserai's
 ---
 > caravanserai/M
-15629,15630d21430
+15625a21666
+> carbs
+15629,15630d21669
 < carburetter/SM
 < carburettor/SM
-15701a21502
+15648a21688
+> cardio
+15701a21742
 > carnitas
-15788d21588
+15702a21744
+> carnivora
+15782a21825
+> cashback/M
+15788d21830
 < cashpoint/S
-15797d21596
+15797d21838
 < cassino/M
-15832a21632
+15832a21874
 > catalyses
-15940d21739
+15940d21981
 < caviare/M
-16013,16014c21812
+15992a22034
+> cellulitis
+16013,16014c22055
 < cent's
 < cent/AR
 ---
 > cent/ARM
-16098,16099c21896
+16058a22100
+> cerebrovascular
+16098,16099c22140
 < chain's
 < chain/UGDS
 ---
 > chain/UGDSM
-16200a21998
+16200a22242
 > charcuterie
-16231,16232c22029
+16231,16232c22273
 < charter's
 < charter/ASGD
 ---
 > charter/ASGDM
-16277c22074
+16252a22294
+> chateaux
+16277c22319
 < check/AGMDS
 ---
 > check/AGMDSU
-16327c22124
+16327c22369
 < chemistry/M
 ---
 > chemistry/MS
-16372c22169
+16372c22414
 < chickenshit/S!
 ---
 > chickenshit/SM!
-16404c22201
+16404c22446
 < children
 ---
 > children/M
-16488d22284
+16488d22529
 < chlorophyl/M
-16629,16630c22425
+16622a22664
+> ciabatta/SM
+16629,16630c22671
 < cider's
 < cider/S
 ---
 > cider/MS
-16651,16652c22446,22447
+16651,16652c22692,22693
 < cipher's
 < cipher/CGDS
 ---
 > cipher/CGDSM
 > ciphertext/S
-16702,16703c22497
+16702,16703c22743
 < cite's
 < cite/IAGSD
 ---
 > cite/IAGSDM
-16733,16735c22527
+16733,16735c22773
 < claim's
 < claim/CKEAGDS
 < claimable
 ---
 > claim/CKEAGDSMB
-16783,16784c22575
+16783,16784c22821
 < clasp's
 < clasp/UGDS
 ---
 > clasp/UGDSM
-16794,16796c22585
+16794,16796c22831
 < classified's
 < classified/U
 < classifieds
 ---
 > classified/MSU
-16918,16919c22707
+16862c22897
+< click/ZGMDRS
+---
+> click/BZGMDRS
+16911a22947
+> clit/SM
+16918,16919c22954
 < cloak's
 < cloak/USDG
 ---
 > cloak/USDGM
-16930,16931c22718
+16930,16931c22965
 < clog's
 < clog/US
 ---
 > clog/USM
-16944,16946c22731
+16944,16946c22978
 < close's
 < close/EIGTSD
 < closeable
 ---
-> close/EIGTSDMB
-17072d22856
+> close/EIGTSDMBR
+17072d23103
 < cocain/M
-17102,17103c22886
+17102,17103c23133
 < cocksucker's
 < cocksucker/S!
 ---
 > cocksucker/SM!
-17117,17118c22900
+17117,17118c23147
 < code's
 < code/CAGDS
 ---
 > code/CAGDSM
-17195,17196c22977
+17195,17196c23224
 < coil's/A
 < coil/UADGS
 ---
 > coil/UADGSM
-17245,17246c23026
+17245,17246c23273
 < collect's
 < collect/ASGVD
 ---
 > collect/ASGVDM
-17301a23082,23083
+17301a23329,23330
 > colonoscope/SM
 > colonoscopy/SM
-17304,17305c23086
+17304,17305c23333
 < color's
 < color/AEGDS
 ---
 > color/AEGDSM
-17311,17313c23092
+17311,17313c23339
 < colored's
 < colored/U
 < coloreds
 ---
 > colored/MSU
-17351,17352c23130
+17351,17352c23377
 < combine's
 < combine/ADSG
 ---
 > combine/ADSGM
-17371c23149
+17371c23396
 < comer's
 ---
 > comer/M
-17376,17377c23154
+17376,17377c23401
 < comfit's
 < comfit/ES
 ---
 > comfit/ESM
-17412c23189
+17412c23436
 < comment/GSMDR
 ---
 > comment/GSMDRZ
-17428,17429c23205
+17428,17429c23452
 < commission's
 < commission/ACGSD
 ---
 > commission/ACGSDM
-17442,17443c23218
+17442,17443c23465
 < commode's
 < commode/EIS
 ---
 > commode/EISM
-17447,17448c23222
+17447,17448c23469
 < common's
 < common/UPRYT
 ---
 > common/UPRYTM
-17537,17538c23311
+17537,17538c23558
 < compilation's
 < compilation/AS
 ---
 > compilation/ASM
-17597,17598c23370
+17597,17598c23617
 < compress's
 < compress/CGVDS
 ---
 > compress/CGVDSM
-17657,17658c23429
+17645a23665
+> concentric
+17657,17658c23677
 < concert's
 < concert/ESDG
 ---
 > concert/ESDGM
-17719,17720c23490
+17719,17720c23738
 < condition's
 < condition/AGSD
 ---
 > condition/AGSDM
-17755c23525
+17755c23773
 < confer/S
 ---
 > confer/SB
-17800a23571
+17797a23816
+> conform/ZB
+17800a23820
 > conformant
-17986,17987c23757
+17909a23930
+> consensual
+17986,17987c24007
 < construct's
 < construct/CADVGS
 ---
 > construct/CADVGSM
-17991,17992c23761
+17991,17992c24011
 < constructionist's
 < constructionist/CS
 ---
 > constructionist/CSM
-18122,18123c23891
+18122,18123c24141
 < control's
 < control/CS
 ---
 > control/CSM
-18151d23918
+18151d24168
 < convenor/S
-18169,18170c23936
+18169,18170c24186
 < convert's
 < convert/AGSD
 ---
 > convert/AGSDM
-18199,18200c23965
+18199,18200c24215
 < cook's
 < cook/ADGS
 ---
 > cook/ADGSM
-18206c23971
+18206c24221
 < cookie/M
 ---
 > cookie/SM
-18294,18295c24059
+18294,18295c24309
 < cork's
 < cork/UDGS
 ---
 > cork/UDGSM
-18375a24140,24141
+18375a24390,24391
 > corrigibility/IM
 > corrigible/I
-18389a24156
+18389a24406
 > corruptibly/I
-18467a24235
+18467a24485
 > could've
-18487,18488c24255
+18487,18488c24505
 < countenance's
 < countenance/EGDS
 ---
 > countenance/EGDSM
-18542,18543c24309
+18501a24519
+> counterfactual
+18542,18543c24560
 < coup's
 < coup/AS
 ---
 > coup/ASM
-18545,18546c24311
+18545,18546c24562
 < couple's
 < couple/CUDSG
 ---
 > couple/CUDSGM
-18559a24325
+18559a24576
 > court-martial/SGD
-18581,18582c24347
+18581,18582c24598
 < cover's
 < cover/AEUGDS
 ---
 > cover/AEUGDSM
-18585,18586c24350
+18585,18586c24601
 < covering's
 < coverings
 ---
 > covering/MS
-18739,18740c24503
+18739,18740c24754
 < creation's/K
 < creation/ASM
 ---
 > creation/ASMK
-18816a24580
+18816a24831
 > crimeware/M
-18880,18881c24644
+18880,18881c24895
 < cross's
 < cross/AUGTSD
 ---
 > cross/AUGTSDM
-18925a24689,24690
+18925a24940,24941
 > crowdfunded
 > crowdfunding
-18972,18973c24737
+18972,18973c24988
 < crust's
 < crust/ISDG
 ---
 > crust/ISDGM
-18988,18989c24752
+18988,18989c25003
 < crypt's
 < crypt/CS
 ---
 > crypt/CSM
-18999a24763
+18999a25014
 > cryptologist/MS
-19000a24765
+19000a25016
 > cryptosystem/S
-19035a24801
+19035a25052
 > cul-de-sac
-19104,19105c24870
+19104,19105c25121
 < cure's
 < cure/KZGBDRS
 ---
 > cure/KZGBDRSM
-19119,19120c24884
+19119,19120c25135
 < curl's
 < curl/UDGS
 ---
 > curl/UDGSM
-19131,19133c24895
+19131,19133c25146
 < current's
 < current/FAY
 < currents
 ---
 > current/FAYSM
-19142,19143c24904
+19142,19143c25155
 < cursive's
 < cursive/EAY
 ---
 > cursive/EAYM
-19167,19168c24928
+19167,19168c25179
 < cuss's
 < cuss/FEGSD
 ---
 > cuss/FEGSDM
-19246c25006
+19211a25223
+> cyberbully/S
+19215a25228
+> cybersex
+19246c25259
 < cysteine
 ---
 > cysteine/M
-19536a25297
+19261,19262c25274,25275
+< d'Arezzo
+< d'Estaing
+---
+> d'Arezzo/M
+> d'Estaing/M
+19391a25405
+> datatype
+19536a25551
 > decertify/DSGNX
-19759c25520
+19669a25685
+> defibrillation
+19759c25775
 < deliverable/U
 ---
 > deliverable/US
-19935a25697
+19846a25863
+> deniability
+19935a25953
 > dequeue/DSG
-19999a25762
+19999a26018
 > designated/U
-20196,20197c25959,25960
+20099c26118
+< dethrone/GL
+---
+> dethrone/DSGL
+20159a26179
+> dharma
+20196,20197c26216,26217
 < dialog/SM
 < dialogue/SM
 ---
 > dialog/SMGD
 > dialogue/SMRGD
-20220a25984
+20220a26241
 > diatomaceous
-20481a26246
+20226a26248
+> dices/I
+20481a26504
 > disclose/DSG
-20633a26399
+20536a26560
+> disguised/U
+20557a26582
+> disinterested/PY
+20603a26629
+> disposed/I
+20606a26633,26634
+> disproportional
+> disprove/B
+20633a26662
 > dissentious
-20695,20696c26461
+20659a26689
+> distemper/M
+20677a26708
+> distract/DG
+20695,20696c26726
 < district's
 < district/AS
 ---
 > district/ASM
-20768c26533
+20768,20769c26798,26799
 < djinn's
+< do/SJRHZG
 ---
 > djinn/M
-20830c26595
+> do/SJMRHZG
+20830c26860
 < dogie/M
 ---
 > dogie/SM
-20850,20851c26615
+20850,20851c26880
 < dole's
 < dole/FGDS
 ---
 > dole/FGDSM
-20895a26660
+20896c26925,26926
+< done/AU
+---
 > donator/MS
-20918,20919c26683
+> done/FAU
+20918,20919c26948
 < door's
 < door/IS
 ---
 > door/ISM
-20975,20976c26739
+20942a26972,26973
+> dopier
+> dopiest
+20968a27000
+> dotcom/SM
+20975,20976c27007
 < double's
 < double/ADSG
 ---
 > double/ADSGM
-21067,21068c26830
+21016a27048
+> downfield
+21059a27092
+> dpi
+21067,21068c27100
 < draft's
 < draft/ASDG
 ---
 > draft/ASDGM
-21282,21283c27044
+21282,21283c27314
 < duct's
 < duct/CIFDG
 ---
 > duct/CIFDGM
-21291,21292c27052
+21291,21292c27322
 < due's
 < due/IS
 ---
 > due/ISM
-21355,21356c27115
+21355,21356c27385
 < duplicate's
 < duplicate/AGNDS
 ---
 > duplicate/AGNDSM
-21367a27127
+21367a27397
 > durian/SM
-21468,21469c27228
+21438a27469
+> eMusic/M
+21446a27478
+> earbud/SM
+21468,21469c27500
 < earth's
 < earth/UDYG
 ---
 > earth/UDYGM
-21523,21524c27282
+21523,21524c27554
 < echo's
 < echo/ADG
 ---
 > echo/ADGM
-21587,21588c27345
+21565a27596
+> edamame
+21587,21588c27618
 < edit's
 < edit/ADGS
 ---
 > edit/ADGSM
-21735,21736c27492
+21612c27642
+< eerie
+---
+> eerie/RT
+21733a27764
+> eldercare/M
+21735,21736c27766
 < elect's
 < elect/ASDGV
 ---
 > elect/ASDGVM
-21820a27577
+21783a27814
+> electronica/M
+21820a27852
 > elicitor/MS
-21864,21865c27621
+21864,21865c27896
 < em's
 < em/S
 ---
 > em/SM
-21992,21993c27748
+21961a27993,27994
+> emo/SM
+> emoji
+21992,21993c28025
 < employ's
 < employ/ADGLS
 ---
 > employ/ADGLSM
-22071a27827
+22071a28104
 > encyclopaedia
-22196a27953
+22091a28125
+> endocarditis
+22130c28164
+< enforce/AGDS
+---
+> enforce/LZGDRS
+22196a28231
 > enqueue/DSG
-22508a28266,28267
+22432c28467
+< er
+---
+> er/C
+22508a28544,28545
 > eschatological
 > eschatologist/SM
-22556a28316
+22556a28594
 > estoppel
-22638c28398
+22638c28676
 < euthanize
 ---
 > euthanize/DSG
-22719a28480
+22719a28758
 > exabyte/MS
-22722,22724c28483,28486
+22722,22724c28761,28764
 < exact/SPDRYTG
 < exacting/Y
 < exaction/M
@@ -9807,52 +18248,60 @@
 > exacta/S
 > exacting/YP
 > exaction/MS
-22726a28489
+22726a28767
 > exactor/MS
-22947a28711
+22881a28923
+> exoplanet/MS
+22947a28990
 > experimentalism
-23165,23166c28929
+23165,23166c29208
 < face's
 < face/ACSDG
 ---
 > face/ACSDGM
-23207,23208d28969
+23207,23208d29248
 < faecal
 < faeces/M
-23215c28976
+23215c29255
 < faggoting's
 ---
 > faggot/SMG
-23238,23239c28999
+23238,23239c29278
 < faithful's
 < faithful/UPY
 ---
 > faithful/UPYM
-23278,23279c29038
+23278,23279c29317
 < fame's
 < fame/D
 ---
 > fame/DM
-23418a29178
+23293a29332
+> fanboy/SM
+23302a29342
+> fandom
+23360a29401
+> fashionista/MS
+23418a29460
 > faux
-23589,23590c29349
+23589,23590c29631
 < fetter's
 < fetter/USGD
 ---
 > fetter/USGDM
-23690,23691c29449
+23690,23691c29731
 < figure's
 < figure/FEGSD
 ---
 > figure/FEGSDM
-23699,23700c29457
+23699,23700c29739
 < file's/KC
 < file/CAKGDS
 ---
 > file/CAKGDSM
-23701a29459
+23701a29741
 > filesystem/MS
-23708,23711c29466,29467
+23708,23711c29748,29749
 < filing's
 < filings
 < fill's
@@ -9860,670 +18309,771 @@
 ---
 > filing/SM
 > fill/AIDGSM
-23715,23716c29471
+23715,23716c29753
 < filling's
 < filling/S
 ---
 > filling/SM
-23733,23734c29488
+23733,23734c29770
 < filtrate's
 < filtrate/IGNDS
 ---
 > filtrate/IGNDSM
-23745,23746c29499
+23745,23746c29781
 < finance's
 < finance/ADSG
 ---
 > finance/ADSGM
-23755,23756c29508
+23755,23756c29790
 < fine's/F
 < fine/CAFTGDS
 ---
 > fine/CAFTGDSM
-23776,23777c29528
+23776,23777c29810
 < finish's
 < finish/ADSG
 ---
 > finish/ADSGM
-24131,24132c29882
+24033a30067
+> flexion
+24057a30092,30094
+> flipflop/S
+> flipflopped
+> flipflopping
+24131,24132c30168
 < flower's
 < flower/CSDG
 ---
 > flower/CSDGM
-24155c29905
+24155c30191
 < fluidized
 ---
 > fluidize/DSG
-24185,24186c29935
+24185,24186c30221
 < flux's
 < flux/ADG
 ---
 > flux/ADGM
-24217,24218c29966,29967
+24217,24218c30252,30253
 < focus's
 < focus/ADSG
 ---
 > foci
 > focus/ADSGM
-24223,24224c29972
+24223,24224c30258
 < fog's
 < fog/CS
 ---
 > fog/CSM
-24238,24239c29986
+24238,24239c30272
 < fold's
 < fold/IAUSGD
 ---
 > fold/IAUSGDM
-24414,24415c30161
+24414,24415c30447
 < forest's
 < forest/ACGDS
 ---
 > forest/ACGDSM
-24464,24465c30210
+24464,24465c30496
 < form's
 < form/CAIFDGS
 ---
 > form/CAIFDGSM
-24585a30331,30332
+24585a30617,30618
 > frack/DRGS
 > fracker/S
-24609,24610c30356
+24609,24610c30642
 < franchise's
 < franchise/EDSG
 ---
 > franchise/EDSGM
-24633,24634c30379
+24633,24634c30665
 < fraud's
 < fraud/S
 ---
 > fraud/SM
-24639,24640c30384
+24639,24640c30670
 < fray's
 < fray/CDGS
 ---
 > fray/CDGSM
-24657a30402
+24657a30688
 > freegan/S
-24681,24682c30426
+24681,24682c30712
 < freeze's
 < freeze/UAGS
 ---
 > freeze/UAGSM
-24684c30428
+24684c30714
 < freezing's
 ---
 > freezing/M
-24733,24734c30477
+24728c30758
+< friend/SM
+---
+> friend/SMU
+24733,24734c30763
 < friendly's
 < friendly/UTPR
 ---
 > friendly/UTPRM
-24736d30478
+24736d30764
 < frier/M
-24752,24753c30494
+24752,24753c30780
 < fringe's
 < fringe/IDSG
 ---
 > fringe/IDSGM
-24771,24772c30512
+24771,24772c30798
 < frock's
 < frock/CUS
 ---
 > frock/CUSM
-24786,24787c30526
+24786,24787c30812
 < front's
 < front/FSDG
 ---
 > front/FSDGM
-24800,24801c30539
+24800,24801c30825
 < frost's
 < frost/CSDG
 ---
 > frost/CSDGM
-24855,24856c30593,30594
+24855,24856c30879,30880
 < fucker/M!
 < fuckhead/S!
 ---
 > fucker/SM!
 > fuckhead/SM!
-24860,24861c30598
+24860,24861c30884
 < fuel's
 < fuel/ADGS
 ---
 > fuel/ADGSM
-24941,24942c30678
+24941,24942c30964
 < furl's
 < furl/UDGS
 ---
 > furl/UDGSM
-24953d30688
+24953d30974
 < furore/MS
-24969,24970c30704
+24969,24970c30990
 < fuse's/A
 < fuse/CAIFGDS
 ---
 > fuse/CAIFGDSM
-25038,25039c30772
+25038,25039c31058
 < gain's
 < gain/ADGS
 ---
 > gain/ADGSM
-25051,25052c30784
+25051,25052c31070
 < gale's
 < gale/AS
 ---
 > gale/ASM
-25095a30828
+25095a31114
 > gamify/NGDS
-25125c30858
+25125c31144
 < gaolbird/S
 ---
 > gaolbirds
-25169,25170c30902
+25169,25170c31188
 < gas's
 < gas/CS
 ---
 > gas/CSM
-25180d30911
+25180d31197
 < gasolene/M
-25190a30922
+25190a31208
 > gastroenterologist/M
-25262c30994
+25262c31280
 < geezer/M
 ---
 > geezer/MS
-25297,25298c31029
+25297,25298c31315
 < generation's/C
 < generation/ASM
 ---
 > generation/ASMC
-25327c31058
+25327c31344
 < genomic
 ---
 > genomic/S
-25462a31194
+25353a31371
+> geocache/DSG
+25361a31380
+> geoengineering
+25462a31482
 > gigabit/MS
-25464a31197,31199
+25464a31485,31487
 > gigajoule/MS
 > gigapixel/MS
 > gigawatt/MS
-25560d31294
+25560c31583
 < glamourize/DSG
-25674c31408
+---
+> glamour/GMDS
+25674c31697
 < glycerine's
 ---
 > glycerine/M
-25816,25817c31550
+25816,25817c31839
 < gorge's
 < gorge/EDSG
 ---
 > gorge/EDSGM
-25884,25885c31617
+25884,25885c31906
 < grade's
 < grade/CADSG
 ---
 > grade/CADSGM
-25905c31637
+25905c31926
 < gram/MS
 ---
 > gram/KMS
-25909d31640
+25909d31929
 < gramme/SM
-26063c31794,31795
+26063c32083,32084
 < greybeard
 ---
 > grey/MDRTGSP
 > greybeard/SM
-26066c31798
+26066c32087
 < greyness
 ---
 > greyness/M
-26246,26247d31977
+26246,26247d32266
 < guerilla's
 < guerillas
-26403,26404c32133
+26403,26404c32422
 < habit's
 < habit/ISB
 ---
 > habit/ISBM
-26432,26436d32160
+26422a32441
+> hacktivist/S
+26432,26436d32450
 < haemoglobin's
 < haemophilia/M
 < haemorrhage/DSMG
 < haemorrhoid/S
 < haemorrhoids/M
-26555,26556c32279
+26555,26556c32569
 < hand's
 < hand/UDGS
 ---
 > hand/UDGSM
-26702,26703c32425
+26702,26703c32715
 < harness's
 < harness/UDSG
 ---
 > harness/UDSGM
-26725a32448
-> hashtag/S
-26888,26889c32611
+26725a32738
+> hashtag/SM
+26804a32818
+> hazmat
+26888,26889c32902
 < hearse's
 < hearse/AS
 ---
 > hearse/ASM
-26915,26916c32637
+26915,26916c32928
 < heat's
 < heat/ADGS
 ---
 > heat/ADGSM
-27167c32888
+27167c33179
 < hexane
 ---
 > hexane/SM
-27227a32949
+27227a33240
 > hijab/S
-27256,27257c32978
+27256,27257c33269
 < hinge's
 < hinge/UDSG
 ---
 > hinge/UDSGM
-27273a32995
+27273a33286
 > hippopotami
-27276,27277c32998
+27274a33288
+> hippy
+27276,27277c33290
 < hire's
 < hire/AGDS
 ---
 > hire/AGDSM
-27302,27303c33023
+27302,27303c33315
 < hitch's
 < hitch/UDSG
 ---
 > hitch/UDSGM
-27512,27513c33232
+27438a33451
+> homewrecker/SM
+27442a33456,33457
+> homier
+> homiest
+27506a33522
+> hoodie/MS
+27512,27513c33528
 < hook's
 < hook/UDSG
 ---
 > hook/UDSGM
-27575,27576c33294
+27575,27576c33590
 < horse's
 < horse/UDSG
 ---
 > horse/UDSGM
-27666,27667c33384
+27647a33662
+> hotkey/S
+27666,27667c33681
 < house's
 < house/ADSG
 ---
 > house/ADSGM
-27841c33558
+27801a33816
+> humoresque
+27841c33856
 < hurrah's
 ---
-> hurrah/M
-27875d33591
+> hurrah/MGDS
+27875d33889
 < hyaena/SM
-27883,27884c33599
+27883,27884c33897
 < hydrate's
 < hydrate/CGNDS
 ---
 > hydrate/CGNDSM
-28017c33732
+27911a33925
+> hydrolyses
+27956c33970
+< hyperlink/SM
+---
+> hyperlink/SMGD
+28017c34031,34032
 < iPod/M
 ---
+> iPad/MS
 > iPod/MS
-28029,28030c33744
+28029,28030c34044
 < ice's
 < ice/CDSG
 ---
 > ice/CDSGM
-28105a33820
+28105a34120
 > idolator/SM
-28227c33942
+28227c34242
 < immerse/XDSGN
 ---
 > immerse/XDSGNV
-28513c34228
+28513c34528
 < inbound
 ---
 > inbound/s
-28531,28532c34246,34247
+28531,28532c34546,34547
 < incentive's
 < incentive/ES
 ---
 > incentive/ESM
 > incentivize/SDG
-28560,28561c34275
+28560,28561c34575
 < incline's
 < incline/EGDS
 ---
 > incline/EGDSM
-28590,28591c34304
+28590,28591c34604
 < incorrigibility/M
 < incorrigible
 ---
 > incorrigibleness
-28593d34305
+28593d34605
 < incorruptibly
-28650a34363
+28597a34610,34611
+> incrementalism
+> incrementalist/SM
+28650a34665
 > indices
-28812d34524
+28812d34826
 < inflexion/SM
-28981,28982c34693
+28981,28982c34995
 < insert's
 < insert/AGSD
 ---
 > insert/AGSDM
-29204a34916
+29204a35218
 > intermediacy/S
-29206c34918,34920
+29206c35220,35222
 < intermediate/SMY
 ---
 > intermediate/SMYPGD
 > intermediation/SE
 > intermediator/SM
-29216a34931
+29216a35233
 > intern/GDL
-29266a34982
+29266a35284
 > interruptible/U
-29272a34989,34992
+29272a35291,35294
 > intersex
 > intersexual/MS
 > intersexualism
 > intersexuality
-29446c35166
+29312a35335
+> intracranial
+29446c35469
 < ironic
 ---
 > ironic/U
-29447a35168
+29447a35471
 > ironically/U
-29724c35445
+29478a35503
+> irreligion
+29724c35749
 < jewellery's
 ---
 > jewellery/M
-29733,29734c35454
+29733,29734c35758
 < jig's
 < jig/AS
 ---
 > jig/ASM
-29736,29737c35456
+29736,29737c35760
 < jigger's
 < jigger/ASDG
 ---
 > jigger/ASDGM
-29799,29800c35518
+29742a35766
+> jihadist/SM
+29799,29800c35823
 < join's
 < join/AFDSG
 ---
 > join/AFDSGM
-29803,29804c35521
+29803,29804c35826
 < joint's
 < joint/EGSD
 ---
 > joint/EGSDM
-29869,29870c35586,35587
+29869,29870c35891,35892
 < judge's
 < judge/ADSG
 ---
 > judge/ADSGM
 > judgement/MS
-30035a35753,35754
+29962a35985
+> kabbalah
+30031a36055
+> keybinding/S
+30035a36060,36061
 > keylogger/MS
 > keylogging/MS
-30066c35785
+30066c36092
 < kiddie/M
 ---
 > kiddie/SM
-30102,30103c35821
+30102,30103c36128
 < kind's
 < kind/UPRYT
 ---
 > kind/UPRYTM
-30262,30263c35980
+30174a36200
+> kleptocracy
+30262,30263c36288
 < kraut's
 < kraut/S!
 ---
 > kraut/MS!
-30283,30284c36000
+30283,30284c36308
 < label's
 < label/ASDG
 ---
 > label/ASDGM
-30302,30303c36018
+30302,30303c36326
 < lace's
 < lace/UGDS
 ---
 > lace/UGDSM
-30497,30498c36212
+30497,30498c36520
 < latch's
 < latch/UDSG
 ---
 > latch/UDSGM
-30637c36351
+30637c36659
 < learning's
 ---
 > learning/M
-30643,30644c36357
+30643,30644c36665
 < leash's
 < leash/UDSG
 ---
 > leash/UDSGM
-30665a36379
+30665a36687
 > lector/MS
-30700c36414
+30700c36722
 < legation's/AC
 ---
 > legation/ACM
-30927,30928c36641
+30927,30928c36949
 < light's/C
 < light/CASTGD
 ---
 > light/CASTGDM
-30938c36651
+30938c36959
 < lighting's
 ---
 > lighting/M
-30981,30982c36694
+30981,30982c37002
 < limit's
 < limit/CSZGDR
 ---
 > limit/CSZGDRM
-30986c36698
+30986c37006
 < limiter's
 ---
 > limiter/M
-30990a36703,36705
+30990a37011,37013
 > limnological
 > limnologist/MS
 > limnology/M
-31031c36746
+31031c37054
 < linguini's
 ---
 > linguini/M
-31034c36749
+31034c37057
 < linguistically
 ---
 > linguistical/Y
-31047,31048c36762
+31047,31048c37070
 < lint's
 < lint/CDSG
 ---
 > lint/CDSGM
-31058a36773
+31058a37081
 > lepidopterist/SM
-31151,31152c36866
+31151,31152c37174
 < liver's
 < liver/S
 ---
 > liver/MS
-31170,31171c36884
+31170,31171c37192
 < load's
 < load/AUGSD
 ---
 > load/AUGSDM
-31211,31212c36924
+31211,31212c37232
 < location's/A
 < location/ESM
 ---
 > location/ESMA
-31291,31292c37003
+31216a37237
+> locavore/SM
+31262a37284
+> login/S
+31267a37290,37291
+> logoff/S
+> logon/S
+31268a37293
+> logout/S
+31276a37302
+> lolcat
+31291,31292c37317
 < long's
 < long/KDSTG
 ---
 > long/KDSTGM
-31379,31380c37090
+31320a37346
+> lookup
+31323a37350
+> loonie/M
+31379,31380c37406
 < louse's
 < louse/CDSG
 ---
 > louse/CDSGM
-31639a37350
+31629a37656,37658
+> madrasa/S
+> madrassah
+> madrassahs
+31639a37669
 > mage/SM
-31741,31742c37452
+31686a37717
+> magus/M
+31741,31742c37772
 < make's/A
 < make/UAGS
 ---
 > make/UAGSM
-31806a37517
+31806a37837
 > malware/MS
-31822,31823c37533
+31822,31823c37853
 < man's/F
 < man/USY
 ---
 > man/USYMF
-31924,31925c37634
+31924,31925c37954
 < mantle's
 < mantle/EGDS
 ---
 > mantle/EGDSM
-31940,31941c37649
+31940,31941c37969
 < map's
 < map/AS
 ---
 > map/ASM
-32061,32062c37769
+32061,32062c38089
 < mask's
 < mask/UDSG
 ---
 > mask/UDSGM
-32084,32085c37791
+32084,32085c38111
 < master's
 < master/ADGS
 ---
 > master/ADGSM
-32230c37936
+32230c38256
 < meanie/M
 ---
 > meanie/MS
-32246,32247c37952
+32246,32247c38272
 < measure's
 < measure/ADSG
 ---
 > measure/ADSGM
-32317,32318c38022
+32315a38341
+> megachurch/MS
+32317,32318c38343
 < megadeath/M
 < megadeaths
 ---
 > megadeath/SM
-32320c38024
+32320c38345
 < megajoules
 ---
 > megajoule/SM
-32329c38033
+32329c38354
 < megapixel/S
 ---
 > megapixel/MS
-32361,32362c38065
+32332a38358
+> meh
+32361,32362c38387
 < melt's
 < melt/ADSG
 ---
 > melt/ADSGM
-32365,32366c38068
+32365,32366c38390
 < member's
 < member/EAS
 ---
 > member/EASM
-32386c38088
+32386c38410
 < men
 ---
 > men/M
-32708a38411
+32647a38672
+> microloan/MS
+32708a38734
 > might've
-32717a38421
+32717a38744
 > migrator/SM
-32760a38465
+32733a38761
+> milf/MS
+32761c38789,38790
+< millennial
+---
 > millennia
-32777d38481
+> millennial/MS
+32777d38805
 < millionnaire/M
-32806,32807c38510
+32806,32807c38834
 < mind's
 < mind/ADRSZG
 ---
 > mind/ADRSZGM
-32934a38638
+32934a38962
 > miscommunication/S
-32991a38696
+32991a39020
 > misjudgement/MS
-33027,33028c38732
+33027,33028c39056
 < miss's
 < miss/EDSGV
 ---
 > miss/EDSGVM
-33051,33052c38755
+33051,33052c39079
 < mist's
 < mist/CDRSZG
 ---
 > mist/CDRSZGM
-33056c38759
+33056c39083
 < mister's
 ---
 > mister/M
-33083c38786
+33083c39110
 < mitigation/M
 ---
 > mitigation/MS
-33107,33108c38810
+33107,33108c39134
 < mob's
 < mob/CS
 ---
 > mob/CSM
-33448,33449c39150
+33448,33449c39474
 < mortgage's
 < mortgage/AGDS
 ---
 > mortgage/AGDSM
-33471,33472c39172
+33471,33472c39496
 < mote's
 < mote/KCXSVN
 ---
 > mote/KCXSVNM
-33539,33540c39239
+33539,33540c39563
 < mounting's
 < mountings
 ---
 > mounting/MS
-33784a39484
+33630a39654
+> muggle/MS
+33654a39679
+> multi
+33679a39705
+> multiplayer/M
+33702a39729
+> multiverse/SM
+33784a39812
 > must've
-33887,33888c39587
+33831a39860
+> myocardium
+33887,33888c39916
 < name's
 < name/AGDS
 ---
 > name/AGDSM
-33963c39662
+33963c39991
 < native/MS
 ---
 > native/MSY
-33970,33971c39669
+33970,33971c39998
 < natural's
 < natural/UPY
 ---
 > natural/UPYM
-33979,33980c39677
+33979,33980c40006
 < nature's
 < nature/CS
 ---
 > nature/CSM
-34133,34134c39830
+34109a40136
+> neocon/S
+34133,34134c40160
 < nerve's
 < nerve/UDSG
 ---
 > nerve/UDSGM
-34169,34171c39865,39867
+34145a40172
+> netbook/MS
+34169,34171c40196,40198
 < neurone/S
 < neurophysiology
 < neuroscience
@@ -10531,898 +19081,1037 @@
 > neurophysiology/M
 > neuroscience/MS
 > neuroscientist/MS
-34175a39872
+34175a40203
 > neurosurgical
-34275c39972
+34258a40287
+> nigga/S
+34260a40290
+> niggaz
+34275c40305
 < nightie/M
 ---
 > nightie/SM
-34388,34389c40085
+34388,34389c40418
 < nomination's/A
 < nomination/CSM
 ---
 > nomination/CSMA
-34755,34756c40451
+34539a40569
+> nonissue
+34755,34756c40785
 < note's
 < note/FCSDG
 ---
 > note/FCSDGM
-34840,34841c40535
+34840,34841c40869
 < number's
 < number/ASDG
 ---
 > number/ASDGM
-35104a40799
+35104a41133
 > octopi
-35137,35138c40832
+35137,35138c41166
 < offensive's
 < offensive/IYP
 ---
 > offensive/IYPM
-35219d40912
+35219d41246
 < oleomargarin/M
-35226a40920
+35226a41254
 > oligo
-35345c41039
+35345c41373
 < oppose/DSG
 ---
 > oppose/DSGRB
-35452,35453c41146
+35401a41430
+> orc/S
+35452,35453c41481
 < orient's
 < orient/AEDGS
 ---
 > orient/AEDGSM
-35913c41606
+35913c41941
 < oversize/D
 ---
 > oversize
-36031,36032c41724
+35944a41973,41974
+> overthink/SG
+> overthought
+36031,36032c42061
 < pack's
 < pack/UADSG
 ---
 > pack/UADSGM
-36034,36035c41726
+36034,36035c42063
 < package's
 < package/AGDS
 ---
 > package/AGDSM
-36041c41732
+36041c42069
 < packing's
 ---
 > packing/M
-36056,36059d41746
+36056,36059d42083
 < paederast/S
 < paediatrician's
 < paediatricians
 < paediatrics/M
-36290a41978,41979
+36117a42142,42143
+> palazzi
+> palazzo
+36290a42317,42318
 > parallelization/SM
 > parallelize/SGD
-36291a41981
+36291a42320
 > paralyses
-36377a42068
+36324a42354
+> parasailing
+36377a42408
 > parkour
-36403d42093
+36403d42433
 < parrakeet/MS
-36418,36419c42108
+36418,36419c42448
 < part's
 < part/CDSG
 ---
 > part/CDSGM
-36445,36447c42134
+36445,36447c42474
 < partition's
 < partition/ADG
 < partitions
 ---
 > partition/ADGMS
-36449d42135
+36449d42475
 < partizan/SM
-36621,36622c42307
+36621,36622c42647
 < pay's
 < pay/ASGBL
 ---
 > pay/ASGBLM
-37093a42779
+37093a43119
 > petabyte/MS
-37102c42788
+37102c43128
 < petitioner/M
 ---
 > petitioner/MS
-37221a42908,42909
+37221a43248,43249
 > phlebotomist/SM
 > phlebotomize/SGD
-37228a42917
+37228a43257
 > pho
-37264a42954
+37264a43294
 > phosphorylate/DSGN
-37310,37311c43000
+37265a43296
+> photobomb/DGS
+37305a43337,43338
+> phototropic
+> phototropism
+37310,37311c43343
 < phrase's
 < phrase/AGDS
 ---
 > phrase/AGDSM
-37316d43004
+37316d43347
 < phrenetic
-37374c43062
+37358a43390
+> picante
+37374c43406
 < picky/TR
 ---
 > picky/TRP
-37469,37470c43157
+37469,37470c43501
 < pine's
 < pine/AGDS
 ---
 > pine/AGDSM
-37596,37597c43283
+37596,37597c43627
 < place's
 < place/EAGLDS
 ---
 > place/EAGLDSM
-37630a43317
+37630a43661
 > plaintext
-37636,37637c43323
+37636,37637c43667
 < plane's
 < plane/CGDS
 ---
 > plane/CGDSM
-37786,37787c43472
+37671a43702
+> plastique
+37689a43721
+> platys
+37786,37787c43818
 < ploy's
 < ploy/S
 ---
 > ploy/SM
-37792,37793c43477
+37792,37793c43823
 < plug's
 < plug/US
 ---
 > plug/USM
-37796a43481
+37796a43827
 > plugin/MS
-37987c43672
+37804a43836,43837
+> plummer
+> plummest
+37849c43882
+< podcast
+---
+> podcast/SM
+37953a43987
+> polyamory/S
+37987c44021
 < polypeptide/S
 ---
 > polypeptide/MS
-38106,38107c43791
+37991a44026
+> polys
+38106,38107c44141
 < port's
 < port/CAEGDS
 ---
 > port/CAEGDSM
-38134,38135c43818
+38134,38135c44168
 < pose's/A
 < pose/CAKEGDS
 ---
 > pose/CAKEGDSM
-38140,38141c43823
+38140,38141c44173
 < position's/KC
 < position/ACKES
 ---
 > position/ACKESM
-38260,38261c43942
+38170a44203
+> postcolonial
+38260,38261c44293
 < pound's
 < pound/KDSG
 ---
 > pound/KDSGM
-38266a43948
+38266a44299
 > poutine/S
-38291d43972
+38291d44323
 < practise's
-38451a44133
+38447a44480
+> prehistorian/S
+38450a44484
+> prehuman
+38451a44486
 > prejudgement/MS
-38568,38569c44250
+38484a44520
+> prenup/SM
+38568,38569c44604
 < press's
 < press/ACGSD
 ---
 > press/ACGSDM
-38638,38639c44319
+38638,38639c44673
 < price's
 < price/AGDS
 ---
 > price/AGDSM
-38756,38757c44436
+38756,38757c44790
 < process's
 < process/AGDS
 ---
 > process/AGDSM
-38780,38781c44459
+38780,38781c44813
 < produce's
 < produce/AZGDRS
 ---
 > produce/AZGDRSM
-38805a44484
+38805a44838
 > profiler/SM
-38835a44515
+38835a44869
 > programmatically
-38891a44572,44573
+38891a44926,44927
 > pronate/DSGN
 > pronator/MS
-38951c44633
+38951c44987
 < proprietorship/M
 ---
 > proprietorship/MS
-39039a44722
+39039a45076
 > provender/M
-39095a44779
+39095a45133
 > pseudorandom/Y
-39564a45249
+39380a45419
+> pwn/SGD
+39564a45604
 > quinoa
-39581,39582c45266
+39581,39582c45621
 < quire's
 < quire/IAS
 ---
 > quire/IASM
-39614,39615c45298
+39614,39615c45653
 < quote's
 < quote/UDSG
 ---
 > quote/UDSGM
-39653,39654c45336
+39653,39654c45691
 < racoon's
 < racoons
 ---
 > racoon/MS
-39738,39739c45420
+39738,39739c45775
 < rail's
 < rail/CGDS
 ---
 > rail/CGDSM
-39816,39817c45497
+39816,39817c45852
 < range's
 < range/CGDS
 ---
 > range/CGDSM
-39873a45554,45555
+39873a45909,45910
 > rasterization/M
 > rasterize/SGDR
-39925,39926c45607
+39925,39926c45962
 < ravel's
 < ravel/UDSG
 ---
 > ravel/UDSGM
-40036a45718
+40036a46073
 > recency
-40140a45823
+40140a46178
 > recurse/DGSV
-40141a45825
+40141a46180
 > recuse/DGS
-40204,40205c45888
+40204,40205c46243
 < reel's
 < reel/UGDS
 ---
 > reel/UGDSM
-40208a45892
+40208a46247
 > refactor/SMDG
-40244d45927
+40244d46282
 < reflexion/SM
-40659d46341
+40295a46334
+> regex/M
+40420a46460
+> relist/SGD
+40491a46532
+> reorg/DSG
+40659d46699
 < resizing
-40829c46511
+40829c46869
 < reverie/M
 ---
 > reverie/MS
-40895a46578,46580
+40895a46936,46938
 > rheumatological
 > rheumatology/M
 > rheumatologist/SM
-40944,40945c46629
+40900a46944
+> rhinovirus/MS
+40944,40945c46988
 < ride's
 < ride/CZGS
 ---
 > ride/CZGSM
-41104,41105c46788
+41104,41105c47147
 < robe's
 < robe/EGDS
 ---
 > robe/EGDSM
-41132,41133c46815
+41132,41133c47174
 < rogue's
 < rogue/KS
 ---
 > rogue/KSM
-41185a46868
+41185a47227
 > rootkit/MS
-41258,41259c46941
+41258,41259c47300
 < route's
 < route/ADSG
 ---
 > route/ADSGM
-41415a47098
+41330a47372
+> rugrat/SM
+41415a47458
 > sabre/MS
-41447,41448c47130
+41447,41448c47490
 < saddle's
 < saddle/UDSG
 ---
 > saddle/UDSGM
-41463,41464c47145
+41463,41464c47505
 < safe's
 < safe/UYTPR
 ---
 > safe/UYTPRM
-41544,41545c47225
+41544,41545c47585
 < salt's
 < salt/CTGDS
 ---
 > salt/CTGDSM
-41765,41766c47445
+41765,41766c47805
 < say's
 < say/USG
 ---
 > say/USGM
-41787,41788c47466
+41787,41788c47826
 < scale's
 < scale/ACSDG
 ---
 > scale/ACSDGM
-41806,41807c47484
+41801a47840
+> scammer/S
+41806,41807c47845
 < scan's
 < scan/AS
 ---
 > scan/ASM
-41880,41881c47557
+41861a47900
+> scattershot
+41880,41881c47919
 < schedule's
 < schedule/ADSG
 ---
 > schedule/ADSGM
-41914c47590
+41914c47952
 < schnaps's
 ---
 > schnaps/M
-41949c47625
+41949c47987
 < schrod's
 ---
 > schrod/SM
-41998a47675
+41998a48037
 > scot-free
-42016,42017c47693
+42016,42017c48055
 < scramble's
 < scramble/UGDS
 ---
 > scramble/UGDSM
-42055,42056c47731
+42055,42056c48093
 < screw's
 < screw/UDSG
 ---
 > screw/UDSGM
-42065,42066c47740
+42065,42066c48102
 < scribe's
 < scribe/IKCGSD
 ---
 > scribe/IKCGSDM
-42170,42171c47844
+42170,42171c48206
 < seal's
 < seal/AUSDG
 ---
 > seal/AUSDGM
-42204,42205c47877
+42204,42205c48239
 < seat's
 < seat/UGDS
 ---
 > seat/UGDSM
-42288,42289c47960
+42288,42289c48322
 < seed's
 < seed/AGDS
 ---
 > seed/AGDSM
-42359c48030,48031
+42359c48392,48393
 < self/M
 ---
 > self/MG
 > selfie/S
-42361a48034,48035
+42361a48396,48397
 > selfism
 > selfist/S
-42365,42367c48039,48040
+42365,42367c48401,48402
 < sell's
 < sell/AZGRS
 < seller's
 ---
 > sell/AZGRSM
 > seller/M
-42524c48197
+42524c48559
 < seraphim's
 ---
 > seraphim/M
-42558,42559c48231
+42558,42559c48593
 < serve's/AF
 < serve/FACGDS
 ---
 > serve/FACGDSM
-42574,42575c48246
+42574,42575c48608
 < serving's
 < servings
 ---
 > serving/MS
-42594,42595c48265
+42594,42595c48627
 < settle's
 < settle/AUGDS
 ---
 > settle/AUGDSM
-42647,42648c48317
+42622c48654
+< sewn
+---
+> sewn/A
+42635a48668
+> sexting
+42647,42648c48680
 < shackle's
 < shackle/UGDS
 ---
 > shackle/UGDSM
-42716,42717c48385
+42716,42717c48748
 < shape's
 < shape/AGDS
 ---
 > shape/AGDSM
-42851,42852c48519
+42791a48823,48824
+> sheikh/M
+> sheikhs
+42825a48859
+> shiitake/S
+42851,42852c48885
 < ship's
 < ship/ALS
 ---
 > ship/ALSM
-42883,42885c48550
+42883,42885c48916
 < shit's
 < shit/S!
 < shite/S!
 ---
 > shit/MS!
-42887,42888c48552,48553
+42887,42888c48918,48919
 < shithead/S!
 < shitload/!
 ---
 > shithead/MS!
 > shitload/MS!
-42891c48556
+42891c48922
 < shitty/RT!
 ---
 > shitty/TR!
-42976a48642
+42976a49008
 > should've
-43008c48674
+43008c49040
 < showtime
 ---
 > showtime/MS
-43090,43091c48756
+43076a49109,49110
+> sicced
+> siccing
+43090,43091c49124
 < side's
 < side/AGDS
 ---
 > side/AGDSM
-43143,43144c48808
+43143,43144c49176
 < sign's
 < sign/AFCGDS
 ---
 > sign/AFCGDSM
-43163,43164c48827
+43163,43164c49195
 < signing's/C
 < signings
 ---
 > signing/MCS
-43328c48991
+43203a49235
+> sim/S
+43328c49360
 < size/MGBDRS
 ---
 > size/AMGBDRS
-43368,43369c49031
+43368,43369c49400
 < skill's
 < skill/CSD
 ---
 > skill/CSDM
-43724,43726c49386
+43634a49666
+> slumdog/SM
+43669a49702
+> smartwatch/MS
+43724,43726c49757
 < smoulder's
 < smouldered
 < smoulders
 ---
 > smoulder/GSMD
-43752,43753c49412
+43752,43753c49783
 < snap's
 < snap/US
 ---
 > snap/USM
-43767,43768c49426,49428
+43767,43768c49797,49799
 < snarl's
 < snarl/USDG
 ---
 > snarkily
 > snarky/TR
 > snarl/USDGM
-44012,44013c49672
+44012,44013c50043
 < solute's
 < solute/XN
 ---
 > solute/XNM
-44015c49674
+44015c50045
 < solution's/EA
 ---
 > solution/EAM
-44021c49680
+44021c50051
 < solver's
 ---
 > solver/M
-44041a49701
+44041a50072
 > sommelier/SM
-44062c49722
+44062c50093
 < sonofabitch
 ---
 > sonofabitch/!
-44177,44178c49837
+44133a50165
+> soulmate/S
+44142a50175
+> soundscape/S
+44177,44178c50210
 < sow's
 < sow/ASGD
 ---
 > sow/ASGDM
-44346a50006
+44346a50379
 > spelled
-44348a50009
+44348a50382
 > spelt
-44371a50033
+44371a50406
 > spick/S!
-44383c50045
+44383c50418
 < spik/S
 ---
 > spik/S!
-44413,44414c50075
+44413,44414c50448
 < spire's
 < spire/IFAS
 ---
 > spire/IFASM
-44416,44417c50077
+44416,44417c50450
 < spirit's
 < spirit/ISGD
 ---
 > spirit/ISGDM
-44475,44476c50135
+44475,44476c50508
 < spoil's
 < spoil/CSDRZG
 ---
 > spoil/CSDRZGM
-44549,44550c50208
+44549,44550c50581
 < spray's
 < spray/ASDG
 ---
 > spray/ASDGM
-44688,44689c50346
+44668a50700
+> sriracha
+44688,44689c50720
 < staff's
 < staff/ASDG
 ---
 > staff/ASDGM
-44729,44730c50386
+44729,44730c50760
 < stall's
 < stall/SDG
 ---
 > stall/SDGM
-44871a50528
+44772a50803
+> starburst/S
+44799a50831
+> startup/MS
+44871a50904
 > steampunk
-44985,44986c50642
+44985,44986c51018
 < still's
 < still/ITGSD
 ---
 > still/ITGSDM
-45024,45025c50680
+45024,45025c51056
 < stitch's
 < stitch/ADSG
 ---
 > stitch/ADSGM
-45030,45031c50685
+45030,45031c51061
 < stock's
 < stock/AGSD
 ---
 > stock/AGSDM
-45090,45091c50744
+45073c51103
+< stone/DSMG
+---
+> stone/DRSMZG
+45075a51106
+> stoner/M
+45090,45091c51121
 < stop's
 < stop/US
 ---
 > stop/USM
-45105,45106c50758
+45105,45106c51135
 < store's
 < store/ADSG
 ---
 > store/ADSGM
-45148,45149c50800
+45148,45149c51177
 < strain's
 < strain/FADSG
 ---
 > strain/FADSGM
-45164,45165c50815
+45164,45165c51192
 < strap's
 < strap/US
 ---
 > strap/USM
-45290,45291c50940
+45290,45291c51317
 < structure's
 < structure/AGDS
 ---
 > structure/AGDSM
-45330,45331c50979
+45330,45331c51356
 < study's
 < study/AGDS
 ---
 > study/AGDSM
-45368,45369c51016
+45368,45369c51393
 < style's
 < style/ADSG
 ---
 > style/ADSGM
-45455,45456c51102
+45455,45456c51479
 < submission's
 < submission/AS
 ---
 > submission/ASM
-45872,45873c51518
+45474a51498
+> subprime
+45872,45873c51896
 < surface's
 < surface/AGDS
 ---
 > surface/AGDSM
-45918,45919c51563
+45918,45919c51941
 < survey's
 < survey/ADGS
 ---
 > survey/ADGSM
-46106a51751
+46106a52129
 > syllabi
-46160c51805
+46153c52176
+< syn
+---
+> syn/H
+46160c52183
 < synch/GMD
 ---
 > synch/GMDS
-46167d51811
+46167d52189
 < synchs
-46178a51823,51825
+46178a52201,52203
 > synesthesia
 > synesthete/S
 > synesthetic
-46203,46204c51850,51851
+46188a52214
+> synovial
+46197a52224
+> synths
+46203,46204c52230,52231
 < sysadmin/S
 < sysop/S
 ---
 > sysadmin/MS
 > sysop/MS
-46363,46364c52010
+46363,46364c52390
 < tangle's
 < tangle/UDSG
 ---
 > tangle/UDSGM
-46632a52279,52280
+46436a52463
+> taser/GMDS
+46519a52547
+> tealight/MS
+46632a52661,52662
 > teleport/SGD
 > teleportation
-46675,46676c52323
+46675,46676c52705
 < template's
 < template/S
 ---
 > template/SM
-46752a52400
+46752a52782
 > terabit/MS
-46753a52402,52403
+46753a52784,52785
 > terahertz/M
 > terapixel/MS
-46756a52407
+46756a52789
 > teriyaki
-46806,46807c52457
+46806,46807c52839
 < test's/AFK
 < test/AKFCDGS
 ---
 > test/AKFCDGSM
-46817a52468
+46817a52850
 > testcase/MS
-46831a52483
+46831a52865
 > testsuite/MS
-46845a52498
+46844c52878
+< text/FMS
+---
+> text/FMSDG
+46845a52880
 > textbox/SM
-46925a52579
+46925a52961
 > theremin/MS
-46999c52653
+46999c53035
 < thinking's
 ---
 > thinking/M
-47095,47096c52749
+47095,47096c53131
 < throne's
 < throne/CDS
 ---
 > throne/CDSM
-47188,47189c52841
+47188,47189c53223
 < tie's
 < tie/AUSD
 ---
 > tie/AUSDM
-47213,47214c52865
+47213,47214c53247
 < till's
 < till/EDRZGS
 ---
 > till/EDRZGSM
-47303,47304c52954
+47303,47304c53336
 < tire's
 < tire/AGDS
 ---
 > tire/AGDSM
-47433,47434c53083
+47433,47434c53465
 < tone's
 < tone/IZGDRS
 ---
 > tone/IZGDRSM
-47453,47455c53102,53103
+47453,47455c53484,53485
 < tool's
 < tool/ADGS
 < toolbar
 ---
 > tool/ADGSM
 > toolbar/MS
-47540,47541c53188
+47540,47541c53570
 < tort's
 < tort/FEAS
 ---
 > tort/FEASM
-47644a53292
+47644a53674
 > traceur/SM
-47657,47658c53305
+47657,47658c53687
 < tract's
 < tract/CEKFAS
 ---
 > tract/CEKFASM
-47755a53403
+47755a53785
 > transfect/DSMG
-47774a53423,53424
+47774a53805,53806
 > transgenderism
 > transgene/MS
-47807,47808c53457
+47807,47808c53839
 < transmission's
 < transmission/AS
 ---
 > transmission/ASM
-47928,47929c53577
+47928,47929c53959
 < trench's
 < trench/AIGSD
 ---
 > trench/AIGSDM
-47951c53599
+47951c53981
 < triage/M
 ---
 > triage/MGS
-47976,47977c53624
+47976,47977c54006
 < tribute's
 < tribute/FS
 ---
 > tribute/FSM
-47997a53645
+47997a54027
 > trifecta/S
-48165,48166c53813
+48165,48166c54195
 < trust's/E
 < trust/IESGD
 ---
 > trust/IESGDM
-48180,48181c53827
+48178a54208
+> truthiness
+48180,48181c54210
 < try's
 < try/AGDS
 ---
 > try/AGDSM
-48271a53918
+48271a54301
 > turducken
-48334a53982
+48334a54365
 > tweep/S
-48371,48372c54019
+48345a54377
+> twerk/SDG
+48371,48372c54403
 < twist's
 < twist/USDG
 ---
 > twist/USDGM
-48396,48397c54043
+48393a54425
+> tympanic
+48396,48397c54428
 < type's
 < type/AGDS
 ---
 > type/AGDSM
-48869a54516
+48784a54816
+> unfriend/GD
+48869a54902
 > unlikeable
-49163,49164c54810
+49163,49164c55196
 < usual's
 < usual/UY
 ---
 > usual/UYM
-49211c54857
+49211c55243
 < vagina/M
 ---
 > vagina/MS
-49249,49250c54895
+49249,49250c55281
 < value's
 < value/CAGSD
 ---
 > value/CAGSDM
-49292,49293c54937
+49275a55307
+> vape/GDS
+49292,49293c55324
 < variant's
 < variant/IS
 ---
 > variant/ISM
-49356,49357c55000
+49356,49357c55387
 < veil's
 < veil/UDGS
 ---
 > veil/UDGSM
-49368,49369c55011
+49368,49369c55398
 < velour's
 < velours's
 ---
 > velour/MS
-49398,49399c55040
+49398,49399c55427
 < vent's
 < vent/DGS
 ---
 > vent/DGSM
-49435,49436c55076
+49435,49436c55463
 < verge's
 < verge/FDSG
 ---
 > verge/FDSGM
-49478a55119
+49478a55506
 > vertices
-49488,49489c55129
+49488,49489c55516
 < vest's
 < vest/ILDGS
 ---
 > vest/ILDGSM
-49681,49682c55321
+49681,49682c55708
 < visit's
 < visit/ASGD
 ---
 > visit/ASGDM
-49772a55412,55414
+49760a55787
+> voicemail/M
+49772a55800,55802
 > volcanological
 > volcanologist/MS
 > volcanology/M
-49807,49808c55449
+49807,49808c55837
 < vote's
 < vote/CGVDS
 ---
 > vote/CGVDSM
-50148a55790
+49840a55870
+> vuvuzela/MS
+49844a55875
+> wack/RTS
+50148a56180
 > weaponize/DSG
-50215,50216c55857
+50181a56214,56215
+> webinar/SM
+> webisode/MS
+50215,50216c56249
 < weigh's
 < weigh/AGD
 ---
 > weigh/AGDM
-50260,50261d55900
+50260,50261d56292
 < werwolf/M
 < werwolves
-50555,50556c56194
+50555,50556c56586
 < wind's
 < wind/UASG
 ---
 > wind/UASGM
-50626,50627c56264
+50602a56633
+> wingnut/SM
+50626,50627c56657
 < wire's
 < wire/AGDS
 ---
 > wire/AGDSM
-50728c56365
+50728c56758
 < women
 ---
 > women/M
-50794,50796c56431,56432
+50794,50796c56824,56825
 < wop/S!
 < word's
 < word/AJDSG
 ---
 > wop/MS!
 > word/AJDSGM
-50801c56437
+50801c56830
 < wording's
 ---
 > wording/M
-50808,50809c56444
+50808,50809c56837
 < work's
 < work/ADJSG
 ---
 > work/ADJSGM
-50824c56459
+50824c56852
 < working's
 ---
 > working/M
-50884,50885c56519
+50884,50885c56912
 < worthy's
 < worthy/UPRT
 ---
 > worthy/UPRTM
-50903,50904c56537
+50903,50904c56930
 < wrap's
 < wrap/US
 ---
 > wrap/USM
-50945c56578
+50945c56971
 < writing's
 ---
 > writing/M
-51118,51119c56751
+51118,51119c57144
 < yoke's
 < yoke/UGDS
 ---
 > yoke/UGDSM
-51212,51213c56844
+51212,51213c57237
 < zip's
 < zip/US
 ---
 > zip/USM
-51228,51229c56859
+51222a57247
+> zlotys
+51228,51229c57253
 < zone's
 < zone/AGDS
 ---
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/spellcheck/locales/en-US/hunspell/en-US.dic thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/spellcheck/locales/en-US/hunspell/en-US.dic
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/spellcheck/locales/en-US/hunspell/en-US.dic	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/spellcheck/locales/en-US/hunspell/en-US.dic	2015-02-28 15:03:12.000000000 +0000
@@ -1,4 +1,4 @@
-57246
+57640
 0/nm
 0th/pt
 1/n1
@@ -27,11 +27,11 @@
 AAA
 AB/M
 ABA
-ABC/M
+ABC/SM
 ABM/SM
 ABS
 AC/M
-ACLU
+ACLU/M
 ACT
 ACTH/M
 AD/M
@@ -41,7 +41,7 @@
 AF
 AFAIK/S
 AFB
-AFC
+AFC/M
 AFDC
 AFN
 AFT
@@ -52,10 +52,11 @@
 AL
 AM/M
 AMA
+AMD/M
 ANSI/S
-ANZUS
+ANZUS/M
 AOL/M
-AP
+AP/M
 APB
 API/MS
 APO
@@ -71,7 +72,7 @@
 ATPase/M
 ATV
 AV
-AWACS
+AWACS/M
 AWOL/M
 AZ/M
 AZT/M
@@ -79,13 +80,13 @@
 Aaliyah/M
 Aaren/M
 Aarika/M
-Aaron
+Aaron/M
 Ab/M
 Abagael/M
 Abagail/M
 Abba/S
 Abbas/M
-Abbasid
+Abbasid/M
 Abbe/M
 Abbey/M
 Abbi/M
@@ -99,7 +100,7 @@
 Abe/M
 AbeBooks
 Abel/M
-Abelard
+Abelard/M
 Abelson/M
 Aberdeen/M
 Abernathy/M
@@ -108,9 +109,9 @@
 Abidjan/M
 Abie/M
 Abigael/M
-Abigail
+Abigail/M
 Abigale/M
-Abilene
+Abilene/M
 Abner/M
 Aborigine/MS
 Abra/M
@@ -120,7 +121,7 @@
 Abramo/M
 Abran/M
 Absalom
-Abuja
+Abuja/M
 Abyssinia/M
 Abyssinian/M
 Ac/M
@@ -131,17 +132,17 @@
 Acevedo/M
 Achaean/M
 Achebe/M
-Achernar
+Achernar/M
 Acheson/M
 Achilles/M
 Aconcagua/M
 Acosta/M
 Acropolis
 Acrux/M
-Actaeon
+Actaeon/M
 ActiveX/M
-Acton
-Acts
+Acton/M
+Acts/M
 Acuff/M
 Acura/MS
 Ad/MN
@@ -151,18 +152,19 @@
 Adaline/M
 Adam/SM
 Adamo/M
+Adams/M
 Adan/M
-Adana
+Adana/M
 Adar/M
 Adara/M
 AddThis/M
 Adda/M
-Addams
+Addams/M
 Adderley/M
 Addi/M
 Addia/M
 Addie/M
-Addison
+Addison/M
 Addy/M
 Ade/M
 Adel/M
@@ -180,7 +182,7 @@
 Adelle/M
 Aden/M
 Adena/M
-Adenauer
+Adenauer/M
 Adey/M
 Adham/M
 Adhara/M
@@ -192,7 +194,7 @@
 Adirondacks/M
 Adkins/M
 Adlai/M
-Adler
+Adler/M
 Adm
 Admiralty
 Ado/M
@@ -210,7 +212,7 @@
 Adrea/M
 Adrenalin/MS
 Adria/MX
-Adrian
+Adrian/M
 Adriana/M
 Adriane/M
 Adrianna/M
@@ -236,6 +238,7 @@
 Aesculapius/M
 Aesop/M
 Afghan/SM
+Afghani/M
 Afghanistan/M
 Afr
 Africa/M
@@ -244,7 +247,7 @@
 Afrikaner/SM
 Afro/SM
 Afrocentric
-Afrocentrism
+Afrocentrism/M
 Afton/M
 Ag/M
 Agace/M
@@ -256,13 +259,13 @@
 Agatha/M
 Agathe/M
 Aggi/M
-Aggie
+Aggie/M
 Aggy/M
 Agilent
-Aglaia
+Aglaia/M
 Agna/M
 Agnella/M
-Agnes
+Agnes/M
 Agnese/M
 Agnesse/M
 Agneta/M
@@ -270,9 +273,9 @@
 Agni/M
 Agnola/M
 Agosto/M
-Agra
+Agra/M
 Agretha/M
-Agricola
+Agricola/M
 Agrippa/M
 Agrippina/M
 Aguascalientes
@@ -286,14 +289,14 @@
 Ahab/M
 Aharon/M
 Ahmad/M
-Ahmadabad
+Ahmadabad/M
 Ahmadinejad/M
 Ahmed/M
 Ahriman/M
 Aida/M
 Aidan/M
 Aigneis/M
-Aiken
+Aiken/M
 Aila/M
 Ailbert/M
 Aile/M
@@ -312,18 +315,18 @@
 Ainslee/M
 Ainsley/M
 Ainslie/M
-Ainu
+Ainu/M
 Airedale/MS
-Aisha
+Aisha/M
 Ajax/M
 Ajay/M
-Akbar
+Akbar/M
 Akhmatova/M
-Akihito
+Akihito/M
 Akim/M
-Akita
+Akita/M
 Akiva/M
-Akkad
+Akkad/M
 Akron/M
 Aksel/M
 Al/M
@@ -348,7 +351,7 @@
 Alanson/M
 Alar/M
 Alard/M
-Alaric
+Alaric/M
 Alasdair/M
 Alaska/M
 Alaskan/MS
@@ -356,38 +359,38 @@
 Alasteir/M
 Alaster/M
 Alayne/M
-Alba
+Alba/M
 Albania/M
 Albanian/MS
 Albany/M
-Albee
+Albee/M
 Alberik/M
 Alberio/M
-Albert
+Albert/M
 Alberta/M
 Albertan
 Albertina/M
 Albertine/M
 Alberto/M
 Albie/M
-Albigensian
+Albigensian/M
 Albina/M
-Albion
+Albion/M
 Albireo/M
 Albrecht/M
 Albuquerque/M
-Alcatraz
-Alcestis
-Alcibiades
+Alcatraz/M
+Alcestis/M
+Alcibiades/M
 Alcindor/M
 Alcmena/M
 Alcoa/M
-Alcott
-Alcuin
-Alcyone
-Aldan
+Alcott/M
+Alcuin/M
+Alcyone/M
+Aldan/M
 Aldebaran/M
-Alden
+Alden/M
 Alderamin/M
 Aldin/M
 Aldis/M
@@ -425,7 +428,7 @@
 Alexa/M
 Alexander/MS
 Alexandr/M
-Alexandra
+Alexandra/M
 Alexandre/M
 Alexandria/M
 Alexandrian
@@ -437,6 +440,7 @@
 Alexina/M
 Alexine/M
 Alexio/M
+Alexis/M
 Alf/M
 Alfi/M
 Alfie/M
@@ -445,12 +449,12 @@
 Alfonso/M
 Alfonzo/M
 Alford/M
-Alfred
+Alfred/M
 Alfreda/M
-Alfredo
+Alfredo/M
 Alfy/M
 Algenib/M
-Alger
+Alger/M
 Algeria/M
 Algerian/SM
 Algernon/M
@@ -459,9 +463,9 @@
 Algol/M
 Algonquian/SM
 Algonquin/MS
-Alhambra
+Alhambra/M
 Alhena/M
-Ali/S
+Ali/SM
 Alia/M
 Alibaba
 Alic/M
@@ -492,18 +496,18 @@
 Alkaid/M
 Alla/M
 Allah/M
-Allahabad
+Allahabad/M
 Allan/M
 Allard/M
 Allayne/M
 Alleen/M
 Alleghenies/M
-Allegheny/S
+Allegheny/SM
 Allegra/M
-Allen
+Allen/M
 Allende/M
 Allene/M
-Allentown
+Allentown/M
 Alley/M
 Alleyn/M
 Allhallows/M
@@ -547,7 +551,7 @@
 Alpheratz/M
 Alphonse/M
 Alphonso/M
-Alpine
+Alpine/M
 Alpo/M
 Alps/M
 Alric/M
@@ -555,11 +559,11 @@
 Alsatian/SM
 Alsop/M
 Alston/M
-Alta
+Alta/M
 Altai/M
 Altaic/M
-Altair
-Altamira
+Altair/M
+Altamira/M
 Althea/M
 Altiplano/M
 Altman/M
@@ -568,7 +572,7 @@
 Aludra/M
 Aluin/M
 Aluino/M
-Alva
+Alva/M
 Alvan/M
 Alvarado/M
 Alvarez/M
@@ -613,11 +617,11 @@
 Amandy/M
 Amara/M
 Amargo/M
-Amarillo
+Amarillo/M
 Amaru/M
 Amata/M
 Amaterasu/M
-Amati
+Amati/M
 Amazon/SM
 Amazonian
 Amber/MY
@@ -638,7 +642,7 @@
 Amelita/M
 Amen/M
 Amenhotep/M
-Amerasian
+Amerasian/M
 America/SM
 American/MS
 Americana/M
@@ -651,7 +655,7 @@
 Amery/M
 Ameslan/M
 Amharic/M
-Amherst
+Amherst/M
 Ami/M
 Amie/M
 Amiga/M
@@ -664,13 +668,13 @@
 Amman/M
 Amoco/M
 Amory/M
-Amos
+Amos/M
 Amparo/M
 Ampere/M
-Amritsar
+Amritsar/M
 Amsterdam/M
-Amtrak
-Amundsen
+Amtrak/M
+Amundsen/M
 Amur/M
 Amway/M
 Amy/M
@@ -682,16 +686,16 @@
 Anabella/M
 Anabelle/M
 Anacin/M
-Anacreon
-Anaheim
+Anacreon/M
+Anaheim/M
 Analects/M
 Analiese/M
 Analise/M
 Anallese/M
 Anallise/M
 Ananias/M
-Anasazi
-Anastasia
+Anasazi/M
+Anastasia/M
 Anastasie/M
 Anastassia/M
 Anatol/M
@@ -700,19 +704,19 @@
 Anatolia/M
 Anatolian/M
 Anatollo/M
-Anaxagoras
+Anaxagoras/M
 Ancell/M
 Anchorage/M
 Andalusia/M
-Andalusian
-Andaman
-Andean
+Andalusian/M
+Andaman/M
+Andean/M
 Andee/M
 Andeee/M
 Anderea/M
 Anders/N
 Andersen/M
-Anderson
+Anderson/M
 Andes/M
 Andi/M
 Andie/M
@@ -733,10 +737,11 @@
 Andriana/M
 Andrianampoinimerina/M
 Andriette/M
-Andris
-Andromache
+Andris/M
+Android/M
+Andromache/M
 Andromeda/M
-Andropov
+Andropov/M
 Andros
 Andrus/M
 Andy/M
@@ -745,15 +750,15 @@
 Anett/M
 Anetta/M
 Anette/M
-Angara
+Angara/M
 Ange/M
 Angel/M
 Angela/M
 Angele/M
 Angeli/M
 Angelia/M
-Angelica
-Angelico
+Angelica/M
+Angelico/M
 Angelika/M
 Angelina/M
 Angeline/M
@@ -761,26 +766,26 @@
 Angelita/M
 Angelle/M
 Angelo/M
-Angelou
+Angelou/M
 Angevin/M
 Angie/M
 Angil/M
-Angkor
+Angkor/M
 Angle/MS
-Anglia
+Anglia/M
 Anglican/SM
 Anglicanism/MS
 Anglicism/MS
 Anglicization
 Anglicize/DSG
-Anglo
-Anglophil
-Anglophile
+Anglo/M
+Anglophil/M
+Anglophile/M
 Anglophobe
 Angola/M
 Angolan/MS
 Angora/SM
-Angstrom
+Angstrom/M
 Anguilla/M
 Angus/M
 Angy/M
@@ -795,7 +800,7 @@
 Anjela/M
 Ankara/M
 Ann/M
-Anna
+Anna/M
 Annabal/M
 Annabel/M
 Annabela/M
@@ -812,7 +817,7 @@
 Annamarie/M
 Annapolis/M
 Annapurna/M
-Anne
+Anne/M
 Annecorinne/M
 Anneliese/M
 Annelise/M
@@ -829,17 +834,17 @@
 Annora/M
 Annunciation/MS
 Anny/M
-Anouilh
+Anouilh/M
 Ansel/M
 Ansell/M
-Anselm
+Anselm/M
 Anselma/M
 Anselmo/M
 Anshan/M
 Ansley/M
 Anson/M
 Anstice/M
-Antaeus
+Antaeus/M
 Antananarivo/M
 Antarctic/M
 Antarctica/M
@@ -848,20 +853,21 @@
 Anthea/M
 Anthia/M
 Anthiathia/M
-Anthony
+Anthony/M
+Anthropocene
 Antichrist/MS
-Antietam
+Antietam/M
 Antigone/M
 Antigua/M
-Antillean
+Antillean/M
 Antilles/M
 Antin/M
-Antioch
+Antioch/M
 Antipas/M
 Antipodes
 Antofagasta/M
 Antoine/M
-Antoinette
+Antoinette/M
 Anton/MS
 Antone/M
 Antonella/M
@@ -873,41 +879,42 @@
 Antonin/M
 Antonina/M
 Antonino/M
-Antoninus
+Antoninus/M
 Antonio/M
-Antonius
+Antonius/M
 Antony/M
 Antwan/M
 Antwerp/M
 Anubis/M
 Any/M
 Anya/M
-Anzac
+Anzac/M
 Apache/SM
 Apalachicola/M
-Apennines
+Apatosaurus/M
+Apennines/M
 Aphrodite/M
-Apia
+Apia/M
 Apocalypse/M
 Apocrypha/M
-Apollinaire
+Apollinaire/M
 Apollo/SM
-Apollonian
+Apollonian/M
 Appalachia/M
 Appalachian/S
 Appaloosa/SM
 Apple/M
-Appleseed
-Appleton
+Appleseed/M
+Appleton/M
 Appolonia/M
-Appomattox
+Appomattox/M
 Apr/M
 April/MS
 Aprilette/M
-Apuleius
+Apuleius/M
 Aquafresh/M
 Aquarius/MS
-Aquila
+Aquila/M
 Aquinas/M
 Aquino/M
 Aquitaine/M
@@ -924,7 +931,7 @@
 Arabic/M
 Arabidopsis
 Arabist/MS
-Araby
+Araby/M
 Araceli/M
 Arafat/M
 Araguaya/M
@@ -944,12 +951,12 @@
 Arch/R
 Archaimbaud/M
 Archambault/M
-Archean
+Archean/M
 Archibald/M
 Archibaldo/M
 Archibold/M
 Archie/M
-Archimedes
+Archimedes/M
 Archy/M
 Arctic/M
 Arcturus/M
@@ -962,7 +969,7 @@
 Ardelis/M
 Ardella/M
 Ardelle/M
-Arden
+Arden/M
 Ardene/M
 Ardenia/M
 Ardine/M
@@ -974,16 +981,17 @@
 Ardys
 Ardyth/M
 Arel/M
-Arequipa
-Ares
+Arequipa/M
+Ares/M
 Aretha/M
 Argentina/M
 Argentine
 Argentinean
 Argentinian/MS
-Argo/S
+Argo/SM
 Argonaut/MS
 Argonne/M
+Argos/M
 Argus/M
 Ari/M
 Ariadne/M
@@ -992,30 +1000,30 @@
 Arianism/M
 Aridatha/M
 Arie/SM
-Ariel
+Ariel/M
 Ariela/M
 Ariella/M
 Arielle/M
 Aries/MS
 Arin/M
 Ario/M
-Ariosto
+Ariosto/M
 Aristarchus/M
-Aristides
+Aristides/M
 Aristophanes/M
 Aristotelian/M
 Aristotle/M
 Arius/M
-Ariz
+Ariz/M
 Arizona/M
 Arizonan/SM
 Arizonian/MS
-Arjuna
-Ark
+Arjuna/M
+Ark/M
 Arkansan/MS
 Arkansas/M
-Arkhangelsk
-Arkwright
+Arkhangelsk/M
+Arkwright/M
 Arlan/M
 Arlana/M
 Arlee/M
@@ -1033,7 +1041,7 @@
 Arlina/M
 Arlinda/M
 Arline/M
-Arlington
+Arlington/M
 Arluene/M
 Arly/M
 Arlyn/M
@@ -1052,32 +1060,32 @@
 Armour/M
 Armstrong/M
 Arnaldo/M
-Arne
+Arne/M
 Arneb/M
 Arney/M
-Arnhem
+Arnhem/M
 Arni/M
 Arnie/M
 Arno/M
-Arnold
+Arnold/M
 Arnoldo/M
 Arnuad/M
 Arnulfo/M
 Arny/M
 Aron/M
-Arrhenius
+Arrhenius/M
 Arri/M
 Arron/M
 Art/M
 Artair/M
 Artaxerxes/M
 Arte/M
-Artemas
+Artemas/M
 Artemis/M
 Artemus/M
 Arther/M
 Arthur/M
-Arthurian
+Arthurian/M
 Artie/M
 Artur/M
 Arturo/M
@@ -1090,17 +1098,18 @@
 Arvy/M
 Aryan/MS
 Aryn/M
+As/M
 Asa/M
 Asama/M
 Ascella/M
 Ascension/M
 Ase/M
-Asgard
+Asgard/M
 Ash/MRY
-Ashanti
+Ashanti/M
 Ashbey/M
 Ashby/M
-Ashcroft
+Ashcroft/M
 Ashe/Y
 Ashely/M
 Ashgabat
@@ -1108,7 +1117,7 @@
 Ashien/M
 Ashikaga/M
 Ashil/M
-Ashkenazim
+Ashkenazim/M
 Ashkhabad/M
 Ashla/M
 Ashlan/M
@@ -1121,43 +1130,45 @@
 Ashlin/M
 Ashly/M
 Ashmolean/M
-Ashton
-Ashurbanipal
+Ashton/M
+Ashurbanipal/M
 Asia/M
+Asiago
 Asian/MS
 Asiatic/SM
-Asimov
-Asmara
-Asoka
+Asimov/M
+Asmara/M
+Asoka/M
 Aspell/M
 Aspen/M
+Asperger/M
 Aspidiske/M
-Asquith
+Asquith/M
 Assad/M
 Assam/M
 Assamese/M
 Assembly
-Assisi
+Assisi/M
 Assyria/M
 Assyrian/SM
-Astaire
+Astaire/M
 Astana/M
 Astarte/M
-Aston
-Astor
-Astoria
+Aston/M
+Astor/M
+Astoria/M
 Astra/M
-Astrakhan
+Astrakhan/M
 Astrid/M
 Astrix/M
-AstroTurf
-Asturias
+AstroTurf/M
+Asturias/M
 Asuncion/M
 Aswan/M
 At/SM
 Atacama/M
-Atahualpa
-Atalanta
+Atahualpa/M
+Atalanta/M
 Atari/M
 Ataturk/M
 Athabasca/M
@@ -1170,22 +1181,22 @@
 Athens/M
 Athlon/MS
 Atkins/M
-Atkinson
+Atkinson/M
 Atlanta/M
 Atlante/SM
 Atlantic/M
 Atlantis/M
 Atlas/MS
-Atman
-Atreus
+Atman/M
+Atreus/M
 Atria/M
 Atropos/M
 Attic/M
 Attica/M
 Attila/M
-Attlee
+Attlee/M
 Attn
-Attucks
+Attucks/M
 Atwood/M
 Au/M
 Aube
@@ -1195,10 +1206,10 @@
 Aubine/M
 Aubree/M
 Aubrette/M
-Aubrey
+Aubrey/M
 Aubrie/M
 Aubry/M
-Auckland
+Auckland/M
 Auden/M
 Audi/M
 Audie/M
@@ -1209,15 +1220,15 @@
 Audrie/M
 Audry/M
 Audrye/M
-Audubon
+Audubon/M
 Audy/M
 Aug/M
-Augean
+Augean/M
 Augie/M
-Augsburg
+Augsburg/M
 August/MS
 Augusta/M
-Augustan
+Augustan/M
 Auguste/M
 Augustin/M
 Augustina/M
@@ -1228,14 +1239,14 @@
 Augy/M
 Aundrea/M
 Aura/M
-Aurangzeb
+Aurangzeb/M
 Aurea/M
 Aurel/M
 Aurelea/M
 Aurelia/M
 Aurelie/M
 Aurelio/M
-Aurelius
+Aurelius/M
 Aureomycin/M
 Auria/M
 Aurie/M
@@ -1246,18 +1257,18 @@
 Aurora/M
 Aurore/M
 Aurthur/M
-Auschwitz
+Auschwitz/M
 Aussie/MS
-Austen
+Austen/M
 Austerlitz/M
 Austin/MS
 Austina/M
 Austine/M
 Australasia/M
-Australasian
+Australasian/M
 Australia/M
 Australian/MS
-Australoid
+Australoid/M
 Australopithecus/M
 Austria/M
 Austrian/SM
@@ -1265,56 +1276,56 @@
 Autumn/M
 Av/M
 Ava/M
-Avalon
-Ave
+Avalon/M
+Ave/M
 Aveline/M
-Aventine
+Aventine/M
 Averell/M
 Averil/M
 Averill/M
-Avernus
-Averroes
+Avernus/M
+Averroes/M
 Avery/M
 Averyl/M
 Avesta/M
-Avicenna
+Avicenna/M
 Avictor/M
 Avie/M
 Avigdor/M
-Avignon
+Avignon/M
 Avila/M
 Avior/M
-Avis
+Avis/M
 Aviva/M
 Avivah/M
-Avogadro
-Avon
+Avogadro/M
+Avon/M
 Avram/M
 Avril/M
 Avrit/M
 Avrom/M
 Ax/M
 Axe/M
-Axel
-Axis
-Axum
+Axel/M
+Axis/M
+Axum/M
 Ayala/M
-Ayers
+Ayers/M
 Aylmar/M
 Aylmer/M
-Aymara
+Aymara/M
 Aymer/M
 Ayn/M
 Ayrshire/M
-Ayurveda
+Ayurveda/M
 Ayyubid/M
 Azana/M
 Azania/M
-Azazel
+Azazel/M
 Azerbaijan/M
 Azerbaijani/MS
 Azores/M
-Azov
+Azov/M
 Aztec/SM
 Aztecan/M
 Aztlan/M
@@ -1322,12 +1333,13 @@
 BA/M
 BASIC/SM
 BB/M
-BBB
-BBC
+BBB/M
+BBC/M
 BBQ
 BBS
 BBSes
 BC/M
+BFF
 BIA
 BIOS
 BITNET/S
@@ -1335,27 +1347,27 @@
 BM/M
 BMW/M
 BO
-BP
+BP/M
 BPOE
 BR
 BS/M
 BSA
-BSD/S
+BSD/SM
 BTU
 BTW
 BYOB
 Ba/M
 Baal/SM
 Baath/M
-Baathist
+Baathist/M
 Bab/SM
 Babar/M
 Babara/M
 Babb/M
-Babbage
+Babbage/M
 Babbette/M
 Babbie/M
-Babbitt
+Babbitt/M
 Babel/MS
 Babette/M
 Babita/M
@@ -1364,62 +1376,62 @@
 Babylonia/M
 Babylonian/SM
 Bacall/M
-Bacardi
+Bacardi/M
 Bacchanalia/M
 Bacchic
 Bacchus/M
 Bach/M
 Backus/M
 Bacon/M
-Bactria
-Baden
+Bactria/M
+Baden/M
 Badlands/M
 Baedeker/MS
-Baez
+Baez/M
 Baffin/M
-Baggies
+Baggies/M
 Baghdad/M
-Baguio
-Baha'i
-Baha'ullah
+Baguio/M
+Baha'i/M
+Baha'ullah/M
 Bahama/SM
 Bahamanian
 Bahamas/M
 Bahamian/MS
-Bahia
+Bahia/M
 Bahrain/M
-Baikal
+Baikal/M
 Bail/M
 Bailey/M
 Bailie/M
 Baillie/M
 Baily/M
-Baird
+Baird/M
 Bakelite/M
-Baker
-Bakersfield
+Baker/M
+Bakersfield/M
 Baku/M
-Bakunin
-Balanchine
-Balaton
-Balboa
+Bakunin/M
+Balanchine/M
+Balaton/M
+Balboa/M
 Bald/MR
 Balder/M
 Balduin/M
 Baldwin/SM
 Bale/M
 Balearic/M
-Balfour
+Balfour/M
 Bali/M
 Balinese/M
-Balkan/S
-Balkhash
-Ball
+Balkan/SM
+Balkhash/M
+Ball/M
 Ballard/M
-Balthazar
+Balthazar/M
 Baltic/M
 Baltimore/M
-Baluchistan
+Baluchistan/M
 Balzac/M
 Bamako/M
 Bambi/M
@@ -1430,25 +1442,25 @@
 Bancorp
 Bancroft/M
 Bandung/M
-Bangalore
+Bangalore/M
 Bangkok/M
 Bangladesh/M
 Bangladeshi/MS
-Bangor
+Bangor/M
 Bangui/M
 Banjarmasin/M
-Banjul
+Banjul/M
 Bank/SM
 Banky/M
 Banneker/M
-Bannister
-Banting
+Bannister/M
+Banting/M
 Bantu/MS
 Baotou/M
 Baptist/SM
 Baptiste/M
 Bar/H
-Barabbas
+Barabbas/M
 Barack/M
 Barb/MR
 Barbabas/M
@@ -1462,11 +1474,11 @@
 Barbary/M
 Barbe/M
 Barbee/M
-Barber
+Barber/M
 Barbette/M
 Barbey/M
 Barbi/M
-Barbie
+Barbie/M
 Barbour/M
 Barbra/M
 Barbuda/M
@@ -1482,66 +1494,66 @@
 Barkley/M
 Barlow/M
 Barn/M
-Barnabas
+Barnabas/M
 Barnabe/M
 Barnaby/M
-Barnard
-Barnaul
+Barnard/M
+Barnaul/M
 Barnebas/M
-Barnes
+Barnes/M
 Barnett/M
 Barney/M
 Barnie/M
-Barnum
+Barnum/M
 Barny/M
-Baroda
+Baroda/M
 Baron/M
 Baroque
-Barquisimeto
+Barquisimeto/M
 Barr/M
-Barranquilla
+Barranquilla/M
 Barrera/M
 Barret/M
 Barrett/M
 Barri/MS
 Barrie/M
 Barron/M
-Barry
-Barrymore
-Bart
+Barry/M
+Barrymore/M
+Bart/M
 Bartel/M
-Barth/S
+Barth/SM
 Barthel/M
 Bartholdi/M
 Bartholemy/M
 Bartholomeo/M
 Bartholomeus/M
-Bartholomew
+Bartholomew/M
 Bartie/M
 Bartlet/M
-Bartlett
-Bartok
+Bartlett/M
+Bartok/M
 Bartolemo/M
 Bartolomeo/M
-Barton
+Barton/M
 Bartram/M
 Barty/M
-Baruch
+Baruch/M
 Bary/M
 Baryram/M
-Baryshnikov
+Baryshnikov/M
 Base/M
 Basel/M
 Basho/M
 Basia/M
-Basic
-Basie
-Basil
+Basic/M
+Basie/M
+Basil/M
 Basile/M
 Basilio/M
 Basilius/M
 Basque/MS
-Basra
+Basra/M
 Bass/M
 Basseterre/M
 Bastian/M
@@ -1550,10 +1562,10 @@
 Basutoland/M
 Bat/M
 Bataan/M
-Bates
+Bates/M
 Batholomew/M
-Bathsheba
-Batista
+Bathsheba/M
+Batista/M
 Batman/M
 Batsheva/M
 Battle/M
@@ -1561,9 +1573,9 @@
 Baudelaire/M
 Baudoin/M
 Baudouin/M
-Bauer
+Bauer/M
 Bauhaus/M
-Baum
+Baum/M
 Bavaria/M
 Bavarian
 Bax
@@ -1574,24 +1586,24 @@
 Bayamon
 Bayard
 Bayer/M
-Bayes
-Bayesian
+Bayes/M
+Bayesian/M
 Bayeux/M
 Baylor/M
 Bayonne/M
-Bayreuth
+Bayreuth/M
 Baywatch/M
 Be/MH
 Bea/M
 Beach/M
-Beadle
+Beadle/M
 Beale/M
 Bealle/M
 Bean/M
 Bear/M
 Beard/M
 Beardmore/M
-Beardsley
+Beardsley/M
 Bearnaise/M
 Bearnard/M
 Beasley/M
@@ -1602,12 +1614,12 @@
 Beatrix/M
 Beatriz/M
 Beau/M
-Beaufort
+Beaufort/M
 Beaujolais/M
 Beaumarchais
-Beaumont
+Beaumont/M
 Beauregard/M
-Beauvoir
+Beauvoir/M
 Bebe/M
 Becca/M
 Bechtel/M
@@ -1620,21 +1632,21 @@
 Becki/M
 Beckie/M
 Becky/M
-Becquerel
-Bede
+Becquerel/M
+Bede/M
 Bedouin/SM
 Bee/M
 Beebe/M
-Beecher
+Beecher/M
 Beefaroni/M
 Beelzebub/M
-Beerbohm
+Beerbohm/M
 Beethoven/M
 Beeton/M
-Begin
-Behan
-Behring
-Beiderbecke
+Begin/M
+Behan/M
+Behring/M
+Beiderbecke/M
 Beijing/M
 Beilul/M
 Beirut/M
@@ -1647,7 +1659,7 @@
 Belau/M
 Belem/M
 Belfast/M
-Belg
+Belg/M
 Belgian/SM
 Belgium/M
 Belgrade/M
@@ -1663,17 +1675,17 @@
 Bellanca/M
 Bellatrix/M
 Belle/M
-Belleek
+Belleek/M
 Bellevue/M
 Bellina/M
-Bellini
-Bellow
+Bellini/M
+Bellow/M
 Belmont/M
-Belmopan
+Belmopan/M
 Belorussia/M
 Belorussian/MS
 Belshazzar/M
-Beltane
+Beltane/M
 Beltran/M
 Belushi/M
 Belva/M
@@ -1697,7 +1709,7 @@
 Benedikt/M
 Benedikta/M
 Benelux/M
-Benet
+Benet/M
 Benetta/M
 Benetton/M
 Bengal/SM
@@ -1710,12 +1722,12 @@
 Benita/M
 Benito/M
 Benjamen/M
-Benjamin
+Benjamin/M
 Benji/M
 Benjie/M
 Benjy/M
 Benn/M
-Bennett
+Bennett/M
 Benni/M
 Bennie/M
 Benny/M
@@ -1723,28 +1735,28 @@
 Benoite/M
 Benson/M
 Bent/M
-Bentham
+Bentham/M
 Bentlee/M
-Bentley
-Benton
+Bentley/M
+Benton/M
 Benyamin/M
-Benz
+Benz/M
 Benzedrine/M
-Beowulf
+Beowulf/M
 Ber/MG
 Berber/SM
 Berenice/M
 Beret
 Beretta/M
-Berg/NR
+Berg/MNR
 Bergen/M
 Berger/M
-Bergerac
+Bergerac/M
 Berget/M
-Bergman
-Bergson
-Beria
-Bering
+Bergman/M
+Bergson/M
+Beria/M
+Bering/M
 Berk/MY
 Berke/M
 Berkeley/M
@@ -1756,7 +1768,7 @@
 Berle/M
 Berlin/SZMR
 Berliner/M
-Berlioz
+Berlioz/M
 Berlitz/M
 Bermuda/SM
 Bermudan/SM
@@ -1764,11 +1776,11 @@
 Bern/M
 Berna/M
 Bernadene/M
-Bernadette
+Bernadette/M
 Bernadina/M
 Bernadine/M
 Bernanke/M
-Bernard
+Bernard/M
 Bernardina/M
 Bernardine
 Bernardo/M
@@ -1781,19 +1793,19 @@
 Bernetta/M
 Bernette/M
 Bernhard/M
-Bernhardt
+Bernhardt/M
 Berni/M
 Bernice/M
 Bernie/M
-Bernini
+Bernini/M
 Bernita/M
-Bernoulli
-Bernstein
+Bernoulli/M
+Bernstein/M
 Berny/M
 Berra/M
 Berri/M
 Berrie/M
-Berry
+Berry/M
 Bert/M
 Berta/M
 Berte/M
@@ -1812,24 +1824,24 @@
 Berty/M
 Beryl/M
 Beryle/M
-Berzelius
+Berzelius/M
 Bespin/M
-Bess
-Bessel
+Bess/M
+Bessel/M
 Bessemer/M
-Bessie
+Bessie/M
 Bessy/M
 Best/M
 Betelgeuse/M
 Beth/M
 Bethanne/M
-Bethany
-Bethe
+Bethany/M
+Bethe/M
 Bethena/M
-Bethesda
+Bethesda/M
 Bethina/M
 Bethlehem
-Bethune
+Bethune/M
 Betsey/M
 Betsy/M
 Betta/M
@@ -1842,7 +1854,7 @@
 Bettine/M
 Betty/M
 Bettye/M
-Beulah
+Beulah/M
 Bevan
 Beverie/M
 Beverlee/M
@@ -1852,13 +1864,13 @@
 Bevin
 Bevon/M
 Bevvy/M
-Beyer
-Bhopal
+Beyer/M
+Bhopal/M
 Bhutan/M
 Bhutanese/M
 Bhutto/M
 Bi/M
-Bialystok
+Bialystok/M
 Bianca/M
 Bianka/M
 Bib
@@ -1872,16 +1884,16 @@
 Biblical
 Bic/M
 Biddie/M
-Biddle
+Biddle/M
 Biddy/M
 Biden/M
 Bidget/M
-Bierce
+Bierce/M
 Bigfoot/M
 Biggles/M
 Biko/M
 Bil/MY
-Bilbao
+Bilbao/M
 Bilbo/M
 Bili/M
 Bill/MJ
@@ -1898,26 +1910,27 @@
 Binny/M
 Bioko/M
 Birch/M
-Bird
+Bird/M
 Birdie/M
 Birdseye/M
 Birgit/M
 Birgitta/M
 Birk/M
-Birkenstock
+Birkenstock/M
 Birmingham/M
 Biro/M
 Biron/M
-Biscay
+Biscay/M
 Biscayne/M
-Bishkek
+Bishkek/M
 Bishop/M
 Bismarck/M
 Bismark/M
 Bisquick/M
 Bissau/M
+BitTorrent/M
 BizRate/M
-Bizet
+Bizet/M
 Bjerknes/M
 Bjork/M
 Bjorn/M
@@ -1926,16 +1939,16 @@
 BlackBerry/M
 Blackbeard/M
 Blackburn/M
-Blackfeet
+Blackfeet/M
 Blackfoot/M
 Blackpool/M
 Blackshirt/M
-Blackstone
-Blackwell
+Blackstone/M
+Blackwell/M
 Blaine/M
 Blair/M
 Blaire/M
-Blake
+Blake/M
 Blakelee/M
 Blakeley/M
 Blanca/M
@@ -1947,7 +1960,7 @@
 Blankenship/M
 Blantyre/M
 Blatz/M
-Blavatsky
+Blavatsky/M
 Blayne/M
 Blenheim/M
 Blevins/M
@@ -1959,7 +1972,7 @@
 Bliss
 Blisse/M
 Blithe/M
-Bloch
+Bloch/M
 Blockbuster/M
 Bloemfontein/M
 Bloglines/M
@@ -1970,9 +1983,11 @@
 Blondy/M
 Bloom/MR
 Bloomberg/M
-Bloomfield
+Bloomer/M
+Bloomfield/M
 Bloomingdale/M
-Bloomsbury
+Bloomsbury/M
+Blu
 Blucher/M
 Bluebeard/M
 Bluetooth/M
@@ -1994,20 +2009,20 @@
 Bobina/M
 Bobine/M
 Bobinette/M
-Boccaccio
+Boccaccio/M
 Bodhidharma/M
 Bodhisattva/M
 Boeing/M
 Boeotia/M
-Boeotian
+Boeotian/M
 Boer/SM
-Boethius
+Boethius/M
 Bogart/M
 Bogey/M
 Bogota/M
-Bohemia
+Bohemia/M
 Bohemian/SM
-Bohr
+Bohr/M
 Boigie/M
 Boise/M
 Bojangles/M
@@ -2018,21 +2033,21 @@
 Bollywood/M
 Bologna/M
 Bolshevik/SM
-Bolshevism
-Bolshevist
+Bolshevism/M
+Bolshevist/M
 Bolshoi/M
-Bolton
-Boltzmann
+Bolton/M
+Boltzmann/M
 Bombay/M
-Bonaparte
-Bonaventure
+Bonaparte/M
+Bonaventure/M
 Bond/M
 Bondie/M
 Bondon/M
 Bondy/M
 Bone/M
 Bonhoeffer/M
-Boniface
+Boniface/M
 Bonita/M
 Bonn/MR
 Bonnee/M
@@ -2041,19 +2056,19 @@
 Bonni/M
 Bonnibelle/M
 Bonnie/M
-Bonny
+Bonny/M
 Bono/M
 Bonsai/M
 Booker/M
 Boole/M
-Boolean
+Boolean/M
 Boone/M
 Boonie/M
 Boony/M
 Boot/M
 Boote/MS
 Bootes/M
-Booth
+Booth/M
 Boothe/M
 Bord/MN
 Bordeaux/M
@@ -2063,70 +2078,71 @@
 Bordy/M
 Boreas/M
 Borg/SM
-Borges
-Borgia
-Borglum
-Boris
+Borges/M
+Borgia/M
+Borglum/M
+Boris/M
 Bork/M
 Borlaug/M
-Born
+Born/M
 Borneo/M
 Borobudur/M
-Borodin
+Borodin/M
 Boru/M
-Bosch
-Bose
+Bosch/M
+Bose/M
 Bosnia/M
-Bosnian
+Bosnian/M
 Bosporus/M
 Boston/MS
-Bostonian
-Boswell
+Bostonian/M
+Boswell/M
+Botox
 Botswana/M
-Botticelli
-Boudicca
-Boulder
+Botticelli/M
+Boudicca/M
+Boulder/M
 Boulez/M
 Bourbaki/M
 Bourbon/SM
 Bourke/M
-Bournemouth
+Bournemouth/M
 Bovary/M
 Bowditch/M
 Bowell/M
 Bowen/M
-Bowers
+Bowers/M
 Bowery/M
-Bowie
+Bowie/M
 Bowman/M
 Boy/MR
 Boyce/M
 Boycey/M
 Boycie/M
-Boyd
+Boyd/M
 Boyer/M
-Boyle
+Boyle/M
 Br/MNT
 Brad/MY
 Bradan/M
-Bradbury
+Bradbury/M
 Braddock/M
 Brade/M
 Braden/M
-Bradford
-Bradley
+Bradford/M
+Bradley/M
 Bradly/M
 Bradney/M
 Bradshaw/M
 Bradstreet/M
-Brady
+Brady/M
 Bragg/M
-Brahe
+Brahe/M
 Brahma/MS
 Brahmagupta/M
 Brahman/MS
-Brahmanee
-Brahmani
+Brahmanee/M
+Brahmani/M
 Brahmanism/SM
 Brahmaputra/M
 Brahmin/MS
@@ -2142,26 +2158,26 @@
 Brandais/M
 Brande/M
 Brandea/M
-Brandeis
+Brandeis/M
 Branden/M
-Brandenburg
+Brandenburg/M
 Brander/M
 Brandi/M
 Brandice/M
 Brandie/M
 Brandise/M
-Brando
+Brando/M
 Brandon/M
-Brandt
+Brandt/M
 Brandtr/M
 Brandy/M
 Brandyn/M
 Brannon/M
 Brant/M
 Brantley/M
-Braque
+Braque/M
 Brasilia/M
-Bratislava
+Bratislava/M
 Brattain/M
 Bray/M
 Brazil/M
@@ -2172,11 +2188,11 @@
 Breanne/M
 Brear/M
 Breathalyzer
-Brecht
+Brecht/M
 Breckenridge/M
 Bree/M
 Breena/M
-Bremen
+Bremen/M
 Bren/M
 Brena/M
 Brenda/M
@@ -2192,14 +2208,15 @@
 Brenner/M
 Brent/M
 Brenton/M
+Brest/M
 Bret/M
 Breton/M
 Brett/M
 Breughel
 Brew/MR
 Brewer/M
-Brewster
-Brezhnev
+Brewster/M
+Brezhnev/M
 Bria/M
 Brian/M
 Briana/M
@@ -2212,29 +2229,29 @@
 Bride/M
 Bridgeport/M
 Bridger/M
-Bridges
+Bridges/M
 Bridget/M
-Bridgetown
+Bridgetown/M
 Bridgett/M
 Bridgette/M
-Bridgman
+Bridgman/M
 Bridie/M
 Brie/RSM
 Brien/M
 Brier/M
 Brietta/M
-Brig
-Brigadoon
+Brig/M
+Brigadoon/M
 Brigg/MS
 Brigham/M
-Bright
+Bright/M
 Brighton/M
 Brigid/M
 Brigida/M
 Brigit/M
 Brigitta/M
 Brigitte/M
-Brillo
+Brillo/M
 Brina/M
 Briney/M
 Brinkley/M
@@ -2247,8 +2264,8 @@
 Brit/SM
 Brita/M
 Britain/M
-Britannia
-Britannic
+Britannia/M
+Britannic/M
 Britannica/M
 Briticism/SM
 British/MRZ
@@ -2263,16 +2280,17 @@
 Brittani/M
 Brittany/SM
 Britte/M
+Britten/M
 Britteny/M
 Brittne/M
 Brittney/M
 Brittni/M
 Brnaba/M
 Brnaby/M
-Brno
+Brno/M
 Broadway/SM
 Brobdingnag/M
-Brobdingnagian
+Brobdingnagian/M
 Brock/M
 Brockie/M
 Brocky/M
@@ -2289,40 +2307,43 @@
 Bronnie/M
 Bronny/M
 Bronson/M
-Bronte
+Bronte/M
+Brontosaurus
 Bronx/M
 Brook/MS
-Brooke
+Brooke/M
 Brooklyn/M
+Brooks/M
 Bros
 Brose/M
-Brown/G
-Browne
+Brown/MG
+Browne/M
 Brownian/M
 Brownie/S
-Brownshirt
-Brownsville
-Brubeck
+Browning/M
+Brownshirt/M
+Brownsville/M
+Brubeck/M
 Bruce/M
 Brucie/M
-Bruckner
-Bruegel
-Brueghel
+Bruckner/M
+Bruegel/M
+Brueghel/M
 Bruis/M
 Brummel/M
 Brunei/M
 Bruneian/MS
-Brunelleschi
+Brunelleschi/M
 Brunhilda/M
 Brunhilde/M
-Bruno
+Bruno/M
 Brunswick/M
 Brussels/M
 Brut/M
 Brutus/M
-Bryan
+Bryan/M
 Bryana/M
-Bryant
+Bryant/M
 Bryanty/M
 Bryce/M
 Bryn/M
@@ -2334,14 +2355,14 @@
 Bryon/M
 Brzezinski/M
 Btu/M
-Buber
+Buber/M
 Buchanan/M
 Bucharest/M
 Buchenwald
 Buchwald/M
-Buck
+Buck/M
 Buckie/M
-Buckingham
+Buckingham/M
 Buckley/M
 Buckner/M
 Bucky/M
@@ -2362,12 +2383,12 @@
 Buick/M
 Buiron/M
 Bujumbura/M
-Bukhara
-Bukharin
-Bulawayo
-Bulfinch
-Bulganin
-Bulgar
+Bukhara/M
+Bukharin/M
+Bulawayo/M
+Bulfinch/M
+Bulganin/M
+Bulgar/M
 Bulgari/M
 Bulgaria/M
 Bulgarian/SM
@@ -2375,29 +2396,30 @@
 Bullwinkle/M
 Bultmann/M
 Bumppo/M
-Bunche
+Bunche/M
 Bundesbank/M
-Bundestag
-Bunin
+Bundestag/M
+Bunin/M
 Bunker/M
 Bunni/M
 Bunnie/M
 Bunny/M
-Bunsen
+Bunsen/M
 Bunuel/M
 Bunyan/M
-Burbank
+Burbank/M
 Burberry/M
 Burch/M
 Burg/MR
 Burger/M
-Burgess
+Burgess/M
 Burgoyne/M
-Burgundian
+Burgundian/M
 Burgundy/SM
 Burk/SM
-Burke
+Burke/M
 Burkina/M
+Burks/M
 Burl/M
 Burlie/M
 Burlington/M
@@ -2405,13 +2427,13 @@
 Burmese/M
 Burnaby/M
 Burnard/M
-Burnett
-Burns
-Burnside
-Burr
+Burnett/M
+Burns/M
+Burnside/M
+Burr/M
 Burris/M
-Burroughs
-Bursa
+Burroughs/M
+Bursa/M
 Burt/M
 Burtie/M
 Burton/M
@@ -2420,7 +2442,7 @@
 Burundian/MS
 Busch/M
 Bush/M
-Bushido
+Bushido/M
 Bushnell/M
 Butch/M
 Butler
@@ -2432,11 +2454,11 @@
 Byram/M
 Byran/M
 Byrann/M
-Byrd
+Byrd/M
 Byrle/M
 Byrom/M
-Byron
-Byronic
+Byron/M
+Byronic/M
 Byzantine/MS
 Byzantium/M
 C/SMDY
@@ -2449,7 +2471,7 @@
 CATV
 CB
 CBC/M
-CBS
+CBS/M
 CCTV
 CCU
 CD/M
@@ -2461,7 +2483,7 @@
 CFO
 CIA/M
 CID
-CNN
+CNN/M
 CNS/M
 CO/M
 COBOL/SM
@@ -2477,30 +2499,31 @@
 CST/M
 CT/M
 CV
+CVS/M
 CZ
 Ca/M
 Cabernet/M
 Cabinet
-Cabot
-Cabral
+Cabot/M
+Cabral/M
 Cabrera/M
-Cabrini
+Cabrini/M
 Cacilia/M
 Cacilie/M
 Cad/M
 Caddric/M
 Cadette
-Cadillac
+Cadillac/M
 Cadiz/M
 Caedmon/M
-Caerphilly
+Caerphilly/M
 Caesar/SM
 Caesarean
-Cage
+Cage/M
 Cagney/M
 Cahokia/M
 Cahra/M
-Caiaphas
+Caiaphas/M
 Caicos/M
 Cain/SM
 Cairistiona/M
@@ -2509,28 +2532,29 @@
 Caitrin/M
 Cajan
 Cajun/MS
-Cal/Y
-Calais
+Cal/YM
+Calais/M
 Calcutta/M
 Calder
 Calderon/M
-Caldwell
+Caldwell/M
 Cale/M
 Caleb/M
-Caledonia
+Caledonia/M
 Calgary/M
-Calhoun
-Cali
-Caliban
+Calhoun/M
+Cali/M
+Caliban/M
 Calida/M
 Calif
 California/M
 Californian/MS
-Caligula
+Caligula/M
 Calla/MS
-Callaghan
+Callaghan/M
 Callahan/M
-Callao
+Callao/M
+Callas/M
 Callean/M
 Calley/M
 Calli/M
@@ -2542,7 +2566,7 @@
 Caloocan/M
 Calv/M
 Calvary/M
-Calvert
+Calvert/M
 Calvin/M
 Calvinism/MS
 Calvinist/MS
@@ -2560,7 +2584,7 @@
 Camel/M
 Camella/M
 Camellia/M
-Camelopardalis
+Camelopardalis/M
 Camelot/MS
 Camembert/MS
 Cameron/M
@@ -2578,21 +2602,21 @@
 Cammy/M
 Camoens/M
 Campanella/M
-Campbell
-Campinas
-Campos
+Campbell/M
+Campinas/M
+Campos/M
 Camry/M
-Camus
-Can
+Camus/M
+Can/M
 Canaan/M
 Canaanite/MS
 Canad
 Canada/M
 Canadian/SM
 Canadianism
-Canaletto
+Canaletto/M
 Canaries/M
-Canaveral
+Canaveral/M
 Canberra/M
 Cancer/SM
 Cancun/M
@@ -2607,43 +2631,43 @@
 Cannes/M
 Cannon/M
 Canon/M
-Canopus
+Canopus/M
 Cantabrigian/M
-Canterbury
+Canterbury/M
 Canton/M
 Cantonese/M
 Cantor/M
 Cantrell/M
 Cantu/M
-Canute
-Capablanca
+Canute/M
+Capablanca/M
 Capek/M
 Capella/M
-Capet
-Capetian
+Capet/M
+Capetian/M
 Capetown/M
 Caph/M
 Capistrano/M
 Capitol/SM
-Capitoline
-Capone
-Capote
+Capitoline/M
+Capone/M
+Capote/M
 Capra/M
 Capri/M
 Caprice/M
 Capricorn/MS
 Capt
-Capuchin
+Capuchin/M
 Capulet/M
 Car/MNY
 Cara/M
-Caracalla
+Caracalla/M
 Caracas/M
 Caralie/M
-Caravaggio
+Caravaggio/M
 Carboloy/M
 Carboniferous/M
-Carborundum
+Carborundum/M
 Carce/M
 Cardenas/M
 Cardiff/M
@@ -2656,7 +2680,7 @@
 Caresa/M
 Caressa/M
 Caresse/M
-Carey
+Carey/M
 Cari/M
 Caria
 Carib/MS
@@ -2665,7 +2689,7 @@
 Caril/M
 Carilyn/M
 Carin/M
-Carina
+Carina/M
 Carine/M
 Cariotta/M
 Carissa/M
@@ -2687,19 +2711,20 @@
 Carlisle/M
 Carlita/M
 Carlo/MS
-Carlota
+Carlos/M
+Carlota/M
 Carlotta/M
-Carlsbad
+Carlsbad/M
 Carlson/M
-Carlton
+Carlton/M
 Carly/M
 Carlye/M
-Carlyle
+Carlyle/M
 Carlyn/M
 Carlynn/M
 Carlynne/M
 Carma/M
-Carmel
+Carmel/M
 Carmela/M
 Carmelia/M
 Carmelina/M
@@ -2714,11 +2739,11 @@
 Carmine/M
 Carmita/M
 Carmon/M
-Carnap
+Carnap/M
 Carnation/M
 Carnegie/M
 Carney/M
-Carnot
+Carnot/M
 Carny/M
 Caro/M
 Carol/M
@@ -2728,9 +2753,9 @@
 Carole/M
 Carolee/M
 Carolin/M
-Carolina
-Caroline
-Carolingian
+Carolina/M
+Caroline/M
+Carolingian/M
 Carolinian/M
 Caroljean/M
 Carolus/M
@@ -2739,51 +2764,52 @@
 Carolynn/M
 Caron/M
 Carpathian/MS
-Carpenter
+Carpathians/M
+Carpenter/M
 Carr/M
 Carranza/M
 Carree/M
 Carri/MR
-Carrie/M
+Carrie/RM
 Carrier/M
 Carrillo/M
 Carrissa/M
 Carrol/M
 Carroll/M
 Carry/M
-Carson
+Carson/M
 Cart/MR
 Carter/M
-Cartesian
+Cartesian/M
 Carthage/M
 Carthaginian/MS
-Cartier
-Cartwright
-Caruso
-Carver
-Cary
+Cartier/M
+Cartwright/M
+Caruso/M
+Carver/M
+Cary/M
 Caryl/M
 Caryn/M
 Casablanca/M
-Casals
+Casals/M
 Casandra/M
 Casanova/SM
 Casar/M
 Cascades/M
 Case/M
 Casey/M
-Cash
+Cash/M
 Casi/M
 Casie/M
 Casio/M
-Caspar
+Caspar/M
 Casper/M
-Caspian
+Caspian/M
 Cass/M
 Cassandra/SM
 Cassandre/M
 Cassandry/M
-Cassatt
+Cassatt/M
 Cassaundra/M
 Cassey/M
 Cassi/M
@@ -2796,10 +2822,10 @@
 Castaneda/M
 Castile/M
 Castillo/M
-Castlereagh
+Castlereagh/M
 Castor/M
 Castries/M
-Castro
+Castro/M
 Catalan/SM
 Catalina/M
 Catalonia/M
@@ -2814,6 +2840,7 @@
 Cathay/M
 Cathe/MR
 Cathee/M
+Cather/M
 Catherin/M
 Catherina/M
 Catherine/M
@@ -2830,28 +2857,28 @@
 Cathyleen/M
 Cati/M
 Catie/M
-Catiline
+Catiline/M
 Catina/M
 Catlaina/M
 Catlee/M
 Catlin/M
-Cato
+Cato/M
 Catrina/M
 Catriona/M
 Catskill/SM
 Catskills/M
-Catt
-Catullus
+Catt/M
+Catullus/M
 Caty/M
 Caucasian/MS
 Caucasoid
 Caucasus/M
-Cauchy
-Cavendish
-Cavour
-Caxton
+Cauchy/M
+Cavendish/M
+Cavour/M
+Caxton/M
 Caye/M
-Cayenne
+Cayenne/M
 Cayla/M
 Cayman/M
 Cayuga/SM
@@ -2867,10 +2894,10 @@
 Cebuano/M
 Cece/M
 Cecelia/M
-Cecil
+Cecil/M
 Cecile/M
 Ceciley/M
-Cecilia
+Cecilia/M
 Cecilio/M
 Cecilius/M
 Cecilla/M
@@ -2897,9 +2924,9 @@
 Celisse/M
 Celka/M
 Celle/M
-Cellini
+Cellini/M
 Cello/M
-Celsius
+Celsius/M
 Celt/SM
 Celtic/SM
 Cenozoic/M
@@ -2907,26 +2934,26 @@
 Centigrade
 Central
 Centro/M
-Cepheid
+Cepheid/M
 Cepheus/M
 Cerberus/M
-Cerenkov
+Cerenkov/M
 Ceres/M
 Cerf/M
 Cervantes/M
 Cesar/M
 Cesare/M
 Cesarean
-Cesarian
+Cesarian/M
 Cesaro/M
 Cessna/M
 Cesya/M
-Cetus
+Cetus/M
 Ceylon/M
 Ceylonese
-Cezanne
+Cezanne/M
 Cf/M
-Ch'in
+Ch'in/M
 Ch/NRS
 Chablis/M
 Chad/M
@@ -2934,45 +2961,45 @@
 Chaddie/M
 Chaddy/M
 Chadian/MS
-Chadwick
-Chagall
+Chadwick/M
+Chagall/M
 Chaim/M
 Chaitanya/M
 Chaitin/M
 Chaldea
-Chaldean
+Chaldean/M
 Challenger/M
 Chalmers
-Chamberlain
-Chambers
-Champlain
-Champollion
+Chamberlain/M
+Chambers/M
+Champlain/M
+Champollion/M
 Chan/M
 Chance/M
 Chancellorsville/M
 Chancey/M
 Chanda/M
 Chandal/M
-Chandigarh
-Chandler
+Chandigarh/M
+Chandler/M
 Chandon/M
 Chandra/M
-Chandragupta
+Chandragupta/M
 Chandrasekhar/M
 Chane/M
-Chanel
+Chanel/M
 Chaney/M
 Chang/M
-Changchun
-Changsha
+Changchun/M
+Changsha/M
 Channa/M
 Chantal/M
 Chantalle/M
-Chantilly
+Chantilly/M
 Chanukah/M
 Chanukahs
-Chaplin
-Chapman
+Chaplin/M
+Chapman/M
 Chappaquiddick/M
 Chapultepec/M
 Chara
@@ -2981,7 +3008,7 @@
 Charil/M
 Charin/M
 Chariot/M
-Charis
+Charis/M
 Charissa/M
 Charisse/M
 Charita/M
@@ -2994,14 +3021,14 @@
 Charlene/M
 Charles/M
 Charleston/MS
-Charley
-Charlie
+Charley/M
+Charlie/M
 Charline/M
 Charlot/M
 Charlotta/M
 Charlotte/M
 Charlottetown/M
-Charlton
+Charlton/M
 Charmain/M
 Charmaine/M
 Charmane/M
@@ -3013,11 +3040,11 @@
 Charolais/M
 Charon/M
 Chartism/M
-Chartres
+Chartres/M
 Charybdis/M
 Charyl/M
-Chas
-Chase
+Chas/M
+Chase/M
 Chasity/M
 Chastity/M
 ChatZilla/M
@@ -3026,25 +3053,25 @@
 Chattahoochee/M
 Chattanooga/M
 Chatterley/M
-Chatterton
+Chatterton/M
 Chaucer/M
 Chaunce/M
 Chauncey/M
-Chautauqua
+Chautauqua/M
 Chavez/M
 Chayefsky/M
 Che/M
-Chechen
+Chechen/M
 Chechnya/M
-Cheddar
+Cheddar/M
 Cheer/M
 Cheerios/M
 Cheetos/M
-Cheever
+Cheever/M
 Chekhov/M
 Chekhovian
 Chelsae/M
-Chelsea
+Chelsea/M
 Chelsey/M
 Chelsie/M
 Chelsy/M
@@ -3053,7 +3080,7 @@
 Cheney/M
 Chengdu
 Chennai/M
-Cheops
+Cheops/M
 Chere/M
 Cherey/M
 Cheri/M
@@ -3077,16 +3104,16 @@
 Chery/M
 Cherye/M
 Cheryl/M
-Chesapeake
-Cheshire
+Chesapeake/M
+Cheshire/M
 Cheslie/M
 Chester/M
-Chesterfield
-Chesterton
+Chesterfield/M
+Chesterton/M
 Cheston/M
 Chet/M
 Chev/M
-Chevalier
+Chevalier/M
 Cheviot/M
 Chevrolet/M
 Chevron/M
@@ -3095,13 +3122,13 @@
 Chi/M
 Chianti/MS
 Chiarra/M
-Chiba
-Chibcha
+Chiba/M
+Chibcha/M
 Chic/M
 Chicago/M
-Chicagoan
-Chicana
-Chicano
+Chicagoan/M
+Chicana/M
+Chicano/M
 Chick/M
 Chickasaw/MS
 Chickie/M
@@ -3117,7 +3144,7 @@
 Chimu/M
 Chin/M
 China/M
-Chinatown
+Chinatown/M
 Chinese/M
 Chinook/MS
 Chip/M
@@ -3126,22 +3153,22 @@
 Chippewa/SM
 Chiquia/M
 Chiquita/M
-Chirico
+Chirico/M
 Chisholm/M
 Chisinau/M
-Chittagong
+Chittagong/M
 Chivas/M
 Chlo/M
-Chloe
+Chloe/M
 Chloette/M
 Chloris/M
 Choctaw/SM
 Choi/M
-Chomsky
-Chongqing
+Chomsky/M
+Chongqing/M
 Chopin/M
 Chopra/M
-Chou
+Chou/M
 Chretien/M
 Chris/M
 Chrisse/M
@@ -3154,11 +3181,11 @@
 Christal/M
 Christalle/M
 Christan/M
-Christchurch
+Christchurch/M
 Christean/M
 Christel/M
 Christen/M
-Christendom/SM
+Christendom/MS
 Christensen/M
 Christi/M
 Christian/SM
@@ -3167,9 +3194,9 @@
 Christianity/SM
 Christianize/DSG
 Christiano/M
-Christie
+Christie/M
 Christin/M
-Christina
+Christina/M
 Christine/M
 Christlike
 Christmas/MS
@@ -3179,7 +3206,7 @@
 Christoforo/M
 Christoper/M
 Christoph/MR
-Christophe
+Christophe/M
 Christopher/M
 Christophorus/M
 Christos/M
@@ -3190,29 +3217,29 @@
 Chrotoem/M
 Chrysa/M
 Chrysler/M
-Chrysostom
+Chrysostom/M
 Chrystal/M
 Chryste/M
 Chrystel/M
 Chucho/M
 Chuck/M
-Chukchi
-Chumash
+Chukchi/M
+Chumash/M
 Chung/M
 Chungking/M
-Church
+Church/M
 Churchill/M
 Churriguera/M
 Chuvash/M
-Ci
+Ci/M
 Cicely/M
 Cicero/M
 Cicily/M
-Cid
+Cid/M
 Ciel/M
 Cilka/M
 Cimabue/M
-Cincinnati
+Cincinnati/M
 Cinda/M
 Cindee/M
 Cindelyn/M
@@ -3222,7 +3249,7 @@
 Cindra/M
 Cindy/M
 CinemaScope/M
-Cinerama
+Cinerama/M
 Cingular/M
 Cinnamon/M
 Cipro/M
@@ -3249,9 +3276,9 @@
 Clara/M
 Clarabelle/M
 Clarance/M
-Clare
+Clare/M
 Clarence/M
-Clarendon
+Clarendon/M
 Claresta/M
 Clareta/M
 Claretta/M
@@ -3266,7 +3293,7 @@
 Clarissa/M
 Clarisse/M
 Clarita/M
-Clark
+Clark/M
 Clarke/M
 Clarkson/M
 Clary/M
@@ -3284,9 +3311,9 @@
 Claudio/M
 Claudius/M
 Claus/M
-Clausewitz
-Clausius
-Clay
+Clausewitz/M
+Clausius/M
+Clay/M
 Clayborn/M
 Clayborne/M
 Claybourne/M
@@ -3297,23 +3324,25 @@
 Cleavland/M
 Clem/XM
 Clemence/M
-Clemenceau
+Clemenceau/M
+Clemens/M
 Clement/MS
 Clemente/M
+Clementes/M
 Clementia/M
 Clementina/M
 Clementine/M
 Clementius/M
 Clemmie/M
 Clemmy/M
-Clemons
+Clemons/M
 Clemson/M
 Cleo/M
-Cleon
+Cleon/M
 Cleopatra/M
 Clerc/M
 Clerissa/M
-Cletis
+Cletis/M
 Cletus/M
 Cleve/M
 Cleveland/M
@@ -3321,26 +3350,28 @@
 Clevie/M
 Cliburn/M
 Cliff/M
-Clifford
+Clifford/M
 Clifton/M
 Clim/M
 Cline/M
 Clint/M
 Clinton/M
 Clio/M
+Clive/M
 Clo/M
 Cloe/M
 Clorets/M
 Cloris/M
 Clorox/M
+Closure/M
 Clotho/M
 Clotilda/M
 Clouseau/M
 Clovis/M
 Cly/M
-Clyde
+Clyde/M
 Clydesdale/M
-Clytemnestra
+Clytemnestra/M
 Clyve/M
 Clywd/M
 Cm/M
@@ -3348,42 +3379,42 @@
 Co/SM
 Cob/M
 Cobain/M
-Cobb
+Cobb/M
 Cobbie/M
 Cobby/M
-Cochabamba
-Cochin
-Cochise
+Cochabamba/M
+Cochin/M
+Cochise/M
 Cochran/M
 Cockney/M
-Cocteau
+Cocteau/M
 Cod
 Codee/M
 Codi/M
 Codie/M
-Cody
+Cody/M
 Coffey/M
 Cognac/M
-Cohan
-Cohen
-Coimbatore
+Cohan/M
+Cohen/M
+Coimbatore/M
 Cointon/M
-Cointreau
+Cointreau/M
 Coke/SM
-Col
+Col/M
 Colan/M
-Colas
+Colas/M
 Colbert/M
-Colby
+Colby/M
 ColdFusion/M
-Cole
+Cole/M
 Coleen/M
 Coleman/M
 Colene/M
 Coleridge/M
-Colet
+Colet/M
 Coletta/M
-Colette
+Colette/M
 Colfax/M
 Colgate/M
 Colin/M
@@ -3395,6 +3426,7 @@
 Collier/M
 Collin/SM
 Colline/M
+Collins/M
 Colly/RM
 Colman/M
 Colo
@@ -3407,11 +3439,11 @@
 Coloradan/SM
 Colorado/M
 Coloradoan
-Colosseum
+Colosseum/M
 Colt/M
-Coltrane
+Coltrane/M
 Columbia/M
-Columbine
+Columbine/M
 Columbus/M
 Colver/M
 Com
@@ -3419,52 +3451,52 @@
 Combs/M
 Comcast/M
 Comdr
-Comintern
-Commons
+Comintern/M
+Commons/M
 Commonwealth
 Communion/SM
 Communism
 Communist/SM
-Como
+Como/M
 Comoran
 Comoros/M
 Compaq/M
 Composer/M
-Compton
+Compton/M
 CompuServe/M
 Computerworld/M
-Comte
+Comte/M
 Con
 Conakry/M
 Conan/M
 Conant/M
-Concepcion
+Concepcion/M
 Concetta/M
 Concettina/M
 Conchita/M
 Concord/SM
-Concorde
+Concorde/M
 Concordia/M
-Condillac
-Condorcet
+Condillac/M
+Condorcet/M
 Conestoga/M
 Confederacy/M
 Confederate/MS
 Confucian/SM
 Confucianism/MS
 Confucius/M
-Cong
+Cong/M
 Congo/M
 Congolese/M
 Congregational
 Congregationalist/MS
 Congress/MS
 Congressional
-Congreve
+Congreve/M
 Conley/M
-Conn/R
+Conn/MR
 Connecticut/M
-Connemara
+Connemara/M
 Conner/M
 Connery/M
 Conney/M
@@ -3472,9 +3504,10 @@
 Connie/M
 Connolly/M
 Connor/SM
+Connors/M
 Connotea/M
 Conny/M
-Conrad
+Conrad/M
 Conrade/M
 Conrado/M
 Conrail/M
@@ -3482,25 +3515,25 @@
 Consalve/M
 Conservative
 Consolata/M
-Constable
-Constance
+Constable/M
+Constance/M
 Constancia/M
 Constancy/M
 Constanta/M
 Constantia
 Constantin/M
 Constantina/M
-Constantine
+Constantine/M
 Constantino/M
 Constantinople/M
 Constitution
 Consuela/M
 Consuelo/M
 Continent/M
-Continental
+Continental/M
 Contreras/M
-Conway
-Cook
+Conway/M
+Cook/M
 Cooke/M
 Cookie/M
 Cooley/M
@@ -3511,10 +3544,10 @@
 Copacabana/M
 Copeland/M
 Copenhagen/M
-Copernican
+Copernican/M
 Copernicus/M
-Copland
-Copley
+Copland/M
+Copley/M
 Copperfield/M
 Coppertone/M
 Coppola/M
@@ -3531,7 +3564,7 @@
 Corbett/M
 Corbie/M
 Corbin/M
-Corby
+Corby/M
 Cord/M
 Cordelia/M
 Cordelie/M
@@ -3539,7 +3572,7 @@
 Cordey/M
 Cordi/M
 Cordie/M
-Cordilleras
+Cordilleras/M
 Cordoba/M
 Cordula/M
 Cordy/M
@@ -3550,7 +3583,7 @@
 Coretta/M
 Corette/M
 Corey/M
-Corfu
+Corfu/M
 Cori/M
 Corie/M
 Corilla/M
@@ -3559,18 +3592,19 @@
 Corinna/M
 Corinne/M
 Corinth/M
-Corinthian/SM
-Coriolanus
+Corinthian/MS
+Corinthians/M
+Coriolanus/M
 Coriolis/M
 Coriss/M
 Corissa/M
-Cork
+Cork/M
 Corleone/M
 Corliss/M
 Corly/M
 Cormack/M
 Cornall/M
-Corneille
+Corneille/M
 Cornela/M
 Cornelia/M
 Cornelius/M
@@ -3581,12 +3615,12 @@
 Corning/M
 Cornish/MS
 Cornwall/M
-Cornwallis
+Cornwallis/M
 Corny/M
-Coronado
-Corot
+Coronado/M
+Corot/M
 Corp
-Correggio
+Correggio/M
 Correna/M
 Correy/M
 Corri/M
@@ -3597,7 +3631,7 @@
 Corrinne/M
 Corry/M
 Corsica/M
-Corsican
+Corsican/M
 Cort/M
 Cortes/MS
 Cortez/M
@@ -3615,46 +3649,46 @@
 Cosimo/M
 Cosme/M
 Cosmo/M
-Cossack
+Cossack/M
 Costa/M
 Costanza/M
 Costco/M
 Costello/M
 Costner/M
 Cote/M
-Cotonou
+Cotonou/M
 Cotopaxi/M
 Cotswold/M
 Cotton/M
-Coulomb
+Coulomb/M
 Coulter/M
 Councillor/MS
-Couperin
-Courbet
+Couperin/M
+Courbet/M
 Court/M
 Courtenay/M
 Courtnay/M
 Courtney/M
-Cousteau
+Cousteau/M
 Coventry/SM
-Coward
-Cowley
-Cowper
-Cox
+Coward/M
+Cowley/M
+Cowper/M
+Cox/M
 Coy/M
 Cozmo/M
 Cozumel/M
 Cpl
 Cr/MT
-Crabbe
+Crabbe/M
 Craft/M
 Craggie/M
 Craggy/M
-Craig
+Craig/M
 Craigslist/M
-Cranach
-Crane
-Cranmer
+Cranach/M
+Crane/M
+Cranmer/M
 Crater/M
 Crawford/M
 Cray/M
@@ -3668,17 +3702,18 @@
 Creight/M
 Creighton/M
 Creole/SM
-Creon
+Creon/M
+Cressida/M
 Crest/M
 Cretaceous/M
 Cretan/SM
 Crete/M
-Crichton
-Crick
+Crichton/M
+Crick/M
 Crimea/M
-Crimean
+Crimean/M
 Crin/M
-Criollo
+Criollo/M
 Cris/M
 Crisco/M
 Crissie/M
@@ -3700,23 +3735,23 @@
 Croat/SM
 Croatia/M
 Croatian/MS
-Croce
-Crockett
-Croesus
+Croce/M
+Crockett/M
+Croesus/M
 Cromwell/M
-Cromwellian
+Cromwellian/M
 Cronin/M
 Cronkite/M
 Cronus/M
-Crookes
-Crosby
-Cross
+Crookes/M
+Crosby/M
+Cross/M
 Crow/SM
 Crowley/M
 Crucifixion/MS
-Cruikshank
+Cruikshank/M
 Cruise/M
-Crusades
+Crusades/M
 Crusoe/M
 Crux/M
 Cruz/M
@@ -3726,15 +3761,15 @@
 Crystie/M
 Csonka/M
 Ct
-Ctesiphon
+Ctesiphon/M
 Cthrine/M
 Cthulhu/M
 Cu/M
 Cuba/M
 Cuban/SM
 Cuchulain/M
-Cuisinart
-Culbertson
+Cuisinart/M
+Culbertson/M
 Cull/MN
 Cullan/M
 Cullen/M
@@ -3745,26 +3780,26 @@
 Culver/M
 Cumberland/M
 Cumbria/M
-Cummings
+Cummings/M
 Cunard/M
 Cunningham/M
 Cupid/M
 Curacao/M
 Curcio/M
-Curie
-Curitiba
+Curie/M
+Curitiba/M
 Curr/M
 Curran/M
 Currey/M
 Currie/MR
 Currier/M
-Curry
+Curry/RM
 Curt/M
 Curtice/M
 Curtis/M
-Custer
+Custer/M
 Cuvier/M
-Cuzco
+Cuzco/M
 Cy
 Cyb/M
 Cybele/M
@@ -3789,18 +3824,18 @@
 Cypriot/MS
 Cyprus/M
 Cyrano/M
-Cyril
+Cyril/M
 Cyrill/M
 Cyrille/M
 Cyrillic/M
 Cyrillus/M
-Cyrus
+Cyrus/M
 Czech/M
 Czechoslovak
 Czechoslovakia/M
-Czechoslovakian/MS
+Czechoslovakian/SM
 Czechs
-Czerny
+Czerny/M
 D'Arcy
 D/MN
 DA/M
@@ -3815,8 +3850,10 @@
 DEA
 DEC/SDG
 DH
+DHS
 DI
 DJ
+DMCA
 DMD/M
 DMZ
 DNA/M
@@ -3834,7 +3871,7 @@
 DUI
 DVD
 DVDs
-DVR/S
+DVR/SM
 DWI
 Dacca/M
 Dacey/M
@@ -3853,8 +3890,8 @@
 Dag/M
 Dagmar/M
 Dagny/M
-Daguerre
-Dagwood
+Daguerre/M
+Dagwood/M
 Dahlia/M
 Dahomey/M
 Daile/M
@@ -3862,12 +3899,13 @@
 Daisey/M
 Daisi/M
 Daisie/M
-Daisy
+Daisy/M
 Dakar/M
 Dakota/SM
-Dakotan
+Dakotan/M
 Dal/M
-Dale
+Dalai
+Dale/M
 Dalenna/M
 Daley/M
 Dali/S
@@ -3887,19 +3925,19 @@
 Damara/M
 Damaris/M
 Damascus/M
-Dame/N
+Dame/MN
 Damian/M
 Damiano/M
-Damien
+Damien/M
 Damion/M
 Damita/M
-Damocles
+Damocles/M
 Damon/M
-Dan
+Dan/M
 Dana/M
-Danae
+Danae/M
 Dane/SM
-Danelaw
+Danelaw/M
 Danell/M
 Danella/M
 Danette/M
@@ -3915,6 +3953,7 @@
 Daniele/M
 Daniella/M
 Danielle/M
+Daniels/M
 Danika/M
 Danila/M
 Danish/M
@@ -3928,9 +3967,9 @@
 Dannye/M
 Danone/M
 Dante/M
-Danton
+Danton/M
 Danube/M
-Danubian
+Danubian/M
 Danya/M
 Danyelle/M
 Danyette/M
@@ -3950,20 +3989,20 @@
 Darcy/M
 Darda/M
 Dardanelles/M
-Dare
+Dare/M
 Dareen/M
 Darell/M
 Darelle/M
 Daren/M
-Darfur
+Darfur/M
 Dari/M
 Daria/M
 Darice/M
 Darill/M
 Darin/M
 Dario/M
-Darius
-Darjeeling
+Darius/M
+Darjeeling/M
 Darla/M
 Darleen/M
 Darlene/M
@@ -3980,16 +4019,16 @@
 Darren/M
 Darrick/M
 Darrin/M
-Darrow
+Darrow/M
 Darryl/M
 Darsey/M
 Darsie/M
 Darth/M
-Dartmoor
-Dartmouth
+Dartmoor/M
+Dartmouth/M
 Darvon/M
 Darwin/M
-Darwinian
+Darwinian/M
 Darwinism/SM
 Darwinist
 Darya/M
@@ -4003,14 +4042,14 @@
 Datamation/S
 Datha/M
 Daugherty/M
-Daumier
+Daumier/M
 Daune/M
 Dav/MN
-Davao
+Davao/M
 Dave/M
 Daveen/M
 Daven/M
-Davenport
+Davenport/M
 Daveta/M
 Davey/M
 David/MS
@@ -4019,20 +4058,21 @@
 Davide/M
 Davidson/M
 Davie/MS
+Davies/M
 Davin/M
 Davina/M
 Davine/M
-Davis
-Davy/S
-Dawes
+Davis/M
+Davy/SM
+Dawes/M
 Dawn/M
 Dawna/M
-Dawson
-Day
-Dayan
+Dawson/M
+Day/M
+Dayan/M
 Dayle/M
 Dayna/M
-Dayton
+Dayton/M
 Daytona/M
 Ddene/M
 De/RSMN
@@ -4040,7 +4080,7 @@
 DeKalb/M
 Deadhead/M
 DealTime/M
-Dean
+Dean/M
 Deana/M
 Deandre/M
 Deane/M
@@ -4057,24 +4097,24 @@
 Debian/M
 Debor/M
 Debora/M
-Deborah
+Deborah/M
 Debouillet/M
 Debra/M
-Debs
-Debussy
+Debs/M
+Debussy/M
 Dec/M
 Decalog
 Decalogue/M
-Decatur
+Decatur/M
 Decca/M
-Deccan
+Deccan/M
 December/SM
 Deck/MR
 Dede/M
 Dedekind/M
 Dedie/M
 Dedra/M
-Dee
+Dee/M
 Deeann/M
 Deeanne/M
 Deedee/M
@@ -4082,45 +4122,45 @@
 Deerdre/M
 Deere/M
 Deeyn/M
-Defoe
-Degas
+Defoe/M
+Degas/M
 Dehlia/M
 Deidre/M
-Deimos
+Deimos/M
 Deina/M
-Deirdre
-Deity
+Deirdre/M
+Deity/M
 Dejesus/M
-Del/Y
+Del/YM
 Dela/M
-Delacroix
+Delacroix/M
 Delacruz/M
 Delainey/M
 Delaney/M
 Delano/M
 Delaware/MS
-Delawarean/MS
+Delawarean/SM
 Delbert/M
 Delcina/M
 Delcine/M
 Deleon/M
-Delgado
+Delgado/M
 Delhi/M
 Delia/M
-Delibes
+Delibes/M
 Delicious/M
 Delila/M
 Delilah/M
-Delilahs
+Delilahs/M
 Delinda/M
-Delius
+Delius/M
 Dell/M
 Della/M
 Delly/M
 Delmar/M
 Delmarva/M
 Delmer/M
-Delmonico
+Delmonico/M
 Delmor/M
 Delmore/M
 Deloitte/M
@@ -4129,11 +4169,11 @@
 Deloria/M
 Deloris/M
 Delphi/M
-Delphic
+Delphic/M
 Delphine/M
 Delphinia/M
 Delphinus/M
-Delta
+Delta/M
 Dem/G
 Demavend/M
 Demerol/M
@@ -4146,18 +4186,19 @@
 Deming/M
 Democrat/SM
 Democratic
-Democritus
+Democritus/M
 Demosthenes/M
 Demott/M
-Dempsey
+Dempsey/M
 Dena/M
 Denali
 Dene
-Deneb
+Deneb/M
 Denebola/M
 Deng/M
 Deni/SM
 Denice/M
+Denis/M
 Denise/M
 Denmark/M
 Denna/M
@@ -4165,18 +4206,19 @@
 Denney/M
 Denni/MS
 Dennie/M
+Dennis/M
 Dennison/M
 Denny/M
 Denton/M
 Denver/M
 Deny/M
-Denys
+Denys/M
 Denyse/M
 Deon/M
 Deonne/M
 Depp/M
 Der/M
-Derby
+Derby/M
 Derek/M
 Derick/M
 Derk/M
@@ -4187,7 +4229,7 @@
 Derrik/M
 Derril/M
 Derron/M
-Derry
+Derry/M
 Derward/M
 Derwin/M
 Descartes/M
@@ -4230,14 +4272,14 @@
 Dewitt/M
 Dex/M
 Dexedrine/M
-Dexter
+Dexter/M
 Dhabi
 Dhaka/M
 Dhaulagiri/M
-Di/S
+Di/S/M
 DiCaprio/M
-DiMaggio
-Diaghilev
+DiMaggio/M
+Diaghilev/M
 Diahann/M
 Dial/M
 Dian/M
@@ -4252,30 +4294,31 @@
 Diarmid/M
 Dias
 Diaspora/MS
-Diaz
-Dick/X
+Diaz/M
+Dick/XM
+Dickens/M
 Dickensian
 Dickerson/M
 Dickie/M
-Dickinson
+Dickinson/M
 Dickson/M
 Dicky/M
 Dictaphone/SM
-Diderot
+Diderot/M
 Didi/M
 Dido/M
 Didrikson/M
-Diefenbaker
+Diefenbaker/M
 Diego/M
 Diem/M
 Diena/M
 Dierdre/M
 Diesel/M
 Dieter/M
-Dietrich
+Dietrich/M
 Digg/MS
 Dijkstra/M
-Dijon
+Dijon/M
 Dilan/M
 Dilbert/MS
 Dill/M
@@ -4287,50 +4330,50 @@
 Dimitri/M
 Dimitry/M
 Dina/M
-Dinah
+Dinah/M
 Dinnie/M
 Dinny/M
 Dino/M
-Diocletian
-Diogenes
+Diocletian/M
+Diogenes/M
 Dion/M
-Dione
+Dione/M
 Dionis/M
 Dionisio/M
 Dionne/M
-Dionysian
+Dionysian/M
 Dionysus/M
 Diophantine/M
-Dior
+Dior/M
 Dipper/M
 Dir
-Dirac
-Dirichlet
+Dirac/M
+Dirichlet/M
 Dirk/M
 Dis/M
-Disney
-Disneyland
-Disraeli
+Disney/M
+Disneyland/M
+Disraeli/M
 Dita/M
 DivX/M
 Divine/M
 Diwali/M
-Dix
+Dix/M
 Dixie/M
-Dixiecrat
+Dixiecrat/M
 Dixieland/SM
 Dixon/M
 Djakarta/M
 Djibouti/M
 Dmitri/M
 Dnepr
-Dnepropetrovsk
+Dnepropetrovsk/M
 Dnieper
-Dniester
+Dniester/M
 Dniren/M
 Dobbin/M
 Doberman/M
-Dobro
+Dobro/M
 Doctor
 Doctorow/M
 Dode/M
@@ -4341,9 +4384,9 @@
 Dodoma/M
 Dodson/M
 Dody/M
-Doe
+Doe/M
 Doha/M
-Dolby
+Dolby/M
 Dole/M
 Dolf/M
 Doll/M
@@ -4363,24 +4406,24 @@
 Domingo/M
 Dominguez/M
 Domini/M
-Dominic
+Dominic/M
 Dominica/M
 Dominican/MS
 Dominick/M
 Dominik/M
 Dominion
 Dominique/M
-Domitian
+Domitian/M
 Don't
 Don/SM
-Dona
+Dona/M
 Donahue/M
 Donal/M
 Donald/M
 Donaldson/M
 Donall/M
 Donalt/M
-Donatello
+Donatello/M
 Donaugh/M
 Donavon/M
 Donella/M
@@ -4392,7 +4435,7 @@
 Donielle/M
 Donizetti/M
 Donn/MR
-Donna
+Donna/M
 Donnamarie/M
 Donne/M
 Donnell/M
@@ -4402,16 +4445,16 @@
 Donny/M
 Donovan/M
 Dooley/M
-Doolittle
+Doolittle/M
 Doonesbury/M
-Doppler
+Doppler/M
 Dora/M
 Doralia/M
 Doralin/M
 Doralyn/M
 Doralynn/M
 Doralynne/M
-Dorcas
+Dorcas/M
 Dore/M
 Doreen/M
 Dorelia/M
@@ -4446,11 +4489,11 @@
 Dorri/SM
 Dorrie/M
 Dorry/M
-Dorset
+Dorset/M
 Dorsey/M
 Dorthea/M
 Dorthy/M
-Dortmund
+Dortmund/M
 Dory/M
 Dosi/M
 Dostoevsky/M
@@ -4466,36 +4509,37 @@
 Doubleday/M
 Doug/M
 Dougie/M
-Douglas
-Douglass
+Douglas/M
+Douglass/M
 Dougy/M
-Douro
+Douro/M
 Dov/MR
 Dover/M
-Dow
-Downs
+Dow/M
+Downs/M
 Downy/M
 Doy/M
-Doyle
+Doyle/M
 Dr
 Draco/M
-Draconian
+Draconian/M
 Dracula/M
-Drake
+Drake/M
 Dramamine/SM
-Drambuie
+Drambuie/M
 Drano/M
 Dravidian/M
 Dre/M
 Dreamweaver/M
 Dreddy/M
 Dredi/M
-Dreiser
+Dreiser/M
 Dresden/M
 Drew/M
 Dreyfus/M
 Dristan/M
 Drona/M
+Dropbox/M
 Dru/M
 Druci/M
 Drucie/M
@@ -4509,24 +4553,24 @@
 Drusie/M
 Drusilla/M
 Drusy/M
-Dryden
+Dryden/M
 Dschubba/M
 Du
-DuPont
+DuPont/M
 Duane/M
-Dubai
+Dubai/M
 Dubcek/M
 Dubhe/M
 Dublin/M
 Dubrovnik/M
-Duchamp
+Duchamp/M
 Dud/M
-Dudley
+Dudley/M
 Duff/M
 Duffie/M
 Duffy/M
 Dugald/M
-Duisburg
+Duisburg/M
 Duke/M
 Dukey/M
 Dukie/M
@@ -4540,37 +4584,37 @@
 Dulcine/M
 Dulcinea/M
 Dulcy/M
-Dulles
+Dulles/M
 Dulsea/M
-Duluth
-Dumas
+Duluth/M
+Dumas/M
 Dumbledore/M
 Dumbo/M
-Dumpster
+Dumpster/M
 Dun/M
-Dunant
-Dunbar
+Dunant/M
+Dunbar/M
 Dunc/M
-Duncan
-Dundee
-Dunedin
+Duncan/M
+Dundee/M
+Dunedin/M
 Dunkirk/M
 Dunlap/M
 Dunn/M
 Dunne/M
-Dunstan
+Dunstan/M
 Dur/R
 Duracell/M
 Duran/M
 Durand/M
 Durant
 Durante/M
-Durban
-Durer
+Durban/M
+Durer/M
 Durex/M
 Durham/MS
-Durkheim
-Duroc
+Durkheim/M
+Duroc/M
 Durocher/M
 Durward/M
 Duse/M
@@ -4581,11 +4625,11 @@
 Dusty/M
 Dutch/M
 Dutchman/M
-Dutchmen
+Dutchmen/M
 Dutchwoman
-Duvalier
-Dvina
-Dvorak
+Duvalier/M
+Dvina/M
+Dvorak/M
 Dwain/M
 Dwayne/M
 Dwight/M
@@ -4602,7 +4646,7 @@
 Dynah/M
 Dyson/M
 Dzerzhinsky/M
-Dzungaria
+Dzungaria/M
 E/SMY
 EC
 ECG/M
@@ -4627,22 +4671,23 @@
 ESE/M
 ESL
 ESP/M
-ESPN
+ESPN/M
 EST/M
 ET
 ETA
 ETD
 EU
+EULA/M
 Eachelle/M
 Eada/M
 Eadie/M
 Eadith/M
 Eadmund/M
-Eakins
+Eakins/M
 Eal/M
 Ealasaid/M
 Eamon/M
-Earhart
+Earhart/M
 Earl/M
 Earle/M
 Earlene/M
@@ -4659,7 +4704,7 @@
 East/SZMR
 Easter/M
 Eastern/R
-Eastman
+Eastman/M
 Easton/M
 Eastwood/M
 Eaton/M
@@ -4671,27 +4716,27 @@
 Ebeneser/M
 Ebenezer/M
 Eberhard/M
-Ebert
+Ebert/M
 Eberto/M
-Ebola
+Ebola/M
 Ebonee/M
 Ebonics/M
 Ebony/M
 Ebro/M
-Ecclesiastes
+Ecclesiastes/M
 Ecma/M
 Eco/M
 Ecstasy
 Ecuador/M
 Ecuadoran/SM
 Ecuadorean
-Ecuadorian/MS
+Ecuadorian/SM
 Ed/MNX
 Eda/M
 Edam/SM
 Edan/M
 Edd/M
-Edda
+Edda/M
 Eddi/M
 Eddie/M
 Eddington/M
@@ -4700,7 +4745,7 @@
 Edee/M
 Edeline/M
 Eden/M
-Edgar
+Edgar/M
 Edgard/M
 Edgardo/M
 Edi/MH
@@ -4721,7 +4766,7 @@
 Edmund/M
 Edna/M
 Edouard/M
-Edsel
+Edsel/M
 Eduard/M
 Eduardo/M
 Eduino/M
@@ -4729,7 +4774,8 @@
 Edward/SM
 Edwardian/M
 Edwardo/M
-Edwin
+Edwards/M
+Edwin/M
 Edwina/M
 Edy/M
 Edyth/M
@@ -4748,9 +4794,9 @@
 Egyptian/MS
 Egyptology/M
 Ehrenberg/M
-Ehrlich
-Eichmann
-Eiffel
+Ehrlich/M
+Eichmann/M
+Eiffel/M
 Eileen/M
 Eilis/M
 Eimile/M
@@ -4758,29 +4804,29 @@
 Eire/M
 Eirena/M
 Eisenhower/M
-Eisenstein
+Eisenstein/M
 Eisner/M
 Ekaterina/M
 El/Y
 Elaina/M
-Elaine
-Elam
+Elaine/M
+Elam/M
 Elana/M
 Elane/M
 Elanor/M
 Elastoplast/M
 Elayne/M
-Elba
+Elba/M
 Elbe/M
-Elbert
+Elbert/M
 Elberta/M
 Elbertina/M
 Elbertine/M
-Elbrus
+Elbrus/M
 Elden/M
 Eldin/M
 Eldon/M
-Eldorado
+Eldorado/M
 Eldredge/M
 Eldridge/M
 Eleanor/M
@@ -4800,31 +4846,32 @@
 Elfrida/M
 Elfrieda/M
 Elga/M
-Elgar
-Eli
-Elia/S
+Elgar/M
+Eli/M
+Elia/S/M
 Elianora/M
 Elianore/M
+Elias/M
 Elicia/M
 Elie/M
 Elihu/M
 Elijah/M
 Elinor/M
 Elinore/M
-Eliot
+Eliot/M
 Elisa/M
 Elisabet/M
-Elisabeth
+Elisabeth/M
 Elisabetta/M
 Elise/M
 Eliseo/M
-Elisha
+Elisha/M
 Elissa/M
 Elita/M
 Eliza/M
 Elizabet/M
 Elizabeth/M
-Elizabethan/MS
+Elizabethan/SM
 Elka/M
 Elke/M
 Ella/M
@@ -4839,10 +4886,10 @@
 Ellette/M
 Elli/SM
 Ellie/M
-Ellington
+Ellington/M
 Elliot/M
 Elliott/M
-Ellis
+Ellis/M
 Ellison/M
 Ellissa/M
 Ellswerth/M
@@ -4861,7 +4908,7 @@
 Elnath/M
 Elnora/M
 Elnore/M
-Elohim
+Elohim/M
 Eloisa/M
 Eloise/M
 Elonore/M
@@ -4876,7 +4923,7 @@
 Elsey/M
 Elsi/M
 Elsie/M
-Elsinore
+Elsinore/M
 Elspeth/M
 Elston/M
 Elsworth/M
@@ -4901,8 +4948,8 @@
 Elyse/M
 Elysee/M
 Elysha/M
-Elysia
-Elysian
+Elysia/M
+Elysian/M
 Elysium/SM
 Elyssa/M
 Em/M
@@ -4920,7 +4967,7 @@
 Emelita/M
 Emelyne/M
 Emera/M
-Emerson
+Emerson/M
 Emery/M
 Emil/M
 Emile/M
@@ -4943,7 +4990,7 @@
 Emmalyn/M
 Emmalynn/M
 Emmalynne/M
-Emmanuel
+Emmanuel/M
 Emmeline/M
 Emmerich/M
 Emmery/M
@@ -4954,7 +5001,7 @@
 Emmie/M
 Emmit/M
 Emmott/M
-Emmy
+Emmy/M
 Emmye/M
 Emogene/M
 Emory/M
@@ -4962,8 +5009,8 @@
 Emylee/M
 Encarta/M
 EndNote/M
-Endymion
-Eng
+Endymion/M
+Eng/M
 Engadget/M
 Engelbert/M
 Engels/M
@@ -4971,17 +5018,17 @@
 Englebert/M
 English/MRS
 Englishman/M
-Englishmen
+Englishmen/M
 Englishwoman/M
 Englishwomen
 Engracia/M
-Enid
+Enid/M
 Enif/M
 Eniwetok/M
 Enkidu/M
-Ennis
-Enoch
-Enos
+Ennis/M
+Enoch/M
+Enos/M
 Enrica/M
 Enrichetta/M
 Enrico/M
@@ -4995,12 +5042,12 @@
 Eolande/M
 Epcot/M
 Ephesian/S
-Ephesus
-Ephraim
+Ephesus/M
+Ephraim/M
 Ephrayim/M
 Ephrem/M
-Epictetus
-Epicurean
+Epictetus/M
+Epicurean/M
 Epicurus/M
 Epimethius/M
 Epinions/M
@@ -5008,10 +5055,10 @@
 Episcopal
 Episcopalian/MS
 Epistle
-Epsom
+Epsom/M
 Epson/M
-Epstein
-Equuleus
+Epstein/M
+Equuleus/M
 Er/M
 Eran/M
 Erasmus/M
@@ -5020,11 +5067,11 @@
 Eratosthenes/M
 Erda/M
 Erebus/M
-Erector
+Erector/M
 Erek/M
 Erena/M
 Erewhon/M
-Erhard
+Erhard/M
 Erhart/M
 Eric/M
 Erica/M
@@ -5033,14 +5080,14 @@
 Erick/M
 Ericka/M
 Erickson/M
-Ericson
-Ericsson
-Eridanus
-Erie
+Ericson/M
+Ericsson/M
+Eridanus/M
+Erie/M
 Erik/M
 Erika/M
-Eriksson
-Erin
+Eriksson/M
+Erin/M
 Erina/M
 Erinn/M
 Erinna/M
@@ -5065,14 +5112,14 @@
 Ernesto/M
 Ernestus/M
 Ernie/M
-Ernst
+Ernst/M
 Erny/M
 Eros/MS
 Errick/M
 Errol/M
 Erroll/M
 Erse/M
-Erskine
+Erskine/M
 Ertha/M
 Erv/M
 ErvIn/M
@@ -5081,8 +5128,8 @@
 Esau/M
 Escher/M
 Escherichia/M
-Escondido
-Esdras
+Escondido/M
+Esdras/M
 Eskimo/MS
 Esma/M
 Esmaria/M
@@ -5096,9 +5143,9 @@
 Esra/M
 Essa/M
 Essen/M
-Essene
-Essequibo
-Essex
+Essene/M
+Essequibo/M
+Essex/M
 Essie/M
 Essy/M
 Esta/M
@@ -5112,7 +5159,7 @@
 Estelle/M
 Ester/M
 Esterhazy/M
-Estes
+Estes/M
 Estevan/M
 Esther/M
 Estonia/M
@@ -5124,22 +5171,22 @@
 Ethan/M
 Ethe/M
 Ethel/M
-Ethelbert
+Ethelbert/M
 Ethelda/M
 Ethelin/M
 Ethelind/M
 Etheline/M
 Ethelred/M
 Ethelyn/M
-Ethernet
+Ethernet/M
 Ethiopia/M
 Ethiopian/SM
 Ethyl/M
 Etienne/M
 Etna/M
-Eton
-Etruria
-Etruscan
+Eton/M
+Etruria/M
+Etruscan/M
 Etta/M
 Etti/M
 Ettie/M
@@ -5153,7 +5200,7 @@
 Eudora/M
 Euell/M
 Eugen/M
-Eugene
+Eugene/M
 Eugenia/M
 Eugenie/M
 Eugenio/M
@@ -5162,7 +5209,7 @@
 Eukaryota/MS
 Eula/M
 Eulalie/M
-Euler
+Euler/M
 Eumenides/M
 Eunice/M
 Euphemia/M
@@ -5170,8 +5217,8 @@
 Eur
 Eurasia/M
 Eurasian/MS
-Euripides
-Eurodollar/MS
+Euripides/M
+Eurodollar/SM
 Europa/M
 Europe/M
 European/MS
@@ -5189,16 +5236,17 @@
 Evangelin/M
 Evangelina/M
 Evangeline/M
-Evangelist
+Evangelist/M
 Evania/M
 Evanne/M
-Evansville
+Evans/M
+Evansville/M
 Eve/M
 Eveleen/M
 Evelin/M
 Evelina/M
 Eveline/M
-Evelyn
+Evelyn/M
 Even/M
 Evenki/M
 EverReady/M
@@ -5229,7 +5277,7 @@
 Excedrin/M
 Excellency/SM
 Exchequer
-Exercycle
+Exercycle/M
 Exocet/M
 Exodus/M
 Expedia/M
@@ -5237,14 +5285,14 @@
 Eyck/M
 Eyde/M
 Eydie/M
-Eyre
+Eyre/M
 Eysenck/M
 Ezechiel/M
-Ezekiel
+Ezekiel/M
 Ezequiel/M
 Eziechiele/M
 Ezmeralda/M
-Ezra
+Ezra/M
 Ezri/M
 F/MD
 FAA
@@ -5264,6 +5312,7 @@
 FOFL
 FORTRAN/M
 FPO
+FSF/M
 FSLIC
 FTC
 FUD/S
@@ -5272,7 +5321,7 @@
 FYI
 Fabe/RM
 Faber/M
-Faberge
+Faberge/M
 Fabian/MS
 Fabiano/M
 Fabien/M
@@ -5280,20 +5329,20 @@
 Facebook/M
 Fae/M
 Faeroe/M
-Fafnir
+Fafnir/M
 Fagin/M
 Fahd/M
-Fahrenheit
+Fahrenheit/M
 Faina/M
 Fair/M
-Fairbanks
+Fairbanks/M
 Fairfax
 Fairleigh/M
 Fairlie/M
 Faisal/M
-Faisalabad
-Faith
-Falasha
+Faisalabad/M
+Faith/M
+Falasha/M
 Falito/M
 Falkland/SM
 Falkner
@@ -5325,10 +5374,10 @@
 Farley/M
 Farlie/M
 Farly/M
-Farmer
+Farmer/M
 Farr/M
 Farra/M
-Farragut
+Farragut/M
 Farrah/M
 Farrakhan/M
 Farrand/M
@@ -5342,12 +5391,12 @@
 Faso/M
 Fassbinder/M
 Fatah/M
-Fates
+Fates/M
 Father/SM
-Fatima
-Fatimid
+Fatima/M
+Fatimid/M
 Faulkner/M
-Faulknerian
+Faulknerian/M
 Faun/M
 Faunie/M
 Fauntleroy/M
@@ -5358,7 +5407,7 @@
 Faustino/M
 Faustus/M
 Favorited
-Fawkes
+Fawkes/M
 Fawn/M
 Fawne/M
 Fawnia/M
@@ -5375,12 +5424,13 @@
 Feb/M
 February/SM
 Fed/SM
-FedEx
+FedEx/M
 Federal/MS
 Federalist/M
 Federica/M
 Federico/M
 Fedora/M
+Feds/M
 Fee/M
 Felecia/M
 Felic/M
@@ -5399,25 +5449,25 @@
 Felix/M
 Feliza/M
 Felizio/M
-Fellini
+Fellini/M
 Fenelia/M
 Feng/M
-Fenian
+Fenian/M
 Fennec/M
 Feodor/M
 Feodora/M
 Ferber/M
 Ferd/M
 Ferdie/M
-Ferdinand
+Ferdinand/M
 Ferdinanda/M
 Ferdinande/M
 Ferdy/M
-Fergus
+Fergus/M
 Ferguson/M
 Ferlinghetti/M
 Fermat/M
-Fermi
+Fermi/M
 Fern/M
 Fernanda/M
 Fernande/M
@@ -5429,16 +5479,16 @@
 Ferraro/M
 Ferrel/M
 Ferrell/M
-Ferris
+Ferris/M
 Fey/M
 Feynman/M
-Fez
+Fez/M
 Fiann/M
 Fianna
 Fiat/M
-Fiberglas
+Fiberglas/M
 Fibonacci/M
-Fichte
+Fichte/M
 Fidel/M
 Fidela/M
 Fidelia/M
@@ -5447,6 +5497,8 @@
 Fido/M
 Fidole/M
 Field/GS
+Fielding/M
+Fields/M
 Fifi/M
 Fifine/M
 Figaro/M
@@ -5466,7 +5518,7 @@
 FilmSpot/M
 Filmer/M
 Filmore/M
-Filofax
+Filofax/M
 Fin
 Fina/M
 Finch/M
@@ -5487,12 +5539,12 @@
 Fiorenze/M
 Firefox/M
 Firestone/M
-Fischer
-Fisher
+Fischer/M
+Fisher/M
 Fisk/M
 Fitch/M
 Fitz/M
-Fitzgerald
+Fitzgerald/M
 Fitzpatrick/M
 Fitzroy/M
 Fizeau/M
@@ -5501,38 +5553,40 @@
 Flanders/M
 Flathead
 Flatt/M
-Flaubert
+Flaubert/M
 Fleischer/M
 Flem/G
+Fleming/M
 Flemish/M
 Flemming/M
 Fletch/MR
+Fletcher/M
 Fleur/M
 Fleurette/M
 Flickr/M
 Flin/M
 Flinn/M
-Flint
-Flintstones
+Flint/M
+Flintstones/M
 Flo/M
 Flock/M
 Flor/M
-Flora
+Flora/M
 Florance/M
 Flore/SM
 Florella/M
 Florence/M
 Florencia/M
 Florentia/M
-Florentine
+Florentine/M
 Florenza/M
-Flores
+Flores/M
 Florette/M
 Flori/SM
 Floria/M
 Florian/M
 Florida/M
-Floridan
+Floridan/M
 Floridian/SM
 Florie/M
 Florina/M
@@ -5546,24 +5600,24 @@
 Flossi/M
 Flossie/M
 Flossy/M
-Flowers
-Floyd
+Flowers/M
+Floyd/M
 Flss/M
 Flynn/M
 Fm/M
-Foch
-Fokker
-Foley
-Folgers
-Folsom
-Fomalhaut
-Fonda
+Foch/M
+Fokker/M
+Foley/M
+Folgers/M
+Folsom/M
+Fomalhaut/M
+Fonda/M
 Fons
 Fonsie/M
 Fonz/M
 Fonzie/M
 Foosball/M
-Forbes
+Forbes/M
 Ford/M
 Foreman/M
 Forest/MR
@@ -5573,20 +5627,20 @@
 Formosan/M
 Forrest/R
 Forrester/M
-Forster
-Fortaleza
+Forster/M
+Fortaleza/M
 Foss/M
 Fosse/M
-Foster
+Foster/M
 Fotomat/M
-Foucault
-Fourier
+Foucault/M
+Fourier/M
 Fourneyron/M
 Fourth
-Fowler
+Fowler/M
 Fox/MS
 Fr/MD
-Fragonard
+Fragonard/M
 Fran/SM
 France/SM
 Francene/M
@@ -5594,29 +5648,30 @@
 Francesco/M
 Franchot/M
 Francine/M
-Francis
+Francis/M
 Francisca/M
-Franciscan/SM
+Franciscan/MS
 Francisco/M
 Franciska/M
 Franciskus/M
-Franck
+Franck/M
 Francklin/M
 Francklyn/M
-Franco
+Franco/M
 Francois/M
 Francoise/M
 Francyne/M
-Franglais
+Franglais/M
 Frank/SM
 Frankel/M
-Frankenstein
+Frankenstein/M
 Frankfort/M
 Frankfurt/MR
 Frankie/M
-Frankish
-Franklin
+Frankish/M
+Franklin/M
 Franklyn/M
+Franks/M
 Franky/M
 Franni/M
 Frannie/M
@@ -5626,7 +5681,7 @@
 Franz/MN
 Franzen/M
 Frasco/M
-Fraser
+Fraser/M
 Frasier/M
 Frasquito/M
 Frau/MN
@@ -5644,7 +5699,7 @@
 Frederic/M
 Frederica/M
 Frederich/M
-Frederick
+Frederick/M
 Fredericka/M
 Frederico/M
 Fredericton/M
@@ -5667,67 +5722,68 @@
 Freemon/M
 Freetown/M
 Freida/M
-Fremont
+Fremont/M
 French/MS
 Frenchman/M
-Frenchmen
+Frenchmen/M
 Frenchwoman/M
-Frenchwomen
-Freon
+Frenchwomen/M
+Freon/M
 Fresnel/M
 Fresno/M
 Freud/M
-Freudian
+Freudian/M
 Frey/M
 Freya/M
 Fri/M
 Friday/SM
 Frieda/M
-Friedan
+Friedan/M
 Friederike/M
-Friedman
-Friedrich
+Friedman/M
+Friedrich/M
 Friedrick/M
 Friend/SM
 Frigga/M
-Frigidaire
-Frisbee
-Frisco
+Frigidaire/M
+Frisbee/M
+Frisco/M
 Frisian/MS
 Frito/M
 Fritz/M
-Frobisher
-Froissart
-Fromm
-Fronde
+Frobisher/M
+Froissart/M
+Fromm/M
+Fronde/M
 FrontPage/M
 Frontenac/M
 Frost/M
-Frostbelt
+Frostbelt/M
 Frunze/M
-Fry
+Fry/M
 Frye/M
 Fuchs/M
-Fuentes
-Fugger
+Fuentes/M
+Fugger/M
 Fuji/M
 Fujitsu/M
 Fujiwara/M
 Fujiyama/M
 Fukuoka/M
+Fukuyama/M
 Fulani/M
-Fulbright
-Fuller
-Fullerton
+Fulbright/M
+Fuller/M
+Fullerton/M
 Fulton/M
 Fulvia/M
-Funafuti
-Fundy
+Funafuti/M
+Fundy/M
 Furies/M
 Furtwangler/M
-Fushun
+Fushun/M
 Fuzhou/M
-Fuzzbuster
+Fuzzbuster/M
 G/MNRB
 GA
 GAO
@@ -5739,15 +5795,19 @@
 GHQ/M
 GHz/M
 GI
+GIF
 GIGO
-GM
+GM/M
 GMAT
 GMT/M
 GNP/M
+GNU/M
 GOP/M
 GP/M
 GPA
 GPO
+GPS
+GPU
 GSA
 GTE/M
 GU
@@ -5762,10 +5822,11 @@
 Gabey/M
 Gabi/M
 Gabie/M
+Gable/M
 Gabon/M
 Gabonese/M
 Gaborone/M
-Gabriel
+Gabriel/M
 Gabriela/M
 Gabriele/M
 Gabriell/M
@@ -5776,15 +5837,16 @@
 Gabrila/M
 Gaby/M
 Gacrux/M
-Gaddafi
+Gaddafi/M
 Gadsden/M
 Gae/M
 Gaea/M
 Gael/SM
 Gaelan/M
 Gaelic/M
-Gagarin
-Gage
+Gagarin/M
+Gage/M
+Gaia/M
 Gail/M
 Gaile/M
 Gaiman/M
@@ -5793,37 +5855,37 @@
 Gal/N
 Galahad/SM
 Galapagos/M
-Galatea
-Galatia
-Galatians
+Galatea/M
+Galatia/M
+Galatians/M
 Galaxy
-Galbraith
+Galbraith/M
 Gale/M
-Galen
-Galibi
+Galen/M
+Galibi/M
 Galilean/SM
-Galilee
+Galilee/M
 Galileo/M
 Galina/M
 Gall/M
 Gallagher/M
 Gallard/M
 Gallegos/M
-Gallic
+Gallic/M
 Gallicism/SM
 Gallo/M
 Galloway/M
-Gallup
+Gallup/M
 Galois/M
-Galsworthy
+Galsworthy/M
 Galvan/M
-Galvani
+Galvani/M
 Galven/M
 Galveston/M
 Galvin/M
-Gama
+Gama/M
 Gamaliel/M
-Gamay
+Gamay/M
 Gambia/M
 Gambian/SM
 Gamble/M
@@ -5833,7 +5895,7 @@
 Gamow/M
 Gan/M
 Gandhi/M
-Gandhian
+Gandhian/M
 Ganesha/M
 Ganges/M
 Gangtok/M
@@ -5845,7 +5907,7 @@
 Gap/M
 Gar/MH
 Garald/M
-Garbo
+Garbo/M
 Garcia/M
 Gard
 Gardener/M
@@ -5862,9 +5924,9 @@
 Gargantua
 Garibaldi/M
 Garik/M
-Garland
+Garland/M
 Garmin/M
-Garner
+Garner/M
 Garnet/M
 Garnette/M
 Garold/M
@@ -5873,29 +5935,29 @@
 Garret/M
 Garreth/M
 Garrett/M
-Garrick
+Garrick/M
 Garrik/M
-Garrison
+Garrison/M
 Garrot/M
 Garrott/M
 Garry/M
 Garth/M
 Garv/M
-Garvey
+Garvey/M
 Garvin/M
 Garvy/M
 Garwin/M
 Garwood/M
-Gary
+Gary/M
 Garza/M
 Gascony/M
-Gaspar
+Gaspar/M
 Gaspard/M
 Gasparo/M
 Gasper/M
-Gasser
+Gasser/M
 Gaston/M
-Gates
+Gates/M
 Gatling/M
 Gatorade/M
 Gatsby/M
@@ -5905,10 +5967,10 @@
 Gaulish
 Gaultiero/M
 Gauss/M
-Gaussian
+Gaussian/M
 Gautama/M
 Gauthier/M
-Gautier
+Gautier/M
 Gav/MN
 Gavan/M
 Gaven/M
@@ -5917,7 +5979,7 @@
 Gavrielle/M
 Gawain/M
 Gawen/M
-Gay
+Gay/M
 Gaye/M
 Gayel/M
 Gayelord/M
@@ -5929,8 +5991,8 @@
 Gaylor/M
 Gaylord/M
 Gaynor/M
-Gaza
-Gaziantep
+Gaza/M
+Gaziantep/M
 Gbps
 Gd/M
 Gdansk/M
@@ -5941,12 +6003,13 @@
 Geer/M
 Geffen/M
 Gehenna/M
-Gehrig
+Gehrig/M
 Geiger/M
 Gelbvieh/M
 Geller/M
 Gelya/M
 Gemini/MS
+Gen/M
 GenBank/M
 Gena/M
 Genaro/M
@@ -5967,7 +6030,7 @@
 Genoa/SM
 Genovera/M
 Gentile/MS
-Gentoo
+Gentoo/M
 Gentry/M
 Genvieve/M
 Geo/M
@@ -5984,7 +6047,7 @@
 Georgeta/M
 Georgetown/M
 Georgetta/M
-Georgette
+Georgette/M
 Georgi/M
 Georgia/M
 Georgian/MS
@@ -5995,6 +6058,7 @@
 Georgina/M
 Georgine/M
 Georgy/M
+Ger/M
 Gerald/M
 Geralda/M
 Geraldine/M
@@ -6002,6 +6066,7 @@
 Gerardo/M
 Gerber/M
 Gerda/M
+Gere/M
 Gerek/M
 Gerhard/M
 Gerhardine/M
@@ -6021,13 +6086,13 @@
 Germany/M
 Germayne/M
 Gerome/M
-Geronimo
+Geronimo/M
 Gerrard/M
 Gerri/M
 Gerrie/M
 Gerrilee/M
 Gerry/M
-Gershwin
+Gershwin/M
 Gert/M
 Gerta/M
 Gerti/M
@@ -6039,21 +6104,21 @@
 Gerty/M
 Gery/M
 Gestapo/SM
-Gethsemane
-Getty
+Gethsemane/M
+Getty/M
 Gettysburg/M
-Gewurztraminer
+Gewurztraminer/M
 Ghana/M
 Ghanaian
 Ghanian/MS
-Ghats
+Ghats/M
 Ghazvanid/M
-Ghent
+Ghent/M
 Gherardo/M
 Ghibelline
 Giacinta/M
 Giacobo/M
-Giacometti
+Giacometti/M
 Giacomo/M
 Giacopo/M
 Gian/M
@@ -6067,14 +6132,14 @@
 Gib/M
 Gibb/SM
 Gibbie/M
-Gibbon
-Gibbs
+Gibbon/M
+Gibbs/M
 Gibby/M
 Gibraltar/MS
-Gibson
-Gide
-Gideon
-Gielgud
+Gibson/M
+Gide/M
+Gideon/M
+Gielgud/M
 Gienah/M
 Giff/MR
 Giffard/M
@@ -6089,19 +6154,19 @@
 Gilberta/M
 Gilberte/M
 Gilbertina/M
-Gilbertine
+Gilbertine/M
 Gilberto/M
 Gilburt/M
 Gilchrist/M
 Gilda/M
-Gilead
+Gilead/M
 Gilemette/M
-Giles
-Gilgamesh
-Gill
+Giles/M
+Gilgamesh/M
+Gill/M
 Gillan/M
-Gilles
-Gillespie
+Gilles/M
+Gillespie/M
 Gillette/M
 Gilli/M
 Gilliam/M
@@ -6120,28 +6185,29 @@
 Ginnifer/M
 Ginny/M
 Gino/M
-Ginsberg
+Ginsberg/M
 Ginsburg/M
 Ginsu/M
 Giordano/M
 Giorgi/M
 Giorgia/M
 Giorgio/M
-Giorgione
-Giotto
+Giorgione/M
+Giotto/M
 Giovanna/M
 Giovanni/M
 Gipsy/SM
 Giralda/M
 Giraldo/M
-Giraud
-Giraudoux
+Giraud/M
+Giraudoux/M
 Gisela/M
 Giselbert/M
 Gisele/M
 Gisella/M
 Giselle/M
-Gish
+Gish/M
+GitHub/M
 Giuditta/M
 Giulia/M
 Giuliani/M
@@ -6157,8 +6223,8 @@
 Glad/M
 Gladi/M
 Gladstone/MS
-Gladys
-Glaser
+Gladys/M
+Glaser/M
 Glasgow/M
 Glass/M
 Glastonbury/M
@@ -6178,11 +6244,11 @@
 Glennie/M
 Glennis/M
 Glori/M
-Gloria
+Gloria/M
 Gloriana/M
 Gloriane/M
 Glory/M
-Gloucester
+Gloucester/M
 Gloucestershire/M
 Glover/M
 Glyn/M
@@ -6192,14 +6258,15 @@
 Glynnis/M
 GmbH
 Gnni/M
-Gnostic
+Gnostic/M
 Gnosticism/M
-Goa
+GnuPG
+Goa/M
 Gobi/M
 God/M
-Godard
+Godard/M
 Godart/M
-Goddard
+Goddard/M
 Goddart/M
 Godel/M
 Godfree/M
@@ -6209,20 +6276,20 @@
 Godiva/M
 Godot/M
 Godspeed/SM
-Godthaab
-Godunov
-Godwin
+Godthaab/M
+Godunov/M
+Godwin/M
 Godzilla/M
-Goebbels
-Goering
+Goebbels/M
+Goering/M
 Goethals/M
 Goethe/M
 Goff/M
-Gog
-Gogol
+Gog/M
+Gogol/M
 Goiania/M
 Golan/M
-Golconda
+Golconda/M
 Golda/M
 Goldarina/M
 Goldberg/M
@@ -6232,68 +6299,68 @@
 Goldie/M
 Goldilocks/M
 Goldina/M
-Golding
+Golding/M
 Goldman/M
-Goldsmith
+Goldsmith/M
 Goldwater/M
-Goldwyn
+Goldwyn/M
 Goldy/M
-Golgi
+Golgi/M
 Golgotha/M
-Goliath
+Goliath/M
 Gomez/M
 Gomorrah/M
-Gompers
-Gomulka
+Gompers/M
+Gomulka/M
 Gondwanaland/M
-Gonzales
+Gonzales/M
 Gonzalez/M
 Gonzalo/M
 Goober/M
 Good/M
 Goodall/M
-Goodman
+Goodman/M
 Goodrich/M
 Goodwill/M
 Goodwin/M
-Goodyear
+Goodyear/M
 Google/M
 Goolagong/M
 Gopher
 Goran/M
 Goraud/M
-Gorbachev
+Gorbachev/M
 Gordan/M
 Gorden/M
 Gordian/M
 Gordie/M
-Gordimer
-Gordon
+Gordimer/M
+Gordon/M
 Gordy/M
-Gore
+Gore/M
 Goren/M
 Gorey/M
-Gorgas
+Gorgas/M
 Gorgon/M
 Gorgonzola
 Gorky/M
 Gospel/MS
 Goteborg/M
 Goth/M
-Gotham
+Gotham/M
 Gothart/M
 Gothic/MS
 Goths
 Gottfried/M
 Gouda/SM
-Gould
-Gounod
+Gould/M
+Gounod/M
 Governor
-Goya
+Goya/M
 Gr/B
 Grable/M
-Gracchus
-Grace
+Gracchus/M
+Grace/M
 Graceland/M
 Gracia/M
 Gracie/M
@@ -6305,13 +6372,13 @@
 Graeme/M
 Graffias/M
 Grafton/M
-Graham
-Grahame
+Graham/M
+Grahame/M
 Graig/M
-Grail
+Grail/M
 Gram/M
-Grammy
-Grampians
+Grammy/M
+Grampians/M
 Gran/M
 Granada/M
 Grange/R
@@ -6322,20 +6389,20 @@
 Granthem/M
 Grantley/M
 Granville/M
-Grass
+Grass/M
 Grata/M
 Gratia/M
 Gratiana/M
-Graves
-Gray
+Graves/M
+Gray/M
 Grayce/M
 Grazia/M
-Grecian
+Grecian/M
 Greece/M
 Greek/SM
-Greeley
+Greeley/M
 Green/SM
-Greene
+Greene/M
 Greenland/M
 Greenlandic
 Greenpeace/M
@@ -6350,17 +6417,17 @@
 Gregoire/M
 Gregoor/M
 Gregor/M
-Gregorian
+Gregorian/M
 Gregorio/M
 Gregorius/M
 Gregory/M
 Grenada/M
 Grenadian/MS
-Grenadines
-Grendel
-Grenoble
+Grenadines/M
+Grendel/M
+Grenoble/M
 Grenville
-Gresham
+Gresham/M
 Greta/M
 Gretal/M
 Gretchen/M
@@ -6370,39 +6437,39 @@
 Gretna/M
 Gretta/M
 Gretzky/M
-Grey
-Grieg
+Grey/M
+Grieg/M
 Grier/M
 Griff/M
 Griffie/M
 Griffin/M
-Griffith
+Griffith/M
 Griffiths
 Griffy/M
-Grimes
+Grimes/M
 Grimm/M
 Grinch/M
-Gris
+Gris/M
 Griselda
 Grissel/M
 Griswold/M
 Griz/M
-Gromyko
+Gromyko/M
 Gropius/M
-Gross
-Grosz
-Grotius
+Gross/M
+Grosz/M
+Grotius/M
 Grove/RM
 Grover/M
-Grozny
+Grozny/M
 Grumman/M
-Grundy
+Grundy/M
 Grunewald/M
 Grus/M
 Gruyere/SM
 Guadalajara/M
 Guadalcanal/M
-Guadalquivir
+Guadalquivir/M
 Guadalupe/M
 Guadeloupe/M
 Guallatiri/M
@@ -6414,18 +6481,18 @@
 Guarani/M
 Guarnieri/M
 Guatemala/M
-Guatemalan/SM
+Guatemalan/MS
 Guayaquil/M
 Gucci/M
-Guelph
+Guelph/M
 Guendolen/M
 Guenevere/M
 Guenna/M
 Guernsey/MS
 Guerra/M
-Guerrero
-Guevara
-Guggenheim
+Guerrero/M
+Guevara/M
+Guggenheim/M
 Guglielma/M
 Guglielmo/M
 Gui/M
@@ -6442,12 +6509,12 @@
 Guinevere/M
 Guinna/M
 Guinness/M
-Guiyang
-Guizot
+Guiyang/M
+Guizot/M
 Gujarat/M
 Gujarati/M
-Gujranwala
-Gullah
+Gujranwala/M
+Gullah/M
 Gulliver/M
 Gumbel/M
 Gun/M
@@ -6456,7 +6523,7 @@
 Gunner/M
 Guntar/M
 Gunter
-Gunther
+Gunther/M
 Guofeng/M
 Gupta/M
 Gurkha/M
@@ -6475,16 +6542,16 @@
 Gusti/M
 Gustie/M
 Gusty/M
-Gutenberg
+Gutenberg/M
 Guthrey/M
-Guthrie
+Guthrie/M
 Guthry/M
 Gutierrez/M
 Guy/M
 Guyana/M
 Guyanese/M
 Guzman/M
-Gwalior
+Gwalior/M
 Gwen/M
 Gwendolen/M
 Gwendolin/M
@@ -6503,7 +6570,9 @@
 Gwynne/M
 Gypsy/SM
 H/M
-HBO
+HBO/M
+HDD
+HDMI
 HDTV
 HF/M
 HHS
@@ -6525,9 +6594,9 @@
 HTTP
 HTTPS
 HUD/M
-Ha
+Ha/M
 Haas/M
-Habakkuk
+Habakkuk/M
 Haber/M
 Had/M
 Hadar/M
@@ -6539,28 +6608,28 @@
 Hadrian
 Hafiz/M
 Hagan/M
-Hagar
-Hagen
-Haggai
+Hagar/M
+Hagen/M
+Haggai/M
 Hagiographa/M
-Hague
-Hahn
+Hague/M
+Hahn/M
 Haida/SM
 Haifa/M
 Hailee/M
 Hailey/M
 Haily/M
-Haiphong
+Haiphong/M
 Haiti/M
 Haitian/MS
 Hakeem/M
 Hakim/M
 Hakka/M
-Hakluyt
+Hakluyt/M
 Hal/SMY
-Haldane
-Hale
-Haleakala
+Haldane/M
+Hale/M
+Haleakala/M
 Haleigh/M
 Halette/M
 Haley/M
@@ -6568,52 +6637,52 @@
 Halie/M
 Halifax/M
 Halimeda/M
-Hall
-Halley
+Hall/M
+Halley/M
 Halli/M
 Halliburton/M
 Hallie/M
 Hallmark/M
 Halloween/MS
-Hallstatt
+Hallstatt/M
 Hallsy/M
 Hally/M
 Halon/M
-Halsey
+Halsey/M
 Halsy/M
 Ham/M
 Haman/M
 Hamas/M
 Hamburg/MS
 Hamel/M
-Hamhung
+Hamhung/M
 Hamid/M
 Hamil/M
 Hamilcar/M
 Hamill/M
 Hamilton/M
-Hamiltonian
+Hamiltonian/M
 Hamish/M
 Hamitic/M
 Hamlen/M
-Hamlet
+Hamlet/M
 Hamlin/M
 Hammad/M
-Hammarskjold
-Hammerstein
+Hammarskjold/M
+Hammerstein/M
 Hammett/M
-Hammond
-Hammurabi
+Hammond/M
+Hammurabi/M
 Hamnet/M
 Hampshire/M
-Hampton
-Hamsun
-Han/S
+Hampton/M
+Hamsun/M
+Han/S/M
 Hana/M
 Hanan/M
-Hancock
+Hancock/M
 Handel/M
-Handy
+Handy/M
 Haney/M
 Hangul/M
 Hangzhou/M
@@ -6627,6 +6696,7 @@
 Hanoi/M
 Hanover/M
 Hanoverian/M
+Hans/MN
 Hansel/M
 Hansen/M
 Hansiain/M
@@ -6639,23 +6709,23 @@
 Harald/M
 Harare/M
 Harbert/M
-Harbin
+Harbin/M
 Harcourt/M
 Hardin/M
 Harding/M
-Hardy
-Hargreaves
+Hardy/M
+Hargreaves/M
 Harlan/M
 Harland/M
 Harlem/M
 Harlen/M
 Harlene/M
-Harlequin
-Harley
+Harlequin/M
+Harley/M
 Harli/M
 Harlie/M
 Harlin/M
-Harlow
+Harlow/M
 Harman/M
 Harmon/M
 Harmonia/M
@@ -6676,26 +6746,27 @@
 Harrington/M
 Harriot/M
 Harriott/M
+Harris/M
 Harrisburg/M
 Harrison/M
-Harrods
+Harrods/M
 Harry/M
-Hart
-Harte
+Hart/M
+Harte/M
 Hartford/M
-Hartley
+Hartley/M
 Hartline/M
 Hartman/M
 Hartwell/M
 Harv/M
 Harvard/M
-Harvey
+Harvey/M
 Harwell/M
 Harwilll/M
 Hasbro/M
 Hasheem/M
 Hashim/M
-Hasidim
+Hasidim/M
 Haskel/M
 Haskell/M
 Haslett/M
@@ -6703,10 +6774,10 @@
 Hastie/M
 Hastings/M
 Hasty/M
-Hatfield
-Hathaway
+Hatfield/M
+Hathaway/M
 Hatsheput/M
-Hatteras
+Hatteras/M
 Hatti/M
 Hattie/M
 Hatty/M
@@ -6714,50 +6785,52 @@
 Hausa/M
 Hausdorff/M
 Havana/MS
-Havarti
-Havel
+Havarti/M
+Havel/M
 Haven/M
 Havoline/M
-Haw
+Haw/M
 Hawaii/M
 Hawaiian/SM
-Hawking
-Hawkins
+Hawking/M
+Hawkins/M
 Hawks
-Hawthorne
+Hawthorne/M
 Hay/SM
 Hayden/M
 Haydn/M
 Haydon/M
 Hayes/M
 Hayley/M
-Haynes
-Hayward
+Haynes/M
+Hays/M
+Hayward/M
 Haywood/M
 Hayworth/M
 Hayyim/M
 Haze/M
 Hazel/M
 Hazlett/M
-Hazlitt
+Hazlitt/M
 He/M
 Head/M
 Heall/M
-Hearst
-Heath/R
+Hearst/M
+Heath/MR
 Heather/M
 Heaven/MS
-Heaviside
+Heaviside/M
 Heb
-Hebe
+Hebe/M
 Hebert/M
-Hebraic
+Hebraic/M
 Hebraism/SM
 Hebrew/MS
+Hebrews/M
 Hebrides/M
-Hecate
+Hecate/M
 Hector/M
-Hecuba
+Hecuba/M
 Heda/M
 Hedda/M
 Heddi/M
@@ -6771,24 +6844,24 @@
 Heep/M
 Hefner/M
 Hegel/M
-Hegelian
-Hegira
+Hegelian/M
+Hegira/M
 Heida/M
-Heidegger
-Heidelberg
+Heidegger/M
+Heidelberg/M
 Heidi/M
 Heidie/M
-Heifetz
+Heifetz/M
 Heimlich/M
 Heindrick/M
-Heine
+Heine/M
 Heineken/M
 Heinlein/M
 Heinrich/M
 Heinrick/M
 Heinrik/M
-Heinz
-Heisenberg
+Heinz/M
+Heisenberg/M
 Heisman/M
 Hejira/MS
 Helaina/M
@@ -6799,21 +6872,21 @@
 Helenka/M
 Helga/M
 Helge/M
-Helicon
-Heliopolis
+Helicon/M
+Heliopolis/M
 Helios/M
 Hell/SMR
 Hellene/SM
 Hellenic/M
 Hellenism/MS
 Hellenist
-Hellenistic
-Hellenization
+Hellenistic/M
+Hellenization/M
 Hellenize/DSG
-Heller
+Heller/M
 Hellespont/M
 Helli/M
-Hellman
+Hellman/M
 Helmholtz/M
 Heloise/M
 Helsa/M
@@ -6828,9 +6901,9 @@
 Hendrick/MS
 Hendrik/M
 Hendrika/M
-Hendrix
+Hendrix/M
 Henka/M
-Henley
+Henley/M
 Hennessy/M
 Henri/M
 Henrie/M
@@ -6842,32 +6915,32 @@
 Henryetta/M
 Hensley/M
 Henson/M
-Hepburn
+Hepburn/M
 Hephaestus/M
 Hephzibah/M
-Hepplewhite
+Hepplewhite/M
 Hera/M
 Heracles/M
-Heraclitus
+Heraclitus/M
 Herakles/M
 Herb/M
-Herbart
-Herbert
+Herbart/M
+Herbert/M
 Herbie/M
 Herby/M
 Herc/M
 Herculaneum/M
 Hercule/MS
-Herculean
+Herculean/M
 Hercules/M
 Herculie/M
-Herder
+Herder/M
 Hereford/SM
-Herero
+Herero/M
 Heriberto/M
 Herman/M
 Hermann/M
-Hermaphroditus
+Hermaphroditus/M
 Hermes/M
 Hermia/M
 Hermie/M
@@ -6875,7 +6948,7 @@
 Hermine/M
 Herminia/M
 Hermione/M
-Hermitage
+Hermitage/M
 Hermite/M
 Hermon
 Hermosillo/M
@@ -6887,10 +6960,10 @@
 Herold/M
 Herr/MG
 Herrera/M
-Herrick
+Herrick/M
 Herring/M
 Hersch/M
-Herschel
+Herschel/M
 Hersey/M
 Hersh/M
 Hershel/M
@@ -6902,14 +6975,14 @@
 Hertzsprung/M
 Herve/M
 Hervey/M
-Herzegovina
-Herzl
+Herzegovina/M
+Herzl/M
 Heshvan/M
-Hesiod
-Hesperus
-Hess
-Hesse
-Hessian
+Hesiod/M
+Hesperus/M
+Hess/M
+Hesse/M
+Hessian/M
 Hester/M
 Hesther/M
 Hestia/M
@@ -6924,43 +6997,43 @@
 Hewie/M
 Hewitt/M
 Hewlett/M
-Heyerdahl
-Heywood
+Heyerdahl/M
+Heywood/M
 Hezbollah/M
-Hezekiah
+Hezekiah/M
 Hf/M
 Hg/M
 Hi/M
-Hialeah
+Hialeah/M
 Hiawatha/M
 Hibernia/M
 Hibernian
 Hickman/M
-Hickok
+Hickok/M
 Hicks/M
-Hieronymus
+Hieronymus/M
 Higashiosaka
 Higgins/M
-Highlander/MS
+Highlander/SM
 Highlands
 Highness/M
 Hilario/M
 Hilarius/M
 Hilary/M
-Hilbert
+Hilbert/M
 Hilda/M
 Hildagard/M
 Hildagarde/M
 Hilde/M
-Hildebrand
+Hildebrand/M
 Hildegaard/M
 Hildegarde/M
 Hildy/M
 Hilfiger/M
-Hill
+Hill/M
 Hillard/M
-Hillary
-Hillel
+Hillary/M
+Hillel/M
 Hillery/M
 Hilliard
 Hilliary/M
@@ -6969,68 +7042,69 @@
 Hillsborough/M
 Hilly/RM
 Hillyer/M
-Hilton
+Hilton/M
 Himalaya/SM
-Himalayan
-Himmler
+Himalayan/M
+Himmler/M
 Hinayana/M
 Hinda/M
-Hindemith
-Hindenburg
-Hindi
+Hindemith/M
+Hindenburg/M
+Hindi/M
 Hindu/SM
 Hinduism/SM
 Hindustan/M
 Hindustani/SM
-Hines
+Hines/M
 Hinton/M
 Hinze/M
-Hipparchus
+Hipparchus/M
 Hippocrates/M
-Hippocratic
-Hiram
+Hippocratic/M
+Hiram/M
 Hirobumi/M
-Hirohito
+Hirohito/M
 Hiroshima/M
 Hirsch/M
 Hispanic/SM
 Hispaniola/M
 Hiss/M
 Hitachi/M
-Hitchcock
+Hitchcock/M
 Hitler/MS
 Hittite/SM
-Hmong
+Hmong/M
 Ho/M
 Hobard/M
 Hobart/M
-Hobbes
-Hobbs
+Hobbes/M
+Hobbs/M
 Hobey/M
 Hobie/M
 Hockney/M
 Hodge/SM
-Hodgkin
+Hodges/M
+Hodgkin/M
 Hoebart/M
 Hoff/M
 Hoffa/M
 Hoffman/M
 Hofstadter/M
 Hogan/M
-Hogarth
+Hogarth/M
 Hogwarts/M
-Hohenlohe
-Hohenstaufen
+Hohenlohe/M
+Hohenstaufen/M
 Hohenzollern/M
 Hohhot/M
-Hohokam
+Hohokam/M
 Hokkaido/M
-Hokusai
-Holbein
+Hokusai/M
+Holbein/M
 Holcomb/M
 Holden/M
 Holder/M
-Holiday
+Holiday/M
 Holiness
 Holland/ZSMR
 Hollander/M
@@ -7038,20 +7112,21 @@
 Holley/M
 Holli/SM
 Hollie/M
+Hollis/M
 Holloway/M
-Holly
+Holly/M
 Hollyanne/M
 Hollywood/M
 Holman/M
 Holmes/M
-Holocaust
+Holocaust/M
 Holocene/M
-Holst
+Holst/M
 Holstein/SM
-Holt
+Holt/M
 Homer/M
 Homere/M
-Homeric
+Homeric/M
 Homerus/M
 Hon
 Honda/M
@@ -7060,39 +7135,40 @@
 Honecker/M
 Honey/M
 Honeywell/M
-Honiara
+Hong/M
+Honiara/M
 Honolulu/M
 Honor/B
 Honoria/M
 Honshu/M
-Hood
-Hooke/R
+Hood/M
+Hooke/RM
 Hooper/M
 Hoosier/MS
 Hooters/M
 Hoover/MS
-Hope
+Hope/M
 Hopewell/M
 Hopi/SM
-Hopkins
-Hopper
-Horace
+Hopkins/M
+Hopper/M
+Horace/M
 Horacio/M
 Horatia/M
 Horatio/M
 Horatius/M
 Hormel/M
-Hormuz
-Horn
+Hormuz/M
+Horn/M
 Hornblower/M
 Horne/M
-Horowitz
+Horowitz/M
 Horst/M
 Hort/MN
 Horten/M
 Hortense
 Hortensia/M
-Horthy
+Horthy/M
 Horton/M
 Horus/M
 Hosea/M
@@ -7100,25 +7176,25 @@
 Hotmail/M
 Hotpoint/M
 Hottentot/SM
-Houdini
+Houdini/M
 Houghton/M
-House
-Housman
+House/M
+Housman/M
 Houston/M
 Houyhnhnm/M
 Hovhaness/M
-Howard
-Howe
+Howard/M
+Howe/M
 Howell/MS
 Howey/M
 Howie/M
 Howrah
-Hoyle
+Hoyle/M
 Hoyt/M
 Hrothgar/M
 Hts
-Huang
-Hubbard
+Huang/M
+Hubbard/M
 Hubble/M
 Hube/RM
 Huber/M
@@ -7133,55 +7209,56 @@
 Huey/M
 Huff/M
 Huffman/M
-Huggins
+Huggins/M
 Hugh/MS
+Hughes/M
 Hughie
 Hugibert/M
 Hugo/M
 Huguenot/MS
 Hugues/M
-Hui
+Hui/M
 Huitzilopotchli/M
 Hulda/M
 Hull/M
 Humbert/M
 Humberto/M
-Humboldt
-Hume
+Humboldt/M
+Hume/M
 Humfrey/M
 Humfrid/M
 Humfried/M
 Hummer/M
-Humphrey
-Humvee
+Humphrey/M
+Humvee/M
 Hun/SM
 Hunfredo/M
-Hung
+Hung/M
 Hungarian/SM
 Hungary/M
 Hunspell/M
-Hunt/R
+Hunt/MR
 Hunter/M
 Huntington/M
 Huntlee/M
 Huntley/M
-Huntsville
+Huntsville/M
 Hurlee/M
 Hurleigh/M
 Hurley/M
-Huron
+Huron/M
 Hurst/M
-Hus
+Hus/M
 Husein/M
-Hussein
-Husserl
-Hussite
-Huston
-Hutchinson
+Hussein/M
+Husserl/M
+Hussite/M
+Huston/M
+Hutchinson/M
 Hutton/M
-Hutu
+Hutu/M
 Huxley/M
-Huygens
+Huygens/M
 Hy/M
 Hyacinth/M
 Hyacintha/M
@@ -7190,8 +7267,8 @@
 Hyacinthie/M
 Hyades/M
 Hyatt/M
-Hyde
-Hyderabad
+Hyde/M
+Hyderabad/M
 Hydra/M
 Hyman/M
 Hymen/M
@@ -7211,7 +7288,10 @@
 ICC
 ICU
 ID/SM
+IDE
 IE
+IED
+IEEE
 IKEA/M
 IL
 IMDb/M
@@ -7225,16 +7305,20 @@
 INRI
 INS
 IOU/M
+IP
 IPA
 IPO/MS
 IQ/M
 IRA/SM
+IRC
 IRS/M
 ISBN
-ISO
+ISO/M
+ISP
 IT
 IUD
 IV/SM
+IVF
 Ia
 Iaccoca/M
 Iago/M
@@ -7242,14 +7326,14 @@
 Ian/M
 Ianthe/M
 Iapetus/M
-Ibadan
+Ibadan/M
 Ibbie/M
 Ibby/M
 Iberia/M
-Iberian
-Ibiza
+Iberian/M
+Ibiza/M
 Iblis/M
-Ibo
+Ibo/M
 Ibrahim/M
 Ibsen/M
 Icahn/M
@@ -7259,7 +7343,7 @@
 Icelander/M
 Icelandic/M
 Ichabod/M
-Ida
+Ida/M
 Idaho/SM
 Idahoan/MS
 Idahoes
@@ -7269,13 +7353,13 @@
 Idell/M
 Idelle/M
 Idette/M
-Ieyasu
+Ieyasu/M
 Iggie/M
 Iggy/M
 Ignace/M
 Ignacio/M
 Ignacius/M
-Ignatius
+Ignatius/M
 Ignaz/M
 Ignazio/M
 Igor/M
@@ -7284,8 +7368,8 @@
 Ijsselmeer/M
 Ike/M
 Ikey/M
-Ikhnaton
-Ila
+Ikhnaton/M
+Ila/M
 Ilaire/M
 Ilario/M
 Ileana/M
@@ -7298,7 +7382,7 @@
 Illa/M
 Illinois/M
 Illinoisan/MS
-Illuminati
+Illuminati/M
 Ilsa/M
 Ilse/M
 Ilysa/M
@@ -7328,16 +7412,17 @@
 Indianan/SM
 Indianapolis/M
 Indianian
+Indies/M
 Indira/M
 Indochina/M
-Indochinese
+Indochinese/M
 Indonesia/M
 Indonesian/MS
-Indore
+Indore/M
 Indra/M
 Indus/M
 Indy/SM
-Ines
+Ines/M
 Inesita/M
 Inessa/M
 Inez/M
@@ -7346,7 +7431,7 @@
 Ingaborg/M
 Ingamar/M
 Ingar/M
-Inge/R
+Inge/RM
 Ingeberg/M
 Ingeborg/M
 Ingelbert/M
@@ -7358,7 +7443,7 @@
 Ingmar/M
 Ingra/M
 Ingram/M
-Ingres
+Ingres/M
 Ingrid/M
 Ingrim/M
 Ingunna/M
@@ -7369,14 +7454,15 @@
 Innocent/M
 Innsbruck
 Inonu/M
-Inquisition
+Inquisition/M
 Inst
+Instagram/M
 Instamatic/M
 Intel/M
-Intelsat
+Intelsat/M
 Internationale/M
-Internet/S
-Interpol
+Internet/SM
+Interpol/M
 Inuit/MS
 Inuktitut/M
 Invar/M
@@ -7384,7 +7470,7 @@
 Iolande/M
 Iolanthe/M
 Iona
-Ionesco
+Ionesco/M
 Ionian/MS
 Ionic/SM
 Iorgo/MS
@@ -7392,11 +7478,11 @@
 Iosep/M
 Iowa/SM
 Iowan/MS
-Iphigenia
+Iphigenia/M
 Ipswich
 Iqaluit/M
-Iqbal
-Iquitos
+Iqbal/M
+Iquitos/M
 Ir/M
 Ira/M
 Iran/M
@@ -7405,25 +7491,25 @@
 Iraqi/MS
 Ireland/M
 Irena/M
-Irene
+Irene/M
 Irina/M
-Iris
+Iris/M
 Irish/MR
 Irishman/M
-Irishmen
+Irishmen/M
 Irishwoman/M
-Irishwomen
+Irishwomen/M
 Irita/M
-Irkutsk
+Irkutsk/M
 Irma/M
 Iroquoian/SM
 Iroquois/M
-Irrawaddy
+Irrawaddy/M
 Irtish/M
 Irv/MG
 Irvin/M
-Irvine
-Irving
+Irvine/M
+Irving/M
 Irwin/M
 Irwinn/M
 Isa
@@ -7431,7 +7517,7 @@
 Isaak/M
 Isabel/M
 Isabelita/M
-Isabella
+Isabella/M
 Isabelle/M
 Isac/M
 Isacco/M
@@ -7439,14 +7525,14 @@
 Isadora/M
 Isadore/M
 Isahella/M
-Isaiah
+Isaiah/M
 Isak/M
-Iscariot
+Iscariot/M
 Iseabal/M
-Isfahan
-Isherwood
+Isfahan/M
+Isherwood/M
 Ishim/M
-Ishmael
+Ishmael/M
 Ishtar/M
 Isiah/M
 Isiahi/M
@@ -7458,20 +7544,20 @@
 Isis/M
 Islam/MS
 Islamabad/M
-Islamic
+Islamic/M
 Islamism/M
-Islamist
+Islamist/M
 Ismael/M
 Ismail/M
 Isobel/M
-Isolde
+Isolde/M
 Ispahan
 Ispell/M
 Israel/SM
 Israeli/SM
-Israelite
+Israelite/M
 Issac/M
-Issachar
+Issachar/M
 Issi/M
 Issiah/M
 Issie/M
@@ -7486,15 +7572,16 @@
 Italy/M
 Itasca/M
 Itch/M
-Ithaca
-Ithacan
-Ito
+Ithaca/M
+Ithacan/M
+Ito/M
 Iva/M
-Ivan
+Ivan/M
 Ivanhoe/M
 Ivar/M
 Ive/RSM
 Iver/M
+Ives/M
 Ivett/M
 Ivette/M
 Ivie/M
@@ -7503,15 +7590,15 @@
 Ivor/M
 Ivorian
 Ivory/M
-Ivy
+Ivy/M
 Iyar/M
 Izaak/M
 Izabel/M
 Izak/M
 Izanagi/M
 Izanami/M
-Izhevsk
-Izmir
+Izhevsk/M
+Izmir/M
 Izod/M
 Izvestia/M
 Izzy/M
@@ -7528,7 +7615,7 @@
 Jacinta/M
 Jacintha/M
 Jacinthe/M
-Jack
+Jack/M
 Jackelyn/M
 Jacki/M
 Jackie/M
@@ -7537,31 +7624,32 @@
 Jackquelin/M
 Jackqueline/M
 Jackson/M
-Jacksonian
+Jacksonian/M
 Jacksonville/M
 Jacky/M
 Jaclin/M
 Jaclyn/M
 Jacob/SM
 Jacobean/M
-Jacobi
+Jacobi/M
 Jacobin/M
 Jacobite/M
 Jacobo/M
+Jacobs/M
 Jacobson/M
-Jacquard
+Jacquard/M
 Jacquelin/M
 Jacqueline/M
 Jacquelyn/M
 Jacquelynn/M
 Jacquenetta/M
 Jacquenette/M
-Jacques
+Jacques/M
 Jacquetta/M
 Jacquette/M
 Jacqui/M
 Jacquie/M
-Jacuzzi
+Jacuzzi/M
 Jacynth/M
 Jada/M
 Jade/M
@@ -7572,10 +7660,10 @@
 Jahangir/M
 Jaime/M
 Jaimie/M
-Jain
+Jain/M
 Jaine/M
 Jainism/M
-Jaipur
+Jaipur/M
 Jakarta/M
 Jake/M
 Jakie/M
@@ -7588,8 +7676,8 @@
 Jame/SM
 Jamel/M
 James/M
-Jameson
-Jamestown
+Jameson/M
+Jamestown/M
 Jamesy/M
 Jamey/M
 Jami/M
@@ -7629,7 +7717,7 @@
 Janice/M
 Janie/M
 Janifer/M
-Janina
+Janina/M
 Janine/M
 Janis/M
 Janissary/M
@@ -7661,7 +7749,7 @@
 Jared/M
 Jarib/M
 Jarid/M
-Jarlsberg
+Jarlsberg/M
 Jarrad/M
 Jarred/M
 Jarret/M
@@ -7677,16 +7765,17 @@
 Jason/M
 Jasper/M
 Jasun/M
-Jataka
+Jataka/M
 Java/SM
 JavaScript/M
 Javanese/M
 Javier/M
-Jaxartes
-Jay
+Jaxartes/M
+Jay/M
 Jayapura/M
 Jayawardene/M
-Jaycee/S
+Jaycee/MS
+Jaycees/M
 Jaye/M
 Jayme/M
 Jaymee/M
@@ -7715,21 +7804,21 @@
 Jedediah/M
 Jedi/M
 Jedidiah/M
-Jeep
+Jeep/M
 Jeeves/M
 Jeff/M
 Jefferey/M
 Jefferson/M
-Jeffersonian
+Jeffersonian/M
 Jeffery/M
 Jeffie/M
-Jeffrey
+Jeffrey/M
 Jeffry/M
 Jeffy/M
 Jehanna/M
-Jehoshaphat
+Jehoshaphat/M
 Jehovah/M
-Jehu
+Jehu/M
 Jekyll/M
 Jelene/M
 Jemie/M
@@ -7748,10 +7837,11 @@
 Jeniffer/M
 Jenilee/M
 Jenine/M
-Jenkins
+Jenkins/M
 Jenn/MRJ
 Jenna/M
 Jennee/M
+Jenner/M
 Jennette/M
 Jenni/M
 Jennica/M
@@ -7763,7 +7853,7 @@
 Jenny/M
 Jeno/M
 Jensen/M
-Jephthah
+Jephthah/M
 Jerad/M
 Jerald/M
 Jeralee/M
@@ -7772,7 +7862,7 @@
 Jere/M
 Jereme/M
 Jeremiah/M
-Jeremiahs
+Jeremiahs/M
 Jeremias/M
 Jeremie/M
 Jeremy/M
@@ -7781,9 +7871,9 @@
 Jermain/M
 Jermaine/M
 Jermayne/M
-Jeroboam
+Jeroboam/M
 Jerold/M
-Jerome
+Jerome/M
 Jeromy/M
 Jerri/M
 Jerrie/M
@@ -7804,7 +7894,7 @@
 Jessalyn/M
 Jessamine/M
 Jessamyn/M
-Jesse
+Jesse/M
 Jessee/M
 Jesselyn/M
 Jessey/M
@@ -7814,21 +7904,21 @@
 Jessika/M
 Jessy/M
 Jesuit/MS
-Jesus
+Jesus/M
 Jeth/M
-Jethro
-Jetway
+Jethro/M
+Jetway/M
 Jew/SM
 Jewel/M
 Jewell/M
 Jewelle/M
 Jewess/MS
 Jewish/P
-Jewry
+Jewry/M
 Jezebel/SM
-Jidda
-Jilin
-Jill
+Jidda/M
+Jilin/M
+Jill/M
 Jillana/M
 Jillane/M
 Jillayne/M
@@ -7842,13 +7932,13 @@
 Jimenez/M
 Jimmie/M
 Jimmy/M
-Jinan
-Jinnah
+Jinan/M
+Jinnah/M
 Jinny/M
-Jivaro
+Jivaro/M
 Jo/MY
-Joachim
-Joan
+Joachim/M
+Joan/M
 Joana/M
 Joane/M
 Joanie/M
@@ -7861,24 +7951,25 @@
 Jobi/M
 Jobie/M
 Jobina/M
+Jobs/M
 Joby/M
 Jobye/M
 Jobyna/M
-Jocasta
+Jocasta/M
 Jocelin/M
 Joceline/M
 Jocelyn/M
 Jocelyne/M
-Jock
-Jockey
+Jock/M
+Jockey/M
 Jocko/M
 Jodee/M
 Jodi/M
 Jodie/M
 Jody/M
-Joe
+Joe/M
 Joeann/M
-Joel/Y
+Joel/YM
 Joela/M
 Joelie/M
 Joell/MN
@@ -7896,7 +7987,7 @@
 Johann/M
 Johanna/M
 Johannah/M
-Johannes
+Johannes/M
 Johannesburg/M
 John/SM
 Johna/MH
@@ -7906,8 +7997,9 @@
 Johnette/M
 Johnie/M
 Johnna/M
-Johnnie
+Johnnie/M
 Johnny/M
+Johns/M
 Johnson/M
 Johnston/M
 Johny/M
@@ -7921,22 +8013,23 @@
 Jolie/M
 Joliet
 Joline/M
-Jolson
+Jolson/M
 Joly/M
 Jolyn/M
 Jolynn/M
 Jon/M
 Jonah/M
-Jonahs
-Jonas
+Jonahs/M
+Jonas/M
 Jonathan/M
 Jonathon/M
 Jone/SM
 Jonell/M
+Jones/M
 Joni/SM
 Jonie/M
-Jonson
-Joplin
+Jonson/M
+Joplin/M
 Jordain/M
 Jordan/M
 Jordana/M
@@ -7961,33 +8054,33 @@
 Joseph/M
 Josepha/M
 Josephina/M
-Josephine
-Josephs
+Josephine/M
+Josephs/M
 Josephson/M
-Josephus
+Josephus/M
 Josey/M
-Josh
+Josh/M
 Joshia/M
 Joshua/M
 Joshuah/M
 Josi/M
-Josiah
+Josiah/M
 Josias/M
 Josie/M
 Josselyn/M
 Josue/M
 Josy/M
-Joule
+Joule/M
 Jourdain/M
 Jourdan/M
 Jove/M
-Jovian
+Jovian/M
 Joy/M
 Joya/M
 Joyan/M
 Joyann/M
-Joyce
-Joycean
+Joyce/M
+Joycean/M
 Joycelin/M
 Joye/M
 Joyner/M
@@ -7999,16 +8092,17 @@
 Juana/M
 Juanita/M
 Juarez/M
-Jubal
+Jubal/M
 Jud
-Judah
+Judaeo
+Judah/M
 Judaic
 Judaical
 Judaism/MS
 Judas/MS
 Judd/M
-Jude
-Judea
+Jude/M
+Judea/M
 Judges
 Judi/MH
 Judie/M
@@ -8016,24 +8110,25 @@
 Juditha/M
 Judon/M
 Judson/M
-Judy
+Judy/M
 Judye/M
 Juggernaut/M
 Juieta/M
 Jul
 Jule/SM
 Julee/M
+Jules/M
 Juli/M
 Julia/M
-Julian
-Juliana
+Julian/M
+Juliana/M
 Juliane/M
 Juliann/M
 Julianna/M
 Julianne/M
 Julie/M
 Julienne/M
-Juliet
+Juliet/M
 Julieta/M
 Julietta/M
 Juliette/M
@@ -8045,13 +8140,13 @@
 Julius/M
 Julliard/M
 July/SM
-Jun
+Jun/M
 June/SM
 Juneau/M
 Junette/M
 Jung/M
-Jungfrau
-Jungian
+Jungfrau/M
+Jungian/M
 Junia/M
 Junie/M
 Junina/M
@@ -8072,34 +8167,34 @@
 Justis/M
 Justus/M
 Jutland/M
-Juvenal
+Juvenal/M
 Jyoti/M
 K/SMNRGJ
 KB/M
 KC
 KFC/M
-KGB
+KGB/M
 KIA
 KKK/M
 KO/M
 KP
 KS
 KY
-Kaaba
+Kaaba/M
 Kabul/M
 Kacey/M
 Kacie/M
 Kacy/M
 Kaela/M
 Kafka/M
-Kafkaesque
-Kagoshima
+Kafkaesque/M
+Kagoshima/M
 Kahaleel/M
 Kahlil/M
 Kahlua/M
 Kai/M
 Kaia/M
-Kaifeng
+Kaifeng/M
 Kaila/M
 Kaile/M
 Kailey/M
@@ -8113,14 +8208,14 @@
 Kakalina/M
 Kala/M
 Kalahari/M
-Kalamazoo
-Kalashnikov
+Kalamazoo/M
+Kalashnikov/M
 Kalb/M
 Kale/M
 Kaleb/M
 Kaleena/M
-Kalevala
-Kalgoorlie
+Kalevala/M
+Kalgoorlie/M
 Kali/M
 Kalie/M
 Kalil/M
@@ -8131,10 +8226,10 @@
 Kalle/M
 Kalli/M
 Kally/M
-Kalmyk
+Kalmyk/M
 Kalvin/M
 Kama/M
-Kamchatka
+Kamchatka/M
 Kamehameha/M
 Kameko/M
 Kamila/M
@@ -8142,28 +8237,28 @@
 Kamillah/M
 Kampala/M
 Kampuchea/M
-Kan/S
+Kan/SM
 Kanchenjunga/M
 Kandace/M
-Kandahar
-Kandinsky
+Kandahar/M
+Kandinsky/M
 Kandy
 Kane/M
 Kania/M
 Kannada/M
-Kano
-Kanpur
+Kano/M
+Kanpur/M
 Kansan/MS
-Kansas
+Kansas/M
 Kant/M
-Kantian
+Kantian/M
 Kanya/M
-Kaohsiung
+Kaohsiung/M
 Kaposi/M
 Kara/M
 Karachi/M
-Karaganda
-Karakorum
+Karaganda/M
+Karakorum/M
 Karalee/M
 Karalynn/M
 Karamazov/M
@@ -8253,7 +8348,7 @@
 Katherine/M
 Katheryn/M
 Kathi/M
-Kathiawar
+Kathiawar/M
 Kathie/M
 Kathleen/M
 Kathlin/M
@@ -8270,9 +8365,9 @@
 Katinka/M
 Katleen/M
 Katlin/M
-Katmai
+Katmai/M
 Katmandu/M
-Katowice
+Katowice/M
 Katrina/M
 Katrine
 Katrinka/M
@@ -8287,8 +8382,8 @@
 Kaunas/M
 Kaunda/M
 Kawabata/M
-Kawasaki
-Kay
+Kawasaki/M
+Kay/M
 Kaycee/M
 Kaye/M
 Kayla/M
@@ -8302,14 +8397,14 @@
 Kazakhs
 Kazakhstan/M
 Kazan/M
-Kazantzakis
+Kazantzakis/M
 Kb/M
 Kean
 Keane/M
 Kearney/M
 Keary/M
 Keaton/M
-Keats
+Keats/M
 Keck/M
 Keefe/RM
 Keefer/M
@@ -8320,7 +8415,7 @@
 Keen/M
 Keenan/M
 Keene/M
-Keewatin
+Keewatin/M
 Keillor/M
 Keir/M
 Keisha/M
@@ -8335,25 +8430,26 @@
 Kelila/M
 Kellby/M
 Kellen/M
-Keller
+Keller/M
 Kelley/M
 Kelli/M
 Kellia/M
 Kellie/M
 Kellina/M
-Kellogg
+Kellogg/M
 Kellsie/M
-Kelly
+Kelly/M
 Kellyann/M
 Kelsey/M
 Kelsi/M
 Kelsy/M
 Kelt/SM
-Kelvin
+Kelvin/M
 Kelwin/M
-Kemerovo
+Kemerovo/M
 Kemp/M
-Kempis
+Kempis/M
+Ken/M
 Kendal/M
 Kendall/M
 Kendell/M
@@ -8373,11 +8469,11 @@
 Kenon/M
 Kent/M
 Kenton/M
-Kentuckian/SM
+Kentuckian/MS
 Kentucky/M
 Kenya/M
 Kenyan/SM
-Kenyatta
+Kenyatta/M
 Kenyon/M
 Keogh/M
 Keokuk/M
@@ -8393,14 +8489,14 @@
 Kermie/M
 Kermit/M
 Kermy/M
-Kern
-Kerouac
-Kerr
+Kern/M
+Kerouac/M
+Kerr/M
 Kerri/M
 Kerrie/M
 Kerrill/M
 Kerrin/M
-Kerry
+Kerry/M
 Kerstin/M
 Kerwin/M
 Kerwinn/M
@@ -8408,7 +8504,7 @@
 Keslie/M
 Kessia/M
 Kessiah/M
-Kettering
+Kettering/M
 Ketti/M
 Kettie/M
 Ketty/M
@@ -8417,16 +8513,16 @@
 Keven/M
 Kevin/M
 Kevina/M
-Kevlar
+Kevlar/M
 Kevon/M
 Kevorkian/M
 Kevyn/M
-Kewpie
-Key
+Kewpie/M
+Key/M
 Keynes/M
-Keynesian
-Khabarovsk
-Khachaturian
+Keynesian/M
+Khabarovsk/M
+Khachaturian/M
 Khalid/M
 Khalil/M
 Khan/M
@@ -8439,28 +8535,28 @@
 Khoisan/M
 Khomeini/M
 Khorana/M
-Khrushchev
-Khufu
+Khrushchev/M
+Khufu/M
 Khulna/M
 Khwarizmi/M
 Khyber/M
 Ki/M
 Kiah/M
 Kial/M
-Kickapoo
+Kickapoo/M
 Kidd/M
-Kiel
+Kiel/M
 Kiele/M
 Kienan/M
-Kierkegaard
+Kierkegaard/M
 Kiersten/M
 Kieth/M
 Kiev/M
 Kigali/M
 Kijiji/M
 Kikelia/M
-Kikuyu
-Kilauea
+Kikuyu/M
+Kilauea/M
 Kile/M
 Kiley/M
 Kilian/M
@@ -8473,7 +8569,7 @@
 Kimball/M
 Kimbell/M
 Kimberlee/M
-Kimberley
+Kimberley/M
 Kimberli/M
 Kimberly/M
 Kimberlyn/M
@@ -8494,7 +8590,7 @@
 Kinney/M
 Kinnie/M
 Kinny/M
-Kinsey
+Kinsey/M
 Kinshasa/M
 Kinsley/M
 Kiowa/MS
@@ -8509,7 +8605,7 @@
 Kirbee/M
 Kirbie/M
 Kirby/M
-Kirchhoff
+Kirchhoff/M
 Kirchner/M
 Kirghistan/M
 Kirghiz/M
@@ -8517,30 +8613,30 @@
 Kiri/M
 Kiribati/M
 Kirinyaga/M
-Kirk
+Kirk/M
 Kirkland/M
 Kirkpatrick/M
-Kirov
+Kirov/M
 Kirsten/M
 Kirsteni/M
 Kirsti/M
 Kirstin/M
 Kirstyn/M
-Kisangani
+Kisangani/M
 Kishinev/M
 Kislev/M
 Kissee/M
 Kissiah/M
 Kissie/M
-Kissinger
+Kissinger/M
 Kit/M
 Kitakyushu/M
-Kitchener
+Kitchener/M
 Kitti/M
 Kittie/M
 Kitts/M
 Kitty/M
-Kiwanis
+Kiwanis/M
 Kizzee/M
 Kizzie/M
 Klan/M
@@ -8549,34 +8645,34 @@
 Klarika/M
 Klarrisa/M
 Klaus/M
-Klee
+Klee/M
 Kleenex/MS
 Klein/M
 Klemens/M
 Klement/M
 Kleon/M
 Kliment/M
-Klimt
-Kline
+Klimt/M
+Kline/M
 Klingon/M
 Klondike/MS
 Kmart/M
 Knapp/M
 Knesset/M
 Kngwarreye/M
-Knickerbocker
+Knickerbocker/M
 Knievel/M
-Knight
+Knight/M
 Knopf/M
-Knossos
-Knowles
-Knox
-Knoxville
+Knossos/M
+Knowles/M
+Knox/M
+Knoxville/M
 Knudsen/M
 Knuth/M
 Knuths
-Kobe
-Koch
+Kobe/M
+Koch/M
 Kochab/M
 Kodachrome/M
 Kodak
@@ -8589,7 +8685,7 @@
 Koizumi/M
 Kojak/M
 Koln/M
-Kolyma
+Kolyma/M
 Kommunizma/M
 Kong/M
 Kongo/M
@@ -8599,6 +8695,7 @@
 Konstantine/M
 Konstanze/M
 Koo/M
+Kooker/M
 Koontz/M
 Koppel/M
 Kora/M
@@ -8622,23 +8719,23 @@
 Korry/M
 Kort/M
 Kory/M
-Korzybski
-Kosciusko
+Korzybski/M
+Kosciusko/M
 Kosovo/M
-Kossuth
-Kosygin
+Kossuth/M
+Kosygin/M
 Koufax/M
-Kowloon
+Kowloon/M
 Kr/M
 Kraft/M
 Krakatau/M
 Krakatoa/M
 Krakow/M
 Kramer/M
-Krasnodar
-Krasnoyarsk
-Krebs
-Kremlin
+Krasnodar/M
+Krasnoyarsk/M
+Krebs/M
+Kremlin/M
 Kremlinologist
 Kremlinology
 Kresge/M
@@ -8675,10 +8772,10 @@
 Kroc/M
 Kroger/M
 Kronecker/M
-Kropotkin
-Kruger
-Krugerrand
-Krupp
+Kropotkin/M
+Kruger/M
+Krugerrand/M
+Krupp/M
 Krysta/M
 Krystal/M
 Krystalle/M
@@ -8687,21 +8784,21 @@
 Kshatriya/M
 Kuala/M
 Kublai/M
-Kubrick
+Kubrick/M
 Kuhn/M
-Kuibyshev
+Kuibyshev/M
 Kulthumm/M
-Kunming
-Kuomintang
-Kurd
+Kunming/M
+Kuomintang/M
+Kurd/M
 Kurdish/M
-Kurdistan
+Kurdistan/M
 Kurile
-Kurosawa
+Kurosawa/M
 Kurt/M
 Kurtis/M
 Kusch/M
-Kutuzov
+Kutuzov/M
 Kuwait/M
 Kuwaiti/SM
 Kuznets/M
@@ -8709,10 +8806,10 @@
 Kwakiutl/M
 Kwan/M
 Kwangchow/M
-Kwangju
+Kwangju/M
 Kwanza/MS
 Kwanzaa/MS
-Ky/H
+Ky/MH
 Kyla/M
 Kyle/M
 Kylen/M
@@ -8722,13 +8819,13 @@
 Kym/M
 Kynthia/M
 Kyoto/M
-Kyrgyzstan
+Kyrgyzstan/M
 Kyrstin/M
 Kyushu/M
-L'Amour
+L'Amour/M
 L'Enfant
-L'Oreal
-L'Ouverture
+L'Oreal/M
+L'Ouverture/M
 L/MN
 LA
 LAN/M
@@ -8739,6 +8836,8 @@
 LDC
 LED/M
 LG/M
+LGBT
+LGBTQ
 LIFO
 LL
 LLB/M
@@ -8751,9 +8850,9 @@
 LSAT
 LSD/M
 LVN
-La/M
+La/SM
 Lab
-Laban
+Laban/M
 Labrador/SM
 Labradorean
 Labradorian
@@ -8762,37 +8861,37 @@
 Lachesis/M
 Lacie/M
 Lacy/M
-Ladoga
+Ladoga/M
 Ladonna/M
-Lady
+Lady/M
 Ladyship/MS
 Laetitia/M
-Lafayette
+Lafayette/M
 Lafitte/M
 Lagos/M
-Lagrange
-Lagrangian
-Lahore
+Lagrange/M
+Lagrangian/M
+Lahore/M
 Laina/M
 Lainey/M
 Laird/M
-Laius
+Laius/M
 Lajos/M
 Lakeisha/M
 Lakers/M
 Lakewood
 Lakisha/M
-Lakota
+Lakota/M
 Lakshmi/M
 Lalo/M
 Lamaism/SM
 Lamar/M
 Lamarck/M
-Lamaze
-Lamb
-Lambert
+Lamaze/M
+Lamb/M
+Lambert/M
 Lamborghini/M
-Lambrusco
+Lambrusco/M
 Lamentations
 Lammond/M
 Lamond/M
@@ -8800,29 +8899,30 @@
 Lana/M
 Lanae/M
 Lanai/M
-Lancashire
+Lancashire/M
 Lancaster/M
 Lance/M
 Lancelot/M
-Land
+Land/M
 Landon/M
 Landry/M
-Landsat
+Landsat/M
 Landsteiner/M
 Lane/M
 Lanette/M
 Laney/M
-Lang
+Lang/M
 Langerhans/M
-Langland
-Langley
-Langmuir
+Langland/M
+Langley/M
+Langmuir/M
 Langsdon/M
 Langston/M
 Lani/M
 Lanie/M
 Lanita/M
 Lanka/M
+Lankan/M
 Lanna/M
 Lanni/M
 Lannie/M
@@ -8831,24 +8931,25 @@
 Lanzhou/M
 Lao/SM
 Laocoon/M
+Laos/M
 Laotian/SM
-Laplace
+Laplace/M
 Lapland/MR
 Lapp/SM
 Lara/M
 Laraine/M
 Laramie/M
 Lardner/M
-Laredo
+Laredo/M
 Lari/M
 Larina/M
 Larine/M
 Larisa/M
 Larissa/M
 Lark/M
-Larousse
+Larousse/M
 Larry/M
-Lars/N
+Lars/MN
 Larsen/M
 Larson/M
 Laryssa/M
@@ -8856,7 +8957,7 @@
 Lassa/M
 Lassen/M
 Lassie/M
-Lat
+Lat/M
 Latasha/M
 Latashia/M
 Lateran/M
@@ -8872,11 +8973,12 @@
 Latrobe/M
 Latvia/M
 Latvian/MS
-Laud/R
-Laue
+Laud/MR
+Lauder/M
+Laue/M
 Laughton
 Launce/M
-Laundromat
+Laundromat/M
 Laura/M
 Lauraine/M
 Laural/M
@@ -8900,7 +9002,7 @@
 Laurie/M
 Lauritz/M
 Lauryn/M
-Laval
+Laval/M
 Lavena/M
 Lavern/M
 Laverna/M
@@ -8908,16 +9010,16 @@
 Lavina/M
 Lavinia/M
 Lavinie/M
-Lavoisier
+Lavoisier/M
 Lavonne/M
 Law
 Lawanda/M
-Lawrence
+Lawrence/M
 Lawry/M
-Lawson
+Lawson/M
 Lawton/M
 Lay/M
-Layamon
+Layamon/M
 Layla/M
 Layne/M
 Layney/M
@@ -8929,11 +9031,11 @@
 Le/SMN
 Lea/M
 Leach/M
-Leadbelly
-Leah
+Leadbelly/M
+Leah/M
 Leakey/M
 Lean/M
-Leander
+Leander/M
 Leandra/M
 Leann/M
 Leanna/M
@@ -8943,13 +9045,13 @@
 Lear/M
 Learjet/M
 Leary/M
-Leavenworth
+Leavenworth/M
 Lebanese/M
 Lebanon/M
 Lebbie/M
 Lebesgue/M
 Leblanc/M
-Leda
+Leda/M
 Lederberg/M
 Lee/M
 Leeann/M
@@ -8961,13 +9063,13 @@
 Leena/M
 Leesa/M
 Leese/M
-Leeuwenhoek
+Leeuwenhoek/M
 Leeward/M
 Left
 Lefty/M
-Legendre
+Legendre/M
 Leger/M
-Leghorn
+Leghorn/M
 Lego/M
 Legra/M
 Legree/M
@@ -8978,7 +9080,7 @@
 Leicester/SM
 Leiden/M
 Leif/M
-Leigh
+Leigh/M
 Leigha/M
 Leighton/M
 Leila/M
@@ -9006,7 +9108,7 @@
 Lenin/M
 Leningrad/M
 Leninism/M
-Leninist
+Leninist/M
 Lenka/M
 Lenna/M
 Lennard/M
@@ -9018,23 +9120,24 @@
 Lenora/M
 Lenore/M
 Lent/SMN
+Lenten/M
 Leo/SM
 Leodora/M
 Leoine/M
 Leola/M
 Leoline/M
-Leon
+Leon/M
 Leona/M
 Leonanie/M
 Leonard/M
 Leonardo/M
-Leoncavallo
+Leoncavallo/M
 Leone/M
 Leonel/M
 Leonelle/M
 Leonerd/M
 Leonhard/M
-Leonid
+Leonid/M
 Leonidas/M
 Leonie/M
 Leonor/M
@@ -9045,12 +9148,13 @@
 Leopold/M
 Leopoldo/M
 Leora/M
-Lepidus
+Lepidus/M
 Lepke/M
 Lepus/M
-Lerner
+Lerner/M
 Leroi/M
 Leroy/M
+Les/M
 Lesa/M
 Leshia/M
 Lesley/M
@@ -9058,7 +9162,7 @@
 Leslie/M
 Lesly/M
 Lesotho/M
-Lesseps
+Lesseps/M
 Lessie/M
 Lester/M
 Lestrade/M
@@ -9082,7 +9186,7 @@
 Levesque/M
 Levey/M
 Levi/SM
-Leviathan
+Leviathan/M
 Levin/M
 Levine/M
 Leviticus/M
@@ -9090,10 +9194,10 @@
 Levon/M
 Levy/M
 Lew/M
-Lewes
+Lewes/M
 Lewie/M
 Lewinsky/M
-Lewis
+Lewis/M
 Lewiss
 Lexi/SM
 Lexie/M
@@ -9120,22 +9224,23 @@
 Libbey/M
 Libbi/M
 Libbie/M
-Libby
+Libby/M
 Liberace/M
 Liberia/M
 Liberian/SM
 Libra/MS
+LibreOffice/M
 Libreville/M
 Librium/M
 Libya/M
 Libyan/SM
 Licha/M
-Lichtenstein
+Lichtenstein/M
 Lida/M
 Lidia/M
-Lie
+Lie/M
 Lieberman/M
-Liebfraumilch
+Liebfraumilch/M
 Liechtenstein/ZMR
 Liechtensteiner/M
 Lief/M
@@ -9151,14 +9256,14 @@
 Liliana/M
 Liliane/M
 Lilith/M
-Liliuokalani
+Liliuokalani/M
 Lilla/M
-Lille
+Lille/M
 Lilli/MS
 Lillian/M
 Lillie/M
 Lilliput/M
-Lilliputian/SM
+Lilliputian/MS
 Lilllie/M
 Lilly/M
 Lilongwe/M
@@ -9167,8 +9272,8 @@
 Lima/M
 Limbaugh/M
 Limbo
-Limburger
-Limoges
+Limburger/M
+Limoges/M
 Limousin/M
 Limpopo/M
 Lin/M
@@ -9176,16 +9281,16 @@
 Linc/M
 Lincoln/MS
 Lincolnshire/M
-Lind
+Lind/M
 Linda/M
-Lindbergh
+Lindbergh/M
 Lindi/M
 Lindie/M
 Lindon/M
-Lindsay
-Lindsey
+Lindsay/M
+Lindsey/M
 Lindsy/M
-Lindy
+Lindy/M
 Linea/M
 Linell/M
 Linet/M
@@ -9199,17 +9304,17 @@
 Linnet/M
 Linnie/M
 Linoel/M
-Linotype
+Linotype/M
 Linton/M
 Linus/M
-Linux/S
+Linux/MS
 Linwood/M
 Linzy/M
 Lionel/M
 Lionello/M
-Lipizzaner
-Lippi
-Lippmann
+Lipizzaner/M
+Lippi/M
+Lippmann/M
 Lipscomb/M
 Lipton/M
 Lira/M
@@ -9231,7 +9336,7 @@
 Lister/M
 Listerine/M
 Liston/M
-Liszt
+Liszt/M
 Lita/M
 Lithuania/M
 Lithuanian/MS
@@ -9242,15 +9347,15 @@
 Liva/M
 LiveJournal/M
 Liverpool/M
-Liverpudlian/MS
+Liverpudlian/SM
 Livia/M
-Livingston
-Livingstone
+Livingston/M
+Livingstone/M
 Livonia/M
 Livvie/M
 Livvy/M
 Livvyy/M
-Livy
+Livy/M
 Liz/M
 Liza/M
 Lizabeth/M
@@ -9259,36 +9364,36 @@
 Lizzie/M
 Lizzy/M
 Ljubljana/M
-Llewellyn
-Lloyd
+Llewellyn/M
+Lloyd/M
 Llywellyn/M
 Ln
 Loafer/SM
-Lobachevsky
-Lochinvar
+Lobachevsky/M
+Lochinvar/M
 Lock/M
 Locke/M
-Lockean
+Lockean/M
 Lockheed/M
 Lockwood/M
-Lodge
+Lodge/M
 Lodovico/M
 Lodz/M
 Loella/M
-Loewe
-Loewi
+Loewe/M
+Loewi/M
 Loews/M
 Logan/M
 Logitech/M
-Lohengrin
+Lohengrin/M
 Loire/M
 Lois/M
 Loise/M
 Loki/M
 Lola/M
 Loleta/M
-Lolita
-Lollard
+Lolita/M
+Lollard/M
 Lollobrigida/M
 Lolly/M
 Lombard/M
@@ -9300,7 +9405,7 @@
 London/MRZ
 Londoner/M
 Lonee/M
-Long
+Long/M
 Longfellow/M
 Longstreet/M
 Longueuil
@@ -9325,11 +9430,11 @@
 Loreen/M
 Lorelei/M
 Lorelle/M
-Loren/S
+Loren/SM
 Lorena/M
 Lorene/M
-Lorentz
-Lorenz
+Lorentz/M
+Lorenz/M
 Lorenza/M
 Lorenzo/M
 Loretta/M
@@ -9355,6 +9460,7 @@
 Lorrin/M
 Lorry/M
 Lory/M
+Los
 Lot/M
 Lothaire/M
 Lothario/SM
@@ -9367,7 +9473,7 @@
 Lou/M
 Louella/M
 Louie/M
-Louis
+Louis/M
 Louisa/M
 Louise/M
 Louisette/M
@@ -9375,15 +9481,15 @@
 Louisianan/MS
 Louisianian/MS
 Louisville/M
-Lourdes
+Lourdes/M
 Loutitia/M
 Louvre/M
 Love/M
 Lovecraft/M
-Lovelace
+Lovelace/M
 Lovell
 Lowe/M
-Lowell
+Lowell/M
 Lowenbrau/M
 Lowery/M
 Lowlands
@@ -9392,23 +9498,24 @@
 Loyang/M
 Loyd/M
 Loydie/M
-Loyola
+Loyola/M
 Lr
 Lt
 Ltd
 Lu/M
 Luanda/M
 Luann/M
-Lubavitcher
-Lubbock
-Lubumbashi
+Lubavitcher/M
+Lubbock/M
+Lubumbashi/M
 Luca/SM
 Lucais/M
+Lucas/M
 Luce/M
 Lucho/M
 Luci/MN
 Lucia/MS
-Lucian
+Lucian/M
 Luciana/M
 Luciano/M
 Lucie/M
@@ -9428,11 +9535,11 @@
 Lucius/M
 Lucknow/M
 Lucky/M
-Lucretia
-Lucretius
+Lucretia/M
+Lucretius/M
 Lucy/M
 Luddite/MS
-Ludhiana
+Ludhiana/M
 Ludovico/M
 Ludovika/M
 Ludvig/M
@@ -9440,7 +9547,7 @@
 Luella/M
 Luelle/M
 Lufthansa/M
-Luftwaffe
+Luftwaffe/M
 Luger/M
 Lugosi/M
 Luigi/M
@@ -9451,12 +9558,12 @@
 Luke/M
 Lula/M
 Lulita/M
-Lully
+Lully/M
 Lulu/M
 Lumiere/M
 Luna/M
 Lupe/M
-Lupercalia
+Lupercalia/M
 Lupus/M
 Lura/M
 Lurette/M
@@ -9478,25 +9585,25 @@
 Luxemburg/M
 Luz/M
 Luzon/M
-Lvov
+Lvov/M
 Ly/MY
 LyX/M
 Lyallpur
 Lycos/M
-Lycra
-Lycurgus
+Lycra/M
+Lycurgus/M
 Lyda/M
-Lydia
+Lydia/M
 Lydian/SM
 Lydie/M
 Lydon/M
-Lyell
+Lyell/M
 Lyle/M
-Lyly
+Lyly/M
 Lyman/M
 Lyme/M
 Lyn/M
-Lynch
+Lynch/M
 Lynda/M
 Lynde/M
 Lyndel/M
@@ -9510,7 +9617,7 @@
 Lynelle/M
 Lynett/M
 Lynette/M
-Lynn
+Lynn/M
 Lynna/M
 Lynne/M
 Lynnea/M
@@ -9521,8 +9628,9 @@
 Lynnette/M
 Lynsey/M
 Lyon/SM
+Lyons/M
 Lyra/M
-Lysenko
+Lysenko/M
 Lysistrata/M
 Lysol/M
 Lyssa/M
@@ -9539,7 +9647,7 @@
 MEGO/S
 MFA/M
 MGM/M
-MHz/M
+MHz
 MI/M
 MIA
 MIDI/M
@@ -9550,6 +9658,7 @@
 MM
 MN
 MO
+MOOC
 MP/M
 MPEG/MS
 MRI/M
@@ -9558,7 +9667,7 @@
 MST/M
 MSW
 MT/M
-MTV
+MTV/M
 MVP/M
 MW
 Maalox/M
@@ -9567,31 +9676,31 @@
 Mabelle/M
 Mable/M
 Mac
-MacArthur
+MacArthur/M
 MacBride/M
-MacDonald
+MacDonald/M
 MacLeish/M
 Macao/M
 Macau/M
-Macaulay
-Macbeth
+Macaulay/M
+Macbeth/M
 Maccabees
 Maccabeus/M
-Mace
+Mace/M
 Macedon/M
 Macedonia/M
 Macedonian/SM
-Mach
+Mach/M
 Machiavelli/M
-Machiavellian
+Machiavellian/M
 Macias/M
 Macintosh/M
 Mack/M
 Mackenzie/M
 Mackinac/M
-Mackinaw
-Macmillan
-Macon
+Mackinaw/M
+Macmillan/M
+Macon/M
 Macromedia/M
 Macumba/M
 Macy/M
@@ -9632,15 +9741,15 @@
 Maegan/M
 Maeterlinck/M
 Mafia/MS
-Mafioso
+Mafioso/M
 Mag/M
 Magda/M
 Magdaia/M
 Magdalen
-Magdalena
+Magdalena/M
 Magdalene/M
 Magellan/M
-Magellanic
+Magellanic/M
 Maggee/M
 Maggi/M
 Maggie/M
@@ -9648,11 +9757,11 @@
 Maghreb/M
 Magi
 Maginot/M
-Magnitogorsk
+Magnitogorsk/M
 Magnum
-Magog
+Magog/M
 Magoo/M
-Magritte
+Magritte/M
 Magsaysay/M
 Magus
 Magyar/SM
@@ -9663,10 +9772,10 @@
 Mahavira/M
 Mahayana/M
 Mahayanist/M
-Mahdi
+Mahdi/M
 Mahfouz/M
 Mahican/SM
-Mahler
+Mahler/M
 Mahmoud/M
 Mahmud/M
 Mahomet/M
@@ -9677,10 +9786,10 @@
 Maiga/M
 Maighdiln/M
 Maigret/M
-Mailer
-Maillol
+Mailer/M
+Maillol/M
 Maiman/M
-Maimonides
+Maimonides/M
 Maine/MZR
 Mainer/M
 Mair/M
@@ -9693,19 +9802,19 @@
 Maj
 Maje/M
 Majesty
-Major
+Major/M
 Majorca/M
-Majuro
+Majuro/M
 Makarios/M
-Maker
+Maker/M
 Mal
 Mala/M
 Malabar/M
 Malabo/M
-Malacca
-Malachi
-Malagasy
-Malamud
+Malacca/M
+Malachi/M
+Malagasy/M
+Malamud/M
 Malanie/M
 Malaprop/M
 Malawi/M
@@ -9717,24 +9826,24 @@
 Malaysia/M
 Malaysian/MS
 Malchy/M
-Malcolm
+Malcolm/M
 Maldive/MS
 Maldives/M
 Maldivian/MS
 Maldonado/M
 Male/M
 Malena/M
-Mali
+Mali/M
 Malia/M
 Malian/SM
 Malibu/M
 Malina/M
 Malinda/M
 Malinde/M
-Malinowski
+Malinowski/M
 Malissa/M
 Malissia/M
-Mallarme
+Mallarme/M
 Mallissa/M
 Mallomars/M
 Mallorie/M
@@ -9743,7 +9852,7 @@
 Malorie/M
 Malory/M
 Malplaquet/M
-Malraux
+Malraux/M
 Malta/M
 Maltese/M
 Malthus/M
@@ -9753,53 +9862,54 @@
 Malvina/M
 Malynda/M
 Mame/M
-Mameluke
-Mamet
+Mameluke/M
+Mamet/M
 Mamie/M
 Mammon/SM
 Mamore/M
 Man/M
 Managua/M
 Manama/M
-Manasseh
+Manasseh/M
 Manaus
 Manchester/M
 Manchu/SM
 Manchuria/M
-Manchurian
+Manchurian/M
 Mancini/M
 Mancunian/MS
 Manda/M
 Mandalay/M
 Mandarin/M
 Mandel/M
-Mandela
-Mandelbrot
+Mandela/M
+Mandelbrot/M
 Mandi/M
 Mandie/M
-Mandingo
+Mandingo/M
 Mandrell/M
 Mandriva/M
 Mandy/M
-Manet
+Manet/M
 Manfred/M
 Manhattan/SM
-Mani
-Manichean
+Mani/M
+Manichean/M
 Manila/SM
 Manitoba/M
 Manitoulin/M
 Manley/M
-Mann/G
+Mann/GM
 Mannheim/M
 Mannie/M
+Manning/M
 Manny/M
 Mano/M
 Manolo/M
 Manon/M
-Mansfield
+Mansfield/M
 Manson/M
-Mantegna
+Mantegna/M
 Mantle/M
 Manuel/M
 Manuela/M
@@ -9815,13 +9925,13 @@
 Mar/SMN
 Mara/M
 Marabel/M
-Maracaibo
-Marat
+Maracaibo/M
+Marat/M
 Maratha/M
 Marathi/M
 Marathon/M
-Marc
-Marceau
+Marc/M
+Marceau/M
 Marcel/M
 Marcela/M
 Marcelia/M
@@ -9838,14 +9948,14 @@
 Marchelle/M
 Marci/M
 Marcia/M
-Marciano
+Marciano/M
 Marcie/M
 Marcile/M
 Marcille/M
 Marco/MS
-Marconi
+Marconi/M
 Marcus/M
-Marcuse
+Marcuse/M
 Marcy/M
 Marduk/M
 Mareah/M
@@ -9855,14 +9965,14 @@
 Marga/M
 Margalit/M
 Margalo/M
-Margaret
+Margaret/M
 Margareta/M
 Margarete/M
 Margaretha/M
 Margarethe/M
 Margaretta/M
 Margarette/M
-Margarita
+Margarita/M
 Margarito/M
 Margaux
 Marge/M
@@ -9882,11 +9992,12 @@
 Mari/SM
 Maria/M
 Mariam/M
-Marian
+Marian/M
 Mariana/SM
+Marianas/M
 Mariann/M
 Marianna/M
-Marianne
+Marianne/M
 Mariano/M
 Maribel/M
 Maribelle/M
@@ -9911,23 +10022,24 @@
 Marilin/M
 Marillin/M
 Marilyn/M
-Marin
+Marin/M
 Marina/M
 Marine/SM
 Marinna/M
 Mario/M
 Marion/M
 Mariquilla/M
+Maris/M
 Marisa/M
 Mariska/M
 Marisol/M
 Marissa/M
 Marita/M
-Maritain
+Maritain/M
 Maritsa
 Maritza/M
 Mariupol
-Marius
+Marius/M
 Mariya/M
 Marj/M
 Marja/M
@@ -9940,14 +10052,15 @@
 Mark/SM
 Markab/M
 Marketa/M
-Markham
-Markos
-Markov
+Markham/M
+Markos/M
+Markov/M
+Marks/M
 Markus/M
 Marla/M
 Marlane/M
 Marlboro/M
-Marlborough
+Marlborough/M
 Marleah/M
 Marlee/M
 Marleen/M
@@ -9955,27 +10068,27 @@
 Marlene/M
 Marley/M
 Marlie/M
-Marlin
+Marlin/M
 Marline/M
 Marlo/M
 Marlon/M
 Marlow/M
-Marlowe
+Marlowe/M
 Marlyn/M
 Marmaduke/M
 Marmara/M
 Marna/M
-Marne
+Marne/M
 Marney/M
 Marni/M
 Marnia/M
 Marnie/M
-Maronite
+Maronite/M
 Marple/M
 Marquesas/M
-Marquette
+Marquette/M
 Marquez/M
-Marquis
+Marquis/M
 Marquita/M
 Marrakesh/M
 Marrilee/M
@@ -9986,6 +10099,7 @@
 Marsala/M
 Marseillaise/MS
 Marseille/S
+Marseilles/M
 Marsh/M
 Marsha/M
 Marshal/M
@@ -9994,19 +10108,19 @@
 Mart/MN
 Marta/M
 Martainn/M
-Martel
+Martel/M
 Martelle/M
 Marten/M
 Martguerita/M
-Martha
+Martha/M
 Marthe/M
 Marthena/M
 Marti/M
-Martial
+Martial/M
 Martian/SM
 Martica/M
 Martie/M
-Martin
+Martin/M
 Martina/M
 Martinez/M
 Martinique/M
@@ -10020,7 +10134,7 @@
 Marve/M
 Marvell/M
 Marven/M
-Marvin
+Marvin/M
 Marwin/M
 Marx/M
 Marxian
@@ -10038,6 +10152,7 @@
 Maryjo/M
 Maryl/M
 Maryland/MR
+Marylander/M
 Marylee/M
 Marylin/M
 Marylinda/M
@@ -10048,49 +10163,53 @@
 Marysa/M
 Masada/M
 Masai/M
-Masaryk
-Mascagni
-Masefield
+Masaryk/M
+Mascagni/M
+Masefield/M
 Maserati/M
 Maseru/M
 Masha/M
 Mashhad/M
 Mason/MS
-Masonic
+Masonic/M
 Masonite/M
 Mass/MS
-Massachusetts
-Massasoit
-Massenet
-Massey
+Massachusetts/M
+Massasoit/M
+Massenet/M
+Massey/M
 Massimiliano/M
 Massimo/M
 Master/S
 MasterCard/M
+Masters/M
 Mata/M
 Matelda/M
 Mateo/M
 MathML/M
 Mathe/MR
+Mather/M
 Mathew/SM
+Mathews/M
 Mathewson/M
 Mathian/M
-Mathias
+Mathias/M
 Mathilda/M
 Mathilde/M
-Mathis
+Mathis/M
 Matias/M
-Matilda
+Matilda/M
 Matilde/M
-Matisse
-Matt
+Matisse/M
+Matt/M
 Mattel/M
 Matteo/M
 Matterhorn/M
 Matthaeus/M
 Mattheus/M
 Matthew/SM
-Matthias
+Matthews/M
+Matthias/M
 Matthieu/M
 Matthiew/M
 Matthus/M
@@ -10101,65 +10220,67 @@
 Maud/M
 Maude/M
 Maudie/M
-Maugham
+Maugham/M
 Maui/M
-Maupassant
+Maupassant/M
 Maura/M
 Maure/M
 Maureen/M
 Maureene/M
 Maurene/M
-Mauriac
-Maurice
+Mauriac/M
+Maurice/M
 Mauricio/M
 Maurie/M
 Maurine/M
 Maurise/M
 Maurita/M
 Mauritania/M
-Mauritanian/MS
+Mauritanian/SM
 Mauritian/SM
 Mauritius/M
 Maurits/M
 Maurizia/M
 Maurizio/M
 Mauro/M
-Maurois
+Maurois/M
 Maury
 Mauryan/M
-Mauser
+Mauser/M
 Mavis/M
 Mavra/M
 Max/M
 Maxi/M
 Maxie/M
 Maxim
-Maximilian
+Maximilian/M
 Maximilianus/M
 Maximilien/M
 Maximo/M
 Maxine/M
-Maxwell
+Maxwell/M
 Maxy/M
 May/SMR
 Maya/SM
 Mayan/MS
 Maybelle/M
 Maye/M
-Mayfair
+Mayer/M
+Mayfair/M
 Mayflower/M
 Maynard/M
 Mayne/M
 Maynord/M
-Mayo
+Mayo/M
 Mayor/M
 Maypole
 Mayra/M
+Mays/M
 Maytag/M
 Mazama/M
-Mazarin
+Mazarin/M
 Mazatlan/M
-Mazda
+Mazda/M
 Mazola/M
 Mazzini/M
 Mb/M
@@ -10172,16 +10293,16 @@
 McCain/M
 McCall/M
 McCann/M
-McCarthy
+McCarthy/M
 McCarthyism/M
 McCartney/M
 McCarty/M
 McClain/M
-McClellan
+McClellan/M
 McClure/M
 McConnell/M
-McCormick
-McCoy
+McCormick/M
+McCoy/M
 McCray/M
 McCullough/M
 McDaniel/M
@@ -10218,24 +10339,24 @@
 McVeigh/M
 Md/M
 Me
-Mead
-Meade
-Meadows
+Mead/M
+Meade/M
+Meadows/M
 Meagan/M
 Meaghan/M
 Meany/M
 Meara/M
 Mecca/MS
 Mechelle/M
-Medan
+Medan/M
 Medea/M
-Medellin
-Media
+Medellin/M
+Media/M
 Medicaid/SM
 Medicare/SM
-Medici
-Medina
-Mediterranean/SM
+Medici/M
+Medina/M
+Mediterranean/MS
 Medline/M
 Medusa/M
 Meg/MN
@@ -10251,22 +10372,22 @@
 Meier/M
 Meighen/M
 Meiji/M
-Meir
+Meir/M
 Mejia/M
 Mekong/M
 Mel/MY
 Mela/M
 Melamie/M
 Melanesia/M
-Melanesian
+Melanesian/M
 Melania/M
 Melanie/M
 Melantha/M
 Melany/M
-Melba
+Melba/M
 Melbourne/M
-Melchior
-Melchizedek
+Melchior/M
+Melchizedek/M
 Melendez/M
 Melesa/M
 Melessa/M
@@ -10289,7 +10410,7 @@
 Mellie/M
 Mellisa/M
 Mellisent/M
-Mellon
+Mellon/M
 Melloney/M
 Melly/M
 Melodee/M
@@ -10304,24 +10425,24 @@
 Melville/M
 Melvin/M
 Melvyn/M
-Memling
+Memling/M
 Memphis/M
-Menander
+Menander/M
 Menard/M
-Mencius
-Mencken
+Mencius/M
+Mencken/M
 Mendel/M
 Mendeleev/M
-Mendelian
-Mendelssohn
+Mendelian/M
+Mendelssohn/M
 Mendez/M
 Mendie/M
 Mendocino/M
-Mendoza
+Mendoza/M
 Mendy/M
 Menelaus/M
 Menelik/M
-Menes
+Menes/M
 Mengzi
 Menkalinan/M
 Menkar/M
@@ -10329,26 +10450,26 @@
 Mennen/M
 Mennonite/MS
 Menominee/M
-Menotti
-Mensa
+Menotti/M
+Mensa/M
 Mentholatum/M
 Menuhin/M
-Menzies
-Mephistopheles
+Menzies/M
+Mephistopheles/M
 Merak/M
 Mercado/M
-Mercator
-Mercedes
+Mercator/M
+Mercedes/M
 Mercer/M
 Merci/M
-Mercia
+Mercia/M
 Mercie/M
 Merck/M
 Mercurochrome/M
 Mercury/SM
 Mercy/M
 Meredeth/M
-Meredith
+Meredith/M
 Meredithe/M
 Merell/M
 Meridel/M
@@ -10357,7 +10478,7 @@
 Merilee/M
 Merill/M
 Merilyn/M
-Merino
+Merino/M
 Meris
 Merissa/M
 Merl/M
@@ -10366,10 +10487,10 @@
 Merlin/M
 Merlina/M
 Merline/M
-Merlot
+Merlot/M
 Merna/M
 Merola/M
-Merovingian
+Merovingian/M
 Merralee/M
 Merrel/M
 Merriam/M
@@ -10387,22 +10508,22 @@
 Merry/M
 Mersey
 Merthiolate/M
-Merton
+Merton/M
 Merv/M
 Mervin/M
 Merwin/M
 Merwyn/M
 Meryl/M
-Mesa
+Mesa/M
 Mesabi/M
 Meshed/M
 Mesmer/M
-Mesolithic
+Mesolithic/M
 Mesopotamia/M
 Mesopotamian
 Mesozoic/M
 Messerschmidt/M
-Messiaen
+Messiaen/M
 Messiah/M
 Messiahs
 Messianic
@@ -10412,28 +10533,29 @@
 Metamucil/M
 Methodism/SM
 Methodist/SM
-Methuselah
-Metternich
+Methuselah/M
+Metternich/M
 Meuse/M
 Mex
-Mexicali
+Mexicali/M
 Mexican/MS
 Mexico/M
 Meyer/MS
-Meyerbeer
+Meyerbeer/M
+Meyers/M
 Mfume/M
 Mg/M
 Mgr
-MiG
+MiG/M
 Mia/M
 Miami/MS
 Miaplacidus/M
 Mic
 Micaela/M
-Micah
-Micawber
-Mich
-Michael
+Micah/M
+Micawber/M
+Mich/M
+Michael/M
 Michaela/M
 Michaelina/M
 Michaeline/M
@@ -10453,9 +10575,9 @@
 Michell/M
 Michelle/M
 Michelob/M
-Michelson
+Michelson/M
 Michigan/M
-Michigander/SM
+Michigander/MS
 Michiganite
 Mick/M
 Mickey/M
@@ -10464,17 +10586,17 @@
 Micky/M
 Micmac/SM
 Micronesia/M
-Micronesian
+Micronesian/M
 Microsoft/M
 Midas/M
-Middleton
+Middleton/M
 Mideast
 Mideastern
 Midge/M
-Midland/S
+Midland/MS
 Midway/M
 Midwest/M
-Midwestern/R
+Midwestern/MR
 Mignon/M
 Mignonne/M
 Miguel/M
@@ -10497,30 +10619,33 @@
 Mildrid/M
 Mile/SM
 Milena/M
+Miles/M
 Milford/M
 Milicent/M
 Milissent/M
 Milka/M
 Milken/M
-Mill/SR
+Mill/SMR
 Millard/M
-Millay
-Millet
+Millay/M
+Miller/M
+Millet/M
 Milli/M
 Millicent/M
 Millie/M
-Millikan
+Millikan/M
 Millisent/M
+Mills/M
 Milly/M
-Milne
+Milne/M
 Milo/M
 Milosevic/M
 Milquetoast/M
 Milt/M
-Miltiades
+Miltiades/M
 Miltie/M
-Milton
-Miltonic
+Milton/M
+Miltonic/M
 Miltown/M
 Milty/M
 Milwaukee/M
@@ -10531,13 +10656,14 @@
 Mina/M
 Minamoto/M
 Minda/M
-Mindanao
+Mindanao/M
 Mindoro/M
 Mindy/M
 Miner/M
 Minerva/M
 Minetta/M
 Minette/M
+Ming/M
 Mingus/M
 Minn
 Minna
@@ -10561,19 +10687,19 @@
 Minsky/M
 Minta/M
 Mintaka/M
-Minuit
+Minuit/M
 Minuteman/M
 Miocene/M
 Miquela/M
 Mir/M
 Mira/M
-Mirabeau
+Mirabeau/M
 Mirabel/M
 Mirabella/M
 Mirabelle/M
 Mirach/M
 Miran/M
-Miranda
+Miranda/M
 Mireielle/M
 Mireille/M
 Mirella/M
@@ -10582,20 +10708,20 @@
 Miriam/M
 Mirilla/M
 Mirna/M
-Miro
+Miro/M
 Mirzam/M
 Mischa/M
 Misha/M
-Miskito
+Miskito/M
 Miss
 Missie/M
-Mississauga
+Mississauga/M
 Mississippi/M
 Mississippian/SM
 Missouri/M
 Missourian/MS
 Missy/M
-Mistassini
+Mistassini/M
 Mister
 Misti
 Mistress
@@ -10603,7 +10729,7 @@
 Mitch/M
 Mitchael/M
 Mitchel/M
-Mitchell
+Mitchell/M
 Mitford/M
 Mithra/M
 Mithridates/M
@@ -10611,8 +10737,8 @@
 Mitterrand/M
 Mitty/M
 Mitzi/M
-Mixtec
-Mizar
+Mixtec/M
+Mizar/M
 Mk
 Mlle
 Mme/S
@@ -10626,19 +10752,19 @@
 Modesta/M
 Modestia/M
 Modestine/M
-Modesto
+Modesto/M
 Modesty/M
-Modigliani
+Modigliani/M
 Moe/M
 Moet/M
-Mogadishu
+Mogadishu/M
 Mogul/MS
 Mohacs/M
 Mohamed/M
 Mohammad/M
 Mohammed/M
 Mohammedan/SM
-Mohammedanism/MS
+Mohammedanism/SM
 Mohandas/M
 Mohandis/M
 Mohave/SM
@@ -10648,8 +10774,9 @@
 Moho/M
 Mohorovicic/M
 Moina/M
-Moira
+Moira/M
 Moise/MS
+Moises/M
 Moiseyev/M
 Moishe/M
 Mojave/SM
@@ -10658,7 +10785,7 @@
 Moldova/M
 Moldovan
 Moliere/M
-Molina
+Molina/M
 Moll/M
 Mollee/M
 Molli/M
@@ -10668,7 +10795,7 @@
 Moloch/M
 Molokai/M
 Molotov/M
-Moluccas
+Moluccas/M
 Mombasa/M
 Mommy/M
 Mon/SM
@@ -10678,10 +10805,10 @@
 Monah/M
 Mondale/M
 Monday/SM
-Mondrian
+Mondrian/M
 Monegasque/SM
 Monera/M
-Monet
+Monet/M
 Mongol/SM
 Mongolia/M
 Mongolian/SM
@@ -10691,55 +10818,55 @@
 Monika/M
 Monique/M
 Monk/M
-Monmouth
-Monongahela
+Monmouth/M
+Monongahela/M
 Monro/M
 Monroe/M
 Monrovia/M
 Monsanto/M
 Monsignor/SM
-Mont
-Montague
-Montaigne
+Mont/M
+Montague/M
+Montaigne/M
 Montana/M
 Montanan/SM
-Montcalm
+Montcalm/M
 Monte/M
-Montenegrin
+Montenegrin/M
 Montenegro/M
-Monterrey
-Montesquieu
-Montessori
-Monteverdi
+Monterrey/M
+Montesquieu/M
+Montessori/M
+Monteverdi/M
 Montevideo/M
 Montezuma/M
-Montgolfier
+Montgolfier/M
 Montgomery/M
 Monti/M
 Monticello
 Montoya/M
 Montpelier/M
-Montrachet
+Montrachet/M
 Montreal/M
 Montserrat/M
 Monty/M
-Moody
-Moog
+Moody/M
+Moog/M
 Moon/M
 Mooney/M
 Moor/SM
-Moore
+Moore/M
 Moorish/M
 Mora/M
 Morales/M
 Moran/M
-Moravia
-Moravian
+Moravia/M
+Moravian/M
 Mord/M
 Mordecai
-Mordred
+Mordred/M
 Mordy/M
-More
+More/M
 Moreen/M
 Morena/M
 Moreno/M
@@ -10759,47 +10886,47 @@
 Morita/M
 Moritz/M
 Morlee/M
-Morley
+Morley/M
 Morly/M
 Mormon/SM
 Mormonism/SM
 Morna/M
-Moro
+Moro/M
 Moroccan/SM
 Morocco/M
-Moroni
+Moroni/M
 Morpheus/M
 Morphy/M
 Morrie/M
-Morris
-Morrison
+Morris/M
+Morrison/M
 Morrow/M
 Morry/M
 Morse/M
 Mort/MN
 Morten/M
 Mortie/M
-Mortimer
+Mortimer/M
 Morton/M
 Morty/M
 Mosaic/M
 Moscow/M
 Mose/SM
-Moseley
+Moseley/M
 Moselle/M
 Moses/M
 Moshe/M
 Mosley/M
 Moss/M
-Mosul
+Mosul/M
 Motorola/M
 Motown/M
 Motrin/M
-Mott
-Mount
-Mountbatten
+Mott/M
+Mount/M
+Mountbatten/M
 Mountie/MS
-Moussorgsky
+Moussorgsky/M
 Mouthe/M
 Mouton/M
 Mowgli/M
@@ -10825,9 +10952,9 @@
 Mufinella/M
 Mugabe/M
 Muhammad/M
-Muhammadan/SM
+Muhammadan/MS
 Muhammadanism/SM
-Muir
+Muir/M
 Muire/M
 Mujib/M
 Mulder/M
@@ -10835,38 +10962,38 @@
 Muller/M
 Mulligan/M
 Mullikan/M
-Mullins
+Mullins/M
 Mulroney/M
-Multan
+Multan/M
 Multics/S
 Mumbai/M
-Mumford
-Munch
+Mumford/M
+Munch/M
 Munchhausen/M
 Munich/M
 Munmro/M
 Munoz/M
-Munro
+Munro/M
 Munroe/M
-Munster
+Munster/M
 Muppet/M
 Murasaki/M
-Murat
+Murat/M
 Murchison/M
 Murcia
-Murdoch
+Murdoch/M
 Murdock/M
 Mureil/M
 Murial/M
 Muriel/M
 Murielle/M
-Murillo
+Murillo/M
 Murine/M
-Murmansk
-Murphy
+Murmansk/M
+Murphy/M
 Murray/M
 Murrow/M
-Murrumbidgee
+Murrumbidgee/M
 Murry/M
 Murvyn/M
 Muscat/M
@@ -10878,9 +11005,9 @@
 Muskogee/M
 Muslim/MS
 Mussolini/M
-Mussorgsky
+Mussorgsky/M
 Mutsuhito/M
-Muzak
+Muzak/M
 My/M
 MySQL/M
 MySpace/M
@@ -10889,9 +11016,10 @@
 Myca/M
 Mycah/M
 Mycenae/M
-Mycenaean
+Mycenaean/M
 Mychal/M
 Myer/SM
+Myers/M
 Mylar/MS
 Myles/M
 Mylo/M
@@ -10904,7 +11032,7 @@
 Myrle/M
 Myrlene/M
 Myrna/M
-Myron
+Myron/M
 Myrta/M
 Myrtia/M
 Myrtice/M
@@ -10912,32 +11040,32 @@
 Myrtle/M
 Myrvyn/M
 Myrwyn/M
-Mysore
+Mysore/M
 Myst/M
 N'Djamena
 N/MD
-NAACP
-NAFTA
+NAACP/M
+NAFTA/M
 NASA/M
 NASCAR/M
 NASDAQ/M
 NATO/M
 NB
-NBA
-NBC
+NBA/M
+NBC/M
 NBS
 NC
-NCAA
+NCAA/M
 NCO
 ND
 NE/M
 NEH
 NF
 NFC
-NFL
+NFL/M
 NGO/MS
 NH
-NHL
+NHL/M
 NIH
 NIMBY
 NJ
@@ -10946,11 +11074,12 @@
 NORAD/M
 NOW
 NP
-NPR
+NPR/M
 NR
 NRA
 NRC
 NS
+NSA/M
 NSC
 NSF
 NSPR/M
@@ -10965,11 +11094,11 @@
 NZ
 Na/M
 Nabisco/M
-Nabokov
+Nabokov/M
 Nada/M
 Nadean/M
 Nadeen/M
-Nader
+Nader/M
 Nadia/M
 Nadine/M
 Nadiya/M
@@ -10977,11 +11106,11 @@
 Nady/M
 Nadya/M
 Nagasaki/M
-Nagoya
-Nagpur
-Nagy
+Nagoya/M
+Nagpur/M
+Nagy/M
 Nahuatl/MS
-Nahum
+Nahum/M
 Naipaul/M
 Nair/M
 Nairobi/M
@@ -10993,15 +11122,15 @@
 Namibian/MS
 Nan/M
 Nana/M
-Nanak
+Nanak/M
 Nananne/M
 Nance/M
 Nancee/M
 Nancey/M
-Nanchang
+Nanchang/M
 Nanci/M
 Nancie/M
-Nancy
+Nancy/M
 Nanete/M
 Nanette/M
 Nani/M
@@ -11015,7 +11144,7 @@
 Nanny/M
 Nanon/M
 Nanook/M
-Nansen
+Nansen/M
 Nantes/M
 Nantucket/M
 Naoma/M
@@ -11026,7 +11155,7 @@
 Napier/M
 Naples/M
 Napoleon/MS
-Napoleonic
+Napoleonic/M
 Nappie/M
 Nappy/M
 Napster/M
@@ -11037,10 +11166,10 @@
 Narmada/M
 Narnia/M
 Narraganset
-Narragansett
+Narragansett/M
 Naruto/M
-Nash
-Nashua
+Nash/M
+Nashua/M
 Nashville/M
 Nassau/M
 Nasser/M
@@ -11058,34 +11187,36 @@
 Nataniel/M
 Natasha/M
 Natassia/M
-Natchez
+Natchez/M
 Nate/MN
 Nathalia/M
 Nathalie/M
-Nathan/S
+Nathan/SM
 Nathanael
 Nathanial/M
 Nathaniel/M
 Nathanil/M
+Nathans/M
+Nation/M
 Nationwide/M
 Natividad/M
 Nativity/M
 Natka/M
 Natty/M
 Nature
-Naugahyde
+Naugahyde/M
 Nauru/M
-Nautilus
+Nautilus/M
 Navaho/M
 Navajo/SM
 Navajoes
-Navarre
+Navarre/M
 Navarro/M
 Navratilova/M
 Navy
-Nazarene
-Nazareth
-Nazca
+Nazarene/M
+Nazareth/M
+Nazca/M
 Nazi/SM
 Naziism/SM
 Nazism/MS
@@ -11102,13 +11233,13 @@
 Nealon/M
 Nealson/M
 Nealy/M
-Neanderthal/MS
-Neapolitan
+Neanderthal/SM
+Neapolitan/M
 Neb
 Nebr
 Nebraska/M
 Nebraskan/MS
-Nebuchadnezzar
+Nebuchadnezzar/M
 Necko/M
 Ned/M
 Neda/M
@@ -11119,14 +11250,15 @@
 Neel/M
 Neely/M
 Nefen/M
-Nefertiti
+Nefertiti/M
 Negev/M
 Negress/MS
 Negritude
 Negro/MS
 Negroes
 Negroid/SM
-Nehemiah
+Negros/M
+Nehemiah/M
 Nehru/M
 Neil/SM
 Neila/M
@@ -11144,20 +11276,20 @@
 Nelly/M
 Nels/N
 Nelsen/M
-Nelson
+Nelson/M
 Nembutal/M
 Nemesis/M
-Neogene
+Neogene/M
 Neolithic
 Nepal/M
 Nepalese/M
 Nepali/MS
 Neptune/M
 Nereid/M
-Nerf
+Nerf/M
 Nerissa/M
 Nerita/M
-Nero
+Nero/M
 Neron/M
 Nert/M
 Nerta/M
@@ -11165,10 +11297,10 @@
 Nerti/M
 Nertie/M
 Nerty/M
-Neruda
+Neruda/M
 Nescafe/M
 Nessa/M
-Nesselrode
+Nesselrode/M
 Nessi/M
 Nessie/M
 Nessy/M
@@ -11176,10 +11308,11 @@
 Nester/M
 Nestle/M
 Nestor/M
-Nestorius
+Nestorius/M
 NetBSD/M
-Netherlander/MS
-Netherlands
+Netflix/M
+Netherlander/SM
+Netherlands/M
 Netscape/M
 Netta/M
 Netti/M
@@ -11187,8 +11320,8 @@
 Nettle/M
 Netty/M
 Netzahualcoyotl/M
-Nev
-Neva
+Nev/M
+Neva/M
 Nevada/M
 Nevadan/SM
 Nevadian
@@ -11202,53 +11335,56 @@
 Newark/M
 Newcastle/M
 Newfoundland/MRS
-Newman
+Newman/M
 Newport/M
 Newsvine/M
 Newsweek/M
 Newton/M
 Newtonian/M
 NexTag/M
-Nexis
+Nexis/M
 Nextel/M
 Neysa/M
 Ngaliema/M
 Nguyen/M
-Ni
+Ni/M
 Niagara/M
 Nial/M
 Niall/M
 Niamey/M
-Nibelung
-Nicaea
+Nibelung/M
+Nicaea/M
 Nicaragua/M
 Nicaraguan/SM
 Niccolo/M
 Nice/M
-Nicene
+Nicene/M
 Nichiren/M
 Nichol/SM
-Nicholas
+Nicholas/M
 Nichole/M
 Nicholle/M
-Nicholson
+Nichols/M
+Nicholson/M
 Nick/M
 Nickelodeon/M
 Nickey/M
 Nicki/M
 Nickie/M
-Nicklaus
+Nicklaus/M
 Nicko/M
 Nickola/SM
 Nickolai/M
+Nickolas/M
 Nickolaus/M
 Nicky/M
 Nico/M
 Nicobar/M
-Nicodemus
+Nicodemus/M
 Nicol/M
 Nicola/SM
 Nicolai/S
+Nicolas/M
 Nicole/M
 Nicolea/M
 Nicolette/M
@@ -11260,7 +11396,8 @@
 Niebuhr/M
 Niel/SM
 Niels/N
-Nietzsche
+Nielsen/M
+Nietzsche/M
 Nieves/M
 Nigel/M
 Niger/M
@@ -11268,12 +11405,12 @@
 Nigerian/MS
 Nigerien/M
 Nightingale/M
-Nijinsky
+Nijinsky/M
 Nikaniki/M
 Nike/M
 Niki/M
 Nikita/M
-Nikkei
+Nikkei/M
 Nikki/M
 Nikkie/M
 Niko/SM
@@ -11289,8 +11426,8 @@
 Nil/SM
 Nile/SM
 Nilson/M
-Nimitz
-Nimrod
+Nimitz/M
+Nimrod/M
 Nina/M
 Ninetta/M
 Ninette/M
@@ -11298,14 +11435,14 @@
 Ninnetta/M
 Ninnette/M
 Ninon/M
-Nintendo
-Niobe
+Nintendo/M
+Niobe/M
 Nippon/M
 Nipponese/M
 Nirenberg/M
-Nirvana
+Nirvana/M
 Nisan/M
-Nisei
+Nisei/M
 Nissa/M
 Nissan/M
 Nisse/M
@@ -11317,7 +11454,7 @@
 Niven/M
 Nixie
 Nixon/M
-Nkrumah
+Nkrumah/M
 No/M
 NoDoz/M
 Noach/M
@@ -11326,7 +11463,7 @@
 Noam/M
 Noami/M
 Nobe/M
-Nobel
+Nobel/M
 Nobelist/MS
 Nobie/M
 Noble/M
@@ -11350,7 +11487,7 @@
 Noll/M
 Nollie/M
 Nolly/M
-Nome
+Nome/M
 Nomi/M
 Nona/M
 Nonah/M
@@ -11373,22 +11510,23 @@
 Noriega/M
 Norina/M
 Norine/M
-Norma
+Norma/M
 Norman/MS
 Normand/M
 Normandy/M
 Normie/M
 Normy/M
-Norplant
+Norplant/M
 Norri/MS
 Norrie/M
+Norris/M
 Norry/M
 Norse/M
 Norseman/M
-Norsemen
+Norsemen/M
 Nortel/M
 North/M
-Northampton
+Northampton/M
 Northeast/MS
 Northern/MR
 Northerner/M
@@ -11400,11 +11538,11 @@
 Norw
 Norway/M
 Norwegian/SM
-Norwich
+Norwich/M
 Nosferatu/M
-Nostradamus
+Nostradamus/M
 Notre
-Nottingham
+Nottingham/M
 Nouakchott/M
 Noumea/M
 Nov/M
@@ -11412,25 +11550,25 @@
 Novartis/M
 Novelia/M
 November/MS
-Novgorod
+Novgorod/M
 Novocain/MS
 Novocaine
-Novokuznetsk
+Novokuznetsk/M
 Novosibirsk/M
 Nowell/M
 Noxzema/M
 Noyce/M
 Noyes/M
 Np/M
-Nubia
-Nubian
-Nukualofa
+Nubia/M
+Nubian/M
+Nukualofa/M
 Numbers/M
 Nunavut/M
 Nunez/M
 Nunki/M
-Nuremberg
-Nureyev
+Nuremberg/M
+Nureyev/M
 NutraSweet/M
 NyQuil/M
 Nyasa/M
@@ -11438,18 +11576,18 @@
 Nye/M
 Nyerere/M
 Nyssa/M
-O'Brien
-O'Casey
-O'Connell
-O'Connor
-O'Donnell
-O'Hara
-O'Higgins
-O'Keeffe
-O'Neil
-O'Neill
-O'Rourke
-O'Toole
+O'Brien/M
+O'Casey/M
+O'Connell/M
+O'Connor/M
+O'Donnell/M
+O'Hara/M
+O'Higgins/M
+O'Keeffe/M
+O'Neil/M
+O'Neill/M
+O'Rourke/M
+O'Toole/M
 O/SM
 OAS/M
 OB
@@ -11460,7 +11598,7 @@
 OH
 OHSA/M
 OJ
-OK/SM
+OK/SMDG
 OMB/M
 ON
 OPEC/M
@@ -11474,29 +11612,30 @@
 OTOH
 Oahu/M
 Oakland/M
-Oakley
-Oates
+Oakley/M
+Oates/M
 Oaxaca/M
 Ob/MD
-Obadiah
+Obadiah/M
 Obadias/M
 Obama/M
+Obamacare
 Obed/M
 Obediah/M
 Oberlin/M
-Oberon
+Oberon/M
 Obidiah/M
 Obie
 Oby/M
-Occam
-Occident
-Occidental/SM
+Occam/M
+Occident/M
+Occidental/MS
 Oceania/M
 Oceanside
 Oceanus/M
 Ochoa/M
 Oct/M
-Octavia
+Octavia/M
 Octavian/M
 Octavio/M
 Octavius/M
@@ -11510,7 +11649,7 @@
 Odelle/M
 Oder/M
 Odessa/M
-Odets
+Odets/M
 Odetta/M
 Odette/M
 Odey/M
@@ -11524,41 +11663,41 @@
 Ody/M
 Odysseus/M
 Odyssey/M
-Oedipal
+Oedipal/M
 Oedipus/M
 Oersted/M
 Ofelia/M
 Ofella/M
-Offenbach
+Offenbach/M
 OfficeMax/M
 Ofilia/M
-Ogbomosho
+Ogbomosho/M
 Ogdan/M
 Ogden/M
 Ogdon/M
 Ogilvy/M
-Oglethorpe
+Oglethorpe/M
 Ohio/M
 Ohioan/SM
 Oise/M
 Ojibwa/SM
 Ojibway/MS
 Okayama
-Okeechobee
-Okefenokee
-Okhotsk
+Okeechobee/M
+Okefenokee/M
+Okhotsk/M
 Okinawa/M
 Okinawan
 Okla
 Oklahoma/M
-Oklahoman
-Oktoberfest
+Oklahoman/M
+Oktoberfest/M
 Ola/M
 Olaf/M
 Olag/M
 Olajuwon/M
 Olav/M
-Oldenburg
+Oldenburg/M
 Oldfield/M
 Oldsmobile/M
 Olduvai/M
@@ -11573,6 +11712,7 @@
 Olimpia/M
 Olin/M
 Olive/MR
+Oliver/M
 Olivero/M
 Olivette/M
 Olivetti/M
@@ -11582,7 +11722,7 @@
 Oliy/M
 Ollie/M
 Olly/M
-Olmec
+Olmec/M
 Olmsted/M
 Olsen/M
 Olson/M
@@ -11593,22 +11733,23 @@
 Olympia/SM
 Olympiad/MS
 Olympian/MS
-Olympic/S
+Olympic/SM
+Olympics/M
 Olympie/M
 Olympus/M
 Omaha/MS
 Oman/M
 Omani/MS
 Omar/M
-Omayyad
+Omayyad/M
 Omdurman/M
 Omero/M
 Omnipotent
 Omsk/M
-Onassis
+Onassis/M
 Ondrea/M
 Oneal/M
-Onega
+Onega/M
 Onegin/M
 Oneida/MS
 Onfre/M
@@ -11629,9 +11770,10 @@
 Opaline/M
 Opel/M
 OpenBSD/M
+OpenOffice/M
 Ophelia/M
 Ophelie/M
-Ophiuchus
+Ophiuchus/M
 Oppenheimer/M
 Oprah/M
 Ora/M
@@ -11642,7 +11784,7 @@
 Oralla/M
 Oralle/M
 Oran/M
-Orange
+Orange/M
 Oranjestad/M
 Orazio/M
 Orbadiah/M
@@ -11659,10 +11801,10 @@
 Orella/M
 Orelle/M
 Oren/M
-Oreo
-Orestes
+Oreo/M
+Orestes/M
 Oriana/M
-Orient
+Orient/M
 Oriental/MS
 Orin/M
 Orinoco/M
@@ -11677,7 +11819,7 @@
 Orlon/MS
 Orly/M
 Orpheus/M
-Orphic
+Orphic/M
 Orr/MN
 Orran/M
 Orren/M
@@ -11693,20 +11835,21 @@
 Orv/M
 Orval/M
 Orville/M
-Orwell
-Orwellian
+Orwell/M
+Orwellian/M
 Oryza/M
+Os/M
 Osage/MS
 Osaka/M
 Osbert/M
 Osborn/M
-Osborne
+Osborne/M
 Osbourn/M
 Osbourne/M
 Oscar/MS
-Osceola
+Osceola/M
 Osgood/M
-Oshawa
+Oshawa/M
 Oshkosh/M
 Osiris/M
 Oslo/M
@@ -11715,7 +11858,7 @@
 Osmund/M
 Ossie/M
 Ostrogoth/M
-Ostwald
+Ostwald/M
 Osvaldo/M
 Oswald
 Oswell/M
@@ -11730,19 +11873,20 @@
 Otis/M
 Ottawa/SM
 Ottilie/M
-Otto
-Ottoman
-Ouagadougou
+Otto/M
+Ottoman/M
+Ouagadougou/M
 Ouija/MS
-Ovid
-Owen/S
+Ovid/M
+Owen/SM
+Owens/M
 Oxford/SM
 Oxley/M
-Oxnard
+Oxnard/M
 Oxonian/M
-Oxus
+Oxus/M
 Oxycontin/M
-Oz
+Oz/M
 Ozark/MS
 Ozarks/M
 Ozymandias/M
@@ -11757,6 +11901,7 @@
 PBX
 PC/SM
 PCB
+PCMCIA
 PCP/M
 PD
 PDA/MS
@@ -11767,9 +11912,10 @@
 PET/M
 PFC
 PG
+PGP
 PIN
 PJ's
-PLO
+PLO/M
 PM/SMDG
 PMS/M
 PO
@@ -11783,7 +11929,7 @@
 PS/M
 PST/M
 PT
-PTA
+PTA/M
 PTO
 PVC/M
 PW
@@ -11804,41 +11950,41 @@
 Padang
 Paddie/M
 Paddy/M
-Paderewski
+Paderewski/M
 Padget/M
 Padgett/M
 Padilla/M
 Padraic/M
 Padraig/M
 Padriac/M
-Paganini
-Page
+Paganini/M
+Page/M
 Paglia/M
-Pahlavi
+Pahlavi/M
 Paige/M
 Pail/M
-Paine
+Paine/M
 Paiute/SM
 Pakistan/M
 Pakistani/SM
 Palau
-Palembang
+Palembang/M
 Paleocene/M
-Paleogene
-Paleolithic
+Paleogene/M
+Paleolithic/M
 Paleozoic/M
 Palermo/M
 Palestine/M
 Palestinian/SM
-Palestrina
-Paley
+Palestrina/M
+Paley/M
 Palikir/M
 Palin/MS
 Palisades/M
 Pall/M
-Palladio
+Palladio/M
 Palm/MR
-Palmerston
+Palmerston/M
 Palmolive/M
 Palmyra/M
 Paloma/M
@@ -11847,11 +11993,11 @@
 Pamela/M
 Pamelina/M
 Pamella/M
-Pamirs
+Pamirs/M
 Pammi/M
 Pammie/M
 Pammy/M
-Pampers
+Pampers/M
 Pan/M
 Panama/SM
 Panamanian/MS
@@ -11860,13 +12006,13 @@
 Pancho/M
 Pandora/M
 Pangaea/M
-Pankhurst
+Pankhurst/M
 Panmunjom/M
 Pansie/M
 Pansy/M
-Pantagruel
+Pantagruel/M
 Pantaloon/M
-Pantheon
+Pantheon/M
 Panza/M
 Paola/M
 Paolina/M
@@ -11875,34 +12021,37 @@
 Papageno/M
 Papua/M
 Paquito/M
-Paracelsus
-Paraclete
+Paracelsus/M
+Paraclete/M
 Paradise
 Paraguay/M
 Paraguayan/MS
+Paralympic/S
 Paramaribo/M
 Paramount/M
 Parana/M
 Parcheesi/M
-Pareto
+Pareto/M
 Paris/M
 Parisian/MS
-Park/SR
+Park/SMR
 Parke/M
+Parker/M
 Parkinson/M
-Parkman
-Parliament
+Parkman/M
+Parks/M
+Parliament/M
 Parmesan/MS
 Parnassus/MS
-Parnell
-Parr
-Parrish
+Parnell/M
+Parr/M
+Parrish/M
 Parrnell/M
 Parry
 Parsee/SM
 Parsi/MS
 Parsifal/M
-Parsons
+Parsons/M
 Parthenon/M
 Parthia/M
 Pasadena/M
@@ -11911,18 +12060,18 @@
 Pasquale/M
 Passion/SM
 Passover/MS
-Pasternak
+Pasternak/M
 Pasteur/M
-Pat/N
+Pat/NM
 Patagonia/M
-Patagonian
+Patagonian/M
 Pate/M
 Patel/M
 Paten/M
-Paterson
+Paterson/M
 Patience/M
 Patin/M
-Patna
+Patna/M
 Paton
 Patric/M
 Patrica/M
@@ -11936,42 +12085,44 @@
 Patsy/M
 Patten/M
 Patterson/M
-Patti
+Patti/M
 Pattie/M
 Pattin/M
-Patton
+Patton/M
 Patty/M
 Paul/GM
 Paula/M
 Paule/M
 Pauletta/M
 Paulette/M
-Pauli
+Pauli/M
 Paulie/M
 Paulina/M
-Pauline
+Pauline/M
+Pauling/M
 Paulita/M
 Paulo/M
 Pauly/M
-Pavarotti
+Pavarotti/M
 Pavel/M
 Pavia/M
 Pavla/M
 Pavlov/M
-Pavlova
-Pavlovian
+Pavlova/M
+Pavlovian/M
 Pawnee/SM
 Paxon/M
 Paxton
 PayPal/M
 Payne/M
+Paypal/M
 Payton/M
 Pb/M
 Pd/M
 Peabody/M
 Peace/M
 Peadar/M
-Peale
+Peale/M
 Pearce/M
 Pearl/M
 Pearla/M
@@ -11979,9 +12130,9 @@
 Pearlie/M
 Pearline/M
 Pearson/M
-Peary
+Peary/M
 Pebrook/M
-Pechora
+Pechora/M
 Peck/M
 Peckinpah/M
 Pecos/M
@@ -11994,7 +12145,7 @@
 Peggi/M
 Peggie/M
 Peggy/M
-Pei
+Pei/M
 Peiping/M
 Peirce/M
 Pekinese/MS
@@ -12004,18 +12155,19 @@
 Pelee/M
 Peloponnese/M
 Pembroke/M
+Pen/M
 Pena/M
 Penderecki/M
 Penelopa/M
 Penelope/M
-Penn
+Penn/M
 Penna
 Penney/M
 Penni/M
 Pennie/M
 Pennington/M
 Pennsylvania/M
-Pennsylvanian/SM
+Pennsylvanian/MS
 Penny/M
 Pennzoil/M
 Penrod/M
@@ -12027,7 +12179,7 @@
 Pentecostal/MS
 Pentecostalism
 Pentium/SM
-Peoria
+Peoria/M
 Pepe/M
 Pepi/M
 Pepillo/M
@@ -12035,19 +12187,19 @@
 Pepita/M
 Pepito/M
 Pepsi/M
-Pepys
-Pequot
+Pepys/M
+Pequot/M
 Perceval
-Percheron
-Percival
-Percy
+Percheron/M
+Percival/M
+Percy/M
 Perelman/M
 Perez/M
 Peri/M
 Peria/M
 Perice/M
-Periclean
-Pericles
+Periclean/M
+Pericles/M
 Perkin/MS
 Perl/SM
 Perla/M
@@ -12057,24 +12209,26 @@
 Permian/M
 Pernell/M
 Pernod/M
-Peron
+Peron/M
 Perot/M
 Perren/M
 Perri/M
+Perrier/M
 Perrine/M
-Perry/R
-Perseid
+Perry/RM
+Perseid/M
 Persephone/M
 Persepolis/M
 Perseus/M
-Pershing
+Pershing/M
 Persia/M
 Persian/SM
 Persis
+Perters/MN
 Perth/M
 Peru/M
 Peruvian/MS
-Peshawar
+Peshawar/M
 Pet
 Peta/M
 Petain/M
@@ -12086,7 +12240,7 @@
 Peterus/M
 Petey/M
 Petr/M
-Petra
+Petra/M
 Petrarch/M
 Petrina/M
 Petronella/M
@@ -12101,10 +12255,10 @@
 Pfc
 Pfizer/M
 PhD/M
-Phaedra
+Phaedra/M
 Phaethon/M
 Phaidra/M
-Phanerozoic
+Phanerozoic/M
 Pharaoh/M
 Pharaohs
 Pharisaic
@@ -12115,34 +12269,36 @@
 Phekda/M
 Phelia/M
 Phelps/M
-Phidias
-Phil/Y
+Phidias/M
+Phil/MY
 Philadelphia/M
 Philbert/M
 Philby/M
-Philemon
-Philip/S
+Philemon/M
+Philip/MS
 Philipa/M
 Philippa/M
 Philippe/M
-Philippians
+Philippians/M
 Philippine/SM
+Philippines/M
 Philips/M
 Philis/M
-Philistine
+Philistine/M
 Phillida/M
 Phillie/M
-Phillip/S
+Phillip/SM
 Phillipa/M
 Phillipe/M
 Phillipp/M
+Phillips/M
 Phillis/M
 Philly/M
 Philomena/M
 Phineas/M
 Phip/M
 Phipps/M
-Phobos
+Phobos/M
 Phoebe/M
 Phoenicia/M
 Phoenician/SM
@@ -12164,12 +12320,12 @@
 Piaget/M
 Pianola/M
 Picasso/M
-Piccadilly
+Piccadilly/M
 Pickering/M
-Pickett
+Pickett/M
 Pickford/M
 Pickwick/M
-Pict
+Pict/M
 Pictor
 Piedmont/M
 Pier/M
@@ -12186,19 +12342,20 @@
 Piggy/M
 Pigmy/SM
 Pike/M
-Pilate/S
-Pilcomayo
-Pilgrim/S
+Pilate/MS
+Pilates/M
+Pilcomayo/M
+Pilgrim/SM
 Pillsbury/M
 Pinatubo/M
 Pincas/M
 Pinchas/M
 Pincus/M
 Pindar/M
-Pinkerton
+Pinkerton/M
 Pinocchio/M
 Pinochet/M
-Pinter
+Pinter/M
 Pinyin
 Piotr/M
 Pip/MR
@@ -12207,27 +12364,28 @@
 Pippin/M
 Pippo/M
 Pippy/M
-Piraeus
-Pirandello
-Pisa
+Piraeus/M
+Pirandello/M
+Pisa/M
 Pisces/M
-Pisistratus
+Pisistratus/M
 Pissaro/M
 Pitcairn/M
-Pitt/S
+Pitt/SM
 Pittman/M
+Pitts/M
 Pittsburgh/M
 Pius/M
-Pizarro
+Pizarro/M
 Pkwy
 Pl
 Place
-Planck
+Planck/M
 Plano
 Plantagenet/M
 Plasticine/M
 Plataea/M
-Plath
+Plath/M
 Plato/M
 Platonic
 Platonism/M
@@ -12240,7 +12398,7 @@
 Pleiades/M
 Pleistocene/M
 Plexiglas/MS
-Pliny
+Pliny/M
 Pliocene/SM
 Plutarch/M
 Pluto/M
@@ -12249,10 +12407,11 @@
 Po/M
 Pocahontas/M
 Pocono/SM
-Podgorica
+Poconos/M
+Podgorica/M
 Podhoretz/M
-Podunk
-Poe
+Podunk/M
+Poe/M
 Pogo/M
 Poincare/M
 Poiret/M
@@ -12260,56 +12419,57 @@
 Poisson/M
 Poitier/M
 Pokemon/M
-Pol/Y
+Pol/MY
 Poland/M
 Polanski/M
 Polaris/M
 Polaroid/MS
 Pole/SM
 Polish/M
-Politburo
+Politburo/M
 Polk/M
 Pollard/M
-Pollock
+Pollock/M
 Pollux/M
 Polly/M
-Pollyanna
+Pollyanna/M
 Polo/M
 Poltava/M
 Polyhymnia/M
 Polynesia/M
 Polynesian/MS
-Polyphemus
-Pomerania
+Polyphemus/M
+Pomerania/M
 Pomeranian/M
-Pomona
-Pompadour
+Pomona/M
+Pompadour/M
 Pompeian
 Pompeii/M
 Pompey/M
-Ponce
-Pontchartrain
+Ponce/M
+Pontchartrain/M
 Pontiac/M
-Pontianak
+Pontianak/M
 Pooh/M
 Poole/M
-Poona
-Pope
+Poona/M
+Pope/M
 Popeye/M
-Popocatepetl
+Popocatepetl/M
 Popper/M
 Poppins/M
 Poppy/M
-Popsicle
+Popsicle/M
 Porfirio/M
 Porrima/M
 Porsche/M
-Port/R
+Port/MR
+Porter/M
 Portia/M
 Portie/M
 Portland/M
 Porto/M
-Portsmouth
+Portsmouth/M
 Portugal/M
 Portuguese/M
 Porty/M
@@ -12317,32 +12477,33 @@
 Post/M
 PostScript/M
 PostgreSQL/M
-Potemkin
+Potemkin/M
 Potomac/M
-Potsdam
+Potsdam/M
 Pottawatomie/M
-Potter
+Potter/M
 Potts/M
 Poul/M
-Pound
-Poussin
+Pound/M
+Poussin/M
 Powell/M
+PowerPC/M
 PowerPoint/M
-Powers
+Powers/M
 Powhatan/M
 Poynter/M
 Poznan/M
 Pr/MN
 Prada/M
 Prado/M
-Praetorian
+Praetorian/M
 Prague/M
 Praia/M
-Prakrit
+Prakrit/M
 Pratchett/M
 Pratt/M
 Pravda/M
-Praxiteles
+Praxiteles/M
 Preakness/M
 Precambrian/M
 Preminger/M
@@ -12353,17 +12514,17 @@
 Prentice/M
 Prentiss/M
 Pres
-Presbyterian/MS
-Presbyterianism/SM
+Presbyterian/SM
+Presbyterianism/MS
 Prescott/M
 President/SM
-Presley
-Preston
+Presley/M
+Preston/M
 Pretoria/M
 Priam/M
 Pribilof/M
-Price
-Priestley
+Price/M
+Priestley/M
 Prince/M
 Princeton/M
 Principal
@@ -12379,30 +12540,30 @@
 Private
 Prix
 ProQuest/M
-Procrustean
+Procrustean/M
 Procrustes/M
 Procter/M
 Procyon/M
 Prof
 Prohibition
-Prokofiev
-Promethean
+Prokofiev/M
+Promethean/M
 Prometheus/M
 Prophets
 Proserpina/M
 Proserpine/M
-Protagoras
+Protagoras/M
 Proterozoic/M
 Protestant/MS
-Protestantism/MS
+Protestantism/SM
 Proteus/M
 Proudhon
 Proust/M
 Provencal/MS
 Provence/M
 Proverbs
-Providence/MS
-Provo
+Providence/SM
+Provo/M
 Prozac/MS
 Pru/M
 Prudence/M
@@ -12413,65 +12574,66 @@
 Pruitt/M
 Prussia/M
 Prussian/MS
-Prut
+Prut/M
 Pryce/M
 Pryor/M
-Psalms
+Psalms/M
 Psalter/MS
 Pseudomonas/MS
 Psyche/M
 Pt/M
 Ptah/M
-Ptolemaic
+Ptolemaic/M
 Ptolemy/SM
 Pu/M
 PubMed/M
-Puccini
-Puck
+Puccini/M
+Puck/M
 Puckett/M
-Puebla
-Pueblo
+Puebla/M
+Pueblo/M
+Puerto
 Puff/M
 Puget/M
 Pugh/M
-Pulaski
-Pulitzer
+Pulaski/M
+Pulitzer/M
 Pullman/MS
-Punch
+Punch/M
 Punic/M
 Punjab/M
 Punjabi/M
-Purana
-Purcell
+Purana/M
+Purcell/M
 Purdue/M
 Purgatory
 Purim/MS
 Purina/M
-Puritan
-Puritanism/SM
+Puritan/M
+Puritanism/MS
 Purus/M
 Pusan/M
-Pusey
-Pushkin
+Pusey/M
+Pushkin/M
 Pushtu/M
 Putin/M
-Putnam
+Putnam/M
 Putnem/M
 Puzo/M
 Pvt
 Pygmalion/M
 Pygmy/SM
 Pyle/M
-Pym
+Pym/M
 Pynchon/M
 Pyongyang/M
 Pyotr/M
 Pyrenees/M
 Pyrex/MS
-Pyrrhic
+Pyrrhic/M
 Pythagoras/M
-Pythagorean
-Pythias
+Pythagorean/M
+Pythias/M
 Python/M
 Q
 QB
@@ -12484,22 +12646,22 @@
 Qantas/M
 Qatar/M
 Qatari/MS
-Qingdao
+Qingdao/M
 Qiqihar/M
 Qom/M
 Quaalude/M
 Quaker/MS
 Quakerism/SM
 Quaoar/M
-Quasimodo
+Quasimodo/M
 Quaternary/M
 Quayle/M
 Que
 Quebec/M
 Quebecker
-Quebecois
+Quebecois/M
 Quechua/M
-Queen/S
+Queen/MS
 Queenie/M
 Queens/M
 Queensland/M
@@ -12515,7 +12677,7 @@
 Quincey/M
 Quincy/M
 Quinlan/M
-Quinn
+Quinn/M
 Quint/M
 Quinta/M
 Quintana/M
@@ -12525,13 +12687,13 @@
 Quintina/M
 Quinton/M
 Quintus/M
-Quirinal
+Quirinal/M
 Quisling/M
 Quito/M
-Quixote
+Quixote/M
 Quixotism/M
-Qumran
-Quonset
+Qumran/M
+Quonset/M
 Qur'an
 Qwest/M
 R/MGD
@@ -12569,14 +12731,14 @@
 Rabat/M
 Rabbi/M
 Rabelais/M
-Rabelaisian
+Rabelaisian/M
 Rabi
 Rabin/M
 Rachael/M
 Rachel/M
 Rachele/M
 Rachelle/M
-Rachmaninoff
+Rachmaninoff/M
 Racine/M
 Rad/M
 Radcliffe/M
@@ -12609,7 +12771,7 @@
 Raina/M
 Raine/MR
 Rainer/M
-Rainier
+Rainier/M
 Rakel/M
 Raleigh/M
 Ralf/M
@@ -12619,23 +12781,23 @@
 Rama/M
 Ramada/M
 Ramadan/MS
-Ramakrishna
+Ramakrishna/M
 Ramanujan/M
-Ramayana
+Ramayana/M
 Rambo/M
 Ramirez/M
 Ramiro/M
 Ramon/M
 Ramona/M
 Ramonda/M
-Ramos
-Ramsay
-Ramses
+Ramos/M
+Ramsay/M
+Ramses/M
 Ramsey/M
 Rana/M
 Rance/M
 Rancell/M
-Rand
+Rand/M
 Randa/M
 Randal/M
 Randall/M
@@ -12653,13 +12815,13 @@
 Rania/M
 Ranice/M
 Ranique/M
-Rankin
+Rankin/M
 Rankine/M
 Ranna/M
 Ransell/M
 Ransom/M
 Raoul/M
-Raphael
+Raphael/M
 Raphaela/M
 Rapunzel/M
 Raquel/M
@@ -12669,25 +12831,27 @@
 Rasia/M
 Rasla/M
 Rasmussen/M
-Rasputin
+Rasputin/M
+Rasta
 Rastaban/M
 Rastafarian/M
+Rastafarianism
 Rather/M
 Ratliff/M
 Raul/M
-Ravel
+Ravel/M
 Raven/M
 Ravi/M
 Ravid/M
 Raviv/M
-Rawalpindi
+Rawalpindi/M
 Rawley/M
-Ray
+Ray/M
 RayBan/M
 Rayburn/M
 Raychel/M
 Raye/M
-Rayleigh
+Rayleigh/M
 Raymond/M
 Raymund/M
 Raymundo/M
@@ -12707,7 +12871,7 @@
 Reagan/M
 Reaganomics/M
 Reagen/M
-Realtor
+Realtor/M
 Reamonn/M
 Reasoner/M
 Reba/M
@@ -12717,7 +12881,7 @@
 Rebecca/M
 Rebecka/M
 Rebeka/M
-Rebekah
+Rebekah/M
 Rebekkah/M
 Recife/M
 Reconstruction/M
@@ -12727,7 +12891,7 @@
 Redeemer/M
 Redford/M
 Redgrave/M
-Redmond
+Redmond/M
 Ree/DSM
 Reeba/M
 Reebok/M
@@ -12737,7 +12901,7 @@
 Reese/M
 Reeta/M
 Reeva/M
-Reeves
+Reeves/M
 Reformation/MS
 Refugio/M
 Reg/N
@@ -12747,15 +12911,16 @@
 Reggie/M
 Reggy/M
 Regina/M
-Reginae
+Reginae/M
 Reginald/M
 Reginauld/M
 Regine/M
 Regor/M
 Regulus/M
-Rehnquist
+Rehnquist/M
 Reich/M
-Reid/R
+Reichstag/M
+Reid/RM
 Reidar/M
 Reider/M
 Reiko/M
@@ -12765,16 +12930,16 @@
 Reinaldo/SM
 Reine/M
 Reinhard/M
-Reinhardt
+Reinhardt/M
 Reinhold/M
 Reinold/M
 Reinwald/M
 Rem/M
 Remanence/S
 Remanent
-Remarque
+Remarque/M
 Rembrandt/M
-Remington
+Remington/M
 Remus/M
 Remy/M
 Rena/M
@@ -12796,7 +12961,7 @@
 Renie/M
 Rennie/M
 Reno/M
-Renoir
+Renoir/M
 Rep
 Representative
 Republican/SM
@@ -12808,33 +12973,35 @@
 Reta/M
 Retha/M
 Reube/M
-Reuben
-Reunion
-Reuters
+Reuben/M
+Reunion/M
+Reuters/M
 Reuther/M
 Reuven/M
 Rev
 Reva/M
 Revelation/SM
+Revelations/M
 Revere
 Reverend/M
 Revkah/M
 Revlon/M
-Rex
+Rex/M
 Rey/M
-Reyes
+Reyes/M
 Reykjavik/M
 Reyna/M
 Reynaldo/M
 Reynard/M
 Reynold/MS
+Reynolds/M
 Rf/M
 Rh/M
-Rhea
+Rhea/M
 Rheba/M
-Rhee
+Rhee/M
 Rheingau/M
-Rhenish
+Rhenish/M
 Rheta/M
 Rhett/M
 Rhetta/M
@@ -12846,8 +13013,8 @@
 Rhineland/M
 Rhino/M
 Rhoda/M
-Rhode
-Rhodes
+Rhode/M
+Rhodes/M
 Rhodesia/M
 Rhodesian
 Rhodia/M
@@ -12860,25 +13027,26 @@
 Riane/M
 Riannon/M
 Rianon/M
-Ribbentrop
+Ribbentrop/M
 Ric/M
 Rica/M
 Ricard/M
-Ricardo
+Ricardo/M
 Ricca/M
 Riccardo/M
-Rice
+Rice/M
 Rich/M
-Richard/S
+Richard/MS
 Richardo/M
-Richardson
+Richards/M
+Richardson/M
 Richart/M
 Richelieu/M
 Richie/M
 Richmond/M
 Richmound/M
-Richter
-Richthofen
+Richter/M
+Richthofen/M
 Richy/M
 Rici/M
 Rick/M
@@ -12888,12 +13056,12 @@
 Rickey/M
 Ricki/M
 Rickie/M
-Rickover
+Rickover/M
 Ricky/M
 Rico/M
 Ricoriki/M
 Riddle/M
-Ride
+Ride/M
 Riefenstahl/M
 Riel/M
 Riemann/M
@@ -12907,9 +13075,9 @@
 Rik/M
 Riki/M
 Rikki/M
-Riley
-Rilke
-Rimbaud
+Riley/M
+Rilke/M
+Rimbaud/M
 Rina/M
 Rinaldo/M
 Ring/M
@@ -12918,25 +13086,27 @@
 Rio/SM
 Riobard/M
 Riordan/M
+Rios/M
 Rip/M
-Ripley
+Ripley/M
 Risa/M
-Risorgimento
+Risorgimento/M
 Rita/M
 Ritalin/M
 Ritchie/M
 Ritz/M
 Riva/SM
 Rivalee/M
-Rivera
-Rivers
+Rivas/M
+Rivera/M
+Rivers/M
 Riverside
 Rivi/M
 Riviera/MS
 Rivkah/M
 Rivy/M
 Riyadh/M
-Rizal
+Rizal/M
 Rn/M
 Roach/M
 Roana/M
@@ -12950,6 +13120,7 @@
 Robbi/M
 Robbie/M
 Robbin/MS
+Robbins/M
 Robby/M
 Robbyn/M
 Robena/M
@@ -12959,9 +13130,10 @@
 Robert/MS
 Roberta/M
 Roberto/M
+Roberts/M
 Robertson/M
-Robeson
-Robespierre
+Robeson/M
+Robespierre/M
 Robin/M
 Robina/M
 Robinet/M
@@ -12969,10 +13141,10 @@
 Robinetta/M
 Robinette/M
 Robinia/M
-Robinson
+Robinson/M
 Robitussin/M
 Robles/M
-Robson
+Robson/M
 Robt/M
 Roby/M
 Robyn/M
@@ -12986,14 +13158,14 @@
 Rochelle/M
 Rochester/M
 Rochette/M
-Rock
-Rockefeller
+Rock/M
+Rockefeller/M
 Rockey/M
-Rockford
+Rockford/M
 Rockie/M
 Rockies/M
 Rockne/M
-Rockwell
+Rockwell/M
 Rocky/SM
 Rod/M
 Roda/M
@@ -13007,12 +13179,13 @@
 Roderigo/M
 Rodge/MZR
 Rodger/MS
+Rodgers/M
 Rodham/M
 Rodi/M
 Rodie/M
-Rodin
+Rodin/M
 Rodina/M
-Rodney
+Rodney/M
 Rodolfo/M
 Rodolph/M
 Rodolphe/M
@@ -13025,24 +13198,28 @@
 Roentgen
 Rog/MRZ
 Rogelio/M
+Roger/MS
 Rogerio/M
+Rogers/M
 Roget/M
 Roi/SM
 Rojas/M
+Roku/M
 Rolaids/M
-Roland
+Roland/M
 Rolando/M
 Roldan/M
 Rolex/M
 Roley/M
 Rolf
 Rolfe/M
-Rolland
-Rollerblade
+Rolland/M
+Rollerblade/M
 Rollie/M
 Rollin/MS
+Rollins/M
 Rollo
-Rolodex
+Rolodex/M
 Rolph/M
 Rolvaag/M
 Rom
@@ -13052,17 +13229,18 @@
 Romanesque/MS
 Romania/M
 Romanian/MS
-Romano
+Romano/M
 Romanov/M
-Romansh
+Romans/M
+Romansh/M
 Romantic
 Romanticism
 Romany/SM
 Rome/SM
-Romeo
+Romeo/M
 Romero/M
 Rommel/M
-Romney
+Romney/M
 Romola/M
 Romona/M
 Romonda/M
@@ -13091,7 +13269,7 @@
 Rori/M
 Rorie/M
 Rorke/M
-Rorschach
+Rorschach/M
 Rory/M
 Ros
 Rosa/M
@@ -13113,7 +13291,7 @@
 Rosana/M
 Rosanna/M
 Rosanne/M
-Rosario
+Rosario/M
 Rosco/M
 Roscoe/M
 Rose/M
@@ -13135,10 +13313,10 @@
 Rosendo/M
 Rosene/M
 Rosenzweig/M
-Rosetta
+Rosetta/M
 Rosette/M
 Roshelle/M
-Rosicrucian
+Rosicrucian/M
 Rosie/M
 Rosina/M
 Rosita/M
@@ -13149,26 +13327,27 @@
 Rossie/M
 Rossini/M
 Rossy/M
-Rostand
+Rostand/M
 Rostov/M
 Rostropovich/M
 Roswell/M
 Rosy/M
 Rotarian/M
 Roth/M
-Rothko
-Rothschild
+Rothko/M
+Rothschild/M
 Rotterdam/M
 Rottweiler/M
-Rouault
+Rouault/M
 Rourke/M
 Rousseau/M
 Routledge/M
 Rouvin/M
 Rove/RM
+Rover/M
 Row/MN
 Rowan/M
-Rowe
+Rowe/M
 Rowen/M
 Rowena/M
 Rowland/M
@@ -13183,9 +13362,9 @@
 Roxine/M
 Roxy/M
 Roy/M
-Royal
+Royal/M
 Royall/M
-Royce
+Royce/M
 Roz/M
 Rozalie/M
 Rozalin/M
@@ -13204,6 +13383,7 @@
 Rubbermaid/M
 Rube/M
 Ruben/SM
+Rubens/M
 Rubetta/M
 Rubi/M
 Rubia/M
@@ -13212,7 +13392,7 @@
 Rubik/M
 Rubin/M
 Rubina/M
-Rubinstein
+Rubinstein/M
 Ruby/M
 Ruchbah/M
 Rudd/M
@@ -13220,7 +13400,7 @@
 Ruddy/M
 Rudie/M
 Rudiger/M
-Rudolf
+Rudolf/M
 Rudolfo/M
 Rudolph/M
 Rudy/M
@@ -13236,8 +13416,8 @@
 Rumanian/SM
 Rumpelstiltskin/M
 Rumsfeld/M
-Runnymede
-Runyon
+Runnymede/M
+Runyon/M
 Rupert/M
 Ruperta/M
 Ruperto/M
@@ -13246,8 +13426,8 @@
 Rush/M
 Rushdie/M
 Rushmore/M
-Ruskin
-Russ
+Ruskin/M
+Russ/M
 Russel/M
 Russell/M
 Russia/M
@@ -13263,7 +13443,7 @@
 Ruthann/M
 Ruthanne/M
 Ruthe/M
-Rutherford
+Rutherford/M
 Ruthi/M
 Ruthie/M
 Ruthy/M
@@ -13280,7 +13460,7 @@
 Ryann/M
 Rycca/M
 Rydberg/M
-Ryder
+Ryder/M
 Ryley/M
 Ryon/M
 Ryukyu/M
@@ -13301,7 +13481,7 @@
 SDI
 SE/M
 SEATO
-SEC
+SEC/M
 SF
 SGML/M
 SIDS/M
@@ -13316,6 +13496,7 @@
 SOSes
 SPCA
 SPF
+SQL
 SRO
 SS
 SSA
@@ -13326,77 +13507,78 @@
 ST
 STD
 STOL
-SUSE
+SUSE/M
 SUV
+SVN/M
 SW/M
 SWAK
 SWAT
 Saab/M
-Saar
-Saarinen
+Saar/M
+Saarinen/M
 Saatchi/M
 Saba/M
 Sabbath/M
 Sabbaths
 Sabik/M
-Sabin
+Sabin/M
 Sabina/M
 Sabine/M
 Sabra
 Sabre/M
 Sabrina/M
-Sacajawea
+Sacajawea/M
 Saccharomyces/M
 Sacco/M
 Sacha/M
 Sachs/M
 Sacramento/M
 Sada/M
-Sadat
+Sadat/M
 Saddam/M
-Sadducee
+Sadducee/M
 Sade/M
 Sadella/M
 Sadie/M
 Sadr/M
 Sadye/M
-Safavid
+Safavid/M
 Safeway/M
 Sagan/M
 Saginaw/M
 Sagittarius/MS
 Sahara/M
 Saharan/M
-Sahel
+Sahel/M
 Saidee/M
 Saigon/M
 Saiph/M
-Sakai
+Sakai/M
 Sakha/M
 Sakhalin/M
-Sakharov
+Sakharov/M
 Saki/M
-Saks
-Sal/Y
-Saladin
-Salado
+Saks/M
+Sal/MY
+Saladin/M
+Salado/M
 Salaidh/M
-Salamis
+Salamis/M
 Salas/M
 Salazar/M
 Saleem/M
 Salem/M
 Salerno/M
 Salim/M
-Salinas
-Salinger
+Salinas/M
+Salinger/M
 Salisbury/M
 Salish/M
-Salk
+Salk/M
 Sallee/M
 Salli/M
 Sallie/M
-Sallust
+Sallust/M
 Sally/M
 Sallyann/M
 Sallyanne/M
@@ -13417,10 +13599,10 @@
 Salvidor/M
 Salween/M
 Salyut/M
-Sam
+Sam/M
 Samantha/M
 Samar/M
-Samara
+Samara/M
 Samaria
 Samaritan/MS
 Samarkand/M
@@ -13431,26 +13613,27 @@
 Samoset/M
 Samoyed/M
 Sampson/M
-Samson
+Samson/M
 Samsonite/M
 Samsung/M
-Samuel
+Samuel/M
 Samuele/M
 Samuelson/M
-San
 San'a
+San/M
 Sana/M
 Sanaa/M
 Sanchez/M
 Sancho/M
 Sand/Z
-Sandburg
+Sandburg/M
 Sande/MZR
 Sander/M
+Sanders/M
 Sanderson/M
 Sandi/M
 Sandie/M
-Sandinista
+Sandinista/M
 Sandor/M
 Sandoval/M
 Sandra/M
@@ -13458,21 +13641,21 @@
 Sandy/M
 Sandye/M
 Sanford/M
-Sanforized
+Sanforized/M
 Sang/MR
-Sanhedrin
+Sanhedrin/M
 Sanka/M
 Sankara/M
 Sanskrit/M
 Sanson/M
 Sansone/M
-Santa
+Santa/M
 Santana/M
-Santayana
-Santeria
+Santayana/M
+Santeria/M
 Santiago/M
-Santos
-Sapphira
+Santos/M
+Sapphira/M
 Sapphire/M
 Sappho/M
 Sapporo/M
@@ -13495,7 +13678,7 @@
 Sarette/M
 Sargasso/M
 Sarge/M
-Sargent
+Sargent/M
 Sargon/M
 Sari/M
 Sarina/M
@@ -13503,8 +13686,8 @@
 Sarita/M
 Sarnoff/M
 Saroyan/M
-Sarto
-Sartre
+Sarto/M
+Sartre/M
 Sascha/M
 Sasha/M
 Sashenka/M
@@ -13512,8 +13695,8 @@
 Saskatchewan/M
 Saskatoon/M
 Sasquatch/MS
-Sassanian
-Sassoon
+Sassanian/M
+Sassoon/M
 Sat/M
 Satan/M
 Satanism/M
@@ -13526,17 +13709,19 @@
 Saul/M
 Sauncho/M
 Saunder/MS
+Saunders/M
 Saunderson/M
 Saundra/M
-Saussure
+Saussure/M
 Sauterne/MS
+Sauternes
 Sauveur/M
-Savage
+Savage/M
 Savannah/M
 Savina/M
 Savior/M
-Savonarola
-Savoy
+Savonarola/M
+Savoy/M
 Savoyard/M
 Saw/M
 Sawyer/M
@@ -13547,43 +13732,44 @@
 Saxony/M
 Say/MRZ
 Sayer/MS
+Sayers/M
 Sayre/MS
 Sb/M
 Sc/M
 Scan
 Scandinavia/M
-Scandinavian/SM
-Scaramouch
-Scarborough
+Scandinavian/MS
+Scaramouch/M
+Scarborough/M
 Scarface/M
-Scarlatti
+Scarlatti/M
 Scarlet/M
 Scarlett/M
 Scheat/M
 Schedar/M
 Scheherazade/M
-Schelling
+Schelling/M
 Schenectady/M
 Schiaparelli/M
 Schick/M
-Schiller
+Schiller/M
 Schindler/M
 Schlesinger/M
-Schliemann
+Schliemann/M
 Schlitz/M
-Schmidt
-Schnabel
+Schmidt/M
+Schnabel/M
 Schnauzer/M
 Schneider/M
 Schoenberg/M
-Schopenhauer
+Schopenhauer/M
 Schrieffer/M
 Schrodinger/M
 Schroeder/M
-Schubert
+Schubert/M
 Schultz/M
 Schulz/M
-Schumann
+Schumann/M
 Schumpeter/M
 Schuyler/M
 Schuylkill/M
@@ -13591,10 +13777,11 @@
 Schwarz/M
 Schwarzenegger/M
 Schwarzkopf/M
-Schweitzer
+Schweitzer/M
 Schweppes/M
 Schwinger/M
 Schwinn/M
+Scientologist/SM
 Scientology/M
 Scipio/M
 Scopes/M
@@ -13604,36 +13791,37 @@
 Scot/SM
 Scotch/MS
 Scotchman/M
-Scotchmen
+Scotchmen/M
 Scotchwoman/M
-Scotchwomen
+Scotchwomen/M
+Scotia/M
 Scotland/M
 Scotsman/M
-Scotsmen
+Scotsmen/M
 Scotswoman/M
-Scotswomen
-Scott
+Scotswomen/M
+Scott/M
 Scotti/M
 Scottie/SM
 Scottish/M
-Scottsdale
+Scottsdale/M
 Scotty
 Scout
 Scrabble/MS
-Scranton
-Scriabin
+Scranton/M
+Scriabin/M
 Scribner/M
 Scripture/SM
-Scrooge
+Scrooge/M
 Scruggs/M
-Scud
+Scud/M
 Sculley/M
 Scylla/M
-Scythia
-Scythian
+Scythia/M
+Scythian/M
 Se/MH
 SeaMonkey/M
-Seaborg
+Seaborg/M
 Seagram/M
 Seamus/M
 Sean/M
@@ -13652,6 +13840,7 @@
 Sedna/M
 See/M
 Seebeck/M
+Seeger/M
 Sega/M
 Segovia/M
 Segre/M
@@ -13668,7 +13857,7 @@
 Selena/M
 Selene/M
 Selestina/M
-Seleucid
+Seleucid/M
 Seleucus/M
 Selia/M
 Selie/M
@@ -13677,39 +13866,39 @@
 Selina/M
 Selinda/M
 Seline/M
-Seljuk
+Seljuk/M
 Selkirk/M
 Sella/M
 Selle/MZ
 Sellers/M
 Selma/M
 Selznick/M
-Semarang
+Semarang/M
 Seminole/MS
-Semiramis
+Semiramis/M
 Semite/MS
 Semitic/SM
-Semtex
+Semtex/M
 Sena/M
 Senate/MS
 Senator
-Sendai
+Sendai/M
 Seneca/MS
 Senegal/M
 Senegalese/M
-Senghor
-Senior
-Sennacherib
+Senghor/M
+Senior/M
+Sennacherib/M
 Sennett/M
 Sensurround/M
 Seoul/M
-Sephardi
+Sephardi/M
 Sephira/M
 Sepoy/M
 Sept/M
 September/MS
-Septuagint/SM
-Sequoya
+Septuagint/MS
+Sequoya/M
 Serb/SM
 Serbia/M
 Serbian/MS
@@ -13721,28 +13910,28 @@
 Sergei/M
 Sergent/M
 Sergio/M
-Serpens
+Serpens/M
 Serra/M
 Serrano/M
 Set/M
 Seth/M
-Seton
+Seton/M
 Seumas/M
-Seurat
-Seuss
+Seurat/M
+Seuss/M
 Sevastopol/M
-Severn
-Severus
+Severn/M
+Severus/M
 Seville/M
-Sevres
-Seward
-Sextans
+Sevres/M
+Seward/M
+Sextans/M
 Sexton/M
 Seychelles/M
-Seyfert
+Seyfert/M
 Seymour/M
 Sgt
-Shackleton
+Shackleton/M
 Shadow/M
 Shae/M
 Shaffer/M
@@ -13751,7 +13940,7 @@
 Shaka/M
 Shaker
 Shakespeare/M
-Shakespearean
+Shakespearean/M
 Shalna/M
 Shalne/M
 Shalom/M
@@ -13773,17 +13962,17 @@
 Shannah/M
 Shannan/M
 Shannen/M
-Shannon
+Shannon/M
 Shanon/M
 Shanta/M
 Shantee/M
-Shantung
+Shantung/M
 Shapiro/M
 Shara/M
 Sharai/M
 SharePoint/M
-Shari
-Shari'a
+Shari'a/M
+Shari/M
 Sharia/M
 Sharif/M
 Sharity/M
@@ -13793,7 +13982,7 @@
 Sharlene/M
 Sharline/M
 Sharma/M
-Sharon
+Sharon/M
 Sharona/M
 Sharp/M
 Sharpe/M
@@ -13819,7 +14008,7 @@
 Shayne/M
 Shcharansky/M
 Shea/M
-Sheba
+Sheba/M
 Shebeli/M
 Sheela/M
 Sheelagh/M
@@ -13843,7 +14032,7 @@
 Sheldon/M
 Shelia/M
 Shell/M
-Shelley
+Shelley/M
 Shelli/M
 Shellie/M
 Shelly/M
@@ -13851,10 +14040,10 @@
 Shem/M
 Shen/M
 Shena/M
-Shenandoah
+Shenandoah/M
 Shenyang/M
 Shenzhen/M
-Sheol
+Sheol/M
 Shep/M
 Shepard/M
 Shepherd/M
@@ -13865,35 +14054,36 @@
 Sheraton/M
 Sheree/M
 Sheri/M
-Sheridan
+Sheridan/M
 Sherie/M
 Sherill/M
 Sherilyn/M
 Sherline/M
-Sherlock
+Sherlock/M
 Sherlocke/M
 Sherm/M
-Sherman
+Sherman/M
 Shermie/M
 Shermy/M
-Sherpa
+Sherpa/M
 Sherri/M
 Sherrie/M
 Sherry/M
 Sherwin/M
-Sherwood
+Sherwood/M
 Sherwynd/M
 Sherye/M
 Sheryl/M
 Shetland/SM
+Shetlands/M
 Shevardnadze/M
 Shevat/M
-Shi'ite
+Shi'ite/M
 Shields/M
 Shiite/MS
-Shijiazhuang
+Shijiazhuang/M
 Shikoku/M
-Shillong
+Shillong/M
 Shiloh/M
 Shina/M
 Shinto/MS
@@ -13912,23 +14102,23 @@
 Sholom/M
 Shopzilla/M
 Short/M
-Shorthorn
+Shorthorn/M
 Shoshana/M
 Shoshanna/M
 Shoshone/SM
 Shoshoni/SM
 Shostakovitch/M
 Shrek/M
-Shreveport
-Shriner
-Shropshire
+Shreveport/M
+Shriner/M
+Shropshire/M
 Shula/M
 Shurlock/M
 Shurlocke/M
 Shurwood/M
-Shylock
+Shylock/M
 Shylockian/M
-Si
+Si/M
 Siam/M
 Siamese/M
 Sian/M
@@ -13939,14 +14129,14 @@
 Sibby/M
 Sibeal/M
 Sibel/M
-Sibelius
+Sibelius/M
 Sibella/M
 Sibelle/M
 Siberia/M
 Siberian/MS
 Sibilla/M
 Sibley/M
-Sibyl
+Sibyl/M
 Sibylla/M
 Sibylle/M
 Sicilian/SM
@@ -13954,12 +14144,12 @@
 Sid/M
 Siddhartha/M
 Sidnee/M
-Sidney
+Sidney/M
 Sidoney/M
 Sidonia/M
 Sidonnie/M
-Siegfried
-Siemens
+Siegfried/M
+Siemens/M
 Sierpinski/M
 Sierras
 Siffre/M
@@ -13968,19 +14158,19 @@
 Sigfried/M
 Sigismond/M
 Sigismondo/M
-Sigismund
+Sigismund/M
 Sigismundo/M
-Sigmund
+Sigmund/M
 Sigrid/M
-Sigurd
+Sigurd/M
 Sigvard/M
 Sihanouk/M
 Sikh/M
 Sikhism
 Sikhs
-Sikkim
-Sikkimese
-Sikorsky
+Sikkim/M
+Sikkimese/M
+Sikorsky/M
 Silas/M
 Sile/M
 Sileas/M
@@ -13999,26 +14189,28 @@
 Sim/SM
 Simenon/M
 Simeon/M
-Simmental
+Simmental/M
 Simmonds/M
 Simmons/M
-Simon
+Simon/M
 Simona/M
 Simone/M
 Simonette/M
 Simonne/M
 Simpson/SM
-Sims
+Simpsons/M
+Sims/M
 Sinai/M
-Sinatra
-Sinclair
+Sinatra/M
+Sinbad/M
+Sinclair/M
 Sinclare/M
 Sindbad/M
 Sindee/M
 Sindhi/M
 Singapore/M
 Singaporean/SM
-Singer
+Singer/M
 Singh/M
 Singleton/M
 Sinhalese/M
@@ -14034,8 +14226,8 @@
 Sissie/M
 Sissy/M
 Sister/MS
-Sistine
-Sisyphean
+Sistine/M
+Sisyphean/M
 Sisyphus/M
 Siusan/M
 Siva/M
@@ -14051,9 +14243,9 @@
 Skippie/M
 Skippy/M
 Skipton/M
-Skopje
+Skopje/M
 Sky/M
-Skye
+Skye/M
 Skylab/M
 Skylar/M
 Skyler/M
@@ -14066,11 +14258,11 @@
 Slavic/M
 Slavonic/M
 Slinky/M
-Sloan
+Sloan/M
 Sloane/M
 Slocum/M
 Slovak/SM
-Slovakia
+Slovakia/M
 Slovakian
 Slovene/SM
 Slovenia/M
@@ -14079,16 +14271,16 @@
 Sly/M
 Sm/M
 Small/M
-Smetana
+Smetana/M
 Smirnoff/M
-Smith
-Smithson
+Smith/M
+Smithson/M
 Smithsonian/M
 Smitty/M
 Smokey/M
-Smolensk
-Smollett
-Smuts
+Smolensk/M
+Smollett/M
+Smuts/M
 Smyrna
 Sn/M
 Snake/M
@@ -14098,28 +14290,28 @@
 Snickers/M
 Snider/M
 Snoopy/M
-Snow
-Snowbelt
+Snow/M
+Snowbelt/M
 Snowl/M
 Snyder/M
 Soave/M
 Soc
 Socorro/M
 Socrates/M
-Socratic
-Soddy
+Socratic/M
+Soddy/M
 Sodom/M
 Sofia/M
 Sofie/M
-Soho
+Soho/M
 Sol/MY
 Solaris/M
 Solis/M
 Sollie/M
 Solly/M
-Solomon
-Solon
-Solzhenitsyn
+Solomon/M
+Solon/M
+Solzhenitsyn/M
 Somali/SM
 Somalia/M
 Somalian/MS
@@ -14127,7 +14319,7 @@
 Somme/M
 Somoza/M
 Son/M
-Sondheim
+Sondheim/M
 Sondra/M
 Songbird/M
 Songhai/M
@@ -14144,10 +14336,10 @@
 Sonya/M
 Sophey/M
 Sophi/M
-Sophia
+Sophia/M
 Sophie/M
-Sophoclean
-Sophocles
+Sophoclean/M
+Sophocles/M
 Sophronia/M
 Sopwith/M
 Sorbonne/M
@@ -14158,20 +14350,20 @@
 Souphanouvong/M
 Sousa/M
 South/M
-Southampton
+Southampton/M
 Southeast/MS
 Southern/ZR
 Southerner/SM
-Southey
+Southey/M
 Souths
 Southwest/MS
-Soviet
+Soviet/M
 Soweto/M
 Soyinka/M
-Soyuz
+Soyuz/M
 Sp
 Spaatz/M
-Spackle
+Spackle/M
 Spahn/M
 Spain/M
 Spam/M
@@ -14180,20 +14372,21 @@
 Spaniard/SM
 Spanish/M
 Sparc
-Sparks
+Sparks/M
 Sparta/M
-Spartacus
+Spartacus/M
 Spartan/MS
 Speaker
-Spears
+Spears/M
 Speer/M
-Spence/R
-Spencerian
+Spence/RM
+Spencer/M
+Spencerian/M
 Spengler/M
-Spenglerian
+Spenglerian/M
 Spense/RM
 Spenser/M
-Spenserian
+Spenserian/M
 Sperry/M
 Sphinx/M
 Spica/M
@@ -14201,24 +14394,24 @@
 Spielberg/M
 Spike/M
 Spillane/M
-Spinoza
+Spinoza/M
 Spinx/M
 Spiro/M
 Spirograph/M
 Spitsbergen/M
 Spitz/M
-Spock
-Spokane
+Spock/M
+Spokane/M
 Springfield/M
 Springsteen/M
 Sprint/M
 Sprite/M
-Sputnik
+Sputnik/M
 Sq
-Squanto
+Squanto/M
 Squibb/M
 Sr/M
-Srinagar
+Srinagar/M
 Srivijaya/M
 St
 Sta
@@ -14232,32 +14425,32 @@
 Stael/M
 Stafani/M
 Staffard/M
-Stafford
+Stafford/M
 Staford/M
-StairMaster
+StairMaster/M
 Stalin/M
 Stalingrad/M
-Stalinist
+Stalinist/M
 Stallone/M
-Stamford
+Stamford/M
 Stan/MY
 Standford/M
-Standish
+Standish/M
 Stanfield/M
 Stanford/M
 Stanislas/M
 Stanislaus/M
-Stanislavsky
+Stanislavsky/M
 Stanislaw/M
 Stanleigh/M
-Stanley
+Stanley/M
 Stanly/M
-Stanton
+Stanton/M
 Stanwood/M
 Staples/M
 Star/M
-Starbucks
-Stark
+Starbucks/M
+Stark/M
 Starkey/M
 Starla/M
 Starlene/M
@@ -14270,7 +14463,7 @@
 Staubach/M
 Stavro/MS
 Ste
-Steadicam
+Steadicam/M
 Stearn/M
 Stearne/M
 Steele
@@ -14283,13 +14476,14 @@
 Steffen/M
 Steffi/M
 Steffie/M
-Stein/R
-Steinbeck
+Stein/MR
+Steinbeck/M
 Steinem/M
+Steiner/M
 Steinmetz/M
 Steinway/M
-Stella
-Stendhal
+Stella/M
+Stendhal/M
 Stengel/M
 Stepha/M
 Stephan/M
@@ -14298,16 +14492,17 @@
 Stephanie/M
 Stephannie/M
 Stephanus/M
-Stephen/S
+Stephen/MS
 Stephenie/M
-Stephenson
+Stephens/M
+Stephenson/M
 Stephi/M
 Stephie/M
 Stephine/M
 Sterling/M
-Stern
+Stern/M
 Sterne/M
-Sterno
+Sterno/M
 Stesha/M
 Stetson/M
 Steuben/M
@@ -14315,7 +14510,8 @@
 Steve/M
 Steven/MS
 Stevena/M
-Stevenson
+Stevens/M
+Stevenson/M
 Stevie/M
 Stevy/M
 Steward/M
@@ -14327,65 +14523,65 @@
 Stimson/M
 Stine/M
 Stinky/M
-Stirling
+Stirling/M
 Stockhausen/M
 Stockholm/M
-Stockton
+Stockton/M
 Stoddard/M
 Stoic/SM
 Stoicism/MS
 Stokes/M
 Stolichnaya/M
 Stolypin/M
-Stone
-Stonehenge
+Stone/M
+Stonehenge/M
 Stoppard/M
 Storm/M
 Stormi/M
 Stormie/M
 Stormy/M
-Stout
-Stowe
+Stout/M
+Stowe/M
 Strabo/M
 Stradivari
-Stradivarius
-Strasbourg
-Strauss
+Stradivarius/M
+Strasbourg/M
+Strauss/M
 Stravinsky/M
 Streisand/M
 Strickland/M
-Strindberg
-Stromboli
+Strindberg/M
+Stromboli/M
 Strong/M
 Stu/M
 Stuart/MS
 Studebaker/M
 StumbleUpon/M
 Stuttgart/M
-Stuyvesant
-Stygian
+Stuyvesant/M
+Stygian/M
 Styrofoam/SM
 Styron/M
 Styx/M
 Suarez/M
 Subaru/M
-Sucre
+Sucre/M
 Sucrets/M
 Sudan/M
 Sudanese/M
 Sudetenland/M
 Sudoku/M
 Sudra/M
-Sue
+Sue/M
 Suellen/M
-Suetonius
-Suez
-Suffolk
-Sufi
-Sufism
+Suetonius/M
+Suez/M
+Suffolk/M
+Sufi/M
+Sufism/M
 Suharto/M
 Sui/M
-Sukarno
+Sukarno/M
 Sukey/M
 Suki/M
 Sukkot
@@ -14402,32 +14598,33 @@
 Sumeria/M
 Sumerian/SM
 Summer/MS
+Summers/M
 Sumner/M
-Sumter
+Sumter/M
 Sun/SM
 Sunbeam/M
 Sunbelt/M
 Sunbird/M
 Sundanese/M
-Sundas
+Sundas/M
 Sunday/MS
 Sunderland/M
-Sung
+Sung/M
 Sunkist/M
 Sunni/SM
 Sunnite/MS
 Sunny/M
-Sunnyvale
+Sunnyvale/M
 Sunshine/M
 Superbowl/M
 Superfund/M
 Superglue/M
-Superior
+Superior/M
 Superman/M
 Supt
 Surabaja
-Surabaya
-Surat
+Surabaya/M
+Surat/M
 Surinam/M
 Suriname/M
 Surinamese
@@ -14436,14 +14633,14 @@
 Susana/M
 Susanetta/M
 Susann/M
-Susanna
+Susanna/M
 Susannah/M
 Susanne/M
 Susette/M
 Susi/M
 Susie/M
 Susquehanna/M
-Sussex
+Sussex/M
 Susy/M
 Sutherlan/M
 Sutherland/M
@@ -14462,11 +14659,11 @@
 Svalbard/M
 Sven/M
 Svend/M
-Svengali
+Svengali/M
 Sverdlovsk
 Swahili/SM
 Swammerdam/M
-Swanee
+Swanee/M
 Swansea/M
 Swanson/M
 Swazi/SM
@@ -14477,7 +14674,7 @@
 Swedenborg/M
 Swedish/M
 Sweeney/M
-Sweet
+Sweet/M
 Swen/M
 Swift/M
 Swinburne/M
@@ -14505,17 +14702,18 @@
 Symantec/M
 Symbian/M
 Symon/M
-Synge
+Synge/M
 Syracuse/M
 Syria/M
-Syriac
+Syriac/M
 Syrian/MS
 Szechuan/M
 Szilard/M
 Szymborska/M
-T'ang
+T'ang/M
 T/MDG
 TA
+TARP
 TB/M
 TBA
 TD
@@ -14558,7 +14756,7 @@
 Tabitha/M
 Tabor
 Tabriz/MS
-Tacitus
+Tacitus/M
 Tacoma/M
 Tad/M
 Tadd/M
@@ -14571,33 +14769,33 @@
 Tadzhik/M
 Tadzhikistan/M
 Taegu/M
-Taejon
+Taejon/M
 Taffy/M
 Taft/M
 Tagalog/SM
-Tagore
+Tagore/M
 Tagus/M
 Tahiti/M
 Tahitian/MS
-Tahoe
+Tahoe/M
 Taichung/M
 Tailor/M
 Tainan
 Taine/M
 Taipei/M
-Taiping
+Taiping/M
 Tait/M
 Taite/M
 Taiwan/M
 Taiwanese/M
-Taiyuan
+Taiyuan/M
 Tajikistan/M
 Taklamakan/M
 Talbert/M
-Talbot
+Talbot/M
 Talia/M
 Taliban/M
-Taliesin
+Taliesin/M
 Tallahassee/M
 Tallchief/M
 Talley/M
@@ -14638,17 +14836,17 @@
 Tampax/M
 Tamqrah/M
 Tamra/M
-Tamworth
+Tamworth/M
 Tan
 Tana
-Tancred
+Tancred/M
 Tandi/M
 Tandie/M
 Tandy/M
-Taney
+Taney/M
 Tanganyika/M
 Tangier/MS
-Tangshan
+Tangshan/M
 Tanhya/M
 Tani/M
 Tania/M
@@ -14675,45 +14873,45 @@
 Tarazed/M
 Tarbell/M
 Target/M
-Tarim
+Tarim/M
 Tarkenton/M
-Tarkington
+Tarkington/M
 Tarra/M
 Tarrah/M
 Tarrance/M
 Tartar/MS
-Tartary
-Tartuffe
+Tartary/M
+Tartuffe/M
 Taryn/M
 Tarzan/M
 Tasha/M
 Tashkent/M
 Tasia/M
-Tasman
+Tasman/M
 Tasmania/M
-Tasmanian
-Tass
+Tasmanian/M
+Tass/M
 Tatar/MS
-Tate
+Tate/M
 Tatiana/M
 Tatiania/M
-Tatum
+Tatum/M
 Taurus/MS
-Tawney
+Tawney/M
 Tawnya/M
 Tawsha/M
 Taylor/M
 Tb/M
 Tbilisi/M
 Tc/M
-Tchaikovsky
+Tchaikovsky/M
 Te/M
 TeX
 TeXes
 Teador/M
 Teasdale/M
 TechRepublic/M
-Technicolor
+Technicolor/M
 Technorati/M
 Tecumseh/M
 Ted/M
@@ -14733,21 +14931,22 @@
 Teheran/M
 Tehran
 TelePrompTer
-TelePrompter
-Telemachus
-Telemann
+TelePrompter/M
+Telemachus/M
+Telemann/M
 Teletype
 Tell/MR
+Teller/M
 Telugu/M
 Temp/M
 Tempe
 Templar/M
 Temple/M
 Templeton/M
-Tenn
+Tenn/M
 Tennessean/SM
 Tennessee/M
-Tennyson
+Tennyson/M
 Tenochtitlan/M
 Teodoor/M
 Teodor/M
@@ -14756,11 +14955,11 @@
 Teodoro/M
 Teotihuacan/M
 Tera/M
-Terence
+Terence/M
 Terencio/M
 Teresa/M
 Terese/M
-Tereshkova
+Tereshkova/M
 Teresina
 Teresita/M
 Teressa/M
@@ -14781,49 +14980,50 @@
 Terrill/M
 Territorial
 Territory
-Terry
+Terry/M
 Terrye/M
 Tersina/M
 Tertiary/M
 Terza/M
 Tesco/M
-Tesla
-Tess
+Tesla/M
+Tess/M
 Tessa/M
 Tessi/M
 Tessie/M
 Tessy/M
 Tet/M
 Tethys/M
-Tetons
+Tetons/M
 Teuton/MS
-Teutonic
+Teutonic/M
 Tevet/M
-Tex
+Tex/M
 Texaco/M
 Texan/MS
 Texas/M
 Th/M
 Thacher/M
-Thackeray
+Thackeray/M
 Thad/M
-Thaddeus
+Thaddeus/M
 Thaddus/M
 Thadeus/M
 Thai/SM
 Thailand/M
 Thain/M
 Thaine/M
-Thales
+Thales/M
 Thalia/M
 Thames/M
 Thane/M
 Thanh/M
-Thanksgiving/SM
-Thant
+Thanksgiving/MS
+Thant/M
 Thar/M
 Tharp/M
 Thatch/MR
+Thatcher/M
 Thatcherism
 Thaxter/M
 Thayne/M
@@ -14838,19 +15038,19 @@
 Theiler/M
 Thekla/M
 Thelma/M
-Themistocles
+Themistocles/M
 Theo/M
 Theobald/M
-Theocritus
+Theocritus/M
 Theodor/M
-Theodora
+Theodora/M
 Theodore/M
 Theodoric/M
 Theodosia/M
 Theodosius/M
-Theosophy
-Theravada
-Theresa
+Theosophy/M
+Theravada/M
+Theresa/M
 Therese/M
 Theresina/M
 Theresita/M
@@ -14860,16 +15060,16 @@
 Thermos
 Theron/M
 Theseus/M
-Thespian
+Thespian/M
 Thespis/M
-Thessalonian/S
+Thessalonian/SM
 Thessaloniki/M
 Thessaly/M
 Thia/M
 Thibaud/M
 Thibaut/M
 Thieu/M
-Thimbu
+Thimbu/M
 Thimphu
 Thom/M
 Thoma/SM
@@ -14879,9 +15079,9 @@
 Thomasina/M
 Thomasine/M
 Thomism/M
-Thomistic
-Thompson
-Thomson
+Thomistic/M
+Thompson/M
+Thomson/M
 Thor/M
 Thorazine/M
 Thoreau/M
@@ -14891,8 +15091,8 @@
 Thornie/M
 Thornton/M
 Thorny/M
-Thoroughbred
-Thorpe
+Thoroughbred/M
+Thorpe/M
 Thorstein/M
 Thorsten/M
 Thorvald/M
@@ -14904,7 +15104,7 @@
 Thule/M
 Thunderbird/M
 Thur/S
-Thurber
+Thurber/M
 Thurman/M
 Thurmond/M
 Thursday/SM
@@ -14915,12 +15115,12 @@
 Tia/M
 Tianjin/M
 Tiber/M
-Tiberius
+Tiberius/M
 Tibet/M
 Tibetan/MS
 Tibold/M
 Ticketmaster/M
-Ticonderoga
+Ticonderoga/M
 Tide/M
 Tiebold/M
 Tiebout/M
@@ -14932,7 +15132,7 @@
 Tiff/M
 Tiffani/M
 Tiffanie/M
-Tiffany
+Tiffany/M
 Tiffi/M
 Tiffie/M
 Tiffy/M
@@ -14943,11 +15143,11 @@
 Tildie/M
 Tildy/M
 Tiler/M
-Tillich
+Tillich/M
 Tillie/M
 Tillman/M
 Tilly/M
-Tilsit
+Tilsit/M
 Tim/M
 Timbuktu/M
 Timex/M
@@ -14957,12 +15157,12 @@
 Timmy/M
 Timofei/M
 Timon/M
-Timor
+Timor/M
 Timoteo/M
 Timothea/M
 Timothee/M
 Timotheus/M
-Timothy
+Timothy/M
 Timur/M
 Timurid/M
 Tina/M
@@ -14970,14 +15170,14 @@
 Tine/M
 Ting/M
 Tinkerbell/M
-Tinkertoy
+Tinkertoy/M
 Tinseltown/M
-Tintoretto
+Tintoretto/M
 Tiphani/M
 Tiphanie/M
 Tiphany/M
 Tippecanoe/M
-Tipperary
+Tipperary/M
 Tirana/M
 Tirane
 Tiresias/M
@@ -14988,12 +15188,12 @@
 Tisha/M
 Tishri/M
 Titan/SM
-Titania
-Titanic
+Titania/M
+Titanic/M
 Titian/M
 Titicaca
 Tito/SM
-Titus
+Titus/M
 Tl/M
 Tlaloc/M
 Tlingit/M
@@ -15006,31 +15206,32 @@
 Tobias/M
 Tobie/M
 Tobin/M
-Tobit
-Toby
+Tobit/M
+Toby/M
 Tobye/M
-Tocantins
-Tocqueville
+Tocantins/M
+Tocqueville/M
 Tod/M
-Todd
+Todd/M
 Toddie/M
 Toddy/M
 Togo/M
 Togolese/M
 Toiboid/M
 Toinette/M
-Tojo
+Tojo/M
 Tokay/M
-Tokugawa
+Tokugawa/M
 Tokyo/M
 Tokyoite
 Toledo/MS
-Tolkien
+Tolkien/M
 Tolstoy/M
-Toltec
+Toltec/M
 Tolyatti/M
 Tom/M
 Toma/SM
+Tomas/M
 Tomasina/M
 Tomasine/M
 Tomaso/M
@@ -15041,9 +15242,9 @@
 Tomlin/M
 Tommi/M
 Tommie/M
-Tommy
+Tommy/M
 Tompkins/M
-Tomsk
+Tomsk/M
 Tonga/M
 Tongan/MS
 Toni/M
@@ -15051,7 +15252,7 @@
 Tonie/M
 Tonnie/M
 Tonto/M
-Tony
+Tony/M
 Tonya/M
 Tonye/M
 Tootsie/M
@@ -15065,31 +15266,31 @@
 Torie/M
 Torin/M
 Toronto/M
-Torquemada
+Torquemada/M
 Torr/MX
-Torrance
+Torrance/M
 Torre/SM
 Torrence/M
-Torrens
-Torres
+Torrens/M
+Torres/M
 Torrey/M
 Torricelli/M
 Torrie/M
 Torrin/M
 Torry/M
-Tortola
-Tortuga
+Tortola/M
+Tortuga/M
 Torvalds/M
 Tory/SM
 Tosca/M
-Toscanini
+Toscanini/M
 Toshiba/M
 Toto/M
-Toulouse
+Toulouse/M
 Tova/M
 Tove/M
 Town/M
-Townes
+Townes/M
 Towney/M
 Townie/M
 Townsend/M
@@ -15105,18 +15306,19 @@
 Tracy/M
 Trafalgar/M
 Trailways/M
-Trajan
+Trajan/M
 Tran/M
-Transcaucasia
+Transcaucasia/M
 Transvaal/M
-Transylvania
+Transylvania/M
+Transylvanian/M
 Trappist/SM
 Traver/MS
 Travis/M
 Travolta/M
 Travus/M
 Treasury/SM
-Treblinka
+Treblinka/M
 Trefor/M
 Trekkie/M
 Tremain/M
@@ -15131,7 +15333,7 @@
 Tressa/M
 Trev/MR
 Trevar/M
-Trevelyan
+Trevelyan/M
 Trever/M
 Trevino/M
 Trevor/M
@@ -15140,7 +15342,7 @@
 Triassic/M
 Tricia/M
 Trident/M
-Trieste
+Trieste/M
 Trimurti/M
 Trina/M
 Trinidad/M
@@ -15148,7 +15350,7 @@
 Trinity/SM
 Trip/M
 TripAdvisor/M
-Tripitaka
+Tripitaka/M
 Tripoli/M
 Tripp/M
 Trippe/M
@@ -15164,42 +15366,43 @@
 Trixie/M
 Trixy/M
 Trobriand/M
+Troilus/M
 Trojan/MS
-Trollope
+Trollope/M
 Trondheim/M
 Tropicana/M
-Trotsky
+Trotsky/M
 Troy/M
 Troyes
 Trstram/M
 Truckee/M
 Truda/M
 Trude/M
-Trudeau
+Trudeau/M
 Trudey/M
 Trudi/M
 Trudie/M
 Trudy/M
 Trueman/M
 Truffaut/M
-Trujillo
+Trujillo/M
 Trula/M
 Trumaine/M
 Truman/M
 Trumann/M
 Trumbull/M
 Trump/M
-Truth
+Truth/M
 Tsimshian/M
 Tsingtao
 Tsiolkovsky/M
 Tsitsihar/M
 Tsongkhapa/M
 Tswana/M
-Tu
+Tu/M
 Tuamotu/M
 Tuareg/M
-Tubman
+Tubman/M
 Tuck/R
 Tucker/M
 Tuckie/M
@@ -15224,9 +15427,9 @@
 Tunisian/MS
 Tunney/M
 Tupi/M
-Tupperware
+Tupperware/M
 Tupungato/M
-Turgenev
+Turgenev/M
 Turin/M
 Turing/M
 Turk/SM
@@ -15235,8 +15438,8 @@
 Turkic/MS
 Turkish/M
 Turkmenistan/M
-Turner
-Turpin
+Turner/M
+Turpin/M
 Tuscaloosa/M
 Tuscan/M
 Tuscany/M
@@ -15245,17 +15448,18 @@
 Tuskegee/M
 Tussaud/M
 Tut/M
-Tutankhamen
-Tutsi
+Tutankhamen/M
+Tutsi/M
 Tutu/M
 Tuvalu/M
 Tuvaluan
-Twain
-Tweed
+Twain/M
+Tweed/M
 Tweedledee/M
 Tweedledum/M
 Twila/M
-Twinkies
+Twinkies/M
+Twitter/M
 Twizzlers/M
 Twp
 Twyla/M
@@ -15263,21 +15467,21 @@
 Tybalt/M
 Tybi/M
 Tybie/M
-Tycho
+Tycho/M
 Tye/M
 Tylenol/M
 Tyler/M
 Tymon/M
 Tymothy/M
 Tynan/M
-Tyndale
-Tyndall
+Tyndale/M
+Tyndall/M
 Tyne/M
-Tyre
+Tyre/M
 Tyree/M
 Tyrol/M
 Tyrolean
-Tyrone
+Tyrone/M
 Tyrus/M
 Tyson/M
 U/M
@@ -15295,15 +15499,16 @@
 UNICEF/M
 UNIX/M
 UPC
-UPI
-UPS
+UPI/M
+UPS/M
 URL/S
 URLs
 US/M
 USA/M
 USAF
+USB
 USCG
-USDA
+USDA/M
 USIA
 USMC
 USN
@@ -15314,13 +15519,13 @@
 USSR/M
 UT/M
 UV/M
-Ubangi
+Ubangi/M
 Ubiquity/M
 Ubuntu/M
-Ucayali
+Ucayali/M
 Uccello/M
 Udale/M
-Udall
+Udall/M
 Udell/M
 Ufa/M
 Uganda/M
@@ -15345,14 +15550,14 @@
 Ulrike/M
 Ulster/M
 Ultrasuede/M
-Ulyanovsk
+Ulyanovsk/M
 Ulysses/M
 Umberto/M
 Umbriel/M
 Umeko/M
 Una/M
 Underwood/M
-Ungava
+Ungava/M
 Unicode/M
 Unilever/M
 Union/SM
@@ -15363,12 +15568,13 @@
 Unitas/M
 Unix/S
 Unukalhai/M
-Upanishads
-Updike
+Upanishads/M
+Updike/M
 Upjohn/M
 Upton/M
-Ur
-Ural/S
+Ur/M
+Ural/SM
+Urals/M
 Urania/M
 Uranus/M
 Urbain/M
@@ -15376,24 +15582,24 @@
 Urbano/M
 Urbanus/M
 Urdu/M
-Urey
+Urey/M
 Uri/SM
-Uriah
-Uriel
-Uris
-Urquhart
+Uriah/M
+Uriel/M
+Uris/M
+Urquhart/M
 Ursa/M
 Ursala/M
 Ursola/M
 Urson/M
-Ursula
+Ursula/M
 Ursulina/M
-Ursuline
+Ursuline/M
 Uruguay/M
 Uruguayan/MS
-Urumqi
+Urumqi/M
 Usenet/MS
-Ustinov
+Ustinov/M
 Uta/M
 Utah/M
 Utahan/MS
@@ -15430,7 +15636,7 @@
 VP
 VT
 VTOL
-Va
+Va/M
 Vachel/M
 Vaclav/M
 Vader/M
@@ -15453,13 +15659,13 @@
 Valentin/M
 Valentina/M
 Valentine/M
-Valentino
+Valentino/M
 Valenzuela/M
 Valera
 Valeria/M
 Valerian/M
 Valerie/M
-Valery
+Valery/M
 Valerye/M
 Valhalla/M
 Valida/M
@@ -15473,17 +15679,17 @@
 Vallie/M
 Vally/M
 Valma/M
-Valois
+Valois/M
 Valparaiso/M
 Valry/M
 Valvoline/M
-Van
-Vance
+Van/M
+Vance/M
 Vancouver/M
 Vanda/M
 Vandal/MS
-Vanderbilt
-Vandyke
+Vanderbilt/M
+Vandyke/M
 Vanessa/M
 Vang/M
 Vania/M
@@ -15494,9 +15700,9 @@
 Vanuatu/M
 Vanya/M
 Vanzetti/M
-Varanasi
-Varese
-Vargas
+Varanasi/M
+Varese/M
+Vargas/M
 Vaseline/SM
 Vasili/MS
 Vasily/M
@@ -15505,19 +15711,20 @@
 Vassili/M
 Vassily/M
 Vatican/M
-Vauban
-Vaughan
+Vauban/M
+Vaughan/M
 Vaughn/M
 Vazquez/M
 Veblen/M
 Veda/SM
-Vedanta
+Vedanta/M
 Veep
 Vega/SM
+Vegas/M
 Vegemite/M
-Vela
+Vela/M
 Velasquez/M
-Velazquez
+Velazquez/M
 Velcro/MS
 Velez/M
 Velma/M
@@ -15532,12 +15739,12 @@
 Venn/M
 Ventolin/M
 Venus/MS
-Venusian
+Venusian/M
 Vera/M
 Veracruz/M
 Veradis
-Verde
-Verdi
+Verde/M
+Verdi/M
 Verdun/M
 Vere/M
 Verena/M
@@ -15551,26 +15758,26 @@
 Verizon/M
 Verla/M
 Verlaine/M
-Vermeer
+Vermeer/M
 Vermont/ZMR
 Vermonter/M
 Vern/MN
 Verna/M
-Verne
+Verne/M
 Vernen/M
 Verney/M
 Vernice/M
 Vernon/M
 Vernor/M
 Verona/M
-Veronese
-Veronica
+Veronese/M
+Veronica/M
 Veronika/M
 Veronike/M
 Veronique
 Versailles/M
 Vesalius/M
-Vespasian
+Vespasian/M
 Vespers
 Vespucci/M
 Vesta/M
@@ -15578,15 +15785,15 @@
 Vevay/M
 Vi/M
 Viacom/M
-Viagra
-Vic
+Viagra/M
+Vic/M
 Vicente/M
-Vichy
+Vichy/M
 Vick/M
 Vicki/M
 Vickie/M
 Vicksburg/M
-Vicky
+Vicky/M
 Vicodin/M
 Victoir/M
 Victor/M
@@ -15599,10 +15806,10 @@
 Vidovic/M
 Vidovik/M
 Vienna/M
-Viennese
+Viennese/M
 Vientiane/M
-Vietcong
-Vietminh
+Vietcong/M
+Vietminh/M
 Vietnam/M
 Vietnamese/M
 Vijayanagar/M
@@ -15613,9 +15820,9 @@
 Vikky/M
 Vila/M
 Vilhelmina/M
-Villa
+Villa/M
 Villarreal/M
-Villon
+Villon/M
 Vilma/M
 Vilnius/M
 Vilyui/M
@@ -15648,7 +15855,7 @@
 Virgo/SM
 Visa/M
 Visakhapatnam
-Visayans
+Visayans/M
 Vishnu/M
 Visigoth/M
 Visigoths
@@ -15664,11 +15871,11 @@
 Vitus/M
 Viv/M
 Viva/M
-Vivaldi
+Vivaldi/M
 Vivekananda/M
 Vivi/MN
 Vivia/M
-Vivian
+Vivian/M
 Viviana/M
 Vivianna/M
 Vivianne/M
@@ -15681,9 +15888,9 @@
 Vivyanne/M
 Vlad/M
 Vladamir/M
-Vladimir
+Vladimir/M
 Vladivostok/M
-Vlaminck
+Vlaminck/M
 Vlasic/M
 VoIP
 Vodafone/M
@@ -15694,7 +15901,7 @@
 Volgograd/M
 Volkswagen/M
 Volstead/M
-Volta
+Volta/M
 Voltaire/M
 Volvo/M
 Von/M
@@ -15703,7 +15910,7 @@
 Vonni/M
 Vonnie/M
 Vonny/M
-Voronezh
+Voronezh/M
 Vorster/M
 Voyager/M
 Vt
@@ -15720,9 +15927,11 @@
 WC
 WHO/M
 WI
+WMD
 WNW/M
 WP
 WSW/M
+WTO
 WV
 WW
 WWI
@@ -15732,13 +15941,13 @@
 WYSIWYG
 Wabash/M
 Wac
-Waco
-Wade
+Waco/M
+Wade/M
 Wadsworth/M
 Wagner/M
-Wagnerian
-Wahhabi
-Waikiki
+Wagnerian/M
+Wahhabi/M
+Waikiki/M
 Wain/M
 Wainwright/M
 Wait/MR
@@ -15746,34 +15955,38 @@
 Waiter/M
 Wake/M
 Wakefield
-Waksman
+Waksman/M
 Wald/MN
 Waldemar/M
 Walden/M
-Waldensian
-Waldheim
+Waldensian/M
+Waldheim/M
 Waldo/M
 Waldon/M
 Waldorf/M
 Wales/M
-Walesa
+Walesa/M
 Walgreen/M
 Walker/M
-Walkman
+Walkman/M
 Wall/SMR
-Wallace
+Wallace/M
 Wallache/M
 Wallas/M
-Wallenstein
+Wallenstein/M
 Wallie/M
-Wallis
+Wallis/M
 Walliw/M
-Walloon
+Walloon/M
+Walls/M
 Wally/M
+Walmart/M
 Walpole/M
-Walpurgisnacht
+Walpurgisnacht/M
 Walsh/M
 Walt/MRZ
+Walter/M
+Walters/M
 Walther/M
 Walton/M
 Waly/M
@@ -15786,33 +15999,33 @@
 Wanids/M
 Wankel/M
 Warcraft/M
-Ward/N
+Ward/NM
 Warde/M
 Ware/MG
-Warhol
+Warhol/M
 Waring/M
 Warner/M
-Warren
+Warren/M
 Warsaw/M
-Warwick
+Warwick/M
 Warwickshire/M
 Wasatch/M
-Wash
+Wash/M
 Washington/M
-Washingtonian/SM
-Wassermann
+Washingtonian/MS
+Wassermann/M
 Wat/MZ
-Waterbury
-Waterford
-Watergate
+Waterbury/M
+Waterford/M
+Watergate/M
 Waterloo/MS
 Waters/M
-Watkins
-Watson
-Watt/S
-Watteau
-Watusi
-Waugh
+Watkins/M
+Watson/M
+Watt/SM
+Watteau/M
+Watusi/M
+Waugh/M
 Wave
 Waverley/M
 Waverly/M
@@ -15822,20 +16035,21 @@
 Waylen/M
 Waylin/M
 Waylon/M
-Wayne
+Wayne/M
 Weave/M
 Weaver/M
-Web/R
+Web/MR
 WebSphere/M
-Webb
+Webb/M
+Weber/M
 Webern/M
 Webster/MS
 Wed/M
 Weddell/M
-Wedgwood
+Wedgwood/M
 Wednesday/MS
 Weeks/M
-Wehrmacht
+Wehrmacht/M
 Wei/M
 Weidar/M
 Weider/M
@@ -15844,19 +16058,19 @@
 Weinberg/M
 Weiss/M
 Weissmuller/M
-Weizmann
+Weizmann/M
 Welbie/M
 Welby/M
 Welch
 Weldon/M
 Welland/M
 Weller/M
-Welles
+Welles/M
 Wellington/SM
-Wells
+Wells/M
 Welsh/M
 Welshman/M
-Welshmen
+Welshmen/M
 Welshwoman
 Wenda/M
 Wendall/M
@@ -15875,22 +16089,22 @@
 Wesak/M
 Wesley/M
 Wesleyan/M
-Wessex
+Wessex/M
 Wesson/M
 West/SM
 Westbrook/M
 Westbrooke/M
 Western/MRS
-Westinghouse
+Westinghouse/M
 Westleigh/M
 Westley/M
-Westminster
+Westminster/M
 Weston/M
-Westphalia
+Westphalia/M
 Weyden/M
 Weylin/M
 Wezen/M
-Wharton
+Wharton/M
 Wheaties/M
 Wheatstone/M
 Wheeler/M
@@ -15898,54 +16112,56 @@
 Whig/SM
 Whipple/M
 Whirlpool/M
-Whistler
+Whistler/M
 Whit
-Whitaker
+Whitaker/M
 Whitby/M
 White/SM
 Whitefield/M
-Whitehall
-Whitehead
+Whitehall/M
+Whitehead/M
 Whitehorse/M
 Whiteley/M
 Whitfield/M
 Whitley/M
-Whitman
+Whitman/M
 Whitney/M
-Whitsunday/SM
+Whitsunday/MS
 Whittaker/M
-Whittier
+Whittier/M
 WiFi/M
 Wiatt/M
-Wicca
+Wicca/M
 Wichita/M
 Wiemar/M
 Wiesel/M
 Wiesenthal/M
-Wiggins
+Wiggins/M
 Wigner/M
 Wii/M
 WikiPatents/M
 Wikibooks/M
+Wikileaks
 Wikimedia/M
 Wikinews/M
 Wikipedia/M
 Wikiquote/M
 Wikisource/M
 Wiktionary/M
-Wilberforce
+Wilberforce/M
 Wilbert/M
 Wilbur/M
 Wilburn/M
 Wilburt/M
 Wilcox/M
 Wilda/M
-Wilde/R
+Wilde/MR
 Wilden/M
+Wilder/M
 Wildon/M
 Wileen/M
 Wilek/M
-Wiles
+Wiles/M
 Wiley/M
 Wilford/M
 Wilfred/M
@@ -15956,26 +16172,27 @@
 Wilhelmine
 Wilie/M
 Wilkerson/M
-Wilkes
-Wilkins
+Wilkes/M
+Wilkins/M
 Wilkinson/M
 Will/M
 Willa/M
 Willabella/M
 Willamette/M
 Willamina/M
-Willard
+Willard/M
 Willdon/M
 Willem/M
-Willemstad
+Willemstad/M
 Willetta/M
 Willette/M
 Willey/M
 Willi/MS
-William/S
-Williamson
+William/SM
+Williams/M
+Williamson/M
 Willie/M
-Willis
+Willis/M
 Willow/M
 Willy/M
 Willyt/M
@@ -15988,7 +16205,7 @@
 Wilone/M
 Wilow/M
 Wilson/M
-Wilsonian
+Wilsonian/M
 Wilt/M
 Wilton/M
 Wiltshire/M
@@ -15996,12 +16213,12 @@
 Wimsey/M
 Win/M
 Winchell/M
-Winchester/S
-Windbreaker
+Winchester/MS
+Windbreaker/M
 Windex/M
 Windham/M
-Windhoek
-Windows
+Windhoek/M
+Windows/M
 Windsor/SM
 Windward/M
 Windy/M
@@ -16019,7 +16236,7 @@
 Winne/M
 Winnebago/M
 Winni/M
-Winnie
+Winnie/M
 Winnifred/M
 Winnipeg/M
 Winny/M
@@ -16027,58 +16244,59 @@
 Winonah/M
 Winslow/M
 Winston/M
-Winters
+Winters/M
 Winthrop/M
 Wis
 Wisc
 Wisconsin/M
-Wisconsinite/SM
+Wisconsinite/MS
 Wise/M
 Wit/M
 Witt/M
 Wittgenstein/M
 Wittie/M
 Witty/M
-Witwatersrand
+Witwatersrand/M
 Wm/M
 Wobegon/M
 Wodehouse/M
-Wolf
-Wolfe
-Wolff
+Wolf/M
+Wolfe/M
+Wolff/M
 Wolfgang/M
 Wolfie/M
 Wolfy/M
-Wollongong
+Wollongong/M
 Wollstonecraft/M
-Wolsey
+Wolsey/M
 Wolverhampton
-Wonder
+Wonder/M
 Wonderbra/M
 Wong/M
-Wood/S
+Wood/SM
 Woodard/M
 Woodhull/M
 Woodie/M
 Woodman
 Woodrow/M
+Woods/M
 Woodstock/M
 Woodward/M
 Woody/M
-Woolf
+Woolf/M
 Woolite/M
 Woolongong/M
-Woolworth
+Woolworth/M
 Wooster/M
 Wooten/M
 Worcester/SM
-Worcestershire
+Worcestershire/M
 WordPress/M
 Worden/M
 Wordsworth/M
 Workman/M
 WorldCat/M
-Worms
+Worms/M
 Worth
 Worthington/M
 Worthy/M
@@ -16087,19 +16305,20 @@
 Wozniak/M
 Wozzeck/M
 Wrangell/M
-Wren
+Wren/M
 Wrennie/M
-Wright
+Wright/M
 Wrigley/M
 Wroclaw/M
 Wu/M
-Wuhan
+Wuhan/M
 Wurlitzer/M
 Wyatan/M
-Wyatt
+Wyatt/M
 Wycherley/M
 Wycliffe/M
 Wye/H
+Wyeth/M
 Wylie/M
 Wylma/M
 Wyn/M
@@ -16110,7 +16329,7 @@
 Wynny/M
 Wyo
 Wyoming/M
-Wyomingite/MS
+Wyomingite/SM
 X/M
 XBL/M
 XEmacs/M
@@ -16123,26 +16342,26 @@
 XUL/M
 XULRunner/M
 XXL
-Xanadu
+Xanadu/M
 Xanax/M
-Xanthippe
-Xavier
+Xanthippe/M
+Xavier/M
 Xaviera/M
 Xbox/M
 Xe/SM
 Xena/M
 Xenakis/M
 Xenia/M
-Xenophon
+Xenophon/M
 Xenos
 Xerox/MS
-Xerxes
+Xerxes/M
 Xever/M
 Xhosa/M
-Xi'an
+Xi'an/M
 Xian/SM
 Xiaoping/M
-Ximenes
+Ximenes/M
 Ximenez/M
 Xingu/M
 Xiongnu/M
@@ -16153,20 +16372,20 @@
 Xylina/M
 Xymenes/M
 Y/M
-YMCA
+YMCA/M
 YMHA
 YMMV
 YT
-YWCA
+YWCA/M
 YWHA
 Yacc/M
 Yahoo/M
 Yahtzee/M
 Yahveh/M
 Yahweh/M
-Yakima
+Yakima/M
 Yakut/M
-Yakutsk
+Yakutsk/M
 Yale/M
 Yalonda/M
 Yalow/M
@@ -16174,42 +16393,42 @@
 Yalu/M
 Yamagata/M
 Yamaha/M
-Yamoussoukro
+Yamoussoukro/M
 Yanaton/M
 Yance/M
 Yancey/M
 Yancy/M
-Yang
+Yang/M
 Yangon/M
 Yangtze/M
 Yank/SM
 Yankee/SM
 Yaobang/M
 Yaounde/M
-Yaqui
+Yaqui/M
 Yard/M
 Yardley/M
 Yaren
-Yaroslavl
+Yaroslavl/M
 Yasmeen/M
 Yasmin/M
 Yataro/M
-Yates
+Yates/M
 Yb/M
 Yeager/M
 Yeats/M
 Yehudi/M
 Yehudit/M
-Yekaterinburg
+Yekaterinburg/M
 Yelena/M
-Yellowknife
+Yellowknife/M
 Yellowstone/M
-Yeltsin
+Yeltsin/M
 Yemen/M
 Yemeni/SM
 Yemenite
 Yenisei/M
-Yerevan
+Yerevan/M
 Yerkes/M
 Yesenia/M
 Yetta/M
@@ -16217,7 +16436,7 @@
 Yetty/M
 Yevette/M
 Yevtushenko/M
-Yggdrasil
+Yggdrasil/M
 Yiddish/M
 Ymir/M
 Ynes/M
@@ -16225,19 +16444,19 @@
 Yoda/M
 Yoknapatawpha/M
 Yoko/M
-Yokohama
+Yokohama/M
 Yolanda/M
 Yolande/M
 Yolane/M
 Yolanthe/M
 Yong/M
-Yonkers
+Yonkers/M
 Yooper/MS
 Yorgo/MS
 York/MR
 Yorke/M
 Yorker/M
-Yorkie
+Yorkie/M
 Yorkshire/MS
 Yorktown/M
 Yoruba/M
@@ -16246,15 +16465,15 @@
 Yoshiko/M
 Yossarian/M
 YouTube/M
-Young
-Youngstown
+Young/M
+Youngstown/M
 Yovonnda/M
 Ypres/M
-Ypsilanti
+Ypsilanti/M
 Ysabel/M
 Yuan/M
 Yucatan/M
-Yugo
+Yugo/M
 Yugoslav/MS
 Yugoslavia/M
 Yugoslavian/SM
@@ -16293,17 +16512,17 @@
 Zambezi/M
 Zambia/M
 Zambian/SM
-Zamboni
+Zamboni/M
 Zamenhof/M
-Zamora
+Zamora/M
 Zandra/M
 Zane/M
 Zaneta/M
 Zanuck/M
 Zanzibar/M
-Zapata
-Zaporozhye
-Zapotec
+Zapata/M
+Zaporozhye/M
+Zapotec/M
 Zappa/M
 Zara/M
 Zarah/M
@@ -16315,25 +16534,25 @@
 Zealand/M
 Zeb/M
 Zebadiah/M
-Zebedee
+Zebedee/M
 Zebulen/M
 Zebulon/M
-Zechariah
+Zechariah/M
 Zed/M
 Zedekiah/M
 Zedong/M
 Zeffirelli/M
 Zeke/M
 Zelda/M
-Zelig
+Zelig/M
 Zelma/M
 Zen/M
 Zena/M
 Zenger/M
 Zenia/M
 Zeno/M
-Zephaniah
-Zephyrus
+Zephaniah/M
+Zephyrus/M
 Zeppelin
 Zerk/M
 Zest/M
@@ -16341,13 +16560,13 @@
 Zhang/M
 Zhao/M
 Zhdanov
-Zhengzhou
+Zhengzhou/M
 Zhivago/M
 Zhou/M
-Zhukov
+Zhukov/M
 Zia/M
 Zibo/M
-Ziegfeld
+Ziegfeld/M
 Ziegler/M
 Ziff/M
 Ziggy/M
@@ -16359,16 +16578,16 @@
 Zion/SM
 Zionism/SM
 Zionist/SM
-Ziploc
+Ziploc/M
 Zita/M
 Zitella/M
 Zn/M
 Zoe/M
 Zola/M
 Zollie/M
-Zollverein
+Zollverein/M
 Zolly/M
-Zoloft
+Zoloft/M
 Zomba/M
 Zonda/M
 Zondra/M
@@ -16378,7 +16597,7 @@
 Zorana/M
 Zorina/M
 Zorine/M
-Zorn
+Zorn/M
 Zoroaster/M
 Zoroastrian/MS
 Zoroastrianism/SM
@@ -16386,7 +16605,7 @@
 Zosma/M
 Zr/M
 Zsazsa/M
-Zsigmondy
+Zsigmondy/M
 Zubenelgenubi/M
 Zubeneschamali/M
 Zukor/M
@@ -16394,11 +16613,11 @@
 Zulu/SM
 Zululand
 Zune/M
-Zuni
+Zuni/M
 Zurich/M
 Zuzana/M
 Zwingli/M
-Zworykin
+Zworykin/M
 Zyrtec/M
 Zyuganov/M
 Zzz
@@ -16434,6 +16653,7 @@
 abdomen/SM
 abdominal
 abduct/DSG
+abductee/MS
 abduction/SM
 abductor/MS
 abeam
@@ -16984,7 +17204,7 @@
 advt
 adware/MS
 adz/MS
-adze/M
+adze/SM
 aegis/M
 aeolian
 aeon/SM
@@ -16993,7 +17213,7 @@
 aerator/SM
 aerial/SMY
 aerialist/MS
-aerie/M
+aerie/MS
 aerobatic/S
 aerobatics/M
 aerobic/S
@@ -17012,7 +17232,7 @@
 aerosol/MS
 aerospace/M
 aery/TRSM
-aesthete/S
+aesthete/MS
 aesthetic/S
 aesthetically
 aestheticism/M
@@ -17625,7 +17845,7 @@
 analogue/SM
 analogy/SM
 analysand/MS
-analyses
+analyses/A
 analysis/AM
 analyst/SM
 analytic
@@ -17983,7 +18203,6 @@
 apathetically
 apathy/M
 apatite/M
-apatosaurus/M
 ape/DSMG
 apelike
 aperiodic
@@ -18866,6 +19085,7 @@
 awakened/U
 awakening/SM
 award/GMDS
+awardee/S
 aware/UPT
 awareness/UM
 awarer
@@ -19317,6 +19537,7 @@
 basemen
 basement/CMS
 baseness/M
+baser
 bash/GMDS
 bashful/PY
 bashfulness/M
@@ -19563,6 +19784,7 @@
 befuddlement/M
 beg/S
 began
+begat
 beget/S
 begetter/S
 begetting
@@ -19795,6 +20017,7 @@
 bi/SMRZ
 biannual/Y
 bias/GMDS
+biased/U
 biathlon/SM
 bib/SM
 bible/MS
@@ -19874,6 +20097,7 @@
 bilingualism/M
 bilious/P
 biliousness/M
+bilirubin
 bilk/SZGDR
 bilker/M
 bill/SBJGMD
@@ -19993,8 +20217,9 @@
 birefringence
 birefringent
 biretta/SM
-birth/GMD
+birth/ZGMDR
 birthday/MS
+birther/M
 birthmark/MS
 birthplace/MS
 birthrate/MS
@@ -20019,6 +20244,7 @@
 bitchily
 bitchiness/M
 bitchy/PRT
+bitcoin/SM
 bite/RSMZ
 biter/M
 biting/Y
@@ -20042,7 +20268,7 @@
 biz/M
 bizarre/YP
 bk
-bl/D
+bl/DG
 blab/SM
 blabbed
 blabber/DGS
@@ -20455,6 +20681,7 @@
 boner/M
 boneshaker/S
 boney
+boneyard
 bonfire/MS
 bong/SGMD
 bongo/MS
@@ -20465,6 +20692,7 @@
 bonnet/MS
 bonnie
 bonny/TR
+bonobo/MS
 bonsai/MS
 bonus/MS
 bony/PTR
@@ -20673,6 +20901,7 @@
 boyscout
 boysenberry/SM
 bozo/MS
+bpm
 bps
 bra/SM
 brace/MZGDRS
@@ -21029,6 +21258,7 @@
 buckteeth
 bucktooth/MD
 buckwheat/M
+buckyball/SM
 bucolic/MS
 bucolically
 bud/SM
@@ -21063,6 +21293,7 @@
 building/M
 buildup/SM
 built/AI
+builtin
 bulb/MS
 bulbous
 bulge/DSMG
@@ -21194,6 +21425,7 @@
 burnout/MS
 burnt/U
 burp/MDGS
+burqa/S
 burr/MDGS
 burrito/MS
 burro/SM
@@ -21258,6 +21490,7 @@
 butted/A
 butter/MDG
 butterball/MS
+buttercream
 buttercup/SM
 butterfat/M
 butterfingered
@@ -21282,6 +21515,7 @@
 buzz/MDRSZG
 buzzard/MS
 buzzer/M
+buzzkill/SM
 buzzword/SM
 bx
 bxs
@@ -21344,6 +21578,7 @@
 cad/SM
 cadaver/SM
 cadaverous
+caddie/MDS
 caddish/YP
 caddishness/M
 caddy/GDSM
@@ -21368,6 +21603,8 @@
 caftan/MS
 cage/DSMG
 cagey
+cagier
+cagiest
 cagily
 caginess/M
 cagoule/S
@@ -21685,6 +21922,7 @@
 carborundum/M
 carboxylic
 carboy/MS
+carbs
 carbuncle/SM
 carbuncular
 carburetor/MS
@@ -21706,6 +21944,7 @@
 cardigan/SM
 cardinal/SMY
 cardinality
+cardio
 cardiogram/MS
 cardiograph/M
 cardiographs
@@ -21761,6 +22000,7 @@
 carney/MS
 carnitas
 carnival/MS
+carnivora
 carnivore/SM
 carnivorous/YP
 carnivorousness/M
@@ -21841,6 +22081,7 @@
 casework/ZMR
 caseworker/M
 cash/GMDS
+cashback/M
 cashbook/MS
 cashew/MS
 cashier/GSMD
@@ -22050,6 +22291,7 @@
 cellphone/MS
 cellular/SM
 cellulite/M
+cellulitis
 celluloid/M
 cellulose/M
 cement/MDRZGS
@@ -22115,6 +22357,7 @@
 cerebral
 cerebrate/GNDS
 cerebration/M
+cerebrovascular
 cerebrum/MS
 cerement/MS
 ceremonial/SMY
@@ -22309,6 +22552,7 @@
 chasuble/SM
 chat/SM
 chateau/SM
+chateaux
 chatelaine/SM
 chatline/S
 chatted
@@ -22678,6 +22922,7 @@
 chutzpa/M
 chutzpah/M
 chyme/M
+ciabatta/SM
 ciao/S
 cicada/MS
 cicatrice/SM
@@ -22910,7 +23155,7 @@
 clevis/MS
 clew/SGMD
 cliche/MDS
-click/ZGMDRS
+click/BZGMDRS
 clicker/M
 client/MS
 clientele/MS
@@ -22960,6 +23205,7 @@
 cliquiest
 cliquish/YP
 cliquishness/M
+clit/SM
 clitoral
 clitorides
 clitoris/MS
@@ -22990,7 +23236,7 @@
 clop/MS
 clopped
 clopping
-close/EIGTSDMB
+close/EIGTSDMBR
 closed/U
 closefisted
 closely
@@ -23680,6 +23926,7 @@
 concentrate/MGNDSX
 concentration/M
 concentrator/S
+concentric
 concentrically
 concept/SM
 conception/SM
@@ -23831,6 +24078,7 @@
 confluence/MS
 confluent
 confocal
+conform/ZB
 conformable/U
 conformal
 conformance/M
@@ -23944,6 +24192,7 @@
 consecration/AM
 consecrations
 consecutive/Y
+consensual
 consensus/MS
 consent/SMDG
 consequence/MS
@@ -24532,6 +24781,7 @@
 countered
 counterespionage/M
 counterexample/S
+counterfactual
 counterfeit/ZGMDRS
 counterfeiter/M
 counterfoil/MS
@@ -25238,10 +25488,12 @@
 cyanide/M
 cyanogen
 cyber
+cyberbully/S
 cybercafe/S
 cybernetic/S
 cybernetics/M
 cyberpunk/SM
+cybersex
 cyberspace/MS
 cyborg/SM
 cyclamen/MS
@@ -25288,8 +25540,8 @@
 czarina/SM
 czarism
 czarist/SM
-d'Arezzo
-d'Estaing
+d'Arezzo/M
+d'Estaing/M
 d/NXGJ
 dB
 dab/SM
@@ -25420,6 +25672,7 @@
 databank/SM
 database/SM
 datasheet/MS
+datatype
 date/DRSBMZGV
 datebook/S
 dated/U
@@ -25699,6 +25952,7 @@
 deffer
 deffest
 defiant/Y
+defibrillation
 defibrillator/S
 deficiency/SM
 deficient
@@ -25877,6 +26131,7 @@
 dendrochronological
 dendrochronology
 dengue/M
+deniability
 deniable/U
 denial/MS
 denier/M
@@ -26132,7 +26387,7 @@
 detest/RZB
 detestably
 detestation/M
-dethrone/GL
+dethrone/DSGL
 dethronement/M
 detonate/GNDSX
 detonated/U
@@ -26193,6 +26448,7 @@
 dexterousness/M
 dextrose/M
 dextrous/Y
+dharma
 dhoti/SM
 dhow/MS
 diabetes/M
@@ -26261,6 +26517,7 @@
 dibble/DSMG
 dibs/M
 dice/GDS
+dices/I
 dicey
 dichloride
 dichotomous
@@ -26573,6 +26830,7 @@
 disgruntle/LDSG
 disgruntlement/M
 disguise/GD
+disguised/U
 disgusted/Y
 disgusting/Y
 dish/MDSG
@@ -26594,6 +26852,7 @@
 disillusionment/M
 disinfectant/SM
 disinfection/M
+disinterested/PY
 disinterestedness/M
 disinvest
 disjoint/P
@@ -26640,9 +26899,12 @@
 displeasure/M
 disposable/SM
 disposal/SM
+disposed/I
 disposition/ISM
 dispossession/M
 disproof/SM
+disproportional
+disprove/B
 disputable/I
 disputably/I
 disputant/MS
@@ -26697,6 +26959,7 @@
 distance/DSMG
 distant/Y
 distaste/SM
+distemper/M
 distention/MS
 distil/S
 distillate/SMNX
@@ -26715,6 +26978,7 @@
 distort/GDR
 distorted/U
 distortion/MS
+distract/DG
 distracted/YP
 distracting/Y
 distraction/S
@@ -26805,7 +27069,7 @@
 djellabah/M
 djellabahs
 djinn/M
-do/SJRHZG
+do/SJMRHZG
 doable
 dob/S
 dobbed
@@ -26932,7 +27196,7 @@
 donate/DSXGN
 donation/M
 donator/MS
-done/AU
+done/FAU
 dong/MDGS
 dongle/SM
 donkey/SM
@@ -26978,6 +27242,8 @@
 dope/MZGDRS
 doper/M
 dopey
+dopier
+dopiest
 dopiness/M
 doping/M
 doppelganger/S
@@ -27004,6 +27270,7 @@
 dot/ZGSMDR
 dotage/M
 dotard/SM
+dotcom/SM
 dote/S
 doter/M
 doting/Y
@@ -27051,6 +27318,7 @@
 downdraft/MS
 downer/M
 downfall/SMN
+downfield
 downgrade/DSMG
 downhearted/YP
 downheartedness/M
@@ -27095,6 +27363,7 @@
 dozen/MH
 dozily
 dozy/RTP
+dpi
 dpt
 drab/MYSP
 drabber
@@ -27473,6 +27742,7 @@
 eBay/M
 eBook/MS
 eCommerce/M
+eMusic/M
 ea
 each
 eager/PTRY
@@ -27481,6 +27751,7 @@
 eaglet/MS
 ear/SMDY
 earache/SM
+earbud/SM
 eardrum/SM
 earful/SM
 earl/MS
@@ -27598,6 +27869,7 @@
 ecumenism/M
 eczema/M
 ed/ACSM
+edamame
 eddy/DSMG
 edelweiss/M
 edema/SM
@@ -27643,7 +27915,7 @@
 edutainment/M
 eek
 eel/SM
-eerie
+eerie/RT
 eerily
 eeriness/M
 eery/RTP
@@ -27764,6 +28036,7 @@
 elbowroom/M
 elder/SMY
 elderberry/SM
+eldercare/M
 elderflower
 eldest
 elect/ASDGVM
@@ -27814,6 +28087,7 @@
 electron/MS
 electronegative
 electronic/S
+electronica/M
 electronically
 electronics/M
 electrophoresis
@@ -27992,6 +28266,8 @@
 emitted
 emitter/MS
 emitting
+emo/SM
+emoji
 emollient/MS
 emolument/MS
 emote/XDSGNV
@@ -28122,6 +28398,7 @@
 endless/PY
 endlessness/M
 endmost
+endocarditis
 endocrine/MS
 endocrinologist/MS
 endocrinology/M
@@ -28160,7 +28437,7 @@
 enfeeblement/M
 enfilade/DSMG
 enfold/SGD
-enforce/AGDS
+enforce/LZGDRS
 enforceability
 enforceable/U
 enforced/U
@@ -28463,7 +28740,7 @@
 equivocate/XGNDS
 equivocation/M
 equivocator/MS
-er
+er/C
 era/SM
 eradicable/I
 eradicate/DSGN
@@ -28920,6 +29197,7 @@
 exon/MS
 exonerate/GNDS
 exoneration/M
+exoplanet/MS
 exorbitance/M
 exorbitant/Y
 exorcise/DSG
@@ -29328,6 +29606,7 @@
 fanatic/SM
 fanatical/Y
 fanaticism/M
+fanboy/SM
 fanciable
 fancier/M
 fanciful/PY
@@ -29337,6 +29616,7 @@
 fancy/DRSMZTGP
 fancywork/M
 fandango/MS
+fandom
 fanfare/SM
 fang/MDS
 fanlight/SM
@@ -29395,6 +29675,7 @@
 fashionable/U
 fashionably/U
 fashioner/M
+fashionista/MS
 fast/MDRTGSP
 fastback/SM
 fastball/SM
@@ -30061,6 +30342,7 @@
 flexible/I
 flexibly/I
 flexing
+flexion
 flexitime/M
 flextime/M
 flibbertigibbet/MS
@@ -30085,6 +30367,9 @@
 flintlock/SM
 flinty/TR
 flip/MS
+flipflop/S
+flipflopped
+flipflopping
 flippable
 flippancy/M
 flippant/Y
@@ -30751,7 +31036,7 @@
 frictionless
 fridge/SM
 friedcake/MS
-friend/SM
+friend/SMU
 friendless/P
 friendlies
 friendlily
@@ -31366,6 +31651,7 @@
 genuine/PY
 genuineness/M
 genus/M
+geocache/DSG
 geocentric
 geocentrically
 geochemical
@@ -31374,6 +31660,7 @@
 geodesic/SM
 geodesy/M
 geodetic
+geoengineering
 geog
 geographer/SM
 geographic
@@ -31576,6 +31863,7 @@
 glamorization/M
 glamorize/DSG
 glamorous/Y
+glamour/GMDS
 glance/DSMG
 gland/SM
 glandes
@@ -32435,6 +32723,7 @@
 hackle/MS
 hackney/SMDG
 hacksaw/SM
+hacktivist/S
 hackwork/M
 had
 haddock/SM
@@ -32732,7 +33021,7 @@
 hash/AMDSG
 hasheesh/M
 hashish/M
-hashtag/S
+hashtag/SM
 hasn't
 hasp/MS
 hassle/DSMG
@@ -32812,6 +33101,7 @@
 hazily
 haziness/M
 hazing/M
+hazmat
 hazy/RTP
 hdqrs
 he'd
@@ -33282,6 +33572,7 @@
 hippodrome/SM
 hippopotami
 hippopotamus/MS
+hippy
 hipster/MS
 hire/AGDSM
 hireling/MS
@@ -33445,10 +33736,13 @@
 hometown/MS
 homeward/S
 homework/MRZG
+homewrecker/SM
 homey/SMP
 homeyness/M
 homicidal
 homicide/MS
+homier
+homiest
 homiletic
 homily/SM
 hominess/M
@@ -33513,6 +33807,7 @@
 honorific/MS
 hooch/M
 hood/MDSG
+hoodie/MS
 hoodlum/SM
 hoodoo/MDSG
 hoodwink/DGS
@@ -33652,6 +33947,7 @@
 hotheaded/YP
 hotheadedness/M
 hothouse/SM
+hotkey/S
 hotline/MS
 hotlink/S
 hotness/M
@@ -33805,6 +34101,7 @@
 hummus/M
 humongous
 humor/SMDG
+humoresque
 humorist/MS
 humorless/PY
 humorlessness/M
@@ -33844,7 +34141,7 @@
 hurl/MDRSZG
 hurler/M
 hurling/M
-hurrah/M
+hurrah/MGDS
 hurray/GSMD
 hurricane/MS
 hurried/UY
@@ -33913,6 +34210,7 @@
 hydrological
 hydrologist/MS
 hydrology/M
+hydrolyses
 hydrolysis/M
 hydrolyze/DSG
 hydromagnetic
@@ -33957,7 +34255,7 @@
 hyperfine
 hyperglycemia/M
 hyperinflation
-hyperlink/SM
+hyperlink/SMGD
 hypermarket/S
 hypermedia/M
 hyperplane/S
@@ -34018,6 +34316,7 @@
 hysterical/Y
 hysterics/M
 i/US
+iPad/MS
 iPhone/M
 iPod/MS
 iTunes/M
@@ -34597,6 +34896,8 @@
 increasing/Y
 increment/SMDG
 incremental/Y
+incrementalism
+incrementalist/SM
 incrementation
 incriminate/GNDS
 incrimination/M
@@ -35322,6 +35623,7 @@
 intoxicate/GNDS
 intoxication/M
 intracellular
+intracranial
 intramural
 intramuscular
 intranet/S
@@ -35489,6 +35791,7 @@
 irrelevance/SM
 irrelevancy/SM
 irrelevant/Y
+irreligion
 irreligious
 irremediable
 irremediably
@@ -35753,6 +36056,7 @@
 jiggly/RT
 jigsaw/SMDG
 jihad/SM
+jihadist/SM
 jilt/MDSG
 jimmy/DSMG
 jimsonweed/M
@@ -35971,6 +36275,7 @@
 kHz
 kW
 kWh
+kabbalah
 kabob/SM
 kaboom
 kabuki/M
@@ -36041,6 +36346,7 @@
 kettledrum/SM
 kettleful
 key/SGMD
+keybinding/S
 keyboard/ZGSMDR
 keyboarder/M
 keyboardist/MS
@@ -36186,6 +36492,7 @@
 kiwifruit/MS
 kl
 klaxon/S
+kleptocracy
 kleptomania/M
 kleptomaniac/MS
 kludge/GDS
@@ -37221,6 +37528,7 @@
 location/ESMA
 locational
 locator/MS
+locavore/SM
 loch/M
 lochs
 loci
@@ -37269,12 +37577,16 @@
 logical/Y
 logicality/M
 logician/MS
+login/S
 logistic/S
 logistical/Y
 logistics/M
 logjam/SM
 logo/MS
+logoff/S
+logon/S
 logotype/SM
+logout/S
 logrolling/M
 logy/RT
 loin/MS
@@ -37283,6 +37595,7 @@
 loiter/ZGSDR
 loiterer/M
 loitering/M
+lolcat
 loll/DSG
 lollipop/SM
 lollop/GSD
@@ -37326,9 +37639,11 @@
 lookalike/MS
 looker/M
 lookout/MS
+lookup
 loom/MDSG
 loon/MS
 looney/M
+loonie/M
 loony/RSMT
 loop/MDSG
 loophole/MS
@@ -37635,6 +37950,9 @@
 madmen
 madness/M
 madras/MS
+madrasa/S
+madrassah
+madrassahs
 madrigal/SM
 madwoman/M
 madwomen
@@ -37693,6 +38011,7 @@
 magnolia/MS
 magnum/MS
 magpie/MS
+magus/M
 maharaja/SM
 maharajah/M
 maharajahs
@@ -38319,6 +38638,7 @@
 megabit/SM
 megabucks/M
 megabyte/MS
+megachurch/MS
 megacycle/SM
 megadeath/SM
 megahertz/M
@@ -38335,6 +38655,7 @@
 megastar/S
 megaton/SM
 megawatt/MS
+meh
 meiosis/M
 meiotic
 melamine/M
@@ -38652,6 +38973,7 @@
 microgroove/MS
 microhydrodynamics
 microlight/SM
+microloan/MS
 micromanage/GLDS
 micromanagement/M
 micrometeorite/MS
@@ -38740,6 +39062,7 @@
 milepost/MS
 miler/M
 milestone/MS
+milf/MS
 milieu/SM
 militancy/M
 militant/MYS
@@ -38768,7 +39091,7 @@
 millage/M
 millenarian
 millennia
-millennial
+millennial/MS
 millennium/SM
 millepede/MS
 miller/M
@@ -39635,6 +39958,7 @@
 mugginess/M
 mugging/MS
 muggins
+muggle/MS
 muggy/PTR
 mugshot/MS
 mugwump/MS
@@ -39659,6 +39983,7 @@
 mulligan/SM
 mulligatawny/M
 mullion/SMD
+multi
 multicast
 multichannel
 multicolor/D
@@ -39685,6 +40010,7 @@
 multinational/MS
 multiparty
 multiphase
+multiplayer/M
 multiple/MS
 multiplex/ZGMDRS
 multiplexer/M
@@ -39708,6 +40034,7 @@
 multitudinous
 multivalued
 multivariate
+multiverse/SM
 multivitamin/SM
 mum/SM
 mumble/JMZGDRS
@@ -39841,6 +40168,7 @@
 mynah/M
 mynahs
 myocardial
+myocardium
 myopia/M
 myopic
 myopically
@@ -40118,6 +40446,7 @@
 neoclassicism/M
 neocolonialism/M
 neocolonialist/MS
+neocon/S
 neoconservative/SM
 neodymium/M
 neolithic
@@ -40153,6 +40482,7 @@
 nestling/M
 net/SM
 netball
+netbook/MS
 nether
 nethermost
 netherworld/M
@@ -40268,8 +40598,10 @@
 niffy
 niftily
 nifty/TR
+nigga/S
 niggard/SMY
 niggardliness/M
+niggaz
 nigger/SM!
 niggle/MZGDRS
 niggler/M
@@ -40549,6 +40881,7 @@
 nonintoxicating
 noninvasive
 nonirritating
+nonissue
 nonjudgmental
 nonjudicial
 nonlegal
@@ -41412,6 +41745,7 @@
 orbit/MDRZGS
 orbital/SM
 orbiter/M
+orc/S
 orchard/SM
 orchestra/MS
 orchestral
@@ -41954,6 +42288,8 @@
 overtake/ZGRS
 overtaken
 overtax/GDS
+overthink/SG
+overthought
 overthrew
 overthrow/GSM
 overthrown
@@ -42122,6 +42458,8 @@
 palatinate/MS
 palatine/MS
 palaver/GSMD
+palazzi
+palazzo
 pale/MYTGPDRSJ
 paleface/MS
 paleness/M
@@ -42332,6 +42670,7 @@
 parapsychologist/SM
 parapsychology/M
 paraquat/M
+parasailing
 parascending
 parasite/SM
 parasitic
@@ -43275,6 +43614,7 @@
 phosphorus/M
 phosphorylate/DSGN
 photo/SGMD
+photobomb/DGS
 photocell/MS
 photochemical/Y
 photochemistry
@@ -43315,6 +43655,8 @@
 photosynthesize/GDS
 photosynthetic
 photosynthetically
+phototropic
+phototropism
 phototypesetter
 phototypesetting
 photovoltaic
@@ -43366,6 +43708,7 @@
 pic/SM
 pica/M
 picador/MS
+picante
 picaresque
 picayune
 piccalilli/M
@@ -43677,6 +44020,7 @@
 plasticine
 plasticity/M
 plasticize/DSZG
+plastique
 plat/XGMDNS
 plate/MS
 plateau/SMDG
@@ -43695,6 +44039,7 @@
 platting
 platy/M
 platypus/MS
+platys
 plaudit/SM
 plausibility/M
 plausible
@@ -43810,6 +44155,8 @@
 plumber/M
 plumbing/M
 plume/MS
+plummer
+plummest
 plummet/SGMD
 plummy
 plump/MDRYSTGP
@@ -43854,7 +44201,7 @@
 pocketknives
 pockmark/MDGS
 pod/SM
-podcast
+podcast/SM
 podded
 podding
 podgy
@@ -43959,6 +44306,7 @@
 poltergeist/MS
 poltroon/SM
 poly
+polyamory/S
 polyandrous
 polyandry/M
 polyatomic
@@ -43997,6 +44345,7 @@
 polyphonic
 polyphony/M
 polypropylene/M
+polys
 polysaccharides
 polysemous
 polystyrene/M
@@ -44175,6 +44524,7 @@
 postbox/S
 postcard/SM
 postcode/S
+postcolonial
 postconsonantal
 postdate/DSG
 postdoc
@@ -44451,9 +44801,11 @@
 pregnant
 preheat/GSD
 prehensile
+prehistorian/S
 prehistoric
 prehistorical/Y
 prehistory/M
+prehuman
 prejudge/GDS
 prejudgement/MS
 prejudgment/MS
@@ -44489,6 +44841,7 @@
 premonition/SM
 premonitory
 prenatal/Y
+prenup/SM
 prenuptial
 preoccupation/MS
 preoccupy/DSG
@@ -45388,6 +45741,7 @@
 puzzler/M
 puzzling/Y
 pvt
+pwn/SGD
 pygmy/SM
 pylon/SM
 pylori
@@ -46303,6 +46657,7 @@
 regency/SM
 regeneracy/M
 regenerate/VX
+regex/M
 regexp/S
 reggae/M
 regicide/MS
@@ -46428,6 +46783,7 @@
 relinquishment/M
 reliquary/SM
 relish/GMDS
+relist/SGD
 reluctance/M
 reluctant/Y
 rely/GDS
@@ -46499,6 +46855,7 @@
 renter/M
 renunciation/SM
 reopen/SDG
+reorg/DSG
 rep/SM
 repaint/GDS
 repairable/U
@@ -46910,6 +47267,7 @@
 rhinitis/M
 rhino/MS
 rhinoceros/MS
+rhinovirus/MS
 rhizome/MS
 rho/SM
 rhodium/M
@@ -47340,6 +47698,7 @@
 rugged/PTRY
 ruggedness/M
 rugger
+rugrat/SM
 ruin/MDGS
 ruination/SM
 ruinous/Y
@@ -47810,6 +48169,7 @@
 scaly/RTP
 scam/MS
 scammed
+scammer/S
 scamming
 scamp/MRSZ
 scamper/GMD
@@ -47869,6 +48229,7 @@
 scatter/ZGJSMDR
 scatterbrain/MDS
 scattering/M
+scattershot
 scatting
 scatty
 scavenge/ZGDRS
@@ -48524,6 +48885,7 @@
 sequestrate/XDSGN
 sequestration/M
 sequin/SMD
+sequinned
 sequitur
 sequoia/MS
 seraglio/MS
@@ -48627,7 +48989,7 @@
 sewer/MS
 sewerage/M
 sewing/M
-sewn
+sewn/A
 sex/GMDS
 sexagenarian/SM
 sexily
@@ -48641,6 +49003,7 @@
 sextant/SM
 sextet/MS
 sextette/MS
+sexting
 sexton/MS
 sextuplet/SM
 sexual/Y
@@ -48794,7 +49157,9 @@
 sheetlike
 sheik/MS
 sheikdom/MS
+sheikh/M
 sheikhdom/MS
+sheikhs
 sheila/S
 shekel/SM
 shelf/M
@@ -48830,6 +49195,7 @@
 shiftless/PY
 shiftlessness/M
 shifty/RPT
+shiitake/S
 shill/GMDSJ
 shillalah/M
 shillalahs
@@ -49079,6 +49445,8 @@
 sibyl/MS
 sibylline
 sic/S
+sicced
+siccing
 sick/PXTGDNRYS
 sickbay/S
 sickbed/SM
@@ -49205,6 +49573,7 @@
 silversmiths
 silverware/M
 silvery/RT
+sim/S
 simian/MS
 similar/Y
 similarity/ESM
@@ -49637,6 +50006,7 @@
 slumber/GSMD
 slumberous
 slumbrous
+slumdog/SM
 slumlord/MS
 slummed
 slummer
@@ -49673,6 +50043,7 @@
 smartness/M
 smartphone/MS
 smarts/M
+smartwatch/MS
 smarty/SM
 smartypants/M
 smash/MDRSZG
@@ -50135,6 +50506,7 @@
 soulful/YP
 soulfulness/M
 soulless/YP
+soulmate/S
 sound/JPSMDRYZTG
 soundbite/S
 soundboard/SM
@@ -50144,6 +50516,7 @@
 soundness/UM
 soundproof/DGS
 soundproofing/M
+soundscape/S
 soundtrack/SM
 soup/MDGS
 soupcon/MS
@@ -50669,6 +51042,7 @@
 squirt/SGMD
 squish/GMDS
 squishy/RT
+sriracha
 ssh
 st
 stab/MYS
@@ -50771,6 +51145,7 @@
 stapler/M
 star/MDRZGS
 starboard/M
+starburst/S
 starch/GMDS
 starchily
 starchiness/M
@@ -50798,6 +51173,7 @@
 starter/MS
 startle/GDS
 startling/Y
+startup/MS
 starvation/M
 starve/DSJG
 starveling/SM
@@ -51070,9 +51446,10 @@
 stomachs
 stomata
 stomp/GSMD
-stone/DSMG
+stone/DRSMZG
 stoneless
 stonemason/MS
+stoner/M
 stonewall/GSD
 stoneware/M
 stonewashed
@@ -51464,6 +51841,7 @@
 subpena/GMDS
 subplot/MS
 subpoena/GMDS
+subprime
 subprofessional/SM
 subprogram/S
 subroutine/MS
@@ -52142,7 +52520,7 @@
 symptomatic
 symptomatically
 symptomless
-syn
+syn/H
 synagog/MS
 synagogal
 synagogue/SM
@@ -52180,6 +52558,7 @@
 synopsis/M
 synopsizes
 synoptic
+synovial
 syntactic
 syntactical/Y
 syntax/M
@@ -52190,6 +52569,7 @@
 synthesizer/M
 synthetic/SM
 synthetically
+synths
 syphilis/M
 syphilitic/SM
 syringe/DSMG
@@ -52430,6 +52810,7 @@
 tartaric
 tartness/M
 tarty/T
+taser/GMDS
 task/GMDS
 taskmaster/MS
 taskmistress/MS
@@ -52515,6 +52896,7 @@
 teakettle/SM
 teal/MS
 tealeaves
+tealight/MS
 team/GMDS
 teammate/MS
 teamster/MS
@@ -52846,7 +53228,7 @@
 tetrahedral
 tetrahedron/SM
 tetrameter/MS
-text/FMS
+text/FMSDG
 textbook/SM
 textbox/SM
 textile/MS
@@ -54180,6 +54562,7 @@
 truth/UM
 truthful/UPY
 truthfulness/UM
+truthiness
 truths/U
 try/AGDSM
 trying/Y
@@ -54348,6 +54731,7 @@
 twentieth/M
 twentieths
 twenty/SMH
+twerk/SDG
 twerp/SM
 twice
 twiddle/MGDRS
@@ -54395,6 +54779,7 @@
 tying/AU
 tyke/MS
 tympani/M
+tympanic
 tympanist/MS
 tympanum/SM
 type/AGDSM
@@ -54785,6 +55170,7 @@
 unforgettably
 unforgivably
 unfortunate/MS
+unfriend/GD
 unfriendly/T
 unfrock/DG
 unfruitful
@@ -55276,6 +55662,7 @@
 vanquished/U
 vanquisher/M
 vantage/SM
+vape/GDS
 vapid/YP
 vapidity/M
 vapidness/M
@@ -55756,6 +56143,7 @@
 voiced/U
 voiceless/PY
 voicelessness/M
+voicemail/M
 void/MDSGB
 voila
 voile/M
@@ -55838,9 +56226,11 @@
 vulturous
 vulva/M
 vulvae
+vuvuzela/MS
 vying
 w/DNXTGVJ
 wabbit/S
+wack/RTS
 wackes
 wackiness/M
 wacko/SM
@@ -56183,6 +56573,8 @@
 webdesign/MS
 webfeet
 webfoot/M
+webinar/SM
+webisode/MS
 weblog/MS
 webmaster/SM
 webmistress/MS
@@ -56605,6 +56997,7 @@
 wingding/MS
 wingless
 winglike
+wingnut/SM
 wingspan/MS
 wingspread/SM
 wingtip/SM
@@ -57220,6 +57613,7 @@
 zit/SM
 zither/MS
 zloty/SM
+zlotys
 zodiac/MS
 zodiacal
 zombi/SM
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -1347,7 +1347,7 @@
   // elements inside the selection
   nsTArray<nsRefPtr<nsRange>> ranges;
 
-  int32_t count = aSpellCheckSelection->GetRangeCount();
+  int32_t count = aSpellCheckSelection->RangeCount();
 
   for (int32_t idx = 0; idx < count; idx++) {
     nsRange *range = aSpellCheckSelection->GetRangeAt(idx);
@@ -1441,7 +1441,7 @@
   // see if the selection has any ranges, if not, then we can optimize checking
   // range inclusion later (we have no ranges when we are initially checking or
   // when there are no misspelled words yet).
-  int32_t originalRangeCount = aSpellCheckSelection->GetRangeCount();
+  int32_t originalRangeCount = aSpellCheckSelection->RangeCount();
 
   // set the starting DOM position to be the beginning of our range
   {
@@ -1643,7 +1643,7 @@
   rv = mSpellCheck->GetCurrentDictionary(currentDictionary);
   if (NS_FAILED(rv)) {
     // no active dictionary
-    int32_t count = spellCheckSelection->GetRangeCount();
+    int32_t count = spellCheckSelection->RangeCount();
     for (int32_t index = count - 1; index >= 0; index--) {
       nsRange *checkRange = spellCheckSelection->GetRangeAt(index);
       if (checkRange) {
@@ -1714,7 +1714,7 @@
   if (!aSelection)
     return NS_ERROR_FAILURE;
 
-  int32_t count = aSelection->GetRangeCount();
+  int32_t count = aSelection->RangeCount();
 
   for (int32_t index = 0; index < count; index++)
   {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/2D.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/2D.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/2D.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/2D.h	2015-02-28 15:03:12.000000000 +0000
@@ -194,7 +194,10 @@
     : mColor(aColor)
   {}
 
-  virtual PatternType GetType() const { return PatternType::COLOR; }
+  virtual PatternType GetType() const MOZ_OVERRIDE
+  {
+    return PatternType::COLOR;
+  }
 
   Color mColor;
 };
@@ -219,7 +222,10 @@
   {
   }
 
-  virtual PatternType GetType() const { return PatternType::LINEAR_GRADIENT; }
+  virtual PatternType GetType() const MOZ_OVERRIDE
+  {
+    return PatternType::LINEAR_GRADIENT;
+  }
 
   Point mBegin;                 //!< Start of the linear gradient
   Point mEnd;                   /**< End of the linear gradient - NOTE: In the case
@@ -256,7 +262,10 @@
   {
   }
 
-  virtual PatternType GetType() const { return PatternType::RADIAL_GRADIENT; }
+  virtual PatternType GetType() const MOZ_OVERRIDE
+  {
+    return PatternType::RADIAL_GRADIENT;
+  }
 
   Point mCenter1; //!< Center of the inner (focal) circle.
   Point mCenter2; //!< Center of the outer circle.
@@ -286,7 +295,10 @@
     , mSamplingRect(aSamplingRect)
   {}
 
-  virtual PatternType GetType() const { return PatternType::SURFACE; }
+  virtual PatternType GetType() const MOZ_OVERRIDE
+  {
+    return PatternType::SURFACE;
+  }
 
   RefPtr<SourceSurface> mSurface; //!< Surface to use for drawing
   ExtendMode mExtendMode;         /**< This determines how the image is extended
@@ -359,7 +371,7 @@
 class DataSourceSurface : public SourceSurface
 {
 public:
-  MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DataSourceSurface)
+  MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(DataSourceSurface, MOZ_OVERRIDE)
   DataSourceSurface()
     : mIsMapped(false)
   {
@@ -383,7 +395,7 @@
     READ_WRITE
   };
 
-  virtual SurfaceType GetType() const { return SurfaceType::DATA; }
+  virtual SurfaceType GetType() const MOZ_OVERRIDE { return SurfaceType::DATA; }
   /** @deprecated
    * Get the raw bitmap data of the surface.
    * Can return null if there was OOM allocating surface data.
@@ -415,7 +427,7 @@
    * Returns a DataSourceSurface with the same data as this one, but
    * guaranteed to have surface->GetType() == SurfaceType::DATA.
    */
-  virtual TemporaryRef<DataSourceSurface> GetDataSurface();
+  virtual TemporaryRef<DataSourceSurface> GetDataSurface() MOZ_OVERRIDE;
 
 protected:
   bool mIsMapped;
@@ -1154,6 +1166,8 @@
   // This is a little hacky at the moment, but we want to have this data. Bug 1068613.
   static void SetLogForwarder(LogForwarder* aLogFwd);
 
+  static uint32_t GetMaxSurfaceSize(BackendType aType);
+
   static LogForwarder* GetLogForwarder() { return mLogForwarder; }
 
 private:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/BaseRect.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/BaseRect.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/BaseRect.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/BaseRect.h	2015-02-28 15:03:12.000000000 +0000
@@ -111,8 +111,8 @@
     Sub result;
     result.x = std::max<T>(x, aRect.x);
     result.y = std::max<T>(y, aRect.y);
-    result.width = std::min<T>(XMost(), aRect.XMost()) - result.x;
-    result.height = std::min<T>(YMost(), aRect.YMost()) - result.y;
+    result.width = std::min<T>(x - result.x + width, aRect.x - result.x + aRect.width);
+    result.height = std::min<T>(y - result.y + height, aRect.y - result.y + aRect.height);
     if (result.width < 0 || result.height < 0) {
       result.SizeTo(0, 0);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetCairo.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetCairo.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetCairo.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetCairo.h	2015-02-28 15:03:12.000000000 +0000
@@ -170,6 +170,11 @@
 
   static cairo_surface_t *GetDummySurface();
 
+  // Cairo hardcodes this as its maximum surface size.
+  static size_t GetMaxSurfaceSize() {
+    return 32767;
+  }
+
 private: // methods
   // Init cairo surface without doing a cairo_surface_reference() call.
   bool InitAlreadyReferenced(cairo_surface_t* aSurface, const IntSize& aSize, SurfaceFormat* aFormat = nullptr);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetCG.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetCG.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetCG.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetCG.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -11,6 +11,7 @@
 #include "Rect.h"
 #include "ScaledFontMac.h"
 #include "Tools.h"
+#include "PathHelpers.h"
 #include <vector>
 #include <algorithm>
 #include "MacIOSurface.h"
@@ -990,13 +991,162 @@
   CGContextRestoreGState(mCg);
 }
 
+static Float
+DashPeriodLength(const StrokeOptions& aStrokeOptions)
+{
+  Float length = 0;
+  for (size_t i = 0; i < aStrokeOptions.mDashLength; i++) {
+    length += aStrokeOptions.mDashPattern[i];
+  }
+  if (aStrokeOptions.mDashLength & 1) {
+    // "If an odd number of values is provided, then the list of values is
+    // repeated to yield an even number of values."
+    // Double the length.
+    length += length;
+  }
+  return length;
+}
+
+inline Float
+RoundDownToMultiple(Float aValue, Float aFactor)
+{
+  return floorf(aValue / aFactor) * aFactor;
+}
+
+static Rect
+UserSpaceStrokeClip(const Rect &aDeviceClip,
+                   const Matrix &aTransform,
+                   const StrokeOptions &aStrokeOptions)
+{
+  Matrix inverse = aTransform;
+  if (!inverse.Invert()) {
+    return Rect();
+  }
+  Rect deviceClip = aDeviceClip;
+  deviceClip.Inflate(MaxStrokeExtents(aStrokeOptions, aTransform));
+  return inverse.TransformBounds(deviceClip);
+}
+
+static Rect
+ShrinkClippedStrokedRect(const Rect &aStrokedRect, const Rect &aDeviceClip,
+                         const Matrix &aTransform,
+                         const StrokeOptions &aStrokeOptions)
+{
+  Rect userSpaceStrokeClip =
+    UserSpaceStrokeClip(aDeviceClip, aTransform, aStrokeOptions);
+
+  Rect intersection = aStrokedRect.Intersect(userSpaceStrokeClip);
+  Float dashPeriodLength = DashPeriodLength(aStrokeOptions);
+  if (intersection.IsEmpty() || dashPeriodLength == 0.0f) {
+    return intersection;
+  }
+
+  // Reduce the rectangle side lengths in multiples of the dash period length
+  // so that the visible dashes stay in the same place.
+  Margin insetBy = aStrokedRect - intersection;
+  insetBy.top = RoundDownToMultiple(insetBy.top, dashPeriodLength);
+  insetBy.right = RoundDownToMultiple(insetBy.right, dashPeriodLength);
+  insetBy.bottom = RoundDownToMultiple(insetBy.bottom, dashPeriodLength);
+  insetBy.left = RoundDownToMultiple(insetBy.left, dashPeriodLength);
+
+  Rect shrunkRect = aStrokedRect;
+  shrunkRect.Deflate(insetBy);
+  return shrunkRect;
+}
+
+// Liang-Barsky
+// This algorithm was chosen for its code brevity, with the hope that its
+// performance is good enough.
+// Sets aStart and aEnd to floats between 0 and the line length, or returns
+// false if the line is completely outside the rect.
+static bool
+IntersectLineWithRect(const Point& aP1, const Point& aP2, const Rect& aClip,
+                      Float* aStart, Float* aEnd)
+{
+  Float t0 = 0.0f;
+  Float t1 = 1.0f;
+  Point vector = aP2 - aP1;
+  for (uint32_t edge = 0; edge < 4; edge++) {
+    Float p, q;
+    switch (edge) {
+      case 0: p = -vector.x; q = aP1.x - aClip.x; break;
+      case 1: p =  vector.x; q = aClip.XMost() - aP1.x; break;
+      case 2: p = -vector.y; q = aP1.y - aClip.y; break;
+      case 3: p =  vector.y; q = aClip.YMost() - aP1.y; break;
+    }
+
+    if (p == 0.0f) {
+      // Line is parallel to the edge.
+      if (q < 0.0f) {
+        return false;
+      }
+      continue;
+    }
+
+    Float r = q / p;
+    if (p < 0) {
+      t0 = std::max(t0, r);
+    } else {
+      t1 = std::min(t1, r);
+    }
+
+    if (t0 > t1) {
+      return false;
+    }
+  }
+
+  Float length = vector.Length();
+  *aStart = t0 * length;
+  *aEnd = t1 * length;
+  return true;
+}
+
+// Adjusts aP1 and aP2 to a shrunk line, or returns false if the line is
+// completely outside the clip.
+static bool
+ShrinkClippedStrokedLine(Point &aP1, Point& aP2, const Rect &aDeviceClip,
+                         const Matrix &aTransform,
+                         const StrokeOptions &aStrokeOptions)
+{
+  Rect userSpaceStrokeClip =
+    UserSpaceStrokeClip(aDeviceClip, aTransform, aStrokeOptions);
+
+  Point vector = aP2 - aP1;
+  Float length = vector.Length();
+
+  if (length == 0.0f) {
+    return true;
+  }
+
+  Float start = 0;
+  Float end = length;
+  if (!IntersectLineWithRect(aP1, aP2, userSpaceStrokeClip, &start, &end)) {
+    return false;
+  }
+
+  Float dashPeriodLength = DashPeriodLength(aStrokeOptions);
+  if (dashPeriodLength > 0.0f) {
+    // Shift the line points by multiples of dashPeriodLength so that the
+    // dashes stay in the same place.
+    start = RoundDownToMultiple(start, dashPeriodLength);
+    end = length - RoundDownToMultiple(length - end, dashPeriodLength);
+  }
+
+  Point startPoint = aP1;
+  aP1 = Point(startPoint.x + start * vector.x / length,
+              startPoint.y + start * vector.y / length);
+  aP2 = Point(startPoint.x + end * vector.x / length,
+              startPoint.y + end * vector.y / length);
+  return true;
+}
+
 void
-DrawTargetCG::StrokeLine(const Point &p1, const Point &p2, const Pattern &aPattern, const StrokeOptions &aStrokeOptions, const DrawOptions &aDrawOptions)
+DrawTargetCG::StrokeLine(const Point &aP1, const Point &aP2, const Pattern &aPattern, const StrokeOptions &aStrokeOptions, const DrawOptions &aDrawOptions)
 {
-  if (!std::isfinite(p1.x) ||
-      !std::isfinite(p1.y) ||
-      !std::isfinite(p2.x) ||
-      !std::isfinite(p2.y)) {
+  if (!std::isfinite(aP1.x) ||
+      !std::isfinite(aP1.y) ||
+      !std::isfinite(aP2.x) ||
+      !std::isfinite(aP2.y)) {
     return;
   }
 
@@ -1004,6 +1154,14 @@
     return;
   }
 
+  Point p1 = aP1;
+  Point p2 = aP2;
+
+  Rect deviceClip(0, 0, mSize.width, mSize.height);
+  if (!ShrinkClippedStrokedLine(p1, p2, deviceClip, mTransform, aStrokeOptions)) {
+    return;
+  }
+
   MarkChanged();
 
   CGContextSaveGState(mCg);
@@ -1078,6 +1236,20 @@
   if (MOZ2D_ERROR_IF(!cg)) {
     return;
   }
+
+  // Stroking large rectangles with dashes is expensive with CG (fixed
+  // overhead based on the number of dashes, regardless of whether the dashes
+  // are visible), so we try to reduce the size of the stroked rectangle as
+  // much as possible before passing it on to CG.
+  Rect rect = aRect;
+  if (!rect.IsEmpty()) {
+    Rect deviceClip(0, 0, mSize.width, mSize.height);
+    rect = ShrinkClippedStrokedRect(rect, deviceClip, mTransform, aStrokeOptions);
+    if (rect.IsEmpty()) {
+      return;
+    }
+  }
+
   CGContextSetAlpha(mCg, aDrawOptions.mAlpha);
   CGContextSetBlendMode(mCg, ToBlendMode(aDrawOptions.mCompositionOp));
 
@@ -1521,10 +1693,11 @@
 {
   // XXX: we should come up with some consistent semantics for dealing
   // with zero area drawtargets
-  if (aSize.width <= 0 || aSize.height <= 0 ||
-      // 32767 is the maximum size supported by cairo
-      // we clamp to that to make it easier to interoperate
-      aSize.width > 32767 || aSize.height > 32767) {
+  if (aSize.width <= 0 ||
+      aSize.height <= 0 ||
+      size_t(aSize.width) > GetMaxSurfaceSize() ||
+      size_t(aSize.height) > GetMaxSurfaceSize())
+  {
     gfxWarning() << "Failed to Init() DrawTargetCG because of bad size.";
     mColorSpace = nullptr;
     mCg = nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetCG.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetCG.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetCG.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetCG.h	2015-02-28 15:03:12.000000000 +0000
@@ -183,6 +183,13 @@
   CGContextRef GetCGContext() {
       return mCg;
   }
+
+  // 32767 is the maximum size supported by cairo. We clamp to that to make it
+  // easier to interoperate.
+  static size_t GetMaxSurfaceSize() {
+    return 32767;
+  }
+
 private:
   void MarkChanged();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D1.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D1.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D1.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D1.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -827,7 +827,7 @@
   hr = mDC->CreateBitmap(D2DIntSize(aSize), nullptr, 0, props, (ID2D1Bitmap1**)byRef(mTempBitmap));
 
   if (FAILED(hr)) {
-    gfxCriticalError() << "[D2D1.1] failed to create new TempBitmap " << aSize << " Code: " << hexa(hr);
+    gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(aSize))) << "[D2D1.1] failed to create new TempBitmap " << aSize << " Code: " << hexa(hr);
     return false;
   }
 
@@ -965,7 +965,13 @@
     }
 
     RefPtr<ID2D1Bitmap> tmpBitmap;
-    mDC->CreateBitmap(D2DIntSize(mSize), D2D1::BitmapProperties(D2DPixelFormat(mFormat)), byRef(tmpBitmap));
+    HRESULT hr = mDC->CreateBitmap(D2DIntSize(mSize), D2D1::BitmapProperties(D2DPixelFormat(mFormat)), byRef(tmpBitmap));
+    if (FAILED(hr)) {
+      gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(mSize))) << "[D2D1.1] 5CreateBitmap 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;
+    }
 
     // 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.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D1.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D1.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D1.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D1.h	2015-02-28 15:03:12.000000000 +0000
@@ -144,6 +144,10 @@
     return stream.str();
   }
 
+  static uint32_t GetMaxSurfaceSize() {
+    return D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION;
+  }
+
   static uint64_t mVRAMUsageDT;
   static uint64_t mVRAMUsageSS;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -138,14 +138,18 @@
     sink->Close();
 
     RefPtr<ID2D1BitmapBrush> brush;
-    rt->CreateBitmapBrush(mOldSurfBitmap, D2D1::BitmapBrushProperties(), D2D1::BrushProperties(), byRef(brush));                   
+    HRESULT hr = rt->CreateBitmapBrush(mOldSurfBitmap, D2D1::BitmapBrushProperties(), D2D1::BrushProperties(), byRef(brush));
+    if (FAILED(hr)) {
+      gfxCriticalError(CriticalLog::DefaultOptions(false)) << "[D2D] CreateBitmapBrush failure " << hexa(hr);
+      return;
+    }
 
     rt->FillGeometry(invClippedArea, brush);
   }
 
 private:
 
-  DrawTargetD2D *mDT;  
+  DrawTargetD2D *mDT;
 
   // If we have an operator unbound by the source, this will contain a bitmap
   // with the old dest surface data.
@@ -308,7 +312,12 @@
 
       D2D1_BITMAP_PROPERTIES props =
         D2D1::BitmapProperties(D2DPixelFormat(srcSurf->GetFormat()));
-      mRT->CreateBitmap(D2D1::SizeU(UINT32(sourceRect.width), UINT32(sourceRect.height)), data, stride, props, byRef(bitmap));
+      HRESULT hr = mRT->CreateBitmap(D2D1::SizeU(UINT32(sourceRect.width), UINT32(sourceRect.height)), data, stride, props, byRef(bitmap));
+      if (FAILED(hr)) {
+        IntSize size(sourceRect.width, sourceRect.height);
+        gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(size))) << "[D2D] 1CreateBitmap failure " << size << " Code: " << hexa(hr);
+        return nullptr;
+      }
 
       // subtract the integer part leaving the fractional part
       aSource.x -= (uint32_t)aSource.x;
@@ -2415,14 +2424,17 @@
       }
       break;
     }
-    
-    mRT->CreateBitmapBrush(bitmap,
+
+    HRESULT hr = mRT->CreateBitmapBrush(bitmap,
                            D2D1::BitmapBrushProperties(D2DExtend(pat->mExtendMode),
                                                        D2DExtend(pat->mExtendMode),
                                                        D2DFilter(pat->mFilter)),
                            D2D1::BrushProperties(aAlpha, D2DMatrix(mat)),
                            byRef(bmBrush));
-
+    if (FAILED(hr)) {
+      gfxCriticalError() << "[D2D] 1CreateBitmapBrush failure: " << hexa(hr);
+      return nullptr;
+    }
     return bmBrush.forget();
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetD2D.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetD2D.h	2015-02-28 15:03:12.000000000 +0000
@@ -145,6 +145,10 @@
   static IDWriteFactory *GetDWriteFactory();
   ID2D1RenderTarget *GetRT() { return mRT; }
 
+  static uint32_t GetMaxSurfaceSize() {
+    return D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION;
+  }
+
   operator std::string() const {
     std::stringstream stream;
     stream << "DrawTargetD2D(" << this << ")";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetTiled.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetTiled.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/DrawTargetTiled.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/DrawTargetTiled.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -3,11 +3,9 @@
  * License, v. 2.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 _USE_MATH_DEFINES
-#include <cmath>
-
 #include "DrawTargetTiled.h"
 #include "Logging.h"
+#include "PathHelpers.h"
 
 using namespace std;
 
@@ -107,8 +105,6 @@
 TILED_COMMAND4(DrawFilter, FilterNode*, const Rect&, const Point&, const DrawOptions&)
 TILED_COMMAND1(ClearRect, const Rect&)
 TILED_COMMAND4(MaskSurface, const Pattern&, SourceSurface*, Point, const DrawOptions&)
-TILED_COMMAND4(StrokeRect, const Rect&, const Pattern&, const StrokeOptions&, const DrawOptions&)
-TILED_COMMAND5(StrokeLine, const Point&, const Point&, const Pattern&, const StrokeOptions&, const DrawOptions&)
 TILED_COMMAND5(FillGlyphs, ScaledFont*, const GlyphBuffer&, const Pattern&, const DrawOptions&, const GlyphRenderingOptions*)
 TILED_COMMAND3(Mask, const Pattern&, const Pattern&, const DrawOptions&)
 
@@ -232,47 +228,64 @@
   }
 }
 
-// The logic for this comes from _cairo_stroke_style_max_distance_from_path
-static Rect
-PathExtentsToMaxStrokeExtents(const StrokeOptions &aStrokeOptions,
-                              const Rect &aRect,
-                              const Matrix &aTransform)
+void
+DrawTargetTiled::Stroke(const Path* aPath, const Pattern& aPattern, const StrokeOptions& aStrokeOptions, const DrawOptions& aDrawOptions)
 {
-  double styleExpansionFactor = 0.5f;
-
-  if (aStrokeOptions.mLineCap == CapStyle::SQUARE) {
-    styleExpansionFactor = M_SQRT1_2;
+  // Approximate the stroke extents, since Path::GetStrokeExtents can be slow
+  Rect deviceRect = aPath->GetBounds(mTransform);
+  deviceRect.Inflate(MaxStrokeExtents(aStrokeOptions, mTransform));
+  for (size_t i = 0; i < mTiles.size(); i++) {
+    if (!mTiles[i].mClippedOut &&
+        deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
+                                   mTiles[i].mTileOrigin.y,
+                                   mTiles[i].mDrawTarget->GetSize().width,
+                                   mTiles[i].mDrawTarget->GetSize().height))) {
+      mTiles[i].mDrawTarget->Stroke(aPath, aPattern, aStrokeOptions, aDrawOptions);
+    }
   }
+}
 
-  if (aStrokeOptions.mLineJoin == JoinStyle::MITER &&
-      styleExpansionFactor < M_SQRT2 * aStrokeOptions.mMiterLimit) {
-    styleExpansionFactor = M_SQRT2 * aStrokeOptions.mMiterLimit;
+void
+DrawTargetTiled::StrokeRect(const Rect& aRect, const Pattern& aPattern, const StrokeOptions &aStrokeOptions, const DrawOptions& aDrawOptions)
+{
+  Rect deviceRect = mTransform.TransformBounds(aRect);
+  Margin strokeMargin = MaxStrokeExtents(aStrokeOptions, mTransform);
+  Rect outerRect = deviceRect;
+  outerRect.Inflate(strokeMargin);
+  Rect innerRect;
+  if (mTransform.IsRectilinear()) {
+    // If rects are mapped to rects, we can compute the inner rect
+    // of the stroked rect.
+    innerRect = deviceRect;
+    innerRect.Deflate(strokeMargin);
+  }
+  for (size_t i = 0; i < mTiles.size(); i++) {
+    if (mTiles[i].mClippedOut) {
+      continue;
+    }
+    Rect tileRect(mTiles[i].mTileOrigin.x,
+                  mTiles[i].mTileOrigin.y,
+                  mTiles[i].mDrawTarget->GetSize().width,
+                  mTiles[i].mDrawTarget->GetSize().height);
+    if (outerRect.Intersects(tileRect) && !innerRect.Contains(tileRect)) {
+      mTiles[i].mDrawTarget->StrokeRect(aRect, aPattern, aStrokeOptions, aDrawOptions);
+    }
   }
-
-  styleExpansionFactor *= aStrokeOptions.mLineWidth;
-
-  double dx = styleExpansionFactor * hypot(aTransform._11, aTransform._21);
-  double dy = styleExpansionFactor * hypot(aTransform._22, aTransform._12);
-
-  Rect result = aRect;
-  result.Inflate(dx, dy);
-  return result;
 }
 
 void
-DrawTargetTiled::Stroke(const Path* aPath, const Pattern& aPattern, const StrokeOptions& aStrokeOptions, const DrawOptions& aDrawOptions)
+DrawTargetTiled::StrokeLine(const Point& aStart, const Point& aEnd, const Pattern& aPattern, const StrokeOptions &aStrokeOptions, const DrawOptions& aDrawOptions)
 {
-  // Approximate the stroke extents, since Path::GetStrokeExtents can be slow
-  Rect deviceRect = PathExtentsToMaxStrokeExtents(aStrokeOptions,
-                                                 aPath->GetBounds(mTransform),
-                                                 mTransform);
+  Rect lineBounds = Rect(aStart, Size()).UnionEdges(Rect(aEnd, Size()));
+  Rect deviceRect = mTransform.TransformBounds(lineBounds);
+  deviceRect.Inflate(MaxStrokeExtents(aStrokeOptions, mTransform));
   for (size_t i = 0; i < mTiles.size(); i++) {
     if (!mTiles[i].mClippedOut &&
         deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
                                    mTiles[i].mTileOrigin.y,
                                    mTiles[i].mDrawTarget->GetSize().width,
                                    mTiles[i].mDrawTarget->GetSize().height))) {
-      mTiles[i].mDrawTarget->Stroke(aPath, aPattern, aStrokeOptions, aDrawOptions);
+      mTiles[i].mDrawTarget->StrokeLine(aStart, aEnd, aPattern, aStrokeOptions, aDrawOptions);
     }
   }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/Factory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/Factory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/Factory.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/Factory.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -449,6 +449,30 @@
   return false;
 }
 
+uint32_t
+Factory::GetMaxSurfaceSize(BackendType aType)
+{
+  switch (aType) {
+  case BackendType::CAIRO:
+  case BackendType::COREGRAPHICS:
+    return DrawTargetCairo::GetMaxSurfaceSize();
+#ifdef XP_MACOSX
+  case BackendType::COREGRAPHICS_ACCELERATED:
+    return DrawTargetCG::GetMaxSurfaceSize();
+#endif
+  case BackendType::SKIA:
+    return INT_MAX;
+#ifdef WIN32
+  case BackendType::DIRECT2D:
+    return DrawTargetD2D::GetMaxSurfaceSize();
+  case BackendType::DIRECT2D1_1:
+    return DrawTargetD2D1::GetMaxSurfaceSize();
+#endif
+  default:
+    return 0;
+  }
+}
+
 TemporaryRef<ScaledFont>
 Factory::CreateScaledFontForNativeFont(const NativeFont &aNativeFont, Float aSize)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/GenericRefCounted.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/GenericRefCounted.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/GenericRefCounted.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/GenericRefCounted.h	2015-02-28 15:03:12.000000000 +0000
@@ -57,7 +57,7 @@
     }
 
   public:
-    virtual void AddRef() {
+    virtual void AddRef() MOZ_OVERRIDE {
       // Note: this method must be thread safe for GenericAtomicRefCounted.
       MOZ_ASSERT(int32_t(refCnt) >= 0);
 #ifndef MOZ_REFCOUNTED_LEAK_CHECKING
@@ -71,7 +71,7 @@
 #endif
     }
 
-    virtual void Release() {
+    virtual void Release() MOZ_OVERRIDE {
       // Note: this method must be thread safe for GenericAtomicRefCounted.
       MOZ_ASSERT(int32_t(refCnt) > 0);
 #ifndef MOZ_REFCOUNTED_LEAK_CHECKING
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/Makefile.in	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/Makefile.in	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/.
-
-include $(topsrcdir)/config/rules.mk
-
-# Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those
-# macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This
-# changes the symbol names of exported C++ functions that use LOGFONT.
-DEFINES := $(filter-out -DUNICODE -D_UNICODE,$(DEFINES))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/moz.build	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/moz.build	2015-02-28 15:03:12.000000000 +0000
@@ -109,6 +109,7 @@
     'DrawTargetCapture.cpp',
     'DrawTargetDual.cpp',
     'DrawTargetRecording.cpp',
+    'DrawTargetTiled.cpp',
     'Factory.cpp',
     'FilterNodeSoftware.cpp',
     'FilterProcessing.cpp',
@@ -117,7 +118,6 @@
     'Matrix.cpp',
     'Path.cpp',
     'PathCairo.cpp',
-    'PathHelpers.cpp',
     'PathRecording.cpp',
     'RecordedEvent.cpp',
     'Scale.cpp',
@@ -128,7 +128,7 @@
 ]
 
 SOURCES += [
-    'DrawTargetTiled.cpp',
+    'PathHelpers.cpp', # Uses _USE_MATH_DEFINES
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
@@ -170,3 +170,10 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    # Due to bug 796023, we can't have -DUNICODE and -D_UNICODE; defining those
+    # macros changes the type of LOGFONT to LOGFONTW instead of LOGFONTA. This
+    # changes the symbol names of exported C++ functions that use LOGFONT.
+    del DEFINES['UNICODE']
+    del DEFINES['_UNICODE']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/PathHelpers.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/PathHelpers.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/PathHelpers.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/PathHelpers.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -3,6 +3,9 @@
  * License, v. 2.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 _USE_MATH_DEFINES
+#include <cmath>
+
 #include "PathHelpers.h"
 
 namespace mozilla {
@@ -238,6 +241,29 @@
   aDrawTarget.StrokeLine(p1, p2, aColor, aStrokeOptions);
 }
 
+// The logic for this comes from _cairo_stroke_style_max_distance_from_path
+Margin
+MaxStrokeExtents(const StrokeOptions& aStrokeOptions,
+                 const Matrix& aTransform)
+{
+  double styleExpansionFactor = 0.5f;
+
+  if (aStrokeOptions.mLineCap == CapStyle::SQUARE) {
+    styleExpansionFactor = M_SQRT1_2;
+  }
+
+  if (aStrokeOptions.mLineJoin == JoinStyle::MITER &&
+      styleExpansionFactor < M_SQRT2 * aStrokeOptions.mMiterLimit) {
+    styleExpansionFactor = M_SQRT2 * aStrokeOptions.mMiterLimit;
+  }
+
+  styleExpansionFactor *= aStrokeOptions.mLineWidth;
+
+  double dx = styleExpansionFactor * hypot(aTransform._11, aTransform._21);
+  double dy = styleExpansionFactor * hypot(aTransform._22, aTransform._12);
+  return Margin(dy, dx, dy, dx);
+}
+
 } // namespace gfx
 } // namespace mozilla
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/PathHelpers.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/PathHelpers.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/2d/PathHelpers.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/2d/PathHelpers.h	2015-02-28 15:03:12.000000000 +0000
@@ -283,6 +283,16 @@
                                         const ColorPattern& aColor,
                                         const StrokeOptions& aStrokeOptions);
 
+/**
+ * Return the margin, in device space, by which a stroke can extend beyond the
+ * rendered shape.
+ * @param  aStrokeOptions The stroke options that the stroke is drawn with.
+ * @param  aTransform     The user space to device space transform.
+ * @return                The stroke margin.
+ */
+GFX2D_API Margin MaxStrokeExtents(const StrokeOptions& aStrokeOptions,
+                                  const Matrix& aTransform);
+
 extern UserDataKey sDisablePixelSnapping;
 
 /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/moz.build	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/moz.build	2015-02-28 15:03:12.000000000 +0000
@@ -117,9 +117,6 @@
 DEFINES['GL_GLEXT_PROTOTYPES'] = ""
 DEFINES['EGLAPI'] = ""
 
-# ANGLE uses the STL, so we can't use our derpy STL wrappers.
-DISABLE_STL_WRAPPING = True
-
 
 # Only build libEGL/libGLESv2 on Windows
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/src/commit.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/src/commit.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/src/commit.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/src/commit.h	2015-02-28 15:03:12.000000000 +0000
@@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "180bf375fb42"
+#define ANGLE_COMMIT_HASH "040a674b6d67"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2015-02-05 14:21:03 -0500"
+#define ANGLE_COMMIT_DATE "2015-02-18 11:50:36 -0500"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/src/libGLESv2/libGLESv2.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/src/libGLESv2/libGLESv2.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/src/libGLESv2/libGLESv2.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/src/libGLESv2/libGLESv2.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -295,7 +295,7 @@
 
     if (context)
     {
-        context->getState().setBlendColor(gl::clamp01(red), gl::clamp01(green), gl::clamp01(blue), gl::clamp01(alpha));
+        context->getState().setBlendColor(red, green, blue, alpha);
     }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/src/libGLESv2/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/src/libGLESv2/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/angle/src/libGLESv2/moz.build	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/angle/src/libGLESv2/moz.build	2015-02-28 15:03:12.000000000 +0000
@@ -234,5 +234,6 @@
 
 SOURCES['renderer/d3d/HLSLCompiler.cpp'].flags += ['-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES=\'{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }\'']
 
-SOURCES['renderer/d3d/d3d11/SwapChain11.cpp'].flags += ['-DANGLE_RESOURCE_SHARE_TYPE=D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX']
+if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
+    SOURCES['renderer/d3d/d3d11/SwapChain11.cpp'].flags += ['-DANGLE_RESOURCE_SHARE_TYPE=D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX']
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContext.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContext.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContext.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContext.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -1412,6 +1412,20 @@
             }
         }
 
+        if (IsSupported(GLFeature::read_buffer)) {
+            SymLoadStruct extSymbols[] = {
+                { (PRFuncPtr*) &mSymbols.fReadBuffer, { "ReadBuffer",    nullptr } },
+                END_SYMBOLS
+            };
+
+            if (!LoadSymbols(&extSymbols[0], trygl, prefix)) {
+                NS_ERROR("GL supports read_buffer without supplying its functions.");
+
+                MarkUnsupported(GLFeature::read_buffer);
+                ClearSymbols(extSymbols);
+            }
+        }
+
         // Load developer symbols, don't fail if we can't find them.
         SymLoadStruct auxSymbols[] = {
                 { (PRFuncPtr*) &mSymbols.fGetTexImage, { "GetTexImage", nullptr } },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContextFeatures.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContextFeatures.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContextFeatures.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContextFeatures.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -409,6 +409,15 @@
          */
     },
     {
+        "read_buffer",
+        GLVersion::GL2,
+        GLESVersion::ES3,
+        GLContext::Extension_None,
+        {
+            GLContext::Extensions_End
+        }
+    },
+    {
         "renderbuffer_color_float",
         GLVersion::GL3,
         GLESVersion::ES3,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContext.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContext.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContext.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContext.h	2015-02-28 15:03:12.000000000 +0000
@@ -115,6 +115,7 @@
     occlusion_query2,
     packed_depth_stencil,
     query_objects,
+    read_buffer,
     renderbuffer_color_float,
     renderbuffer_color_half_float,
     robustness,
@@ -885,7 +886,7 @@
         AFTER_GL_CALL;
     }
 
-    void fBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) {
+    void fBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) {
         BEFORE_GL_CALL;
         mSymbols.fBlendColor(red, green, blue, alpha);
         AFTER_GL_CALL;
@@ -985,7 +986,7 @@
         AFTER_GL_CALL;
     }
 
-    void fClearColor(GLclampf r, GLclampf g, GLclampf b, GLclampf a) {
+    void fClearColor(GLfloat r, GLfloat g, GLfloat b, GLfloat a) {
         BEFORE_GL_CALL;
         mSymbols.fClearColor(r, g, b, a);
         AFTER_GL_CALL;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContextSymbols.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContextSymbols.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLContextSymbols.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLContextSymbols.h	2015-02-28 15:03:12.000000000 +0000
@@ -49,7 +49,7 @@
     PFNGLBINDTEXTUREPROC fBindTexture;
     typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYPROC) (GLuint array);
     PFNGLBINDVERTEXARRAYPROC fBindVertexArray;
-    typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+    typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
     PFNGLBLENDCOLORPROC fBlendColor;
     typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
     PFNGLBLENDEQUATIONPROC fBlendEquation;
@@ -73,7 +73,7 @@
     PFNGLCLEARBUFFERIVPROC fClearBufferiv;
     typedef void (GLAPIENTRY * PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint* value);
     PFNGLCLEARBUFFERUIVPROC fClearBufferuiv;
-    typedef void (GLAPIENTRY * PFNGLCLEARCOLORPROC) (GLclampf, GLclampf, GLclampf, GLclampf);
+    typedef void (GLAPIENTRY * PFNGLCLEARCOLORPROC) (GLfloat, GLfloat, GLfloat, GLfloat);
     PFNGLCLEARCOLORPROC fClearColor;
     typedef void (GLAPIENTRY * PFNGLCLEARSTENCILPROC) (GLint);
     PFNGLCLEARSTENCILPROC fClearStencil;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLLibraryEGL.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLLibraryEGL.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLLibraryEGL.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLLibraryEGL.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -42,6 +42,8 @@
 
 static PRLibrary* LoadApitraceLibrary()
 {
+    // Initialization of gfx prefs here is only needed during the unit tests...
+    gfxPrefs::GetSingleton();
     if (!gfxPrefs::UseApitrace()) {
         return nullptr;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLScreenBuffer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLScreenBuffer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLScreenBuffer.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLScreenBuffer.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -421,6 +421,12 @@
     // Check that we're all set up.
     MOZ_ASSERT(SharedSurf() == surf);
 
+    // Update the ReadBuffer mode.
+    if (mGL->IsSupported(gl::GLFeature::read_buffer)) {
+        BindFB(0);
+        mRead->SetReadBuffer(mUserReadBufferMode);
+    }
+
     return true;
 }
 
@@ -517,6 +523,16 @@
     return ReadBuffer::Create(gl, caps, formats, surf);
 }
 
+void
+GLScreenBuffer::SetReadBuffer(GLenum mode)
+{
+    MOZ_ASSERT(mGL->IsSupported(gl::GLFeature::read_buffer));
+    MOZ_ASSERT(GetReadFB() == 0);
+
+    mUserReadBufferMode = mode;
+    mRead->SetReadBuffer(mUserReadBufferMode);
+}
+
 bool
 GLScreenBuffer::IsDrawFramebufferDefault() const
 {
@@ -636,7 +652,6 @@
 
     if (surf->mAttachType == AttachmentType::Screen) {
         // Don't need anything. Our read buffer will be the 'screen'.
-
         return UniquePtr<ReadBuffer>( new ReadBuffer(gl, 0, 0, 0,
                                                      surf) );
     }
@@ -740,5 +755,31 @@
     return mSurf->mSize;
 }
 
+void
+ReadBuffer::SetReadBuffer(GLenum userMode) const
+{
+    if (!mGL->IsSupported(GLFeature::read_buffer))
+        return;
+
+    GLenum internalMode;
+
+    switch (userMode) {
+    case LOCAL_GL_BACK:
+        internalMode = (mFB == 0) ? LOCAL_GL_BACK
+                                  : LOCAL_GL_COLOR_ATTACHMENT0;
+        break;
+
+    case LOCAL_GL_NONE:
+        internalMode = LOCAL_GL_NONE;
+        break;
+
+    default:
+        MOZ_CRASH("Bad value.");
+    }
+
+    mGL->MakeCurrent();
+    mGL->fReadBuffer(internalMode);
+}
+
 } /* namespace gl */
 } /* namespace mozilla */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLScreenBuffer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLScreenBuffer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/GLScreenBuffer.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/GLScreenBuffer.h	2015-02-28 15:03:12.000000000 +0000
@@ -116,6 +116,8 @@
     SharedSurface* SharedSurf() const {
         return mSurf;
     }
+
+    void SetReadBuffer(GLenum mode) const;
 };
 
 
@@ -142,6 +144,8 @@
 
     bool mNeedsBlit;
 
+    GLenum mUserReadBufferMode;
+
     // Below are the parts that help us pretend to be framebuffer 0:
     GLuint mUserDrawFB;
     GLuint mUserReadFB;
@@ -160,6 +164,7 @@
         , mCaps(caps)
         , mFactory(Move(factory))
         , mNeedsBlit(true)
+        , mUserReadBufferMode(LOCAL_GL_BACK)
         , mUserDrawFB(0)
         , mUserReadFB(0)
         , mInternalDrawFB(0)
@@ -223,6 +228,8 @@
     void AfterDrawCall();
     void BeforeReadCall();
 
+    void SetReadBuffer(GLenum userMode);
+
     /**
      * Attempts to read pixels from the current bound framebuffer, if
      * it is backed by a SharedSurface.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/Makefile.in	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/Makefile.in	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/.
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES := $(filter-out -DUNICODE,$(DEFINES))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/gl/moz.build	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/gl/moz.build	2015-02-28 15:03:12.000000000 +0000
@@ -157,3 +157,6 @@
 CXXFLAGS += CONFIG['TK_CFLAGS']
 CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CFLAGS += CONFIG['TK_CFLAGS']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    del DEFINES['UNICODE']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/ipc/GfxMessageUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/ipc/GfxMessageUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/ipc/GfxMessageUtils.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/ipc/GfxMessageUtils.h	2015-02-28 15:03:12.000000000 +0000
@@ -278,21 +278,6 @@
 {};
 
 template <>
-struct ParamTraits<mozilla::layers::TextureIdentifier>
-  : public ContiguousEnumSerializer<
-             mozilla::layers::TextureIdentifier,
-             mozilla::layers::TextureIdentifier::Front,
-             mozilla::layers::TextureIdentifier::HighBound>
-{};
-
-template <>
-struct ParamTraits<mozilla::layers::DeprecatedTextureHostFlags>
-  : public BitFlagsEnumSerializer<
-             mozilla::layers::DeprecatedTextureHostFlags,
-             mozilla::layers::DeprecatedTextureHostFlags::ALL_BITS>
-{};
-
-template <>
 struct ParamTraits<mozilla::layers::DiagnosticTypes>
   : public BitFlagsEnumSerializer<
              mozilla::layers::DiagnosticTypes,
@@ -834,14 +819,12 @@
   static void Write(Message* aMsg, const paramType& aParam)
   {
     WriteParam(aMsg, aParam.mCompositableType);
-    WriteParam(aMsg, aParam.mDeprecatedTextureHostFlags);
     WriteParam(aMsg, aParam.mTextureFlags);
   }
 
   static bool Read(const Message* aMsg, void** aIter, paramType* aResult)
   {
     return ReadParam(aMsg, aIter, &aResult->mCompositableType) &&
-           ReadParam(aMsg, aIter, &aResult->mDeprecatedTextureHostFlags) &&
            ReadParam(aMsg, aIter, &aResult->mTextureFlags);
   }
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/src/AsyncPanZoomController.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -112,12 +112,18 @@
   if (aModifiers & mozilla::MODIFIER_FN) {
     result |= nsIDOMWindowUtils::MODIFIER_FN;
   }
+  if (aModifiers & mozilla::MODIFIER_FNLOCK) {
+    result |= nsIDOMWindowUtils::MODIFIER_FNLOCK;
+  }
   if (aModifiers & mozilla::MODIFIER_NUMLOCK) {
     result |= nsIDOMWindowUtils::MODIFIER_NUMLOCK;
   }
   if (aModifiers & mozilla::MODIFIER_SCROLLLOCK) {
     result |= nsIDOMWindowUtils::MODIFIER_SCROLLLOCK;
   }
+  if (aModifiers & mozilla::MODIFIER_SYMBOL) {
+    result |= nsIDOMWindowUtils::MODIFIER_SYMBOL;
+  }
   if (aModifiers & mozilla::MODIFIER_SYMBOLLOCK) {
     result |= nsIDOMWindowUtils::MODIFIER_SYMBOLLOCK;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/src/Axis.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/src/Axis.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/src/Axis.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/src/Axis.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -40,7 +40,7 @@
     mAsyncPanZoomController(aAsyncPanZoomController),
     mOverscroll(0),
     mFirstOverscrollAnimationSample(0),
-    mOverscrollOffset(0),
+    mLastOverscrollPeak(0),
     mOverscrollScale(1.0f)
 {
 }
@@ -196,7 +196,7 @@
 }
 
 ParentLayerCoord Axis::GetOverscroll() const {
-  ParentLayerCoord result = (mOverscroll - mOverscrollOffset) / mOverscrollScale;
+  ParentLayerCoord result = (mOverscroll - mLastOverscrollPeak) / mOverscrollScale;
 
   // Assert that we return overscroll in the correct direction
   MOZ_ASSERT((result.value * mFirstOverscrollAnimationSample.value) >= 0.0f);
@@ -250,19 +250,32 @@
     // It's possible to start sampling overscroll with velocity == 0, or
     // velocity in the opposite direction of overscroll, so make sure we
     // correctly record the peak in this case.
-    if ((mOverscroll >= 0 ? oldVelocity : -oldVelocity) <= 0.0f) {
+    if (mOverscroll != 0 && ((mOverscroll > 0 ? oldVelocity : -oldVelocity) <= 0.0f)) {
       velocitySignChange = true;
     }
   }
   if (velocitySignChange) {
     bool oddOscillation = (mOverscroll.value * mFirstOverscrollAnimationSample.value) < 0.0f;
-    mOverscrollOffset = oddOscillation ? mOverscroll : -mOverscroll;
+    mLastOverscrollPeak = oddOscillation ? mOverscroll : -mOverscroll;
     mOverscrollScale = 2.0f;
   }
 
   // Adjust the amount of overscroll based on the velocity.
   // Note that we allow for oscillations.
   mOverscroll += (mVelocity * aStepDurationMilliseconds);
+
+  // Our mechanism for translating a set of mOverscroll values that oscillate
+  // around zero to a set of GetOverscroll() values that have the same sign
+  // (so content is always stretched, never compressed) assumes that
+  // mOverscroll does not exceed mLastOverscrollPeak in magnitude. If our
+  // calculations were exact, this would be the case, as a dampened spring
+  // should never attain a displacement greater in magnitude than a previous
+  // peak. In our approximation calculations, however, this may not hold
+  // exactly. To ensure the assumption is not violated, we clamp the magnitude
+  // of mOverscroll.
+  if (mLastOverscrollPeak != 0 && fabs(mOverscroll) > fabs(mLastOverscrollPeak)) {
+    mOverscroll = (mOverscroll >= 0) ? fabs(mLastOverscrollPeak) : -fabs(mLastOverscrollPeak);
+  }
 }
 
 bool Axis::SampleOverscrollAnimation(const TimeDuration& aDelta) {
@@ -314,7 +327,7 @@
 void Axis::ClearOverscroll() {
   mOverscroll = 0;
   mFirstOverscrollAnimationSample = 0;
-  mOverscrollOffset = 0;
+  mLastOverscrollPeak = 0;
   mOverscrollScale = 1.0f;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/src/Axis.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/src/Axis.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/src/Axis.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/src/Axis.h	2015-02-28 15:03:12.000000000 +0000
@@ -232,11 +232,12 @@
   // GetOverscroll() never changes sign during animation. This is necessary,
   // as mOverscroll itself oscillates around zero during animation.
   // If we're not sampling overscroll animation, mOverscrollScale will be 1.0
-  // and mOverscrollOffset will be zero.
+  // and mLastOverscrollPeak will be zero.
   // If we are animating, after the overscroll reaches its peak,
-  // mOverscrollScale will be 2.0 and mOverscrollOffset will store a value that
-  // guarantees that the result of GetOverscroll() never changes sign.
-  ParentLayerCoord mOverscrollOffset;
+  // mOverscrollScale will be 2.0 and mLastOverscrollPeak will store the amount
+  // of overscroll at the last peak of the oscillation. Together, these values
+  // guarantee that the result of GetOverscroll() never changes sign.
+  ParentLayerCoord mLastOverscrollPeak;
   float mOverscrollScale;
 
   // A queue of (timestamp, velocity) pairs; these are the historical
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/util/APZCCallbackHelper.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -244,7 +244,7 @@
 APZCCallbackHelper::GetDOMWindowUtils(const nsIContent* aContent)
 {
     nsCOMPtr<nsIDOMWindowUtils> utils;
-    nsIDocument* doc = aContent->GetCurrentDoc();
+    nsIDocument* doc = aContent->GetComposedDoc();
     if (doc) {
         utils = GetDOMWindowUtils(doc);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/util/APZEventState.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/util/APZEventState.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/apz/util/APZEventState.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/apz/util/APZEventState.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -249,6 +249,9 @@
   case APZStateChange::TransformBegin:
   {
     nsIScrollableFrame* sf = nsLayoutUtils::FindScrollableFrameFor(aViewId);
+    if (sf) {
+      sf->SetTransformingByAPZ(true);
+    }
     nsIScrollbarMediator* scrollbarMediator = do_QueryFrame(sf);
     if (scrollbarMediator) {
       scrollbarMediator->ScrollbarActivityStarted();
@@ -266,6 +269,9 @@
   case APZStateChange::TransformEnd:
   {
     nsIScrollableFrame* sf = nsLayoutUtils::FindScrollableFrameFor(aViewId);
+    if (sf) {
+      sf->SetTransformingByAPZ(false);
+    }
     nsIScrollbarMediator* scrollbarMediator = do_QueryFrame(sf);
     if (scrollbarMediator) {
       scrollbarMediator->ScrollbarActivityStopped();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/basic/BasicCompositor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/basic/BasicCompositor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/basic/BasicCompositor.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/basic/BasicCompositor.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -48,8 +48,6 @@
                       nsIntRegion* aDestRegion = nullptr,
                       gfx::IntPoint* aSrcOffset = nullptr) MOZ_OVERRIDE
   {
-    // XXX - For this to work with IncrementalContentHost we will need to support
-    // the aDestRegion and aSrcOffset parameters properly;
     mSurface = aSurface;
     return true;
   }
@@ -69,6 +67,9 @@
 {
   MOZ_COUNT_CTOR(BasicCompositor);
   SetBackend(LayersBackend::LAYERS_BASIC);
+
+  mMaxTextureSize =
+    Factory::GetMaxSurfaceSize(gfxPlatform::GetPlatform()->GetContentBackend());
 }
 
 BasicCompositor::~BasicCompositor()
@@ -76,6 +77,12 @@
   MOZ_COUNT_DTOR(BasicCompositor);
 }
 
+int32_t
+BasicCompositor::GetMaxTextureSize() const
+{
+  return mMaxTextureSize;
+}
+
 void
 BasicCompositingRenderTarget::BindRenderTarget()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/basic/BasicCompositor.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/basic/BasicCompositor.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/basic/BasicCompositor.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/basic/BasicCompositor.h	2015-02-28 15:03:12.000000000 +0000
@@ -103,7 +103,7 @@
 
   virtual bool SupportsPartialTextureUpdate() MOZ_OVERRIDE { return true; }
   virtual bool CanUseCanvasLayerForSize(const gfx::IntSize &aSize) MOZ_OVERRIDE { return true; }
-  virtual int32_t GetMaxTextureSize() const MOZ_OVERRIDE { return INT32_MAX; }
+  virtual int32_t GetMaxTextureSize() const MOZ_OVERRIDE;
   virtual void SetDestinationSurfaceSize(const gfx::IntSize& aSize) MOZ_OVERRIDE { }
   
   virtual void SetScreenRenderOffset(const ScreenPoint& aOffset) MOZ_OVERRIDE {
@@ -140,6 +140,8 @@
 
   gfx::IntRect mInvalidRect;
   nsIntRegion mInvalidRegion;
+
+  uint32_t mMaxTextureSize;
 };
 
 } // namespace layers
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ClientLayerManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ClientLayerManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ClientLayerManager.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ClientLayerManager.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -212,10 +212,8 @@
   // Desktop does not support async zoom yet, so we ignore this for those
   // platforms.
 #if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
-  if (mWidget) {
-    if (dom::TabChild* window = mWidget->GetOwningTabChild()) {
-      mCompositorMightResample = window->IsAsyncPanZoomEnabled();
-    }
+  if (mWidget && mWidget->GetOwningTabChild()) {
+    mCompositorMightResample = gfxPrefs::AsyncPanZoomEnabled();
   }
 #endif
 
@@ -587,17 +585,6 @@
 
         break;
       }
-      case EditReply::TOpTextureSwap: {
-        MOZ_LAYERS_LOG(("[LayersForwarder] TextureSwap"));
-
-        const OpTextureSwap& ots = reply.get_OpTextureSwap();
-
-        CompositableClient* compositable =
-          CompositableClient::FromIPDLActor(ots.compositableChild());
-        MOZ_ASSERT(compositable);
-        compositable->SetDescriptorFromReply(ots.textureId(), ots.image());
-        break;
-      }
       case EditReply::TReturnReleaseFence: {
         const ReturnReleaseFence& rep = reply.get_ReturnReleaseFence();
         FenceHandle fence = rep.fence();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ClientTiledPaintedLayer.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -91,11 +91,14 @@
 
 void
 ClientTiledPaintedLayer::GetAncestorLayers(LayerMetricsWrapper* aOutScrollAncestor,
-                                          LayerMetricsWrapper* aOutDisplayPortAncestor)
+                                           LayerMetricsWrapper* aOutDisplayPortAncestor,
+                                           bool* aOutHasTransformAnimation)
 {
   LayerMetricsWrapper scrollAncestor;
   LayerMetricsWrapper displayPortAncestor;
+  bool hasTransformAnimation = false;
   for (LayerMetricsWrapper ancestor(this, LayerMetricsWrapper::StartAt::BOTTOM); ancestor; ancestor = ancestor.GetParent()) {
+    hasTransformAnimation |= ancestor.HasTransformAnimation();
     const FrameMetrics& metrics = ancestor.Metrics();
     if (!scrollAncestor && metrics.GetScrollId() != FrameMetrics::NULL_SCROLL_ID) {
       scrollAncestor = ancestor;
@@ -113,6 +116,9 @@
   if (aOutDisplayPortAncestor) {
     *aOutDisplayPortAncestor = displayPortAncestor;
   }
+  if (aOutHasTransformAnimation) {
+    *aOutHasTransformAnimation = hasTransformAnimation;
+  }
 }
 
 void
@@ -134,7 +140,8 @@
   // with a displayport.
   LayerMetricsWrapper scrollAncestor;
   LayerMetricsWrapper displayPortAncestor;
-  GetAncestorLayers(&scrollAncestor, &displayPortAncestor);
+  bool hasTransformAnimation;
+  GetAncestorLayers(&scrollAncestor, &displayPortAncestor, &hasTransformAnimation);
 
   if (!displayPortAncestor || !scrollAncestor) {
     // No displayport or scroll ancestor, so we can't do progressive rendering.
@@ -146,8 +153,8 @@
     return;
   }
 
-  TILING_LOG("TILING %p: Found scrollAncestor %p and displayPortAncestor %p\n", this,
-    scrollAncestor.GetLayer(), displayPortAncestor.GetLayer());
+  TILING_LOG("TILING %p: Found scrollAncestor %p, displayPortAncestor %p, transform %d\n", this,
+    scrollAncestor.GetLayer(), displayPortAncestor.GetLayer(), hasTransformAnimation);
 
   const FrameMetrics& scrollMetrics = scrollAncestor.Metrics();
   const FrameMetrics& displayportMetrics = displayPortAncestor.Metrics();
@@ -159,12 +166,17 @@
   transformDisplayPortToLayer.Invert();
 
   // Compute the critical display port that applies to this layer in the
-  // LayoutDevice space of this layer.
-  ParentLayerRect criticalDisplayPort =
-    (displayportMetrics.GetCriticalDisplayPort() * displayportMetrics.GetZoom())
-    + displayportMetrics.mCompositionBounds.TopLeft();
-  mPaintData.mCriticalDisplayPort = RoundedOut(
-    ApplyParentLayerToLayerTransform(transformDisplayPortToLayer, criticalDisplayPort));
+  // LayoutDevice space of this layer, but only if there is no OMT animation
+  // on this layer. If there is an OMT animation then we need to draw the whole
+  // visible region of this layer as determined by layout, because we don't know
+  // what parts of it might move into view in the compositor.
+  if (!hasTransformAnimation) {
+    ParentLayerRect criticalDisplayPort =
+      (displayportMetrics.GetCriticalDisplayPort() * displayportMetrics.GetZoom())
+      + displayportMetrics.mCompositionBounds.TopLeft();
+    mPaintData.mCriticalDisplayPort = RoundedOut(
+      ApplyParentLayerToLayerTransform(transformDisplayPortToLayer, criticalDisplayPort));
+  }
   TILING_LOG("TILING %p: Critical displayport %s\n", this, Stringify(mPaintData.mCriticalDisplayPort).c_str());
 
   // Store the resolution from the displayport ancestor layer. Because this is Gecko-side,
@@ -217,26 +229,48 @@
 }
 
 bool
-ClientTiledPaintedLayer::UseFastPath()
-{
-  LayerMetricsWrapper scrollAncestor;
-  GetAncestorLayers(&scrollAncestor, nullptr);
-  if (!scrollAncestor) {
-    return true;
+ClientTiledPaintedLayer::UseProgressiveDraw() {
+  if (!gfxPlatform::GetPlatform()->UseProgressivePaint()) {
+    // pref is disabled, so never do progressive
+    return false;
   }
-  const FrameMetrics& parentMetrics = scrollAncestor.Metrics();
 
-  bool multipleTransactionsNeeded = gfxPlatform::GetPlatform()->UseProgressivePaint()
-                                 || gfxPrefs::UseLowPrecisionBuffer()
-                                 || !parentMetrics.GetCriticalDisplayPort().IsEmpty();
-  bool isFixed = GetIsFixedPosition() || GetParent()->GetIsFixedPosition();
-  bool isScrollable = parentMetrics.IsScrollable();
-
-  return !multipleTransactionsNeeded || isFixed || !isScrollable
-#if !defined(MOZ_WIDGET_ANDROID) || defined(MOZ_ANDROID_APZ)
-         || !IsScrollingOnCompositor(parentMetrics)
+  if (ClientManager()->HasShadowTarget()) {
+    // This condition is true when we are in a reftest scenario. We don't want
+    // to draw progressively here because it can cause intermittent reftest
+    // failures because the harness won't wait for all the tiles to be drawn.
+    return false;
+  }
+
+  if (mPaintData.mCriticalDisplayPort.IsEmpty()) {
+    // This catches three scenarios:
+    // 1) This layer doesn't have a scrolling ancestor
+    // 2) This layer is subject to OMTA transforms
+    // 3) Low-precision painting is disabled
+    // In all of these cases, we don't want to draw this layer progressively.
+    return false;
+  }
+
+  if (GetIsFixedPosition() || GetParent()->GetIsFixedPosition()) {
+    // This layer is fixed-position and so even if it does have a scrolling
+    // ancestor it will likely be entirely on-screen all the time, so we
+    // should draw it all at once
+    return false;
+  }
+
+  // XXX We probably want to disable progressive drawing for non active APZ layers in the future
+  //     but we should wait for a proper test case before making this change.
+#if 0 //!defined(MOZ_WIDGET_ANDROID) || defined(MOZ_ANDROID_APZ)
+  LayerMetricsWrapper scrollAncestor;
+  GetAncestorLayers(&scrollAncestor, nullptr, nullptr);
+  MOZ_ASSERT(scrollAncestor); // because mPaintData.mCriticalDisplayPort is non-empty
+  const FrameMetrics& parentMetrics = scrollAncestor.Metrics();
+  if (!IsScrollingOnCompositor(parentMetrics)) {
+    return false;
+  }
 #endif
-         ;
+
+  return true;
 }
 
 bool
@@ -251,10 +285,8 @@
     return false;
   }
 
-  // Only draw progressively when the resolution is unchanged, and we're not
-  // in a reftest scenario (that's what the HasShadowManager() check is for).
-  if (gfxPlatform::GetPlatform()->UseProgressivePaint() &&
-      !ClientManager()->HasShadowTarget() &&
+  // Only draw progressively when the resolution is unchanged
+  if (UseProgressiveDraw() &&
       mContentClient->mTiledBuffer.GetFrameResolution() == mPaintData.mResolution) {
     // Store the old valid region, then clear it before painting.
     // We clip the old valid region to the visible region, as it only gets
@@ -425,32 +457,6 @@
       return;
     }
 
-    // In some cases we can take a fast path and just be done with it.
-    if (UseFastPath()) {
-      TILING_LOG("TILING %p: Taking fast-path\n", this);
-      mValidRegion = neededRegion;
-
-      // Make sure that tiles that fall outside of the visible region or outside of the
-      // critical displayport are discarded on the first update. Also make sure that we
-      // only draw stuff inside the critical displayport on the first update.
-      if (!mPaintData.mCriticalDisplayPort.IsEmpty()) {
-        mValidRegion.And(mValidRegion, LayerIntRect::ToUntyped(mPaintData.mCriticalDisplayPort));
-        invalidRegion.And(invalidRegion, LayerIntRect::ToUntyped(mPaintData.mCriticalDisplayPort));
-      }
-
-      if (invalidRegion.IsEmpty()) {
-        EndPaint();
-        return;
-      }
-
-      mContentClient->mTiledBuffer.SetFrameResolution(mPaintData.mResolution);
-      mContentClient->mTiledBuffer.PaintThebes(mValidRegion, invalidRegion, callback, data);
-      ClientManager()->Hold(this);
-      mContentClient->UseTiledLayerBuffer(TiledContentClient::TILED_BUFFER);
-      EndPaint();
-      return;
-    }
-
     // Make sure that tiles that fall outside of the visible region or outside of the
     // critical displayport are discarded on the first update. Also make sure that we
     // only draw stuff inside the critical displayport on the first update.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ClientTiledPaintedLayer.h	2015-02-28 15:03:12.000000000 +0000
@@ -81,7 +81,8 @@
    * which hold the return values; the values passed in may be null.
    */
   void GetAncestorLayers(LayerMetricsWrapper* aOutScrollAncestor,
-                         LayerMetricsWrapper* aOutDisplayPortAncestor);
+                         LayerMetricsWrapper* aOutDisplayPortAncestor,
+                         bool* aOutHasTransformAnimation);
 
 private:
   ClientLayerManager* ClientManager()
@@ -96,15 +97,16 @@
   void BeginPaint();
 
   /**
-   * Determine if we can use a fast path to just do a single high-precision,
-   * non-progressive paint.
+   * Check if the layer is being scrolled by APZ on the compositor.
    */
-  bool UseFastPath();
+  bool IsScrollingOnCompositor(const FrameMetrics& aParentMetrics);
 
   /**
-   * Check if the layer is being scrolled by APZ on the compositor.
+   * Check if we should use progressive draw on this layer. We will
+   * disable progressive draw based on a preference or if the layer
+   * is not being scrolled.
    */
-  bool IsScrollingOnCompositor(const FrameMetrics& aParentMetrics);
+  bool UseProgressiveDraw();
 
   /**
    * Helper function to do the high-precision paint.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/CompositableClient.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/CompositableClient.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/CompositableClient.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/CompositableClient.h	2015-02-28 15:03:12.000000000 +0000
@@ -143,12 +143,6 @@
                                 TextureFlags aTextureFlags,
                                 TextureAllocationFlags aAllocFlags = ALLOC_DEFAULT);
 
-  virtual void SetDescriptorFromReply(TextureIdentifier aTextureId,
-                                      const SurfaceDescriptor& aDescriptor)
-  {
-    MOZ_CRASH("If you want to call this, you should have implemented it");
-  }
-
   /**
    * Establishes the connection with compositor side through IPDL
    */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ContentClient.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ContentClient.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ContentClient.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ContentClient.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -93,11 +93,6 @@
   if (useDoubleBuffering || PR_GetEnv("MOZ_FORCE_DOUBLE_BUFFERING")) {
     return new ContentClientDoubleBuffered(aForwarder);
   }
-#ifdef XP_MACOSX
-  if (backend == LayersBackend::LAYERS_OPENGL) {
-    return new ContentClientIncremental(aForwarder);
-  }
-#endif
   return new ContentClientSingleBuffered(aForwarder);
 }
 
@@ -673,362 +668,5 @@
   }
 }
 
-static void
-WrapRotationAxis(int32_t* aRotationPoint, int32_t aSize)
-{
-  if (*aRotationPoint < 0) {
-    *aRotationPoint += aSize;
-  } else if (*aRotationPoint >= aSize) {
-    *aRotationPoint -= aSize;
-  }
-}
-
-static void
-FillSurface(DrawTarget* aDT, const nsIntRegion& aRegion,
-            const nsIntPoint& aOffset, const gfxRGBA& aColor)
-{
-  nsIntRegionRectIterator iter(aRegion);
-  const nsIntRect* r;
-  while ((r = iter.Next()) != nullptr) {
-    aDT->FillRect(Rect(r->x - aOffset.x, r->y - aOffset.y,
-                       r->width, r->height),
-                  ColorPattern(ToColor(aColor)));
-  }
-}
-
-void
-ContentClientIncremental::NotifyBufferCreated(ContentType aType, TextureFlags aFlags)
-{
-  mTextureInfo.mTextureFlags = aFlags;
-  mContentType = aType;
-
-  mForwarder->CreatedIncrementalBuffer(this,
-                                        mTextureInfo,
-                                        mBufferRect);
-
-}
-
-RotatedContentBuffer::PaintState
-ContentClientIncremental::BeginPaintBuffer(PaintedLayer* aLayer,
-                                           uint32_t aFlags)
-{
-  mTextureInfo.mDeprecatedTextureHostFlags = DeprecatedTextureHostFlags::DEFAULT;
-  PaintState result;
-  // We need to disable rotation if we're going to be resampled when
-  // drawing, because we might sample across the rotation boundary.
-  bool canHaveRotation =  !(aFlags & RotatedContentBuffer::PAINT_WILL_RESAMPLE);
-
-  nsIntRegion validRegion = aLayer->GetValidRegion();
-
-  bool canUseOpaqueSurface = aLayer->CanUseOpaqueSurface();
-  ContentType contentType =
-    canUseOpaqueSurface ? gfxContentType::COLOR :
-                          gfxContentType::COLOR_ALPHA;
-
-  SurfaceMode mode;
-  nsIntRegion neededRegion;
-  bool canReuseBuffer;
-  nsIntRect destBufferRect;
-
-  while (true) {
-    mode = aLayer->GetSurfaceMode();
-    neededRegion = aLayer->GetVisibleRegion();
-    // If we're going to resample, we need a buffer that's in clamp mode.
-    canReuseBuffer = neededRegion.GetBounds().Size() <= mBufferRect.Size() &&
-      mHasBuffer && !(aFlags & RotatedContentBuffer::PAINT_WILL_RESAMPLE);
-
-    if (canReuseBuffer) {
-      if (mBufferRect.Contains(neededRegion.GetBounds())) {
-        // We don't need to adjust mBufferRect.
-        destBufferRect = mBufferRect;
-      } else {
-        // The buffer's big enough but doesn't contain everything that's
-        // going to be visible. We'll move it.
-        destBufferRect = nsIntRect(neededRegion.GetBounds().TopLeft(), mBufferRect.Size());
-      }
-    } else {
-      destBufferRect = neededRegion.GetBounds();
-    }
-
-    if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
-      if (!gfxPrefs::ComponentAlphaEnabled() ||
-          !aLayer->GetParent() ||
-          !aLayer->GetParent()->SupportsComponentAlphaChildren()) {
-        mode = SurfaceMode::SURFACE_SINGLE_CHANNEL_ALPHA;
-      } else {
-        contentType = gfxContentType::COLOR;
-      }
-    }
-
-    if ((aFlags & RotatedContentBuffer::PAINT_WILL_RESAMPLE) &&
-        (!neededRegion.GetBounds().IsEqualInterior(destBufferRect) ||
-         neededRegion.GetNumRects() > 1)) {
-      // The area we add to neededRegion might not be painted opaquely
-      if (mode == SurfaceMode::SURFACE_OPAQUE) {
-        contentType = gfxContentType::COLOR_ALPHA;
-        mode = SurfaceMode::SURFACE_SINGLE_CHANNEL_ALPHA;
-      }
-      // For component alpha layers, we leave contentType as gfxContentType::COLOR.
-
-      // We need to validate the entire buffer, to make sure that only valid
-      // pixels are sampled
-      neededRegion = destBufferRect;
-    }
-
-    if (mHasBuffer &&
-        (mContentType != contentType ||
-         (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) != mHasBufferOnWhite)) {
-#ifdef MOZ_DUMP_PAINTING
-      if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
-        if (mContentType != contentType) {
-          printf_stderr("Layer's content type has changed\n");
-        }
-        if ((mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) != mHasBufferOnWhite) {
-          printf_stderr("Layer's component alpha status has changed\n");
-        }
-        printf_stderr("Invalidating entire layer %p: no buffer, or content type or component alpha changed\n", aLayer);
-      }
-#endif
-      // We're effectively clearing the valid region, so we need to draw
-      // the entire needed region now.
-      result.mRegionToInvalidate = aLayer->GetValidRegion();
-      validRegion.SetEmpty();
-      mHasBuffer = false;
-      mHasBufferOnWhite = false;
-      mBufferRect.SetRect(0, 0, 0, 0);
-      mBufferRotation.MoveTo(0, 0);
-      // Restart decision process with the cleared buffer. We can only go
-      // around the loop one more iteration, since mTexImage is null now.
-      continue;
-    }
-
-    break;
-  }
-
-  result.mRegionToDraw.Sub(neededRegion, validRegion);
-  if (result.mRegionToDraw.IsEmpty())
-    return result;
-
-  if (destBufferRect.width > mForwarder->GetMaxTextureSize() ||
-      destBufferRect.height > mForwarder->GetMaxTextureSize()) {
-    return result;
-  }
-
-  // BlitTextureImage depends on the FBO texture target being
-  // TEXTURE_2D.  This isn't the case on some older X1600-era Radeons.
-  if (!mForwarder->SupportsTextureBlitting() ||
-      !mForwarder->SupportsPartialUploads()) {
-    result.mRegionToDraw = neededRegion;
-    validRegion.SetEmpty();
-    mHasBuffer = false;
-    mHasBufferOnWhite = false;
-    mBufferRect.SetRect(0, 0, 0, 0);
-    mBufferRotation.MoveTo(0, 0);
-    canReuseBuffer = false;
-  }
-
-  nsIntRect drawBounds = result.mRegionToDraw.GetBounds();
-  bool createdBuffer = false;
-
-  TextureFlags bufferFlags = TextureFlags::NO_FLAGS;
-  if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
-    bufferFlags |= TextureFlags::COMPONENT_ALPHA;
-  }
-  if (canReuseBuffer) {
-    nsIntRect keepArea;
-    if (keepArea.IntersectRect(destBufferRect, mBufferRect)) {
-      // Set mBufferRotation so that the pixels currently in mBuffer
-      // will still be rendered in the right place when mBufferRect
-      // changes to destBufferRect.
-      nsIntPoint newRotation = mBufferRotation +
-        (destBufferRect.TopLeft() - mBufferRect.TopLeft());
-      WrapRotationAxis(&newRotation.x, mBufferRect.width);
-      WrapRotationAxis(&newRotation.y, mBufferRect.height);
-      NS_ASSERTION(nsIntRect(nsIntPoint(0,0), mBufferRect.Size()).Contains(newRotation),
-                   "newRotation out of bounds");
-      int32_t xBoundary = destBufferRect.XMost() - newRotation.x;
-      int32_t yBoundary = destBufferRect.YMost() - newRotation.y;
-      if ((drawBounds.x < xBoundary && xBoundary < drawBounds.XMost()) ||
-          (drawBounds.y < yBoundary && yBoundary < drawBounds.YMost()) ||
-          (newRotation != nsIntPoint(0,0) && !canHaveRotation)) {
-        // The stuff we need to redraw will wrap around an edge of the
-        // buffer, so we will need to do a self-copy
-        // If mBufferRotation == nsIntPoint(0,0) we could do a real
-        // self-copy but we're not going to do that in GL yet.
-        // We can't do a real self-copy because the buffer is rotated.
-        // So allocate a new buffer for the destination.
-        destBufferRect = neededRegion.GetBounds();
-        createdBuffer = true;
-      } else {
-        mBufferRect = destBufferRect;
-        mBufferRotation = newRotation;
-      }
-    } else {
-      // No pixels are going to be kept. The whole visible region
-      // will be redrawn, so we don't need to copy anything, so we don't
-      // set destBuffer.
-      mBufferRect = destBufferRect;
-      mBufferRotation = nsIntPoint(0,0);
-    }
-  } else {
-    // The buffer's not big enough, so allocate a new one
-    createdBuffer = true;
-  }
-  NS_ASSERTION(!(aFlags & RotatedContentBuffer::PAINT_WILL_RESAMPLE) ||
-               destBufferRect == neededRegion.GetBounds(),
-               "If we're resampling, we need to validate the entire buffer");
-
-  if (!createdBuffer && !mHasBuffer) {
-    return result;
-  }
-
-  if (createdBuffer) {
-    if (mHasBuffer &&
-        (mode != SurfaceMode::SURFACE_COMPONENT_ALPHA || mHasBufferOnWhite)) {
-      mTextureInfo.mDeprecatedTextureHostFlags = DeprecatedTextureHostFlags::COPY_PREVIOUS;
-    }
-
-    mHasBuffer = true;
-    if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
-      mHasBufferOnWhite = true;
-    }
-    mBufferRect = destBufferRect;
-    mBufferRotation = nsIntPoint(0,0);
-    NotifyBufferCreated(contentType, bufferFlags);
-  }
-
-  NS_ASSERTION(canHaveRotation || mBufferRotation == nsIntPoint(0,0),
-               "Rotation disabled, but we have nonzero rotation?");
-
-  nsIntRegion invalidate;
-  invalidate.Sub(aLayer->GetValidRegion(), destBufferRect);
-  result.mRegionToInvalidate.Or(result.mRegionToInvalidate, invalidate);
-
-  // If we do partial updates, we have to clip drawing to the regionToDraw.
-  // If we don't clip, background images will be fillrect'd to the region correctly,
-  // while text or lines will paint outside of the regionToDraw. This becomes apparent
-  // with concave regions. Right now the scrollbars invalidate a narrow strip of the bar
-  // although they never cover it. This leads to two draw rects, the narow strip and the actually
-  // newly exposed area. It would be wise to fix this glitch in any way to have simpler
-  // clip and draw regions.
-  result.mClip = DrawRegionClip::DRAW;
-  result.mMode = mode;
-
-  return result;
-}
-
-DrawTarget*
-ContentClientIncremental::BorrowDrawTargetForPainting(PaintState& aPaintState,
-                                                      RotatedContentBuffer::DrawIterator* aIter)
-{
-  if (aPaintState.mMode == SurfaceMode::SURFACE_NONE) {
-    return nullptr;
-  }
-
-  if (aIter) {
-    if (aIter->mCount++ > 0) {
-      return nullptr;
-    }
-    aIter->mDrawRegion = aPaintState.mRegionToDraw;
-  }
-
-  DrawTarget* result = nullptr;
-
-  nsIntRect drawBounds = aPaintState.mRegionToDraw.GetBounds();
-  MOZ_ASSERT(!mLoanedDrawTarget);
-
-  // BeginUpdate is allowed to modify the given region,
-  // if it wants more to be repainted than we request.
-  if (aPaintState.mMode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
-    nsIntRegion drawRegionCopy = aPaintState.mRegionToDraw;
-    RefPtr<DrawTarget> onBlack = GetUpdateSurface(BUFFER_BLACK, drawRegionCopy);
-    RefPtr<DrawTarget> onWhite = GetUpdateSurface(BUFFER_WHITE, aPaintState.mRegionToDraw);
-    if (onBlack && onWhite) {
-      NS_ASSERTION(aPaintState.mRegionToDraw == drawRegionCopy,
-                   "BeginUpdate should always modify the draw region in the same way!");
-      FillSurface(onBlack, aPaintState.mRegionToDraw, nsIntPoint(drawBounds.x, drawBounds.y), gfxRGBA(0.0, 0.0, 0.0, 1.0));
-      FillSurface(onWhite, aPaintState.mRegionToDraw, nsIntPoint(drawBounds.x, drawBounds.y), gfxRGBA(1.0, 1.0, 1.0, 1.0));
-      mLoanedDrawTarget = Factory::CreateDualDrawTarget(onBlack, onWhite);
-    } else {
-      mLoanedDrawTarget = nullptr;
-    }
-  } else {
-    mLoanedDrawTarget = GetUpdateSurface(BUFFER_BLACK, aPaintState.mRegionToDraw);
-  }
-  if (!mLoanedDrawTarget) {
-    NS_WARNING("unable to get context for update");
-    return nullptr;
-  }
-
-  result = mLoanedDrawTarget;
-  mLoanedTransform = mLoanedDrawTarget->GetTransform();
-  result->SetTransform(Matrix(mLoanedTransform).
-                         PreTranslate(-drawBounds.x, -drawBounds.y));
-
-  if (mContentType == gfxContentType::COLOR_ALPHA) {
-    gfxUtils::ClipToRegion(result, aPaintState.mRegionToDraw);
-    nsIntRect bounds = aPaintState.mRegionToDraw.GetBounds();
-    result->ClearRect(Rect(bounds.x, bounds.y, bounds.width, bounds.height));
-  }
-
-  return result;
-}
-
-void
-ContentClientIncremental::Updated(const nsIntRegion& aRegionToDraw,
-                                  const nsIntRegion& aVisibleRegion,
-                                  bool aDidSelfCopy)
-{
-  if (IsSurfaceDescriptorValid(mUpdateDescriptor)) {
-    mForwarder->UpdateTextureIncremental(this,
-                                         TextureIdentifier::Front,
-                                         mUpdateDescriptor,
-                                         aRegionToDraw,
-                                         mBufferRect,
-                                         mBufferRotation);
-    mUpdateDescriptor = SurfaceDescriptor();
-  }
-  if (IsSurfaceDescriptorValid(mUpdateDescriptorOnWhite)) {
-    mForwarder->UpdateTextureIncremental(this,
-                                         TextureIdentifier::OnWhiteFront,
-                                         mUpdateDescriptorOnWhite,
-                                         aRegionToDraw,
-                                         mBufferRect,
-                                         mBufferRotation);
-    mUpdateDescriptorOnWhite = SurfaceDescriptor();
-  }
-
-}
-
-TemporaryRef<DrawTarget>
-ContentClientIncremental::GetUpdateSurface(BufferType aType,
-                                           const nsIntRegion& aUpdateRegion)
-{
-  nsIntRect rgnSize = aUpdateRegion.GetBounds();
-  if (!mBufferRect.Contains(rgnSize)) {
-    NS_ERROR("update outside of image");
-    return nullptr;
-  }
-  SurfaceDescriptor desc;
-  if (!mForwarder->AllocSurfaceDescriptor(rgnSize.Size().ToIntSize(),
-                                          mContentType,
-                                          &desc)) {
-    NS_WARNING("creating SurfaceDescriptor failed!");
-    Clear();
-    return nullptr;
-  }
-
-  if (aType == BUFFER_BLACK) {
-    MOZ_ASSERT(!IsSurfaceDescriptorValid(mUpdateDescriptor));
-    mUpdateDescriptor = desc;
-  } else {
-    MOZ_ASSERT(!IsSurfaceDescriptorValid(mUpdateDescriptorOnWhite));
-    MOZ_ASSERT(aType == BUFFER_WHITE);
-    mUpdateDescriptorOnWhite = desc;
-  }
-
-  return GetDrawTargetForDescriptor(desc, gfx::BackendType::COREGRAPHICS);
-}
-
 }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ContentClient.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ContentClient.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/ContentClient.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/ContentClient.h	2015-02-28 15:03:12.000000000 +0000
@@ -397,89 +397,6 @@
   }
 };
 
-/**
- * A single buffered ContentClient that creates temporary buffers which are
- * used to update the host-side texture. The ownership of the buffers is
- * passed to the host side during the transaction, and we need to create
- * new ones each frame.
- */
-class ContentClientIncremental : public ContentClientRemote
-                               , public BorrowDrawTarget
-{
-public:
-  explicit ContentClientIncremental(CompositableForwarder* aFwd)
-    : ContentClientRemote(aFwd)
-    , mContentType(gfxContentType::COLOR_ALPHA)
-    , mHasBuffer(false)
-    , mHasBufferOnWhite(false)
-  {
-    mTextureInfo.mCompositableType = CompositableType::CONTENT_INC;
-  }
-
-  typedef RotatedContentBuffer::PaintState PaintState;
-  typedef RotatedContentBuffer::ContentType ContentType;
-
-  virtual TextureInfo GetTextureInfo() const MOZ_OVERRIDE
-  {
-    return mTextureInfo;
-  }
-
-  virtual void Clear() MOZ_OVERRIDE
-  {
-    mBufferRect.SetEmpty();
-    mHasBuffer = false;
-    mHasBufferOnWhite = false;
-  }
-
-  virtual PaintState BeginPaintBuffer(PaintedLayer* aLayer,
-                                      uint32_t aFlags) MOZ_OVERRIDE;
-  virtual gfx::DrawTarget* BorrowDrawTargetForPainting(PaintState& aPaintState,
-                                                       RotatedContentBuffer::DrawIterator* aIter = nullptr) MOZ_OVERRIDE;
-  virtual void ReturnDrawTargetToBuffer(gfx::DrawTarget*& aReturned) MOZ_OVERRIDE
-  {
-    BorrowDrawTarget::ReturnDrawTarget(aReturned);
-  }
-
-  virtual void Updated(const nsIntRegion& aRegionToDraw,
-                       const nsIntRegion& aVisibleRegion,
-                       bool aDidSelfCopy) MOZ_OVERRIDE;
-
-  virtual void EndPaint(nsTArray<ReadbackProcessor::Update>* aReadbackUpdates = nullptr) MOZ_OVERRIDE
-  {
-    if (IsSurfaceDescriptorValid(mUpdateDescriptor)) {
-      mForwarder->DestroySharedSurface(&mUpdateDescriptor);
-    }
-    if (IsSurfaceDescriptorValid(mUpdateDescriptorOnWhite)) {
-      mForwarder->DestroySharedSurface(&mUpdateDescriptorOnWhite);
-    }
-    ContentClientRemote::EndPaint(aReadbackUpdates);
-  }
-
-private:
-
-  enum BufferType{
-    BUFFER_BLACK,
-    BUFFER_WHITE
-  };
-
-  void NotifyBufferCreated(ContentType aType, TextureFlags aFlags);
-
-  TemporaryRef<gfx::DrawTarget> GetUpdateSurface(BufferType aType,
-                                                 const nsIntRegion& aUpdateRegion);
-
-  TextureInfo mTextureInfo;
-  nsIntRect mBufferRect;
-  nsIntPoint mBufferRotation;
-
-  SurfaceDescriptor mUpdateDescriptor;
-  SurfaceDescriptor mUpdateDescriptorOnWhite;
-
-  ContentType mContentType;
-
-  bool mHasBuffer;
-  bool mHasBufferOnWhite;
-};
-
 }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/TextureClient.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/TextureClient.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/TextureClient.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/TextureClient.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -86,7 +86,6 @@
   TextureChild()
   : mForwarder(nullptr)
   , mTextureClient(nullptr)
-  , mKeep(nullptr)
   , mIPCOpen(false)
   {
   }
@@ -135,7 +134,7 @@
   RefPtr<CompositableForwarder> mForwarder;
   RefPtr<TextureClient> mWaitForRecycle;
   TextureClient* mTextureClient;
-  KeepAlive* mKeep;
+  UniquePtr<KeepAlive> mKeep;
   bool mIPCOpen;
 
   friend class TextureClient;
@@ -154,7 +153,7 @@
     mTextureClient->mActor = nullptr;
   }
   mWaitForRecycle = nullptr;
-  delete mKeep;
+  mKeep = nullptr;
 }
 
 // static
@@ -496,11 +495,11 @@
 }
 
 void
-TextureClient::KeepUntilFullDeallocation(KeepAlive* aKeep)
+TextureClient::KeepUntilFullDeallocation(UniquePtr<KeepAlive> aKeep)
 {
   MOZ_ASSERT(mActor);
   MOZ_ASSERT(!mActor->mKeep);
-  mActor->mKeep = aKeep;
+  mActor->mKeep = Move(aKeep);
 }
 
 void TextureClient::ForceRemove(bool sync)
@@ -746,7 +745,7 @@
   }
 
   uint32_t bufSize = ImageDataSerializer::ComputeMinBufferSize(aSize, mFormat);
-  if (!Allocate(bufSize)) {
+  if (!bufSize || !Allocate(bufSize)) {
     return false;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/TextureClient.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/TextureClient.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/TextureClient.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/TextureClient.h	2015-02-28 15:03:12.000000000 +0000
@@ -403,7 +403,7 @@
    * It's a temporary hack to ensure that DXGI textures don't get destroyed
    * between serialization and deserialization.
    */
-  void KeepUntilFullDeallocation(KeepAlive* aKeep);
+  void KeepUntilFullDeallocation(UniquePtr<KeepAlive> aKeep);
 
   /**
    * Create and init the TextureChild/Parent IPDL actor pair.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/TiledContentClient.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/TiledContentClient.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/client/TiledContentClient.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/client/TiledContentClient.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -1360,7 +1360,7 @@
   TILING_LOG("TILING %p: Progressive update stale region %s\n", mPaintedLayer, Stringify(staleRegion).c_str());
 
   LayerMetricsWrapper scrollAncestor;
-  mPaintedLayer->GetAncestorLayers(&scrollAncestor, nullptr);
+  mPaintedLayer->GetAncestorLayers(&scrollAncestor, nullptr, nullptr);
 
   // Find out the current view transform to determine which tiles to draw
   // first, and see if we should just abort this paint. Aborting is usually
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/CompositableHost.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/CompositableHost.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/CompositableHost.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/CompositableHost.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -181,9 +181,6 @@
   case CompositableType::IMAGE_BRIDGE:
     NS_ERROR("Cannot create an image bridge compositable this way");
     break;
-  case CompositableType::CONTENT_INC:
-    result = new ContentHostIncremental(aTextureInfo);
-    break;
   case CompositableType::CONTENT_TILED:
     result = new TiledContentHost(aTextureInfo);
     break;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/CompositableHost.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/CompositableHost.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/CompositableHost.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/CompositableHost.h	2015-02-28 15:03:12.000000000 +0000
@@ -102,45 +102,6 @@
   }
 
   /**
-   * Update the content host using a surface that only contains the updated
-   * region.
-   *
-   * Takes ownership of aSurface, and is responsible for freeing it.
-   *
-   * @param aTextureId Texture to update.
-   * @param aSurface Surface containing the update area. Its contents are relative
-   *                 to aUpdated.TopLeft()
-   * @param aUpdated Area of the content host to update.
-   * @param aBufferRect New area covered by the content host.
-   * @param aBufferRotation New buffer rotation.
-   */
-  virtual void UpdateIncremental(TextureIdentifier aTextureId,
-                                 SurfaceDescriptor& aSurface,
-                                 const nsIntRegion& aUpdated,
-                                 const nsIntRect& aBufferRect,
-                                 const nsIntPoint& aBufferRotation)
-  {
-    MOZ_ASSERT(false, "should be implemented or not used");
-  }
-
-  /**
-   * Ensure that a suitable texture host exists in this compsitable.
-   *
-   * Only used with ContentHostIncremental.
-   *
-   * No SurfaceDescriptor or TextureIdentifier is provider as we
-   * don't have a single surface for the texture contents, and we
-   * need to allocate our own one to be updated later.
-   */
-  virtual bool CreatedIncrementalTexture(ISurfaceAllocator* aAllocator,
-                                         const TextureInfo& aTextureInfo,
-                                         const nsIntRect& aBufferRect)
-  {
-    NS_ERROR("should be implemented or not used");
-    return false;
-  }
-
-  /**
    * Returns the front buffer.
    */
   virtual TextureHost* GetAsTextureHost() { return nullptr; }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/ContentHost.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/ContentHost.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/ContentHost.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/ContentHost.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -388,429 +388,6 @@
   return true;
 }
 
-ContentHostIncremental::ContentHostIncremental(const TextureInfo& aTextureInfo)
-  : ContentHostBase(aTextureInfo)
-  , mDeAllocator(nullptr)
-  , mLocked(false)
-{
-}
-
-ContentHostIncremental::~ContentHostIncremental()
-{
-}
-
-bool
-ContentHostIncremental::CreatedIncrementalTexture(ISurfaceAllocator* aAllocator,
-                                                  const TextureInfo& aTextureInfo,
-                                                  const nsIntRect& aBufferRect)
-{
-  mUpdateList.AppendElement(new TextureCreationRequest(aTextureInfo,
-                                                       aBufferRect));
-  mDeAllocator = aAllocator;
-  FlushUpdateQueue();
-  return true;
-}
-
-void
-ContentHostIncremental::UpdateIncremental(TextureIdentifier aTextureId,
-                                          SurfaceDescriptor& aSurface,
-                                          const nsIntRegion& aUpdated,
-                                          const nsIntRect& aBufferRect,
-                                          const nsIntPoint& aBufferRotation)
-{
-  mUpdateList.AppendElement(new TextureUpdateRequest(mDeAllocator,
-                                                     aTextureId,
-                                                     aSurface,
-                                                     aUpdated,
-                                                     aBufferRect,
-                                                     aBufferRotation));
-  FlushUpdateQueue();
-}
-
-void
-ContentHostIncremental::Composite(EffectChain& aEffectChain,
-                                  float aOpacity,
-                                  const gfx::Matrix4x4& aTransform,
-                                  const Filter& aFilter,
-                                  const Rect& aClipRect,
-                                  const nsIntRegion* aVisibleRegion)
-{
-  NS_ASSERTION(aVisibleRegion, "Requires a visible region");
-
-  AutoLockCompositableHost lock(this);
-  if (lock.Failed()) {
-    return;
-  }
-
-  if (!mSource) {
-    return;
-  }
-
-  RefPtr<TexturedEffect> effect = CreateTexturedEffect(mSource.get(),
-                                                       mSourceOnWhite.get(),
-                                                       aFilter, true);
-  if (!effect) {
-    return;
-  }
-
-  aEffectChain.mPrimaryEffect = effect;
-
-  nsIntRegion tmpRegion;
-  const nsIntRegion* renderRegion;
-  if (PaintWillResample()) {
-    // If we're resampling, then the texture image will contain exactly the
-    // entire visible region's bounds, and we should draw it all in one quad
-    // to avoid unexpected aliasing.
-    tmpRegion = aVisibleRegion->GetBounds();
-    renderRegion = &tmpRegion;
-  } else {
-    renderRegion = aVisibleRegion;
-  }
-
-  nsIntRegion region(*renderRegion);
-  nsIntPoint origin = GetOriginOffset();
-  // translate into TexImage space, buffer origin might not be at texture (0,0)
-  region.MoveBy(-origin);
-
-  // Figure out the intersecting draw region
-  gfx::IntSize texSize = mSource->GetSize();
-  nsIntRect textureRect = nsIntRect(0, 0, texSize.width, texSize.height);
-  textureRect.MoveBy(region.GetBounds().TopLeft());
-  nsIntRegion subregion;
-  subregion.And(region, textureRect);
-  if (subregion.IsEmpty()) {
-    // Region is empty, nothing to draw
-    return;
-  }
-
-  nsIntRegion screenRects;
-  nsIntRegion regionRects;
-
-  // Collect texture/screen coordinates for drawing
-  nsIntRegionRectIterator iter(subregion);
-  while (const nsIntRect* iterRect = iter.Next()) {
-    nsIntRect regionRect = *iterRect;
-    nsIntRect screenRect = regionRect;
-    screenRect.MoveBy(origin);
-
-    screenRects.Or(screenRects, screenRect);
-    regionRects.Or(regionRects, regionRect);
-  }
-
-  BigImageIterator* bigImgIter = mSource->AsBigImageIterator();
-  BigImageIterator* iterOnWhite = nullptr;
-  if (bigImgIter) {
-    bigImgIter->BeginBigImageIteration();
-  }
-
-  if (mSourceOnWhite) {
-    iterOnWhite = mSourceOnWhite->AsBigImageIterator();
-    MOZ_ASSERT(!bigImgIter || bigImgIter->GetTileCount() == iterOnWhite->GetTileCount(),
-               "Tile count mismatch on component alpha texture");
-    if (iterOnWhite) {
-      iterOnWhite->BeginBigImageIteration();
-    }
-  }
-
-  bool usingTiles = (bigImgIter && bigImgIter->GetTileCount() > 1);
-  do {
-    if (iterOnWhite) {
-      MOZ_ASSERT(iterOnWhite->GetTileRect() == bigImgIter->GetTileRect(),
-                 "component alpha textures should be the same size.");
-    }
-
-    nsIntRect texRect = bigImgIter ? bigImgIter->GetTileRect()
-                                   : nsIntRect(0, 0,
-                                               texSize.width,
-                                               texSize.height);
-
-    // Draw texture. If we're using tiles, we do repeating manually, as texture
-    // repeat would cause each individual tile to repeat instead of the
-    // compound texture as a whole. This involves drawing at most 4 sections,
-    // 2 for each axis that has texture repeat.
-    for (int y = 0; y < (usingTiles ? 2 : 1); y++) {
-      for (int x = 0; x < (usingTiles ? 2 : 1); x++) {
-        nsIntRect currentTileRect(texRect);
-        currentTileRect.MoveBy(x * texSize.width, y * texSize.height);
-
-        nsIntRegionRectIterator screenIter(screenRects);
-        nsIntRegionRectIterator regionIter(regionRects);
-
-        const nsIntRect* screenRect;
-        const nsIntRect* regionRect;
-        while ((screenRect = screenIter.Next()) &&
-               (regionRect = regionIter.Next())) {
-          nsIntRect tileScreenRect(*screenRect);
-          nsIntRect tileRegionRect(*regionRect);
-
-          // When we're using tiles, find the intersection between the tile
-          // rect and this region rect. Tiling is then handled by the
-          // outer for-loops and modifying the tile rect.
-          if (usingTiles) {
-            tileScreenRect.MoveBy(-origin);
-            tileScreenRect = tileScreenRect.Intersect(currentTileRect);
-            tileScreenRect.MoveBy(origin);
-
-            if (tileScreenRect.IsEmpty())
-              continue;
-
-            tileRegionRect = regionRect->Intersect(currentTileRect);
-            tileRegionRect.MoveBy(-currentTileRect.TopLeft());
-          }
-          gfx::Rect rect(tileScreenRect.x, tileScreenRect.y,
-                         tileScreenRect.width, tileScreenRect.height);
-
-          effect->mTextureCoords = Rect(Float(tileRegionRect.x) / texRect.width,
-                                        Float(tileRegionRect.y) / texRect.height,
-                                        Float(tileRegionRect.width) / texRect.width,
-                                        Float(tileRegionRect.height) / texRect.height);
-          GetCompositor()->DrawQuad(rect, aClipRect, aEffectChain, aOpacity, aTransform);
-          if (usingTiles) {
-            DiagnosticFlags diagnostics = DiagnosticFlags::CONTENT | DiagnosticFlags::BIGIMAGE;
-            if (iterOnWhite) {
-              diagnostics |= DiagnosticFlags::COMPONENT_ALPHA;
-            }
-            GetCompositor()->DrawDiagnostics(diagnostics, rect, aClipRect,
-                                             aTransform, mFlashCounter);
-          }
-        }
-      }
-    }
-
-    if (iterOnWhite) {
-      iterOnWhite->NextTile();
-    }
-  } while (usingTiles && bigImgIter->NextTile());
-
-  if (bigImgIter) {
-    bigImgIter->EndBigImageIteration();
-  }
-  if (iterOnWhite) {
-    iterOnWhite->EndBigImageIteration();
-  }
-
-  DiagnosticFlags diagnostics = DiagnosticFlags::CONTENT;
-  if (iterOnWhite) {
-    diagnostics |= DiagnosticFlags::COMPONENT_ALPHA;
-  }
-  GetCompositor()->DrawDiagnostics(diagnostics, nsIntRegion(mBufferRect), aClipRect,
-                                   aTransform, mFlashCounter);
-}
-
-void
-ContentHostIncremental::FlushUpdateQueue()
-{
-  // If we're not compositing for some reason (the window being minimized
-  // is one example), then we never process these updates and it can consume
-  // huge amounts of memory. Instead we forcibly process the updates (during the
-  // transaction) if the list gets too long.
-  static const uint32_t kMaxUpdateCount = 6;
-  if (mUpdateList.Length() >= kMaxUpdateCount) {
-    ProcessTextureUpdates();
-  }
-}
-
-void
-ContentHostIncremental::ProcessTextureUpdates()
-{
-  for (uint32_t i = 0; i < mUpdateList.Length(); i++) {
-    mUpdateList[i]->Execute(this);
-  }
-  mUpdateList.Clear();
-}
-
-void
-ContentHostIncremental::TextureCreationRequest::Execute(ContentHostIncremental* aHost)
-{
-  Compositor* compositor = aHost->GetCompositor();
-  MOZ_ASSERT(compositor);
-
-  RefPtr<DataTextureSource> temp =
-    compositor->CreateDataTextureSource(mTextureInfo.mTextureFlags);
-  MOZ_ASSERT(temp->AsSourceOGL() &&
-             temp->AsSourceOGL()->AsTextureImageTextureSource());
-  RefPtr<TextureImageTextureSourceOGL> newSource =
-    temp->AsSourceOGL()->AsTextureImageTextureSource();
-
-  RefPtr<TextureImageTextureSourceOGL> newSourceOnWhite;
-  if (mTextureInfo.mTextureFlags & TextureFlags::COMPONENT_ALPHA) {
-    temp =
-      compositor->CreateDataTextureSource(mTextureInfo.mTextureFlags);
-    MOZ_ASSERT(temp->AsSourceOGL() &&
-               temp->AsSourceOGL()->AsTextureImageTextureSource());
-    newSourceOnWhite = temp->AsSourceOGL()->AsTextureImageTextureSource();
-  }
-
-  if (mTextureInfo.mDeprecatedTextureHostFlags & DeprecatedTextureHostFlags::COPY_PREVIOUS) {
-    MOZ_ASSERT(aHost->mSource);
-    MOZ_ASSERT(aHost->mSource->IsValid());
-    nsIntRect bufferRect = aHost->mBufferRect;
-    nsIntPoint bufferRotation = aHost->mBufferRotation;
-    nsIntRect overlap;
-
-    // The buffer looks like:
-    //  ______
-    // |1  |2 |  Where the center point is offset by mBufferRotation from the top-left corner.
-    // |___|__|
-    // |3  |4 |
-    // |___|__|
-    //
-    // This is drawn to the screen as:
-    //  ______
-    // |4  |3 |  Where the center point is { width - mBufferRotation.x, height - mBufferRotation.y } from
-    // |___|__|  from the top left corner - rotationPoint.
-    // |2  |1 |
-    // |___|__|
-    //
-
-    // The basic idea below is to take all quadrant rectangles from the src and transform them into rectangles
-    // in the destination. Unfortunately, it seems it is overly complex and could perhaps be simplified.
-
-    nsIntRect srcBufferSpaceBottomRight(bufferRotation.x, bufferRotation.y, bufferRect.width - bufferRotation.x, bufferRect.height - bufferRotation.y);
-    nsIntRect srcBufferSpaceTopRight(bufferRotation.x, 0, bufferRect.width - bufferRotation.x, bufferRotation.y);
-    nsIntRect srcBufferSpaceTopLeft(0, 0, bufferRotation.x, bufferRotation.y);
-    nsIntRect srcBufferSpaceBottomLeft(0, bufferRotation.y, bufferRotation.x, bufferRect.height - bufferRotation.y);
-
-    overlap.IntersectRect(bufferRect, mBufferRect);
-
-    nsIntRect srcRect(overlap), dstRect(overlap);
-    srcRect.MoveBy(- bufferRect.TopLeft() + bufferRotation);
-
-    nsIntRect srcRectDrawTopRight(srcRect);
-    nsIntRect srcRectDrawTopLeft(srcRect);
-    nsIntRect srcRectDrawBottomLeft(srcRect);
-    // transform into the different quadrants
-    srcRectDrawTopRight  .MoveBy(-nsIntPoint(0, bufferRect.height));
-    srcRectDrawTopLeft   .MoveBy(-nsIntPoint(bufferRect.width, bufferRect.height));
-    srcRectDrawBottomLeft.MoveBy(-nsIntPoint(bufferRect.width, 0));
-
-    // Intersect with the quadrant
-    srcRect               = srcRect              .Intersect(srcBufferSpaceBottomRight);
-    srcRectDrawTopRight   = srcRectDrawTopRight  .Intersect(srcBufferSpaceTopRight);
-    srcRectDrawTopLeft    = srcRectDrawTopLeft   .Intersect(srcBufferSpaceTopLeft);
-    srcRectDrawBottomLeft = srcRectDrawBottomLeft.Intersect(srcBufferSpaceBottomLeft);
-
-    dstRect = srcRect;
-    nsIntRect dstRectDrawTopRight(srcRectDrawTopRight);
-    nsIntRect dstRectDrawTopLeft(srcRectDrawTopLeft);
-    nsIntRect dstRectDrawBottomLeft(srcRectDrawBottomLeft);
-
-    // transform back to src buffer space
-    dstRect              .MoveBy(-bufferRotation);
-    dstRectDrawTopRight  .MoveBy(-bufferRotation + nsIntPoint(0, bufferRect.height));
-    dstRectDrawTopLeft   .MoveBy(-bufferRotation + nsIntPoint(bufferRect.width, bufferRect.height));
-    dstRectDrawBottomLeft.MoveBy(-bufferRotation + nsIntPoint(bufferRect.width, 0));
-
-    // transform back to draw coordinates
-    dstRect              .MoveBy(bufferRect.TopLeft());
-    dstRectDrawTopRight  .MoveBy(bufferRect.TopLeft());
-    dstRectDrawTopLeft   .MoveBy(bufferRect.TopLeft());
-    dstRectDrawBottomLeft.MoveBy(bufferRect.TopLeft());
-
-    // transform to destBuffer space
-    dstRect              .MoveBy(-mBufferRect.TopLeft());
-    dstRectDrawTopRight  .MoveBy(-mBufferRect.TopLeft());
-    dstRectDrawTopLeft   .MoveBy(-mBufferRect.TopLeft());
-    dstRectDrawBottomLeft.MoveBy(-mBufferRect.TopLeft());
-
-    newSource->EnsureBuffer(mBufferRect.Size(),
-                           ContentForFormat(aHost->mSource->GetFormat()));
-
-    aHost->mSource->CopyTo(srcRect, newSource, dstRect);
-    if (bufferRotation != nsIntPoint(0, 0)) {
-      // Draw the remaining quadrants. We call BlitTextureImage 3 extra
-      // times instead of doing a single draw call because supporting that
-      // with a tiled source is quite tricky.
-
-      if (!srcRectDrawTopRight.IsEmpty())
-        aHost->mSource->CopyTo(srcRectDrawTopRight,
-                               newSource, dstRectDrawTopRight);
-      if (!srcRectDrawTopLeft.IsEmpty())
-        aHost->mSource->CopyTo(srcRectDrawTopLeft,
-                               newSource, dstRectDrawTopLeft);
-      if (!srcRectDrawBottomLeft.IsEmpty())
-        aHost->mSource->CopyTo(srcRectDrawBottomLeft,
-                               newSource, dstRectDrawBottomLeft);
-    }
-
-    if (newSourceOnWhite) {
-      newSourceOnWhite->EnsureBuffer(mBufferRect.Size(),
-                                    ContentForFormat(aHost->mSourceOnWhite->GetFormat()));
-      aHost->mSourceOnWhite->CopyTo(srcRect, newSourceOnWhite, dstRect);
-      if (bufferRotation != nsIntPoint(0, 0)) {
-        // draw the remaining quadrants
-        if (!srcRectDrawTopRight.IsEmpty())
-          aHost->mSourceOnWhite->CopyTo(srcRectDrawTopRight,
-                                        newSourceOnWhite, dstRectDrawTopRight);
-        if (!srcRectDrawTopLeft.IsEmpty())
-          aHost->mSourceOnWhite->CopyTo(srcRectDrawTopLeft,
-                                        newSourceOnWhite, dstRectDrawTopLeft);
-        if (!srcRectDrawBottomLeft.IsEmpty())
-          aHost->mSourceOnWhite->CopyTo(srcRectDrawBottomLeft,
-                                        newSourceOnWhite, dstRectDrawBottomLeft);
-      }
-    }
-  }
-
-  aHost->mSource = newSource;
-  aHost->mSourceOnWhite = newSourceOnWhite;
-
-  aHost->mBufferRect = mBufferRect;
-  aHost->mBufferRotation = nsIntPoint();
-}
-
-nsIntRect
-ContentHostIncremental::TextureUpdateRequest::GetQuadrantRectangle(XSide aXSide,
-                                                                   YSide aYSide) const
-{
-  // quadrantTranslation is the amount we translate the top-left
-  // of the quadrant by to get coordinates relative to the layer
-  nsIntPoint quadrantTranslation = -mBufferRotation;
-  quadrantTranslation.x += aXSide == LEFT ? mBufferRect.width : 0;
-  quadrantTranslation.y += aYSide == TOP ? mBufferRect.height : 0;
-  return mBufferRect + quadrantTranslation;
-}
-
-void
-ContentHostIncremental::TextureUpdateRequest::Execute(ContentHostIncremental* aHost)
-{
-  nsIntRect drawBounds = mUpdated.GetBounds();
-
-  aHost->mBufferRect = mBufferRect;
-  aHost->mBufferRotation = mBufferRotation;
-
-  // Figure out which quadrant to draw in
-  int32_t xBoundary = mBufferRect.XMost() - mBufferRotation.x;
-  int32_t yBoundary = mBufferRect.YMost() - mBufferRotation.y;
-  XSide sideX = drawBounds.XMost() <= xBoundary ? RIGHT : LEFT;
-  YSide sideY = drawBounds.YMost() <= yBoundary ? BOTTOM : TOP;
-  nsIntRect quadrantRect = GetQuadrantRectangle(sideX, sideY);
-  NS_ASSERTION(quadrantRect.Contains(drawBounds), "Messed up quadrants");
-
-  mUpdated.MoveBy(-nsIntPoint(quadrantRect.x, quadrantRect.y));
-
-  IntPoint offset = ToIntPoint(-mUpdated.GetBounds().TopLeft());
-
-  RefPtr<DataSourceSurface> surf = GetSurfaceForDescriptor(mDescriptor);
-
-  if (mTextureId == TextureIdentifier::Front) {
-    aHost->mSource->Update(surf, &mUpdated, &offset);
-  } else {
-    aHost->mSourceOnWhite->Update(surf, &mUpdated, &offset);
-  }
-}
-
-void
-ContentHostIncremental::PrintInfo(std::stringstream& aStream, const char* aPrefix)
-{
-  aStream << aPrefix;
-  aStream << nsPrintfCString("ContentHostIncremental (0x%p)", this).get();
-
-  if (PaintWillResample()) {
-    aStream << " [paint-will-resample]";
-  }
-}
-
 void
 ContentHostTexture::PrintInfo(std::stringstream& aStream, const char* aPrefix)
 {
@@ -869,15 +446,6 @@
                               aFilter, true);
 }
 
-TemporaryRef<TexturedEffect>
-ContentHostIncremental::GenEffect(const gfx::Filter& aFilter)
-{
-  if (!mSource) {
-    return nullptr;
-  }
-  return CreateTexturedEffect(mSource, mSourceOnWhite, aFilter, true);
-}
-
 TemporaryRef<gfx::DataSourceSurface>
 ContentHostTexture::GetAsSurface()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/ContentHost.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/ContentHost.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/ContentHost.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/ContentHost.h	2015-02-28 15:03:12.000000000 +0000
@@ -223,160 +223,6 @@
                             nsIntRegion* aUpdatedRegionBack);
 };
 
-/**
- * Maintains a host-side only texture, and gets provided with
- * surfaces that only cover the changed pixels during an update.
- *
- * Takes ownership of the passed in update surfaces, and must
- * free them once texture upload is complete.
- *
- * Delays texture uploads until the next composite to
- * avoid blocking the main thread.
- */
-class ContentHostIncremental : public ContentHostBase
-{
-public:
-  explicit ContentHostIncremental(const TextureInfo& aTextureInfo);
-  ~ContentHostIncremental();
-
-  virtual CompositableType GetType() MOZ_OVERRIDE { return CompositableType::CONTENT_INC; }
-
-  virtual LayerRenderState GetRenderState() MOZ_OVERRIDE { return LayerRenderState(); }
-
-  virtual bool CreatedIncrementalTexture(ISurfaceAllocator* aAllocator,
-                                         const TextureInfo& aTextureInfo,
-                                         const nsIntRect& aBufferRect) MOZ_OVERRIDE;
-
-  virtual void UpdateIncremental(TextureIdentifier aTextureId,
-                                 SurfaceDescriptor& aSurface,
-                                 const nsIntRegion& aUpdated,
-                                 const nsIntRect& aBufferRect,
-                                 const nsIntPoint& aBufferRotation) MOZ_OVERRIDE;
-
-  virtual bool UpdateThebes(const ThebesBufferData& aData,
-                            const nsIntRegion& aUpdated,
-                            const nsIntRegion& aOldValidRegionBack,
-                            nsIntRegion* aUpdatedRegionBack) MOZ_OVERRIDE
-  {
-    NS_ERROR("Shouldn't call this");
-    return false;
-  }
-
-  virtual void Composite(EffectChain& aEffectChain,
-                         float aOpacity,
-                         const gfx::Matrix4x4& aTransform,
-                         const gfx::Filter& aFilter,
-                         const gfx::Rect& aClipRect,
-                         const nsIntRegion* aVisibleRegion = nullptr) MOZ_OVERRIDE;
-
-  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) MOZ_OVERRIDE;
-
-  virtual bool Lock() MOZ_OVERRIDE {
-    MOZ_ASSERT(!mLocked);
-    ProcessTextureUpdates();
-    mLocked = true;
-    return true;
-  }
-
-  virtual void Unlock() MOZ_OVERRIDE {
-    MOZ_ASSERT(mLocked);
-    mLocked = false;
-  }
-
-  virtual TemporaryRef<TexturedEffect>
-  GenEffect(const gfx::Filter& aFilter) MOZ_OVERRIDE;
-
-private:
-
-  void FlushUpdateQueue();
-  void ProcessTextureUpdates();
-
-  class Request
-  {
-  public:
-    Request()
-    {
-      MOZ_COUNT_CTOR(ContentHostIncremental::Request);
-    }
-
-    virtual ~Request()
-    {
-      MOZ_COUNT_DTOR(ContentHostIncremental::Request);
-    }
-
-    virtual void Execute(ContentHostIncremental *aHost) = 0;
-  };
-
-  class TextureCreationRequest : public Request
-  {
-  public:
-    TextureCreationRequest(const TextureInfo& aTextureInfo,
-                           const nsIntRect& aBufferRect)
-      : mTextureInfo(aTextureInfo)
-      , mBufferRect(aBufferRect)
-    {}
-
-    virtual void Execute(ContentHostIncremental *aHost);
-
-  private:
-    TextureInfo mTextureInfo;
-    nsIntRect mBufferRect;
-  };
-
-  class TextureUpdateRequest : public Request
-  {
-  public:
-    TextureUpdateRequest(ISurfaceAllocator* aDeAllocator,
-                         TextureIdentifier aTextureId,
-                         SurfaceDescriptor& aDescriptor,
-                         const nsIntRegion& aUpdated,
-                         const nsIntRect& aBufferRect,
-                         const nsIntPoint& aBufferRotation)
-      : mDeAllocator(aDeAllocator)
-      , mTextureId(aTextureId)
-      , mDescriptor(aDescriptor)
-      , mUpdated(aUpdated)
-      , mBufferRect(aBufferRect)
-      , mBufferRotation(aBufferRotation)
-    {}
-
-    ~TextureUpdateRequest()
-    {
-      //TODO: Recycle these?
-      mDeAllocator->DestroySharedSurface(&mDescriptor);
-    }
-
-    virtual void Execute(ContentHostIncremental *aHost);
-
-  private:
-    enum XSide {
-      LEFT, RIGHT
-    };
-    enum YSide {
-      TOP, BOTTOM
-    };
-
-    nsIntRect GetQuadrantRectangle(XSide aXSide, YSide aYSide) const;
-
-    RefPtr<ISurfaceAllocator> mDeAllocator;
-    TextureIdentifier mTextureId;
-    SurfaceDescriptor mDescriptor;
-    nsIntRegion mUpdated;
-    nsIntRect mBufferRect;
-    nsIntPoint mBufferRotation;
-  };
-
-  nsTArray<UniquePtr<Request> > mUpdateList;
-
-  // Specific to OGL to avoid exposing methods on TextureSource that only
-  // have one implementation.
-  RefPtr<TextureImageTextureSourceOGL> mSource;
-  RefPtr<TextureImageTextureSourceOGL> mSourceOnWhite;
-
-  RefPtr<ISurfaceAllocator> mDeAllocator;
-  bool mLocked;
-};
-
 }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/LayerManagerComposite.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/LayerManagerComposite.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/LayerManagerComposite.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/LayerManagerComposite.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -233,7 +233,7 @@
       !aLayer->GetMaskLayer() &&
       aLayer->GetLocalOpacity() == 1.0f) {
     if (aLayer->GetContentFlags() & Layer::CONTENT_OPAQUE) {
-      localOpaque.Or(localOpaque, composite->GetShadowVisibleRegion());
+      localOpaque.Or(localOpaque, composite->GetFullyRenderedRegion());
     }
     localOpaque.MoveBy(transform2d._31, transform2d._32);
     const nsIntRect* clip = aLayer->GetEffectiveClipRect();
@@ -304,11 +304,8 @@
     // so we don't need to pass any global transform here.
     mRoot->ComputeEffectiveTransforms(gfx::Matrix4x4());
 
-    // Disable culling for now. We need to fix /the regressions from
-    // bug 1085223 before we can re-enable this:
-    // 1) Don't cull during progressive draw, 2) OS X tp5 regressions.
-    //nsIntRegion opaque;
-    //ApplyOcclusionCulling(mRoot, opaque);
+    nsIntRegion opaque;
+    ApplyOcclusionCulling(mRoot, opaque);
 
     Render();
     mGeometryChanged = false;
@@ -1154,6 +1151,20 @@
   mCompositor = aManager->GetCompositor();
 }
 
+nsIntRegion
+LayerComposite::GetFullyRenderedRegion() {
+  if (TiledLayerComposer* tiled = GetTiledLayerComposer()) {
+    nsIntRegion shadowVisibleRegion = GetShadowVisibleRegion();
+    // Discard the region which hasn't been drawn yet when doing
+    // progressive drawing. Note that if the shadow visible region
+    // shrunk the tiled valig region may not have discarded this yet.
+    shadowVisibleRegion.And(shadowVisibleRegion, tiled->GetValidRegion());
+    return shadowVisibleRegion;
+  } else {
+    return GetShadowVisibleRegion();
+  }
+}
+
 #ifndef MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS
 
 /*static*/ bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/LayerManagerComposite.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/LayerManagerComposite.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/LayerManagerComposite.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/LayerManagerComposite.h	2015-02-28 15:03:12.000000000 +0000
@@ -441,6 +441,13 @@
   bool HasLayerBeenComposited() { return mLayerComposited; }
   nsIntRect GetClearRect() { return mClearRect; }
 
+  /**
+   * Return the part of the visible region that has been fully rendered.
+   * While progressive drawing is in progress this region will be
+   * a subset of the shadow visible region.
+   */
+  nsIntRegion GetFullyRenderedRegion();
+
 protected:
   gfx::Matrix4x4 mShadowTransform;
   nsIntRegion mShadowVisibleRegion;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/PaintedLayerComposite.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/PaintedLayerComposite.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/PaintedLayerComposite.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/PaintedLayerComposite.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -53,7 +53,6 @@
 PaintedLayerComposite::SetCompositableHost(CompositableHost* aHost)
 {
   switch (aHost->GetType()) {
-    case CompositableType::CONTENT_INC:
     case CompositableType::CONTENT_TILED:
     case CompositableType::CONTENT_SINGLE:
     case CompositableType::CONTENT_DOUBLE:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/TiledContentHost.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/TiledContentHost.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/TiledContentHost.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/TiledContentHost.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -532,7 +532,11 @@
                                   textureRect.height / aTextureBounds.height);
     mCompositor->DrawQuad(graphicsRect, aClipRect, aEffectChain, aOpacity, aTransform);
   }
-  mCompositor->DrawDiagnostics(DiagnosticFlags::CONTENT | DiagnosticFlags::TILE,
+  DiagnosticFlags flags = DiagnosticFlags::CONTENT | DiagnosticFlags::TILE;
+  if (aTile.mTextureHostOnWhite) {
+    flags |= DiagnosticFlags::COMPONENT_ALPHA;
+  }
+  mCompositor->DrawDiagnostics(flags,
                                aScreenRegion, aClipRect, aTransform, mFlashCounter);
 }
 
@@ -579,6 +583,8 @@
   aTransform.PreScale(1/(resolution * layerScale.width),
                       1/(resolution * layerScale.height), 1);
 
+  DiagnosticFlags componentAlphaDiagnostic = DiagnosticFlags::NO_DIAGNOSTIC;
+
   uint32_t rowCount = 0;
   uint32_t tileX = 0;
   nsIntRect visibleRect = aVisibleRegion.GetBounds();
@@ -615,6 +621,9 @@
           RenderTile(tileTexture, aBackgroundColor, aEffectChain, aOpacity, aTransform,
                      aFilter, aClipRect, tileDrawRegion, tileOffset,
                      nsIntSize(tileSize.width, tileSize.height));
+          if (tileTexture.mTextureHostOnWhite) {
+            componentAlphaDiagnostic = DiagnosticFlags::COMPONENT_ALPHA;
+          }
         }
       }
       tileY++;
@@ -625,7 +634,7 @@
   }
   gfx::Rect rect(visibleRect.x, visibleRect.y,
                  visibleRect.width, visibleRect.height);
-  GetCompositor()->DrawDiagnostics(DiagnosticFlags::CONTENT,
+  GetCompositor()->DrawDiagnostics(DiagnosticFlags::CONTENT | componentAlphaDiagnostic,
                                    rect, aClipRect, aTransform, mFlashCounter);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/TiledContentHost.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/TiledContentHost.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/composite/TiledContentHost.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/composite/TiledContentHost.h	2015-02-28 15:03:12.000000000 +0000
@@ -231,6 +231,11 @@
     return mLowPrecisionTiledBuffer.GetValidRegion();
   }
 
+  const nsIntRegion& GetValidRegion() const MOZ_OVERRIDE
+  {
+    return mTiledBuffer.GetValidRegion();
+  }
+
   virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE
   {
     CompositableHost::SetCompositor(aCompositor);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/CompositorTypes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/CompositorTypes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/CompositorTypes.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/CompositorTypes.h	2015-02-28 15:03:12.000000000 +0000
@@ -133,8 +133,6 @@
  */
 enum class CompositableType : uint8_t {
   UNKNOWN,
-  CONTENT_INC,     // painted layer interface, only sends incremental
-                   // updates to a texture on the compositor side.
   CONTENT_TILED,   // tiled painted layer
   IMAGE,           // image with single buffering
   IMAGE_OVERLAY,   // image without buffer
@@ -144,19 +142,6 @@
   COUNT
 };
 
-/**
- * How the texture host is used for composition,
- * XXX - Only used by ContentClientIncremental
- */
-enum class DeprecatedTextureHostFlags : uint8_t {
-  DEFAULT = 0,       // The default texture host for the given SurfaceDescriptor
-  TILED = 1 << 0,    // A texture host that supports tiling
-  COPY_PREVIOUS = 1 << 1, // Texture contents should be initialized
-                                      // from the previous texture.
-  ALL_BITS = (1 << 2) - 1
-};
-MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(DeprecatedTextureHostFlags)
-
 #ifdef XP_WIN
 typedef void* SyncHandle;
 #else
@@ -195,20 +180,6 @@
 };
 
 /**
- * Identify a texture to a compositable. Many textures can have the same id, but
- * the id is unique for any texture owned by a particular compositable.
- * XXX - We don't really need this, it will be removed along with the incremental
- * ContentClient/Host.
- */
-enum class TextureIdentifier : uint8_t {
-  Front = 1,
-  Back = 2,
-  OnWhiteFront = 3,
-  OnWhiteBack = 4,
-  HighBound
-};
-
-/**
  * Information required by the compositor from the content-side for creating or
  * using compositables and textures.
  * XXX - TextureInfo is a bad name: this information is useful for the compositable,
@@ -218,27 +189,22 @@
 struct TextureInfo
 {
   CompositableType mCompositableType;
-  // XXX - only used by ContentClientIncremental
-  DeprecatedTextureHostFlags mDeprecatedTextureHostFlags;
   TextureFlags mTextureFlags;
 
   TextureInfo()
     : mCompositableType(CompositableType::UNKNOWN)
-    , mDeprecatedTextureHostFlags(DeprecatedTextureHostFlags::DEFAULT)
     , mTextureFlags(TextureFlags::NO_FLAGS)
   {}
 
   explicit TextureInfo(CompositableType aType,
                        TextureFlags aTextureFlags = TextureFlags::DEFAULT)
     : mCompositableType(aType)
-    , mDeprecatedTextureHostFlags(DeprecatedTextureHostFlags::DEFAULT)
     , mTextureFlags(aTextureFlags)
   {}
 
   bool operator==(const TextureInfo& aOther) const
   {
     return mCompositableType == aOther.mCompositableType &&
-           mDeprecatedTextureHostFlags == aOther.mDeprecatedTextureHostFlags &&
            mTextureFlags == aOther.mTextureFlags;
   }
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/d3d11/TextureD3D11.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/d3d11/TextureD3D11.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/d3d11/TextureD3D11.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/d3d11/TextureD3D11.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -179,9 +179,9 @@
 {
   if (mActor) {
     if (mTexture) {
-      KeepUntilFullDeallocation(new TKeepAlive<ID3D10Texture2D>(mTexture10));
+      KeepUntilFullDeallocation(MakeUnique<TKeepAlive<ID3D10Texture2D>>(mTexture10));
     } else if (mTexture10) {
-      KeepUntilFullDeallocation(new TKeepAlive<ID3D11Texture2D>(mTexture));
+      KeepUntilFullDeallocation(MakeUnique<TKeepAlive<ID3D11Texture2D>>(mTexture));
     }
   }
 #ifdef DEBUG
@@ -825,7 +825,7 @@
   if (mD3D10SyncedTextures.size()) {
     RefPtr<IDXGIKeyedMutex> mutex;
     hr = mD3D10Texture->QueryInterface((IDXGIKeyedMutex**)byRef(mutex));
-    hr = mutex->AcquireSync(0, 10000);
+    hr = mutex->AcquireSync(0, 20000);
 
     if (hr == WAIT_TIMEOUT) {
       MOZ_CRASH();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/d3d9/TextureD3D9.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/d3d9/TextureD3D9.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/d3d9/TextureD3D9.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/d3d9/TextureD3D9.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -739,7 +739,7 @@
 SharedTextureClientD3D9::~SharedTextureClientD3D9()
 {
   if (mTexture && mActor) {
-    KeepUntilFullDeallocation(new TKeepAlive<IDirect3DTexture9>(mTexture));
+    KeepUntilFullDeallocation(MakeUnique<TKeepAlive<IDirect3DTexture9>>(mTexture));
   }
   if (mTexture) {
     gfxWindowsPlatform::sD3D9SharedTextureUsed -= mDesc.Width * mDesc.Height * 4;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/d3d9/TextureD3D9.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/d3d9/TextureD3D9.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/d3d9/TextureD3D9.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/d3d9/TextureD3D9.h	2015-02-28 15:03:12.000000000 +0000
@@ -266,7 +266,9 @@
     mTexture = aTexture;
     mHandle = aSharedHandle;
     mDesc = aDesc;
-    gfxWindowsPlatform::sD3D9SharedTextureUsed += mDesc.Width * mDesc.Height * 4;
+    if (mTexture) {
+      gfxWindowsPlatform::sD3D9SharedTextureUsed += mDesc.Width * mDesc.Height * 4;
+    }
   }
 
   virtual gfx::IntSize GetSize() const
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/CompositableForwarder.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/CompositableForwarder.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/CompositableForwarder.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/CompositableForwarder.h	2015-02-28 15:03:12.000000000 +0000
@@ -56,14 +56,6 @@
   virtual void Connect(CompositableClient* aCompositable) = 0;
 
   /**
-   * Notify the CompositableHost that it should create host-side-only
-   * texture(s), that we will update incrementally using UpdateTextureIncremental.
-   */
-  virtual void CreatedIncrementalBuffer(CompositableClient* aCompositable,
-                                        const TextureInfo& aTextureInfo,
-                                        const nsIntRect& aBufferRect) = 0;
-
-  /**
    * Tell the CompositableHost on the compositor side what TiledLayerBuffer to
    * use for the next composition.
    */
@@ -84,23 +76,6 @@
                                    const nsIntRegion& aUpdatedRegion) = 0;
 
   /**
-   * Notify the compositor to update aTextureId using aDescriptor, and take
-   * ownership of aDescriptor.
-   *
-   * aDescriptor only contains the pixels for aUpdatedRegion, and is relative
-   * to aUpdatedRegion.TopLeft().
-   *
-   * aBufferRect/aBufferRotation define the new valid region contained
-   * within the texture after the update has been applied.
-   */
-  virtual void UpdateTextureIncremental(CompositableClient* aCompositable,
-                                        TextureIdentifier aTextureId,
-                                        SurfaceDescriptor& aDescriptor,
-                                        const nsIntRegion& aUpdatedRegion,
-                                        const nsIntRect& aBufferRect,
-                                        const nsIntPoint& aBufferRotation) = 0;
-
-  /**
    * Communicate the picture rect of a YUV image in aLayer to the compositor
    */
   virtual void UpdatePictureRect(CompositableClient* aCompositable,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/CompositableTransactionParent.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -73,20 +73,6 @@
                                                      EditReplyVector& replyv)
 {
   switch (aEdit.type()) {
-    case CompositableOperation::TOpCreatedIncrementalTexture: {
-      MOZ_LAYERS_LOG(("[ParentSide] Created texture"));
-      const OpCreatedIncrementalTexture& op = aEdit.get_OpCreatedIncrementalTexture();
-      CompositableHost* compositable = AsCompositable(op);
-
-      bool success =
-        compositable->CreatedIncrementalTexture(this,
-                                                op.textureInfo(),
-                                                op.bufferRect());
-      if (!success) {
-        return false;
-      }
-      break;
-    }
     case CompositableOperation::TOpPaintTextureRegion: {
       MOZ_LAYERS_LOG(("[ParentSide] Paint PaintedLayer"));
 
@@ -116,22 +102,6 @@
       RenderTraceInvalidateEnd(thebes, "FF00FF");
       break;
     }
-    case CompositableOperation::TOpPaintTextureIncremental: {
-      MOZ_LAYERS_LOG(("[ParentSide] Paint PaintedLayer"));
-
-      const OpPaintTextureIncremental& op = aEdit.get_OpPaintTextureIncremental();
-
-      CompositableHost* compositable = AsCompositable(op);
-
-      SurfaceDescriptor desc = op.image();
-
-      compositable->UpdateIncremental(op.textureId(),
-                                      desc,
-                                      op.updatedRegion(),
-                                      op.bufferRect(),
-                                      op.bufferRotation());
-      break;
-    }
     case CompositableOperation::TOpUpdatePictureRect: {
       const OpUpdatePictureRect& op = aEdit.get_OpUpdatePictureRect();
       CompositableHost* compositable = AsCompositable(op);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/CompositorParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/CompositorParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/CompositorParent.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/CompositorParent.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -74,11 +74,13 @@
 namespace mozilla {
 namespace layers {
 
-using namespace base;
 using namespace mozilla::ipc;
 using namespace mozilla::gfx;
 using namespace std;
 
+using base::ProcessHandle;
+using base::Thread;
+
 CompositorParent::LayerTreeState::LayerTreeState()
   : mParent(nullptr)
   , mLayerManager(nullptr)
@@ -230,7 +232,7 @@
   MOZ_ASSERT(aWidget != nullptr);
   mCompositorVsyncDispatcher = aWidget->GetCompositorVsyncDispatcher();
 #ifdef MOZ_WIDGET_GONK
-  GeckoTouchDispatcher::SetCompositorVsyncObserver(this);
+  GeckoTouchDispatcher::GetInstance()->SetCompositorVsyncObserver(this);
 #endif
 }
 
@@ -368,7 +370,7 @@
 CompositorVsyncObserver::DispatchTouchEvents(TimeStamp aVsyncTimestamp)
 {
 #ifdef MOZ_WIDGET_GONK
-  GeckoTouchDispatcher::NotifyVsync(aVsyncTimestamp);
+  GeckoTouchDispatcher::GetInstance()->NotifyVsync(aVsyncTimestamp);
 #endif
 }
 
@@ -443,7 +445,7 @@
     mApzcTreeManager = new APZCTreeManager();
   }
 
-  if (gfxPrefs::VsyncAlignedCompositor()) {
+  if (gfxPrefs::VsyncAlignedCompositor() && gfxPrefs::HardwareVsyncEnabled()) {
     mCompositorVsyncObserver = new CompositorVsyncObserver(this, aWidget);
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/FenceUtilsGonk.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/FenceUtilsGonk.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/FenceUtilsGonk.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/FenceUtilsGonk.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -12,9 +12,10 @@
 #include "FenceUtilsGonk.h"
 
 using namespace android;
-using namespace base;
 using namespace mozilla::layers;
 
+using base::FileDescriptor;
+
 namespace IPC {
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ImageBridgeChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ImageBridgeChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ImageBridgeChild.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ImageBridgeChild.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -541,17 +541,6 @@
   for (nsTArray<EditReply>::size_type i = 0; i < replies.Length(); ++i) {
     const EditReply& reply = replies[i];
     switch (reply.type()) {
-    case EditReply::TOpTextureSwap: {
-      const OpTextureSwap& ots = reply.get_OpTextureSwap();
-
-      CompositableClient* compositable =
-        CompositableClient::FromIPDLActor(ots.compositableChild());
-
-      MOZ_ASSERT(compositable);
-
-      compositable->SetDescriptorFromReply(ots.textureId(), ots.image());
-      break;
-    }
     case EditReply::TReturnReleaseFence: {
       const ReturnReleaseFence& rep = reply.get_ReturnReleaseFence();
       FenceHandle fence = rep.fence();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ImageBridgeChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ImageBridgeChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ImageBridgeChild.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ImageBridgeChild.h	2015-02-28 15:03:12.000000000 +0000
@@ -13,7 +13,7 @@
 #include "mozilla/ipc/SharedMemory.h"   // for SharedMemory, etc
 #include "mozilla/layers/AsyncTransactionTracker.h" // for AsyncTransactionTrackerHolder
 #include "mozilla/layers/CompositableForwarder.h"
-#include "mozilla/layers/CompositorTypes.h"  // for TextureIdentifier, etc
+#include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/layers/PImageBridgeChild.h"
 #include "nsDebug.h"                    // for NS_RUNTIMEABORT
 #include "nsRegion.h"                   // for nsIntRegion
@@ -248,16 +248,6 @@
     NS_RUNTIMEABORT("should not be called");
   }
 
-  virtual void UpdateTextureIncremental(CompositableClient* aCompositable,
-                                        TextureIdentifier aTextureId,
-                                        SurfaceDescriptor& aDescriptor,
-                                        const nsIntRegion& aUpdatedRegion,
-                                        const nsIntRect& aBufferRect,
-                                        const nsIntPoint& aBufferRotation) MOZ_OVERRIDE
-  {
-    NS_RUNTIMEABORT("should not be called");
-  }
-
   /**
    * Communicate the picture rect of a YUV image in aLayer to the compositor
    */
@@ -265,12 +255,6 @@
                                  const nsIntRect& aRect) MOZ_OVERRIDE;
 
 
-  virtual void CreatedIncrementalBuffer(CompositableClient* aCompositable,
-                                        const TextureInfo& aTextureInfo,
-                                        const nsIntRect& aBufferRect) MOZ_OVERRIDE
-  {
-    NS_RUNTIMEABORT("should not be called");
-  }
   virtual void UpdateTextureRegion(CompositableClient* aCompositable,
                                    const ThebesBufferData& aThebesBufferData,
                                    const nsIntRegion& aUpdatedRegion) MOZ_OVERRIDE {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ISurfaceAllocator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ISurfaceAllocator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ISurfaceAllocator.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ISurfaceAllocator.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -297,20 +297,26 @@
   ShrinkShmemSectionHeap();
 }
 
+
 void
 ISurfaceAllocator::ShrinkShmemSectionHeap()
 {
-  for (size_t i = 0; i < mUsedShmems.size(); i++) {
+  // The loop will terminate as we either increase i, or decrease size
+  // every time through.
+  size_t i = 0;
+  while (i < mUsedShmems.size()) {
     ShmemSectionHeapHeader* header = mUsedShmems[i].get<ShmemSectionHeapHeader>();
     if (header->mAllocatedBlocks == 0) {
       DeallocShmem(mUsedShmems[i]);
 
       // We don't particularly care about order, move the last one in the array
       // to this position.
-      mUsedShmems[i] = mUsedShmems[mUsedShmems.size() - 1];
+      if (i < mUsedShmems.size() - 1) {
+        mUsedShmems[i] = mUsedShmems[mUsedShmems.size() - 1];
+      }
       mUsedShmems.pop_back();
-      i--;
-      break;
+    } else {
+      i++;
     }
   }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/LayersMessages.ipdlh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/LayersMessages.ipdlh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/LayersMessages.ipdlh	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/LayersMessages.ipdlh	2015-02-28 15:03:00.000000000 +0000
@@ -41,7 +41,6 @@
 using mozilla::layers::FrameMetrics::ViewID from "FrameMetrics.h";
 using struct mozilla::layers::FenceHandle from "mozilla/layers/FenceUtils.h";
 using struct mozilla::layers::FenceHandleFromChild from "mozilla/layers/FenceUtils.h";
-using mozilla::layers::TextureIdentifier from "mozilla/layers/CompositorTypes.h";
 using std::string from "string";
 
 namespace mozilla {
@@ -339,27 +338,12 @@
   OverlaySource overlay;
 };
 
-struct OpCreatedIncrementalTexture {
-  PCompositable compositable;
-  TextureInfo textureInfo;
-  nsIntRect bufferRect;
-};
-
 struct OpPaintTextureRegion {
   PCompositable compositable;
   ThebesBufferData bufferData;
   nsIntRegion updatedRegion;
 };
 
-struct OpPaintTextureIncremental {
-  PCompositable compositable;
-  TextureIdentifier textureId;
-  SurfaceDescriptor image;
-  nsIntRegion updatedRegion;
-  nsIntRect bufferRect;
-  nsIntPoint bufferRotation;
-};
-
 struct OpUpdatePictureRect {
   PCompositable compositable;
   nsIntRect picture;
@@ -438,10 +422,7 @@
 union CompositableOperation {
   OpUpdatePictureRect;
 
-  OpCreatedIncrementalTexture;
-
   OpPaintTextureRegion;
-  OpPaintTextureIncremental;
 
   OpUseTiledLayerBuffer;
 
@@ -487,12 +468,6 @@
   nsIntRegion frontUpdatedRegion;
 };
 
-struct OpTextureSwap {
-  PCompositable compositable;
-  TextureIdentifier textureId;
-  SurfaceDescriptor image;
-};
-
 struct ReturnReleaseFence {
   PCompositable compositable;
   PTexture texture;
@@ -503,7 +478,6 @@
 // only to be used for buffer swapping.
 union EditReply {
   OpContentBufferSwap;
-  OpTextureSwap;
 
   ReturnReleaseFence;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ShadowLayers.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ShadowLayers.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ShadowLayers.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ShadowLayers.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -353,26 +353,6 @@
 }
 
 void
-ShadowLayerForwarder::UpdateTextureIncremental(CompositableClient* aCompositable,
-                                               TextureIdentifier aTextureId,
-                                               SurfaceDescriptor& aDescriptor,
-                                               const nsIntRegion& aUpdatedRegion,
-                                               const nsIntRect& aBufferRect,
-                                               const nsIntPoint& aBufferRotation)
-{
-  CheckSurfaceDescriptor(&aDescriptor);
-  MOZ_ASSERT(aCompositable);
-  MOZ_ASSERT(aCompositable->GetIPDLActor());
-  mTxn->AddNoSwapPaint(OpPaintTextureIncremental(nullptr, aCompositable->GetIPDLActor(),
-                                                 aTextureId,
-                                                 aDescriptor,
-                                                 aUpdatedRegion,
-                                                 aBufferRect,
-                                                 aBufferRotation));
-}
-
-
-void
 ShadowLayerForwarder::UpdatePictureRect(CompositableClient* aCompositable,
                                         const nsIntRect& aRect)
 {
@@ -815,16 +795,6 @@
   aCompositable->InitIPDLActor(actor);
 }
 
-void
-ShadowLayerForwarder::CreatedIncrementalBuffer(CompositableClient* aCompositable,
-                                               const TextureInfo& aTextureInfo,
-                                               const nsIntRect& aBufferRect)
-{
-  MOZ_ASSERT(aCompositable);
-  mTxn->AddNoSwapPaint(OpCreatedIncrementalTexture(nullptr, aCompositable->GetIPDLActor(),
-                                                   aTextureInfo, aBufferRect));
-}
-
 void ShadowLayerForwarder::Attach(CompositableClient* aCompositable,
                                   ShadowableLayer* aLayer)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ShadowLayers.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ShadowLayers.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ShadowLayers.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ShadowLayers.h	2015-02-28 15:03:00.000000000 +0000
@@ -133,7 +133,6 @@
 
 class ShadowLayerForwarder : public CompositableForwarder
 {
-  friend class ContentClientIncremental;
   friend class ClientLayerManager;
 
 public:
@@ -148,10 +147,6 @@
   virtual PTextureChild* CreateTexture(const SurfaceDescriptor& aSharedData,
                                        TextureFlags aFlags) MOZ_OVERRIDE;
 
-  virtual void CreatedIncrementalBuffer(CompositableClient* aCompositable,
-                                        const TextureInfo& aTextureInfo,
-                                        const nsIntRect& aBufferRect) MOZ_OVERRIDE;
-
   /**
    * Adds an edit in the layers transaction in order to attach
    * the corresponding compositable and layer on the compositor side.
@@ -259,13 +254,6 @@
                                    const ThebesBufferData& aThebesBufferData,
                                    const nsIntRegion& aUpdatedRegion) MOZ_OVERRIDE;
 
-  virtual void UpdateTextureIncremental(CompositableClient* aCompositable,
-                                        TextureIdentifier aTextureId,
-                                        SurfaceDescriptor& aDescriptor,
-                                        const nsIntRegion& aUpdatedRegion,
-                                        const nsIntRect& aBufferRect,
-                                        const nsIntPoint& aBufferRotation) MOZ_OVERRIDE;
-
   /**
    * Communicate the picture rect of an image to the compositor
    */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -33,10 +33,11 @@
 #include "MainThreadUtils.h"
 
 using namespace android;
-using namespace base;
 using namespace mozilla::layers;
 using namespace mozilla::gl;
 
+using base::FileDescriptor;
+
 namespace IPC {
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/LayerMetricsWrapper.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/LayerMetricsWrapper.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/LayerMetricsWrapper.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/LayerMetricsWrapper.h	2015-02-28 15:03:12.000000000 +0000
@@ -309,6 +309,16 @@
     return EventRegions();
   }
 
+  bool HasTransformAnimation() const
+  {
+    MOZ_ASSERT(IsValid());
+
+    if (AtBottomLayer()) {
+      return mLayer->HasTransformAnimation();
+    }
+    return false;
+  }
+
   RefLayer* AsRefLayer() const
   {
     MOZ_ASSERT(IsValid());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/Layers.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/Layers.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/Layers.cpp	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/Layers.cpp	2015-02-28 15:03:12.000000000 +0000
@@ -762,6 +762,17 @@
   return transform;
 }
 
+bool
+Layer::HasTransformAnimation() const
+{
+  for (uint32_t i = 0; i < mAnimations.Length(); i++) {
+    if (mAnimations[i].property() == eCSSProperty_transform) {
+      return true;
+    }
+  }
+  return false;
+}
+
 void
 Layer::ApplyPendingUpdatesForThisTransaction()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/Layers.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/Layers.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/Layers.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/Layers.h	2015-02-28 15:03:12.000000000 +0000
@@ -1284,6 +1284,8 @@
   uint64_t GetAnimationGeneration() { return mAnimationGeneration; }
   void SetAnimationGeneration(uint64_t aCount) { mAnimationGeneration = aCount; }
 
+  bool HasTransformAnimation() const;
+
   /**
    * Returns the local transform for this layer: either mTransform or,
    * for shadow layers, GetShadowTransform()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/RotatedBuffer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/RotatedBuffer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/RotatedBuffer.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/RotatedBuffer.h	2015-02-28 15:03:12.000000000 +0000
@@ -272,7 +272,6 @@
 
   struct DrawIterator {
     friend class RotatedContentBuffer;
-    friend class ContentClientIncremental;
     DrawIterator()
       : mCount(0)
     {}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/TiledLayerBuffer.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/TiledLayerBuffer.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/layers/TiledLayerBuffer.h	2015-02-19 00:42:17.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/layers/TiledLayerBuffer.h	2015-02-28 15:03:12.000000000 +0000
@@ -236,6 +236,8 @@
    */
   virtual const nsIntRegion& GetValidLowPrecisionRegion() const = 0;
 
+  virtual const nsIntRegion& GetValidRegion() const = 0;
+
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
   /**
    * Store a fence that will signal when the current buffer is no longer being read.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/qcms/iccread.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/qcms/iccread.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/qcms/iccread.c	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/qcms/iccread.c	2015-02-28 15:03:00.000000000 +0000
@@ -547,14 +547,14 @@
 	}
 
 	num_in_channels = read_u8(src, offset + 8);
-	num_out_channels = read_u8(src, offset + 8);
+	num_out_channels = read_u8(src, offset + 9);
 	if (num_in_channels > MAX_CHANNELS || num_out_channels > MAX_CHANNELS)
 		return NULL;
 
 	// We require 3in/out channels since we only support RGB->XYZ (or RGB->LAB)
 	// XXX: If we remove this restriction make sure that the number of channels
 	//      is less or equal to the maximum number of mAB curves in qcmsint.h
-	//      also check for clut_size overflow.
+	//      also check for clut_size overflow. Also make sure it's != 0
 	if (num_in_channels != 3 || num_out_channels != 3)
 		return NULL;
 
@@ -584,6 +584,9 @@
 		// clut_size can not overflow since lg(256^num_in_channels) = 24 bits.
 		for (i = 0; i < num_in_channels; i++) {
 			clut_size *= read_u8(src, clut_offset + i);
+			if (clut_size == 0) {
+				invalid_source(src, "bad clut_size");
+			}
 		}
 	} else {
 		clut_size = 0;
@@ -604,6 +607,9 @@
 
 	for (i = 0; i < num_in_channels; i++) {
 		lut->num_grid_points[i] = read_u8(src, clut_offset + i);
+		if (lut->num_grid_points[i] == 0) {
+			invalid_source(src, "bad grid_points");
+		}
 	}
 
 	// Reverse the processing of transformation elements for mBA type.
@@ -686,6 +692,10 @@
 	} else if (type == LUT16_TYPE) {
 		num_input_table_entries  = read_u16(src, offset + 48);
 		num_output_table_entries = read_u16(src, offset + 50);
+		if (num_input_table_entries == 0 || num_output_table_entries == 0) {
+			invalid_source(src, "Bad channel count");
+			return NULL;
+		}
 		entry_size = 2;
 	} else {
 		assert(0); // the caller checks that this doesn't happen
@@ -699,15 +709,18 @@
 
 	clut_size = pow(grid_points, in_chan);
 	if (clut_size > MAX_CLUT_SIZE) {
+		invalid_source(src, "CLUT too large");
 		return NULL;
 	}
 
 	if (in_chan != 3 || out_chan != 3) {
+		invalid_source(src, "CLUT only supports RGB");
 		return NULL;
 	}
 
 	lut = malloc(sizeof(struct lutType) + (num_input_table_entries * in_chan + clut_size*out_chan + num_output_table_entries * out_chan)*sizeof(float));
 	if (!lut) {
+		invalid_source(src, "CLUT too large");
 		return NULL;
 	}
 
@@ -718,9 +731,9 @@
 
 	lut->num_input_table_entries  = num_input_table_entries;
 	lut->num_output_table_entries = num_output_table_entries;
-	lut->num_input_channels   = read_u8(src, offset + 8);
-	lut->num_output_channels  = read_u8(src, offset + 9);
-	lut->num_clut_grid_points = read_u8(src, offset + 10);
+	lut->num_input_channels   = in_chan;
+	lut->num_output_channels  = out_chan;
+	lut->num_clut_grid_points = grid_points;
 	lut->e00 = read_s15Fixed16Number(src, offset+12);
 	lut->e01 = read_s15Fixed16Number(src, offset+16);
 	lut->e02 = read_s15Fixed16Number(src, offset+20);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/skia/README_MOZILLA thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/skia/README_MOZILLA
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/skia/README_MOZILLA	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/skia/README_MOZILLA	2015-02-28 15:03:00.000000000 +0000
@@ -1,12 +1,9 @@
-The source from this directory was copied from the skia subversion trunk
-using the update.sh script. The changes made were those applied by update.sh,
-the addition/update of Makefile.in files for the Mozilla build system.
-
 This is an import of Skia from 2014-07-28 (b1ab5fdd11bb358d738c1bfa63737dc65174a281)
 
 To update to a new version of Skia:
 
-- Copy the entire trunk/ directory from a Skia clone to mozilla-central/gfx/skia
+- Clone Skia from upstream using the instructions here: https://sites.google.com/site/skiadocs/user-documentation/downloading
+- Copy the entire source tree from a Skia clone to mozilla-central/gfx/skia/trunk
 - cd gfx/skia && ./gyp_mozbuild
 
 Once that's done, use git status to view the files that have changed. Keep an eye on GrUserConfig.h
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/src/FilterSupport.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/src/FilterSupport.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/src/FilterSupport.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/src/FilterSupport.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Filters.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/PodOperations.h"
 
 #include "gfxContext.h"
@@ -399,8 +400,9 @@
 
     case SVG_FECOLORMATRIX_TYPE_MATRIX:
     {
-      if (aValues.Length() != 20)
+      if (aValues.Length() != 20) {
         return NS_ERROR_FAILURE;
+      }
 
       PodCopy(aOutMatrix, aValues.Elements(), 20);
       break;
@@ -1479,7 +1481,7 @@
     {
       if (atts.GetUint(eColorMatrixType) == (uint32_t)SVG_FECOLORMATRIX_TYPE_MATRIX) {
         const nsTArray<float>& values = atts.GetFloats(eColorMatrixValues);
-        if (values[19] > 0.0f) {
+        if (values.Length() == 20 && values[19] > 0.0f) {
           return ThebesIntRect(aDescription.PrimitiveSubregion());
         }
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/593526.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/593526.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/593526.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/593526.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1 @@
+<html style="max-width: 51079px; width: 730.549in; -moz-appearance: checkbox; box-shadow: 0.2em 0.2em rgb(204, 204, 204);">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/593526.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/593526.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/593526.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/593526.xul	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<box style="max-width: 51079px; width: 730.549in; -moz-appearance: checkbox; box-shadow: 0.2em 0.2em rgb(204, 204, 204);"></box>
+</window>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/944579.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/944579.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/944579.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/944579.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1 @@
+><svg><filter width=60cm height=190.339893225in id=morphology><feMorphology operator=dilate width=140 radius=10><img src=944579.png style="-moz-filter: url(#morphology); filter: url(#morphology);">
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/944579.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/944579.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/944579.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/944579.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/944579.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/944579.svg	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,26 @@
+<html><head></head><body><svg xmlns="http://www.w3.org/2000/svg" width="500">
+
+<filter>
+  <feMorphology></feMorphology>
+</filter>
+<g><rect></rect>
+</g>
+
+<filter>
+<feMorphology></feMorphology>
+</filter>
+<g>
+  <rect></rect>
+</g>
+
+<filter id="f3" primitiveUnits="objectBoundingBox">
+  <feMorphology operator="dilate" radius="32542"></feMorphology>
+</filter>
+<g filter="url(#f3)"><rect width="4294967217ex" height="100" x="29%"></rect>
+</g>
+
+<filter></filter>
+<g></g>
+
+</svg>
+</body><style>></style></html><!-- -->
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/950000.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/950000.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/950000.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/950000.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<style id="s">
+
+@font-face {
+  font-family: x;
+  src: url(bogus-font.ttf);
+}
+
+@font-face {
+  font-family: y;
+  src: url(bogus-font.ttf);
+}
+
+</style>
+
+<script>
+
+function boom()
+{
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+    ctx.font = 'normal 20px x';
+
+    document.getElementById("s").remove();
+
+    setTimeout(function() {
+       ctx.measureText("A");
+    }, 50);
+}
+
+window.addEventListener("DOMContentLoaded", boom, false)
+
+</script>
+</head>
+
+<body><div style="font-family: y;">y</div></body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/crashtests.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/crashtests.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/crashtests/crashtests.list	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/crashtests/crashtests.list	2015-02-28 15:03:00.000000000 +0000
@@ -87,6 +87,8 @@
 load 580212-1.html
 load 580233-1.html
 load 580719-1.html
+load 593526.html
+load 593526.xul
 load 594654-1.xhtml
 load 595727-1.html
 load 624198.xhtml
@@ -109,4 +111,7 @@
 load 893572-2.html
 load 893572-3.html
 load 893572-4.html
+load 944579.svg
+load 944579.html
+pref(security.fileuri.strict_origin_policy,false) load 950000.html
 load 1034403-1.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/gtest/TestRect.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/gtest/TestRect.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/tests/gtest/TestRect.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/tests/gtest/TestRect.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -400,6 +400,25 @@
   return true;
 }
 
+// We want to test nsRect values that are still in range but where
+// the implementation is at risk of overflowing
+template <class RectType>
+static bool
+TestBug1135677()
+{
+  RectType  rect1(1073741344, 1073741344, 1073756696, 1073819936);
+  RectType  rect2(1073741820, 1073741820, 14400, 77640);
+  RectType  dest;
+
+  dest = rect1.Intersect(rect2);
+
+  EXPECT_TRUE(dest.x == 1073741820 && dest.y == 1073741820 &&
+              dest.width == 14400 && dest.height == 77640) <<
+              "[1] Operation should not overflow internally.";
+
+  return true;
+}
+
 TEST(Gfx, nsRect) {
   TestConstructors<nsRect>();
   TestEqualityOperator<nsRect>();
@@ -407,6 +426,7 @@
   TestIntersects<nsRect>();
   TestIntersection<nsRect>();
   TestUnion<nsRect>();
+  TestBug1135677<nsRect>();
 }
 
 TEST(Gfx, nsIntRect) {
@@ -416,6 +436,7 @@
   TestIntersects<nsIntRect>();
   TestIntersection<nsIntRect>();
   TestUnion<nsIntRect>();
+  TestBug1135677<nsIntRect>();
 }
 
 TEST(Gfx, gfxRect) {
@@ -425,5 +446,6 @@
   TestIntersects<gfxRect>();
   TestIntersection<gfxRect>();
   TestUnion<gfxRect>();
+  TestBug1135677<gfxRect>();
   TestFiniteGfx();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxFont.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxFont.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxFont.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxFont.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -2038,14 +2038,18 @@
         GetAdjustedSize() / GetFontEntry()->UnitsPerEm();
     gfxContextMatrixAutoSaveRestore matrixRestore(aContext);
 
+    aContext->Save();
     aContext->SetMatrix(
       aContext->CurrentMatrix().Translate(aPoint.x, aPoint.y).
                                 Scale(devUnitsPerSVGUnit, devUnitsPerSVGUnit));
 
     aContextPaint->InitStrokeGeometry(aContext, devUnitsPerSVGUnit);
 
-    return GetFontEntry()->RenderSVGGlyph(aContext, aGlyphId, int(aDrawMode),
-                                          aContextPaint);
+    bool rv = GetFontEntry()->RenderSVGGlyph(aContext, aGlyphId,
+                                             int(aDrawMode), aContextPaint);
+    aContext->Restore();
+    aContext->NewPath();
+    return rv;
 }
 
 bool
@@ -2054,19 +2058,11 @@
                         gfxTextRunDrawCallbacks *aCallbacks,
                         bool& aEmittedGlyphs) const
 {
-    if (aCallbacks) {
-        if (aEmittedGlyphs) {
-            aCallbacks->NotifyGlyphPathEmitted();
-            aEmittedGlyphs = false;
-        }
-        aCallbacks->NotifyBeforeSVGGlyphPainted();
+    if (aCallbacks && aEmittedGlyphs) {
+        aCallbacks->NotifyGlyphPathEmitted();
+        aEmittedGlyphs = false;
     }
-    bool rendered = RenderSVGGlyph(aContext, aPoint, aDrawMode, aGlyphId,
-                                   aContextPaint);
-    if (aCallbacks) {
-        aCallbacks->NotifyAfterSVGGlyphPainted();
-    }
-    return rendered;
+    return RenderSVGGlyph(aContext, aPoint, aDrawMode, aGlyphId, aContextPaint);
 }
 
 bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxPlatform.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxPlatform.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxPlatform.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxPlatform.h	2015-02-28 15:03:00.000000000 +0000
@@ -159,6 +159,16 @@
   MOZ_CRASH("Incomplete switch");
 }
 
+enum class DeviceResetReason
+{
+  OK = 0,
+  HUNG,
+  REMOVED,
+  RESET,
+  DRIVER_ERROR,
+  INVALID_CALL
+};
+
 class gfxPlatform {
     friend class SRGBOverrideObserver;
 
@@ -435,7 +445,7 @@
     // check whether format is supported on a platform or not (if unclear, returns true)
     virtual bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags) { return false; }
 
-    virtual bool DidRenderingDeviceReset() { return false; }
+    virtual bool DidRenderingDeviceReset(DeviceResetReason* aResetReason = nullptr) { return false; }
 
     void GetPrefFonts(nsIAtom *aLanguage, nsString& array, bool aAppendUnicode = true);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxPrefs.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxPrefs.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxPrefs.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxPrefs.h	2015-02-28 15:03:00.000000000 +0000
@@ -312,7 +312,7 @@
   DECL_GFX_PREF(Once, "layers.d3d11.force-warp",               LayersD3D11ForceWARP, bool, false);
   DECL_GFX_PREF(Once, "layers.prefer-d3d9",                    LayersPreferD3D9, bool, false);
   DECL_GFX_PREF(Once, "layers.prefer-opengl",                  LayersPreferOpenGL, bool, false);
-  DECL_GFX_PREF(Once, "layers.progressive-paint",              ProgressivePaintDoNotUseDirectly, bool, false);
+  DECL_GFX_PREF(Live, "layers.progressive-paint",              ProgressivePaintDoNotUseDirectly, bool, false);
   DECL_GFX_PREF(Once, "layers.uniformity-info",                UniformityInfo, bool, false);
   DECL_GFX_PREF(Once, "layers.gralloc.disable",                DisableGralloc, bool, false);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxTextRun.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxTextRun.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxTextRun.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxTextRun.h	2015-02-28 15:03:00.000000000 +0000
@@ -39,10 +39,9 @@
     /**
      * Constructs a new DrawCallbacks object.
      *
-     * @param aShouldPaintSVGGlyphs If true, SVG glyphs will be
-     *   painted and the NotifyBeforeSVGGlyphPainted/NotifyAfterSVGGlyphPainted
-     *   callbacks will be invoked for each SVG glyph.  If false, SVG glyphs
-     *   will not be painted; fallback plain glyphs are not emitted either.
+     * @param aShouldPaintSVGGlyphs If true, SVG glyphs will be painted.  If
+     *   false, SVG glyphs will not be painted; fallback plain glyphs are not
+     *   emitted either.
      */
     explicit gfxTextRunDrawCallbacks(bool aShouldPaintSVGGlyphs = false)
       : mShouldPaintSVGGlyphs(aShouldPaintSVGGlyphs)
@@ -56,16 +55,6 @@
      */
     virtual void NotifyGlyphPathEmitted() = 0;
 
-    /**
-     * Called just before an SVG glyph has been painted to the gfxContext.
-     */
-    virtual void NotifyBeforeSVGGlyphPainted() { }
-
-    /**
-     * Called just after an SVG glyph has been painted to the gfxContext.
-     */
-    virtual void NotifyAfterSVGGlyphPainted() { }
-
     bool mShouldPaintSVGGlyphs;
 };
 
@@ -103,38 +92,41 @@
 
     // Public textrun API for general use
 
-    bool IsClusterStart(uint32_t aPos) {
+    bool IsClusterStart(uint32_t aPos) const {
         NS_ASSERTION(aPos < GetLength(), "aPos out of range");
         return mCharacterGlyphs[aPos].IsClusterStart();
     }
-    bool IsLigatureGroupStart(uint32_t aPos) {
+    bool IsLigatureGroupStart(uint32_t aPos) const {
         NS_ASSERTION(aPos < GetLength(), "aPos out of range");
         return mCharacterGlyphs[aPos].IsLigatureGroupStart();
     }
-    bool CanBreakLineBefore(uint32_t aPos) {
-        NS_ASSERTION(aPos < GetLength(), "aPos out of range");
-        return mCharacterGlyphs[aPos].CanBreakBefore() ==
-            CompressedGlyph::FLAG_BREAK_TYPE_NORMAL;
+    bool CanBreakLineBefore(uint32_t aPos) const {
+        return CanBreakBefore(aPos) == CompressedGlyph::FLAG_BREAK_TYPE_NORMAL;
     }
-    bool CanHyphenateBefore(uint32_t aPos) {
+    bool CanHyphenateBefore(uint32_t aPos) const {
+        return CanBreakBefore(aPos) == CompressedGlyph::FLAG_BREAK_TYPE_HYPHEN;
+    }
+
+    // Returns a gfxShapedText::CompressedGlyph::FLAG_BREAK_TYPE_* value
+    // as defined in gfxFont.h (may be NONE, NORMAL or HYPHEN).
+    uint8_t CanBreakBefore(uint32_t aPos) const {
         NS_ASSERTION(aPos < GetLength(), "aPos out of range");
-        return mCharacterGlyphs[aPos].CanBreakBefore() ==
-            CompressedGlyph::FLAG_BREAK_TYPE_HYPHEN;
+        return mCharacterGlyphs[aPos].CanBreakBefore();
     }
 
-    bool CharIsSpace(uint32_t aPos) {
+    bool CharIsSpace(uint32_t aPos) const {
         NS_ASSERTION(aPos < GetLength(), "aPos out of range");
         return mCharacterGlyphs[aPos].CharIsSpace();
     }
-    bool CharIsTab(uint32_t aPos) {
+    bool CharIsTab(uint32_t aPos) const {
         NS_ASSERTION(aPos < GetLength(), "aPos out of range");
         return mCharacterGlyphs[aPos].CharIsTab();
     }
-    bool CharIsNewline(uint32_t aPos) {
+    bool CharIsNewline(uint32_t aPos) const {
         NS_ASSERTION(aPos < GetLength(), "aPos out of range");
         return mCharacterGlyphs[aPos].CharIsNewline();
     }
-    bool CharIsLowSurrogate(uint32_t aPos) {
+    bool CharIsLowSurrogate(uint32_t aPos) const {
         NS_ASSERTION(aPos < GetLength(), "aPos out of range");
         return mCharacterGlyphs[aPos].CharIsLowSurrogate();
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxUserFontSet.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxUserFontSet.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxUserFontSet.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxUserFontSet.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -1067,6 +1067,11 @@
     NS_ASSERTION(aFontEntry->mFamilyName.Length() != 0,
                  "caching a font associated with no family yet");
 
+    // if caching is disabled, simply return
+    if (Preferences::GetBool("gfx.downloadable_fonts.disable_cache")) {
+        return;
+    }
+
     gfxUserFontData* data = aFontEntry->mUserFontData;
     if (data->mIsBuffer) {
 #ifdef DEBUG_USERFONT_CACHE
@@ -1143,7 +1148,8 @@
                                        gfxUserFontEntry* aUserFontEntry,
                                        bool aPrivate)
 {
-    if (!sUserFonts) {
+    if (!sUserFonts ||
+        Preferences::GetBool("gfx.downloadable_fonts.disable_cache")) {
         return nullptr;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxWindowsPlatform.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxWindowsPlatform.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxWindowsPlatform.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxWindowsPlatform.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/WindowsVersion.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
+#include "mozilla/Telemetry.h"
 
 #include "nsIWindowsRegKey.h"
 #include "nsIFile.h"
@@ -474,7 +475,9 @@
  * desktop.
  */
     bool didReset = false;
-    if (DidRenderingDeviceReset()) {
+    DeviceResetReason resetReason = DeviceResetReason::OK;
+    if (DidRenderingDeviceReset(&resetReason)) {
+      Telemetry::Accumulate(Telemetry::DEVICE_RESET_REASON, uint32_t(resetReason));
       mD3D11DeviceInitialized = false;
       mD3D11Device = nullptr;
       mD3D11ContentDevice = nullptr;
@@ -1140,10 +1143,35 @@
 }
 
 bool
-gfxWindowsPlatform::DidRenderingDeviceReset()
+gfxWindowsPlatform::DidRenderingDeviceReset(DeviceResetReason* aResetReason)
 {
+  if (aResetReason) {
+    *aResetReason = DeviceResetReason::OK;
+  }
+
   if (mD3D11Device) {
-    if (mD3D11Device->GetDeviceRemovedReason() != S_OK) {
+    HRESULT hr = mD3D11Device->GetDeviceRemovedReason();
+    if (hr != S_OK) {
+      if (aResetReason) {
+        switch (hr) {
+        case DXGI_ERROR_DEVICE_HUNG:
+          *aResetReason = DeviceResetReason::HUNG;
+          break;
+        case DXGI_ERROR_DEVICE_REMOVED:
+          *aResetReason = DeviceResetReason::REMOVED;
+          break;
+        case DXGI_ERROR_DEVICE_RESET:
+          *aResetReason = DeviceResetReason::RESET;
+          break;
+        case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
+          *aResetReason = DeviceResetReason::DRIVER_ERROR;
+          break;
+        case DXGI_ERROR_INVALID_CALL:
+          *aResetReason = DeviceResetReason::INVALID_CALL;
+        default:
+          MOZ_ASSERT(false);
+        }
+      }
       return true;
     }
   }
@@ -1945,13 +1973,6 @@
         mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate);
       }
 
-      virtual ~D3DVsyncDisplay()
-      {
-        MOZ_ASSERT(NS_IsMainThread());
-        DisableVsync();
-        delete mVsyncThread;
-      }
-
       virtual void EnableVsync() MOZ_OVERRIDE
       {
         MOZ_ASSERT(NS_IsMainThread());
@@ -2054,6 +2075,13 @@
       }
 
     private:
+      virtual ~D3DVsyncDisplay()
+      {
+        MOZ_ASSERT(NS_IsMainThread());
+        DisableVsync();
+        delete mVsyncThread;
+      }
+
       bool IsInVsyncThread()
       {
         return mVsyncThread->thread_id() == PlatformThread::CurrentId();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxWindowsPlatform.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxWindowsPlatform.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/gfxWindowsPlatform.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/gfxWindowsPlatform.h	2015-02-28 15:03:00.000000000 +0000
@@ -210,7 +210,7 @@
      */
     virtual bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags);
 
-    virtual bool DidRenderingDeviceReset();
+    virtual bool DidRenderingDeviceReset(DeviceResetReason* aResetReason = nullptr);
 
     // ClearType is not always enabled even when available (e.g. Windows XP)
     // if either of these prefs are enabled and apply, use ClearType rendering
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/Makefile.in	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/Makefile.in	2015-02-28 15:03:00.000000000 +0000
@@ -4,7 +4,5 @@
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES := $(filter-out -DUNICODE,$(DEFINES))
-
 DeprecatedPremultiplyTables.h: $(srcdir)/genTables.py
 	$(PYTHON) $(srcdir)/genTables.py
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/gfx/thebes/moz.build	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/gfx/thebes/moz.build	2015-02-28 15:03:00.000000000 +0000
@@ -302,3 +302,6 @@
 
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     DEFINES['OTS_DLL'] = True
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    del DEFINES['UNICODE']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/encoders/png/nsPNGEncoder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/encoders/png/nsPNGEncoder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/encoders/png/nsPNGEncoder.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/encoders/png/nsPNGEncoder.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -660,14 +660,17 @@
     uint8_t* pixelOut = &aDest[x * pixelStride];
 
     uint8_t alpha = (pixelIn & 0xff000000) >> 24;
-    if (alpha == 0) {
-      pixelOut[0] = pixelOut[1] = pixelOut[2] = pixelOut[3] = 0;
+    pixelOut[pixelStride - 1] = alpha; // overwritten below if pixelStride == 3
+    if (alpha == 255) {
+      pixelOut[0] = (pixelIn & 0xff0000) >> 16;
+      pixelOut[1] = (pixelIn & 0x00ff00) >>  8;
+      pixelOut[2] = (pixelIn & 0x0000ff)      ;
+    } else if (alpha == 0) {
+      pixelOut[0] = pixelOut[1] = pixelOut[2] = 0;
     } else {
       pixelOut[0] = (((pixelIn & 0xff0000) >> 16) * 255 + alpha / 2) / alpha;
       pixelOut[1] = (((pixelIn & 0x00ff00) >>  8) * 255 + alpha / 2) / alpha;
-      pixelOut[2] = (((pixelIn & 0x0000ff) >>  0) * 255 + alpha / 2) / alpha;
-      if (aUseTransparency)
-        pixelOut[3] = alpha;
+      pixelOut[2] = (((pixelIn & 0x0000ff)      ) * 255 + alpha / 2) / alpha;
     }
   }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/src/SVGDocumentWrapper.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/src/SVGDocumentWrapper.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/src/SVGDocumentWrapper.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/src/SVGDocumentWrapper.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -320,7 +320,8 @@
   nsCOMPtr<nsIStreamListener> listener;
   rv = docLoaderFactory->CreateInstance("external-resource", chan,
                                         newLoadGroup,
-                                        IMAGE_SVG_XML, nullptr, nullptr,
+                                        NS_LITERAL_CSTRING(IMAGE_SVG_XML),
+                                        nullptr, nullptr,
                                         getter_AddRefs(listener),
                                         getter_AddRefs(viewer));
   NS_ENSURE_SUCCESS(rv, rv);
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/crashtests/944353.jpg and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/crashtests/944353.jpg differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/crashtests/crashtests.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/crashtests/crashtests.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/crashtests/crashtests.list	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/crashtests/crashtests.list	2015-02-28 15:03:01.000000000 +0000
@@ -45,3 +45,5 @@
 # Bug 856615
 # Asserts in the debug build
 load 856616.gif
+
+load 944353.jpg
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/crashtests/ownerdiscard.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/crashtests/ownerdiscard.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/crashtests/ownerdiscard.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/crashtests/ownerdiscard.html	2015-02-28 15:03:01.000000000 +0000
@@ -30,23 +30,20 @@
     var imgLoadingContent =
       SpecialPowers.wrap(img).QueryInterface(Ci.nsIImageLoadingContent);
     imgLoadingContent.addObserver(gObserver);
-
-    SpecialPowers.setBoolPref('min_discard_timeout_ms', 1);
-
     function initCF() {
       setTimeout(function() { document.adoptNode(tCF0); }, 0);
     }
     document.addEventListener("DOMContentLoaded", initCF, false);
 
     function cleanupAndFinish() {
-      SpecialPowers.clearUserPref('min_discard_timeout_ms');
       imgLoadingContent.removeObserver(gObserver);
       setTimeout("document.documentElement.className = '';", 0);
     }
     function loadhandler() {
       setTimeout("cleanupAndFinish();", 30000);
     }
-    window.addEventListener("load", loadhandler, false);
+    window.addEventListener("load", function() {
+      SpecialPowers.pushPrefEnv({"set":[["min_discard_timeout_ms", 1]]}, loadhandler)}, false);
   </script>
 </body>
 </html>
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/mochitest/bug1132427.gif and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/mochitest/bug1132427.gif differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/mochitest/bug1132427.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/mochitest/bug1132427.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/mochitest/bug1132427.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/mochitest/bug1132427.html	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,6 @@
+<html>
+<body onload="opener.doTest();">
+  <img id="left" style="width: 201px; height: 201px;" src="bug1132427.gif">
+  <img id="right" src="bug1132427.gif">
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/mochitest/chrome.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/mochitest/chrome.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/mochitest/chrome.ini	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/mochitest/chrome.ini	2015-02-28 15:03:01.000000000 +0000
@@ -28,6 +28,8 @@
   rillybad.jpg
   transparent.gif
   transparent.png
+  bug1132427.html
+  bug1132427.gif
 
 [test_animSVGImage.html]
 [test_animSVGImage2.html]
@@ -50,3 +52,4 @@
 [test_undisplayed_iframe.html]
 disabled = bug 1060869
 [test_xultree_animation.xhtml]
+[test_bug1132427.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/mochitest/test_bug1132427.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/mochitest/test_bug1132427.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/image/test/mochitest/test_bug1132427.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/image/test/mochitest/test_bug1132427.html	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for scrolling selection into view</title>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.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">
+
+// We open a window which contains two copies of the same gif. One at a scaled size, one at the
+// natural image size. We rely on the bug only showing up in the scaled image. The gif has three
+// frames and a delay of 100ms. The first is all white. The second has a very small update area
+// in the upper left, it changes the pixels to slightly off white. The third changes all the
+// pixels to blue. When the bug appears we only update the upper left pixels when looping around
+// from the last frame to the first frame. We compare a middle pixel of the two images to make
+// sure that they are the same at 100ms for a second. If the bug appears then the middle pixel
+// on the scaled image will always be blue and so should not match the middle pixel on the
+// unscaled image which should be white two thirds of the time. If the timers fire at bad times
+// and only fire when both frames are displaying blue we won't be able to detect this bug and the
+// test will pass without testing anything important, but that's not a big deal. That should be
+// rare enough, and the next time the test is run will should do proper testing.
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(openWindow);
+
+var win = null;
+
+function openWindow() {
+  win = window.open("bug1132427.html",
+                "", "scrollbars=yes,toolbar,menubar,width=600,height=800");
+  win.addEventListener("load", doTest, false);
+  win.focus();
+}
+
+function doTest() {
+  setTimeout(continueTest, 1000);
+}
+
+function checkPixel(canvas, context, x1, y1, x2, y2) {
+  var pix = context.getImageData(0, 0, canvas.width, canvas.height).data;
+  for (var i = 0; i < 4; i++) {
+    is(pix[4 * (y1 * canvas.width + x1) + i], pix[4 * (y2 * canvas.width + x2) + i], "pixels should match");
+  }
+}
+
+var iterationsLeft = 10;
+
+function continueTest() {
+  // we need to drawWindow the chrome window so we can get a dump of the retained widget layers
+  // if we have to repaint to fulfill this drawWindow request then it will be impossible to
+  // observe the bug
+  var chromewin = win.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                     .getInterface(Components.interfaces.nsIWebNavigation)
+                     .QueryInterface(Components.interfaces.nsIDocShellTreeItem)
+                     .rootTreeItem
+                     .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                     .getInterface(Components.interfaces.nsIDOMWindow);
+
+  var el = window.document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
+  el.width = chromewin.innerWidth;
+  el.height = chromewin.innerHeight;
+  var ctx = el.getContext("2d");
+  // pass the correct flags so we don't have to flush the retained layers
+  ctx.drawWindow(chromewin, 0, 0, chromewin.innerWidth, chromewin.innerHeight, "rgba(0,0,0,0)",
+    ctx.DRAWWINDOW_USE_WIDGET_LAYERS | ctx.DRAWWINDOW_DRAW_VIEW | ctx.DRAWWINDOW_DRAW_CARET);
+
+  var leftbox = win.document.getElementById("left").getBoundingClientRect();
+  var rightbox = win.document.getElementById("right").getBoundingClientRect();
+  // this is actually chrome on left and right, but in practice we have none so it doesn't matter
+  var chromeleft = win.outerWidth - win.innerWidth;
+  // this is actually chrome on top and bottom, but bottom chrome is usually small to none and we have
+  // 100px to spare in hitting the middle of the image elements (they are 200x200)
+  var chrometop = win.outerHeight - win.innerHeight;
+
+  // compare the middle of the two image elements
+  checkPixel(el, ctx, chromeleft + leftbox.left + Math.floor(leftbox.width/2), chrometop + leftbox.top + Math.floor(leftbox.height/2),
+                      chromeleft + rightbox.left + Math.floor(rightbox.width/2), chrometop + rightbox.top + Math.floor(rightbox.height/2));
+
+  iterationsLeft--;
+  if (iterationsLeft > 0) {
+    // now test 100ms later, we should have the next frame of the gif then
+    setTimeout(continueTest, 100);
+  } else {
+    win.close();
+    SimpleTest.finish();
+  }
+}
+</script>
+</pre>
+</body>
+
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/hyphenation/nsHyphenator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/hyphenation/nsHyphenator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/hyphenation/nsHyphenator.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/hyphenation/nsHyphenator.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -80,9 +80,47 @@
     }
 
     if (inWord) {
-      const char16_t *begin = aString.BeginReading();
-      NS_ConvertUTF16toUTF8 utf8(begin + wordStart,
-                                 wordLimit - wordStart);
+      // Convert the word to utf-8 for libhyphen, lowercasing it as we go
+      // so that it will match the (lowercased) patterns (bug 1105644).
+      nsAutoCString utf8;
+      const char16_t* const begin = aString.BeginReading();
+      const char16_t *cur = begin + wordStart;
+      const char16_t *end = begin + wordLimit;
+      while (cur < end) {
+        uint32_t ch = *cur++;
+
+        if (NS_IS_HIGH_SURROGATE(ch)) {
+          if (cur < end && NS_IS_LOW_SURROGATE(*cur)) {
+            ch = SURROGATE_TO_UCS4(ch, *cur++);
+          } else {
+            ch = 0xfffd; // unpaired surrogate, treat as REPLACEMENT CHAR
+          }
+        } else if (NS_IS_LOW_SURROGATE(ch)) {
+          ch = 0xfffd; // unpaired surrogate
+        }
+
+        // XXX What about language-specific casing? Consider Turkish I/i...
+        // In practice, it looks like the current patterns will not be
+        // affected by this, as they treat dotted and undotted i similarly.
+        ch = ToLowerCase(ch);
+
+        if (ch < 0x80) { // U+0000 - U+007F
+          utf8.Append(ch);
+        } else if (ch < 0x0800) { // U+0100 - U+07FF
+          utf8.Append(0xC0 | (ch >> 6));
+          utf8.Append(0x80 | (0x003F & ch));
+        } else if (ch < 0x10000) { // U+0800 - U+D7FF,U+E000 - U+FFFF
+          utf8.Append(0xE0 | (ch >> 12));
+          utf8.Append(0x80 | (0x003F & (ch >> 6)));
+          utf8.Append(0x80 | (0x003F & ch));
+        } else {
+          utf8.Append(0xF0 | (ch >> 18));
+          utf8.Append(0x80 | (0x003F & (ch >> 12)));
+          utf8.Append(0x80 | (0x003F & (ch >> 6)));
+          utf8.Append(0x80 | (0x003F & ch));
+        }
+      }
+
       nsAutoTArray<char,200> utf8hyphens;
       utf8hyphens.SetLength(utf8.Length() + 5);
       char **rep = nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/Makefile.in	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +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
-
-PROPS2ARRAYS = $(topsrcdir)/intl/locale/props2arrays.py
-langGroups.properties.h: $(PROPS2ARRAYS) langGroups.properties
-	$(PYTHON) $^ $@
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/moz.build	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/moz.build	2015-02-28 15:03:02.000000000 +0000
@@ -64,6 +64,9 @@
 GENERATED_FILES += [
     'langGroups.properties.h',
 ]
+langgroups = GENERATED_FILES['langGroups.properties.h']
+langgroups.script = 'props2arrays.py'
+langgroups.inputs = ['langGroups.properties']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/props2arrays.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/props2arrays.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/props2arrays.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/props2arrays.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,36 +4,24 @@
 
 import sys
 
-mappings = {}
-  
-propFile = open(sys.argv[1], "r");
-  
-for line in propFile:
-  line = line.strip()
-  if not line.startswith('#'):
-    parts = line.split("=", 1)
-    if len(parts) == 2 and len(parts[0]) > 0:
-      mappings[parts[0].strip()] = parts[1].strip()
- 
-propFile.close()
+def main(header, propFile):
+  mappings = {}
 
-keys = mappings.keys()
-keys.sort()
+  with open(propFile, 'r') as f:
+    for line in f:
+      line = line.strip()
+      if not line.startswith('#'):
+        parts = line.split("=", 1)
+        if len(parts) == 2 and len(parts[0]) > 0:
+          mappings[parts[0].strip()] = parts[1].strip()
+ 
+  keys = mappings.keys()
+  keys.sort()
 
-hFile = open(sys.argv[2], "w");
+  header.write("// This is a generated file. Please do not edit.\n")
+  header.write("// Please edit the corresponding .properties file instead.\n")
 
-hFile.write("// This is a generated file. Please do not edit.\n")
-hFile.write("// Please edit the corresponding .properties file instead.\n")
-
-first = 1
-for key in keys:
-  if first:
-    first = 0
-  else:
-    hFile.write(',\n')
-  hFile.write('{ "%s", "%s", (const char*)NS_INT32_TO_PTR(%d) }' 
-              % (key, mappings[key], len(mappings[key])));
-hFile.write('\n')
-hFile.flush()
-hFile.close()
+  entries = ['{ "%s", "%s", (const char*)NS_INT32_TO_PTR(%d) }'
+             % (key, mappings[key], len(mappings[key])) for key in keys]
+  header.write(',\n'.join(entries) + '\n')
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/unix/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/unix/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/unix/Makefile.in	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/unix/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +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
-
-unixcharset.properties.h: $(srcdir)/../props2arrays.py unixcharset.properties
-	$(PYTHON) $^ $@
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/unix/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/unix/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/unix/moz.build	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/unix/moz.build	2015-02-28 15:03:02.000000000 +0000
@@ -24,6 +24,10 @@
 GENERATED_FILES = [
     'unixcharset.properties.h',
 ]
+unixcharset = GENERATED_FILES['unixcharset.properties.h']
+unixcharset.script = '../props2arrays.py'
+unixcharset.inputs = ['unixcharset.properties']
+
 LOCAL_INCLUDES += [
     '..',
 ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/windows/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/windows/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/windows/Makefile.in	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/windows/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +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
-
-wincharset.properties.h: $(srcdir)/../props2arrays.py wincharset.properties
-	$(PYTHON) $^ $@
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/windows/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/windows/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/intl/locale/windows/moz.build	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/intl/locale/windows/moz.build	2015-02-28 15:03:02.000000000 +0000
@@ -16,6 +16,10 @@
 GENERATED_FILES = [
     'wincharset.properties.h',
 ]
+wincharset = GENERATED_FILES['wincharset.properties.h']
+wincharset.script = '../props2arrays.py'
+wincharset.inputs = ['wincharset.properties']
+
 LOCAL_INCLUDES += [
     '..',
 ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/base/file_descriptor_shuffle.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/base/file_descriptor_shuffle.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/base/file_descriptor_shuffle.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/base/file_descriptor_shuffle.h	2015-02-28 15:03:03.000000000 +0000
@@ -5,6 +5,8 @@
 #ifndef BASE_FILE_DESCRIPTOR_SHUFFLE_H_
 #define BASE_FILE_DESCRIPTOR_SHUFFLE_H_
 
+#include "mozilla/Attributes.h"
+
 // This code exists to perform the shuffling of file descriptors which is
 // commonly needed when forking subprocesses. The naive approve is very simple,
 // just call dup2 to setup the desired descriptors, but wrong. It's tough to
@@ -42,9 +44,9 @@
 // An implementation of the InjectionDelegate interface using the file
 // descriptor table of the current process as the domain.
 class FileDescriptorTableInjection : public InjectionDelegate {
-  bool Duplicate(int* result, int fd);
-  bool Move(int src, int dest);
-  void Close(int fd);
+  virtual bool Duplicate(int* result, int fd) MOZ_OVERRIDE;
+  virtual bool Move(int src, int dest) MOZ_OVERRIDE;
+  virtual void Close(int fd) MOZ_OVERRIDE;
 };
 
 // A single arc of the directed graph which describes an injective multimapping.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/base/message_loop.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/base/message_loop.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/base/message_loop.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/base/message_loop.h	2015-02-28 15:03:03.000000000 +0000
@@ -176,7 +176,7 @@
   // arbitrary MessageLoop to Quit.
   class QuitTask : public Task {
    public:
-    virtual void Run() {
+    virtual void Run() MOZ_OVERRIDE {
       MessageLoop::current()->Quit();
     }
   };
@@ -396,9 +396,9 @@
                        int delay_ms, bool nestable);
 
   // base::MessagePump::Delegate methods:
-  virtual bool DoWork();
-  virtual bool DoDelayedWork(base::TimeTicks* next_delayed_work_time);
-  virtual bool DoIdleWork();
+  virtual bool DoWork() MOZ_OVERRIDE;
+  virtual bool DoDelayedWork(base::TimeTicks* next_delayed_work_time) MOZ_OVERRIDE;
+  virtual bool DoIdleWork() MOZ_OVERRIDE;
 
   Type type_;
   int32_t id_;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/base/message_pump_libevent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/base/message_pump_libevent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/base/message_pump_libevent.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/base/message_pump_libevent.h	2015-02-28 15:03:03.000000000 +0000
@@ -133,10 +133,10 @@
 
 
   // MessagePump methods:
-  virtual void Run(Delegate* delegate);
-  virtual void Quit();
-  virtual void ScheduleWork();
-  virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time);
+  virtual void Run(Delegate* delegate) MOZ_OVERRIDE;
+  virtual void Quit() MOZ_OVERRIDE;
+  virtual void ScheduleWork() MOZ_OVERRIDE;
+  virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time) MOZ_OVERRIDE;
 
  protected:
 
@@ -204,9 +204,9 @@
    */
   virtual void OnError() {}
   virtual void OnLineRead(int aFd, nsDependentCSubstring& aMessage) = 0;
-  virtual void OnFileCanWriteWithoutBlocking(int /* aFd */) {}
+  virtual void OnFileCanWriteWithoutBlocking(int /* aFd */) MOZ_OVERRIDE {}
 private:
-  virtual void OnFileCanReadWithoutBlocking(int aFd) MOZ_FINAL;
+  virtual void OnFileCanReadWithoutBlocking(int aFd) MOZ_FINAL MOZ_OVERRIDE;
 
   nsAutoPtr<char> mReceiveBuffer;
   int mReceivedIndex;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/chromium/src/chrome/common/ipc_channel.h	2015-02-28 15:03:03.000000000 +0000
@@ -98,7 +98,7 @@
   //
   // If you Send() a message on a Close()'d channel, we delete the message
   // immediately.
-  virtual bool Send(Message* message);
+  virtual bool Send(Message* message) MOZ_OVERRIDE;
 
   // Unsound_IsClosed() and Unsound_NumQueuedMessages() are safe to call from
   // any thread, but the value returned may be out of date, because we don't
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/CrossProcessMutex_windows.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/CrossProcessMutex_windows.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/CrossProcessMutex_windows.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/CrossProcessMutex_windows.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -10,7 +10,8 @@
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
 
-using namespace base;
+using base::GetCurrentProcessHandle;
+using base::ProcessHandle;
 
 namespace mozilla {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/MessageChannel.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/MessageChannel.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/MessageChannel.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/MessageChannel.h	2015-02-28 15:03:03.000000000 +0000
@@ -451,7 +451,7 @@
         explicit DequeueTask(RefCountedTask* aTask)
           : mTask(aTask)
         { }
-        void Run() { mTask->Run(); }
+        void Run() MOZ_OVERRIDE { mTask->Run(); }
 
       private:
         nsRefPtr<RefCountedTask> mTask;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/ProcessUtils_linux.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/ProcessUtils_linux.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/ProcessUtils_linux.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/ProcessUtils_linux.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -92,9 +92,17 @@
  * NOTE: The server process serves at most one load() request.
  */
 
-using namespace base;
 using namespace mozilla::dom;
 
+using base::ChildPrivileges;
+using base::InjectionArc;
+using base::InjectiveMultimap;
+using base::ProcessHandle;
+using base::ProcessId;
+using base::SetCurrentProcessPrivileges;
+using base::ShuffleFileDescriptors;
+using base::file_handle_mapping_vector;
+
 static bool sProcLoaderClientOnDeinit = false;
 static DebugOnly<bool> sProcLoaderClientInitialized = false;
 static DebugOnly<bool> sProcLoaderClientGeckoInitialized = false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/ProtocolUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/ProtocolUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/ProtocolUtils.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/ProtocolUtils.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -11,9 +11,13 @@
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/ipc/Transport.h"
 
-using namespace base;
 using namespace IPC;
 
+using base::GetCurrentProcessHandle;
+using base::GetProcId;
+using base::ProcessHandle;
+using base::ProcessId;
+
 namespace mozilla {
 namespace ipc {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/Transport_posix.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/Transport_posix.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/Transport_posix.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/Transport_posix.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -14,9 +14,10 @@
 #include "mozilla/ipc/Transport.h"
 #include "mozilla/ipc/FileDescriptor.h"
 
-using namespace base;
 using namespace std;
 
+using base::ProcessHandle;
+
 namespace mozilla {
 namespace ipc {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/Transport_win.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/Transport_win.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/Transport_win.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/Transport_win.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -10,9 +10,10 @@
 
 #include "mozilla/ipc/Transport.h"
 
-using namespace base;
 using namespace std;
 
+using base::ProcessHandle;
+
 namespace mozilla {
 namespace ipc {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/URIParams.ipdlh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/URIParams.ipdlh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/URIParams.ipdlh	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/URIParams.ipdlh	2015-02-28 15:03:03.000000000 +0000
@@ -64,12 +64,18 @@
   int32_t iconState;
 };
 
+struct NullPrincipalURIParams
+{
+  // Purposefully empty. Null principal URIs do not round-trip.
+};
+
 union URIParams
 {
   SimpleURIParams;
   StandardURLParams;
   JARURIParams;
   IconURIParams;
+  NullPrincipalURIParams;
 };
 
 union OptionalURIParams
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/URIUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/URIUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/glue/URIUtils.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/glue/URIUtils.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsID.h"
 #include "nsJARURI.h"
 #include "nsIIconURI.h"
+#include "nsNullPrincipalURI.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsThreadUtils.h"
@@ -41,7 +42,7 @@
 
   nsCOMPtr<nsIIPCSerializableURI> serializable = do_QueryInterface(aURI);
   if (!serializable) {
-    MOZ_CRASH("All IPDL URIs must be serializable scheme!");
+    MOZ_CRASH("All IPDL URIs must be serializable!");
   }
 
   serializable->Serialize(aParams);
@@ -90,6 +91,10 @@
       serializable = do_CreateInstance(kIconURICID);
       break;
 
+    case URIParams::TNullPrincipalURIParams:
+      serializable = new nsNullPrincipalURI();
+      break;
+
     default:
       MOZ_CRASH("Unknown params!");
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/ipdl/test/cxx/IPDLUnitTests.template.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/ipdl/test/cxx/IPDLUnitTests.template.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/ipdl/test/cxx/IPDLUnitTests.template.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/ipdl/test/cxx/IPDLUnitTests.template.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -20,9 +20,10 @@
 ${INCLUDES}
 //-----------------------------------------------------------------------------
 
-using namespace base;
 using namespace std;
 
+using base::Thread;
+
 namespace mozilla {
 namespace _ipdltest {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/ipdl/test/cxx/TestOpens.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/ipdl/test/cxx/TestOpens.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/ipc/ipdl/test/cxx/TestOpens.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/ipc/ipdl/test/cxx/TestOpens.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -18,9 +18,11 @@
     static void ReleaseCallee(mozilla::_ipdltest2::TestOpensOpenedChild* obj) { }
 };
 
-using namespace base;
 using namespace mozilla::ipc;
 
+using base::ProcessHandle;
+using base::Thread;
+
 namespace mozilla {
 // NB: this is generally bad style, but I am lazy.
 using namespace _ipdltest;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/ipc/JavaScriptLogging.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/ipc/JavaScriptLogging.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/ipc/JavaScriptLogging.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/ipc/JavaScriptLogging.h	2015-02-28 15:03:03.000000000 +0000
@@ -106,7 +106,7 @@
             obj = shared->objects_.find(id);
             if (obj) {
                 JSAutoCompartment ac(cx, obj);
-                objDesc = js_ObjectClassName(cx, obj);
+                objDesc = js::ObjectClassName(cx, obj);
             } else {
                 objDesc = "<dead object>";
             }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/ipc/WrapperAnswer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/ipc/WrapperAnswer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/ipc/WrapperAnswer.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/ipc/WrapperAnswer.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -180,7 +180,7 @@
         return fail(cx, rs);
 
     bool ignored;
-    if (!js_DefineOwnProperty(cx, obj, id, desc, &ignored))
+    if (!js::DefineOwnProperty(cx, obj, id, desc, &ignored))
         return fail(cx, rs);
 
     return ok(rs);
@@ -513,7 +513,7 @@
 
     LOG("%s.objectClassIs()", ReceiverObj(objId));
 
-    *result = js_ObjectClassIs(cx, obj, (js::ESClassValue)classValue);
+    *result = js::ObjectClassIs(cx, obj, (js::ESClassValue)classValue);
     return true;
 }
 
@@ -533,7 +533,7 @@
 
     LOG("%s.className()", ReceiverObj(objId));
 
-    *name = NS_ConvertASCIItoUTF16(js_ObjectClassName(cx, obj));
+    *name = NS_ConvertASCIItoUTF16(js::ObjectClassName(cx, obj));
     return true;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/ipc/WrapperOwner.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/ipc/WrapperOwner.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/ipc/WrapperOwner.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/ipc/WrapperOwner.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -1020,7 +1020,6 @@
                              &CPOWProxyHandler::singleton,
                              v,
                              nullptr,
-                             junkScope,
                              options);
         if (!obj)
             return nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/GCAPI.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/GCAPI.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/GCAPI.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/GCAPI.h	2015-02-28 15:03:03.000000000 +0000
@@ -99,7 +99,8 @@
     D(REFRESH_FRAME)                            \
     D(FULL_GC_TIMER)                            \
     D(SHUTDOWN_CC)                              \
-    D(FINISH_LARGE_EVALUATE)
+    D(FINISH_LARGE_EVALUATE)                    \
+    D(USER_INACTIVE)
 
 namespace gcreason {
 
@@ -263,9 +264,10 @@
 
 struct JS_PUBLIC_API(GCDescription) {
     bool isCompartment_;
+    JSGCInvocationKind invocationKind_;
 
-    explicit GCDescription(bool isCompartment)
-      : isCompartment_(isCompartment) {}
+    GCDescription(bool isCompartment, JSGCInvocationKind kind)
+      : isCompartment_(isCompartment), invocationKind_(kind) {}
 
     char16_t *formatMessage(JSRuntime *rt) const;
     char16_t *formatJSON(JSRuntime *rt, uint64_t timestamp) const;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/HashTable.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/HashTable.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/HashTable.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/HashTable.h	2015-02-28 15:03:03.000000000 +0000
@@ -732,7 +732,6 @@
     void removeLive()      { MOZ_ASSERT(isLive()); keyHash = sRemovedKey; mem.addr()->~T(); }
     bool isLive() const    { return isLiveHash(keyHash); }
     void setCollision()               { MOZ_ASSERT(isLive()); keyHash |= sCollisionBit; }
-    void setCollision(HashNumber bit) { MOZ_ASSERT(isLive()); keyHash |= bit; }
     void unsetCollision()             { keyHash &= ~sCollisionBit; }
     bool hasCollision() const         { return keyHash & sCollisionBit; }
     bool matchHash(HashNumber hn)     { return (keyHash & ~sCollisionBit) == hn; }
@@ -1014,18 +1013,20 @@
     void operator=(const HashTable &) = delete;
 
   private:
-    static const size_t CAP_BITS = 24;
+    static const size_t CAP_BITS = 30;
 
   public:
     Entry       *table;                 // entry storage
-    uint32_t    gen;                    // entry storage generation number
-    uint32_t    entryCount;             // number of entries in table
-    uint32_t    removedCount:CAP_BITS;  // removed entry sentinels in table
+    uint32_t    gen:24;                 // entry storage generation number
     uint32_t    hashShift:8;            // multiplicative hash shift
+    uint32_t    entryCount;             // number of entries in table
+    uint32_t    removedCount;           // removed entry sentinels in table
 
 #ifdef JS_DEBUG
     uint64_t     mutationCount;
     mutable bool mEntered;
+    // Note that some updates to these stats are not thread-safe. See the
+    // comment on the three-argument overloading of HashTable::lookup().
     mutable struct Stats
     {
         uint32_t        searches;       // total number of table searches
@@ -1087,8 +1088,6 @@
     {
         static_assert(sFreeKey == 0,
                       "newly-calloc'd tables have to be considered empty");
-        static_assert(sMaxCapacity <= SIZE_MAX / sizeof(Entry),
-                      "would overflow allocating max number of entries");
         return alloc.template pod_calloc<Entry>(capacity);
     }
 
@@ -1104,9 +1103,9 @@
       : AllocPolicy(ap)
       , table(nullptr)
       , gen(0)
+      , hashShift(sHashBits)
       , entryCount(0)
       , removedCount(0)
-      , hashShift(sHashBits)
 #ifdef JS_DEBUG
       , mutationCount(0)
       , mEntered(false)
@@ -1223,6 +1222,11 @@
         return HashPolicy::match(HashPolicy::getKey(e.get()), l);
     }
 
+    // Warning: in order for readonlyThreadsafeLookup() to be safe this
+    // function must not modify the table in any way when |collisionBit| is 0.
+    // (The use of the METER() macro to increment stats violates this
+    // restriction but we will live with that for now because it's enabled so
+    // rarely.)
     Entry &lookup(const Lookup &l, HashNumber keyHash, unsigned collisionBit) const
     {
         MOZ_ASSERT(isLiveHash(keyHash));
@@ -1253,12 +1257,13 @@
         // Save the first removed entry pointer so we can recycle later.
         Entry *firstRemoved = nullptr;
 
-        while(true) {
+        while (true) {
             if (MOZ_UNLIKELY(entry->isRemoved())) {
                 if (!firstRemoved)
                     firstRemoved = entry;
             } else {
-                entry->setCollision(collisionBit);
+                if (collisionBit == sCollisionBit)
+                    entry->setCollision();
             }
 
             METER(stats.steps++);
@@ -1304,7 +1309,7 @@
         // Collision: double hash.
         DoubleHash dh = hash2(keyHash);
 
-        while(true) {
+        while (true) {
             MOZ_ASSERT(!entry->isRemoved());
             entry->setCollision();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/MemoryMetrics.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/MemoryMetrics.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/MemoryMetrics.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/MemoryMetrics.h	2015-02-28 15:03:03.000000000 +0000
@@ -435,12 +435,66 @@
 #undef FOR_EACH_SIZE
 };
 
+struct GCThingSizes
+{
+#define FOR_EACH_SIZE(macro) \
+    macro(_, _, object) \
+    macro(_, _, script) \
+    macro(_, _, lazyScript) \
+    macro(_, _, shape) \
+    macro(_, _, baseShape) \
+    macro(_, _, objectGroup) \
+    macro(_, _, string) \
+    macro(_, _, symbol) \
+    macro(_, _, jitcode) \
+
+    GCThingSizes()
+      : FOR_EACH_SIZE(ZERO_SIZE)
+        dummy()
+    {}
+
+    GCThingSizes(GCThingSizes &&other)
+      : FOR_EACH_SIZE(COPY_OTHER_SIZE)
+        dummy()
+    {}
+
+    void addToKind(JSGCTraceKind kind, intptr_t n) {
+        switch (kind) {
+          case JSTRACE_OBJECT:       object += n;      break;
+          case JSTRACE_STRING:       string += n;      break;
+          case JSTRACE_SYMBOL:       symbol += n;      break;
+          case JSTRACE_SCRIPT:       script += n;      break;
+          case JSTRACE_SHAPE:        shape += n;       break;
+          case JSTRACE_BASE_SHAPE:   baseShape += n;   break;
+          case JSTRACE_JITCODE:      jitcode += n;     break;
+          case JSTRACE_LAZY_SCRIPT:  lazyScript += n;  break;
+          case JSTRACE_OBJECT_GROUP: objectGroup += n; break;
+          default:
+            MOZ_CRASH("Bad trace kind for GCThingSizes");
+        }
+    }
+
+    void addSizes(const GCThingSizes &other) {
+        FOR_EACH_SIZE(ADD_OTHER_SIZE)
+    }
+
+    size_t totalSize() const {
+        size_t n = 0;
+        FOR_EACH_SIZE(ADD_SIZE_TO_N)
+        return n;
+    }
+
+    FOR_EACH_SIZE(DECL_SIZE)
+    int dummy;  // present just to absorb the trailing comma from FOR_EACH_SIZE(ZERO_SIZE)
+
+#undef FOR_EACH_SIZE
+};
+
 struct ZoneStats
 {
 #define FOR_EACH_SIZE(macro) \
     macro(Other,   IsLiveGCThing,  symbolsGCHeap) \
     macro(Other,   NotLiveGCThing, gcHeapArenaAdmin) \
-    macro(Other,   NotLiveGCThing, unusedGCThings) \
     macro(Other,   IsLiveGCThing,  lazyScriptsGCHeap) \
     macro(Other,   NotLiveGCThing, lazyScriptsMallocHeap) \
     macro(Other,   IsLiveGCThing,  jitCodesGCHeap) \
@@ -451,6 +505,7 @@
 
     ZoneStats()
       : FOR_EACH_SIZE(ZERO_SIZE)
+        unusedGCThings(),
         stringInfo(),
         extra(),
         allStrings(nullptr),
@@ -460,6 +515,7 @@
 
     ZoneStats(ZoneStats &&other)
       : FOR_EACH_SIZE(COPY_OTHER_SIZE)
+        unusedGCThings(mozilla::Move(other.unusedGCThings)),
         stringInfo(mozilla::Move(other.stringInfo)),
         extra(other.extra),
         allStrings(other.allStrings),
@@ -482,6 +538,7 @@
     void addSizes(const ZoneStats &other) {
         MOZ_ASSERT(isTotals);
         FOR_EACH_SIZE(ADD_OTHER_SIZE)
+        unusedGCThings.addSizes(other.unusedGCThings);
         stringInfo.add(other.stringInfo);
     }
 
@@ -496,6 +553,7 @@
     void addToTabSizes(JS::TabSizes *sizes) const {
         MOZ_ASSERT(isTotals);
         FOR_EACH_SIZE(ADD_TO_TAB_SIZES)
+        sizes->add(JS::TabSizes::Other, unusedGCThings.totalSize());
         stringInfo.addToTabSizes(sizes);
     }
 
@@ -504,6 +562,7 @@
     // measurements of the notable script sources and move them into
     // |notableStrings|.
     FOR_EACH_SIZE(DECL_SIZE)
+    GCThingSizes unusedGCThings;
     StringInfo stringInfo;
     void *extra;    // This field can be used by embedders.
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/ProfilingFrameIterator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/ProfilingFrameIterator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/ProfilingFrameIterator.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/ProfilingFrameIterator.h	2015-02-28 15:03:03.000000000 +0000
@@ -34,6 +34,7 @@
 class JS_PUBLIC_API(ProfilingFrameIterator)
 {
     JSRuntime *rt_;
+    uint32_t sampleBufferGen_;
     js::Activation *activation_;
 
     // When moving past a JitActivation, we need to save the prevJitTop
@@ -68,6 +69,10 @@
 
     void settle();
 
+    bool hasSampleBufferGen() const {
+        return sampleBufferGen_ != UINT32_MAX;
+    }
+
   public:
     struct RegisterState
     {
@@ -77,7 +82,8 @@
         void *lr;
     };
 
-    ProfilingFrameIterator(JSRuntime *rt, const RegisterState &state);
+    ProfilingFrameIterator(JSRuntime *rt, const RegisterState &state,
+                           uint32_t sampleBufferGen = UINT32_MAX);
     ~ProfilingFrameIterator();
     void operator++();
     bool done() const { return !activation_; }
@@ -117,6 +123,18 @@
     bool isJit() const;
 };
 
+/**
+ * After each sample run, this method should be called with the latest sample
+ * buffer generation, and the lapCount.  It will update corresponding fields on
+ * JSRuntime.
+ *
+ * See fields |profilerSampleBufferGen|, |profilerSampleBufferLapCount| on
+ * JSRuntime for documentation about what these values are used for.
+ */
+JS_FRIEND_API(void)
+UpdateJSRuntimeProfilerSampleBufferGen(JSRuntime *runtime, uint32_t generation,
+                                       uint32_t lapCount);
+
 } // namespace JS
 
 #endif  /* js_ProfilingFrameIterator_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/Proxy.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/Proxy.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/Proxy.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/Proxy.h	2015-02-28 15:03:03.000000000 +0000
@@ -355,7 +355,7 @@
  * to add an override in CrossCompartmentWrapper. If you don't, you risk
  * compartment mismatches. See bug 945826 comment 0.
  */
-class JS_PUBLIC_API(DirectProxyHandler) : public BaseProxyHandler
+class JS_FRIEND_API(DirectProxyHandler) : public BaseProxyHandler
 {
   public:
     explicit MOZ_CONSTEXPR DirectProxyHandler(const void *aFamily, bool aHasPrototype = false,
@@ -581,7 +581,7 @@
 
 JS_FRIEND_API(JSObject *)
 NewProxyObject(JSContext *cx, const BaseProxyHandler *handler, HandleValue priv,
-               JSObject *proto, JSObject *parent, const ProxyOptions &options = ProxyOptions());
+               JSObject *proto, const ProxyOptions &options = ProxyOptions());
 
 JSObject *
 RenewProxyObject(JSContext *cx, JSObject *obj, BaseProxyHandler *handler, Value priv);
@@ -674,9 +674,9 @@
 {}
 #endif
 
-} /* namespace js */
-
 extern JS_FRIEND_API(JSObject *)
-js_InitProxyClass(JSContext *cx, JS::HandleObject obj);
+InitProxyClass(JSContext *cx, JS::HandleObject obj);
+
+} /* namespace js */
 
 #endif /* js_Proxy_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/TrackedOptimizationInfo.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/TrackedOptimizationInfo.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/public/TrackedOptimizationInfo.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/public/TrackedOptimizationInfo.h	2015-02-28 15:03:03.000000000 +0000
@@ -110,6 +110,8 @@
       "not definitely a TypedObject struct")                            \
     _(NotUnboxed,                                                       \
       "not definitely an unboxed object")                               \
+    _(UnboxedConvertedToNative,                                         \
+      "unboxed object may have been converted")                         \
     _(StructNoField,                                                    \
       "struct doesn't definitely have field")                           \
     _(InconsistentFieldType,                                            \
@@ -201,6 +203,8 @@
       "can't inline: not hot enough")                                   \
     _(CantInlineNotInDispatch,                                          \
       "can't inline: not in dispatch table")                            \
+    _(CantInlineUnreachable,                                            \
+      "can't inline: unreachable due to incomplete types for this/arguments") \
     _(CantInlineNativeBadForm,                                          \
       "can't inline native: bad form (arity mismatch/constructing)")    \
     _(CantInlineNativeBadType,                                          \
@@ -277,7 +281,8 @@
 
 JS_PUBLIC_API(void)
 ForEachTrackedOptimizationAttempt(JSRuntime *rt, void *addr,
-                                  ForEachTrackedOptimizationAttemptOp &op);
+                                  ForEachTrackedOptimizationAttemptOp &op,
+                                  JSScript **scriptOut, jsbytecode **pcOut);
 
 struct ForEachTrackedOptimizationTypeInfoOp
 {
@@ -291,15 +296,28 @@
     //                   function.
     //   - "alloc site"  for object types tied to an allocation site.
     //   - "prototype"   for object types tied neither to a constructor nor
-    //                   to an allocation site.
+    //                   to an allocation site, but to a prototype.
+    //   - "singleton"   for object types which only has a single value.
+    //   - "function"    for object types referring to scripted functions.
+    //   - "native"      for object types referring to native functions.
     //
     // The name parameter is the string representation of the type. If the
     // type is keyed by "constructor", or if the type itself refers to a
-    // scripted function, the name is the function's displayAtom.
+    // scripted function, the name is the function's displayAtom. If the type
+    // is keyed by "native", this is nullptr.
     //
-    // If the type is keyed by "constructor", "alloc site", or if the type
-    // itself refers to a scripted function, the location and lineno
-    // parameters will be respectively non-nullptr and non-0.
+    // The location parameter is the filename if the type is keyed by
+    // "constructor", "alloc site", or if the type itself refers to a scripted
+    // function. If the type is keyed by "native", it is the offset of the
+    // native function, suitable for use with addr2line on Linux or atos on OS
+    // X. Otherwise it is nullptr.
+    //
+    // The lineno parameter is the line number if the type is keyed by
+    // "constructor", "alloc site", or if the type itself refers to a scripted
+    // function. Otherwise it is UINT32_MAX.
+    //
+    // The location parameter is the only one that may need escaping if being
+    // quoted.
     virtual void readType(const char *keyedBy, const char *name,
                           const char *location, unsigned lineno) = 0;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSLink.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSLink.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSLink.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSLink.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -73,7 +73,7 @@
 static bool
 LinkFail(JSContext *cx, const char *str)
 {
-    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING, js_GetErrorMessage,
+    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING, GetErrorMessage,
                                  nullptr, JSMSG_USE_ASM_LINK_FAIL, str);
     return false;
 }
@@ -252,7 +252,7 @@
     RootedFunction fun(cx, &v.toObject().as<JSFunction>());
 
     RootedValue boundTarget(cx, ObjectValue(*fun->getBoundFunctionTarget()));
-    if (!IsNativeFunction(boundTarget, js_fun_call))
+    if (!IsNativeFunction(boundTarget, fun_call))
         return LinkFail(cx, "bound target of byteLength must be Function.prototype.call");
 
     RootedValue boundThis(cx, fun->getBoundFunctionThis());
@@ -736,7 +736,7 @@
     // since these can technically pop out anywhere and the full fix may
     // actually OOM when trying to allocate the PROT_NONE memory.
     if (module.hasDetachedHeap()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_OUT_OF_MEMORY);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_OUT_OF_MEMORY);
         return false;
     }
 
@@ -1235,7 +1235,7 @@
 
     JSFunction *fun;
     if (!args.hasDefined(0) || !IsMaybeWrappedNativeFunction(args[0], LinkAsmJS, &fun)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_USE_ASM_TYPE_FAIL,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_USE_ASM_TYPE_FAIL,
                              "argument passed to isAsmJSModuleLoadedFromCache is not a "
                              "validated asm.js module");
         return false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSModule.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSModule.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSModule.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSModule.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -65,7 +65,7 @@
 #endif
     void *p = AllocateExecutableMemory(nullptr, bytes, permissions, "asm-js-code", AsmJSPageSize);
     if (!p)
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
     return (uint8_t *)p;
 }
 
@@ -250,7 +250,7 @@
     const AsmJSHeapAccessVector &accesses;
     explicit HeapAccessOffset(const AsmJSHeapAccessVector &accesses) : accesses(accesses) {}
     uintptr_t operator[](size_t index) const {
-        return accesses[index].offset();
+        return accesses[index].insnOffset();
     }
 };
 
@@ -328,7 +328,7 @@
     pod.functionBytes_ = masm.actualOffset(pod.functionBytes_);
     for (size_t i = 0; i < heapAccesses_.length(); i++) {
         AsmJSHeapAccess &a = heapAccesses_[i];
-        a.setOffset(masm.actualOffset(a.offset()));
+        a.setInsnOffset(masm.actualOffset(a.insnOffset()));
     }
     for (unsigned i = 0; i < numExportedFunctions(); i++) {
         if (!exportedFunction(i).isChangeHeap())
@@ -455,7 +455,7 @@
 AsmJSReportOverRecursed()
 {
     JSContext *cx = JSRuntime::innermostAsmJSActivation()->cx();
-    js_ReportOverRecursed(cx);
+    ReportOverRecursed(cx);
 }
 
 static void
@@ -463,14 +463,14 @@
 {
     // See hasDetachedHeap comment in LinkAsmJS.
     JSContext *cx = JSRuntime::innermostAsmJSActivation()->cx();
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_OUT_OF_MEMORY);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_OUT_OF_MEMORY);
 }
 
 static void
 OnOutOfBounds()
 {
     JSContext *cx = JSRuntime::innermostAsmJSActivation()->cx();
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
 }
 
 static bool
@@ -774,16 +774,6 @@
     MOZ_ASSERT(isStaticallyLinked());
 }
 
-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
-static size_t
-ByteSizeOfHeapAccess(const jit::AsmJSHeapAccess access)
-{
-    Scalar::Type type = access.type();
-    if (Scalar::isSimdType(type))
-        return Scalar::scalarByteSize(type) * access.numSimdElems();
-    return TypedArrayElemSize(type);
-}
-#endif
 void
 AsmJSModule::initHeap(Handle<ArrayBufferObjectMaybeShared *> heap, JSContext *cx)
 {
@@ -797,18 +787,17 @@
 
 #if defined(JS_CODEGEN_X86)
     uint8_t *heapOffset = heap->dataPointer();
+    uint32_t heapLength = heap->byteLength();
     for (unsigned i = 0; i < heapAccesses_.length(); i++) {
         const jit::AsmJSHeapAccess &access = heapAccesses_[i];
-        if (access.hasLengthCheck()) {
-            // An access is out-of-bounds iff
-            //      ptr + data-type-byte-size > heapLength
-            // i.e. ptr >= heapLength + 1 - data-type-byte-size
-            // (Note that we need >= as this is what codegen uses.)
-            size_t scalarByteSize = ByteSizeOfHeapAccess(access);
-            X86Encoding::SetPointer(access.patchLengthAt(code_),
-                                    (void*)(heap->byteLength() + 1 - scalarByteSize));
-        }
-        void *addr = access.patchOffsetAt(code_);
+        // An access is out-of-bounds iff
+        //      ptr + offset + data-type-byte-size > heapLength
+        // i.e. ptr > heapLength - data-type-byte-size - offset.
+        // data-type-byte-size and offset are already included in the addend
+        // so we just have to add the heap length here.
+        if (access.hasLengthCheck())
+            X86Encoding::AddInt32(access.patchLengthAt(code_), heapLength);
+        void *addr = access.patchHeapPtrImmAt(code_);
         uint32_t disp = reinterpret_cast<uint32_t>(X86Encoding::GetPointer(addr));
         MOZ_ASSERT(disp <= INT32_MAX);
         X86Encoding::SetPointer(addr, (void *)(heapOffset + disp));
@@ -821,20 +810,18 @@
     // checks at the right places. All accesses that have been recorded are the
     // only ones that need bound checks (see also
     // CodeGeneratorX64::visitAsmJS{Load,Store,CompareExchange,AtomicBinop}Heap)
-    int32_t heapLength = int32_t(intptr_t(heap->byteLength()));
+    uint32_t heapLength = heap->byteLength();
     for (size_t i = 0; i < heapAccesses_.length(); i++) {
         const jit::AsmJSHeapAccess &access = heapAccesses_[i];
-        if (access.hasLengthCheck()) {
-            // See comment above for x86 codegen.
-            size_t scalarByteSize = ByteSizeOfHeapAccess(access);
-            X86Encoding::SetInt32(access.patchLengthAt(code_), heapLength + 1 - scalarByteSize);
-        }
+        // See comment above for x86 codegen.
+        if (access.hasLengthCheck())
+            X86Encoding::AddInt32(access.patchLengthAt(code_), heapLength);
     }
 #elif defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
     uint32_t heapLength = heap->byteLength();
     for (unsigned i = 0; i < heapAccesses_.length(); i++) {
         jit::Assembler::UpdateBoundsCheck(heapLength,
-                                          (jit::Instruction*)(heapAccesses_[i].offset() + code_));
+                                          (jit::Instruction*)(heapAccesses_[i].insnOffset() + code_));
     }
 #endif
 }
@@ -846,14 +833,28 @@
     if (maybePrevBuffer) {
         // Subtract out the base-pointer added by AsmJSModule::initHeap.
         uint8_t *ptrBase = maybePrevBuffer->dataPointer();
+        uint32_t heapLength = maybePrevBuffer->byteLength();
         for (unsigned i = 0; i < heapAccesses_.length(); i++) {
             const jit::AsmJSHeapAccess &access = heapAccesses_[i];
-            void *addr = access.patchOffsetAt(code_);
+            // Subtract the heap length back out, leaving the raw displacement in place.
+            if (access.hasLengthCheck())
+                X86Encoding::AddInt32(access.patchLengthAt(code_), -heapLength);
+            void *addr = access.patchHeapPtrImmAt(code_);
             uint8_t *ptr = reinterpret_cast<uint8_t*>(X86Encoding::GetPointer(addr));
             MOZ_ASSERT(ptr >= ptrBase);
             X86Encoding::SetPointer(addr, (void *)(ptr - ptrBase));
         }
     }
+#elif defined(JS_CODEGEN_X64)
+    if (maybePrevBuffer) {
+        uint32_t heapLength = maybePrevBuffer->byteLength();
+        for (unsigned i = 0; i < heapAccesses_.length(); i++) {
+            const jit::AsmJSHeapAccess &access = heapAccesses_[i];
+            // See comment above for x86 codegen.
+            if (access.hasLengthCheck())
+                X86Encoding::AddInt32(access.patchLengthAt(code_), -heapLength);
+        }
+    }
 #endif
 
     maybeHeap_ = nullptr;
@@ -2202,7 +2203,7 @@
 
     uint32_t srcStart = parser.pc->maybeFunction->pn_body->pn_pos.begin;
     uint32_t srcBodyStart = parser.tokenStream.currentToken().pos.end;
-    bool strict = parser.pc->sc->strict && !parser.pc->sc->hasExplicitUseStrict();
+    bool strict = parser.pc->sc->strict() && !parser.pc->sc->hasExplicitUseStrict();
 
     // usesSignalHandlers will be clobbered when deserializing
     ScopedJSDeletePtr<AsmJSModule> module(
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/PodOperations.h"
 
 #include "asmjs/AsmJSModule.h"
+#include "jit/Disassembler.h"
 #include "vm/Runtime.h"
 
 using namespace js;
@@ -308,6 +309,28 @@
 # define CONTEXT ucontext_t
 #endif
 
+// Define a context type for use in the emulator code. This is usually just
+// the same as CONTEXT, but on Mac we use a different structure since we call
+// into the emulator code from a Mach exception handler rather than a
+// sigaction-style signal handler.
+#if defined(XP_MACOSX)
+# if defined(JS_CODEGEN_X64)
+struct macos_x64_context {
+    x86_thread_state64_t thread;
+    x86_float_state64_t float_;
+};
+#  define EMULATOR_CONTEXT macos_x64_context
+# else
+struct macos_x86_context {
+    x86_thread_state_t thread;
+    x86_float_state_t float_;
+};
+#  define EMULATOR_CONTEXT macos_x86_context
+# endif
+#else
+# define EMULATOR_CONTEXT CONTEXT
+#endif
+
 #if defined(JS_CPU_X64)
 # define PC_sig(p) RIP_sig(p)
 #elif defined(JS_CPU_X86)
@@ -329,96 +352,368 @@
 }
 
 #if defined(JS_CODEGEN_X64)
-template <class T>
-static void
-SetXMMRegToNaN(Scalar::Type viewType, T *xmm_reg)
-{
-    switch (viewType) {
-      case Scalar::Float32: {
-        JS_STATIC_ASSERT(sizeof(T) == 4 * sizeof(float));
-        float *floats = reinterpret_cast<float*>(xmm_reg);
-        floats[0] = GenericNaN();
-        floats[1] = 0;
-        floats[2] = 0;
-        floats[3] = 0;
-        break;
-      }
-      case Scalar::Float64: {
-        JS_STATIC_ASSERT(sizeof(T) == 2 * sizeof(double));
-        double *dbls = reinterpret_cast<double*>(xmm_reg);
-        dbls[0] = GenericNaN();
-        dbls[1] = 0;
-        break;
-      }
-      // Float32x4 and Int32x4 out of bounds are handled with the OutOfBounds stub.
-      case Scalar::Float32x4:
-      case Scalar::Int32x4:
-      case Scalar::Int8:
-      case Scalar::Uint8:
-      case Scalar::Int16:
-      case Scalar::Uint16:
-      case Scalar::Int32:
-      case Scalar::Uint32:
-      case Scalar::Uint8Clamped:
-      case Scalar::MaxTypedArrayViewType:
-        MOZ_CRASH("unexpected type in SetXMMRegToNaN");
+MOZ_COLD static void
+SetFPRegToNaN(size_t size, void *fp_reg)
+{
+    MOZ_RELEASE_ASSERT(size <= Simd128DataSize);
+    memset(fp_reg, 0, Simd128DataSize);
+    switch (size) {
+      case 4: *static_cast<float *>(fp_reg) = GenericNaN(); break;
+      case 8: *static_cast<double *>(fp_reg) = GenericNaN(); break;
+      default:
+        // All SIMD accesses throw on OOB.
+        MOZ_CRASH("unexpected size in SetFPRegToNaN");
     }
 }
 
+MOZ_COLD static void
+SetGPRegToZero(void *gp_reg)
+{
+    memset(gp_reg, 0, sizeof(intptr_t));
+}
+
+MOZ_COLD static void
+SetFPRegToLoadedValue(const void *addr, size_t size, void *fp_reg)
+{
+    MOZ_RELEASE_ASSERT(size <= Simd128DataSize);
+    memset(fp_reg, 0, Simd128DataSize);
+    memcpy(fp_reg, addr, size);
+}
+
+MOZ_COLD static void
+SetGPRegToLoadedValue(const void *addr, size_t size, void *gp_reg)
+{
+    MOZ_RELEASE_ASSERT(size <= sizeof(void *));
+    memset(gp_reg, 0, sizeof(void *));
+    memcpy(gp_reg, addr, size);
+}
+
+MOZ_COLD static void
+SetGPRegToLoadedValueSext32(const void *addr, size_t size, void *gp_reg)
+{
+    MOZ_RELEASE_ASSERT(size <= sizeof(int32_t));
+    int8_t msb = static_cast<const int8_t *>(addr)[size - 1];
+    memset(gp_reg, 0, sizeof(void *));
+    memset(gp_reg, msb >> 7, sizeof(int32_t));
+    memcpy(gp_reg, addr, size);
+}
+
+MOZ_COLD static void
+StoreValueFromFPReg(void *addr, size_t size, const void *fp_reg)
+{
+    MOZ_RELEASE_ASSERT(size <= Simd128DataSize);
+    memcpy(addr, fp_reg, size);
+}
+
+MOZ_COLD static void
+StoreValueFromGPReg(void *addr, size_t size, const void *gp_reg)
+{
+    MOZ_RELEASE_ASSERT(size <= sizeof(void *));
+    memcpy(addr, gp_reg, size);
+}
+
+MOZ_COLD static void
+StoreValueFromGPImm(void *addr, size_t size, int32_t imm)
+{
+    MOZ_RELEASE_ASSERT(size <= sizeof(imm));
+    memcpy(addr, &imm, size);
+}
+
 # if !defined(XP_MACOSX)
-static void
-SetRegisterToCoercedUndefined(CONTEXT *context, Scalar::Type viewType, AnyRegister reg)
+MOZ_COLD static void *
+AddressOfFPRegisterSlot(CONTEXT *context, FloatRegisters::Encoding encoding)
 {
-    if (reg.isFloat()) {
-        switch (reg.fpu().code()) {
-          case X86Encoding::xmm0:  SetXMMRegToNaN(viewType, &XMM_sig(context, 0)); break;
-          case X86Encoding::xmm1:  SetXMMRegToNaN(viewType, &XMM_sig(context, 1)); break;
-          case X86Encoding::xmm2:  SetXMMRegToNaN(viewType, &XMM_sig(context, 2)); break;
-          case X86Encoding::xmm3:  SetXMMRegToNaN(viewType, &XMM_sig(context, 3)); break;
-          case X86Encoding::xmm4:  SetXMMRegToNaN(viewType, &XMM_sig(context, 4)); break;
-          case X86Encoding::xmm5:  SetXMMRegToNaN(viewType, &XMM_sig(context, 5)); break;
-          case X86Encoding::xmm6:  SetXMMRegToNaN(viewType, &XMM_sig(context, 6)); break;
-          case X86Encoding::xmm7:  SetXMMRegToNaN(viewType, &XMM_sig(context, 7)); break;
-          case X86Encoding::xmm8:  SetXMMRegToNaN(viewType, &XMM_sig(context, 8)); break;
-          case X86Encoding::xmm9:  SetXMMRegToNaN(viewType, &XMM_sig(context, 9)); break;
-          case X86Encoding::xmm10: SetXMMRegToNaN(viewType, &XMM_sig(context, 10)); break;
-          case X86Encoding::xmm11: SetXMMRegToNaN(viewType, &XMM_sig(context, 11)); break;
-          case X86Encoding::xmm12: SetXMMRegToNaN(viewType, &XMM_sig(context, 12)); break;
-          case X86Encoding::xmm13: SetXMMRegToNaN(viewType, &XMM_sig(context, 13)); break;
-          case X86Encoding::xmm14: SetXMMRegToNaN(viewType, &XMM_sig(context, 14)); break;
-          case X86Encoding::xmm15: SetXMMRegToNaN(viewType, &XMM_sig(context, 15)); break;
-          default: MOZ_CRASH();
-        }
-    } else {
-        switch (reg.gpr().code()) {
-          case X86Encoding::rax: RAX_sig(context) = 0; break;
-          case X86Encoding::rcx: RCX_sig(context) = 0; break;
-          case X86Encoding::rdx: RDX_sig(context) = 0; break;
-          case X86Encoding::rbx: RBX_sig(context) = 0; break;
-          case X86Encoding::rsp: RSP_sig(context) = 0; break;
-          case X86Encoding::rbp: RBP_sig(context) = 0; break;
-          case X86Encoding::rsi: RSI_sig(context) = 0; break;
-          case X86Encoding::rdi: RDI_sig(context) = 0; break;
-          case X86Encoding::r8:  R8_sig(context)  = 0; break;
-          case X86Encoding::r9:  R9_sig(context)  = 0; break;
-          case X86Encoding::r10: R10_sig(context) = 0; break;
-          case X86Encoding::r11: R11_sig(context) = 0; break;
-          case X86Encoding::r12: R12_sig(context) = 0; break;
-          case X86Encoding::r13: R13_sig(context) = 0; break;
-          case X86Encoding::r14: R14_sig(context) = 0; break;
-          case X86Encoding::r15: R15_sig(context) = 0; break;
-          default: MOZ_CRASH();
-        }
+    switch (encoding) {
+      case X86Encoding::xmm0:  return &XMM_sig(context, 0);
+      case X86Encoding::xmm1:  return &XMM_sig(context, 1);
+      case X86Encoding::xmm2:  return &XMM_sig(context, 2);
+      case X86Encoding::xmm3:  return &XMM_sig(context, 3);
+      case X86Encoding::xmm4:  return &XMM_sig(context, 4);
+      case X86Encoding::xmm5:  return &XMM_sig(context, 5);
+      case X86Encoding::xmm6:  return &XMM_sig(context, 6);
+      case X86Encoding::xmm7:  return &XMM_sig(context, 7);
+      case X86Encoding::xmm8:  return &XMM_sig(context, 8);
+      case X86Encoding::xmm9:  return &XMM_sig(context, 9);
+      case X86Encoding::xmm10: return &XMM_sig(context, 10);
+      case X86Encoding::xmm11: return &XMM_sig(context, 11);
+      case X86Encoding::xmm12: return &XMM_sig(context, 12);
+      case X86Encoding::xmm13: return &XMM_sig(context, 13);
+      case X86Encoding::xmm14: return &XMM_sig(context, 14);
+      case X86Encoding::xmm15: return &XMM_sig(context, 15);
+      default: break;
+    }
+    MOZ_CRASH();
+}
+
+MOZ_COLD static void *
+AddressOfGPRegisterSlot(EMULATOR_CONTEXT *context, Registers::Code code)
+{
+    switch (code) {
+      case X86Encoding::rax: return &RAX_sig(context);
+      case X86Encoding::rcx: return &RCX_sig(context);
+      case X86Encoding::rdx: return &RDX_sig(context);
+      case X86Encoding::rbx: return &RBX_sig(context);
+      case X86Encoding::rsp: return &RSP_sig(context);
+      case X86Encoding::rbp: return &RBP_sig(context);
+      case X86Encoding::rsi: return &RSI_sig(context);
+      case X86Encoding::rdi: return &RDI_sig(context);
+      case X86Encoding::r8:  return &R8_sig(context);
+      case X86Encoding::r9:  return &R9_sig(context);
+      case X86Encoding::r10: return &R10_sig(context);
+      case X86Encoding::r11: return &R11_sig(context);
+      case X86Encoding::r12: return &R12_sig(context);
+      case X86Encoding::r13: return &R13_sig(context);
+      case X86Encoding::r14: return &R14_sig(context);
+      case X86Encoding::r15: return &R15_sig(context);
+      default: break;
+    }
+    MOZ_CRASH();
+}
+# else
+MOZ_COLD static void *
+AddressOfFPRegisterSlot(EMULATOR_CONTEXT *context, FloatRegisters::Encoding encoding)
+{
+    switch (encoding) {
+      case X86Encoding::xmm0:  return &context->float_.__fpu_xmm0;
+      case X86Encoding::xmm1:  return &context->float_.__fpu_xmm1;
+      case X86Encoding::xmm2:  return &context->float_.__fpu_xmm2;
+      case X86Encoding::xmm3:  return &context->float_.__fpu_xmm3;
+      case X86Encoding::xmm4:  return &context->float_.__fpu_xmm4;
+      case X86Encoding::xmm5:  return &context->float_.__fpu_xmm5;
+      case X86Encoding::xmm6:  return &context->float_.__fpu_xmm6;
+      case X86Encoding::xmm7:  return &context->float_.__fpu_xmm7;
+      case X86Encoding::xmm8:  return &context->float_.__fpu_xmm8;
+      case X86Encoding::xmm9:  return &context->float_.__fpu_xmm9;
+      case X86Encoding::xmm10: return &context->float_.__fpu_xmm10;
+      case X86Encoding::xmm11: return &context->float_.__fpu_xmm11;
+      case X86Encoding::xmm12: return &context->float_.__fpu_xmm12;
+      case X86Encoding::xmm13: return &context->float_.__fpu_xmm13;
+      case X86Encoding::xmm14: return &context->float_.__fpu_xmm14;
+      case X86Encoding::xmm15: return &context->float_.__fpu_xmm15;
+      default: break;
+    }
+    MOZ_CRASH();
+}
+
+MOZ_COLD static void *
+AddressOfGPRegisterSlot(EMULATOR_CONTEXT *context, Registers::Code code)
+{
+    switch (code) {
+      case X86Encoding::rax: return &context->thread.__rax;
+      case X86Encoding::rcx: return &context->thread.__rcx;
+      case X86Encoding::rdx: return &context->thread.__rdx;
+      case X86Encoding::rbx: return &context->thread.__rbx;
+      case X86Encoding::rsp: return &context->thread.__rsp;
+      case X86Encoding::rbp: return &context->thread.__rbp;
+      case X86Encoding::rsi: return &context->thread.__rsi;
+      case X86Encoding::rdi: return &context->thread.__rdi;
+      case X86Encoding::r8:  return &context->thread.__r8;
+      case X86Encoding::r9:  return &context->thread.__r9;
+      case X86Encoding::r10: return &context->thread.__r10;
+      case X86Encoding::r11: return &context->thread.__r11;
+      case X86Encoding::r12: return &context->thread.__r12;
+      case X86Encoding::r13: return &context->thread.__r13;
+      case X86Encoding::r14: return &context->thread.__r14;
+      case X86Encoding::r15: return &context->thread.__r15;
+      default: break;
     }
+    MOZ_CRASH();
 }
 # endif  // !XP_MACOSX
 
-static void
-RedirectToOutOfBoundsLabel(uint8_t **ppc, const AsmJSModule &module)
+MOZ_COLD static void
+SetRegisterToCoercedUndefined(EMULATOR_CONTEXT *context, size_t size,
+                              const Disassembler::OtherOperand &value)
+{
+    if (value.kind() == Disassembler::OtherOperand::FPR)
+        SetFPRegToNaN(size, AddressOfFPRegisterSlot(context, value.fpr()));
+    else
+        SetGPRegToZero(AddressOfGPRegisterSlot(context, value.gpr()));
+}
+
+MOZ_COLD static void
+SetRegisterToLoadedValue(EMULATOR_CONTEXT *context, const void *addr, size_t size,
+                         const Disassembler::OtherOperand &value)
+{
+    if (value.kind() == Disassembler::OtherOperand::FPR)
+        SetFPRegToLoadedValue(addr, size, AddressOfFPRegisterSlot(context, value.fpr()));
+    else
+        SetGPRegToLoadedValue(addr, size, AddressOfGPRegisterSlot(context, value.gpr()));
+}
+
+MOZ_COLD static void
+SetRegisterToLoadedValueSext32(EMULATOR_CONTEXT *context, const void *addr, size_t size,
+                               const Disassembler::OtherOperand &value)
+{
+    SetGPRegToLoadedValueSext32(addr, size, AddressOfGPRegisterSlot(context, value.gpr()));
+}
+
+MOZ_COLD static void
+StoreValueFromRegister(EMULATOR_CONTEXT *context, void *addr, size_t size,
+                       const Disassembler::OtherOperand &value)
+{
+    if (value.kind() == Disassembler::OtherOperand::FPR)
+        StoreValueFromFPReg(addr, size, AddressOfFPRegisterSlot(context, value.fpr()));
+    else if (value.kind() == Disassembler::OtherOperand::GPR)
+        StoreValueFromGPReg(addr, size, AddressOfGPRegisterSlot(context, value.gpr()));
+    else
+        StoreValueFromGPImm(addr, size, value.imm());
+}
+
+MOZ_COLD static uint8_t *
+ComputeAccessAddress(EMULATOR_CONTEXT *context, const Disassembler::ComplexAddress &address)
 {
-    MOZ_ASSERT(module.containsFunctionPC(*ppc));
-    *ppc = module.outOfBoundsExit();
+    MOZ_RELEASE_ASSERT(!address.isPCRelative(), "PC-relative addresses not supported yet");
+
+    uintptr_t result = address.disp();
+
+    if (address.base() != Registers::Invalid) {
+        uintptr_t base;
+        StoreValueFromGPReg(&base, sizeof(uintptr_t),
+                            AddressOfGPRegisterSlot(context, address.base()));
+        result += base;
+    }
+
+    if (address.index() != Registers::Invalid) {
+        uintptr_t index;
+        StoreValueFromGPReg(&index, sizeof(uintptr_t),
+                            AddressOfGPRegisterSlot(context, address.index()));
+        result += index * (1 << address.scale());
+    }
+
+    return reinterpret_cast<uint8_t *>(result);
 }
+
+MOZ_COLD static uint8_t *
+EmulateHeapAccess(EMULATOR_CONTEXT *context, uint8_t *pc, uint8_t *faultingAddress,
+                  const AsmJSHeapAccess *heapAccess, const AsmJSModule &module)
+{
+    MOZ_RELEASE_ASSERT(module.containsFunctionPC(pc));
+    MOZ_RELEASE_ASSERT(module.usesSignalHandlersForOOB());
+    MOZ_RELEASE_ASSERT(!heapAccess->hasLengthCheck());
+    MOZ_RELEASE_ASSERT(heapAccess->insnOffset() == (pc - module.codeBase()));
+
+    // Disassemble the instruction which caused the trap so that we can extract
+    // information about it and decide what to do.
+    Disassembler::HeapAccess access;
+    uint8_t *end = Disassembler::DisassembleHeapAccess(pc, &access);
+    const Disassembler::ComplexAddress &address = access.address();
+    MOZ_RELEASE_ASSERT(end > pc);
+    MOZ_RELEASE_ASSERT(module.containsFunctionPC(end));
+
+#if defined(JS_CODEGEN_X64)
+    // 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.scale() == 0);
+    if (address.base() != Registers::Invalid) {
+        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) {
+        uintptr_t index;
+        StoreValueFromGPReg(&index, sizeof(uintptr_t),
+                            AddressOfGPRegisterSlot(context, address.index()));
+        MOZ_RELEASE_ASSERT(uint32_t(index) == index);
+    }
+#endif
+
+    // Determine the actual effective address of the faulting access. We can't
+    // rely on the faultingAddress given to us by the OS, because we need the
+    // address of the start of the access, and the OS may sometimes give us an
+    // address somewhere in the middle of the heap access.
+    uint8_t *accessAddress = ComputeAccessAddress(context, address);
+    MOZ_RELEASE_ASSERT(size_t(faultingAddress - accessAddress) < access.size(),
+                       "Given faulting address does not appear to be within computed "
+                       "faulting address range");
+    MOZ_RELEASE_ASSERT(accessAddress >= module.maybeHeap(),
+                       "Access begins outside the asm.js heap");
+    MOZ_RELEASE_ASSERT(accessAddress + access.size() <= module.maybeHeap() + AsmJSMappedSize,
+                       "Access extends beyond the asm.js heap guard region");
+    MOZ_RELEASE_ASSERT(accessAddress + access.size() > module.maybeHeap() + module.heapLength(),
+                       "Computed access address is not actually out of bounds");
+
+    // The basic sandbox model is that all heap accesses are a heap base
+    // register plus an index, and the index is always computed with 32-bit
+    // operations, so we know it can only be 4 GiB off of the heap base.
+    //
+    // However, we wish to support the optimization of folding immediates
+    // and scaled indices into addresses, and any address arithmetic we fold
+    // gets done at full pointer width, so it doesn't get properly wrapped.
+    // We support this by extending AsmJSMappedSize to the greatest size
+    // that could be reached by such an unwrapped address, and then when we
+    // arrive here in the signal handler for such an access, we compute the
+    // fully wrapped address, and perform the load or store on it.
+    //
+    // Taking a signal is really slow, but in theory programs really shouldn't
+    // be hitting this anyway.
+    intptr_t unwrappedOffset = accessAddress - module.maybeHeap();
+    uint32_t wrappedOffset = uint32_t(unwrappedOffset);
+    size_t size = access.size();
+    MOZ_RELEASE_ASSERT(wrappedOffset + size > wrappedOffset);
+    bool inBounds = wrappedOffset < module.heapLength() &&
+                    wrappedOffset + size < module.heapLength();
+
+    // If this is storing Z of an XYZ, check whether X is also in bounds, so
+    // that we don't store anything before throwing.
+    MOZ_RELEASE_ASSERT(unwrappedOffset > heapAccess->offsetWithinWholeSimdVector());
+    uint32_t wrappedBaseOffset = uint32_t(unwrappedOffset - heapAccess->offsetWithinWholeSimdVector());
+    if (wrappedBaseOffset >= module.heapLength())
+        inBounds = false;
+
+    if (inBounds) {
+        // We now know that this is an access that is actually in bounds when
+        // properly wrapped. Complete the load or store with the wrapped
+        // address.
+        uint8_t *wrappedAddress = module.maybeHeap() + wrappedOffset;
+        MOZ_RELEASE_ASSERT(wrappedAddress >= module.maybeHeap());
+        MOZ_RELEASE_ASSERT(wrappedAddress + size > wrappedAddress);
+        MOZ_RELEASE_ASSERT(wrappedAddress + size <= module.maybeHeap() + module.heapLength());
+        switch (access.kind()) {
+          case Disassembler::HeapAccess::Load:
+            SetRegisterToLoadedValue(context, wrappedAddress, size, access.otherOperand());
+            break;
+          case Disassembler::HeapAccess::LoadSext32:
+            SetRegisterToLoadedValueSext32(context, wrappedAddress, size, access.otherOperand());
+            break;
+          case Disassembler::HeapAccess::Store:
+            StoreValueFromRegister(context, wrappedAddress, size, access.otherOperand());
+            break;
+          case Disassembler::HeapAccess::Unknown:
+            MOZ_CRASH("Failed to disassemble instruction");
+        }
+    } else {
+        // We now know that this is an out-of-bounds access made by an asm.js
+        // load/store that we should handle.
+
+        if (heapAccess->throwOnOOB())
+            return module.outOfBoundsExit();
+
+        switch (access.kind()) {
+          case Disassembler::HeapAccess::Load:
+          case Disassembler::HeapAccess::LoadSext32:
+            // Assign the JS-defined result value to the destination register
+            // (ToInt32(undefined) or ToNumber(undefined), determined by the
+            // type of the destination register). Very conveniently, we can
+            // infer the type from the register class, since all SIMD accesses
+            // throw on out of bounds (see above), so the only types using FP
+            // registers are float32 and double.
+            SetRegisterToCoercedUndefined(context, access.size(), access.otherOperand());
+            break;
+          case Disassembler::HeapAccess::Store:
+            // Do nothing.
+            break;
+          case Disassembler::HeapAccess::Unknown:
+            MOZ_CRASH("Failed to disassemble instruction");
+        }
+    }
+
+    return end;
+}
+
 #endif // JS_CODEGEN_X64
 
 #if defined(XP_WIN)
@@ -453,7 +748,7 @@
 
     // These checks aren't necessary, but, since we can, check anyway to make
     // sure we aren't covering up a real bug.
-    void *faultingAddress = (void*)record->ExceptionInformation[1];
+    uint8_t *faultingAddress = reinterpret_cast<uint8_t *>(record->ExceptionInformation[1]);
     if (!module.maybeHeap() ||
         faultingAddress < module.maybeHeap() ||
         faultingAddress >= module.maybeHeap() + AsmJSMappedSize)
@@ -484,26 +779,7 @@
     if (!heapAccess)
         return false;
 
-    // We now know that this is an out-of-bounds access made by an asm.js
-    // load/store that we should handle.
-
-    // SIMD out-of-bounds loads and stores just need to throw.
-    if (Scalar::isSimdType(heapAccess->type())) {
-        RedirectToOutOfBoundsLabel(ppc, module);
-        return true;
-    }
-
-    // Also not necessary, but, since we can, do.
-    if (heapAccess->isLoad() != !record->ExceptionInformation[0])
-        return false;
-
-    // If this is a load, assign the JS-defined result value to the destination
-    // register (ToInt32(undefined) or ToNumber(undefined), determined by the
-    // type of the destination register) and set the PC to the next op. Upon
-    // return from the handler, execution will resume at this next PC.
-    if (heapAccess->isLoad())
-        SetRegisterToCoercedUndefined(context, heapAccess->type(), heapAccess->loadedReg());
-    *ppc += heapAccess->opLength();
+    *ppc = EmulateHeapAccess(context, pc, faultingAddress, heapAccess, module);
 
     return true;
 # else
@@ -525,82 +801,19 @@
 # include <mach/exc.h>
 
 static uint8_t **
-ContextToPC(x86_thread_state_t &state)
+ContextToPC(EMULATOR_CONTEXT *context)
 {
 # if defined(JS_CPU_X64)
-    static_assert(sizeof(state.uts.ts64.__rip) == sizeof(void*),
+    static_assert(sizeof(context->thread.__rip) == sizeof(void*),
                   "stored IP should be compile-time pointer-sized");
-    return reinterpret_cast<uint8_t**>(&state.uts.ts64.__rip);
+    return reinterpret_cast<uint8_t**>(&context->thread.__rip);
 # else
-    static_assert(sizeof(state.uts.ts32.__eip) == sizeof(void*),
+    static_assert(sizeof(context->thread.uts.ts32.__eip) == sizeof(void*),
                   "stored IP should be compile-time pointer-sized");
-    return reinterpret_cast<uint8_t**>(&state.uts.ts32.__eip);
+    return reinterpret_cast<uint8_t**>(&context->thread.uts.ts32.__eip);
 # endif
 }
 
-# if defined(JS_CODEGEN_X64)
-static bool
-SetRegisterToCoercedUndefined(mach_port_t rtThread, x86_thread_state64_t &state,
-                              const AsmJSHeapAccess &heapAccess)
-{
-    if (heapAccess.loadedReg().isFloat()) {
-        kern_return_t kret;
-
-        x86_float_state64_t fstate;
-        unsigned int count = x86_FLOAT_STATE64_COUNT;
-        kret = thread_get_state(rtThread, x86_FLOAT_STATE64, (thread_state_t) &fstate, &count);
-        if (kret != KERN_SUCCESS)
-            return false;
-
-        Scalar::Type viewType = heapAccess.type();
-        switch (heapAccess.loadedReg().fpu().code()) {
-          case X86Encoding::xmm0:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm0); break;
-          case X86Encoding::xmm1:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm1); break;
-          case X86Encoding::xmm2:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm2); break;
-          case X86Encoding::xmm3:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm3); break;
-          case X86Encoding::xmm4:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm4); break;
-          case X86Encoding::xmm5:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm5); break;
-          case X86Encoding::xmm6:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm6); break;
-          case X86Encoding::xmm7:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm7); break;
-          case X86Encoding::xmm8:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm8); break;
-          case X86Encoding::xmm9:  SetXMMRegToNaN(viewType, &fstate.__fpu_xmm9); break;
-          case X86Encoding::xmm10: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm10); break;
-          case X86Encoding::xmm11: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm11); break;
-          case X86Encoding::xmm12: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm12); break;
-          case X86Encoding::xmm13: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm13); break;
-          case X86Encoding::xmm14: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm14); break;
-          case X86Encoding::xmm15: SetXMMRegToNaN(viewType, &fstate.__fpu_xmm15); break;
-          default: MOZ_CRASH();
-        }
-
-        kret = thread_set_state(rtThread, x86_FLOAT_STATE64, (thread_state_t)&fstate, x86_FLOAT_STATE64_COUNT);
-        if (kret != KERN_SUCCESS)
-            return false;
-    } else {
-        switch (heapAccess.loadedReg().gpr().code()) {
-          case X86Encoding::rax: state.__rax = 0; break;
-          case X86Encoding::rcx: state.__rcx = 0; break;
-          case X86Encoding::rdx: state.__rdx = 0; break;
-          case X86Encoding::rbx: state.__rbx = 0; break;
-          case X86Encoding::rsp: state.__rsp = 0; break;
-          case X86Encoding::rbp: state.__rbp = 0; break;
-          case X86Encoding::rsi: state.__rsi = 0; break;
-          case X86Encoding::rdi: state.__rdi = 0; break;
-          case X86Encoding::r8:  state.__r8  = 0; break;
-          case X86Encoding::r9:  state.__r9  = 0; break;
-          case X86Encoding::r10: state.__r10 = 0; break;
-          case X86Encoding::r11: state.__r11 = 0; break;
-          case X86Encoding::r12: state.__r12 = 0; break;
-          case X86Encoding::r13: state.__r13 = 0; break;
-          case X86Encoding::r14: state.__r14 = 0; break;
-          case X86Encoding::r15: state.__r15 = 0; break;
-          default: MOZ_CRASH();
-        }
-    }
-    return true;
-}
-# endif
-
 // This definition was generated by mig (the Mach Interface Generator) for the
 // routine 'exception_raise' (exc.defs).
 #pragma pack(4)
@@ -637,14 +850,29 @@
     mach_port_t rtThread = request.body.thread.name;
 
     // Read out the JSRuntime thread's register state.
-    x86_thread_state_t state;
-    unsigned int count = x86_THREAD_STATE_COUNT;
+    EMULATOR_CONTEXT context;
+# if defined(JS_CODEGEN_X64)
+    unsigned int thread_state_count = x86_THREAD_STATE64_COUNT;
+    unsigned int float_state_count = x86_FLOAT_STATE64_COUNT;
+    int thread_state = x86_THREAD_STATE64;
+    int float_state = x86_FLOAT_STATE64;
+# else
+    unsigned int thread_state_count = x86_THREAD_STATE_COUNT;
+    unsigned int float_state_count = x86_FLOAT_STATE_COUNT;
+    int thread_state = x86_THREAD_STATE;
+    int float_state = x86_FLOAT_STATE;
+# endif
     kern_return_t kret;
-    kret = thread_get_state(rtThread, x86_THREAD_STATE, (thread_state_t)&state, &count);
+    kret = thread_get_state(rtThread, thread_state,
+                            (thread_state_t)&context.thread, &thread_state_count);
+    if (kret != KERN_SUCCESS)
+        return false;
+    kret = thread_get_state(rtThread, float_state,
+                            (thread_state_t)&context.float_, &float_state_count);
     if (kret != KERN_SUCCESS)
         return false;
 
-    uint8_t **ppc = ContextToPC(state);
+    uint8_t **ppc = ContextToPC(&context);
     uint8_t *pc = *ppc;
 
     if (request.body.exception != EXC_BAD_ACCESS || request.body.codeCnt != 2)
@@ -658,10 +886,10 @@
     if (!module.containsFunctionPC(pc))
         return false;
 
-# if defined(JS_CPU_X64)
+# if defined(JS_CODEGEN_X64)
     // These checks aren't necessary, but, since we can, check anyway to make
     // sure we aren't covering up a real bug.
-    void *faultingAddress = (void*)request.body.code[1];
+    uint8_t *faultingAddress = reinterpret_cast<uint8_t *>(request.body.code[1]);
     if (!module.maybeHeap() ||
         faultingAddress < module.maybeHeap() ||
         faultingAddress >= module.maybeHeap() + AsmJSMappedSize)
@@ -673,26 +901,13 @@
     if (!heapAccess)
         return false;
 
-    // We now know that this is an out-of-bounds access made by an asm.js
-    // load/store that we should handle.
+    *ppc = EmulateHeapAccess(&context, pc, faultingAddress, heapAccess, module);
 
-    if (Scalar::isSimdType(heapAccess->type())) {
-        // SIMD out-of-bounds loads and stores just need to throw.
-        RedirectToOutOfBoundsLabel(ppc, module);
-    } else {
-        // If this is a load, assign the JS-defined result value to the destination
-        // register (ToInt32(undefined) or ToNumber(undefined), determined by the
-        // type of the destination register) and set the PC to the next op. Upon
-        // return from the handler, execution will resume at this next PC.
-        if (heapAccess->isLoad()) {
-            if (!SetRegisterToCoercedUndefined(rtThread, state.uts.ts64, *heapAccess))
-                return false;
-        }
-        *ppc += heapAccess->opLength();
-    }
-
-    // Update the thread state with the new pc.
-    kret = thread_set_state(rtThread, x86_THREAD_STATE, (thread_state_t)&state, x86_THREAD_STATE_COUNT);
+    // Update the thread state with the new pc and register values.
+    kret = thread_set_state(rtThread, float_state, (thread_state_t)&context.float_, float_state_count);
+    if (kret != KERN_SUCCESS)
+        return false;
+    kret = thread_set_state(rtThread, thread_state, (thread_state_t)&context.thread, thread_state_count);
     if (kret != KERN_SUCCESS)
         return false;
 
@@ -860,6 +1075,13 @@
 static bool
 HandleFault(int signum, siginfo_t *info, void *ctx)
 {
+    // The signals we're expecting come from access violations, accessing
+    // mprotected memory. If the signal originates anywhere else, don't try
+    // to handle it.
+    MOZ_RELEASE_ASSERT(signum == SIGSEGV);
+    if (info->si_code != SEGV_ACCERR)
+        return false;
+
     CONTEXT *context = (CONTEXT *)ctx;
     uint8_t **ppc = ContextToPC(context);
     uint8_t *pc = *ppc;
@@ -881,7 +1103,7 @@
 # if defined(JS_CODEGEN_X64)
     // These checks aren't necessary, but, since we can, check anyway to make
     // sure we aren't covering up a real bug.
-    void *faultingAddress = info->si_addr;
+    uint8_t *faultingAddress = static_cast<uint8_t *>(info->si_addr);
     if (!module.maybeHeap() ||
         faultingAddress < module.maybeHeap() ||
         faultingAddress >= module.maybeHeap() + AsmJSMappedSize)
@@ -893,22 +1115,7 @@
     if (!heapAccess)
         return false;
 
-    // We now know that this is an out-of-bounds access made by an asm.js
-    // load/store that we should handle.
-
-    // SIMD out-of-bounds loads and stores just need to throw.
-    if (Scalar::isSimdType(heapAccess->type())) {
-        RedirectToOutOfBoundsLabel(ppc, module);
-        return true;
-    }
-
-    // If this is a load, assign the JS-defined result value to the destination
-    // register (ToInt32(undefined) or ToNumber(undefined), determined by the
-    // type of the destination register) and set the PC to the next op. Upon
-    // return from the handler, execution will resume at this next PC.
-    if (heapAccess->isLoad())
-        SetRegisterToCoercedUndefined(context, heapAccess->type(), heapAccess->loadedReg());
-    *ppc += heapAccess->opLength();
+    *ppc = EmulateHeapAccess(context, pc, faultingAddress, heapAccess, module);
 
     return true;
 # else
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSValidate.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSValidate.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSValidate.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSValidate.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -398,15 +398,15 @@
 {
     return pn->isKind(PNK_COLON) &&
            pn->getOp() == JSOP_INITPROP &&
-           BinaryLeft(pn)->isKind(PNK_NAME) &&
-           BinaryLeft(pn)->name() != cx->names().proto;
+           BinaryLeft(pn)->isKind(PNK_OBJECT_PROPERTY_NAME);
 }
 
 static inline PropertyName *
 ObjectNormalFieldName(ExclusiveContext *cx, ParseNode *pn)
 {
     MOZ_ASSERT(IsNormalObjectField(cx, pn));
-    return BinaryLeft(pn)->name();
+    MOZ_ASSERT(BinaryLeft(pn)->isKind(PNK_OBJECT_PROPERTY_NAME));
+    return BinaryLeft(pn)->pn_atom->asPropertyName();
 }
 
 static inline ParseNode *
@@ -1481,7 +1481,7 @@
                                            errorString_.get());
         }
         if (errorOverRecursed_)
-            js_ReportOverRecursed(cx_);
+            ReportOverRecursed(cx_);
     }
 
     bool init() {
@@ -1548,7 +1548,7 @@
         // "use strict" should be added to the source if we are in an implicit
         // strict context, see also comment above addUseStrict in
         // js::FunctionToString.
-        bool strict = parser_.pc->sc->strict && !parser_.pc->sc->hasExplicitUseStrict();
+        bool strict = parser_.pc->sc->strict() && !parser_.pc->sc->hasExplicitUseStrict();
         module_ = cx_->new_<AsmJSModule>(parser_.ss, srcStart, srcBodyStart, strict,
                                          cx_->canUseSignalHandlers());
         if (!module_)
@@ -2519,7 +2519,9 @@
         const JitCompileOptions options;
         mirGen_ = lifo_.new_<MIRGenerator>(CompileCompartment::get(cx()->compartment()),
                                            options, alloc_,
-                                           graph_, info_, optimizationInfo);
+                                           graph_, info_, optimizationInfo,
+                                           &m().onOutOfBoundsLabel(),
+                                           m().usesSignalHandlersForOOB());
 
         if (!newBlock(/* pred = */ nullptr, &curBlock_, fn_))
             return false;
@@ -2871,7 +2873,7 @@
         if (inDeadCode())
             return nullptr;
 
-        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK;
         MOZ_ASSERT(!Scalar::isSimdType(accessType), "SIMD loads should use loadSimdHeap");
         MAsmJSLoadHeap *load = MAsmJSLoadHeap::New(alloc(), accessType, ptr, needsBoundsCheck);
         curBlock_->add(load);
@@ -2884,11 +2886,10 @@
         if (inDeadCode())
             return nullptr;
 
-        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK;
         MOZ_ASSERT(Scalar::isSimdType(accessType), "loadSimdHeap can only load from a SIMD view");
-        Label *outOfBoundsLabel = &m().onOutOfBoundsLabel();
         MAsmJSLoadHeap *load = MAsmJSLoadHeap::New(alloc(), accessType, ptr, needsBoundsCheck,
-                                                   outOfBoundsLabel, numElems);
+                                                   numElems);
         curBlock_->add(load);
         return load;
     }
@@ -2898,7 +2899,7 @@
         if (inDeadCode())
             return;
 
-        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK;
         MOZ_ASSERT(!Scalar::isSimdType(accessType), "SIMD stores should use loadSimdHeap");
         MAsmJSStoreHeap *store = MAsmJSStoreHeap::New(alloc(), accessType, ptr, v, needsBoundsCheck);
         curBlock_->add(store);
@@ -2910,11 +2911,10 @@
         if (inDeadCode())
             return;
 
-        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK;
         MOZ_ASSERT(Scalar::isSimdType(accessType), "storeSimdHeap can only load from a SIMD view");
-        Label *outOfBoundsLabel = &m().onOutOfBoundsLabel();
         MAsmJSStoreHeap *store = MAsmJSStoreHeap::New(alloc(), accessType, ptr, v, needsBoundsCheck,
-                                                      outOfBoundsLabel, numElems);
+                                                      numElems);
         curBlock_->add(store);
     }
 
@@ -2931,9 +2931,8 @@
         if (inDeadCode())
             return nullptr;
 
-        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK;
         MAsmJSLoadHeap *load = MAsmJSLoadHeap::New(alloc(), accessType, ptr, needsBoundsCheck,
-                                                   /* outOfBoundsLabel = */ nullptr,
                                                    /* numElems */ 0,
                                                    MembarBeforeLoad, MembarAfterLoad);
         curBlock_->add(load);
@@ -2945,9 +2944,8 @@
         if (inDeadCode())
             return;
 
-        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK && !m().usesSignalHandlersForOOB();
+        bool needsBoundsCheck = chk == NEEDS_BOUNDS_CHECK;
         MAsmJSStoreHeap *store = MAsmJSStoreHeap::New(alloc(), accessType, ptr, v, needsBoundsCheck,
-                                                      /* outOfBoundsLabel = */ nullptr,
                                                       /* numElems = */ 0,
                                                       MembarBeforeStore, MembarAfterStore);
         curBlock_->add(store);
@@ -8183,12 +8181,14 @@
 }
 
 #if defined(JS_CODEGEN_ARM)
-// The ARM system ABI also includes d15 in the non volatile float registers.
+// The ARM system ABI also includes d15 & s31 in the non volatile float registers.
 // Also exclude lr (a.k.a. r14) as we preserve it manually)
 static const RegisterSet NonVolatileRegs =
     RegisterSet(GeneralRegisterSet(Registers::NonVolatileMask &
                                    ~(uint32_t(1) << Registers::lr)),
-                FloatRegisterSet(FloatRegisters::NonVolatileMask | (1ULL << FloatRegisters::d15)));
+                FloatRegisterSet(FloatRegisters::NonVolatileMask
+                                 | (1ULL << FloatRegisters::d15)
+                                 | (1ULL << FloatRegisters::s31)));
 #else
 static const RegisterSet NonVolatileRegs =
     RegisterSet(GeneralRegisterSet(Registers::NonVolatileMask),
@@ -8371,11 +8371,11 @@
         break;
       case RetType::Int32x4:
         // We don't have control on argv alignment, do an unaligned access.
-        masm.storeUnalignedInt32x4(ReturnSimdReg, Address(argv, 0));
+        masm.storeUnalignedInt32x4(ReturnInt32x4Reg, Address(argv, 0));
         break;
       case RetType::Float32x4:
         // We don't have control on argv alignment, do an unaligned access.
-        masm.storeUnalignedFloat32x4(ReturnSimdReg, Address(argv, 0));
+        masm.storeUnalignedFloat32x4(ReturnFloat32x4Reg, Address(argv, 0));
         break;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSValidate.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSValidate.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/asmjs/AsmJSValidate.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/asmjs/AsmJSValidate.h	2015-02-28 15:03:04.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include "jsutil.h"
 
+#include "jit/Registers.h"
 #include "js/TypeDecls.h"
 #include "vm/NativeObject.h"
 
@@ -53,13 +54,25 @@
 // The assumed page size; dynamically checked in ValidateAsmJS.
 const size_t AsmJSPageSize = 4096;
 
+// Targets define AsmJSImmediateRange to be the size of an address immediate,
+// and AsmJSCheckedImmediateRange, to be the size of an address immediate that
+// can be supported by signal-handler OOB handling.
+static_assert(jit::AsmJSCheckedImmediateRange <= jit::AsmJSImmediateRange,
+              "AsmJSImmediateRange should be the size of an unconstrained "
+              "address immediate");
+
 #ifdef JS_CPU_X64
 // On x64, 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.
-// 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 + AsmJSPageSize;
+// Then, an additional extent is added to permit folding of small 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 +
+                                      AsmJSPageSize;
+
 #endif
 
 // From the asm.js spec Linking section:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/AtomicsObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/AtomicsObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/AtomicsObject.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/AtomicsObject.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -48,10 +48,13 @@
 #include "builtin/AtomicsObject.h"
 
 #include "mozilla/Atomics.h"
+#include "mozilla/FloatingPoint.h"
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
 
+#include "prmjtime.h"
+
 #include "vm/GlobalObject.h"
 #include "vm/SharedTypedArrayObject.h"
 #include "vm/TypedArrayObject.h"
@@ -151,14 +154,7 @@
 static bool
 ReportBadArrayType(JSContext *cx)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ATOMICS_BAD_ARRAY);
-    return false;
-}
-
-static bool
-ReportNoFutexes(JSContext *cx)
-{
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ATOMICS_NOT_INSTALLED);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ATOMICS_BAD_ARRAY);
     return false;
 }
 
@@ -697,7 +693,7 @@
 //
 // The type is declared opaque in SharedArrayObject.h.  Instances of
 // js::FutexWaiter are stack-allocated and linked onto a list across a
-// call to JS::PerRuntimeFutexAPI::wait().
+// call to FutexRuntime::wait().
 //
 // The 'waiters' field of the SharedArrayRawBuffer points to the highest
 // priority waiter in the list, and lower priority nodes are linked through
@@ -709,30 +705,39 @@
 class FutexWaiter
 {
   public:
-    FutexWaiter(uint32_t offset, JS::PerRuntimeFutexAPI *fx)
+    FutexWaiter(uint32_t offset, JSRuntime *rt)
       : offset(offset),
-        fx(fx),
+        rt(rt),
         lower_pri(nullptr),
         back(nullptr)
     {
     }
 
-    bool        waiting;                // Set to true when the worker is on the list and not woken
     uint32_t    offset;                 // int32 element index within the SharedArrayBuffer
-    JS::PerRuntimeFutexAPI *fx;         // ...
+    JSRuntime   *rt;                    // The runtime of the waiter
     FutexWaiter *lower_pri;             // Lower priority nodes in circular doubly-linked list of waiters
     FutexWaiter *back;                  // Other direction
 };
 
 class AutoLockFutexAPI
 {
-    JS::PerRuntimeFutexAPI * const fx;
   public:
-    explicit AutoLockFutexAPI(JS::PerRuntimeFutexAPI *fx) : fx(fx) {
-        fx->lock();
+    AutoLockFutexAPI() {
+        FutexRuntime::lock();
     }
     ~AutoLockFutexAPI() {
-        fx->unlock();
+        FutexRuntime::unlock();
+    }
+};
+
+class AutoUnlockFutexAPI
+{
+  public:
+    AutoUnlockFutexAPI() {
+        FutexRuntime::unlock();
+    }
+    ~AutoUnlockFutexAPI() {
+        FutexRuntime::lock();
     }
 };
 
@@ -748,9 +753,7 @@
     HandleValue timeoutv = args.get(3);
     MutableHandleValue r = args.rval();
 
-    JS::PerRuntimeFutexAPI* fx = cx->runtime()->futexAPI_;
-    if (!fx)
-        return ReportNoFutexes(cx);
+    JSRuntime* rt = cx->runtime();
 
     Rooted<SharedTypedArrayObject *> view(cx, nullptr);
     if (!GetSharedTypedArray(cx, objv, &view))
@@ -764,11 +767,17 @@
     int32_t value;
     if (!ToInt32(cx, valv, &value))
         return false;
-    double timeout;
-    if (!ToInteger(cx, timeoutv, &timeout))
-        return false;
-    if (timeout < 0)
-        timeout = 0;
+    double timeout_ms;
+    if (timeoutv.isUndefined()) {
+        timeout_ms = mozilla::PositiveInfinity<double>();
+    } else {
+        if (!ToNumber(cx, timeoutv, &timeout_ms))
+            return false;
+        if (mozilla::IsNaN(timeout_ms))
+            timeout_ms = mozilla::PositiveInfinity<double>();
+        else if (timeout_ms < 0)
+            timeout_ms = 0;
+    }
 
     if (!inRange) {
         atomics_fullMemoryBarrier();
@@ -778,7 +787,7 @@
 
     // This lock also protects the "waiters" field on SharedArrayRawBuffer,
     // and it provides the necessary memory fence.
-    AutoLockFutexAPI lock(fx);
+    AutoLockFutexAPI lock;
 
     int32_t* addr = (int32_t*)view->viewData() + offset;
     if (*addr != value) {
@@ -789,8 +798,7 @@
     Rooted<SharedArrayBufferObject *> sab(cx, &view->buffer()->as<SharedArrayBufferObject>());
     SharedArrayRawBuffer *sarb = sab->rawBufferObject();
 
-    FutexWaiter w(offset, fx);
-    w.waiting = true;
+    FutexWaiter w(offset, rt);
     if (FutexWaiter *waiters = sarb->waiters()) {
         w.lower_pri = waiters;
         w.back = waiters->back;
@@ -801,33 +809,10 @@
         sarb->setWaiters(&w);
     }
 
-    bool retval = true;
-    switch (fx->wait(timeout)) {
-      case JS::PerRuntimeFutexAPI::Woken:
-        r.setInt32(AtomicsObject::FutexOK);
-        break;
-      case JS::PerRuntimeFutexAPI::Timedout:
-        r.setInt32(AtomicsObject::FutexTimedout);
-        break;
-      case JS::PerRuntimeFutexAPI::ErrorException:
-        MOZ_ASSERT(JS_IsExceptionPending(cx));
-        retval = false;
-        break;
-      case JS::PerRuntimeFutexAPI::InterruptForTerminate:
-        JS_ClearPendingException(cx);
-        retval = false;
-        break;
-      case JS::PerRuntimeFutexAPI::WaitingNotAllowed:
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ATOMICS_WAIT_NOT_ALLOWED);
-        retval = false;
-        break;
-      case JS::PerRuntimeFutexAPI::ErrorTooLong:
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ATOMICS_TOO_LONG);
-        retval = false;
-        break;
-      default:
-        MOZ_CRASH();
-    }
+    AtomicsObject::FutexWaitResult result = AtomicsObject::FutexOK;
+    bool retval = rt->fx.wait(cx, timeout_ms, &result);
+    if (retval)
+        r.setInt32(result);
 
     if (w.lower_pri == &w) {
         sarb->setWaiters(nullptr);
@@ -869,11 +854,7 @@
     if (count < 0)
         count = 0;
 
-    JS::PerRuntimeFutexAPI* fx = cx->runtime()->futexAPI_;
-    if (!fx)
-        return ReportNoFutexes(cx);
-
-    AutoLockFutexAPI lock(fx);
+    AutoLockFutexAPI lock;
 
     Rooted<SharedArrayBufferObject *> sab(cx, &view->buffer()->as<SharedArrayBufferObject>());
     SharedArrayRawBuffer *sarb = sab->rawBufferObject();
@@ -885,10 +866,9 @@
         do {
             FutexWaiter *c = iter;
             iter = iter->lower_pri;
-            if (c->offset != offset || !c->waiting)
+            if (c->offset != offset || !c->rt->fx.isWaiting())
                 continue;
-            c->fx->wake();
-            c->waiting = false;
+            c->rt->fx.wake(FutexRuntime::WakeExplicit);
             ++woken;
             --count;
         } while (count > 0 && iter != waiters);
@@ -936,11 +916,7 @@
         return true;
     }
 
-    JS::PerRuntimeFutexAPI* fx = cx->runtime()->futexAPI_;
-    if (!fx)
-        return ReportNoFutexes(cx);
-
-    AutoLockFutexAPI lock(fx);
+    AutoLockFutexAPI lock;
 
     int32_t* addr = (int32_t*)view->viewData() + offset1;
     if (*addr != value) {
@@ -980,11 +956,10 @@
     while (iter != &whead) {
         FutexWaiter *c = iter;
         iter = iter->lower_pri;
-        if (!c->waiting || c->offset != offset1)
+        if (c->offset != offset1 || !c->rt->fx.isWaiting())
             continue;
         if (count > 0) {
-            c->fx->wake();
-            c->waiting = false;
+            c->rt->fx.wake(FutexRuntime::WakeExplicit);
             ++woken;
             --count;
         } else {
@@ -1024,6 +999,218 @@
     return true;
 }
 
+/* static */ bool
+js::FutexRuntime::initialize()
+{
+    MOZ_ASSERT(!lock_);
+    lock_ = PR_NewLock();
+    return lock_ != nullptr;
+}
+
+/* static */ void
+js::FutexRuntime::destroy()
+{
+    if (lock_) {
+        PR_DestroyLock(lock_);
+        lock_ = nullptr;
+    }
+}
+
+/* static */ void
+js::FutexRuntime::lock()
+{
+    PR_Lock(lock_);
+#ifdef DEBUG
+    MOZ_ASSERT(!lockHolder_);
+    lockHolder_ = PR_GetCurrentThread();
+#endif
+}
+
+/* static */ mozilla::Atomic<PRLock*> FutexRuntime::lock_;
+
+#ifdef DEBUG
+/* static */ mozilla::Atomic<PRThread*> FutexRuntime::lockHolder_;
+#endif
+
+/* static */ void
+js::FutexRuntime::unlock()
+{
+#ifdef DEBUG
+    MOZ_ASSERT(lockHolder_ == PR_GetCurrentThread());
+    lockHolder_ = nullptr;
+#endif
+    PR_Unlock(lock_);
+}
+
+js::FutexRuntime::FutexRuntime()
+  : cond_(nullptr),
+    state_(Idle)
+{
+}
+
+bool
+js::FutexRuntime::initInstance()
+{
+    MOZ_ASSERT(lock_);
+    cond_ = PR_NewCondVar(lock_);
+    return cond_ != nullptr;
+}
+
+void
+js::FutexRuntime::destroyInstance()
+{
+    if (cond_)
+        PR_DestroyCondVar(cond_);
+}
+
+bool
+js::FutexRuntime::isWaiting()
+{
+    return state_ == Waiting || state_ == WaitingInterrupted;
+}
+
+bool
+js::FutexRuntime::wait(JSContext *cx, double timeout_ms, AtomicsObject::FutexWaitResult *result)
+{
+    MOZ_ASSERT(&cx->runtime()->fx == this);
+    MOZ_ASSERT(lockHolder_ == PR_GetCurrentThread());
+    MOZ_ASSERT(state_ == Idle || state_ == WaitingInterrupted);
+
+    // Disallow waiting when a runtime is processing an interrupt.
+    // See explanation below.
+
+    if (state_ == WaitingInterrupted) {
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ATOMICS_WAIT_NOT_ALLOWED);
+        return false;
+    }
+
+    const bool timed = !mozilla::IsInfinite(timeout_ms);
+
+    // Reject the timeout if it is not exactly representable.  2e50 ms = 2e53 us = 6e39 years.
+
+    if (timed && timeout_ms > 2e50) {
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ATOMICS_TOO_LONG);
+        return false;
+    }
+
+    // Times and intervals are in microseconds.
+
+    const uint64_t finalEnd = timed ? PRMJ_Now() + (uint64_t)ceil(timeout_ms * 1000.0) : 0;
+
+    // 4000s is about the longest timeout slice that is guaranteed to
+    // work cross-platform.
+
+    const uint64_t maxSlice = 4000000000LLU;
+    bool retval = true;
+
+    for (;;) {
+        uint64_t sliceStart = 0;
+        uint32_t timeout = PR_INTERVAL_NO_TIMEOUT;
+        if (timed) {
+            sliceStart = PRMJ_Now();
+            uint64_t timeLeft = finalEnd > sliceStart ? finalEnd - sliceStart : 0;
+            timeout = PR_MicrosecondsToInterval((uint32_t)Min(timeLeft, maxSlice));
+        }
+        state_ = Waiting;
+#ifdef DEBUG
+        PRThread* holder = lockHolder_;
+        lockHolder_ = nullptr;
+#endif
+        JS_ALWAYS_TRUE(PR_WaitCondVar(cond_, timeout) == PR_SUCCESS);
+#ifdef DEBUG
+        lockHolder_ = holder;
+#endif
+        switch (state_) {
+          case FutexRuntime::Waiting:
+            // Timeout or spurious wakeup.
+            if (timed) {
+                uint64_t now = PRMJ_Now();
+                if (now >= finalEnd) {
+                    *result = AtomicsObject::FutexTimedout;
+                    goto finished;
+                }
+            }
+            break;
+
+          case FutexRuntime::Woken:
+            *result = AtomicsObject::FutexOK;
+            goto finished;
+
+          case FutexRuntime::WokenForJSInterrupt:
+            // The interrupt handler may reenter the engine.  In that case
+            // there are two complications:
+            //
+            // - The waiting thread is not actually waiting on the
+            //   condition variable so we have to record that it
+            //   should be woken when the interrupt handler returns.
+            //   To that end, we flag the thread as interrupted around
+            //   the interrupt and check state_ when the interrupt
+            //   handler returns.  A futexWake() call that reaches the
+            //   runtime during the interrupt sets state_ to woken.
+            //
+            // - It is in principle possible for futexWait() to be
+            //   reentered on the same thread/runtime and waiting on the
+            //   same location and to yet again be interrupted and enter
+            //   the interrupt handler.  In this case, it is important
+            //   that when another agent wakes waiters, all waiters using
+            //   the same runtime on the same location are woken in LIFO
+            //   order; FIFO may be the required order, but FIFO would
+            //   fail to wake up the innermost call.  Interrupts are
+            //   outside any spec anyway.  Also, several such suspended
+            //   waiters may be woken at a time.
+            //
+            //   For the time being we disallow waiting from within code
+            //   that runs from within an interrupt handler; this may
+            //   occasionally (very rarely) be surprising but is
+            //   expedient.  Other solutions exist, see bug #1131943.  The
+            //   code that performs the check is above, at the head of
+            //   this function.
+
+            state_ = WaitingInterrupted;
+            {
+                AutoUnlockFutexAPI unlock;
+                retval = cx->runtime()->handleInterrupt(cx);
+            }
+            if (!retval)
+                goto finished;
+            if (state_ == Woken) {
+                *result = AtomicsObject::FutexOK;
+                goto finished;
+            }
+            break;
+
+          default:
+            MOZ_CRASH();
+        }
+    }
+finished:
+    state_ = Idle;
+    return retval;
+}
+
+void
+js::FutexRuntime::wake(WakeReason reason)
+{
+    MOZ_ASSERT(lockHolder_ == PR_GetCurrentThread());
+    MOZ_ASSERT(isWaiting());
+
+    if (state_ == WaitingInterrupted && reason == WakeExplicit) {
+        state_ = Woken;
+        return;
+    }
+    switch (reason) {
+      case WakeExplicit:
+        state_ = Woken;
+        break;
+      case WakeForJSInterrupt:
+        state_ = WokenForJSInterrupt;
+        break;
+      default:
+        MOZ_CRASH();
+    }
+    PR_NotifyCondVar(cond_);
+}
+
 const JSFunctionSpec AtomicsMethods[] = {
     JS_FN("compareExchange",    atomics_compareExchange,    4,0),
     JS_FN("load",               atomics_load,               2,0),
@@ -1075,7 +1262,7 @@
 }
 
 JSObject *
-js_InitAtomicsClass(JSContext *cx, HandleObject obj)
+js::InitAtomicsClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->is<GlobalObject>());
     Rooted<GlobalObject *> global(cx, &obj->as<GlobalObject>());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/AtomicsObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/AtomicsObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/AtomicsObject.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/AtomicsObject.h	2015-02-28 15:03:04.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef builtin_AtomicsObject_h
 #define builtin_AtomicsObject_h
 
+#include "jslock.h"
 #include "jsobj.h"
 
 namespace js {
@@ -18,15 +19,14 @@
     static JSObject* initClass(JSContext *cx, Handle<GlobalObject *> global);
     static bool toString(JSContext *cx, unsigned int argc, jsval *vp);
 
-    static const int FutexOK = 0;
-
+    // Defined return values for futexWait.
     // The error values must be negative because APIs such as futexWaitOrRequeue
     // return a value that is either the number of tasks woken or an error code.
-    static const int FutexNotequal = -1;
-    static const int FutexTimedout = -2;
-
-    // Internal signals; negative for the same reason.
-    static const int FutexInterrupted = -1000;
+    enum FutexWaitResult : int32_t {
+        FutexOK = 0,
+        FutexNotequal = -1,
+        FutexTimedout = -2
+    };
 };
 
 void atomics_fullMemoryBarrier();
@@ -44,9 +44,88 @@
 bool atomics_futexWake(JSContext *cx, unsigned argc, Value *vp);
 bool atomics_futexWakeOrRequeue(JSContext *cx, unsigned argc, Value *vp);
 
-}  /* namespace js */
+class FutexRuntime
+{
+public:
+    static bool initialize();
+    static void destroy();
+
+    static void lock();
+    static void unlock();
+
+    FutexRuntime();
+    bool initInstance();
+    void destroyInstance();
+
+    // Parameters to wake().
+    enum WakeReason {
+        WakeExplicit,           // Being asked to wake up by another thread
+        WakeForJSInterrupt      // Interrupt requested
+    };
+
+    // Block the calling thread and wait.
+    //
+    // The futex lock must be held around this call.
+    //
+    // The timeout is the number of milliseconds, with fractional
+    // times allowed; specify positive infinity for an indefinite wait.
+    //
+    // wait() will not wake up spuriously.  It will return true and
+    // set *result to a return code appropriate for
+    // Atomics.futexWait() on success, and return false on error.
+    bool wait(JSContext *cx, double timeout, AtomicsObject::FutexWaitResult *result);
+
+    // Wake the thread represented by this Runtime.
+    //
+    // The futex lock must be held around this call.  (The sleeping
+    // thread will not wake up until the caller of futexWake()
+    // releases the lock.)
+    //
+    // If the thread is not waiting then this method does nothing.
+    //
+    // If the thread is waiting in a call to futexWait() and the
+    // reason is WakeExplicit then the futexWait() call will return
+    // with Woken.
+    //
+    // If the thread is waiting in a call to futexWait() and the
+    // reason is WakeForJSInterrupt then the futexWait() will return
+    // with WokenForJSInterrupt; in the latter case the caller of
+    // futexWait() must handle the interrupt.
+    void wake(WakeReason reason);
+
+    bool isWaiting();
+
+  private:
+    enum FutexState {
+        Idle,                   // We are not waiting or woken
+        Waiting,                // We are waiting, nothing has happened yet
+        WaitingInterrupted,     // We are waiting, but have been interrupted
+        Woken,                  // Woken by a script call to futexWake
+        WokenForJSInterrupt     // Woken by an interrupt handler
+    };
+
+    // Condition variable that this runtime will wait on.
+    PRCondVar *cond_;
+
+    // Current futex state for this runtime.  When not in a wait this
+    // is Idle; when in a wait it is Waiting or the reason the futex
+    // is about to wake up.
+    FutexState state_;
+
+    // Shared futex lock for all runtimes.  We can perhaps do better,
+    // but any lock will need to be per-domain (consider SharedWorker)
+    // or coarser.
+    static mozilla::Atomic<PRLock*> lock_;
+
+#ifdef DEBUG
+    // Null or the thread holding the lock.
+    static mozilla::Atomic<PRThread*> lockHolder_;
+#endif
+};
 
 JSObject *
-js_InitAtomicsClass(JSContext *cx, js::HandleObject obj);
+InitAtomicsClass(JSContext *cx, HandleObject obj);
+
+}  /* namespace js */
 
 #endif /* builtin_AtomicsObject_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Eval.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Eval.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Eval.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Eval.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -234,7 +234,7 @@
 
     Rooted<GlobalObject*> scopeObjGlobal(cx, &scopeobj->global());
     if (!GlobalObject::isRuntimeCodeGenEnabled(cx, scopeObjGlobal)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CSP_BLOCKED_EVAL);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CSP_BLOCKED_EVAL);
         return false;
     }
 
@@ -358,7 +358,7 @@
 
     Rooted<GlobalObject*> scopeObjGlobal(cx, &scopeobj->global());
     if (!GlobalObject::isRuntimeCodeGenEnabled(cx, scopeObjGlobal)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CSP_BLOCKED_EVAL);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CSP_BLOCKED_EVAL);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Intl.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Intl.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Intl.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Intl.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -769,14 +769,14 @@
     UErrorCode status = U_ZERO_ERROR;
     UEnumeration *values = ucol_getKeywordValuesForLocale("co", locale.ptr(), false, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
     ScopedICUObject<UEnumeration> toClose(values, uenum_close);
 
     uint32_t count = uenum_count(values, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
 
@@ -788,7 +788,7 @@
     for (uint32_t i = 0; i < count; i++) {
         const char *collation = uenum_next(values, nullptr, &status);
         if (U_FAILURE(status)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
             return false;
         }
 
@@ -938,7 +938,7 @@
     UErrorCode status = U_ZERO_ERROR;
     UCollator *coll = ucol_open(icuLocale(locale.ptr()), &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return nullptr;
     }
 
@@ -950,7 +950,7 @@
     ucol_setAttribute(coll, UCOL_CASE_FIRST, uCaseFirst, &status);
     if (U_FAILURE(status)) {
         ucol_close(coll);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return nullptr;
     }
 
@@ -1266,7 +1266,7 @@
     UErrorCode status = U_ZERO_ERROR;
     NumberingSystem *numbers = NumberingSystem::createInstance(ulocale, status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
     const char *name = numbers->getName();
@@ -1397,7 +1397,7 @@
     UErrorCode status = U_ZERO_ERROR;
     UNumberFormat *nf = unum_open(uStyle, nullptr, 0, icuLocale(locale.ptr()), nullptr, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return nullptr;
     }
     ScopedICUObject<UNumberFormat> toClose(nf, unum_close);
@@ -1405,7 +1405,7 @@
     if (uCurrency) {
         unum_setTextAttribute(nf, UNUM_CURRENCY_CODE, uCurrency, 3, &status);
         if (U_FAILURE(status)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
             return nullptr;
         }
     }
@@ -1444,7 +1444,7 @@
         unum_formatDouble(nf, x, Char16ToUChar(chars.begin()), size, nullptr, &status);
     }
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
 
@@ -1743,7 +1743,7 @@
     UCalendar *cal = ucal_open(nullptr, 0, locale.ptr(), UCAL_DEFAULT, &status);
     const char *calendar = ucal_getType(cal, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
     ucal_close(cal);
@@ -1757,21 +1757,21 @@
     // Now get the calendars that "would make a difference", i.e., not the default.
     UEnumeration *values = ucal_getKeywordValuesForLocale("ca", locale.ptr(), false, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
     ScopedICUObject<UEnumeration> toClose(values, uenum_close);
 
     uint32_t count = uenum_count(values, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
 
     for (; count > 0; count--) {
         calendar = uenum_next(values, nullptr, &status);
         if (U_FAILURE(status)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
             return false;
         }
 
@@ -1813,7 +1813,7 @@
     UErrorCode status = U_ZERO_ERROR;
     UDateTimePatternGenerator *gen = udatpg_open(icuLocale(locale.ptr()), &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
     ScopedICUObject<UDateTimePatternGenerator> toClose(gen, udatpg_close);
@@ -1821,7 +1821,7 @@
     int32_t size = udatpg_getBestPattern(gen, Char16ToUChar(skeletonChars.start().get()),
                                          skeletonLen, nullptr, 0, &status);
     if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
     ScopedJSFreePtr<UChar> pattern(cx->pod_malloc<UChar>(size + 1));
@@ -1832,7 +1832,7 @@
     udatpg_getBestPattern(gen, Char16ToUChar(skeletonChars.start().get()),
                           skeletonLen, pattern, size, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
 
@@ -1912,7 +1912,7 @@
         udat_open(UDAT_PATTERN, UDAT_PATTERN, icuLocale(locale.ptr()), uTimeZone, uTimeZoneLength,
                   uPattern, uPatternLength, &status);
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return nullptr;
     }
 
@@ -1930,7 +1930,7 @@
 intl_FormatDateTime(JSContext *cx, UDateFormat *df, double x, MutableHandleValue result)
 {
     if (!IsFinite(x)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DATE_NOT_FINITE);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DATE_NOT_FINITE);
         return false;
     }
 
@@ -1947,7 +1947,7 @@
         udat_format(df, x, Char16ToUChar(chars.begin()), size, nullptr, &status);
     }
     if (U_FAILURE(status)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INTERNAL_INTL_ERROR);
         return false;
     }
 
@@ -2032,7 +2032,7 @@
  * Spec: ECMAScript Internationalization API Specification, 8.0, 8.1
  */
 JSObject *
-js_InitIntlClass(JSContext *cx, HandleObject obj)
+js::InitIntlClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->is<GlobalObject>());
     Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Intl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Intl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Intl.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Intl.h	2015-02-28 15:03:04.000000000 +0000
@@ -15,14 +15,14 @@
  * ECMAScript Internationalization API Specification.
  */
 
+namespace js {
+
 /**
  * Initializes the Intl Object and its standard built-in properties.
  * Spec: ECMAScript Internationalization API Specification, 8.0, 8.1
  */
 extern JSObject *
-js_InitIntlClass(JSContext *cx, js::HandleObject obj);
-
-namespace js {
+InitIntlClass(JSContext *cx, HandleObject obj);
 
 /*
  * The following functions are for use by self-hosted code.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Intl.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Intl.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Intl.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Intl.js	2015-02-28 15:03:04.000000000 +0000
@@ -52,6 +52,19 @@
     return result;
 }
 
+/**
+ * Holder object for encapsulating regexp instances.
+ *
+ * Regular expression instances should be created after the initialization of
+ * self-hosted global.
+ */
+var internalIntlRegExps = std_Object_create(null);
+internalIntlRegExps.unicodeLocaleExtensionSequenceRE = null;
+internalIntlRegExps.languageTagRE = null;
+internalIntlRegExps.duplicateVariantRE = null;
+internalIntlRegExps.duplicateSingletonRE = null;
+internalIntlRegExps.isWellFormedCurrencyCodeRE = null;
+internalIntlRegExps.currencyDigitsRE = null;
 
 /**
  * Regular expression matching a "Unicode locale extension sequence", which the
@@ -65,8 +78,11 @@
  *
  * Spec: ECMAScript Internationalization API Specification, 6.2.1.
  */
-var unicodeLocaleExtensionSequence = "-u(-[a-z0-9]{2,8})+";
-var unicodeLocaleExtensionSequenceRE = new RegExp(unicodeLocaleExtensionSequence);
+function getUnicodeLocaleExtensionSequenceRE() {
+    return internalIntlRegExps.unicodeLocaleExtensionSequenceRE ||
+           (internalIntlRegExps.unicodeLocaleExtensionSequenceRE =
+            regexp_construct_no_statics("-u(-[a-z0-9]{2,8})+"));
+}
 
 
 /**
@@ -76,6 +92,7 @@
     // Don't use std_String_replace directly with a regular expression,
     // as that would set RegExp statics.
     var extensions;
+    var unicodeLocaleExtensionSequenceRE = getUnicodeLocaleExtensionSequenceRE();
     while ((extensions = regexp_exec_no_statics(unicodeLocaleExtensionSequenceRE, locale)) !== null) {
         locale = callFunction(std_String_replace, locale, extensions[0], "");
         unicodeLocaleExtensionSequenceRE.lastIndex = 0;
@@ -89,7 +106,10 @@
  *
  * Spec: RFC 5646 section 2.1.
  */
-var languageTagRE = (function () {
+function getLanguageTagRE() {
+    if (internalIntlRegExps.languageTagRE)
+        return internalIntlRegExps.languageTagRE;
+
     // RFC 5234 section B.1
     // ALPHA          =  %x41-5A / %x61-7A   ; A-Z / a-z
     var ALPHA = "[a-zA-Z]";
@@ -172,11 +192,15 @@
     var languageTag = "^(?:" + langtag + "|" + privateuse + "|" + grandfathered + ")$";
 
     // Language tags are case insensitive (RFC 5646 section 2.1.1).
-    return new RegExp(languageTag, "i");
-}());
+    return (internalIntlRegExps.languageTagRE =
+            regexp_construct_no_statics(languageTag, "i"));
+}
 
 
-var duplicateVariantRE = (function () {
+function getDuplicateVariantRE() {
+    if (internalIntlRegExps.duplicateVariantRE)
+        return internalIntlRegExps.duplicateVariantRE;
+
     // RFC 5234 section B.1
     // ALPHA          =  %x41-5A / %x61-7A   ; A-Z / a-z
     var ALPHA = "[a-zA-Z]";
@@ -211,11 +235,15 @@
     // Language tags are case insensitive (RFC 5646 section 2.1.1), but for
     // this regular expression that's covered by having its character classes
     // list both upper- and lower-case characters.
-    return new RegExp(duplicateVariant);
-}());
+    return (internalIntlRegExps.duplicateVariantRE =
+            regexp_construct_no_statics(duplicateVariant));
+}
+
 
+function getDuplicateSingletonRE() {
+    if (internalIntlRegExps.duplicateSingletonRE)
+        return internalIntlRegExps.duplicateSingletonRE;
 
-var duplicateSingletonRE = (function () {
     // RFC 5234 section B.1
     // ALPHA          =  %x41-5A / %x61-7A   ; A-Z / a-z
     var ALPHA = "[a-zA-Z]";
@@ -249,8 +277,9 @@
     // Language tags are case insensitive (RFC 5646 section 2.1.1), but for
     // this regular expression that's covered by having its character classes
     // list both upper- and lower-case characters.
-    return new RegExp(duplicateSingleton);
-}());
+    return (internalIntlRegExps.duplicateSingletonRE =
+            regexp_construct_no_statics(duplicateSingleton));
+}
 
 
 /**
@@ -261,6 +290,7 @@
  */
 function IsStructurallyValidLanguageTag(locale) {
     assert(typeof locale === "string", "IsStructurallyValidLanguageTag");
+    var languageTagRE = getLanguageTagRE();
     if (!regexp_test_no_statics(languageTagRE, locale))
         return false;
 
@@ -274,6 +304,8 @@
         locale = callFunction(std_String_substring, locale, 0, pos);
 
     // Check for duplicate variant or singleton subtags.
+    var duplicateVariantRE = getDuplicateVariantRE();
+    var duplicateSingletonRE = getDuplicateSingletonRE();
     return !regexp_test_no_statics(duplicateVariantRE, locale) &&
            !regexp_test_no_statics(duplicateSingletonRE, locale);
 }
@@ -452,12 +484,17 @@
  *
  * Spec: ECMAScript Internationalization API Specification, 6.3.1.
  */
+function getIsWellFormedCurrencyCodeRE() {
+    return internalIntlRegExps.isWellFormedCurrencyCodeRE ||
+           (internalIntlRegExps.isWellFormedCurrencyCodeRE =
+            regexp_construct_no_statics("[^A-Z]"));
+}
 function IsWellFormedCurrencyCode(currency) {
     var c = ToString(currency);
     var normalized = toASCIIUpperCase(c);
     if (normalized.length !== 3)
         return false;
-    return !regexp_test_no_statics(/[^A-Z]/, normalized);
+    return !regexp_test_no_statics(getIsWellFormedCurrencyCodeRE(), normalized);
 }
 
 
@@ -571,6 +608,7 @@
     if (availableLocale !== undefined) {
         result.locale = availableLocale;
         if (locale !== noExtensionsLocale) {
+            var unicodeLocaleExtensionSequenceRE = getUnicodeLocaleExtensionSequenceRE();
             var extensionMatch = regexp_exec_no_statics(unicodeLocaleExtensionSequenceRE, locale);
             var extension = extensionMatch[0];
             var extensionIndex = extensionMatch.index;
@@ -1731,9 +1769,14 @@
  *
  * Spec: ECMAScript Internationalization API Specification, 11.1.1.
  */
+function getCurrencyDigitsRE() {
+    return internalIntlRegExps.currencyDigitsRE ||
+           (internalIntlRegExps.currencyDigitsRE =
+            regexp_construct_no_statics("^[A-Z]{3}$"));
+}
 function CurrencyDigits(currency) {
     assert(typeof currency === "string", "CurrencyDigits");
-    assert(regexp_test_no_statics(/^[A-Z]{3}$/, currency), "CurrencyDigits");
+    assert(regexp_test_no_statics(getCurrencyDigitsRE(), currency), "CurrencyDigits");
 
     if (callFunction(std_Object_hasOwnProperty, currencyDigits, currency))
         return currencyDigits[currency];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/MapObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/MapObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/MapObject.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/MapObject.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -1189,7 +1189,7 @@
 
     RelocatableValue rval(v);
     if (!map->put(key, rval)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     WriteBarrierPost(cx->runtime(), map, key.get());
@@ -1206,7 +1206,7 @@
     ValueMap *map = cx->new_<ValueMap>(cx->runtime());
     if (!map || !map->init()) {
         js_delete(map);
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
@@ -1261,7 +1261,7 @@
             if (done)
                 break;
             if (!pairVal.isObject()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_INVALID_MAP_ITERABLE, "Map");
                 return false;
             }
@@ -1284,7 +1284,7 @@
 
                 RelocatableValue rval(val);
                 if (!map->put(hkey, rval)) {
-                    js_ReportOutOfMemory(cx);
+                    ReportOutOfMemory(cx);
                     return false;
                 }
                 WriteBarrierPost(cx->runtime(), map, key);
@@ -1441,7 +1441,7 @@
     ARG0_KEY(cx, args, key);
     RelocatableValue rval(args.get(1));
     if (!map.put(key, rval)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     WriteBarrierPost(cx->runtime(), &map, key.get());
@@ -1474,7 +1474,7 @@
     ARG0_KEY(cx, args, key);
     bool found;
     if (!map.remove(key, &found)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     args.rval().setBoolean(found);
@@ -1565,14 +1565,14 @@
     MOZ_ASSERT(MapObject::is(obj));
     ValueMap &map = extract(obj);
     if (!map.clear()) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     return true;
 }
 
 JSObject *
-js_InitMapClass(JSContext *cx, HandleObject obj)
+js::InitMapClass(JSContext *cx, HandleObject obj)
 {
     return MapObject::initClass(cx, obj);
 }
@@ -1828,7 +1828,7 @@
         return false;
 
     if (!set->put(key)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     WriteBarrierPost(cx->runtime(), set, key.get());
@@ -1845,7 +1845,7 @@
     ValueSet *set = cx->new_<ValueSet>(cx->runtime());
     if (!set || !set->init()) {
         js_delete(set);
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
     obj->setPrivate(set);
@@ -1913,7 +1913,7 @@
                 if (!key.setValue(cx, keyVal))
                     return false;
                 if (!set->put(key)) {
-                    js_ReportOutOfMemory(cx);
+                    ReportOutOfMemory(cx);
                     return false;
                 }
                 WriteBarrierPost(cx->runtime(), set, keyVal);
@@ -1994,7 +1994,7 @@
     ValueSet &set = extract(args);
     ARG0_KEY(cx, args, key);
     if (!set.put(key)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     WriteBarrierPost(cx->runtime(), &set, key.get());
@@ -2018,7 +2018,7 @@
     ARG0_KEY(cx, args, key);
     bool found;
     if (!set.remove(key, &found)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     args.rval().setBoolean(found);
@@ -2075,7 +2075,7 @@
 {
     Rooted<SetObject*> setobj(cx, &args.thisv().toObject().as<SetObject>());
     if (!setobj->getData()->clear()) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     args.rval().setUndefined();
@@ -2090,7 +2090,7 @@
 }
 
 JSObject *
-js_InitSetClass(JSContext *cx, HandleObject obj)
+js::InitSetClass(JSContext *cx, HandleObject obj)
 {
     return SetObject::initClass(cx, obj);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/MapObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/MapObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/MapObject.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/MapObject.h	2015-02-28 15:03:04.000000000 +0000
@@ -180,12 +180,12 @@
 extern bool
 InitSelfHostingCollectionIteratorFunctions(JSContext *cx, js::HandleObject obj);
 
-} /* namespace js */
-
 extern JSObject *
-js_InitMapClass(JSContext *cx, js::HandleObject obj);
+InitMapClass(JSContext *cx, HandleObject obj);
 
 extern JSObject *
-js_InitSetClass(JSContext *cx, js::HandleObject obj);
+InitSetClass(JSContext *cx, HandleObject obj);
+
+} /* namespace js */
 
 #endif /* builtin_MapObject_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Object.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Object.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Object.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Object.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -235,7 +235,7 @@
                 ? !IsIdentifier(JSID_TO_ATOM(id))
                 : JSID_TO_INT(id) < 0)
             {
-                idstr = js_QuoteString(cx, idstr, char16_t('\''));
+                idstr = QuoteString(cx, idstr, char16_t('\''));
                 if (!idstr)
                     return nullptr;
             }
@@ -419,21 +419,21 @@
         return false;
 
     if (args.length() < 2) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "Object.setPrototypeOf", "1", "");
         return false;
     }
 
     /* Step 1-2. */
     if (args[0].isNullOrUndefined()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
                              args[0].isNull() ? "null" : "undefined", "object");
         return false;
     }
 
     /* Step 3. */
     if (!args[1].isObjectOrNull()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
                              "Object.setPrototypeOf", "an object or null", InformalValueTypeName(args[1]));
         return false;
     }
@@ -458,7 +458,7 @@
                                                                         args[0], NullPtr()));
         if (!bytes)
             return false;
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
                              bytes.get());
         return false;
     }
@@ -505,7 +505,7 @@
         return false;
 
     if (args.length() <= 1) {
-        js_ReportMissingArg(cx, args.calleev(), 1);
+        ReportMissingArg(cx, args.calleev(), 1);
         return false;
     }
 
@@ -659,13 +659,15 @@
     return ObjectCreateImpl(cx, proto, GenericObject, group);
 }
 
-/* ES5 15.2.3.5: Object.create(O [, Properties]) */
+// ES6 draft rev34 (2015/02/20) 19.1.2.2 Object.create(O [, Properties])
 bool
 js::obj_create(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
+
+    // Step 1.
     if (args.length() == 0) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "Object.create", "0", "s");
         return false;
     }
@@ -675,30 +677,27 @@
         char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NullPtr());
         if (!bytes)
             return false;
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              bytes, "not an object or null");
         js_free(bytes);
         return false;
     }
 
+    // Step 2.
     RootedObject proto(cx, args[0].toObjectOrNull());
     RootedPlainObject obj(cx, ObjectCreateImpl(cx, proto));
     if (!obj)
         return false;
 
-    /* 15.2.3.5 step 4. */
+    // Step 3.
     if (args.hasDefined(1)) {
-        if (args[1].isPrimitive()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
-            return false;
-        }
-
-        RootedObject props(cx, &args[1].toObject());
-        if (!DefineProperties(cx, obj, props))
+        RootedValue val(cx, args[1]);
+        RootedObject props(cx, ToObject(cx, val));
+        if (!props || !DefineProperties(cx, obj, props))
             return false;
     }
 
-    /* 5. Return obj. */
+    // Step 4.
     args.rval().setObject(*obj);
     return true;
 }
@@ -856,7 +855,7 @@
 
     /* Step 2. */
     if (args.length() < 2) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "Object.defineProperties", "0", "s");
         return false;
     }
@@ -908,7 +907,7 @@
 
     // Step 4.
     if (!status) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
         return false;
     }
 
@@ -1051,7 +1050,7 @@
         return false;
 
     if (!success) {
-        js_ReportValueError(cx, JSMSG_SETPROTOTYPEOF_FAIL, JSDVG_IGNORE_STACK, thisv, js::NullPtr());
+        ReportValueError(cx, JSMSG_SETPROTOTYPEOF_FAIL, JSDVG_IGNORE_STACK, thisv, js::NullPtr());
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/RegExp.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/RegExp.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/RegExp.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/RegExp.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -151,9 +151,11 @@
  *       flags := ToString(flags) if defined(flags) else ''
  */
 static bool
-CompileRegExpObject(JSContext *cx, RegExpObjectBuilder &builder, CallArgs args)
+CompileRegExpObject(JSContext *cx, RegExpObjectBuilder &builder, CallArgs args,
+                    RegExpStaticsUse staticsUse)
 {
     if (args.length() == 0) {
+        MOZ_ASSERT(staticsUse == UseRegExpStatics);
         RegExpStatics *res = cx->global()->getRegExpStatics(cx);
         if (!res)
             return false;
@@ -180,7 +182,7 @@
         RootedObject sourceObj(cx, &sourceValue.toObject());
 
         if (args.hasDefined(1)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NEWREGEXP_FLAGGED);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NEWREGEXP_FLAGGED);
             return false;
         }
 
@@ -233,10 +235,13 @@
     if (!irregexp::ParsePatternSyntax(dummyTokenStream, cx->tempLifoAlloc(), source))
         return false;
 
-    RegExpStatics *res = cx->global()->getRegExpStatics(cx);
-    if (!res)
-        return false;
-    RegExpObject *reobj = builder.build(source, RegExpFlag(flags | res->getFlags()));
+    if (staticsUse == UseRegExpStatics) {
+        RegExpStatics *res = cx->global()->getRegExpStatics(cx);
+        if (!res)
+            return false;
+        flags = RegExpFlag(flags | res->getFlags());
+    }
+    RegExpObject *reobj = builder.build(source, flags);
     if (!reobj)
         return false;
 
@@ -255,7 +260,7 @@
 {
     MOZ_ASSERT(IsRegExp(args.thisv()));
     RegExpObjectBuilder builder(cx, &args.thisv().toObject().as<RegExpObject>());
-    return CompileRegExpObject(cx, builder, args);
+    return CompileRegExpObject(cx, builder, args, UseRegExpStatics);
 }
 
 static bool
@@ -286,7 +291,21 @@
     }
 
     RegExpObjectBuilder builder(cx);
-    return CompileRegExpObject(cx, builder, args);
+    return CompileRegExpObject(cx, builder, args, UseRegExpStatics);
+}
+
+bool
+js::regexp_construct_no_statics(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    MOZ_ASSERT(args.length() == 1 || args.length() == 2);
+    MOZ_ASSERT(args[0].isString());
+    MOZ_ASSERT_IF(args.length() == 2, args[1].isString());
+    MOZ_ASSERT(!args.isConstructing());
+
+    RegExpObjectBuilder builder(cx);
+    return CompileRegExpObject(cx, builder, args, DontUseRegExpStatics);
 }
 
 MOZ_ALWAYS_INLINE bool
@@ -309,67 +328,6 @@
     return CallNonGenericMethod<IsRegExp, regexp_toString_impl>(cx, args);
 }
 
-/* ES6 draft rev29 21.2.5.3 RegExp.prototype.flags */
-bool
-regexp_flags(JSContext *cx, unsigned argc, JS::Value *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-
-    /* Steps 1-2. */
-    if (!args.thisv().isObject()) {
-        char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, args.thisv(), NullPtr());
-        if (!bytes)
-            return false;
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
-                             bytes, "not an object");
-        js_free(bytes);
-        return false;
-    }
-    RootedObject thisObj(cx, &args.thisv().toObject());
-
-    /* Step 3. */
-    StringBuffer sb(cx);
-
-    /* Steps 4-6. */
-    RootedValue global(cx);
-    if (!GetProperty(cx, thisObj, thisObj, cx->names().global, &global))
-        return false;
-    if (ToBoolean(global) && !sb.append('g'))
-        return false;
-
-    /* Steps 7-9. */
-    RootedValue ignoreCase(cx);
-    if (!GetProperty(cx, thisObj, thisObj, cx->names().ignoreCase, &ignoreCase))
-        return false;
-    if (ToBoolean(ignoreCase) && !sb.append('i'))
-        return false;
-
-    /* Steps 10-12. */
-    RootedValue multiline(cx);
-    if (!GetProperty(cx, thisObj, thisObj, cx->names().multiline, &multiline))
-        return false;
-    if (ToBoolean(multiline) && !sb.append('m'))
-        return false;
-
-    /* Steps 13-15. */
-    RootedValue unicode(cx);
-    if (!GetProperty(cx, thisObj, thisObj, cx->names().unicode, &unicode))
-        return false;
-    if (ToBoolean(unicode) && !sb.append('u'))
-        return false;
-
-    /* Steps 16-18. */
-    RootedValue sticky(cx);
-    if (!GetProperty(cx, thisObj, thisObj, cx->names().sticky, &sticky))
-        return false;
-    if (ToBoolean(sticky) && !sb.append('y'))
-        return false;
-
-    /* Step 19. */
-    args.rval().setString(sb.finishString());
-    return true;
-}
-
 /* ES6 draft rev32 21.2.5.4. */
 MOZ_ALWAYS_INLINE bool
 regexp_global_impl(JSContext *cx, CallArgs args)
@@ -480,7 +438,7 @@
 }
 
 static const JSPropertySpec regexp_properties[] = {
-    JS_PSG("flags", regexp_flags, 0),
+    JS_SELF_HOSTED_GET("flags", "RegExpFlagsGetter", 0),
     JS_PSG("global", regexp_global, 0),
     JS_PSG("ignoreCase", regexp_ignoreCase, 0),
     JS_PSG("multiline", regexp_multiline, 0),
@@ -619,7 +577,7 @@
 };
 
 JSObject *
-js_InitRegExpClass(JSContext *cx, HandleObject obj)
+js::InitRegExpClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->isNative());
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/RegExp.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/RegExp.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/RegExp.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/RegExp.h	2015-02-28 15:03:04.000000000 +0000
@@ -9,12 +9,6 @@
 
 #include "vm/RegExpObject.h"
 
-JSObject *
-js_InitRegExpClass(JSContext *cx, js::HandleObject obj);
-
-bool
-regexp_flags(JSContext *cx, unsigned argc, JS::Value *vp);
-
 /*
  * The following builtin natives are extern'd for pointer comparison in
  * other parts of the engine.
@@ -22,10 +16,19 @@
 
 namespace js {
 
+bool
+regexp_flags(JSContext *cx, unsigned argc, JS::Value *vp);
+
+JSObject *
+InitRegExpClass(JSContext *cx, HandleObject obj);
+
 // Whether RegExp statics should be updated with the input and results of a
 // regular expression execution.
 enum RegExpStaticsUpdate { UpdateRegExpStatics, DontUpdateRegExpStatics };
 
+// Whether RegExp statics should be used to create a RegExp instance.
+enum RegExpStaticsUse { UseRegExpStatics, DontUseRegExpStatics };
+
 RegExpRunStatus
 ExecuteRegExp(JSContext *cx, HandleObject regexp, HandleString string,
               MatchPairs *matches, RegExpStaticsUpdate staticsUpdate);
@@ -80,6 +83,16 @@
 extern bool
 regexp_test_no_statics(JSContext *cx, unsigned argc, Value *vp);
 
+/*
+ * Behaves like RegExp(string) or RegExp(string, string), but doesn't use
+ * RegExp statics.
+ *
+ * Usage: re = regexp_construct(pattern)
+ *        re = regexp_construct(pattern, flags)
+ */
+extern bool
+regexp_construct_no_statics(JSContext *cx, unsigned argc, Value *vp);
+
 } /* namespace js */
 
 #endif /* builtin_RegExp_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/RegExp.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/RegExp.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/RegExp.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/RegExp.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,38 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// ES6 draft rev34 (2015/02/20) 21.2.5.3 get RegExp.prototype.flags
+function RegExpFlagsGetter() {
+    // Steps 1-2.
+    var R = this;
+    if (!IsObject(R))
+        ThrowError(JSMSG_NOT_NONNULL_OBJECT, R === null ? "null" : typeof R);
+
+    // Step 3.
+    var result = "";
+
+    // Steps 4-6.
+    if (R.global)
+        result += "g";
+
+    // Steps 7-9.
+    if (R.ignoreCase)
+        result += "i";
+
+    // Steps 10-12.
+    if (R.multiline)
+        result += "m";
+
+    // Steps 13-15.
+    // TODO: Uncomment these steps when bug 1135377 is fixed.
+    // if (R.unicode)
+    //     result += "u";
+
+    // Steps 16-18.
+    if (R.sticky)
+        result += "y";
+
+    // Step 19.
+    return result;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SIMD.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SIMD.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SIMD.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SIMD.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -74,7 +74,7 @@
 {
     typedef typename V::Elem Elem;
     if (!IsVectorObject<V>(v)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SIMD_NOT_A_VECTOR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SIMD_NOT_A_VECTOR);
         return false;
     }
 
@@ -101,7 +101,7 @@
 
     CallArgs args = CallArgsFromVp(argc, vp);
     if (!IsVectorObject<SimdType>(args.thisv())) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              SimdTypeDescr::class_.name, laneNames[lane],
                              InformalValueTypeName(args.thisv()));
         return false;
@@ -138,7 +138,7 @@
 
     CallArgs args = CallArgsFromVp(argc, vp);
     if (!args.thisv().isObject() || !args.thisv().toObject().is<TypedObject>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              SimdTypeDescr::class_.name, "signMask",
                              InformalValueTypeName(args.thisv()));
         return false;
@@ -147,7 +147,7 @@
     TypedObject &typedObj = args.thisv().toObject().as<TypedObject>();
     TypeDescr &descr = typedObj.typeDescr();
     if (descr.kind() != type::Simd || descr.as<SimdTypeDescr>().type() != SimdType::type) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              SimdTypeDescr::class_.name, "signMask",
                              InformalValueTypeName(args.thisv()));
         return false;
@@ -486,7 +486,7 @@
 }
 
 JSObject *
-js_InitSIMDClass(JSContext *cx, HandleObject obj)
+js::InitSIMDClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->is<GlobalObject>());
     Rooted<GlobalObject *> global(cx, &obj->as<GlobalObject>());
@@ -495,7 +495,7 @@
 
 template<typename V>
 JSObject *
-js::CreateSimd(JSContext *cx, typename V::Elem *data)
+js::CreateSimd(JSContext *cx, const typename V::Elem *data)
 {
     typedef typename V::Elem Elem;
     Rooted<TypeDescr*> typeDescr(cx, &V::GetTypeDescr(*cx->global()));
@@ -510,9 +510,9 @@
     return result;
 }
 
-template JSObject *js::CreateSimd<Float32x4>(JSContext *cx, Float32x4::Elem *data);
-template JSObject *js::CreateSimd<Float64x2>(JSContext *cx, Float64x2::Elem *data);
-template JSObject *js::CreateSimd<Int32x4>(JSContext *cx, Int32x4::Elem *data);
+template JSObject *js::CreateSimd<Float32x4>(JSContext *cx, const Float32x4::Elem *data);
+template JSObject *js::CreateSimd<Float64x2>(JSContext *cx, const Float64x2::Elem *data);
+template JSObject *js::CreateSimd<Int32x4>(JSContext *cx, const Int32x4::Elem *data);
 
 namespace js {
 // Unary SIMD operators
@@ -644,7 +644,7 @@
 static inline bool
 ErrorBadArgs(JSContext *cx)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
     return false;
 }
 
@@ -1017,26 +1017,27 @@
 template<class VElem, unsigned NumElem>
 static bool
 TypedArrayFromArgs(JSContext *cx, const CallArgs &args,
-                   MutableHandle<TypedArrayObject*> typedArray, int32_t *byteStart)
+                   MutableHandleObject typedArray, int32_t *byteStart)
 {
     if (!args[0].isObject())
         return ErrorBadArgs(cx);
 
     JSObject &argobj = args[0].toObject();
-    if (!argobj.is<TypedArrayObject>())
+    if (!IsAnyTypedArray(&argobj))
         return ErrorBadArgs(cx);
 
-    typedArray.set(&argobj.as<TypedArrayObject>());
+    typedArray.set(&argobj);
 
     int32_t index;
     if (!ToInt32(cx, args[1], &index))
         return false;
 
-    *byteStart = index * typedArray->bytesPerElement();
-    if (*byteStart < 0 || (uint32_t(*byteStart) + NumElem * sizeof(VElem)) > typedArray->byteLength())
+    *byteStart = index * AnyTypedArrayBytesPerElement(typedArray);
+    if (*byteStart < 0 ||
+        (uint32_t(*byteStart) + NumElem * sizeof(VElem)) > AnyTypedArrayByteLength(typedArray))
     {
         // Keep in sync with AsmJS OnOutOfBounds function.
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
         return false;
     }
 
@@ -1054,7 +1055,7 @@
         return ErrorBadArgs(cx);
 
     int32_t byteStart;
-    Rooted<TypedArrayObject*> typedArray(cx);
+    RootedObject typedArray(cx);
     if (!TypedArrayFromArgs<Elem, NumElem>(cx, args, &typedArray, &byteStart))
         return false;
 
@@ -1064,7 +1065,7 @@
     if (!result)
         return false;
 
-    Elem *src = reinterpret_cast<Elem*>(static_cast<char*>(typedArray->viewData()) + byteStart);
+    Elem *src = reinterpret_cast<Elem*>(static_cast<char*>(AnyTypedArrayViewData(typedArray)) + byteStart);
     Elem *dst = reinterpret_cast<Elem*>(result->typedMem());
     memcpy(dst, src, sizeof(Elem) * NumElem);
 
@@ -1083,7 +1084,7 @@
         return ErrorBadArgs(cx);
 
     int32_t byteStart;
-    Rooted<TypedArrayObject*> typedArray(cx);
+    RootedObject typedArray(cx);
     if (!TypedArrayFromArgs<Elem, NumElem>(cx, args, &typedArray, &byteStart))
         return false;
 
@@ -1091,7 +1092,7 @@
         return ErrorBadArgs(cx);
 
     Elem *src = TypedObjectMemory<Elem*>(args[2]);
-    Elem *dst = reinterpret_cast<Elem*>(static_cast<char*>(typedArray->viewData()) + byteStart);
+    Elem *dst = reinterpret_cast<Elem*>(static_cast<char*>(AnyTypedArrayViewData(typedArray)) + byteStart);
     memcpy(dst, src, sizeof(Elem) * NumElem);
 
     args.rval().setObject(args[2].toObject());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SIMD.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SIMD.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SIMD.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SIMD.h	2015-02-28 15:03:04.000000000 +0000
@@ -323,7 +323,7 @@
 };
 
 template<typename V>
-JSObject *CreateSimd(JSContext *cx, typename V::Elem *data);
+JSObject *CreateSimd(JSContext *cx, const typename V::Elem *data);
 
 template<typename V>
 bool IsVectorObject(HandleValue v);
@@ -349,9 +349,9 @@
 INT32X4_FUNCTION_LIST(DECLARE_SIMD_INT32x4_FUNCTION)
 #undef DECLARE_SIMD_INT32x4_FUNCTION
 
-}  /* namespace js */
-
 JSObject *
-js_InitSIMDClass(JSContext *cx, js::HandleObject obj);
+InitSIMDClass(JSContext *cx, HandleObject obj);
+
+}  /* namespace js */
 
 #endif /* builtin_SIMD_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SymbolObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SymbolObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SymbolObject.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SymbolObject.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -29,7 +29,7 @@
 };
 
 SymbolObject *
-SymbolObject::create(JSContext *cx, JS::Symbol *symbol)
+SymbolObject::create(JSContext *cx, JS::HandleSymbol symbol)
 {
     JSObject *obj = NewBuiltinClassInstance(cx, &class_);
     if (!obj)
@@ -103,7 +103,7 @@
     // yet, so just throw a TypeError.
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.isConstructing()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_CONSTRUCTOR, "Symbol");
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_CONSTRUCTOR, "Symbol");
         return false;
     }
 
@@ -159,8 +159,8 @@
     // step 1
     HandleValue arg = args.get(0);
     if (!arg.isSymbol()) {
-        js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE, JSDVG_SEARCH_STACK,
-                                 arg, js::NullPtr(), "not a symbol", nullptr);
+        ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE, JSDVG_SEARCH_STACK,
+                              arg, js::NullPtr(), "not a symbol", nullptr);
         return false;
     }
 
@@ -230,7 +230,7 @@
 }
 
 JSObject *
-js_InitSymbolClass(JSContext *cx, HandleObject obj)
+js::InitSymbolClass(JSContext *cx, HandleObject obj)
 {
     return SymbolObject::initClass(cx, obj);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SymbolObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SymbolObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/SymbolObject.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/SymbolObject.h	2015-02-28 15:03:04.000000000 +0000
@@ -28,7 +28,7 @@
      * Creates a new Symbol object boxing the given primitive Symbol.  The
      * object's [[Prototype]] is determined from context.
      */
-    static SymbolObject *create(JSContext *cx, JS::Symbol *symbol);
+    static SymbolObject *create(JSContext *cx, JS::HandleSymbol symbol);
 
     JS::Symbol *unbox() const {
         return getFixedSlot(PRIMITIVE_VALUE_SLOT).toSymbol();
@@ -58,9 +58,9 @@
     static const JSFunctionSpec staticMethods[];
 };
 
-} /* namespace js */
-
 extern JSObject *
-js_InitSymbolClass(JSContext *cx, js::HandleObject obj);
+InitSymbolClass(JSContext *cx, HandleObject obj);
+
+} /* namespace js */
 
 #endif /* builtin_SymbolObject_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TestingFunctions.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TestingFunctions.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TestingFunctions.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TestingFunctions.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -183,6 +183,18 @@
     if (!JS_SetProperty(cx, info, "intl-api", value))
         return false;
 
+#if defined(XP_WIN)
+    value = BooleanValue(false);
+#elif defined(SOLARIS)
+    value = BooleanValue(false);
+#elif defined(XP_UNIX)
+    value = BooleanValue(true);
+#else
+    value = BooleanValue(false);
+#endif
+    if (!JS_SetProperty(cx, info, "mapped-array-buffer", value))
+        return false;
+
     args.rval().setObject(*info);
     return true;
 }
@@ -735,7 +747,7 @@
         return false;
     }
     if (!args[0].isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
                              "nondeterministicGetWeakMapKeys", "WeakMap",
                              InformalValueTypeName(args[0]));
         return false;
@@ -745,7 +757,7 @@
     if (!JS_NondeterministicGetWeakMapKeys(cx, mapObj, &arr))
         return false;
     if (!arr) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
                              "nondeterministicGetWeakMapKeys", "WeakMap",
                              args[0].toObject().getClass()->name);
         return false;
@@ -959,9 +971,9 @@
         if (!ToNumber(cx, args[0], &d))
             return false;
         if (d < 0) {
-            js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                     JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
-                                     "not a valid maximum frame count", NULL);
+            ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
+                                  JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                                  "not a valid maximum frame count", NULL);
             return false;
         }
         maxFrameCount = d;
@@ -970,9 +982,9 @@
     JSCompartment *targetCompartment = cx->compartment();
     if (args.length() >= 2) {
         if (!args[1].isObject()) {
-            js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                     JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
-                                     "not an object", NULL);
+            ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
+                                  JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                                  "not an object", NULL);
             return false;
         }
         RootedObject obj(cx, UncheckedUnwrap(&args[1].toObject()));
@@ -1089,11 +1101,8 @@
 MakeFinalizeObserver(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    RootedObject scope(cx, JS::CurrentGlobalOrNull(cx));
-    if (!scope)
-        return false;
 
-    JSObject *obj = JS_NewObjectWithGivenProto(cx, &FinalizeCounterClass, JS::NullPtr(), scope);
+    JSObject *obj = JS_NewObjectWithGivenProto(cx, &FinalizeCounterClass, JS::NullPtr());
     if (!obj)
         return false;
 
@@ -2099,7 +2108,7 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (argc < 2) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
                              "findPath", "1", "");
         return false;
     }
@@ -2108,16 +2117,16 @@
     // test is all about object identity, and ToString doesn't preserve that.
     // Non-GCThing endpoints don't make much sense.
     if (!args[0].isObject() && !args[0].isString() && !args[0].isSymbol()) {
-        js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                 JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
-                                 "not an object, string, or symbol", NULL);
+        ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
+                              JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                              "not an object, string, or symbol", NULL);
         return false;
     }
 
     if (!args[1].isObject() && !args[1].isString() && !args[1].isSymbol()) {
-        js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                 JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
-                                 "not an object, string, or symbol", NULL);
+        ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
+                              JSDVG_SEARCH_STACK, args[0], JS::NullPtr(),
+                              "not an object, string, or symbol", NULL);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TypedArray.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TypedArray.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TypedArray.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TypedArray.js	2015-02-28 15:03:04.000000000 +0000
@@ -98,6 +98,70 @@
     return O;
 }
 
+// ES6 draft 32 (2015-02-02) 22.2.3.9 %TypedArray%.prototype.filter(callbackfn[, thisArg])
+function TypedArrayFilter(callbackfn, thisArg = undefined) {
+    // Step 1.
+    var O = this;
+
+    // Steps 2-3.
+    // This function is not generic.
+    if (!IsObject(O) || !IsTypedArray(O)) {
+        return callFunction(CallTypedArrayMethodIfWrapped, this, callbackfn, thisArg,
+                           "TypedArrayFilter");
+    }
+
+    // Step 4.
+    var len = TypedArrayLength(O);
+
+    // Step 5.
+    if (arguments.length === 0)
+        ThrowError(JSMSG_MISSING_FUN_ARG, 0, "%TypedArray%.prototype.filter");
+    if (!IsCallable(callbackfn))
+        ThrowError(JSMSG_NOT_FUNCTION, DecompileArg(0, callbackfn));
+
+    // Step 6.
+    var T = thisArg;
+
+    // Step 7.
+    var defaultConstructor = _ConstructorForTypedArray(O);
+
+    // Steps 8-9.
+    var C = SpeciesConstructor(O, defaultConstructor);
+
+    // Step 10.
+    var kept = new List();
+
+    // Step 12.
+    var captured = 0;
+
+    // Steps 11, 13 and 13.g.
+    for (var k = 0; k < len; k++) {
+        // Steps 13.b-c.
+        var kValue = O[k];
+        // Steps 13.d-e.
+        var selected = ToBoolean(callFunction(callbackfn, T, kValue, k, O));
+        // Step 13.f.
+        if (selected) {
+            // Step 13.f.i.
+            kept.push(kValue);
+            // Step 13.f.ii.
+            captured++;
+        }
+    }
+
+    // Steps 14-15.
+    var A = new C(captured);
+
+    // Steps 16 and 17.c.
+    for (var n = 0; n < captured; n++) {
+        // Steps 17.a-b.
+        A[n] = kept[n];
+    }
+
+    // Step 18.
+    return A;
+}
+
 // ES6 draft rev28 (2014/10/14) 22.2.3.10 %TypedArray%.prototype.find(predicate[, thisArg]).
 function TypedArrayFind(predicate, thisArg = undefined) {
     // This function is not generic.
@@ -353,6 +417,51 @@
     return -1;
 }
 
+// ES6 draft rev32 (2015-02-02) 22.2.3.18 %TypedArray%.prototype.map(callbackfn [, thisArg]).
+function TypedArrayMap(callbackfn, thisArg = undefined) {
+    // Step 1.
+    var O = this;
+
+    // Steps 2-3.
+    // This function is not generic.
+    if (!IsObject(O) || !IsTypedArray(O)) {
+        return callFunction(CallTypedArrayMethodIfWrapped, this, callbackfn, thisArg,
+                            "TypedArrayMap");
+    }
+
+    // Step 4.
+    var len = TypedArrayLength(O);
+
+    // Step 5.
+    if (arguments.length === 0)
+        ThrowError(JSMSG_MISSING_FUN_ARG, 0, '%TypedArray%.prototype.map');
+    if (!IsCallable(callbackfn))
+        ThrowError(JSMSG_NOT_FUNCTION, DecompileArg(0, callbackfn));
+
+    // Step 6.
+    var T = thisArg;
+
+    // Step 7.
+    var defaultConstructor = _ConstructorForTypedArray(O);
+
+    // Steps 8-9.
+    var C = SpeciesConstructor(O, defaultConstructor);
+
+    // Steps 10-11.
+    var A = new C(len);
+
+    // Steps 12, 13.a (implicit) and 13.h.
+    for (var k = 0; k < len; k++) {
+        // Steps 13.d-e.
+        var mappedValue = callFunction(callbackfn, T, O[k], k, O);
+        // Steps 13.f-g.
+        A[k] = mappedValue;
+    }
+
+    // Step 14.
+    return A;
+}
+
 // ES6 draft rev30 (2014/12/24) 22.2.3.19 %TypedArray%.prototype.reduce(callbackfn[, initialValue]).
 function TypedArrayReduce(callbackfn/*, initialValue*/) {
     // This function is not generic.
@@ -469,6 +578,65 @@
     return O;
 }
 
+// ES6 draft rev32 (2015-02-02) 22.2.3.23 %TypedArray%.prototype.slice(start, end).
+function TypedArraySlice(start, end) {
+
+    // Step 1.
+    var O = this;
+
+    // Step 2-3.
+    if (!IsObject(O) || !IsTypedArray(O)) {
+        return callFunction(CallTypedArrayMethodIfWrapped, O, start, end, "TypedArraySlice");
+    }
+
+    // Step 4.
+    var len = TypedArrayLength(O);
+
+    // Steps 5-6.
+    var relativeStart = ToInteger(start);
+
+    // Step 7.
+    var k = relativeStart < 0
+            ? std_Math_max(len + relativeStart, 0)
+            : std_Math_min(relativeStart, len);
+
+    // Steps 8-9.
+    var relativeEnd = end === undefined ? len : ToInteger(end);
+
+    // Step 10.
+    var final = relativeEnd < 0
+                ? std_Math_max(len + relativeEnd, 0)
+                : std_Math_min(relativeEnd, len);
+
+    // Step 11.
+    var count = std_Math_max(final - k, 0);
+
+    // Step 12.
+    var defaultConstructor = _ConstructorForTypedArray(O);
+
+    // Steps 13-14.
+    var C = SpeciesConstructor(O, defaultConstructor);
+
+    // Steps 15-16.
+    var A = new C(count);
+
+    // Step 17.
+    var n = 0;
+
+    // Step 18.
+    while (k < final) {
+        // Steps 18.a-e.
+        A[n] = O[k];
+        // Step 18f.
+        k++;
+        // Step 18g.
+        n++;
+    }
+
+    // Step 19.
+    return A;
+}
+
 // ES6 draft rev30 (2014/12/24) 22.2.3.25 %TypedArray%.prototype.some(callbackfn[, thisArg]).
 function TypedArraySome(callbackfn, thisArg = undefined) {
     // This function is not generic.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TypedObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TypedObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TypedObject.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TypedObject.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -48,7 +48,7 @@
 static void
 ReportCannotConvertTo(JSContext *cx, HandleValue fromValue, const char *toType)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
                          InformalValueTypeName(fromValue), toType);
 }
 
@@ -185,7 +185,7 @@
         return nullptr;
     }
     if (!prototypeVal.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_INVALID_PROTOTYPE);
         return nullptr;
     }
@@ -268,7 +268,7 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              args.callee().getClass()->name, "0", "s");
         return false;
     }
@@ -372,7 +372,7 @@
     Rooted<ReferenceTypeDescr *> descr(cx, &args.callee().as<ReferenceTypeDescr>());
 
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_MORE_ARGS_NEEDED,
                              descr->typeName(), "0", "s");
         return false;
@@ -644,7 +644,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (!args.isConstructing()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_NOT_FUNCTION, "ArrayType");
         return false;
     }
@@ -653,7 +653,7 @@
 
     // Expect two arguments. The first is a type object, the second is a length.
     if (args.length() < 2) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "ArrayType", "1", "");
         return false;
     }
@@ -675,7 +675,7 @@
     // Compute the byte size.
     CheckedInt32 size = CheckedInt32(elementType->size()) * length;
     if (!size.isValid()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_TYPEDOBJECT_TOO_BIG);
         return false;
     }
@@ -787,7 +787,7 @@
         return nullptr;
 
     if (!stringBuffer.append("new StructType({")) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
@@ -818,11 +818,11 @@
         // Collect field name and type object
         RootedValue fieldName(cx, IdToValue(id));
         if (!fieldNames.append(fieldName)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
         if (!fieldTypeObjs.append(ObjectValue(*fieldType))) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
 
@@ -835,19 +835,19 @@
 
         // Append "f:Type" to the string repr
         if (i > 0 && !stringBuffer.append(", ")) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
         if (!stringBuffer.append(JSID_TO_ATOM(id))) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
         if (!stringBuffer.append(": ")) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
         if (!stringBuffer.append(&fieldType->stringRepr())) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
 
@@ -855,13 +855,13 @@
         // the field's alignment.
         CheckedInt32 offset = roundUpToAlignment(sizeSoFar, fieldType->alignment());
         if (!offset.isValid()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_TYPEDOBJECT_TOO_BIG);
             return nullptr;
         }
         MOZ_ASSERT(offset.value() >= 0);
         if (!fieldOffsets.append(Int32Value(offset.value()))) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
 
@@ -876,7 +876,7 @@
         // Add space for this field to the total struct size.
         sizeSoFar = offset + fieldType->size();
         if (!sizeSoFar.isValid()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_TYPEDOBJECT_TOO_BIG);
             return nullptr;
         }
@@ -891,7 +891,7 @@
 
     // Complete string representation.
     if (!stringBuffer.append("})")) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
     RootedAtom stringRepr(cx, stringBuffer.finishAtom());
@@ -901,7 +901,7 @@
     // Adjust the total size to be a multiple of the final alignment.
     CheckedInt32 totalSize = roundUpToAlignment(sizeSoFar, alignment);
     if (!totalSize.isValid()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_TYPEDOBJECT_TOO_BIG);
         return nullptr;
     }
@@ -1002,7 +1002,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (!args.isConstructing()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_NOT_FUNCTION, "StructType");
         return false;
     }
@@ -1017,7 +1017,7 @@
         return true;
     }
 
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                          JSMSG_TYPEDOBJECT_STRUCTTYPE_BAD_ARGS);
     return false;
 }
@@ -1333,25 +1333,13 @@
 }
 
 JSObject *
-js_InitTypedObjectModuleObject(JSContext *cx, HandleObject obj)
+js::InitTypedObjectModuleObject(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->is<GlobalObject>());
     Rooted<GlobalObject *> global(cx, &obj->as<GlobalObject>());
     return global->getOrCreateTypedObjectModule(cx);
 }
 
-JSObject *
-js_InitTypedObjectDummy(JSContext *cx, HandleObject obj)
-{
-    /*
-     * This function is entered into the jsprototypes.h table
-     * as the initializer for `TypedObject`. It should not
-     * be executed via the `standard_class_atoms` mechanism.
-     */
-
-    MOZ_CRASH("shouldn't be initializing TypedObject via the JSProtoKey initializer mechanism");
-}
-
 /******************************************************************************
  * Typed objects
  */
@@ -1633,7 +1621,7 @@
     if (!typeReprStr)
         return false;
 
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                          errorNumber, typeReprStr);
 
     JS_free(cx, (void *) typeReprStr);
@@ -1700,7 +1688,7 @@
       case type::Array:
       {
         uint32_t index;
-        if (js_IdIsIndex(id, &index))
+        if (IdIsIndex(id, &index))
             return obj_lookupElement(cx, obj, index, objp, propp);
 
         if (JSID_IS_ATOM(id, cx->names().length)) {
@@ -1749,7 +1737,8 @@
                     const unsigned errorNumber,
                     HandleId id)
 {
-    RootedString str(cx, IdToString(cx, id));
+    RootedValue idVal(cx, IdToValue(id));
+    RootedString str(cx, ValueToSource(cx, idVal));
     if (!str)
         return false;
 
@@ -1757,7 +1746,7 @@
     if (!propName)
         return false;
 
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                          errorNumber, propName);
 
     JS_free(cx, propName);
@@ -1789,7 +1778,7 @@
         }
         uint32_t index;
         // Elements are not inherited from the prototype.
-        if (js_IdIsIndex(id, &index)) {
+        if (IdIsIndex(id, &index)) {
             *foundp = (index < uint32_t(typedObj->length()));
             return true;
         }
@@ -1821,7 +1810,7 @@
 
     // Dispatch elements to obj_getElement:
     uint32_t index;
-    if (js_IdIsIndex(id, &index))
+    if (IdIsIndex(id, &index))
         return obj_getElement(cx, obj, receiver, index, vp);
 
     // Handle everything else here:
@@ -1838,7 +1827,7 @@
         if (JSID_IS_ATOM(id, cx->names().length)) {
             if (!typedObj->isAttached()) {
                 JS_ReportErrorNumber(
-                    cx, js_GetErrorMessage,
+                    cx, GetErrorMessage,
                     nullptr, JSMSG_TYPEDOBJECT_HANDLE_UNATTACHED);
                 return false;
             }
@@ -1933,7 +1922,7 @@
       case type::Array: {
         if (JSID_IS_ATOM(id, cx->names().length)) {
             if (obj == receiver) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage,
+                JS_ReportErrorNumber(cx, GetErrorMessage,
                                      nullptr, JSMSG_CANT_REDEFINE_ARRAY_LENGTH);
                 return false;
             }
@@ -1941,12 +1930,12 @@
         }
 
         uint32_t index;
-        if (js_IdIsIndex(id, &index)) {
+        if (IdIsIndex(id, &index)) {
             if (obj != receiver)
                 return SetPropertyByDefining(cx, obj, receiver, id, vp, strict, false);
 
             if (index >= uint32_t(typedObj->length())) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage,
+                JS_ReportErrorNumber(cx, GetErrorMessage,
                                      nullptr, JSMSG_TYPEDOBJECT_BINARYARRAY_BAD_INDEX);
                 return false;
             }
@@ -1985,7 +1974,7 @@
 {
     Rooted<TypedObject *> typedObj(cx, &obj->as<TypedObject>());
     if (!typedObj->isAttached()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPEDOBJECT_HANDLE_UNATTACHED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPEDOBJECT_HANDLE_UNATTACHED);
         return false;
     }
 
@@ -1999,7 +1988,7 @@
       case type::Array:
       {
         uint32_t index;
-        if (js_IdIsIndex(id, &index)) {
+        if (IdIsIndex(id, &index)) {
             if (!obj_getArrayElement(cx, typedObj, descr, index, desc.value()))
                 return false;
             desc.setAttributes(JSPROP_ENUMERATE | JSPROP_PERMANENT);
@@ -2051,7 +2040,7 @@
         return false;
 
       case type::Array:
-        return js_IdIsIndex(id, &index) || JSID_IS_ATOM(id, cx->names().length);
+        return IdIsIndex(id, &index) || JSID_IS_ATOM(id, cx->names().length);
 
       case type::Struct:
         size_t index;
@@ -2273,7 +2262,7 @@
 {
     MOZ_ASSERT(!map.has(obj));
     if (!map.put(obj, buffer)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -2427,7 +2416,7 @@
         buffer = &args[0].toObject().as<ArrayBufferObject>();
 
         if (callee->opaque() || buffer->isNeutered()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage,
+            JS_ReportErrorNumber(cx, GetErrorMessage,
                                  nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS);
             return false;
         }
@@ -2435,7 +2424,7 @@
         int32_t offset;
         if (args.length() >= 2 && !args[1].isUndefined()) {
             if (!args[1].isInt32()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage,
+                JS_ReportErrorNumber(cx, GetErrorMessage,
                                      nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS);
                 return false;
             }
@@ -2446,7 +2435,7 @@
         }
 
         if (args.length() >= 3 && !args[2].isUndefined()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage,
+            JS_ReportErrorNumber(cx, GetErrorMessage,
                                  nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS);
             return false;
         }
@@ -2454,7 +2443,7 @@
         if (!CheckOffset(offset, callee->size(), callee->alignment(),
                          buffer->byteLength()))
         {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage,
+            JS_ReportErrorNumber(cx, GetErrorMessage,
                                  nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS);
             return false;
         }
@@ -2485,7 +2474,7 @@
     }
 
     // Something bogus.
-    JS_ReportErrorNumber(cx, js_GetErrorMessage,
+    JS_ReportErrorNumber(cx, GetErrorMessage,
                          nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS);
     return false;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TypedObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TypedObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/TypedObject.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/TypedObject.h	2015-02-28 15:03:04.000000000 +0000
@@ -39,7 +39,7 @@
  * Currently, all "globals" related to typed objects are packaged
  * within a single "module" object `TypedObject`. This module has its
  * own js::Class and when that class is initialized, we also create
- * and define all other values (in `js_InitTypedObjectModuleClass()`).
+ * and define all other values (in `js::InitTypedObjectModuleClass()`).
  *
  * - Type objects, meta type objects, and type representations:
  *
@@ -333,7 +333,8 @@
     enum Type {
         TYPE_INT32 = JS_SIMDTYPEREPR_INT32,
         TYPE_FLOAT32 = JS_SIMDTYPEREPR_FLOAT32,
-        TYPE_FLOAT64 = JS_SIMDTYPEREPR_FLOAT64
+        TYPE_FLOAT64 = JS_SIMDTYPEREPR_FLOAT64,
+        LAST_TYPE = TYPE_FLOAT64
     };
 
     static const type::Kind Kind = type::Simd;
@@ -1041,10 +1042,10 @@
     size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf);
 };
 
-} // namespace js
-
 JSObject *
-js_InitTypedObjectModuleObject(JSContext *cx, JS::HandleObject obj);
+InitTypedObjectModuleObject(JSContext *cx, JS::HandleObject obj);
+
+} // namespace js
 
 template <>
 inline bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Utilities.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Utilities.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/Utilities.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/Utilities.js	2015-02-28 15:03:04.000000000 +0000
@@ -153,3 +153,14 @@
     // Step 6.
     return iterator;
 }
+
+function SpeciesConstructor(obj, defaultConstructor) {
+    var C = obj.constructor;
+    if (C === undefined) {
+        return defaultConstructor;
+    }
+    if (!IsConstructor(C)) {
+        ThrowError(JSMSG_NOT_CONSTRUCTOR, DecompileArg(1, C));
+    }
+    return C;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/WeakSet.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/WeakSet.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/WeakSet.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/WeakSet.js	2015-02-28 15:03:04.000000000 +0000
@@ -16,7 +16,7 @@
 
     // Step 5.
     if (!IsObject(value))
-        ThrowError(JSMSG_NOT_NONNULL_OBJECT);
+        ThrowError(JSMSG_NOT_NONNULL_OBJECT, DecompileArg(0, value));
 
     // Steps 7-8.
     callFunction(std_WeakMap_set, entries, value, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/WeakSetObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/WeakSetObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/WeakSetObject.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/WeakSetObject.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -86,7 +86,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (!args.isConstructing()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_FUNCTION, "WeakSet");
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_FUNCTION, "WeakSet");
         return false;
     }
 
@@ -123,7 +123,10 @@
 
             if (isOriginalAdder) {
                 if (keyVal.isPrimitive()) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+                    char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, keyVal, NullPtr());
+                    if (!bytes)
+                        return false;
+                    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes);
                     return false;
                 }
 
@@ -150,7 +153,7 @@
 
 
 JSObject *
-js_InitWeakSetClass(JSContext *cx, HandleObject obj)
+js::InitWeakSetClass(JSContext *cx, HandleObject obj)
 {
     return WeakSetObject::initClass(cx, obj);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/WeakSetObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/WeakSetObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/builtin/WeakSetObject.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/builtin/WeakSetObject.h	2015-02-28 15:03:04.000000000 +0000
@@ -27,9 +27,9 @@
     static bool construct(JSContext *cx, unsigned argc, Value *vp);
 };
 
-} // namespace js
-
 extern JSObject *
-js_InitWeakSetClass(JSContext *cx, js::HandleObject obj);
+InitWeakSetClass(JSContext *cx, HandleObject obj);
+
+} // namespace js
 
 #endif /* builtin_WeakSetObject_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ctypes/CTypes.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ctypes/CTypes.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ctypes/CTypes.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ctypes/CTypes.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -89,7 +89,7 @@
     if (maybecx) {
         js::gc::AutoSuppressGC suppress(maybecx);
         JS_snprintf(buffer, 10, "0x%x", c);
-        JS_ReportErrorFlagsAndNumber(maybecx, JSREPORT_ERROR, js_GetErrorMessage,
+        JS_ReportErrorFlagsAndNumber(maybecx, JSREPORT_ERROR, GetErrorMessage,
                                      nullptr, JSMSG_BAD_SURROGATE_CHAR, buffer);
     }
     return (size_t) -1;
@@ -151,7 +151,7 @@
             *dst++ = (char) v;
             utf8Len = 1;
         } else {
-            utf8Len = js_OneUcs4ToUtf8Char(utf8buf, v);
+            utf8Len = js::OneUcs4ToUtf8Char(utf8buf, v);
             if (utf8Len > dstlen)
                 goto bufferTooSmall;
             for (i = 0; i < utf8Len; i++)
@@ -173,7 +173,7 @@
     *dstlenp = (origDstlen - dstlen);
     if (maybecx) {
         js::gc::AutoSuppressGC suppress(maybecx);
-        JS_ReportErrorNumber(maybecx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(maybecx, GetErrorMessage, nullptr,
                              JSMSG_BUFFER_TOO_SMALL);
     }
     return false;
@@ -749,8 +749,8 @@
 };
 
 static const JSFunctionSpec sFunctionInstanceFunctions[] = {
-  JS_FN("call", js_fun_call, 1, CDATAFN_FLAGS),
-  JS_FN("apply", js_fun_apply, 2, CDATAFN_FLAGS),
+  JS_FN("call", js::fun_call, 1, CDATAFN_FLAGS),
+  JS_FN("apply", js::fun_apply, 2, CDATAFN_FLAGS),
   JS_FS_END
 };
 
@@ -894,9 +894,9 @@
 }
 
 static JSObject*
-InitCTypeClass(JSContext* cx, HandleObject parent)
+InitCTypeClass(JSContext* cx, HandleObject ctypesObj)
 {
-  JSFunction *fun = JS_DefineFunction(cx, parent, "CType", ConstructAbstract, 0,
+  JSFunction *fun = JS_DefineFunction(cx, ctypesObj, "CType", ConstructAbstract, 0,
                                       CTYPESCTOR_FLAGS);
   if (!fun)
     return nullptr;
@@ -909,7 +909,7 @@
   MOZ_ASSERT(fnproto);
 
   // Set up ctypes.CType.prototype.
-  RootedObject prototype(cx, JS_NewObjectWithGivenProto(cx, &sCTypeProtoClass, fnproto, parent));
+  RootedObject prototype(cx, JS_NewObjectWithGivenProto(cx, &sCTypeProtoClass, fnproto));
   if (!prototype)
     return nullptr;
 
@@ -933,7 +933,7 @@
 }
 
 static JSObject*
-InitABIClass(JSContext* cx, JSObject* parent)
+InitABIClass(JSContext* cx)
 {
   RootedObject obj(cx, JS_NewPlainObject(cx));
 
@@ -965,7 +965,7 @@
     return nullptr;
 
   // Set up ctypes.CData.prototype.
-  RootedObject prototype(cx, JS_NewObject(cx, &sCDataProtoClass, parent));
+  RootedObject prototype(cx, JS_NewObject(cx, &sCDataProtoClass));
   if (!prototype)
     return nullptr;
 
@@ -991,7 +991,7 @@
 
 static bool
 DefineABIConstant(JSContext* cx,
-                  HandleObject parent,
+                  HandleObject ctypesObj,
                   const char* name,
                   ABICode code,
                   HandleObject prototype)
@@ -1004,7 +1004,7 @@
   if (!JS_FreezeObject(cx, obj))
     return false;
 
-  return JS_DefineProperty(cx, parent, name, obj,
+  return JS_DefineProperty(cx, ctypesObj, name, obj,
                            JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT);
 }
 
@@ -1033,7 +1033,7 @@
     return false;
 
   // Set up the .prototype and .prototype.constructor properties.
-  typeProto.set(JS_NewObjectWithGivenProto(cx, &sCTypeProtoClass, CTypeProto, parent));
+  typeProto.set(JS_NewObjectWithGivenProto(cx, &sCTypeProtoClass, CTypeProto));
   if (!typeProto)
     return false;
 
@@ -1060,7 +1060,7 @@
   // created from the given type constructor. This has ctypes.CData.prototype
   // as its prototype, such that it inherits the properties and functions
   // common to all CDatas.
-  dataProto.set(JS_NewObjectWithGivenProto(cx, &sCDataProtoClass, CDataProto, parent));
+  dataProto.set(JS_NewObjectWithGivenProto(cx, &sCDataProtoClass, CDataProto));
   if (!dataProto)
     return false;
 
@@ -1133,7 +1133,7 @@
 }
 
 static bool
-InitTypeClasses(JSContext* cx, HandleObject parent)
+InitTypeClasses(JSContext* cx, HandleObject ctypesObj)
 {
   // Initialize the ctypes.CType class. This acts as an abstract base class for
   // the various types, and provides the common API functions. It has:
@@ -1148,7 +1148,7 @@
   //       abstract type instance!)
   //     * 'constructor' property === ctypes.CType
   //     * Provides properties and functions common to all CTypes.
-  RootedObject CTypeProto(cx, InitCTypeClass(cx, parent));
+  RootedObject CTypeProto(cx, InitCTypeClass(cx, ctypesObj));
   if (!CTypeProto)
     return false;
 
@@ -1163,7 +1163,7 @@
   //     * [[Class]] "CDataProto"
   //     * 'constructor' property === ctypes.CData
   //     * Provides properties and functions common to all CDatas.
-  RootedObject CDataProto(cx, InitCDataClass(cx, parent, CTypeProto));
+  RootedObject CDataProto(cx, InitCDataClass(cx, ctypesObj, CTypeProto));
   if (!CDataProto)
     return false;
 
@@ -1198,25 +1198,25 @@
   //     * 'constructor' property === 't'
   AutoObjectVector protos(cx);
   protos.resize(CTYPEPROTO_SLOTS);
-  if (!InitTypeConstructor(cx, parent, CTypeProto, CDataProto,
+  if (!InitTypeConstructor(cx, ctypesObj, CTypeProto, CDataProto,
          sPointerFunction, nullptr, sPointerProps,
          sPointerInstanceFunctions, sPointerInstanceProps,
          protos[SLOT_POINTERPROTO], protos[SLOT_POINTERDATAPROTO]))
     return false;
 
-  if (!InitTypeConstructor(cx, parent, CTypeProto, CDataProto,
+  if (!InitTypeConstructor(cx, ctypesObj, CTypeProto, CDataProto,
          sArrayFunction, nullptr, sArrayProps,
          sArrayInstanceFunctions, sArrayInstanceProps,
          protos[SLOT_ARRAYPROTO], protos[SLOT_ARRAYDATAPROTO]))
     return false;
 
-  if (!InitTypeConstructor(cx, parent, CTypeProto, CDataProto,
+  if (!InitTypeConstructor(cx, ctypesObj, CTypeProto, CDataProto,
          sStructFunction, sStructFunctions, sStructProps,
          sStructInstanceFunctions, nullptr,
          protos[SLOT_STRUCTPROTO], protos[SLOT_STRUCTDATAPROTO]))
     return false;
 
-  if (!InitTypeConstructor(cx, parent, CTypeProto, protos[SLOT_POINTERDATAPROTO],
+  if (!InitTypeConstructor(cx, ctypesObj, CTypeProto, protos[SLOT_POINTERDATAPROTO],
          sFunctionFunction, nullptr, sFunctionProps, sFunctionInstanceFunctions, nullptr,
          protos[SLOT_FUNCTIONPROTO], protos[SLOT_FUNCTIONDATAPROTO]))
     return false;
@@ -1231,18 +1231,18 @@
   //   * 'prototype' property:
   //     * [[Class]] {"Int64Proto","UInt64Proto"}
   //     * 'constructor' property === ctypes.{Int64,UInt64}
-  protos[SLOT_INT64PROTO].set(InitInt64Class(cx, parent, &sInt64ProtoClass,
+  protos[SLOT_INT64PROTO].set(InitInt64Class(cx, ctypesObj, &sInt64ProtoClass,
     Int64::Construct, sInt64Functions, sInt64StaticFunctions));
   if (!protos[SLOT_INT64PROTO])
     return false;
-  protos[SLOT_UINT64PROTO].set(InitInt64Class(cx, parent, &sUInt64ProtoClass,
+  protos[SLOT_UINT64PROTO].set(InitInt64Class(cx, ctypesObj, &sUInt64ProtoClass,
     UInt64::Construct, sUInt64Functions, sUInt64StaticFunctions));
   if (!protos[SLOT_UINT64PROTO])
     return false;
 
   // Finally, store a pointer to the global ctypes object.
   // Note that there is no other reliable manner of locating this object.
-  protos[SLOT_CTYPES].set(parent);
+  protos[SLOT_CTYPES].set(ctypesObj);
 
   // Attach the prototypes just created to each of ctypes.CType.prototype,
   // and the special type constructors, so we can access them when constructing
@@ -1253,14 +1253,14 @@
   AttachProtos(protos[SLOT_STRUCTPROTO], protos);
   AttachProtos(protos[SLOT_FUNCTIONPROTO], protos);
 
-  RootedObject ABIProto(cx, InitABIClass(cx, parent));
+  RootedObject ABIProto(cx, InitABIClass(cx));
   if (!ABIProto)
     return false;
 
   // Attach objects representing ABI constants.
-  if (!DefineABIConstant(cx, parent, "default_abi", ABI_DEFAULT, ABIProto) ||
-      !DefineABIConstant(cx, parent, "stdcall_abi", ABI_STDCALL, ABIProto) ||
-      !DefineABIConstant(cx, parent, "winapi_abi", ABI_WINAPI, ABIProto))
+  if (!DefineABIConstant(cx, ctypesObj, "default_abi", ABI_DEFAULT, ABIProto) ||
+      !DefineABIConstant(cx, ctypesObj, "stdcall_abi", ABI_STDCALL, ABIProto) ||
+      !DefineABIConstant(cx, ctypesObj, "winapi_abi", ABI_WINAPI, ABIProto))
     return false;
 
   // Create objects representing the builtin types, and attach them to the
@@ -1275,7 +1275,7 @@
   //     * 'constructor' property === 't'
 #define DEFINE_TYPE(name, type, ffiType)                                       \
   RootedObject typeObj_##name(cx,                                              \
-    CType::DefineBuiltin(cx, parent, #name, CTypeProto, CDataProto, #name,     \
+    CType::DefineBuiltin(cx, ctypesObj, #name, CTypeProto, CDataProto, #name,  \
       TYPE_##name, INT_TO_JSVAL(sizeof(type)),                                 \
       INT_TO_JSVAL(ffiType.alignment), &ffiType));                             \
   if (!typeObj_##name)                                                         \
@@ -1285,19 +1285,19 @@
 
   // Alias 'ctypes.unsigned' as 'ctypes.unsigned_int', since they represent
   // the same type in C.
-  if (!JS_DefineProperty(cx, parent, "unsigned", typeObj_unsigned_int,
+  if (!JS_DefineProperty(cx, ctypesObj, "unsigned", typeObj_unsigned_int,
                          JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT))
     return false;
 
   // Alias 'ctypes.jschar' as 'ctypes.char16_t' to prevent breaking addons
   // that are still using jschar (bug 1064935).
-  if (!JS_DefineProperty(cx, parent, "jschar", typeObj_char16_t,
+  if (!JS_DefineProperty(cx, ctypesObj, "jschar", typeObj_char16_t,
                          JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT))
     return false;
 
   // Create objects representing the special types void_t and voidptr_t.
   RootedObject typeObj(cx,
-    CType::DefineBuiltin(cx, parent, "void_t", CTypeProto, CDataProto, "void",
+    CType::DefineBuiltin(cx, ctypesObj, "void_t", CTypeProto, CDataProto, "void",
                          TYPE_void_t, JSVAL_VOID, JSVAL_VOID, &ffi_type_void));
   if (!typeObj)
     return false;
@@ -1305,7 +1305,7 @@
   typeObj = PointerType::CreateInternal(cx, typeObj);
   if (!typeObj)
     return false;
-  if (!JS_DefineProperty(cx, parent, "voidptr_t", typeObj,
+  if (!JS_DefineProperty(cx, ctypesObj, "voidptr_t", typeObj,
                          JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT))
     return false;
 
@@ -1390,7 +1390,7 @@
   if (!GetObjectProperty(cx, ctypes, "CDataFinalizer", &ctor))
     return false;
 
-  RootedObject prototype(cx, JS_NewObject(cx, &sCDataFinalizerProtoClass, ctypes));
+  RootedObject prototype(cx, JS_NewObject(cx, &sCDataFinalizerProtoClass));
   if (!prototype)
     return false;
 
@@ -3286,8 +3286,6 @@
   RootedString name(cx, name_);
   RootedValue size(cx, size_);
   RootedValue align(cx, align_);
-  RootedObject parent(cx, JS_GetParent(typeProto));
-  MOZ_ASSERT(parent);
 
   // Create a CType object with the properties and slots common to all CTypes.
   // Each type object 't' has:
@@ -3305,7 +3303,7 @@
   //     * 'constructor' property === 't'
   //     * Additional properties specified by 'ps', as appropriate for the
   //       specific type instance 't'.
-  RootedObject typeObj(cx, JS_NewObjectWithGivenProto(cx, &sCTypeClass, typeProto, parent));
+  RootedObject typeObj(cx, JS_NewObjectWithGivenProto(cx, &sCTypeClass, typeProto));
   if (!typeObj)
     return nullptr;
 
@@ -3320,7 +3318,7 @@
 
   if (dataProto) {
     // Set up the 'prototype' and 'prototype.constructor' properties.
-    RootedObject prototype(cx, JS_NewObjectWithGivenProto(cx, &sCDataProtoClass, dataProto, parent));
+    RootedObject prototype(cx, JS_NewObjectWithGivenProto(cx, &sCDataProtoClass, dataProto));
     if (!prototype)
       return nullptr;
 
@@ -3347,7 +3345,7 @@
 
 JSObject*
 CType::DefineBuiltin(JSContext* cx,
-                     JSObject* parent_,
+                     HandleObject ctypesObj,
                      const char* propName,
                      JSObject* typeProto_,
                      JSObject* dataProto_,
@@ -3357,7 +3355,6 @@
                      jsval align_,
                      ffi_type* ffiType)
 {
-  RootedObject parent(cx, parent_);
   RootedObject typeProto(cx, typeProto_);
   RootedObject dataProto(cx, dataProto_);
   RootedValue size(cx, size_);
@@ -3372,8 +3369,8 @@
   if (!typeObj)
     return nullptr;
 
-  // Define the CType as a 'propName' property on 'parent'.
-  if (!JS_DefineProperty(cx, parent, propName, typeObj,
+  // Define the CType as a 'propName' property on 'ctypesObj'.
+  if (!JS_DefineProperty(cx, ctypesObj, propName, typeObj,
                          JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT))
     return nullptr;
 
@@ -4872,7 +4869,7 @@
   // Set up the 'prototype' and 'prototype.constructor' properties.
   // The prototype will reflect the struct fields as properties on CData objects
   // created from this type.
-  RootedObject prototype(cx, JS_NewObjectWithGivenProto(cx, &sCDataProtoClass, dataProto, NullPtr()));
+  RootedObject prototype(cx, JS_NewObjectWithGivenProto(cx, &sCDataProtoClass, dataProto));
   if (!prototype)
     return false;
 
@@ -6378,10 +6375,8 @@
   MOZ_ASSERT(slot.isObject());
 
   RootedObject proto(cx, &slot.toObject());
-  RootedObject parent(cx, JS_GetParent(typeObj));
-  MOZ_ASSERT(parent);
 
-  RootedObject dataObj(cx, JS_NewObjectWithGivenProto(cx, &sCDataClass, proto, parent));
+  RootedObject dataObj(cx, JS_NewObjectWithGivenProto(cx, &sCDataClass, proto));
   if (!dataObj)
     return nullptr;
 
@@ -6962,8 +6957,7 @@
 
   // Get arguments
   if (args.length() == 0) { // Special case: the empty (already finalized) object
-    JSObject *objResult = JS_NewObjectWithGivenProto(cx, &sCDataFinalizerClass, objProto,
-                                                     NullPtr());
+    JSObject *objResult = JS_NewObjectWithGivenProto(cx, &sCDataFinalizerClass, objProto);
     args.rval().setObject(*objResult);
     return true;
   }
@@ -7062,7 +7056,7 @@
 
   // 5. Create |objResult|
 
-  JSObject *objResult = JS_NewObjectWithGivenProto(cx, &sCDataFinalizerClass, objProto, NullPtr());
+  JSObject *objResult = JS_NewObjectWithGivenProto(cx, &sCDataFinalizerClass, objProto);
   if (!objResult) {
     return false;
   }
@@ -7361,8 +7355,7 @@
                      bool isUnsigned)
 {
   const JSClass* clasp = isUnsigned ? &sUInt64Class : &sInt64Class;
-  RootedObject parent(cx, JS_GetParent(proto));
-  RootedObject result(cx, JS_NewObjectWithGivenProto(cx, clasp, proto, parent));
+  RootedObject result(cx, JS_NewObjectWithGivenProto(cx, clasp, proto));
   if (!result)
     return nullptr;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ctypes/CTypes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ctypes/CTypes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ctypes/CTypes.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ctypes/CTypes.h	2015-02-28 15:03:04.000000000 +0000
@@ -416,7 +416,7 @@
   JSObject* Create(JSContext* cx, HandleObject typeProto, HandleObject dataProto,
     TypeCode type, JSString* name, jsval size, jsval align, ffi_type* ffiType);
 
-  JSObject* DefineBuiltin(JSContext* cx, JSObject* parent, const char* propName,
+  JSObject* DefineBuiltin(JSContext* cx, HandleObject ctypesObj, const char* propName,
     JSObject* typeProto, JSObject* dataProto, const char* name, TypeCode type,
     jsval size, jsval align, ffi_type* ffiType);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ctypes/Library.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ctypes/Library.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ctypes/Library.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ctypes/Library.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "ctypes/Library.h"
 
+#include "prerror.h"
 #include "prlink.h"
 
 #include "ctypes/CTypes.h"
@@ -146,12 +147,17 @@
   PRLibrary* library = PR_LoadLibraryWithFlags(libSpec, 0);
 
   if (!library) {
+    char *error = (char*) JS_malloc(cx, PR_GetErrorTextLength() + 1);
+    if (error)
+      PR_GetErrorText(error);
+
 #ifdef XP_WIN
-    JS_ReportError(cx, "couldn't open library %hs", pathChars);
+    JS_ReportError(cx, "couldn't open library %hs: %s", pathChars, error);
 #else
-    JS_ReportError(cx, "couldn't open library %s", pathBytes);
+    JS_ReportError(cx, "couldn't open library %s: %s", pathBytes, error);
     JS_free(cx, pathBytes);
 #endif
+    JS_free(cx, error);
     return nullptr;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/automation/autospider.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/automation/autospider.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/automation/autospider.sh	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/automation/autospider.sh	2015-02-28 15:03:04.000000000 +0000
@@ -111,34 +111,39 @@
 $MAKE -s -w -j4 || exit 2
 cp -p $SOURCE/build/unix/run-mozilla.sh $OBJDIR/dist/bin
 
-# The root analysis tests run in a special GC Zeal mode and disable ASLR to
-# make tests reproducible.
 COMMAND_PREFIX=''
+
+# On Linux, disable ASLR to make shell builds a bit more reproducible.
+if type setarch >/dev/null 2>&1; then
+    COMMAND_PREFIX="setarch $(uname -m) -R "
+fi
+
+RUN_JSTESTS=true
+
 if [[ "$VARIANT" = "rootanalysis" ]]; then
     export JS_GC_ZEAL=7
 
-    # rootanalysis builds are currently only done on Linux, which should have
-    # setarch, but just in case we enable them on another platform:
-    if type setarch >/dev/null 2>&1; then
-        COMMAND_PREFIX="setarch $(uname -m) -R "
-    fi
 elif [[ "$VARIANT" = "generational" ]]; then
     # Generational is currently being used for compacting GC
     export JS_GC_ZEAL=14
 
     # Ignore timeouts from tests that are known to take too long with this zeal mode
     export JITTEST_EXTRA_ARGS=--ignore-timeouts=$ABSDIR/cgc-jittest-timeouts.txt
+    export JSTESTS_EXTRA_ARGS=--exclude-file=$ABSDIR/cgc-jstests-slow.txt
 
-    # rootanalysis builds are currently only done on Linux, which should have
-    # setarch, but just in case we enable them on another platform:
-    if type setarch >/dev/null 2>&1; then
-        COMMAND_PREFIX="setarch $(uname -m) -R "
-    fi
+    case "$platform" in
+    win*)
+        RUN_JSTESTS=false
+    esac
+fi
+
+if [[ "$VARIANT" = "warnaserr" ]]; then
+    export JSTESTS_EXTRA_ARGS=--tbpl
 fi
 
 $COMMAND_PREFIX $MAKE check || exit 1
 $COMMAND_PREFIX $MAKE check-jit-test || exit 1
-if [[ "$VARIANT" != "generational" ]]; then
+$COMMAND_PREFIX $OBJDIR/dist/bin/jsapi-tests || exit 1
+if $RUN_JSTESTS; then
     $COMMAND_PREFIX $MAKE check-jstests || exit 1
 fi
-$COMMAND_PREFIX $OBJDIR/dist/bin/jsapi-tests || exit 1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/automation/cgc-jstests-slow.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/automation/cgc-jstests-slow.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/automation/cgc-jstests-slow.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/automation/cgc-jstests-slow.txt	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,58 @@
+ecma_5/Object/15.2.3.6-dictionary-redefinition-01-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-02-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-03-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-04-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-05-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-06-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-07-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-08-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-09-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-10-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-11-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-12-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-13-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-14-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-15-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-16-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-17-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-18-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-19-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-20-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-21-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-22-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-23-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-24-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-25-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-26-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-27-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-28-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-29-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-30-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-31-of-32.js
+ecma_5/Object/15.2.3.6-dictionary-redefinition-32-of-32.js
+ecma_5/Object/15.2.3.6-middle-redefinition-1-of-8.js
+ecma_5/Object/15.2.3.6-middle-redefinition-2-of-8.js
+ecma_5/Object/15.2.3.6-middle-redefinition-3-of-8.js
+ecma_5/Object/15.2.3.6-middle-redefinition-4-of-8.js
+ecma_5/Object/15.2.3.6-middle-redefinition-5-of-8.js
+ecma_5/Object/15.2.3.6-middle-redefinition-6-of-8.js
+ecma_5/Object/15.2.3.6-middle-redefinition-7-of-8.js
+ecma_5/Object/15.2.3.6-middle-redefinition-8-of-8.js
+ecma_5/Object/15.2.3.6-redefinition-1-of-4.js
+ecma_5/Object/15.2.3.6-redefinition-2-of-4.js
+ecma_5/Object/15.2.3.6-redefinition-3-of-4.js
+ecma_5/Object/15.2.3.6-redefinition-4-of-4.js
+ecma_6/String/normalize-generateddata-part0.js
+ecma_6/String/normalize-generateddata-part1-not-listed.js
+ecma_6/String/normalize-generateddata-part1.js
+ecma_6/String/normalize-generateddata-part2.js
+ecma_6/String/normalize-generateddata-part3.js
+js1_5/GC/regress-203278-2.js
+js1_5/GC/regress-278725.js
+js1_5/Regress/regress-360969-01.js
+js1_5/Regress/regress-360969-02.js
+js1_5/Regress/regress-360969-03.js
+js1_5/Regress/regress-360969-04.js
+js1_5/Regress/regress-360969-05.js
+js1_5/Regress/regress-360969-06.js
+js1_8_5/extensions/clone-complex-object.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/3d-cube.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/3d-cube.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/3d-cube.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/3d-cube.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,369 +0,0 @@
-// 3D Cube Rotation
-// http://www.speich.net/computer/moztesting/3d.htm
-// Created by Simon Speich
-
-var Q = new Array();
-var MTrans = new Array();  // transformation matrix
-var MQube = new Array();  // position information of qube
-var I = new Array();      // entity matrix
-var Origin = new Object();
-var Testing = new Object();
-var LoopTimer;
-
-var DisplArea = new Object();
-DisplArea.Width = 300;
-DisplArea.Height = 300;
-
-function DrawLine(From, To) {
-  var x1 = From.V[0];
-  var x2 = To.V[0];
-  var y1 = From.V[1];
-  var y2 = To.V[1];
-  var dx = Math.abs(x2 - x1);
-  var dy = Math.abs(y2 - y1);
-  var x = x1;
-  var y = y1;
-  var IncX1, IncY1;
-  var IncX2, IncY2;  
-  var Den;
-  var Num;
-  var NumAdd;
-  var NumPix;
-
-  if (x2 >= x1) {  IncX1 = 1; IncX2 = 1;  }
-  else { IncX1 = -1; IncX2 = -1; }
-  if (y2 >= y1)  {  IncY1 = 1; IncY2 = 1; }
-  else { IncY1 = -1; IncY2 = -1; }
-  if (dx >= dy) {
-    IncX1 = 0;
-    IncY2 = 0;
-    Den = dx;
-    Num = dx / 2;
-    NumAdd = dy;
-    NumPix = dx;
-  }
-  else {
-    IncX2 = 0;
-    IncY1 = 0;
-    Den = dy;
-    Num = dy / 2;
-    NumAdd = dx;
-    NumPix = dy;
-  }
-
-  NumPix = Math.round(Q.LastPx + NumPix);
-
-  var i = Q.LastPx;
-/* BEGIN LOOP */
-  for (; i < NumPix; i++) {
-    Num += NumAdd;
-    if (Num >= Den) {
-      Num -= Den;
-      x += IncX1;
-      y += IncY1;
-    }
-    x += IncX2;
-    y += IncY2;
-  }
-/* END LOOP */
-  Q.LastPx = NumPix;
-}
-
-function CalcCross(V0, V1) {
-  var Cross = new Array();
-  Cross[0] = V0[1]*V1[2] - V0[2]*V1[1];
-  Cross[1] = V0[2]*V1[0] - V0[0]*V1[2];
-  Cross[2] = V0[0]*V1[1] - V0[1]*V1[0];
-  return Cross;
-}
-
-function CalcNormal(V0, V1, V2) {
-  var A = new Array();   var B = new Array(); 
-/* BEGIN LOOP */
-  for (var i = 0; i < 3; i++) {
-    A[i] = V0[i] - V1[i];
-    B[i] = V2[i] - V1[i];
-  }
-/* END LOOP */
-  A = CalcCross(A, B);
-  var Length = Math.sqrt(A[0]*A[0] + A[1]*A[1] + A[2]*A[2]); 
-/* BEGIN LOOP */
-  for (var i = 0; i < 3; i++) A[i] = A[i] / Length;
-/* END LOOP */
-  A[3] = 1;
-  return A;
-}
-
-function CreateP(X,Y,Z) {
-  this.V = [X,Y,Z,1];
-}
-
-// multiplies two matrices
-function MMulti(M1, M2) {
-  var M = [[],[],[],[]];
-  var i = 0;
-  var j = 0;
-/* BEGIN LOOP */
-  for (; i < 4; i++) {
-    j = 0;
-/* BEGIN LOOP */
-    for (; j < 4; j++) M[i][j] = M1[i][0] * M2[0][j] + M1[i][1] * M2[1][j] + M1[i][2] * M2[2][j] + M1[i][3] * M2[3][j];
-/* END LOOP */
-  }
-/* END LOOP */
-  return M;
-}
-
-//multiplies matrix with vector
-function VMulti(M, V) {
-  var Vect = new Array();
-  var i = 0;
-/* BEGIN LOOP */
-  for (;i < 4; i++) Vect[i] = M[i][0] * V[0] + M[i][1] * V[1] + M[i][2] * V[2] + M[i][3] * V[3];
-/* END LOOP */
-  return Vect;
-}
-
-function VMulti2(M, V) {
-  var Vect = new Array();
-  var i = 0;
-/* BEGIN LOOP */
-  for (;i < 3; i++) Vect[i] = M[i][0] * V[0] + M[i][1] * V[1] + M[i][2] * V[2];
-/* END LOOP */
-  return Vect;
-}
-
-// add to matrices
-function MAdd(M1, M2) {
-  var M = [[],[],[],[]];
-  var i = 0;
-  var j = 0;
-/* BEGIN LOOP */
-  for (; i < 4; i++) {
-    j = 0;
-/* BEGIN LOOP */
-    for (; j < 4; j++) M[i][j] = M1[i][j] + M2[i][j];
-/* END LOOP */
-  }
-/* END LOOP */
-  return M;
-}
-
-function Translate(M, Dx, Dy, Dz) {
-  var T = [
-  [1,0,0,Dx],
-  [0,1,0,Dy],
-  [0,0,1,Dz],
-  [0,0,0,1]
-  ];
-  return MMulti(T, M);
-}
-
-function RotateX(M, Phi) {
-  var a = Phi;
-  a *= Math.PI / 180;
-  var Cos = Math.cos(a);
-  var Sin = Math.sin(a);
-  var R = [
-  [1,0,0,0],
-  [0,Cos,-Sin,0],
-  [0,Sin,Cos,0],
-  [0,0,0,1]
-  ];
-  return MMulti(R, M);
-}
-
-function RotateY(M, Phi) {
-  var a = Phi;
-  a *= Math.PI / 180;
-  var Cos = Math.cos(a);
-  var Sin = Math.sin(a);
-  var R = [
-  [Cos,0,Sin,0],
-  [0,1,0,0],
-  [-Sin,0,Cos,0],
-  [0,0,0,1]
-  ];
-  return MMulti(R, M);
-}
-
-function RotateZ(M, Phi) {
-  var a = Phi;
-  a *= Math.PI / 180;
-  var Cos = Math.cos(a);
-  var Sin = Math.sin(a);
-  var R = [
-  [Cos,-Sin,0,0],
-  [Sin,Cos,0,0],
-  [0,0,1,0],   
-  [0,0,0,1]
-  ];
-  return MMulti(R, M);
-}
-
-function DrawQube() {
-  // calc current normals
-  var CurN = new Array();
-  var i = 5;
-  Q.LastPx = 0;
-/* BEGIN LOOP */
-  for (; i > -1; i--) CurN[i] = VMulti2(MQube, Q.Normal[i]);
-/* END LOOP */
-  if (CurN[0][2] < 0) {
-    if (!Q.Line[0]) { DrawLine(Q[0], Q[1]); Q.Line[0] = true; };
-    if (!Q.Line[1]) { DrawLine(Q[1], Q[2]); Q.Line[1] = true; };
-    if (!Q.Line[2]) { DrawLine(Q[2], Q[3]); Q.Line[2] = true; };
-    if (!Q.Line[3]) { DrawLine(Q[3], Q[0]); Q.Line[3] = true; };
-  }
-  if (CurN[1][2] < 0) {
-    if (!Q.Line[2]) { DrawLine(Q[3], Q[2]); Q.Line[2] = true; };
-    if (!Q.Line[9]) { DrawLine(Q[2], Q[6]); Q.Line[9] = true; };
-    if (!Q.Line[6]) { DrawLine(Q[6], Q[7]); Q.Line[6] = true; };
-    if (!Q.Line[10]) { DrawLine(Q[7], Q[3]); Q.Line[10] = true; };
-  }
-  if (CurN[2][2] < 0) {
-    if (!Q.Line[4]) { DrawLine(Q[4], Q[5]); Q.Line[4] = true; };
-    if (!Q.Line[5]) { DrawLine(Q[5], Q[6]); Q.Line[5] = true; };
-    if (!Q.Line[6]) { DrawLine(Q[6], Q[7]); Q.Line[6] = true; };
-    if (!Q.Line[7]) { DrawLine(Q[7], Q[4]); Q.Line[7] = true; };
-  }
-  if (CurN[3][2] < 0) {
-    if (!Q.Line[4]) { DrawLine(Q[4], Q[5]); Q.Line[4] = true; };
-    if (!Q.Line[8]) { DrawLine(Q[5], Q[1]); Q.Line[8] = true; };
-    if (!Q.Line[0]) { DrawLine(Q[1], Q[0]); Q.Line[0] = true; };
-    if (!Q.Line[11]) { DrawLine(Q[0], Q[4]); Q.Line[11] = true; };
-  }
-  if (CurN[4][2] < 0) {
-    if (!Q.Line[11]) { DrawLine(Q[4], Q[0]); Q.Line[11] = true; };
-    if (!Q.Line[3]) { DrawLine(Q[0], Q[3]); Q.Line[3] = true; };
-    if (!Q.Line[10]) { DrawLine(Q[3], Q[7]); Q.Line[10] = true; };
-    if (!Q.Line[7]) { DrawLine(Q[7], Q[4]); Q.Line[7] = true; };
-  }
-  if (CurN[5][2] < 0) {
-    if (!Q.Line[8]) { DrawLine(Q[1], Q[5]); Q.Line[8] = true; };
-    if (!Q.Line[5]) { DrawLine(Q[5], Q[6]); Q.Line[5] = true; };
-    if (!Q.Line[9]) { DrawLine(Q[6], Q[2]); Q.Line[9] = true; };
-    if (!Q.Line[1]) { DrawLine(Q[2], Q[1]); Q.Line[1] = true; };
-  }
-  Q.Line = [false,false,false,false,false,false,false,false,false,false,false,false];
-  Q.LastPx = 0;
-}
-
-function Loop() {
-  if (Testing.LoopCount > Testing.LoopMax) return;
-  var TestingStr = String(Testing.LoopCount);
-/* BEGIN LOOP */
-  while (TestingStr.length < 3) TestingStr = "0" + TestingStr;
-/* END LOOP */
-  MTrans = Translate(I, -Q[8].V[0], -Q[8].V[1], -Q[8].V[2]);
-  MTrans = RotateX(MTrans, 1);
-  MTrans = RotateY(MTrans, 3);
-  MTrans = RotateZ(MTrans, 5);
-  MTrans = Translate(MTrans, Q[8].V[0], Q[8].V[1], Q[8].V[2]);
-  MQube = MMulti(MTrans, MQube);
-  var i = 8;
-/* BEGIN LOOP */
-  for (; i > -1; i--) {
-    Q[i].V = VMulti(MTrans, Q[i].V);
-  }
-/* END LOOP */
-  DrawQube();
-  Testing.LoopCount++;
-  Loop();
-}
-
-function Init(CubeSize) {
-  // init/reset vars
-  Origin.V = [150,150,20,1];
-  Testing.LoopCount = 0;
-  Testing.LoopMax = 50;
-  Testing.TimeMax = 0;
-  Testing.TimeAvg = 0;
-  Testing.TimeMin = 0;
-  Testing.TimeTemp = 0;
-  Testing.TimeTotal = 0;
-  Testing.Init = false;
-
-  // transformation matrix
-  MTrans = [
-  [1,0,0,0],
-  [0,1,0,0],
-  [0,0,1,0],
-  [0,0,0,1]
-  ];
-  
-  // position information of qube
-  MQube = [
-  [1,0,0,0],
-  [0,1,0,0],
-  [0,0,1,0],
-  [0,0,0,1]
-  ];
-  
-  // entity matrix
-  I = [
-  [1,0,0,0],
-  [0,1,0,0],
-  [0,0,1,0],
-  [0,0,0,1]
-  ];
-  
-  // create qube
-  Q[0] = new CreateP(-CubeSize,-CubeSize, CubeSize);
-  Q[1] = new CreateP(-CubeSize, CubeSize, CubeSize);
-  Q[2] = new CreateP( CubeSize, CubeSize, CubeSize);
-  Q[3] = new CreateP( CubeSize,-CubeSize, CubeSize);
-  Q[4] = new CreateP(-CubeSize,-CubeSize,-CubeSize);
-  Q[5] = new CreateP(-CubeSize, CubeSize,-CubeSize);
-  Q[6] = new CreateP( CubeSize, CubeSize,-CubeSize);
-  Q[7] = new CreateP( CubeSize,-CubeSize,-CubeSize);
-  
-  // center of gravity
-  Q[8] = new CreateP(0, 0, 0);
-  
-  // anti-clockwise edge check
-  Q.Edge = [[0,1,2],[3,2,6],[7,6,5],[4,5,1],[4,0,3],[1,5,6]];
-  
-  // calculate squad normals
-  Q.Normal = new Array();
-/* BEGIN LOOP */
-  for (var i = 0; i < Q.Edge.length; i++) Q.Normal[i] = CalcNormal(Q[Q.Edge[i][0]].V, Q[Q.Edge[i][1]].V, Q[Q.Edge[i][2]].V);
-/* END LOOP */
-  
-  // line drawn ?
-  Q.Line = [false,false,false,false,false,false,false,false,false,false,false,false];
-  
-  // create line pixels
-  Q.NumPx = 9 * 2 * CubeSize;
-/* BEGIN LOOP */
-  for (var i = 0; i < Q.NumPx; i++) CreateP(0,0,0);
-/* END LOOP */
-  
-  MTrans = Translate(MTrans, Origin.V[0], Origin.V[1], Origin.V[2]);
-  MQube = MMulti(MTrans, MQube);
-
-  var i = 0;
-/* BEGIN LOOP */
-  for (; i < 9; i++) {
-    Q[i].V = VMulti(MTrans, Q[i].V);
-  }
-/* END LOOP */
-  DrawQube();
-  Testing.Init = true;
-  Loop();
-}
-
-/* BEGIN LOOP */
-for ( var i = 20; i <= 160; i *= 2 ) {
-  Init(i);
-}
-/* END LOOP */
-
-Q = null;
-MTrans = null;
-MQube = null;
-I = null;
-Origin = null;
-Testing = null;
-LoopTime = null;
-DisplArea = null;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/3d-morph.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/3d-morph.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/3d-morph.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/3d-morph.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-var loops = 15
-var nx = 120
-var nz = 120
-
-function morph(a, f) {
-    var PI2nx = Math.PI * 8/nx
-    var sin = Math.sin
-    var f30 = -(50 * sin(f*Math.PI*2))
-    
-/* BEGIN LOOP */
-    for (var i = 0; i < nz; ++i) {
-/* BEGIN LOOP */
-        for (var j = 0; j < nx; ++j) {
-            a[3*(i*nx+j)+1]    = sin((j-1) * PI2nx ) * -f30
-        }
-/* END LOOP */
-    }
-/* END LOOP */
-}
-
-    
-var a = Array()
-/* BEGIN LOOP */
-for (var i=0; i < nx*nz*3; ++i) 
-    a[i] = 0
-/* END LOOP */
-
-/* BEGIN LOOP */
-for (var i = 0; i < loops; ++i) {
-    morph(a, i/loops)
-}
-/* END LOOP */
-
-testOutput = 0;
-/* BEGIN LOOP */
-for (var i = 0; i < nx; i++)
-    testOutput += a[3*(i*nx+i)+1];
-/* END LOOP */
-a = null;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/3d-raytrace.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/3d-raytrace.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/3d-raytrace.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/3d-raytrace.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,466 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-function createVector(x,y,z) {
-    return new Array(x,y,z);
-}
-
-function sqrLengthVector(self) {
-    return self[0] * self[0] + self[1] * self[1] + self[2] * self[2];
-}
-
-function lengthVector(self) {
-    return Math.sqrt(self[0] * self[0] + self[1] * self[1] + self[2] * self[2]);
-}
-
-function addVector(self, v) {
-    self[0] += v[0];
-    self[1] += v[1];
-    self[2] += v[2];
-    return self;
-}
-
-function subVector(self, v) {
-    self[0] -= v[0];
-    self[1] -= v[1];
-    self[2] -= v[2];
-    return self;
-}
-
-function scaleVector(self, scale) {
-    self[0] *= scale;
-    self[1] *= scale;
-    self[2] *= scale;
-    return self;
-}
-
-function normaliseVector(self) {
-    var len = Math.sqrt(self[0] * self[0] + self[1] * self[1] + self[2] * self[2]);
-    self[0] /= len;
-    self[1] /= len;
-    self[2] /= len;
-    return self;
-}
-
-function add(v1, v2) {
-    return new Array(v1[0] + v2[0], v1[1] + v2[1], v1[2] + v2[2]);
-}
-
-function sub(v1, v2) {
-    return new Array(v1[0] - v2[0], v1[1] - v2[1], v1[2] - v2[2]);
-}
-
-function scalev(v1, v2) {
-    return new Array(v1[0] * v2[0], v1[1] * v2[1], v1[2] * v2[2]);
-}
-
-function dot(v1, v2) {
-    return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
-}
-
-function scale(v, scale) {
-    return [v[0] * scale, v[1] * scale, v[2] * scale];
-}
-
-function cross(v1, v2) {
-    return [v1[1] * v2[2] - v1[2] * v2[1], 
-            v1[2] * v2[0] - v1[0] * v2[2],
-            v1[0] * v2[1] - v1[1] * v2[0]];
-
-}
-
-function normalise(v) {
-    var len = lengthVector(v);
-    return [v[0] / len, v[1] / len, v[2] / len];
-}
-
-function transformMatrix(self, v) {
-    var vals = self;
-    var x  = vals[0] * v[0] + vals[1] * v[1] + vals[2] * v[2] + vals[3];
-    var y  = vals[4] * v[0] + vals[5] * v[1] + vals[6] * v[2] + vals[7];
-    var z  = vals[8] * v[0] + vals[9] * v[1] + vals[10] * v[2] + vals[11];
-    return [x, y, z];
-}
-
-function invertMatrix(self) {
-    var temp = new Array(16);
-    var tx = -self[3];
-    var ty = -self[7];
-    var tz = -self[11];
-    /* BEGIN LOOP */
-    for (h = 0; h < 3; h++) {
-	/* BEGIN LOOP */
-        for (v = 0; v < 3; v++) 
-            temp[h + v * 4] = self[v + h * 4];
-	/* END LOOP */
-    }
-    /* END LOOP */
-    /* BEGIN LOOP */
-    for (i = 0; i < 11; i++)
-        self[i] = temp[i];
-    /* END LOOP */
-    self[3] = tx * self[0] + ty * self[1] + tz * self[2];
-    self[7] = tx * self[4] + ty * self[5] + tz * self[6];
-    self[11] = tx * self[8] + ty * self[9] + tz * self[10];
-    return self;
-}
-
-
-// Triangle intersection using barycentric coord method
-function Triangle(p1, p2, p3) {
-    var edge1 = sub(p3, p1);
-    var edge2 = sub(p2, p1);
-    var normal = cross(edge1, edge2);
-    if (Math.abs(normal[0]) > Math.abs(normal[1]))
-        if (Math.abs(normal[0]) > Math.abs(normal[2]))
-            this.axis = 0; 
-        else 
-            this.axis = 2;
-    else
-        if (Math.abs(normal[1]) > Math.abs(normal[2])) 
-            this.axis = 1;
-        else 
-            this.axis = 2;
-    var u = (this.axis + 1) % 3;
-    var v = (this.axis + 2) % 3;
-    var u1 = edge1[u];
-    var v1 = edge1[v];
-    
-    var u2 = edge2[u];
-    var v2 = edge2[v];
-    this.normal = normalise(normal);
-    this.nu = normal[u] / normal[this.axis];
-    this.nv = normal[v] / normal[this.axis];
-    this.nd = dot(normal, p1) / normal[this.axis];
-    var det = u1 * v2 - v1 * u2;
-    this.eu = p1[u];
-    this.ev = p1[v]; 
-    this.nu1 = u1 / det;
-    this.nv1 = -v1 / det;
-    this.nu2 = v2 / det;
-    this.nv2 = -u2 / det; 
-    this.material = [0.7, 0.7, 0.7];
-}
-
-Triangle.prototype.intersect = function(orig, dir, near, far) {
-    var u = (this.axis + 1) % 3;
-    var v = (this.axis + 2) % 3;
-    var d = dir[this.axis] + this.nu * dir[u] + this.nv * dir[v];
-    var t = (this.nd - orig[this.axis] - this.nu * orig[u] - this.nv * orig[v]) / d;
-    if (t < near || t > far)
-        return null;
-    var Pu = orig[u] + t * dir[u] - this.eu;
-    var Pv = orig[v] + t * dir[v] - this.ev;
-    var a2 = Pv * this.nu1 + Pu * this.nv1;
-    if (a2 < 0) 
-        return null;
-    var a3 = Pu * this.nu2 + Pv * this.nv2;
-    if (a3 < 0) 
-        return null;
-
-    if ((a2 + a3) > 1) 
-        return null;
-    return t;
-}
-
-function Scene(a_triangles) {
-    this.triangles = a_triangles;
-    this.lights = [];
-    this.ambient = [0,0,0];
-    this.background = [0.8,0.8,1];
-}
-var zero = new Array(0,0,0);
-
-Scene.prototype.intersect = function(origin, dir, near, far) {
-    var closest = null;
-    /* BEGIN LOOP */
-    for (i = 0; i < this.triangles.length; i++) {
-        var triangle = this.triangles[i];   
-        var d = triangle.intersect(origin, dir, near, far);
-        if (d == null || d > far || d < near)
-            continue;
-        far = d;
-        closest = triangle;
-    }
-    /* END LOOP */
-    
-    if (!closest)
-        return [this.background[0],this.background[1],this.background[2]];
-        
-    var normal = closest.normal;
-    var hit = add(origin, scale(dir, far)); 
-    if (dot(dir, normal) > 0)
-        normal = [-normal[0], -normal[1], -normal[2]];
-    
-    var colour = null;
-    if (closest.shader) {
-        colour = closest.shader(closest, hit, dir);
-    } else {
-        colour = closest.material;
-    }
-    
-    // do reflection
-    var reflected = null;
-    if (colour.reflection > 0.001) {
-        var reflection = addVector(scale(normal, -2*dot(dir, normal)), dir);
-        reflected = this.intersect(hit, reflection, 0.0001, 1000000);
-        if (colour.reflection >= 0.999999)
-            return reflected;
-    }
-    
-    var l = [this.ambient[0], this.ambient[1], this.ambient[2]];
-    /* BEGIN LOOP */
-    for (var i = 0; i < this.lights.length; i++) {
-        var light = this.lights[i];
-        var toLight = sub(light, hit);
-        var distance = lengthVector(toLight);
-        scaleVector(toLight, 1.0/distance);
-        distance -= 0.0001;
-        if (this.blocked(hit, toLight, distance))
-            continue;
-        var nl = dot(normal, toLight);
-        if (nl > 0)
-            addVector(l, scale(light.colour, nl));
-    }
-    /* END LOOP */
-    l = scalev(l, colour);
-    if (reflected) {
-        l = addVector(scaleVector(l, 1 - colour.reflection), scaleVector(reflected, colour.reflection));
-    }
-    return l;
-}
-
-Scene.prototype.blocked = function(O, D, far) {
-    var near = 0.0001;
-    var closest = null;
-    /* BEGIN LOOP */
-    for (i = 0; i < this.triangles.length; i++) {
-        var triangle = this.triangles[i];   
-        var d = triangle.intersect(O, D, near, far);
-        if (d == null || d > far || d < near)
-            continue;
-        return true;
-    }
-    /* END LOOP */
-    
-    return false;
-}
-
-
-// this camera code is from notes i made ages ago, it is from *somewhere* -- i cannot remember where
-// that somewhere is
-function Camera(origin, lookat, up) {
-    var zaxis = normaliseVector(subVector(lookat, origin));
-    var xaxis = normaliseVector(cross(up, zaxis));
-    var yaxis = normaliseVector(cross(xaxis, subVector([0,0,0], zaxis)));
-    var m = new Array(16);
-    m[0] = xaxis[0]; m[1] = xaxis[1]; m[2] = xaxis[2];
-    m[4] = yaxis[0]; m[5] = yaxis[1]; m[6] = yaxis[2];
-    m[8] = zaxis[0]; m[9] = zaxis[1]; m[10] = zaxis[2];
-    invertMatrix(m);
-    m[3] = 0; m[7] = 0; m[11] = 0;
-    this.origin = origin;
-    this.directions = new Array(4);
-    this.directions[0] = normalise([-0.7,  0.7, 1]);
-    this.directions[1] = normalise([ 0.7,  0.7, 1]);
-    this.directions[2] = normalise([ 0.7, -0.7, 1]);
-    this.directions[3] = normalise([-0.7, -0.7, 1]);
-    this.directions[0] = transformMatrix(m, this.directions[0]);
-    this.directions[1] = transformMatrix(m, this.directions[1]);
-    this.directions[2] = transformMatrix(m, this.directions[2]);
-    this.directions[3] = transformMatrix(m, this.directions[3]);
-}
-
-Camera.prototype.generateRayPair = function(y) {
-    rays = new Array(new Object(), new Object());
-    rays[0].origin = this.origin;
-    rays[1].origin = this.origin;
-    rays[0].dir = addVector(scale(this.directions[0], y), scale(this.directions[3], 1 - y));
-    rays[1].dir = addVector(scale(this.directions[1], y), scale(this.directions[2], 1 - y));
-    return rays;
-}
-
-function renderRows(camera, scene, pixels, width, height, starty, stopy) {
-    /* BEGIN LOOP */
-    for (var y = starty; y < stopy; y++) {
-        var rays = camera.generateRayPair(y / height);
-        /* BEGIN LOOP */
-        for (var x = 0; x < width; x++) {
-            var xp = x / width;
-            var origin = addVector(scale(rays[0].origin, xp), scale(rays[1].origin, 1 - xp));
-            var dir = normaliseVector(addVector(scale(rays[0].dir, xp), scale(rays[1].dir, 1 - xp)));
-            var l = scene.intersect(origin, dir);
-            pixels[y][x] = l;
-        }
-        /* END LOOP */
-    }
-    /* END LOOP */
-}
-
-Camera.prototype.render = function(scene, pixels, width, height) {
-    var cam = this;
-    var row = 0;
-    renderRows(cam, scene, pixels, width, height, 0, height);
-}
-
-
-
-function raytraceScene()
-{
-    var startDate = new Date().getTime();
-    var numTriangles = 2 * 6;
-    var triangles = new Array();//numTriangles);
-    var tfl = createVector(-10,  10, -10);
-    var tfr = createVector( 10,  10, -10);
-    var tbl = createVector(-10,  10,  10);
-    var tbr = createVector( 10,  10,  10);
-    var bfl = createVector(-10, -10, -10);
-    var bfr = createVector( 10, -10, -10);
-    var bbl = createVector(-10, -10,  10);
-    var bbr = createVector( 10, -10,  10);
-    
-    // cube!!!
-    // front
-    var i = 0;
-    
-    triangles[i++] = new Triangle(tfl, tfr, bfr);
-    triangles[i++] = new Triangle(tfl, bfr, bfl);
-    // back
-    triangles[i++] = new Triangle(tbl, tbr, bbr);
-    triangles[i++] = new Triangle(tbl, bbr, bbl);
-    //        triangles[i-1].material = [0.7,0.2,0.2];
-    //            triangles[i-1].material.reflection = 0.8;
-    // left
-    triangles[i++] = new Triangle(tbl, tfl, bbl);
-    //            triangles[i-1].reflection = 0.6;
-    triangles[i++] = new Triangle(tfl, bfl, bbl);
-    //            triangles[i-1].reflection = 0.6;
-    // right
-    triangles[i++] = new Triangle(tbr, tfr, bbr);
-    triangles[i++] = new Triangle(tfr, bfr, bbr);
-    // top
-    triangles[i++] = new Triangle(tbl, tbr, tfr);
-    triangles[i++] = new Triangle(tbl, tfr, tfl);
-    // bottom
-    triangles[i++] = new Triangle(bbl, bbr, bfr);
-    triangles[i++] = new Triangle(bbl, bfr, bfl);
-    
-    //Floor!!!!
-    var green = createVector(0.0, 0.4, 0.0);
-    var grey = createVector(0.4, 0.4, 0.4);
-    grey.reflection = 1.0;
-    var floorShader = function(tri, pos, view) {
-        var x = ((pos[0]/32) % 2 + 2) % 2;
-        var z = ((pos[2]/32 + 0.3) % 2 + 2) % 2;
-        if (x < 1 != z < 1) {
-            //in the real world we use the fresnel term...
-            //    var angle = 1-dot(view, tri.normal);
-            //   angle *= angle;
-            //  angle *= angle;
-            // angle *= angle;
-            //grey.reflection = angle;
-            return grey;
-        } else 
-            return green;
-    }
-    var ffl = createVector(-1000, -30, -1000);
-    var ffr = createVector( 1000, -30, -1000);
-    var fbl = createVector(-1000, -30,  1000);
-    var fbr = createVector( 1000, -30,  1000);
-    triangles[i++] = new Triangle(fbl, fbr, ffr);
-    triangles[i-1].shader = floorShader;
-    triangles[i++] = new Triangle(fbl, ffr, ffl);
-    triangles[i-1].shader = floorShader;
-    
-    var _scene = new Scene(triangles);
-    _scene.lights[0] = createVector(20, 38, -22);
-    _scene.lights[0].colour = createVector(0.7, 0.3, 0.3);
-    _scene.lights[1] = createVector(-23, 40, 17);
-    _scene.lights[1].colour = createVector(0.7, 0.3, 0.3);
-    _scene.lights[2] = createVector(23, 20, 17);
-    _scene.lights[2].colour = createVector(0.7, 0.7, 0.7);
-    _scene.ambient = createVector(0.1, 0.1, 0.1);
-    //  _scene.background = createVector(0.7, 0.7, 1.0);
-    
-    var size = 30;
-    var pixels = new Array();
-    /* BEGIN LOOP */
-    for (var y = 0; y < size; y++) {
-        pixels[y] = new Array();
-        /* BEGIN LOOP */
-        for (var x = 0; x < size; x++) {
-            pixels[y][x] = 0;
-        }
-        /* END LOOP */
-    }
-    /* END LOOP */
-
-    var _camera = new Camera(createVector(-40, 40, 40), createVector(0, 0, 0), createVector(0, 1, 0));
-    _camera.render(_scene, pixels, size, size);
-
-    return pixels;
-}
-
-function arrayToCanvasCommands(pixels)
-{
-    var s = '<canvas id="renderCanvas" width="30px" height="30px"></canvas><scr' + 'ipt>\nvar pixels = [';
-    var size = 30;
-    /* BEGIN LOOP */
-    for (var y = 0; y < size; y++) {
-        s += "[";
-        /* BEGIN LOOP */
-        for (var x = 0; x < size; x++) {
-            s += "[" + pixels[y][x] + "],";
-        }
-        /* END LOOP */
-        s+= "],";
-    }
-    /* END LOOP */
-    s += '];\n    var canvas = document.getElementById("renderCanvas").getContext("2d");\n\
-\n\
-\n\
-    var size = 30;\n\
-    canvas.fillStyle = "red";\n\
-    canvas.fillRect(0, 0, size, size);\n\
-    canvas.scale(1, -1);\n\
-    canvas.translate(0, -size);\n\
-\n\
-    if (!canvas.setFillColor)\n\
-        canvas.setFillColor = function(r, g, b, a) {\n\
-            this.fillStyle = "rgb("+[Math.floor(r * 255), Math.floor(g * 255), Math.floor(b * 255)]+")";\n\
-    }\n\
-\n\
-for (var y = 0; y < size; y++) {\n\
-  for (var x = 0; x < size; x++) {\n\
-    var l = pixels[y][x];\n\
-    canvas.setFillColor(l[0], l[1], l[2], 1);\n\
-    canvas.fillRect(x, y, 1, 1);\n\
-  }\n\
-}</scr' + 'ipt>';
-
-    return s;
-}
-
-testOutput = arrayToCanvasCommands(raytraceScene());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-binary-trees.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-binary-trees.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-binary-trees.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-binary-trees.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/* The Great Computer Language Shootout
-   http://shootout.alioth.debian.org/
-   contributed by Isaac Gouy */
-
-function TreeNode(left,right,item){
-   this.left = left;
-   this.right = right;
-   this.item = item;
-}
-
-TreeNode.prototype.itemCheck = function(){
-   if (this.left==null) return this.item;
-   else return this.item + this.left.itemCheck() - this.right.itemCheck();
-}
-
-function bottomUpTree(item,depth){
-   if (depth>0){
-      return new TreeNode(
-          bottomUpTree(2*item-1, depth-1)
-         ,bottomUpTree(2*item, depth-1)
-         ,item
-      );
-   }
-   else {
-      return new TreeNode(null,null,item);
-   }
-}
-
-var ret;
-
-/* BEGIN LOOP */
-for ( var n = 4; n <= 7; n += 1 ) {
-    var minDepth = 4;
-    var maxDepth = Math.max(minDepth + 2, n);
-    var stretchDepth = maxDepth + 1;
-    
-    var check = bottomUpTree(0,stretchDepth).itemCheck();
-    
-    var longLivedTree = bottomUpTree(0,maxDepth);
-    /* BEGIN LOOP */
-    for (var depth=minDepth; depth<=maxDepth; depth+=2){
-        var iterations = 1 << (maxDepth - depth + minDepth);
-
-        check = 0;
-        /* BEGIN LOOP */
-        for (var i=1; i<=iterations; i++){
-            check += bottomUpTree(i,depth).itemCheck();
-            check += bottomUpTree(-i,depth).itemCheck();
-        }
-        /* END LOOP */
-    }
-    /* END LOOP */
-
-    ret = longLivedTree.itemCheck();
-}
-/* END LOOP */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-fannkuch.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-fannkuch.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-fannkuch.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-fannkuch.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/* The Great Computer Language Shootout
-   http://shootout.alioth.debian.org/
-   contributed by Isaac Gouy */
-
-function fannkuch(n) {
-   var check = 0;
-   var perm = Array(n);
-   var perm1 = Array(n);
-   var count = Array(n);
-   var maxPerm = Array(n);
-   var maxFlipsCount = 0;
-   var m = n - 1;
-
-   /* BEGIN LOOP */
-   for (var i = 0; i < n; i++) perm1[i] = i;
-   /* END LOOP */
-   var r = n;
-
-   /* BEGIN LOOP */
-   while (true) {
-      // write-out the first 30 permutations
-      if (check < 30){
-         var s = "";
-	 /* BEGIN LOOP */
-         for(var i=0; i<n; i++) s += (perm1[i]+1).toString();
-	 /* END LOOP */
-         check++;
-      }
-
-      /* BEGIN LOOP */
-      while (r != 1) { count[r - 1] = r; r--; }
-      /* END LOOP */
-      if (!(perm1[0] == 0 || perm1[m] == m)) {
-	 /* BEGIN LOOP */
-         for (var i = 0; i < n; i++) perm[i] = perm1[i];
-	 /* END LOOP */
-
-         var flipsCount = 0;
-         var k;
-
-	 /* BEGIN LOOP */
-         while (!((k = perm[0]) == 0)) {
-            var k2 = (k + 1) >> 1;
-	    /* BEGIN LOOP */
-            for (var i = 0; i < k2; i++) {
-               var temp = perm[i]; perm[i] = perm[k - i]; perm[k - i] = temp;
-            }
-	    /* END LOOP */
-            flipsCount++;
-         }
-	 /* END LOOP */
-
-         if (flipsCount > maxFlipsCount) {
-            maxFlipsCount = flipsCount;
-	    /* BEGIN LOOP */
-            for (var i = 0; i < n; i++) maxPerm[i] = perm1[i];
-	    /* END LOOP */
-         }
-      }
-
-      /* BEGIN LOOP */
-      while (true) {
-         if (r == n) return maxFlipsCount;
-         var perm0 = perm1[0];
-         var i = 0;
-	 /* BEGIN LOOP */
-         while (i < r) {
-            var j = i + 1;
-            perm1[i] = perm1[j];
-            i = j;
-         }
-	 /* END LOOP */
-         perm1[r] = perm0;
-
-         count[r] = count[r] - 1;
-         if (count[r] > 0) break;
-         r++;
-      }
-      /* END LOOP */
-   }
-   /* END LOOP */
-}
-
-var n = 8;
-var ret = fannkuch(n);
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-nbody.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-nbody.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-nbody.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-nbody.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-/* The Great Computer Language Shootout
-   http://shootout.alioth.debian.org/
-   contributed by Isaac Gouy */
-
-var PI = 3.141592653589793;
-var SOLAR_MASS = 4 * PI * PI;
-var DAYS_PER_YEAR = 365.24;
-
-function Body(x,y,z,vx,vy,vz,mass){
-   this.x = x;
-   this.y = y;
-   this.z = z;
-   this.vx = vx;
-   this.vy = vy;
-   this.vz = vz;
-   this.mass = mass;
-}
-
-Body.prototype.offsetMomentum = function(px,py,pz) {
-   this.vx = -px / SOLAR_MASS;
-   this.vy = -py / SOLAR_MASS;
-   this.vz = -pz / SOLAR_MASS;
-   return this;
-}
-
-function Jupiter(){
-   return new Body(
-      4.84143144246472090e+00,
-      -1.16032004402742839e+00,
-      -1.03622044471123109e-01,
-      1.66007664274403694e-03 * DAYS_PER_YEAR,
-      7.69901118419740425e-03 * DAYS_PER_YEAR,
-      -6.90460016972063023e-05 * DAYS_PER_YEAR,
-      9.54791938424326609e-04 * SOLAR_MASS
-   );
-}
-
-function Saturn(){
-   return new Body(
-      8.34336671824457987e+00,
-      4.12479856412430479e+00,
-      -4.03523417114321381e-01,
-      -2.76742510726862411e-03 * DAYS_PER_YEAR,
-      4.99852801234917238e-03 * DAYS_PER_YEAR,
-      2.30417297573763929e-05 * DAYS_PER_YEAR,
-      2.85885980666130812e-04 * SOLAR_MASS
-   );
-}
-
-function Uranus(){
-   return new Body(
-      1.28943695621391310e+01,
-      -1.51111514016986312e+01,
-      -2.23307578892655734e-01,
-      2.96460137564761618e-03 * DAYS_PER_YEAR,
-      2.37847173959480950e-03 * DAYS_PER_YEAR,
-      -2.96589568540237556e-05 * DAYS_PER_YEAR,
-      4.36624404335156298e-05 * SOLAR_MASS
-   );
-}
-
-function Neptune(){
-   return new Body(
-      1.53796971148509165e+01,
-      -2.59193146099879641e+01,
-      1.79258772950371181e-01,
-      2.68067772490389322e-03 * DAYS_PER_YEAR,
-      1.62824170038242295e-03 * DAYS_PER_YEAR,
-      -9.51592254519715870e-05 * DAYS_PER_YEAR,
-      5.15138902046611451e-05 * SOLAR_MASS
-   );
-}
-
-function Sun(){
-   return new Body(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, SOLAR_MASS);
-}
-
-
-function NBodySystem(bodies){
-   this.bodies = bodies;
-   var px = 0.0;
-   var py = 0.0;
-   var pz = 0.0;
-   var size = this.bodies.length;
-   /* BEGIN LOOP */
-   for (var i=0; i<size; i++){
-      var b = this.bodies[i];
-      var m = b.mass;
-      px += b.vx * m;
-      py += b.vy * m;
-      pz += b.vz * m;
-   }
-   /* END LOOP */
-   this.bodies[0].offsetMomentum(px,py,pz);
-}
-
-NBodySystem.prototype.advance = function(dt){
-   var dx, dy, dz, distance, mag;
-   var size = this.bodies.length;
-
-   /* BEGIN LOOP */
-   for (var i=0; i<size; i++) {
-      var bodyi = this.bodies[i];
-      /* BEGIN LOOP */
-      for (var j=i+1; j<size; j++) {
-         var bodyj = this.bodies[j];
-         dx = bodyi.x - bodyj.x;
-         dy = bodyi.y - bodyj.y;
-         dz = bodyi.z - bodyj.z;
-
-         distance = Math.sqrt(dx*dx + dy*dy + dz*dz);
-         mag = dt / (distance * distance * distance);
-
-         bodyi.vx -= dx * bodyj.mass * mag;
-         bodyi.vy -= dy * bodyj.mass * mag;
-         bodyi.vz -= dz * bodyj.mass * mag;
-
-         bodyj.vx += dx * bodyi.mass * mag;
-         bodyj.vy += dy * bodyi.mass * mag;
-         bodyj.vz += dz * bodyi.mass * mag;
-      }
-      /* END LOOP */
-   }
-   /* END LOOP */
-
-   /* BEGIN LOOP */
-   for (var i=0; i<size; i++) {
-      var body = this.bodies[i];
-      body.x += dt * body.vx;
-      body.y += dt * body.vy;
-      body.z += dt * body.vz;
-   }
-   /* END LOOP */
-}
-
-NBodySystem.prototype.energy = function(){
-   var dx, dy, dz, distance;
-   var e = 0.0;
-   var size = this.bodies.length;
-
-   /* BEGIN LOOP */
-   for (var i=0; i<size; i++) {
-      var bodyi = this.bodies[i];
-
-      e += 0.5 * bodyi.mass *
-         ( bodyi.vx * bodyi.vx
-         + bodyi.vy * bodyi.vy
-         + bodyi.vz * bodyi.vz );
-
-      /* BEGIN LOOP */
-      for (var j=i+1; j<size; j++) {
-         var bodyj = this.bodies[j];
-         dx = bodyi.x - bodyj.x;
-         dy = bodyi.y - bodyj.y;
-         dz = bodyi.z - bodyj.z;
-
-         distance = Math.sqrt(dx*dx + dy*dy + dz*dz);
-         e -= (bodyi.mass * bodyj.mass) / distance;
-      }
-      /* END LOOP */
-   }
-   /* END LOOP */
-   return e;
-}
-
-var ret;
-
-/* BEGIN LOOP */
-for ( var n = 3; n <= 24; n *= 2 ) {
-    (function(){
-        var bodies = new NBodySystem( Array(
-           Sun(),Jupiter(),Saturn(),Uranus(),Neptune()
-        ));
-        var max = n * 100;
-        
-        ret = bodies.energy();
-	/* BEGIN LOOP */
-        for (var i=0; i<max; i++){
-            bodies.advance(0.01);
-        }
-	/* END LOOP */
-        ret = bodies.energy();
-    })();
-}
-/* END LOOP */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-nsieve.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-nsieve.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/access-nsieve.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/access-nsieve.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-// The Great Computer Language Shootout
-// http://shootout.alioth.debian.org/
-//
-// modified by Isaac Gouy
-
-function pad(number,width){
-   var s = number.toString();
-   var prefixWidth = width - s.length;
-   if (prefixWidth>0){
-      /* BEGIN LOOP */
-      for (var i=1; i<=prefixWidth; i++) s = " " + s;
-      /* END LOOP */
-   }
-   return s;
-}
-
-function nsieve(m, isPrime){
-   var i, k, count;
-
-   /* BEGIN LOOP */
-   for (i=2; i<=m; i++) { isPrime[i] = true; }
-   /* END LOOP */
-   count = 0;
-
-   /* BEGIN LOOP */
-   for (i=2; i<=m; i++){
-      if (isPrime[i]) {
-	 /* BEGIN LOOP */
-         for (k=i+i; k<=m; k+=i) isPrime[k] = false;
-	 /* END LOOP */
-         count++;
-      }
-   }
-   /* END LOOP */
-   return count;
-}
-
-function sieve() {
-    /* BEGIN LOOP */
-    for (var i = 1; i <= 3; i++ ) {
-        var m = (1<<i)*10000;
-        var flags = Array(m+1);
-        nsieve(m, flags);
-    }
-    /* END LOOP */
-}
-
-sieve();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-3bit-bits-in-byte.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-3bit-bits-in-byte.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-3bit-bits-in-byte.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-3bit-bits-in-byte.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// Copyright (c) 2004 by Arthur Langereis (arthur_ext at domain xfinitegames, tld com
-
-// 1 op = 6 ANDs, 3 SHRs, 3 SHLs, 4 assigns, 2 ADDs
-// O(1)
-function fast3bitlookup(b) {
-var c, bi3b = 0xE994; // 0b1110 1001 1001 0100; // 3 2 2 1  2 1 1 0
-c  = 3 & (bi3b >> ((b << 1) & 14));
-c += 3 & (bi3b >> ((b >> 2) & 14));
-c += 3 & (bi3b >> ((b >> 5) & 6));
-return c;
-
-/*
-lir4,0xE994; 9 instructions, no memory access, minimal register dependence, 6 shifts, 2 adds, 1 inline assign
-rlwinmr5,r3,1,28,30
-rlwinmr6,r3,30,28,30
-rlwinmr7,r3,27,29,30
-rlwnmr8,r4,r5,30,31
-rlwnmr9,r4,r6,30,31
-rlwnmr10,r4,r7,30,31
-addr3,r8,r9
-addr3,r3,r10
-*/
-}
-
-
-function TimeFunc(func) {
-var x, y, t;
-/* BEGIN LOOP */
-for(var x=0; x<500; x++) {
-	/* BEGIN LOOP */
-for(var y=0; y<256; y++) func(y);
-	/* END LOOP */
-}
-/* END LOOP */
-}
-
-TimeFunc(fast3bitlookup);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-bits-in-byte.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-bits-in-byte.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-bits-in-byte.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-bits-in-byte.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-// Copyright (c) 2004 by Arthur Langereis (arthur_ext at domain xfinitegames, tld com)
-
-
-// 1 op = 2 assigns, 16 compare/branches, 8 ANDs, (0-8) ADDs, 8 SHLs
-// O(n)
-function bitsinbyte(b) {
-var m = 1, c = 0;
-/* BEGIN LOOP */
-while(m<0x100) {
-if(b & m) c++;
-m <<= 1;
-}
-/* END LOOP */
-return c;
-}
-
-function TimeFunc(func) {
-var x, y, t;
-/* BEGIN LOOP */
-for(var x=0; x<350; x++) {
-/* BEGIN LOOP */
-for(var y=0; y<256; y++) func(y);
-/* END LOOP */
-}
-/* END LOOP */
-}
-
-TimeFunc(bitsinbyte);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-bitwise-and.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-bitwise-and.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-bitwise-and.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-bitwise-and.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-bitwiseAndValue = 4294967296;
-/* BEGIN LOOP */
-for (var i = 0; i < 600000; i++)
-    bitwiseAndValue = bitwiseAndValue & i;
-/* END LOOP */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-nsieve-bits.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-nsieve-bits.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/bitops-nsieve-bits.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/bitops-nsieve-bits.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-// The Great Computer Language Shootout
-//  http://shootout.alioth.debian.org
-//
-//  Contributed by Ian Osgood
-
-function pad(n,width) {
-  var s = n.toString();
-  /* BEGIN LOOP */
-  while (s.length < width) s = ' ' + s;
-  /* END LOOP */
-  return s;
-}
-
-function primes(isPrime, n) {
-  var i, count = 0, m = 10000<<n, size = m+31>>5;
-
-  /* BEGIN LOOP */
-  for (i=0; i<size; i++) isPrime[i] = 0xffffffff;
-  /* END LOOP */
-
-  /* BEGIN LOOP */
-  for (i=2; i<m; i++)
-    if (isPrime[i>>5] & 1<<(i&31)) {
-      /* BEGIN LOOP */
-      for (var j=i+i; j<m; j+=i)
-        isPrime[j>>5] &= ~(1<<(j&31));
-      /* END LOOP */
-      count++;
-    }
-  /* END LOOP */
-}
-
-function sieve() {
-    /* BEGIN LOOP */
-    for (var i = 4; i <= 4; i++) {
-        var isPrime = new Array((10000<<i)+31>>5);
-        primes(isPrime, i);
-    }
-    /* END LOOP */
-}
-
-sieve();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/controlflow-recursive.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/controlflow-recursive.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/controlflow-recursive.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/controlflow-recursive.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-// The Computer Language Shootout
-// http://shootout.alioth.debian.org/
-// contributed by Isaac Gouy
-
-function ack(m,n){
-   if (m==0) { return n+1; }
-   if (n==0) { return ack(m-1,1); }
-   return ack(m-1, ack(m,n-1) );
-}
-
-function fib(n) {
-    if (n < 2){ return 1; }
-    return fib(n-2) + fib(n-1);
-}
-
-function tak(x,y,z) {
-    if (y >= x) return z;
-    return tak(tak(x-1,y,z), tak(y-1,z,x), tak(z-1,x,y));
-}
-
-/* BEGIN LOOP */
-for ( var i = 3; i <= 5; i++ ) {
-    ack(3,i);
-    fib(17.0+i);
-    tak(3*i+3,2*i+2,i+1);
-}
-/* END LOOP */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/crypto-aes.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/crypto-aes.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/crypto-aes.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/crypto-aes.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,494 +0,0 @@
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
-
-/*
- * AES Cipher function: encrypt 'input' with Rijndael algorithm
- *
- *   takes   byte-array 'input' (16 bytes)
- *           2D byte-array key schedule 'w' (Nr+1 x Nb bytes)
- *
- *   applies Nr rounds (10/12/14) using key schedule w for 'add round key' stage
- *
- *   returns byte-array encrypted value (16 bytes)
- */
-function Cipher(input, w) {    // main Cipher function [§5.1]
-  var Nb = 4;               // block size (in words): no of columns in state (fixed at 4 for AES)
-  var Nr = w.length/Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
-
-  var state = [[],[],[],[]];  // initialise 4xNb byte-array 'state' with input [§3.4]
-  /* BEGIN LOOP */
-  for (var i=0; i<4*Nb; i++) state[i%4][Math.floor(i/4)] = input[i];
-  /* END LOOP */
-
-  state = AddRoundKey(state, w, 0, Nb);
-
-  /* BEGIN LOOP */
-  for (var round=1; round<Nr; round++) {
-    state = SubBytes(state, Nb);
-    state = ShiftRows(state, Nb);
-    state = MixColumns(state, Nb);
-    state = AddRoundKey(state, w, round, Nb);
-  }
-  /* END LOOP */
-
-  state = SubBytes(state, Nb);
-  state = ShiftRows(state, Nb);
-  state = AddRoundKey(state, w, Nr, Nb);
-
-  var output = new Array(4*Nb);  // convert state to 1-d array before returning [§3.4]
-  /* BEGIN LOOP */
-  for (var i=0; i<4*Nb; i++) output[i] = state[i%4][Math.floor(i/4)];
-  /* END LOOP */
-  return output;
-}
-
-
-function SubBytes(s, Nb) {    // apply SBox to state S [§5.1.1]
-  /* BEGIN LOOP */
-  for (var r=0; r<4; r++) {
-    /* BEGIN LOOP */
-    for (var c=0; c<Nb; c++) s[r][c] = Sbox[s[r][c]];
-    /* END LOOP */
-  }
-  /* END LOOP */
-  return s;
-}
-
-
-function ShiftRows(s, Nb) {    // shift row r of state S left by r bytes [§5.1.2]
-  var t = new Array(4);
-  /* BEGIN LOOP */
-  for (var r=1; r<4; r++) {
-    /* BEGIN LOOP */
-    for (var c=0; c<4; c++) t[c] = s[r][(c+r)%Nb];  // shift into temp copy
-    /* END LOOP */
-    /* BEGIN LOOP */
-    for (var c=0; c<4; c++) s[r][c] = t[c];         // and copy back
-    /* END LOOP */
-  }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
-  /* END LOOP */
-  return s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf 
-}
-
-
-function MixColumns(s, Nb) {   // combine bytes of each col of state S [§5.1.3]
-  /* BEGIN LOOP */
-  for (var c=0; c<4; c++) {
-    var a = new Array(4);  // 'a' is a copy of the current column from 's'
-    var b = new Array(4);  // 'b' is a•{02} in GF(2^8)
-    /* BEGIN LOOP */
-    for (var i=0; i<4; i++) {
-      a[i] = s[i][c];
-      b[i] = s[i][c]&0x80 ? s[i][c]<<1 ^ 0x011b : s[i][c]<<1;
-    }
-    /* END LOOP */
-    // a[n] ^ b[n] is a•{03} in GF(2^8)
-    s[0][c] = b[0] ^ a[1] ^ b[1] ^ a[2] ^ a[3]; // 2*a0 + 3*a1 + a2 + a3
-    s[1][c] = a[0] ^ b[1] ^ a[2] ^ b[2] ^ a[3]; // a0 * 2*a1 + 3*a2 + a3
-    s[2][c] = a[0] ^ a[1] ^ b[2] ^ a[3] ^ b[3]; // a0 + a1 + 2*a2 + 3*a3
-    s[3][c] = a[0] ^ b[0] ^ a[1] ^ a[2] ^ b[3]; // 3*a0 + a1 + a2 + 2*a3
-  }
-  /* END LOOP */
-  return s;
-}
-
-
-function AddRoundKey(state, w, rnd, Nb) {  // xor Round Key into state S [§5.1.4]
-  /* BEGIN LOOP */
-  for (var r=0; r<4; r++) {
-    /* BEGIN LOOP */
-    for (var c=0; c<Nb; c++) state[r][c] ^= w[rnd*4+c][r];
-    /* END LOOP */
-  }
-  /* END LOOP */
-  return state;
-}
-
-
-function KeyExpansion(key) {  // generate Key Schedule (byte-array Nr+1 x Nb) from Key [§5.2]
-  var Nb = 4;            // block size (in words): no of columns in state (fixed at 4 for AES)
-  var Nk = key.length/4  // key length (in words): 4/6/8 for 128/192/256-bit keys
-  var Nr = Nk + 6;       // no of rounds: 10/12/14 for 128/192/256-bit keys
-
-  var w = new Array(Nb*(Nr+1));
-  var temp = new Array(4);
-
-  /* BEGIN LOOP */
-  for (var i=0; i<Nk; i++) {
-    var r = [key[4*i], key[4*i+1], key[4*i+2], key[4*i+3]];
-    w[i] = r;
-  }
-  /* END LOOP */
-
-  /* BEGIN LOOP */
-  for (var i=Nk; i<(Nb*(Nr+1)); i++) {
-    w[i] = new Array(4);
-    /* BEGIN LOOP */
-    for (var t=0; t<4; t++) temp[t] = w[i-1][t];
-    /* END LOOP */
-    if (i % Nk == 0) {
-      temp = SubWord(RotWord(temp));
-      /* BEGIN LOOP */
-      for (var t=0; t<4; t++) temp[t] ^= Rcon[i/Nk][t];
-      /* END LOOP */
-    } else if (Nk > 6 && i%Nk == 4) {
-      temp = SubWord(temp);
-    }
-    /* BEGIN LOOP */
-    for (var t=0; t<4; t++) w[i][t] = w[i-Nk][t] ^ temp[t];
-    /* END LOOP */
-  }
-  /* END LOOP */
-
-  return w;
-}
-
-function SubWord(w) {    // apply SBox to 4-byte word w
-  /* BEGIN LOOP */
-  for (var i=0; i<4; i++) w[i] = Sbox[w[i]];
-  /* END LOOP */
-  return w;
-}
-
-function RotWord(w) {    // rotate 4-byte word w left by one byte
-  w[4] = w[0];
-  /* BEGIN LOOP */
-  for (var i=0; i<4; i++) w[i] = w[i+1];
-  /* END LOOP */
-  return w;
-}
-
-
-// Sbox is pre-computed multiplicative inverse in GF(2^8) used in SubBytes and KeyExpansion [§5.1.1]
-var Sbox =  [0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
-             0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
-             0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
-             0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
-             0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
-             0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
-             0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
-             0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
-             0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
-             0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
-             0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
-             0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
-             0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
-             0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
-             0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
-             0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16];
-
-// Rcon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [§5.2]
-var Rcon = [ [0x00, 0x00, 0x00, 0x00],
-             [0x01, 0x00, 0x00, 0x00],
-             [0x02, 0x00, 0x00, 0x00],
-             [0x04, 0x00, 0x00, 0x00],
-             [0x08, 0x00, 0x00, 0x00],
-             [0x10, 0x00, 0x00, 0x00],
-             [0x20, 0x00, 0x00, 0x00],
-             [0x40, 0x00, 0x00, 0x00],
-             [0x80, 0x00, 0x00, 0x00],
-             [0x1b, 0x00, 0x00, 0x00],
-             [0x36, 0x00, 0x00, 0x00] ]; 
-
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
-
-/* 
- * Use AES to encrypt 'plaintext' with 'password' using 'nBits' key, in 'Counter' mode of operation
- *                           - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
- *   for each block
- *   - outputblock = cipher(counter, key)
- *   - cipherblock = plaintext xor outputblock
- */
-function AESEncryptCtr(plaintext, password, nBits) {
-  if (!(nBits==128 || nBits==192 || nBits==256)) return '';  // standard allows 128/192/256 bit keys
-
-  // for this example script, generate the key by applying Cipher to 1st 16/24/32 chars of password; 
-  // for real-world applications, a more secure approach would be to hash the password e.g. with SHA-1
-  var nBytes = nBits/8;  // no bytes in key
-  var pwBytes = new Array(nBytes);
-  /* BEGIN LOOP */
-  for (var i=0; i<nBytes; i++) pwBytes[i] = password.charCodeAt(i) & 0xff;
-  /* END LOOP */
-  var key = Cipher(pwBytes, KeyExpansion(pwBytes));
-  key = key.concat(key.slice(0, nBytes-16));  // key is now 16/24/32 bytes long
-
-  // initialise counter block (NIST SP800-38A §B.2): millisecond time-stamp for nonce in 1st 8 bytes,
-  // block counter in 2nd 8 bytes
-  var blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-  var counterBlock = new Array(blockSize);  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-  var nonce = (new Date()).getTime();  // milliseconds since 1-Jan-1970
-
-  // encode nonce in two stages to cater for JavaScript 32-bit limit on bitwise ops
-  /* BEGIN LOOP */
-  for (var i=0; i<4; i++) counterBlock[i] = (nonce >>> i*8) & 0xff;
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for (var i=0; i<4; i++) counterBlock[i+4] = (nonce/0x100000000 >>> i*8) & 0xff; 
-  /* END LOOP */
-
-  // generate key schedule - an expansion of the key into distinct Key Rounds for each round
-  var keySchedule = KeyExpansion(key);
-
-  var blockCount = Math.ceil(plaintext.length/blockSize);
-  var ciphertext = new Array(blockCount);  // ciphertext as array of strings
-  
-  /* BEGIN LOOP */
-  for (var b=0; b<blockCount; b++) {
-    // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-    // again done in two stages for 32-bit ops
-    /* BEGIN LOOP */
-    for (var c=0; c<4; c++) counterBlock[15-c] = (b >>> c*8) & 0xff;
-    /* END LOOP */
-    /* BEGIN LOOP */
-    for (var c=0; c<4; c++) counterBlock[15-c-4] = (b/0x100000000 >>> c*8)
-    /* END LOOP */
-
-    var cipherCntr = Cipher(counterBlock, keySchedule);  // -- encrypt counter block --
-    
-    // calculate length of final block:
-    var blockLength = b<blockCount-1 ? blockSize : (plaintext.length-1)%blockSize+1;
-
-    var ct = '';
-    /* BEGIN LOOP */
-    for (var i=0; i<blockLength; i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
-      var plaintextByte = plaintext.charCodeAt(b*blockSize+i);
-      var cipherByte = plaintextByte ^ cipherCntr[i];
-      ct += String.fromCharCode(cipherByte);
-    }
-    /* END LOOP */
-    // ct is now ciphertext for this block
-
-    ciphertext[b] = escCtrlChars(ct);  // escape troublesome characters in ciphertext
-  }
-  /* END LOOP */
-
-  // convert the nonce to a string to go on the front of the ciphertext
-  var ctrTxt = '';
-  /* BEGIN LOOP */
-  for (var i=0; i<8; i++) ctrTxt += String.fromCharCode(counterBlock[i]);
-  /* END LOOP */
-  ctrTxt = escCtrlChars(ctrTxt);
-
-  // use '-' to separate blocks, use Array.join to concatenate arrays of strings for efficiency
-  return ctrTxt + '-' + ciphertext.join('-');
-}
-
-
-/* 
- * Use AES to decrypt 'ciphertext' with 'password' using 'nBits' key, in Counter mode of operation
- *
- *   for each block
- *   - outputblock = cipher(counter, key)
- *   - cipherblock = plaintext xor outputblock
- */
-function AESDecryptCtr(ciphertext, password, nBits) {
-  if (!(nBits==128 || nBits==192 || nBits==256)) return '';  // standard allows 128/192/256 bit keys
-
-  var nBytes = nBits/8;  // no bytes in key
-  var pwBytes = new Array(nBytes);
-  /* BEGIN LOOP */
-  for (var i=0; i<nBytes; i++) pwBytes[i] = password.charCodeAt(i) & 0xff;
-  /* END LOOP */
-  var pwKeySchedule = KeyExpansion(pwBytes);
-  var key = Cipher(pwBytes, pwKeySchedule);
-  key = key.concat(key.slice(0, nBytes-16));  // key is now 16/24/32 bytes long
-
-  var keySchedule = KeyExpansion(key);
-
-  ciphertext = ciphertext.split('-');  // split ciphertext into array of block-length strings 
-
-  // recover nonce from 1st element of ciphertext
-  var blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-  var counterBlock = new Array(blockSize);
-  var ctrTxt = unescCtrlChars(ciphertext[0]);
-  /* BEGIN LOOP */
-  for (var i=0; i<8; i++) counterBlock[i] = ctrTxt.charCodeAt(i);
-  /* END LOOP */
-
-  var plaintext = new Array(ciphertext.length-1);
-
-  /* BEGIN LOOP */
-  for (var b=1; b<ciphertext.length; b++) {
-    // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-    /* BEGIN LOOP */
-    for (var c=0; c<4; c++) counterBlock[15-c] = ((b-1) >>> c*8) & 0xff;
-    /* END LOOP */
-    /* BEGIN LOOP */
-    for (var c=0; c<4; c++) counterBlock[15-c-4] = ((b/0x100000000-1) >>> c*8) & 0xff;
-    /* END LOOP */
-
-    var cipherCntr = Cipher(counterBlock, keySchedule);  // encrypt counter block
-
-    ciphertext[b] = unescCtrlChars(ciphertext[b]);
-
-    var pt = '';
-    /* BEGIN LOOP */
-    for (var i=0; i<ciphertext[b].length; i++) {
-      // -- xor plaintext with ciphered counter byte-by-byte --
-      var ciphertextByte = ciphertext[b].charCodeAt(i);
-      var plaintextByte = ciphertextByte ^ cipherCntr[i];
-      pt += String.fromCharCode(plaintextByte);
-    }
-    /* END LOOP */
-    // pt is now plaintext for this block
-
-    plaintext[b-1] = pt;  // b-1 'cos no initial nonce block in plaintext
-  }
-  /* END LOOP */
-
-  return plaintext.join('');
-}
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
-
-function escCtrlChars(str) {  // escape control chars which might cause problems handling ciphertext
-  return str.replace(/[\0\t\n\v\f\r\xa0'"!-]/g, function(c) { return '!' + c.charCodeAt(0) + '!'; });
-}  // \xa0 to cater for bug in Firefox; include '-' to leave it free for use as a block marker
-
-function unescCtrlChars(str) {  // unescape potentially problematic control characters
-  return str.replace(/!\d\d?\d?!/g, function(c) { return String.fromCharCode(c.slice(1,-1)); });
-}
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
-
-/*
- * if escCtrlChars()/unescCtrlChars() still gives problems, use encodeBase64()/decodeBase64() instead
- */
-var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-
-function encodeBase64(str) {  // http://tools.ietf.org/html/rfc4648
-   var o1, o2, o3, h1, h2, h3, h4, bits, i=0, enc='';
-   
-   str = encodeUTF8(str);  // encode multi-byte chars into UTF-8 for byte-array
-
-   /* BEGIN LOOP */
-   do {  // pack three octets into four hexets
-      o1 = str.charCodeAt(i++);
-      o2 = str.charCodeAt(i++);
-      o3 = str.charCodeAt(i++);
-      
-      bits = o1<<16 | o2<<8 | o3;
-      
-      h1 = bits>>18 & 0x3f;
-      h2 = bits>>12 & 0x3f;
-      h3 = bits>>6 & 0x3f;
-      h4 = bits & 0x3f;
-      
-      // end of string? index to '=' in b64
-      if (isNaN(o3)) h4 = 64;
-      if (isNaN(o2)) h3 = 64;
-      
-      // use hexets to index into b64, and append result to encoded string
-      enc += b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4);
-   } while (i < str.length);
-   /* END LOOP */
-   
-   return enc;
-}
-
-function decodeBase64(str) {
-   var o1, o2, o3, h1, h2, h3, h4, bits, i=0, enc='';
-
-   /* BEGIN LOOP */
-   do {  // unpack four hexets into three octets using index points in b64
-      h1 = b64.indexOf(str.charAt(i++));
-      h2 = b64.indexOf(str.charAt(i++));
-      h3 = b64.indexOf(str.charAt(i++));
-      h4 = b64.indexOf(str.charAt(i++));
-      
-      bits = h1<<18 | h2<<12 | h3<<6 | h4;
-      
-      o1 = bits>>16 & 0xff;
-      o2 = bits>>8 & 0xff;
-      o3 = bits & 0xff;
-      
-      if (h3 == 64)      enc += String.fromCharCode(o1);
-      else if (h4 == 64) enc += String.fromCharCode(o1, o2);
-      else               enc += String.fromCharCode(o1, o2, o3);
-   } while (i < str.length);
-   /* END LOOP */
-
-   return decodeUTF8(enc);  // decode UTF-8 byte-array back to Unicode
-}
-
-function encodeUTF8(str) {  // encode multi-byte string into utf-8 multiple single-byte characters 
-  str = str.replace(
-      /[\u0080-\u07ff]/g,  // U+0080 - U+07FF = 2-byte chars
-      function(c) { 
-        var cc = c.charCodeAt(0);
-        return String.fromCharCode(0xc0 | cc>>6, 0x80 | cc&0x3f); }
-    );
-  str = str.replace(
-      /[\u0800-\uffff]/g,  // U+0800 - U+FFFF = 3-byte chars
-      function(c) { 
-        var cc = c.charCodeAt(0); 
-        return String.fromCharCode(0xe0 | cc>>12, 0x80 | cc>>6&0x3F, 0x80 | cc&0x3f); }
-    );
-  return str;
-}
-
-function decodeUTF8(str) {  // decode utf-8 encoded string back into multi-byte characters
-  str = str.replace(
-      /[\u00c0-\u00df][\u0080-\u00bf]/g,                 // 2-byte chars
-      function(c) { 
-        var cc = (c.charCodeAt(0)&0x1f)<<6 | c.charCodeAt(1)&0x3f;
-        return String.fromCharCode(cc); }
-    );
-  str = str.replace(
-      /[\u00e0-\u00ef][\u0080-\u00bf][\u0080-\u00bf]/g,  // 3-byte chars
-      function(c) { 
-        var cc = (c.charCodeAt(0)&0x0f)<<12 | (c.charCodeAt(1)&0x3f<<6) | c.charCodeAt(2)&0x3f; 
-        return String.fromCharCode(cc); }
-    );
-  return str;
-}
-
-
-function byteArrayToHexStr(b) {  // convert byte array to hex string for displaying test vectors
-  var s = '';
-  /* BEGIN LOOP */
-  for (var i=0; i<b.length; i++) s += b[i].toString(16) + ' ';
-  /* END LOOP */
-  return s;
-}
-
-/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
-
-
-var plainText = "ROMEO: But, soft! what light through yonder window breaks?\n\
-It is the east, and Juliet is the sun.\n\
-Arise, fair sun, and kill the envious moon,\n\
-Who is already sick and pale with grief,\n\
-That thou her maid art far more fair than she:\n\
-Be not her maid, since she is envious;\n\
-Her vestal livery is but sick and green\n\
-And none but fools do wear it; cast it off.\n\
-It is my lady, O, it is my love!\n\
-O, that she knew she were!\n\
-She speaks yet she says nothing: what of that?\n\
-Her eye discourses; I will answer it.\n\
-I am too bold, 'tis not to me she speaks:\n\
-Two of the fairest stars in all the heaven,\n\
-Having some business, do entreat her eyes\n\
-To twinkle in their spheres till they return.\n\
-What if her eyes were there, they in her head?\n\
-The brightness of her cheek would shame those stars,\n\
-As daylight doth a lamp; her eyes in heaven\n\
-Would through the airy region stream so bright\n\
-That birds would sing and think it were not night.\n\
-See, how she leans her cheek upon her hand!\n\
-O, that I were a glove upon that hand,\n\
-That I might touch that cheek!\n\
-JULIET: Ay me!\n\
-ROMEO: She speaks:\n\
-O, speak again, bright angel! for thou art\n\
-As glorious to this night, being o'er my head\n\
-As is a winged messenger of heaven\n\
-Unto the white-upturned wondering eyes\n\
-Of mortals that fall back to gaze on him\n\
-When he bestrides the lazy-pacing clouds\n\
-And sails upon the bosom of the air.";
-
-var password = "O Romeo, Romeo! wherefore art thou Romeo?";
-
-var cipherText = AESEncryptCtr(plainText, password, 256);
-var decryptedText = AESDecryptCtr(cipherText, password, 256);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/crypto-md5.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/crypto-md5.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/crypto-md5.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/crypto-md5.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +0,0 @@
-/*
- * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
- * Digest Algorithm, as defined in RFC 1321.
- * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
- * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
- * Distributed under the BSD License
- * See http://pajhome.org.uk/crypt/md5 for more info.
- */
-
-/*
- * Configurable variables. You may need to tweak these to be compatible with
- * the server-side, but the defaults work in most cases.
- */
-var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
-var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
-var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
-
-/*
- * These are the functions you'll usually want to call
- * They take string arguments and return either hex or base-64 encoded strings
- */
-function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));}
-function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));}
-function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));}
-function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); }
-function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); }
-function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); }
-
-/*
- * Perform a simple self-test to see if the VM is working
- */
-function md5_vm_test()
-{
-  return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
-}
-
-/*
- * Calculate the MD5 of an array of little-endian words, and a bit length
- */
-function core_md5(x, len)
-{
-  /* append padding */
-  x[len >> 5] |= 0x80 << ((len) % 32);
-  x[(((len + 64) >>> 9) << 4) + 14] = len;
-
-  var a =  1732584193;
-  var b = -271733879;
-  var c = -1732584194;
-  var d =  271733878;
-
-  /* BEGIN LOOP */
-  for(var i = 0; i < x.length; i += 16)
-  {
-    var olda = a;
-    var oldb = b;
-    var oldc = c;
-    var oldd = d;
-
-    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
-    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
-    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
-    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
-    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
-    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
-    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
-    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
-    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
-    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
-    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
-    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
-    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
-    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
-    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
-    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
-
-    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
-    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
-    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
-    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
-    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
-    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
-    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
-    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
-    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
-    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
-    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
-    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
-    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
-    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
-    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
-    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
-
-    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
-    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
-    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
-    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
-    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
-    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
-    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
-    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
-    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
-    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
-    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
-    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
-    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
-    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
-    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
-    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
-
-    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
-    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
-    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
-    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
-    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
-    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
-    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
-    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
-    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
-    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
-    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
-    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
-    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
-    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
-    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
-    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
-
-    a = safe_add(a, olda);
-    b = safe_add(b, oldb);
-    c = safe_add(c, oldc);
-    d = safe_add(d, oldd);
-  }
-  /* END LOOP */
-  return Array(a, b, c, d);
-
-}
-
-/*
- * These functions implement the four basic operations the algorithm uses.
- */
-function md5_cmn(q, a, b, x, s, t)
-{
-  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
-}
-function md5_ff(a, b, c, d, x, s, t)
-{
-  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
-}
-function md5_gg(a, b, c, d, x, s, t)
-{
-  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
-}
-function md5_hh(a, b, c, d, x, s, t)
-{
-  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
-}
-function md5_ii(a, b, c, d, x, s, t)
-{
-  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
-}
-
-/*
- * Calculate the HMAC-MD5, of a key and some data
- */
-function core_hmac_md5(key, data)
-{
-  var bkey = str2binl(key);
-  if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz);
-
-  var ipad = Array(16), opad = Array(16);
-  /* BEGIN LOOP */
-  for(var i = 0; i < 16; i++)
-  {
-    ipad[i] = bkey[i] ^ 0x36363636;
-    opad[i] = bkey[i] ^ 0x5C5C5C5C;
-  }
-  /* END LOOP */
-
-  var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz);
-  return core_md5(opad.concat(hash), 512 + 128);
-}
-
-/*
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally
- * to work around bugs in some JS interpreters.
- */
-function safe_add(x, y)
-{
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
-}
-
-/*
- * Bitwise rotate a 32-bit number to the left.
- */
-function bit_rol(num, cnt)
-{
-  return (num << cnt) | (num >>> (32 - cnt));
-}
-
-/*
- * Convert a string to an array of little-endian words
- * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
- */
-function str2binl(str)
-{
-  var bin = Array();
-  var mask = (1 << chrsz) - 1;
-  /* BEGIN LOOP */
-  for(var i = 0; i < str.length * chrsz; i += chrsz)
-    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
-  /* END LOOP */
-  return bin;
-}
-
-/*
- * Convert an array of little-endian words to a string
- */
-function binl2str(bin)
-{
-  var str = "";
-  var mask = (1 << chrsz) - 1;
-  /* BEGIN LOOP */
-  for(var i = 0; i < bin.length * 32; i += chrsz)
-    str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
-  /* END LOOP */
-  return str;
-}
-
-/*
- * Convert an array of little-endian words to a hex string.
- */
-function binl2hex(binarray)
-{
-  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
-  var str = "";
-  /* BEGIN LOOP */
-  for(var i = 0; i < binarray.length * 4; i++)
-  {
-    str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +
-           hex_tab.charAt((binarray[i>>2] >> ((i%4)*8  )) & 0xF);
-  }
-  /* END LOOP */
-  return str;
-}
-
-/*
- * Convert an array of little-endian words to a base-64 string
- */
-function binl2b64(binarray)
-{
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  var str = "";
-  /* BEGIN LOOP */
-  for(var i = 0; i < binarray.length * 4; i += 3)
-  {
-    var triplet = (((binarray[i   >> 2] >> 8 * ( i   %4)) & 0xFF) << 16)
-                | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 )
-                |  ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF);
-    /* BEGIN LOOP */
-    for(var j = 0; j < 4; j++)
-    {
-      if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
-      else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
-    }
-    /* END LOOP */
-  }
-  /* END LOOP */
-  return str;
-}
-
-var plainText = "Rebellious subjects, enemies to peace,\n\
-Profaners of this neighbour-stained steel,--\n\
-Will they not hear? What, ho! you men, you beasts,\n\
-That quench the fire of your pernicious rage\n\
-With purple fountains issuing from your veins,\n\
-On pain of torture, from those bloody hands\n\
-Throw your mistemper'd weapons to the ground,\n\
-And hear the sentence of your moved prince.\n\
-Three civil brawls, bred of an airy word,\n\
-By thee, old Capulet, and Montague,\n\
-Have thrice disturb'd the quiet of our streets,\n\
-And made Verona's ancient citizens\n\
-Cast by their grave beseeming ornaments,\n\
-To wield old partisans, in hands as old,\n\
-Canker'd with peace, to part your canker'd hate:\n\
-If ever you disturb our streets again,\n\
-Your lives shall pay the forfeit of the peace.\n\
-For this time, all the rest depart away:\n\
-You Capulet; shall go along with me:\n\
-And, Montague, come you this afternoon,\n\
-To know our further pleasure in this case,\n\
-To old Free-town, our common judgment-place.\n\
-Once more, on pain of death, all men depart."
-
-    /* BEGIN LOOP */
-for (var i = 0; i <4; i++) {
-    plainText += plainText;
-}
-    /* END LOOP */
-
-var md5Output = hex_md5(plainText);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/crypto-sha1.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/crypto-sha1.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/crypto-sha1.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/crypto-sha1.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-/*
- * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
- * in FIPS PUB 180-1
- * Version 2.1a Copyright Paul Johnston 2000 - 2002.
- * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
- * Distributed under the BSD License
- * See http://pajhome.org.uk/crypt/md5 for details.
- */
-
-/*
- * Configurable variables. You may need to tweak these to be compatible with
- * the server-side, but the defaults work in most cases.
- */
-var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
-var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
-var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
-
-/*
- * These are the functions you'll usually want to call
- * They take string arguments and return either hex or base-64 encoded strings
- */
-function hex_sha1(s){return binb2hex(core_sha1(str2binb(s),s.length * chrsz));}
-function b64_sha1(s){return binb2b64(core_sha1(str2binb(s),s.length * chrsz));}
-function str_sha1(s){return binb2str(core_sha1(str2binb(s),s.length * chrsz));}
-function hex_hmac_sha1(key, data){ return binb2hex(core_hmac_sha1(key, data));}
-function b64_hmac_sha1(key, data){ return binb2b64(core_hmac_sha1(key, data));}
-function str_hmac_sha1(key, data){ return binb2str(core_hmac_sha1(key, data));}
-
-/*
- * Perform a simple self-test to see if the VM is working
- */
-function sha1_vm_test()
-{
-  return hex_sha1("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d";
-}
-
-/*
- * Calculate the SHA-1 of an array of big-endian words, and a bit length
- */
-function core_sha1(x, len)
-{
-  /* append padding */
-  x[len >> 5] |= 0x80 << (24 - len % 32);
-  x[((len + 64 >> 9) << 4) + 15] = len;
-
-  var w = Array(80);
-  var a =  1732584193;
-  var b = -271733879;
-  var c = -1732584194;
-  var d =  271733878;
-  var e = -1009589776;
-
-  /* BEGIN LOOP */
-  for(var i = 0; i < x.length; i += 16)
-  {
-    var olda = a;
-    var oldb = b;
-    var oldc = c;
-    var oldd = d;
-    var olde = e;
-
-  /* BEGIN LOOP */
-    for(var j = 0; j < 80; j++)
-    {
-      if(j < 16) w[j] = x[i + j];
-      else w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1);
-      var t = safe_add(safe_add(rol(a, 5), sha1_ft(j, b, c, d)),
-                       safe_add(safe_add(e, w[j]), sha1_kt(j)));
-      e = d;
-      d = c;
-      c = rol(b, 30);
-      b = a;
-      a = t;
-    }
-  /* END LOOP */
-
-    a = safe_add(a, olda);
-    b = safe_add(b, oldb);
-    c = safe_add(c, oldc);
-    d = safe_add(d, oldd);
-    e = safe_add(e, olde);
-  }
-  /* END LOOP */
-  return Array(a, b, c, d, e);
-
-}
-
-/*
- * Perform the appropriate triplet combination function for the current
- * iteration
- */
-function sha1_ft(t, b, c, d)
-{
-  if(t < 20) return (b & c) | ((~b) & d);
-  if(t < 40) return b ^ c ^ d;
-  if(t < 60) return (b & c) | (b & d) | (c & d);
-  return b ^ c ^ d;
-}
-
-/*
- * Determine the appropriate additive constant for the current iteration
- */
-function sha1_kt(t)
-{
-  return (t < 20) ?  1518500249 : (t < 40) ?  1859775393 :
-         (t < 60) ? -1894007588 : -899497514;
-}
-
-/*
- * Calculate the HMAC-SHA1 of a key and some data
- */
-function core_hmac_sha1(key, data)
-{
-  var bkey = str2binb(key);
-  if(bkey.length > 16) bkey = core_sha1(bkey, key.length * chrsz);
-
-  var ipad = Array(16), opad = Array(16);
-  /* BEGIN LOOP */
-  for(var i = 0; i < 16; i++)
-  {
-    ipad[i] = bkey[i] ^ 0x36363636;
-    opad[i] = bkey[i] ^ 0x5C5C5C5C;
-  }
-  /* END LOOP */
-
-  var hash = core_sha1(ipad.concat(str2binb(data)), 512 + data.length * chrsz);
-  return core_sha1(opad.concat(hash), 512 + 160);
-}
-
-/*
- * Add integers, wrapping at 2^32. This uses 16-bit operations internally
- * to work around bugs in some JS interpreters.
- */
-function safe_add(x, y)
-{
-  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-  return (msw << 16) | (lsw & 0xFFFF);
-}
-
-/*
- * Bitwise rotate a 32-bit number to the left.
- */
-function rol(num, cnt)
-{
-  return (num << cnt) | (num >>> (32 - cnt));
-}
-
-/*
- * Convert an 8-bit or 16-bit string to an array of big-endian words
- * In 8-bit function, characters >255 have their hi-byte silently ignored.
- */
-function str2binb(str)
-{
-  var bin = Array();
-  var mask = (1 << chrsz) - 1;
-  /* BEGIN LOOP */
-  for(var i = 0; i < str.length * chrsz; i += chrsz)
-    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32);
-  /* END LOOP */
-  return bin;
-}
-
-/*
- * Convert an array of big-endian words to a string
- */
-function binb2str(bin)
-{
-  var str = "";
-  var mask = (1 << chrsz) - 1;
-  /* BEGIN LOOP */
-  for(var i = 0; i < bin.length * 32; i += chrsz)
-    str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask);
-  /* END LOOP */
-  return str;
-}
-
-/*
- * Convert an array of big-endian words to a hex string.
- */
-function binb2hex(binarray)
-{
-  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
-  var str = "";
-  /* BEGIN LOOP */
-  for(var i = 0; i < binarray.length * 4; i++)
-  {
-    str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) +
-           hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8  )) & 0xF);
-  }
-  /* END LOOP */
-  return str;
-}
-
-/*
- * Convert an array of big-endian words to a base-64 string
- */
-function binb2b64(binarray)
-{
-  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  var str = "";
-  /* BEGIN LOOP */
-  for(var i = 0; i < binarray.length * 4; i += 3)
-  {
-    var triplet = (((binarray[i   >> 2] >> 8 * (3 -  i   %4)) & 0xFF) << 16)
-                | (((binarray[i+1 >> 2] >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 )
-                |  ((binarray[i+2 >> 2] >> 8 * (3 - (i+2)%4)) & 0xFF);
-  /* BEGIN LOOP */
-    for(var j = 0; j < 4; j++)
-    {
-      if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
-      else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
-    }
-  /* END LOOP */
-  }
-  /* END LOOP */
-  return str;
-}
-
-
-var plainText = "Two households, both alike in dignity,\n\
-In fair Verona, where we lay our scene,\n\
-From ancient grudge break to new mutiny,\n\
-Where civil blood makes civil hands unclean.\n\
-From forth the fatal loins of these two foes\n\
-A pair of star-cross'd lovers take their life;\n\
-Whole misadventured piteous overthrows\n\
-Do with their death bury their parents' strife.\n\
-The fearful passage of their death-mark'd love,\n\
-And the continuance of their parents' rage,\n\
-Which, but their children's end, nought could remove,\n\
-Is now the two hours' traffic of our stage;\n\
-The which if you with patient ears attend,\n\
-What here shall miss, our toil shall strive to mend.";
-
-  /* BEGIN LOOP */
-for (var i = 0; i <4; i++) {
-    plainText += plainText;
-}
-  /* END LOOP */
-
-var sha1Output = hex_sha1(plainText);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/date-format-tofte.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/date-format-tofte.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/date-format-tofte.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/date-format-tofte.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-function arrayExists(array, x) {
-  /* BEGIN LOOP */
-    for (var i = 0; i < array.length; i++) {
-        if (array[i] == x) return true;
-    }
-  /* END LOOP */
-    return false;
-}
-
-Date.prototype.formatDate = function (input,time) {
-    // formatDate :
-    // a PHP date like function, for formatting date strings
-    // See: http://www.php.net/date
-    //
-    // input : format string
-    // time : epoch time (seconds, and optional)
-    //
-    // if time is not passed, formatting is based on 
-    // the current "this" date object's set time.
-    //
-    // supported:
-    // a, A, B, d, D, F, g, G, h, H, i, j, l (lowercase L), L, 
-    // m, M, n, O, r, s, S, t, U, w, W, y, Y, z
-    //
-    // unsupported:
-    // I (capital i), T, Z    
-
-    var switches =    ["a", "A", "B", "d", "D", "F", "g", "G", "h", "H", 
-                       "i", "j", "l", "L", "m", "M", "n", "O", "r", "s", 
-                       "S", "t", "U", "w", "W", "y", "Y", "z"];
-    var daysLong =    ["Sunday", "Monday", "Tuesday", "Wednesday", 
-                       "Thursday", "Friday", "Saturday"];
-    var daysShort =   ["Sun", "Mon", "Tue", "Wed", 
-                       "Thu", "Fri", "Sat"];
-    var monthsShort = ["Jan", "Feb", "Mar", "Apr",
-                       "May", "Jun", "Jul", "Aug", "Sep",
-                       "Oct", "Nov", "Dec"];
-    var monthsLong =  ["January", "February", "March", "April",
-                       "May", "June", "July", "August", "September",
-                       "October", "November", "December"];
-    var daysSuffix = ["st", "nd", "rd", "th", "th", "th", "th", // 1st - 7th
-                      "th", "th", "th", "th", "th", "th", "th", // 8th - 14th
-                      "th", "th", "th", "th", "th", "th", "st", // 15th - 21st
-                      "nd", "rd", "th", "th", "th", "th", "th", // 22nd - 28th
-                      "th", "th", "st"];                        // 29th - 31st
-
-    function a() {
-        // Lowercase Ante meridiem and Post meridiem
-        return self.getHours() > 11? "pm" : "am";
-    }
-    function A() {
-        // Uppercase Ante meridiem and Post meridiem
-        return self.getHours() > 11? "PM" : "AM";
-    }
-
-    function B(){
-        // Swatch internet time. code simply grabbed from ppk,
-        // since I was feeling lazy:
-        // http://www.xs4all.nl/~ppk/js/beat.html
-        var off = (self.getTimezoneOffset() + 60)*60;
-        var theSeconds = (self.getHours() * 3600) + 
-                         (self.getMinutes() * 60) + 
-                          self.getSeconds() + off;
-        var beat = Math.floor(theSeconds/86.4);
-        if (beat > 1000) beat -= 1000;
-        if (beat < 0) beat += 1000;
-        if ((""+beat).length == 1) beat = "00"+beat;
-        if ((""+beat).length == 2) beat = "0"+beat;
-        return beat;
-    }
-    
-    function d() {
-        // Day of the month, 2 digits with leading zeros
-        return new String(self.getDate()).length == 1?
-        "0"+self.getDate() : self.getDate();
-    }
-    function D() {
-        // A textual representation of a day, three letters
-        return daysShort[self.getDay()];
-    }
-    function F() {
-        // A full textual representation of a month
-        return monthsLong[self.getMonth()];
-    }
-    function g() {
-        // 12-hour format of an hour without leading zeros
-        return self.getHours() > 12? self.getHours()-12 : self.getHours();
-    }
-    function G() {
-        // 24-hour format of an hour without leading zeros
-        return self.getHours();
-    }
-    function h() {
-        // 12-hour format of an hour with leading zeros
-        if (self.getHours() > 12) {
-          var s = new String(self.getHours()-12);
-          return s.length == 1?
-          "0"+ (self.getHours()-12) : self.getHours()-12;
-        } else { 
-          var s = new String(self.getHours());
-          return s.length == 1?
-          "0"+self.getHours() : self.getHours();
-        }  
-    }
-    function H() {
-        // 24-hour format of an hour with leading zeros
-        return new String(self.getHours()).length == 1?
-        "0"+self.getHours() : self.getHours();
-    }
-    function i() {
-        // Minutes with leading zeros
-        return new String(self.getMinutes()).length == 1? 
-        "0"+self.getMinutes() : self.getMinutes(); 
-    }
-    function j() {
-        // Day of the month without leading zeros
-        return self.getDate();
-    }    
-    function l() {
-        // A full textual representation of the day of the week
-        return daysLong[self.getDay()];
-    }
-    function L() {
-        // leap year or not. 1 if leap year, 0 if not.
-        // the logic should match iso's 8601 standard.
-        var y_ = Y();
-        if (         
-            (y_ % 4 == 0 && y_ % 100 != 0) ||
-            (y_ % 4 == 0 && y_ % 100 == 0 && y_ % 400 == 0)
-            ) {
-            return 1;
-        } else {
-            return 0;
-        }
-    }
-    function m() {
-        // Numeric representation of a month, with leading zeros
-        return self.getMonth() < 9?
-        "0"+(self.getMonth()+1) : 
-        self.getMonth()+1;
-    }
-    function M() {
-        // A short textual representation of a month, three letters
-        return monthsShort[self.getMonth()];
-    }
-    function n() {
-        // Numeric representation of a month, without leading zeros
-        return self.getMonth()+1;
-    }
-    function O() {
-        // Difference to Greenwich time (GMT) in hours
-        var os = Math.abs(self.getTimezoneOffset());
-        var h = ""+Math.floor(os/60);
-        var m = ""+(os%60);
-        h.length == 1? h = "0"+h:1;
-        m.length == 1? m = "0"+m:1;
-        return self.getTimezoneOffset() < 0 ? "+"+h+m : "-"+h+m;
-    }
-    function r() {
-        // RFC 822 formatted date
-        var r; // result
-        //  Thu    ,     21          Dec         2000
-        r = D() + ", " + j() + " " + M() + " " + Y() +
-        //        16     :    01     :    07          +0200
-            " " + H() + ":" + i() + ":" + s() + " " + O();
-        return r;
-    }
-    function S() {
-        // English ordinal suffix for the day of the month, 2 characters
-        return daysSuffix[self.getDate()-1];
-    }
-    function s() {
-        // Seconds, with leading zeros
-        return new String(self.getSeconds()).length == 1?
-        "0"+self.getSeconds() : self.getSeconds();
-    }
-    function t() {
-
-        // thanks to Matt Bannon for some much needed code-fixes here!
-        var daysinmonths = [null,31,28,31,30,31,30,31,31,30,31,30,31];
-        if (L()==1 && n()==2) return 29; // leap day
-        return daysinmonths[n()];
-    }
-    function U() {
-        // Seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
-        return Math.round(self.getTime()/1000);
-    }
-    function W() {
-        // Weeknumber, as per ISO specification:
-        // http://www.cl.cam.ac.uk/~mgk25/iso-time.html
-        
-        // if the day is three days before newyears eve,
-        // there's a chance it's "week 1" of next year.
-        // here we check for that.
-        var beforeNY = 364+L() - z();
-        var afterNY  = z();
-        var weekday = w()!=0?w()-1:6; // makes sunday (0), into 6.
-        if (beforeNY <= 2 && weekday <= 2-beforeNY) {
-            return 1;
-        }
-        // similarly, if the day is within threedays of newyears
-        // there's a chance it belongs in the old year.
-        var ny = new Date("January 1 " + Y() + " 00:00:00");
-        var nyDay = ny.getDay()!=0?ny.getDay()-1:6;
-        if (
-            (afterNY <= 2) && 
-            (nyDay >=4)  && 
-            (afterNY >= (6-nyDay))
-            ) {
-            // Since I'm not sure we can just always return 53,
-            // i call the function here again, using the last day
-            // of the previous year, as the date, and then just
-            // return that week.
-            var prevNY = new Date("December 31 " + (Y()-1) + " 00:00:00");
-            return prevNY.formatDate("W");
-        }
-        
-        // week 1, is the week that has the first thursday in it.
-        // note that this value is not zero index.
-        if (nyDay <= 3) {
-            // first day of the year fell on a thursday, or earlier.
-            return 1 + Math.floor( ( z() + nyDay ) / 7 );
-        } else {
-            // first day of the year fell on a friday, or later.
-            return 1 + Math.floor( ( z() - ( 7 - nyDay ) ) / 7 );
-        }
-    }
-    function w() {
-        // Numeric representation of the day of the week
-        return self.getDay();
-    }
-    
-    function Y() {
-        // A full numeric representation of a year, 4 digits
-
-        // we first check, if getFullYear is supported. if it
-        // is, we just use that. ppks code is nice, but wont
-        // work with dates outside 1900-2038, or something like that
-        if (self.getFullYear) {
-            var newDate = new Date("January 1 2001 00:00:00 +0000");
-            var x = newDate .getFullYear();
-            if (x == 2001) {              
-                // i trust the method now
-                return self.getFullYear();
-            }
-        }
-        // else, do this:
-        // codes thanks to ppk:
-        // http://www.xs4all.nl/~ppk/js/introdate.html
-        var x = self.getYear();
-        var y = x % 100;
-        y += (y < 38) ? 2000 : 1900;
-        return y;
-    }
-    function y() {
-        // A two-digit representation of a year
-        var y = Y()+"";
-        return y.substring(y.length-2,y.length);
-    }
-    function z() {
-        // The day of the year, zero indexed! 0 through 366
-        var t = new Date("January 1 " + Y() + " 00:00:00");
-        var diff = self.getTime() - t.getTime();
-        return Math.floor(diff/1000/60/60/24);
-    }
-        
-    var self = this;
-    if (time) {
-        // save time
-        var prevTime = self.getTime();
-        self.setTime(time);
-    }
-    
-    var ia = input.split("");
-    var ij = 0;
-  /* BEGIN LOOP */
-    while (ia[ij]) {
-        if (ia[ij] == "\\") {
-            // this is our way of allowing users to escape stuff
-            ia.splice(ij,1);
-        } else {
-            if (arrayExists(switches,ia[ij])) {
-                ia[ij] = eval(ia[ij] + "()");
-            }
-        }
-        ij++;
-    }
-  /* END LOOP */
-    // reset time, back to what it was
-    if (prevTime) {
-        self.setTime(prevTime);
-    }
-    return ia.join("");
-}
-
-var date = new Date("1/1/2007 1:11:11");
-
-  /* BEGIN LOOP */
-for (i = 0; i < 500; ++i) {
-    var shortFormat = date.formatDate("Y-m-d");
-    var longFormat = date.formatDate("l, F d, Y g:i:s A");
-    date.setTime(date.getTime() + 84266956);
-}
-  /* END LOOP */
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/date-format-xparb.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/date-format-xparb.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/date-format-xparb.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/date-format-xparb.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,427 +0,0 @@
-/*
- * Copyright (C) 2004 Baron Schwartz <baron at sequent dot org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, version 2.1.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
- * details.
- */
-
-Date.parseFunctions = {count:0};
-Date.parseRegexes = [];
-Date.formatFunctions = {count:0};
-
-Date.prototype.dateFormat = function(format) {
-    if (Date.formatFunctions[format] == null) {
-        Date.createNewFormat(format);
-    }
-    var func = Date.formatFunctions[format];
-    return this[func]();
-}
-
-Date.createNewFormat = function(format) {
-    var funcName = "format" + Date.formatFunctions.count++;
-    Date.formatFunctions[format] = funcName;
-    var code = "Date.prototype." + funcName + " = function(){return ";
-    var special = false;
-    var ch = '';
-  /* BEGIN LOOP */
-    for (var i = 0; i < format.length; ++i) {
-        ch = format.charAt(i);
-        if (!special && ch == "\\") {
-            special = true;
-        }
-        else if (special) {
-            special = false;
-            code += "'" + String.escape(ch) + "' + ";
-        }
-        else {
-            code += Date.getFormatCode(ch);
-        }
-    }
-  /* END LOOP */
-    eval(code.substring(0, code.length - 3) + ";}");
-}
-
-Date.getFormatCode = function(character) {
-    switch (character) {
-    case "d":
-        return "String.leftPad(this.getDate(), 2, '0') + ";
-    case "D":
-        return "Date.dayNames[this.getDay()].substring(0, 3) + ";
-    case "j":
-        return "this.getDate() + ";
-    case "l":
-        return "Date.dayNames[this.getDay()] + ";
-    case "S":
-        return "this.getSuffix() + ";
-    case "w":
-        return "this.getDay() + ";
-    case "z":
-        return "this.getDayOfYear() + ";
-    case "W":
-        return "this.getWeekOfYear() + ";
-    case "F":
-        return "Date.monthNames[this.getMonth()] + ";
-    case "m":
-        return "String.leftPad(this.getMonth() + 1, 2, '0') + ";
-    case "M":
-        return "Date.monthNames[this.getMonth()].substring(0, 3) + ";
-    case "n":
-        return "(this.getMonth() + 1) + ";
-    case "t":
-        return "this.getDaysInMonth() + ";
-    case "L":
-        return "(this.isLeapYear() ? 1 : 0) + ";
-    case "Y":
-        return "this.getFullYear() + ";
-    case "y":
-        return "('' + this.getFullYear()).substring(2, 4) + ";
-    case "a":
-        return "(this.getHours() < 12 ? 'am' : 'pm') + ";
-    case "A":
-        return "(this.getHours() < 12 ? 'AM' : 'PM') + ";
-    case "g":
-        return "((this.getHours() %12) ? this.getHours() % 12 : 12) + ";
-    case "G":
-        return "this.getHours() + ";
-    case "h":
-        return "String.leftPad((this.getHours() %12) ? this.getHours() % 12 : 12, 2, '0') + ";
-    case "H":
-        return "String.leftPad(this.getHours(), 2, '0') + ";
-    case "i":
-        return "String.leftPad(this.getMinutes(), 2, '0') + ";
-    case "s":
-        return "String.leftPad(this.getSeconds(), 2, '0') + ";
-    case "O":
-        return "this.getGMTOffset() + ";
-    case "T":
-        return "this.getTimezone() + ";
-    case "Z":
-        return "(this.getTimezoneOffset() * -60) + ";
-    default:
-        return "'" + String.escape(character) + "' + ";
-    }
-}
-
-Date.parseDate = function(input, format) {
-    if (Date.parseFunctions[format] == null) {
-        Date.createParser(format);
-    }
-    var func = Date.parseFunctions[format];
-    return Date[func](input);
-}
-
-Date.createParser = function(format) {
-    var funcName = "parse" + Date.parseFunctions.count++;
-    var regexNum = Date.parseRegexes.length;
-    var currentGroup = 1;
-    Date.parseFunctions[format] = funcName;
-
-    var code = "Date." + funcName + " = function(input){\n"
-        + "var y = -1, m = -1, d = -1, h = -1, i = -1, s = -1;\n"
-        + "var d = new Date();\n"
-        + "y = d.getFullYear();\n"
-        + "m = d.getMonth();\n"
-        + "d = d.getDate();\n"
-        + "var results = input.match(Date.parseRegexes[" + regexNum + "]);\n"
-        + "if (results && results.length > 0) {"
-    var regex = "";
-
-    var special = false;
-    var ch = '';
-  /* BEGIN LOOP */
-    for (var i = 0; i < format.length; ++i) {
-        ch = format.charAt(i);
-        if (!special && ch == "\\") {
-            special = true;
-        }
-        else if (special) {
-            special = false;
-            regex += String.escape(ch);
-        }
-        else {
-            obj = Date.formatCodeToRegex(ch, currentGroup);
-            currentGroup += obj.g;
-            regex += obj.s;
-            if (obj.g && obj.c) {
-                code += obj.c;
-            }
-        }
-    }
-  /* END LOOP */
-
-    code += "if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n"
-        + "{return new Date(y, m, d, h, i, s);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n"
-        + "{return new Date(y, m, d, h, i);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0 && h >= 0)\n"
-        + "{return new Date(y, m, d, h);}\n"
-        + "else if (y > 0 && m >= 0 && d > 0)\n"
-        + "{return new Date(y, m, d);}\n"
-        + "else if (y > 0 && m >= 0)\n"
-        + "{return new Date(y, m);}\n"
-        + "else if (y > 0)\n"
-        + "{return new Date(y);}\n"
-        + "}return null;}";
-
-    Date.parseRegexes[regexNum] = new RegExp("^" + regex + "$");
-    eval(code);
-}
-
-Date.formatCodeToRegex = function(character, currentGroup) {
-    switch (character) {
-    case "D":
-        return {g:0,
-        c:null,
-        s:"(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)"};
-    case "j":
-    case "d":
-        return {g:1,
-            c:"d = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{1,2})"};
-    case "l":
-        return {g:0,
-            c:null,
-            s:"(?:" + Date.dayNames.join("|") + ")"};
-    case "S":
-        return {g:0,
-            c:null,
-            s:"(?:st|nd|rd|th)"};
-    case "w":
-        return {g:0,
-            c:null,
-            s:"\\d"};
-    case "z":
-        return {g:0,
-            c:null,
-            s:"(?:\\d{1,3})"};
-    case "W":
-        return {g:0,
-            c:null,
-            s:"(?:\\d{2})"};
-    case "F":
-        return {g:1,
-            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "].substring(0, 3)], 10);\n",
-            s:"(" + Date.monthNames.join("|") + ")"};
-    case "M":
-        return {g:1,
-            c:"m = parseInt(Date.monthNumbers[results[" + currentGroup + "]], 10);\n",
-            s:"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"};
-    case "n":
-    case "m":
-        return {g:1,
-            c:"m = parseInt(results[" + currentGroup + "], 10) - 1;\n",
-            s:"(\\d{1,2})"};
-    case "t":
-        return {g:0,
-            c:null,
-            s:"\\d{1,2}"};
-    case "L":
-        return {g:0,
-            c:null,
-            s:"(?:1|0)"};
-    case "Y":
-        return {g:1,
-            c:"y = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{4})"};
-    case "y":
-        return {g:1,
-            c:"var ty = parseInt(results[" + currentGroup + "], 10);\n"
-                + "y = ty > Date.y2kYear ? 1900 + ty : 2000 + ty;\n",
-            s:"(\\d{1,2})"};
-    case "a":
-        return {g:1,
-            c:"if (results[" + currentGroup + "] == 'am') {\n"
-                + "if (h == 12) { h = 0; }\n"
-                + "} else { if (h < 12) { h += 12; }}",
-            s:"(am|pm)"};
-    case "A":
-        return {g:1,
-            c:"if (results[" + currentGroup + "] == 'AM') {\n"
-                + "if (h == 12) { h = 0; }\n"
-                + "} else { if (h < 12) { h += 12; }}",
-            s:"(AM|PM)"};
-    case "g":
-    case "G":
-    case "h":
-    case "H":
-        return {g:1,
-            c:"h = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{1,2})"};
-    case "i":
-        return {g:1,
-            c:"i = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{2})"};
-    case "s":
-        return {g:1,
-            c:"s = parseInt(results[" + currentGroup + "], 10);\n",
-            s:"(\\d{2})"};
-    case "O":
-        return {g:0,
-            c:null,
-            s:"[+-]\\d{4}"};
-    case "T":
-        return {g:0,
-            c:null,
-            s:"[A-Z]{3}"};
-    case "Z":
-        return {g:0,
-            c:null,
-            s:"[+-]\\d{1,5}"};
-    default:
-        return {g:0,
-            c:null,
-            s:String.escape(character)};
-    }
-}
-
-Date.prototype.getTimezone = function() {
-    return this.toString().replace(
-        /^.*? ([A-Z]{3}) [0-9]{4}.*$/, "$1").replace(
-        /^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, "$1$2$3");
-}
-
-Date.prototype.getGMTOffset = function() {
-    return (this.getTimezoneOffset() > 0 ? "-" : "+")
-        + String.leftPad(Math.floor(this.getTimezoneOffset() / 60), 2, "0")
-        + String.leftPad(this.getTimezoneOffset() % 60, 2, "0");
-}
-
-Date.prototype.getDayOfYear = function() {
-    var num = 0;
-    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
-  /* BEGIN LOOP */
-    for (var i = 0; i < this.getMonth(); ++i) {
-        num += Date.daysInMonth[i];
-    }
-  /* END LOOP */
-    return num + this.getDate() - 1;
-}
-
-Date.prototype.getWeekOfYear = function() {
-    // Skip to Thursday of this week
-    var now = this.getDayOfYear() + (4 - this.getDay());
-    // Find the first Thursday of the year
-    var jan1 = new Date(this.getFullYear(), 0, 1);
-    var then = (7 - jan1.getDay() + 4);
-    document.write(then);
-    return String.leftPad(((now - then) / 7) + 1, 2, "0");
-}
-
-Date.prototype.isLeapYear = function() {
-    var year = this.getFullYear();
-    return ((year & 3) == 0 && (year % 100 || (year % 400 == 0 && year)));
-}
-
-Date.prototype.getFirstDayOfMonth = function() {
-    var day = (this.getDay() - (this.getDate() - 1)) % 7;
-    return (day < 0) ? (day + 7) : day;
-}
-
-Date.prototype.getLastDayOfMonth = function() {
-    var day = (this.getDay() + (Date.daysInMonth[this.getMonth()] - this.getDate())) % 7;
-    return (day < 0) ? (day + 7) : day;
-}
-
-Date.prototype.getDaysInMonth = function() {
-    Date.daysInMonth[1] = this.isLeapYear() ? 29 : 28;
-    return Date.daysInMonth[this.getMonth()];
-}
-
-Date.prototype.getSuffix = function() {
-    switch (this.getDate()) {
-        case 1:
-        case 21:
-        case 31:
-            return "st";
-        case 2:
-        case 22:
-            return "nd";
-        case 3:
-        case 23:
-            return "rd";
-        default:
-            return "th";
-    }
-}
-
-String.escape = function(string) {
-    return string.replace(/('|\\)/g, "\\$1");
-}
-
-String.leftPad = function (val, size, ch) {
-    var result = new String(val);
-    if (ch == null) {
-        ch = " ";
-    }
-  /* BEGIN LOOP */
-    while (result.length < size) {
-        result = ch + result;
-    }
-  /* END LOOP */
-    return result;
-}
-
-Date.daysInMonth = [31,28,31,30,31,30,31,31,30,31,30,31];
-Date.monthNames =
-   ["January",
-    "February",
-    "March",
-    "April",
-    "May",
-    "June",
-    "July",
-    "August",
-    "September",
-    "October",
-    "November",
-    "December"];
-Date.dayNames =
-   ["Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"];
-Date.y2kYear = 50;
-Date.monthNumbers = {
-    Jan:0,
-    Feb:1,
-    Mar:2,
-    Apr:3,
-    May:4,
-    Jun:5,
-    Jul:6,
-    Aug:7,
-    Sep:8,
-    Oct:9,
-    Nov:10,
-    Dec:11};
-Date.patterns = {
-    ISO8601LongPattern:"Y-m-d H:i:s",
-    ISO8601ShortPattern:"Y-m-d",
-    ShortDatePattern: "n/j/Y",
-    LongDatePattern: "l, F d, Y",
-    FullDateTimePattern: "l, F d, Y g:i:s A",
-    MonthDayPattern: "F d",
-    ShortTimePattern: "g:i A",
-    LongTimePattern: "g:i:s A",
-    SortableDateTimePattern: "Y-m-d\\TH:i:s",
-    UniversalSortableDateTimePattern: "Y-m-d H:i:sO",
-    YearMonthPattern: "F, Y"};
-
-var date = new Date("1/1/2007 1:11:11");
-
-  /* BEGIN LOOP */
-for (i = 0; i < 4000; ++i) {
-    var shortFormat = date.dateFormat("Y-m-d");
-    var longFormat = date.dateFormat("l, F d, Y g:i:s A");
-    date.setTime(date.getTime() + 84266956);
-}
-  /* END LOOP */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/math-cordic.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/math-cordic.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/math-cordic.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/math-cordic.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) Rich Moore.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-/////. Start CORDIC
-
-var AG_CONST = 0.6072529350;
-
-function FIXED(X)
-{
-  return X * 65536.0;
-}
-
-function FLOAT(X)
-{
-  return X / 65536.0;
-}
-
-function DEG2RAD(X)
-{
-  return 0.017453 * (X);
-}
-
-var Angles = [
-  FIXED(45.0), FIXED(26.565), FIXED(14.0362), FIXED(7.12502),
-  FIXED(3.57633), FIXED(1.78991), FIXED(0.895174), FIXED(0.447614),
-  FIXED(0.223811), FIXED(0.111906), FIXED(0.055953),
-  FIXED(0.027977) 
-              ];
-
-
-function cordicsincos() {
-    var X;
-    var Y;
-    var TargetAngle;
-    var CurrAngle;
-    var Step;
- 
-    X = FIXED(AG_CONST);         /* AG_CONST * cos(0) */
-    Y = 0;                       /* AG_CONST * sin(0) */
-
-    TargetAngle = FIXED(28.027);
-    CurrAngle = 0;
-  /* BEGIN LOOP */
-    for (Step = 0; Step < 12; Step++) {
-        var NewX;
-        if (TargetAngle > CurrAngle) {
-            NewX = X - (Y >> Step);
-            Y = (X >> Step) + Y;
-            X = NewX;
-            CurrAngle += Angles[Step];
-        } else {
-            NewX = X + (Y >> Step);
-            Y = -(X >> Step) + Y;
-            X = NewX;
-            CurrAngle -= Angles[Step];
-        }
-    }
-  /* END LOOP */
-}
-
-///// End CORDIC
-
-function cordic( runs ) {
-  var start = new Date();
-
-  /* BEGIN LOOP */
-  for ( var i = 0 ; i < runs ; i++ ) {
-      cordicsincos();
-  }
-  /* END LOOP */
-
-  var end = new Date();
-
-  return end.getTime() - start.getTime();
-}
-
-cordic(25000);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/math-partial-sums.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/math-partial-sums.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/math-partial-sums.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/math-partial-sums.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// The Computer Language Shootout
-// http://shootout.alioth.debian.org/
-// contributed by Isaac Gouy
-
-function partial(n){
-    var a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0.0;
-    var twothirds = 2.0/3.0;
-    var alt = -1.0;
-    var k2 = k3 = sk = ck = 0.0;
-    
-  /* BEGIN LOOP */
-    for (var k = 1; k <= n; k++){
-        k2 = k*k;
-        k3 = k2*k;
-        sk = Math.sin(k);
-        ck = Math.cos(k);
-        alt = -alt;
-        
-        a1 += Math.pow(twothirds,k-1);
-        a2 += Math.pow(k,-0.5);
-        a3 += 1.0/(k*(k+1.0));
-        a4 += 1.0/(k3 * sk*sk);
-        a5 += 1.0/(k3 * ck*ck);
-        a6 += 1.0/k;
-        a7 += 1.0/k2;
-        a8 += alt/k;
-        a9 += alt/(2*k -1);
-    }
-  /* END LOOP */
-}
-
-  /* BEGIN LOOP */
-for (var i = 1024; i <= 16384; i *= 2) {
-    partial(i);
-}
-  /* END LOOP */
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/math-spectral-norm.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/math-spectral-norm.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/math-spectral-norm.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/math-spectral-norm.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-// The Great Computer Language Shootout
-// http://shootout.alioth.debian.org/
-//
-// contributed by Ian Osgood
-
-function A(i,j) {
-  return 1/((i+j)*(i+j+1)/2+i+1);
-}
-
-function Au(u,v) {
-  /* BEGIN LOOP */
-  for (var i=0; i<u.length; ++i) {
-    var t = 0;
-  /* BEGIN LOOP */
-    for (var j=0; j<u.length; ++j)
-      t += A(i,j) * u[j];
-  /* END LOOP */
-    v[i] = t;
-  }
-  /* END LOOP */
-}
-
-function Atu(u,v) {
-  /* BEGIN LOOP */
-  for (var i=0; i<u.length; ++i) {
-    var t = 0;
-  /* BEGIN LOOP */
-    for (var j=0; j<u.length; ++j)
-      t += A(j,i) * u[j];
-  /* END LOOP */
-    v[i] = t;
-  }
-  /* END LOOP */
-}
-
-function AtAu(u,v,w) {
-  Au(u,w);
-  Atu(w,v);
-}
-
-function spectralnorm(n) {
-  var i, u=[], v=[], w=[], vv=0, vBv=0;
-  /* BEGIN LOOP */
-  for (i=0; i<n; ++i) {
-    u[i] = 1; v[i] = w[i] = 0;
-  }
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for (i=0; i<10; ++i) {
-    AtAu(u,v,w);
-    AtAu(v,u,w);
-  }
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for (i=0; i<n; ++i) {
-    vBv += u[i]*v[i];
-    vv  += v[i]*v[i];
-  }
-  /* END LOOP */
-  return Math.sqrt(vBv/vv);
-}
-
-  /* BEGIN LOOP */
-for (var i = 6; i <= 48; i *= 2) {
-    spectralnorm(i);
-}
-  /* END LOOP */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/regexp-dna.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/regexp-dna.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/regexp-dna.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/regexp-dna.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1716 +0,0 @@
-// The Computer Language Shootout
-// http://shootout.alioth.debian.org/
-//
-// contributed by Jesse Millikan
-// Base on the Ruby version by jose fco. gonzalez
-
-var l;
-var dnaInput = ">ONE Homo sapiens alu\n\
-GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGA\n\
-TCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACT\n\
-AAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAG\n\
-GCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCG\n\
-CCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGT\n\
-GGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCA\n\
-GGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAA\n\
-TTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAG\n\
-AATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCA\n\
-GCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGT\n\
-AATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACC\n\
-AGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTG\n\
-GTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACC\n\
-CGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAG\n\
-AGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTT\n\
-TGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACA\n\
-TGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCT\n\
-GTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGG\n\
-TTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGT\n\
-CTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGG\n\
-CGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCG\n\
-TCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTA\n\
-CTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCG\n\
-AGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCG\n\
-GGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACC\n\
-TGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAA\n\
-TACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGA\n\
-GGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACT\n\
-GCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTC\n\
-ACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGT\n\
-TCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGC\n\
-CGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCG\n\
-CTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTG\n\
-GGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCC\n\
-CAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCT\n\
-GGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGC\n\
-GCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGA\n\
-GGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGA\n\
-GACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGA\n\
-GGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTG\n\
-AAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAAT\n\
-CCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCA\n\
-GTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAA\n\
-AAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGC\n\
-GGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCT\n\
-ACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGG\n\
-GAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATC\n\
-GCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGC\n\
-GGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGG\n\
-TCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAA\n\
-AAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAG\n\
-GAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACT\n\
-CCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCC\n\
-TGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAG\n\
-ACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGC\n\
-GTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGA\n\
-ACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGA\n\
-CAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCA\n\
-CTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCA\n\
-ACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCG\n\
-CCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGG\n\
-AGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTC\n\
-CGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCG\n\
-AGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACC\n\
-CCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAG\n\
-CTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAG\n\
-CCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGG\n\
-CCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATC\n\
-ACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAA\n\
-AAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGC\n\
-TGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCC\n\
-ACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGG\n\
-CTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGG\n\
-AGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATT\n\
-AGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAA\n\
-TCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGC\n\
-CTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAA\n\
-TCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAG\n\
-CCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGT\n\
-GGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCG\n\
-GGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAG\n\
-CGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTG\n\
-GGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATG\n\
-GTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGT\n\
-AATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTT\n\
-GCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCT\n\
-CAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCG\n\
-GGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTC\n\
-TCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACT\n\
-CGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAG\n\
-ATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGG\n\
-CGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTG\n\
-AGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATA\n\
-CAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGG\n\
-CAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGC\n\
-ACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCAC\n\
-GCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTC\n\
-GAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCG\n\
-GGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCT\n\
-TGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGG\n\
-CGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCA\n\
-GCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGG\n\
-CCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGC\n\
-GCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGG\n\
-CGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGA\n\
-CTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGG\n\
-CCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAA\n\
-ACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCC\n\
-CAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGT\n\
-GAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAA\n\
-AGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGG\n\
-ATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTAC\n\
-TAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGA\n\
-GGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGC\n\
-GCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGG\n\
-TGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTC\n\
-AGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAA\n\
-ATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGA\n\
-GAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC\n\
-AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTG\n\
-TAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGAC\n\
-CAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGT\n\
-GGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAAC\n\
-CCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACA\n\
-GAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACT\n\
-TTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAAC\n\
-ATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCC\n\
-TGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAG\n\
-GTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCG\n\
-TCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAG\n\
-GCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCC\n\
-GTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCT\n\
-ACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCC\n\
-GAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCC\n\
-GGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCAC\n\
-CTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAA\n\
-ATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTG\n\
-AGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCAC\n\
-TGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCT\n\
-CACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAG\n\
-TTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAG\n\
-CCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATC\n\
-GCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCT\n\
-GGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATC\n\
-CCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCC\n\
-TGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGG\n\
-CGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG\n\
-AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCG\n\
-AGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGG\n\
-AGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGT\n\
-GAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAA\n\
-TCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGC\n\
-AGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCA\n\
-AAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGG\n\
-CGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTC\n\
-TACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCG\n\
-GGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGAT\n\
-CGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCG\n\
-CGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAG\n\
-GTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACA\n\
-AAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCA\n\
-GGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCAC\n\
-TCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGC\n\
-CTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGA\n\
-GACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGG\n\
-CGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTG\n\
-AACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCG\n\
-ACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGC\n\
-ACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCC\n\
-AACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGC\n\
-GCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCG\n\
-GAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACT\n\
-CCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCC\n\
-GAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAAC\n\
-CCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA\n\
-GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGA\n\
-GCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAG\n\
-GCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGAT\n\
-CACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTA\n\
-AAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGG\n\
-CTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGC\n\
-CACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTG\n\
-GCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAG\n\
-GAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAAT\n\
-TAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGA\n\
-ATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAG\n\
-CCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTA\n\
-ATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCA\n\
-GCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGG\n\
-TGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCC\n\
-GGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGA\n\
-GCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTT\n\
-GGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACAT\n\
-GGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTG\n\
-TAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGT\n\
-TGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTC\n\
-TCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGC\n\
-GGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGT\n\
-CTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTAC\n\
-TCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGA\n\
-GATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGG\n\
-GCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCT\n\
-GAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT\n\
-ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAG\n\
-GCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTG\n\
-CACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCA\n\
-CGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTT\n\
-CGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCC\n\
-GGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGC\n\
-TTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGG\n\
-GCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCC\n\
-AGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTG\n\
-GCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCG\n\
-CGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAG\n\
-GCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAG\n\
-ACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAG\n\
-GCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGA\n\
-AACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATC\n\
-CCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAG\n\
-TGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAA\n\
-AAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCG\n\
-GATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTA\n\
-CTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGG\n\
-AGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCG\n\
-CGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCG\n\
-GTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGT\n\
-CAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAA\n\
-AATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGG\n\
-AGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTC\n\
-CAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCT\n\
-GTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA\n\
-CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCG\n\
-TGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAA\n\
-CCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGAC\n\
-AGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCAC\n\
-TTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAA\n\
-CATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGC\n\
-CTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGA\n\
-GGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCC\n\
-GTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGA\n\
-GGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCC\n\
-CGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGC\n\
-TACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGC\n\
-CGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGC\n\
-CGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCA\n\
-CCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAA\n\
-AATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCT\n\
-GAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCA\n\
-CTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGC\n\
-TCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGA\n\
-GTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTA\n\
-GCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAAT\n\
-CGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCC\n\
-TGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAAT\n\
-CCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGC\n\
-CTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTG\n\
-GCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGG\n\
-GAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGC\n\
-GAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG\n\
-GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGG\n\
-TGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTA\n\
-ATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTG\n\
-CAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTC\n\
-AAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGG\n\
-GCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCT\n\
-CTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTC\n\
-GGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGA\n\
-TCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGC\n\
-GCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGA\n\
-GGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATAC\n\
-AAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGC\n\
-AGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCA\n\
-CTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACG\n\
-CCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCG\n\
-AGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGG\n\
-GCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTT\n\
-GAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGC\n\
-GACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAG\n\
-CACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGC\n\
-CAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCG\n\
-CGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGC\n\
-GGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGAC\n\
-TCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGC\n\
-CGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAA\n\
-CCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCC\n\
-AGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTG\n\
-AGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA\n\
-GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGA\n\
-TCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACT\n\
-AAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAG\n\
-GCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCG\n\
-CCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGT\n\
-GGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCA\n\
-GGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAA\n\
-TTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAG\n\
-AATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCA\n\
-GCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGT\n\
-AATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACC\n\
-AGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTG\n\
-GTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACC\n\
-CGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAG\n\
-AGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTT\n\
-TGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACA\n\
-TGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCT\n\
-GTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGG\n\
-TTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGT\n\
-CTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGG\n\
-CGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCG\n\
-TCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTA\n\
-CTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCG\n\
-AGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCG\n\
-GGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACC\n\
-TGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAA\n\
-TACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGA\n\
-GGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACT\n\
-GCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTC\n\
-ACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGT\n\
-TCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGC\n\
-CGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCG\n\
-CTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTG\n\
-GGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCC\n\
-CAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCT\n\
-GGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGC\n\
-GCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGA\n\
-GGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGA\n\
-GACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGA\n\
-GGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTG\n\
-AAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAAT\n\
-CCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCA\n\
-GTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAA\n\
-AAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGC\n\
-GGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCT\n\
-ACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGG\n\
-GAGGCTGAGGCAGGAGAATC\n\
->TWO IUB ambiguity codes\n\
-cttBtatcatatgctaKggNcataaaSatgtaaaDcDRtBggDtctttataattcBgtcg\n\
-tactDtDagcctatttSVHtHttKtgtHMaSattgWaHKHttttagacatWatgtRgaaa\n\
-NtactMcSMtYtcMgRtacttctWBacgaaatatagScDtttgaagacacatagtVgYgt\n\
-cattHWtMMWcStgttaggKtSgaYaaccWStcgBttgcgaMttBYatcWtgacaYcaga\n\
-gtaBDtRacttttcWatMttDBcatWtatcttactaBgaYtcttgttttttttYaaScYa\n\
-HgtgttNtSatcMtcVaaaStccRcctDaataataStcYtRDSaMtDttgttSagtRRca\n\
-tttHatSttMtWgtcgtatSSagactYaaattcaMtWatttaSgYttaRgKaRtccactt\n\
-tattRggaMcDaWaWagttttgacatgttctacaaaRaatataataaMttcgDacgaSSt\n\
-acaStYRctVaNMtMgtaggcKatcttttattaaaaagVWaHKYagtttttatttaacct\n\
-tacgtVtcVaattVMBcttaMtttaStgacttagattWWacVtgWYagWVRctDattBYt\n\
-gtttaagaagattattgacVatMaacattVctgtBSgaVtgWWggaKHaatKWcBScSWa\n\
-accRVacacaaactaccScattRatatKVtactatatttHttaagtttSKtRtacaaagt\n\
-RDttcaaaaWgcacatWaDgtDKacgaacaattacaRNWaatHtttStgttattaaMtgt\n\
-tgDcgtMgcatBtgcttcgcgaDWgagctgcgaggggVtaaScNatttacttaatgacag\n\
-cccccacatYScaMgtaggtYaNgttctgaMaacNaMRaacaaacaKctacatagYWctg\n\
-ttWaaataaaataRattagHacacaagcgKatacBttRttaagtatttccgatctHSaat\n\
-actcNttMaagtattMtgRtgaMgcataatHcMtaBSaRattagttgatHtMttaaKagg\n\
-YtaaBataSaVatactWtataVWgKgttaaaacagtgcgRatatacatVtHRtVYataSa\n\
-KtWaStVcNKHKttactatccctcatgWHatWaRcttactaggatctataDtDHBttata\n\
-aaaHgtacVtagaYttYaKcctattcttcttaataNDaaggaaaDYgcggctaaWSctBa\n\
-aNtgctggMBaKctaMVKagBaactaWaDaMaccYVtNtaHtVWtKgRtcaaNtYaNacg\n\
-gtttNattgVtttctgtBaWgtaattcaagtcaVWtactNggattctttaYtaaagccgc\n\
-tcttagHVggaYtgtNcDaVagctctctKgacgtatagYcctRYHDtgBattDaaDgccK\n\
-tcHaaStttMcctagtattgcRgWBaVatHaaaataYtgtttagMDMRtaataaggatMt\n\
-ttctWgtNtgtgaaaaMaatatRtttMtDgHHtgtcattttcWattRSHcVagaagtacg\n\
-ggtaKVattKYagactNaatgtttgKMMgYNtcccgSKttctaStatatNVataYHgtNa\n\
-BKRgNacaactgatttcctttaNcgatttctctataScaHtataRagtcRVttacDSDtt\n\
-aRtSatacHgtSKacYagttMHtWataggatgactNtatSaNctataVtttRNKtgRacc\n\
-tttYtatgttactttttcctttaaacatacaHactMacacggtWataMtBVacRaSaatc\n\
-cgtaBVttccagccBcttaRKtgtgcctttttRtgtcagcRttKtaaacKtaaatctcac\n\
-aattgcaNtSBaaccgggttattaaBcKatDagttactcttcattVtttHaaggctKKga\n\
-tacatcBggScagtVcacattttgaHaDSgHatRMaHWggtatatRgccDttcgtatcga\n\
-aacaHtaagttaRatgaVacttagattVKtaaYttaaatcaNatccRttRRaMScNaaaD\n\
-gttVHWgtcHaaHgacVaWtgttScactaagSgttatcttagggDtaccagWattWtRtg\n\
-ttHWHacgattBtgVcaYatcggttgagKcWtKKcaVtgaYgWctgYggVctgtHgaNcV\n\
-taBtWaaYatcDRaaRtSctgaHaYRttagatMatgcatttNattaDttaattgttctaa\n\
-ccctcccctagaWBtttHtBccttagaVaatMcBHagaVcWcagBVttcBtaYMccagat\n\
-gaaaaHctctaacgttagNWRtcggattNatcRaNHttcagtKttttgWatWttcSaNgg\n\
-gaWtactKKMaacatKatacNattgctWtatctaVgagctatgtRaHtYcWcttagccaa\n\
-tYttWttaWSSttaHcaaaaagVacVgtaVaRMgattaVcDactttcHHggHRtgNcctt\n\
-tYatcatKgctcctctatVcaaaaKaaaagtatatctgMtWtaaaacaStttMtcgactt\n\
-taSatcgDataaactaaacaagtaaVctaggaSccaatMVtaaSKNVattttgHccatca\n\
-cBVctgcaVatVttRtactgtVcaattHgtaaattaaattttYtatattaaRSgYtgBag\n\
-aHSBDgtagcacRHtYcBgtcacttacactaYcgctWtattgSHtSatcataaatataHt\n\
-cgtYaaMNgBaatttaRgaMaatatttBtttaaaHHKaatctgatWatYaacttMctctt\n\
-ttVctagctDaaagtaVaKaKRtaacBgtatccaaccactHHaagaagaaggaNaaatBW\n\
-attccgStaMSaMatBttgcatgRSacgttVVtaaDMtcSgVatWcaSatcttttVatag\n\
-ttactttacgatcaccNtaDVgSRcgVcgtgaacgaNtaNatatagtHtMgtHcMtagaa\n\
-attBgtataRaaaacaYKgtRccYtatgaagtaataKgtaaMttgaaRVatgcagaKStc\n\
-tHNaaatctBBtcttaYaBWHgtVtgacagcaRcataWctcaBcYacYgatDgtDHccta\n\
-aagacYRcaggattHaYgtKtaatgcVcaataMYacccatatcacgWDBtgaatcBaata\n\
-cKcttRaRtgatgaBDacggtaattaaYtataStgVHDtDctgactcaaatKtacaatgc\n\
-gYatBtRaDatHaactgtttatatDttttaaaKVccYcaaccNcBcgHaaVcattHctcg\n\
-attaaatBtatgcaaaaatYMctSactHatacgaWacattacMBgHttcgaatVaaaaca\n\
-BatatVtctgaaaaWtctRacgBMaatSgRgtgtcgactatcRtattaScctaStagKga\n\
-DcWgtYtDDWKRgRtHatRtggtcgaHgggcgtattaMgtcagccaBggWVcWctVaaat\n\
-tcgNaatcKWagcNaHtgaaaSaaagctcYctttRVtaaaatNtataaccKtaRgtttaM\n\
-tgtKaBtRtNaggaSattHatatWactcagtgtactaKctatttgRYYatKatgtccgtR\n\
-tttttatttaatatVgKtttgtatgtNtataRatWYNgtRtHggtaaKaYtKSDcatcKg\n\
-taaYatcSRctaVtSMWtVtRWHatttagataDtVggacagVcgKWagBgatBtaaagNc\n\
-aRtagcataBggactaacacRctKgttaatcctHgDgttKHHagttgttaatgHBtatHc\n\
-DaagtVaBaRccctVgtgDtacRHSctaagagcggWYaBtSaKtHBtaaactYacgNKBa\n\
-VYgtaacttagtVttcttaatgtBtatMtMtttaattaatBWccatRtttcatagVgMMt\n\
-agctStKctaMactacDNYgKYHgaWcgaHgagattacVgtttgtRaSttaWaVgataat\n\
-gtgtYtaStattattMtNgWtgttKaccaatagNYttattcgtatHcWtctaaaNVYKKt\n\
-tWtggcDtcgaagtNcagatacgcattaagaccWctgcagcttggNSgaNcHggatgtVt\n\
-catNtRaaBNcHVagagaaBtaaSggDaatWaatRccaVgggStctDaacataKttKatt\n\
-tggacYtattcSatcttagcaatgaVBMcttDattctYaaRgatgcattttNgVHtKcYR\n\
-aatRKctgtaaacRatVSagctgtWacBtKVatctgttttKcgtctaaDcaagtatcSat\n\
-aWVgcKKataWaYttcccSaatgaaaacccWgcRctWatNcWtBRttYaattataaNgac\n\
-acaatagtttVNtataNaYtaatRaVWKtBatKagtaatataDaNaaaaataMtaagaaS\n\
-tccBcaatNgaataWtHaNactgtcDtRcYaaVaaaaaDgtttRatctatgHtgttKtga\n\
-aNSgatactttcgagWaaatctKaaDaRttgtggKKagcDgataaattgSaacWaVtaNM\n\
-acKtcaDaaatttctRaaVcagNacaScRBatatctRatcctaNatWgRtcDcSaWSgtt\n\
-RtKaRtMtKaatgttBHcYaaBtgatSgaSWaScMgatNtctcctatttctYtatMatMt\n\
-RRtSaattaMtagaaaaStcgVgRttSVaScagtgDtttatcatcatacRcatatDctta\n\
-tcatVRtttataaHtattcYtcaaaatactttgVctagtaaYttagatagtSYacKaaac\n\
-gaaKtaaatagataatSatatgaaatSgKtaatVtttatcctgKHaatHattagaaccgt\n\
-YaaHactRcggSBNgtgctaaBagBttgtRttaaattYtVRaaaattgtaatVatttctc\n\
-ttcatgBcVgtgKgaHaaatattYatagWacNctgaaMcgaattStagWaSgtaaKagtt\n\
-ttaagaDgatKcctgtaHtcatggKttVDatcaaggtYcgccagNgtgcVttttagagat\n\
-gctaccacggggtNttttaSHaNtatNcctcatSaaVgtactgBHtagcaYggYVKNgta\n\
-KBcRttgaWatgaatVtagtcgattYgatgtaatttacDacSctgctaaaStttaWMagD\n\
-aaatcaVYctccgggcgaVtaaWtStaKMgDtttcaaMtVgBaatccagNaaatcYRMBg\n\
-gttWtaaScKttMWtYataRaDBMaDataatHBcacDaaKDactaMgagttDattaHatH\n\
-taYatDtattDcRNStgaatattSDttggtattaaNSYacttcDMgYgBatWtaMagact\n\
-VWttctttgYMaYaacRgHWaattgRtaagcattctMKVStatactacHVtatgatcBtV\n\
-NataaBttYtSttacKgggWgYDtgaVtYgatDaacattYgatggtRDaVDttNactaSa\n\
-MtgNttaacaaSaBStcDctaccacagacgcaHatMataWKYtaYattMcaMtgSttDag\n\
-cHacgatcaHttYaKHggagttccgatYcaatgatRaVRcaagatcagtatggScctata\n\
-ttaNtagcgacgtgKaaWaactSgagtMYtcttccaKtStaacggMtaagNttattatcg\n\
-tctaRcactctctDtaacWYtgaYaSaagaWtNtatttRacatgNaatgttattgWDDcN\n\
-aHcctgaaHacSgaataaRaataMHttatMtgaSDSKatatHHaNtacagtccaYatWtc\n\
-actaactatKDacSaStcggataHgYatagKtaatKagStaNgtatactatggRHacttg\n\
-tattatgtDVagDVaRctacMYattDgtttYgtctatggtKaRSttRccRtaaccttaga\n\
-gRatagSaaMaacgcaNtatgaaatcaRaagataatagatactcHaaYKBctccaagaRa\n\
-BaStNagataggcgaatgaMtagaatgtcaKttaaatgtaWcaBttaatRcggtgNcaca\n\
-aKtttScRtWtgcatagtttWYaagBttDKgcctttatMggNttattBtctagVtacata\n\
-aaYttacacaaRttcYtWttgHcaYYtaMgBaBatctNgcDtNttacgacDcgataaSat\n\
-YaSttWtcctatKaatgcagHaVaacgctgcatDtgttaSataaaaYSNttatagtaNYt\n\
-aDaaaNtggggacttaBggcHgcgtNtaaMcctggtVtaKcgNacNtatVaSWctWtgaW\n\
-cggNaBagctctgaYataMgaagatBSttctatacttgtgtKtaattttRagtDtacata\n\
-tatatgatNHVgBMtKtaKaNttDHaagatactHaccHtcatttaaagttVaMcNgHata\n\
-tKtaNtgYMccttatcaaNagctggacStttcNtggcaVtattactHaSttatgNMVatt\n\
-MMDtMactattattgWMSgtHBttStStgatatRaDaagattttctatMtaaaaaggtac\n\
-taaVttaSacNaatactgMttgacHaHRttgMacaaaatagttaatatWKRgacDgaRta\n\
-tatttattatcYttaWtgtBRtWatgHaaattHataagtVaDtWaVaWtgStcgtMSgaS\n\
-RgMKtaaataVacataatgtaSaatttagtcgaaHtaKaatgcacatcggRaggSKctDc\n\
-agtcSttcccStYtccRtctctYtcaaKcgagtaMttttcRaYDttgttatctaatcata\n\
-NctctgctatcaMatactataggDaHaaSttMtaDtcNatataattctMcStaaBYtaNa\n\
-gatgtaatHagagSttgWHVcttatKaYgDctcttggtgttMcRaVgSgggtagacaata\n\
-aDtaattSaDaNaHaBctattgNtaccaaRgaVtKNtaaYggHtaKKgHcatctWtctDt\n\
-ttctttggSDtNtaStagttataaacaattgcaBaBWggHgcaaaBtYgctaatgaaatW\n\
-cDcttHtcMtWWattBHatcatcaaatctKMagtDNatttWaBtHaaaNgMttaaStagt\n\
-tctctaatDtcRVaYttgttMtRtgtcaSaaYVgSWDRtaatagctcagDgcWWaaaBaa\n\
-RaBctgVgggNgDWStNaNBKcBctaaKtttDcttBaaggBttgaccatgaaaNgttttt\n\
-tttatctatgttataccaaDRaaSagtaVtDtcaWatBtacattaWacttaSgtattggD\n\
-gKaaatScaattacgWcagKHaaccaYcRcaRttaDttRtttHgaHVggcttBaRgtccc\n\
-tDatKaVtKtcRgYtaKttacgtatBtStaagcaattaagaRgBagSaattccSWYttta\n\
-ttVaataNctgHgttaaNBgcVYgtRtcccagWNaaaacaDNaBcaaaaRVtcWMgBagM\n\
-tttattacgDacttBtactatcattggaaatVccggttRttcatagttVYcatYaSHaHc\n\
-ttaaagcNWaHataaaRWtctVtRYtagHtaaaYMataHYtNBctNtKaatattStgaMc\n\
-BtRgctaKtgcScSttDgYatcVtggaaKtaagatWccHccgKYctaNNctacaWctttt\n\
-gcRtgtVcgaKttcMRHgctaHtVaataaDtatgKDcttatBtDttggNtacttttMtga\n\
-acRattaaNagaactcaaaBBVtcDtcgaStaDctgaaaSgttMaDtcgttcaccaaaag\n\
-gWtcKcgSMtcDtatgtttStaaBtatagDcatYatWtaaaBacaKgcaDatgRggaaYc\n\
-taRtccagattDaWtttggacBaVcHtHtaacDacYgtaatataMagaatgHMatcttat\n\
-acgtatttttatattacHactgttataMgStYaattYaccaattgagtcaaattaYtgta\n\
-tcatgMcaDcgggtcttDtKgcatgWRtataatatRacacNRBttcHtBgcRttgtgcgt\n\
-catacMtttBctatctBaatcattMttMYgattaaVYatgDaatVagtattDacaacDMa\n\
-tcMtHcccataagatgBggaccattVWtRtSacatgctcaaggggYtttDtaaNgNtaaB\n\
-atggaatgtctRtaBgBtcNYatatNRtagaacMgagSaSDDSaDcctRagtVWSHtVSR\n\
-ggaacaBVaccgtttaStagaacaMtactccagtttVctaaRaaHttNcttagcaattta\n\
-ttaatRtaaaatctaacDaBttggSagagctacHtaaRWgattcaaBtctRtSHaNtgta\n\
-cattVcaHaNaagtataccacaWtaRtaaVKgMYaWgttaKggKMtKcgWatcaDatYtK\n\
-SttgtacgaccNctSaattcDcatcttcaaaDKttacHtggttHggRRaRcaWacaMtBW\n\
-VHSHgaaMcKattgtaRWttScNattBBatYtaNRgcggaagacHSaattRtttcYgacc\n\
-BRccMacccKgatgaacttcgDgHcaaaaaRtatatDtatYVtttttHgSHaSaatagct\n\
-NYtaHYaVYttattNtttgaaaYtaKttWtctaNtgagaaaNctNDctaaHgttagDcRt\n\
-tatagccBaacgcaRBtRctRtggtaMYYttWtgataatcgaataattattataVaaaaa\n\
-ttacNRVYcaaMacNatRttcKatMctgaagactaattataaYgcKcaSYaatMNctcaa\n\
-cgtgatttttBacNtgatDccaattattKWWcattttatatatgatBcDtaaaagttgaa\n\
-VtaHtaHHtBtataRBgtgDtaataMttRtDgDcttattNtggtctatctaaBcatctaR\n\
-atgNacWtaatgaagtcMNaacNgHttatactaWgcNtaStaRgttaaHacccgaYStac\n\
-aaaatWggaYaWgaattattcMaactcBKaaaRVNcaNRDcYcgaBctKaacaaaaaSgc\n\
-tccYBBHYaVagaatagaaaacagYtctVccaMtcgtttVatcaatttDRtgWctagtac\n\
-RttMctgtDctttcKtWttttataaatgVttgBKtgtKWDaWagMtaaagaaattDVtag\n\
-gttacatcatttatgtcgMHaVcttaBtVRtcgtaYgBRHatttHgaBcKaYWaatcNSc\n\
-tagtaaaaatttacaatcactSWacgtaatgKttWattagttttNaggtctcaagtcact\n\
-attcttctaagKggaataMgtttcataagataaaaatagattatDgcBVHWgaBKttDgc\n\
-atRHaagcaYcRaattattatgtMatatattgHDtcaDtcaaaHctStattaatHaccga\n\
-cNattgatatattttgtgtDtRatagSacaMtcRtcattcccgacacSattgttKaWatt\n\
-NHcaacttccgtttSRtgtctgDcgctcaaMagVtBctBMcMcWtgtaacgactctcttR\n\
-ggRKSttgYtYatDccagttDgaKccacgVatWcataVaaagaataMgtgataaKYaaat\n\
-cHDaacgataYctRtcYatcgcaMgtNttaBttttgatttaRtStgcaacaaaataccVg\n\
-aaDgtVgDcStctatatttattaaaaRKDatagaaagaKaaYYcaYSgKStctccSttac\n\
-agtcNactttDVttagaaagMHttRaNcSaRaMgBttattggtttaRMggatggcKDgWR\n\
-tNaataataWKKacttcKWaaagNaBttaBatMHtccattaacttccccYtcBcYRtaga\n\
-ttaagctaaYBDttaNtgaaaccHcaRMtKtaaHMcNBttaNaNcVcgVttWNtDaBatg\n\
-ataaVtcWKcttRggWatcattgaRagHgaattNtatttctctattaattaatgaDaaMa\n\
-tacgttgggcHaYVaaNaDDttHtcaaHtcVVDgBVagcMacgtgttaaBRNtatRtcag\n\
-taagaggtttaagacaVaaggttaWatctccgtVtaDtcDatttccVatgtacNtttccg\n\
-tHttatKgScBatgtVgHtYcWagcaKtaMYaaHgtaattaSaHcgcagtWNaatNccNN\n\
-YcacgVaagaRacttctcattcccRtgtgtaattagcSttaaStWaMtctNNcSMacatt\n\
-ataaactaDgtatWgtagtttaagaaaattgtagtNagtcaataaatttgatMMYactaa\n\
-tatcggBWDtVcYttcDHtVttatacYaRgaMaacaStaatcRttttVtagaDtcacWat\n\
-ttWtgaaaagaaagNRacDtttStVatBaDNtaactatatcBSMcccaSttccggaMatg\n\
-attaaWatKMaBaBatttgataNctgttKtVaagtcagScgaaaDggaWgtgttttKtWt\n\
-atttHaatgtagttcactaaKMagttSYBtKtaYgaactcagagRtatagtVtatcaaaW\n\
-YagcgNtaDagtacNSaaYDgatBgtcgataacYDtaaactacagWDcYKaagtttatta\n\
-gcatcgagttKcatDaattgattatDtcagRtWSKtcgNtMaaaaacaMttKcaWcaaSV\n\
-MaaaccagMVtaMaDtMaHaBgaacataBBVtaatVYaNSWcSgNtDNaaKacacBttta\n\
-tKtgtttcaaHaMctcagtaacgtcgYtactDcgcctaNgagagcYgatattttaaattt\n\
-ccattttacatttDaaRctattttWctttacgtDatYtttcagacgcaaVttagtaaKaa\n\
-aRtgVtccataBggacttatttgtttaWNtgttVWtaWNVDaattgtatttBaagcBtaa\n\
-BttaaVatcHcaVgacattccNggtcgacKttaaaRtagRtctWagaYggtgMtataatM\n\
-tgaaRttattttgWcttNtDRRgMDKacagaaaaggaaaRStcccagtYccVattaNaaK\n\
-StNWtgacaVtagaagcttSaaDtcacaacgDYacWDYtgtttKatcVtgcMaDaSKStV\n\
-cgtagaaWaKaagtttcHaHgMgMtctataagBtKaaaKKcactggagRRttaagaBaaN\n\
-atVVcgRcKSttDaactagtSttSattgttgaaRYatggttVttaataaHttccaagDtg\n\
-atNWtaagHtgcYtaactRgcaatgMgtgtRaatRaNaacHKtagactactggaatttcg\n\
-ccataacgMctRgatgttaccctaHgtgWaYcactcacYaattcttaBtgacttaaacct\n\
-gYgaWatgBttcttVttcgttWttMcNYgtaaaatctYgMgaaattacNgaHgaacDVVM\n\
-tttggtHtctaaRgtacagacgHtVtaBMNBgattagcttaRcttacaHcRctgttcaaD\n\
-BggttKaacatgKtttYataVaNattccgMcgcgtagtRaVVaattaKaatggttRgaMc\n\
-agtatcWBttNtHagctaatctagaaNaaacaYBctatcgcVctBtgcaaagDgttVtga\n\
-HtactSNYtaaNccatgtgDacgaVtDcgKaRtacDcttgctaagggcagMDagggtBWR\n\
-tttSgccttttttaacgtcHctaVtVDtagatcaNMaVtcVacatHctDWNaataRgcgt\n\
-aVHaggtaaaaSgtttMtattDgBtctgatSgtRagagYtctSaKWaataMgattRKtaa\n\
-catttYcgtaacacattRWtBtcggtaaatMtaaacBatttctKagtcDtttgcBtKYYB\n\
-aKttctVttgttaDtgattttcttccacttgSaaacggaaaNDaattcYNNaWcgaaYat\n\
-tttMgcBtcatRtgtaaagatgaWtgaccaYBHgaatagataVVtHtttVgYBtMctaMt\n\
-cctgaDcYttgtccaaaRNtacagcMctKaaaggatttacatgtttaaWSaYaKttBtag\n\
-DacactagctMtttNaKtctttcNcSattNacttggaacaatDagtattRtgSHaataat\n\
-gccVgacccgatactatccctgtRctttgagaSgatcatatcgDcagWaaHSgctYYWta\n\
-tHttggttctttatVattatcgactaagtgtagcatVgtgHMtttgtttcgttaKattcM\n\
-atttgtttWcaaStNatgtHcaaaDtaagBaKBtRgaBgDtSagtatMtaacYaatYtVc\n\
-KatgtgcaacVaaaatactKcRgtaYtgtNgBBNcKtcttaccttKgaRaYcaNKtactt\n\
-tgagSBtgtRagaNgcaaaNcacagtVtttHWatgttaNatBgtttaatNgVtctgaata\n\
-tcaRtattcttttttttRaaKcRStctcggDgKagattaMaaaKtcaHacttaataataK\n\
-taRgDtKVBttttcgtKaggHHcatgttagHggttNctcgtatKKagVagRaaaggaaBt\n\
-NatttVKcRttaHctaHtcaaatgtaggHccaBataNaNaggttgcWaatctgatYcaaa\n\
-HaatWtaVgaaBttagtaagaKKtaaaKtRHatMaDBtBctagcatWtatttgWttVaaa\n\
-ScMNattRactttgtYtttaaaagtaagtMtaMaSttMBtatgaBtttaKtgaatgagYg\n\
-tNNacMtcNRacMMHcttWtgtRtctttaacaacattattcYaMagBaacYttMatcttK\n\
-cRMtgMNccattaRttNatHaHNaSaaHMacacaVaatacaKaSttHatattMtVatWga\n\
-ttttttaYctttKttHgScWaacgHtttcaVaaMgaacagNatcgttaacaaaaagtaca\n\
-HBNaattgttKtcttVttaaBtctgctacgBgcWtttcaggacacatMgacatcccagcg\n\
-gMgaVKaBattgacttaatgacacacaaaaaatRKaaBctacgtRaDcgtagcVBaacDS\n\
-BHaaaaSacatatacagacRNatcttNaaVtaaaataHattagtaaaaSWccgtatWatg\n\
-gDttaactattgcccatcttHaSgYataBttBaactattBtcHtgatcaataSttaBtat\n\
-KSHYttWggtcYtttBttaataccRgVatStaHaKagaatNtagRMNgtcttYaaSaact\n\
-cagDSgagaaYtMttDtMRVgWKWtgMaKtKaDttttgactatacataatcNtatNaHat\n\
-tVagacgYgatatatttttgtStWaaatctWaMgagaRttRatacgStgattcttaagaD\n\
-taWccaaatRcagcagaaNKagtaaDggcgccBtYtagSBMtactaaataMataBSacRM\n\
-gDgattMMgtcHtcaYDtRaDaacggttDaggcMtttatgttaNctaattaVacgaaMMt\n\
-aatDccSgtattgaRtWWaccaccgagtactMcgVNgctDctaMScatagcgtcaactat\n\
-acRacgHRttgctatttaatgaattataYKttgtaagWgtYttgcHgMtaMattWaWVta\n\
-RgcttgYgttBHtYataSccStBtgtagMgtDtggcVaaSBaatagDttgBgtctttctc\n\
-attttaNagtHKtaMWcYactVcgcgtatMVtttRacVagDaatcttgctBBcRDgcaac\n\
-KttgatSKtYtagBMagaRtcgBattHcBWcaactgatttaatttWDccatttatcgagS\n\
-KaWttataHactaHMttaatHtggaHtHagaatgtKtaaRactgtttMatacgatcaagD\n\
-gatKaDctataMggtHDtggHacctttRtatcttYattttgacttgaaSaataaatYcgB\n\
-aaaaccgNatVBttMacHaKaataagtatKgtcaagactcttaHttcggaattgttDtct\n\
-aaccHttttWaaatgaaatataaaWattccYDtKtaaaacggtgaggWVtctattagtga\n\
-ctattaagtMgtttaagcatttgSgaaatatccHaaggMaaaattttcWtatKctagDtY\n\
-tMcctagagHcactttactatacaaacattaacttaHatcVMYattYgVgtMttaaRtga\n\
-aataaDatcaHgtHHatKcDYaatcttMtNcgatYatgSaMaNtcttKcWataScKggta\n\
-tcttacgcttWaaagNatgMgHtctttNtaacVtgttcMaaRatccggggactcMtttaY\n\
-MtcWRgNctgNccKatcttgYDcMgattNYaRagatHaaHgKctcataRDttacatBatc\n\
-cattgDWttatttaWgtcggagaaaaatacaatacSNtgggtttccttacSMaagBatta\n\
-caMaNcactMttatgaRBacYcYtcaaaWtagctSaacttWgDMHgaggatgBVgcHaDt\n\
-ggaactttggtcNatNgtaKaBcccaNtaagttBaacagtatacDYttcctNgWgcgSMc\n\
-acatStctHatgRcNcgtacacaatRttMggaNKKggataaaSaYcMVcMgtaMaHtgat\n\
-tYMatYcggtcttcctHtcDccgtgRatcattgcgccgatatMaaYaataaYSggatagc\n\
-gcBtNtaaaScaKgttBgagVagttaKagagtatVaactaSacWactSaKatWccaKaaa\n\
-atBKgaaKtDMattttgtaaatcRctMatcaaMagMttDgVatggMaaWgttcgaWatga\n\
-aatttgRtYtattaWHKcRgctacatKttctaccaaHttRatctaYattaaWatVNccat\n\
-NgagtcKttKataStRaatatattcctRWatDctVagttYDgSBaatYgttttgtVaatt\n\
-taatagcagMatRaacttBctattgtMagagattaaactaMatVtHtaaatctRgaaaaa\n\
-aaatttWacaacaYccYDSaattMatgaccKtaBKWBattgtcaagcHKaagttMMtaat\n\
-ttcKcMagNaaKagattggMagaggtaatttYacatcWaaDgatMgKHacMacgcVaaca\n\
-DtaDatatYggttBcgtatgWgaSatttgtagaHYRVacaRtctHaaRtatgaactaata\n\
-tctSSBgggaaHMWtcaagatKgagtDaSatagttgattVRatNtctMtcSaagaSHaat\n\
-aNataataRaaRgattctttaataaagWaRHcYgcatgtWRcttgaaggaMcaataBRaa\n\
-ccagStaaacNtttcaatataYtaatatgHaDgcStcWttaacctaRgtYaRtataKtgM\n\
-ttttatgactaaaatttacYatcccRWtttHRtattaaatgtttatatttgttYaatMca\n\
-RcSVaaDatcgtaYMcatgtagacatgaaattgRtcaaYaaYtRBatKacttataccaNa\n\
-aattVaBtctggacaagKaaYaaatatWtMtatcYaaVNtcgHaactBaagKcHgtctac\n\
-aatWtaDtSgtaHcataHtactgataNctRgttMtDcDttatHtcgtacatcccaggStt\n\
-aBgtcacacWtccNMcNatMVaVgtccDYStatMaccDatggYaRKaaagataRatttHK\n\
-tSaaatDgataaacttaHgttgVBtcttVttHgDacgaKatgtatatNYataactctSat\n\
-atatattgcHRRYttStggaactHgttttYtttaWtatMcttttctatctDtagVHYgMR\n\
-BgtHttcctaatYRttKtaagatggaVRataKDctaMtKBNtMtHNtWtttYcVtattMc\n\
-gRaacMcctNSctcatttaaagDcaHtYccSgatgcaatYaaaaDcttcgtaWtaattct\n\
-cgttttScttggtaatctttYgtctaactKataHacctMctcttacHtKataacacagcN\n\
-RatgKatttttSaaatRYcgDttaMRcgaaattactMtgcgtaagcgttatBtttttaat\n\
-taagtNacatHgttcRgacKcBBtVgatKttcgaBaatactDRgtRtgaNacWtcacYtt\n\
-aaKcgttctHaKttaNaMgWgWaggtctRgaKgWttSttBtDcNtgtttacaaatYcDRt\n\
-gVtgcctattcNtctaaaDMNttttNtggctgagaVctDaacVtWccaagtaacacaNct\n\
-gaScattccDHcVBatcgatgtMtaatBgHaatDctMYgagaatgYWKcctaatNaStHa\n\
-aaKccgHgcgtYaaYtattgtStgtgcaaRtattaKatattagaWVtcaMtBagttatta\n\
-gNaWHcVgcaattttDcMtgtaRHVYtHtctgtaaaaHVtMKacatcgNaatttMatatg\n\
-ttgttactagWYtaRacgataKagYNKcattataNaRtgaacKaYgcaaYYacaNccHat\n\
-MatDcNgtHttRaWttagaaDcaaaaaatagggtKDtStaDaRtaVtHWKNtgtattVct\n\
-SVgRgataDaRaWataBgaagaaKtaataaYgDcaStaNgtaDaaggtattHaRaWMYaY\n\
-aWtggttHYgagVtgtgcttttcaaDKcagVcgttagacNaaWtagtaataDttctggtt\n\
-VcatcataaagtgKaaaNaMtaBBaattaatWaattgctHaVKaSgDaaVKaHtatatat\n\
-HatcatSBagNgHtatcHYMHgttDgtaHtBttWatcgtttaRaattgStKgSKNWKatc\n\
-agDtctcagatttctRtYtBatBgHHtKaWtgYBgacVVWaKtacKcDttKMaKaVcggt\n\
-gttataagaataaHaatattagtataatMHgttYgaRttagtaRtcaaVatacggtcMcg\n\
-agtaaRttacWgactKRYataaaagSattYaWgagatYagKagatgSaagKgttaatMgg\n\
-tataatgttWYttatgagaaacctNVataatHcccKtDctcctaatactggctHggaSag\n\
-gRtKHaWaattcgSatMatttagaggcYtctaMcgctcataSatatgRagacNaaDagga\n\
-VBagaYttKtacNaKgtSYtagttggaWcatcWttaatctatgaVtcgtgtMtatcaYcg\n\
-tRccaaYgDctgcMgtgtWgacWtgataacacgcgctBtgttaKtYDtatDcatcagKaV\n\
-MctaatcttgVcaaRgcRMtDcgattaHttcaNatgaatMtactacVgtRgatggaWttt\n\
-actaaKatgagSaaKggtaNtactVaYtaaKRagaacccacaMtaaMtKtatBcttgtaa\n\
-WBtMctaataaVcDaaYtcRHBtcgttNtaaHatttBNgRStVDattBatVtaagttaYa\n\
-tVattaagaBcacggtSgtVtatttaRattgatgtaHDKgcaatattKtggcctatgaWD\n\
-KRYcggattgRctatNgatacaatMNttctgtcRBYRaaaHctNYattcHtaWcaattct\n\
-BtMKtVgYataatMgYtcagcttMDataVtggRtKtgaatgccNcRttcaMtRgattaac\n\
-attRcagcctHtWMtgtDRagaKaBtgDttYaaaaKatKgatctVaaYaacWcgcatagB\n\
-VtaNtRtYRaggBaaBtgKgttacataagagcatgtRattccacttaccatRaaatgWgD\n\
-aMHaYVgVtaSctatcgKaatatattaDgacccYagtgtaYNaaatKcagtBRgagtcca\n\
-tgKgaaaccBgaagBtgSttWtacgatWHaYatcgatttRaaNRgcaNaKVacaNtDgat\n\
-tgHVaatcDaagcgtatgcNttaDataatcSataaKcaataaHWataBtttatBtcaKtK\n\
-tatagttaDgSaYctacaRatNtaWctSaatatttYaKaKtaccWtatcRagacttaYtt\n\
-VcKgSDcgagaagatccHtaattctSttatggtKYgtMaHagVaBRatttctgtRgtcta\n\
-tgggtaHKgtHacHtSYacgtacacHatacKaaBaVaccaDtatcSaataaHaagagaat\n\
-ScagactataaRttagcaaVcaHataKgDacatWccccaagcaBgagWatctaYttgaaa\n\
-tctVNcYtttWagHcgcgcDcVaaatgttKcHtNtcaatagtgtNRaactttttcaatgg\n\
-WgBcgDtgVgtttctacMtaaataaaRggaaacWaHttaRtNtgctaaRRtVBctYtVta\n\
-tDcattDtgaccYatagatYRKatNYKttNgcctagtaWtgaactaMVaacctgaStttc\n\
-tgaKVtaaVaRKDttVtVctaDNtataaaDtccccaagtWtcgatcactDgYaBcatcct\n\
-MtVtacDaaBtYtMaKNatNtcaNacgDatYcatcgcaRatWBgaacWttKttagYtaat\n\
-tcggttgSWttttDWctttacYtatatWtcatDtMgtBttgRtVDggttaacYtacgtac\n\
-atgaattgaaWcttMStaDgtatattgaDtcRBcattSgaaVBRgagccaaKtttcDgcg\n\
-aSMtatgWattaKttWtgDBMaggBBttBaatWttRtgcNtHcgttttHtKtcWtagHSt\n\
-aacagttgatatBtaWSaWggtaataaMttaKacDaatactcBttcaatatHttcBaaSa\n\
-aatYggtaRtatNtHcaatcaHtagVtgtattataNggaMtcttHtNagctaaaggtaga\n\
-YctMattNaMVNtcKtactBKcaHHcBttaSagaKacataYgctaKaYgttYcgacWVtt\n\
-WtSagcaacatcccHaccKtcttaacgaKttcacKtNtacHtatatRtaaatacactaBt\n\
-ttgaHaRttggttWtatYagcatYDatcggagagcWBataagRtacctataRKgtBgatg\n\
-aDatataSttagBaHtaatNtaDWcWtgtaattacagKttcNtMagtattaNgtctcgtc\n\
-ctcttBaHaKcKccgtRcaaYagSattaagtKataDatatatagtcDtaacaWHcaKttD\n\
-gaaRcgtgYttgtcatatNtatttttatggccHtgDtYHtWgttatYaacaattcaWtat\n\
-NgctcaaaSttRgctaatcaaatNatcgtttaBtNNVtgttataagcaaagattBacgtD\n\
-atttNatttaaaDcBgtaSKgacgtagataatttcHMVNttgttBtDtgtaWKaaRMcKM\n\
-tHtaVtagataWctccNNaSWtVaHatctcMgggDgtNHtDaDttatatVWttgttattt\n\
-aacctttcacaaggaSaDcggttttttatatVtctgVtaacaStDVaKactaMtttaSNa\n\
-gtgaaattaNacttSKctattcctctaSagKcaVttaagNaVcttaVaaRNaHaaHttat\n\
-gtHttgtgatMccaggtaDcgaccgtWgtWMtttaHcRtattgScctatttKtaaccaag\n\
-tYagaHgtWcHaatgccKNRtttagtMYSgaDatctgtgaWDtccMNcgHgcaaacNDaa\n\
-aRaStDWtcaaaaHKtaNBctagBtgtattaactaattttVctagaatggcWSatMaccc\n\
-ttHttaSgSgtgMRcatRVKtatctgaaaccDNatYgaaVHNgatMgHRtacttaaaRta\n\
-tStRtDtatDttYatattHggaBcttHgcgattgaKcKtttcRataMtcgaVttWacatN\n\
-catacctRataDDatVaWNcggttgaHtgtMacVtttaBHtgagVttMaataattatgtt\n\
-cttagtttgtgcDtSatttgBtcaacHattaaBagVWcgcaSYttMgcttacYKtVtatc\n\
-aYaKctgBatgcgggcYcaaaaacgNtctagKBtattatctttKtaVttatagtaYtRag\n\
-NtaYataaVtgaatatcHgcaaRataHtacacatgtaNtgtcgYatWMatttgaactacR\n\
-ctaWtWtatacaatctBatatgYtaagtatgtgtatSttactVatcttYtaBcKgRaSgg\n\
-RaaaaatgcagtaaaWgtaRgcgataatcBaataccgtatttttccatcNHtatWYgatH\n\
-SaaaDHttgctgtccHtggggcctaataatttttctatattYWtcattBtgBRcVttaVM\n\
-RSgctaatMagtYtttaaaaatBRtcBttcaaVtaacagctccSaaSttKNtHtKYcagc\n\
-agaaaccccRtttttaaDcDtaStatccaagcgctHtatcttaDRYgatDHtWcaaaBcW\n\
-gKWHttHataagHacgMNKttMKHccaYcatMVaacgttaKgYcaVaaBtacgcaacttt\n\
-MctaaHaatgtBatgagaSatgtatgSRgHgWaVWgataaatatttccKagVgataattW\n\
-aHNcYggaaatgctHtKtaDtctaaagtMaatVDVactWtSaaWaaMtaHtaSKtcBRaN\n\
-cttStggtBttacNagcatagRgtKtgcgaacaacBcgKaatgataagatgaaaattgta\n\
-ctgcgggtccHHWHaaNacaBttNKtKtcaaBatatgctaHNgtKcDWgtttatNgVDHg\n\
-accaacWctKaaggHttgaRgYaatHcaBacaatgagcaaattactgtaVaaYaDtagat\n\
-tgagNKggtggtgKtWKaatacagDRtatRaMRtgattDggtcaaYRtatttNtagaDtc\n\
-acaaSDctDtataatcgtactaHttatacaatYaacaaHttHatHtgcgatRRttNgcat\n\
-SVtacWWgaaggagtatVMaVaaattScDDKNcaYBYaDatHgtctatBagcaacaagaa\n\
-tgagaaRcataaKNaRtBDatcaaacgcattttttaaBtcSgtacaRggatgtMNaattg\n\
-gatatWtgagtattaaaVctgcaYMtatgatttttYgaHtgtcttaagWBttHttgtctt\n\
-attDtcgtatWtataataSgctaHagcDVcNtaatcaagtaBDaWaDgtttagYctaNcc\n\
-DtaKtaHcttaataacccaRKtacaVaatNgcWRaMgaattatgaBaaagattVYaHMDc\n\
-aDHtcRcgYtcttaaaWaaaVKgatacRtttRRKYgaatacaWVacVcRtatMacaBtac\n\
-tggMataaattttHggNagSctacHgtBagcgtcgtgattNtttgatSaaggMttctttc\n\
-ttNtYNagBtaaacaaatttMgaccttacataattgYtcgacBtVMctgStgMDtagtaR\n\
-ctHtatgttcatatVRNWataDKatWcgaaaaagttaaaagcacgHNacgtaatctttMR\n\
-tgacttttDacctataaacgaaatatgattagaactccSYtaBctttaataacWgaaaYa\n\
-tagatgWttcatKtNgatttttcaagHtaYgaaRaDaagtaggagcttatVtagtctttc\n\
-attaaaatcgKtattaRttacagVaDatgcatVgattgggtctttHVtagKaaRBtaHta\n\
-aggccccaaaaKatggtttaMWgtBtaaacttcactttKHtcgatctccctaYaBacMgt\n\
-cttBaBaNgcgaaacaatctagtHccHtKttcRtRVttccVctttcatacYagMVtMcag\n\
-aMaaacaataBctgYtaatRaaagattaaccatVRatHtaRagcgcaBcgDttStttttc\n\
-VtttaDtKgcaaWaaaaatSccMcVatgtKgtaKgcgatatgtagtSaaaDttatacaaa\n\
-catYaRRcVRHctKtcgacKttaaVctaDaatgttMggRcWaacttttHaDaKaDaBctg\n\
-taggcgtttaHBccatccattcNHtDaYtaataMttacggctNVaacDattgatatttta\n\
-cVttSaattacaaRtataNDgacVtgaacataVRttttaDtcaaacataYDBtttaatBa\n\
-DtttYDaDaMccMttNBttatatgagaaMgaNtattHccNataattcaHagtgaaggDga\n\
-tgtatatatgYatgaStcataaBStWacgtcccataRMaaDattggttaaattcMKtctM\n\
-acaBSactcggaatDDgatDgcWctaacaccgggaVcacWKVacggtaNatatacctMta\n\
-tgatagtgcaKagggVaDtgtaacttggagtcKatatcgMcttRaMagcattaBRaStct\n\
-YSggaHYtacaactMBaagDcaBDRaaacMYacaHaattagcattaaaHgcgctaaggSc\n\
-cKtgaaKtNaBtatDDcKBSaVtgatVYaagVtctSgMctacgttaacWaaattctSgtD\n\
-actaaStaaattgcagBBRVctaatatacctNttMcRggctttMttagacRaHcaBaacV\n\
-KgaataHttttMgYgattcYaNRgttMgcVaaacaVVcDHaatttgKtMYgtatBtVVct\n\
-WgVtatHtacaaHttcacgatagcagtaaNattBatatatttcVgaDagcggttMaagtc\n\
-ScHagaaatgcYNggcgtttttMtStggtRatctacttaaatVVtBacttHNttttaRca\n\
-aatcacagHgagagtMgatcSWaNRacagDtatactaaDKaSRtgattctccatSaaRtt\n\
-aaYctacacNtaRtaactggatgaccYtacactttaattaattgattYgttcagDtNKtt\n\
-agDttaaaaaaaBtttaaNaYWKMBaaaacVcBMtatWtgBatatgaacVtattMtYatM\n\
-NYDKNcKgDttDaVtaaaatgggatttctgtaaatWtctcWgtVVagtcgRgacttcccc\n\
-taDcacagcRcagagtgtWSatgtacatgttaaSttgtaaHcgatgggMagtgaacttat\n\
-RtttaVcaccaWaMgtactaatSSaHtcMgaaYtatcgaaggYgggcgtgaNDtgttMNg\n\
-aNDMtaattcgVttttaacatgVatgtWVMatatcaKgaaattcaBcctccWcttgaaWH\n\
-tWgHtcgNWgaRgctcBgSgaattgcaaHtgattgtgNagtDttHHgBttaaWcaaWagc\n\
-aSaHHtaaaVctRaaMagtaDaatHtDMtcVaWMtagSagcttHSattaacaaagtRacM\n\
-tRtctgttagcMtcaBatVKtKtKacgagaSNatSactgtatatcBctgagVtYactgta\n\
-aattaaaggcYgDHgtaacatSRDatMMccHatKgttaacgactKtgKagtcttcaaHRV\n\
-tccttKgtSataatttacaactggatDNgaacttcaRtVaagDcaWatcBctctHYatHa\n\
-DaaatttagYatSatccaWtttagaaatVaacBatHcatcgtacaatatcgcNYRcaata\n\
-YaRaYtgattVttgaatgaVaactcRcaNStgtgtattMtgaggtNttBaDRcgaaaagc\n\
-tNgBcWaWgtSaDcVtgVaatMKBtttcgtttctaaHctaaagYactgMtatBDtcStga\n\
-ccgtSDattYaataHctgggaYYttcggttaWaatctggtRagWMaDagtaacBccacta\n\
-cgHWMKaatgatWatcctgHcaBaSctVtcMtgtDttacctaVgatYcWaDRaaaaRtag\n\
-atcgaMagtggaRaWctctgMgcWttaagKBRtaaDaaWtctgtaagYMttactaHtaat\n\
-cttcataacggcacBtSgcgttNHtgtHccatgttttaaagtatcgaKtMttVcataYBB\n\
-aKtaMVaVgtattNDSataHcagtWMtaggtaSaaKgttgBtVtttgttatcatKcgHac\n\
-acRtctHatNVagSBgatgHtgaRaSgttRcctaacaaattDNttgacctaaYtBgaaaa\n\
-tagttattactcttttgatgtNNtVtgtatMgtcttRttcatttgatgacacttcHSaaa\n\
-ccaWWDtWagtaRDDVNacVaRatgttBccttaatHtgtaaacStcVNtcacaSRttcYa\n\
-gacagaMMttttgMcNttBcgWBtactgVtaRttctccaaYHBtaaagaBattaYacgat\n\
-ttacatctgtaaMKaRYtttttactaaVatWgctBtttDVttctggcDaHaggDaagtcg\n\
-aWcaagtagtWttHtgKtVataStccaMcWcaagataagatcactctHatgtcYgaKcat\n\
-cagatactaagNSStHcctRRNtattgtccttagttagMVgtatagactaactctVcaat\n\
-MctgtttgtgttgccttatWgtaBVtttctggMcaaKgDWtcgtaaYStgSactatttHg\n\
-atctgKagtagBtVacRaagRtMctatgggcaaaKaaaatacttcHctaRtgtDcttDat\n\
-taggaaatttcYHaRaaBttaatggcacKtgctHVcaDcaaaVDaaaVcgMttgtNagcg\n\
-taDWgtcgttaatDgKgagcSatatcSHtagtagttggtgtHaWtaHKtatagctgtVga\n\
-ttaBVaatgaataagtaatVatSttaHctttKtttgtagttaccttaatcgtagtcctgB\n\
-cgactatttVcMacHaaaggaatgDatggKtaHtgStatattaaSagctWcctccRtata\n\
-BaDYcgttgcNaagaggatRaaaYtaWgNtSMcaatttactaacatttaaWttHtatBat\n\
-tgtcgacaatNgattgcNgtMaaaKaBDattHacttggtRtttaYaacgVactBtaBaKt\n\
-gBttatgVttgtVttcaatcWcNctDBaaBgaDHacBttattNtgtDtatttVSaaacag\n\
-gatgcRatSgtaSaNtgBatagttcHBgcBBaaattaHgtDattatDaKaatBaaYaaMa\n\
-ataaataKtttYtagtBgMatNcatgtttgaNagtgttgtgKaNaSagtttgaSMaYBca\n\
-aaacDStagttVacaaaaactaaWttBaagtctgtgcgtMgtaattctcctacctcaNtt\n\
-taaccaaaaVtBcacataacaccccBcWMtatVtggaatgaWtcaaWaaaaaaaaWtDta\n\
-atatRcctDWtcctaccMtVVatKttaWaaKaaatataaagScHBagaggBaSMtaWaVt\n\
-atattactSaaaKNaactatNatccttgaYctattcaaaVgatttYHcRagattttaSat\n\
-aggttattcVtaaagaKgtattattKtRttNcggcRgtgtgtWYtaacHgKatKgatYta\n\
-cYagDtWcHBDctctgRaYKaYagcactKcacSaRtBttttBHKcMtNtcBatttatttt\n\
-tgSatVgaaagaWtcDtagDatatgMacaacRgatatatgtttgtKtNRaatatNatgYc\n\
-aHtgHataacKtgagtagtaacYttaNccaaatHcacaacaVDtagtaYtccagcattNt\n\
-acKtBtactaaagaBatVtKaaHBctgStgtBgtatgaSNtgDataaccctgtagcaBgt\n\
-gatcttaDataStgaMaccaSBBgWagtacKcgattgaDgNNaaaacacagtSatBacKD\n\
-gcgtataBKcatacactaSaatYtYcDaactHttcatRtttaatcaattataRtttgtaa\n\
-gMcgNttcatcBtYBagtNWNMtSHcattcRctttttRWgaKacKttgggagBcgttcgc\n\
-MaWHtaatactgtctctatttataVgtttaBScttttaBMaNaatMacactYtBMggtHa\n\
-cMagtaRtctgcatttaHtcaaaatttgagKtgNtactBacaHtcgtatttctMaSRagc\n\
-agttaatgtNtaaattgagagWcKtaNttagVtacgatttgaatttcgRtgtWcVatcgt\n\
-taaDVctgtttBWgaccagaaagtcSgtVtatagaBccttttcctaaattgHtatcggRa\n\
-ttttcaaggcYSKaagWaWtRactaaaacccBatMtttBaatYtaagaactSttcgaaSc\n\
-aatagtattgaccaagtgttttctaacatgtttNVaatcaaagagaaaNattaaRtttta\n\
-VaaaccgcaggNMtatattVctcaagaggaacgBgtttaacaagttcKcYaatatactaa\n\
-ccBaaaSggttcNtattctagttRtBacgScVctcaatttaatYtaaaaaaatgSaatga\n\
-tagaMBRatgRcMcgttgaWHtcaVYgaatYtaatctttYttatRaWtctgBtDcgatNa\n\
-tcKaBaDgatgtaNatWKctccgatattaacattNaaacDatgBgttctgtDtaaaMggt\n\
-gaBaSHataacgccSctaBtttaRBtcNHcDatcDcctagagtcRtaBgWttDRVHagat\n\
-tYatgtatcWtaHtttYcattWtaaagtctNgtStggRNcgcggagSSaaagaaaatYcH\n\
-DtcgctttaatgYcKBVSgtattRaYBaDaaatBgtatgaHtaaRaRgcaSWNtagatHa\n\
-acttNctBtcaccatctMcatattccaSatttgcgaDagDgtatYtaaaVDtaagtttWV\n\
-aagtagYatRttaagDcNgacKBcScagHtattatcDaDactaaaaaYgHttBcgaDttg\n\
-gataaaKSRcBMaBcgaBSttcWtgNBatRaccgattcatttataacggHVtaattcaca\n\
-agagVttaaRaatVVRKcgWtVgacctgDgYaaHaWtctttcacMagggatVgactagMa\n\
-aataKaaNWagKatagNaaWtaaaatttgaattttatttgctaaVgaHatBatcaaBWcB\n\
-gttcMatcgBaaNgttcgSNaggSaRtttgHtRtattaNttcDcatSaVttttcgaaaaa\n\
-ttgHatctaRaggSaNatMDaaatDcacgattttagaHgHaWtYgattaatHNSttatMS\n\
-gggNtcKtYatRggtttgtMWVtttaYtagcagBagHaYagttatatggtBacYcattaR\n\
-SataBatMtttaaatctHcaaaSaaaagttNSaaWcWRccRtKaagtBWtcaaattSttM\n\
-tattggaaaccttaacgttBtWatttatatWcDaatagattcctScacctaagggRaaYt\n\
-aNaatgVtBcttaaBaacaMVaaattatStYgRcctgtactatcMcVKatttcgSgatRH\n\
-MaaaHtagtaaHtVgcaaataatatcgKKtgccaatBNgaaWcVttgagttaKatagttc\n\
-aggKDatDtattgaKaVcaKtaataDataataHSaHcattagttaatRVYcNaHtaRcaa\n\
-ggtNHcgtcaaccaBaaagYtHWaaaRcKgaYaaDttgcWYtataRgaatatgtYtgcKt\n\
-aNttWacatYHctRaDtYtattcBttttatcSataYaYgttWaRagcacHMgtttHtYtt\n\
-YaatcggtatStttcgtRSattaaDaKMaatatactaNBaWgctacacYtgaYVgtgHta\n\
-aaRaaRgHtagtWattataaaSDaaWtgMattatcgaaaagtaYRSaWtSgNtBgagcRY\n\
-aMDtactaacttaWgtatctagacaagNtattHggataatYttYatcataDcgHgttBtt\n\
-ctttVttgccgaaWtaaaacgKgtatctaaaaaNtccDtaDatBMaMggaatNKtatBaa\n\
-atVtccRaHtaSacataHattgtttKVYattcataVaattWtcgtgMttcttKtgtctaa\n\
-cVtatctatatBRataactcgKatStatattcatHHRttKtccaacgtgggtgRgtgaMt\n\
-attattggctatcgtgacMtRcBDtcttgtactaatRHttttaagatcgVMDStattatY\n\
-BtttDttgtBtNttgRcMtYtgBacHaWaBaatDKctaagtgaaactaatgRaaKgatcc\n\
-aagNaaaatattaggWNtaagtatacttttKcgtcggSYtcttgRctataYcttatataa\n\
-agtatattaatttataVaacacaDHatctatttttKYVatHRactttaBHccaWagtact\n\
-BtcacgaVgcgttRtttttttSVgtSagtBaaattctgaHgactcttgMcattttagVta\n\
-agaattHctHtcaDaaNtaacRggWatagttcgtSttgaDatcNgNagctagDgatcNtt\n\
-KgttgtaDtctttRaaYStRatDtgMggactSttaDtagSaVtBDttgtDgccatcacaM\n\
-attaaaMtNacaVcgSWcVaaDatcaHaatgaattaMtatccVtctBtaattgtWattat\n\
-BRcWcaatgNNtactWYtDaKttaaatcactcagtRaaRgatggtKgcgccaaHgaggat\n\
-StattYcaNMtcaBttacttatgagDaNtaMgaaWtgtttcttctaHtMNgttatctaWW\n\
-atMtBtaaatagDVatgtBYtatcggcttaagacMRtaHScgatatYgRDtcattatSDa\n\
-HggaaataNgaWSRRaaaBaatagBattaDctttgHWNttacaataaaaaaatacggttt\n\
-gHgVtaHtWMttNtBtctagtMcgKMgHgYtataHaNagWtcaacYattaataYRgtaWK\n\
-gaBctataaccgatttaHaNBRaRaMtccggtNgacMtctcatttgcaattcWgMactta\n\
-caaDaaNtactWatVtttagccttMaatcagVaagtctVaaDaBtattaattaYtNaYtg\n\
-gattaKtaKctYaMtattYgatattataatKtVgDcttatatNBtcgttgtStttttMag\n\
-aggttaHYSttcKgtcKtDNtataagttataagSgttatDtRttattgttttSNggRtca\n\
-aKMNatgaatattgtBWtaMacctgggYgaSgaagYataagattacgagaatBtggtRcV\n\
-HtgYggaDgaYaKagWagctatagacgaaHgtWaNgacttHRatVaWacKYtgRVNgVcS\n\
-gRWctacatcKSactctgWYtBggtataagcttNRttVtgRcaWaaatDMatYattaact\n\
-ttcgaagRatSctgccttgcRKaccHtttSNVagtagHagBagttagaccaRtataBcca\n\
-taatSHatRtcHagacBWatagcaMtacaRtgtgaaBatctKRtScttccaNaatcNgta\n\
-atatWtcaMgactctBtWtaaNactHaaaaRctcgcatggctMcaaNtcagaaaaacaca\n\
-gtggggWttRttagtaagaVctVMtcgaatcttcMaaaHcaHBttcgattatgtcaDagc\n\
-YRtBtYcgacMgtDcagcgaNgttaataatagcagKYYtcgtaBtYctMaRtaRtDagaa\n\
-aacacatgYaBttgattattcgaaNttBctSataaMataWRgaHtttccgtDgaYtatgg\n\
-tDgHKgMtatttVtMtVagttaRatMattRagataaccctKctMtSttgaHagtcStcta\n\
-tttccSagatgttccacgaggYNttHRacgattcDatatDcataaaatBBttatcgaHtN\n\
-HaaatatDNaggctgaNcaaggagttBttMgRagVatBcRtaWgatgBtSgaKtcgHttt\n\
-gaatcaaDaHttcSBgHcagtVaaSttDcagccgttNBtgttHagYtattctttRWaaVt\n\
-SttcatatKaaRaaaNacaVtVctMtSDtDtRHRcgtaatgctcttaaatSacacaatcg\n\
-HattcaWcttaaaatHaaatcNctWttaNMcMtaKctVtcctaagYgatgatcYaaaRac\n\
-tctaRDaYagtaacgtDgaggaaatctcaaacatcaScttcKttNtaccatNtaNataca\n\
-tttHaaDHgcaDatMWaaBttcRggctMaagctVYcacgatcaDttatYtaatcKatWat\n\
-caatVYtNagatttgattgaYttttYgacttVtcKaRagaaaHVgDtaMatKYagagttN\n\
-atWttaccNtYtcDWgSatgaRgtMatgKtcgacaagWtacttaagtcgKtgatccttNc\n\
-ttatagMatHVggtagcgHctatagccctYttggtaattKNaacgaaYatatVctaataM\n\
-aaaYtgVtcKaYtaataacagaatHcacVagatYWHttagaaSMaatWtYtgtaaagNaa\n\
-acaVgaWtcacNWgataNttcaSagctMDaRttgNactaccgataMaaatgtttattDtc\n\
-aagacgctDHYYatggttcaagccNctccttcMctttagacBtaaWtaWVHggaaaaNat\n\
-ttaDtDtgctaaHHtMtatNtMtagtcatttgcaaaRatacagRHtatDNtgtDgaatVg\n\
-tVNtcaaatYBMaaaagcaKgtgatgatMgWWMaHttttMgMagatDtataaattaacca\n\
-actMtacataaattgRataatacgBtKtaataattRgtatDagDtcRDacctatRcagag\n\
-cSHatNtcaScNtttggacNtaaggaccgtgKNttgttNcttgaaRgYgRtNtcagttBc\n\
-ttttcHtKtgcttYaaNgYagtaaatgaatggWaMattBHtatctatSgtcYtgcHtaat\n\
-tHgaaMtHcagaaSatggtatgccaHBtYtcNattWtgtNgctttaggtttgtWatNtgH\n\
-tgcDttactttttttgcNtactKtWRaVcttcatagtgSNKaNccgaataaBttataata\n\
-YtSagctttaaatSttggctaaKSaatRccgWHgagDttaaatcatgagMtcgagtVtaD\n\
-ggaBtatttgDacataaacgtagYRagBWtgDStKDgatgaagttcattatttaKWcata\n\
-aatWRgatataRgttRacaaNKttNtKagaaYaStaactScattattaacgatttaaatg\n\
-DtaattagatHgaYataaactatggggatVHtgccgtNgatNYcaStRtagaccacWcaM\n\
-tatRagHgVactYtWHtcttcatgatWgagaKggagtatgaWtDtVtNaNtcgYYgtaaa\n\
-ctttaDtBactagtaDctatagtaatatttatatataacgHaaaRagKattSagttYtSt\n\
->THREE Homo sapiens frequency\n\
-agagagacgatgaaaattaatcgtcaatacgctggcgaacactgagggggacccaatgct\n\
-cttctcggtctaaaaaggaatgtgtcagaaattggtcagttcaaaagtagaccggatctt\n\
-tgcggagaacaattcacggaacgtagcgttgggaaatatcctttctaccacacatcggat\n\
-tttcgccctctcccattatttattgtgttctcacatagaattattgtttagacatccctc\n\
-gttgtatggagagttgcccgagcgtaaaggcataatccatataccgccgggtgagtgacc\n\
-tgaaattgtttttagttgggatttcgctatggattagcttacacgaagagattctaatgg\n\
-tactataggataattataatgctgcgtggcgcagtacaccgttacaaacgtcgttcgcat\n\
-atgtggctaacacggtgaaaatacctacatcgtatttgcaatttcggtcgtttcatagag\n\
-cgcattgaattactcaaaaattatatatgttgattatttgattagactgcgtggaaagaa\n\
-ggggtactcaagccatttgtaaaagctgcatctcgcttaagtttgagagcttacattagt\n\
-ctatttcagtcttctaggaaatgtctgtgtgagtggttgtcgtccataggtcactggcat\n\
-atgcgattcatgacatgctaaactaagaaagtagattactattaccggcatgcctaatgc\n\
-gattgcactgctatgaaggtgcggacgtcgcgcccatgtagccctgataataccaatact\n\
-tacatttggtcagcaattctgacattatacctagcacccataaatttactcagacttgag\n\
-gacaggctcttggagtcgatcttctgtttgtatgcatgtgatcatatagatgaataagcg\n\
-atgcgactagttagggcatagtatagatctgtgtatacagttcagctgaacgtccgcgag\n\
-tggaagtacagctgagatctatcctaaaatgcaaccatatcgttcacacatgatatgaac\n\
-ccagggggaaacattgagttcagttaaattggcagcgaatcccccaagaagaaggcggag\n\
-tgacgttgaacgggcttatggtttttcagtacttcctccgtataagttgagcgaaatgta\n\
-aacagaataatcgttgtgttaacaacattaaaatcgcggaatatgatgagaatacacagt\n\
-gtgagcatttcacttgtaaaatatctttggtagaacttactttgctttaaatatgttaaa\n\
-ccgatctaataatctacaaaacggtagattttgcctagcacattgcgtccttctctattc\n\
-agatagaggcaatactcagaaggttttatccaaagcactgtgttgactaacctaagtttt\n\
-agtctaataatcatgattgattataggtgccgtggactacatgactcgtccacaaataat\n\
-acttagcagatcagcaattggccaagcacccgacttttatttaatggttgtgcaatagtc\n\
-cagattcgtattcgggactctttcaaataatagtttcctggcatctaagtaagaaaagct\n\
-cataaggaagcgatattatgacacgctcttccgccgctgttttgaaacttgagtattgct\n\
-cgtccgaaattgagggtcacttcaaaatttactgagaagacgaagatcgactaaagttaa\n\
-aatgctagtccacagttggtcaagttgaattcatccacgagttatatagctattttaatt\n\
-tatagtcgagtgtacaaaaaacatccacaataagatttatcttagaataacaacccccgt\n\
-atcatcgaaatcctccgttatggcctgactcctcgagcttatagcatttgtgctggcgct\n\
-cttgccaggaacttgctcgcgaggtggtgacgagtgagatgatcagtttcattatgatga\n\
-tacgattttatcgcgactagttaatcatcatagcaagtaaaatttgaattatgtcattat\n\
-catgctccattaacaggttatttaattgatactgacgaaattttttcacaatgggttttc\n\
-tagaatttaatatcagtaattgaagccttcataggggtcctactagtatcctacacgacg\n\
-caggtccgcagtatcctggagggacgtgttactgattaaaagggtcaaaggaatgaaggc\n\
-tcacaatgttacctgcttcaccatagtgagccgatgagttttacattagtactaaatccc\n\
-aaatcatactttacgatgaggcttgctagcgctaaagagaatacatacaccaccacatag\n\
-aattgttagcgatgatatcaaatagactcctggaagtgtcagggggaaactgttcaatat\n\
-ttcgtccacaggactgaccaggcatggaaaagactgacgttggaaactataccatctcac\n\
-gcccgacgcttcactaattgatgatccaaaaaatatagcccggattcctgattagcaaag\n\
-ggttcacagagaaagatattatcgacgtatatcccaaaaaacagacgtaatgtgcatctt\n\
-cgaatcgggatgaatacttgtatcataaaaatgtgacctctagtatacaggttaatgtta\n\
-gtgatacacaatactcgtgggccatgggttctcaaataaaatgtaatattgcgtcgatca\n\
-ctcacccacgtatttggtctaattatgttttatttagtgacaatccaatagataaccggt\n\
-cctattaagggctatatttttagcgaccacgcgtttaaacaaaggattgtatgtagatgg\n\
-taccagtttaattgccagtgggcaatcctaagcaaaatgagattctatcctaaagtttgg\n\
-gcttgatataagatttcggatgtatgggttttataatcgttggagagctcaatcatgagc\n\
-taatacatggatttcgctacctcaccgagagaccttgcatgaagaattctaaccaaaagt\n\
-ttaataggccggattggattgagttaattaagaccttgttcagtcatagtaaaaaccctt\n\
-aaattttaccgattgacaaagtgagcagtcgcaataccctatgcgaaacgcctcgatagt\n\
-gactaggtatacaaggtttttgagttcctttgaaatagttaactaatttaaaattaatta\n\
-acgacatggaaatcacagaacctaatgctttgtaggagttatttatgctgtttactgcct\n\
-ctacaaccctaataaagcagtcctaagaatgaaacgcatcttttagttcagaaagtggta\n\
-tccagggtggtcaatttaataaattcaacatcgggtctcaggatattcggtcatataatt\n\
-tattaagggctcttcgagtcttactctgagtgaaattggaaacagtcatccttttcgttg\n\
-tgaggcatcttacaccgctatcgatatacaatgcattccaccgcggtgtcccgtacacaa\n\
-ggaaacttgttaccttggggatataagaaaactcacacgtctcattattaaactgagtac\n\
-aatttttgcacgagaaagtaatgcaatacaatatgatgaaagccagctaatgaaaaggga\n\
-tggaacgcacctcggatctgttgcactggattaaaatccgattatttttaaaaatattca\n\
-gtgctagagcatatcaggtctacttttttatctggtatgtaaagcccacggagcgatagt\n\
-gagatccttacgactcaacgaaaagttataacataactcccgttagccaaagcccaatcc\n\
-cgattactgccctaccctaacgtctgccatctaaatatcgaacttgttatgatcaatgtg\n\
-actacctcccaccctttccccttcatttgttccactggggataagctagcgttttcagaa\n\
-tcaatgcaataagaatagccaattgtctcacttcatcagagctcttggcaattccaggcg\n\
-ctacgtggttctggaatatattcatttttcaaatagtaatacgtttagtgttgctattgt\n\
-ctacacgtttggatattacgttatgtgagcggacatcaatagttgtctaactctttagta\n\
-agccagagatagcactcttagcgaatggataccatcttccataagtttagttaatagtcc\n\
-gaaacaactgcttcgagcatatttgaacctccttgtaggcaaatagcctcttcaaagcaa\n\
-tcttactaatagatagagtttgttttaagggactactagaaatgggacaatcttaatagt\n\
-atgacctaaactgacatttaaagatatatccaggtggcaagcataaagatcattgcgcca\n\
-cctccaccgtgggattacttatcagtcgatatcctatatgctaagtttgcgacggcagaa\n\
-tacaaactaagctgagttgatgctaaccttacctatgataccccattggaccggttaaca\n\
-gccctacttattccaaataaaagaacttttatgctgtagaagctattatagtgatgcctg\n\
-gtaacttcagtatattaaaatgacacacatacgccatatagagctcctggaactttgaat\n\
-aatgagcgaacttcgaagttgaagagcaagaaaccatatgtcacggttgcctaaagcccg\n\
-gtaaccagacatgtgctatcattgatcattatcgaggttttcataaccttgacccattat\n\
-cggctgtgcgcggacaagtacttaaatcactagtttcttcacctgcttatcggtaagaaa\n\
-taaggttggcaaagaatcgcataagacggacgtagagccgcagcgttgtgcgagtccagg\n\
-tgcatgcgcagcaataggattttaaattttgttccatttttaatttagccgtaaggatgt\n\
-ccgtaaatgattgaaaattggattcaatctttgggcctatgctactggaacctgatcgac\n\
-aaaatttcaaacatacgttaactccgaaagaccgtatttttgcggctagaatagtcagtc\n\
-gcttggagccatataccttaccacttaaacgacgtgctcctgtagttgaaatataaacag\n\
-aacacaaagactaccgatcatatcaactgaagatctttgtaactttgaggcgaagcaccc\n\
-tcttcgagacaactaagagtaaagtaccgggcgccgcaaggagtcgattgggaccctaaa\n\
-tcttgacgaattgctaagaggctcagagctaccactgtaatttctctagagcccataata\n\
-aatgaacgatacatccgtaggtagcacctaagggattataatggaagccaaatgcagtta\n\
-ataatattatatactggcgtacacgattcgacggatctctcacatagtgattcacgaccc\n\
-ccccctttgattgacacagcgtcagcattttgcaagaacgatcttctgcatagggtgcgc\n\
-caccgtaaggatgacgtcgaagctacaactgggtataatttaccatgcttccctgatgct\n\
-gagtgcaatacactaagaatgagtttttaccccatatcaccagtatttgttctgttattg\n\
-cgaagaaatggctatgctgagttggcgactaaagtcacccatcctttttattaggtaacc\n\
-ccctcccttaaactaactgatttgctggagctgccctgcatacatatactttatcattta\n\
-tggacgtccgtgacgcttattatccaccatagtcgatatgctacacggattcattaatgg\n\
-atcgtaggagtttaagttatatttactaagatcggtctcggctactatcccgccttaccc\n\
-ggcgctatttacggccatttttaatatattgacggtaattattcctatggtttcgaccgc\n\
-acgtccttggacaagaaagaatggcaaaaaaaatgtaaaagaaaaaaaatattgagtccc\n\
-taccatcatataaaaaatatgtgatgagtaacttgacgaaatgttagtggttattaaaga\n\
-ctatctattacaccttttgttttctgtcgtagtatattaaagtctagaagccttacagga\n\
-aaatcagggttatacagccgatactccgcagcatgaatcatcgaggaggtgtcctaccat\n\
-cgcgccttgtaatcttgtctgtgtatactgtatttagaccttttatacaaagtaaatatc\n\
-tcggctttatgtgattgggaggggcctactcaaacatgatgacttgacctaataatcact\n\
-gtgcgggcgtcttatgactagctattccttgaaatccaccaccaaatggttaatatgtaa\n\
-aaactttgacgatgaaacaaggtgaatgtgtagttactttgtgtaattagctgcgtcgag\n\
-cattgcttgtaaaaccgtcaatcgcacacgttacttccataaaatttctacgaatacacc\n\
-cttcttaaaaaaaacgtaggaattcacgagtttaacaaacgataactgtataaagtggaa\n\
-gtccgaagaaagcagatgcccgaactactcgaagatgtttcgttttcttaaccatagggg\n\
-cttcttaatggcccactacgcacattttgttcaagcccgagagggacatccccattacgg\n\
-gagtattactaaaactgttccgtaatacgttcagcaagggatgaaaaaggccactgctca\n\
-agttattgacgtgggagtattacatcggaagcctgaatcccacactatgatggtctgtac\n\
-aggcctagggactgcgtctagacggtattaccggcttctaatcatacgatcgtgagtctt\n\
-aacgggaagtaaggctcacacctaccccaaaccatttatctatgtaagtataaaattgtg\n\
-cgtaagtgttcaaagtggacaataaagacgtggcaaaaacccccgcacataagccgcttt\n\
-agatttcacaaataccaatgcggttaaaaacatccttgagtcgtacatacaccatactcg\n\
-cgttaaacggatataacagaagataataaatccggatgtggagtcggtgtaactatagaa\n\
-agccaagtgaaataatgcttaccagtcatttagctatacggctttcatttcatgtcaaga\n\
-gggtggagtttgacctgtacagttgatatatcaccgatacttagaactcacctaaagcta\n\
-aaattgctcgcagcgtgtaatccgcatattacaaacaatagatgggattcattatacata\n\
-agacacgatgatctgctttttcaggttgcgagatgttgcctatcgtcaatcgagtcctgc\n\
-cttacaccacttaaacaaaagtattgacagggaacctattttcgaggtattatatagtcc\n\
-agcttgaatatcaatttgacagttaacctagtgaaaatcagtaagaggaaatacgccaca\n\
-ttctccagtgaaattctacgggttatcgtctagtccaactatcaattataactcacgaga\n\
-tataagtaaattctcgtacttggcctgatttttattatactttggatccttagtaaacag\n\
-gaagggagaaaccttcaacgaaaaacactggattttgttttactctcaaagctcttatat\n\
-gacggaaataccctgtcaagtcttaactttattactagactaatgaaatgggcttggggt\n\
-ggccagaatcatagtacaatttagcggatacactattcggactttcctatcggctgtctg\n\
-gttggataagtatggggactaataggctagacatacctatacttaaactatacaggcgtc\n\
-atctatctctgcaactttggagttccctgatgttctcccgccctttgggttcacatcttc\n\
-tataccgacacccctaataacgattagtttgtgggttagagtaaattaatacggttaata\n\
-ttaatgtatcgttgaaaagctggtgtcgccaataaggtaaccggctaggcagagtatatg\n\
-tcacgaagtataactaccctaatgataagctgtaggaataaaattaatgctgtctctaag\n\
-cgaagagatatttccgactctgttttaatgacgaatctcattacttctgacttgcaaatg\n\
-ttcaatatggcacggtttcacggcacctttgtgacgcatataatgaacttagaagattat\n\
-aacgacggaactttatatgataatccgttacgattaaagaatctgttaaatatcataatg\n\
-gcattcagttctagaccgtgcatcatggtaaacttactttctctgcatggcgacatacat\n\
-ttcgctattcaaattcgcgtgtggttacacccactcgcacctttggaatattaagagaag\n\
-atgatcagaaaatccattcgctcaatttttctgacgtacgtctaatttatcctaggagac\n\
-aaatcgttttatgtctctcacatttttgaagaaaggttcgagagacaatactcaggtcct\n\
-gaactgctagaagatactcggtggagcgtggcaacaatgaaaaactcgtgacataaatga\n\
-atgatacttttccaagttcagttaagtgaatatgtttaacatacccggcttttcgatctt\n\
-aagctgacgctggacgtgcgagtaatgtcagtctcttacatacactagtgactccaagtt\n\
-tcgtcaaaaacgccccctcccttctcgagcccactcacgctatgtattgacgcgaacttg\n\
-ttcgggatcagacttttcaggagttcggtcgcgtgtccctatgtgctaatatataagtta\n\
-gatcgcattagatgctaatctgaatacttatagacgaccttcaacgagaacgggtaccac\n\
-cttgaggctagagttaggtgtgaaacgacaggtagggacatataaaatttgagtgcggct\n\
-ttagttaagggtttaattacctactcaaacatcacgctcgcgcccttcgtacgtaatcga\n\
-ccatctagaggctaaggggactgtactaggtagtgattaatgatatcctagacgcacgtg\n\
-ccttagatcttcagactctgatggtccgcgatcaccgtaattgtagtcctccaactcgat\n\
-cactttgttggcgtcaaagaaattacgatatctaaatacttataatacaataaccaagga\n\
-tgagaatgactcatcgcgttggagttatattgcttgaagttctatggaatgaaagcacgt\n\
-tatctgccgtcccaatatctccagtgagctaattcattggacggtccactttgatcaatc\n\
-cccgaggagatgttcggacactttagtctgtaacacttagcgttgagaccacgaacaatt\n\
-gattactcagtcttgaaggtgttttccaaagttcattttaaataagactacgataggcct\n\
-ttcctattgatataaactacccggctctgttgttcgtgtgagtcgtacttctctgtgttt\n\
-ttctgattatagcaagattcgattcttagtgtaaacagcgatttttatttgacccgtcaa\n\
-tgagaagcgcataggatctaagcaaaattatcaagttgtgccacaaggtaagatctttcc\n\
-agttattgcaggtaggatgtatcccacgttgatagtatgaggtctgacgtcaactgtcta\n\
-ggagagttgaccgcgtgcgggtacaccggatttgcatcgatgttgagaacgcagaactcc\n\
-cactgtcgtggcggcgttcctgatatttagcaagaggcgttgataaagccctcatcatct\n\
-agatctcgacctcatctgccctcttgctccatcattttctacacagactactttcctatc\n\
-tacgttagtataattgctttctatcttagtatcatttagagcttctccgtcaacaggttc\n\
-gtgctattaaagttagtacgaaagggacaacttgtagcaacgcatttaatcggttttcga\n\
-ctacttcgcacaaaatcagataaagaagtttgtcattctattagacattgaattgcgcaa\n\
-ttgacttgtaccacttatgatcgaacactgaatcaagactgtgattaactaaaatagaca\n\
-agccactatatcaactaataaaaacgcccctggtggtcgaacatagttgactacaggata\n\
-attaattggactggagccattacattctctacaatcgtatcacttcccaagtagacaact\n\
-ttgaccttgtagtttcatgtacaaaaaaatgctttcgcaggagcacattggtagttcaat\n\
-agtttcatgggaacctcttgagccgtcttctgtgggtgtgttcggatagtaggtactgat\n\
-aaagtcgtgtcgctttcgatgagagggaattcaccggaaaacaccttggttaacaggata\n\
-gtctatgtaaacttcgagacatgtttaagagttaccagcttaatccacggtgctctacta\n\
-gtatcatcagctgtcttgcctcgcctagaaatatgcattctatcgttatcctatcaacgg\n\
-ttgccgtactgagcagccttattgtggaagagtaatatataaatgtagtcttgtctttac\n\
-gaagcagacgtaagtaataatgacttggaataccaaaactaaacatagtggattatcata\n\
-ctcaagaactctccagataaataacagtttttacgatacgtcaccaatgagcttaaagat\n\
-taggatcctcaaaactgatacaaacgctaattcatttgttattggatccagtatcagtta\n\
-aactgaatggagtgaagattgtagaatgttgttctggcctcgcatggggtctaggtgata\n\
-tacaatttctcatacttacacggtagtggaaatctgattctagcttcgtagctgactata\n\
-ctcaaggaaccactgctcaaggtaggagactagttccgaccctacagtcaaagtggccga\n\
-agcttaaactatagactagttgttaaatgctgatttcaagatatcatctatatacagttt\n\
-ggacaattatgtgtgcgaaactaaaattcatgctattcagatggatttcacttatgcctt\n\
-agaaacagatattgcccgagctcaatcaacagttttagccggaaacaatcgaagcatagg\n\
-gacaatgtatcttttcctaaattgccatgtgcagatttctgagtgtcacgaagcgcataa\n\
-tagaatcttgtgttgcctcaactcgttgaaaagtttaaaacaatcgcagcagtctttttg\n\
-gggtctactgtgtgtttgcaaaataactgaaagaaacgcttgaacaactctgaagtagct\n\
-cgagtactcattaaagtgtaacacattagtgaatatcggccaatgaaccaaacgcttccc\n\
-ggtacgctatctctctcatcgggaggcgatgtgcaggttatctacgaaagcatcccttta\n\
-cgttgagagtgtcgatgcatgaacctcattgtaacaatagcccagcaaattctcatacgt\n\
-gcctcagggtccgggcgtactcctccatggaagggcgcgcatctagtgttataccaactc\n\
-gctttttaactactatgctgtagttctacaggcatagtggccagtattttctaacttctc\n\
-tggatagatgctctcactcctcatccatcacggcttcagtttacgtcttacttgcttgtt\n\
-cagcaacggatggaggcattaagtatcttcactgttccctaaaattgctgttcaatatca\n\
-aagtaaggacgatacagggaaagctcaagcacactcattgaatactgccccagttgcaac\n\
-ctcacttaatctgacaaaaataatgactactctaagtgttgcggaagcagtctcttccac\n\
-gagcttgtctgtatcacttcgtataggcatgtaactcgatagacacgaacaccgagtgag\n\
-aaactatattcttgcttccgtgtgtgtgacaccaggtaattgatgcggatataagctgga\n\
-gatcactcacgcccacacaaggcgctgctacctctttattccaatgtgtaagaatttgct\n\
-aacttcatttctagaccgcagctttgcggtcataatttcacggtacggacccttgggtta\n\
-gagacttgataacacacttcgcagtttccaccgcgcacatgttttagtggcttctaacat\n\
-agaatttttgttgtgacataaagagtgcgtgggagacttgcccgaccgttaagccataat\n\
-caattgaaagccccgtgagtcacatctaattggttgtactgcgcatttagctatccttta\n\
-gctgactcgaagagattcgattcctaatataggttaattagatggctgccgcgcgaagta\n\
-aaacgtgaaaaacgtagtgcgcagatctgcataactcgcgcttaattacttatgagtagt\n\
-tccaagttcgctacgttatgagagagattggaattaagcaaatatgttttatggtgattt\n\
-tgggatgagaaggactgctaagtacggctactaaacaaatttctaaaaccgccatctacc\n\
-ttatcttggagacatttaagttgtatatgtcactagtctagcttttgtctgtgggacgcg\n\
-ttctcggaatgagggaaatgcaagagccgattcatcaaatgcttatctaagaaagtagtg\n\
-gactattacaccaagcacgaatgccagggaactgctttcttgctcaggacctcgcgacaa\n\
-ggtaccccgcataagtcctagaattacatttggtcagcaatgctgacatttgaccgtgaa\n\
-aacataattttaatcagaaggcagctcacccgcttgctctagatcttatctttgtatgaa\n\
-tgtcagaatttactgcaatatccgttccgaatagtgagggcttagtatagttctctgtat\n\
-acaggtcacatcaaactccccctgtcctagtacagctctgagctttaattaattgcatac\n\
-atttccttcaatcatcagatgaaaacaccgcgaatcatgctcttctcgtatagggcaaga\n\
-gaagcaacaaacaactagcccgactcacgttcatccgccgtatccttgttcagttcttac\n\
-tccgtattaggtcagcgaaatctaatcagaataatcggtcgcgtatcaaaattaaaatcc\n\
-cgcttgaggttgacaattaaaacgctgagcagttatcggctattagatagtggggtgaaa\n\
-gtaattggctggaattatgttaaaacgtgatattaagctaaaatacgctacttgttgccg\n\
-acctaattcagtcattcgatattcagttagagccaagaataacaagcttgtataaattga\n\
-acggggtgcactaaacgatgtgttactctaatattcagcttggagtatacctgaaggcga\n\
-attcatgtatcggccaataataagacgttgaagatcacaatttggactagcaaaagaagg\n\
-tgatttatgcgtggggattgagtccactgtacgagtacggtctctggaaaattataggtt\n\
-cagggaatataaggaagtaaagataattaccaagagatttttggtatcgctatgacccag\n\
-aggtgttctaacgtctgttttgatccgcagaatttctgcctcaatgcatatttgacggac\n\
-ttgaactagagcctctaaagttaaatggcgacgcaactgttcctaaacttcaattattac\n\
-tactctttttttcctagggtattgtagaggccagtggacaaaataaatcaaatttaagat\n\
-gtttcggacattaacatcccccgtagcatagaaatcatcagttatccaatctctcatcga\n\
-gcttttacaatttctgctggcgctatggacagcatatgccgcgagacctccgcaagactc\n\
-acttgatcactgtaagtatcttcattagaggttagagcctatagttaagctgctgaccta\n\
-gtaaaattggtattttctaattttattgctcaagttaaaggttagtgaagggataatgac\n\
-gttatttttgaacaatgggttgtattcaattttatatcacgaatggaacccttcattccc\n\
-ggcataatactagacgacacgaacaagctccgatctatcagccaggcacgtgttaaggtt\n\
-taattccggcaaaccaatgaagcatcaaaaggtgacctgatgcaacttagggtcacgatg\n\
-agtttttcaggactacttattacctattaataagttaacatgagccttcataccccgtaa\n\
-gacaatacatactccaccaattagaattctgagccatcttatctttttgtatcatcgaag\n\
-ggtatggccgaataggttaattagttactcctaacgtctctacaggcatgcatttgacgc\n\
-accttcgaaaatagtcaatctctcgccacacgcgtctagtatgcagcatcaaaaatatag\n\
-tccacggtttccggattaccaaacgcggcaaagagaaacattgtatcgacggagataact\n\
-taatacagaaggaaggggcatcttcgaatacggatgaataattctatctgtttattctga\n\
-catcttgttttcaggttaatcttacgcattcaaatgacgcctgccccatgcgtgcgcaat\n\
-tattttctaatattgacgagagcaatctcactccttttgggtctatttatgttttattga\n\
-ggcacaagcctatacagaacaggtactattaaggccgtgagtgtgagactcaaaccgtgg\n\
-aaacaaaggatgggttgttcttggtacaagttttagtgcatgtgggcaatccttaccaaa\n\
-atcagatgctatccttaactttgggctgcatttaagatggcggttggaggcctgtgagaa\n\
-tcctgcgtgtcatctttaatgaccgaattcatccatgtagattcagatcacacactcatt\n\
-ccttgatgttgtctaaacaaaagttgttgtggacgcattggagggagttaagtaacaact\n\
-tgggatcgcatacttataaaaattatatgttaaactttcacaaacgctgaagtccaaagt\n\
-aactagcccaaacgcctcgagagtcactaggtattaatggtgtttgagttcctgtgaaat\n\
-agtgttcgaaggtaaaatttatgtaccaaatcgaaagaacacttaataaggcttgcttgc\n\
-acggaggtatgatgtttactgactctacaaccctaattttccagtacgtacattcattcc\n\
-aataggttagttctcaaagtgctatacaggctcctcaattgatgatatgcttcagccgct\n\
-ctatggatattagctcattttatttaggaagcccgcttagaggcttactatgagggaaat\n\
-gccaaaatgtcatacttttcggtgtgtcccatatgacaccgctttacatagaatttgaat\n\
-taaaacgcgctctcccgttcactaccatacttggtaccgtgcgcatattacatatagata\n\
-taggatcattttttaaagctgtactaggtttgatcgacaatcttatgctatactatatga\n\
-tgtaaccctcataatcaataccgatcgtacgatcctagcataggtggcaagcgattttat\n\
-gccgattattgtgttaaatagtctgtgagtgtgattatcagggctacgttggtagagggg\n\
-ttgtatagacctcgcacacattgtgacatacttaacaatatacgaaaactgatataataa\n\
-atccccttacccaaacaccaatcccgttgaatcaactaccataacgtctcccatataaat\n\
-tgcctacttgtttgcataaatctgaatacataacaccattgcaccttcttgtgttccaat\n\
-cccgttaagattgccttgtcagatgatatgcaagaacaatagcatttgctagcaattatt\n\
-aacagctcttcgaattgcctccacataacgcgggagggtatattttaatttggcaaatac\n\
-taagtactgttggcgtcatatgctattaacggttggatattaagttatgtcagccgtaag\n\
-caagagtgggcgaaatattttgttacccagtgagagcactcttagagtttggatacaata\n\
-ggccatatgttgacttaagaggacgtaactacgccgtacaccattgttcaaccgacttct\n\
-tggcaaatagaatcgtattagcaatcttaagaatagagacacgttcgtgttagggtatac\n\
-tacaaatccgaaaatcttaagaggatcacctaaactgaaatttatacatatttcaacgtg\n\
-gatagatttaacataattcagccacctccaacctgggagtaattttcagtagatttacta\n\
-gatgattagtggcccaacgcacttgactatataagatctggggatcctaacctgacctat\n\
-gagacaaaattggaaacgttaacagcccttatgtgtacaaagaaaagtaagttgttgctg\n\
-ttcaacagatgatagtcatgacgcgtaacttcactatagtaaattgaaacaaatacgcaa\n\
-tttagacagaatggtacggtcatgaatgacagtaattcgaagtgctagaccaacttaaaa\n\
-taggtaaacgtgcccgaaaccccccttaacagaaagctgctatcatggtgcagtatcgac\n\
-gtgttcagaaacttgtaacttttgagcaggtccgagcacatggaagtatatcacgtgttt\n\
-ctgaaccggcttatccctaagatatatccgtcgcaaactttcgatttagtcccacgtaga\n\
-gcccaagcgttgtgcgactccacgtgcatgcccagaaatacgagtttaaatttggttaca\n\
-tggttaattttgaccgaagcatcgcactttatgattgataattggattcaatatgtcgcc\n\
-ctatgcgaatgcaacatgatccacaatttggctataagacgtttaatccgtatcacactt\n\
-tgtttgcggctagtatagtaacgcccgtgcaccaagagtcagtaacaattataagtactc\n\
-cgcaggtacttcaaatataaaaactaatcaaacacgacccatatgatcatctgaagatat\n\
-ttggaactttctcgacaaccaccctcgtactcaatacttacactaatcgacaggcacacg\n\
-caacgtgtacagtcgcaccatattgagtcaagatttgcttagtggcgatgagcgtacacg\n\
-cttatttctctagtcacaattagttatctacgagacatcacgagggagcaaataagcgat\n\
-gttatggctacacataggcacgtatgaatatgatataagccagttaaacagtcgaaccat\n\
-cgagcaaattctcatgcaccaacccacacgttgaggcacaaagagtaagctgtttgaatg\n\
-taacttcttctgctgagcgggccccaacgtaaggatcaactagaagagaaaactcggtat\n\
-tagtttaaatgcgtcacggagcatgagtgcatttcactaagaatgtctgtgtaaccaata\n\
-taacatctatttgttatctgattgcctacttatggctttgcggtcgtggcgactaatgtc\n\
-tccaatccttttgaggtcggtaccaactccctttaaattacgctgtgcaggctcatgcac\n\
-tgcatacatatacggtagcaggtagggacctcacgcacccttattataatcaatagtagt\n\
-tatcagtcaacgaggcaggaatgctgaggtcgaggtgttggtatattttctatgtgccgt\n\
-ctaggcgactatcacgcattaccaggcgagatttaagccaattttgaatatagtcaacgt\n\
-aatttttactatgggttccaccgaaacgccttgcacaactaagaatcccataaaatatcg\n\
-atatcaaataaaagattgtgtcaataccttcatatatattttttcggttgactaacgtga\n\
-actaaggttaggggttttgtatgtctatataggaaacagtttcttttctgtcctacttta\n\
-gtaaagtcttcaagccttactccaaaatcacggtgattaagccgttactcagcagcatga\n\
-ttctgcctgctcgggtcctaaaatccagccttgtaagagtcgctgtgtattagctaggga\n\
-gacctttgttaaaaaggatatatcgcggcgggatgtgagtgcgtggcgcatactcaatct\n\
-tcagctcgtgtcattataatatctctcccccacgcttttcactagatatgccgtgtaagc\n\
-aaacaccttatgcttaatttcgaaaatattggtacttgaaaaaagctgtaggggtactta\n\
-atgtctggtaggagatcaggagagaattgagtgtaaaaccgtaaagccctcacctgactt\n\
-catgtaaatggcttagaagactccatgatttaataaatactacgaaggaaagactggatc\n\
-taaagataactctagtaaggccaactcccttcaatgctgttgccagttataatccaagag\n\
-ctgtccttttctgaaccatagcggcttctgaagcgaactagaagcaaagttggttctagc\n\
-cagacagccacataccctgtacgggtgtattactaaaactggtccggtattagttcacca\n\
-agggaggaattaggcaaaggatctaggtatgcaagtcggagtattacatccctaccctga\n\
-atccatcaataggttcctctgtactggccttcgcaatgagtattcaaggttgtacagccg\n\
-tataataataagatagtgactatgaacgggaagtaacccgctcaccttccccaaaacatt\n\
-gttatatctaagtattaaagtctgccgtagtgttaatactcgaaaataaacaactggcaa\n\
-attacaccgcacttaagccgcttttgatttatatttttccaatgcgcttttaaaaataat\n\
-tcagtcctacatactaattaagacccttaaacggagatatcacaagttaagttttaacca\n\
-tctcgactaggtggaactatagatacccaactcaatttatcattacctgtaatgttccta\n\
-gaaggattgcatttcatgtcaagacggtggagtttcacagcgaaacttcagtgtgaacag\n\
-attctgagaaatcacctaaacctattagtcagagcacccggttagaaccagttgtcaaaa\n\
-aatagagcggttgcatgagacagaagtaacgatgagatccgttgtaacgttgagacatct\n\
-ggcctatcgtcaatacagtcctcccttaaaaatatttttaaatactaggcaaacccaaca\n\
-taggttagtcctatgtgatacgccacatggtatatcattttgtaacgttacctagggata\n\
-atcaggaagtggaattacgcaaaagtagacagtgaaatgcttagggttatagtctagtcc\n\
-aaagataaaggataaagcacgtcagagaactatattagccgaatgggaatcattgttagg\n\
-agactgtggatcatgtctaaaaagcaacgcagaaacagtcatcgaaaaaatctcgttttt\n\
-gtttgaatctaaaagagctttgatgaccgatagtacctgtatactagttactgtattacg\n\
-tgtctaatgatttcggattggggtccccagaatcagacgtcattgtagacgattcaagtt\n\
-taccaatttaatttcccagctctccttggagaactatcgccaataattgcagtcactttc\n\
-cttttctgaaacgataaagccgtcagagttctctgcaacgttggacttacctgaggttct\n\
-aacccactttcggttctaatagtagttaacgacacaacgaataacctttactgtggggct\n\
-ttcacgatattttttcgcttattattaatggttacgtcataagctggtgtccaaattaag\n\
-gttaccggcttcgcagagtagttgtatccaagtataacttccctaatcataagatcgagg\n\
-tagaaaattaatgctgtctctaaccgaacagatatgtcccactatgtggtatggacgttg\n\
-ctaattacttctgaagggaaattggtcattatggatacgtgtctaccatcaggtcggacg\n\
-cagatatggttctgtcttcagttgatccaccgttctttataggataataactgacgatta\n\
-aagattatggtaaatagattaagccaattctcttcttgtcagtgaagcatccttaactga\n\
-cttgctctgcagcccctcatacatttagctattcaaagtaccggctcgtttcaaactctc\n\
-ccacctttggaagaggttgtcaacttgataagtatatcatttacagcattttttcggacg\n\
-tacctctaatgtttcattgcagaaaattagttttttctatcgcacattttgcaagtaacg\n\
-ttagagacacaattatctgcgaatgaactgctagatctgacgaccgggagcctcgcaaat\n\
-atcaaaaaagactgacatatatcaaggagtcgttgacaagtgctggtaagtcaattggtt\n\
-tatctgtcccggcgtttcgatcttaagctgaccatgcacggcagagtaatgtcactctcg\n\
-ttcttacaagtctgtctccaagggtcggcaaaaaagacccctccattctcgagcccactc\n\
-acgatatgtagggacgacaacttgtgcggcttatgaattgtctggactgcgggcgagggt\n\
-ccatatctccgaagttagaagggacatacctttagatgataagatcaattcttattgacg\n\
-aaattcatccacaacggggaacaacttcaccctagacttacgtctgaaaagacacctagc\n\
-gtcttataaaaggtcagtgccccgtttcgtaaggctggaattacctacgcaaacttaaac\n\
-ctcgcgcccttccttacgtatcgacaagatagaggctatcgcgaatgtactacggaggca\n\
-tgaatcatatactagaaccaagtgcctgtgatattaacaagatgatccgacgcgagcacc\n\
-gtaattctaggcataaaactccagcaatttgggggccgaaaacaaatgacgttagctaat\n\
-taattatatgacatgatcaaaggaggtcaatcacgcatcgagttcgacgtatattcattg\n\
-aacttcgtgcgtttgaaagaaacttttatgaaggcaaaattgatcctgtctcctatttca\n\
-tgcgtacctcctagttgataattccccgagcagtggttaggacacttttgtcggtatcaa\n\
-gttccggtctcaaaacgtaaaattctgtaatctgtatggatggtctgtgaattagttaat\n\
-ttttatgaagtcgtcgagacgcagttcctattgatttattctaaacggagatgtgcttcg\n\
-tgggactcggaagtagatctgtgtttatgattattgctactttagatgctgactgttaac\n\
-tccgtgttgtttttcaaccgtatatcacaaccgaattggatagaacctatagtttcaagt\n\
-tctgccacaaggtatcatatttacagttagtgctggttgcttctttcaaacgtggtgagt\n\
-ttgtgctatcacgtcaacggtagagctcagtggaccgagtgcgcgttcaaccctgttcca\n\
-gagagggtgtgatagcacatataccacgctcgtcgaggcgttcatgatagtttgcaagag\n\
-ccggtgttaaacacatattattattgttatccaactaatcggacctatgcataaagcatt\n\
-gtctaaacagaataattgcctatatacggtagttttagtgatttatatcttagtatcagt\n\
-tagagcttcgaactcttcaggttcctcatatttaacgttcttcgaaagcgaaaacttcta\n\
-caaacgaatgtaagcggttttccaagtagtacctataaatcacagaaagatctgtctcag\n\
-tatagttgaaatggtattcagctagtgacgtgtaccaattatcatagttcactcaagcaa\n\
-gacgctcattaacgaatatagacaagacactatatcatataataaaaaagaacatggtgc\n\
-tcgaacatagttgaattcaccatattgaaggggaatgctgacatgtaattcgctactaga\n\
-cgatcaattccctacttgtcaaagttgaactggtacgttcttggaattaaatatgattgc\n\
-gctggaccaaattgcgacttcttgagtttcagggcaaacgattgagccggaggatgtccg\n\
-tctcttacctttcttgcttatgataaacgacggtccctgtacatcactgggaattctcag\n\
-caaaaataattgggtaaatcgagactcgatgtattcggccacaaaggtgttagacgttaa\n\
-agattattcaacggggcgataataggatcataaccggtatgcaagcgcattgaaagagcc\n\
-atgagatccttatccgataaacgctgcacggtatgtgcagccttattgtcgatcacgaat\n\
-ttataaatgtagtctgggctgtaagttgaagacctaagttataatgaagtgcaataccaa\n\
-atcgattcatagtggattatcagactcaagatatctcctgataaattacagttgttaaga\n\
-tacggataaaatgagatttaagattagcagcctctaatctgtttcaatcccgttggaatg\n\
-tggtatgcgatcaaggttaagttaaaatcaagcctgtcttcagtcttgattcttgttctg\n\
-ccatcgcatgcggtctacgtgagttaatatgtagcttacgttctagcttgtgctaatctg\n\
-agtatagattcgtagaggaatattatcaagcttccacgcctcaacgtacgtgtattggtc\n\
-acacaagacactaaaagtggaagtagcgtaaactatagtctagttgttaaatgctcagtt\n\
-cttgttatattcgatatactcttggctaatttatgtctgagtatataaaattaatgatat\n\
-taacttgcatttcacggatcccttagaaaaagattttgaccgagcgcattataaacggtt\n\
-acaccgaatcaatagaagcatacccaatagctttctttgaatttattgcctgcgcaactt\n\
-ggctgactctctagatccgaataattctatatggtcgtgacgaaactagttcattactgt\n\
-ttaaaatgccaacatgtcttttgggccgataatggctctttgcaaaattactcaatgata\n\
-cgattgatcaaagcggtagttgctagtggtagcatgtaagtctatcaaatgtctgattat\n\
-ccgaaaatcttccaaaagagtccacgtaccatatctatctcatagcgacgcgaggggaac\n\
-cttatctaactatcattccatttaccgggtgactctcgatgcaggatccgattgggataa\n\
-attgcccagaaatggctcattcctgactaagggtaaggccgttctcagcaagggaacccc\n\
-gcgaatctaggcttataccatctagattgttaactacttgcctgtagttctacagccata\n\
-ctggacagttgtttctaaatgatcgggattcatgctagcactcctctgaatgcaccgcgt\n\
-aagtttaactattacgtccgtgggcagataaggatggaggctgtatgtatcttaactgtt\n\
-acctaatatggctggtaattatcaaagtaaggaccttaatgccatagcgctagcaatcgc\n\
-tttgtatactgaccatgtgccaacctctcttaatctgtaaaatataatgtcttagctaac\n\
-tgtggacgatcatgtctctgcctagagcttcgctgtatcaattcctatagccagcgtact\n\
-agtgacacaacaacaccgtgtgagaaaagatattagtccttacgtctgtctctctacagc\n\
-ttattgatgaggattgaacatggacatatagctccccctcaaaagcagatgctacctctt\n\
-tattccattctcgaacatttgccgaacttaatttcgacaaacctgaggtcacgtcttaat\n\
-ttatcggtaacgtcacgtccctttgagactggataaatatattaccaggggccaacgagc\n\
-aattgttggaggcgcttctataatacaaggtgtcttgtcaaagaaagacggcgtgcgtct\n\
-cgtgcaactcacttaaccaatattaatgtgaaacccccctctctcacatcttatgcggtg\n\
-tactgccctggtacatttcctgtacaggactccaacagtgtagattcctaagatagctgt\n\
-tggagttgcctcacgccagatcgaaaaactgaataaactagtgagctgagctgcagaaat\n\
-accgcttaattacttatgactagttcaaagggacctacgtgatgtcagacattgcaagga\n\
-agaaattaggtttgtgcgtcattttggctggactagcactccttacttcccctactattc\n\
-aaatgtcgtaaacagcatgagacaggatcgtgctgacatttaaggtctattgggaacgag\n\
-gctacctttggtcgcgcgctcgcgttctccgaatgaccgaaatgcatgagcacagtatgc\n\
-aattgcttatagatctaaggtctggtcgttgaaaccaagcacgtaggcctgggaaatcag\n\
-ttcttcctcagcaactacacaaaagcgtccaagcattagtacttgtagtaaatgtccgaa\n\
-cctatgcgctcatttgaaagtcaaaaaatatttttaagcagtaggcacctaacccgattc\n\
-ctctacttagtagctttctttgattctcagaattgactgcaatatcactgcacaattctg\n\
-tgccattactagacttctctgtattaacgtctcatcttactaacactcgcctaggacaca\n\
-tctgagagtgaagtatttcaatacatttactgaaatcttcagttctaaaatccccgaata\n\
-aggctcttatcggtttggccaacacaagaaaaaaacttcttgcaccactcaccttcatac\n\
-gcaggagcctggggaacttagtaataactatttcggcagacaaagcttataacaagttgc\n\
-cggcgcgtataatatttaaaagaccccttgagctgctcaattaaaacgctcacctggtat\n\
-aggctattagatagtgccgtcttagtaaggggcgggaattatcggataaactgatatttt\n\
-gataaaataaccgacttgttcacgacataagtcactaaggagattttatctttctccaaa\n\
-gtatatcttccttggataatttcaaagcgctgcaatttaagttctgttactagtttatgc\n\
-tgctgggaggtgaccggaaggcgtagtaatctagaggcaaattataagaagttcatcata\n\
-tcattttcgactacaaaaacaaggtgttgtatgccggcgcattgtgtaaactggacgagt\n\
-accctagatggaaaattatacgttaagccaagatttcgatgtaatgataattacctacac\n\
-atttttgctatccataggaacaagagctgttctataggctcgtggcatacgaacatttgc\n\
-tgccgctatgaatattggaagctcttcaactacagactctattcttaattgccgtcgaaa\n\
-atgggccgaatcggctattattaatactcggtttttccgaggggattgttgtcgacagtc\n\
-gtaattattattaatattgatgttggtgaggtcatttaaatacaaccttgcagacaatga\n\
-ataagggatccaatctctcatactccttttacaattgctcatgcccctatgcaaacctta\n\
-tgccgccacacctccgcaactctctcttctgaactgtaagtagcttcattactggtttga\n\
-gactatactgaagctgatgacattctaaaatggctattttcgaatgtgattcataatgtt\n\
-tatcgtttgggatggcagaatcacgttatttttgatatagcccgggtattctattgtata\n\
-gaacgtatgctacaagtcattccccgaagaagactagaagtaaacaacatgcgaccatcg\n\
-ttaagccacgcaaggctgtagctttatttcccgataacctatcttccataaatagcggac\n\
-agcaggatactgacgctcaacatcagtggttatggtctaatttttaacttttaataaggt\n\
-aacttcagcaggcatacacagtaactctttaatttataatcaaattagaagtctgacact\n\
-tcttatatttttctatcatccaacgcgatcgcccattagcttattgtgttactaataacg\n\
-tatctaaaccaatccttttcaagctactgcctatattgtcaatatatacaaacaacagga\n\
-tagtaggctgcttaaaaaatattgtcaaccgtgtacgctttacaatacccggaaatcaca\n\
-aactttgtagacaacgagtgaaatttatacactacgaagggccagcgtacaagacccatg\n\
-aattaggcgatatgtttattctgacatattggtttatccttaatctgtcgctgtaaaatg\n\
-aagccgcccccatccctgcgaattttttttcgaagattcacgactgaaatataaatacgt\n\
-ttggctatatttatgttggagggaggcaatagcctttactgttaaccgaagatttagcca\n\
-gtgagtgtgacactaaaacactggaataaatgcaggcgttcttctgggtaaaaggtttag\n\
-tcaatctcgcctataagttcatatagctctggatataattatctggcccatgcatttatc\n\
-atggcgcttggtgccctgtgtgaagccggcctctcatattgaaggtccgaagtattccat\n\
-gtacattaagatcactctctcattcatgcatcttggcttaacaaatctggttgtccaagc\n\
-tttccaggcacgtatggtacaaattcggatcgaatacttataaaaatgatatgttaaact\n\
-gtctaaaacgctcatctacaaagtaaagtgcactaaccaatagagtctcaagaccgtgta\n\
-atgctggtgcactgaatgtgtaatacggttagaagggattagttatgttacaaatccatt\n\
-gaaaacttaagaagcattgcgtgctcggagggtgcatcttttatcaagagactaacatta\n\
-ttttcaacgacgtacatgctttacaatagggtacttatcaaacgccgagaaacgcgccta\n\
-tagtgatgttatgattatgacccgatatccattggaccgaattttatgtaggttcccagc\n\
-gtactcgcgtaatatctcggtattgccataatgtaatacttgtcggtctctcccagatga\n\
-aaaagcgttacagagtatttcaatgaaaaacagcgcgcaacgtcaatacctttaggggta\n\
-acggccgctgatttcatatagatatacgataagttggtatagctctactaggtggcatcc\n\
-acaatcgttgcatttactatagctggttacaatcataatctataccgttccttacatact\n\
-accatagcgggatagcgtttttttgccgttgattgggtttaagaggatgtcagtctcatt\n\
-atatccgattcggtgggagagccgttgttttcaaatcgcacactttgtgacataatgtac\n\
-aagataacaaaactgatataagatataaactgtcaatatcaccttgacacttgaatcaaa\n\
-gtaaattaactcgcaaatataatttgactaattgggtgcagatttctcaattaataaaaa\n\
-aatggcaccggatgggcttacaagccccttatcattcacttgtatcatgatttccaagaa\n\
-caatagaatttgctagcaagtatgaacagagattcgaattgcatccacagtacgccggag\n\
-cgtttattttaatgtggatatgacgatgtactgttggcggcatttgctagtaaccggtcc\n\
-ttatttacgtagcgcacacgtaagcatgtctgggagaaatatggtggtacaatctcagag\n\
-aaagattacagtttggtttaaataggacttatcgggtcggaagtggaacttaataagcag\n\
-tacacaattgggcaacagacgtcttgcctattacaataggattacaatgcgttagatttc\n\
-agacacgttcgtgtttggctattcgtcaattccctaaatagttagacgatcaactattat\n\
-caaagtgattctttgttcatcctccattcatgtaacagatggcacactacgcataacgcc\n\
-gaggaattttaacgagatttaagagagcagttcgggcacaacccacttgactttataaca\n\
-gctcggcagcataaacggtaatatgtgacaaatttccaaacgttataagaacgtatgtgt\n\
-acttagaaaactaagtggttcatgttcaacagatgtgacgcagcaagcctaacttatcta\n\
-ttggttttgctataaaagaacaaagttacacagaatcctaagggcttgtttcacacttat\n\
-gcctagtgcttcaccatcttaaaatagcgaaaccggcacgaatcaaaccttaaaacaatg\n\
-cgcagatattggtgatggtgactccgggtatgataatggtaactgttgaccagcgcccac\n\
-ctcatcgaagtatagaaagtggttaggataaggatgagaccgaacttatttccggccata\n\
-actttagattttctacctagtacacaacatcagggcggacacgaaaccgccatcacatca\n\
-tataccaggtttaatttgcttaatgggggaagtgtcaacgaaccttcgaactttagcagg\n\
-catatggccattatatatggccccagagcagaatgctacagcagacaaaatttggattta\n\
-tgtagtttaatacctatcaaacttggtgtgaccatacttgtctaacgacagtgcacaaag\n\
-tgtaagttacaattattactactcagcagcttctgcaatgataaaatcttatcatacacg\n\
-tcacatatgataatatctacttagggggaacgggctccacaacctacatagtactcaata\n\
-cttacactattcgacaggcacaccaaacctgtacagtcccaaaagattgagtcaactttg\n\
-cagtactgcagatcacagtaatagcttagttagcgagtcaaaattagttttctacgagac\n\
-tgcacgaccgtgcaaatttccgatgtgttggctacaaatagcaacgtatgaatttgtttg\n\
-aagccacgtaaactgtacaaccttagagataagtctcaggctactaaaaacacgttgtgg\n\
-cactaacaggatcatggttgattcttacttattcggctgaccggcccaataagtaacctt\n\
-caactagaacagaataatcgggagtagtttaattcagtcaaggtgcaggtctcattgtaa\n\
-ctaacaagctctgtgtaaccaagttaaaatcgttttcttagcggattccctacttatgga\n\
-tttgagctcgtccacaatattcgatacaagaagtttgtggtccgtaacaacgaaatttta\n\
-attacgctgtgcagcctcatccaaggaattaatagaaggttgatggtaggctccgaacgc\n\
-tccatgattataatcaagtggactgtgcagtaaacgaggaaggtatcctgacgtcgtggt\n\
-gttcgtttttgttatttgtgccctatacgagtagataaaccatgaacagcacagtgtgaa\n\
-cccatggttgattttaggctaccttatttttaatttccgttacacagaaacgaattccac\n\
-aactaacatgccattaatttttcgatatcttataaaagatggtcgaaattcattcattta\n\
-ttttttttcggttctcgaaagtcaactaagctgtcgcgttttgtttctctttagaggtaa\n\
-aagtggctttgatctcctacgtttggatactagtcaaccattactccatttgatccgtga\n\
-gtatcacctgtctaacatccagcattatgactcctcggcgaagaaaagacacacttctta\n\
-gagtcgatgtgtattagctagggacacagttgtttaatacgatagtgagcccagggaggg\n\
-cagtgcgtcccccagtagatttattcagctagtgtaagtataagatatctcacccacgag\n\
-gttcaagtgatatgcagtcttagaataatacttatcctgaatttcgatattatgggtact\n\
-tcaataatccgctagcgctactttatgtctcgttggacagcaggacacatggcagtctta\n\
-aacactaaagacatcacctgaatgaatgtaatgggattacaagaatcaatgaggtattat\n\
-atacgacgtaggaaactctggatatatacagtaatctagttacgccatcgcacttcattc\n\
-ctctggaaacttagaagacatcagctgtacgtggaggaaccagacccccgtatgtagcca\n\
-aatagaaccaaagttgcttatacaaacacacccaatgacaatggaccgctggagttcgta\n\
-aactcggaacgtagtactgcacaaacccagcatttagcaataggagctacgtatgcaact\n\
-cccacgtggtaataccttcaagctatcaatatataggtgcctagctaatcgcattcgcaa\n\
-gcagtattcaagcttgtaaaccagtataataattacagaggctctatgaaacccaacttt\n\
-ccagctaaaagtcccaattaaatggttatttcgtacttttaaagtcgcccgttctgttat\n\
-tacgcgaattgattctactccaaaattaaacacaaattatcaaccgtttcatttatattt\n\
-gtcaatgcagctgtttaaaataaggctctactaaattataattaagacacttattaccag\n\
-atttctctagttaagtttgaaccagctcgactaccgcgaaagatacattcccttctctat\n\
-ttttcagttcatctatgggtcagagaagcattgaatttattctattcaccctcgtcgttc\n\
-acagcgaatcgtcagtgtgatcagtgtatgagaaatatcctaaaccgtttagtcagacca\n\
-cacgcttagaacaagtggtctaaaaagactgccctggaaggagtaagaagtatacagctg\n\
-atccggtgtatccttcagtcatctgccctatactaattacacgacgcaaggaaaaatagg\n\
-tttattttctaggcaaacccttcataggtgactccgatgtgttacgaatcatgcttgaga\n\
-atgtgctatcgttaccgacggataataacgatctccaatgaaccaaatgtagaatgtcta\n\
-ttgattacccttttactattcgacttagagataggagatagaacctcagtgtactttttt\n\
-agccgaatgggaatctttgggaggtgaatggccataaggtcgtaaatccaaccctcttaa\n\
-agtcttccatattatatcgttgttcgtggaatcgataacagatttgttgacccatagtaa\n\
-atgtatactagtttatgttgtaagtgtagattgttttccgattgccgtccaaactttatg\n\
-tcgtaattgtagaccagtaaagttgaccaaggtaagtgcccagcgatcctgcgagatcga\n\
-tcgccaatttttccagtcactgtaagtgtaggtttagataaagccgtatgagttatatca\n\
-taagggcctcggaaagcagcttcgaaccaaagttcccttataatagtagtttaactataa\n\
-aagtatatactggtctgtcgccctttcacgatttgttttaccggtttatgaagcgttacg\n\
-tcattagagcggctccaatttaaggttaacggcttccatgtgtagttgtatacaaggata\n\
-acttaaagtatctgttcagcgagctagttaagttatcctcgatagaacacaactcagagg\n\
-tcccaagatcgggtttgcaacttgctaatttattctcaaggcaaattgggaattatcgat\n\
-acctgtataccataaggtcgctcgatgtgatgcttatgtcttctggtgatcctaccttag\n\
-ttagtgctgattaacggaacattaatgtttatcgttttgagatttagccaattctctgat\n\
-tctaactcaagatgccttatctgacgtgctatgcagcccctaagtattttacattgtaat\n\
-aggacacgctcctttaaaactcgccaaaaggtcgttgtggttctctactggttaactata\n\
-taatttacagctttgttgagctagttcctctttggtttaagtcctcaatattagttggtt\n\
-cgagcgataagttggctagttaccttagtcactatattagatccgaatgttatgcttcat\n\
-ctgaagaccgccaccctccaaaatttcttttaagactcacttattgcaaggtgtaggtga\n\
-attcggctcgtttctcaagtggtgtatctgtacacgagtttccatattttcatcaacagc\n\
-caccgcacacttatgtcactctaggtattaaaagtcgctctacaaggggacgcaattaag\n\
-aaacagacatgctagtcaaaaataaacatagcgaggcaccactaattcggccgcttatca\n\
-atgggatgctctgcgcgagacgcgccagagctcagtagttagttcggacatacatttact\n\
-tcagatgatcaattagttttctacaaatgcttactctaccccgaaaaaagtcaccagact\n\
-cttacgtctctttagtatccttccgtcttatataaggtcagtcccccgtttcggtaccct\n\
-ggaatttactaagaataatgaaacagcccccaaggacgtacgtttacaaatgatagacca\n\
-gatcgcctagcttattccgacgcatgttgcatagaattgaaccaacggaatgtgagagta\n\
-actagatgagccgaccacagcacccgtttgcgtcgcagaatacgcctgatagttcggcca\n\
-cgaaatcatatgtcctttgagtattaagtatttgtaatgatcaatcgagctcaagcaagc\n\
-ttacacttcctcggatattcagggaacttagtgcctttgaaagatacgttgatcaacgaa\n\
-aaattgataatggctcatatggaatgcctacctcatagtgctgaattaacacagcactgc\n\
-ggacctaacttttcgaggtttcaagttcacgtctcaaaacctaataggctggaatatgta\n\
-gggatcctcggtgaatttgtgattgggtttgttgtagtactgaccaagtgaatattcttt\n\
-ttttctaaaagcagatctgctgccgggcactacgaaggagatctctgtgtatcattattg\n\
-cttcttgacatgatgactcttaaatcactgtgggtgtgcaaaacgatagcacaacccaat\n\
-tcgatagtacatattgttgatacttcgcactaaaccgttcatatttaaaggttgtgctcc\n\
-ttccttcgttaaatactggtgacttggtcctatctactattagctagacctctggggaac\n\
-cacgcccccgtaaaacctgtgcaagagagggggtcatacatcttagacatcgcgcctcca\n\
-ccagggaagcattgggtgattgaccaggtgtgtaacaaatatgattattcttatactaat\n\
-attagcaaagatgcataatgatttgtattaaatgtataattgaattgataagggtctttt\n\
-agtcagtgatagagtagtataaggtagacattagaactcttaaccggacgcagatttttc\n\
-ggtcttagtaagccaattagtcgacaaaacaaggtaagagcggttactagtagtacctat\n\
-aatgcactgaatcttcggtcgaagtatagttctaatgctatgcagattgtgacggcgaca\n\
-aatgttcagacttatatcatgaaacaagctcttgtaagtattgacaaatgaaaagattga\n\
-atatttttaaatacaaaatgcgcctacttattaggggaattaaccagattgaaggccaat\n\
-cctcacatgtaatgagataatagacgataaatgaaattcttgtaatagttgaactgctac\n\
-gtgatgggtattatatatgattgagatcctccaattgccgacgtcttgtcttgatgccca\n\
-aaagattgtcaacgaggagctccctcgcgtacctgtcgtccgtatcataaacgacgcgac\n\
-atgtacagcactccgaagtataagcaataataatgcgggtaatccagactagatcttttc\n\
-ggactcaatgcggtttcacggtaaacatgattaataccggagagtagtcgagcttatcag\n\
-cgatgcaagcgaattcattgtgccaggagatacgttgcagataaaaccggcaacgtatgt\n\
-caacaagttttggcgatctcgttgtttgtattcgacgaggcgcgggaacttcaagaacta\n\
-tcgtatattcaagtccattaccttttagtttcagactggtggagctgactaaagttatat\n\
-catcattttgtacactggtttagttaacgataatttcagatttaacatgaccagacgata\n\
-atcgctgtatatccagttggaatgtggtttgccagaaaggttaacttataatcaagcctc\n\
-tcttcagtcttgattcgtcgtatcccatccattgcgctatacctcagtgtatttggagct\n\
-gtagttataccgtgtgctaagatcagtagacatgacgagagcaatattatctaccttaca\n\
-agcatcaacggacgtctagtcggaacaaaagactctaaaactcgaacttcaggttaatat\n\
-actatagttctgtattcagcagttattcttatattcgatattatcttgcctattggatgt\n\
-ctgactttagtatattaatcatagtatctgccatgtaaaggtgccagtactaaatctgtt\n\
-tcacagtgcgaattataaacggttacaaccattaaagacaacaagaccctatagctttat\n\
-ttgaattttgtcaatgcgcaacttggagctcgcgatacatcccaattagtctatagggtc\n\
-gggacgattctacggcatttctggttataatgacaacatggattgtggcccgagaatcgc\n\
-tctttcattaattaagcaatcattacagtcttataagcgctacttccgagtggtagcagg\n\
-taactcgatataaggtcgcatgagccgaatagcttaaaaaacaggccaccgaacattgat\n\
-agagaataccgaccacagcgcaacctttgattactttcattaaattgtacggctcactcg\n\
-acatcaagcttaagattgcgataatgtgaactcaaatggatcagtactgaagaaccgtaa\n\
-cccacttcgcagaaagcgtacccagagaagatacgctgttacaatatacagggtgaaatt\n\
-attgcctgttcttcgtaaccatttcgccaaacttggttagaaatgatagccattcatgat\n\
-agaaataagctgaatgataccagtatctttaactatgtagtcagggggaagataacgatg\n\
-gtccatgtatgtttctgatatgtgacagtattggccgcgtaatttgctaacgaagctact\n\
-taatgcctttgagcttcatatagatttctttaatcaaaatcggcaaaaagatagtatgag\n\
-ctataatatatgctagtagagaactctggaccatcatctatatgaatactgattcgagcg\n\
-tgcaattactttagcctgcgtactactgactctacaaaacactctgagataagtttgtag\n\
-tcagtaagtcgctctctataaaccttttggatgaccattgtacagccacttatagatccc\n\
-aataaatagcacaggagacagagtttttcaatgctcgatcatttgccgatagtattttcg\n\
-tctaacctcagggcacctattatttgatacctaacctaacggccctttcacaatggagaa\n\
-atatatgacatcgggacaaacacaaatggtgggtggccaggagatatgacatggtggcgt\n\
-ctctaagaaacacggactccctctaggcaaactcacgtaaccaattttaatgtcaaacaa\n\
-aacgctcgaaaagattttgccgtgtaatgacctggtacattgactggtcaggaatacatc\n\
-actgtagttgccgtagtgtcctgttggtgttccatcaagacacatcgtataacgcaattt\n\
-acgacggacatcagatcaagttatacagattatttaagtatcacgtgtgcattgggacat\n\
-aagggatctcacacatgccttggaacatttttgctttgtgccgctttttcgctgcactac\n\
-caatccttacttaccagtatattcaaaggtcgttaacagaatgagaaaggttagggctct\n\
-aagttatcgtcgattgggatagacgagacatttgcgagcgccctccacggatacgaatct\n\
-cccatatcaatgtgaactggatgctatgcagtttagttcttacgtctcctagtggtaaaa\n\
-atcaaagtagcactcgcatagcagttattcagaacctaatacacaaaaccgtcaaacatt\n\
-ttctaattctaggtatgggccgatcataggagctaaggtgaaactcataaatgttttgtt\n\
-agatctagcatcctaaaaagatgcatatactgagtagctggcgtgcattctctcaattgt\n\
-atcctttttaactgaactagtcggtcccatttcgtgactgagatctattaaccgataaga\n\
-ttaataacactcgcattcgtatcagctcagagtgaagtttttcaataatttgactgatat\n\
-attaacttctaaaataaccctttaagcctcggatccgtttcccaatcacatcaaaaattc\n\
-ttattccaactatctacggattaacaacgtgcatggggatcgtagtaagaacttgttccg\n\
-atcactttgagtatatcaagttgacggcccggttattattgaatagaaacattcacctgc\n\
-taaattaaataccgcacatcggatacccgatttcagagggccgtcttactaagggcaggc\n\
-tttgttcggtttaactgagatgttcattattttacagtatgcttcaactaatatgtaacg\n\
-aaggacagtggatctgtctccatagtagatcttcagtcgtgaatttcataccgctcctat\n\
-ttaagttcgcgttcgagttgttgatcatggcacgtgaaagcaacccctagtattctagac\n\
-gaaaattttttctagttcatctgataatttgccaattcaaaaacaaccgctggtttcccg\n\
-gcgcattctctaaaatggaagtcgaacctagagccattatttgtcggtaacccatgagtt\n\
-ccttcttttcagaagttaatacactgtggtcctatacagaggaaaaacagcggttatata\n\
-cgatcgtggcataacaacattggatcaagatagcaatttggctacctattctaattctca\n\
-ctagattcggtattccactacaatatcggcagattaggattggatgaataatcggtgttt\n\
-aagtccggttgcgtctccaatctcctaatttttattaatattgatcttggtgacctattg\n\
-taaataaaaacttcaagactttgaataacggtgaaaagatagaagactcatttgaaaatg\n\
-gatcatccacagatccaaacattagcaagacactaatccccaactagctattctgatcgc\n\
-gatcgtgctgcagtactcctgtcacaatagtctgttcatgatctaattctttttgggctt\n\
-tgttcgatggtgattcagaatctttatccggtcgcttccctgtagctactttgtggggat\n\
-attgcccggggattatagggttgagatcgtttcctaaaagtatttaaaccaagtagactt\n\
-caactaaactacatcagaacatcgtgaagacaccatacgcggtacctttatttaccgata\n\
-acatttcttcaagaaataccggtaagcagcataatgaccctaaacagctcggggtatcgt\n\
-cgtagttttaaattttatttaggttactgctcaaggaataaaaactaactatttaattta\n\
-taataatattacaaggctcacactgattagatttgtctataagacttcgcgatcccccat\n\
-taccggattgtcttaagaataaactagataaaccatgcattttctagataaggcctttag\n\
-tctaattagatacaaaaaacacgatagttgcatccttaatttattgtgtcaaacctggaa\n\
-ccttttaattacccgcaaatcactttatgtcgagactacctctgaaatttattatctacc\n\
-taccgcatgaggacttgaaccatcttgtaggagttatgtttattagctaagattcgttta\n\
-tcctgtagcggtccatgtatattcaacaagcaaaaagcactcagaattgtttttagttga\n\
-gtcaagactgatatataaataagtttccctagttttttcgtggtgggacgatattgaatt\n\
-gaatcttaaccgaagagtttcccactctgtcgcacaataatacacgccaatatttccagc\n\
-cctgcttatgccttaatcggttactcaatctcccattgaagttcattttgatctgcatag\n\
-aagtttcgggcccagccttttttctgccaccttcctccaagctctgtagacgcactctaa\n\
-gattgatgctcacatgtattaattctacattaacataaatatataagtcatgcatcttcg\n\
-agtaaaatatctggttctccaacatgtcctggcacgtatcgttataatgcccatacatgt\n\
-agtattaaaatgattgggttaactggatattaagatcatcgaaattgtaaagtcaaatta\n\
-acaatactgtctcaagaccgtgtattcctcgtgctcggaagggctattacgcttacttcc\n\
-gttttggtatcttaatatgactttcaaaaattaagttgcagtgagtcctacctgcgtgca\n\
-tcggttagcaagagtataaaagttgtttaaacgaactacttgctttacaataccggtcgt\n\
-atatatcgccgtgaatccagaagattgtcttctttggattatcaaccgagatcctgtgga\n\
-ccgatgttttgggaccttcacagaggactccaggtagagctcgcttttgcattaatctaa\n\
-gaattgtacctctctaaaagatctaaaacagtgaatgtgtatttcatggaaaaacacaga\n\
-gaaacgtaaattactttaggccgaaaggcacatgagttattatacatatacgagatggtg\n\
-gtatacatcgaattcggggcatacactatagttgcattgtatttagctgctttaaataat\n\
-atgatattaccttccttacataagacattaccggcataccctggttttcaacttgtgggg\n\
-ctttttgacgatcgcactctcatttgatccgagtagggcggtgacccctgcttttcaaat\n\
-acaaaaatttcgctatgaaggtaatagattacttttcgctgttatgatagaaacggtaaa\n\
-tttaaaattgaaacttctagaaaagtaaagtaacgagaaatgattttgtgaataatgcgg\n\
-tcatgattgcgcaagtaagaaaaaaaggcaaaaggatgcgcggaatagaaacttatcagt\n\
-cacgggtatcttgatttcattcttcttgtcaattgccgacataggatgaaatcagattcc\n\
-aatgcaatacacagtaacccccacccttgattgtaatgtcgatttgaagttgtacgcgtc\n\
-gacgaagtggatagtatacgggccttttgtacggtgcgatcaactatgaatctcggcgag\n\
-ttagatggtcgtacaatctcacacatagaggtcacttgcctgtaatgacgaattttcggc\n\
-taggtactcgaactttattagaagtaaaaatgtgggcaaaagaaggattccattttacaa\n\
-gacgattacaatgagttacatgtctctcaacgtagtctttccctagtagtctttgaacta\n\
-tttaggtactccagaaaattttagcaaagggtttctgtgtgaatccgccattcatgttta\n\
-tgatggaacaataagaataacgccctcgtatgttatcgacagtgaagtcagcagttcggc\n\
-caaaaacatattcaatttagtacagatccccagaagttaagctaagtgctctaaaatggc\n\
-ctaaacggttatcaaagtaggtctaattactatactaacgggtgcatcgtaataactgct\n\
-gtcgatgcaacactatatgatagtgtcgttttgctatatatgtacaatgtgacaaagaag\n\
-ccttagcgattcttgcaaacttaggacttcggattctcaatcttaaatgtccgaaaacgc\n\
-aaagattcaaaaatttaatctatgagcagatatgcctgatggtgactacgcgtatgttaa\n\
-ggctaaatgttgacaaccgcacacataatcgaactattgatagtcgggagcataaccagg\n\
-tgaacgtactttgttcacgacatttattgacatgttctaaatacgtctcaaaatcacggc\n\
-gcactagaaaacgcaatcaaatcattgtcctggtttaagggccgtaatgccggtagtgtc\n\
-aaacttcatgagaactttagctggcttttggccagtatttagggaccaagagcactagcc\n\
-ttaagctgaatattttgccatttatctactgttataactttaaaacttggtggcaccaga\n\
-cttgtcgatacacacgcatcaatctgtaacgtaaaaggtttactaagaacaagcgtagga\n\
-attgagtttatattatatttaaactaaaagatgatattagcttctgagggcgatagggct\n\
-ccaaatcataaagaggaatatattattacacgattagaaacccacaacatacctcgaatc\n\
-gcccaaaagtttgacgaaacttggcagtactccacatctcagtaatacagttgggagagt\n\
-ctcaaatgttgttttattactcaatgaaccaccctcataatttcactgctgttccattaa\n\
-atttgcaaacgatcatttgctttgaagaaacgtaaaatcgacaaaattacagataagtag\n\
-atgcataataaaaaaaactgctcgctataacacgatcatcgtgcattcttacttaggagc\n\
-atcacccgcacaataacgtaccttaaactacaacactattagaccgagtactgtaattca\n\
-cgaaagctcaagctcgcattgtaaagaacttgctctctcgtaaaatgtgataatagtttg\n\
-cggagaggattcaattattttccattgcacctactccactagattcgataaaagaaggtg\n\
-gtcctcccttaaaaagaaatgttaagtaacatcggaaccataagcaaagcatgtaagtga\n\
-accgtcatccttccctaagaaacataaaggtttttaataatgtcgactgtgaactataac\n\
-tgcatcctttcctgacctactccggttccttgttgttatttctgaacgagaccagtagat\n\
-aaacaatgtaaaccacagtgggtaccaatggtgcatgtgacgctaccgttgttttaagtg\n\
-cccgtacaaacataagaagtcataatcttacttgaaattaattttgccttttattttttt\n\
-tcaggctcgaaattaatgatttgttttttttgaccttctagttacgctaatatgcggtcg\n\
-cctgtggtttctattgagtcctataacgggatgggatctaatacgtttggttactagtaa\n\
-acaaggtataaatttgataccggagtatcaactgtataacatcaagctttatgactcata\n\
-cgcgaagtaatgacacaaggctttcaggagatcgcgagtacagagccactaaggggtgta\n\
-ttacgatagtgacaccaccgagcgcactcactccccaagtagatttatgatcctacgcta\n\
-agtattagatatataaccaaagaggttctagtcagtgcaactcttagaataataattagc\n\
-cggttttgcctttttaggcctaatgcaatattcagctagcccttatgtatctcgcgttcc\n\
-acagcaccactcatggcacgcgtttaaactaatcaaatataatctatgaatgttatgcca\n\
-gtacttgaataaatcaggttttttataagtccttgcatactctcgttatatactgttaga\n\
-gtcttaccccatagaaattctttcatctgcaaacttagaagaattctcagctacggggag\n\
-cataaagtccccaggatgttgacaaatacaacaaatgtggcttatacaaacactccatat\n\
-gaaaatcgaaccctcgtggtagttttagccgaaccttgtacggataaatccctccatttt\n\
-ccaatagcagatacctatcctactacctcgtggtattaaattaaagcttgaaatatagag\n\
-ctgcatagcttatccaattcccaagcacgagtctaccgtcgtaaccacgatttgatttac\n\
-agacgctagagcaaacccatctttaaacatataagtaaaaattaaagggtgagtgcgtac\n\
-gtgtttactagcaacttcgcttattaagacaattgtttataagccataattaaaaacata\n\
-tgttcaacaggttcattgatatttgtaattgcacaggtttttaataaggatctacgtaag\n\
-tataatgaacaaactttttaccagagttatattctgtactttgaaaatgctcctctaccg\n\
-ccttagagactttcaattagattttttgcagttaatctatgcgtaagtgaaccatgcaag\n\
-ggatgcgattcaaccgcctcgtgctaaccctatcgtctgtctcataactgtaggtctaat\n\
-ataattttcagttttcgaacacataaccctttgaaaatctgctatttaatgtctcacctg\n\
-catgcactatcttctatactgctcagaacggctatacgtcactatgctccaagtgacgat\n\
-ttaaacgaagcaaggaataataggtttattttagtgcaaaacaattaagtgcggactacg\n\
-tgctctttacaataagccttgtgattgggctataggttaagtcccatattaacgatctcc\n\
-aatgtacaaaatcgacaatcgctttgcattacccggttactagtcgaattacagatagct\n\
-gttagatactcactctaattttggacaacaatcccaatcttggggtcgtctatcgcctga\n\
-agctcgtaaatccttccatcttaaacgattacatattatagacttgttcggggtagagat\n\
-atcacagttgtgcaaacattgtaaatcgatactagtttatgttggtagtctagttgcttt\n\
-taccattccccgaaaaacttgatctactatttcgacaacagtaaacttgaactaggtaag\n\
-tgaaaacagagaatgcctcatagtgccactatttgtccactatatgtaagtgtagcttta\n\
-cataatccactatgactgagatcattacggcctaggaaagcagcgtagaaaaaaagggcc\n\
-cggatattacgactgtaactataaaactagttactggtagcgcgccatgtatagatttgt\n\
-tttaccggttgtggttgcgttaacgaatttcagccgcgaaaattgatccgttaaccagtc\n\
-catctcgacttctataaaacgataaagtaaagttgatgttcagcctccttcttatggttg\n\
-catcgagagtacactactcagtgggaaatagatcggggttcctacttcagattgtattat\n\
-ctaggcaattgccgattgtgccatacctggataaaataagctacctacatgtgatgctta\n\
-tctattatcgtcatactaccttagggtgtcctgttgaacgctacattaatctttagccgt\n\
-ttgagatgttccaatggataggagtctaacgcatgatgaagtttaggaaggcagagcatc\n\
-ccactaagtatgtgacagtgtatttcgaaacgagacgttataaatagaaaaaaggtcctt\n\
-ctggttctattctgctgaactattgaatggaaagattggttgacctacgtactatttgct\n\
-tgaagtcatcaatttgacggggtgagagacatatggtgcatactttacggactctatatt\n\
-ttagatcagaagcttagcagtcttctctacaccccctcacgacataattgcttttaagaa\n\
-tctatgtttgattcctctacgggaattcggatccgttcgcatgtgcggtttatctaaacc\n\
-aggggacatatgttcagctaaagcatacgaacactttgctaactagacgtatgtatagta\n\
-gctataaatcccgacgatatttacaaaaagaaatgagactcaaatatatacatagcgacc\n\
-ctacacttattcgcaccctgatctaggcgatcctagcacccacacccgaaagtgagcact\n\
-agtgtcttccgtattaaatttactgcagttgagattttagttgtctactaaggattactc\n\
-taacccgtaataaggatcaagactcggtactagctttactatcattccctatgtgttttc\n\
-ctaactcacaagggtacgtaccagcctatgtaattacaataatgataaagacacaaagga\n\
-agtaactttacaaatgagtctccagttacactagcttagtccctcccatcttgctttgaa\n\
-gtctaaatacgcaatctctgaggatatacagcagaagaacactcataacgttggagtcca\n\
-agaattagactcatagggcccccaacatttaatatgtactgtgagtttgaaggtgttcta\n\
-ttgttaattcctgctcttgatacatgacacgtactccgtgtttaaggcttcggactgact\n\
-ttctttcataagttgagcaacgaaaatttcagaatcgataagttggattcactaactaat\n\
-acggctgattgaaaactccactccggacctatatggtcgacctttatacgtaaccgatat\n\
-aaaacttataggctggtatatcgagccttcctagcgcaatttcggatggggtttcttcta\n\
-ctactcaacaacggaatagtctttgtttagtaaaccagagctcaggacgcccaatacgta\n\
-ggagagcgctgtggagcatgtgtcattatggactggagcactcttaaatcactctgcgtg\n\
-tgctaaacgatagatcataacatgtcctgagtaaattttcttgatacgtcgcaatatacc\n\
-gttattagttaaacgttctcatccgtcatgcgtgaaatacggctgtcgtgctcagatata\n\
-ctattagcgactcatctcgcctaacacgcacacgtataaactcggaatgactgccgctct\n\
-tacatattagaaatacagactacaccacggaagcattgggtcattctcaaccgctgtata\n\
-aaagatgattagtcttataataagattaccaaagaggcagaatcatgggtagtaaatcta\n\
-ttattcaagtgattaccgtcgtgtaggcagggagtgaggacgagatggtactcaggacaa\n\
-atattaaccggacgaagtggtttacgtcgtactttcactattagtagtaaatacaaggta\n\
-acaccggggaatagtactaaatataatgatatctatcttcgggagaacgagtcgtctatt\n\
-gctttgaacattctcaaggcgtaaaatgtgctgacttatagcatgatacaaccgattgtt\n\
-acttttgtctattcaaaagattgaatagttttttatacaaaagccgcatacttatgacgg\n\
-ctagtatacagtttcatcccctagcatcaatgctatggacagtattgaacttataggaaa\n\
-ttcttctaatagggcaaatccgtcgtgatgcctattttttttcagtcacatcctcaaatg\n\
-gcactagtattgtcgggatcccattaacaggctcaaccacgagctcacgcgaggacatgt\n\
-agtccgtatctttaacgaagcgacagcgacagaactcccatggataaccaattataaggc\n\
-ccgtaatcctctagacatcgtttaccaataaatccgctttctccgtaatcatgttgaata\n\
-ccccagagtagtccagatgataaccgatgaaacacaagtctttctcaatgcacttacggt\n\
-gaacttattaccgccaacgtagctcatcaaggttgcgacatctagttgtgtgtttgcgac\n\
-gagcccagcgaacttcatcaactttcgtatattcaacgccttgtaattttactttaagac\n\
-gcctggtgatgtagattcttagataatcagtttgttatcggctgtactttaccataattt\n\
-cacaggtttcaggtcaagaagattatagctgtatatacagttccatgctcggtgcacaga\n\
-aacgtgatcggataataatcaatcgcttatgtcgtctttaggcgtatccaatacatgccc\n\
-cgataccgcagtgtatttcgacatgtaggtataccgtcgcatttgagctcgagtcaggac\n\
-gtcagctagattagattccttaatagaatataccgacctctagtccgaactaaactatag\n\
-ataacgccaacttcaggttaattgtctagtcgtctgtttgcagatgggattcttagatga\n\
-gtgagtatcggccatattggttcgagcactttagtttttgatgcataggatatgcaatgt\n\
-atagctgaaagtactttatctgtttcaaactcacattgattaaaccggtaaacctttaaa\n\
-gactacaagaaaatattcagtgagggcaattttgtcaatcacaatcttccagctagagat\n\
-acttcacaatttgtcttgaggctacgcaacattagacggattttcgcgttttattgaaat\n\
-aatcgaggggcccaagagtatccatagttcattttgtaagatttctttacaggcttatta\n\
-cagcttcttcagactcctacatgcttacgagttatatgctagcatgtgaacaatagatta\n\
-atatacaggaaaacgtacattgagagagatgaccctacacagcgcaaccgttgagtactt\n\
-tcattaaagggtaacgctctcgagacagcatccttaagatggccttattgtcaaatcatt\n\
-tgcagaagtacgcaagatccctaaccaacgtagaagaatccctacaaacacatgagacgc\n\
-ggtgaaaatagacagggtgttagtattcaatcttcggagtatcaatttcgccaatcttgg\n\
-tgagaaagcataccctttcttcagagaaagaagatcaatcataacactatctttaacgag\n\
-gtacgcacgcgcatcattacctgcctccatggatctttaggatagcggaaagtattggca\n\
-gcgtattgtgatttcgttcctactttatcaatttcacattcatatacatgtcttttatca\n\
-aaatcgccaataagataggatgagctatattagatgctagtagagttcgcgccaacatca\n\
-tcgataggaatactcaggacagcgtgataggacttttcaatccctaatactctctataat\n\
-tataactctctcttaagtttggaggcagtaacgcgctctatataatcagtttgctgcacc\n\
-attcttcagcctctgatacatacaaataaattccacagcagtaagagggtttaattgaga\n\
-catcttgggaacttaggattttactctaacatcaccgaaacgattattggataccgtacc\n\
-taaacgaactttctcaaggcagtaatataggacatccgcaataacacaaatgctgcctcc\n\
-ccaggagttatgtcttcctggaggctatatcttacacccactcactataggcaaactaaa\n\
-gtttaaatgttgattgtctaaaaaaaagatagataagagttggccggcgtagcacatgcg\n\
-aaagtgaatcgtaagctataattctctggacttgaagttctgtcctgttcctctgcaaga\n\
-aacaaacttcctttaaagctatttacgacgcacatctcagcaagttataaacatgttgga\n\
-agtttctagtcggaattcccaaagaacggatctatctaatgcattcctacatttttcctg\n\
-tctgccgatggtgccatcctattcaaagaatttcttaaaagtagattaaatgggactttt\n\
-aacaatgagtaaccttacgcctctaagggttcctcgagtgccatacaccagtcaggtccg\n\
-agccacatacacggagaacattctaacatagcattctcaactcgatcatttgcaggttac\n\
-ttctttcctatcctagtgctaaaaatcatacttgcaatcccatagcacggattaagaacc\n\
-taagaaacaattcagtaaaacatgttcgaattcttggtatgggaacatcattgcagctat\n\
-ggtctaacgcattaatgtttgggtacatcttccatcatataaacaggaagagtctgacga\n\
-cagggagtgcttgcgatcatgtctatcattgtgaaatcaaattgtagctcacatgtcgtc\n\
-tatgagagcgtgtatccgataagatttagaaaaatagaagtcgtataagatctcactgaa\n\
-cttttgaatgaatgtgaagcatatatgatctgctttaataaaactttatccataggatac\n\
-gtttccaaatcaattcaataattattagtcaaaatagataaggatgaacaacctgaaggc\n\
-cgatcggacgtagaaagtggtcccatcactttgagttgatattgttgaaccacacgttat\n\
-tatggttttcaaacagtctcaggatattgtatatacagataatccgataccagttgtctg\n\
-acgcccctcttacgtaccccaccctttgtgacgtttaaagcagttgttcagtattttaaa\n\
-ctaggcggcaactaatttggaaagaagcacagtggatatgtctaaattcttgttattcag\n\
-gcctgaatttaatacaccgcatagttaacttcgcggtagagttgttcatcatgcctcctc\n\
-taagctaccacttctatgatacaccaatagttgttctacggaatctgataattggccaag\n\
-tcataaacttccgctgcgttcaacccccttgctcgaatatccaactcgaaaagacagcct\n\
-tttggtgtccggaacaaatcagttacttcttttctgatgttaattctctgtggtcagata\n\
-cagaccaaaaactccgcggatttaccatcctccaagaacaaatttgcatcaacatagcat\n\
-tttggctacatattctaagtctcaatagtttaggttttcaactacattatcccaacatta\n\
-ggattggaggaataatagctgggtaagtccccttgcgtctacaatcgactattttttatg\n\
-aatatgcttctgccgcacctatggttattaaaaaagtcatgactttgaagaaccctgaaa\n\
-agatagatgaatcaggtgtaatggcagcagccaaagagcatataattagcaacactctaa\n\
-gaacattatagatatgatgatagcgatcgtcatgatgttatccggtcacaatagtagctt\n\
-catcagctaattcgttttgccagtggtgacttgcgctggaagaatcgttatacggtccct\n\
-tccctcttgatacggtgggggcttattcaaccgcgtggattgggttgtcatacttgcatt\n\
-aaacgatgtaaaccatctagtagtcaactatactaaatcacaaaatagtgatcaatacat\n\
-acccgcttcatggttttaaccatttaattgattaaagatattccgctaagaaccattatc\n\
-tacctaaactgatcgccgtatcctagtagtttgaaatttgatgtaccgtaatgatcaacg\n\
-aagtaaaacgttatattgtatgtagaataataggtcttggagctaaatgatgtgattggt\n\
-agtgaagacttacccttacaactttaccggtttctcggaagaatatactagagaatcaat\n\
-gcatgggctacataagcactttagtctaatgagataaaaaatacacgagtcttccatcat\n\
-gaattttttgtcgaaaaactcgaacctggtaatttaaaccatatatctttatgtcgtcaa\n\
-taactctcatatgttttatataacttcccaatcacgacttgtaactgcttgttcgactga\n\
-gctgtttgagctatgaggccgggatccggttgagctacatctatttgctacaagaaaaat\n\
-gaaagcacatttgttgggagttctggctacactcatagagaaataagtggcccgagtggg\n\
-tgcggcctgcctccatattcaagtgtatcttaaaccaagtggttccaacgctcgcgctaa\n\
-agaattaaagcctttatttcctccacggagtagcccgtaatccggttcgaaagagaccat\n\
-tgaagttaattttcatatccagtgaagtttaggcacaagcatgtgttctgccacatgcct\n\
-caaagcgctcttcaaccaagatatgattcatcctaacttcgatgaatgcgtctgtaacat\n\
-aaatatagaaggaatgattcggcgagttaattttcgccttctccaacatggcatccctac\n\
-gttcgttataaggaccatacatgtaggttttaaaggtttgcggttaatcgatatttacat\n\
-catagaaattctatagtcaaatttacaagactctagatactcactcgttgcagccggcta\n\
-ggaagcgctttgtaccttacttcccttttcgttgcgtaatatgaatttcatatagtaagt\n\
-tcaaggcactcatacctccgtgaagagggtagatagactattaaagttgtttaatagtac\n\
-gtattgatggaaatgacccgtaggagatttaccactcaatccacaagattcgctgctgtg\n\
-cattatcaaaacagtgcatgtcgaaacatgggttgggtccttcaaacacgaatccaggta\n\
-gagatacctttgcaattttt\n";
-
-dnaInput = dnaInput + dnaInput + dnaInput;
-
-var ilen, clen,
- seqs = [
-  /agggtaaa|tttaccct/ig,
-  /[cgt]gggtaaa|tttaccc[acg]/ig,
-  /a[act]ggtaaa|tttacc[agt]t/ig,
-  /ag[act]gtaaa|tttac[agt]ct/ig,
-  /agg[act]taaa|ttta[agt]cct/ig,
-  /aggg[acg]aaa|ttt[cgt]ccct/ig,
-  /agggt[cgt]aa|tt[acg]accct/ig,
-  /agggta[cgt]a|t[acg]taccct/ig,
-  /agggtaa[cgt]|[acg]ttaccct/ig],
- subs = {
-  B: '(c|g|t)', D: '(a|g|t)', H: '(a|c|t)', K: '(g|t)',
-  M: '(a|c)', N: '(a|c|g|t)', R: '(a|g)', S: '(c|t)',
-  V: '(a|c|g)', W: '(a|t)', Y: '(c|t)' }
-
-ilen = dnaInput.length;
-
-// There is no in-place substitution
-dnaInput = dnaInput.replace(/>.*\n|\n/g,"")
-clen = dnaInput.length
-
-var dnaOutputString;
-
-  /* BEGIN LOOP */
-for(i in seqs)
-    dnaOutputString += seqs[i].source + " " + (dnaInput.match(seqs[i]) || []).length + "\n";
-  /* END LOOP */
- // match returns null if no matches, so replace with empty
-
-  /* BEGIN LOOP */
-for(k in subs)
- dnaInput = dnaInput.replace(k, subs[k], "g")
-  /* END LOOP */
- // search string, replacement string, flags
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-base64.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-base64.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-base64.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-base64.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +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/. */
-
-// From: http://lxr.mozilla.org/mozilla/source/extensions/xml-rpc/src/nsXmlRpcClient.js#956
-
-/* Convert data (an array of integers) to a Base64 string. */
-var toBase64Table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-var base64Pad = '=';
-
-function toBase64(data) {
-    var result = '';
-    var length = data.length;
-    var i;
-    // Convert every three bytes to 4 ascii characters.
-  /* BEGIN LOOP */
-    for (i = 0; i < (length - 2); i += 3) {
-        result += toBase64Table[data[i] >> 2];
-        result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
-        result += toBase64Table[((data[i+1] & 0x0f) << 2) + (data[i+2] >> 6)];
-        result += toBase64Table[data[i+2] & 0x3f];
-    }
-  /* END LOOP */
-
-    // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
-    if (length%3) {
-        i = length - (length%3);
-        result += toBase64Table[data[i] >> 2];
-        if ((length%3) == 2) {
-            result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
-            result += toBase64Table[(data[i+1] & 0x0f) << 2];
-            result += base64Pad;
-        } else {
-            result += toBase64Table[(data[i] & 0x03) << 4];
-            result += base64Pad + base64Pad;
-        }
-    }
-
-    return result;
-}
-
-/* Convert Base64 data to a string */
-var toBinaryTable = [
-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
-    52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1,
-    -1, 0, 1, 2,  3, 4, 5, 6,  7, 8, 9,10, 11,12,13,14,
-    15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
-    -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
-    41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
-];
-
-function base64ToString(data) {
-    var result = '';
-    var leftbits = 0; // number of bits decoded, but yet to be appended
-    var leftdata = 0; // bits decoded, but yet to be appended
-
-    // Convert one by one.
-  /* BEGIN LOOP */
-    for (var i = 0; i < data.length; i++) {
-        var c = toBinaryTable[data.charCodeAt(i) & 0x7f];
-        var padding = (data[i] == base64Pad);
-        // Skip illegal characters and whitespace
-        if (c == -1) continue;
-        
-        // Collect data into leftdata, update bitcount
-        leftdata = (leftdata << 6) | c;
-        leftbits += 6;
-
-        // If we have 8 or more bits, append 8 bits to the result
-        if (leftbits >= 8) {
-            leftbits -= 8;
-            // Append if not padding.
-            if (!padding)
-                result += String.fromCharCode((leftdata >> leftbits) & 0xff);
-            leftdata &= (1 << leftbits) - 1;
-        }
-    }
-  /* END LOOP */
-
-    // If there are any bits left, the base64 string was corrupted
-    if (leftbits)
-        throw Components.Exception('Corrupted base64 string');
-
-    return result;
-}
-
-var str = "";
-
-  /* BEGIN LOOP */
-for ( var i = 0; i < 8192; i++ )
-        str += String.fromCharCode( (25 * Math.random()) + 97 );
-  /* END LOOP */
-
-  /* BEGIN LOOP */
-for ( var i = 8192; i <= 16384; i *= 2 ) {
-
-    var base64;
-
-    base64 = toBase64(str);
-    base64ToString(base64);
-
-    // Double the string
-    str += str;
-}
-  /* END LOOP */
-
-toBinaryTable = null;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-fasta.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-fasta.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-fasta.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-fasta.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-// The Great Computer Language Shootout
-//  http://shootout.alioth.debian.org
-//
-//  Contributed by Ian Osgood
-
-var last = 42, A = 3877, C = 29573, M = 139968;
-
-function rand(max) {
-  last = (last * A + C) % M;
-  return max * last / M;
-}
-
-var ALU =
-  "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG" +
-  "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA" +
-  "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT" +
-  "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA" +
-  "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG" +
-  "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC" +
-  "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA";
-
-var IUB = {
-  a:0.27, c:0.12, g:0.12, t:0.27,
-  B:0.02, D:0.02, H:0.02, K:0.02,
-  M:0.02, N:0.02, R:0.02, S:0.02,
-  V:0.02, W:0.02, Y:0.02
-}
-
-var HomoSap = {
-  a: 0.3029549426680,
-  c: 0.1979883004921,
-  g: 0.1975473066391,
-  t: 0.3015094502008
-}
-
-function makeCumulative(table) {
-  var last = null;
-  /* BEGIN LOOP */
-  for (var c in table) {
-    if (last) table[c] += table[last];
-    last = c;
-  }
-  /* END LOOP */
-}
-
-function fastaRepeat(n, seq) {
-  var seqi = 0, lenOut = 60;
-  /* BEGIN LOOP */
-  while (n>0) {
-    if (n<lenOut) lenOut = n;
-    if (seqi + lenOut < seq.length) {
-      ret = seq.substring(seqi, seqi+lenOut);
-      seqi += lenOut;
-    } else {
-      var s = seq.substring(seqi);
-      seqi = lenOut - s.length;
-      ret = s + seq.substring(0, seqi);
-    }
-    n -= lenOut;
-  }
-  /* END LOOP */
-}
-
-function fastaRandom(n, table) {
-  var line = new Array(60);
-  makeCumulative(table);
-  /* BEGIN LOOP */
-  while (n>0) {
-    if (n<line.length) line = new Array(n);
-  /* BEGIN LOOP */
-    for (var i=0; i<line.length; i++) {
-      var r = rand(1);
-  /* BEGIN LOOP */
-      for (var c in table) {
-        if (r < table[c]) {
-          line[i] = c;
-          break;
-        }
-      }
-  /* END LOOP */
-    }
-  /* END LOOP */
-    ret = line.join('');
-    n -= line.length;
-  }
-  /* END LOOP */
-}
-
-var ret;
-
-var count = 7;
-ret = fastaRepeat(2*count*100000, ALU);
-ret = fastaRandom(3*count*1000, IUB);
-ret = fastaRandom(5*count*1000, HomoSap);
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-tagcloud.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-tagcloud.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-tagcloud.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-tagcloud.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,277 +0,0 @@
-
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-/*
-    Portions from:
-    json.js
-    2007-10-10
-
-    Public Domain
-*/
-
-// This test parses a JSON string giving tag names and popularity, and
-// generates html markup for a "tagcloud" view.
-
-if (!Object.prototype.toJSONString) {
-
-    Array.prototype.toJSONString = function (w) {
-        var a = [],     // The array holding the partial texts.
-            i,          // Loop counter.
-            l = this.length,
-            v;          // The value to be stringified.
-
-  /* BEGIN LOOP */
-        for (i = 0; i < l; i += 1) {
-            v = this[i];
-            switch (typeof v) {
-            case 'object':
-
-                if (v && typeof v.toJSONString === 'function') {
-                    a.push(v.toJSONString(w));
-                } else {
-                    a.push('null');
-                }
-                break;
-
-            case 'string':
-            case 'number':
-            case 'boolean':
-                a.push(v.toJSONString());
-                break;
-            default:
-                a.push('null');
-            }
-        }
-  /* END LOOP */
-
-        return '[' + a.join(',') + ']';
-    };
-
-
-    Boolean.prototype.toJSONString = function () {
-        return String(this);
-    };
-
-
-    Date.prototype.toJSONString = function () {
-
-        function f(n) {
-
-            return n < 10 ? '0' + n : n;
-        }
-
-        return '"' + this.getUTCFullYear()   + '-' +
-                   f(this.getUTCMonth() + 1) + '-' +
-                   f(this.getUTCDate())      + 'T' +
-                   f(this.getUTCHours())     + ':' +
-                   f(this.getUTCMinutes())   + ':' +
-                   f(this.getUTCSeconds())   + 'Z"';
-    };
-
-
-    Number.prototype.toJSONString = function () {
-
-        return isFinite(this) ? String(this) : 'null';
-    };
-
-
-    Object.prototype.toJSONString = function (w) {
-        var a = [],     // The array holding the partial texts.
-            k,          // The current key.
-            i,          // The loop counter.
-            v;          // The current value.
-
-        if (w) {
-  /* BEGIN LOOP */
-            for (i = 0; i < w.length; i += 1) {
-                k = w[i];
-                if (typeof k === 'string') {
-                    v = this[k];
-                    switch (typeof v) {
-                    case 'object':
-
-                        if (v) {
-                            if (typeof v.toJSONString === 'function') {
-                                a.push(k.toJSONString() + ':' +
-                                       v.toJSONString(w));
-                            }
-                        } else {
-                            a.push(k.toJSONString() + ':null');
-                        }
-                        break;
-
-                    case 'string':
-                    case 'number':
-                    case 'boolean':
-                        a.push(k.toJSONString() + ':' + v.toJSONString());
-
-                    }
-                }
-            }
-  /* END LOOP */
-        } else {
-
-  /* BEGIN LOOP */
-            for (k in this) {
-                if (typeof k === 'string' &&
-                        Object.prototype.hasOwnProperty.apply(this, [k])) {
-                    v = this[k];
-                    switch (typeof v) {
-                    case 'object':
-
-                        if (v) {
-                            if (typeof v.toJSONString === 'function') {
-                                a.push(k.toJSONString() + ':' +
-                                       v.toJSONString());
-                            }
-                        } else {
-                            a.push(k.toJSONString() + ':null');
-                        }
-                        break;
-
-                    case 'string':
-                    case 'number':
-                    case 'boolean':
-                        a.push(k.toJSONString() + ':' + v.toJSONString());
-
-                    }
-                }
-            }
-  /* END LOOP */
-        }
-
-        return '{' + a.join(',') + '}';
-    };
-
-
-    (function (s) {
-
-        var m = {
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        };
-
-
-        s.parseJSON = function (filter) {
-            var j;
-
-            function walk(k, v) {
-                var i, n;
-                if (v && typeof v === 'object') {
-  /* BEGIN LOOP */
-                    for (i in v) {
-                        if (Object.prototype.hasOwnProperty.apply(v, [i])) {
-                            n = walk(i, v[i]);
-                            if (n !== undefined) {
-                                v[i] = n;
-                            }
-                        }
-                    }
-  /* END LOOP */
-                }
-                return filter(k, v);
-            }
-
-            if (/^[\],:{}\s]*$/.test(this.replace(/\\./g, '@').
-                    replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(:?[eE][+\-]?\d+)?/g, ']').
-                    replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-                j = eval('(' + this + ')');
-
-                return typeof filter === 'function' ? walk('', j) : j;
-            }
-
-            throw new SyntaxError('parseJSON');
-        };
-
-
-        s.toJSONString = function () {
-
-            if (/["\\\x00-\x1f]/.test(this)) {
-                return '"' + this.replace(/[\x00-\x1f\\"]/g, function (a) {
-                    var c = m[a];
-                    if (c) {
-                        return c;
-                    }
-                    c = a.charCodeAt();
-                    return '\\u00' + Math.floor(c / 16).toString(16) +
-                                               (c % 16).toString(16);
-                }) + '"';
-            }
-            return '"' + this + '"';
-        };
-    })(String.prototype);
-}
-
-var tagInfoJSON = '[\n  {\n    \"tag\": "titillation",\n    \"popularity\": 4294967296\n  },\n  {\n    \"tag\": "foamless",\n    \"popularity\": 1257718401\n  },\n  {\n    \"tag\": "snarler",\n    \"popularity\": 613166183\n  },\n  {\n    \"tag\": "multangularness",\n    \"popularity\": 368304452\n  },\n  {\n    \"tag\": "Fesapo unventurous",\n    \"popularity\": 248026512\n  },\n  {\n    \"tag\": "esthesioblast",\n    \"popularity\": 179556755\n  },\n  {\n    \"tag\": "echeneidoid",\n    \"popularity\": 136641578\n  },\n  {\n    \"tag\": "embryoctony",\n    \"popularity\": 107852576\n  },\n  {\n    \"tag\": "undilatory",\n    \"popularity\": 87537981\n  },\n  {\n    \"tag\": "predisregard",\n    \"popularity\": 72630939\n  },\n  {\n    \"tag\": "allergenic",\n    \"popularity\": 61345190\n  },\n  {\n    \"tag\": "uncloudy",\n    \"popularity\": 52580571\n  },\n  {\n    \"tag\": "unforeseeably",\n    \"popularity\": 45628109\n  },\n  {\n    \"tag\": "sturniform",\n    \"popularity\": 40013489\n  },\n  {\n    \"tag\": "anesthetize",\n    \"popularity\": 35409226\n  },\n  {\n    \"tag\": "ametabolia",\n    \"popularity\": 31583050\n  },\n  {\n    \"tag\": "angiopathy",\n    \"popularity\": 28366350\n  },\n  {\n    \"tag\": "sultanaship",\n    \"popularity\": 25634218\n  },\n  {\n    \"tag\": "Frenchwise",\n    \"popularity\": 23292461\n  },\n  {\n    \"tag\": "cerviconasal",\n    \"popularity\": 21268909\n  },\n  {\n    \"tag\": "mercurialness",\n    \"popularity\": 19507481\n  },\n  {\n    \"tag\": "glutelin venditate",\n    \"popularity\": 17964042\n  },\n  {\n    \"tag\": "acred overblack",\n    \"popularity\": 16603454\n  },\n  {\n    \"tag\": "Atik",\n    \"popularity\": 15397451\n  },\n  {\n    \"tag\": "puncturer",\n    \"popularity\": 14323077\n  },\n  {\n    \"tag\": "pukatea",\n    \"popularity\": 13361525\n  },\n  {\n    \"tag\": "suberize",\n    \"popularity\": 12497261\n  },\n  {\n    \"tag\": "Godfrey",\n    \"popularity\": 11717365\n  },\n  {\n    \"tag\": "tetraptote",\n    \"popularity\": 11011011\n  },\n  {\n    \"tag\": "lucidness",\n    \"popularity\": 10369074\n  },\n  {\n    \"tag\": "tartness",\n    \"popularity\": 9783815\n  },\n  {\n    \"tag\": "axfetch",\n    \"popularity\": 9248634\n  },\n  {\n    \"tag\": "preacquittal",\n    \"popularity\": 8757877\n  },\n  {\n    \"tag\": "matris",\n    \"popularity\": 8306671\n  },\n  {\n    \"tag\": "hyphenate",\n    \"popularity\": 7890801\n  },\n  {\n    \"tag\": "semifabulous",\n    \"popularity\": 7506606\n  },\n  {\n    \"tag\": "oppressiveness",\n    \"popularity\": 7150890\n  },\n  {\n    \"tag\": "Protococcales",\n    \"popularity\": 6820856\n  },\n  {\n    \"tag\": "unpreventive",\n    \"popularity\": 6514045\n  },\n  {\n    \"tag\": "Cordia",\n    \"popularity\": 6228289\n  },\n  {\n    \"tag\": "Wakamba leaflike",\n    \"popularity\": 5961668\n  },\n  {\n    \"tag\": "dacryoma",\n    \"popularity\": 5712480\n  },\n  {\n    \"tag\": "inguinal",\n    \"popularity\": 5479211\n  },\n  {\n    \"tag\": "responseless",\n    \"popularity\": 5260507\n  },\n  {\n    \"tag\": "supplementarily",\n    \"popularity\": 5055158\n  },\n  {\n    \"tag\": "emu",\n    \"popularity\": 4862079\n  },\n  {\n    \"tag\": "countermeet",\n    \"popularity\": 4680292\n  },\n  {\n    \"tag\": "purrer",\n    \"popularity\": 4508918\n  },\n  {\n    \"tag\": "Corallinaceae",\n    \"popularity\": 4347162\n  },\n  {\n    \"tag\": "speculum",\n    \"popularity\": 4194304\n  },\n  {\n    \"tag\": "crimpness",\n    \"popularity\": 4049690\n  },\n  {\n    \"tag\": "antidetonant",\n    \"popularity\": 3912727\n  },\n  {\n    \"tag\": "topeewallah",\n    \"popularity\": 3782875\n  },\n  {\n    \"tag\": "fidalgo ballant",\n    \"popularity\": 3659640\n  },\n  {\n    \"tag\": "utriculose",\n    \"popularity\": 3542572\n  },\n  {\n    \"tag\": "testata",\n    \"popularity\": 3431259\n  },\n  {\n    \"tag\": "beltmaking",\n    \"popularity\": 3325322\n  },\n  {\n    \"tag\": "necrotype",\n    \"popularity\": 3224413\n  },\n  {\n    \"tag\": "ovistic",\n    \"popularity\": 3128215\n  },\n  {\n    \"tag\": "swindlership",\n    \"popularity\": 3036431\n  },\n  {\n    \"tag\": "augustal",\n    \"popularity\": 2948792\n  },\n  {\n    \"tag\": "Titoist",\n    \"popularity\": 2865047\n  },\n  {\n    \"tag\": "trisoctahedral",\n    \"popularity\": 2784963\n  },\n  {\n    \"tag\": "sequestrator",\n    \"popularity\": 2708327\n  },\n  {\n    \"tag\": "sideburns",\n    \"popularity\": 2634939\n  },\n  {\n    \"tag\": "paraphrasia",\n    \"popularity\": 2564616\n  },\n  {\n    \"tag\": "graminology unbay",\n    \"popularity\": 2497185\n  },\n  {\n    \"tag\": "acaridomatium emargination",\n    \"popularity\": 2432487\n  },\n  {\n    \"tag\": "roofward",\n    \"popularity\": 2370373\n  },\n  {\n    \"tag\": "lauder",\n    \"popularity\": 2310705\n  },\n  {\n    \"tag\": "subjunctive",\n    \"popularity\": 2253354\n  },\n  {\n    \"tag\": "subelongate",\n    \"popularity\": 2198199\n  },\n  {\n    \"tag\": "guacimo",\n    \"popularity\": 2145128\n  },\n  {\n    \"tag\": "cockade",\n    \"popularity\": 2094033\n  },\n  {\n    \"tag\": "misgauge",\n    \"popularity\": 2044818\n  },\n  {\n    \"tag\": "unexpensive",\n    \"popularity\": 1997388\n  },\n  {\n    \"tag\": "chebel",\n    \"popularity\": 1951657\n  },\n  {\n    \"tag\": "unpursuing",\n    \"popularity\": 1907543\n  },\n  {\n    \"tag\": "kilobar",\n    \"popularity\": 1864969\n  },\n  {\n    \"tag\": "obsecration",\n    \"popularity\": 1823863\n  },\n  {\n    \"tag\": "nacarine",\n    \"popularity\": 1784157\n  },\n  {\n    \"tag\": "spirituosity",\n    \"popularity\": 1745787\n  },\n  {\n    \"tag\": "movableness deity",\n    \"popularity\": 1708692\n  },\n  {\n    \"tag\": "exostracism",\n    \"popularity\": 1672816\n  },\n  {\n    \"tag\": "archipterygium",\n    \"popularity\": 1638104\n  },\n  {\n    \"tag\": "monostrophic",\n    \"popularity\": 1604506\n  },\n  {\n    \"tag\": "gynecide",\n    \"popularity\": 1571974\n  },\n  {\n    \"tag\": "gladden",\n    \"popularity\": 1540462\n  },\n  {\n    \"tag\": "throughbred",\n    \"popularity\": 1509927\n  },\n  {\n    \"tag\": "groper",\n    \"popularity\": 1480329\n  },\n  {\n    \"tag\": "Xenosaurus",\n    \"popularity\": 1451628\n  },\n  {\n    \"tag\": "photoetcher",\n    \"popularity\": 1423788\n  },\n  {\n    \"tag\": "glucosid",\n    \"popularity\": 1396775\n  },\n  {\n    \"tag\": "Galtonian",\n    \"popularity\": 1370555\n  },\n  {\n    \"tag\": "mesosporic",\n    \"popularity\": 1345097\n  },\n  {\n    \"tag\": "theody",\n    \"popularity\": 1320370\n  },\n  {\n    \"tag\": "zaffer",\n    \"popularity\": 1296348\n  },\n  {\n    \"tag\": "probiology",\n    \"popularity\": 1273003\n  },\n  {\n    \"tag\": "rhizomic",\n    \"popularity\": 1250308\n  },\n  {\n    \"tag\": "superphosphate",\n    \"popularity\": 1228240\n  },\n  {\n    \"tag\": "Hippolytan",\n    \"popularity\": 1206776\n  },\n  {\n    \"tag\": "garget",\n    \"popularity\": 1185892\n  },\n  {\n    \"tag\": "diploplacula",\n    \"popularity\": 1165568\n  },\n  {\n    \"tag\": "orohydrographical",\n    \"popularity\": 1145785\n  },\n  {\n    \"tag\": "enhypostatize",\n    \"popularity\": 1126521\n  },\n  {\n    \"tag\": "polisman",\n    \"popularity\": 1107759\n  },\n  {\n    \"tag\": "acetometer",\n    \"popularity\": 1089482\n  },\n  {\n    \"tag\": "unsnatched",\n    \"popularity\": 1071672\n  },\n  {\n    \"tag\": "yabber",\n    \"popularity\": 1054313\n  },\n  {\n    \"tag\": "demiwolf",\n    \"popularity\": 1037390\n  },\n  {\n    \"tag\": "chromascope",\n    \"popularity\": 1020888\n  },\n  {\n    \"tag\": "seamanship",\n    \"popularity\": 1004794\n  },\n  {\n    \"tag\": "nonfenestrated",\n    \"popularity\": 989092\n  },\n  {\n    \"tag\": "hydrophytism",\n    \"popularity\": 973771\n  },\n  {\n    \"tag\": "dotter",\n    \"popularity\": 958819\n  },\n  {\n    \"tag\": "thermoperiodism",\n    \"popularity\": 944222\n  },\n  {\n    \"tag\": "unlawyerlike",\n    \"popularity\": 929970\n  },\n  {\n    \"tag\": "enantiomeride citywards",\n    \"popularity\": 916052\n  },\n  {\n    \"tag\": "unmetallurgical",\n    \"popularity\": 902456\n  },\n  {\n    \"tag\": "prickled",\n    \"popularity\": 889174\n  },\n  {\n    \"tag\": "strangerwise manioc",\n    \"popularity\": 876195\n  },\n  {\n    \"tag\": "incisorial",\n    \"popularity\": 863510\n  },\n  {\n    \"tag\": "irrationalize",\n    \"popularity\": 851110\n  },\n  {\n    \"tag\": "nasology",\n    \"popularity\": 838987\n  },\n  {\n    \"tag\": "fatuism",\n    \"popularity\": 827131\n  },\n  {\n    \"tag\": "Huk",\n    \"popularity\": 815535\n  },\n  {\n    \"tag\": "properispomenon",\n    \"popularity\": 804192\n  },\n  {\n    \"tag\": "unpummelled",\n    \"popularity\": 793094\n  },\n  {\n    \"tag\": "technographically",\n    \"popularity\": 782233\n  },\n  {\n    \"tag\": "underfurnish",\n    \"popularity\": 771603\n  },\n  {\n    \"tag\": "sinter",\n    \"popularity\": 761198\n  },\n  {\n    \"tag\": "lateroanterior",\n    \"popularity\": 751010\n  },\n  {\n    \"tag\": "nonpersonification",\n    \"popularity\": 741034\n  },\n  {\n    \"tag\": "Sitophilus",\n    \"popularity\": 731264\n  },\n  {\n    \"tag\": "unstudded overexerted",\n    \"popularity\": 721694\n  },\n  {\n    \"tag\": "tracheation",\n    \"popularity\": 712318\n  },\n  {\n    \"tag\": "thirteenth begloze",\n    \"popularity\": 703131\n  },\n  {\n    \"tag\": "bespice",\n    \"popularity\": 694129\n  },\n  {\n    \"tag\": "doppia",\n    \"popularity\": 685305\n  },\n  {\n    \"tag\": "unadorned",\n    \"popularity\": 676656\n  },\n  {\n    \"tag\": "dovelet engraff",\n    \"popularity\": 668176\n  },\n  {\n    \"tag\": "diphyozooid",\n    \"popularity\": 659862\n  },\n  {\n    \"tag\": "mure",\n    \"popularity\": 651708\n  },\n  {\n    \"tag\": "Tripitaka",\n    \"popularity\": 643710\n  },\n  {\n    \"tag\": "Billjim",\n    \"popularity\": 635865\n  },\n  {\n    \"tag\": "pyramidical",\n    \"popularity\": 628169\n  },\n  {\n    \"tag\": "circumlocutionist",\n    \"popularity\": 620617\n  },\n  {\n    \"tag\": "slapstick",\n    \"popularity\": 613207\n  },\n  {\n    \"tag\": "preobedience",\n    \"popularity\": 605934\n  },\n  {\n    \"tag\": "unfriarlike",\n    \"popularity\": 598795\n  },\n  {\n    \"tag\": "microchromosome",\n    \"popularity\": 591786\n  },\n  {\n    \"tag\": "Orphicism",\n    \"popularity\": 584905\n  },\n  {\n    \"tag\": "peel",\n    \"popularity\": 578149\n  },\n  {\n    \"tag\": "obediential",\n    \"popularity\": 571514\n  },\n  {\n    \"tag\": "Peripatidea",\n    \"popularity\": 564997\n  },\n  {\n    \"tag\": "undoubtful",\n    \"popularity\": 558596\n  },\n  {\n    \"tag\": "lodgeable",\n    \"popularity\": 552307\n  },\n  {\n    \"tag\": "pustulated woodchat",\n    \"popularity\": 546129\n  },\n  {\n    \"tag\": "antepast",\n    \"popularity\": 540057\n  },\n  {\n    \"tag\": "sagittoid matrimoniously",\n    \"popularity\": 534091\n  },\n  {\n    \"tag\": "Albizzia",\n    \"popularity\": 528228\n  },\n  {\n    \"tag\": "Elateridae unnewness",\n    \"popularity\": 522464\n  },\n  {\n    \"tag\": "convertingness",\n    \"popularity\": 516798\n  },\n  {\n    \"tag\": "Pelew",\n    \"popularity\": 511228\n  },\n  {\n    \"tag\": "recapitulation",\n    \"popularity\": 505751\n  },\n  {\n    \"tag\": "shack",\n    \"popularity\": 500365\n  },\n  {\n    \"tag\": "unmellowed",\n    \"popularity\": 495069\n  },\n  {\n    \"tag\": "pavis capering",\n    \"popularity\": 489859\n  },\n  {\n    \"tag\": "fanfare",\n    \"popularity\": 484735\n  },\n  {\n    \"tag\": "sole",\n    \"popularity\": 479695\n  },\n  {\n    \"tag\": "subarcuate",\n    \"popularity\": 474735\n  },\n  {\n    \"tag\": "multivious",\n    \"popularity\": 469856\n  },\n  {\n    \"tag\": "squandermania",\n    \"popularity\": 465054\n  },\n  {\n    \"tag\": "scintle",\n    \"popularity\": 460329\n  },\n  {\n    \"tag\": "hash chirognomic",\n    \"popularity\": 455679\n  },\n  {\n    \"tag\": "linseed",\n    \"popularity\": 451101\n  },\n  {\n    \"tag\": "redoubtable",\n    \"popularity\": 446596\n  },\n  {\n    \"tag\": "poachy reimpact",\n    \"popularity\": 442160\n  },\n  {\n    \"tag\": "limestone",\n    \"popularity\": 437792\n  },\n  {\n    \"tag\": "serranid",\n    \"popularity\": 433492\n  },\n  {\n    \"tag\": "pohna",\n    \"popularity\": 429258\n  },\n  {\n    \"tag\": "warwolf",\n    \"popularity\": 425088\n  },\n  {\n    \"tag\": "ruthenous",\n    \"popularity\": 420981\n  },\n  {\n    \"tag\": "dover",\n    \"popularity\": 416935\n  },\n  {\n    \"tag\": "deuteroalbumose",\n    \"popularity\": 412950\n  },\n  {\n    \"tag\": "pseudoprophetic",\n    \"popularity\": 409025\n  },\n  {\n    \"tag\": "dissoluteness",\n    \"popularity\": 405157\n  },\n  {\n    \"tag\": "preinvention",\n    \"popularity\": 401347\n  },\n  {\n    \"tag\": "swagbellied",\n    \"popularity\": 397592\n  },\n  {\n    \"tag\": "Ophidia",\n    \"popularity\": 393892\n  },\n  {\n    \"tag\": "equanimity",\n    \"popularity\": 390245\n  },\n  {\n    \"tag\": "troutful",\n    \"popularity\": 386651\n  },\n  {\n    \"tag\": "uke",\n    \"popularity\": 383108\n  },\n  {\n    \"tag\": "preacquaint",\n    \"popularity\": 379616\n  },\n  {\n    \"tag\": "shoq",\n    \"popularity\": 376174\n  },\n  {\n    \"tag\": "yox",\n    \"popularity\": 372780\n  },\n  {\n    \"tag\": "unelemental",\n    \"popularity\": 369434\n  },\n  {\n    \"tag\": "Yavapai",\n    \"popularity\": 366134\n  },\n  {\n    \"tag\": "joulean",\n    \"popularity\": 362880\n  },\n  {\n    \"tag\": "dracontine",\n    \"popularity\": 359672\n  },\n  {\n    \"tag\": "hardmouth",\n    \"popularity\": 356507\n  },\n  {\n    \"tag\": "sylvanize",\n    \"popularity\": 353386\n  },\n  {\n    \"tag\": "intraparenchymatous meadowbur",\n    \"popularity\": 350308\n  },\n  {\n    \"tag\": "uncharily",\n    \"popularity\": 347271\n  },\n  {\n    \"tag\": "redtab flexibly",\n    \"popularity\": 344275\n  },\n  {\n    \"tag\": "centervelic",\n    \"popularity\": 341319\n  },\n  {\n    \"tag\": "unravellable",\n    \"popularity\": 338403\n  },\n  {\n    \"tag\": "infortunately",\n    \"popularity\": 335526\n  },\n  {\n    \"tag\": "cannel",\n    \"popularity\": 332687\n  },\n  {\n    \"tag\": "oxyblepsia",\n    \"popularity\": 329885\n  },\n  {\n    \"tag\": "Damon",\n    \"popularity\": 327120\n  },\n  {\n    \"tag\": "etherin",\n    \"popularity\": 324391\n  },\n  {\n    \"tag\": "luminal",\n    \"popularity\": 321697\n  },\n  {\n    \"tag\": "interrogatorily presbyte",\n    \"popularity\": 319038\n  },\n  {\n    \"tag\": "hemiclastic",\n    \"popularity\": 316414\n  },\n  {\n    \"tag\": "poh flush",\n    \"popularity\": 313823\n  },\n  {\n    \"tag\": "Psoroptes",\n    \"popularity\": 311265\n  },\n  {\n    \"tag\": "dispirit",\n    \"popularity\": 308740\n  },\n  {\n    \"tag\": "nashgab",\n    \"popularity\": 306246\n  },\n  {\n    \"tag\": "Aphidiinae",\n    \"popularity\": 303784\n  },\n  {\n    \"tag\": "rhapsody nonconstruction",\n    \"popularity\": 301353\n  },\n  {\n    \"tag\": "Osmond",\n    \"popularity\": 298952\n  },\n  {\n    \"tag\": "Leonis",\n    \"popularity\": 296581\n  },\n  {\n    \"tag\": "Lemnian",\n    \"popularity\": 294239\n  },\n  {\n    \"tag\": "acetonic gnathonic",\n    \"popularity\": 291926\n  },\n  {\n    \"tag\": "surculus",\n    \"popularity\": 289641\n  },\n  {\n    \"tag\": "diagonally",\n    \"popularity\": 287384\n  },\n  {\n    \"tag\": "counterpenalty",\n    \"popularity\": 285154\n  },\n  {\n    \"tag\": "Eugenie",\n    \"popularity\": 282952\n  },\n  {\n    \"tag\": "hornbook",\n    \"popularity\": 280776\n  },\n  {\n    \"tag\": "miscoin",\n    \"popularity\": 278626\n  },\n  {\n    \"tag\": "admi",\n    \"popularity\": 276501\n  },\n  {\n    \"tag\": "Tarmac",\n    \"popularity\": 274402\n  },\n  {\n    \"tag\": "inexplicable",\n    \"popularity\": 272328\n  },\n  {\n    \"tag\": "rascallion",\n    \"popularity\": 270278\n  },\n  {\n    \"tag\": "dusterman",\n    \"popularity\": 268252\n  },\n  {\n    \"tag\": "osteostomous unhoroscopic",\n    \"popularity\": 266250\n  },\n  {\n    \"tag\": "spinibulbar",\n    \"popularity\": 264271\n  },\n  {\n    \"tag\": "phototelegraphically",\n    \"popularity\": 262315\n  },\n  {\n    \"tag\": "Manihot",\n    \"popularity\": 260381\n  },\n  {\n    \"tag\": "neighborhood",\n    \"popularity\": 258470\n  },\n  {\n    \"tag\": "Vincetoxicum",\n    \"popularity\": 256581\n  },\n  {\n    \"tag\": "khirka",\n    \"popularity\": 254713\n  },\n  {\n    \"tag\": "conscriptive",\n    \"popularity\": 252866\n  },\n  {\n    \"tag\": "synechthran",\n    \"popularity\": 251040\n  },\n  {\n    \"tag\": "Guttiferales",\n    \"popularity\": 249235\n  },\n  {\n    \"tag\": "roomful",\n    \"popularity\": 247450\n  },\n  {\n    \"tag\": "germinal",\n    \"popularity\": 245685\n  },\n  {\n    \"tag\": "untraitorous",\n    \"popularity\": 243939\n  },\n  {\n    \"tag\": "nondissenting",\n    \"popularity\": 242213\n  },\n  {\n    \"tag\": "amotion",\n    \"popularity\": 240506\n  },\n  {\n    \"tag\": "badious",\n    \"popularity\": 238817\n  },\n  {\n    \"tag\": "sumpit",\n    \"popularity\": 237147\n  },\n  {\n    \"tag\": "ectozoic",\n    \"popularity\": 235496\n  },\n  {\n    \"tag\": "elvet",\n    \"popularity\": 233862\n  },\n  {\n    \"tag\": "underclerk",\n    \"popularity\": 232246\n  },\n  {\n    \"tag\": "reticency",\n    \"popularity\": 230647\n  },\n  {\n    \"tag\": "neutroclusion",\n    \"popularity\": 229065\n  },\n  {\n    \"tag\": "unbelieving",\n    \"popularity\": 227500\n  },\n  {\n    \"tag\": "histogenetic",\n    \"popularity\": 225952\n  },\n  {\n    \"tag\": "dermamyiasis",\n    \"popularity\": 224421\n  },\n  {\n    \"tag\": "telenergy",\n    \"popularity\": 222905\n  },\n  {\n    \"tag\": "axiomatic",\n    \"popularity\": 221406\n  },\n  {\n    \"tag\": "undominoed",\n    \"popularity\": 219922\n  },\n  {\n    \"tag\": "periosteoma",\n    \"popularity\": 218454\n  },\n  {\n    \"tag\": "justiciaryship",\n    \"popularity\": 217001\n  },\n  {\n    \"tag\": "autoluminescence",\n    \"popularity\": 215563\n  },\n  {\n    \"tag\": "osmous",\n    \"popularity\": 214140\n  },\n  {\n    \"tag\": "borgh",\n    \"popularity\": 212731\n  },\n  {\n    \"tag\": "bedebt",\n    \"popularity\": 211337\n  },\n  {\n    \"tag\": "considerableness adenoidism",\n    \"popularity\": 209957\n  },\n  {\n    \"tag\": "sailorizing",\n    \"popularity\": 208592\n  },\n  {\n    \"tag\": "Montauk",\n    \"popularity\": 207240\n  },\n  {\n    \"tag\": "Bridget",\n    \"popularity\": 205901\n  },\n  {\n    \"tag\": "Gekkota",\n    \"popularity\": 204577\n  },\n  {\n    \"tag\": "subcorymbose",\n    \"popularity\": 203265\n  },\n  {\n    \"tag\": "undersap",\n    \"popularity\": 201967\n  },\n  {\n    \"tag\": "poikilothermic",\n    \"popularity\": 200681\n  },\n  {\n    \"tag\": "enneatical",\n    \"popularity\": 199409\n  },\n  {\n    \"tag\": "martinetism",\n    \"popularity\": 198148\n  },\n  {\n    \"tag\": "sustanedly",\n    \"popularity\": 196901\n  },\n  {\n    \"tag\": "declaration",\n    \"popularity\": 195665\n  },\n  {\n    \"tag\": "myringoplasty",\n    \"popularity\": 194442\n  },\n  {\n    \"tag\": "Ginkgo",\n    \"popularity\": 193230\n  },\n  {\n    \"tag\": "unrecurrent",\n    \"popularity\": 192031\n  },\n  {\n    \"tag\": "proprecedent",\n    \"popularity\": 190843\n  },\n  {\n    \"tag\": "roadman",\n    \"popularity\": 189666\n  },\n  {\n    \"tag\": "elemin",\n    \"popularity\": 188501\n  },\n  {\n    \"tag\": "maggot",\n    \"popularity\": 187347\n  },\n  {\n    \"tag\": "alitrunk",\n    \"popularity\": 186204\n  },\n  {\n    \"tag\": "introspection",\n    \"popularity\": 185071\n  },\n  {\n    \"tag\": "batiker",\n    \"popularity\": 183950\n  },\n  {\n    \"tag\": "backhatch oversettle",\n    \"popularity\": 182839\n  },\n  {\n    \"tag\": "thresherman",\n    \"popularity\": 181738\n  },\n  {\n    \"tag\": "protemperance",\n    \"popularity\": 180648\n  },\n  {\n    \"tag\": "undern",\n    \"popularity\": 179568\n  },\n  {\n    \"tag\": "tweeg",\n    \"popularity\": 178498\n  },\n  {\n    \"tag\": "crosspath",\n    \"popularity\": 177438\n  },\n  {\n    \"tag\": "Tangaridae",\n    \"popularity\": 176388\n  },\n  {\n    \"tag\": "scrutation",\n    \"popularity\": 175348\n  },\n  {\n    \"tag\": "piecemaker",\n    \"popularity\": 174317\n  },\n  {\n    \"tag\": "paster",\n    \"popularity\": 173296\n  },\n  {\n    \"tag\": "unpretendingness",\n    \"popularity\": 172284\n  },\n  {\n    \"tag\": "inframundane",\n    \"popularity\": 171281\n  },\n  {\n    \"tag\": "kiblah",\n    \"popularity\": 170287\n  },\n  {\n    \"tag\": "playwrighting",\n    \"popularity\": 169302\n  },\n  {\n    \"tag\": "gonepoiesis snowslip",\n    \"popularity\": 168326\n  },\n  {\n    \"tag\": "hoodwise",\n    \"popularity\": 167359\n  },\n  {\n    \"tag\": "postseason",\n    \"popularity\": 166401\n  },\n  {\n    \"tag\": "equivocality",\n    \"popularity\": 165451\n  },\n  {\n    \"tag\": "Opiliaceae nuclease",\n    \"popularity\": 164509\n  },\n  {\n    \"tag\": "sextipara",\n    \"popularity\": 163576\n  },\n  {\n    \"tag\": "weeper",\n    \"popularity\": 162651\n  },\n  {\n    \"tag\": "frambesia",\n    \"popularity\": 161735\n  },\n  {\n    \"tag\": "answerable",\n    \"popularity\": 160826\n  },\n  {\n    \"tag\": "Trichosporum",\n    \"popularity\": 159925\n  },\n  {\n    \"tag\": "cajuputol",\n    \"popularity\": 159033\n  },\n  {\n    \"tag\": "pleomorphous",\n    \"popularity\": 158148\n  },\n  {\n    \"tag\": "aculeolate",\n    \"popularity\": 157270\n  },\n  {\n    \"tag\": "wherever",\n    \"popularity\": 156400\n  },\n  {\n    \"tag\": "collapse",\n    \"popularity\": 155538\n  },\n  {\n    \"tag\": "porky",\n    \"popularity\": 154683\n  },\n  {\n    \"tag\": "perule",\n    \"popularity\": 153836\n  },\n  {\n    \"tag\": "Nevada",\n    \"popularity\": 152996\n  },\n  {\n    \"tag\": "conalbumin",\n    \"popularity\": 152162\n  },\n  {\n    \"tag\": "tsunami",\n    \"popularity\": 151336\n  },\n  {\n    \"tag\": "Gulf",\n    \"popularity\": 150517\n  },\n  {\n    \"tag\": "hertz",\n    \"popularity\": 149705\n  },\n  {\n    \"tag\": "limmock",\n    \"popularity\": 148900\n  },\n  {\n    \"tag\": "Tartarize",\n    \"popularity\": 148101\n  },\n  {\n    \"tag\": "entosphenoid",\n    \"popularity\": 147310\n  },\n  {\n    \"tag\": "ibis",\n    \"popularity\": 146524\n  },\n  {\n    \"tag\": "unyeaned",\n    \"popularity\": 145746\n  },\n  {\n    \"tag\": "tritural",\n    \"popularity\": 144973\n  },\n  {\n    \"tag\": "hundredary",\n    \"popularity\": 144207\n  },\n  {\n    \"tag\": "stolonlike",\n    \"popularity\": 143448\n  },\n  {\n    \"tag\": "chorister",\n    \"popularity\": 142694\n  },\n  {\n    \"tag\": "mismove",\n    \"popularity\": 141947\n  },\n  {\n    \"tag\": "Andine",\n    \"popularity\": 141206\n  },\n  {\n    \"tag\": "Annette proneur escribe",\n    \"popularity\": 140471\n  },\n  {\n    \"tag\": "exoperidium",\n    \"popularity\": 139742\n  },\n  {\n    \"tag\": "disedge",\n    \"popularity\": 139019\n  },\n  {\n    \"tag\": "hypochloruria",\n    \"popularity\": 138302\n  },\n  {\n    \"tag\": "prepupa",\n    \"popularity\": 137590\n  },\n  {\n    \"tag\": "assent",\n    \"popularity\": 136884\n  },\n  {\n    \"tag\": "hydrazobenzene",\n    \"popularity\": 136184\n  },\n  {\n    \"tag\": "emballonurid",\n    \"popularity\": 135489\n  },\n  {\n    \"tag\": "roselle",\n    \"popularity\": 134800\n  },\n  {\n    \"tag\": "unifiedly",\n    \"popularity\": 134117\n  },\n  {\n    \"tag\": "clang",\n    \"popularity\": 133439\n  },\n  {\n    \"tag\": "acetolytic",\n    \"popularity\": 132766\n  },\n  {\n    \"tag\": "cladodont",\n    \"popularity\": 132098\n  },\n  {\n    \"tag\": "recoast",\n    \"popularity\": 131436\n  },\n  {\n    \"tag\": "celebrated tydie Eocarboniferous",\n    \"popularity\": 130779\n  },\n  {\n    \"tag\": "superconsciousness",\n    \"popularity\": 130127\n  },\n  {\n    \"tag\": "soberness",\n    \"popularity\": 129480\n  },\n  {\n    \"tag\": "panoramist",\n    \"popularity\": 128838\n  },\n  {\n    \"tag\": "Orbitolina",\n    \"popularity\": 128201\n  },\n  {\n    \"tag\": "overlewd",\n    \"popularity\": 127569\n  },\n  {\n    \"tag\": "demiquaver",\n    \"popularity\": 126942\n  },\n  {\n    \"tag\": "kamelaukion",\n    \"popularity\": 126319\n  },\n  {\n    \"tag\": "flancard",\n    \"popularity\": 125702\n  },\n  {\n    \"tag\": "tricuspid",\n    \"popularity\": 125089\n  },\n  {\n    \"tag\": "bepelt",\n    \"popularity\": 124480\n  },\n  {\n    \"tag\": "decuplet",\n    \"popularity\": 123877\n  },\n  {\n    \"tag\": "Rockies",\n    \"popularity\": 123278\n  },\n  {\n    \"tag\": "unforgeability",\n    \"popularity\": 122683\n  },\n  {\n    \"tag\": "mocha",\n    \"popularity\": 122093\n  },\n  {\n    \"tag\": "scrunge",\n    \"popularity\": 121507\n  },\n  {\n    \"tag\": "delighter",\n    \"popularity\": 120926\n  },\n  {\n    \"tag\": "willey Microtinae",\n    \"popularity\": 120349\n  },\n  {\n    \"tag\": "unhuntable",\n    \"popularity\": 119777\n  },\n  {\n    \"tag\": "historically",\n    \"popularity\": 119208\n  },\n  {\n    \"tag\": "vicegerentship",\n    \"popularity\": 118644\n  },\n  {\n    \"tag\": "hemangiosarcoma",\n    \"popularity\": 118084\n  },\n  {\n    \"tag\": "harpago",\n    \"popularity\": 117528\n  },\n  {\n    \"tag\": "unionoid",\n    \"popularity\": 116976\n  },\n  {\n    \"tag\": "wiseman",\n    \"popularity\": 116429\n  },\n  {\n    \"tag\": "diclinism",\n    \"popularity\": 115885\n  },\n  {\n    \"tag\": "Maud",\n    \"popularity\": 115345\n  },\n  {\n    \"tag\": "scaphocephalism",\n    \"popularity\": 114809\n  },\n  {\n    \"tag\": "obtenebration",\n    \"popularity\": 114277\n  },\n  {\n    \"tag\": "cymar predreadnought",\n    \"popularity\": 113749\n  },\n  {\n    \"tag\": "discommend",\n    \"popularity\": 113225\n  },\n  {\n    \"tag\": "crude",\n    \"popularity\": 112704\n  },\n  {\n    \"tag\": "upflash",\n    \"popularity\": 112187\n  },\n  {\n    \"tag\": "saltimbank",\n    \"popularity\": 111674\n  },\n  {\n    \"tag\": "posthysterical",\n    \"popularity\": 111165\n  },\n  {\n    \"tag\": "trample",\n    \"popularity\": 110659\n  },\n  {\n    \"tag\": "ungirthed",\n    \"popularity\": 110157\n  },\n  {\n    \"tag\": "unshakable",\n    \"popularity\": 109658\n  },\n  {\n    \"tag\": "hepatocystic",\n    \"popularity\": 109163\n  },\n  {\n    \"tag\": "psammophyte",\n    \"popularity\": 108671\n  },\n  {\n    \"tag\": "millionfold",\n    \"popularity\": 108183\n  },\n  {\n    \"tag\": "outtaste",\n    \"popularity\": 107698\n  },\n  {\n    \"tag\": "poppycockish",\n    \"popularity\": 107217\n  },\n  {\n    \"tag\": "viduine",\n    \"popularity\": 106739\n  },\n  {\n    \"tag\": "pleasureman",\n    \"popularity\": 106264\n  },\n  {\n    \"tag\": "cholesterolemia",\n    \"popularity\": 105792\n  },\n  {\n    \"tag\": "hostlerwife",\n    \"popularity\": 105324\n  },\n  {\n    \"tag\": "figure undergrass",\n    \"popularity\": 104859\n  },\n  {\n    \"tag\": "bedrape",\n    \"popularity\": 104398\n  },\n  {\n    \"tag\": "nuttishness",\n    \"popularity\": 103939\n  },\n  {\n    \"tag\": "fow",\n    \"popularity\": 103484\n  },\n  {\n    \"tag\": "rachianesthesia",\n    \"popularity\": 103031\n  },\n  {\n    \"tag\": "recruitable",\n    \"popularity\": 102582\n  },\n  {\n    \"tag\": "semianatomical Oenotheraceae",\n    \"popularity\": 102136\n  },\n  {\n    \"tag\": "extracapsular",\n    \"popularity\": 101693\n  },\n  {\n    \"tag\": "unsigneted",\n    \"popularity\": 101253\n  },\n  {\n    \"tag\": "fissural",\n    \"popularity\": 100816\n  },\n  {\n    \"tag\": "ayous",\n    \"popularity\": 100381\n  },\n  {\n    \"tag\": "crestfallenness odontograph",\n    \"popularity\": 99950\n  },\n  {\n    \"tag\": "monopodium",\n    \"popularity\": 99522\n  },\n  {\n    \"tag\": "germfree",\n    \"popularity\": 99096\n  },\n  {\n    \"tag\": "dauphin",\n    \"popularity\": 98673\n  },\n  {\n    \"tag\": "nonagesimal",\n    \"popularity\": 98254\n  },\n  {\n    \"tag\": "waterchat",\n    \"popularity\": 97836\n  },\n  {\n    \"tag\": "Entelodon",\n    \"popularity\": 97422\n  },\n  {\n    \"tag\": "semischolastic",\n    \"popularity\": 97010\n  },\n  {\n    \"tag\": "somata",\n    \"popularity\": 96602\n  },\n  {\n    \"tag\": "expositorily",\n    \"popularity\": 96195\n  },\n  {\n    \"tag\": "bass",\n    \"popularity\": 95792\n  },\n  {\n    \"tag\": "calorimetry",\n    \"popularity\": 95391\n  },\n  {\n    \"tag\": "entireness",\n    \"popularity\": 94993\n  },\n  {\n    \"tag\": "ratline soppiness",\n    \"popularity\": 94597\n  },\n  {\n    \"tag\": "shor",\n    \"popularity\": 94204\n  },\n  {\n    \"tag\": "coprecipitation",\n    \"popularity\": 93813\n  },\n  {\n    \"tag\": "unblushingly",\n    \"popularity\": 93425\n  },\n  {\n    \"tag\": "macarize",\n    \"popularity\": 93040\n  },\n  {\n    \"tag\": "scruplesomeness",\n    \"popularity\": 92657\n  },\n  {\n    \"tag\": "offsaddle",\n    \"popularity\": 92276\n  },\n  {\n    \"tag\": "hypertragical",\n    \"popularity\": 91898\n  },\n  {\n    \"tag\": "uncassock loined",\n    \"popularity\": 91522\n  },\n  {\n    \"tag\": "interlobate",\n    \"popularity\": 91149\n  },\n  {\n    \"tag\": "releasor orrisroot stoloniferously",\n    \"popularity\": 90778\n  },\n  {\n    \"tag\": "elementoid",\n    \"popularity\": 90410\n  },\n  {\n    \"tag\": "Lentilla",\n    \"popularity\": 90043\n  },\n  {\n    \"tag\": "distressing",\n    \"popularity\": 89679\n  },\n  {\n    \"tag\": "hydrodrome",\n    \"popularity\": 89318\n  },\n  {\n    \"tag\": "Jeannette",\n    \"popularity\": 88958\n  },\n  {\n    \"tag\": "Kuli",\n    \"popularity\": 88601\n  },\n  {\n    \"tag\": "taxinomist",\n    \"popularity\": 88246\n  },\n  {\n    \"tag\": "southwestwardly",\n    \"popularity\": 87894\n  },\n  {\n    \"tag\": "polyparia",\n    \"popularity\": 87543\n  },\n  {\n    \"tag\": "exmeridian",\n    \"popularity\": 87195\n  },\n  {\n    \"tag\": "splenius regimentaled",\n    \"popularity\": 86849\n  },\n  {\n    \"tag\": "Sphaeropsidaceae",\n    \"popularity\": 86505\n  },\n  {\n    \"tag\": "unbegun",\n    \"popularity\": 86163\n  },\n  {\n    \"tag\": "something",\n    \"popularity\": 85823\n  },\n  {\n    \"tag\": "contaminable nonexpulsion",\n    \"popularity\": 85486\n  },\n  {\n    \"tag\": "douser",\n    \"popularity\": 85150\n  },\n  {\n    \"tag\": "prostrike",\n    \"popularity\": 84817\n  },\n  {\n    \"tag\": "worky",\n    \"popularity\": 84485\n  },\n  {\n    \"tag\": "folliful",\n    \"popularity\": 84156\n  },\n  {\n    \"tag\": "prioracy",\n    \"popularity\": 83828\n  },\n  {\n    \"tag\": "undermentioned",\n    \"popularity\": 83503\n  },\n  {\n    \"tag\": "Judaica",\n    \"popularity\": 83179\n  },\n  {\n    \"tag\": "multifarious",\n    \"popularity\": 82858\n  },\n  {\n    \"tag\": "poogye",\n    \"popularity\": 82538\n  },\n  {\n    \"tag\": "Sparganium",\n    \"popularity\": 82221\n  },\n  {\n    \"tag\": "thurrock",\n    \"popularity\": 81905\n  },\n  {\n    \"tag\": "outblush",\n    \"popularity\": 81591\n  },\n  {\n    \"tag\": "Strophanthus supraordination",\n    \"popularity\": 81279\n  },\n  {\n    \"tag\": "gingerroot",\n    \"popularity\": 80969\n  },\n  {\n    \"tag\": "unconscient",\n    \"popularity\": 80661\n  },\n  {\n    \"tag\": "unconstitutionally",\n    \"popularity\": 80354\n  },\n  {\n    \"tag\": "plaguily",\n    \"popularity\": 80050\n  },\n  {\n    \"tag\": "waterily equatorwards",\n    \"popularity\": 79747\n  },\n  {\n    \"tag\": "nondeposition",\n    \"popularity\": 79446\n  },\n  {\n    \"tag\": "dronishly",\n    \"popularity\": 79147\n  },\n  {\n    \"tag\": "gateado",\n    \"popularity\": 78849\n  },\n  {\n    \"tag\": "dislink",\n    \"popularity\": 78553\n  },\n  {\n    \"tag\": "Joceline",\n    \"popularity\": 78259\n  },\n  {\n    \"tag\": "amphiboliferous",\n    \"popularity\": 77967\n  },\n  {\n    \"tag\": "bushrope",\n    \"popularity\": 77676\n  },\n  {\n    \"tag\": "plumicorn sulphosalicylic",\n    \"popularity\": 77387\n  },\n  {\n    \"tag\": "nonefficiency",\n    \"popularity\": 77100\n  },\n  {\n    \"tag\": "hieroscopy",\n    \"popularity\": 76815\n  },\n  {\n    \"tag\": "causativeness",\n    \"popularity\": 76531\n  },\n  {\n    \"tag\": "swird paleoeremology",\n    \"popularity\": 76249\n  },\n  {\n    \"tag\": "camphoric",\n    \"popularity\": 75968\n  },\n  {\n    \"tag\": "retaining",\n    \"popularity\": 75689\n  },\n  {\n    \"tag\": "thyreoprotein",\n    \"popularity\": 75411\n  },\n  {\n    \"tag\": "carbona",\n    \"popularity\": 75136\n  },\n  {\n    \"tag\": "protectively",\n    \"popularity\": 74861\n  },\n  {\n    \"tag\": "mosasaur",\n    \"popularity\": 74589\n  },\n  {\n    \"tag\": "reciprocator",\n    \"popularity\": 74317\n  },\n  {\n    \"tag\": "detentive",\n    \"popularity\": 74048\n  },\n  {\n    \"tag\": "supravital",\n    \"popularity\": 73780\n  },\n  {\n    \"tag\": "Vespertilionidae",\n    \"popularity\": 73513\n  },\n  {\n    \"tag\": "parka",\n    \"popularity\": 73248\n  },\n  {\n    \"tag\": "pickaway",\n    \"popularity\": 72984\n  },\n  {\n    \"tag\": "oleaceous",\n    \"popularity\": 72722\n  },\n  {\n    \"tag\": "anticogitative",\n    \"popularity\": 72462\n  },\n  {\n    \"tag\": "woe",\n    \"popularity\": 72203\n  },\n  {\n    \"tag\": "skeuomorph",\n    \"popularity\": 71945\n  },\n  {\n    \"tag\": "helpmeet",\n    \"popularity\": 71689\n  },\n  {\n    \"tag\": "Hexactinellida brickmaking",\n    \"popularity\": 71434\n  },\n  {\n    \"tag\": "resink",\n    \"popularity\": 71180\n  },\n  {\n    \"tag\": "diluter",\n    \"popularity\": 70928\n  },\n  {\n    \"tag\": "micromicron",\n    \"popularity\": 70677\n  },\n  {\n    \"tag\": "parentage",\n    \"popularity\": 70428\n  },\n  {\n    \"tag\": "galactorrhoea",\n    \"popularity\": 70180\n  },\n  {\n    \"tag\": "gey",\n    \"popularity\": 69934\n  },\n  {\n    \"tag\": "gesticulatory",\n    \"popularity\": 69689\n  },\n  {\n    \"tag\": "wergil",\n    \"popularity\": 69445\n  },\n  {\n    \"tag\": "Lecanora",\n    \"popularity\": 69202\n  },\n  {\n    \"tag\": "malanders karst",\n    \"popularity\": 68961\n  },\n  {\n    \"tag\": "vibetoite",\n    \"popularity\": 68721\n  },\n  {\n    \"tag\": "unrequitedness",\n    \"popularity\": 68483\n  },\n  {\n    \"tag\": "outwash",\n    \"popularity\": 68245\n  },\n  {\n    \"tag\": "unsacred",\n    \"popularity\": 68009\n  },\n  {\n    \"tag\": "unabetted dividend",\n    \"popularity\": 67775\n  },\n  {\n    \"tag\": "untraveling",\n    \"popularity\": 67541\n  },\n  {\n    \"tag\": "thermobattery",\n    \"popularity\": 67309\n  },\n  {\n    \"tag\": "polypragmist",\n    \"popularity\": 67078\n  },\n  {\n    \"tag\": "irrefutableness",\n    \"popularity\": 66848\n  },\n  {\n    \"tag\": "remiges",\n    \"popularity\": 66620\n  },\n  {\n    \"tag\": "implode",\n    \"popularity\": 66393\n  },\n  {\n    \"tag\": "superfluousness",\n    \"popularity\": 66166\n  },\n  {\n    \"tag\": "croakily unalleviated",\n    \"popularity\": 65942\n  },\n  {\n    \"tag\": "edicule",\n    \"popularity\": 65718\n  },\n  {\n    \"tag\": "entophytous",\n    \"popularity\": 65495\n  },\n  {\n    \"tag\": "benefactorship Toryish",\n    \"popularity\": 65274\n  },\n  {\n    \"tag\": "pseudoamateurish",\n    \"popularity\": 65054\n  },\n  {\n    \"tag\": "flueless Iguanodontoidea snipnose",\n    \"popularity\": 64835\n  },\n  {\n    \"tag\": "zealotical Zamicrus interpole",\n    \"popularity\": 64617\n  },\n  {\n    \"tag\": "whereabout",\n    \"popularity\": 64401\n  },\n  {\n    \"tag\": "benzazide",\n    \"popularity\": 64185\n  },\n  {\n    \"tag\": "pokeweed",\n    \"popularity\": 63971\n  },\n  {\n    \"tag\": "calamitoid",\n    \"popularity\": 63757\n  },\n  {\n    \"tag\": "sporozoal",\n    \"popularity\": 63545\n  },\n  {\n    \"tag\": "physcioid Welshwoman",\n    \"popularity\": 63334\n  },\n  {\n    \"tag\": "wanting",\n    \"popularity\": 63124\n  },\n  {\n    \"tag\": "unencumbering",\n    \"popularity\": 62915\n  },\n  {\n    \"tag\": "Tupi",\n    \"popularity\": 62707\n  },\n  {\n    \"tag\": "potbank",\n    \"popularity\": 62501\n  },\n  {\n    \"tag\": "bulked",\n    \"popularity\": 62295\n  },\n  {\n    \"tag\": "uparise",\n    \"popularity\": 62090\n  },\n  {\n    \"tag\": "Sudra",\n    \"popularity\": 61887\n  },\n  {\n    \"tag\": "hyperscrupulosity",\n    \"popularity\": 61684\n  },\n  {\n    \"tag\": "subterraneously unmaid",\n    \"popularity\": 61483\n  },\n  {\n    \"tag\": "poisonousness",\n    \"popularity\": 61282\n  },\n  {\n    \"tag\": "phare",\n    \"popularity\": 61083\n  },\n  {\n    \"tag\": "dicynodont",\n    \"popularity\": 60884\n  },\n  {\n    \"tag\": "chewer",\n    \"popularity\": 60687\n  },\n  {\n    \"tag\": "uliginous",\n    \"popularity\": 60490\n  },\n  {\n    \"tag\": "tinman",\n    \"popularity\": 60295\n  },\n  {\n    \"tag\": "coconut",\n    \"popularity\": 60100\n  },\n  {\n    \"tag\": "phryganeoid",\n    \"popularity\": 59907\n  },\n  {\n    \"tag\": "bismillah",\n    \"popularity\": 59714\n  },\n  {\n    \"tag\": "tautomeric",\n    \"popularity\": 59523\n  },\n  {\n    \"tag\": "jerquer",\n    \"popularity\": 59332\n  },\n  {\n    \"tag\": "Dryopithecinae",\n    \"popularity\": 59143\n  },\n  {\n    \"tag\": "ghizite",\n    \"popularity\": 58954\n  },\n  {\n    \"tag\": "unliveable",\n    \"popularity\": 58766\n  },\n  {\n    \"tag\": "craftsmaster",\n    \"popularity\": 58579\n  },\n  {\n    \"tag\": "semiscenic",\n    \"popularity\": 58394\n  },\n  {\n    \"tag\": "danaid",\n    \"popularity\": 58209\n  },\n  {\n    \"tag\": "flawful",\n    \"popularity\": 58025\n  },\n  {\n    \"tag\": "risibleness",\n    \"popularity\": 57841\n  },\n  {\n    \"tag\": "Muscovite",\n    \"popularity\": 57659\n  },\n  {\n    \"tag\": "snaringly",\n    \"popularity\": 57478\n  },\n  {\n    \"tag\": "brilliantwise",\n    \"popularity\": 57297\n  },\n  {\n    \"tag\": "plebeity",\n    \"popularity\": 57118\n  },\n  {\n    \"tag\": "historicalness",\n    \"popularity\": 56939\n  },\n  {\n    \"tag\": "piecemeal",\n    \"popularity\": 56761\n  },\n  {\n    \"tag\": "maxillipedary",\n    \"popularity\": 56584\n  },\n  {\n    \"tag\": "Hypenantron",\n    \"popularity\": 56408\n  },\n  {\n    \"tag\": "quaintness avigate",\n    \"popularity\": 56233\n  },\n  {\n    \"tag\": "ave",\n    \"popularity\": 56059\n  },\n  {\n    \"tag\": "mediaevally",\n    \"popularity\": 55885\n  },\n  {\n    \"tag\": "brucite",\n    \"popularity\": 55712\n  },\n  {\n    \"tag\": "Schwendenerian",\n    \"popularity\": 55541\n  },\n  {\n    \"tag\": "julole",\n    \"popularity\": 55370\n  },\n  {\n    \"tag\": "palaeolith",\n    \"popularity\": 55199\n  },\n  {\n    \"tag\": "cotyledonary",\n    \"popularity\": 55030\n  },\n  {\n    \"tag\": "rond",\n    \"popularity\": 54861\n  },\n  {\n    \"tag\": "boomster tassoo",\n    \"popularity\": 54694\n  },\n  {\n    \"tag\": "cattishly",\n    \"popularity\": 54527\n  },\n  {\n    \"tag\": "tonguefence",\n    \"popularity\": 54360\n  },\n  {\n    \"tag\": "hexastylar triskele",\n    \"popularity\": 54195\n  },\n  {\n    \"tag\": "ariot",\n    \"popularity\": 54030\n  },\n  {\n    \"tag\": "intarsist",\n    \"popularity\": 53867\n  },\n  {\n    \"tag\": "Oscines",\n    \"popularity\": 53704\n  },\n  {\n    \"tag\": "Spaniolize",\n    \"popularity\": 53541\n  },\n  {\n    \"tag\": "smellfungus",\n    \"popularity\": 53380\n  },\n  {\n    \"tag\": "redisplay",\n    \"popularity\": 53219\n  },\n  {\n    \"tag\": "phosphene",\n    \"popularity\": 53059\n  },\n  {\n    \"tag\": "phycomycete",\n    \"popularity\": 52900\n  },\n  {\n    \"tag\": "prophetic",\n    \"popularity\": 52741\n  },\n  {\n    \"tag\": "overtrustful",\n    \"popularity\": 52584\n  },\n  {\n    \"tag\": "pinitol",\n    \"popularity\": 52427\n  },\n  {\n    \"tag\": "asthmatic",\n    \"popularity\": 52270\n  },\n  {\n    \"tag\": "convulsive",\n    \"popularity\": 52115\n  },\n  {\n    \"tag\": "draughtswoman",\n    \"popularity\": 51960\n  },\n  {\n    \"tag\": "unetymologizable",\n    \"popularity\": 51806\n  },\n  {\n    \"tag\": "centrarchoid",\n    \"popularity\": 51652\n  },\n  {\n    \"tag\": "mesioincisal",\n    \"popularity\": 51500\n  },\n  {\n    \"tag\": "transbaikal",\n    \"popularity\": 51348\n  },\n  {\n    \"tag\": "silveriness",\n    \"popularity\": 51196\n  },\n  {\n    \"tag\": "costotomy",\n    \"popularity\": 51046\n  },\n  {\n    \"tag\": "caracore",\n    \"popularity\": 50896\n  },\n  {\n    \"tag\": "depotentiation",\n    \"popularity\": 50747\n  },\n  {\n    \"tag\": "glossoepiglottidean",\n    \"popularity\": 50598\n  },\n  {\n    \"tag\": "upswell",\n    \"popularity\": 50450\n  },\n  {\n    \"tag\": "flecnodal",\n    \"popularity\": 50303\n  },\n  {\n    \"tag\": "coventrate",\n    \"popularity\": 50157\n  },\n  {\n    \"tag\": "duchesse",\n    \"popularity\": 50011\n  },\n  {\n    \"tag\": "excisemanship trophied",\n    \"popularity\": 49866\n  },\n  {\n    \"tag\": "cytinaceous",\n    \"popularity\": 49721\n  },\n  {\n    \"tag\": "assuringly",\n    \"popularity\": 49577\n  },\n  {\n    \"tag\": "unconducted upliftitis",\n    \"popularity\": 49434\n  },\n  {\n    \"tag\": "rachicentesis",\n    \"popularity\": 49292\n  },\n  {\n    \"tag\": "antiangular",\n    \"popularity\": 49150\n  },\n  {\n    \"tag\": "advisal",\n    \"popularity\": 49008\n  },\n  {\n    \"tag\": "birdcatcher",\n    \"popularity\": 48868\n  },\n  {\n    \"tag\": "secularistic",\n    \"popularity\": 48728\n  },\n  {\n    \"tag\": "grandeeism superinformal",\n    \"popularity\": 48588\n  },\n  {\n    \"tag\": "unapprehension",\n    \"popularity\": 48449\n  },\n  {\n    \"tag\": "excipulum",\n    \"popularity\": 48311\n  },\n  {\n    \"tag\": "decimole",\n    \"popularity\": 48174\n  },\n  {\n    \"tag\": "semidrachm",\n    \"popularity\": 48037\n  },\n  {\n    \"tag\": "uvulotome",\n    \"popularity\": 47901\n  },\n  {\n    \"tag\": "Lemaneaceae",\n    \"popularity\": 47765\n  },\n  {\n    \"tag\": "corrade",\n    \"popularity\": 47630\n  },\n  {\n    \"tag\": "Kuroshio",\n    \"popularity\": 47495\n  },\n  {\n    \"tag\": "Araliophyllum",\n    \"popularity\": 47361\n  },\n  {\n    \"tag\": "victoriousness cardiosphygmograph",\n    \"popularity\": 47228\n  },\n  {\n    \"tag\": "reinvent",\n    \"popularity\": 47095\n  },\n  {\n    \"tag\": "Macrotolagus",\n    \"popularity\": 46963\n  },\n  {\n    \"tag\": "strenuousness",\n    \"popularity\": 46831\n  },\n  {\n    \"tag\": "deviability",\n    \"popularity\": 46700\n  },\n  {\n    \"tag\": "phyllospondylous",\n    \"popularity\": 46570\n  },\n  {\n    \"tag\": "bisect rudderhole",\n    \"popularity\": 46440\n  },\n  {\n    \"tag\": "crownwork",\n    \"popularity\": 46311\n  },\n  {\n    \"tag\": "Ascalabota",\n    \"popularity\": 46182\n  },\n  {\n    \"tag\": "prostatomyomectomy",\n    \"popularity\": 46054\n  },\n  {\n    \"tag\": "neurosyphilis",\n    \"popularity\": 45926\n  },\n  {\n    \"tag\": "tabloid scraplet",\n    \"popularity\": 45799\n  },\n  {\n    \"tag\": "nonmedullated servility",\n    \"popularity\": 45673\n  },\n  {\n    \"tag\": "melopoeic practicalization",\n    \"popularity\": 45547\n  },\n  {\n    \"tag\": "nonrhythmic",\n    \"popularity\": 45421\n  },\n  {\n    \"tag\": "deplorer",\n    \"popularity\": 45296\n  },\n  {\n    \"tag\": "Ophion",\n    \"popularity\": 45172\n  },\n  {\n    \"tag\": "subprioress",\n    \"popularity\": 45048\n  },\n  {\n    \"tag\": "semiregular",\n    \"popularity\": 44925\n  },\n  {\n    \"tag\": "praelection",\n    \"popularity\": 44802\n  },\n  {\n    \"tag\": "discinct",\n    \"popularity\": 44680\n  },\n  {\n    \"tag\": "preplace",\n    \"popularity\": 44558\n  },\n  {\n    \"tag\": "paternoster",\n    \"popularity\": 44437\n  },\n  {\n    \"tag\": "suboccipital",\n    \"popularity\": 44316\n  },\n  {\n    \"tag\": "Teutophil",\n    \"popularity\": 44196\n  },\n  {\n    \"tag\": "tracheole",\n    \"popularity\": 44076\n  },\n  {\n    \"tag\": "subsmile",\n    \"popularity\": 43957\n  },\n  {\n    \"tag\": "nonapostatizing",\n    \"popularity\": 43839\n  },\n  {\n    \"tag\": "cleidotomy",\n    \"popularity\": 43720\n  },\n  {\n    \"tag\": "hingle",\n    \"popularity\": 43603\n  },\n  {\n    \"tag\": "jocoque",\n    \"popularity\": 43486\n  },\n  {\n    \"tag\": "trundler notidanian",\n    \"popularity\": 43369\n  },\n  {\n    \"tag\": "strangling misdaub",\n    \"popularity\": 43253\n  },\n  {\n    \"tag\": "noncancellable",\n    \"popularity\": 43137\n  },\n  {\n    \"tag\": "lavabo",\n    \"popularity\": 43022\n  },\n  {\n    \"tag\": "lanterloo",\n    \"popularity\": 42907\n  },\n  {\n    \"tag\": "uncitizenly",\n    \"popularity\": 42793\n  },\n  {\n    \"tag\": "autoturning",\n    \"popularity\": 42679\n  },\n  {\n    \"tag\": "Haganah",\n    \"popularity\": 42566\n  },\n  {\n    \"tag\": "Glecoma",\n    \"popularity\": 42453\n  },\n  {\n    \"tag\": "membered",\n    \"popularity\": 42341\n  },\n  {\n    \"tag\": "consuetudinal",\n    \"popularity\": 42229\n  },\n  {\n    \"tag\": "gatehouse",\n    \"popularity\": 42117\n  },\n  {\n    \"tag\": "tetherball",\n    \"popularity\": 42006\n  },\n  {\n    \"tag\": "counterrevolutionist numismatical",\n    \"popularity\": 41896\n  },\n  {\n    \"tag\": "pagehood plateiasmus",\n    \"popularity\": 41786\n  },\n  {\n    \"tag\": "pelterer",\n    \"popularity\": 41676\n  },\n  {\n    \"tag\": "splenemphraxis",\n    \"popularity\": 41567\n  },\n  {\n    \"tag\": "Crypturidae",\n    \"popularity\": 41458\n  },\n  {\n    \"tag\": "caboodle",\n    \"popularity\": 41350\n  },\n  {\n    \"tag\": "Filaria",\n    \"popularity\": 41242\n  },\n  {\n    \"tag\": "noninvincibility",\n    \"popularity\": 41135\n  },\n  {\n    \"tag\": "preadvertisement",\n    \"popularity\": 41028\n  },\n  {\n    \"tag\": "bathrobe",\n    \"popularity\": 40921\n  },\n  {\n    \"tag\": "nitrifier",\n    \"popularity\": 40815\n  },\n  {\n    \"tag\": "furthermore",\n    \"popularity\": 40709\n  },\n  {\n    \"tag\": "recrate",\n    \"popularity\": 40604\n  },\n  {\n    \"tag\": "inexist",\n    \"popularity\": 40499\n  },\n  {\n    \"tag\": "Mocoan",\n    \"popularity\": 40395\n  },\n  {\n    \"tag\": "forint",\n    \"popularity\": 40291\n  },\n  {\n    \"tag\": "cardiomyoliposis",\n    \"popularity\": 40187\n  },\n  {\n    \"tag\": "channeling",\n    \"popularity\": 40084\n  },\n  {\n    \"tag\": "quebrachine",\n    \"popularity\": 39981\n  },\n  {\n    \"tag\": "magistery",\n    \"popularity\": 39879\n  },\n  {\n    \"tag\": "koko",\n    \"popularity\": 39777\n  },\n  {\n    \"tag\": "nobilify",\n    \"popularity\": 39676\n  },\n  {\n    \"tag\": "articulate taprooted",\n    \"popularity\": 39575\n  },\n  {\n    \"tag\": "cardiotonic Nicaragua",\n    \"popularity\": 39474\n  },\n  {\n    \"tag\": "assertiveness",\n    \"popularity\": 39374\n  },\n  {\n    \"tag\": "springtail",\n    \"popularity\": 39274\n  },\n  {\n    \"tag\": "spontoon",\n    \"popularity\": 39174\n  },\n  {\n    \"tag\": "plesiobiosis",\n    \"popularity\": 39075\n  },\n  {\n    \"tag\": "rooinek",\n    \"popularity\": 38976\n  },\n  {\n    \"tag\": "hairif falsehood",\n    \"popularity\": 38878\n  },\n  {\n    \"tag\": "synodally",\n    \"popularity\": 38780\n  },\n  {\n    \"tag\": "biodynamics",\n    \"popularity\": 38683\n  },\n  {\n    \"tag\": "trickling",\n    \"popularity\": 38585\n  },\n  {\n    \"tag\": "oxfly daystar",\n    \"popularity\": 38489\n  },\n  {\n    \"tag\": "epicycloidal",\n    \"popularity\": 38392\n  },\n  {\n    \"tag\": "shorthand",\n    \"popularity\": 38296\n  },\n  {\n    \"tag\": "herpolhode",\n    \"popularity\": 38201\n  },\n  {\n    \"tag\": "polysynthesism",\n    \"popularity\": 38105\n  },\n  {\n    \"tag\": "cany",\n    \"popularity\": 38010\n  },\n  {\n    \"tag\": "sideage",\n    \"popularity\": 37916\n  },\n  {\n    \"tag\": "strainableness",\n    \"popularity\": 37822\n  },\n  {\n    \"tag\": "superformidable",\n    \"popularity\": 37728\n  },\n  {\n    \"tag\": "slendang",\n    \"popularity\": 37634\n  },\n  {\n    \"tag\": "impropriation",\n    \"popularity\": 37541\n  },\n  {\n    \"tag\": "ficklehearted",\n    \"popularity\": 37449\n  },\n  {\n    \"tag\": "wintrify",\n    \"popularity\": 37356\n  },\n  {\n    \"tag\": "geomorphogenist",\n    \"popularity\": 37264\n  },\n  {\n    \"tag\": "smuggleable",\n    \"popularity\": 37173\n  },\n  {\n    \"tag\": "delapsion",\n    \"popularity\": 37081\n  },\n  {\n    \"tag\": "projective",\n    \"popularity\": 36990\n  },\n  {\n    \"tag\": "unglue exfoliation",\n    \"popularity\": 36900\n  },\n  {\n    \"tag\": "Acerae",\n    \"popularity\": 36810\n  },\n  {\n    \"tag\": "unstaged",\n    \"popularity\": 36720\n  },\n  {\n    \"tag\": "ranal",\n    \"popularity\": 36630\n  },\n  {\n    \"tag\": "worrier",\n    \"popularity\": 36541\n  },\n  {\n    \"tag\": "unhid",\n    \"popularity\": 36452\n  },\n  {\n    \"tag\": "adequation",\n    \"popularity\": 36363\n  },\n  {\n    \"tag\": "strongylid Sokotri",\n    \"popularity\": 36275\n  },\n  {\n    \"tag\": "fumingly",\n    \"popularity\": 36187\n  },\n  {\n    \"tag\": "gynosporangium phaenogenetic",\n    \"popularity\": 36100\n  },\n  {\n    \"tag\": "uniunguiculate",\n    \"popularity\": 36012\n  },\n  {\n    \"tag\": "prudelike",\n    \"popularity\": 35926\n  },\n  {\n    \"tag\": "seminomata",\n    \"popularity\": 35839\n  },\n  {\n    \"tag\": "trinklet",\n    \"popularity\": 35753\n  },\n  {\n    \"tag\": "risorial",\n    \"popularity\": 35667\n  },\n  {\n    \"tag\": "pericardiocentesis",\n    \"popularity\": 35581\n  },\n  {\n    \"tag\": "filmist",\n    \"popularity\": 35496\n  },\n  {\n    \"tag\": "Nana",\n    \"popularity\": 35411\n  },\n  {\n    \"tag\": "cynipoid",\n    \"popularity\": 35326\n  },\n  {\n    \"tag\": "cteniform",\n    \"popularity\": 35242\n  },\n  {\n    \"tag\": "semiflex",\n    \"popularity\": 35158\n  },\n  {\n    \"tag\": "solstitially",\n    \"popularity\": 35074\n  },\n  {\n    \"tag\": "Algarsife",\n    \"popularity\": 34991\n  },\n  {\n    \"tag\": "noncriminal",\n    \"popularity\": 34908\n  },\n  {\n    \"tag\": "compassion",\n    \"popularity\": 34825\n  },\n  {\n    \"tag\": "Buddhic",\n    \"popularity\": 34743\n  },\n  {\n    \"tag\": "vellicative dactylically hotfoot",\n    \"popularity\": 34661\n  },\n  {\n    \"tag\": "chicory",\n    \"popularity\": 34579\n  },\n  {\n    \"tag\": "transperitoneally",\n    \"popularity\": 34497\n  },\n  {\n    \"tag\": "pennae",\n    \"popularity\": 34416\n  },\n  {\n    \"tag\": "Flamandize",\n    \"popularity\": 34335\n  },\n  {\n    \"tag\": "underviewer",\n    \"popularity\": 34254\n  },\n  {\n    \"tag\": "assoil",\n    \"popularity\": 34174\n  },\n  {\n    \"tag\": "saccharobacillus",\n    \"popularity\": 34094\n  },\n  {\n    \"tag\": "biacetylene",\n    \"popularity\": 34014\n  },\n  {\n    \"tag\": "mouchardism",\n    \"popularity\": 33935\n  },\n  {\n    \"tag\": "anisomeric",\n    \"popularity\": 33856\n  },\n  {\n    \"tag\": "digestive",\n    \"popularity\": 33777\n  },\n  {\n    \"tag\": "darlingly",\n    \"popularity\": 33698\n  },\n  {\n    \"tag\": "liman",\n    \"popularity\": 33620\n  },\n  {\n    \"tag\": "soldanrie",\n    \"popularity\": 33542\n  },\n  {\n    \"tag\": "sully",\n    \"popularity\": 33464\n  },\n  {\n    \"tag\": "brightsmith",\n    \"popularity\": 33387\n  },\n  {\n    \"tag\": "inwrap antiliturgist ureterocervical",\n    \"popularity\": 33309\n  },\n  {\n    \"tag\": "discommodity",\n    \"popularity\": 33232\n  },\n  {\n    \"tag\": "typical aggrandizer",\n    \"popularity\": 33156\n  },\n  {\n    \"tag\": "xenogeny",\n    \"popularity\": 33079\n  },\n  {\n    \"tag\": "uncountrified",\n    \"popularity\": 33003\n  },\n  {\n    \"tag\": "Podarge",\n    \"popularity\": 32928\n  },\n  {\n    \"tag\": "uninterviewed",\n    \"popularity\": 32852\n  },\n  {\n    \"tag\": "underprior",\n    \"popularity\": 32777\n  },\n  {\n    \"tag\": "leiomyomatous",\n    \"popularity\": 32702\n  },\n  {\n    \"tag\": "postdysenteric",\n    \"popularity\": 32627\n  },\n  {\n    \"tag\": "Fusicladium",\n    \"popularity\": 32553\n  },\n  {\n    \"tag\": "Dulcinea",\n    \"popularity\": 32478\n  },\n  {\n    \"tag\": "interspersion",\n    \"popularity\": 32404\n  },\n  {\n    \"tag\": "preobligate",\n    \"popularity\": 32331\n  },\n  {\n    \"tag\": "subaggregate",\n    \"popularity\": 32257\n  },\n  {\n    \"tag\": "grammarianism",\n    \"popularity\": 32184\n  },\n  {\n    \"tag\": "palikar",\n    \"popularity\": 32111\n  },\n  {\n    \"tag\": "facileness",\n    \"popularity\": 32039\n  },\n  {\n    \"tag\": "deuterofibrinose",\n    \"popularity\": 31966\n  },\n  {\n    \"tag\": "pseudesthesia",\n    \"popularity\": 31894\n  },\n  {\n    \"tag\": "sedimentary",\n    \"popularity\": 31822\n  },\n  {\n    \"tag\": "typewrite",\n    \"popularity\": 31751\n  },\n  {\n    \"tag\": "immemorable",\n    \"popularity\": 31679\n  },\n  {\n    \"tag\": "Myrtus",\n    \"popularity\": 31608\n  },\n  {\n    \"tag\": "hauchecornite",\n    \"popularity\": 31537\n  },\n  {\n    \"tag\": "galleylike",\n    \"popularity\": 31467\n  },\n  {\n    \"tag\": "thimber",\n    \"popularity\": 31396\n  },\n  {\n    \"tag\": "Hegelianism",\n    \"popularity\": 31326\n  },\n  {\n    \"tag\": "strig",\n    \"popularity\": 31256\n  },\n  {\n    \"tag\": "skyre",\n    \"popularity\": 31187\n  },\n  {\n    \"tag\": "eupepticism",\n    \"popularity\": 31117\n  },\n  {\n    \"tag\": "eponymism",\n    \"popularity\": 31048\n  },\n  {\n    \"tag\": "flunkeyhood",\n    \"popularity\": 30979\n  },\n  {\n    \"tag\": "Abama",\n    \"popularity\": 30911\n  },\n  {\n    \"tag\": "adiadochokinesis",\n    \"popularity\": 30842\n  },\n  {\n    \"tag\": "spendthrifty",\n    \"popularity\": 30774\n  },\n  {\n    \"tag\": "chalcedony",\n    \"popularity\": 30706\n  },\n  {\n    \"tag\": "authorism",\n    \"popularity\": 30638\n  },\n  {\n    \"tag\": "nasturtium",\n    \"popularity\": 30571\n  },\n  {\n    \"tag\": "Acanthocereus",\n    \"popularity\": 30504\n  },\n  {\n    \"tag\": "uncollapsible",\n    \"popularity\": 30437\n  },\n  {\n    \"tag\": "excursionist",\n    \"popularity\": 30370\n  },\n  {\n    \"tag\": "fogbow",\n    \"popularity\": 30303\n  },\n  {\n    \"tag\": "overlie",\n    \"popularity\": 30237\n  },\n  {\n    \"tag\": "velours",\n    \"popularity\": 30171\n  },\n  {\n    \"tag\": "zoodendria madrigal stagbush",\n    \"popularity\": 30105\n  },\n  {\n    \"tag\": "imi",\n    \"popularity\": 30039\n  },\n  {\n    \"tag\": "cojudge",\n    \"popularity\": 29974\n  },\n  {\n    \"tag\": "depurate argal",\n    \"popularity\": 29909\n  },\n  {\n    \"tag\": "unrecognition",\n    \"popularity\": 29844\n  },\n  {\n    \"tag\": "paunchful",\n    \"popularity\": 29779\n  },\n  {\n    \"tag\": "invalued",\n    \"popularity\": 29714\n  },\n  {\n    \"tag\": "probang",\n    \"popularity\": 29650\n  },\n  {\n    \"tag\": "chetvert",\n    \"popularity\": 29586\n  },\n  {\n    \"tag\": "enactable",\n    \"popularity\": 29522\n  },\n  {\n    \"tag\": "detoxicate adhibit",\n    \"popularity\": 29458\n  },\n  {\n    \"tag\": "kullaite",\n    \"popularity\": 29395\n  },\n  {\n    \"tag\": "undazzling",\n    \"popularity\": 29332\n  },\n  {\n    \"tag\": "excalation",\n    \"popularity\": 29269\n  },\n  {\n    \"tag\": "sievings",\n    \"popularity\": 29206\n  },\n  {\n    \"tag\": "disenthral",\n    \"popularity\": 29143\n  },\n  {\n    \"tag\": "disinterestedly",\n    \"popularity\": 29081\n  },\n  {\n    \"tag\": "stanner",\n    \"popularity\": 29018\n  },\n  {\n    \"tag\": "recapitulative",\n    \"popularity\": 28956\n  },\n  {\n    \"tag\": "objectivist",\n    \"popularity\": 28895\n  },\n  {\n    \"tag\": "hypermetropia",\n    \"popularity\": 28833\n  },\n  {\n    \"tag\": "incumbency",\n    \"popularity\": 28772\n  },\n  {\n    \"tag\": "protegee",\n    \"popularity\": 28711\n  },\n  {\n    \"tag\": "zealotic",\n    \"popularity\": 28650\n  },\n  {\n    \"tag\": "predebit",\n    \"popularity\": 28589\n  },\n  {\n    \"tag\": "cupolar",\n    \"popularity\": 28528\n  },\n  {\n    \"tag\": "unattributed",\n    \"popularity\": 28468\n  },\n  {\n    \"tag\": "louisine",\n    \"popularity\": 28408\n  },\n  {\n    \"tag\": "illustrate",\n    \"popularity\": 28348\n  },\n  {\n    \"tag\": "inofficiousness",\n    \"popularity\": 28288\n  },\n  {\n    \"tag\": "Americawards",\n    \"popularity\": 28228\n  },\n  {\n    \"tag\": "foreflap",\n    \"popularity\": 28169\n  },\n  {\n    \"tag\": "eruditeness",\n    \"popularity\": 28110\n  },\n  {\n    \"tag\": "copiopsia",\n    \"popularity\": 28051\n  },\n  {\n    \"tag\": "sporuliferous",\n    \"popularity\": 27992\n  },\n  {\n    \"tag\": "muttering",\n    \"popularity\": 27934\n  },\n  {\n    \"tag\": "prepsychology adrip",\n    \"popularity\": 27875\n  },\n  {\n    \"tag\": "unfriendly",\n    \"popularity\": 27817\n  },\n  {\n    \"tag\": "sulphanilic",\n    \"popularity\": 27759\n  },\n  {\n    \"tag\": "Coelococcus",\n    \"popularity\": 27701\n  },\n  {\n    \"tag\": "undoubtfulness",\n    \"popularity\": 27643\n  },\n  {\n    \"tag\": "flaringly",\n    \"popularity\": 27586\n  },\n  {\n    \"tag\": "unordain",\n    \"popularity\": 27529\n  },\n  {\n    \"tag\": "fratchety",\n    \"popularity\": 27472\n  },\n  {\n    \"tag\": "decadentism dolefully",\n    \"popularity\": 27415\n  },\n  {\n    \"tag\": "synthronus",\n    \"popularity\": 27358\n  },\n  {\n    \"tag\": "maiid",\n    \"popularity\": 27301\n  },\n  {\n    \"tag\": "rhinobyon",\n    \"popularity\": 27245\n  },\n  {\n    \"tag\": "Didynamia",\n    \"popularity\": 27189\n  },\n  {\n    \"tag\": "millionairedom",\n    \"popularity\": 27133\n  },\n  {\n    \"tag\": "mulierine",\n    \"popularity\": 27077\n  },\n  {\n    \"tag\": "Mayo",\n    \"popularity\": 27021\n  },\n  {\n    \"tag\": "perceivedness",\n    \"popularity\": 26966\n  },\n  {\n    \"tag\": "unadoration",\n    \"popularity\": 26911\n  },\n  {\n    \"tag\": "regraft",\n    \"popularity\": 26856\n  },\n  {\n    \"tag\": "witch",\n    \"popularity\": 26801\n  },\n  {\n    \"tag\": "ungrow",\n    \"popularity\": 26746\n  },\n  {\n    \"tag\": "glossopharyngeus",\n    \"popularity\": 26691\n  },\n  {\n    \"tag\": "unstirrable",\n    \"popularity\": 26637\n  },\n  {\n    \"tag\": "synodsman",\n    \"popularity\": 26583\n  },\n  {\n    \"tag\": "placentalian",\n    \"popularity\": 26529\n  },\n  {\n    \"tag\": "corpulently",\n    \"popularity\": 26475\n  },\n  {\n    \"tag\": "photochromoscope",\n    \"popularity\": 26421\n  },\n  {\n    \"tag\": "indusiate retinasphaltum chokestrap",\n    \"popularity\": 26368\n  },\n  {\n    \"tag\": "murdrum",\n    \"popularity\": 26314\n  },\n  {\n    \"tag\": "belatedness",\n    \"popularity\": 26261\n  },\n  {\n    \"tag\": "Cochin",\n    \"popularity\": 26208\n  },\n  {\n    \"tag\": "Leonist",\n    \"popularity\": 26155\n  },\n  {\n    \"tag\": "keeker confined",\n    \"popularity\": 26102\n  },\n  {\n    \"tag\": "unintellectual",\n    \"popularity\": 26050\n  },\n  {\n    \"tag\": "nymphaline bait",\n    \"popularity\": 25997\n  },\n  {\n    \"tag\": "sarcosporidiosis",\n    \"popularity\": 25945\n  },\n  {\n    \"tag\": "catawamptiously",\n    \"popularity\": 25893\n  },\n  {\n    \"tag\": "outshame",\n    \"popularity\": 25841\n  },\n  {\n    \"tag\": "animalism",\n    \"popularity\": 25790\n  },\n  {\n    \"tag\": "epithalamial",\n    \"popularity\": 25738\n  },\n  {\n    \"tag\": "ganner",\n    \"popularity\": 25687\n  },\n  {\n    \"tag\": "desilicify",\n    \"popularity\": 25635\n  },\n  {\n    \"tag\": "dandyism",\n    \"popularity\": 25584\n  },\n  {\n    \"tag\": "hyleg",\n    \"popularity\": 25533\n  },\n  {\n    \"tag\": "photophysical",\n    \"popularity\": 25483\n  },\n  {\n    \"tag\": "underload",\n    \"popularity\": 25432\n  },\n  {\n    \"tag\": "unintrusive",\n    \"popularity\": 25382\n  },\n  {\n    \"tag\": "succinamic",\n    \"popularity\": 25331\n  },\n  {\n    \"tag\": "matchy",\n    \"popularity\": 25281\n  },\n  {\n    \"tag\": "concordal",\n    \"popularity\": 25231\n  },\n  {\n    \"tag\": "exteriority",\n    \"popularity\": 25181\n  },\n  {\n    \"tag\": "sterculiad",\n    \"popularity\": 25132\n  },\n  {\n    \"tag\": "sulfoxylic",\n    \"popularity\": 25082\n  },\n  {\n    \"tag\": "oversubscription",\n    \"popularity\": 25033\n  },\n  {\n    \"tag\": "chiasmic",\n    \"popularity\": 24984\n  },\n  {\n    \"tag\": "pseudoparthenogenesis",\n    \"popularity\": 24935\n  },\n  {\n    \"tag\": "indorse",\n    \"popularity\": 24886\n  },\n  {\n    \"tag\": "Krishnaite",\n    \"popularity\": 24837\n  },\n  {\n    \"tag\": "calcinize",\n    \"popularity\": 24788\n  },\n  {\n    \"tag\": "rhodium",\n    \"popularity\": 24740\n  },\n  {\n    \"tag\": "tragopan",\n    \"popularity\": 24692\n  },\n  {\n    \"tag\": "overwhelmingly",\n    \"popularity\": 24643\n  },\n  {\n    \"tag\": "procidence accorporate",\n    \"popularity\": 24595\n  },\n  {\n    \"tag\": "polemize speelless",\n    \"popularity\": 24548\n  },\n  {\n    \"tag\": "radiocarpal goran",\n    \"popularity\": 24500\n  },\n  {\n    \"tag\": "counteroffer Pelodytes",\n    \"popularity\": 24452\n  },\n  {\n    \"tag\": "lionhearted",\n    \"popularity\": 24405\n  },\n  {\n    \"tag\": "paramastoid",\n    \"popularity\": 24358\n  },\n  {\n    \"tag\": "murine",\n    \"popularity\": 24310\n  },\n  {\n    \"tag\": "woodbined",\n    \"popularity\": 24263\n  },\n  {\n    \"tag\": "packthread",\n    \"popularity\": 24217\n  },\n  {\n    \"tag\": "citreous",\n    \"popularity\": 24170\n  },\n  {\n    \"tag\": "unfallaciously",\n    \"popularity\": 24123\n  },\n  {\n    \"tag\": "tentwork reincarnadine",\n    \"popularity\": 24077\n  },\n  {\n    \"tag\": "verminousness",\n    \"popularity\": 24030\n  },\n  {\n    \"tag\": "sillometer",\n    \"popularity\": 23984\n  },\n  {\n    \"tag\": "jointy",\n    \"popularity\": 23938\n  },\n  {\n    \"tag\": "streptolysin",\n    \"popularity\": 23892\n  },\n  {\n    \"tag\": "Florentinism",\n    \"popularity\": 23847\n  },\n  {\n    \"tag\": "monosomatous",\n    \"popularity\": 23801\n  },\n  {\n    \"tag\": "capsulociliary",\n    \"popularity\": 23756\n  },\n  {\n    \"tag\": "organum",\n    \"popularity\": 23710\n  },\n  {\n    \"tag\": "overtly",\n    \"popularity\": 23665\n  },\n  {\n    \"tag\": "ophthalmoscopical",\n    \"popularity\": 23620\n  },\n  {\n    \"tag\": "supposititiously",\n    \"popularity\": 23575\n  },\n  {\n    \"tag\": "radiochemistry",\n    \"popularity\": 23530\n  },\n  {\n    \"tag\": "flaxtail",\n    \"popularity\": 23486\n  },\n  {\n    \"tag\": "pretympanic",\n    \"popularity\": 23441\n  },\n  {\n    \"tag\": "auscultation",\n    \"popularity\": 23397\n  },\n  {\n    \"tag\": "hairdresser",\n    \"popularity\": 23352\n  },\n  {\n    \"tag\": "chaffless",\n    \"popularity\": 23308\n  },\n  {\n    \"tag\": "polioencephalitis",\n    \"popularity\": 23264\n  },\n  {\n    \"tag\": "axolotl",\n    \"popularity\": 23220\n  },\n  {\n    \"tag\": "smous",\n    \"popularity\": 23177\n  },\n  {\n    \"tag\": "morgen disenamour toothed",\n    \"popularity\": 23133\n  },\n  {\n    \"tag\": "chaiseless",\n    \"popularity\": 23089\n  },\n  {\n    \"tag\": "frugally",\n    \"popularity\": 23046\n  },\n  {\n    \"tag\": "combustive antievolutionist cinenegative",\n    \"popularity\": 23003\n  },\n  {\n    \"tag\": "malacolite",\n    \"popularity\": 22960\n  },\n  {\n    \"tag\": "borne",\n    \"popularity\": 22917\n  },\n  {\n    \"tag\": "mercaptole",\n    \"popularity\": 22874\n  },\n  {\n    \"tag\": "judicatory",\n    \"popularity\": 22831\n  },\n  {\n    \"tag\": "noctivagation",\n    \"popularity\": 22789\n  },\n  {\n    \"tag\": "synthete",\n    \"popularity\": 22746\n  },\n  {\n    \"tag\": "tomboyism",\n    \"popularity\": 22704\n  },\n  {\n    \"tag\": "serranoid",\n    \"popularity\": 22661\n  },\n  {\n    \"tag\": "impostorism",\n    \"popularity\": 22619\n  },\n  {\n    \"tag\": "flagellosis Talitha",\n    \"popularity\": 22577\n  },\n  {\n    \"tag\": "pseudoviscous",\n    \"popularity\": 22535\n  },\n  {\n    \"tag\": "Galleriidae",\n    \"popularity\": 22494\n  },\n  {\n    \"tag\": "undulation didelph Comintern",\n    \"popularity\": 22452\n  },\n  {\n    \"tag\": "triangulopyramidal",\n    \"popularity\": 22411\n  },\n  {\n    \"tag\": "middlings",\n    \"popularity\": 22369\n  },\n  {\n    \"tag\": "piperazin",\n    \"popularity\": 22328\n  },\n  {\n    \"tag\": "endostitis",\n    \"popularity\": 22287\n  },\n  {\n    \"tag\": "swordlike",\n    \"popularity\": 22246\n  },\n  {\n    \"tag\": "forthwith",\n    \"popularity\": 22205\n  },\n  {\n    \"tag\": "menaceful",\n    \"popularity\": 22164\n  },\n  {\n    \"tag\": "explantation defective",\n    \"popularity\": 22123\n  },\n  {\n    \"tag\": "arrear",\n    \"popularity\": 22083\n  },\n  {\n    \"tag\": "engraft",\n    \"popularity\": 22042\n  },\n  {\n    \"tag\": "revolunteer",\n    \"popularity\": 22002\n  },\n  {\n    \"tag\": "foliaceous",\n    \"popularity\": 21962\n  },\n  {\n    \"tag\": "pseudograph",\n    \"popularity\": 21922\n  },\n  {\n    \"tag\": "maenaite",\n    \"popularity\": 21882\n  },\n  {\n    \"tag\": "interfinger",\n    \"popularity\": 21842\n  },\n  {\n    \"tag\": "macroscopically",\n    \"popularity\": 21802\n  },\n  {\n    \"tag\": "bluewood",\n    \"popularity\": 21762\n  },\n  {\n    \"tag\": "chikara",\n    \"popularity\": 21723\n  },\n  {\n    \"tag\": "reprehension diazeuxis nickelous",\n    \"popularity\": 21683\n  },\n  {\n    \"tag\": "vacuation",\n    \"popularity\": 21644\n  },\n  {\n    \"tag\": "Sartish",\n    \"popularity\": 21605\n  },\n  {\n    \"tag\": "pseudogyny",\n    \"popularity\": 21566\n  },\n  {\n    \"tag\": "friedcake",\n    \"popularity\": 21527\n  },\n  {\n    \"tag\": "thraw",\n    \"popularity\": 21488\n  },\n  {\n    \"tag\": "bifid",\n    \"popularity\": 21449\n  },\n  {\n    \"tag\": "truthlessly",\n    \"popularity\": 21411\n  },\n  {\n    \"tag\": "lungy",\n    \"popularity\": 21372\n  },\n  {\n    \"tag\": "fluoborite",\n    \"popularity\": 21334\n  },\n  {\n    \"tag\": "anthropolithic",\n    \"popularity\": 21295\n  },\n  {\n    \"tag\": "coachee straw",\n    \"popularity\": 21257\n  },\n  {\n    \"tag\": "dehorner Grecize",\n    \"popularity\": 21219\n  },\n  {\n    \"tag\": "spondylopyosis",\n    \"popularity\": 21181\n  },\n  {\n    \"tag\": "institutionary",\n    \"popularity\": 21143\n  },\n  {\n    \"tag\": "agentry",\n    \"popularity\": 21105\n  },\n  {\n    \"tag\": "musing bietle",\n    \"popularity\": 21068\n  },\n  {\n    \"tag\": "cormophyte",\n    \"popularity\": 21030\n  },\n  {\n    \"tag\": "semielliptic",\n    \"popularity\": 20993\n  },\n  {\n    \"tag\": "ependytes",\n    \"popularity\": 20955\n  },\n  {\n    \"tag\": "coachmaster",\n    \"popularity\": 20918\n  },\n  {\n    \"tag\": "overexuberant",\n    \"popularity\": 20881\n  },\n  {\n    \"tag\": "selectable",\n    \"popularity\": 20844\n  },\n  {\n    \"tag\": "saclike",\n    \"popularity\": 20807\n  },\n  {\n    \"tag\": "mullion",\n    \"popularity\": 20770\n  },\n  {\n    \"tag\": "pantheonize prevalency",\n    \"popularity\": 20733\n  },\n  {\n    \"tag\": "trophosperm",\n    \"popularity\": 20697\n  },\n  {\n    \"tag\": "paraphrasist",\n    \"popularity\": 20660\n  },\n  {\n    \"tag\": "undercarry",\n    \"popularity\": 20624\n  },\n  {\n    \"tag\": "thallogenic",\n    \"popularity\": 20587\n  },\n  {\n    \"tag\": "bulgy forbid",\n    \"popularity\": 20551\n  },\n  {\n    \"tag\": "proliquor gratulatory",\n    \"popularity\": 20515\n  },\n  {\n    \"tag\": "booker",\n    \"popularity\": 20479\n  },\n  {\n    \"tag\": "wizen",\n    \"popularity\": 20443\n  },\n  {\n    \"tag\": "synchondrosially",\n    \"popularity\": 20407\n  },\n  {\n    \"tag\": "herbless",\n    \"popularity\": 20371\n  },\n  {\n    \"tag\": "arfvedsonite",\n    \"popularity\": 20336\n  },\n  {\n    \"tag\": "Neuroptera",\n    \"popularity\": 20300\n  },\n  {\n    \"tag\": "fingerstone",\n    \"popularity\": 20265\n  },\n  {\n    \"tag\": "Odontoglossae",\n    \"popularity\": 20229\n  },\n  {\n    \"tag\": "transmigrator",\n    \"popularity\": 20194\n  },\n  {\n    \"tag\": "Dehaites",\n    \"popularity\": 20159\n  },\n  {\n    \"tag\": "Molinist",\n    \"popularity\": 20124\n  },\n  {\n    \"tag\": "novelistic",\n    \"popularity\": 20089\n  },\n  {\n    \"tag\": "astelic",\n    \"popularity\": 20054\n  },\n  {\n    \"tag\": "pyelometry",\n    \"popularity\": 20019\n  },\n  {\n    \"tag\": "pigmentation",\n    \"popularity\": 19984\n  },\n  {\n    \"tag\": "epinaos",\n    \"popularity\": 19950\n  },\n  {\n    \"tag\": "outdare",\n    \"popularity\": 19915\n  },\n  {\n    \"tag\": "Funje philaristocracy",\n    \"popularity\": 19881\n  },\n  {\n    \"tag\": "keddah",\n    \"popularity\": 19846\n  },\n  {\n    \"tag\": "axoidean",\n    \"popularity\": 19812\n  },\n  {\n    \"tag\": "ovule",\n    \"popularity\": 19778\n  },\n  {\n    \"tag\": "solidify",\n    \"popularity\": 19744\n  },\n  {\n    \"tag\": "noncelestial",\n    \"popularity\": 19710\n  },\n  {\n    \"tag\": "overmultiplication",\n    \"popularity\": 19676\n  },\n  {\n    \"tag\": "hexatetrahedron",\n    \"popularity\": 19642\n  },\n  {\n    \"tag\": "pliciform",\n    \"popularity\": 19609\n  },\n  {\n    \"tag\": "zimbalon",\n    \"popularity\": 19575\n  },\n  {\n    \"tag\": "annexational",\n    \"popularity\": 19542\n  },\n  {\n    \"tag\": "eurhodol",\n    \"popularity\": 19508\n  },\n  {\n    \"tag\": "yark",\n    \"popularity\": 19475\n  },\n  {\n    \"tag\": "illegality nitroalizarin",\n    \"popularity\": 19442\n  },\n  {\n    \"tag\": "quadratum",\n    \"popularity\": 19409\n  },\n  {\n    \"tag\": "saccharine",\n    \"popularity\": 19376\n  },\n  {\n    \"tag\": "unemploy",\n    \"popularity\": 19343\n  },\n  {\n    \"tag\": "uniclinal unipotent",\n    \"popularity\": 19310\n  },\n  {\n    \"tag\": "turbo",\n    \"popularity\": 19277\n  },\n  {\n    \"tag\": "sybarism",\n    \"popularity\": 19244\n  },\n  {\n    \"tag\": "motacilline",\n    \"popularity\": 19212\n  },\n  {\n    \"tag\": "weaselly",\n    \"popularity\": 19179\n  },\n  {\n    \"tag\": "plastid",\n    \"popularity\": 19147\n  },\n  {\n    \"tag\": "wasting",\n    \"popularity\": 19114\n  },\n  {\n    \"tag\": "begrime fluting",\n    \"popularity\": 19082\n  },\n  {\n    \"tag\": "Nephilinae",\n    \"popularity\": 19050\n  },\n  {\n    \"tag\": "disregardance",\n    \"popularity\": 19018\n  },\n  {\n    \"tag\": "Shakerlike",\n    \"popularity\": 18986\n  },\n  {\n    \"tag\": "uniped",\n    \"popularity\": 18954\n  },\n  {\n    \"tag\": "knap",\n    \"popularity\": 18922\n  },\n  {\n    \"tag\": "electivism undergardener",\n    \"popularity\": 18890\n  },\n  {\n    \"tag\": "hulverheaded",\n    \"popularity\": 18858\n  },\n  {\n    \"tag\": "unruptured",\n    \"popularity\": 18827\n  },\n  {\n    \"tag\": "solemnize credently",\n    \"popularity\": 18795\n  },\n  {\n    \"tag\": "pentastomoid possessingly",\n    \"popularity\": 18764\n  },\n  {\n    \"tag\": "octose",\n    \"popularity\": 18733\n  },\n  {\n    \"tag\": "psithurism indefensibility",\n    \"popularity\": 18701\n  },\n  {\n    \"tag\": "torrentuous cyanometer subcrenate",\n    \"popularity\": 18670\n  },\n  {\n    \"tag\": "photoplaywright tapaculo",\n    \"popularity\": 18639\n  },\n  {\n    \"tag\": "univalence",\n    \"popularity\": 18608\n  },\n  {\n    \"tag\": "Porthetria",\n    \"popularity\": 18577\n  },\n  {\n    \"tag\": "funambulo",\n    \"popularity\": 18546\n  },\n  {\n    \"tag\": "pedion",\n    \"popularity\": 18515\n  },\n  {\n    \"tag\": "horticulturally",\n    \"popularity\": 18485\n  },\n  {\n    \"tag\": "marennin",\n    \"popularity\": 18454\n  },\n  {\n    \"tag\": "horselaugh",\n    \"popularity\": 18423\n  },\n  {\n    \"tag\": "semiexecutive",\n    \"popularity\": 18393\n  },\n  {\n    \"tag\": "Monopteridae",\n    \"popularity\": 18363\n  },\n  {\n    \"tag\": "commonable",\n    \"popularity\": 18332\n  },\n  {\n    \"tag\": "dreariment",\n    \"popularity\": 18302\n  },\n  {\n    \"tag\": "disbud",\n    \"popularity\": 18272\n  },\n  {\n    \"tag\": "monocled",\n    \"popularity\": 18242\n  },\n  {\n    \"tag\": "hurlbarrow",\n    \"popularity\": 18212\n  },\n  {\n    \"tag\": "opiateproof",\n    \"popularity\": 18182\n  },\n  {\n    \"tag\": "Fahrenheit",\n    \"popularity\": 18152\n  },\n  {\n    \"tag\": "writhed",\n    \"popularity\": 18122\n  },\n  {\n    \"tag\": "Volstead",\n    \"popularity\": 18093\n  },\n  {\n    \"tag\": "yesternight",\n    \"popularity\": 18063\n  },\n  {\n    \"tag\": "readmittance",\n    \"popularity\": 18033\n  },\n  {\n    \"tag\": "reiterable",\n    \"popularity\": 18004\n  },\n  {\n    \"tag\": "triquetral",\n    \"popularity\": 17975\n  },\n  {\n    \"tag\": "guillotinement",\n    \"popularity\": 17945\n  },\n  {\n    \"tag\": "repermission",\n    \"popularity\": 17916\n  },\n  {\n    \"tag\": "assishly",\n    \"popularity\": 17887\n  },\n  {\n    \"tag\": "daidle",\n    \"popularity\": 17858\n  },\n  {\n    \"tag\": "prismatoid",\n    \"popularity\": 17829\n  },\n  {\n    \"tag\": "irreptitious",\n    \"popularity\": 17800\n  },\n  {\n    \"tag\": "sourdeline",\n    \"popularity\": 17771\n  },\n  {\n    \"tag\": "Austrian",\n    \"popularity\": 17742\n  },\n  {\n    \"tag\": "psychorrhagic",\n    \"popularity\": 17713\n  },\n  {\n    \"tag\": "Monumbo",\n    \"popularity\": 17685\n  },\n  {\n    \"tag\": "cloiochoanitic",\n    \"popularity\": 17656\n  },\n  {\n    \"tag\": "hant",\n    \"popularity\": 17628\n  },\n  {\n    \"tag\": "roily pulldown",\n    \"popularity\": 17599\n  },\n  {\n    \"tag\": "recongratulation",\n    \"popularity\": 17571\n  },\n  {\n    \"tag\": "Peking",\n    \"popularity\": 17543\n  },\n  {\n    \"tag\": "erdvark",\n    \"popularity\": 17514\n  },\n  {\n    \"tag\": "antimnemonic",\n    \"popularity\": 17486\n  },\n  {\n    \"tag\": "noncapillarity",\n    \"popularity\": 17458\n  },\n  {\n    \"tag\": "irrepressive",\n    \"popularity\": 17430\n  },\n  {\n    \"tag\": "Petromyzontes",\n    \"popularity\": 17402\n  },\n  {\n    \"tag\": "piscatorially",\n    \"popularity\": 17374\n  },\n  {\n    \"tag\": "cholesterosis",\n    \"popularity\": 17346\n  },\n  {\n    \"tag\": "denunciate",\n    \"popularity\": 17319\n  },\n  {\n    \"tag\": "unmetalled",\n    \"popularity\": 17291\n  },\n  {\n    \"tag\": "Tigris enruin",\n    \"popularity\": 17263\n  },\n  {\n    \"tag\": "anaspalin",\n    \"popularity\": 17236\n  },\n  {\n    \"tag\": "monodromy",\n    \"popularity\": 17208\n  },\n  {\n    \"tag\": "Canichanan",\n    \"popularity\": 17181\n  },\n  {\n    \"tag\": "mesolabe",\n    \"popularity\": 17154\n  },\n  {\n    \"tag\": "trichothallic overcunningness",\n    \"popularity\": 17127\n  },\n  {\n    \"tag\": "spinsterishly",\n    \"popularity\": 17099\n  },\n  {\n    \"tag\": "sensilla",\n    \"popularity\": 17072\n  },\n  {\n    \"tag\": "wifelkin",\n    \"popularity\": 17045\n  },\n  {\n    \"tag\": "suppositionless",\n    \"popularity\": 17018\n  },\n  {\n    \"tag\": "irksomeness",\n    \"popularity\": 16991\n  },\n  {\n    \"tag\": "sanbenito",\n    \"popularity\": 16964\n  },\n  {\n    \"tag\": "nonstatement",\n    \"popularity\": 16938\n  },\n  {\n    \"tag\": "phenoloid",\n    \"popularity\": 16911\n  },\n  {\n    \"tag\": "Steinberger",\n    \"popularity\": 16884\n  },\n  {\n    \"tag\": "replicated boom",\n    \"popularity\": 16858\n  },\n  {\n    \"tag\": "sciomachiology",\n    \"popularity\": 16831\n  },\n  {\n    \"tag\": "starwise",\n    \"popularity\": 16805\n  },\n  {\n    \"tag\": "prerich",\n    \"popularity\": 16778\n  },\n  {\n    \"tag\": "unspawned",\n    \"popularity\": 16752\n  },\n  {\n    \"tag\": "unindentable",\n    \"popularity\": 16726\n  },\n  {\n    \"tag\": "stromatic",\n    \"popularity\": 16700\n  },\n  {\n    \"tag\": "fetishize",\n    \"popularity\": 16673\n  },\n  {\n    \"tag\": "dihydroxy",\n    \"popularity\": 16647\n  },\n  {\n    \"tag\": "precaudal",\n    \"popularity\": 16621\n  },\n  {\n    \"tag\": "Madagascar",\n    \"popularity\": 16595\n  },\n  {\n    \"tag\": "repinement",\n    \"popularity\": 16570\n  },\n  {\n    \"tag\": "noncathedral wenzel",\n    \"popularity\": 16544\n  },\n  {\n    \"tag\": "corollike",\n    \"popularity\": 16518\n  },\n  {\n    \"tag\": "pubes unamortization",\n    \"popularity\": 16492\n  },\n  {\n    \"tag\": "brickcroft",\n    \"popularity\": 16467\n  },\n  {\n    \"tag\": "intertrabecular",\n    \"popularity\": 16441\n  },\n  {\n    \"tag\": "formulaic",\n    \"popularity\": 16416\n  },\n  {\n    \"tag\": "arienzo",\n    \"popularity\": 16390\n  },\n  {\n    \"tag\": "Mazzinian",\n    \"popularity\": 16365\n  },\n  {\n    \"tag\": "wallowishly",\n    \"popularity\": 16339\n  },\n  {\n    \"tag\": "sysselman",\n    \"popularity\": 16314\n  },\n  {\n    \"tag\": "seligmannite",\n    \"popularity\": 16289\n  },\n  {\n    \"tag\": "harlequinery",\n    \"popularity\": 16264\n  },\n  {\n    \"tag\": "zucchetto",\n    \"popularity\": 16239\n  },\n  {\n    \"tag\": "malonyl",\n    \"popularity\": 16214\n  },\n  {\n    \"tag\": "patwari",\n    \"popularity\": 16189\n  },\n  {\n    \"tag\": "neoholmia venturesomeness",\n    \"popularity\": 16164\n  },\n  {\n    \"tag\": "Dehwar",\n    \"popularity\": 16139\n  },\n  {\n    \"tag\": "fetiferous",\n    \"popularity\": 16114\n  },\n  {\n    \"tag\": "chromatophore",\n    \"popularity\": 16090\n  },\n  {\n    \"tag\": "reregistration",\n    \"popularity\": 16065\n  },\n  {\n    \"tag\": "alienor",\n    \"popularity\": 16040\n  },\n  {\n    \"tag\": "Hexagynia",\n    \"popularity\": 16016\n  },\n  {\n    \"tag\": "cerebrotonia",\n    \"popularity\": 15991\n  },\n  {\n    \"tag\": "deedbox",\n    \"popularity\": 15967\n  },\n  {\n    \"tag\": "staab",\n    \"popularity\": 15943\n  },\n  {\n    \"tag\": "uratemia",\n    \"popularity\": 15918\n  },\n  {\n    \"tag\": "flaunt",\n    \"popularity\": 15894\n  },\n  {\n    \"tag\": "bogy",\n    \"popularity\": 15870\n  },\n  {\n    \"tag\": "subcartilaginous",\n    \"popularity\": 15846\n  },\n  {\n    \"tag\": "protonephridial",\n    \"popularity\": 15822\n  },\n  {\n    \"tag\": "Boswellia",\n    \"popularity\": 15798\n  },\n  {\n    \"tag\": "relaxant untiaraed protoepiphyte",\n    \"popularity\": 15774\n  },\n  {\n    \"tag\": "nesslerization",\n    \"popularity\": 15750\n  },\n  {\n    \"tag\": "precession",\n    \"popularity\": 15726\n  },\n  {\n    \"tag\": "peat",\n    \"popularity\": 15702\n  },\n  {\n    \"tag\": "unbit",\n    \"popularity\": 15678\n  },\n  {\n    \"tag\": "snailish",\n    \"popularity\": 15655\n  },\n  {\n    \"tag\": "porismatical",\n    \"popularity\": 15631\n  },\n  {\n    \"tag\": "hooflike",\n    \"popularity\": 15608\n  },\n  {\n    \"tag\": "resuppose phene cranic",\n    \"popularity\": 15584\n  },\n  {\n    \"tag\": "peptonization kipskin",\n    \"popularity\": 15561\n  },\n  {\n    \"tag\": "birdstone",\n    \"popularity\": 15537\n  },\n  {\n    \"tag\": "empty inferoanterior",\n    \"popularity\": 15514\n  },\n  {\n    \"tag\": "androtauric",\n    \"popularity\": 15491\n  },\n  {\n    \"tag\": "triamide",\n    \"popularity\": 15467\n  },\n  {\n    \"tag\": "showmanry",\n    \"popularity\": 15444\n  },\n  {\n    \"tag\": "doing",\n    \"popularity\": 15421\n  },\n  {\n    \"tag\": "bouchaleen",\n    \"popularity\": 15398\n  },\n  {\n    \"tag\": "precollude",\n    \"popularity\": 15375\n  },\n  {\n    \"tag\": "finger",\n    \"popularity\": 15352\n  },\n  {\n    \"tag\": "limnetic intermessenger",\n    \"popularity\": 15329\n  },\n  {\n    \"tag\": "uncharitable picrotoxic",\n    \"popularity\": 15306\n  },\n  {\n    \"tag\": "nationalizer Phasmidae",\n    \"popularity\": 15283\n  },\n  {\n    \"tag\": "laughingstock",\n    \"popularity\": 15261\n  },\n  {\n    \"tag\": "nondeferential",\n    \"popularity\": 15238\n  },\n  {\n    \"tag\": "uproariously",\n    \"popularity\": 15215\n  },\n  {\n    \"tag\": "manzanilla",\n    \"popularity\": 15193\n  },\n  {\n    \"tag\": "khahoon",\n    \"popularity\": 15170\n  },\n  {\n    \"tag\": "olericulturally longshanks",\n    \"popularity\": 15148\n  },\n  {\n    \"tag\": "enthusiastically methionic",\n    \"popularity\": 15125\n  },\n  {\n    \"tag\": "pobs",\n    \"popularity\": 15103\n  },\n  {\n    \"tag\": "tricarpellate",\n    \"popularity\": 15081\n  },\n  {\n    \"tag\": "souterrain",\n    \"popularity\": 15058\n  },\n  {\n    \"tag\": "tethelin",\n    \"popularity\": 15036\n  },\n  {\n    \"tag\": "tartle",\n    \"popularity\": 15014\n  },\n  {\n    \"tag\": "tidelike",\n    \"popularity\": 14992\n  },\n  {\n    \"tag\": "cosmoramic",\n    \"popularity\": 14970\n  },\n  {\n    \"tag\": "pretardiness",\n    \"popularity\": 14948\n  },\n  {\n    \"tag\": "insoul",\n    \"popularity\": 14926\n  },\n  {\n    \"tag\": "anthroxan",\n    \"popularity\": 14904\n  },\n  {\n    \"tag\": "jilter",\n    \"popularity\": 14882\n  },\n  {\n    \"tag\": "pectinibranchian trematode",\n    \"popularity\": 14860\n  },\n  {\n    \"tag\": "Renaissancist",\n    \"popularity\": 14838\n  },\n  {\n    \"tag\": "imaginant",\n    \"popularity\": 14817\n  },\n  {\n    \"tag\": "supercensure",\n    \"popularity\": 14795\n  },\n  {\n    \"tag\": "festilogy",\n    \"popularity\": 14773\n  },\n  {\n    \"tag\": "regression",\n    \"popularity\": 14752\n  },\n  {\n    \"tag\": "mesobregmate languorously",\n    \"popularity\": 14730\n  },\n  {\n    \"tag\": "unsupernaturalized",\n    \"popularity\": 14709\n  },\n  {\n    \"tag\": "boobyish",\n    \"popularity\": 14687\n  },\n  {\n    \"tag\": "scopolamine",\n    \"popularity\": 14666\n  },\n  {\n    \"tag\": "reamputation unchristianly",\n    \"popularity\": 14645\n  },\n  {\n    \"tag\": "cuneatic",\n    \"popularity\": 14623\n  },\n  {\n    \"tag\": "heathberry",\n    \"popularity\": 14602\n  },\n  {\n    \"tag\": "hate",\n    \"popularity\": 14581\n  },\n  {\n    \"tag\": "redeemableness",\n    \"popularity\": 14560\n  },\n  {\n    \"tag\": "damasse",\n    \"popularity\": 14539\n  },\n  {\n    \"tag\": "thrillsome",\n    \"popularity\": 14518\n  },\n  {\n    \"tag\": "disseverment",\n    \"popularity\": 14497\n  },\n  {\n    \"tag\": "underbishopric Ostyak",\n    \"popularity\": 14476\n  },\n  {\n    \"tag\": "Exoascales",\n    \"popularity\": 14455\n  },\n  {\n    \"tag\": "soiled",\n    \"popularity\": 14434\n  },\n  {\n    \"tag\": "Cain",\n    \"popularity\": 14413\n  },\n  {\n    \"tag\": "mismanageable arenae",\n    \"popularity\": 14392\n  },\n  {\n    \"tag\": "manducate unhinderably",\n    \"popularity\": 14372\n  },\n  {\n    \"tag\": "peregrin",\n    \"popularity\": 14351\n  },\n  {\n    \"tag\": "musicianly",\n    \"popularity\": 14330\n  },\n  {\n    \"tag\": "aln",\n    \"popularity\": 14310\n  },\n  {\n    \"tag\": "intercentrum",\n    \"popularity\": 14289\n  },\n  {\n    \"tag\": "roothold",\n    \"popularity\": 14269\n  },\n  {\n    \"tag\": "jane aneurism",\n    \"popularity\": 14248\n  },\n  {\n    \"tag\": "insinuatively forefeel phytolatrous",\n    \"popularity\": 14228\n  },\n  {\n    \"tag\": "kanchil",\n    \"popularity\": 14208\n  },\n  {\n    \"tag\": "Austrophile",\n    \"popularity\": 14187\n  },\n  {\n    \"tag\": "unterrorized",\n    \"popularity\": 14167\n  },\n  {\n    \"tag\": "admeasure",\n    \"popularity\": 14147\n  },\n  {\n    \"tag\": "electrodissolution",\n    \"popularity\": 14127\n  },\n  {\n    \"tag\": "unweddedly",\n    \"popularity\": 14107\n  },\n  {\n    \"tag\": "unannoying",\n    \"popularity\": 14087\n  },\n  {\n    \"tag\": "uningenuous",\n    \"popularity\": 14067\n  },\n  {\n    \"tag\": "omnibenevolent",\n    \"popularity\": 14047\n  },\n  {\n    \"tag\": "commissure",\n    \"popularity\": 14027\n  },\n  {\n    \"tag\": "tellureted",\n    \"popularity\": 14007\n  },\n  {\n    \"tag\": "suffragan",\n    \"popularity\": 13987\n  },\n  {\n    \"tag\": "sphaeriaceous",\n    \"popularity\": 13967\n  },\n  {\n    \"tag\": "unfearing",\n    \"popularity\": 13947\n  },\n  {\n    \"tag\": "stentoriousness precounsellor",\n    \"popularity\": 13928\n  },\n  {\n    \"tag\": "haemaspectroscope",\n    \"popularity\": 13908\n  },\n  {\n    \"tag\": "teras",\n    \"popularity\": 13888\n  },\n  {\n    \"tag\": "pulicine",\n    \"popularity\": 13869\n  },\n  {\n    \"tag\": "colicystopyelitis",\n    \"popularity\": 13849\n  },\n  {\n    \"tag\": "Physalia",\n    \"popularity\": 13830\n  },\n  {\n    \"tag\": "Saxicolidae",\n    \"popularity\": 13810\n  },\n  {\n    \"tag\": "peritonital",\n    \"popularity\": 13791\n  },\n  {\n    \"tag\": "dysphotic",\n    \"popularity\": 13771\n  },\n  {\n    \"tag\": "unabandoned",\n    \"popularity\": 13752\n  },\n  {\n    \"tag\": "rashful",\n    \"popularity\": 13733\n  },\n  {\n    \"tag\": "goodyness Manobo",\n    \"popularity\": 13714\n  },\n  {\n    \"tag\": "glaring",\n    \"popularity\": 13694\n  },\n  {\n    \"tag\": "horrorful",\n    \"popularity\": 13675\n  },\n  {\n    \"tag\": "intercepting",\n    \"popularity\": 13656\n  },\n  {\n    \"tag\": "semifine",\n    \"popularity\": 13637\n  },\n  {\n    \"tag\": "Gaypoo",\n    \"popularity\": 13618\n  },\n  {\n    \"tag\": "Metrosideros",\n    \"popularity\": 13599\n  },\n  {\n    \"tag\": "thoracicolumbar",\n    \"popularity\": 13580\n  },\n  {\n    \"tag\": "unserried",\n    \"popularity\": 13561\n  },\n  {\n    \"tag\": "keeperess cauterization",\n    \"popularity\": 13542\n  },\n  {\n    \"tag\": "administrant",\n    \"popularity\": 13523\n  },\n  {\n    \"tag\": "unpropitiatedness",\n    \"popularity\": 13505\n  },\n  {\n    \"tag\": "pensileness",\n    \"popularity\": 13486\n  },\n  {\n    \"tag\": "quinaldic unreceivable",\n    \"popularity\": 13467\n  },\n  {\n    \"tag\": "Carnaria",\n    \"popularity\": 13448\n  },\n  {\n    \"tag\": "azothionium wurrus",\n    \"popularity\": 13430\n  },\n  {\n    \"tag\": "mistresshood",\n    \"popularity\": 13411\n  },\n  {\n    \"tag\": "Savara",\n    \"popularity\": 13393\n  },\n  {\n    \"tag\": "dasyurine",\n    \"popularity\": 13374\n  },\n  {\n    \"tag\": "superideal",\n    \"popularity\": 13356\n  },\n  {\n    \"tag\": "Parisianize",\n    \"popularity\": 13337\n  },\n  {\n    \"tag\": "underearth",\n    \"popularity\": 13319\n  },\n  {\n    \"tag\": "athrogenic",\n    \"popularity\": 13301\n  },\n  {\n    \"tag\": "communicate",\n    \"popularity\": 13282\n  },\n  {\n    \"tag\": "denervation enworthed",\n    \"popularity\": 13264\n  },\n  {\n    \"tag\": "subbromide",\n    \"popularity\": 13246\n  },\n  {\n    \"tag\": "stenocoriasis",\n    \"popularity\": 13228\n  },\n  {\n    \"tag\": "facetiousness",\n    \"popularity\": 13209\n  },\n  {\n    \"tag\": "twaddling",\n    \"popularity\": 13191\n  },\n  {\n    \"tag\": "tetartoconid",\n    \"popularity\": 13173\n  },\n  {\n    \"tag\": "audiophile",\n    \"popularity\": 13155\n  },\n  {\n    \"tag\": "fustigate",\n    \"popularity\": 13137\n  },\n  {\n    \"tag\": "Sorbian cacophonia",\n    \"popularity\": 13119\n  },\n  {\n    \"tag\": "fondish",\n    \"popularity\": 13101\n  },\n  {\n    \"tag\": "endomastoiditis",\n    \"popularity\": 13084\n  },\n  {\n    \"tag\": "sniptious",\n    \"popularity\": 13066\n  },\n  {\n    \"tag\": "glochidiate",\n    \"popularity\": 13048\n  },\n  {\n    \"tag\": "polycarboxylic",\n    \"popularity\": 13030\n  },\n  {\n    \"tag\": "stamp",\n    \"popularity\": 13012\n  },\n  {\n    \"tag\": "tritonymph endotoxoid",\n    \"popularity\": 12995\n  },\n  {\n    \"tag\": "wolfskin",\n    \"popularity\": 12977\n  },\n  {\n    \"tag\": "oncosimeter",\n    \"popularity\": 12959\n  },\n  {\n    \"tag\": "outward",\n    \"popularity\": 12942\n  },\n  {\n    \"tag\": "circumscribed",\n    \"popularity\": 12924\n  },\n  {\n    \"tag\": "autohemolytic",\n    \"popularity\": 12907\n  },\n  {\n    \"tag\": "isorhamnose",\n    \"popularity\": 12889\n  },\n  {\n    \"tag\": "monarchomachic",\n    \"popularity\": 12872\n  },\n  {\n    \"tag\": "phaenomenon",\n    \"popularity\": 12855\n  },\n  {\n    \"tag\": "angiopressure",\n    \"popularity\": 12837\n  },\n  {\n    \"tag\": "similarize",\n    \"popularity\": 12820\n  },\n  {\n    \"tag\": "unseeable",\n    \"popularity\": 12803\n  },\n  {\n    \"tag\": "Toryize",\n    \"popularity\": 12785\n  },\n  {\n    \"tag\": "fruitling",\n    \"popularity\": 12768\n  },\n  {\n    \"tag\": "axle",\n    \"popularity\": 12751\n  },\n  {\n    \"tag\": "priestal cocked",\n    \"popularity\": 12734\n  },\n  {\n    \"tag\": "serotoxin",\n    \"popularity\": 12717\n  },\n  {\n    \"tag\": "unmovably",\n    \"popularity\": 12700\n  },\n  {\n    \"tag\": "darbha",\n    \"popularity\": 12683\n  },\n  {\n    \"tag\": "Mongolize",\n    \"popularity\": 12666\n  },\n  {\n    \"tag\": "clusteringly",\n    \"popularity\": 12649\n  },\n  {\n    \"tag\": "tendence",\n    \"popularity\": 12632\n  },\n  {\n    \"tag\": "foziness",\n    \"popularity\": 12615\n  },\n  {\n    \"tag\": "brickkiln lithify",\n    \"popularity\": 12598\n  },\n  {\n    \"tag\": "unpriest",\n    \"popularity\": 12581\n  },\n  {\n    \"tag\": "convincer",\n    \"popularity\": 12564\n  },\n  {\n    \"tag\": "mornlike",\n    \"popularity\": 12548\n  },\n  {\n    \"tag\": "overaddiction ostentatiousness",\n    \"popularity\": 12531\n  },\n  {\n    \"tag\": "diffusively moccasin pendom",\n    \"popularity\": 12514\n  },\n  {\n    \"tag\": "boose",\n    \"popularity\": 12498\n  },\n  {\n    \"tag\": "myonosus",\n    \"popularity\": 12481\n  },\n  {\n    \"tag\": "handsome",\n    \"popularity\": 12464\n  },\n  {\n    \"tag\": "paroxysmic",\n    \"popularity\": 12448\n  },\n  {\n    \"tag\": "Ulidian",\n    \"popularity\": 12431\n  },\n  {\n    \"tag\": "heartache",\n    \"popularity\": 12415\n  },\n  {\n    \"tag\": "torporize",\n    \"popularity\": 12398\n  },\n  {\n    \"tag\": "hippish",\n    \"popularity\": 12382\n  },\n  {\n    \"tag\": "stigmal militation",\n    \"popularity\": 12366\n  },\n  {\n    \"tag\": "matmaker",\n    \"popularity\": 12349\n  },\n  {\n    \"tag\": "marantaceous bivoluminous",\n    \"popularity\": 12333\n  },\n  {\n    \"tag\": "Uraniidae",\n    \"popularity\": 12317\n  },\n  {\n    \"tag\": "risper",\n    \"popularity\": 12301\n  },\n  {\n    \"tag\": "tintinnabulation",\n    \"popularity\": 12284\n  },\n  {\n    \"tag\": "tributorian",\n    \"popularity\": 12268\n  },\n  {\n    \"tag\": "ashamedly",\n    \"popularity\": 12252\n  },\n  {\n    \"tag\": "Macrourus",\n    \"popularity\": 12236\n  },\n  {\n    \"tag\": "Chora",\n    \"popularity\": 12220\n  },\n  {\n    \"tag\": "caul",\n    \"popularity\": 12204\n  },\n  {\n    \"tag\": "exsector",\n    \"popularity\": 12188\n  },\n  {\n    \"tag\": "acutish",\n    \"popularity\": 12172\n  },\n  {\n    \"tag\": "amphichrome",\n    \"popularity\": 12156\n  },\n  {\n    \"tag\": "guarder",\n    \"popularity\": 12140\n  },\n  {\n    \"tag\": "sculpturally",\n    \"popularity\": 12124\n  },\n  {\n    \"tag\": "benightmare",\n    \"popularity\": 12108\n  },\n  {\n    \"tag\": "chucky",\n    \"popularity\": 12093\n  },\n  {\n    \"tag\": "Venetian",\n    \"popularity\": 12077\n  },\n  {\n    \"tag\": "autotheater",\n    \"popularity\": 12061\n  },\n  {\n    \"tag\": "planarioid",\n    \"popularity\": 12045\n  },\n  {\n    \"tag\": "handkerchiefful",\n    \"popularity\": 12030\n  },\n  {\n    \"tag\": "fuliginousness potentize",\n    \"popularity\": 12014\n  },\n  {\n    \"tag\": "pantheum",\n    \"popularity\": 11998\n  },\n  {\n    \"tag\": "heavyweight",\n    \"popularity\": 11983\n  },\n  {\n    \"tag\": "unbrick",\n    \"popularity\": 11967\n  },\n  {\n    \"tag\": "duomachy",\n    \"popularity\": 11952\n  },\n  {\n    \"tag\": "polyphyodont",\n    \"popularity\": 11936\n  },\n  {\n    \"tag\": "hibernacle",\n    \"popularity\": 11921\n  },\n  {\n    \"tag\": "undistend",\n    \"popularity\": 11905\n  },\n  {\n    \"tag\": "hystericky",\n    \"popularity\": 11890\n  },\n  {\n    \"tag\": "paleolimnology",\n    \"popularity\": 11875\n  },\n  {\n    \"tag\": "cedarware",\n    \"popularity\": 11859\n  },\n  {\n    \"tag\": "overwrested",\n    \"popularity\": 11844\n  },\n  {\n    \"tag\": "Syriacism",\n    \"popularity\": 11829\n  },\n  {\n    \"tag\": "pretan",\n    \"popularity\": 11813\n  },\n  {\n    \"tag\": "formant",\n    \"popularity\": 11798\n  },\n  {\n    \"tag\": "pharmacopoeist Fedia",\n    \"popularity\": 11783\n  },\n  {\n    \"tag\": "exorcist eerisome",\n    \"popularity\": 11768\n  },\n  {\n    \"tag\": "separation",\n    \"popularity\": 11753\n  },\n  {\n    \"tag\": "infancy",\n    \"popularity\": 11738\n  },\n  {\n    \"tag\": "ecrasite",\n    \"popularity\": 11723\n  },\n  {\n    \"tag\": "propolize",\n    \"popularity\": 11708\n  },\n  {\n    \"tag\": "uncram phyllin",\n    \"popularity\": 11693\n  },\n  {\n    \"tag\": "thymopathy",\n    \"popularity\": 11678\n  },\n  {\n    \"tag\": "omniscient",\n    \"popularity\": 11663\n  },\n  {\n    \"tag\": "coussinet hazer",\n    \"popularity\": 11648\n  },\n  {\n    \"tag\": "contributiveness",\n    \"popularity\": 11633\n  },\n  {\n    \"tag\": "septifluous",\n    \"popularity\": 11618\n  },\n  {\n    \"tag\": "halfness",\n    \"popularity\": 11603\n  },\n  {\n    \"tag\": "tocher",\n    \"popularity\": 11589\n  },\n  {\n    \"tag\": "monotonist",\n    \"popularity\": 11574\n  },\n  {\n    \"tag\": "headchair",\n    \"popularity\": 11559\n  },\n  {\n    \"tag\": "everywhence",\n    \"popularity\": 11544\n  },\n  {\n    \"tag\": "gerate",\n    \"popularity\": 11530\n  },\n  {\n    \"tag\": "unrepellent",\n    \"popularity\": 11515\n  },\n  {\n    \"tag\": "inidoneous",\n    \"popularity\": 11500\n  },\n  {\n    \"tag\": "Rifi",\n    \"popularity\": 11486\n  },\n  {\n    \"tag\": "unstop",\n    \"popularity\": 11471\n  },\n  {\n    \"tag\": "conformer",\n    \"popularity\": 11457\n  },\n  {\n    \"tag\": "vivisectionally",\n    \"popularity\": 11442\n  },\n  {\n    \"tag\": "nonfinishing",\n    \"popularity\": 11428\n  },\n  {\n    \"tag\": "tyranness",\n    \"popularity\": 11413\n  },\n  {\n    \"tag\": "shepherdage havoc",\n    \"popularity\": 11399\n  },\n  {\n    \"tag\": "coronale",\n    \"popularity\": 11385\n  },\n  {\n    \"tag\": "airmarker",\n    \"popularity\": 11370\n  },\n  {\n    \"tag\": "subpanel",\n    \"popularity\": 11356\n  },\n  {\n    \"tag\": "conciliation",\n    \"popularity\": 11342\n  },\n  {\n    \"tag\": "supergun",\n    \"popularity\": 11327\n  },\n  {\n    \"tag\": "photoheliography",\n    \"popularity\": 11313\n  },\n  {\n    \"tag\": "cacosmia",\n    \"popularity\": 11299\n  },\n  {\n    \"tag\": "caressant",\n    \"popularity\": 11285\n  },\n  {\n    \"tag\": "swivet",\n    \"popularity\": 11270\n  },\n  {\n    \"tag\": "coddler",\n    \"popularity\": 11256\n  },\n  {\n    \"tag\": "rakehellish",\n    \"popularity\": 11242\n  },\n  {\n    \"tag\": "recohabitation",\n    \"popularity\": 11228\n  },\n  {\n    \"tag\": "postillator",\n    \"popularity\": 11214\n  },\n  {\n    \"tag\": "receipt",\n    \"popularity\": 11200\n  },\n  {\n    \"tag\": "nonconformistical",\n    \"popularity\": 11186\n  },\n  {\n    \"tag\": "unglorified",\n    \"popularity\": 11172\n  },\n  {\n    \"tag\": "unordinariness",\n    \"popularity\": 11158\n  },\n  {\n    \"tag\": "tetrahydroxy",\n    \"popularity\": 11144\n  },\n  {\n    \"tag\": "haploperistomic corporeity",\n    \"popularity\": 11130\n  },\n  {\n    \"tag\": "varical",\n    \"popularity\": 11117\n  },\n  {\n    \"tag\": "pilferment",\n    \"popularity\": 11103\n  },\n  {\n    \"tag\": "reverentially playcraft",\n    \"popularity\": 11089\n  },\n  {\n    \"tag\": "unretentive",\n    \"popularity\": 11075\n  },\n  {\n    \"tag\": "readiness",\n    \"popularity\": 11061\n  },\n  {\n    \"tag\": "thermomagnetism",\n    \"popularity\": 11048\n  },\n  {\n    \"tag\": "spotless",\n    \"popularity\": 11034\n  },\n  {\n    \"tag\": "semishrubby",\n    \"popularity\": 11020\n  },\n  {\n    \"tag\": "metrotomy",\n    \"popularity\": 11007\n  },\n  {\n    \"tag\": "hocker",\n    \"popularity\": 10993\n  },\n  {\n    \"tag\": "anecdotal",\n    \"popularity\": 10979\n  },\n  {\n    \"tag\": "tetrabelodont",\n    \"popularity\": 10966\n  },\n  {\n    \"tag\": "Ramillied",\n    \"popularity\": 10952\n  },\n  {\n    \"tag\": "sympatheticism",\n    \"popularity\": 10939\n  },\n  {\n    \"tag\": "kiskatom",\n    \"popularity\": 10925\n  },\n  {\n    \"tag\": "concyclically",\n    \"popularity\": 10912\n  },\n  {\n    \"tag\": "tunicless",\n    \"popularity\": 10899\n  },\n  {\n    \"tag\": "formalistic",\n    \"popularity\": 10885\n  },\n  {\n    \"tag\": "thermacogenesis",\n    \"popularity\": 10872\n  },\n  {\n    \"tag\": "multimotored",\n    \"popularity\": 10858\n  },\n  {\n    \"tag\": "inversive",\n    \"popularity\": 10845\n  },\n  {\n    \"tag\": "Jatki",\n    \"popularity\": 10832\n  },\n  {\n    \"tag\": "highest",\n    \"popularity\": 10818\n  },\n  {\n    \"tag\": "rubidic",\n    \"popularity\": 10805\n  },\n  {\n    \"tag\": "acranial",\n    \"popularity\": 10792\n  },\n  {\n    \"tag\": "pulvinulus",\n    \"popularity\": 10779\n  },\n  {\n    \"tag\": "nattiness",\n    \"popularity\": 10766\n  },\n  {\n    \"tag\": "antisimoniacal",\n    \"popularity\": 10752\n  },\n  {\n    \"tag\": "tetanize",\n    \"popularity\": 10739\n  },\n  {\n    \"tag\": "spectrophobia",\n    \"popularity\": 10726\n  },\n  {\n    \"tag\": "monopolitical",\n    \"popularity\": 10713\n  },\n  {\n    \"tag\": "teallite",\n    \"popularity\": 10700\n  },\n  {\n    \"tag\": "alicyclic interpellator",\n    \"popularity\": 10687\n  },\n  {\n    \"tag\": "nonsynthesized",\n    \"popularity\": 10674\n  },\n  {\n    \"tag\": "wheelwrighting",\n    \"popularity\": 10661\n  },\n  {\n    \"tag\": "pelliculate",\n    \"popularity\": 10648\n  },\n  {\n    \"tag\": "Euphyllopoda",\n    \"popularity\": 10635\n  },\n  {\n    \"tag\": "graver",\n    \"popularity\": 10622\n  },\n  {\n    \"tag\": "automorph",\n    \"popularity\": 10609\n  },\n  {\n    \"tag\": "underhanded",\n    \"popularity\": 10597\n  },\n  {\n    \"tag\": "causal",\n    \"popularity\": 10584\n  },\n  {\n    \"tag\": "odoom",\n    \"popularity\": 10571\n  },\n  {\n    \"tag\": "apodictical",\n    \"popularity\": 10558\n  },\n  {\n    \"tag\": "foundery",\n    \"popularity\": 10545\n  },\n  {\n    \"tag\": "unneighbored",\n    \"popularity\": 10533\n  },\n  {\n    \"tag\": "woolshearing",\n    \"popularity\": 10520\n  },\n  {\n    \"tag\": "boschveld",\n    \"popularity\": 10507\n  },\n  {\n    \"tag\": "unhardened lipopod",\n    \"popularity\": 10495\n  },\n  {\n    \"tag\": "unenriching",\n    \"popularity\": 10482\n  },\n  {\n    \"tag\": "spak",\n    \"popularity\": 10469\n  },\n  {\n    \"tag\": "yogasana",\n    \"popularity\": 10457\n  },\n  {\n    \"tag\": "depoetize",\n    \"popularity\": 10444\n  },\n  {\n    \"tag\": "parousiamania",\n    \"popularity\": 10432\n  },\n  {\n    \"tag\": "longlegs",\n    \"popularity\": 10419\n  },\n  {\n    \"tag\": "gelatinizability",\n    \"popularity\": 10407\n  },\n  {\n    \"tag\": "edeology",\n    \"popularity\": 10394\n  },\n  {\n    \"tag\": "sodwork",\n    \"popularity\": 10382\n  },\n  {\n    \"tag\": "somnambule",\n    \"popularity\": 10369\n  },\n  {\n    \"tag\": "antiquing",\n    \"popularity\": 10357\n  },\n  {\n    \"tag\": "intaker",\n    \"popularity\": 10344\n  },\n  {\n    \"tag\": "Gerberia",\n    \"popularity\": 10332\n  },\n  {\n    \"tag\": "preadmit",\n    \"popularity\": 10320\n  },\n  {\n    \"tag\": "bullhorn",\n    \"popularity\": 10307\n  },\n  {\n    \"tag\": "sororal",\n    \"popularity\": 10295\n  },\n  {\n    \"tag\": "phaeophyceous",\n    \"popularity\": 10283\n  },\n  {\n    \"tag\": "omphalopsychite",\n    \"popularity\": 10271\n  },\n  {\n    \"tag\": "substantious",\n    \"popularity\": 10258\n  },\n  {\n    \"tag\": "undemonstratively",\n    \"popularity\": 10246\n  },\n  {\n    \"tag\": "corallike blackit",\n    \"popularity\": 10234\n  },\n  {\n    \"tag\": "amoebous",\n    \"popularity\": 10222\n  },\n  {\n    \"tag\": "Polypodium",\n    \"popularity\": 10210\n  },\n  {\n    \"tag\": "blodite",\n    \"popularity\": 10198\n  },\n  {\n    \"tag\": "hordarian",\n    \"popularity\": 10186\n  },\n  {\n    \"tag\": "nonmoral",\n    \"popularity\": 10174\n  },\n  {\n    \"tag\": "dredgeful",\n    \"popularity\": 10162\n  },\n  {\n    \"tag\": "nourishingly",\n    \"popularity\": 10150\n  },\n  {\n    \"tag\": "seamy",\n    \"popularity\": 10138\n  },\n  {\n    \"tag\": "vara",\n    \"popularity\": 10126\n  },\n  {\n    \"tag\": "incorruptibleness",\n    \"popularity\": 10114\n  },\n  {\n    \"tag\": "manipulator",\n    \"popularity\": 10102\n  },\n  {\n    \"tag\": "chromodiascope uncountably",\n    \"popularity\": 10090\n  },\n  {\n    \"tag\": "typhemia",\n    \"popularity\": 10078\n  },\n  {\n    \"tag\": "Smalcaldic",\n    \"popularity\": 10066\n  },\n  {\n    \"tag\": "precontrive",\n    \"popularity\": 10054\n  },\n  {\n    \"tag\": "sowarry",\n    \"popularity\": 10042\n  },\n  {\n    \"tag\": "monopodic",\n    \"popularity\": 10031\n  },\n  {\n    \"tag\": "recodify",\n    \"popularity\": 10019\n  },\n  {\n    \"tag\": "phosphowolframic rimple",\n    \"popularity\": 10007\n  },\n  {\n    \"tag\": "triconch",\n    \"popularity\": 9995\n  },\n  {\n    \"tag\": "pycnodontoid",\n    \"popularity\": 9984\n  },\n  {\n    \"tag\": "bradyspermatism",\n    \"popularity\": 9972\n  },\n  {\n    \"tag\": "extensionist",\n    \"popularity\": 9960\n  },\n  {\n    \"tag\": "characterize",\n    \"popularity\": 9949\n  },\n  {\n    \"tag\": "anatreptic proteolytic",\n    \"popularity\": 9937\n  },\n  {\n    \"tag\": "waterboard",\n    \"popularity\": 9925\n  },\n  {\n    \"tag\": "allopathically",\n    \"popularity\": 9914\n  },\n  {\n    \"tag\": "arithmetician",\n    \"popularity\": 9902\n  },\n  {\n    \"tag\": "subsist",\n    \"popularity\": 9891\n  },\n  {\n    \"tag\": "Islamitish",\n    \"popularity\": 9879\n  },\n  {\n    \"tag\": "biddy",\n    \"popularity\": 9868\n  },\n  {\n    \"tag\": "reverberation",\n    \"popularity\": 9856\n  },\n  {\n    \"tag\": "Zaporogue",\n    \"popularity\": 9845\n  },\n  {\n    \"tag\": "soapberry",\n    \"popularity\": 9833\n  },\n  {\n    \"tag\": "physiognomics",\n    \"popularity\": 9822\n  },\n  {\n    \"tag\": "hospitalization",\n    \"popularity\": 9810\n  },\n  {\n    \"tag\": "dissembler",\n    \"popularity\": 9799\n  },\n  {\n    \"tag\": "festinate",\n    \"popularity\": 9788\n  },\n  {\n    \"tag\": "angiectopia",\n    \"popularity\": 9776\n  },\n  {\n    \"tag\": "Pulicidae",\n    \"popularity\": 9765\n  },\n  {\n    \"tag\": "beslimer",\n    \"popularity\": 9754\n  },\n  {\n    \"tag\": "nontreaty",\n    \"popularity\": 9743\n  },\n  {\n    \"tag\": "unhaggled",\n    \"popularity\": 9731\n  },\n  {\n    \"tag\": "catfall",\n    \"popularity\": 9720\n  },\n  {\n    \"tag\": "stola",\n    \"popularity\": 9709\n  },\n  {\n    \"tag\": "pataco",\n    \"popularity\": 9698\n  },\n  {\n    \"tag\": "ontologistic",\n    \"popularity\": 9686\n  },\n  {\n    \"tag\": "aerosphere",\n    \"popularity\": 9675\n  },\n  {\n    \"tag\": "deobstruent",\n    \"popularity\": 9664\n  },\n  {\n    \"tag\": "threepence",\n    \"popularity\": 9653\n  },\n  {\n    \"tag\": "cyprinoid",\n    \"popularity\": 9642\n  },\n  {\n    \"tag\": "overbank",\n    \"popularity\": 9631\n  },\n  {\n    \"tag\": "prostyle",\n    \"popularity\": 9620\n  },\n  {\n    \"tag\": "photoactivation",\n    \"popularity\": 9609\n  },\n  {\n    \"tag\": "homothetic",\n    \"popularity\": 9598\n  },\n  {\n    \"tag\": "roguedom",\n    \"popularity\": 9587\n  },\n  {\n    \"tag\": "underschool",\n    \"popularity\": 9576\n  },\n  {\n    \"tag\": "tractility",\n    \"popularity\": 9565\n  },\n  {\n    \"tag\": "gardenin",\n    \"popularity\": 9554\n  },\n  {\n    \"tag\": "Micromastictora",\n    \"popularity\": 9543\n  },\n  {\n    \"tag\": "gossypine",\n    \"popularity\": 9532\n  },\n  {\n    \"tag\": "amylodyspepsia",\n    \"popularity\": 9521\n  },\n  {\n    \"tag\": "Luciana",\n    \"popularity\": 9510\n  },\n  {\n    \"tag\": "meetly nonfisherman",\n    \"popularity\": 9500\n  },\n  {\n    \"tag\": "backhanded",\n    \"popularity\": 9489\n  },\n  {\n    \"tag\": "decrustation",\n    \"popularity\": 9478\n  },\n  {\n    \"tag\": "pinrail",\n    \"popularity\": 9467\n  },\n  {\n    \"tag\": "Mahori",\n    \"popularity\": 9456\n  },\n  {\n    \"tag\": "unsizable",\n    \"popularity\": 9446\n  },\n  {\n    \"tag\": "disawa",\n    \"popularity\": 9435\n  },\n  {\n    \"tag\": "launderability inconsidered",\n    \"popularity\": 9424\n  },\n  {\n    \"tag\": "unclassical",\n    \"popularity\": 9414\n  },\n  {\n    \"tag\": "inobtrusiveness",\n    \"popularity\": 9403\n  },\n  {\n    \"tag\": "sialogenous",\n    \"popularity\": 9392\n  },\n  {\n    \"tag\": "sulphonamide",\n    \"popularity\": 9382\n  },\n  {\n    \"tag\": "diluvion",\n    \"popularity\": 9371\n  },\n  {\n    \"tag\": "deuteranope",\n    \"popularity\": 9361\n  },\n  {\n    \"tag\": "addition",\n    \"popularity\": 9350\n  },\n  {\n    \"tag\": "bockeret",\n    \"popularity\": 9339\n  },\n  {\n    \"tag\": "unidentified",\n    \"popularity\": 9329\n  },\n  {\n    \"tag\": "caryatic",\n    \"popularity\": 9318\n  },\n  {\n    \"tag\": "misattribution",\n    \"popularity\": 9308\n  },\n  {\n    \"tag\": "outray",\n    \"popularity\": 9297\n  },\n  {\n    \"tag\": "areometrical",\n    \"popularity\": 9287\n  },\n  {\n    \"tag\": "antilogism",\n    \"popularity\": 9277\n  },\n  {\n    \"tag\": "inadjustable",\n    \"popularity\": 9266\n  },\n  {\n    \"tag\": "byssus",\n    \"popularity\": 9256\n  },\n  {\n    \"tag\": "trun",\n    \"popularity\": 9245\n  },\n  {\n    \"tag\": "thereology",\n    \"popularity\": 9235\n  },\n  {\n    \"tag\": "extort",\n    \"popularity\": 9225\n  },\n  {\n    \"tag\": "bumpkin",\n    \"popularity\": 9214\n  },\n  {\n    \"tag\": "sulphobenzide",\n    \"popularity\": 9204\n  },\n  {\n    \"tag\": "hydrogeology",\n    \"popularity\": 9194\n  },\n  {\n    \"tag\": "nidulariaceous",\n    \"popularity\": 9183\n  },\n  {\n    \"tag\": "propodiale",\n    \"popularity\": 9173\n  },\n  {\n    \"tag\": "fierily",\n    \"popularity\": 9163\n  },\n  {\n    \"tag\": "aerotonometry",\n    \"popularity\": 9153\n  },\n  {\n    \"tag\": "pelobatid oversuperstitious",\n    \"popularity\": 9142\n  },\n  {\n    \"tag\": "restringent",\n    \"popularity\": 9132\n  },\n  {\n    \"tag\": "tetrapodic",\n    \"popularity\": 9122\n  },\n  {\n    \"tag\": "heroicness Vendidad",\n    \"popularity\": 9112\n  },\n  {\n    \"tag\": "Sphingurus",\n    \"popularity\": 9102\n  },\n  {\n    \"tag\": "sclerote",\n    \"popularity\": 9092\n  },\n  {\n    \"tag\": "unkeyed",\n    \"popularity\": 9082\n  },\n  {\n    \"tag\": "superparliamentary",\n    \"popularity\": 9072\n  },\n  {\n    \"tag\": "hetericism",\n    \"popularity\": 9061\n  },\n  {\n    \"tag\": "hucklebone",\n    \"popularity\": 9051\n  },\n  {\n    \"tag\": "yojan",\n    \"popularity\": 9041\n  },\n  {\n    \"tag\": "bossed",\n    \"popularity\": 9031\n  },\n  {\n    \"tag\": "spiderwork",\n    \"popularity\": 9021\n  },\n  {\n    \"tag\": "millfeed dullery",\n    \"popularity\": 9011\n  },\n  {\n    \"tag\": "adnoun",\n    \"popularity\": 9001\n  },\n  {\n    \"tag\": "mesometric",\n    \"popularity\": 8992\n  },\n  {\n    \"tag\": "doublehandedness",\n    \"popularity\": 8982\n  },\n  {\n    \"tag\": "suppurant",\n    \"popularity\": 8972\n  },\n  {\n    \"tag\": "Berlinize",\n    \"popularity\": 8962\n  },\n  {\n    \"tag\": "sontag",\n    \"popularity\": 8952\n  },\n  {\n    \"tag\": "biplane",\n    \"popularity\": 8942\n  },\n  {\n    \"tag\": "insula",\n    \"popularity\": 8932\n  },\n  {\n    \"tag\": "unbrand",\n    \"popularity\": 8922\n  },\n  {\n    \"tag\": "Basilosaurus",\n    \"popularity\": 8913\n  },\n  {\n    \"tag\": "prenomination",\n    \"popularity\": 8903\n  },\n  {\n    \"tag\": "untextual",\n    \"popularity\": 8893\n  },\n  {\n    \"tag\": "coleslaw",\n    \"popularity\": 8883\n  },\n  {\n    \"tag\": "langsyne",\n    \"popularity\": 8874\n  },\n  {\n    \"tag\": "impede",\n    \"popularity\": 8864\n  },\n  {\n    \"tag\": "irrigator",\n    \"popularity\": 8854\n  },\n  {\n    \"tag\": "deflocculation",\n    \"popularity\": 8844\n  },\n  {\n    \"tag\": "narghile",\n    \"popularity\": 8835\n  },\n  {\n    \"tag\": "unguardedly ebenaceous",\n    \"popularity\": 8825\n  },\n  {\n    \"tag\": "conversantly subocular",\n    \"popularity\": 8815\n  },\n  {\n    \"tag\": "hydroponic",\n    \"popularity\": 8806\n  },\n  {\n    \"tag\": "anthropopsychism",\n    \"popularity\": 8796\n  },\n  {\n    \"tag\": "panoptic",\n    \"popularity\": 8787\n  },\n  {\n    \"tag\": "insufferable",\n    \"popularity\": 8777\n  },\n  {\n    \"tag\": "salema",\n    \"popularity\": 8768\n  },\n  {\n    \"tag\": "Myriapoda",\n    \"popularity\": 8758\n  },\n  {\n    \"tag\": "regarrison",\n    \"popularity\": 8748\n  },\n  {\n    \"tag\": "overlearned",\n    \"popularity\": 8739\n  },\n  {\n    \"tag\": "ultraroyalist conventical bureaucratical",\n    \"popularity\": 8729\n  },\n  {\n    \"tag\": "epicaridan",\n    \"popularity\": 8720\n  },\n  {\n    \"tag\": "poetastress",\n    \"popularity\": 8711\n  },\n  {\n    \"tag\": "monophthalmus",\n    \"popularity\": 8701\n  },\n  {\n    \"tag\": "simnel",\n    \"popularity\": 8692\n  },\n  {\n    \"tag\": "compotor",\n    \"popularity\": 8682\n  },\n  {\n    \"tag\": "hydrolase",\n    \"popularity\": 8673\n  },\n  {\n    \"tag\": "attemptless",\n    \"popularity\": 8663\n  },\n  {\n    \"tag\": "visceroptosis",\n    \"popularity\": 8654\n  },\n  {\n    \"tag\": "unpreparedly",\n    \"popularity\": 8645\n  },\n  {\n    \"tag\": "mastage",\n    \"popularity\": 8635\n  },\n  {\n    \"tag\": "preinfluence",\n    \"popularity\": 8626\n  },\n  {\n    \"tag\": "Siwan",\n    \"popularity\": 8617\n  },\n  {\n    \"tag\": "ceratotheca belvedere",\n    \"popularity\": 8607\n  },\n  {\n    \"tag\": "disenablement",\n    \"popularity\": 8598\n  },\n  {\n    \"tag\": "nine",\n    \"popularity\": 8589\n  },\n  {\n    \"tag\": "spellingdown abridgment",\n    \"popularity\": 8580\n  },\n  {\n    \"tag\": "twilightless",\n    \"popularity\": 8571\n  },\n  {\n    \"tag\": "overflow",\n    \"popularity\": 8561\n  },\n  {\n    \"tag\": "mismeasurement",\n    \"popularity\": 8552\n  },\n  {\n    \"tag\": "nawabship",\n    \"popularity\": 8543\n  },\n  {\n    \"tag\": "Phrynosoma",\n    \"popularity\": 8534\n  },\n  {\n    \"tag\": "unanticipatingly",\n    \"popularity\": 8525\n  },\n  {\n    \"tag\": "blankite",\n    \"popularity\": 8516\n  },\n  {\n    \"tag\": "role",\n    \"popularity\": 8506\n  },\n  {\n    \"tag\": "peperine edelweiss",\n    \"popularity\": 8497\n  },\n  {\n    \"tag\": "unhysterical",\n    \"popularity\": 8488\n  },\n  {\n    \"tag\": "attentiveness",\n    \"popularity\": 8479\n  },\n  {\n    \"tag\": "scintillant",\n    \"popularity\": 8470\n  },\n  {\n    \"tag\": "stenostomatous",\n    \"popularity\": 8461\n  },\n  {\n    \"tag\": "pectinite",\n    \"popularity\": 8452\n  },\n  {\n    \"tag\": "herring",\n    \"popularity\": 8443\n  },\n  {\n    \"tag\": "interroom",\n    \"popularity\": 8434\n  },\n  {\n    \"tag\": "laccol",\n    \"popularity\": 8425\n  },\n  {\n    \"tag\": "unpartably kylite",\n    \"popularity\": 8416\n  },\n  {\n    \"tag\": "spirivalve",\n    \"popularity\": 8407\n  },\n  {\n    \"tag\": "hoosegow",\n    \"popularity\": 8398\n  },\n  {\n    \"tag\": "doat",\n    \"popularity\": 8389\n  },\n  {\n    \"tag\": "amphibian",\n    \"popularity\": 8380\n  },\n  {\n    \"tag\": "exposit",\n    \"popularity\": 8371\n  },\n  {\n    \"tag\": "canopy",\n    \"popularity\": 8363\n  },\n  {\n    \"tag\": "houndlike",\n    \"popularity\": 8354\n  },\n  {\n    \"tag\": "spikebill",\n    \"popularity\": 8345\n  },\n  {\n    \"tag\": "wiseacre pyrotechnic",\n    \"popularity\": 8336\n  },\n  {\n    \"tag\": "confessingly woodman",\n    \"popularity\": 8327\n  },\n  {\n    \"tag\": "overside",\n    \"popularity\": 8318\n  },\n  {\n    \"tag\": "oftwhiles",\n    \"popularity\": 8310\n  },\n  {\n    \"tag\": "Musophagidae",\n    \"popularity\": 8301\n  },\n  {\n    \"tag\": "slumberer",\n    \"popularity\": 8292\n  },\n  {\n    \"tag\": "leiotrichy",\n    \"popularity\": 8283\n  },\n  {\n    \"tag\": "Mantispidae",\n    \"popularity\": 8275\n  },\n  {\n    \"tag\": "perceptually",\n    \"popularity\": 8266\n  },\n  {\n    \"tag\": "biller",\n    \"popularity\": 8257\n  },\n  {\n    \"tag\": "eudaemonical",\n    \"popularity\": 8249\n  },\n  {\n    \"tag\": "underfiend",\n    \"popularity\": 8240\n  },\n  {\n    \"tag\": "impartible",\n    \"popularity\": 8231\n  },\n  {\n    \"tag\": "saxicavous",\n    \"popularity\": 8223\n  },\n  {\n    \"tag\": "yapster",\n    \"popularity\": 8214\n  },\n  {\n    \"tag\": "aliseptal",\n    \"popularity\": 8205\n  },\n  {\n    \"tag\": "omniparient",\n    \"popularity\": 8197\n  },\n  {\n    \"tag\": "nishiki",\n    \"popularity\": 8188\n  },\n  {\n    \"tag\": "yuzluk",\n    \"popularity\": 8180\n  },\n  {\n    \"tag\": "solderer",\n    \"popularity\": 8171\n  },\n  {\n    \"tag\": "Pinna",\n    \"popularity\": 8162\n  },\n  {\n    \"tag\": "reinterfere",\n    \"popularity\": 8154\n  },\n  {\n    \"tag\": "superepic",\n    \"popularity\": 8145\n  },\n  {\n    \"tag\": "ronquil",\n    \"popularity\": 8137\n  },\n  {\n    \"tag\": "bratstvo",\n    \"popularity\": 8128\n  },\n  {\n    \"tag\": "Thea",\n    \"popularity\": 8120\n  },\n  {\n    \"tag\": "hermaphroditical",\n    \"popularity\": 8111\n  },\n  {\n    \"tag\": "enlief",\n    \"popularity\": 8103\n  },\n  {\n    \"tag\": "Jesuate",\n    \"popularity\": 8095\n  },\n  {\n    \"tag\": "gaysome",\n    \"popularity\": 8086\n  },\n  {\n    \"tag\": "iliohypogastric",\n    \"popularity\": 8078\n  },\n  {\n    \"tag\": "regardance",\n    \"popularity\": 8069\n  },\n  {\n    \"tag\": "cumulately",\n    \"popularity\": 8061\n  },\n  {\n    \"tag\": "haustorial nucleolocentrosome",\n    \"popularity\": 8053\n  },\n  {\n    \"tag\": "cosmocrat",\n    \"popularity\": 8044\n  },\n  {\n    \"tag\": "onyxitis",\n    \"popularity\": 8036\n  },\n  {\n    \"tag\": "Cabinda",\n    \"popularity\": 8028\n  },\n  {\n    \"tag\": "coresort",\n    \"popularity\": 8019\n  },\n  {\n    \"tag\": "drusy preformant",\n    \"popularity\": 8011\n  },\n  {\n    \"tag\": "piningly",\n    \"popularity\": 8003\n  },\n  {\n    \"tag\": "bootlessly",\n    \"popularity\": 7994\n  },\n  {\n    \"tag\": "talari",\n    \"popularity\": 7986\n  },\n  {\n    \"tag\": "amidoacetal",\n    \"popularity\": 7978\n  },\n  {\n    \"tag\": "pschent",\n    \"popularity\": 7970\n  },\n  {\n    \"tag\": "consumptional scarer titivate",\n    \"popularity\": 7962\n  },\n  {\n    \"tag\": "Anserinae",\n    \"popularity\": 7953\n  },\n  {\n    \"tag\": "flaunter",\n    \"popularity\": 7945\n  },\n  {\n    \"tag\": "reindeer",\n    \"popularity\": 7937\n  },\n  {\n    \"tag\": "disparage",\n    \"popularity\": 7929\n  },\n  {\n    \"tag\": "superheat",\n    \"popularity\": 7921\n  },\n  {\n    \"tag\": "Chromatium",\n    \"popularity\": 7912\n  },\n  {\n    \"tag\": "Tina",\n    \"popularity\": 7904\n  },\n  {\n    \"tag\": "rededicatory",\n    \"popularity\": 7896\n  },\n  {\n    \"tag\": "nontransient",\n    \"popularity\": 7888\n  },\n  {\n    \"tag\": "Phocaean brinkless",\n    \"popularity\": 7880\n  },\n  {\n    \"tag\": "ventriculose",\n    \"popularity\": 7872\n  },\n  {\n    \"tag\": "upplough",\n    \"popularity\": 7864\n  },\n  {\n    \"tag\": "succorless",\n    \"popularity\": 7856\n  },\n  {\n    \"tag\": "hayrake",\n    \"popularity\": 7848\n  },\n  {\n    \"tag\": "merriness amorphia",\n    \"popularity\": 7840\n  },\n  {\n    \"tag\": "merycism",\n    \"popularity\": 7832\n  },\n  {\n    \"tag\": "checkrow",\n    \"popularity\": 7824\n  },\n  {\n    \"tag\": "scry",\n    \"popularity\": 7816\n  },\n  {\n    \"tag\": "obvolve",\n    \"popularity\": 7808\n  },\n  {\n    \"tag\": "orchard",\n    \"popularity\": 7800\n  },\n  {\n    \"tag\": "isomerize",\n    \"popularity\": 7792\n  },\n  {\n    \"tag\": "competitrix",\n    \"popularity\": 7784\n  },\n  {\n    \"tag\": "unbannered",\n    \"popularity\": 7776\n  },\n  {\n    \"tag\": "undoctrined",\n    \"popularity\": 7768\n  },\n  {\n    \"tag\": "theologian",\n    \"popularity\": 7760\n  },\n  {\n    \"tag\": "nebby",\n    \"popularity\": 7752\n  },\n  {\n    \"tag\": "Cardiazol",\n    \"popularity\": 7745\n  },\n  {\n    \"tag\": "phagedenic",\n    \"popularity\": 7737\n  },\n  {\n    \"tag\": "nostalgic",\n    \"popularity\": 7729\n  },\n  {\n    \"tag\": "orthodoxy",\n    \"popularity\": 7721\n  },\n  {\n    \"tag\": "oversanguine",\n    \"popularity\": 7713\n  },\n  {\n    \"tag\": "lish",\n    \"popularity\": 7705\n  },\n  {\n    \"tag\": "ketogenic",\n    \"popularity\": 7698\n  },\n  {\n    \"tag\": "syndicalize",\n    \"popularity\": 7690\n  },\n  {\n    \"tag\": "leeftail",\n    \"popularity\": 7682\n  },\n  {\n    \"tag\": "bulbomedullary",\n    \"popularity\": 7674\n  },\n  {\n    \"tag\": "reletter",\n    \"popularity\": 7667\n  },\n  {\n    \"tag\": "bitterly",\n    \"popularity\": 7659\n  },\n  {\n    \"tag\": "participatory",\n    \"popularity\": 7651\n  },\n  {\n    \"tag\": "baldberry",\n    \"popularity\": 7643\n  },\n  {\n    \"tag\": "prowaterpower",\n    \"popularity\": 7636\n  },\n  {\n    \"tag\": "lexicographical",\n    \"popularity\": 7628\n  },\n  {\n    \"tag\": "Anisodactyli",\n    \"popularity\": 7620\n  },\n  {\n    \"tag\": "amphipodous",\n    \"popularity\": 7613\n  },\n  {\n    \"tag\": "triglandular",\n    \"popularity\": 7605\n  },\n  {\n    \"tag\": "xanthopsin",\n    \"popularity\": 7597\n  },\n  {\n    \"tag\": "indefinitude",\n    \"popularity\": 7590\n  },\n  {\n    \"tag\": "bookworm",\n    \"popularity\": 7582\n  },\n  {\n    \"tag\": "suffocative",\n    \"popularity\": 7574\n  },\n  {\n    \"tag\": "uncongested tyrant",\n    \"popularity\": 7567\n  },\n  {\n    \"tag\": "alow harmoniously Pamir",\n    \"popularity\": 7559\n  },\n  {\n    \"tag\": "monander",\n    \"popularity\": 7552\n  },\n  {\n    \"tag\": "bagatelle",\n    \"popularity\": 7544\n  },\n  {\n    \"tag\": "membranology",\n    \"popularity\": 7537\n  },\n  {\n    \"tag\": "parturifacient",\n    \"popularity\": 7529\n  },\n  {\n    \"tag\": "excitovascular",\n    \"popularity\": 7522\n  },\n  {\n    \"tag\": "homopolar",\n    \"popularity\": 7514\n  },\n  {\n    \"tag\": "phobiac",\n    \"popularity\": 7507\n  },\n  {\n    \"tag\": "clype",\n    \"popularity\": 7499\n  },\n  {\n    \"tag\": "unsubversive",\n    \"popularity\": 7492\n  },\n  {\n    \"tag\": "bostrychoidal scorpionwort",\n    \"popularity\": 7484\n  },\n  {\n    \"tag\": "biliteralism",\n    \"popularity\": 7477\n  },\n  {\n    \"tag\": "dentatocostate",\n    \"popularity\": 7469\n  },\n  {\n    \"tag\": "Pici",\n    \"popularity\": 7462\n  },\n  {\n    \"tag\": "sideritic",\n    \"popularity\": 7454\n  },\n  {\n    \"tag\": "syntaxis",\n    \"popularity\": 7447\n  },\n  {\n    \"tag\": "ingest",\n    \"popularity\": 7440\n  },\n  {\n    \"tag\": "rigmarolish",\n    \"popularity\": 7432\n  },\n  {\n    \"tag\": "ocreaceous",\n    \"popularity\": 7425\n  },\n  {\n    \"tag\": "hyperbrachyskelic",\n    \"popularity\": 7418\n  },\n  {\n    \"tag\": "basophobia",\n    \"popularity\": 7410\n  },\n  {\n    \"tag\": "substantialness",\n    \"popularity\": 7403\n  },\n  {\n    \"tag\": "agglutinoid",\n    \"popularity\": 7396\n  },\n  {\n    \"tag\": "longleaf",\n    \"popularity\": 7388\n  },\n  {\n    \"tag\": "electroengraving",\n    \"popularity\": 7381\n  },\n  {\n    \"tag\": "laparoenterotomy",\n    \"popularity\": 7374\n  },\n  {\n    \"tag\": "oxalylurea",\n    \"popularity\": 7366\n  },\n  {\n    \"tag\": "unattaintedly",\n    \"popularity\": 7359\n  },\n  {\n    \"tag\": "pennystone",\n    \"popularity\": 7352\n  },\n  {\n    \"tag\": "Plumbaginaceae",\n    \"popularity\": 7345\n  },\n  {\n    \"tag\": "horntip",\n    \"popularity\": 7337\n  },\n  {\n    \"tag\": "begrudge",\n    \"popularity\": 7330\n  },\n  {\n    \"tag\": "bechignoned",\n    \"popularity\": 7323\n  },\n  {\n    \"tag\": "hologonidium",\n    \"popularity\": 7316\n  },\n  {\n    \"tag\": "Pulian",\n    \"popularity\": 7309\n  },\n  {\n    \"tag\": "gratulation",\n    \"popularity\": 7301\n  },\n  {\n    \"tag\": "Sebright",\n    \"popularity\": 7294\n  },\n  {\n    \"tag\": "coinstantaneous emotionally",\n    \"popularity\": 7287\n  },\n  {\n    \"tag\": "thoracostracan",\n    \"popularity\": 7280\n  },\n  {\n    \"tag\": "saurodont",\n    \"popularity\": 7273\n  },\n  {\n    \"tag\": "coseat",\n    \"popularity\": 7266\n  },\n  {\n    \"tag\": "irascibility",\n    \"popularity\": 7259\n  },\n  {\n    \"tag\": "occlude",\n    \"popularity\": 7251\n  },\n  {\n    \"tag\": "metallurgist",\n    \"popularity\": 7244\n  },\n  {\n    \"tag\": "extraviolet",\n    \"popularity\": 7237\n  },\n  {\n    \"tag\": "clinic",\n    \"popularity\": 7230\n  },\n  {\n    \"tag\": "skater",\n    \"popularity\": 7223\n  },\n  {\n    \"tag\": "linguistic",\n    \"popularity\": 7216\n  },\n  {\n    \"tag\": "attacheship",\n    \"popularity\": 7209\n  },\n  {\n    \"tag\": "Rachianectes",\n    \"popularity\": 7202\n  },\n  {\n    \"tag\": "foliolose",\n    \"popularity\": 7195\n  },\n  {\n    \"tag\": "claudetite",\n    \"popularity\": 7188\n  },\n  {\n    \"tag\": "aphidian scratching",\n    \"popularity\": 7181\n  },\n  {\n    \"tag\": "Carida",\n    \"popularity\": 7174\n  },\n  {\n    \"tag\": "tiepin polymicroscope",\n    \"popularity\": 7167\n  },\n  {\n    \"tag\": "telpherage",\n    \"popularity\": 7160\n  },\n  {\n    \"tag\": "meek",\n    \"popularity\": 7153\n  },\n  {\n    \"tag\": "swiftness",\n    \"popularity\": 7146\n  },\n  {\n    \"tag\": "gentes",\n    \"popularity\": 7139\n  },\n  {\n    \"tag\": "uncommemorated",\n    \"popularity\": 7132\n  },\n  {\n    \"tag\": "Lazarus",\n    \"popularity\": 7125\n  },\n  {\n    \"tag\": "redivive",\n    \"popularity\": 7119\n  },\n  {\n    \"tag\": "nonfebrile",\n    \"popularity\": 7112\n  },\n  {\n    \"tag\": "nymphet",\n    \"popularity\": 7105\n  },\n  {\n    \"tag\": "areologically",\n    \"popularity\": 7098\n  },\n  {\n    \"tag\": "undonkey",\n    \"popularity\": 7091\n  },\n  {\n    \"tag\": "projecting",\n    \"popularity\": 7084\n  },\n  {\n    \"tag\": "pinnigrade",\n    \"popularity\": 7077\n  },\n  {\n    \"tag\": "butylation",\n    \"popularity\": 7071\n  },\n  {\n    \"tag\": "philologistic lenticle",\n    \"popularity\": 7064\n  },\n  {\n    \"tag\": "nooky",\n    \"popularity\": 7057\n  },\n  {\n    \"tag\": "incestuousness",\n    \"popularity\": 7050\n  },\n  {\n    \"tag\": "palingenetically",\n    \"popularity\": 7043\n  },\n  {\n    \"tag\": "mitochondria",\n    \"popularity\": 7037\n  },\n  {\n    \"tag\": "truthify",\n    \"popularity\": 7030\n  },\n  {\n    \"tag\": "titanyl",\n    \"popularity\": 7023\n  },\n  {\n    \"tag\": "bestride",\n    \"popularity\": 7016\n  },\n  {\n    \"tag\": "chende",\n    \"popularity\": 7010\n  },\n  {\n    \"tag\": "Chaucerian monophote",\n    \"popularity\": 7003\n  },\n  {\n    \"tag\": "cutback",\n    \"popularity\": 6996\n  },\n  {\n    \"tag\": "unpatiently",\n    \"popularity\": 6989\n  },\n  {\n    \"tag\": "subvitreous",\n    \"popularity\": 6983\n  },\n  {\n    \"tag\": "organizable",\n    \"popularity\": 6976\n  },\n  {\n    \"tag\": "anniverse uncomprehensible",\n    \"popularity\": 6969\n  },\n  {\n    \"tag\": "hyalescence",\n    \"popularity\": 6963\n  },\n  {\n    \"tag\": "amniochorial",\n    \"popularity\": 6956\n  },\n  {\n    \"tag\": "Corybantian",\n    \"popularity\": 6949\n  },\n  {\n    \"tag\": "genocide Scaphitidae",\n    \"popularity\": 6943\n  },\n  {\n    \"tag\": "accordionist",\n    \"popularity\": 6936\n  },\n  {\n    \"tag\": "becheck",\n    \"popularity\": 6930\n  },\n  {\n    \"tag\": "overproduce",\n    \"popularity\": 6923\n  },\n  {\n    \"tag\": "unmaniac frijolillo",\n    \"popularity\": 6916\n  },\n  {\n    \"tag\": "multisulcated",\n    \"popularity\": 6910\n  },\n  {\n    \"tag\": "wennebergite",\n    \"popularity\": 6903\n  },\n  {\n    \"tag\": "tautousious mowth",\n    \"popularity\": 6897\n  },\n  {\n    \"tag\": "marigold",\n    \"popularity\": 6890\n  },\n  {\n    \"tag\": "affray",\n    \"popularity\": 6884\n  },\n  {\n    \"tag\": "nonidolatrous",\n    \"popularity\": 6877\n  },\n  {\n    \"tag\": "aphrasia",\n    \"popularity\": 6871\n  },\n  {\n    \"tag\": "muddlingly",\n    \"popularity\": 6864\n  },\n  {\n    \"tag\": "clear",\n    \"popularity\": 6858\n  },\n  {\n    \"tag\": "Clitoria",\n    \"popularity\": 6851\n  },\n  {\n    \"tag\": "apportionment underwaist",\n    \"popularity\": 6845\n  },\n  {\n    \"tag\": "kodakist",\n    \"popularity\": 6838\n  },\n  {\n    \"tag\": "Momotidae",\n    \"popularity\": 6832\n  },\n  {\n    \"tag\": "cryptovalency",\n    \"popularity\": 6825\n  },\n  {\n    \"tag\": "floe",\n    \"popularity\": 6819\n  },\n  {\n    \"tag\": "aphagia",\n    \"popularity\": 6812\n  },\n  {\n    \"tag\": "brontograph",\n    \"popularity\": 6806\n  },\n  {\n    \"tag\": "tubulous",\n    \"popularity\": 6799\n  },\n  {\n    \"tag\": "unhorse",\n    \"popularity\": 6793\n  },\n  {\n    \"tag\": "chlordane",\n    \"popularity\": 6787\n  },\n  {\n    \"tag\": "colloquy brochan",\n    \"popularity\": 6780\n  },\n  {\n    \"tag\": "sloosh",\n    \"popularity\": 6774\n  },\n  {\n    \"tag\": "battered",\n    \"popularity\": 6767\n  },\n  {\n    \"tag\": "monocularity pluriguttulate",\n    \"popularity\": 6761\n  },\n  {\n    \"tag\": "chiastoneury",\n    \"popularity\": 6755\n  },\n  {\n    \"tag\": "Sanguinaria",\n    \"popularity\": 6748\n  },\n  {\n    \"tag\": "confessionary",\n    \"popularity\": 6742\n  },\n  {\n    \"tag\": "enzymic",\n    \"popularity\": 6736\n  },\n  {\n    \"tag\": "cord",\n    \"popularity\": 6729\n  },\n  {\n    \"tag\": "oviducal",\n    \"popularity\": 6723\n  },\n  {\n    \"tag\": "crozzle outsea",\n    \"popularity\": 6717\n  },\n  {\n    \"tag\": "balladical",\n    \"popularity\": 6710\n  },\n  {\n    \"tag\": "uncollectibleness",\n    \"popularity\": 6704\n  },\n  {\n    \"tag\": "predorsal",\n    \"popularity\": 6698\n  },\n  {\n    \"tag\": "reauthenticate",\n    \"popularity\": 6692\n  },\n  {\n    \"tag\": "ravissant",\n    \"popularity\": 6685\n  },\n  {\n    \"tag\": "advantageousness",\n    \"popularity\": 6679\n  },\n  {\n    \"tag\": "rung",\n    \"popularity\": 6673\n  },\n  {\n    \"tag\": "duncedom",\n    \"popularity\": 6667\n  },\n  {\n    \"tag\": "hematolite",\n    \"popularity\": 6660\n  },\n  {\n    \"tag\": "thisness",\n    \"popularity\": 6654\n  },\n  {\n    \"tag\": "mapau",\n    \"popularity\": 6648\n  },\n  {\n    \"tag\": "Hecatic",\n    \"popularity\": 6642\n  },\n  {\n    \"tag\": "meningoencephalocele",\n    \"popularity\": 6636\n  },\n  {\n    \"tag\": "confection sorra",\n    \"popularity\": 6630\n  },\n  {\n    \"tag\": "unsedate",\n    \"popularity\": 6623\n  },\n  {\n    \"tag\": "meningocerebritis",\n    \"popularity\": 6617\n  },\n  {\n    \"tag\": "biopsychological",\n    \"popularity\": 6611\n  },\n  {\n    \"tag\": "clavicithern",\n    \"popularity\": 6605\n  },\n  {\n    \"tag\": "resun",\n    \"popularity\": 6599\n  },\n  {\n    \"tag\": "bayamo",\n    \"popularity\": 6593\n  },\n  {\n    \"tag\": "seeableness",\n    \"popularity\": 6587\n  },\n  {\n    \"tag\": "hypsidolichocephalism",\n    \"popularity\": 6581\n  },\n  {\n    \"tag\": "salivous",\n    \"popularity\": 6574\n  },\n  {\n    \"tag\": "neumatize",\n    \"popularity\": 6568\n  },\n  {\n    \"tag\": "stree",\n    \"popularity\": 6562\n  },\n  {\n    \"tag\": "markshot",\n    \"popularity\": 6556\n  },\n  {\n    \"tag\": "phraseologically",\n    \"popularity\": 6550\n  },\n  {\n    \"tag\": "yealing",\n    \"popularity\": 6544\n  },\n  {\n    \"tag\": "puggy",\n    \"popularity\": 6538\n  },\n  {\n    \"tag\": "sexadecimal",\n    \"popularity\": 6532\n  },\n  {\n    \"tag\": "unofficerlike",\n    \"popularity\": 6526\n  },\n  {\n    \"tag\": "curiosa",\n    \"popularity\": 6520\n  },\n  {\n    \"tag\": "pedomotor",\n    \"popularity\": 6514\n  },\n  {\n    \"tag\": "astrally",\n    \"popularity\": 6508\n  },\n  {\n    \"tag\": "prosomatic",\n    \"popularity\": 6502\n  },\n  {\n    \"tag\": "bulletheaded",\n    \"popularity\": 6496\n  },\n  {\n    \"tag\": "fortuned",\n    \"popularity\": 6490\n  },\n  {\n    \"tag\": "pixy",\n    \"popularity\": 6484\n  },\n  {\n    \"tag\": "protectrix",\n    \"popularity\": 6478\n  },\n  {\n    \"tag\": "arthritical",\n    \"popularity\": 6472\n  },\n  {\n    \"tag\": "coction",\n    \"popularity\": 6466\n  },\n  {\n    \"tag\": "Anthropos",\n    \"popularity\": 6460\n  },\n  {\n    \"tag\": "runer",\n    \"popularity\": 6454\n  },\n  {\n    \"tag\": "prenotify",\n    \"popularity\": 6449\n  },\n  {\n    \"tag\": "microspheric gastroparalysis",\n    \"popularity\": 6443\n  },\n  {\n    \"tag\": "Jovicentrical",\n    \"popularity\": 6437\n  },\n  {\n    \"tag\": "ceratopsid",\n    \"popularity\": 6431\n  },\n  {\n    \"tag\": "Theodoric",\n    \"popularity\": 6425\n  },\n  {\n    \"tag\": "Pactolus",\n    \"popularity\": 6419\n  },\n  {\n    \"tag\": "spawning",\n    \"popularity\": 6413\n  },\n  {\n    \"tag\": "nonconfidential",\n    \"popularity\": 6407\n  },\n  {\n    \"tag\": "halotrichite infumate",\n    \"popularity\": 6402\n  },\n  {\n    \"tag\": "undiscriminatingly",\n    \"popularity\": 6396\n  },\n  {\n    \"tag\": "unexasperated",\n    \"popularity\": 6390\n  },\n  {\n    \"tag\": "isoeugenol",\n    \"popularity\": 6384\n  },\n  {\n    \"tag\": "pressboard",\n    \"popularity\": 6378\n  },\n  {\n    \"tag\": "unshrew",\n    \"popularity\": 6372\n  },\n  {\n    \"tag\": "huffingly",\n    \"popularity\": 6367\n  },\n  {\n    \"tag\": "wagaun",\n    \"popularity\": 6361\n  },\n  {\n    \"tag\": "squirt Philistine",\n    \"popularity\": 6355\n  },\n  {\n    \"tag\": "kryptic",\n    \"popularity\": 6349\n  },\n  {\n    \"tag\": "paraform",\n    \"popularity\": 6344\n  },\n  {\n    \"tag\": "preverify",\n    \"popularity\": 6338\n  },\n  {\n    \"tag\": "dalar",\n    \"popularity\": 6332\n  },\n  {\n    \"tag\": "interdictor appraisingly",\n    \"popularity\": 6326\n  },\n  {\n    \"tag\": "chipped",\n    \"popularity\": 6321\n  },\n  {\n    \"tag\": "Pteropoda",\n    \"popularity\": 6315\n  },\n  {\n    \"tag\": "Bohairic",\n    \"popularity\": 6309\n  },\n  {\n    \"tag\": "felting",\n    \"popularity\": 6303\n  },\n  {\n    \"tag\": "compurgatorial",\n    \"popularity\": 6298\n  },\n  {\n    \"tag\": "unclead",\n    \"popularity\": 6292\n  },\n  {\n    \"tag\": "stockish",\n    \"popularity\": 6286\n  },\n  {\n    \"tag\": "mulligatawny",\n    \"popularity\": 6281\n  },\n  {\n    \"tag\": "Monotheletism",\n    \"popularity\": 6275\n  },\n  {\n    \"tag\": "lutanist",\n    \"popularity\": 6269\n  },\n  {\n    \"tag\": "gluttonize",\n    \"popularity\": 6264\n  },\n  {\n    \"tag\": "hackneyed",\n    \"popularity\": 6258\n  },\n  {\n    \"tag\": "yield",\n    \"popularity\": 6253\n  },\n  {\n    \"tag\": "sulphonamido",\n    \"popularity\": 6247\n  },\n  {\n    \"tag\": "granulative",\n    \"popularity\": 6241\n  },\n  {\n    \"tag\": "swingy",\n    \"popularity\": 6236\n  },\n  {\n    \"tag\": "Desmidiales",\n    \"popularity\": 6230\n  },\n  {\n    \"tag\": "tootlish",\n    \"popularity\": 6224\n  },\n  {\n    \"tag\": "unsatisfiedly",\n    \"popularity\": 6219\n  },\n  {\n    \"tag\": "burucha",\n    \"popularity\": 6213\n  },\n  {\n    \"tag\": "premeditatingly",\n    \"popularity\": 6208\n  },\n  {\n    \"tag\": "cowrie",\n    \"popularity\": 6202\n  },\n  {\n    \"tag\": "pleurolysis",\n    \"popularity\": 6197\n  },\n  {\n    \"tag\": "nationalist",\n    \"popularity\": 6191\n  },\n  {\n    \"tag\": "Pholadacea",\n    \"popularity\": 6186\n  },\n  {\n    \"tag\": "anakrousis",\n    \"popularity\": 6180\n  },\n  {\n    \"tag\": "proctorial",\n    \"popularity\": 6175\n  },\n  {\n    \"tag\": "cavillation",\n    \"popularity\": 6169\n  },\n  {\n    \"tag\": "cervicobregmatic",\n    \"popularity\": 6163\n  },\n  {\n    \"tag\": "interspecific",\n    \"popularity\": 6158\n  },\n  {\n    \"tag\": "Teutonity",\n    \"popularity\": 6152\n  },\n  {\n    \"tag\": "snakeholing",\n    \"popularity\": 6147\n  },\n  {\n    \"tag\": "balcony",\n    \"popularity\": 6142\n  },\n  {\n    \"tag\": "latchless",\n    \"popularity\": 6136\n  },\n  {\n    \"tag\": "Mithraea",\n    \"popularity\": 6131\n  },\n  {\n    \"tag\": "pseudepigraph",\n    \"popularity\": 6125\n  },\n  {\n    \"tag\": "flosser",\n    \"popularity\": 6120\n  },\n  {\n    \"tag\": "kotyle",\n    \"popularity\": 6114\n  },\n  {\n    \"tag\": "outdo",\n    \"popularity\": 6109\n  },\n  {\n    \"tag\": "interclerical",\n    \"popularity\": 6103\n  },\n  {\n    \"tag\": "aurar",\n    \"popularity\": 6098\n  },\n  {\n    \"tag\": "apophyseal",\n    \"popularity\": 6093\n  },\n  {\n    \"tag\": "Miro",\n    \"popularity\": 6087\n  },\n  {\n    \"tag\": "Priscillian",\n    \"popularity\": 6082\n  },\n  {\n    \"tag\": "alluvia",\n    \"popularity\": 6076\n  },\n  {\n    \"tag\": "exordize",\n    \"popularity\": 6071\n  },\n  {\n    \"tag\": "breakage",\n    \"popularity\": 6066\n  },\n  {\n    \"tag\": "unclosable",\n    \"popularity\": 6060\n  },\n  {\n    \"tag\": "monocondylous",\n    \"popularity\": 6055\n  },\n  {\n    \"tag\": "dyarchy",\n    \"popularity\": 6050\n  },\n  {\n    \"tag\": "subchelate",\n    \"popularity\": 6044\n  },\n  {\n    \"tag\": "hearsay",\n    \"popularity\": 6039\n  },\n  {\n    \"tag\": "prestigiously",\n    \"popularity\": 6034\n  },\n  {\n    \"tag\": "unimuscular",\n    \"popularity\": 6028\n  },\n  {\n    \"tag\": "lingwort",\n    \"popularity\": 6023\n  },\n  {\n    \"tag\": "jealous",\n    \"popularity\": 6018\n  },\n  {\n    \"tag\": "artilleryman",\n    \"popularity\": 6012\n  },\n  {\n    \"tag\": "phantasmagorially",\n    \"popularity\": 6007\n  },\n  {\n    \"tag\": "stagnum",\n    \"popularity\": 6002\n  },\n  {\n    \"tag\": "organotropism shatteringly",\n    \"popularity\": 5997\n  },\n  {\n    \"tag\": "Mytilus Hebraist",\n    \"popularity\": 5991\n  },\n  {\n    \"tag\": "returf",\n    \"popularity\": 5986\n  },\n  {\n    \"tag\": "townfolk",\n    \"popularity\": 5981\n  },\n  {\n    \"tag\": "propitiative",\n    \"popularity\": 5976\n  },\n  {\n    \"tag\": "Anita unsullied",\n    \"popularity\": 5970\n  },\n  {\n    \"tag\": "bandoleered",\n    \"popularity\": 5965\n  },\n  {\n    \"tag\": "cubby",\n    \"popularity\": 5960\n  },\n  {\n    \"tag\": "Hexanchus",\n    \"popularity\": 5955\n  },\n  {\n    \"tag\": "circuminsular",\n    \"popularity\": 5949\n  },\n  {\n    \"tag\": "chamberletted eumycete",\n    \"popularity\": 5944\n  },\n  {\n    \"tag\": "secure",\n    \"popularity\": 5939\n  },\n  {\n    \"tag\": "Edwardean",\n    \"popularity\": 5934\n  },\n  {\n    \"tag\": "strenth",\n    \"popularity\": 5929\n  },\n  {\n    \"tag\": "exhaustless",\n    \"popularity\": 5923\n  },\n  {\n    \"tag\": "electioneerer",\n    \"popularity\": 5918\n  },\n  {\n    \"tag\": "estoile",\n    \"popularity\": 5913\n  },\n  {\n    \"tag\": "redden",\n    \"popularity\": 5908\n  },\n  {\n    \"tag\": "solicitee",\n    \"popularity\": 5903\n  },\n  {\n    \"tag\": "nonpatented",\n    \"popularity\": 5898\n  },\n  {\n    \"tag\": "lemming",\n    \"popularity\": 5893\n  },\n  {\n    \"tag\": "marled subalate",\n    \"popularity\": 5887\n  },\n  {\n    \"tag\": "premial horizonward",\n    \"popularity\": 5882\n  },\n  {\n    \"tag\": "nonrefueling",\n    \"popularity\": 5877\n  },\n  {\n    \"tag\": "rupturewort",\n    \"popularity\": 5872\n  },\n  {\n    \"tag\": "unfed",\n    \"popularity\": 5867\n  },\n  {\n    \"tag\": "empanelment",\n    \"popularity\": 5862\n  },\n  {\n    \"tag\": "isoosmosis",\n    \"popularity\": 5857\n  },\n  {\n    \"tag\": "jipijapa",\n    \"popularity\": 5852\n  },\n  {\n    \"tag\": "Fiji",\n    \"popularity\": 5847\n  },\n  {\n    \"tag\": "interferant",\n    \"popularity\": 5842\n  },\n  {\n    \"tag\": "reconstitution",\n    \"popularity\": 5837\n  },\n  {\n    \"tag\": "dockyardman",\n    \"popularity\": 5832\n  },\n  {\n    \"tag\": "dolichopodous",\n    \"popularity\": 5826\n  },\n  {\n    \"tag\": "whiteworm",\n    \"popularity\": 5821\n  },\n  {\n    \"tag\": "atheistically",\n    \"popularity\": 5816\n  },\n  {\n    \"tag\": "nonconcern",\n    \"popularity\": 5811\n  },\n  {\n    \"tag\": "scarabaeidoid",\n    \"popularity\": 5806\n  },\n  {\n    \"tag\": "triumviri",\n    \"popularity\": 5801\n  },\n  {\n    \"tag\": "rakit",\n    \"popularity\": 5796\n  },\n  {\n    \"tag\": "leecheater",\n    \"popularity\": 5791\n  },\n  {\n    \"tag\": "Arthrostraca",\n    \"popularity\": 5786\n  },\n  {\n    \"tag\": "upknit",\n    \"popularity\": 5781\n  },\n  {\n    \"tag\": "tymbalon",\n    \"popularity\": 5776\n  },\n  {\n    \"tag\": "inventurous",\n    \"popularity\": 5771\n  },\n  {\n    \"tag\": "perradiate",\n    \"popularity\": 5766\n  },\n  {\n    \"tag\": "seer",\n    \"popularity\": 5762\n  },\n  {\n    \"tag\": "Auricularia",\n    \"popularity\": 5757\n  },\n  {\n    \"tag\": "wettish exclusivity",\n    \"popularity\": 5752\n  },\n  {\n    \"tag\": "arteriosympathectomy",\n    \"popularity\": 5747\n  },\n  {\n    \"tag\": "tunlike",\n    \"popularity\": 5742\n  },\n  {\n    \"tag\": "cephalocercal",\n    \"popularity\": 5737\n  },\n  {\n    \"tag\": "meaninglessness",\n    \"popularity\": 5732\n  },\n  {\n    \"tag\": "fountful",\n    \"popularity\": 5727\n  },\n  {\n    \"tag\": "appraisement",\n    \"popularity\": 5722\n  },\n  {\n    \"tag\": "geniculated",\n    \"popularity\": 5717\n  },\n  {\n    \"tag\": "rotator",\n    \"popularity\": 5712\n  },\n  {\n    \"tag\": "foremarch biography",\n    \"popularity\": 5707\n  },\n  {\n    \"tag\": "arid",\n    \"popularity\": 5703\n  },\n  {\n    \"tag\": "inapprehensible",\n    \"popularity\": 5698\n  },\n  {\n    \"tag\": "chlorosulphonic",\n    \"popularity\": 5693\n  },\n  {\n    \"tag\": "braguette",\n    \"popularity\": 5688\n  },\n  {\n    \"tag\": "panophthalmitis",\n    \"popularity\": 5683\n  },\n  {\n    \"tag\": "pro objurgatorily",\n    \"popularity\": 5678\n  },\n  {\n    \"tag\": "zooplasty",\n    \"popularity\": 5673\n  },\n  {\n    \"tag\": "Terebratulidae",\n    \"popularity\": 5669\n  },\n  {\n    \"tag\": "Mahran",\n    \"popularity\": 5664\n  },\n  {\n    \"tag\": "anthologize merocele",\n    \"popularity\": 5659\n  },\n  {\n    \"tag\": "firecracker chiropractic",\n    \"popularity\": 5654\n  },\n  {\n    \"tag\": "tenorist",\n    \"popularity\": 5649\n  },\n  {\n    \"tag\": "amphitene",\n    \"popularity\": 5645\n  },\n  {\n    \"tag\": "silverbush toadstone",\n    \"popularity\": 5640\n  },\n  {\n    \"tag\": "entozoological",\n    \"popularity\": 5635\n  },\n  {\n    \"tag\": "trustlessness",\n    \"popularity\": 5630\n  },\n  {\n    \"tag\": "reassay",\n    \"popularity\": 5625\n  },\n  {\n    \"tag\": "chrysalides",\n    \"popularity\": 5621\n  },\n  {\n    \"tag\": "truncation",\n    \"popularity\": 5616\n  },\n  {\n    \"tag\": "unwavered mausoleal",\n    \"popularity\": 5611\n  },\n  {\n    \"tag\": "unserrated",\n    \"popularity\": 5606\n  },\n  {\n    \"tag\": "frampler",\n    \"popularity\": 5602\n  },\n  {\n    \"tag\": "celestial",\n    \"popularity\": 5597\n  },\n  {\n    \"tag\": "depreter",\n    \"popularity\": 5592\n  },\n  {\n    \"tag\": "retaliate",\n    \"popularity\": 5588\n  },\n  {\n    \"tag\": "decempunctate",\n    \"popularity\": 5583\n  },\n  {\n    \"tag\": "submitter",\n    \"popularity\": 5578\n  },\n  {\n    \"tag\": "phenothiazine",\n    \"popularity\": 5573\n  },\n  {\n    \"tag\": "hobbledehoyish",\n    \"popularity\": 5569\n  },\n  {\n    \"tag\": "erraticness",\n    \"popularity\": 5564\n  },\n  {\n    \"tag\": "ovariodysneuria",\n    \"popularity\": 5559\n  },\n  {\n    \"tag\": "puja",\n    \"popularity\": 5555\n  },\n  {\n    \"tag\": "cesspool",\n    \"popularity\": 5550\n  },\n  {\n    \"tag\": "sonation",\n    \"popularity\": 5545\n  },\n  {\n    \"tag\": "moggan",\n    \"popularity\": 5541\n  },\n  {\n    \"tag\": "overjutting",\n    \"popularity\": 5536\n  },\n  {\n    \"tag\": "cohobate",\n    \"popularity\": 5531\n  },\n  {\n    \"tag\": "Distoma",\n    \"popularity\": 5527\n  },\n  {\n    \"tag\": "Plectognathi",\n    \"popularity\": 5522\n  },\n  {\n    \"tag\": "dumple caliphate",\n    \"popularity\": 5517\n  },\n  {\n    \"tag\": "shiko",\n    \"popularity\": 5513\n  },\n  {\n    \"tag\": "downness",\n    \"popularity\": 5508\n  },\n  {\n    \"tag\": "whippletree",\n    \"popularity\": 5504\n  },\n  {\n    \"tag\": "nymphaeum",\n    \"popularity\": 5499\n  },\n  {\n    \"tag\": "there trest",\n    \"popularity\": 5494\n  },\n  {\n    \"tag\": "psychrometer",\n    \"popularity\": 5490\n  },\n  {\n    \"tag\": "pyelograph",\n    \"popularity\": 5485\n  },\n  {\n    \"tag\": "unsalvable",\n    \"popularity\": 5481\n  },\n  {\n    \"tag\": "bescreen",\n    \"popularity\": 5476\n  },\n  {\n    \"tag\": "cushy",\n    \"popularity\": 5471\n  },\n  {\n    \"tag\": "plicatolobate",\n    \"popularity\": 5467\n  },\n  {\n    \"tag\": "lakie",\n    \"popularity\": 5462\n  },\n  {\n    \"tag\": "anthropodeoxycholic",\n    \"popularity\": 5458\n  },\n  {\n    \"tag\": "resatisfaction",\n    \"popularity\": 5453\n  },\n  {\n    \"tag\": "unravelment unaccidental",\n    \"popularity\": 5449\n  },\n  {\n    \"tag\": "telewriter monogeneous",\n    \"popularity\": 5444\n  },\n  {\n    \"tag\": "unsabred",\n    \"popularity\": 5440\n  },\n  {\n    \"tag\": "startlingly",\n    \"popularity\": 5435\n  },\n  {\n    \"tag\": "Aralia",\n    \"popularity\": 5431\n  },\n  {\n    \"tag\": "alamonti",\n    \"popularity\": 5426\n  },\n  {\n    \"tag\": "Franklinization",\n    \"popularity\": 5422\n  },\n  {\n    \"tag\": "parliament",\n    \"popularity\": 5417\n  },\n  {\n    \"tag\": "schoolkeeper",\n    \"popularity\": 5413\n  },\n  {\n    \"tag\": "nonsociety",\n    \"popularity\": 5408\n  },\n  {\n    \"tag\": "parenthetic",\n    \"popularity\": 5404\n  },\n  {\n    \"tag\": "stog",\n    \"popularity\": 5399\n  },\n  {\n    \"tag\": "Pristipomidae",\n    \"popularity\": 5395\n  },\n  {\n    \"tag\": "exocarp",\n    \"popularity\": 5390\n  },\n  {\n    \"tag\": "monaxonial",\n    \"popularity\": 5386\n  },\n  {\n    \"tag\": "tramroad",\n    \"popularity\": 5381\n  },\n  {\n    \"tag\": "hookah",\n    \"popularity\": 5377\n  },\n  {\n    \"tag\": "saccharonic",\n    \"popularity\": 5372\n  },\n  {\n    \"tag\": "perimetrium",\n    \"popularity\": 5368\n  },\n  {\n    \"tag\": "libelluloid",\n    \"popularity\": 5364\n  },\n  {\n    \"tag\": "overrunningly",\n    \"popularity\": 5359\n  },\n  {\n    \"tag\": "untwister",\n    \"popularity\": 5355\n  },\n  {\n    \"tag\": "ninnyhammer",\n    \"popularity\": 5350\n  },\n  {\n    \"tag\": "metranate",\n    \"popularity\": 5346\n  },\n  {\n    \"tag\": "sarcoblast",\n    \"popularity\": 5341\n  },\n  {\n    \"tag\": "porkish",\n    \"popularity\": 5337\n  },\n  {\n    \"tag\": "chauvinistic",\n    \"popularity\": 5333\n  },\n  {\n    \"tag\": "sexagesimal",\n    \"popularity\": 5328\n  },\n  {\n    \"tag\": "hematogenic",\n    \"popularity\": 5324\n  },\n  {\n    \"tag\": "selfpreservatory",\n    \"popularity\": 5320\n  },\n  {\n    \"tag\": "myelauxe",\n    \"popularity\": 5315\n  },\n  {\n    \"tag\": "triply",\n    \"popularity\": 5311\n  },\n  {\n    \"tag\": "metaphysicous",\n    \"popularity\": 5306\n  },\n  {\n    \"tag\": "vitrinoid",\n    \"popularity\": 5302\n  },\n  {\n    \"tag\": "glabellae",\n    \"popularity\": 5298\n  },\n  {\n    \"tag\": "moonlighter",\n    \"popularity\": 5293\n  },\n  {\n    \"tag\": "monotheistically epexegetical",\n    \"popularity\": 5289\n  },\n  {\n    \"tag\": "pseudolateral",\n    \"popularity\": 5285\n  },\n  {\n    \"tag\": "heptamethylene",\n    \"popularity\": 5280\n  },\n  {\n    \"tag\": "salvadora",\n    \"popularity\": 5276\n  },\n  {\n    \"tag\": "unjovial diphenylthiourea",\n    \"popularity\": 5272\n  },\n  {\n    \"tag\": "thievishness",\n    \"popularity\": 5268\n  },\n  {\n    \"tag\": "unridable",\n    \"popularity\": 5263\n  },\n  {\n    \"tag\": "underhandedly",\n    \"popularity\": 5259\n  },\n  {\n    \"tag\": "fungiform",\n    \"popularity\": 5255\n  },\n  {\n    \"tag\": "scruffle",\n    \"popularity\": 5250\n  },\n  {\n    \"tag\": "preindisposition",\n    \"popularity\": 5246\n  },\n  {\n    \"tag\": "Amadis",\n    \"popularity\": 5242\n  },\n  {\n    \"tag\": "Culex",\n    \"popularity\": 5238\n  },\n  {\n    \"tag\": "churning",\n    \"popularity\": 5233\n  },\n  {\n    \"tag\": "imperite",\n    \"popularity\": 5229\n  },\n  {\n    \"tag\": "levorotation",\n    \"popularity\": 5225\n  },\n  {\n    \"tag\": "barbate",\n    \"popularity\": 5221\n  },\n  {\n    \"tag\": "knotwort",\n    \"popularity\": 5216\n  },\n  {\n    \"tag\": "gypsiferous",\n    \"popularity\": 5212\n  },\n  {\n    \"tag\": "tourmalinic",\n    \"popularity\": 5208\n  },\n  {\n    \"tag\": "helleboric",\n    \"popularity\": 5204\n  },\n  {\n    \"tag\": "pneumograph",\n    \"popularity\": 5199\n  },\n  {\n    \"tag\": "Peltigeraceae",\n    \"popularity\": 5195\n  },\n  {\n    \"tag\": "busine",\n    \"popularity\": 5191\n  },\n  {\n    \"tag\": "Ailuridae",\n    \"popularity\": 5187\n  },\n  {\n    \"tag\": "azotate",\n    \"popularity\": 5183\n  },\n  {\n    \"tag\": "unlikable",\n    \"popularity\": 5178\n  },\n  {\n    \"tag\": "sloyd",\n    \"popularity\": 5174\n  },\n  {\n    \"tag\": "biblioclasm",\n    \"popularity\": 5170\n  },\n  {\n    \"tag\": "Seres",\n    \"popularity\": 5166\n  },\n  {\n    \"tag\": "unaccurateness",\n    \"popularity\": 5162\n  },\n  {\n    \"tag\": "scrollwise",\n    \"popularity\": 5157\n  },\n  {\n    \"tag\": "flandowser",\n    \"popularity\": 5153\n  },\n  {\n    \"tag\": "unblackened",\n    \"popularity\": 5149\n  },\n  {\n    \"tag\": "schistosternia",\n    \"popularity\": 5145\n  },\n  {\n    \"tag\": "fuse",\n    \"popularity\": 5141\n  },\n  {\n    \"tag\": "narthecal",\n    \"popularity\": 5137\n  },\n  {\n    \"tag\": "Cueva",\n    \"popularity\": 5133\n  },\n  {\n    \"tag\": "appositeness",\n    \"popularity\": 5128\n  },\n  {\n    \"tag\": "proindustrial",\n    \"popularity\": 5124\n  },\n  {\n    \"tag\": "dermatorrhoea",\n    \"popularity\": 5120\n  },\n  {\n    \"tag\": "oxyurous tendential",\n    \"popularity\": 5116\n  },\n  {\n    \"tag\": "isopurpurin",\n    \"popularity\": 5112\n  },\n  {\n    \"tag\": "impose",\n    \"popularity\": 5108\n  },\n  {\n    \"tag\": "wordsmanship",\n    \"popularity\": 5104\n  },\n  {\n    \"tag\": "saturator",\n    \"popularity\": 5100\n  },\n  {\n    \"tag\": "Nordicity",\n    \"popularity\": 5096\n  },\n  {\n    \"tag\": "interaccuse",\n    \"popularity\": 5092\n  },\n  {\n    \"tag\": "acridinic",\n    \"popularity\": 5087\n  },\n  {\n    \"tag\": "scholion",\n    \"popularity\": 5083\n  },\n  {\n    \"tag\": "pseudoaconitine",\n    \"popularity\": 5079\n  },\n  {\n    \"tag\": "doctorial",\n    \"popularity\": 5075\n  },\n  {\n    \"tag\": "Etchimin",\n    \"popularity\": 5071\n  },\n  {\n    \"tag\": "oliviform",\n    \"popularity\": 5067\n  },\n  {\n    \"tag\": "Pele",\n    \"popularity\": 5063\n  },\n  {\n    \"tag\": "Chiromantis Progymnasium",\n    \"popularity\": 5059\n  },\n  {\n    \"tag\": "toxosis",\n    \"popularity\": 5055\n  },\n  {\n    \"tag\": "spadilla",\n    \"popularity\": 5051\n  },\n  {\n    \"tag\": "Actinopterygii",\n    \"popularity\": 5047\n  },\n  {\n    \"tag\": "untiring",\n    \"popularity\": 5043\n  },\n  {\n    \"tag\": "butyral",\n    \"popularity\": 5039\n  },\n  {\n    \"tag\": "Gymnoderinae",\n    \"popularity\": 5035\n  },\n  {\n    \"tag\": "testudo",\n    \"popularity\": 5031\n  },\n  {\n    \"tag\": "frigorify",\n    \"popularity\": 5027\n  },\n  {\n    \"tag\": "aliency",\n    \"popularity\": 5023\n  },\n  {\n    \"tag\": "jargon",\n    \"popularity\": 5019\n  },\n  {\n    \"tag\": "counterservice",\n    \"popularity\": 5015\n  },\n  {\n    \"tag\": "isostrychnine",\n    \"popularity\": 5011\n  },\n  {\n    \"tag\": "tellership",\n    \"popularity\": 5007\n  },\n  {\n    \"tag\": "miscegenetic",\n    \"popularity\": 5003\n  },\n  {\n    \"tag\": "sorcer",\n    \"popularity\": 4999\n  },\n  {\n    \"tag\": "tilewright",\n    \"popularity\": 4995\n  },\n  {\n    \"tag\": "cyanoplastid",\n    \"popularity\": 4991\n  },\n  {\n    \"tag\": "fluxionally",\n    \"popularity\": 4987\n  },\n  {\n    \"tag\": "proudhearted",\n    \"popularity\": 4983\n  },\n  {\n    \"tag\": "blithely",\n    \"popularity\": 4979\n  },\n  {\n    \"tag\": "jestproof",\n    \"popularity\": 4975\n  },\n  {\n    \"tag\": "jestwise",\n    \"popularity\": 4971\n  },\n  {\n    \"tag\": "nonassimilable",\n    \"popularity\": 4967\n  },\n  {\n    \"tag\": "compurgation",\n    \"popularity\": 4964\n  },\n  {\n    \"tag\": "unhate",\n    \"popularity\": 4960\n  },\n  {\n    \"tag\": "haplodonty",\n    \"popularity\": 4956\n  },\n  {\n    \"tag\": "cardholder",\n    \"popularity\": 4952\n  },\n  {\n    \"tag\": "rainlight megohmmeter overstout",\n    \"popularity\": 4948\n  },\n  {\n    \"tag\": "itchless",\n    \"popularity\": 4944\n  },\n  {\n    \"tag\": "begiggle",\n    \"popularity\": 4940\n  },\n  {\n    \"tag\": "chromatosphere",\n    \"popularity\": 4936\n  },\n  {\n    \"tag\": "typicality",\n    \"popularity\": 4932\n  },\n  {\n    \"tag\": "overgrown",\n    \"popularity\": 4928\n  },\n  {\n    \"tag\": "envolume",\n    \"popularity\": 4925\n  },\n  {\n    \"tag\": "pachycholia",\n    \"popularity\": 4921\n  },\n  {\n    \"tag\": "passageable",\n    \"popularity\": 4917\n  },\n  {\n    \"tag\": "pathopoiesis",\n    \"popularity\": 4913\n  },\n  {\n    \"tag\": "overbreak",\n    \"popularity\": 4909\n  },\n  {\n    \"tag\": "satyric",\n    \"popularity\": 4905\n  },\n  {\n    \"tag\": "unaudited",\n    \"popularity\": 4901\n  },\n  {\n    \"tag\": "whimble",\n    \"popularity\": 4898\n  },\n  {\n    \"tag\": "pressureless",\n    \"popularity\": 4894\n  },\n  {\n    \"tag\": "Selene",\n    \"popularity\": 4890\n  },\n  {\n    \"tag\": "slithery",\n    \"popularity\": 4886\n  },\n  {\n    \"tag\": "nondisfigurement",\n    \"popularity\": 4882\n  },\n  {\n    \"tag\": "overdelicious",\n    \"popularity\": 4878\n  },\n  {\n    \"tag\": "Perca",\n    \"popularity\": 4875\n  },\n  {\n    \"tag\": "Palladium",\n    \"popularity\": 4871\n  },\n  {\n    \"tag\": "insagacity",\n    \"popularity\": 4867\n  },\n  {\n    \"tag\": "peristoma",\n    \"popularity\": 4863\n  },\n  {\n    \"tag\": "uncreativeness",\n    \"popularity\": 4859\n  },\n  {\n    \"tag\": "incomparability surfboarding",\n    \"popularity\": 4856\n  },\n  {\n    \"tag\": "bacillar",\n    \"popularity\": 4852\n  },\n  {\n    \"tag\": "ulcerative",\n    \"popularity\": 4848\n  },\n  {\n    \"tag\": "stychomythia",\n    \"popularity\": 4844\n  },\n  {\n    \"tag\": "sesma somatics nonentry",\n    \"popularity\": 4840\n  },\n  {\n    \"tag\": "unsepulchred",\n    \"popularity\": 4837\n  },\n  {\n    \"tag\": "cephalanthium",\n    \"popularity\": 4833\n  },\n  {\n    \"tag\": "Asiaticization",\n    \"popularity\": 4829\n  },\n  {\n    \"tag\": "killeen",\n    \"popularity\": 4825\n  },\n  {\n    \"tag\": "Pseudococcus",\n    \"popularity\": 4822\n  },\n  {\n    \"tag\": "untractable",\n    \"popularity\": 4818\n  },\n  {\n    \"tag\": "apolegamic",\n    \"popularity\": 4814\n  },\n  {\n    \"tag\": "hyperpnea",\n    \"popularity\": 4810\n  },\n  {\n    \"tag\": "martyrolatry",\n    \"popularity\": 4807\n  },\n  {\n    \"tag\": "Sarmatic",\n    \"popularity\": 4803\n  },\n  {\n    \"tag\": "nonsurface",\n    \"popularity\": 4799\n  },\n  {\n    \"tag\": "adjoined",\n    \"popularity\": 4796\n  },\n  {\n    \"tag\": "vasiform",\n    \"popularity\": 4792\n  },\n  {\n    \"tag\": "tastelessness",\n    \"popularity\": 4788\n  },\n  {\n    \"tag\": "rumbo",\n    \"popularity\": 4784\n  },\n  {\n    \"tag\": "subdititious",\n    \"popularity\": 4781\n  },\n  {\n    \"tag\": "reparticipation",\n    \"popularity\": 4777\n  },\n  {\n    \"tag\": "Yorkshireism",\n    \"popularity\": 4773\n  },\n  {\n    \"tag\": "outcrow",\n    \"popularity\": 4770\n  },\n  {\n    \"tag\": "casserole",\n    \"popularity\": 4766\n  },\n  {\n    \"tag\": "semideltaic",\n    \"popularity\": 4762\n  },\n  {\n    \"tag\": "freemason",\n    \"popularity\": 4759\n  },\n  {\n    \"tag\": "catkin",\n    \"popularity\": 4755\n  },\n  {\n    \"tag\": "conscient",\n    \"popularity\": 4751\n  },\n  {\n    \"tag\": "reliably",\n    \"popularity\": 4748\n  },\n  {\n    \"tag\": "Telembi",\n    \"popularity\": 4744\n  },\n  {\n    \"tag\": "hide",\n    \"popularity\": 4740\n  },\n  {\n    \"tag\": "social",\n    \"popularity\": 4737\n  },\n  {\n    \"tag\": "ichneutic",\n    \"popularity\": 4733\n  },\n  {\n    \"tag\": "polypotome blouse pentagrammatic",\n    \"popularity\": 4729\n  },\n  {\n    \"tag\": "airdrome pesthole",\n    \"popularity\": 4726\n  },\n  {\n    \"tag\": "unportended",\n    \"popularity\": 4722\n  },\n  {\n    \"tag\": "sheerly",\n    \"popularity\": 4719\n  },\n  {\n    \"tag\": "acardiac",\n    \"popularity\": 4715\n  },\n  {\n    \"tag\": "fetor",\n    \"popularity\": 4711\n  },\n  {\n    \"tag\": "storax",\n    \"popularity\": 4708\n  },\n  {\n    \"tag\": "syndactylic",\n    \"popularity\": 4704\n  },\n  {\n    \"tag\": "otiatrics",\n    \"popularity\": 4700\n  },\n  {\n    \"tag\": "range",\n    \"popularity\": 4697\n  },\n  {\n    \"tag\": "branchway",\n    \"popularity\": 4693\n  },\n  {\n    \"tag\": "beatific",\n    \"popularity\": 4690\n  },\n  {\n    \"tag\": "Rugosa",\n    \"popularity\": 4686\n  },\n  {\n    \"tag\": "rafty",\n    \"popularity\": 4682\n  },\n  {\n    \"tag\": "gapy",\n    \"popularity\": 4679\n  },\n  {\n    \"tag\": "heterocercal",\n    \"popularity\": 4675\n  },\n  {\n    \"tag\": "actinopterygious",\n    \"popularity\": 4672\n  },\n  {\n    \"tag\": "glauconite",\n    \"popularity\": 4668\n  },\n  {\n    \"tag\": "limbless priest",\n    \"popularity\": 4665\n  },\n  {\n    \"tag\": "chrysene",\n    \"popularity\": 4661\n  },\n  {\n    \"tag\": "isentropic",\n    \"popularity\": 4658\n  },\n  {\n    \"tag\": "lairdess",\n    \"popularity\": 4654\n  },\n  {\n    \"tag\": "butterhead choliambic",\n    \"popularity\": 4650\n  },\n  {\n    \"tag\": "hexaseme",\n    \"popularity\": 4647\n  },\n  {\n    \"tag\": "treeify",\n    \"popularity\": 4643\n  },\n  {\n    \"tag\": "coronetted fructify",\n    \"popularity\": 4640\n  },\n  {\n    \"tag\": "admiralty",\n    \"popularity\": 4636\n  },\n  {\n    \"tag\": "Flosculariidae",\n    \"popularity\": 4633\n  },\n  {\n    \"tag\": "limaceous",\n    \"popularity\": 4629\n  },\n  {\n    \"tag\": "subterconscious",\n    \"popularity\": 4626\n  },\n  {\n    \"tag\": "stayless",\n    \"popularity\": 4622\n  },\n  {\n    \"tag\": "psha",\n    \"popularity\": 4619\n  },\n  {\n    \"tag\": "Mediterraneanize",\n    \"popularity\": 4615\n  },\n  {\n    \"tag\": "impenetrably",\n    \"popularity\": 4612\n  },\n  {\n    \"tag\": "Myrmeleonidae",\n    \"popularity\": 4608\n  },\n  {\n    \"tag\": "germander",\n    \"popularity\": 4605\n  },\n  {\n    \"tag\": "Buri",\n    \"popularity\": 4601\n  },\n  {\n    \"tag\": "papyrotamia",\n    \"popularity\": 4598\n  },\n  {\n    \"tag\": "Toxylon",\n    \"popularity\": 4594\n  },\n  {\n    \"tag\": "batatilla",\n    \"popularity\": 4591\n  },\n  {\n    \"tag\": "fabella assumer",\n    \"popularity\": 4587\n  },\n  {\n    \"tag\": "macromethod",\n    \"popularity\": 4584\n  },\n  {\n    \"tag\": "Blechnum",\n    \"popularity\": 4580\n  },\n  {\n    \"tag\": "pantography",\n    \"popularity\": 4577\n  },\n  {\n    \"tag\": "seminovel",\n    \"popularity\": 4574\n  },\n  {\n    \"tag\": "disembarrassment",\n    \"popularity\": 4570\n  },\n  {\n    \"tag\": "bushmaking",\n    \"popularity\": 4567\n  },\n  {\n    \"tag\": "neurosis",\n    \"popularity\": 4563\n  },\n  {\n    \"tag\": "Animalia",\n    \"popularity\": 4560\n  },\n  {\n    \"tag\": "Bernice",\n    \"popularity\": 4556\n  },\n  {\n    \"tag\": "wisen",\n    \"popularity\": 4553\n  },\n  {\n    \"tag\": "subhymenium",\n    \"popularity\": 4549\n  },\n  {\n    \"tag\": "esophagomycosis",\n    \"popularity\": 4546\n  },\n  {\n    \"tag\": "wireworks",\n    \"popularity\": 4543\n  },\n  {\n    \"tag\": "Sabellidae",\n    \"popularity\": 4539\n  },\n  {\n    \"tag\": "fustianish",\n    \"popularity\": 4536\n  },\n  {\n    \"tag\": "professively",\n    \"popularity\": 4532\n  },\n  {\n    \"tag\": "overcorruptly",\n    \"popularity\": 4529\n  },\n  {\n    \"tag\": "overcreep",\n    \"popularity\": 4526\n  },\n  {\n    \"tag\": "Castilloa",\n    \"popularity\": 4522\n  },\n  {\n    \"tag\": "forelady Georgie",\n    \"popularity\": 4519\n  },\n  {\n    \"tag\": "outsider",\n    \"popularity\": 4515\n  },\n  {\n    \"tag\": "Enukki",\n    \"popularity\": 4512\n  },\n  {\n    \"tag\": "gypsy",\n    \"popularity\": 4509\n  },\n  {\n    \"tag\": "Passamaquoddy",\n    \"popularity\": 4505\n  },\n  {\n    \"tag\": "reposit",\n    \"popularity\": 4502\n  },\n  {\n    \"tag\": "overtenderness",\n    \"popularity\": 4499\n  },\n  {\n    \"tag\": "keratome",\n    \"popularity\": 4495\n  },\n  {\n    \"tag\": "interclavicular hypermonosyllable Susanna",\n    \"popularity\": 4492\n  },\n  {\n    \"tag\": "mispropose",\n    \"popularity\": 4489\n  },\n  {\n    \"tag\": "Membranipora",\n    \"popularity\": 4485\n  },\n  {\n    \"tag\": "lampad",\n    \"popularity\": 4482\n  },\n  {\n    \"tag\": "header",\n    \"popularity\": 4479\n  },\n  {\n    \"tag\": "triseriate",\n    \"popularity\": 4475\n  },\n  {\n    \"tag\": "distrainment",\n    \"popularity\": 4472\n  },\n  {\n    \"tag\": "staphyloplastic",\n    \"popularity\": 4469\n  },\n  {\n    \"tag\": "outscour",\n    \"popularity\": 4465\n  },\n  {\n    \"tag\": "tallowmaking",\n    \"popularity\": 4462\n  },\n  {\n    \"tag\": "plugger",\n    \"popularity\": 4459\n  },\n  {\n    \"tag\": "fashionize",\n    \"popularity\": 4455\n  },\n  {\n    \"tag\": "puzzle",\n    \"popularity\": 4452\n  },\n  {\n    \"tag\": "imbrue",\n    \"popularity\": 4449\n  },\n  {\n    \"tag\": "osteoblast",\n    \"popularity\": 4445\n  },\n  {\n    \"tag\": "Hydrocores",\n    \"popularity\": 4442\n  },\n  {\n    \"tag\": "Lutra",\n    \"popularity\": 4439\n  },\n  {\n    \"tag\": "upridge scarfy",\n    \"popularity\": 4435\n  },\n  {\n    \"tag\": "ancon taffle",\n    \"popularity\": 4432\n  },\n  {\n    \"tag\": "impest",\n    \"popularity\": 4429\n  },\n  {\n    \"tag\": "uncollatedness",\n    \"popularity\": 4426\n  },\n  {\n    \"tag\": "hypersensitize",\n    \"popularity\": 4422\n  },\n  {\n    \"tag\": "autographically",\n    \"popularity\": 4419\n  },\n  {\n    \"tag\": "louther",\n    \"popularity\": 4416\n  },\n  {\n    \"tag\": "Ollie",\n    \"popularity\": 4413\n  },\n  {\n    \"tag\": "recompensate",\n    \"popularity\": 4409\n  },\n  {\n    \"tag\": "Shan",\n    \"popularity\": 4406\n  },\n  {\n    \"tag\": "brachycnemic",\n    \"popularity\": 4403\n  },\n  {\n    \"tag\": "Carinatae",\n    \"popularity\": 4399\n  },\n  {\n    \"tag\": "geotherm",\n    \"popularity\": 4396\n  },\n  {\n    \"tag\": "sawback",\n    \"popularity\": 4393\n  },\n  {\n    \"tag\": "Novatianist",\n    \"popularity\": 4390\n  },\n  {\n    \"tag\": "reapproach",\n    \"popularity\": 4387\n  },\n  {\n    \"tag\": "myelopoietic",\n    \"popularity\": 4383\n  },\n  {\n    \"tag\": "cyanin",\n    \"popularity\": 4380\n  },\n  {\n    \"tag\": "unsmutted",\n    \"popularity\": 4377\n  },\n  {\n    \"tag\": "nonpapist",\n    \"popularity\": 4374\n  },\n  {\n    \"tag\": "transbaikalian",\n    \"popularity\": 4370\n  },\n  {\n    \"tag\": "connately",\n    \"popularity\": 4367\n  },\n  {\n    \"tag\": "tenderize iterance",\n    \"popularity\": 4364\n  },\n  {\n    \"tag\": "hydrostatical",\n    \"popularity\": 4361\n  },\n  {\n    \"tag\": "unflag",\n    \"popularity\": 4358\n  },\n  {\n    \"tag\": "translate",\n    \"popularity\": 4354\n  },\n  {\n    \"tag\": "Scorzonera",\n    \"popularity\": 4351\n  },\n  {\n    \"tag\": "uncomforted",\n    \"popularity\": 4348\n  },\n  {\n    \"tag\": "risser varied",\n    \"popularity\": 4345\n  },\n  {\n    \"tag\": "plumbate",\n    \"popularity\": 4342\n  },\n  {\n    \"tag\": "Usneaceae",\n    \"popularity\": 4338\n  },\n  {\n    \"tag\": "fohat",\n    \"popularity\": 4335\n  },\n  {\n    \"tag\": "slagging",\n    \"popularity\": 4332\n  },\n  {\n    \"tag\": "superserious",\n    \"popularity\": 4329\n  },\n  {\n    \"tag\": "theocracy",\n    \"popularity\": 4326\n  },\n  {\n    \"tag\": "valonia",\n    \"popularity\": 4323\n  },\n  {\n    \"tag\": "Sapindales",\n    \"popularity\": 4319\n  },\n  {\n    \"tag\": "palaeozoologist",\n    \"popularity\": 4316\n  },\n  {\n    \"tag\": "yalb",\n    \"popularity\": 4313\n  },\n  {\n    \"tag\": "unviewed",\n    \"popularity\": 4310\n  },\n  {\n    \"tag\": "polyarteritis",\n    \"popularity\": 4307\n  },\n  {\n    \"tag\": "vectorial",\n    \"popularity\": 4304\n  },\n  {\n    \"tag\": "skimpingly",\n    \"popularity\": 4301\n  },\n  {\n    \"tag\": "athort",\n    \"popularity\": 4297\n  },\n  {\n    \"tag\": "tribofluorescence",\n    \"popularity\": 4294\n  },\n  {\n    \"tag\": "benzonitrol",\n    \"popularity\": 4291\n  },\n  {\n    \"tag\": "swiller subobtuse subjacency",\n    \"popularity\": 4288\n  },\n  {\n    \"tag\": "uncompassed",\n    \"popularity\": 4285\n  },\n  {\n    \"tag\": "cacochymia",\n    \"popularity\": 4282\n  },\n  {\n    \"tag\": "commensalist butadiene",\n    \"popularity\": 4279\n  },\n  {\n    \"tag\": "culpable",\n    \"popularity\": 4276\n  },\n  {\n    \"tag\": "contributive",\n    \"popularity\": 4273\n  },\n  {\n    \"tag\": "attemperately",\n    \"popularity\": 4269\n  },\n  {\n    \"tag\": "spelt",\n    \"popularity\": 4266\n  },\n  {\n    \"tag\": "exoneration",\n    \"popularity\": 4263\n  },\n  {\n    \"tag\": "antivivisectionist",\n    \"popularity\": 4260\n  },\n  {\n    \"tag\": "granitification",\n    \"popularity\": 4257\n  },\n  {\n    \"tag\": "palladize",\n    \"popularity\": 4254\n  },\n  {\n    \"tag\": "marksmanship",\n    \"popularity\": 4251\n  },\n  {\n    \"tag\": "bullydom",\n    \"popularity\": 4248\n  },\n  {\n    \"tag\": "spirality",\n    \"popularity\": 4245\n  },\n  {\n    \"tag\": "caliginous",\n    \"popularity\": 4242\n  },\n  {\n    \"tag\": "reportedly",\n    \"popularity\": 4239\n  },\n  {\n    \"tag\": "polyad",\n    \"popularity\": 4236\n  },\n  {\n    \"tag\": "arthroempyesis",\n    \"popularity\": 4233\n  },\n  {\n    \"tag\": "semibay facultatively",\n    \"popularity\": 4229\n  },\n  {\n    \"tag\": "metastatically",\n    \"popularity\": 4226\n  },\n  {\n    \"tag\": "prophetically",\n    \"popularity\": 4223\n  },\n  {\n    \"tag\": "Linguatula elapid",\n    \"popularity\": 4220\n  },\n  {\n    \"tag\": "pyknatom",\n    \"popularity\": 4217\n  },\n  {\n    \"tag\": "centimeter",\n    \"popularity\": 4214\n  },\n  {\n    \"tag\": "mensurate",\n    \"popularity\": 4211\n  },\n  {\n    \"tag\": "migraine",\n    \"popularity\": 4208\n  },\n  {\n    \"tag\": "pentagamist",\n    \"popularity\": 4205\n  },\n  {\n    \"tag\": "querken",\n    \"popularity\": 4202\n  },\n  {\n    \"tag\": "ambulance",\n    \"popularity\": 4199\n  },\n  {\n    \"tag\": "Stokavian",\n    \"popularity\": 4196\n  },\n  {\n    \"tag\": "malvasian",\n    \"popularity\": 4193\n  },\n  {\n    \"tag\": "uncouthsome",\n    \"popularity\": 4190\n  },\n  {\n    \"tag\": "readable",\n    \"popularity\": 4187\n  },\n  {\n    \"tag\": "enlodge",\n    \"popularity\": 4184\n  },\n  {\n    \"tag\": "plasterwise Appendiculariidae perspectograph",\n    \"popularity\": 4181\n  },\n  {\n    \"tag\": "inkweed",\n    \"popularity\": 4178\n  },\n  {\n    \"tag\": "streep",\n    \"popularity\": 4175\n  },\n  {\n    \"tag\": "diadelphian cultured",\n    \"popularity\": 4172\n  },\n  {\n    \"tag\": "hymenopterous",\n    \"popularity\": 4169\n  },\n  {\n    \"tag\": "unexorableness",\n    \"popularity\": 4166\n  },\n  {\n    \"tag\": "cascaron",\n    \"popularity\": 4163\n  },\n  {\n    \"tag\": "undaintiness",\n    \"popularity\": 4160\n  },\n  {\n    \"tag\": "Curtana",\n    \"popularity\": 4157\n  },\n  {\n    \"tag\": "scurvied",\n    \"popularity\": 4154\n  },\n  {\n    \"tag\": "molluscoidal",\n    \"popularity\": 4151\n  },\n  {\n    \"tag\": "yurt",\n    \"popularity\": 4148\n  },\n  {\n    \"tag\": "deciduitis",\n    \"popularity\": 4145\n  },\n  {\n    \"tag\": "creephole",\n    \"popularity\": 4142\n  },\n  {\n    \"tag\": "quatrefeuille",\n    \"popularity\": 4139\n  },\n  {\n    \"tag\": "bicapitate adenomatome",\n    \"popularity\": 4136\n  },\n  {\n    \"tag\": "damassin",\n    \"popularity\": 4134\n  },\n  {\n    \"tag\": "planching",\n    \"popularity\": 4131\n  },\n  {\n    \"tag\": "dashedly inferential",\n    \"popularity\": 4128\n  },\n  {\n    \"tag\": "lobe",\n    \"popularity\": 4125\n  },\n  {\n    \"tag\": "Hyrachyus",\n    \"popularity\": 4122\n  },\n  {\n    \"tag\": "knab",\n    \"popularity\": 4119\n  },\n  {\n    \"tag\": "discohexaster",\n    \"popularity\": 4116\n  },\n  {\n    \"tag\": "malign",\n    \"popularity\": 4113\n  },\n  {\n    \"tag\": "pedagoguism",\n    \"popularity\": 4110\n  },\n  {\n    \"tag\": "shrubbery",\n    \"popularity\": 4107\n  },\n  {\n    \"tag\": "undershrub",\n    \"popularity\": 4104\n  },\n  {\n    \"tag\": "bureaucrat",\n    \"popularity\": 4101\n  },\n  {\n    \"tag\": "pantaleon",\n    \"popularity\": 4098\n  },\n  {\n    \"tag\": "mesoventral",\n    \"popularity\": 4096\n  }]';
-
-var log2 = Math.log(2);
-var tagInfo = tagInfoJSON.parseJSON(function(a, b) { if (a == "popularity") { return Math.log(b) / log2; } else {return b; } });
-
-function makeTagCloud(tagInfo)
-{
-    var output = '<div class="tagCloud" style="width: 100%">';
-
-    tagInfo.sort(function(a, b) { if (a.tag < b.tag) { return -1; } else if (a.tag == b.tag) { return 0; } else return 1; });
-
-  /* BEGIN LOOP */
-    for (var i = 0; i < tagInfo.length; i++) {
-        var tag = tagInfo[i].tag;
-
-        var validates = true;
-  /* BEGIN LOOP */
-        for (var j = 0; j < tag.length; j++) {
-            var ch = tag.charCodeAt(j);
-            if (ch < 0x20 || ch >= 0x7f) {
-                validates = false;
-                break;
-            }
-        }
-  /* END LOOP */
-
-        if (!validates)
-            continue;
-
-        var url = "http://example.com/tag/" + tag.replace(" ", "").toLowerCase();
-        var popularity = tagInfo[i].popularity;
-        var color = 'rgb(' + Math.floor(255 * (popularity - 12) / 20) + ', 0, 255)';
-        output += ' <a href="' + url + '" style="font-size: ' + popularity + 'px; color: ' + color + '">' + tag + '</a> \n';
-    }
-  /* END LOOP */
-
-    output += '</div>';
-    output.replace(" ", "&nbsp;");
-
-    return output;
-}
-
-var tagcloud = makeTagCloud(tagInfo);
-tagInfo = null;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-unpack-code.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-unpack-code.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-unpack-code.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-unpack-code.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-// This test case unpacks the compressed code for the MochiKit,
-// jQuery, Dojo and Prototype JavaScript libraries.
-/***
- MochiKit.MochiKit 1.3.1 : PACKED VERSION
- THIS FILE IS AUTOMATICALLY GENERATED.  If creating patches, please
- diff against the source tree, not this file.
- 
- See <http://mochikit.com/> for documentation, downloads, license, etc.
- 
- (c) 2005 Bob Ippolito.  All rights Reserved.
- ***/
-
-/* BEGIN LOOP */
-for (var i = 0; i < 2; i++) {
-
-    var decompressedMochiKit = function (p, a, c, k, e, d) {
-        e = function (c) {
-            return (c < a ? "" : e(parseInt(c / a))) + ((c = c % a) > 35 ? String.fromCharCode(c + 29) : c.toString(36))
-        };
-        if (!''.replace(/^/, String)) {
-
-/* BEGIN LOOP */
-            while (c--) d[e(c)] = k[c] || e(c);
-
-/* END LOOP */
-            k = [function (e) {
-                return d[e]
-            }];
-            e = function () {
-                return '\\w+'
-            };
-            c = 1
-        };
-/* BEGIN LOOP */
-        while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]);
-/* END LOOP */
-        return p
-    }('if(H(1q)!="L"){1q.2X("B.J")}if(H(B)=="L"){B={}}if(H(B.J)=="L"){B.J={}}B.J.1Y="1.3.1";B.J.1r="B.J";B.J.2l=G(7V,vR){if(7V===O){7V={}}R(u i=1;i<M.K;i++){u o=M[i];if(H(o)!="L"&&o!==O){R(u k in o){7V[k]=o[k]}}}F 7V};B.J.2l(B.J,{1K:G(){F"["+D.1r+" "+D.1Y+"]"},1l:G(){F D.1K()},4f:G(n){if(M.K===0){n=1}F G(){F n++}},4L:G(mw){u me=M.2U;if(M.K==1){me.1U=mw;F Y me()}},bg:G(vQ){u X=[];u m=B.J;u aw=m.1R(O,M);1M(aw.K){u o=aw.2P();if(o&&H(o)=="3n"&&H(o.K)=="2y"){R(u i=o.K-1;i>=0;i--){aw.e9(o[i])}}N{X.1c(o)}}F X},1R:G(7U,1i,av){if(!av){av=0}if(1i){u l=1i.K;if(H(l)!="2y"){if(H(B.15)!="L"){1i=B.15.2G(1i);l=1i.K}N{14 Y 3p("au 2E an at-as 3W B.15 2E ar")}}if(!7U){7U=[]}R(u i=av;i<l;i++){7U.1c(1i[i])}}F 7U},8Z:G(5g,1i){if(5g===O){5g={}}R(u i=1;i<M.K;i++){u o=M[i];if(H(o)!="L"&&o!==O){R(u k in o){u v=o[k];if(H(5g[k])=="3n"&&H(v)=="3n"){M.2U(5g[k],v)}N{5g[k]=v}}}}F 5g},lO:G(6c,1i){if(6c===O){6c={}}R(u i=1;i<M.K;i++){u o=M[i];R(u k in o){if(!(k in 6c)){6c[k]=o[k]}}}F 6c},lN:G(1i){u fj=[];R(u mv in 1i){fj.1c(mv)}F fj},lM:G(1i){u fh=[];u e;R(u fi in 1i){u v;1f{v=1i[fi]}1e(e){2V}fh.1c([fi,v])}F fh},jq:G(fg,ff,fe){fe.1U=Y B.J.5a(fg.1r+"."+ff);fg[ff]=fe},4i:{7L:G(a){F!!a},vP:G(a){F!a},eE:G(a){F a},2E:G(a){F~a},vO:G(a){F-a},vN:G(a,b){F a+b},vM:G(a,b){F a-b},4u:G(a,b){F a/b},vL:G(a,b){F a%b},vK:G(a,b){F a*b},3W:G(a,b){F a&b},or:G(a,b){F a|b},vJ:G(a,b){F a^b},vI:G(a,b){F a<<b},vH:G(a,b){F a>>b},vG:G(a,b){F a>>>b},eq:G(a,b){F a==b},ne:G(a,b){F a!=b},gt:G(a,b){F a>b},ge:G(a,b){F a>=b},lt:G(a,b){F a<b},le:G(a,b){F a<=b},vF:G(a,b){F B.J.2f(a,b)===0},vE:G(a,b){F B.J.2f(a,b)!==0},vD:G(a,b){F B.J.2f(a,b)==1},vC:G(a,b){F B.J.2f(a,b)!=-1},vB:G(a,b){F B.J.2f(a,b)==-1},vA:G(a,b){F B.J.2f(a,b)!=1},vz:G(a,b){F a&&b},vy:G(a,b){F a||b},vx:G(a,b){F b in a}},24:G(mu){F G(){F D[mu].1w(D,M)}},lL:G(mt){F G(a9){F a9[mt]}},66:G(){u fd={};R(u i=0;i<M.K;i++){u 6b=M[i];fd[6b]=6b}F G(){R(u i=0;i<M.K;i++){if(!(H(M[i])in fd)){F 1m}}F 1h}},lJ:G(){R(u i=0;i<M.K;i++){if(M[i]!==O){F 1m}}F 1h},lK:G(){R(u i=0;i<M.K;i++){u o=M[i];if(!(H(o)=="L"||o===O)){F 1m}}F 1h},lI:G(1i){F!B.J.7e.1w(D,M)},7e:G(1i){R(u i=0;i<M.K;i++){u o=M[i];if(!(o&&o.K)){F 1m}}F 1h},3A:G(){R(u i=0;i<M.K;i++){u o=M[i];u 6b=H(o);if((6b!="3n"&&!(6b=="G"&&H(o.vw)=="G"))||o===O||H(o.K)!="2y"){F 1m}}F 1h},eN:G(){R(u i=0;i<M.K;i++){u o=M[i];if(H(o)!="3n"||o===O||H(o.9P)!="G"){F 1m}}F 1h},lH:G(fn){if(fn===O){F B.J.1R(O,M,1)}u fc=[];R(u i=1;i<M.K;i++){fc.1c(fn(M[i]))}F fc},2r:G(fn,1g){u m=B.J;u 6a=B.15;u fb=m.3A;if(M.K<=2){if(!fb(1g)){if(6a){1g=6a.2G(1g);if(fn===O){F 1g}}N{14 Y 3p("au 2E an at-as 3W B.15 2E ar")}}if(fn===O){F m.1R(O,1g)}u 69=[];R(u i=0;i<1g.K;i++){69.1c(fn(1g[i]))}F 69}N{if(fn===O){fn=7o}u 7T=O;R(i=1;i<M.K;i++){if(!fb(M[i])){if(6a){F 6a.2G(6a.4c.1w(O,M))}N{14 Y 3p("au 2E an at-as 3W B.15 2E ar")}}u l=M[i].K;if(7T===O||7T>l){7T=l}}69=[];R(i=0;i<7T;i++){u fa=[];R(u j=1;j<M.K;j++){fa.1c(M[j][i])}69.1c(fn.1w(D,fa))}F 69}},lG:G(fn){u f9=[];if(fn===O){fn=B.J.4i.7L}R(u i=1;i<M.K;i++){u o=M[i];if(fn(o)){f9.1c(o)}}F f9},47:G(fn,1g,7S){u aq=[];u m=B.J;if(!m.3A(1g)){if(B.15){1g=B.15.2G(1g)}N{14 Y 3p("au 2E an at-as 3W B.15 2E ar")}}if(fn===O){fn=m.4i.7L}if(H(7o.1U.47)=="G"){F 7o.1U.47.cz(1g,fn,7S)}N{if(H(7S)=="L"||7S===O){R(u i=0;i<1g.K;i++){u o=1g[i];if(fn(o)){aq.1c(o)}}}N{R(i=0;i<1g.K;i++){o=1g[i];if(fn.cz(7S,o)){aq.1c(o)}}}}F aq},mq:G(7R){F G(){hd(M.K){3j 0:F 7R();3j 1:F 7R(M[0]);3j 2:F 7R(M[0],M[1]);3j 3:F 7R(M[0],M[1],M[2])}u f8=[];R(u i=0;i<M.K;i++){f8.1c("M["+i+"]")}F dB("(1A("+f8.2b(",")+"))")}},lv:G(mr,ms){u m=B.J;F m.1O.1w(D,m.1R([ms,mr],M,2))},1O:G(3c,4o){if(H(3c)=="1n"){3c=4o[3c]}u ao=3c.f5;u 5f=3c.am;u f6=3c.f7;u m=B.J;if(H(3c)=="G"&&H(3c.1w)=="L"){3c=m.mq(3c)}if(H(ao)!="G"){ao=3c}if(H(4o)!="L"){f6=4o}if(H(5f)=="L"){5f=[]}N{5f=5f.9T()}m.1R(5f,M,2);u 7Q=G(){u ap=M;u me=M.2U;if(me.am.K>0){ap=m.2o(me.am,ap)}u 4o=me.f7;if(!4o){4o=D}F me.f5.1w(4o,ap)};7Q.f7=f6;7Q.f5=ao;7Q.am=5f;F 7Q},lF:G(7P){u mp=B.J.1O;R(u k in 7P){u f4=7P[k];if(H(f4)=="G"){7P[k]=mp(f4,7P)}}},5u:G(mo,mn,ml,mk){B.J.ae.5M(mo,mn,ml,mk)},mj:{"5L":1h,"1n":1h,"2y":1h},2f:G(a,b){if(a==b){F 0}u f3=(H(a)=="L"||a===O);u f2=(H(b)=="L"||b===O);if(f3&&f2){F 0}N{if(f3){F-1}N{if(f2){F 1}}}u m=B.J;u f1=m.mj;if(!(H(a)in f1&&H(b)in f1)){1f{F m.ae.3C(a,b)}1e(e){if(e!=m.4d){14 e}}}if(a<b){F-1}N{if(a>b){F 1}}u f0=m.U;14 Y 3p(f0(a)+" 3W "+f0(b)+" 9v 2E be vv")},eM:G(a,b){F B.J.2f(a.9P(),b.9P())},eL:G(a,b){u mi=B.J.2f;u 7O=a.K;u al=0;if(7O>b.K){al=1;7O=b.K}N{if(7O<b.K){al=-1}}R(u i=0;i<7O;i++){u 4j=mi(a[i],b[i]);if(4j){F 4j}}F al},7M:G(mh,mg,mf,md){B.J.ad.5M(mh,mg,mf,md)},U:G(o){if(H(o)=="L"){F"L"}N{if(o===O){F"O"}}1f{if(H(o.1K)=="G"){F o.1K()}N{if(H(o.U)=="G"&&o.U!=M.2U){F o.U()}}F B.J.ad.3C(o)}1e(e){if(H(o.1r)=="1n"&&(o.1l==cZ.1U.1l||o.1l==vu.1U.1l)){F o.1r}}1f{u eZ=(o+"")}1e(e){F"["+H(o)+"]"}if(H(o)=="G"){o=eZ.23(/^\\s+/,"");u 5n=o.2A("{");if(5n!=-1){o=o.3H(0,5n)+"{...}"}}F eZ},eK:G(o){u m=B.J;F"["+m.2r(m.U,o).2b(", ")+"]"},ac:G(o){F("\\""+o.23(/(["\\\\])/g,"\\\\$1")+"\\"").23(/[\\f]/g,"\\\\f").23(/[\\b]/g,"\\\\b").23(/[\\n]/g,"\\\\n").23(/[\\t]/g,"\\\\t").23(/[\\r]/g,"\\\\r")},eJ:G(o){F o+""},ly:G(mc,mb,ma,m9){B.J.ab.5M(mc,mb,ma,m9)},lx:G(){F dB("("+M[0]+")")},lz:G(o){u 5e=H(o);if(5e=="L"){F"L"}N{if(5e=="2y"||5e=="5L"){F o+""}N{if(o===O){F"O"}}}u m=B.J;u eY=m.ac;if(5e=="1n"){F eY(o)}u me=M.2U;u 3S;if(H(o.m8)=="G"){3S=o.m8();if(o!==3S){F me(3S)}}if(H(o.m7)=="G"){3S=o.m7();if(o!==3S){F me(3S)}}if(5e!="G"&&H(o.K)=="2y"){u X=[];R(u i=0;i<o.K;i++){u 2i=me(o[i]);if(H(2i)!="1n"){2i="L"}X.1c(2i)}F"["+X.2b(", ")+"]"}1f{3S=m.ab.3C(o);F me(3S)}1e(e){if(e!=m.4d){14 e}}if(5e=="G"){F O}X=[];R(u k in o){u ak;if(H(k)=="2y"){ak="\\""+k+"\\""}N{if(H(k)=="1n"){ak=eY(k)}N{2V}}2i=me(o[k]);if(H(2i)!="1n"){2V}X.1c(ak+":"+2i)}F"{"+X.2b(", ")+"}"},lE:G(a,b){F(B.J.2f(a,b)===0)},lD:G(eX,4n){if(eX.K!=4n.K){F 1m}F(B.J.2f(eX,4n)===0)},2o:G(){u eW=[];u m6=B.J.1R;R(u i=0;i<M.K;i++){m6(eW,M[i])}F eW},eR:G(2h){u m=B.J;u eU=m.2f;if(M.K==1){F G(a,b){F eU(a[2h],b[2h])}}u eV=m.1R(O,M);F G(a,b){u aj=0;R(u i=0;(aj===0)&&(i<eV.K);i++){u 2h=eV[i];aj=eU(a[2h],b[2h])}F aj}},lC:G(2h){u m5=B.J.eR.1w(D,M);F G(a,b){F m5(b,a)}},2z:G(m4){u m=B.J;F m.1O.1w(D,m.1R([m4,L],M,1))},67:G(m0,1g){if(1g.K===0){F O}u ai=1g[0];u m3=B.J.2f;R(u i=1;i<1g.K;i++){u o=1g[i];if(m3(o,ai)==m0){ai=o}}F ai},lB:G(){F B.J.67(1,M)},lA:G(){F B.J.67(-1,M)},bi:G(1g,lY,lZ,3B){if(H(3B)=="L"||3B===O){3B=1g.K}R(u i=(lZ||0);i<3B;i++){if(1g[i]===lY){F i}}F-1},eO:G(1g,lW,lX,3B){if(H(3B)=="L"||3B===O){3B=1g.K}u 4j=B.J.2f;R(u i=(lX||0);i<3B;i++){if(4j(1g[i],lW)===0){F i}}F-1},d4:G(1j,lV){u ah=[1j];u lU=B.J.1R;1M(ah.K){u X=lV(ah.2P());if(X){lU(ah,X)}}},3f:G(ag){u 2w=ag.1r;if(H(2w)=="L"){2w=""}N{2w=2w+"."}R(u 1b in ag){u o=ag[1b];if(H(o)=="G"&&H(o.1r)=="L"){1f{o.1r=2w+1b}1e(e){}}}},dw:G(3s,68){if(H(B.S)!="L"&&M.K==1&&(H(3s)=="1n"||(H(3s.3T)!="L"&&3s.3T>0))){u kv=B.S.d5(3s);3s=kv[0];68=kv[1]}N{if(M.K==1){u o=3s;3s=[];68=[];R(u k in o){u v=o[k];if(H(v)!="G"){3s.1c(k);68.1c(v)}}}}u W=[];u lT=28.2a(3s.K,68.K);u eT=B.J.af;R(u i=0;i<lT;i++){v=68[i];if(H(v)!="L"&&v!==O){W.1c(eT(3s[i])+"="+eT(v))}}F W.2b("&")},lw:G(lS,lQ){u 7N=lS.23(/\\+/g,"%20").2R("&");u o={};u 5d;if(H(lR)!="L"){5d=lR}N{5d=vt}if(lQ){R(u i=0;i<7N.K;i++){u 2n=7N[i].2R("=");u 1b=5d(2n[0]);u 4n=o[1b];if(!(4n 2C 7o)){4n=[];o[1b]=4n}4n.1c(5d(2n[1]))}}N{R(i=0;i<7N.K;i++){2n=7N[i].2R("=");o[5d(2n[0])]=5d(2n[1])}}F o}});B.J.4a=G(){D.4m=[]};B.J.4a.1U={5M:G(1b,eS,3y,lP){if(lP){D.4m.e9([1b,eS,3y])}N{D.4m.1c([1b,eS,3y])}},3C:G(){R(u i=0;i<D.4m.K;i++){u 2n=D.4m[i];if(2n[1].1w(D,M)){F 2n[2].1w(D,M)}}14 B.J.4d},vs:G(1b){R(u i=0;i<D.4m.K;i++){u 2n=D.4m[i];if(2n[0]==1b){D.4m.4y(i,1);F 1h}}F 1m}};B.J.1z=["4f","4L","1R","2l","8Z","lO","lN","lM","5a","4i","24","lL","66","lo","ln","lK","lJ","lI","7e","3A","eN","lH","2r","lG","47","1O","lF","4d","4a","5u","2f","7M","U","lE","lD","2o","eR","lC","2z","lm","67","lp","eI","lB","lA","d4","ll","af","dw","lz","ly","lx","lw","eO","bi","bg","lv"];B.J.1W=["3f","ae","ad","ab","eM","eL","eK","ac","eJ"];B.J.2Y=G(lu,eP){if(H(B.eQ)=="L"){B.eQ=(B.3d||(H(1x)=="L"&&H(1q)=="L"))}if(!B.eQ){F}u 1p=eP.2k[":1p"];R(u i=0;i<1p.K;i++){lu[1p[i]]=eP[1p[i]]}};B.J.2d=G(){u m=D;m.vr=m.24;m.vq=m.eO;if(H(ls)!="L"){m.af=G(lr){F ls(lr).23(/\\\'/g,"%27")}}N{m.af=G(lq){F vp(lq).23(/\\+/g,"%2B").23(/\\"/g,"%22").W.23(/\\\'/g,"%27")}}m.5a=G(1b){D.43=1b;D.1b=1b};m.5a.1U=Y 2x();m.2l(m.5a.1U,{U:G(){if(D.43&&D.43!=D.1b){F D.1b+"("+m.U(D.43)+")"}N{F D.1b+"()"}},1l:m.24("U")});m.4d=Y m.5a("B.J.4d");m.lp=m.2z(m.67,1);m.eI=m.2z(m.67,-1);m.lo=m.66("G");m.ln=m.66("L");m.lm=m.2z(m.2l,O);m.ll=m.2z(m.2r,O);m.ae=Y m.4a();m.5u("vo",m.eN,m.eM);m.5u("ej",m.3A,m.eL);m.ad=Y m.4a();m.7M("ej",m.3A,m.eK);m.7M("1n",m.66("1n"),m.ac);m.7M("vn",m.66("2y","5L"),m.eJ);m.ab=Y m.4a();u 1p=m.2o(m.1z,m.1W);m.2k={":3e":m.2o(m.1W),":1p":1p};m.3f(D)};B.J.2d();if(!B.3d){2f=B.J.2f}B.J.2Y(D,B.J);if(H(1q)!="L"){1q.2X("B.15");1q.2M("B.J")}if(H(1x)!="L"){1x.26("B.J",[])}1f{if(H(B.J)=="L"){14""}}1e(e){14"B.15 3F on B.J!"}if(H(B.15)=="L"){B.15={}}B.15.1r="B.15";B.15.1Y="1.3.1";B.J.2l(B.15,{1K:G(){F"["+D.1r+" "+D.1Y+"]"},1l:G(){F D.1K()},9W:G(1b,lk,lj,lh){B.15.9Y.5M(1b,lk,lj,lh)},1Q:G(3R,lg){u I=B.15;if(M.K==2){F I.9Z(G(a){F a!=lg},3R)}if(H(3R.1a)=="G"){F 3R}N{if(H(3R.1Q)=="G"){F 3R.1Q()}}1f{F I.9Y.3C(3R)}1e(e){u m=B.J;if(e==m.4d){e=Y 3p(H(3R)+": "+m.U(3R)+" is 2E vm")}14 e}},eu:G(n){if(!n){n=0}u m=B.J;F{U:G(){F"eu("+n+")"},1l:m.24("U"),1a:m.4f(n)}},et:G(p){u I=B.15;u m=B.J;u 1g=[];u lf=I.1Q(p);F{U:G(){F"et(...)"},1l:m.24("U"),1a:G(){1f{u W=lf.1a();1g.1c(W);F W}1e(e){if(e!=I.25){14 e}if(1g.K===0){D.1a=G(){14 I.25}}N{u i=-1;D.1a=G(){i=(i+1)%1g.K;F 1g[i]}}F D.1a()}}}},7b:G(Q,n){u m=B.J;if(H(n)=="L"){F{U:G(){F"7b("+m.U(Q)+")"},1l:m.24("U"),1a:G(){F Q}}}F{U:G(){F"7b("+m.U(Q)+", "+n+")"},1l:m.24("U"),1a:G(){if(n<=0){14 B.15.25}n-=1;F Q}}},1a:G(ld){F ld.1a()},es:G(p,q){u m=B.J;u 1a=B.15.1a;u lc=m.2r(1Q,M);F{U:G(){F"es(...)"},1l:m.24("U"),1a:G(){F m.2r(1a,lc)}}},a1:G(3b,1V){u m=B.J;1V=B.15.1Q(1V);if(3b===O){3b=m.4i.7L}F{U:G(){F"a1(...)"},1l:m.24("U"),1a:G(){1M(1h){u W=1V.1a();if(3b(W)){F W}}F L}}},a0:G(3b,1V){u m=B.J;1V=B.15.1Q(1V);if(3b===O){3b=m.4i.7L}F{U:G(){F"a0(...)"},1l:m.24("U"),1a:G(){1M(1h){u W=1V.1a();if(!3b(W)){F W}}F L}}},er:G(1V){u I=B.15;u m=B.J;1V=I.1Q(1V);u 5c=0;u 2J=0;u 3a=1;u i=-1;if(M.K==2){2J=M[1]}N{if(M.K==3){5c=M[1];2J=M[2]}N{5c=M[1];2J=M[2];3a=M[3]}}F{U:G(){F"er("+["...",5c,2J,3a].2b(", ")+")"},1l:m.24("U"),1a:G(){u W;1M(i<5c){W=1V.1a();i++}if(5c>=2J){14 I.25}5c+=3a;F W}}},4c:G(aa,p,q){u m=B.J;u I=B.15;u lb=m.2r(I.1Q,m.1R(O,M,1));u 2r=m.2r;u 1a=I.1a;F{U:G(){F"4c(...)"},1l:m.24("U"),1a:G(){F aa.1w(D,2r(1a,lb))}}},ep:G(aa,1V,I){1V=B.15.1Q(1V);u m=B.J;F{U:G(){F"ep(...)"},1l:m.24("U"),1a:G(){F aa.1w(I,1V.1a())}}},55:G(p,q){u I=B.15;u m=B.J;if(M.K==1){F I.1Q(M[0])}u 64=m.2r(I.1Q,M);F{U:G(){F"55(...)"},1l:m.24("U"),1a:G(){1M(64.K>1){1f{F 64[0].1a()}1e(e){if(e!=I.25){14 e}64.2P()}}if(64.K==1){u a9=64.2P();D.1a=m.1O("1a",a9);F D.1a()}14 I.25}}},9Z:G(3b,1V){u I=B.15;1V=I.1Q(1V);F{U:G(){F"9Z(...)"},1l:B.J.24("U"),1a:G(){u W=1V.1a();if(!3b(W)){D.1a=G(){14 I.25};D.1a()}F W}}},eo:G(3b,1V){1V=B.15.1Q(1V);u m=B.J;u 1O=m.1O;F{"U":G(){F"eo(...)"},"1l":m.24("U"),"1a":G(){1M(1h){u W=1V.1a();if(!3b(W)){2K}}D.1a=1O("1a",1V);F W}}},a7:G(63,2u,la){2u.62[63]=-1;u m=B.J;u l9=m.eI;F{U:G(){F"en("+63+", ...)"},1l:m.24("U"),1a:G(){u W;u i=2u.62[63];if(i==2u.29){W=la.1a();2u.a8.1c(W);2u.29+=1;2u.62[63]+=1}N{W=2u.a8[i-2u.2a];2u.62[63]+=1;if(i==2u.2a&&l9(2u.62)!=2u.2a){2u.2a+=1;2u.a8.2P()}}F W}}},en:G(a6,n){u W=[];u 2u={"62":[],"a8":[],"29":-1,"2a":-1};if(M.K==1){n=2}u I=B.15;a6=I.1Q(a6);u a7=I.a7;R(u i=0;i<n;i++){W.1c(a7(i,2u,a6))}F W},2G:G(4l){u m=B.J;if(H(4l.9T)=="G"){F 4l.9T()}N{if(m.3A(4l)){F m.2o(4l)}}u I=B.15;4l=I.1Q(4l);u W=[];1f{1M(1h){W.1c(4l.1a())}}1e(e){if(e!=I.25){14 e}F W}F L},7H:G(fn,7K,l8){u i=0;u x=l8;u I=B.15;7K=I.1Q(7K);if(M.K<3){1f{x=7K.1a()}1e(e){if(e==I.25){e=Y 3p("7H() of vl vk vj no vi 3m")}14 e}i++}1f{1M(1h){x=fn(x,7K.1a())}}1e(e){if(e!=I.25){14 e}}F x},7I:G(){u 4k=0;u 2J=0;u 3a=1;if(M.K==1){2J=M[0]}N{if(M.K==2){4k=M[0];2J=M[1]}N{if(M.K==3){4k=M[0];2J=M[1];3a=M[2]}N{14 Y 3p("7I() vh 1, 2, or 3 M!")}}}if(3a===0){14 Y 3p("7I() 3a 5p 2E be 0")}F{1a:G(){if((3a>0&&4k>=2J)||(3a<0&&4k<=2J)){14 B.15.25}u W=4k;4k+=3a;F W},U:G(){F"7I("+[4k,2J,3a].2b(", ")+")"},1l:B.J.24("U")}},l0:G(a5,l7){u x=l7||0;u I=B.15;a5=I.1Q(a5);1f{1M(1h){x+=a5.1a()}}1e(e){if(e!=I.25){14 e}}F x},em:G(a4){u I=B.15;a4=I.1Q(a4);1f{1M(1h){a4.1a()}}1e(e){if(e!=I.25){14 e}}},9a:G(7J,1A,I){u m=B.J;if(M.K>2){1A=m.1O(1A,I)}if(m.3A(7J)){1f{R(u i=0;i<7J.K;i++){1A(7J[i])}}1e(e){if(e!=B.15.25){14 e}}}N{I=B.15;I.em(I.4c(1A,7J))}},kZ:G(l6,1A){u I=B.15;1f{I.a0(1A,l6).1a();F 1m}1e(e){if(e!=I.25){14 e}F 1h}},kY:G(l5,4j){u W=B.15.2G(l5);if(M.K==1){4j=B.J.2f}W.iz(4j);F W},kX:G(l4){u W=B.15.2G(l4);W.vg();F W},kW:G(l3,1A){u I=B.15;1f{I.a1(1A,l3).1a();F 1h}1e(e){if(e!=I.25){14 e}F 1m}},kV:G(1g,5b){if(B.J.3A(5b)){R(u i=0;i<5b.K;i++){1g.1c(5b[i])}}N{u I=B.15;5b=I.1Q(5b);1f{1M(1h){1g.1c(5b.1a())}}1e(e){if(e!=I.25){14 e}}}F 1g},ek:G(a3,eH){u m=B.J;u I=B.15;if(M.K<2){eH=m.4i.eE}a3=I.1Q(a3);u pk=L;u k=L;u v;G eF(){v=a3.1a();k=eH(v)}G l2(){u 7j=v;v=L;F 7j}u eG=1h;F{U:G(){F"ek(...)"},1a:G(){1M(k==pk){eF();if(eG){eG=1m;2K}}pk=k;F[k,{1a:G(){if(v==L){eF()}if(k!=pk){14 I.25}F l2()}}]}}},kU:G(a2,eD){u m=B.J;u I=B.15;if(M.K<2){eD=m.4i.eE}a2=I.1Q(a2);u ey=[];u eA=1h;u ez;1M(1h){1f{u eB=a2.1a();u 2h=eD(eB)}1e(e){if(e==I.25){2K}14 e}if(eA||2h!=ez){u eC=[];ey.1c([2h,eC])}eC.1c(eB);eA=1m;ez=2h}F ey},9X:G(ex){u i=0;F{U:G(){F"9X(...)"},1l:B.J.24("U"),1a:G(){if(i>=ex.K){14 B.15.25}F ex[i++]}}},eh:G(ew){F(ew&&H(ew.ei)=="G")},9V:G(l1){F{U:G(){F"9V(...)"},1l:B.J.24("U"),1a:G(){u W=l1.ei();if(W===O||W===L){14 B.15.25}F W}}}});B.15.1W=["9Y","9X","eh","9V",];B.15.1z=["25","9W","1Q","eu","et","7b","1a","es","a1","a0","er","4c","ep","55","9Z","eo","en","2G","7H","7I","l0","em","9a","kZ","kY","kX","kW","kV","ek","kU"];B.15.2d=G(){u m=B.J;D.25=Y m.5a("25");D.9Y=Y m.4a();D.9W("ej",m.3A,D.9X);D.9W("ei",D.eh,D.9V);D.2k={":3e":D.1z,":1p":m.2o(D.1z,D.1W)};m.3f(D)};B.15.2d();if(!B.3d){7H=B.15.7H}B.J.2Y(D,B.15);if(H(1q)!="L"){1q.2X("B.1H");1q.2M("B.J")}if(H(1x)!="L"){1x.26("B.J",[])}1f{if(H(B.J)=="L"){14""}}1e(e){14"B.1H 3F on B.J!"}if(H(B.1H)=="L"){B.1H={}}B.1H.1r="B.1H";B.1H.1Y="1.3.1";B.1H.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.1H.1l=G(){F D.1K()};B.1H.1z=["5C","49","7A","kR","2L","5Z","kG","ch","kE","kC"];B.1H.1W=["ef","e8","e7"];B.1H.49=G(1P,kT,3z){D.1P=1P;D.3N=kT;D.3z=3z;D.vf=Y 3Q()};B.1H.49.1U={U:G(){u m=B.J;F"49("+m.2r(m.U,[D.1P,D.3N,D.3z]).2b(", ")+")"},1l:B.J.24("U")};B.J.2l(B.1H,{ef:G(7F){u I=B.1H;if(H(7F)=="1n"){7F=I.5C[7F]}F G(1t){u 7G=1t.3N;if(H(7G)=="1n"){7G=I.5C[7G]}F 7G>=7F}},e8:G(){u kS=B.1H.49;R(u i=0;i<M.K;i++){if(!(M[i]2C kS)){F 1m}}F 1h},e7:G(a,b){F B.J.2f([a.3N,a.3z],[b.3N,b.3z])},kR:G(1t){cq("1P: "+1t.1P+"\\ve: "+1t.3N+"\\vd: "+1t.3z.2b(" "))}});B.1H.7A=G(7E){D.4f=0;if(H(7E)=="L"||7E===O){7E=-1}D.ec=7E;D.4h=[];D.7C={};D.e5=1m};B.1H.7A.1U={vc:G(){D.4h.4y(0,D.4h.K)},kK:G(1t){if(H(2O)!="L"&&2O.eg&&2O.eg.5Z){2O.eg.5Z(1t)}N{if(H(7h)!="L"&&7h.kQ){7h.kQ(1t)}N{if(H(5X)=="G"){5X(1t)}}}},kL:G(1t){R(u k in D.7C){u 2n=D.7C[k];if(2n.kO!=k||(2n[0]&&!2n[0](1t))){2V}2n[1](1t)}},hE:G(ee,7D,kP){if(H(7D)=="1n"){7D=B.1H.ef(7D)}u ed=[7D,kP];ed.kO=ee;D.7C[ee]=ed},c9:G(kN){gi D.7C[kN]},kH:G(kM,vb){u 1t=Y B.1H.49(D.4f,kM,B.J.1R(O,M,1));D.4h.1c(1t);D.kL(1t);if(D.e5){D.kK(1t.3N+": "+1t.3z.2b(" "))}D.4f+=1;1M(D.ec>=0&&D.4h.K>D.ec){D.4h.2P()}},c8:G(9U){u ea=0;if(!(H(9U)=="L"||9U===O)){ea=28.29(0,D.4h.K-9U)}F D.4h.9T(ea)},kJ:G(7B){if(H(7B)=="L"||7B===O){7B=30}u 9S=D.c8(7B);if(9S.K){u 1g=2r(G(m){F"\\n  ["+m.1P+"] "+m.3N+": "+m.3z.2b(" ")},9S);1g.e9("va "+9S.K+" v9:");F 1g.2b("")}F""},v8:G(kI){if(H(B.1I)=="L"){cq(D.kJ())}N{B.1I.bY(kI||1m)}}};B.1H.2d=G(){D.5C={8M:40,8L:50,8K:30,8J:20,8I:10};u m=B.J;m.5u("49",D.e8,D.e7);u 61=m.2z;u e6=D.7A;u 60=e6.1U.kH;m.2l(D.7A.1U,{kF:61(60,"8I"),5Z:61(60,"8J"),dE:61(60,"8M"),kD:61(60,"8L"),kB:61(60,"8K")});u I=D;u 5Y=G(1b){F G(){I.2L[1b].1w(I.2L,M)}};D.5Z=5Y("5Z");D.kG=5Y("dE");D.ch=5Y("kF");D.kE=5Y("kD");D.kC=5Y("kB");D.2L=Y e6();D.2L.e5=1h;D.2k={":3e":D.1z,":1p":m.2o(D.1z,D.1W)};m.3f(D)};if(H(5X)=="L"&&H(2v)!="L"&&2v.kA&&H(kz)!="L"){5X=G(){5X.3G=M;u ev=2v.kA("v7");ev.v6("5X",1m,1h);kz(ev)}}B.1H.2d();B.J.2Y(D,B.1H);if(H(1q)!="L"){1q.2X("B.1D")}if(H(B)=="L"){B={}}if(H(B.1D)=="L"){B.1D={}}B.1D.1r="B.1D";B.1D.1Y="1.3.1";B.1D.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.1D.1l=G(){F D.1K()};B.1D.ks=G(1y){1y=1y+"";if(H(1y)!="1n"||1y.K===0){F O}u 7z=1y.2R("-");if(7z.K===0){F O}F Y 3Q(7z[0],7z[1]-1,7z[2])};B.1D.ky=/(\\d{4,})(?:-(\\d{1,2})(?:-(\\d{1,2})(?:[T ](\\d{1,2}):(\\d{1,2})(?::(\\d{1,2})(?:\\.(\\d+))?)?(?:(Z)|([+-])(\\d{1,2})(?::(\\d{1,2}))?)?)?)?)?/;B.1D.kr=G(1y){1y=1y+"";if(H(1y)!="1n"||1y.K===0){F O}u X=1y.3C(B.1D.ky);if(H(X)=="L"||X===O){F O}u 5W,7y,7x,9R,2a,9Q,7w;5W=3w(X[1],10);if(H(X[2])=="L"||X[2]===""){F Y 3Q(5W)}7y=3w(X[2],10)-1;7x=3w(X[3],10);if(H(X[4])=="L"||X[4]===""){F Y 3Q(5W,7y,7x)}9R=3w(X[4],10);2a=3w(X[5],10);9Q=(H(X[6])!="L"&&X[6]!=="")?3w(X[6],10):0;if(H(X[7])!="L"&&X[7]!==""){7w=28.ha(c5*4M("0."+X[7]))}N{7w=0}if((H(X[8])=="L"||X[8]==="")&&(H(X[9])=="L"||X[9]==="")){F Y 3Q(5W,7y,7x,9R,2a,9Q,7w)}u 58;if(H(X[9])!="L"&&X[9]!==""){58=3w(X[10],10)*v5;if(H(X[11])!="L"&&X[11]!==""){58+=3w(X[11],10)*kw}if(X[9]=="-"){58=-58}}N{58=0}F Y 3Q(3Q.v4(5W,7y,7x,9R,2a,9Q,7w)-58)};B.1D.dY=G(2g,kx){if(H(2g)=="L"||2g===O){F O}u hh=2g.v3();u mm=2g.v2();u ss=2g.v1();u 1g=[((kx&&(hh<10))?"0"+hh:hh),((mm<10)?"0"+mm:mm),((ss<10)?"0"+ss:ss)];F 1g.2b(":")};B.1D.kq=G(2g,7v){if(H(2g)=="L"||2g===O){F O}u ku=7v?"T":" ";u kt=7v?"Z":"";if(7v){2g=Y 3Q(2g.9P()+(2g.v0()*kw))}F B.1D.dX(2g)+ku+B.1D.dY(2g,7v)+kt};B.1D.dX=G(2g){if(H(2g)=="L"||2g===O){F O}u e4=B.1D.e3;F[2g.dZ(),e4(2g.e1()+1),e4(2g.e0())].2b("-")};B.1D.kp=G(d){d=d+"";if(H(d)!="1n"||d.K===0){F O}u a=d.2R("/");F Y 3Q(a[2],a[0]-1,a[1])};B.1D.e3=G(n){F(n>9)?n:"0"+n};B.1D.ko=G(d){if(H(d)=="L"||d===O){F O}u e2=B.1D.e3;F[e2(d.e1()+1),e2(d.e0()),d.dZ()].2b("/")};B.1D.kn=G(d){if(H(d)=="L"||d===O){F O}F[d.e1()+1,d.e0(),d.dZ()].2b("/")};B.1D.1z=["ks","kr","dY","kq","dX","kp","ko","kn"];B.1D.1W=[];B.1D.2k={":3e":B.1D.1z,":1p":B.1D.1z};B.1D.2d=G(){u 2w=D.1r+".";R(u k in D){u o=D[k];if(H(o)=="G"&&H(o.1r)=="L"){1f{o.1r=2w+k}1e(e){}}}};B.1D.2d();if(H(B.J)!="L"){B.J.2Y(D,B.1D)}N{(G(km,dW){if((H(1x)=="L"&&H(1q)=="L")||(H(B.3d)=="5L"&&B.3d)){u 1p=dW.2k[":1p"];R(u i=0;i<1p.K;i++){km[1p[i]]=dW[1p[i]]}}})(D,B.1D)}if(H(1q)!="L"){1q.2X("B.1s")}if(H(B)=="L"){B={}}if(H(B.1s)=="L"){B.1s={}}B.1s.1r="B.1s";B.1s.1Y="1.3.1";B.1s.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.1s.1l=G(){F D.1K()};B.1s.ke=G(kl,kk,kj,ki,kh,dV,kg,9N,kf){F G(1P){1P=4M(1P);if(H(1P)=="L"||1P===O||k8(1P)){F kl}u 9L=kk;u 9K=kj;if(1P<0){1P=-1P}N{9L=9L.23(/-/,"")}u me=M.2U;u 9M=B.1s.dJ(ki);if(kh){1P=1P*3k;9K=9M.9y+9K}1P=B.1s.dK(1P,dV);u 9O=1P.2R(/\\./);u 3r=9O[0];u 3P=(9O.K==1)?"":9O[1];u X="";1M(3r.K<kg){3r="0"+3r}if(9N){1M(3r.K>9N){u i=3r.K-9N;X=9M.9A+3r.2W(i,3r.K)+X;3r=3r.2W(0,i)}}X=3r+X;if(dV>0){1M(3P.K<kf){3P=3P+"0"}X=X+9M.9z+3P}F 9L+X+9K}};B.1s.k5=G(9J,9H,9G){if(H(9H)=="L"){9H=""}u 3q=9J.3C(/((?:[0#]+,)?[0#]+)(?:\\.([0#]+))?(%)?/);if(!3q){14 3p("uZ uY")}u 7u=9J.3H(0,3q.c6);u kd=9J.3H(3q.c6+3q[0].K);if(7u.uX(/-/)==-1){7u=7u+"-"}u 9I=3q[1];u 3P=(H(3q[2])=="1n"&&3q[2]!="")?3q[2]:"";u kc=(H(3q[3])=="1n"&&3q[3]!="");u dU=9I.2R(/,/);u 9F;if(H(9G)=="L"){9G="dG"}if(dU.K==1){9F=O}N{9F=dU[1].K}u ka=9I.K-9I.23(/0/g,"").K;u k9=3P.K-3P.23(/0/g,"").K;u kb=3P.K;u W=B.1s.ke(9H,7u,kd,9G,kc,kb,ka,9F,k9);u m=B.J;if(m){u fn=M.2U;u 3G=m.2o(M);W.U=G(){F[I.1r,"(",2r(m.U,3G).2b(", "),")"].2b("")}}F W};B.1s.dJ=G(4g){if(H(4g)=="L"||4g===O){4g="dG"}if(H(4g)=="1n"){u W=B.1s.5V[4g];if(H(W)=="1n"){W=M.2U(W);B.1s.5V[4g]=W}F W}N{F 4g}};B.1s.k4=G(dT,9E){if(9E){u X=dT/9E;if(!k8(X)){F B.1s.9B(dT/9E)}}F"0"};B.1s.9B=G(dS){u dR=(dS<0?"-":"");u s=28.8B(28.uW(dS)*3k).1l();if(s=="0"){F s}if(s.K<3){1M(s.3Z(s.K-1)=="0"){s=s.2W(0,s.K-1)}F dR+"0."+s}u 5E=dR+s.2W(0,s.K-2);u 7t=s.2W(s.K-2,s.K);if(7t=="uV"){F 5E}N{if(7t.3Z(1)=="0"){F 5E+"."+7t.3Z(0)}N{F 5E+"."+7t}}};B.1s.dI=G(1y,dQ){1y=1y+"";if(H(1y)!="1n"){F O}if(!dQ){F 1y.23(/^\\s+/,"")}N{F 1y.23(Y 8V("^["+dQ+"]+"),"")}};B.1s.dH=G(1y,dP){1y=1y+"";if(H(1y)!="1n"){F O}if(!dP){F 1y.23(/\\s+$/,"")}N{F 1y.23(Y 8V("["+dP+"]+$"),"")}};B.1s.k2=G(1y,dO){u I=B.1s;F I.dH(I.dI(1y,dO),dO)};B.1s.dL=G(9D,9C){9D=28.8B(9D*28.dN(10,9C));u X=(9D*28.dN(10,-9C)).6I(9C);if(X.3Z(0)=="."){X="0"+X}F X};B.1s.dK=G(k7,dM){F B.1s.dL(k7+0.5*28.dN(10,-dM),dM)};B.1s.k3=G(k6){F B.1s.9B(3k*k6)+"%"};B.1s.1z=["dL","dK","k5","dJ","k4","9B","k3","dI","dH","k2"];B.1s.5V={k1:{9A:",",9z:".",9y:"%"},uU:{9A:".",9z:",",9y:"%"},uT:{9A:" ",9z:",",9y:"%"},"dG":"k1"};B.1s.1W=[];B.1s.2k={":1p":B.1s.1z,":3e":B.1s.1z};B.1s.2d=G(){u 2w=D.1r+".";u k,v,o;R(k in D.5V){o=D.5V[k];if(H(o)=="3n"){o.U=G(){F D.1r};o.1r=2w+"5V."+k}}R(k in D){o=D[k];if(H(o)=="G"&&H(o.1r)=="L"){1f{o.1r=2w+k}1e(e){}}}};B.1s.2d();if(H(B.J)!="L"){B.J.2Y(D,B.1s)}N{(G(k0,dF){if((H(1x)=="L"&&H(1q)=="L")||(H(B.3d)=="5L"&&B.3d)){u 1p=dF.2k[":1p"];R(u i=0;i<1p.K;i++){k0[1p[i]]=dF[1p[i]]}}})(D,B.1s)}if(H(1q)!="L"){1q.2X("B.1k");1q.2M("B.J")}if(H(1x)!="L"){1x.26("B.J",[])}1f{if(H(B.J)=="L"){14""}}1e(e){14"B.1k 3F on B.J!"}if(H(B.1k)=="L"){B.1k={}}B.1k.1r="B.1k";B.1k.1Y="1.3.1";B.1k.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.1k.1l=G(){F D.1K()};B.1k.2t=G(jZ){D.55=[];D.id=D.7n();D.2H=-1;D.54=0;D.53=[O,O];D.7m=jZ;D.7l=1m;D.7r=1m};B.1k.2t.1U={U:G(){u 7s;if(D.2H==-1){7s="uS"}N{if(D.2H===0){7s="uR"}N{7s="dE"}}F"2t("+D.id+", "+7s+")"},1l:B.J.24("U"),7n:B.J.4f(),jY:G(){u I=B.1k;if(D.2H==-1){if(D.7m){D.7m(D)}N{D.7l=1h}if(D.2H==-1){D.52(Y I.di(D))}}N{if((D.2H===0)&&(D.53[0]2C I.2t)){D.53[0].jY()}}},jQ:G(){D.54++},jX:G(){D.54--;if((D.54===0)&&(D.2H>=0)){D.9u()}},jR:G(X){D.9x(X);D.jX()},9x:G(X){D.2H=((X 2C 2x)?1:0);D.53[D.2H]=X;D.9u()},dD:G(){if(D.2H!=-1){if(!D.7l){14 Y B.1k.dj(D)}D.7l=1m;F}},3o:G(X){D.dD();if(X 2C B.1k.2t){14 Y 2x("2t jW 9v aB be 7r if jV jU jT jS of a 3o")}D.9x(X)},52:G(X){D.dD();u I=B.1k;if(X 2C I.2t){14 Y 2x("2t jW 9v aB be 7r if jV jU jT jS of a 3o")}if(!(X 2C 2x)){X=Y I.9p(X)}D.9x(X)},jP:G(fn){if(M.K>1){fn=B.J.2z.1w(O,M)}F D.9w(fn,fn)},5Q:G(fn){if(M.K>1){fn=B.J.2z.1w(O,M)}F D.9w(fn,O)},jA:G(fn){if(M.K>1){fn=B.J.2z.1w(O,M)}F D.9w(O,fn)},9w:G(cb,eb){if(D.7r){14 Y 2x("uQ uP 9v 2E be re-uO")}D.55.1c([cb,eb]);if(D.2H>=0){D.9u()}F D},9u:G(){u dC=D.55;u 56=D.2H;u X=D.53[56];u I=D;u cb=O;1M(dC.K>0&&D.54===0){u 2n=dC.2P();u f=2n[56];if(f===O){2V}1f{X=f(X);56=((X 2C 2x)?1:0);if(X 2C B.1k.2t){cb=G(X){I.jR(X)};D.jQ()}}1e(3O){56=1;if(!(3O 2C 2x)){3O=Y B.1k.9p(3O)}X=3O}}D.2H=56;D.53[56]=X;if(cb&&D.54){X.jP(cb);X.7r=1h}}};B.J.2l(B.1k,{dk:G(){F dB("("+M[0].jN+")")},dp:G(uN){u d=Y B.1k.2t();d.3o.1w(d,M);F d},9q:G(uM){u d=Y B.1k.2t();d.52.1w(d,M);F d},do:G(){u I=M.2U;if(!I.7q){u dy=[G(){F Y 7q()},G(){F Y dA("jO.dz")},G(){F Y dA("uL.dz")},G(){F Y dA("jO.dz.4.0")},G(){14 Y B.1k.dh("uK uJ 2E uI 7q")}];R(u i=0;i<dy.K;i++){u 1A=dy[i];1f{I.7q=1A;F 1A()}1e(e){}}}F I.7q()},dx:G(){},jK:G(d){if(D.uH==4){1f{D.5T=O}1e(e){1f{D.5T=B.1k.dx}1e(e){}}u 5U=O;1f{5U=D.jm;if(!5U&&B.J.7e(D.jN)){5U=jM}}1e(e){}if(5U==hQ||5U==jM){d.3o(D)}N{u 3O=Y B.1k.dg(D,"uG uF");if(3O.2y){d.52(3O)}N{d.52(3O)}}}},jL:G(2s){1f{2s.5T=O}1e(e){1f{2s.5T=B.1k.dx}1e(e){}}2s.uE()},dl:G(2s,7p){if(H(7p)=="L"||7p===O){7p=""}u m=B.J;u I=B.1k;u d=Y I.2t(m.2z(I.jL,2s));1f{2s.5T=m.1O(I.jK,2s,d);2s.uD(7p)}1e(e){1f{2s.5T=O}1e(uC){}d.52(e)}F d},dn:G(5F){u I=B.1k;u 2s=I.do();if(M.K>1){u m=B.J;u qs=m.dw.1w(O,m.1R(O,M,1));if(qs){5F+="?"+qs}}2s.cp("uB",5F,1h);F I.dl(2s)},jv:G(5F){u I=B.1k;u d=I.dn.1w(I,M);d=d.5Q(I.dk);F d},dm:G(jJ,dv){u d=Y B.1k.2t();u m=B.J;if(H(dv)!="L"){d.5Q(G(){F dv})}u jI=uA(m.1O("3o",d),28.8B(jJ*c5));d.7m=G(){1f{uz(jI)}1e(e){}};F d},ju:G(jH,1A){u m=B.J;u jG=m.2z.1w(m,m.1R(O,M,1));F B.1k.dm(jH).5Q(G(X){F jG()})}});B.1k.5O=G(){D.5S=[];D.4e=1m;D.id=D.7n()};B.1k.5O.1U={bX:B.1k.5O,uy:G(){d=Y B.1k.2t();if(D.4e){D.5S.1c(d)}N{D.4e=1h;d.3o(D)}F d},jF:G(){if(!D.4e){14 3p("ux to jF an jE 5O")}D.4e=1m;if(D.5S.K>0){D.4e=1h;D.5S.2P().3o(D)}},7n:B.J.4f(),U:G(){u 9t;if(D.4e){9t="4e, "+D.5S.K+" 5S"}N{9t="jE"}F"5O("+D.id+", "+9t+")"},1l:B.J.24("U")};B.1k.7i=G(2G,du,jC,jB,jD){D.2G=2G;D.9r=Y 7o(D.2G.K);D.55=[];D.id=D.7n();D.2H=-1;D.54=0;D.53=[O,O];D.7m=jD;D.7l=1m;if(D.2G.K===0&&!du){D.3o(D.9r)}D.dr=0;D.jz=du;D.jy=jC;D.jx=jB;u 9s=0;B.J.2r(B.J.1O(G(d){d.5Q(B.J.1O(D.dt,D),9s,1h);d.jA(B.J.1O(D.dt,D),9s,1m);9s+=1},D),D.2G)};B.J.2l(B.1k.7i.1U,B.1k.2t.1U);B.J.2l(B.1k.7i.1U,{dt:G(ds,7k,5R){D.9r[ds]=[7k,5R];D.dr+=1;if(D.2H!==0){if(7k&&D.jz){D.3o([ds,5R])}N{if(!7k&&D.jy){D.52(5R)}N{if(D.dr==D.2G.K){D.3o(D.9r)}}}}if(!7k&&D.jx){5R=O}F 5R}});B.1k.jt=G(jw){u d=Y B.1k.7i(jw,1m,1h,1m);d.5Q(G(dq){u 7j=[];R(u i=0;i<dq.K;i++){7j.1c(dq[i][1])}F 7j});F d};B.1k.jr=G(1A){u I=B.1k;u 5P;1f{u r=1A.1w(O,B.J.1R([],M,1));if(r 2C I.2t){5P=r}N{if(r 2C 2x){5P=I.9q(r)}N{5P=I.dp(r)}}}1e(e){5P=I.9q(e)}F 5P};B.1k.1z=["dj","di","dh","9p","dg","2t","dp","9q","do","dn","jv","dm","ju","dl","5O","7i","jt","jr"];B.1k.1W=["dk"];B.1k.2d=G(){u m=B.J;u ne=m.2z(m.jq,D);ne("dj",G(jp){D.jo=jp});ne("di",G(jn){D.jo=jn});ne("dh",G(1t){D.43=1t});ne("9p",G(1t){D.43=1t});ne("dg",G(2s,1t){D.2s=2s;D.43=1t;1f{D.2y=2s.jm}1e(e){}});D.2k={":3e":D.1z,":1p":m.2o(D.1z,D.1W)};m.3f(D)};B.1k.2d();B.J.2Y(D,B.1k);if(H(1q)!="L"){1q.2X("B.S");1q.2M("B.15")}if(H(1x)!="L"){1x.26("B.15",[])}1f{if(H(B.15)=="L"){14""}}1e(e){14"B.S 3F on B.15!"}if(H(B.S)=="L"){B.S={}}B.S.1r="B.S";B.S.1Y="1.3.1";B.S.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.S.1l=G(){F D.1K()};B.S.1z=["d5","cr","b9","95","94","j3","9k","cX","cw","iT","iV","4X","9j","iQ","hS","cs","ia","i9","i8","i7","i6","i5","i4","hV","i3","i2","i1","cu","hW","ct","i0","hZ","hY","hX","P","io","il","ik","ij","cm","ih","ii","ig","ie","ic","cv","8d","A","6m","ib","1E","$","4q","aH","cO","cN","iM","5G","iK","9d","9e","iH","iD","9c","iB","cG","97","hU","hT","iw","jh","jb","j6","j5","jk","jl"];B.S.1W=["9b"];B.S.5N=G(w,h){D.w=w;D.h=h};B.S.5N.1U.U=G(){u U=B.J.U;F"{w: "+U(D.w)+", h: "+U(D.h)+"}"};B.S.5t=G(x,y){D.x=x;D.y=y};B.S.5t.1U.U=G(){u U=B.J.U;F"{x: "+U(D.x)+", y: "+U(D.y)+"}"};B.S.5t.1U.1l=G(){F D.U()};B.J.2l(B.S,{jl:G(Q,o){Q=B.S.1E(Q);B.S.4X(Q,{"1T":{"9o":o,"-hL-9o":o,"-uw-9o":o,"47":" uv(9o="+(o*3k)+")"}})},jk:G(){u d=Y B.S.5N();u w=B.S.3X;u b=B.S.1Z.5s;if(w.jj){d.w=w.jj;d.h=w.uu}N{if(b.dd.9n){d.w=b.dd.9n;d.h=b.dd.ji}N{if(b&&b.9n){d.w=b.9n;d.h=b.ji}}}F d},jh:G(Q){u I=B.S;if(H(Q.w)=="2y"||H(Q.h)=="2y"){F Y I.5N(Q.w||0,Q.h||0)}Q=I.1E(Q);if(!Q){F L}if(I.4q(Q,"3u")!="98"){F Y I.5N(Q.jg||0,Q.ci||0)}u s=Q.1T;u je=s.dc;u jf=s.6P;s.dc="fR";s.6P="j8";s.3u="";u jd=Q.jg;u jc=Q.ci;s.3u="98";s.6P=jf;s.dc=je;F Y I.5N(jd,jc)},jb:G(Q,4Z){u I=B.S;Q=I.1E(Q);if(!Q){F L}u c=Y I.5t(0,0);if(Q.x&&Q.y){c.x+=Q.x||0;c.y+=Q.y||0;F c}N{if(Q.3t===O||I.4q(Q,"3u")=="98"){F L}}u 51=O;u 2j=O;u d=B.S.1Z;u de=d.7Z;u b=d.5s;if(Q.ja){51=Q.ja();c.x+=51.2I+(de.6y||b.6y)-(de.8q||b.8q);c.y+=51.3D+(de.4C||b.4C)-(de.8p||b.8p)}N{if(d.j9){51=d.j9(Q);c.x+=51.x;c.y+=51.y}N{if(Q.8g){c.x+=Q.db;c.y+=Q.da;2j=Q.8g;if(2j!=Q){1M(2j){c.x+=2j.db;c.y+=2j.da;2j=2j.8g}}u ua=ut.us.8G();if((H(7h)!="L"&&4M(7h.ur())<9)||(ua.2A("uq")!=-1&&I.4q(Q,"6P")=="j8")){c.x-=b.db;c.y-=b.da}}}}if(H(4Z)!="L"){4Z=M.2U(4Z);if(4Z){c.x-=(4Z.x||0);c.y-=(4Z.y||0)}}if(Q.3t){2j=Q.3t}N{2j=O}1M(2j&&2j.j7!="uo"&&2j.j7!="co"){c.x-=2j.6y;c.y-=2j.4C;if(2j.3t){2j=2j.3t}N{2j=O}}F c},j6:G(Q,d9,7g){Q=B.S.1E(Q);if(H(7g)=="L"){7g="px"}B.S.4X(Q,{"1T":{"5A":d9.w+7g,"3V":d9.h+7g}})},j5:G(Q,d8,7f){Q=B.S.1E(Q);if(H(7f)=="L"){7f="px"}B.S.4X(Q,{"1T":{"2I":d8.x+7f,"3D":d8.y+7f}})},cr:G(){F B.S.3X},b9:G(){F B.S.1Z},95:G(2m,1A){u I=B.S;u d6=I.1Z;u d7=I.un;u W;1f{I.3X=2m;I.1Z=2m.2v;W=1A()}1e(e){I.3X=d7;I.1Z=d6;14 e}I.3X=d7;I.1Z=d6;F W},d5:G(Q){u 7d=[];u 7c=[];u m=B.J;u I=B.S;if(H(Q)=="L"||Q===O){Q=I.1Z}N{Q=I.1E(Q)}m.d4(Q,G(Q){u 1b=Q.1b;if(m.7e(1b)){u 4Y=Q.cD;if(4Y=="cv"&&(Q.1J=="um"||Q.1J=="uk")&&!Q.ip){F O}if(4Y=="ct"){if(Q.j4>=0){u 9m=Q.1S[Q.j4];7d.1c(1b);7c.1c((9m.3m)?9m.3m:9m.7X);F O}7d.1c(1b);7c.1c("");F O}if(4Y=="cu"||4Y=="P"||4Y=="8d"||4Y=="6m"){F Q.5h}7d.1c(1b);7c.1c(Q.3m||"");F O}F Q.5h});F[7d,7c]},94:G(1N,1A){u I=B.S;u d3=I.1Z;u W;1f{I.1Z=1N;W=1A()}1e(e){I.1Z=d3;14 e}I.1Z=d3;F W},j3:G(1b,j2,3y,j1){B.S.9b.5M(1b,j2,3y,j1)},9k:G(1j,7a){u im=B.15;u I=B.S;u 1Q=im.1Q;u iY=im.7b;u 4c=im.4c;u iX=I.9b;u iZ=I.9k;u iW=B.J.4d;1M(1h){if(H(1j)=="L"||1j===O){F O}if(H(1j.3T)!="L"&&1j.3T>0){F 1j}if(H(1j)=="2y"||H(1j)=="5L"){1j=1j.1l()}if(H(1j)=="1n"){F I.1Z.4S(1j)}if(H(1j.j0)=="G"){1j=1j.j0(7a);2V}if(H(1j)=="G"){1j=1j(7a);2V}u 9l=O;1f{9l=1Q(1j)}1e(e){}if(9l){F 4c(iZ,9l,iY(7a))}1f{1j=iX.3C(1j,7a);2V}1e(e){if(e!=iW){14 e}}F I.1Z.4S(1j.1l())}F L},iV:G(1j,79,iU){u o={};o[79]=iU;1f{F B.S.4X(1j,o)}1e(e){}F O},iT:G(1j,79){u I=B.S;u d2=I.4U.99[79];1j=I.1E(1j);1f{if(d2){F 1j[d2]}F 1j.fm(79)}1e(e){}F O},4X:G(1j,5K){u Q=1j;u I=B.S;if(H(1j)=="1n"){Q=I.1E(1j)}if(5K){u d0=B.J.8Z;if(I.4U.6X){R(u k in 5K){u v=5K[k];if(H(v)=="3n"&&H(Q[k])=="3n"){d0(Q[k],v)}N{if(k.2W(0,2)=="on"){if(H(v)=="1n"){v=Y cZ(v)}Q[k]=v}N{Q.4p(k,v)}}}}N{u iS=I.4U.99;R(k in 5K){v=5K[k];u d1=iS[k];if(k=="1T"&&H(v)=="1n"){Q.1T.3x=v}N{if(H(d1)=="1n"){Q[d1]=v}N{if(H(Q[k])=="3n"&&H(v)=="3n"){d0(Q[k],v)}N{if(k.2W(0,2)=="on"){if(H(v)=="1n"){v=Y cZ(v)}Q[k]=v}N{Q.4p(k,v)}}}}}}}F Q},9j:G(1j){u Q=1j;u I=B.S;if(H(1j)=="1n"){Q=I.1E(1j)}u 78=[I.9k(B.J.1R(O,M,1),Q)];u iR=B.J.2o;1M(78.K){u n=78.2P();if(H(n)=="L"||n===O){}N{if(H(n.3T)=="2y"){Q.2c(n)}N{78=iR(n,78)}}}F Q},iQ:G(1j){u Q=1j;u I=B.S;if(H(1j)=="1n"){Q=I.1E(1j);M[0]=Q}u cY;1M((cY=Q.6n)){Q.6S(cY)}if(M.K<2){F Q}N{F I.9j.1w(D,M)}},cX:G(1b,4b){u Q;u I=B.S;u m=B.J;if(H(4b)=="1n"||H(4b)=="2y"){u 3G=m.1R([1b,O],M,1);F M.2U.1w(D,3G)}if(H(1b)=="1n"){if(4b&&"1b"in 4b&&!I.4U.6X){1b=("<"+1b+" 1b=\\""+I.9c(4b.1b)+"\\">")}Q=I.1Z.2S(1b)}N{Q=1b}if(4b){I.4X(Q,4b)}if(M.K<=2){F Q}N{u 3G=m.1R([Q],M,2);F I.9j.1w(D,3G)}},cw:G(){u m=B.J;F m.2z.1w(D,m.1R([B.S.cX],M))},cs:G(5J,1d){u I=B.S;5J=I.1E(5J);u cW=5J.3t;if(1d){1d=I.1E(1d);cW.uj(1d,5J)}N{cW.6S(5J)}F 1d},1E:G(id){u I=B.S;if(M.K==1){F((H(id)=="1n")?I.1Z.hN(id):id)}N{F B.J.2r(I.1E,M)}},4q:G(iP,cV,cU){if(M.K==2){cU=cV}u I=B.S;u el=I.1E(iP);u 77=I.1Z;if(!el||el==77){F L}if(el.iO){F el.iO[cV]}if(H(77.5k)=="L"){F L}if(77.5k===O){F L}u 9i=77.5k.g4(el,O);if(H(9i)=="L"||9i===O){F L}F 9i.6q(cU)},aH:G(76,9g,4W){u I=B.S;if(H(76)=="L"||76===O){76="*"}if(H(4W)=="L"||4W===O){4W=I.1Z}4W=I.1E(4W);u 9h=(4W.fr(76)||I.1Z.1p);if(H(9g)=="L"||9g===O){F B.J.1R(O,9h)}u cR=[];R(u i=0;i<9h.K;i++){u cS=9h[i];u cT=cS.3M.2R(" ");R(u j=0;j<cT.K;j++){if(cT[j]==9g){cR.1c(cS);2K}}}F cR},iN:G(5I,9f){u W=G(){u cQ=M.2U.5H;R(u i=0;i<cQ.K;i++){if(cQ[i].1w(D,M)===1m){2K}}if(9f){1f{D[5I]=O}1e(e){}}};W.5H=[];F W},cO:G(cP,5I,1A,9f){u I=B.S;u 4V=cP[5I];u 75=4V;if(!(H(4V)=="G"&&H(4V.5H)=="3n"&&4V.5H!==O)){75=I.iN(5I,9f);if(H(4V)=="G"){75.5H.1c(4V)}cP[5I]=75}75.5H.1c(1A)},cN:G(1A){u I=B.S;I.cO(I.3X,"gh",1A,1h)},iM:G(74){u I=B.S;I.cN(G(){74=I.1E(74);if(74){74.ui()}})},5G:G(iL,cM){u I=B.S;u 1i=I.1E(iL);if(I.4U.6X){1i.4p("iq",cM)}N{1i.4p("3M",cM)}},iK:G(cL){u I=B.S;R(u i=1;i<M.K;i++){u 1i=I.1E(M[i]);if(!I.9d(1i,cL)){I.9e(1i,cL)}}},9d:G(iJ,73){u I=B.S;u 1i=I.1E(iJ);u 2F=1i.3M;if(2F.K===0){I.5G(1i,73);F 1h}if(2F==73){F 1m}u cK=1i.3M.2R(" ");R(u i=0;i<cK.K;i++){if(cK[i]==73){F 1m}}I.5G(1i,2F+" "+73);F 1h},9e:G(iI,cJ){u I=B.S;u 1i=I.1E(iI);u 2F=1i.3M;if(2F.K===0){F 1m}if(2F==cJ){I.5G(1i,"");F 1h}u 72=1i.3M.2R(" ");R(u i=0;i<72.K;i++){if(72[i]==cJ){72.4y(i,1);I.5G(1i,72.2b(" "));F 1h}}F 1m},iH:G(iG,iF,iE){u 1i=B.S.1E(iG);u X=B.S.9e(1i,iF);if(X){B.S.9d(1i,iE)}F X},iD:G(iC,uh){u 1i=B.S.1E(iC);u cI=1i.3M.2R(" ");R(u i=1;i<M.K;i++){u cH=1m;R(u j=0;j<cI.K;j++){if(cI[j]==M[i]){cH=1h;2K}}if(!cH){F 1m}}F 1h},9c:G(s){F s.23(/&/g,"&ug;").23(/"/g,"&uf;").23(/</g,"&lt;").23(/>/g,"&gt;")},iB:G(2q){F B.S.cG(2q).2b("")},cG:G(2q,1g){if(H(1g)=="L"||1g===O){1g=[]}u 70=[2q];u I=B.S;u cB=I.9c;u iA=I.4U;1M(70.K){2q=70.hP();if(H(2q)=="1n"){1g.1c(2q)}N{if(2q.3T==1){1g.1c("<"+2q.cD.8G());u 71=[];u cF=iA(2q);R(u i=0;i<cF.K;i++){u a=cF[i];71.1c([" ",a.1b,"=\\"",cB(a.3m),"\\""])}71.iz();R(i=0;i<71.K;i++){u cE=71[i];R(u j=0;j<cE.K;j++){1g.1c(cE[j])}}if(2q.ue()){1g.1c(">");70.1c("</"+2q.cD.8G()+">");u cC=2q.5h;R(i=cC.K-1;i>=0;i--){70.1c(cC[i])}}N{1g.1c("/>")}}N{if(2q.3T==3){1g.1c(cB(2q.iv))}}}}F 1g},97:G(ix,cA){u m=B.J;u iy=m.1R(O,M,1);B.15.9a(m.47(O,m.2r(B.S.1E,iy)),G(cA){cA.1T.3u=ix})},iw:G(1j,iu){u W=[];(G(1j){u cn=1j.5h;if(cn){R(u i=0;i<cn.K;i++){M.2U.cz(D,cn[i])}}u cy=1j.iv;if(H(cy)=="1n"){W.1c(cy)}})(B.S.1E(1j));if(iu){F W}N{F W.2b("")}},2d:G(2m){u m=B.J;D.1Z=2v;D.3X=2m;D.9b=Y m.4a();u 6Z=D.1Z.2S("cj");u 2T;if(6Z&&6Z.6Y&&6Z.6Y.K>0){u it=m.47;2T=G(1j){F it(2T.ir,1j.6Y)};2T.cx={};B.15.9a(6Z.6Y,G(a){2T.cx[a.1b]=a.3m});2T.ir=G(a){F(2T.cx[a.1b]!=a.3m)};2T.6X=1m;2T.99={"iq":"3M","ip":"ud","uc":"ub","R":"u9"}}N{2T=G(1j){F 1j.6Y};2T.6X=1h;2T.99={}}D.4U=2T;u 1C=D.cw;D.io=1C("ul");D.il=1C("ol");D.ik=1C("li");D.ij=1C("td");D.cm=1C("tr");D.ii=1C("u8");D.ih=1C("u7");D.ig=1C("u6");D.ie=1C("u5");D.ic=1C("th");D.cv=1C("ck");D.8d=1C("cj");D.A=1C("a");D.6m=1C("4u");D.ib=1C("u4");D.ia=1C("2e");D.i9=1C("tt");D.i8=1C("4O");D.i7=1C("h1");D.i6=1C("h2");D.i5=1C("h3");D.i4=1C("br");D.i3=1C("hr");D.i2=1C("u3");D.i1=1C("u2");D.cu=1C("u1");D.P=1C("p");D.ct=1C("u0");D.i0=1C("hJ");D.hZ=1C("tZ");D.hY=1C("tY");D.hX=1C("tX");D.hW=1C("tW");D.hV=1C("tV");D.hU=m.2z(D.97,"98");D.hT=m.2z(D.97,"8c");D.hS=D.cs;D.$=D.1E;D.2k={":3e":D.1z,":1p":m.2o(D.1z,D.1W)};m.3f(D)}});B.S.2d(((H(2O)=="L")?D:2O));if(!B.3d){95=B.S.95;94=B.S.94}B.J.2Y(D,B.S);if(H(1q)!="L"){1q.2X("B.1I");1q.2M("B.1H");1q.2M("B.J")}if(H(1x)!="L"){1x.26("B.1H",[]);1x.26("B.J",[])}1f{if(H(B.J)=="L"||H(B.1H)=="L"){14""}}1e(e){14"B.1I 3F on B.J 3W B.1H!"}if(H(B.1I)=="L"){B.1I={}}B.1I.1r="B.1I";B.1I.1Y="1.3.1";B.1I.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.1I.1l=G(){F D.1K()};B.1I.bY=G(6W){u m=B.1I;6W=!(!6W);if(m.3l&&m.3l.8Q!=6W){m.3l.hA();m.3l=O}if(!m.3l||m.3l.8P){m.3l=Y m.1I(6W,B.1H.2L)}F m.3l};B.1I.1I=G(4R,6V){if(H(6V)=="L"||6V===O){6V=B.1H.2L}D.2L=6V;u tU=B.J.2l;u c3=B.J.8Z;u 1O=B.J.1O;u hM=B.J.4L;u 2m=2O;u 6U="tT";if(H(B.S)!="L"){2m=B.S.cr()}if(!4R){u 5F=2m.tS.tR.2R("?")[0].23(/[:\\/.><&]/g,"hR");u 1b=6U+"hR"+5F;u 5D=2m.cp("",1b,"tQ,tP,3V=hQ");if(!5D){cq("tO tN to cp tM 2O tL to hP-up tK.");F L}5D.2v.fl("<!tJ co tI \\"-//tH//tG co 4.0 tF//tE\\" "+"\\"fq://fp.tD.fo/cm/tC/tB.tA\\">"+"<hO><5E><8Y>[B.1I]</8Y></5E>"+"<5s></5s></hO>");5D.2v.hG();5D.2v.8Y+=" "+2m.2v.8Y;2m=5D}u 1N=2m.2v;D.1N=1N;u 21=1N.hN(6U);u c4=!!21;if(21&&H(21.5B)!="L"){21.5B.2L=D.2L;21.5B.6K();F 21.5B}if(c4){u cl;1M((cl=21.6n)){21.6S(cl)}}N{21=1N.2S("4u");21.id=6U}21.5B=D;u 8T=1N.2S("ck");u 8S=1N.2S("ck");u 6O=1N.2S("2e");u 6N=1N.2S("2e");u 6M=1N.2S("2e");u 6L=1N.2S("2e");u 3L=1N.2S("4u");u 42=1N.2S("4u");u 8U=6U+"tz";D.8N=hM(D.8N);u 4T=[];u 6R=O;u cf=G(1t){u 6T=1t.3N;if(H(6T)=="2y"){6T=B.1H.5C[6T]}F 6T};u cd=G(1t){F 1t.3z.2b(" ")};u ca=1O(G(1t){u 8W=cf(1t);u 7X=cd(1t);u c=D.8N[8W];u p=1N.2S("cj");p.3M="B-49 B-5C-"+8W;p.1T.3x="ty: 2N; 4F-8X: -hL-4O-3y; 4F-8X: -o-4O-3y; 4F-8X: 4O-3y; 4F-8X: 4O-tx; hK-3y: 2K-hK; 3y-hJ: tw; 3U: "+c;p.2c(1N.4S(8W+": "+7X));42.2c(p);42.2c(1N.2S("br"));if(3L.ci>3L.hI){3L.4C=0}N{3L.4C=3L.hI}},D);u hD=G(1t){4T[4T.K]=1t;ca(1t)};u hF=G(){u cg,ce;1f{cg=Y 8V(8T.3m);ce=Y 8V(8S.3m)}1e(e){ch("2x in 47 tv: "+e.43);F O}F G(1t){F(cg.hH(cf(1t))&&ce.hH(cd(1t)))}};u cc=G(){1M(42.6n){42.6S(42.6n)}};u hB=G(){4T=[];cc()};u bZ=1O(G(){if(D.8P){F}D.8P=1h;if(B.1I.3l==D){B.1I.3l=O}D.2L.c9(8U);21.5B=O;if(4R){21.3t.6S(21)}N{D.2m.hG()}},D);u c7=G(){cc();R(u i=0;i<4T.K;i++){u 1t=4T[i];if(6R===O||6R(1t)){ca(1t)}}};D.6K=G(){6R=hF();c7();D.2L.c9(8U);D.2L.hE(8U,6R,hD)};u c0=1O(G(){4T=D.2L.c8();c7()},D);u c2=1O(G(6Q){6Q=6Q||2O.6D;2h=6Q.6w||6Q.8t;if(2h==13){D.6K()}},D);u 31="3u: 8c; z-c6: c5; 2I: 2N; 6f: 2N; 6P: tu; 5A: 3k%; he-3U: 4F; c1: "+D.8O;if(4R){31+="; 3V: ts; 3E-3D: fO 8a 8y"}N{31+="; 3V: 3k%;"}21.1T.3x=31;if(!c4){1N.5s.2c(21)}31={"3x":"5A: 33%; 3u: 8Q; c1: "+D.8O};c3(8T,{"3m":"8L|8M|8K|8J|8I","hC":c2,"1T":31});21.2c(8T);c3(8S,{"3m":".*","hC":c2,"1T":31});21.2c(8S);31="5A: 8%; 3u:8Q; c1: "+D.8O;6O.2c(1N.4S("tq"));6O.8R=1O("6K",D);6O.1T.3x=31;21.2c(6O);6N.2c(1N.4S("tp"));6N.8R=c0;6N.1T.3x=31;21.2c(6N);6M.2c(1N.4S("tn"));6M.8R=hB;6M.1T.3x=31;21.2c(6M);6L.2c(1N.4S("tm"));6L.8R=bZ;6L.1T.3x=31;21.2c(6L);3L.1T.3x="fS: tk; 5A: 3k%";42.1T.3x="5A: 3k%; 3V: "+(4R?"tj":"3k%");3L.2c(42);21.2c(3L);D.6K();c0();if(4R){D.2m=L}N{D.2m=2m}D.8Q=4R;D.hA=bZ;D.8P=1m;F D};B.1I.1I.1U={"8O":"ti tg,tf-te","8N":{"8M":"1v","8L":"gU","8K":"1F","8J":"8y","8I":"bx"}};B.1I.1W=["1I"];B.1I.1z=["bY"];B.1I.2d=G(){D.2k={":3e":D.1z,":1p":B.J.2o(D.1z,D.1W)};B.J.3f(D);B.1I.3l=O};B.1I.2d();B.J.2Y(D,B.1I);if(H(1q)!="L"){1q.2X("B.V");1q.2M("B.J")}if(H(1x)!="L"){1x.26("B.J",[])}1f{if(H(B.J)=="L"){14""}}1e(e){14"B.V 3F on B.J"}if(H(B.V)=="L"){B.V={}}B.V.1r="B.V";B.V.1Y="1.3.1";B.V.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.V.1l=G(){F D.1K()};B.V.V=G(1v,hz,1F,6J){if(H(6J)=="L"||6J===O){6J=1}D.1B={r:1v,g:hz,b:1F,a:6J}};B.V.V.1U={bX:B.V.V,tc:G(hy){u 1B=D.1B;u m=B.V;F m.V.3Y(1B.r,1B.g,1B.b,hy)},tb:G(1o){u 1G=D.41();1G.h=1o;u m=B.V;F m.V.4H(1G)},ta:G(hx){u 1G=D.41();1G.s=hx;u m=B.V;F m.V.4H(1G)},t9:G(hw){u 1G=D.41();1G.l=hw;u m=B.V;F m.V.4H(1G)},t8:G(hv){u 1G=D.41();1G.l=28.29(1G.l-hv,0);u m=B.V;F m.V.4H(1G)},t7:G(hu){u 1G=D.41();1G.l=28.2a(1G.l+hu,1);u m=B.V;F m.V.4H(1G)},fJ:G(ht,5z){if(H(5z)=="L"||5z===O){5z=0.5}u sf=1-5z;u s=D.1B;u d=ht.1B;u df=5z;F B.V.V.3Y((s.r*sf)+(d.r*df),(s.g*sf)+(d.g*df),(s.b*sf)+(d.b*df),(s.a*sf)+(d.a*df))},h4:G(hs){u a=D.6r();u b=hs.6r();F B.J.2f([a.r,a.g,a.b,a.a],[b.r,b.g,b.b,b.a])},hq:G(){F D.41().b>0.5},t6:G(){F(!D.hq())},t5:G(){u c=D.41();u 2Z=B.V.6F;u W=D.ho;if(!W){u 5y=(2Z(c.h,bF).6I(0)+","+2Z(c.s,3k).hp(4)+"%"+","+2Z(c.l,3k).hp(4)+"%");u a=c.a;if(a>=1){a=1;W="1G("+5y+")"}N{if(a<=0){a=0}W="t4("+5y+","+a+")"}D.ho=W}F W},hl:G(){u c=D.1B;u 2Z=B.V.6F;u W=D.hn;if(!W){u 5y=(2Z(c.r,3h).6I(0)+","+2Z(c.g,3h).6I(0)+","+2Z(c.b,3h).6I(0));if(c.a!=1){W="t3("+5y+","+c.a+")"}N{W="1B("+5y+")"}D.hn=W}F W},6r:G(){F B.J.4L(D.1B)},t2:G(){u m=B.V;u c=D.1B;u 2Z=B.V.6F;u W=D.hm;if(!W){W=("#"+m.6E(2Z(c.r,3h))+m.6E(2Z(c.g,3h))+m.6E(2Z(c.b,3h)));D.hm=W}F W},t1:G(){u 2Q=D.2Q;u c=D.1B;if(H(2Q)=="L"||2Q===O){2Q=B.V.bA(D.1B);D.2Q=2Q}F B.J.4L(2Q)},41:G(){u 1G=D.1G;u c=D.1B;if(H(1G)=="L"||1G===O){1G=B.V.bC(D.1B);D.1G=1G}F B.J.4L(1G)},1l:G(){F D.hl()},U:G(){u c=D.1B;u hk=[c.r,c.g,c.b,c.a];F D.bX.1r+"("+hk.2b(", ")+")"}};B.J.2l(B.V.V,{3Y:G(1v,bW,1F,8H){u hj=B.V.V;if(M.K==1){u 1B=1v;1v=1B.r;bW=1B.g;1F=1B.b;if(H(1B.a)=="L"){8H=L}N{8H=1B.a}}F Y hj(1v,bW,1F,8H)},4H:G(1o,t0,sZ,sY){u m=B.V;F m.V.3Y(m.bB.1w(m,M))},sX:G(1o,sW,sV,sU){u m=B.V;F m.V.3Y(m.bz.1w(m,M))},hi:G(1b){u 8F=B.V.V;if(1b.3Z(0)=="\\""){1b=1b.3H(1,1b.K-2)}u bV=8F.by[1b.8G()];if(H(bV)=="1n"){F 8F.bT(bV)}N{if(1b=="aP"){F 8F.sT()}}F O},8f:G(4Q){u I=B.V.V;u bU=4Q.3H(0,3);if(bU=="1B"){F I.h9(4Q)}N{if(bU=="1G"){F I.h8(4Q)}N{if(4Q.3Z(0)=="#"){F I.bT(4Q)}}}F I.hi(4Q)},bT:G(4P){if(4P.3Z(0)=="#"){4P=4P.2W(1)}u 8E=[];u i,5x;if(4P.K==3){R(i=0;i<3;i++){5x=4P.3H(i,1);8E.1c(3w(5x+5x,16)/3h)}}N{R(i=0;i<6;i+=2){5x=4P.3H(i,2);8E.1c(3w(5x,16)/3h)}}u bS=B.V.V;F bS.3Y.1w(bS,8E)},bG:G(4O,hf,hg,4N){if(4N.2A(4O)===0){4N=4N.2W(4N.2A("(",3)+1,4N.K-1)}u bR=4N.2R(/\\s*,\\s*/);u bP=[];R(u i=0;i<bR.K;i++){u c=bR[i];u 2i;u bQ=c.2W(c.K-3);if(c.3Z(c.K-1)=="%"){2i=0.bE*4M(c.2W(0,c.K-1))}N{if(bQ=="sS"){2i=4M(c)/bF}N{if(bQ=="sR"){2i=4M(c)/(28.sQ*2)}N{2i=hg[i]*4M(c)}}}bP.1c(2i)}F D[hf].1w(D,bP)},bN:G(Q,sP,sO){u d=B.S;u 2F=B.V.V;R(Q=d.1E(Q);Q;Q=Q.3t){u bO=d.4q.1w(d,M);if(!bO){2V}u 8D=2F.8f(bO);if(!8D){2K}if(8D.6r().a>0){F 8D}}F O},ba:G(Q){u 2F=B.V.V;F 2F.bN(Q,"aZ","he-3U")||2F.sN()},sM:G(Q){u 2F=B.V.V;F 2F.bN(Q,"3U","3U")||2F.sL()},sK:G(){F B.J.4L(B.V.V.by)}});B.J.2l(B.V,{6F:G(v,8C){v*=8C;if(v<0){F 0}N{if(v>8C){F 8C}N{F v}}},hc:G(n1,n2,1o){if(1o>6){1o-=6}N{if(1o<0){1o+=6}}u 2i;if(1o<1){2i=n1+(n2-n1)*1o}N{if(1o<3){2i=n2}N{if(1o<4){2i=n1+(n2-n1)*(4-1o)}N{2i=n1}}}F 2i},bz:G(1o,5w,3i,bM){if(M.K==1){u 2Q=1o;1o=2Q.h;5w=2Q.s;3i=2Q.v;bM=2Q.a}u 1v;u 3K;u 1F;if(5w===0){1v=0;3K=0;1F=0}N{u i=28.8B(1o*6);u f=(1o*6)-i;u p=3i*(1-5w);u q=3i*(1-(5w*f));u t=3i*(1-(5w*(1-f)));hd(i){3j 1:1v=q;3K=3i;1F=p;2K;3j 2:1v=p;3K=3i;1F=t;2K;3j 3:1v=p;3K=q;1F=3i;2K;3j 4:1v=t;3K=p;1F=3i;2K;3j 5:1v=3i;3K=p;1F=q;2K;3j 6:3j 0:1v=3i;3K=t;1F=p;2K}}F{r:1v,g:3K,b:1F,a:bM}},bB:G(1o,5v,3v,bL){if(M.K==1){u 1G=1o;1o=1G.h;5v=1G.s;3v=1G.l;bL=1G.a}u 1v;u 8A;u 1F;if(5v===0){1v=3v;8A=3v;1F=3v}N{u m2;if(3v<=0.5){m2=3v*(1+5v)}N{m2=3v+5v-(3v*5v)}u m1=(2*3v)-m2;u f=B.V.hc;u h6=1o*6;1v=f(m1,m2,h6+2);8A=f(m1,m2,h6);1F=f(m1,m2,h6-2)}F{r:1v,g:8A,b:1F,a:bL}},bA:G(1v,4K,1F,bK){if(M.K==1){u 1B=1v;1v=1B.r;4K=1B.g;1F=1B.b;bK=1B.a}u 29=28.29(28.29(1v,4K),1F);u 2a=28.2a(28.2a(1v,4K),1F);u 1o;u 8z;u hb=29;if(2a==29){1o=0;8z=0}N{u 6H=(29-2a);8z=6H/29;if(1v==29){1o=(4K-1F)/6H}N{if(4K==29){1o=2+((1F-1v)/6H)}N{1o=4+((1v-4K)/6H)}}1o/=6;if(1o<0){1o+=1}if(1o>1){1o-=1}}F{h:1o,s:8z,v:hb,a:bK}},bC:G(1v,4J,1F,bI){if(M.K==1){u 1B=1v;1v=1B.r;4J=1B.g;1F=1B.b;bI=1B.a}u 29=28.29(1v,28.29(4J,1F));u 2a=28.2a(1v,28.2a(4J,1F));u 1o;u 6G;u bJ=(29+2a)/2;u 4I=29-2a;if(4I===0){1o=0;6G=0}N{if(bJ<=0.5){6G=4I/(29+2a)}N{6G=4I/(2-29-2a)}if(1v==29){1o=(4J-1F)/4I}N{if(4J==29){1o=2+((1F-1v)/4I)}N{1o=4+((1v-4J)/4I)}}1o/=6;if(1o<0){1o+=1}if(1o>1){1o-=1}}F{h:1o,s:6G,l:bJ,a:bI}},6E:G(1P){1P=28.ha(1P);u bH=1P.1l(16);if(1P<16){F"0"+bH}F bH},2d:G(){u m=B.J;D.V.h9=m.1O(D.V.bG,D.V,"1B","3Y",[1/3h,1/3h,1/3h,1]);D.V.h8=m.1O(D.V.bG,D.V,"1G","4H",[1/bF,0.bE,0.bE,1]);u 4G=1/3;u bD={8y:[0,0,0],1F:[0,0,1],gY:[0.6,0.4,0.2],gX:[0,1,1],sJ:[4G,4G,4G],gR:[0.5,0.5,0.5],bx:[0,1,0],sI:[2*4G,2*4G,2*4G],gN:[1,0,1],gL:[1,0.5,0],gK:[0.5,0,0.5],1v:[1,0,0],aP:[0,0,0,0],4F:[1,1,1],gI:[1,1,0]};u h7=G(1b,r,g,b,a){u W=D.3Y(r,g,b,a);D[1b]=G(){F W};F W};R(u k in bD){u 1b=k+"V";u h5=m.2o([h7,D.V,1b],bD[k]);D.V[1b]=m.1O.1w(O,h5)}u h0=G(){R(u i=0;i<M.K;i++){if(!(M[i]2C V)){F 1m}}F 1h};u gZ=G(a,b){F a.h4(b)};m.3f(D);m.5u(D.V.1r,h0,gZ);D.2k={":3e":D.1z,":1p":m.2o(D.1z,D.1W)}}});B.V.1z=["V"];B.V.1W=["6F","bC","bB","bA","bz","6E"];B.V.2d();B.J.2Y(D,B.V);B.V.V.by={sH:"#sG",sF:"#sE",sD:"#gW",sC:"#sB",sA:"#sz",sy:"#sx",sw:"#sv",8y:"#su",st:"#sr",1F:"#sq",sp:"#so",gY:"#sn",sm:"#sl",sk:"#sj",si:"#sh",sg:"#se",sd:"#sc",sb:"#sa",s9:"#s8",s7:"#s6",gX:"#gW",s5:"#s4",s3:"#s2",s1:"#s0",rZ:"#gV",rY:"#rX",rW:"#gV",rV:"#rU",rT:"#rS",rR:"#rQ",rP:"#rO",rN:"#rM",gU:"#rL",rK:"#rJ",rI:"#rH",rG:"#rF",rE:"#gT",rD:"#gT",rC:"#rB",rA:"#rz",ry:"#rx",rw:"#rv",ru:"#gS",rt:"#gS",rs:"#rr",rq:"#rp",ro:"#rn",rm:"#rl",rk:"#gM",rj:"#ri",rh:"#rg",rf:"#rd",rc:"#rb",gR:"#gQ",bx:"#ra",r9:"#r8",r7:"#gQ",r6:"#r5",r4:"#r3",r2:"#r1",r0:"#qZ",qY:"#qX",qW:"#qV",qU:"#qT",qS:"#qR",qQ:"#qP",qO:"#qN",qM:"#qL",qK:"#qJ",qI:"#qH",qG:"#qF",qE:"#gP",qD:"#qC",qB:"#gP",qA:"#qz",qy:"#qx",qw:"#qv",qu:"#qt",qr:"#gO",qq:"#gO",qp:"#qo",qn:"#qm",ql:"#qk",qj:"#qi",qh:"#qg",gN:"#gM",qf:"#qe",qd:"#qc",qb:"#qa",q9:"#q8",q7:"#q6",q5:"#q4",q3:"#q2",q1:"#q0",pZ:"#pY",pX:"#pW",pV:"#pU",pT:"#pS",pR:"#pQ",pP:"#pO",pN:"#pM",pL:"#pK",pJ:"#pI",pH:"#pG",pF:"#pE",gL:"#pD",pC:"#pB",pA:"#pz",py:"#pw",pv:"#pu",pt:"#ps",pr:"#pq",pp:"#po",pn:"#pm",pl:"#pj",pi:"#ph",pg:"#pf",pe:"#pd",gK:"#pc",1v:"#pb",pa:"#p9",p8:"#p7",p6:"#p5",p4:"#p3",p2:"#p1",p0:"#oZ",oY:"#oX",oW:"#oV",oU:"#oT",oS:"#oR",oQ:"#oP",oO:"#gJ",oN:"#gJ",oM:"#oL",oK:"#oJ",oI:"#oH",oG:"#oF",oE:"#oD",oC:"#oB",oA:"#oz",oy:"#ox",ow:"#ov",ou:"#ot",4F:"#os",oq:"#op",gI:"#oo",om:"#ok"};if(H(1q)!="L"){1q.2X("B.1u");1q.2M("B.J");1q.2M("B.S")}if(H(1x)!="L"){1x.26("B.J",[]);1x.26("B.S",[])}1f{if(H(B.J)=="L"){14""}}1e(e){14"B.1u 3F on B.J!"}1f{if(H(B.S)=="L"){14""}}1e(e){14"B.1u 3F on B.S!"}if(H(B.1u)=="L"){B.1u={}}B.1u.1r="B.1u";B.1u.1Y="1.3.1";B.1u.4x=[];B.1u.bq=G(1d,e){D.1L=e||2O.6D;D.gH=1d};B.J.2l(B.1u.bq.1U,{1K:G(){u U=B.J.U;u 1y="{6D(): "+U(D.6D())+", 1d(): "+U(D.1d())+", 1J(): "+U(D.1J())+", 8x(): "+U(D.8x())+", 4E(): "+"{8w: "+U(D.4E().8w)+", 8v: "+U(D.4E().8v)+", 8u: "+U(D.4E().8u)+", 2P: "+U(D.4E().2P)+", bw: "+U(D.4E().bw)+"}";if(D.1J()&&D.1J().2A("2h")===0){1y+=", 2h(): {3J: "+U(D.2h().3J)+", 1n: "+U(D.2h().1n)+"}"}if(D.1J()&&(D.1J().2A("3I")===0||D.1J().2A("gE")!=-1||D.1J()=="gD")){1y+=", 3I(): {4D: "+U(D.3I().4D)+", 6A: "+U(D.3I().6A);if(D.1J()!="gC"){1y+=", 2e: {2I: "+U(D.3I().2e.2I)+", 6v: "+U(D.3I().2e.6v)+", 3g: "+U(D.3I().2e.3g)+"}}"}N{1y+="}"}}if(D.1J()=="gG"||D.1J()=="gF"){1y+=", 6C(): "+U(D.6C())}1y+="}";F 1y},1l:G(){F D.1K()},1d:G(){F D.gH},6D:G(){F D.1L},1J:G(){F D.1L.1J||L},8x:G(){F D.1L.8x||D.1L.oj},6C:G(){if(D.1J()=="gG"){F(D.1L.6C||D.1L.aW)}N{if(D.1J()=="gF"){F(D.1L.6C||D.1L.oi)}}F L},4E:G(){u m={};m.8w=D.1L.oh;m.8v=D.1L.og;m.8u=D.1L.oe||1m;m.2P=D.1L.od;m.bw=m.8w||m.8v||m.2P||m.8u;F m},2h:G(){u k={};if(D.1J()&&D.1J().2A("2h")===0){if(D.1J()=="oc"||D.1J()=="ob"){k.3J=D.1L.8t;k.1n=(B.1u.5r[k.3J]||"oa");F k}N{if(D.1J()=="o9"){k.3J=0;k.1n="";if(H(D.1L.6B)!="L"&&D.1L.6B!==0&&!B.1u.bv[D.1L.6B]){k.3J=D.1L.6B;k.1n=bu.bt(k.3J)}N{if(D.1L.8t&&H(D.1L.6B)=="L"){k.3J=D.1L.8t;k.1n=bu.bt(k.3J)}}F k}}}F L},3I:G(){u m={};u e=D.1L;if(D.1J()&&(D.1J().2A("3I")===0||D.1J().2A("gE")!=-1||D.1J()=="gD")){m.6A=Y B.S.5t(0,0);if(e.6z||e.6x){m.6A.x=(!e.6z||e.6z<0)?0:e.6z;m.6A.y=(!e.6x||e.6x<0)?0:e.6x}m.4D=Y B.S.5t(0,0);if(e.8s||e.8r){m.4D.x=(!e.8s||e.8s<0)?0:e.8s;m.4D.y=(!e.8r||e.8r<0)?0:e.8r}N{u de=B.S.1Z.7Z;u b=B.S.1Z.5s;m.4D.x=e.6z+(de.6y||b.6y)-(de.8q||b.8q);m.4D.y=e.6x+(de.4C||b.4C)-(de.8p||b.8p)}if(D.1J()!="gC"){m.2e={};m.2e.2I=1m;m.2e.3g=1m;m.2e.6v=1m;if(e.6w){m.2e.2I=(e.6w==1);m.2e.6v=(e.6w==2);m.2e.3g=(e.6w==3)}N{m.2e.2I=!!(e.2e&1);m.2e.3g=!!(e.2e&2);m.2e.6v=!!(e.2e&4)}}F m}F L},2J:G(){D.8o();D.8n()},8o:G(){if(D.1L.8o){D.1L.8o()}N{D.1L.o8=1h}},8n:G(){if(D.1L.8n){D.1L.8n()}N{D.1L.o7=1m}}});B.1u.bv={3:"gz",o6:"gA",o5:"gy",o4:"gx",o3:"gw",o2:"gv",o1:"gu",o0:"gs",nZ:"gr",nY:"gq",nX:"gp",nW:"go"};R(i=gB;i<=nV;i++){B.1u.bv[i]="gk"+(i-gB+1)}B.1u.5r={8:"nU",9:"nT",12:"gA",13:"gz",16:"nS",17:"nR",18:"nQ",19:"nP",20:"nO",27:"nN",32:"nM",33:"gy",34:"gx",35:"gw",36:"gv",37:"gu",38:"gs",39:"gr",40:"gq",44:"nL",45:"gp",46:"go",59:"gn",91:"nK",92:"nJ",93:"nI",nH:"nG",nF:"nE",nD:"nC-gm",nB:"nA",nz:"ny",nx:"nw",nv:"nu",nt:"gn",ns:"nr",nq:"np",nn:"nm-gm",nl:"nk",nj:"ni",nh:"ng",nf:"nd",nc:"nb",na:"n9",n8:"n7"};R(u i=48;i<=57;i++){B.1u.5r[i]="gl"+(i-48)}R(i=65;i<=90;i++){B.1u.5r[i]="gl"+bu.bt(i)}R(i=96;i<=n6;i++){B.1u.5r[i]="n5"+(i-96)}R(i=gj;i<=n4;i++){B.1u.5r[i]="gk"+(i-gj+1)}B.J.2l(B.1u,{1K:G(){F"["+D.1r+" "+D.1Y+"]"},1l:G(){F D.1K()},g7:G(){u I=B.1u;u bs=I.4x;R(u i=0;i<bs.K;i++){I.6t(bs[i])}gi I.4x;1f{2O.gh=L}1e(e){}1f{2O.g8=L}1e(e){}},gb:G(1d,1A,1i,gg){u E=B.1u.bq;if(!gg){F B.J.1O(1A,1i)}1i=1i||1d;if(H(1A)=="1n"){F G(gf){1i[1A].1w(1i,[Y E(1d,gf)])}}N{F G(gd){1A.1w(1i,[Y E(1d,gd)])}}},6s:G(1d,2D,5q,4B){1d=B.S.1E(1d);u I=B.1u;if(H(2D)!="1n"){14 Y 2x("\'2D\' 5p be a 1n")}u 1i=O;u 1A=O;if(H(4B)!="L"){1i=5q;1A=4B;if(H(4B)=="1n"){if(H(5q[4B])!="G"){14 Y 2x("\'bp\' 5p be a G on \'gc\'")}}N{if(H(4B)!="G"){14 Y 2x("\'bp\' 5p be a G or 1n")}}}N{if(H(5q)!="G"){14 Y 2x("\'gc\' 5p be a G if \'bp\' is 2E n3")}N{1A=5q}}if(H(1i)=="L"||1i===O){1i=1d}u bm=!!(1d.bo||1d.bn);u 8m=I.gb(1d,1A,1i,bm);if(1d.bo){1d.bo(2D.3H(2),8m,1m)}N{if(1d.bn){1d.bn(2D,8m)}}u bk=[1d,2D,8m,bm,5q,4B];I.4x.1c(bk);F bk},6t:G(6u){if(!6u[3]){F}u 1d=6u[0];u 2D=6u[1];u bj=6u[2];if(1d.ga){1d.ga(2D.3H(2),bj,1m)}N{if(1d.g9){1d.g9(2D,bj)}N{14 Y 2x("\'1d\' 5p be a S n0")}}},8j:G(bh){u I=B.1u;u 5o=I.4x;u m=B.J;if(M.K>1){u 1d=B.S.1E(M[0]);u 2D=M[1];u 1i=M[2];u 1A=M[3];R(u i=5o.K-1;i>=0;i--){u o=5o[i];if(o[0]===1d&&o[1]===2D&&o[4]===1i&&o[5]===1A){I.6t(o);5o.4y(i,1);F 1h}}}N{u 5n=m.bi(5o,bh);if(5n>=0){I.6t(bh);5o.4y(5n,1);F 1h}}F 1m},8i:G(1d,2D){1d=B.S.1E(1d);u m=B.J;u 8l=m.bg(m.1R(O,M,1));u I=B.1u;u bd=I.6t;u 4z=I.4x;if(8l.K===0){R(u i=4z.K-1;i>=0;i--){u 4A=4z[i];if(4A[0]===1d){bd(4A);4z.4y(i,1)}}}N{u bf={};R(u i=0;i<8l.K;i++){bf[8l[i]]=1h}R(u i=4z.K-1;i>=0;i--){u 4A=4z[i];if(4A[0]===1d&&4A[1]in bf){bd(4A);4z.4y(i,1)}}}},8h:G(1d,2D){u bc=B.1u.4x;1d=B.S.1E(1d);u 3G=B.J.1R(O,M,2);u 5m=[];R(u i=0;i<bc.K;i++){u 8k=bc[i];if(8k[0]===1d&&8k[1]===2D){1f{8k[2].1w(1d,3G)}1e(e){5m.1c(e)}}}if(5m.K==1){14 5m[0]}N{if(5m.K>1){u e=Y 2x("mZ bb mY in mX \'2D\', mW bb mV");e.bb=5m;14 e}}}});B.1u.1W=[];B.1u.1z=["6s","8j","8h","8i"];B.1u.2d=G(2m){u m=B.J;D.1Z=2v;D.3X=2m;1f{D.6s(2O,"g8",D.g7)}1e(e){}D.2k={":3e":D.1z,":1p":m.2o(D.1z,D.1W)};m.3f(D)};B.1u.2d(D);if(!B.3d){6s=B.1u.6s;8j=B.1u.8j;8i=B.1u.8i;8h=B.1u.8h}B.J.2Y(D,B.1u);if(H(1q)!="L"){1q.2X("B.1X");1q.2M("B.J");1q.2M("B.S");1q.2M("B.V")}if(H(1x)!="L"){1x.26("B.J",[]);1x.26("B.S",[]);1x.26("B.V",[])}1f{if(H(B.J)=="L"||H(B.S)=="L"||H(B.V)=="L"){14""}}1e(e){14"B.1X 3F on B.J, B.S 3W B.V!"}if(H(B.1X)=="L"){B.1X={}}B.1X.1r="B.1X";B.1X.1Y="1.3.1";B.1X.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.1X.1l=G(){F D.1K()};B.1X.aI=G(e,g6){e=B.S.1E(e);D.fN(g6);if(D.1S.fL){e=D.g5(e)}u 4w=D.1S.3U;u C=B.V.V;if(D.1S.3U=="aW"){4w=C.ba(e)}N{if(!(4w 2C C)){4w=C.8f(4w)}}D.82=(4w.6r().a<=0);u 5l=D.1S.aV;if(D.1S.aV=="fM"){5l=C.ba(e.8g)}N{if(!(5l 2C C)){5l=C.8f(5l)}}D.g3(e,4w,5l)};B.1X.aI.1U={g5:G(e){u mU=e.3t;u 1N=B.S.b9();if(H(1N.5k)=="L"||1N.5k===O){F e}u 4v=1N.5k.g4(e,O);if(H(4v)=="L"||4v===O){F e}u b8=B.S.6m({"1T":{3u:"8c",mT:4v.6q("6p-3D"),85:4v.6q("6p-3g"),mS:4v.6q("6p-6f"),86:4v.6q("6p-2I"),6p:"2N"}});b8.6o=e.6o;e.6o="";e.2c(b8);F e},g3:G(e,b7,8e){if(D.1S.3E){D.g2(e,8e)}if(D.fy()){D.fX(e,b7,8e)}if(D.fx()){D.fV(e,b7,8e)}},g2:G(el,g1){u b6="6l 8a "+D.aQ(g1);u g0="3E-2I: "+b6;u fZ="3E-3g: "+b6;u fY="1T=\'"+g0+";"+fZ+"\'";el.6o="<4u "+fY+">"+el.6o+"</4u>"},fX:G(el,fW,b5){u b4=D.b1(b5);R(u i=0;i<D.1S.89;i++){b4.2c(D.b0(fW,b5,i,"3D"))}el.1T.mR=0;el.mQ(b4,el.6n)},fV:G(el,fU,b3){u b2=D.b1(b3);R(u i=(D.1S.89-1);i>=0;i--){b2.2c(D.b0(fU,b3,i,"6f"))}el.1T.mP=0;el.2c(b2)},b1:G(fT){u 2q=B.S;F 2q.6m({1T:{aZ:fT.1l()}})},b0:G(aY,fQ,n,aX){u 6k=B.S.8d();u 2p=6k.1T;2p.aZ=aY.1l();2p.3u="8c";2p.3V="6l";2p.fS="fR";2p.mO="6l";u 8b=D.aQ(aY,fQ);if(D.1S.3E&&n===0){2p.mN="8a";2p.mM="6l";2p.84="2N";2p.83="2N";2p.mL="2N";2p.3V="2N";2p.fP=8b.1l()}N{if(8b){2p.fP=8b.1l();2p.mK="8a";2p.mJ="2N 6l"}}if(!D.1S.4r&&(n==(D.1S.89-1))){2p.3V="fO"}D.fI(6k,n,aX);D.fG(6k,n,aX);F 6k},fN:G(fK){D.1S={6g:"1p",3U:"aW",aV:"fM",5j:1h,3E:1m,4r:1m,fL:1m};B.J.2l(D.1S,fK);D.1S.89=(D.1S.4r?2:4)},aL:G(){u 88=D.1S.6g;if(D.6h(88,"1p","3D")){F""}u aU=(88.2A("tl")!=-1);u aT=(88.2A("tr")!=-1);if(aU&&aT){F""}if(aU){F"2I"}if(aT){F"3g"}F""},aK:G(){u 87=D.1S.6g;if(D.6h(87,"1p","6f")){F""}u aS=(87.2A("bl")!=-1);u aR=(87.2A("br")!=-1);if(aS&&aR){F""}if(aS){F"2I"}if(aR){F"3g"}F""},aQ:G(aN,aO){if(aN=="aP"){F aO}N{if(D.1S.3E){F D.1S.3E}N{if(D.1S.5j){F aO.fJ(aN)}}}F""},fI:G(el,n,fH){u 6j=D.fE(n)+"px";u aM=(fH=="3D"?D.aL():D.aK());u 4t=el.1T;if(aM=="2I"){4t.86=6j;4t.85="2N"}N{if(aM=="3g"){4t.85=6j;4t.86="2N"}N{4t.86=6j;4t.85=6j}}},fG:G(el,n,fF){u 6i=D.fz(n)+"px";u aJ=(fF=="3D"?D.aL():D.aK());u 4s=el.1T;if(aJ=="2I"){4s.84=6i;4s.83="2N"}N{if(aJ=="3g"){4s.83=6i;4s.84="2N"}N{4s.84=6i;4s.83=6i}}},fE:G(n){if(D.82){F 0}u o=D.1S;if(o.4r&&o.5j){u fD=[1,0];F fD[n]}N{if(o.4r){u fC=[2,1];F fC[n]}N{if(o.5j){u fB=[3,2,1,0];F fB[n]}N{u fA=[5,3,2,1];F fA[n]}}}},fz:G(n){u o=D.1S;u 5i;if(o.4r&&(o.5j||D.82)){F 1}N{if(o.4r){5i=[1,0]}N{if(o.5j){5i=[2,1,1,1]}N{if(o.3E){5i=[0,2,0,0]}N{if(D.82){5i=[5,3,2,1]}N{F 0}}}}}F 5i[n]},6h:G(1y){R(u i=1;i<M.K;i++){if(1y.2A(M[i])!=-1){F 1h}}F 1m},fy:G(){F D.6h(D.1S.6g,"1p","3D","tl","tr")},fx:G(){F D.6h(D.1S.6g,"1p","6f","bl","br")},mI:G(el){F(el.5h.K==1&&el.5h[0].3T==3)}};B.1X.aF=G(e,fw){Y B.1X.aI(e,fw)};B.1X.fs=G(fv,fu,ft){u aG=B.S.aH(fv,fu);R(u i=0;i<aG.K;i++){B.1X.aF(aG[i],ft)}};B.1X.V=B.V.V;B.1X.mH=B.S.4q;B.1X.2d=G(){u m=B.J;m.3f(D);D.2k={":3e":D.1z,":1p":m.2o(D.1z,D.1W)}};B.1X.1z=["aF","fs"];B.1X.1W=[];B.1X.2d();B.J.2Y(D,B.1X);if(H(B)=="L"){B={}}if(H(B.B)=="L"){B.B={}}B.B.1r="B.B";B.B.1Y="1.3.1";B.B.1K=G(){F"["+D.1r+" "+D.1Y+"]"};B.B.1l=G(){F D.1K()};B.B.aA=["J","15","1H","1D","1s","1k","S","1I","V","1u","1X"];if(H(1x)!="L"||H(1q)!="L"){if(H(1q)!="L"){1q.2X("B.B");1q.2M("B.*")}if(H(1x)!="L"){1x.26("B.J",[]);1x.26("B.15",[]);1x.26("B.1H",[]);1x.26("B.1D",[]);1x.26("B.1s",[]);1x.26("B.1k",[]);1x.26("B.S",[]);1x.26("B.1I",[]);1x.26("B.V",[]);1x.26("B.1u",[]);1x.26("B.1X",[])}(G(){u 6e=B.J.1R;u I=B.B;u aE=I.aA;u aD=[];u aC=[];u 81={};u i,k,m,1p;R(i=0;i<aE.K;i++){m=B[aE[i]];6e(aD,m.1z);6e(aC,m.1W);R(k in m.2k){81[k]=6e(81[k],m.2k[k])}1p=m.2k[":1p"];if(!1p){1p=6e(O,m.1z,m.1W)}u j;R(j=0;j<1p.K;j++){k=1p[j];I[k]=m[k]}}I.1z=aD;I.1W=aC;I.2k=81}())}N{if(H(B.3d)=="L"){B.3d=1h}(G(){u 80=2v.fr("7W");u ay="fq://fp.mG.fo/mF/mE/mD.is.aB.mC";u 2w=O;u ax=O;u az={};u i;R(i=0;i<80.K;i++){u 1d=80[i].fm("1d");if(!1d){2V}az[1d]=1h;if(1d.3C(/B.js$/)){2w=1d.2W(0,1d.mB("B.js"));ax=80[i]}}if(2w===O){F}u 6d=B.B.aA;R(u i=0;i<6d.K;i++){if(B[6d[i]]){2V}u 7Y=2w+6d[i]+".js";if(7Y in az){2V}if(2v.7Z&&2v.7Z.mA==ay){u s=2v.mz(ay,"7W");s.4p("id","my"+2w+6d[i]);s.4p("1d",7Y);s.4p("1J","mx/x-fk");ax.3t.2c(s)}N{2v.fl("<7W 1d=\\""+7Y+"\\" 1J=\\"7X/fk\\"></7W>")}}})()}', 62, 1976, '||||||||||||||||||||||||||||||var|||||||MochiKit||this||return|function|typeof|self|Base|length|undefined|arguments|else|null||elem|for|DOM||repr|Color|rval|res|new||||||throw|Iter|||||next|name|push|src|catch|try|lst|true|obj|node|Async|toString|false|string|hue|all|dojo|NAME|Format|msg|Signal|red|apply|JSAN|str|EXPORT|func|rgb|_425|DateTime|getElement|blue|hsl|Logging|LoggingPane|type|__repr__|_event|while|doc|bind|num|iter|extend|options|style|prototype|seq|EXPORT_OK|Visual|VERSION|_document||_434||replace|forwardCall|StopIteration|use||Math|max|min|join|appendChild|__new__|button|compare|date|key|val|_329|EXPORT_TAGS|update|win|pair|concat|_596|dom|map|req|Deferred|sync|document|base|Error|number|partial|indexOf||instanceof|sig|not|cls|list|fired|left|stop|break|logger|require|0px|window|shift|hsv|split|createElement|_423|callee|continue|substring|provide|_exportSymbols|ccc||_464|||||||||step|pred|_51|__compat__|common|nameFunctions|right|255|_517|case|100|_loggingPane|value|object|callback|TypeError|_251|_246|_113|parentNode|display|_522|parseInt|cssText|wrap|info|isArrayLike|end|match|top|border|depends|args|substr|mouse|code|_519|_443|className|level|err|frac|Date|_135|_85|nodeType|color|height|and|_window|fromRGB|charAt||asHSL|_444|message||||filter||LogMessage|AdapterRegistry|_366|imap|NotFound|locked|counter|_262|_messages|operator|cmp|_165|_161|pairs|arr|_52|setAttribute|computedStyle|compact|_614|_610|div|_576|_572|_observers|splice|_565|_566|_555|scrollTop|page|modifier|white|_541|fromHSL|_539|_535|_528|clone|parseFloat|_505|pre|_499|_497|_427|createTextNode|_446|attributeArray|_388|_379|updateNodeAttributes|_341|_326||box|errback|results|paused|chain|_285||ofs||NamedError|_175|_147|_122|_83|_54|_17|childNodes|_619|blend|defaultView|_574|_569|idx|_562|must|_554|_specialKeys|body|Coordinates|registerComparator|_521|_516|hex|mid|_478|width|loggingPane|LogLevel|nwin|head|url|setElementClass|callStack|path|dest|_359|boolean|register|Dimensions|DeferredLock|_313|addCallback|_310|waiting|onreadystatechange|_290|LOCALE|year|printfire|_214|log|_213|_211|pos|_155|_153||typeMatcher|listMinMax|_114|_40|itr|typ|_19|_634|_625|bottom|corners|_hasString|_612|_608|_595|1px|DIV|firstChild|innerHTML|padding|getPropertyValue|asRGB|connect|_disconnect|_559|middle|which|clientY|scrollLeft|clientX|client|charCode|relatedTarget|event|toColorPart|clampColorComponent|_537|_534|toFixed|_468|buildAndApplyFilter|_442|_441|_440|_439|position|_463|_447|removeChild|_449|uid|_428|_426|compliant|attributes|_422|_409|_412|_400|_395|_390|_389|_377|_375|_363|attr|ctx|repeat|_340|_339|isNotEmpty|_335|_333|opera|DeferredList|ret|_309|silentlyCancelled|canceller|_nextId|Array|_293|XMLHttpRequest|chained|_281|tail|_252|_225|msec|day|month|iso|Logger|_208|listeners|_200|_198|_194|_196|reduce|range|_169|_162|truth|registerRepr|_121|_70|_58|_56|_47|_45|_41|_13|_1|script|text|uri|documentElement|_630|_629|isTransparent|borderRightWidth|borderLeftWidth|marginRight|marginLeft|_602|_599|numSlices|solid|_597|block|SPAN|_579|fromString|offsetParent|signal|disconnectAll|disconnect|_570|_563|_557|preventDefault|stopPropagation|clientTop|clientLeft|pageY|pageX|keyCode|meta|ctrl|alt|target|black|_532|_524|floor|_513|_512|_500|_495|toLowerCase|_487|DEBUG|INFO|WARNING|FATAL|ERROR|colorTable|logFont|closed|inline|onclick|_438|_437|_445|RegExp|_452|space|title|updatetree|||||withDocument|withWindow||setDisplayForElement|none|renames|forEach|domConverters|escapeHTML|addElementClass|removeElementClass|once|_378|_380|_376|appendChildNodes|coerceToDOM|_355|opt|clientWidth|opacity|GenericError|fail|resultList|_307|_301|_fire|can|addCallbacks|_resback|percent|decimal|separator|twoDigitFloat|_274|_273|_264|_257|_250|_249|_254|_248|_243|_242|fmt|_240|_245|getTime|sec|hour|_209|slice|_206|iterateNextIter|registerIteratorFactory|arrayLikeIter|iteratorRegistry|takewhile|ifilterfalse|ifilter|_181|_176|_168|_166|_159|_tee|deque|arg|fun|jsonRegistry|reprString|reprRegistry|comparatorRegistry|urlEncode|_110|_108|cur|_95|_87|_71|im_preargs||_53|_57|_46|present|like|array|Argument|_15|_12|_632|_631|_633|SUBMODULES|only|_628|_627|_626|roundElement|_624|getElementsByTagAndClassName|_RoundCorners|_613|_whichSideBottom|_whichSideTop|_609|_605|_606|transparent|_borderColor|_604|_603|_601|_600|bgColor|fromElement|_594|_592|backgroundColor|_createCornerSlice|_createCorner|_590|_589|_587|_586|_581|_578|_577|currentDocument|fromBackground|errors|_568|_564||sigs|flattenArguments|_561|findIdentical|_560|_558||_556|attachEvent|addEventListener|funcOrStr|Event||_548|fromCharCode|String|_specialMacKeys|any|green|_namedColors|hsvToRGB|rgbToHSV|hslToRGB|rgbToHSL|_542|01|360|_fromColorString|_540|_536|_538|_529|_523|_518|fromComputedStyle|_511|_507|_508|_506|_501|fromHexString|_498|_496|_486|__class__|createLoggingPane|_459|_461|font|_462|_430|_435|1000|index|_460|getMessages|removeListener|_451||_457|_450|infore|_448|_456|logDebug|offsetHeight|span|input|_436|TR||HTML|open|alert|currentWindow|swapDOM|SELECT|FORM|INPUT|createDOMFunc|ignoreAttr|_421|call|_417|_410|_415|nodeName|_414|_413|emitHTML|good|_406|_399|_397|_393|_392|addLoadEvent|addToCallStack|_387|_386|_381|_382|_383|_373|_372|_369|createDOM|_365|Function|_360|_362|_358|_344|nodeWalk|formContents|_337|_338|_334|_332|offsetTop|offsetLeft|visibility|parentElement|||XMLHttpRequestError|BrowserComplianceError|CancelledError|AlreadyCalledError|evalJSONRequest|sendXMLHttpRequest|wait|doSimpleXMLHttpRequest|getXMLHttpRequest|succeed|_312|finishedCount|_308|_cbDeferred|_303|_297|queryString|_nothing|_289|XMLHTTP|ActiveXObject|eval|_284|_check|error|_279|default|rstrip|lstrip|formatLocale|roundToFixed|truncToFixed|_276|pow|_272|_271|_270|sign|_265|_263|tmp|_238|_232|toISODate|toISOTime|getFullYear|getDate|getMonth|_230|_padTwo|_228|useNativeConsole|_212|compareLogMessage|isLogMessage|unshift|_207||maxSize|_202|_199|logLevelAtLeast|console|hasIterateNext|iterateNext|arrayLike|groupby||exhaust|tee|dropwhile|applymap||islice|izip|cycle|count||_189|_188|_183|_185|_184|_186|_187|_182|identity|fetch|_180|_177|listMin|reprNumber|reprArrayLike|compareArrayLike|compareDateLike|isDateLike|findValue|_128|__export__|keyComparator|_124|_118|_93|_94|_90|_88|_84|_77|_68|_67|_66|_65|_60|im_func|_55|im_self|_48|_44|_42|_39|_36|_33|_27|_26|_25|_22|_24|_20|javascript|write|getAttribute||org|www|http|getElementsByTagName|roundClass|_623|_622|_621|_620|_isBottomRounded|_isTopRounded|_borderSize|_618|_617|_616|_615|_marginSize|_611|_setBorder|_607|_setMargin|blendedColor|_598|__unstable__wrapElement|fromParent|_setOptions|2px|borderColor|_593|hidden|overflow|_591|_588|_roundBottomCorners|_585|_roundTopCorners|_584|_583|_582|_580|_renderBorder|_roundCornersImpl|getComputedStyle|_doWrap|_571|_unloadCache|onunload|detachEvent|removeEventListener|_listener|objOrFunc|_552||_551|_549|onload|delete|112|KEY_F|KEY_|MINUS|KEY_SEMICOLON|KEY_DELETE|KEY_INSERT|KEY_ARROW_DOWN|KEY_ARROW_RIGHT|KEY_ARROW_UP||KEY_ARROW_LEFT|KEY_HOME|KEY_END|KEY_PAGE_DOWN|KEY_PAGE_UP|KEY_ENTER|KEY_NUM_PAD_CLEAR|63236|mousemove|contextmenu|click|mouseout|mouseover|_src|yellow|708090|purple|orange|ff00ff|magenta|778899|d3d3d3|808080|gray|696969|2f4f4f|darkred|a9a9a9|00ffff|cyan|brown|_547|_546||||compareRGB|_545||_543|fromHSLString|fromRGBString|round|_533|_hslValue|switch|background|_503|_504||fromName|_488|col|toRGBString|_hexString|_rgbString|_hslString|toPrecision|isLight||_481|_477|_476|_475|_474|_473|_469|_466|closePane|_458|onkeypress|_454|addListener|_455|close|test|scrollHeight|option|word|moz|_431|getElementById|html|pop|200|_|removeElement|showElement|hideElement|CANVAS|STRONG|FIELDSET|LEGEND|OPTGROUP|OPTION|TEXTAREA|LABEL|HR|BR|H3|H2|H1|PRE|TT|BUTTON|IMG|TH||TABLE||TFOOT|THEAD|TBODY|TD|LI|OL|||UL|checked|class|ignoreAttrFilter||_424|_419|nodeValue|scrapeText|_416|_418|sort|_411|toHTML|_404|hasElementClass|_403|_402|_401|swapElementClass|_398|_394|toggleElementClass|_391|focusOnLoad|_newCallStack|currentStyle|_371|replaceChildNodes|_364|_361|getNodeAttribute|_357|setNodeAttribute|_354|_352|_350|_353|toDOM|_346|_345|registerDOMConverter|selectedIndex|setElementPosition|setElementDimensions|tagName|absolute|getBoxObjectFor|getBoundingClientRect|elementPosition|_325|_324|_322|_323|offsetWidth|elementDimensions|clientHeight|innerWidth|getViewportDimensions|setOpacity|status|_317|deferred|_316|_newNamedError|maybeDeferred||gatherResults|callLater|loadJSONDoc|_311|consumeErrors|fireOnOneErrback|fireOnOneCallback|addErrback|_305|_304|_306|unlocked|release|_300|_299|_298|_296|_xhr_onreadystatechange|_xhr_canceller|304|responseText|Msxml2|addBoth|_pause|_continue|result|the|are|they|instances|_unpause|cancel|_280|_278|en_US|strip|percentFormat|twoDigitAverage|numberFormatter|_277|_275|isNaN|_259|_258|_260|_255|_253|_numberFormatter|_241|_239|_237|_236|_235|_234|_233|_231|toAmericanDate|toPaddedAmericanDate|americanDate|toISOTimestamp|isoTimestamp|isoDate|foot|sep||60000|_221|_isoRegexp|dispatchEvent|createEvent|warning|logWarning|fatal|logFatal|debug|logError|baseLog|_210|getMessageText|logToConsole|dispatchListeners|_204|_203|ident|_201|postError|alertListener|_197|_192|groupby_as_array|iextend|some|reversed|sorted|every|sum|_190|eat|_174|_173|_172|_171|_167|_163|_158|_157|_151|_144|_141||_139|_136|_134||_133|_132|zip|merge|isUndefined|isCallable|listMax|_131|_130|encodeURIComponent||_127|method|parseQueryString|evalJSON|registerJSON|serializeJSON|objMin|objMax|reverseKeyComparator|arrayEqual|objEqual|bindMethods|xfilter|xmap|isEmpty|isNull|isUndefinedOrNull|itemgetter|items|keys|setdefault|_126|_120|decodeURIComponent|_119|len|_109|_107|_104|_105|_101|_102|_98|||_100|_97|_96|_91|json|__json__|_82|_81|_80|_79|_76||_75|_74|_73|_69|_primitives|_64|_63||_62|_61|_59|_wrapDumbFunction|_49|_50|_31|_30|_21|_7|application|MochiKit_|createElementNS|namespaceURI|lastIndexOf|xul|there|gatekeeper|keymaster|mozilla|getElementsComputedStyle|_hasSingleTextChild|borderWidth|borderStyle|borderBottomWidth|borderTopWidth|borderTopStyle|fontSize|paddingBottom|insertBefore|paddingTop|marginBottom|marginTop|_575|property|see|handling|thrown|Multiple|element|||given|123|KEY_NUM_PAD_|105|KEY_APOSTROPHE|222|KEY_RIGHT_SQUARE_BRACKET|221|KEY_REVERSE_SOLIDUS|220|KEY_LEFT_SQUARE_BRACKET||219|KEY_GRAVE_ACCENT|192|KEY_SOLIDUS|191|KEY_FULL_STOP|190|KEY_HYPHEN|189||KEY_COMMA|188|KEY_EQUALS_SIGN|187|186|KEY_SCROLL_LOCK|145|KEY_NUM_LOCK|144|KEY_NUM_PAD_SOLIDUS|111|KEY_NUM_PAD_FULL_STOP|110|KEY_NUM_PAD_HYPHEN|109|KEY_NUM_PAD_PLUS_SIGN|107|KEY_NUM_PAD_ASTERISK|106|KEY_SELECT|KEY_WINDOWS_RIGHT|KEY_WINDOWS_LEFT|KEY_PRINT_SCREEN|KEY_SPACEBAR|KEY_ESCAPE|KEY_CAPS_LOCK|KEY_PAUSE|KEY_ALT|KEY_CTRL|KEY_SHIFT|KEY_TAB|KEY_BACKSPACE|63242|63272|63302|63233|63235|63232|63234|63273|63275|63277|63276|63289|returnValue|cancelBubble|keypress|KEY_UNKNOWN|keyup|keydown|shiftKey|metaKey||ctrlKey|altKey|toElement|srcElement|9acd32||yellowgreen||ffff00|f5f5f5|whitesmoke||ffffff|f5deb3|wheat|ee82ee|violet|40e0d0|turquoise|ff6347|tomato|d8bfd8|thistle|008080|teal|d2b48c|tan|4682b4|steelblue|00ff7f|springgreen|fffafa|snow|slategrey|slategray|6a5acd|slateblue|87ceeb|skyblue|c0c0c0|silver|a0522d|sienna|fff5ee|seashell|2e8b57|seagreen|f4a460|sandybrown|fa8072|salmon|8b4513|saddlebrown|4169e1|royalblue|bc8f8f|rosybrown|ff0000|800080|b0e0e6|powderblue|dda0dd|plum|ffc0cb|pink|cd853f||peru|ffdab9|peachpuff|ffefd5|papayawhip|db7093|palevioletred|afeeee|paleturquoise|98fb98|palegreen|eee8aa||palegoldenrod|da70d6|orchid|ff4500|orangered|ffa500|6b8e23|olivedrab|808000|olive|fdf5e6|oldlace|000080|navy|ffdead|navajowhite|ffe4b5|moccasin|ffe4e1|mistyrose|f5fffa|mintcream|191970|midnightblue|c71585|mediumvioletred|48d1cc|mediumturquoise|00fa9a|mediumspringgreen|7b68ee|mediumslateblue|3cb371|mediumseagreen|9370db|mediumpurple|ba55d3|mediumorchid|0000cd|mediumblue|66cdaa|mediumaquamarine|800000|maroon|faf0e6|linen|32cd32|limegreen|00ff00|lime|ffffe0|lightyellow|b0c4de|lightsteelblue|lightslategrey|lightslategray||87cefa|lightskyblue|20b2aa|lightseagreen|ffa07a|lightsalmon|ffb6c1|lightpink|lightgrey|90ee90|lightgreen|lightgray|fafad2|lightgoldenrodyellow|e0ffff|lightcyan|f08080|lightcoral|add8e6|lightblue|fffacd|lemonchiffon|7cfc00|lawngreen|fff0f5|lavenderblush|e6e6fa|lavender|f0e68c|khaki|fffff0|ivory|4b0082|indigo|cd5c5c|indianred|ff69b4|hotpink|f0fff0|honeydew|grey|adff2f|greenyellow|008000|daa520|goldenrod|ffd700||gold|f8f8ff|ghostwhite|dcdcdc|gainsboro|fuchsia|228b22|forestgreen|fffaf0|floralwhite|b22222|firebrick|1e90ff|dodgerblue|dimgrey|dimgray|00bfff|deepskyblue|ff1493|deeppink|9400d3|darkviolet|00ced1|darkturquoise|darkslategrey|darkslategray|483d8b|darkslateblue|8fbc8f|darkseagreen|e9967a|darksalmon|8b0000|9932cc|darkorchid|ff8c00|darkorange|556b2f|darkolivegreen|8b008b|darkmagenta|bdb76b|darkkhaki|darkgrey|006400|darkgreen|darkgray|b8860b|darkgoldenrod|008b8b|darkcyan|00008b|darkblue|dc143c|crimson|fff8dc|cornsilk|6495ed|cornflowerblue|ff7f50|coral|d2691e||chocolate|7fff00|chartreuse|5f9ea0|cadetblue|deb887|burlywood|a52a2a|8a2be2|blueviolet|0000ff|ffebcd||blanchedalmond|000000|ffe4c4|bisque|f5f5dc|beige|f0ffff|azure|7fffd4|aquamarine|aqua|faebd7|antiquewhite|f0f8ff|aliceblue|lightGray|darkGray|namedColors|blackColor|fromText|whiteColor|_510|_509|PI|rad|deg|transparentColor|_494|_493|_492|fromHSV|_491|_490|_489|asHSV|toHexString|rgba|hsla|toHSLString|isDark|lighterColorWithLevel|darkerColorWithLevel|colorWithLightness|colorWithSaturation|colorWithHue|colorWithAlpha||serif|sans|Verdana||8pt|8em|auto||Close|Clear||Load|Filter||10em||fixed|regex|emergency|line|margin|_Listener|dtd|loose|html4|w3|EN|Transitional|DTD|W3C|PUBLIC|DOCTYPE|blocking|due|debugging|able|Not|resizable|dependent|href|location|_MochiKit_LoggingPane|_429|canvas|strong|fieldset|legend|optgroup|select|form|textarea|label|img|table|tfoot|thead|tbody|htmlFor||useMap|usemap|defaultChecked|hasChildNodes|quot|amp|_405|focus|replaceChild|checkbox||radio|_win|BODY||safari|version|userAgent|navigator|innerHeight|alpha|khtml|Tried|acquire|clearTimeout|setTimeout|GET|ignore|send|abort|failed|Request|readyState|support|does|Browser|Microsoft|_288|_287|used|Deferreds|Chained|success|unfired|fr_FR|de_DE|00|abs|search|pattern|Invalid|getTimezoneOffset|getSeconds|getMinutes|getHours|UTC|3600000|initEvent|Events|debuggingBookmarklet|MESSAGES|LAST|_205|clear|ninfo|nlevel|timestamp|reverse|takes|initial|with|sequence|empty|iterable|numbers|dateLike|escape|find|forward|unregister|unescape|Object|compared|item|contains|logor|logand|cle|clt|cge|cgt|cne|ceq|zrshift|rshift|lshift|xor|mul|mod|sub|add|neg|lognot|_9|_2'.split('|'), 0, {})
-
-
-/*
- * jQuery 1.2.1 - New Wave Javascript
- *
- * Copyright (c) 2007 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2007-09-16 23:42:06 -0400 (Sun, 16 Sep 2007) $
- * $Rev: 3353 $
- */
-
-    var decompressedJQuery = function (p, a, c, k, e, r) {
-        e = function (c) {
-            return (c < a ? '' : e(parseInt(c / a))) + ((c = c % a) > 35 ? String.fromCharCode(c + 29) : c.toString(36))
-        };
-        if (!''.replace(/^/, String)) {
-            while (c--) r[e(c)] = k[c] || e(c);
-            k = [function (e) {
-                return r[e]
-            }];
-            e = function () {
-                return '\\w+'
-            };
-            c = 1
-        };
-        while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]);
-        return p
-    }('(G(){9(1m E!="W")H w=E;H E=18.15=G(a,b){I 6 7u E?6.5N(a,b):1u E(a,b)};9(1m $!="W")H D=$;18.$=E;H u=/^[^<]*(<(.|\\s)+>)[^>]*$|^#(\\w+)$/;E.1b=E.3A={5N:G(c,a){c=c||U;9(1m c=="1M"){H m=u.2S(c);9(m&&(m[1]||!a)){9(m[1])c=E.4D([m[1]],a);J{H b=U.3S(m[3]);9(b)9(b.22!=m[3])I E().1Y(c);J{6[0]=b;6.K=1;I 6}J c=[]}}J I 1u E(a).1Y(c)}J 9(E.1n(c))I 1u E(U)[E.1b.2d?"2d":"39"](c);I 6.6v(c.1c==1B&&c||(c.4c||c.K&&c!=18&&!c.1y&&c[0]!=W&&c[0].1y)&&E.2h(c)||[c])},4c:"1.2.1",7Y:G(){I 6.K},K:0,21:G(a){I a==W?E.2h(6):6[a]},2o:G(a){H b=E(a);b.4Y=6;I b},6v:G(a){6.K=0;1B.3A.1a.16(6,a);I 6},N:G(a,b){I E.N(6,a,b)},4I:G(a){H b=-1;6.N(G(i){9(6==a)b=i});I b},1x:G(f,d,e){H c=f;9(f.1c==3X)9(d==W)I 6.K&&E[e||"1x"](6[0],f)||W;J{c={};c[f]=d}I 6.N(G(a){L(H b 1i c)E.1x(e?6.R:6,b,E.1e(6,c[b],e,a,b))})},17:G(b,a){I 6.1x(b,a,"3C")},2g:G(e){9(1m e!="5i"&&e!=S)I 6.4n().3g(U.6F(e));H t="";E.N(e||6,G(){E.N(6.3j,G(){9(6.1y!=8)t+=6.1y!=1?6.6x:E.1b.2g([6])})});I t},5m:G(b){9(6[0])E(b,6[0].3H).6u().3d(6[0]).1X(G(){H a=6;1W(a.1w)a=a.1w;I a}).3g(6);I 6},8m:G(a){I 6.N(G(){E(6).6q().5m(a)})},8d:G(a){I 6.N(G(){E(6).5m(a)})},3g:G(){I 6.3z(1q,Q,1,G(a){6.58(a)})},6j:G(){I 6.3z(1q,Q,-1,G(a){6.3d(a,6.1w)})},6g:G(){I 6.3z(1q,P,1,G(a){6.12.3d(a,6)})},50:G(){I 6.3z(1q,P,-1,G(a){6.12.3d(a,6.2q)})},2D:G(){I 6.4Y||E([])},1Y:G(t){H b=E.1X(6,G(a){I E.1Y(t,a)});I 6.2o(/[^+>] [^+>]/.14(t)||t.1g("..")>-1?E.4V(b):b)},6u:G(e){H f=6.1X(G(){I 6.67?E(6.67)[0]:6.4R(Q)});H d=f.1Y("*").4O().N(G(){9(6[F]!=W)6[F]=S});9(e===Q)6.1Y("*").4O().N(G(i){H c=E.M(6,"2P");L(H a 1i c)L(H b 1i c[a])E.1j.1f(d[i],a,c[a][b],c[a][b].M)});I f},1E:G(t){I 6.2o(E.1n(t)&&E.2W(6,G(b,a){I t.16(b,[a])})||E.3m(t,6))},5V:G(t){I 6.2o(t.1c==3X&&E.3m(t,6,Q)||E.2W(6,G(a){I(t.1c==1B||t.4c)?E.2A(a,t)<0:a!=t}))},1f:G(t){I 6.2o(E.1R(6.21(),t.1c==3X?E(t).21():t.K!=W&&(!t.11||E.11(t,"2Y"))?t:[t]))},3t:G(a){I a?E.3m(a,6).K>0:P},7c:G(a){I 6.3t("."+a)},3i:G(b){9(b==W){9(6.K){H c=6[0];9(E.11(c,"24")){H e=c.4Z,a=[],Y=c.Y,2G=c.O=="24-2G";9(e<0)I S;L(H i=2G?e:0,33=2G?e+1:Y.K;i<33;i++){H d=Y[i];9(d.26){H b=E.V.1h&&!d.9V["1Q"].9L?d.2g:d.1Q;9(2G)I b;a.1a(b)}}I a}J I 6[0].1Q.1p(/\\r/g,"")}}J I 6.N(G(){9(b.1c==1B&&/4k|5j/.14(6.O))6.2Q=(E.2A(6.1Q,b)>=0||E.2A(6.2H,b)>=0);J 9(E.11(6,"24")){H a=b.1c==1B?b:[b];E("9h",6).N(G(){6.26=(E.2A(6.1Q,a)>=0||E.2A(6.2g,a)>=0)});9(!a.K)6.4Z=-1}J 6.1Q=b})},4o:G(a){I a==W?(6.K?6[0].3O:S):6.4n().3g(a)},6H:G(a){I 6.50(a).28()},6E:G(i){I 6.2J(i,i+1)},2J:G(){I 6.2o(1B.3A.2J.16(6,1q))},1X:G(b){I 6.2o(E.1X(6,G(a,i){I b.2O(a,i,a)}))},4O:G(){I 6.1f(6.4Y)},3z:G(f,d,g,e){H c=6.K>1,a;I 6.N(G(){9(!a){a=E.4D(f,6.3H);9(g<0)a.8U()}H b=6;9(d&&E.11(6,"1I")&&E.11(a[0],"4m"))b=6.4l("1K")[0]||6.58(U.5B("1K"));E.N(a,G(){H a=c?6.4R(Q):6;9(!5A(0,a))e.2O(b,a)})})}};G 5A(i,b){H a=E.11(b,"1J");9(a){9(b.3k)E.3G({1d:b.3k,3e:P,1V:"1J"});J E.5f(b.2g||b.6s||b.3O||"");9(b.12)b.12.3b(b)}J 9(b.1y==1)E("1J",b).N(5A);I a}E.1k=E.1b.1k=G(){H c=1q[0]||{},a=1,2c=1q.K,5e=P;9(c.1c==8o){5e=c;c=1q[1]||{}}9(2c==1){c=6;a=0}H b;L(;a<2c;a++)9((b=1q[a])!=S)L(H i 1i b){9(c==b[i])6r;9(5e&&1m b[i]==\'5i\'&&c[i])E.1k(c[i],b[i]);J 9(b[i]!=W)c[i]=b[i]}I c};H F="15"+(1u 3D()).3B(),6p=0,5c={};E.1k({8a:G(a){18.$=D;9(a)18.15=w;I E},1n:G(a){I!!a&&1m a!="1M"&&!a.11&&a.1c!=1B&&/G/i.14(a+"")},4a:G(a){I a.2V&&!a.1G||a.37&&a.3H&&!a.3H.1G},5f:G(a){a=E.36(a);9(a){9(18.6l)18.6l(a);J 9(E.V.1N)18.56(a,0);J 3w.2O(18,a)}},11:G(b,a){I b.11&&b.11.27()==a.27()},1L:{},M:G(c,d,b){c=c==18?5c:c;H a=c[F];9(!a)a=c[F]=++6p;9(d&&!E.1L[a])E.1L[a]={};9(b!=W)E.1L[a][d]=b;I d?E.1L[a][d]:a},30:G(c,b){c=c==18?5c:c;H a=c[F];9(b){9(E.1L[a]){2E E.1L[a][b];b="";L(b 1i E.1L[a])1T;9(!b)E.30(c)}}J{2a{2E c[F]}29(e){9(c.53)c.53(F)}2E E.1L[a]}},N:G(a,b,c){9(c){9(a.K==W)L(H i 1i a)b.16(a[i],c);J L(H i=0,48=a.K;i<48;i++)9(b.16(a[i],c)===P)1T}J{9(a.K==W)L(H i 1i a)b.2O(a[i],i,a[i]);J L(H i=0,48=a.K,3i=a[0];i<48&&b.2O(3i,i,3i)!==P;3i=a[++i]){}}I a},1e:G(c,b,d,e,a){9(E.1n(b))b=b.2O(c,[e]);H f=/z-?4I|7T-?7Q|1r|69|7P-?1H/i;I b&&b.1c==4W&&d=="3C"&&!f.14(a)?b+"2T":b},1o:{1f:G(b,c){E.N((c||"").2l(/\\s+/),G(i,a){9(!E.1o.3K(b.1o,a))b.1o+=(b.1o?" ":"")+a})},28:G(b,c){b.1o=c!=W?E.2W(b.1o.2l(/\\s+/),G(a){I!E.1o.3K(c,a)}).66(" "):""},3K:G(t,c){I E.2A(c,(t.1o||t).3s().2l(/\\s+/))>-1}},2k:G(e,o,f){L(H i 1i o){e.R["3r"+i]=e.R[i];e.R[i]=o[i]}f.16(e,[]);L(H i 1i o)e.R[i]=e.R["3r"+i]},17:G(e,p){9(p=="1H"||p=="2N"){H b={},42,41,d=["7J","7I","7G","7F"];E.N(d,G(){b["7C"+6]=0;b["7B"+6+"5Z"]=0});E.2k(e,b,G(){9(E(e).3t(\':3R\')){42=e.7A;41=e.7w}J{e=E(e.4R(Q)).1Y(":4k").5W("2Q").2D().17({4C:"1P",2X:"4F",19:"2Z",7o:"0",1S:"0"}).5R(e.12)[0];H a=E.17(e.12,"2X")||"3V";9(a=="3V")e.12.R.2X="7g";42=e.7e;41=e.7b;9(a=="3V")e.12.R.2X="3V";e.12.3b(e)}});I p=="1H"?42:41}I E.3C(e,p)},3C:G(h,j,i){H g,2w=[],2k=[];G 3n(a){9(!E.V.1N)I P;H b=U.3o.3Z(a,S);I!b||b.4y("3n")==""}9(j=="1r"&&E.V.1h){g=E.1x(h.R,"1r");I g==""?"1":g}9(j.1t(/4u/i))j=y;9(!i&&h.R[j])g=h.R[j];J 9(U.3o&&U.3o.3Z){9(j.1t(/4u/i))j="4u";j=j.1p(/([A-Z])/g,"-$1").2p();H d=U.3o.3Z(h,S);9(d&&!3n(h))g=d.4y(j);J{L(H a=h;a&&3n(a);a=a.12)2w.4w(a);L(a=0;a<2w.K;a++)9(3n(2w[a])){2k[a]=2w[a].R.19;2w[a].R.19="2Z"}g=j=="19"&&2k[2w.K-1]!=S?"2s":U.3o.3Z(h,S).4y(j)||"";L(a=0;a<2k.K;a++)9(2k[a]!=S)2w[a].R.19=2k[a]}9(j=="1r"&&g=="")g="1"}J 9(h.3Q){H f=j.1p(/\\-(\\w)/g,G(m,c){I c.27()});g=h.3Q[j]||h.3Q[f];9(!/^\\d+(2T)?$/i.14(g)&&/^\\d/.14(g)){H k=h.R.1S;H e=h.4v.1S;h.4v.1S=h.3Q.1S;h.R.1S=g||0;g=h.R.71+"2T";h.R.1S=k;h.4v.1S=e}}I g},4D:G(a,e){H r=[];e=e||U;E.N(a,G(i,d){9(!d)I;9(d.1c==4W)d=d.3s();9(1m d=="1M"){d=d.1p(/(<(\\w+)[^>]*?)\\/>/g,G(m,a,b){I b.1t(/^(70|6Z|6Y|9Q|4t|9N|9K|3a|9G|9E)$/i)?m:a+"></"+b+">"});H s=E.36(d).2p(),1s=e.5B("1s"),2x=[];H c=!s.1g("<9y")&&[1,"<24>","</24>"]||!s.1g("<9w")&&[1,"<6T>","</6T>"]||s.1t(/^<(9u|1K|9t|9r|9p)/)&&[1,"<1I>","</1I>"]||!s.1g("<4m")&&[2,"<1I><1K>","</1K></1I>"]||(!s.1g("<9m")||!s.1g("<9k"))&&[3,"<1I><1K><4m>","</4m></1K></1I>"]||!s.1g("<6Y")&&[2,"<1I><1K></1K><6L>","</6L></1I>"]||E.V.1h&&[1,"1s<1s>","</1s>"]||[0,"",""];1s.3O=c[1]+d+c[2];1W(c[0]--)1s=1s.5p;9(E.V.1h){9(!s.1g("<1I")&&s.1g("<1K")<0)2x=1s.1w&&1s.1w.3j;J 9(c[1]=="<1I>"&&s.1g("<1K")<0)2x=1s.3j;L(H n=2x.K-1;n>=0;--n)9(E.11(2x[n],"1K")&&!2x[n].3j.K)2x[n].12.3b(2x[n]);9(/^\\s/.14(d))1s.3d(e.6F(d.1t(/^\\s*/)[0]),1s.1w)}d=E.2h(1s.3j)}9(0===d.K&&(!E.11(d,"2Y")&&!E.11(d,"24")))I;9(d[0]==W||E.11(d,"2Y")||d.Y)r.1a(d);J r=E.1R(r,d)});I r},1x:G(c,d,a){H e=E.4a(c)?{}:E.5o;9(d=="26"&&E.V.1N)c.12.4Z;9(e[d]){9(a!=W)c[e[d]]=a;I c[e[d]]}J 9(E.V.1h&&d=="R")I E.1x(c.R,"9e",a);J 9(a==W&&E.V.1h&&E.11(c,"2Y")&&(d=="9d"||d=="9a"))I c.97(d).6x;J 9(c.37){9(a!=W){9(d=="O"&&E.11(c,"4t")&&c.12)6G"O 94 93\'t 92 91";c.90(d,a)}9(E.V.1h&&/6C|3k/.14(d)&&!E.4a(c))I c.4p(d,2);I c.4p(d)}J{9(d=="1r"&&E.V.1h){9(a!=W){c.69=1;c.1E=(c.1E||"").1p(/6O\\([^)]*\\)/,"")+(3I(a).3s()=="8S"?"":"6O(1r="+a*6A+")")}I c.1E?(3I(c.1E.1t(/1r=([^)]*)/)[1])/6A).3s():""}d=d.1p(/-([a-z])/8Q,G(z,b){I b.27()});9(a!=W)c[d]=a;I c[d]}},36:G(t){I(t||"").1p(/^\\s+|\\s+$/g,"")},2h:G(a){H r=[];9(1m a!="8P")L(H i=0,2c=a.K;i<2c;i++)r.1a(a[i]);J r=a.2J(0);I r},2A:G(b,a){L(H i=0,2c=a.K;i<2c;i++)9(a[i]==b)I i;I-1},1R:G(a,b){9(E.V.1h){L(H i=0;b[i];i++)9(b[i].1y!=8)a.1a(b[i])}J L(H i=0;b[i];i++)a.1a(b[i]);I a},4V:G(b){H r=[],2f={};2a{L(H i=0,6y=b.K;i<6y;i++){H a=E.M(b[i]);9(!2f[a]){2f[a]=Q;r.1a(b[i])}}}29(e){r=b}I r},2W:G(b,a,c){9(1m a=="1M")a=3w("P||G(a,i){I "+a+"}");H d=[];L(H i=0,4g=b.K;i<4g;i++)9(!c&&a(b[i],i)||c&&!a(b[i],i))d.1a(b[i]);I d},1X:G(c,b){9(1m b=="1M")b=3w("P||G(a){I "+b+"}");H d=[];L(H i=0,4g=c.K;i<4g;i++){H a=b(c[i],i);9(a!==S&&a!=W){9(a.1c!=1B)a=[a];d=d.8M(a)}}I d}});H v=8K.8I.2p();E.V={4s:(v.1t(/.+(?:8F|8E|8C|8B)[\\/: ]([\\d.]+)/)||[])[1],1N:/6w/.14(v),34:/34/.14(v),1h:/1h/.14(v)&&!/34/.14(v),35:/35/.14(v)&&!/(8z|6w)/.14(v)};H y=E.V.1h?"4h":"5h";E.1k({5g:!E.V.1h||U.8y=="8x",4h:E.V.1h?"4h":"5h",5o:{"L":"8w","8v":"1o","4u":y,5h:y,4h:y,3O:"3O",1o:"1o",1Q:"1Q",3c:"3c",2Q:"2Q",8u:"8t",26:"26",8s:"8r"}});E.N({1D:"a.12",8q:"15.4e(a,\'12\')",8p:"15.2I(a,2,\'2q\')",8n:"15.2I(a,2,\'4d\')",8l:"15.4e(a,\'2q\')",8k:"15.4e(a,\'4d\')",8j:"15.5d(a.12.1w,a)",8i:"15.5d(a.1w)",6q:"15.11(a,\'8h\')?a.8f||a.8e.U:15.2h(a.3j)"},G(i,n){E.1b[i]=G(a){H b=E.1X(6,n);9(a&&1m a=="1M")b=E.3m(a,b);I 6.2o(E.4V(b))}});E.N({5R:"3g",8c:"6j",3d:"6g",8b:"50",89:"6H"},G(i,n){E.1b[i]=G(){H a=1q;I 6.N(G(){L(H j=0,2c=a.K;j<2c;j++)E(a[j])[n](6)})}});E.N({5W:G(a){E.1x(6,a,"");6.53(a)},88:G(c){E.1o.1f(6,c)},87:G(c){E.1o.28(6,c)},86:G(c){E.1o[E.1o.3K(6,c)?"28":"1f"](6,c)},28:G(a){9(!a||E.1E(a,[6]).r.K){E.30(6);6.12.3b(6)}},4n:G(){E("*",6).N(G(){E.30(6)});1W(6.1w)6.3b(6.1w)}},G(i,n){E.1b[i]=G(){I 6.N(n,1q)}});E.N(["85","5Z"],G(i,a){H n=a.2p();E.1b[n]=G(h){I 6[0]==18?E.V.1N&&3y["84"+a]||E.5g&&38.33(U.2V["5a"+a],U.1G["5a"+a])||U.1G["5a"+a]:6[0]==U?38.33(U.1G["6n"+a],U.1G["6m"+a]):h==W?(6.K?E.17(6[0],n):S):6.17(n,h.1c==3X?h:h+"2T")}});H C=E.V.1N&&3x(E.V.4s)<83?"(?:[\\\\w*57-]|\\\\\\\\.)":"(?:[\\\\w\\82-\\81*57-]|\\\\\\\\.)",6k=1u 47("^>\\\\s*("+C+"+)"),6i=1u 47("^("+C+"+)(#)("+C+"+)"),6h=1u 47("^([#.]?)("+C+"*)");E.1k({55:{"":"m[2]==\'*\'||15.11(a,m[2])","#":"a.4p(\'22\')==m[2]",":":{80:"i<m[3]-0",7Z:"i>m[3]-0",2I:"m[3]-0==i",6E:"m[3]-0==i",3v:"i==0",3u:"i==r.K-1",6f:"i%2==0",6e:"i%2","3v-46":"a.12.4l(\'*\')[0]==a","3u-46":"15.2I(a.12.5p,1,\'4d\')==a","7X-46":"!15.2I(a.12.5p,2,\'4d\')",1D:"a.1w",4n:"!a.1w",7W:"(a.6s||a.7V||15(a).2g()||\'\').1g(m[3])>=0",3R:\'"1P"!=a.O&&15.17(a,"19")!="2s"&&15.17(a,"4C")!="1P"\',1P:\'"1P"==a.O||15.17(a,"19")=="2s"||15.17(a,"4C")=="1P"\',7U:"!a.3c",3c:"a.3c",2Q:"a.2Q",26:"a.26||15.1x(a,\'26\')",2g:"\'2g\'==a.O",4k:"\'4k\'==a.O",5j:"\'5j\'==a.O",54:"\'54\'==a.O",52:"\'52\'==a.O",51:"\'51\'==a.O",6d:"\'6d\'==a.O",6c:"\'6c\'==a.O",2r:\'"2r"==a.O||15.11(a,"2r")\',4t:"/4t|24|6b|2r/i.14(a.11)",3K:"15.1Y(m[3],a).K",7S:"/h\\\\d/i.14(a.11)",7R:"15.2W(15.32,G(1b){I a==1b.T;}).K"}},6a:[/^(\\[) *@?([\\w-]+) *([!*$^~=]*) *(\'?"?)(.*?)\\4 *\\]/,/^(:)([\\w-]+)\\("?\'?(.*?(\\(.*?\\))?[^(]*?)"?\'?\\)/,1u 47("^([:.#]*)("+C+"+)")],3m:G(a,c,b){H d,2b=[];1W(a&&a!=d){d=a;H f=E.1E(a,c,b);a=f.t.1p(/^\\s*,\\s*/,"");2b=b?c=f.r:E.1R(2b,f.r)}I 2b},1Y:G(t,o){9(1m t!="1M")I[t];9(o&&!o.1y)o=S;o=o||U;H d=[o],2f=[],3u;1W(t&&3u!=t){H r=[];3u=t;t=E.36(t);H l=P;H g=6k;H m=g.2S(t);9(m){H p=m[1].27();L(H i=0;d[i];i++)L(H c=d[i].1w;c;c=c.2q)9(c.1y==1&&(p=="*"||c.11.27()==p.27()))r.1a(c);d=r;t=t.1p(g,"");9(t.1g(" ")==0)6r;l=Q}J{g=/^([>+~])\\s*(\\w*)/i;9((m=g.2S(t))!=S){r=[];H p=m[2],1R={};m=m[1];L(H j=0,31=d.K;j<31;j++){H n=m=="~"||m=="+"?d[j].2q:d[j].1w;L(;n;n=n.2q)9(n.1y==1){H h=E.M(n);9(m=="~"&&1R[h])1T;9(!p||n.11.27()==p.27()){9(m=="~")1R[h]=Q;r.1a(n)}9(m=="+")1T}}d=r;t=E.36(t.1p(g,""));l=Q}}9(t&&!l){9(!t.1g(",")){9(o==d[0])d.44();2f=E.1R(2f,d);r=d=[o];t=" "+t.68(1,t.K)}J{H k=6i;H m=k.2S(t);9(m){m=[0,m[2],m[3],m[1]]}J{k=6h;m=k.2S(t)}m[2]=m[2].1p(/\\\\/g,"");H f=d[d.K-1];9(m[1]=="#"&&f&&f.3S&&!E.4a(f)){H q=f.3S(m[2]);9((E.V.1h||E.V.34)&&q&&1m q.22=="1M"&&q.22!=m[2])q=E(\'[@22="\'+m[2]+\'"]\',f)[0];d=r=q&&(!m[3]||E.11(q,m[3]))?[q]:[]}J{L(H i=0;d[i];i++){H a=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];9(a=="*"&&d[i].11.2p()=="5i")a="3a";r=E.1R(r,d[i].4l(a))}9(m[1]==".")r=E.4X(r,m[2]);9(m[1]=="#"){H e=[];L(H i=0;r[i];i++)9(r[i].4p("22")==m[2]){e=[r[i]];1T}r=e}d=r}t=t.1p(k,"")}}9(t){H b=E.1E(t,r);d=r=b.r;t=E.36(b.t)}}9(t)d=[];9(d&&o==d[0])d.44();2f=E.1R(2f,d);I 2f},4X:G(r,m,a){m=" "+m+" ";H c=[];L(H i=0;r[i];i++){H b=(" "+r[i].1o+" ").1g(m)>=0;9(!a&&b||a&&!b)c.1a(r[i])}I c},1E:G(t,r,h){H d;1W(t&&t!=d){d=t;H p=E.6a,m;L(H i=0;p[i];i++){m=p[i].2S(t);9(m){t=t.7O(m[0].K);m[2]=m[2].1p(/\\\\/g,"");1T}}9(!m)1T;9(m[1]==":"&&m[2]=="5V")r=E.1E(m[3],r,Q).r;J 9(m[1]==".")r=E.4X(r,m[2],h);J 9(m[1]=="["){H g=[],O=m[3];L(H i=0,31=r.K;i<31;i++){H a=r[i],z=a[E.5o[m[2]]||m[2]];9(z==S||/6C|3k|26/.14(m[2]))z=E.1x(a,m[2])||\'\';9((O==""&&!!z||O=="="&&z==m[5]||O=="!="&&z!=m[5]||O=="^="&&z&&!z.1g(m[5])||O=="$="&&z.68(z.K-m[5].K)==m[5]||(O=="*="||O=="~=")&&z.1g(m[5])>=0)^h)g.1a(a)}r=g}J 9(m[1]==":"&&m[2]=="2I-46"){H e={},g=[],14=/(\\d*)n\\+?(\\d*)/.2S(m[3]=="6f"&&"2n"||m[3]=="6e"&&"2n+1"||!/\\D/.14(m[3])&&"n+"+m[3]||m[3]),3v=(14[1]||1)-0,d=14[2]-0;L(H i=0,31=r.K;i<31;i++){H j=r[i],12=j.12,22=E.M(12);9(!e[22]){H c=1;L(H n=12.1w;n;n=n.2q)9(n.1y==1)n.4U=c++;e[22]=Q}H b=P;9(3v==1){9(d==0||j.4U==d)b=Q}J 9((j.4U+d)%3v==0)b=Q;9(b^h)g.1a(j)}r=g}J{H f=E.55[m[1]];9(1m f!="1M")f=E.55[m[1]][m[2]];f=3w("P||G(a,i){I "+f+"}");r=E.2W(r,f,h)}}I{r:r,t:t}},4e:G(b,c){H d=[];H a=b[c];1W(a&&a!=U){9(a.1y==1)d.1a(a);a=a[c]}I d},2I:G(a,e,c,b){e=e||1;H d=0;L(;a;a=a[c])9(a.1y==1&&++d==e)1T;I a},5d:G(n,a){H r=[];L(;n;n=n.2q){9(n.1y==1&&(!a||n!=a))r.1a(n)}I r}});E.1j={1f:G(g,e,c,h){9(E.V.1h&&g.4j!=W)g=18;9(!c.2u)c.2u=6.2u++;9(h!=W){H d=c;c=G(){I d.16(6,1q)};c.M=h;c.2u=d.2u}H i=e.2l(".");e=i[0];c.O=i[1];H b=E.M(g,"2P")||E.M(g,"2P",{});H f=E.M(g,"2t",G(){H a;9(1m E=="W"||E.1j.4T)I a;a=E.1j.2t.16(g,1q);I a});H j=b[e];9(!j){j=b[e]={};9(g.4S)g.4S(e,f,P);J g.7N("43"+e,f)}j[c.2u]=c;6.1Z[e]=Q},2u:1,1Z:{},28:G(d,c,b){H e=E.M(d,"2P"),2L,4I;9(1m c=="1M"){H a=c.2l(".");c=a[0]}9(e){9(c&&c.O){b=c.4Q;c=c.O}9(!c){L(c 1i e)6.28(d,c)}J 9(e[c]){9(b)2E e[c][b.2u];J L(b 1i e[c])9(!a[1]||e[c][b].O==a[1])2E e[c][b];L(2L 1i e[c])1T;9(!2L){9(d.4P)d.4P(c,E.M(d,"2t"),P);J d.7M("43"+c,E.M(d,"2t"));2L=S;2E e[c]}}L(2L 1i e)1T;9(!2L){E.30(d,"2P");E.30(d,"2t")}}},1F:G(d,b,e,c,f){b=E.2h(b||[]);9(!e){9(6.1Z[d])E("*").1f([18,U]).1F(d,b)}J{H a,2L,1b=E.1n(e[d]||S),4N=!b[0]||!b[0].2M;9(4N)b.4w(6.4M({O:d,2m:e}));b[0].O=d;9(E.1n(E.M(e,"2t")))a=E.M(e,"2t").16(e,b);9(!1b&&e["43"+d]&&e["43"+d].16(e,b)===P)a=P;9(4N)b.44();9(f&&f.16(e,b)===P)a=P;9(1b&&c!==P&&a!==P&&!(E.11(e,\'a\')&&d=="4L")){6.4T=Q;e[d]()}6.4T=P}I a},2t:G(d){H a;d=E.1j.4M(d||18.1j||{});H b=d.O.2l(".");d.O=b[0];H c=E.M(6,"2P")&&E.M(6,"2P")[d.O],3q=1B.3A.2J.2O(1q,1);3q.4w(d);L(H j 1i c){3q[0].4Q=c[j];3q[0].M=c[j].M;9(!b[1]||c[j].O==b[1]){H e=c[j].16(6,3q);9(a!==P)a=e;9(e===P){d.2M();d.3p()}}}9(E.V.1h)d.2m=d.2M=d.3p=d.4Q=d.M=S;I a},4M:G(c){H a=c;c=E.1k({},a);c.2M=G(){9(a.2M)a.2M();a.7L=P};c.3p=G(){9(a.3p)a.3p();a.7K=Q};9(!c.2m&&c.65)c.2m=c.65;9(E.V.1N&&c.2m.1y==3)c.2m=a.2m.12;9(!c.4K&&c.4J)c.4K=c.4J==c.2m?c.7H:c.4J;9(c.64==S&&c.63!=S){H e=U.2V,b=U.1G;c.64=c.63+(e&&e.2R||b.2R||0);c.7E=c.7D+(e&&e.2B||b.2B||0)}9(!c.3Y&&(c.61||c.60))c.3Y=c.61||c.60;9(!c.5F&&c.5D)c.5F=c.5D;9(!c.3Y&&c.2r)c.3Y=(c.2r&1?1:(c.2r&2?3:(c.2r&4?2:0)));I c}};E.1b.1k({3W:G(c,a,b){I c=="5Y"?6.2G(c,a,b):6.N(G(){E.1j.1f(6,c,b||a,b&&a)})},2G:G(d,b,c){I 6.N(G(){E.1j.1f(6,d,G(a){E(6).5X(a);I(c||b).16(6,1q)},c&&b)})},5X:G(a,b){I 6.N(G(){E.1j.28(6,a,b)})},1F:G(c,a,b){I 6.N(G(){E.1j.1F(c,a,6,Q,b)})},7x:G(c,a,b){9(6[0])I E.1j.1F(c,a,6[0],P,b)},25:G(){H a=1q;I 6.4L(G(e){6.4H=0==6.4H?1:0;e.2M();I a[6.4H].16(6,[e])||P})},7v:G(f,g){G 4G(e){H p=e.4K;1W(p&&p!=6)2a{p=p.12}29(e){p=6};9(p==6)I P;I(e.O=="4x"?f:g).16(6,[e])}I 6.4x(4G).5U(4G)},2d:G(f){5T();9(E.3T)f.16(U,[E]);J E.3l.1a(G(){I f.16(6,[E])});I 6}});E.1k({3T:P,3l:[],2d:G(){9(!E.3T){E.3T=Q;9(E.3l){E.N(E.3l,G(){6.16(U)});E.3l=S}9(E.V.35||E.V.34)U.4P("5S",E.2d,P);9(!18.7t.K)E(18).39(G(){E("#4E").28()})}}});E.N(("7s,7r,39,7q,6n,5Y,4L,7p,"+"7n,7m,7l,4x,5U,7k,24,"+"51,7j,7i,7h,3U").2l(","),G(i,o){E.1b[o]=G(f){I f?6.3W(o,f):6.1F(o)}});H x=P;G 5T(){9(x)I;x=Q;9(E.V.35||E.V.34)U.4S("5S",E.2d,P);J 9(E.V.1h){U.7f("<7d"+"7y 22=4E 7z=Q "+"3k=//:><\\/1J>");H a=U.3S("4E");9(a)a.62=G(){9(6.2C!="1l")I;E.2d()};a=S}J 9(E.V.1N)E.4B=4j(G(){9(U.2C=="5Q"||U.2C=="1l"){4A(E.4B);E.4B=S;E.2d()}},10);E.1j.1f(18,"39",E.2d)}E.1b.1k({39:G(g,d,c){9(E.1n(g))I 6.3W("39",g);H e=g.1g(" ");9(e>=0){H i=g.2J(e,g.K);g=g.2J(0,e)}c=c||G(){};H f="4z";9(d)9(E.1n(d)){c=d;d=S}J{d=E.3a(d);f="5P"}H h=6;E.3G({1d:g,O:f,M:d,1l:G(a,b){9(b=="1C"||b=="5O")h.4o(i?E("<1s/>").3g(a.40.1p(/<1J(.|\\s)*?\\/1J>/g,"")).1Y(i):a.40);56(G(){h.N(c,[a.40,b,a])},13)}});I 6},7a:G(){I E.3a(6.5M())},5M:G(){I 6.1X(G(){I E.11(6,"2Y")?E.2h(6.79):6}).1E(G(){I 6.2H&&!6.3c&&(6.2Q||/24|6b/i.14(6.11)||/2g|1P|52/i.14(6.O))}).1X(G(i,c){H b=E(6).3i();I b==S?S:b.1c==1B?E.1X(b,G(a,i){I{2H:c.2H,1Q:a}}):{2H:c.2H,1Q:b}}).21()}});E.N("5L,5K,6t,5J,5I,5H".2l(","),G(i,o){E.1b[o]=G(f){I 6.3W(o,f)}});H B=(1u 3D).3B();E.1k({21:G(d,b,a,c){9(E.1n(b)){a=b;b=S}I E.3G({O:"4z",1d:d,M:b,1C:a,1V:c})},78:G(b,a){I E.21(b,S,a,"1J")},77:G(c,b,a){I E.21(c,b,a,"45")},76:G(d,b,a,c){9(E.1n(b)){a=b;b={}}I E.3G({O:"5P",1d:d,M:b,1C:a,1V:c})},75:G(a){E.1k(E.59,a)},59:{1Z:Q,O:"4z",2z:0,5G:"74/x-73-2Y-72",6o:Q,3e:Q,M:S},49:{},3G:G(s){H f,2y=/=(\\?|%3F)/g,1v,M;s=E.1k(Q,s,E.1k(Q,{},E.59,s));9(s.M&&s.6o&&1m s.M!="1M")s.M=E.3a(s.M);9(s.1V=="4b"){9(s.O.2p()=="21"){9(!s.1d.1t(2y))s.1d+=(s.1d.1t(/\\?/)?"&":"?")+(s.4b||"5E")+"=?"}J 9(!s.M||!s.M.1t(2y))s.M=(s.M?s.M+"&":"")+(s.4b||"5E")+"=?";s.1V="45"}9(s.1V=="45"&&(s.M&&s.M.1t(2y)||s.1d.1t(2y))){f="4b"+B++;9(s.M)s.M=s.M.1p(2y,"="+f);s.1d=s.1d.1p(2y,"="+f);s.1V="1J";18[f]=G(a){M=a;1C();1l();18[f]=W;2a{2E 18[f]}29(e){}}}9(s.1V=="1J"&&s.1L==S)s.1L=P;9(s.1L===P&&s.O.2p()=="21")s.1d+=(s.1d.1t(/\\?/)?"&":"?")+"57="+(1u 3D()).3B();9(s.M&&s.O.2p()=="21"){s.1d+=(s.1d.1t(/\\?/)?"&":"?")+s.M;s.M=S}9(s.1Z&&!E.5b++)E.1j.1F("5L");9(!s.1d.1g("8g")&&s.1V=="1J"){H h=U.4l("9U")[0];H g=U.5B("1J");g.3k=s.1d;9(!f&&(s.1C||s.1l)){H j=P;g.9R=g.62=G(){9(!j&&(!6.2C||6.2C=="5Q"||6.2C=="1l")){j=Q;1C();1l();h.3b(g)}}}h.58(g);I}H k=P;H i=18.6X?1u 6X("9P.9O"):1u 6W();i.9M(s.O,s.1d,s.3e);9(s.M)i.5C("9J-9I",s.5G);9(s.5y)i.5C("9H-5x-9F",E.49[s.1d]||"9D, 9C 9B 9A 5v:5v:5v 9z");i.5C("X-9x-9v","6W");9(s.6U)s.6U(i);9(s.1Z)E.1j.1F("5H",[i,s]);H c=G(a){9(!k&&i&&(i.2C==4||a=="2z")){k=Q;9(d){4A(d);d=S}1v=a=="2z"&&"2z"||!E.6S(i)&&"3U"||s.5y&&E.6R(i,s.1d)&&"5O"||"1C";9(1v=="1C"){2a{M=E.6Q(i,s.1V)}29(e){1v="5k"}}9(1v=="1C"){H b;2a{b=i.5s("6P-5x")}29(e){}9(s.5y&&b)E.49[s.1d]=b;9(!f)1C()}J E.5r(s,i,1v);1l();9(s.3e)i=S}};9(s.3e){H d=4j(c,13);9(s.2z>0)56(G(){9(i){i.9q();9(!k)c("2z")}},s.2z)}2a{i.9o(s.M)}29(e){E.5r(s,i,S,e)}9(!s.3e)c();I i;G 1C(){9(s.1C)s.1C(M,1v);9(s.1Z)E.1j.1F("5I",[i,s])}G 1l(){9(s.1l)s.1l(i,1v);9(s.1Z)E.1j.1F("6t",[i,s]);9(s.1Z&&!--E.5b)E.1j.1F("5K")}},5r:G(s,a,b,e){9(s.3U)s.3U(a,b,e);9(s.1Z)E.1j.1F("5J",[a,s,e])},5b:0,6S:G(r){2a{I!r.1v&&9n.9l=="54:"||(r.1v>=6N&&r.1v<9j)||r.1v==6M||E.V.1N&&r.1v==W}29(e){}I P},6R:G(a,c){2a{H b=a.5s("6P-5x");I a.1v==6M||b==E.49[c]||E.V.1N&&a.1v==W}29(e){}I P},6Q:G(r,b){H c=r.5s("9i-O");H d=b=="6K"||!b&&c&&c.1g("6K")>=0;H a=d?r.9g:r.40;9(d&&a.2V.37=="5k")6G"5k";9(b=="1J")E.5f(a);9(b=="45")a=3w("("+a+")");I a},3a:G(a){H s=[];9(a.1c==1B||a.4c)E.N(a,G(){s.1a(3f(6.2H)+"="+3f(6.1Q))});J L(H j 1i a)9(a[j]&&a[j].1c==1B)E.N(a[j],G(){s.1a(3f(j)+"="+3f(6))});J s.1a(3f(j)+"="+3f(a[j]));I s.66("&").1p(/%20/g,"+")}});E.1b.1k({1A:G(b,a){I b?6.1U({1H:"1A",2N:"1A",1r:"1A"},b,a):6.1E(":1P").N(G(){6.R.19=6.3h?6.3h:"";9(E.17(6,"19")=="2s")6.R.19="2Z"}).2D()},1z:G(b,a){I b?6.1U({1H:"1z",2N:"1z",1r:"1z"},b,a):6.1E(":3R").N(G(){6.3h=6.3h||E.17(6,"19");9(6.3h=="2s")6.3h="2Z";6.R.19="2s"}).2D()},6J:E.1b.25,25:G(a,b){I E.1n(a)&&E.1n(b)?6.6J(a,b):a?6.1U({1H:"25",2N:"25",1r:"25"},a,b):6.N(G(){E(6)[E(6).3t(":1P")?"1A":"1z"]()})},9c:G(b,a){I 6.1U({1H:"1A"},b,a)},9b:G(b,a){I 6.1U({1H:"1z"},b,a)},99:G(b,a){I 6.1U({1H:"25"},b,a)},98:G(b,a){I 6.1U({1r:"1A"},b,a)},96:G(b,a){I 6.1U({1r:"1z"},b,a)},95:G(c,a,b){I 6.1U({1r:a},c,b)},1U:G(k,i,h,g){H j=E.6D(i,h,g);I 6[j.3L===P?"N":"3L"](G(){j=E.1k({},j);H f=E(6).3t(":1P"),3y=6;L(H p 1i k){9(k[p]=="1z"&&f||k[p]=="1A"&&!f)I E.1n(j.1l)&&j.1l.16(6);9(p=="1H"||p=="2N"){j.19=E.17(6,"19");j.2U=6.R.2U}}9(j.2U!=S)6.R.2U="1P";j.3M=E.1k({},k);E.N(k,G(c,a){H e=1u E.2j(3y,j,c);9(/25|1A|1z/.14(a))e[a=="25"?f?"1A":"1z":a](k);J{H b=a.3s().1t(/^([+-]=)?([\\d+-.]+)(.*)$/),1O=e.2b(Q)||0;9(b){H d=3I(b[2]),2i=b[3]||"2T";9(2i!="2T"){3y.R[c]=(d||1)+2i;1O=((d||1)/e.2b(Q))*1O;3y.R[c]=1O+2i}9(b[1])d=((b[1]=="-="?-1:1)*d)+1O;e.3N(1O,d,2i)}J e.3N(1O,a,"")}});I Q})},3L:G(a,b){9(E.1n(a)){b=a;a="2j"}9(!a||(1m a=="1M"&&!b))I A(6[0],a);I 6.N(G(){9(b.1c==1B)A(6,a,b);J{A(6,a).1a(b);9(A(6,a).K==1)b.16(6)}})},9f:G(){H a=E.32;I 6.N(G(){L(H i=0;i<a.K;i++)9(a[i].T==6)a.6I(i--,1)}).5n()}});H A=G(b,c,a){9(!b)I;H q=E.M(b,c+"3L");9(!q||a)q=E.M(b,c+"3L",a?E.2h(a):[]);I q};E.1b.5n=G(a){a=a||"2j";I 6.N(G(){H q=A(6,a);q.44();9(q.K)q[0].16(6)})};E.1k({6D:G(b,a,c){H d=b&&b.1c==8Z?b:{1l:c||!c&&a||E.1n(b)&&b,2e:b,3J:c&&a||a&&a.1c!=8Y&&a};d.2e=(d.2e&&d.2e.1c==4W?d.2e:{8X:8W,8V:6N}[d.2e])||8T;d.3r=d.1l;d.1l=G(){E(6).5n();9(E.1n(d.3r))d.3r.16(6)};I d},3J:{6B:G(p,n,b,a){I b+a*p},5q:G(p,n,b,a){I((-38.9s(p*38.8R)/2)+0.5)*a+b}},32:[],2j:G(b,c,a){6.Y=c;6.T=b;6.1e=a;9(!c.3P)c.3P={}}});E.2j.3A={4r:G(){9(6.Y.2F)6.Y.2F.16(6.T,[6.2v,6]);(E.2j.2F[6.1e]||E.2j.2F.6z)(6);9(6.1e=="1H"||6.1e=="2N")6.T.R.19="2Z"},2b:G(a){9(6.T[6.1e]!=S&&6.T.R[6.1e]==S)I 6.T[6.1e];H r=3I(E.3C(6.T,6.1e,a));I r&&r>-8O?r:3I(E.17(6.T,6.1e))||0},3N:G(c,b,e){6.5u=(1u 3D()).3B();6.1O=c;6.2D=b;6.2i=e||6.2i||"2T";6.2v=6.1O;6.4q=6.4i=0;6.4r();H f=6;G t(){I f.2F()}t.T=6.T;E.32.1a(t);9(E.32.K==1){H d=4j(G(){H a=E.32;L(H i=0;i<a.K;i++)9(!a[i]())a.6I(i--,1);9(!a.K)4A(d)},13)}},1A:G(){6.Y.3P[6.1e]=E.1x(6.T.R,6.1e);6.Y.1A=Q;6.3N(0,6.2b());9(6.1e=="2N"||6.1e=="1H")6.T.R[6.1e]="8N";E(6.T).1A()},1z:G(){6.Y.3P[6.1e]=E.1x(6.T.R,6.1e);6.Y.1z=Q;6.3N(6.2b(),0)},2F:G(){H t=(1u 3D()).3B();9(t>6.Y.2e+6.5u){6.2v=6.2D;6.4q=6.4i=1;6.4r();6.Y.3M[6.1e]=Q;H a=Q;L(H i 1i 6.Y.3M)9(6.Y.3M[i]!==Q)a=P;9(a){9(6.Y.19!=S){6.T.R.2U=6.Y.2U;6.T.R.19=6.Y.19;9(E.17(6.T,"19")=="2s")6.T.R.19="2Z"}9(6.Y.1z)6.T.R.19="2s";9(6.Y.1z||6.Y.1A)L(H p 1i 6.Y.3M)E.1x(6.T.R,p,6.Y.3P[p])}9(a&&E.1n(6.Y.1l))6.Y.1l.16(6.T);I P}J{H n=t-6.5u;6.4i=n/6.Y.2e;6.4q=E.3J[6.Y.3J||(E.3J.5q?"5q":"6B")](6.4i,n,0,1,6.Y.2e);6.2v=6.1O+((6.2D-6.1O)*6.4q);6.4r()}I Q}};E.2j.2F={2R:G(a){a.T.2R=a.2v},2B:G(a){a.T.2B=a.2v},1r:G(a){E.1x(a.T.R,"1r",a.2v)},6z:G(a){a.T.R[a.1e]=a.2v+a.2i}};E.1b.6m=G(){H c=0,3E=0,T=6[0],5t;9(T)8L(E.V){H b=E.17(T,"2X")=="4F",1D=T.12,23=T.23,2K=T.3H,4f=1N&&3x(4s)<8J;9(T.6V){5w=T.6V();1f(5w.1S+38.33(2K.2V.2R,2K.1G.2R),5w.3E+38.33(2K.2V.2B,2K.1G.2B));9(1h){H d=E("4o").17("8H");d=(d=="8G"||E.5g&&3x(4s)>=7)&&2||d;1f(-d,-d)}}J{1f(T.5l,T.5z);1W(23){1f(23.5l,23.5z);9(35&&/^t[d|h]$/i.14(1D.37)||!4f)d(23);9(4f&&!b&&E.17(23,"2X")=="4F")b=Q;23=23.23}1W(1D.37&&!/^1G|4o$/i.14(1D.37)){9(!/^8D|1I-9S.*$/i.14(E.17(1D,"19")))1f(-1D.2R,-1D.2B);9(35&&E.17(1D,"2U")!="3R")d(1D);1D=1D.12}9(4f&&b)1f(-2K.1G.5l,-2K.1G.5z)}5t={3E:3E,1S:c}}I 5t;G d(a){1f(E.17(a,"9T"),E.17(a,"8A"))}G 1f(l,t){c+=3x(l)||0;3E+=3x(t)||0}}})();', 62, 616, '||||||this|||if|||||||||||||||||||||||||||||||||function|var|return|else|length|for|data|each|type|false|true|style|null|elem|document|browser|undefined||options|||nodeName|parentNode||test|jQuery|apply|css|window|display|push|fn|constructor|url|prop|add|indexOf|msie|in|event|extend|complete|typeof|isFunction|className|replace|arguments|opacity|div|match|new|status|firstChild|attr|nodeType|hide|show|Array|success|parent|filter|trigger|body|height|table|script|tbody|cache|string|safari|start|hidden|value|merge|left|break|animate|dataType|while|map|find|global||get|id|offsetParent|select|toggle|selected|toUpperCase|remove|catch|try|cur|al|ready|duration|done|text|makeArray|unit|fx|swap|split|target||pushStack|toLowerCase|nextSibling|button|none|handle|guid|now|stack|tb|jsre|timeout|inArray|scrollTop|readyState|end|delete|step|one|name|nth|slice|doc|ret|preventDefault|width|call|events|checked|scrollLeft|exec|px|overflow|documentElement|grep|position|form|block|removeData|rl|timers|max|opera|mozilla|trim|tagName|Math|load|param|removeChild|disabled|insertBefore|async|encodeURIComponent|append|oldblock|val|childNodes|src|readyList|multiFilter|color|defaultView|stopPropagation|args|old|toString|is|last|first|eval|parseInt|self|domManip|prototype|getTime|curCSS|Date|top||ajax|ownerDocument|parseFloat|easing|has|queue|curAnim|custom|innerHTML|orig|currentStyle|visible|getElementById|isReady|error|static|bind|String|which|getComputedStyle|responseText|oWidth|oHeight|on|shift|json|child|RegExp|ol|lastModified|isXMLDoc|jsonp|jquery|previousSibling|dir|safari2|el|styleFloat|state|setInterval|radio|getElementsByTagName|tr|empty|html|getAttribute|pos|update|version|input|float|runtimeStyle|unshift|mouseover|getPropertyValue|GET|clearInterval|safariTimer|visibility|clean|__ie_init|absolute|handleHover|lastToggle|index|fromElement|relatedTarget|click|fix|evt|andSelf|removeEventListener|handler|cloneNode|addEventListener|triggered|nodeIndex|unique|Number|classFilter|prevObject|selectedIndex|after|submit|password|removeAttribute|file|expr|setTimeout|_|appendChild|ajaxSettings|client|active|win|sibling|deep|globalEval|boxModel|cssFloat|object|checkbox|parsererror|offsetLeft|wrapAll|dequeue|props|lastChild|swing|handleError|getResponseHeader|results|startTime|00|box|Modified|ifModified|offsetTop|evalScript|createElement|setRequestHeader|ctrlKey|callback|metaKey|contentType|ajaxSend|ajaxSuccess|ajaxError|ajaxStop|ajaxStart|serializeArray|init|notmodified|POST|loaded|appendTo|DOMContentLoaded|bindReady|mouseout|not|removeAttr|unbind|unload|Width|keyCode|charCode|onreadystatechange|clientX|pageX|srcElement|join|outerHTML|substr|zoom|parse|textarea|reset|image|odd|even|before|quickClass|quickID|prepend|quickChild|execScript|offset|scroll|processData|uuid|contents|continue|textContent|ajaxComplete|clone|setArray|webkit|nodeValue|fl|_default|100|linear|href|speed|eq|createTextNode|throw|replaceWith|splice|_toggle|xml|colgroup|304|200|alpha|Last|httpData|httpNotModified|httpSuccess|fieldset|beforeSend|getBoundingClientRect|XMLHttpRequest|ActiveXObject|col|br|abbr|pixelLeft|urlencoded|www|application|ajaxSetup|post|getJSON|getScript|elements|serialize|clientWidth|hasClass|scr|clientHeight|write|relative|keyup|keypress|keydown|change|mousemove|mouseup|mousedown|right|dblclick|resize|focus|blur|frames|instanceof|hover|offsetWidth|triggerHandler|ipt|defer|offsetHeight|border|padding|clientY|pageY|Left|Right|toElement|Bottom|Top|cancelBubble|returnValue|detachEvent|attachEvent|substring|line|weight|animated|header|font|enabled|innerText|contains|only|size|gt|lt|uFFFF|u0128|417|inner|Height|toggleClass|removeClass|addClass|replaceAll|noConflict|insertAfter|prependTo|wrap|contentWindow|contentDocument|http|iframe|children|siblings|prevAll|nextAll|wrapInner|prev|Boolean|next|parents|maxLength|maxlength|readOnly|readonly|class|htmlFor|CSS1Compat|compatMode|compatible|borderTopWidth|ie|ra|inline|it|rv|medium|borderWidth|userAgent|522|navigator|with|concat|1px|10000|array|ig|PI|NaN|400|reverse|fast|600|slow|Function|Object|setAttribute|changed|be|can|property|fadeTo|fadeOut|getAttributeNode|fadeIn|slideToggle|method|slideUp|slideDown|action|cssText|stop|responseXML|option|content|300|th|protocol|td|location|send|cap|abort|colg|cos|tfoot|thead|With|leg|Requested|opt|GMT|1970|Jan|01|Thu|area|Since|hr|If|Type|Content|meta|specified|open|link|XMLHTTP|Microsoft|img|onload|row|borderLeftWidth|head|attributes'.split('|'), 0, {});
-
-/*
-    Copyright (c) 2004-2007, The Dojo Foundation
-    All Rights Reserved.
-
-    Licensed under the Academic Free License version 2.1 or above OR the
-    modified BSD license. For more information on Dojo licensing, see:
-
-        http://dojotoolkit.org/community/licensing.shtml
-*/
-
-/*
-    This is a compiled version of Dojo, built for deployment and not for
-    development. To get an editable version, please visit:
-
-        http://dojotoolkit.org
-
-    for documentation and information on getting the source.
-*/
-
-    var decompressedDojo = function (p, a, c, k, e, d) {
-        e = function (c) {
-            return (c < a ? "" : e(parseInt(c / a))) + ((c = c % a) > 35 ? String.fromCharCode(c + 29) : c.toString(36))
-        };
-        if (!''.replace(/^/, String)) {
-/* BEGIN LOOP */
-            while (c--) d[e(c)] = k[c] || e(c);
-/* END LOOP */
-            k = [function (e) {
-                return d[e]
-            }];
-            e = function () {
-                return '\\w+'
-            };
-            c = 1
-        };
-/* BEGIN LOOP */
-        while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]);
-/* END LOOP */
-        return p
-    }('if(V z=="1k"){(B(){if(V D["1o"]=="1k"){D.1o={}}if((!D["1z"])||(!1z["ca"])){D.1z={}}A cn=["rA","rz","1K","ry","rx","9f","rw","rv","ru","rt","rs","rr","rq","ro","rn","rm"];A i=0,24;1s(24=cn[i++]){if(!1z[24]){1z[24]=B(){}}}if(V D["z"]=="1k"){D.z={}}z.1W=D;A d3={im:U,rl:U,rk:"",rj:"",ri:"",rh:K,rg:U};R(A 8z in d3){if(V 1o[8z]=="1k"){1o[8z]=d3[8z]}}A jK=["rf","rd","rc","rb"];A t;1s(t=jK.3a()){z["is"+t]=U}})();z.8h=1o.8h;z.cY={jJ:0,jI:9,jH:0,jG:"",jF:2V("$ra: r9 $".1f(/[0-9]+/)[0]),2i:B(){4G(z.cY){C jJ+"."+jI+"."+jH+jG+" ("+jF+")"}}};z.d1=B(jE,jD,1V){A 2h=1V||z.1W;R(A i=0,p;2h&&(p=jE[i]);i++){2h=(p in 2h?2h[p]:(jD?2h[p]={}:1k))}C 2h};z.88=B(jC,jA,jB){A d2=jC.1A("."),p=d2.8q(),M=z.d1(d2,K,jB);C(M&&p?(M[p]=jA):1k)};z.6q=B(jz,jy,jx){C z.d1(jz.1A("."),jy,jx)};z.r8=B(jw,M){C!!z.6q(jw,U,M)};z["3u"]=B(d0){C z.1W.3u?z.1W.3u(d0):3u(d0)};z.ia=B(jv,cZ,cX){A 8y="r7: "+jv;if(cZ){8y+=" "+cZ}if(cX){8y+=" -- r6 be r5 in cY: "+cX}1z.1K(8y)};z.r4=B(ju,cW){A cV="r3: "+ju+" -- r2 r1 4F r0 qZ qY.";if(cW){cV+=" "+cW}1z.1K(cV)};(B(){A cR={53:{},6p:0,1h:{},8k:{z:{1p:"z",1Z:"."},cU:{1p:"cU",1Z:"../qX/cU"},cT:{1p:"cT",1Z:"cT"}},cN:B(cS){A mp=D.8k;C jp(mp[cS]&&mp[cS].1Z)},jk:B(8x){A mp=D.8k;if(D.cN(8x)){C mp[8x].1Z}C 8x},8v:[],6t:U,56:[],8t:[],8u:U};R(A cQ in cR){z[cQ]=cR[cQ]}})();z.jg=B(8w,cP,cb){A 1g=(((8w.2s(0)=="/"||8w.1f(/^\\w+:/)))?"":D.51)+8w;if(1o.jt&&z.c8){1g+="?"+67(1o.jt).2f(/\\W+/g,"")}1u{C!cP?D.cO(1g,cb):D.jq(1g,cP,cb)}1y(e){1z.1K(e);C U}};z.cO=B(1g,cb){if(D.8v[1g]){C K}A 6u=D.iR(1g,K);if(!6u){C U}D.8v[1g]=K;D.8v.Y(1g);if(cb){6u="("+6u+")"}A jr=z["3u"](6u+"\\r\\n//@ qW="+1g);if(cb){cb(jr)}C K};z.jq=B(1g,jo,cb){A ok=U;1u{ok=D.cO(1g,cb)}1y(e){1z.1K("qV je ",1g," 4G 9f: ",e)}C jp(ok&&D.53[jo])};z.6m=B(){D.8u=K;D.6t=K;A 57=D.56;D.56=[];R(A x=0;x<57.G;x++){57[x]()}D.8u=U;if(z.6t&&z.6p==0&&D.56.G>0){z.8s()}};z.ck=B(){A 57=D.8t;1s(57.G){(57.8q())()}};z.qU=B(M,jn){A d=z;if(P.G==1){d.56.Y(M)}I{if(P.G>1){d.56.Y(B(){M[jn]()})}}if(d.6t&&d.6p==0&&!d.8u){d.8s()}};z.dW=B(M,jm){A d=z;if(P.G==1){d.8t.Y(M)}I{if(P.G>1){d.8t.Y(B(){M[jm]()})}}};z.iM=B(){if(D.6t){C}if(D.6p>0){1z.1K("qT qS in qR!");C}z.8s()};z.8s=B(){if(V 5c=="8b"||(1o["qQ"]&&z.2M)){5c("z.6m();",0)}I{z.6m()}};z.cF=B(jl){A 4v=jl.1A(".");R(A i=4v.G;i>0;i--){A 8r=4v.2w(0,i).22(".");if((i==1)&&!D.cN(8r)){4v[0]="../"+4v[0]}I{A cM=D.jk(8r);if(cM!=8r){4v.3S(0,i,cM);3f}}}C 4v};z.jj=U;z.8m=B(2T,qP,55){55=D.jj||55;A 54=D.53[2T];if(54){C 54}A cL=2T.1A(".");A 3L=D.cF(2T);A jh=((3L[0].2s(0)!="/")&&!3L[0].1f(/^\\w+:/));A ji=3L[3L.G-1];A 3m;if(ji=="*"){2T=cL.2w(0,-1).22(".");3L.8q();3m=3L.22("/")+"/"+(1o["qO"]||"qN")+".js";if(jh&&3m.2s(0)=="/"){3m=3m.2w(1)}}I{3m=3L.22("/")+".js";2T=cL.22(".")}A jf=(!55)?2T:L;A ok=D.jg(3m,jf);if((!ok)&&(!55)){2m S 1O("qM 3O 4E \'"+2T+"\'; 72 qL \'"+3m+"\'")}if((!55)&&(!D["qK"])){54=D.53[2T];if(!54){2m S 1O("qJ \'"+2T+"\' is 3O qI a8 je \'"+3m+"\'")}}C 54};z.8c=z.8m;z.1Q=B(cK){A cJ=cK+"";A 8p=cJ;A 6s=cK.1A(/\\./);if(6s[6s.G-1]=="*"){6s.8q();8p=6s.22(".")}A 8o=z.6q(8p,K);D.53[cJ]=8o;D.53[8p]=8o;C 8o};z.qH=B(8n){A jd=8n["qG"]||[];A cI=jd.3U(8n[z.j4]||8n["aY"]||[]);R(A x=0;x<cI.G;x++){A 8l=cI[x];if(8l.1P==4e){z.8m.14(z,8l)}I{z.8m(8l)}}};z.jb=B(jc,qF){if(jc===K){A cH=[];R(A i=1;i<P.G;i++){cH.Y(P[i])}z.8c.14(z,cH)}};z.qE=z.jb;z.io=B(cG,ja){D.8k[cG]={1p:cG,1Z:ja}};z.qD=B(qC,qB,qA,qz){z.8c("z.j9");z.j9.qy.14(z.qx,P)};(B(){A j7=S 9G("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\\\?([^#]*))?(#(.*))?$");A j6=S 9G("^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$");z.4r=B(){A n=L;A 1V=P;A 1g=1V[0];R(A i=1;i<1V.G;i++){if(!1V[i]){6c}A 1t=S z.4r(1V[i]+"");A 4u=S z.4r(1g+"");if((1t.28=="")&&(!1t.4t)&&(!1t.3l)&&(!1t.1r)){if(1t.52!=n){4u.52=1t.52}1t=4u}I{if(!1t.4t){1t.4t=4u.4t;if(!1t.3l){1t.3l=4u.3l;if(1t.28.2s(0)!="/"){A j8=4u.28.21(0,4u.28.31("/")+1)+1t.28;A 1X=j8.1A("/");R(A j=0;j<1X.G;j++){if(1X[j]=="."){if(j==1X.G-1){1X[j]=""}I{1X.3S(j,1);j--}}I{if(j>0&&!(j==1&&1X[0]=="")&&1X[j]==".."&&1X[j-1]!=".."){if(j==(1X.G-1)){1X.3S(j,1);1X[j-1]=""}I{1X.3S(j-1,2);j-=2}}}}1t.28=1X.22("/")}}}}1g="";if(1t.4t){1g+=1t.4t+":"}if(1t.3l){1g+="//"+1t.3l}1g+=1t.28;if(1t.1r){1g+="?"+1t.1r}if(1t.52){1g+="#"+1t.52}}D.1g=1g.2i();A r=D.1g.1f(j7);D.4t=r[2]||(r[1]?"":n);D.3l=r[4]||(r[3]?"":n);D.28=r[5];D.1r=r[7]||(r[6]?"":n);D.52=r[9]||(r[8]?"":n);if(D.3l!=n){r=D.3l.1f(j6);D.8X=r[3]||n;D.8W=r[4]||n;D.qw=r[5];D.qv=r[7]||n}};z.4r.1C.2i=B(){C D.1g}})();z.qu=B(j5,2E){A 2B=z.cF(j5).22("/");if(!2B){C L}if(2B.31("/")!=2B.G-1){2B+="/"}A cE=2B.T(":");if(2B.2s(0)!="/"&&(cE==-1||cE>2B.T("/"))){2B=z.51+2B}C S z.4r(2B,2E)};if(V 26!="1k"){z.c8=K;z.j4="qt";(B(){A d=z;if(1q&&1q.4I){A 8j=1q.4I("ak");A j3=/z(\\.qs)?\\.js([\\?\\.]|$)/i;R(A i=0;i<8j.G;i++){A 4X=8j[i].5t("4X");if(!4X){6c}A m=4X.1f(j3);if(m){if(!1o["51"]){1o["51"]=4X.21(0,m.hK)}A cD=8j[i].5t("1o");if(cD){A cC=3u("({ "+cD+" })");R(A x in cC){1o[x]=cC[x]}}3f}}}d.51=1o["51"];A n=cq;A 8i=n.iL;A 4Z=n.qr;A 6r=2k(4Z);d.2M=(8i.T("qq")>=0)?6r:0;d.6B=(4Z.T("qo")>=0)||(4Z.T("j2")>=0)?6r:0;d.3o=(4Z.T("j2")>=0)?6r:0;A j1=8i.T("qn");d.gu=d.7B=((j1>=0)&&(!d.6B))?6r:0;d.j0=0;d.1l=0;d.iV=0;1u{if(d.7B){d.j0=2k(8i.1A("qm/")[1].1A(" ")[0])}if((1q.gx)&&(!d.2M)){d.1l=2k(4Z.1A("qk ")[1].1A(";")[0])}}1y(e){}if(z.1l&&(26.8f.cu==="9q:")){1o.iT=K}d.iX=B(){A 2A;A qj;A cB=d.6q("cz.cy");if(cB){C cB}if(V iZ!="1k"){2A=S iZ()}I{if(d.1l){1u{2A=S 9j("qi.qh")}1y(e){}}I{if(cq.qg["8Z/x-iY"]){2A=1q.a9("8b");2A.cA("Z","8Z/x-iY");2A.cA("3n",0);2A.cA("58",0);2A.1c.gq="7C";1q.5K.4c(2A)}}}if(!2A){C L}z.88("cz.cy.qf",2A);C z.6q("cz.cy")};A iW=d.iX();if(iW){d.iV=K}A cm=1q["aX"];d.qe=(cm=="aW")||(cm=="gr")||(d.1l<6);d.8h=1o.8h||(d.1l?n.qd:n.qc).1M();d.qb=1z.1K;d.cx=["iU.8g","em.8g","iU.8g.4.0"];d.9b=B(){A 4s=L;A cv=L;if(!z.1l||!1o.iT){1u{4s=S qa()}1y(e){}}if(!4s){R(A i=0;i<3;++i){A cw=z.cx[i];1u{4s=S 9j(cw)}1y(e){cv=e}if(4s){z.cx=[cw];3f}}}if(!4s){2m S 1O("8g 3O q9: "+cv)}C 4s};d.8Y=B(iS){A 4Y=iS.3N||0;C((4Y>=q8)&&(4Y<q7))||(4Y==q6)||(4Y==q5)||(!4Y&&(8f.cu=="9q:"||8f.cu=="q4:"))};A cs=1q.4I("q3");A iQ=(cs&&cs.G>0);d.iR=B(1g,iP){A 3K=D.9b();if(!iQ&&z.4r){1g=(S z.4r(26.8f,1g)).2i()}3K.dL("dD",1g,U);1u{3K.dI(L);if(!d.8Y(3K)){A 1G=1O("q2 4F 4E "+1g+" 3N:"+3K.3N);1G.3N=3K.3N;1G.2G=3K.2G;2m 1G}}1y(e){if(iP){C L}2m e}C 3K.2G}})();z.iO=U;z.6o=B(e){z.iO=K;A cr=(e&&e.Z)?e.Z.1M():"4E";if(P.2O.iN||(cr!="q1"&&cr!="4E")){C}P.2O.iN=K;if(V z["8e"]!="1k"){dX(z.8e);63 z.8e}if(z.6p==0){z.iM()}};if(1q.66){if(z.2M||(z.7B&&(1o["q0"]===K))){1q.66("pZ",z.6o,L)}26.66("4E",z.6o,L)}if(/(pY|pX)/i.6Z(cq.iL)){z.8e=dN(B(){if(/6m|iJ/.6Z(1q.6F)){z.6o()}},10)}(B(){A 3g=26;A 8d=B(cp,fp){A iK=3g[cp]||B(){};3g[cp]=B(){fp.14(3g,P);iK.14(3g,P)}};if(z.1l){1q.fJ("<iI"+"iH pW 4X=\\"//:\\" "+"pV=\\"if(D.6F==\'iJ\'){z.6o();}\\">"+"</iI"+"iH>");A co=K;8d("iG",B(){3g.5c(B(){co=U},0)});8d("pU",B(){if(co){z.ck()}});1u{1q.pT.2P("v","pS:pR-pQ-pP:pO");1q.pN().pM("v\\\\:*","pL:2E(#aY#pK)")}1y(e){}}I{8d("iG",B(){z.ck()})}})();z.pJ=B(){};z.1e=26["1q"]||L;z.3E=B(){C z.1e.3E||z.1e.4I("3E")[0]};z.ch=B(iF,iE){z.1W=iF;z.1e=iE};z.cf=B(4q,6n,iD){if((6n)&&((V 4q=="3c")||(4q 1N 67))){4q=6n[4q]}C(6n?4q.14(6n,iD||[]):4q())};z.pI=B(cj,iC,iB,iA){A cg;A iz=z.1W;A iy=z.1e;1u{z.ch(cj,cj.1q);cg=z.cf(iC,iB,iA)}ir{z.ch(iz,iy)}C cg};z.pH=B(ix,iw,iv,iu){A ce;A ip=z.1e;1u{z.1e=ix;ce=z.cf(iw,iv,iu)}ir{z.1e=ip}C ce};if(1o["cd"]){R(A cc in 1o["cd"]){z.io(cc,1o["cd"][cc])}}}if(1o.im){if(!1z.ca){z.8c("z.pG.ca")}}}if(!z.1h["z.X.c9"]){z.1h["z.X.c9"]=K;z.1Q("z.X.c9");z.1R=B(it){C(V it=="3c"||it 1N 67)};z.2l=B(it){C(it&&it 1N 4e||V it=="6a"||((V z["1H"]!="1k")&&(it 1N z.1H)))};if(z.c8&&z.3o){z.1Y=B(it){if((V(it)=="B")&&(it=="[8b 1H]")){C U}C(V it=="B"||it 1N bI)}}I{z.1Y=B(it){C(V it=="B"||it 1N bI)}}z.ib=B(it){if(V it=="1k"){C U}C(it===L||V it=="8b"||z.2l(it)||z.1Y(it))};z.pF=B(it){A d=z;if((!it)||(V it=="1k")){C U}if(d.1R(it)){C U}if(d.1Y(it)){C U}if(d.2l(it)){C K}if((it.5w)&&(it.5w.1M()=="3R")){C U}if(pE(it.G)){C K}C U};z.pD=B(it){if(!it){C U}C!z.1Y(it)&&/\\{\\s*\\[il 5h\\]\\s*\\}/.6Z(67(it))};z.c7=B(M,4W){A 8a={};R(A x in 4W){if((V 8a[x]=="1k")||(8a[x]!=4W[x])){M[x]=4W[x]}}if(z.1l){A p=4W.2i;if((V(p)=="B")&&(p!=M.2i)&&(p!=8a.2i)&&(p!="\\pC 2i() {\\n    [il 5h]\\n}\\n")){M.2i=4W.2i}}C M};z.1x=B(M,pB){R(A i=1,l=P.G;i<l;i++){z.c7(M,P[i])}C M};z.4M=B(c6,pA){R(A i=1,l=P.G;i<l;i++){z.c7(c6.1C,P[i])}C c6};z.ig=B(c5,89){A ij=z.4d(P,2);A ik=z.1R(89);C B(){A ih=z.4d(P);A f=(ik?(c5||z.1W)[89]:89);C(f)&&(f.14(c5||D,ij.3U(ih)))}};z.2p=B(2z,3k){if(P.G>2){C z.ig.14(z,P)}if(!3k){3k=2z;2z=L}if(z.1R(3k)){2z=2z||z.1W;if(!2z[3k]){2m(["z.2p: ie[\\"",3k,"\\"] is L (ie=\\"",2z,"\\")"].22(""))}C B(){C 2z[3k].14(2z,P||[])}}I{C(!2z?3k:B(){C 3k.14(2z,P||[])})}};z.6j=B(M,c3){B c4(){};c4.1C=M;A c2=S c4();if(c3){z.1x(c2,c3)}C c2};z.7X=B(pz){A Q=[L];C z.2p.14(z,Q.3U(z.4d(P)))};z.4d=B(M,ic){A Q=[];R(A x=ic||0;x<M.G;x++){Q.Y(M[x])}C Q};z.c1=B(o){if(!o){C o}if(z.2l(o)){A r=[];R(A i=0;i<o.G;++i){r.Y(z.c1(o[i]))}C r}I{if(z.ib(o)){if(o.2t&&o.a7){C o.a7(K)}I{A r=S o.1P();R(A i in o){if(!(i in r)||r[i]!=o[i]){r[i]=z.c1(o[i])}}C r}}}C o};z.7g=B(2H){C 2H.2f(/^\\s\\s*/,"").2f(/\\s\\s*$/,"")}}if(!z.1h["z.X.2r"]){z.1h["z.X.2r"]=K;z.1Q("z.X.2r");z.2r=B(6l,4p,3j){if(z.1Y(3j)||(P.G>3)){z.ia("z.2r: R 9P \'"+6l+"\' py pw B as \'1P\' pv pu of as a pt i3.","","1.0");A c=3j;3j=P[3]||{};3j.1P=c}A dd=P.2O,4V=L;if(z.2l(4p)){4V=4p;4p=4V.3a()}if(4V){R(A i=0,m;i<4V.G;i++){m=4V[i];if(!m){2m("ps #"+i+" 4F pr of "+6l+" is L. pq\'s pp a po pl is 3O 6m.")}4p=dd.6j(4p,m)}}A i9=(3j||0).1P,6k=dd.6j(4p),fn;R(A i in 3j){if(z.1Y(fn=3j[i])&&(!0[i])){fn.i4=i}}z.4M(6k,{4o:6l,bY:i9,bZ:L},3j||0);6k.1C.1P=6k;C z.88(6l,6k)};z.1x(z.2r,{6j:B(c0,i8){A bp=(c0||0).1C,mp=(i8||0).1C;A 2S=z.2r.i7();z.1x(2S,{84:bp,1x:mp});if(c0){2S.1C=z.6j(bp)}z.4M(2S,z.2r.i6,mp||0,{bY:L});2S.1C.1P=2S;2S.1C.4o=(bp||0).4o+"pk"+(mp||0).4o;z.88(2S.1C.4o,2S);C 2S},i7:B(){C B(){D.i5(P)}},i6:{i5:B(86){A c=86.2O,s=c.84,ct=s&&s.1P,m=c.1x,87=m&&m.1P,a=86,ii,fn;if(a[0]){if((fn=a[0]["bZ"])){a=fn.14(D,a)||a}}if(fn=c.1C.bZ){a=fn.14(D,a)||a}if(ct&&ct.14){ct.14(D,a)}if(87&&87.14){87.14(D,a)}if(ii=c.1C.bY){ii.14(D,86)}},bX:B(85){A c=D.1P,p,m;1s(c){p=c.84;m=c.1x;if(m==85||(m 1N 85.1P)){C p}if(m&&(m=m.bX(85))){C m}c=p&&p.1P}},6h:B(83,82,bW,6i){A p=bW,c,m,f;do{c=p.1P;m=c.1x;if(m&&(m=D.6h(83,82,m,6i))){C m}if((f=p[83])&&(6i==(f==82))){C p}p=c.84}1s(p);C!6i&&(p=D.bX(bW))&&D.6h(83,82,p,6i)},bU:B(2R,4U,bV){A a=P;if(!z.1R(a[0])){bV=4U;4U=2R;2R=4U.2O.i4}A c=4U.2O,p=D.1P.1C,a=bV||4U,fn,mp;if(D[2R]!=c||p[2R]==c){mp=D.6h(2R,c,p,K);if(!mp){2m(D.4o+": 1p i3 (\\""+2R+"\\") 4F bU pj 1f 2O (2r.js)")}p=D.6h(2R,c,mp,U)}fn=p&&p[2R];if(!fn){1z.1K(mp.4o+": no bU \\""+2R+"\\" ph pg (2r.js)");C}C fn.14(D,a)}}})}if(!z.1h["z.X.2c"]){z.1h["z.X.2c"]=K;z.1Q("z.X.2c");z.3i={i2:B(){C B(){A ap=4e.1C,c=P.2O,ls=c.2b,t=c.5V;A r=t&&t.14(D,P);R(A i in ls){if(!(i in ap)){ls[i].14(D,P)}}C r}},2P:B(6g,bT,i1){6g=6g||z.1W;A f=6g[bT];if(!f||!f.2b){A d=z.3i.i2();d.5V=f;d.2b=[];f=6g[bT]=d}C f.2b.Y(i1)},3J:B(i0,hZ,bS){A f=(i0||z.1W)[hZ];if(f&&f.2b&&bS--){63 f.2b[bS]}}};z.2c=B(M,pd,pc,pa,p9){A a=P,F=[],i=0;F.Y(z.1R(a[0])?L:a[i++],a[i++]);A a1=a[i+1];F.Y(z.1R(a1)||z.1Y(a1)?a[i++]:L,a[i++]);R(A l=a.G;i<l;i++){F.Y(a[i])}C z.by.14(D,F)};z.by=B(M,bR,hY,hX){A l=z.3i,h=l.2P(M,bR,z.2p(hY,hX));C[M,bR,h,l]};z.p8=B(6f){if(6f&&6f[0]!==1k){z.bv.14(D,6f);63 6f[0]}};z.bv=B(M,hV,hU,hW){hW.3J(M,hV,hU)};z.80={};z.p7=B(bQ,hT,hS){C[bQ,z.3i.2P(z.80,bQ,z.2p(hT,hS))]};z.p6=B(81){if(81){z.3i.3J(z.80,81[0],81[1])}};z.hQ=B(hR,F){A f=z.80[hR];(f)&&(f.14(D,F||[]))};z.p5=B(hP,M,bP){A pf=B(){z.hQ(hP,P)};C(bP)?z.2c(M,bP,pf):z.2c(M,pf)}}if(!z.1h["z.X.30"]){z.1h["z.X.30"]=K;z.1Q("z.X.30");z.30=B(hO){D.bM=[];D.id=D.hN();D.2y=-1;D.3M=0;D.4R=[L,L];D.bO=hO;D.7Z=U};z.4M(z.30,{hN:(B(){A n=1;C B(){C n++}})(),4C:B(){if(D.2y==-1){if(D.bO){D.bO(D)}I{D.7Z=K}if(D.2y==-1){A 1G=S 1O("30 p4");1G.dY="4C";D.5i(1G)}}I{if((D.2y==0)&&(D.4R[0]1N z.30)){D.4R[0].4C()}}},7V:B(1v){D.2y=((1v 1N 1O)?1:0);D.4R[D.2y]=1v;D.7U()},bN:B(){if(D.2y!=-1){if(!D.7Z){2m S 1O("p3 p2!")}D.7Z=U;C}},dM:B(1v){D.bN();D.7V(1v)},5i:B(1v){D.bN();if(!(1v 1N 1O)){1v=S 1O(1v)}D.7V(1v)},9e:B(cb,4T){A 6e=z.2p(cb,4T);if(P.G>2){6e=z.7X(6e,P,2)}C D.5k(6e,6e)},ef:B(cb,4T){A 7Y=z.2p(cb,4T);if(P.G>2){7Y=z.7X(7Y,P,2)}C D.5k(7Y,L)},ed:B(cb,4T){A 7W=z.2p(cb,4T);if(P.G>2){7W=z.7X(7W,P,2)}C D.5k(L,7W)},5k:B(cb,eb){D.bM.Y([cb,eb]);if(D.2y>=0){D.7U()}C D},7U:B(){A bL=D.bM;A 4n=D.2y;A 1v=D.4R[4n];A 4S=D;A cb=L;1s((bL.G>0)&&(D.3M==0)){A f=bL.3a()[4n];if(!f){6c}1u{1v=f(1v);4n=((1v 1N 1O)?1:0);if(1v 1N z.30){cb=B(1v){4S.7V(1v);4S.3M--;if((4S.3M==0)&&(4S.2y>=0)){4S.7U()}};D.3M++}}1y(1G){1z.1K(1G);4n=1;1v=1G}}D.2y=4n;D.4R[4n]=1v;if((cb)&&(D.3M)){1v.9e(cb)}}})}if(!z.1h["z.X.2e"]){z.1h["z.X.2e"]=K;z.1Q("z.X.2e");z.5m=B(2e){1u{C 3u("("+2e+")")}1y(e){1z.1K(e);C 2e}};z.bK=B(2H){C("\\""+2H.2f(/(["\\\\])/g,"\\\\$1")+"\\"").2f(/[\\f]/g,"\\\\f").2f(/[\\b]/g,"\\\\b").2f(/[\\n]/g,"\\\\n").2f(/[\\t]/g,"\\\\t").2f(/[\\r]/g,"\\\\r")};z.hM="\\t";z.eq=B(it,4l,4P){4P=4P||"";A 4k=(4l?4P+z.hM:"");A 6b=(4l?"\\n":"");A 4Q=V(it);if(4Q=="1k"){C"1k"}I{if((4Q=="4J")||(4Q=="p1")){C it+""}I{if(it===L){C"L"}}}if(4Q=="3c"){C z.bK(it)}A 6d=P.2O;A 4m;if(V it.hL=="B"){4m=it.hL();if(it!==4m){C 6d(4m,4l,4k)}}if(V it.2e=="B"){4m=it.2e();if(it!==4m){C 6d(4m,4l,4k)}}if(z.2l(it)){A 1v=[];R(A i=0;i<it.G;i++){A 1U=6d(it[i],4l,4k);if(V(1U)!="3c"){1U="1k"}1v.Y(6b+4k+1U)}C"["+1v.22(", ")+6b+4P+"]"}if(4Q=="B"){C L}A bJ=[];R(A 1i in it){A 7T;if(V(1i)=="4J"){7T="\\""+1i+"\\""}I{if(V(1i)=="3c"){7T=z.bK(1i)}I{6c}}1U=6d(it[1i],4l,4k);if(V(1U)!="3c"){6c}bJ.Y(6b+4k+7T+": "+1U)}C"{"+bJ.22(", ")+6b+4P+"}"}}if(!z.1h["z.X.6a"]){z.1h["z.X.6a"]=K;z.1Q("z.X.6a");(B(){A 69=B(Q,M,cb){C[(z.1R(Q)?Q.1A(""):Q),(M||z.1W),(z.1R(cb)?(S bI("1m","hK","6a",cb)):cb)]};z.1x(z,{T:B(bH,hH,hI,hJ){A i=0,2q=1,1d=bH.G;if(hJ){i=1d-1;2q=1d=-1}R(i=hI||i;i!=1d;i+=2q){if(bH[i]==hH){C i}}C-1},31:B(hG,hF,hE){C z.T(hG,hF,hE,K)},1n:B(Q,hD,M){if(!Q||!Q.G){C}A 1I=69(Q,M,hD);Q=1I[0];R(A i=0,l=1I[0].G;i<l;i++){1I[2].2d(1I[1],Q[i],i,Q)}},bE:B(bF,Q,hC,M){A 1I=69(Q,M,hC);Q=1I[0];R(A i=0,l=Q.G;i<l;i++){A bG=!!1I[2].2d(1I[1],Q[i],i,Q);if(bF^bG){C bG}}C bF},ah:B(Q,hB,hA){C D.bE(K,Q,hB,hA)},ag:B(Q,hz,hy){C D.bE(U,Q,hz,hy)},23:B(Q,7t,M){A 1I=69(Q,M,7t);Q=1I[0];A bD=((P[3])?(S P[3]()):[]);R(A i=0;i<Q.G;++i){bD.Y(1I[2].2d(1I[1],Q[i],i,Q))}C bD},3T:B(Q,hx,M){A 1I=69(Q,M,hx);Q=1I[0];A bC=[];R(A i=0;i<Q.G;i++){if(1I[2].2d(1I[1],Q[i],i,Q)){bC.Y(Q[i])}}C bC}})})()}if(!z.1h["z.X.1J"]){z.1h["z.X.1J"]=K;z.1Q("z.X.1J");z.1J=B(bB){if(bB){D.hw(bB)}};z.1J.hp={p0:[0,0,0],oZ:[60,60,60],oY:[2j,2j,2j],oX:[1T,1T,1T],oW:[2j,0,0],oV:[1T,0,0],oU:[2j,0,2j],oT:[1T,0,1T],oS:[0,2j,0],oR:[0,1T,0],oQ:[2j,2j,0],oP:[1T,1T,0],oO:[0,0,2j],oN:[0,0,1T],oM:[0,2j,2j],oL:[0,1T,1T]};z.4M(z.1J,{r:1T,g:1T,b:1T,a:1,bz:B(r,g,b,a){A t=D;t.r=r;t.g=g;t.b=b;t.a=a},hw:B(2Q){A d=z;if(d.1R(2Q)){d.hq(2Q,D)}I{if(d.2l(2Q)){d.7P(2Q,D)}I{D.bz(2Q.r,2Q.g,2Q.b,2Q.a);if(!(2Q 1N d.1J)){D.7Q()}}}C D},7Q:B(){C D},oK:B(){A t=D;C[t.r,t.g,t.b]},oJ:B(){A t=D;C[t.r,t.g,t.b,t.a]},oI:B(){A Q=z.23(["r","g","b"],B(x){A s=D[x].2i(16);C s.G<2?"0"+s:s},D);C"#"+Q.22("")},8F:B(hv){A t=D,7S=t.r+", "+t.g+", "+t.b;C(hv?"hs("+7S+", "+t.a:"7S("+7S)+")"},2i:B(){C D.8F(K)}});z.d8=B(bA,1d,hu,M){A d=z,t=M||S z.1J();d.1n(["r","g","b","a"],B(x){t[x]=bA[x]+(1d[x]-bA[x])*hu;if(x!="a"){t[x]=2Y.oH(t[x])}});C t.7Q()};z.ho=B(ht,M){A m=ht.1M().1f(/^hs?\\(([\\s\\.,0-9]+)\\)/);C m&&z.7P(m[1].1A(/\\s*,\\s*/),M)};z.hn=B(4j,M){A d=z,t=M||S d.1J(),7R=(4j.G==4)?4:8,hr=(1<<7R)-1;4j=2V("oG"+4j.3b(1));if(2L(4j)){C L}d.1n(["b","g","r"],B(x){A c=4j&hr;4j>>=7R;t[x]=7R==4?17*c:c});t.a=1;C t};z.7P=B(a,M){A t=M||S z.1J();t.bz(2V(a[0]),2V(a[1]),2V(a[2]),2V(a[3]));if(2L(t.a)){t.a=1}C t.7Q()};z.hq=B(2H,M){A a=z.1J.hp[2H];C a&&z.7P(a,M)||z.ho(2H,M)||z.hn(2H,M)}}if(!z.1h["z.X"]){z.1h["z.X"]=K;z.1Q("z.X")}if(!z.1h["z.X.5Z"]){z.1h["z.X.5Z"]=K;z.1Q("z.X.5Z");(B(){A 1j=z.b2={2P:B(E,68,fp){if(!E){C}68=1j.4O(68);fp=1j.7G(68,fp);E.66(68,fp,U);C fp},3J:B(E,hm,hl){(E)&&(E.oF(1j.4O(hm),hl,U))},4O:B(1p){C(1p.2w(0,2)=="on"?1p.2w(2):1p)},7G:B(1p,fp){C(1p!="4b"?fp:B(e){C fp.2d(D,1j.4i(e,D))})},4i:B(H,oE){4w(H.Z){2X"4b":1j.7K(H);3f}C H},7K:B(H){H.oD=(H.3h?67.oC(H.3h):"")}};z.oB=B(H,hk){C 1j.4i(H,hk)};z.gY=B(H){H.7J();H.7I()};A 7O=z.3i;z.by=B(M,bx,hh,hg,hi){A hj=M&&(M.2t||M.oA||M.66);A bw=!hj?0:(!hi?1:2),l=[z.3i,1j,7O][bw];A h=l.2P(M,bx,z.2p(hh,hg));C[M,bx,h,bw]};z.bv=B(M,he,hd,hf){([z.3i,1j,7O][hf]).3J(M,he,hd)};z.5W={oz:8,gV:9,oy:12,ox:13,ow:16,ov:17,ou:18,gG:19,ot:20,os:27,or:32,b5:33,b4:34,gE:35,gF:36,b7:37,b9:38,b6:39,b8:40,gD:45,8S:46,oq:47,oo:91,om:92,ol:93,oj:96,oi:97,oh:98,og:99,oe:6D,od:oc,ob:oa,o9:o8,o7:o6,o5:o4,o3:bi,o2:o1,o0:nZ,nY:nX,nW:nV,nU:bk,gS:nT,gR:nS,gQ:nR,gP:nQ,gO:nP,gN:nO,gM:nN,gL:nM,gK:nL,gJ:nK,gI:nJ,gH:nI,nH:nG,nF:nE,nD:nC,gB:nB,gC:nA};if(z.1l){bf=B(e,5h){1u{C(e.3I=5h)}1y(e){C 0}};A 61=z.3i;if(!1o.nz){7O=61=z.gy={b3:[],2P:B(64,bu,hc){64=64||z.1W;A f=64[bu];if(!f||!f.2b){A d=z.gz();d.5V=f&&(7M.Y(f)-1);d.2b=[];f=64[bu]=d}C f.2b.Y(7M.Y(hc)-1)},3J:B(hb,ha,7N){A f=(hb||z.1W)[ha],l=f&&f.2b;if(f&&l&&7N--){63 7M[l[7N]];63 l[7N]}}};A 7M=61.b3}z.1x(1j,{2P:B(E,62,fp){if(!E){C}62=1j.4O(62);if(62=="h3"){A kd=E.bs;if(!kd||!kd.2b||!kd.h9){1j.2P(E,"bs",1j.h4);E.bs.h9=K}}C 61.2P(E,62,1j.7G(fp))},3J:B(E,h8,h7){61.3J(E,1j.4O(h8),h7)},4O:B(7L){C(7L.2w(0,2)!="on"?"on"+7L:7L)},ny:B(){},4i:B(H,4N){if(!H){A w=(4N)&&((4N.aD||4N.1q||4N).nx)||26;H=w.5Z}if(!H){C(H)}H.5V=H.br;H.bh=(4N||H.br);H.nw=H.nv;H.nu=H.nr;A bq=H.br,1e=(bq&&bq.aD)||1q;A bn=((z.1l<6)||(1e["aX"]=="aW"))?1e.3E:1e.5K;A bm=z.aB();H.nq=H.np+z.aH(bn.5I||0)-bm.x;H.nn=H.nm+(bn.5G||0)-bm.y;if(H.Z=="fk"){H.h6=H.nl}if(H.Z=="fj"){H.h6=H.nk}H.7I=1j.bc;H.7J=1j.ba;C 1j.h5(H)},h5:B(H){4w(H.Z){2X"4b":A c=("3h"in H?H.3h:H.3I);if(c==10){c=0;H.3I=13}I{if(c==13||c==27){c=0}I{if(c==3){c=99}}}H.3h=c;1j.7K(H);3f}C H},gZ:{bi:42,bk:47,h2:59,nj:43,ni:44,nh:45,ng:46,nf:47,60:96,h1:91,nb:92,na:93,h0:39},h4:B(H){A kp=H.bh.h3;if(!kp||!kp.2b){C}A k=H.3I;A bj=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>bk)&&(k<h2||k>60)&&(k<h1||k>h0);if(bj||H.5Y){A c=(bj?0:k);if(H.5Y){if(k==3||k==13){C}I{if(c>95&&c<bi){c-=48}I{if((!H.5X)&&(c>=65&&c<=90)){c+=32}I{c=1j.gZ[c]||c}}}}A 2x=1j.7H(H,{Z:"4b",2x:K,3h:c});kp.2d(H.bh,2x);H.bg=2x.bg;H.bd=2x.bd;bf(H,2x.3I)}},bc:B(){D.bg=K},ba:B(){D.n9=D.3I;if(D.5Y){bf(D,0)}D.bd=U}});z.gY=B(H){H=H||26.5Z;1j.bc.2d(H);1j.ba.2d(H)}}1j.7H=B(H,gX){A 2x=z.1x({},H,gX);1j.7K(2x);2x.7J=B(){H.7J()};2x.7I=B(){H.7I()};C 2x};if(z.2M){z.1x(1j,{4i:B(H,n8){4w(H.Z){2X"4b":A c=H.n7;if(c==3){c=99}c=((c<41)&&(!H.5X)?0:c);if((H.5Y)&&(!H.5X)&&(c>=65)&&(c<=90)){c+=32}C 1j.7H(H,{3h:c})}C H}})}if(z.3o){z.1x(1j,{4i:B(H,n6){4w(H.Z){2X"4b":A c=H.3h,s=H.5X,k=H.3I;k=k||gA[H.gW]||0;if(H.gW=="n5"){c=0}I{if((H.5Y)&&(c>0)&&(c<27)){c+=96}I{if(c==z.5W.gU){c=z.5W.gV;s=K}I{c=(c>=32&&c<gT?c:0)}}}C 1j.7H(H,{3h:c,5X:s,3I:k})}C H}});z.1x(z.5W,{gU:25,b9:gT,b8:n4,b7:n3,b6:n2,gS:n1,gR:n0,gQ:mZ,gP:mY,gO:mX,gN:mW,gM:mV,gL:mU,gK:mT,gJ:mS,gI:mR,gH:mQ,gG:mP,8S:mO,gF:mN,gE:mM,b5:mL,b4:mK,gD:mJ,mI:mH,gC:mG,gB:mF});A dk=z.5W,gA={"mE":dk.b9,"mD":dk.b8,"mC":dk.b7,"mB":dk.b6,"mA":dk.b5,"mz":dk.b4}}})();if(z.1l){z.gz=B(){C B(){A ap=4e.1C,h=z.gy.b3,c=P.2O,ls=c.2b,t=h[c.5V];A r=t&&t.14(D,P);R(A i in ls){if(!(i in ap)){h[ls[i]].14(D,P)}}C r}};z.b2.7G=B(fp){A f=z.b2.4i;C B(e){C fp.2d(D,f(e,D))}}}}if(!z.1h["z.X.b1"]){z.1h["z.X.b1"]=K;z.1Q("z.X.b1");1u{1q.my("mx",U,K)}1y(e){}if(z.1l||z.2M){z.1D=B(id,1e){if(z.1R(id)){A b0=(1e||z.1e);A 11=b0.gv(id);if((11)&&(11.gw.id.1Z==id)){C 11}I{A 5U=b0.gx[id];if(!5U){C}if(!5U.G){C 5U}A i=0;1s(11=5U[i++]){if(11.gw.id.1Z==id){C 11}}}}I{C id}}}I{z.1D=B(id,1e){if(z.1R(id)){C(1e||z.1e).gv(id)}I{C id}}}(B(){A 5T=L;z.mw=B(E){E=z.1D(E);1u{if(!5T){5T=1q.a9("mv")}5T.4c(E.1L?E.1L.fs(E):E);5T.9L=""}1y(e){}};z.mu=B(E,7F){1u{E=z.1D(E);7F=z.1D(7F);1s(E){if(E===7F){C K}E=E.1L}}1y(e){}C U};z.mt=B(E,5S){E=z.1D(E);if(z.gu){E.1c.ms=(5S)?"dg":"7C"}I{if(z.6B){E.1c.mr=(5S)?"8K":"7C"}I{if(z.1l){E.gs=(5S)?"":"on";z.1r("*",E).1n(B(gt){gt.gs=(5S)?"":"on"})}}}};A 5R=B(E,4h){4h.1L.mq(E,4h);C K};A aZ=B(E,4h){A pn=4h.1L;if(4h==pn.fm){pn.4c(E)}I{C 5R(E,4h.71)}C K};z.5E=B(E,2a,3H){if((!E)||(!2a)||(V 3H=="1k")){C U}E=z.1D(E);2a=z.1D(2a);if(V 3H=="4J"){A cn=2a.3W;if(((3H==0)&&(cn.G==0))||(cn.G==3H)){2a.4c(E);C K}if(3H==0){C 5R(E,2a.5A)}C aZ(E,cn[3H-1])}4w(3H.1M()){2X"mo":C 5R(E,2a);2X"a8":C aZ(E,2a);2X"9M":if(2a.5A){C 5R(E,2a.5A)}I{2a.4c(E);C K}3f;aY:2a.4c(E);C K}};z.aP="5g-3G";if(z.1l){A aV=1q.aX;z.aP=(aV=="aW")||(aV=="gr")||(z.1l<6)?"g5-3G":"5g-3G"}A 1E,dv=1q.mn;if(z.3o){1E=B(E){A s=dv.3F(E,L);if(!s&&E.1c){E.1c.gq="";s=dv.3F(E,L)}C s||{}}}I{if(z.1l){1E=B(E){C E.gn}}I{1E=B(E){C dv.3F(E,L)}}}z.3F=1E;if(!z.1l){z.4g=B(mm,gp){C 2k(gp)||0}}I{z.4g=B(go,2N){if(!2N){C 0}if(2N=="ml"){C 4}if(2N.2w&&(2N.2w(-2)=="px")){C 2k(2N)}4G(go){A gm=1c.2g;A gl=aU.2g;aU.2g=gn.2g;1u{1c.2g=2N;2N=1c.mk}1y(e){2N=0}1c.2g=gm;aU.2g=gl}C 2N}}z.ge=(z.1l?B(E){1u{C(E.mj.mi.2W/6D)}1y(e){C 1}}:B(E){C z.3F(E).2W});z.gf=(z.1l?B(E,7D){if(7D==1){E.1c.7E=E.1c.7E.2f(/gk:[^;]*;/i,"");if(E.gj.1M()=="gi"){z.1r("> gh",E).1n(B(i){i.1c.7E=i.1c.7E.2f(/gk:[^;]*;/i,"")})}}I{A o="mh(mg="+(7D*6D)+")";E.1c.3T=o}if(E.gj.1M()=="gi"){z.1r("> gh",E).1n(B(i){i.1c.3T=o})}C 7D}:B(E,gg){C E.1c.2W=gg});A 5Q={3n:K,58:K,2g:K,5J:K};A gd=B(E,Z,5P){Z=Z.1M();if(5Q[Z]===K){C z.4g(E,5P)}I{if(5Q[Z]===U){C 5P}I{if((Z.T("mf")>=0)||(Z.T("md")>=0)||(Z.T("3n")>=0)||(Z.T("58")>=0)||(Z.T("5q")>=0)||(Z.T("mc")>=0)||(Z.T("ma")>=0)){5Q[Z]=K;C z.4g(E,5P)}I{5Q[Z]=U;C 5P}}}};z.1c=B(E,5O,aT){A n=z.1D(E),F=P.G,op=(5O=="2W");if(F==3){C op?z.gf(n,aT):n.1c[5O]=aT}if(F==2&&op){C z.ge(n)}A s=z.3F(n);C(F==1)?s:gd(n,5O,s[5O])};z.7A=B(n,gc){A s=gc||1E(n),px=z.4g,l=px(n,s.m9),t=px(n,s.m8);C{l:l,t:t,w:l+px(n,s.m7),h:t+px(n,s.m6)}};z.5N=B(n,gb){A ne="7C",px=z.4g,s=gb||1E(n),bl=(s.m5!=ne?px(n,s.m4):0),bt=(s.m3!=ne?px(n,s.m2):0);C{l:bl,t:bt,w:bl+(s.m1!=ne?px(n,s.m0):0),h:bt+(s.lZ!=ne?px(n,s.lY):0)}};z.aN=B(n,ga){A s=ga||1E(n),p=z.7A(n,s),b=z.5N(n,s);C{l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h}};z.aM=B(n,g9){A s=g9||1E(n),px=z.4g,l=px(n,s.lX),t=px(n,s.lW),r=px(n,s.lV),b=px(n,s.lU);if(z.3o&&(s.ax!="fU")){r=l}C{l:l,t:t,w:l+r,h:t+b}};z.au=B(E,g8){A s=g8||1E(E),me=z.aM(E,s);A l=E.fT-me.l,t=E.fS-me.t;if(z.7B){A aS=2k(s.2g),aR=2k(s.5J);if(!2L(aS)&&!2L(aR)){l=aS,t=aR}I{A p=E.1L;if(p&&p.1c){A aQ=1E(p);if(aQ.lT!="lS"){A be=z.5N(p,aQ);l+=be.l,t+=be.t}}}}I{if(z.2M){A p=E.1L;if(p){A be=z.5N(p);l-=be.l,t-=be.t}}}C{l:l,t:t,w:E.6v+me.w,h:E.8D+me.h}};z.aK=B(E,g7){A s=g7||1E(E),pe=z.7A(E,s),be=z.5N(E,s),w=E.aF,h;if(!w){w=E.6v,h=E.8D}I{h=E.lR,be.w=be.h=0}if(z.2M){pe.l+=be.l;pe.t+=be.t}C{l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h}};z.lQ=B(E,g6){A s=g6||1E(E),pe=z.7A(E,s),cb=z.aK(E,s);C{l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h}};z.aL=B(E,l,t,w,h,u){u=u||"px";4G(E.1c){if(!2L(l)){2g=l+u}if(!2L(t)){5J=t+u}if(w>=0){3n=w+u}if(h>=0){58=h+u}}};z.aO=B(E){A n=E.5w;C(z.aP=="g5-3G")||(n=="lP")||(n=="lO")};z.fX=B(E,7z,7y,g4){A bb=z.aO(E);if(bb){A pb=z.aN(E,g4);if(7z>=0){7z+=pb.w}if(7y>=0){7y+=pb.h}}z.aL(E,g3,g3,7z,7y)};z.fY=B(E,g1,g0,5M,5L,g2){A s=g2||z.3F(E);A bb=z.aO(E),pb=bb?fZ:z.aN(E,s),mb=z.aM(E,s);if(5M>=0){5M=2Y.5q(5M-pb.w-mb.w,0)}if(5L>=0){5L=2Y.5q(5L-pb.h-mb.h,0)}z.aL(E,g1,g0,5M,5L)};A fZ={l:0,t:0,w:0,h:0};z.lN=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.au(n,s):z.fY(n,b.l,b.t,b.w,b.h,s)};z.lM=B(E,3G){A n=z.1D(E),s=1E(n),b=3G;C!b?z.aK(n,s):z.fX(n,b.w,b.h,s)};A 5H=B(E,1a){if(!(E=(E||0).1L)){C 0}A 1U,aJ=0,2h=z.3E();1s(E&&E.1c){if(1E(E).ax=="lL"){C 0}1U=E[1a];if(1U){aJ+=1U-0;if(E==2h){3f}}E=E.1L}C aJ};z.fQ=B(){A 2h=z.3E();A 3g=z.1W;A de=z.1e.5K;C{y:(3g.lK||de.5G||2h.5G||0),x:(3g.lJ||z.aH(de.5I)||2h.5I||0)}};z.aG=B(){C V z.aI=="1k"?(z.aI=z.3F(z.3E()).lI=="lH"):z.aI};z.aB=B(){A de=z.1e.5K;if(z.1l>=7){C{x:de.aC().2g,y:de.aC().5J}}I{C{x:z.aG()||26.am==26?de.fW:de.6v-de.aF-de.fW,y:de.lG}}};z.aH=B(aE){if(z.1l&&!z.aG()){A de=z.1e.5K;C aE+de.aF-de.lF}C aE};z.fP=B(E,aw){A ay=E.aD;A J={x:0,y:0};A 7w=U;A db=z.3E();if(z.1l){A aA=E.aC();A az=z.aB();J.x=aA.2g-az.x;J.y=aA.5J-az.y}I{if(ay["fV"]){A bo=ay.fV(E);J.x=bo.x-5H(E,"5I");J.y=bo.y-5H(E,"5G")}I{if(E["fR"]){7w=K;A 7x;if(z.3o&&(1E(E).ax=="fU")&&(E.1L==db)){7x=db}I{7x=db.1L}if(E.1L!=db){A nd=E;if(z.2M){nd=db}J.x-=5H(nd,"5I");J.y-=5H(nd,"5G")}A 4f=E;do{A n=4f["fT"];if(!z.2M||n>0){J.x+=2L(n)?0:n}A m=4f["fS"];J.y+=2L(m)?0:m;4f=4f.fR}1s((4f!=7x)&&4f)}I{if(E["x"]&&E["y"]){J.x+=2L(E.x)?0:E.x;J.y+=2L(E.y)?0:E.y}}}}if(7w||aw){A av=z.fQ();A m=7w?(!aw?-1:0):1;J.y+=m*av.y;J.x+=m*av.x}C J};z.af=B(E,fO){A n=z.1D(E),s=1E(n),mb=z.au(n,s);A at=z.fP(n,fO);mb.x=at.x;mb.y=at.y;C mb}})();z.fL=B(E,fN){C((" "+E.3A+" ").T(" "+fN+" ")>=0)};z.7s=B(E,ar){A 7v=E.3A;if((" "+7v+" ").T(" "+ar+" ")<0){E.3A=7v+(7v?" ":"")+ar}};z.7r=B(E,fM){A t=z.7g((" "+E.3A+" ").2f(" "+fM+" "," "));if(E.3A!=t){E.3A=t}};z.lE=B(E,aq,7u){if(V 7u=="1k"){7u=!z.fL(E,aq)}z[7u?"7s":"7r"](E,aq)}}if(!z.1h["z.X.1H"]){z.1h["z.X.1H"]=K;z.1Q("z.X.1H");(B(){A d=z;z.1H=B(){A F=P;if((F.G==1)&&(V F[0]=="4J")){D.G=eK(F[0])}I{if(F.G){d.1n(F,B(i){D.Y(i)},D)}}};z.1H.1C=S 4e;if(d.1l){A fK=B(al){C("A a2 = am."+al+"; "+"A ap = 4e.1C; "+"A ao = a2.1C; "+"R(A x in ao){ ap[x] = ao[x]; } "+"am."+al+" = 4e; ")};A fI=fK("z.1H");A aj=26.lD();aj.1q.fJ("<ak>"+fI+"</ak>");aj.lC(1,1,1,1)}z.4M(z.1H,{T:B(fH,fG){C d.T(D,fH,fG)},31:B(lB,lA){A aa=d.4d(P);aa.ae(D);C d.31.14(d,aa)},ah:B(fF,fE){C d.ah(D,fF,fE)},ag:B(fD,fC){C d.ag(D,fD,fC)},1n:B(fB,fA){d.1n(D,fB,fA);C D},23:B(7t,M){C d.23(D,7t,M,d.1H)},af:B(){C d.23(D,d.af)},1c:B(lz,ly){A aa=d.4d(P);aa.ae(D[0]);A s=d.1c.14(d,aa);C(P.G>1)?D:s},lx:B(lw,lv){A aa=d.4d(P);aa.ae(L);A s=D.23(B(i){aa[0]=i;C d.1c.14(d,aa)});C(P.G>1)?D:s},7s:B(fz){C D.1n(B(i){z.7s(i,fz)})},7r:B(fy){C D.1n(B(i){z.7r(i,fy)})},5E:B(fw,7q){A 1m=d.1r(fw)[0];7q=7q||"72";R(A x=0;x<D.G;x++){d.5E(D[x],1m,7q)}C D},2c:B(fv,fu,ft){D.1n(B(1m){d.2c(1m,fv,fu,ft)});C D},lu:B(ad){A ac=(ad)?d.9t(D,ad):D;ac.1n(B(1m){if(1m["1L"]){1m.1L.fs(1m)}});C ac},lt:B(fr,fq){A 1m=D[0];C d.1r(fr).1n(B(ai){d.5E(ai,1m,(fq||"72"))})},1r:B(7p){7p=7p||"";A J=S d.1H();D.1n(B(1m){d.1r(7p,1m).1n(B(ab){if(V ab!="1k"){J.Y(ab)}})});C J},3T:B(fo){A 5F=D;A 1V=P;A r=S d.1H();A rp=B(t){if(V t!="1k"){r.Y(t)}};if(d.1R(fo)){5F=d.9t(D,1V[0]);if(1V.G==1){C 5F}d.1n(d.3T(5F,1V[1],1V[2]),rp);C r}d.1n(d.3T(5F,1V[0],1V[1]),rp);C r},lr:B(7o,7n){A 1S=d.1e.a9("lq");if(d.1R(7o)){1S.9L=7o}I{1S.4c(7o)}A ct=((7n=="9M")||(7n=="a8"))?"fm":"5A";D.1n(B(1m){A 24=1S.a7(K);1s(24[ct]){d.5E(24[ct],1m,7n)}});C D},7m:B(fl,F){A a5=[];F=F||{};D.1n(B(1m){A a6={E:1m};d.1x(a6,F);a5.Y(d[fl](a6))});C d.fx.lp(a5)},8I:B(F){C D.7m("8I",F)},8H:B(F){C D.7m("8H",F)},6y:B(F){C D.7m("6y",F)}});z.1n(["fk","lo","fj","fi","ln","lm","ll","fi","lk","lj","4b"],B(H){A a4="on"+H;z.1H.1C[a4]=B(a,b){C D.2c(a4,a,b)}})})()}if(!z.1h["z.X.1r"]){z.1h["z.X.1r"]=K;z.1Q("z.X.1r");(B(){A d=z;A 2I=B(q){C[q.T("#"),q.T("."),q.T("["),q.T(":")]};A a0=B(a3,fh){A ql=a3.G;A i=2I(a3);A 1d=ql;R(A x=fh;x<i.G;x++){if(i[x]>=0){if(i[x]<1d){1d=i[x]}}}C(1d<0)?ql:1d};A 6X=B(7l){A i=2I(7l);if(i[0]!=-1){C 7l.21(i[0]+1,a0(7l,1))}I{C""}};A 5r=B(7k){A 5D;A i=2I(7k);if((i[0]==0)||(i[1]==0)){5D=0}I{5D=a0(7k,0)}C((5D>0)?7k.3b(0,5D).1M():"*")};A fg=B(Q){A J=-1;R(A x=0;x<Q.G;x++){A 1S=Q[x];if(1S>=0){if((1S>J)||(J==-1)){J=1S}}}C J};A 9H=B(7i){A i=2I(7i);if(-1==i[1]){C""}A di=i[1]+1;A 7j=fg(i.2w(2));if(di<7j){C 7i.21(di,7j)}I{if(-1==7j){C 7i.3b(di)}I{C""}}};A f3=[{1i:"|=",1f:B(15,fe){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fe+"-\')]"}},{1i:"~=",1f:B(15,fd){C"[5z(3U(\' \',@"+15+",\' \'), \' "+fd+" \')]"}},{1i:"^=",1f:B(15,fb){C"[li-4G(@"+15+", \'"+fb+"\')]"}},{1i:"*=",1f:B(15,fa){C"[5z(@"+15+", \'"+fa+"\')]"}},{1i:"$=",1f:B(15,9Z){C"[21(@"+15+", 3c-G(@"+15+")-"+(9Z.G-1)+")=\'"+9Z+"\']"}},{1i:"!=",1f:B(15,f9){C"[3O(@"+15+"=\'"+f9+"\')]"}},{1i:"=",1f:B(15,f8){C"[@"+15+"=\'"+f8+"\']"}}];A 9C=B(9Y,3Z,f7,f6){A 49;A i=2I(3Z);if(i[2]>=0){A 4L=3Z.T("]",i[2]);A 29=3Z.21(i[2]+1,4L);1s(29&&29.G){if(29.2s(0)=="@"){29=29.2w(1)}49=L;R(A x=0;x<9Y.G;x++){A 1S=9Y[x];A 7h=29.T(1S.1i);if(7h>=0){A 15=29.21(0,7h);A 4a=29.21(7h+1S.1i.G);if((4a.2s(0)=="\\"")||(4a.2s(0)=="\'")){4a=4a.21(1,4a.G-1)}49=1S.1f(d.7g(15),d.7g(4a));3f}}if((!49)&&(29.G)){49=f7(29)}if(49){f6(49)}29=L;A 7f=3Z.T("[",4L);if(0<=7f){4L=3Z.T("]",7f);if(0<=4L){29=3Z.21(7f+1,4L)}}}}};A f0=B(f5){A 4K=".";A 7e=f5.1A(" ");1s(7e.G){A 2K=7e.3a();A 7d;if(2K==">"){7d="/";2K=7e.3a()}I{7d="//"}A f4=5r(2K);4K+=7d+f4;A id=6X(2K);if(id.G){4K+="[@id=\'"+id+"\'][1]"}A cn=9H(2K);if(cn.G){A 9X=" ";if(cn.2s(cn.G-1)=="*"){9X="";cn=cn.3b(0,cn.G-1)}4K+="[5z(3U(\' \',@9P,\' \'), \' "+cn+9X+"\')]"}9C(f3,2K,B(f2){C"[@"+f2+"]"},B(f1){4K+=f1})}C 4K};A 7a={};A eC=B(28){if(7a[28]){C 7a[28]}A 1e=d.1e;A 9W=f0(28);A 4H=B(9V){A J=[];A 7b;1u{7b=1e.9x(9W,9V,L,lh.lg,L)}1y(e){1z.1K("lf in le:",9W,"lc:",9V);1z.1K(e)}A 7c=7b.eZ();1s(7c){J.Y(7c);7c=7b.eZ()}C J};C 7a[28]=4H};A 5x={};A 9B={};A 3y=B(79,78){if(!79){C 78}if(!78){C 79}C B(){C 79.14(26,P)&&78.14(26,P)}};A 75=B(9U,3Y,5B,2J){A 2v=2J+1;A 76=(3Y.G==2v);A 2K=3Y[2J];if(2K==">"){A 77=9U.3W;if(!77.G){C}2v++;76=(3Y.G==2v);A 4H=6O(3Y[2J+1]);R(A x=0,11;x<77.G,11=77[x];x++){if(4H(11)){if(76){5B.Y(11)}I{75(11,3Y,5B,2v)}}}}A 5C=6U(2K)(9U);if(76){1s(5C.G){5B.Y(5C.3a())}}I{1s(5C.G){75(5C.3a(),3Y,5B,2v)}}};A eE=B(9T,eY){A J=[];A x=9T.G-1,11;1s(11=9T[x--]){75(11,eY,J,0)}C J};A 6O=B(3D){if(5x[3D]){C 5x[3D]}A ff=L;A 9S=5r(3D);if(9S!="*"){ff=3y(ff,B(N){C((N.2t==1)&&(9S==N.5w.1M()))})}A 9R=6X(3D);if(9R.G){ff=3y(ff,B(N){C((N.2t==1)&&(N.id==9R))})}if(2Y.5q.14(D,2I(3D).2w(1))>=0){ff=3y(ff,9z(3D))}C 5x[3D]=ff};A 5y=B(E){A pn=E.1L;A 9Q=pn.3W;A 2v=-1;A 3C=pn.5A;if(!3C){C 2v}A ci=E["eW"];A cl=pn["eX"];if(((V cl=="4J")&&(cl!=9Q.G))||(V ci!="4J")){pn["eX"]=9Q.G;A 2J=1;do{if(3C===E){2v=2J}if(3C.2t==1){3C["eW"]=2J;2J++}3C=3C.71}1s(3C)}I{2v=ci}C 2v};A lb=0;A 3X=B(N,15){A 74="";if(15=="9P"){C N.3A||74}if(15=="R"){C N.la||74}C N.5t(15,2)||74};A eH=[{1i:"|=",1f:B(15,9O){A eV=" "+9O+"-";C B(N){A ea=" "+(N.5t(15,2)||"");C((ea==9O)||(ea.T(eV)==0))}}},{1i:"^=",1f:B(15,eU){C B(N){C(3X(N,15).T(eU)==0)}}},{1i:"*=",1f:B(15,eT){C B(N){C(3X(N,15).T(eT)>=0)}}},{1i:"~=",1f:B(15,eS){A 9N=" "+eS+" ";C B(N){A ea=" "+3X(N,15)+" ";C(ea.T(9N)>=0)}}},{1i:"$=",1f:B(15,73){A 9N=" "+73;C B(N){A ea=" "+3X(N,15);C(ea.31(73)==(ea.G-73.G))}}},{1i:"!=",1f:B(15,eR){C B(N){C(3X(N,15)!=eR)}}},{1i:"=",1f:B(15,eQ){C B(N){C(3X(N,15)==eQ)}}}];A 9E=[{1i:"9M-9K",1f:B(1p,l9){C B(N){if(N.2t!=1){C U}A fc=N.eP;1s(fc&&(fc.2t!=1)){fc=fc.eP}C(!fc)}}},{1i:"72-9K",1f:B(1p,l8){C B(N){if(N.2t!=1){C U}A nc=N.71;1s(nc&&(nc.2t!=1)){nc=nc.71}C(!nc)}}},{1i:"l7",1f:B(1p,l6){C B(N){A cn=N.3W;A eO=N.3W.G;R(A x=eO-1;x>=0;x--){A nt=cn[x].2t;if((nt==1)||(nt==3)){C U}}C K}}},{1i:"5z",1f:B(1p,eN){C B(N){C(N.9L.T(eN)>=0)}}},{1i:"3O",1f:B(1p,eM){A eL=6O(eM);C B(N){C(!eL(N))}}},{1i:"l5-9K",1f:B(1p,2u){A pi=eK;if(2u=="l4"){C B(N){C(((5y(N))%2)==1)}}I{if((2u=="2n")||(2u=="l3")){C B(N){C((5y(N)%2)==0)}}I{if(2u.T("l2+")==0){A 70=pi(2u.3b(3));C B(N){C(N.1L.3W[70-1]===N)}}I{if((2u.T("n+")>0)&&(2u.G>3)){A 9J=2u.1A("n+",2);A eJ=pi(9J[0]);A 2J=pi(9J[1]);C B(N){C((5y(N)%eJ)==2J)}}I{if(2u.T("n")==-1){A 70=pi(2u);C B(N){C(5y(N)==70)}}}}}}}}];A 9z=B(3e){A 9I=(9B[3e]||5x[3e]);if(9I){C 9I}A ff=L;A i=2I(3e);if(i[0]>=0){A 24=5r(3e);if(24!="*"){ff=3y(ff,B(N){C(N.5w.1M()==24)})}}A 5u;A 3B=9H(3e);if(3B.G){A 9F=3B.2s(3B.G-1)=="*";if(9F){3B=3B.3b(0,3B.G-1)}A re=S 9G("(?:^|\\\\s)"+3B+(9F?".*":"")+"(?:\\\\s|$)");ff=3y(ff,B(N){C re.6Z(N.3A)})}if(i[3]>=0){A 3z=3e.3b(i[3]+1);A 9D="";A 5v=3z.T("(");A 6Y=3z.31(")");if((0<=5v)&&(0<=6Y)&&(6Y>5v)){9D=3z.21(5v+1,6Y);3z=3z.3b(0,5v)}5u=L;R(A x=0;x<9E.G;x++){A 1S=9E[x];if(1S.1i==3z){5u=1S.1f(3z,9D);3f}}if(5u){ff=3y(ff,5u)}}A eG=(d.1l)?B(5s){A eI=5s.1M();C B(N){C N[5s]||N[eI]}}:B(5s){C B(N){C(N&&N.5t&&N.l1(5s))}};9C(eH,3e,eG,B(eF){ff=3y(ff,eF)});if(!ff){ff=B(){C K}}C 9B[3e]=ff};A 6W={};A 6U=B(3d,1B){A 9A=6W[3d];if(9A){C 9A}A i=2I(3d);A id=6X(3d);if(i[0]==0){C 6W[3d]=B(1B){C[d.1D(id)]}}A 9y=9z(3d);A 5p;if(i[0]>=0){5p=B(1B){A 11=d.1D(id);if(9y(11)){C[11]}}}I{A 3V;A 24=5r(3d);if(2Y.5q.14(D,2I(3d))==-1){5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){J.Y(11)}C J}}I{5p=B(1B){A J=[];A 11,x=0,3V=1B.4I(24);1s(11=3V[x++]){if(9y(11)){J.Y(11)}}C J}}}C 6W[3d]=5p};A l0={};A 5o={">":B(1B){A J=[];A 11,x=0,3V=1B.3W;1s(11=3V[x++]){if(11.2t==1){J.Y(11)}}C J}};A 9w=B(6V){if(0>6V.T(" ")){C 6U(6V)}A eD=B(1B){A 6S=6V.1A(" ");A 6T;if(6S[0]==">"){6T=[1B]}I{6T=6U(6S.3a())(1B)}C eE(6T,6S)};C eD};A 9v=((1q["9x"]&&!d.3o)?B(3x){A 6R=3x.1A(" ");if((1q["9x"])&&(3x.T(":")==-1)&&((K))){if(((6R.G>2)&&(3x.T(">")==-1))||(6R.G>3)||(3x.T("[")>=0)||((1==6R.G)&&(0<=3x.T(".")))){C eC(3x)}}C 9w(3x)}:9w);A ey=B(3w){if(5o[3w]){C 5o[3w]}if(0>3w.T(",")){C 5o[3w]=9v(3w)}I{A eB=3w.1A(/\\s*,\\s*/);A 4H=B(1B){A eA=0;A J=[];A 6Q;1s(6Q=eB[eA++]){J=J.3U(9v(6Q,6Q.T(" "))(1B))}C J};C 5o[3w]=4H}};A 5n=0;A ez=B(Q){A J=S d.1H();if(!Q){C J}if(Q[0]){J.Y(Q[0])}if(Q.G<2){C J}5n++;Q[0]["9u"]=5n;R(A x=1,11;11=Q[x];x++){if(Q[x]["9u"]!=5n){J.Y(11)}11["9u"]=5n}C J};d.1r=B(6P,1B){if(V 6P!="3c"){C S d.1H(6P)}if(V 1B=="3c"){1B=d.1D(1B)}C ez(ey(6P)(1B||d.1e))};d.9t=B(ex,9s){A 9r=S d.1H();A ff=(9s)?6O(9s):B(){C K};R(A x=0,11;11=ex[x];x++){if(ff(11)){9r.Y(11)}}C 9r}})()}if(!z.1h["z.X.1b"]){z.1h["z.X.1b"]=K;z.1Q("z.X.1b");z.6K=B(ew){A J={};A iq="kZ[Z!=9q][Z!=kY][Z!=et][Z!=kX][Z!=kW], kV, kU";z.1r(iq,ew).3T(B(E){C(!E.kT)}).1n(B(1m){A 3v=1m.1p;A Z=(1m.Z||"").1M();if((Z=="kS")||(Z=="kR")){if(1m.kQ){J[3v]=1m.1Z}}I{if(1m.kP){A ev=J[3v]=[];z.1r("kO[kN]",1m).1n(B(eu){ev.Y(eu.1Z)})}I{J[3v]=1m.1Z;if(Z=="et"){J[3v+".x"]=J[3v+".y"]=J[3v].x=J[3v].y=0}}}});C J};z.9h=B(23){A ec=kM;A J="";A es={};R(A x in 23){if(23[x]!=es[x]){if(z.2l(23[x])){R(A y=0;y<23[x].G;y++){J+=ec(x)+"="+ec(23[x][y])+"&"}}I{J+=ec(x)+"="+ec(23[x])+"&"}}}if((J.G)&&(J.2s(J.G-1)=="&")){J=J.3b(0,J.G-1)}C J};z.kL=B(er){C z.9h(z.6K(er))};z.kK=B(ep){C z.eq(z.6K(ep))};z.kJ=B(2H){A J={};A qp=2H.1A("&");A dc=kI;z.1n(qp,B(1m){if(1m.G){A 9p=1m.1A("=");A 1p=dc(9p.3a());A 1U=dc(9p.22("="));if(z.1R(J[1p])){J[1p]=[J[1p]]}if(z.2l(J[1p])){J[1p].Y(1U)}I{J[1p]=1U}}});C J};z.e1=U;z.e6={"9g":B(1b){C 1b.2G},"2e":B(1b){if(!1o.eo){1z.1K("kH kG kF a kE of 9g/2e-6M-9m"+" 4F kD kC kB kA 4G en kz"+" (ky 1o.eo=K 4F kx kw D kv)")}C z.5m(1b.2G)},"2e-6M-ku":B(1b){A 6N=1b.2G;A 9o=6N.T("/*");A 9n=6N.31("*/");if((9o==-1)||(9n==-1)){C z.5m(1b.2G)}C z.5m(6N.21(9o+2,9n))},"2e-6M-9m":B(1b){A 6L=1b.2G;A 9l=6L.T("/*");A 9k=6L.31("*/");if((9l==-1)||(9k==-1)){1z.1K("kt en ks\'t 6M 9m!");C""}C z.5m(6L.21(9l+2,9k))},"kr":B(1b){C z.3u(1b.2G)},"kq":B(1b){if(z.1l&&!1b.el){z.1n(["ko","em","kn","km"],B(i){1u{A 1e=S 9j(kl[i]+".kk");1e.kj=U;1e.ki(1b.2G);C 1e}1y(e){}})}I{C 1b.el}}};(B(){z.e5=B(F,ej,ei,eh){A 2F={};2F.F=F;A 6J=L;if(F.3R){A 3R=z.1D(F.3R);A 9i=3R.kh("kg");2F.2E=F.2E||(9i?9i.1Z:L);6J=z.6K(3R)}I{2F.2E=F.2E}A 5l=[{}];if(6J){5l.Y(6J)}if(F.5g){5l.Y(F.5g)}if(F.ek){5l.Y({"z.ek":S 5d().8O()})}2F.1r=z.9h(z.1x.14(L,5l));2F.9d=F.9d||"9g";A d=S z.30(ej);d.5k(ei,B(eg){C eh(eg,d)});A ld=F.4E;if(ld&&z.1Y(ld)){d.ef(B(ee){C ld.2d(F,ee,2F)})}A 1G=F.9f;if(1G&&z.1Y(1G)){d.ed(B(e9){C 1G.2d(F,e9,2F)})}A 6I=F.kf;if(6I&&z.1Y(6I)){d.9e(B(e8){C 6I.2d(F,e8,2F)})}d.1F=2F;C d};A e4=B(O){O.e0=K;A 1b=O.1F.1b;if(V 1b.e7=="B"){1b.e7()}};A e3=B(O){C z.e6[O.1F.9d](O.1F.1b)};A e2=B(9c,O){1z.1K(9c);C 9c};A 3Q=B(F){A O=z.e5(F,e4,e3,e2);O.1F.1b=z.9b(O.1F.F);C O};A 5j=L;A 3t=[];A 94=B(){A dZ=(S 5d()).dU();if(!z.e1){z.1n(3t,B(4D,6H){if(!4D){C}A O=4D.O;1u{if(!O||O.e0||!4D.dT(O)){3t.3S(6H,1);C}if(4D.dR(O)){3t.3S(6H,1);4D.dP(O)}I{if(O.9a){if(O.9a+(O.1F.F.6G||0)<dZ){3t.3S(6H,1);A 1G=S 1O("6G ke");1G.dY="6G";O.5i(1G);O.4C()}}}}1y(e){1z.1K(e);O.5i(S 1O("kc!"))}})}if(!3t.G){dX(5j);5j=L;C}};z.dV=B(){1u{z.1n(3t,B(i){i.O.4C()})}1y(e){}};if(z.1l){z.dW(z.dV)}z.dH=B(O,dS,dQ,dO){if(O.1F.F.6G){O.9a=(S 5d()).dU()}3t.Y({O:O,dT:dS,dR:dQ,dP:dO});if(!5j){5j=dN(94,50)}94()};A dJ="8Z/x-kb-3R-ka";A dG=B(O){C O.1F.1b.6F};A dF=B(O){C 4==O.1F.1b.6F};A dE=B(O){if(z.8Y(O.1F.1b)){O.dM(O)}I{O.5i(S 1O("k9 k8 k7 5h:"+O.1F.1b.3N))}};A 3P=B(Z,O){A 3s=O.1F;A F=3s.F;3s.1b.dL(Z,3s.2E,(F.k6!==K),(F.8X?F.8X:1k),(F.8W?F.8W:1k));if(F.6E){R(A 5f in F.6E){if(5f.1M()==="5g-Z"&&!F.8V){F.8V=F.6E[5f]}I{3s.1b.dK(5f,F.6E[5f])}}}3s.1b.dK("k5-k4",(F.8V||dJ));1u{3s.1b.dI(3s.1r)}1y(e){O.4C()}z.dH(O,dG,dF,dE);C O};z.8T=B(4B){if(4B.1r.G){4B.2E+=(4B.2E.T("?")==-1?"?":"&")+4B.1r;4B.1r=L}};z.k3=B(F){A O=3Q(F);z.8T(O.1F);C 3P("dD",O)};z.k2=B(F){C 3P("dC",3Q(F))};z.k1=B(F){A O=3Q(F);O.1F.1r=F.k0;C 3P("dC",O)};z.jZ=B(F){C 3P("dA",3Q(F))};z.jY=B(F){A O=3Q(F);A dB=O.1F;if(F["8U"]){dB.1r=F.8U;F.8U=L}C 3P("dA",O)};z.jX=B(F){A O=3Q(F);z.8T(O.1F);C 3P("8S",O)};z.dz=B(jW){2m S 1O("z.dz 3O jV jU")}})()}if(!z.1h["z.X.fx"]){z.1h["z.X.fx"]=K;z.1Q("z.X.fx");z.dx=B(dy,1d){D.1w=dy;D.1d=1d;D.4x=B(n){C((D.1d-D.1w)*n)+D.1w}};z.2r("z.d6",L,{1P:B(F){z.1x(D,F);if(z.2l(D.2C)){D.2C=S z.dx(D.2C[0],D.2C[1])}},2C:L,8Q:jT,5a:L,4z:0,dj:10,du:L,6x:L,dt:L,8B:L,dh:L,ds:L,dr:L,dm:L,2D:U,2Z:U,4A:L,8N:L,3r:L,2o:0,4y:0,3q:B(H,F){if(D[H]){D[H].14(D,F||[])}C D},5b:B(dw,8R){if(8R){5e(D.3r);D.2D=D.2Z=U;D.2o=0}I{if(D.2D&&!D.2Z){C D}}D.3q("6x");A d=dw||D.du;if(d>0){5c(z.2p(D,B(){D.5b(L,8R)}),d);C D}D.4A=S 5d().8O();if(D.2Z){D.4A-=D.8Q*D.2o}D.8N=D.4A+D.8Q;D.2D=K;D.2Z=U;A 8P=D.2C.4x(D.2o);if(!D.2o){if(!D.4y){D.4y=D.4z}D.3q("dt",[8P])}D.3q("ds",[8P]);D.8M();C D},jS:B(){5e(D.3r);if(!D.2D){C D}D.2Z=K;D.3q("dr",[D.2C.4x(D.2o)]);C D},jR:B(dq,dp){5e(D.3r);D.2D=D.2Z=K;D.2o=dq*6D;if(dp){D.5b()}C D},jQ:B(dn){if(!D.3r){C}5e(D.3r);if(dn){D.2o=1}D.3q("dm",[D.2C.4x(D.2o)]);D.2D=D.2Z=U;C D},3N:B(){if(D.2D){C D.2Z?"3M":"jP"}C"jO"},8M:B(){5e(D.3r);if(D.2D){A dl=S 5d().8O();A 2q=(dl-D.4A)/(D.8N-D.4A);if(2q>=1){2q=1}D.2o=2q;if(D.5a){2q=D.5a(2q)}D.3q("8B",[D.2C.4x(2q)]);if(2q<1){D.3r=5c(z.2p(D,"8M"),D.dj)}I{D.2D=U;if(D.4z>0){D.4z--;D.5b(L,K)}I{if(D.4z==-1){D.5b(L,K)}I{if(D.4y){D.4z=D.4y;D.4y=0}}}D.2o=0;D.3q("dh")}}C D}});(B(){A df=B(E){if(z.1l){A ns=E.1c;if(!ns.8L.G&&z.1c(E,"8L")=="dg"){ns.8L="1"}if(!ns.3n.G&&z.1c(E,"3n")=="8K"){ns.3n="8K"}}};z.6C=B(F){if(V F.1d=="1k"){2m S 1O("z.6C jN an 1d 1Z")}F.E=z.1D(F.E);A 3p=z.1x({6w:{}},F);A 8J=(3p.6w.2W={});8J.1w=(V 3p.1w=="1k")?B(){C 2V(z.1c(3p.E,"2W"))}:3p.1w;8J.1d=3p.1d;A 2U=z.6y(3p);z.2c(2U,"6x",L,B(){df(3p.E)});C 2U};z.8I=B(F){C z.6C(z.1x({1d:1},F))};z.8H=B(F){C z.6C(z.1x({1d:0},F))};if(z.6B&&!z.3o){z.8E=B(n){C 2k("0.5")+((2Y.da((n+2k("1.5"))*2Y.d9))/2)}}I{z.8E=B(n){C 0.5+((2Y.da((n+1.5)*2Y.d9))/2)}}A d4=B(6A){D.8G=6A;R(A p in 6A){A 1a=6A[p];if(1a.1w 1N z.1J){1a.d7=S z.1J()}}D.4x=B(r){A J={};R(A p in D.8G){A 1a=D.8G[p];A 6z=L;if(1a.1w 1N z.1J){6z=z.d8(1a.1w,1a.1d,r,1a.d7).8F()}I{if(!z.2l(1a.1w)){6z=((1a.1d-1a.1w)*r)+1a.1w+(p!="2W"?1a.jM||"px":"")}}J[p]=6z}C J}};z.6y=B(F){F.E=z.1D(F.E);if(!F.5a){F.5a=z.8E}A 2U=S z.d6(F);z.2c(2U,"6x",2U,B(){A pm={};R(A p in D.6w){A 1a=pm[p]=z.1x({},D.6w[p]);if(z.1Y(1a.1w)){1a.1w=1a.1w()}if(z.1Y(1a.1d)){1a.1d=1a.1d()}A d5=(p.1M().T("jL")>=0);B 8C(E,p){4w(p){2X"58":C E.8D;2X"3n":C E.6v}A v=z.1c(E,p);C(p=="2W")?2V(v):2k(v)};if(V 1a.1d=="1k"){1a.1d=8C(D.E,p)}I{if(V 1a.1w=="1k"){1a.1w=8C(D.E,p)}}if(d5){1a.1w=S z.1J(1a.1w);1a.1d=S z.1J(1a.1d)}I{1a.1w=(p=="2W")?2V(1a.1w):2k(1a.1w)}}D.2C=S d4(pm)});z.2c(2U,"8B",2U,B(8A){R(A s in 8A){z.1c(D.E,s,8A[s])}});C 2U}})()}', 62, 1711, '|||||||||||||||||||||||||||||||||||dojo|var|function|return|this|node|args|length|evt|else|ret|true|null|obj|elem|dfd|arguments|arr|for|new|indexOf|false|typeof||_base|push|type||te|||apply|attr|||||prop|xhr|style|end|doc|match|uri|_hasResource|key|del|undefined|isIE|item|forEach|djConfig|name|document|query|while|_66|try|res|start|mixin|catch|console|split|root|prototype|byId|gcs|ioArgs|err|NodeList|_p|Color|debug|parentNode|toLowerCase|instanceof|Error|constructor|provide|isString|ta|255|val|_a|global|_69|isFunction|value||substring|join|map|tn||window||path|_343|_220|_listeners|connect|call|json|replace|left|_b|toString|128|parseFloat|isArray|throw||_percent|hitch|step|declare|charAt|nodeType|_3c3|nidx|slice|faux|fired|_c4|_7e|loc|curve|_active|url|_44c|responseText|str|_312|idx|tqp|isNaN|isOpera|_22d|callee|add|_18b|_f8|_e2|_41|anim|Number|opacity|case|Math|_paused|Deferred|lastIndexOf|||||||||shift|substr|string|_3e7|_3ce|break|_w|charCode|_listener|_d5|_c5|authority|_49|width|isSafari|_49e|fire|_timer|_47b|_465|eval|_in|_40c|_409|_362|_3d9|className|_3d5|_386|_37a|body|getComputedStyle|box|_221|keyCode|remove|_8d|_46|paused|status|not|_478|_461|form|splice|filter|concat|tret|childNodes|_38b|_367|_33d||||||||||_340|_348|keypress|appendChild|_toArray|Array|_2b0|_toPixelValue|ref|_fixEvent|_19f|_14c|_14a|_150|_141|declaredClass|_d4|_99|_Url|_83|scheme|_67|_3d|switch|getValue|_startRepeatCount|repeat|_startTime|_47e|cancel|tif|load|to|with|tf|getElementsByTagName|number|_34c|_342|extend|_1e3|_normalizeEventName|_14b|_14e|results|self|cbfn|_f9|_d8|_b2|src|_88|dav||baseUrl|fragment|_loadedModules|_44|_43|_loaders|mll|height||easing|play|setTimeout|Date|clearTimeout|hdr|content|code|errback|_464|addCallbacks|_450|fromJson|_413|_3fc|_3ee|max|_31e|cond|getAttribute|_3d4|obi|tagName|_360|_381|contains|firstChild|_368|_372|_320|place|_2fa|scrollTop|_299|scrollLeft|top|documentElement|_288|_287|_getBorderExtents|_23f|_23d|_239|_218|_216|_211|eles|target|keys|shiftKey|ctrlKey|event|192|iel|_1db|delete|_1cf||addEventListener|String|_1af|_157|array|_14d|continue|_14f|_137|_11f|_106|_findMethod|has|_delegate|_dc|_d3|loaded|_9a|_loadInit|_inFlightCount|getObject|tv|_4f|_postLoad|_2d|offsetWidth|properties|beforeBegin|animateProperty|_4ad|_4a6|isKhtml|_fade|100|headers|readyState|timeout|_469|_457|_44d|formToObject|_441|comment|_43d|_36f|_419|tp|_40a|_406|_407|_373|_403|_3e6|_31b|cbi|test|_3c7|nextSibling|last|_3a1|_38e|_365|_36b|ecn|_364|_363|_356|_35e|_35f|_34f|_34d|_349|trim|tci|_328|_32b|_31f|_31c|_anim|_300|_2ff|_2f5|_2e7|removeClass|addClass|func|_2c4|cls|_2a9|_2ae|_280|_27f|_getPadExtents|isMoz|none|_233|cssText|_214|_fixCallback|_synthesizeEvent|stopPropagation|preventDefault|_setKeyChar|_1e1|ieh|_1d7|_1be|colorFromArray|sanitize|bits|rgb|_156|_fire|_resback|_13d|partial|_13a|silentlyCancelled|_topics|_127|_f1|_f0|superclass|_ec|_e3|mct|setObject|_bf|_b3|object|require|_92|_khtmlTimer|location|XMLHTTP|locale|dua|_71|_modulePrefixes|_55|_loadModule|_51|_50|_4e|pop|_3f|_callLoaded|_unloaders|_loadNotifying|_loadedUrls|_27|_24|_1d|_5|_4b7|onAnimate|getStyle|offsetHeight|_defaultEasing|toCss|_properties|fadeOut|fadeIn|_49f|auto|zoom|_cycle|_endTime|valueOf|_494|duration|_492|DELETE|_ioAddQueryToUrl|putData|contentType|password|user|_isDocumentOk|application|||||_466||||||startTime|_xhrObj|_45f|handleAs|addBoth|error|text|objectToQuery|_44f|ActiveXObject|_443|_442|filtered|_43f|_43e|_437|file|tnl|_41c|_filterQueryResult|_zipIdx|_408|_402|evaluate|_3ed|_380|fHit|_361|_33b|_3da|_3ab|_3d6|RegExp|_327|_3cf|_3c9|child|innerHTML|first|tval|_391|class|pnc|_37e|_37c|_375|_366|_35c|_35a|_353|_33c|_336|_314|||_315|_oe|_307|_309|cloneNode|after|createElement||_2f8|_2ef|_2ee|unshift|coords|some|every||_2cb|script|_2c9|parent||a2p||_2c3|_2bd||abs|_getMarginBox|_2b3|_2a6|position|_2a7|_2ac|_2ab|_getIeDocumentElementOffset|getBoundingClientRect|ownerDocument|_2a3|clientWidth|_isBodyLtr|_fixIeBiDiScrollLeft|_bodyLtr|_29d|_getContentBox|_setBox|_getMarginExtents|_getPadBorderExtents|_usesBorderBox|boxModel|pcs|st|sl|_240|runtimeStyle|_dcm|BackCompat|compatMode|default|_21b|_d|html|_event_listener|handlers|PAGE_DOWN|PAGE_UP|RIGHT_ARROW|LEFT_ARROW|DOWN_ARROW|UP_ARROW|_preventDefault||_stopPropagation|returnValue||_trySetKeyCode|cancelBubble|currentTarget|106|_1ee|111||_1e8|_1e7|||se|srcElement|onkeydown||_1d0|_disconnect|lid|_1c0|_connect|_set|_195|_185|_183|_17d|_everyOrSome|_16b|_172|_15b|Function|_154|_escapeString|_140|chain|_check|canceller|_12d|_124|_11a|_10d|_107|inherited|_fa|_f2|_findMixin|_constructor|preamble|_de|clone|tmp|_c7|TMP|_be|_ba|_mixin|isBrowser|lang|firebug||param|modulePaths|_a7|_fireCallback|_a0|setContext||_9c|unloaded||||_96|_93|navigator|_90|_89||protocol|_84|_86|_XMLHTTP_PROGIDS|gears|google|setAttribute|_80|_77|cfg|_6f|_getModuleSymbols|_5a|_58|_53|_4d|_4c|_45|_40|_moduleHasPrefix|_loadUri|_28|_26|_21|_22|tests|doh|_20|_1f|_1c|version|_1b|_19|_getProp|_11|_4|_4a5|_4b3|_Animation|tempColor|blendColors|PI|sin|||||_49a|normal|onEnd||rate||curr|onStop|_497||_496|pct|onPause|onPlay|onBegin|delay||_491|_Line|_48b|wrapForm|PUT|_487|POST|GET|_476|_474|_472|_ioWatch|send|_471|setRequestHeader|open|callback|setInterval|_470|resHandle|_46f|ioCheck|_46e|validCheck|getTime|_ioCancelAll|addOnUnload|clearInterval|dojoType|now|canceled|_blockAsync|_45e|_45c|_459|_ioSetArgs|_contentHandlers|abort|_458|_456||||addErrback|_454|addCallback|_452|_44b|_44a|_449|preventCache|responseXML|Microsoft|JSON|usePlainJson|_431|toJson|_430|_42d|image|opt|ria|_421|_41b|_40b|_zip|_410|_40d|_357|sqf|_374|_3e5|_3df|_38f|clc|pred|parseInt|ntf|_3bf|_3bc|cnl|previousSibling|_3a9|_3a6|_39c|_399|_396|_392|__cachedIndex|__cachedLength|_376|iterateNext|_34a|_355|_354|_32c|_350|_34b|_33f|_33e|_33a|_338|_334|_332||_330|_32e||_322|_316|mousemove|mouseout|mouseover|_305|lastChild||_2f9||_2f2|_2f1|removeChild|_2ec|_2eb|_2ea|_2e6||_2e4|_2e2|_2d6|_2d5|_2d4|_2d3|_2d2|_2d1|_2cd|_2cc|scs|write|_2c8|hasClass|_2c0|_2bb|_2b5|_abs|_docScroll|offsetParent|offsetTop|offsetLeft|absolute|getBoxObjectFor|clientLeft|_setContentSize|_setMarginBox|_28d|_286|_285|_289|NaN|_281|border|_272|_26b|_260|_258|_253|_24c|_246|_23a|_getOpacity|_setOpacity|_238|td|tr|nodeName|FILTER|_22f|_22e|currentStyle|_22c|_22b|display|QuirksMode|unselectable|_217|isMozilla|getElementById|attributes|all|_ie_listener|_getIeDispatcher|_1fd|NUM_LOCK|SCROLL_LOCK|INSERT|END|HOME|PAUSE|F12|F11|F10|F9|F8|F7|F6|F5|F4|F3|F2|F1|63232|SHIFT_TAB|TAB|keyIdentifier|_1f3|stopEvent|_punctMap|222|219|186|onkeypress|_stealthKeyDown|_fixKeys|relatedTarget|_1e0|_1df|_stealthKeydown|_1d6|_1d5|_1d1|_1ca|_1c9|_1cb|_1c2|_1c1|_1c3|_1c4|_1bc|_1b3|_1b2|colorFromHex|colorFromRgb|named|colorFromString|mask|rgba|_19c|_197|_192|setColor|_180|_178|_177|_175|_174|_16d|_166|_164|_163|_162|_15c|_15d|_15e|index|__json__|toJsonIndentStr|_nextId|_12f|_12b|publish|_128|_126|_125|_122|_121|_123|_11c|_11b|_10c|_10b|_108|getDispatcher|argument|nom|_construct|_core|_makeCtor|_df|_db|deprecated|isObject|_cc||scope||_hitchArgs|_c2||pre|_c1|native|isDebug||registerModulePath|_a8||finally|||_a6|_a5|_a4|_a3|_a2|_a1|_9f|_9e|_9d|_9b|_98|_97|onbeforeunload|ipt|scr|complete|_95|userAgent|_modulesLoaded|initialized|_initFired|_8c|_8a|_getText|_87|ieForceActiveXXhr|Msxml2|isGears|_81|_gearsObject|googlegears|GearsFactory|isFF|_7d|Safari|_72|_name|_6c|ire|ore|_68|i18n|_5b|requireIf|_56|_52|loading|_4a|_loadPath|_47|_48|_global_omit_module_check|_getModulePrefix|_3c|_3a|_37|_30|Boolean|_loadUriAndCheck|_2e||cacheBust|_1e|_1a|_17|_16|_15|_14|_f|_10|_e|_9|_8|revision|flag|patch|minor|major|_6|color|units|needs|stopped|playing|stop|gotoPercent|pause|1000|implemented|yet|_48a|xhrDelete|rawXhrPut|xhrPut|postData|rawXhrPost|xhrPost|xhrGet|Type|Content|sync|response|http|bad|urlencoded|www|_watchInFlightError||exceeded|handle|action|getAttributeNode|loadXML|async|XMLDOM|prefixes|MSXML3|MSXML|MSXML2||xml|javascript|wasn|your|optional|message|off|turn|use|endpoints|issues|security|potential|avoid|mimetype|using|consider|please|decodeURIComponent|queryToObject|formToJson|formToQuery|encodeURIComponent|selected|option|multiple|checked|checkbox|radio|disabled|textarea|select|button|reset|submit|input|_3fb|hasAttribute|0n|even|odd|nth|_3b5|empty|_3b1|_3ad|htmlFor|_38a|under||exprssion|failure|ANY_TYPE|XPathResult|starts|keyup|keydown|mouseup|mousedown|blur|click|combine|span|addContent||adopt|orphan|_2de|_2dd|styles|_2da|_2d9|_2cf|_2ce|show|createPopup|toggleClass|scrollWidth|clientTop|ltr|direction|pageXOffset|pageYOffset|fixed|contentBox|marginBox|BUTTON|TABLE|_getBorderBox|clientHeight|visible|overflow|marginBottom|marginRight|marginTop|marginLeft|borderBottomWidth|borderBottomStyle|borderRightWidth|borderRightStyle|borderTopWidth|borderTopStyle|borderLeftWidth|borderLeftStyle|paddingBottom|paddingRight|paddingTop|paddingLeft|offset||min|padding||margin|Opacity|Alpha|alpha|filters|pixelLeft|medium|_22a|defaultView|before||insertBefore|KhtmlUserSelect|MozUserSelect|setSelectable|isDescendant|div|_destroyElement|BackgroundImageCache|execCommand|PageDown|PageUp|Right|Left|Down|Up|63289|63249|63248|PRINT_SCREEN|63302|63277|63276|63275|63273|63272|63250|63247|63246|63245|63244|63243|63242|63241|63240|63239|63238|63237|63236|63235|63234|63233|Enter|_1f9|which|_1f6|bubbledKeyCode|221|220||||191|190|189|188|187|toElement|fromElement|clientY|pageY||clientX|pageX|offsetY|||layerY|offsetX|layerX|parentWindow|_nop|_allow_leaks|145|144|126|F15|125|F14|124|F13|123|122|121|120|119|118|117|116|115|114|113|112|NUMPAD_DIVIDE|110|NUMPAD_PERIOD|109|NUMPAD_MINUS|108|NUMPAD_ENTER|107|NUMPAD_PLUS|NUMPAD_MULTIPLY|105|NUMPAD_9|104|NUMPAD_8|103|NUMPAD_7|102|NUMPAD_6|101|NUMPAD_5|NUMPAD_4||NUMPAD_3|NUMPAD_2|NUMPAD_1|NUMPAD_0||SELECT|RIGHT_WINDOW||LEFT_WINDOW||HELP|SPACE|ESCAPE|CAPS_LOCK|ALT|CTRL|SHIFT|ENTER|CLEAR|BACKSPACE|attachEvent|fixEvent|fromCharCode|keyChar|_1b9|removeEventListener|0x|round|toHex|toRgba|toRgb|aqua|teal|blue|navy|yellow|olive|lime|green|fuchsia|purple|red|maroon|white|gray|silver|black|boolean|called|already|Cancelled|connectPublisher|unsubscribe|subscribe|disconnect|_113|_112||_111|_110|||found|was||must|_|module|||required|likely|It|declaration|Mixin|separate|instead|property|initializer||pass|_c9|_bb|_b7|nfunction|isAlien|isFinite|isArrayLike|_firebug|withDoc|withGlobal|_writeIncludes|VML|behavior|addRule|createStyleSheet|vml|com|microsoft|schemas|urn|namespaces|onunload|onreadystatechange|defer|khtml|WebKit|DOMContentLoaded|enableMozDomContentLoaded|domcontentloaded|Unable|base|chrome|1223|304|300|200|available|XMLHttpRequest|_println|language|userLanguage|isQuirks|factory|mimeTypes|Factory|Gears|_7f|MSIE||Firefox|Gecko|Konqueror||Opera|appVersion|xd|browser|moduleUrl|port|host|hostenv|_requireLocalization|_5f|_5e|_5d|_5c|requireLocalization|requireAfterIf|_57|common|platformRequire|defined|symbol|_isXDomain|tried|Could|__package__|packageFileName|_42|useXDomain|flight|still|files|addOnLoad|failed|sourceURL|util|notice|without|change|subject|APIs|EXPERIMENTAL|experimental|removed|will|DEPRECATED|exists|10315|Rev|Mobile|Spidermonkey|Rhino||Browser|delayMozLoadingFix|preventBackButtonFix|libraryScriptUri|baseRelativePath|baseScriptUri|allowQueryConfig|warn|trace|timeEnd||time|profileEnd|profile|log|info|groupEnd|group|dirxml|dir|count|assert'.split('|'), 0, {});
-
-
-/*
-
-Prototype 1.5 rc0
- - Adapted from Ruby on Rails - http://dev.rubyonrails.org/browser/spinoffs/prototype/src
- - By Lunarmedia, 06 August, 2006
- - Available at (and packed with) JavascriptCompressor.com
-
-Please note this version is missing the selector.js component of the full Prototype library. 
-You can get the compressed version of selector at JavascriptCompressor.com
-
-*/
-
-    var decompressedPrototype = function (p, a, c, k, e, d) {
-        e = function (c) {
-            return (c < a ? "" : e(parseInt(c / a))) + ((c = c % a) > 35 ? String.fromCharCode(c + 29) : c.toString(36))
-        };
-        if (!''.replace(/^/, String)) {
-/* BEGIN LOOP */
-            while (c--) {
-                d[e(c)] = k[c] || e(c)
-            }
-/* END LOOP */
-            k = [(function (e) {
-                return d[e]
-            })];
-            e = (function () {
-                return '\\w+'
-            });
-            c = 1
-        };
-/* BEGIN LOOP */
-        while (c--) {
-            if (k[c]) {
-                p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c])
-            }
-        }
-/* END LOOP */
-        return p
-    }('d T={4l:\'1.5.8P\',3E:\'(?:<3G.*?>)((\\n|\\r|.)*?)(?:<\\/3G>)\',2v:7(){},K:7(x){c x}};d 1b={17:7(){c 7(){6.1I.2n(6,N)}}};d 1e=z q();q.u=7(5d,O){G(d 1G 2M O){5d[1G]=O[1G]}c 5d};q.1U=7(U){1j{f(U==1v)c\'1v\';f(U==1L)c\'1L\';c U.1U?U.1U():U.2C()}1s(e){f(e 8R 9l)c\'...\';25 e}};7j.v.1d=7(){d 43=6,23=$A(N),U=23.8S();c 7(){c 43.2n(U,23.3s($A(N)))}};7j.v.8U=7(U){d 43=6;c 7(C){c 43.8V(U,C||1W.C)}};q.u(8Q.v,{8W:7(){d 4Z=6.2C(16);f(6<16)c\'0\'+4Z;c 4Z},5j:7(){c 6+1},8Y:7(o){$R(0,6,11).V(o);c 6}});d 6s={6j:7(){d 48;G(d i=0;i<N.t;i++){d 6L=N[i];1j{48=6L();1y}1s(e){}}c 48}};d 6Q=1b.17();6Q.v={1I:7(1a,1J){6.1a=1a;6.1J=1J;6.41=Y;6.2A()},2A:7(){5Z(6.2D.1d(6),6.1J*4z)},2D:7(){f(!6.41){1j{6.41=11;6.1a()}8Z{6.41=Y}}}};q.u(4b.v,{2T:7(1A,1z){d L=\'\',O=6,I;1z=N.90.52(1z);1H(O.t>0){f(I=O.I(1A)){L+=O.47(0,I.w);L+=(1z(I)||\'\').2C();O=O.47(I.w+I[0].t)}1D{L+=O,O=\'\'}}c L},92:7(1A,1z,3i){1z=6.2T.52(1z);3i=3i===1v?1:3i;c 6.2T(1A,7(I){f(--3i<0)c I[0];c 1z(I)})},93:7(1A,o){6.2T(1A,o);c 6},94:7(t,2S){t=t||30;2S=2S===1v?\'...\':2S;c 6.t>t?6.47(0,t-2S.t)+2S:6},9F:7(){c 6.2y(/^\\s+/,\'\').2y(/\\s+$/,\'\')},71:7(){c 6.2y(/<\\/?[^>]+>/7Y,\'\')},2Q:7(){c 6.2y(z 3O(T.3E,\'5P\'),\'\')},70:7(){d 6Y=z 3O(T.3E,\'5P\');d 5p=z 3O(T.3E,\'98\');c(6.I(6Y)||[]).1C(7(5o){c(5o.I(5p)||[\'\',\'\'])[1]})},3q:7(){c 6.70().1C(7(3G){c 4q(3G)})},9E:7(){d 1q=J.4Y(\'1q\');d 1Y=J.9D(6);1q.75(1Y);c 1q.3h},9c:7(){d 1q=J.4Y(\'1q\');1q.3h=6.71();c 1q.2z[0]?1q.2z[0].6q:\'\'},78:7(){d 7i=6.I(/^\\??(.*)$/)[1].3j(\'&\');c 7i.36({},7(5b,72){d 1i=72.3j(\'=\');5b[1i[0]]=1i[1];c 5b})},1Z:7(){c 6.3j(\'\')},3P:7(){d 2l=6.3j(\'-\');f(2l.t==1)c 2l[0];d 54=6.5g(\'-\')==0?2l[0].7e(0).3Y()+2l[0].7g(1):2l[0];G(d i=1,73=2l.t;i<73;i++){d s=2l[i];54+=s.7e(0).3Y()+s.7g(1)}c 54},1U:7(){c"\'"+6.2y(/\\\\/g,\'\\\\\\\\\').2y(/\'/g,\'\\\\\\\'\')+"\'"}});4b.v.2T.52=7(1z){f(2i 1z==\'7\')c 1z;d 2U=z 3n(1z);c 7(I){c 2U.7a(I)}};4b.v.9h=4b.v.78;d 3n=1b.17();3n.79=/(^|.|\\r|\\n)(#\\{(.*?)\\})/;3n.v={1I:7(2U,1A){6.2U=2U.2C();6.1A=1A||3n.79},7a:7(U){c 6.2U.2T(6.1A,7(I){d 53=I[1];f(53==\'\\\\\')c I[2];c 53+(U[I[3]]||\'\').2C()})}};d $1y=z q();d $49=z q();d 1p={V:7(o){d w=0;1j{6.2m(7(h){1j{o(h,w++)}1s(e){f(e!=$49)25 e}})}1s(e){f(e!=$1y)25 e}},9n:7(o){d L=11;6.V(7(h,w){L=L&&!!(o||T.K)(h,w);f(!L)25 $1y});c L},9o:7(o){d L=11;6.V(7(h,w){f(L=!!(o||T.K)(h,w))25 $1y});c L},3e:7(o){d P=[];6.V(7(h,w){P.W(o(h,w))});c P},7n:7(o){d L;6.V(7(h,w){f(o(h,w)){L=h;25 $1y}});c L},7o:7(o){d P=[];6.V(7(h,w){f(o(h,w))P.W(h)});c P},9p:7(1A,o){d P=[];6.V(7(h,w){d 7c=h.2C();f(7c.I(1A))P.W((o||T.K)(h,w))});c P},1M:7(U){d 51=Y;6.V(7(h){f(h==U){51=11;25 $1y}});c 51},36:7(45,o){6.V(7(h,w){45=o(45,h,w)});c 45},9q:7(1F){d 23=$A(N).47(1);c 6.3e(7(h){c h[1F].2n(h,23)})},9s:7(o){d L;6.V(7(h,w){h=(o||T.K)(h,w);f(L==1v||h>=L)L=h});c L},9u:7(o){d L;6.V(7(h,w){h=(o||T.K)(h,w);f(L==1v||h<L)L=h});c L},9v:7(o){d 50=[],58=[];6.V(7(h,w){((o||T.K)(h,w)?50:58).W(h)});c[50,58]},3r:7(1G){d P=[];6.V(7(h,w){P.W(h[1G])});c P},9x:7(o){d P=[];6.V(7(h,w){f(!o(h,w))P.W(h)});c P},9y:7(o){c 6.3e(7(h,w){c{h:h,59:o(h,w)}}).9z(7(18,3U){d a=18.59,b=3U.59;c a<b?-1:a>b?1:0}).3r(\'h\')},1Z:7(){c 6.3e(T.K)},9B:7(){d o=T.K,23=$A(N);f(2i 23.5e()==\'7\')o=23.9C();d 7l=[6].3s(23).1C($A);c 6.1C(7(h,w){c o(7l.3r(w))})},1U:7(){c\'#<1p:\'+6.1Z().1U()+\'>\'}};q.u(1p,{1C:1p.3e,5v:1p.7n,1k:1p.7o,8M:1p.1M,7p:1p.1Z});d $A=1E.7q=7(2R){f(!2R)c[];f(2R.1Z){c 2R.1Z()}1D{d P=[];G(d i=0;i<2R.t;i++)P.W(2R[i]);c P}};q.u(1E.v,1p);f(!1E.v.4d)1E.v.4d=1E.v.4m;q.u(1E.v,{2m:7(o){G(d i=0;i<6.t;i++)o(6[i])},5i:7(){6.t=0;c 6},7r:7(){c 6[0]},5e:7(){c 6[6.t-1]},7s:7(){c 6.1k(7(h){c h!=1v||h!=1L})},6J:7(){c 6.36([],7(6H,h){c 6H.3s(h&&h.5D==1E?h.6J():[h])})},5s:7(){d 4N=$A(N);c 6.1k(7(h){c!4N.1M(h)})},5g:7(U){G(d i=0;i<6.t;i++)f(6[i]==U)c i;c-1},4m:7(5h){c(5h!==Y?6:6.1Z()).4d()},1U:7(){c\'[\'+6.1C(q.1U).1N(\', \')+\']\'}});d 4h={2m:7(o){G(d 1O 2M 6){d h=6[1O];f(2i h==\'7\')49;d 1i=[1O,h];1i.1O=1O;1i.h=h;o(1i)}},7t:7(){c 6.3r(\'1O\')},4N:7(){c 6.3r(\'h\')},7u:7(2N){c $H(2N).36($H(6),7(4Q,1i){4Q[1i.1O]=1i.h;c 4Q})},7w:7(){c 6.1C(7(1i){c 1i.1C(4n).1N(\'=\')}).1N(\'&\')},1U:7(){c\'#<4h:{\'+6.1C(7(1i){c 1i.1C(q.1U).1N(\': \')}).1N(\', \')+\'}>\'}};7 $H(U){d 2N=q.u({},U||{});q.u(2N,1p);q.u(2N,4h);c 2N};3L=1b.17();q.u(3L.v,1p);q.u(3L.v,{1I:7(22,2x,2H){6.22=22;6.2x=2x;6.2H=2H},2m:7(o){d h=6.22;2q{o(h);h=h.5j()}1H(6.1M(h))},1M:7(h){f(h<6.22)c Y;f(6.2H)c h<6.2x;c h<=6.2x}});d $R=7(22,2x,2H){c z 3L(22,2x,2H)};d M={4w:7(){c 6s.6j(7(){c z 5C()},7(){c z 5n(\'7y.6d\')},7(){c z 5n(\'7z.6d\')})||Y},4s:0};M.2W={3b:[],2m:7(o){6.3b.2m(o)},69:7(4F){f(!6.1M(4F))6.3b.W(4F)},7A:7(5t){6.3b=6.3b.5s(5t)},3y:7(1a,26,E,2Z){6.V(7(3o){f(3o[1a]&&2i 3o[1a]==\'7\'){1j{3o[1a].2n(3o,[26,E,2Z])}1s(e){}}})}};q.u(M.2W,1p);M.2W.69({5G:7(){M.4s++},1B:7(){M.4s--}});M.44=7(){};M.44.v={4a:7(m){6.m={1F:\'4j\',4p:11,5H:\'5E/x-86-Q-7C\',28:\'\'};q.u(6.m,m||{})},3l:7(){c 6.E.32==1v||6.E.32==0||(6.E.32>=84&&6.E.32<7E)},7G:7(){c!6.3l()}};M.3t=1b.17();M.3t.5L=[\'7H\',\'80\',\'7I\',\'7J\',\'4t\'];M.3t.v=q.u(z M.44(),{1I:7(1l,m){6.E=M.4w();6.4a(m);6.26(1l)},26:7(1l){d 28=6.m.28||\'\';f(28.t>0)28+=\'&7K=\';1j{6.1l=1l;f(6.m.1F==\'7L\'&&28.t>0)6.1l+=(6.1l.I(/\\?/)?\'&\':\'?\')+28;M.2W.3y(\'5G\',6,6.E);6.E.7N(6.m.1F,6.1l,6.m.4p);f(6.m.4p){6.E.5T=6.5J.1d(6);2Y((7(){6.4r(1)}).1d(6),10)}6.5A();d 1c=6.m.5V?6.m.5V:28;6.E.7O(6.m.1F==\'4j\'?1c:1L)}1s(e){6.3p(e)}},5A:7(){d 1P=[\'X-7P-7Q\',\'5C\',\'X-T-4l\',T.4l,\'7R\',\'1Y/7m, 1Y/2e, 5E/5F, 1Y/5F, */*\'];f(6.m.1F==\'4j\'){1P.W(\'5Q-2g\',6.m.5H);f(6.E.7S)1P.W(\'7T\',\'7U\')}f(6.m.1P)1P.W.2n(1P,6.m.1P);G(d i=0;i<1P.t;i+=2)6.E.7V(1P[i],1P[i+1])},5J:7(){d 2F=6.E.2F;f(2F!=1)6.4r(6.E.2F)},4A:7(B){1j{c 6.E.7W(B)}1s(e){}},5M:7(){1j{c 4q(\'(\'+6.4A(\'X-7X\')+\')\')}1s(e){}},5R:7(){1j{c 4q(6.E.3F)}1s(e){6.3p(e)}},4r:7(2F){d C=M.3t.5L[2F];d E=6.E,2Z=6.5M();f(C==\'4t\'){1j{(6.m[\'2I\'+6.E.32]||6.m[\'2I\'+(6.3l()?\'81\':\'82\')]||T.2v)(E,2Z)}1s(e){6.3p(e)}f((6.4A(\'5Q-2g\')||\'\').I(/^1Y\\/7m/i))6.5R()}1j{(6.m[\'2I\'+C]||T.2v)(E,2Z);M.2W.3y(\'2I\'+C,6,E,2Z)}1s(e){6.3p(e)}f(C==\'4t\')6.E.5T=T.2v},3p:7(57){(6.m.5W||T.2v)(6,57);M.2W.3y(\'5W\',6,57)}});M.4C=1b.17();q.u(q.u(M.4C.v,M.3t.v),{1I:7(1w,1l,m){6.4x={3m:1w.3m?$(1w.3m):$(1w),3z:1w.3z?$(1w.3z):(1w.3m?1L:$(1w))};6.E=M.4w();6.4a(m);d 1B=6.m.1B||T.2v;6.m.1B=(7(E,U){6.5Y();1B(E,U)}).1d(6);6.26(1l)},5Y:7(){d 3A=6.3l()?6.4x.3m:6.4x.3z;d 3k=6.E.3F;f(!6.m.3q)3k=3k.2Q();f(3A){f(6.m.60){z 6.m.60(3A,3k)}1D{k.6h(3A,3k)}}f(6.3l()){f(6.1B)2Y(6.1B.1d(6),10)}}});M.61=1b.17();M.61.v=q.u(z M.44(),{1I:7(1w,1l,m){6.4a(m);6.1B=6.m.1B;6.1J=(6.m.1J||2);6.2s=(6.m.2s||1);6.4B={};6.1w=1w;6.1l=1l;6.22()},22:7(){6.m.1B=6.63.1d(6);6.2D()},7b:7(){6.4B.1B=1v;89(6.65);(6.1B||T.2v).2n(6,N)},63:7(26){f(6.m.2s){6.2s=(26.3F==6.64?6.2s*6.m.2s:1);6.64=26.3F}6.65=2Y(6.2D.1d(6),6.2s*6.1J*4z)},2D:7(){6.4B=z M.4C(6.1w,6.1l,6.m)}});7 $(){d P=[],4;G(d i=0;i<N.t;i++){4=N[i];f(2i 4==\'8c\')4=J.8d(4);P.W(k.u(4))}c P.t<2?P[0]:P};J.8f=7(1f,6a){d 6b=($(6a)||J.1c).4D(\'*\');c $A(6b).36([],7(12,4E){f(4E.1f.I(z 3O("(^|\\\\s)"+1f+"(\\\\s|$)")))12.W(k.u(4E));c 12})};f(!1W.k)d k=z q();k.u=7(4){f(!4)c;f(4X)c 4;f(!4.6e&&4.1h&&4!=1W){d 2a=k.3d,2r=k.u.2r;G(d 1G 2M 2a){d h=2a[1G];f(2i h==\'7\')4[1G]=2r.4W(h)}}4.6e=11;c 4};k.u.2r={4W:7(h){c 6[h]=6[h]||7(){c h.2n(1L,[6].3s($A(N)))}}};k.3d={4U:7(4){c $(4).l.2B!=\'3Q\'},6N:7(){G(d i=0;i<N.t;i++){d 4=$(N[i]);k[k.4U(4)?\'6f\':\'6w\'](4)}},6f:7(){G(d i=0;i<N.t;i++){d 4=$(N[i]);4.l.2B=\'3Q\'}},6w:7(){G(d i=0;i<N.t;i++){d 4=$(N[i]);4.l.2B=\'\'}},42:7(4){4=$(4);4.1X.8h(4)},6h:7(4,2e){$(4).3h=2e.2Q();2Y(7(){2e.3q()},10)},2y:7(4,2e){4=$(4);f(4.6k){4.6k=2e.2Q()}1D{d 1K=4.6R.6S();1K.56(4);4.1X.8i(1K.6T(2e.2Q()),4)}2Y(7(){2e.3q()},10)},8k:7(4){4=$(4);c 4.2k},3K:7(4){c z k.3S(4)},8l:7(4,1f){f(!(4=$(4)))c;c k.3K(4).1M(1f)},8m:7(4,1f){f(!(4=$(4)))c;c k.3K(4).7k(1f)},8n:7(4,1f){f(!(4=$(4)))c;c k.3K(4).42(1f)},8p:7(4){4=$(4);G(d i=0;i<4.2z.t;i++){d 3M=4.2z[i];f(3M.8q==3&&!/\\S/.4v(3M.6q))k.42(3M)}},8r:7(4){c $(4).3h.I(/^\\s*$/)},8s:7(4,3I){4=$(4),3I=$(3I);1H(4=4.1X)f(4==3I)c 11;c Y},6t:7(4){4=$(4);d x=4.x?4.x:4.2f,y=4.y?4.y:4.29;1W.6t(x,y)},1R:7(4,l){4=$(4);d h=4.l[l.3P()];f(!h){f(J.4J&&J.4J.6v){d 4L=J.4J.6v(4,1L);h=4L?4L.8v(l):1L}1D f(4.6x){h=4.6x[l.3P()]}}f(1W.6E&&[\'18\',\'1n\',\'3U\',\'6G\'].1M(l))f(k.1R(4,\'14\')==\'4G\')h=\'6y\';c h==\'6y\'?1L:h},8x:7(4,l){4=$(4);G(d B 2M l)4.l[B.3P()]=l[B]},8y:7(4){4=$(4);f(k.1R(4,\'2B\')!=\'3Q\')c{21:4.2p,24:4.2k};d 20=4.l;d 6B=20.4O;d 6A=20.14;20.4O=\'31\';20.14=\'2o\';20.2B=\'\';d 6C=4.6m;d 6D=4.6p;20.2B=\'3Q\';20.14=6A;20.4O=6B;c{21:6C,24:6D}},8z:7(4){4=$(4);d 4R=k.1R(4,\'14\');f(4R==\'4G\'||!4R){4.4T=11;4.l.14=\'3T\';f(1W.6E){4.l.1n=0;4.l.18=0}}},8A:7(4){4=$(4);f(4.4T){4.4T=1v;4.l.14=4.l.1n=4.l.18=4.l.6G=4.l.3U=\'\'}},8B:7(4){4=$(4);f(4.3c)c;4.3c=4.l.3V;f((k.1R(4,\'3V\')||\'4U\')!=\'31\')4.l.3V=\'31\'},8D:7(4){4=$(4);f(4.3c)c;4.l.3V=4.3c;4.3c=1v}};q.u(k,k.3d);d 4X=Y;f(!3W&&/3x|3w|3u/.4v(33.62)){d 3W={}};k.6K=7(2a){q.u(k.3d,2a||{});f(2i 3W!=\'1v\'){d 2a=k.3d,2r=k.u.2r;G(d 1G 2M 2a){d h=2a[1G];f(2i h==\'7\')3W.v[1G]=2r.4W(h)}4X=11}};k.6K();d 6M=z q();6M.2B=k.6N;1e.1g=7(3f){6.3f=3f};1e.1g.v={1I:7(4,2t){6.4=$(4);6.2t=2t.2Q();f(6.3f&&6.4.6O){1j{6.4.6O(6.3f,6.2t)}1s(e){d 1h=6.4.1h.2w();f(1h==\'4V\'||1h==\'8N\'){6.2X(6.6U())}1D{25 e}}}1D{6.1K=6.4.6R.6S();f(6.2V)6.2V();6.2X([6.1K.6T(6.2t)])}2Y(7(){2t.3q()},10)},6U:7(){d 1q=J.4Y(\'1q\');1q.3h=\'<6V><4V>\'+6.2t+\'</4V></6V>\';c $A(1q.2z[0].2z[0].2z)}};d 1g=z q();1g.6W=1b.17();1g.6W.v=q.u(z 1e.1g(\'96\'),{2V:7(){6.1K.97(6.4)},2X:7(2h){2h.V((7(2j){6.4.1X.55(2j,6.4)}).1d(6))}});1g.5m=1b.17();1g.5m.v=q.u(z 1e.1g(\'99\'),{2V:7(){6.1K.56(6.4);6.1K.74(11)},2X:7(2h){2h.4m(Y).V((7(2j){6.4.55(2j,6.4.9a)}).1d(6))}});1g.7h=1b.17();1g.7h.v=q.u(z 1e.1g(\'9d\'),{2V:7(){6.1K.56(6.4);6.1K.74(6.4)},2X:7(2h){2h.V((7(2j){6.4.75(2j)}).1d(6))}});1g.76=1b.17();1g.76.v=q.u(z 1e.1g(\'9i\'),{2V:7(){6.1K.9m(6.4)},2X:7(2h){2h.V((7(2j){6.4.1X.55(2j,6.4.9t)}).1d(6))}});k.3S=1b.17();k.3S.v={1I:7(4){6.4=$(4)},2m:7(o){6.4.1f.3j(/\\s+/).1k(7(B){c B.t>0}).2m(o)},5c:7(1f){6.4.1f=1f},7k:7(5a){f(6.1M(5a))c;6.5c(6.1Z().3s(5a).1N(\' \'))},42:7(4c){f(!6.1M(4c))c;6.5c(6.1k(7(1f){c 1f!=4c}).1N(\' \'))},2C:7(){c 6.1Z().1N(\' \')}};q.u(k.3S.v,1p);d 5I={5i:7(){G(d i=0;i<N.t;i++)$(N[i]).h=\'\'},4f:7(4){$(4).4f()},7v:7(){G(d i=0;i<N.t;i++)f($(N[i]).h==\'\')c Y;c 11},1k:7(4){$(4).1k()},5y:7(4){4=$(4);4.4f();f(4.1k)4.1k()}};d D={3a:7(Q){d 12=D.2L($(Q));d 4I=z 1E();G(d i=0;i<12.t;i++){d 4g=D.k.3a(12[i]);f(4g)4I.W(4g)}c 4I.1N(\'&\')},2L:7(Q){Q=$(Q);d 12=z 1E();G(d 1h 2M D.k.2E){d 4H=Q.4D(1h);G(d j=0;j<4H.t;j++)12.W(4H[j])}c 12},7x:7(Q,3N,B){Q=$(Q);d 3H=Q.4D(\'2u\');f(!3N&&!B)c 3H;d 4y=z 1E();G(d i=0;i<3H.t;i++){d 2u=3H[i];f((3N&&2u.2g!=3N)||(B&&2u.B!=B))49;4y.W(2u)}c 4y},7B:7(Q){d 12=D.2L(Q);G(d i=0;i<12.t;i++){d 4=12[i];4.7D();4.4o=\'11\'}},7F:7(Q){d 12=D.2L(Q);G(d i=0;i<12.t;i++){d 4=12[i];4.4o=\'\'}},5z:7(Q){c D.2L(Q).5v(7(4){c 4.2g!=\'31\'&&!4.4o&&[\'2u\',\'1k\',\'3J\'].1M(4.1h.2w())})},7M:7(Q){5I.5y(D.5z(Q))},5w:7(Q){$(Q).5w()}};D.k={3a:7(4){4=$(4);d 1F=4.1h.2w();d 1S=D.k.2E[1F](4);f(1S){d 1O=4n(1S[0]);f(1O.t==0)c;f(1S[1].5D!=1E)1S[1]=[1S[1]];c 1S[1].1C(7(h){c 1O+\'=\'+4n(h)}).1N(\'&\')}},1x:7(4){4=$(4);d 1F=4.1h.2w();d 1S=D.k.2E[1F](4);f(1S)c 1S[1]}};D.k.2E={2u:7(4){6c(4.2g.2w()){1r\'7Z\':1r\'31\':1r\'6l\':1r\'1Y\':c D.k.2E.3J(4);1r\'6g\':1r\'6i\':c D.k.2E.5O(4)}c Y},5O:7(4){f(4.83)c[4.B,4.h]},3J:7(4){c[4.B,4.h]},1k:7(4){c D.k.2E[4.2g==\'1k-6n\'?\'5S\':\'5X\'](4)},5S:7(4){d h=\'\',2b,w=4.85;f(w>=0){2b=4.m[w];h=2b.h||2b.1Y}c[4.B,h]},5X:7(4){d h=[];G(d i=0;i<4.t;i++){d 2b=4.m[i];f(2b.87)h.W(2b.h||2b.1Y)}c[4.B,h]}};d $F=D.k.1x;1e.3D=7(){};1e.3D.v={1I:7(4,1J,1a){6.1J=1J;6.4=$(4);6.1a=1a;6.2K=6.1x();6.2A()},2A:7(){5Z(6.2D.1d(6),6.1J*4z)},2D:7(){d h=6.1x();f(6.2K!=h){6.1a(6.4,h);6.2K=h}}};D.k.3C=1b.17();D.k.3C.v=q.u(z 1e.3D(),{1x:7(){c D.k.1x(6.4)}});D.3C=1b.17();D.3C.v=q.u(z 1e.3D(),{1x:7(){c D.3a(6.4)}});1e.2c=7(){};1e.2c.v={1I:7(4,1a){6.4=$(4);6.1a=1a;6.2K=6.1x();f(6.4.1h.2w()==\'Q\')6.67();1D 6.2A(6.4)},4K:7(){d h=6.1x();f(6.2K!=h){6.1a(6.4,h);6.2K=h}},67:7(){d 12=D.2L(6.4);G(d i=0;i<12.t;i++)6.2A(12[i])},2A:7(4){f(4.2g){6c(4.2g.2w()){1r\'6g\':1r\'6i\':1o.3B(4,\'8j\',6.4K.1d(6));1y;1r\'6l\':1r\'1Y\':1r\'3J\':1r\'1k-6n\':1r\'1k-8t\':1o.3B(4,\'8u\',6.4K.1d(6));1y}}}};D.k.2c=1b.17();D.k.2c.v=q.u(z 1e.2c(),{1x:7(){c D.k.1x(6.4)}});D.2c=1b.17();D.2c.v=q.u(z 1e.2c(),{1x:7(){c D.3a(6.4)}});f(!1W.1o){d 1o=z q()}q.u(1o,{8C:8,8F:9,8H:13,8I:27,8J:37,8L:38,8O:39,8T:40,8X:46,4:7(C){c C.Z||C.91},95:7(C){c(((C.6X)&&(C.6X==1))||((C.6Z)&&(C.6Z==1)))},9b:7(C){c C.9e||(C.9f+(J.3R.2G||J.1c.2G))},9g:7(C){c C.9j||(C.9k+(J.3R.2O||J.1c.2O))},7b:7(C){f(C.7d){C.7d();C.9r()}1D{C.48=Y;C.9w=11}},9A:7(C,1h){d 4=1o.4(C);1H(4.1X&&(!4.1h||(4.1h.3Y()!=1h.3Y())))4=4.1X;c 4},1T:Y,5u:7(4,B,1V,1u){f(!6.1T)6.1T=[];f(4.5f){6.1T.W([4,B,1V,1u]);4.5f(B,1V,1u)}1D f(4.4i){6.1T.W([4,B,1V,1u]);4.4i(\'2I\'+B,1V)}},66:7(){f(!1o.1T)c;G(d i=0;i<1o.1T.t;i++){1o.5N.2n(6,1o.1T[i]);1o.1T[i][0]=1L}1o.1T=Y},3B:7(4,B,1V,1u){d 4=$(4);1u=1u||Y;f(B==\'5U\'&&(33.4u.I(/3x|3w|3u/)||4.4i))B=\'5K\';6.5u(4,B,1V,1u)},5N:7(4,B,1V,1u){d 4=$(4);1u=1u||Y;f(B==\'5U\'&&(33.4u.I(/3x|3w|3u/)||4.4k))B=\'5K\';f(4.5x){4.5x(B,1V,1u)}1D f(4.4k){1j{4.4k(\'2I\'+B,1V)}1s(e){}}}});f(33.4u.I(/\\88\\b/))1o.3B(1W,\'8a\',1o.66,Y);d 2d={6o:Y,4P:7(){6.6z=1W.8e||J.3R.2G||J.1c.2G||0;6.6F=1W.8g||J.3R.2O||J.1c.2O||0},6u:7(4){d 19=0,15=0;2q{19+=4.2O||0;15+=4.2G||0;4=4.1X}1H(4);c[15,19]},35:7(4){d 19=0,15=0;2q{19+=4.29||0;15+=4.2f||0;4=4.1Q}1H(4);c[15,19]},68:7(4){d 19=0,15=0;2q{19+=4.29||0;15+=4.2f||0;4=4.1Q;f(4){p=k.1R(4,\'14\');f(p==\'3T\'||p==\'2o\')1y}}1H(4);c[15,19]},1Q:7(4){f(4.1Q)c 4.1Q;f(4==J.1c)c 4;1H((4=4.1X)&&4!=J.1c)f(k.1R(4,\'14\')!=\'4G\')c 4;c J.1c},8o:7(4,x,y){f(6.6o)c 6.6r(4,x,y);6.3g=x;6.34=y;6.1t=6.35(4);c(y>=6.1t[1]&&y<6.1t[1]+4.2k&&x>=6.1t[0]&&x<6.1t[0]+4.2p)},6r:7(4,x,y){d 4S=6.6u(4);6.3g=x+4S[0]-6.6z;6.34=y+4S[1]-6.6F;6.1t=6.35(4);c(6.34>=6.1t[1]&&6.34<6.1t[1]+4.2k&&6.3g>=6.1t[0]&&6.3g<6.1t[0]+4.2p)},8E:7(3Z,4){f(!3Z)c 0;f(3Z==\'8G\')c((6.1t[1]+4.2k)-6.34)/4.2k;f(3Z==\'8K\')c((6.1t[0]+4.2p)-6.3g)/4.2p},77:7(O,Z){O=$(O);Z=$(Z);Z.l.14=\'2o\';d 2P=6.35(O);Z.l.1n=2P[1]+\'1m\';Z.l.18=2P[0]+\'1m\';Z.l.21=O.2p+\'1m\';Z.l.24=O.2k+\'1m\'},4e:7(4M){d 19=0,15=0;d 4=4M;2q{19+=4.29||0;15+=4.2f||0;f(4.1Q==J.1c)f(k.1R(4,\'14\')==\'2o\')1y}1H(4=4.1Q);4=4M;2q{19-=4.2O||0;15-=4.2G||0}1H(4=4.1X);c[15,19]},77:7(O,Z){d m=q.u({5l:11,5r:11,5B:11,5q:11,29:0,2f:0},N[2]||{});O=$(O);d p=2d.4e(O);Z=$(Z);d 2J=[0,0];d 3v=1L;f(k.1R(Z,\'14\')==\'2o\'){3v=2d.1Q(Z);2J=2d.4e(3v)}f(3v==J.1c){2J[0]-=J.1c.2f;2J[1]-=J.1c.29}f(m.5l)Z.l.18=(p[0]-2J[0]+m.2f)+\'1m\';f(m.5r)Z.l.1n=(p[1]-2J[1]+m.29)+\'1m\';f(m.5B)Z.l.21=O.2p+\'1m\';f(m.5q)Z.l.24=O.2k+\'1m\'},8b:7(4){4=$(4);f(4.l.14==\'2o\')c;2d.4P();d 2P=2d.68(4);d 1n=2P[1];d 18=2P[0];d 21=4.6m;d 24=4.6p;4.6P=18-3X(4.l.18||0);4.6I=1n-3X(4.l.1n||0);4.5k=4.l.21;4.7f=4.l.24;4.l.14=\'2o\';4.l.1n=1n+\'1m\';4.l.18=18+\'1m\';4.l.21=21+\'1m\';4.l.24=24+\'1m\'},8w:7(4){4=$(4);f(4.l.14==\'3T\')c;2d.4P();4.l.14=\'3T\';d 1n=3X(4.l.1n||0)-(4.6I||0);d 18=3X(4.l.18||0)-(4.6P||0);4.l.1n=1n+\'1m\';4.l.18=18+\'1m\';4.l.24=4.7f;4.l.21=4.5k}};f(/3x|3w|3u/.4v(33.62)){2d.35=7(4){d 19=0,15=0;2q{19+=4.29||0;15+=4.2f||0;f(4.1Q==J.1c)f(k.1R(4,\'14\')==\'2o\')1y;4=4.1Q}1H(4);c[15,19]}};', 62, 600, '||||element||this|function|||||return|var||if||value|||Element|style|options||iterator||Object|||length|extend|prototype|index|||new||name|event|Form|transport||for||match|document||result|Ajax|arguments|source|results|form|||Prototype|object|each|push||false|target||true|elements||position|valueL||create|left|valueT|callback|Class|body|bind|Abstract|className|Insertion|tagName|pair|try|select|url|px|top|Event|Enumerable|div|case|catch|offset|useCapture|undefined|container|getValue|break|replacement|pattern|onComplete|map|else|Array|method|property|while|initialize|frequency|range|null|include|join|key|requestHeaders|offsetParent|getStyle|parameter|observers|inspect|observer|window|parentNode|text|toArray|els|width|start|args|height|throw|request||parameters|offsetTop|methods|opt|EventObserver|Position|html|offsetLeft|type|fragments|typeof|fragment|offsetHeight|oStringList|_each|apply|absolute|offsetWidth|do|cache|decay|content|input|emptyFunction|toLowerCase|end|replace|childNodes|registerCallback|display|toString|onTimerEvent|Serializers|readyState|scrollLeft|exclusive|on|delta|lastValue|getElements|in|hash|scrollTop|offsets|stripScripts|iterable|truncation|gsub|template|initializeRange|Responders|insertContent|setTimeout|json||hidden|status|navigator|ycomp|cumulativeOffset|inject||||serialize|responders|_overflow|Methods|collect|adjacency|xcomp|innerHTML|count|split|response|responseIsSuccess|success|Template|responder|dispatchException|evalScripts|pluck|concat|Request|KHTML|parent|Safari|Konqueror|dispatch|failure|receiver|observe|Observer|TimedObserver|ScriptFragment|responseText|script|inputs|ancestor|textarea|classNames|ObjectRange|node|typeName|RegExp|camelize|none|documentElement|ClassNames|relative|right|overflow|HTMLElement|parseFloat|toUpperCase|mode||currentlyExecuting|remove|__method|Base|memo||slice|returnValue|continue|setOptions|String|classNameToRemove|_reverse|page|focus|queryComponent|Hash|attachEvent|post|detachEvent|Version|reverse|encodeURIComponent|disabled|asynchronous|eval|respondToReadyState|activeRequestCount|Complete|appVersion|test|getTransport|containers|matchingInputs|1000|header|updater|Updater|getElementsByTagName|child|responderToAdd|static|tagElements|queryComponents|defaultView|onElementEvent|css|forElement|values|visibility|prepare|mergedHash|pos|offsetcache|_madePositioned|visible|tbody|findOrStore|_nativeExtensions|createElement|digits|trues|found|prepareReplacement|before|camelizedString|insertBefore|selectNodeContents|exception|falses|criteria|classNameToAdd|params|set|destination|last|addEventListener|indexOf|inline|clear|succ|_originalWidth|setLeft|Top|ActiveXObject|scriptTag|matchOne|setHeight|setTop|without|responderToRemove|_observeAndCache|find|reset|removeEventListener|activate|findFirstElement|setRequestHeaders|setWidth|XMLHttpRequest|constructor|application|xml|onCreate|contentType|Field|onStateChange|keydown|Events|evalJSON|stopObserving|inputSelector|img|Content|evalResponse|selectOne|onreadystatechange|keypress|postBody|onException|selectMany|updateContent|setInterval|insertion|PeriodicalUpdater|userAgent|updateComplete|lastText|timer|unloadCache|registerFormCallbacks|positionedOffset|register|parentElement|children|switch|XMLHTTP|_extended|hide|checkbox|update|radio|these|outerHTML|password|clientWidth|one|includeScrollOffsets|clientHeight|nodeValue|withinIncludingScrolloffsets|Try|scrollTo|realOffset|getComputedStyle|show|currentStyle|auto|deltaX|originalPosition|originalVisibility|originalWidth|originalHeight|opera|deltaY|bottom|array|_originalTop|flatten|addMethods|lambda|Toggle|toggle|insertAdjacentHTML|_originalLeft|PeriodicalExecuter|ownerDocument|createRange|createContextualFragment|contentFromAnonymousTable|table|Before|which|matchAll|button|extractScripts|stripTags|pairString|len|collapse|appendChild|After|clone|toQueryParams|Pattern|evaluate|stop|stringValue|preventDefault|charAt|_originalHeight|substring|Bottom|pairs|Function|add|collections|javascript|detect|findAll|entries|from|first|compact|keys|merge|present|toQueryString|getInputs|Msxml2|Microsoft|unregister|disable|urlencoded|blur|300|enable|responseIsFailure|Uninitialized|Loaded|Interactive|_|get|focusFirstElement|open|send|Requested|With|Accept|overrideMimeType|Connection|close|setRequestHeader|getResponseHeader|JSON|gi|submit|Loading|Success|Failure|checked|200|selectedIndex|www|selected|bMSIE|clearTimeout|unload|absolutize|string|getElementById|pageXOffset|getElementsByClassName|pageYOffset|removeChild|replaceChild|click|getHeight|hasClassName|addClassName|removeClassName|within|cleanWhitespace|nodeType|empty|childOf|multiple|change|getPropertyValue|relativize|setStyle|getDimensions|makePositioned|undoPositioned|makeClipping|KEY_BACKSPACE|undoClipping|overlap|KEY_TAB|vertical|KEY_RETURN|KEY_ESC|KEY_LEFT|horizontal|KEY_UP|member|tr|KEY_RIGHT|0_RC_0|Number|instanceof|shift|KEY_DOWN|bindAsEventListener|call|toColorPart|KEY_DELETE|times|finally|callee|srcElement|sub|scan|truncate|isLeftClick|beforeBegin|setStartBefore|im|afterBegin|firstChild|pointerX|unescapeHTML|beforeEnd|pageX|clientX|pointerY|parseQuery|afterEnd|pageY|clientY|RangeError|setStartAfter|all|any|grep|invoke|stopPropagation|max|nextSibling|min|partition|cancelBubble|reject|sortBy|sort|findElement|zip|pop|createTextNode|escapeHTML|strip'.split('|'), 0, {})
-
-} /* END LOOP */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-validate-input.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-validate-input.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/sunspider/string-validate-input.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/sunspider/string-validate-input.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-letters = new Array("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z");
-numbers = new Array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26);
-colors  = new Array("FF","CC","99","66","33","00");
-
-var endResult;
-
-function doTest()
-{
-   endResult = "";
-
-   // make up email address
-  /* BEGIN LOOP */
-   for (var k=0;k<4000;k++)
-   {
-      name = makeName(6);
-      (k%2)?email=name+"@mac.com":email=name+"(at)mac.com";
-
-      // validate the email address
-      var pattern = /^[a-zA-Z0-9\-\._]+@[a-zA-Z0-9\-_]+(\.?[a-zA-Z0-9\-_]*)\.[a-zA-Z]{2,3}$/;
-
-      if(pattern.test(email))
-      {
-         var r = email + " appears to be a valid email address.";
-         addResult(r);
-      }
-      else
-      {
-         r = email + " does NOT appear to be a valid email address.";
-         addResult(r);
-      }
-   }
-  /* END LOOP */
-
-   // make up ZIP codes
-  /* BEGIN LOOP */
-   for (var s=0;s<4000;s++)
-   {
-      var zipGood = true;
-      var zip = makeNumber(4);
-      (s%2)?zip=zip+"xyz":zip=zip.concat("7");
-
-      // validate the zip code
-  /* BEGIN LOOP */
-      for (var i = 0; i < zip.length; i++) {
-          var ch = zip.charAt(i);
-          if (ch < "0" || ch > "9") {
-              zipGood = false;
-              r = zip + " contains letters.";
-              addResult(r);
-          }
-      }
-  /* END LOOP */
-      if (zipGood && zip.length>5)
-      {
-         zipGood = false;
-         r = zip + " is longer than five characters.";
-         addResult(r);
-      }
-      if (zipGood)
-      {
-         r = zip + " appears to be a valid ZIP code.";
-         addResult(r);
-      }
-   }
-  /* END LOOP */
-}
-
-function makeName(n)
-{
-   var tmp = "";
-  /* BEGIN LOOP */
-   for (var i=0;i<n;i++)
-   {
-      var l = Math.floor(26*Math.random());
-      tmp += letters[l];
-   }
-  /* END LOOP */
-   return tmp;
-}
-
-function makeNumber(n)
-{
-   var tmp = "";
-  /* BEGIN LOOP */
-   for (var i=0;i<n;i++)
-   {
-      var l = Math.floor(9*Math.random());
-      tmp = tmp.concat(l);
-   }
-  /* END LOOP */
-   return tmp;
-}
-
-function addResult(r)
-{
-   endResult += "\n" + r;
-}
-
-doTest();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/treesearch.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/treesearch.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/treesearch.py	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/treesearch.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,411 +0,0 @@
-# vim: set ts=8 sts=4 et sw=4 tw=99:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import os, re
-import tempfile
-import subprocess
-import sys, math
-import datetime
-import random
-
-def realpath(k):
-    return os.path.realpath(os.path.normpath(k))
-
-class UCTNode:
-    def __init__(self, loop):
-        self.children = None
-        self.loop = loop
-        self.visits = 1
-        self.score = 0
-
-    def addChild(self, child):
-        if self.children == None:
-            self.children = []
-        self.children.append(child)
-
-    def computeUCB(self, coeff):
-        return (self.score / self.visits) + math.sqrt(coeff / self.visits)
-
-class UCT:
-    def __init__(self, benchmark, bestTime, enableLoops, loops, fd, playouts):
-        self.bm = benchmark
-        self.fd = fd
-        self.numPlayouts = playouts
-        self.maxNodes = self.numPlayouts * 20
-        self.loops = loops
-        self.enableLoops = enableLoops
-        self.maturityThreshold = 20
-        self.originalBest = bestTime
-        self.bestTime = bestTime
-        self.bias = 20
-        self.combos = []
-        self.zobrist = { }
-        random.seed()
-
-    def expandNode(self, node, pending):
-        for loop in pending:
-            node.addChild(UCTNode(loop))
-            self.numNodes += 1
-            if self.numNodes >= self.maxNodes:
-                return False
-        return True
-
-    def findBestChild(self, node):
-        coeff = self.bias * math.log(node.visits)
-        bestChild = None
-        bestUCB = -float('Infinity')
-
-        for child in node.children:
-            ucb = child.computeUCB(coeff)
-            if ucb >= bestUCB:
-                bestUCB = ucb
-                bestChild = child
-
-        return child
-
-    def playout(self, history):
-        queue = []
-        for i in range(0, len(self.loops)):
-            queue.append(random.randint(0, 1))
-        for node in history:
-            queue[node.loop] = not self.enableLoops
-        zash = 0
-        for i in range(0, len(queue)):
-            if queue[i]:
-                zash |= (1 << i)
-        if zash in self.zobrist:
-            return self.zobrist[zash]
-
-        self.bm.generateBanList(self.loops, queue)
-        result = self.bm.treeSearchRun(self.fd, ['-m', '-j'], 3)
-        self.zobrist[zash] = result
-        return result
-
-    def step(self, loopList):
-        node = self.root
-        pending = loopList[:]
-        history = [node]
-
-        while True:
-            # If this is a leaf node...
-            if node.children == None:
-                # And the leaf node is mature...
-                if node.visits >= self.maturityThreshold:
-                    # If the node can be expanded, keep spinning.
-                    if self.expandNode(node, pending) and node.children != None:
-                        continue
-
-                # Otherwise, this is a leaf node. Run a playout.
-                score = self.playout(history)
-                break
-
-            # Find the best child.
-            node = self.findBestChild(node)
-            history.append(node)
-            pending.remove(node.loop)
-
-        # Normalize the score.
-        origScore = score
-        score = (self.originalBest - score) / self.originalBest
-
-        for node in history:
-            node.visits += 1
-            node.score += score
-
-        if int(origScore) < int(self.bestTime):
-            print('New best score: {0:f}ms'.format(origScore))
-            self.combos = [history]
-            self.bestTime = origScore
-        elif int(origScore) == int(self.bestTime):
-            self.combos.append(history)
-
-    def run(self):
-        loopList = [i for i in range(0, len(self.loops))]
-        self.numNodes = 1
-        self.root = UCTNode(-1)
-        self.expandNode(self.root, loopList)
-
-        for i in range(0, self.numPlayouts):
-            self.step(loopList)
-
-        # Build the expected combination vector.
-        combos = [ ]
-        for combo in self.combos:
-            vec = [ ]
-            for i in range(0, len(self.loops)):
-                vec.append(int(self.enableLoops))
-            for node in combo:
-                vec[node.loop] = int(not self.enableLoops)
-            combos.append(vec)
-
-        return [self.bestTime, combos]
-
-class Benchmark:
-    def __init__(self, JS, fname):
-        self.fname = fname
-        self.JS = JS
-        self.stats = { }
-        self.runList = [ ]
-
-    def run(self, fd, eargs):
-        args = [self.JS]
-        args.extend(eargs)
-        args.append(fd.name)
-        return subprocess.check_output(args).decode()
-
-    #    self.stats[name] = { }
-    #    self.runList.append(name)
-    #    for line in output.split('\n'):
-    #        m = re.search('line (\d+): (\d+)', line)
-    #        if m:
-    #            self.stats[name][int(m.group(1))] = int(m.group(2))
-    #        else:
-    #            m = re.search('total: (\d+)', line)
-    #            if m:
-    #                self.stats[name]['total'] = m.group(1)
-
-    def winnerForLine(self, line):
-        best = self.runList[0]
-        bestTime = self.stats[best][line]
-        for run in self.runList[1:]:
-            x = self.stats[run][line]
-            if x < bestTime:
-                best = run
-                bestTime = x
-        return best
-
-    def chart(self):
-        sys.stdout.write('{0:7s}'.format(''))
-        sys.stdout.write('{0:15s}'.format('line'))
-        for run in self.runList:
-            sys.stdout.write('{0:15s}'.format(run))
-        sys.stdout.write('{0:15s}\n'.format('best'))
-        for c in self.counters:
-            sys.stdout.write('{0:10d}'.format(c))
-            for run in self.runList:
-                sys.stdout.write('{0:15d}'.format(self.stats[run][c]))
-            sys.stdout.write('{0:12s}'.format(''))
-            sys.stdout.write('{0:15s}'.format(self.winnerForLine(c)))
-            sys.stdout.write('\n')
-
-    def preprocess(self, lines, onBegin, onEnd):
-        stack = []
-        counters = []
-        rd = open(self.fname, 'rt')
-        for line in rd:
-            if re.search('\/\* BEGIN LOOP \*\/', line):
-                stack.append([len(lines), len(counters)])
-                counters.append([len(lines), 0])
-                onBegin(lines, len(lines))
-            elif re.search('\/\* END LOOP \*\/', line):
-                old = stack.pop()
-                onEnd(lines, old[0], len(lines))
-                counters[old[1]][1] = len(lines)
-            else:
-                lines.append(line)
-        return [lines, counters]
-
-    def treeSearchRun(self, fd, args, count = 5):
-        total = 0
-        for i in range(0, count):
-            output = self.run(fd, args)
-            total += int(output)
-        return total / count
-
-    def generateBanList(self, counters, queue):
-        if os.path.exists('/tmp/permabans'):
-            os.unlink('/tmp/permabans')
-        fd = open('/tmp/permabans', 'wt')
-        for i in range(0, len(counters)):
-            for j in range(counters[i][0], counters[i][1] + 1):
-                fd.write('{0:d} {1:d}\n'.format(j, int(queue[i])))
-        fd.close()
-
-    def internalExhaustiveSearch(self, params):
-        counters = params['counters']
-
-        # iterative algorithm to explore every combination
-        ncombos = 2 ** len(counters)
-        queue = []
-        for c in counters:
-            queue.append(0)
-
-        fd = params['fd']
-        bestTime = float('Infinity')
-        bestCombos = []
-
-        i = 0
-        while i < ncombos:
-            temp = i
-            for j in range(0, len(counters)):
-                queue[j] = temp & 1
-                temp = temp >> 1
-            self.generateBanList(counters, queue)
-
-            t = self.treeSearchRun(fd, ['-m', '-j'])
-            if (t < bestTime):
-                bestTime = t
-                bestCombos = [queue[:]]
-                print('New best time: {0:f}ms'.format(t))
-            elif int(t) == int(bestTime):
-                bestCombos.append(queue[:])
-
-            i = i + 1
-
-        return [bestTime, bestCombos]
-
-    def internalTreeSearch(self, params):
-        fd = params['fd']
-        methodTime = params['methodTime']
-        tracerTime = params['tracerTime']
-        combinedTime = params['combinedTime']
-        counters = params['counters']
-
-        # Build the initial loop data.
-        # If the method JIT already wins, disable tracing by default.
-        # Otherwise, enable tracing by default.
-        if methodTime < combinedTime:
-            enableLoops = True
-        else:
-            enableLoops = False
-
-        enableLoops = False
-
-        uct = UCT(self, combinedTime, enableLoops, counters[:], fd, 50000)
-        return uct.run()
-
-    def treeSearch(self):
-        fd, counters = self.ppForTreeSearch()
-
-        os.system("cat " + fd.name + " > /tmp/k.js")
-
-        if os.path.exists('/tmp/permabans'):
-            os.unlink('/tmp/permabans')
-        methodTime = self.treeSearchRun(fd, ['-m'])
-        tracerTime = self.treeSearchRun(fd, ['-j'])
-        combinedTime = self.treeSearchRun(fd, ['-m', '-j'])
-
-        #Get a rough estimate of how long this benchmark will take to fully compute.
-        upperBound = max(methodTime, tracerTime, combinedTime)
-        upperBound *= 2 ** len(counters)
-        upperBound *= 5    # Number of runs
-        treeSearch = False
-        if (upperBound < 1000):
-            print('Estimating {0:d}ms to test, so picking exhaustive '.format(int(upperBound)) +
-                  'search.')
-        else:
-            upperBound = int(upperBound / 1000)
-            delta = datetime.timedelta(seconds = upperBound)
-            if upperBound < 180:
-                print('Estimating {0:d}s to test, so picking exhaustive '.format(int(upperBound)))
-            else:
-                print('Estimating {0:s} to test, so picking tree search '.format(str(delta)))
-                treeSearch = True
-
-        best = min(methodTime, tracerTime, combinedTime)
-
-        params = {
-                    'fd': fd,
-                    'counters': counters,
-                    'methodTime': methodTime,
-                    'tracerTime': tracerTime,
-                    'combinedTime': combinedTime
-                 }
-
-        print('Method JIT:  {0:d}ms'.format(int(methodTime)))
-        print('Tracing JIT: {0:d}ms'.format(int(tracerTime)))
-        print('Combined:    {0:d}ms'.format(int(combinedTime)))
-
-        if 1 and treeSearch:
-            results = self.internalTreeSearch(params)
-        else:
-            results = self.internalExhaustiveSearch(params)
-
-        bestTime = results[0]
-        bestCombos = results[1]
-        print('Search found winning time {0:d}ms!'.format(int(bestTime)))
-        print('Combos at this time: {0:d}'.format(len(bestCombos)))
-
-        #Find loops that traced every single time
-        for i in range(0, len(counters)):
-            start = counters[i][0]
-            end = counters[i][1]
-            n = len(bestCombos)
-            for j in bestCombos:
-                n -= j[i]
-            print('\tloop @ {0:d}-{1:d} traced {2:d}% of the time'.format(
-                    start, end, int(n / len(bestCombos) * 100)))
-
-    def ppForTreeSearch(self):
-        def onBegin(lines, lineno):
-            lines.append('GLOBAL_THINGY = 1;\n')
-        def onEnd(lines, old, lineno):
-            lines.append('GLOBAL_THINGY = 1;\n')
-
-        lines = ['var JINT_START_TIME = Date.now();\n',
-                 'var GLOBAL_THINGY = 0;\n']
-
-        lines, counters = self.preprocess(lines, onBegin, onEnd)
-        fd = tempfile.NamedTemporaryFile('wt')
-        for line in lines:
-            fd.write(line)
-        fd.write('print(Date.now() - JINT_START_TIME);\n')
-        fd.flush()
-        return [fd, counters]
-
-    def preprocessForLoopCounting(self):
-        def onBegin(lines, lineno):
-            lines.append('JINT_TRACKER.line_' + str(lineno) + '_start = Date.now();\n')
-
-        def onEnd(lines, old, lineno):
-            lines.append('JINT_TRACKER.line_' + str(old) + '_end = Date.now();\n')
-            lines.append('JINT_TRACKER.line_' + str(old) + '_total += ' + \
-                         'JINT_TRACKER.line_' + str(old) + '_end - ' + \
-                         'JINT_TRACKER.line_' + str(old) + '_start;\n')
-
-        lines, counters = self.preprocess(onBegin, onEnd)
-        fd = tempfile.NamedTemporaryFile('wt')
-        fd.write('var JINT_TRACKER = { };\n')
-        for c in counters:
-            fd.write('JINT_TRACKER.line_' + str(c) + '_start = 0;\n')
-            fd.write('JINT_TRACKER.line_' + str(c) + '_end = 0;\n')
-            fd.write('JINT_TRACKER.line_' + str(c) + '_total = 0;\n')
-        fd.write('JINT_TRACKER.begin = Date.now();\n')
-        for line in lines:
-            fd.write(line)
-        fd.write('JINT_TRACKER.total = Date.now() - JINT_TRACKER.begin;\n')
-        for c in self.counters:
-            fd.write('print("line ' + str(c) + ': " + JINT_TRACKER.line_' + str(c) +
-                           '_total);')
-        fd.write('print("total: " + JINT_TRACKER.total);')
-        fd.flush()
-        return fd
-
-if __name__ == '__main__':
-    script_path = os.path.abspath(__file__)
-    script_dir = os.path.dirname(script_path)
-    test_dir = os.path.join(script_dir, 'tests')
-    lib_dir = os.path.join(script_dir, 'lib')
-
-    # 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] JS_SHELL test')
-    (OPTIONS, args) = op.parse_args()
-    if len(args) < 2:
-        op.error('missing JS_SHELL and test argument')
-    # We need to make sure we are using backslashes on Windows.
-    JS = realpath(args[0])
-    test = realpath(args[1])
-
-    bm = Benchmark(JS, test)
-    bm.treeSearch()
-    # bm.preprocess()
-    # bm.run('mjit', ['-m'])
-    # bm.run('tjit', ['-j'])
-    # bm.run('m+tjit', ['-m', '-j'])
-    # bm.chart()
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/base.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/base.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/base.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/base.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +0,0 @@
-// Copyright 2008 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Simple framework for running the benchmark suites and
-// computing a score based on the timing measurements.
-
-
-// A benchmark has a name (string) and a function that will be run to
-// do the performance measurement. The optional setup and tearDown
-// arguments are functions that will be invoked before and after
-// running the benchmark, but the running time of these functions will
-// not be accounted for in the benchmark score.
-function Benchmark(name, run, setup, tearDown) {
-  this.name = name;
-  this.run = run;
-  this.Setup = setup ? setup : function() { };
-  this.TearDown = tearDown ? tearDown : function() { };
-}
-
-
-// Benchmark results hold the benchmark and the measured time used to
-// run the benchmark. The benchmark score is computed later once a
-// full benchmark suite has run to completion.
-function BenchmarkResult(benchmark, time) {
-  this.benchmark = benchmark;
-  this.time = time;
-}
-
-
-// Automatically convert results to numbers. Used by the geometric
-// mean computation.
-BenchmarkResult.prototype.valueOf = function() {
-  return this.time;
-}
-
-
-// Suites of benchmarks consist of a name and the set of benchmarks in
-// addition to the reference timing that the final score will be based
-// on. This way, all scores are relative to a reference run and higher
-// scores implies better performance.
-function BenchmarkSuite(name, reference, benchmarks) {
-  this.name = name;
-  this.reference = reference;
-  this.benchmarks = benchmarks;
-  BenchmarkSuite.suites.push(this);
-}
-
-
-// Keep track of all declared benchmark suites.
-BenchmarkSuite.suites = [];
-
-
-// Scores are not comparable across versions. Bump the version if
-// you're making changes that will affect that scores, e.g. if you add
-// a new benchmark or change an existing one.
-BenchmarkSuite.version = '5';
-
-
-// To make the benchmark results predictable, we replace Math.random
-// with a 100% deterministic alternative.
-Math.random = (function() {
-  var seed = 49734321;
-  return function() {
-    // Robert Jenkins' 32 bit integer hash function.
-    seed = ((seed + 0x7ed55d16) + (seed << 12))  & 0xffffffff;
-    seed = ((seed ^ 0xc761c23c) ^ (seed >>> 19)) & 0xffffffff;
-    seed = ((seed + 0x165667b1) + (seed << 5))   & 0xffffffff;
-    seed = ((seed + 0xd3a2646c) ^ (seed << 9))   & 0xffffffff;
-    seed = ((seed + 0xfd7046c5) + (seed << 3))   & 0xffffffff;
-    seed = ((seed ^ 0xb55a4f09) ^ (seed >>> 16)) & 0xffffffff;
-    return (seed & 0xfffffff) / 0x10000000;
-  };
-})();
-
-
-// Runs all registered benchmark suites and optionally yields between
-// each individual benchmark to avoid running for too long in the
-// context of browsers. Once done, the final score is reported to the
-// runner.
-BenchmarkSuite.RunSuites = function(runner) {
-  var continuation = null;
-  var suites = BenchmarkSuite.suites;
-  var length = suites.length;
-  BenchmarkSuite.scores = [];
-  var index = 0;
-  function RunStep() {
-    while (continuation || index < length) {
-      if (continuation) {
-        continuation = continuation();
-      } else {
-        var suite = suites[index++];
-        if (runner.NotifyStart) runner.NotifyStart(suite.name);
-        continuation = suite.RunStep(runner);
-      }
-      if (continuation && typeof window != 'undefined' && window.setTimeout) {
-        window.setTimeout(RunStep, 25);
-        return;
-      }
-    }
-    if (runner.NotifyScore) {
-      var score = BenchmarkSuite.GeometricMean(BenchmarkSuite.scores);
-      var formatted = BenchmarkSuite.FormatScore(100 * score);
-      runner.NotifyScore(formatted);
-    }
-  }
-  RunStep();
-}
-
-
-// Counts the total number of registered benchmarks. Useful for
-// showing progress as a percentage.
-BenchmarkSuite.CountBenchmarks = function() {
-  var result = 0;
-  var suites = BenchmarkSuite.suites;
-  for (var i = 0; i < suites.length; i++) {
-    result += suites[i].benchmarks.length;
-  }
-  return result;
-}
-
-
-// Computes the geometric mean of a set of numbers.
-BenchmarkSuite.GeometricMean = function(numbers) {
-  var log = 0;
-  for (var i = 0; i < numbers.length; i++) {
-    log += Math.log(numbers[i]);
-  }
-  return Math.pow(Math.E, log / numbers.length);
-}
-
-
-// Converts a score value to a string with at least three significant
-// digits.
-BenchmarkSuite.FormatScore = function(value) {
-  if (value > 100) {
-    return value.toFixed(0);
-  } else {
-    return value.toPrecision(3);
-  }
-}
-
-// Notifies the runner that we're done running a single benchmark in
-// the benchmark suite. This can be useful to report progress.
-BenchmarkSuite.prototype.NotifyStep = function(result) {
-  this.results.push(result);
-  if (this.runner.NotifyStep) this.runner.NotifyStep(result.benchmark.name);
-}
-
-
-// Notifies the runner that we're done with running a suite and that
-// we have a result which can be reported to the user if needed.
-BenchmarkSuite.prototype.NotifyResult = function() {
-  var mean = BenchmarkSuite.GeometricMean(this.results);
-  var score = this.reference / mean;
-  BenchmarkSuite.scores.push(score);
-  if (this.runner.NotifyResult) {
-    var formatted = BenchmarkSuite.FormatScore(100 * score);
-    this.runner.NotifyResult(this.name, formatted);
-  }
-}
-
-
-// Notifies the runner that running a benchmark resulted in an error.
-BenchmarkSuite.prototype.NotifyError = function(error) {
-  if (this.runner.NotifyError) {
-    this.runner.NotifyError(this.name, error);
-  }
-  if (this.runner.NotifyStep) {
-    this.runner.NotifyStep(this.name);
-  }
-}
-
-
-// Runs a single benchmark for at least a second and computes the
-// average time it takes to run a single iteration.
-BenchmarkSuite.prototype.RunSingleBenchmark = function(benchmark) {
-  var elapsed = 0;
-  var start = new Date();
-  for (var n = 0; elapsed < 1000; n++) {
-    benchmark.run();
-    elapsed = new Date() - start;
-  }
-  var usec = (elapsed * 1000) / n;
-  this.NotifyStep(new BenchmarkResult(benchmark, usec));
-}
-
-
-// This function starts running a suite, but stops between each
-// individual benchmark in the suite and returns a continuation
-// function which can be invoked to run the next benchmark. Once the
-// last benchmark has been executed, null is returned.
-BenchmarkSuite.prototype.RunStep = function(runner) {
-  this.results = [];
-  this.runner = runner;
-  var length = this.benchmarks.length;
-  var index = 0;
-  var suite = this;
-
-  // Run the setup, the actual benchmark, and the tear down in three
-  // separate steps to allow the framework to yield between any of the
-  // steps.
-
-  function RunNextSetup() {
-    if (index < length) {
-      try {
-        suite.benchmarks[index].Setup();
-      } catch (e) {
-        suite.NotifyError(e);
-        return null;
-      }
-      return RunNextBenchmark;
-    }
-    suite.NotifyResult();
-    return null;
-  }
-
-  function RunNextBenchmark() {
-    try {
-      suite.RunSingleBenchmark(suite.benchmarks[index]);
-    } catch (e) {
-      suite.NotifyError(e);
-      return null;
-    }
-    return RunNextTearDown;
-  }
-
-  function RunNextTearDown() {
-    try {
-      suite.benchmarks[index++].TearDown();
-    } catch (e) {
-      suite.NotifyError(e);
-      return null;
-    }
-    return RunNextSetup;
-  }
-
-  // Start out running the setup.
-  return RunNextSetup();
-}
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/crypto.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/crypto.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/crypto.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/crypto.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,2135 +0,0 @@
-// Copyright 2008 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Simple framework for running the benchmark suites and
-// computing a score based on the timing measurements.
-
-
-// A benchmark has a name (string) and a function that will be run to
-// do the performance measurement. The optional setup and tearDown
-// arguments are functions that will be invoked before and after
-// running the benchmark, but the running time of these functions will
-// not be accounted for in the benchmark score.
-function Benchmark(name, run, setup, tearDown) {
-  this.name = name;
-  this.run = run;
-  this.Setup = setup ? setup : function() { };
-  this.TearDown = tearDown ? tearDown : function() { };
-}
-
-
-// Benchmark results hold the benchmark and the measured time used to
-// run the benchmark. The benchmark score is computed later once a
-// full benchmark suite has run to completion.
-function BenchmarkResult(benchmark, time) {
-  this.benchmark = benchmark;
-  this.time = time;
-}
-
-
-// Automatically convert results to numbers. Used by the geometric
-// mean computation.
-BenchmarkResult.prototype.valueOf = function() {
-  return this.time;
-}
-
-
-// Suites of benchmarks consist of a name and the set of benchmarks in
-// addition to the reference timing that the final score will be based
-// on. This way, all scores are relative to a reference run and higher
-// scores implies better performance.
-function BenchmarkSuite(name, reference, benchmarks) {
-  this.name = name;
-  this.reference = reference;
-  this.benchmarks = benchmarks;
-  BenchmarkSuite.suites.push(this);
-}
-
-
-// Keep track of all declared benchmark suites.
-BenchmarkSuite.suites = [];
-
-
-// Scores are not comparable across versions. Bump the version if
-// you're making changes that will affect that scores, e.g. if you add
-// a new benchmark or change an existing one.
-BenchmarkSuite.version = '5';
-
-
-// To make the benchmark results predictable, we replace Math.random
-// with a 100% deterministic alternative.
-Math.random = (function() {
-  var seed = 49734321;
-  return function() {
-    // Robert Jenkins' 32 bit integer hash function.
-    seed = ((seed + 0x7ed55d16) + (seed << 12))  & 0xffffffff;
-    seed = ((seed ^ 0xc761c23c) ^ (seed >>> 19)) & 0xffffffff;
-    seed = ((seed + 0x165667b1) + (seed << 5))   & 0xffffffff;
-    seed = ((seed + 0xd3a2646c) ^ (seed << 9))   & 0xffffffff;
-    seed = ((seed + 0xfd7046c5) + (seed << 3))   & 0xffffffff;
-    seed = ((seed ^ 0xb55a4f09) ^ (seed >>> 16)) & 0xffffffff;
-    return (seed & 0xfffffff) / 0x10000000;
-  };
-})();
-
-
-// Runs all registered benchmark suites and optionally yields between
-// each individual benchmark to avoid running for too long in the
-// context of browsers. Once done, the final score is reported to the
-// runner.
-BenchmarkSuite.RunSuites = function(runner) {
-  var continuation = null;
-  var suites = BenchmarkSuite.suites;
-  var length = suites.length;
-  BenchmarkSuite.scores = [];
-  var index = 0;
-  function RunStep() {
-    while (continuation || index < length) {
-      if (continuation) {
-        continuation = continuation();
-      } else {
-        var suite = suites[index++];
-        if (runner.NotifyStart) runner.NotifyStart(suite.name);
-        continuation = suite.RunStep(runner);
-      }
-      if (continuation && typeof window != 'undefined' && window.setTimeout) {
-        window.setTimeout(RunStep, 25);
-        return;
-      }
-    }
-    if (runner.NotifyScore) {
-      var score = BenchmarkSuite.GeometricMean(BenchmarkSuite.scores);
-      var formatted = BenchmarkSuite.FormatScore(100 * score);
-      runner.NotifyScore(formatted);
-    }
-  }
-  RunStep();
-}
-
-
-// Counts the total number of registered benchmarks. Useful for
-// showing progress as a percentage.
-BenchmarkSuite.CountBenchmarks = function() {
-  var result = 0;
-  var suites = BenchmarkSuite.suites;
-  for (var i = 0; i < suites.length; i++) {
-    result += suites[i].benchmarks.length;
-  }
-  return result;
-}
-
-
-// Computes the geometric mean of a set of numbers.
-BenchmarkSuite.GeometricMean = function(numbers) {
-  var log = 0;
-  for (var i = 0; i < numbers.length; i++) {
-    log += Math.log(numbers[i]);
-  }
-  return Math.pow(Math.E, log / numbers.length);
-}
-
-
-// Converts a score value to a string with at least three significant
-// digits.
-BenchmarkSuite.FormatScore = function(value) {
-  if (value > 100) {
-    return value.toFixed(0);
-  } else {
-    return value.toPrecision(3);
-  }
-}
-
-// Notifies the runner that we're done running a single benchmark in
-// the benchmark suite. This can be useful to report progress.
-BenchmarkSuite.prototype.NotifyStep = function(result) {
-  this.results.push(result);
-  if (this.runner.NotifyStep) this.runner.NotifyStep(result.benchmark.name);
-}
-
-
-// Notifies the runner that we're done with running a suite and that
-// we have a result which can be reported to the user if needed.
-BenchmarkSuite.prototype.NotifyResult = function() {
-  var mean = BenchmarkSuite.GeometricMean(this.results);
-  var score = this.reference / mean;
-  BenchmarkSuite.scores.push(score);
-  if (this.runner.NotifyResult) {
-    var formatted = BenchmarkSuite.FormatScore(100 * score);
-    this.runner.NotifyResult(this.name, formatted);
-  }
-}
-
-
-// Notifies the runner that running a benchmark resulted in an error.
-BenchmarkSuite.prototype.NotifyError = function(error) {
-  if (this.runner.NotifyError) {
-    this.runner.NotifyError(this.name, error);
-  }
-  if (this.runner.NotifyStep) {
-    this.runner.NotifyStep(this.name);
-  }
-}
-
-
-// Runs a single benchmark for at least a second and computes the
-// average time it takes to run a single iteration.
-BenchmarkSuite.prototype.RunSingleBenchmark = function(benchmark) {
-  var elapsed = 0;
-  var start = new Date();
-  for (var n = 0; elapsed < 20; n++) {
-    benchmark.run();
-    elapsed = new Date() - start;
-  }
-  var usec = (elapsed * 1000) / n;
-  this.NotifyStep(new BenchmarkResult(benchmark, usec));
-}
-
-
-// This function starts running a suite, but stops between each
-// individual benchmark in the suite and returns a continuation
-// function which can be invoked to run the next benchmark. Once the
-// last benchmark has been executed, null is returned.
-BenchmarkSuite.prototype.RunStep = function(runner) {
-  this.results = [];
-  this.runner = runner;
-  var length = this.benchmarks.length;
-  var index = 0;
-  var suite = this;
-
-  // Run the setup, the actual benchmark, and the tear down in three
-  // separate steps to allow the framework to yield between any of the
-  // steps.
-
-  function RunNextSetup() {
-    if (index < length) {
-      try {
-        suite.benchmarks[index].Setup();
-      } catch (e) {
-        suite.NotifyError(e);
-        return null;
-      }
-      return RunNextBenchmark;
-    }
-    suite.NotifyResult();
-    return null;
-  }
-
-  function RunNextBenchmark() {
-    try {
-      suite.RunSingleBenchmark(suite.benchmarks[index]);
-    } catch (e) {
-      suite.NotifyError(e);
-      return null;
-    }
-    return RunNextTearDown;
-  }
-
-  function RunNextTearDown() {
-    try {
-      suite.benchmarks[index++].TearDown();
-    } catch (e) {
-      suite.NotifyError(e);
-      return null;
-    }
-    return RunNextSetup;
-  }
-
-  // Start out running the setup.
-  return RunNextSetup();
-}
-
-/*
- * Copyright (c) 2003-2005  Tom Wu
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
- * THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * In addition, the following condition applies:
- *
- * All redistributions must retain an intact copy of this copyright notice
- * and disclaimer.
- */
-
-
-// The code has been adapted for use as a benchmark by Google.
-var Crypto = new BenchmarkSuite('Crypto', 203037, [
-  new Benchmark("Encrypt", encrypt),
-  new Benchmark("Decrypt", decrypt)
-]);
-
-
-// Basic JavaScript BN library - subset useful for RSA encryption.
-
-// Bits per digit
-var dbits;
-var BI_DB;
-var BI_DM;
-var BI_DV;
-
-var BI_FP;
-var BI_FV;
-var BI_F1;
-var BI_F2;
-
-// JavaScript engine analysis
-var canary = 0xdeadbeefcafe;
-var j_lm = ((canary&0xffffff)==0xefcafe);
-
-// (public) Constructor
-function BigInteger(a,b,c) {
-  this.array = new Array();
-  if(a != null)
-    if("number" == typeof a) this.fromNumber(a,b,c);
-    else if(b == null && "string" != typeof a) this.fromString(a,256);
-    else this.fromString(a,b);
-}
-
-// return new, unset BigInteger
-function nbi() { return new BigInteger(null); }
-
-// am: Compute w_j += (x*this_i), propagate carries,
-// c is initial carry, returns final carry.
-// c < 3*dvalue, x < 2*dvalue, this_i < dvalue
-// We need to select the fastest one that works in this environment.
-
-// am1: use a single mult and divide to get the high bits,
-// max digit bits should be 26 because
-// max internal value = 2*dvalue^2-2*dvalue (< 2^53)
-function am1(i,x,w,j,c,n) {
-  var this_array = this.array;
-  var w_array    = w.array;
-  /* BEGIN LOOP */
-  while(--n >= 0) {
-    var v = x*this_array[i++]+w_array[j]+c;
-    c = Math.floor(v/0x4000000);
-    w_array[j++] = v&0x3ffffff;
-  }
-  /* END LOOP */
-  return c;
-}
-
-// am2 avoids a big mult-and-extract completely.
-// Max digit bits should be <= 30 because we do bitwise ops
-// on values up to 2*hdvalue^2-hdvalue-1 (< 2^31)
-function am2(i,x,w,j,c,n) {
-  var this_array = this.array;
-  var w_array    = w.array;
-  var xl = x&0x7fff, xh = x>>15;
-  /* BEGIN LOOP */
-  while(--n >= 0) {
-    var l = this_array[i]&0x7fff;
-    var h = this_array[i++]>>15;
-    var m = xh*l+h*xl;
-    l = xl*l+((m&0x7fff)<<15)+w_array[j]+(c&0x3fffffff);
-    c = (l>>>30)+(m>>>15)+xh*h+(c>>>30);
-    w_array[j++] = l&0x3fffffff;
-  }
-  /* END LOOP */
-  return c;
-}
-
-// Alternately, set max digit bits to 28 since some
-// browsers slow down when dealing with 32-bit numbers.
-function am3(i,x,w,j,c,n) {
-  var this_array = this.array;
-  var w_array    = w.array;
-
-  var xl = x&0x3fff, xh = x>>14;
-  /* BEGIN LOOP */
-  while(--n >= 0) {
-    var l = this_array[i]&0x3fff;
-    var h = this_array[i++]>>14;
-    var m = xh*l+h*xl;
-    l = xl*l+((m&0x3fff)<<14)+w_array[j]+c;
-    c = (l>>28)+(m>>14)+xh*h;
-    w_array[j++] = l&0xfffffff;
-  }
-  /* END LOOP */
-  return c;
-}
-
-// This is tailored to VMs with 2-bit tagging. It makes sure
-// that all the computations stay within the 29 bits available.
-function am4(i,x,w,j,c,n) {
-  var this_array = this.array;
-  var w_array    = w.array;
-
-  var xl = x&0x1fff, xh = x>>13;
-  /* BEGIN LOOP */
-  while(--n >= 0) {
-    var l = this_array[i]&0x1fff;
-    var h = this_array[i++]>>13;
-    var m = xh*l+h*xl;
-    l = xl*l+((m&0x1fff)<<13)+w_array[j]+c;
-    c = (l>>26)+(m>>13)+xh*h;
-    w_array[j++] = l&0x3ffffff;
-  }
-  /* END LOOP */
-  return c;
-}
-
-// am3/28 is best for SM, Rhino, but am4/26 is best for v8.
-// Kestrel (Opera 9.5) gets its best result with am4/26.
-// IE7 does 9% better with am3/28 than with am4/26.
-// Firefox (SM) gets 10% faster with am3/28 than with am4/26.
-
-setupEngine = function(fn, bits) {
-  BigInteger.prototype.am = fn;
-  dbits = bits;
-
-  BI_DB = dbits;
-  BI_DM = ((1<<dbits)-1);
-  BI_DV = (1<<dbits);
-
-  BI_FP = 52;
-  BI_FV = Math.pow(2,BI_FP);
-  BI_F1 = BI_FP-dbits;
-  BI_F2 = 2*dbits-BI_FP;
-}
-
-
-// Digit conversions
-var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz";
-var BI_RC = new Array();
-var rr,vv;
-rr = "0".charCodeAt(0);
-  /* BEGIN LOOP */
-for(vv = 0; vv <= 9; ++vv) BI_RC[rr++] = vv;
-  /* END LOOP */
-rr = "a".charCodeAt(0);
-  /* BEGIN LOOP */
-for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
-  /* END LOOP */
-rr = "A".charCodeAt(0);
-  /* BEGIN LOOP */
-for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
-  /* END LOOP */
-
-function int2char(n) { return BI_RM.charAt(n); }
-function intAt(s,i) {
-  var c = BI_RC[s.charCodeAt(i)];
-  return (c==null)?-1:c;
-}
-
-// (protected) copy this to r
-function bnpCopyTo(r) {
-  var this_array = this.array;
-  var r_array    = r.array;
-
-  /* BEGIN LOOP */
-  for(var i = this.t-1; i >= 0; --i) r_array[i] = this_array[i];
-  /* END LOOP */
-  r.t = this.t;
-  r.s = this.s;
-}
-
-// (protected) set from integer value x, -DV <= x < DV
-function bnpFromInt(x) {
-  var this_array = this.array;
-  this.t = 1;
-  this.s = (x<0)?-1:0;
-  if(x > 0) this_array[0] = x;
-  else if(x < -1) this_array[0] = x+DV;
-  else this.t = 0;
-}
-
-// return bigint initialized to value
-function nbv(i) { var r = nbi(); r.fromInt(i); return r; }
-
-// (protected) set from string and radix
-function bnpFromString(s,b) {
-  var this_array = this.array;
-  var k;
-  if(b == 16) k = 4;
-  else if(b == 8) k = 3;
-  else if(b == 256) k = 8; // byte array
-  else if(b == 2) k = 1;
-  else if(b == 32) k = 5;
-  else if(b == 4) k = 2;
-  else { this.fromRadix(s,b); return; }
-  this.t = 0;
-  this.s = 0;
-  var i = s.length, mi = false, sh = 0;
-  /* BEGIN LOOP */
-  while(--i >= 0) {
-    var x = (k==8)?s[i]&0xff:intAt(s,i);
-    if(x < 0) {
-      if(s.charAt(i) == "-") mi = true;
-      continue;
-    }
-    mi = false;
-    if(sh == 0)
-      this_array[this.t++] = x;
-    else if(sh+k > BI_DB) {
-      this_array[this.t-1] |= (x&((1<<(BI_DB-sh))-1))<<sh;
-      this_array[this.t++] = (x>>(BI_DB-sh));
-    }
-    else
-      this_array[this.t-1] |= x<<sh;
-    sh += k;
-    if(sh >= BI_DB) sh -= BI_DB;
-  }
-  /* END LOOP */
-  if(k == 8 && (s[0]&0x80) != 0) {
-    this.s = -1;
-    if(sh > 0) this_array[this.t-1] |= ((1<<(BI_DB-sh))-1)<<sh;
-  }
-  this.clamp();
-  if(mi) BigInteger.ZERO.subTo(this,this);
-}
-
-// (protected) clamp off excess high words
-function bnpClamp() {
-  var this_array = this.array;
-  var c = this.s&BI_DM;
-  /* BEGIN LOOP */
-  while(this.t > 0 && this_array[this.t-1] == c) --this.t;
-  /* END LOOP */
-}
-
-// (public) return string representation in given radix
-function bnToString(b) {
-  var this_array = this.array;
-  if(this.s < 0) return "-"+this.negate().toString(b);
-  var k;
-  if(b == 16) k = 4;
-  else if(b == 8) k = 3;
-  else if(b == 2) k = 1;
-  else if(b == 32) k = 5;
-  else if(b == 4) k = 2;
-  else return this.toRadix(b);
-  var km = (1<<k)-1, d, m = false, r = "", i = this.t;
-  var p = BI_DB-(i*BI_DB)%k;
-  if(i-- > 0) {
-    if(p < BI_DB && (d = this_array[i]>>p) > 0) { m = true; r = int2char(d); }
-  /* BEGIN LOOP */
-    while(i >= 0) {
-      if(p < k) {
-        d = (this_array[i]&((1<<p)-1))<<(k-p);
-        d |= this_array[--i]>>(p+=BI_DB-k);
-      }
-      else {
-        d = (this_array[i]>>(p-=k))&km;
-        if(p <= 0) { p += BI_DB; --i; }
-      }
-      if(d > 0) m = true;
-      if(m) r += int2char(d);
-    }
-  /* END LOOP */
-  }
-  return m?r:"0";
-}
-
-// (public) -this
-function bnNegate() { var r = nbi(); BigInteger.ZERO.subTo(this,r); return r; }
-
-// (public) |this|
-function bnAbs() { return (this.s<0)?this.negate():this; }
-
-// (public) return + if this > a, - if this < a, 0 if equal
-function bnCompareTo(a) {
-  var this_array = this.array;
-  var a_array = a.array;
-
-  var r = this.s-a.s;
-  if(r != 0) return r;
-  var i = this.t;
-  r = i-a.t;
-  if(r != 0) return r;
-  /* BEGIN LOOP */
-  while(--i >= 0) if((r=this_array[i]-a_array[i]) != 0) return r;
-  /* END LOOP */
-  return 0;
-}
-
-// returns bit length of the integer x
-function nbits(x) {
-  var r = 1, t;
-  if((t=x>>>16) != 0) { x = t; r += 16; }
-  if((t=x>>8) != 0) { x = t; r += 8; }
-  if((t=x>>4) != 0) { x = t; r += 4; }
-  if((t=x>>2) != 0) { x = t; r += 2; }
-  if((t=x>>1) != 0) { x = t; r += 1; }
-  return r;
-}
-
-// (public) return the number of bits in "this"
-function bnBitLength() {
-  var this_array = this.array;
-  if(this.t <= 0) return 0;
-  return BI_DB*(this.t-1)+nbits(this_array[this.t-1]^(this.s&BI_DM));
-}
-
-// (protected) r = this << n*DB
-function bnpDLShiftTo(n,r) {
-  var this_array = this.array;
-  var r_array = r.array;
-  var i;
-  /* BEGIN LOOP */
-  for(i = this.t-1; i >= 0; --i) r_array[i+n] = this_array[i];
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for(i = n-1; i >= 0; --i) r_array[i] = 0;
-  /* END LOOP */
-  r.t = this.t+n;
-  r.s = this.s;
-}
-
-// (protected) r = this >> n*DB
-function bnpDRShiftTo(n,r) {
-  var this_array = this.array;
-  var r_array = r.array;
-  /* BEGIN LOOP */
-  for(var i = n; i < this.t; ++i) r_array[i-n] = this_array[i];
-  /* END LOOP */
-  r.t = Math.max(this.t-n,0);
-  r.s = this.s;
-}
-
-// (protected) r = this << n
-function bnpLShiftTo(n,r) {
-  var this_array = this.array;
-  var r_array = r.array;
-  var bs = n%BI_DB;
-  var cbs = BI_DB-bs;
-  var bm = (1<<cbs)-1;
-  var ds = Math.floor(n/BI_DB), c = (this.s<<bs)&BI_DM, i;
-  /* BEGIN LOOP */
-  for(i = this.t-1; i >= 0; --i) {
-    r_array[i+ds+1] = (this_array[i]>>cbs)|c;
-    c = (this_array[i]&bm)<<bs;
-  }
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for(i = ds-1; i >= 0; --i) r_array[i] = 0;
-  /* END LOOP */
-  r_array[ds] = c;
-  r.t = this.t+ds+1;
-  r.s = this.s;
-  r.clamp();
-}
-
-// (protected) r = this >> n
-function bnpRShiftTo(n,r) {
-  var this_array = this.array;
-  var r_array = r.array;
-  r.s = this.s;
-  var ds = Math.floor(n/BI_DB);
-  if(ds >= this.t) { r.t = 0; return; }
-  var bs = n%BI_DB;
-  var cbs = BI_DB-bs;
-  var bm = (1<<bs)-1;
-  r_array[0] = this_array[ds]>>bs;
-  /* BEGIN LOOP */
-  for(var i = ds+1; i < this.t; ++i) {
-    r_array[i-ds-1] |= (this_array[i]&bm)<<cbs;
-    r_array[i-ds] = this_array[i]>>bs;
-  }
-  /* END LOOP */
-  if(bs > 0) r_array[this.t-ds-1] |= (this.s&bm)<<cbs;
-  r.t = this.t-ds;
-  r.clamp();
-}
-
-// (protected) r = this - a
-function bnpSubTo(a,r) {
-  var this_array = this.array;
-  var r_array = r.array;
-  var a_array = a.array;
-  var i = 0, c = 0, m = Math.min(a.t,this.t);
-  /* BEGIN LOOP */
-  while(i < m) {
-    c += this_array[i]-a_array[i];
-    r_array[i++] = c&BI_DM;
-    c >>= BI_DB;
-  }
-  /* END LOOP */
-  if(a.t < this.t) {
-    c -= a.s;
-  /* BEGIN LOOP */
-    while(i < this.t) {
-      c += this_array[i];
-      r_array[i++] = c&BI_DM;
-      c >>= BI_DB;
-    }
-  /* END LOOP */
-    c += this.s;
-  }
-  else {
-    c += this.s;
-  /* BEGIN LOOP */
-    while(i < a.t) {
-      c -= a_array[i];
-      r_array[i++] = c&BI_DM;
-      c >>= BI_DB;
-    }
-  /* END LOOP */
-    c -= a.s;
-  }
-  r.s = (c<0)?-1:0;
-  if(c < -1) r_array[i++] = BI_DV+c;
-  else if(c > 0) r_array[i++] = c;
-  r.t = i;
-  r.clamp();
-}
-
-// (protected) r = this * a, r != this,a (HAC 14.12)
-// "this" should be the larger one if appropriate.
-function bnpMultiplyTo(a,r) {
-  var this_array = this.array;
-  var r_array = r.array;
-  var x = this.abs(), y = a.abs();
-  var y_array = y.array;
-
-  var i = x.t;
-  r.t = i+y.t;
-  /* BEGIN LOOP */
-  while(--i >= 0) r_array[i] = 0;
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for(i = 0; i < y.t; ++i) r_array[i+x.t] = x.am(0,y_array[i],r,i,0,x.t);
-  r.s = 0;
-  r.clamp();
-  if(this.s != a.s) BigInteger.ZERO.subTo(r,r);
-}
-
-// (protected) r = this^2, r != this (HAC 14.16)
-function bnpSquareTo(r) {
-  var x = this.abs();
-  var x_array = x.array;
-  var r_array = r.array;
-
-  var i = r.t = 2*x.t;
-  /* BEGIN LOOP */
-  while(--i >= 0) r_array[i] = 0;
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for(i = 0; i < x.t-1; ++i) {
-    var c = x.am(i,x_array[i],r,2*i,0,1);
-    if((r_array[i+x.t]+=x.am(i+1,2*x_array[i],r,2*i+1,c,x.t-i-1)) >= BI_DV) {
-      r_array[i+x.t] -= BI_DV;
-      r_array[i+x.t+1] = 1;
-    }
-  }
-  /* END LOOP */
-  if(r.t > 0) r_array[r.t-1] += x.am(i,x_array[i],r,2*i,0,1);
-  r.s = 0;
-  r.clamp();
-}
-
-// (protected) divide this by m, quotient and remainder to q, r (HAC 14.20)
-// r != q, this != m.  q or r may be null.
-function bnpDivRemTo(m,q,r) {
-  var pm = m.abs();
-  if(pm.t <= 0) return;
-  var pt = this.abs();
-  if(pt.t < pm.t) {
-    if(q != null) q.fromInt(0);
-    if(r != null) this.copyTo(r);
-    return;
-  }
-  if(r == null) r = nbi();
-  var y = nbi(), ts = this.s, ms = m.s;
-  var pm_array = pm.array;
-  var nsh = BI_DB-nbits(pm_array[pm.t-1]);	// normalize modulus
-  if(nsh > 0) { pm.lShiftTo(nsh,y); pt.lShiftTo(nsh,r); }
-  else { pm.copyTo(y); pt.copyTo(r); }
-  var ys = y.t;
-
-  var y_array = y.array;
-  var y0 = y_array[ys-1];
-  if(y0 == 0) return;
-  var yt = y0*(1<<BI_F1)+((ys>1)?y_array[ys-2]>>BI_F2:0);
-  var d1 = BI_FV/yt, d2 = (1<<BI_F1)/yt, e = 1<<BI_F2;
-  var i = r.t, j = i-ys, t = (q==null)?nbi():q;
-  y.dlShiftTo(j,t);
-
-  var r_array = r.array;
-  if(r.compareTo(t) >= 0) {
-    r_array[r.t++] = 1;
-    r.subTo(t,r);
-  }
-  BigInteger.ONE.dlShiftTo(ys,t);
-  t.subTo(y,y);	// "negative" y so we can replace sub with am later
-  /* BEGIN LOOP */
-  while(y.t < ys) y_array[y.t++] = 0;
-  /* END LOOP */
-  /* BEGIN LOOP */
-  while(--j >= 0) {
-    // Estimate quotient digit
-    var qd = (r_array[--i]==y0)?BI_DM:Math.floor(r_array[i]*d1+(r_array[i-1]+e)*d2);
-    if((r_array[i]+=y.am(0,qd,r,j,0,ys)) < qd) {	// Try it out
-      y.dlShiftTo(j,t);
-      r.subTo(t,r);
-  /* BEGIN LOOP */
-      while(r_array[i] < --qd) r.subTo(t,r);
-  /* END LOOP */
-    }
-  }
-  /* END LOOP */
-  if(q != null) {
-    r.drShiftTo(ys,q);
-    if(ts != ms) BigInteger.ZERO.subTo(q,q);
-  }
-  r.t = ys;
-  r.clamp();
-  if(nsh > 0) r.rShiftTo(nsh,r);	// Denormalize remainder
-  if(ts < 0) BigInteger.ZERO.subTo(r,r);
-}
-
-// (public) this mod a
-function bnMod(a) {
-  var r = nbi();
-  this.abs().divRemTo(a,null,r);
-  if(this.s < 0 && r.compareTo(BigInteger.ZERO) > 0) a.subTo(r,r);
-  return r;
-}
-
-// Modular reduction using "classic" algorithm
-function Classic(m) { this.m = m; }
-function cConvert(x) {
-  if(x.s < 0 || x.compareTo(this.m) >= 0) return x.mod(this.m);
-  else return x;
-}
-function cRevert(x) { return x; }
-function cReduce(x) { x.divRemTo(this.m,null,x); }
-function cMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
-function cSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
-
-Classic.prototype.convert = cConvert;
-Classic.prototype.revert = cRevert;
-Classic.prototype.reduce = cReduce;
-Classic.prototype.mulTo = cMulTo;
-Classic.prototype.sqrTo = cSqrTo;
-
-// (protected) return "-1/this % 2^DB"; useful for Mont. reduction
-// justification:
-//         xy == 1 (mod m)
-//         xy =  1+km
-//   xy(2-xy) = (1+km)(1-km)
-// x[y(2-xy)] = 1-k^2m^2
-// x[y(2-xy)] == 1 (mod m^2)
-// if y is 1/x mod m, then y(2-xy) is 1/x mod m^2
-// should reduce x and y(2-xy) by m^2 at each step to keep size bounded.
-// JS multiply "overflows" differently from C/C++, so care is needed here.
-function bnpInvDigit() {
-  var this_array = this.array;
-  if(this.t < 1) return 0;
-  var x = this_array[0];
-  if((x&1) == 0) return 0;
-  var y = x&3;		// y == 1/x mod 2^2
-  y = (y*(2-(x&0xf)*y))&0xf;	// y == 1/x mod 2^4
-  y = (y*(2-(x&0xff)*y))&0xff;	// y == 1/x mod 2^8
-  y = (y*(2-(((x&0xffff)*y)&0xffff)))&0xffff;	// y == 1/x mod 2^16
-  // last step - calculate inverse mod DV directly;
-  // assumes 16 < DB <= 32 and assumes ability to handle 48-bit ints
-  y = (y*(2-x*y%BI_DV))%BI_DV;		// y == 1/x mod 2^dbits
-  // we really want the negative inverse, and -DV < y < DV
-  return (y>0)?BI_DV-y:-y;
-}
-
-// Montgomery reduction
-function Montgomery(m) {
-  this.m = m;
-  this.mp = m.invDigit();
-  this.mpl = this.mp&0x7fff;
-  this.mph = this.mp>>15;
-  this.um = (1<<(BI_DB-15))-1;
-  this.mt2 = 2*m.t;
-}
-
-// xR mod m
-function montConvert(x) {
-  var r = nbi();
-  x.abs().dlShiftTo(this.m.t,r);
-  r.divRemTo(this.m,null,r);
-  if(x.s < 0 && r.compareTo(BigInteger.ZERO) > 0) this.m.subTo(r,r);
-  return r;
-}
-
-// x/R mod m
-function montRevert(x) {
-  var r = nbi();
-  x.copyTo(r);
-  this.reduce(r);
-  return r;
-}
-
-// x = x/R mod m (HAC 14.32)
-function montReduce(x) {
-  var x_array = x.array;
-  /* BEGIN LOOP */
-  while(x.t <= this.mt2)	// pad x so am has enough room later
-    x_array[x.t++] = 0;
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for(var i = 0; i < this.m.t; ++i) {
-    // faster way of calculating u0 = x[i]*mp mod DV
-    var j = x_array[i]&0x7fff;
-    var u0 = (j*this.mpl+(((j*this.mph+(x_array[i]>>15)*this.mpl)&this.um)<<15))&BI_DM;
-    // use am to combine the multiply-shift-add into one call
-    j = i+this.m.t;
-    x_array[j] += this.m.am(0,u0,x,i,0,this.m.t);
-    // propagate carry
-  /* BEGIN LOOP */
-    while(x_array[j] >= BI_DV) { x_array[j] -= BI_DV; x_array[++j]++; }
-  /* BEGIN LOOP */
-  }
-  /* END LOOP */
-  x.clamp();
-  x.drShiftTo(this.m.t,x);
-  if(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
-}
-
-// r = "x^2/R mod m"; x != r
-function montSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
-
-// r = "xy/R mod m"; x,y != r
-function montMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
-
-Montgomery.prototype.convert = montConvert;
-Montgomery.prototype.revert = montRevert;
-Montgomery.prototype.reduce = montReduce;
-Montgomery.prototype.mulTo = montMulTo;
-Montgomery.prototype.sqrTo = montSqrTo;
-
-// (protected) true iff this is even
-function bnpIsEven() {
-  var this_array = this.array;
-  return ((this.t>0)?(this_array[0]&1):this.s) == 0;
-}
-
-// (protected) this^e, e < 2^32, doing sqr and mul with "r" (HAC 14.79)
-function bnpExp(e,z) {
-  if(e > 0xffffffff || e < 1) return BigInteger.ONE;
-  var r = nbi(), r2 = nbi(), g = z.convert(this), i = nbits(e)-1;
-  g.copyTo(r);
-  /* BEGIN LOOP */
-  while(--i >= 0) {
-    z.sqrTo(r,r2);
-    if((e&(1<<i)) > 0) z.mulTo(r2,g,r);
-    else { var t = r; r = r2; r2 = t; }
-  }
-  /* END LOOP */
-  return z.revert(r);
-}
-
-// (public) this^e % m, 0 <= e < 2^32
-function bnModPowInt(e,m) {
-  var z;
-  if(e < 256 || m.isEven()) z = new Classic(m); else z = new Montgomery(m);
-  return this.exp(e,z);
-}
-
-// protected
-BigInteger.prototype.copyTo = bnpCopyTo;
-BigInteger.prototype.fromInt = bnpFromInt;
-BigInteger.prototype.fromString = bnpFromString;
-BigInteger.prototype.clamp = bnpClamp;
-BigInteger.prototype.dlShiftTo = bnpDLShiftTo;
-BigInteger.prototype.drShiftTo = bnpDRShiftTo;
-BigInteger.prototype.lShiftTo = bnpLShiftTo;
-BigInteger.prototype.rShiftTo = bnpRShiftTo;
-BigInteger.prototype.subTo = bnpSubTo;
-BigInteger.prototype.multiplyTo = bnpMultiplyTo;
-BigInteger.prototype.squareTo = bnpSquareTo;
-BigInteger.prototype.divRemTo = bnpDivRemTo;
-BigInteger.prototype.invDigit = bnpInvDigit;
-BigInteger.prototype.isEven = bnpIsEven;
-BigInteger.prototype.exp = bnpExp;
-
-// public
-BigInteger.prototype.toString = bnToString;
-BigInteger.prototype.negate = bnNegate;
-BigInteger.prototype.abs = bnAbs;
-BigInteger.prototype.compareTo = bnCompareTo;
-BigInteger.prototype.bitLength = bnBitLength;
-BigInteger.prototype.mod = bnMod;
-BigInteger.prototype.modPowInt = bnModPowInt;
-
-// "constants"
-BigInteger.ZERO = nbv(0);
-BigInteger.ONE = nbv(1);
-// Copyright (c) 2005  Tom Wu
-// All Rights Reserved.
-// See "LICENSE" for details.
-
-// Extended JavaScript BN functions, required for RSA private ops.
-
-// (public)
-function bnClone() { var r = nbi(); this.copyTo(r); return r; }
-
-// (public) return value as integer
-function bnIntValue() {
-  var this_array = this.array;
-  if(this.s < 0) {
-    if(this.t == 1) return this_array[0]-BI_DV;
-    else if(this.t == 0) return -1;
-  }
-  else if(this.t == 1) return this_array[0];
-  else if(this.t == 0) return 0;
-  // assumes 16 < DB < 32
-  return ((this_array[1]&((1<<(32-BI_DB))-1))<<BI_DB)|this_array[0];
-}
-
-// (public) return value as byte
-function bnByteValue() {
-  var this_array = this.array;
-  return (this.t==0)?this.s:(this_array[0]<<24)>>24;
-}
-
-// (public) return value as short (assumes DB>=16)
-function bnShortValue() {
-  var this_array = this.array;
-  return (this.t==0)?this.s:(this_array[0]<<16)>>16;
-}
-
-// (protected) return x s.t. r^x < DV
-function bnpChunkSize(r) { return Math.floor(Math.LN2*BI_DB/Math.log(r)); }
-
-// (public) 0 if this == 0, 1 if this > 0
-function bnSigNum() {
-  var this_array = this.array;
-  if(this.s < 0) return -1;
-  else if(this.t <= 0 || (this.t == 1 && this_array[0] <= 0)) return 0;
-  else return 1;
-}
-
-// (protected) convert to radix string
-function bnpToRadix(b) {
-  if(b == null) b = 10;
-  if(this.signum() == 0 || b < 2 || b > 36) return "0";
-  var cs = this.chunkSize(b);
-  var a = Math.pow(b,cs);
-  var d = nbv(a), y = nbi(), z = nbi(), r = "";
-  this.divRemTo(d,y,z);
-  /* BEGIN LOOP */
-  while(y.signum() > 0) {
-    r = (a+z.intValue()).toString(b).substr(1) + r;
-    y.divRemTo(d,y,z);
-  }
-  /* END LOOP */
-  return z.intValue().toString(b) + r;
-}
-
-// (protected) convert from radix string
-function bnpFromRadix(s,b) {
-  this.fromInt(0);
-  if(b == null) b = 10;
-  var cs = this.chunkSize(b);
-  var d = Math.pow(b,cs), mi = false, j = 0, w = 0;
-  /* BEGIN LOOP */
-  for(var i = 0; i < s.length; ++i) {
-    var x = intAt(s,i);
-    if(x < 0) {
-      if(s.charAt(i) == "-" && this.signum() == 0) mi = true;
-      continue;
-    }
-    w = b*w+x;
-    if(++j >= cs) {
-      this.dMultiply(d);
-      this.dAddOffset(w,0);
-      j = 0;
-      w = 0;
-    }
-  }
-  /* END LOOP */
-  if(j > 0) {
-    this.dMultiply(Math.pow(b,j));
-    this.dAddOffset(w,0);
-  }
-  if(mi) BigInteger.ZERO.subTo(this,this);
-}
-
-// (protected) alternate constructor
-function bnpFromNumber(a,b,c) {
-  if("number" == typeof b) {
-    // new BigInteger(int,int,RNG)
-    if(a < 2) this.fromInt(1);
-    else {
-      this.fromNumber(a,c);
-      if(!this.testBit(a-1))	// force MSB set
-        this.bitwiseTo(BigInteger.ONE.shiftLeft(a-1),op_or,this);
-      if(this.isEven()) this.dAddOffset(1,0); // force odd
-  /* BEGIN LOOP */
-      while(!this.isProbablePrime(b)) {
-        this.dAddOffset(2,0);
-        if(this.bitLength() > a) this.subTo(BigInteger.ONE.shiftLeft(a-1),this);
-      }
-  /* END LOOP */
-    }
-  }
-  else {
-    // new BigInteger(int,RNG)
-    var x = new Array(), t = a&7;
-    x.length = (a>>3)+1;
-    b.nextBytes(x);
-    if(t > 0) x[0] &= ((1<<t)-1); else x[0] = 0;
-    this.fromString(x,256);
-  }
-}
-
-// (public) convert to bigendian byte array
-function bnToByteArray() {
-  var this_array = this.array;
-  var i = this.t, r = new Array();
-  r[0] = this.s;
-  var p = BI_DB-(i*BI_DB)%8, d, k = 0;
-  if(i-- > 0) {
-    if(p < BI_DB && (d = this_array[i]>>p) != (this.s&BI_DM)>>p)
-      r[k++] = d|(this.s<<(BI_DB-p));
-  /* BEGIN LOOP */
-    while(i >= 0) {
-      if(p < 8) {
-        d = (this_array[i]&((1<<p)-1))<<(8-p);
-        d |= this_array[--i]>>(p+=BI_DB-8);
-      }
-      else {
-        d = (this_array[i]>>(p-=8))&0xff;
-        if(p <= 0) { p += BI_DB; --i; }
-      }
-      if((d&0x80) != 0) d |= -256;
-      if(k == 0 && (this.s&0x80) != (d&0x80)) ++k;
-      if(k > 0 || d != this.s) r[k++] = d;
-    }
-  /* END LOOP */
-  }
-  return r;
-}
-
-function bnEquals(a) { return(this.compareTo(a)==0); }
-function bnMin(a) { return(this.compareTo(a)<0)?this:a; }
-function bnMax(a) { return(this.compareTo(a)>0)?this:a; }
-
-// (protected) r = this op a (bitwise)
-function bnpBitwiseTo(a,op,r) {
-  var this_array = this.array;
-  var a_array    = a.array;
-  var r_array    = r.array;
-  var i, f, m = Math.min(a.t,this.t);
-  /* BEGIN LOOP */
-  for(i = 0; i < m; ++i) r_array[i] = op(this_array[i],a_array[i]);
-  /* END LOOP */
-  if(a.t < this.t) {
-    f = a.s&BI_DM;
-  /* BEGIN LOOP */
-    for(i = m; i < this.t; ++i) r_array[i] = op(this_array[i],f);
-  /* END LOOP */
-    r.t = this.t;
-  }
-  else {
-    f = this.s&BI_DM;
-  /* BEGIN LOOP */
-    for(i = m; i < a.t; ++i) r_array[i] = op(f,a_array[i]);
-  /* END LOOP */
-    r.t = a.t;
-  }
-  r.s = op(this.s,a.s);
-  r.clamp();
-}
-
-// (public) this & a
-function op_and(x,y) { return x&y; }
-function bnAnd(a) { var r = nbi(); this.bitwiseTo(a,op_and,r); return r; }
-
-// (public) this | a
-function op_or(x,y) { return x|y; }
-function bnOr(a) { var r = nbi(); this.bitwiseTo(a,op_or,r); return r; }
-
-// (public) this ^ a
-function op_xor(x,y) { return x^y; }
-function bnXor(a) { var r = nbi(); this.bitwiseTo(a,op_xor,r); return r; }
-
-// (public) this & ~a
-function op_andnot(x,y) { return x&~y; }
-function bnAndNot(a) { var r = nbi(); this.bitwiseTo(a,op_andnot,r); return r; }
-
-// (public) ~this
-function bnNot() {
-  var this_array = this.array;
-  var r = nbi();
-  var r_array = r.array;
-
-  /* BEGIN LOOP */
-  for(var i = 0; i < this.t; ++i) r_array[i] = BI_DM&~this_array[i];
-  /* END LOOP */
-  r.t = this.t;
-  r.s = ~this.s;
-  return r;
-}
-
-// (public) this << n
-function bnShiftLeft(n) {
-  var r = nbi();
-  if(n < 0) this.rShiftTo(-n,r); else this.lShiftTo(n,r);
-  return r;
-}
-
-// (public) this >> n
-function bnShiftRight(n) {
-  var r = nbi();
-  if(n < 0) this.lShiftTo(-n,r); else this.rShiftTo(n,r);
-  return r;
-}
-
-// return index of lowest 1-bit in x, x < 2^31
-function lbit(x) {
-  if(x == 0) return -1;
-  var r = 0;
-  if((x&0xffff) == 0) { x >>= 16; r += 16; }
-  if((x&0xff) == 0) { x >>= 8; r += 8; }
-  if((x&0xf) == 0) { x >>= 4; r += 4; }
-  if((x&3) == 0) { x >>= 2; r += 2; }
-  if((x&1) == 0) ++r;
-  return r;
-}
-
-// (public) returns index of lowest 1-bit (or -1 if none)
-function bnGetLowestSetBit() {
-  var this_array = this.array;
-  /* BEGIN LOOP */
-  for(var i = 0; i < this.t; ++i)
-    if(this_array[i] != 0) return i*BI_DB+lbit(this_array[i]);
-  /* END LOOP */
-  if(this.s < 0) return this.t*BI_DB;
-  return -1;
-}
-
-// return number of 1 bits in x
-function cbit(x) {
-  var r = 0;
-  /* BEGIN LOOP */
-  while(x != 0) { x &= x-1; ++r; }
-  /* END LOOP */
-  return r;
-}
-
-// (public) return number of set bits
-function bnBitCount() {
-  var r = 0, x = this.s&BI_DM;
-  /* BEGIN LOOP */
-  for(var i = 0; i < this.t; ++i) r += cbit(this_array[i]^x);
-  /* END LOOP */
-  return r;
-}
-
-// (public) true iff nth bit is set
-function bnTestBit(n) {
-  var this_array = this.array;
-  var j = Math.floor(n/BI_DB);
-  if(j >= this.t) return(this.s!=0);
-  return((this_array[j]&(1<<(n%BI_DB)))!=0);
-}
-
-// (protected) this op (1<<n)
-function bnpChangeBit(n,op) {
-  var r = BigInteger.ONE.shiftLeft(n);
-  this.bitwiseTo(r,op,r);
-  return r;
-}
-
-// (public) this | (1<<n)
-function bnSetBit(n) { return this.changeBit(n,op_or); }
-
-// (public) this & ~(1<<n)
-function bnClearBit(n) { return this.changeBit(n,op_andnot); }
-
-// (public) this ^ (1<<n)
-function bnFlipBit(n) { return this.changeBit(n,op_xor); }
-
-// (protected) r = this + a
-function bnpAddTo(a,r) {
-  var this_array = this.array;
-  var a_array = a.array;
-  var r_array = r.array;
-  var i = 0, c = 0, m = Math.min(a.t,this.t);
-  /* BEGIN LOOP */
-  while(i < m) {
-    c += this_array[i]+a_array[i];
-    r_array[i++] = c&BI_DM;
-    c >>= BI_DB;
-  }
-  /* END LOOP */
-  if(a.t < this.t) {
-    c += a.s;
-  /* BEGIN LOOP */
-    while(i < this.t) {
-      c += this_array[i];
-      r_array[i++] = c&BI_DM;
-      c >>= BI_DB;
-    }
-  /* END LOOP */
-    c += this.s;
-  }
-  else {
-    c += this.s;
-  /* BEGIN LOOP */
-    while(i < a.t) {
-      c += a_array[i];
-      r_array[i++] = c&BI_DM;
-      c >>= BI_DB;
-    }
-  /* END LOOP */
-    c += a.s;
-  }
-  r.s = (c<0)?-1:0;
-  if(c > 0) r_array[i++] = c;
-  else if(c < -1) r_array[i++] = BI_DV+c;
-  r.t = i;
-  r.clamp();
-}
-
-// (public) this + a
-function bnAdd(a) { var r = nbi(); this.addTo(a,r); return r; }
-
-// (public) this - a
-function bnSubtract(a) { var r = nbi(); this.subTo(a,r); return r; }
-
-// (public) this * a
-function bnMultiply(a) { var r = nbi(); this.multiplyTo(a,r); return r; }
-
-// (public) this / a
-function bnDivide(a) { var r = nbi(); this.divRemTo(a,r,null); return r; }
-
-// (public) this % a
-function bnRemainder(a) { var r = nbi(); this.divRemTo(a,null,r); return r; }
-
-// (public) [this/a,this%a]
-function bnDivideAndRemainder(a) {
-  var q = nbi(), r = nbi();
-  this.divRemTo(a,q,r);
-  return new Array(q,r);
-}
-
-// (protected) this *= n, this >= 0, 1 < n < DV
-function bnpDMultiply(n) {
-  var this_array = this.array;
-  this_array[this.t] = this.am(0,n-1,this,0,0,this.t);
-  ++this.t;
-  this.clamp();
-}
-
-// (protected) this += n << w words, this >= 0
-function bnpDAddOffset(n,w) {
-  var this_array = this.array;
-  /* BEGIN LOOP */
-  while(this.t <= w) this_array[this.t++] = 0;
-  /* END LOOP */
-  this_array[w] += n;
-  /* BEGIN LOOP */
-  while(this_array[w] >= BI_DV) {
-    this_array[w] -= BI_DV;
-    if(++w >= this.t) this_array[this.t++] = 0;
-    ++this_array[w];
-  }
-  /* END LOOP */
-}
-
-// A "null" reducer
-function NullExp() {}
-function nNop(x) { return x; }
-function nMulTo(x,y,r) { x.multiplyTo(y,r); }
-function nSqrTo(x,r) { x.squareTo(r); }
-
-NullExp.prototype.convert = nNop;
-NullExp.prototype.revert = nNop;
-NullExp.prototype.mulTo = nMulTo;
-NullExp.prototype.sqrTo = nSqrTo;
-
-// (public) this^e
-function bnPow(e) { return this.exp(e,new NullExp()); }
-
-// (protected) r = lower n words of "this * a", a.t <= n
-// "this" should be the larger one if appropriate.
-function bnpMultiplyLowerTo(a,n,r) {
-  var r_array = r.array;
-  var a_array = a.array;
-  var i = Math.min(this.t+a.t,n);
-  r.s = 0; // assumes a,this >= 0
-  r.t = i;
-  /* BEGIN LOOP */
-  while(i > 0) r_array[--i] = 0;
-  /* END LOOP */
-  var j;
-  /* BEGIN LOOP */
-  for(j = r.t-this.t; i < j; ++i) r_array[i+this.t] = this.am(0,a_array[i],r,i,0,this.t);
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for(j = Math.min(a.t,n); i < j; ++i) this.am(0,a_array[i],r,i,0,n-i);
-  /* END LOOP */
-  r.clamp();
-}
-
-// (protected) r = "this * a" without lower n words, n > 0
-// "this" should be the larger one if appropriate.
-function bnpMultiplyUpperTo(a,n,r) {
-  var r_array = r.array;
-  var a_array = a.array;
-  --n;
-  var i = r.t = this.t+a.t-n;
-  r.s = 0; // assumes a,this >= 0
-  /* BEGIN LOOP */
-  while(--i >= 0) r_array[i] = 0;
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for(i = Math.max(n-this.t,0); i < a.t; ++i)
-    r_array[this.t+i-n] = this.am(n-i,a_array[i],r,0,0,this.t+i-n);
-  /* END LOOP */
-  r.clamp();
-  r.drShiftTo(1,r);
-}
-
-// Barrett modular reduction
-function Barrett(m) {
-  // setup Barrett
-  this.r2 = nbi();
-  this.q3 = nbi();
-  BigInteger.ONE.dlShiftTo(2*m.t,this.r2);
-  this.mu = this.r2.divide(m);
-  this.m = m;
-}
-
-function barrettConvert(x) {
-  if(x.s < 0 || x.t > 2*this.m.t) return x.mod(this.m);
-  else if(x.compareTo(this.m) < 0) return x;
-  else { var r = nbi(); x.copyTo(r); this.reduce(r); return r; }
-}
-
-function barrettRevert(x) { return x; }
-
-// x = x mod m (HAC 14.42)
-function barrettReduce(x) {
-  x.drShiftTo(this.m.t-1,this.r2);
-  if(x.t > this.m.t+1) { x.t = this.m.t+1; x.clamp(); }
-  this.mu.multiplyUpperTo(this.r2,this.m.t+1,this.q3);
-  this.m.multiplyLowerTo(this.q3,this.m.t+1,this.r2);
-  /* BEGIN LOOP */
-  while(x.compareTo(this.r2) < 0) x.dAddOffset(1,this.m.t+1);
-  /* END LOOP */
-  x.subTo(this.r2,x);
-  /* BEGIN LOOP */
-  while(x.compareTo(this.m) >= 0) x.subTo(this.m,x);
-  /* END LOOP */
-}
-
-// r = x^2 mod m; x != r
-function barrettSqrTo(x,r) { x.squareTo(r); this.reduce(r); }
-
-// r = x*y mod m; x,y != r
-function barrettMulTo(x,y,r) { x.multiplyTo(y,r); this.reduce(r); }
-
-Barrett.prototype.convert = barrettConvert;
-Barrett.prototype.revert = barrettRevert;
-Barrett.prototype.reduce = barrettReduce;
-Barrett.prototype.mulTo = barrettMulTo;
-Barrett.prototype.sqrTo = barrettSqrTo;
-
-// (public) this^e % m (HAC 14.85)
-function bnModPow(e,m) {
-  var e_array = e.array;
-  var i = e.bitLength(), k, r = nbv(1), z;
-  if(i <= 0) return r;
-  else if(i < 18) k = 1;
-  else if(i < 48) k = 3;
-  else if(i < 144) k = 4;
-  else if(i < 768) k = 5;
-  else k = 6;
-  if(i < 8)
-    z = new Classic(m);
-  else if(m.isEven())
-    z = new Barrett(m);
-  else
-    z = new Montgomery(m);
-
-  // precomputation
-  var g = new Array(), n = 3, k1 = k-1, km = (1<<k)-1;
-  g[1] = z.convert(this);
-  if(k > 1) {
-    var g2 = nbi();
-    z.sqrTo(g[1],g2);
-  /* BEGIN LOOP */
-    while(n <= km) {
-      g[n] = nbi();
-      z.mulTo(g2,g[n-2],g[n]);
-      n += 2;
-    }
-  /* END LOOP */
-  }
-
-  var j = e.t-1, w, is1 = true, r2 = nbi(), t;
-  i = nbits(e_array[j])-1;
-  /* BEGIN LOOP */
-  while(j >= 0) {
-    if(i >= k1) w = (e_array[j]>>(i-k1))&km;
-    else {
-      w = (e_array[j]&((1<<(i+1))-1))<<(k1-i);
-      if(j > 0) w |= e_array[j-1]>>(BI_DB+i-k1);
-    }
-
-    n = k;
-  /* BEGIN LOOP */
-    while((w&1) == 0) { w >>= 1; --n; }
-  /* END LOOP */
-    if((i -= n) < 0) { i += BI_DB; --j; }
-    if(is1) {	// ret == 1, don't bother squaring or multiplying it
-      g[w].copyTo(r);
-      is1 = false;
-    }
-    else {
-  /* BEGIN LOOP */
-      while(n > 1) { z.sqrTo(r,r2); z.sqrTo(r2,r); n -= 2; }
-  /* END LOOP */
-      if(n > 0) z.sqrTo(r,r2); else { t = r; r = r2; r2 = t; }
-      z.mulTo(r2,g[w],r);
-    }
-
-  /* BEGIN LOOP */
-    while(j >= 0 && (e_array[j]&(1<<i)) == 0) {
-      z.sqrTo(r,r2); t = r; r = r2; r2 = t;
-      if(--i < 0) { i = BI_DB-1; --j; }
-    }
-  /* END LOOP */
-  }
-  /* END LOOP */
-  return z.revert(r);
-}
-
-// (public) gcd(this,a) (HAC 14.54)
-function bnGCD(a) {
-  var x = (this.s<0)?this.negate():this.clone();
-  var y = (a.s<0)?a.negate():a.clone();
-  if(x.compareTo(y) < 0) { var t = x; x = y; y = t; }
-  var i = x.getLowestSetBit(), g = y.getLowestSetBit();
-  if(g < 0) return x;
-  if(i < g) g = i;
-  if(g > 0) {
-    x.rShiftTo(g,x);
-    y.rShiftTo(g,y);
-  }
-  /* BEGIN LOOP */
-  while(x.signum() > 0) {
-    if((i = x.getLowestSetBit()) > 0) x.rShiftTo(i,x);
-    if((i = y.getLowestSetBit()) > 0) y.rShiftTo(i,y);
-    if(x.compareTo(y) >= 0) {
-      x.subTo(y,x);
-      x.rShiftTo(1,x);
-    }
-    else {
-      y.subTo(x,y);
-      y.rShiftTo(1,y);
-    }
-  }
-  /* END LOOP */
-  if(g > 0) y.lShiftTo(g,y);
-  return y;
-}
-
-// (protected) this % n, n < 2^26
-function bnpModInt(n) {
-  var this_array = this.array;
-  if(n <= 0) return 0;
-  var d = BI_DV%n, r = (this.s<0)?n-1:0;
-  if(this.t > 0)
-    if(d == 0) r = this_array[0]%n;
-    else for(var i = this.t-1; i >= 0; --i) r = (d*r+this_array[i])%n;
-  return r;
-}
-
-// (public) 1/this % m (HAC 14.61)
-function bnModInverse(m) {
-  var ac = m.isEven();
-  if((this.isEven() && ac) || m.signum() == 0) return BigInteger.ZERO;
-  var u = m.clone(), v = this.clone();
-  var a = nbv(1), b = nbv(0), c = nbv(0), d = nbv(1);
-  /* BEGIN LOOP */
-  while(u.signum() != 0) {
-  /* BEGIN LOOP */
-    while(u.isEven()) {
-      u.rShiftTo(1,u);
-      if(ac) {
-        if(!a.isEven() || !b.isEven()) { a.addTo(this,a); b.subTo(m,b); }
-        a.rShiftTo(1,a);
-      }
-      else if(!b.isEven()) b.subTo(m,b);
-      b.rShiftTo(1,b);
-    }
-  /* END LOOP */
-  /* BEGIN LOOP */
-    while(v.isEven()) {
-      v.rShiftTo(1,v);
-      if(ac) {
-        if(!c.isEven() || !d.isEven()) { c.addTo(this,c); d.subTo(m,d); }
-        c.rShiftTo(1,c);
-      }
-      else if(!d.isEven()) d.subTo(m,d);
-      d.rShiftTo(1,d);
-    }
-  /* END LOOP */
-    if(u.compareTo(v) >= 0) {
-      u.subTo(v,u);
-      if(ac) a.subTo(c,a);
-      b.subTo(d,b);
-    }
-    else {
-      v.subTo(u,v);
-      if(ac) c.subTo(a,c);
-      d.subTo(b,d);
-    }
-  }
-  /* END LOOP */
-  if(v.compareTo(BigInteger.ONE) != 0) return BigInteger.ZERO;
-  if(d.compareTo(m) >= 0) return d.subtract(m);
-  if(d.signum() < 0) d.addTo(m,d); else return d;
-  if(d.signum() < 0) return d.add(m); else return d;
-}
-
-var lowprimes = [2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,467,479,487,491,499,503,509];
-var lplim = (1<<26)/lowprimes[lowprimes.length-1];
-
-// (public) test primality with certainty >= 1-.5^t
-function bnIsProbablePrime(t) {
-  var i, x = this.abs();
-  var x_array = x.array;
-  if(x.t == 1 && x_array[0] <= lowprimes[lowprimes.length-1]) {
-    for(i = 0; i < lowprimes.length; ++i)
-      if(x_array[0] == lowprimes[i]) return true;
-    return false;
-  }
-  if(x.isEven()) return false;
-  i = 1;
-  /* BEGIN LOOP */
-  while(i < lowprimes.length) {
-    var m = lowprimes[i], j = i+1;
-  /* BEGIN LOOP */
-    while(j < lowprimes.length && m < lplim) m *= lowprimes[j++];
-  /* END LOOP */
-    m = x.modInt(m);
-  /* BEGIN LOOP */
-    while(i < j) if(m%lowprimes[i++] == 0) return false;
-  /* END LOOP */
-  }
-  /* END LOOP */
-  return x.millerRabin(t);
-}
-
-// (protected) true if probably prime (HAC 4.24, Miller-Rabin)
-function bnpMillerRabin(t) {
-  var n1 = this.subtract(BigInteger.ONE);
-  var k = n1.getLowestSetBit();
-  if(k <= 0) return false;
-  var r = n1.shiftRight(k);
-  t = (t+1)>>1;
-  if(t > lowprimes.length) t = lowprimes.length;
-  var a = nbi();
-  /* BEGIN LOOP */
-  for(var i = 0; i < t; ++i) {
-    a.fromInt(lowprimes[i]);
-    var y = a.modPow(r,this);
-    if(y.compareTo(BigInteger.ONE) != 0 && y.compareTo(n1) != 0) {
-      var j = 1;
-  /* BEGIN LOOP */
-      while(j++ < k && y.compareTo(n1) != 0) {
-        y = y.modPowInt(2,this);
-        if(y.compareTo(BigInteger.ONE) == 0) return false;
-      }
-  /* END LOOP */
-      if(y.compareTo(n1) != 0) return false;
-    }
-  }
-  /* END LOOP */
-  return true;
-}
-
-// protected
-BigInteger.prototype.chunkSize = bnpChunkSize;
-BigInteger.prototype.toRadix = bnpToRadix;
-BigInteger.prototype.fromRadix = bnpFromRadix;
-BigInteger.prototype.fromNumber = bnpFromNumber;
-BigInteger.prototype.bitwiseTo = bnpBitwiseTo;
-BigInteger.prototype.changeBit = bnpChangeBit;
-BigInteger.prototype.addTo = bnpAddTo;
-BigInteger.prototype.dMultiply = bnpDMultiply;
-BigInteger.prototype.dAddOffset = bnpDAddOffset;
-BigInteger.prototype.multiplyLowerTo = bnpMultiplyLowerTo;
-BigInteger.prototype.multiplyUpperTo = bnpMultiplyUpperTo;
-BigInteger.prototype.modInt = bnpModInt;
-BigInteger.prototype.millerRabin = bnpMillerRabin;
-
-// public
-BigInteger.prototype.clone = bnClone;
-BigInteger.prototype.intValue = bnIntValue;
-BigInteger.prototype.byteValue = bnByteValue;
-BigInteger.prototype.shortValue = bnShortValue;
-BigInteger.prototype.signum = bnSigNum;
-BigInteger.prototype.toByteArray = bnToByteArray;
-BigInteger.prototype.equals = bnEquals;
-BigInteger.prototype.min = bnMin;
-BigInteger.prototype.max = bnMax;
-BigInteger.prototype.and = bnAnd;
-BigInteger.prototype.or = bnOr;
-BigInteger.prototype.xor = bnXor;
-BigInteger.prototype.andNot = bnAndNot;
-BigInteger.prototype.not = bnNot;
-BigInteger.prototype.shiftLeft = bnShiftLeft;
-BigInteger.prototype.shiftRight = bnShiftRight;
-BigInteger.prototype.getLowestSetBit = bnGetLowestSetBit;
-BigInteger.prototype.bitCount = bnBitCount;
-BigInteger.prototype.testBit = bnTestBit;
-BigInteger.prototype.setBit = bnSetBit;
-BigInteger.prototype.clearBit = bnClearBit;
-BigInteger.prototype.flipBit = bnFlipBit;
-BigInteger.prototype.add = bnAdd;
-BigInteger.prototype.subtract = bnSubtract;
-BigInteger.prototype.multiply = bnMultiply;
-BigInteger.prototype.divide = bnDivide;
-BigInteger.prototype.remainder = bnRemainder;
-BigInteger.prototype.divideAndRemainder = bnDivideAndRemainder;
-BigInteger.prototype.modPow = bnModPow;
-BigInteger.prototype.modInverse = bnModInverse;
-BigInteger.prototype.pow = bnPow;
-BigInteger.prototype.gcd = bnGCD;
-BigInteger.prototype.isProbablePrime = bnIsProbablePrime;
-
-// BigInteger interfaces not implemented in jsbn:
-
-// BigInteger(int signum, byte[] magnitude)
-// double doubleValue()
-// float floatValue()
-// int hashCode()
-// long longValue()
-// static BigInteger valueOf(long val)
-// prng4.js - uses Arcfour as a PRNG
-
-function Arcfour() {
-  this.i = 0;
-  this.j = 0;
-  this.S = new Array();
-}
-
-// Initialize arcfour context from key, an array of ints, each from [0..255]
-function ARC4init(key) {
-  var i, j, t;
-  /* BEGIN LOOP */
-  for(i = 0; i < 256; ++i)
-    this.S[i] = i;
-  /* END LOOP */
-  j = 0;
-  /* BEGIN LOOP */
-  for(i = 0; i < 256; ++i) {
-    j = (j + this.S[i] + key[i % key.length]) & 255;
-    t = this.S[i];
-    this.S[i] = this.S[j];
-    this.S[j] = t;
-  }
-  /* END LOOP */
-  this.i = 0;
-  this.j = 0;
-}
-
-function ARC4next() {
-  var t;
-  this.i = (this.i + 1) & 255;
-  this.j = (this.j + this.S[this.i]) & 255;
-  t = this.S[this.i];
-  this.S[this.i] = this.S[this.j];
-  this.S[this.j] = t;
-  return this.S[(t + this.S[this.i]) & 255];
-}
-
-Arcfour.prototype.init = ARC4init;
-Arcfour.prototype.next = ARC4next;
-
-// Plug in your RNG constructor here
-function prng_newstate() {
-  return new Arcfour();
-}
-
-// Pool size must be a multiple of 4 and greater than 32.
-// An array of bytes the size of the pool will be passed to init()
-var rng_psize = 256;
-// Random number generator - requires a PRNG backend, e.g. prng4.js
-
-// For best results, put code like
-// <body onClick='rng_seed_time();' onKeyPress='rng_seed_time();'>
-// in your main HTML document.
-
-var rng_state;
-var rng_pool;
-var rng_pptr;
-
-// Mix in a 32-bit integer into the pool
-function rng_seed_int(x) {
-  rng_pool[rng_pptr++] ^= x & 255;
-  rng_pool[rng_pptr++] ^= (x >> 8) & 255;
-  rng_pool[rng_pptr++] ^= (x >> 16) & 255;
-  rng_pool[rng_pptr++] ^= (x >> 24) & 255;
-  if(rng_pptr >= rng_psize) rng_pptr -= rng_psize;
-}
-
-// Mix in the current time (w/milliseconds) into the pool
-function rng_seed_time() {
-  rng_seed_int(new Date().getTime());
-}
-
-// Initialize the pool with junk if needed.
-if(rng_pool == null) {
-  rng_pool = new Array();
-  rng_pptr = 0;
-  var t;
-  /* BEGIN LOOP */
-  while(rng_pptr < rng_psize) {  // extract some randomness from Math.random()
-    t = Math.floor(65536 * Math.random());
-    rng_pool[rng_pptr++] = t >>> 8;
-    rng_pool[rng_pptr++] = t & 255;
-  }
-  /* END LOOP */
-  rng_pptr = 0;
-  rng_seed_time();
-  //rng_seed_int(window.screenX);
-  //rng_seed_int(window.screenY);
-}
-
-function rng_get_byte() {
-  if(rng_state == null) {
-    rng_seed_time();
-    rng_state = prng_newstate();
-    rng_state.init(rng_pool);
-  /* BEGIN LOOP */
-    for(rng_pptr = 0; rng_pptr < rng_pool.length; ++rng_pptr)
-      rng_pool[rng_pptr] = 0;
-  /* END LOOP */
-    rng_pptr = 0;
-    //rng_pool = null;
-  }
-  // TODO: allow reseeding after first request
-  return rng_state.next();
-}
-
-function rng_get_bytes(ba) {
-  var i;
-  /* BEGIN LOOP */
-  for(i = 0; i < ba.length; ++i) ba[i] = rng_get_byte();
-  /* END LOOP */
-}
-
-function SecureRandom() {}
-
-SecureRandom.prototype.nextBytes = rng_get_bytes;
-// Depends on jsbn.js and rng.js
-
-// convert a (hex) string to a bignum object
-function parseBigInt(str,r) {
-  return new BigInteger(str,r);
-}
-
-function linebrk(s,n) {
-  var ret = "";
-  var i = 0;
-  /* BEGIN LOOP */
-  while(i + n < s.length) {
-    ret += s.substring(i,i+n) + "\n";
-    i += n;
-  }
-  /* END LOOP */
-  return ret + s.substring(i,s.length);
-}
-
-function byte2Hex(b) {
-  if(b < 0x10)
-    return "0" + b.toString(16);
-  else
-    return b.toString(16);
-}
-
-// PKCS#1 (type 2, random) pad input string s to n bytes, and return a bigint
-function pkcs1pad2(s,n) {
-  if(n < s.length + 11) {
-    alert("Message too long for RSA");
-    return null;
-  }
-  var ba = new Array();
-  var i = s.length - 1;
-  /* BEGIN LOOP */
-  while(i >= 0 && n > 0) ba[--n] = s.charCodeAt(i--);
-  /* END LOOP */
-  ba[--n] = 0;
-  var rng = new SecureRandom();
-  var x = new Array();
-  /* BEGIN LOOP */
-  while(n > 2) { // random non-zero pad
-    x[0] = 0;
-  /* BEGIN LOOP */
-    while(x[0] == 0) rng.nextBytes(x);
-  /* END LOOP */
-    ba[--n] = x[0];
-  }
-  /* END LOOP */
-  ba[--n] = 2;
-  ba[--n] = 0;
-  return new BigInteger(ba);
-}
-
-// "empty" RSA key constructor
-function RSAKey() {
-  this.n = null;
-  this.e = 0;
-  this.d = null;
-  this.p = null;
-  this.q = null;
-  this.dmp1 = null;
-  this.dmq1 = null;
-  this.coeff = null;
-}
-
-// Set the public key fields N and e from hex strings
-function RSASetPublic(N,E) {
-  if(N != null && E != null && N.length > 0 && E.length > 0) {
-    this.n = parseBigInt(N,16);
-    this.e = parseInt(E,16);
-  }
-  else
-    alert("Invalid RSA public key");
-}
-
-// Perform raw public operation on "x": return x^e (mod n)
-function RSADoPublic(x) {
-  return x.modPowInt(this.e, this.n);
-}
-
-// Return the PKCS#1 RSA encryption of "text" as an even-length hex string
-function RSAEncrypt(text) {
-  var m = pkcs1pad2(text,(this.n.bitLength()+7)>>3);
-  if(m == null) return null;
-  var c = this.doPublic(m);
-  if(c == null) return null;
-  var h = c.toString(16);
-  if((h.length & 1) == 0) return h; else return "0" + h;
-}
-
-// Return the PKCS#1 RSA encryption of "text" as a Base64-encoded string
-//function RSAEncryptB64(text) {
-//  var h = this.encrypt(text);
-//  if(h) return hex2b64(h); else return null;
-//}
-
-// protected
-RSAKey.prototype.doPublic = RSADoPublic;
-
-// public
-RSAKey.prototype.setPublic = RSASetPublic;
-RSAKey.prototype.encrypt = RSAEncrypt;
-//RSAKey.prototype.encrypt_b64 = RSAEncryptB64;
-// Depends on rsa.js and jsbn2.js
-
-// Undo PKCS#1 (type 2, random) padding and, if valid, return the plaintext
-function pkcs1unpad2(d,n) {
-  var b = d.toByteArray();
-  var i = 0;
-  /* BEGIN LOOP */
-  while(i < b.length && b[i] == 0) ++i;
-  /* END LOOP */
-  if(b.length-i != n-1 || b[i] != 2)
-    return null;
-  ++i;
-  /* BEGIN LOOP */
-  while(b[i] != 0)
-    if(++i >= b.length) return null;
-  /* END LOOP */
-  var ret = "";
-  /* BEGIN LOOP */
-  while(++i < b.length)
-    ret += String.fromCharCode(b[i]);
-  /* END LOOP */
-  return ret;
-}
-
-// Set the private key fields N, e, and d from hex strings
-function RSASetPrivate(N,E,D) {
-  if(N != null && E != null && N.length > 0 && E.length > 0) {
-    this.n = parseBigInt(N,16);
-    this.e = parseInt(E,16);
-    this.d = parseBigInt(D,16);
-  }
-  else
-    alert("Invalid RSA private key");
-}
-
-// Set the private key fields N, e, d and CRT params from hex strings
-function RSASetPrivateEx(N,E,D,P,Q,DP,DQ,C) {
-  if(N != null && E != null && N.length > 0 && E.length > 0) {
-    this.n = parseBigInt(N,16);
-    this.e = parseInt(E,16);
-    this.d = parseBigInt(D,16);
-    this.p = parseBigInt(P,16);
-    this.q = parseBigInt(Q,16);
-    this.dmp1 = parseBigInt(DP,16);
-    this.dmq1 = parseBigInt(DQ,16);
-    this.coeff = parseBigInt(C,16);
-  }
-  else
-    alert("Invalid RSA private key");
-}
-
-// Generate a new random private key B bits long, using public expt E
-function RSAGenerate(B,E) {
-  var rng = new SecureRandom();
-  var qs = B>>1;
-  this.e = parseInt(E,16);
-  var ee = new BigInteger(E,16);
-  /* BEGIN LOOP */
-  for(;;) {
-  /* BEGIN LOOP */
-    for(;;) {
-      this.p = new BigInteger(B-qs,1,rng);
-      if(this.p.subtract(BigInteger.ONE).gcd(ee).compareTo(BigInteger.ONE) == 0 && this.p.isProbablePrime(10)) break;
-    }
-  /* END LOOP */
-  /* BEGIN LOOP */
-    for(;;) {
-      this.q = new BigInteger(qs,1,rng);
-      if(this.q.subtract(BigInteger.ONE).gcd(ee).compareTo(BigInteger.ONE) == 0 && this.q.isProbablePrime(10)) break;
-    }
-  /* END LOOP */
-    if(this.p.compareTo(this.q) <= 0) {
-      var t = this.p;
-      this.p = this.q;
-      this.q = t;
-    }
-    var p1 = this.p.subtract(BigInteger.ONE);
-    var q1 = this.q.subtract(BigInteger.ONE);
-    var phi = p1.multiply(q1);
-    if(phi.gcd(ee).compareTo(BigInteger.ONE) == 0) {
-      this.n = this.p.multiply(this.q);
-      this.d = ee.modInverse(phi);
-      this.dmp1 = this.d.mod(p1);
-      this.dmq1 = this.d.mod(q1);
-      this.coeff = this.q.modInverse(this.p);
-      break;
-    }
-  }
-  /* END LOOP */
-}
-
-// Perform raw private operation on "x": return x^d (mod n)
-function RSADoPrivate(x) {
-  if(this.p == null || this.q == null)
-    return x.modPow(this.d, this.n);
-
-  // TODO: re-calculate any missing CRT params
-  var xp = x.mod(this.p).modPow(this.dmp1, this.p);
-  var xq = x.mod(this.q).modPow(this.dmq1, this.q);
-
-  /* BEGIN LOOP */
-  while(xp.compareTo(xq) < 0)
-    xp = xp.add(this.p);
-  /* END LOOP */
-  return xp.subtract(xq).multiply(this.coeff).mod(this.p).multiply(this.q).add(xq);
-}
-
-// Return the PKCS#1 RSA decryption of "ctext".
-// "ctext" is an even-length hex string and the output is a plain string.
-function RSADecrypt(ctext) {
-  var c = parseBigInt(ctext, 16);
-  var m = this.doPrivate(c);
-  if(m == null) return null;
-  return pkcs1unpad2(m, (this.n.bitLength()+7)>>3);
-}
-
-// Return the PKCS#1 RSA decryption of "ctext".
-// "ctext" is a Base64-encoded string and the output is a plain string.
-//function RSAB64Decrypt(ctext) {
-//  var h = b64tohex(ctext);
-//  if(h) return this.decrypt(h); else return null;
-//}
-
-// protected
-RSAKey.prototype.doPrivate = RSADoPrivate;
-
-// public
-RSAKey.prototype.setPrivate = RSASetPrivate;
-RSAKey.prototype.setPrivateEx = RSASetPrivateEx;
-RSAKey.prototype.generate = RSAGenerate;
-RSAKey.prototype.decrypt = RSADecrypt;
-//RSAKey.prototype.b64_decrypt = RSAB64Decrypt;
-
-
-nValue="a5261939975948bb7a58dffe5ff54e65f0498f9175f5a09288810b8975871e99af3b5dd94057b0fc07535f5f97444504fa35169d461d0d30cf0192e307727c065168c788771c561a9400fb49175e9e6aa4e23fe11af69e9412dd23b0cb6684c4c2429bce139e848ab26d0829073351f4acd36074eafd036a5eb83359d2a698d3";
-eValue="10001";
-dValue="8e9912f6d3645894e8d38cb58c0db81ff516cf4c7e5a14c7f1eddb1459d2cded4d8d293fc97aee6aefb861859c8b6a3d1dfe710463e1f9ddc72048c09751971c4a580aa51eb523357a3cc48d31cfad1d4a165066ed92d4748fb6571211da5cb14bc11b6e2df7c1a559e6d5ac1cd5c94703a22891464fba23d0d965086277a161";
-pValue="d090ce58a92c75233a6486cb0a9209bf3583b64f540c76f5294bb97d285eed33aec220bde14b2417951178ac152ceab6da7090905b478195498b352048f15e7d";
-qValue="cab575dc652bb66df15a0359609d51d1db184750c00c6698b90ef3465c99655103edbf0d54c56aec0ce3c4d22592338092a126a0cc49f65a4a30d222b411e58f";
-dmp1Value="1a24bca8e273df2f0e47c199bbf678604e7df7215480c77c8db39f49b000ce2cf7500038acfff5433b7d582a01f1826e6f4d42e1c57f5e1fef7b12aabc59fd25";
-dmq1Value="3d06982efbbe47339e1f6d36b1216b8a741d410b0c662f54f7118b27b9a4ec9d914337eb39841d8666f3034408cf94f5b62f11c402fc994fe15a05493150d9fd";
-coeffValue="3a3e731acd8960b7ff9eb81a7ff93bd1cfa74cbd56987db58b4594fb09c09084db1734c8143f98b602b981aaa9243ca28deb69b5b280ee8dcee0fd2625e53250";
-
-setupEngine(am3, 28);
-
-var RSA = new RSAKey();
-var TEXT = "The quick brown fox jumped over the extremely lazy frogs!";
-
-RSA.setPublic(nValue, eValue);
-RSA.setPrivateEx(nValue, eValue, dValue, pValue, qValue, dmp1Value, dmq1Value, coeffValue);
-
-function encrypt() {
-  return RSA.encrypt(TEXT);
-}
-
-function decrypt() {
-  return RSA.decrypt(TEXT);
-}
-
-function PrintResult(name, result) {
-}
-
-
-function PrintScore(score) {
-//  print(score);
-}
-
-
-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
-                           NotifyScore: PrintScore });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/deltablue.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/deltablue.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/deltablue.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/deltablue.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1196 +0,0 @@
-// Copyright 2008 the V8 project authors. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Simple framework for running the benchmark suites and
-// computing a score based on the timing measurements.
-
-
-// A benchmark has a name (string) and a function that will be run to
-// do the performance measurement. The optional setup and tearDown
-// arguments are functions that will be invoked before and after
-// running the benchmark, but the running time of these functions will
-// not be accounted for in the benchmark score.
-function Benchmark(name, run, setup, tearDown) {
-  this.name = name;
-  this.run = run;
-  this.Setup = setup ? setup : function() { };
-  this.TearDown = tearDown ? tearDown : function() { };
-}
-
-
-// Benchmark results hold the benchmark and the measured time used to
-// run the benchmark. The benchmark score is computed later once a
-// full benchmark suite has run to completion.
-function BenchmarkResult(benchmark, time) {
-  this.benchmark = benchmark;
-  this.time = time;
-}
-
-
-// Automatically convert results to numbers. Used by the geometric
-// mean computation.
-BenchmarkResult.prototype.valueOf = function() {
-  return this.time;
-}
-
-
-// Suites of benchmarks consist of a name and the set of benchmarks in
-// addition to the reference timing that the final score will be based
-// on. This way, all scores are relative to a reference run and higher
-// scores implies better performance.
-function BenchmarkSuite(name, reference, benchmarks) {
-  this.name = name;
-  this.reference = reference;
-  this.benchmarks = benchmarks;
-  BenchmarkSuite.suites.push(this);
-}
-
-
-// Keep track of all declared benchmark suites.
-BenchmarkSuite.suites = [];
-
-
-// Scores are not comparable across versions. Bump the version if
-// you're making changes that will affect that scores, e.g. if you add
-// a new benchmark or change an existing one.
-BenchmarkSuite.version = '5';
-
-
-// To make the benchmark results predictable, we replace Math.random
-// with a 100% deterministic alternative.
-Math.random = (function() {
-  var seed = 49734321;
-  return function() {
-    // Robert Jenkins' 32 bit integer hash function.
-    seed = ((seed + 0x7ed55d16) + (seed << 12))  & 0xffffffff;
-    seed = ((seed ^ 0xc761c23c) ^ (seed >>> 19)) & 0xffffffff;
-    seed = ((seed + 0x165667b1) + (seed << 5))   & 0xffffffff;
-    seed = ((seed + 0xd3a2646c) ^ (seed << 9))   & 0xffffffff;
-    seed = ((seed + 0xfd7046c5) + (seed << 3))   & 0xffffffff;
-    seed = ((seed ^ 0xb55a4f09) ^ (seed >>> 16)) & 0xffffffff;
-    return (seed & 0xfffffff) / 0x10000000;
-  };
-})();
-
-
-// Runs all registered benchmark suites and optionally yields between
-// each individual benchmark to avoid running for too long in the
-// context of browsers. Once done, the final score is reported to the
-// runner.
-BenchmarkSuite.RunSuites = function(runner) {
-  var continuation = null;
-  var suites = BenchmarkSuite.suites;
-  var length = suites.length;
-  BenchmarkSuite.scores = [];
-  var index = 0;
-  function RunStep() {
-    while (continuation || index < length) {
-      if (continuation) {
-        continuation = continuation();
-      } else {
-        var suite = suites[index++];
-        if (runner.NotifyStart) runner.NotifyStart(suite.name);
-        continuation = suite.RunStep(runner);
-      }
-      if (continuation && typeof window != 'undefined' && window.setTimeout) {
-        window.setTimeout(RunStep, 25);
-        return;
-      }
-    }
-    if (runner.NotifyScore) {
-      var score = BenchmarkSuite.GeometricMean(BenchmarkSuite.scores);
-      var formatted = BenchmarkSuite.FormatScore(100 * score);
-      runner.NotifyScore(formatted);
-    }
-  }
-  RunStep();
-}
-
-
-// Counts the total number of registered benchmarks. Useful for
-// showing progress as a percentage.
-BenchmarkSuite.CountBenchmarks = function() {
-  var result = 0;
-  var suites = BenchmarkSuite.suites;
-  for (var i = 0; i < suites.length; i++) {
-    result += suites[i].benchmarks.length;
-  }
-  return result;
-}
-
-
-// Computes the geometric mean of a set of numbers.
-BenchmarkSuite.GeometricMean = function(numbers) {
-  var log = 0;
-  for (var i = 0; i < numbers.length; i++) {
-    log += Math.log(numbers[i]);
-  }
-  return Math.pow(Math.E, log / numbers.length);
-}
-
-
-// Converts a score value to a string with at least three significant
-// digits.
-BenchmarkSuite.FormatScore = function(value) {
-  if (value > 100) {
-    return value.toFixed(0);
-  } else {
-    return value.toPrecision(3);
-  }
-}
-
-// Notifies the runner that we're done running a single benchmark in
-// the benchmark suite. This can be useful to report progress.
-BenchmarkSuite.prototype.NotifyStep = function(result) {
-  this.results.push(result);
-  if (this.runner.NotifyStep) this.runner.NotifyStep(result.benchmark.name);
-}
-
-
-// Notifies the runner that we're done with running a suite and that
-// we have a result which can be reported to the user if needed.
-BenchmarkSuite.prototype.NotifyResult = function() {
-  var mean = BenchmarkSuite.GeometricMean(this.results);
-  var score = this.reference / mean;
-  BenchmarkSuite.scores.push(score);
-  if (this.runner.NotifyResult) {
-    var formatted = BenchmarkSuite.FormatScore(100 * score);
-    this.runner.NotifyResult(this.name, formatted);
-  }
-}
-
-
-// Notifies the runner that running a benchmark resulted in an error.
-BenchmarkSuite.prototype.NotifyError = function(error) {
-  if (this.runner.NotifyError) {
-    this.runner.NotifyError(this.name, error);
-  }
-  if (this.runner.NotifyStep) {
-    this.runner.NotifyStep(this.name);
-  }
-}
-
-
-// Runs a single benchmark for at least a second and computes the
-// average time it takes to run a single iteration.
-BenchmarkSuite.prototype.RunSingleBenchmark = function(benchmark) {
-  var elapsed = 0;
-  var start = new Date();
-  for (var n = 0; elapsed < 200; n++) {
-    benchmark.run();
-    elapsed = new Date() - start;
-  }
-  var usec = (elapsed * 1000) / n;
-  this.NotifyStep(new BenchmarkResult(benchmark, usec));
-}
-
-
-// This function starts running a suite, but stops between each
-// individual benchmark in the suite and returns a continuation
-// function which can be invoked to run the next benchmark. Once the
-// last benchmark has been executed, null is returned.
-BenchmarkSuite.prototype.RunStep = function(runner) {
-  this.results = [];
-  this.runner = runner;
-  var length = this.benchmarks.length;
-  var index = 0;
-  var suite = this;
-
-  // Run the setup, the actual benchmark, and the tear down in three
-  // separate steps to allow the framework to yield between any of the
-  // steps.
-
-  function RunNextSetup() {
-    if (index < length) {
-      try {
-        suite.benchmarks[index].Setup();
-      } catch (e) {
-        suite.NotifyError(e);
-        return null;
-      }
-      return RunNextBenchmark;
-    }
-    suite.NotifyResult();
-    return null;
-  }
-
-  function RunNextBenchmark() {
-    try {
-      suite.RunSingleBenchmark(suite.benchmarks[index]);
-    } catch (e) {
-      suite.NotifyError(e);
-      return null;
-    }
-    return RunNextTearDown;
-  }
-
-  function RunNextTearDown() {
-    try {
-      suite.benchmarks[index++].TearDown();
-    } catch (e) {
-      suite.NotifyError(e);
-      return null;
-    }
-    return RunNextSetup;
-  }
-
-  // Start out running the setup.
-  return RunNextSetup();
-}
-
-
-// Copyright 2008 Google Inc. All Rights Reserved.
-// Copyright 1996 John Maloney and Mario Wolczko.
-
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-// This implementation of the DeltaBlue benchmark is derived 
-// from the Smalltalk implementation by John Maloney and Mario 
-// Wolczko. Some parts have been translated directly, whereas 
-// others have been modified more aggresively to make it feel 
-// more like a JavaScript program.
-
-
-var DeltaBlue = new BenchmarkSuite('DeltaBlue', 71104, [
-  new Benchmark('DeltaBlue', deltaBlue)
-]);
-
-
-/**
- * A JavaScript implementation of the DeltaBlue constrain-solving
- * algorithm, as described in:
- *
- * "The DeltaBlue Algorithm: An Incremental Constraint Hierarchy Solver"
- *   Bjorn N. Freeman-Benson and John Maloney
- *   January 1990 Communications of the ACM,
- *   also available as University of Washington TR 89-08-06.
- *
- * Beware: this benchmark is written in a grotesque style where
- * the constraint model is built by side-effects from constructors.
- * I've kept it this way to avoid deviating too much from the original
- * implementation.
- */
-
-
-/* --- O b j e c t   M o d e l --- */
-
-Object.prototype.inherits = function (shuper) {
-  function Inheriter() { }
-  Inheriter.prototype = shuper.prototype;
-  this.prototype = new Inheriter();
-  this.superConstructor = shuper;
-}
-
-function OrderedCollection() {
-  this.elms = new Array();
-}
-
-OrderedCollection.prototype.add = function (elm) {
-  this.elms.push(elm);
-}
-
-OrderedCollection.prototype.at = function (index) {
-  return this.elms[index];
-}
-
-OrderedCollection.prototype.size = function () {
-  return this.elms.length;
-}
-
-OrderedCollection.prototype.removeFirst = function () {
-  return this.elms.pop();
-}
-
-OrderedCollection.prototype.remove = function (elm) {
-  var index = 0, skipped = 0;
-  /* BEGIN LOOP */
-  for (var i = 0; i < this.elms.length; i++) {
-    var value = this.elms[i];
-    if (value != elm) {
-      this.elms[index] = value;
-      index++;
-    } else {
-      skipped++;
-    }
-  }
-  /* END LOOP */
-  /* BEGIN LOOP */
-  for (var i = 0; i < skipped; i++)
-    this.elms.pop();
-  /* END LOOP */
-}
-
-/* --- *
- * S t r e n g t h
- * --- */
-
-/**
- * Strengths are used to measure the relative importance of constraints.
- * New strengths may be inserted in the strength hierarchy without
- * disrupting current constraints.  Strengths cannot be created outside
- * this class, so pointer comparison can be used for value comparison.
- */
-function Strength(strengthValue, name) {
-  this.strengthValue = strengthValue;
-  this.name = name;
-}
-
-Strength.stronger = function (s1, s2) {
-  return s1.strengthValue < s2.strengthValue;
-}
-
-Strength.weaker = function (s1, s2) {
-  return s1.strengthValue > s2.strengthValue;
-}
-
-Strength.weakestOf = function (s1, s2) {
-  return this.weaker(s1, s2) ? s1 : s2;
-}
-
-Strength.strongest = function (s1, s2) {
-  return this.stronger(s1, s2) ? s1 : s2;
-}
-
-Strength.prototype.nextWeaker = function () {
-  switch (this.strengthValue) {
-    case 0: return Strength.WEAKEST;
-    case 1: return Strength.WEAK_DEFAULT;
-    case 2: return Strength.NORMAL;
-    case 3: return Strength.STRONG_DEFAULT;
-    case 4: return Strength.PREFERRED;
-    case 5: return Strength.REQUIRED;
-  }
-}
-
-// Strength constants.
-Strength.REQUIRED        = new Strength(0, "required");
-Strength.STONG_PREFERRED = new Strength(1, "strongPreferred");
-Strength.PREFERRED       = new Strength(2, "preferred");
-Strength.STRONG_DEFAULT  = new Strength(3, "strongDefault");
-Strength.NORMAL          = new Strength(4, "normal");
-Strength.WEAK_DEFAULT    = new Strength(5, "weakDefault");
-Strength.WEAKEST         = new Strength(6, "weakest");
-
-/* --- *
- * C o n s t r a i n t
- * --- */
-
-/**
- * An abstract class representing a system-maintainable relationship
- * (or "constraint") between a set of variables. A constraint supplies
- * a strength instance variable; concrete subclasses provide a means
- * of storing the constrained variables and other information required
- * to represent a constraint.
- */
-function Constraint(strength) {
-  this.strength = strength;
-}
-
-/**
- * Activate this constraint and attempt to satisfy it.
- */
-Constraint.prototype.addConstraint = function () {
-  this.addToGraph();
-  planner.incrementalAdd(this);
-}
-
-/**
- * Attempt to find a way to enforce this constraint. If successful,
- * record the solution, perhaps modifying the current dataflow
- * graph. Answer the constraint that this constraint overrides, if
- * there is one, or nil, if there isn't.
- * Assume: I am not already satisfied.
- */
-Constraint.prototype.satisfy = function (mark) {
-  this.chooseMethod(mark);
-  if (!this.isSatisfied()) {
-    if (this.strength == Strength.REQUIRED)
-      alert("Could not satisfy a required constraint!");
-    return null;
-  }
-  this.markInputs(mark);
-  var out = this.output();
-  var overridden = out.determinedBy;
-  if (overridden != null) overridden.markUnsatisfied();
-  out.determinedBy = this;
-  if (!planner.addPropagate(this, mark))
-    alert("Cycle encountered");
-  out.mark = mark;
-  return overridden;
-}
-
-Constraint.prototype.destroyConstraint = function () {
-  if (this.isSatisfied()) planner.incrementalRemove(this);
-  else this.removeFromGraph();
-}
-
-/**
- * Normal constraints are not input constraints.  An input constraint
- * is one that depends on external state, such as the mouse, the
- * keybord, a clock, or some arbitraty piece of imperative code.
- */
-Constraint.prototype.isInput = function () {
-  return false;
-}
-
-/* --- *
- * U n a r y   C o n s t r a i n t
- * --- */
-
-/**
- * Abstract superclass for constraints having a single possible output
- * variable.
- */
-function UnaryConstraint(v, strength) {
-  UnaryConstraint.superConstructor.call(this, strength);
-  this.myOutput = v;
-  this.satisfied = false;
-  this.addConstraint();
-}
-
-UnaryConstraint.inherits(Constraint);
-
-/**
- * Adds this constraint to the constraint graph
- */
-UnaryConstraint.prototype.addToGraph = function () {
-  this.myOutput.addConstraint(this);
-  this.satisfied = false;
-}
-
-/**
- * Decides if this constraint can be satisfied and records that
- * decision.
- */
-UnaryConstraint.prototype.chooseMethod = function (mark) {
-  this.satisfied = (this.myOutput.mark != mark)
-    && Strength.stronger(this.strength, this.myOutput.walkStrength);
-}
-
-/**
- * Returns true if this constraint is satisfied in the current solution.
- */
-UnaryConstraint.prototype.isSatisfied = function () {
-  return this.satisfied;
-}
-
-UnaryConstraint.prototype.markInputs = function (mark) {
-  // has no inputs
-}
-
-/**
- * Returns the current output variable.
- */
-UnaryConstraint.prototype.output = function () {
-  return this.myOutput;
-}
-
-/**
- * Calculate the walkabout strength, the stay flag, and, if it is
- * 'stay', the value for the current output of this constraint. Assume
- * this constraint is satisfied.
- */
-UnaryConstraint.prototype.recalculate = function () {
-  this.myOutput.walkStrength = this.strength;
-  this.myOutput.stay = !this.isInput();
-  if (this.myOutput.stay) this.execute(); // Stay optimization
-}
-
-/**
- * Records that this constraint is unsatisfied
- */
-UnaryConstraint.prototype.markUnsatisfied = function () {
-  this.satisfied = false;
-}
-
-UnaryConstraint.prototype.inputsKnown = function () {
-  return true;
-}
-
-UnaryConstraint.prototype.removeFromGraph = function () {
-  if (this.myOutput != null) this.myOutput.removeConstraint(this);
-  this.satisfied = false;
-}
-
-/* --- *
- * S t a y   C o n s t r a i n t
- * --- */
-
-/**
- * Variables that should, with some level of preference, stay the same.
- * Planners may exploit the fact that instances, if satisfied, will not
- * change their output during plan execution.  This is called "stay
- * optimization".
- */
-function StayConstraint(v, str) {
-  StayConstraint.superConstructor.call(this, v, str);
-}
-
-StayConstraint.inherits(UnaryConstraint);
-
-StayConstraint.prototype.execute = function () {
-  // Stay constraints do nothing
-}
-
-/* --- *
- * E d i t   C o n s t r a i n t
- * --- */
-
-/**
- * A unary input constraint used to mark a variable that the client
- * wishes to change.
- */
-function EditConstraint(v, str) {
-  EditConstraint.superConstructor.call(this, v, str);
-}
-
-EditConstraint.inherits(UnaryConstraint);
-
-/**
- * Edits indicate that a variable is to be changed by imperative code.
- */
-EditConstraint.prototype.isInput = function () {
-  return true;
-}
-
-EditConstraint.prototype.execute = function () {
-  // Edit constraints do nothing
-}
-
-/* --- *
- * B i n a r y   C o n s t r a i n t
- * --- */
-
-var Direction = new Object();
-Direction.NONE     = 0;
-Direction.FORWARD  = 1;
-Direction.BACKWARD = -1;
-
-/**
- * Abstract superclass for constraints having two possible output
- * variables.
- */
-function BinaryConstraint(var1, var2, strength) {
-  BinaryConstraint.superConstructor.call(this, strength);
-  this.v1 = var1;
-  this.v2 = var2;
-  this.direction = Direction.NONE;
-  this.addConstraint();
-}
-
-BinaryConstraint.inherits(Constraint);
-
-/**
- * Decides if this constratint can be satisfied and which way it
- * should flow based on the relative strength of the variables related,
- * and record that decision.
- */
-BinaryConstraint.prototype.chooseMethod = function (mark) {
-  if (this.v1.mark == mark) {
-    this.direction = (this.v1.mark != mark && Strength.stronger(this.strength, this.v2.walkStrength))
-      ? Direction.FORWARD
-      : Direction.NONE;
-  }
-  if (this.v2.mark == mark) {
-    this.direction = (this.v1.mark != mark && Strength.stronger(this.strength, this.v1.walkStrength))
-      ? Direction.BACKWARD
-      : Direction.NONE;
-  }
-  if (Strength.weaker(this.v1.walkStrength, this.v2.walkStrength)) {
-    this.direction = Strength.stronger(this.strength, this.v1.walkStrength)
-      ? Direction.BACKWARD
-      : Direction.NONE;
-  } else {
-    this.direction = Strength.stronger(this.strength, this.v2.walkStrength)
-      ? Direction.FORWARD
-      : Direction.BACKWARD
-  }
-}
-
-/**
- * Add this constraint to the constraint graph
- */
-BinaryConstraint.prototype.addToGraph = function () {
-  this.v1.addConstraint(this);
-  this.v2.addConstraint(this);
-  this.direction = Direction.NONE;
-}
-
-/**
- * Answer true if this constraint is satisfied in the current solution.
- */
-BinaryConstraint.prototype.isSatisfied = function () {
-  return this.direction != Direction.NONE;
-}
-
-/**
- * Mark the input variable with the given mark.
- */
-BinaryConstraint.prototype.markInputs = function (mark) {
-  this.input().mark = mark;
-}
-
-/**
- * Returns the current input variable
- */
-BinaryConstraint.prototype.input = function () {
-  return (this.direction == Direction.FORWARD) ? this.v1 : this.v2;
-}
-
-/**
- * Returns the current output variable
- */
-BinaryConstraint.prototype.output = function () {
-  return (this.direction == Direction.FORWARD) ? this.v2 : this.v1;
-}
-
-/**
- * Calculate the walkabout strength, the stay flag, and, if it is
- * 'stay', the value for the current output of this
- * constraint. Assume this constraint is satisfied.
- */
-BinaryConstraint.prototype.recalculate = function () {
-  var ihn = this.input(), out = this.output();
-  out.walkStrength = Strength.weakestOf(this.strength, ihn.walkStrength);
-  out.stay = ihn.stay;
-  if (out.stay) this.execute();
-}
-
-/**
- * Record the fact that this constraint is unsatisfied.
- */
-BinaryConstraint.prototype.markUnsatisfied = function () {
-  this.direction = Direction.NONE;
-}
-
-BinaryConstraint.prototype.inputsKnown = function (mark) {
-  var i = this.input();
-  return i.mark == mark || i.stay || i.determinedBy == null;
-}
-
-BinaryConstraint.prototype.removeFromGraph = function () {
-  if (this.v1 != null) this.v1.removeConstraint(this);
-  if (this.v2 != null) this.v2.removeConstraint(this);
-  this.direction = Direction.NONE;
-}
-
-/* --- *
- * S c a l e   C o n s t r a i n t
- * --- */
-
-/**
- * Relates two variables by the linear scaling relationship: "v2 =
- * (v1 * scale) + offset". Either v1 or v2 may be changed to maintain
- * this relationship but the scale factor and offset are considered
- * read-only.
- */
-function ScaleConstraint(src, scale, offset, dest, strength) {
-  this.direction = Direction.NONE;
-  this.scale = scale;
-  this.offset = offset;
-  ScaleConstraint.superConstructor.call(this, src, dest, strength);
-}
-
-ScaleConstraint.inherits(BinaryConstraint);
-
-/**
- * Adds this constraint to the constraint graph.
- */
-ScaleConstraint.prototype.addToGraph = function () {
-  ScaleConstraint.superConstructor.prototype.addToGraph.call(this);
-  this.scale.addConstraint(this);
-  this.offset.addConstraint(this);
-}
-
-ScaleConstraint.prototype.removeFromGraph = function () {
-  ScaleConstraint.superConstructor.prototype.removeFromGraph.call(this);
-  if (this.scale != null) this.scale.removeConstraint(this);
-  if (this.offset != null) this.offset.removeConstraint(this);
-}
-
-ScaleConstraint.prototype.markInputs = function (mark) {
-  ScaleConstraint.superConstructor.prototype.markInputs.call(this, mark);
-  this.scale.mark = this.offset.mark = mark;
-}
-
-/**
- * Enforce this constraint. Assume that it is satisfied.
- */
-ScaleConstraint.prototype.execute = function () {
-  if (this.direction == Direction.FORWARD) {
-    this.v2.value = this.v1.value * this.scale.value + this.offset.value;
-  } else {
-    this.v1.value = (this.v2.value - this.offset.value) / this.scale.value;
-  }
-}
-
-/**
- * Calculate the walkabout strength, the stay flag, and, if it is
- * 'stay', the value for the current output of this constraint. Assume
- * this constraint is satisfied.
- */
-ScaleConstraint.prototype.recalculate = function () {
-  var ihn = this.input(), out = this.output();
-  out.walkStrength = Strength.weakestOf(this.strength, ihn.walkStrength);
-  out.stay = ihn.stay && this.scale.stay && this.offset.stay;
-  if (out.stay) this.execute();
-}
-
-/* --- *
- * E q u a l i t  y   C o n s t r a i n t
- * --- */
-
-/**
- * Constrains two variables to have the same value.
- */
-function EqualityConstraint(var1, var2, strength) {
-  EqualityConstraint.superConstructor.call(this, var1, var2, strength);
-}
-
-EqualityConstraint.inherits(BinaryConstraint);
-
-/**
- * Enforce this constraint. Assume that it is satisfied.
- */
-EqualityConstraint.prototype.execute = function () {
-  this.output().value = this.input().value;
-}
-
-/* --- *
- * V a r i a b l e
- * --- */
-
-/**
- * A constrained variable. In addition to its value, it maintain the
- * structure of the constraint graph, the current dataflow graph, and
- * various parameters of interest to the DeltaBlue incremental
- * constraint solver.
- **/
-function Variable(name, initialValue) {
-  this.value = initialValue || 0;
-  this.constraints = new OrderedCollection();
-  this.determinedBy = null;
-  this.mark = 0;
-  this.walkStrength = Strength.WEAKEST;
-  this.stay = true;
-  this.name = name;
-}
-
-/**
- * Add the given constraint to the set of all constraints that refer
- * this variable.
- */
-Variable.prototype.addConstraint = function (c) {
-  this.constraints.add(c);
-}
-
-/**
- * Removes all traces of c from this variable.
- */
-Variable.prototype.removeConstraint = function (c) {
-  this.constraints.remove(c);
-  if (this.determinedBy == c) this.determinedBy = null;
-}
-
-/* --- *
- * P l a n n e r
- * --- */
-
-/**
- * The DeltaBlue planner
- */
-function Planner() {
-  this.currentMark = 0;
-}
-
-/**
- * Attempt to satisfy the given constraint and, if successful,
- * incrementally update the dataflow graph.  Details: If satifying
- * the constraint is successful, it may override a weaker constraint
- * on its output. The algorithm attempts to resatisfy that
- * constraint using some other method. This process is repeated
- * until either a) it reaches a variable that was not previously
- * determined by any constraint or b) it reaches a constraint that
- * is too weak to be satisfied using any of its methods. The
- * variables of constraints that have been processed are marked with
- * a unique mark value so that we know where we've been. This allows
- * the algorithm to avoid getting into an infinite loop even if the
- * constraint graph has an inadvertent cycle.
- */
-Planner.prototype.incrementalAdd = function (c) {
-  var mark = this.newMark();
-  var overridden = c.satisfy(mark);
-  /* BEGIN LOOP */
-  while (overridden != null)
-    overridden = overridden.satisfy(mark);
-  /* END LOOP */
-}
-
-/**
- * Entry point for retracting a constraint. Remove the given
- * constraint and incrementally update the dataflow graph.
- * Details: Retracting the given constraint may allow some currently
- * unsatisfiable downstream constraint to be satisfied. We therefore collect
- * a list of unsatisfied downstream constraints and attempt to
- * satisfy each one in turn. This list is traversed by constraint
- * strength, strongest first, as a heuristic for avoiding
- * unnecessarily adding and then overriding weak constraints.
- * Assume: c is satisfied.
- */
-Planner.prototype.incrementalRemove = function (c) {
-  var out = c.output();
-  c.markUnsatisfied();
-  c.removeFromGraph();
-  var unsatisfied = this.removePropagateFrom(out);
-  var strength = Strength.REQUIRED;
-  /* BEGIN LOOP */
-  do {
-  /* BEGIN LOOP */
-    for (var i = 0; i < unsatisfied.size(); i++) {
-      var u = unsatisfied.at(i);
-      if (u.strength == strength)
-        this.incrementalAdd(u);
-    }
-  /* END LOOP */
-    strength = strength.nextWeaker();
-  } while (strength != Strength.WEAKEST);
-  /* END LOOP */
-}
-
-/**
- * Select a previously unused mark value.
- */
-Planner.prototype.newMark = function () {
-  return ++this.currentMark;
-}
-
-/**
- * Extract a plan for resatisfaction starting from the given source
- * constraints, usually a set of input constraints. This method
- * assumes that stay optimization is desired; the plan will contain
- * only constraints whose output variables are not stay. Constraints
- * that do no computation, such as stay and edit constraints, are
- * not included in the plan.
- * Details: The outputs of a constraint are marked when it is added
- * to the plan under construction. A constraint may be appended to
- * the plan when all its input variables are known. A variable is
- * known if either a) the variable is marked (indicating that has
- * been computed by a constraint appearing earlier in the plan), b)
- * the variable is 'stay' (i.e. it is a constant at plan execution
- * time), or c) the variable is not determined by any
- * constraint. The last provision is for past states of history
- * variables, which are not stay but which are also not computed by
- * any constraint.
- * Assume: sources are all satisfied.
- */
-Planner.prototype.makePlan = function (sources) {
-  var mark = this.newMark();
-  var plan = new Plan();
-  var todo = sources;
-  /* BEGIN LOOP */
-  while (todo.size() > 0) {
-    var c = todo.removeFirst();
-    if (c.output().mark != mark && c.inputsKnown(mark)) {
-      plan.addConstraint(c);
-      c.output().mark = mark;
-      this.addConstraintsConsumingTo(c.output(), todo);
-    }
-  }
-  /* END LOOP */
-  return plan;
-}
-
-/**
- * Extract a plan for resatisfying starting from the output of the
- * given constraints, usually a set of input constraints.
- */
-Planner.prototype.extractPlanFromConstraints = function (constraints) {
-  var sources = new OrderedCollection();
-  /* BEGIN LOOP */
-  for (var i = 0; i < constraints.size(); i++) {
-    var c = constraints.at(i);
-    if (c.isInput() && c.isSatisfied())
-      // not in plan already and eligible for inclusion
-      sources.add(c);
-  }
-  /* END LOOP */
-  return this.makePlan(sources);
-}
-
-/**
- * Recompute the walkabout strengths and stay flags of all variables
- * downstream of the given constraint and recompute the actual
- * values of all variables whose stay flag is true. If a cycle is
- * detected, remove the given constraint and answer
- * false. Otherwise, answer true.
- * Details: Cycles are detected when a marked variable is
- * encountered downstream of the given constraint. The sender is
- * assumed to have marked the inputs of the given constraint with
- * the given mark. Thus, encountering a marked node downstream of
- * the output constraint means that there is a path from the
- * constraint's output to one of its inputs.
- */
-Planner.prototype.addPropagate = function (c, mark) {
-  var todo = new OrderedCollection();
-  todo.add(c);
-  /* BEGIN LOOP */
-  while (todo.size() > 0) {
-    var d = todo.removeFirst();
-    if (d.output().mark == mark) {
-      this.incrementalRemove(c);
-      return false;
-    }
-    d.recalculate();
-    this.addConstraintsConsumingTo(d.output(), todo);
-  }
-  /* END LOOP */
-  return true;
-}
-
-
-/**
- * Update the walkabout strengths and stay flags of all variables
- * downstream of the given constraint. Answer a collection of
- * unsatisfied constraints sorted in order of decreasing strength.
- */
-Planner.prototype.removePropagateFrom = function (out) {
-  out.determinedBy = null;
-  out.walkStrength = Strength.WEAKEST;
-  out.stay = true;
-  var unsatisfied = new OrderedCollection();
-  var todo = new OrderedCollection();
-  todo.add(out);
-  /* BEGIN LOOP */
-  while (todo.size() > 0) {
-    var v = todo.removeFirst();
-  /* BEGIN LOOP */
-    for (var i = 0; i < v.constraints.size(); i++) {
-      var c = v.constraints.at(i);
-      if (!c.isSatisfied())
-        unsatisfied.add(c);
-    }
-  /* END LOOP */
-    var determining = v.determinedBy;
-  /* BEGIN LOOP */
-    for (var i = 0; i < v.constraints.size(); i++) {
-      var next = v.constraints.at(i);
-      if (next != determining && next.isSatisfied()) {
-        next.recalculate();
-        todo.add(next.output());
-      }
-    }
-  /* END LOOP */
-  }
-  /* END LOOP */
-  return unsatisfied;
-}
-
-Planner.prototype.addConstraintsConsumingTo = function (v, coll) {
-  var determining = v.determinedBy;
-  var cc = v.constraints;
-  /* BEGIN LOOP */
-  for (var i = 0; i < cc.size(); i++) {
-    var c = cc.at(i);
-    if (c != determining && c.isSatisfied())
-      coll.add(c);
-  }
-  /* END LOOP */
-}
-
-/* --- *
- * P l a n
- * --- */
-
-/**
- * A Plan is an ordered list of constraints to be executed in sequence
- * to resatisfy all currently satisfiable constraints in the face of
- * one or more changing inputs.
- */
-function Plan() {
-  this.v = new OrderedCollection();
-}
-
-Plan.prototype.addConstraint = function (c) {
-  this.v.add(c);
-}
-
-Plan.prototype.size = function () {
-  return this.v.size();
-}
-
-Plan.prototype.constraintAt = function (index) {
-  return this.v.at(index);
-}
-
-Plan.prototype.execute = function () {
-  /* BEGIN LOOP */
-  for (var i = 0; i < this.size(); i++) {
-    var c = this.constraintAt(i);
-    c.execute();
-  }
-  /* END LOOP */
-}
-
-/* --- *
- * M a i n
- * --- */
-
-/**
- * This is the standard DeltaBlue benchmark. A long chain of equality
- * constraints is constructed with a stay constraint on one end. An
- * edit constraint is then added to the opposite end and the time is
- * measured for adding and removing this constraint, and extracting
- * and executing a constraint satisfaction plan. There are two cases.
- * In case 1, the added constraint is stronger than the stay
- * constraint and values must propagate down the entire length of the
- * chain. In case 2, the added constraint is weaker than the stay
- * constraint so it cannot be accomodated. The cost in this case is,
- * of course, very low. Typical situations lie somewhere between these
- * two extremes.
- */
-function chainTest(n) {
-  planner = new Planner();
-  var prev = null, first = null, last = null;
-
-  // Build chain of n equality constraints
-  /* BEGIN LOOP */
-  for (var i = 0; i <= n; i++) {
-    var name = "v" + i;
-    var v = new Variable(name);
-    if (prev != null)
-      new EqualityConstraint(prev, v, Strength.REQUIRED);
-    if (i == 0) first = v;
-    if (i == n) last = v;
-    prev = v;
-  }
-  /* END LOOP */
-
-  new StayConstraint(last, Strength.STRONG_DEFAULT);
-  var edit = new EditConstraint(first, Strength.PREFERRED);
-  var edits = new OrderedCollection();
-  edits.add(edit);
-  var plan = planner.extractPlanFromConstraints(edits);
-  /* BEGIN LOOP */
-  for (var i = 0; i < 100; i++) {
-    first.value = i;
-    plan.execute();
-    if (last.value != i)
-      alert("Chain test failed.");
-  }
-  /* END LOOP */
-}
-
-/**
- * This test constructs a two sets of variables related to each
- * other by a simple linear transformation (scale and offset). The
- * time is measured to change a variable on either side of the
- * mapping and to change the scale and offset factors.
- */
-function projectionTest(n) {
-  planner = new Planner();
-  var scale = new Variable("scale", 10);
-  var offset = new Variable("offset", 1000);
-  var src = null, dst = null;
-
-  var dests = new OrderedCollection();
-  /* BEGIN LOOP */
-  for (var i = 0; i < n; i++) {
-    src = new Variable("src" + i, i);
-    dst = new Variable("dst" + i, i);
-    dests.add(dst);
-    new StayConstraint(src, Strength.NORMAL);
-    new ScaleConstraint(src, scale, offset, dst, Strength.REQUIRED);
-  }
-  /* END LOOP */
-
-  change(src, 17);
-  if (dst.value != 1170) alert("Projection 1 failed");
-  change(dst, 1050);
-  if (src.value != 5) alert("Projection 2 failed");
-  change(scale, 5);
-  /* BEGIN LOOP */
-  for (var i = 0; i < n - 1; i++) {
-    if (dests.at(i).value != i * 5 + 1000)
-      alert("Projection 3 failed");
-  }
-  /* END LOOP */
-  change(offset, 2000);
-  /* BEGIN LOOP */
-  for (var i = 0; i < n - 1; i++) {
-    if (dests.at(i).value != i * 5 + 2000)
-      alert("Projection 4 failed");
-  }
-  /* END LOOP */
-}
-
-function change(v, newValue) {
-  var edit = new EditConstraint(v, Strength.PREFERRED);
-  var edits = new OrderedCollection();
-  edits.add(edit);
-  var plan = planner.extractPlanFromConstraints(edits);
-  /* BEGIN LOOP */
-  for (var i = 0; i < 10; i++) {
-    v.value = newValue;
-    plan.execute();
-  }
-  /* END LOOP */
-  edit.destroyConstraint();
-}
-
-// Global variable holding the current planner.
-var planner = null;
-
-function deltaBlue() {
-  chainTest(100);
-  projectionTest(100);
-}
-
-function PrintResult(name, result) {
-}
-
-
-function PrintScore(score) {
-}
-
-
-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
-                           NotifyScore: PrintScore });
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/earley-boyer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/earley-boyer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/earley-boyer.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/earley-boyer.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,4682 +0,0 @@
-// This file is automatically generated by scheme2js, except for the
-// benchmark harness code at the beginning and end of the file.
-
-var EarleyBoyer = new BenchmarkSuite('EarleyBoyer', 765819, [
-  new Benchmark("Earley", function () { BgL_earleyzd2benchmarkzd2(); }),
-  new Benchmark("Boyer", function () { BgL_nboyerzd2benchmarkzd2(); })
-]);
-
-
-/************* GENERATED FILE - DO NOT EDIT *************/
-/************* GENERATED FILE - DO NOT EDIT *************/
-/************* GENERATED FILE - DO NOT EDIT *************/
-/************* GENERATED FILE - DO NOT EDIT *************/
-/************* GENERATED FILE - DO NOT EDIT *************/
-/************* GENERATED FILE - DO NOT EDIT *************/
-/************* GENERATED FILE - DO NOT EDIT *************/
-/************* GENERATED FILE - DO NOT EDIT *************/
-/*
- * To use write/prints/... the default-output port has to be set first.
- * Simply setting SC_DEFAULT_OUT and SC_ERROR_OUT to the desired values
- * should do the trick.
- * In the following example the std-out and error-port are redirected to
- * a DIV.
-function initRuntime() {
-    function escapeHTML(s) {
-	var tmp = s;
-	tmp = tmp.replace(/&/g, "&amp;");
-	tmp = tmp.replace(/</g, "&lt;");
-	tmp = tmp.replace(/>/g, "&gt;");
-	tmp = tmp.replace(/ /g, "&nbsp;");
-	tmp = tmp.replace(/\n/g, "<br />");
-	tmp = tmp.replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp");
-	return tmp;
-	
-    }
-
-    document.write("<div id='stdout'></div>");
-    SC_DEFAULT_OUT = new sc_GenericOutputPort(
-	function(s) {
-	    var stdout = document.getElementById('stdout');
-	    stdout.innerHTML = stdout.innerHTML + escapeHTML(s);
-	});
-    SC_ERROR_OUT = SC_DEFAULT_OUT;
-}
-*/
-
-
-function sc_print_debug() {
-    sc_print.apply(null, arguments);
-}
-/*** META ((export *js*)) */
-var sc_JS_GLOBALS = this;
-
-var __sc_LINE=-1;
-var __sc_FILE="";
-
-/*** META ((export #t)) */
-function sc_alert() {
-   var len = arguments.length;
-   var s = "";
-   var i;
-
-   for( i = 0; i < len; i++ ) {
-       s += sc_toDisplayString(arguments[ i ]);
-   }
-
-   return alert( s );
-}
-
-/*** META ((export #t)) */
-function sc_typeof( x ) {
-   return typeof x;
-}
-
-/*** META ((export #t)) */
-function sc_error() {
-    var a = [sc_jsstring2symbol("*error*")];
-    for (var i = 0; i < arguments.length; i++) {
-	a[i+1] = arguments[i];
-    }
-    throw a;
-}
-
-/*** META ((export #t)
-           (peephole (prefix "throw ")))
-*/
-function sc_raise(obj) {
-    throw obj;
-}
-
-/*** META ((export with-handler-lambda)) */
-function sc_withHandlerLambda(handler, body) {
-    try {
-	return body();
-    } catch(e) {
-	if (!e._internalException)
-	    return handler(e);
-	else
-	    throw e;
-    }
-}
-
-var sc_properties = new Object();
-
-/*** META ((export #t)) */
-function sc_putpropBang(sym, key, val) {
-    var ht = sc_properties[sym];
-    if (!ht) {
-	ht = new Object();
-	sc_properties[sym] = ht;
-    }
-    ht[key] = val;
-}
-
-/*** META ((export #t)) */
-function sc_getprop(sym, key) {
-    var ht = sc_properties[sym];
-    if (ht) {
-	if (key in ht)
-	    return ht[key];
-	else
-	    return false;
-    } else
-	return false;
-}
-
-/*** META ((export #t)) */
-function sc_rempropBang(sym, key) {
-    var ht = sc_properties[sym];
-    if (ht)
-	delete ht[key];
-}
-
-/*** META ((export #t)) */
-function sc_any2String(o) {
-    return jsstring2string(sc_toDisplayString(o));
-}    
-
-/*** META ((export #t)
-           (peephole (infix 2 2 "==="))
-           (type bool))
-*/
-function sc_isEqv(o1, o2) {
-    return (o1 === o2);
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 "==="))
-           (type bool))
-*/
-function sc_isEq(o1, o2) {
-    return (o1 === o2);
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isNumber(n) {
-    return (typeof n === "number");
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isComplex(n) {
-    return sc_isNumber(n);
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isReal(n) {
-    return sc_isNumber(n);
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isRational(n) {
-    return sc_isReal(n);
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isInteger(n) {
-    return (parseInt(n) === n);
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix ", false")))
-*/
-// we don't have exact numbers...
-function sc_isExact(n) {
-    return false;
-}
-
-/*** META ((export #t)
-           (peephole (postfix ", true"))
-	   (type bool))
-*/
-function sc_isInexact(n) {
-    return true;
-}
-
-/*** META ((export = =fx =fl)
-           (type bool)
-           (peephole (infix 2 2 "===")))
-*/
-function sc_equal(x) {
-    for (var i = 1; i < arguments.length; i++)
-	if (x !== arguments[i])
-	    return false;
-    return true;
-}
-
-/*** META ((export < <fx <fl)
-           (type bool)
-           (peephole (infix 2 2 "<")))
-*/
-function sc_less(x) {
-    for (var i = 1; i < arguments.length; i++) {
-	if (x >= arguments[i])
-	    return false;
-	x = arguments[i];
-    }
-    return true;
-}
-
-/*** META ((export > >fx >fl)
-           (type bool)
-           (peephole (infix 2 2 ">")))
-*/
-function sc_greater(x, y) {
-    for (var i = 1; i < arguments.length; i++) {
-	if (x <= arguments[i])
-	    return false;
-	x = arguments[i];
-    }
-    return true;
-}
-
-/*** META ((export <= <=fx <=fl)
-           (type bool)
-           (peephole (infix 2 2 "<=")))
-*/
-function sc_lessEqual(x, y) {
-    for (var i = 1; i < arguments.length; i++) {
-	if (x > arguments[i])
-	    return false;
-	x = arguments[i];
-    }
-    return true;
-}
-
-/*** META ((export >= >=fl >=fx)
-           (type bool)
-           (peephole (infix 2 2 ">=")))
-*/
-function sc_greaterEqual(x, y) {
-    for (var i = 1; i < arguments.length; i++) {
-	if (x < arguments[i])
-	    return false;
-	x = arguments[i];
-    }
-    return true;
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix "=== 0")))
-*/
-function sc_isZero(x) {
-    return (x === 0);
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix "> 0")))
-*/
-function sc_isPositive(x) {
-    return (x > 0);
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix "< 0")))
-*/
-function sc_isNegative(x) {
-    return (x < 0);
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix "%2===1")))
-*/
-function sc_isOdd(x) {
-    return (x % 2 === 1);
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix "%2===0")))
-*/
-function sc_isEven(x) {
-    return (x % 2 === 0);
-}
-
-/*** META ((export #t)) */
-var sc_max = Math.max;
-/*** META ((export #t)) */
-var sc_min = Math.min;
-
-/*** META ((export + +fx +fl)
-           (peephole (infix 0 #f "+" "0")))
-*/
-function sc_plus() {
-    var sum = 0;
-    for (var i = 0; i < arguments.length; i++)
-	sum += arguments[i];
-    return sum;
-}
-
-/*** META ((export * *fx *fl)
-           (peephole (infix 0 #f "*" "1")))
-*/
-function sc_multi() {
-    var product = 1;
-    for (var i = 0; i < arguments.length; i++)
-	product *= arguments[i];
-    return product;
-}
-
-/*** META ((export - -fx -fl)
-           (peephole (minus)))
-*/
-function sc_minus(x) {
-    if (arguments.length === 1)
-	return -x;
-    else {
-	var res = x;
-	for (var i = 1; i < arguments.length; i++)
-	    res -= arguments[i];
-	return res;
-    }
-}
-
-/*** META ((export / /fl)
-           (peephole (div)))
-*/
-function sc_div(x) {
-    if (arguments.length === 1)
-	return 1/x;
-    else {
-	var res = x;
-	for (var i = 1; i < arguments.length; i++)
-	    res /= arguments[i];
-	return res;
-    }
-}
-
-/*** META ((export #t)) */
-var sc_abs = Math.abs;
-
-/*** META ((export quotient /fx)
-           (peephole (hole 2 "parseInt(" x "/" y ")")))
-*/
-function sc_quotient(x, y) {
-    return parseInt(x / y);
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 "%")))
-*/
-function sc_remainder(x, y) {
-    return x % y;
-}
-
-/*** META ((export #t)
-           (peephole (modulo)))
-*/
-function sc_modulo(x, y) {
-    var remainder = x % y;
-    // if they don't have the same sign
-    if ((remainder * y) < 0)
-	return remainder + y;
-    else
-	return remainder;
-}
-
-function sc_euclid_gcd(a, b) {
-    var temp;
-    if (a === 0) return b;
-    if (b === 0) return a;
-    if (a < 0) {a = -a;};
-    if (b < 0) {b = -b;};
-    if (b > a) {temp = a; a = b; b = temp;};
-    while (true) {
-	a %= b;
-	if(a === 0) {return b;};
-	b %= a;
-	if(b === 0) {return a;};
-    };
-    return b;
-}
-
-/*** META ((export #t)) */
-function sc_gcd() {
-    var gcd = 0;
-    for (var i = 0; i < arguments.length; i++)
-	gcd = sc_euclid_gcd(gcd, arguments[i]);
-    return gcd;
-}
-
-/*** META ((export #t)) */
-function sc_lcm() {
-    var lcm = 1;
-    for (var i = 0; i < arguments.length; i++) {
-	var f = Math.round(arguments[i] / sc_euclid_gcd(arguments[i], lcm));
-	lcm *= Math.abs(f);
-    }
-    return lcm;
-}
-
-// LIMITATION: numerator and denominator don't make sense in floating point world.
-//var SC_MAX_DECIMALS = 1000000
-//
-// function sc_numerator(x) {
-//     var rounded = Math.round(x * SC_MAX_DECIMALS);
-//     return Math.round(rounded / sc_euclid_gcd(rounded, SC_MAX_DECIMALS));
-// }
-
-// function sc_denominator(x) {
-//     var rounded = Math.round(x * SC_MAX_DECIMALS);
-//     return Math.round(SC_MAX_DECIMALS / sc_euclid_gcd(rounded, SC_MAX_DECIMALS));
-// }
-
-/*** META ((export #t)) */
-var sc_floor = Math.floor;
-/*** META ((export #t)) */
-var sc_ceiling = Math.ceil;
-/*** META ((export #t)) */
-var sc_truncate = parseInt;
-/*** META ((export #t)) */
-var sc_round = Math.round;
-
-// LIMITATION: sc_rationalize doesn't make sense in a floating point world.
-
-/*** META ((export #t)) */
-var sc_exp = Math.exp;
-/*** META ((export #t)) */
-var sc_log = Math.log;
-/*** META ((export #t)) */
-var sc_sin = Math.sin;
-/*** META ((export #t)) */
-var sc_cos = Math.cos;
-/*** META ((export #t)) */
-var sc_tan = Math.tan;
-/*** META ((export #t)) */
-var sc_asin = Math.asin;
-/*** META ((export #t)) */
-var sc_acos = Math.acos;
-/*** META ((export #t)) */
-var sc_atan = Math.atan;
-
-/*** META ((export #t)) */
-var sc_sqrt = Math.sqrt;
-/*** META ((export #t)) */
-var sc_expt = Math.pow;
-
-// LIMITATION: we don't have complex numbers.
-// LIMITATION: the following functions are hence not implemented.
-// LIMITATION: make-rectangular, make-polar, real-part, imag-part, magnitude, angle
-// LIMITATION: 2 argument atan
-
-/*** META ((export #t)
-           (peephole (id)))
-*/
-function sc_exact2inexact(x) {
-    return x;
-}
-
-/*** META ((export #t)
-           (peephole (id)))
-*/
-function sc_inexact2exact(x) {
-    return x;
-}
-
-function sc_number2jsstring(x, radix) {
-    if (radix)
-	return x.toString(radix);
-    else
-	return x.toString();
-}
-
-function sc_jsstring2number(s, radix) {
-    if (s === "") return false;
-
-    if (radix) {
-	var t = parseInt(s, radix);
-	if (!t && t !== 0) return false;
-	// verify that each char is in range. (parseInt ignores leading
-	// white and trailing chars)
-	var allowedChars = "01234567890abcdefghijklmnopqrstuvwxyz".substring(0, radix+1);
-	if ((new RegExp("^["+allowedChars+"]*$", "i")).test(s))
-	    return t;
-	else return false;
-    } else {
-	var t = +s; // does not ignore trailing chars.
-	if (!t && t !== 0) return false;
-	// simply verify that first char is not whitespace.
-	var c = s.charAt(0);
-	// if +c is 0, but the char is not "0", then we have a whitespace.
-	if (+c === 0 && c !== "0") return false;
-	return t;
-    }
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (not)))
-*/
-function sc_not(b) {
-    return b === false;
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isBoolean(b) {
-    return (b === true) || (b === false);
-}
-
-function sc_Pair(car, cdr) {
-    this.car = car;
-    this.cdr = cdr;
-}
-
-sc_Pair.prototype.toString = function() {
-    return sc_toDisplayString(this);
-};
-sc_Pair.prototype.sc_toWriteOrDisplayString = function(writeOrDisplay) {
-    var current = this;
-
-    var res = "(";
-
-    while(true) {
-	res += writeOrDisplay(current.car);
-	if (sc_isPair(current.cdr)) {
-	    res += " ";
-	    current = current.cdr;
-	} else if (current.cdr !== null) {
-	    res += " . " + writeOrDisplay(current.cdr);
-	    break;
-	} else // current.cdr == null
-	    break;
-    }
-	
-    res += ")";
-
-    return res;
-};
-sc_Pair.prototype.sc_toDisplayString = function() {
-    return this.sc_toWriteOrDisplayString(sc_toDisplayString);
-};
-sc_Pair.prototype.sc_toWriteString = function() {
-    return this.sc_toWriteOrDisplayString(sc_toWriteString);
-};
-// sc_Pair.prototype.sc_toWriteCircleString in IO.js
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix " instanceof sc_Pair")))
-*/
-function sc_isPair(p) {
-    return (p instanceof sc_Pair);
-}
-
-function sc_isPairEqual(p1, p2, comp) {
-    return (comp(p1.car, p2.car) && comp(p1.cdr, p2.cdr));
-}
-
-/*** META ((export #t)
-           (peephole (hole 2 "new sc_Pair(" car ", " cdr ")")))
-*/
-function sc_cons(car, cdr) {
-    return new sc_Pair(car, cdr);
-}
-
-/*** META ((export cons*)) */
-function sc_consStar() {
-    var res = arguments[arguments.length - 1];
-    for (var i = arguments.length-2; i >= 0; i--)
-	res = new sc_Pair(arguments[i], res);
-    return res;
-}
-
-/*** META ((export #t)
-           (peephole (postfix ".car")))
-*/
-function sc_car(p) {
-    return p.car;
-}
-
-/*** META ((export #t)
-           (peephole (postfix ".cdr")))
-*/
-function sc_cdr(p) {
-    return p.cdr;
-}
-
-/*** META ((export #t)
-           (peephole (hole 2 p ".car = " val)))
-*/
-function sc_setCarBang(p, val) {
-    p.car = val;
-}
-
-/*** META ((export #t)
-           (peephole (hole 2 p ".cdr = " val)))
-*/
-function sc_setCdrBang(p, val) {
-    p.cdr = val;
-}
-
-/*** META ((export #t)
-           (peephole (postfix ".car.car")))
-*/
-function sc_caar(p) { return p.car.car; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.car")))
-*/
-function sc_cadr(p) { return p.cdr.car; }
-/*** META ((export #t)
-           (peephole (postfix ".car.cdr")))
-*/
-function sc_cdar(p) { return p.car.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.cdr")))
-*/
-function sc_cddr(p) { return p.cdr.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".car.car.car")))
-*/
-function sc_caaar(p) { return p.car.car.car; }
-/*** META ((export #t)
-           (peephole (postfix ".car.cdr.car")))
-*/
-function sc_cadar(p) { return p.car.cdr.car; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.car.car")))
-*/
-function sc_caadr(p) { return p.cdr.car.car; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.cdr.car")))
-*/
-function sc_caddr(p) { return p.cdr.cdr.car; }
-/*** META ((export #t)
-           (peephole (postfix ".car.car.cdr")))
-*/
-function sc_cdaar(p) { return p.car.car.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.car.cdr")))
-*/
-function sc_cdadr(p) { return p.cdr.car.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".car.cdr.cdr")))
-*/
-function sc_cddar(p) { return p.car.cdr.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.cdr.cdr")))
-*/
-function sc_cdddr(p) { return p.cdr.cdr.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".car.car.car.car")))
-*/
-function sc_caaaar(p) { return p.car.car.car.car; }
-/*** META ((export #t)
-           (peephole (postfix ".car.cdr.car.car")))
-*/
-function sc_caadar(p) { return p.car.cdr.car.car; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.car.car.car")))
-*/
-function sc_caaadr(p) { return p.cdr.car.car.car; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.cdr.car.car")))
-*/
-function sc_caaddr(p) { return p.cdr.cdr.car.car; }
-/*** META ((export #t)
-           (peephole (postfix ".car.car.car.cdr")))
-*/
-function sc_cdaaar(p) { return p.car.car.car.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".car.cdr.car.cdr")))
-*/
-function sc_cdadar(p) { return p.car.cdr.car.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.car.car.cdr")))
-*/
-function sc_cdaadr(p) { return p.cdr.car.car.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.cdr.car.cdr")))
-*/
-function sc_cdaddr(p) { return p.cdr.cdr.car.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".car.car.cdr.car")))
-*/
-function sc_cadaar(p) { return p.car.car.cdr.car; }
-/*** META ((export #t)
-           (peephole (postfix ".car.cdr.cdr.car")))
-*/
-function sc_caddar(p) { return p.car.cdr.cdr.car; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.car.cdr.car")))
-*/
-function sc_cadadr(p) { return p.cdr.car.cdr.car; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.cdr.cdr.car")))
-*/
-function sc_cadddr(p) { return p.cdr.cdr.cdr.car; }
-/*** META ((export #t)
-           (peephole (postfix ".car.car.cdr.cdr")))
-*/
-function sc_cddaar(p) { return p.car.car.cdr.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".car.cdr.cdr.cdr")))
-*/
-function sc_cdddar(p) { return p.car.cdr.cdr.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.car.cdr.cdr")))
-*/
-function sc_cddadr(p) { return p.cdr.car.cdr.cdr; }
-/*** META ((export #t)
-           (peephole (postfix ".cdr.cdr.cdr.cdr")))
-*/
-function sc_cddddr(p) { return p.cdr.cdr.cdr.cdr; }
-
-/*** META ((export #t)) */
-function sc_lastPair(l) {
-    if (!sc_isPair(l)) sc_error("sc_lastPair: pair expected");
-    var res = l;
-    var cdr = l.cdr;
-    while (sc_isPair(cdr)) {
-	res = cdr;
-	cdr = res.cdr;
-    }
-    return res;
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix " === null")))
-*/
-function sc_isNull(o) {
-    return (o === null);
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isList(o) {
-    var rabbit;
-    var turtle;
-
-    var rabbit = o;
-    var turtle = o;
-    while (true) {
-	if (rabbit === null ||
-	    (rabbit instanceof sc_Pair && rabbit.cdr === null))
-	    return true;  // end of list
-	else if ((rabbit instanceof sc_Pair) &&
-		 (rabbit.cdr instanceof sc_Pair)) {
-	    rabbit = rabbit.cdr.cdr;
-	    turtle = turtle.cdr;
-	    if (rabbit === turtle) return false; // cycle
-	} else
-	    return false; // not pair
-    }
-}
-
-/*** META ((export #t)) */
-function sc_list() {
-    var res = null;
-    var a = arguments;
-    for (var i = a.length-1; i >= 0; i--)
-	res = new sc_Pair(a[i], res);
-    return res;
-}
-
-/*** META ((export #t)) */
-function sc_iota(num, init) {
-   var res = null;
-   if (!init) init = 0;
-   for (var i = num - 1; i >= 0; i--)
-      res = new sc_Pair(i + init, res);
-   return res;
-}
-
-/*** META ((export #t)) */
-function sc_makeList(nbEls, fill) {
-    var res = null;
-    for (var i = 0; i < nbEls; i++)
-	res = new sc_Pair(fill, res);
-    return res;
-}
-
-/*** META ((export #t)) */
-function sc_length(l) {
-    var res = 0;
-    while (l !== null) {
-	res++;
-	l = l.cdr;
-    }
-    return res;
-}
-
-/*** META ((export #t)) */
-function sc_remq(o, l) {
-    var dummy = { cdr : null };
-    var tail = dummy;
-    while (l !== null) {
-	if (l.car !== o) {
-	    tail.cdr = sc_cons(l.car, null);
-	    tail = tail.cdr;
-	}
-	l = l.cdr;
-    }
-    return dummy.cdr;
-}
-
-/*** META ((export #t)) */
-function sc_remqBang(o, l) {
-    var dummy = { cdr : null };
-    var tail = dummy;
-    var needsAssig = true;
-    while (l !== null) {
-	if (l.car === o) {
-	    needsAssig = true;
-	} else {
-	    if (needsAssig) {
-		tail.cdr = l;
-		needsAssig = false;
-	    }
-	    tail = l;
-	}
-	l = l.cdr;
-    }
-    tail.cdr = null;
-    return dummy.cdr;
-}
-
-/*** META ((export #t)) */
-function sc_delete(o, l) {
-    var dummy = { cdr : null };
-    var tail = dummy;
-    while (l !== null) {
-	if (!sc_isEqual(l.car, o)) {
-	    tail.cdr = sc_cons(l.car, null);
-	    tail = tail.cdr;
-	}
-	l = l.cdr;
-    }
-    return dummy.cdr;
-}
-
-/*** META ((export #t)) */
-function sc_deleteBang(o, l) {
-    var dummy = { cdr : null };
-    var tail = dummy;
-    var needsAssig = true;
-    while (l !== null) {
-	if (sc_isEqual(l.car, o)) {
-	    needsAssig = true;
-	} else {
-	    if (needsAssig) {
-		tail.cdr = l;
-		needsAssig = false;
-	    }
-	    tail = l;
-	}
-	l = l.cdr;
-    }
-    tail.cdr = null;
-    return dummy.cdr;
-}
-
-function sc_reverseAppendBang(l1, l2) {
-    var res = l2;
-    while (l1 !== null) {
-	var tmp = res;
-	res = l1;
-	l1 = l1.cdr;
-	res.cdr = tmp;
-    }
-    return res;
-}
-	
-function sc_dualAppend(l1, l2) {
-    if (l1 === null) return l2;
-    if (l2 === null) return l1;
-    var rev = sc_reverse(l1);
-    return sc_reverseAppendBang(rev, l2);
-}
-
-/*** META ((export #t)) */
-function sc_append() {
-    if (arguments.length === 0)
-	return null;
-    var res = arguments[arguments.length - 1];
-    for (var i = arguments.length - 2; i >= 0; i--)
-	res = sc_dualAppend(arguments[i], res);
-    return res;
-}
-
-function sc_dualAppendBang(l1, l2) {
-    if (l1 === null) return l2;
-    if (l2 === null) return l1;
-    var tmp = l1;
-    while (tmp.cdr !== null) tmp=tmp.cdr;
-    tmp.cdr = l2;
-    return l1;
-}
-    
-/*** META ((export #t)) */
-function sc_appendBang() {
-    var res = null;
-    for (var i = 0; i < arguments.length; i++)
-	res = sc_dualAppendBang(res, arguments[i]);
-    return res;
-}
-
-/*** META ((export #t)) */
-function sc_reverse(l1) {
-    var res = null;
-    while (l1 !== null) {
-	res = sc_cons(l1.car, res);
-	l1 = l1.cdr;
-    }
-    return res;
-}
-
-/*** META ((export #t)) */
-function sc_reverseBang(l) {
-    return sc_reverseAppendBang(l, null);
-}
-
-/*** META ((export #t)) */
-function sc_listTail(l, k) {
-    var res = l;
-    for (var i = 0; i < k; i++) {
-	res = res.cdr;
-    }
-    return res;
-}
-
-/*** META ((export #t)) */
-function sc_listRef(l, k) {
-    return sc_listTail(l, k).car;
-}
-
-/* // unoptimized generic versions
-function sc_memX(o, l, comp) {
-    while (l != null) {
-	if (comp(l.car, o))
-	    return l;
-	l = l.cdr;
-    }
-    return false;
-}
-function sc_memq(o, l) { return sc_memX(o, l, sc_isEq); }
-function sc_memv(o, l) { return sc_memX(o, l, sc_isEqv); }
-function sc_member(o, l) { return sc_memX(o, l, sc_isEqual); }
-*/
-
-/* optimized versions */
-/*** META ((export #t)) */
-function sc_memq(o, l) {
-    while (l !== null) {
-	if (l.car === o)
-	    return l;
-	l = l.cdr;
-    }
-    return false;
-}
-/*** META ((export #t)) */
-function sc_memv(o, l) {
-    while (l !== null) {
-	if (l.car === o)
-	    return l;
-	l = l.cdr;
-    }
-    return false;
-}
-/*** META ((export #t)) */
-function sc_member(o, l) {
-    while (l !== null) {
-	if (sc_isEqual(l.car,o))
-	    return l;
-	l = l.cdr;
-    }
-    return false;
-}
-
-/* // generic unoptimized versions
-function sc_assX(o, al, comp) {
-    while (al != null) {
-	if (comp(al.car.car, o))
-	    return al.car;
-	al = al.cdr;
-    }
-    return false;
-}
-function sc_assq(o, al) { return sc_assX(o, al, sc_isEq); }
-function sc_assv(o, al) { return sc_assX(o, al, sc_isEqv); }
-function sc_assoc(o, al) { return sc_assX(o, al, sc_isEqual); }
-*/
-// optimized versions
-/*** META ((export #t)) */
-function sc_assq(o, al) {
-    while (al !== null) {
-	if (al.car.car === o)
-	    return al.car;
-	al = al.cdr;
-    }
-    return false;
-}
-/*** META ((export #t)) */
-function sc_assv(o, al) {
-    while (al !== null) {
-	if (al.car.car === o)
-	    return al.car;
-	al = al.cdr;
-    }
-    return false;
-}
-/*** META ((export #t)) */
-function sc_assoc(o, al) {
-    while (al !== null) {
-	if (sc_isEqual(al.car.car, o))
-	    return al.car;
-	al = al.cdr;
-    }
-    return false;
-}
-
-/* can be used for mutable strings and characters */
-function sc_isCharStringEqual(cs1, cs2) { return cs1.val === cs2.val; }
-function sc_isCharStringLess(cs1, cs2) { return cs1.val < cs2.val; }
-function sc_isCharStringGreater(cs1, cs2) { return cs1.val > cs2.val; }
-function sc_isCharStringLessEqual(cs1, cs2) { return cs1.val <= cs2.val; }
-function sc_isCharStringGreaterEqual(cs1, cs2) { return cs1.val >= cs2.val; }
-function sc_isCharStringCIEqual(cs1, cs2)
-    { return cs1.val.toLowerCase() === cs2.val.toLowerCase(); }
-function sc_isCharStringCILess(cs1, cs2)
-    { return cs1.val.toLowerCase() < cs2.val.toLowerCase(); }
-function sc_isCharStringCIGreater(cs1, cs2)
-    { return cs1.val.toLowerCase() > cs2.val.toLowerCase(); }
-function sc_isCharStringCILessEqual(cs1, cs2)
-    { return cs1.val.toLowerCase() <= cs2.val.toLowerCase(); }
-function sc_isCharStringCIGreaterEqual(cs1, cs2)
-    { return cs1.val.toLowerCase() >= cs2.val.toLowerCase(); }
-
-
-
-
-function sc_Char(c) {
-    var cached = sc_Char.lazy[c];
-    if (cached)
-	return cached;
-    this.val = c;
-    sc_Char.lazy[c] = this;
-    // add return, so FF does not complain.
-    return undefined;
-}
-sc_Char.lazy = new Object();
-// thanks to Eric
-sc_Char.char2readable = {
-    "\000": "#\\null",
-    "\007": "#\\bell",
-    "\010": "#\\backspace",
-    "\011": "#\\tab",
-    "\012": "#\\newline",
-    "\014": "#\\page",
-    "\015": "#\\return",
-    "\033": "#\\escape",
-    "\040": "#\\space",
-    "\177": "#\\delete",
-
-  /* poeticless names */
-    "\001": "#\\soh",
-    "\002": "#\\stx",
-    "\003": "#\\etx",
-    "\004": "#\\eot",
-    "\005": "#\\enq",
-    "\006": "#\\ack",
-
-    "\013": "#\\vt",
-    "\016": "#\\so",
-    "\017": "#\\si",
-
-    "\020": "#\\dle",
-    "\021": "#\\dc1",
-    "\022": "#\\dc2",
-    "\023": "#\\dc3",
-    "\024": "#\\dc4",
-    "\025": "#\\nak",
-    "\026": "#\\syn",
-    "\027": "#\\etb",
-
-    "\030": "#\\can",
-    "\031": "#\\em",
-    "\032": "#\\sub",
-    "\033": "#\\esc",
-    "\034": "#\\fs",
-    "\035": "#\\gs",
-    "\036": "#\\rs",
-    "\037": "#\\us"};
-
-sc_Char.readable2char = {
-    "null": "\000",
-    "bell": "\007",
-    "backspace": "\010",
-    "tab": "\011",
-    "newline": "\012",
-    "page": "\014",
-    "return": "\015",
-    "escape": "\033",
-    "space": "\040",
-    "delete": "\000",
-    "soh": "\001",
-    "stx": "\002",
-    "etx": "\003",
-    "eot": "\004",
-    "enq": "\005",
-    "ack": "\006",
-    "bel": "\007",
-    "bs": "\010",
-    "ht": "\011",
-    "nl": "\012",
-    "vt": "\013",
-    "np": "\014",
-    "cr": "\015",
-    "so": "\016",
-    "si": "\017",
-    "dle": "\020",
-    "dc1": "\021",
-    "dc2": "\022",
-    "dc3": "\023",
-    "dc4": "\024",
-    "nak": "\025",
-    "syn": "\026",
-    "etb": "\027",
-    "can": "\030",
-    "em": "\031",
-    "sub": "\032",
-    "esc": "\033",
-    "fs": "\034",
-    "gs": "\035",
-    "rs": "\036",
-    "us": "\037",
-    "sp": "\040",
-    "del": "\177"};
-    
-sc_Char.prototype.toString = function() {
-    return this.val;
-};
-// sc_toDisplayString == toString
-sc_Char.prototype.sc_toWriteString = function() {
-    var entry = sc_Char.char2readable[this.val];
-    if (entry)
-	return entry;
-    else
-	return "#\\" + this.val;
-};
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix "instanceof sc_Char")))
-*/
-function sc_isChar(c) {
-    return (c instanceof sc_Char);
-}
-
-/*** META ((export char=?)
-           (type bool)
-           (peephole (hole 2 c1 ".val === " c2 ".val")))
-*/
-var sc_isCharEqual = sc_isCharStringEqual;
-/*** META ((export char<?)
-           (type bool)
-           (peephole (hole 2 c1 ".val < " c2 ".val")))
-*/
-var sc_isCharLess = sc_isCharStringLess;
-/*** META ((export char>?)
-           (type bool)
-           (peephole (hole 2 c1 ".val > " c2 ".val")))
-*/
-var sc_isCharGreater = sc_isCharStringGreater;
-/*** META ((export char<=?)
-           (type bool)
-           (peephole (hole 2 c1 ".val <= " c2 ".val")))
-*/
-var sc_isCharLessEqual = sc_isCharStringLessEqual;
-/*** META ((export char>=?)
-           (type bool)
-           (peephole (hole 2 c1 ".val >= " c2 ".val")))
-*/
-var sc_isCharGreaterEqual = sc_isCharStringGreaterEqual;
-/*** META ((export char-ci=?)
-           (type bool)
-           (peephole (hole 2 c1 ".val.toLowerCase() === " c2 ".val.toLowerCase()")))
-*/
-var sc_isCharCIEqual = sc_isCharStringCIEqual;
-/*** META ((export char-ci<?)
-           (type bool)
-           (peephole (hole 2 c1 ".val.toLowerCase() < " c2 ".val.toLowerCase()")))
-*/
-var sc_isCharCILess = sc_isCharStringCILess;
-/*** META ((export char-ci>?)
-           (type bool)
-           (peephole (hole 2 c1 ".val.toLowerCase() > " c2 ".val.toLowerCase()")))
-*/
-var sc_isCharCIGreater = sc_isCharStringCIGreater;
-/*** META ((export char-ci<=?)
-           (type bool)
-           (peephole (hole 2 c1 ".val.toLowerCase() <= " c2 ".val.toLowerCase()")))
-*/
-var sc_isCharCILessEqual = sc_isCharStringCILessEqual;
-/*** META ((export char-ci>=?)
-           (type bool)
-           (peephole (hole 2 c1 ".val.toLowerCase() >= " c2 ".val.toLowerCase()")))
-*/
-var sc_isCharCIGreaterEqual = sc_isCharStringCIGreaterEqual;
-
-var SC_NUMBER_CLASS = "0123456789";
-var SC_WHITESPACE_CLASS = ' \r\n\t\f';
-var SC_LOWER_CLASS = 'abcdefghijklmnopqrstuvwxyz';
-var SC_UPPER_CLASS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
-function sc_isCharOfClass(c, cl) { return (cl.indexOf(c) != -1); }
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isCharAlphabetic(c)
-    { return sc_isCharOfClass(c.val, SC_LOWER_CLASS) ||
-	  sc_isCharOfClass(c.val, SC_UPPER_CLASS); }
-/*** META ((export #t)
-           (type bool)
-           (peephole (hole 1 "SC_NUMBER_CLASS.indexOf(" c ".val) != -1")))
-*/
-function sc_isCharNumeric(c)
-    { return sc_isCharOfClass(c.val, SC_NUMBER_CLASS); }
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isCharWhitespace(c) {
-    var tmp = c.val;
-    return tmp === " " || tmp === "\r" || tmp === "\n" || tmp === "\t" || tmp === "\f";
-}
-/*** META ((export #t)
-           (type bool)
-           (peephole (hole 1 "SC_UPPER_CLASS.indexOf(" c ".val) != -1")))
-*/
-function sc_isCharUpperCase(c)
-    { return sc_isCharOfClass(c.val, SC_UPPER_CLASS); }
-/*** META ((export #t)
-           (type bool)
-           (peephole (hole 1 "SC_LOWER_CLASS.indexOf(" c ".val) != -1")))
-*/
-function sc_isCharLowerCase(c)
-    { return sc_isCharOfClass(c.val, SC_LOWER_CLASS); }
-
-/*** META ((export #t)
-           (peephole (postfix ".val.charCodeAt(0)")))
-*/
-function sc_char2integer(c)
-    { return c.val.charCodeAt(0); }
-/*** META ((export #t)
-           (peephole (hole 1 "new sc_Char(String.fromCharCode(" n "))")))
-*/
-function sc_integer2char(n)
-    { return new sc_Char(String.fromCharCode(n)); }
-
-/*** META ((export #t)
-           (peephole (hole 1 "new sc_Char(" c ".val.toUpperCase())")))
-*/
-function sc_charUpcase(c)
-    { return new sc_Char(c.val.toUpperCase()); }
-/*** META ((export #t)
-           (peephole (hole 1 "new sc_Char(" c ".val.toLowerCase())")))
-*/
-function sc_charDowncase(c)
-    { return new sc_Char(c.val.toLowerCase()); }
-
-function sc_makeJSStringOfLength(k, c) {
-    var fill;
-    if (c === undefined)
-	fill = " ";
-    else
-	fill = c;
-    var res = "";
-    var len = 1;
-    // every round doubles the size of fill.
-    while (k >= len) {
-	if (k & len)
-	    res = res.concat(fill);
-	fill = fill.concat(fill);
-	len *= 2;
-    }
-    return res;
-}
-
-function sc_makejsString(k, c) {
-    var fill;
-    if (c)
-	fill = c.val;
-    else
-	fill = " ";
-    return sc_makeJSStringOfLength(k, fill);
-}
-
-function sc_jsstring2list(s) {
-    var res = null;
-    for (var i = s.length - 1; i >= 0; i--)
-	res = sc_cons(new sc_Char(s.charAt(i)), res);
-    return res;
-}
-
-function sc_list2jsstring(l) {
-    var a = new Array();
-    while(l !== null) {
-	a.push(l.car.val);
-	l = l.cdr;
-    }
-    return "".concat.apply("", a);
-}
-
-var sc_Vector = Array;
-
-sc_Vector.prototype.sc_toWriteOrDisplayString = function(writeOrDisplay) {
-    if (this.length === 0) return "#()";
-
-    var res = "#(" + writeOrDisplay(this[0]);
-    for (var i = 1; i < this.length; i++)
-	res += " " + writeOrDisplay(this[i]);
-    res += ")";
-    return res;
-};
-sc_Vector.prototype.sc_toDisplayString = function() {
-    return this.sc_toWriteOrDisplayString(sc_toDisplayString);
-};
-sc_Vector.prototype.sc_toWriteString = function() {
-    return this.sc_toWriteOrDisplayString(sc_toWriteString);
-};
-
-/*** META ((export vector? array?)
-           (type bool)
-           (peephole (postfix " instanceof sc_Vector")))
-*/
-function sc_isVector(v) {
-    return (v instanceof sc_Vector);
-}
-
-// only applies to vectors
-function sc_isVectorEqual(v1, v2, comp) {
-    if (v1.length !== v2.length) return false;
-    for (var i = 0; i < v1.length; i++)
-	if (!comp(v1[i], v2[i])) return false;
-    return true;
-}
-
-/*** META ((export make-vector make-array)) */
-function sc_makeVector(size, fill) {
-    var a = new sc_Vector(size);
-    if (fill !== undefined)
-	sc_vectorFillBang(a, fill);
-    return a;
-}
-
-/*** META ((export vector array)
-           (peephole (vector)))
-*/
-function sc_vector() {
-    var a = new sc_Vector();
-    for (var i = 0; i < arguments.length; i++)
-	a.push(arguments[i]);
-    return a;
-}
-
-/*** META ((export vector-length array-length)
-           (peephole (postfix ".length")))
-*/
-function sc_vectorLength(v) {
-    return v.length;
-}
-
-/*** META ((export vector-ref array-ref)
-           (peephole (hole 2 v "[" pos "]")))
-*/
-function sc_vectorRef(v, pos) {
-    return v[pos];
-}
-
-/*** META ((export vector-set! array-set!)
-           (peephole (hole 3 v "[" pos "] = " val)))
-*/
-function sc_vectorSetBang(v, pos, val) {
-    v[pos] = val;
-}
-
-/*** META ((export vector->list array->list)) */
-function sc_vector2list(a) {
-    var res = null;
-    for (var i = a.length-1; i >= 0; i--)
-	res = sc_cons(a[i], res);
-    return res;
-}
-
-/*** META ((export list->vector list->array)) */
-function sc_list2vector(l) {
-    var a = new sc_Vector();
-    while(l !== null) {
-	a.push(l.car);
-	l = l.cdr;
-    }
-    return a;
-}
-
-/*** META ((export vector-fill! array-fill!)) */
-function sc_vectorFillBang(a, fill) {
-    for (var i = 0; i < a.length; i++)
-	a[i] = fill;
-}
-
-
-/*** META ((export #t)) */
-function sc_copyVector(a, len) {
-    if (len <= a.length)
-	return a.slice(0, len);
-    else {
-	var tmp = a.concat();
-	tmp.length = len;
-	return tmp;
-    }
-}
-
-/*** META ((export #t)
-           (peephole (hole 3 a ".slice(" start "," end ")")))
-*/
-function sc_vectorCopy(a, start, end) {
-    return a.slice(start, end);
-}
-
-/*** META ((export #t)) */
-function sc_vectorCopyBang(target, tstart, source, sstart, send) {
-    if (!sstart) sstart = 0;
-    if (!send) send = source.length;
-
-    // if target == source we don't want to overwrite not yet copied elements.
-    if (tstart <= sstart) {
-	for (var i = tstart, j = sstart; j < send; i++, j++) {
-	    target[i] = source[j];
-	}
-    } else {
-	var diff = send - sstart;
-	for (var i = tstart + diff - 1, j = send - 1;
-	     j >= sstart;
-	     i--, j--) {
-	    target[i] = source[j];
-	}
-    }
-    return target;
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (hole 1 "typeof " o " === 'function'")))
-*/
-function sc_isProcedure(o) {
-    return (typeof o === "function");
-}
-
-/*** META ((export #t)) */
-function sc_apply(proc) {
-    var args = new Array();
-    // first part of arguments are not in list-form.
-    for (var i = 1; i < arguments.length - 1; i++)
-	args.push(arguments[i]);
-    var l = arguments[arguments.length - 1];
-    while (l !== null) {
-	args.push(l.car);
-	l = l.cdr;
-    }
-    return proc.apply(null, args);
-}
-
-/*** META ((export #t)) */
-function sc_map(proc, l1) {
-    if (l1 === undefined)
-	return null;
-    // else
-    var nbApplyArgs = arguments.length - 1;
-    var applyArgs = new Array(nbApplyArgs);
-    var revres = null;
-    while (l1 !== null) {
-	for (var i = 0; i < nbApplyArgs; i++) {
-	    applyArgs[i] = arguments[i + 1].car;
-	    arguments[i + 1] = arguments[i + 1].cdr;
-	}
-	revres = sc_cons(proc.apply(null, applyArgs), revres);
-    }
-    return sc_reverseAppendBang(revres, null);
-}
-
-/*** META ((export #t)) */
-function sc_mapBang(proc, l1) {
-    if (l1 === undefined)
-	return null;
-    // else
-    var l1_orig = l1;
-    var nbApplyArgs = arguments.length - 1;
-    var applyArgs = new Array(nbApplyArgs);
-    while (l1 !== null) {
-	var tmp = l1;
-	for (var i = 0; i < nbApplyArgs; i++) {
-	    applyArgs[i] = arguments[i + 1].car;
-	    arguments[i + 1] = arguments[i + 1].cdr;
-	}
-	tmp.car = proc.apply(null, applyArgs);
-    }
-    return l1_orig;
-}
-     
-/*** META ((export #t)) */
-function sc_forEach(proc, l1) {
-    if (l1 === undefined)
-	return undefined;
-    // else
-    var nbApplyArgs = arguments.length - 1;
-    var applyArgs = new Array(nbApplyArgs);
-    while (l1 !== null) {
-	for (var i = 0; i < nbApplyArgs; i++) {
-	    applyArgs[i] = arguments[i + 1].car;
-	    arguments[i + 1] = arguments[i + 1].cdr;
-	}
-	proc.apply(null, applyArgs);
-    }
-    // add return so FF does not complain.
-    return undefined;
-}
-
-/*** META ((export #t)) */
-function sc_filter(proc, l1) {
-    var dummy = { cdr : null };
-    var tail = dummy;
-    while (l1 !== null) {
-	if (proc(l1.car) !== false) {
-	    tail.cdr = sc_cons(l1.car, null);
-	    tail = tail.cdr;
-	}
-	l1 = l1.cdr;
-    }
-    return dummy.cdr;
-}
-
-/*** META ((export #t)) */
-function sc_filterBang(proc, l1) {
-    var head = sc_cons("dummy", l1);
-    var it = head;
-    var next = l1;
-    while (next !== null) {
-        if (proc(next.car) !== false) {
-	    it.cdr = next
-	    it = next;
-	}
-	next = next.cdr;
-    }
-    it.cdr = null;
-    return head.cdr;
-}
-
-function sc_filterMap1(proc, l1) {
-    var revres = null;
-    while (l1 !== null) {
-        var tmp = proc(l1.car)
-        if (tmp !== false) revres = sc_cons(tmp, revres);
-        l1 = l1.cdr;
-    }
-    return sc_reverseAppendBang(revres, null);
-}
-function sc_filterMap2(proc, l1, l2) {
-    var revres = null;
-    while (l1 !== null) {
-        var tmp = proc(l1.car, l2.car);
-        if(tmp !== false) revres = sc_cons(tmp, revres);
-	l1 = l1.cdr;
-	l2 = l2.cdr
-    }
-    return sc_reverseAppendBang(revres, null);
-}
-
-/*** META ((export #t)) */
-function sc_filterMap(proc, l1, l2, l3) {
-    if (l2 === undefined)
-	return sc_filterMap1(proc, l1);
-    else if (l3 === undefined)
-	return sc_filterMap2(proc, l1, l2);
-    // else
-    var nbApplyArgs = arguments.length - 1;
-    var applyArgs = new Array(nbApplyArgs);
-    var revres = null;
-    while (l1 !== null) {
-	for (var i = 0; i < nbApplyArgs; i++) {
-	    applyArgs[i] = arguments[i + 1].car;
-	    arguments[i + 1] = arguments[i + 1].cdr;
-	}
-	var tmp = proc.apply(null, applyArgs);
-	if(tmp !== false) revres = sc_cons(tmp, revres);
-    }
-    return sc_reverseAppendBang(revres, null);
-}
-
-/*** META ((export #t)) */
-function sc_any(proc, l) {
-    var revres = null;
-    while (l !== null) {
-        var tmp = proc(l.car);
-        if(tmp !== false) return tmp;
-	l = l.cdr;
-    }
-    return false;
-}
-
-/*** META ((export any?)
-           (peephole (hole 2 "sc_any(" proc "," l ") !== false")))
-*/
-function sc_anyPred(proc, l) {
-    return sc_any(proc, l)!== false;
-}
-
-/*** META ((export #t)) */
-function sc_every(proc, l) {
-    var revres = null;
-    var tmp = true;
-    while (l !== null) {
-        tmp = proc(l.car);
-        if (tmp === false) return false;
-	l = l.cdr;
-    }
-    return tmp;
-}
-
-/*** META ((export every?)
-           (peephole (hole 2 "sc_every(" proc "," l ") !== false")))
-*/
-function sc_everyPred(proc, l) {
-    var tmp = sc_every(proc, l);
-    if (tmp !== false) return true;
-    return false;
-}
-
-/*** META ((export #t)
-           (peephole (postfix "()")))
-*/
-function sc_force(o) {
-    return o();
-}
-
-/*** META ((export #t)) */
-function sc_makePromise(proc) {
-    var isResultReady = false;
-    var result = undefined;
-    return function() {
-	if (!isResultReady) {
-	    var tmp = proc();
-	    if (!isResultReady) {
-		isResultReady = true;
-		result = tmp;
-	    }
-	}
-	return result;
-    };
-}
-
-function sc_Values(values) {
-    this.values = values;
-}
-
-/*** META ((export #t)
-           (peephole (values)))
-*/
-function sc_values() {
-    if (arguments.length === 1)
-	return arguments[0];
-    else
-	return new sc_Values(arguments);
-}
-
-/*** META ((export #t)) */
-function sc_callWithValues(producer, consumer) {
-    var produced = producer();
-    if (produced instanceof sc_Values)
-	return consumer.apply(null, produced.values);
-    else
-	return consumer(produced);
-}
-
-/*** META ((export #t)) */
-function sc_dynamicWind(before, thunk, after) {
-    before();
-    try {
-	var res = thunk();
-	return res;
-    } finally {
-	after();
-    }
-}
-
-
-// TODO: eval/scheme-report-environment/null-environment/interaction-environment
-
-// LIMITATION: 'load' doesn't exist without files.
-// LIMITATION: transcript-on/transcript-off doesn't exist without files.
-
-
-function sc_Struct(name) {
-    this.name = name;
-}
-sc_Struct.prototype.sc_toDisplayString = function() {
-    return "#<struct" + sc_hash(this) + ">";
-};
-sc_Struct.prototype.sc_toWriteString = sc_Struct.prototype.sc_toDisplayString;
-
-/*** META ((export #t)
-           (peephole (hole 1 "new sc_Struct(" name ")")))
-*/
-function sc_makeStruct(name) {
-    return new sc_Struct(name);
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix " instanceof sc_Struct")))
-*/
-function sc_isStruct(o) {
-    return (o instanceof sc_Struct);
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (hole 2 "(" 1 " instanceof sc_Struct) && ( " 1 ".name === " 0 ")")))
-*/
-function sc_isStructNamed(name, s) {
-    return ((s instanceof sc_Struct) && (s.name === name));
-}
-
-/*** META ((export struct-field)
-           (peephole (hole 3 0 "[" 2 "]")))
-*/
-function sc_getStructField(s, name, field) {
-    return s[field];
-}
-
-/*** META ((export struct-field-set!)
-           (peephole (hole 4 0 "[" 2 "] = " 3)))
-*/
-function sc_setStructFieldBang(s, name, field, val) {
-    s[field] = val;
-}
-
-/*** META ((export #t)
-           (peephole (prefix "~")))
-*/
-function sc_bitNot(x) {
-    return ~x;
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 "&")))
-*/
-function sc_bitAnd(x, y) {
-    return x & y;
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 "|")))
-*/
-function sc_bitOr(x, y) {
-    return x | y;
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 "^")))
-*/
-function sc_bitXor(x, y) {
-    return x ^ y;
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 "<<")))
-*/
-function sc_bitLsh(x, y) {
-    return x << y;
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 ">>")))
-*/
-function sc_bitRsh(x, y) {
-    return x >> y;
-}
-
-/*** META ((export #t)
-           (peephole (infix 2 2 ">>>")))
-*/
-function sc_bitUrsh(x, y) {
-    return x >>> y;
-}
-
-/*** META ((export js-field js-property)
-           (peephole (hole 2 o "[" field "]")))
-*/
-function sc_jsField(o, field) {
-    return o[field];
-}
-
-/*** META ((export js-field-set! js-property-set!)
-           (peephole (hole 3 o "[" field "] = " val)))
-*/
-function sc_setJsFieldBang(o, field, val) {
-    return o[field] = val;
-}
-
-/*** META ((export js-field-delete! js-property-delete!)
-           (peephole (hole 2 "delete" o "[" field "]")))
-*/
-function sc_deleteJsFieldBang(o, field) {
-    delete o[field];
-}
-
-/*** META ((export #t)
-           (peephole (jsCall)))
-*/
-function sc_jsCall(o, fun) {
-    var args = new Array();
-    for (var i = 2; i < arguments.length; i++)
-	args[i-2] = arguments[i];
-    return fun.apply(o, args);
-}
-
-/*** META ((export #t)
-           (peephole (jsMethodCall)))
-*/
-function sc_jsMethodCall(o, field) {
-    var args = new Array();
-    for (var i = 2; i < arguments.length; i++)
-	args[i-2] = arguments[i];
-    return o[field].apply(o, args);
-}
-
-/*** META ((export new js-new)
-           (peephole (jsNew)))
-*/
-function sc_jsNew(c) {
-    var evalStr = "new c(";
-    evalStr +=arguments.length > 1? "arguments[1]": "";
-    for (var i = 2; i < arguments.length; i++)
-	evalStr += ", arguments[" + i + "]";
-    evalStr +=")";
-    return eval(evalStr);
-}    
-
-// ======================== RegExp ====================
-/*** META ((export #t)) */
-function sc_pregexp(re) {
-    return new RegExp(sc_string2jsstring(re));
-}
-
-/*** META ((export #t)) */
-function sc_pregexpMatch(re, s) {
-    var reg = (re instanceof RegExp) ? re : sc_pregexp(re);
-    var tmp = reg.exec(sc_string2jsstring(s));
-    
-    if (tmp == null) return false;
-    
-    var res = null;
-    for (var i = tmp.length-1; i >= 0; i--) {
-	if (tmp[i] !== null) {
-	    res = sc_cons(sc_jsstring2string(tmp[i]), res);
-	} else {
-	    res = sc_cons(false, res);
-	}
-    }
-    return res;
-}
-   
-/*** META ((export #t)) */
-function sc_pregexpReplace(re, s1, s2) {
-   var reg;
-   var jss1 = sc_string2jsstring(s1);
-   var jss2 = sc_string2jsstring(s2);
-
-   if (re instanceof RegExp) {
-       if (re.global)
-	   reg = re;
-       else
-	   reg = new RegExp(re.source);
-   } else {
-       reg = new RegExp(sc_string2jsstring(re));
-   }
-
-   return jss1.replace(reg, jss2);
-}
-   
-/*** META ((export pregexp-replace*)) */
-function sc_pregexpReplaceAll(re, s1, s2) {
-   var reg;
-   var jss1 = sc_string2jsstring(s1);
-   var jss2 = sc_string2jsstring(s2);
-
-   if (re instanceof RegExp) {
-      if (re.global)
-	  reg = re;
-      else
-	  reg = new RegExp(re.source, "g");
-   } else {
-       reg = new RegExp(sc_string2jsstring(re), "g");
-   }
-
-   return jss1.replace(reg, jss2);
-}
-
-/*** META ((export #t)) */
-function sc_pregexpSplit(re, s) {
-   var reg = ((re instanceof RegExp) ?
-	      re :
-	      new RegExp(sc_string2jsstring(re)));
-   var jss = sc_string2jsstring(s);
-   var tmp = jss.split(reg);
-
-   if (tmp == null) return false;
-
-   return sc_vector2list(tmp);
-}
-   
-
-/* =========================================================================== */
-/* Other library stuff */
-/* =========================================================================== */
-
-/*** META ((export #t)
-           (peephole (hole 1 "Math.floor(Math.random()*" 'n ")")))
-*/
-function sc_random(n) {
-    return Math.floor(Math.random()*n);
-}
-
-/*** META ((export current-date)
-           (peephole (hole 0 "new Date()")))
-*/
-function sc_currentDate() {
-   return new Date();
-}
-
-function sc_Hashtable() {
-}
-sc_Hashtable.prototype.toString = function() {
-    return "#{%hashtable}";
-};
-// sc_toWriteString == sc_toDisplayString == toString
-
-function sc_HashtableElement(key, val) {
-    this.key = key;
-    this.val = val;
-}
-
-/*** META ((export #t)
-           (peephole (hole 0 "new sc_Hashtable()")))
-*/
-function sc_makeHashtable() {
-    return new sc_Hashtable();
-}
-
-/*** META ((export #t)) */
-function sc_hashtablePutBang(ht, key, val) {
-    var hash = sc_hash(key);
-    ht[hash] = new sc_HashtableElement(key, val);
-}
-
-/*** META ((export #t)) */
-function sc_hashtableGet(ht, key) {
-    var hash = sc_hash(key);
-    if (hash in ht)
-	return ht[hash].val;
-    else
-	return false;
-}
-
-/*** META ((export #t)) */
-function sc_hashtableForEach(ht, f) {
-    for (var v in ht) {
-	if (ht[v] instanceof sc_HashtableElement)
-	    f(ht[v].key, ht[v].val);
-    }
-}
-
-/*** META ((export hashtable-contains?)
-           (peephole (hole 2 "sc_hash(" 1 ") in " 0)))
-*/
-function sc_hashtableContains(ht, key) {
-    var hash = sc_hash(key);
-    if (hash in ht)
-	return true;
-    else
-	return false;
-}
-
-var SC_HASH_COUNTER = 0;
-
-function sc_hash(o) {
-    if (o === null)
-	return "null";
-    else if (o === undefined)
-	return "undefined";
-    else if (o === true)
-	return "true";
-    else if (o === false)
-	return "false";
-    else if (typeof o === "number")
-	return "num-" + o;
-    else if (typeof o === "string")
-	return "jsstr-" + o;
-    else if (o.sc_getHash)
-	return o.sc_getHash();
-    else
-	return sc_counterHash.call(o);
-}
-function sc_counterHash() {
-    if (!this.sc_hash) {
-	this.sc_hash = "hash-" + SC_HASH_COUNTER;
-	SC_HASH_COUNTER++;
-    }
-    return this.sc_hash;
-}
-
-function sc_Trampoline(args, maxTailCalls) {
-    this['__trampoline return__'] = true;
-    this.args = args;
-    this.MAX_TAIL_CALLs = maxTailCalls;
-}
-// TODO: call/cc stuff
-sc_Trampoline.prototype.restart = function() {
-    var o = this;
-    while (true) {
-	// set both globals.
-	SC_TAIL_OBJECT.calls = o.MAX_TAIL_CALLs-1;
-	var fun = o.args.callee;
-	var res = fun.apply(SC_TAIL_OBJECT, o.args);
-	if (res instanceof sc_Trampoline)
-	    o = res;
-	else
-	    return res;
-    }
-}
-
-/*** META ((export bind-exit-lambda)) */
-function sc_bindExitLambda(proc) {
-    var escape_obj = new sc_BindExitException();
-    var escape = function(res) {
-	escape_obj.res = res;
-	throw escape_obj;
-    };
-    try {
-	return proc(escape);
-    } catch(e) {
-	if (e === escape_obj) {
-	    return e.res;
-	}
-	throw e;
-    }
-}
-function sc_BindExitException() {
-    this._internalException = true;
-}
-
-var SC_SCM2JS_GLOBALS = new Object();
-
-// default tail-call depth.
-// normally the program should set it again. but just in case...
-var SC_TAIL_OBJECT = new Object();
-SC_SCM2JS_GLOBALS.TAIL_OBJECT = SC_TAIL_OBJECT;
-// ======================== I/O =======================
-
-/*------------------------------------------------------------------*/
-
-function sc_EOF() {
-}
-var SC_EOF_OBJECT = new sc_EOF();
-
-function sc_Port() {
-}
-
-/* --------------- Input ports -------------------------------------*/
-
-function sc_InputPort() {
-}
-sc_InputPort.prototype = new sc_Port();
-
-sc_InputPort.prototype.peekChar = function() {
-    if (!("peeked" in this))
-	this.peeked = this.getNextChar();
-    return this.peeked;
-}
-sc_InputPort.prototype.readChar = function() {
-    var tmp = this.peekChar();
-    delete this.peeked;
-    return tmp;
-}
-sc_InputPort.prototype.isCharReady = function() {
-    return true;
-}
-sc_InputPort.prototype.close = function() {
-    // do nothing
-}
-
-/* .............. String port ..........................*/
-function sc_ErrorInputPort() {
-};
-sc_ErrorInputPort.prototype = new sc_InputPort();
-sc_ErrorInputPort.prototype.getNextChar = function() {
-    throw "can't read from error-port.";
-};
-sc_ErrorInputPort.prototype.isCharReady = function() {
-    return false;
-};
-    
-
-/* .............. String port ..........................*/
-
-function sc_StringInputPort(jsStr) {
-    // we are going to do some charAts on the str.
-    // instead of recreating all the time a String-object, we
-    // create one in the beginning. (not sure, if this is really an optim)
-    this.str = new String(jsStr);
-    this.pos = 0;
-}
-sc_StringInputPort.prototype = new sc_InputPort();
-sc_StringInputPort.prototype.getNextChar = function() {
-    if (this.pos >= this.str.length)
-	return SC_EOF_OBJECT;
-    return this.str.charAt(this.pos++);
-};
-
-/* ------------- Read and other lib-funs  -------------------------------*/
-function sc_Token(type, val, pos) {
-    this.type = type;
-    this.val = val;
-    this.pos = pos;
-}
-sc_Token.EOF = 0/*EOF*/;
-sc_Token.OPEN_PAR = 1/*OPEN_PAR*/;
-sc_Token.CLOSE_PAR = 2/*CLOSE_PAR*/;
-sc_Token.OPEN_BRACE = 3/*OPEN_BRACE*/;
-sc_Token.CLOSE_BRACE = 4/*CLOSE_BRACE*/;
-sc_Token.OPEN_BRACKET = 5/*OPEN_BRACKET*/;
-sc_Token.CLOSE_BRACKET = 6/*CLOSE_BRACKET*/;
-sc_Token.WHITESPACE = 7/*WHITESPACE*/;
-sc_Token.QUOTE = 8/*QUOTE*/;
-sc_Token.ID = 9/*ID*/;
-sc_Token.DOT = 10/*DOT*/;
-sc_Token.STRING = 11/*STRING*/;
-sc_Token.NUMBER = 12/*NUMBER*/;
-sc_Token.ERROR = 13/*ERROR*/;
-sc_Token.VECTOR_BEGIN = 14/*VECTOR_BEGIN*/;
-sc_Token.TRUE = 15/*TRUE*/;
-sc_Token.FALSE = 16/*FALSE*/;
-sc_Token.UNSPECIFIED = 17/*UNSPECIFIED*/;
-sc_Token.REFERENCE = 18/*REFERENCE*/;
-sc_Token.STORE = 19/*STORE*/;
-sc_Token.CHAR = 20/*CHAR*/;
-
-var SC_ID_CLASS = SC_LOWER_CLASS + SC_UPPER_CLASS + "!$%*+-./:<=>?@^_~";
-function sc_Tokenizer(port) {
-    this.port = port;
-}
-sc_Tokenizer.prototype.peekToken = function() {
-    if (this.peeked)
-	return this.peeked;
-    var newToken = this.nextToken();
-    this.peeked = newToken;
-    return newToken;
-};
-sc_Tokenizer.prototype.readToken = function() {
-    var tmp = this.peekToken();
-    delete this.peeked;
-    return tmp;
-};
-sc_Tokenizer.prototype.nextToken = function() {
-    var port = this.port;
-    
-    function isNumberChar(c) {
-	return (c >= "0" && c <= "9");
-    };
-    function isIdOrNumberChar(c) {
-	return SC_ID_CLASS.indexOf(c) != -1 || // ID-char
-	    (c >= "0" && c <= "9");
-    }
-    function isWhitespace(c) {
-	return c === " " || c === "\r" || c === "\n" || c === "\t" || c === "\f";
-    };
-    function isWhitespaceOrEOF(c) {
-	return isWhitespace(c) || c === SC_EOF_OBJECT;
-    };
-
-    function readString() {
-	res = "";
-	while (true) {
-	    var c = port.readChar();
-	    switch (c) {
-	    case '"':
-		return new sc_Token(11/*STRING*/, res);
-	    case "\\":
-		var tmp = port.readChar();
-		switch (tmp) {
-		case '0': res += "\0"; break;
-		case 'a': res += "\a"; break;
-		case 'b': res += "\b"; break;
-		case 'f': res += "\f"; break;
-		case 'n': res += "\n"; break;
-		case 'r': res += "\r"; break;
-		case 't': res += "\t"; break;
-		case 'v': res += "\v"; break;
-		case '"': res += '"'; break;
-		case '\\': res += '\\'; break;
-		case 'x':
-		    /* hexa-number */
-		    var nb = 0;
-		    while (true) {
-			var hexC = port.peekChar();
-			if (hexC >= '0' && hexC <= '9') {
-			    port.readChar();
-			    nb = nb * 16 + hexC.charCodeAt(0) - '0'.charCodeAt(0);
-			} else if (hexC >= 'a' && hexC <= 'f') {
-			    port.readChar();
-			    nb = nb * 16 + hexC.charCodeAt(0) - 'a'.charCodeAt(0);
-			} else if (hexC >= 'A' && hexC <= 'F') {
-			    port.readChar();
-			    nb = nb * 16 + hexC.charCodeAt(0) - 'A'.charCodeAt(0);
-			} else {
-			    // next char isn't part of hex.
-			    res += String.fromCharCode(nb);
-			    break;
-			}
-		    }
-		    break;
-		default:
-		    if (tmp === SC_EOF_OBJECT) {
-			return new sc_Token(13/*ERROR*/, "unclosed string-literal" + res);
-		    }
-		    res += tmp;
-		}
-		break;
-	    default:
-		if (c === SC_EOF_OBJECT) {
-		    return new sc_Token(13/*ERROR*/, "unclosed string-literal" + res);
-		}
-		res += c;
-	    }
-	}
-    };
-    function readIdOrNumber(firstChar) {
-	var res = firstChar;
-	while (isIdOrNumberChar(port.peekChar()))
-	    res += port.readChar();
-	if (isNaN(res))
-	    return new sc_Token(9/*ID*/, res);
-	else
-	    return new sc_Token(12/*NUMBER*/, res - 0);
-    };
-    
-    function skipWhitespaceAndComments() {
-	var done = false;
-	while (!done) {
-	    done = true;
-	    while (isWhitespace(port.peekChar()))
-		port.readChar();
-	    if (port.peekChar() === ';') {
-		port.readChar();
-		done = false;
-		while (true) {
-		    curChar = port.readChar();
-		    if (curChar === SC_EOF_OBJECT ||
-			curChar === '\n')
-			break;
-		}
-	    }
-	}
-    };
-    
-    function readDot() {
-	if (isWhitespace(port.peekChar()))
-	    return new sc_Token(10/*DOT*/);
-	else
-	    return readIdOrNumber(".");
-    };
-
-    function readSharp() {
-	var c = port.readChar();
-	if (isWhitespace(c))
-	    return new sc_Token(13/*ERROR*/, "bad #-pattern0.");
-
-	// reference
-	if (isNumberChar(c)) {
-	    var nb = c - 0;
-	    while (isNumberChar(port.peekChar()))
-		nb = nb*10 + (port.readChar() - 0);
-	    switch (port.readChar()) {
-	    case '#':
-		return new sc_Token(18/*REFERENCE*/, nb);
-	    case '=':
-		return new sc_Token(19/*STORE*/, nb);
-	    default:
-		return new sc_Token(13/*ERROR*/, "bad #-pattern1." + nb);
-	    }
-	}
-
-	if (c === "(")
-	    return new sc_Token(14/*VECTOR_BEGIN*/);
-	
-	if (c === "\\") { // character
-	    var tmp = ""
-	    while (!isWhitespaceOrEOF(port.peekChar()))
-		tmp += port.readChar();
-	    switch (tmp.length) {
-	    case 0: // it's escaping a whitespace char:
-		if (sc_isEOFObject(port.peekChar))
-		    return new sc_Token(13/*ERROR*/, "bad #-pattern2.");
-		else
-		    return new sc_Token(20/*CHAR*/, port.readChar());
-	    case 1:
-		return new sc_Token(20/*CHAR*/, tmp);
-	    default:
-		var entry = sc_Char.readable2char[tmp.toLowerCase()];
-		if (entry)
-		    return new sc_Token(20/*CHAR*/, entry);
-		else
-		    return new sc_Token(13/*ERROR*/, "unknown character description: #\\" + tmp);
-	    }
-	}
-
-	// some constants (#t, #f, #unspecified)
-	var res;
-	var needing;
-	switch (c) {
-	case 't': res = new sc_Token(15/*TRUE*/, true); needing = ""; break;
-	case 'f': res = new sc_Token(16/*FALSE*/, false); needing = ""; break;
-	case 'u': res = new sc_Token(17/*UNSPECIFIED*/, undefined); needing = "nspecified"; break;
-	default:
-	    return new sc_Token(13/*ERROR*/, "bad #-pattern3: " + c);
-	}
-	while(true) {
-	    c = port.peekChar();
-	    if ((isWhitespaceOrEOF(c) || c === ')') &&
-		needing == "")
-		return res;
-	    else if (isWhitespace(c) || needing == "")
-		return new sc_Token(13/*ERROR*/, "bad #-pattern4 " + c + " " + needing);
-	    else if (needing.charAt(0) == c) {
-		port.readChar(); // consume
-		needing = needing.slice(1);
-	    } else
-		return new sc_Token(13/*ERROR*/, "bad #-pattern5");
-	}
-	
-    };
-
-    skipWhitespaceAndComments();
-    var curChar = port.readChar();
-    if (curChar === SC_EOF_OBJECT)
-	return new sc_Token(0/*EOF*/, curChar);
-    switch (curChar)
-    {
-    case " ":
-    case "\n":
-    case "\t":
-	return readWhitespace();
-    case "(":
-	return new sc_Token(1/*OPEN_PAR*/);
-    case ")":
-	return new sc_Token(2/*CLOSE_PAR*/);
-    case "{":
-	return new sc_Token(3/*OPEN_BRACE*/);
-    case "}":
-	return new sc_Token(4/*CLOSE_BRACE*/);
-    case "[":
-	return new sc_Token(5/*OPEN_BRACKET*/);
-    case "]":
-	return new sc_Token(6/*CLOSE_BRACKET*/);
-    case "'":
-	return new sc_Token(8/*QUOTE*/);
-    case "#":
-	return readSharp();
-    case ".":
-	return readDot();
-    case '"':
-	return readString();
-    default:
-	if (isIdOrNumberChar(curChar))
-	    return readIdOrNumber(curChar);
-	throw "unexpected character: " + curChar;
-    }
-};
-
-function sc_Reader(tokenizer) {
-    this.tokenizer = tokenizer;
-    this.backref = new Array();
-}
-sc_Reader.prototype.read = function() {
-    function readList(listBeginType) {
-	function matchesPeer(open, close) {
-	    return open === 1/*OPEN_PAR*/ && close === 2/*CLOSE_PAR*/
-	    	|| open === 3/*OPEN_BRACE*/ && close === 4/*CLOSE_BRACE*/
-		|| open === 5/*OPEN_BRACKET*/ && close === 6/*CLOSE_BRACKET*/;
-	};
-	var res = null;
-
-	while (true) {
-	    var token = tokenizer.peekToken();
-	    
-	    switch (token.type) {
-	    case 2/*CLOSE_PAR*/:
-	    case 4/*CLOSE_BRACE*/:
-	    case 6/*CLOSE_BRACKET*/:
-		if (matchesPeer(listBeginType, token.type)) {
-		    tokenizer.readToken(); // consume token
-		    return sc_reverseBang(res);
-		} else
-		    throw "closing par doesn't match: " + listBeginType
-			+ " " + listEndType;
-
-	    case 0/*EOF*/:
-		throw "unexpected end of file";
-
-	    case 10/*DOT*/:
-		tokenizer.readToken(); // consume token
-		var cdr = this.read();
-		var par = tokenizer.readToken();
-		if (!matchesPeer(listBeginType, par.type))
-		    throw "closing par doesn't match: " + listBeginType
-			+ " " + par.type;
-		else
-		    return sc_reverseAppendBang(res, cdr);
-		
-
-	    default:
-		res = sc_cons(this.read(), res);
-	    }
-	}
-    };
-    function readQuote() {
-	return sc_cons("quote", sc_cons(this.read(), null));
-    };
-    function readVector() {
-	// opening-parenthesis is already consumed
-	var a = new Array();
-	while (true) {
-	    var token = tokenizer.peekToken();
-	    switch (token.type) {
-	    case 2/*CLOSE_PAR*/:
-		tokenizer.readToken();
-		return a;
-		
-	    default:
-		a.push(this.read());
-	    }
-	}
-    };
-
-    function storeRefence(nb) {
-	var tmp = this.read();
-	this.backref[nb] = tmp;
-	return tmp;
-    };
-	
-    function readReference(nb) {
-	if (nb in this.backref)
-	    return this.backref[nb];
-	else
-	    throw "bad reference: " + nb;
-    };
-    
-    var tokenizer = this.tokenizer;
-
-    var token = tokenizer.readToken();
-
-    // handle error
-    if (token.type === 13/*ERROR*/)
-	throw token.val;
-    
-    switch (token.type) {
-    case 1/*OPEN_PAR*/:
-    case 3/*OPEN_BRACE*/:
-    case 5/*OPEN_BRACKET*/:
-	return readList.call(this, token.type);
-    case 8/*QUOTE*/:
-	return readQuote.call(this);
-    case 11/*STRING*/:
-	return sc_jsstring2string(token.val);
-    case 20/*CHAR*/:
-	return new sc_Char(token.val);
-    case 14/*VECTOR_BEGIN*/:
-	return readVector.call(this);
-    case 18/*REFERENCE*/:
-	return readReference.call(this, token.val);
-    case 19/*STORE*/:
-	return storeRefence.call(this, token.val);
-    case 9/*ID*/:
-	return sc_jsstring2symbol(token.val);
-    case 0/*EOF*/:
-    case 12/*NUMBER*/:
-    case 15/*TRUE*/:
-    case 16/*FALSE*/:
-    case 17/*UNSPECIFIED*/:
-	return token.val;
-    default:
-	throw "unexpected token " + token.type + " " + token.val;
-    }
-};
-
-/*** META ((export #t)) */
-function sc_read(port) {
-    if (port === undefined) // we assume the port hasn't been given.
-	port = SC_DEFAULT_IN; // THREAD: shared var...
-    var reader = new sc_Reader(new sc_Tokenizer(port));
-    return reader.read();
-}
-/*** META ((export #t)) */
-function sc_readChar(port) {
-    if (port === undefined) // we assume the port hasn't been given.
-	port = SC_DEFAULT_IN; // THREAD: shared var...
-    var t = port.readChar();
-    return t === SC_EOF_OBJECT? t: new sc_Char(t);
-}
-/*** META ((export #t)) */
-function sc_peekChar(port) {
-    if (port === undefined) // we assume the port hasn't been given.
-	port = SC_DEFAULT_IN; // THREAD: shared var...
-    var t = port.peekChar();
-    return t === SC_EOF_OBJECT? t: new sc_Char(t);
-}    
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isCharReady(port) {
-    if (port === undefined) // we assume the port hasn't been given.
-	port = SC_DEFAULT_IN; // THREAD: shared var...
-    return port.isCharReady();
-}
-/*** META ((export #t)
-           (peephole (postfix ".close()")))
-*/
-function sc_closeInputPort(p) {
-    return p.close();
-}
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix " instanceof sc_InputPort")))
-*/
-function sc_isInputPort(o) {
-    return (o instanceof sc_InputPort);
-}
-
-/*** META ((export eof-object?)
-           (type bool)
-           (peephole (postfix " === SC_EOF_OBJECT")))
-*/
-function sc_isEOFObject(o) {
-    return o === SC_EOF_OBJECT;
-}
-
-/*** META ((export #t)
-           (peephole (hole 0 "SC_DEFAULT_IN")))
-*/
-function sc_currentInputPort() {
-    return SC_DEFAULT_IN;
-}
-
-/* ------------ file operations are not supported -----------*/
-/*** META ((export #t)) */
-function sc_callWithInputFile(s, proc) {
-    throw "can't open " + s;
-}
-
-/*** META ((export #t)) */
-function sc_callWithOutputFile(s, proc) {
-    throw "can't open " + s;
-}
-
-/*** META ((export #t)) */
-function sc_withInputFromFile(s, thunk) {
-    throw "can't open " + s;
-}
-
-/*** META ((export #t)) */
-function sc_withOutputToFile(s, thunk) {
-    throw "can't open " + s;
-}
-
-/*** META ((export #t)) */
-function sc_openInputFile(s) {
-    throw "can't open " + s;
-}
-
-/*** META ((export #t)) */
-function sc_openOutputFile(s) {
-    throw "can't open " + s;
-}
-
-/* ----------------------------------------------------------------------------*/
-/*** META ((export #t)) */
-function sc_basename(p) {
-   var i = p.lastIndexOf('/');
-
-   if(i >= 0)
-      return p.substring(i + 1, p.length);
-   else
-      return '';
-}
-
-/*** META ((export #t)) */
-function sc_dirname(p) {
-   var i = p.lastIndexOf('/');
-
-   if(i >= 0)
-      return p.substring(0, i);
-   else
-      return '';
-}
-
-/* ----------------------------------------------------------------------------*/
-
-/*** META ((export #t)) */
-function sc_withInputFromPort(p, thunk) {
-    try {
-	var tmp = SC_DEFAULT_IN; // THREAD: shared var.
-	SC_DEFAULT_IN = p;
-	return thunk();
-    } finally {
-	SC_DEFAULT_IN = tmp;
-    }
-}
-
-/*** META ((export #t)) */
-function sc_withInputFromString(s, thunk) {
-    return sc_withInputFromPort(new sc_StringInputPort(sc_string2jsstring(s)), thunk);
-}
-
-/*** META ((export #t)) */
-function sc_withOutputToPort(p, thunk) {
-    try {
-	var tmp = SC_DEFAULT_OUT; // THREAD: shared var.
-	SC_DEFAULT_OUT = p;
-	return thunk();
-    } finally {
-	SC_DEFAULT_OUT = tmp;
-    }
-}
-
-/*** META ((export #t)) */
-function sc_withOutputToString(thunk) {
-    var p = new sc_StringOutputPort();
-    sc_withOutputToPort(p, thunk);
-    return p.close();
-}
-
-/*** META ((export #t)) */
-function sc_withOutputToProcedure(proc, thunk) {
-    var t = function(s) { proc(sc_jsstring2string(s)); };
-    return sc_withOutputToPort(new sc_GenericOutputPort(t), thunk);
-}
-
-/*** META ((export #t)
-           (peephole (hole 0 "new sc_StringOutputPort()")))
-*/
-function sc_openOutputString() {
-    return new sc_StringOutputPort();
-}
-
-/*** META ((export #t)) */
-function sc_openInputString(str) {
-    return new sc_StringInputPort(sc_string2jsstring(str));
-}
-
-/* ----------------------------------------------------------------------------*/
-
-function sc_OutputPort() {
-}
-sc_OutputPort.prototype = new sc_Port();
-sc_OutputPort.prototype.appendJSString = function(obj) {
-    /* do nothing */
-}
-sc_OutputPort.prototype.close = function() {
-    /* do nothing */
-}
-
-function sc_StringOutputPort() {
-    this.res = "";
-}
-sc_StringOutputPort.prototype = new sc_OutputPort();
-sc_StringOutputPort.prototype.appendJSString = function(s) {
-    this.res += s;
-}
-sc_StringOutputPort.prototype.close = function() {
-    return sc_jsstring2string(this.res);
-}
-
-/*** META ((export #t)) */
-function sc_getOutputString(sp) {
-    return sc_jsstring2string(sp.res);
-}
-    
-
-function sc_ErrorOutputPort() {
-}
-sc_ErrorOutputPort.prototype = new sc_OutputPort();
-sc_ErrorOutputPort.prototype.appendJSString = function(s) {
-    throw "don't write on ErrorPort!";
-}
-sc_ErrorOutputPort.prototype.close = function() {
-    /* do nothing */
-}
-
-function sc_GenericOutputPort(appendJSString, close) {
-    this.appendJSString = appendJSString;
-    if (close)
-	this.close = close;
-}
-sc_GenericOutputPort.prototype = new sc_OutputPort();
-
-/*** META ((export #t)
-           (type bool)
-           (peephole (postfix " instanceof sc_OutputPort")))
-*/
-function sc_isOutputPort(o) {
-    return (o instanceof sc_OutputPort);
-}
-
-/*** META ((export #t)
-           (peephole (postfix ".close()")))
-*/
-function sc_closeOutputPort(p) {
-    return p.close();
-}
-
-/* ------------------ write ---------------------------------------------------*/
-
-/*** META ((export #t)) */
-function sc_write(o, p) {
-    if (p === undefined) // we assume not given
-	p = SC_DEFAULT_OUT;
-    p.appendJSString(sc_toWriteString(o));
-}
-
-function sc_toWriteString(o) {
-    if (o === null)
-	return "()";
-    else if (o === true)
-	return "#t";
-    else if (o === false)
-	return "#f";
-    else if (o === undefined)
-	return "#unspecified";
-    else if (typeof o === 'function')
-	return "#<procedure " + sc_hash(o) + ">";
-    else if (o.sc_toWriteString)
-	return o.sc_toWriteString();
-    else
-	return o.toString();
-}
-
-function sc_escapeWriteString(s) {
-    var res = "";
-    var j = 0;
-    for (i = 0; i < s.length; i++) {
-	switch (s.charAt(i)) {
-	case "\0": res += s.substring(j, i) + "\\0"; j = i + 1; break;
-	case "\b": res += s.substring(j, i) + "\\b"; j = i + 1; break;
-	case "\f": res += s.substring(j, i) + "\\f"; j = i + 1; break;
-	case "\n": res += s.substring(j, i) + "\\n"; j = i + 1; break;
-	case "\r": res += s.substring(j, i) + "\\r"; j = i + 1; break;
-	case "\t": res += s.substring(j, i) + "\\t"; j = i + 1; break;
-	case "\v": res += s.substring(j, i) + "\\v"; j = i + 1; break;
-	case '"': res += s.substring(j, i) + '\\"'; j = i + 1; break;
-	case "\\": res += s.substring(j, i) + "\\\\"; j = i + 1; break;
-	default:
-	    var c = s.charAt(i);
-	    if ("\a" !== "a" && c == "\a") {
-		res += s.substring(j, i) + "\\a"; j = i + 1; continue;
-	    }
-	    if ("\v" !== "v" && c == "\v") {
-		res += s.substring(j, i) + "\\v"; j = i + 1; continue;
-	    }
-	    //if (s.charAt(i) < ' ' || s.charCodeAt(i) > 127) {
-	    // CARE: Manuel is this OK with HOP?
-	    if (s.charAt(i) < ' ') {
-		/* non printable character and special chars */
-		res += s.substring(j, i) + "\\x" + s.charCodeAt(i).toString(16);
-		j = i + 1;
-	    }
-	    // else just let i increase...
-	}
-    }
-    res += s.substring(j, i);
-    return res;
-}
-
-/* ------------------ display ---------------------------------------------------*/
-
-/*** META ((export #t)) */
-function sc_display(o, p) {
-    if (p === undefined) // we assume not given
-	p = SC_DEFAULT_OUT;
-    p.appendJSString(sc_toDisplayString(o));
-}
-
-function sc_toDisplayString(o) {
-    if (o === null)
-	return "()";
-    else if (o === true)
-	return "#t";
-    else if (o === false)
-	return "#f";
-    else if (o === undefined)
-	return "#unspecified";
-    else if (typeof o === 'function')
-	return "#<procedure " + sc_hash(o) + ">";
-    else if (o.sc_toDisplayString)
-	return o.sc_toDisplayString();
-    else
-	return o.toString();
-}
-
-/* ------------------ newline ---------------------------------------------------*/
-
-/*** META ((export #t)) */
-function sc_newline(p) {
-    if (p === undefined) // we assume not given
-	p = SC_DEFAULT_OUT;
-    p.appendJSString("\n");
-}
-    
-/* ------------------ write-char ---------------------------------------------------*/
-
-/*** META ((export #t)) */
-function sc_writeChar(c, p) {
-    if (p === undefined) // we assume not given
-	p = SC_DEFAULT_OUT;
-    p.appendJSString(c.val);
-}
-
-/* ------------------ write-circle ---------------------------------------------------*/
-
-/*** META ((export #t)) */
-function sc_writeCircle(o, p) {
-    if (p === undefined) // we assume not given
-	p = SC_DEFAULT_OUT;
-    p.appendJSString(sc_toWriteCircleString(o));
-}
-
-function sc_toWriteCircleString(o) {
-    var symb = sc_gensym("writeCircle");
-    var nbPointer = new Object();
-    nbPointer.nb = 0;
-    sc_prepWriteCircle(o, symb, nbPointer);
-    return sc_genToWriteCircleString(o, symb);
-}
-
-function sc_prepWriteCircle(o, symb, nbPointer) {
-    // TODO sc_Struct
-    if (o instanceof sc_Pair ||
-	o instanceof sc_Vector) {
-	if (o[symb] !== undefined) {
-	    // not the first visit.
-	    o[symb]++;
-	    // unless there is already a number, assign one.
-	    if (!o[symb + "nb"]) o[symb + "nb"] = nbPointer.nb++;
-	    return;
-	}
-	o[symb] = 0;
-	if (o instanceof sc_Pair) {
-	    sc_prepWriteCircle(o.car, symb, nbPointer);
-	    sc_prepWriteCircle(o.cdr, symb, nbPointer);
-	} else {
-	    for (var i = 0; i < o.length; i++)
-		sc_prepWriteCircle(o[i], symb, nbPointer);
-	}
-    }
-}
-
-function sc_genToWriteCircleString(o, symb) {
-    if (!(o instanceof sc_Pair ||
-	  o instanceof sc_Vector))
-	return sc_toWriteString(o);
-    return o.sc_toWriteCircleString(symb);
-}
-sc_Pair.prototype.sc_toWriteCircleString = function(symb, inList) {
-    if (this[symb + "use"]) { // use-flag is set. Just use it.
-	var nb = this[symb + "nb"];
-	if (this[symb]-- === 0) { // if we are the last use. remove all fields.
-	    delete this[symb];
-	    delete this[symb + "nb"];
-	    delete this[symb + "use"];
-	}
-	if (inList)
-	    return '. #' + nb + '#';
-	else
-	    return '#' + nb + '#';
-    }
-    if (this[symb]-- === 0) { // if we are the last use. remove all fields.
-	delete this[symb];
-	delete this[symb + "nb"];
-	delete this[symb + "use"];
-    }
-
-    var res = "";
-    
-    if (this[symb] !== undefined) { // implies > 0
-	this[symb + "use"] = true;
-	if (inList)
-	    res += '. #' + this[symb + "nb"] + '=';
-	else
-	    res += '#' + this[symb + "nb"] + '=';
-	inList = false;
-    }
-
-    if (!inList)
-	res += "(";
-    
-    // print car
-    res += sc_genToWriteCircleString(this.car, symb);
-    
-    if (sc_isPair(this.cdr)) {
-	res += " " + this.cdr.sc_toWriteCircleString(symb, true);
-    } else if (this.cdr !== null) {
-	res += " . " + sc_genToWriteCircleString(this.cdr, symb);
-    }
-    if (!inList)
-	res += ")";
-    return res;
-};
-sc_Vector.prototype.sc_toWriteCircleString = function(symb) {
-    if (this[symb + "use"]) { // use-flag is set. Just use it.
-	var nb = this[symb + "nb"];
-	if (this[symb]-- === 0) { // if we are the last use. remove all fields.
-	    delete this[symb];
-	    delete this[symb + "nb"];
-	    delete this[symb + "use"];
-	}
-	return '#' + nb + '#';
-    }
-    if (this[symb]-- === 0) { // if we are the last use. remove all fields.
-	delete this[symb];
-	delete this[symb + "nb"];
-	delete this[symb + "use"];
-    }
-
-    var res = "";
-    if (this[symb] !== undefined) { // implies > 0
-	this[symb + "use"] = true;
-	res += '#' + this[symb + "nb"] + '=';
-    }
-    res += "#(";
-    for (var i = 0; i < this.length; i++) {
-	res += sc_genToWriteCircleString(this[i], symb);
-	if (i < this.length - 1) res += " ";
-    }
-    res += ")";
-    return res;
-};
-
-
-/* ------------------ print ---------------------------------------------------*/
-
-/*** META ((export #t)) */
-function sc_print(s) {
-    if (arguments.length === 1) {
-	sc_display(s);
-	sc_newline();
-    }
-    else {
-	for (var i = 0; i < arguments.length; i++)
-	    sc_display(arguments[i]);
-	sc_newline();
-    }
-}
-
-/* ------------------ format ---------------------------------------------------*/
-/*** META ((export #t)) */
-function sc_format(s, args) {
-   var len = s.length;
-   var p = new sc_StringOutputPort();
-   var i = 0, j = 1;
-
-   while( i < len ) {
-      var i2 = s.indexOf("~", i);
-
-      if (i2 == -1) {
-	  p.appendJSString( s.substring( i, len ) );
-	  return p.close();
-      } else {
-	 if (i2 > i) {
-	    if (i2 == (len - 1)) {
-		p.appendJSString(s.substring(i, len));
-		return p.close();
-	    } else {
-	       p.appendJSString(s.substring(i, i2));
-	       i = i2;
-	    }
-	 }
-
-	 switch(s.charCodeAt(i2 + 1)) {
-	    case 65:
-	    case 97:
-	       // a
-	       sc_display(arguments[j], p);
-	       i += 2; j++;
-	       break;
-
-	    case 83:
-	    case 115:
-	       // s
-	       sc_write(arguments[j], p);
-	       i += 2; j++;
-	       break;
-
-	    case 86:
-	    case 118:
-	       // v
-	       sc_display(arguments[j], p);
-	       p.appendJSString("\n");
-	       i += 2; j++;
-	       break;
-
-	    case 67:
-	    case 99:
-	       // c
-	       p.appendJSString(String.fromCharCode(arguments[j]));
-	       i += 2; j++;
-	       break;
-
-	    case 88:
-	    case 120:
-	       // x
-	       p.appendJSString(arguments[j].toString(6));
-	       i += 2; j++;
-	       break;
-
-	    case 79:
-	    case 111:
-	       // o
-	       p.appendJSString(arguments[j].toString(8));
-	       i += 2; j++;
-	       break;
-
-	    case 66:
-	    case 98:
-	       // b
-	       p.appendJSString(arguments[j].toString(2));
-	       i += 2; j++;
-	       break;
-	       
-	    case 37:
-	    case 110:
-	       // %, n
-	       p.appendJSString("\n");
-	       i += 2; break;
-
-	    case 114:
-	       // r
-	       p.appendJSString("\r");
-	       i += 2; break;
-
-	    case 126:
-	       // ~
-	       p.appendJSString("~");
-	       i += 2; break;
-
-	    default:
-	       sc_error( "format: illegal ~"
-			 + String.fromCharCode(s.charCodeAt(i2 + 1))
-			 + " sequence" );
-	       return "";
-	 }
-      }
-   }
-
-   return p.close();
-}
-
-/* ------------------ global ports ---------------------------------------------------*/
-
-var SC_DEFAULT_IN = new sc_ErrorInputPort();
-var SC_DEFAULT_OUT = new sc_ErrorOutputPort();
-var SC_ERROR_OUT = new sc_ErrorOutputPort();
-
-var sc_SYMBOL_PREFIX = "\u1E9C";
-var sc_KEYWORD_PREFIX = "\u1E9D";
-
-/*** META ((export #t)
-           (peephole (id))) */
-function sc_jsstring2string(s) {
-    return s;
-}
-
-/*** META ((export #t)
-           (peephole (prefix "'\\u1E9C' +")))
-*/
-function sc_jsstring2symbol(s) {
-    return sc_SYMBOL_PREFIX + s;
-}
-
-/*** META ((export #t)
-           (peephole (id)))
-*/
-function sc_string2jsstring(s) {
-    return s;
-}
-
-/*** META ((export #t)
-           (peephole (symbol2jsstring_immutable)))
-*/
-function sc_symbol2jsstring(s) {
-    return s.slice(1);
-}
-
-/*** META ((export #t)
-           (peephole (postfix ".slice(1)")))
-*/
-function sc_keyword2jsstring(k) {
-    return k.slice(1);
-}
-
-/*** META ((export #t)
-           (peephole (prefix "'\\u1E9D' +")))
-*/
-function sc_jsstring2keyword(s) {
-    return sc_KEYWORD_PREFIX + s;
-}
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isKeyword(s) {
-    return (typeof s === "string") &&
-	(s.charAt(0) === sc_KEYWORD_PREFIX);
-}
-
-
-/*** META ((export #t)) */
-var sc_gensym = function() {
-    var counter = 1000;
-    return function(sym) {
-	counter++;
-	if (!sym) sym = sc_SYMBOL_PREFIX;
-	return sym + "s" + counter + "~" + "^sC-GeNsYm ";
-    };
-}();
-
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isEqual(o1, o2) {
-    return ((o1 === o2) ||
-	    (sc_isPair(o1) && sc_isPair(o2)
-	     && sc_isPairEqual(o1, o2, sc_isEqual)) ||
-	    (sc_isVector(o1) && sc_isVector(o2)
-	     && sc_isVectorEqual(o1, o2, sc_isEqual)));
-}
-
-/*** META ((export number->symbol integer->symbol)) */
-function sc_number2symbol(x, radix) {
-    return sc_SYMBOL_PREFIX + sc_number2jsstring(x, radix);
-}
-    
-/*** META ((export number->string integer->string)) */
-var sc_number2string = sc_number2jsstring;
-
-/*** META ((export #t)) */
-function sc_symbol2number(s, radix) {
-    return sc_jsstring2number(s.slice(1), radix);
-}
-
-/*** META ((export #t)) */
-var sc_string2number = sc_jsstring2number;
-
-/*** META ((export #t)
-           (peephole (prefix "+" s)))
-           ;; peephole will only apply if no radix is given.
-*/
-function sc_string2integer(s, radix) {
-    if (!radix) return +s;
-    return parseInt(s, radix);
-}
-
-/*** META ((export #t)
-           (peephole (prefix "+")))
-*/
-function sc_string2real(s) {
-    return +s;
-}
-
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isSymbol(s) {
-    return (typeof s === "string") &&
-	(s.charAt(0) === sc_SYMBOL_PREFIX);
-}
-
-/*** META ((export #t)
-           (peephole (symbol2string_immutable)))
-*/
-function sc_symbol2string(s) {
-    return s.slice(1);
-}
-
-/*** META ((export #t)
-           (peephole (prefix "'\\u1E9C' +")))
-*/
-function sc_string2symbol(s) {
-    return sc_SYMBOL_PREFIX + s;
-}
-
-/*** META ((export symbol-append)
-           (peephole (symbolAppend_immutable)))
-*/
-function sc_symbolAppend() {
-    var res = sc_SYMBOL_PREFIX;
-    for (var i = 0; i < arguments.length; i++)
-	res += arguments[i].slice(1);
-    return res;
-}
-
-/*** META ((export #t)
-           (peephole (postfix ".val")))
-*/
-function sc_char2string(c) { return c.val; }
-
-/*** META ((export #t)
-           (peephole (hole 1 "'\\u1E9C' + " c ".val")))
-*/
-function sc_char2symbol(c) { return sc_SYMBOL_PREFIX + c.val; }
-
-/*** META ((export #t)
-           (type bool))
-*/
-function sc_isString(s) {
-    return (typeof s === "string") &&
-	(s.charAt(0) !== sc_SYMBOL_PREFIX);
-}
-
-/*** META ((export #t)) */
-var sc_makeString = sc_makejsString;
-
-
-/*** META ((export #t)) */
-function sc_string() {
-    for (var i = 0; i < arguments.length; i++)
-	arguments[i] = arguments[i].val;
-    return "".concat.apply("", arguments);
-}
-
-/*** META ((export #t)
-           (peephole (postfix ".length")))
-*/
-function sc_stringLength(s) { return s.length; }
-
-/*** META ((export #t)) */
-function sc_stringRef(s, k) {
-    return new sc_Char(s.charAt(k));
-}
-
-/* there's no stringSet in the immutable version
-function sc_stringSet(s, k, c)
-*/
-
-
-/*** META ((export string=?)
-	   (type bool)
-           (peephole (hole 2 str1 " === " str2)))
-*/
-function sc_isStringEqual(s1, s2) {
-    return s1 === s2;
-}
-/*** META ((export string<?)
-	   (type bool)
-           (peephole (hole 2 str1 " < " str2)))
-*/
-function sc_isStringLess(s1, s2) {
-    return s1 < s2;
-}
-/*** META ((export string>?)
-	   (type bool)
-           (peephole (hole 2 str1 " > " str2)))
-*/
-function sc_isStringGreater(s1, s2) {
-    return s1 > s2;
-}
-/*** META ((export string<=?)
-	   (type bool)
-           (peephole (hole 2 str1 " <= " str2)))
-*/
-function sc_isStringLessEqual(s1, s2) {
-    return s1 <= s2;
-}
-/*** META ((export string>=?)
-	   (type bool)
-           (peephole (hole 2 str1 " >= " str2)))
-*/
-function sc_isStringGreaterEqual(s1, s2) {
-    return s1 >= s2;
-}
-/*** META ((export string-ci=?)
-	   (type bool)
-           (peephole (hole 2 str1 ".toLowerCase() === " str2 ".toLowerCase()")))
-*/
-function sc_isStringCIEqual(s1, s2) {
-    return s1.toLowerCase() === s2.toLowerCase();
-}
-/*** META ((export string-ci<?)
-	   (type bool)
-           (peephole (hole 2 str1 ".toLowerCase() < " str2 ".toLowerCase()")))
-*/
-function sc_isStringCILess(s1, s2) {
-    return s1.toLowerCase() < s2.toLowerCase();
-}
-/*** META ((export string-ci>?)
-	   (type bool)
-           (peephole (hole 2 str1 ".toLowerCase() > " str2 ".toLowerCase()")))
-*/
-function sc_isStringCIGreater(s1, s2) {
-    return s1.toLowerCase() > s2.toLowerCase();
-}
-/*** META ((export string-ci<=?)
-	   (type bool)
-           (peephole (hole 2 str1 ".toLowerCase() <= " str2 ".toLowerCase()")))
-*/
-function sc_isStringCILessEqual(s1, s2) {
-    return s1.toLowerCase() <= s2.toLowerCase();
-}
-/*** META ((export string-ci>=?)
-	   (type bool)
-           (peephole (hole 2 str1 ".toLowerCase() >= " str2 ".toLowerCase()")))
-*/
-function sc_isStringCIGreaterEqual(s1, s2) {
-    return s1.toLowerCase() >= s2.toLowerCase();
-}
-
-/*** META ((export #t)
-           (peephole (hole 3 s ".substring(" start ", " end ")")))
-*/
-function sc_substring(s, start, end) {
-    return s.substring(start, end);
-}
-
-/*** META ((export #t))
-*/
-function sc_isSubstring_at(s1, s2, i) {
-    return s2 == s1.substring(i, i+ s2.length);
-}
-
-/*** META ((export #t)
-           (peephole (infix 0 #f "+" "''")))
-*/
-function sc_stringAppend() {
-    return "".concat.apply("", arguments);
-}
-
-/*** META ((export #t)) */
-var sc_string2list = sc_jsstring2list;
-
-/*** META ((export #t)) */
-var sc_list2string = sc_list2jsstring;
-
-/*** META ((export #t)
-           (peephole (id)))
-*/
-function sc_stringCopy(s) {
-    return s;
-}
-
-/* there's no string-fill in the immutable version
-function sc_stringFill(s, c)
-*/
-
-/*** META ((export #t)
-           (peephole (postfix ".slice(1)")))
-*/
-function sc_keyword2string(o) {
-    return o.slice(1);
-}
-
-/*** META ((export #t)
-           (peephole (prefix "'\\u1E9D' +")))
-*/
-function sc_string2keyword(o) {
-    return sc_KEYWORD_PREFIX + o;
-}
-
-String.prototype.sc_toDisplayString = function() {
-    if (this.charAt(0) === sc_SYMBOL_PREFIX)
-	// TODO: care for symbols with spaces (escape-chars symbols).
-	return this.slice(1);
-    else if (this.charAt(0) === sc_KEYWORD_PREFIX)
-	return ":" + this.slice(1);
-    else
-	return this.toString();
-};
-
-String.prototype.sc_toWriteString = function() {
-    if (this.charAt(0) === sc_SYMBOL_PREFIX)
-	// TODO: care for symbols with spaces (escape-chars symbols).
-	return this.slice(1);
-    else if (this.charAt(0) === sc_KEYWORD_PREFIX)
-	return ":" + this.slice(1);
-    else
-	return '"' + sc_escapeWriteString(this) + '"';
-};
-/* Exported Variables */
-var BgL_testzd2boyerzd2;
-var BgL_nboyerzd2benchmarkzd2;
-var BgL_setupzd2boyerzd2;
-/* End Exports */
-
-var translate_term_nboyer;
-var translate_args_nboyer;
-var untranslate_term_nboyer;
-var BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer;
-var BgL_sc_za2symbolzd2recordszd2alistza2_2z00_nboyer;
-var translate_alist_nboyer;
-var apply_subst_nboyer;
-var apply_subst_lst_nboyer;
-var tautologyp_nboyer;
-var if_constructor_nboyer;
-var rewrite_count_nboyer;
-var rewrite_nboyer;
-var rewrite_args_nboyer;
-var unify_subst_nboyer;
-var one_way_unify1_nboyer;
-var false_term_nboyer;
-var true_term_nboyer;
-var trans_of_implies1_nboyer;
-var is_term_equal_nboyer;
-var is_term_member_nboyer;
-var const_nboyer;
-var sc_const_3_nboyer;
-var sc_const_4_nboyer;
-{
-    (sc_const_4_nboyer = (new sc_Pair("\u1E9Cimplies",(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cz",(new sc_Pair("\u1E9Cu",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cu",(new sc_Pair("\u1E9Cw",null)))))),null)))))),null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cw",null)))))),null)))))));
-    (sc_const_3_nboyer = sc_list((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ccompile",(new sc_Pair("\u1E9Cform",null)))),(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair((new sc_Pair("\u1E9Ccodegen",(new sc_Pair((new sc_Pair("\u1E9Coptimize",(new sc_Pair("\u1E9Cform",null)))),(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ceqp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cy",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cgreaterp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clesseqp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cgreatereqp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cboolean",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Ct",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cf",null)),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ciff",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ceven1",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Ct",null)),(new sc_Pair((new sc_Pair("\u1E9Codd",(new sc_Pair((new sc_Pair("\u1E9Csub1",(new sc_Pair("\u1E9Cx",null)))),null)))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ccountps-",(new sc_Pair("\u1E9Cl",(new sc_Pair("\u1E9Cpred",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ccountps-loop",(new sc_Pair("\u1E9Cl",(new sc_Pair("\u1E9Cpred",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cfact-",(new sc_Pair("\u1E9Ci",null)))),(new sc_Pair((new sc_Pair("\u1E9Cfact-loop",(new sc_Pair("\u1E9Ci",(new sc_Pair((1),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Creverse-",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Creverse-loop",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdivides",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cassume-true",(new sc_Pair("\u1E9Cvar",(new sc_Pair("\u1E9Calist",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cvar",(new sc_Pair((new sc_Pair("\u1E9Ct",null)),null)))))),(new sc_Pair("\u1E9Calist",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cassume-false",(new sc_Pair("\u1E9Cvar",(new sc_Pair("\u1E9Calist",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cvar",(new sc_Pair((new sc_Pair("\u1E9Cf",null)),null)))))),(new sc_Pair("\u1E9Calist",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctautology-checker",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Ctautologyp",(new sc_Pair((new sc_Pair("\u1E9Cnormalize",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cfalsify",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cfalsify1",(new sc_Pair((new sc_Pair("\u1E9Cnormalize",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cprime",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))),null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cprime1",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Csub1",(new sc_Pair("\u1E9Cx",null)))),null)))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair("\u1E9Cp",(new sc_Pair("\u1E9Cq",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cp",(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cq",(new sc_Pair((new sc_Pair("\u1E9Ct",null)),(new sc_Pair((new sc_Pair("\u1E9Cf",null)),null)))))))),(new sc_Pair((new sc_Pair("\u1E9Cf",null)),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair("\u1E9Cp",(new sc_Pair("\u1E9Cq",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cp",(new sc_Pair((new sc_Pair("\u1E9Ct",null)),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cq",(new sc_Pair((new sc_Pair("\u1E9Ct",null)),(new sc_Pair((new sc_Pair("\u1E9Cf",null)),null)))))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair("\u1E9Cp",null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cp",(new sc_Pair((new sc_Pair("\u1E9Cf",null)),(new sc_Pair((new sc_Pair("\u1E9Ct",null)),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cimplies",(new sc_Pair("\u1E9Cp",(new sc_Pair("\u1E9Cq",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cp",(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cq",(new sc_Pair((new sc_Pair("\u1E9Ct",null)),(new sc_Pair((new sc_Pair("\u1E9Cf",null)),null)))))))),(new sc_Pair((new sc_Pair("\u1E9Ct",null)),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",(new sc_Pair("\u1E9Cc",null)))))))),(new sc_Pair("\u1E9Cd",(new sc_Pair("\u1E9Ce",null)))))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Ca",(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cb",(new sc_Pair("\u1E9Cd",(new sc_Pair("\u1E9Ce",null)))))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair("\u1E9Cc",(new sc_Pair("\u1E9Cd",(new sc_Pair("\u1E9Ce",null)))))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cx",null)))),null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Ca",null)))),(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cb",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cc",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cb",null)))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cc",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cy",null)))),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair((new sc_Pair("\u1E9Cplus-tree",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair((new sc_Pair("\u1E9Cplus-tree",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair((new sc_Pair("\u1E9Cplus-tree",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair("\u1E9Ca",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair((new sc_Pair("\u1E9Cplus-tree",(new sc_Pair((new sc_Pair("\u1E9Cplus-fringe",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Ca",null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair("\u1E9Cb",null)))),(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair("\u1E9Ca",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cz",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cy",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cexec",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cpds",(new sc_Pair("\u1E9Cenvrn",null)))))))),(new sc_Pair((new sc_Pair("\u1E9Cexec",(new sc_Pair("\u1E9Cy",(new sc_Pair((new sc_Pair("\u1E9Cexec",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cpds",(new sc_Pair("\u1E9Cenvrn",null)))))))),(new sc_Pair("\u1E9Cenvrn",null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cmc-flatten",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair((new sc_Pair("\u1E9Cflatten",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair("\u1E9Cy",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cb",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair("\u1E9Cy",null)))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair("\u1E9Cx",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Ca",(new sc_Pair((new sc_Pair("\u1E9Cintersect",(new sc_Pair("\u1E9Cb",(new sc_Pair("\u1E9Cc",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cc",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cnth",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),(new sc_Pair("\u1E9Ci",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cexp",(new sc_Pair("\u1E9Ci",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cj",(new sc_Pair("\u1E9Ck",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair((new sc_Pair("\u1E9Cexp",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cj",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cexp",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Ck",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cexp",(new sc_Pair("\u1E9Ci",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cj",(new sc_Pair("\u1E9Ck",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cexp",(new sc_Pair((new sc_Pair("\u1E9Cexp",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cj",null)))))),(new sc_Pair("\u1E9Ck",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Creverse-loop",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair("\u1E9Cy",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Creverse-loop",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair("\u1E9Cx",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ccount-list",(new sc_Pair("\u1E9Cz",(new sc_Pair((new sc_Pair("\u1E9Csort-lp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Ccount-list",(new sc_Pair("\u1E9Cz",(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ccount-list",(new sc_Pair("\u1E9Cz",(new sc_Pair("\u1E9Cy",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cc",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cb",(new sc_Pair("\u1E9Cc",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cy",(new sc_Pair((new sc_Pair("\u1E9Cquotient",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cx",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cpower-eval",(new sc_Pair((new sc_Pair("\u1E9Cbig-plus1",(new sc_Pair("\u1E9Cl",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cbase",null)))))))),(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Cpower-eval",(new sc_Pair("\u1E9Cl",(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair("\u1E9Ci",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cpower-eval",(new sc_Pair((new sc_Pair("\u1E9Cbig-plus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cbase",null)))))))))),(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ci",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Cpower-eval",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cpower-eval",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cbase",null)))))),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair("\u1E9Cy",(new sc_Pair((1),null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cy",null)))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair((new sc_Pair("\u1E9Cquotient",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cj",null)))))),(new sc_Pair("\u1E9Ci",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Ci",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cj",null)))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cj",(new sc_Pair((1),null)))))),null)))),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cy",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cpower-eval",(new sc_Pair((new sc_Pair("\u1E9Cpower-rep",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Ci",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cpower-eval",(new sc_Pair((new sc_Pair("\u1E9Cbig-plus",(new sc_Pair((new sc_Pair("\u1E9Cpower-rep",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cpower-rep",(new sc_Pair("\u1E9Cj",(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),(new sc_Pair("\u1E9Cbase",null)))))))))),(new sc_Pair("\u1E9Cbase",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cj",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cgcd",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cgcd",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cnth",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair("\u1E9Ci",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair((new sc_Pair("\u1E9Cnth",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Ci",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnth",(new sc_Pair("\u1E9Cb",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Ci",(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair("\u1E9Ca",null)))),null)))))),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cy",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cy",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cz",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cc",(new sc_Pair("\u1E9Cw",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cc",(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cw",(new sc_Pair("\u1E9Cx",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cb",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cc",null)))))),null)))))),(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cb",(new sc_Pair("\u1E9Cc",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))),(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair("\u1E9Cy",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cz",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cz",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cy",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cx",null)))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cgcd",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cz",(new sc_Pair((new sc_Pair("\u1E9Cgcd",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cvalue",(new sc_Pair((new sc_Pair("\u1E9Cnormalize",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cvalue",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Ca",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cflatten",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cy",(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnlistp",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clistp",(new sc_Pair((new sc_Pair("\u1E9Cgopher",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Clistp",(new sc_Pair("\u1E9Cx",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Csamefringe",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cflatten",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cflatten",(new sc_Pair("\u1E9Cy",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cgreatest-factor",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cy",(new sc_Pair((1),null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cgreatest-factor",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((1),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((1),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair((new sc_Pair("\u1E9Cgreatest-factor",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cy",(new sc_Pair((1),null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cx",null)))),null)))),null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctimes-list",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair((new sc_Pair("\u1E9Ctimes-list",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Ctimes-list",(new sc_Pair("\u1E9Cy",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cprime-list",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cprime-list",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cprime-list",(new sc_Pair("\u1E9Cy",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cz",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cw",(new sc_Pair("\u1E9Cz",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cz",null)))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cz",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cw",(new sc_Pair((1),null)))))),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cgreatereqp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cor",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cand",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cy",(new sc_Pair((1),null)))))),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((1),null)))))),(new sc_Pair(sc_list("\u1E9Cand", (new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Ca",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),null)))), (new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair("\u1E9Cb",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),null)))), (new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Ca",null)))), (new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cb",null)))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Csub1",(new sc_Pair("\u1E9Ca",null)))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Csub1",(new sc_Pair("\u1E9Cb",null)))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair((new sc_Pair("\u1E9Cdelete",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cl",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair("\u1E9Cl",null)))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cl",null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Csort2",(new sc_Pair((new sc_Pair("\u1E9Cdelete",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cl",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cdelete",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Csort2",(new sc_Pair("\u1E9Cl",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdsort",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Csort2",(new sc_Pair("\u1E9Cx",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cx1",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cx2",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cx3",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cx4",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cx5",(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair("\u1E9Cx6",(new sc_Pair("\u1E9Cx7",null)))))),null)))))),null)))))),null)))))),null)))))),null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((6),(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair("\u1E9Cx7",null)))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((2),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cx",null)))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cquotient",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((2),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cquotient",(new sc_Pair("\u1E9Cy",(new sc_Pair((2),null)))))),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Csigma",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),(new sc_Pair("\u1E9Ci",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cquotient",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Ci",(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair("\u1E9Ci",null)))),null)))))),(new sc_Pair((2),null)))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair("\u1E9Cy",null)))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair("\u1E9Cx",null)))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cz",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cz",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cz",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnot",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cz",null)))),null)))))),null)))))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair((new sc_Pair("\u1E9Cplus-tree",(new sc_Pair((new sc_Pair("\u1E9Cdelete",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))),(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair((new sc_Pair("\u1E9Cplus-tree",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Ca",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmeaning",(new sc_Pair((new sc_Pair("\u1E9Cplus-tree",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair("\u1E9Ca",null)))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cadd1",(new sc_Pair("\u1E9Cy",null)))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Cnumberp",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cx",null)))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cnth",(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),(new sc_Pair("\u1E9Ci",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Ci",null)))),(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clast",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Clistp",(new sc_Pair("\u1E9Cb",null)))),(new sc_Pair((new sc_Pair("\u1E9Clast",(new sc_Pair("\u1E9Cb",null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Clistp",(new sc_Pair("\u1E9Ca",null)))),(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair((new sc_Pair("\u1E9Ccar",(new sc_Pair((new sc_Pair("\u1E9Clast",(new sc_Pair("\u1E9Ca",null)))),null)))),(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair("\u1E9Cb",null)))))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Clessp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ct",null)),(new sc_Pair("\u1E9Cz",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cf",null)),(new sc_Pair("\u1E9Cz",null)))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cassignment",(new sc_Pair("\u1E9Cx",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Cassignedp",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cassignment",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Ca",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cassignment",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cb",null)))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Ccar",(new sc_Pair((new sc_Pair("\u1E9Cgopher",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Clistp",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Ccar",(new sc_Pair((new sc_Pair("\u1E9Cflatten",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cflatten",(new sc_Pair((new sc_Pair("\u1E9Ccdr",(new sc_Pair((new sc_Pair("\u1E9Cgopher",(new sc_Pair("\u1E9Cx",null)))),null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Clistp",(new sc_Pair("\u1E9Cx",null)))),(new sc_Pair((new sc_Pair("\u1E9Ccdr",(new sc_Pair((new sc_Pair("\u1E9Cflatten",(new sc_Pair("\u1E9Cx",null)))),null)))),(new sc_Pair((new sc_Pair("\u1E9Ccons",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cquotient",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cx",null)))))),(new sc_Pair("\u1E9Cy",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Czerop",(new sc_Pair("\u1E9Cy",null)))),(new sc_Pair((new sc_Pair("\u1E9Czero",null)),(new sc_Pair((new sc_Pair("\u1E9Cfix",(new sc_Pair("\u1E9Cx",null)))),null)))))))),null)))))), (new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cget",(new sc_Pair("\u1E9Cj",(new sc_Pair((new sc_Pair("\u1E9Cset",(new sc_Pair("\u1E9Ci",(new sc_Pair("\u1E9Cval",(new sc_Pair("\u1E9Cmem",null)))))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cif",(new sc_Pair((new sc_Pair("\u1E9Ceqp",(new sc_Pair("\u1E9Cj",(new sc_Pair("\u1E9Ci",null)))))),(new sc_Pair("\u1E9Cval",(new sc_Pair((new sc_Pair("\u1E9Cget",(new sc_Pair("\u1E9Cj",(new sc_Pair("\u1E9Cmem",null)))))),null)))))))),null))))))));
-    (const_nboyer = (new sc_Pair((new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cf",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cc",(new sc_Pair((new sc_Pair("\u1E9Czero",null)),null)))))),null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cy",(new sc_Pair("\u1E9Cf",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair((new sc_Pair("\u1E9Ctimes",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Cc",(new sc_Pair("\u1E9Cd",null)))))),null)))))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cz",(new sc_Pair("\u1E9Cf",(new sc_Pair((new sc_Pair("\u1E9Creverse",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair((new sc_Pair("\u1E9Cappend",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cnil",null)),null)))))),null)))),null)))))),(new sc_Pair((new sc_Pair("\u1E9Cu",(new sc_Pair("\u1E9Cequal",(new sc_Pair((new sc_Pair("\u1E9Cplus",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cdifference",(new sc_Pair("\u1E9Cx",(new sc_Pair("\u1E9Cy",null)))))),null)))))))),(new sc_Pair((new sc_Pair("\u1E9Cw",(new sc_Pair("\u1E9Clessp",(new sc_Pair((new sc_Pair("\u1E9Cremainder",(new sc_Pair("\u1E9Ca",(new sc_Pair("\u1E9Cb",null)))))),(new sc_Pair((new sc_Pair("\u1E9Cmember",(new sc_Pair("\u1E9Ca",(new sc_Pair((new sc_Pair("\u1E9Clength",(new sc_Pair("\u1E9Cb",null)))),null)))))),null)))))))),null)))))))))));
-    BgL_nboyerzd2benchmarkzd2 = function() {
-        var args = null;
-        for (var sc_tmp = arguments.length - 1; sc_tmp >= 0; sc_tmp--) {
-            args = sc_cons(arguments[sc_tmp], args);
-        }
-        var n;
-        return ((n = ((args === null)?(0):(args.car))), (BgL_setupzd2boyerzd2()), (BgL_runzd2benchmarkzd2(("nboyer"+(sc_number2string(n))), (1), function() {
-            return (BgL_testzd2boyerzd2(n));
-        }, function(rewrites) {
-            if ((sc_isNumber(rewrites)))
-                switch (n) {
-                case (0):
-                    return (rewrites===(95024));
-                    break;
-                case (1):
-                    return (rewrites===(591777));
-                    break;
-                case (2):
-                    return (rewrites===(1813975));
-                    break;
-                case (3):
-                    return (rewrites===(5375678));
-                    break;
-                case (4):
-                    return (rewrites===(16445406));
-                    break;
-                case (5):
-                    return (rewrites===(51507739));
-                    break;
-                default:
-                    return true;
-                    break;
-                }
-            else
-                return false;
-        })));
-    };
-    BgL_setupzd2boyerzd2 = function() {
-        return true;
-    };
-    BgL_testzd2boyerzd2 = function() {
-        return true;
-    };
-    translate_term_nboyer = function(term) {
-        var lst;
-        return (!(term instanceof sc_Pair)?term:(new sc_Pair((BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer((term.car))), ((lst = (term.cdr)), ((lst === null)?null:(new sc_Pair((translate_term_nboyer((lst.car))), (translate_args_nboyer((lst.cdr))))))))));
-    };
-    translate_args_nboyer = function(lst) {
-        var sc_lst_5;
-        var term;
-        return ((lst === null)?null:(new sc_Pair(((term = (lst.car)), (!(term instanceof sc_Pair)?term:(new sc_Pair((BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer((term.car))), (translate_args_nboyer((term.cdr))))))), ((sc_lst_5 = (lst.cdr)), ((sc_lst_5 === null)?null:(new sc_Pair((translate_term_nboyer((sc_lst_5.car))), (translate_args_nboyer((sc_lst_5.cdr))))))))));
-    };
-    untranslate_term_nboyer = function(term) {
-        var optrOpnd;
-        var tail1131;
-        var L1127;
-        var falseHead1130;
-        var symbol_record;
-        if (!(term instanceof sc_Pair))
-            return term;
-        else
-            {
-                (falseHead1130 = (new sc_Pair(null, null)));
-                (L1127 = (term.cdr));
-                (tail1131 = falseHead1130);
-                while (!(L1127 === null)) {
-                    {
-                        (tail1131.cdr = (new sc_Pair((untranslate_term_nboyer((L1127.car))), null)));
-                        (tail1131 = (tail1131.cdr));
-                        (L1127 = (L1127.cdr));
-                    }
-                }
-                (optrOpnd = (falseHead1130.cdr));
-                return (new sc_Pair(((symbol_record = (term.car)), (symbol_record[(0)])), optrOpnd));
-            }
-    };
-    BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer = function(sym) {
-        var r;
-        var x;
-        return ((x = (sc_assq(sym, BgL_sc_za2symbolzd2recordszd2alistza2_2z00_nboyer))), ((x!== false)?(x.cdr):((r = [sym, null]), (BgL_sc_za2symbolzd2recordszd2alistza2_2z00_nboyer = (new sc_Pair((new sc_Pair(sym, r)), BgL_sc_za2symbolzd2recordszd2alistza2_2z00_nboyer))), r)));
-    };
-    (BgL_sc_za2symbolzd2recordszd2alistza2_2z00_nboyer = null);
-    translate_alist_nboyer = function(alist) {
-        var sc_alist_6;
-        var term;
-        return ((alist === null)?null:(new sc_Pair((new sc_Pair((alist.car.car), ((term = (alist.car.cdr)), (!(term instanceof sc_Pair)?term:(new sc_Pair((BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer((term.car))), (translate_args_nboyer((term.cdr))))))))), ((sc_alist_6 = (alist.cdr)), ((sc_alist_6 === null)?null:(new sc_Pair((new sc_Pair((sc_alist_6.car.car), (translate_term_nboyer((sc_alist_6.car.cdr))))), (translate_alist_nboyer((sc_alist_6.cdr))))))))));
-    };
-    apply_subst_nboyer = function(alist, term) {
-        var lst;
-        var temp_temp;
-        return (!(term instanceof sc_Pair)?((temp_temp = (sc_assq(term, alist))), ((temp_temp!== false)?(temp_temp.cdr):term)):(new sc_Pair((term.car), ((lst = (term.cdr)), ((lst === null)?null:(new sc_Pair((apply_subst_nboyer(alist, (lst.car))), (apply_subst_lst_nboyer(alist, (lst.cdr))))))))));
-    };
-    apply_subst_lst_nboyer = function(alist, lst) {
-        var sc_lst_7;
-        return ((lst === null)?null:(new sc_Pair((apply_subst_nboyer(alist, (lst.car))), ((sc_lst_7 = (lst.cdr)), ((sc_lst_7 === null)?null:(new sc_Pair((apply_subst_nboyer(alist, (sc_lst_7.car))), (apply_subst_lst_nboyer(alist, (sc_lst_7.cdr))))))))));
-    };
-    tautologyp_nboyer = function(sc_x_11, true_lst, false_lst) {
-        var tmp1125;
-        var x;
-        var tmp1126;
-        var sc_x_8;
-        var sc_tmp1125_9;
-        var sc_tmp1126_10;
-        var sc_x_11;
-        var true_lst;
-        var false_lst;
-        while (true) {
-            if ((((sc_tmp1126_10 = (is_term_equal_nboyer(sc_x_11, true_term_nboyer))), ((sc_tmp1126_10!== false)?sc_tmp1126_10:(is_term_member_nboyer(sc_x_11, true_lst))))!== false))
-                return true;
-            else
-                if ((((sc_tmp1125_9 = (is_term_equal_nboyer(sc_x_11, false_term_nboyer))), ((sc_tmp1125_9!== false)?sc_tmp1125_9:(is_term_member_nboyer(sc_x_11, false_lst))))!== false))
-                    return false;
-                else
-                    if (!(sc_x_11 instanceof sc_Pair))
-                        return false;
-                    else
-                        if (((sc_x_11.car)===if_constructor_nboyer))
-                            if ((((sc_x_8 = (sc_x_11.cdr.car)), (tmp1126 = (is_term_equal_nboyer(sc_x_8, true_term_nboyer))), ((tmp1126!== false)?tmp1126:(is_term_member_nboyer(sc_x_8, true_lst))))!== false))
-                                (sc_x_11 = (sc_x_11.cdr.cdr.car));
-                            else
-                                if ((((x = (sc_x_11.cdr.car)), (tmp1125 = (is_term_equal_nboyer(x, false_term_nboyer))), ((tmp1125!== false)?tmp1125:(is_term_member_nboyer(x, false_lst))))!== false))
-                                    (sc_x_11 = (sc_x_11.cdr.cdr.cdr.car));
-                                else
-                                    if (((tautologyp_nboyer((sc_x_11.cdr.cdr.car), (new sc_Pair((sc_x_11.cdr.car), true_lst)), false_lst))!== false))
-                                        {
-                                            (false_lst = (new sc_Pair((sc_x_11.cdr.car), false_lst)));
-                                            (sc_x_11 = (sc_x_11.cdr.cdr.cdr.car));
-                                        }
-                                    else
-                                        return false;
-                        else
-                            return false;
-        }
-    };
-    (if_constructor_nboyer = "\u1E9C*");
-    (rewrite_count_nboyer = (0));
-    rewrite_nboyer = function(term) {
-        var term2;
-        var sc_term_12;
-        var lst;
-        var symbol_record;
-        var sc_lst_13;
-        {
-            (++rewrite_count_nboyer);
-            if (!(term instanceof sc_Pair))
-                return term;
-            else
-                {
-                    (sc_term_12 = (new sc_Pair((term.car), ((sc_lst_13 = (term.cdr)), ((sc_lst_13 === null)?null:(new sc_Pair((rewrite_nboyer((sc_lst_13.car))), (rewrite_args_nboyer((sc_lst_13.cdr))))))))));
-                    (lst = ((symbol_record = (term.car)), (symbol_record[(1)])));
-                    while (true) {
-                        if ((lst === null))
-                            return sc_term_12;
-                        else
-                            if ((((term2 = ((lst.car).cdr.car)), (unify_subst_nboyer = null), (one_way_unify1_nboyer(sc_term_12, term2)))!== false))
-                                return (rewrite_nboyer((apply_subst_nboyer(unify_subst_nboyer, ((lst.car).cdr.cdr.car)))));
-                            else
-                                (lst = (lst.cdr));
-                    }
-                }
-        }
-    };
-    rewrite_args_nboyer = function(lst) {
-        var sc_lst_14;
-        return ((lst === null)?null:(new sc_Pair((rewrite_nboyer((lst.car))), ((sc_lst_14 = (lst.cdr)), ((sc_lst_14 === null)?null:(new sc_Pair((rewrite_nboyer((sc_lst_14.car))), (rewrite_args_nboyer((sc_lst_14.cdr))))))))));
-    };
-    (unify_subst_nboyer = "\u1E9C*");
-    one_way_unify1_nboyer = function(term1, term2) {
-        var lst1;
-        var lst2;
-        var temp_temp;
-        if (!(term2 instanceof sc_Pair))
-            {
-                (temp_temp = (sc_assq(term2, unify_subst_nboyer)));
-                if ((temp_temp!== false))
-                    return (is_term_equal_nboyer(term1, (temp_temp.cdr)));
-                else
-                    if ((sc_isNumber(term2)))
-                        return (sc_isEqual(term1, term2));
-                    else
-                        {
-                            (unify_subst_nboyer = (new sc_Pair((new sc_Pair(term2, term1)), unify_subst_nboyer)));
-                            return true;
-                        }
-            }
-        else
-            if (!(term1 instanceof sc_Pair))
-                return false;
-            else
-                if (((term1.car)===(term2.car)))
-                    {
-                        (lst1 = (term1.cdr));
-                        (lst2 = (term2.cdr));
-                        while (true) {
-                            if ((lst1 === null))
-                                return (lst2 === null);
-                            else
-                                if ((lst2 === null))
-                                    return false;
-                                else
-                                    if (((one_way_unify1_nboyer((lst1.car), (lst2.car)))!== false))
-                                        {
-                                            (lst1 = (lst1.cdr));
-                                            (lst2 = (lst2.cdr));
-                                        }
-                                    else
-                                        return false;
-                        }
-                    }
-                else
-                    return false;
-    };
-    (false_term_nboyer = "\u1E9C*");
-    (true_term_nboyer = "\u1E9C*");
-    trans_of_implies1_nboyer = function(n) {
-        var sc_n_15;
-        return ((sc_isEqual(n, (1)))?(sc_list("\u1E9Cimplies", (0), (1))):(sc_list("\u1E9Cand", (sc_list("\u1E9Cimplies", (n-(1)), n)), ((sc_n_15 = (n-(1))), ((sc_isEqual(sc_n_15, (1)))?(sc_list("\u1E9Cimplies", (0), (1))):(sc_list("\u1E9Cand", (sc_list("\u1E9Cimplies", (sc_n_15-(1)), sc_n_15)), (trans_of_implies1_nboyer((sc_n_15-(1)))))))))));
-    };
-    is_term_equal_nboyer = function(x, y) {
-        var lst1;
-        var lst2;
-        var r2;
-        var r1;
-        if ((x instanceof sc_Pair))
-            if ((y instanceof sc_Pair))
-                if ((((r1 = (x.car)), (r2 = (y.car)), (r1===r2))!== false))
-                    {
-                        (lst1 = (x.cdr));
-                        (lst2 = (y.cdr));
-                        while (true) {
-                            if ((lst1 === null))
-                                return (lst2 === null);
-                            else
-                                if ((lst2 === null))
-                                    return false;
-                                else
-                                    if (((is_term_equal_nboyer((lst1.car), (lst2.car)))!== false))
-                                        {
-                                            (lst1 = (lst1.cdr));
-                                            (lst2 = (lst2.cdr));
-                                        }
-                                    else
-                                        return false;
-                        }
-                    }
-                else
-                    return false;
-            else
-                return false;
-        else
-            return (sc_isEqual(x, y));
-    };
-    is_term_member_nboyer = function(x, lst) {
-        var x;
-        var lst;
-        while (true) {
-            if ((lst === null))
-                return false;
-            else
-                if (((is_term_equal_nboyer(x, (lst.car)))!== false))
-                    return true;
-                else
-                    (lst = (lst.cdr));
-        }
-    };
-    BgL_setupzd2boyerzd2 = function() {
-        var symbol_record;
-        var value;
-        var BgL_sc_symbolzd2record_16zd2;
-        var sym;
-        var sc_sym_17;
-        var term;
-        var lst;
-        var sc_term_18;
-        var sc_term_19;
-        {
-            (BgL_sc_za2symbolzd2recordszd2alistza2_2z00_nboyer = null);
-            (if_constructor_nboyer = (BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer("\u1E9Cif")));
-            (false_term_nboyer = ((sc_term_19 = (new sc_Pair("\u1E9Cf",null))), (!(sc_term_19 instanceof sc_Pair)?sc_term_19:(new sc_Pair((BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer((sc_term_19.car))), (translate_args_nboyer((sc_term_19.cdr))))))));
-            (true_term_nboyer = ((sc_term_18 = (new sc_Pair("\u1E9Ct",null))), (!(sc_term_18 instanceof sc_Pair)?sc_term_18:(new sc_Pair((BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer((sc_term_18.car))), (translate_args_nboyer((sc_term_18.cdr))))))));
-            (lst = sc_const_3_nboyer);
-            while (!(lst === null)) {
-                {
-                    (term = (lst.car));
-                    if (((term instanceof sc_Pair)&&(((term.car)==="\u1E9Cequal")&&((term.cdr.car) instanceof sc_Pair))))
-                        {
-                            (sc_sym_17 = ((term.cdr.car).car));
-                            (value = (new sc_Pair((!(term instanceof sc_Pair)?term:(new sc_Pair((BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer((term.car))), (translate_args_nboyer((term.cdr)))))), ((sym = ((term.cdr.car).car)), (BgL_sc_symbolzd2record_16zd2 = (BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer(sym))), (BgL_sc_symbolzd2record_16zd2[(1)])))));
-                            (symbol_record = (BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer(sc_sym_17)));
-                            (symbol_record[(1)] = value);
-                        }
-                    else
-                        (sc_error("ADD-LEMMA did not like term:  ", term));
-                    (lst = (lst.cdr));
-                }
-            }
-            return true;
-        }
-    };
-    BgL_testzd2boyerzd2 = function(n) {
-        var optrOpnd;
-        var term;
-        var sc_n_20;
-        var answer;
-        var sc_term_21;
-        var sc_term_22;
-        {
-            (rewrite_count_nboyer = (0));
-            (term = sc_const_4_nboyer);
-            (sc_n_20 = n);
-            while (!(sc_n_20=== 0)) {
-                {
-                    (term = (sc_list("\u1E9Cor", term, (new sc_Pair("\u1E9Cf",null)))));
-                    (--sc_n_20);
-                }
-            }
-            (sc_term_22 = term);
-            if (!(sc_term_22 instanceof sc_Pair))
-                (optrOpnd = sc_term_22);
-            else
-                (optrOpnd = (new sc_Pair((BgL_sc_symbolzd2ze3symbolzd2record_1ze3_nboyer((sc_term_22.car))), (translate_args_nboyer((sc_term_22.cdr))))));
-            (sc_term_21 = (apply_subst_nboyer(((const_nboyer === null)?null:(new sc_Pair((new sc_Pair((const_nboyer.car.car), (translate_term_nboyer((const_nboyer.car.cdr))))), (translate_alist_nboyer((const_nboyer.cdr)))))), optrOpnd)));
-            (answer = (tautologyp_nboyer((rewrite_nboyer(sc_term_21)), null, null)));
-            (sc_write(rewrite_count_nboyer));
-            (sc_display(" rewrites"));
-            (sc_newline());
-            if ((answer!== false))
-                return rewrite_count_nboyer;
-            else
-                return false;
-        }
-    };
-}
-/* Exported Variables */
-var BgL_parsezd2ze3nbzd2treesze3;
-var BgL_earleyzd2benchmarkzd2;
-var BgL_parsezd2ze3parsedzf3zc2;
-var test;
-var BgL_parsezd2ze3treesz31;
-var BgL_makezd2parserzd2;
-/* End Exports */
-
-var const_earley;
-{
-    (const_earley = (new sc_Pair((new sc_Pair("\u1E9Cs",(new sc_Pair((new sc_Pair("\u1E9Ca",null)),(new sc_Pair((new sc_Pair("\u1E9Cs",(new sc_Pair("\u1E9Cs",null)))),null)))))),null)));
-    BgL_makezd2parserzd2 = function(grammar, lexer) {
-        var i;
-        var parser_descr;
-        var def_loop;
-        var nb_nts;
-        var names;
-        var steps;
-        var predictors;
-        var enders;
-        var starters;
-        var nts;
-        var sc_names_1;
-        var sc_steps_2;
-        var sc_predictors_3;
-        var sc_enders_4;
-        var sc_starters_5;
-        var nb_confs;
-        var BgL_sc_defzd2loop_6zd2;
-        var BgL_sc_nbzd2nts_7zd2;
-        var sc_nts_8;
-        var BgL_sc_defzd2loop_9zd2;
-        var ind;
-        {
-            ind = function(nt, sc_nts_10) {
-                var i;
-                {
-                    (i = ((sc_nts_10.length)-(1)));
-                    while (true) {
-                        if ((i>=(0)))
-                            if ((sc_isEqual((sc_nts_10[i]), nt)))
-                                return i;
-                            else
-                                (--i);
-                        else
-                            return false;
-                    }
-                }
-            };
-            (sc_nts_8 = ((BgL_sc_defzd2loop_9zd2 = function(defs, sc_nts_11) {
-                var rule_loop;
-                var head;
-                var def;
-                return ((defs instanceof sc_Pair)?((def = (defs.car)), (head = (def.car)), (rule_loop = function(rules, sc_nts_12) {
-                    var nt;
-                    var l;
-                    var sc_nts_13;
-                    var rule;
-                    if ((rules instanceof sc_Pair))
-                        {
-                            (rule = (rules.car));
-                            (l = rule);
-                            (sc_nts_13 = sc_nts_12);
-                            while ((l instanceof sc_Pair)) {
-                                {
-                                    (nt = (l.car));
-                                    (l = (l.cdr));
-                                    (sc_nts_13 = (((sc_member(nt, sc_nts_13))!== false)?sc_nts_13:(new sc_Pair(nt, sc_nts_13))));
-                                }
-                            }
-                            return (rule_loop((rules.cdr), sc_nts_13));
-                        }
-                    else
-                        return (BgL_sc_defzd2loop_9zd2((defs.cdr), sc_nts_12));
-                }), (rule_loop((def.cdr), (((sc_member(head, sc_nts_11))!== false)?sc_nts_11:(new sc_Pair(head, sc_nts_11)))))):(sc_list2vector((sc_reverse(sc_nts_11)))));
-            }), (BgL_sc_defzd2loop_9zd2(grammar, null))));
-            (BgL_sc_nbzd2nts_7zd2 = (sc_nts_8.length));
-            (nb_confs = (((BgL_sc_defzd2loop_6zd2 = function(defs, BgL_sc_nbzd2confs_14zd2) {
-                var rule_loop;
-                var def;
-                return ((defs instanceof sc_Pair)?((def = (defs.car)), (rule_loop = function(rules, BgL_sc_nbzd2confs_15zd2) {
-                    var l;
-                    var BgL_sc_nbzd2confs_16zd2;
-                    var rule;
-                    if ((rules instanceof sc_Pair))
-                        {
-                            (rule = (rules.car));
-                            (l = rule);
-                            (BgL_sc_nbzd2confs_16zd2 = BgL_sc_nbzd2confs_15zd2);
-                            while ((l instanceof sc_Pair)) {
-                                {
-                                    (l = (l.cdr));
-                                    (++BgL_sc_nbzd2confs_16zd2);
-                                }
-                            }
-                            return (rule_loop((rules.cdr), (BgL_sc_nbzd2confs_16zd2+(1))));
-                        }
-                    else
-                        return (BgL_sc_defzd2loop_6zd2((defs.cdr), BgL_sc_nbzd2confs_15zd2));
-                }), (rule_loop((def.cdr), BgL_sc_nbzd2confs_14zd2))):BgL_sc_nbzd2confs_14zd2);
-            }), (BgL_sc_defzd2loop_6zd2(grammar, (0))))+BgL_sc_nbzd2nts_7zd2));
-            (sc_starters_5 = (sc_makeVector(BgL_sc_nbzd2nts_7zd2, null)));
-            (sc_enders_4 = (sc_makeVector(BgL_sc_nbzd2nts_7zd2, null)));
-            (sc_predictors_3 = (sc_makeVector(BgL_sc_nbzd2nts_7zd2, null)));
-            (sc_steps_2 = (sc_makeVector(nb_confs, false)));
-            (sc_names_1 = (sc_makeVector(nb_confs, false)));
-            (nts = sc_nts_8);
-            (starters = sc_starters_5);
-            (enders = sc_enders_4);
-            (predictors = sc_predictors_3);
-            (steps = sc_steps_2);
-            (names = sc_names_1);
-            (nb_nts = (sc_nts_8.length));
-            (i = (nb_nts-(1)));
-            while ((i>=(0))) {
-                {
-                    (sc_steps_2[i] = (i-nb_nts));
-                    (sc_names_1[i] = (sc_list((sc_nts_8[i]), (0))));
-                    (sc_enders_4[i] = (sc_list(i)));
-                    (--i);
-                }
-            }
-            def_loop = function(defs, conf) {
-                var rule_loop;
-                var head;
-                var def;
-                return ((defs instanceof sc_Pair)?((def = (defs.car)), (head = (def.car)), (rule_loop = function(rules, conf, rule_num) {
-                    var i;
-                    var sc_i_17;
-                    var nt;
-                    var l;
-                    var sc_conf_18;
-                    var sc_i_19;
-                    var rule;
-                    if ((rules instanceof sc_Pair))
-                        {
-                            (rule = (rules.car));
-                            (names[conf] = (sc_list(head, rule_num)));
-                            (sc_i_19 = (ind(head, nts)));
-                            (starters[sc_i_19] = (new sc_Pair(conf, (starters[sc_i_19]))));
-                            (l = rule);
-                            (sc_conf_18 = conf);
-                            while ((l instanceof sc_Pair)) {
-                                {
-                                    (nt = (l.car));
-                                    (steps[sc_conf_18] = (ind(nt, nts)));
-                                    (sc_i_17 = (ind(nt, nts)));
-                                    (predictors[sc_i_17] = (new sc_Pair(sc_conf_18, (predictors[sc_i_17]))));
-                                    (l = (l.cdr));
-                                    (++sc_conf_18);
-                                }
-                            }
-                            (steps[sc_conf_18] = ((ind(head, nts))-nb_nts));
-                            (i = (ind(head, nts)));
-                            (enders[i] = (new sc_Pair(sc_conf_18, (enders[i]))));
-                            return (rule_loop((rules.cdr), (sc_conf_18+(1)), (rule_num+(1))));
-                        }
-                    else
-                        return (def_loop((defs.cdr), conf));
-                }), (rule_loop((def.cdr), conf, (1)))):undefined);
-            };
-            (def_loop(grammar, (sc_nts_8.length)));
-            (parser_descr = [lexer, sc_nts_8, sc_starters_5, sc_enders_4, sc_predictors_3, sc_steps_2, sc_names_1]);
-            return function(input) {
-                var optrOpnd;
-                var sc_optrOpnd_20;
-                var sc_optrOpnd_21;
-                var sc_optrOpnd_22;
-                var loop1;
-                var BgL_sc_stateza2_23za2;
-                var toks;
-                var BgL_sc_nbzd2nts_24zd2;
-                var sc_steps_25;
-                var sc_enders_26;
-                var state_num;
-                var BgL_sc_statesza2_27za2;
-                var states;
-                var i;
-                var conf;
-                var l;
-                var tok_nts;
-                var sc_i_28;
-                var sc_i_29;
-                var l1;
-                var l2;
-                var tok;
-                var tail1129;
-                var L1125;
-                var goal_enders;
-                var BgL_sc_statesza2_30za2;
-                var BgL_sc_nbzd2nts_31zd2;
-                var BgL_sc_nbzd2confs_32zd2;
-                var nb_toks;
-                var goal_starters;
-                var sc_states_33;
-                var BgL_sc_nbzd2confs_34zd2;
-                var BgL_sc_nbzd2toks_35zd2;
-                var sc_toks_36;
-                var falseHead1128;
-                var sc_names_37;
-                var sc_steps_38;
-                var sc_predictors_39;
-                var sc_enders_40;
-                var sc_starters_41;
-                var sc_nts_42;
-                var lexer;
-                var sc_ind_43;
-                var make_states;
-                var BgL_sc_confzd2setzd2getza2_44za2;
-                var conf_set_merge_new_bang;
-                var conf_set_adjoin;
-                var BgL_sc_confzd2setzd2adjoinza2_45za2;
-                var BgL_sc_confzd2setzd2adjoinza2za2_46z00;
-                var conf_set_union;
-                var forw;
-                var is_parsed;
-                var deriv_trees;
-                var BgL_sc_derivzd2treesza2_47z70;
-                var nb_deriv_trees;
-                var BgL_sc_nbzd2derivzd2treesza2_48za2;
-                {
-                    sc_ind_43 = function(nt, sc_nts_49) {
-                        var i;
-                        {
-                            (i = ((sc_nts_49.length)-(1)));
-                            while (true) {
-                                if ((i>=(0)))
-                                    if ((sc_isEqual((sc_nts_49[i]), nt)))
-                                        return i;
-                                    else
-                                        (--i);
-                                else
-                                    return false;
-                            }
-                        }
-                    };
-                    make_states = function(BgL_sc_nbzd2toks_50zd2, BgL_sc_nbzd2confs_51zd2) {
-                        var v;
-                        var i;
-                        var sc_states_52;
-                        {
-                            (sc_states_52 = (sc_makeVector((BgL_sc_nbzd2toks_50zd2+(1)), false)));
-                            (i = BgL_sc_nbzd2toks_50zd2);
-                            while ((i>=(0))) {
-                                {
-                                    (v = (sc_makeVector((BgL_sc_nbzd2confs_51zd2+(1)), false)));
-                                    (v[(0)] = (-1));
-                                    (sc_states_52[i] = v);
-                                    (--i);
-                                }
-                            }
-                            return sc_states_52;
-                        }
-                    };
-                    BgL_sc_confzd2setzd2getza2_44za2 = function(state, BgL_sc_statezd2num_53zd2, sc_conf_54) {
-                        var conf_set;
-                        var BgL_sc_confzd2set_55zd2;
-                        return ((BgL_sc_confzd2set_55zd2 = (state[(sc_conf_54+(1))])), ((BgL_sc_confzd2set_55zd2!== false)?BgL_sc_confzd2set_55zd2:((conf_set = (sc_makeVector((BgL_sc_statezd2num_53zd2+(6)), false))), (conf_set[(1)] = (-3)), (conf_set[(2)] = (-1)), (conf_set[(3)] = (-1)), (conf_set[(4)] = (-1)), (state[(sc_conf_54+(1))] = conf_set), conf_set)));
-                    };
-                    conf_set_merge_new_bang = function(conf_set) {
-                        return ((conf_set[((conf_set[(1)])+(5))] = (conf_set[(4)])), (conf_set[(1)] = (conf_set[(3)])), (conf_set[(3)] = (-1)), (conf_set[(4)] = (-1)));
-                    };
-                    conf_set_adjoin = function(state, conf_set, sc_conf_56, i) {
-                        var tail;
-                        return ((tail = (conf_set[(3)])), (conf_set[(i+(5))] = (-1)), (conf_set[(tail+(5))] = i), (conf_set[(3)] = i), ((tail<(0))?((conf_set[(0)] = (state[(0)])), (state[(0)] = sc_conf_56)):undefined));
-                    };
-                    BgL_sc_confzd2setzd2adjoinza2_45za2 = function(sc_states_57, BgL_sc_statezd2num_58zd2, l, i) {
-                        var conf_set;
-                        var sc_conf_59;
-                        var l1;
-                        var state;
-                        {
-                            (state = (sc_states_57[BgL_sc_statezd2num_58zd2]));
-                            (l1 = l);
-                            while ((l1 instanceof sc_Pair)) {
-                                {
-                                    (sc_conf_59 = (l1.car));
-                                    (conf_set = (BgL_sc_confzd2setzd2getza2_44za2(state, BgL_sc_statezd2num_58zd2, sc_conf_59)));
-                                    if (((conf_set[(i+(5))])=== false))
-                                        {
-                                            (conf_set_adjoin(state, conf_set, sc_conf_59, i));
-                                            (l1 = (l1.cdr));
-                                        }
-                                    else
-                                        (l1 = (l1.cdr));
-                                }
-                            }
-                            return undefined;
-                        }
-                    };
-                    BgL_sc_confzd2setzd2adjoinza2za2_46z00 = function(sc_states_60, BgL_sc_statesza2_61za2, BgL_sc_statezd2num_62zd2, sc_conf_63, i) {
-                        var BgL_sc_confzd2setza2_64z70;
-                        var BgL_sc_stateza2_65za2;
-                        var conf_set;
-                        var state;
-                        return ((state = (sc_states_60[BgL_sc_statezd2num_62zd2])), ((((conf_set = (state[(sc_conf_63+(1))])), ((conf_set!== false)?(conf_set[(i+(5))]):false))!== false)?((BgL_sc_stateza2_65za2 = (BgL_sc_statesza2_61za2[BgL_sc_statezd2num_62zd2])), (BgL_sc_confzd2setza2_64z70 = (BgL_sc_confzd2setzd2getza2_44za2(BgL_sc_stateza2_65za2, BgL_sc_statezd2num_62zd2, sc_conf_63))), (((BgL_sc_confzd2setza2_64z70[(i+(5))])=== false)?(conf_set_adjoin(BgL_sc_stateza2_65za2, BgL_sc_confzd2setza2_64z70, sc_conf_63, i)):undefined), true):false));
-                    };
-                    conf_set_union = function(state, conf_set, sc_conf_66, other_set) {
-                        var i;
-                        {
-                            (i = (other_set[(2)]));
-                            while ((i>=(0))) {
-                                if (((conf_set[(i+(5))])=== false))
-                                    {
-                                        (conf_set_adjoin(state, conf_set, sc_conf_66, i));
-                                        (i = (other_set[(i+(5))]));
-                                    }
-                                else
-                                    (i = (other_set[(i+(5))]));
-                            }
-                            return undefined;
-                        }
-                    };
-                    forw = function(sc_states_67, BgL_sc_statezd2num_68zd2, sc_starters_69, sc_enders_70, sc_predictors_71, sc_steps_72, sc_nts_73) {
-                        var next_set;
-                        var next;
-                        var conf_set;
-                        var ender;
-                        var l;
-                        var starter_set;
-                        var starter;
-                        var sc_l_74;
-                        var sc_loop1_75;
-                        var head;
-                        var BgL_sc_confzd2set_76zd2;
-                        var BgL_sc_statezd2num_77zd2;
-                        var state;
-                        var sc_states_78;
-                        var preds;
-                        var BgL_sc_confzd2set_79zd2;
-                        var step;
-                        var sc_conf_80;
-                        var BgL_sc_nbzd2nts_81zd2;
-                        var sc_state_82;
-                        {
-                            (sc_state_82 = (sc_states_67[BgL_sc_statezd2num_68zd2]));
-                            (BgL_sc_nbzd2nts_81zd2 = (sc_nts_73.length));
-                            while (true) {
-                                {
-                                    (sc_conf_80 = (sc_state_82[(0)]));
-                                    if ((sc_conf_80>=(0)))
-                                        {
-                                            (step = (sc_steps_72[sc_conf_80]));
-                                            (BgL_sc_confzd2set_79zd2 = (sc_state_82[(sc_conf_80+(1))]));
-                                            (head = (BgL_sc_confzd2set_79zd2[(4)]));
-                                            (sc_state_82[(0)] = (BgL_sc_confzd2set_79zd2[(0)]));
-                                            (conf_set_merge_new_bang(BgL_sc_confzd2set_79zd2));
-                                            if ((step>=(0)))
-                                                {
-                                                    (sc_l_74 = (sc_starters_69[step]));
-                                                    while ((sc_l_74 instanceof sc_Pair)) {
-                                                        {
-                                                            (starter = (sc_l_74.car));
-                                                            (starter_set = (BgL_sc_confzd2setzd2getza2_44za2(sc_state_82, BgL_sc_statezd2num_68zd2, starter)));
-                                                            if (((starter_set[(BgL_sc_statezd2num_68zd2+(5))])=== false))
-                                                                {
-                                                                    (conf_set_adjoin(sc_state_82, starter_set, starter, BgL_sc_statezd2num_68zd2));
-                                                                    (sc_l_74 = (sc_l_74.cdr));
-                                                                }
-                                                            else
-                                                                (sc_l_74 = (sc_l_74.cdr));
-                                                        }
-                                                    }
-                                                    (l = (sc_enders_70[step]));
-                                                    while ((l instanceof sc_Pair)) {
-                                                        {
-                                                            (ender = (l.car));
-                                                            if ((((conf_set = (sc_state_82[(ender+(1))])), ((conf_set!== false)?(conf_set[(BgL_sc_statezd2num_68zd2+(5))]):false))!== false))
-                                                                {
-                                                                    (next = (sc_conf_80+(1)));
-                                                                    (next_set = (BgL_sc_confzd2setzd2getza2_44za2(sc_state_82, BgL_sc_statezd2num_68zd2, next)));
-                                                                    (conf_set_union(sc_state_82, next_set, next, BgL_sc_confzd2set_79zd2));
-                                                                    (l = (l.cdr));
-                                                                }
-                                                            else
-                                                                (l = (l.cdr));
-                                                        }
-                                                    }
-                                                }
-                                            else
-                                                {
-                                                    (preds = (sc_predictors_71[(step+BgL_sc_nbzd2nts_81zd2)]));
-                                                    (sc_states_78 = sc_states_67);
-                                                    (state = sc_state_82);
-                                                    (BgL_sc_statezd2num_77zd2 = BgL_sc_statezd2num_68zd2);
-                                                    (BgL_sc_confzd2set_76zd2 = BgL_sc_confzd2set_79zd2);
-                                                    sc_loop1_75 = function(l) {
-                                                        var sc_state_83;
-                                                        var BgL_sc_nextzd2set_84zd2;
-                                                        var sc_next_85;
-                                                        var pred_set;
-                                                        var i;
-                                                        var pred;
-                                                        if ((l instanceof sc_Pair))
-                                                            {
-                                                                (pred = (l.car));
-                                                                (i = head);
-                                                                while ((i>=(0))) {
-                                                                    {
-                                                                        (pred_set = ((sc_state_83 = (sc_states_78[i])), (sc_state_83[(pred+(1))])));
-                                                                        if ((pred_set!== false))
-                                                                            {
-                                                                                (sc_next_85 = (pred+(1)));
-                                                                                (BgL_sc_nextzd2set_84zd2 = (BgL_sc_confzd2setzd2getza2_44za2(state, BgL_sc_statezd2num_77zd2, sc_next_85)));
-                                                                                (conf_set_union(state, BgL_sc_nextzd2set_84zd2, sc_next_85, pred_set));
-                                                                            }
-                                                                        (i = (BgL_sc_confzd2set_76zd2[(i+(5))]));
-                                                                    }
-                                                                }
-                                                                return (sc_loop1_75((l.cdr)));
-                                                            }
-                                                        else
-                                                            return undefined;
-                                                    };
-                                                    (sc_loop1_75(preds));
-                                                }
-                                        }
-                                    else
-                                        return undefined;
-                                }
-                            }
-                        }
-                    };
-                    is_parsed = function(nt, i, j, sc_nts_86, sc_enders_87, sc_states_88) {
-                        var conf_set;
-                        var state;
-                        var sc_conf_89;
-                        var l;
-                        var BgL_sc_ntza2_90za2;
-                        {
-                            (BgL_sc_ntza2_90za2 = (sc_ind_43(nt, sc_nts_86)));
-                            if ((BgL_sc_ntza2_90za2!== false))
-                                {
-                                    (sc_nts_86.length);
-                                    (l = (sc_enders_87[BgL_sc_ntza2_90za2]));
-                                    while (true) {
-                                        if ((l instanceof sc_Pair))
-                                            {
-                                                (sc_conf_89 = (l.car));
-                                                if ((((state = (sc_states_88[j])), (conf_set = (state[(sc_conf_89+(1))])), ((conf_set!== false)?(conf_set[(i+(5))]):false))!== false))
-                                                    return true;
-                                                else
-                                                    (l = (l.cdr));
-                                            }
-                                        else
-                                            return false;
-                                    }
-                                }
-                            else
-                                return false;
-                        }
-                    };
-                    deriv_trees = function(sc_conf_91, i, j, sc_enders_92, sc_steps_93, sc_names_94, sc_toks_95, sc_states_96, BgL_sc_nbzd2nts_97zd2) {
-                        var sc_loop1_98;
-                        var prev;
-                        var name;
-                        return ((name = (sc_names_94[sc_conf_91])), ((name!== false)?((sc_conf_91<BgL_sc_nbzd2nts_97zd2)?(sc_list((sc_list(name, ((sc_toks_95[i]).car))))):(sc_list((sc_list(name))))):((prev = (sc_conf_91-(1))), (sc_loop1_98 = function(l1, l2) {
-                            var loop2;
-                            var ender_set;
-                            var state;
-                            var ender;
-                            var l1;
-                            var l2;
-                            while (true) {
-                                if ((l1 instanceof sc_Pair))
-                                    {
-                                        (ender = (l1.car));
-                                        (ender_set = ((state = (sc_states_96[j])), (state[(ender+(1))])));
-                                        if ((ender_set!== false))
-                                            {
-                                                loop2 = function(k, l2) {
-                                                    var loop3;
-                                                    var ender_trees;
-                                                    var prev_trees;
-                                                    var conf_set;
-                                                    var sc_state_99;
-                                                    var k;
-                                                    var l2;
-                                                    while (true) {
-                                                        if ((k>=(0)))
-                                                            if (((k>=i)&&(((sc_state_99 = (sc_states_96[k])), (conf_set = (sc_state_99[(prev+(1))])), ((conf_set!== false)?(conf_set[(i+(5))]):false))!== false)))
-                                                                {
-                                                                    (prev_trees = (deriv_trees(prev, i, k, sc_enders_92, sc_steps_93, sc_names_94, sc_toks_95, sc_states_96, BgL_sc_nbzd2nts_97zd2)));
-                                                                    (ender_trees = (deriv_trees(ender, k, j, sc_enders_92, sc_steps_93, sc_names_94, sc_toks_95, sc_states_96, BgL_sc_nbzd2nts_97zd2)));
-                                                                    loop3 = function(l3, l2) {
-                                                                        var l4;
-                                                                        var sc_l2_100;
-                                                                        var ender_tree;
-                                                                        if ((l3 instanceof sc_Pair))
-                                                                            {
-                                                                                (ender_tree = (sc_list((l3.car))));
-                                                                                (l4 = prev_trees);
-                                                                                (sc_l2_100 = l2);
-                                                                                while ((l4 instanceof sc_Pair)) {
-                                                                                    {
-                                                                                        (sc_l2_100 = (new sc_Pair((sc_append((l4.car), ender_tree)), sc_l2_100)));
-                                                                                        (l4 = (l4.cdr));
-                                                                                    }
-                                                                                }
-                                                                                return (loop3((l3.cdr), sc_l2_100));
-                                                                            }
-                                                                        else
-                                                                            return (loop2((ender_set[(k+(5))]), l2));
-                                                                    };
-                                                                    return (loop3(ender_trees, l2));
-                                                                }
-                                                            else
-                                                                (k = (ender_set[(k+(5))]));
-                                                        else
-                                                            return (sc_loop1_98((l1.cdr), l2));
-                                                    }
-                                                };
-                                                return (loop2((ender_set[(2)]), l2));
-                                            }
-                                        else
-                                            (l1 = (l1.cdr));
-                                    }
-                                else
-                                    return l2;
-                            }
-                        }), (sc_loop1_98((sc_enders_92[(sc_steps_93[prev])]), null)))));
-                    };
-                    BgL_sc_derivzd2treesza2_47z70 = function(nt, i, j, sc_nts_101, sc_enders_102, sc_steps_103, sc_names_104, sc_toks_105, sc_states_106) {
-                        var conf_set;
-                        var state;
-                        var sc_conf_107;
-                        var l;
-                        var trees;
-                        var BgL_sc_nbzd2nts_108zd2;
-                        var BgL_sc_ntza2_109za2;
-                        {
-                            (BgL_sc_ntza2_109za2 = (sc_ind_43(nt, sc_nts_101)));
-                            if ((BgL_sc_ntza2_109za2!== false))
-                                {
-                                    (BgL_sc_nbzd2nts_108zd2 = (sc_nts_101.length));
-                                    (l = (sc_enders_102[BgL_sc_ntza2_109za2]));
-                                    (trees = null);
-                                    while ((l instanceof sc_Pair)) {
-                                        {
-                                            (sc_conf_107 = (l.car));
-                                            if ((((state = (sc_states_106[j])), (conf_set = (state[(sc_conf_107+(1))])), ((conf_set!== false)?(conf_set[(i+(5))]):false))!== false))
-                                                {
-                                                    (l = (l.cdr));
-                                                    (trees = (sc_append((deriv_trees(sc_conf_107, i, j, sc_enders_102, sc_steps_103, sc_names_104, sc_toks_105, sc_states_106, BgL_sc_nbzd2nts_108zd2)), trees)));
-                                                }
-                                            else
-                                                (l = (l.cdr));
-                                        }
-                                    }
-                                    return trees;
-                                }
-                            else
-                                return false;
-                        }
-                    };
-                    nb_deriv_trees = function(sc_conf_110, i, j, sc_enders_111, sc_steps_112, sc_toks_113, sc_states_114, BgL_sc_nbzd2nts_115zd2) {
-                        var sc_loop1_116;
-                        var tmp1124;
-                        var prev;
-                        return ((prev = (sc_conf_110-(1))), ((((tmp1124 = (sc_conf_110<BgL_sc_nbzd2nts_115zd2)), ((tmp1124!== false)?tmp1124:((sc_steps_112[prev])<(0))))!== false)?(1):((sc_loop1_116 = function(l, sc_n_118) {
-                            var nb_ender_trees;
-                            var nb_prev_trees;
-                            var conf_set;
-                            var state;
-                            var k;
-                            var n;
-                            var ender_set;
-                            var sc_state_117;
-                            var ender;
-                            var l;
-                            var sc_n_118;
-                            while (true) {
-                                if ((l instanceof sc_Pair))
-                                    {
-                                        (ender = (l.car));
-                                        (ender_set = ((sc_state_117 = (sc_states_114[j])), (sc_state_117[(ender+(1))])));
-                                        if ((ender_set!== false))
-                                            {
-                                                (k = (ender_set[(2)]));
-                                                (n = sc_n_118);
-                                                while ((k>=(0))) {
-                                                    if (((k>=i)&&(((state = (sc_states_114[k])), (conf_set = (state[(prev+(1))])), ((conf_set!== false)?(conf_set[(i+(5))]):false))!== false)))
-                                                        {
-                                                            (nb_prev_trees = (nb_deriv_trees(prev, i, k, sc_enders_111, sc_steps_112, sc_toks_113, sc_states_114, BgL_sc_nbzd2nts_115zd2)));
-                                                            (nb_ender_trees = (nb_deriv_trees(ender, k, j, sc_enders_111, sc_steps_112, sc_toks_113, sc_states_114, BgL_sc_nbzd2nts_115zd2)));
-                                                            (k = (ender_set[(k+(5))]));
-                                                            (n +=(nb_prev_trees*nb_ender_trees));
-                                                        }
-                                                    else
-                                                        (k = (ender_set[(k+(5))]));
-                                                }
-                                                return (sc_loop1_116((l.cdr), n));
-                                            }
-                                        else
-                                            (l = (l.cdr));
-                                    }
-                                else
-                                    return sc_n_118;
-                            }
-                        }), (sc_loop1_116((sc_enders_111[(sc_steps_112[prev])]), (0))))));
-                    };
-                    BgL_sc_nbzd2derivzd2treesza2_48za2 = function(nt, i, j, sc_nts_119, sc_enders_120, sc_steps_121, sc_toks_122, sc_states_123) {
-                        var conf_set;
-                        var state;
-                        var sc_conf_124;
-                        var l;
-                        var nb_trees;
-                        var BgL_sc_nbzd2nts_125zd2;
-                        var BgL_sc_ntza2_126za2;
-                        {
-                            (BgL_sc_ntza2_126za2 = (sc_ind_43(nt, sc_nts_119)));
-                            if ((BgL_sc_ntza2_126za2!== false))
-                                {
-                                    (BgL_sc_nbzd2nts_125zd2 = (sc_nts_119.length));
-                                    (l = (sc_enders_120[BgL_sc_ntza2_126za2]));
-                                    (nb_trees = (0));
-                                    while ((l instanceof sc_Pair)) {
-                                        {
-                                            (sc_conf_124 = (l.car));
-                                            if ((((state = (sc_states_123[j])), (conf_set = (state[(sc_conf_124+(1))])), ((conf_set!== false)?(conf_set[(i+(5))]):false))!== false))
-                                                {
-                                                    (l = (l.cdr));
-                                                    (nb_trees = ((nb_deriv_trees(sc_conf_124, i, j, sc_enders_120, sc_steps_121, sc_toks_122, sc_states_123, BgL_sc_nbzd2nts_125zd2))+nb_trees));
-                                                }
-                                            else
-                                                (l = (l.cdr));
-                                        }
-                                    }
-                                    return nb_trees;
-                                }
-                            else
-                                return false;
-                        }
-                    };
-                    (lexer = (parser_descr[(0)]));
-                    (sc_nts_42 = (parser_descr[(1)]));
-                    (sc_starters_41 = (parser_descr[(2)]));
-                    (sc_enders_40 = (parser_descr[(3)]));
-                    (sc_predictors_39 = (parser_descr[(4)]));
-                    (sc_steps_38 = (parser_descr[(5)]));
-                    (sc_names_37 = (parser_descr[(6)]));
-                    (falseHead1128 = (new sc_Pair(null, null)));
-                    (L1125 = (lexer(input)));
-                    (tail1129 = falseHead1128);
-                    while (!(L1125 === null)) {
-                        {
-                            (tok = (L1125.car));
-                            (l1 = (tok.cdr));
-                            (l2 = null);
-                            while ((l1 instanceof sc_Pair)) {
-                                {
-                                    (sc_i_29 = (sc_ind_43((l1.car), sc_nts_42)));
-                                    if ((sc_i_29!== false))
-                                        {
-                                            (l1 = (l1.cdr));
-                                            (l2 = (new sc_Pair(sc_i_29, l2)));
-                                        }
-                                    else
-                                        (l1 = (l1.cdr));
-                                }
-                            }
-                            (sc_optrOpnd_22 = (new sc_Pair((tok.car), (sc_reverse(l2)))));
-                            (sc_optrOpnd_21 = (new sc_Pair(sc_optrOpnd_22, null)));
-                            (tail1129.cdr = sc_optrOpnd_21);
-                            (tail1129 = (tail1129.cdr));
-                            (L1125 = (L1125.cdr));
-                        }
-                    }
-                    (sc_optrOpnd_20 = (falseHead1128.cdr));
-                    (sc_toks_36 = (sc_list2vector(sc_optrOpnd_20)));
-                    (BgL_sc_nbzd2toks_35zd2 = (sc_toks_36.length));
-                    (BgL_sc_nbzd2confs_34zd2 = (sc_steps_38.length));
-                    (sc_states_33 = (make_states(BgL_sc_nbzd2toks_35zd2, BgL_sc_nbzd2confs_34zd2)));
-                    (goal_starters = (sc_starters_41[(0)]));
-                    (BgL_sc_confzd2setzd2adjoinza2_45za2(sc_states_33, (0), goal_starters, (0)));
-                    (forw(sc_states_33, (0), sc_starters_41, sc_enders_40, sc_predictors_39, sc_steps_38, sc_nts_42));
-                    (sc_i_28 = (0));
-                    while ((sc_i_28<BgL_sc_nbzd2toks_35zd2)) {
-                        {
-                            (tok_nts = ((sc_toks_36[sc_i_28]).cdr));
-                            (BgL_sc_confzd2setzd2adjoinza2_45za2(sc_states_33, (sc_i_28+(1)), tok_nts, sc_i_28));
-                            (forw(sc_states_33, (sc_i_28+(1)), sc_starters_41, sc_enders_40, sc_predictors_39, sc_steps_38, sc_nts_42));
-                            (++sc_i_28);
-                        }
-                    }
-                    (nb_toks = (sc_toks_36.length));
-                    (BgL_sc_nbzd2confs_32zd2 = (sc_steps_38.length));
-                    (BgL_sc_nbzd2nts_31zd2 = (sc_nts_42.length));
-                    (BgL_sc_statesza2_30za2 = (make_states(nb_toks, BgL_sc_nbzd2confs_32zd2)));
-                    (goal_enders = (sc_enders_40[(0)]));
-                    (l = goal_enders);
-                    while ((l instanceof sc_Pair)) {
-                        {
-                            (conf = (l.car));
-                            (BgL_sc_confzd2setzd2adjoinza2za2_46z00(sc_states_33, BgL_sc_statesza2_30za2, nb_toks, conf, (0)));
-                            (l = (l.cdr));
-                        }
-                    }
-                    (i = nb_toks);
-                    while ((i>=(0))) {
-                        {
-                            (states = sc_states_33);
-                            (BgL_sc_statesza2_27za2 = BgL_sc_statesza2_30za2);
-                            (state_num = i);
-                            (sc_enders_26 = sc_enders_40);
-                            (sc_steps_25 = sc_steps_38);
-                            (BgL_sc_nbzd2nts_24zd2 = BgL_sc_nbzd2nts_31zd2);
-                            (toks = sc_toks_36);
-                            (BgL_sc_stateza2_23za2 = (BgL_sc_statesza2_30za2[i]));
-                            loop1 = function() {
-                                var sc_loop1_127;
-                                var prev;
-                                var BgL_sc_statesza2_128za2;
-                                var sc_states_129;
-                                var j;
-                                var i;
-                                var sc_i_130;
-                                var head;
-                                var conf_set;
-                                var sc_conf_131;
-                                {
-                                    (sc_conf_131 = (BgL_sc_stateza2_23za2[(0)]));
-                                    if ((sc_conf_131>=(0)))
-                                        {
-                                            (conf_set = (BgL_sc_stateza2_23za2[(sc_conf_131+(1))]));
-                                            (head = (conf_set[(4)]));
-                                            (BgL_sc_stateza2_23za2[(0)] = (conf_set[(0)]));
-                                            (conf_set_merge_new_bang(conf_set));
-                                            (sc_i_130 = head);
-                                            while ((sc_i_130>=(0))) {
-                                                {
-                                                    (i = sc_i_130);
-                                                    (j = state_num);
-                                                    (sc_states_129 = states);
-                                                    (BgL_sc_statesza2_128za2 = BgL_sc_statesza2_27za2);
-                                                    (prev = (sc_conf_131-(1)));
-                                                    if (((sc_conf_131>=BgL_sc_nbzd2nts_24zd2)&&((sc_steps_25[prev])>=(0))))
-                                                        {
-                                                            sc_loop1_127 = function(l) {
-                                                                var k;
-                                                                var ender_set;
-                                                                var state;
-                                                                var ender;
-                                                                var l;
-                                                                while (true) {
-                                                                    if ((l instanceof sc_Pair))
-                                                                        {
-                                                                            (ender = (l.car));
-                                                                            (ender_set = ((state = (sc_states_129[j])), (state[(ender+(1))])));
-                                                                            if ((ender_set!== false))
-                                                                                {
-                                                                                    (k = (ender_set[(2)]));
-                                                                                    while ((k>=(0))) {
-                                                                                        {
-                                                                                            if ((k>=i))
-                                                                                                if (((BgL_sc_confzd2setzd2adjoinza2za2_46z00(sc_states_129, BgL_sc_statesza2_128za2, k, prev, i))!== false))
-                                                                                                    (BgL_sc_confzd2setzd2adjoinza2za2_46z00(sc_states_129, BgL_sc_statesza2_128za2, j, ender, k));
-                                                                                            (k = (ender_set[(k+(5))]));
-                                                                                        }
-                                                                                    }
-                                                                                    return (sc_loop1_127((l.cdr)));
-                                                                                }
-                                                                            else
-                                                                                (l = (l.cdr));
-                                                                        }
-                                                                    else
-                                                                        return undefined;
-                                                                }
-                                                            };
-                                                            (sc_loop1_127((sc_enders_26[(sc_steps_25[prev])])));
-                                                        }
-                                                    (sc_i_130 = (conf_set[(sc_i_130+(5))]));
-                                                }
-                                            }
-                                            return (loop1());
-                                        }
-                                    else
-                                        return undefined;
-                                }
-                            };
-                            (loop1());
-                            (--i);
-                        }
-                    }
-                    (optrOpnd = BgL_sc_statesza2_30za2);
-                    return [sc_nts_42, sc_starters_41, sc_enders_40, sc_predictors_39, sc_steps_38, sc_names_37, sc_toks_36, optrOpnd, is_parsed, BgL_sc_derivzd2treesza2_47z70, BgL_sc_nbzd2derivzd2treesza2_48za2];
-                }
-            };
-        }
-    };
-    BgL_parsezd2ze3parsedzf3zc2 = function(parse, nt, i, j) {
-        var is_parsed;
-        var states;
-        var enders;
-        var nts;
-        return ((nts = (parse[(0)])), (enders = (parse[(2)])), (states = (parse[(7)])), (is_parsed = (parse[(8)])), (is_parsed(nt, i, j, nts, enders, states)));
-    };
-    BgL_parsezd2ze3treesz31 = function(parse, nt, i, j) {
-        var BgL_sc_derivzd2treesza2_132z70;
-        var states;
-        var toks;
-        var names;
-        var steps;
-        var enders;
-        var nts;
-        return ((nts = (parse[(0)])), (enders = (parse[(2)])), (steps = (parse[(4)])), (names = (parse[(5)])), (toks = (parse[(6)])), (states = (parse[(7)])), (BgL_sc_derivzd2treesza2_132z70 = (parse[(9)])), (BgL_sc_derivzd2treesza2_132z70(nt, i, j, nts, enders, steps, names, toks, states)));
-    };
-    BgL_parsezd2ze3nbzd2treesze3 = function(parse, nt, i, j) {
-        var BgL_sc_nbzd2derivzd2treesza2_133za2;
-        var states;
-        var toks;
-        var steps;
-        var enders;
-        var nts;
-        return ((nts = (parse[(0)])), (enders = (parse[(2)])), (steps = (parse[(4)])), (toks = (parse[(6)])), (states = (parse[(7)])), (BgL_sc_nbzd2derivzd2treesza2_133za2 = (parse[(10)])), (BgL_sc_nbzd2derivzd2treesza2_133za2(nt, i, j, nts, enders, steps, toks, states)));
-    };
-    test = function(k) {
-        var x;
-        var p;
-        return ((p = (BgL_makezd2parserzd2(const_earley, function(l) {
-            var sc_x_134;
-            var tail1134;
-            var L1130;
-            var falseHead1133;
-            {
-                (falseHead1133 = (new sc_Pair(null, null)));
-                (tail1134 = falseHead1133);
-                (L1130 = l);
-                while (!(L1130 === null)) {
-                    {
-                        (tail1134.cdr = (new sc_Pair(((sc_x_134 = (L1130.car)), (sc_list(sc_x_134, sc_x_134))), null)));
-                        (tail1134 = (tail1134.cdr));
-                        (L1130 = (L1130.cdr));
-                    }
-                }
-                return (falseHead1133.cdr);
-            }
-        }))), (x = (p((sc_vector2list((sc_makeVector(k, "\u1E9Ca"))))))), (sc_length((BgL_parsezd2ze3treesz31(x, "\u1E9Cs", (0), k)))));
-    };
-    BgL_earleyzd2benchmarkzd2 = function() {
-        var args = null;
-        for (var sc_tmp = arguments.length - 1; sc_tmp >= 0; sc_tmp--) {
-            args = sc_cons(arguments[sc_tmp], args);
-        }
-        var k;
-        return ((k = ((args === null)?(7):(args.car))), (BgL_runzd2benchmarkzd2("earley", (1), function() {
-            return (test(k));
-        }, function(result) {
-            return ((sc_display(result)), (sc_newline()), true);
-        })));
-    };
-}
-
-
-/************* END OF GENERATED CODE *************/
-// Invoke this function to run a benchmark.
-// The first argument is a string identifying the benchmark.
-// The second argument is the number of times to run the benchmark.
-// The third argument is a function that runs the benchmark.
-// The fourth argument is a unary function that warns if the result
-// returned by the benchmark is incorrect.
-//
-// Example:
-// RunBenchmark("new Array()",
-//              1,
-//              function () { new Array(1000000); }
-//              function (v) {
-//                return (v instanceof Array) && (v.length == 1000000);
-//              });
-
-SC_DEFAULT_OUT = new sc_GenericOutputPort(function(s) {});
-SC_ERROR_OUT = SC_DEFAULT_OUT;
-
-function RunBenchmark(name, count, run, warn) {
-  for (var n = 0; n < count; ++n) {
-    result = run();
-  }
-}
-
-var BgL_runzd2benchmarkzd2 = RunBenchmark;
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/raytrace.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/raytrace.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/raytrace.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/raytrace.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,3418 +0,0 @@
-// The ray tracer code in this file is written by Adam Burmister. It
-// is available in its original form from:
-//
-//   http://labs.flog.nz.co/raytracer/
-//
-// It has been modified slightly by Google to work as a standalone
-// benchmark, but the all the computational code remains
-// untouched. This file also contains a copy of the Prototype
-// JavaScript framework which is used by the ray tracer.
-
-var RayTrace = new BenchmarkSuite('RayTrace', 932666, [
-  new Benchmark('RayTrace', renderScene)
-]);
-
-
-// Create dummy objects if we're not running in a browser.
-if (typeof document == 'undefined') {
-  document = { };
-  window = { opera: null };
-  navigator = { userAgent: null, appVersion: "" };
-}
-
-
-// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-
-
-/*  Prototype JavaScript framework, version 1.5.0
- *  (c) 2005-2007 Sam Stephenson
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
- *  For details, see the Prototype web site: http://prototype.conio.net/
- *
-/*--------------------------------------------------------------------------*/
-
-//--------------------
-var Prototype = {
-  Version: '1.5.0',
-  BrowserFeatures: {
-    XPath: !!document.evaluate
-  },
-
-  ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
-  emptyFunction: function() {},
-  K: function(x) { return x }
-}
-
-var Class = {
-  create: function() {
-    return function() {
-      this.initialize.apply(this, arguments);
-    }
-  }
-}
-
-var Abstract = new Object();
-
-Object.extend = function(destination, source) {
-  for (var property in source) {
-    destination[property] = source[property];
-  }
-  return destination;
-}
-
-Object.extend(Object, {
-  inspect: function(object) {
-    try {
-      if (object === undefined) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : object.toString();
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
-  },
-
-  keys: function(object) {
-    var keys = [];
-    for (var property in object)
-      keys.push(property);
-    return keys;
-  },
-
-  values: function(object) {
-    var values = [];
-    for (var property in object)
-      values.push(object[property]);
-    return values;
-  },
-
-  clone: function(object) {
-    return Object.extend({}, object);
-  }
-});
-
-Function.prototype.bind = function() {
-  var __method = this, args = $A(arguments), object = args.shift();
-  return function() {
-    return __method.apply(object, args.concat($A(arguments)));
-  }
-}
-
-Function.prototype.bindAsEventListener = function(object) {
-  var __method = this, args = $A(arguments), object = args.shift();
-  return function(event) {
-    return __method.apply(object, [( event || window.event)].concat(args).concat($A(arguments)));
-  }
-}
-
-Object.extend(Number.prototype, {
-  toColorPart: function() {
-    var digits = this.toString(16);
-    if (this < 16) return '0' + digits;
-    return digits;
-  },
-
-  succ: function() {
-    return this + 1;
-  },
-
-  times: function(iterator) {
-    $R(0, this, true).each(iterator);
-    return this;
-  }
-});
-
-var Try = {
-  these: function() {
-    var returnValue;
-
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) {}
-    }
-
-    return returnValue;
-  }
-}
-
-/*--------------------------------------------------------------------------*/
-
-var PeriodicalExecuter = Class.create();
-PeriodicalExecuter.prototype = {
-  initialize: function(callback, frequency) {
-    this.callback = callback;
-    this.frequency = frequency;
-    this.currentlyExecuting = false;
-
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  stop: function() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-
-  onTimerEvent: function() {
-    if (!this.currentlyExecuting) {
-      try {
-        this.currentlyExecuting = true;
-        this.callback(this);
-      } finally {
-        this.currentlyExecuting = false;
-      }
-    }
-  }
-}
-String.interpret = function(value){
-  return value == null ? '' : String(value);
-}
-
-Object.extend(String.prototype, {
-  gsub: function(pattern, replacement) {
-    var result = '', source = this, match;
-    replacement = arguments.callee.prepareReplacement(replacement);
-
-    while (source.length > 0) {
-      if (match = source.match(pattern)) {
-        result += source.slice(0, match.index);
-        result += String.interpret(replacement(match));
-        source  = source.slice(match.index + match[0].length);
-      } else {
-        result += source, source = '';
-      }
-    }
-    return result;
-  },
-
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-    count = count === undefined ? 1 : count;
-
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
-      return replacement(match);
-    });
-  },
-
-  scan: function(pattern, iterator) {
-    this.gsub(pattern, iterator);
-    return this;
-  },
-
-  truncate: function(length, truncation) {
-    length = length || 30;
-    truncation = truncation === undefined ? '...' : truncation;
-    return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : this;
-  },
-
-  strip: function() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-
-  stripTags: function() {
-    return this.replace(/<\/?[^>]+>/gi, '');
-  },
-
-  stripScripts: function() {
-    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
-  },
-
-  extractScripts: function() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
-    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
-    return (this.match(matchAll) || []).map(function(scriptTag) {
-      return (scriptTag.match(matchOne) || ['', ''])[1];
-    });
-  },
-
-  evalScripts: function() {
-    return this.extractScripts().map(function(script) { return eval(script) });
-  },
-
-  escapeHTML: function() {
-    var div = document.createElement('div');
-    var text = document.createTextNode(this);
-    div.appendChild(text);
-    return div.innerHTML;
-  },
-
-  unescapeHTML: function() {
-    var div = document.createElement('div');
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ?
-      $A(div.childNodes).inject('',function(memo,node){ return memo+node.nodeValue }) :
-      div.childNodes[0].nodeValue) : '';
-  },
-
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return {};
-
-    return match[1].split(separator || '&').inject({}, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-        var name = decodeURIComponent(pair[0]);
-        var value = pair[1] ? decodeURIComponent(pair[1]) : undefined;
-
-        if (hash[name] !== undefined) {
-          if (hash[name].constructor != Array)
-            hash[name] = [hash[name]];
-          if (value) hash[name].push(value);
-        }
-        else hash[name] = value;
-      }
-      return hash;
-    });
-  },
-
-  toArray: function() {
-    return this.split('');
-  },
-
-  succ: function() {
-    return this.slice(0, this.length - 1) +
-      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-  },
-
-  camelize: function() {
-    var parts = this.split('-'), len = parts.length;
-    if (len == 1) return parts[0];
-
-    var camelized = this.charAt(0) == '-'
-      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-      : parts[0];
-
-    for (var i = 1; i < len; i++)
-      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
-    return camelized;
-  },
-
-  capitalize: function(){
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  },
-
-  underscore: function() {
-    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
-  },
-
-  dasherize: function() {
-    return this.gsub(/_/,'-');
-  },
-
-  inspect: function(useDoubleQuotes) {
-    var escapedString = this.replace(/\\/g, '\\\\');
-    if (useDoubleQuotes)
-      return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    else
-      return "'" + escapedString.replace(/'/g, '\\\'') + "'";
-  }
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (typeof replacement == 'function') return replacement;
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
-}
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-var Template = Class.create();
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-Template.prototype = {
-  initialize: function(template, pattern) {
-    this.template = template.toString();
-    this.pattern  = pattern || Template.Pattern;
-  },
-
-  evaluate: function(object) {
-    return this.template.gsub(this.pattern, function(match) {
-      var before = match[1];
-      if (before == '\\') return match[2];
-      return before + String.interpret(object[match[3]]);
-    });
-  }
-}
-
-var $break    = new Object();
-var $continue = new Object();
-
-var Enumerable = {
-  each: function(iterator) {
-    var index = 0;
-    try {
-      this._each(function(value) {
-        try {
-          iterator(value, index++);
-        } catch (e) {
-          if (e != $continue) throw e;
-        }
-      });
-    } catch (e) {
-      if (e != $break) throw e;
-    }
-    return this;
-  },
-
-  eachSlice: function(number, iterator) {
-    var index = -number, slices = [], array = this.toArray();
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-    return slices.map(iterator);
-  },
-
-  all: function(iterator) {
-    var result = true;
-    this.each(function(value, index) {
-      result = result && !!(iterator || Prototype.K)(value, index);
-      if (!result) throw $break;
-    });
-    return result;
-  },
-
-  any: function(iterator) {
-    var result = false;
-    this.each(function(value, index) {
-      if (result = !!(iterator || Prototype.K)(value, index))
-        throw $break;
-    });
-    return result;
-  },
-
-  collect: function(iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      results.push((iterator || Prototype.K)(value, index));
-    });
-    return results;
-  },
-
-  detect: function(iterator) {
-    var result;
-    this.each(function(value, index) {
-      if (iterator(value, index)) {
-        result = value;
-        throw $break;
-      }
-    });
-    return result;
-  },
-
-  findAll: function(iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      if (iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  grep: function(pattern, iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      var stringValue = value.toString();
-      if (stringValue.match(pattern))
-        results.push((iterator || Prototype.K)(value, index));
-    })
-    return results;
-  },
-
-  include: function(object) {
-    var found = false;
-    this.each(function(value) {
-      if (value == object) {
-        found = true;
-        throw $break;
-      }
-    });
-    return found;
-  },
-
-  inGroupsOf: function(number, fillWith) {
-    fillWith = fillWith === undefined ? null : fillWith;
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;
-    });
-  },
-
-  inject: function(memo, iterator) {
-    this.each(function(value, index) {
-      memo = iterator(memo, value, index);
-    });
-    return memo;
-  },
-
-  invoke: function(method) {
-    var args = $A(arguments).slice(1);
-    return this.map(function(value) {
-      return value[method].apply(value, args);
-    });
-  },
-
-  max: function(iterator) {
-    var result;
-    this.each(function(value, index) {
-      value = (iterator || Prototype.K)(value, index);
-      if (result == undefined || value >= result)
-        result = value;
-    });
-    return result;
-  },
-
-  min: function(iterator) {
-    var result;
-    this.each(function(value, index) {
-      value = (iterator || Prototype.K)(value, index);
-      if (result == undefined || value < result)
-        result = value;
-    });
-    return result;
-  },
-
-  partition: function(iterator) {
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-      ((iterator || Prototype.K)(value, index) ?
-        trues : falses).push(value);
-    });
-    return [trues, falses];
-  },
-
-  pluck: function(property) {
-    var results = [];
-    this.each(function(value, index) {
-      results.push(value[property]);
-    });
-    return results;
-  },
-
-  reject: function(iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      if (!iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  sortBy: function(iterator) {
-    return this.map(function(value, index) {
-      return {value: value, criteria: iterator(value, index)};
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }).pluck('value');
-  },
-
-  toArray: function() {
-    return this.map();
-  },
-
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-    if (typeof args.last() == 'function')
-      iterator = args.pop();
-
-    var collections = [this].concat(args).map($A);
-    return this.map(function(value, index) {
-      return iterator(collections.pluck(index));
-    });
-  },
-
-  size: function() {
-    return this.toArray().length;
-  },
-
-  inspect: function() {
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
-}
-
-Object.extend(Enumerable, {
-  map:     Enumerable.collect,
-  find:    Enumerable.detect,
-  select:  Enumerable.findAll,
-  member:  Enumerable.include,
-  entries: Enumerable.toArray
-});
-var $A = Array.from = function(iterable) {
-  if (!iterable) return [];
-  if (iterable.toArray) {
-    return iterable.toArray();
-  } else {
-    var results = [];
-    for (var i = 0, length = iterable.length; i < length; i++)
-      results.push(iterable[i]);
-    return results;
-  }
-}
-
-Object.extend(Array.prototype, Enumerable);
-
-if (!Array.prototype._reverse)
-  Array.prototype._reverse = Array.prototype.reverse;
-
-Object.extend(Array.prototype, {
-  _each: function(iterator) {
-    for (var i = 0, length = this.length; i < length; i++)
-      iterator(this[i]);
-  },
-
-  clear: function() {
-    this.length = 0;
-    return this;
-  },
-
-  first: function() {
-    return this[0];
-  },
-
-  last: function() {
-    return this[this.length - 1];
-  },
-
-  compact: function() {
-    return this.select(function(value) {
-      return value != null;
-    });
-  },
-
-  flatten: function() {
-    return this.inject([], function(array, value) {
-      return array.concat(value && value.constructor == Array ?
-        value.flatten() : [value]);
-    });
-  },
-
-  without: function() {
-    var values = $A(arguments);
-    return this.select(function(value) {
-      return !values.include(value);
-    });
-  },
-
-  indexOf: function(object) {
-    for (var i = 0, length = this.length; i < length; i++)
-      if (this[i] == object) return i;
-    return -1;
-  },
-
-  reverse: function(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
-  },
-
-  reduce: function() {
-    return this.length > 1 ? this : this[0];
-  },
-
-  uniq: function() {
-    return this.inject([], function(array, value) {
-      return array.include(value) ? array : array.concat([value]);
-    });
-  },
-
-  clone: function() {
-    return [].concat(this);
-  },
-
-  size: function() {
-    return this.length;
-  },
-
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  }
-});
-
-Array.prototype.toArray = Array.prototype.clone;
-
-function $w(string){
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
-}
-
-if(window.opera){
-  Array.prototype.concat = function(){
-    var array = [];
-    for(var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for(var i = 0, length = arguments.length; i < length; i++) {
-      if(arguments[i].constructor == Array) {
-        for(var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
-          array.push(arguments[i][j]);
-      } else {
-        array.push(arguments[i]);
-      }
-    }
-    return array;
-  }
-}
-var Hash = function(obj) {
-  Object.extend(this, obj || {});
-};
-
-Object.extend(Hash, {
-  toQueryString: function(obj) {
-    var parts = [];
-
-	  this.prototype._each.call(obj, function(pair) {
-      if (!pair.key) return;
-
-      if (pair.value && pair.value.constructor == Array) {
-        var values = pair.value.compact();
-        if (values.length < 2) pair.value = values.reduce();
-        else {
-        	key = encodeURIComponent(pair.key);
-          values.each(function(value) {
-            value = value != undefined ? encodeURIComponent(value) : '';
-            parts.push(key + '=' + encodeURIComponent(value));
-          });
-          return;
-        }
-      }
-      if (pair.value == undefined) pair[1] = '';
-      parts.push(pair.map(encodeURIComponent).join('='));
-	  });
-
-    return parts.join('&');
-  }
-});
-
-Object.extend(Hash.prototype, Enumerable);
-Object.extend(Hash.prototype, {
-  _each: function(iterator) {
-    for (var key in this) {
-      var value = this[key];
-      if (value && value == Hash.prototype[key]) continue;
-
-      var pair = [key, value];
-      pair.key = key;
-      pair.value = value;
-      iterator(pair);
-    }
-  },
-
-  keys: function() {
-    return this.pluck('key');
-  },
-
-  values: function() {
-    return this.pluck('value');
-  },
-
-  merge: function(hash) {
-    return $H(hash).inject(this, function(mergedHash, pair) {
-      mergedHash[pair.key] = pair.value;
-      return mergedHash;
-    });
-  },
-
-  remove: function() {
-    var result;
-    for(var i = 0, length = arguments.length; i < length; i++) {
-      var value = this[arguments[i]];
-      if (value !== undefined){
-        if (result === undefined) result = value;
-        else {
-          if (result.constructor != Array) result = [result];
-          result.push(value)
-        }
-      }
-      delete this[arguments[i]];
-    }
-    return result;
-  },
-
-  toQueryString: function() {
-    return Hash.toQueryString(this);
-  },
-
-  inspect: function() {
-    return '#<Hash:{' + this.map(function(pair) {
-      return pair.map(Object.inspect).join(': ');
-    }).join(', ') + '}>';
-  }
-});
-
-function $H(object) {
-  if (object && object.constructor == Hash) return object;
-  return new Hash(object);
-};
-ObjectRange = Class.create();
-Object.extend(ObjectRange.prototype, Enumerable);
-Object.extend(ObjectRange.prototype, {
-  initialize: function(start, end, exclusive) {
-    this.start = start;
-    this.end = end;
-    this.exclusive = exclusive;
-  },
-
-  _each: function(iterator) {
-    var value = this.start;
-    while (this.include(value)) {
-      iterator(value);
-      value = value.succ();
-    }
-  },
-
-  include: function(value) {
-    if (value < this.start)
-      return false;
-    if (this.exclusive)
-      return value < this.end;
-    return value <= this.end;
-  }
-});
-
-var $R = function(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
-}
-
-var Ajax = {
-  getTransport: function() {
-    return Try.these(
-      function() {return new XMLHttpRequest()},
-      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
-      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
-    ) || false;
-  },
-
-  activeRequestCount: 0
-}
-
-Ajax.Responders = {
-  responders: [],
-
-  _each: function(iterator) {
-    this.responders._each(iterator);
-  },
-
-  register: function(responder) {
-    if (!this.include(responder))
-      this.responders.push(responder);
-  },
-
-  unregister: function(responder) {
-    this.responders = this.responders.without(responder);
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-      if (typeof responder[callback] == 'function') {
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) {}
-      }
-    });
-  }
-};
-
-Object.extend(Ajax.Responders, Enumerable);
-
-Ajax.Responders.register({
-  onCreate: function() {
-    Ajax.activeRequestCount++;
-  },
-  onComplete: function() {
-    Ajax.activeRequestCount--;
-  }
-});
-
-Ajax.Base = function() {};
-Ajax.Base.prototype = {
-  setOptions: function(options) {
-    this.options = {
-      method:       'post',
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-      parameters:   ''
-    }
-    Object.extend(this.options, options || {});
-
-    this.options.method = this.options.method.toLowerCase();
-    if (typeof this.options.parameters == 'string')
-      this.options.parameters = this.options.parameters.toQueryParams();
-  }
-}
-
-Ajax.Request = Class.create();
-Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
-  _complete: false,
-
-  initialize: function(url, options) {
-    this.transport = Ajax.getTransport();
-    this.setOptions(options);
-    this.request(url);
-  },
-
-  request: function(url) {
-    this.url = url;
-    this.method = this.options.method;
-    var params = this.options.parameters;
-
-    if (!['get', 'post'].include(this.method)) {
-      // simulate other verbs over post
-      params['_method'] = this.method;
-      this.method = 'post';
-    }
-
-    params = Hash.toQueryString(params);
-    if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_='
-
-    // when GET, append parameters to URL
-    if (this.method == 'get' && params)
-      this.url += (this.url.indexOf('?') > -1 ? '&' : '?') + params;
-
-    try {
-      Ajax.Responders.dispatch('onCreate', this, this.transport);
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-      if (this.options.asynchronous)
-        setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10);
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-      var body = this.method == 'post' ? (this.options.postBody || params) : null;
-
-      this.transport.send(body);
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-
-    }
-    catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState > 1 && !((readyState == 4) && this._complete))
-      this.respondToReadyState(this.transport.readyState);
-  },
-
-  setRequestHeaders: function() {
-    var headers = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'X-Prototype-Version': Prototype.Version,
-      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-    };
-
-    if (this.method == 'post') {
-      headers['Content-type'] = this.options.contentType +
-        (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-      /* Force "Connection: close" for older Mozilla browsers to work
-       * around a bug where XMLHttpRequest sends an incorrect
-       * Content-length header. See Mozilla Bugzilla #246651.
-       */
-      if (this.transport.overrideMimeType &&
-          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-            headers['Connection'] = 'close';
-    }
-
-    // user-defined headers
-    if (typeof this.options.requestHeaders == 'object') {
-      var extras = this.options.requestHeaders;
-
-      if (typeof extras.push == 'function')
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
-      else
-        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-    }
-
-    for (var name in headers)
-      this.transport.setRequestHeader(name, headers[name]);
-  },
-
-  success: function() {
-    return !this.transport.status
-        || (this.transport.status >= 200 && this.transport.status < 300);
-  },
-
-  respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState];
-    var transport = this.transport, json = this.evalJSON();
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-        (this.options['on' + this.transport.status]
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(transport, json);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      if ((this.getHeader('Content-type') || 'text/javascript').strip().
-        match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
-          this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + state] || Prototype.emptyFunction)(transport, json);
-      Ajax.Responders.dispatch('on' + state, this, transport, json);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    if (state == 'Complete') {
-      // avoid memory leak in MSIE: clean up
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-    }
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name);
-    } catch (e) { return null }
-  },
-
-  evalJSON: function() {
-    try {
-      var json = this.getHeader('X-JSON');
-      return json ? eval('(' + json + ')') : null;
-    } catch (e) { return null }
-  },
-
-  evalResponse: function() {
-    try {
-      return eval(this.transport.responseText);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
-    Ajax.Responders.dispatch('onException', this, exception);
-  }
-});
-
-Ajax.Updater = Class.create();
-
-Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
-  initialize: function(container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-    }
-
-    this.transport = Ajax.getTransport();
-    this.setOptions(options);
-
-    var onComplete = this.options.onComplete || Prototype.emptyFunction;
-    this.options.onComplete = (function(transport, param) {
-      this.updateContent();
-      onComplete(transport, param);
-    }).bind(this);
-
-    this.request(url);
-  },
-
-  updateContent: function() {
-    var receiver = this.container[this.success() ? 'success' : 'failure'];
-    var response = this.transport.responseText;
-
-    if (!this.options.evalScripts) response = response.stripScripts();
-
-    if (receiver = $(receiver)) {
-      if (this.options.insertion)
-        new this.options.insertion(receiver, response);
-      else
-        receiver.update(response);
-    }
-
-    if (this.success()) {
-      if (this.onComplete)
-        setTimeout(this.onComplete.bind(this), 10);
-    }
-  }
-});
-
-Ajax.PeriodicalUpdater = Class.create();
-Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
-  initialize: function(container, url, options) {
-    this.setOptions(options);
-    this.onComplete = this.options.onComplete;
-
-    this.frequency = (this.options.frequency || 2);
-    this.decay = (this.options.decay || 1);
-
-    this.updater = {};
-    this.container = container;
-    this.url = url;
-
-    this.start();
-  },
-
-  start: function() {
-    this.options.onComplete = this.updateComplete.bind(this);
-    this.onTimerEvent();
-  },
-
-  stop: function() {
-    this.updater.options.onComplete = undefined;
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
-  },
-
-  updateComplete: function(request) {
-    if (this.options.decay) {
-      this.decay = (request.responseText == this.lastText ?
-        this.decay * this.options.decay : 1);
-
-      this.lastText = request.responseText;
-    }
-    this.timer = setTimeout(this.onTimerEvent.bind(this),
-      this.decay * this.frequency * 1000);
-  },
-
-  onTimerEvent: function() {
-    this.updater = new Ajax.Updater(this.container, this.url, this.options);
-  }
-});
-function $(element) {
-  if (arguments.length > 1) {
-    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-      elements.push($(arguments[i]));
-    return elements;
-  }
-  if (typeof element == 'string')
-    element = document.getElementById(element);
-  return Element.extend(element);
-}
-
-if (Prototype.BrowserFeatures.XPath) {
-  document._getElementsByXPath = function(expression, parentElement) {
-    var results = [];
-    var query = document.evaluate(expression, $(parentElement) || document,
-      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (var i = 0, length = query.snapshotLength; i < length; i++)
-      results.push(query.snapshotItem(i));
-    return results;
-  };
-}
-
-document.getElementsByClassName = function(className, parentElement) {
-  if (Prototype.BrowserFeatures.XPath) {
-    var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
-    return document._getElementsByXPath(q, parentElement);
-  } else {
-    var children = ($(parentElement) || document.body).getElementsByTagName('*');
-    var elements = [], child;
-    for (var i = 0, length = children.length; i < length; i++) {
-      child = children[i];
-      if (Element.hasClassName(child, className))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-if (!window.Element)
-  var Element = new Object();
-
-Element.extend = function(element) {
-  if (!element || _nativeExtensions || element.nodeType == 3) return element;
-
-  if (!element._extended && element.tagName && element != window) {
-    var methods = Object.clone(Element.Methods), cache = Element.extend.cache;
-
-    if (element.tagName == 'FORM')
-      Object.extend(methods, Form.Methods);
-    if (['INPUT', 'TEXTAREA', 'SELECT'].include(element.tagName))
-      Object.extend(methods, Form.Element.Methods);
-
-    Object.extend(methods, Element.Methods.Simulated);
-
-    for (var property in methods) {
-      var value = methods[property];
-      if (typeof value == 'function' && !(property in element))
-        element[property] = cache.findOrStore(value);
-    }
-  }
-
-  element._extended = true;
-  return element;
-};
-
-Element.extend.cache = {
-  findOrStore: function(value) {
-    return this[value] = this[value] || function() {
-      return value.apply(null, [this].concat($A(arguments)));
-    }
-  }
-};
-
-Element.Methods = {
-  visible: function(element) {
-    return $(element).style.display != 'none';
-  },
-
-  toggle: function(element) {
-    element = $(element);
-    Element[Element.visible(element) ? 'hide' : 'show'](element);
-    return element;
-  },
-
-  hide: function(element) {
-    $(element).style.display = 'none';
-    return element;
-  },
-
-  show: function(element) {
-    $(element).style.display = '';
-    return element;
-  },
-
-  remove: function(element) {
-    element = $(element);
-    element.parentNode.removeChild(element);
-    return element;
-  },
-
-  update: function(element, html) {
-    html = typeof html == 'undefined' ? '' : html.toString();
-    $(element).innerHTML = html.stripScripts();
-    setTimeout(function() {html.evalScripts()}, 10);
-    return element;
-  },
-
-  replace: function(element, html) {
-    element = $(element);
-    html = typeof html == 'undefined' ? '' : html.toString();
-    if (element.outerHTML) {
-      element.outerHTML = html.stripScripts();
-    } else {
-      var range = element.ownerDocument.createRange();
-      range.selectNodeContents(element);
-      element.parentNode.replaceChild(
-        range.createContextualFragment(html.stripScripts()), element);
-    }
-    setTimeout(function() {html.evalScripts()}, 10);
-    return element;
-  },
-
-  inspect: function(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
-    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
-      var property = pair.first(), attribute = pair.last();
-      var value = (element[property] || '').toString();
-      if (value) result += ' ' + attribute + '=' + value.inspect(true);
-    });
-    return result + '>';
-  },
-
-  recursivelyCollect: function(element, property) {
-    element = $(element);
-    var elements = [];
-    while (element = element[property])
-      if (element.nodeType == 1)
-        elements.push(Element.extend(element));
-    return elements;
-  },
-
-  ancestors: function(element) {
-    return $(element).recursivelyCollect('parentNode');
-  },
-
-  descendants: function(element) {
-    return $A($(element).getElementsByTagName('*'));
-  },
-
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
-  },
-
-  previousSiblings: function(element) {
-    return $(element).recursivelyCollect('previousSibling');
-  },
-
-  nextSiblings: function(element) {
-    return $(element).recursivelyCollect('nextSibling');
-  },
-
-  siblings: function(element) {
-    element = $(element);
-    return element.previousSiblings().reverse().concat(element.nextSiblings());
-  },
-
-  match: function(element, selector) {
-    if (typeof selector == 'string')
-      selector = new Selector(selector);
-    return selector.match($(element));
-  },
-
-  up: function(element, expression, index) {
-    return Selector.findElement($(element).ancestors(), expression, index);
-  },
-
-  down: function(element, expression, index) {
-    return Selector.findElement($(element).descendants(), expression, index);
-  },
-
-  previous: function(element, expression, index) {
-    return Selector.findElement($(element).previousSiblings(), expression, index);
-  },
-
-  next: function(element, expression, index) {
-    return Selector.findElement($(element).nextSiblings(), expression, index);
-  },
-
-  getElementsBySelector: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element, args);
-  },
-
-  getElementsByClassName: function(element, className) {
-    return document.getElementsByClassName(className, element);
-  },
-
-  readAttribute: function(element, name) {
-    element = $(element);
-    if (document.all && !window.opera) {
-      var t = Element._attributeTranslations;
-      if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name])  name = t.names[name];
-      var attribute = element.attributes[name];
-      if(attribute) return attribute.nodeValue;
-    }
-    return element.getAttribute(name);
-  },
-
-  getHeight: function(element) {
-    return $(element).getDimensions().height;
-  },
-
-  getWidth: function(element) {
-    return $(element).getDimensions().width;
-  },
-
-  classNames: function(element) {
-    return new Element.ClassNames(element);
-  },
-
-  hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    var elementClassName = element.className;
-    if (elementClassName.length == 0) return false;
-    if (elementClassName == className ||
-        elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
-      return true;
-    return false;
-  },
-
-  addClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    Element.classNames(element).add(className);
-    return element;
-  },
-
-  removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    Element.classNames(element).remove(className);
-    return element;
-  },
-
-  toggleClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
-    return element;
-  },
-
-  observe: function() {
-    Event.observe.apply(Event, arguments);
-    return $A(arguments).first();
-  },
-
-  stopObserving: function() {
-    Event.stopObserving.apply(Event, arguments);
-    return $A(arguments).first();
-  },
-
-  // removes whitespace-only text node children
-  cleanWhitespace: function(element) {
-    element = $(element);
-    var node = element.firstChild;
-    while (node) {
-      var nextNode = node.nextSibling;
-      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
-        element.removeChild(node);
-      node = nextNode;
-    }
-    return element;
-  },
-
-  empty: function(element) {
-    return $(element).innerHTML.match(/^\s*$/);
-  },
-
-  descendantOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-    while (element = element.parentNode)
-      if (element == ancestor) return true;
-    return false;
-  },
-
-  scrollTo: function(element) {
-    element = $(element);
-    var pos = Position.cumulativeOffset(element);
-    window.scrollTo(pos[0], pos[1]);
-    return element;
-  },
-
-  getStyle: function(element, style) {
-    element = $(element);
-    if (['float','cssFloat'].include(style))
-      style = (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat');
-    style = style.camelize();
-    var value = element.style[style];
-    if (!value) {
-      if (document.defaultView && document.defaultView.getComputedStyle) {
-        var css = document.defaultView.getComputedStyle(element, null);
-        value = css ? css[style] : null;
-      } else if (element.currentStyle) {
-        value = element.currentStyle[style];
-      }
-    }
-
-    if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
-      value = element['offset'+style.capitalize()] + 'px';
-
-    if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
-      if (Element.getStyle(element, 'position') == 'static') value = 'auto';
-    if(style == 'opacity') {
-      if(value) return parseFloat(value);
-      if(value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if(value[1]) return parseFloat(value[1]) / 100;
-      return 1.0;
-    }
-    return value == 'auto' ? null : value;
-  },
-
-  setStyle: function(element, style) {
-    element = $(element);
-    for (var name in style) {
-      var value = style[name];
-      if(name == 'opacity') {
-        if (value == 1) {
-          value = (/Gecko/.test(navigator.userAgent) &&
-            !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0;
-          if(/MSIE/.test(navigator.userAgent) && !window.opera)
-            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
-        } else if(value == '') {
-          if(/MSIE/.test(navigator.userAgent) && !window.opera)
-            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
-        } else {
-          if(value < 0.00001) value = 0;
-          if(/MSIE/.test(navigator.userAgent) && !window.opera)
-            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
-              'alpha(opacity='+value*100+')';
-        }
-      } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat';
-      element.style[name.camelize()] = value;
-    }
-    return element;
-  },
-
-  getDimensions: function(element) {
-    element = $(element);
-    var display = $(element).getStyle('display');
-    if (display != 'none' && display != null) // Safari bug
-      return {width: element.offsetWidth, height: element.offsetHeight};
-
-    // All *Width and *Height properties give 0 on elements with display none,
-    // so enable the element temporarily
-    var els = element.style;
-    var originalVisibility = els.visibility;
-    var originalPosition = els.position;
-    var originalDisplay = els.display;
-    els.visibility = 'hidden';
-    els.position = 'absolute';
-    els.display = 'block';
-    var originalWidth = element.clientWidth;
-    var originalHeight = element.clientHeight;
-    els.display = originalDisplay;
-    els.position = originalPosition;
-    els.visibility = originalVisibility;
-    return {width: originalWidth, height: originalHeight};
-  },
-
-  makePositioned: function(element) {
-    element = $(element);
-    var pos = Element.getStyle(element, 'position');
-    if (pos == 'static' || !pos) {
-      element._madePositioned = true;
-      element.style.position = 'relative';
-      // Opera returns the offset relative to the positioning context, when an
-      // element is position relative but top and left have not been defined
-      if (window.opera) {
-        element.style.top = 0;
-        element.style.left = 0;
-      }
-    }
-    return element;
-  },
-
-  undoPositioned: function(element) {
-    element = $(element);
-    if (element._madePositioned) {
-      element._madePositioned = undefined;
-      element.style.position =
-        element.style.top =
-        element.style.left =
-        element.style.bottom =
-        element.style.right = '';
-    }
-    return element;
-  },
-
-  makeClipping: function(element) {
-    element = $(element);
-    if (element._overflow) return element;
-    element._overflow = element.style.overflow || 'auto';
-    if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
-      element.style.overflow = 'hidden';
-    return element;
-  },
-
-  undoClipping: function(element) {
-    element = $(element);
-    if (!element._overflow) return element;
-    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
-    element._overflow = null;
-    return element;
-  }
-};
-
-Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
-
-Element._attributeTranslations = {};
-
-Element._attributeTranslations.names = {
-  colspan:   "colSpan",
-  rowspan:   "rowSpan",
-  valign:    "vAlign",
-  datetime:  "dateTime",
-  accesskey: "accessKey",
-  tabindex:  "tabIndex",
-  enctype:   "encType",
-  maxlength: "maxLength",
-  readonly:  "readOnly",
-  longdesc:  "longDesc"
-};
-
-Element._attributeTranslations.values = {
-  _getAttr: function(element, attribute) {
-    return element.getAttribute(attribute, 2);
-  },
-
-  _flag: function(element, attribute) {
-    return $(element).hasAttribute(attribute) ? attribute : null;
-  },
-
-  style: function(element) {
-    return element.style.cssText.toLowerCase();
-  },
-
-  title: function(element) {
-    var node = element.getAttributeNode('title');
-    return node.specified ? node.nodeValue : null;
-  }
-};
-
-Object.extend(Element._attributeTranslations.values, {
-  href: Element._attributeTranslations.values._getAttr,
-  src:  Element._attributeTranslations.values._getAttr,
-  disabled: Element._attributeTranslations.values._flag,
-  checked:  Element._attributeTranslations.values._flag,
-  readonly: Element._attributeTranslations.values._flag,
-  multiple: Element._attributeTranslations.values._flag
-});
-
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-    var t = Element._attributeTranslations;
-    attribute = t.names[attribute] || attribute;
-    return $(element).getAttributeNode(attribute).specified;
-  }
-};
-
-// IE is missing .innerHTML support for TABLE-related elements
-if (document.all && !window.opera){
-  Element.Methods.update = function(element, html) {
-    element = $(element);
-    html = typeof html == 'undefined' ? '' : html.toString();
-    var tagName = element.tagName.toUpperCase();
-    if (['THEAD','TBODY','TR','TD'].include(tagName)) {
-      var div = document.createElement('div');
-      switch (tagName) {
-        case 'THEAD':
-        case 'TBODY':
-          div.innerHTML = '<table><tbody>' +  html.stripScripts() + '</tbody></table>';
-          depth = 2;
-          break;
-        case 'TR':
-          div.innerHTML = '<table><tbody><tr>' +  html.stripScripts() + '</tr></tbody></table>';
-          depth = 3;
-          break;
-        case 'TD':
-          div.innerHTML = '<table><tbody><tr><td>' +  html.stripScripts() + '</td></tr></tbody></table>';
-          depth = 4;
-      }
-      $A(element.childNodes).each(function(node){
-        element.removeChild(node)
-      });
-      depth.times(function(){ div = div.firstChild });
-
-      $A(div.childNodes).each(
-        function(node){ element.appendChild(node) });
-    } else {
-      element.innerHTML = html.stripScripts();
-    }
-    setTimeout(function() {html.evalScripts()}, 10);
-    return element;
-  }
-};
-
-Object.extend(Element, Element.Methods);
-
-var _nativeExtensions = false;
-
-if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-  ['', 'Form', 'Input', 'TextArea', 'Select'].each(function(tag) {
-    var className = 'HTML' + tag + 'Element';
-    if(window[className]) return;
-    var klass = window[className] = {};
-    klass.prototype = document.createElement(tag ? tag.toLowerCase() : 'div').__proto__;
-  });
-
-Element.addMethods = function(methods) {
-  Object.extend(Element.Methods, methods || {});
-
-  function copy(methods, destination, onlyIfAbsent) {
-    onlyIfAbsent = onlyIfAbsent || false;
-    var cache = Element.extend.cache;
-    for (var property in methods) {
-      var value = methods[property];
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = cache.findOrStore(value);
-    }
-  }
-
-  if (typeof HTMLElement != 'undefined') {
-    copy(Element.Methods, HTMLElement.prototype);
-    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-    copy(Form.Methods, HTMLFormElement.prototype);
-    [HTMLInputElement, HTMLTextAreaElement, HTMLSelectElement].each(function(klass) {
-      copy(Form.Element.Methods, klass.prototype);
-    });
-    _nativeExtensions = true;
-  }
-}
-
-var Toggle = new Object();
-Toggle.display = Element.toggle;
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.Insertion = function(adjacency) {
-  this.adjacency = adjacency;
-}
-
-Abstract.Insertion.prototype = {
-  initialize: function(element, content) {
-    this.element = $(element);
-    this.content = content.stripScripts();
-
-    if (this.adjacency && this.element.insertAdjacentHTML) {
-      try {
-        this.element.insertAdjacentHTML(this.adjacency, this.content);
-      } catch (e) {
-        var tagName = this.element.tagName.toUpperCase();
-        if (['TBODY', 'TR'].include(tagName)) {
-          this.insertContent(this.contentFromAnonymousTable());
-        } else {
-          throw e;
-        }
-      }
-    } else {
-      this.range = this.element.ownerDocument.createRange();
-      if (this.initializeRange) this.initializeRange();
-      this.insertContent([this.range.createContextualFragment(this.content)]);
-    }
-
-    setTimeout(function() {content.evalScripts()}, 10);
-  },
-
-  contentFromAnonymousTable: function() {
-    var div = document.createElement('div');
-    div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
-    return $A(div.childNodes[0].childNodes[0].childNodes);
-  }
-}
-
-var Insertion = new Object();
-
-Insertion.Before = Class.create();
-Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
-  initializeRange: function() {
-    this.range.setStartBefore(this.element);
-  },
-
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment, this.element);
-    }).bind(this));
-  }
-});
-
-Insertion.Top = Class.create();
-Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(true);
-  },
-
-  insertContent: function(fragments) {
-    fragments.reverse(false).each((function(fragment) {
-      this.element.insertBefore(fragment, this.element.firstChild);
-    }).bind(this));
-  }
-});
-
-Insertion.Bottom = Class.create();
-Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(this.element);
-  },
-
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.appendChild(fragment);
-    }).bind(this));
-  }
-});
-
-Insertion.After = Class.create();
-Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
-  initializeRange: function() {
-    this.range.setStartAfter(this.element);
-  },
-
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment,
-        this.element.nextSibling);
-    }).bind(this));
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Element.ClassNames = Class.create();
-Element.ClassNames.prototype = {
-  initialize: function(element) {
-    this.element = $(element);
-  },
-
-  _each: function(iterator) {
-    this.element.className.split(/\s+/).select(function(name) {
-      return name.length > 0;
-    })._each(iterator);
-  },
-
-  set: function(className) {
-    this.element.className = className;
-  },
-
-  add: function(classNameToAdd) {
-    if (this.include(classNameToAdd)) return;
-    this.set($A(this).concat(classNameToAdd).join(' '));
-  },
-
-  remove: function(classNameToRemove) {
-    if (!this.include(classNameToRemove)) return;
-    this.set($A(this).without(classNameToRemove).join(' '));
-  },
-
-  toString: function() {
-    return $A(this).join(' ');
-  }
-};
-
-Object.extend(Element.ClassNames.prototype, Enumerable);
-var Selector = Class.create();
-Selector.prototype = {
-  initialize: function(expression) {
-    this.params = {classNames: []};
-    this.expression = expression.toString().strip();
-    this.parseExpression();
-    this.compileMatcher();
-  },
-
-  parseExpression: function() {
-    function abort(message) { throw 'Parse error in selector: ' + message; }
-
-    if (this.expression == '')  abort('empty expression');
-
-    var params = this.params, expr = this.expression, match, modifier, clause, rest;
-    while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) {
-      params.attributes = params.attributes || [];
-      params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''});
-      expr = match[1];
-    }
-
-    if (expr == '*') return this.params.wildcard = true;
-
-    while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) {
-      modifier = match[1], clause = match[2], rest = match[3];
-      switch (modifier) {
-        case '#':       params.id = clause; break;
-        case '.':       params.classNames.push(clause); break;
-        case '':
-        case undefined: params.tagName = clause.toUpperCase(); break;
-        default:        abort(expr.inspect());
-      }
-      expr = rest;
-    }
-
-    if (expr.length > 0) abort(expr.inspect());
-  },
-
-  buildMatchExpression: function() {
-    var params = this.params, conditions = [], clause;
-
-    if (params.wildcard)
-      conditions.push('true');
-    if (clause = params.id)
-      conditions.push('element.readAttribute("id") == ' + clause.inspect());
-    if (clause = params.tagName)
-      conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
-    if ((clause = params.classNames).length > 0)
-      for (var i = 0, length = clause.length; i < length; i++)
-        conditions.push('element.hasClassName(' + clause[i].inspect() + ')');
-    if (clause = params.attributes) {
-      clause.each(function(attribute) {
-        var value = 'element.readAttribute(' + attribute.name.inspect() + ')';
-        var splitValueBy = function(delimiter) {
-          return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
-        }
-
-        switch (attribute.operator) {
-          case '=':       conditions.push(value + ' == ' + attribute.value.inspect()); break;
-          case '~=':      conditions.push(splitValueBy(' ') + '.include(' + attribute.value.inspect() + ')'); break;
-          case '|=':      conditions.push(
-                            splitValueBy('-') + '.first().toUpperCase() == ' + attribute.value.toUpperCase().inspect()
-                          ); break;
-          case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
-          case '':
-          case undefined: conditions.push('element.hasAttribute(' + attribute.name.inspect() + ')'); break;
-          default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
-        }
-      });
-    }
-
-    return conditions.join(' && ');
-  },
-
-  compileMatcher: function() {
-    this.match = new Function('element', 'if (!element.tagName) return false; \
-      element = $(element); \
-      return ' + this.buildMatchExpression());
-  },
-
-  findElements: function(scope) {
-    var element;
-
-    if (element = $(this.params.id))
-      if (this.match(element))
-        if (!scope || Element.childOf(element, scope))
-          return [element];
-
-    scope = (scope || document).getElementsByTagName(this.params.tagName || '*');
-
-    var results = [];
-    for (var i = 0, length = scope.length; i < length; i++)
-      if (this.match(element = scope[i]))
-        results.push(Element.extend(element));
-
-    return results;
-  },
-
-  toString: function() {
-    return this.expression;
-  }
-}
-
-Object.extend(Selector, {
-  matchElements: function(elements, expression) {
-    var selector = new Selector(expression);
-    return elements.select(selector.match.bind(selector)).map(Element.extend);
-  },
-
-  findElement: function(elements, expression, index) {
-    if (typeof expression == 'number') index = expression, expression = false;
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    return expressions.map(function(expression) {
-      return expression.match(/[^\s"]+(?:"[^"]*"[^\s"]+)*/g).inject([null], function(results, expr) {
-        var selector = new Selector(expr);
-        return results.inject([], function(elements, result) {
-          return elements.concat(selector.findElements(result || element));
-        });
-      });
-    }).flatten();
-  }
-});
-
-function $$() {
-  return Selector.findChildElements(document, $A(arguments));
-}
-var Form = {
-  reset: function(form) {
-    $(form).reset();
-    return form;
-  },
-
-  serializeElements: function(elements, getHash) {
-    var data = elements.inject({}, function(result, element) {
-      if (!element.disabled && element.name) {
-        var key = element.name, value = $(element).getValue();
-        if (value != undefined) {
-          if (result[key]) {
-            if (result[key].constructor != Array) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
-        }
-      }
-      return result;
-    });
-
-    return getHash ? data : Hash.toQueryString(data);
-  }
-};
-
-Form.Methods = {
-  serialize: function(form, getHash) {
-    return Form.serializeElements(Form.getElements(form), getHash);
-  },
-
-  getElements: function(form) {
-    return $A($(form).getElementsByTagName('*')).inject([],
-      function(elements, child) {
-        if (Form.Element.Serializers[child.tagName.toLowerCase()])
-          elements.push(Element.extend(child));
-        return elements;
-      }
-    );
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    form.getElements().each(function(element) {
-      element.blur();
-      element.disabled = 'true';
-    });
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    form.getElements().each(function(element) {
-      element.disabled = '';
-    });
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    return $(form).getElements().find(function(element) {
-      return element.type != 'hidden' && !element.disabled &&
-        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    form.findFirstElement().activate();
-    return form;
-  }
-}
-
-Object.extend(Form, Form.Methods);
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
-}
-
-Form.Element.Methods = {
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = {};
-        pair[element.name] = value;
-        return Hash.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    element.focus();
-    if (element.select && ( element.tagName.toLowerCase() != 'input' ||
-      !['button', 'reset', 'submit'].include(element.type) ) )
-      element.select();
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.blur();
-    element.disabled = false;
-    return element;
-  }
-}
-
-Object.extend(Form.Element, Form.Element.Methods);
-var Field = Form.Element;
-var $F = Form.Element.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element.Serializers = {
-  input: function(element) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return Form.Element.Serializers.inputSelector(element);
-      default:
-        return Form.Element.Serializers.textarea(element);
-    }
-  },
-
-  inputSelector: function(element) {
-    return element.checked ? element.value : null;
-  },
-
-  textarea: function(element) {
-    return element.value;
-  },
-
-  select: function(element) {
-    return this[element.type == 'select-one' ?
-      'selectOne' : 'selectMany'](element);
-  },
-
-  selectOne: function(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
-
-  selectMany: function(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
-    }
-    return values;
-  },
-
-  optionValue: function(opt) {
-    // extend element because hasAttribute may not be native
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
-  }
-}
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.TimedObserver = function() {}
-Abstract.TimedObserver.prototype = {
-  initialize: function(element, frequency, callback) {
-    this.frequency = frequency;
-    this.element   = $(element);
-    this.callback  = callback;
-
-    this.lastValue = this.getValue();
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  onTimerEvent: function() {
-    var value = this.getValue();
-    var changed = ('string' == typeof this.lastValue && 'string' == typeof value
-      ? this.lastValue != value : String(this.lastValue) != String(value));
-    if (changed) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
-}
-
-Form.Element.Observer = Class.create();
-Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.Observer = Class.create();
-Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = function() {}
-Abstract.EventObserver.prototype = {
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback.bind(this));
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
-}
-
-Form.Element.EventObserver = Class.create();
-Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.EventObserver = Class.create();
-Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-if (!window.Event) {
-  var Event = new Object();
-}
-
-Object.extend(Event, {
-  KEY_BACKSPACE: 8,
-  KEY_TAB:       9,
-  KEY_RETURN:   13,
-  KEY_ESC:      27,
-  KEY_LEFT:     37,
-  KEY_UP:       38,
-  KEY_RIGHT:    39,
-  KEY_DOWN:     40,
-  KEY_DELETE:   46,
-  KEY_HOME:     36,
-  KEY_END:      35,
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-
-  element: function(event) {
-    return event.target || event.srcElement;
-  },
-
-  isLeftClick: function(event) {
-    return (((event.which) && (event.which == 1)) ||
-            ((event.button) && (event.button == 1)));
-  },
-
-  pointerX: function(event) {
-    return event.pageX || (event.clientX +
-      (document.documentElement.scrollLeft || document.body.scrollLeft));
-  },
-
-  pointerY: function(event) {
-    return event.pageY || (event.clientY +
-      (document.documentElement.scrollTop || document.body.scrollTop));
-  },
-
-  stop: function(event) {
-    if (event.preventDefault) {
-      event.preventDefault();
-      event.stopPropagation();
-    } else {
-      event.returnValue = false;
-      event.cancelBubble = true;
-    }
-  },
-
-  // find the first node with the given tagName, starting from the
-  // node the event was triggered on; traverses the DOM upwards
-  findElement: function(event, tagName) {
-    var element = Event.element(event);
-    while (element.parentNode && (!element.tagName ||
-        (element.tagName.toUpperCase() != tagName.toUpperCase())))
-      element = element.parentNode;
-    return element;
-  },
-
-  observers: false,
-
-  _observeAndCache: function(element, name, observer, useCapture) {
-    if (!this.observers) this.observers = [];
-    if (element.addEventListener) {
-      this.observers.push([element, name, observer, useCapture]);
-      element.addEventListener(name, observer, useCapture);
-    } else if (element.attachEvent) {
-      this.observers.push([element, name, observer, useCapture]);
-      element.attachEvent('on' + name, observer);
-    }
-  },
-
-  unloadCache: function() {
-    if (!Event.observers) return;
-    for (var i = 0, length = Event.observers.length; i < length; i++) {
-      Event.stopObserving.apply(this, Event.observers[i]);
-      Event.observers[i][0] = null;
-    }
-    Event.observers = false;
-  },
-
-  observe: function(element, name, observer, useCapture) {
-    element = $(element);
-    useCapture = useCapture || false;
-
-    if (name == 'keypress' &&
-        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
-        || element.attachEvent))
-      name = 'keydown';
-
-    Event._observeAndCache(element, name, observer, useCapture);
-  },
-
-  stopObserving: function(element, name, observer, useCapture) {
-    element = $(element);
-    useCapture = useCapture || false;
-
-    if (name == 'keypress' &&
-        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
-        || element.detachEvent))
-      name = 'keydown';
-
-    if (element.removeEventListener) {
-      element.removeEventListener(name, observer, useCapture);
-    } else if (element.detachEvent) {
-      try {
-        element.detachEvent('on' + name, observer);
-      } catch (e) {}
-    }
-  }
-});
-
-/* prevent memory leaks in IE */
-if (navigator.appVersion.match(/\bMSIE\b/))
-  Event.observe(window, 'unload', Event.unloadCache, false);
-var Position = {
-  // set to true if needed, warning: firefox performance problems
-  // NOT neeeded for page scrolling, only if draggable contained in
-  // scrollable elements
-  includeScrollOffsets: false,
-
-  // must be called before calling withinIncludingScrolloffset, every time the
-  // page is scrolled
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  realOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if(element.tagName=='BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p == 'relative' || p == 'absolute') break;
-      }
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  offsetParent: function(element) {
-    if (element.offsetParent) return element.offsetParent;
-    if (element == document.body) return element;
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return element;
-
-    return document.body;
-  },
-
-  // caches x/y coordinate pair to use with overlap
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = this.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = this.realOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = this.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  // within must be called directly before
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-  page: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      // Safari fix
-      if (element.offsetParent==document.body)
-        if (Element.getStyle(element,'position')=='absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!window.opera || element.tagName=='BODY') {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return [valueL, valueT];
-  },
-
-  clone: function(source, target) {
-    var options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, arguments[2] || {})
-
-    // find page position of source
-    source = $(source);
-    var p = Position.page(source);
-
-    // find coordinate system to use
-    target = $(target);
-    var delta = [0, 0];
-    var parent = null;
-    // delta [0,0] will do fine with position: fixed elements,
-    // position:absolute needs offsetParent deltas
-    if (Element.getStyle(target,'position') == 'absolute') {
-      parent = Position.offsetParent(target);
-      delta = Position.page(parent);
-    }
-
-    // correct by body offsets (fixes Safari)
-    if (parent == document.body) {
-      delta[0] -= document.body.offsetLeft;
-      delta[1] -= document.body.offsetTop;
-    }
-
-    // set position
-    if(options.setLeft)   target.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if(options.setTop)    target.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
-    if(options.setWidth)  target.style.width = source.offsetWidth + 'px';
-    if(options.setHeight) target.style.height = source.offsetHeight + 'px';
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (element.style.position == 'absolute') return;
-    Position.prepare();
-
-    var offsets = Position.positionedOffset(element);
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (element.style.position == 'relative') return;
-    Position.prepare();
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-  }
-}
-
-// Safari returns margins on body which is incorrect if the child is absolutely
-// positioned.  For performance reasons, redefine Position.cumulativeOffset for
-// KHTML/WebKit only.
-if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
-  Position.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return [valueL, valueT];
-  }
-}
-
-Element.addMethods();
-
-
-// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-
-// The rest of this file is the actual ray tracer written by Adam
-// Burmister. It's a concatenation of the following files:
-//
-//   flog/color.js
-//   flog/light.js
-//   flog/vector.js
-//   flog/ray.js
-//   flog/scene.js
-//   flog/material/basematerial.js
-//   flog/material/solid.js
-//   flog/material/chessboard.js
-//   flog/shape/baseshape.js
-//   flog/shape/sphere.js
-//   flog/shape/plane.js
-//   flog/intersectioninfo.js
-//   flog/camera.js
-//   flog/background.js
-//   flog/engine.js
-
-
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Color = Class.create();
-
-Flog.RayTracer.Color.prototype = {
-    red : 0.0,
-    green : 0.0,
-    blue : 0.0,
-
-    initialize : function(r, g, b) {
-        if(!r) r = 0.0;
-        if(!g) g = 0.0;
-        if(!b) b = 0.0;
-
-        this.red = r;
-        this.green = g;
-        this.blue = b;
-    },
-
-    add : function(c1, c2){
-        var result = new Flog.RayTracer.Color(0,0,0);
-
-        result.red = c1.red + c2.red;
-        result.green = c1.green + c2.green;
-        result.blue = c1.blue + c2.blue;
-
-        return result;
-    },
-
-    addScalar: function(c1, s){
-        var result = new Flog.RayTracer.Color(0,0,0);
-
-        result.red = c1.red + s;
-        result.green = c1.green + s;
-        result.blue = c1.blue + s;
-
-        result.limit();
-
-        return result;
-    },
-
-    subtract: function(c1, c2){
-        var result = new Flog.RayTracer.Color(0,0,0);
-
-        result.red = c1.red - c2.red;
-        result.green = c1.green - c2.green;
-        result.blue = c1.blue - c2.blue;
-
-        return result;
-    },
-
-    multiply : function(c1, c2) {
-        var result = new Flog.RayTracer.Color(0,0,0);
-
-        result.red = c1.red * c2.red;
-        result.green = c1.green * c2.green;
-        result.blue = c1.blue * c2.blue;
-
-        return result;
-    },
-
-    multiplyScalar : function(c1, f) {
-        var result = new Flog.RayTracer.Color(0,0,0);
-
-        result.red = c1.red * f;
-        result.green = c1.green * f;
-        result.blue = c1.blue * f;
-
-        return result;
-    },
-
-    divideFactor : function(c1, f) {
-        var result = new Flog.RayTracer.Color(0,0,0);
-
-        result.red = c1.red / f;
-        result.green = c1.green / f;
-        result.blue = c1.blue / f;
-
-        return result;
-    },
-
-    limit: function(){
-        this.red = (this.red > 0.0) ? ( (this.red > 1.0) ? 1.0 : this.red ) : 0.0;
-        this.green = (this.green > 0.0) ? ( (this.green > 1.0) ? 1.0 : this.green ) : 0.0;
-        this.blue = (this.blue > 0.0) ? ( (this.blue > 1.0) ? 1.0 : this.blue ) : 0.0;
-    },
-
-    distance : function(color) {
-        var d = Math.abs(this.red - color.red) + Math.abs(this.green - color.green) + Math.abs(this.blue - color.blue);
-        return d;
-    },
-
-    blend: function(c1, c2, w){
-        var result = new Flog.RayTracer.Color(0,0,0);
-        result = Flog.RayTracer.Color.prototype.add(
-                    Flog.RayTracer.Color.prototype.multiplyScalar(c1, 1 - w),
-                    Flog.RayTracer.Color.prototype.multiplyScalar(c2, w)
-                  );
-        return result;
-    },
-
-    toString : function () {
-        var r = Math.floor(this.red*255);
-        var g = Math.floor(this.green*255);
-        var b = Math.floor(this.blue*255);
-
-        return "rgb("+ r +","+ g +","+ b +")";
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Light = Class.create();
-
-Flog.RayTracer.Light.prototype = {
-    position: null,
-    color: null,
-    intensity: 10.0,
-
-    initialize : function(pos, color, intensity) {
-        this.position = pos;
-        this.color = color;
-        this.intensity = (intensity ? intensity : 10.0);
-    },
-
-    getIntensity: function(distance){
-        if(distance >= intensity) return 0;
-
-        return Math.pow((intensity - distance) / strength, 0.2);
-    },
-
-    toString : function () {
-        return 'Light [' + this.position.x + ',' + this.position.y + ',' + this.position.z + ']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Vector = Class.create();
-
-Flog.RayTracer.Vector.prototype = {
-    x : 0.0,
-    y : 0.0,
-    z : 0.0,
-
-    initialize : function(x, y, z) {
-        this.x = (x ? x : 0);
-        this.y = (y ? y : 0);
-        this.z = (z ? z : 0);
-    },
-
-    copy: function(vector){
-        this.x = vector.x;
-        this.y = vector.y;
-        this.z = vector.z;
-    },
-
-    normalize : function() {
-        var m = this.magnitude();
-        return new Flog.RayTracer.Vector(this.x / m, this.y / m, this.z / m);
-    },
-
-    magnitude : function() {
-        return Math.sqrt((this.x * this.x) + (this.y * this.y) + (this.z * this.z));
-    },
-
-    cross : function(w) {
-        return new Flog.RayTracer.Vector(
-                                            -this.z * w.y + this.y * w.z,
-                                           this.z * w.x - this.x * w.z,
-                                          -this.y * w.x + this.x * w.y);
-    },
-
-    dot : function(w) {
-        return this.x * w.x + this.y * w.y + this.z * w.z;
-    },
-
-    add : function(v, w) {
-        return new Flog.RayTracer.Vector(w.x + v.x, w.y + v.y, w.z + v.z);
-    },
-
-    subtract : function(v, w) {
-        if(!w || !v) throw 'Vectors must be defined [' + v + ',' + w + ']';
-        return new Flog.RayTracer.Vector(v.x - w.x, v.y - w.y, v.z - w.z);
-    },
-
-    multiplyVector : function(v, w) {
-        return new Flog.RayTracer.Vector(v.x * w.x, v.y * w.y, v.z * w.z);
-    },
-
-    multiplyScalar : function(v, w) {
-        return new Flog.RayTracer.Vector(v.x * w, v.y * w, v.z * w);
-    },
-
-    toString : function () {
-        return 'Vector [' + this.x + ',' + this.y + ',' + this.z + ']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Ray = Class.create();
-
-Flog.RayTracer.Ray.prototype = {
-    position : null,
-    direction : null,
-    initialize : function(pos, dir) {
-        this.position = pos;
-        this.direction = dir;
-    },
-
-    toString : function () {
-        return 'Ray [' + this.position + ',' + this.direction + ']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Scene = Class.create();
-
-Flog.RayTracer.Scene.prototype = {
-    camera : null,
-    shapes : [],
-    lights : [],
-    background : null,
-
-    initialize : function() {
-        this.camera = new Flog.RayTracer.Camera(
-            new Flog.RayTracer.Vector(0,0,-5),
-            new Flog.RayTracer.Vector(0,0,1),
-            new Flog.RayTracer.Vector(0,1,0)
-        );
-        this.shapes = new Array();
-        this.lights = new Array();
-        this.background = new Flog.RayTracer.Background(new Flog.RayTracer.Color(0,0,0.5), 0.2);
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-if(typeof(Flog.RayTracer.Material) == 'undefined') Flog.RayTracer.Material = {};
-
-Flog.RayTracer.Material.BaseMaterial = Class.create();
-
-Flog.RayTracer.Material.BaseMaterial.prototype = {
-
-    gloss: 2.0,             // [0...infinity] 0 = matt
-    transparency: 0.0,      // 0=opaque
-    reflection: 0.0,        // [0...infinity] 0 = no reflection
-    refraction: 0.50,
-    hasTexture: false,
-
-    initialize : function() {
-
-    },
-
-    getColor: function(u, v){
-
-    },
-
-    wrapUp: function(t){
-        t = t % 2.0;
-        if(t < -1) t += 2.0;
-        if(t >= 1) t -= 2.0;
-        return t;
-    },
-
-    toString : function () {
-        return 'Material [gloss=' + this.gloss + ', transparency=' + this.transparency + ', hasTexture=' + this.hasTexture +']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Material.Solid = Class.create();
-
-Flog.RayTracer.Material.Solid.prototype = Object.extend(
-    new Flog.RayTracer.Material.BaseMaterial(), {
-        initialize : function(color, reflection, refraction, transparency, gloss) {
-            this.color = color;
-            this.reflection = reflection;
-            this.transparency = transparency;
-            this.gloss = gloss;
-            this.hasTexture = false;
-        },
-
-        getColor: function(u, v){
-            return this.color;
-        },
-
-        toString : function () {
-            return 'SolidMaterial [gloss=' + this.gloss + ', transparency=' + this.transparency + ', hasTexture=' + this.hasTexture +']';
-        }
-    }
-);
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Material.Chessboard = Class.create();
-
-Flog.RayTracer.Material.Chessboard.prototype = Object.extend(
-    new Flog.RayTracer.Material.BaseMaterial(), {
-        colorEven: null,
-        colorOdd: null,
-        density: 0.5,
-
-        initialize : function(colorEven, colorOdd, reflection, transparency, gloss, density) {
-            this.colorEven = colorEven;
-            this.colorOdd = colorOdd;
-            this.reflection = reflection;
-            this.transparency = transparency;
-            this.gloss = gloss;
-            this.density = density;
-            this.hasTexture = true;
-        },
-
-        getColor: function(u, v){
-            var t = this.wrapUp(u * this.density) * this.wrapUp(v * this.density);
-
-            if(t < 0.0)
-                return this.colorEven;
-            else
-                return this.colorOdd;
-        },
-
-        toString : function () {
-            return 'ChessMaterial [gloss=' + this.gloss + ', transparency=' + this.transparency + ', hasTexture=' + this.hasTexture +']';
-        }
-    }
-);
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-if(typeof(Flog.RayTracer.Shape) == 'undefined') Flog.RayTracer.Shape = {};
-
-Flog.RayTracer.Shape.BaseShape = Class.create();
-
-Flog.RayTracer.Shape.BaseShape.prototype = {
-    position: null,
-    material: null,
-
-    initialize : function() {
-        this.position = new Vector(0,0,0);
-        this.material = new Flog.RayTracer.Material.SolidMaterial(
-            new Flog.RayTracer.Color(1,0,1),
-            0,
-            0,
-            0
-        );
-    },
-
-    toString : function () {
-        return 'Material [gloss=' + this.gloss + ', transparency=' + this.transparency + ', hasTexture=' + this.hasTexture +']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-if(typeof(Flog.RayTracer.Shape) == 'undefined') Flog.RayTracer.Shape = {};
-
-Flog.RayTracer.Shape.Sphere = Class.create();
-
-Flog.RayTracer.Shape.Sphere.prototype = {
-    initialize : function(pos, radius, material) {
-        this.radius = radius;
-        this.position = pos;
-        this.material = material;
-    },
-
-    intersect: function(ray){
-        var info = new Flog.RayTracer.IntersectionInfo();
-        info.shape = this;
-
-        var dst = Flog.RayTracer.Vector.prototype.subtract(ray.position, this.position);
-
-        var B = dst.dot(ray.direction);
-        var C = dst.dot(dst) - (this.radius * this.radius);
-        var D = (B * B) - C;
-
-        if(D > 0){ // intersection!
-            info.isHit = true;
-            info.distance = (-B) - Math.sqrt(D);
-            info.position = Flog.RayTracer.Vector.prototype.add(
-                                                ray.position,
-                                                Flog.RayTracer.Vector.prototype.multiplyScalar(
-                                                    ray.direction,
-                                                    info.distance
-                                                )
-                                            );
-            info.normal = Flog.RayTracer.Vector.prototype.subtract(
-                                            info.position,
-                                            this.position
-                                        ).normalize();
-
-            info.color = this.material.getColor(0,0);
-        } else {
-            info.isHit = false;
-        }
-        return info;
-    },
-
-    toString : function () {
-        return 'Sphere [position=' + this.position + ', radius=' + this.radius + ']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-if(typeof(Flog.RayTracer.Shape) == 'undefined') Flog.RayTracer.Shape = {};
-
-Flog.RayTracer.Shape.Plane = Class.create();
-
-Flog.RayTracer.Shape.Plane.prototype = {
-    d: 0.0,
-
-    initialize : function(pos, d, material) {
-        this.position = pos;
-        this.d = d;
-        this.material = material;
-    },
-
-    intersect: function(ray){
-        var info = new Flog.RayTracer.IntersectionInfo();
-
-        var Vd = this.position.dot(ray.direction);
-        if(Vd == 0) return info; // no intersection
-
-        var t = -(this.position.dot(ray.position) + this.d) / Vd;
-        if(t <= 0) return info;
-
-        info.shape = this;
-        info.isHit = true;
-        info.position = Flog.RayTracer.Vector.prototype.add(
-                                            ray.position,
-                                            Flog.RayTracer.Vector.prototype.multiplyScalar(
-                                                ray.direction,
-                                                t
-                                            )
-                                        );
-        info.normal = this.position;
-        info.distance = t;
-
-        if(this.material.hasTexture){
-            var vU = new Flog.RayTracer.Vector(this.position.y, this.position.z, -this.position.x);
-            var vV = vU.cross(this.position);
-            var u = info.position.dot(vU);
-            var v = info.position.dot(vV);
-            info.color = this.material.getColor(u,v);
-        } else {
-            info.color = this.material.getColor(0,0);
-        }
-
-        return info;
-    },
-
-    toString : function () {
-        return 'Plane [' + this.position + ', d=' + this.d + ']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.IntersectionInfo = Class.create();
-
-Flog.RayTracer.IntersectionInfo.prototype = {
-    isHit: false,
-    hitCount: 0,
-    shape: null,
-    position: null,
-    normal: null,
-    color: null,
-    distance: null,
-
-    initialize : function() {
-        this.color = new Flog.RayTracer.Color(0,0,0);
-    },
-
-    toString : function () {
-        return 'Intersection [' + this.position + ']';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Camera = Class.create();
-
-Flog.RayTracer.Camera.prototype = {
-    position: null,
-    lookAt: null,
-    equator: null,
-    up: null,
-    screen: null,
-
-    initialize : function(pos, lookAt, up) {
-        this.position = pos;
-        this.lookAt = lookAt;
-        this.up = up;
-        this.equator = lookAt.normalize().cross(this.up);
-        this.screen = Flog.RayTracer.Vector.prototype.add(this.position, this.lookAt);
-    },
-
-    getRay: function(vx, vy){
-        var pos = Flog.RayTracer.Vector.prototype.subtract(
-            this.screen,
-            Flog.RayTracer.Vector.prototype.subtract(
-                Flog.RayTracer.Vector.prototype.multiplyScalar(this.equator, vx),
-                Flog.RayTracer.Vector.prototype.multiplyScalar(this.up, vy)
-            )
-        );
-        pos.y = pos.y * -1;
-        var dir = Flog.RayTracer.Vector.prototype.subtract(
-            pos,
-            this.position
-        );
-
-        var ray = new Flog.RayTracer.Ray(pos, dir.normalize());
-
-        return ray;
-    },
-
-    toString : function () {
-        return 'Ray []';
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Background = Class.create();
-
-Flog.RayTracer.Background.prototype = {
-    color : null,
-    ambience : 0.0,
-
-    initialize : function(color, ambience) {
-        this.color = color;
-        this.ambience = ambience;
-    }
-}
-/* Fake a Flog.* namespace */
-if(typeof(Flog) == 'undefined') var Flog = {};
-if(typeof(Flog.RayTracer) == 'undefined') Flog.RayTracer = {};
-
-Flog.RayTracer.Engine = Class.create();
-
-Flog.RayTracer.Engine.prototype = {
-    canvas: null, /* 2d context we can render to */
-
-    initialize: function(options){
-        this.options = Object.extend({
-                canvasHeight: 100,
-                canvasWidth: 100,
-                pixelWidth: 2,
-                pixelHeight: 2,
-                renderDiffuse: false,
-                renderShadows: false,
-                renderHighlights: false,
-                renderReflections: false,
-                rayDepth: 2
-            }, options || {});
-
-        this.options.canvasHeight /= this.options.pixelHeight;
-        this.options.canvasWidth /= this.options.pixelWidth;
-
-        /* TODO: dynamically include other scripts */
-    },
-
-    setPixel: function(x, y, color){
-        var pxW, pxH;
-        pxW = this.options.pixelWidth;
-        pxH = this.options.pixelHeight;
-
-        if (this.canvas) {
-          this.canvas.fillStyle = color.toString();
-          this.canvas.fillRect (x * pxW, y * pxH, pxW, pxH);
-        } else {
-          // print(x * pxW, y * pxH, pxW, pxH);
-        }
-    },
-
-    renderScene: function(scene, canvas){
-        /* Get canvas */
-        if (canvas) {
-          this.canvas = canvas.getContext("2d");
-        } else {
-          this.canvas = null;
-        }
-
-        var canvasHeight = this.options.canvasHeight;
-        var canvasWidth = this.options.canvasWidth;
-
-        for(var y=0; y < canvasHeight; y++){
-            for(var x=0; x < canvasWidth; x++){
-                var yp = y * 1.0 / canvasHeight * 2 - 1;
-          		var xp = x * 1.0 / canvasWidth * 2 - 1;
-
-          		var ray = scene.camera.getRay(xp, yp);
-
-          		var color = this.getPixelColor(ray, scene);
-
-            	this.setPixel(x, y, color);
-            }
-        }
-    },
-
-    getPixelColor: function(ray, scene){
-        var info = this.testIntersection(ray, scene, null);
-        if(info.isHit){
-            var color = this.rayTrace(info, ray, scene, 0);
-            return color;
-        }
-        return scene.background.color;
-    },
-
-    testIntersection: function(ray, scene, exclude){
-        var hits = 0;
-        var best = new Flog.RayTracer.IntersectionInfo();
-        best.distance = 2000;
-
-        for(var i=0; i<scene.shapes.length; i++){
-            var shape = scene.shapes[i];
-
-            if(shape != exclude){
-                var info = shape.intersect(ray);
-                if(info.isHit && info.distance >= 0 && info.distance < best.distance){
-                    best = info;
-                    hits++;
-                }
-            }
-        }
-        best.hitCount = hits;
-        return best;
-    },
-
-    getReflectionRay: function(P,N,V){
-        var c1 = -N.dot(V);
-        var R1 = Flog.RayTracer.Vector.prototype.add(
-            Flog.RayTracer.Vector.prototype.multiplyScalar(N, 2*c1),
-            V
-        );
-        return new Flog.RayTracer.Ray(P, R1);
-    },
-
-    rayTrace: function(info, ray, scene, depth){
-        // Calc ambient
-        var color = Flog.RayTracer.Color.prototype.multiplyScalar(info.color, scene.background.ambience);
-        var oldColor = color;
-        var shininess = Math.pow(10, info.shape.material.gloss + 1);
-
-        for(var i=0; i<scene.lights.length; i++){
-            var light = scene.lights[i];
-
-            // Calc diffuse lighting
-            var v = Flog.RayTracer.Vector.prototype.subtract(
-                                light.position,
-                                info.position
-                            ).normalize();
-
-            if(this.options.renderDiffuse){
-                var L = v.dot(info.normal);
-                if(L > 0.0){
-                    color = Flog.RayTracer.Color.prototype.add(
-                                        color,
-                                        Flog.RayTracer.Color.prototype.multiply(
-                                            info.color,
-                                            Flog.RayTracer.Color.prototype.multiplyScalar(
-                                                light.color,
-                                                L
-                                            )
-                                        )
-                                    );
-                }
-            }
-
-            // The greater the depth the more accurate the colours, but
-            // this is exponentially (!) expensive
-            if(depth <= this.options.rayDepth){
-          // calculate reflection ray
-          if(this.options.renderReflections && info.shape.material.reflection > 0)
-          {
-              var reflectionRay = this.getReflectionRay(info.position, info.normal, ray.direction);
-              var refl = this.testIntersection(reflectionRay, scene, info.shape);
-
-              if (refl.isHit && refl.distance > 0){
-                  refl.color = this.rayTrace(refl, reflectionRay, scene, depth + 1);
-              } else {
-                  refl.color = scene.background.color;
-                        }
-
-                  color = Flog.RayTracer.Color.prototype.blend(
-                    color,
-                    refl.color,
-                    info.shape.material.reflection
-                  );
-          }
-
-                // Refraction
-                /* TODO */
-            }
-
-            /* Render shadows and highlights */
-
-            var shadowInfo = new Flog.RayTracer.IntersectionInfo();
-
-            if(this.options.renderShadows){
-                var shadowRay = new Flog.RayTracer.Ray(info.position, v);
-
-                shadowInfo = this.testIntersection(shadowRay, scene, info.shape);
-                if(shadowInfo.isHit && shadowInfo.shape != info.shape /*&& shadowInfo.shape.type != 'PLANE'*/){
-                    var vA = Flog.RayTracer.Color.prototype.multiplyScalar(color, 0.5);
-                    var dB = (0.5 * Math.pow(shadowInfo.shape.material.transparency, 0.5));
-                    color = Flog.RayTracer.Color.prototype.addScalar(vA,dB);
-                }
-            }
-
-      // Phong specular highlights
-      if(this.options.renderHighlights && !shadowInfo.isHit && info.shape.material.gloss > 0){
-        var Lv = Flog.RayTracer.Vector.prototype.subtract(
-                            info.shape.position,
-                            light.position
-                        ).normalize();
-
-        var E = Flog.RayTracer.Vector.prototype.subtract(
-                            scene.camera.position,
-                            info.shape.position
-                        ).normalize();
-
-        var H = Flog.RayTracer.Vector.prototype.subtract(
-                            E,
-                            Lv
-                        ).normalize();
-
-        var glossWeight = Math.pow(Math.max(info.normal.dot(H), 0), shininess);
-        color = Flog.RayTracer.Color.prototype.add(
-                            Flog.RayTracer.Color.prototype.multiplyScalar(light.color, glossWeight),
-                            color
-                        );
-      }
-        }
-        color.limit();
-        return color;
-    }
-};
-
-
-function renderScene(){
-    var scene = new Flog.RayTracer.Scene();
-
-    scene.camera = new Flog.RayTracer.Camera(
-                        new Flog.RayTracer.Vector(0, 0, -15),
-                        new Flog.RayTracer.Vector(-0.2, 0, 5),
-                        new Flog.RayTracer.Vector(0, 1, 0)
-                    );
-
-    scene.background = new Flog.RayTracer.Background(
-                                new Flog.RayTracer.Color(0.5, 0.5, 0.5),
-                                0.4
-                            );
-
-    var sphere = new Flog.RayTracer.Shape.Sphere(
-        new Flog.RayTracer.Vector(-1.5, 1.5, 2),
-        1.5,
-        new Flog.RayTracer.Material.Solid(
-            new Flog.RayTracer.Color(0,0.5,0.5),
-            0.3,
-            0.0,
-            0.0,
-            2.0
-        )
-    );
-
-    var sphere1 = new Flog.RayTracer.Shape.Sphere(
-        new Flog.RayTracer.Vector(1, 0.25, 1),
-        0.5,
-        new Flog.RayTracer.Material.Solid(
-            new Flog.RayTracer.Color(0.9,0.9,0.9),
-            0.1,
-            0.0,
-            0.0,
-            1.5
-        )
-    );
-
-    var plane = new Flog.RayTracer.Shape.Plane(
-                                new Flog.RayTracer.Vector(0.1, 0.9, -0.5).normalize(),
-                                1.2,
-                                new Flog.RayTracer.Material.Chessboard(
-                                    new Flog.RayTracer.Color(1,1,1),
-                                    new Flog.RayTracer.Color(0,0,0),
-                                    0.2,
-                                    0.0,
-                                    1.0,
-                                    0.7
-                                )
-                            );
-
-    scene.shapes.push(plane);
-    scene.shapes.push(sphere);
-    scene.shapes.push(sphere1);
-
-    var light = new Flog.RayTracer.Light(
-        new Flog.RayTracer.Vector(5, 10, -1),
-        new Flog.RayTracer.Color(0.8, 0.8, 0.8)
-    );
-
-    var light1 = new Flog.RayTracer.Light(
-        new Flog.RayTracer.Vector(-3, 5, -15),
-        new Flog.RayTracer.Color(0.8, 0.8, 0.8),
-        100
-    );
-
-    scene.lights.push(light);
-    scene.lights.push(light1);
-
-    var imageWidth = 100; // $F('imageWidth');
-    var imageHeight = 100; // $F('imageHeight');
-    var pixelSize = "5,5".split(','); //  $F('pixelSize').split(',');
-    var renderDiffuse = true; // $F('renderDiffuse');
-    var renderShadows = true; // $F('renderShadows');
-    var renderHighlights = true; // $F('renderHighlights');
-    var renderReflections = true; // $F('renderReflections');
-    var rayDepth = 2;//$F('rayDepth');
-
-    var raytracer = new Flog.RayTracer.Engine(
-        {
-            canvasWidth: imageWidth,
-            canvasHeight: imageHeight,
-            pixelWidth: pixelSize[0],
-            pixelHeight: pixelSize[1],
-            "renderDiffuse": renderDiffuse,
-            "renderHighlights": renderHighlights,
-            "renderShadows": renderShadows,
-            "renderReflections": renderReflections,
-            "rayDepth": rayDepth
-        }
-    );
-
-    raytracer.renderScene(scene, null, 0);
-}
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/richards.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/richards.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/richards.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/richards.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,539 +0,0 @@
-// Copyright 2007 Google Inc. All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a JavaScript implementation of the Richards
-// benchmark from:
-//
-//    http://www.cl.cam.ac.uk/~mr10/Bench.html
-// 
-// The benchmark was originally implemented in BCPL by
-// Martin Richards.
-
-
-var Richards = new BenchmarkSuite('Richards', 34886, [
-  new Benchmark("Richards", runRichards)
-]);
-
-
-/**
- * The Richards benchmark simulates the task dispatcher of an
- * operating system.
- **/
-function runRichards() {
-  var scheduler = new Scheduler();
-  scheduler.addIdleTask(ID_IDLE, 0, null, COUNT);
-
-  var queue = new Packet(null, ID_WORKER, KIND_WORK);
-  queue = new Packet(queue,  ID_WORKER, KIND_WORK);
-  scheduler.addWorkerTask(ID_WORKER, 1000, queue);
-
-  queue = new Packet(null, ID_DEVICE_A, KIND_DEVICE);
-  queue = new Packet(queue,  ID_DEVICE_A, KIND_DEVICE);
-  queue = new Packet(queue,  ID_DEVICE_A, KIND_DEVICE);
-  scheduler.addHandlerTask(ID_HANDLER_A, 2000, queue);
-
-  queue = new Packet(null, ID_DEVICE_B, KIND_DEVICE);
-  queue = new Packet(queue,  ID_DEVICE_B, KIND_DEVICE);
-  queue = new Packet(queue,  ID_DEVICE_B, KIND_DEVICE);
-  scheduler.addHandlerTask(ID_HANDLER_B, 3000, queue);
-
-  scheduler.addDeviceTask(ID_DEVICE_A, 4000, null);
-
-  scheduler.addDeviceTask(ID_DEVICE_B, 5000, null);
-
-  scheduler.schedule();
-
-  if (scheduler.queueCount != EXPECTED_QUEUE_COUNT ||
-      scheduler.holdCount != EXPECTED_HOLD_COUNT) {
-    var msg =
-        "Error during execution: queueCount = " + scheduler.queueCount +
-        ", holdCount = " + scheduler.holdCount + ".";
-    print(msg);
-  }
-}
-
-var COUNT = 1000;
-
-/**
- * These two constants specify how many times a packet is queued and
- * how many times a task is put on hold in a correct run of richards.
- * They don't have any meaning a such but are characteristic of a
- * correct run so if the actual queue or hold count is different from
- * the expected there must be a bug in the implementation.
- **/
-var EXPECTED_QUEUE_COUNT = 2322;
-var EXPECTED_HOLD_COUNT = 928;
-
-
-/**
- * A scheduler can be used to schedule a set of tasks based on their relative
- * priorities.  Scheduling is done by maintaining a list of task control blocks
- * which holds tasks and the data queue they are processing.
- * @constructor
- */
-function Scheduler() {
-  this.queueCount = 0;
-  this.holdCount = 0;
-  this.blocks = new Array(NUMBER_OF_IDS);
-  this.list = null;
-  this.currentTcb = null;
-  this.currentId = null;
-}
-
-var ID_IDLE       = 0;
-var ID_WORKER     = 1;
-var ID_HANDLER_A  = 2;
-var ID_HANDLER_B  = 3;
-var ID_DEVICE_A   = 4;
-var ID_DEVICE_B   = 5;
-var NUMBER_OF_IDS = 6;
-
-var KIND_DEVICE   = 0;
-var KIND_WORK     = 1;
-
-/**
- * Add an idle task to this scheduler.
- * @param {int} id the identity of the task
- * @param {int} priority the task's priority
- * @param {Packet} queue the queue of work to be processed by the task
- * @param {int} count the number of times to schedule the task
- */
-Scheduler.prototype.addIdleTask = function (id, priority, queue, count) {
-  this.addRunningTask(id, priority, queue, new IdleTask(this, 1, count));
-};
-
-/**
- * Add a work task to this scheduler.
- * @param {int} id the identity of the task
- * @param {int} priority the task's priority
- * @param {Packet} queue the queue of work to be processed by the task
- */
-Scheduler.prototype.addWorkerTask = function (id, priority, queue) {
-  this.addTask(id, priority, queue, new WorkerTask(this, ID_HANDLER_A, 0));
-};
-
-/**
- * Add a handler task to this scheduler.
- * @param {int} id the identity of the task
- * @param {int} priority the task's priority
- * @param {Packet} queue the queue of work to be processed by the task
- */
-Scheduler.prototype.addHandlerTask = function (id, priority, queue) {
-  this.addTask(id, priority, queue, new HandlerTask(this));
-};
-
-/**
- * Add a handler task to this scheduler.
- * @param {int} id the identity of the task
- * @param {int} priority the task's priority
- * @param {Packet} queue the queue of work to be processed by the task
- */
-Scheduler.prototype.addDeviceTask = function (id, priority, queue) {
-  this.addTask(id, priority, queue, new DeviceTask(this))
-};
-
-/**
- * Add the specified task and mark it as running.
- * @param {int} id the identity of the task
- * @param {int} priority the task's priority
- * @param {Packet} queue the queue of work to be processed by the task
- * @param {Task} task the task to add
- */
-Scheduler.prototype.addRunningTask = function (id, priority, queue, task) {
-  this.addTask(id, priority, queue, task);
-  this.currentTcb.setRunning();
-};
-
-/**
- * Add the specified task to this scheduler.
- * @param {int} id the identity of the task
- * @param {int} priority the task's priority
- * @param {Packet} queue the queue of work to be processed by the task
- * @param {Task} task the task to add
- */
-Scheduler.prototype.addTask = function (id, priority, queue, task) {
-  this.currentTcb = new TaskControlBlock(this.list, id, priority, queue, task);
-  this.list = this.currentTcb;
-  this.blocks[id] = this.currentTcb;
-};
-
-/**
- * Execute the tasks managed by this scheduler.
- */
-Scheduler.prototype.schedule = function () {
-  this.currentTcb = this.list;
-  while (this.currentTcb != null) {
-    if (this.currentTcb.isHeldOrSuspended()) {
-      this.currentTcb = this.currentTcb.link;
-    } else {
-      this.currentId = this.currentTcb.id;
-      this.currentTcb = this.currentTcb.run();
-    }
-  }
-};
-
-/**
- * Release a task that is currently blocked and return the next block to run.
- * @param {int} id the id of the task to suspend
- */
-Scheduler.prototype.release = function (id) {
-  var tcb = this.blocks[id];
-  if (tcb == null) return tcb;
-  tcb.markAsNotHeld();
-  if (tcb.priority > this.currentTcb.priority) {
-    return tcb;
-  } else {
-    return this.currentTcb;
-  }
-};
-
-/**
- * Block the currently executing task and return the next task control block
- * to run.  The blocked task will not be made runnable until it is explicitly
- * released, even if new work is added to it.
- */
-Scheduler.prototype.holdCurrent = function () {
-  this.holdCount++;
-  this.currentTcb.markAsHeld();
-  return this.currentTcb.link;
-};
-
-/**
- * Suspend the currently executing task and return the next task control block
- * to run.  If new work is added to the suspended task it will be made runnable.
- */
-Scheduler.prototype.suspendCurrent = function () {
-  this.currentTcb.markAsSuspended();
-  return this.currentTcb;
-};
-
-/**
- * Add the specified packet to the end of the worklist used by the task
- * associated with the packet and make the task runnable if it is currently
- * suspended.
- * @param {Packet} packet the packet to add
- */
-Scheduler.prototype.queue = function (packet) {
-  var t = this.blocks[packet.id];
-  if (t == null) return t;
-  this.queueCount++;
-  packet.link = null;
-  packet.id = this.currentId;
-  return t.checkPriorityAdd(this.currentTcb, packet);
-};
-
-/**
- * A task control block manages a task and the queue of work packages associated
- * with it.
- * @param {TaskControlBlock} link the preceding block in the linked block list
- * @param {int} id the id of this block
- * @param {int} priority the priority of this block
- * @param {Packet} queue the queue of packages to be processed by the task
- * @param {Task} task the task
- * @constructor
- */
-function TaskControlBlock(link, id, priority, queue, task) {
-  this.link = link;
-  this.id = id;
-  this.priority = priority;
-  this.queue = queue;
-  this.task = task;
-  if (queue == null) {
-    this.state = STATE_SUSPENDED;
-  } else {
-    this.state = STATE_SUSPENDED_RUNNABLE;
-  }
-}
-
-/**
- * The task is running and is currently scheduled.
- */
-var STATE_RUNNING = 0;
-
-/**
- * The task has packets left to process.
- */
-var STATE_RUNNABLE = 1;
-
-/**
- * The task is not currently running.  The task is not blocked as such and may
-* be started by the scheduler.
- */
-var STATE_SUSPENDED = 2;
-
-/**
- * The task is blocked and cannot be run until it is explicitly released.
- */
-var STATE_HELD = 4;
-
-var STATE_SUSPENDED_RUNNABLE = STATE_SUSPENDED | STATE_RUNNABLE;
-var STATE_NOT_HELD = ~STATE_HELD;
-
-TaskControlBlock.prototype.setRunning = function () {
-  this.state = STATE_RUNNING;
-};
-
-TaskControlBlock.prototype.markAsNotHeld = function () {
-  this.state = this.state & STATE_NOT_HELD;
-};
-
-TaskControlBlock.prototype.markAsHeld = function () {
-  this.state = this.state | STATE_HELD;
-};
-
-TaskControlBlock.prototype.isHeldOrSuspended = function () {
-  return (this.state & STATE_HELD) != 0 || (this.state == STATE_SUSPENDED);
-};
-
-TaskControlBlock.prototype.markAsSuspended = function () {
-  this.state = this.state | STATE_SUSPENDED;
-};
-
-TaskControlBlock.prototype.markAsRunnable = function () {
-  this.state = this.state | STATE_RUNNABLE;
-};
-
-/**
- * Runs this task, if it is ready to be run, and returns the next task to run.
- */
-TaskControlBlock.prototype.run = function () {
-  var packet;
-  if (this.state == STATE_SUSPENDED_RUNNABLE) {
-    packet = this.queue;
-    this.queue = packet.link;
-    if (this.queue == null) {
-      this.state = STATE_RUNNING;
-    } else {
-      this.state = STATE_RUNNABLE;
-    }
-  } else {
-    packet = null;
-  }
-  return this.task.run(packet);
-};
-
-/**
- * Adds a packet to the worklist of this block's task, marks this as runnable if
- * necessary, and returns the next runnable object to run (the one
- * with the highest priority).
- */
-TaskControlBlock.prototype.checkPriorityAdd = function (task, packet) {
-  if (this.queue == null) {
-    this.queue = packet;
-    this.markAsRunnable();
-    if (this.priority > task.priority) return this;
-  } else {
-    this.queue = packet.addTo(this.queue);
-  }
-  return task;
-};
-
-TaskControlBlock.prototype.toString = function () {
-  return "tcb { " + this.task + "@" + this.state + " }";
-};
-
-/**
- * An idle task doesn't do any work itself but cycles control between the two
- * device tasks.
- * @param {Scheduler} scheduler the scheduler that manages this task
- * @param {int} v1 a seed value that controls how the device tasks are scheduled
- * @param {int} count the number of times this task should be scheduled
- * @constructor
- */
-function IdleTask(scheduler, v1, count) {
-  this.scheduler = scheduler;
-  this.v1 = v1;
-  this.count = count;
-}
-
-IdleTask.prototype.run = function (packet) {
-  this.count--;
-  if (this.count == 0) return this.scheduler.holdCurrent();
-  if ((this.v1 & 1) == 0) {
-    this.v1 = this.v1 >> 1;
-    return this.scheduler.release(ID_DEVICE_A);
-  } else {
-    this.v1 = (this.v1 >> 1) ^ 0xD008;
-    return this.scheduler.release(ID_DEVICE_B);
-  }
-};
-
-IdleTask.prototype.toString = function () {
-  return "IdleTask"
-};
-
-/**
- * A task that suspends itself after each time it has been run to simulate
- * waiting for data from an external device.
- * @param {Scheduler} scheduler the scheduler that manages this task
- * @constructor
- */
-function DeviceTask(scheduler) {
-  this.scheduler = scheduler;
-  this.v1 = null;
-}
-
-DeviceTask.prototype.run = function (packet) {
-  if (packet == null) {
-    if (this.v1 == null) return this.scheduler.suspendCurrent();
-    var v = this.v1;
-    this.v1 = null;
-    return this.scheduler.queue(v);
-  } else {
-    this.v1 = packet;
-    return this.scheduler.holdCurrent();
-  }
-};
-
-DeviceTask.prototype.toString = function () {
-  return "DeviceTask";
-};
-
-/**
- * A task that manipulates work packets.
- * @param {Scheduler} scheduler the scheduler that manages this task
- * @param {int} v1 a seed used to specify how work packets are manipulated
- * @param {int} v2 another seed used to specify how work packets are manipulated
- * @constructor
- */
-function WorkerTask(scheduler, v1, v2) {
-  this.scheduler = scheduler;
-  this.v1 = v1;
-  this.v2 = v2;
-}
-
-WorkerTask.prototype.run = function (packet) {
-  if (packet == null) {
-    return this.scheduler.suspendCurrent();
-  } else {
-    if (this.v1 == ID_HANDLER_A) {
-      this.v1 = ID_HANDLER_B;
-    } else {
-      this.v1 = ID_HANDLER_A;
-    }
-    packet.id = this.v1;
-    packet.a1 = 0;
-    for (var i = 0; i < DATA_SIZE; i++) {
-      this.v2++;
-      if (this.v2 > 26) this.v2 = 1;
-      packet.a2[i] = this.v2;
-    }
-    return this.scheduler.queue(packet);
-  }
-};
-
-WorkerTask.prototype.toString = function () {
-  return "WorkerTask";
-};
-
-/**
- * A task that manipulates work packets and then suspends itself.
- * @param {Scheduler} scheduler the scheduler that manages this task
- * @constructor
- */
-function HandlerTask(scheduler) {
-  this.scheduler = scheduler;
-  this.v1 = null;
-  this.v2 = null;
-}
-
-HandlerTask.prototype.run = function (packet) {
-  if (packet != null) {
-    if (packet.kind == KIND_WORK) {
-      this.v1 = packet.addTo(this.v1);
-    } else {
-      this.v2 = packet.addTo(this.v2);
-    }
-  }
-  if (this.v1 != null) {
-    var count = this.v1.a1;
-    var v;
-    if (count < DATA_SIZE) {
-      if (this.v2 != null) {
-        v = this.v2;
-        this.v2 = this.v2.link;
-        v.a1 = this.v1.a2[count];
-        this.v1.a1 = count + 1;
-        return this.scheduler.queue(v);
-      }
-    } else {
-      v = this.v1;
-      this.v1 = this.v1.link;
-      return this.scheduler.queue(v);
-    }
-  }
-  return this.scheduler.suspendCurrent();
-};
-
-HandlerTask.prototype.toString = function () {
-  return "HandlerTask";
-};
-
-/* --- *
- * P a c k e t
- * --- */
-
-var DATA_SIZE = 4;
-
-/**
- * A simple package of data that is manipulated by the tasks.  The exact layout
- * of the payload data carried by a packet is not importaint, and neither is the
- * nature of the work performed on packets by the tasks.
- *
- * Besides carrying data, packets form linked lists and are hence used both as
- * data and worklists.
- * @param {Packet} link the tail of the linked list of packets
- * @param {int} id an ID for this packet
- * @param {int} kind the type of this packet
- * @constructor
- */
-function Packet(link, id, kind) {
-  this.link = link;
-  this.id = id;
-  this.kind = kind;
-  this.a1 = 0;
-  this.a2 = new Array(DATA_SIZE);
-}
-
-/**
- * Add this packet to the end of a worklist, and return the worklist.
- * @param {Packet} queue the worklist to add this packet to
- */
-Packet.prototype.addTo = function (queue) {
-  this.link = null;
-  if (queue == null) return this;
-  var peek, next = queue;
-  while ((peek = next.link) != null)
-    next = peek;
-  next.link = this;
-  return queue;
-};
-
-Packet.prototype.toString = function () {
-  return "Packet";
-};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run-earley-boyer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run-earley-boyer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run-earley-boyer.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run-earley-boyer.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// Copyright 2008 Google Inc. All Rights Reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-load('base.js');
-load('earley-boyer.js');
-
-function PrintResult(name, result) {
-  print(name + ': ' + result);
-}
-
-
-function PrintScore(score) {
-  print('----');
-  print('Score: ' + score);
-}
-
-
-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
-                           NotifyScore: PrintScore });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-// Copyright 2008 Google Inc. All Rights Reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-load('base.js');
-load('richards.js');
-load('deltablue.js');
-load('crypto.js');
-load('raytrace.js');
-load('earley-boyer.js');
-
-
-function PrintResult(name, result) {
-  print(name + ': ' + result);
-}
-
-
-function PrintScore(score) {
-  print('----');
-  print('Score: ' + score);
-}
-
-
-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
-                           NotifyScore: PrintScore });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run-raytrace.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run-raytrace.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run-raytrace.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run-raytrace.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// Copyright 2008 Google Inc. All Rights Reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-load('base.js');
-load('raytrace.js');
-
-function PrintResult(name, result) {
-  print(name + ': ' + result);
-}
-
-
-function PrintScore(score) {
-  print('----');
-  print('Score: ' + score);
-}
-
-
-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
-                           NotifyScore: PrintScore });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run-richards.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run-richards.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/jint/v8/run-richards.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/jint/v8/run-richards.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// Copyright 2008 Google Inc. All Rights Reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-//       copyright notice, this list of conditions and the following
-//       disclaimer in the documentation and/or other materials provided
-//       with the distribution.
-//     * Neither the name of Google Inc. nor the names of its
-//       contributors may be used to endorse or promote products derived
-//       from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-load('base.js');
-load('richards.js');
-
-function PrintResult(name, result) {
-  print(name + ': ' + result);
-}
-
-
-function PrintScore(score) {
-  print('----');
-  print('Score: ' + score);
-}
-
-
-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
-                           NotifyScore: PrintScore });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/rootAnalysis/annotations.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/rootAnalysis/annotations.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/devtools/rootAnalysis/annotations.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/devtools/rootAnalysis/annotations.js	2015-02-28 15:03:04.000000000 +0000
@@ -81,6 +81,8 @@
     "PLDHashTableOps.hashKey" : true,
     "z_stream_s.zfree" : true,
     "GrGLInterface.fCallback" : true,
+    "std::strstreambuf._M_alloc_fun" : true,
+    "std::strstreambuf._M_free_fun" : true,
 };
 
 function fieldCallCannotGC(csu, fullfield)
@@ -137,6 +139,10 @@
     "JSObject* js::GetWeakmapKeyDelegate(JSObject*)" : true, // FIXME: mark with AutoSuppressGCAnalysis instead
     "uint8 NS_IsMainThread()" : true,
 
+    // Has an indirect call under it by the name "__f", which seemed too
+    // generic to ignore by itself.
+    "void* std::_Locale_impl::~_Locale_impl(int32)" : true,
+
     // FIXME!
     "NS_LogInit": true,
     "NS_LogTerm": true,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ds/SplayTree.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ds/SplayTree.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/ds/SplayTree.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/ds/SplayTree.h	2015-02-28 15:03:04.000000000 +0000
@@ -65,6 +65,14 @@
         return !root;
     }
 
+    T *maybeLookup(const T &v)
+    {
+        if (!root)
+            return nullptr;
+        Node *last = lookup(v);
+        return (C::compare(v, last->item) == 0) ? &(last->item) : nullptr;
+    }
+
     bool contains(const T &v, T *res)
     {
         if (!root)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/BytecodeCompiler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/BytecodeCompiler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/BytecodeCompiler.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/BytecodeCompiler.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -34,7 +34,7 @@
     // is using size_t internally already.
     if (srcBuf.length() > UINT32_MAX) {
         if (cx->isJSContext())
-            JS_ReportErrorNumber(cx->asJSContext(), js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx->asJSContext(), GetErrorMessage, nullptr,
                                  JSMSG_SOURCE_TOO_LONG);
         return false;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/BytecodeEmitter.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/BytecodeEmitter.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/BytecodeEmitter.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/BytecodeEmitter.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -143,6 +143,7 @@
     yieldOffsetList(sc->context),
     typesetCount(0),
     hasSingletons(false),
+    hasTryFinally(false),
     emittingForInit(false),
     emittingRunOnceLambda(false),
     insideEval(insideEval),
@@ -208,7 +209,7 @@
 
     jsbytecode dummy = 0;
     if (!bce->code().appendN(dummy, delta)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return -1;
     }
     return offset;
@@ -246,9 +247,9 @@
 static bool
 CheckStrictOrSloppy(BytecodeEmitter *bce, JSOp op)
 {
-    if (IsCheckStrictOp(op) && !bce->sc->strict)
+    if (IsCheckStrictOp(op) && !bce->sc->strict())
         return false;
-    if (IsCheckSloppyOp(op) && bce->sc->strict)
+    if (IsCheckSloppyOp(op) && bce->sc->strict())
         return false;
     return true;
 }
@@ -1526,11 +1527,11 @@
 {
     switch (op) {
       case JSOP_SETNAME:
-        if (bce->sc->strict)
+        if (bce->sc->strict())
             op = JSOP_STRICTSETNAME;
         break;
       case JSOP_SETGNAME:
-        if (bce->sc->strict)
+        if (bce->sc->strict())
             op = JSOP_STRICTSETGNAME;
         break;
         default:;
@@ -1663,7 +1664,7 @@
     // worth the trouble for doubly-nested eval code.  So we conservatively
     // approximate.  If the outer eval code is strict, then this eval code will
     // be: thus, don't optimize if we're compiling strict code inside an eval.
-    if (bce->insideEval && bce->sc->strict)
+    if (bce->insideEval && bce->sc->strict())
         return false;
 
     JSOp op;
@@ -1701,8 +1702,6 @@
 {
     MOZ_ASSERT(pn->isKind(PNK_NAME));
 
-    MOZ_ASSERT_IF(pn->isKind(PNK_FUNCTION), pn->isBound());
-
     /* Don't attempt if 'pn' is already bound or deoptimized or a function. */
     if (pn->isBound() || pn->isDeoptimized())
         return true;
@@ -2234,7 +2233,7 @@
 
     va_list args;
     va_start(args, errorNumber);
-    bool result = tokenStream()->reportStrictModeErrorNumberVA(pos.begin, sc->strict,
+    bool result = tokenStream()->reportStrictModeErrorNumberVA(pos.begin, sc->strict(),
                                                                errorNumber, args);
     va_end(args);
     return result;
@@ -2459,7 +2458,7 @@
             return false;
     }
 
-    JSOp setOp = bce->sc->strict ? JSOP_STRICTSETPROP : JSOP_SETPROP;
+    JSOp setOp = bce->sc->strict() ? JSOP_STRICTSETPROP : JSOP_SETPROP;
     if (!EmitAtomOp(cx, pn->pn_kid, setOp, bce))     // N? N+1
         return false;
     if (post && Emit1(cx, bce, JSOP_POP) < 0)       // RESULT
@@ -2582,7 +2581,7 @@
             return false;
     }
 
-    JSOp setOp = bce->sc->strict ? JSOP_STRICTSETELEM : JSOP_SETELEM;
+    JSOp setOp = bce->sc->strict() ? JSOP_STRICTSETELEM : JSOP_SETELEM;
     if (!EmitElemOpBase(cx, bce, setOp))     // N? N+1
         return false;
     if (post && Emit1(cx, bce, JSOP_POP) < 0)       // RESULT
@@ -2819,7 +2818,7 @@
                     intmap_bitlen = JS_BIT(16);
                     intmap = cx->pod_malloc<jsbitmap>(JS_BIT(16) / JS_BITMAP_NBITS);
                     if (!intmap) {
-                        js_ReportOutOfMemory(cx);
+                        ReportOutOfMemory(cx);
                         return false;
                     }
                 }
@@ -3122,37 +3121,51 @@
     if (!EmitTree(cx, bce, body))
         return false;
 
-    // If we fall off the end of a generator, do a final yield.
-    if (bce->sc->isFunctionBox() && bce->sc->asFunctionBox()->isGenerator()) {
-        if (bce->sc->asFunctionBox()->isStarGenerator() && !EmitPrepareIteratorResult(cx, bce))
-            return false;
+    if (bce->sc->isFunctionBox()) {
+        if (bce->sc->asFunctionBox()->isGenerator()) {
+            // If we fall off the end of a generator, do a final yield.
+            if (bce->sc->asFunctionBox()->isStarGenerator() && !EmitPrepareIteratorResult(cx, bce))
+                return false;
 
-        if (Emit1(cx, bce, JSOP_UNDEFINED) < 0)
-            return false;
+            if (Emit1(cx, bce, JSOP_UNDEFINED) < 0)
+                return false;
 
-        if (bce->sc->asFunctionBox()->isStarGenerator() && !EmitFinishIteratorResult(cx, bce, true))
-            return false;
+            if (bce->sc->asFunctionBox()->isStarGenerator() &&
+                !EmitFinishIteratorResult(cx, bce, true))
+            {
+                return false;
+            }
 
-        if (Emit1(cx, bce, JSOP_SETRVAL) < 0)
-            return false;
+            if (Emit1(cx, bce, JSOP_SETRVAL) < 0)
+                return false;
 
-        ScopeCoordinate sc;
-        // We know that .generator is on the top scope chain node, as we are
-        // at the function end.
-        sc.setHops(0);
-        MOZ_ALWAYS_TRUE(LookupAliasedNameSlot(bce, bce->script, cx->names().dotGenerator, &sc));
-        if (!EmitAliasedVarOp(cx, JSOP_GETALIASEDVAR, sc, DontCheckLexical, bce))
-            return false;
+            ScopeCoordinate sc;
+            // We know that .generator is on the top scope chain node, as we are
+            // at the function end.
+            sc.setHops(0);
+            MOZ_ALWAYS_TRUE(LookupAliasedNameSlot(bce, bce->script, cx->names().dotGenerator, &sc));
+            if (!EmitAliasedVarOp(cx, JSOP_GETALIASEDVAR, sc, DontCheckLexical, bce))
+                return false;
 
-        // No need to check for finally blocks, etc as in EmitReturn.
-        if (!EmitYieldOp(cx, bce, JSOP_FINALYIELDRVAL))
-            return false;
+            // No need to check for finally blocks, etc as in EmitReturn.
+            if (!EmitYieldOp(cx, bce, JSOP_FINALYIELDRVAL))
+                return false;
+        } else {
+            // Non-generator functions just return |undefined|. The JSOP_RETRVAL
+            // emitted below will do that, except if the script has a finally
+            // block: there can be a non-undefined value in the return value
+            // slot. We just emit an explicit return in this case.
+            if (bce->hasTryFinally) {
+                if (Emit1(cx, bce, JSOP_UNDEFINED) < 0)
+                    return false;
+                if (Emit1(cx, bce, JSOP_RETURN) < 0)
+                    return false;
+            }
+        }
     }
 
-    /*
-     * Always end the script with a JSOP_RETRVAL. Some other parts of the codebase
-     * depend on this opcode, e.g. js_InternalInterpret.
-     */
+    // Always end the script with a JSOP_RETRVAL. Some other parts of the codebase
+    // depend on this opcode, e.g. InterpreterRegs::setToEndOfScript.
     if (Emit1(cx, bce, JSOP_RETRVAL) < 0)
         return false;
 
@@ -3430,7 +3443,7 @@
                 return false;
             if (Emit1(cx, bce, JSOP_SWAP) < 0)
                 return false;
-            JSOp setOp = bce->sc->strict ? JSOP_STRICTSETPROP : JSOP_SETPROP;
+            JSOp setOp = bce->sc->strict() ? JSOP_STRICTSETPROP : JSOP_SETPROP;
             if (!EmitAtomOp(cx, target, setOp, bce))
                 return false;
             break;
@@ -3441,7 +3454,7 @@
             // See the comment at `case PNK_DOT:` above. This case,
             // `[a[x]] = [b]`, is handled much the same way. The JSOP_SWAP
             // is emitted by EmitElemOperands.
-            JSOp setOp = bce->sc->strict ? JSOP_STRICTSETELEM : JSOP_SETELEM;
+            JSOp setOp = bce->sc->strict() ? JSOP_STRICTSETELEM : JSOP_SETELEM;
             if (!EmitElemOp(cx, target, setOp, bce))
                 return false;
             break;
@@ -3692,7 +3705,7 @@
             if (key->isKind(PNK_NUMBER)) {
                 if (!EmitNumberOp(cx, key->pn_dval, bce))              // ... OBJ OBJ KEY
                     return false;
-            } else if (key->isKind(PNK_NAME) || key->isKind(PNK_STRING)) {
+            } else if (key->isKind(PNK_OBJECT_PROPERTY_NAME) || key->isKind(PNK_STRING)) {
                 PropertyName *name = key->pn_atom->asPropertyName();
 
                 // The parser already checked for atoms representing indexes and
@@ -4202,7 +4215,7 @@
         break;
       case PNK_DOT:
       {
-        JSOp setOp = bce->sc->strict ? JSOP_STRICTSETPROP : JSOP_SETPROP;
+        JSOp setOp = bce->sc->strict() ? JSOP_STRICTSETPROP : JSOP_SETPROP;
         if (!EmitIndexOp(cx, setOp, atomIndex, bce))
             return false;
         break;
@@ -4213,7 +4226,7 @@
         break;
       case PNK_ELEM:
       {
-        JSOp setOp = bce->sc->strict ? JSOP_STRICTSETELEM : JSOP_SETELEM;
+        JSOp setOp = bce->sc->strict() ? JSOP_STRICTSETELEM : JSOP_SETELEM;
         if (Emit1(cx, bce, setOp) < 0)
             return false;
         break;
@@ -4325,7 +4338,7 @@
             if (pnid->isKind(PNK_NUMBER)) {
                 idvalue = NumberValue(pnid->pn_dval);
             } else {
-                MOZ_ASSERT(pnid->isKind(PNK_NAME) || pnid->isKind(PNK_STRING));
+                MOZ_ASSERT(pnid->isKind(PNK_OBJECT_PROPERTY_NAME) || pnid->isKind(PNK_STRING));
                 MOZ_ASSERT(pnid->pn_atom != cx->names().proto);
                 idvalue = StringValue(pnid->pn_atom);
             }
@@ -4660,6 +4673,7 @@
         {
             return false;
         }
+        bce->hasTryFinally = true;
         MOZ_ASSERT(bce->stackDepth == depth);
     }
     if (!PopStatementBCE(cx, bce))
@@ -5394,7 +5408,7 @@
 
             if (outersc->isFunctionBox() && outersc->asFunctionBox()->mightAliasLocals())
                 funbox->setMightAliasLocals();      // inherit mightAliasLocals from parent
-            MOZ_ASSERT_IF(outersc->strict, funbox->strict);
+            MOZ_ASSERT_IF(outersc->strict(), funbox->strictScript);
 
             // Inherit most things (principals, version, etc) from the parent.
             Rooted<JSScript*> parent(cx, bce->script);
@@ -6020,7 +6034,7 @@
             // later in the script, because such statements are misleading.
             const char *directive = nullptr;
             if (atom == cx->names().useStrict) {
-                if (!bce->sc->strict)
+                if (!bce->sc->strictScript)
                     directive = js_useStrict_str;
             } else if (atom == cx->names().useAsm) {
                 if (bce->sc->isFunctionBox()) {
@@ -6062,14 +6076,14 @@
         break;
       case PNK_DOT:
       {
-        JSOp delOp = bce->sc->strict ? JSOP_STRICTDELPROP : JSOP_DELPROP;
+        JSOp delOp = bce->sc->strict() ? JSOP_STRICTDELPROP : JSOP_DELPROP;
         if (!EmitPropOp(cx, pn2, delOp, bce))
             return false;
         break;
       }
       case PNK_ELEM:
       {
-        JSOp delOp = bce->sc->strict ? JSOP_STRICTDELELEM : JSOP_DELELEM;
+        JSOp delOp = bce->sc->strict() ? JSOP_STRICTDELELEM : JSOP_DELELEM;
         if (!EmitElemOp(cx, pn2, delOp, bce))
             return false;
         break;
@@ -6545,37 +6559,10 @@
     return SetSrcNoteOffset(cx, bce, noteIndex, 0, jmp - beq);
 }
 
-/*
- * Using MOZ_NEVER_INLINE in here is a workaround for llvm.org/pr14047. See
- * the comment on EmitSwitch.
- */
-MOZ_NEVER_INLINE static bool
-EmitObject(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn)
+static bool
+EmitPropertyList(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
+                 MutableHandlePlainObject objp, PropListType type)
 {
-    if (!(pn->pn_xflags & PNX_NONCONST) && pn->pn_head && bce->checkSingletonContext())
-        return EmitSingletonInitialiser(cx, bce, pn);
-
-    /*
-     * Emit code for {p:a, '%q':b, 2:c} that is equivalent to constructing
-     * a new object and defining (in source order) each property on the object
-     * (or mutating the object's [[Prototype]], in the case of __proto__).
-     */
-    ptrdiff_t offset = bce->offset();
-    if (!EmitNewInit(cx, bce, JSProto_Object))
-        return false;
-
-    /*
-     * Try to construct the shape of the object as we go, so we can emit a
-     * JSOP_NEWOBJECT with the final shape instead.
-     */
-    RootedPlainObject obj(cx);
-    if (bce->script->compileAndGo()) {
-        gc::AllocKind kind = GuessObjectGCKind(pn->pn_count);
-        obj = NewBuiltinClassInstance<PlainObject>(cx, kind, TenuredObject);
-        if (!obj)
-            return false;
-    }
-
     for (ParseNode *propdef = pn->pn_head; propdef; propdef = propdef->pn_next) {
         if (!UpdateSourceCoordNotes(cx, bce, propdef->pn_pos.begin))
             return false;
@@ -6583,14 +6570,24 @@
         // Handle __proto__: v specially because *only* this form, and no other
         // involving "__proto__", performs [[Prototype]] mutation.
         if (propdef->isKind(PNK_MUTATEPROTO)) {
+            MOZ_ASSERT(type == ObjectLiteral);
             if (!EmitTree(cx, bce, propdef->pn_kid))
                 return false;
-            obj = nullptr;
+            objp.set(nullptr);
             if (!Emit1(cx, bce, JSOP_MUTATEPROTO))
                 return false;
             continue;
         }
 
+        bool extraPop = false;
+        if (type == ClassBody && propdef->as<ClassMethod>().isStatic()) {
+            extraPop = true;
+            if (Emit1(cx, bce, JSOP_DUP2) < 0)
+                return false;
+            if (Emit1(cx, bce, JSOP_POP) < 0)
+                return false;
+        }
+
         /* Emit an index for t[2] for later consumption by JSOP_INITELEM. */
         ParseNode *key = propdef->pn_left;
         bool isIndex = false;
@@ -6598,7 +6595,11 @@
             if (!EmitNumberOp(cx, key->pn_dval, bce))
                 return false;
             isIndex = true;
-        } else if (key->isKind(PNK_NAME) || key->isKind(PNK_STRING)) {
+        } else if (key->isKind(PNK_OBJECT_PROPERTY_NAME) || key->isKind(PNK_STRING)) {
+            // EmitClass took care of constructor already.
+            if (type == ClassBody && key->pn_atom == cx->names().constructor)
+                continue;
+
             // The parser already checked for atoms representing indexes and
             // used PNK_NUMBER instead, but also watch for ids which TI treats
             // as indexes for simpliciation of downstream analysis.
@@ -6625,10 +6626,10 @@
                    op == JSOP_INITPROP_SETTER);
 
         if (op == JSOP_INITPROP_GETTER || op == JSOP_INITPROP_SETTER)
-            obj = nullptr;
+            objp.set(nullptr);
 
         if (isIndex) {
-            obj = nullptr;
+            objp.set(nullptr);
             switch (op) {
               case JSOP_INITPROP:        op = JSOP_INITELEM;        break;
               case JSOP_INITPROP_GETTER: op = JSOP_INITELEM_GETTER; break;
@@ -6638,30 +6639,71 @@
             if (Emit1(cx, bce, op) < 0)
                 return false;
         } else {
-            MOZ_ASSERT(key->isKind(PNK_NAME) || key->isKind(PNK_STRING));
+            MOZ_ASSERT(key->isKind(PNK_OBJECT_PROPERTY_NAME) || key->isKind(PNK_STRING));
 
             jsatomid index;
             if (!bce->makeAtomIndex(key->pn_atom, &index))
                 return false;
 
-            if (obj) {
-                MOZ_ASSERT(!obj->inDictionaryMode());
+            if (objp) {
+                MOZ_ASSERT(!objp->inDictionaryMode());
                 Rooted<jsid> id(cx, AtomToId(key->pn_atom));
                 RootedValue undefinedValue(cx, UndefinedValue());
-                if (!NativeDefineProperty(cx, obj, id, undefinedValue, nullptr, nullptr,
+                if (!NativeDefineProperty(cx, objp, id, undefinedValue, nullptr, nullptr,
                                           JSPROP_ENUMERATE))
                 {
                     return false;
                 }
-                if (obj->inDictionaryMode())
-                    obj = nullptr;
+                if (objp->inDictionaryMode())
+                    objp.set(nullptr);
             }
 
             if (!EmitIndex32(cx, op, index, bce))
                 return false;
         }
+
+        if (extraPop) {
+            if (Emit1(cx, bce, JSOP_POP) < 0)
+                return false;
+        }
+    }
+    return true;
+}
+
+/*
+ * Using MOZ_NEVER_INLINE in here is a workaround for llvm.org/pr14047. See
+ * the comment on EmitSwitch.
+ */
+MOZ_NEVER_INLINE static bool
+EmitObject(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn)
+{
+    if (!(pn->pn_xflags & PNX_NONCONST) && pn->pn_head && bce->checkSingletonContext())
+        return EmitSingletonInitialiser(cx, bce, pn);
+
+    /*
+     * Emit code for {p:a, '%q':b, 2:c} that is equivalent to constructing
+     * a new object and defining (in source order) each property on the object
+     * (or mutating the object's [[Prototype]], in the case of __proto__).
+     */
+    ptrdiff_t offset = bce->offset();
+    if (!EmitNewInit(cx, bce, JSProto_Object))
+        return false;
+
+    /*
+     * Try to construct the shape of the object as we go, so we can emit a
+     * JSOP_NEWOBJECT with the final shape instead.
+     */
+    RootedPlainObject obj(cx);
+    if (bce->script->compileAndGo()) {
+        gc::AllocKind kind = GuessObjectGCKind(pn->pn_count);
+        obj = NewBuiltinClassInstance<PlainObject>(cx, kind, TenuredObject);
+        if (!obj)
+            return false;
     }
 
+    if (!EmitPropertyList(cx, bce, pn, &obj, ObjectLiteral))
+        return false;
+
     if (obj) {
         /*
          * The object survived and has a predictable shape: update the original
@@ -6851,6 +6893,120 @@
     return true;
 }
 
+
+static bool
+EmitLexicalInitialization(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn,
+                          JSOp globalDefOp)
+{
+    /*
+     * This function is significantly more complicated than it needs to be.
+     * In fact, it shouldn't exist at all. This should all be a
+     * JSOP_INITLEXIAL. Unfortunately, toplevel lexicals are broken, and
+     * are emitted as vars :(. As such, we have to do these ministrations to
+     * to make sure that all works properly.
+     */
+    MOZ_ASSERT(pn->isKind(PNK_NAME));
+
+    if (!BindNameToSlot(cx, bce, pn))
+        return false;
+
+    jsatomid atomIndex;
+    if (!MaybeEmitVarDecl(cx, bce, globalDefOp, pn, &atomIndex))
+        return false;
+
+    if (pn->getOp() != JSOP_INITLEXICAL) {
+        bool global = js_CodeSpec[pn->getOp()].format & JOF_GNAME;
+        if (!EmitIndex32(cx, global ? JSOP_BINDGNAME : JSOP_BINDNAME, atomIndex, bce))
+            return false;
+        if (Emit1(cx, bce, JSOP_SWAP) < 0)
+            return false;
+    }
+
+    if (!pn->pn_cookie.isFree()) {
+        if (!EmitVarOp(cx, pn, pn->getOp(), bce))
+            return false;
+    } else {
+        if (!EmitIndexOp(cx, pn->getOp(), atomIndex, bce))
+            return false;
+    }
+
+    return true;
+}
+
+// This follows ES6 14.5.14 (ClassDefinitionEvaluation) and ES6 14.5.15
+// (BindingClassDeclarationEvaluation).
+static bool
+EmitClass(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn)
+{
+    ClassNode &classNode = pn->as<ClassNode>();
+
+    ClassNames *names = classNode.names();
+
+    MOZ_ASSERT(!classNode.heritage(), "For now, no heritage expressions");
+    LexicalScopeNode *innerBlock = classNode.scope();
+
+    ParseNode *classMethods = innerBlock->pn_expr;
+    MOZ_ASSERT(classMethods->isKind(PNK_CLASSMETHODLIST));
+
+    ParseNode *constructor = nullptr;
+    for (ParseNode *mn = classMethods->pn_head; mn; mn = mn->pn_next) {
+        ClassMethod &method = mn->as<ClassMethod>();
+        ParseNode &methodName = method.name();
+        if (methodName.isKind(PNK_OBJECT_PROPERTY_NAME) &&
+            methodName.pn_atom == cx->names().constructor)
+        {
+            constructor = &method.method();
+            break;
+        }
+    }
+    MOZ_ASSERT(constructor, "For now, no default constructors");
+
+    bool savedStrictness = bce->sc->setLocalStrictMode(true);
+
+    StmtInfoBCE stmtInfo(cx);
+    if (!EnterBlockScope(cx, bce, &stmtInfo, innerBlock->pn_objbox, JSOP_UNINITIALIZED))
+        return false;
+
+    if (!EmitFunc(cx, bce, constructor))
+        return false;
+
+    if (!EmitNewInit(cx, bce, JSProto_Object))
+        return false;
+
+    if (Emit1(cx, bce, JSOP_DUP2) < 0)
+        return false;
+    if (!EmitAtomOp(cx, cx->names().prototype, JSOP_INITLOCKEDPROP, bce))
+        return false;
+    if (!EmitAtomOp(cx, cx->names().constructor, JSOP_INITHIDDENPROP, bce))
+        return false;
+
+    RootedPlainObject obj(cx);
+    if (!EmitPropertyList(cx, bce, classMethods, &obj, ClassBody))
+        return false;
+
+    if (Emit1(cx, bce, JSOP_POP) < 0)
+        return false;
+
+    // That DEFCONST is never gonna be used, but use it here for logical consistency.
+    ParseNode *innerName = names->innerBinding();
+    if (!EmitLexicalInitialization(cx, bce, innerName, JSOP_DEFCONST))
+        return false;
+
+    if (!LeaveNestedScope(cx, bce, &stmtInfo))
+        return false;
+
+    ParseNode *outerName = names->outerBinding();
+    if (!EmitLexicalInitialization(cx, bce, outerName, JSOP_DEFVAR))
+        return false;
+
+    if (Emit1(cx, bce, JSOP_POP) < 0)
+        return false;
+
+    MOZ_ALWAYS_TRUE(bce->sc->setLocalStrictMode(savedStrictness));
+
+    return true;
+}
+
 bool
 frontend::EmitTree(ExclusiveContext *cx, BytecodeEmitter *bce, ParseNode *pn)
 {
@@ -7298,6 +7454,10 @@
         MOZ_ASSERT(pn->getArity() == PN_NULLARY);
         break;
 
+      case PNK_CLASS:
+        ok = EmitClass(cx, bce, pn);
+        break;
+
       default:
         MOZ_ASSERT(0);
     }
@@ -7321,7 +7481,7 @@
 
     jssrcnote dummy = 0;
     if (!notes.append(dummy)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return -1;
     }
     return notes.length() - 1;
@@ -7455,7 +7615,7 @@
                 !(sn = notes.insert(sn, dummy)) ||
                 !(sn = notes.insert(sn, dummy)))
             {
-                js_ReportOutOfMemory(cx);
+                ReportOutOfMemory(cx);
                 return false;
             }
         }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/BytecodeEmitter.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/BytecodeEmitter.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/BytecodeEmitter.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/BytecodeEmitter.h	2015-02-28 15:03:04.000000000 +0000
@@ -162,6 +162,8 @@
 
     bool            hasSingletons:1;    /* script contains singleton initializer JSOP_OBJECT */
 
+    bool            hasTryFinally:1;    /* script contains finally block */
+
     bool            emittingForInit:1;  /* true while emitting init expr of for; exclude 'in' */
 
     bool            emittingRunOnceLambda:1; /* true while emitting a lambda which is only
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/FoldConstants.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/FoldConstants.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/FoldConstants.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/FoldConstants.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -80,6 +80,13 @@
         *result = false;
         return true;
 
+      // Similarly to the lexical declarations above, classes cannot add hoisted
+      // declarations
+      case PNK_CLASS:
+        MOZ_ASSERT(node->isArity(PN_TERNARY));
+        *result = false;
+        return true;
+
       // ContainsHoistedDeclaration is only called on nested nodes, so any
       // instance of this can't be function statements at body level.  In
       // SpiderMonkey, a binding induced by a function statement is added when
@@ -322,6 +329,7 @@
 
       // Grammar sub-components that should never be reached directly by this
       // method, because some parent component should have asserted itself.
+      case PNK_OBJECT_PROPERTY_NAME:
       case PNK_COMPUTED_NAME:
       case PNK_SPREAD:
       case PNK_MUTATEPROTO:
@@ -404,6 +412,9 @@
       case PNK_FORIN:
       case PNK_FOROF:
       case PNK_FORHEAD:
+      case PNK_CLASSMETHOD:
+      case PNK_CLASSMETHODLIST:
+      case PNK_CLASSNAMES:
         MOZ_CRASH("ContainsHoistedDeclaration should have indicated false on "
                   "some parent node without recurring to test this node");
 
@@ -814,6 +825,7 @@
              * NB: pn must be a PNK_IF as PNK_CONDITIONAL can never have a null
              * kid or an empty statement for a child.
              */
+            handler.prepareNodeForMutation(pn);
             pn->setKind(PNK_STATEMENTLIST);
             pn->setArity(PN_LIST);
             pn->makeEmpty();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/FullParseHandler.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/FullParseHandler.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/FullParseHandler.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/FullParseHandler.h	2015-02-28 15:03:04.000000000 +0000
@@ -104,8 +104,8 @@
         return dn;
     }
 
-    ParseNode *newIdentifier(JSAtom *atom, const TokenPos &pos) {
-        return new_<NullaryNode>(PNK_NAME, JSOP_NOP, pos, atom);
+    ParseNode *newObjectLiteralPropertyName(JSAtom *atom, const TokenPos &pos) {
+        return new_<NullaryNode>(PNK_OBJECT_PROPERTY_NAME, JSOP_NOP, pos, atom);
     }
 
     ParseNode *newNumber(double value, DecimalPoint decimalPoint, const TokenPos &pos) {
@@ -137,8 +137,7 @@
         if (!propExpr)
             return null();
 
-        if (!addArrayElement(callSite, propExpr))
-            return null();
+        addArrayElement(callSite, propExpr);
 
         return callSite;
     }
@@ -146,10 +145,8 @@
     bool addToCallSiteObject(ParseNode *callSiteObj, ParseNode *rawNode, ParseNode *cookedNode) {
         MOZ_ASSERT(callSiteObj->isKind(PNK_CALLSITEOBJ));
 
-        if (!addArrayElement(callSiteObj, cookedNode))
-            return false;
-        if (!addArrayElement(callSiteObj->pn_head, rawNode))
-            return false;
+        addArrayElement(callSiteObj, cookedNode);
+        addArrayElement(callSiteObj->pn_head, rawNode);
 
         /*
          * We don't know when the last noSubstTemplate will come in, and we
@@ -270,11 +267,10 @@
         return true;
     }
 
-    bool addArrayElement(ParseNode *literal, ParseNode *element) {
+    void addArrayElement(ParseNode *literal, ParseNode *element) {
         if (!element->isConstant())
             literal->pn_xflags |= PNX_NONCONST;
         literal->append(element);
-        return true;
     }
 
     ParseNode *newObjectLiteral(uint32_t begin) {
@@ -285,6 +281,16 @@
         return literal;
     }
 
+    ParseNode *newClass(ParseNode *name, ParseNode *heritage, ParseNode *methodBlock) {
+        return new_<ClassNode>(name, heritage, methodBlock);
+    }
+    ParseNode *newClassMethodList(uint32_t begin) {
+        return new_<ListNode>(PNK_CLASSMETHODLIST, TokenPos(begin, begin + 1));
+    }
+    ParseNode *newClassNames(ParseNode *outer, ParseNode *inner, const TokenPos &pos) {
+        return new_<ClassNames>(outer, inner, pos);
+    }
+
     bool addPrototypeMutation(ParseNode *literal, uint32_t begin, ParseNode *expr) {
         // Object literals with mutated [[Prototype]] are non-constant so that
         // singleton objects will have Object.prototype as their [[Prototype]].
@@ -297,31 +303,68 @@
         return true;
     }
 
-    bool addPropertyDefinition(ParseNode *literal, ParseNode *name, ParseNode *expr,
-                               bool isShorthand = false) {
+    bool addPropertyDefinition(ParseNode *literal, ParseNode *key, ParseNode *val) {
+        MOZ_ASSERT(literal->isKind(PNK_OBJECT));
         MOZ_ASSERT(literal->isArity(PN_LIST));
-        ParseNode *propdef = newBinary(isShorthand ? PNK_SHORTHAND : PNK_COLON, name, expr,
-                                       JSOP_INITPROP);
-        if (isShorthand)
-            literal->pn_xflags |= PNX_NONCONST;
+        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
+                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
+                   key->isKind(PNK_STRING) ||
+                   key->isKind(PNK_COMPUTED_NAME));
+
+        ParseNode *propdef = newBinary(PNK_COLON, key, val, JSOP_INITPROP);
         if (!propdef)
             return false;
         literal->append(propdef);
         return true;
     }
 
-    bool addMethodDefinition(ParseNode *literal, ParseNode *name, ParseNode *fn, JSOp op)
+    bool addShorthand(ParseNode *literal, ParseNode *name, ParseNode *expr) {
+        MOZ_ASSERT(literal->isKind(PNK_OBJECT));
+        MOZ_ASSERT(literal->isArity(PN_LIST));
+        MOZ_ASSERT(name->isKind(PNK_OBJECT_PROPERTY_NAME));
+        MOZ_ASSERT(expr->isKind(PNK_NAME));
+        MOZ_ASSERT(name->pn_atom == expr->pn_atom);
+
+        setListFlag(literal, PNX_NONCONST);
+        ParseNode *propdef = newBinary(PNK_SHORTHAND, name, expr, JSOP_INITPROP);
+        if (!propdef)
+            return false;
+        literal->append(propdef);
+        return true;
+    }
+
+    bool addObjectMethodDefinition(ParseNode *literal, ParseNode *key, ParseNode *fn, JSOp op)
     {
         MOZ_ASSERT(literal->isArity(PN_LIST));
+        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
+                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
+                   key->isKind(PNK_STRING) ||
+                   key->isKind(PNK_COMPUTED_NAME));
         literal->pn_xflags |= PNX_NONCONST;
 
-        ParseNode *propdef = newBinary(PNK_COLON, name, fn, op);
+        ParseNode *propdef = newBinary(PNK_COLON, key, fn, op);
         if (!propdef)
             return false;
         literal->append(propdef);
         return true;
     }
 
+    bool addClassMethodDefinition(ParseNode *methodList, ParseNode *key, ParseNode *fn, JSOp op,
+                                  bool isStatic)
+    {
+        MOZ_ASSERT(methodList->isKind(PNK_CLASSMETHODLIST));
+        MOZ_ASSERT(key->isKind(PNK_NUMBER) ||
+                   key->isKind(PNK_OBJECT_PROPERTY_NAME) ||
+                   key->isKind(PNK_STRING) ||
+                   key->isKind(PNK_COMPUTED_NAME));
+
+        ParseNode *classMethod = new_<ClassMethod>(key, fn, op, isStatic);
+        if (!classMethod)
+            return false;
+        methodList->append(classMethod);
+        return true;
+    }
+
     ParseNode *newYieldExpression(uint32_t begin, ParseNode *value, ParseNode *gen,
                                   JSOp op = JSOP_YIELD) {
         TokenPos pos(begin, value ? value->pn_pos.end : begin + 1);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/NameFunctions.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/NameFunctions.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/NameFunctions.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/NameFunctions.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -48,7 +48,7 @@
             return buf->append('.') && buf->append(name);
 
         /* Quote the string as needed. */
-        JSString *source = js_QuoteString(cx, name, '"');
+        JSString *source = QuoteString(cx, name, '"');
         return source && buf->append('[') && buf->append(source) && buf->append(']');
     }
 
@@ -224,12 +224,14 @@
 
             if (node->isKind(PNK_COLON) || node->isKind(PNK_SHORTHAND)) {
                 ParseNode *left = node->pn_left;
-                if (left->isKind(PNK_NAME) || left->isKind(PNK_STRING)) {
+                if (left->isKind(PNK_OBJECT_PROPERTY_NAME) || left->isKind(PNK_STRING)) {
                     if (!appendPropertyReference(left->pn_atom))
                         return false;
                 } else if (left->isKind(PNK_NUMBER)) {
                     if (!appendNumericPropertyReference(left->pn_dval))
                         return false;
+                } else {
+                    MOZ_ASSERT(left->isKind(PNK_COMPUTED_NAME));
                 }
             } else {
                 /*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/ParseMaps.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/ParseMaps.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/ParseMaps.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/ParseMaps.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -62,7 +62,7 @@
 {
     Node *result = alloc.new_<Node>(head, tail);
     if (!result)
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
     return result;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/ParseNode.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/ParseNode.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/ParseNode.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/ParseNode.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -79,7 +79,6 @@
         pn->pn_next = top;
         top = pn;
     }
-    void pushUnlessNull(ParseNode *pn) { if (pn) push(pn); }
     /* Push the children of the PN_LIST node |pn| on the stack. */
     void pushList(ParseNode *pn) {
         /* This clobbers pn->pn_head if the list is empty; should be okay. */
@@ -123,7 +122,8 @@
      * them.
      */
     node->pn_funbox = nullptr;
-    stack->pushUnlessNull(node->pn_body);
+    if (node->pn_body)
+        stack->push(node->pn_body);
     node->pn_body = nullptr;
 
     return PushResult::CleanUpLater;
@@ -146,7 +146,8 @@
      * reference.
      */
     if (!node->isUsed()) {
-        stack->pushUnlessNull(node->pn_expr);
+        if (node->pn_expr)
+            stack->push(node->pn_expr);
         node->pn_expr = nullptr;
     }
 
@@ -168,18 +169,6 @@
 }
 
 static PushResult
-PushTernaryNodeNullableChildren(ParseNode *node, NodeStack *stack)
-{
-    MOZ_ASSERT(node->isArity(PN_TERNARY));
-
-    stack->pushUnlessNull(node->pn_kid1);
-    stack->pushUnlessNull(node->pn_kid2);
-    stack->pushUnlessNull(node->pn_kid3);
-
-    return PushResult::Recyclable;
-}
-
-static PushResult
 PushUnaryNodeChild(ParseNode *node, NodeStack *stack)
 {
     MOZ_ASSERT(node->isArity(PN_UNARY));
@@ -189,57 +178,6 @@
     return PushResult::Recyclable;
 }
 
-static PushResult
-PushUnaryNodeNullableChild(ParseNode *node, NodeStack *stack)
-{
-    MOZ_ASSERT(node->isArity(PN_UNARY));
-
-    if (node->pn_kid)
-        stack->push(node->pn_kid);
-
-    return PushResult::Recyclable;
-}
-
-static PushResult
-PushBinaryNodeChildren(ParseNode *node, NodeStack *stack)
-{
-    MOZ_ASSERT(node->isArity(PN_BINARY));
-
-    stack->push(node->pn_left);
-    stack->push(node->pn_right);
-
-    return PushResult::Recyclable;
-}
-
-static PushResult
-PushBinaryNodeNullableChildren(ParseNode *node, NodeStack *stack)
-{
-    MOZ_ASSERT(node->isArity(PN_BINARY) || node->isArity(PN_BINARY_OBJ));
-
-    if (node->pn_left != node->pn_right) {
-        // XXX Is it ever the case that left == right any more?  I think this
-        //     used to be PNK_SHORTHAND, but its two children are now different
-        //     nodes that are structurally equivalent, so PNK_SHORTHAND doesn't
-        //     require this.
-        stack->pushUnlessNull(node->pn_left);
-    }
-
-    stack->pushUnlessNull(node->pn_right);
-
-    return PushResult::Recyclable;
-}
-
-static PushResult
-CanRecycleNullaryNode(ParseNode *node, NodeStack *stack)
-{
-    MOZ_ASSERT(node->isArity(PN_NULLARY));
-
-    if (node->isUsed() || node->isDefn())
-        return PushResult::CleanUpLater;
-
-    return PushResult::Recyclable;
-}
-
 /*
  * Push the children of |pn| on |stack|. Return true if |pn| itself could be
  * safely recycled, or false if it must be cleaned later (pn_used and pn_defn
@@ -269,6 +207,7 @@
       case PNK_CONTINUE:
       case PNK_DEBUGGER:
       case PNK_EXPORT_BATCH_SPEC:
+      case PNK_OBJECT_PROPERTY_NAME:
         MOZ_ASSERT(pn->isArity(PN_NULLARY));
         MOZ_ASSERT(!pn->isUsed(), "handle non-trivial cases separately");
         MOZ_ASSERT(!pn->isDefn(), "handle non-trivial cases separately");
@@ -295,8 +234,12 @@
         return PushUnaryNodeChild(pn, stack);
 
       // Nodes with a single nullable child.
-      case PNK_SEMI:
-        return PushUnaryNodeNullableChild(pn, stack);
+      case PNK_SEMI: {
+        MOZ_ASSERT(pn->isArity(PN_UNARY));
+        if (pn->pn_kid)
+            stack->push(pn->pn_kid);
+        return PushResult::Recyclable;
+      }
 
       // Binary nodes with two non-null children.
 
@@ -314,6 +257,10 @@
       case PNK_DIVASSIGN:
       case PNK_MODASSIGN:
       // ...and a few others.
+      case PNK_ELEM:
+      case PNK_LETEXPR:
+      case PNK_IMPORT_SPEC:
+      case PNK_EXPORT_SPEC:
       case PNK_COLON:
       case PNK_CASE:
       case PNK_SHORTHAND:
@@ -321,8 +268,25 @@
       case PNK_WHILE:
       case PNK_SWITCH:
       case PNK_LETBLOCK:
-      case PNK_FOR:
-        return PushBinaryNodeChildren(pn, stack);
+      case PNK_CLASSNAMES:
+      case PNK_CLASSMETHOD:
+      case PNK_FOR: {
+        MOZ_ASSERT(pn->isArity(PN_BINARY));
+        stack->push(pn->pn_left);
+        stack->push(pn->pn_right);
+        return PushResult::Recyclable;
+      }
+
+      // PNK_WITH is PN_BINARY_OBJ -- that is, PN_BINARY with (irrelevant for
+      // this method's purposes) the addition of the StaticWithObject as
+      // pn_binary_obj.  Both left (expression) and right (statement) are
+      // non-null.
+      case PNK_WITH: {
+        MOZ_ASSERT(pn->isArity(PN_BINARY_OBJ));
+        stack->push(pn->pn_left);
+        stack->push(pn->pn_right);
+        return PushResult::Recyclable;
+      }
 
       // Default nodes, for dumb reasons that we're not changing now (mostly
       // structural semi-consistency with PNK_CASE nodes), have a null left
@@ -352,6 +316,36 @@
         return PushResult::Recyclable;
       }
 
+      // A return node's left half is what you'd expect: the return expression,
+      // if any.  The right half is non-null only for returns inside generator
+      // functions, with the structure described in the assertions.
+      case PNK_RETURN: {
+        MOZ_ASSERT(pn->isArity(PN_BINARY));
+        if (pn->pn_left)
+            stack->push(pn->pn_left);
+        if (pn->pn_right) {
+            MOZ_ASSERT(pn->pn_right->isKind(PNK_NAME));
+            MOZ_ASSERT(pn->pn_right->pn_atom->equals(".genrval"));
+            MOZ_ASSERT(pn->pn_right->isAssigned());
+            stack->push(pn->pn_right);
+        }
+        return PushResult::Recyclable;
+      }
+
+      // Import and export-from nodes have a list of specifiers on the left
+      // and a module string on the right.
+      case PNK_IMPORT:
+      case PNK_EXPORT_FROM: {
+        MOZ_ASSERT(pn->isArity(PN_BINARY));
+        MOZ_ASSERT_IF(pn->isKind(PNK_IMPORT), pn->pn_left->isKind(PNK_IMPORT_SPEC_LIST));
+        MOZ_ASSERT_IF(pn->isKind(PNK_EXPORT_FROM), pn->pn_left->isKind(PNK_EXPORT_SPEC_LIST));
+        MOZ_ASSERT(pn->pn_left->isArity(PN_LIST));
+        MOZ_ASSERT(pn->pn_right->isKind(PNK_STRING));
+        stack->pushList(pn->pn_left);
+        stack->push(pn->pn_right);
+        return PushResult::Recyclable;
+      }
+
       // Ternary nodes with all children non-null.
       case PNK_CONDITIONAL: {
         MOZ_ASSERT(pn->isArity(PN_TERNARY));
@@ -378,8 +372,26 @@
       }
 
       // for (;;) nodes have one child per optional component of the loop head.
-      case PNK_FORHEAD:
-        return PushTernaryNodeNullableChildren(pn, stack);
+      case PNK_FORHEAD: {
+        MOZ_ASSERT(pn->isArity(PN_TERNARY));
+        if (pn->pn_kid1)
+            stack->push(pn->pn_kid1);
+        if (pn->pn_kid2)
+            stack->push(pn->pn_kid2);
+        if (pn->pn_kid3)
+            stack->push(pn->pn_kid3);
+        return PushResult::Recyclable;
+      }
+
+      // classes might have an optinal node for the heritage
+      case PNK_CLASS: {
+        MOZ_ASSERT(pn->isArity(PN_TERNARY));
+        stack->push(pn->pn_kid1);
+        if (pn->pn_kid2)
+            stack->push(pn->pn_kid2);
+        stack->push(pn->pn_kid3);
+        return PushResult::Recyclable;
+      }
 
       // if-statement nodes have condition and consequent children and a
       // possibly-null alternative.
@@ -405,6 +417,19 @@
         return PushResult::Recyclable;
       }
 
+      // A catch node has first kid as catch-variable pattern, the second kid
+      // as catch condition (which, if non-null, records the |<cond>| in
+      // SpiderMonkey's |catch (e if <cond>)| extension), and third kid as the
+      // statements in the catch block.
+      case PNK_CATCH: {
+        MOZ_ASSERT(pn->isArity(PN_TERNARY));
+        stack->push(pn->pn_kid1);
+        if (pn->pn_kid2)
+            stack->push(pn->pn_kid2);
+        stack->push(pn->pn_kid3);
+        return PushResult::Recyclable;
+      }
+
       // List nodes with all non-null children.
       case PNK_OR:
       case PNK_AND:
@@ -430,77 +455,55 @@
       case PNK_DIV:
       case PNK_MOD:
       case PNK_COMMA:
+      case PNK_NEW:
+      case PNK_CALL:
+      case PNK_GENEXP:
       case PNK_ARRAY:
       case PNK_OBJECT:
+      case PNK_TEMPLATE_STRING_LIST:
+      case PNK_TAGGED_TEMPLATE:
+      case PNK_CALLSITEOBJ:
       case PNK_VAR:
       case PNK_CONST:
       case PNK_GLOBALCONST:
+      case PNK_LET:
       case PNK_CATCHLIST:
+      case PNK_STATEMENTLIST:
+      case PNK_IMPORT_SPEC_LIST:
+      case PNK_EXPORT_SPEC_LIST:
       case PNK_SEQ:
       case PNK_ARGSBODY:
+      case PNK_CLASSMETHODLIST:
         return PushListNodeChildren(pn, stack);
 
-      case PNK_LABEL:
-        return PushNameNodeChildren(pn, stack);
+      // Array comprehension nodes are lists with a single child -- PNK_FOR for
+      // comprehensions, PNK_LEXICALSCOPE for legacy comprehensions.  Probably
+      // this should be a non-list eventually.
+      case PNK_ARRAYCOMP: {
+#ifdef DEBUG
+        MOZ_ASSERT(pn->isKind(PNK_ARRAYCOMP));
+        MOZ_ASSERT(pn->isArity(PN_LIST));
+        MOZ_ASSERT(pn->pn_count == 1);
+        MOZ_ASSERT(pn->pn_head->isKind(PNK_LEXICALSCOPE) || pn->pn_head->isKind(PNK_FOR));
+#endif
+        return PushListNodeChildren(pn, stack);
+      }
 
+      case PNK_LABEL:
       case PNK_DOT:
-      case PNK_ELEM:
-      case PNK_STATEMENTLIST:
-      case PNK_CALL:
+      case PNK_LEXICALSCOPE:
       case PNK_NAME:
-      case PNK_TEMPLATE_STRING_LIST:
-      case PNK_TAGGED_TEMPLATE:
-      case PNK_CALLSITEOBJ:
+        return PushNameNodeChildren(pn, stack);
+
       case PNK_FUNCTION:
-      case PNK_WITH:
-      case PNK_RETURN:
-      case PNK_NEW:
-      case PNK_CATCH:
-      case PNK_GENEXP:
-      case PNK_ARRAYCOMP:
-      case PNK_LEXICALSCOPE:
-      case PNK_LET:
-      case PNK_LETEXPR:
-      case PNK_IMPORT:
-      case PNK_IMPORT_SPEC_LIST:
-      case PNK_IMPORT_SPEC:
-      case PNK_EXPORT_FROM:
-      case PNK_EXPORT_SPEC_LIST:
-      case PNK_EXPORT_SPEC:
-        break; // for now
+        return PushCodeNodeChildren(pn, stack);
 
       case PNK_LIMIT: // invalid sentinel value
         MOZ_CRASH("invalid node kind");
     }
 
-    // Fallthrough for not-yet-handled kinds.
-    switch (pn->getArity()) {
-      case PN_CODE:
-        return PushCodeNodeChildren(pn, stack);
-
-      case PN_NAME:
-        return PushNameNodeChildren(pn, stack);
-
-      case PN_LIST:
-        return PushListNodeChildren(pn, stack);
-
-      case PN_TERNARY:
-        return PushTernaryNodeNullableChildren(pn, stack);
-
-      case PN_BINARY:
-      case PN_BINARY_OBJ:
-        return PushBinaryNodeNullableChildren(pn, stack);
-
-      case PN_UNARY:
-        return PushUnaryNodeNullableChild(pn, stack);
-
-      case PN_NULLARY:
-        return CanRecycleNullaryNode(pn, stack);
-
-      default:
-        MOZ_CRASH("huh?");
-        return PushResult::CleanUpLater;
-    }
+    MOZ_CRASH("bad ParseNodeKind");
+    return PushResult::CleanUpLater;
 }
 
 /*
@@ -566,7 +569,7 @@
 
     void *p = alloc.alloc(sizeof (ParseNode));
     if (!p)
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
     return p;
 }
 
@@ -640,7 +643,7 @@
 
       case PN_CODE:
         NULLCHECK(pn->pn_funbox = newFunctionBox(pn, opn->pn_funbox->function(), pc,
-                                                 Directives(/* strict = */ opn->pn_funbox->strict),
+                                                 Directives(/* strict = */ opn->pn_funbox->strict()),
                                                  opn->pn_funbox->generatorKind()));
         NULLCHECK(pn->pn_body = cloneParseTree(opn->pn_body));
         pn->pn_cookie = opn->pn_cookie;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/ParseNode.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/ParseNode.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/ParseNode.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/ParseNode.h	2015-02-28 15:03:04.000000000 +0000
@@ -89,6 +89,7 @@
     F(OBJECT) \
     F(CALL) \
     F(NAME) \
+    F(OBJECT_PROPERTY_NAME) \
     F(COMPUTED_NAME) \
     F(NUMBER) \
     F(STRING) \
@@ -148,6 +149,10 @@
     F(ARGSBODY) \
     F(SPREAD) \
     F(MUTATEPROTO) \
+    F(CLASS) \
+    F(CLASSMETHOD) \
+    F(CLASSMETHODLIST) \
+    F(CLASSNAMES) \
     \
     /* Unary operators. */ \
     F(TYPEOF) \
@@ -570,6 +575,7 @@
             union {
                 unsigned iflags;        /* JSITER_* flags for PNK_FOR node */
                 ObjectBox *objbox;      /* Only for PN_BINARY_OBJ */
+                bool isStatic;          /* Only for PNK_CLASSMETHOD */
             };
         } binary;
         struct {                        /* one kid if unary */
@@ -1101,6 +1107,10 @@
         pn_expr = blockNode;
         pn_blockid = blockNode->pn_blockid;
     }
+
+    static bool test(const ParseNode &node) {
+        return node.isKind(PNK_LEXICALSCOPE);
+    }
 };
 
 class LabeledStatement : public ParseNode
@@ -1318,6 +1328,91 @@
     }
 };
 
+struct ClassMethod : public BinaryNode {
+    /*
+     * Method defintions often keep a name and function body that overlap,
+     * so explicitly define the beginning and end here.
+     */
+    ClassMethod(ParseNode *name, ParseNode *body, JSOp op, bool isStatic)
+      : BinaryNode(PNK_CLASSMETHOD, op, TokenPos(name->pn_pos.begin, body->pn_pos.end), name, body)
+    {
+        pn_u.binary.isStatic = isStatic;
+    }
+
+    static bool test(const ParseNode &node) {
+        bool match = node.isKind(PNK_CLASSMETHOD);
+        MOZ_ASSERT_IF(match, node.isArity(PN_BINARY));
+        return match;
+    }
+
+    ParseNode &name() const {
+        return *pn_u.binary.left;
+    }
+    ParseNode &method() const {
+        return *pn_u.binary.right;
+    }
+    bool isStatic() const {
+        return pn_u.binary.isStatic;
+    }
+};
+
+struct ClassNames : public BinaryNode {
+    ClassNames(ParseNode *outerBinding, ParseNode *innerBinding, const TokenPos &pos)
+      : BinaryNode(PNK_CLASSNAMES, JSOP_NOP, pos, outerBinding, innerBinding)
+    {
+        MOZ_ASSERT(outerBinding->isKind(PNK_NAME));
+        MOZ_ASSERT(innerBinding->isKind(PNK_NAME));
+        MOZ_ASSERT(innerBinding->pn_atom == outerBinding->pn_atom);
+    }
+
+    static bool test(const ParseNode &node) {
+        bool match = node.isKind(PNK_CLASSNAMES);
+        MOZ_ASSERT_IF(match, node.isArity(PN_BINARY));
+        return match;
+    }
+
+    /*
+     * Classes require two definitions: The first "outer" binding binds the
+     * class into the scope in which it was declared. the outer binding is a
+     * mutable lexial binding. The second "inner" binding binds the class by
+     * name inside a block in which the methods are evaulated. It is immutable,
+     * giving the methods access to the static members of the class even if
+     * the outer binding has been overwritten.
+     */
+    ParseNode *outerBinding() const {
+        return pn_u.binary.left;
+    }
+    ParseNode *innerBinding() const {
+        return pn_u.binary.right;
+    }
+};
+
+struct ClassNode : public TernaryNode {
+    ClassNode(ParseNode *names, ParseNode *heritage, ParseNode *methodBlock)
+      : TernaryNode(PNK_CLASS, JSOP_NOP, names, heritage, methodBlock)
+    {
+        MOZ_ASSERT(names->is<ClassNames>());
+        MOZ_ASSERT(methodBlock->is<LexicalScopeNode>());
+    }
+
+    static bool test(const ParseNode &node) {
+        bool match = node.isKind(PNK_CLASS);
+        MOZ_ASSERT_IF(match, node.isArity(PN_TERNARY));
+        return match;
+    }
+
+    ClassNames *names() const {
+        return &pn_kid1->as<ClassNames>();
+    }
+    ParseNode *heritage() const {
+        return pn_kid2;
+    }
+    LexicalScopeNode *scope() const {
+        return &pn_kid3->as<LexicalScopeNode>();
+    }
+};
+
+
 #ifdef DEBUG
 void DumpParseTree(ParseNode *pn, int indent = 0);
 #endif
@@ -1552,7 +1647,7 @@
     ParseStrictError
 };
 
-enum FunctionSyntaxKind { Expression, Statement, Arrow, Method };
+enum FunctionSyntaxKind { Expression, Statement, Arrow, Method, Lazy };
 
 static inline ParseNode *
 FunctionArgsList(ParseNode *fn, unsigned *numFormals)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/Parser.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/Parser.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/Parser.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/Parser.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -395,7 +395,7 @@
     uint32_t count = args_.length() + vars_.length() + bodyLevelLexicals_.length();
     Binding *packedBindings = alloc.newArrayUninitialized<Binding>(count);
     if (!packedBindings) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -576,7 +576,7 @@
 
     ObjectBox *objbox = alloc.new_<ObjectBox>(obj, traceListHead);
     if (!objbox) {
-        js_ReportOutOfMemory(context);
+        ReportOutOfMemory(context);
         return nullptr;
     }
 
@@ -673,7 +673,7 @@
                                 inheritedDirectives, options().extraWarningsOption,
                                 generatorKind);
     if (!funbox) {
-        js_ReportOutOfMemory(context);
+        ReportOutOfMemory(context);
         return nullptr;
     }
 
@@ -754,7 +754,7 @@
     } else {
         errnum = anonerrnum;
     }
-    return report(kind, pc->sc->strict, pn, errnum, name.ptr());
+    return report(kind, pc->sc->strict(), pn, errnum, name.ptr());
 }
 
 /*
@@ -777,7 +777,7 @@
         if (!AtomToPrintableString(context, atom, &name))
             return false;
 
-        if (!report(ParseStrictError, pc->sc->strict, lhs, JSMSG_BAD_STRICT_ASSIGN, name.ptr()))
+        if (!report(ParseStrictError, pc->sc->strict(), lhs, JSMSG_BAD_STRICT_ASSIGN, name.ptr()))
             return false;
     }
     return true;
@@ -800,7 +800,7 @@
         JSAutoByteString bytes;
         if (!AtomToPrintableString(context, name, &bytes))
             return false;
-        return report(ParseStrictError, pc->sc->strict, pn,
+        return report(ParseStrictError, pc->sc->strict(), pn,
                       JSMSG_BAD_BINDING, bytes.ptr());
     }
 
@@ -1505,7 +1505,7 @@
             JSAutoByteString bytes;
             if (!AtomToPrintableString(context, name, &bytes))
                 return false;
-            if (!report(ParseStrictError, pc->sc->strict, pn,
+            if (!report(ParseStrictError, pc->sc->strict(), pn,
                         JSMSG_DUPLICATE_FORMAL, bytes.ptr()))
             {
                 return false;
@@ -1892,7 +1892,7 @@
              * statements (e.g., functions in an "if" or "while" block) are
              * dynamically bound when control flow reaches the statement.
              */
-            MOZ_ASSERT(!pc->sc->strict);
+            MOZ_ASSERT(!pc->sc->strict());
             MOZ_ASSERT(pn->pn_cookie.isFree());
             if (pc->sc->isFunctionBox()) {
                 FunctionBox *funbox = pc->sc->asFunctionBox();
@@ -2278,7 +2278,7 @@
     for (size_t i = 0; i < numInnerFunctions; i++)
         innerFunctions[i].init(pc->innerFunctions[i]);
 
-    if (pc->sc->strict)
+    if (pc->sc->strict())
         lazy->setStrict();
     lazy->setGeneratorKind(funbox->generatorKind());
     if (funbox->usesArguments && funbox->usesApply && funbox->usesThis)
@@ -2470,7 +2470,7 @@
     if (!funpc.init(tokenStream))
         return null();
 
-    if (!functionArgsAndBodyGeneric(pn, fun, Normal, Statement)) {
+    if (!functionArgsAndBodyGeneric(pn, fun, Normal, Lazy)) {
         MOZ_ASSERT(directives == newDirectives);
         return null();
     }
@@ -2555,8 +2555,11 @@
     if (!body)
         return false;
 
-    if (fun->name() && !checkStrictBinding(fun->name(), pn))
+    if (kind != Method && kind != Lazy && 
+        fun->name() && !checkStrictBinding(fun->name(), pn))
+    {
         return false;
+    }
 
     if (bodyType == StatementListBody) {
         bool matched;
@@ -2568,13 +2571,13 @@
         }
         funbox->bufEnd = pos().begin + 1;
     } else {
-#if not JS_HAS_EXPR_CLOSURES
+#if !JS_HAS_EXPR_CLOSURES
         MOZ_ASSERT(kind == Arrow);
 #endif
         if (tokenStream.hadError())
             return false;
         funbox->bufEnd = pos().end;
-        if (kind == Statement && !MatchOrInsertSemicolon(tokenStream))
+        if ((kind == Statement || kind == Lazy) && !MatchOrInsertSemicolon(tokenStream))
             return false;
     }
 
@@ -2587,7 +2590,7 @@
 {
     // In star generators and in JS >= 1.7, yield is a keyword.  Otherwise in
     // strict mode, yield is a future reserved word.
-    if (pc->isStarGenerator() || versionNumber() >= JSVERSION_1_7 || pc->sc->strict) {
+    if (pc->isStarGenerator() || versionNumber() >= JSVERSION_1_7 || pc->sc->strict()) {
         report(ParseError, false, null(), JSMSG_RESERVED_ID, "yield");
         return false;
     }
@@ -2626,7 +2629,7 @@
 
     /* We forbid function statements in strict mode code. */
     if (!pc->atBodyLevel() && pc->sc->needStrictChecks() &&
-        !report(ParseStrictError, pc->sc->strict, null(), JSMSG_STRICT_FUNCTION_STATEMENT))
+        !report(ParseStrictError, pc->sc->strict(), null(), JSMSG_STRICT_FUNCTION_STATEMENT))
         return null();
 
     return functionDef(name, Normal, Statement, generatorKind);
@@ -2779,7 +2782,7 @@
             // We're going to be in strict mode. Note that this scope explicitly
             // had "use strict";
             pc->sc->setExplicitUseStrict();
-            if (!pc->sc->strict) {
+            if (!pc->sc->strict()) {
                 if (pc->sc->isFunctionBox()) {
                     // Request that this function be reparsed as strict.
                     pc->newDirectives->setStrict();
@@ -2792,7 +2795,7 @@
                         report(ParseError, false, null(), JSMSG_DEPRECATED_OCTAL);
                         return false;
                     }
-                    pc->sc->strict = true;
+                    pc->sc->strictScript = true;
                 }
             }
         } else if (directive == context->names().useAsm) {
@@ -3263,7 +3266,7 @@
                pn->isOp(JSOP_SPREADEVAL) || pn->isOp(JSOP_STRICTSPREADEVAL) ||
                pn->isOp(JSOP_FUNCALL) || pn->isOp(JSOP_FUNAPPLY));
 
-    if (!report(ParseStrictError, pc->sc->strict, pn, msg))
+    if (!report(ParseStrictError, pc->sc->strict(), pn, msg))
         return false;
     handler.markAsSetCall(pn);
     return true;
@@ -3322,7 +3325,7 @@
 
 template <>
 bool
-Parser<FullParseHandler>::bindDestructuringVar(BindData<FullParseHandler> *data, ParseNode *pn)
+Parser<FullParseHandler>::bindInitialized(BindData<FullParseHandler> *data, ParseNode *pn)
 {
     MOZ_ASSERT(pn->isKind(PNK_NAME));
 
@@ -3382,7 +3385,7 @@
                 report(ParseError, false, expr, JSMSG_NO_VARIABLE_NAME);
                 return false;
             }
-            ok = bindDestructuringVar(data, expr);
+            ok = bindInitialized(data, expr);
         } else {
             ok = checkAndMarkAsAssignmentLhs(expr, KeyedDestructuringAssignment);
         }
@@ -3430,7 +3433,7 @@
                     report(ParseError, false, target, JSMSG_NO_VARIABLE_NAME);
                     return false;
                 }
-                ok = bindDestructuringVar(data, target);
+                ok = bindInitialized(data, target);
             } else {
                 ok = checkAndMarkAsAssignmentLhs(target, KeyedDestructuringAssignment);
             }
@@ -3660,7 +3663,7 @@
              *
              * See bug 569464.
              */
-            if (!reportWithOffset(ParseStrictError, pc->sc->strict, begin,
+            if (!reportWithOffset(ParseStrictError, pc->sc->strict(), begin,
                                   JSMSG_STRICT_CODE_LET_EXPR_STMT))
             {
                 return null();
@@ -3684,7 +3687,7 @@
         MUST_MATCH_TOKEN(TOK_RC, JSMSG_CURLY_AFTER_LET);
 
         addTelemetry(JSCompartment::DeprecatedLetBlock);
-        if (!report(ParseWarning, pc->sc->strict, expr, JSMSG_DEPRECATED_LET_BLOCK))
+        if (!report(ParseWarning, pc->sc->strict(), expr, JSMSG_DEPRECATED_LET_BLOCK))
             return null();
     } else {
         MOZ_ASSERT(letContext == LetExpression);
@@ -3693,7 +3696,7 @@
             return null();
 
         addTelemetry(JSCompartment::DeprecatedLetExpression);
-        if (!report(ParseWarning, pc->sc->strict, expr, JSMSG_DEPRECATED_LET_EXPRESSION))
+        if (!report(ParseWarning, pc->sc->strict(), expr, JSMSG_DEPRECATED_LET_EXPRESSION))
             return null();
     }
     handler.setLexicalScopeBody(block, expr);
@@ -3951,135 +3954,168 @@
 }
 
 template <>
-ParseNode *
-Parser<FullParseHandler>::lexicalDeclaration(bool isConst)
+bool
+Parser<FullParseHandler>::checkAndPrepareLexical(bool isConst, const TokenPos &errorPos)
 {
-    handler.disableSyntaxParser();
+    /*
+     * This is a lexical declaration. We must be directly under a block per the
+     * proposed ES4 specs, but not an implicit block created due to
+     * 'for (let ...)'. If we pass this error test, make the enclosing
+     * StmtInfoPC be our scope. Further let declarations in this block will
+     * find this scope statement and use the same block object.
+     *
+     * If we are the first let declaration in this block (i.e., when the
+     * enclosing maybe-scope StmtInfoPC isn't yet a scope statement) then
+     * we also need to set pc->blockNode to be our PNK_LEXICALSCOPE.
+     */
+    StmtInfoPC *stmt = pc->topStmt;
+    if (stmt && (!stmt->maybeScope() || stmt->isForLetBlock)) {
+        reportWithOffset(ParseError, false, errorPos.begin, JSMSG_LEXICAL_DECL_NOT_IN_BLOCK,
+                         isConst ? "const" : "lexical");
+        return false;
+    }
 
-    ParseNode *pn;
+    if (stmt && stmt->isBlockScope) {
+        MOZ_ASSERT(pc->staticScope == stmt->staticScope);
+    } else {
+        if (pc->atBodyLevel()) {
+            /*
+             * When bug 589199 is fixed, let variables will be stored in
+             * the slots of a new scope chain object, encountered just
+             * before the global object in the overall chain.  This extra
+             * object is present in the scope chain for all code in that
+             * global, including self-hosted code.  But self-hosted code
+             * must be usable against *any* global object, including ones
+             * with other let variables -- variables possibly placed in
+             * conflicting slots.  Forbid top-level let declarations to
+             * prevent such conflicts from ever occurring.
+             */
+            bool isGlobal = !pc->sc->isFunctionBox() && stmt == pc->topScopeStmt;
+            if (options().selfHostingMode && isGlobal) {
+                report(ParseError, false, null(), JSMSG_SELFHOSTED_TOP_LEVEL_LEXICAL,
+                        isConst ? "'const'" : "'let'");
+                return false;
+            }
+            return true;
+        }
 
-    do {
         /*
-         * This is a let declaration. We must be directly under a block per the
-         * proposed ES4 specs, but not an implicit block created due to
-         * 'for (let ...)'. If we pass this error test, make the enclosing
-         * StmtInfoPC be our scope. Further let declarations in this block will
-         * find this scope statement and use the same block object.
-         *
-         * If we are the first let declaration in this block (i.e., when the
-         * enclosing maybe-scope StmtInfoPC isn't yet a scope statement) then
-         * we also need to set pc->blockNode to be our PNK_LEXICALSCOPE.
+         * Some obvious assertions here, but they may help clarify the
+         * situation. This stmt is not yet a scope, so it must not be a
+         * catch block (catch is a lexical scope by definition).
          */
-        StmtInfoPC *stmt = pc->topStmt;
-        if (stmt && (!stmt->maybeScope() || stmt->isForLetBlock)) {
-            report(ParseError, false, null(), JSMSG_LEXICAL_DECL_NOT_IN_BLOCK,
-                   isConst ? "const" : "let");
-            return null();
-        }
-
-        if (stmt && stmt->isBlockScope) {
-            MOZ_ASSERT(pc->staticScope == stmt->staticScope);
-        } else {
-            if (pc->atBodyLevel()) {
-                /*
-                 * When bug 589199 is fixed, let variables will be stored in
-                 * the slots of a new scope chain object, encountered just
-                 * before the global object in the overall chain.  This extra
-                 * object is present in the scope chain for all code in that
-                 * global, including self-hosted code.  But self-hosted code
-                 * must be usable against *any* global object, including ones
-                 * with other let variables -- variables possibly placed in
-                 * conflicting slots.  Forbid top-level let declarations to
-                 * prevent such conflicts from ever occurring.
-                 */
-                bool isGlobal = !pc->sc->isFunctionBox() && stmt == pc->topScopeStmt;
-                if (options().selfHostingMode && isGlobal) {
-                    report(ParseError, false, null(), JSMSG_SELFHOSTED_TOP_LEVEL_LEXICAL,
-                           isConst ? "'const'" : "'let'");
-                    return null();
-                }
-
-                /*
-                 * Parse body-level lets without a new block object. ES6 specs
-                 * that an execution environment's initial lexical environment
-                 * is the VariableEnvironment, i.e., body-level lets are in
-                 * the same environment record as vars.
-                 *
-                 * However, they cannot be parsed exactly as vars, as ES6
-                 * requires that uninitialized lets throw ReferenceError on use.
-                 *
-                 * See 8.1.1.1.6 and the note in 13.2.1.
-                 *
-                 * FIXME global-level lets are still considered vars until
-                 * other bugs are fixed.
-                 */
-                ParseNodeKind kind = PNK_LET;
-                if (isGlobal)
-                    kind = isConst ? PNK_GLOBALCONST : PNK_VAR;
-                else if (isConst)
-                    kind = PNK_CONST;
-                pn = variables(kind);
-                if (!pn)
-                    return null();
-                pn->pn_xflags |= PNX_POPVAR;
-                break;
-            }
-
-            /*
-             * Some obvious assertions here, but they may help clarify the
-             * situation. This stmt is not yet a scope, so it must not be a
-             * catch block (catch is a lexical scope by definition).
-             */
-            MOZ_ASSERT(!stmt->isBlockScope);
-            MOZ_ASSERT(stmt != pc->topScopeStmt);
-            MOZ_ASSERT(stmt->type == STMT_BLOCK ||
-                       stmt->type == STMT_SWITCH ||
-                       stmt->type == STMT_TRY ||
-                       stmt->type == STMT_FINALLY);
-            MOZ_ASSERT(!stmt->downScope);
-
-            /* Convert the block statement into a scope statement. */
-            StaticBlockObject *blockObj = StaticBlockObject::create(context);
-            if (!blockObj)
-                return null();
+        MOZ_ASSERT(!stmt->isBlockScope);
+        MOZ_ASSERT(stmt != pc->topScopeStmt);
+        MOZ_ASSERT(stmt->type == STMT_BLOCK ||
+                    stmt->type == STMT_SWITCH ||
+                    stmt->type == STMT_TRY ||
+                    stmt->type == STMT_FINALLY);
+        MOZ_ASSERT(!stmt->downScope);
+
+        /* Convert the block statement into a scope statement. */
+        StaticBlockObject *blockObj = StaticBlockObject::create(context);
+        if (!blockObj)
+            return false;
 
-            ObjectBox *blockbox = newObjectBox(blockObj);
-            if (!blockbox)
-                return null();
+        ObjectBox *blockbox = newObjectBox(blockObj);
+        if (!blockbox)
+            return false;
 
-            /*
-             * Insert stmt on the pc->topScopeStmt/stmtInfo.downScope linked
-             * list stack, if it isn't already there.  If it is there, but it
-             * lacks the SIF_SCOPE flag, it must be a try, catch, or finally
-             * block.
-             */
-            stmt->isBlockScope = stmt->isNestedScope = true;
-            stmt->downScope = pc->topScopeStmt;
-            pc->topScopeStmt = stmt;
-
-            blockObj->initEnclosingNestedScopeFromParser(pc->staticScope);
-            pc->staticScope = blockObj;
-            stmt->staticScope = blockObj;
+        /*
+         * Insert stmt on the pc->topScopeStmt/stmtInfo.downScope linked
+         * list stack, if it isn't already there.  If it is there, but it
+         * lacks the SIF_SCOPE flag, it must be a try, catch, or finally
+         * block.
+         */
+        stmt->isBlockScope = stmt->isNestedScope = true;
+        stmt->downScope = pc->topScopeStmt;
+        pc->topScopeStmt = stmt;
+
+        blockObj->initEnclosingNestedScopeFromParser(pc->staticScope);
+        pc->staticScope = blockObj;
+        stmt->staticScope = blockObj;
 
 #ifdef DEBUG
-            ParseNode *tmp = pc->blockNode;
-            MOZ_ASSERT(!tmp || !tmp->isKind(PNK_LEXICALSCOPE));
+        ParseNode *tmp = pc->blockNode;
+        MOZ_ASSERT(!tmp || !tmp->isKind(PNK_LEXICALSCOPE));
 #endif
 
-            /* Create a new lexical scope node for these statements. */
-            ParseNode *pn1 = handler.new_<LexicalScopeNode>(blockbox, pc->blockNode);
-            if (!pn1)
-                return null();
-            pc->blockNode = pn1;
-        }
+        /* Create a new lexical scope node for these statements. */
+        ParseNode *pn1 = handler.new_<LexicalScopeNode>(blockbox, pc->blockNode);
+        if (!pn1)
+            return false;;
+        pc->blockNode = pn1;
+    }
+    return true;
+}
 
-        pn = variables(isConst ? PNK_CONST : PNK_LET, nullptr,
-                       &pc->staticScope->as<StaticBlockObject>(), HoistVars);
-        if (!pn)
+static StaticBlockObject *
+CurrentLexicalStaticBlock(ParseContext<FullParseHandler> *pc)
+{
+    return pc->atBodyLevel() ? nullptr :
+           &pc->staticScope->as<StaticBlockObject>();
+}
+
+template <>
+ParseNode *
+Parser<FullParseHandler>::makeInitializedLexicalBinding(HandlePropertyName name, bool isConst,
+                                                        const TokenPos &pos)
+{
+    // Handle the silliness of global and body level lexical decls.
+    BindData<FullParseHandler> data(context);
+    if (pc->atGlobalLevel()) {
+        data.initVarOrGlobalConst(isConst ? JSOP_DEFCONST : JSOP_DEFVAR);
+    } else {
+        if (!checkAndPrepareLexical(isConst, pos))
             return null();
-        pn->pn_xflags = PNX_POPVAR;
-    } while (0);
+        data.initLexical(HoistVars, CurrentLexicalStaticBlock(pc), JSMSG_TOO_MANY_LOCALS, isConst);
+    }
+    ParseNode *dn = newBindingNode(name, pc->atGlobalLevel());
+    if (!dn)
+        return null();
+    handler.setPosition(dn, pos);
+
+    if (!bindInitialized(&data, dn))
+        return null();
+
+    return dn;
+}
+
+template <>
+ParseNode *
+Parser<FullParseHandler>::lexicalDeclaration(bool isConst)
+{
+    handler.disableSyntaxParser();
+
+    if (!checkAndPrepareLexical(isConst, pos()))
+        return null();
 
+    /*
+     * Parse body-level lets without a new block object. ES6 specs
+     * that an execution environment's initial lexical environment
+     * is the VariableEnvironment, i.e., body-level lets are in
+     * the same environment record as vars.
+     *
+     * However, they cannot be parsed exactly as vars, as ES6
+     * requires that uninitialized lets throw ReferenceError on use.
+     *
+     * See 8.1.1.1.6 and the note in 13.2.1.
+     *
+     * FIXME global-level lets are still considered vars until
+     * other bugs are fixed.
+     */
+    ParseNodeKind kind = PNK_LET;
+    if (pc->atGlobalLevel())
+        kind = isConst ? PNK_GLOBALCONST : PNK_VAR;
+    else if (isConst)
+        kind = PNK_CONST;
+
+    ParseNode *pn = variables(kind, nullptr,
+                              CurrentLexicalStaticBlock(pc),
+                              HoistVars);
+    if (!pn)
+        return null();
+    pn->pn_xflags = PNX_POPVAR;
     return MatchOrInsertSemicolon(tokenStream) ? pn : nullptr;
 }
 
@@ -4616,7 +4652,7 @@
             isForEach = true;
             addTelemetry(JSCompartment::DeprecatedForEach);
             if (versionNumber() < JSVERSION_LATEST) {
-                if (!report(ParseWarning, pc->sc->strict, null(), JSMSG_DEPRECATED_FOR_EACH))
+                if (!report(ParseWarning, pc->sc->strict(), null(), JSMSG_DEPRECATED_FOR_EACH))
                     return null();
             }
         }
@@ -5484,7 +5520,7 @@
     // construct that is forbidden in strict mode code, but doesn't even merit a
     // warning under JSOPTION_EXTRA_WARNINGS.  See
     // https://bugzilla.mozilla.org/show_bug.cgi?id=514576#c1.
-    if (pc->sc->strict && !report(ParseStrictError, true, null(), JSMSG_STRICT_CODE_WITH))
+    if (pc->sc->strict() && !report(ParseStrictError, true, null(), JSMSG_STRICT_CODE_WITH))
         return null();
 
     MUST_MATCH_TOKEN(TOK_LP, JSMSG_PAREN_BEFORE_WITH);
@@ -5787,6 +5823,80 @@
     return handler.newDebuggerStatement(p);
 }
 
+template <>
+ParseNode *
+Parser<FullParseHandler>::classStatement()
+{
+    MOZ_ASSERT(tokenStream.isCurrentTokenType(TOK_CLASS));
+
+    TokenKind tt;
+    if (!tokenStream.getToken(&tt))
+        return null();
+
+    RootedPropertyName name(context);
+    if (tt == TOK_NAME) {
+        name = tokenStream.currentName();
+    } else if (tt == TOK_YIELD) {
+        if (!checkYieldNameValidity())
+            return null();
+        name = tokenStream.currentName();
+    } else {
+        // Class statements must have a bound name
+        report(ParseError, false, null(), JSMSG_UNNAMED_CLASS_STMT);
+        return null();
+    }
+
+    if (name == context->names().let) {
+        report(ParseError, false, null(), JSMSG_LET_CLASS_BINDING);
+        return null();
+    }
+
+    // Because the binding definitions keep track of their blockId, we need to
+    // create at least the inner binding later. Keep track of the name's position
+    // in order to provide it for the nodes created later.
+    TokenPos namePos = pos();
+
+    MUST_MATCH_TOKEN(TOK_LC, JSMSG_CURLY_BEFORE_CLASS);
+
+    bool savedStrictness = setLocalStrictMode(true);
+
+    StmtInfoPC classStmt(context);
+    ParseNode *classBlock = pushLexicalScope(&classStmt);
+    if (!classBlock)
+        return null();
+
+    ParseNode *classMethods = propertyList(ClassBody);
+    if (!classMethods)
+        return null();
+    handler.setLexicalScopeBody(classBlock, classMethods);
+
+    ParseNode *innerBinding = makeInitializedLexicalBinding(name, true, namePos);
+    if (!innerBinding)
+        return null();
+
+    PopStatementPC(tokenStream, pc);
+
+    ParseNode *outerBinding = makeInitializedLexicalBinding(name, false, namePos);
+    if (!outerBinding)
+        return null();
+
+    ParseNode *nameNode = handler.newClassNames(outerBinding, innerBinding, namePos);
+    if (!nameNode)
+        return null();
+
+    MOZ_ALWAYS_TRUE(setLocalStrictMode(savedStrictness));
+
+    return handler.newClass(nameNode, null(), classBlock);
+}
+
+template <>
+SyntaxParseHandler::Node
+Parser<SyntaxParseHandler>::classStatement()
+{
+    JS_ALWAYS_FALSE(abortIfSyntaxParser());
+    return SyntaxParseHandler::NodeFailure;
+}
+
 template <typename ParseHandler>
 typename ParseHandler::Node
 Parser<ParseHandler>::statement(bool canHaveDirectives)
@@ -5854,6 +5964,11 @@
         return functionStmt();
       case TOK_DEBUGGER:
         return debuggerStatement();
+      case TOK_CLASS:
+        if (!abortIfSyntaxParser())
+            return null();
+        return classStatement();
+
 
       /* TOK_CATCH and TOK_FINALLY are both handled in the TOK_TRY case */
       case TOK_CATCH:
@@ -6292,7 +6407,10 @@
     if (!checkAndMarkAsAssignmentLhs(lhs, flavor))
         return null();
 
+    bool saved = pc->inDeclDestructuring;
+    pc->inDeclDestructuring = false;
     Node rhs = assignExpr();
+    pc->inDeclDestructuring = saved;
     if (!rhs)
         return null();
 
@@ -6405,7 +6523,7 @@
         // Per spec, deleting any unary expression is valid -- it simply
         // returns true -- except for one case that is illegal in strict mode.
         if (handler.isName(expr)) {
-            if (!report(ParseStrictError, pc->sc->strict, expr, JSMSG_DEPRECATED_DELETE_OPERAND))
+            if (!report(ParseStrictError, pc->sc->strict(), expr, JSMSG_DEPRECATED_DELETE_OPERAND))
                 return null();
             pc->sc->setBindingsAccessedDynamically();
         }
@@ -6814,7 +6932,7 @@
                 pn2->pn_iflags |= JSITER_FOREACH;
                 addTelemetry(JSCompartment::DeprecatedForEach);
                 if (versionNumber() < JSVERSION_LATEST) {
-                    if (!report(ParseWarning, pc->sc->strict, pn2, JSMSG_DEPRECATED_FOR_EACH))
+                    if (!report(ParseWarning, pc->sc->strict(), pn2, JSMSG_DEPRECATED_FOR_EACH))
                         return null();
                 }
             }
@@ -7005,26 +7123,30 @@
 ParseNode*
 Parser<FullParseHandler>::legacyArrayComprehension(ParseNode *array)
 {
-    array->setKind(PNK_ARRAYCOMP);
-
-    // Remove the single element from array's linked list, leaving us with an
-    // empty array literal and a comprehension expression.
+    // Discard our presumed array literal containing only a single element, and
+    // instead return an array comprehension node.  Extract the few bits of
+    // information needed from the array literal, then free it.
+    MOZ_ASSERT(array->isKind(PNK_ARRAY));
     MOZ_ASSERT(array->pn_count == 1);
-    ParseNode *bodyExpr = array->last();
+
+    uint32_t arrayBegin = handler.getPosition(array).begin;
+    uint32_t blockid = array->pn_blockid;
+
+    ParseNode *bodyExpr = array->pn_head;
     array->pn_count = 0;
     array->pn_tail = &array->pn_head;
     *array->pn_tail = nullptr;
 
-    ParseNode *comp = legacyComprehensionTail(bodyExpr, array->pn_blockid, NotGenerator,
-                                              nullptr, LegacyComprehensionHeadBlockScopeDepth(pc));
+    handler.freeTree(array);
+
+    ParseNode *comp = legacyComprehensionTail(bodyExpr, blockid, NotGenerator, nullptr,
+                                              LegacyComprehensionHeadBlockScopeDepth(pc));
     if (!comp)
         return null();
 
     MUST_MATCH_TOKEN(TOK_RB, JSMSG_BRACKET_AFTER_ARRAY_COMPREHENSION);
 
-    TokenPos p = handler.getPosition(array);
-    p.end = pos().end;
-    return handler.newArrayComprehension(comp, array->pn_blockid, p);
+    return handler.newArrayComprehension(comp, blockid, TokenPos(arrayBegin, pos().end));
 }
 
 template <>
@@ -7066,7 +7188,7 @@
         return null();
 
     // Create box for fun->object early to root it.
-    Directives directives(/* strict = */ outerpc->sc->strict);
+    Directives directives(/* strict = */ outerpc->sc->strict());
     FunctionBox *genFunbox = newFunctionBox(genfn, fun, outerpc, directives, comprehensionKind);
     if (!genFunbox)
         return null();
@@ -7584,7 +7706,7 @@
             if (JSAtom *atom = handler.isName(lhs)) {
                 if (tt == TOK_LP && atom == context->names().eval) {
                     /* Select JSOP_EVAL and flag pc as heavyweight. */
-                    op = pc->sc->strict ? JSOP_STRICTEVAL : JSOP_EVAL;
+                    op = pc->sc->strict() ? JSOP_STRICTEVAL : JSOP_EVAL;
                     pc->sc->setBindingsAccessedDynamically();
                     pc->sc->setHasDirectEval();
 
@@ -7592,7 +7714,7 @@
                      * In non-strict mode code, direct calls to eval can add
                      * variables to the call object.
                      */
-                    if (pc->sc->isFunctionBox() && !pc->sc->strict)
+                    if (pc->sc->isFunctionBox() && !pc->sc->strict())
                         pc->sc->asFunctionBox()->setHasExtensibleScope();
                 }
             } else if (JSAtom *atom = handler.isGetProp(lhs)) {
@@ -7689,6 +7811,7 @@
 typename ParseHandler::Node
 Parser<ParseHandler>::newRegExp()
 {
+    MOZ_ASSERT(!options().selfHostingMode);
     // Create the regexp even when doing a syntax parse, to check the regexp's syntax.
     const char16_t *chars = tokenStream.getTokenbuf().begin();
     size_t length = tokenStream.getTokenbuf().length();
@@ -7767,8 +7890,7 @@
                     return null();
                 if (foldConstants && !FoldConstants(context, &element, this))
                     return null();
-                if (!handler.addArrayElement(literal, element))
-                    return null();
+                handler.addArrayElement(literal, element);
             }
 
             if (tt != TOK_COMMA) {
@@ -7878,15 +8000,27 @@
 
 template <typename ParseHandler>
 typename ParseHandler::Node
-Parser<ParseHandler>::objectLiteral()
+Parser<ParseHandler>::newPropertyListNode(PropListType type)
+{
+    if (type == ClassBody)
+        return handler.newClassMethodList(pos().begin);
+
+    MOZ_ASSERT(type == ObjectLiteral);
+    return handler.newObjectLiteral(pos().begin);
+}
+
+template <typename ParseHandler>
+typename ParseHandler::Node
+Parser<ParseHandler>::propertyList(PropListType type)
 {
     MOZ_ASSERT(tokenStream.isCurrentTokenType(TOK_LC));
 
-    Node literal = handler.newObjectLiteral(pos().begin);
-    if (!literal)
+    Node propList = newPropertyListNode(type);
+    if (!propList)
         return null();
 
     bool seenPrototypeMutation = false;
+    bool seenConstructor = false;
     RootedAtom atom(context);
     for (;;) {
         TokenKind ltok;
@@ -7895,6 +8029,20 @@
         if (ltok == TOK_RC)
             break;
 
+        bool isStatic = false;
+        if (type == ClassBody) {
+            if (ltok == TOK_SEMI)
+                continue;
+
+            if (ltok == TOK_NAME &&
+                tokenStream.currentName() == context->names().static_)
+            {
+                isStatic = true;
+                if (!tokenStream.getToken(&ltok, TokenStream::KeywordIsName))
+                    return null();
+            }
+        }
+
         bool isGenerator = false;
         if (ltok == TOK_MUL) {
             isGenerator = true;
@@ -7917,7 +8065,7 @@
             break;
 
           case TOK_LB: {
-              propname = computedPropertyName(literal);
+              propname = computedPropertyName(propList);
               if (!propname)
                   return null();
               break;
@@ -7933,7 +8081,7 @@
                 op = atom == context->names().get ? JSOP_INITPROP_GETTER
                                                   : JSOP_INITPROP_SETTER;
             } else {
-                propname = handler.newIdentifier(atom, pos());
+                propname = handler.newObjectLiteralPropertyName(atom, pos());
                 if (!propname)
                     return null();
                 break;
@@ -7946,7 +8094,7 @@
                 return null();
             if (tt == TOK_NAME) {
                 atom = tokenStream.currentName();
-                propname = newName(atom->asPropertyName());
+                propname = handler.newObjectLiteralPropertyName(atom, pos());
                 if (!propname)
                     return null();
             } else if (tt == TOK_STRING) {
@@ -7973,13 +8121,13 @@
                 if (!propname)
                     return null();
             } else if (tt == TOK_LB) {
-                propname = computedPropertyName(literal);
+                propname = computedPropertyName(propList);
                 if (!propname)
                     return null();
             } else {
                 // Not an accessor property after all.
                 tokenStream.ungetToken();
-                propname = handler.newIdentifier(atom, pos());
+                propname = handler.newObjectLiteralPropertyName(atom, pos());
                 if (!propname)
                     return null();
                 op = JSOP_INITPROP;
@@ -8006,8 +8154,36 @@
           }
 
           default:
-            report(ParseError, false, null(), JSMSG_BAD_PROP_ID);
-            return null();
+            // There is never a case in which |static *(| can make a meaningful method definition.
+            if (isStatic && !isGenerator) {
+                // Turns out it wasn't static. Put it back and pretend it was a name all along.
+                isStatic = false;
+                tokenStream.ungetToken();
+                atom = tokenStream.currentName();
+                propname = handler.newObjectLiteralPropertyName(atom->asPropertyName(), pos());
+                if (!propname)
+                    return null();
+            } else {
+                report(ParseError, false, null(), JSMSG_BAD_PROP_ID);
+                return null();
+            }
+        }
+
+        if (type == ClassBody) {
+            if (!isStatic && atom == context->names().constructor) {
+                if (isGenerator || op != JSOP_INITPROP) {
+                    report(ParseError, false, propname, JSMSG_BAD_METHOD_DEF);
+                    return null();
+                }
+                if (seenConstructor) {
+                    report(ParseError, false, propname, JSMSG_DUPLICATE_PROPERTY, "constructor");
+                    return null();
+                }
+                seenConstructor = true;
+            } else if (isStatic && atom == context->names().prototype) {
+                report(ParseError, false, propname, JSMSG_BAD_METHOD_DEF);
+                return null();
+            }
         }
 
         if (op == JSOP_INITPROP) {
@@ -8016,6 +8192,10 @@
                 return null();
 
             if (tt == TOK_COLON) {
+                if (type == ClassBody) {
+                    report(ParseError, false, null(), JSMSG_BAD_METHOD_DEF);
+                    return null();
+                }
                 if (isGenerator) {
                     report(ParseError, false, null(), JSMSG_BAD_PROP_ID);
                     return null();
@@ -8040,13 +8220,13 @@
                     // method/generator definitions, computed property name
                     // versions of all of these, and shorthands do not.
                     uint32_t begin = handler.getPosition(propname).begin;
-                    if (!handler.addPrototypeMutation(literal, begin, propexpr))
+                    if (!handler.addPrototypeMutation(propList, begin, propexpr))
                         return null();
                 } else {
                     if (!handler.isConstant(propexpr))
-                        handler.setListFlag(literal, PNX_NONCONST);
+                        handler.setListFlag(propList, PNX_NONCONST);
 
-                    if (!handler.addPropertyDefinition(literal, propname, propexpr))
+                    if (!handler.addPropertyDefinition(propList, propname, propexpr))
                         return null();
                 }
             } else if (ltok == TOK_NAME && (tt == TOK_COMMA || tt == TOK_RC)) {
@@ -8054,29 +8234,29 @@
                  * Support, e.g., |var {x, y} = o| as destructuring shorthand
                  * for |var {x: x, y: y} = o|, per proposed JS2/ES4 for JS1.8.
                  */
+                if (type == ClassBody) {
+                    report(ParseError, false, null(), JSMSG_BAD_METHOD_DEF);
+                    return null();
+                }
                 if (isGenerator) {
                     report(ParseError, false, null(), JSMSG_BAD_PROP_ID);
                     return null();
                 }
-                if (!abortIfSyntaxParser())
-                    return null();
+
                 tokenStream.ungetToken();
                 if (!tokenStream.checkForKeyword(atom, nullptr))
                     return null();
-                PropertyName *name = handler.isName(propname);
-                MOZ_ASSERT(atom);
-                propname = newName(name);
-                if (!propname)
-                    return null();
-                Node ident = identifierName();
-                if (!ident)
+
+                Node nameExpr = identifierName();
+                if (!nameExpr)
                     return null();
-                if (!handler.addPropertyDefinition(literal, propname, ident, true))
+
+                if (!handler.addShorthand(propList, propname, nameExpr))
                     return null();
             } else if (tt == TOK_LP) {
                 tokenStream.ungetToken();
-                if (!methodDefinition(literal, propname, Normal, Method,
-                                      isGenerator ? StarGenerator : NotGenerator, op)) {
+                if (!methodDefinition(type, propList, propname, Normal, Method,
+                                      isGenerator ? StarGenerator : NotGenerator, isStatic, op)) {
                     return null();
                 }
             } else {
@@ -8085,32 +8265,41 @@
             }
         } else {
             /* NB: Getter function in { get x(){} } is unnamed. */
-            if (!methodDefinition(literal, propname, op == JSOP_INITPROP_GETTER ? Getter : Setter,
-                                  Expression, NotGenerator, op)) {
+            if (!methodDefinition(type, propList, propname, op == JSOP_INITPROP_GETTER ? Getter : Setter,
+                                  Expression, NotGenerator, isStatic, op)) {
                 return null();
             }
         }
 
-        TokenKind tt;
-        if (!tokenStream.getToken(&tt))
-            return null();
-        if (tt == TOK_RC)
-            break;
-        if (tt != TOK_COMMA) {
-            report(ParseError, false, null(), JSMSG_CURLY_AFTER_LIST);
-            return null();
+        if (type == ObjectLiteral) {
+            TokenKind tt;
+            if (!tokenStream.getToken(&tt))
+                return null();
+            if (tt == TOK_RC)
+                break;
+            if (tt != TOK_COMMA) {
+                report(ParseError, false, null(), JSMSG_CURLY_AFTER_LIST);
+                return null();
+            }
         }
     }
 
-    handler.setEndPosition(literal, pos().end);
-    return literal;
+    // Default constructors not yet implemented. See bug 1105463
+    if (type == ClassBody && !seenConstructor) {
+        report(ParseError, false, null(), JSMSG_NO_CLASS_CONSTRUCTOR);
+        return null();
+    }
+
+    handler.setEndPosition(propList, pos().end);
+    return propList;
 }
 
 template <typename ParseHandler>
 bool
-Parser<ParseHandler>::methodDefinition(Node literal, Node propname, FunctionType type,
-                                       FunctionSyntaxKind kind, GeneratorKind generatorKind,
-                                       JSOp op)
+Parser<ParseHandler>::methodDefinition(PropListType listType, Node propList, Node propname,
+                                       FunctionType type, FunctionSyntaxKind kind,
+                                       GeneratorKind generatorKind,
+                                       bool isStatic, JSOp op)
 {
     RootedPropertyName funName(context);
     if (kind == Method && tokenStream.isCurrentTokenType(TOK_NAME))
@@ -8121,9 +8310,12 @@
     Node fn = functionDef(funName, type, kind, generatorKind);
     if (!fn)
         return false;
-    if (!handler.addMethodDefinition(literal, propname, fn, op))
-        return false;
-    return true;
+
+    if (listType == ClassBody)
+        return handler.addClassMethodDefinition(propList, propname, fn, op, isStatic);
+
+    MOZ_ASSERT(listType == ObjectLiteral);
+    return handler.addObjectMethodDefinition(propList, propname, fn, op);
 }
 
 template <typename ParseHandler>
@@ -8141,7 +8333,7 @@
         return arrayInitializer();
 
       case TOK_LC:
-        return objectLiteral();
+        return propertyList(ObjectLiteral);
 
       case TOK_LET:
         return deprecatedLetBlockOrExpression(LetExpression);
@@ -8384,7 +8576,7 @@
     JSContext* cx = context->maybeJSContext();
     if (!cx)
         return;
-    cx->compartment()->addTelemetry(e);
+    cx->compartment()->addTelemetry(getFilename(), e);
 }
 
 template class Parser<FullParseHandler>;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/Parser.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/Parser.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/Parser.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/Parser.h	2015-02-28 15:03:04.000000000 +0000
@@ -301,6 +301,7 @@
     //   if (cond) { function f3() { if (cond) { function f4() { } } } }
     //
     bool atBodyLevel() { return !topStmt; }
+    bool atGlobalLevel() { return atBodyLevel() && !sc->isFunctionBox() && (topStmt == topScopeStmt); }
 
     // True if this is the ParseContext for the body of a function created by
     // the Function constructor.
@@ -316,7 +317,7 @@
 template <typename ParseHandler>
 inline
 Directives::Directives(ParseContext<ParseHandler> *parent)
-  : strict_(parent->sc->strict),
+  : strict_(parent->sc->strict()),
     asmJS_(parent->useAsmOrInsideUseAsm())
 {}
 
@@ -328,6 +329,7 @@
 enum LetContext { LetExpression, LetStatement };
 enum VarContext { HoistVars, DontHoistVars };
 enum FunctionType { Getter, Setter, Normal };
+enum PropListType { ObjectLiteral, ClassBody };
 
 template <typename ParseHandler>
 class Parser : private JS::AutoGCRooter, public StrictModeGetter
@@ -503,7 +505,11 @@
         return versionNumber() >= JSVERSION_1_7 || pc->isGenerator();
     }
 
-    virtual bool strictMode() { return pc->sc->strict; }
+    virtual bool strictMode() { return pc->sc->strict(); }
+    bool setLocalStrictMode(bool strict) {
+        MOZ_ASSERT(tokenStream.debugHasNoLookahead());
+        return pc->sc->setLocalStrictMode(strict);
+    }
 
     const ReadOnlyCompileOptions &options() const {
         return tokenStream.options();
@@ -547,6 +553,7 @@
     Node throwStatement();
     Node tryStatement();
     Node debuggerStatement();
+    Node classStatement();
 
     Node lexicalDeclaration(bool isConst);
     Node letDeclarationOrBlock();
@@ -569,8 +576,9 @@
     Node parenExprOrGeneratorComprehension();
     Node exprInParens();
 
-    bool methodDefinition(Node literal, Node propname, FunctionType type, FunctionSyntaxKind kind,
-                          GeneratorKind generatorKind, JSOp Op);
+    bool methodDefinition(PropListType listType, Node propList, Node propname, FunctionType type,
+                          FunctionSyntaxKind kind, GeneratorKind generatorKind,
+                          bool isStatic, JSOp Op);
 
     /*
      * Additional JS parsers.
@@ -651,16 +659,21 @@
     Node pushLexicalScope(Handle<StaticBlockObject*> blockObj, StmtInfoPC *stmt);
     Node pushLetScope(Handle<StaticBlockObject*> blockObj, StmtInfoPC *stmt);
     bool noteNameUse(HandlePropertyName name, Node pn);
-    Node objectLiteral();
     Node computedPropertyName(Node literal);
     Node arrayInitializer();
     Node newRegExp();
 
+    Node propertyList(PropListType type);
+    Node newPropertyListNode(PropListType type);
+
+    bool checkAndPrepareLexical(bool isConst, const TokenPos &errorPos);
+    Node makeInitializedLexicalBinding(HandlePropertyName name, bool isConst, const TokenPos &pos);
+
     Node newBindingNode(PropertyName *name, bool functionScope, VarContext varContext = HoistVars);
     bool checkDestructuring(BindData<ParseHandler> *data, Node left);
     bool checkDestructuringObject(BindData<ParseHandler> *data, Node objectPattern);
     bool checkDestructuringArray(BindData<ParseHandler> *data, Node arrayPattern);
-    bool bindDestructuringVar(BindData<ParseHandler> *data, Node pn);
+    bool bindInitialized(BindData<ParseHandler> *data, Node pn);
     bool bindDestructuringLHS(Node pn);
     bool makeSetCall(Node pn, unsigned msg);
     Node cloneDestructuringDefault(Node opn);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/SharedContext.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/SharedContext.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/SharedContext.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/SharedContext.h	2015-02-28 15:03:04.000000000 +0000
@@ -178,7 +178,8 @@
   public:
     ExclusiveContext *const context;
     AnyContextFlags anyCxFlags;
-    bool strict;
+    bool strictScript;
+    bool localStrict;
     bool extraWarnings;
 
     // If it's function code, funbox must be non-nullptr and scopeChain must be
@@ -186,7 +187,8 @@
     SharedContext(ExclusiveContext *cx, Directives directives, bool extraWarnings)
       : context(cx),
         anyCxFlags(),
-        strict(directives.strict()),
+        strictScript(directives.strict()),
+        localStrict(false),
         extraWarnings(extraWarnings)
     {}
 
@@ -208,9 +210,18 @@
 
     inline bool allLocalsAliased();
 
+    bool strict() {
+        return strictScript || localStrict;
+    }
+    bool setLocalStrictMode(bool strict) {
+        bool retVal = localStrict;
+        localStrict = strict;
+        return retVal;
+    }
+
     // JSOPTION_EXTRA_WARNINGS warnings or strict mode errors.
     bool needStrictChecks() {
-        return strict || extraWarnings;
+        return strict() || extraWarnings;
     }
 
     bool isDotVariable(JSAtom *atom) const {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/SyntaxParseHandler.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/SyntaxParseHandler.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/SyntaxParseHandler.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/SyntaxParseHandler.h	2015-02-28 15:03:04.000000000 +0000
@@ -120,7 +120,10 @@
         return Definition::PLACEHOLDER;
     }
 
-    Node newIdentifier(JSAtom *atom, const TokenPos &pos) { return NodeName; }
+    Node newObjectLiteralPropertyName(JSAtom *atom, const TokenPos &pos) {
+        return NodeName;
+    }
+
     Node newNumber(double value, DecimalPoint decimalPoint, const TokenPos &pos) { return NodeGeneric; }
     Node newBooleanLiteral(bool cond, const TokenPos &pos) { return NodeGeneric; }
 
@@ -180,12 +183,15 @@
     Node newArrayLiteral(uint32_t begin, unsigned blockid) { return NodeGeneric; }
     bool addElision(Node literal, const TokenPos &pos) { return true; }
     bool addSpreadElement(Node literal, uint32_t begin, Node inner) { return true; }
-    bool addArrayElement(Node literal, Node element) { return true; }
+    void addArrayElement(Node literal, Node element) { }
 
     Node newObjectLiteral(uint32_t begin) { return NodeGeneric; }
+    Node newClassMethodList(uint32_t begin) { return NodeGeneric; }
     bool addPrototypeMutation(Node literal, uint32_t begin, Node expr) { return true; }
-    bool addPropertyDefinition(Node literal, Node name, Node expr, bool isShorthand = false) { return true; }
-    bool addMethodDefinition(Node literal, Node name, Node fn, JSOp op) { return true; }
+    bool addPropertyDefinition(Node literal, Node name, Node expr) { return true; }
+    bool addShorthand(Node literal, Node name, Node expr) { return true; }
+    bool addObjectMethodDefinition(Node literal, Node name, Node fn, JSOp op) { return true; }
+    bool addClassMethodDefinition(Node literal, Node name, Node fn, JSOp op, bool isStatic) { return true; }
     Node newYieldExpression(uint32_t begin, Node value, Node gen) { return NodeUnparenthesizedYieldExpr; }
     Node newYieldStarExpression(uint32_t begin, Node value, Node gen) { return NodeGeneric; }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/TokenKind.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/TokenKind.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/TokenKind.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/TokenKind.h	2015-02-28 15:03:04.000000000 +0000
@@ -110,6 +110,7 @@
     macro(LET,          "keyword 'let'") \
     macro(EXPORT,       "keyword 'export'") \
     macro(IMPORT,       "keyword 'import'") \
+    macro(CLASS,        "keyword 'class'") \
     macro(RESERVED,     "reserved keyword") \
     /* reserved keywords in strict mode */ \
     macro(STRICT_RESERVED, "reserved keyword") \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/TokenStream.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/TokenStream.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/TokenStream.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/TokenStream.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -314,19 +314,6 @@
     // much easier.  Don't worry, the time to initialize them for each
     // TokenStream is trivial.  See bug 639420.
 
-    // See getTokenInternal() for an explanation of maybeStrSpecial[].
-    memset(maybeStrSpecial, 0, sizeof(maybeStrSpecial));
-    maybeStrSpecial[unsigned('"')] = true;
-    maybeStrSpecial[unsigned('`')] = true;
-    maybeStrSpecial[unsigned('$')] = true;
-    maybeStrSpecial[unsigned('\'')] = true;
-    maybeStrSpecial[unsigned('\\')] = true;
-    maybeStrSpecial[unsigned('\n')] = true;
-    maybeStrSpecial[unsigned('\r')] = true;
-    maybeStrSpecial[unsigned(LINE_SEPARATOR & 0xff)] = true;
-    maybeStrSpecial[unsigned(PARA_SEPARATOR & 0xff)] = true;
-    maybeStrSpecial[unsigned(EOF & 0xff)] = true;
-
     // See Parser::assignExpr() for an explanation of isExprEnding[].
     memset(isExprEnding, 0, sizeof(isExprEnding));
     isExprEnding[TOK_COMMA] = 1;
@@ -587,7 +574,7 @@
     // as the non-top-level "load", "eval", or "compile" native function
     // returns false, the top-level reporter will eventually receive the
     // uncaught exception report.
-    if (!js_ErrorToException(cx, message, &report, nullptr, nullptr))
+    if (!ErrorToException(cx, message, &report, nullptr, nullptr))
         CallErrorReporter(cx, message, &report);
 }
 
@@ -654,8 +641,8 @@
 
     err.argumentsType = (flags & JSREPORT_UC) ? ArgumentsAreUnicode : ArgumentsAreASCII;
 
-    if (!js_ExpandErrorArguments(cx, js_GetErrorMessage, nullptr, errorNumber, &err.message,
-                                 &err.report, err.argumentsType, args))
+    if (!ExpandErrorArguments(cx, GetErrorMessage, nullptr, errorNumber, &err.message,
+                              &err.report, err.argumentsType, args))
     {
         return false;
     }
@@ -989,8 +976,14 @@
 bool
 TokenStream::checkForKeyword(const KeywordInfo *kw, TokenKind *ttp)
 {
-    if (kw->tokentype == TOK_RESERVED)
+    if (kw->tokentype == TOK_RESERVED
+#ifndef JS_HAS_CLASSES
+        || kw->tokentype == TOK_CLASS
+#endif
+        )
+    {
         return reportError(JSMSG_RESERVED_ID, kw->chars);
+    }
 
     if (kw->tokentype != TOK_STRICT_RESERVED) {
         if (kw->version <= versionNumber()) {
@@ -1657,120 +1650,136 @@
     return false;
 }
 
-bool TokenStream::getStringOrTemplateToken(int qc, Token **tp)
+bool
+TokenStream::getStringOrTemplateToken(int untilChar, Token **tp)
 {
-    *tp = newToken(-1);
     int c;
     int nc = -1;
+
+    bool parsingTemplate = (untilChar == '`');
+
+    *tp = newToken(-1);
     tokenbuf.clear();
-    while (true) {
-        // We need to detect any of these chars:  " or ', \n (or its
-        // equivalents), \\, EOF.  Because we detect EOL sequences here and
-        // put them back immediately, we can use getCharIgnoreEOL().
-        c = getCharIgnoreEOL();
-        if (maybeStrSpecial[c & 0xff]) {
-            if (c == qc)
+
+    // We need to detect any of these chars:  " or ', \n (or its
+    // equivalents), \\, EOF.  Because we detect EOL sequences here and
+    // put them back immediately, we can use getCharIgnoreEOL().
+    while ((c = getCharIgnoreEOL()) != untilChar) {
+        if (c == EOF) {
+            ungetCharIgnoreEOL(c);
+            reportError(JSMSG_UNTERMINATED_STRING);
+            return false;
+        }
+
+        if (c == '\\') {
+            switch (c = getChar()) {
+              case 'b': c = '\b'; break;
+              case 'f': c = '\f'; break;
+              case 'n': c = '\n'; break;
+              case 'r': c = '\r'; break;
+              case 't': c = '\t'; break;
+              case 'v': c = '\v'; break;
+
+              case '\n':
+                // ES5 7.8.4: an escaped line terminator represents
+                // no character.
+                continue;
+
+              // Unicode character specification.
+              case 'u': {
+                char16_t cp[4];
+                if (peekChars(4, cp) &&
+                    JS7_ISHEX(cp[0]) && JS7_ISHEX(cp[1]) && JS7_ISHEX(cp[2]) && JS7_ISHEX(cp[3]))
+                {
+                    c = JS7_UNHEX(cp[0]);
+                    c = (c << 4) + JS7_UNHEX(cp[1]);
+                    c = (c << 4) + JS7_UNHEX(cp[2]);
+                    c = (c << 4) + JS7_UNHEX(cp[3]);
+                    skipChars(4);
+                } else {
+                    reportError(JSMSG_MALFORMED_ESCAPE, "Unicode");
+                    return false;
+                }
                 break;
-            if (c == '\\') {
-                switch (c = getChar()) {
-                  case 'b': c = '\b'; break;
-                  case 'f': c = '\f'; break;
-                  case 'n': c = '\n'; break;
-                  case 'r': c = '\r'; break;
-                  case 't': c = '\t'; break;
-                  case 'v': c = '\v'; break;
-
-                  default:
-                    if ('0' <= c && c < '8') {
-                        int32_t val = JS7_UNDEC(c);
+              }
 
-                        c = peekChar();
-                        // Strict mode code allows only \0, then a non-digit.
-                        if (val != 0 || JS7_ISDEC(c)) {
-                            if (qc == '`') {
-                                reportError(JSMSG_DEPRECATED_OCTAL);
-                                return false;
-                            }
-                            if (!reportStrictModeError(JSMSG_DEPRECATED_OCTAL))
-                                return false;
-                            flags.sawOctalEscape = true;
-                        }
-                        if ('0' <= c && c < '8') {
-                            val = 8 * val + JS7_UNDEC(c);
-                            getChar();
-                            c = peekChar();
-                            if ('0' <= c && c < '8') {
-                                int32_t save = val;
-                                val = 8 * val + JS7_UNDEC(c);
-                                if (val <= 0377)
-                                    getChar();
-                                else
-                                    val = save;
-                            }
-                        }
+              // Hexadecimal character specification.
+              case 'x': {
+                char16_t cp[2];
+                if (peekChars(2, cp) && JS7_ISHEX(cp[0]) && JS7_ISHEX(cp[1])) {
+                    c = (JS7_UNHEX(cp[0]) << 4) + JS7_UNHEX(cp[1]);
+                    skipChars(2);
+                } else {
+                    reportError(JSMSG_MALFORMED_ESCAPE, "hexadecimal");
+                    return false;
+                }
+                break;
+              }
 
-                        c = char16_t(val);
-                    } else if (c == 'u') {
-                        char16_t cp[4];
-                        if (peekChars(4, cp) &&
-                            JS7_ISHEX(cp[0]) && JS7_ISHEX(cp[1]) &&
-                            JS7_ISHEX(cp[2]) && JS7_ISHEX(cp[3])) {
-                            c = (((((JS7_UNHEX(cp[0]) << 4)
-                                    + JS7_UNHEX(cp[1])) << 4)
-                                  + JS7_UNHEX(cp[2])) << 4)
-                                + JS7_UNHEX(cp[3]);
-                            skipChars(4);
-                        } else {
-                            reportError(JSMSG_MALFORMED_ESCAPE, "Unicode");
+              default:
+                // Octal character specification.
+                if (JS7_ISOCT(c)) {
+                    int32_t val = JS7_UNOCT(c);
+
+                    c = peekChar();
+
+                    // Strict mode code allows only \0, then a non-digit.
+                    if (val != 0 || JS7_ISDEC(c)) {
+                        if (parsingTemplate) {
+                            reportError(JSMSG_DEPRECATED_OCTAL);
                             return false;
                         }
-                    } else if (c == 'x') {
-                        char16_t cp[2];
-                        if (peekChars(2, cp) &&
-                                JS7_ISHEX(cp[0]) && JS7_ISHEX(cp[1])) {
-                            c = (JS7_UNHEX(cp[0]) << 4) + JS7_UNHEX(cp[1]);
-                            skipChars(2);
-                        } else {
-                            reportError(JSMSG_MALFORMED_ESCAPE, "hexadecimal");
+                        if (!reportStrictModeError(JSMSG_DEPRECATED_OCTAL))
                             return false;
+                        flags.sawOctalEscape = true;
+                    }
+
+                    if (JS7_ISOCT(c)) {
+                        val = 8 * val + JS7_UNOCT(c);
+                        getChar();
+                        c = peekChar();
+                        if (JS7_ISOCT(c)) {
+                            int32_t save = val;
+                            val = 8 * val + JS7_UNOCT(c);
+                            if (val <= 0xFF)
+                                getChar();
+                            else
+                                val = save;
                         }
-                    } else if (c == '\n') {
-                        // ES5 7.8.4: an escaped line terminator represents
-                        // no character.
-                        continue;
                     }
-                    break;
-                }
-            } else if (c == EOF) {
+
+                    c = char16_t(val);
+                } 
+                break;
+            }
+        } else if (TokenBuf::isRawEOLChar(c)) {
+            if (!parsingTemplate) {
                 ungetCharIgnoreEOL(c);
                 reportError(JSMSG_UNTERMINATED_STRING);
                 return false;
-            } else if (TokenBuf::isRawEOLChar(c)) {
-                if (qc != '`') {
-                    ungetCharIgnoreEOL(c);
-                    reportError(JSMSG_UNTERMINATED_STRING);
-                    return false;
-                }
-                if (c == '\r') {
-                    c = '\n';
-                    if (userbuf.peekRawChar() == '\n')
-                        skipChars(1);
-                }
-                updateLineInfoForEOL();
-                updateFlagsForEOL();
-            } else if (qc == '`' && c == '$') {
-                if ((nc = getCharIgnoreEOL()) == '{')
-                    break;
-                ungetCharIgnoreEOL(nc);
             }
+            if (c == '\r') {
+                c = '\n';
+                if (userbuf.peekRawChar() == '\n')
+                    skipChars(1);
+            }
+            updateLineInfoForEOL();
+            updateFlagsForEOL();
+        } else if (parsingTemplate && c == '$') {
+            if ((nc = getCharIgnoreEOL()) == '{')
+                break;
+            ungetCharIgnoreEOL(nc);
         }
+
         if (!tokenbuf.append(c))
             return false;
     }
+
     JSAtom *atom = atomize(cx, tokenbuf);
     if (!atom)
         return false;
-    if (qc != '`') {
+
+    if (!parsingTemplate) {
         (*tp)->type = TOK_STRING;
     } else {
         if (c == '$' && nc == '{')
@@ -1778,6 +1787,7 @@
         else
             (*tp)->type = TOK_NO_SUBS_TEMPLATE;
     }
+
     (*tp)->setAtom(atom);
     return true;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/TokenStream.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/TokenStream.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/frontend/TokenStream.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/frontend/TokenStream.h	2015-02-28 15:03:04.000000000 +0000
@@ -531,6 +531,11 @@
     void tell(Position *);
     void seek(const Position &pos);
     bool seek(const Position &pos, const TokenStream &other);
+#ifdef DEBUG
+    inline bool debugHasNoLookahead() const {
+        return lookahead == 0;
+    }
+#endif
 
     const char16_t *rawCharPtrAt(size_t offset) const {
         return userbuf.rawCharPtrAt(offset);
@@ -763,7 +768,7 @@
 
     bool getTokenInternal(TokenKind *ttp, Modifier modifier);
 
-    bool getStringOrTemplateToken(int qc, Token **tp);
+    bool getStringOrTemplateToken(int untilChar, Token **tp);
 
     int32_t getChar();
     int32_t getCharIgnoreEOL();
@@ -824,7 +829,6 @@
     mozilla::UniquePtr<char16_t[], JS::FreePolicy> displayURL_; // the user's requested source URL or null
     mozilla::UniquePtr<char16_t[], JS::FreePolicy> sourceMapURL_; // source map's filename or null
     CharBuffer          tokenbuf;           // current token string buffer
-    bool                maybeStrSpecial[256];   // speeds up string scanning
     uint8_t             isExprEnding[TOK_LIMIT];// which tokens definitely terminate exprs?
     ExclusiveContext    *const cx;
     bool                mutedErrors;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Barrier.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Barrier.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Barrier.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Barrier.h	2015-02-28 15:03:04.000000000 +0000
@@ -748,6 +748,7 @@
 typedef PreBarriered<JSObject*> PreBarrieredObject;
 typedef PreBarriered<JSScript*> PreBarrieredScript;
 typedef PreBarriered<jit::JitCode*> PreBarrieredJitCode;
+typedef PreBarriered<JSString*> PreBarrieredString;
 typedef PreBarriered<JSAtom*> PreBarrieredAtom;
 
 typedef RelocatablePtr<JSObject*> RelocatablePtrObject;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/GCRuntime.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/GCRuntime.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/GCRuntime.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/GCRuntime.h	2015-02-28 15:03:04.000000000 +0000
@@ -908,10 +908,10 @@
     void sweepBackgroundThings(ZoneList &zones, LifoAlloc &freeBlocks, ThreadType threadType);
     void assertBackgroundSweepingFinished();
     bool shouldCompact();
-    IncrementalProgress compactPhase(bool lastGC);
+    IncrementalProgress compactPhase(JS::gcreason::Reason reason);
     void sweepTypesAfterCompacting(Zone *zone);
     void sweepZoneAfterCompacting(Zone *zone);
-    ArenaHeader *relocateArenas();
+    ArenaHeader *relocateArenas(JS::gcreason::Reason reason);
     void updateAllCellPointersParallel(MovingTracer *trc);
     void updateAllCellPointersSerial(MovingTracer *trc);
     void updatePointersToRelocatedCells();
@@ -921,7 +921,7 @@
     void protectRelocatedArenas(ArenaHeader *relocatedList);
     void unprotectRelocatedArenas(ArenaHeader *relocatedList);
 #endif
-    void finishCollection();
+    void finishCollection(JS::gcreason::Reason reason);
 
     void computeNonIncrementalMarkingForValidation();
     void validateIncrementalMarking();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Marking.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Marking.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Marking.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Marking.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -691,14 +691,18 @@
 {
     if (JSID_IS_STRING(*id)) {
         JSString *str = JSID_TO_STRING(*id);
+        JSString *prior = str;
         trc->setTracingLocation((void *)id);
         MarkInternal(trc, &str);
-        *id = NON_INTEGER_ATOM_TO_JSID(reinterpret_cast<JSAtom *>(str));
+        if (str != prior)
+            *id = NON_INTEGER_ATOM_TO_JSID(reinterpret_cast<JSAtom *>(str));
     } else if (JSID_IS_SYMBOL(*id)) {
         JS::Symbol *sym = JSID_TO_SYMBOL(*id);
+        JS::Symbol *prior = sym;
         trc->setTracingLocation((void *)id);
         MarkInternal(trc, &sym);
-        *id = SYMBOL_TO_JSID(sym);
+        if (sym != prior)
+            *id = SYMBOL_TO_JSID(sym);
     } else {
         /* Unset realLocation manually if we do not call MarkInternal. */
         trc->unsetTracingLocation();
@@ -755,14 +759,22 @@
         MOZ_ASSERT(v->toGCThing());
         void *thing = v->toGCThing();
         trc->setTracingLocation((void *)v);
-        MarkKind(trc, &thing, v->gcKind());
         if (v->isString()) {
-            v->setString((JSString *)thing);
+            JSString *str = static_cast<JSString*>(thing);
+            MarkInternal(trc, &str);
+            if (str != thing)
+                v->setString(str);
         } else if (v->isObject()) {
-            v->setObjectOrNull((JSObject *)thing);
+            JSObject *obj = static_cast<JSObject*>(thing);
+            MarkInternal(trc, &obj);
+            if (obj != thing)
+                v->setObjectOrNull(obj);
         } else {
             MOZ_ASSERT(v->isSymbol());
-            v->setSymbol((JS::Symbol *)thing);
+            JS::Symbol *sym = static_cast<JS::Symbol*>(thing);
+            MarkInternal(trc, &sym);
+            if (sym != thing)
+                v->setSymbol(sym);
         }
     } else {
         /* Unset realLocation manually if we do not call MarkInternal. */
@@ -790,11 +802,11 @@
 {
     JS_ROOT_MARKING_ASSERT(trc);
     trc->setTracingName(name);
-    if (v->isSingleton()) {
+    if (v->isSingletonUnchecked()) {
         JSObject *obj = v->singleton();
         MarkInternal(trc, &obj);
         *v = TypeSet::ObjectType(obj);
-    } else if (v->isGroup()) {
+    } else if (v->isGroupUnchecked()) {
         ObjectGroup *group = v->group();
         MarkInternal(trc, &group);
         *v = TypeSet::ObjectType(group);
@@ -915,7 +927,7 @@
 {
     MOZ_ASSERT(obj->isNative());
     for (uint32_t i = start; i < (start + nslots); ++i) {
-        trc->setTracingDetails(js_GetObjectSlotName, obj, i);
+        trc->setTracingDetails(GetObjectSlotName, obj, i);
         MarkValueInternal(trc, obj->getSlotRef(i).unsafeGet());
     }
 }
@@ -995,24 +1007,6 @@
     MarkValueInternal(trc, v);
 }
 
-bool
-gc::IsCellMarked(Cell **thingp)
-{
-    return IsMarked<Cell>(thingp);
-}
-
-bool
-gc::IsCellAboutToBeFinalized(Cell **thingp)
-{
-    return IsAboutToBeFinalized<Cell>(thingp);
-}
-
-bool
-gc::IsCellAboutToBeFinalizedFromAnyThread(Cell **thingp)
-{
-    return IsAboutToBeFinalizedFromAnyThread<Cell>(thingp);
-}
-
 /*** Push Mark Stack ***/
 
 #define JS_COMPARTMENT_ASSERT(rt, thing)                                \
@@ -1441,6 +1435,9 @@
     if (group->maybeUnboxedLayout())
         group->unboxedLayout().trace(gcmarker);
 
+    if (ObjectGroup *unboxedGroup = group->maybeOriginalUnboxedGroup())
+        PushMarkStack(gcmarker, unboxedGroup);
+
     if (TypeDescr *descr = group->maybeTypeDescr())
         PushMarkStack(gcmarker, descr);
 
@@ -1469,6 +1466,11 @@
     if (group->maybeUnboxedLayout())
         group->unboxedLayout().trace(trc);
 
+    if (ObjectGroup *unboxedGroup = group->maybeOriginalUnboxedGroup()) {
+        MarkObjectGroupUnbarriered(trc, &unboxedGroup, "group_original_unboxed_group");
+        group->setOriginalUnboxedGroup(unboxedGroup);
+    }
+
     if (JSObject *descr = group->maybeTypeDescr()) {
         MarkObjectUnbarriered(trc, &descr, "group_type_descr");
         group->setTypeDescr(&descr->as<TypeDescr>());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Marking.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Marking.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Marking.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Marking.h	2015-02-28 15:03:04.000000000 +0000
@@ -320,15 +320,6 @@
     MarkObjectUnbarriered(trc, obj, name);
 }
 
-bool
-IsCellMarked(Cell **thingp);
-
-bool
-IsCellAboutToBeFinalized(Cell **thing);
-
-bool
-IsCellAboutToBeFinalizedFromAnyThread(Cell **thing);
-
 inline bool
 IsMarked(BarrieredBase<Value> *v)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Nursery.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Nursery.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Nursery.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Nursery.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -422,7 +422,7 @@
 
     // Unboxed plain objects are sized according to the data they store.
     if (obj->is<UnboxedPlainObject>()) {
-        size_t nbytes = obj->as<UnboxedPlainObject>().layout().size();
+        size_t nbytes = obj->as<UnboxedPlainObject>().layoutDontCheckGeneration().size();
         return GetGCObjectKindForBytes(UnboxedPlainObject::offsetOfData() + nbytes);
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Rooting.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Rooting.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Rooting.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Rooting.h	2015-02-28 15:03:04.000000000 +0000
@@ -38,6 +38,7 @@
 typedef JS::MutableHandle<Shape*>      MutableHandleShape;
 typedef JS::MutableHandle<JSAtom*>     MutableHandleAtom;
 typedef JS::MutableHandle<NativeObject*> MutableHandleNativeObject;
+typedef JS::MutableHandle<PlainObject*> MutableHandlePlainObject;
 
 typedef JS::Rooted<NativeObject*>      RootedNativeObject;
 typedef JS::Rooted<Shape*>             RootedShape;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Statistics.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Statistics.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Statistics.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Statistics.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -1005,7 +1005,7 @@
         bool wasFullGC = zoneStats.isCollectingAllZones();
         if (sliceCallback)
             (*sliceCallback)(runtime, first ? JS::GC_CYCLE_BEGIN : JS::GC_SLICE_BEGIN,
-                             JS::GCDescription(!wasFullGC));
+                             JS::GCDescription(!wasFullGC, gckind));
     }
 }
 
@@ -1029,7 +1029,7 @@
         bool wasFullGC = zoneStats.isCollectingAllZones();
         if (sliceCallback)
             (*sliceCallback)(runtime, last ? JS::GC_CYCLE_END : JS::GC_SLICE_END,
-                             JS::GCDescription(!wasFullGC));
+                             JS::GCDescription(!wasFullGC, gckind));
     }
 
     /* Do this after the slice callback since it uses these values. */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Zone.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Zone.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/gc/Zone.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/gc/Zone.h	2015-02-28 15:03:04.000000000 +0000
@@ -136,7 +136,7 @@
     void *onOutOfMemory(void *p, size_t nbytes) {
         return runtimeFromMainThread()->onOutOfMemory(p, nbytes);
     }
-    void reportAllocationOverflow() { js_ReportAllocationOverflow(nullptr); }
+    void reportAllocationOverflow() { js::ReportAllocationOverflow(nullptr); }
 
     void beginSweepTypes(js::FreeOp *fop, bool releaseTypes);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/irregexp/RegExpEngine.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/irregexp/RegExpEngine.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/irregexp/RegExpEngine.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/irregexp/RegExpEngine.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -1612,8 +1612,8 @@
         return RegExpCode();
 
     if (reg_exp_too_big_) {
-        JS_ReportError(cx, "regexp too big");
         code.destroy();
+        JS_ReportError(cx, "regexp too big");
         return RegExpCode();
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/irregexp/RegExpInterpreter.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/irregexp/RegExpInterpreter.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/irregexp/RegExpInterpreter.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/irregexp/RegExpInterpreter.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -49,7 +49,7 @@
 
     bool init() {
         if (!stack.init()) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         cursor = base();
@@ -61,7 +61,7 @@
         if (cursor >= stack.limit()) {
             int32_t pos = position();
             if (!stack.grow()) {
-                js_ReportOverRecursed(cx);
+                ReportOverRecursed(cx);
                 return false;
             }
             setPosition(pos);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Architecture-arm.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Architecture-arm.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Architecture-arm.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Architecture-arm.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -365,14 +365,6 @@
 }
 
 uint32_t
-VFPRegister::GetSizeInBytes(const FloatRegisterSet &s)
-{
-    uint64_t bits = s.bits();
-    uint32_t ret = mozilla::CountPopulation32(bits&0xffffffff) * sizeof(float);
-    ret +=  mozilla::CountPopulation32(bits >> 32) * sizeof(double);
-    return ret;
-}
-uint32_t
 VFPRegister::GetPushSizeInBytes(const FloatRegisterSet &s)
 {
     FloatRegisterSet ss = s.reduceSetForPush();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Architecture-arm.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Architecture-arm.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Architecture-arm.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Architecture-arm.h	2015-02-28 15:03:05.000000000 +0000
@@ -75,6 +75,12 @@
         invalid_reg
     };
     typedef RegisterID Code;
+    typedef RegisterID Encoding;
+
+    // Content spilled during bailouts.
+    union RegisterContent {
+        uintptr_t r;
+    };
 
     static const char *GetName(Code code) {
         static const char * const Names[] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
@@ -94,16 +100,18 @@
     static const uint32_t Total = 16;
     static const uint32_t Allocatable = 13;
 
-    static const uint32_t AllMask = (1 << Total) - 1;
-    static const uint32_t ArgRegMask = (1 << r0) | (1 << r1) | (1 << r2) | (1 << r3);
+    typedef uint32_t SetType;
 
-    static const uint32_t VolatileMask =
+    static const SetType AllMask = (1 << Total) - 1;
+    static const SetType ArgRegMask = (1 << r0) | (1 << r1) | (1 << r2) | (1 << r3);
+
+    static const SetType VolatileMask =
         (1 << r0) |
         (1 << r1) |
         (1 << Registers::r2) |
         (1 << Registers::r3);
 
-    static const uint32_t NonVolatileMask =
+    static const SetType NonVolatileMask =
         (1 << Registers::r4) |
         (1 << Registers::r5) |
         (1 << Registers::r6) |
@@ -115,35 +123,35 @@
         (1 << Registers::r12) |
         (1 << Registers::r14);
 
-    static const uint32_t WrapperMask =
+    static const SetType WrapperMask =
         VolatileMask |         // = arguments
         (1 << Registers::r4) | // = outReg
         (1 << Registers::r5);  // = argBase
 
-    static const uint32_t SingleByteRegs =
+    static const SetType SingleByteRegs =
         VolatileMask | NonVolatileMask;
 
-    static const uint32_t NonAllocatableMask =
+    static const SetType NonAllocatableMask =
         (1 << Registers::sp) |
         (1 << Registers::r12) | // r12 = ip = scratch
         (1 << Registers::lr) |
         (1 << Registers::pc);
 
     // Registers that can be allocated without being saved, generally.
-    static const uint32_t TempMask = VolatileMask & ~NonAllocatableMask;
+    static const SetType TempMask = VolatileMask & ~NonAllocatableMask;
 
     // Registers returned from a JS -> JS call.
-    static const uint32_t JSCallMask =
+    static const SetType JSCallMask =
         (1 << Registers::r2) |
         (1 << Registers::r3);
 
     // Registers returned from a JS -> C call.
-    static const uint32_t CallMask =
+    static const SetType CallMask =
         (1 << Registers::r0) |
         (1 << Registers::r1);  // Used for double-size returns.
 
-    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
-    typedef uint32_t SetType;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
+
     static uint32_t SetSize(SetType x) {
         static_assert(sizeof(SetType) == 4, "SetType must be 32 bits");
         return mozilla::CountPopulation32(x);
@@ -232,7 +240,12 @@
     };
 
     typedef FPRegisterID Code;
+    typedef FPRegisterID Encoding;
 
+    // Content spilled during bailouts.
+    union RegisterContent {
+        double d;
+    };
 
     static const char *GetDoubleName(Code code) {
         static const char * const Names[] = { "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7",
@@ -264,11 +277,13 @@
     // There are only 32 places that we can put values.
     static const uint32_t TotalPhys = 32;
     static uint32_t ActualTotalPhys();
-    static const uint64_t AllDoubleMask = ((1ull << 16) - 1) << 32;
-    static const uint64_t AllMask = ((1ull << 48) - 1);
+
+    typedef uint64_t SetType;
+    static const SetType AllDoubleMask = ((1ull << 16) - 1) << 32;
+    static const SetType AllMask = ((1ull << 48) - 1);
 
     // d15 is the ScratchFloatReg.
-    static const uint64_t NonVolatileDoubleMask =
+    static const SetType NonVolatileDoubleMask =
          ((1ULL << d8) |
           (1ULL << d9) |
           (1ULL << d10) |
@@ -277,7 +292,7 @@
           (1ULL << d13) |
           (1ULL << d14));
     // s30 and s31 alias d15.
-    static const uint64_t NonVolatileMask =
+    static const SetType NonVolatileMask =
         (NonVolatileDoubleMask |
          ((1 << s16) |
           (1 << s17) |
@@ -295,22 +310,21 @@
           (1 << s29) |
           (1 << s30)));
 
-    static const uint64_t VolatileMask = AllMask & ~NonVolatileMask;
-    static const uint64_t VolatileDoubleMask = AllDoubleMask & ~NonVolatileDoubleMask;
+    static const SetType VolatileMask = AllMask & ~NonVolatileMask;
+    static const SetType VolatileDoubleMask = AllDoubleMask & ~NonVolatileDoubleMask;
 
-    static const uint64_t WrapperMask = VolatileMask;
+    static const SetType WrapperMask = VolatileMask;
 
     // d15 is the ARM scratch float register.
     // s30 and s31 alias d15.
-    static const uint64_t NonAllocatableMask = ((1ULL << d15)) |
-                                                (1ULL << s30) |
-                                                (1ULL << s31);
+    static const SetType NonAllocatableMask = ((1ULL << d15)) |
+                                               (1ULL << s30) |
+                                               (1ULL << s31);
 
     // Registers that can be allocated without being saved, generally.
-    static const uint64_t TempMask = VolatileMask & ~NonAllocatableMask;
+    static const SetType TempMask = VolatileMask & ~NonAllocatableMask;
 
-    static const uint64_t AllocatableMask = AllMask & ~NonAllocatableMask;
-    typedef uint64_t SetType;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
 };
 
 template <typename T>
@@ -331,6 +345,7 @@
 
     typedef FloatRegisters Codes;
     typedef Codes::Code Code;
+    typedef Codes::Encoding Encoding;
 
   protected:
     RegType kind : 2;
@@ -365,8 +380,11 @@
         MOZ_ASSERT(!other.isInvalid());
         return kind == other.kind && code_ == other.code_;
     }
-    bool isDouble() const { return kind == Double; }
+
     bool isSingle() const { return kind == Single; }
+    bool isDouble() const { return kind == Double; }
+    bool isInt32x4() const { return false; }
+    bool isFloat32x4() const { return false; }
     bool isFloat() const { return (kind == Double) || (kind == Single); }
     bool isInt() const { return (kind == UInt) || (kind == Int); }
     bool isSInt() const { return kind == Int; }
@@ -381,6 +399,11 @@
     VFPRegister sintOverlay(unsigned int which = 0) const;
     VFPRegister uintOverlay(unsigned int which = 0) const;
 
+    VFPRegister asSingle() const { return singleOverlay(); }
+    VFPRegister asDouble() const { return doubleOverlay(); }
+    VFPRegister asInt32x4() const { MOZ_CRASH("NYI"); }
+    VFPRegister asFloat32x4() const { MOZ_CRASH("NYI"); }
+
     struct VFPRegIndexSplit;
     VFPRegIndexSplit encode();
 
@@ -407,6 +430,10 @@
         MOZ_ASSERT(isFloat());
         return Code(code_ | (kind << 5));
     }
+    Encoding encoding() const {
+        MOZ_ASSERT(!_isInvalid && !_isMissing);
+        return Code(code_ | (kind << 5));
+    }
     uint32_t id() const {
         return code_;
     }
@@ -498,7 +525,6 @@
         return FloatRegisters::FromName(name);
     }
     static TypedRegisterSet<VFPRegister> ReduceSetForPush(const TypedRegisterSet<VFPRegister> &s);
-    static uint32_t GetSizeInBytes(const TypedRegisterSet<VFPRegister> &s);
     static uint32_t GetPushSizeInBytes(const TypedRegisterSet<VFPRegister> &s);
     uint32_t getRegisterDumpOffsetInBytes();
     static uint32_t FirstBit(SetType x) {
@@ -583,6 +609,12 @@
 }
 #endif
 
+// See the comments above AsmJSMappedSize in AsmJSValidate.h for more info.
+// TODO: Implement this for ARM. Note that it requires Codegen to respect the
+// offset field of AsmJSHeapAccess.
+static const size_t AsmJSCheckedImmediateRange = 0;
+static const size_t AsmJSImmediateRange = 0;
+
 } // namespace jit
 } // namespace js
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Assembler-arm.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Assembler-arm.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Assembler-arm.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Assembler-arm.h	2015-02-28 15:03:05.000000000 +0000
@@ -95,7 +95,8 @@
 static MOZ_CONSTEXPR_VAR Register ReturnReg = r0;
 static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32Reg = { FloatRegisters::d0, VFPRegister::Single };
 static MOZ_CONSTEXPR_VAR FloatRegister ReturnDoubleReg = { FloatRegisters::d0, VFPRegister::Double};
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnSimdReg = InvalidFloatReg;
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnInt32x4Reg = InvalidFloatReg;
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32x4Reg = InvalidFloatReg;
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloat32Reg = { FloatRegisters::d30, VFPRegister::Single };
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchDoubleReg = { FloatRegisters::d15, VFPRegister::Double };
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchSimdReg = InvalidFloatReg;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Bailouts-arm.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Bailouts-arm.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Bailouts-arm.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Bailouts-arm.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -30,8 +30,8 @@
     };
 
   protected: // Silence Clang warning about unused private fields.
-    mozilla::Array<double, FloatRegisters::TotalPhys> fpregs_;
-    mozilla::Array<uintptr_t, Registers::Total> regs_;
+    RegisterDump::FPUArray fpregs_;
+    RegisterDump::GPRArray regs_;
 
     uintptr_t snapshotOffset_;
     uintptr_t padding_;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/CodeGenerator-arm.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/CodeGenerator-arm.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/CodeGenerator-arm.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/CodeGenerator-arm.h	2015-02-28 15:03:05.000000000 +0000
@@ -240,6 +240,7 @@
     void visitSimdSplatX4(LSimdSplatX4 *lir) { MOZ_CRASH("NYI"); }
     void visitInt32x4(LInt32x4 *ins) { MOZ_CRASH("NYI"); }
     void visitFloat32x4(LFloat32x4 *ins) { MOZ_CRASH("NYI"); }
+    void visitSimdReinterpretCast(LSimdReinterpretCast *ins) { MOZ_CRASH("NYI"); }
     void visitSimdExtractElementI(LSimdExtractElementI *ins) { MOZ_CRASH("NYI"); }
     void visitSimdExtractElementF(LSimdExtractElementF *ins) { MOZ_CRASH("NYI"); }
     void visitSimdSignMaskX4(LSimdSignMaskX4 *ins) { MOZ_CRASH("NYI"); }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Simulator-arm.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Simulator-arm.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Simulator-arm.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Simulator-arm.h	2015-02-28 15:03:05.000000000 +0000
@@ -433,7 +433,7 @@
 #define JS_CHECK_SIMULATOR_RECURSION_WITH_EXTRA(cx, extra, onerror)             \
     JS_BEGIN_MACRO                                                              \
         if (cx->runtime()->simulator()->overRecursedWithExtra(extra)) {         \
-            js_ReportOverRecursed(cx);                                          \
+            js::ReportOverRecursed(cx);                                         \
             onerror;                                                            \
         }                                                                       \
     JS_END_MACRO
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Trampoline-arm.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Trampoline-arm.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/arm/Trampoline-arm.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/arm/Trampoline-arm.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -636,9 +636,9 @@
     masm.ma_ldr(Address(sp, 0), r2);
     masm.ma_add(sp, Imm32(sizeOfBailoutInfo), sp);
     // Common size of a bailout frame.
-    uint32_t bailoutFrameSize = sizeof(void *) + // frameClass
-                              sizeof(double) * FloatRegisters::TotalPhys +
-                              sizeof(void *) * Registers::Total;
+    uint32_t bailoutFrameSize = 0
+        + sizeof(void *) // frameClass
+        + sizeof(RegisterDump);
 
     if (frameClass == NO_FRAME_SIZE_CLASS_ID) {
         // Make sure the bailout frame size fits into the offset for a load.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BacktrackingAllocator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BacktrackingAllocator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BacktrackingAllocator.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BacktrackingAllocator.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -17,11 +17,11 @@
 {
     RegisterSet remainingRegisters(allRegisters_);
     while (!remainingRegisters.empty(/* float = */ false)) {
-        AnyRegister reg = AnyRegister(remainingRegisters.takeGeneral());
+        AnyRegister reg = AnyRegister(remainingRegisters.takeUnaliasedGeneral());
         registers[reg.code()].allocatable = true;
     }
     while (!remainingRegisters.empty(/* float = */ true)) {
-        AnyRegister reg = AnyRegister(remainingRegisters.takeFloat());
+        AnyRegister reg = AnyRegister(remainingRegisters.takeUnaliasedFloat());
         registers[reg.code()].allocatable = true;
     }
 
@@ -471,7 +471,7 @@
 
 bool
 BacktrackingAllocator::tryAllocateFixed(LiveInterval *interval, bool *success,
-                                        bool *pfixed, LiveInterval **pconflicting)
+                                        bool *pfixed, LiveIntervalVector &conflicting)
 {
     // Spill intervals which are required to be in a certain stack slot.
     if (!interval->requirement()->allocation().isRegister()) {
@@ -482,12 +482,12 @@
     }
 
     AnyRegister reg = interval->requirement()->allocation().toRegister();
-    return tryAllocateRegister(registers[reg.code()], interval, success, pfixed, pconflicting);
+    return tryAllocateRegister(registers[reg.code()], interval, success, pfixed, conflicting);
 }
 
 bool
 BacktrackingAllocator::tryAllocateNonFixed(LiveInterval *interval, bool *success,
-                                           bool *pfixed, LiveInterval **pconflicting)
+                                           bool *pfixed, LiveIntervalVector &conflicting)
 {
     // If we want, but do not require an interval to be in a specific
     // register, only look at that register for allocating and evict
@@ -496,7 +496,7 @@
     // and will tie up more registers than if we spilled.
     if (interval->hint()->kind() == Requirement::FIXED) {
         AnyRegister reg = interval->hint()->allocation().toRegister();
-        if (!tryAllocateRegister(registers[reg.code()], interval, success, pfixed, pconflicting))
+        if (!tryAllocateRegister(registers[reg.code()], interval, success, pfixed, conflicting))
             return false;
         if (*success)
             return true;
@@ -511,11 +511,11 @@
         return true;
     }
 
-    if (!*pconflicting || minimalInterval(interval)) {
+    if (conflicting.empty() || minimalInterval(interval)) {
         // Search for any available register which the interval can be
         // allocated to.
         for (size_t i = 0; i < AnyRegister::Total; i++) {
-            if (!tryAllocateRegister(registers[i], interval, success, pfixed, pconflicting))
+            if (!tryAllocateRegister(registers[i], interval, success, pfixed, conflicting))
                 return false;
             if (*success)
                 return true;
@@ -568,19 +568,19 @@
     bool canAllocate = setIntervalRequirement(interval);
 
     bool fixed;
-    LiveInterval *conflict = nullptr;
+    LiveIntervalVector conflicting;
     for (size_t attempt = 0;; attempt++) {
         if (canAllocate) {
             bool success = false;
             fixed = false;
-            conflict = nullptr;
+            conflicting.clear();
 
             // Ok, let's try allocating for this interval.
             if (interval->requirement()->kind() == Requirement::FIXED) {
-                if (!tryAllocateFixed(interval, &success, &fixed, &conflict))
+                if (!tryAllocateFixed(interval, &success, &fixed, conflicting))
                     return false;
             } else {
-                if (!tryAllocateNonFixed(interval, &success, &fixed, &conflict))
+                if (!tryAllocateNonFixed(interval, &success, &fixed, conflicting))
                     return false;
             }
 
@@ -588,15 +588,17 @@
             if (success)
                 return true;
 
-            // If that didn't work, but we have a non-fixed LiveInterval known
-            // to be conflicting, maybe we can evict it and try again.
+            // If that didn't work, but we have one or more non-fixed intervals
+            // known to be conflicting, maybe we can evict them and try again.
             if (attempt < MAX_ATTEMPTS &&
                 !fixed &&
-                conflict &&
-                computeSpillWeight(conflict) < computeSpillWeight(interval))
+                !conflicting.empty() &&
+                maximumSpillWeight(conflicting) < computeSpillWeight(interval))
             {
-                if (!evictInterval(conflict))
-                    return false;
+                for (size_t i = 0; i < conflicting.length(); i++) {
+                    if (!evictInterval(conflicting[i]))
+                        return false;
+                }
                 continue;
             }
         }
@@ -607,6 +609,7 @@
         // be constructed so that any minimal interval is allocatable.
         MOZ_ASSERT(!minimalInterval(interval));
 
+        LiveInterval *conflict = conflicting.empty() ? nullptr : conflicting[0];
         return chooseIntervalSplit(interval, canAllocate && fixed, conflict);
     }
 }
@@ -782,7 +785,7 @@
 
 bool
 BacktrackingAllocator::tryAllocateRegister(PhysicalRegister &r, LiveInterval *interval,
-                                           bool *success, bool *pfixed, LiveInterval **pconflicting)
+                                           bool *success, bool *pfixed, LiveIntervalVector &conflicting)
 {
     *success = false;
 
@@ -796,6 +799,8 @@
     MOZ_ASSERT_IF(interval->requirement()->kind() == Requirement::FIXED,
                   interval->requirement()->allocation() == LAllocation(r.reg));
 
+    LiveIntervalVector aliasedConflicting;
+
     for (size_t i = 0; i < interval->numRanges(); i++) {
         AllocatedRange range(interval, interval->getRange(i)), existing;
         for (size_t a = 0; a < r.reg.numAliased(); a++) {
@@ -803,24 +808,61 @@
             if (!rAlias.allocations.contains(range, &existing))
                 continue;
             if (existing.interval->hasVreg()) {
-                if (JitSpewEnabled(JitSpew_RegAlloc)) {
-                    JitSpew(JitSpew_RegAlloc, "  %s collides with v%u[%u] %s [weight %lu]",
-                            rAlias.reg.name(), existing.interval->vreg(),
-                            existing.interval->index(),
-                            existing.range->toString(),
-                            computeSpillWeight(existing.interval));
+                MOZ_ASSERT(existing.interval->getAllocation()->toRegister() == rAlias.reg);
+                bool duplicate = false;
+                for (size_t i = 0; i < aliasedConflicting.length(); i++) {
+                    if (aliasedConflicting[i] == existing.interval) {
+                        duplicate = true;
+                        break;
+                    }
                 }
-                if (!*pconflicting || computeSpillWeight(existing.interval) < computeSpillWeight(*pconflicting))
-                    *pconflicting = existing.interval;
+                if (!duplicate && !aliasedConflicting.append(existing.interval))
+                    return false;
             } else {
                 if (JitSpewEnabled(JitSpew_RegAlloc)) {
                     JitSpew(JitSpew_RegAlloc, "  %s collides with fixed use %s",
                             rAlias.reg.name(), existing.range->toString());
                 }
                 *pfixed = true;
+                return true;
+            }
+        }
+    }
+
+    if (!aliasedConflicting.empty()) {
+        // One or more aliased registers is allocated to another live interval
+        // overlapping this one. Keep track of the conflicting set, and in the
+        // case of multiple conflicting sets keep track of the set with the
+        // lowest maximum spill weight.
+
+        if (JitSpewEnabled(JitSpew_RegAlloc)) {
+            if (aliasedConflicting.length() == 1) {
+                LiveInterval *existing = aliasedConflicting[0];
+                JitSpew(JitSpew_RegAlloc, "  %s collides with v%u[%u] %s [weight %lu]",
+                        r.reg.name(), existing->vreg(), existing->index(),
+                        existing->rangesToString(), computeSpillWeight(existing));
+            } else {
+                JitSpew(JitSpew_RegAlloc, "  %s collides with the following", r.reg.name());
+                for (size_t i = 0; i < aliasedConflicting.length(); i++) {
+                    LiveInterval *existing = aliasedConflicting[i];
+                    JitSpew(JitSpew_RegAlloc, "      v%u[%u] %s [weight %lu]",
+                            existing->vreg(), existing->index(),
+                            existing->rangesToString(), computeSpillWeight(existing));
+                }
             }
-            return true;
         }
+
+        if (conflicting.empty()) {
+            if (!conflicting.appendAll(aliasedConflicting))
+                return false;
+        } else {
+            if (maximumSpillWeight(aliasedConflicting) < maximumSpillWeight(conflicting)) {
+                conflicting.clear();
+                if (!conflicting.appendAll(aliasedConflicting))
+                    return false;
+            }
+        }
+        return true;
     }
 
     JitSpew(JitSpew_RegAlloc, "  allocated to %s", r.reg.name());
@@ -1503,16 +1545,37 @@
                     // or (b) it is an operand in one of the group's moves. The
                     // latter case handles live intervals which end immediately
                     // before the move group or start immediately after.
+                    // For (b) we need to consider move groups immediately
+                    // preceding or following this one.
 
+                    if (iter->toMoveGroup()->uses(reg.reg.gpr()))
+                        continue;
                     bool found = false;
-                    LGeneralReg alloc(reg.reg.gpr());
-                    for (size_t j = 0; j < iter->toMoveGroup()->numMoves(); j++) {
-                        LMove move = iter->toMoveGroup()->getMove(j);
-                        if (*move.from() == alloc || *move.to() == alloc) {
-                            found = true;
+                    LInstructionIterator niter(iter);
+                    for (niter++; niter != block->end(); niter++) {
+                        if (niter->isMoveGroup()) {
+                            if (niter->toMoveGroup()->uses(reg.reg.gpr())) {
+                                found = true;
+                                break;
+                            }
+                        } else {
                             break;
                         }
                     }
+                    if (iter != block->begin()) {
+                        LInstructionIterator riter(iter);
+                        do {
+                            riter--;
+                            if (riter->isMoveGroup()) {
+                                if (riter->toMoveGroup()->uses(reg.reg.gpr())) {
+                                    found = true;
+                                    break;
+                                }
+                            } else {
+                                break;
+                            }
+                        } while (riter != block->begin());
+                    }
 
                     if (found || reg.allocations.contains(search, &existing))
                         continue;
@@ -1792,6 +1855,15 @@
     return maxWeight;
 }
 
+size_t
+BacktrackingAllocator::maximumSpillWeight(const LiveIntervalVector &intervals)
+{
+    size_t maxWeight = 0;
+    for (size_t i = 0; i < intervals.length(); i++)
+        maxWeight = Max(maxWeight, computeSpillWeight(intervals[i]));
+    return maxWeight;
+}
+
 bool
 BacktrackingAllocator::trySplitAcrossHotcode(LiveInterval *interval, bool *success)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BacktrackingAllocator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BacktrackingAllocator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BacktrackingAllocator.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BacktrackingAllocator.h	2015-02-28 15:03:05.000000000 +0000
@@ -211,13 +211,15 @@
     bool tryGroupRegisters(uint32_t vreg0, uint32_t vreg1);
     bool tryGroupReusedRegister(uint32_t def, uint32_t use);
     bool groupAndQueueRegisters();
-    bool tryAllocateFixed(LiveInterval *interval, bool *success, bool *pfixed, LiveInterval **pconflicting);
-    bool tryAllocateNonFixed(LiveInterval *interval, bool *success, bool *pfixed, LiveInterval **pconflicting);
+    bool tryAllocateFixed(LiveInterval *interval, bool *success, bool *pfixed,
+                          LiveIntervalVector &conflicting);
+    bool tryAllocateNonFixed(LiveInterval *interval, bool *success, bool *pfixed,
+                             LiveIntervalVector &conflicting);
     bool processInterval(LiveInterval *interval);
     bool processGroup(VirtualRegisterGroup *group);
     bool setIntervalRequirement(LiveInterval *interval);
     bool tryAllocateRegister(PhysicalRegister &r, LiveInterval *interval,
-                             bool *success, bool *pfixed, LiveInterval **pconflicting);
+                             bool *success, bool *pfixed, LiveIntervalVector &conflicting);
     bool tryAllocateGroupRegister(PhysicalRegister &r, VirtualRegisterGroup *group,
                                   bool *psuccess, bool *pfixed, LiveInterval **pconflicting);
     bool evictInterval(LiveInterval *interval);
@@ -261,6 +263,8 @@
     size_t computePriority(const VirtualRegisterGroup *group);
     size_t computeSpillWeight(const VirtualRegisterGroup *group);
 
+    size_t maximumSpillWeight(const LiveIntervalVector &intervals);
+
     bool chooseIntervalSplit(LiveInterval *interval, bool fixed, LiveInterval *conflict);
 
     bool splitAt(LiveInterval *interval,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineCompiler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineCompiler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineCompiler.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineCompiler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -277,7 +277,7 @@
             return Method_Error;
 
         JitcodeGlobalEntry::BaselineEntry entry;
-        entry.init(code->raw(), code->rawEnd(), script, str);
+        entry.init(code, code->raw(), code->rawEnd(), script, str);
 
         JitcodeGlobalTable *globalTable = cx->runtime()->jitRuntime()->getJitcodeGlobalTable();
         if (!globalTable->addEntry(entry, cx->runtime())) {
@@ -1974,6 +1974,18 @@
     return emitOpIC(compiler.getStub(&stubSpace_));
 }
 
+bool
+BaselineCompiler::emit_JSOP_INITLOCKEDPROP()
+{
+    return emit_JSOP_INITPROP();
+}
+
+bool
+BaselineCompiler::emit_JSOP_INITHIDDENPROP()
+{
+    return emit_JSOP_INITPROP();
+}
+
 typedef bool (*NewbornArrayPushFn)(JSContext *, HandleObject, const Value &);
 static const VMFunction NewbornArrayPushInfo = FunctionInfo<NewbornArrayPushFn>(NewbornArrayPush);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineCompiler.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineCompiler.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineCompiler.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineCompiler.h	2015-02-28 15:03:05.000000000 +0000
@@ -103,6 +103,8 @@
     _(JSOP_INITELEM_INC)       \
     _(JSOP_MUTATEPROTO)        \
     _(JSOP_INITPROP)           \
+    _(JSOP_INITLOCKEDPROP)     \
+    _(JSOP_INITHIDDENPROP)     \
     _(JSOP_INITPROP_GETTER)    \
     _(JSOP_INITPROP_SETTER)    \
     _(JSOP_ARRAYPUSH)          \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineDebugModeOSR.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineDebugModeOSR.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineDebugModeOSR.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineDebugModeOSR.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -760,7 +760,7 @@
     switch (oldStub->kind()) {
 #define CASE_KIND(kindName)                                                  \
       case ICStub::kindName:                                                 \
-        entry.newStub = IC##kindName::Clone(cx, stubSpace, firstMonitorStub, \
+        entry.newStub = IC##kindName::Clone(stubSpace, firstMonitorStub,     \
                                             *oldStub->to##kindName());       \
         break;
         PATCHABLE_ICSTUB_KIND_LIST(CASE_KIND)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineFrame.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineFrame.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineFrame.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineFrame.h	2015-02-28 15:03:05.000000000 +0000
@@ -49,7 +49,7 @@
 
         // Frame has execution observed by a Debugger.
         //
-        // See comment above 'debugMode' in jscompartment.h for explanation of
+        // See comment above 'isDebuggee' in jscompartment.h for explanation of
         // invariants of debuggee compartments, scripts, and frames.
         DEBUGGEE         = 1 << 6,
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineIC.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineIC.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineIC.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineIC.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1093,7 +1093,7 @@
         ICStub *stub = existingStub ? compiler.updateStub()
                                     : compiler.getStub(compiler.getStubSpace(script));
         if (!stub) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 
@@ -1120,7 +1120,7 @@
         ICTypeMonitor_SingleObject::Compiler compiler(cx, obj);
         ICStub *stub = compiler.getStub(compiler.getStubSpace(script));
         if (!stub) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 
@@ -1144,7 +1144,7 @@
         ICTypeMonitor_ObjectGroup::Compiler compiler(cx, group);
         ICStub *stub = compiler.getStub(compiler.getStubSpace(script));
         if (!stub) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 
@@ -3119,29 +3119,19 @@
     return obj->getTaggedProto().toObjectOrNull();
 }
 
+// Callers are expected to have already guarded on the shape of the
+// object, which guarantees the object is a DOM proxy.
 static void
-GenerateDOMProxyChecks(JSContext *cx, MacroAssembler &masm, Register object,
-                       Address checkProxyHandlerAddr,
-                       Address *checkExpandoShapeAddr,
-                       Address *expandoAndGenerationAddr,
-                       Address *generationAddr,
-                       Register scratch,
-                       GeneralRegisterSet &domProxyRegSet,
-                       Label *checkFailed)
-{
-    // Guard the following:
-    //      1. The object is a DOMProxy.
-    //      2. The object does not have expando properties, or has an expando
-    //          which is known to not have the desired property.
-    Address handlerAddr(object, ProxyObject::offsetOfHandler());
-
-    // Check that object is a DOMProxy.
-    masm.loadPtr(checkProxyHandlerAddr, scratch);
-    masm.branchPtr(Assembler::NotEqual, handlerAddr, scratch, checkFailed);
-
-    // At this point, if not checking for an expando object, just return.
-    if (!checkExpandoShapeAddr)
-        return;
+CheckDOMProxyExpandoDoesNotShadow(JSContext *cx, MacroAssembler &masm, Register object,
+                                  const Address &checkExpandoShapeAddr,
+                                  Address *expandoAndGenerationAddr,
+                                  Address *generationAddr,
+                                  Register scratch,
+                                  GeneralRegisterSet &domProxyRegSet,
+                                  Label *checkFailed)
+{
+    // Guard that the object does not have expando properties, or has an expando
+    // which is known to not have the desired property.
 
     // For the remaining code, we need to reserve some registers to load a value.
     // This is ugly, but unavoidable.
@@ -3178,7 +3168,7 @@
     // The reference object used to generate this check may not have had an
     // expando object at all, in which case the presence of a non-undefined
     // expando value in the incoming object is automatically a failure.
-    masm.loadPtr(*checkExpandoShapeAddr, scratch);
+    masm.loadPtr(checkExpandoShapeAddr, scratch);
     masm.branchPtr(Assembler::Equal, scratch, ImmPtr(nullptr), &failDOMProxyCheck);
 
     // Otherwise, ensure that the incoming object has an object for its expando value and that
@@ -3230,7 +3220,7 @@
         if (*shadowsResult == ShadowCheckFailed)
             return false;
 
-        if (*shadowsResult == Shadows) {
+        if (DOMProxyIsShadowing(*shadowsResult)) {
             holder.set(obj);
             return true;
         }
@@ -5654,7 +5644,7 @@
     FallbackICSpew(cx, stub, "In");
 
     if (!objValue.isObject()) {
-        js_ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, objValue, NullPtr());
+        ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, objValue, NullPtr());
         return false;
     }
 
@@ -6529,7 +6519,7 @@
     }
 
     // If it's a shadowed listbase proxy property, attach stub to call Proxy::get instead.
-    if (isDOMProxy && domProxyShadowsResult == Shadows) {
+    if (isDOMProxy && DOMProxyIsShadowing(domProxyShadowsResult)) {
         MOZ_ASSERT(obj == holder);
 #if JS_HAS_NO_SUCH_METHOD
         if (isCallProp)
@@ -6833,8 +6823,13 @@
             return false;
 
         RootedId id(cx, NameToId(name));
-        if (!GetProperty(cx, obj, obj, id, res))
-            return false;
+        if (op == JSOP_GETXPROP) {
+            if (!GetPropertyForNameLookup(cx, obj, id, res))
+                return false;
+        } else {
+            if (!GetProperty(cx, obj, obj, id, res))
+                return false;
+        }
 
 #if JS_HAS_NO_SUCH_METHOD
         // Handle objects with __noSuchMethod__.
@@ -7109,23 +7104,23 @@
       case ICStub::GetProp_Native: {
         MOZ_ASSERT(obj_ == holder_);
         RootedShape shape(cx, obj_->lastProperty());
-        return ICGetProp_Native::New(space, getStubCode(), firstMonitorStub_, shape, offset_);
+        return ICStub::New<ICGetProp_Native>(space, getStubCode(), firstMonitorStub_, shape, offset_);
       }
 
       case ICStub::GetProp_NativePrototype: {
         MOZ_ASSERT(obj_ != holder_);
         RootedShape shape(cx, obj_->lastProperty());
         RootedShape holderShape(cx, holder_->lastProperty());
-        return ICGetProp_NativePrototype::New(space, getStubCode(), firstMonitorStub_, shape,
-                                              offset_, holder_, holderShape);
+        return ICStub::New<ICGetProp_NativePrototype>(space, getStubCode(), firstMonitorStub_, shape,
+                                                      offset_, holder_, holderShape);
       }
 
       case ICStub::GetProp_UnboxedPrototype: {
         MOZ_ASSERT(obj_ != holder_);
         RootedObjectGroup group(cx, obj_->group());
         RootedShape holderShape(cx, holder_->lastProperty());
-        return ICGetProp_UnboxedPrototype::New(space, getStubCode(), firstMonitorStub_, group,
-                                               offset_, holder_, holderShape);
+        return ICStub::New<ICGetProp_UnboxedPrototype>(space, getStubCode(), firstMonitorStub_, group,
+                                                       offset_, holder_, holderShape);
       }
 
       default:
@@ -7568,17 +7563,16 @@
     masm.loadPtr(Address(BaselineStubReg, ICGetProp_CallDOMProxyNative::offsetOfShape()), scratch);
     masm.branchTestObjShape(Assembler::NotEqual, objReg, scratch, &failure);
 
-    // Guard for ListObject.
+    // Guard that our expando object hasn't started shadowing this property.
     {
         GeneralRegisterSet domProxyRegSet(GeneralRegisterSet::All());
         domProxyRegSet.take(BaselineStubReg);
         domProxyRegSet.take(objReg);
         domProxyRegSet.take(scratch);
         Address expandoShapeAddr(BaselineStubReg, ICGetProp_CallDOMProxyNative::offsetOfExpandoShape());
-        GenerateDOMProxyChecks(
+        CheckDOMProxyExpandoDoesNotShadow(
                 cx, masm, objReg,
-                Address(BaselineStubReg, ICGetProp_CallDOMProxyNative::offsetOfProxyHandler()),
-                &expandoShapeAddr, expandoAndGenerationAddr, generationAddr,
+                expandoShapeAddr, expandoAndGenerationAddr, generationAddr,
                 scratch,
                 domProxyRegSet,
                 &failure);
@@ -7659,13 +7653,13 @@
         expandoShape = expandoVal.toObject().lastProperty();
 
     if (kind == ICStub::GetProp_CallDOMProxyNative) {
-        return ICGetProp_CallDOMProxyNative::New(
-            space, getStubCode(), firstMonitorStub_, shape, proxy_->handler(),
+        return ICStub::New<ICGetProp_CallDOMProxyNative>(
+            space, getStubCode(), firstMonitorStub_, shape,
             expandoShape, holder_, holderShape, getter_, pcOffset_);
     }
 
-    return ICGetProp_CallDOMProxyWithGenerationNative::New(
-        space, getStubCode(), firstMonitorStub_, shape, proxy_->handler(),
+    return ICStub::New<ICGetProp_CallDOMProxyWithGenerationNative>(
+        space, getStubCode(), firstMonitorStub_, shape,
         expandoAndGeneration, generation, expandoShape, holder_, holderShape, getter_,
         pcOffset_);
 }
@@ -7674,7 +7668,7 @@
 ICGetProp_DOMProxyShadowed::Compiler::getStub(ICStubSpace *space)
 {
     RootedShape shape(cx, proxy_->lastProperty());
-    return ICGetProp_DOMProxyShadowed::New(space, getStubCode(), firstMonitorStub_, shape,
+    return New<ICGetProp_DOMProxyShadowed>(space, getStubCode(), firstMonitorStub_, shape,
                                            proxy_->handler(), name_, pcOffset_);
 }
 
@@ -7710,22 +7704,8 @@
     masm.loadPtr(Address(BaselineStubReg, ICGetProp_DOMProxyShadowed::offsetOfShape()), scratch);
     masm.branchTestObjShape(Assembler::NotEqual, objReg, scratch, &failure);
 
-    // Guard for ListObject.
-    {
-        GeneralRegisterSet domProxyRegSet(GeneralRegisterSet::All());
-        domProxyRegSet.take(BaselineStubReg);
-        domProxyRegSet.take(objReg);
-        domProxyRegSet.take(scratch);
-        GenerateDOMProxyChecks(
-                cx, masm, objReg,
-                Address(BaselineStubReg, ICGetProp_DOMProxyShadowed::offsetOfProxyHandler()),
-                /*expandoShapeAddr=*/nullptr,
-                /*expandoAndGenerationAddr=*/nullptr,
-                /*generationAddr=*/nullptr,
-                scratch,
-                domProxyRegSet,
-                &failure);
-    }
+    // No need to do any more guards; it's safe to call ProxyGet even
+    // if we've since stopped shadowing.
 
     // Call ProxyGet(JSContext *cx, HandleObject proxy, HandlePropertyName name, MutableHandleValue vp);
 
@@ -7839,10 +7819,10 @@
 }
 
 /* static */ ICGetProp_Generic *
-ICGetProp_Generic::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_Generic::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                          ICGetProp_Generic &other)
 {
-    return New(space, other.jitCode(), firstMonitorStub);
+    return New<ICGetProp_Generic>(space, other.jitCode(), firstMonitorStub);
 }
 
 static bool
@@ -8266,6 +8246,8 @@
                op == JSOP_SETGNAME ||
                op == JSOP_STRICTSETGNAME ||
                op == JSOP_INITPROP ||
+               op == JSOP_INITLOCKEDPROP ||
+               op == JSOP_INITHIDDENPROP ||
                op == JSOP_SETALIASEDVAR ||
                op == JSOP_INITALIASEDLEXICAL);
 
@@ -8299,10 +8281,14 @@
         return false;
     }
 
-    if (op == JSOP_INITPROP) {
-        MOZ_ASSERT(obj->is<PlainObject>());
-        if (!NativeDefineProperty(cx, obj.as<PlainObject>(), id, rhs,
-                                  nullptr, nullptr, JSPROP_ENUMERATE))
+    if (op == JSOP_INITPROP ||
+        op == JSOP_INITLOCKEDPROP ||
+        op == JSOP_INITHIDDENPROP)
+    {
+        MOZ_ASSERT(obj->is<JSFunction>() || obj->is<PlainObject>());
+        unsigned propAttrs = GetInitDataPropAttrs(op);
+        if (!NativeDefineProperty(cx, obj.as<NativeObject>(), id, rhs,
+                                  nullptr, nullptr, propAttrs))
         {
             return false;
         }
@@ -9107,7 +9093,7 @@
     // Check for natives to which template objects can be attached. This is
     // done to provide templates to Ion for inlining these natives later on.
 
-    if (native == js_Array) {
+    if (native == ArrayConstructor) {
         // Note: the template array won't be used if its length is inaccurately
         // computed here.  (We allocate here because compilation may occur on a
         // separate thread where allocation is impossible.)
@@ -9164,20 +9150,16 @@
         return true;
     }
 
-    if (native == js_String) {
+    if (native == StringConstructor) {
         RootedString emptyString(cx, cx->runtime()->emptyString);
         res.set(StringObject::create(cx, emptyString, TenuredObject));
-        if (!res)
-            return false;
-        return true;
+        return !!res;
     }
 
     if (native == obj_create && args.length() == 1 && args[0].isObjectOrNull()) {
         RootedObject proto(cx, args[0].toObjectOrNull());
         res.set(ObjectCreateImpl(cx, proto, TenuredObject));
-        if (!res)
-            return false;
-        return true;
+        return !!res;
     }
 
     if (JitSupportsSimd()) {
@@ -9186,13 +9168,22 @@
            ARITH_COMMONX4_SIMD_OP(ADD_INT32X4_SIMD_OP_NAME_)
            BITWISE_COMMONX4_SIMD_OP(ADD_INT32X4_SIMD_OP_NAME_))
        {
-            Rooted<TypeDescr *> descr(cx, &Int32x4::GetTypeDescr(*cx->global()));
-            res.set(TypedObject::createZeroed(cx, descr, 0, gc::TenuredHeap));
-            if (!res)
-                return false;
-            return true;
+            Rooted<SimdTypeDescr *> descr(cx, &cx->global()->int32x4TypeDescr().as<SimdTypeDescr>());
+            res.set(cx->compartment()->jitCompartment()->getSimdTemplateObjectFor(cx, descr));
+            return !!res;
        }
 #undef ADD_INT32X4_SIMD_OP_NAME_
+#define ADD_FLOAT32X4_SIMD_OP_NAME_(OP) || native == js::simd_float32x4_##OP
+       if (false
+           ARITH_COMMONX4_SIMD_OP(ADD_FLOAT32X4_SIMD_OP_NAME_)
+           ARITH_FLOAT32X4_SIMD_OP(ADD_FLOAT32X4_SIMD_OP_NAME_)
+           BITWISE_COMMONX4_SIMD_OP(ADD_FLOAT32X4_SIMD_OP_NAME_))
+       {
+            Rooted<SimdTypeDescr *> descr(cx, &cx->global()->float32x4TypeDescr().as<SimdTypeDescr>());
+            res.set(cx->compartment()->jitCompartment()->getSimdTemplateObjectFor(cx, descr));
+            return !!res;
+       }
+#undef ADD_FLOAT32X4_SIMD_OP_NAME_
     }
 
     return true;
@@ -9204,20 +9195,14 @@
 {
     if (hook == TypedObject::construct) {
         Rooted<TypeDescr *> descr(cx, &args.callee().as<TypeDescr>());
-        JSObject *obj = TypedObject::createZeroed(cx, descr, 1, gc::TenuredHeap);
-        if (!obj)
-            return false;
-        templateObject.set(obj);
-        return true;
+        templateObject.set(TypedObject::createZeroed(cx, descr, 1, gc::TenuredHeap));
+        return !!templateObject;
     }
 
     if (hook == SimdTypeDescr::call && JitSupportsSimd()) {
         Rooted<SimdTypeDescr *> descr(cx, &args.callee().as<SimdTypeDescr>());
-        JSObject *obj = TypedObject::createZeroed(cx, descr, 0, gc::TenuredHeap);
-        if (!obj)
-            return false;
-        templateObject.set(obj);
-        return true;
+        templateObject.set(cx->compartment()->jitCompartment()->getSimdTemplateObjectFor(cx, descr));
+        return !!templateObject;
     }
 
     return true;
@@ -9413,7 +9398,7 @@
 
         // Check for JSOP_FUNAPPLY
         if (op == JSOP_FUNAPPLY) {
-            if (fun->native() == js_fun_apply)
+            if (fun->native() == fun_apply)
                 return TryAttachFunApplyStub(cx, stub, script, pc, thisv, argc, vp + 2, handled);
 
             // Don't try to attach a "regular" optimized call stubs for FUNAPPLY ops,
@@ -9421,7 +9406,7 @@
             return true;
         }
 
-        if (op == JSOP_FUNCALL && fun->native() == js_fun_call) {
+        if (op == JSOP_FUNCALL && fun->native() == fun_call) {
             if (!TryAttachFunCallStub(cx, stub, script, pc, thisv, handled))
                 return false;
             if (*handled)
@@ -9833,7 +9818,7 @@
     // Stack now confirmed to be like:
     //      [..., CalleeV, ThisV, Arg0V, MagicValue(Arguments), <MaybeReturnAddr>]
 
-    // Load the callee, ensure that it's js_fun_apply
+    // Load the callee, ensure that it's fun_apply
     ValueOperand val = regs.takeAnyValue();
     Address calleeSlot(BaselineStackReg, ICStackValueOffset + (3 * sizeof(Value)));
     masm.loadValue(calleeSlot, val);
@@ -9845,7 +9830,7 @@
                             failure);
     masm.loadPtr(Address(callee, JSFunction::offsetOfNativeOrScript()), callee);
 
-    masm.branchPtr(Assembler::NotEqual, callee, ImmPtr(js_fun_apply), failure);
+    masm.branchPtr(Assembler::NotEqual, callee, ImmPtr(fun_apply), failure);
 
     // Load the |thisv|, ensure that it's a scripted function with a valid baseline or ion
     // script, or a native function.
@@ -10673,7 +10658,7 @@
     // Stack now looks like:
     //                                      BaselineFrameReg -------------------.
     //                                                                          v
-    //      [..., js_fun_apply, TargetV, TargetThisV, ArgsArrayV, StubFrameHeader]
+    //      [..., fun_apply, TargetV, TargetThisV, ArgsArrayV, StubFrameHeader]
 
     // Push all array elements onto the stack:
     Address arrayVal(BaselineFrameReg, STUB_FRAME_SIZE);
@@ -10682,7 +10667,7 @@
     // Stack now looks like:
     //                                      BaselineFrameReg -------------------.
     //                                                                          v
-    //      [..., js_fun_apply, TargetV, TargetThisV, ArgsArrayV, StubFrameHeader,
+    //      [..., fun_apply, TargetV, TargetThisV, ArgsArrayV, StubFrameHeader,
     //       PushedArgN, ..., PushedArg0]
     // Can't fail after this, so it's ok to clobber argcReg.
 
@@ -10773,7 +10758,7 @@
     //
 
     // Stack now looks like:
-    //      [..., js_fun_apply, TargetV, TargetThisV, MagicArgsV, StubFrameHeader]
+    //      [..., fun_apply, TargetV, TargetThisV, MagicArgsV, StubFrameHeader]
 
     // Push all arguments supplied to caller function onto the stack.
     pushCallerArguments(masm, regs);
@@ -10781,7 +10766,7 @@
     // Stack now looks like:
     //                                      BaselineFrameReg -------------------.
     //                                                                          v
-    //      [..., js_fun_apply, TargetV, TargetThisV, MagicArgsV, StubFrameHeader,
+    //      [..., fun_apply, TargetV, TargetThisV, MagicArgsV, StubFrameHeader,
     //       PushedArgN, ..., PushedArg0]
     // Can't fail after this, so it's ok to clobber argcReg.
 
@@ -10854,14 +10839,14 @@
     masm.loadValue(calleeSlot, R1);
     regs.take(R1);
 
-    // Ensure callee is js_fun_call.
+    // Ensure callee is fun_call.
     masm.branchTestObject(Assembler::NotEqual, R1, &failure);
 
     Register callee = masm.extractObject(R1, ExtractTemp0);
     masm.branchTestObjClass(Assembler::NotEqual, callee, regs.getAny(), &JSFunction::class_,
                             &failure);
     masm.loadPtr(Address(callee, JSFunction::offsetOfNativeOrScript()), callee);
-    masm.branchPtr(Assembler::NotEqual, callee, ImmPtr(js_fun_call), &failure);
+    masm.branchPtr(Assembler::NotEqual, callee, ImmPtr(fun_call), &failure);
 
     // Ensure |this| is a scripted function with JIT code.
     BaseIndex thisSlot(BaselineStackReg, argcReg, TimesEight, ICStackValueOffset);
@@ -11059,7 +11044,7 @@
         pc += JUMP_OFFSET_LEN;
     }
 
-    return ICTableSwitch::New(space, code, table, low, length, defaultpc);
+    return ICStub::New<ICTableSwitch>(space, code, table, low, length, defaultpc);
 }
 
 void
@@ -11280,7 +11265,7 @@
     FallbackICSpew(cx, stub, "InstanceOf");
 
     if (!rhs.isObject()) {
-        js_ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rhs, NullPtr());
+        ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rhs, NullPtr());
         return false;
     }
 
@@ -11599,29 +11584,29 @@
     return true;
 }
 
-ICTypeMonitor_SingleObject::ICTypeMonitor_SingleObject(JitCode *stubCode, HandleObject obj)
+ICTypeMonitor_SingleObject::ICTypeMonitor_SingleObject(JitCode *stubCode, JSObject *obj)
   : ICStub(TypeMonitor_SingleObject, stubCode),
     obj_(obj)
 { }
 
-ICTypeMonitor_ObjectGroup::ICTypeMonitor_ObjectGroup(JitCode *stubCode, HandleObjectGroup group)
+ICTypeMonitor_ObjectGroup::ICTypeMonitor_ObjectGroup(JitCode *stubCode, ObjectGroup *group)
   : ICStub(TypeMonitor_ObjectGroup, stubCode),
     group_(group)
 { }
 
-ICTypeUpdate_SingleObject::ICTypeUpdate_SingleObject(JitCode *stubCode, HandleObject obj)
+ICTypeUpdate_SingleObject::ICTypeUpdate_SingleObject(JitCode *stubCode, JSObject *obj)
   : ICStub(TypeUpdate_SingleObject, stubCode),
     obj_(obj)
 { }
 
-ICTypeUpdate_ObjectGroup::ICTypeUpdate_ObjectGroup(JitCode *stubCode, HandleObjectGroup group)
+ICTypeUpdate_ObjectGroup::ICTypeUpdate_ObjectGroup(JitCode *stubCode, ObjectGroup *group)
   : ICStub(TypeUpdate_ObjectGroup, stubCode),
     group_(group)
 { }
 
 ICGetElemNativeStub::ICGetElemNativeStub(ICStub::Kind kind, JitCode *stubCode,
                                          ICStub *firstMonitorStub,
-                                         HandleShape shape, HandlePropertyName name,
+                                         Shape *shape, PropertyName *name,
                                          AccessType acctype, bool needsAtomize)
   : ICMonitoredStub(kind, stubCode, firstMonitorStub),
     shape_(shape),
@@ -11636,8 +11621,8 @@
 
 ICGetElemNativeGetterStub::ICGetElemNativeGetterStub(
                         ICStub::Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                        HandleShape shape, HandlePropertyName name, AccessType acctype,
-                        bool needsAtomize, HandleFunction getter, uint32_t pcOffset)
+                        Shape *shape, PropertyName *name, AccessType acctype,
+                        bool needsAtomize, JSFunction *getter, uint32_t pcOffset)
   : ICGetElemNativeStub(kind, stubCode, firstMonitorStub, shape, name, acctype, needsAtomize),
     getter_(getter),
     pcOffset_(pcOffset)
@@ -11649,9 +11634,9 @@
 
 ICGetElem_NativePrototypeSlot::ICGetElem_NativePrototypeSlot(
                             JitCode *stubCode, ICStub *firstMonitorStub,
-                            HandleShape shape, HandlePropertyName name,
+                            Shape *shape, PropertyName *name,
                             AccessType acctype, bool needsAtomize, uint32_t offset,
-                            HandleObject holder, HandleShape holderShape)
+                            JSObject *holder, Shape *holderShape)
   : ICGetElemNativeSlotStub(ICStub::GetElem_NativePrototypeSlot, stubCode, firstMonitorStub, shape,
                             name, acctype, needsAtomize, offset),
     holder_(holder),
@@ -11660,9 +11645,9 @@
 
 ICGetElemNativePrototypeCallStub::ICGetElemNativePrototypeCallStub(
                                 ICStub::Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                                HandleShape shape, HandlePropertyName name,
-                                AccessType acctype, bool needsAtomize, HandleFunction getter,
-                                uint32_t pcOffset, HandleObject holder, HandleShape holderShape)
+                                Shape *shape, PropertyName *name,
+                                AccessType acctype, bool needsAtomize, JSFunction *getter,
+                                uint32_t pcOffset, JSObject *holder, Shape *holderShape)
   : ICGetElemNativeGetterStub(kind, stubCode, firstMonitorStub, shape, name, acctype, needsAtomize,
                               getter, pcOffset),
     holder_(holder),
@@ -11670,47 +11655,40 @@
 {}
 
 /* static */ ICGetElem_NativePrototypeCallNative *
-ICGetElem_NativePrototypeCallNative::Clone(JSContext *cx, ICStubSpace *space,
+ICGetElem_NativePrototypeCallNative::Clone(ICStubSpace *space,
                                            ICStub *firstMonitorStub,
                                            ICGetElem_NativePrototypeCallNative &other)
 {
-    RootedShape shape(cx, other.shape());
-    RootedPropertyName name(cx, other.name());
-    RootedFunction getter(cx, other.getter());
-    RootedObject holder(cx, other.holder());
-    RootedShape holderShape(cx, other.holderShape());
-    return New(space, other.jitCode(), firstMonitorStub, shape, name, other.accessType(),
-               other.needsAtomize(), getter, other.pcOffset_, holder, holderShape);
+    return New<ICGetElem_NativePrototypeCallNative>(space, other.jitCode(), firstMonitorStub,
+                                                    other.shape(), other.name(), other.accessType(),
+                                                    other.needsAtomize(), other.getter(), other.pcOffset_,
+                                                    other.holder(), other.holderShape());
 }
 
 /* static */ ICGetElem_NativePrototypeCallScripted *
-ICGetElem_NativePrototypeCallScripted::Clone(JSContext *cx, ICStubSpace *space,
+ICGetElem_NativePrototypeCallScripted::Clone(ICStubSpace *space,
                                              ICStub *firstMonitorStub,
                                              ICGetElem_NativePrototypeCallScripted &other)
 {
-    RootedShape shape(cx, other.shape());
-    RootedPropertyName name(cx, other.name());
-    RootedFunction getter(cx, other.getter());
-    RootedObject holder(cx, other.holder());
-    RootedShape holderShape(cx, other.holderShape());
-    return New(space, other.jitCode(), firstMonitorStub, shape, name, other.accessType(),
-               other.needsAtomize(), getter, other.pcOffset_, holder, holderShape);
+    return New<ICGetElem_NativePrototypeCallScripted>(space, other.jitCode(), firstMonitorStub,
+                                                      other.shape(), other.name(),
+                                                      other.accessType(), other.needsAtomize(), other.getter(),
+                                                      other.pcOffset_, other.holder(), other.holderShape());
 }
 
-ICGetElem_Dense::ICGetElem_Dense(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape)
+ICGetElem_Dense::ICGetElem_Dense(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape)
     : ICMonitoredStub(GetElem_Dense, stubCode, firstMonitorStub),
       shape_(shape)
 { }
 
 /* static */ ICGetElem_Dense *
-ICGetElem_Dense::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetElem_Dense::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                        ICGetElem_Dense &other)
 {
-    RootedShape shape(cx, other.shape_);
-    return New(space, other.jitCode(), firstMonitorStub, shape);
+    return New<ICGetElem_Dense>(space, other.jitCode(), firstMonitorStub, other.shape_);
 }
 
-ICGetElem_TypedArray::ICGetElem_TypedArray(JitCode *stubCode, HandleShape shape, Scalar::Type type)
+ICGetElem_TypedArray::ICGetElem_TypedArray(JitCode *stubCode, Shape *shape, Scalar::Type type)
   : ICStub(GetElem_TypedArray, stubCode),
     shape_(shape)
 {
@@ -11719,13 +11697,13 @@
 }
 
 /* static */ ICGetElem_Arguments *
-ICGetElem_Arguments::Clone(JSContext *, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetElem_Arguments::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                            ICGetElem_Arguments &other)
 {
-    return New(space, other.jitCode(), firstMonitorStub, other.which());
+    return New<ICGetElem_Arguments>(space, other.jitCode(), firstMonitorStub, other.which());
 }
 
-ICSetElem_Dense::ICSetElem_Dense(JitCode *stubCode, HandleShape shape, HandleObjectGroup group)
+ICSetElem_Dense::ICSetElem_Dense(JitCode *stubCode, Shape *shape, ObjectGroup *group)
   : ICUpdatedStub(SetElem_Dense, stubCode),
     shape_(shape),
     group_(group)
@@ -11748,10 +11726,10 @@
     if (!group)
         return nullptr;
     Rooted<JitCode *> stubCode(cx, getStubCode());
-    return ICSetElem_DenseAddImpl<ProtoChainDepth>::New(space, stubCode, group, shapes);
+    return ICStub::New<ICSetElem_DenseAddImpl<ProtoChainDepth>>(space, stubCode, group, shapes);
 }
 
-ICSetElem_TypedArray::ICSetElem_TypedArray(JitCode *stubCode, HandleShape shape, Scalar::Type type,
+ICSetElem_TypedArray::ICSetElem_TypedArray(JitCode *stubCode, Shape *shape, Scalar::Type type,
                                            bool expectOutOfBounds)
   : ICStub(SetElem_TypedArray, stubCode),
     shape_(shape)
@@ -11761,7 +11739,7 @@
     extra_ |= (static_cast<uint16_t>(expectOutOfBounds) << 8);
 }
 
-ICGetName_Global::ICGetName_Global(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape,
+ICGetName_Global::ICGetName_Global(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape,
                                    uint32_t slot)
   : ICMonitoredStub(GetName_Global, stubCode, firstMonitorStub),
     shape_(shape),
@@ -11780,7 +11758,7 @@
         shapes_[i].init((*shapes)[i]);
 }
 
-ICGetIntrinsic_Constant::ICGetIntrinsic_Constant(JitCode *stubCode, HandleValue value)
+ICGetIntrinsic_Constant::ICGetIntrinsic_Constant(JitCode *stubCode, const Value &value)
   : ICStub(GetIntrinsic_Constant, stubCode),
     value_(value)
 { }
@@ -11789,7 +11767,7 @@
 { }
 
 ICGetProp_Primitive::ICGetProp_Primitive(JitCode *stubCode, ICStub *firstMonitorStub,
-                                         HandleShape protoShape, uint32_t offset)
+                                         Shape *protoShape, uint32_t offset)
   : ICMonitoredStub(GetProp_Primitive, stubCode, firstMonitorStub),
     protoShape_(protoShape),
     offset_(offset)
@@ -11802,16 +11780,16 @@
 { }
 
 /* static */ ICGetProp_Native *
-ICGetProp_Native::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_Native::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                         ICGetProp_Native &other)
 {
-    RootedShape shape(cx, other.shape());
-    return New(space, other.jitCode(), firstMonitorStub, shape, other.offset());
+    return New<ICGetProp_Native>(space, other.jitCode(), firstMonitorStub, other.shape(),
+                                 other.offset());
 }
 
 ICGetProp_NativePrototype::ICGetProp_NativePrototype(JitCode *stubCode, ICStub *firstMonitorStub,
-                                                     HandleShape shape, uint32_t offset,
-                                                     HandleObject holder, HandleShape holderShape)
+                                                     Shape *shape, uint32_t offset,
+                                                     JSObject *holder, Shape *holderShape)
   : ICGetPropNativeStub(GetProp_NativePrototype, stubCode, firstMonitorStub, offset),
     shape_(shape),
     holder_(holder),
@@ -11819,19 +11797,16 @@
 { }
 
 /* static */ ICGetProp_NativePrototype *
-ICGetProp_NativePrototype::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_NativePrototype::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                  ICGetProp_NativePrototype &other)
 {
-    RootedShape shape(cx, other.shape());
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    return New(space, other.jitCode(), firstMonitorStub, shape, other.offset(),
-               holder, holderShape);
+    return New<ICGetProp_NativePrototype>(space, other.jitCode(), firstMonitorStub, other.shape(),
+                                          other.offset(), other.holder_, other.holderShape_);
 }
 
 ICGetProp_UnboxedPrototype::ICGetProp_UnboxedPrototype(JitCode *stubCode, ICStub *firstMonitorStub,
-                                                       HandleObjectGroup group, uint32_t offset,
-                                                       HandleObject holder, HandleShape holderShape)
+                                                       ObjectGroup *group, uint32_t offset,
+                                                       JSObject *holder, Shape *holderShape)
   : ICGetPropNativeStub(GetProp_UnboxedPrototype, stubCode, firstMonitorStub, offset),
     group_(group),
     holder_(holder),
@@ -11839,14 +11814,11 @@
 { }
 
 /* static */ ICGetProp_UnboxedPrototype *
-ICGetProp_UnboxedPrototype::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_UnboxedPrototype::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                   ICGetProp_UnboxedPrototype &other)
 {
-    RootedObjectGroup group(cx, other.group());
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    return New(space, other.jitCode(), firstMonitorStub, group, other.offset(),
-               holder, holderShape);
+    return New<ICGetProp_UnboxedPrototype>(space, other.jitCode(), firstMonitorStub, other.group(),
+                                           other.offset(), other.holder_, other.holderShape_);
 }
 
 ICGetProp_NativeDoesNotExist::ICGetProp_NativeDoesNotExist(
@@ -11887,7 +11859,7 @@
 }
 
 ICGetPropCallGetter::ICGetPropCallGetter(Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                                         HandleObject holder, HandleShape holderShape, HandleFunction getter,
+                                         JSObject *holder, Shape *holderShape, JSFunction *getter,
                                          uint32_t pcOffset)
   : ICMonitoredStub(kind, stubCode, firstMonitorStub),
     holder_(holder),
@@ -11904,9 +11876,9 @@
 
 ICGetPropCallPrototypeGetter::ICGetPropCallPrototypeGetter(Kind kind, JitCode *stubCode,
                                                            ICStub *firstMonitorStub,
-                                                           HandleShape receiverShape, HandleObject holder,
-                                                           HandleShape holderShape,
-                                                           HandleFunction getter, uint32_t pcOffset)
+                                                           Shape *receiverShape, JSObject *holder,
+                                                           Shape *holderShape,
+                                                           JSFunction *getter, uint32_t pcOffset)
   : ICGetPropCallGetter(kind, stubCode, firstMonitorStub, holder, holderShape, getter, pcOffset),
     receiverShape_(receiverShape)
 {
@@ -11922,41 +11894,32 @@
 { }
 
 /* static */ ICGetProp_CallScripted *
-ICGetProp_CallScripted::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_CallScripted::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                               ICGetProp_CallScripted &other)
 {
-    RootedShape receiverShape(cx, other.receiverShape_);
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    RootedFunction getter(cx, other.getter_);
-    return New(space, other.jitCode(), firstMonitorStub, receiverShape, holder,
-               holderShape, getter, other.pcOffset_);
+    return New<ICGetProp_CallScripted>(space, other.jitCode(), firstMonitorStub,
+                                       other.receiverShape_, other.holder_, other.holderShape_,
+                                       other.getter_, other.pcOffset_);
 }
 
 /* static */ ICGetProp_CallNative *
-ICGetProp_CallNative::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_CallNative::Clone( ICStubSpace *space, ICStub *firstMonitorStub,
                             ICGetProp_CallNative &other)
 {
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    RootedFunction getter(cx, other.getter_);
-    return New(space, other.jitCode(), firstMonitorStub, holder, holderShape, getter,
-               other.pcOffset_);
+    return New<ICGetProp_CallNative>(space, other.jitCode(), firstMonitorStub, other.holder_,
+                                     other.holderShape_, other.getter_, other.pcOffset_);
 }
 
 /* static */ ICGetProp_CallNativePrototype *
-ICGetProp_CallNativePrototype::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_CallNativePrototype::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                      ICGetProp_CallNativePrototype &other)
 {
-    RootedShape receiverShape(cx, other.receiverShape_);
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    RootedFunction getter(cx, other.getter_);
-    return New(space, other.jitCode(), firstMonitorStub, receiverShape, holder,
-               holderShape, getter, other.pcOffset_);
+    return New<ICGetProp_CallNativePrototype>(space, other.jitCode(), firstMonitorStub,
+                                              other.receiverShape_, other.holder_,
+                                              other.holderShape_, other.getter_, other.pcOffset_);
 }
 
-ICSetProp_Native::ICSetProp_Native(JitCode *stubCode, HandleObjectGroup group, HandleShape shape,
+ICSetProp_Native::ICSetProp_Native(JitCode *stubCode, ObjectGroup *group, Shape *shape,
                                    uint32_t offset)
   : ICUpdatedStub(SetProp_Native, stubCode),
     group_(group),
@@ -11972,16 +11935,16 @@
         return nullptr;
 
     RootedShape shape(cx, obj_->lastProperty());
-    ICSetProp_Native *stub = ICSetProp_Native::New(space, getStubCode(), group, shape, offset_);
+    ICSetProp_Native *stub = ICStub::New<ICSetProp_Native>(space, getStubCode(), group, shape, offset_);
     if (!stub || !stub->initUpdatingChain(cx, space))
         return nullptr;
     return stub;
 }
 
-ICSetProp_NativeAdd::ICSetProp_NativeAdd(JitCode *stubCode, HandleObjectGroup group,
+ICSetProp_NativeAdd::ICSetProp_NativeAdd(JitCode *stubCode, ObjectGroup *group,
                                          size_t protoChainDepth,
-                                         HandleShape newShape,
-                                         HandleObjectGroup newGroup,
+                                         Shape *newShape,
+                                         ObjectGroup *newGroup,
                                          uint32_t offset)
   : ICUpdatedStub(SetProp_NativeAdd, stubCode),
     group_(group),
@@ -11995,10 +11958,10 @@
 
 template <size_t ProtoChainDepth>
 ICSetProp_NativeAddImpl<ProtoChainDepth>::ICSetProp_NativeAddImpl(JitCode *stubCode,
-                                                                  HandleObjectGroup group,
+                                                                  ObjectGroup *group,
                                                                   const AutoShapeVector *shapes,
-                                                                  HandleShape newShape,
-                                                                  HandleObjectGroup newGroup,
+                                                                  Shape *newShape,
+                                                                  ObjectGroup *newGroup,
                                                                   uint32_t offset)
   : ICSetProp_NativeAdd(stubCode, group, ProtoChainDepth, newShape, newGroup, offset)
 {
@@ -12024,9 +11987,9 @@
     MOZ_ASSERT(protoChainDepth_ <= ICSetProp_NativeAdd::MAX_PROTO_CHAIN_DEPTH);
 }
 
-ICSetPropCallSetter::ICSetPropCallSetter(Kind kind, JitCode *stubCode, HandleShape shape,
-                                         HandleObject holder, HandleShape holderShape,
-                                         HandleFunction setter, uint32_t pcOffset)
+ICSetPropCallSetter::ICSetPropCallSetter(Kind kind, JitCode *stubCode, Shape *shape,
+                                         JSObject *holder, Shape *holderShape,
+                                         JSFunction *setter, uint32_t pcOffset)
   : ICStub(kind, stubCode),
     shape_(shape),
     holder_(holder),
@@ -12038,29 +12001,21 @@
 }
 
 /* static */ ICSetProp_CallScripted *
-ICSetProp_CallScripted::Clone(JSContext *cx, ICStubSpace *space, ICStub *,
-                              ICSetProp_CallScripted &other)
+ICSetProp_CallScripted::Clone(ICStubSpace *space, ICStub *, ICSetProp_CallScripted &other)
 {
-    RootedShape shape(cx, other.shape_);
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    RootedFunction setter(cx, other.setter_);
-    return New(space, other.jitCode(), shape, holder, holderShape, setter, other.pcOffset_);
+    return New<ICSetProp_CallScripted>(space, other.jitCode(), other.shape_, other.holder_,
+                                       other.holderShape_, other.setter_, other.pcOffset_);
 }
 
 /* static */ ICSetProp_CallNative *
-ICSetProp_CallNative::Clone(JSContext *cx, ICStubSpace *space, ICStub *,
-                            ICSetProp_CallNative &other)
+ICSetProp_CallNative::Clone(ICStubSpace *space, ICStub *, ICSetProp_CallNative &other)
 {
-    RootedShape shape(cx, other.shape_);
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    RootedFunction setter(cx, other.setter_);
-    return New(space, other.jitCode(), shape, holder, holderShape, setter, other.pcOffset_);
+    return New<ICSetProp_CallNative>(space, other.jitCode(), other.shape_, other.holder_,
+                                     other.holderShape_, other.setter_, other.pcOffset_);
 }
 
 ICCall_Scripted::ICCall_Scripted(JitCode *stubCode, ICStub *firstMonitorStub,
-                                 HandleFunction callee, HandleObject templateObject,
+                                 JSFunction *callee, JSObject *templateObject,
                                  uint32_t pcOffset)
   : ICMonitoredStub(ICStub::Call_Scripted, stubCode, firstMonitorStub),
     callee_(callee),
@@ -12069,24 +12024,20 @@
 { }
 
 /* static */ ICCall_Scripted *
-ICCall_Scripted::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
-                       ICCall_Scripted &other)
+ICCall_Scripted::Clone(ICStubSpace *space, ICStub *firstMonitorStub, ICCall_Scripted &other)
 {
-    RootedFunction callee(cx, other.callee_);
-    RootedObject templateObject(cx, other.templateObject_);
-    return New(space, other.jitCode(), firstMonitorStub, callee, templateObject,
-               other.pcOffset_);
+    return New<ICCall_Scripted>(space, other.jitCode(), firstMonitorStub, other.callee_,
+                                other.templateObject_, other.pcOffset_);
 }
 
 /* static */ ICCall_AnyScripted *
-ICCall_AnyScripted::Clone(JSContext *, ICStubSpace *space, ICStub *firstMonitorStub,
-                          ICCall_AnyScripted &other)
+ICCall_AnyScripted::Clone(ICStubSpace *space, ICStub *firstMonitorStub, ICCall_AnyScripted &other)
 {
-    return New(space, other.jitCode(), firstMonitorStub, other.pcOffset_);
+    return New<ICCall_AnyScripted>(space, other.jitCode(), firstMonitorStub, other.pcOffset_);
 }
 
 ICCall_Native::ICCall_Native(JitCode *stubCode, ICStub *firstMonitorStub,
-                             HandleFunction callee, HandleObject templateObject,
+                             JSFunction *callee, JSObject *templateObject,
                              uint32_t pcOffset)
   : ICMonitoredStub(ICStub::Call_Native, stubCode, firstMonitorStub),
     callee_(callee),
@@ -12103,18 +12054,15 @@
 }
 
 /* static */ ICCall_Native *
-ICCall_Native::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
-                     ICCall_Native &other)
+ICCall_Native::Clone(ICStubSpace *space, ICStub *firstMonitorStub, ICCall_Native &other)
 {
-    RootedFunction callee(cx, other.callee_);
-    RootedObject templateObject(cx, other.templateObject_);
-    return New(space, other.jitCode(), firstMonitorStub, callee, templateObject,
-               other.pcOffset_);
+    return New<ICCall_Native>(space, other.jitCode(), firstMonitorStub, other.callee_,
+                              other.templateObject_, other.pcOffset_);
 }
 
 ICCall_ClassHook::ICCall_ClassHook(JitCode *stubCode, ICStub *firstMonitorStub,
                                    const Class *clasp, Native native,
-                                   HandleObject templateObject, uint32_t pcOffset)
+                                   JSObject *templateObject, uint32_t pcOffset)
   : ICMonitoredStub(ICStub::Call_ClassHook, stubCode, firstMonitorStub),
     clasp_(clasp),
     native_(JS_FUNC_TO_DATA_PTR(void *, native)),
@@ -12130,52 +12078,51 @@
 }
 
 /* static */ ICCall_ClassHook *
-ICCall_ClassHook::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
-                        ICCall_ClassHook &other)
+ICCall_ClassHook::Clone(ICStubSpace *space, ICStub *firstMonitorStub, ICCall_ClassHook &other)
 {
-    RootedObject templateObject(cx, other.templateObject_);
-    ICCall_ClassHook *res = New(space, other.jitCode(), firstMonitorStub,
-                                other.clasp(), nullptr, templateObject, other.pcOffset_);
+    ICCall_ClassHook *res = New<ICCall_ClassHook>(space, other.jitCode(), firstMonitorStub,
+                                                  other.clasp(), nullptr, other.templateObject_,
+                                                  other.pcOffset_);
     if (res)
         res->native_ = other.native();
     return res;
 }
 
 /* static */ ICCall_ScriptedApplyArray *
-ICCall_ScriptedApplyArray::Clone(JSContext *, ICStubSpace *space, ICStub *firstMonitorStub,
+ICCall_ScriptedApplyArray::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                  ICCall_ScriptedApplyArray &other)
 {
-    return New(space, other.jitCode(), firstMonitorStub, other.pcOffset_);
+    return New<ICCall_ScriptedApplyArray>(space, other.jitCode(), firstMonitorStub,
+                                          other.pcOffset_);
 }
 
 /* static */ ICCall_ScriptedApplyArguments *
-ICCall_ScriptedApplyArguments::Clone(JSContext *, ICStubSpace *space,
+ICCall_ScriptedApplyArguments::Clone(ICStubSpace *space,
                                      ICStub *firstMonitorStub,
                                      ICCall_ScriptedApplyArguments &other)
 {
-    return New(space, other.jitCode(), firstMonitorStub, other.pcOffset_);
+    return New<ICCall_ScriptedApplyArguments>(space, other.jitCode(), firstMonitorStub,
+                                              other.pcOffset_);
 }
 
 /* static */ ICCall_ScriptedFunCall *
-ICCall_ScriptedFunCall::Clone(JSContext *, ICStubSpace *space, ICStub *firstMonitorStub,
+ICCall_ScriptedFunCall::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                               ICCall_ScriptedFunCall &other)
 {
-    return New(space, other.jitCode(), firstMonitorStub, other.pcOffset_);
+    return New<ICCall_ScriptedFunCall>(space, other.jitCode(), firstMonitorStub, other.pcOffset_);
 }
 
 ICGetPropCallDOMProxyNativeStub::ICGetPropCallDOMProxyNativeStub(Kind kind, JitCode *stubCode,
                                                                  ICStub *firstMonitorStub,
-                                                                 HandleShape shape,
-                                                                 const BaseProxyHandler *proxyHandler,
-                                                                 HandleShape expandoShape,
-                                                                 HandleObject holder,
-                                                                 HandleShape holderShape,
-                                                                 HandleFunction getter,
+                                                                 Shape *shape,
+                                                                 Shape *expandoShape,
+                                                                 JSObject *holder,
+                                                                 Shape *holderShape,
+                                                                 JSFunction *getter,
                                                                  uint32_t pcOffset)
 : ICGetPropCallGetter(kind, stubCode, firstMonitorStub, holder, holderShape,
                       getter, pcOffset),
     shape_(shape),
-    proxyHandler_(proxyHandler),
     expandoShape_(expandoShape)
 { }
 
@@ -12199,38 +12146,34 @@
 }
 
 /* static */ ICGetProp_CallDOMProxyNative *
-ICGetProp_CallDOMProxyNative::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_CallDOMProxyNative::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                     ICGetProp_CallDOMProxyNative &other)
 {
-    RootedShape shape(cx, other.shape_);
-    RootedShape expandoShape(cx, other.expandoShape_);
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    RootedFunction getter(cx, other.getter_);
-    return New(space, other.jitCode(), firstMonitorStub, shape, other.proxyHandler_,
-               expandoShape, holder, holderShape, getter, other.pcOffset_);
+    return New<ICGetProp_CallDOMProxyNative>(space, other.jitCode(), firstMonitorStub,
+                                             other.shape_, other.expandoShape_,
+                                             other.holder_, other.holderShape_, other.getter_,
+                                             other.pcOffset_);
 }
 
 /* static */ ICGetProp_CallDOMProxyWithGenerationNative *
-ICGetProp_CallDOMProxyWithGenerationNative::Clone(JSContext *cx, ICStubSpace *space,
+ICGetProp_CallDOMProxyWithGenerationNative::Clone(ICStubSpace *space,
                                                   ICStub *firstMonitorStub,
                                                   ICGetProp_CallDOMProxyWithGenerationNative &other)
 {
-    RootedShape shape(cx, other.shape_);
-    RootedShape expandoShape(cx, other.expandoShape_);
-    RootedObject holder(cx, other.holder_);
-    RootedShape holderShape(cx, other.holderShape_);
-    RootedFunction getter(cx, other.getter_);
-    return New(space, other.jitCode(), firstMonitorStub, shape, other.proxyHandler_,
-               other.expandoAndGeneration_, other.generation_,
-               expandoShape, holder, holderShape, getter, other.pcOffset_);
+    return New<ICGetProp_CallDOMProxyWithGenerationNative>(space, other.jitCode(), firstMonitorStub,
+                                                           other.shape_,
+                                                           other.expandoAndGeneration_,
+                                                           other.generation_,
+                                                           other.expandoShape_, other.holder_,
+                                                           other.holderShape_, other.getter_,
+                                                           other.pcOffset_);
 }
 
 ICGetProp_DOMProxyShadowed::ICGetProp_DOMProxyShadowed(JitCode *stubCode,
                                                        ICStub *firstMonitorStub,
-                                                       HandleShape shape,
+                                                       Shape *shape,
                                                        const BaseProxyHandler *proxyHandler,
-                                                       HandlePropertyName name,
+                                                       PropertyName *name,
                                                        uint32_t pcOffset)
   : ICMonitoredStub(ICStub::GetProp_DOMProxyShadowed, stubCode, firstMonitorStub),
     shape_(shape),
@@ -12240,13 +12183,11 @@
 { }
 
 /* static */ ICGetProp_DOMProxyShadowed *
-ICGetProp_DOMProxyShadowed::Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+ICGetProp_DOMProxyShadowed::Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                   ICGetProp_DOMProxyShadowed &other)
 {
-    RootedShape shape(cx, other.shape_);
-    RootedPropertyName name(cx, other.name_);
-    return New(space, other.jitCode(), firstMonitorStub, shape, other.proxyHandler_,
-               name, other.pcOffset_);
+    return New<ICGetProp_DOMProxyShadowed>(space, other.jitCode(), firstMonitorStub, other.shape_,
+                                           other.proxyHandler_, other.name_, other.pcOffset_);
 }
 
 //
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineIC.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineIC.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineIC.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineIC.h	2015-02-28 15:03:05.000000000 +0000
@@ -632,6 +632,13 @@
     void updateCode(JitCode *stubCode);
     void trace(JSTracer *trc);
 
+    template <typename T, typename... Args>
+    static T *New(ICStubSpace *space, JitCode *code, Args&&... args) {
+        if (!code)
+            return nullptr;
+        return space->allocate<T>(code, mozilla::Forward<Args>(args)...);
+    }
+
   protected:
     // The raw jitcode to call for this stub.
     uint8_t *stubCode_;
@@ -1202,12 +1209,6 @@
     { }
 
   public:
-    static inline ICWarmUpCounter_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICWarmUpCounter_Fallback>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -1219,7 +1220,7 @@
         { }
 
         ICWarmUpCounter_Fallback *getStub(ICStubSpace *space) {
-            return ICWarmUpCounter_Fallback::New(space, getStubCode());
+            return ICStub::New<ICWarmUpCounter_Fallback>(space, getStubCode());
         }
     };
 };
@@ -1380,15 +1381,6 @@
     }
 
   public:
-    static inline ICTypeMonitor_Fallback *New(
-        ICStubSpace *space, JitCode *code, ICMonitoredFallbackStub *mainFbStub,
-        uint32_t argumentIndex)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeMonitor_Fallback>(code, mainFbStub, argumentIndex);
-    }
-
     bool hasStub(ICStub::Kind kind) {
         ICStub *stub = firstMonitorStub_;
         do {
@@ -1475,8 +1467,8 @@
         { }
 
         ICTypeMonitor_Fallback *getStub(ICStubSpace *space) {
-            return ICTypeMonitor_Fallback::New(space, getStubCode(), mainFallbackStub_,
-                                               argumentIndex_);
+            return ICStub::New<ICTypeMonitor_Fallback>(space, getStubCode(), mainFallbackStub_,
+                                                       argumentIndex_);
         }
     };
 };
@@ -1490,14 +1482,6 @@
     {}
 
   public:
-    static inline ICTypeMonitor_PrimitiveSet *New(ICStubSpace *space, JitCode *code,
-                                                  uint16_t flags)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeMonitor_PrimitiveSet>(code, flags);
-    }
-
     class Compiler : public TypeCheckPrimitiveSetStub::Compiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -1517,7 +1501,7 @@
 
         ICTypeMonitor_PrimitiveSet *getStub(ICStubSpace *space) {
             MOZ_ASSERT(!existingStub_);
-            return ICTypeMonitor_PrimitiveSet::New(space, getStubCode(), flags_);
+            return ICStub::New<ICTypeMonitor_PrimitiveSet>(space, getStubCode(), flags_);
         }
     };
 };
@@ -1528,17 +1512,9 @@
 
     HeapPtrObject obj_;
 
-    ICTypeMonitor_SingleObject(JitCode *stubCode, HandleObject obj);
+    ICTypeMonitor_SingleObject(JitCode *stubCode, JSObject *obj);
 
   public:
-    static inline ICTypeMonitor_SingleObject *New(
-            ICStubSpace *space, JitCode *code, HandleObject obj)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeMonitor_SingleObject>(code, obj);
-    }
-
     HeapPtrObject &object() {
         return obj_;
     }
@@ -1559,7 +1535,7 @@
         { }
 
         ICTypeMonitor_SingleObject *getStub(ICStubSpace *space) {
-            return ICTypeMonitor_SingleObject::New(space, getStubCode(), obj_);
+            return ICStub::New<ICTypeMonitor_SingleObject>(space, getStubCode(), obj_);
         }
     };
 };
@@ -1570,17 +1546,9 @@
 
     HeapPtrObjectGroup group_;
 
-    ICTypeMonitor_ObjectGroup(JitCode *stubCode, HandleObjectGroup group);
+    ICTypeMonitor_ObjectGroup(JitCode *stubCode, ObjectGroup *group);
 
   public:
-    static inline ICTypeMonitor_ObjectGroup *New(
-            ICStubSpace *space, JitCode *code, HandleObjectGroup group)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeMonitor_ObjectGroup>(code, group);
-    }
-
     HeapPtrObjectGroup &group() {
         return group_;
     }
@@ -1601,7 +1569,7 @@
         { }
 
         ICTypeMonitor_ObjectGroup *getStub(ICStubSpace *space) {
-            return ICTypeMonitor_ObjectGroup::New(space, getStubCode(), group_);
+            return ICStub::New<ICTypeMonitor_ObjectGroup>(space, getStubCode(), group_);
         }
     };
 };
@@ -1621,12 +1589,6 @@
     {}
 
   public:
-    static inline ICTypeUpdate_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeUpdate_Fallback>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -1638,7 +1600,7 @@
         { }
 
         ICTypeUpdate_Fallback *getStub(ICStubSpace *space) {
-            return ICTypeUpdate_Fallback::New(space, getStubCode());
+            return ICStub::New<ICTypeUpdate_Fallback>(space, getStubCode());
         }
     };
 };
@@ -1652,14 +1614,6 @@
     {}
 
   public:
-    static inline ICTypeUpdate_PrimitiveSet *New(ICStubSpace *space, JitCode *code,
-                                                 uint16_t flags)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeUpdate_PrimitiveSet>(code, flags);
-    }
-
     class Compiler : public TypeCheckPrimitiveSetStub::Compiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -1679,7 +1633,7 @@
 
         ICTypeUpdate_PrimitiveSet *getStub(ICStubSpace *space) {
             MOZ_ASSERT(!existingStub_);
-            return ICTypeUpdate_PrimitiveSet::New(space, getStubCode(), flags_);
+            return ICStub::New<ICTypeUpdate_PrimitiveSet>(space, getStubCode(), flags_);
         }
     };
 };
@@ -1691,17 +1645,9 @@
 
     HeapPtrObject obj_;
 
-    ICTypeUpdate_SingleObject(JitCode *stubCode, HandleObject obj);
+    ICTypeUpdate_SingleObject(JitCode *stubCode, JSObject *obj);
 
   public:
-    static inline ICTypeUpdate_SingleObject *New(ICStubSpace *space, JitCode *code,
-                                                 HandleObject obj)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeUpdate_SingleObject>(code, obj);
-    }
-
     HeapPtrObject &object() {
         return obj_;
     }
@@ -1722,7 +1668,7 @@
         { }
 
         ICTypeUpdate_SingleObject *getStub(ICStubSpace *space) {
-            return ICTypeUpdate_SingleObject::New(space, getStubCode(), obj_);
+            return ICStub::New<ICTypeUpdate_SingleObject>(space, getStubCode(), obj_);
         }
     };
 };
@@ -1734,17 +1680,9 @@
 
     HeapPtrObjectGroup group_;
 
-    ICTypeUpdate_ObjectGroup(JitCode *stubCode, HandleObjectGroup group);
+    ICTypeUpdate_ObjectGroup(JitCode *stubCode, ObjectGroup *group);
 
   public:
-    static inline ICTypeUpdate_ObjectGroup *New(ICStubSpace *space, JitCode *code,
-                                                HandleObjectGroup group)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeUpdate_ObjectGroup>(code, group);
-    }
-
     HeapPtrObjectGroup &group() {
         return group_;
     }
@@ -1765,7 +1703,7 @@
         { }
 
         ICTypeUpdate_ObjectGroup *getStub(ICStubSpace *space) {
-            return ICTypeUpdate_ObjectGroup::New(space, getStubCode(), group_);
+            return ICStub::New<ICTypeUpdate_ObjectGroup>(space, getStubCode(), group_);
         }
     };
 };
@@ -1781,12 +1719,6 @@
       : ICFallbackStub(ICStub::This_Fallback, stubCode) {}
 
   public:
-    static inline ICThis_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICThis_Fallback>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -1797,7 +1729,7 @@
           : ICStubCompiler(cx, ICStub::This_Fallback) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICThis_Fallback::New(space, getStubCode());
+            return ICStub::New<ICThis_Fallback>(space, getStubCode());
         }
     };
 };
@@ -1813,13 +1745,6 @@
     {}
 
   public:
-    static inline ICNewArray_Fallback *New(ICStubSpace *space, JitCode *code,
-                                           ArrayObject *templateObject) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICNewArray_Fallback>(code, templateObject);
-    }
-
     class Compiler : public ICStubCompiler {
         RootedArrayObject templateObject;
         bool generateStubCode(MacroAssembler &masm);
@@ -1831,7 +1756,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICNewArray_Fallback::New(space, getStubCode(), templateObject);
+            return ICStub::New<ICNewArray_Fallback>(space, getStubCode(), templateObject);
         }
     };
 
@@ -1851,13 +1776,6 @@
     {}
 
   public:
-    static inline ICNewObject_Fallback *New(ICStubSpace *space, JitCode *code,
-                                            PlainObject *templateObject) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICNewObject_Fallback>(code, templateObject);
-    }
-
     class Compiler : public ICStubCompiler {
         RootedPlainObject templateObject;
         bool generateStubCode(MacroAssembler &masm);
@@ -1869,7 +1787,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICNewObject_Fallback::New(space, getStubCode(), templateObject);
+            return ICStub::New<ICNewObject_Fallback>(space, getStubCode(), templateObject);
         }
     };
 
@@ -1892,12 +1810,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICCompare_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_Fallback>(code);
-    }
-
     static const size_t UNOPTIMIZABLE_ACCESS_BIT = 0;
     void noteUnoptimizableAccess() {
         extra_ |= (1u << UNOPTIMIZABLE_ACCESS_BIT);
@@ -1916,7 +1828,7 @@
           : ICStubCompiler(cx, ICStub::Compare_Fallback) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_Fallback::New(space, getStubCode());
+            return ICStub::New<ICCompare_Fallback>(space, getStubCode());
         }
     };
 };
@@ -1929,12 +1841,6 @@
       : ICStub(ICStub::Compare_Int32, stubCode) {}
 
   public:
-    static inline ICCompare_Int32 *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_Int32>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICMultiStubCompiler {
       protected:
@@ -1945,7 +1851,7 @@
           : ICMultiStubCompiler(cx, ICStub::Compare_Int32, op) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_Int32::New(space, getStubCode());
+            return ICStub::New<ICCompare_Int32>(space, getStubCode());
         }
     };
 };
@@ -1959,12 +1865,6 @@
     {}
 
   public:
-    static inline ICCompare_Double *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_Double>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -1975,7 +1875,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_Double::New(space, getStubCode());
+            return ICStub::New<ICCompare_Double>(space, getStubCode());
         }
     };
 };
@@ -1991,12 +1891,6 @@
     }
 
   public:
-    static inline ICCompare_NumberWithUndefined *New(ICStubSpace *space, JitCode *code, bool lhsIsUndefined) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_NumberWithUndefined>(code, lhsIsUndefined);
-    }
-
     bool lhsIsUndefined() {
         return extra_;
     }
@@ -2020,7 +1914,7 @@
         }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_NumberWithUndefined::New(space, getStubCode(), lhsIsUndefined);
+            return ICStub::New<ICCompare_NumberWithUndefined>(space, getStubCode(), lhsIsUndefined);
         }
     };
 };
@@ -2034,12 +1928,6 @@
     {}
 
   public:
-    static inline ICCompare_String *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_String>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2050,7 +1938,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_String::New(space, getStubCode());
+            return ICStub::New<ICCompare_String>(space, getStubCode());
         }
     };
 };
@@ -2064,12 +1952,6 @@
     {}
 
   public:
-    static inline ICCompare_Boolean *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_Boolean>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2080,7 +1962,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_Boolean::New(space, getStubCode());
+            return ICStub::New<ICCompare_Boolean>(space, getStubCode());
         }
     };
 };
@@ -2094,12 +1976,6 @@
     {}
 
   public:
-    static inline ICCompare_Object *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_Object>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2110,7 +1986,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_Object::New(space, getStubCode());
+            return ICStub::New<ICCompare_Object>(space, getStubCode());
         }
     };
 };
@@ -2124,12 +2000,6 @@
     {}
 
   public:
-    static inline ICCompare_ObjectWithUndefined *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_ObjectWithUndefined>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2152,7 +2022,7 @@
         }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_ObjectWithUndefined::New(space, getStubCode());
+            return ICStub::New<ICCompare_ObjectWithUndefined>(space, getStubCode());
         }
     };
 };
@@ -2168,14 +2038,6 @@
     }
 
   public:
-    static inline ICCompare_Int32WithBoolean *New(ICStubSpace *space, JitCode *code,
-                                                  bool lhsIsInt32)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCompare_Int32WithBoolean>(code, lhsIsInt32);
-    }
-
     bool lhsIsInt32() const {
         return extra_;
     }
@@ -2200,7 +2062,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCompare_Int32WithBoolean::New(space, getStubCode(), lhsIsInt32_);
+            return ICStub::New<ICCompare_Int32WithBoolean>(space, getStubCode(), lhsIsInt32_);
         }
     };
 };
@@ -2218,12 +2080,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICToBool_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICToBool_Fallback>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -2234,7 +2090,7 @@
           : ICStubCompiler(cx, ICStub::ToBool_Fallback) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICToBool_Fallback::New(space, getStubCode());
+            return ICStub::New<ICToBool_Fallback>(space, getStubCode());
         }
     };
 };
@@ -2247,12 +2103,6 @@
       : ICStub(ICStub::ToBool_Int32, stubCode) {}
 
   public:
-    static inline ICToBool_Int32 *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICToBool_Int32>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -2263,7 +2113,7 @@
           : ICStubCompiler(cx, ICStub::ToBool_Int32) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICToBool_Int32::New(space, getStubCode());
+            return ICStub::New<ICToBool_Int32>(space, getStubCode());
         }
     };
 };
@@ -2276,12 +2126,6 @@
       : ICStub(ICStub::ToBool_String, stubCode) {}
 
   public:
-    static inline ICToBool_String *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICToBool_String>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -2292,7 +2136,7 @@
           : ICStubCompiler(cx, ICStub::ToBool_String) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICToBool_String::New(space, getStubCode());
+            return ICStub::New<ICToBool_String>(space, getStubCode());
         }
     };
 };
@@ -2305,12 +2149,6 @@
       : ICStub(ICStub::ToBool_NullUndefined, stubCode) {}
 
   public:
-    static inline ICToBool_NullUndefined *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICToBool_NullUndefined>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -2321,7 +2159,7 @@
           : ICStubCompiler(cx, ICStub::ToBool_NullUndefined) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICToBool_NullUndefined::New(space, getStubCode());
+            return ICStub::New<ICToBool_NullUndefined>(space, getStubCode());
         }
     };
 };
@@ -2334,12 +2172,6 @@
       : ICStub(ICStub::ToBool_Double, stubCode) {}
 
   public:
-    static inline ICToBool_Double *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICToBool_Double>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -2350,7 +2182,7 @@
           : ICStubCompiler(cx, ICStub::ToBool_Double) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICToBool_Double::New(space, getStubCode());
+            return ICStub::New<ICToBool_Double>(space, getStubCode());
         }
     };
 };
@@ -2363,12 +2195,6 @@
       : ICStub(ICStub::ToBool_Object, stubCode) {}
 
   public:
-    static inline ICToBool_Object *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICToBool_Object>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -2379,7 +2205,7 @@
           : ICStubCompiler(cx, ICStub::ToBool_Object) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICToBool_Object::New(space, getStubCode());
+            return ICStub::New<ICToBool_Object>(space, getStubCode());
         }
     };
 };
@@ -2395,12 +2221,6 @@
       : ICFallbackStub(ICStub::ToNumber_Fallback, stubCode) {}
 
   public:
-    static inline ICToNumber_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICToNumber_Fallback>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -2411,7 +2231,7 @@
           : ICStubCompiler(cx, ICStub::ToNumber_Fallback) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICToNumber_Fallback::New(space, getStubCode());
+            return ICStub::New<ICToNumber_Fallback>(space, getStubCode());
         }
     };
 };
@@ -2437,12 +2257,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICBinaryArith_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBinaryArith_Fallback>(code);
-    }
-
     bool sawDoubleResult() const {
         return extra_ & SAW_DOUBLE_RESULT_BIT;
     }
@@ -2466,7 +2280,7 @@
           : ICStubCompiler(cx, ICStub::BinaryArith_Fallback) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBinaryArith_Fallback::New(space, getStubCode());
+            return ICStub::New<ICBinaryArith_Fallback>(space, getStubCode());
         }
     };
 };
@@ -2482,11 +2296,6 @@
     }
 
   public:
-    static inline ICBinaryArith_Int32 *New(ICStubSpace *space, JitCode *code, bool allowDouble) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBinaryArith_Int32>(code, allowDouble);
-    }
     bool allowDouble() const {
         return extra_;
     }
@@ -2511,7 +2320,7 @@
             op_(op), allowDouble_(allowDouble) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBinaryArith_Int32::New(space, getStubCode(), allowDouble_);
+            return ICStub::New<ICBinaryArith_Int32>(space, getStubCode(), allowDouble_);
         }
     };
 };
@@ -2525,12 +2334,6 @@
     {}
 
   public:
-    static inline ICBinaryArith_StringConcat *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBinaryArith_StringConcat>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2541,7 +2344,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBinaryArith_StringConcat::New(space, getStubCode());
+            return ICStub::New<ICBinaryArith_StringConcat>(space, getStubCode());
         }
     };
 };
@@ -2557,13 +2360,6 @@
     }
 
   public:
-    static inline ICBinaryArith_StringObjectConcat *New(ICStubSpace *space, JitCode *code,
-                                                        bool lhsIsString) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBinaryArith_StringObjectConcat>(code, lhsIsString);
-    }
-
     bool lhsIsString() const {
         return extra_;
     }
@@ -2584,7 +2380,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBinaryArith_StringObjectConcat::New(space, getStubCode(), lhsIsString_);
+            return ICStub::New<ICBinaryArith_StringObjectConcat>(space, getStubCode(), lhsIsString_);
         }
     };
 };
@@ -2598,12 +2394,6 @@
     {}
 
   public:
-    static inline ICBinaryArith_Double *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBinaryArith_Double>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2614,7 +2404,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBinaryArith_Double::New(space, getStubCode());
+            return ICStub::New<ICBinaryArith_Double>(space, getStubCode());
         }
     };
 };
@@ -2635,13 +2425,6 @@
     }
 
   public:
-    static inline ICBinaryArith_BooleanWithInt32 *New(ICStubSpace *space, JitCode *code,
-                                                      bool lhsIsBool, bool rhsIsBool) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBinaryArith_BooleanWithInt32>(code, lhsIsBool, rhsIsBool);
-    }
-
     bool lhsIsBoolean() const {
         return extra_ & 1;
     }
@@ -2674,8 +2457,8 @@
         }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBinaryArith_BooleanWithInt32::New(space, getStubCode(),
-                                                       lhsIsBool_, rhsIsBool_);
+            return ICStub::New<ICBinaryArith_BooleanWithInt32>(space, getStubCode(),
+                                                               lhsIsBool_, rhsIsBool_);
         }
     };
 };
@@ -2691,13 +2474,6 @@
     }
 
   public:
-    static inline ICBinaryArith_DoubleWithInt32 *New(ICStubSpace *space, JitCode *code,
-                                                     bool lhsIsDouble) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBinaryArith_DoubleWithInt32>(code, lhsIsDouble);
-    }
-
     bool lhsIsDouble() const {
         return extra_;
     }
@@ -2719,7 +2495,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBinaryArith_DoubleWithInt32::New(space, getStubCode(), lhsIsDouble_);
+            return ICStub::New<ICBinaryArith_DoubleWithInt32>(space, getStubCode(), lhsIsDouble_);
         }
     };
 };
@@ -2741,12 +2517,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICUnaryArith_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICUnaryArith_Fallback>(code);
-    }
-
     bool sawDoubleResult() {
         return extra_;
     }
@@ -2765,7 +2535,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICUnaryArith_Fallback::New(space, getStubCode());
+            return ICStub::New<ICUnaryArith_Fallback>(space, getStubCode());
         }
     };
 };
@@ -2779,12 +2549,6 @@
     {}
 
   public:
-    static inline ICUnaryArith_Int32 *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICUnaryArith_Int32>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2795,7 +2559,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICUnaryArith_Int32::New(space, getStubCode());
+            return ICStub::New<ICUnaryArith_Int32>(space, getStubCode());
         }
     };
 };
@@ -2809,12 +2573,6 @@
     {}
 
   public:
-    static inline ICUnaryArith_Double *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICUnaryArith_Double>(code);
-    }
-
     class Compiler : public ICMultiStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -2825,7 +2583,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICUnaryArith_Double::New(space, getStubCode());
+            return ICStub::New<ICUnaryArith_Double>(space, getStubCode());
         }
     };
 };
@@ -2847,12 +2605,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 16;
 
-    static inline ICGetElem_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_Fallback>(code);
-    }
-
     void noteNonNativeAccess() {
         extra_ |= EXTRA_NON_NATIVE;
     }
@@ -2878,7 +2630,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            ICGetElem_Fallback *stub = ICGetElem_Fallback::New(space, getStubCode());
+            ICGetElem_Fallback *stub = ICStub::New<ICGetElem_Fallback>(space, getStubCode());
             if (!stub)
                 return nullptr;
             if (!stub->initMonitoringChain(cx, space))
@@ -2904,7 +2656,7 @@
     static const uint16_t ACCESSTYPE_MASK = 0x3;
 
     ICGetElemNativeStub(ICStub::Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                        HandleShape shape, HandlePropertyName name, AccessType acctype,
+                        Shape *shape, PropertyName *name, AccessType acctype,
                         bool needsAtomize);
 
     ~ICGetElemNativeStub();
@@ -2939,7 +2691,7 @@
     uint32_t offset_;
 
     ICGetElemNativeSlotStub(ICStub::Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                            HandleShape shape, HandlePropertyName name,
+                            Shape *shape, PropertyName *name,
                             AccessType acctype, bool needsAtomize, uint32_t offset)
       : ICGetElemNativeStub(kind, stubCode, firstMonitorStub, shape, name, acctype, needsAtomize),
         offset_(offset)
@@ -2965,8 +2717,8 @@
     uint32_t pcOffset_;
 
     ICGetElemNativeGetterStub(ICStub::Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                            HandleShape shape, HandlePropertyName name, AccessType acctype,
-                            bool needsAtomize, HandleFunction getter, uint32_t pcOffset);
+                              Shape *shape, PropertyName *name, AccessType acctype,
+                              bool needsAtomize, JSFunction *getter, uint32_t pcOffset);
 
   public:
     HeapPtrFunction &getter() {
@@ -2985,23 +2737,11 @@
 {
     friend class ICStubSpace;
     ICGetElem_NativeSlot(JitCode *stubCode, ICStub *firstMonitorStub,
-                         HandleShape shape, HandlePropertyName name,
+                         Shape *shape, PropertyName *name,
                          AccessType acctype, bool needsAtomize, uint32_t offset)
       : ICGetElemNativeSlotStub(ICStub::GetElem_NativeSlot, stubCode, firstMonitorStub, shape,
                                 name, acctype, needsAtomize, offset)
     {}
-
-  public:
-    static inline ICGetElem_NativeSlot *New(ICStubSpace *space, JitCode *code,
-                                            ICStub *firstMonitorStub,
-                                            HandleShape shape, HandlePropertyName name,
-                                            AccessType acctype, bool needsAtomize, uint32_t offset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_NativeSlot>(code, firstMonitorStub, shape, name,
-                                                     acctype, needsAtomize, offset);
-    }
 };
 
 class ICGetElem_NativePrototypeSlot : public ICGetElemNativeSlotStub
@@ -3011,25 +2751,11 @@
     HeapPtrShape holderShape_;
 
     ICGetElem_NativePrototypeSlot(JitCode *stubCode, ICStub *firstMonitorStub,
-                                  HandleShape shape, HandlePropertyName name,
+                                  Shape *shape, PropertyName *name,
                                   AccessType acctype, bool needsAtomize, uint32_t offset,
-                                  HandleObject holder, HandleShape holderShape);
+                                  JSObject *holder, Shape *holderShape);
 
   public:
-    static inline ICGetElem_NativePrototypeSlot *New(ICStubSpace *space, JitCode *code,
-                                                     ICStub *firstMonitorStub,
-                                                     HandleShape shape, HandlePropertyName name,
-                                                     AccessType acctype, bool needsAtomize,
-                                                     uint32_t offset, HandleObject holder,
-                                                     HandleShape holderShape)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_NativePrototypeSlot>(
-                    code, firstMonitorStub, shape, name, acctype, needsAtomize, offset, holder,
-                    holderShape);
-    }
-
     HeapPtrObject &holder() {
         return holder_;
     }
@@ -3053,10 +2779,10 @@
 
   protected:
     ICGetElemNativePrototypeCallStub(ICStub::Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                                     HandleShape shape, HandlePropertyName name,
-                                     AccessType acctype, bool needsAtomize, HandleFunction getter,
-                                     uint32_t pcOffset, HandleObject holder,
-                                     HandleShape holderShape);
+                                     Shape *shape, PropertyName *name,
+                                     AccessType acctype, bool needsAtomize, JSFunction *getter,
+                                     uint32_t pcOffset, JSObject *holder,
+                                     Shape *holderShape);
 
   public:
     HeapPtrObject &holder() {
@@ -3079,10 +2805,10 @@
     friend class ICStubSpace;
 
     ICGetElem_NativePrototypeCallNative(JitCode *stubCode, ICStub *firstMonitorStub,
-                                        HandleShape shape, HandlePropertyName name,
+                                        Shape *shape, PropertyName *name,
                                         AccessType acctype, bool needsAtomize,
-                                        HandleFunction getter, uint32_t pcOffset,
-                                        HandleObject holder, HandleShape holderShape)
+                                        JSFunction *getter, uint32_t pcOffset,
+                                        JSObject *holder, Shape *holderShape)
       : ICGetElemNativePrototypeCallStub(GetElem_NativePrototypeCallNative,
                                          stubCode, firstMonitorStub, shape, name,
                                          acctype, needsAtomize, getter, pcOffset, holder,
@@ -3090,20 +2816,7 @@
     {}
 
   public:
-    static inline ICGetElem_NativePrototypeCallNative *New(
-                    ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                    HandleShape shape, HandlePropertyName name, AccessType acctype,
-                    bool needsAtomize, HandleFunction getter, uint32_t pcOffset,
-                    HandleObject holder, HandleShape holderShape)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_NativePrototypeCallNative>(
-                        code, firstMonitorStub, shape, name, acctype, needsAtomize, getter,
-                        pcOffset, holder, holderShape);
-    }
-
-    static ICGetElem_NativePrototypeCallNative *Clone(JSContext *cx, ICStubSpace *space,
+    static ICGetElem_NativePrototypeCallNative *Clone(ICStubSpace *space,
                                                       ICStub *firstMonitorStub,
                                                       ICGetElem_NativePrototypeCallNative &other);
 };
@@ -3113,10 +2826,10 @@
     friend class ICStubSpace;
 
     ICGetElem_NativePrototypeCallScripted(JitCode *stubCode, ICStub *firstMonitorStub,
-                                          HandleShape shape, HandlePropertyName name,
+                                          Shape *shape, PropertyName *name,
                                           AccessType acctype, bool needsAtomize,
-                                          HandleFunction getter, uint32_t pcOffset,
-                                          HandleObject holder, HandleShape holderShape)
+                                          JSFunction *getter, uint32_t pcOffset,
+                                          JSObject *holder, Shape *holderShape)
       : ICGetElemNativePrototypeCallStub(GetElem_NativePrototypeCallScripted,
                                          stubCode, firstMonitorStub, shape, name,
                                          acctype, needsAtomize, getter, pcOffset, holder,
@@ -3124,21 +2837,8 @@
     {}
 
   public:
-    static inline ICGetElem_NativePrototypeCallScripted *New(
-                    ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                    HandleShape shape, HandlePropertyName name, AccessType acctype,
-                    bool needsAtomize, HandleFunction getter, uint32_t pcOffset,
-                    HandleObject holder, HandleShape holderShape)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_NativePrototypeCallScripted>(
-                        code, firstMonitorStub, shape, name, acctype, needsAtomize, getter,
-                        pcOffset, holder, holderShape);
-    }
-
     static ICGetElem_NativePrototypeCallScripted *
-    Clone(JSContext *cx, ICStubSpace *space,
+    Clone(ICStubSpace *space,
           ICStub *firstMonitorStub,
           ICGetElem_NativePrototypeCallScripted &other);
 };
@@ -3213,7 +2913,7 @@
         RootedShape shape(cx, obj_->lastProperty());
         if (kind == ICStub::GetElem_NativeSlot) {
             MOZ_ASSERT(obj_ == holder_);
-            return ICGetElem_NativeSlot::New(
+            return ICStub::New<ICGetElem_NativeSlot>(
                     space, getStubCode(), firstMonitorStub_, shape, name_, acctype_, needsAtomize_,
                     offset_);
         }
@@ -3221,20 +2921,20 @@
         MOZ_ASSERT(obj_ != holder_);
         RootedShape holderShape(cx, holder_->lastProperty());
         if (kind == ICStub::GetElem_NativePrototypeSlot) {
-            return ICGetElem_NativePrototypeSlot::New(
+            return ICStub::New<ICGetElem_NativePrototypeSlot>(
                     space, getStubCode(), firstMonitorStub_, shape, name_, acctype_, needsAtomize_,
                     offset_, holder_, holderShape);
         }
 
         if (kind == ICStub::GetElem_NativePrototypeCallNative) {
-            return ICGetElem_NativePrototypeCallNative::New(
+            return ICStub::New<ICGetElem_NativePrototypeCallNative>(
                     space, getStubCode(), firstMonitorStub_, shape, name_, acctype_, needsAtomize_,
                     getter_, pcOffset_, holder_, holderShape);
         }
 
         MOZ_ASSERT(kind == ICStub::GetElem_NativePrototypeCallScripted);
         if (kind == ICStub::GetElem_NativePrototypeCallScripted) {
-            return ICGetElem_NativePrototypeCallScripted::New(
+            return ICStub::New<ICGetElem_NativePrototypeCallScripted>(
                     space, getStubCode(), firstMonitorStub_, shape, name_, acctype_, needsAtomize_,
                     getter_, pcOffset_, holder_, holderShape);
         }
@@ -3251,12 +2951,6 @@
       : ICStub(ICStub::GetElem_String, stubCode) {}
 
   public:
-    static inline ICGetElem_String *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_String>(code);
-    }
-
     // Compiler for this stub kind.
     class Compiler : public ICStubCompiler {
       protected:
@@ -3267,7 +2961,7 @@
           : ICStubCompiler(cx, ICStub::GetElem_String) {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetElem_String::New(space, getStubCode());
+            return ICStub::New<ICGetElem_String>(space, getStubCode());
         }
     };
 };
@@ -3278,18 +2972,10 @@
 
     HeapPtrShape shape_;
 
-    ICGetElem_Dense(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape);
+    ICGetElem_Dense(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape);
 
   public:
-    static inline ICGetElem_Dense *New(ICStubSpace *space, JitCode *code,
-                                       ICStub *firstMonitorStub, HandleShape shape)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_Dense>(code, firstMonitorStub, shape);
-    }
-
-    static ICGetElem_Dense *Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICGetElem_Dense *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                   ICGetElem_Dense &other);
 
     static size_t offsetOfShape() {
@@ -3325,7 +3011,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetElem_Dense::New(space, getStubCode(), firstMonitorStub_, shape_);
+            return ICStub::New<ICGetElem_Dense>(space, getStubCode(), firstMonitorStub_, shape_);
         }
     };
 };
@@ -3357,17 +3043,9 @@
   protected: // Protected to silence Clang warning.
     HeapPtrShape shape_;
 
-    ICGetElem_TypedArray(JitCode *stubCode, HandleShape shape, Scalar::Type type);
+    ICGetElem_TypedArray(JitCode *stubCode, Shape *shape, Scalar::Type type);
 
   public:
-    static inline ICGetElem_TypedArray *New(ICStubSpace *space, JitCode *code,
-                                            HandleShape shape, Scalar::Type type)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_TypedArray>(code, shape, type);
-    }
-
     static size_t offsetOfShape() {
         return offsetof(ICGetElem_TypedArray, shape_);
     }
@@ -3399,7 +3077,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetElem_TypedArray::New(space, getStubCode(), shape_, type_);
+            return ICStub::New<ICGetElem_TypedArray>(space, getStubCode(), shape_, type_);
         }
     };
 };
@@ -3418,15 +3096,7 @@
     }
 
   public:
-    static inline ICGetElem_Arguments *New(ICStubSpace *space, JitCode *code,
-                                           ICStub *firstMonitorStub, Which which)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetElem_Arguments>(code, firstMonitorStub, which);
-    }
-
-    static ICGetElem_Arguments *Clone(JSContext *, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICGetElem_Arguments *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                       ICGetElem_Arguments &other);
 
     Which which() const {
@@ -3460,7 +3130,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetElem_Arguments::New(space, getStubCode(), firstMonitorStub_, which_);
+            return ICStub::New<ICGetElem_Arguments>(space, getStubCode(), firstMonitorStub_, which_);
         }
     };
 };
@@ -3480,12 +3150,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICSetElem_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetElem_Fallback>(code);
-    }
-
     void noteArrayWriteHole() {
         extra_ = 1;
     }
@@ -3504,7 +3168,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICSetElem_Fallback::New(space, getStubCode());
+            return ICStub::New<ICSetElem_Fallback>(space, getStubCode());
         }
     };
 };
@@ -3516,16 +3180,9 @@
     HeapPtrShape shape_;
     HeapPtrObjectGroup group_;
 
-    ICSetElem_Dense(JitCode *stubCode, HandleShape shape, HandleObjectGroup group);
+    ICSetElem_Dense(JitCode *stubCode, Shape *shape, ObjectGroup *group);
 
   public:
-    static inline ICSetElem_Dense *New(ICStubSpace *space, JitCode *code, HandleShape shape,
-                                       HandleObjectGroup group) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetElem_Dense>(code, shape, group);
-    }
-
     static size_t offsetOfShape() {
         return offsetof(ICSetElem_Dense, shape_);
     }
@@ -3558,7 +3215,7 @@
         {}
 
         ICUpdatedStub *getStub(ICStubSpace *space) {
-            ICSetElem_Dense *stub = ICSetElem_Dense::New(space, getStubCode(), shape_, group_);
+            ICSetElem_Dense *stub = ICStub::New<ICSetElem_Dense>(space, getStubCode(), shape_, group_);
             if (!stub || !stub->initUpdatingChain(cx, space))
                 return nullptr;
             return stub;
@@ -3623,15 +3280,6 @@
     }
 
   public:
-    static inline ICSetElem_DenseAddImpl *New(ICStubSpace *space, JitCode *code,
-                                              ObjectGroup *group,
-                                              const AutoShapeVector *shapes)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetElem_DenseAddImpl<ProtoChainDepth> >(code, group, shapes);
-    }
-
     void traceShapes(JSTracer *trc) {
         for (size_t i = 0; i < NumShapes; i++)
             MarkShape(trc, &shapes_[i], "baseline-setelem-denseadd-stub-shape");
@@ -3677,19 +3325,10 @@
   protected: // Protected to silence Clang warning.
     HeapPtrShape shape_;
 
-    ICSetElem_TypedArray(JitCode *stubCode, HandleShape shape, Scalar::Type type,
+    ICSetElem_TypedArray(JitCode *stubCode, Shape *shape, Scalar::Type type,
                          bool expectOutOfBounds);
 
   public:
-    static inline ICSetElem_TypedArray *New(ICStubSpace *space, JitCode *code,
-                                            HandleShape shape, Scalar::Type type,
-                                            bool expectOutOfBounds)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetElem_TypedArray>(code, shape, type, expectOutOfBounds);
-    }
-
     Scalar::Type type() const {
         return (Scalar::Type) (extra_ & 0xff);
     }
@@ -3732,8 +3371,8 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICSetElem_TypedArray::New(space, getStubCode(), shape_, type_,
-                                             expectOutOfBounds_);
+            return ICStub::New<ICSetElem_TypedArray>(space, getStubCode(), shape_, type_,
+                                                     expectOutOfBounds_);
         }
     };
 };
@@ -3749,12 +3388,6 @@
     { }
 
   public:
-    static inline ICIn_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICIn_Fallback>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -3765,7 +3398,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICIn_Fallback::New(space, getStubCode());
+            return ICStub::New<ICIn_Fallback>(space, getStubCode());
         }
     };
 };
@@ -3783,13 +3416,6 @@
 
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
-
-    static inline ICGetName_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetName_Fallback>(code);
-    }
-
     static const size_t UNOPTIMIZABLE_ACCESS_BIT = 0;
 
     void noteUnoptimizableAccess() {
@@ -3809,7 +3435,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            ICGetName_Fallback *stub = ICGetName_Fallback::New(space, getStubCode());
+            ICGetName_Fallback *stub = ICStub::New<ICGetName_Fallback>(space, getStubCode());
             if (!stub || !stub->initMonitoringChain(cx, space))
                 return nullptr;
             return stub;
@@ -3826,17 +3452,9 @@
     HeapPtrShape shape_;
     uint32_t slot_;
 
-    ICGetName_Global(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape, uint32_t slot);
+    ICGetName_Global(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape, uint32_t slot);
 
   public:
-    static inline ICGetName_Global *New(ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                                        HandleShape shape, uint32_t slot)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetName_Global>(code, firstMonitorStub, shape, slot);
-    }
-
     HeapPtrShape &shape() {
         return shape_;
     }
@@ -3864,7 +3482,8 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetName_Global::New(space, getStubCode(), firstMonitorStub_, shape_, slot_);
+            return ICStub::New<ICGetName_Global>(space, getStubCode(), firstMonitorStub_, shape_,
+                                                 slot_);
         }
     };
 };
@@ -3891,14 +3510,6 @@
     }
 
   public:
-    static inline ICGetName_Scope *New(ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                                       AutoShapeVector *shapes, uint32_t offset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetName_Scope<NumHops> >(code, firstMonitorStub, shapes, offset);
-    }
-
     void traceScopes(JSTracer *trc) {
         for (size_t i = 0; i < NumHops + 1; i++)
             MarkShape(trc, &shapes_[i], "baseline-scope-stub-shape");
@@ -3938,7 +3549,7 @@
         }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetName_Scope::New(space, getStubCode(), firstMonitorStub_, shapes_, offset_);
+            return ICStub::New<ICGetName_Scope>(space, getStubCode(), firstMonitorStub_, shapes_, offset_);
         }
     };
 };
@@ -3954,12 +3565,6 @@
     { }
 
   public:
-    static inline ICBindName_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICBindName_Fallback>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -3970,7 +3575,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICBindName_Fallback::New(space, getStubCode());
+            return ICStub::New<ICBindName_Fallback>(space, getStubCode());
         }
     };
 };
@@ -3986,12 +3591,6 @@
     { }
 
   public:
-    static inline ICGetIntrinsic_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetIntrinsic_Fallback>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -4002,7 +3601,8 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            ICGetIntrinsic_Fallback *stub = ICGetIntrinsic_Fallback::New(space, getStubCode());
+            ICGetIntrinsic_Fallback *stub =
+                ICStub::New<ICGetIntrinsic_Fallback>(space, getStubCode());
             if (!stub || !stub->initMonitoringChain(cx, space))
                 return nullptr;
             return stub;
@@ -4017,18 +3617,10 @@
 
     HeapValue value_;
 
-    ICGetIntrinsic_Constant(JitCode *stubCode, HandleValue value);
+    ICGetIntrinsic_Constant(JitCode *stubCode, const Value &value);
     ~ICGetIntrinsic_Constant();
 
   public:
-    static inline ICGetIntrinsic_Constant *New(ICStubSpace *space, JitCode *code,
-                                               HandleValue value)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetIntrinsic_Constant>(code, value);
-    }
-
     HeapValue &value() {
         return value_;
     }
@@ -4048,7 +3640,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetIntrinsic_Constant::New(space, getStubCode(), value_);
+            return ICStub::New<ICGetIntrinsic_Constant>(space, getStubCode(), value_);
         }
     };
 };
@@ -4063,13 +3655,6 @@
 
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 16;
-
-    static inline ICGetProp_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_Fallback>(code);
-    }
-
     static const size_t UNOPTIMIZABLE_ACCESS_BIT = 0;
     static const size_t ACCESSED_GETTER_BIT = 1;
 
@@ -4099,7 +3684,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            ICGetProp_Fallback *stub = ICGetProp_Fallback::New(space, getStubCode());
+            ICGetProp_Fallback *stub = ICStub::New<ICGetProp_Fallback>(space, getStubCode());
             if (!stub || !stub->initMonitoringChain(cx, space))
                 return nullptr;
             return stub;
@@ -4117,14 +3702,7 @@
       : ICMonitoredStub(ICStub::GetProp_Generic, stubCode, firstMonitorStub) {}
 
   public:
-    static inline ICGetProp_Generic *New(ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub)
-    {
-        if(!code)
-            return nullptr;
-        return space->allocate<ICGetProp_Generic>(code, firstMonitorStub);
-    }
-
-    static ICGetProp_Generic *Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICGetProp_Generic *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                     ICGetProp_Generic &other);
 
     class Compiler : public ICStubCompiler {
@@ -4138,7 +3716,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetProp_Generic::New(space, getStubCode(), firstMonitorStub_);
+            return ICStub::New<ICGetProp_Generic>(space, getStubCode(), firstMonitorStub_);
         }
     };
 };
@@ -4153,12 +3731,6 @@
     {}
 
   public:
-    static inline ICGetProp_ArrayLength *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_ArrayLength>(code);
-    }
-
     class Compiler : public ICStubCompiler {
         bool generateStubCode(MacroAssembler &masm);
 
@@ -4168,7 +3740,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetProp_ArrayLength::New(space, getStubCode());
+            return ICStub::New<ICGetProp_ArrayLength>(space, getStubCode());
         }
     };
 };
@@ -4186,17 +3758,9 @@
     uint32_t offset_;
 
     ICGetProp_Primitive(JitCode *stubCode, ICStub *firstMonitorStub,
-                        HandleShape protoShape, uint32_t offset);
+                        Shape *protoShape, uint32_t offset);
 
   public:
-    static inline ICGetProp_Primitive *New(ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                                           HandleShape protoShape, uint32_t offset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_Primitive>(code, firstMonitorStub, protoShape, offset);
-    }
-
     HeapPtrShape &protoShape() {
         return protoShape_;
     }
@@ -4238,8 +3802,8 @@
 
         ICStub *getStub(ICStubSpace *space) {
             RootedShape protoShape(cx, prototype_->lastProperty());
-            return ICGetProp_Primitive::New(space, getStubCode(), firstMonitorStub_,
-                                            protoShape, offset_);
+            return ICStub::New<ICGetProp_Primitive>(space, getStubCode(), firstMonitorStub_,
+                                                    protoShape, offset_);
         }
     };
 };
@@ -4254,12 +3818,6 @@
     {}
 
   public:
-    static inline ICGetProp_StringLength *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_StringLength>(code);
-    }
-
     class Compiler : public ICStubCompiler {
         bool generateStubCode(MacroAssembler &masm);
 
@@ -4269,7 +3827,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetProp_StringLength::New(space, getStubCode());
+            return ICStub::New<ICGetProp_StringLength>(space, getStubCode());
         }
     };
 };
@@ -4307,22 +3865,13 @@
     // Object shape (lastProperty).
     HeapPtrShape shape_;
 
-    ICGetProp_Native(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape,
+    ICGetProp_Native(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape,
                      uint32_t offset)
       : ICGetPropNativeStub(GetProp_Native, stubCode, firstMonitorStub, offset),
         shape_(shape)
     {}
 
   public:
-    static inline ICGetProp_Native *New(ICStubSpace *space, JitCode *code,
-                                        ICStub *firstMonitorStub, HandleShape shape,
-                                        uint32_t offset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_Native>(code, firstMonitorStub, shape, offset);
-    }
-
     HeapPtrShape &shape() {
         return shape_;
     }
@@ -4330,7 +3879,7 @@
         return offsetof(ICGetProp_Native, shape_);
     }
 
-    static ICGetProp_Native *Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICGetProp_Native *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                    ICGetProp_Native &other);
 };
 
@@ -4349,22 +3898,11 @@
     HeapPtrObject holder_;
     HeapPtrShape holderShape_;
 
-    ICGetProp_NativePrototype(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape,
-                              uint32_t offset, HandleObject holder, HandleShape holderShape);
+    ICGetProp_NativePrototype(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape,
+                              uint32_t offset, JSObject *holder, Shape *holderShape);
 
   public:
-    static inline ICGetProp_NativePrototype *New(ICStubSpace *space, JitCode *code,
-                                                 ICStub *firstMonitorStub, HandleShape shape,
-                                                 uint32_t offset, HandleObject holder,
-                                                 HandleShape holderShape)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_NativePrototype>(code, firstMonitorStub, shape, offset,
-                                                          holder, holderShape);
-    }
-
-    static ICGetProp_NativePrototype *Clone(JSContext *cx, ICStubSpace *space,
+    static ICGetProp_NativePrototype *Clone(ICStubSpace *space,
                                             ICStub *firstMonitorStub,
                                             ICGetProp_NativePrototype &other);
 
@@ -4405,23 +3943,11 @@
     HeapPtrShape holderShape_;
 
     ICGetProp_UnboxedPrototype(JitCode *stubCode, ICStub *firstMonitorStub,
-                               HandleObjectGroup group,
-                               uint32_t offset, HandleObject holder, HandleShape holderShape);
+                               ObjectGroup *group,
+                               uint32_t offset, JSObject *holder, Shape *holderShape);
 
   public:
-    static inline ICGetProp_UnboxedPrototype *New(ICStubSpace *space, JitCode *code,
-                                                  ICStub *firstMonitorStub,
-                                                  HandleObjectGroup group,
-                                                  uint32_t offset, HandleObject holder,
-                                                  HandleShape holderShape)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_UnboxedPrototype>(code, firstMonitorStub, group, offset,
-                                                           holder, holderShape);
-    }
-
-    static ICGetProp_UnboxedPrototype *Clone(JSContext *cx, ICStubSpace *space,
+    static ICGetProp_UnboxedPrototype *Clone(ICStubSpace *space,
                                              ICStub *firstMonitorStub,
                                              ICGetProp_UnboxedPrototype &other);
 
@@ -4506,16 +4032,6 @@
                                  size_t protoChainDepth);
 
   public:
-    static inline ICGetProp_NativeDoesNotExist *New(ICStubSpace *space, JitCode *code,
-                                                    ICStub *firstMonitorStub,
-                                                    size_t protoChainDepth)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_NativeDoesNotExist>(code, firstMonitorStub,
-                                                             protoChainDepth);
-    }
-
     size_t protoChainDepth() const {
         MOZ_ASSERT(extra_ <= MAX_PROTO_CHAIN_DEPTH);
         return extra_;
@@ -4545,16 +4061,6 @@
                                      const AutoShapeVector *shapes);
 
   public:
-    static inline ICGetProp_NativeDoesNotExistImpl<ProtoChainDepth> *New(
-        ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-        const AutoShapeVector *shapes)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_NativeDoesNotExistImpl<ProtoChainDepth>>(
-                    code, firstMonitorStub, shapes);
-    }
-
     void traceShapes(JSTracer *trc) {
         for (size_t i = 0; i < NumShapes; i++)
             MarkShape(trc, &shapes_[i], "baseline-getpropnativedoesnotexist-stub-shape");
@@ -4584,8 +4090,8 @@
 
     template <size_t ProtoChainDepth>
     ICStub *getStubSpecific(ICStubSpace *space, const AutoShapeVector *shapes) {
-        return ICGetProp_NativeDoesNotExistImpl<ProtoChainDepth>::New(space, getStubCode(),
-                                                                      firstMonitorStub_, shapes);
+        return ICStub::New<ICGetProp_NativeDoesNotExistImpl<ProtoChainDepth>>(space, getStubCode(),
+                                                                              firstMonitorStub_, shapes);
     }
 
     ICStub *getStub(ICStubSpace *space);
@@ -4598,7 +4104,7 @@
     HeapPtrObjectGroup group_;
     uint32_t fieldOffset_;
 
-    ICGetProp_Unboxed(JitCode *stubCode, ICStub *firstMonitorStub, HandleObjectGroup group,
+    ICGetProp_Unboxed(JitCode *stubCode, ICStub *firstMonitorStub, ObjectGroup *group,
                       uint32_t fieldOffset)
       : ICMonitoredStub(ICStub::GetProp_Unboxed, stubCode, firstMonitorStub),
         group_(group), fieldOffset_(fieldOffset)
@@ -4607,15 +4113,6 @@
     }
 
   public:
-    static inline ICGetProp_Unboxed *New(ICStubSpace *space, JitCode *code,
-                                         ICStub *firstMonitorStub, HandleObjectGroup group,
-                                         uint32_t fieldOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_Unboxed>(code, firstMonitorStub, group, fieldOffset);
-    }
-
     HeapPtrObjectGroup &group() {
         return group_;
     }
@@ -4651,8 +4148,8 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetProp_Unboxed::New(space, getStubCode(), firstMonitorStub_,
-                                          group_, fieldOffset_);
+            return ICStub::New<ICGetProp_Unboxed>(space, getStubCode(), firstMonitorStub_,
+                                                  group_, fieldOffset_);
         }
     };
 };
@@ -4672,7 +4169,7 @@
     HeapPtrShape shape_;
     uint32_t fieldOffset_;
 
-    ICGetProp_TypedObject(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape,
+    ICGetProp_TypedObject(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape,
                           uint32_t fieldOffset)
       : ICMonitoredStub(ICStub::GetProp_TypedObject, stubCode, firstMonitorStub),
         shape_(shape), fieldOffset_(fieldOffset)
@@ -4681,15 +4178,6 @@
     }
 
   public:
-    static inline ICGetProp_TypedObject *New(ICStubSpace *space, JitCode *code,
-                                             ICStub *firstMonitorStub, HandleShape shape,
-                                             uint32_t fieldOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_TypedObject>(code, firstMonitorStub, shape, fieldOffset);
-    }
-
     HeapPtrShape &shape() {
         return shape_;
     }
@@ -4729,8 +4217,8 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetProp_TypedObject::New(space, getStubCode(), firstMonitorStub_,
-                                              shape_, fieldOffset_);
+            return ICStub::New<ICGetProp_TypedObject>(space, getStubCode(), firstMonitorStub_,
+                                                      shape_, fieldOffset_);
         }
     };
 };
@@ -4752,8 +4240,8 @@
     // PC offset of call
     uint32_t pcOffset_;
 
-    ICGetPropCallGetter(Kind kind, JitCode *stubCode, ICStub *firstMonitorStub, HandleObject holder,
-                        HandleShape holderShape, HandleFunction getter, uint32_t pcOffset);
+    ICGetPropCallGetter(Kind kind, JitCode *stubCode, ICStub *firstMonitorStub, JSObject *holder,
+                        Shape *holderShape, JSFunction *getter, uint32_t pcOffset);
 
   public:
     HeapPtrObject &holder() {
@@ -4821,9 +4309,9 @@
     HeapPtrShape receiverShape_;
 
     ICGetPropCallPrototypeGetter(Kind kind, JitCode *stubCode, ICStub *firstMonitorStub,
-                                 HandleShape receiverShape,
-                                 HandleObject holder, HandleShape holderShape,
-                                 HandleFunction getter, uint32_t pcOffset);
+                                 Shape *receiverShape,
+                                 JSObject *holder, Shape *holderShape,
+                                 JSFunction *getter, uint32_t pcOffset);
 
   public:
     HeapPtrShape &receiverShape() {
@@ -4860,26 +4348,14 @@
 
   protected:
     ICGetProp_CallScripted(JitCode *stubCode, ICStub *firstMonitorStub,
-                           HandleShape receiverShape, HandleObject holder, HandleShape holderShape,
-                           HandleFunction getter, uint32_t pcOffset)
+                           Shape *receiverShape, JSObject *holder, Shape *holderShape,
+                           JSFunction *getter, uint32_t pcOffset)
       : ICGetPropCallPrototypeGetter(GetProp_CallScripted, stubCode, firstMonitorStub,
                                      receiverShape, holder, holderShape, getter, pcOffset)
     {}
 
   public:
-    static inline ICGetProp_CallScripted *New(
-                ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                HandleShape receiverShape, HandleObject holder, HandleShape holderShape,
-                HandleFunction getter, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_CallScripted>(code, firstMonitorStub,
-                                                       receiverShape, holder, holderShape, getter,
-                                                       pcOffset);
-    }
-
-    static ICGetProp_CallScripted *Clone(JSContext *cx, ICStubSpace *space,
+    static ICGetProp_CallScripted *Clone(ICStubSpace *space,
                                          ICStub *firstMonitorStub, ICGetProp_CallScripted &other);
 
     class Compiler : public ICGetPropCallPrototypeGetter::Compiler {
@@ -4897,8 +4373,9 @@
         ICStub *getStub(ICStubSpace *space) {
             RootedShape receiverShape(cx, receiver_->lastProperty());
             RootedShape holderShape(cx, holder_->lastProperty());
-            return ICGetProp_CallScripted::New(space, getStubCode(), firstMonitorStub_, receiverShape,
-                                               holder_, holderShape, getter_, pcOffset_);
+            return ICStub::New<ICGetProp_CallScripted>(space, getStubCode(), firstMonitorStub_,
+                                                       receiverShape, holder_, holderShape, getter_,
+                                                       pcOffset_);
         }
     };
 };
@@ -4910,25 +4387,14 @@
 
   protected:
 
-    ICGetProp_CallNative(JitCode *stubCode, ICStub *firstMonitorStub, HandleObject obj,
-                            HandleShape shape, HandleFunction getter, uint32_t pcOffset)
+    ICGetProp_CallNative(JitCode *stubCode, ICStub *firstMonitorStub, JSObject *obj,
+                         Shape *shape, JSFunction *getter, uint32_t pcOffset)
       : ICGetPropCallGetter(GetProp_CallNative, stubCode, firstMonitorStub, obj, shape,
                             getter, pcOffset)
     { }
 
   public:
-    static inline ICGetProp_CallNative *New(ICStubSpace *space, JitCode *code,
-                                            ICStub *firstMonitorStub, HandleObject obj,
-                                            HandleShape shape, HandleFunction getter,
-                                            uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_CallNative>(code, firstMonitorStub, obj, shape,
-                                                     getter, pcOffset);
-    }
-
-    static ICGetProp_CallNative *Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICGetProp_CallNative *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                        ICGetProp_CallNative &other);
 
     class Compiler : public ICGetPropCallGetter::Compiler
@@ -4953,8 +4419,8 @@
 
         ICStub *getStub(ICStubSpace *space) {
             RootedShape shape(cx, holder_->lastProperty());
-            return ICGetProp_CallNative::New(space, getStubCode(), firstMonitorStub_, holder_,
-                                             shape, getter_, pcOffset_);
+            return ICStub::New<ICGetProp_CallNative>(space, getStubCode(), firstMonitorStub_,
+                                                     holder_, shape, getter_, pcOffset_);
         }
     };
 };
@@ -4966,26 +4432,14 @@
 
   protected:
     ICGetProp_CallNativePrototype(JitCode *stubCode, ICStub *firstMonitorStub,
-                         HandleShape receiverShape, HandleObject holder, HandleShape holderShape,
-                         HandleFunction getter, uint32_t pcOffset)
+                         Shape *receiverShape, JSObject *holder, Shape *holderShape,
+                         JSFunction *getter, uint32_t pcOffset)
       : ICGetPropCallPrototypeGetter(GetProp_CallNativePrototype, stubCode, firstMonitorStub,
                                      receiverShape, holder, holderShape, getter, pcOffset)
     {}
 
   public:
-    static inline ICGetProp_CallNativePrototype *New(
-                ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                HandleShape receiverShape, HandleObject holder, HandleShape holderShape,
-                HandleFunction getter, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_CallNativePrototype>(code, firstMonitorStub,
-                                                              receiverShape, holder, holderShape,
-                                                              getter, pcOffset);
-    }
-
-    static ICGetProp_CallNativePrototype *Clone(JSContext *cx, ICStubSpace *space,
+    static ICGetProp_CallNativePrototype *Clone(ICStubSpace *space,
                                                 ICStub *firstMonitorStub,
                                                 ICGetProp_CallNativePrototype &other);
 
@@ -5012,8 +4466,9 @@
         ICStub *getStub(ICStubSpace *space) {
             RootedShape receiverShape(cx, receiver_->lastProperty());
             RootedShape holderShape(cx, holder_->lastProperty());
-            return ICGetProp_CallNativePrototype::New(space, getStubCode(), firstMonitorStub_, receiverShape,
-                                                      holder_, holderShape, getter_, pcOffset_);
+            return ICStub::New<ICGetProp_CallNativePrototype>(space, getStubCode(), firstMonitorStub_,
+                                                              receiverShape, holder_, holderShape,
+                                                              getter_, pcOffset_);
         }
     };
 };
@@ -5022,20 +4477,17 @@
 {
   friend class ICStubSpace;
   protected:
-    // Shape of the DOMProxy
+    // Shape of the DOMProxy.  This enforces its class and hence its proxy handler.
     HeapPtrShape shape_;
 
-    // Proxy handler to check against.
-    const BaseProxyHandler *proxyHandler_;
-
     // Object shape of expected expando object. (nullptr if no expando object should be there)
     HeapPtrShape expandoShape_;
 
     ICGetPropCallDOMProxyNativeStub(ICStub::Kind kind, JitCode *stubCode,
-                                    ICStub *firstMonitorStub, HandleShape shape,
-                                    const BaseProxyHandler *proxyHandler, HandleShape expandoShape,
-                                    HandleObject holder, HandleShape holderShape,
-                                    HandleFunction getter, uint32_t pcOffset);
+                                    ICStub *firstMonitorStub, Shape *shape,
+                                    Shape *expandoShape,
+                                    JSObject *holder, Shape *holderShape,
+                                    JSFunction *getter, uint32_t pcOffset);
 
   public:
     HeapPtrShape &shape() {
@@ -5047,9 +4499,6 @@
     static size_t offsetOfShape() {
         return offsetof(ICGetPropCallDOMProxyNativeStub, shape_);
     }
-    static size_t offsetOfProxyHandler() {
-        return offsetof(ICGetPropCallDOMProxyNativeStub, proxyHandler_);
-    }
     static size_t offsetOfExpandoShape() {
         return offsetof(ICGetPropCallDOMProxyNativeStub, expandoShape_);
     }
@@ -5058,30 +4507,17 @@
 class ICGetProp_CallDOMProxyNative : public ICGetPropCallDOMProxyNativeStub
 {
     friend class ICStubSpace;
-    ICGetProp_CallDOMProxyNative(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape,
-                                 const BaseProxyHandler *proxyHandler, HandleShape expandoShape,
-                                 HandleObject holder, HandleShape holderShape,
-                                 HandleFunction getter, uint32_t pcOffset)
+    ICGetProp_CallDOMProxyNative(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape,
+                                 Shape *expandoShape,
+                                 JSObject *holder, Shape *holderShape,
+                                 JSFunction *getter, uint32_t pcOffset)
       : ICGetPropCallDOMProxyNativeStub(ICStub::GetProp_CallDOMProxyNative, stubCode,
-                                        firstMonitorStub, shape, proxyHandler, expandoShape,
+                                        firstMonitorStub, shape, expandoShape,
                                         holder, holderShape, getter, pcOffset)
     {}
 
   public:
-    static inline ICGetProp_CallDOMProxyNative *New(
-            ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-            HandleShape shape, const BaseProxyHandler *proxyHandler,
-            HandleShape expandoShape, HandleObject holder, HandleShape holderShape,
-            HandleFunction getter, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_CallDOMProxyNative>(code, firstMonitorStub, shape,
-                                                   proxyHandler, expandoShape, holder,
-                                                   holderShape, getter, pcOffset);
-    }
-
-    static ICGetProp_CallDOMProxyNative *Clone(JSContext *cx, ICStubSpace *space,
+    static ICGetProp_CallDOMProxyNative *Clone(ICStubSpace *space,
                                                ICStub *firstMonitorStub,
                                                ICGetProp_CallDOMProxyNative &other);
 };
@@ -5094,36 +4530,21 @@
 
   public:
     ICGetProp_CallDOMProxyWithGenerationNative(JitCode *stubCode, ICStub *firstMonitorStub,
-                                               HandleShape shape, const BaseProxyHandler *proxyHandler,
+                                               Shape *shape,
                                                ExpandoAndGeneration *expandoAndGeneration,
-                                               uint32_t generation, HandleShape expandoShape,
-                                               HandleObject holder, HandleShape holderShape,
-                                               HandleFunction getter, uint32_t pcOffset)
+                                               uint32_t generation, Shape *expandoShape,
+                                               JSObject *holder, Shape *holderShape,
+                                               JSFunction *getter, uint32_t pcOffset)
       : ICGetPropCallDOMProxyNativeStub(ICStub::GetProp_CallDOMProxyWithGenerationNative,
-                                        stubCode, firstMonitorStub, shape, proxyHandler,
+                                        stubCode, firstMonitorStub, shape,
                                         expandoShape, holder, holderShape, getter, pcOffset),
         expandoAndGeneration_(expandoAndGeneration),
         generation_(generation)
     {
     }
 
-    static inline ICGetProp_CallDOMProxyWithGenerationNative *New(
-            ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-            HandleShape shape, const BaseProxyHandler *proxyHandler,
-            ExpandoAndGeneration *expandoAndGeneration, uint32_t generation,
-            HandleShape expandoShape, HandleObject holder, HandleShape holderShape,
-            HandleFunction getter, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_CallDOMProxyWithGenerationNative>(code, firstMonitorStub,
-                                                   shape, proxyHandler, expandoAndGeneration,
-                                                   generation, expandoShape, holder, holderShape,
-                                                   getter, pcOffset);
-    }
-
     static ICGetProp_CallDOMProxyWithGenerationNative *
-    Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    Clone(ICStubSpace *space, ICStub *firstMonitorStub,
           ICGetProp_CallDOMProxyWithGenerationNative &other);
 
     void *expandoAndGeneration() const {
@@ -5174,23 +4595,12 @@
     HeapPtrPropertyName name_;
     uint32_t pcOffset_;
 
-    ICGetProp_DOMProxyShadowed(JitCode *stubCode, ICStub *firstMonitorStub, HandleShape shape,
-                               const BaseProxyHandler *proxyHandler, HandlePropertyName name,
+    ICGetProp_DOMProxyShadowed(JitCode *stubCode, ICStub *firstMonitorStub, Shape *shape,
+                               const BaseProxyHandler *proxyHandler, PropertyName *name,
                                uint32_t pcOffset);
 
   public:
-    static inline ICGetProp_DOMProxyShadowed *New(ICStubSpace *space, JitCode *code,
-                                                  ICStub *firstMonitorStub, HandleShape shape,
-                                                  const BaseProxyHandler *proxyHandler,
-                                                  HandlePropertyName name, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_DOMProxyShadowed>(code, firstMonitorStub, shape,
-                                                           proxyHandler, name, pcOffset);
-    }
-
-    static ICGetProp_DOMProxyShadowed *Clone(JSContext *cx, ICStubSpace *space,
+    static ICGetProp_DOMProxyShadowed *Clone(ICStubSpace *space,
                                              ICStub *firstMonitorStub,
                                              ICGetProp_DOMProxyShadowed &other);
 
@@ -5248,13 +4658,6 @@
     { }
 
   public:
-    static inline ICGetProp_ArgumentsLength *New(ICStubSpace *space, JitCode *code)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_ArgumentsLength>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         Which which_;
@@ -5272,7 +4675,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetProp_ArgumentsLength::New(space, getStubCode());
+            return ICStub::New<ICGetProp_ArgumentsLength>(space, getStubCode());
         }
     };
 };
@@ -5285,14 +4688,6 @@
     ICGetProp_ArgumentsCallee(JitCode *stubCode, ICStub *firstMonitorStub);
 
   public:
-    static inline ICGetProp_ArgumentsCallee *New(ICStubSpace *space, JitCode *code,
-                                                 ICStub *firstMonitorStub)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICGetProp_ArgumentsCallee>(code, firstMonitorStub);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         ICStub *firstMonitorStub_;
@@ -5305,7 +4700,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICGetProp_ArgumentsCallee::New(space, getStubCode(), firstMonitorStub_);
+            return ICStub::New<ICGetProp_ArgumentsCallee>(space, getStubCode(), firstMonitorStub_);
         }
     };
 };
@@ -5327,12 +4722,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICSetProp_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetProp_Fallback>(code);
-    }
-
     static const size_t UNOPTIMIZABLE_ACCESS_BIT = 0;
     void noteUnoptimizableAccess() {
         extra_ |= (1u << UNOPTIMIZABLE_ACCESS_BIT);
@@ -5353,7 +4742,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICSetProp_Fallback::New(space, getStubCode());
+            return ICStub::New<ICSetProp_Fallback>(space, getStubCode());
         }
     };
 };
@@ -5368,16 +4757,9 @@
     HeapPtrShape shape_;
     uint32_t offset_;
 
-    ICSetProp_Native(JitCode *stubCode, HandleObjectGroup group, HandleShape shape, uint32_t offset);
+    ICSetProp_Native(JitCode *stubCode, ObjectGroup *group, Shape *shape, uint32_t offset);
 
   public:
-    static inline ICSetProp_Native *New(ICStubSpace *space, JitCode *code, HandleObjectGroup group,
-                                        HandleShape shape, uint32_t offset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetProp_Native>(code, group, shape, offset);
-    }
     HeapPtrObjectGroup &group() {
         return group_;
     }
@@ -5438,8 +4820,8 @@
     HeapPtrObjectGroup newGroup_;
     uint32_t offset_;
 
-    ICSetProp_NativeAdd(JitCode *stubCode, HandleObjectGroup group, size_t protoChainDepth,
-                        HandleShape newShape, HandleObjectGroup newGroup, uint32_t offset);
+    ICSetProp_NativeAdd(JitCode *stubCode, ObjectGroup *group, size_t protoChainDepth,
+                        Shape *newShape, ObjectGroup *newGroup, uint32_t offset);
 
   public:
     size_t protoChainDepth() const {
@@ -5483,22 +4865,11 @@
     static const size_t NumShapes = ProtoChainDepth + 1;
     mozilla::Array<HeapPtrShape, NumShapes> shapes_;
 
-    ICSetProp_NativeAddImpl(JitCode *stubCode, HandleObjectGroup group,
+    ICSetProp_NativeAddImpl(JitCode *stubCode, ObjectGroup *group,
                             const AutoShapeVector *shapes,
-                            HandleShape newShape, HandleObjectGroup newGroup, uint32_t offset);
+                            Shape *newShape, ObjectGroup *newGroup, uint32_t offset);
 
   public:
-    static inline ICSetProp_NativeAddImpl *New(
-            ICStubSpace *space, JitCode *code, HandleObjectGroup group,
-            const AutoShapeVector *shapes, HandleShape newShape,
-            HandleObjectGroup newGroup, uint32_t offset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetProp_NativeAddImpl<ProtoChainDepth> >(
-                            code, group, shapes, newShape, newGroup, offset);
-    }
-
     void traceShapes(JSTracer *trc) {
         for (size_t i = 0; i < NumShapes; i++)
             MarkShape(trc, &shapes_[i], "baseline-setpropnativeadd-stub-shape");
@@ -5546,7 +4917,7 @@
 
         RootedShape newShape(cx, obj_->lastProperty());
 
-        return ICSetProp_NativeAddImpl<ProtoChainDepth>::New(
+        return ICStub::New<ICSetProp_NativeAddImpl<ProtoChainDepth>>(
                     space, getStubCode(), oldGroup_, shapes, newShape, newGroup, offset_);
     }
 
@@ -5560,7 +4931,7 @@
     HeapPtrObjectGroup group_;
     uint32_t fieldOffset_;
 
-    ICSetProp_Unboxed(JitCode *stubCode, HandleObjectGroup group, uint32_t fieldOffset)
+    ICSetProp_Unboxed(JitCode *stubCode, ObjectGroup *group, uint32_t fieldOffset)
       : ICUpdatedStub(ICStub::SetProp_Unboxed, stubCode),
         group_(group),
         fieldOffset_(fieldOffset)
@@ -5569,14 +4940,6 @@
     }
 
   public:
-    static inline ICSetProp_Unboxed *New(ICStubSpace *space, JitCode *code,
-                                         HandleObjectGroup group, uint32_t fieldOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetProp_Unboxed>(code, group, fieldOffset);
-    }
-
     HeapPtrObjectGroup &group() {
         return group_;
     }
@@ -5611,8 +4974,8 @@
         {}
 
         ICUpdatedStub *getStub(ICStubSpace *space) {
-            ICUpdatedStub *stub = ICSetProp_Unboxed::New(space, getStubCode(),
-                                                         group_, fieldOffset_);
+            ICUpdatedStub *stub = ICStub::New<ICSetProp_Unboxed>(space, getStubCode(),
+                                                                 group_, fieldOffset_);
             if (!stub || !stub->initUpdatingChain(cx, space))
                 return nullptr;
             return stub;
@@ -5633,7 +4996,7 @@
     uint32_t fieldOffset_;
     bool isObjectReference_;
 
-    ICSetProp_TypedObject(JitCode *stubCode, HandleShape shape, HandleObjectGroup group,
+    ICSetProp_TypedObject(JitCode *stubCode, Shape *shape, ObjectGroup *group,
                           uint32_t fieldOffset, bool isObjectReference)
       : ICUpdatedStub(ICStub::SetProp_TypedObject, stubCode),
         shape_(shape),
@@ -5645,16 +5008,6 @@
     }
 
   public:
-    static inline ICSetProp_TypedObject *New(ICStubSpace *space, JitCode *code,
-                                             HandleShape shape, HandleObjectGroup group,
-                                             uint32_t fieldOffset, bool isObjectReference)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetProp_TypedObject>(code, shape, group,
-                                                      fieldOffset, isObjectReference);
-    }
-
     HeapPtrShape &shape() {
         return shape_;
     }
@@ -5706,8 +5059,9 @@
             bool isObjectReference =
                 fieldDescr_->is<ReferenceTypeDescr>() &&
                 fieldDescr_->as<ReferenceTypeDescr>().type() == ReferenceTypeDescr::TYPE_OBJECT;
-            ICUpdatedStub *stub = ICSetProp_TypedObject::New(space, getStubCode(), shape_, group_,
-                                                             fieldOffset_, isObjectReference);
+            ICUpdatedStub *stub = ICStub::New<ICSetProp_TypedObject>(space, getStubCode(), shape_,
+                                                                     group_, fieldOffset_,
+                                                                     isObjectReference);
             if (!stub || !stub->initUpdatingChain(cx, space))
                 return nullptr;
             return stub;
@@ -5739,8 +5093,8 @@
     // PC of call, for profiler
     uint32_t pcOffset_;
 
-    ICSetPropCallSetter(Kind kind, JitCode *stubCode, HandleShape shape, HandleObject holder,
-                        HandleShape holderShape, HandleFunction setter, uint32_t pcOffset);
+    ICSetPropCallSetter(Kind kind, JitCode *stubCode, Shape *shape, JSObject *holder,
+                        Shape *holderShape, JSFunction *setter, uint32_t pcOffset);
 
   public:
     HeapPtrShape &shape() {
@@ -5799,25 +5153,14 @@
     friend class ICStubSpace;
 
   protected:
-    ICSetProp_CallScripted(JitCode *stubCode, HandleShape shape, HandleObject holder,
-                           HandleShape holderShape, HandleFunction setter, uint32_t pcOffset)
+    ICSetProp_CallScripted(JitCode *stubCode, Shape *shape, JSObject *holder,
+                           Shape *holderShape, JSFunction *setter, uint32_t pcOffset)
       : ICSetPropCallSetter(SetProp_CallScripted, stubCode, shape, holder, holderShape,
                             setter, pcOffset)
     {}
 
   public:
-    static inline ICSetProp_CallScripted *New(ICStubSpace *space, JitCode *code,
-                                              HandleShape shape, HandleObject holder,
-                                              HandleShape holderShape, HandleFunction setter,
-                                              uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetProp_CallScripted>(code, shape, holder, holderShape, setter,
-                                                       pcOffset);
-    }
-
-    static ICSetProp_CallScripted *Clone(JSContext *cx, ICStubSpace *space, ICStub *,
+    static ICSetProp_CallScripted *Clone(ICStubSpace *space, ICStub *,
                                          ICSetProp_CallScripted &other);
 
     class Compiler : public ICSetPropCallSetter::Compiler {
@@ -5834,8 +5177,8 @@
         ICStub *getStub(ICStubSpace *space) {
             RootedShape shape(cx, obj_->lastProperty());
             RootedShape holderShape(cx, holder_->lastProperty());
-            return ICSetProp_CallScripted::New(space, getStubCode(), shape, holder_, holderShape,
-                                               setter_, pcOffset_);
+            return ICStub::New<ICSetProp_CallScripted>(space, getStubCode(), shape, holder_,
+                                                       holderShape, setter_, pcOffset_);
         }
     };
 };
@@ -5846,25 +5189,14 @@
     friend class ICStubSpace;
 
   protected:
-    ICSetProp_CallNative(JitCode *stubCode, HandleShape shape, HandleObject holder,
-                           HandleShape holderShape, HandleFunction setter, uint32_t pcOffset)
+    ICSetProp_CallNative(JitCode *stubCode, Shape *shape, JSObject *holder,
+                         Shape *holderShape, JSFunction *setter, uint32_t pcOffset)
       : ICSetPropCallSetter(SetProp_CallNative, stubCode, shape, holder, holderShape,
                             setter, pcOffset)
     {}
 
   public:
-    static inline ICSetProp_CallNative *New(ICStubSpace *space, JitCode *code,
-                                            HandleShape shape, HandleObject holder,
-                                            HandleShape holderShape, HandleFunction setter,
-                                            uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICSetProp_CallNative>(code, shape, holder, holderShape, setter,
-                                                     pcOffset);
-    }
-
-    static ICSetProp_CallNative *Clone(JSContext *cx, ICStubSpace *space, ICStub *,
+    static ICSetProp_CallNative *Clone(ICStubSpace *space, ICStub *,
                                        ICSetProp_CallNative &other);
 
     class Compiler : public ICSetPropCallSetter::Compiler {
@@ -5881,8 +5213,8 @@
         ICStub *getStub(ICStubSpace *space) {
             RootedShape shape(cx, obj_->lastProperty());
             RootedShape holderShape(cx, holder_->lastProperty());
-            return ICSetProp_CallNative::New(space, getStubCode(), shape, holder_, holderShape,
-                                               setter_, pcOffset_);
+            return ICStub::New<ICSetProp_CallNative>(space, getStubCode(), shape, holder_,
+                                                     holderShape, setter_, pcOffset_);
         }
     };
 };
@@ -5940,14 +5272,6 @@
     }
 
   public:
-
-    static inline ICCall_Fallback *New(ICStubSpace *space, JitCode *code, bool isConstructing)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_Fallback>(code, isConstructing);
-    }
-
     bool isConstructing() const {
         return extra_ & CONSTRUCTING_FLAG;
     }
@@ -5995,7 +5319,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            ICCall_Fallback *stub = ICCall_Fallback::New(space, getStubCode(), isConstructing_);
+            ICCall_Fallback *stub = ICStub::New<ICCall_Fallback>(space, getStubCode(), isConstructing_);
             if (!stub || !stub->initMonitoringChain(cx, space))
                 return nullptr;
             return stub;
@@ -6018,22 +5342,11 @@
     uint32_t pcOffset_;
 
     ICCall_Scripted(JitCode *stubCode, ICStub *firstMonitorStub,
-                    HandleFunction callee, HandleObject templateObject,
+                    JSFunction *callee, JSObject *templateObject,
                     uint32_t pcOffset);
 
   public:
-    static inline ICCall_Scripted *New(
-            ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-            HandleFunction callee, HandleObject templateObject,
-            uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_Scripted>(code, firstMonitorStub,
-                                                callee, templateObject, pcOffset);
-    }
-
-    static ICCall_Scripted *Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICCall_Scripted *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                   ICCall_Scripted &other);
 
     HeapPtrFunction &callee() {
@@ -6064,15 +5377,7 @@
     { }
 
   public:
-    static inline ICCall_AnyScripted *New(ICStubSpace *space, JitCode *code,
-                                          ICStub *firstMonitorStub, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_AnyScripted>(code, firstMonitorStub, pcOffset);
-    }
-
-    static ICCall_AnyScripted *Clone(JSContext *, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICCall_AnyScripted *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                      ICCall_AnyScripted &other);
 
     static size_t offsetOfPCOffset() {
@@ -6098,7 +5403,7 @@
 
   public:
     ICCallScriptedCompiler(JSContext *cx, ICStub *firstMonitorStub,
-                           HandleFunction callee, HandleObject templateObject,
+                           JSFunction *callee, JSObject *templateObject,
                            bool isConstructing, bool isSpread, uint32_t pcOffset)
       : ICCallStubCompiler(cx, ICStub::Call_Scripted),
         firstMonitorStub_(firstMonitorStub),
@@ -6122,11 +5427,11 @@
 
     ICStub *getStub(ICStubSpace *space) {
         if (callee_) {
-            return ICCall_Scripted::New(space, getStubCode(), firstMonitorStub_,
-                                        callee_, templateObject_,
-                                        pcOffset_);
+            return ICStub::New<ICCall_Scripted>(space, getStubCode(), firstMonitorStub_,
+                                                callee_, templateObject_,
+                                                pcOffset_);
         }
-        return ICCall_AnyScripted::New(space, getStubCode(), firstMonitorStub_, pcOffset_);
+        return ICStub::New<ICCall_AnyScripted>(space, getStubCode(), firstMonitorStub_, pcOffset_);
     }
 };
 
@@ -6144,21 +5449,11 @@
 #endif
 
     ICCall_Native(JitCode *stubCode, ICStub *firstMonitorStub,
-                  HandleFunction callee, HandleObject templateObject,
+                  JSFunction *callee, JSObject *templateObject,
                   uint32_t pcOffset);
 
   public:
-    static inline ICCall_Native *New(ICStubSpace *space, JitCode *code, ICStub *firstMonitorStub,
-                                     HandleFunction callee, HandleObject templateObject,
-                                     uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_Native>(code, firstMonitorStub,
-                                              callee, templateObject, pcOffset);
-    }
-
-    static ICCall_Native *Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICCall_Native *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                 ICCall_Native &other);
 
     HeapPtrFunction &callee() {
@@ -6211,8 +5506,8 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCall_Native::New(space, getStubCode(), firstMonitorStub_,
-                                      callee_, templateObject_, pcOffset_);
+            return ICStub::New<ICCall_Native>(space, getStubCode(), firstMonitorStub_,
+                                              callee_, templateObject_, pcOffset_);
         }
     };
 };
@@ -6228,23 +5523,11 @@
     uint32_t pcOffset_;
 
     ICCall_ClassHook(JitCode *stubCode, ICStub *firstMonitorStub,
-                     const Class *clasp, Native native, HandleObject templateObject,
+                     const Class *clasp, Native native, JSObject *templateObject,
                      uint32_t pcOffset);
 
   public:
-    static inline ICCall_ClassHook *New(ICStubSpace *space,
-                                        JitCode *code, ICStub *firstMonitorStub,
-                                        const Class *clasp, Native native,
-                                        HandleObject templateObject,
-                                        uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_ClassHook>(code, firstMonitorStub,
-                                                 clasp, native, templateObject, pcOffset);
-    }
-
-    static ICCall_ClassHook *Clone(JSContext *cx, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICCall_ClassHook *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                    ICCall_ClassHook &other);
 
     const Class *clasp() {
@@ -6297,8 +5580,8 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCall_ClassHook::New(space, getStubCode(), firstMonitorStub_,
-                                         clasp_, native_, templateObject_, pcOffset_);
+            return ICStub::New<ICCall_ClassHook>(space, getStubCode(), firstMonitorStub_,
+                                                 clasp_, native_, templateObject_, pcOffset_);
         }
     };
 };
@@ -6321,15 +5604,7 @@
     {}
 
   public:
-    static inline ICCall_ScriptedApplyArray *New(ICStubSpace *space, JitCode *code,
-                                                 ICStub *firstMonitorStub, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_ScriptedApplyArray>(code, firstMonitorStub, pcOffset);
-    }
-
-    static ICCall_ScriptedApplyArray *Clone(JSContext *, ICStubSpace *space,
+    static ICCall_ScriptedApplyArray *Clone(ICStubSpace *space,
                                             ICStub *firstMonitorStub,
                                             ICCall_ScriptedApplyArray &other);
 
@@ -6356,8 +5631,8 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCall_ScriptedApplyArray::New(space, getStubCode(), firstMonitorStub_,
-                                                      pcOffset_);
+            return ICStub::New<ICCall_ScriptedApplyArray>(space, getStubCode(), firstMonitorStub_,
+                                                          pcOffset_);
         }
     };
 };
@@ -6375,15 +5650,7 @@
     {}
 
   public:
-    static inline ICCall_ScriptedApplyArguments *New(ICStubSpace *space, JitCode *code,
-                                                     ICStub *firstMonitorStub, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_ScriptedApplyArguments>(code, firstMonitorStub, pcOffset);
-    }
-
-    static ICCall_ScriptedApplyArguments *Clone(JSContext *, ICStubSpace *space,
+    static ICCall_ScriptedApplyArguments *Clone(ICStubSpace *space,
                                                 ICStub *firstMonitorStub,
                                                 ICCall_ScriptedApplyArguments &other);
 
@@ -6410,8 +5677,8 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCall_ScriptedApplyArguments::New(space, getStubCode(), firstMonitorStub_,
-                                                      pcOffset_);
+            return ICStub::New<ICCall_ScriptedApplyArguments>(space, getStubCode(), firstMonitorStub_,
+                                                              pcOffset_);
         }
     };
 };
@@ -6430,15 +5697,7 @@
     {}
 
   public:
-    static inline ICCall_ScriptedFunCall *New(ICStubSpace *space, JitCode *code,
-                                              ICStub *firstMonitorStub, uint32_t pcOffset)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_ScriptedFunCall>(code, firstMonitorStub, pcOffset);
-    }
-
-    static ICCall_ScriptedFunCall *Clone(JSContext *, ICStubSpace *space, ICStub *firstMonitorStub,
+    static ICCall_ScriptedFunCall *Clone(ICStubSpace *space, ICStub *firstMonitorStub,
                                          ICCall_ScriptedFunCall &other);
 
     static size_t offsetOfPCOffset() {
@@ -6464,8 +5723,8 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCall_ScriptedFunCall::New(space, getStubCode(), firstMonitorStub_,
-                                               pcOffset_);
+            return ICStub::New<ICCall_ScriptedFunCall>(space, getStubCode(), firstMonitorStub_,
+                                                       pcOffset_);
         }
     };
 };
@@ -6480,24 +5739,14 @@
     HeapPtrString expectedArg_;
     HeapPtrArrayObject templateObject_;
 
-    ICCall_StringSplit(JitCode *stubCode, ICStub *firstMonitorStub, uint32_t pcOffset, HandleString thisString,
-                       HandleString argString, HandleArrayObject templateObject)
+    ICCall_StringSplit(JitCode *stubCode, ICStub *firstMonitorStub, uint32_t pcOffset, JSString *thisString,
+                       JSString *argString, ArrayObject *templateObject)
       : ICMonitoredStub(ICStub::Call_StringSplit, stubCode, firstMonitorStub),
         pcOffset_(pcOffset), expectedThis_(thisString), expectedArg_(argString),
         templateObject_(templateObject)
     { }
 
   public:
-    static inline ICCall_StringSplit *New(ICStubSpace *space, JitCode *code,
-                                          ICStub *firstMonitorStub, uint32_t pcOffset, HandleString thisString,
-                                          HandleString argString, HandleArrayObject templateObject)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_StringSplit>(code, firstMonitorStub, pcOffset, thisString,
-                                                   argString, templateObject);
-    }
-
     static size_t offsetOfExpectedThis() {
         return offsetof(ICCall_StringSplit, expectedThis_);
     }
@@ -6548,9 +5797,9 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICCall_StringSplit::New(space, getStubCode(), firstMonitorStub_,
-                                           pcOffset_, expectedThis_, expectedArg_,
-                                           templateObject_);
+            return ICStub::New<ICCall_StringSplit>(space, getStubCode(), firstMonitorStub_,
+                                                   pcOffset_, expectedThis_, expectedArg_,
+                                                   templateObject_);
         }
    };
 };
@@ -6565,12 +5814,6 @@
     {}
 
   public:
-    static inline ICCall_IsSuspendedStarGenerator *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICCall_IsSuspendedStarGenerator>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -6580,7 +5823,7 @@
           : ICStubCompiler(cx, ICStub::Call_IsSuspendedStarGenerator)
         {}
         ICStub *getStub(ICStubSpace *space) {
-            return ICCall_IsSuspendedStarGenerator::New(space, getStubCode());
+            return ICStub::New<ICCall_IsSuspendedStarGenerator>(space, getStubCode());
         }
    };
 };
@@ -6604,13 +5847,6 @@
     {}
 
   public:
-    static inline ICTableSwitch *New(ICStubSpace *space, JitCode *code, void **table,
-                                     int32_t min, int32_t length, void *defaultTarget) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTableSwitch>(code, table, min, length, defaultTarget);
-    }
-
     void fixupJumpTable(JSScript *script, BaselineScript *baseline);
 
     class Compiler : public ICStubCompiler {
@@ -6637,12 +5873,6 @@
     { }
 
   public:
-    static inline ICIteratorNew_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICIteratorNew_Fallback>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -6653,7 +5883,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICIteratorNew_Fallback::New(space, getStubCode());
+            return ICStub::New<ICIteratorNew_Fallback>(space, getStubCode());
         }
     };
 };
@@ -6668,12 +5898,6 @@
     { }
 
   public:
-    static inline ICIteratorMore_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICIteratorMore_Fallback>(code);
-    }
-
     void setHasNonStringResult() {
         extra_ = 1;
     }
@@ -6692,7 +5916,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICIteratorMore_Fallback::New(space, getStubCode());
+            return ICStub::New<ICIteratorMore_Fallback>(space, getStubCode());
         }
     };
 };
@@ -6707,12 +5931,6 @@
     { }
 
   public:
-    static inline ICIteratorMore_Native *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICIteratorMore_Native>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -6723,7 +5941,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICIteratorMore_Native::New(space, getStubCode());
+            return ICStub::New<ICIteratorMore_Native>(space, getStubCode());
         }
     };
 };
@@ -6738,12 +5956,6 @@
     { }
 
   public:
-    static inline ICIteratorClose_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICIteratorClose_Fallback>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -6754,7 +5966,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICIteratorClose_Fallback::New(space, getStubCode());
+            return ICStub::New<ICIteratorClose_Fallback>(space, getStubCode());
         }
     };
 };
@@ -6774,12 +5986,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 4;
 
-    static inline ICInstanceOf_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICInstanceOf_Fallback>(code);
-    }
-
     void noteUnoptimizableAccess() {
         extra_ |= UNOPTIMIZABLE_ACCESS_BIT;
     }
@@ -6797,7 +6003,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICInstanceOf_Fallback::New(space, getStubCode());
+            return ICStub::New<ICInstanceOf_Fallback>(space, getStubCode());
         }
     };
 };
@@ -6813,14 +6019,6 @@
     ICInstanceOf_Function(JitCode *stubCode, Shape *shape, JSObject *prototypeObj, uint32_t slot);
 
   public:
-    static inline ICInstanceOf_Function *New(ICStubSpace *space, JitCode *code, Shape *shape,
-                                             JSObject *prototypeObj, uint32_t slot)
-    {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICInstanceOf_Function>(code, shape, prototypeObj, slot);
-    }
-
     HeapPtrShape &shape() {
         return shape_;
     }
@@ -6857,7 +6055,7 @@
         {}
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICInstanceOf_Function::New(space, getStubCode(), shape_, prototypeObj_, slot_);
+            return ICStub::New<ICInstanceOf_Function>(space, getStubCode(), shape_, prototypeObj_, slot_);
         }
     };
 };
@@ -6874,12 +6072,6 @@
     { }
 
   public:
-    static inline ICTypeOf_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeOf_Fallback>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -6890,7 +6082,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICTypeOf_Fallback::New(space, getStubCode());
+            return ICStub::New<ICTypeOf_Fallback>(space, getStubCode());
         }
     };
 };
@@ -6907,12 +6099,6 @@
     }
 
   public:
-    static inline ICTypeOf_Typed *New(ICStubSpace *space, JitCode *code, JSType type) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICTypeOf_Typed>(code, type);
-    }
-
     JSType type() const {
         return JSType(extra_);
     }
@@ -6935,7 +6121,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICTypeOf_Typed::New(space, getStubCode(), type_);
+            return ICStub::New<ICTypeOf_Typed>(space, getStubCode(), type_);
         }
     };
 };
@@ -6953,13 +6139,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICRest_Fallback *New(ICStubSpace *space, JitCode *code,
-                                       ArrayObject *templateObject) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICRest_Fallback>(code, templateObject);
-    }
-
     HeapPtrArrayObject &templateObject() {
         return templateObject_;
     }
@@ -6976,7 +6155,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICRest_Fallback::New(space, getStubCode(), templateObject);
+            return ICStub::New<ICRest_Fallback>(space, getStubCode(), templateObject);
         }
     };
 };
@@ -6993,12 +6172,6 @@
   public:
     static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 
-    static inline ICRetSub_Fallback *New(ICStubSpace *space, JitCode *code) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICRetSub_Fallback>(code);
-    }
-
     class Compiler : public ICStubCompiler {
       protected:
         bool generateStubCode(MacroAssembler &masm);
@@ -7009,7 +6182,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICRetSub_Fallback::New(space, getStubCode());
+            return ICStub::New<ICRetSub_Fallback>(space, getStubCode());
         }
     };
 };
@@ -7031,13 +6204,6 @@
     { }
 
   public:
-    static ICRetSub_Resume *New(ICStubSpace *space, JitCode *code, uint32_t pcOffset,
-                                uint8_t *addr) {
-        if (!code)
-            return nullptr;
-        return space->allocate<ICRetSub_Resume>(code, pcOffset, addr);
-    }
-
     static size_t offsetOfPCOffset() {
         return offsetof(ICRetSub_Resume, pcOffset_);
     }
@@ -7059,7 +6225,7 @@
         { }
 
         ICStub *getStub(ICStubSpace *space) {
-            return ICRetSub_Resume::New(space, getStubCode(), pcOffset_, addr_);
+            return ICStub::New<ICRetSub_Resume>(space, getStubCode(), pcOffset_, addr_);
         }
     };
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineInspector.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineInspector.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineInspector.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineInspector.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -79,16 +79,31 @@
     return false;
 }
 
+template <typename S, typename T>
+static bool
+VectorAppendNoDuplicate(S &list, T value)
+{
+    for (size_t i = 0; i < list.length(); i++) {
+        if (list[i] == value)
+            return true;
+    }
+    return list.append(value);
+}
+
 bool
 BaselineInspector::maybeInfoForPropertyOp(jsbytecode *pc,
                                           ShapeVector &nativeShapes,
-                                          ObjectGroupVector &unboxedGroups)
+                                          ObjectGroupVector &unboxedGroups,
+                                          ObjectGroupVector &convertUnboxedGroups)
 {
     // Return lists of native shapes and unboxed objects seen by the baseline
     // IC for the current op. Empty lists indicate no shapes/types are known,
-    // or there was an uncacheable access.
+    // or there was an uncacheable access. convertUnboxedGroups is used for
+    // unboxed object groups which have been seen, but have had instances
+    // converted to native objects and should be eagerly converted by Ion.
     MOZ_ASSERT(nativeShapes.empty());
     MOZ_ASSERT(unboxedGroups.empty());
+    MOZ_ASSERT(convertUnboxedGroups.empty());
 
     if (!hasBaselineScript())
         return true;
@@ -114,27 +129,18 @@
             return true;
         }
 
-        // Don't add the same shape/group twice (this can happen if there are
-        // multiple SetProp_Native stubs with different ObjectGroups).
+        if (group && group->unboxedLayout().nativeGroup()) {
+            if (!VectorAppendNoDuplicate(convertUnboxedGroups, group))
+                return false;
+            shape = group->unboxedLayout().nativeShape();
+            group = nullptr;
+        }
+
         if (shape) {
-            bool found = false;
-            for (size_t i = 0; i < nativeShapes.length(); i++) {
-                if (nativeShapes[i] == shape) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found && !nativeShapes.append(shape))
+            if (!VectorAppendNoDuplicate(nativeShapes, shape))
                 return false;
         } else {
-            bool found = false;
-            for (size_t i = 0; i < unboxedGroups.length(); i++) {
-                if (unboxedGroups[i] == group) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found && !unboxedGroups.append(group))
+            if (!VectorAppendNoDuplicate(unboxedGroups, group))
                 return false;
         }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineInspector.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineInspector.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineInspector.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineInspector.h	2015-02-28 15:03:05.000000000 +0000
@@ -96,7 +96,8 @@
     typedef Vector<ObjectGroup *, 4, JitAllocPolicy> ObjectGroupVector;
     bool maybeInfoForPropertyOp(jsbytecode *pc,
                                 ShapeVector &nativeShapes,
-                                ObjectGroupVector &unboxedGroups);
+                                ObjectGroupVector &unboxedGroups,
+                                ObjectGroupVector &convertUnboxedGroups);
 
     SetElemICInspector setElemICInspector(jsbytecode *pc) {
         return makeICInspector<SetElemICInspector>(pc, ICStub::SetElem_Fallback);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineJIT.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineJIT.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/BaselineJIT.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/BaselineJIT.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -172,7 +172,7 @@
     // Skip debug breakpoint/trap handler, the interpreter already handled it
     // for the current op.
     if (fp->isDebuggee()) {
-        MOZ_ASSERT(baseline->hasDebugInstrumentation());
+        MOZ_RELEASE_ASSERT(baseline->hasDebugInstrumentation());
         data.jitcode += MacroAssembler::ToggledCallSize(data.jitcode);
     }
 
@@ -294,6 +294,29 @@
    if (!CheckFrame(fp))
        return Method_CantCompile;
 
+   // This check is needed in the following corner case. Consider a function h,
+   //
+   //   function h(x) {
+   //      h(false);
+   //      if (!x)
+   //        return;
+   //      for (var i = 0; i < N; i++)
+   //         /* do stuff */
+   //   }
+   //
+   // Suppose h is not yet compiled in baseline and is executing in the
+   // interpreter. Let this interpreter frame be f_older. The debugger marks
+   // f_older as isDebuggee. At the point of the recursive call h(false), h is
+   // compiled in baseline without debug instrumentation, pushing a baseline
+   // frame f_newer. The debugger never flags f_newer as isDebuggee, and never
+   // recompiles h. When the recursive call returns and execution proceeds to
+   // the loop, the interpreter attempts to OSR into baseline. Since h is
+   // already compiled in baseline, execution jumps directly into baseline
+   // code. This is incorrect as h's baseline script does not have debug
+   // instrumentation.
+   if (fp->isDebuggee() && !Debugger::ensureExecutionObservabilityOfOsrFrame(cx, fp))
+       return Method_Error;
+
    RootedScript script(cx, fp->script());
    return CanEnterBaselineJIT(cx, script, fp);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/CodeGenerator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/CodeGenerator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/CodeGenerator.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/CodeGenerator.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -653,7 +653,7 @@
     // important here as these tests are extremely unlikely to be used in loop
     // backedges, so emit inline code for the patchable jump. Heap allocating
     // the label allows it to be used by out of line blocks.
-    Label *res = GetJitContext()->temp->lifoAlloc()->new_<Label>();
+    Label *res = alloc().lifoAlloc()->new_<Label>();
     Label after;
     masm.jump(&after);
     masm.bind(res);
@@ -3761,13 +3761,7 @@
         masm.jump(&ok);
 
         masm.bind(&miss);
-
-        // Type set guards might miss when an object's group changes and its
-        // properties become unknown, so check for this case.
-        masm.loadPtr(Address(output, JSObject::offsetOfGroup()), temp);
-        masm.branchTestPtr(Assembler::NonZero,
-                           Address(temp, ObjectGroup::offsetOfFlags()),
-                           Imm32(OBJECT_FLAG_UNKNOWN_PROPERTIES), &ok);
+        masm.guardTypeSetMightBeIncomplete(output, temp, &ok);
 
         masm.assumeUnreachable("MIR instruction returned object with unexpected type");
 
@@ -3839,15 +3833,12 @@
 
         masm.bind(&miss);
 
-        // Type set guards might miss when an object's group changes and its
-        // properties become unknown, so check for this case.
+        // Check for cases where the type set guard might have missed due to
+        // changing object groups.
         Label realMiss;
         masm.branchTestObject(Assembler::NotEqual, output, &realMiss);
         Register payload = masm.extractObject(output, temp1);
-        masm.loadPtr(Address(payload, JSObject::offsetOfGroup()), temp1);
-        masm.branchTestPtr(Assembler::NonZero,
-                           Address(temp1, ObjectGroup::offsetOfFlags()),
-                           Imm32(OBJECT_FLAG_UNKNOWN_PROPERTIES), &ok);
+        masm.guardTypeSetMightBeIncomplete(payload, temp1, &ok);
         masm.bind(&realMiss);
 
         masm.assumeUnreachable("MIR instruction returned value with unexpected type");
@@ -4391,12 +4382,14 @@
     gc::InitialHeap initialHeap = lir->mir()->initialHeap();
     MIRType type = lir->mir()->input()->type();
 
-    // :TODO: We cannot spill SIMD registers (Bug 1112164) from safepoints, thus
-    // we cannot use the same oolCallVM as visitNewTypedObject for allocating
-    // SIMD Typed Objects if we are at the end of the nursery. (Bug 1119303)
-    Label bail;
-    masm.createGCObject(object, temp, templateObject, initialHeap, &bail);
-    bailoutFrom(&bail, lir->snapshot());
+    MOZ_ASSERT(lir->safepoint()->liveRegs().has(in),
+               "Save the input register across the oolCallVM");
+    OutOfLineCode *ool = oolCallVM(NewTypedObjectInfo, lir,
+                                   (ArgList(), ImmGCPtr(templateObject), Imm32(initialHeap)),
+                                   StoreRegisterTo(object));
+
+    masm.createGCObject(object, temp, templateObject, initialHeap, ool->entry());
+    masm.bind(ool->rejoin());
 
     Address objectData(object, InlineTypedObject::offsetOfDataStart());
     switch (type) {
@@ -4635,15 +4628,15 @@
 }
 
 typedef bool(*InitPropFn)(JSContext *cx, HandleNativeObject obj,
-                          HandlePropertyName name, HandleValue value);
-static const VMFunction InitPropInfo =
-    FunctionInfo<InitPropFn>(InitProp);
+                          HandlePropertyName name, HandleValue value, jsbytecode *pc);
+static const VMFunction InitPropInfo = FunctionInfo<InitPropFn>(InitProp);
 
 void
 CodeGenerator::visitInitProp(LInitProp *lir)
 {
     Register objReg = ToRegister(lir->getObject());
 
+    pushArg(ImmPtr(lir->mir()->resumePoint()->pc()));
     pushArg(ToValue(lir, LInitProp::ValueIndex));
     pushArg(ImmGCPtr(lir->mir()->propertyName()));
     pushArg(objReg);
@@ -6638,6 +6631,23 @@
     }
 }
 
+typedef bool (*ConvertUnboxedObjectToNativeFn)(JSContext *, JSObject *);
+static const VMFunction ConvertUnboxedObjectToNativeInfo =
+    FunctionInfo<ConvertUnboxedObjectToNativeFn>(UnboxedPlainObject::convertToNative);
+
+void
+CodeGenerator::visitConvertUnboxedObjectToNative(LConvertUnboxedObjectToNative *lir)
+{
+    Register object = ToRegister(lir->getOperand(0));
+
+    OutOfLineCode *ool = oolCallVM(ConvertUnboxedObjectToNativeInfo, lir,
+                                   (ArgList(), object), StoreNothing());
+
+    masm.branchPtr(Assembler::Equal, Address(object, JSObject::offsetOfGroup()),
+                   ImmGCPtr(lir->mir()->group()), ool->entry());
+    masm.bind(ool->rejoin());
+}
+
 typedef bool (*ArrayPopShiftFn)(JSContext *, HandleObject, MutableHandleValue);
 static const VMFunction ArrayPopDenseInfo = FunctionInfo<ArrayPopShiftFn>(jit::ArrayPopDense);
 static const VMFunction ArrayShiftDenseInfo = FunctionInfo<ArrayPopShiftFn>(jit::ArrayShiftDense);
@@ -7480,7 +7490,7 @@
     } else {
         // Add a dumy jitcodeGlobalTable entry.
         JitcodeGlobalEntry::DummyEntry entry;
-        entry.init(code->raw(), code->rawEnd());
+        entry.init(code, code->raw(), code->rawEnd());
 
         // Add entry to the global table.
         JitcodeGlobalTable *globalTable = cx->runtime()->jitRuntime()->getJitcodeGlobalTable();
@@ -7789,7 +7799,7 @@
     addCache(ins, allocateCache(cache));
 }
 
-typedef bool (*NameICFn)(JSContext *, size_t, HandleObject, MutableHandleValue);
+typedef bool (*NameICFn)(JSContext *, HandleScript, size_t, HandleObject, MutableHandleValue);
 const VMFunction NameIC::UpdateInfo = FunctionInfo<NameICFn>(NameIC::update);
 
 void
@@ -7800,6 +7810,7 @@
 
     pushArg(ic->scopeChainReg());
     pushArg(Imm32(ool->getCacheIndex()));
+    pushArg(ImmGCPtr(gen->info().script()));
     callVM(NameIC::UpdateInfo, lir);
     StoreValueTo(ic->outputReg()).generate(this);
     restoreLiveIgnore(lir, StoreValueTo(ic->outputReg()).clobbered());
@@ -7866,9 +7877,9 @@
                         ins->mir()->profilerLeavePc());
 }
 
-typedef bool (*GetPropertyICFn)(JSContext *, size_t, HandleObject, MutableHandleValue);
-const VMFunction GetPropertyIC::UpdateInfo =
-    FunctionInfo<GetPropertyICFn>(GetPropertyIC::update);
+typedef bool (*GetPropertyICFn)(JSContext *, HandleScript, size_t, HandleObject,
+                                MutableHandleValue);
+const VMFunction GetPropertyIC::UpdateInfo = FunctionInfo<GetPropertyICFn>(GetPropertyIC::update);
 
 void
 CodeGenerator::visitGetPropertyIC(OutOfLineUpdateCache *ool, DataPtr<GetPropertyIC> &ic)
@@ -7886,6 +7897,7 @@
 
     pushArg(ic->object());
     pushArg(Imm32(ool->getCacheIndex()));
+    pushArg(ImmGCPtr(gen->info().script()));
     callVM(GetPropertyIC::UpdateInfo, lir);
     StoreValueTo(ic->output()).generate(this);
     restoreLiveIgnore(lir, StoreValueTo(ic->output()).clobbered());
@@ -7928,9 +7940,9 @@
                        mir->allowDoubleResult(), mir->profilerLeavePc());
 }
 
-typedef bool (*GetElementICFn)(JSContext *, size_t, HandleObject, HandleValue, MutableHandleValue);
-const VMFunction GetElementIC::UpdateInfo =
-    FunctionInfo<GetElementICFn>(GetElementIC::update);
+typedef bool (*GetElementICFn)(JSContext *, HandleScript, size_t, HandleObject, HandleValue,
+                               MutableHandleValue);
+const VMFunction GetElementIC::UpdateInfo = FunctionInfo<GetElementICFn>(GetElementIC::update);
 
 void
 CodeGenerator::visitGetElementIC(OutOfLineUpdateCache *ool, DataPtr<GetElementIC> &ic)
@@ -7941,6 +7953,7 @@
     pushArg(ic->index());
     pushArg(ic->object());
     pushArg(Imm32(ool->getCacheIndex()));
+    pushArg(ImmGCPtr(gen->info().script()));
     callVM(GetElementIC::UpdateInfo, lir);
     StoreValueTo(ic->output()).generate(this);
     restoreLiveIgnore(lir, StoreValueTo(ic->output()).clobbered());
@@ -7985,9 +7998,9 @@
                        ins->mir()->profilerLeavePc());
 }
 
-typedef bool (*SetElementICFn)(JSContext *, size_t, HandleObject, HandleValue, HandleValue);
-const VMFunction SetElementIC::UpdateInfo =
-    FunctionInfo<SetElementICFn>(SetElementIC::update);
+typedef bool (*SetElementICFn)(JSContext *, HandleScript, size_t, HandleObject, HandleValue,
+                               HandleValue);
+const VMFunction SetElementIC::UpdateInfo = FunctionInfo<SetElementICFn>(SetElementIC::update);
 
 void
 CodeGenerator::visitSetElementIC(OutOfLineUpdateCache *ool, DataPtr<SetElementIC> &ic)
@@ -7999,6 +8012,7 @@
     pushArg(ic->index());
     pushArg(ic->object());
     pushArg(Imm32(ool->getCacheIndex()));
+    pushArg(ImmGCPtr(gen->info().script()));
     callVM(SetElementIC::UpdateInfo, lir);
     restoreLive(lir);
 
@@ -8016,9 +8030,8 @@
     addCache(ins, allocateCache(cache));
 }
 
-typedef JSObject *(*BindNameICFn)(JSContext *, size_t, HandleObject);
-const VMFunction BindNameIC::UpdateInfo =
-    FunctionInfo<BindNameICFn>(BindNameIC::update);
+typedef JSObject *(*BindNameICFn)(JSContext *, HandleScript, size_t, HandleObject);
+const VMFunction BindNameIC::UpdateInfo = FunctionInfo<BindNameICFn>(BindNameIC::update);
 
 void
 CodeGenerator::visitBindNameIC(OutOfLineUpdateCache *ool, DataPtr<BindNameIC> &ic)
@@ -8028,6 +8041,7 @@
 
     pushArg(ic->scopeChainReg());
     pushArg(Imm32(ool->getCacheIndex()));
+    pushArg(ImmGCPtr(gen->info().script()));
     callVM(BindNameIC::UpdateInfo, lir);
     StoreRegisterTo(ic->outputReg()).generate(this);
     restoreLiveIgnore(lir, StoreRegisterTo(ic->outputReg()).clobbered());
@@ -8121,9 +8135,8 @@
                         ins->mir()->profilerLeavePc());
 }
 
-typedef bool (*SetPropertyICFn)(JSContext *, size_t, HandleObject, HandleValue);
-const VMFunction SetPropertyIC::UpdateInfo =
-    FunctionInfo<SetPropertyICFn>(SetPropertyIC::update);
+typedef bool (*SetPropertyICFn)(JSContext *, HandleScript, size_t, HandleObject, HandleValue);
+const VMFunction SetPropertyIC::UpdateInfo = FunctionInfo<SetPropertyICFn>(SetPropertyIC::update);
 
 void
 CodeGenerator::visitSetPropertyIC(OutOfLineUpdateCache *ool, DataPtr<SetPropertyIC> &ic)
@@ -8134,6 +8147,7 @@
     pushArg(ic->value());
     pushArg(ic->object());
     pushArg(Imm32(ool->getCacheIndex()));
+    pushArg(ImmGCPtr(gen->info().script()));
     callVM(SetPropertyIC::UpdateInfo, lir);
     restoreLive(lir);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/CodeGenerator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/CodeGenerator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/CodeGenerator.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/CodeGenerator.h	2015-02-28 15:03:05.000000000 +0000
@@ -251,6 +251,7 @@
     void visitStoreElementHoleT(LStoreElementHoleT *lir);
     void visitStoreElementHoleV(LStoreElementHoleV *lir);
     void visitStoreUnboxedPointer(LStoreUnboxedPointer *lir);
+    void visitConvertUnboxedObjectToNative(LConvertUnboxedObjectToNative *lir);
     void emitArrayPopShift(LInstruction *lir, const MArrayPopShift *mir, Register obj,
                            Register elementsTemp, Register lengthTemp, TypedOrValueRegister out);
     void visitArrayPopShiftV(LArrayPopShiftV *lir);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Disassembler.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Disassembler.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Disassembler.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Disassembler.h	2015-02-28 15:03:05.000000000 +0000
@@ -17,8 +17,8 @@
 
 class ComplexAddress {
     int32_t disp_;
-    Register::Code base_ : 8;
-    Register::Code index_ : 8;
+    Register::Encoding base_ : 8;
+    Register::Encoding index_ : 8;
     int8_t scale_; // log2 encoding
     bool isPCRelative_;
 
@@ -33,7 +33,7 @@
         MOZ_ASSERT(*this == *this);
     }
 
-    ComplexAddress(int32_t disp, Register::Code base)
+    ComplexAddress(int32_t disp, Register::Encoding base)
       : disp_(disp),
         base_(base),
         index_(Registers::Invalid),
@@ -45,7 +45,7 @@
         MOZ_ASSERT(base_ == base);
     }
 
-    ComplexAddress(int32_t disp, Register::Code base, Register::Code index, int scale)
+    ComplexAddress(int32_t disp, Register::Encoding base, Register::Encoding index, int scale)
       : disp_(disp),
         base_(base),
         index_(index),
@@ -97,11 +97,11 @@
         return disp_;
     }
 
-    Register::Code base() const {
+    Register::Encoding base() const {
         return base_;
     }
 
-    Register::Code index() const {
+    Register::Encoding index() const {
         return index_;
     }
 
@@ -128,8 +128,8 @@
     Kind kind_;
     union {
         int32_t imm;
-        Register::Code gpr;
-        FloatRegister::Code fpr;
+        Register::Encoding gpr;
+        FloatRegister::Encoding fpr;
     } u_;
 
   public:
@@ -147,14 +147,14 @@
         MOZ_ASSERT(*this == *this);
     }
 
-    explicit OtherOperand(Register::Code gpr)
+    explicit OtherOperand(Register::Encoding gpr)
       : kind_(GPR)
     {
         u_.gpr = gpr;
         MOZ_ASSERT(*this == *this);
     }
 
-    explicit OtherOperand(FloatRegister::Code fpr)
+    explicit OtherOperand(FloatRegister::Encoding fpr)
       : kind_(FPR)
     {
         u_.fpr = fpr;
@@ -170,12 +170,12 @@
         return u_.imm;
     }
 
-    Register::Code gpr() const {
+    Register::Encoding gpr() const {
         MOZ_ASSERT(kind_ == GPR);
         return u_.gpr;
     }
 
-    FloatRegister::Code fpr() const {
+    FloatRegister::Encoding fpr() const {
         MOZ_ASSERT(kind_ == FPR);
         return u_.fpr;
     }
@@ -257,7 +257,6 @@
     MOZ_ASSERT(e == end);
     MOZ_ASSERT(disassembled == expected);
 }
-
 #endif
 
 } // namespace Disassembler
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/EffectiveAddressAnalysis.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -89,6 +89,68 @@
     last->block()->insertAfter(last, eaddr);
 }
 
+static bool
+IsAlignmentMask(uint32_t m)
+{
+    // Test whether m is just leading ones and trailing zeros.
+    return (-m & ~m) == 0;
+}
+
+template<typename MAsmJSHeapAccessType>
+static void
+AnalyzeAsmHeapAccess(MAsmJSHeapAccessType *ins, MIRGraph &graph)
+{
+    MDefinition *ptr = ins->ptr();
+
+    if (ptr->isConstantValue()) {
+        // Look for heap[i] where i is a constant offset, and fold the offset.
+        // By doing the folding now, we simplify the task of codegen; the offset
+        // is always the address mode immediate. This also allows it to avoid
+        // 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));
+            ins->block()->insertBefore(ins, zero);
+            ins->replacePtr(zero);
+        }
+    } else if (ptr->isAdd()) {
+        // Look for heap[a+i] where i is a constant offset, and fold the offset.
+        MDefinition *op0 = ptr->toAdd()->getOperand(0);
+        MDefinition *op1 = ptr->toAdd()->getOperand(1);
+        if (op0->isConstantValue())
+            mozilla::Swap(op0, op1);
+        if (op1->isConstantValue()) {
+            int32_t imm = op1->constantValue().toInt32();
+            if (ins->tryAddDisplacement(imm))
+                ins->replacePtr(op0);
+        }
+    } else if (ptr->isBitAnd() && ptr->hasOneUse()) {
+        // Transform heap[(a+i)&m] to heap[(a&m)+i] so that we can fold i into
+        // the access. Since we currently just mutate the BitAnd in place, this
+        // requires that we are its only user.
+        MDefinition *lhs = ptr->toBitAnd()->getOperand(0);
+        MDefinition *rhs = ptr->toBitAnd()->getOperand(1);
+        int lhsIndex = 0;
+        if (lhs->isConstantValue()) {
+            mozilla::Swap(lhs, rhs);
+            lhsIndex = 1;
+        }
+        if (lhs->isAdd() && rhs->isConstantValue()) {
+            MDefinition *op0 = lhs->toAdd()->getOperand(0);
+            MDefinition *op1 = lhs->toAdd()->getOperand(1);
+            if (op0->isConstantValue())
+                mozilla::Swap(op0, op1);
+            if (op1->isConstantValue()) {
+                uint32_t i = op1->constantValue().toInt32();
+                uint32_t m = rhs->constantValue().toInt32();
+                if (IsAlignmentMask(m) && ((i & m) == i) && ins->tryAddDisplacement(i))
+                    ptr->toBitAnd()->replaceOperand(lhsIndex, op0);
+            }
+        }
+    }
+}
+
 // This analysis converts patterns of the form:
 //   truncate(x + (y << {0,1,2,3}))
 //   truncate(x + (y << {0,1,2,3}) + imm32)
@@ -108,8 +170,15 @@
 {
     for (ReversePostorderIterator block(graph_.rpoBegin()); block != graph_.rpoEnd(); block++) {
         for (MInstructionIterator i = block->begin(); i != block->end(); i++) {
+            // Note that we don't check for MAsmJSCompareExchangeHeap
+            // or MAsmJSAtomicBinopHeap, because the backend and the OOB
+            // mechanism don't support non-zero offsets for them yet.
             if (i->isLsh())
                 AnalyzeLsh(graph_.alloc(), i->toLsh());
+            else if (i->isAsmJSLoadHeap())
+                AnalyzeAsmHeapAccess(i->toAsmJSLoadHeap(), graph_);
+            else if (i->isAsmJSStoreHeap())
+                AnalyzeAsmHeapAccess(i->toAsmJSStoreHeap(), graph_);
         }
     }
     return true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/ExecutableAllocator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/ExecutableAllocator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/ExecutableAllocator.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/ExecutableAllocator.h	2015-02-28 15:03:05.000000000 +0000
@@ -33,6 +33,7 @@
 
 #include "jit/arm/Simulator-arm.h"
 #include "jit/mips/Simulator-mips.h"
+#include "js/GCAPI.h"
 #include "js/HashTable.h"
 #include "js/Vector.h"
 
@@ -250,8 +251,11 @@
 
     void releasePoolPages(ExecutablePool *pool) {
         MOZ_ASSERT(pool->m_allocation.pages);
-        if (destroyCallback)
+        if (destroyCallback) {
+            // Do not allow GC during the page release callback.
+            JS::AutoSuppressGCAnalysis nogc;
             destroyCallback(pool->m_allocation.pages, pool->m_allocation.size);
+        }
         systemRelease(pool->m_allocation);
         MOZ_ASSERT(m_pools.initialized());
         m_pools.remove(m_pools.lookup(pool));   // this asserts if |pool| is not in m_pools
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonAnalysis.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonAnalysis.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonAnalysis.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonAnalysis.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -94,37 +94,50 @@
     return true;
 }
 
-// Determine whether a block simply computes a phi and performs a test on it.
+// Determine whether phiBlock/testBlock simply compute a phi and perform a
+// test on it.
 static bool
-BlockIsSingleTest(MBasicBlock *block, MPhi **pphi, MTest **ptest)
+BlockIsSingleTest(MBasicBlock *phiBlock, MBasicBlock *testBlock, MPhi **pphi, MTest **ptest)
 {
     *pphi = nullptr;
     *ptest = nullptr;
 
-    MInstruction *ins = *block->begin();
+    if (phiBlock != testBlock) {
+        MOZ_ASSERT(phiBlock->numSuccessors() == 1 && phiBlock->getSuccessor(0) == testBlock);
+        if (!phiBlock->begin()->isGoto())
+            return false;
+    }
+
+    MInstruction *ins = *testBlock->begin();
     if (!ins->isTest())
         return false;
     MTest *test = ins->toTest();
     if (!test->input()->isPhi())
         return false;
     MPhi *phi = test->input()->toPhi();
-    if (phi->block() != block)
+    if (phi->block() != phiBlock)
         return false;
 
     for (MUseIterator iter = phi->usesBegin(); iter != phi->usesEnd(); ++iter) {
         MUse *use = *iter;
         if (use->consumer() == test)
             continue;
-        if (use->consumer()->isResumePoint() && use->consumer()->block() == block)
-            continue;
+        if (use->consumer()->isResumePoint()) {
+            MBasicBlock *useBlock = use->consumer()->block();
+            if (useBlock == phiBlock || useBlock == testBlock)
+                continue;
+        }
         return false;
     }
 
-    for (MPhiIterator iter = block->phisBegin(); iter != block->phisEnd(); ++iter) {
+    for (MPhiIterator iter = phiBlock->phisBegin(); iter != phiBlock->phisEnd(); ++iter) {
         if (*iter != phi)
             return false;
     }
 
+    if (phiBlock != testBlock && !testBlock->phisEmpty())
+        return false;
+
     *pphi = phi;
     *ptest = test;
 
@@ -191,10 +204,14 @@
      *          /     \
      *  trueBranch  falseBranch
      *          \     /
+     *          phiBlock
+     *             |
      *         testBlock
      *
-     * Where testBlock contains only a test on a phi combining two values
-     * pushed onto the stack by trueBranch and falseBranch.
+     * Where phiBlock contains a single phi combining values pushed onto the
+     * stack by trueBranch and falseBranch, and testBlock contains a test on
+     * that phi. phiBlock and testBlock may be the same block; generated code
+     * will use different blocks if the (?:) op is in an inlined function.
      */
 
     MInstruction *ins = initialBlock->lastIns();
@@ -208,49 +225,40 @@
     MBasicBlock *falseBranch = initialTest->ifFalse();
     if (falseBranch->numPredecessors() != 1 || falseBranch->numSuccessors() != 1)
         return;
-    MBasicBlock *testBlock = trueBranch->getSuccessor(0);
-    if (testBlock != falseBranch->getSuccessor(0))
+    MBasicBlock *phiBlock = trueBranch->getSuccessor(0);
+    if (phiBlock != falseBranch->getSuccessor(0))
         return;
-    if (testBlock->numPredecessors() != 2)
+    if (phiBlock->numPredecessors() != 2)
         return;
 
     if (initialBlock->isLoopBackedge() || trueBranch->isLoopBackedge() || falseBranch->isLoopBackedge())
         return;
 
+    MBasicBlock *testBlock = phiBlock;
+    if (testBlock->numSuccessors() == 1) {
+        if (testBlock->isLoopBackedge())
+            return;
+        testBlock = testBlock->getSuccessor(0);
+        if (testBlock->numPredecessors() != 1)
+            return;
+    }
+
     // Make sure the test block does not have any outgoing loop backedges.
     if (!SplitCriticalEdgesForBlock(graph, testBlock))
         CrashAtUnhandlableOOM("MaybeFoldConditionBlock");
 
     MPhi *phi;
     MTest *finalTest;
-    if (!BlockIsSingleTest(testBlock, &phi, &finalTest))
-        return;
-
-    if (&testBlock->info() != &initialBlock->info() ||
-        &trueBranch->info() != &initialBlock->info() ||
-        &falseBranch->info() != &initialBlock->info())
-    {
-        return;
-    }
-
-    MDefinition *trueResult = phi->getOperand(testBlock->indexForPredecessor(trueBranch));
-    MDefinition *falseResult = phi->getOperand(testBlock->indexForPredecessor(falseBranch));
-
-    if (trueBranch->stackDepth() != falseBranch->stackDepth())
-        return;
-
-    if (trueBranch->stackDepth() != testBlock->stackDepth() + 1)
+    if (!BlockIsSingleTest(phiBlock, testBlock, &phi, &finalTest))
         return;
 
-    if (trueResult != trueBranch->peek(-1) || falseResult != falseBranch->peek(-1))
-        return;
+    MDefinition *trueResult = phi->getOperand(phiBlock->indexForPredecessor(trueBranch));
+    MDefinition *falseResult = phi->getOperand(phiBlock->indexForPredecessor(falseBranch));
 
     // OK, we found the desired pattern, now transform the graph.
 
-    // Remove the phi and its inputs from testBlock.
-    testBlock->discardPhi(*testBlock->phisBegin());
-    trueBranch->pop();
-    falseBranch->pop();
+    // Remove the phi from phiBlock.
+    phiBlock->discardPhi(*phiBlock->phisBegin());
 
     // If either trueBranch or falseBranch just computes a constant for the
     // test, determine the block that branch will end up jumping to and eliminate
@@ -262,7 +270,7 @@
         trueTarget = trueResult->constantToBoolean()
                      ? finalTest->ifTrue()
                      : finalTest->ifFalse();
-        testBlock->removePredecessor(trueBranch);
+        phiBlock->removePredecessor(trueBranch);
         graph.removeBlock(trueBranch);
     } else {
         UpdateTestSuccessors(graph.alloc(), trueBranch, trueResult,
@@ -274,7 +282,7 @@
         falseTarget = falseResult->constantToBoolean()
                       ? finalTest->ifTrue()
                       : finalTest->ifFalse();
-        testBlock->removePredecessor(falseBranch);
+        phiBlock->removePredecessor(falseBranch);
         graph.removeBlock(falseBranch);
     } else {
         UpdateTestSuccessors(graph.alloc(), falseBranch, falseResult,
@@ -285,6 +293,12 @@
     UpdateTestSuccessors(graph.alloc(), initialBlock, initialTest->input(),
                          trueTarget, falseTarget, testBlock);
 
+    // Remove phiBlock, if different from testBlock.
+    if (phiBlock != testBlock) {
+        testBlock->removePredecessor(phiBlock);
+        graph.removeBlock(phiBlock);
+    }
+
     // Remove testBlock itself.
     finalTest->ifTrue()->removePredecessor(testBlock);
     finalTest->ifFalse()->removePredecessor(testBlock);
@@ -307,10 +321,14 @@
     //         /     |
     // branchBlock   |
     //         \     |
+    //         phiBlock
+    //            |
     //        testBlock
     //
-    // Where testBlock contains only a test on a phi combining two values
-    // pushed onto the stack by initialBlock and branchBlock.
+    // Where phiBlock contains a single phi combining values pushed onto the
+    // stack by initialBlock and testBlock, and testBlock contains a test on
+    // that phi. phiBlock and testBlock may be the same block; generated code
+    // will use different blocks if the &&/|| is in an inlined function.
 
     MInstruction *ins = initialBlock->lastIns();
     if (!ins->isTest())
@@ -319,51 +337,46 @@
 
     bool branchIsTrue = true;
     MBasicBlock *branchBlock = initialTest->ifTrue();
-    MBasicBlock *testBlock = initialTest->ifFalse();
-    if (branchBlock->numSuccessors() != 1 || branchBlock->getSuccessor(0) != testBlock) {
+    MBasicBlock *phiBlock = initialTest->ifFalse();
+    if (branchBlock->numSuccessors() != 1 || branchBlock->getSuccessor(0) != phiBlock) {
         branchIsTrue = false;
         branchBlock = initialTest->ifFalse();
-        testBlock = initialTest->ifTrue();
+        phiBlock = initialTest->ifTrue();
     }
 
-    if (branchBlock->numSuccessors() != 1 || branchBlock->getSuccessor(0) != testBlock)
+    if (branchBlock->numSuccessors() != 1 || branchBlock->getSuccessor(0) != phiBlock)
         return;
-    if (branchBlock->numPredecessors() != 1 || testBlock->numPredecessors() != 2)
+    if (branchBlock->numPredecessors() != 1 || phiBlock->numPredecessors() != 2)
         return;
 
     if (initialBlock->isLoopBackedge() || branchBlock->isLoopBackedge())
         return;
 
+    MBasicBlock *testBlock = phiBlock;
+    if (testBlock->numSuccessors() == 1) {
+        if (testBlock->isLoopBackedge())
+            return;
+        testBlock = testBlock->getSuccessor(0);
+        if (testBlock->numPredecessors() != 1)
+            return;
+    }
+
     // Make sure the test block does not have any outgoing loop backedges.
     if (!SplitCriticalEdgesForBlock(graph, testBlock))
         CrashAtUnhandlableOOM("MaybeFoldAndOrBlock");
 
     MPhi *phi;
     MTest *finalTest;
-    if (!BlockIsSingleTest(testBlock, &phi, &finalTest))
+    if (!BlockIsSingleTest(phiBlock, testBlock, &phi, &finalTest))
         return;
 
-    if (&testBlock->info() != &initialBlock->info() || &branchBlock->info() != &initialBlock->info())
-        return;
-
-    MDefinition *branchResult = phi->getOperand(testBlock->indexForPredecessor(branchBlock));
-    MDefinition *initialResult = phi->getOperand(testBlock->indexForPredecessor(initialBlock));
-
-    if (branchBlock->stackDepth() != initialBlock->stackDepth())
-        return;
-
-    if (branchBlock->stackDepth() != testBlock->stackDepth() + 1)
-        return;
-
-    if (branchResult != branchBlock->peek(-1) || initialResult != initialBlock->peek(-1))
-        return;
+    MDefinition *branchResult = phi->getOperand(phiBlock->indexForPredecessor(branchBlock));
+    MDefinition *initialResult = phi->getOperand(phiBlock->indexForPredecessor(initialBlock));
 
     // OK, we found the desired pattern, now transform the graph.
 
-    // Remove the phi and its inputs from testBlock.
-    testBlock->discardPhi(*testBlock->phisBegin());
-    branchBlock->pop();
-    initialBlock->pop();
+    // Remove the phi from phiBlock.
+    phiBlock->discardPhi(*phiBlock->phisBegin());
 
     // Change the end of the initial and branch blocks to a test that jumps
     // directly to successors of testBlock, rather than to testBlock itself.
@@ -376,6 +389,12 @@
     UpdateTestSuccessors(graph.alloc(), branchBlock, branchResult,
                          finalTest->ifTrue(), finalTest->ifFalse(), testBlock);
 
+    // Remove phiBlock, if different from testBlock.
+    if (phiBlock != testBlock) {
+        testBlock->removePredecessor(phiBlock);
+        graph.removeBlock(phiBlock);
+    }
+
     // Remove testBlock itself.
     finalTest->ifTrue()->removePredecessor(testBlock);
     finalTest->ifFalse()->removePredecessor(testBlock);
@@ -2053,6 +2072,8 @@
       case MIRType_MagicOptimizedOut:
       case MIRType_MagicUninitializedLexical:
       case MIRType_Value:
+      case MIRType_Float32x4:
+      case MIRType_Int32x4:
         return true;
 
       case MIRType_MagicHole:
@@ -2064,9 +2085,7 @@
       case MIRType_Pointer:
       case MIRType_Shape:
       case MIRType_ObjectGroup:
-      case MIRType_Float32x4:
-      case MIRType_Int32x4:
-      case MIRType_Doublex2:
+      case MIRType_Doublex2: // NYI, see also RSimdBox::recover
         return false;
     }
     MOZ_CRASH("Unknown MIRType.");
@@ -2608,6 +2627,8 @@
         return def->toConvertElementsToDoubles()->elements();
     if (def->isMaybeCopyElementsForWrite())
         return def->toMaybeCopyElementsForWrite()->object();
+    if (def->isConvertUnboxedObjectToNative())
+        return def->toConvertUnboxedObjectToNative()->object();
     return nullptr;
 }
 
@@ -3167,7 +3188,7 @@
 
     CompilerConstraintList *constraints = NewCompilerConstraintList(temp);
     if (!constraints) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonBuilder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonBuilder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonBuilder.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonBuilder.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -417,6 +417,25 @@
         return DontInline(nullptr, "Non-interpreted target");
     }
 
+    if (info().analysisMode() != Analysis_DefiniteProperties) {
+        // If |this| or an argument has an empty resultTypeSet, don't bother
+        // inlining, as the call is currently unreachable due to incomplete type
+        // information. This does not apply to the definite properties analysis,
+        // in that case we want to inline anyway.
+
+        if (callInfo.thisArg()->emptyResultTypeSet()) {
+            trackOptimizationOutcome(TrackedOutcome::CantInlineUnreachable);
+            return DontInline(nullptr, "Empty TypeSet for |this|");
+        }
+
+        for (size_t i = 0; i < callInfo.argc(); i++) {
+            if (callInfo.getArg(i)->emptyResultTypeSet()) {
+                trackOptimizationOutcome(TrackedOutcome::CantInlineUnreachable);
+                return DontInline(nullptr, "Empty TypeSet for argument");
+            }
+        }
+    }
+
     // Allow constructing lazy scripts when performing the definite properties
     // analysis, as baseline has not been used to warm the caller up yet.
     if (target->isInterpreted() && info().analysisMode() == Analysis_DefiniteProperties) {
@@ -1730,6 +1749,8 @@
         return jsop_initelem_array();
 
       case JSOP_INITPROP:
+      case JSOP_INITLOCKEDPROP:
+      case JSOP_INITHIDDENPROP:
       {
         PropertyName *name = info().getAtom(pc)->asPropertyName();
         return jsop_initprop(name);
@@ -4432,7 +4453,7 @@
     callInfo.pushFormals(current);
 
     MResumePoint *outerResumePoint =
-        MResumePoint::New(alloc(), current, pc, callerResumePoint_, MResumePoint::Outer);
+        MResumePoint::New(alloc(), current, pc, MResumePoint::Outer);
     if (!outerResumePoint)
         return false;
     current->setOuterResumePoint(outerResumePoint);
@@ -5089,7 +5110,7 @@
 
     // Capture stack prior to the call operation. This captures the function.
     MResumePoint *preCallResumePoint =
-        MResumePoint::New(alloc(), dispatchBlock, pc, callerResumePoint_, MResumePoint::ResumeAt);
+        MResumePoint::New(alloc(), dispatchBlock, pc, MResumePoint::ResumeAt);
     if (!preCallResumePoint)
         return false;
 
@@ -5638,7 +5659,7 @@
     // If |Function.prototype.call| may be overridden, don't optimize callsite.
     TemporaryTypeSet *calleeTypes = current->peek(calleeDepth)->resultTypeSet();
     JSFunction *native = getSingleCallTarget(calleeTypes);
-    if (!native || !native->isNative() || native->native() != &js_fun_call) {
+    if (!native || !native->isNative() || native->native() != &fun_call) {
         CallInfo callInfo(alloc(), false);
         if (!callInfo.init(current, argc))
             return false;
@@ -5721,7 +5742,7 @@
     }
 
     if ((!native || !native->isNative() ||
-        native->native() != js_fun_apply) &&
+        native->native() != fun_apply) &&
         info().analysisMode() != Analysis_DefiniteProperties)
     {
         return abort("fun.apply speculation failed");
@@ -6381,7 +6402,7 @@
 
     bool useSlowPath = false;
 
-    if (obj->isUnknownValue()) {
+    if (obj->isUnknownValue() || obj->isLambda()) {
         useSlowPath = true;
     } else {
         templateObject = obj->toNewObject()->templateObject();
@@ -6771,7 +6792,7 @@
 {
     MOZ_ASSERT(ins->isEffectful() || !ins->isMovable());
 
-    MResumePoint *resumePoint = MResumePoint::New(alloc(), ins->block(), pc, callerResumePoint_,
+    MResumePoint *resumePoint = MResumePoint::New(alloc(), ins->block(), pc,
                                                   mode);
     if (!resumePoint)
         return false;
@@ -7112,6 +7133,10 @@
 
       default: {
         if (def->type() != MIRType_Value) {
+            if (def->type() == MIRType_Int32 && definiteType == MIRType_Double) {
+                replace = MToDouble::New(alloc(), def);
+                break;
+            }
             MOZ_ASSERT(def->type() == definiteType);
             return def;
         }
@@ -9186,7 +9211,8 @@
 }
 
 uint32_t
-IonBuilder::getDefiniteSlot(TemporaryTypeSet *types, PropertyName *name)
+IonBuilder::getDefiniteSlot(TemporaryTypeSet *types, PropertyName *name, uint32_t *pnfixed,
+                            BaselineInspector::ObjectGroupVector &convertUnboxedGroups)
 {
     if (!types || types->unknownObject()) {
         trackOptimizationOutcome(TrackedOutcome::NoTypeInfo);
@@ -9235,6 +9261,17 @@
             return UINT32_MAX;
         }
 
+        // If we encounter a group for an unboxed property which has a
+        // corresponding native group, look for a definite slot in that native
+        // group, and force conversion of incoming objects to the native group.
+        if (key->isGroup() && key->group()->maybeUnboxedLayout()) {
+            if (ObjectGroup *nativeGroup = key->group()->unboxedLayout().nativeGroup()) {
+                if (!convertUnboxedGroups.append(key->group()))
+                    CrashAtUnhandlableOOM("IonBuilder::getDefiniteSlot");
+                key = TypeSet::ObjectKey::get(nativeGroup);
+            }
+        }
+
         HeapTypeSetKey property = key->property(NameToId(name));
         if (!property.maybeTypes() ||
             !property.maybeTypes()->definiteProperty() ||
@@ -9244,10 +9281,18 @@
             return UINT32_MAX;
         }
 
+        // Definite slots will always be fixed slots when they are in the
+        // allowable range for fixed slots, except for objects which were
+        // converted from unboxed objects and have a smaller allocation size.
+        size_t nfixed = NativeObject::MAX_FIXED_SLOTS;
+        if (ObjectGroup *group = key->group()->maybeOriginalUnboxedGroup())
+            nfixed = gc::GetGCKindSlots(group->unboxedLayout().getAllocKind());
+
         uint32_t propertySlot = property.maybeTypes()->definiteSlot();
         if (slot == UINT32_MAX) {
             slot = propertySlot;
-        } else if (slot != propertySlot) {
+            *pnfixed = nfixed;
+        } else if (slot != propertySlot || nfixed != *pnfixed) {
             trackOptimizationOutcome(TrackedOutcome::InconsistentFixedSlot);
             return UINT32_MAX;
         }
@@ -9293,6 +9338,13 @@
             return UINT32_MAX;
         }
 
+        if (layout->nativeGroup()) {
+            trackOptimizationOutcome(TrackedOutcome::UnboxedConvertedToNative);
+            return UINT32_MAX;
+        }
+
+        key->watchStateChangeForUnboxedConvertedToNative(constraints());
+
         if (offset == UINT32_MAX) {
             offset = property->offset;
             *punboxedType = property->type;
@@ -9562,7 +9614,7 @@
     if (inlinePropTable->numEntries() > 0) {
         // Push the object back onto the stack temporarily to capture the resume point.
         current->push(obj);
-        MResumePoint *resumePoint = MResumePoint::New(alloc(), current, pc, callerResumePoint_,
+        MResumePoint *resumePoint = MResumePoint::New(alloc(), current, pc,
                                                       MResumePoint::ResumeAt);
         if (!resumePoint)
             return false;
@@ -10028,13 +10080,27 @@
                                   fieldPrediction, fieldTypeObj);
 }
 
+MDefinition *
+IonBuilder::convertUnboxedObjects(MDefinition *obj,
+                                  const BaselineInspector::ObjectGroupVector &list)
+{
+    for (size_t i = 0; i < list.length(); i++) {
+        obj = MConvertUnboxedObjectToNative::New(alloc(), obj, list[i]);
+        current->add(obj->toInstruction());
+    }
+    return obj;
+}
+
 bool
 IonBuilder::getPropTryDefiniteSlot(bool *emitted, MDefinition *obj, PropertyName *name,
                                    BarrierKind barrier, TemporaryTypeSet *types)
 {
     MOZ_ASSERT(*emitted == false);
 
-    uint32_t slot = getDefiniteSlot(obj->resultTypeSet(), name);
+    BaselineInspector::ObjectGroupVector convertUnboxedGroups(alloc());
+
+    uint32_t nfixed;
+    uint32_t slot = getDefiniteSlot(obj->resultTypeSet(), name, &nfixed, convertUnboxedGroups);
     if (slot == UINT32_MAX)
         return true;
 
@@ -10044,14 +10110,16 @@
         obj = guard;
     }
 
+    obj = convertUnboxedObjects(obj, convertUnboxedGroups);
+
     MInstruction *load;
-    if (slot < NativeObject::MAX_FIXED_SLOTS) {
+    if (slot < nfixed) {
         load = MLoadFixedSlot::New(alloc(), obj, slot);
     } else {
         MInstruction *slots = MSlots::New(alloc(), obj);
         current->add(slots);
 
-        load = MLoadSlot::New(alloc(), slots, slot - NativeObject::MAX_FIXED_SLOTS);
+        load = MLoadSlot::New(alloc(), slots, slot - nfixed);
     }
 
     if (barrier == BarrierKind::NoBarrier)
@@ -10373,13 +10441,15 @@
     }
 
     BaselineInspector::ShapeVector nativeShapes(alloc());
-    BaselineInspector::ObjectGroupVector unboxedGroups(alloc());
-    if (!inspector->maybeInfoForPropertyOp(pc, nativeShapes, unboxedGroups))
+    BaselineInspector::ObjectGroupVector unboxedGroups(alloc()), convertUnboxedGroups(alloc());
+    if (!inspector->maybeInfoForPropertyOp(pc, nativeShapes, unboxedGroups, convertUnboxedGroups))
         return false;
 
     if (!canInlinePropertyOpShapes(nativeShapes, unboxedGroups))
         return true;
 
+    obj = convertUnboxedObjects(obj, convertUnboxedGroups);
+
     MIRType rvalType = types->getKnownMIRType();
     if (barrier != BarrierKind::NoBarrier || IsNullOrUndefined(rvalType))
         rvalType = MIRType_Value;
@@ -10917,7 +10987,10 @@
         return true;
     }
 
-    uint32_t slot = getDefiniteSlot(obj->resultTypeSet(), name);
+    BaselineInspector::ObjectGroupVector convertUnboxedGroups(alloc());
+
+    uint32_t nfixed;
+    uint32_t slot = getDefiniteSlot(obj->resultTypeSet(), name, &nfixed, convertUnboxedGroups);
     if (slot == UINT32_MAX)
         return true;
 
@@ -10935,8 +11008,10 @@
         writeBarrier |= property.needsBarrier(constraints());
     }
 
+    obj = convertUnboxedObjects(obj, convertUnboxedGroups);
+
     MInstruction *store;
-    if (slot < NativeObject::MAX_FIXED_SLOTS) {
+    if (slot < nfixed) {
         store = MStoreFixedSlot::New(alloc(), obj, slot, value);
         if (writeBarrier)
             store->toStoreFixedSlot()->setNeedsBarrier();
@@ -10944,7 +11019,7 @@
         MInstruction *slots = MSlots::New(alloc(), obj);
         current->add(slots);
 
-        store = MStoreSlot::New(alloc(), slots, slot - NativeObject::MAX_FIXED_SLOTS, value);
+        store = MStoreSlot::New(alloc(), slots, slot - nfixed, value);
         if (writeBarrier)
             store->toStoreSlot()->setNeedsBarrier();
     }
@@ -11053,13 +11128,15 @@
     }
 
     BaselineInspector::ShapeVector nativeShapes(alloc());
-    BaselineInspector::ObjectGroupVector unboxedGroups(alloc());
-    if (!inspector->maybeInfoForPropertyOp(pc, nativeShapes, unboxedGroups))
+    BaselineInspector::ObjectGroupVector unboxedGroups(alloc()), convertUnboxedGroups(alloc());
+    if (!inspector->maybeInfoForPropertyOp(pc, nativeShapes, unboxedGroups, convertUnboxedGroups))
         return false;
 
     if (!canInlinePropertyOpShapes(nativeShapes, unboxedGroups))
         return true;
 
+    obj = convertUnboxedObjects(obj, convertUnboxedGroups);
+
     if (nativeShapes.length() == 1 && unboxedGroups.empty()) {
         spew("Inlining monomorphic SETPROP");
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonBuilder.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonBuilder.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonBuilder.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonBuilder.h	2015-02-28 15:03:05.000000000 +0000
@@ -805,10 +805,10 @@
 
     // SIMD intrinsics and natives.
     InliningStatus inlineConstructSimdObject(CallInfo &callInfo, SimdTypeDescr *target);
-    InliningStatus inlineSimdInt32x4BinaryArith(CallInfo &callInfo, JSNative native,
-                                                MSimdBinaryArith::Operation op);
-    InliningStatus inlineSimdInt32x4BinaryBitwise(CallInfo &callInfo, JSNative native,
-                                                  MSimdBinaryBitwise::Operation op);
+
+    template <typename T>
+    InliningStatus inlineBinarySimd(CallInfo &callInfo, JSNative native,
+                                    typename T::Operation op, SimdTypeDescr::Type type);
 
     // Utility intrinsics.
     InliningStatus inlineIsCallable(CallInfo &callInfo);
@@ -889,7 +889,10 @@
     JSObject *testSingletonProperty(JSObject *obj, PropertyName *name);
     bool testSingletonPropertyTypes(MDefinition *obj, JSObject *singleton, PropertyName *name,
                                     bool *testObject, bool *testString);
-    uint32_t getDefiniteSlot(TemporaryTypeSet *types, PropertyName *name);
+    uint32_t getDefiniteSlot(TemporaryTypeSet *types, PropertyName *name, uint32_t *pnfixed,
+                             BaselineInspector::ObjectGroupVector &convertUnboxedGroups);
+    MDefinition *convertUnboxedObjects(MDefinition *obj,
+                                       const BaselineInspector::ObjectGroupVector &list);
     uint32_t getUnboxedOffset(TemporaryTypeSet *types, PropertyName *name,
                               JSValueType *punboxedType);
     MInstruction *loadUnboxedProperty(MDefinition *obj, size_t offset, JSValueType unboxedType,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonCaches.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonCaches.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonCaches.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonCaches.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -431,7 +431,7 @@
     // Add entry to native => bytecode mapping for this stub if needed.
     if (cx->runtime()->jitRuntime()->isProfilerInstrumentationEnabled(cx->runtime())) {
         JitcodeGlobalEntry::IonCacheEntry entry;
-        entry.init(code->raw(), code->rawEnd(), rejoinAddress());
+        entry.init(code, code->raw(), code->rawEnd(), rejoinAddress());
 
         // Add entry to the global table.
         JitcodeGlobalTable *globalTable = cx->runtime()->jitRuntime()->getJitcodeGlobalTable();
@@ -444,7 +444,7 @@
         code->setHasBytecodeMap();
     } else {
         JitcodeGlobalEntry::DummyEntry entry;
-        entry.init(code->raw(), code->rawEnd());
+        entry.init(code, code->raw(), code->rawEnd());
 
         // Add entry to the global table.
         JitcodeGlobalTable *globalTable = cx->runtime()->jitRuntime()->getJitcodeGlobalTable();
@@ -471,6 +471,20 @@
 {
 }
 
+static void *
+GetReturnAddressToIonCode(JSContext *cx)
+{
+    JitFrameIterator iter(cx);
+    MOZ_ASSERT(iter.type() == JitFrame_Exit);
+
+    void *returnAddr = iter.returnAddress();
+#ifdef DEBUG
+    ++iter;
+    MOZ_ASSERT(iter.isIonJS());
+#endif
+    return returnAddr;
+}
+
 static void
 GeneratePrototypeGuards(JSContext *cx, IonScript *ion, MacroAssembler &masm, JSObject *obj,
                         JSObject *holder, Register objectReg, Register scratchReg,
@@ -701,25 +715,16 @@
     }
 }
 
+// Callers are expected to have already guarded on the shape of the
+// object, which guarantees the object is a DOM proxy.
 static void
-GenerateDOMProxyChecks(JSContext *cx, MacroAssembler &masm, JSObject *obj,
-                       PropertyName *name, Register object, Label *stubFailure,
-                       bool skipExpandoCheck = false)
+CheckDOMProxyExpandoDoesNotShadow(JSContext *cx, MacroAssembler &masm, JSObject *obj,
+                                  PropertyName *name, Register object, Label *stubFailure)
 {
     MOZ_ASSERT(IsCacheableDOMProxy(obj));
 
-    // Guard the following:
-    //      1. The object is a DOMProxy.
-    //      2. The object does not have expando properties, or has an expando
-    //          which is known to not have the desired property.
-    Address handlerAddr(object, ProxyObject::offsetOfHandler());
-
-    // Check that object is a DOMProxy.
-    masm.branchPtr(Assembler::NotEqual, handlerAddr,
-                   ImmPtr(obj->as<ProxyObject>().handler()), stubFailure);
-
-    if (skipExpandoCheck)
-        return;
+    // Guard that the object does not have expando properties, or has an expando
+    // which is known to not have the desired property.
 
     // For the remaining code, we need to reserve some registers to load a value.
     // This is ugly, but unvaoidable.
@@ -1252,7 +1257,7 @@
 
 template <class GetPropCache>
 static GetPropertyIC::NativeGetPropCacheability
-CanAttachNativeGetProp(typename GetPropCache::Context cx, const GetPropCache &cache,
+CanAttachNativeGetProp(JSContext *cx, const GetPropCache &cache,
                        HandleObject obj, HandlePropertyName name,
                        MutableHandleNativeObject holder, MutableHandleShape shape,
                        bool skipArrayLen = false)
@@ -1320,7 +1325,7 @@
 }
 
 bool
-GetPropertyIC::allowArrayLength(Context cx, HandleObject obj) const
+GetPropertyIC::allowArrayLength(JSContext *cx, HandleObject obj) const
 {
     if (!idempotent())
         return true;
@@ -1550,9 +1555,9 @@
                                    ImmGCPtr(obj->lastProperty()),
                                    &failures);
 
-    // Make sure object is a DOMProxy
-    GenerateDOMProxyChecks(cx, masm, obj, name(), object(), &failures,
-                           /*skipExpandoCheck=*/true);
+    // No need for more guards: we know this is a DOM proxy, since the shape
+    // guard enforces a given JSClass, so just go ahead and emit the call to
+    // ProxyGet.
 
     if (!EmitCallProxyGet(cx, masm, attacher, name(), liveRegs_, object(), output(),
                           pc(), returnAddr))
@@ -1619,8 +1624,8 @@
                                    ImmGCPtr(obj->lastProperty()),
                                    &failures);
 
-    // Make sure object is a DOMProxy proxy
-    GenerateDOMProxyChecks(cx, masm, obj, name, object(), &failures);
+    // Guard that our expando object hasn't started shadowing this property.
+    CheckDOMProxyExpandoDoesNotShadow(cx, masm, obj, name, object(), &failures);
 
     if (holder) {
         // Found the property on the prototype chain. Treat it like a native
@@ -1692,9 +1697,10 @@
         DOMProxyShadowsResult shadows = GetDOMProxyShadowsCheck()(cx, obj, id);
         if (shadows == ShadowCheckFailed)
             return false;
-        if (shadows == Shadows)
+        if (DOMProxyIsShadowing(shadows))
             return tryAttachDOMProxyShadowed(cx, outerScript, ion, obj, returnAddr, emitted);
 
+        MOZ_ASSERT(shadows == DoesntShadow || shadows == DoesntShadowUnique);
         return tryAttachDOMProxyUnshadowed(cx, outerScript, ion, obj, name,
                                            shadows == DoesntShadowUnique, returnAddr, emitted);
     }
@@ -1823,8 +1829,7 @@
 
 bool
 GetPropertyIC::tryAttachStub(JSContext *cx, HandleScript outerScript, IonScript *ion,
-                             HandleObject obj, HandlePropertyName name,
-                             void *returnAddr, bool *emitted)
+                             HandleObject obj, HandlePropertyName name, bool *emitted)
 {
     MOZ_ASSERT(!*emitted);
 
@@ -1834,6 +1839,8 @@
     if (!*emitted && !tryAttachArgumentsLength(cx, outerScript, ion, obj, name, emitted))
         return false;
 
+    void *returnAddr = GetReturnAddressToIonCode(cx);
+
     if (!*emitted && !tryAttachProxy(cx, outerScript, ion, obj, name, returnAddr, emitted))
         return false;
 
@@ -1853,11 +1860,9 @@
 }
 
 /* static */ bool
-GetPropertyIC::update(JSContext *cx, size_t cacheIndex,
+GetPropertyIC::update(JSContext *cx, HandleScript outerScript, size_t cacheIndex,
                       HandleObject obj, MutableHandleValue vp)
 {
-    void *returnAddr;
-    RootedScript outerScript(cx, GetTopJitJSScript(cx, &returnAddr));
     IonScript *ion = outerScript->ionScript();
 
     GetPropertyIC &cache = ion->getCache(cacheIndex).toGetProperty();
@@ -1874,7 +1879,7 @@
     // limit. Once we can make calls from within generated stubs, a new call
     // stub will be generated instead and the previous stubs unlinked.
     bool emitted = false;
-    if (!cache.tryAttachStub(cx, outerScript, ion, obj, name, returnAddr, &emitted))
+    if (!cache.tryAttachStub(cx, outerScript, ion, obj, name, &emitted))
         return false;
 
     if (cache.idempotent() && !emitted) {
@@ -2238,9 +2243,9 @@
                    Address(object(), JSObject::offsetOfShape()),
                    ImmGCPtr(obj->lastProperty()), &failures);
 
-    // Make sure object is a DOMProxy
-    GenerateDOMProxyChecks(cx, masm, obj, name(), object(), &failures,
-                           /*skipExpandoCheck=*/true);
+    // No need for more guards: we know this is a DOM proxy, since the shape
+    // guard enforces a given JSClass, so just go ahead and emit the call to
+    // ProxySet.
 
     RootedId propId(cx, AtomToId(name()));
     if (!EmitCallProxySet(cx, masm, attacher, propId, liveRegs_, object(),
@@ -2512,8 +2517,8 @@
                    Address(object(), JSObject::offsetOfShape()),
                    ImmGCPtr(obj->lastProperty()), &failures);
 
-    // Make sure object is a DOMProxy
-    GenerateDOMProxyChecks(cx, masm, obj, name(), object(), &failures);
+    // Guard that our expando object hasn't started shadowing this property.
+    CheckDOMProxyExpandoDoesNotShadow(cx, masm, obj, name(), object(), &failures);
 
     RootedPropertyName propName(cx, name());
     RootedObject holder(cx);
@@ -2917,7 +2922,7 @@
     MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
     RepatchStubAppender attacher(*this);
     GenerateSetUnboxed(cx, masm, attacher, obj, id, unboxedOffset, unboxedType,
-                       object(), value(), needsTypeBarrier());
+                       object(), value(), checkTypeset);
     return linkAndAttachStub(cx, masm, attacher, ion, "set_unboxed");
 }
 
@@ -2942,12 +2947,10 @@
 }
 
 bool
-SetPropertyIC::update(JSContext *cx, size_t cacheIndex, HandleObject obj,
+SetPropertyIC::update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject obj,
                       HandleValue value)
 {
-    void *returnAddr;
-    RootedScript script(cx, GetTopJitJSScript(cx, &returnAddr));
-    IonScript *ion = script->ionScript();
+    IonScript *ion = outerScript->ionScript();
     SetPropertyIC &cache = ion->getCache(cacheIndex).toSetProperty();
     RootedPropertyName name(cx, cache.name());
     RootedId id(cx, AtomToId(name));
@@ -2962,26 +2965,27 @@
     bool addedSetterStub = false;
     if (cache.canAttachStub() && !obj->watched()) {
         if (!addedSetterStub && obj->is<ProxyObject>()) {
+            void *returnAddr = GetReturnAddressToIonCode(cx);
             if (IsCacheableDOMProxy(obj)) {
                 DOMProxyShadowsResult shadows = GetDOMProxyShadowsCheck()(cx, obj, id);
                 if (shadows == ShadowCheckFailed)
                     return false;
-                if (shadows == Shadows) {
-                    if (!cache.attachDOMProxyShadowed(cx, script, ion, obj, returnAddr))
+                if (DOMProxyIsShadowing(shadows)) {
+                    if (!cache.attachDOMProxyShadowed(cx, outerScript, ion, obj, returnAddr))
                         return false;
                     addedSetterStub = true;
                 } else {
                     MOZ_ASSERT(shadows == DoesntShadow || shadows == DoesntShadowUnique);
                     if (shadows == DoesntShadowUnique)
                         cache.reset();
-                    if (!cache.attachDOMProxyUnshadowed(cx, script, ion, obj, returnAddr))
+                    if (!cache.attachDOMProxyUnshadowed(cx, outerScript, ion, obj, returnAddr))
                         return false;
                     addedSetterStub = true;
                 }
             }
 
             if (!addedSetterStub && !cache.hasGenericProxyStub()) {
-                if (!cache.attachGenericProxy(cx, script, ion, returnAddr))
+                if (!cache.attachGenericProxy(cx, outerScript, ion, returnAddr))
                     return false;
                 addedSetterStub = true;
             }
@@ -2995,13 +2999,14 @@
 
         if (!addedSetterStub && canCache == CanAttachSetSlot) {
             RootedNativeObject nobj(cx, &obj->as<NativeObject>());
-            if (!cache.attachSetSlot(cx, script, ion, nobj, shape, checkTypeset))
+            if (!cache.attachSetSlot(cx, outerScript, ion, nobj, shape, checkTypeset))
                 return false;
             addedSetterStub = true;
         }
 
         if (!addedSetterStub && canCache == CanAttachCallSetter) {
-            if (!cache.attachCallSetter(cx, script, ion, obj, holder, shape, returnAddr))
+            void *returnAddr = GetReturnAddressToIonCode(cx);
+            if (!cache.attachCallSetter(cx, outerScript, ion, obj, holder, shape, returnAddr))
                 return false;
             addedSetterStub = true;
         }
@@ -3013,7 +3018,7 @@
                                                     cache.needsTypeBarrier(),
                                                     &checkTypeset, &unboxedOffset, &unboxedType))
         {
-            if (!cache.attachSetUnboxed(cx, script, ion, obj, id, unboxedOffset, unboxedType,
+            if (!cache.attachSetUnboxed(cx, outerScript, ion, obj, id, unboxedOffset, unboxedType,
                                         checkTypeset))
             {
                 return false;
@@ -3037,7 +3042,7 @@
                                 &checkTypeset))
     {
         RootedNativeObject nobj(cx, &obj->as<NativeObject>());
-        if (!cache.attachAddSlot(cx, script, ion, nobj, oldShape, oldGroup, checkTypeset))
+        if (!cache.attachAddSlot(cx, outerScript, ion, nobj, oldShape, oldGroup, checkTypeset))
             return false;
         addedSetterStub = true;
     }
@@ -3083,8 +3088,7 @@
 
 bool
 GetElementIC::attachGetProp(JSContext *cx, HandleScript outerScript, IonScript *ion,
-                            HandleObject obj, const Value &idval, HandlePropertyName name,
-                            void *returnAddr)
+                            HandleObject obj, const Value &idval, HandlePropertyName name)
 {
     MOZ_ASSERT(index().reg().hasValue());
 
@@ -3164,7 +3168,9 @@
                          &failures);
     } else {
         MOZ_ASSERT(canCache == GetPropertyIC::CanAttachCallGetter);
+
         // Set the frame for bailout safety of the OOL call.
+        void *returnAddr = GetReturnAddressToIonCode(cx);
         if (!GenerateCallGetter(cx, ion, masm, attacher, obj, name, holder, shape, liveRegs_,
                                 object(), output(), returnAddr, &failures))
         {
@@ -3253,6 +3259,160 @@
     return linkAndAttachStub(cx, masm, attacher, ion, "dense array");
 }
 
+
+/* static */ bool
+GetElementIC::canAttachDenseElementHole(JSObject *obj, const Value &idval, TypedOrValueRegister output)
+{
+    if (!idval.isInt32())
+        return false;
+
+    if (!output.hasValue())
+        return false;
+
+    if (!obj->isNative())
+        return false;
+
+    if (obj->as<NativeObject>().getDenseInitializedLength() == 0)
+        return false;
+
+    while (obj) {
+        if (obj->isIndexed())
+            return false;
+
+        if (ClassCanHaveExtraProperties(obj->getClass()))
+            return false;
+
+        JSObject *proto = obj->getProto();
+        if (!proto)
+            break;
+
+        if (!proto->isNative())
+            return false;
+
+        // Make sure objects on the prototype don't have dense elements.
+        if (proto->as<NativeObject>().getDenseInitializedLength() != 0)
+            return false;
+
+        obj = proto;
+    }
+
+    return true;
+}
+
+static bool
+GenerateDenseElementHole(JSContext *cx, MacroAssembler &masm, IonCache::StubAttacher &attacher,
+                         IonScript *ion, JSObject *obj, const Value &idval,
+                         Register object, ConstantOrRegister index, TypedOrValueRegister output)
+{
+    MOZ_ASSERT(GetElementIC::canAttachDenseElementHole(obj, idval, output));
+    MOZ_ASSERT(obj->lastProperty());
+
+    Register scratchReg = output.valueReg().scratchReg();
+
+    // Guard on the shape and group, to prevent non-dense elements from appearing.
+    Label failures;
+    attacher.branchNextStubOrLabel(masm, Assembler::NotEqual,
+                                   Address(object, JSObject::offsetOfShape()),
+                                   ImmGCPtr(obj->lastProperty()), &failures);
+
+
+    if (obj->hasUncacheableProto()) {
+        masm.loadPtr(Address(object, JSObject::offsetOfGroup()), scratchReg);
+        Address proto(scratchReg, ObjectGroup::offsetOfProto());
+        masm.branchPtr(Assembler::NotEqual, proto,
+                       ImmMaybeNurseryPtr(obj->getProto()), &failures);
+    }
+
+    JSObject *pobj = obj->getProto();
+    while (pobj) {
+        MOZ_ASSERT(pobj->lastProperty());
+
+        masm.movePtr(ImmMaybeNurseryPtr(pobj), scratchReg);
+        if (pobj->hasUncacheableProto()) {
+            MOZ_ASSERT(!pobj->isSingleton());
+            Address groupAddr(scratchReg, JSObject::offsetOfGroup());
+            masm.branchPtr(Assembler::NotEqual, groupAddr, ImmGCPtr(pobj->group()), &failures);
+        }
+
+        // Make sure the shape matches, to avoid non-dense elements.
+        masm.branchPtr(Assembler::NotEqual, Address(scratchReg, JSObject::offsetOfShape()),
+                       ImmGCPtr(pobj->lastProperty()), &failures);
+
+        // Load elements vector.
+        masm.loadPtr(Address(scratchReg, NativeObject::offsetOfElements()), scratchReg);
+
+        // Also make sure there are no dense elements.
+        Label hole;
+        Address initLength(scratchReg, ObjectElements::offsetOfInitializedLength());
+        masm.branch32(Assembler::NotEqual, initLength, Imm32(0), &failures);
+
+        pobj = pobj->getProto();
+    }
+
+    // Ensure the index is an int32 value.
+    Register indexReg = InvalidReg;
+    Register elementsReg = InvalidReg;
+
+    if (index.reg().hasValue()) {
+        indexReg = scratchReg;
+        MOZ_ASSERT(indexReg != InvalidReg);
+        ValueOperand val = index.reg().valueReg();
+
+        masm.branchTestInt32(Assembler::NotEqual, val, &failures);
+
+        // Unbox the index.
+        masm.unboxInt32(val, indexReg);
+
+        // Save the object register.
+        masm.push(object);
+        elementsReg = object;
+    } else {
+        MOZ_ASSERT(!index.reg().typedReg().isFloat());
+        indexReg = index.reg().typedReg().gpr();
+        elementsReg = scratchReg;
+    }
+
+    // Load elements vector.
+    masm.loadPtr(Address(object, NativeObject::offsetOfElements()), elementsReg);
+
+    // Guard on the initialized length.
+    Label hole;
+    Address initLength(elementsReg, ObjectElements::offsetOfInitializedLength());
+    masm.branch32(Assembler::BelowOrEqual, initLength, indexReg, &hole);
+
+    // Load the value.
+    Label done;
+    masm.loadValue(BaseObjectElementIndex(elementsReg, indexReg), output.valueReg());
+    masm.branchTestMagic(Assembler::NotEqual, output.valueReg(), &done);
+
+    // Load undefined for the hole.
+    masm.bind(&hole);
+    masm.moveValue(UndefinedValue(), output.valueReg());
+
+    masm.bind(&done);
+    // Restore the object register.
+    if (elementsReg == object)
+        masm.pop(object);
+    attacher.jumpRejoin(masm);
+
+    // All failure flows through here.
+    masm.bind(&failures);
+    attacher.jumpNextStub(masm);
+
+    return true;
+}
+
+bool
+GetElementIC::attachDenseElementHole(JSContext *cx, HandleScript outerScript, IonScript *ion,
+                                     HandleObject obj, const Value &idval)
+{
+    MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);
+    RepatchStubAppender attacher(*this);
+    GenerateDenseElementHole(cx, masm, attacher, ion, obj, idval, object(), index(), output());
+
+    return linkAndAttachStub(cx, masm, attacher, ion, "dense hole");
+}
+
 /* static */ bool
 GetElementIC::canAttachTypedArrayElement(JSObject *obj, const Value &idval,
                                          TypedOrValueRegister output)
@@ -3515,11 +3675,9 @@
 }
 
 bool
-GetElementIC::update(JSContext *cx, size_t cacheIndex, HandleObject obj,
+GetElementIC::update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject obj,
                      HandleValue idval, MutableHandleValue res)
 {
-    void *returnAddr;
-    RootedScript outerScript(cx, GetTopJitJSScript(cx, &returnAddr));
     IonScript *ion = outerScript->ionScript();
     GetElementIC &cache = ion->getCache(cacheIndex).toGetElement();
     RootedScript script(cx);
@@ -3556,7 +3714,7 @@
         }
         if (!attachedStub && cache.monitoredResult() && canAttachGetProp(obj, idval, id)) {
             RootedPropertyName name(cx, JSID_TO_ATOM(id)->asPropertyName());
-            if (!cache.attachGetProp(cx, outerScript, ion, obj, idval, name, returnAddr))
+            if (!cache.attachGetProp(cx, outerScript, ion, obj, idval, name))
                 return false;
             attachedStub = true;
         }
@@ -3565,6 +3723,13 @@
                 return false;
             attachedStub = true;
         }
+        if (!attachedStub && cache.monitoredResult() &&
+            canAttachDenseElementHole(obj, idval, cache.output()))
+        {
+            if (!cache.attachDenseElementHole(cx, outerScript, ion, obj, idval))
+                return false;
+            attachedStub = true;
+        }
         if (!attachedStub && canAttachTypedArrayElement(obj, idval, cache.output())) {
             if (!cache.attachTypedArrayElement(cx, outerScript, ion, obj, idval))
                 return false;
@@ -3906,10 +4071,9 @@
 }
 
 bool
-SetElementIC::update(JSContext *cx, size_t cacheIndex, HandleObject obj,
+SetElementIC::update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject obj,
                      HandleValue idval, HandleValue value)
 {
-    RootedScript outerScript(cx, GetTopJitJSScript(cx));
     IonScript *ion = outerScript->ionScript();
     SetElementIC &cache = ion->getCache(cacheIndex).toSetElement();
 
@@ -4075,9 +4239,9 @@
 }
 
 JSObject *
-BindNameIC::update(JSContext *cx, size_t cacheIndex, HandleObject scopeChain)
+BindNameIC::update(JSContext *cx, HandleScript outerScript, size_t cacheIndex,
+                   HandleObject scopeChain)
 {
-    RootedScript outerScript(cx, GetTopJitJSScript(cx));
     IonScript *ion = outerScript->ionScript();
     BindNameIC &cache = ion->getCache(cacheIndex).toBindName();
     HandlePropertyName name = cache.name();
@@ -4225,11 +4389,9 @@
 }
 
 bool
-NameIC::update(JSContext *cx, size_t cacheIndex, HandleObject scopeChain,
+NameIC::update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject scopeChain,
                MutableHandleValue vp)
 {
-    void *returnAddr;
-    RootedScript outerScript(cx, GetTopJitJSScript(cx, &returnAddr));
     IonScript *ion = outerScript->ionScript();
 
     NameIC &cache = ion->getCache(cacheIndex).toName();
@@ -4262,8 +4424,12 @@
                 return false;
             }
         } else if (IsCacheableNameCallGetter(scopeChain, obj, holder, shape)) {
-            if (!cache.attachCallGetter(cx, outerScript, ion, scopeChain, obj, holder, shape, returnAddr))
+            void *returnAddr = GetReturnAddressToIonCode(cx);
+            if (!cache.attachCallGetter(cx, outerScript, ion, scopeChain, obj, holder, shape,
+                                        returnAddr))
+            {
                 return false;
+            }
         }
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonCaches.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonCaches.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonCaches.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonCaches.h	2015-02-28 15:03:05.000000000 +0000
@@ -638,16 +638,14 @@
     };
 
     // Helpers for CanAttachNativeGetProp
-    typedef JSContext * Context;
-    bool allowArrayLength(Context cx, HandleObject obj) const;
+    bool allowArrayLength(JSContext *cx, HandleObject obj) const;
     bool allowGetters() const {
         return monitoredResult() && !idempotent();
     }
 
     // Attach the proper stub, if possible
     bool tryAttachStub(JSContext *cx, HandleScript outerScript, IonScript *ion,
-                       HandleObject obj, HandlePropertyName name,
-                       void *returnAddr, bool *emitted);
+                       HandleObject obj, HandlePropertyName name, bool *emitted);
 
     bool tryAttachProxy(JSContext *cx, HandleScript outerScript, IonScript *ion,
                         HandleObject obj, HandlePropertyName name,
@@ -678,7 +676,8 @@
     bool tryAttachArgumentsLength(JSContext *cx, HandleScript outerScript, IonScript *ion,
                                   HandleObject obj, HandlePropertyName name, bool *emitted);
 
-    static bool update(JSContext *cx, size_t cacheIndex, HandleObject obj, MutableHandleValue vp);
+    static bool update(JSContext *cx, HandleScript outerScript, size_t cacheIndex,
+                       HandleObject obj, MutableHandleValue vp);
 };
 
 class SetPropertyIC : public RepatchIonCache
@@ -764,7 +763,8 @@
     bool attachDOMProxyUnshadowed(JSContext *cx, HandleScript outerScript, IonScript *ion,
                                   HandleObject obj, void *returnAddr);
 
-    static bool update(JSContext *cx, size_t cacheIndex, HandleObject obj, HandleValue value);
+    static bool update(JSContext *cx, HandleScript outerScript, size_t cacheIndex,
+                       HandleObject obj, HandleValue value);
 };
 
 class GetElementIC : public RepatchIonCache
@@ -842,16 +842,20 @@
 
     static bool canAttachGetProp(JSObject *obj, const Value &idval, jsid id);
     static bool canAttachDenseElement(JSObject *obj, const Value &idval);
+    static bool canAttachDenseElementHole(JSObject *obj, const Value &idval,
+                                          TypedOrValueRegister output);
     static bool canAttachTypedArrayElement(JSObject *obj, const Value &idval,
                                            TypedOrValueRegister output);
 
     bool attachGetProp(JSContext *cx, HandleScript outerScript, IonScript *ion,
-                       HandleObject obj, const Value &idval, HandlePropertyName name,
-                       void *returnAddr);
+                       HandleObject obj, const Value &idval, HandlePropertyName name);
 
     bool attachDenseElement(JSContext *cx, HandleScript outerScript, IonScript *ion,
                             HandleObject obj, const Value &idval);
 
+    bool attachDenseElementHole(JSContext *cx, HandleScript outerScript, IonScript *ion,
+                                HandleObject obj, const Value &idval);
+
     bool attachTypedArrayElement(JSContext *cx, HandleScript outerScript, IonScript *ion,
                                  HandleObject tarr, const Value &idval);
 
@@ -859,8 +863,8 @@
                                 HandleObject obj);
 
     static bool
-    update(JSContext *cx, size_t cacheIndex, HandleObject obj, HandleValue idval,
-           MutableHandleValue vp);
+    update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject obj,
+           HandleValue idval, MutableHandleValue vp);
 
     void incFailedUpdates() {
         failedUpdates_++;
@@ -954,8 +958,8 @@
                                  HandleObject tarr);
 
     static bool
-    update(JSContext *cx, size_t cacheIndex, HandleObject obj, HandleValue idval,
-           HandleValue value);
+    update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject obj,
+           HandleValue idval, HandleValue value);
 };
 
 class BindNameIC : public RepatchIonCache
@@ -992,7 +996,7 @@
                          HandleObject scopeChain, HandleObject holder);
 
     static JSObject *
-    update(JSContext *cx, size_t cacheIndex, HandleObject scopeChain);
+    update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject scopeChain);
 };
 
 class NameIC : public RepatchIonCache
@@ -1043,7 +1047,8 @@
                           HandleShape shape, void *returnAddr);
 
     static bool
-    update(JSContext *cx, size_t cacheIndex, HandleObject scopeChain, MutableHandleValue vp);
+    update(JSContext *cx, HandleScript outerScript, size_t cacheIndex, HandleObject scopeChain,
+           MutableHandleValue vp);
 };
 
 #undef CACHE_HEADER
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Ion.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Ion.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Ion.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Ion.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -495,6 +495,13 @@
         JitCode *code = i.get<JitCode>();
         MarkJitCodeRoot(trc, &code, "wrapper");
     }
+
+    // Mark all heap the jitcode global table map.
+    if (trc->runtime()->hasJitRuntime() &&
+        trc->runtime()->jitRuntime()->hasJitcodeGlobalTable())
+    {
+        trc->runtime()->jitRuntime()->getJitcodeGlobalTable()->mark(trc);
+    }
 }
 
 void
@@ -533,6 +540,12 @@
 
     if (regExpTestStub_ && !IsJitCodeMarked(&regExpTestStub_))
         regExpTestStub_ = nullptr;
+
+    for (size_t i = 0; i <= SimdTypeDescr::LAST_TYPE; i++) {
+        ReadBarrieredObject &obj = simdTemplateObjects_[i];
+        if (obj && IsObjectAboutToBeFinalized(obj.unsafeGet()))
+            obj.set(nullptr);
+    }
 }
 
 void
@@ -654,7 +667,7 @@
     // If this jitcode has a bytecode map, de-register it.
     if (hasBytecodeMap_) {
         MOZ_ASSERT(rt->jitRuntime()->hasJitcodeGlobalTable());
-        rt->jitRuntime()->getJitcodeGlobalTable()->removeEntry(raw(), rt);
+        rt->jitRuntime()->getJitcodeGlobalTable()->releaseEntry(raw(), rt);
     }
 
     // Buffer can be freed at any time hereafter. Catch use-after-free bugs.
@@ -744,7 +757,7 @@
     if (snapshotsListSize >= MAX_BUFFER_SIZE ||
         (bailoutEntries >= MAX_BUFFER_SIZE / sizeof(uint32_t)))
     {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
@@ -2098,7 +2111,7 @@
         return Method_CantCompile;
 
     if (reason == AbortReason_Alloc) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return Method_Error;
     }
 
@@ -2453,6 +2466,11 @@
 {
     JitSpew(JitSpew_IonInvalidate, "BEGIN invalidating activation");
 
+#ifdef CHECK_OSIPOINT_REGISTERS
+    if (js_JitOptions.checkOsiPointRegisters)
+        activations->asJit()->setCheckRegs(false);
+#endif
+
     size_t frameno = 1;
 
     for (JitFrameIterator it(activations); !it.done(); ++it, ++frameno) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonOptimizationLevels.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonOptimizationLevels.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/IonOptimizationLevels.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/IonOptimizationLevels.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -34,7 +34,7 @@
     loopUnrolling_ = true;
     autoTruncate_ = true;
     sink_ = true;
-    registerAllocator_ = RegisterAllocator_LSRA;
+    registerAllocator_ = RegisterAllocator_Backtracking;
 
     inlineMaxTotalBytecodeLength_ = 1000;
     inliningMaxCallerBytecodeLength_ = 10000;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitcodeMap.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitcodeMap.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitcodeMap.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitcodeMap.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -7,8 +7,10 @@
 #include "jit/JitcodeMap.h"
 
 #include "mozilla/DebugOnly.h"
+#include "mozilla/MathAlgorithms.h"
 #include "mozilla/UniquePtr.h"
 #include "jsprf.h"
+#include "gc/Marking.h"
 
 #include "jit/BaselineJIT.h"
 #include "jit/JitSpewer.h"
@@ -20,19 +22,28 @@
 namespace js {
 namespace jit {
 
+
+static inline JitcodeRegionEntry
+RegionAtAddr(const JitcodeGlobalEntry::IonEntry &entry, void *ptr,
+             uint32_t *ptrOffset)
+{
+    MOZ_ASSERT(entry.containsPointer(ptr));
+    *ptrOffset = reinterpret_cast<uint8_t *>(ptr) -
+                 reinterpret_cast<uint8_t *>(entry.nativeStartAddr());
+
+    uint32_t regionIdx = entry.regionTable()->findRegionEntry(*ptrOffset);
+    MOZ_ASSERT(regionIdx < entry.regionTable()->numRegions());
+
+    return entry.regionTable()->regionEntry(regionIdx);
+}
+
 bool
 JitcodeGlobalEntry::IonEntry::callStackAtAddr(JSRuntime *rt, void *ptr,
                                               BytecodeLocationVector &results,
                                               uint32_t *depth) const
 {
-    MOZ_ASSERT(containsPointer(ptr));
-    uint32_t ptrOffset = reinterpret_cast<uint8_t *>(ptr) -
-                         reinterpret_cast<uint8_t *>(nativeStartAddr());
-
-    uint32_t regionIdx = regionTable()->findRegionEntry(ptrOffset);
-    MOZ_ASSERT(regionIdx < regionTable()->numRegions());
-
-    JitcodeRegionEntry region = regionTable()->regionEntry(regionIdx);
+    uint32_t ptrOffset;
+    JitcodeRegionEntry region = RegionAtAddr(*this, ptr, &ptrOffset);
     *depth = region.scriptDepth();
 
     JitcodeRegionEntry::ScriptPcIterator locationIter = region.scriptPcIterator();
@@ -61,15 +72,10 @@
                                               const char **results,
                                               uint32_t maxResults) const
 {
-    MOZ_ASSERT(containsPointer(ptr));
     MOZ_ASSERT(maxResults >= 1);
-    uint32_t ptrOffset = reinterpret_cast<uint8_t *>(ptr) -
-                         reinterpret_cast<uint8_t *>(nativeStartAddr());
 
-    uint32_t regionIdx = regionTable()->findRegionEntry(ptrOffset);
-    MOZ_ASSERT(regionIdx < regionTable()->numRegions());
-
-    JitcodeRegionEntry region = regionTable()->regionEntry(regionIdx);
+    uint32_t ptrOffset;
+    JitcodeRegionEntry region = RegionAtAddr(*this, ptr, &ptrOffset);
 
     JitcodeRegionEntry::ScriptPcIterator locationIter = region.scriptPcIterator();
     MOZ_ASSERT(locationIter.hasMore());
@@ -89,6 +95,23 @@
 }
 
 void
+JitcodeGlobalEntry::IonEntry::youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                                          JSScript **script, jsbytecode **pc) const
+{
+    uint32_t ptrOffset;
+    JitcodeRegionEntry region = RegionAtAddr(*this, ptr, &ptrOffset);
+
+    JitcodeRegionEntry::ScriptPcIterator locationIter = region.scriptPcIterator();
+    MOZ_ASSERT(locationIter.hasMore());
+    uint32_t scriptIdx, pcOffset;
+    locationIter.readNext(&scriptIdx, &pcOffset);
+    pcOffset = region.findPcOffset(ptrOffset, pcOffset);
+
+    *script = getScript(scriptIdx);
+    *pc = (*script)->offsetToPC(pcOffset);
+}
+
+void
 JitcodeGlobalEntry::IonEntry::destroy()
 {
     // The region table is stored at the tail of the compacted data,
@@ -156,6 +179,16 @@
 }
 
 void
+JitcodeGlobalEntry::BaselineEntry::youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                                               JSScript **script,
+                                                               jsbytecode **pc) const
+{
+    uint8_t *addr = reinterpret_cast<uint8_t*>(ptr);
+    *script = script_;
+    *pc = script_->baselineScript()->approximatePcForNativeAddress(script_, addr);
+}
+
+void
 JitcodeGlobalEntry::BaselineEntry::destroy()
 {
     if (!str_)
@@ -164,19 +197,25 @@
     str_ = nullptr;
 }
 
+static inline void
+RejoinEntry(JSRuntime *rt, const JitcodeGlobalEntry::IonCacheEntry &cache,
+            void *ptr, JitcodeGlobalEntry *entry)
+{
+    MOZ_ASSERT(cache.containsPointer(ptr));
+
+    // There must exist an entry for the rejoin addr if this entry exists.
+    JitRuntime *jitrt = rt->jitRuntime();
+    jitrt->getJitcodeGlobalTable()->lookupInfallible(cache.rejoinAddr(), entry, rt);
+    MOZ_ASSERT(entry->isIon());
+}
+
 bool
 JitcodeGlobalEntry::IonCacheEntry::callStackAtAddr(JSRuntime *rt, void *ptr,
                                                    BytecodeLocationVector &results,
                                                    uint32_t *depth) const
 {
-    MOZ_ASSERT(containsPointer(ptr));
-
-    // There must exist an entry for the rejoin addr if this entry exists.
-    JitRuntime *jitrt = rt->jitRuntime();
     JitcodeGlobalEntry entry;
-    jitrt->getJitcodeGlobalTable()->lookupInfallible(rejoinAddr(), &entry, rt);
-    MOZ_ASSERT(entry.isIon());
-
+    RejoinEntry(rt, *this, ptr, &entry);
     return entry.callStackAtAddr(rt, rejoinAddr(), results, depth);
 }
 
@@ -185,17 +224,21 @@
                                                    const char **results,
                                                    uint32_t maxResults) const
 {
-    MOZ_ASSERT(containsPointer(ptr));
-
-    // There must exist an entry for the rejoin addr if this entry exists.
-    JitRuntime *jitrt = rt->jitRuntime();
     JitcodeGlobalEntry entry;
-    jitrt->getJitcodeGlobalTable()->lookupInfallible(rejoinAddr(), &entry, rt);
-    MOZ_ASSERT(entry.isIon());
-
+    RejoinEntry(rt, *this, ptr, &entry);
     return entry.callStackAtAddr(rt, rejoinAddr(), results, maxResults);
 }
 
+void
+JitcodeGlobalEntry::IonCacheEntry::youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                                               JSScript **script,
+                                                               jsbytecode **pc) const
+{
+    JitcodeGlobalEntry entry;
+    RejoinEntry(rt, *this, ptr, &entry);
+    return entry.youngestFrameLocationAtAddr(rt, ptr, script, pc);
+}
+
 
 static int ComparePointers(const void *a, const void *b) {
     const uint8_t *a_ptr = reinterpret_cast<const uint8_t *>(a);
@@ -334,45 +377,364 @@
 {
     MOZ_ASSERT(result);
 
-    // Construct a JitcodeGlobalEntry::Query to do the lookup
-    JitcodeGlobalEntry query = JitcodeGlobalEntry::MakeQuery(ptr);
+    JitcodeGlobalEntry *entry = lookupInternal(ptr);
+    if (!entry)
+        return false;
 
-    // Lookups on tree does mutation.  Suppress sampling when this is happening.
-    AutoSuppressProfilerSampling suppressSampling(rt);
-    return tree_.contains(query, result);
+    *result = *entry;
+    return true;
 }
 
-void
-JitcodeGlobalTable::lookupInfallible(void *ptr, JitcodeGlobalEntry *result, JSRuntime *rt)
+bool
+JitcodeGlobalTable::lookupForSampler(void *ptr, JitcodeGlobalEntry *result, JSRuntime *rt,
+                                     uint32_t sampleBufferGen)
 {
-    mozilla::DebugOnly<bool> success = lookup(ptr, result, rt);
-    MOZ_ASSERT(success);
+    MOZ_ASSERT(result);
+
+    JitcodeGlobalEntry *entry = lookupInternal(ptr);
+    if (!entry)
+        return false;
+
+    entry->setGeneration(sampleBufferGen);
+
+    *result = *entry;
+    return true;
+}
+
+JitcodeGlobalEntry *
+JitcodeGlobalTable::lookupInternal(void *ptr)
+{
+    JitcodeGlobalEntry query = JitcodeGlobalEntry::MakeQuery(ptr);
+    JitcodeGlobalEntry *searchTower[JitcodeSkiplistTower::MAX_HEIGHT];
+    searchInternal(query, searchTower);
+
+    if (searchTower[0] == nullptr) {
+        // Check startTower
+        if (startTower_[0] == nullptr)
+            return nullptr;
+
+        MOZ_ASSERT(startTower_[0]->compareTo(query) >= 0);
+        int cmp = startTower_[0]->compareTo(query);
+        MOZ_ASSERT(cmp >= 0);
+        return (cmp == 0) ? startTower_[0] : nullptr;
+    }
+
+    JitcodeGlobalEntry *bottom = searchTower[0];
+    MOZ_ASSERT(bottom->compareTo(query) < 0);
+
+    JitcodeGlobalEntry *bottomNext = bottom->tower_->next(0);
+    if (bottomNext == nullptr)
+        return nullptr;
+
+    int cmp = bottomNext->compareTo(query);
+    MOZ_ASSERT(cmp >= 0);
+    return (cmp == 0) ? bottomNext : nullptr;
 }
 
 bool
 JitcodeGlobalTable::addEntry(const JitcodeGlobalEntry &entry, JSRuntime *rt)
 {
-    // Suppress profiler sampling while table is being mutated.
+    MOZ_ASSERT(entry.isIon() || entry.isBaseline() || entry.isIonCache() || entry.isDummy());
+
+    JitcodeGlobalEntry *searchTower[JitcodeSkiplistTower::MAX_HEIGHT];
+    searchInternal(entry, searchTower);
+
+    // Allocate a new entry and tower.
+    JitcodeSkiplistTower *newTower = allocateTower(generateTowerHeight());
+    if (!newTower)
+        return false;
+
+    JitcodeGlobalEntry *newEntry = allocateEntry();
+    if (!newEntry)
+        return false;
+
+    *newEntry = entry;
+    newEntry->tower_ = newTower;
+
+    // Suppress profiler sampling while skiplist is being mutated.
     AutoSuppressProfilerSampling suppressSampling(rt);
 
-    MOZ_ASSERT(entry.isIon() || entry.isBaseline() || entry.isIonCache() || entry.isDummy());
-    return tree_.insert(entry);
+    // Link up entry with forward entries taken from tower.
+    for (int level = newTower->height() - 1; level >= 0; level--) {
+        JitcodeGlobalEntry *searchTowerEntry = searchTower[level];
+        if (searchTowerEntry) {
+            MOZ_ASSERT(searchTowerEntry->compareTo(*newEntry) < 0);
+            JitcodeGlobalEntry *searchTowerNextEntry = searchTowerEntry->tower_->next(level);
+
+            MOZ_ASSERT_IF(searchTowerNextEntry, searchTowerNextEntry->compareTo(*newEntry) > 0);
+
+            newTower->setNext(level, searchTowerNextEntry);
+            searchTowerEntry->tower_->setNext(level, newEntry);
+        } else {
+            newTower->setNext(level, startTower_[level]);
+            startTower_[level] = newEntry;
+        }
+    }
+    skiplistSize_++;
+    // verifySkiplist(); - disabled for release.
+    return true;
 }
 
 void
 JitcodeGlobalTable::removeEntry(void *startAddr, JSRuntime *rt)
 {
-    // Suppress profiler sampling while table is being mutated.
-    AutoSuppressProfilerSampling suppressSampling(rt);
-
     JitcodeGlobalEntry query = JitcodeGlobalEntry::MakeQuery(startAddr);
-    JitcodeGlobalEntry result;
-    mozilla::DebugOnly<bool> success = tree_.contains(query, &result);
-    MOZ_ASSERT(success);
-
-    // Destroy entry before removing it from tree.
-    result.destroy();
-    tree_.remove(query);
+    JitcodeGlobalEntry *searchTower[JitcodeSkiplistTower::MAX_HEIGHT];
+    searchInternal(query, searchTower);
+
+    JitcodeGlobalEntry *queryEntry;
+    if (searchTower[0]) {
+        MOZ_ASSERT(searchTower[0]->compareTo(query) < 0);
+        queryEntry = searchTower[0]->tower_->next(0);
+    } else {
+        MOZ_ASSERT(startTower_[0]);
+        queryEntry = startTower_[0];
+    }
+    MOZ_ASSERT(queryEntry->compareTo(query) == 0);
+
+    {
+        // Suppress profiler sampling while table is being mutated.
+        AutoSuppressProfilerSampling suppressSampling(rt);
+
+        // Unlink query entry.
+        for (int level = queryEntry->tower_->height() - 1; level >= 0; level--) {
+            JitcodeGlobalEntry *searchTowerEntry = searchTower[level];
+            if (searchTowerEntry) {
+                MOZ_ASSERT(searchTowerEntry);
+                searchTowerEntry->tower_->setNext(level, queryEntry->tower_->next(level));
+            } else {
+                startTower_[level] = queryEntry->tower_->next(level);
+            }
+        }
+        skiplistSize_--;
+        // verifySkiplist(); - disabled for release.
+    }
+
+    // Entry has been unlinked.
+    queryEntry->destroy();
+    queryEntry->tower_->addToFreeList(&(freeTowers_[queryEntry->tower_->height() - 1]));
+    queryEntry->tower_ = nullptr;
+    *queryEntry = JitcodeGlobalEntry();
+    queryEntry->addToFreeList(&freeEntries_);
+}
+
+void
+JitcodeGlobalTable::releaseEntry(void *startAddr, JSRuntime *rt)
+{
+    mozilla::DebugOnly<JitcodeGlobalEntry *> entry = lookupInternal(startAddr);
+    mozilla::DebugOnly<uint32_t> gen = rt->profilerSampleBufferGen();
+    mozilla::DebugOnly<uint32_t> lapCount = rt->profilerSampleBufferLapCount();
+    MOZ_ASSERT(entry);
+    MOZ_ASSERT_IF(gen != UINT32_MAX, !entry->isSampled(gen, lapCount));
+    removeEntry(startAddr, rt);
+}
+
+void
+JitcodeGlobalTable::searchInternal(const JitcodeGlobalEntry &query, JitcodeGlobalEntry **towerOut)
+{
+    JitcodeGlobalEntry *cur = nullptr;
+    for (int level = JitcodeSkiplistTower::MAX_HEIGHT - 1; level >= 0; level--) {
+        JitcodeGlobalEntry *entry = searchAtHeight(level, cur, query);
+        MOZ_ASSERT_IF(entry == nullptr, cur == nullptr);
+        towerOut[level] = entry;
+        cur = entry;
+    }
+
+    // Validate the resulting tower.
+#ifdef DEBUG
+    for (int level = JitcodeSkiplistTower::MAX_HEIGHT - 1; level >= 0; level--) {
+        if (towerOut[level] == nullptr) {
+            // If we got NULL for a given level, then we should have gotten NULL
+            // for the level above as well.
+            MOZ_ASSERT_IF(unsigned(level) < (JitcodeSkiplistTower::MAX_HEIGHT - 1),
+                          towerOut[level + 1] == nullptr);
+            continue;
+        }
+
+        JitcodeGlobalEntry *cur = towerOut[level];
+
+        // Non-null result at a given level must sort < query.
+        MOZ_ASSERT(cur->compareTo(query) < 0);
+
+        // The entry must have a tower height that accomodates level.
+        if (!cur->tower_->next(level))
+            continue;
+
+        JitcodeGlobalEntry *next = cur->tower_->next(level);
+
+        // Next entry must have tower height that accomodates level.
+        MOZ_ASSERT(unsigned(level) < next->tower_->height());
+
+        // Next entry must sort >= query.
+        MOZ_ASSERT(next->compareTo(query) >= 0);
+    }
+#endif // DEBUG
+}
+
+JitcodeGlobalEntry *
+JitcodeGlobalTable::searchAtHeight(unsigned level, JitcodeGlobalEntry *start,
+                                   const JitcodeGlobalEntry &query)
+{
+    JitcodeGlobalEntry *cur = start;
+
+    // If starting with nullptr, use the start tower.
+    if (start == nullptr) {
+        cur = startTower_[level];
+        if (cur == nullptr || cur->compareTo(query) >= 0)
+            return nullptr;
+    }
+
+    // Keep skipping at |level| until we reach an entry < query whose
+    // successor is an entry >= query.
+    for (;;) {
+        JitcodeGlobalEntry *next = cur->tower_->next(level);
+        if (next == nullptr || next->compareTo(query) >= 0)
+            return cur;
+
+        cur = next;
+    }
+}
+
+unsigned
+JitcodeGlobalTable::generateTowerHeight()
+{
+    // Implementation taken from Hars L. and Pteruska G.,
+    // "Pseudorandom Recursions: Small and fast Pseudorandom number generators for
+    //  embedded applications."
+    rand_ ^= mozilla::RotateLeft(rand_, 5) ^ mozilla::RotateLeft(rand_, 24);
+    rand_ += 0x37798849;
+
+    // Return number of lowbit zeros in new randval.
+    unsigned result = 0;
+    for (unsigned i = 0; i < 32; i++) {
+        if ((rand_ >> i) & 0x1)
+            break;
+        result++;
+    }
+    return result + 1;
+}
+
+JitcodeSkiplistTower *
+JitcodeGlobalTable::allocateTower(unsigned height)
+{
+    MOZ_ASSERT(height >= 1);
+    JitcodeSkiplistTower *tower = JitcodeSkiplistTower::PopFromFreeList(&freeTowers_[height - 1]);
+    if (tower)
+        return tower;
+
+    size_t size = JitcodeSkiplistTower::CalculateSize(height);
+    tower = (JitcodeSkiplistTower *) alloc_.alloc(size);
+    if (!tower)
+        return nullptr;
+
+    return new (tower) JitcodeSkiplistTower(height);
+}
+
+JitcodeGlobalEntry *
+JitcodeGlobalTable::allocateEntry()
+{
+    JitcodeGlobalEntry *entry = JitcodeGlobalEntry::PopFromFreeList(&freeEntries_);
+    if (entry)
+        return entry;
+
+    return alloc_.new_<JitcodeGlobalEntry>();
+}
+
+#ifdef DEBUG
+void
+JitcodeGlobalTable::verifySkiplist()
+{
+    JitcodeGlobalEntry *curTower[JitcodeSkiplistTower::MAX_HEIGHT];
+    for (unsigned i = 0; i < JitcodeSkiplistTower::MAX_HEIGHT; i++)
+        curTower[i] = startTower_[i];
+
+    uint32_t count = 0;
+    JitcodeGlobalEntry *curEntry = startTower_[0];
+    while (curEntry) {
+        count++;
+        unsigned curHeight = curEntry->tower_->height();
+        MOZ_ASSERT(curHeight >= 1);
+
+        for (unsigned i = 0; i < JitcodeSkiplistTower::MAX_HEIGHT; i++) {
+            if (i < curHeight) {
+                MOZ_ASSERT(curTower[i] == curEntry);
+                JitcodeGlobalEntry *nextEntry = curEntry->tower_->next(i);
+                MOZ_ASSERT_IF(nextEntry, curEntry->compareTo(*nextEntry) < 0);
+                curTower[i] = nextEntry;
+            } else {
+                MOZ_ASSERT_IF(curTower[i], curTower[i]->compareTo(*curEntry) > 0);
+            }
+        }
+        curEntry = curEntry->tower_->next(0);
+    }
+
+    MOZ_ASSERT(count == skiplistSize_);
+}
+#endif // DEBUG
+
+struct JitcodeMapEntryTraceCallback
+{
+    JSTracer *trc;
+    uint32_t gen;
+    uint32_t lapCount;
+
+    explicit JitcodeMapEntryTraceCallback(JSTracer *trc)
+      : trc(trc),
+        gen(trc->runtime()->profilerSampleBufferGen()),
+        lapCount(trc->runtime()->profilerSampleBufferLapCount())
+    {
+        if (!trc->runtime()->spsProfiler.enabled())
+            gen = UINT32_MAX;
+    }
+
+    void operator()(JitcodeGlobalEntry &entry) {
+        // If an entry is not sampled, reset its generation to
+        // the invalid generation, and skip it.
+        if (!entry.isSampled(gen, lapCount)) {
+            entry.setGeneration(UINT32_MAX);
+            return;
+        }
+
+        // Mark jitcode pointed to by this entry.
+        entry.baseEntry().markJitcode(trc);
+
+        // Mark ion entry if necessary.
+        if (entry.isIon())
+            entry.ionEntry().mark(trc);
+    }
+};
+
+void
+JitcodeGlobalTable::mark(JSTracer *trc)
+{
+    AutoSuppressProfilerSampling suppressSampling(trc->runtime());
+    JitcodeMapEntryTraceCallback traceCallback(trc);
+
+    // Find start entry.
+    JitcodeGlobalEntry *entry = startTower_[0];
+    while (entry != nullptr) {
+        traceCallback(*entry);
+        entry = entry->tower_->next(0);
+    }
+}
+
+void
+JitcodeGlobalEntry::BaseEntry::markJitcode(JSTracer *trc)
+{
+    MarkJitCodeRoot(trc, &jitcode_, "jitcodglobaltable-baseentry-jitcode");
+}
+
+void
+JitcodeGlobalEntry::IonEntry::mark(JSTracer *trc)
+{
+    if (!optsAllTypes_)
+        return;
+
+    for (IonTrackedTypeWithAddendum *iter = optsAllTypes_->begin();
+         iter != optsAllTypes_->end(); iter++)
+    {
+        TypeSet::MarkTypeRoot(trc, &(iter->type), "jitcodeglobaltable-ionentry-type");
+    }
 }
 
 /* static */ void
@@ -804,7 +1166,7 @@
 
     SizedScriptList *scriptList = new (mem) SizedScriptList(numScripts, scripts,
                                                             &profilingStrings[0]);
-    out.init(code->raw(), code->rawEnd(), scriptList, this);
+    out.init(code, code->raw(), code->rawEnd(), scriptList, this);
     return true;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitcodeMap.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitcodeMap.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitcodeMap.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitcodeMap.h	2015-02-28 15:03:05.000000000 +0000
@@ -7,9 +7,9 @@
 #ifndef jit_JitcodeMap_h
 #define jit_JitcodeMap_h
 
-#include "ds/SplayTree.h"
 #include "jit/CompactBuffer.h"
 #include "jit/CompileInfo.h"
+#include "jit/ExecutableAllocator.h"
 #include "jit/OptimizationTracking.h"
 #include "jit/shared/CodeGenerator-shared.h"
 
@@ -31,11 +31,97 @@
  * distinguished by the kind field.
  */
 
+class JitcodeGlobalTable;
 class JitcodeIonTable;
 class JitcodeRegionEntry;
 
+class JitcodeGlobalEntry;
+
+class JitcodeSkiplistTower
+{
+  public:
+    static const unsigned MAX_HEIGHT = 32;
+
+  private:
+    uint8_t height_;
+    bool isFree_;
+    JitcodeGlobalEntry *ptrs_[1];
+
+  public:
+    explicit JitcodeSkiplistTower(unsigned height)
+      : height_(height),
+        isFree_(false)
+    {
+        MOZ_ASSERT(height >= 1 && height <= MAX_HEIGHT);
+        clearPtrs();
+    }
+
+    unsigned height() const {
+        return height_;
+    }
+
+    JitcodeGlobalEntry **ptrs(unsigned level) {
+        return ptrs_;
+    }
+
+    JitcodeGlobalEntry *next(unsigned level) const {
+        MOZ_ASSERT(!isFree_);
+        MOZ_ASSERT(level < height());
+        return ptrs_[level];
+    }
+    void setNext(unsigned level, JitcodeGlobalEntry *entry) {
+        MOZ_ASSERT(!isFree_);
+        MOZ_ASSERT(level < height());
+        ptrs_[level] = entry;
+    }
+
+    //
+    // When stored in a free-list, towers use 'ptrs_[0]' to store a
+    // pointer to the next tower.  In this context only, 'ptrs_[0]'
+    // may refer to a |JitcodeSkiplistTower *| instead of a
+    // |JitcodeGlobalEntry *|.
+    //
+
+    void addToFreeList(JitcodeSkiplistTower **freeList) {
+        JitcodeSkiplistTower *nextFreeTower = *freeList;
+        MOZ_ASSERT_IF(nextFreeTower, nextFreeTower->isFree_ &&
+                                     nextFreeTower->height() == height_);
+        ptrs_[0] = (JitcodeGlobalEntry *) nextFreeTower;
+        isFree_ = true;
+        *freeList = this;
+    }
+
+    static JitcodeSkiplistTower *PopFromFreeList(JitcodeSkiplistTower **freeList) {
+        if (!*freeList)
+            return nullptr;
+
+        JitcodeSkiplistTower *tower = *freeList;
+        MOZ_ASSERT(tower->isFree_);
+        JitcodeSkiplistTower *nextFreeTower = (JitcodeSkiplistTower *) tower->ptrs_[0];
+        tower->clearPtrs();
+        tower->isFree_ = false;
+        *freeList = nextFreeTower;
+        return tower;
+    }
+
+    static size_t CalculateSize(unsigned height) {
+        MOZ_ASSERT(height >= 1);
+        return sizeof(JitcodeSkiplistTower) +
+               (sizeof(JitcodeGlobalEntry *) * (height - 1));
+    }
+
+  private:
+    void clearPtrs() {
+        for (unsigned i = 0; i < height_; i++)
+            ptrs_[0] = nullptr;
+    }
+};
+
+
 class JitcodeGlobalEntry
 {
+    friend class JitcodeGlobalTable;
+
   public:
     enum Kind {
         INVALID = 0,
@@ -58,28 +144,53 @@
 
     struct BaseEntry
     {
+        JitCode *jitcode_;
         void *nativeStartAddr_;
         void *nativeEndAddr_;
-        Kind kind_;
+        uint32_t gen_;
+        Kind kind_ : 7;
 
         void init() {
+            jitcode_ = nullptr;
             nativeStartAddr_ = nullptr;
             nativeEndAddr_ = nullptr;
+            gen_ = UINT32_MAX;
             kind_ = INVALID;
         }
 
-        void init(Kind kind, void *nativeStartAddr, void *nativeEndAddr) {
+        void init(Kind kind, JitCode *code,
+                  void *nativeStartAddr, void *nativeEndAddr)
+        {
+            MOZ_ASSERT_IF(kind != Query, code);
             MOZ_ASSERT(nativeStartAddr);
             MOZ_ASSERT(nativeEndAddr);
             MOZ_ASSERT(kind > INVALID && kind < LIMIT);
+            jitcode_ = code;
             nativeStartAddr_ = nativeStartAddr;
             nativeEndAddr_ = nativeEndAddr;
+            gen_ = UINT32_MAX;
             kind_ = kind;
         }
 
+        uint32_t generation() const {
+            return gen_;
+        }
+        void setGeneration(uint32_t gen) {
+            gen_ = gen;
+        }
+        bool isSampled(uint32_t currentGen, uint32_t lapCount) {
+            if (gen_ == UINT32_MAX || currentGen == UINT32_MAX)
+                return false;
+            MOZ_ASSERT(currentGen >= gen_);
+            return (currentGen - gen_) <= lapCount;
+        }
+
         Kind kind() const {
             return kind_;
         }
+        JitCode *jitcode() const {
+            return jitcode_;
+        }
         void *nativeStartAddr() const {
             return nativeStartAddr_;
         }
@@ -96,6 +207,8 @@
         bool containsPointer(void *ptr) const {
             return startsBelowPointer(ptr) && endsAbovePointer(ptr);
         }
+
+        void markJitcode(JSTracer *trc);
     };
 
     struct IonEntry : public BaseEntry
@@ -146,12 +259,12 @@
 
         SizedScriptList *scriptList_;
 
-        void init(void *nativeStartAddr, void *nativeEndAddr,
+        void init(JitCode *code, void *nativeStartAddr, void *nativeEndAddr,
                   SizedScriptList *scriptList, JitcodeIonTable *regionTable)
         {
             MOZ_ASSERT(scriptList);
             MOZ_ASSERT(regionTable);
-            BaseEntry::init(Ion, nativeStartAddr, nativeEndAddr);
+            BaseEntry::init(Ion, code, nativeStartAddr, nativeEndAddr);
             regionTable_ = regionTable;
             scriptList_ = scriptList;
             optsRegionTable_ = nullptr;
@@ -210,10 +323,23 @@
         uint32_t callStackAtAddr(JSRuntime *rt, void *ptr, const char **results,
                                  uint32_t maxResults) const;
 
+        void youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                         JSScript **script, jsbytecode **pc) const;
+
         bool hasTrackedOptimizations() const {
             return !!optsRegionTable_;
         }
 
+        const IonTrackedOptimizationsRegionTable *trackedOptimizationsRegionTable() const {
+            MOZ_ASSERT(hasTrackedOptimizations());
+            return optsRegionTable_;
+        }
+
+        uint8_t numOptimizationAttempts() const {
+            MOZ_ASSERT(hasTrackedOptimizations());
+            return optsAttemptsTable_->numEntries();
+        }
+
         IonTrackedOptimizationsAttempts trackedOptimizationAttempts(uint8_t index) {
             MOZ_ASSERT(hasTrackedOptimizations());
             return optsAttemptsTable_->entry(index);
@@ -230,6 +356,8 @@
         }
 
         mozilla::Maybe<uint8_t> trackedOptimizationIndexAtAddr(void *ptr);
+
+        void mark(JSTracer *trc);
     };
 
     struct BaselineEntry : public BaseEntry
@@ -243,10 +371,11 @@
         jsbytecode *ionAbortPc_;
         const char *ionAbortMessage_;
 
-        void init(void *nativeStartAddr, void *nativeEndAddr, JSScript *script, const char *str)
+        void init(JitCode *code, void *nativeStartAddr, void *nativeEndAddr,
+                  JSScript *script, const char *str)
         {
             MOZ_ASSERT(script != nullptr);
-            BaseEntry::init(Baseline, nativeStartAddr, nativeEndAddr);
+            BaseEntry::init(Baseline, code, nativeStartAddr, nativeEndAddr);
             script_ = script;
             str_ = str;
         }
@@ -278,16 +407,20 @@
 
         uint32_t callStackAtAddr(JSRuntime *rt, void *ptr, const char **results,
                                  uint32_t maxResults) const;
+
+        void youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                         JSScript **script, jsbytecode **pc) const;
     };
 
     struct IonCacheEntry : public BaseEntry
     {
         void *rejoinAddr_;
 
-        void init(void *nativeStartAddr, void *nativeEndAddr, void *rejoinAddr)
+        void init(JitCode *code, void *nativeStartAddr, void *nativeEndAddr,
+                  void *rejoinAddr)
         {
             MOZ_ASSERT(rejoinAddr != nullptr);
-            BaseEntry::init(IonCache, nativeStartAddr, nativeEndAddr);
+            BaseEntry::init(IonCache, code, nativeStartAddr, nativeEndAddr);
             rejoinAddr_ = rejoinAddr;
         }
 
@@ -302,6 +435,9 @@
 
         uint32_t callStackAtAddr(JSRuntime *rt, void *ptr, const char **results,
                                  uint32_t maxResults) const;
+
+        void youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                         JSScript **script, jsbytecode **pc) const;
     };
 
     // Dummy entries are created for jitcode generated when profiling is not turned on,
@@ -309,8 +445,8 @@
     // stack when profiling is enabled.
     struct DummyEntry : public BaseEntry
     {
-        void init(void *nativeStartAddr, void *nativeEndAddr) {
-            BaseEntry::init(Dummy, nativeStartAddr, nativeEndAddr);
+        void init(JitCode *code, void *nativeStartAddr, void *nativeEndAddr) {
+            BaseEntry::init(Dummy, code, nativeStartAddr, nativeEndAddr);
         }
 
         void destroy() {}
@@ -326,6 +462,13 @@
         {
             return 0;
         }
+
+        void youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                         JSScript **script, jsbytecode **pc) const
+        {
+            *script = nullptr;
+            *pc = nullptr;
+        }
     };
 
     // QueryEntry is never stored in the table, just used for queries
@@ -334,7 +477,7 @@
     struct QueryEntry : public BaseEntry
     {
         void init(void *addr) {
-            BaseEntry::init(Query, addr, addr);
+            BaseEntry::init(Query, nullptr, addr, addr);
         }
         uint8_t *addr() const {
             return reinterpret_cast<uint8_t *>(nativeStartAddr());
@@ -343,6 +486,8 @@
     };
 
   private:
+    JitcodeSkiplistTower *tower_;
+
     union {
         // Shadowing BaseEntry instance to allow access to base fields
         // and type extraction.
@@ -367,27 +512,39 @@
     };
 
   public:
-    JitcodeGlobalEntry() {
+    JitcodeGlobalEntry()
+      : tower_(nullptr)
+    {
         base_.init();
     }
 
-    explicit JitcodeGlobalEntry(const IonEntry &ion) {
+    explicit JitcodeGlobalEntry(const IonEntry &ion)
+      : tower_(nullptr)
+    {
         ion_ = ion;
     }
 
-    explicit JitcodeGlobalEntry(const BaselineEntry &baseline) {
+    explicit JitcodeGlobalEntry(const BaselineEntry &baseline)
+      : tower_(nullptr)
+    {
         baseline_ = baseline;
     }
 
-    explicit JitcodeGlobalEntry(const IonCacheEntry &ionCache) {
+    explicit JitcodeGlobalEntry(const IonCacheEntry &ionCache)
+      : tower_(nullptr)
+    {
         ionCache_ = ionCache;
     }
 
-    explicit JitcodeGlobalEntry(const DummyEntry &dummy) {
+    explicit JitcodeGlobalEntry(const DummyEntry &dummy)
+      : tower_(nullptr)
+    {
         dummy_ = dummy;
     }
 
-    explicit JitcodeGlobalEntry(const QueryEntry &query) {
+    explicit JitcodeGlobalEntry(const QueryEntry &query)
+      : tower_(nullptr)
+    {
         query_ = query;
     }
 
@@ -419,6 +576,9 @@
         }
     }
 
+    JitCode *jitcode() const {
+        return baseEntry().jitcode();
+    }
     void *nativeStartAddr() const {
         return base_.nativeStartAddr();
     }
@@ -426,6 +586,16 @@
         return base_.nativeEndAddr();
     }
 
+    uint32_t generation() const {
+        return baseEntry().generation();
+    }
+    void setGeneration(uint32_t gen) {
+        baseEntry().setGeneration(gen);
+    }
+    bool isSampled(uint32_t currentGen, uint32_t lapCount) {
+        return baseEntry().isSampled(currentGen, lapCount);
+    }
+
     bool startsBelowPointer(void *ptr) const {
         return base_.startsBelowPointer(ptr);
     }
@@ -452,6 +622,9 @@
         return base_.kind();
     }
 
+    bool isValid() const {
+        return (kind() > INVALID) && (kind() < LIMIT);
+    }
     bool isIon() const {
         return kind() == Ion;
     }
@@ -468,6 +641,10 @@
         return kind() == Query;
     }
 
+    BaseEntry &baseEntry() {
+        MOZ_ASSERT(isValid());
+        return base_;
+    }
     IonEntry &ionEntry() {
         MOZ_ASSERT(isIon());
         return ion_;
@@ -489,6 +666,10 @@
         return query_;
     }
 
+    const BaseEntry &baseEntry() const {
+        MOZ_ASSERT(isValid());
+        return base_;
+    }
     const IonEntry &ionEntry() const {
         MOZ_ASSERT(isIon());
         return ion_;
@@ -551,12 +732,32 @@
         return false;
     }
 
+    void youngestFrameLocationAtAddr(JSRuntime *rt, void *ptr,
+                                     JSScript **script, jsbytecode **pc) const
+    {
+        switch (kind()) {
+          case Ion:
+            return ionEntry().youngestFrameLocationAtAddr(rt, ptr, script, pc);
+          case Baseline:
+            return baselineEntry().youngestFrameLocationAtAddr(rt, ptr, script, pc);
+          case IonCache:
+            return ionCacheEntry().youngestFrameLocationAtAddr(rt, ptr, script, pc);
+          case Dummy:
+            return dummyEntry().youngestFrameLocationAtAddr(rt, ptr, script, pc);
+          default:
+            MOZ_CRASH("Invalid JitcodeGlobalEntry kind.");
+        }
+    }
+
     // Figure out the number of the (JSScript *, jsbytecode *) pairs that are active
     // at this location.
     uint32_t lookupInlineCallDepth(void *ptr);
 
     // Compare two global entries.
     static int compare(const JitcodeGlobalEntry &ent1, const JitcodeGlobalEntry &ent2);
+    int compareTo(const JitcodeGlobalEntry &other) {
+        return compare(*this, other);
+    }
 
     // Compute a profiling string for a given script.
     static char *createScriptString(JSContext *cx, JSScript *script, size_t *length=nullptr);
@@ -600,6 +801,35 @@
     const IonTrackedTypeVector *allTrackedTypes() {
         return ionEntry().allTrackedTypes();
     }
+
+    //
+    // When stored in a free-list, entries use 'tower_' to store a
+    // pointer to the next entry.  In this context only, 'tower_'
+    // may refer to a |JitcodeGlobalEntry *| instead of a
+    // |JitcodeSkiplistTower *|.
+    //
+
+    void addToFreeList(JitcodeGlobalEntry **freeList) {
+        MOZ_ASSERT(!isValid());
+
+        JitcodeGlobalEntry *nextFreeEntry = *freeList;
+        MOZ_ASSERT_IF(nextFreeEntry, !nextFreeEntry->isValid());
+
+        tower_ = (JitcodeSkiplistTower *) nextFreeEntry;
+        *freeList = this;
+    }
+
+    static JitcodeGlobalEntry *PopFromFreeList(JitcodeGlobalEntry **freeList) {
+        if (!*freeList)
+            return nullptr;
+
+        JitcodeGlobalEntry *entry = *freeList;
+        MOZ_ASSERT(!entry->isValid());
+        JitcodeGlobalEntry *nextFreeEntry = (JitcodeGlobalEntry *) entry->tower_;
+        entry->tower_ = nullptr;
+        *freeList = nextFreeEntry;
+        return entry;
+    }
 };
 
 /*
@@ -607,31 +837,40 @@
  */
 class JitcodeGlobalTable
 {
-  public:
-    typedef SplayTree<JitcodeGlobalEntry, JitcodeGlobalEntry> EntryTree;
-
-    typedef Vector<JitcodeGlobalEntry, 0, SystemAllocPolicy> EntryVector;
-
   private:
     static const size_t LIFO_CHUNK_SIZE = 16 * 1024;
-    LifoAlloc treeAlloc_;
-    EntryTree tree_;
-    EntryVector entries_;
+
+    LifoAlloc alloc_;
+    JitcodeGlobalEntry *freeEntries_;
+    uint32_t rand_;
+    uint32_t skiplistSize_;
+
+    JitcodeGlobalEntry *startTower_[JitcodeSkiplistTower::MAX_HEIGHT];
+    JitcodeSkiplistTower *freeTowers_[JitcodeSkiplistTower::MAX_HEIGHT];
 
   public:
-    JitcodeGlobalTable() : treeAlloc_(LIFO_CHUNK_SIZE), tree_(&treeAlloc_), entries_() {
-        // Always checking coherency in DEBUG builds may cause tests to time
-        // out under --baseline-eager or --ion-eager.
-        tree_.disableCheckCoherency();
+    JitcodeGlobalTable()
+      : alloc_(LIFO_CHUNK_SIZE), freeEntries_(nullptr), rand_(0), skiplistSize_(0)
+    {
+        for (unsigned i = 0; i < JitcodeSkiplistTower::MAX_HEIGHT; i++)
+            startTower_[i] = nullptr;
+        for (unsigned i = 0; i < JitcodeSkiplistTower::MAX_HEIGHT; i++)
+            freeTowers_[i] = nullptr;
     }
     ~JitcodeGlobalTable() {}
 
     bool empty() const {
-        return tree_.empty();
+        return skiplistSize_ == 0;
     }
 
     bool lookup(void *ptr, JitcodeGlobalEntry *result, JSRuntime *rt);
-    void lookupInfallible(void *ptr, JitcodeGlobalEntry *result, JSRuntime *rt);
+    bool lookupForSampler(void *ptr, JitcodeGlobalEntry *result, JSRuntime *rt,
+                          uint32_t sampleBufferGen);
+
+    void lookupInfallible(void *ptr, JitcodeGlobalEntry *result, JSRuntime *rt) {
+        mozilla::DebugOnly<bool> success = lookup(ptr, result, rt);
+        MOZ_ASSERT(success);
+    }
 
     bool addEntry(const JitcodeGlobalEntry::IonEntry &entry, JSRuntime *rt) {
         return addEntry(JitcodeGlobalEntry(entry), rt);
@@ -647,9 +886,37 @@
     }
 
     void removeEntry(void *startAddr, JSRuntime *rt);
+    void releaseEntry(void *startAddr, JSRuntime *rt);
+
+    void mark(JSTracer *trc);
 
   private:
     bool addEntry(const JitcodeGlobalEntry &entry, JSRuntime *rt);
+
+    JitcodeGlobalEntry *lookupInternal(void *ptr);
+
+    // Initialize towerOut such that towerOut[i] (for i in [0, MAX_HEIGHT-1])
+    // is a JitcodeGlobalEntry that is sorted to be <query, whose successor at
+    // level i is either null, or sorted to be >= query.
+    //
+    // If entry with the given properties does not exist for level i, then
+    // towerOut[i] is initialized to nullptr.
+    void searchInternal(const JitcodeGlobalEntry &query, JitcodeGlobalEntry **towerOut);
+
+    JitcodeGlobalEntry *searchAtHeight(unsigned level, JitcodeGlobalEntry *start,
+                                       const JitcodeGlobalEntry &query);
+
+    // Calculate next random tower height.
+    unsigned generateTowerHeight();
+
+    JitcodeSkiplistTower *allocateTower(unsigned height);
+    JitcodeGlobalEntry *allocateEntry();
+
+#ifdef DEBUG
+    void verifySkiplist();
+#else
+    void verifySkiplist() {}
+#endif
 };
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitCompartment.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitCompartment.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitCompartment.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitCompartment.h	2015-02-28 15:03:05.000000000 +0000
@@ -7,10 +7,12 @@
 #ifndef jit_JitCompartment_h
 #define jit_JitCompartment_h
 
+#include "mozilla/Array.h"
 #include "mozilla/MemoryReporting.h"
 
 #include "jsweakcache.h"
 
+#include "builtin/TypedObject.h"
 #include "jit/CompileInfo.h"
 #include "jit/IonCode.h"
 #include "jit/JitFrames.h"
@@ -433,11 +435,19 @@
     JitCode *regExpExecStub_;
     JitCode *regExpTestStub_;
 
+    mozilla::Array<ReadBarrieredObject, SimdTypeDescr::LAST_TYPE + 1> simdTemplateObjects_;
+
     JitCode *generateStringConcatStub(JSContext *cx);
     JitCode *generateRegExpExecStub(JSContext *cx);
     JitCode *generateRegExpTestStub(JSContext *cx);
 
   public:
+    JSObject *getSimdTemplateObjectFor(JSContext *cx, Handle<SimdTypeDescr*> descr) {
+        ReadBarrieredObject &tpl = simdTemplateObjects_[descr->type()];
+        if (!tpl)
+            tpl.set(TypedObject::createZeroed(cx, descr, 0, gc::TenuredHeap));
+        return tpl.get();
+    }
     JitCode *getStubCode(uint32_t key) {
         ICStubCodeMap::AddPtr p = stubCodes_->lookupForAdd(key);
         if (p)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitFrameIterator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitFrameIterator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitFrameIterator.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitFrameIterator.h	2015-02-28 15:03:05.000000000 +0000
@@ -382,6 +382,7 @@
 
 
 class RResumePoint;
+class RSimdBox;
 
 // Reads frame information in snapshot-encoding order (that is, outermost frame
 // to innermost frame).
@@ -442,6 +443,10 @@
     void writeAllocationValuePayload(const RValueAllocation &a, Value v);
     void warnUnreadableAllocation();
 
+  private:
+    friend class RSimdBox;
+    const FloatRegisters::RegisterContent *floatAllocationPointer(const RValueAllocation &a) const;
+
   public:
     // Handle iterating over RValueAllocations of the snapshots.
     inline RValueAllocation readAllocation() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitFrames.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitFrames.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitFrames.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitFrames.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -51,40 +51,46 @@
     return -slot;
 }
 
+static inline uint8_t *
+AddressOfFrameSlot(JitFrameLayout *fp, int32_t slot)
+{
+    return (uint8_t *) fp + OffsetOfFrameSlot(slot);
+}
+
 static inline uintptr_t
 ReadFrameSlot(JitFrameLayout *fp, int32_t slot)
 {
-    return *(uintptr_t *)((char *)fp + OffsetOfFrameSlot(slot));
+    return *(uintptr_t *) AddressOfFrameSlot(fp, slot);
 }
 
 static inline void
 WriteFrameSlot(JitFrameLayout *fp, int32_t slot, uintptr_t value)
 {
-    *(uintptr_t *)((char *)fp + OffsetOfFrameSlot(slot)) = value;
+    *(uintptr_t *) AddressOfFrameSlot(fp, slot) = value;
 }
 
 static inline double
 ReadFrameDoubleSlot(JitFrameLayout *fp, int32_t slot)
 {
-    return *(double *)((char *)fp + OffsetOfFrameSlot(slot));
+    return *(double *) AddressOfFrameSlot(fp, slot);
 }
 
 static inline float
 ReadFrameFloat32Slot(JitFrameLayout *fp, int32_t slot)
 {
-    return *(float *)((char *)fp + OffsetOfFrameSlot(slot));
+    return *(float *) AddressOfFrameSlot(fp, slot);
 }
 
 static inline int32_t
 ReadFrameInt32Slot(JitFrameLayout *fp, int32_t slot)
 {
-    return *(int32_t *)((char *)fp + OffsetOfFrameSlot(slot));
+    return *(int32_t *) AddressOfFrameSlot(fp, slot);
 }
 
 static inline bool
 ReadFrameBooleanSlot(JitFrameLayout *fp, int32_t slot)
 {
-    return *(bool *)((char *)fp + OffsetOfFrameSlot(slot));
+    return *(bool *) AddressOfFrameSlot(fp, slot);
 }
 
 JitFrameIterator::JitFrameIterator()
@@ -747,6 +753,11 @@
 
     JitActivation *activation = cx->runtime()->activation()->asJit();
 
+#ifdef CHECK_OSIPOINT_REGISTERS
+    if (js_JitOptions.checkOsiPointRegisters)
+        activation->setCheckRegs(false);
+#endif
+
     // The Debugger onExceptionUnwind hook (reachable via
     // HandleExceptionBaseline below) may cause on-stack recompilation of
     // baseline scripts, which may patch return addresses on the stack. Since
@@ -875,7 +886,7 @@
 
         if (overrecursed) {
             // We hit an overrecursion error during bailout. Report it now.
-            js_ReportOverRecursed(cx);
+            ReportOverRecursed(cx);
         }
     }
 
@@ -1824,19 +1835,20 @@
       case RValueAllocation::DOUBLE_REG:
         return DoubleValue(fromRegister(alloc.fpuReg()));
 
-      case RValueAllocation::FLOAT32_REG:
+      case RValueAllocation::ANY_FLOAT_REG:
       {
         union {
             double d;
             float f;
         } pun;
+        MOZ_ASSERT(alloc.fpuReg().isSingle());
         pun.d = fromRegister(alloc.fpuReg());
         // The register contains the encoding of a float32. We just read
         // the bits without making any conversion.
         return Float32Value(pun.f);
       }
 
-      case RValueAllocation::FLOAT32_STACK:
+      case RValueAllocation::ANY_FLOAT_STACK:
         return Float32Value(ReadFrameFloat32Slot(fp_, alloc.stackOffset()));
 
       case RValueAllocation::TYPED_REG:
@@ -1924,6 +1936,21 @@
     }
 }
 
+const FloatRegisters::RegisterContent *
+SnapshotIterator::floatAllocationPointer(const RValueAllocation &alloc) const
+{
+    switch (alloc.mode()) {
+      case RValueAllocation::ANY_FLOAT_REG:
+        return machine_.address(alloc.fpuReg());
+
+      case RValueAllocation::ANY_FLOAT_STACK:
+        return (FloatRegisters::RegisterContent *) AddressOfFrameSlot(fp_, alloc.stackOffset());
+
+      default:
+        MOZ_CRASH("Not a float allocation.");
+    }
+}
+
 Value
 SnapshotIterator::maybeRead(const RValueAllocation &a, MaybeReadFallback &fallback)
 {
@@ -1961,8 +1988,8 @@
       case RValueAllocation::CST_UNDEFINED:
       case RValueAllocation::CST_NULL:
       case RValueAllocation::DOUBLE_REG:
-      case RValueAllocation::FLOAT32_REG:
-      case RValueAllocation::FLOAT32_STACK:
+      case RValueAllocation::ANY_FLOAT_REG:
+      case RValueAllocation::ANY_FLOAT_STACK:
         MOZ_CRASH("Not a GC thing: Unexpected write");
         break;
 
@@ -2456,32 +2483,39 @@
 }
 
 MachineState
-MachineState::FromBailout(mozilla::Array<uintptr_t, Registers::Total> &regs,
-                          mozilla::Array<double, FloatRegisters::TotalPhys> &fpregs)
+MachineState::FromBailout(RegisterDump::GPRArray &regs, RegisterDump::FPUArray &fpregs)
 {
     MachineState machine;
 
     for (unsigned i = 0; i < Registers::Total; i++)
-        machine.setRegisterLocation(Register::FromCode(i), &regs[i]);
+        machine.setRegisterLocation(Register::FromCode(i), &regs[i].r);
 #ifdef JS_CODEGEN_ARM
     float *fbase = (float*)&fpregs[0];
     for (unsigned i = 0; i < FloatRegisters::TotalDouble; i++)
-        machine.setRegisterLocation(FloatRegister(i, FloatRegister::Double), &fpregs[i]);
+        machine.setRegisterLocation(FloatRegister(i, FloatRegister::Double), &fpregs[i].d);
     for (unsigned i = 0; i < FloatRegisters::TotalSingle; i++)
         machine.setRegisterLocation(FloatRegister(i, FloatRegister::Single), (double*)&fbase[i]);
 #elif defined(JS_CODEGEN_MIPS)
     float *fbase = (float*)&fpregs[0];
     for (unsigned i = 0; i < FloatRegisters::TotalDouble; i++) {
         machine.setRegisterLocation(FloatRegister::FromIndex(i, FloatRegister::Double),
-                                    &fpregs[i]);
+                                    &fpregs[i].d);
     }
     for (unsigned i = 0; i < FloatRegisters::TotalSingle; i++) {
         machine.setRegisterLocation(FloatRegister::FromIndex(i, FloatRegister::Single),
                                     (double*)&fbase[i]);
     }
+#elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+    for (unsigned i = 0; i < FloatRegisters::TotalPhys; i++) {
+        machine.setRegisterLocation(FloatRegister(i, FloatRegisters::Single), &fpregs[i]);
+        machine.setRegisterLocation(FloatRegister(i, FloatRegisters::Double), &fpregs[i]);
+        machine.setRegisterLocation(FloatRegister(i, FloatRegisters::Int32x4), &fpregs[i]);
+        machine.setRegisterLocation(FloatRegister(i, FloatRegisters::Float32x4), &fpregs[i]);
+    }
+#elif defined(JS_CODEGEN_NONE)
+    MOZ_CRASH();
 #else
-    for (unsigned i = 0; i < FloatRegisters::Total; i++)
-        machine.setRegisterLocation(FloatRegister::FromCode(i), &fpregs[i]);
+# error "Unknown architecture!"
 #endif
     return machine;
 }
@@ -2851,7 +2885,6 @@
 
 JitProfilingFrameIterator::JitProfilingFrameIterator(void *exitFrame)
 {
-    // Exit frame was en
     ExitFrameLayout *frame = (ExitFrameLayout *) exitFrame;
     FrameType prevType = frame->prevType();
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitFrames.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitFrames.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/JitFrames.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/JitFrames.h	2015-02-28 15:03:05.000000000 +0000
@@ -289,16 +289,12 @@
 
 // Returns the JSScript associated with the topmost JIT frame.
 inline JSScript *
-GetTopJitJSScript(JSContext *cx, void **returnAddrOut = nullptr)
+GetTopJitJSScript(JSContext *cx)
 {
     JitFrameIterator iter(cx);
     MOZ_ASSERT(iter.type() == JitFrame_Exit);
     ++iter;
 
-    MOZ_ASSERT(iter.returnAddressToFp() != nullptr);
-    if (returnAddrOut)
-        *returnAddrOut = (void *) iter.returnAddressToFp();
-
     if (iter.isBaselineStub()) {
         ++iter;
         MOZ_ASSERT(iter.isBaselineJS());
@@ -871,8 +867,8 @@
 // An invalidation bailout stack is at the stack pointer for the callee frame.
 class InvalidationBailoutStack
 {
-    mozilla::Array<double, FloatRegisters::TotalPhys> fpregs_;
-    mozilla::Array<uintptr_t, Registers::Total> regs_;
+    RegisterDump::FPUArray fpregs_;
+    RegisterDump::GPRArray regs_;
     IonScript   *ionScript_;
     uint8_t       *osiPointReturnAddress_;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LinearScan.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LinearScan.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LinearScan.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LinearScan.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -998,7 +998,7 @@
     for (RegisterSet regs(allRegisters_); !regs.empty(needFloat); ) {
         // If the requested register is a FP, we may need to look at
         // all of the float32 and float64 registers.
-        AnyRegister reg = regs.takeAny(needFloat);
+        AnyRegister reg = regs.takeUnaliasedAny(needFloat);
         freeUntilPos[reg.code()] = CodePosition::MAX;
     }
     for (IntervalIterator i(active.begin()); i != active.end(); i++) {
@@ -1126,7 +1126,7 @@
     CodePosition nextUsePos[AnyRegister::Total];
     bool needFloat = vregs[current->vreg()].isFloatReg();
     for (RegisterSet regs(allRegisters_); !regs.empty(needFloat); ) {
-        AnyRegister reg = regs.takeAny(needFloat);
+        AnyRegister reg = regs.takeUnaliasedAny(needFloat);
         nextUsePos[reg.code()] = CodePosition::MAX;
     }
     for (IntervalIterator i(active.begin()); i != active.end(); i++) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Linker.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Linker.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Linker.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Linker.h	2015-02-28 15:03:05.000000000 +0000
@@ -24,7 +24,7 @@
     MacroAssembler &masm;
 
     JitCode *fail(JSContext *cx) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LIR-Common.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LIR-Common.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LIR-Common.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LIR-Common.h	2015-02-28 15:03:05.000000000 +0000
@@ -153,6 +153,15 @@
         return LAllocation();
 #endif
     }
+
+    bool uses(Register reg) {
+        for (size_t i = 0; i < numMoves(); i++) {
+            LMove move = getMove(i);
+            if (*move.from() == LGeneralReg(reg) || *move.to() == LGeneralReg(reg))
+                return true;
+        }
+        return false;
+    }
 };
 
 
@@ -212,6 +221,21 @@
     }
 };
 
+// Reinterpret the bits of a SIMD value with a different type.
+class LSimdReinterpretCast : public LInstructionHelper<1, 1, 0>
+{
+  public:
+    LIR_HEADER(SimdReinterpretCast)
+    explicit LSimdReinterpretCast(const LAllocation &v)
+    {
+        setOperand(0, v);
+    }
+
+    MSimdReinterpretCast *mir() const {
+        return mir_->toSimdReinterpretCast();
+    }
+};
+
 class LSimdExtractElementBase : public LInstructionHelper<1, 1, 0>
 {
   protected:
@@ -511,6 +535,9 @@
     MSimdBinaryBitwise::Operation operation() const {
         return mir_->toSimdBinaryBitwise()->operation();
     }
+    const char *extraName() const {
+        return MSimdBinaryBitwise::OperationName(operation());
+    }
     MIRType type() const {
         return mir_->type();
     }
@@ -4652,6 +4679,22 @@
     }
 };
 
+// If necessary, convert an unboxed object in a particular group to its native
+// representation.
+class LConvertUnboxedObjectToNative : public LInstructionHelper<0, 1, 0>
+{
+  public:
+    LIR_HEADER(ConvertUnboxedObjectToNative)
+
+    explicit LConvertUnboxedObjectToNative(const LAllocation &object) {
+        setOperand(0, object);
+    }
+
+    MConvertUnboxedObjectToNative *mir() {
+        return mir_->toConvertUnboxedObjectToNative();
+    }
+};
+
 class LArrayPopShiftV : public LInstructionHelper<BOX_PIECES, 1, 2>
 {
   public:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LIR.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LIR.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LIR.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LIR.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -395,11 +395,8 @@
         JS_snprintf(buf, size, "v%d:r", use->virtualRegister());
         break;
       case LUse::FIXED:
-        // Unfortunately, we don't know here whether the virtual register is a
-        // float or a double. Should we steal a bit in LUse for help? For now,
-        // nothing defines any fixed xmm registers.
         JS_snprintf(buf, size, "v%d:%s", use->virtualRegister(),
-                    Registers::GetName(Registers::Code(use->registerCode())));
+                    AnyRegister::FromCode(use->registerCode()).name());
         break;
       case LUse::ANY:
         JS_snprintf(buf, size, "v%d:r?", use->virtualRegister());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LIR.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LIR.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LIR.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LIR.h	2015-02-28 15:03:05.000000000 +0000
@@ -492,13 +492,15 @@
     }
     bool isCompatibleReg(const AnyRegister &r) const {
         if (isFloatReg() && r.isFloat()) {
-#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
             if (type() == FLOAT32)
                 return r.fpu().isSingle();
-            return r.fpu().isDouble();
-#else
-            return true;
-#endif
+            if (type() == DOUBLE)
+                return r.fpu().isDouble();
+            if (type() == INT32X4)
+                return r.fpu().isInt32x4();
+            if (type() == FLOAT32X4)
+                return r.fpu().isFloat32x4();
+            MOZ_CRASH("Unexpected MDefinition type");
         }
         return !isFloatReg() && !r.isFloat();
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LiveRangeAllocator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LiveRangeAllocator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LiveRangeAllocator.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LiveRangeAllocator.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -647,8 +647,16 @@
             if (ins->isCall()) {
                 for (AnyRegisterIterator iter(allRegisters_); iter.more(); iter++) {
                     if (forLSRA) {
-                        if (!addFixedRangeAtHead(*iter, inputOf(*ins), outputOf(*ins)))
-                            return false;
+                        AnyRegister reg(*iter);
+                        // AnyRegisterIterator only iterates every allocatable
+                        // register once, and skip all aliased registers. Thus,
+                        // we have to record that each typed-variant/alias of
+                        // the same register has to be spilled if it got
+                        // allocated.
+                        for (size_t i = 0; i < reg.numAliased(); i++) {
+                            if (!addFixedRangeAtHead(reg.aliased(i), inputOf(*ins), outputOf(*ins)))
+                                return false;
+                        }
                     } else {
                         bool found = false;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LOpcodes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LOpcodes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/LOpcodes.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/LOpcodes.h	2015-02-28 15:03:05.000000000 +0000
@@ -22,6 +22,7 @@
     _(SimdSplatX4)                  \
     _(Int32x4)                      \
     _(Float32x4)                    \
+    _(SimdReinterpretCast)          \
     _(SimdExtractElementI)          \
     _(SimdExtractElementF)          \
     _(SimdInsertElementI)           \
@@ -223,6 +224,7 @@
     _(StoreElementV)                \
     _(StoreElementT)                \
     _(StoreUnboxedPointer)          \
+    _(ConvertUnboxedObjectToNative) \
     _(ArrayPopShiftV)               \
     _(ArrayPopShiftT)               \
     _(ArrayPushV)                   \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Lowering.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Lowering.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Lowering.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Lowering.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -2546,6 +2546,9 @@
 void
 LIRGenerator::visitBoundsCheck(MBoundsCheck *ins)
 {
+     if (!ins->fallible())
+         return;
+
     LInstruction *check;
     if (ins->minimum() || ins->maximum()) {
         check = new(alloc()) LBoundsCheckRange(useRegisterOrConstant(ins->index()),
@@ -2767,6 +2770,14 @@
 }
 
 void
+LIRGenerator::visitConvertUnboxedObjectToNative(MConvertUnboxedObjectToNative *ins)
+{
+    LInstruction *check = new(alloc()) LConvertUnboxedObjectToNative(useRegister(ins->object()));
+    add(check, ins);
+    assignSafepoint(check, ins);
+}
+
+void
 LIRGenerator::visitEffectiveAddress(MEffectiveAddress *ins)
 {
     define(new(alloc()) LEffectiveAddress(useRegister(ins->base()), useRegister(ins->index())), ins);
@@ -3066,6 +3077,11 @@
 {
     MOZ_ASSERT(ins->scopeObj()->type() == MIRType_Object);
 
+    // Set the performs-call flag so that we don't omit the overrecursed check.
+    // This is necessary because the cache can attach a scripted getter stub
+    // that calls this script recursively.
+    gen->setPerformsCall();
+
     LGetNameCache *lir = new(alloc()) LGetNameCache(useRegister(ins->scopeObj()));
     defineBox(lir, ins);
     assignSafepoint(lir, ins);
@@ -3083,6 +3099,14 @@
 LIRGenerator::visitGetPropertyCache(MGetPropertyCache *ins)
 {
     MOZ_ASSERT(ins->object()->type() == MIRType_Object);
+
+    if (ins->monitoredResult()) {
+        // Set the performs-call flag so that we don't omit the overrecursed
+        // check. This is necessary because the cache can attach a scripted
+        // getter stub that calls this script recursively.
+        gen->setPerformsCall();
+    }
+
     if (ins->type() == MIRType_Value) {
         LGetPropertyCacheV *lir = new(alloc()) LGetPropertyCacheV(useRegister(ins->object()));
         defineBox(lir, ins);
@@ -3313,6 +3337,11 @@
     LUse obj = useRegisterAtStart(ins->object());
     LDefinition slots = tempCopy(ins->object(), 0);
 
+    // Set the performs-call flag so that we don't omit the overrecursed check.
+    // This is necessary because the cache can attach a scripted setter stub
+    // that calls this script recursively.
+    gen->setPerformsCall();
+
     LInstruction *lir;
     if (ins->value()->type() == MIRType_Value) {
         lir = new(alloc()) LSetPropertyCacheV(obj, slots);
@@ -3633,8 +3662,10 @@
         lir->setOperand(0, useFixed(rval, ReturnFloat32Reg));
     else if (rval->type() == MIRType_Double)
         lir->setOperand(0, useFixed(rval, ReturnDoubleReg));
-    else if (IsSimdType(rval->type()))
-        lir->setOperand(0, useFixed(rval, ReturnSimdReg));
+    else if (rval->type() == MIRType_Int32x4)
+        lir->setOperand(0, useFixed(rval, ReturnInt32x4Reg));
+    else if (rval->type() == MIRType_Float32x4)
+        lir->setOperand(0, useFixed(rval, ReturnFloat32x4Reg));
     else if (rval->type() == MIRType_Int32)
         lir->setOperand(0, useFixed(rval, ReturnReg));
     else
@@ -3772,9 +3803,8 @@
     MOZ_ASSERT(IsSimdType(ins->input()->type()));
     LUse in = useRegister(ins->input());
     LSimdBox *lir = new(alloc()) LSimdBox(in, temp());
-    // :TODO: Cannot spill SIMD registers (Bug 1112164)
-    assignSnapshot(lir, Bailout_Inevitable);
     define(lir, ins);
+    assignSafepoint(lir, ins);
 }
 
 void
@@ -3836,7 +3866,12 @@
 LIRGenerator::visitSimdReinterpretCast(MSimdReinterpretCast *ins)
 {
     MOZ_ASSERT(IsSimdType(ins->type()) && IsSimdType(ins->input()->type()));
-    redefine(ins, ins->input());
+    MDefinition *input = ins->input();
+    LUse use = useRegisterAtStart(input);
+    // :TODO: (Bug 1132894) We have to allocate a different register as redefine
+    // and/or defineReuseInput are not yet capable of reusing the same register
+    // with a different register type.
+    define(new(alloc()) LSimdReinterpretCast(use), ins);
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Lowering.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Lowering.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Lowering.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Lowering.h	2015-02-28 15:03:05.000000000 +0000
@@ -197,6 +197,7 @@
     void visitStoreElementHole(MStoreElementHole *ins);
     void visitStoreUnboxedObjectOrNull(MStoreUnboxedObjectOrNull *ins);
     void visitStoreUnboxedString(MStoreUnboxedString *ins);
+    void visitConvertUnboxedObjectToNative(MConvertUnboxedObjectToNative *ins);
     void visitEffectiveAddress(MEffectiveAddress *ins);
     void visitArrayPopShift(MArrayPopShift *ins);
     void visitArrayPush(MArrayPush *ins);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MacroAssembler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MacroAssembler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MacroAssembler.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MacroAssembler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -138,14 +138,9 @@
         jump(&matched);
         bind(&fail);
 
-        // Type set guards might miss when an object's type changes and its
-        // properties become unknown, so check for this case.
         if (obj == scratch)
             extractObject(address, scratch);
-        loadPtr(Address(obj, JSObject::offsetOfGroup()), scratch);
-        branchTestPtr(Assembler::NonZero,
-                      Address(scratch, ObjectGroup::offsetOfFlags()),
-                      Imm32(OBJECT_FLAG_UNKNOWN_PROPERTIES), &matched);
+        guardTypeSetMightBeIncomplete(obj, scratch, &matched);
 
         assumeUnreachable("Unexpected object type");
 #endif
@@ -154,6 +149,22 @@
     bind(&matched);
 }
 
+void
+MacroAssembler::guardTypeSetMightBeIncomplete(Register obj, Register scratch, Label *label)
+{
+    // Type set guards might miss when an object's group changes. In this case
+    // either its properties will become unknown, or it will change to a native
+    // object with an original unboxed group. Jump to label if this might have
+    // happened for the input object.
+
+    loadPtr(Address(obj, JSObject::offsetOfGroup()), scratch);
+    load32(Address(scratch, ObjectGroup::offsetOfFlags()), scratch);
+    branchTest32(Assembler::NonZero, scratch, Imm32(OBJECT_FLAG_UNKNOWN_PROPERTIES), label);
+    and32(Imm32(OBJECT_FLAG_ADDENDUM_MASK), scratch);
+    branch32(Assembler::Equal,
+             scratch, Imm32(ObjectGroup::addendumOriginalUnboxedGroupValue()), label);
+}
+
 template <typename Set> void
 MacroAssembler::guardObjectType(Register obj, const Set *types,
                                 Register scratch, Label *miss)
@@ -1372,9 +1383,9 @@
 }
 
 static void
-ReportOverRecursed(JSContext *cx)
+BailoutReportOverRecursed(JSContext *cx)
 {
-    js_ReportOverRecursed(cx);
+    ReportOverRecursed(cx);
 }
 
 void
@@ -1400,7 +1411,7 @@
         loadJSContext(ReturnReg);
         setupUnalignedABICall(1, scratch);
         passABIArg(ReturnReg);
-        callWithABI(JS_FUNC_TO_DATA_PTR(void *, ReportOverRecursed));
+        callWithABI(JS_FUNC_TO_DATA_PTR(void *, BailoutReportOverRecursed));
         jump(exceptionLabel());
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MacroAssembler.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MacroAssembler.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MacroAssembler.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MacroAssembler.h	2015-02-28 15:03:05.000000000 +0000
@@ -280,6 +280,8 @@
     template <typename Source>
     void guardType(const Source &address, TypeSet::Type type, Register scratch, Label *miss);
 
+    void guardTypeSetMightBeIncomplete(Register obj, Register scratch, Label *label);
+
     void loadObjShape(Register objReg, Register dest) {
         loadPtr(Address(objReg, JSObject::offsetOfShape()), dest);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MCallOptimize.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MCallOptimize.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MCallOptimize.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MCallOptimize.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -64,7 +64,7 @@
     }
 
     // Array natives.
-    if (native == js_Array)
+    if (native == ArrayConstructor)
         return inlineArray(callInfo);
     if (native == js::array_pop)
         return inlineArrayPopShift(callInfo, MArrayPopShift::Pop);
@@ -152,15 +152,15 @@
         return inlineMathFunction(callInfo, MMathFunction::Cbrt);
 
     // String natives.
-    if (native == js_String)
+    if (native == StringConstructor)
         return inlineStringObject(callInfo);
-    if (native == js::str_split)
+    if (native == str_split)
         return inlineStringSplit(callInfo);
-    if (native == js_str_charCodeAt)
+    if (native == str_charCodeAt)
         return inlineStrCharCodeAt(callInfo);
-    if (native == js::str_fromCharCode)
+    if (native == str_fromCharCode)
         return inlineStrFromCharCode(callInfo);
-    if (native == js_str_charAt)
+    if (native == str_charAt)
         return inlineStrCharAt(callInfo);
     if (native == str_replace)
         return inlineStrReplace(callInfo);
@@ -257,17 +257,30 @@
         return inlineBoundFunction(callInfo, target);
 
     // Simd functions
-#define INLINE_INT32X4_SIMD_ARITH_(OP)                                                      \
-    if (native == js::simd_int32x4_##OP)                                                    \
-        return inlineSimdInt32x4BinaryArith(callInfo, native, MSimdBinaryArith::Op_##OP);
+#define INLINE_INT32X4_SIMD_ARITH_(OP)                                                           \
+    if (native == js::simd_int32x4_##OP)                                                         \
+        return inlineBinarySimd<MSimdBinaryArith>(callInfo, native, MSimdBinaryArith::Op_##OP,   \
+                                                  SimdTypeDescr::TYPE_INT32);
     ARITH_COMMONX4_SIMD_OP(INLINE_INT32X4_SIMD_ARITH_)
 #undef INLINE_INT32X4_SIMD_ARITH_
 
-#define INLINE_INT32X4_SIMD_BITWISE_(OP)                                                    \
-    if (native == js::simd_int32x4_##OP)                                                    \
-        return inlineSimdInt32x4BinaryBitwise(callInfo, native, MSimdBinaryBitwise::OP##_);
-    BITWISE_COMMONX4_SIMD_OP(INLINE_INT32X4_SIMD_BITWISE_)
-#undef INLINE_INT32X4_SIMD_BITWISE_
+#define INLINE_FLOAT32X4_SIMD_ARITH_(OP)                                                         \
+    if (native == js::simd_float32x4_##OP)                                                       \
+        return inlineBinarySimd<MSimdBinaryArith>(callInfo, native, MSimdBinaryArith::Op_##OP,   \
+                                                  SimdTypeDescr::TYPE_FLOAT32);
+    ARITH_COMMONX4_SIMD_OP(INLINE_FLOAT32X4_SIMD_ARITH_)
+    ARITH_FLOAT32X4_SIMD_OP(INLINE_FLOAT32X4_SIMD_ARITH_)
+#undef INLINE_FLOAT32X4_SIMD_ARITH_
+
+#define INLINE_SIMD_BITWISE_(OP)                                                                 \
+    if (native == js::simd_int32x4_##OP)                                                         \
+        return inlineBinarySimd<MSimdBinaryBitwise>(callInfo, native, MSimdBinaryBitwise::OP##_, \
+                                                    SimdTypeDescr::TYPE_INT32);                  \
+    if (native == js::simd_float32x4_##OP)                                                       \
+        return inlineBinarySimd<MSimdBinaryBitwise>(callInfo, native, MSimdBinaryBitwise::OP##_, \
+                                                    SimdTypeDescr::TYPE_FLOAT32);
+    BITWISE_COMMONX4_SIMD_OP(INLINE_SIMD_BITWISE_)
+#undef INLINE_SIMD_BITWISE_
 
     return InliningStatus_NotInlined;
 }
@@ -372,7 +385,7 @@
     uint32_t initLength = 0;
     AllocatingBehaviour allocating = NewArray_Unallocating;
 
-    JSObject *templateObject = inspector->getTemplateObjectForNative(pc, js_Array);
+    JSObject *templateObject = inspector->getTemplateObjectForNative(pc, ArrayConstructor);
     if (!templateObject) {
         trackOptimizationOutcome(TrackedOutcome::CantInlineNativeNoTemplateObj);
         return InliningStatus_NotInlined;
@@ -1349,7 +1362,7 @@
     if (callInfo.getArg(0)->mightBeType(MIRType_Object))
         return InliningStatus_NotInlined;
 
-    JSObject *templateObj = inspector->getTemplateObjectForNative(pc, js_String);
+    JSObject *templateObj = inspector->getTemplateObjectForNative(pc, StringConstructor);
     if (!templateObj)
         return InliningStatus_NotInlined;
     MOZ_ASSERT(templateObj->is<StringObject>());
@@ -2860,41 +2873,21 @@
     return InliningStatus_Inlined;
 }
 
-IonBuilder::InliningStatus
-IonBuilder::inlineSimdInt32x4BinaryArith(CallInfo &callInfo, JSNative native,
-                                         MSimdBinaryArith::Operation op)
+static MIRType
+SimdTypeDescrToMIRType(SimdTypeDescr::Type type)
 {
-    if (callInfo.argc() != 2)
-        return InliningStatus_NotInlined;
-
-    JSObject *templateObject = inspector->getTemplateObjectForNative(pc, native);
-    if (!templateObject)
-        return InliningStatus_NotInlined;
-
-    InlineTypedObject *inlineTypedObject = &templateObject->as<InlineTypedObject>();
-    MOZ_ASSERT(inlineTypedObject->typeDescr().as<SimdTypeDescr>().type() == js::Int32x4::type);
-
-    // If the type of any of the arguments is neither a SIMD type, an Object
-    // type, or a Value, then the applyTypes phase will add a fallible box &
-    // unbox sequence.  This does not matter much as the binary arithmetic
-    // instruction is supposed to produce a TypeError once it is called.
-    MSimdBinaryArith *ins = MSimdBinaryArith::New(alloc(), callInfo.getArg(0), callInfo.getArg(1),
-                                                  op, MIRType_Int32x4);
-
-    MSimdBox *obj = MSimdBox::New(alloc(), constraints(), ins, inlineTypedObject,
-                                  inlineTypedObject->group()->initialHeap(constraints()));
-
-    current->add(ins);
-    current->add(obj);
-    current->push(obj);
-
-    callInfo.setImplicitlyUsedUnchecked();
-    return InliningStatus_Inlined;
+    switch (type) {
+      case SimdTypeDescr::TYPE_FLOAT32:   return MIRType_Float32x4;
+      case SimdTypeDescr::TYPE_INT32:     return MIRType_Int32x4;
+      case SimdTypeDescr::TYPE_FLOAT64:   break;
+    }
+    MOZ_CRASH("unexpected SimdTypeDescr");
 }
 
+template<typename T>
 IonBuilder::InliningStatus
-IonBuilder::inlineSimdInt32x4BinaryBitwise(CallInfo &callInfo, JSNative native,
-                                           MSimdBinaryBitwise::Operation op)
+IonBuilder::inlineBinarySimd(CallInfo &callInfo, JSNative native, typename T::Operation op,
+                             SimdTypeDescr::Type type)
 {
     if (callInfo.argc() != 2)
         return InliningStatus_NotInlined;
@@ -2904,14 +2897,14 @@
         return InliningStatus_NotInlined;
 
     InlineTypedObject *inlineTypedObject = &templateObject->as<InlineTypedObject>();
-    MOZ_ASSERT(inlineTypedObject->typeDescr().as<SimdTypeDescr>().type() == js::Int32x4::type);
+    MOZ_ASSERT(inlineTypedObject->typeDescr().as<SimdTypeDescr>().type() == type);
 
     // If the type of any of the arguments is neither a SIMD type, an Object
     // type, or a Value, then the applyTypes phase will add a fallible box &
     // unbox sequence.  This does not matter much as the binary bitwise
     // instruction is supposed to produce a TypeError once it is called.
-    MSimdBinaryBitwise *ins = MSimdBinaryBitwise::New(alloc(), callInfo.getArg(0), callInfo.getArg(1),
-                                                      op, MIRType_Int32x4);
+    T *ins = T::New(alloc(), callInfo.getArg(0), callInfo.getArg(1), op,
+                    SimdTypeDescrToMIRType(type));
 
     MSimdBox *obj = MSimdBox::New(alloc(), constraints(), ins, inlineTypedObject,
                                   inlineTypedObject->group()->initialHeap(constraints()));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Architecture-mips.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Architecture-mips.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Architecture-mips.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Architecture-mips.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -115,14 +115,6 @@
 }
 
 uint32_t
-FloatRegister::GetSizeInBytes(const FloatRegisterSet &s)
-{
-    uint64_t bits = s.bits();
-    uint32_t ret = mozilla::CountPopulation32(bits & 0xffffffff) * sizeof(float);
-    ret +=  mozilla::CountPopulation32(bits >> 32) * sizeof(double);
-    return ret;
-}
-uint32_t
 FloatRegister::GetPushSizeInBytes(const FloatRegisterSet &s)
 {
     FloatRegisterSet ss = s.reduceSetForPush();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Architecture-mips.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Architecture-mips.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Architecture-mips.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Architecture-mips.h	2015-02-28 15:03:05.000000000 +0000
@@ -113,6 +113,12 @@
         invalid_reg
     };
     typedef RegisterID Code;
+    typedef RegisterID Encoding;
+
+    // Content spilled during bailouts.
+    union RegisterContent {
+        uintptr_t r;
+    };
 
     static const char *GetName(Code code) {
         static const char * const Names[] = { "zero", "at", "v0", "v1", "a0", "a1", "a2", "a3",
@@ -134,10 +140,11 @@
     static const uint32_t Total = 32;
     static const uint32_t Allocatable = 14;
 
-    static const uint32_t AllMask = 0xffffffff;
-    static const uint32_t ArgRegMask = (1 << a0) | (1 << a1) | (1 << a2) | (1 << a3);
+    typedef uint32_t SetType;
+    static const SetType AllMask = 0xffffffff;
+    static const SetType ArgRegMask = (1 << a0) | (1 << a1) | (1 << a2) | (1 << a3);
 
-    static const uint32_t VolatileMask =
+    static const SetType VolatileMask =
         (1 << Registers::v0) |
         (1 << Registers::v1) |
         (1 << Registers::a0) |
@@ -155,7 +162,7 @@
 
     // We use this constant to save registers when entering functions. This
     // is why $ra is added here even though it is not "Non Volatile".
-    static const uint32_t NonVolatileMask =
+    static const SetType NonVolatileMask =
         (1 << Registers::s0) |
         (1 << Registers::s1) |
         (1 << Registers::s2) |
@@ -166,12 +173,12 @@
         (1 << Registers::s7) |
         (1 << Registers::ra);
 
-    static const uint32_t WrapperMask =
+    static const SetType WrapperMask =
         VolatileMask |         // = arguments
         (1 << Registers::t0) | // = outReg
         (1 << Registers::t1);  // = argBase
 
-    static const uint32_t NonAllocatableMask =
+    static const SetType NonAllocatableMask =
         (1 << Registers::zero) |
         (1 << Registers::at) | // at = scratch
         (1 << Registers::t8) | // t8 = scratch
@@ -184,21 +191,20 @@
         (1 << Registers::ra);
 
     // Registers that can be allocated without being saved, generally.
-    static const uint32_t TempMask = VolatileMask & ~NonAllocatableMask;
+    static const SetType TempMask = VolatileMask & ~NonAllocatableMask;
 
     // Registers returned from a JS -> JS call.
-    static const uint32_t JSCallMask =
+    static const SetType JSCallMask =
         (1 << Registers::a2) |
         (1 << Registers::a3);
 
     // Registers returned from a JS -> C call.
-    static const uint32_t CallMask =
+    static const SetType CallMask =
         (1 << Registers::v0) |
         (1 << Registers::v1);  // used for double-size returns
 
-    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
 
-    typedef uint32_t SetType;
     static uint32_t SetSize(SetType x) {
         static_assert(sizeof(SetType) == 4, "SetType must be 32 bits");
         return mozilla::CountPopulation32(x);
@@ -264,6 +270,12 @@
         invalid_freg
     };
     typedef FPRegisterID Code;
+    typedef FPRegisterID Encoding;
+
+    // Content spilled during bailouts.
+    union RegisterContent {
+        double d;
+    };
 
     static const char *GetName(Code code) {
         static const char * const Names[] = { "f0", "f1", "f2", "f3",  "f4", "f5",  "f6", "f7",
@@ -288,10 +300,12 @@
     static const uint32_t Allocatable = 42;
     // When saving all registers we only need to do is save double registers.
     static const uint32_t TotalPhys = 16;
-    static const uint64_t AllDoubleMask = 0x55555555ULL << 32;
-    static const uint64_t AllMask = AllDoubleMask | ((1ULL << 32) - 1);
 
-    static const uint64_t NonVolatileDoubleMask =
+    typedef uint64_t SetType;
+    static const SetType AllDoubleMask = 0x55555555ULL << 32;
+    static const SetType AllMask = AllDoubleMask | ((1ULL << 32) - 1);
+
+    static const SetType NonVolatileDoubleMask =
         ((1ULL << FloatRegisters::f20) |
          (1ULL << FloatRegisters::f22) |
          (1ULL << FloatRegisters::f24) |
@@ -300,7 +314,7 @@
          (1ULL << FloatRegisters::f30)) << 32;
 
     // f20-single and f21-single alias f20-double ...
-    static const uint64_t NonVolatileMask =
+    static const SetType NonVolatileMask =
         NonVolatileDoubleMask |
         (1ULL << FloatRegisters::f20) |
         (1ULL << FloatRegisters::f21) |
@@ -315,16 +329,16 @@
         (1ULL << FloatRegisters::f30) |
         (1ULL << FloatRegisters::f31);
 
-    static const uint64_t VolatileMask = AllMask & ~NonVolatileMask;
-    static const uint64_t VolatileDoubleMask = AllDoubleMask & ~NonVolatileDoubleMask;
+    static const SetType VolatileMask = AllMask & ~NonVolatileMask;
+    static const SetType VolatileDoubleMask = AllDoubleMask & ~NonVolatileDoubleMask;
 
-    static const uint64_t WrapperMask = VolatileMask;
+    static const SetType WrapperMask = VolatileMask;
 
-    static const uint64_t NonAllocatableDoubleMask =
+    static const SetType NonAllocatableDoubleMask =
         ((1ULL << FloatRegisters::f16) |
          (1ULL << FloatRegisters::f18)) << 32;
     // f16-single and f17-single alias f16-double ...
-    static const uint64_t NonAllocatableMask =
+    static const SetType NonAllocatableMask =
         NonAllocatableDoubleMask |
         (1ULL << FloatRegisters::f16) |
         (1ULL << FloatRegisters::f17) |
@@ -332,11 +346,9 @@
         (1ULL << FloatRegisters::f19);
 
     // Registers that can be allocated without being saved, generally.
-    static const uint64_t TempMask = VolatileMask & ~NonAllocatableMask;
+    static const SetType TempMask = VolatileMask & ~NonAllocatableMask;
 
-    static const uint64_t AllocatableMask = AllMask & ~NonAllocatableMask;
-
-    typedef uint64_t SetType;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
 };
 
 template <typename T>
@@ -352,6 +364,7 @@
 
     typedef FloatRegisters Codes;
     typedef Codes::Code Code;
+    typedef Codes::Encoding Encoding;
 
     uint32_t code_ : 6;
   protected:
@@ -370,23 +383,35 @@
         MOZ_ASSERT(!other.isInvalid());
         return kind_ == other.kind_ && code_ == other.code_;
     }
-    bool isDouble() const { return kind_ == Double; }
-    bool isSingle() const { return kind_ == Single; }
     bool equiv(const FloatRegister &other) const { return other.kind_ == kind_; }
     size_t size() const { return (kind_ == Double) ? 8 : 4; }
     bool isInvalid() const {
         return code_ == FloatRegisters::invalid_freg;
     }
 
+    bool isSingle() const { return kind_ == Single; }
+    bool isDouble() const { return kind_ == Double; }
+    bool isInt32x4() const { return false; }
+    bool isFloat32x4() const { return false; }
+
     FloatRegister doubleOverlay(unsigned int which = 0) const;
     FloatRegister singleOverlay(unsigned int which = 0) const;
     FloatRegister sintOverlay(unsigned int which = 0) const;
     FloatRegister uintOverlay(unsigned int which = 0) const;
 
+    FloatRegister asSingle() const { return singleOverlay(); }
+    FloatRegister asDouble() const { return doubleOverlay(); }
+    FloatRegister asInt32x4() const { MOZ_CRASH("NYI"); }
+    FloatRegister asFloat32x4() const { MOZ_CRASH("NYI"); }
+
     Code code() const {
         MOZ_ASSERT(!isInvalid());
         return Code(code_  | (kind_ << 5));
     }
+    Encoding encoding() const {
+        MOZ_ASSERT(!isInvalid());
+        return Code(code_  | (kind_ << 5));
+    }
     uint32_t id() const {
         return code_;
     }
@@ -473,7 +498,6 @@
         return FloatRegisters::FromName(name);
     }
     static TypedRegisterSet<FloatRegister> ReduceSetForPush(const TypedRegisterSet<FloatRegister> &s);
-    static uint32_t GetSizeInBytes(const TypedRegisterSet<FloatRegister> &s);
     static uint32_t GetPushSizeInBytes(const TypedRegisterSet<FloatRegister> &s);
     uint32_t getRegisterDumpOffsetInBytes();
     static uint32_t FirstBit(SetType x) {
@@ -501,6 +525,12 @@
     return true;
 }
 
+// See the comments above AsmJSMappedSize in AsmJSValidate.h for more info.
+// TODO: Implement this for MIPS. Note that it requires Codegen to respect the
+// offset field of AsmJSHeapAccess.
+static const size_t AsmJSCheckedImmediateRange = 0;
+static const size_t AsmJSImmediateRange = 0;
+
 } // namespace jit
 } // namespace js
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Assembler-mips.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Assembler-mips.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Assembler-mips.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Assembler-mips.h	2015-02-28 15:03:05.000000000 +0000
@@ -114,7 +114,8 @@
 static MOZ_CONSTEXPR_VAR Register ReturnReg = v0;
 static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32Reg = { FloatRegisters::f0, FloatRegister::Single };
 static MOZ_CONSTEXPR_VAR FloatRegister ReturnDoubleReg = { FloatRegisters::f0, FloatRegister::Double };
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnSimdReg = InvalidFloatReg;
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnInt32x4Reg = InvalidFloatReg;
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32x4Reg = InvalidFloatReg;
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloat32Reg = { FloatRegisters::f18, FloatRegister::Single };
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchDoubleReg = { FloatRegisters::f18, FloatRegister::Double };
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchSimdReg = InvalidFloatReg;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Bailouts-mips.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Bailouts-mips.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Bailouts-mips.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Bailouts-mips.h	2015-02-28 15:03:05.000000000 +0000
@@ -26,8 +26,8 @@
     };
 
   protected:
-    mozilla::Array<double, FloatRegisters::TotalPhys> fpregs_;
-    mozilla::Array<uintptr_t, Registers::Total> regs_;
+    RegisterDump::FPUArray fpregs_;
+    RegisterDump::GPRArray regs_;
 
     uintptr_t snapshotOffset_;
     uintptr_t padding_;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/CodeGenerator-mips.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/CodeGenerator-mips.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/CodeGenerator-mips.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/CodeGenerator-mips.h	2015-02-28 15:03:05.000000000 +0000
@@ -281,6 +281,7 @@
     void visitSimdSplatX4(LSimdSplatX4 *lir) { MOZ_CRASH("NYI"); }
     void visitInt32x4(LInt32x4 *ins) { MOZ_CRASH("NYI"); }
     void visitFloat32x4(LFloat32x4 *ins) { MOZ_CRASH("NYI"); }
+    void visitSimdReinterpretCast(LSimdReinterpretCast *ins) { MOZ_CRASH("NYI"); }
     void visitSimdExtractElementI(LSimdExtractElementI *ins) { MOZ_CRASH("NYI"); }
     void visitSimdExtractElementF(LSimdExtractElementF *ins) { MOZ_CRASH("NYI"); }
     void visitSimdSignMaskX4(LSimdSignMaskX4 *ins) { MOZ_CRASH("NYI"); }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/MacroAssembler-mips.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -2385,6 +2385,14 @@
 }
 
 void
+MacroAssemblerMIPSCompat::branchTestObject(Condition cond, const Address &address, Label *label)
+{
+    MOZ_ASSERT(cond == Equal || cond == NotEqual);
+    extractTag(address, SecondScratchReg);
+    ma_b(SecondScratchReg, ImmTag(JSVAL_TAG_OBJECT), label, cond);
+}
+
+void
 MacroAssemblerMIPSCompat::testObjectSet(Condition cond, const ValueOperand &value, Register dest)
 {
     MOZ_ASSERT(cond == Equal || cond == NotEqual);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/MacroAssembler-mips.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/MacroAssembler-mips.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/MacroAssembler-mips.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/MacroAssembler-mips.h	2015-02-28 15:03:05.000000000 +0000
@@ -687,6 +687,7 @@
     void branchTestObject(Condition cond, const ValueOperand &value, Label *label);
     void branchTestObject(Condition cond, Register tag, Label *label);
     void branchTestObject(Condition cond, const BaseIndex &src, Label *label);
+    void branchTestObject(Condition cond, const Address &src, Label *label);
     void testObjectSet(Condition cond, const ValueOperand &value, Register dest);
 
     void branchTestString(Condition cond, const ValueOperand &value, Label *label);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Simulator-mips.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Simulator-mips.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/mips/Simulator-mips.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/mips/Simulator-mips.h	2015-02-28 15:03:05.000000000 +0000
@@ -408,7 +408,7 @@
 #define JS_CHECK_SIMULATOR_RECURSION_WITH_EXTRA(cx, extra, onerror)             \
     JS_BEGIN_MACRO                                                              \
         if (cx->mainThread().simulator()->overRecursedWithExtra(extra)) {       \
-            js_ReportOverRecursed(cx);                                          \
+            js::ReportOverRecursed(cx);                                         \
             onerror;                                                            \
         }                                                                       \
     JS_END_MACRO
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIR.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIR.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIR.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIR.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -31,6 +31,7 @@
 
 using mozilla::NumbersAreIdentical;
 using mozilla::IsFloat32Representable;
+using mozilla::IsNaN;
 using mozilla::Maybe;
 using mozilla::DebugOnly;
 
@@ -629,7 +630,7 @@
 MConstant::NewTypedValue(TempAllocator &alloc, const Value &v, MIRType type, CompilerConstraintList *constraints)
 {
     MOZ_ASSERT(!IsSimdType(type));
-    MOZ_ASSERT_IF(type == MIRType_Float32, v.toDouble() == double(float(v.toDouble())));
+    MOZ_ASSERT_IF(type == MIRType_Float32, IsNaN(v.toDouble()) || v.toDouble() == double(float(v.toDouble())));
     MConstant *constant = new(alloc) MConstant(v, constraints);
     constant->setResultType(type);
     return constant;
@@ -921,6 +922,24 @@
 }
 
 MDefinition *
+MSimdUnbox::foldsTo(TempAllocator &alloc)
+{
+    MDefinition *in = input();
+
+    if (in->isSimdBox()) {
+        // If the operand is a MSimdBox, then we just reuse the operand of the
+        // MSimdBox as long as the type corresponds to what we are supposed to
+        // unbox.
+        in = in->toSimdBox()->input();
+        if (in->type() != type())
+            return this;
+        return in;
+    }
+
+    return this;
+}
+
+MDefinition *
 MSimdSwizzle::foldsTo(TempAllocator &alloc)
 {
     if (lanesMatch(0, 1, 2, 3))
@@ -2930,10 +2949,10 @@
 }
 
 MResumePoint *
-MResumePoint::New(TempAllocator &alloc, MBasicBlock *block, jsbytecode *pc, MResumePoint *parent,
+MResumePoint::New(TempAllocator &alloc, MBasicBlock *block, jsbytecode *pc,
                   Mode mode)
 {
-    MResumePoint *resume = new(alloc) MResumePoint(block, pc, parent, mode);
+    MResumePoint *resume = new(alloc) MResumePoint(block, pc, mode);
     if (!resume->init(alloc))
         return nullptr;
     resume->inherit(block);
@@ -2944,7 +2963,7 @@
 MResumePoint::New(TempAllocator &alloc, MBasicBlock *block, MResumePoint *model,
                   const MDefinitionVector &operands)
 {
-    MResumePoint *resume = new(alloc) MResumePoint(block, model->pc(), model->caller(), model->mode());
+    MResumePoint *resume = new(alloc) MResumePoint(block, model->pc(), model->mode());
 
     // Allocate the same number of operands as the original resume point, and
     // copy operands from the operands vector and not the not from the current
@@ -2963,7 +2982,7 @@
 MResumePoint::Copy(TempAllocator &alloc, MResumePoint *src)
 {
     MResumePoint *resume = new(alloc) MResumePoint(src->block(), src->pc(),
-                                                   src->caller(), src->mode());
+                                                   src->mode());
     // Copy the operands from the original resume point, and not from the
     // current block stack.
     if (!resume->operands_.init(alloc, src->numAllocatedOperands()))
@@ -2975,11 +2994,9 @@
     return resume;
 }
 
-MResumePoint::MResumePoint(MBasicBlock *block, jsbytecode *pc, MResumePoint *caller,
-                           Mode mode)
+MResumePoint::MResumePoint(MBasicBlock *block, jsbytecode *pc, Mode mode)
   : MNode(block),
     pc_(pc),
-    caller_(caller),
     instruction_(nullptr),
     mode_(mode)
 {
@@ -2992,6 +3009,12 @@
     return operands_.init(alloc, block()->stackDepth());
 }
 
+MResumePoint*
+MResumePoint::caller() const
+{
+    return block_->callerResumePoint();
+}
+
 void
 MResumePoint::inherit(MBasicBlock *block)
 {
@@ -4829,6 +4852,17 @@
 
     MOZ_ASSERT(excluded);
 
+    // If the excluded object is a group with an unboxed layout, make sure it
+    // does not have a corresponding native group. Objects with the native
+    // group might appear even though they are not in the type set.
+    if (excluded->isGroup()) {
+        if (UnboxedLayout *layout = excluded->group()->maybeUnboxedLayout()) {
+            if (layout->nativeGroup())
+                return true;
+            excluded->watchStateChangeForUnboxedConvertedToNative(constraints);
+        }
+    }
+
     *pobj = AddGroupGuard(alloc, current, *pobj, excluded, /* bailOnEquality = */ true);
     return false;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIRGenerator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIRGenerator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIRGenerator.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIRGenerator.h	2015-02-28 15:03:05.000000000 +0000
@@ -38,7 +38,8 @@
   public:
     MIRGenerator(CompileCompartment *compartment, const JitCompileOptions &options,
                  TempAllocator *alloc, MIRGraph *graph,
-                 CompileInfo *info, const OptimizationInfo *optimizationInfo);
+                 CompileInfo *info, const OptimizationInfo *optimizationInfo,
+                 Label *outOfBoundsLabel = nullptr, bool usesSignalHandlersForAsmJSOOB = false);
 
     TempAllocator &alloc() {
         return *alloc_;
@@ -199,6 +200,9 @@
     // CodeGenerator::link).
     ObjectVector nurseryObjects_;
 
+    Label *outOfBoundsLabel_;
+    bool usesSignalHandlersForAsmJSOOB_;
+
     void addAbortedNewScriptPropertiesGroup(ObjectGroup *type);
     void setForceAbort() {
         shouldForceAbort_ = true;
@@ -222,6 +226,21 @@
     const ObjectVector &nurseryObjects() const {
         return nurseryObjects_;
     }
+
+    Label *outOfBoundsLabel() const {
+        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.
+#ifdef JS_CODEGEN_X64
+        if (usesSignalHandlersForAsmJSOOB_)
+            return false;
+#endif
+        return access->needsBoundsCheck();
+    }
 };
 
 } // namespace jit
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIRGraph.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIRGraph.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIRGraph.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIRGraph.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -19,7 +19,8 @@
 
 MIRGenerator::MIRGenerator(CompileCompartment *compartment, const JitCompileOptions &options,
                            TempAllocator *alloc, MIRGraph *graph, CompileInfo *info,
-                           const OptimizationInfo *optimizationInfo)
+                           const OptimizationInfo *optimizationInfo,
+                           Label *outOfBoundsLabel, bool usesSignalHandlersForAsmJSOOB)
   : compartment(compartment),
     info_(info),
     optimizationInfo_(optimizationInfo),
@@ -40,6 +41,8 @@
     instrumentedProfiling_(false),
     instrumentedProfilingIsCached_(false),
     nurseryObjects_(*alloc),
+    outOfBoundsLabel_(outOfBoundsLabel),
+    usesSignalHandlersForAsmJSOOB_(usesSignalHandlersForAsmJSOOB),
     options(options)
 { }
 
@@ -406,11 +409,10 @@
     MOZ_ASSERT(!entryResumePoint_);
 
     // Propagate the caller resume point from the inherited block.
-    MResumePoint *callerResumePoint = pred ? pred->callerResumePoint() : nullptr;
+    callerResumePoint_ = pred ? pred->callerResumePoint() : nullptr;
 
     // Create a resume point using our initial stack state.
-    entryResumePoint_ = new(alloc) MResumePoint(this, pc(), callerResumePoint,
-                                                MResumePoint::ResumeAt);
+    entryResumePoint_ = new(alloc) MResumePoint(this, pc(), MResumePoint::ResumeAt);
     if (!entryResumePoint_->init(alloc))
         return false;
 
@@ -475,6 +477,8 @@
     MOZ_ASSERT(kind_ != PENDING_LOOP_HEADER);
     MOZ_ASSERT(pred != nullptr);
 
+    callerResumePoint_ = pred->callerResumePoint();
+
     if (!predecessors_.append(pred))
         return false;
 
@@ -495,8 +499,7 @@
     discardResumePoint(entryResumePoint_);
 
     // Create a resume point using our initial stack state.
-    entryResumePoint_ = MResumePoint::New(alloc, this, pc(), callerResumePoint(),
-                                          MResumePoint::ResumeAt);
+    entryResumePoint_ = MResumePoint::New(alloc, this, pc(), MResumePoint::ResumeAt);
     if (!entryResumePoint_)
         return false;
     return true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIRGraph.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIRGraph.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIRGraph.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIRGraph.h	2015-02-28 15:03:05.000000000 +0000
@@ -57,6 +57,8 @@
     // This block cannot be reached by any means.
     bool unreachable_;
 
+    MResumePoint *callerResumePoint_;
+
     // Pushes a copy of a local variable or argument.
     void pushVariable(uint32_t slot);
 
@@ -545,11 +547,11 @@
         discardResumePoint(outerResumePoint_);
         outerResumePoint_ = nullptr;
     }
-    MResumePoint *callerResumePoint() {
-        return entryResumePoint() ? entryResumePoint()->caller() : nullptr;
+    MResumePoint *callerResumePoint() const {
+        return callerResumePoint_;
     }
     void setCallerResumePoint(MResumePoint *caller) {
-        entryResumePoint()->setCaller(caller);
+        callerResumePoint_ = caller;
     }
     size_t numEntrySlots() const {
         return entryResumePoint()->stackDepth();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIR.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIR.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MIR.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MIR.h	2015-02-28 15:03:05.000000000 +0000
@@ -27,6 +27,7 @@
 #include "vm/ArrayObject.h"
 #include "vm/ScopeObject.h"
 #include "vm/TypedArrayCommon.h"
+#include "vm/UnboxedObject.h"
 
 // Undo windows.h damage on Win64
 #undef MemoryBarrier
@@ -245,6 +246,7 @@
     MBasicBlock *block() const {
         return block_;
     }
+    MBasicBlock *caller() const;
 
     // Sets an already set operand, updating use information. If you're looking
     // for setOperand, this is probably what you want.
@@ -2035,6 +2037,15 @@
         xor_
     };
 
+    static const char* OperationName(Operation op) {
+        switch (op) {
+          case and_: return "and";
+          case or_:  return "or";
+          case xor_: return "xor";
+        }
+        MOZ_CRASH("unexpected operation");
+    }
+
   private:
     Operation operation_;
 
@@ -3012,8 +3023,6 @@
     bool congruentTo(const MDefinition *ins) const MOZ_OVERRIDE {
         if (congruentIfOperandsEqual(ins)) {
             MOZ_ASSERT(ins->toSimdBox()->initialHeap() == initialHeap());
-            // The template object is likely to be different, but represents the
-            // same kind of objects as the MIRTypes are identical.
             return true;
         }
 
@@ -3023,6 +3032,11 @@
     AliasSet getAliasSet() const MOZ_OVERRIDE {
         return AliasSet::None();
     }
+
+    bool writeRecoverData(CompactBufferWriter &writer) const MOZ_OVERRIDE;
+    bool canRecoverOnBailout() const MOZ_OVERRIDE {
+        return true;
+    }
 };
 
 class MSimdUnbox
@@ -3047,6 +3061,11 @@
         return new(alloc) MSimdUnbox(op, type);
     }
 
+    MDefinition *foldsTo(TempAllocator &alloc) MOZ_OVERRIDE;
+    bool congruentTo(const MDefinition *ins) const MOZ_OVERRIDE {
+        return congruentIfOperandsEqual(ins);
+    }
+
     AliasSet getAliasSet() const MOZ_OVERRIDE {
         return AliasSet::None();
     }
@@ -3274,7 +3293,6 @@
   : public MAryInstruction<2>,
     public MixPolicy<ObjectPolicy<0>, BoxPolicy<1> >::Data
 {
-  public:
     AlwaysTenuredPropertyName name_;
 
   protected:
@@ -3305,6 +3323,7 @@
     PropertyName *propertyName() const {
         return name_;
     }
+
     bool possiblyCalls() const MOZ_OVERRIDE {
         return true;
     }
@@ -4228,7 +4247,6 @@
       : MUnaryInstruction(ins), assertedRange_(assertedRange)
     {
         setGuard();
-        setMovable();
         setResultType(MIRType_None);
     }
 
@@ -6729,6 +6747,9 @@
     static MCheckOverRecursed *New(TempAllocator &alloc) {
         return new(alloc) MCheckOverRecursed();
     }
+    AliasSet getAliasSet() const MOZ_OVERRIDE {
+        return AliasSet::None();
+    }
 };
 
 // Check whether we need to fire the interrupt handler.
@@ -7817,9 +7838,10 @@
     // Range over which to perform the bounds check, may be modified by GVN.
     int32_t minimum_;
     int32_t maximum_;
+    bool fallible_;
 
     MBoundsCheck(MDefinition *index, MDefinition *length)
-      : MBinaryInstruction(index, length), minimum_(0), maximum_(0)
+      : MBinaryInstruction(index, length), minimum_(0), maximum_(0), fallible_(true)
     {
         setGuard();
         setMovable();
@@ -7867,6 +7889,10 @@
         return AliasSet::None();
     }
     void computeRange(TempAllocator &alloc) MOZ_OVERRIDE;
+    bool fallible() const {
+        return fallible_;
+    }
+    void collectRangeInfoPreTrunc() MOZ_OVERRIDE;
 
     ALLOW_CLONE(MBoundsCheck)
 };
@@ -8425,6 +8451,60 @@
     ALLOW_CLONE(MStoreUnboxedString)
 };
 
+// Passes through an object, after ensuring it is converted from an unboxed
+// object to a native representation.
+class MConvertUnboxedObjectToNative
+  : public MUnaryInstruction,
+    public SingleObjectPolicy::Data
+{
+    AlwaysTenured<ObjectGroup *> group_;
+
+    explicit MConvertUnboxedObjectToNative(MDefinition *obj, ObjectGroup *group)
+      : MUnaryInstruction(obj),
+        group_(group)
+    {
+        setGuard();
+        setMovable();
+        setResultType(MIRType_Object);
+    }
+
+  public:
+    INSTRUCTION_HEADER(ConvertUnboxedObjectToNative)
+
+    static MConvertUnboxedObjectToNative *New(TempAllocator &alloc, MDefinition *obj,
+                                              ObjectGroup *group) {
+        return new(alloc) MConvertUnboxedObjectToNative(obj, group);
+    }
+
+    MDefinition *object() const {
+        return getOperand(0);
+    }
+    ObjectGroup *group() const {
+        return group_;
+    }
+    bool congruentTo(const MDefinition *ins) const MOZ_OVERRIDE {
+        if (!congruentIfOperandsEqual(ins))
+            return false;
+        return ins->toConvertUnboxedObjectToNative()->group() == group();
+    }
+    AliasSet getAliasSet() const MOZ_OVERRIDE {
+        // This instruction can read and write to all parts of the object, but
+        // is marked as non-effectful so it can be consolidated by LICM and GVN
+        // and avoid inhibiting other optimizations.
+        //
+        // This is valid to do because when unboxed objects might have a native
+        // group they can be converted to, we do not optimize accesses to the
+        // unboxed objects and do not guard on their group or shape (other than
+        // in this opcode).
+        //
+        // Later accesses can assume the object has a native representation
+        // and optimize accordingly. Those accesses cannot be reordered before
+        // this instruction, however. This is prevented by chaining this
+        // instruction with the object itself, in the same way as MBoundsCheck.
+        return AliasSet::None();
+    }
+};
+
 // Array.prototype.pop or Array.prototype.shift on a dense array.
 class MArrayPopShift
   : public MUnaryInstruction,
@@ -9776,6 +9856,11 @@
         setGuard();
         setMovable();
         setResultType(MIRType_Object);
+
+        // Disallow guarding on unboxed object shapes. The group is better to
+        // guard on, and guarding on the shape can interact badly with
+        // MConvertUnboxedObjectToNative.
+        MOZ_ASSERT(shape->getObjectClass() != &UnboxedPlainObject::class_);
     }
 
   public:
@@ -9872,6 +9957,10 @@
         setGuard();
         setMovable();
         setResultType(MIRType_Object);
+
+        // Unboxed groups which might be converted to natives can't be guarded
+        // on, due to MConvertUnboxedObjectToNative.
+        MOZ_ASSERT_IF(group->maybeUnboxedLayout(), !group->unboxedLayout().nativeGroup());
     }
 
   public:
@@ -11646,11 +11735,10 @@
     MStoresToRecoverList stores_;
 
     jsbytecode *pc_;
-    MResumePoint *caller_;
     MInstruction *instruction_;
     Mode mode_;
 
-    MResumePoint(MBasicBlock *block, jsbytecode *pc, MResumePoint *parent, Mode mode);
+    MResumePoint(MBasicBlock *block, jsbytecode *pc, Mode mode);
     void inherit(MBasicBlock *state);
 
   protected:
@@ -11672,7 +11760,7 @@
 
   public:
     static MResumePoint *New(TempAllocator &alloc, MBasicBlock *block, jsbytecode *pc,
-                             MResumePoint *parent, Mode mode);
+                             Mode mode);
     static MResumePoint *New(TempAllocator &alloc, MBasicBlock *block, MResumePoint *model,
                              const MDefinitionVector &operands);
     static MResumePoint *Copy(TempAllocator &alloc, MResumePoint *src);
@@ -11712,15 +11800,10 @@
     jsbytecode *pc() const {
         return pc_;
     }
-    MResumePoint *caller() const {
-        return caller_;
-    }
-    void setCaller(MResumePoint *caller) {
-        caller_ = caller;
-    }
+    MResumePoint *caller() const;
     uint32_t frameCount() const {
         uint32_t count = 1;
-        for (MResumePoint *it = caller_; it; it = it->caller_)
+        for (MResumePoint *it = caller(); it; it = it->caller())
             count++;
         return count;
     }
@@ -12111,25 +12194,57 @@
 
 class MAsmJSHeapAccess
 {
-    Scalar::Type accessType_;
+    int32_t offset_;
+    Scalar::Type accessType_ : 8;
     bool needsBoundsCheck_;
-    Label *outOfBoundsLabel_;
     unsigned numSimdElems_;
 
   public:
-    MAsmJSHeapAccess(Scalar::Type accessType, bool needsBoundsCheck,
-                     Label *outOfBoundsLabel = nullptr, unsigned numSimdElems = 0)
-      : accessType_(accessType), needsBoundsCheck_(needsBoundsCheck),
-        outOfBoundsLabel_(outOfBoundsLabel), numSimdElems_(numSimdElems)
+    MAsmJSHeapAccess(Scalar::Type accessType, bool needsBoundsCheck, unsigned numSimdElems = 0)
+      : offset_(0), accessType_(accessType),
+        needsBoundsCheck_(needsBoundsCheck), numSimdElems_(numSimdElems)
     {
         MOZ_ASSERT(numSimdElems <= ScalarTypeToLength(accessType));
     }
 
+    int32_t offset() const { return offset_; }
+    int32_t endOffset() const { return offset() + byteSize(); }
     Scalar::Type accessType() const { return accessType_; }
+    unsigned byteSize() const {
+        return Scalar::isSimdType(accessType())
+               ? Scalar::scalarByteSize(accessType()) * numSimdElems()
+               : TypedArrayElemSize(accessType());
+    }
     bool needsBoundsCheck() const { return needsBoundsCheck_; }
     void removeBoundsCheck() { needsBoundsCheck_ = false; }
-    Label *outOfBoundsLabel() const { return outOfBoundsLabel_; }
     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;
+    }
 };
 
 class MAsmJSLoadHeap
@@ -12141,10 +12256,9 @@
     MemoryBarrierBits barrierAfter_;
 
     MAsmJSLoadHeap(Scalar::Type accessType, MDefinition *ptr, bool needsBoundsCheck,
-                   Label *outOfBoundsLabel, unsigned numSimdElems,
-                   MemoryBarrierBits before, MemoryBarrierBits after)
+                   unsigned numSimdElems, MemoryBarrierBits before, MemoryBarrierBits after)
       : MUnaryInstruction(ptr),
-        MAsmJSHeapAccess(accessType, needsBoundsCheck, outOfBoundsLabel, numSimdElems),
+        MAsmJSHeapAccess(accessType, needsBoundsCheck, numSimdElems),
         barrierBefore_(before),
         barrierAfter_(after)
     {
@@ -12185,16 +12299,16 @@
 
     static MAsmJSLoadHeap *New(TempAllocator &alloc, Scalar::Type accessType,
                                MDefinition *ptr, bool needsBoundsCheck,
-                               Label *outOfBoundsLabel = nullptr,
                                unsigned numSimdElems = 0,
                                MemoryBarrierBits barrierBefore = MembarNobits,
                                MemoryBarrierBits barrierAfter = MembarNobits)
     {
-        return new(alloc) MAsmJSLoadHeap(accessType, ptr, needsBoundsCheck, outOfBoundsLabel,
+        return new(alloc) MAsmJSLoadHeap(accessType, ptr, needsBoundsCheck,
                                          numSimdElems, barrierBefore, barrierAfter);
     }
 
     MDefinition *ptr() const { return getOperand(0); }
+    void replacePtr(MDefinition *newPtr) { replaceOperand(0, newPtr); }
     MemoryBarrierBits barrierBefore() const { return barrierBefore_; }
     MemoryBarrierBits barrierAfter() const { return barrierAfter_; }
 
@@ -12214,10 +12328,9 @@
     MemoryBarrierBits barrierAfter_;
 
     MAsmJSStoreHeap(Scalar::Type accessType, MDefinition *ptr, MDefinition *v, bool needsBoundsCheck,
-                    Label *outOfBoundsLabel, unsigned numSimdElems,
-                    MemoryBarrierBits before, MemoryBarrierBits after)
+                    unsigned numSimdElems, MemoryBarrierBits before, MemoryBarrierBits after)
       : MBinaryInstruction(ptr, v),
-        MAsmJSHeapAccess(accessType, needsBoundsCheck, outOfBoundsLabel, numSimdElems),
+        MAsmJSHeapAccess(accessType, needsBoundsCheck, numSimdElems),
         barrierBefore_(before),
         barrierAfter_(after)
     {
@@ -12230,16 +12343,16 @@
 
     static MAsmJSStoreHeap *New(TempAllocator &alloc, Scalar::Type accessType,
                                 MDefinition *ptr, MDefinition *v, bool needsBoundsCheck,
-                                Label *outOfBoundsLabel = nullptr,
                                 unsigned numSimdElems = 0,
                                 MemoryBarrierBits barrierBefore = MembarNobits,
                                 MemoryBarrierBits barrierAfter = MembarNobits)
     {
-        return new(alloc) MAsmJSStoreHeap(accessType, ptr, v, needsBoundsCheck, outOfBoundsLabel,
+        return new(alloc) MAsmJSStoreHeap(accessType, ptr, v, needsBoundsCheck,
                                           numSimdElems, barrierBefore, barrierAfter);
     }
 
     MDefinition *ptr() const { return getOperand(0); }
+    void replacePtr(MDefinition *newPtr) { replaceOperand(0, newPtr); }
     MDefinition *value() const { return getOperand(1); }
     MemoryBarrierBits barrierBefore() const { return barrierBefore_; }
     MemoryBarrierBits barrierAfter() const { return barrierAfter_; }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MOpcodes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MOpcodes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/MOpcodes.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/MOpcodes.h	2015-02-28 15:03:05.000000000 +0000
@@ -184,6 +184,7 @@
     _(StoreElementHole)                                                     \
     _(StoreUnboxedObjectOrNull)                                             \
     _(StoreUnboxedString)                                                   \
+    _(ConvertUnboxedObjectToNative)                                         \
     _(ArrayPopShift)                                                        \
     _(ArrayPush)                                                            \
     _(ArrayConcat)                                                          \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/none/Architecture-none.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/none/Architecture-none.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/none/Architecture-none.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/none/Architecture-none.h	2015-02-28 15:03:05.000000000 +0000
@@ -26,6 +26,11 @@
         invalid_reg
     };
     typedef RegisterID Code;
+    typedef RegisterID Encoding;
+    union RegisterContent {
+        uintptr_t r;
+    };
+
     typedef uint8_t SetType;
 
     static uint32_t SetSize(SetType) { MOZ_CRASH(); }
@@ -39,15 +44,15 @@
     static const uint32_t Total = 1;
     static const uint32_t TotalPhys = 0;
     static const uint32_t Allocatable = 0;
-    static const uint32_t AllMask = 0;
-    static const uint32_t ArgRegMask = 0;
-    static const uint32_t VolatileMask = 0;
-    static const uint32_t NonVolatileMask = 0;
-    static const uint32_t NonAllocatableMask = 0;
-    static const uint32_t AllocatableMask = 0;
-    static const uint32_t TempMask = 0;
-    static const uint32_t JSCallMask = 0;
-    static const uint32_t CallMask = 0;
+    static const SetType AllMask = 0;
+    static const SetType ArgRegMask = 0;
+    static const SetType VolatileMask = 0;
+    static const SetType NonVolatileMask = 0;
+    static const SetType NonAllocatableMask = 0;
+    static const SetType AllocatableMask = 0;
+    static const SetType TempMask = 0;
+    static const SetType JSCallMask = 0;
+    static const SetType CallMask = 0;
 };
 
 typedef uint8_t PackedRegisterMask;
@@ -60,6 +65,11 @@
         invalid_reg
     };
     typedef FPRegisterID  Code;
+    typedef FPRegisterID Encoding;
+    union RegisterContent {
+        double d;
+    };
+
     typedef uint32_t SetType;
 
     static const char *GetName(Code) { MOZ_CRASH(); }
@@ -69,12 +79,12 @@
     static const uint32_t Total = 0;
     static const uint32_t TotalPhys = 0;
     static const uint32_t Allocatable = 0;
-    static const uint32_t AllMask = 0;
-    static const uint32_t AllDoubleMask = 0;
-    static const uint32_t VolatileMask = 0;
-    static const uint32_t NonVolatileMask = 0;
-    static const uint32_t NonAllocatableMask = 0;
-    static const uint32_t AllocatableMask = 0;
+    static const SetType AllMask = 0;
+    static const SetType AllDoubleMask = 0;
+    static const SetType VolatileMask = 0;
+    static const SetType NonVolatileMask = 0;
+    static const SetType NonAllocatableMask = 0;
+    static const SetType AllocatableMask = 0;
 };
 
 template <typename T>
@@ -84,6 +94,7 @@
 {
     typedef FloatRegisters Codes;
     typedef Codes::Code Code;
+    typedef Codes::Encoding Encoding;
     typedef Codes::SetType SetType;
 
     Code _;
@@ -91,6 +102,14 @@
     static uint32_t FirstBit(SetType) { MOZ_CRASH(); }
     static uint32_t LastBit(SetType) { MOZ_CRASH(); }
     static FloatRegister FromCode(uint32_t) { MOZ_CRASH(); }
+    bool isSingle() const { MOZ_CRASH(); }
+    bool isDouble() const { MOZ_CRASH(); }
+    bool isInt32x4() const { MOZ_CRASH(); }
+    bool isFloat32x4() const { MOZ_CRASH(); }
+    FloatRegister asSingle() const { MOZ_CRASH(); }
+    FloatRegister asDouble() const { MOZ_CRASH(); }
+    FloatRegister asInt32x4() const { MOZ_CRASH(); }
+    FloatRegister asFloat32x4() const { MOZ_CRASH(); }
     Code code() const { MOZ_CRASH(); }
     const char *name() const { MOZ_CRASH(); }
     bool volatile_() const { MOZ_CRASH(); }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/none/MacroAssembler-none.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/none/MacroAssembler-none.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/none/MacroAssembler-none.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/none/MacroAssembler-none.h	2015-02-28 15:03:05.000000000 +0000
@@ -22,7 +22,8 @@
 static MOZ_CONSTEXPR_VAR Register ReturnReg = { Registers::invalid_reg };
 static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32Reg = { FloatRegisters::invalid_reg };
 static MOZ_CONSTEXPR_VAR FloatRegister ReturnDoubleReg = { FloatRegisters::invalid_reg };
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnSimdReg = { FloatRegisters::invalid_reg };
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnInt32x4Reg = { FloatRegisters::invalid_reg };
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32x4Reg = { FloatRegisters::invalid_reg };
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloat32Reg = { FloatRegisters::invalid_reg };
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchDoubleReg = { FloatRegisters::invalid_reg };
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchSimdReg = { FloatRegisters::invalid_reg };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/OptimizationTracking.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/OptimizationTracking.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/OptimizationTracking.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/OptimizationTracking.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1123,11 +1123,13 @@
 
 JS_PUBLIC_API(void)
 JS::ForEachTrackedOptimizationAttempt(JSRuntime *rt, void *addr,
-                                      ForEachTrackedOptimizationAttemptOp &op)
+                                      ForEachTrackedOptimizationAttemptOp &op,
+                                      JSScript **scriptOut, jsbytecode **pcOut)
 {
     JitcodeGlobalTable *table = rt->jitRuntime()->getJitcodeGlobalTable();
     JitcodeGlobalEntry entry;
     table->lookupInfallible(addr, &entry, rt);
+    entry.youngestFrameLocationAtAddr(rt, addr, scriptOut, pcOut);
     Maybe<uint8_t> index = entry.trackedOptimizationIndexAtAddr(addr);
     entry.trackedOptimizationAttempts(index.value()).forEach(op);
 }
@@ -1143,11 +1145,11 @@
         source = fun->lazyScript()->maybeForwardedScriptSource();
         *lineno = fun->lazyScript()->lineno();
     }
-    *filename = source->introducerFilename();
+    *filename = source->filename();
 }
 
 static JSFunction *
-InterpretedFunctionFromTrackedType(const IonTrackedTypeWithAddendum &tracked)
+FunctionFromTrackedType(const IonTrackedTypeWithAddendum &tracked)
 {
     if (tracked.hasConstructor())
         return tracked.constructor;
@@ -1162,55 +1164,78 @@
     return ty.group()->maybeInterpretedFunction();
 }
 
-// This adapter is needed as the internal API can deal with engine-internal
-// data structures directly, while the public API cannot.
-class ForEachTypeInfoAdapter : public IonTrackedOptimizationsTypeInfo::ForEachOp
-{
-    ForEachTrackedOptimizationTypeInfoOp &op_;
-
-  public:
-    explicit ForEachTypeInfoAdapter(ForEachTrackedOptimizationTypeInfoOp &op)
-      : op_(op)
-    { }
-
-    void readType(const IonTrackedTypeWithAddendum &tracked) MOZ_OVERRIDE {
-        TypeSet::Type ty = tracked.type;
+void
+IonTrackedOptimizationsTypeInfo::ForEachOpAdapter::readType(const IonTrackedTypeWithAddendum &tracked)
+{
+    TypeSet::Type ty = tracked.type;
 
-        if (ty.isPrimitive() || ty.isUnknown() || ty.isAnyObject()) {
-            op_.readType("primitive", TypeSet::NonObjectTypeString(ty), nullptr, 0);
-            return;
-        }
+    if (ty.isPrimitive() || ty.isUnknown() || ty.isAnyObject()) {
+        op_.readType("primitive", TypeSet::NonObjectTypeString(ty), nullptr, 0);
+        return;
+    }
 
-        char buf[512];
-        const uint32_t bufsize = mozilla::ArrayLength(buf);
+    char buf[512];
+    const uint32_t bufsize = mozilla::ArrayLength(buf);
 
-        if (JSFunction *fun = InterpretedFunctionFromTrackedType(tracked)) {
-            PutEscapedString(buf, bufsize, fun->displayAtom(), 0);
-            const char *filename;
-            unsigned lineno;
-            InterpretedFunctionFilenameAndLineNumber(fun, &filename, &lineno);
-            op_.readType(tracked.constructor ? "constructor" : "function", buf, filename, lineno);
+    if (JSFunction *fun = FunctionFromTrackedType(tracked)) {
+        if (fun->isNative()) {
+            //
+            // Print out the absolute address of the function pointer.
+            //
+            // Note that this address is not usable without knowing the
+            // starting address at which our shared library is loaded. Shared
+            // library information is exposed by the profiler. If this address
+            // needs to be symbolicated manually (e.g., when it is gotten via
+            // debug spewing of all optimization information), it needs to be
+            // converted to an offset from the beginning of the shared library
+            // for use with utilities like `addr2line` on Linux and `atos` on
+            // OS X. Converting to an offset may be done via dladdr():
+            //
+            //   void *addr = JS_FUNC_TO_DATA_PTR(void *, fun->native());
+            //   uintptr_t offset;
+            //   Dl_info info;
+            //   if (dladdr(addr, &info) != 0)
+            //       offset = uintptr_t(addr) - uintptr_t(info.dli_fbase);
+            //
+            uintptr_t addr = JS_FUNC_TO_DATA_PTR(uintptr_t, fun->native());
+            JS_snprintf(buf, bufsize, "%llx", addr);
+            op_.readType("native", nullptr, buf, UINT32_MAX);
             return;
         }
 
-        const char *className = ty.objectKey()->clasp()->name;
-        JS_snprintf(buf, bufsize, "[object %s]", className);
+        PutEscapedString(buf, bufsize, fun->displayAtom(), 0);
+        const char *filename;
+        unsigned lineno;
+        InterpretedFunctionFilenameAndLineNumber(fun, &filename, &lineno);
+        op_.readType(tracked.constructor ? "constructor" : "function", buf, filename, lineno);
+        return;
+    }
 
-        if (tracked.hasAllocationSite()) {
-            JSScript *script = tracked.script;
-            op_.readType("alloc site", buf,
-                         script->maybeForwardedScriptSource()->introducerFilename(),
-                         PCToLineNumber(script, script->offsetToPC(tracked.offset)));
-            return;
-        }
+    const char *className = ty.objectKey()->clasp()->name;
+    JS_snprintf(buf, bufsize, "[object %s]", className);
 
-        op_.readType("prototype", buf, nullptr, 0);
+    if (tracked.hasAllocationSite()) {
+        JSScript *script = tracked.script;
+        op_.readType("alloc site", buf,
+                     script->maybeForwardedScriptSource()->filename(),
+                     PCToLineNumber(script, script->offsetToPC(tracked.offset)));
+        return;
     }
 
-    void operator()(JS::TrackedTypeSite site, MIRType mirType) MOZ_OVERRIDE {
-        op_(site, StringFromMIRType(mirType));
+    if (ty.isGroup()) {
+        op_.readType("prototype", buf, nullptr, UINT32_MAX);
+        return;
     }
-};
+
+    op_.readType("singleton", buf, nullptr, UINT32_MAX);
+}
+
+void
+IonTrackedOptimizationsTypeInfo::ForEachOpAdapter::operator()(JS::TrackedTypeSite site,
+                                                              MIRType mirType)
+{
+    op_(site, StringFromMIRType(mirType));
+}
 
 JS_PUBLIC_API(void)
 JS::ForEachTrackedOptimizationTypeInfo(JSRuntime *rt, void *addr,
@@ -1219,7 +1244,7 @@
     JitcodeGlobalTable *table = rt->jitRuntime()->getJitcodeGlobalTable();
     JitcodeGlobalEntry entry;
     table->lookupInfallible(addr, &entry, rt);
-    ForEachTypeInfoAdapter adapter(op);
+    IonTrackedOptimizationsTypeInfo::ForEachOpAdapter adapter(op);
     Maybe<uint8_t> index = entry.trackedOptimizationIndexAtAddr(addr);
     entry.trackedOptimizationTypeInfo(index.value()).forEach(adapter, entry.allTrackedTypes());
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/OptimizationTracking.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/OptimizationTracking.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/OptimizationTracking.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/OptimizationTracking.h	2015-02-28 15:03:05.000000000 +0000
@@ -484,12 +484,27 @@
     // JS::ForEachTrackedOptimizaitonTypeInfoOp cannot be used directly. The
     // internal API needs to deal with engine-internal data structures (e.g.,
     // TypeSet::Type) directly.
+    //
+    // An adapter is provided below.
     struct ForEachOp
     {
         virtual void readType(const IonTrackedTypeWithAddendum &tracked) = 0;
         virtual void operator()(JS::TrackedTypeSite site, MIRType mirType) = 0;
     };
 
+    class ForEachOpAdapter : public ForEachOp
+    {
+        JS::ForEachTrackedOptimizationTypeInfoOp &op_;
+
+      public:
+        explicit ForEachOpAdapter(JS::ForEachTrackedOptimizationTypeInfoOp &op)
+          : op_(op)
+        { }
+
+        void readType(const IonTrackedTypeWithAddendum &tracked) MOZ_OVERRIDE;
+        void operator()(JS::TrackedTypeSite site, MIRType mirType) MOZ_OVERRIDE;
+    };
+
     void forEach(ForEachOp &op, const IonTrackedTypeVector *allTypes);
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/RangeAnalysis.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/RangeAnalysis.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/RangeAnalysis.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/RangeAnalysis.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -3168,6 +3168,26 @@
 }
 
 void
+MBoundsCheck::collectRangeInfoPreTrunc()
+{
+    Range indexRange(index());
+    Range lengthRange(length());
+    if (!indexRange.hasInt32LowerBound() || !indexRange.hasInt32UpperBound())
+        return;
+    if (!lengthRange.hasInt32LowerBound() || lengthRange.canBeNaN())
+        return;
+
+    int64_t indexLower = indexRange.lower();
+    int64_t indexUpper = indexRange.upper();
+    int64_t lengthLower = lengthRange.lower();
+    int64_t min = minimum();
+    int64_t max = maximum();
+
+    if (indexLower + min >= 0 && indexUpper + max < lengthLower)
+        fallible_ = false;
+}
+
+void
 MBoundsCheckLower::collectRangeInfoPreTrunc()
 {
     Range indexRange(index());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Recover.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Recover.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Recover.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Recover.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -13,6 +13,7 @@
 #include "jsstr.h"
 
 #include "builtin/RegExp.h"
+#include "builtin/SIMD.h"
 #include "builtin/TypedObject.h"
 
 #include "gc/Heap.h"
@@ -1307,6 +1308,54 @@
     if (!resultObject)
         return false;
 
+    RootedValue result(cx);
+    result.setObject(*resultObject);
+    iter.storeInstructionResult(result);
+    return true;
+}
+
+bool
+MSimdBox::writeRecoverData(CompactBufferWriter &writer) const
+{
+    MOZ_ASSERT(canRecoverOnBailout());
+    writer.writeUnsigned(uint32_t(RInstruction::Recover_SimdBox));
+    SimdTypeDescr &simdTypeDescr = templateObject()->typeDescr().as<SimdTypeDescr>();
+    SimdTypeDescr::Type type = simdTypeDescr.type();
+    writer.writeByte(uint8_t(type));
+    return true;
+}
+
+RSimdBox::RSimdBox(CompactBufferReader &reader)
+{
+    type_ = reader.readByte();
+}
+
+bool
+RSimdBox::recover(JSContext *cx, SnapshotIterator &iter) const
+{
+    JSObject *resultObject = nullptr;
+    RValueAllocation a = iter.readAllocation();
+    MOZ_ASSERT(iter.allocationReadable(a));
+    const FloatRegisters::RegisterContent *raw = iter.floatAllocationPointer(a);
+    switch (SimdTypeDescr::Type(type_)) {
+      case SimdTypeDescr::TYPE_INT32:
+        MOZ_ASSERT_IF(a.mode() == RValueAllocation::ANY_FLOAT_REG,
+                      a.fpuReg().isInt32x4());
+        resultObject = js::CreateSimd<Int32x4>(cx, (const Int32x4::Elem *) raw);
+        break;
+      case SimdTypeDescr::TYPE_FLOAT32:
+        MOZ_ASSERT_IF(a.mode() == RValueAllocation::ANY_FLOAT_REG,
+                      a.fpuReg().isFloat32x4());
+        resultObject = js::CreateSimd<Float32x4>(cx, (const Float32x4::Elem *) raw);
+        break;
+      case SimdTypeDescr::TYPE_FLOAT64:
+        MOZ_CRASH("NYI, RSimdBox of Float64x2");
+        break;
+    }
+
+    if (!resultObject)
+        return false;
+
     RootedValue result(cx);
     result.setObject(*resultObject);
     iter.storeInstructionResult(result);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Recover.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Recover.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Recover.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Recover.h	2015-02-28 15:03:05.000000000 +0000
@@ -64,6 +64,7 @@
     _(NewDerivedTypedObject)                    \
     _(CreateThisWithTemplate)                   \
     _(Lambda)                                   \
+    _(SimdBox)                                  \
     _(ObjectState)                              \
     _(ArrayState)
 
@@ -682,6 +683,21 @@
     }
 
     bool recover(JSContext *cx, SnapshotIterator &iter) const;
+};
+
+class RSimdBox MOZ_FINAL : public RInstruction
+{
+  private:
+    uint8_t type_;
+
+  public:
+    RINSTRUCTION_HEADER_(SimdBox)
+
+    virtual uint32_t numOperands() const {
+        return 1;
+    }
+
+    bool recover(JSContext *cx, SnapshotIterator &iter) const;
 };
 
 class RObjectState MOZ_FINAL : public RInstruction
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/RegisterSets.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/RegisterSets.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/RegisterSets.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/RegisterSets.h	2015-02-28 15:03:05.000000000 +0000
@@ -425,7 +425,7 @@
         for (uint32_t a = 0; a < reg.numAliased(); a++) {
             T tmp;
             reg.aliased(a, &tmp);
-            bits_ &= ~(SetType(1) << tmp.code());
+            takeUnchecked(tmp);
         }
     }
     void take(ValueOperand value) {
@@ -488,12 +488,19 @@
     T takeAny() {
         MOZ_ASSERT(!empty());
         T reg = getAny();
-        take(reg);
+        takeAllAliasedUnchecked(reg);
+        return reg;
+    }
+    T takeUnaliasedAny() {
+        // This variant is used by LinearScan for iterating over all registers.
+        MOZ_ASSERT(!empty());
+        T reg = getAny();
+        takeUnchecked(reg);
         return reg;
     }
     T takeAnyExcluding(T preclude) {
         T reg = getAnyExcluding(preclude);
-        take(reg);
+        takeAllAliasedUnchecked(reg);
         return reg;
     }
     ValueOperand takeAnyValue() {
@@ -509,15 +516,20 @@
 #endif
     }
     T takeFirst() {
+        // This function is used to implement a forward register set iterator.
         MOZ_ASSERT(!empty());
         T reg = getFirst();
-        take(reg);
+        // The iterator is used by PushRegsInMask which might be called with
+        // AllAlllocatableRegister mask.  To avoid saving more than needed we
+        // should take aliased registers too.
+        takeAllAliasedUnchecked(reg);
         return reg;
     }
     T takeLast() {
+        // This function is used to implement a backward register set iterator.
         MOZ_ASSERT(!empty());
         T reg = getLast();
-        take(reg);
+        takeAllAliasedUnchecked(reg);
         return reg;
     }
     void clear() {
@@ -527,7 +539,7 @@
         return bits_;
     }
     uint32_t size() const {
-        return mozilla::CountPopulation32(bits_);
+        return T::SetSize(bits_);
     }
     bool operator ==(const TypedRegisterSet<T> &other) const {
         return other.bits_ == bits_;
@@ -535,9 +547,6 @@
     TypedRegisterSet<T> reduceSetForPush() const {
         return T::ReduceSetForPush(*this);
     }
-    uint32_t getSizeInBytes() const {
-        return T::GetSizeInBytes(*this);
-    }
     uint32_t getPushSizeInBytes() const {
         return T::GetPushSizeInBytes(*this);
     }
@@ -646,9 +655,15 @@
     FloatRegister takeFloat() {
         return fpu_.takeAny();
     }
+    FloatRegister takeUnaliasedFloat() {
+        return fpu_.takeUnaliasedAny();
+    }
     Register takeGeneral() {
         return gpr_.takeAny();
     }
+    Register takeUnaliasedGeneral() {
+        return gpr_.takeUnaliasedAny();
+    }
     ValueOperand takeValueOperand() {
 #if defined(JS_NUNBOX32)
         return ValueOperand(takeGeneral(), takeGeneral());
@@ -670,10 +685,11 @@
         else
             gpr_.takeAllAliasedUnchecked(reg.gpr());
     }
-    AnyRegister takeAny(bool isFloat) {
+    // This function is used by LinearScan to find a free register.
+    AnyRegister takeUnaliasedAny(bool isFloat) {
         if (isFloat)
-            return AnyRegister(takeFloat());
-        return AnyRegister(takeGeneral());
+            return AnyRegister(takeUnaliasedFloat());
+        return AnyRegister(takeUnaliasedGeneral());
     }
     void clear() {
         gpr_.clear();
@@ -853,8 +869,8 @@
   private:
     Kind kind_;
     union {
-        Registers::Code gpr_;
-        FloatRegisters::Code fpu_;
+        Register::Code gpr_;
+        FloatRegister::Code fpu_;
         uint32_t offset_;
     } u;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Registers.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Registers.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Registers.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Registers.h	2015-02-28 15:03:05.000000000 +0000
@@ -29,16 +29,17 @@
 
 struct Register {
     typedef Registers Codes;
+    typedef Codes::Encoding Encoding;
     typedef Codes::Code Code;
     typedef Codes::SetType SetType;
     Code code_;
     static Register FromCode(uint32_t i) {
         MOZ_ASSERT(i < Registers::Total);
-        Register r = { (Registers::Code)i };
+        Register r = { Code(i) };
         return r;
     }
     static Register FromName(const char *name) {
-        Registers::Code code = Registers::FromName(name);
+        Code code = Registers::FromName(name);
         Register r = { code };
         return r;
     }
@@ -85,9 +86,13 @@
 
 class RegisterDump
 {
+  public:
+    typedef mozilla::Array<Registers::RegisterContent, Registers::Total> GPRArray;
+    typedef mozilla::Array<FloatRegisters::RegisterContent, FloatRegisters::TotalPhys> FPUArray;
+
   protected: // Silence Clang warning.
-    mozilla::Array<uintptr_t, Registers::Total> regs_;
-    mozilla::Array<double, FloatRegisters::TotalPhys> fpregs_;
+    GPRArray regs_;
+    FPUArray fpregs_;
 
   public:
     static size_t offsetOfRegister(Register reg) {
@@ -101,18 +106,24 @@
 // Information needed to recover machine register state.
 class MachineState
 {
-    mozilla::Array<uintptr_t *, Registers::Total> regs_;
-    mozilla::Array<double *, FloatRegisters::Total> fpregs_;
+    mozilla::Array<Registers::RegisterContent *, Registers::Total> regs_;
+    mozilla::Array<FloatRegisters::RegisterContent *, FloatRegisters::Total> fpregs_;
 
   public:
-    static MachineState FromBailout(mozilla::Array<uintptr_t, Registers::Total> &regs,
-                                    mozilla::Array<double, FloatRegisters::TotalPhys> &fpregs);
+    static MachineState FromBailout(RegisterDump::GPRArray &regs, RegisterDump::FPUArray &fpregs);
 
     void setRegisterLocation(Register reg, uintptr_t *up) {
-        regs_[reg.code()] = up;
+        regs_[reg.code()] = (Registers::RegisterContent *) up;
+    }
+    void setRegisterLocation(FloatRegister reg, float *fp) {
+        MOZ_ASSERT(reg.isSingle());
+        fpregs_[reg.code()] = (FloatRegisters::RegisterContent *) fp;
     }
     void setRegisterLocation(FloatRegister reg, double *dp) {
-        fpregs_[reg.code()] = dp;
+        fpregs_[reg.code()] = (FloatRegisters::RegisterContent *) dp;
+    }
+    void setRegisterLocation(FloatRegister reg, FloatRegisters::RegisterContent *rp) {
+        fpregs_[reg.code()] = rp;
     }
 
     bool has(Register reg) const {
@@ -122,13 +133,16 @@
         return fpregs_[reg.code()] != nullptr;
     }
     uintptr_t read(Register reg) const {
-        return *regs_[reg.code()];
+        return regs_[reg.code()]->r;
     }
     double read(FloatRegister reg) const {
-        return *fpregs_[reg.code()];
+        return fpregs_[reg.code()]->d;
     }
     void write(Register reg, uintptr_t value) const {
-        *regs_[reg.code()] = value;
+        regs_[reg.code()]->r = value;
+    }
+    const FloatRegisters::RegisterContent *address(FloatRegister reg) const {
+        return fpregs_[reg.code()];
     }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/ScalarReplacement.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/ScalarReplacement.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/ScalarReplacement.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/ScalarReplacement.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -143,6 +143,9 @@
             JitSpewDef(JitSpew_Escape, "  is escaped by\n", def);
             return true;
 
+          case MDefinition::Op_PostWriteBarrier:
+            break;
+
           case MDefinition::Op_Slots: {
 #ifdef DEBUG
             // Assert that MSlots are only used by MStoreSlot and MLoadSlot.
@@ -245,6 +248,7 @@
     void visitObjectState(MObjectState *ins);
     void visitStoreFixedSlot(MStoreFixedSlot *ins);
     void visitLoadFixedSlot(MLoadFixedSlot *ins);
+    void visitPostWriteBarrier(MPostWriteBarrier *ins);
     void visitStoreSlot(MStoreSlot *ins);
     void visitLoadSlot(MLoadSlot *ins);
     void visitGuardShape(MGuardShape *ins);
@@ -449,6 +453,17 @@
 
     // Remove original instruction.
     ins->block()->discard(ins);
+}
+
+void
+ObjectMemoryView::visitPostWriteBarrier(MPostWriteBarrier *ins)
+{
+    // Skip loads made on other objects.
+    if (ins->object() != obj_)
+        return;
+
+    // Remove original instruction.
+    ins->block()->discard(ins);
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Assembler-shared.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Assembler-shared.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Assembler-shared.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Assembler-shared.h	2015-02-28 15:03:05.000000000 +0000
@@ -316,6 +316,9 @@
     explicit PatchedAbsoluteAddress(const void *addr)
       : addr(const_cast<void*>(addr))
     { }
+    explicit PatchedAbsoluteAddress(uintptr_t addr)
+      : addr(reinterpret_cast<void*>(addr))
+    { }
 };
 
 // Specifies an address computed in the form of a register base and a constant,
@@ -764,14 +767,25 @@
 // #ifdefery.
 class AsmJSHeapAccess
 {
+#if defined(JS_CODEGEN_X64)
+  public:
+    enum WhatToDoOnOOB {
+        CarryOn, // loads return undefined, stores do nothing.
+        Throw    // throw a RangeError
+    };
+#endif
+
   private:
-    uint32_t offset_;
+    uint32_t insnOffset_;
+#if defined(JS_CODEGEN_X86)
+    uint8_t opLength_;  // the length of the load/store instruction
+#endif
+#if defined(JS_CODEGEN_X64)
+    uint8_t offsetWithinWholeSimdVector_; // if is this e.g. the Z of an XYZ
+    bool throwOnOOB_;   // should we throw on OOB?
+#endif
 #if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
     uint8_t cmpDelta_;  // the number of bytes from the cmp to the load/store instruction
-    uint8_t opLength_;  // the length of the load/store instruction
-    uint8_t numSimdElems_; // the number of SIMD lanes to load/store at once
-    Scalar::Type type_;
-    AnyRegister::Code loadedReg_ : 8;
 #endif
 
     JS_STATIC_ASSERT(AnyRegister::Total < UINT8_MAX);
@@ -780,63 +794,50 @@
     AsmJSHeapAccess() {}
 #if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
     static const uint32_t NoLengthCheck = UINT32_MAX;
+#endif
 
-    // If 'cmp' equals 'offset' or if it is not supplied then the
+#if defined(JS_CODEGEN_X86)
+    // If 'cmp' equals 'insnOffset' or if it is not supplied then the
     // cmpDelta_ is zero indicating that there is no length to patch.
-    AsmJSHeapAccess(uint32_t offset, uint32_t after, Scalar::Type type, AnyRegister loadedReg,
-                    uint32_t cmp = NoLengthCheck)
-      : offset_(offset),
-        cmpDelta_(cmp == NoLengthCheck ? 0 : offset - cmp),
-        opLength_(after - offset),
-        numSimdElems_(UINT8_MAX),
-        type_(type),
-        loadedReg_(loadedReg.code())
-    {
-        MOZ_ASSERT(!Scalar::isSimdType(type));
-    }
-    AsmJSHeapAccess(uint32_t offset, uint8_t after, Scalar::Type type, uint32_t cmp = NoLengthCheck)
-      : offset_(offset),
-        cmpDelta_(cmp == NoLengthCheck ? 0 : offset - cmp),
-        opLength_(after - offset),
-        numSimdElems_(UINT8_MAX),
-        type_(type),
-        loadedReg_(UINT8_MAX)
-    {
-        MOZ_ASSERT(!Scalar::isSimdType(type));
-    }
-    // SIMD loads / stores
-    AsmJSHeapAccess(uint32_t offset, uint32_t after, unsigned numSimdElems, Scalar::Type type,
-                    uint32_t cmp = NoLengthCheck)
-      : offset_(offset),
-        cmpDelta_(cmp == NoLengthCheck ? 0 : offset - cmp),
-        opLength_(after - offset),
-        numSimdElems_(numSimdElems),
-        type_(type),
-        loadedReg_(UINT8_MAX)
+    AsmJSHeapAccess(uint32_t insnOffset, uint32_t after, uint32_t cmp = NoLengthCheck)
+      : insnOffset_(insnOffset),
+        opLength_(after - insnOffset),
+        cmpDelta_(cmp == NoLengthCheck ? 0 : insnOffset - cmp)
+    {}
+#elif defined(JS_CODEGEN_X64)
+    // If 'cmp' equals 'insnOffset' or if it is not supplied then the
+    // cmpDelta_ is zero indicating that there is no length to patch.
+    AsmJSHeapAccess(uint32_t insnOffset, WhatToDoOnOOB oob,
+                    uint32_t cmp = NoLengthCheck,
+                    uint32_t offsetWithinWholeSimdVector = 0)
+      : insnOffset_(insnOffset),
+        offsetWithinWholeSimdVector_(offsetWithinWholeSimdVector),
+        throwOnOOB_(oob == Throw),
+        cmpDelta_(cmp == NoLengthCheck ? 0 : insnOffset - cmp)
     {
-        MOZ_ASSERT(Scalar::isSimdType(type));
+        MOZ_ASSERT(offsetWithinWholeSimdVector_ == offsetWithinWholeSimdVector);
     }
 #elif defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
-    explicit AsmJSHeapAccess(uint32_t offset)
-      : offset_(offset)
+    explicit AsmJSHeapAccess(uint32_t insnOffset)
+      : insnOffset_(insnOffset)
     {}
 #endif
 
-    uint32_t offset() const { return offset_; }
-    void setOffset(uint32_t offset) { offset_ = offset; }
+    uint32_t insnOffset() const { return insnOffset_; }
+    void setInsnOffset(uint32_t insnOffset) { insnOffset_ = insnOffset; }
 #if defined(JS_CODEGEN_X86)
-    void *patchOffsetAt(uint8_t *code) const { return code + (offset_ + opLength_); }
+    void *patchHeapPtrImmAt(uint8_t *code) const { return code + (insnOffset_ + opLength_); }
 #endif
 #if defined(JS_CODEGEN_X64)
-    unsigned opLength() const { MOZ_ASSERT(!Scalar::isSimdType(type_)); return opLength_; }
-    bool isLoad() const { MOZ_ASSERT(!Scalar::isSimdType(type_)); return loadedReg_ != UINT8_MAX; }
+    bool throwOnOOB() const { return throwOnOOB_; }
+    uint32_t offsetWithinWholeSimdVector() const { return offsetWithinWholeSimdVector_; }
 #endif
 #if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
     bool hasLengthCheck() const { return cmpDelta_ > 0; }
-    void *patchLengthAt(uint8_t *code) const { return code + (offset_ - cmpDelta_); }
-    unsigned numSimdElems() const { MOZ_ASSERT(Scalar::isSimdType(type_)); return numSimdElems_; }
-    Scalar::Type type() const { return type_; }
-    AnyRegister loadedReg() const { return AnyRegister::FromCode(loadedReg_); }
+    void *patchLengthAt(uint8_t *code) const {
+        MOZ_ASSERT(hasLengthCheck());
+        return code + (insnOffset_ - cmpDelta_);
+    }
 #endif
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Assembler-x86-shared.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Assembler-x86-shared.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Assembler-x86-shared.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Assembler-x86-shared.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -293,3 +293,32 @@
         avxPresent = (xcr0EAX & xcr0SSEBit) && (xcr0EAX & xcr0AVXBit);
     }
 }
+
+const char *
+FloatRegister::name() const {
+    static const char *const names[] = {
+
+#ifdef JS_CODEGEN_X64
+#define FLOAT_REGS_(TYPE) \
+        "%xmm0" TYPE, "%xmm1" TYPE, "%xmm2" TYPE, "%xmm3" TYPE, \
+        "%xmm4" TYPE, "%xmm5" TYPE, "%xmm6" TYPE, "%xmm7" TYPE, \
+        "%xmm8" TYPE, "%xmm9" TYPE, "%xmm10" TYPE, "%xmm11" TYPE, \
+        "%xmm12" TYPE, "%xmm13" TYPE, "%xmm14" TYPE, "%xmm15" TYPE
+#else
+#define FLOAT_REGS_(TYPE) \
+        "%xmm0" TYPE, "%xmm1" TYPE, "%xmm2" TYPE, "%xmm3" TYPE, \
+        "%xmm4" TYPE, "%xmm5" TYPE, "%xmm6" TYPE, "%xmm7" TYPE
+#endif
+
+        // These should be enumerated in the same order as in
+        // FloatRegisters::ContentType.
+        FLOAT_REGS_(".s"),
+        FLOAT_REGS_(".d"),
+        FLOAT_REGS_(".i4"),
+        FLOAT_REGS_(".s4")
+#undef FLOAT_REGS_
+
+    };
+    MOZ_ASSERT(size_t(code()) < mozilla::ArrayLength(names));
+    return names[size_t(code())];
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Assembler-x86-shared.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Assembler-x86-shared.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Assembler-x86-shared.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Assembler-x86-shared.h	2015-02-28 15:03:05.000000000 +0000
@@ -40,7 +40,7 @@
     { }
     explicit Operand(FloatRegister reg)
       : kind_(FPREG),
-        base_(reg.code())
+        base_(reg.encoding())
     { }
     explicit Operand(const Address &address)
       : kind_(MEM_REG_DISP),
@@ -70,6 +70,10 @@
       : kind_(MEM_ADDRESS32),
         disp_(X86Encoding::AddressImmediate(address.addr))
     { }
+    explicit Operand(PatchedAbsoluteAddress address)
+      : kind_(MEM_ADDRESS32),
+        disp_(X86Encoding::AddressImmediate(address.addr))
+    { }
 
     Address toAddress() const {
         MOZ_ASSERT(kind() == MEM_REG_DISP);
@@ -84,25 +88,25 @@
     Kind kind() const {
         return kind_;
     }
-    Registers::Code reg() const {
+    Register::Code reg() const {
         MOZ_ASSERT(kind() == REG);
-        return (Registers::Code)base_;
+        return Register::Code(base_);
     }
-    Registers::Code base() const {
+    Register::Code base() const {
         MOZ_ASSERT(kind() == MEM_REG_DISP || kind() == MEM_SCALE);
-        return (Registers::Code)base_;
+        return Register::Code(base_);
     }
-    Registers::Code index() const {
+    Register::Code index() const {
         MOZ_ASSERT(kind() == MEM_SCALE);
-        return (Registers::Code)index_;
+        return Register::Code(index_);
     }
     Scale scale() const {
         MOZ_ASSERT(kind() == MEM_SCALE);
         return scale_;
     }
-    FloatRegisters::Code fpu() const {
+    FloatRegister::Encoding fpu() const {
         MOZ_ASSERT(kind() == FPREG);
-        return (FloatRegisters::Code)base_;
+        return FloatRegister::Encoding(base_);
     }
     int32_t disp() const {
         MOZ_ASSERT(kind() == MEM_REG_DISP || kind() == MEM_SCALE);
@@ -479,24 +483,24 @@
     // stores too.
     void vmovapd(FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovapd_rr(src.code(), dest.code());
+        masm.vmovapd_rr(src.encoding(), dest.encoding());
     }
 
     void vmovaps(FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovaps_rr(src.code(), dest.code());
+        masm.vmovaps_rr(src.encoding(), dest.encoding());
     }
     void vmovaps(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovaps_mr(src.disp(), src.base(), dest.code());
+            masm.vmovaps_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovaps_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
+            masm.vmovaps_mr(src.disp(), src.base(), src.index(), src.scale(), dest.encoding());
             break;
           case Operand::FPREG:
-            masm.vmovaps_rr(src.fpu(), dest.code());
+            masm.vmovaps_rr(src.fpu(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -506,10 +510,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (dest.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovaps_rm(src.code(), dest.disp(), dest.base());
+            masm.vmovaps_rm(src.encoding(), dest.disp(), dest.base());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovaps_rm(src.code(), dest.disp(), dest.base(), dest.index(), dest.scale());
+            masm.vmovaps_rm(src.encoding(), dest.disp(), dest.base(), dest.index(), dest.scale());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -519,10 +523,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovups_mr(src.disp(), src.base(), dest.code());
+            masm.vmovups_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovups_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
+            masm.vmovups_mr(src.disp(), src.base(), src.index(), src.scale(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -532,10 +536,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (dest.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovups_rm(src.code(), dest.disp(), dest.base());
+            masm.vmovups_rm(src.encoding(), dest.disp(), dest.base());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovups_rm(src.code(), dest.disp(), dest.base(), dest.index(), dest.scale());
+            masm.vmovups_rm(src.encoding(), dest.disp(), dest.base(), dest.index(), dest.scale());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -546,44 +550,44 @@
     // register-to-register form has different semantics (it doesn't clobber
     // the whole output register) and isn't needed currently.
     void vmovsd(const Address &src, FloatRegister dest) {
-        masm.vmovsd_mr(src.offset, src.base.code(), dest.code());
+        masm.vmovsd_mr(src.offset, src.base.code(), dest.encoding());
     }
     void vmovsd(const BaseIndex &src, FloatRegister dest) {
-        masm.vmovsd_mr(src.offset, src.base.code(), src.index.code(), src.scale, dest.code());
+        masm.vmovsd_mr(src.offset, src.base.code(), src.index.code(), src.scale, dest.encoding());
     }
     void vmovsd(FloatRegister src, const Address &dest) {
-        masm.vmovsd_rm(src.code(), dest.offset, dest.base.code());
+        masm.vmovsd_rm(src.encoding(), dest.offset, dest.base.code());
     }
     void vmovsd(FloatRegister src, const BaseIndex &dest) {
-        masm.vmovsd_rm(src.code(), dest.offset, dest.base.code(), dest.index.code(), dest.scale);
+        masm.vmovsd_rm(src.encoding(), dest.offset, dest.base.code(), dest.index.code(), dest.scale);
     }
     // Although vmovss is not only provided in load/store form (for the same
     // reasons as vmovsd above), the register to register form should be only
     // used in contexts where we care about not clearing the higher lanes of
     // the FloatRegister.
     void vmovss(const Address &src, FloatRegister dest) {
-        masm.vmovss_mr(src.offset, src.base.code(), dest.code());
+        masm.vmovss_mr(src.offset, src.base.code(), dest.encoding());
     }
     void vmovss(const BaseIndex &src, FloatRegister dest) {
-        masm.vmovss_mr(src.offset, src.base.code(), src.index.code(), src.scale, dest.code());
+        masm.vmovss_mr(src.offset, src.base.code(), src.index.code(), src.scale, dest.encoding());
     }
     void vmovss(FloatRegister src, const Address &dest) {
-        masm.vmovss_rm(src.code(), dest.offset, dest.base.code());
+        masm.vmovss_rm(src.encoding(), dest.offset, dest.base.code());
     }
     void vmovss(FloatRegister src, const BaseIndex &dest) {
-        masm.vmovss_rm(src.code(), dest.offset, dest.base.code(), dest.index.code(), dest.scale);
+        masm.vmovss_rm(src.encoding(), dest.offset, dest.base.code(), dest.index.code(), dest.scale);
     }
     void vmovss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
-        masm.vmovss_rr(src1.code(), src0.code(), dest.code());
+        masm.vmovss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vmovdqu(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovdqu_mr(src.disp(), src.base(), dest.code());
+            masm.vmovdqu_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovdqu_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
+            masm.vmovdqu_mr(src.disp(), src.base(), src.index(), src.scale(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -593,10 +597,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (dest.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovdqu_rm(src.code(), dest.disp(), dest.base());
+            masm.vmovdqu_rm(src.encoding(), dest.disp(), dest.base());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovdqu_rm(src.code(), dest.disp(), dest.base(), dest.index(), dest.scale());
+            masm.vmovdqu_rm(src.encoding(), dest.disp(), dest.base(), dest.index(), dest.scale());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -606,13 +610,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::FPREG:
-            masm.vmovdqa_rr(src.fpu(), dest.code());
+            masm.vmovdqa_rr(src.fpu(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmovdqa_mr(src.disp(), src.base(), dest.code());
+            masm.vmovdqa_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovdqa_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
+            masm.vmovdqa_mr(src.disp(), src.base(), src.index(), src.scale(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -622,10 +626,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (dest.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovdqa_rm(src.code(), dest.disp(), dest.base());
+            masm.vmovdqa_rm(src.encoding(), dest.disp(), dest.base());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovdqa_rm(src.code(), dest.disp(), dest.base(), dest.index(), dest.scale());
+            masm.vmovdqa_rm(src.encoding(), dest.disp(), dest.base(), dest.index(), dest.scale());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -633,15 +637,15 @@
     }
     void vmovdqa(FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovdqa_rr(src.code(), dest.code());
+        masm.vmovdqa_rr(src.encoding(), dest.encoding());
     }
     void vcvtss2sd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvtss2sd_rr(src1.code(), src0.code(), dest.code());
+        masm.vcvtss2sd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vcvtsd2ss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvtsd2ss_rr(src1.code(), src0.code(), dest.code());
+        masm.vcvtsd2ss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void movzbl(const Operand &src, Register dest) {
         switch (src.kind()) {
@@ -1499,16 +1503,16 @@
 
     void vpinsrd(unsigned lane, Register src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
-        masm.vpinsrd_irr(lane, src1.code(), src0.code(), dest.code());
+        masm.vpinsrd_irr(lane, src1.code(), src0.encoding(), dest.encoding());
     }
     void vpinsrd(unsigned lane, const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
         switch (src1.kind()) {
           case Operand::REG:
-            masm.vpinsrd_irr(lane, src1.reg(), src0.code(), dest.code());
+            masm.vpinsrd_irr(lane, src1.reg(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpinsrd_imr(lane, src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpinsrd_imr(lane, src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1516,16 +1520,16 @@
     }
     void vpextrd(unsigned lane, FloatRegister src, Register dest) {
         MOZ_ASSERT(HasSSE41());
-        masm.vpextrd_irr(lane, src.code(), dest.code());
+        masm.vpextrd_irr(lane, src.encoding(), dest.code());
     }
     void vpextrd(unsigned lane, FloatRegister src, const Operand &dest) {
         MOZ_ASSERT(HasSSE41());
         switch (dest.kind()) {
           case Operand::REG:
-            masm.vpextrd_irr(lane, src.code(), dest.reg());
+            masm.vpextrd_irr(lane, src.encoding(), dest.reg());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpextrd_irm(lane, src.code(), dest.disp(), dest.base());
+            masm.vpextrd_irm(lane, src.encoding(), dest.disp(), dest.base());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1533,52 +1537,52 @@
     }
     void vpsrldq(Imm32 shift, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpsrldq_ir(shift.value, src0.code(), dest.code());
+        masm.vpsrldq_ir(shift.value, src0.encoding(), dest.encoding());
     }
     void vpsllq(Imm32 shift, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpsllq_ir(shift.value, src0.code(), dest.code());
+        masm.vpsllq_ir(shift.value, src0.encoding(), dest.encoding());
     }
     void vpsrlq(Imm32 shift, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpsrlq_ir(shift.value, src0.code(), dest.code());
+        masm.vpsrlq_ir(shift.value, src0.encoding(), dest.encoding());
     }
     void vpslld(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpslld_rr(src1.code(), src0.code(), dest.code());
+        masm.vpslld_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpslld(Imm32 count, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpslld_ir(count.value, src0.code(), dest.code());
+        masm.vpslld_ir(count.value, src0.encoding(), dest.encoding());
     }
     void vpsrad(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpsrad_rr(src1.code(), src0.code(), dest.code());
+        masm.vpsrad_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpsrad(Imm32 count, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpsrad_ir(count.value, src0.code(), dest.code());
+        masm.vpsrad_ir(count.value, src0.encoding(), dest.encoding());
     }
     void vpsrld(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpsrld_rr(src1.code(), src0.code(), dest.code());
+        masm.vpsrld_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpsrld(Imm32 count, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpsrld_ir(count.value, src0.code(), dest.code());
+        masm.vpsrld_ir(count.value, src0.encoding(), dest.encoding());
     }
 
     void vcvtsi2sd(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::REG:
-            masm.vcvtsi2sd_rr(src1.reg(), src0.code(), dest.code());
+            masm.vcvtsi2sd_rr(src1.reg(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vcvtsi2sd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vcvtsi2sd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vcvtsi2sd_mr(src1.disp(), src1.base(), src1.index(), src1.scale(), src0.code(), dest.code());
+            masm.vcvtsi2sd_mr(src1.disp(), src1.base(), src1.index(), src1.scale(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1586,23 +1590,23 @@
     }
     void vcvttsd2si(FloatRegister src, Register dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvttsd2si_rr(src.code(), dest.code());
+        masm.vcvttsd2si_rr(src.encoding(), dest.code());
     }
     void vcvttss2si(FloatRegister src, Register dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvttss2si_rr(src.code(), dest.code());
+        masm.vcvttss2si_rr(src.encoding(), dest.code());
     }
     void vcvtsi2ss(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::REG:
-            masm.vcvtsi2ss_rr(src1.reg(), src0.code(), dest.code());
+            masm.vcvtsi2ss_rr(src1.reg(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vcvtsi2ss_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vcvtsi2ss_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vcvtsi2ss_mr(src1.disp(), src1.base(), src1.index(), src1.scale(), src0.code(), dest.code());
+            masm.vcvtsi2ss_mr(src1.disp(), src1.base(), src1.index(), src1.scale(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1610,55 +1614,55 @@
     }
     void vcvtsi2ss(Register src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvtsi2ss_rr(src1.code(), src0.code(), dest.code());
+        masm.vcvtsi2ss_rr(src1.code(), src0.encoding(), dest.encoding());
     }
     void vcvtsi2sd(Register src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvtsi2sd_rr(src1.code(), src0.code(), dest.code());
+        masm.vcvtsi2sd_rr(src1.code(), src0.encoding(), dest.encoding());
     }
     void vcvttps2dq(FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvttps2dq_rr(src.code(), dest.code());
+        masm.vcvttps2dq_rr(src.encoding(), dest.encoding());
     }
     void vcvtdq2ps(FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vcvtdq2ps_rr(src.code(), dest.code());
+        masm.vcvtdq2ps_rr(src.encoding(), dest.encoding());
     }
     void vmovmskpd(FloatRegister src, Register dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovmskpd_rr(src.code(), dest.code());
+        masm.vmovmskpd_rr(src.encoding(), dest.code());
     }
     void vmovmskps(FloatRegister src, Register dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovmskps_rr(src.code(), dest.code());
+        masm.vmovmskps_rr(src.encoding(), dest.code());
     }
     void vptest(FloatRegister rhs, FloatRegister lhs) {
         MOZ_ASSERT(HasSSE41());
-        masm.vptest_rr(rhs.code(), lhs.code());
+        masm.vptest_rr(rhs.encoding(), lhs.encoding());
     }
     void vucomisd(FloatRegister rhs, FloatRegister lhs) {
         MOZ_ASSERT(HasSSE2());
-        masm.vucomisd_rr(rhs.code(), lhs.code());
+        masm.vucomisd_rr(rhs.encoding(), lhs.encoding());
     }
     void vucomiss(FloatRegister rhs, FloatRegister lhs) {
         MOZ_ASSERT(HasSSE2());
-        masm.vucomiss_rr(rhs.code(), lhs.code());
+        masm.vucomiss_rr(rhs.encoding(), lhs.encoding());
     }
     void vpcmpeqw(FloatRegister rhs, FloatRegister lhs, FloatRegister dst) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpcmpeqw_rr(rhs.code(), lhs.code(), dst.code());
+        masm.vpcmpeqw_rr(rhs.encoding(), lhs.encoding(), dst.encoding());
     }
     void vpcmpeqd(const Operand &rhs, FloatRegister lhs, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (rhs.kind()) {
           case Operand::FPREG:
-            masm.vpcmpeqd_rr(rhs.fpu(), lhs.code(), dest.code());
+            masm.vpcmpeqd_rr(rhs.fpu(), lhs.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpcmpeqd_mr(rhs.disp(), rhs.base(), lhs.code(), dest.code());
+            masm.vpcmpeqd_mr(rhs.disp(), rhs.base(), lhs.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpcmpeqd_mr(rhs.address(), lhs.code(), dest.code());
+            masm.vpcmpeqd_mr(rhs.address(), lhs.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1668,29 +1672,40 @@
         MOZ_ASSERT(HasSSE2());
         switch (rhs.kind()) {
           case Operand::FPREG:
-            masm.vpcmpgtd_rr(rhs.fpu(), lhs.code(), dest.code());
+            masm.vpcmpgtd_rr(rhs.fpu(), lhs.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpcmpgtd_mr(rhs.disp(), rhs.base(), lhs.code(), dest.code());
+            masm.vpcmpgtd_mr(rhs.disp(), rhs.base(), lhs.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpcmpgtd_mr(rhs.address(), lhs.code(), dest.code());
+            masm.vpcmpgtd_mr(rhs.address(), lhs.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
         }
     }
-    void vcmpps(uint8_t order, const Operand &src1, FloatRegister src0, FloatRegister dest) {
+    void vcmpps(uint8_t order, Operand src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
+        // :TODO: (Bug 1132894) See LIRGeneratorX86Shared::lowerForFPU
+        if (!HasAVX() && !src0.aliases(dest)) {
+            if (src1.kind() == Operand::FPREG &&
+                dest.aliases(FloatRegister::FromCode(src1.fpu())))
+            {
+                vmovdqa(src1, ScratchSimdReg);
+                src1 = Operand(ScratchSimdReg);
+            }
+            vmovdqa(src0, dest);
+            src0 = dest;
+        }
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vcmpps_rr(order, src1.fpu(), src0.code(), dest.code());
+            masm.vcmpps_rr(order, src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vcmpps_mr(order, src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vcmpps_mr(order, src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vcmpps_mr(order, src1.address(), src0.code(), dest.code());
+            masm.vcmpps_mr(order, src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1715,13 +1730,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::FPREG:
-            masm.vrcpps_rr(src.fpu(), dest.code());
+            masm.vrcpps_rr(src.fpu(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vrcpps_mr(src.disp(), src.base(), dest.code());
+            masm.vrcpps_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vrcpps_mr(src.address(), dest.code());
+            masm.vrcpps_mr(src.address(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1731,13 +1746,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::FPREG:
-            masm.vsqrtps_rr(src.fpu(), dest.code());
+            masm.vsqrtps_rr(src.fpu(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vsqrtps_mr(src.disp(), src.base(), dest.code());
+            masm.vsqrtps_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vsqrtps_mr(src.address(), dest.code());
+            masm.vsqrtps_mr(src.address(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1747,13 +1762,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::FPREG:
-            masm.vrsqrtps_rr(src.fpu(), dest.code());
+            masm.vrsqrtps_rr(src.fpu(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vrsqrtps_mr(src.disp(), src.base(), dest.code());
+            masm.vrsqrtps_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vrsqrtps_mr(src.address(), dest.code());
+            masm.vrsqrtps_mr(src.address(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1761,20 +1776,20 @@
     }
     void vmovd(Register src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovd_rr(src.code(), dest.code());
+        masm.vmovd_rr(src.code(), dest.encoding());
     }
     void vmovd(FloatRegister src, Register dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovd_rr(src.code(), dest.code());
+        masm.vmovd_rr(src.encoding(), dest.code());
     }
     void vmovd(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovd_mr(src.disp(), src.base(), dest.code());
+            masm.vmovd_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovd_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
+            masm.vmovd_mr(src.disp(), src.base(), src.index(), src.scale(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1784,13 +1799,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (dest.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovd_rm(src.code(), dest.disp(), dest.base());
+            masm.vmovd_rm(src.encoding(), dest.disp(), dest.base());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovd_rm(src.code(), dest.disp(), dest.base(), dest.index(), dest.scale());
+            masm.vmovd_rm(src.encoding(), dest.disp(), dest.base(), dest.index(), dest.scale());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vmovq_rm(src.code(), dest.address());
+            masm.vmovq_rm(src.encoding(), dest.address());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1800,13 +1815,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovq_mr(src.disp(), src.base(), dest.code());
+            masm.vmovq_mr(src.disp(), src.base(), dest.encoding());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovq_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
+            masm.vmovq_mr(src.disp(), src.base(), src.index(), src.scale(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vmovq_mr(src.address(), dest.code());
+            masm.vmovq_mr(src.address(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1816,10 +1831,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (dest.kind()) {
           case Operand::MEM_REG_DISP:
-            masm.vmovq_rm(src.code(), dest.disp(), dest.base());
+            masm.vmovq_rm(src.encoding(), dest.disp(), dest.base());
             break;
           case Operand::MEM_SCALE:
-            masm.vmovq_rm(src.code(), dest.disp(), dest.base(), dest.index(), dest.scale());
+            masm.vmovq_rm(src.encoding(), dest.disp(), dest.base(), dest.index(), dest.scale());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1829,13 +1844,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpaddd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpaddd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpaddd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpaddd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpaddd_mr(src1.address(), src0.code(), dest.code());
+            masm.vpaddd_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1845,13 +1860,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpsubd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpsubd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpsubd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpsubd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpsubd_mr(src1.address(), src0.code(), dest.code());
+            masm.vpsubd_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1859,16 +1874,16 @@
     }
     void vpmuludq(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpmuludq_rr(src1.code(), src0.code(), dest.code());
+        masm.vpmuludq_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpmuludq(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpmuludq_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpmuludq_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpmuludq_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpmuludq_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1878,13 +1893,13 @@
         MOZ_ASSERT(HasSSE41());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpmulld_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpmulld_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpmulld_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpmulld_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpmulld_mr(src1.address(), src0.code(), dest.code());
+            masm.vpmulld_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1894,13 +1909,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vaddps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vaddps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vaddps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vaddps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vaddps_mr(src1.address(), src0.code(), dest.code());
+            masm.vaddps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1910,13 +1925,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vsubps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vsubps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vsubps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vsubps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vsubps_mr(src1.address(), src0.code(), dest.code());
+            masm.vsubps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1926,13 +1941,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vmulps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vmulps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmulps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vmulps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vmulps_mr(src1.address(), src0.code(), dest.code());
+            masm.vmulps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1942,13 +1957,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vdivps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vdivps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vdivps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vdivps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vdivps_mr(src1.address(), src0.code(), dest.code());
+            masm.vdivps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1958,13 +1973,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vmaxps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vmaxps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmaxps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vmaxps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vmaxps_mr(src1.address(), src0.code(), dest.code());
+            masm.vmaxps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1974,13 +1989,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vminps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vminps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vminps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vminps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vminps_mr(src1.address(), src0.code(), dest.code());
+            masm.vminps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -1990,13 +2005,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vandps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vandps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vandps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vandps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vandps_mr(src1.address(), src0.code(), dest.code());
+            masm.vandps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2007,13 +2022,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vandnps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vandnps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vandnps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vandnps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vandnps_mr(src1.address(), src0.code(), dest.code());
+            masm.vandnps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2023,13 +2038,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vorps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vorps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vorps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vorps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vorps_mr(src1.address(), src0.code(), dest.code());
+            masm.vorps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2039,13 +2054,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vxorps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vxorps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vxorps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vxorps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vxorps_mr(src1.address(), src0.code(), dest.code());
+            masm.vxorps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2053,19 +2068,19 @@
     }
     void vpand(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpand_rr(src1.code(), src0.code(), dest.code());
+        masm.vpand_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpand(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpand_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpand_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpand_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpand_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpand_mr(src1.address(), src0.code(), dest.code());
+            masm.vpand_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2073,19 +2088,19 @@
     }
     void vpor(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpor_rr(src1.code(), src0.code(), dest.code());
+        masm.vpor_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpor(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpor_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpor_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpor_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpor_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpor_mr(src1.address(), src0.code(), dest.code());
+            masm.vpor_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2093,19 +2108,19 @@
     }
     void vpxor(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpxor_rr(src1.code(), src0.code(), dest.code());
+        masm.vpxor_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpxor(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpxor_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpxor_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpxor_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpxor_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpxor_mr(src1.address(), src0.code(), dest.code());
+            masm.vpxor_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2113,19 +2128,19 @@
     }
     void vpandn(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpandn_rr(src1.code(), src0.code(), dest.code());
+        masm.vpandn_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vpandn(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpandn_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vpandn_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpandn_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vpandn_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpandn_mr(src1.address(), src0.code(), dest.code());
+            masm.vpandn_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2134,19 +2149,19 @@
 
     void vpshufd(uint32_t mask, FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vpshufd_irr(mask, src.code(), dest.code());
+        masm.vpshufd_irr(mask, src.encoding(), dest.encoding());
     }
     void vpshufd(uint32_t mask, const Operand &src1, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vpshufd_irr(mask, src1.fpu(), dest.code());
+            masm.vpshufd_irr(mask, src1.fpu(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vpshufd_imr(mask, src1.disp(), src1.base(), dest.code());
+            masm.vpshufd_imr(mask, src1.disp(), src1.base(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vpshufd_imr(mask, src1.address(), dest.code());
+            masm.vpshufd_imr(mask, src1.address(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2154,27 +2169,27 @@
     }
     void vmovhlps(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovhlps_rr(src1.code(), src0.code(), dest.code());
+        masm.vmovhlps_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vmovlhps(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovlhps_rr(src1.code(), src0.code(), dest.code());
+        masm.vmovlhps_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vunpcklps(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vunpcklps_rr(src1.code(), src0.code(), dest.code());
+        masm.vunpcklps_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vunpcklps(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vunpcklps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vunpcklps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vunpcklps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vunpcklps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vunpcklps_mr(src1.address(), src0.code(), dest.code());
+            masm.vunpcklps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2182,19 +2197,19 @@
     }
     void vunpckhps(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vunpckhps_rr(src1.code(), src0.code(), dest.code());
+        masm.vunpckhps_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vunpckhps(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vunpckhps_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vunpckhps_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vunpckhps_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vunpckhps_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vunpckhps_mr(src1.address(), src0.code(), dest.code());
+            masm.vunpckhps_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2202,19 +2217,19 @@
     }
     void vshufps(uint32_t mask, FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vshufps_irr(mask, src1.code(), src0.code(), dest.code());
+        masm.vshufps_irr(mask, src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vshufps(uint32_t mask, const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vshufps_irr(mask, src1.fpu(), src0.code(), dest.code());
+            masm.vshufps_irr(mask, src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vshufps_imr(mask, src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vshufps_imr(mask, src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vshufps_imr(mask, src1.address(), src0.code(), dest.code());
+            masm.vshufps_imr(mask, src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2222,23 +2237,23 @@
     }
     void vaddsd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vaddsd_rr(src1.code(), src0.code(), dest.code());
+        masm.vaddsd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vaddss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vaddss_rr(src1.code(), src0.code(), dest.code());
+        masm.vaddss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vaddsd(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vaddsd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vaddsd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vaddsd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vaddsd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vaddsd_mr(src1.address(), src0.code(), dest.code());
+            masm.vaddsd_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2248,13 +2263,13 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vaddss_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vaddss_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vaddss_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vaddss_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_ADDRESS32:
-            masm.vaddss_mr(src1.address(), src0.code(), dest.code());
+            masm.vaddss_mr(src1.address(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2262,20 +2277,20 @@
     }
     void vsubsd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vsubsd_rr(src1.code(), src0.code(), dest.code());
+        masm.vsubsd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vsubss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vsubss_rr(src1.code(), src0.code(), dest.code());
+        masm.vsubss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vsubsd(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vsubsd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vsubsd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vsubsd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vsubsd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2285,10 +2300,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vsubss_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vsubss_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vsubss_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vsubss_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2296,16 +2311,16 @@
     }
     void vmulsd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmulsd_rr(src1.code(), src0.code(), dest.code());
+        masm.vmulsd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vmulsd(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vmulsd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vmulsd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmulsd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vmulsd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2315,10 +2330,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vmulss_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vmulss_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmulss_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vmulss_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2326,24 +2341,24 @@
     }
     void vmulss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmulss_rr(src1.code(), src0.code(), dest.code());
+        masm.vmulss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vdivsd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vdivsd_rr(src1.code(), src0.code(), dest.code());
+        masm.vdivsd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vdivss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vdivss_rr(src1.code(), src0.code(), dest.code());
+        masm.vdivss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vdivsd(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vdivsd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vdivsd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vdivsd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vdivsd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2353,10 +2368,10 @@
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vdivss_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vdivss_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vdivss_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vdivss_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2364,43 +2379,43 @@
     }
     void vxorpd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vxorpd_rr(src1.code(), src0.code(), dest.code());
+        masm.vxorpd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vxorps(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vxorps_rr(src1.code(), src0.code(), dest.code());
+        masm.vxorps_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vorpd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vorpd_rr(src1.code(), src0.code(), dest.code());
+        masm.vorpd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vorps(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vorps_rr(src1.code(), src0.code(), dest.code());
+        masm.vorps_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vandpd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vandpd_rr(src1.code(), src0.code(), dest.code());
+        masm.vandpd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vandps(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vandps_rr(src1.code(), src0.code(), dest.code());
+        masm.vandps_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vsqrtsd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vsqrtsd_rr(src1.code(), src0.code(), dest.code());
+        masm.vsqrtsd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vsqrtss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vsqrtss_rr(src1.code(), src0.code(), dest.code());
+        masm.vsqrtss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vroundsd(X86Encoding::RoundingMode mode, FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
-        masm.vroundsd_irr(mode, src1.code(), src0.code(), dest.code());
+        masm.vroundsd_irr(mode, src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vroundss(X86Encoding::RoundingMode mode, FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
-        masm.vroundss_irr(mode, src1.code(), src0.code(), dest.code());
+        masm.vroundss_irr(mode, src1.encoding(), src0.encoding(), dest.encoding());
     }
     unsigned vinsertpsMask(SimdLane sourceLane, SimdLane destLane, unsigned zeroMask = 0)
     {
@@ -2415,16 +2430,16 @@
     }
     void vinsertps(uint32_t mask, FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
-        masm.vinsertps_irr(mask, src1.code(), src0.code(), dest.code());
+        masm.vinsertps_irr(mask, src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vinsertps(uint32_t mask, const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vinsertps_irr(mask, src1.fpu(), src0.code(), dest.code());
+            masm.vinsertps_irr(mask, src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vinsertps_imr(mask, src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vinsertps_imr(mask, src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2435,16 +2450,16 @@
     }
     void vblendps(unsigned mask, FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
-        masm.vblendps_irr(mask, src1.code(), src0.code(), dest.code());
+        masm.vblendps_irr(mask, src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vblendps(unsigned mask, const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vblendps_irr(mask, src1.fpu(), src0.code(), dest.code());
+            masm.vblendps_irr(mask, src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vblendps_imr(mask, src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vblendps_imr(mask, src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2452,16 +2467,16 @@
     }
     void vblendvps(FloatRegister mask, FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
-        masm.vblendvps_rr(mask.code(), src1.code(), src0.code(), dest.code());
+        masm.vblendvps_rr(mask.encoding(), src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vblendvps(FloatRegister mask, const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE41());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vblendvps_rr(mask.code(), src1.fpu(), src0.code(), dest.code());
+            masm.vblendvps_rr(mask.encoding(), src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vblendvps_mr(mask.code(), src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vblendvps_mr(mask.encoding(), src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2469,16 +2484,16 @@
     }
     void vmovsldup(FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE3());
-        masm.vmovsldup_rr(src.code(), dest.code());
+        masm.vmovsldup_rr(src.encoding(), dest.encoding());
     }
     void vmovsldup(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE3());
         switch (src.kind()) {
           case Operand::FPREG:
-            masm.vmovsldup_rr(src.fpu(), dest.code());
+            masm.vmovsldup_rr(src.fpu(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmovsldup_mr(src.disp(), src.base(), dest.code());
+            masm.vmovsldup_mr(src.disp(), src.base(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2486,16 +2501,16 @@
     }
     void vmovshdup(FloatRegister src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE3());
-        masm.vmovshdup_rr(src.code(), dest.code());
+        masm.vmovshdup_rr(src.encoding(), dest.encoding());
     }
     void vmovshdup(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE3());
         switch (src.kind()) {
           case Operand::FPREG:
-            masm.vmovshdup_rr(src.fpu(), dest.code());
+            masm.vmovshdup_rr(src.fpu(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmovshdup_mr(src.disp(), src.base(), dest.code());
+            masm.vmovshdup_mr(src.disp(), src.base(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2503,16 +2518,16 @@
     }
     void vminsd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vminsd_rr(src1.code(), src0.code(), dest.code());
+        masm.vminsd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vminsd(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vminsd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vminsd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vminsd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vminsd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2520,20 +2535,20 @@
     }
     void vminss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vminss_rr(src1.code(), src0.code(), dest.code());
+        masm.vminss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vmaxsd(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmaxsd_rr(src1.code(), src0.code(), dest.code());
+        masm.vmaxsd_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void vmaxsd(const Operand &src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
         switch (src1.kind()) {
           case Operand::FPREG:
-            masm.vmaxsd_rr(src1.fpu(), src0.code(), dest.code());
+            masm.vmaxsd_rr(src1.fpu(), src0.encoding(), dest.encoding());
             break;
           case Operand::MEM_REG_DISP:
-            masm.vmaxsd_mr(src1.disp(), src1.base(), src0.code(), dest.code());
+            masm.vmaxsd_mr(src1.disp(), src1.base(), src0.encoding(), dest.encoding());
             break;
           default:
             MOZ_CRASH("unexpected operand kind");
@@ -2541,7 +2556,7 @@
     }
     void vmaxss(FloatRegister src1, FloatRegister src0, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmaxss_rr(src1.code(), src0.code(), dest.code());
+        masm.vmaxss_rr(src1.encoding(), src0.encoding(), dest.encoding());
     }
     void fisttp(const Operand &dest) {
         MOZ_ASSERT(HasSSE3());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-shared.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-shared.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-shared.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-shared.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -381,30 +381,46 @@
       case MIRType_ObjectOrNull:
       case MIRType_Boolean:
       case MIRType_Double:
-      case MIRType_Float32:
       {
         LAllocation *payload = snapshot->payloadOfSlot(*allocIndex);
+        if (payload->isConstant()) {
+            MConstant *constant = mir->toConstant();
+            uint32_t index;
+            masm.propagateOOM(graph.addConstantToPool(constant->value(), &index));
+            alloc = RValueAllocation::ConstantPool(index);
+            break;
+        }
+
         JSValueType valueType =
             (type == MIRType_ObjectOrNull) ? JSVAL_TYPE_OBJECT : ValueTypeFromMIRType(type);
-        if (payload->isMemory()) {
-            if (type == MIRType_Float32)
-                alloc = RValueAllocation::Float32(ToStackIndex(payload));
-            else
-                alloc = RValueAllocation::Typed(valueType, ToStackIndex(payload));
-        } else if (payload->isGeneralReg()) {
+
+        MOZ_ASSERT(payload->isMemory() || payload->isRegister());
+        if (payload->isMemory())
+            alloc = RValueAllocation::Typed(valueType, ToStackIndex(payload));
+        else if (payload->isGeneralReg())
             alloc = RValueAllocation::Typed(valueType, ToRegister(payload));
-        } else if (payload->isFloatReg()) {
-            FloatRegister reg = ToFloatRegister(payload);
-            if (type == MIRType_Float32)
-                alloc = RValueAllocation::Float32(reg);
-            else
-                alloc = RValueAllocation::Double(reg);
-        } else {
+        else if (payload->isFloatReg())
+            alloc = RValueAllocation::Double(ToFloatRegister(payload));
+        break;
+      }
+      case MIRType_Float32:
+      case MIRType_Int32x4:
+      case MIRType_Float32x4:
+      {
+        LAllocation *payload = snapshot->payloadOfSlot(*allocIndex);
+        if (payload->isConstant()) {
             MConstant *constant = mir->toConstant();
             uint32_t index;
             masm.propagateOOM(graph.addConstantToPool(constant->value(), &index));
             alloc = RValueAllocation::ConstantPool(index);
+            break;
         }
+
+        MOZ_ASSERT(payload->isMemory() || payload->isFloatReg());
+        if (payload->isFloatReg())
+            alloc = RValueAllocation::AnyFloat(ToFloatRegister(payload));
+        else
+            alloc = RValueAllocation::AnyFloat(ToStackIndex(payload));
         break;
       }
       case MIRType_MagicOptimizedArguments:
@@ -1075,15 +1091,18 @@
         masm.storePtr(reg, dump);
     }
     void operator()(FloatRegister reg, Address dump) {
-#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
-        if (reg.isDouble()) {
+        if (reg.isDouble())
             masm.storeDouble(reg, dump);
-        } else {
+        else if (reg.isSingle())
             masm.storeFloat32(reg, dump);
-        }
-#else
-        masm.storeDouble(reg, dump);
+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+        else if (reg.isInt32x4())
+            masm.storeUnalignedInt32x4(reg, dump);
+        else if (reg.isFloat32x4())
+            masm.storeUnalignedFloat32x4(reg, dump);
 #endif
+        else
+            MOZ_CRASH("Unexpected register type.");
     }
 };
 
@@ -1124,21 +1143,17 @@
     }
     void operator()(FloatRegister reg, Address dump) {
         FloatRegister scratch;
-#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_MIPS)
         if (reg.isDouble()) {
             scratch = ScratchDoubleReg;
             masm.loadDouble(dump, scratch);
             masm.branchDouble(Assembler::DoubleNotEqual, scratch, reg, failure_);
-        } else {
+        } else if (reg.isSingle()) {
             scratch = ScratchFloat32Reg;
             masm.loadFloat32(dump, scratch);
             masm.branchFloat(Assembler::DoubleNotEqual, scratch, reg, failure_);
         }
-#else
-        scratch = ScratchFloat32Reg;
-        masm.loadDouble(dump, scratch);
-        masm.branchDouble(Assembler::DoubleNotEqual, scratch, reg, failure_);
-#endif
+
+        // :TODO: (Bug 1133745) Add support to verify SIMD registers.
     }
 };
 
@@ -1167,6 +1182,10 @@
     // before the return address.
     masm.branch32(Assembler::NotEqual, checkRegs, Imm32(1), &failure);
 
+    // Set checkRegs to 0, so that we don't try to verify registers after we
+    // return from this script to the caller.
+    masm.store32(Imm32(0), checkRegs);
+
     // Ignore clobbered registers. Some instructions (like LValueToInt32) modify
     // temps after calling into the VM. This is fine because no other
     // instructions (including this OsiPoint) will depend on them. Also
@@ -1362,16 +1381,19 @@
     Register dest = ool->dest();
 
     saveVolatile(dest);
-#ifdef JS_CODEGEN_ARM
+#if defined(JS_CODEGEN_ARM)
     if (ool->needFloat32Conversion()) {
         masm.convertFloat32ToDouble(src, ScratchDoubleReg);
         src = ScratchDoubleReg;
     }
 
 #else
+    FloatRegister srcSingle = src.asSingle();
     if (ool->needFloat32Conversion()) {
+        MOZ_ASSERT(src.isSingle());
         masm.push(src);
         masm.convertFloat32ToDouble(src, src);
+        src = src.asDouble();
     }
 #endif
     masm.setupUnalignedABICall(1, dest);
@@ -1382,9 +1404,9 @@
         masm.callWithABI(BitwiseCast<void*, int32_t(*)(double)>(JS::ToInt32));
     masm.storeCallResult(dest);
 
-#ifndef JS_CODEGEN_ARM
+#if !defined(JS_CODEGEN_ARM)
     if (ool->needFloat32Conversion())
-        masm.pop(src);
+        masm.pop(srcSingle);
 #endif
     restoreVolatile(dest);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-shared.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-shared.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-shared.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-shared.h	2015-02-28 15:03:05.000000000 +0000
@@ -549,8 +549,8 @@
     }
 
     inline void verifyHeapAccessDisassembly(uint32_t begin, uint32_t end, bool isLoad,
-                                            Scalar::Type type, const Operand &mem,
-                                            LAllocation alloc);
+                                            Scalar::Type type, unsigned numElems,
+                                            const Operand &mem, LAllocation alloc);
 };
 
 // An out-of-line path is generated at the end of the function.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-shared-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-shared-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-shared-inl.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-shared-inl.h	2015-02-28 15:03:05.000000000 +0000
@@ -186,8 +186,8 @@
 
 void
 CodeGeneratorShared::verifyHeapAccessDisassembly(uint32_t begin, uint32_t end, bool isLoad,
-                                                 Scalar::Type type, const Operand &mem,
-                                                 LAllocation alloc)
+                                                 Scalar::Type type, unsigned numElems,
+                                                 const Operand &mem, LAllocation alloc)
 {
 #ifdef DEBUG
     using namespace Disassembler;
@@ -222,16 +222,18 @@
       case Scalar::Float64:
       case Scalar::Float32x4:
       case Scalar::Int32x4:
-        op = OtherOperand(ToFloatRegister(alloc).code());
+        op = OtherOperand(ToFloatRegister(alloc).encoding());
         break;
       case Scalar::Uint8Clamped:
       case Scalar::MaxTypedArrayViewType:
         MOZ_CRASH("Unexpected array type");
     }
 
+    size_t size = Scalar::isSimdType(type)
+                  ? Scalar::scalarByteSize(type) * numElems
+                  : TypedArrayElemSize(type);
     masm.verifyHeapAccessDisassembly(begin, end,
-                                     HeapAccess(kind, TypedArrayElemSize(type),
-                                     ComplexAddress(mem), op));
+                                     HeapAccess(kind, size, ComplexAddress(mem), op));
 #endif
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -363,6 +363,82 @@
     masm.jmp(ool->rejoin());
 }
 
+void
+CodeGeneratorX86Shared::visitOffsetBoundsCheck(OffsetBoundsCheck *oolCheck)
+{
+    // The access is heap[ptr + offset]. The inline code checks that
+    // ptr < heap.length - offset. We get here when that fails. We need to check
+    // for the case where ptr + offset >= 0, in which case the access is still
+    // in bounds.
+    MOZ_ASSERT(oolCheck->offset() != 0,
+               "An access without a constant offset doesn't need a separate OffsetBoundsCheck");
+    masm.cmp32(oolCheck->ptrReg(), Imm32(-uint32_t(oolCheck->offset())));
+    masm.j(Assembler::Below, oolCheck->outOfBounds());
+
+#ifdef JS_CODEGEN_X64
+    // In order to get the offset to wrap properly, we must sign-extend the
+    // pointer to 32-bits. We'll zero out the sign extension immediately
+    // after the access to restore asm.js invariants.
+    masm.movslq(oolCheck->ptrReg(), oolCheck->ptrReg());
+#endif
+
+    masm.jmp(oolCheck->rejoin());
+}
+
+uint32_t
+CodeGeneratorX86Shared::emitAsmJSBoundsCheckBranch(const MAsmJSHeapAccess *access,
+                                                   const MInstruction *mir,
+                                                   Register ptr, Label *fail)
+{
+    // Emit a bounds-checking branch for |access|.
+
+    MOZ_ASSERT(gen->needsAsmJSBoundsCheckBranch(access));
+
+    Label *pass = nullptr;
+
+    // If we have a non-zero offset, it's possible that |ptr| itself is out of
+    // bounds, while adding the offset computes an in-bounds address. To catch
+    // this case, we need a second branch, which we emit out of line since it's
+    // unlikely to be needed in normal programs.
+    if (access->offset() != 0) {
+        OffsetBoundsCheck *oolCheck = new(alloc()) OffsetBoundsCheck(fail, ptr, access->offset());
+        fail = oolCheck->entry();
+        pass = oolCheck->rejoin();
+        addOutOfLineCode(oolCheck, mir);
+    }
+
+    // The bounds check is a comparison with an immediate value. The asm.js
+    // module linking process will add the length of the heap to the immediate
+    // field, so -access->endOffset() will turn into
+    // (heapLength - access->endOffset()), allowing us to test whether the end
+    // of the access is beyond the end of the heap.
+    uint32_t maybeCmpOffset = masm.cmp32WithPatch(ptr, Imm32(-access->endOffset())).offset();
+    masm.j(Assembler::Above, fail);
+
+    if (pass)
+        masm.bind(pass);
+
+    return maybeCmpOffset;
+}
+
+void
+CodeGeneratorX86Shared::cleanupAfterAsmJSBoundsCheckBranch(const MAsmJSHeapAccess *access,
+                                                           Register ptr)
+{
+    // Clean up after performing a heap access checked by a branch.
+
+    MOZ_ASSERT(gen->needsAsmJSBoundsCheckBranch(access));
+
+#ifdef JS_CODEGEN_X64
+    // If the offset is 0, we don't use an OffsetBoundsCheck.
+    if (access->offset() != 0) {
+        // Zero out the high 32 bits, in case the OffsetBoundsCheck code had to
+        // sign-extend (movslq) the pointer value to get wraparound to work.
+        masm.movl(ptr, ptr);
+    }
+#endif
+}
+
 bool
 CodeGeneratorX86Shared::generateOutOfLineCode()
 {
@@ -2170,6 +2246,27 @@
       default:
         MOZ_CRASH("Unknown SIMD kind");
     }
+}
+
+void
+CodeGeneratorX86Shared::visitSimdReinterpretCast(LSimdReinterpretCast *ins)
+{
+    FloatRegister input = ToFloatRegister(ins->input());
+    FloatRegister output = ToFloatRegister(ins->output());
+
+    if (input.aliases(output))
+        return;
+
+    switch (ins->mir()->type()) {
+      case MIRType_Int32x4:
+        masm.vmovdqa(input, output);
+        break;
+      case MIRType_Float32x4:
+        masm.vmovaps(input, output);
+        break;
+      default:
+        MOZ_CRASH("Unknown SIMD kind");
+    }
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/CodeGenerator-x86-shared.h	2015-02-28 15:03:05.000000000 +0000
@@ -32,7 +32,6 @@
     void bailout(const T &t, LSnapshot *snapshot);
 
   protected:
-
     // Load a NaN or zero into a register for an out of bounds AsmJS or static
     // typed array load.
     class OutOfLineLoadTypedArrayOutOfBounds : public OutOfLineCodeBase<CodeGeneratorX86Shared>
@@ -51,6 +50,31 @@
         }
     };
 
+    // Additional bounds checking for heap accesses with constant offsets.
+    class OffsetBoundsCheck : public OutOfLineCodeBase<CodeGeneratorX86Shared>
+    {
+        Label *outOfBounds_;
+        Register ptrReg_;
+        int32_t offset_;
+      public:
+        OffsetBoundsCheck(Label *outOfBounds, Register ptrReg, int32_t offset)
+          : outOfBounds_(outOfBounds), ptrReg_(ptrReg), offset_(offset)
+        {}
+
+        Label *outOfBounds() const { return outOfBounds_; }
+        Register ptrReg() const { return ptrReg_; }
+        int32_t offset() const { return offset_; }
+        void accept(CodeGeneratorX86Shared *codegen) {
+            codegen->visitOffsetBoundsCheck(this);
+        }
+    };
+
+    // Functions for emitting bounds-checking code with branches.
+    MOZ_WARN_UNUSED_RESULT
+    uint32_t emitAsmJSBoundsCheckBranch(const MAsmJSHeapAccess *mir, const MInstruction *ins,
+                                        Register ptr, Label *fail);
+    void cleanupAfterAsmJSBoundsCheckBranch(const MAsmJSHeapAccess *mir, Register ptr);
+
     // Label for the common return path.
     NonAssertingLabel returnLabel_;
     NonAssertingLabel deoptLabel_;
@@ -214,6 +238,7 @@
     virtual void visitMemoryBarrier(LMemoryBarrier *ins);
 
     void visitOutOfLineLoadTypedArrayOutOfBounds(OutOfLineLoadTypedArrayOutOfBounds *ool);
+    void visitOffsetBoundsCheck(OffsetBoundsCheck *oolCheck);
 
     void visitNegI(LNegI *lir);
     void visitNegD(LNegD *lir);
@@ -227,6 +252,7 @@
     void visitFloat32x4(LFloat32x4 *ins);
     void visitInt32x4ToFloat32x4(LInt32x4ToFloat32x4 *ins);
     void visitFloat32x4ToInt32x4(LFloat32x4ToInt32x4 *ins);
+    void visitSimdReinterpretCast(LSimdReinterpretCast *lir);
     void visitSimdExtractElementI(LSimdExtractElementI *lir);
     void visitSimdExtractElementF(LSimdExtractElementF *lir);
     void visitSimdInsertElementI(LSimdInsertElementI *lir);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Lowering-shared.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Lowering-shared.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Lowering-shared.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Lowering-shared.h	2015-02-28 15:03:05.000000000 +0000
@@ -108,7 +108,7 @@
     inline LAllocation useKeepaliveOrConstant(MDefinition *mir);
     inline LAllocation useRegisterOrConstant(MDefinition *mir);
     inline LAllocation useRegisterOrConstantAtStart(MDefinition *mir);
-    inline LAllocation useRegisterOrNonNegativeConstantAtStart(MDefinition *mir);
+    inline LAllocation useRegisterOrZeroAtStart(MDefinition *mir);
     inline LAllocation useRegisterOrNonDoubleConstant(MDefinition *mir);
 
     inline LUse useRegisterForTypedLoad(MDefinition *mir, MIRType type);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Lowering-shared-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Lowering-shared-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Lowering-shared-inl.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Lowering-shared-inl.h	2015-02-28 15:03:05.000000000 +0000
@@ -139,10 +139,10 @@
         lir->setDef(0, LDefinition(vreg, LDefinition::DOUBLE, LFloatReg(ReturnDoubleReg)));
         break;
       case MIRType_Int32x4:
-        lir->setDef(0, LDefinition(vreg, LDefinition::INT32X4, LFloatReg(ReturnSimdReg)));
+        lir->setDef(0, LDefinition(vreg, LDefinition::INT32X4, LFloatReg(ReturnInt32x4Reg)));
         break;
       case MIRType_Float32x4:
-        lir->setDef(0, LDefinition(vreg, LDefinition::FLOAT32X4, LFloatReg(ReturnSimdReg)));
+        lir->setDef(0, LDefinition(vreg, LDefinition::FLOAT32X4, LFloatReg(ReturnFloat32x4Reg)));
         break;
       default:
         LDefinition::Type type = LDefinition::TypeFrom(mir->type());
@@ -276,10 +276,10 @@
 }
 
 LAllocation
-LIRGeneratorShared::useRegisterOrNonNegativeConstantAtStart(MDefinition *mir)
+LIRGeneratorShared::useRegisterOrZeroAtStart(MDefinition *mir)
 {
-    if (mir->isConstant() && mir->toConstant()->value().toInt32() >= 0)
-        return LAllocation(mir->toConstant()->vp());
+    if (mir->isConstant() && mir->toConstant()->value().isInt32(0))
+        return LAllocation();
     return useRegisterAtStart(mir);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/Lowering-x86-shared.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -102,7 +102,12 @@
 {
     // Without AVX, we'll need to use the x86 encodings where one of the
     // inputs must be the same location as the output.
-    if (!Assembler::HasAVX()) {
+    //
+    // :TODO: (Bug 1132894) Note, we might have to allocate a different
+    // registers if the MIRType of the reused operand differs from the MIRType
+    // of returned value, as MUST_REUSE_INPUT is not yet capable of reusing the
+    // same register but with a different register type.
+    if (!Assembler::HasAVX() && mir->type() == lhs->type()) {
         ins->setOperand(0, useRegisterAtStart(lhs));
         ins->setOperand(1, lhs != rhs ? use(rhs) : useAtStart(rhs));
         defineReuseInput(ins, mir, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/MacroAssembler-x86-shared.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -17,9 +17,10 @@
 {
     FloatRegisterSet doubleSet(FloatRegisterSet::Subtract(set.fpus(), simdSet));
     MOZ_ASSERT_IF(simdSet.empty(), doubleSet == set.fpus());
+    doubleSet = doubleSet.reduceSetForPush();
     unsigned numSimd = simdSet.size();
     unsigned numDouble = doubleSet.size();
-    int32_t diffF = numDouble * sizeof(double) + numSimd * Simd128DataSize;
+    int32_t diffF = doubleSet.getPushSizeInBytes() + numSimd * Simd128DataSize;
     int32_t diffG = set.gprs().size() * sizeof(intptr_t);
 
     // On x86, always use push to push the integer registers, as it's fast
@@ -32,9 +33,20 @@
 
     reserveStack(diffF);
     for (FloatRegisterBackwardIterator iter(doubleSet); iter.more(); iter++) {
-        diffF -= sizeof(double);
+        FloatRegister reg = *iter;
+        diffF -= reg.size();
         numDouble -= 1;
-        storeDouble(*iter, Address(StackPointer, diffF));
+        Address spillAddress(StackPointer, diffF);
+        if (reg.isDouble())
+            storeDouble(reg, spillAddress);
+        else if (reg.isSingle())
+            storeFloat32(reg, spillAddress);
+        else if (reg.isInt32x4())
+            storeUnalignedInt32x4(reg, spillAddress);
+        else if (reg.isFloat32x4())
+            storeUnalignedFloat32x4(reg, spillAddress);
+        else
+            MOZ_CRASH("Unknown register type.");
     }
     MOZ_ASSERT(numDouble == 0);
     for (FloatRegisterBackwardIterator iter(simdSet); iter.more(); iter++) {
@@ -52,10 +64,11 @@
 {
     FloatRegisterSet doubleSet(FloatRegisterSet::Subtract(set.fpus(), simdSet));
     MOZ_ASSERT_IF(simdSet.empty(), doubleSet == set.fpus());
+    doubleSet = doubleSet.reduceSetForPush();
     unsigned numSimd = simdSet.size();
     unsigned numDouble = doubleSet.size();
     int32_t diffG = set.gprs().size() * sizeof(intptr_t);
-    int32_t diffF = numDouble * sizeof(double) + numSimd * Simd128DataSize;
+    int32_t diffF = doubleSet.getPushSizeInBytes() + numSimd * Simd128DataSize;
     const int32_t reservedG = diffG;
     const int32_t reservedF = diffF;
 
@@ -68,10 +81,23 @@
     }
     MOZ_ASSERT(numSimd == 0);
     for (FloatRegisterBackwardIterator iter(doubleSet); iter.more(); iter++) {
-        diffF -= sizeof(double);
+        FloatRegister reg = *iter;
+        diffF -= reg.size();
         numDouble -= 1;
-        if (!ignore.has(*iter))
-            loadDouble(Address(StackPointer, diffF), *iter);
+        if (ignore.has(reg))
+            continue;
+
+        Address spillAddress(StackPointer, diffF);
+        if (reg.isDouble())
+            loadDouble(spillAddress, reg);
+        else if (reg.isSingle())
+            loadFloat32(spillAddress, reg);
+        else if (reg.isInt32x4())
+            loadUnalignedInt32x4(spillAddress, reg);
+        else if (reg.isFloat32x4())
+            loadUnalignedFloat32x4(spillAddress, reg);
+        else
+            MOZ_CRASH("Unknown register type.");
     }
     freeStack(reservedF);
     MOZ_ASSERT(numDouble == 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/MoveEmitter-x86-shared.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/MoveEmitter-x86-shared.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/shared/MoveEmitter-x86-shared.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/shared/MoveEmitter-x86-shared.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -426,6 +426,9 @@
 void
 MoveEmitterX86::emitFloat32Move(const MoveOperand &from, const MoveOperand &to)
 {
+    MOZ_ASSERT_IF(from.isFloatReg(), from.floatReg().isSingle());
+    MOZ_ASSERT_IF(to.isFloatReg(), to.floatReg().isSingle());
+
     if (from.isFloatReg()) {
         if (to.isFloatReg())
             masm.moveFloat32(from.floatReg(), to.floatReg());
@@ -444,6 +447,9 @@
 void
 MoveEmitterX86::emitDoubleMove(const MoveOperand &from, const MoveOperand &to)
 {
+    MOZ_ASSERT_IF(from.isFloatReg(), from.floatReg().isDouble());
+    MOZ_ASSERT_IF(to.isFloatReg(), to.floatReg().isDouble());
+
     if (from.isFloatReg()) {
         if (to.isFloatReg())
             masm.moveDouble(from.floatReg(), to.floatReg());
@@ -462,6 +468,9 @@
 void
 MoveEmitterX86::emitInt32X4Move(const MoveOperand &from, const MoveOperand &to)
 {
+    MOZ_ASSERT_IF(from.isFloatReg(), from.floatReg().isInt32x4());
+    MOZ_ASSERT_IF(to.isFloatReg(), to.floatReg().isInt32x4());
+
     if (from.isFloatReg()) {
         if (to.isFloatReg())
             masm.moveInt32x4(from.floatReg(), to.floatReg());
@@ -480,6 +489,9 @@
 void
 MoveEmitterX86::emitFloat32X4Move(const MoveOperand &from, const MoveOperand &to)
 {
+    MOZ_ASSERT_IF(from.isFloatReg(), from.floatReg().isFloat32x4());
+    MOZ_ASSERT_IF(to.isFloatReg(), to.floatReg().isFloat32x4());
+
     if (from.isFloatReg()) {
         if (to.isFloatReg())
             masm.moveFloat32x4(from.floatReg(), to.floatReg());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Snapshots.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Snapshots.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Snapshots.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Snapshots.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -88,11 +88,11 @@
 //         DOUBLE_REG [FPU_REG]
 //           Double value stored in a FPU register.
 //
-//         FLOAT32_REG [FPU_REG]
-//           Float 32bit value stored in a FPU register.
+//         ANY_FLOAT_REG [FPU_REG]
+//           Any Float value (float32, simd) stored in a FPU register.
 //
-//         FLOAT32_STACK [STACK_OFFSET]
-//           Float 32bit value stored on the stack.
+//         ANY_FLOAT_STACK [STACK_OFFSET]
+//           Any Float value (float32, simd) stored on the stack.
 //
 //         UNTYPED_REG   [GPR_REG]
 //         UNTYPED_STACK [STACK_OFFSET]
@@ -160,19 +160,19 @@
         };
         return layout;
       }
-      case FLOAT32_REG: {
+      case ANY_FLOAT_REG: {
         static const RValueAllocation::Layout layout = {
             PAYLOAD_FPU,
             PAYLOAD_NONE,
-            "float32"
+            "float register content"
         };
         return layout;
       }
-      case FLOAT32_STACK: {
+      case ANY_FLOAT_STACK: {
         static const RValueAllocation::Layout layout = {
             PAYLOAD_STACK_OFFSET,
             PAYLOAD_NONE,
-            "float32"
+            "float register content"
         };
         return layout;
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Snapshots.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Snapshots.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/Snapshots.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/Snapshots.h	2015-02-28 15:03:05.000000000 +0000
@@ -43,8 +43,8 @@
         CST_UNDEFINED       = 0x01,
         CST_NULL            = 0x02,
         DOUBLE_REG          = 0x03,
-        FLOAT32_REG         = 0x04,
-        FLOAT32_STACK       = 0x05,
+        ANY_FLOAT_REG       = 0x04,
+        ANY_FLOAT_STACK     = 0x05,
 #if defined(JS_NUNBOX32)
         UNTYPED_REG_REG     = 0x06,
         UNTYPED_REG_STACK   = 0x07,
@@ -196,12 +196,12 @@
         return RValueAllocation(DOUBLE_REG, payloadOfFloatRegister(reg));
     }
 
-    // FLOAT32_REG or FLOAT32_STACK
-    static RValueAllocation Float32(FloatRegister reg) {
-        return RValueAllocation(FLOAT32_REG, payloadOfFloatRegister(reg));
+    // ANY_FLOAT_REG or ANY_FLOAT_STACK
+    static RValueAllocation AnyFloat(FloatRegister reg) {
+        return RValueAllocation(ANY_FLOAT_REG, payloadOfFloatRegister(reg));
     }
-    static RValueAllocation Float32(int32_t offset) {
-        return RValueAllocation(FLOAT32_STACK, payloadOfStackOffset(offset));
+    static RValueAllocation AnyFloat(int32_t offset) {
+        return RValueAllocation(ANY_FLOAT_STACK, payloadOfStackOffset(offset));
     }
 
     // TYPED_REG or TYPED_STACK
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/StupidAllocator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/StupidAllocator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/StupidAllocator.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/StupidAllocator.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -14,7 +14,10 @@
 static inline uint32_t
 DefaultStackSlot(uint32_t vreg)
 {
-    return vreg * sizeof(Value);
+    // On x86/x64, we have to keep the stack aligned on 16 bytes for spilling
+    // SIMD registers.  To avoid complexity in this stupid allocator, we just
+    // allocate 16 bytes stack slot for all vreg.
+    return vreg * 2 * sizeof(Value);
 }
 
 LAllocation *
@@ -75,10 +78,10 @@
         registerCount = 0;
         RegisterSet remainingRegisters(allRegisters_);
         while (!remainingRegisters.empty(/* float = */ false))
-            registers[registerCount++].reg = AnyRegister(remainingRegisters.takeGeneral());
+            registers[registerCount++].reg = AnyRegister(remainingRegisters.takeUnaliasedGeneral());
 
         while (!remainingRegisters.empty(/* float = */ true))
-            registers[registerCount++].reg = AnyRegister(remainingRegisters.takeFloat());
+            registers[registerCount++].reg = AnyRegister(remainingRegisters.takeUnaliasedFloat());
 
         MOZ_ASSERT(registerCount <= MAX_REGISTERS);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/StupidAllocator.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/StupidAllocator.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/StupidAllocator.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/StupidAllocator.h	2015-02-28 15:03:05.000000000 +0000
@@ -16,7 +16,7 @@
 
 class StupidAllocator : public RegisterAllocator
 {
-    static const uint32_t MAX_REGISTERS = Registers::Allocatable + FloatRegisters::Allocatable;
+    static const uint32_t MAX_REGISTERS = AnyRegister::Total;
     static const uint32_t MISSING_ALLOCATION = UINT32_MAX;
 
     struct AllocatedRegister {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/VMFunctions.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/VMFunctions.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/VMFunctions.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/VMFunctions.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -36,10 +36,9 @@
 // run before the constructors for static VMFunctions.
 /* static */ VMFunction *VMFunction::functions;
 
-AutoDetectInvalidation::AutoDetectInvalidation(JSContext *cx, MutableHandleValue rval,
-                                               IonScript *ionScript)
+AutoDetectInvalidation::AutoDetectInvalidation(JSContext *cx, MutableHandleValue rval)
   : cx_(cx),
-    ionScript_(ionScript ? ionScript : GetTopJitJSScript(cx)->ionScript()),
+    ionScript_(GetTopJitJSScript(cx)->ionScript()),
     rval_(rval),
     disabled_(false)
 { }
@@ -193,10 +192,12 @@
 }
 
 bool
-InitProp(JSContext *cx, HandleNativeObject obj, HandlePropertyName name, HandleValue value)
+InitProp(JSContext *cx, HandleNativeObject obj, HandlePropertyName name, HandleValue value,
+         jsbytecode *pc)
 {
     RootedId id(cx, NameToId(name));
-    return NativeDefineProperty(cx, obj, id, value, nullptr, nullptr, JSPROP_ENUMERATE);
+    unsigned propAttrs = GetInitDataPropAttrs(JSOp(*pc));
+    return NativeDefineProperty(cx, obj, id, value, nullptr, nullptr, propAttrs);
 }
 
 template<bool Equal>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/VMFunctions.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/VMFunctions.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/VMFunctions.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/VMFunctions.h	2015-02-28 15:03:05.000000000 +0000
@@ -617,7 +617,13 @@
     void setReturnOverride();
 
   public:
-    AutoDetectInvalidation(JSContext *cx, MutableHandleValue rval, IonScript *ionScript = nullptr);
+    AutoDetectInvalidation(JSContext *cx, MutableHandleValue rval, IonScript *ionScript)
+      : cx_(cx), ionScript_(ionScript), rval_(rval), disabled_(false)
+    {
+        MOZ_ASSERT(ionScript);
+    }
+
+    AutoDetectInvalidation(JSContext *cx, MutableHandleValue rval);
 
     void disable() {
         MOZ_ASSERT(!disabled_);
@@ -641,7 +647,9 @@
 bool DefVarOrConst(JSContext *cx, HandlePropertyName dn, unsigned attrs, HandleObject scopeChain);
 bool SetConst(JSContext *cx, HandlePropertyName name, HandleObject scopeChain, HandleValue rval);
 bool MutatePrototype(JSContext *cx, HandlePlainObject obj, HandleValue value);
-bool InitProp(JSContext *cx, HandleNativeObject obj, HandlePropertyName name, HandleValue value);
+
+bool InitProp(JSContext *cx, HandleNativeObject obj, HandlePropertyName name, HandleValue value,
+              jsbytecode *pc);
 
 template<bool Equal>
 bool LooselyEqual(JSContext *cx, MutableHandleValue lhs, MutableHandleValue rhs, bool *res);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Architecture-x64.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Architecture-x64.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Architecture-x64.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Architecture-x64.h	2015-02-28 15:03:05.000000000 +0000
@@ -27,6 +27,13 @@
 class Registers {
   public:
     typedef X86Encoding::RegisterID Code;
+    typedef X86Encoding::RegisterID Encoding;
+
+    // Content spilled during bailouts.
+    union RegisterContent {
+        uintptr_t r;
+    };
+
     typedef uint32_t SetType;
     static uint32_t SetSize(SetType x) {
         static_assert(sizeof(SetType) == 4, "SetType must be 32 bits");
@@ -61,9 +68,9 @@
     static const uint32_t TotalPhys = 16;
     static const uint32_t Allocatable = 14;
 
-    static const uint32_t AllMask = (1 << Total) - 1;
+    static const SetType AllMask = (1 << Total) - 1;
 
-    static const uint32_t ArgRegMask =
+    static const SetType ArgRegMask =
 # if !defined(_WIN64)
         (1 << X86Encoding::rdi) |
         (1 << X86Encoding::rsi) |
@@ -73,7 +80,7 @@
         (1 << X86Encoding::r8) |
         (1 << X86Encoding::r9);
 
-    static const uint32_t VolatileMask =
+    static const SetType VolatileMask =
         (1 << X86Encoding::rax) |
         (1 << X86Encoding::rcx) |
         (1 << X86Encoding::rdx) |
@@ -86,7 +93,7 @@
         (1 << X86Encoding::r10) |
         (1 << X86Encoding::r11);
 
-    static const uint32_t NonVolatileMask =
+    static const SetType NonVolatileMask =
         (1 << X86Encoding::rbx) |
 #if defined(_WIN64)
         (1 << X86Encoding::rsi) |
@@ -98,25 +105,25 @@
         (1 << X86Encoding::r14) |
         (1 << X86Encoding::r15);
 
-    static const uint32_t WrapperMask = VolatileMask;
+    static const SetType WrapperMask = VolatileMask;
 
-    static const uint32_t SingleByteRegs = VolatileMask | NonVolatileMask;
+    static const SetType SingleByteRegs = VolatileMask | NonVolatileMask;
 
-    static const uint32_t NonAllocatableMask =
+    static const SetType NonAllocatableMask =
         (1 << X86Encoding::rsp) |
         (1 << X86Encoding::r11);      // This is ScratchReg.
 
-    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
 
     // Registers that can be allocated without being saved, generally.
-    static const uint32_t TempMask = VolatileMask & ~NonAllocatableMask;
+    static const SetType TempMask = VolatileMask & ~NonAllocatableMask;
 
     // Registers returned from a JS -> JS call.
-    static const uint32_t JSCallMask =
+    static const SetType JSCallMask =
         (1 << X86Encoding::rcx);
 
     // Registers returned from a JS -> C call.
-    static const uint32_t CallMask =
+    static const SetType CallMask =
         (1 << X86Encoding::rax);
 };
 
@@ -125,49 +132,82 @@
 
 class FloatRegisters {
   public:
-    typedef X86Encoding::XMMRegisterID Code;
-    typedef uint32_t SetType;
-    static const char *GetName(Code code) {
+    typedef X86Encoding::XMMRegisterID Encoding;
+
+    enum ContentType {
+        Single,
+        Double,
+        Int32x4,
+        Float32x4,
+        NumTypes
+    };
+
+    // Content spilled during bailouts.
+    union RegisterContent {
+        float s;
+        double d;
+        int32_t i4[4];
+        float s4[4];
+    };
+
+    static const char *GetName(Encoding code) {
         return X86Encoding::XMMRegName(code);
     }
 
-    static Code FromName(const char *name) {
+    static Encoding FromName(const char *name) {
         for (size_t i = 0; i < Total; i++) {
-            if (strcmp(GetName(Code(i)), name) == 0)
-                return Code(i);
+            if (strcmp(GetName(Encoding(i)), name) == 0)
+                return Encoding(i);
         }
         return Invalid;
     }
 
-    static const Code Invalid = X86Encoding::invalid_xmm;
+    static const Encoding Invalid = X86Encoding::invalid_xmm;
 
-    static const uint32_t Total = 16;
+    static const uint32_t Total = 16 * NumTypes;
     static const uint32_t TotalPhys = 16;
-
     static const uint32_t Allocatable = 15;
 
-    static const uint32_t AllMask = (1 << Total) - 1;
-    static const uint32_t AllDoubleMask = AllMask;
-    static const uint32_t VolatileMask =
+    typedef uint64_t SetType;
+    static_assert(sizeof(SetType) * 8 >= Total,
+                  "SetType should be large enough to enumerate all registers.");
+
+    // Magic values which are used to duplicate a mask of physical register for
+    // a specific type of register. A multiplication is used to copy and shift
+    // the bits of the physical register mask.
+    static const SetType SpreadSingle = SetType(1) << (uint32_t(Single) * TotalPhys);
+    static const SetType SpreadDouble = SetType(1) << (uint32_t(Double) * TotalPhys);
+    static const SetType SpreadInt32x4 = SetType(1) << (uint32_t(Int32x4) * TotalPhys);
+    static const SetType SpreadFloat32x4 = SetType(1) << (uint32_t(Float32x4) * TotalPhys);
+    static const SetType SpreadScalar = SpreadSingle | SpreadDouble;
+    static const SetType SpreadVector = SpreadInt32x4 | SpreadFloat32x4;
+    static const SetType Spread = SpreadScalar | SpreadVector;
+
+    static const SetType AllPhysMask = ((1 << TotalPhys) - 1);
+    static const SetType AllMask = AllPhysMask * Spread;
+    static const SetType AllDoubleMask = AllPhysMask * SpreadDouble;
+    static const SetType VolatileMask =
 #if defined(_WIN64)
-        (1 << X86Encoding::xmm0) |
-        (1 << X86Encoding::xmm1) |
-        (1 << X86Encoding::xmm2) |
-        (1 << X86Encoding::xmm3) |
-        (1 << X86Encoding::xmm4) |
-        (1 << X86Encoding::xmm5);
+        ( (1 << X86Encoding::xmm0) |
+          (1 << X86Encoding::xmm1) |
+          (1 << X86Encoding::xmm2) |
+          (1 << X86Encoding::xmm3) |
+          (1 << X86Encoding::xmm4) |
+          (1 << X86Encoding::xmm5)
+        ) * SpreadScalar
+        | AllPhysMask * SpreadVector;
 #else
         AllMask;
 #endif
 
-    static const uint32_t NonVolatileMask = AllMask & ~VolatileMask;
+    static const SetType NonVolatileMask = AllMask & ~VolatileMask;
 
-    static const uint32_t WrapperMask = VolatileMask;
+    static const SetType WrapperMask = VolatileMask;
 
-    static const uint32_t NonAllocatableMask =
-        (1 << X86Encoding::xmm15);    // This is ScratchDoubleReg.
+    static const SetType NonAllocatableMask =
+        Spread * (1 << X86Encoding::xmm15);    // This is ScratchDoubleReg.
 
-    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
 };
 
 template <typename T>
@@ -175,73 +215,127 @@
 
 struct FloatRegister {
     typedef FloatRegisters Codes;
-    typedef Codes::Code Code;
+    typedef size_t Code;
+    typedef Codes::Encoding Encoding;
     typedef Codes::SetType SetType;
     static uint32_t SetSize(SetType x) {
-        static_assert(sizeof(SetType) == 4, "SetType must be 32 bits");
+        static_assert(sizeof(SetType) == 8, "SetType must be 64 bits");
+        // Count the number of non-aliased registers, for the moment.
+        //
+        // Copy the set bits of each typed register to the low part of the of
+        // the Set, and count the number of registers. This is made to avoid
+        // registers which are allocated twice with different types (such as in
+        // AllMask).
+        x |= x >> (2 * Codes::TotalPhys);
+        x |= x >> Codes::TotalPhys;
+        x &= Codes::AllPhysMask;
+        static_assert(Codes::AllPhysMask <= 0xffff, "We can safely use CountPopulation32");
         return mozilla::CountPopulation32(x);
     }
     static uint32_t FirstBit(SetType x) {
-        return mozilla::CountTrailingZeroes32(x);
+        return mozilla::CountTrailingZeroes64(x);
     }
     static uint32_t LastBit(SetType x) {
-        return 31 - mozilla::CountLeadingZeroes32(x);
+        return 63 - mozilla::CountLeadingZeroes64(x);
     }
-    Code code_;
+
+  private:
+    // Note: These fields are using one extra bit to make the invalid enumerated
+    // values fit, and thus prevent a warning.
+    Codes::Encoding reg_ : 5;
+    Codes::ContentType type_ : 3;
+    bool isInvalid_ : 1;
+
+    // Constants used for exporting/importing the float register code.
+    static const size_t RegSize = 4;
+    static const size_t RegMask = (1 << RegSize) - 1;
+
+  public:
+    MOZ_CONSTEXPR FloatRegister()
+        : reg_(Codes::Encoding(0)), type_(Codes::Single), isInvalid_(true)
+    { }
+    MOZ_CONSTEXPR FloatRegister(uint32_t r, Codes::ContentType k)
+        : reg_(Codes::Encoding(r)), type_(k), isInvalid_(false)
+    { }
+    MOZ_CONSTEXPR FloatRegister(Codes::Encoding r, Codes::ContentType k)
+        : reg_(r), type_(k), isInvalid_(false)
+    { }
 
     static FloatRegister FromCode(uint32_t i) {
-        MOZ_ASSERT(i < FloatRegisters::Total);
-        FloatRegister r = { (FloatRegisters::Code)i };
-        return r;
+        MOZ_ASSERT(i < Codes::Total);
+        return FloatRegister(i & RegMask, Codes::ContentType(i >> RegSize));
     }
-    Code code() const {
-        MOZ_ASSERT((uint32_t)code_ < FloatRegisters::Total);
-        return code_;
+
+    bool isSingle() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Single; }
+    bool isDouble() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Double; }
+    bool isInt32x4() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Int32x4; }
+    bool isFloat32x4() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Float32x4; }
+    bool isInvalid() const { return isInvalid_; }
+
+    FloatRegister asSingle() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Single); }
+    FloatRegister asDouble() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Double); }
+    FloatRegister asInt32x4() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Int32x4); }
+    FloatRegister asFloat32x4() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Float32x4); }
+
+    uint32_t size() const {
+        MOZ_ASSERT(!isInvalid());
+        if (isSingle())
+            return sizeof(float);
+        if (isDouble())
+            return sizeof(double);
+        MOZ_ASSERT(isInt32x4() || isFloat32x4());
+        return 4 * sizeof(int32_t);
     }
-    const char *name() const {
-        return FloatRegisters::GetName(code());
+
+    Code code() const {
+        MOZ_ASSERT(!isInvalid());
+        MOZ_ASSERT(uint32_t(reg_) < Codes::TotalPhys);
+        // :TODO: ARM is doing the same thing, but we should avoid this, except
+        // that the RegisterSets depends on this.
+        return Code(reg_ | (type_ << RegSize));
+    }
+    Encoding encoding() const {
+        MOZ_ASSERT(!isInvalid());
+        MOZ_ASSERT(uint32_t(reg_) < Codes::TotalPhys);
+        return reg_;
     }
+    // defined in Assembler-x86-shared.cpp
+    const char *name() const;
     bool volatile_() const {
-        return !!((1 << code()) & FloatRegisters::VolatileMask);
+        return !!((SetType(1) << code()) & FloatRegisters::VolatileMask);
     }
     bool operator !=(FloatRegister other) const {
-        return other.code_ != code_;
+        return other.reg_ != reg_ || other.type_ != type_;
     }
     bool operator ==(FloatRegister other) const {
-        return other.code_ == code_;
+        return other.reg_ == reg_ && other.type_ == type_;
     }
     bool aliases(FloatRegister other) const {
-        return other.code_ == code_;
+        return other.reg_ == reg_;
     }
-    uint32_t numAliased() const {
-        return 1;
-    }
-    // N.B. FloatRegister is an explicit outparam here because msvc-2010
-    // miscompiled it on win64 when the value was simply returned
-    void aliased(uint32_t aliasIdx, FloatRegister *ret) {
-        MOZ_ASSERT(aliasIdx == 0);
-        *ret = *this;
-    }
-    // This function mostly exists for the ARM backend.  It is to ensure that two
-    // floating point registers' types are equivalent.  e.g. S0 is not equivalent
-    // to D16, since S0 holds a float32, and D16 holds a Double.
-    // Since all floating point registers on x86 and x64 are equivalent, it is
-    // reasonable for this function to do the same.
+    // Check if two floating point registers have the same type.
     bool equiv(FloatRegister other) const {
-        return true;
+        return other.type_ == type_;
     }
-    uint32_t size() const {
-        return sizeof(double);
+
+    uint32_t numAliased() const {
+        return Codes::NumTypes;
     }
     uint32_t numAlignedAliased() const {
-        return 1;
+        return numAliased();
     }
-    void alignedAliased(uint32_t aliasIdx, FloatRegister *ret) {
-        MOZ_ASSERT(aliasIdx == 0);
-        *ret = *this;
+
+    // N.B. FloatRegister is an explicit outparam here because msvc-2010
+    // miscompiled it on win64 when the value was simply returned
+    void aliased(uint32_t aliasIdx, FloatRegister *ret) const {
+        MOZ_ASSERT(aliasIdx < Codes::NumTypes);
+        *ret = FloatRegister(reg_, Codes::ContentType((aliasIdx + type_) % Codes::NumTypes));
+    }
+    void alignedAliased(uint32_t aliasIdx, FloatRegister *ret) const {
+        aliased(aliasIdx, ret);
     }
+
     static TypedRegisterSet<FloatRegister> ReduceSetForPush(const TypedRegisterSet<FloatRegister> &s);
-    static uint32_t GetSizeInBytes(const TypedRegisterSet<FloatRegister> &s);
     static uint32_t GetPushSizeInBytes(const TypedRegisterSet<FloatRegister> &s);
     uint32_t getRegisterDumpOffsetInBytes();
 };
@@ -262,6 +356,11 @@
     return false;
 }
 
+// Support some constant-offset addressing.
+// See the comments above AsmJSMappedSize in AsmJSValidate.h for more info.
+static const size_t AsmJSCheckedImmediateRange = 4096;
+static const size_t AsmJSImmediateRange = UINT32_C(0x80000000);
+
 } // namespace jit
 } // namespace js
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Assembler-x64.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Assembler-x64.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Assembler-x64.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Assembler-x64.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -49,15 +49,22 @@
         current_ = ABIArg(IntArgRegs[regIndex_++]);
         break;
       case MIRType_Float32:
+        current_ = ABIArg(FloatArgRegs[regIndex_++].asSingle());
+        break;
       case MIRType_Double:
         current_ = ABIArg(FloatArgRegs[regIndex_++]);
         break;
       case MIRType_Int32x4:
+        // On Win64, >64 bit args need to be passed by reference, but asm.js
+        // doesn't allow passing SIMD values to FFIs. The only way to reach
+        // here is asm to asm calls, so we can break the ABI here.
+        current_ = ABIArg(FloatArgRegs[regIndex_++].asInt32x4());
+        break;
       case MIRType_Float32x4:
         // On Win64, >64 bit args need to be passed by reference, but asm.js
         // doesn't allow passing SIMD values to FFIs. The only way to reach
         // here is asm to asm calls, so we can break the ABI here.
-        current_ = ABIArg(FloatArgRegs[regIndex_++]);
+        current_ = ABIArg(FloatArgRegs[regIndex_++].asFloat32x4());
         break;
       default:
         MOZ_CRASH("Unexpected argument type");
@@ -81,7 +88,10 @@
             stackOffset_ += sizeof(uint64_t);
             break;
         }
-        current_ = ABIArg(FloatArgRegs[floatRegIndex_++]);
+        if (type == MIRType_Float32)
+            current_ = ABIArg(FloatArgRegs[floatRegIndex_++].asSingle());
+        else
+            current_ = ABIArg(FloatArgRegs[floatRegIndex_++]);
         break;
       case MIRType_Int32x4:
       case MIRType_Float32x4:
@@ -91,7 +101,10 @@
             stackOffset_ += Simd128DataSize;
             break;
         }
-        current_ = ABIArg(FloatArgRegs[floatRegIndex_++]);
+        if (type == MIRType_Int32x4)
+            current_ = ABIArg(FloatArgRegs[floatRegIndex_++].asInt32x4());
+        else
+            current_ = ABIArg(FloatArgRegs[floatRegIndex_++].asFloat32x4());
         break;
       default:
         MOZ_CRASH("Unexpected argument type");
@@ -294,21 +307,39 @@
 FloatRegisterSet
 FloatRegister::ReduceSetForPush(const FloatRegisterSet &s)
 {
-    return s;
-}
-uint32_t
-FloatRegister::GetSizeInBytes(const FloatRegisterSet &s)
-{
-    uint32_t ret = s.size() * sizeof(double);
-    return ret;
+    if (JitSupportsSimd())
+        return s;
+
+    // Ignore all SIMD register.
+    return FloatRegisterSet(s.bits() & (Codes::AllPhysMask * Codes::SpreadScalar));
 }
 uint32_t
 FloatRegister::GetPushSizeInBytes(const FloatRegisterSet &s)
 {
-    return s.size() * sizeof(double);
+    SetType all = s.bits();
+    SetType float32x4Set =
+        (all >> (uint32_t(Codes::Float32x4) * Codes::TotalPhys)) & Codes::AllPhysMask;
+    SetType int32x4Set =
+        (all >> (uint32_t(Codes::Int32x4) * Codes::TotalPhys)) & Codes::AllPhysMask;
+    SetType doubleSet =
+        (all >> (uint32_t(Codes::Double) * Codes::TotalPhys)) & Codes::AllPhysMask;
+    SetType singleSet =
+        (all >> (uint32_t(Codes::Single) * Codes::TotalPhys)) & Codes::AllPhysMask;
+
+    // PushRegsInMask pushes the largest register first, and thus avoids pushing
+    // aliased registers. So we have to filter out the physical registers which
+    // are already pushed as part of larger registers.
+    SetType set128b = int32x4Set | float32x4Set;
+    SetType set64b = doubleSet & ~set128b;
+    SetType set32b = singleSet & ~set64b  & ~set128b;
+
+    static_assert(Codes::AllPhysMask <= 0xffff, "We can safely use CountPopulation32");
+    return mozilla::CountPopulation32(set128b) * (4 * sizeof(int32_t))
+        + mozilla::CountPopulation32(set64b) * sizeof(double)
+        + mozilla::CountPopulation32(set32b) * sizeof(float);
 }
 uint32_t
 FloatRegister::getRegisterDumpOffsetInBytes()
 {
-    return code() * sizeof(double);
+    return uint32_t(encoding()) * sizeof(FloatRegisters::RegisterContent);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Assembler-x64.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Assembler-x64.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Assembler-x64.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Assembler-x64.h	2015-02-28 15:03:05.000000000 +0000
@@ -33,22 +33,22 @@
 static MOZ_CONSTEXPR_VAR Register r15 = { X86Encoding::r15 };
 static MOZ_CONSTEXPR_VAR Register rsp = { X86Encoding::rsp };
 
-static MOZ_CONSTEXPR_VAR FloatRegister xmm0 = { X86Encoding::xmm0 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm1 = { X86Encoding::xmm1 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm2 = { X86Encoding::xmm2 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm3 = { X86Encoding::xmm3 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm4 = { X86Encoding::xmm4 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm5 = { X86Encoding::xmm5 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm6 = { X86Encoding::xmm6 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm7 = { X86Encoding::xmm7 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm8 = { X86Encoding::xmm8 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm9 = { X86Encoding::xmm9 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm10 = { X86Encoding::xmm10 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm11 = { X86Encoding::xmm11 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm12 = { X86Encoding::xmm12 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm13 = { X86Encoding::xmm13 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm14 = { X86Encoding::xmm14 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm15 = { X86Encoding::xmm15 };
+static MOZ_CONSTEXPR_VAR FloatRegister xmm0 = FloatRegister(X86Encoding::xmm0, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm1 = FloatRegister(X86Encoding::xmm1, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm2 = FloatRegister(X86Encoding::xmm2, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm3 = FloatRegister(X86Encoding::xmm3, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm4 = FloatRegister(X86Encoding::xmm4, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm5 = FloatRegister(X86Encoding::xmm5, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm6 = FloatRegister(X86Encoding::xmm6, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm7 = FloatRegister(X86Encoding::xmm7, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm8 = FloatRegister(X86Encoding::xmm8, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm9 = FloatRegister(X86Encoding::xmm9, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm10 = FloatRegister(X86Encoding::xmm10, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm11 = FloatRegister(X86Encoding::xmm11, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm12 = FloatRegister(X86Encoding::xmm12, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm13 = FloatRegister(X86Encoding::xmm13, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm14 = FloatRegister(X86Encoding::xmm14, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm15 = FloatRegister(X86Encoding::xmm15, FloatRegisters::Double);
 
 // X86-common synonyms.
 static MOZ_CONSTEXPR_VAR Register eax = rax;
@@ -61,7 +61,7 @@
 static MOZ_CONSTEXPR_VAR Register esp = rsp;
 
 static MOZ_CONSTEXPR_VAR Register InvalidReg = { X86Encoding::invalid_reg };
-static MOZ_CONSTEXPR_VAR FloatRegister InvalidFloatReg = { X86Encoding::invalid_xmm };
+static MOZ_CONSTEXPR_VAR FloatRegister InvalidFloatReg = FloatRegister();
 
 static MOZ_CONSTEXPR_VAR Register StackPointer = rsp;
 static MOZ_CONSTEXPR_VAR Register FramePointer = rbp;
@@ -73,11 +73,12 @@
 static MOZ_CONSTEXPR_VAR Register ReturnReg = rax;
 static MOZ_CONSTEXPR_VAR Register ScratchReg = r11;
 static MOZ_CONSTEXPR_VAR Register HeapReg = r15;
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32Reg = xmm0;
-static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloat32Reg = xmm15;
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnDoubleReg = xmm0;
-static MOZ_CONSTEXPR_VAR FloatRegister ScratchDoubleReg = xmm15;
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnSimdReg = xmm0;
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32Reg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Single);
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnDoubleReg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnInt32x4Reg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Int32x4);
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32x4Reg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Float32x4);
+static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloat32Reg = FloatRegister(X86Encoding::xmm15, FloatRegisters::Single);
+static MOZ_CONSTEXPR_VAR FloatRegister ScratchDoubleReg = FloatRegister(X86Encoding::xmm15, FloatRegisters::Double);
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchSimdReg = xmm15;
 
 // Avoid rbp, which is the FramePointer, which is unavailable in some modes.
@@ -399,10 +400,10 @@
         }
     }
     void vmovq(Register src, FloatRegister dest) {
-        masm.vmovq_rr(src.code(), dest.code());
+        masm.vmovq_rr(src.code(), dest.encoding());
     }
     void vmovq(FloatRegister src, Register dest) {
-        masm.vmovq_rr(src.code(), dest.code());
+        masm.vmovq_rr(src.encoding(), dest.code());
     }
     void movq(Register src, Register dest) {
         masm.movq_rr(src.code(), dest.code());
@@ -620,31 +621,31 @@
         return CodeOffsetLabel(masm.movq_ripr(dest.code()).offset());
     }
     CodeOffsetLabel loadRipRelativeDouble(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovsd_ripr(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovsd_ripr(dest.encoding()).offset());
     }
     CodeOffsetLabel loadRipRelativeFloat32(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovss_ripr(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovss_ripr(dest.encoding()).offset());
     }
     CodeOffsetLabel loadRipRelativeInt32x4(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovdqa_ripr(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovdqa_ripr(dest.encoding()).offset());
     }
     CodeOffsetLabel loadRipRelativeFloat32x4(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovaps_ripr(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovaps_ripr(dest.encoding()).offset());
     }
     CodeOffsetLabel storeRipRelativeInt32(Register dest) {
         return CodeOffsetLabel(masm.movl_rrip(dest.code()).offset());
     }
     CodeOffsetLabel storeRipRelativeDouble(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovsd_rrip(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovsd_rrip(dest.encoding()).offset());
     }
     CodeOffsetLabel storeRipRelativeFloat32(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovss_rrip(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovss_rrip(dest.encoding()).offset());
     }
     CodeOffsetLabel storeRipRelativeInt32x4(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovdqa_rrip(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovdqa_rrip(dest.encoding()).offset());
     }
     CodeOffsetLabel storeRipRelativeFloat32x4(FloatRegister dest) {
-        return CodeOffsetLabel(masm.vmovaps_rrip(dest.code()).offset());
+        return CodeOffsetLabel(masm.vmovaps_rrip(dest.encoding()).offset());
     }
     CodeOffsetLabel leaRipRelative(Register dest) {
         return CodeOffsetLabel(masm.leaq_rip(dest.code()).offset());
@@ -768,16 +769,16 @@
     using AssemblerX86Shared::call;
 
     void vcvttsd2sq(FloatRegister src, Register dest) {
-        masm.vcvttsd2sq_rr(src.code(), dest.code());
+        masm.vcvttsd2sq_rr(src.encoding(), dest.code());
     }
     void vcvttss2sq(FloatRegister src, Register dest) {
-        masm.vcvttss2sq_rr(src.code(), dest.code());
+        masm.vcvttss2sq_rr(src.encoding(), dest.code());
     }
     void vcvtsq2sd(Register src1, FloatRegister src0, FloatRegister dest) {
-        masm.vcvtsq2sd_rr(src1.code(), src0.code(), dest.code());
+        masm.vcvtsq2sd_rr(src1.code(), src0.encoding(), dest.encoding());
     }
     void vcvtsq2ss(Register src1, FloatRegister src0, FloatRegister dest) {
-        masm.vcvtsq2ss_rr(src1.code(), src0.code(), dest.code());
+        masm.vcvtsq2ss_rr(src1.code(), src0.encoding(), dest.encoding());
     }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Bailouts-x64.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Bailouts-x64.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Bailouts-x64.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Bailouts-x64.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -18,8 +18,8 @@
 
 class BailoutStack
 {
-    mozilla::Array<double, FloatRegisters::Total> fpregs_;
-    mozilla::Array<uintptr_t, Registers::Total> regs_;
+    RegisterDump::FPUArray fpregs_;
+    RegisterDump::GPRArray regs_;
     uintptr_t frameSize_;
     uintptr_t snapshotOffset_;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/CodeGenerator-x64.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -298,94 +298,86 @@
 void
 CodeGeneratorX64::emitSimdLoad(LAsmJSLoadHeap *ins)
 {
-    MAsmJSLoadHeap *mir = ins->mir();
+    const MAsmJSLoadHeap *mir = ins->mir();
     Scalar::Type type = mir->accessType();
-    const LAllocation *ptr = ins->ptr();
     FloatRegister out = ToFloatRegister(ins->output());
-    Operand srcAddr(HeapReg);
-
-    if (ptr->isConstant()) {
-        int32_t ptrImm = ptr->toConstant()->toInt32();
-        MOZ_ASSERT(ptrImm >= 0);
-        srcAddr = Operand(HeapReg, ptrImm);
-    } else {
-        srcAddr = Operand(HeapReg, ToRegister(ptr), TimesOne);
-    }
+    const LAllocation *ptr = ins->ptr();
+    Operand srcAddr = ptr->isBogus()
+                      ? Operand(HeapReg, mir->offset())
+                      : Operand(HeapReg, ToRegister(ptr), TimesOne, mir->offset());
 
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
-    if (mir->needsBoundsCheck()) {
-        maybeCmpOffset = masm.cmp32WithPatch(ToRegister(ptr), Imm32(0)).offset();
-        masm.j(Assembler::AboveOrEqual, mir->outOfBoundsLabel()); // Throws RangeError
-    }
+    if (gen->needsAsmJSBoundsCheckBranch(mir))
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr),
+                                                    gen->outOfBoundsLabel());
 
     unsigned numElems = mir->numSimdElems();
     if (numElems == 3) {
         MOZ_ASSERT(type == Scalar::Int32x4 || type == Scalar::Float32x4);
 
-        Operand shiftedOffset(HeapReg);
-        if (ptr->isConstant())
-            shiftedOffset = Operand(HeapReg, ptr->toConstant()->toInt32() + 2 * sizeof(float));
-        else
-            shiftedOffset = Operand(HeapReg, ToRegister(ptr), TimesOne, 2 * sizeof(float));
+        Operand srcAddrZ =
+            ptr->isBogus()
+            ? Operand(HeapReg, 2 * sizeof(float) + mir->offset())
+            : Operand(HeapReg, ToRegister(ptr), TimesOne, 2 * sizeof(float) + mir->offset());
 
         // Load XY
         uint32_t before = masm.size();
         loadSimd(type, 2, srcAddr, out);
         uint32_t after = masm.size();
-        // We're noting a load of 3 elements, so that the bounds check checks
-        // for 3 elements.
-        masm.append(AsmJSHeapAccess(before, after, 3, type, maybeCmpOffset));
+        verifyHeapAccessDisassembly(before, after, /*isLoad=*/true, type, 2, srcAddr,
+                                    *ins->output()->output());
+        masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw, maybeCmpOffset));
 
         // Load Z (W is zeroed)
+        // This is still in bounds, as we've checked with a manual bounds check
+        // or we had enough space for sure when removing the bounds check.
         before = after;
-        loadSimd(type, 1, shiftedOffset, ScratchSimdReg);
+        loadSimd(type, 1, srcAddrZ, ScratchSimdReg);
         after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, 1, type));
+        verifyHeapAccessDisassembly(before, after, /*isLoad=*/true, type, 1, srcAddrZ, LFloatReg(ScratchSimdReg));
+        masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw,
+                                    AsmJSHeapAccess::NoLengthCheck, 8));
 
         // Move ZW atop XY
         masm.vmovlhps(ScratchSimdReg, out, out);
-        return;
+    } else {
+        uint32_t before = masm.size();
+        loadSimd(type, numElems, srcAddr, out);
+        uint32_t after = masm.size();
+        verifyHeapAccessDisassembly(before, after, /*isLoad=*/true, type, numElems, srcAddr, *ins->output()->output());
+        masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw, maybeCmpOffset));
     }
 
-    uint32_t before = masm.size();
-    loadSimd(type, numElems, srcAddr, out);
-    uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, numElems, type, maybeCmpOffset));
+    if (maybeCmpOffset != AsmJSHeapAccess::NoLengthCheck)
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
 }
 
 void
 CodeGeneratorX64::visitAsmJSLoadHeap(LAsmJSLoadHeap *ins)
 {
-    MAsmJSLoadHeap *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
-    const LAllocation *ptr = ins->ptr();
-    const LDefinition *out = ins->output();
-    Operand srcAddr(HeapReg);
+    const MAsmJSLoadHeap *mir = ins->mir();
+    Scalar::Type accessType = mir->accessType();
 
-    if (Scalar::isSimdType(vt))
+    if (Scalar::isSimdType(accessType))
         return emitSimdLoad(ins);
 
-    if (ptr->isConstant()) {
-        int32_t ptrImm = ptr->toConstant()->toInt32();
-        MOZ_ASSERT(ptrImm >= 0);
-        srcAddr = Operand(HeapReg, ptrImm);
-    } else {
-        srcAddr = Operand(HeapReg, ToRegister(ptr), TimesOne);
-    }
+    const LAllocation *ptr = ins->ptr();
+    const LDefinition *out = ins->output();
+    Operand srcAddr = ptr->isBogus()
+                      ? Operand(HeapReg, mir->offset())
+                      : Operand(HeapReg, ToRegister(ptr), TimesOne, mir->offset());
 
-    memoryBarrier(ins->mir()->barrierBefore());
+    memoryBarrier(mir->barrierBefore());
     OutOfLineLoadTypedArrayOutOfBounds *ool = nullptr;
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
-    if (mir->needsBoundsCheck()) {
-        CodeOffsetLabel cmp = masm.cmp32WithPatch(ToRegister(ptr), Imm32(0));
-        ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), vt);
-        addOutOfLineCode(ool, ins->mir());
-        masm.j(Assembler::AboveOrEqual, ool->entry());
-        maybeCmpOffset = cmp.offset();
+    if (gen->needsAsmJSBoundsCheckBranch(mir)) {
+        ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), accessType);
+        addOutOfLineCode(ool, mir);
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr), ool->entry());
     }
 
     uint32_t before = masm.size();
-    switch (vt) {
+    switch (accessType) {
       case Scalar::Int8:      masm.movsbl(srcAddr, ToRegister(out)); break;
       case Scalar::Uint8:     masm.movzbl(srcAddr, ToRegister(out)); break;
       case Scalar::Int16:     masm.movswl(srcAddr, ToRegister(out)); break;
@@ -401,11 +393,13 @@
           MOZ_CRASH("unexpected array type");
     }
     uint32_t after = masm.size();
-    verifyHeapAccessDisassembly(before, after, /*isLoad=*/true, vt, srcAddr, *out->output());
-    if (ool)
+    verifyHeapAccessDisassembly(before, after, /*isLoad=*/true, accessType, 0, srcAddr, *out->output());
+    if (ool) {
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
         masm.bind(ool->rejoin());
-    memoryBarrier(ins->mir()->barrierAfter());
-    masm.append(AsmJSHeapAccess(before, after, vt, ToAnyRegister(out), maybeCmpOffset));
+    }
+    memoryBarrier(mir->barrierAfter());
+    masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::CarryOn, maybeCmpOffset));
 }
 
 void
@@ -452,98 +446,90 @@
 void
 CodeGeneratorX64::emitSimdStore(LAsmJSStoreHeap *ins)
 {
-    MAsmJSStoreHeap *mir = ins->mir();
+    const MAsmJSStoreHeap *mir = ins->mir();
     Scalar::Type type = mir->accessType();
-    const LAllocation *ptr = ins->ptr();
     FloatRegister in = ToFloatRegister(ins->value());
-    Operand dstAddr(HeapReg);
-
-    if (ptr->isConstant()) {
-        int32_t ptrImm = ptr->toConstant()->toInt32();
-        MOZ_ASSERT(ptrImm >= 0);
-        dstAddr = Operand(HeapReg, ptrImm);
-    } else {
-        dstAddr = Operand(HeapReg, ToRegister(ptr), TimesOne);
-    }
+    const LAllocation *ptr = ins->ptr();
+    Operand dstAddr = ptr->isBogus()
+                      ? Operand(HeapReg, mir->offset())
+                      : Operand(HeapReg, ToRegister(ptr), TimesOne, mir->offset());
 
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
-    if (mir->needsBoundsCheck()) {
-        maybeCmpOffset = masm.cmp32WithPatch(ToRegister(ptr), Imm32(0)).offset();
-        masm.j(Assembler::AboveOrEqual, mir->outOfBoundsLabel()); // Throws RangeError
-    }
+    if (gen->needsAsmJSBoundsCheckBranch(mir))
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr),
+                                                    gen->outOfBoundsLabel());
 
     unsigned numElems = mir->numSimdElems();
     if (numElems == 3) {
         MOZ_ASSERT(type == Scalar::Int32x4 || type == Scalar::Float32x4);
 
-        Operand shiftedOffset(HeapReg);
-        if (ptr->isConstant())
-            shiftedOffset = Operand(HeapReg, ptr->toConstant()->toInt32() + 2 * sizeof(float));
-        else
-            shiftedOffset = Operand(HeapReg, ToRegister(ptr), TimesOne, 2 * sizeof(float));
-
-        // Store Z first: it would be observable to store XY first, in the
-        // case XY can be stored in bounds but Z can't (in this case, we'd throw
-        // without restoring the values previously stored before XY).
+        Operand dstAddrZ =
+            ptr->isBogus()
+            ? Operand(HeapReg, 2 * sizeof(float) + mir->offset())
+            : Operand(HeapReg, ToRegister(ptr), TimesOne, 2 * sizeof(float) + mir->offset());
+
+        // It's possible that the Z could be out of bounds when the XY is in
+        // bounds. To avoid storing the XY before the exception is thrown, we
+        // store the Z first, and record its offset in the AsmJSHeapAccess so
+        // that the signal handler knows to check the bounds of the full
+        // access, rather than just the Z.
         masm.vmovhlps(in, ScratchSimdReg, ScratchSimdReg);
         uint32_t before = masm.size();
-        storeSimd(type, 1, ScratchSimdReg, shiftedOffset);
+        storeSimd(type, 1, ScratchSimdReg, dstAddrZ);
         uint32_t after = masm.size();
-        // We're noting a store of 3 elements, so that the bounds check checks
-        // for 3 elements.
-        masm.append(AsmJSHeapAccess(before, after, 3, type, maybeCmpOffset));
+        verifyHeapAccessDisassembly(before, after, /*isLoad=*/false, type, 1, dstAddrZ, LFloatReg(ScratchSimdReg));
+        masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw, maybeCmpOffset, 8));
 
         // Store XY
         before = after;
         storeSimd(type, 2, in, dstAddr);
         after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, 2, type));
-        return;
+        verifyHeapAccessDisassembly(before, after, /*isLoad=*/false, type, 2, dstAddr, *ins->value());
+        masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw));
+    } else {
+        uint32_t before = masm.size();
+        storeSimd(type, numElems, in, dstAddr);
+        uint32_t after = masm.size();
+        verifyHeapAccessDisassembly(before, after, /*isLoad=*/false, type, numElems, dstAddr, *ins->value());
+        masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::Throw, maybeCmpOffset));
     }
 
-    uint32_t before = masm.size();
-    storeSimd(type, numElems, in, dstAddr);
-    uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, numElems, type, maybeCmpOffset));
+    if (maybeCmpOffset != AsmJSHeapAccess::NoLengthCheck)
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
 }
 
 void
 CodeGeneratorX64::visitAsmJSStoreHeap(LAsmJSStoreHeap *ins)
 {
-    MAsmJSStoreHeap *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
-    const LAllocation *ptr = ins->ptr();
-    Operand dstAddr(HeapReg);
+    const MAsmJSStoreHeap *mir = ins->mir();
+    Scalar::Type accessType = mir->accessType();
 
-    if (Scalar::isSimdType(vt))
+    if (Scalar::isSimdType(accessType))
         return emitSimdStore(ins);
 
-    if (ptr->isConstant()) {
-        int32_t ptrImm = ptr->toConstant()->toInt32();
-        MOZ_ASSERT(ptrImm >= 0);
-        dstAddr = Operand(HeapReg, ptrImm);
-    } else {
-        dstAddr = Operand(HeapReg, ToRegister(ptr), TimesOne);
-    }
+    const LAllocation *value = ins->value();
+    const LAllocation *ptr = ins->ptr();
+    Operand dstAddr = ptr->isBogus()
+                      ? Operand(HeapReg, mir->offset())
+                      : Operand(HeapReg, ToRegister(ptr), TimesOne, mir->offset());
 
-    memoryBarrier(ins->mir()->barrierBefore());
-    Label rejoin;
+    memoryBarrier(mir->barrierBefore());
+    Label *rejoin = nullptr;
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
-    if (mir->needsBoundsCheck()) {
-        CodeOffsetLabel cmp = masm.cmp32WithPatch(ToRegister(ptr), Imm32(0));
-        masm.j(Assembler::AboveOrEqual, &rejoin);
-        maybeCmpOffset = cmp.offset();
+    if (gen->needsAsmJSBoundsCheckBranch(mir)) {
+        rejoin = alloc().lifoAlloc()->new_<Label>();
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr), rejoin);
     }
 
     uint32_t before = masm.size();
-    if (ins->value()->isConstant()) {
-        switch (vt) {
+    if (value->isConstant()) {
+        switch (accessType) {
           case Scalar::Int8:
-          case Scalar::Uint8:        masm.movb(Imm32(ToInt32(ins->value())), dstAddr); break;
+          case Scalar::Uint8:        masm.movb(Imm32(ToInt32(value)), dstAddr); break;
           case Scalar::Int16:
-          case Scalar::Uint16:       masm.movw(Imm32(ToInt32(ins->value())), dstAddr); break;
+          case Scalar::Uint16:       masm.movw(Imm32(ToInt32(value)), dstAddr); break;
           case Scalar::Int32:
-          case Scalar::Uint32:       masm.movl(Imm32(ToInt32(ins->value())), dstAddr); break;
+          case Scalar::Uint32:       masm.movl(Imm32(ToInt32(value)), dstAddr); break;
           case Scalar::Float32:
           case Scalar::Float64:
           case Scalar::Float32x4:
@@ -553,15 +539,15 @@
               MOZ_CRASH("unexpected array type");
         }
     } else {
-        switch (vt) {
+        switch (accessType) {
           case Scalar::Int8:
-          case Scalar::Uint8:        masm.movb(ToRegister(ins->value()), dstAddr); break;
+          case Scalar::Uint8:        masm.movb(ToRegister(value), dstAddr); break;
           case Scalar::Int16:
-          case Scalar::Uint16:       masm.movw(ToRegister(ins->value()), dstAddr); break;
+          case Scalar::Uint16:       masm.movw(ToRegister(value), dstAddr); break;
           case Scalar::Int32:
-          case Scalar::Uint32:       masm.movl(ToRegister(ins->value()), dstAddr); break;
-          case Scalar::Float32:      masm.storeFloat32(ToFloatRegister(ins->value()), dstAddr); break;
-          case Scalar::Float64:      masm.storeDouble(ToFloatRegister(ins->value()), dstAddr); break;
+          case Scalar::Uint32:       masm.movl(ToRegister(value), dstAddr); break;
+          case Scalar::Float32:      masm.storeFloat32(ToFloatRegister(value), dstAddr); break;
+          case Scalar::Float64:      masm.storeDouble(ToFloatRegister(value), dstAddr); break;
           case Scalar::Float32x4:
           case Scalar::Int32x4:      MOZ_CRASH("SIMD stores must be handled in emitSimdStore");
           case Scalar::Uint8Clamped:
@@ -570,39 +556,44 @@
         }
     }
     uint32_t after = masm.size();
-    verifyHeapAccessDisassembly(before, after, /*isLoad=*/false, vt, dstAddr, *ins->value());
-    if (rejoin.used())
-        masm.bind(&rejoin);
-    memoryBarrier(ins->mir()->barrierAfter());
-    masm.append(AsmJSHeapAccess(before, after, vt, maybeCmpOffset));
+    verifyHeapAccessDisassembly(before, after, /*isLoad=*/false, accessType, 0, dstAddr, *value);
+    if (rejoin) {
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
+        masm.bind(rejoin);
+    }
+    memoryBarrier(mir->barrierAfter());
+    masm.append(AsmJSHeapAccess(before, AsmJSHeapAccess::CarryOn, maybeCmpOffset));
 }
 
 void
 CodeGeneratorX64::visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins)
 {
     MAsmJSCompareExchangeHeap *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
+    Scalar::Type accessType = mir->accessType();
     const LAllocation *ptr = ins->ptr();
 
     MOZ_ASSERT(ptr->isRegister());
-    BaseIndex srcAddr(HeapReg, ToRegister(ptr), TimesOne);
+    BaseIndex srcAddr(HeapReg, ToRegister(ptr), TimesOne, mir->offset());
 
     Register oldval = ToRegister(ins->oldValue());
     Register newval = ToRegister(ins->newValue());
 
+    // Note that we can't use
+    // needsAsmJSBoundsCheckBranch/emitAsmJSBoundsCheckBranch/cleanupAfterAsmJSBoundsCheckBranch
+    // since signal-handler bounds checking is not yet implemented for atomic accesses.
     Label rejoin;
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
     if (mir->needsBoundsCheck()) {
-        maybeCmpOffset = masm.cmp32WithPatch(ToRegister(ptr), Imm32(0)).offset();
+        maybeCmpOffset = masm.cmp32WithPatch(ToRegister(ptr), Imm32(-mir->endOffset())).offset();
         Label goahead;
-        masm.j(Assembler::Below, &goahead);
+        masm.j(Assembler::BelowOrEqual, &goahead);
         memoryBarrier(MembarFull);
         Register out = ToRegister(ins->output());
         masm.xorl(out, out);
         masm.jmp(&rejoin);
         masm.bind(&goahead);
     }
-    masm.compareExchangeToTypedIntArray(vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+    masm.compareExchangeToTypedIntArray(accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         srcAddr,
                                         oldval,
                                         newval,
@@ -611,28 +602,34 @@
     uint32_t after = masm.size();
     if (rejoin.used())
         masm.bind(&rejoin);
-    masm.append(AsmJSHeapAccess(after, after, mir->accessType(), maybeCmpOffset));
+    MOZ_ASSERT(mir->offset() == 0,
+               "The AsmJS signal handler doesn't yet support emulating "
+               "atomic accesses in the case of a fault from an unwrapped offset");
+    masm.append(AsmJSHeapAccess(after, AsmJSHeapAccess::Throw, maybeCmpOffset));
 }
 
 void
 CodeGeneratorX64::visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins)
 {
     MAsmJSAtomicBinopHeap *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
+    Scalar::Type accessType = mir->accessType();
     const LAllocation *ptr = ins->ptr();
     Register temp = ins->temp()->isBogusTemp() ? InvalidReg : ToRegister(ins->temp());
     const LAllocation* value = ins->value();
     AtomicOp op = mir->operation();
 
     MOZ_ASSERT(ptr->isRegister());
-    BaseIndex srcAddr(HeapReg, ToRegister(ptr), TimesOne);
+    BaseIndex srcAddr(HeapReg, ToRegister(ptr), TimesOne, mir->offset());
 
+    // Note that we can't use
+    // needsAsmJSBoundsCheckBranch/emitAsmJSBoundsCheckBranch/cleanupAfterAsmJSBoundsCheckBranch
+    // since signal-handler bounds checking is not yet implemented for atomic accesses.
     Label rejoin;
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
     if (mir->needsBoundsCheck()) {
-        maybeCmpOffset = masm.cmp32WithPatch(ToRegister(ptr), Imm32(0)).offset();
+        maybeCmpOffset = masm.cmp32WithPatch(ToRegister(ptr), Imm32(-mir->endOffset())).offset();
         Label goahead;
-        masm.j(Assembler::Below, &goahead);
+        masm.j(Assembler::BelowOrEqual, &goahead);
         memoryBarrier(MembarFull);
         Register out = ToRegister(ins->output());
         masm.xorl(out,out);
@@ -640,14 +637,14 @@
         masm.bind(&goahead);
     }
     if (value->isConstant()) {
-        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+        masm.atomicBinopToTypedIntArray(op, accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         Imm32(ToInt32(value)),
                                         srcAddr,
                                         temp,
                                         InvalidReg,
                                         ToAnyRegister(ins->output()));
     } else {
-        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+        masm.atomicBinopToTypedIntArray(op, accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         ToRegister(value),
                                         srcAddr,
                                         temp,
@@ -657,7 +654,10 @@
     uint32_t after = masm.size();
     if (rejoin.used())
         masm.bind(&rejoin);
-    masm.append(AsmJSHeapAccess(after, after, mir->accessType(), maybeCmpOffset));
+    MOZ_ASSERT(mir->offset() == 0,
+               "The AsmJS signal handler doesn't yet support emulating "
+               "atomic accesses in the case of a fault from an unwrapped offset");
+    masm.append(AsmJSHeapAccess(after, AsmJSHeapAccess::Throw, maybeCmpOffset));
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Lowering-x64.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Lowering-x64.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Lowering-x64.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Lowering-x64.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -153,14 +153,11 @@
     MDefinition *ptr = ins->ptr();
     MOZ_ASSERT(ptr->type() == MIRType_Int32);
 
-    // Only a positive index is accepted because a negative offset encoded as an
-    // offset in the addressing mode would not wrap back into the protected area
-    // reserved for the heap. For simplicity (and since we don't care about
-    // getting maximum performance in these cases) only allow constant
-    // operands when skipping bounds checks.
-    LAllocation ptrAlloc = ins->needsBoundsCheck()
+    // For simplicity, require a register if we're going to emit a bounds-check
+    // branch, so that we don't have special cases for constants.
+    LAllocation ptrAlloc = gen->needsAsmJSBoundsCheckBranch(ins)
                            ? useRegisterAtStart(ptr)
-                           : useRegisterOrNonNegativeConstantAtStart(ptr);
+                           : useRegisterOrZeroAtStart(ptr);
 
     define(new(alloc()) LAsmJSLoadHeap(ptrAlloc), ins);
 }
@@ -171,14 +168,11 @@
     MDefinition *ptr = ins->ptr();
     MOZ_ASSERT(ptr->type() == MIRType_Int32);
 
-    // Only a positive index is accepted because a negative offset encoded as an
-    // offset in the addressing mode would not wrap back into the protected area
-    // reserved for the heap. For simplicity (and since we don't care about
-    // getting maximum performance in these cases) only allow constant
-    // opererands when skipping bounds checks.
-    LAllocation ptrAlloc = ins->needsBoundsCheck()
+    // For simplicity, require a register if we're going to emit a bounds-check
+    // branch, so that we don't have special cases for constants.
+    LAllocation ptrAlloc = gen->needsAsmJSBoundsCheckBranch(ins)
                            ? useRegisterAtStart(ptr)
-                           : useRegisterOrNonNegativeConstantAtStart(ptr);
+                           : useRegisterOrZeroAtStart(ptr);
 
     LAsmJSStoreHeap *lir = nullptr;  // initialize to silence GCC warning
     switch (ins->accessType()) {
@@ -200,7 +194,6 @@
       case Scalar::MaxTypedArrayViewType:
         MOZ_CRASH("unexpected array type");
     }
-
     add(lir, ins);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/MacroAssembler-x64.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/MacroAssembler-x64.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/MacroAssembler-x64.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/MacroAssembler-x64.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -44,7 +44,7 @@
     // instructions which reference them. This allows the instructions to use
     // PC-relative addressing. Use "jump" label support code, because we need
     // the same PC-relative address patching that jumps use.
-    JmpSrc j = masm.vmovsd_ripr(dest.code());
+    JmpSrc j = masm.vmovsd_ripr(dest.encoding());
     JmpSrc prev = JmpSrc(dbl.uses.use(j.offset()));
     masm.setNextJump(j, prev);
 }
@@ -74,7 +74,7 @@
     MOZ_ASSERT(!flt.uses.bound());
 
     // See comment in loadConstantDouble
-    JmpSrc j = masm.vmovss_ripr(dest.code());
+    JmpSrc j = masm.vmovss_ripr(dest.encoding());
     JmpSrc prev = JmpSrc(flt.uses.use(j.offset()));
     masm.setNextJump(j, prev);
 }
@@ -115,7 +115,7 @@
     MOZ_ASSERT(!val->uses.bound());
     MOZ_ASSERT(val->type() == SimdConstant::Int32x4);
 
-    JmpSrc j = masm.vmovdqa_ripr(dest.code());
+    JmpSrc j = masm.vmovdqa_ripr(dest.encoding());
     JmpSrc prev = JmpSrc(val->uses.use(j.offset()));
     masm.setNextJump(j, prev);
 }
@@ -134,7 +134,7 @@
     MOZ_ASSERT(!val->uses.bound());
     MOZ_ASSERT(val->type() == SimdConstant::Float32x4);
 
-    JmpSrc j = masm.vmovaps_ripr(dest.code());
+    JmpSrc j = masm.vmovaps_ripr(dest.encoding());
     JmpSrc prev = JmpSrc(val->uses.use(j.offset()));
     masm.setNextJump(j, prev);
 }
@@ -213,6 +213,9 @@
       case MoveOp::DOUBLE: {
         FloatRegister dest;
         if (GetFloatArgReg(passedIntArgs_, passedFloatArgs_++, &dest)) {
+            // Convert to the right type of register.
+            if (type == MoveOp::FLOAT32)
+                dest = dest.asSingle();
             if (from.isFloatReg() && from.floatReg() == dest) {
                 // Nothing to do; the value is in the right register already
                 return;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/MacroAssembler-x64.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/MacroAssembler-x64.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/MacroAssembler-x64.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/MacroAssembler-x64.h	2015-02-28 15:03:05.000000000 +0000
@@ -977,6 +977,12 @@
         branchTestNull(cond, Operand(address), label);
     }
 
+    // This one, though, clobbers the ScratchReg.
+    void branchTestObject(Condition cond, const Address &src, Label *label) {
+        cond = testObject(cond, src);
+        j(cond, label);
+    }
+
     // Perform a type-test on a full Value loaded into a register.
     // Clobbers the ScratchReg.
     void branchTestUndefined(Condition cond, const ValueOperand &src, Label *label) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Trampoline-x64.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Trampoline-x64.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x64/Trampoline-x64.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x64/Trampoline-x64.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -509,7 +509,25 @@
 PushBailoutFrame(MacroAssembler &masm, Register spArg)
 {
     // Push registers such that we can access them from [base + code].
-    masm.PushRegsInMask(AllRegs);
+    if (JitSupportsSimd()) {
+        masm.PushRegsInMask(AllRegs);
+    } else {
+        // When SIMD isn't supported, PushRegsInMask reduces the set of float
+        // registers to be double-sized, while the RegisterDump expects each of
+        // the float registers to have the maximal possible size
+        // (Simd128DataSize). To work around this, we just spill the double
+        // registers by hand here, using the register dump offset directly.
+        RegisterSet set = AllRegs;
+        for (GeneralRegisterBackwardIterator iter(set.gprs()); iter.more(); iter++)
+            masm.Push(*iter);
+
+        masm.reserveStack(sizeof(RegisterDump::FPUArray));
+        for (FloatRegisterBackwardIterator iter(set.fpus()); iter.more(); iter++) {
+            FloatRegister reg = *iter;
+            Address spillAddress(StackPointer, reg.getRegisterDumpOffsetInBytes());
+            masm.storeDouble(reg, spillAddress);
+        }
+    }
 
     // Get the stack pointer into a register, pre-alignment.
     masm.movq(rsp, spArg);
@@ -539,8 +557,7 @@
     //     [bailoutFrame]
     //
     // Remove both the bailout frame and the topmost Ion frame's stack.
-    static const uint32_t BailoutDataSize = sizeof(void *) * Registers::Total +
-                                            sizeof(double) * FloatRegisters::Total;
+    static const uint32_t BailoutDataSize = sizeof(RegisterDump);
     masm.addq(Imm32(BailoutDataSize), rsp);
     masm.pop(rcx);
     masm.lea(Operand(rsp, rcx, TimesOne, sizeof(void *)), rsp);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Architecture-x86.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Architecture-x86.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Architecture-x86.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Architecture-x86.h	2015-02-28 15:03:05.000000000 +0000
@@ -36,6 +36,13 @@
 class Registers {
   public:
     typedef X86Encoding::RegisterID Code;
+    typedef X86Encoding::RegisterID Encoding;
+
+    // Content spilled during bailouts.
+    union RegisterContent {
+        uintptr_t r;
+    };
+
     typedef uint8_t SetType;
     static uint32_t SetSize(SetType x) {
         static_assert(sizeof(SetType) == 1, "SetType must be 8 bits");
@@ -66,46 +73,46 @@
     static const uint32_t TotalPhys = 8;
     static const uint32_t Allocatable = 7;
 
-    static const uint32_t AllMask = (1 << Total) - 1;
+    static const SetType AllMask = (1 << Total) - 1;
 
-    static const uint32_t ArgRegMask = 0;
+    static const SetType ArgRegMask = 0;
 
-    static const uint32_t VolatileMask =
+    static const SetType VolatileMask =
         (1 << X86Encoding::rax) |
         (1 << X86Encoding::rcx) |
         (1 << X86Encoding::rdx);
 
-    static const uint32_t NonVolatileMask =
+    static const SetType NonVolatileMask =
         (1 << X86Encoding::rbx) |
         (1 << X86Encoding::rsi) |
         (1 << X86Encoding::rdi) |
         (1 << X86Encoding::rbp);
 
-    static const uint32_t WrapperMask =
+    static const SetType WrapperMask =
         VolatileMask |
         (1 << X86Encoding::rbx);
 
-    static const uint32_t SingleByteRegs =
+    static const SetType SingleByteRegs =
         (1 << X86Encoding::rax) |
         (1 << X86Encoding::rcx) |
         (1 << X86Encoding::rdx) |
         (1 << X86Encoding::rbx);
 
-    static const uint32_t NonAllocatableMask =
+    static const SetType NonAllocatableMask =
         (1 << X86Encoding::rsp);
 
-    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
 
     // Registers that can be allocated without being saved, generally.
-    static const uint32_t TempMask = VolatileMask & ~NonAllocatableMask;
+    static const SetType TempMask = VolatileMask & ~NonAllocatableMask;
 
     // Registers returned from a JS -> JS call.
-    static const uint32_t JSCallMask =
+    static const SetType JSCallMask =
         (1 << X86Encoding::rcx) |
         (1 << X86Encoding::rdx);
 
     // Registers returned from a JS -> C call.
-    static const uint32_t CallMask =
+    static const SetType CallMask =
         (1 << X86Encoding::rax);
 };
 
@@ -114,37 +121,69 @@
 
 class FloatRegisters {
   public:
-    typedef X86Encoding::XMMRegisterID Code;
-    typedef uint32_t SetType;
-    static const char *GetName(Code code) {
+    typedef X86Encoding::XMMRegisterID Encoding;
+
+    enum ContentType {
+        Single,
+        Double,
+        Int32x4,
+        Float32x4,
+        NumTypes
+    };
+
+    // Content spilled during bailouts.
+    union RegisterContent {
+        float s;
+        double d;
+        int32_t i4[4];
+        float s4[4];
+    };
+
+    static const char *GetName(Encoding code) {
         return X86Encoding::XMMRegName(code);
     }
 
-    static Code FromName(const char *name) {
+    static Encoding FromName(const char *name) {
         for (size_t i = 0; i < Total; i++) {
-            if (strcmp(GetName(Code(i)), name) == 0)
-                return Code(i);
+            if (strcmp(GetName(Encoding(i)), name) == 0)
+                return Encoding(i);
         }
         return Invalid;
     }
 
-    static const Code Invalid = X86Encoding::invalid_xmm;
+    static const Encoding Invalid = X86Encoding::invalid_xmm;
 
-    static const uint32_t Total = 8;
+    static const uint32_t Total = 8 * NumTypes;
     static const uint32_t TotalPhys = 8;
     static const uint32_t Allocatable = 7;
 
-    static const uint32_t AllMask = (1 << Total) - 1;
-    static const uint32_t AllDoubleMask = AllMask;
-    static const uint32_t VolatileMask = AllMask;
-    static const uint32_t NonVolatileMask = 0;
+    typedef uint32_t SetType;
+    static_assert(sizeof(SetType) * 8 >= Total,
+                  "SetType should be large enough to enumerate all registers.");
+
+    // Magic values which are used to duplicate a mask of physical register for
+    // a specific type of register. A multiplication is used to copy and shift
+    // the bits of the physical register mask.
+    static const SetType SpreadSingle = SetType(1) << (uint32_t(Single) * TotalPhys);
+    static const SetType SpreadDouble = SetType(1) << (uint32_t(Double) * TotalPhys);
+    static const SetType SpreadInt32x4 = SetType(1) << (uint32_t(Int32x4) * TotalPhys);
+    static const SetType SpreadFloat32x4 = SetType(1) << (uint32_t(Float32x4) * TotalPhys);
+    static const SetType SpreadScalar = SpreadSingle | SpreadDouble;
+    static const SetType SpreadVector = SpreadInt32x4 | SpreadFloat32x4;
+    static const SetType Spread = SpreadScalar | SpreadVector;
+
+    static const SetType AllPhysMask = ((1 << TotalPhys) - 1);
+    static const SetType AllMask = AllPhysMask * Spread;
+    static const SetType AllDoubleMask = AllPhysMask * SpreadDouble;
+    static const SetType VolatileMask = AllMask;
+    static const SetType NonVolatileMask = 0;
 
-    static const uint32_t WrapperMask = VolatileMask;
+    static const SetType WrapperMask = VolatileMask;
 
-    static const uint32_t NonAllocatableMask =
-        (1 << X86Encoding::xmm7);     // This is ScratchDoubleReg.
+    static const SetType NonAllocatableMask =
+        Spread * (1 << X86Encoding::xmm7);     // This is ScratchDoubleReg.
 
-    static const uint32_t AllocatableMask = AllMask & ~NonAllocatableMask;
+    static const SetType AllocatableMask = AllMask & ~NonAllocatableMask;
 };
 
 template <typename T>
@@ -152,10 +191,21 @@
 
 struct FloatRegister {
     typedef FloatRegisters Codes;
-    typedef Codes::Code Code;
+    typedef size_t Code;
+    typedef Codes::Encoding Encoding;
     typedef Codes::SetType SetType;
     static uint32_t SetSize(SetType x) {
         static_assert(sizeof(SetType) == 4, "SetType must be 32 bits");
+        // Count the number of non-aliased registers, for the moment.
+        //
+        // Copy the set bits of each typed register to the low part of the of
+        // the Set, and count the number of registers. This is made to avoid
+        // registers which are allocated twice with different types (such as in
+        // AllMask).
+        x |= x >> (2 * Codes::TotalPhys);
+        x |= x >> Codes::TotalPhys;
+        x &= Codes::AllPhysMask;
+        static_assert(Codes::AllPhysMask <= 0xffff, "We can safely use CountPopulation32");
         return mozilla::CountPopulation32(x);
     }
     static uint32_t FirstBit(SetType x) {
@@ -164,61 +214,101 @@
     static uint32_t LastBit(SetType x) {
         return 31 - mozilla::CountLeadingZeroes32(x);
     }
-    Code code_;
+
+  private:
+    // Note: These fields are using one extra bit to make the invalid enumerated
+    // values fit, and thus prevent a warning.
+    Codes::Encoding reg_ : 4;
+    Codes::ContentType type_ : 3;
+    bool isInvalid_ : 1;
+
+    // Constants used for exporting/importing the float register code.
+    static const size_t RegSize = 3;
+    static const size_t RegMask = (1 << RegSize) - 1;
+
+  public:
+    MOZ_CONSTEXPR FloatRegister()
+        : reg_(Codes::Encoding(0)), type_(Codes::Single), isInvalid_(true)
+    { }
+    MOZ_CONSTEXPR FloatRegister(uint32_t r, Codes::ContentType k)
+        : reg_(Codes::Encoding(r)), type_(k), isInvalid_(false)
+    { }
 
     static FloatRegister FromCode(uint32_t i) {
-        MOZ_ASSERT(i < FloatRegisters::Total);
-        FloatRegister r = { (FloatRegisters::Code)i };
-        return r;
+        MOZ_ASSERT(i < Codes::Total);
+        return FloatRegister(i & RegMask, Codes::ContentType(i >> RegSize));
     }
-    Code code() const {
-        MOZ_ASSERT((uint32_t)code_ < FloatRegisters::Total);
-        return code_;
+
+    bool isSingle() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Single; }
+    bool isDouble() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Double; }
+    bool isInt32x4() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Int32x4; }
+    bool isFloat32x4() const { MOZ_ASSERT(!isInvalid()); return type_ == Codes::Float32x4; }
+    bool isInvalid() const { return isInvalid_; }
+
+    FloatRegister asSingle() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Single); }
+    FloatRegister asDouble() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Double); }
+    FloatRegister asInt32x4() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Int32x4); }
+    FloatRegister asFloat32x4() const { MOZ_ASSERT(!isInvalid()); return FloatRegister(reg_, Codes::Float32x4); }
+
+    uint32_t size() const {
+        MOZ_ASSERT(!isInvalid());
+        if (isSingle())
+            return sizeof(float);
+        if (isDouble())
+            return sizeof(double);
+        MOZ_ASSERT(isInt32x4() || isFloat32x4());
+        return 4 * sizeof(int32_t);
     }
-    const char *name() const {
-        return FloatRegisters::GetName(code());
+
+    Code code() const {
+        MOZ_ASSERT(!isInvalid());
+        MOZ_ASSERT(uint32_t(reg_) < Codes::TotalPhys);
+        // :TODO: ARM is doing the same thing, but we should avoid this, except
+        // that the RegisterSets depends on this.
+        return Code(reg_ | (type_ << RegSize));
+    }
+    Encoding encoding() const {
+        MOZ_ASSERT(!isInvalid());
+        MOZ_ASSERT(uint32_t(reg_) < Codes::TotalPhys);
+        return reg_;
     }
+    // defined in Assembler-x86-shared.cpp
+    const char *name() const;
     bool volatile_() const {
-        return !!((1 << code()) & FloatRegisters::VolatileMask);
+        return !!((SetType(1) << code()) & FloatRegisters::VolatileMask);
     }
     bool operator !=(FloatRegister other) const {
-        return other.code_ != code_;
+        return other.reg_ != reg_ || other.type_ != type_;
     }
     bool operator ==(FloatRegister other) const {
-        return other.code_ == code_;
+        return other.reg_ == reg_ && other.type_ == type_;
     }
     bool aliases(FloatRegister other) const {
-        return other.code_ == code_;
+        return other.reg_ == reg_;
     }
-    uint32_t numAliased() const {
-        return 1;
-    }
-    // N.B. FloatRegister is an explicit outparam here because msvc-2010
-    // miscompiled it on win64 when the value was simply returned
-    void aliased(uint32_t aliasIdx, FloatRegister *ret) {
-        MOZ_ASSERT(aliasIdx == 0);
-        *ret = *this;
-    }
-    // This function mostly exists for the ARM backend.  It is to ensure that two
-    // floating point registers' types are equivalent.  e.g. S0 is not equivalent
-    // to D16, since S0 holds a float32, and D16 holds a Double.
-    // Since all floating point registers on x86 and x64 are equivalent, it is
-    // reasonable for this function to do the same.
+    // Check if two floating point registers have the same type.
     bool equiv(FloatRegister other) const {
-        return true;
+        return other.type_ == type_;
     }
-    uint32_t size() const {
-        return sizeof(double);
+
+    uint32_t numAliased() const {
+        return Codes::NumTypes;
     }
     uint32_t numAlignedAliased() const {
-        return 1;
+        return numAliased();
+    }
+
+    // N.B. FloatRegister is an explicit outparam here because msvc-2010
+    // miscompiled it on win64 when the value was simply returned
+    void aliased(uint32_t aliasIdx, FloatRegister *ret) const {
+        MOZ_ASSERT(aliasIdx < Codes::NumTypes);
+        *ret = FloatRegister(reg_, Codes::ContentType((aliasIdx + type_) % Codes::NumTypes));
     }
-    void alignedAliased(uint32_t aliasIdx, FloatRegister *ret) {
-        MOZ_ASSERT(aliasIdx == 0);
-        *ret = *this;
+    void alignedAliased(uint32_t aliasIdx, FloatRegister *ret) const {
+        aliased(aliasIdx, ret);
     }
+
     static TypedRegisterSet<FloatRegister> ReduceSetForPush(const TypedRegisterSet<FloatRegister> &s);
-    static uint32_t GetSizeInBytes(const TypedRegisterSet<FloatRegister> &s);
     static uint32_t GetPushSizeInBytes(const TypedRegisterSet<FloatRegister> &s);
     uint32_t getRegisterDumpOffsetInBytes();
 };
@@ -239,6 +329,11 @@
     return false;
 }
 
+// Support some constant-offset addressing.
+// See the comments above AsmJSMappedSize in AsmJSValidate.h for more info.
+static const size_t AsmJSCheckedImmediateRange = 4096;
+static const size_t AsmJSImmediateRange = UINT32_C(0x80000000);
+
 } // namespace jit
 } // namespace js
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Assembler-x86.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Assembler-x86.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Assembler-x86.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Assembler-x86.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -102,25 +102,42 @@
     }
 }
 
-uint32_t
-FloatRegister::GetSizeInBytes(const FloatRegisterSet &s)
-{
-    uint32_t ret = s.size() * sizeof(double);
-    return ret;
-}
-
 FloatRegisterSet
 FloatRegister::ReduceSetForPush(const FloatRegisterSet &s)
 {
-    return s;
+    if (JitSupportsSimd())
+        return s;
+
+    // Ignore all SIMD register.
+    return FloatRegisterSet(s.bits() & (Codes::AllPhysMask * Codes::SpreadScalar));
 }
 uint32_t
 FloatRegister::GetPushSizeInBytes(const FloatRegisterSet &s)
 {
-    return s.size() * sizeof(double);
+    SetType all = s.bits();
+    SetType float32x4Set =
+        (all >> (uint32_t(Codes::Float32x4) * Codes::TotalPhys)) & Codes::AllPhysMask;
+    SetType int32x4Set =
+        (all >> (uint32_t(Codes::Int32x4) * Codes::TotalPhys)) & Codes::AllPhysMask;
+    SetType doubleSet =
+        (all >> (uint32_t(Codes::Double) * Codes::TotalPhys)) & Codes::AllPhysMask;
+    SetType singleSet =
+        (all >> (uint32_t(Codes::Single) * Codes::TotalPhys)) & Codes::AllPhysMask;
+
+    // PushRegsInMask pushes the largest register first, and thus avoids pushing
+    // aliased registers. So we have to filter out the physical registers which
+    // are already pushed as part of larger registers.
+    SetType set128b = int32x4Set | float32x4Set;
+    SetType set64b = doubleSet & ~set128b;
+    SetType set32b = singleSet & ~set64b  & ~set128b;
+
+    static_assert(Codes::AllPhysMask <= 0xffff, "We can safely use CountPopulation32");
+    return mozilla::CountPopulation32(set128b) * (4 * sizeof(int32_t))
+        + mozilla::CountPopulation32(set64b) * sizeof(double)
+        + mozilla::CountPopulation32(set32b) * sizeof(float);
 }
 uint32_t
 FloatRegister::getRegisterDumpOffsetInBytes()
 {
-    return code() * sizeof(double);
+    return uint32_t(encoding()) * sizeof(FloatRegisters::RegisterContent);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Assembler-x86.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Assembler-x86.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Assembler-x86.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Assembler-x86.h	2015-02-28 15:03:05.000000000 +0000
@@ -27,28 +27,29 @@
 static MOZ_CONSTEXPR_VAR Register esi = { X86Encoding::rsi };
 static MOZ_CONSTEXPR_VAR Register edi = { X86Encoding::rdi };
 
-static MOZ_CONSTEXPR_VAR FloatRegister xmm0 = { X86Encoding::xmm0 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm1 = { X86Encoding::xmm1 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm2 = { X86Encoding::xmm2 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm3 = { X86Encoding::xmm3 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm4 = { X86Encoding::xmm4 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm5 = { X86Encoding::xmm5 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm6 = { X86Encoding::xmm6 };
-static MOZ_CONSTEXPR_VAR FloatRegister xmm7 = { X86Encoding::xmm7 };
+static MOZ_CONSTEXPR_VAR FloatRegister xmm0 = FloatRegister(X86Encoding::xmm0, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm1 = FloatRegister(X86Encoding::xmm1, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm2 = FloatRegister(X86Encoding::xmm2, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm3 = FloatRegister(X86Encoding::xmm3, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm4 = FloatRegister(X86Encoding::xmm4, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm5 = FloatRegister(X86Encoding::xmm5, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm6 = FloatRegister(X86Encoding::xmm6, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister xmm7 = FloatRegister(X86Encoding::xmm7, FloatRegisters::Double);
 
 static MOZ_CONSTEXPR_VAR Register InvalidReg = { X86Encoding::invalid_reg };
-static MOZ_CONSTEXPR_VAR FloatRegister InvalidFloatReg = { X86Encoding::invalid_xmm };
+static MOZ_CONSTEXPR_VAR FloatRegister InvalidFloatReg = FloatRegister();
 
 static MOZ_CONSTEXPR_VAR Register JSReturnReg_Type = ecx;
 static MOZ_CONSTEXPR_VAR Register JSReturnReg_Data = edx;
 static MOZ_CONSTEXPR_VAR Register StackPointer = esp;
 static MOZ_CONSTEXPR_VAR Register FramePointer = ebp;
 static MOZ_CONSTEXPR_VAR Register ReturnReg = eax;
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32Reg = xmm0;
-static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloat32Reg = xmm7;
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnDoubleReg = xmm0;
-static MOZ_CONSTEXPR_VAR FloatRegister ScratchDoubleReg = xmm7;
-static MOZ_CONSTEXPR_VAR FloatRegister ReturnSimdReg = xmm0;
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32Reg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Single);
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnDoubleReg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Double);
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnInt32x4Reg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Int32x4);
+static MOZ_CONSTEXPR_VAR FloatRegister ReturnFloat32x4Reg = FloatRegister(X86Encoding::xmm0, FloatRegisters::Float32x4);
+static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloat32Reg = FloatRegister(X86Encoding::xmm7, FloatRegisters::Single);
+static MOZ_CONSTEXPR_VAR FloatRegister ScratchDoubleReg = FloatRegister(X86Encoding::xmm7, FloatRegisters::Double);
 static MOZ_CONSTEXPR_VAR FloatRegister ScratchSimdReg = xmm7;
 
 // Avoid ebp, which is the FramePointer, which is unavailable in some modes.
@@ -442,98 +443,278 @@
     }
 
     // Load from *(base + disp32) where disp32 can be patched.
-    CodeOffsetLabel movsblWithPatch(Address src, Register dest) {
-        masm.movsbl_mr_disp32(src.offset, src.base.code(), dest.code());
+    CodeOffsetLabel movsblWithPatch(const Operand &src, Register dest) {
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movsbl_mr_disp32(src.disp(), src.base(), dest.code());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movsbl_mr(src.address(), dest.code());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel movzblWithPatch(Address src, Register dest) {
-        masm.movzbl_mr_disp32(src.offset, src.base.code(), dest.code());
+    CodeOffsetLabel movzblWithPatch(const Operand &src, Register dest) {
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movzbl_mr_disp32(src.disp(), src.base(), dest.code());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movzbl_mr(src.address(), dest.code());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel movswlWithPatch(Address src, Register dest) {
-        masm.movswl_mr_disp32(src.offset, src.base.code(), dest.code());
+    CodeOffsetLabel movswlWithPatch(const Operand &src, Register dest) {
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movswl_mr_disp32(src.disp(), src.base(), dest.code());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movswl_mr(src.address(), dest.code());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel movzwlWithPatch(Address src, Register dest) {
-        masm.movzwl_mr_disp32(src.offset, src.base.code(), dest.code());
+    CodeOffsetLabel movzwlWithPatch(const Operand &src, Register dest) {
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movzwl_mr_disp32(src.disp(), src.base(), dest.code());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movzwl_mr(src.address(), dest.code());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel movlWithPatch(Address src, Register dest) {
-        masm.movl_mr_disp32(src.offset, src.base.code(), dest.code());
+    CodeOffsetLabel movlWithPatch(const Operand &src, Register dest) {
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movl_mr_disp32(src.disp(), src.base(), dest.code());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movl_mr(src.address(), dest.code());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovssWithPatch(Address src, FloatRegister dest) {
+    CodeOffsetLabel vmovssWithPatch(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovss_mr_disp32(src.offset, src.base.code(), dest.code());
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovss_mr_disp32(src.disp(), src.base(), dest.encoding());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovss_mr(src.address(), dest.encoding());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovdWithPatch(Address src, FloatRegister dest) {
+    CodeOffsetLabel vmovdWithPatch(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovd_mr_disp32(src.offset, src.base.code(), dest.code());
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovd_mr_disp32(src.disp(), src.base(), dest.encoding());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovd_mr(src.address(), dest.encoding());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovqWithPatch(Address src, FloatRegister dest) {
+    CodeOffsetLabel vmovqWithPatch(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovq_mr_disp32(src.offset, src.base.code(), dest.code());
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovq_mr_disp32(src.disp(), src.base(), dest.encoding());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovq_mr(src.address(), dest.encoding());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovsdWithPatch(Address src, FloatRegister dest) {
+    CodeOffsetLabel vmovsdWithPatch(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovsd_mr_disp32(src.offset, src.base.code(), dest.code());
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovsd_mr_disp32(src.disp(), src.base(), dest.encoding());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovsd_mr(src.address(), dest.encoding());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovupsWithPatch(Address src, FloatRegister dest) {
+    CodeOffsetLabel vmovupsWithPatch(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovups_mr_disp32(src.offset, src.base.code(), dest.code());
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovups_mr_disp32(src.disp(), src.base(), dest.encoding());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovups_mr(src.address(), dest.encoding());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovdquWithPatch(Address src, FloatRegister dest) {
+    CodeOffsetLabel vmovdquWithPatch(const Operand &src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovdqu_mr_disp32(src.offset, src.base.code(), dest.code());
+        switch (src.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovdqu_mr_disp32(src.disp(), src.base(), dest.encoding());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovdqu_mr(src.address(), dest.encoding());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
 
     // Store to *(base + disp32) where disp32 can be patched.
-    CodeOffsetLabel movbWithPatch(Register src, Address dest) {
-        masm.movb_rm_disp32(src.code(), dest.offset, dest.base.code());
+    CodeOffsetLabel movbWithPatch(Register src, const Operand &dest) {
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movb_rm_disp32(src.code(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movb_rm(src.code(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel movwWithPatch(Register src, Address dest) {
-        masm.movw_rm_disp32(src.code(), dest.offset, dest.base.code());
+    CodeOffsetLabel movwWithPatch(Register src, const Operand &dest) {
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movw_rm_disp32(src.code(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movw_rm(src.code(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel movlWithPatch(Register src, Address dest) {
-        masm.movl_rm_disp32(src.code(), dest.offset, dest.base.code());
+    CodeOffsetLabel movlWithPatch(Register src, const Operand &dest) {
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.movl_rm_disp32(src.code(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.movl_rm(src.code(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovdWithPatch(FloatRegister src, Address dest) {
+    CodeOffsetLabel vmovdWithPatch(FloatRegister src, const Operand &dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovd_rm_disp32(src.code(), dest.offset, dest.base.code());
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovd_rm_disp32(src.encoding(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovd_rm(src.encoding(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovqWithPatch(FloatRegister src, Address dest) {
+    CodeOffsetLabel vmovqWithPatch(FloatRegister src, const Operand &dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovq_rm_disp32(src.code(), dest.offset, dest.base.code());
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovq_rm_disp32(src.encoding(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovq_rm(src.encoding(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovssWithPatch(FloatRegister src, Address dest) {
+    CodeOffsetLabel vmovssWithPatch(FloatRegister src, const Operand &dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovss_rm_disp32(src.code(), dest.offset, dest.base.code());
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovss_rm_disp32(src.encoding(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovss_rm(src.encoding(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovsdWithPatch(FloatRegister src, Address dest) {
+    CodeOffsetLabel vmovsdWithPatch(FloatRegister src, const Operand &dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovsd_rm_disp32(src.code(), dest.offset, dest.base.code());
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovsd_rm_disp32(src.encoding(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovsd_rm(src.encoding(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovupsWithPatch(FloatRegister src, Address dest) {
+    CodeOffsetLabel vmovupsWithPatch(FloatRegister src, const Operand &dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovups_rm_disp32(src.code(), dest.offset, dest.base.code());
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovups_rm_disp32(src.encoding(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovups_rm(src.encoding(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
-    CodeOffsetLabel vmovdquWithPatch(FloatRegister src, Address dest) {
+    CodeOffsetLabel vmovdquWithPatch(FloatRegister src, const Operand &dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovdqu_rm_disp32(src.code(), dest.offset, dest.base.code());
+        switch (dest.kind()) {
+          case Operand::MEM_REG_DISP:
+            masm.vmovdqu_rm_disp32(src.encoding(), dest.disp(), dest.base());
+            break;
+          case Operand::MEM_ADDRESS32:
+            masm.vmovdqu_rm(src.encoding(), dest.address());
+            break;
+          default:
+            MOZ_CRASH("unexpected operand kind");
+        }
         return CodeOffsetLabel(masm.currentOffset());
     }
 
@@ -568,42 +749,42 @@
     }
     CodeOffsetLabel vmovssWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovss_mr(src.addr, dest.code());
+        masm.vmovss_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovdWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovd_mr(src.addr, dest.code());
+        masm.vmovd_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovqWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovq_mr(src.addr, dest.code());
+        masm.vmovq_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovsdWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovsd_mr(src.addr, dest.code());
+        masm.vmovsd_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovdqaWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovdqa_mr(src.addr, dest.code());
+        masm.vmovdqa_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovdquWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovdqu_mr(src.addr, dest.code());
+        masm.vmovdqu_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovapsWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovaps_mr(src.addr, dest.code());
+        masm.vmovaps_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovupsWithPatch(PatchedAbsoluteAddress src, FloatRegister dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovups_mr(src.addr, dest.code());
+        masm.vmovups_mr(src.addr, dest.encoding());
         return CodeOffsetLabel(masm.currentOffset());
     }
 
@@ -622,42 +803,42 @@
     }
     CodeOffsetLabel vmovssWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovss_rm(src.code(), dest.addr);
+        masm.vmovss_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovdWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovd_rm(src.code(), dest.addr);
+        masm.vmovd_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovqWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovq_rm(src.code(), dest.addr);
+        masm.vmovq_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovsdWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovsd_rm(src.code(), dest.addr);
+        masm.vmovsd_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovdqaWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovdqa_rm(src.code(), dest.addr);
+        masm.vmovdqa_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovapsWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovaps_rm(src.code(), dest.addr);
+        masm.vmovaps_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovdquWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovdqu_rm(src.code(), dest.addr);
+        masm.vmovdqu_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
     CodeOffsetLabel vmovupsWithPatch(FloatRegister src, PatchedAbsoluteAddress dest) {
         MOZ_ASSERT(HasSSE2());
-        masm.vmovups_rm(src.code(), dest.addr);
+        masm.vmovups_rm(src.encoding(), dest.addr);
         return CodeOffsetLabel(masm.currentOffset());
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Bailouts-x86.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Bailouts-x86.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Bailouts-x86.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Bailouts-x86.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -23,8 +23,8 @@
 class BailoutStack
 {
     uintptr_t frameClassId_;
-    mozilla::Array<double, FloatRegisters::Total> fpregs_;
-    mozilla::Array<uintptr_t, Registers::Total> regs_;
+    RegisterDump::FPUArray fpregs_;
+    RegisterDump::GPRArray regs_;
     union {
         uintptr_t frameSize_;
         uintptr_t tableOffset_;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/CodeGenerator-x86.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -255,11 +255,10 @@
     masm.convertUInt32ToFloat32(temp, output);
 }
 
-template<typename T>
 void
-CodeGeneratorX86::load(Scalar::Type vt, const T &srcAddr, const LDefinition *out)
+CodeGeneratorX86::load(Scalar::Type accessType, const Operand &srcAddr, const LDefinition *out)
 {
-    switch (vt) {
+    switch (accessType) {
       case Scalar::Int8:         masm.movsblWithPatch(srcAddr, ToRegister(out)); break;
       case Scalar::Uint8Clamped:
       case Scalar::Uint8:        masm.movzblWithPatch(srcAddr, ToRegister(out)); break;
@@ -275,23 +274,12 @@
     }
 }
 
-template<typename T>
-void
-CodeGeneratorX86::loadAndNoteViewTypeElement(Scalar::Type vt, const T &srcAddr,
-                                             const LDefinition *out)
-{
-    uint32_t before = masm.size();
-    load(vt, srcAddr, out);
-    uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, vt, ToAnyRegister(out)));
-}
-
 void
 CodeGeneratorX86::visitLoadTypedArrayElementStatic(LLoadTypedArrayElementStatic *ins)
 {
     const MLoadTypedArrayElementStatic *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
-    MOZ_ASSERT_IF(vt == Scalar::Float32, mir->type() == MIRType_Float32);
+    Scalar::Type accessType = mir->accessType();
+    MOZ_ASSERT_IF(accessType == Scalar::Float32, mir->type() == MIRType_Float32);
 
     Register ptr = ToRegister(ins->ptr());
     const LDefinition *out = ins->output();
@@ -301,7 +289,7 @@
     if (mir->needsBoundsCheck()) {
         MOZ_ASSERT(offset == 0);
         if (!mir->fallible()) {
-            ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), vt);
+            ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), accessType);
             addOutOfLineCode(ool, ins->mir());
         }
 
@@ -312,11 +300,11 @@
             bailoutIf(Assembler::AboveOrEqual, ins->snapshot());
     }
 
-    Address srcAddr(ptr, int32_t(mir->base()) + int32_t(offset));
-    load(vt, srcAddr, out);
-    if (vt == Scalar::Float64)
+    Operand srcAddr(ptr, int32_t(mir->base()) + int32_t(offset));
+    load(accessType, srcAddr, out);
+    if (accessType == Scalar::Float64)
         masm.canonicalizeDouble(ToFloatRegister(out));
-    if (vt == Scalar::Float32)
+    if (accessType == Scalar::Float32)
         masm.canonicalizeFloat(ToFloatRegister(out));
     if (ool)
         masm.bind(ool->rejoin());
@@ -354,9 +342,9 @@
         masm.storeLoadFence();
 }
 
-template<typename T>
 void
-CodeGeneratorX86::loadSimd(Scalar::Type type, unsigned numElems, T srcAddr, FloatRegister out)
+CodeGeneratorX86::loadSimd(Scalar::Type type, unsigned numElems, const Operand &srcAddr,
+                           FloatRegister out)
 {
     switch (type) {
       case Scalar::Float32x4: {
@@ -374,7 +362,7 @@
         switch (numElems) {
           // In memory-to-register mode, movd zeroes out the high lanes.
           case 1: masm.vmovdWithPatch(srcAddr, out); break;
-          // See comment above, which also applies to movsd.
+          // See comment above, which also applies to movq.
           case 2: masm.vmovqWithPatch(srcAddr, out); break;
           case 4: masm.vmovdquWithPatch(srcAddr, out); break;
           default: MOZ_CRASH("unexpected size for partial load");
@@ -396,77 +384,55 @@
 }
 
 void
-CodeGeneratorX86::emitSimdLoad(Scalar::Type type, unsigned numElems, const LAllocation *ptr,
-                               FloatRegister out, bool needsBoundsCheck /* = false */,
-                               Label *oobLabel /* = nullptr */)
-{
-    if (ptr->isConstant()) {
-        MOZ_ASSERT(!needsBoundsCheck);
-
-        if (numElems == 3) {
-            MOZ_ASSERT(type == Scalar::Int32x4 || type == Scalar::Float32x4);
-
-            // Load XY
-            emitSimdLoad(type, 2, ptr, out);
-
-            // Load Z (W is zeroed)
-            // This add won't overflow, as we've checked that we have at least
-            // room for loading 4 elements during asm.js validation.
-            PatchedAbsoluteAddress srcAddr((void *) (ptr->toConstant()->toInt32() + 2 * sizeof(float)));
-            uint32_t before = masm.size();
-            loadSimd(type, 1, srcAddr, ScratchSimdReg);
-            uint32_t after = masm.size();
-            masm.append(AsmJSHeapAccess(before, after, 1, type));
-
-            // Move ZW atop XY
-            masm.vmovlhps(ScratchSimdReg, out, out);
-            return;
-        }
-
-        PatchedAbsoluteAddress srcAddr((void *) ptr->toConstant()->toInt32());
-        uint32_t before = masm.size();
-        loadSimd(type, numElems, srcAddr, out);
-        uint32_t after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, numElems, type));
-        return;
-    }
+CodeGeneratorX86::emitSimdLoad(LAsmJSLoadHeap *ins)
+{
+    const MAsmJSLoadHeap *mir = ins->mir();
+    Scalar::Type type = mir->accessType();
+    FloatRegister out = ToFloatRegister(ins->output());
+    const LAllocation *ptr = ins->ptr();
+    Operand srcAddr = ptr->isBogus()
+                      ? Operand(PatchedAbsoluteAddress(mir->offset()))
+                      : Operand(ToRegister(ptr), mir->offset());
 
-    Register ptrReg = ToRegister(ptr);
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
-    if (needsBoundsCheck) {
-        maybeCmpOffset = masm.cmp32WithPatch(ptrReg, Imm32(0)).offset();
-        masm.j(Assembler::AboveOrEqual, oobLabel); // Throws RangeError
-    }
+    if (gen->needsAsmJSBoundsCheckBranch(mir))
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr),
+                                                    gen->outOfBoundsLabel());
 
-    uint32_t before = masm.size();
+    unsigned numElems = mir->numSimdElems();
     if (numElems == 3) {
         MOZ_ASSERT(type == Scalar::Int32x4 || type == Scalar::Float32x4);
 
+        Operand srcAddrZ =
+            ptr->isBogus()
+            ? Operand(PatchedAbsoluteAddress(2 * sizeof(float) + mir->offset()))
+            : Operand(ToRegister(ptr), 2 * sizeof(float) + mir->offset());
+
         // Load XY
-        Address addr(ptrReg, 0);
-        before = masm.size();
-        loadSimd(type, 2, addr, out);
+        uint32_t before = masm.size();
+        loadSimd(type, 2, srcAddr, out);
         uint32_t after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, 3, type, maybeCmpOffset));
+        masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
 
         // Load Z (W is zeroed)
         // This is still in bounds, as we've checked with a manual bounds check
         // or we had enough space for sure when removing the bounds check.
-        Address shiftedAddr(ptrReg, 2 * sizeof(float));
         before = after;
-        loadSimd(type, 1, shiftedAddr, ScratchSimdReg);
+        loadSimd(type, 1, srcAddrZ, ScratchSimdReg);
         after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, 1, type));
+        masm.append(AsmJSHeapAccess(before, after));
 
         // Move ZW atop XY
         masm.vmovlhps(ScratchSimdReg, out, out);
-        return;
+    } else {
+        uint32_t before = masm.size();
+        loadSimd(type, numElems, srcAddr, out);
+        uint32_t after = masm.size();
+        masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
     }
 
-    Address addr(ptrReg, 0);
-    loadSimd(type, numElems, addr, out);
-    uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, numElems, type, maybeCmpOffset));
+    if (maybeCmpOffset != AsmJSHeapAccess::NoLengthCheck)
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
 }
 
 void
@@ -474,56 +440,40 @@
 {
     const MAsmJSLoadHeap *mir = ins->mir();
     Scalar::Type accessType = mir->accessType();
-    const LAllocation *ptr = ins->ptr();
-    const LDefinition *out = ins->output();
-
-    if (Scalar::isSimdType(accessType)) {
-        return emitSimdLoad(accessType, mir->numSimdElems(), ptr, ToFloatRegister(out),
-                            mir->needsBoundsCheck(), mir->outOfBoundsLabel());
-    }
 
-    memoryBarrier(ins->mir()->barrierBefore());
-
-    if (ptr->isConstant()) {
-        // The constant displacement still needs to be added to the as-yet-unknown
-        // base address of the heap. For now, embed the displacement as an
-        // immediate in the instruction. This displacement will fixed up when the
-        // base address is known during dynamic linking (AsmJSModule::initHeap).
-        PatchedAbsoluteAddress srcAddr((void *) ptr->toConstant()->toInt32());
-        loadAndNoteViewTypeElement(accessType, srcAddr, out);
-        memoryBarrier(ins->mir()->barrierAfter());
-        return;
-    }
+    if (Scalar::isSimdType(accessType))
+        return emitSimdLoad(ins);
 
-    Register ptrReg = ToRegister(ptr);
-    Address srcAddr(ptrReg, 0);
+    const LAllocation *ptr = ins->ptr();
+    const LDefinition *out = ins->output();
+    Operand srcAddr = ptr->isBogus()
+                      ? Operand(PatchedAbsoluteAddress(mir->offset()))
+                      : Operand(ToRegister(ptr), mir->offset());
 
-    if (!mir->needsBoundsCheck()) {
-        loadAndNoteViewTypeElement(accessType, srcAddr, out);
-        memoryBarrier(ins->mir()->barrierAfter());
-        return;
+    memoryBarrier(mir->barrierBefore());
+    OutOfLineLoadTypedArrayOutOfBounds *ool = nullptr;
+    uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
+    if (gen->needsAsmJSBoundsCheckBranch(mir)) {
+        ool = new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), accessType);
+        addOutOfLineCode(ool, mir);
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr), ool->entry());
     }
 
-    OutOfLineLoadTypedArrayOutOfBounds *ool =
-        new(alloc()) OutOfLineLoadTypedArrayOutOfBounds(ToAnyRegister(out), accessType);
-    CodeOffsetLabel cmp = masm.cmp32WithPatch(ptrReg, Imm32(0));
-    addOutOfLineCode(ool, mir);
-    masm.j(Assembler::AboveOrEqual, ool->entry());
-
     uint32_t before = masm.size();
     load(accessType, srcAddr, out);
     uint32_t after = masm.size();
-    if (ool)
+    if (ool) {
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
         masm.bind(ool->rejoin());
-    memoryBarrier(ins->mir()->barrierAfter());
-    masm.append(AsmJSHeapAccess(before, after, accessType, ToAnyRegister(out), cmp.offset()));
+    }
+    memoryBarrier(mir->barrierAfter());
+    masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
 }
 
-template<typename T>
 void
-CodeGeneratorX86::store(Scalar::Type vt, const LAllocation *value, const T &dstAddr)
+CodeGeneratorX86::store(Scalar::Type accessType, const LAllocation *value, const Operand &dstAddr)
 {
-    switch (vt) {
+    switch (accessType) {
       case Scalar::Int8:
       case Scalar::Uint8Clamped:
       case Scalar::Uint8:        masm.movbWithPatch(ToRegister(value), dstAddr); break;
@@ -539,29 +489,18 @@
     }
 }
 
-template<typename T>
-void
-CodeGeneratorX86::storeAndNoteViewTypeElement(Scalar::Type vt, const LAllocation *value,
-                                              const T &dstAddr)
-{
-    uint32_t before = masm.size();
-    store(vt, value, dstAddr);
-    uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, vt));
-}
-
 void
 CodeGeneratorX86::visitStoreTypedArrayElementStatic(LStoreTypedArrayElementStatic *ins)
 {
     MStoreTypedArrayElementStatic *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
+    Scalar::Type accessType = mir->accessType();
     Register ptr = ToRegister(ins->ptr());
     const LAllocation *value = ins->value();
     uint32_t offset = mir->offset();
 
     if (!mir->needsBoundsCheck()) {
-        Address dstAddr(ptr, int32_t(mir->base()) + int32_t(offset));
-        store(vt, value, dstAddr);
+        Operand dstAddr(ptr, int32_t(mir->base()) + int32_t(offset));
+        store(accessType, value, dstAddr);
         return;
     }
 
@@ -570,34 +509,34 @@
     Label rejoin;
     masm.j(Assembler::AboveOrEqual, &rejoin);
 
-    Address dstAddr(ptr, (int32_t) mir->base());
-    store(vt, value, dstAddr);
+    Operand dstAddr(ptr, (int32_t) mir->base());
+    store(accessType, value, dstAddr);
     masm.bind(&rejoin);
 }
 
-template<typename T>
 void
-CodeGeneratorX86::storeSimd(Scalar::Type type, unsigned numElems, FloatRegister in, T destAddr)
+CodeGeneratorX86::storeSimd(Scalar::Type type, unsigned numElems, FloatRegister in,
+                            const Operand &dstAddr)
 {
     switch (type) {
       case Scalar::Float32x4: {
         switch (numElems) {
           // In memory-to-register mode, movss zeroes out the high lanes.
-          case 1: masm.vmovssWithPatch(in, destAddr); break;
+          case 1: masm.vmovssWithPatch(in, dstAddr); break;
           // See comment above, which also applies to movsd.
-          case 2: masm.vmovsdWithPatch(in, destAddr); break;
-          case 4: masm.vmovupsWithPatch(in, destAddr); break;
+          case 2: masm.vmovsdWithPatch(in, dstAddr); break;
+          case 4: masm.vmovupsWithPatch(in, dstAddr); break;
           default: MOZ_CRASH("unexpected size for partial load");
         }
         break;
       }
       case Scalar::Int32x4: {
         switch (numElems) {
-          // In memory-to-register mode, movd zeroes destAddr the high lanes.
-          case 1: masm.vmovdWithPatch(in, destAddr); break;
+          // In memory-to-register mode, movd zeroes out the high lanes.
+          case 1: masm.vmovdWithPatch(in, dstAddr); break;
           // See comment above, which also applies to movsd.
-          case 2: masm.vmovqWithPatch(in, destAddr); break;
-          case 4: masm.vmovdquWithPatch(in, destAddr); break;
+          case 2: masm.vmovqWithPatch(in, dstAddr); break;
+          case 4: masm.vmovdquWithPatch(in, dstAddr); break;
           default: MOZ_CRASH("unexpected size for partial load");
         }
         break;
@@ -617,129 +556,95 @@
 }
 
 void
-CodeGeneratorX86::emitSimdStore(Scalar::Type type, unsigned numElems, FloatRegister in,
-                                const LAllocation *ptr, bool needsBoundsCheck /* = false */,
-                                Label *oobLabel /* = nullptr */)
-{
-    if (ptr->isConstant()) {
-        MOZ_ASSERT(!needsBoundsCheck);
-
-        if (numElems == 3) {
-            MOZ_ASSERT(type == Scalar::Int32x4 || type == Scalar::Float32x4);
-
-            // Store XY
-            emitSimdStore(type, 2, in, ptr);
-
-            masm.vmovhlps(in, ScratchSimdReg, ScratchSimdReg);
-
-            // Store Z
-            // This add won't overflow, as we've checked that we have at least
-            // room for loading 4 elements during asm.js validation.
-            PatchedAbsoluteAddress dstAddr((void *) (ptr->toConstant()->toInt32() + 2 * sizeof(float)));
-            uint32_t before = masm.size();
-            storeSimd(type, 1, ScratchSimdReg, dstAddr);
-            uint32_t after = masm.size();
-            masm.append(AsmJSHeapAccess(before, after, 1, type));
-            return;
-        }
-
-        PatchedAbsoluteAddress dstAddr((void *) ptr->toConstant()->toInt32());
-        uint32_t before = masm.size();
-        storeSimd(type, numElems, in, dstAddr);
-        uint32_t after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, 3, type));
-        return;
-    }
+CodeGeneratorX86::emitSimdStore(LAsmJSStoreHeap *ins)
+{
+    const MAsmJSStoreHeap *mir = ins->mir();
+    Scalar::Type type = mir->accessType();
+    FloatRegister in = ToFloatRegister(ins->value());
+    const LAllocation *ptr = ins->ptr();
+    Operand dstAddr = ptr->isBogus()
+                      ? Operand(PatchedAbsoluteAddress(mir->offset()))
+                      : Operand(ToRegister(ptr), mir->offset());
 
-    Register ptrReg = ToRegister(ptr);
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
-    if (needsBoundsCheck) {
-        maybeCmpOffset = masm.cmp32WithPatch(ptrReg, Imm32(0)).offset();
-        masm.j(Assembler::AboveOrEqual, oobLabel); // Throws RangeError
-    }
+    if (gen->needsAsmJSBoundsCheckBranch(mir))
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr),
+                                                    gen->outOfBoundsLabel());
 
-    uint32_t before = masm.size();
+    unsigned numElems = mir->numSimdElems();
     if (numElems == 3) {
         MOZ_ASSERT(type == Scalar::Int32x4 || type == Scalar::Float32x4);
 
+        Operand dstAddrZ =
+            ptr->isBogus()
+            ? Operand(PatchedAbsoluteAddress(2 * sizeof(float) + mir->offset()))
+            : Operand(ToRegister(ptr), 2 * sizeof(float) + mir->offset());
+
         // Store XY
-        Address addr(ptrReg, 0);
-        before = masm.size();
-        storeSimd(type, 2, in, addr);
+        uint32_t before = masm.size();
+        storeSimd(type, 2, in, dstAddr);
         uint32_t after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, 3, type, maybeCmpOffset));
+        masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
 
         masm.vmovhlps(in, ScratchSimdReg, ScratchSimdReg);
 
         // Store Z (W is zeroed)
         // This is still in bounds, as we've checked with a manual bounds check
         // or we had enough space for sure when removing the bounds check.
-        Address shiftedAddr(ptrReg, 2 * sizeof(float));
         before = masm.size();
-        storeSimd(type, 1, ScratchSimdReg, shiftedAddr);
+        storeSimd(type, 1, ScratchSimdReg, dstAddrZ);
         after = masm.size();
-        masm.append(AsmJSHeapAccess(before, after, 1, type));
-        return;
+        masm.append(AsmJSHeapAccess(before, after));
+    } else {
+        uint32_t before = masm.size();
+        storeSimd(type, numElems, in, dstAddr);
+        uint32_t after = masm.size();
+        masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
     }
 
-    Address addr(ptrReg, 0);
-    storeSimd(type, numElems, in, addr);
-    uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, numElems, type, maybeCmpOffset));
+    if (maybeCmpOffset != AsmJSHeapAccess::NoLengthCheck)
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
 }
 
 void
 CodeGeneratorX86::visitAsmJSStoreHeap(LAsmJSStoreHeap *ins)
 {
-    MAsmJSStoreHeap *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
-    const LAllocation *value = ins->value();
-    const LAllocation *ptr = ins->ptr();
-
-    if (Scalar::isSimdType(vt)) {
-        return emitSimdStore(vt, mir->numSimdElems(), ToFloatRegister(value), ptr,
-                             mir->needsBoundsCheck(), mir->outOfBoundsLabel());
-    }
+    const MAsmJSStoreHeap *mir = ins->mir();
+    Scalar::Type accessType = mir->accessType();
 
-    memoryBarrier(ins->mir()->barrierBefore());
-
-    if (ptr->isConstant()) {
-        // The constant displacement still needs to be added to the as-yet-unknown
-        // base address of the heap. For now, embed the displacement as an
-        // immediate in the instruction. This displacement will fixed up when the
-        // base address is known during dynamic linking (AsmJSModule::initHeap).
-        PatchedAbsoluteAddress dstAddr((void *) ptr->toConstant()->toInt32());
-        storeAndNoteViewTypeElement(vt, value, dstAddr);
-        memoryBarrier(ins->mir()->barrierAfter());
-        return;
-    }
+    if (Scalar::isSimdType(accessType))
+        return emitSimdStore(ins);
 
-    Register ptrReg = ToRegister(ptr);
-    Address dstAddr(ptrReg, 0);
+    const LAllocation *value = ins->value();
+    const LAllocation *ptr = ins->ptr();
+    Operand dstAddr = ptr->isBogus()
+                      ? Operand(PatchedAbsoluteAddress(mir->offset()))
+                      : Operand(ToRegister(ptr), mir->offset());
 
-    if (!mir->needsBoundsCheck()) {
-        storeAndNoteViewTypeElement(vt, value, dstAddr);
-        memoryBarrier(ins->mir()->barrierAfter());
-        return;
+    memoryBarrier(mir->barrierBefore());
+    Label *rejoin = nullptr;
+    uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
+    if (gen->needsAsmJSBoundsCheckBranch(mir)) {
+        rejoin = alloc().lifoAlloc()->new_<Label>();
+        maybeCmpOffset = emitAsmJSBoundsCheckBranch(mir, mir, ToRegister(ptr), rejoin);
     }
 
-    CodeOffsetLabel cmp = masm.cmp32WithPatch(ptrReg, Imm32(0));
-    Label rejoin;
-    masm.j(Assembler::AboveOrEqual, &rejoin);
-
     uint32_t before = masm.size();
-    store(vt, value, dstAddr);
+    store(accessType, value, dstAddr);
     uint32_t after = masm.size();
-    masm.bind(&rejoin);
-    memoryBarrier(ins->mir()->barrierAfter());
-    masm.append(AsmJSHeapAccess(before, after, vt, cmp.offset()));
+    if (rejoin) {
+        cleanupAfterAsmJSBoundsCheckBranch(mir, ToRegister(ptr));
+        masm.bind(rejoin);
+    }
+    memoryBarrier(mir->barrierAfter());
+    masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
 }
 
 void
 CodeGeneratorX86::visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap *ins)
 {
     MAsmJSCompareExchangeHeap *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
+    Scalar::Type accessType = mir->accessType();
     const LAllocation *ptr = ins->ptr();
     Register oldval = ToRegister(ins->oldValue());
     Register newval = ToRegister(ins->newValue());
@@ -752,9 +657,9 @@
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
 
     if (mir->needsBoundsCheck()) {
-        maybeCmpOffset = masm.cmp32WithPatch(ptrReg, Imm32(0)).offset();
+        maybeCmpOffset = masm.cmp32WithPatch(ptrReg, Imm32(-mir->endOffset())).offset();
         Label goahead;
-        masm.j(Assembler::Below, &goahead);
+        masm.j(Assembler::BelowOrEqual, &goahead);
         memoryBarrier(MembarFull);
         Register out = ToRegister(ins->output());
         masm.xorl(out,out);
@@ -765,12 +670,12 @@
     // Add in the actual heap pointer explicitly, to avoid opening up
     // the abstraction that is compareExchangeToTypedIntArray at this time.
     uint32_t before = masm.size();
-    masm.addlWithPatch(Imm32(0), ptrReg);
+    masm.addlWithPatch(Imm32(mir->offset()), ptrReg);
     uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, mir->accessType(), maybeCmpOffset));
+    masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
 
-    Address memAddr(ToRegister(ptr), 0);
-    masm.compareExchangeToTypedIntArray(vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+    Address memAddr(ToRegister(ptr), mir->offset());
+    masm.compareExchangeToTypedIntArray(accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         memAddr,
                                         oldval,
                                         newval,
@@ -784,7 +689,7 @@
 CodeGeneratorX86::visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap *ins)
 {
     MAsmJSAtomicBinopHeap *mir = ins->mir();
-    Scalar::Type vt = mir->accessType();
+    Scalar::Type accessType = mir->accessType();
     const LAllocation *ptr = ins->ptr();
     Register temp = ins->temp()->isBogusTemp() ? InvalidReg : ToRegister(ins->temp());
     const LAllocation* value = ins->value();
@@ -798,9 +703,9 @@
     uint32_t maybeCmpOffset = AsmJSHeapAccess::NoLengthCheck;
 
     if (mir->needsBoundsCheck()) {
-        maybeCmpOffset = masm.cmp32WithPatch(ptrReg, Imm32(0)).offset();
+        maybeCmpOffset = masm.cmp32WithPatch(ptrReg, Imm32(-mir->endOffset())).offset();
         Label goahead;
-        masm.j(Assembler::Below, &goahead);
+        masm.j(Assembler::BelowOrEqual, &goahead);
         memoryBarrier(MembarFull);
         Register out = ToRegister(ins->output());
         masm.xorl(out,out);
@@ -811,20 +716,20 @@
     // Add in the actual heap pointer explicitly, to avoid opening up
     // the abstraction that is atomicBinopToTypedIntArray at this time.
     uint32_t before = masm.size();
-    masm.addlWithPatch(Imm32(0), ptrReg);
+    masm.addlWithPatch(Imm32(mir->offset()), ptrReg);
     uint32_t after = masm.size();
-    masm.append(AsmJSHeapAccess(before, after, mir->accessType(), maybeCmpOffset));
+    masm.append(AsmJSHeapAccess(before, after, maybeCmpOffset));
 
-    Address memAddr(ptrReg, 0);
+    Address memAddr(ptrReg, mir->offset());
     if (value->isConstant()) {
-        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+        masm.atomicBinopToTypedIntArray(op, accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         Imm32(ToInt32(value)),
                                         memAddr,
                                         temp,
                                         InvalidReg,
                                         ToAnyRegister(ins->output()));
     } else {
-        masm.atomicBinopToTypedIntArray(op, vt == Scalar::Uint32 ? Scalar::Int32 : vt,
+        masm.atomicBinopToTypedIntArray(op, accessType == Scalar::Uint32 ? Scalar::Int32 : accessType,
                                         ToRegister(value),
                                         memAddr,
                                         temp,
@@ -1161,7 +1066,7 @@
         masm.push(input);
         masm.setupUnalignedABICall(1, output);
         masm.vcvtss2sd(input, input, input);
-        masm.passABIArg(input, MoveOp::DOUBLE);
+        masm.passABIArg(input.asDouble(), MoveOp::DOUBLE);
 
         if (gen->compilingAsmJS())
             masm.callWithABI(AsmJSImm_ToInt32);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/CodeGenerator-x86.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/CodeGenerator-x86.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/CodeGenerator-x86.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/CodeGenerator-x86.h	2015-02-28 15:03:05.000000000 +0000
@@ -28,25 +28,14 @@
     ValueOperand ToOutValue(LInstruction *ins);
     ValueOperand ToTempValue(LInstruction *ins, size_t pos);
 
-    template<typename T>
-    void loadAndNoteViewTypeElement(Scalar::Type vt, const T &srcAddr, const LDefinition *out);
-    template<typename T>
-    void load(Scalar::Type vt, const T &srcAddr, const LDefinition *out);
-    template<typename T>
-    void storeAndNoteViewTypeElement(Scalar::Type vt, const LAllocation *value, const T &dstAddr);
-    template<typename T>
-    void store(Scalar::Type vt, const LAllocation *value, const T &dstAddr);
+    void load(Scalar::Type vt, const Operand &srcAddr, const LDefinition *out);
+    void store(Scalar::Type vt, const LAllocation *value, const Operand &dstAddr);
 
-    template<typename T>
-    void loadSimd(Scalar::Type type, unsigned numElems, T srcAddr, FloatRegister out);
-    void emitSimdLoad(Scalar::Type type, unsigned numElems, const LAllocation *ptr,
-                      FloatRegister out, bool needsBoundsCheck = false, Label *oobLabel = nullptr);
+    void loadSimd(Scalar::Type type, unsigned numElems, const Operand &srcAddr, FloatRegister out);
+    void emitSimdLoad(LAsmJSLoadHeap *ins);
 
-    template<typename T>
-    void storeSimd(Scalar::Type type, unsigned numElems, FloatRegister in, T destAddr);
-    void emitSimdStore(Scalar::Type type, unsigned numElems, FloatRegister in,
-                       const LAllocation *ptr, bool needsBoundsCheck = false,
-                       Label *oobLabel = nullptr);
+    void storeSimd(Scalar::Type type, unsigned numElems, FloatRegister in, const Operand &dstAddr);
+    void emitSimdStore(LAsmJSStoreHeap *ins);
 
     void memoryBarrier(MemoryBarrierBits barrier);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Lowering-x86.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Lowering-x86.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Lowering-x86.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Lowering-x86.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -202,55 +202,34 @@
 LIRGeneratorX86::visitAsmJSLoadHeap(MAsmJSLoadHeap *ins)
 {
     MDefinition *ptr = ins->ptr();
-    LAllocation ptrAlloc;
     MOZ_ASSERT(ptr->type() == MIRType_Int32);
 
-    // For the x86 it is best to keep the 'ptr' in a register if a bounds check is needed.
-    if (ptr->isConstant() && !ins->needsBoundsCheck()) {
-        // A bounds check is only skipped for a positive index.
-        MOZ_ASSERT(ptr->toConstant()->value().toInt32() >= 0);
-        ptrAlloc = LAllocation(ptr->toConstant()->vp());
-    } else {
-        ptrAlloc = useRegisterAtStart(ptr);
-    }
-    LAsmJSLoadHeap *lir = new(alloc()) LAsmJSLoadHeap(ptrAlloc);
-    define(lir, ins);
+    // For simplicity, require a register if we're going to emit a bounds-check
+    // branch, so that we don't have special cases for constants.
+    LAllocation ptrAlloc = gen->needsAsmJSBoundsCheckBranch(ins)
+                           ? useRegisterAtStart(ptr)
+                           : useRegisterOrZeroAtStart(ptr);
+
+    define(new(alloc()) LAsmJSLoadHeap(ptrAlloc), ins);
 }
 
 void
 LIRGeneratorX86::visitAsmJSStoreHeap(MAsmJSStoreHeap *ins)
 {
     MDefinition *ptr = ins->ptr();
-    LAsmJSStoreHeap *lir;
     MOZ_ASSERT(ptr->type() == MIRType_Int32);
 
-    if (ptr->isConstant() && !ins->needsBoundsCheck()) {
-        MOZ_ASSERT(ptr->toConstant()->value().toInt32() >= 0);
-        LAllocation ptrAlloc = LAllocation(ptr->toConstant()->vp());
-        switch (ins->accessType()) {
-          case Scalar::Int8: case Scalar::Uint8:
-            // See comment below.
-            lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useFixed(ins->value(), eax));
-            break;
-          case Scalar::Int16: case Scalar::Uint16:
-          case Scalar::Int32: case Scalar::Uint32:
-          case Scalar::Float32: case Scalar::Float64:
-          case Scalar::Float32x4: case Scalar::Int32x4:
-            // See comment below.
-            lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useRegisterAtStart(ins->value()));
-            break;
-          case Scalar::Uint8Clamped:
-          case Scalar::MaxTypedArrayViewType:
-            MOZ_CRASH("unexpected array type");
-        }
-        add(lir, ins);
-        return;
-    }
+    // For simplicity, require a register if we're going to emit a bounds-check
+    // branch, so that we don't have special cases for constants.
+    LAllocation ptrAlloc = gen->needsAsmJSBoundsCheckBranch(ins)
+                           ? useRegisterAtStart(ptr)
+                           : useRegisterOrZeroAtStart(ptr);
 
+    LAsmJSStoreHeap *lir = nullptr;
     switch (ins->accessType()) {
       case Scalar::Int8: case Scalar::Uint8:
         // See comment for LIRGeneratorX86::useByteOpRegister.
-        lir = new(alloc()) LAsmJSStoreHeap(useRegister(ins->ptr()), useFixed(ins->value(), eax));
+        lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useFixed(ins->value(), eax));
         break;
       case Scalar::Int16: case Scalar::Uint16:
       case Scalar::Int32: case Scalar::Uint32:
@@ -258,13 +237,12 @@
       case Scalar::Float32x4: case Scalar::Int32x4:
         // For now, don't allow constant values. The immediate operand
         // affects instruction layout which affects patching.
-        lir = new(alloc()) LAsmJSStoreHeap(useRegisterAtStart(ptr), useRegisterAtStart(ins->value()));
+        lir = new(alloc()) LAsmJSStoreHeap(ptrAlloc, useRegisterAtStart(ins->value()));
         break;
       case Scalar::Uint8Clamped:
       case Scalar::MaxTypedArrayViewType:
         MOZ_CRASH("unexpected array type");
     }
-
     add(lir, ins);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/MacroAssembler-x86.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/MacroAssembler-x86.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/MacroAssembler-x86.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/MacroAssembler-x86.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -50,7 +50,7 @@
     Double *dbl = getDouble(d);
     if (!dbl)
         return;
-    masm.vmovsd_mr(reinterpret_cast<const void *>(dbl->uses.prev()), dest.code());
+    masm.vmovsd_mr(reinterpret_cast<const void *>(dbl->uses.prev()), dest.encoding());
     dbl->uses.setPrev(masm.size());
 }
 
@@ -60,7 +60,7 @@
     Double *dbl = getDouble(d);
     if (!dbl)
         return;
-    masm.vaddsd_mr(reinterpret_cast<const void *>(dbl->uses.prev()), dest.code(), dest.code());
+    masm.vaddsd_mr(reinterpret_cast<const void *>(dbl->uses.prev()), dest.encoding(), dest.encoding());
     dbl->uses.setPrev(masm.size());
 }
 
@@ -96,7 +96,7 @@
     Float *flt = getFloat(f);
     if (!flt)
         return;
-    masm.vmovss_mr(reinterpret_cast<const void *>(flt->uses.prev()), dest.code());
+    masm.vmovss_mr(reinterpret_cast<const void *>(flt->uses.prev()), dest.encoding());
     flt->uses.setPrev(masm.size());
 }
 
@@ -106,7 +106,7 @@
     Float *flt = getFloat(f);
     if (!flt)
         return;
-    masm.vaddss_mr(reinterpret_cast<const void *>(flt->uses.prev()), dest.code(), dest.code());
+    masm.vaddss_mr(reinterpret_cast<const void *>(flt->uses.prev()), dest.encoding(), dest.encoding());
     flt->uses.setPrev(masm.size());
 }
 
@@ -144,7 +144,7 @@
     if (!i4)
         return;
     MOZ_ASSERT(i4->type() == SimdConstant::Int32x4);
-    masm.vmovdqa_mr(reinterpret_cast<const void *>(i4->uses.prev()), dest.code());
+    masm.vmovdqa_mr(reinterpret_cast<const void *>(i4->uses.prev()), dest.encoding());
     i4->uses.setPrev(masm.size());
 }
 
@@ -158,7 +158,7 @@
     if (!f4)
         return;
     MOZ_ASSERT(f4->type() == SimdConstant::Float32x4);
-    masm.vmovaps_mr(reinterpret_cast<const void *>(f4->uses.prev()), dest.code());
+    masm.vmovaps_mr(reinterpret_cast<const void *>(f4->uses.prev()), dest.encoding());
     f4->uses.setPrev(masm.size());
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/MacroAssembler-x86.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/MacroAssembler-x86.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/MacroAssembler-x86.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/MacroAssembler-x86.h	2015-02-28 15:03:05.000000000 +0000
@@ -360,6 +360,15 @@
         MOZ_ASSERT(cond == Equal || cond == NotEqual);
         return testInt32(cond, Operand(address));
     }
+    Condition testObject(Condition cond, const Operand &operand) {
+        MOZ_ASSERT(cond == Equal || cond == NotEqual);
+        cmp32(ToType(operand), ImmTag(JSVAL_TAG_OBJECT));
+        return cond;
+    }
+    Condition testObject(Condition cond, const Address &address) {
+        MOZ_ASSERT(cond == Equal || cond == NotEqual);
+        return testObject(cond, Operand(address));
+    }
     Condition testDouble(Condition cond, const Operand &operand) {
         MOZ_ASSERT(cond == Equal || cond == NotEqual);
         Condition actual = (cond == Equal) ? Below : AboveOrEqual;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Trampoline-x86.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Trampoline-x86.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit/x86/Trampoline-x86.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit/x86/Trampoline-x86.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -503,7 +503,25 @@
 PushBailoutFrame(MacroAssembler &masm, uint32_t frameClass, Register spArg)
 {
     // Push registers such that we can access them from [base + code].
-    masm.PushRegsInMask(AllRegs);
+    if (JitSupportsSimd()) {
+        masm.PushRegsInMask(AllRegs);
+    } else {
+        // When SIMD isn't supported, PushRegsInMask reduces the set of float
+        // registers to be double-sized, while the RegisterDump expects each of
+        // the float registers to have the maximal possible size
+        // (Simd128DataSize). To work around this, we just spill the double
+        // registers by hand here, using the register dump offset directly.
+        RegisterSet set = AllRegs;
+        for (GeneralRegisterBackwardIterator iter(set.gprs()); iter.more(); iter++)
+            masm.Push(*iter);
+
+        masm.reserveStack(sizeof(RegisterDump::FPUArray));
+        for (FloatRegisterBackwardIterator iter(set.fpus()); iter.more(); iter++) {
+            FloatRegister reg = *iter;
+            Address spillAddress(StackPointer, reg.getRegisterDumpOffsetInBytes());
+            masm.storeDouble(reg, spillAddress);
+        }
+    }
 
     // Push the bailout table number.
     masm.push(Imm32(frameClass));
@@ -530,9 +548,9 @@
     masm.pop(ecx); // Get bailoutInfo outparam.
 
     // Common size of stuff we've pushed.
-    const uint32_t BailoutDataSize = sizeof(void *) + // frameClass
-                                   sizeof(double) * FloatRegisters::Total +
-                                   sizeof(void *) * Registers::Total;
+    static const uint32_t BailoutDataSize = 0
+        + sizeof(void *) // frameClass
+        + sizeof(RegisterDump);
 
     // Remove both the bailout frame and the topmost Ion frame's stack.
     if (frameClass == NO_FRAME_SIZE_CLASS_ID) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/lib/simd.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/lib/simd.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/lib/simd.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/lib/simd.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,19 @@
+function binaryX4(op, v, w) {
+    var arr = [];
+    var [varr, warr] = [simdToArray(v), simdToArray(w)];
+    [varr, warr] = [varr.map(Math.fround), warr.map(Math.fround)];
+    for (var i = 0; i < 4; i++)
+        arr[i] = op(varr[i], warr[i]);
+    return arr.map(Math.fround);
+}
+
+function assertEqX4(vec, arr) {
+    assertEq(vec.x, arr[0]);
+    assertEq(vec.y, arr[1]);
+    assertEq(vec.z, arr[2]);
+    assertEq(vec.w, arr[3]);
+}
+
+function simdToArray(vec) {
+    return [vec.x, vec.y, vec.z, vec.w];
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/arguments/destructuring-default-value-scope.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/arguments/destructuring-default-value-scope.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/arguments/destructuring-default-value-scope.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/arguments/destructuring-default-value-scope.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,10 @@
+var a = 10;
+function f1(a,
+            [b=(assertEq(a, 1), a=2, 42)],
+            {c:c=(assertEq(a, 2), a=3, 43)}) {
+  assertEq(a, 3);
+  assertEq(b, 42);
+  assertEq(c, 43);
+}
+f1(1, [], {});
+assertEq(a, 10);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/simd-fbirds.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/simd-fbirds.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/simd-fbirds.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/simd-fbirds.js	2015-02-28 15:03:04.000000000 +0000
@@ -44,15 +44,13 @@
 var code = `
     "use asm";
     var toF = global.Math.fround;
+    var u8 = new global.Uint8Array(buffer);
     var f32 = new global.Float32Array(buffer);
     const maxBirds = 100000;
     const maxBirdsx4 = 400000;
-    const maxBirdsx4Plus4 = 400004;
-    const maxBirdsx4Plus8 = 400008;
-    const maxBirdsx4Plus12 = 400012;
     const maxBirdsx8 = 800000;
     const accelMask = 0x3c;
-    const mk2 = 0x000ffffc;
+    const mk4 = 0x000ffff0;
 
     const getMaxPos = 1000.0;
     const getAccelDataSteps = imp.accelDataSteps | 0;
@@ -68,6 +66,8 @@
     var f4mul = f4.mul;
     var f4greaterThan = f4.greaterThan;
     var f4splat = f4.splat;
+    var f4load = f4.load;
+    var f4store = f4.store;
 
     const zerox4 = f4(0.0,0.0,0.0,0.0);
 
@@ -110,15 +110,8 @@
 
         for (i = 0; (i | 0) < (len | 0); i = (i + 16) | 0) {
             accelIndex = 0;
-            // Work around unimplemented Float32x4Array
-            newPosx4 = f4(toF(f32[(i & mk2) >> 2]),
-                    toF(f32[(i & mk2) + 4 >> 2]),
-                    toF(f32[(i & mk2) + 8 >> 2]),
-                    toF(f32[(i & mk2) + 12 >> 2]));
-            newVelx4 = f4(toF(f32[(i & mk2) + maxBirdsx4 >> 2]),
-                    toF(f32[(i & mk2) + maxBirdsx4Plus4 >> 2]),
-                    toF(f32[(i & mk2) + maxBirdsx4Plus8 >> 2]),
-                    toF(f32[(i & mk2) + maxBirdsx4Plus12 >> 2]));
+            newPosx4 = f4load(u8, i & mk4);
+            newVelx4 = f4load(u8, (i & mk4) + maxBirdsx4);
             for (a = 0; (a | 0) < (steps | 0); a = (a + 1) | 0) {
                 accel = toF(f32[(accelIndex & accelMask) + maxBirdsx8 >> 2]);
                 accelx4 = f4splat(accel);
@@ -135,15 +128,8 @@
                     newVelx4 = f4select(cmpx4, newVelTruex4, newVelx4);
                 }
             }
-            // Work around unimplemented Float32x4Array
-            f32[(i & mk2) >> 2] = newPosx4.x;
-            f32[(i & mk2) + 4 >> 2] = newPosx4.y;
-            f32[(i & mk2) + 8 >> 2] = newPosx4.z;
-            f32[(i & mk2) + 12 >> 2] = newPosx4.w;
-            f32[(i & mk2) + maxBirdsx4 >> 2] = newVelx4.x;
-            f32[(i & mk2) + maxBirdsx4Plus4 >> 2] = newVelx4.y;
-            f32[(i & mk2) + maxBirdsx4Plus8 >> 2] = newVelx4.z;
-            f32[(i & mk2) + maxBirdsx4Plus12 >> 2] = newVelx4.w;
+            f4store(u8, i & mk4, newPosx4);
+            f4store(u8, (i & mk4) + maxBirdsx4, newVelx4);
         }
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testAddressErrors.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testAddressErrors.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testAddressErrors.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testAddressErrors.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,48 @@
+// |jit-test| test-also-noasmjs
+load(libdir + "asm.js");
+
+setIonCheckGraphCoherency(false);
+setCachingEnabled(false);
+
+// constants
+var buf = new ArrayBuffer(BUF_MIN);
+
+// An unshifted literal constant byte index in the range 0 to 2^31-1 inclusive should give a link failure.
+assertAsmLinkFail(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x7fffffff]|0 } return f'), this, null, buf);
+assertAsmLinkFail(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x1fffffff]|0 } return f'), this, null, buf);
+
+
+// An unshifted literal constant byte index outside the range 0 to 2^31-1 inclusive should cause an error compiling.
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x20000000]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x3fffffff]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x40000000]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x7fffffff]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x80000000]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x8fffffff]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0xffffffff]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x100000000]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x80000000]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x100000000]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int16Array(b); function f() {return arr[-1]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[-2]|0 } return f');
+
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[10-12]|0 } return f');
+
+// An intish shifted literal constant index should not fail to compile or link.
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x3fffffff>>0]|0 } return f'), this, null, buf)(), 0);
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x3fffffff>>2]|0 } return f'), this, null, buf)(), 0);
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff>>0]|0 } return f'), this, null, buf)(), 0);
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0xffffffff>>2]|0 } return f'), this, null, buf)(), 0);
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[-1>>0]|0 } return f'), this, null, buf)(), 0);
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[-1>>2]|0 } return f'), this, null, buf)(), 0);
+// Unsigned (intish) folded constant index.
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff>>>0]|0 } return f'), this, null, buf)(), 0);
+assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {arr[0] = 1; return arr[(0xffffffff+1)>>>0]|0 } return f'), this, null, buf)(), 1);
+
+// A non-intish shifted literal constant index should cause an error compiling.
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b); function f() {return arr[0x100000000>>0]|0 } return f');
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x100000000>>2]|0 } return f');
+
+// Folded non-intish constant expressions should cause an error compiling.
+assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff+1]|0 } return f');
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testFFI.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testFFI.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testFFI.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testFFI.js	2015-02-28 15:03:04.000000000 +0000
@@ -151,10 +151,8 @@
 function testBadConversions(f) {
     valueToConvert = {valueOf: function () { throw "FAIL"; }};
     assertThrowsValue(() => f(40), "FAIL");
-    if (typeof Symbol === "function") {
-        valueToConvert = Symbol();
-        assertThrowsInstanceOf(() => f(40), TypeError);
-    }
+    valueToConvert = Symbol();
+    assertThrowsInstanceOf(() => f(40), TypeError);
 }
 testBadConversions(f);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testGlobals.js	2015-02-28 15:03:04.000000000 +0000
@@ -116,11 +116,9 @@
 assertEq(asmLink(asmCompile('glob','foreign', USE_ASM + 'var i = foreign.x|0; function f() { return i|0} return f'), null, {x:"blah"})(), 0);
 assertEq(asmLink(asmCompile('glob','foreign', USE_ASM + 'var i = +foreign.x; function f() { return +i} return f'), null, {x:"blah"})(), NaN);
 assertEq(asmLink(asmCompile('glob','foreign', USE_ASM + 'var tof = glob.Math.fround; var i = tof(foreign.x); function f() { return +i} return f'), this, {x:"blah"})(), NaN);
-if (typeof Symbol === "function") {
-    assertThrowsInstanceOf(() => asmCompile('glob','foreign',USE_ASM + 'var i = foreign.x|0; function f() { return i|0} return f')(null, {x:Symbol("blah")}), TypeError);
-    assertThrowsInstanceOf(() => asmCompile('glob','foreign',USE_ASM + 'var i = +foreign.x; function f() { return +i} return f')(null, {x:Symbol("blah")}), TypeError);
-    assertThrowsInstanceOf(() => asmCompile('glob','foreign',USE_ASM + 'var tof = glob.Math.fround; var i = tof(foreign.x); function f() { return +i} return f')(this, {x:Symbol("blah")}), TypeError);
-}
+assertThrowsInstanceOf(() => asmCompile('glob','foreign',USE_ASM + 'var i = foreign.x|0; function f() { return i|0} return f')(null, {x:Symbol("blah")}), TypeError);
+assertThrowsInstanceOf(() => asmCompile('glob','foreign',USE_ASM + 'var i = +foreign.x; function f() { return +i} return f')(null, {x:Symbol("blah")}), TypeError);
+assertThrowsInstanceOf(() => asmCompile('glob','foreign',USE_ASM + 'var tof = glob.Math.fround; var i = tof(foreign.x); function f() { return +i} return f')(this, {x:Symbol("blah")}), TypeError);
 
 // Temporary workaround; this test can be removed when Emscripten is fixed and
 // the fix has propagated out to most apps:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testZOOB.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testZOOB.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/asm.js/testZOOB.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/asm.js/testZOOB.js	2015-02-28 15:03:04.000000000 +0000
@@ -1,116 +1,83 @@
 // |jit-test| test-also-noasmjs
 load(libdir + "asm.js");
+load(libdir + "asserts.js");
 
 setIonCheckGraphCoherency(false);
 setCachingEnabled(false);
 
-// constants
-var buf = new ArrayBuffer(BUF_MIN);
-
-// An unshifted literal constant byte index in the range 0 to 2^31-1 inclusive should give a link failure.
-assertAsmLinkFail(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x7fffffff]|0 } return f'), this, null, buf);
-assertAsmLinkFail(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x1fffffff]|0 } return f'), this, null, buf);
-
-
-// An unshifted literal constant byte index outside the range 0 to 2^31-1 inclusive should cause an error compiling.
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x20000000]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x3fffffff]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x40000000]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x7fffffff]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x80000000]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x8fffffff]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0xffffffff]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x100000000]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x80000000]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x100000000]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int16Array(b); function f() {return arr[-1]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[-2]|0 } return f');
-
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[10-12]|0 } return f');
-
-// An intish shifted literal constant index should not fail to compile or link.
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0x3fffffff>>0]|0 } return f'), this, null, buf)(), 0);
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x3fffffff>>2]|0 } return f'), this, null, buf)(), 0);
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff>>0]|0 } return f'), this, null, buf)(), 0);
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0xffffffff>>2]|0 } return f'), this, null, buf)(), 0);
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[-1>>0]|0 } return f'), this, null, buf)(), 0);
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[-1>>2]|0 } return f'), this, null, buf)(), 0);
-// Unsigned (intish) folded constant index.
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff>>>0]|0 } return f'), this, null, buf)(), 0);
-assertEq(asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {arr[0] = 1; return arr[(0xffffffff+1)>>>0]|0 } return f'), this, null, buf)(), 1);
-
-// A non-intish shifted literal constant index should cause an error compiling.
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b); function f() {return arr[0x100000000>>0]|0 } return f');
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int32Array(b); function f() {return arr[0x100000000>>2]|0 } return f');
-
-// Folded non-intish constant expressions should cause an error compiling.
-assertAsmTypeFail('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.Int8Array(b);  function f() {return arr[0xffffffff+1]|0 } return f');
-
 var ab = new ArrayBuffer(BUF_MIN);
-var arr = new Int32Array(BUF_MIN);
-for (var i = 0; i < arr.length; i++)
-    arr[i] = i;
+
+// Compute a set of interesting indices.
+indices = [0]
+for (var i of [4,1024,BUF_MIN,Math.pow(2,30),Math.pow(2,31),Math.pow(2,32),Math.pow(2,33)]) {
+    for (var j of [-2,-1,0,1,2]) {
+        for (var k of [1,-1])
+            indices.push((i+j)*k);
+    }
+}
 
 function testInt(ctor, shift, scale, disp) {
     var arr = new ctor(ab);
-    var f = asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.' + ctor.name + '(b); function f(i) {i=i|0; return arr[((i<<' + scale + ')+' + disp + ')>>' + shift + ']|0 } return f'), this, null, ab);
-    for (var i of [0,1,2,3,4,1023,1024,1025,BUF_MIN-2,BUF_MIN-1,BUF_MIN,BUF_MIN+1])
-        assertEq(f(i), arr[((i<<scale)+disp)>>shift]|0);
 
-    for (var i of [-Math.pow(2,28),Math.pow(2,28),-Math.pow(2,29),Math.pow(2,29),-Math.pow(2,30),Math.pow(2,30),-Math.pow(2,31),Math.pow(2,31),-Math.pow(2,32),Math.pow(2,32)]) {
-        for (var j of [-8,-4,-1,0,1,4,8])
-            assertEq(f(i+j), arr[(((i+j)<<scale)+disp)>>shift]|0);
-    }
+    var c = asmCompile('glob', 'imp', 'b',
+                       USE_ASM +
+                       'var arr=new glob.' + ctor.name + '(b); ' +
+                       'function load(i) {i=i|0; return arr[((i<<' + scale + ')+' + disp + ')>>' + shift + ']|0 } ' +
+                       'function store(i,j) {i=i|0;j=j|0; arr[((i<<' + scale + ')+' + disp + ')>>' + shift + '] = j } ' +
+                       'function storeZero(i) {i=i|0; arr[((i<<' + scale + ')+' + disp + ')>>' + shift + '] = 0 } ' +
+                       'function storeNegOne(i) {i=i|0; arr[((i<<' + scale + ')+' + disp + ')>>' + shift + '] = -1 } ' +
+                       'return { load: load, store: store, storeZero: storeZero, storeNegOne: storeNegOne }');
+    var f = asmLink(c, this, null, ab);
+
+    var v = arr[0];
+    arr[0] = -1;
+    var negOne = arr[0]|0;
+    arr[0] = v;
 
-    var f = asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.' + ctor.name + '(b); function f(i,j) {i=i|0;j=j|0; arr[((i<<' + scale + ')+' + disp + ')>>' + shift + '] = j } return f'), this, null, ab);
-    for (var i of [0,1,2,3,4,1023,1024,1025,4095,4096,4097]) {
+    for (var i of indices) {
         var index = ((i<<scale)+disp)>>shift;
-        var v = arr[index]|0;
-        arr[index] = 0;
-        f(i, v);
-        assertEq(arr[index]|0, v);
-    }
+        v = arr[index]|0;
 
-    for (var i of [-Math.pow(2,31), Math.pow(2,31)-1, Math.pow(2,32)]) {
-        for (var j of [-8,-4,-1,0,1,4,8]) {
-            var index = (((i+j)<<scale)+disp)>>shift;
-            var v = arr[index]|0;
-            arr[index] = 0;
-            f(i+j, v);
-            assertEq(arr[index]|0, v);
-        }
+        // Loads
+        assertEq(f.load(i), v);
+
+        // Stores of immediates
+        arr[index] = 1;
+        f.storeZero(i);
+        assertEq(arr[index]|0, 0);
+        f.storeNegOne(i);
+        assertEq(arr[index]|0, index>>>0 < arr.length ? negOne : 0);
+
+        // Stores
+        arr[index] = ~v;
+        f.store(i, v);
+        assertEq(arr[index]|0, v);
     }
 }
 
 function testFloat(ctor, shift, scale, disp, coercion) {
     var arr = new ctor(ab);
-    var f = asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.' + ctor.name + '(b); var toF = glob.Math.fround; function f(i) {i=i|0; return ' + coercion + '(arr[((i<<' + scale + ')+' + disp + ')>>' + shift + ']) } return f'), this, null, ab);
-    for (var i of [0,1,2,3,4,1023,1024,1025,BUF_MIN-2,BUF_MIN-1,BUF_MIN,BUF_MIN+1])
-        assertEq(f(i), +arr[((i<<scale)+disp)>>shift]);
 
-    for (var i of [-Math.pow(2,31), Math.pow(2,31)-1, Math.pow(2,32)]) {
-        for (var j of [-8,-4,-1,0,1,4,8])
-            assertEq(f(i+j), +arr[(((i+j)<<scale)+disp)>>shift]);
-    }
+    var c = asmCompile('glob', 'imp', 'b',
+                       USE_ASM +
+                       'var arr=new glob.' + ctor.name + '(b); ' +
+                       'var toF = glob.Math.fround; ' +
+                       'function load(i) {i=i|0; return ' + coercion + '(arr[((i<<' + scale + ')+' + disp + ')>>' + shift + ']) } ' +
+                       'function store(i,j) {i=i|0;j=+j; arr[((i<<' + scale + ')+' + disp + ')>>' + shift + '] = j } ' +
+                       'return { load: load, store: store }');
+    var f = asmLink(c, this, null, ab);
 
-    var f = asmLink(asmCompile('glob', 'imp', 'b', USE_ASM + 'var arr=new glob.' + ctor.name + '(b); var toF = glob.Math.fround; function f(i,j) {i=i|0;j=+j; arr[((i<<' + scale + ')+' + disp + ')>>' + shift + '] = j } return f'), this, null, ab);
-    for (var i of [0,1,2,3,4,1023,1024,1025,4095,4096,4097]) {
+    for (var i of indices) {
         var index = ((i<<scale)+disp)>>shift;
         var v = +arr[index];
-        arr[index] = 0;
-        f(i, v);
-        assertEq(+arr[index], v);
-    }
 
-    for (var i of [-Math.pow(2,31), Math.pow(2,31)-1, Math.pow(2,32)]) {
-        for (var j of [-8,-4,-1,0,1,4,8]) {
-            var index = (((i+j)<<scale)+disp)>>shift;
-            var v = +arr[index];
-            arr[index] = 0;
-            f(i+j, v);
-            assertEq(+arr[index], v);
-        }
+        // Loads
+        assertEq(f.load(i), v);
+
+        // Stores
+        arr[index] = ~v;
+        f.store(i, v);
+        assertEq(+arr[index], v);
     }
 }
 
@@ -121,11 +88,146 @@
     testFloat(ctor, shift, scale, disp, "+");
 }
 
+function assertEqX4(observed, expected) {
+    assertEq(observed.x, expected.x);
+    assertEq(observed.y, expected.y);
+    assertEq(observed.z, expected.z);
+    assertEq(observed.w, expected.w);
+}
+
+function testSimdX4(ctor, shift, scale, disp, simdName, simdCtor) {
+    var arr = new ctor(ab);
+
+    var c = asmCompile('glob', 'imp', 'b',
+                       USE_ASM +
+                       'var arr=new glob.' + ctor.name + '(b); ' +
+                       'var SIMD_' + simdName + ' = glob.SIMD.' + simdName + '; ' +
+                       'var SIMD_' + simdName + '_check = SIMD_' + simdName + '.check; ' +
+                       'var SIMD_' + simdName + '_load = SIMD_' + simdName + '.load; ' +
+                       'var SIMD_' + simdName + '_loadXYZ = SIMD_' + simdName + '.loadXYZ; ' +
+                       'var SIMD_' + simdName + '_loadXY = SIMD_' + simdName + '.loadXY; ' +
+                       'var SIMD_' + simdName + '_loadX = SIMD_' + simdName + '.loadX; ' +
+                       'var SIMD_' + simdName + '_store = SIMD_' + simdName + '.store; ' +
+                       'var SIMD_' + simdName + '_storeXYZ = SIMD_' + simdName + '.storeXYZ; ' +
+                       'var SIMD_' + simdName + '_storeXY = SIMD_' + simdName + '.storeXY; ' +
+                       'var SIMD_' + simdName + '_storeX = SIMD_' + simdName + '.storeX; ' +
+                       'function load(i) {i=i|0; return SIMD_' + simdName + '_check(SIMD_' + simdName + '_load(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ')) } ' +
+                       'function loadXYZ(i) {i=i|0; return SIMD_' + simdName + '_check(SIMD_' + simdName + '_loadXYZ(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ')) } ' +
+                       'function loadXY(i) {i=i|0; return SIMD_' + simdName + '_check(SIMD_' + simdName + '_loadXY(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ')) } ' +
+                       'function loadX(i) {i=i|0; return SIMD_' + simdName + '_check(SIMD_' + simdName + '_loadX(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ')) } ' +
+                       'function store(i,j) {i=i|0;j=SIMD_' + simdName + '_check(j); SIMD_' + simdName + '_store(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ', j) } ' +
+                       'function storeXYZ(i,j) {i=i|0;j=SIMD_' + simdName + '_check(j); SIMD_' + simdName + '_storeXYZ(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ', j) } ' +
+                       'function storeXY(i,j) {i=i|0;j=SIMD_' + simdName + '_check(j); SIMD_' + simdName + '_storeXY(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ', j) } ' +
+                       'function storeX(i,j) {i=i|0;j=SIMD_' + simdName + '_check(j); SIMD_' + simdName + '_storeX(arr, ((i<<' + scale + ')+' + disp + ')>>' + shift + ', j) } ' +
+                       'return { load: load, loadXYZ: loadXYZ, loadXY: loadXY, loadX: loadX, store: store, storeXYZ: storeXYZ, storeXY : storeXY, storeX : storeX }');
+    var f = asmLink(c, this, null, ab);
+
+    for (var i of indices) {
+        var index = ((i<<scale)+disp)>>shift;
+
+        var v, vXYZ, vXY, vX;
+        var t = false, tXYZ = false, tXY = false, tX = false;
+        try { v = simdCtor.load(arr, index); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            t = true;
+        }
+        try { vXYZ = simdCtor.loadXYZ(arr, index); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            tXYZ = true;
+        }
+        try { vXY = simdCtor.loadXY(arr, index); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            tXY = true;
+        }
+        try { vX = simdCtor.loadX(arr, index); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            tX = true;
+        }
+
+        // Loads
+        var l, lXYZ, lXY, lX;
+        var r = false, rXYZ = false, rXY = false, rX = false;
+        try { l = f.load(i); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            r = true;
+        }
+        try { lXYZ = f.loadXYZ(i); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            rXYZ = true;
+        }
+        try { lXY = f.loadXY(i); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            rXY = true;
+        }
+        try { lX = f.loadX(i); }
+        catch (e) {
+            assertEq(e instanceof RangeError, true);
+            rX = true;
+        }
+        assertEq(t, r);
+        assertEq(tXYZ, rXYZ);
+        assertEq(tXY, rXY);
+        assertEq(tX, rX);
+        if (!t) assertEqX4(v, l);
+        if (!tXYZ) assertEqX4(vXYZ, lXYZ);
+        if (!tXY) assertEqX4(vXY, lXY);
+        if (!tX) assertEqX4(vX, lX);
+
+        // Stores
+        if (!t) {
+            simdCtor.store(arr, index, simdCtor.not(v));
+            f.store(i, v);
+            assertEqX4(simdCtor.load(arr, index), v);
+        } else
+            assertThrowsInstanceOf(() => f.store(i, simdCtor()), RangeError);
+        if (!tXYZ) {
+            simdCtor.storeXYZ(arr, index, simdCtor.not(vXYZ));
+            f.storeXYZ(i, vXYZ);
+            assertEqX4(simdCtor.loadXYZ(arr, index), vXYZ);
+        } else
+            assertThrowsInstanceOf(() => f.storeXYZ(i, simdCtor()), RangeError);
+        if (!tXY) {
+            simdCtor.storeXY(arr, index, simdCtor.not(vXY));
+            f.storeXY(i, vXY);
+            assertEqX4(simdCtor.loadXY(arr, index), vXY);
+        } else
+            assertThrowsInstanceOf(() => f.storeXY(i, simdCtor()), RangeError);
+        if (!tX) {
+            simdCtor.storeX(arr, index, simdCtor.not(vX));
+            f.storeX(i, vX);
+            assertEqX4(simdCtor.loadX(arr, index), vX);
+        } else
+            assertThrowsInstanceOf(() => f.storeX(i, simdCtor()), RangeError);
+    }
+}
+
+function testFloat32x4(ctor, shift, scale, disp) {
+    testSimdX4(ctor, shift, scale, disp, 'float32x4', SIMD.float32x4);
+}
+function testInt32x4(ctor, shift, scale, disp) {
+    testSimdX4(ctor, shift, scale, disp, 'int32x4', SIMD.int32x4);
+}
+
 function test(tester, ctor, shift) {
+    var arr = new ctor(ab);
+    for (var i = 0; i < arr.length; i++)
+        arr[i] = Math.imul(i, Math.imul((i & 1), 2) - 1);
     for (scale of [0,1,2,3]) {
-        for (disp of [0,1,8,Math.pow(2,31)-1,Math.pow(2,31),Math.pow(2,32)-1])
+        for (disp of [0,1,2,8,Math.pow(2,31)-1,Math.pow(2,31),Math.pow(2,32)-1])
             tester(ctor, shift, scale, disp);
     }
+    for (var i = 0; i < arr.length; i++) {
+        var v = arr[i];
+        arr[i] = Math.imul(i, Math.imul((i & 1), 2) - 1);
+        assertEq(arr[i], v);
+    }
 }
 
 test(testInt, Int8Array, 0);
@@ -136,3 +238,7 @@
 test(testInt, Uint32Array, 2);
 test(testFloat32, Float32Array, 2);
 test(testFloat64, Float64Array, 3);
+if (typeof SIMD !== 'undefined' && isSimdAvailable()) {
+    test(testInt32x4, Uint8Array, 0);
+    test(testFloat32x4, Uint8Array, 0);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/array-proto-outofrange.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/array-proto-outofrange.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/array-proto-outofrange.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/array-proto-outofrange.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,18 @@
+function f(obj) {
+    return typeof obj[15];
+}
+
+function test() {
+    var a = [1, 2];
+    a.__proto__ = {15: 1337};
+    var b = [1, 2, 3, 4];
+
+    for (var i = 0; i < 1000; i++) {
+        var r = f(i % 2 ? a : b);
+        assertEq(r, i % 2 ? "number" : "undefined");
+    }
+}
+
+test();
+test();
+test();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/bug1106982.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/bug1106982.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/bug1106982.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/bug1106982.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,13 @@
+var x = "wrong";
+var t = {x: "x"};
+var p = new Proxy(t, {
+    has(t, id) {
+        var found = id in t;
+        delete t[id];
+        return found;
+    },
+    get(t, id) { return t[id]; }
+});
+with (p)
+    x += " x";
+assertEq(t.x, "undefined x");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/bug1134146.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/bug1134146.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/bug1134146.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/bug1134146.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,10 @@
+
+function Foo(a, b) {
+    b = {};
+    this.b = b;
+};
+var a = [];
+for (var i = 0; i < 50; i++)
+    a.push(new Foo(i, i + 1));
+i = 0;
+a[i].c = i;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/bug1135718.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/bug1135718.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/bug1135718.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/bug1135718.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,13 @@
+
+setJitCompilerOption("ion.warmup.trigger", 30);
+function ArrayCallback(state)
+  this.state = state;
+ArrayCallback.prototype.isUpperCase = function(v, index, array) {
+    return this.state ? true : (v == v.toUpperCase());
+};
+strings = ['hello', 'Array', 'WORLD'];
+obj = new ArrayCallback(false);
+strings.filter(obj.isUpperCase, obj)
+obj = new ArrayCallback(true);
+strings.filter(obj.isUpperCase, obj)
+obj.__proto__ = {};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/dense-elements-appear.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/dense-elements-appear.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/dense-elements-appear.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/dense-elements-appear.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,28 @@
+function f() {
+    var x = [1, 2, 3];
+    var y = {};
+    x.__proto__ = y;
+
+    for (var i = 0; i < 200; i++) {
+        if (i == 100)
+            y[100000] = 15;
+        else
+            assertEq(typeof x[100000], i > 100 ? "number" : "undefined");
+    }
+}
+
+function g() {
+    var x = [1, 2, 3];
+    var y = {};
+    x.__proto__ = y;
+
+    for (var i = 0; i < 200; i++) {
+        if (i == 100)
+            y[4] = 15;
+        else
+            assertEq(typeof x[4], i > 100 ? "number" : "undefined");
+    }
+}
+
+f();
+g();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/expression-autopsy.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/expression-autopsy.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/expression-autopsy.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/expression-autopsy.js	2015-02-28 15:03:04.000000000 +0000
@@ -107,6 +107,7 @@
 check("o[+ (o)]");
 check("o[- (o)]");
 
+
 // A few one off tests
 check_one("6", (function () { 6() }), " is not a function");
 check_one("Array.prototype.reverse.call(...)", (function () { Array.prototype.reverse.call('123'); }), " is read-only");
@@ -114,6 +115,8 @@
           function () { var [{ x }] = [null, {}]; }, " is null");
 check_one(`(intermediate value)[Symbol.iterator](...).next(...).value`,
           function () { ieval("let (x) { var [a, b, [c0, c1]] = [x, x, x]; }") }, " is undefined");
+check_one("void 1", function() { (void 1)(); }, " is not a function");
+check_one("void o[1]", function() { var o = []; (void o[1])() }, " is not a function");
 
 // Check fallback behavior
 assertThrowsInstanceOf(function () { for (let x of undefined) {} }, TypeError);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/finally-implicit-return.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/finally-implicit-return.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/finally-implicit-return.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/finally-implicit-return.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,45 @@
+// Implicit return at the end of a function should return |undefined|,
+// even if we initially set another return value and then executed a finally
+// block.
+
+function test1() {
+    try {
+        try {
+            return 3;
+        } finally {
+            throw 4;
+        }
+    } catch (e) {}
+}
+assertEq(test1(), undefined);
+
+function test2() {
+    L: try {
+        return 3;
+    } finally {
+        break L;
+    }
+}
+assertEq(test2(), undefined);
+
+function test3() {
+    for (var i=0; i<2; i++) {
+        try {
+            return 5;
+        } finally {
+            continue;
+        }
+    }
+}
+assertEq(test3(), undefined);
+
+// "return;" should work the same way.
+function test4() {
+    L: try {
+        return 6;
+    } finally {
+        break L;
+    }
+    return;
+}
+assertEq(test4(), undefined);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/symbol-in-loop.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/symbol-in-loop.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/basic/symbol-in-loop.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/basic/symbol-in-loop.js	2015-02-28 15:03:04.000000000 +0000
@@ -1,6 +1,5 @@
 function f() {
-    if (typeof Symbol === "function")
-        return Object(Symbol());
+    return Object(Symbol());
 }
 
 for (var i = 0; i < 4; i++) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/bug1133196.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/bug1133196.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/bug1133196.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/bug1133196.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,16 @@
+// |jit-test| error: TypeError
+
+var g = newGlobal();
+g.parent = this;
+g.eval("(" + function() {
+    var dbg = new Debugger(parent);
+    dbg.onExceptionUnwind = function(frame) {
+        frame.older.onStep = function() {}
+    };
+} + ")()");
+function f() {
+    (function inner(arr) {
+        inner(arr.map);
+    })([]);
+}
+f();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Debugger-debuggees-06.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Debugger-debuggees-06.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Debugger-debuggees-06.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Debugger-debuggees-06.js	2015-02-28 15:03:04.000000000 +0000
@@ -17,8 +17,7 @@
 check(1);
 check(NaN);
 check("ok");
-if (typeof Symbol === "function")
-    check(Symbol("ok"));
+check(Symbol("ok"));
 
 // A Debugger.Object that belongs to a different Debugger object is invalid.
 var g = newGlobal();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Environment-names-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Environment-names-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Environment-names-02.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Environment-names-02.js	2015-02-28 15:03:04.000000000 +0000
@@ -18,8 +18,7 @@
            obj[" "] = 3;
            obj[""] = 4;
            obj[0] = 5;
-           if (typeof Symbol === "function")
-               obj[Symbol.for("moon")] = 6;
+           obj[Symbol.for("moon")] = 6;
            return obj;
        })
 g.eval("fill(this);\n" +
@@ -31,6 +30,5 @@
     assertEq(names.indexOf(" "), -1);
     assertEq(names.indexOf(""), -1);
     assertEq(names.indexOf("0"), -1);
-    if (typeof Symbol === "function")
-        assertEq(names.indexOf(Symbol.for("moon")), -1);
+    assertEq(names.indexOf(Symbol.for("moon")), -1);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/execution-observability-06.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/execution-observability-06.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/execution-observability-06.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/execution-observability-06.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,24 @@
+// Test that OSR respect debuggeeness.
+
+var g = newGlobal();
+var dbg = new Debugger(g);
+
+g.eval("" + function f(c) {
+  if (c == 0)
+    return;
+  if (c == 2)
+    debugger;
+  f(c-1);
+  acc = 0;
+  for (var i = 0; i < 100; i++)
+    acc += i;
+});
+
+var log = "";
+dbg.onDebuggerStatement = function (frame) {
+  frame.onPop = function f() { log += "p"; }
+};
+
+g.eval("f(2)");
+
+assertEq(log, "p");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-arguments-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-arguments-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-arguments-01.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-arguments-01.js	2015-02-28 15:03:04.000000000 +0000
@@ -22,9 +22,7 @@
 hits = 0;
 g.eval("args = []; f();");
 g.eval("this.f();");
-g.eval("var world = 'world'; " +
-       "if (typeof Symbol === 'function') " +
-       "    Symbol('world'); " +
+g.eval("var world = Symbol('world'); " +
        "args = ['hello', world, 3.14, true, false, null, undefined]; " +
        "f('hello', world, 3.14, true, false, null, undefined);");
 g.eval("f.apply(undefined, args);");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-02.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-02.js	2015-02-28 15:03:04.000000000 +0000
@@ -15,9 +15,7 @@
 
 g.eval("f(new Number(-0), '0');");
 g.eval("f(new String('ok'), 'ok');");
-if (typeof Symbol === "function") {
-    g.eval("f(Symbol('still ok'), 'Symbol(still ok)');");
-    g.eval("f(Object(Symbol('still ok')), 'Symbol(still ok)');");
-}
+g.eval("f(Symbol('still ok'), 'Symbol(still ok)');");
+g.eval("f(Object(Symbol('still ok')), 'Symbol(still ok)');");
 g.eval("f({toString: function () { return f; }}, f);");
-assertEq(hits, typeof Symbol === "function" ? 5 : 3);
+assertEq(hits, 5);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-03.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-03.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-03.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-evalWithBindings-03.js	2015-02-28 15:03:04.000000000 +0000
@@ -12,6 +12,5 @@
     hits++;
 };
 g.eval("function f() { debugger; }");
-var symbolExpr = typeof Symbol === "function" ? "Symbol('alpha')" : "'alpha'";
-g.eval("f(undefined, -0, NaN, '\uffff', " + symbolExpr + ", Array.prototype, Math, f);");
+g.eval("f(undefined, -0, NaN, '\uffff', Symbol('alpha'), Array.prototype, Math, f);");
 assertEq(hits, 1);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-onPop-17.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-onPop-17.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-onPop-17.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-onPop-17.js	2015-02-28 15:03:04.000000000 +0000
@@ -23,8 +23,7 @@
 test(false);
 test(1);
 test("stringy");
-if (typeof Symbol === "function")
-    test(Symbol("symbolic"));
+test(Symbol("symbolic"));
 test({});
 test([]);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-this-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-this-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-this-01.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-this-01.js	2015-02-28 15:03:04.000000000 +0000
@@ -16,11 +16,9 @@
 g.eval("f.call(v);");
 g.eval("String.prototype.f = f; v = 'hello'; v.f();");
 g.eval("f.call(v);");
-if (typeof Symbol === "function") {
-    g.eval("Symbol.prototype.f = f; v = Symbol('world'); v.f();");
-    g.eval("f.call(v);");
-}
+g.eval("Symbol.prototype.f = f; v = Symbol('world'); v.f();");
+g.eval("f.call(v);");
 g.eval("v = undefined; f.call(v);");
 g.eval("v = null; f.call(v);");
 
-assertEq(hits, typeof Symbol === "function" ? 10 : 8);
+assertEq(hits, 10);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-this-03.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-this-03.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Frame-this-03.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Frame-this-03.js	2015-02-28 15:03:04.000000000 +0000
@@ -21,11 +21,9 @@
 g.eval("f.call(v);");
 g.eval("String.prototype.f = f; v = 'hello'; v.f();");
 g.eval("f.call(v);");
-if (typeof Symbol === "function") {
-    g.eval("Symbol.prototype.f = f; v = Symbol('world'); v.f();");
-    g.eval("f.call(v);");
-}
+g.eval("Symbol.prototype.f = f; v = Symbol('world'); v.f();");
+g.eval("f.call(v);");
 g.eval("v = undefined; f.call(v);");
 g.eval("v = null; f.call(v);");
 
-assertEq(hits, typeof Symbol === "function" ? 10 : 8);
+assertEq(hits, 10);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-01.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-01.js	2015-02-28 15:03:05.000000000 +0000
@@ -26,10 +26,8 @@
 test("[,,,,,]");
 test("/a*a/");
 test("function () {}");
-if (typeof Symbol === "function") {
-    test("(function () {\n" +
-         "    var x = {};\n" +
-         "    x[Symbol()] = 1; x[Symbol.for('moon')] = 2; x[Symbol.iterator] = 3;\n" +
-         "    return x;\n" + 
-         "})()");
-}
+test("(function () {\n" +
+     "    var x = {};\n" +
+     "    x[Symbol()] = 1; x[Symbol.for('moon')] = 2; x[Symbol.iterator] = 3;\n" +
+     "    return x;\n" + 
+     "})()");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-02.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Object-getOwnPropertyNames-02.js	2015-02-28 15:03:05.000000000 +0000
@@ -4,8 +4,7 @@
 var dbg = Debugger();
 var gobj = dbg.addDebuggee(g);
 g.p = {xyzzy: 8};  // makes a cross-compartment wrapper
-if (typeof Symbol === "function")
-    g.p[Symbol.for("plugh")] = 9;
+g.p[Symbol.for("plugh")] = 9;
 var wp = gobj.getOwnPropertyDescriptor("p").value;
 var names = wp.getOwnPropertyNames();
 assertEq(names.length, 1);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Object-makeDebuggeeValue-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Object-makeDebuggeeValue-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/debug/Object-makeDebuggeeValue-01.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/debug/Object-makeDebuggeeValue-01.js	2015-02-28 15:03:05.000000000 +0000
@@ -38,7 +38,5 @@
 assertEq(gw.makeDebuggeeValue(1729), 1729);
 assertEq(gw.makeDebuggeeValue(Math.PI), Math.PI);
 assertEq(gw.makeDebuggeeValue(undefined), undefined);
-if (typeof Symbol === "function") {
-    var s = g.eval("Symbol('Stavromula Beta')");
-    assertEq(gw.makeDebuggeeValue(s), s);
-}
+var s = g.eval("Symbol('Stavromula Beta')");
+assertEq(gw.makeDebuggeeValue(s), s);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/gc/bug-1032206.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/gc/bug-1032206.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/gc/bug-1032206.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/gc/bug-1032206.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,5 +1,3 @@
-if (typeof Symbol === "function") {
-    gczeal(4);
-    var symbols = [Symbol(), Symbol("comet"), Symbol.for("moon"), Symbol.iterator, 0];
-    for (var a of symbols) {}
-}
+gczeal(4);
+var symbols = [Symbol(), Symbol("comet"), Symbol.for("moon"), Symbol.iterator, 0];
+for (var a of symbols) {}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/gc/bug-1035371.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/gc/bug-1035371.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/gc/bug-1035371.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/gc/bug-1035371.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,5 +1,4 @@
 x = function() {};
 y = new WeakMap;
 selectforgc({});;
-if (typeof Symbol === "function")
-    y.set(x, Symbol());
+y.set(x, Symbol());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/gc/bug-1039516.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/gc/bug-1039516.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/gc/bug-1039516.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/gc/bug-1039516.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,8 +1,6 @@
-if (typeof Symbol === "function") {
-    gczeal(9);
-    Symbol.for("a");
-    gcslice(1);
-    var a = Symbol.for("a");
-    gcslice();
-    print(Symbol.keyFor(a));
-}
+gczeal(9);
+Symbol.for("a");
+gcslice(1);
+var a = Symbol.for("a");
+gcslice();
+print(Symbol.keyFor(a));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/heap-analysis/findPath.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/heap-analysis/findPath.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/heap-analysis/findPath.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/heap-analysis/findPath.js	2015-02-28 15:03:05.000000000 +0000
@@ -42,10 +42,8 @@
   .assert(findPath(o, o));
 print(findPath(o, o).map((e) => e.edge).toString());
 
-if (typeof Symbol === "function") {
-    // Check that we can generate ubi::Nodes for Symbols.
-    var so = { sym: Symbol() };
-    Match.Pattern([{node: {}, edge: "sym" }])
-      .assert(findPath(so, so.sym));
-    print(findPath(so, so.sym).map((e) => e.edge).toString());
-}
+// Check that we can generate ubi::Nodes for Symbols.
+var so = { sym: Symbol() };
+Match.Pattern([{node: {}, edge: "sym" }])
+  .assert(findPath(so, so.sym));
+print(findPath(so, so.sym).map((e) => e.edge).toString());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/bug1054753.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/bug1054753.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/bug1054753.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/bug1054753.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,16 +1,13 @@
 // |jit-test| error: TypeError
-if (typeof Symbol === "function") {
-    g = (function() {
-        var Int32ArrayView = new Int32Array();
-        function f() {
-            Int32ArrayView[Symbol() >> 2]
-        }
-        return f;
-    })();
-    try {
-        g();
-    } catch (e) {}
+g = (function() {
+    var Int32ArrayView = new Int32Array();
+    function f() {
+        Int32ArrayView[Symbol() >> 2]
+    }
+    return f;
+})();
+try {
     g();
-} else {
-    throw new TypeError("pass");
-}
+} catch (e) {}
+g();
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/bug1132584.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/bug1132584.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/bug1132584.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/bug1132584.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,12 @@
+enableOsiPointRegisterChecks()
+function f() {}
+f.__defineGetter__("x", (function() {
+    this._
+}))
+for (var i = 0; i < 3; i++) {
+    (function() {
+        for (var j = 0; j < 1; j++) {
+            f.x + 1
+        }
+    })()
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/bug1132770.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/bug1132770.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/bug1132770.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/bug1132770.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,4 @@
+// |jit-test| error: too much recursion
+Object.defineProperty(this, "x", {set: function() { this.x = 2; }});
+setJitCompilerOption("ion.warmup.trigger", 30);
+x ^= 1;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/lsra-bug1112164.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/lsra-bug1112164.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/lsra-bug1112164.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/lsra-bug1112164.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,36 @@
+setJitCompilerOption("baseline.warmup.trigger", 10);
+setJitCompilerOption("ion.warmup.trigger", 30);
+
+var atan2 = Math.atan2;
+
+function reference(x, y, z, w) {
+  with({}) {}; /* prevent compilation */
+  return [ atan2(x + 0.1, w),
+           atan2(y + 0.1, z),
+           atan2(z + 0.1, y),
+           atan2(w + 0.1, x) ];
+}
+
+function generator(x, y, z, w) {
+  return [ atan2(x + 0.1, w),
+           atan2(y + 0.1, z),
+           atan2(z + 0.1, y),
+           atan2(w + 0.1, x) ];
+}
+
+function test() {
+  var min = -0.99999, step = 0.1, max = 1;
+  for (var x = min; x < max; x += step)
+    for (var y = min; y < max; y += step)
+      for (var z = min; z < max; z += step)
+        for (var w = min; w < max; w += step) {
+          var ref = reference(x, y, z, w);
+          var gen = generator(x, y, z, w);
+          assertEq(gen[0], ref[0]);
+          assertEq(gen[1], ref[1]);
+          assertEq(gen[2], ref[2]);
+          assertEq(gen[3], ref[3]);
+        }
+}
+
+test();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/object-create-with-primitive-second-arg-in-ion.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/object-create-with-primitive-second-arg-in-ion.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/object-create-with-primitive-second-arg-in-ion.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/object-create-with-primitive-second-arg-in-ion.js	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,8 @@
+// |jit-test| ion-eager
+load(libdir + "asserts.js");
+
+[1, "", true, Symbol(), undefined].forEach(props => {
+    assertEq(Object.getPrototypeOf(Object.create(null, props)), null);
+});
+
+assertThrowsInstanceOf(() => Object.create(null, null), TypeError);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/testFloat32.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/testFloat32.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/ion/testFloat32.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/ion/testFloat32.js	2015-02-28 15:03:05.000000000 +0000
@@ -37,6 +37,12 @@
         }))
     })();
     //
+    (function() {
+        // bug 1134298
+        for (var k = 0; k < 1; k++) {
+            Math.fround(Math.ceil(Math.fround(Math.acos(3.0))))
+        }
+    })();
 })();
 //
 // ION TESTS
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/pic/watch5.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/pic/watch5.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/pic/watch5.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/pic/watch5.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,29 +1,27 @@
 // test against future pic support for symbols
 
-if (typeof Symbol === "function") {
-    // assignments to watched objects must not be cached
-    var obj = {};
-    var x = Symbol.for("x");
-    obj[x] = 0;
-    var hits = 0;
-    obj.watch(x, function (id, oldval, newval) { hits++; return newval; });
-    for (var i = 0; i < 10; i++)
-        obj[x] = i;
-    assertEq(hits, 10);
+// assignments to watched objects must not be cached
+var obj = {};
+var x = Symbol.for("x");
+obj[x] = 0;
+var hits = 0;
+obj.watch(x, function (id, oldval, newval) { hits++; return newval; });
+for (var i = 0; i < 10; i++)
+    obj[x] = i;
+assertEq(hits, 10);
 
-    // assignments to watched properties via ++ must not be cached
-    hits = 0;
-    for (var i = 0; i < 10; i++)
-        obj[x]++;
-    assertEq(hits, 10);
+// assignments to watched properties via ++ must not be cached
+hits = 0;
+for (var i = 0; i < 10; i++)
+    obj[x]++;
+assertEq(hits, 10);
 
-    // adding assignment + watchpoint vs. caching
-    hits = 0;
-    obj = {};
-    obj.watch(x, function (id, oldval, newval) { hits++; return newval; });
-    for (var i = 0; i < 10; i++) {
-        obj[x] = 1;
-        delete obj[x];
-    }
-    assertEq(hits, 10);
+// adding assignment + watchpoint vs. caching
+hits = 0;
+obj = {};
+obj.watch(x, function (id, oldval, newval) { hits++; return newval; });
+for (var i = 0; i < 10; i++) {
+    obj[x] = 1;
+    delete obj[x];
 }
+assertEq(hits, 10);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty1.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty1.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty1.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty1.js	2015-02-28 15:03:05.000000000 +0000
@@ -15,10 +15,7 @@
     assertEq(desc.configurable, true);
 }
 
-var keys = ['foo'];
-if (typeof Symbol === "function")
-    keys.push(Symbol("quux"));
-for (var key of keys) {
+for (var key of ['foo', Symbol("quux")]) {
     target = {};
     testProxy(new Proxy(target, {}), key);
     target = {};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty2.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyDefineProperty2.js	2015-02-28 15:03:05.000000000 +0000
@@ -23,15 +23,11 @@
     configurable: true
 };
 
-function quux() {
-    return typeof Symbol === "function" ? Symbol.for('quux') : 'quux';
-}
-
 for (let p of [new Proxy(target, handler), Proxy.revocable(target, handler).proxy]) {
     var log = [];
     Object.defineProperty(p, 'foo', desc);
-    Object.defineProperty(p, quux(), desc);
+    Object.defineProperty(p, Symbol.for('quux'), desc);
     assertEq(log.length, 2);
     assertEq(log[0], 'foo');
-    assertEq(log[1], quux());
+    assertEq(log[1], Symbol.for('quux'));
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet1.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet1.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet1.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet1.js	2015-02-28 15:03:05.000000000 +0000
@@ -5,10 +5,8 @@
     assertEq(p['foo'], 'bar');
 }
 
-if (typeof Symbol === "function") {
-    var s = Symbol.for("moon");
-    var obj = {};
-    obj[s] = "dust";
-    for (let p of [new Proxy(obj, {}), Proxy.revocable(obj, {}).proxy])
-        assertEq(p[s], "dust");
-}
+var s = Symbol.for("moon");
+var obj = {};
+obj[s] = "dust";
+for (let p of [new Proxy(obj, {}), Proxy.revocable(obj, {}).proxy])
+    assertEq(p[s], "dust");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet2.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet2.js	2015-02-28 15:03:05.000000000 +0000
@@ -4,10 +4,7 @@
  * as the third argument
  */
 var target = {};
-var keys = ['foo'];
-if (typeof Symbol === "function")
-    keys.push(Symbol.iterator);
-for (var key of keys) {
+for (var key of ['foo', Symbol.iterator]) {
     handler = {};
     for (let p of [new Proxy(target, handler), Proxy.revocable(target, handler).proxy]) {
         handler.get =
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet5.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet5.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet5.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGet5.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,9 +1,7 @@
 // Return the trap result
 var target = { foo: 'bar' };
-if (typeof Symbol === "function") {
-    var s1 = Symbol("moon"), s2 = Symbol("sun");
-    target[s1] = "wrong";
-}
+var s1 = Symbol("moon"), s2 = Symbol("sun");
+target[s1] = "wrong";
 
 var handler = { };
 for (let p of [new Proxy(target, handler), Proxy.revocable(target, handler).proxy]) {
@@ -13,8 +11,6 @@
     handler.get = (() => undefined);
     assertEq(p.foo, undefined);
 
-    if (typeof Symbol === "function") {
-        handler.get = (() => s2);
-        assertEq(p[s1], s2);
-    }
+    handler.get = (() => s2);
+    assertEq(p[s1], s2);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGetOwnPropertyNames1.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGetOwnPropertyNames1.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGetOwnPropertyNames1.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyGetOwnPropertyNames1.js	2015-02-28 15:03:05.000000000 +0000
@@ -21,8 +21,7 @@
     }
 });
 
-if (typeof Symbol === "function")
-    objCD[Symbol("moon")] = "something";
+objCD[Symbol("moon")] = "something";
 for (let p of [new Proxy(objCD, {}), Proxy.revocable(objCD, {}).proxy]) {
     var names = Object.getOwnPropertyNames(p);
     assertEq(names.length, 2);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas1.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas1.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas1.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas1.js	2015-02-28 15:03:05.000000000 +0000
@@ -14,6 +14,5 @@
     assertEq('foo' in p, true);
     assertEq('bar' in p, true);
     assertEq('baz' in p, false);
-    if (typeof Symbol === "function")
-        assertEq(Symbol() in p, false);
+    assertEq(Symbol() in p, false);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas2.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas2.js	2015-02-28 15:03:05.000000000 +0000
@@ -3,10 +3,7 @@
  * argument, and the name of the property as the second argument
  */
 var target = {};
-var keys = ['foo'];
-if (typeof Symbol === "function")
-    keys.push(Symbol('bar'));
-for (var key of keys) {
+for (var key of ['foo', Symbol('bar')]) {
     var called;
     var handler = {
         has: function (target1, name) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas6.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas6.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas6.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHas6.js	2015-02-28 15:03:05.000000000 +0000
@@ -9,6 +9,5 @@
 
 for (let p of [new Proxy(target, handler), Proxy.revocable(target, handler).proxy]) {
     assertEq('foo' in p, false);
-    if (typeof Symbol === "function")
-        assertEq(Symbol.iterator in p, false);
+    assertEq(Symbol.iterator in p, false);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHasOwnProperty.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHasOwnProperty.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHasOwnProperty.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxyHasOwnProperty.js	2015-02-28 15:03:05.000000000 +0000
@@ -9,19 +9,16 @@
         configurable: true
     }
 };
-if (typeof Symbol === "function")
-    descs[Symbol.for("quux")] = {configurable: true};
+descs[Symbol.for("quux")] = {configurable: true};
 var target = Object.create(proto, descs);
 
 for (let p of [new Proxy(target, {}), Proxy.revocable(target, {}).proxy]) {
     assertEq(({}).hasOwnProperty.call(p, 'foo'), false);
     assertEq(({}).hasOwnProperty.call(p, 'bar'), true);
     assertEq(({}).hasOwnProperty.call(p, 'quux'), false);
-    if (typeof Symbol === "function") {
-        assertEq(({}).hasOwnProperty.call(p, Symbol('quux')), false);
-        assertEq(({}).hasOwnProperty.call(p, 'Symbol(quux)'), false);
-        assertEq(({}).hasOwnProperty.call(p, Symbol.for('quux')), true);
-    }
+    assertEq(({}).hasOwnProperty.call(p, Symbol('quux')), false);
+    assertEq(({}).hasOwnProperty.call(p, 'Symbol(quux)'), false);
+    assertEq(({}).hasOwnProperty.call(p, Symbol.for('quux')), true);
 }
 
 // Make sure only the getOwnPropertyDescriptor trap is called, and not the has
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet1.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet1.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet1.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet1.js	2015-02-28 15:03:05.000000000 +0000
@@ -10,11 +10,9 @@
     p['foo'] = 'buz';
     assertEq(target.foo, 'buz');
 
-    if (typeof Symbol === "function") {
-        var sym = Symbol.for('quux');
-        p[sym] = sym;
-        assertEq(target[sym], sym);
-        // Reset for second iteration
-        target[sym] = undefined;
-    }
+    var sym = Symbol.for('quux');
+    p[sym] = sym;
+    assertEq(target[sym], sym);
+    // Reset for second iteration
+    target[sym] = undefined;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet2.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet2.js	2015-02-28 15:03:05.000000000 +0000
@@ -4,10 +4,7 @@
  * third argument, and the receiver as the fourth argument
  */
 var target = {};
-var keys = ['foo'];
-if (typeof Symbol === "function")
-    keys.push(Symbol.for('quux'));
-for (var key of keys) {
+for (var key of ['foo', Symbol.for('quux')]) {
     var handler = { };
     for (let p of [new Proxy(target, handler), Proxy.revocable(target, handler).proxy]) {
         handler.set = function (target1, name, val, receiver) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet3.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet3.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet3.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/proxy/testDirectProxySet3.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,10 +1,7 @@
 load(libdir + "asserts.js");
 
 // Throw a TypeError if the trap sets a non-writable, non-configurable property
-var keys = ['foo'];
-if (typeof Symbol === "function")
-    keys.push(Symbol.for('quux'));
-for (var key of keys) {
+for (var key of ['foo', Symbol.for('quux')]) {
     var target = {};
     Object.defineProperty(target, key, {
         value: 'bar',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/self-test/assertDeepEq.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/self-test/assertDeepEq.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/self-test/assertDeepEq.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/self-test/assertDeepEq.js	2015-02-28 15:03:05.000000000 +0000
@@ -14,24 +14,22 @@
 assertNotDeepEq({}, null);
 
 // symbols
-if (typeof Symbol === "function") {
-    assertDeepEq(Symbol(), Symbol());
-    assertNotDeepEq(Symbol(), Symbol(""));
-    assertDeepEq(Symbol("tweedledum"), Symbol("tweedledum"));
-    assertNotDeepEq(Symbol("tweedledum"), Symbol("alice"));
-    assertNotDeepEq(Symbol("what-its-called"), Symbol.for("what-its-called"));
-    assertNotDeepEq(Symbol.iterator, Symbol.for("Symbol.iterator"));
-    assertDeepEq([Symbol(), Symbol(), Symbol()],
-                 [Symbol(), Symbol(), Symbol()]);
-    var sym = Symbol();
-    assertDeepEq([sym, sym], [sym, sym]);
-    assertNotDeepEq([sym, sym], [Symbol(), Symbol()]);
-    assertNotDeepEq([sym, sym], [Symbol(), sym]);
-    var obj1 = {}, obj2 = {};
-    obj1[Symbol("x")] = "y";
-    obj2[Symbol("x")] = "y";
-    assertDeepEq(obj1, obj2);
-}
+assertDeepEq(Symbol(), Symbol());
+assertNotDeepEq(Symbol(), Symbol(""));
+assertDeepEq(Symbol("tweedledum"), Symbol("tweedledum"));
+assertNotDeepEq(Symbol("tweedledum"), Symbol("alice"));
+assertNotDeepEq(Symbol("what-its-called"), Symbol.for("what-its-called"));
+assertNotDeepEq(Symbol.iterator, Symbol.for("Symbol.iterator"));
+assertDeepEq([Symbol(), Symbol(), Symbol()],
+             [Symbol(), Symbol(), Symbol()]);
+var sym = Symbol();
+assertDeepEq([sym, sym], [sym, sym]);
+assertNotDeepEq([sym, sym], [Symbol(), Symbol()]);
+assertNotDeepEq([sym, sym], [Symbol(), sym]);
+var obj1 = {}, obj2 = {};
+obj1[Symbol("x")] = "y";
+obj2[Symbol("x")] = "y";
+assertDeepEq(obj1, obj2);
 
 // objects
 assertDeepEq({}, {});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/binary-arith.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/binary-arith.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/binary-arith.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/binary-arith.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,23 @@
+load(libdir + 'simd.js');
+
+setJitCompilerOption("ion.warmup.trigger", 50);
+
+function f() {
+    var i1 = SIMD.int32x4(1, 2, 3, 4);
+    var i2 = SIMD.int32x4(4, 3, 2, 1);
+
+    var f1 = SIMD.float32x4(1, 2, 3, 4);
+    var f2 = SIMD.float32x4(4, 3, 2, 1);
+
+    for (var i = 0; i < 150; i++) {
+        assertEqX4(SIMD.float32x4.add(f1, f2), binaryX4((x, y) => x + y, f1, f2));
+        assertEqX4(SIMD.float32x4.sub(f1, f2), binaryX4((x, y) => x - y, f1, f2));
+        assertEqX4(SIMD.float32x4.mul(f1, f2), binaryX4((x, y) => x * y, f1, f2));
+
+        assertEqX4(SIMD.int32x4.add(i1, i2), binaryX4((x, y) => x + y, i1, i2));
+        assertEqX4(SIMD.int32x4.sub(i1, i2), binaryX4((x, y) => x - y, i1, i2));
+        assertEqX4(SIMD.int32x4.mul(i1, i2), binaryX4((x, y) => x * y, i1, i2));
+    }
+}
+
+f();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/bug1130845.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/bug1130845.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/bug1130845.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/bug1130845.js	2015-02-28 15:03:04.000000000 +0000
@@ -1,3 +1,6 @@
+if (!this.hasOwnProperty("SIMD"))
+  quit();
+
 var int32x4 = SIMD.int32x4;
 function test() {
   var a = int32x4();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/complex-4.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/complex-4.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/complex-4.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/complex-4.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,70 @@
+load(libdir + 'simd.js');
+
+if (typeof SIMD === "undefined")
+    quit();
+
+setJitCompilerOption("baseline.warmup.trigger", 10);
+setJitCompilerOption("ion.warmup.trigger", 90);
+var max = 100; // Make have the warm-up counter high enough to
+               // consider inlining functions.
+
+var f4 = SIMD.int32x4; // :TODO: Support float32x4 arith.
+var f4add = f4.add;
+var f4sub = f4.sub;
+var f4mul = f4.mul;
+
+function c4mul(z1, z2) {
+  var { re: re1, im: im1 } = z1;
+  var { re: re2, im: im2 } = z2;
+  var rere = f4mul(re1, re2);
+  var reim = f4mul(re1, im2);
+  var imre = f4mul(im1, re2);
+  var imim = f4mul(im1, im2);
+  return { re: f4sub(rere, imim), im: f4add(reim, imre) };
+}
+
+function c4inv(z) {
+  var { re: re, im: im } = z;
+  var minus = f4(-1, -1, -1, -1);
+  return { re: re, im: f4mul(im, minus) };
+}
+
+function c4inv_inplace(z) {
+  var res = c4inv(z);
+  z.re = res.re;
+  z.im = res.im;
+}
+
+function c4norm(z) {
+  var { re: re, im: im } = c4mul(z, c4inv(z));
+  return re;
+}
+
+function c4scale(z, s) {
+  var { re: re, im: im } = z;
+  var f4s = f4(s, s, s, s);
+  return { re: f4mul(re, f4s), im: f4mul(im, f4s) };
+}
+
+var rotate90 = { re: f4(0, 0, 0, 0), im: f4(1, 1, 1, 1) };
+var cardinals = { re: f4(1, 0, -1, 0), im: f4(0, 1, 0, -1) };
+
+function test(dots) {
+  for (var j = 0; j < 4; j++) {
+    dots = c4mul(rotate90, dots);
+    if (j % 2 == 0) // Magic !
+      c4inv_inplace(dots);
+    dots = c4scale(dots, 2);
+  }
+  return dots;
+}
+
+assertEqX4(c4norm(cardinals), simdToArray(f4.splat(1)));
+var cardinals16 = c4scale(cardinals, 16);
+
+for (var i = 0; i < max; i++) {
+  var res = test(cardinals);
+  assertEqX4(c4norm(res), simdToArray(f4.splat(16 * 16)));
+  assertEqX4(res.re, simdToArray(cardinals16.re));
+  assertEqX4(res.im, simdToArray(cardinals16.im));
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-arith.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-arith.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-arith.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-arith.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,33 @@
+load(libdir + 'simd.js');
+
+setJitCompilerOption("ion.warmup.trigger", 50);
+
+function maxNum(x, y) {
+    if (x != x)
+        return y;
+    if (y != y)
+        return x;
+    return Math.max(x, y);
+}
+
+function minNum(x, y) {
+    if (x != x)
+        return y;
+    if (y != y)
+        return x;
+    return Math.min(x, y);
+}
+
+function f() {
+    var f1 = SIMD.float32x4(1, 2, 3, 4);
+    var f2 = SIMD.float32x4(4, 3, 2, 1);
+    for (var i = 0; i < 150; i++) {
+        assertEqX4(SIMD.float32x4.div(f1, f2), binaryX4((x, y) => x / y, f1, f2));
+        assertEqX4(SIMD.float32x4.min(f1, f2), binaryX4(Math.min, f1, f2));
+        assertEqX4(SIMD.float32x4.max(f1, f2), binaryX4(Math.max, f1, f2));
+        assertEqX4(SIMD.float32x4.minNum(f1, f2), binaryX4(minNum, f1, f2));
+        assertEqX4(SIMD.float32x4.maxNum(f1, f2), binaryX4(maxNum, f1, f2));
+    }
+}
+
+f();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-bitwise.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-bitwise.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-bitwise.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/float32x4-binary-bitwise.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+load(libdir + "simd.js");
+
+setJitCompilerOption("ion.warmup.trigger", 50);
+
+var helpers = (function() {
+    var i32 = new Int32Array(2);
+    var f32 = new Float32Array(i32.buffer);
+    return {
+        and: function(x, y) {
+            f32[0] = x;
+            f32[1] = y;
+            i32[0] = i32[0] & i32[1];
+            return f32[0];
+        },
+        or: function(x, y) {
+            f32[0] = x;
+            f32[1] = y;
+            i32[0] = i32[0] | i32[1];
+            return f32[0];
+        },
+        xor: function(x, y) {
+            f32[0] = x;
+            f32[1] = y;
+            i32[0] = i32[0] ^ i32[1];
+            return f32[0];
+        },
+    }
+})();
+
+function f() {
+    var f1 = SIMD.float32x4(1, 2, 3, 4);
+    var f2 = SIMD.float32x4(4, 3, 2, 1);
+    for (var i = 0; i < 150; i++) {
+        assertEqX4(SIMD.float32x4.and(f1, f2), binaryX4(helpers.and, f1, f2));
+        assertEqX4(SIMD.float32x4.or(f1, f2),  binaryX4(helpers.or, f1, f2));
+        assertEqX4(SIMD.float32x4.xor(f1, f2), binaryX4(helpers.xor, f1, f2));
+    }
+}
+
+f();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/nursery-overflow.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/nursery-overflow.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/nursery-overflow.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/nursery-overflow.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,29 @@
+load(libdir + 'simd.js');
+
+if (typeof SIMD === "undefined")
+    quit();
+
+setJitCompilerOption("baseline.warmup.trigger", 10);
+setJitCompilerOption("ion.warmup.trigger", 30);
+
+var i4 = SIMD.int32x4;
+var i4sub = SIMD.int32x4.sub;
+
+function simdbox(i) {
+  return i4(i, i, i, i);
+}
+
+function test() {
+  var arr = [];
+
+  // overflow the nursery with live SIMD objects.
+  for (var i = 0; i < 100000; i++) {
+    arr.push(simdbox(i));
+  }
+
+  return arr;
+}
+
+var arr = test();
+for (var i = 0; i < arr.length; i++)
+  assertEqX4(arr[i], [i, i, i, i]);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/recover.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/recover.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/SIMD/recover.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/SIMD/recover.js	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,40 @@
+load(libdir + 'simd.js');
+
+if (!this.hasOwnProperty("SIMD"))
+  quit();
+
+setJitCompilerOption("baseline.warmup.trigger", 10);
+setJitCompilerOption("ion.warmup.trigger", 20);
+
+// This function is used to cause an invalidation after having removed a branch
+// after DCE.  This is made to check if we correctly recover an array
+// allocation.
+var uceFault = function (i) {
+    if (i > 98)
+        uceFault = function (i) { return true; };
+    return false;
+};
+
+// Check that we can correctly recover a boxed value.
+var uceFault_simdBox_i4 = eval(uneval(uceFault).replace('uceFault', 'uceFault_simdBox_i4'));
+function simdBox_i4(i) {
+    var a = SIMD.int32x4(i, i, i, i);
+    if (uceFault_simdBox_i4(i) || uceFault_simdBox_i4(i)) {
+        assertEqX4(a, [i, i, i, i]);
+    }
+    return 0;
+}
+
+var uceFault_simdBox_f4 = eval(uneval(uceFault).replace('uceFault', 'uceFault_simdBox_f4'));
+function simdBox_f4(i) {
+    var a = SIMD.float32x4(i, i + 0.1, i + 0.2, i + 0.3);
+    if (uceFault_simdBox_f4(i) || uceFault_simdBox_f4(i)) {
+        assertEqX4(a, [i, i + 0.1, i + 0.2, i + 0.3].map(Math.fround));
+    }
+    return 0;
+}
+
+for (var i = 0; i < 100; i++) {
+    simdBox_i4(i);
+    simdBox_f4(i);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/bug-1033856.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/bug-1033856.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/bug-1033856.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/bug-1033856.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,12 +1,6 @@
-function sym() {
-    return typeof Symbol === "function" ? Symbol() : "non-symbol";
-}
-
 function f(x, y) {
     return x == y;
 }
-
 f(1.1, 2.2);
 for (var i=0; i<5; i++)
-    f(1, sym());
-
+    f(1, Symbol());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/not.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/not.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/not.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/not.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,9 +1,7 @@
-var sym = this.Symbol || (() => "truthy");
-
 for (var i = 0; i < 9; i++)
-    assertEq(!sym(), false, "symbols are truthy");
+    assertEq(!Symbol(), false, "symbols are truthy");
 
-var a = [0, 0, 0, 0, 0, sym(), sym()];
+var a = [0, 0, 0, 0, 0, Symbol(), Symbol()];
 var b = [];
 function f(i, v) {
     b[i] = !v;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/toNumber.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/toNumber.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/toNumber.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/toNumber.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,24 +1,36 @@
 load(libdir + "asserts.js");
 
+var sym = Symbol();
+
 function add2(x) {
     return x + 2;
 }
+for (var i = 0; i < 9; i++)
+    assertThrowsInstanceOf(() => add2(sym), TypeError);
 
 function sqr(x) {
     return x * x;
 }
+for (var i = 0; i < 9; i++)
+    assertThrowsInstanceOf(() => sqr(sym), TypeError);
 
 function bit_or(x) {
     return x | x;
 }
+for (var i = 0; i < 9; i++)
+    assertThrowsInstanceOf(() => bit_or(sym), TypeError);
 
 function bit_not(x) {
     return ~x;
 }
+for (var i = 0; i < 9; i++)
+    assertThrowsInstanceOf(() => bit_not(sym), TypeError);
 
 function plus(x) {
     return +x;
 }
+for (var i = 0; i < 9; i++)
+    assertThrowsInstanceOf(() => plus(sym), TypeError);
 
 function f(a, b) {
     return a + b;
@@ -34,22 +46,8 @@
     assertThrowsInstanceOf(() => f(13.719, Symbol("14")), TypeError);
 }
 
-if (typeof Symbol === "function") {
-    var sym = Symbol();
-
-    for (var i = 0; i < 9; i++)
-        assertThrowsInstanceOf(() => add2(sym), TypeError);
-    for (var i = 0; i < 9; i++)
-        assertThrowsInstanceOf(() => sqr(sym), TypeError);
-    for (var i = 0; i < 9; i++)
-        assertThrowsInstanceOf(() => bit_or(sym), TypeError);
-    for (var i = 0; i < 9; i++)
-        assertThrowsInstanceOf(() => bit_not(sym), TypeError);
-    for (var i = 0; i < 9; i++)
-        assertThrowsInstanceOf(() => plus(sym), TypeError);
-    for (var i = 0; i < 9; i++)
-        testPoly();
+for (var i = 0; i < 9; i++)
+    testPoly();
 
-    for (var i = 0; i < 9; i++)
-        assertThrowsInstanceOf(() => assertEq(f(Symbol("14"), "40"), NaN), TypeError);
-}
+for (var i = 0; i < 9; i++)
+    assertThrowsInstanceOf(() => assertEq(f(Symbol("14"), "40"), NaN), TypeError);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/toString.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/toString.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/toString.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/toString.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,13 +1,11 @@
 // ToString(symbol) throws a TypeError.
 
-if (typeof Symbol === "function") {
-    var N = 10, obj, hits = 0;
-    for (var i = 0; i < N; i++) {
-        try {
-            obj = new String(Symbol());
-        } catch (exc) {
-            hits++;
-        }
+var N = 10, obj, hits = 0;
+for (var i = 0; i < N; i++) {
+    try {
+        obj = new String(Symbol());
+    } catch (exc) {
+        hits++;
     }
-    assertEq(hits, N);
 }
+assertEq(hits, N);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/truthiness.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/truthiness.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/truthiness.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/truthiness.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,9 +1,7 @@
-var sym = this.Symbol || (() => "truthy");
-
 for (var i = 0; i < 9; i++)
-    assertEq(sym() ? 1 : 0, 1, "symbols are truthy");
+    assertEq(Symbol() ? 1 : 0, 1, "symbols are truthy");
 
-var a = [0, 0, 0, 0, 0, sym(), sym()];
+var a = [0, 0, 0, 0, 0, Symbol(), Symbol()];
 var b = [];
 function f(i, v) {
     b[i] = v ? "yes" : "no";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/typed-arrays.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/typed-arrays.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/typed-arrays.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/typed-arrays.js	2015-02-28 15:03:05.000000000 +0000
@@ -2,30 +2,28 @@
 
 var LENGTH = 1024, SYMBOL_INDEX = 999;
 
-if (typeof Symbol === "function") {
-    var big = [];
-    for (var i = 0; i < LENGTH; i++)
-        big[i] = (i === SYMBOL_INDEX ? Symbol.for("comet") : i);
+var big = [];
+for (var i = 0; i < LENGTH; i++)
+    big[i] = (i === SYMBOL_INDEX ? Symbol.for("comet") : i);
 
-    var progress;
-    function copy(arr, big) {
-        for (var i = 0; i < LENGTH; i++) {
-            arr[i] = big[i];
-            progress = i;
-        }
+var progress;
+function copy(arr, big) {
+    for (var i = 0; i < LENGTH; i++) {
+        arr[i] = big[i];
+        progress = i;
     }
+}
 
-    for (var T of [Uint8Array, Uint8ClampedArray, Int16Array, Float32Array]) {
-        // Typed array constructors convert symbols using ToNumber, which throws.
-        assertThrowsInstanceOf(() => new T(big), TypeError);
+for (var T of [Uint8Array, Uint8ClampedArray, Int16Array, Float32Array]) {
+    // Typed array constructors convert symbols using ToNumber, which throws.
+    assertThrowsInstanceOf(() => new T(big), TypeError);
 
-        // Element assignment does the same.
-        var arr = new T(big.length);
-        for (var k = 0; k < 3; k++) {
-            progress = -1;
-            assertThrowsInstanceOf(() => copy(arr, big), TypeError);
-            assertEq(progress, SYMBOL_INDEX - 1);
-            assertEq(arr[SYMBOL_INDEX], 0);
-        }
+    // Element assignment does the same.
+    var arr = new T(big.length);
+    for (var k = 0; k < 3; k++) {
+        progress = -1;
+        assertThrowsInstanceOf(() => copy(arr, big), TypeError);
+        assertEq(progress, SYMBOL_INDEX - 1);
+        assertEq(arr[SYMBOL_INDEX], 0);
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/typeof.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/typeof.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jit-test/tests/symbol/typeof.js	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jit-test/tests/symbol/typeof.js	2015-02-28 15:03:05.000000000 +0000
@@ -1,18 +1,9 @@
-function sym() {
-    return typeof Symbol === "function" ? Symbol() : "symbol";
-}
-
-function typ() {
-    return typeof Symbol === "function" ? "symbol" : "string";
-}
-
-var a = [0, 0, 0, 0, 0, sym(), sym()];
+var a = [0, 0, 0, 0, 0, Symbol(), Symbol()];
 var b = [];
 function f(i, v) {
     b[i] = typeof v;
 }
 for (var i = 0; i < a.length; i++)
     f(i, a[i]);
-assertEq(b[b.length - 2], typ());
-assertEq(b[b.length - 1], typ());
-
+assertEq(b[b.length - 2], "symbol");
+assertEq(b[b.length - 1], "symbol");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsalloc.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsalloc.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsalloc.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsalloc.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -19,5 +19,5 @@
 void
 TempAllocPolicy::reportAllocOverflow() const
 {
-    js_ReportAllocationOverflow(static_cast<ExclusiveContext *>(cx_));
+    ReportAllocationOverflow(static_cast<ExclusiveContext *>(cx_));
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -120,7 +120,7 @@
     if (length() < required) {
         char numArgsStr[40];
         JS_snprintf(numArgsStr, sizeof numArgsStr, "%u", required - 1);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              fnname, numArgsStr, required == 2 ? "" : "s");
         return false;
     }
@@ -403,6 +403,9 @@
     if (!CreateHelperThreadsState())
         return false;
 
+    if (!FutexRuntime::initialize())
+        return false;
+
     jsInitState = Running;
     return true;
 }
@@ -422,6 +425,8 @@
     }
 #endif
 
+    FutexRuntime::destroy();
+
     DestroyHelperThreadsState();
 
 #ifdef JS_TRACE_LOGGING
@@ -506,18 +511,6 @@
     rt->data = data;
 }
 
-JS_PUBLIC_API(JS::PerRuntimeFutexAPI *)
-JS::GetRuntimeFutexAPI(JSRuntime *rt)
-{
-    return rt->futexAPI_;
-}
-
-JS_PUBLIC_API(void)
-JS::SetRuntimeFutexAPI(JSRuntime *rt, JS::PerRuntimeFutexAPI *fx)
-{
-    rt->futexAPI_ = fx;
-}
-
 static void
 StartRequest(JSContext *cx)
 {
@@ -1621,8 +1614,8 @@
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, obj, parent_proto);
-    return js_InitClass(cx, obj, parent_proto, Valueify(clasp), constructor,
-                        nargs, ps, fs, static_ps, static_fs);
+    return InitClass(cx, obj, parent_proto, Valueify(clasp), constructor,
+                     nargs, ps, fs, static_ps, static_fs);
 }
 
 JS_PUBLIC_API(bool)
@@ -1705,7 +1698,7 @@
 
     if (!succeeded) {
         RootedValue val(cx, ObjectValue(*obj));
-        js_ReportValueError(cx, JSMSG_SETPROTOTYPEOF_FAIL, JSDVG_IGNORE_STACK, val, js::NullPtr());
+        ReportValueError(cx, JSMSG_SETPROTOTYPEOF_FAIL, JSDVG_IGNORE_STACK, val, js::NullPtr());
         return false;
     }
 
@@ -1731,18 +1724,6 @@
     return obj->getParent();
 }
 
-JS_PUBLIC_API(bool)
-JS_SetParent(JSContext *cx, HandleObject obj, HandleObject parent)
-{
-    AssertHeapIsIdle(cx);
-    CHECK_REQUEST(cx);
-    MOZ_ASSERT(!obj->is<ScopeObject>());
-    MOZ_ASSERT(parent || !obj->getParent());
-    assertSameCompartment(cx, obj, parent);
-
-    return JSObject::setParent(cx, obj, parent);
-}
-
 JS_PUBLIC_API(JSObject *)
 JS_GetConstructor(JSContext *cx, HandleObject proto)
 {
@@ -1754,7 +1735,7 @@
     if (!GetProperty(cx, proto, proto, cx->names().constructor, &cval))
         return nullptr;
     if (!IsFunctionObject(cval)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                              proto->getClass()->name);
         return nullptr;
     }
@@ -1849,12 +1830,11 @@
 }
 
 JS_PUBLIC_API(JSObject *)
-JS_NewObject(JSContext *cx, const JSClass *jsclasp, HandleObject parent)
+JS_NewObject(JSContext *cx, const JSClass *jsclasp)
 {
     MOZ_ASSERT(!cx->runtime()->isAtomsCompartment(cx->compartment()));
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
-    assertSameCompartment(cx, parent);
 
     const Class *clasp = Valueify(jsclasp);
     if (!clasp)
@@ -1863,18 +1843,18 @@
     MOZ_ASSERT(clasp != &JSFunction::class_);
     MOZ_ASSERT(!(clasp->flags & JSCLASS_IS_GLOBAL));
 
-    JSObject *obj = NewObjectWithClassProto(cx, clasp, NullPtr(), parent);
+    JSObject *obj = NewObjectWithClassProto(cx, clasp, NullPtr(), NullPtr());
     MOZ_ASSERT_IF(obj, obj->getParent());
     return obj;
 }
 
 JS_PUBLIC_API(JSObject *)
-JS_NewObjectWithGivenProto(JSContext *cx, const JSClass *jsclasp, HandleObject proto, HandleObject parent)
+JS_NewObjectWithGivenProto(JSContext *cx, const JSClass *jsclasp, HandleObject proto)
 {
     MOZ_ASSERT(!cx->runtime()->isAtomsCompartment(cx->compartment()));
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
-    assertSameCompartment(cx, proto, parent);
+    assertSameCompartment(cx, proto);
 
     const Class *clasp = Valueify(jsclasp);
     if (!clasp)
@@ -1883,7 +1863,7 @@
     MOZ_ASSERT(clasp != &JSFunction::class_);
     MOZ_ASSERT(!(clasp->flags & JSCLASS_IS_GLOBAL));
 
-    return NewObjectWithGivenProto(cx, clasp, proto, parent);
+    return NewObjectWithGivenProto(cx, clasp, proto, JS::NullPtr());
 }
 
 JS_PUBLIC_API(JSObject *)
@@ -3155,17 +3135,17 @@
     }
 
     if (!IsFunctionCloneable(fun, dynamicScope)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_CLONE_FUNOBJ_SCOPE);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_CLONE_FUNOBJ_SCOPE);
         return nullptr;
     }
 
     if (fun->isBoundFunction()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CLONE_OBJECT);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CLONE_OBJECT);
         return nullptr;
     }
 
     if (fun->isNative() && IsAsmJSModuleNative(fun->native())) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CLONE_OBJECT);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CLONE_OBJECT);
         return nullptr;
     }
 
@@ -3258,7 +3238,7 @@
 JS_BindCallable(JSContext *cx, HandleObject target, HandleObject newThis)
 {
     RootedValue thisArg(cx, ObjectValue(*newThis));
-    return js_fun_bind(cx, target, thisArg, nullptr, 0);
+    return fun_bind(cx, target, thisArg, nullptr, 0);
 }
 
 static bool
@@ -3271,7 +3251,7 @@
     MOZ_ASSERT((fs->flags & JSFUN_GENERIC_NATIVE) != 0);
 
     if (argc < 1) {
-        js_ReportMissingArg(cx, args.calleev(), 0);
+        ReportMissingArg(cx, args.calleev(), 0);
         return false;
     }
 
@@ -3432,7 +3412,7 @@
         if (cx->isExceptionPending() &&
             !JS_IsRunning(cx) &&
             (!cx->options().dontReportUncaught() && !cx->options().autoJSAPIOwnsErrorReporting())) {
-            js_ReportUncaughtException(cx);
+            ReportUncaughtException(cx);
         }
     }
 
@@ -3517,7 +3497,7 @@
     } else {
         fp_ = fopen(filename, "r");
         if (!fp_) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_OPEN,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_OPEN,
                                  filename, "No such file or directory");
             return false;
         }
@@ -4275,8 +4255,8 @@
          * API is asking for an object, so we report an error.
          */
         JSAutoByteString bytes;
-        if (js_ValueToPrintable(cx, args.rval(), &bytes)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_NEW_RESULT,
+        if (ValueToPrintable(cx, args.rval(), &bytes)) {
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_NEW_RESULT,
                                  bytes.ptr());
         }
         return nullptr;
@@ -4669,7 +4649,7 @@
         CopyAndInflateChars(dst, src, dstlen);
 
         AutoSuppressGC suppress(cx);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
         return false;
     }
 
@@ -4851,7 +4831,7 @@
     StringBuffer sb(cx);
     if (!sb.ensureTwoByteChars())
         return false;
-    if (!js_Stringify(cx, vp, replacer, space, sb))
+    if (!Stringify(cx, vp, replacer, space, sb))
         return false;
     if (sb.empty() && !sb.append(cx->names().null))
         return false;
@@ -4905,7 +4885,7 @@
 
     AssertHeapIsIdle(cx);
     va_start(ap, format);
-    js_ReportErrorVA(cx, JSREPORT_ERROR, format, ap);
+    ReportErrorVA(cx, JSREPORT_ERROR, format, ap);
     va_end(ap);
 }
 
@@ -4925,8 +4905,8 @@
                        va_list ap)
 {
     AssertHeapIsIdle(cx);
-    js_ReportErrorNumberVA(cx, JSREPORT_ERROR, errorCallback, userRef,
-                           errorNumber, ArgumentsAreASCII, ap);
+    ReportErrorNumberVA(cx, JSREPORT_ERROR, errorCallback, userRef,
+                        errorNumber, ArgumentsAreASCII, ap);
 }
 
 JS_PUBLIC_API(void)
@@ -4937,8 +4917,8 @@
 
     AssertHeapIsIdle(cx);
     va_start(ap, errorNumber);
-    js_ReportErrorNumberVA(cx, JSREPORT_ERROR, errorCallback, userRef,
-                           errorNumber, ArgumentsAreUnicode, ap);
+    ReportErrorNumberVA(cx, JSREPORT_ERROR, errorCallback, userRef,
+                        errorNumber, ArgumentsAreUnicode, ap);
     va_end(ap);
 }
 
@@ -4948,8 +4928,8 @@
                             const char16_t **args)
 {
     AssertHeapIsIdle(cx);
-    js_ReportErrorNumberUCArray(cx, JSREPORT_ERROR, errorCallback, userRef,
-                                errorNumber, args);
+    ReportErrorNumberUCArray(cx, JSREPORT_ERROR, errorCallback, userRef,
+                             errorNumber, args);
 }
 
 JS_PUBLIC_API(bool)
@@ -4960,7 +4940,7 @@
 
     AssertHeapIsIdle(cx);
     va_start(ap, format);
-    ok = js_ReportErrorVA(cx, JSREPORT_WARNING, format, ap);
+    ok = ReportErrorVA(cx, JSREPORT_WARNING, format, ap);
     va_end(ap);
     return ok;
 }
@@ -4975,8 +4955,8 @@
 
     AssertHeapIsIdle(cx);
     va_start(ap, errorNumber);
-    ok = js_ReportErrorNumberVA(cx, flags, errorCallback, userRef,
-                                errorNumber, ArgumentsAreASCII, ap);
+    ok = ReportErrorNumberVA(cx, flags, errorCallback, userRef,
+                             errorNumber, ArgumentsAreASCII, ap);
     va_end(ap);
     return ok;
 }
@@ -4991,8 +4971,8 @@
 
     AssertHeapIsIdle(cx);
     va_start(ap, errorNumber);
-    ok = js_ReportErrorNumberVA(cx, flags, errorCallback, userRef,
-                                errorNumber, ArgumentsAreUnicode, ap);
+    ok = ReportErrorNumberVA(cx, flags, errorCallback, userRef,
+                             errorNumber, ArgumentsAreUnicode, ap);
     va_end(ap);
     return ok;
 }
@@ -5000,13 +4980,13 @@
 JS_PUBLIC_API(void)
 JS_ReportOutOfMemory(JSContext *cx)
 {
-    js_ReportOutOfMemory(cx);
+    ReportOutOfMemory(cx);
 }
 
 JS_PUBLIC_API(void)
 JS_ReportAllocationOverflow(JSContext *cx)
 {
-    js_ReportAllocationOverflow(cx);
+    ReportAllocationOverflow(cx);
 }
 
 JS_PUBLIC_API(JSErrorReporter)
@@ -5035,7 +5015,7 @@
 {
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
-    return js_NewDateObject(cx, year, mon, mday, hour, min, sec);
+    return NewDateObject(cx, year, mon, mday, hour, min, sec);
 }
 
 JS_PUBLIC_API(JSObject *)
@@ -5043,7 +5023,7 @@
 {
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
-    return js_NewDateObjectMsec(cx, msec);
+    return NewDateObjectMsec(cx, msec);
 }
 
 JS_PUBLIC_API(bool)
@@ -5287,7 +5267,7 @@
     CHECK_REQUEST(cx);
 
     // This can only fail due to oom.
-    bool ok = js_ReportUncaughtException(cx);
+    bool ok = ReportUncaughtException(cx);
     MOZ_ASSERT(!cx->isExceptionPending());
     return ok;
 }
@@ -5381,7 +5361,7 @@
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, obj);
-    return js_ErrorFromException(cx, obj);
+    return ErrorFromException(cx, obj);
 }
 
 JS_PUBLIC_API(bool)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi.h	2015-02-28 15:03:05.000000000 +0000
@@ -598,59 +598,6 @@
     }
 };
 
-// Container for futex methods, used to implement the Atomics primitives.
-//
-// Client code calls JS_SetContextFutexAPI to install an instance of a
-// subclass of PerRuntimeFutexAPI on the runtime.  Implementations
-// of the Atomics primitives will use that object, if it is present
-// (and fail, if not).
-//
-// The API may differ among clients; for example, the APIs installed by
-// a worker and by the main window event thread are possibly different.
-
-class PerRuntimeFutexAPI
-{
-  public:
-    virtual ~PerRuntimeFutexAPI() {}
-
-    // Acquire the GLOBAL lock for all futex resources in all domains.
-    virtual void lock() = 0;
-
-    // Release the GLOBAL lock.
-    virtual void unlock() = 0;
-
-    enum WakeResult {
-        Woken,                  // Woken by futexWait
-        Timedout,               // Woken by timeout
-        ErrorException,         // Propagate a pending exception
-        InterruptForTerminate,  // Woken by a request to terminate the worker, throw an uncatchable
-        WaitingNotAllowed,      // wait() was not allowed to block on this thread (permanently)
-        ErrorTooLong            // Implementation limit
-    };
-
-    // Block the thread.
-    //
-    // The lock must be held around this call, see lock() and unlock().
-    virtual WakeResult wait(double timeout_ns) = 0;
-
-    // Wake the thread represented by this PerRuntimeFutexAPI.
-    //
-    // The lock must be held around this call, see lock() and unlock().
-    // Since the sleeping thread also needs that lock to wake up, the
-    // thread will not actually wake up until the caller of wake()
-    // releases the lock.
-    virtual void wake() = 0;
-};
-
-JS_PUBLIC_API(JS::PerRuntimeFutexAPI *)
-GetRuntimeFutexAPI(JSRuntime *rt);
-
-// Transfers ownership of fx to rt; if rt's futexAPI field is not null when rt is
-// deleted then rt's destructor will delete that value.  If fx is null in this
-// call then ownership of a held nonnull value is transfered away from rt.
-JS_PUBLIC_API(void)
-SetRuntimeFutexAPI(JSRuntime *rt, JS::PerRuntimeFutexAPI *fx);
-
 }  /* namespace JS */
 
 /************************************************************************/
@@ -791,8 +738,7 @@
  * guaranteed not to wrap a function.
  */
 typedef JSObject *
-(* JSWrapObjectCallback)(JSContext *cx, JS::HandleObject existing, JS::HandleObject obj,
-                         JS::HandleObject parent);
+(* JSWrapObjectCallback)(JSContext *cx, JS::HandleObject existing, JS::HandleObject obj);
 
 /*
  * Callback used by the wrap hook to ask the embedding to prepare an object
@@ -2198,7 +2144,7 @@
 #define JS_SELF_HOSTED_GET(name, getterName, flags) \
     {name, \
      uint8_t(JS_CHECK_ACCESSOR_FLAGS(flags) | JSPROP_SHARED | JSPROP_GETTER), \
-     { nullptr, JS_CAST_STRING_TO(getterName, const JSJitInfo *) }, \
+     { { nullptr, JS_CAST_STRING_TO(getterName, const JSJitInfo *) } }, \
      JSNATIVE_WRAPPER(nullptr) }
 #define JS_SELF_HOSTED_GETSET(name, getterName, setterName, flags) \
     {name, \
@@ -2298,9 +2244,6 @@
 extern JS_PUBLIC_API(JSObject *)
 JS_GetParent(JSObject *obj);
 
-extern JS_PUBLIC_API(bool)
-JS_SetParent(JSContext *cx, JS::HandleObject obj, JS::HandleObject parent);
-
 extern JS_PUBLIC_API(JSObject *)
 JS_GetConstructor(JSContext *cx, JS::Handle<JSObject*> proto);
 
@@ -2516,7 +2459,7 @@
 JS_FireOnNewGlobalObject(JSContext *cx, JS::HandleObject global);
 
 extern JS_PUBLIC_API(JSObject *)
-JS_NewObject(JSContext *cx, const JSClass *clasp, JS::Handle<JSObject*> parent = JS::NullPtr());
+JS_NewObject(JSContext *cx, const JSClass *clasp);
 
 /* Queries the [[Extensible]] property of the object. */
 extern JS_PUBLIC_API(bool)
@@ -2533,8 +2476,7 @@
  * If proto is JS::NullPtr, the JS object will have `null` as [[Prototype]].
  */
 extern JS_PUBLIC_API(JSObject *)
-JS_NewObjectWithGivenProto(JSContext *cx, const JSClass *clasp, JS::Handle<JSObject*> proto,
-                           JS::Handle<JSObject*> parent = JS::NullPtr());
+JS_NewObjectWithGivenProto(JSContext *cx, const JSClass *clasp, JS::Handle<JSObject*> proto);
 
 // Creates a new plain object, like `new Object()`, with Object.prototype as [[Prototype]].
 extern JS_PUBLIC_API(JSObject *)
@@ -3693,7 +3635,7 @@
  * names) of the execution context for script.
  *
  * Using obj as the variables object is problematic if obj's parent (which is
- * the scope chain link; see JS_SetParent and JS_NewObject) is not null: in
+ * the scope chain link) is not null, which in practice is always true: in
  * this case, variables created by 'var x = 0', e.g., go in obj, but variables
  * created by assignment to an unbound id, 'x = 0', go in the last object on
  * the scope chain linked by parent.
@@ -5098,13 +5040,87 @@
 
 
 /*
- * Capture the current call stack as a chain of SavedFrame objects, and set
- * |stackp| to the SavedFrame for the newest stack frame. If |maxFrameCount| is
- * non-zero, capture at most the youngest |maxFrameCount| frames.
+ * Capture the current call stack as a chain of SavedFrame JSObjects, and set
+ * |stackp| to the SavedFrame for the youngest stack frame, or nullptr if there
+ * are no JS frames on the stack. If |maxFrameCount| is non-zero, capture at
+ * most the youngest |maxFrameCount| frames.
  */
 extern JS_PUBLIC_API(bool)
 CaptureCurrentStack(JSContext *cx, MutableHandleObject stackp, unsigned maxFrameCount = 0);
 
+/*
+ * Accessors for working with SavedFrame JSObjects
+ *
+ * Each of these functions assert that if their `HandleObject savedFrame`
+ * argument is non-null, its JSClass is the SavedFrame class (or it is a
+ * cross-compartment or Xray wrapper around an object with the SavedFrame class)
+ * and the object is not the SavedFrame.prototype object.
+ *
+ * Each of these functions will find the first SavedFrame object in the chain
+ * whose underlying stack frame principals are subsumed by the cx's current
+ * compartment's principals, and operate on that SavedFrame object. This
+ * prevents leaking information about privileged frames to un-privileged
+ * callers. As a result, the SavedFrame in parameters do _NOT_ need to be in the
+ * same compartment as the cx, and the various out parameters are _NOT_
+ * guaranteed to be in the same compartment as cx.
+ *
+ * Additionally, it may be the case that there is no such SavedFrame object
+ * whose captured frame's principals are subsumed by the caller's compartment's
+ * principals! If the `HandleObject savedFrame` argument is null, or the
+ * caller's principals do not subsume any of the chained SavedFrame object's
+ * principals, `SavedFrameResult::AccessDenied` is returned and a (hopefully)
+ * sane default value is chosen for the out param.
+ */
+
+enum class SavedFrameResult {
+    Ok,
+    AccessDenied
+};
+
+/*
+ * Given a SavedFrame JSObject, get its source property. Defaults to the empty
+ * string.
+ */
+extern JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameSource(JSContext *cx, HandleObject savedFrame, MutableHandleString sourcep);
+
+/*
+ * Given a SavedFrame JSObject, get its line property. Defaults to 0.
+ */
+extern JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameLine(JSContext *cx, HandleObject savedFrame, uint32_t *linep);
+
+/*
+ * Given a SavedFrame JSObject, get its column property. Defaults to 0.
+ */
+extern JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameColumn(JSContext *cx, HandleObject savedFrame, uint32_t *columnp);
+
+/*
+ * Given a SavedFrame JSObject, get its functionDisplayName string, or nullptr
+ * if SpiderMonkey was unable to infer a name for the captured frame's
+ * function. Defaults to nullptr.
+ */
+extern JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameFunctionDisplayName(JSContext *cx, HandleObject savedFrame, MutableHandleString namep);
+
+/*
+ * Given a SavedFrame JSObject, get its parent SavedFrame object or nullptr if
+ * it is the oldest frame in the stack. The `parentp` out parameter is _NOT_
+ * guaranteed to be in the cx's compartment. Defaults to nullptr.
+ */
+extern JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameParent(JSContext *cx, HandleObject savedFrame, MutableHandleObject parentp);
+
+/*
+ * Given a SavedFrame JSObject stack, stringify it in the same format as
+ * Error.prototype.stack. The stringified stack out parameter is placed in the
+ * cx's compartment. Defaults to the empty string.
+ */
+extern JS_PUBLIC_API(bool)
+StringifySavedFrameStack(JSContext *cx, HandleObject stack, MutableHandleString stringp);
+
+
 } /* namespace JS */
 
 #endif /* jsapi_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/moz.build	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/moz.build	2015-02-28 15:03:05.000000000 +0000
@@ -45,7 +45,6 @@
     'testGCStoreBufferRemoval.cpp',
     'testGetPropertyDescriptor.cpp',
     'testHashTable.cpp',
-    'testHashTableInit.cpp',
     'testIndexToString.cpp',
     'testIntern.cpp',
     'testIntString.cpp',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testBug604087.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testBug604087.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testBug604087.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testBug604087.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -44,10 +44,9 @@
 }
 
 static JSObject *
-Wrap(JSContext *cx, JS::HandleObject existing, JS::HandleObject obj,
-     JS::HandleObject parent)
+Wrap(JSContext *cx, JS::HandleObject existing, JS::HandleObject obj)
 {
-    return js::Wrapper::New(cx, obj, parent, &js::CrossCompartmentWrapper::singleton);
+    return js::Wrapper::New(cx, obj, &js::CrossCompartmentWrapper::singleton);
 }
 
 static const JSWrapObjectCallbacks WrapObjectCallbacks = {
@@ -60,7 +59,7 @@
     js::WrapperOptions options;
     options.setClass(&OuterWrapperClass);
     options.setSingleton(true);
-    JS::RootedObject outerObj(cx, js::Wrapper::New(cx, global, global, &js::Wrapper::singleton, options));
+    JS::RootedObject outerObj(cx, js::Wrapper::New(cx, global, &js::Wrapper::singleton, options));
     JS::RootedObject compartment2(cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr, JS::FireOnNewGlobalHook));
     JS::RootedObject compartment3(cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr, JS::FireOnNewGlobalHook));
     JS::RootedObject compartment4(cx, JS_NewGlobalObject(cx, getGlobalClass(), nullptr, JS::FireOnNewGlobalHook));
@@ -81,7 +80,7 @@
     JS::RootedObject next(cx);
     {
         JSAutoCompartment ac(cx, compartment2);
-        next = js::Wrapper::New(cx, compartment2, compartment2, &js::Wrapper::singleton, options);
+        next = js::Wrapper::New(cx, compartment2, &js::Wrapper::singleton, options);
         CHECK(next);
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testHashTableInit.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testHashTableInit.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testHashTableInit.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testHashTableInit.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +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 "js/HashTable.h"
-#include "jsapi-tests/tests.h"
-
-typedef js::HashSet<uint32_t, js::DefaultHasher<uint32_t>, js::SystemAllocPolicy> IntSet;
-
-static const uint32_t MaxAllowedHashInit = 1 << 23;
-
-BEGIN_TEST(testHashInitAlmostTooHuge)
-{
-    IntSet smallEnough;
-    CHECK(smallEnough.init(MaxAllowedHashInit));
-    return true;
-}
-END_TEST(testHashInitAlmostTooHuge)
-
-BEGIN_TEST(testHashInitTooHuge)
-{
-    IntSet tooBig;
-    CHECK(!tooBig.init(MaxAllowedHashInit + 1));
-    return true;
-}
-END_TEST(testHashInitTooHuge)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testJitRValueAlloc.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testJitRValueAlloc.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testJitRValueAlloc.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testJitRValueAlloc.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -43,7 +43,7 @@
 {
     RValueAllocation s;
     for (uint32_t i = 0; i < FloatRegisters::Total; i++) {
-        s = RValueAllocation::Float32(FloatRegister::FromCode(i));
+        s = RValueAllocation::AnyFloat(FloatRegister::FromCode(i));
         CHECK(s == Read(s));
     }
     return true;
@@ -55,7 +55,7 @@
     RValueAllocation s;
     int32_t i, last = 0, tmp;
     for (i = 0; i > 0; tmp = i, i += last, last = tmp) {
-        s = RValueAllocation::Float32(i);
+        s = RValueAllocation::AnyFloat(i);
         CHECK(s == Read(s));
     }
     return true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testSavedStacks.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testSavedStacks.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testSavedStacks.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testSavedStacks.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -22,3 +22,45 @@
     return true;
 }
 END_TEST(testSavedStacks_withNoStack)
+
+BEGIN_TEST(testSavedStacks_ApiDefaultValues)
+{
+    js::RootedSavedFrame savedFrame(cx, nullptr);
+
+    // Source
+    JS::RootedString str(cx);
+    JS::SavedFrameResult result = JS::GetSavedFrameSource(cx, savedFrame, &str);
+    CHECK(result == JS::SavedFrameResult::AccessDenied);
+    CHECK(str.get() == cx->runtime()->emptyString);
+
+    // Line
+    uint32_t line = 123;
+    result = JS::GetSavedFrameLine(cx, savedFrame, &line);
+    CHECK(result == JS::SavedFrameResult::AccessDenied);
+    CHECK(line == 0);
+
+    // Column
+    uint32_t column = 123;
+    result = JS::GetSavedFrameColumn(cx, savedFrame, &column);
+    CHECK(result == JS::SavedFrameResult::AccessDenied);
+    CHECK(column == 0);
+
+    // Function display name
+    result = JS::GetSavedFrameFunctionDisplayName(cx, savedFrame, &str);
+    CHECK(result == JS::SavedFrameResult::AccessDenied);
+    CHECK(str.get() == nullptr);
+
+    // Parent
+    JS::RootedObject parent(cx);
+    result = JS::GetSavedFrameParent(cx, savedFrame, &parent);
+    CHECK(result == JS::SavedFrameResult::AccessDenied);
+    CHECK(parent.get() == nullptr);
+
+    // Stack string
+    result = JS::GetSavedFrameSource(cx, savedFrame, &str);
+    CHECK(result == JS::SavedFrameResult::AccessDenied);
+    CHECK(str.get() == cx->runtime()->emptyString);
+
+    return true;
+}
+END_TEST(testSavedStacks_ApiDefaultValues)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/tests.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/tests.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -76,20 +76,23 @@
 JSObject * JSAPITest::createGlobal(JSPrincipals *principals)
 {
     /* Create the global object. */
+    JS::RootedObject newGlobal(cx);
     JS::CompartmentOptions options;
     options.setVersion(JSVERSION_LATEST);
-    global = JS_NewGlobalObject(cx, getGlobalClass(), principals, JS::FireOnNewGlobalHook, options);
-    if (!global)
+    newGlobal = JS_NewGlobalObject(cx, getGlobalClass(), principals, JS::FireOnNewGlobalHook,
+                                   options);
+    if (!newGlobal)
         return nullptr;
 
-    JSAutoCompartment ac(cx, global);
+    JSAutoCompartment ac(cx, newGlobal);
 
     /* Populate the global object with the standard globals, like Object and
        Array. */
-    if (!JS_InitStandardClasses(cx, global))
-        global = nullptr;
+    if (!JS_InitStandardClasses(cx, newGlobal))
+        return nullptr;
 
-    return global;
+    global = newGlobal;
+    return newGlobal;
 }
 
 int main(int argc, char *argv[])
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsapi-tests/testSetPropertyIgnoringNamedGetter.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -72,7 +72,7 @@
     EVAL("({})", &targetv);
 
     RootedObject proxyObj(cx, NewProxyObject(cx, &customProxyHandler, targetv,
-                                             &protov.toObject(), global, ProxyOptions()));
+                                             &protov.toObject(), ProxyOptions()));
     CHECK(proxyObj);
 
     CHECK(JS_DefineProperty(cx, global, "target", targetv, 0));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsarray.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsarray.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsarray.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsarray.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -340,7 +340,7 @@
                 break;
             uint32_t idx = uint32_t(index);
             if (idx >= arr->length() && !arr->lengthIsWritable()) {
-                JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+                JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                              JSMSG_CANT_REDEFINE_ARRAY_LENGTH);
                 return false;
             }
@@ -499,7 +499,7 @@
     if (d == *newLen)
         return true;
 
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
     return false;
 }
 
@@ -553,7 +553,7 @@
             return true;
 
         if (setterIsStrict) {
-            return JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+            return JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                                 JSMSG_CANT_REDEFINE_ARRAY_LENGTH);
         }
 
@@ -659,7 +659,7 @@
                         return false;
 
                     uint32_t index;
-                    if (!js_IdIsIndex(props[i], &index))
+                    if (!IdIsIndex(props[i], &index))
                         continue;
 
                     if (index >= newLen && index < oldLen) {
@@ -783,7 +783,7 @@
         return true;
 
     // XXX include the index and maybe array length in the error message
-    return JS_ReportErrorFlagsAndNumber(ncx, flags, js_GetErrorMessage, nullptr,
+    return JS_ReportErrorFlagsAndNumber(ncx, flags, GetErrorMessage, nullptr,
                                         JSMSG_CANT_DEFINE_PAST_ARRAY_LENGTH);
 }
 
@@ -793,7 +793,7 @@
     Rooted<ArrayObject*> arr(cx, &obj->as<ArrayObject>());
 
     uint32_t index;
-    if (!js_IdIsIndex(id, &index))
+    if (!IdIsIndex(id, &index))
         return true;
 
     uint32_t length = arr->length();
@@ -1073,7 +1073,7 @@
     size_t seplen = sepstr->length();
     CheckedInt<uint32_t> res = CheckedInt<uint32_t>(seplen) * (length - 1);
     if (length > 0 && !res.isValid()) {
-        js_ReportAllocationOverflow(cx);
+        ReportAllocationOverflow(cx);
         return nullptr;
     }
 
@@ -1873,7 +1873,7 @@
 
     if (args.hasDefined(0)) {
         if (args[0].isPrimitive()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_SORT_ARG);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_SORT_ARG);
             return false;
         }
         fval = args[0];     /* non-default compare function */
@@ -1902,7 +1902,7 @@
      */
 #if JS_BITS_PER_WORD == 32
     if (size_t(len) > size_t(-1) / (2 * sizeof(Value))) {
-        js_ReportAllocationOverflow(cx);
+        ReportAllocationOverflow(cx);
         return false;
     }
 #endif
@@ -2966,7 +2966,7 @@
 
     /* Step 4. */
     if (args.length() == 0) {
-        js_ReportMissingArg(cx, args.calleev(), 0);
+        ReportMissingArg(cx, args.calleev(), 0);
         return false;
     }
     RootedObject callable(cx, ValueToCallable(cx, args[0], args.length() - 1));
@@ -3054,7 +3054,7 @@
     return v.isObject() &&
            v.toObject().is<JSFunction>() &&
            v.toObject().as<JSFunction>().isNative() &&
-           v.toObject().as<JSFunction>().native() == js_Array;
+           v.toObject().as<JSFunction>().native() == ArrayConstructor;
 }
 
 static bool
@@ -3184,7 +3184,7 @@
 
 /* ES5 15.4.2 */
 bool
-js_Array(JSContext *cx, unsigned argc, Value *vp)
+js::ArrayConstructor(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     RootedObjectGroup group(cx, ObjectGroup::callingAllocationSiteGroup(cx, JSProto_Array));
@@ -3198,7 +3198,7 @@
     if (args[0].isInt32()) {
         int32_t i = args[0].toInt32();
         if (i < 0) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
             return false;
         }
         length = uint32_t(i);
@@ -3206,7 +3206,7 @@
         double d = args[0].toDouble();
         length = ToUint32(d);
         if (d != double(length)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
             return false;
         }
     }
@@ -3230,7 +3230,7 @@
 js::ArrayConstructorOneArg(JSContext *cx, HandleObjectGroup group, int32_t lengthInt)
 {
     if (lengthInt < 0) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
         return nullptr;
     }
 
@@ -3301,7 +3301,7 @@
     nullptr, /* construct */
     nullptr, /* trace */
     {
-        GenericCreateConstructor<js_Array, 1, JSFunction::FinalizeKind>,
+        GenericCreateConstructor<ArrayConstructor, 1, JSFunction::FinalizeKind>,
         CreateArrayPrototype,
         array_static_methods,
         array_methods
@@ -3329,6 +3329,14 @@
     return true;
 }
 
+static bool
+NewArrayIsCachable(ExclusiveContext *cxArg, NewObjectKind newKind)
+{
+    return cxArg->isJSContext() &&
+           newKind == GenericObject &&
+           !cxArg->asJSContext()->compartment()->hasObjectMetadataCallback();
+}
+
 template <uint32_t maxLength>
 static MOZ_ALWAYS_INLINE ArrayObject *
 NewArray(ExclusiveContext *cxArg, uint32_t length,
@@ -3338,15 +3346,13 @@
     MOZ_ASSERT(CanBeFinalizedInBackground(allocKind, &ArrayObject::class_));
     allocKind = GetBackgroundAllocKind(allocKind);
 
-    NewObjectCache::EntryIndex entry = -1;
-    uint64_t gcNumber = 0;
-    if (JSContext *cx = cxArg->maybeJSContext()) {
+    bool isCachable = NewArrayIsCachable(cxArg, newKind);
+    if (isCachable) {
+        JSContext *cx = cxArg->asJSContext();
         JSRuntime *rt = cx->runtime();
         NewObjectCache &cache = rt->newObjectCache;
-        if (newKind == GenericObject &&
-            !cx->compartment()->hasObjectMetadataCallback() &&
-            cache.lookupGlobal(&ArrayObject::class_, cx->global(), allocKind, &entry))
-        {
+        NewObjectCache::EntryIndex entry = -1;
+        if (cache.lookupGlobal(&ArrayObject::class_, cx->global(), allocKind, &entry)) {
             gc::InitialHeap heap = GetInitialHeap(newKind, &ArrayObject::class_);
             JSObject *obj = cache.newObjectFromHit(cx, entry, heap);
             if (obj) {
@@ -3361,8 +3367,6 @@
                 }
                 return arr;
             }
-        } else {
-            gcNumber = rt->gc.gcNumber();
         }
     }
 
@@ -3405,11 +3409,11 @@
     if (newKind == SingletonObject && !JSObject::setSingleton(cxArg, arr))
         return nullptr;
 
-    if (entry != -1 &&
-        cxArg->asJSContext()->runtime()->gc.gcNumber() == gcNumber)
-    {
-        cxArg->asJSContext()->runtime()->newObjectCache.fillGlobal(entry, &ArrayObject::class_,
-                                                                   cxArg->global(), allocKind, arr);
+    if (isCachable) {
+        NewObjectCache &cache = cxArg->asJSContext()->runtime()->newObjectCache;
+        NewObjectCache::EntryIndex entry = -1;
+        cache.lookupGlobal(&ArrayObject::class_, cxArg->global(), allocKind, &entry);
+        cache.fillGlobal(entry, &ArrayObject::class_, cxArg->global(), allocKind, arr);
     }
 
     if (maxLength > 0 && !EnsureNewArrayElements(cxArg, arr, std::min(maxLength, length)))
@@ -3572,7 +3576,7 @@
 
 #ifdef DEBUG
 bool
-js_ArrayInfo(JSContext *cx, unsigned argc, Value *vp)
+js::ArrayInfo(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     JSObject *obj;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsarray.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsarray.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsarray.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsarray.h	2015-02-28 15:03:05.000000000 +0000
@@ -15,10 +15,9 @@
 namespace js {
 /* 2^32-2, inclusive */
 const uint32_t MAX_ARRAY_INDEX = 4294967294u;
-}
 
 inline bool
-js_IdIsIndex(jsid id, uint32_t *indexp)
+IdIsIndex(jsid id, uint32_t *indexp)
 {
     if (JSID_IS_INT(id)) {
         int32_t i = JSID_TO_INT(id);
@@ -34,12 +33,7 @@
 }
 
 extern JSObject *
-js_InitArrayClass(JSContext *cx, js::HandleObject obj);
-
-extern bool
-js_InitContextBusyArrayTable(JSContext *cx);
-
-namespace js {
+InitArrayClass(JSContext *cx, js::HandleObject obj);
 
 class ArrayObject;
 
@@ -131,7 +125,7 @@
  * Copy 'length' elements from aobj to vp.
  *
  * This function assumes 'length' is effectively the result of calling
- * js_GetLengthProperty on aobj. vp must point to rooted memory.
+ * GetLengthProperty on aobj. vp must point to rooted memory.
  */
 extern bool
 GetElements(JSContext *cx, HandleObject aobj, uint32_t length, js::Value *vp);
@@ -195,15 +189,15 @@
 extern ArrayObject *
 ArrayConstructorOneArg(JSContext *cx, HandleObjectGroup group, int32_t lengthInt);
 
-} /* namespace js */
-
 #ifdef DEBUG
 extern bool
-js_ArrayInfo(JSContext *cx, unsigned argc, js::Value *vp);
+ArrayInfo(JSContext *cx, unsigned argc, Value *vp);
 #endif
 
 /* Array constructor native. Exposed only so the JIT can know its address. */
-bool
-js_Array(JSContext *cx, unsigned argc, js::Value *vp);
+extern bool
+ArrayConstructor(JSContext *cx, unsigned argc, Value *vp);
+
+} /* namespace js */
 
 #endif /* jsarray_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsast.tbl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsast.tbl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsast.tbl	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsast.tbl	2015-02-28 15:03:05.000000000 +0000
@@ -77,4 +77,6 @@
 ASTDEF(AST_CALL_SITE_OBJ,         "CallSiteObject",                 "callSiteObject")
 ASTDEF(AST_COMPUTED_NAME,         "ComputedName",                   "computedName")
 
+ASTDEF(AST_CLASS_STMT,            "ClassStatement",                 "classStatement")
+ASTDEF(AST_CLASS_METHOD,          "ClassMethod",                    "classMethod")
 /* AST_LIMIT = last + 1 */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsatom.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsatom.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsatom.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsatom.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -39,7 +39,7 @@
 const char *
 js::AtomToPrintableString(ExclusiveContext *cx, JSAtom *atom, JSAutoByteString *bytes)
 {
-    JSString *str = js_QuoteString(cx, atom, 0);
+    JSString *str = QuoteString(cx, atom, 0);
     if (!str)
         return nullptr;
     return bytes->encodeLatin1(cx, str);
@@ -83,7 +83,6 @@
 const char js_public_str[]          = "public";
 const char js_send_str[]            = "send";
 const char js_setter_str[]          = "setter";
-const char js_static_str[]          = "static";
 const char js_super_str[]           = "super";
 const char js_switch_str[]          = "switch";
 const char js_this_str[]            = "this";
@@ -97,6 +96,10 @@
 // which create a small number of atoms.
 static const uint32_t JS_STRING_HASH_COUNT = 64;
 
+AtomSet::Ptr js::FrozenAtomSet::readonlyThreadsafeLookup(const AtomSet::Lookup &l) const {
+    return mSet->readonlyThreadsafeLookup(l);
+}
+
 struct CommonNameInfo
 {
     const char *str;
@@ -110,6 +113,9 @@
     if (!atoms_ || !atoms_->init(JS_STRING_HASH_COUNT))
         return false;
 
+    // |permanentAtoms| hasn't been created yet.
+    MOZ_ASSERT(!permanentAtoms);
+
     if (parentRuntime) {
         staticStrings = parentRuntime->staticStrings;
         commonNames = parentRuntime->commonNames;
@@ -119,10 +125,6 @@
         return true;
     }
 
-    permanentAtoms = cx->new_<AtomSet>();
-    if (!permanentAtoms || !permanentAtoms->init(JS_STRING_HASH_COUNT))
-        return false;
-
     staticStrings = cx->new_<StaticStrings>();
     if (!staticStrings || !staticStrings->init(cx))
         return false;
@@ -161,7 +163,7 @@
     for (size_t i = 0; i < JS::WellKnownSymbolLimit; i++) {
         JS::Symbol *symbol = JS::Symbol::new_(cx, JS::SymbolCode(i), descriptions[i]);
         if (!symbol) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         symbols[i].init(symbol);
@@ -221,8 +223,8 @@
         rt->staticStrings->trace(trc);
 
     if (rt->permanentAtoms) {
-        for (AtomSet::Enum e(*rt->permanentAtoms); !e.empty(); e.popFront()) {
-            const AtomStateEntry &entry = e.front();
+        for (FrozenAtomSet::Range r(rt->permanentAtoms->all()); !r.empty(); r.popFront()) {
+            const AtomStateEntry &entry = r.front();
 
             JSAtom *atom = entry.asPtr();
             MarkPermanentAtom(trc, atom, "permanent_table");
@@ -264,21 +266,22 @@
 }
 
 bool
-JSRuntime::transformToPermanentAtoms()
+JSRuntime::transformToPermanentAtoms(JSContext *cx)
 {
     MOZ_ASSERT(!parentRuntime);
 
     // All static strings were created as permanent atoms, now move the contents
     // of the atoms table into permanentAtoms and mark each as permanent.
 
-    MOZ_ASSERT(permanentAtoms && permanentAtoms->empty());
+    MOZ_ASSERT(!permanentAtoms);
+    permanentAtoms = cx->new_<FrozenAtomSet>(atoms_);   // takes ownership of atoms_
 
-    AtomSet *temp = atoms_;
-    atoms_ = permanentAtoms;
-    permanentAtoms = temp;
+    atoms_ = cx->new_<AtomSet>();
+    if (!atoms_ || !atoms_->init(JS_STRING_HASH_COUNT))
+        return false;
 
-    for (AtomSet::Enum e(*permanentAtoms); !e.empty(); e.popFront()) {
-        AtomStateEntry entry = e.front();
+    for (FrozenAtomSet::Range r(permanentAtoms->all()); !r.empty(); r.popFront()) {
+        AtomStateEntry entry = r.front();
         JSAtom *atom = entry.asPtr();
         atom->morphIntoPermanentAtom();
     }
@@ -296,6 +299,7 @@
     AtomHasher::Lookup lookup(atom);
 
     /* Likewise, permanent strings are considered to be interned. */
+    MOZ_ASSERT(cx->isPermanentAtomsInitialized());
     AtomSet::Ptr p = cx->permanentAtoms().readonlyThreadsafeLookup(lookup);
     if (p)
         return true;
@@ -320,9 +324,16 @@
 
     AtomHasher::Lookup lookup(tbchars, length);
 
-    AtomSet::Ptr pp = cx->permanentAtoms().readonlyThreadsafeLookup(lookup);
-    if (pp)
-        return pp->asPtr();
+    // Note: when this function is called while the permanent atoms table is
+    // being initialized (in initializeAtoms()), |permanentAtoms| is not yet
+    // initialized so this lookup is always skipped. Only once
+    // transformToPermanentAtoms() is called does |permanentAtoms| get
+    // initialized and then this lookup will go ahead.
+    if (cx->isPermanentAtomsInitialized()) {
+        AtomSet::Ptr pp = cx->permanentAtoms().readonlyThreadsafeLookup(lookup);
+        if (pp)
+            return pp->asPtr();
+    }
 
     AutoLockForExclusiveAccess lock(cx);
 
@@ -341,7 +352,7 @@
         // Grudgingly forgo last-ditch GC. The alternative would be to release
         // the lock, manually GC here, and retry from the top. If you fix this,
         // please also fix or comment the similar case in Symbol::new_.
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
@@ -351,7 +362,7 @@
     // since then can't GC; therefore the atoms table has not been modified and
     // p is still valid.
     if (!atoms.add(p, AtomStateEntry(atom, bool(ib)))) {
-        js_ReportOutOfMemory(cx); /* SystemAllocPolicy does not report OOM. */
+        ReportOutOfMemory(cx); /* SystemAllocPolicy does not report OOM. */
         return nullptr;
     }
 
@@ -377,6 +388,7 @@
         AtomHasher::Lookup lookup(&atom);
 
         /* Likewise, permanent atoms are always interned. */
+        MOZ_ASSERT(cx->isPermanentAtomsInitialized());
         AtomSet::Ptr p = cx->permanentAtoms().readonlyThreadsafeLookup(lookup);
         if (p)
             return &atom;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsatom.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsatom.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsatom.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsatom.h	2015-02-28 15:03:05.000000000 +0000
@@ -117,6 +117,30 @@
 
 typedef HashSet<AtomStateEntry, AtomHasher, SystemAllocPolicy> AtomSet;
 
+// This class is a wrapper for AtomSet that is used to ensure the AtomSet is
+// not modified. It should only expose read-only methods from AtomSet.
+// Note however that the atoms within the table can be marked during GC.
+class FrozenAtomSet
+{
+    AtomSet *mSet;
+
+public:
+    // This constructor takes ownership of the passed-in AtomSet.
+    explicit FrozenAtomSet(AtomSet *set) { mSet = set; }
+
+    ~FrozenAtomSet() { js_delete(mSet); }
+
+    AtomSet::Ptr readonlyThreadsafeLookup(const AtomSet::Lookup &l) const;
+
+    size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const {
+        return mSet->sizeOfIncludingThis(mallocSizeOf);
+    }
+
+    typedef AtomSet::Range Range;
+
+    AtomSet::Range all() const { return mSet->all(); }
+};
+
 class PropertyName;
 
 }  /* namespace js */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsbool.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsbool.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsbool.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsbool.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -70,7 +70,7 @@
     MOZ_ASSERT(IsBoolean(thisv));
 
     bool b = thisv.isBoolean() ? thisv.toBoolean() : thisv.toObject().as<BooleanObject>().unbox();
-    args.rval().setString(js_BooleanToString(cx, b));
+    args.rval().setString(BooleanToString(cx, b));
     return true;
 }
 
@@ -127,7 +127,7 @@
 }
 
 JSObject *
-js_InitBooleanClass(JSContext *cx, HandleObject obj)
+js::InitBooleanClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->isNative());
 
@@ -155,7 +155,7 @@
 }
 
 JSString *
-js_BooleanToString(ExclusiveContext *cx, bool b)
+js::BooleanToString(ExclusiveContext *cx, bool b)
 {
     return b ? cx->names().true_ : cx->names().false_;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsbool.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsbool.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsbool.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsbool.h	2015-02-28 15:03:05.000000000 +0000
@@ -13,10 +13,14 @@
 
 #include "NamespaceImports.h"
 
+namespace js {
+
 extern JSObject *
-js_InitBooleanClass(JSContext *cx, js::HandleObject obj);
+InitBooleanClass(JSContext *cx, js::HandleObject obj);
 
 extern JSString *
-js_BooleanToString(js::ExclusiveContext *cx, bool b);
+BooleanToString(js::ExclusiveContext *cx, bool b);
+
+}
 
 #endif /* jsbool_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscntxt.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscntxt.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscntxt.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscntxt.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -126,7 +126,7 @@
             ok = rt->initSelfHosting(cx);
 
         if (ok && !rt->parentRuntime)
-            ok = rt->transformToPermanentAtoms();
+            ok = rt->transformToPermanentAtoms(cx);
 
         JS_EndRequest(cx);
 
@@ -219,24 +219,22 @@
      * on the error report, and exception-aware hosts should ignore it.
      */
     MOZ_ASSERT(reportp);
-    if ((!callback || callback == js_GetErrorMessage) &&
+    if ((!callback || callback == GetErrorMessage) &&
         reportp->errorNumber == JSMSG_UNCAUGHT_EXCEPTION)
     {
         reportp->flags |= JSREPORT_EXCEPTION;
     }
 
     if (cx->options().autoJSAPIOwnsErrorReporting() || JS_IsRunning(cx)) {
-        if (js_ErrorToException(cx, message, reportp, callback, userRef)) {
+        if (ErrorToException(cx, message, reportp, callback, userRef))
             return;
-        }
     }
 
     /*
      * Call the error reporter only if an exception wasn't raised.
      */
-    if (message) {
+    if (message)
         CallErrorReporter(cx, message, reportp);
-    }
 }
 
 /*
@@ -265,11 +263,11 @@
  * throw the static atom "out of memory". If code is not running, call the
  * error reporter directly.
  *
- * Furthermore, callers of js_ReportOutOfMemory (viz., malloc) assume a GC does
+ * Furthermore, callers of ReportOutOfMemory (viz., malloc) assume a GC does
  * not occur, so GC must be avoided or suppressed.
  */
 void
-js_ReportOutOfMemory(ExclusiveContext *cxArg)
+js::ReportOutOfMemory(ExclusiveContext *cxArg)
 {
 #ifdef JS_MORE_DETERMINISTIC
     /*
@@ -277,7 +275,7 @@
      * (e.g. interpreter vs JIT). In more-deterministic builds, print to stderr
      * so that the fuzzers can detect this.
      */
-    fprintf(stderr, "js_ReportOutOfMemory called\n");
+    fprintf(stderr, "ReportOutOfMemory called\n");
 #endif
 
     if (!cxArg->isJSContext())
@@ -298,7 +296,7 @@
     }
 
     /* Get the message for this error, but we don't expand any arguments. */
-    const JSErrorFormatString *efs = js_GetErrorMessage(nullptr, JSMSG_OUT_OF_MEMORY);
+    const JSErrorFormatString *efs = GetErrorMessage(nullptr, JSMSG_OUT_OF_MEMORY);
     const char *msg = efs ? efs->format : "Out of memory";
 
     /* Fill out the report, but don't do anything that requires allocation. */
@@ -327,7 +325,7 @@
 }
 
 JS_FRIEND_API(void)
-js_ReportOverRecursed(JSContext *maybecx)
+js::ReportOverRecursed(JSContext *maybecx)
 {
 #ifdef JS_MORE_DETERMINISTIC
     /*
@@ -338,25 +336,25 @@
      * stack depth which is useful for external testing programs
      * like fuzzers.
      */
-    fprintf(stderr, "js_ReportOverRecursed called\n");
+    fprintf(stderr, "ReportOverRecursed called\n");
 #endif
     if (maybecx) {
-        JS_ReportErrorNumber(maybecx, js_GetErrorMessage, nullptr, JSMSG_OVER_RECURSED);
+        JS_ReportErrorNumber(maybecx, GetErrorMessage, nullptr, JSMSG_OVER_RECURSED);
         maybecx->overRecursed_ = true;
     }
 }
 
 void
-js_ReportOverRecursed(ExclusiveContext *cx)
+js::ReportOverRecursed(ExclusiveContext *cx)
 {
     if (cx->isJSContext())
-        js_ReportOverRecursed(cx->asJSContext());
+        ReportOverRecursed(cx->asJSContext());
     else
         cx->addPendingOverRecursed();
 }
 
 void
-js_ReportAllocationOverflow(ExclusiveContext *cxArg)
+js::ReportAllocationOverflow(ExclusiveContext *cxArg)
 {
     if (!cxArg)
         return;
@@ -366,7 +364,7 @@
     JSContext *cx = cxArg->asJSContext();
 
     AutoSuppressGC suppressGC(cx);
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ALLOC_OVERFLOW);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ALLOC_OVERFLOW);
 }
 
 /*
@@ -406,7 +404,7 @@
 }
 
 bool
-js_ReportErrorVA(JSContext *cx, unsigned flags, const char *format, va_list ap)
+js::ReportErrorVA(JSContext *cx, unsigned flags, const char *format, va_list ap)
 {
     char *message;
     char16_t *ucmessage;
@@ -549,10 +547,10 @@
  * Returns true if the expansion succeeds (can fail if out of memory).
  */
 bool
-js_ExpandErrorArguments(ExclusiveContext *cx, JSErrorCallback callback,
-                        void *userRef, const unsigned errorNumber,
-                        char **messagep, JSErrorReport *reportp,
-                        ErrorArgumentsType argumentsType, va_list ap)
+js::ExpandErrorArguments(ExclusiveContext *cx, JSErrorCallback callback,
+                         void *userRef, const unsigned errorNumber,
+                         char **messagep, JSErrorReport *reportp,
+                         ErrorArgumentsType argumentsType, va_list ap)
 {
     const JSErrorFormatString *efs;
     int i;
@@ -562,7 +560,7 @@
     *messagep = nullptr;
 
     if (!callback)
-        callback = js_GetErrorMessage;
+        callback = GetErrorMessage;
 
     {
         AutoSuppressGC suppressGC(cx);
@@ -714,9 +712,9 @@
 }
 
 bool
-js_ReportErrorNumberVA(JSContext *cx, unsigned flags, JSErrorCallback callback,
-                       void *userRef, const unsigned errorNumber,
-                       ErrorArgumentsType argumentsType, va_list ap)
+js::ReportErrorNumberVA(JSContext *cx, unsigned flags, JSErrorCallback callback,
+                        void *userRef, const unsigned errorNumber,
+                        ErrorArgumentsType argumentsType, va_list ap)
 {
     JSErrorReport report;
     char *message;
@@ -730,8 +728,8 @@
     report.errorNumber = errorNumber;
     PopulateReportBlame(cx, &report);
 
-    if (!js_ExpandErrorArguments(cx, callback, userRef, errorNumber,
-                                 &message, &report, argumentsType, ap)) {
+    if (!ExpandErrorArguments(cx, callback, userRef, errorNumber,
+                              &message, &report, argumentsType, ap)) {
         return false;
     }
 
@@ -740,7 +738,7 @@
     js_free(message);
     if (report.messageArgs) {
         /*
-         * js_ExpandErrorArguments owns its messageArgs only if it had to
+         * ExpandErrorArguments owns its messageArgs only if it had to
          * inflate the arguments (from regular |char *|s).
          */
         if (argumentsType == ArgumentsAreASCII) {
@@ -756,9 +754,9 @@
 }
 
 bool
-js_ReportErrorNumberUCArray(JSContext *cx, unsigned flags, JSErrorCallback callback,
-                            void *userRef, const unsigned errorNumber,
-                            const char16_t **args)
+js::ReportErrorNumberUCArray(JSContext *cx, unsigned flags, JSErrorCallback callback,
+                             void *userRef, const unsigned errorNumber,
+                             const char16_t **args)
 {
     if (checkReportFlags(cx, &flags))
         return true;
@@ -772,8 +770,8 @@
 
     char *message;
     va_list dummy;
-    if (!js_ExpandErrorArguments(cx, callback, userRef, errorNumber,
-                                 &message, &report, ArgumentsAreUnicode, dummy)) {
+    if (!ExpandErrorArguments(cx, callback, userRef, errorNumber,
+                              &message, &report, ArgumentsAreUnicode, dummy)) {
         return false;
     }
 
@@ -796,14 +794,14 @@
 }
 
 void
-js_ReportIsNotDefined(JSContext *cx, const char *name)
+js::ReportIsNotDefined(JSContext *cx, const char *name)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_DEFINED, name);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_DEFINED, name);
 }
 
 bool
-js_ReportIsNullOrUndefined(JSContext *cx, int spindex, HandleValue v,
-                           HandleString fallback)
+js::ReportIsNullOrUndefined(JSContext *cx, int spindex, HandleValue v,
+                            HandleString fallback)
 {
     char *bytes;
     bool ok;
@@ -815,18 +813,18 @@
     if (strcmp(bytes, js_undefined_str) == 0 ||
         strcmp(bytes, js_null_str) == 0) {
         ok = JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR,
-                                          js_GetErrorMessage, nullptr,
+                                          GetErrorMessage, nullptr,
                                           JSMSG_NO_PROPERTIES, bytes,
                                           nullptr, nullptr);
     } else if (v.isUndefined()) {
         ok = JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR,
-                                          js_GetErrorMessage, nullptr,
+                                          GetErrorMessage, nullptr,
                                           JSMSG_UNEXPECTED_TYPE, bytes,
                                           js_undefined_str, nullptr);
     } else {
         MOZ_ASSERT(v.isNull());
         ok = JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR,
-                                          js_GetErrorMessage, nullptr,
+                                          GetErrorMessage, nullptr,
                                           JSMSG_UNEXPECTED_TYPE, bytes,
                                           js_null_str, nullptr);
     }
@@ -836,7 +834,7 @@
 }
 
 void
-js_ReportMissingArg(JSContext *cx, HandleValue v, unsigned arg)
+js::ReportMissingArg(JSContext *cx, HandleValue v, unsigned arg)
 {
     char argbuf[11];
     char *bytes;
@@ -851,16 +849,16 @@
         if (!bytes)
             return;
     }
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                          JSMSG_MISSING_FUN_ARG, argbuf,
                          bytes ? bytes : "");
     js_free(bytes);
 }
 
 bool
-js_ReportValueErrorFlags(JSContext *cx, unsigned flags, const unsigned errorNumber,
-                         int spindex, HandleValue v, HandleString fallback,
-                         const char *arg1, const char *arg2)
+js::ReportValueErrorFlags(JSContext *cx, unsigned flags, const unsigned errorNumber,
+                          int spindex, HandleValue v, HandleString fallback,
+                          const char *arg1, const char *arg2)
 {
     char *bytes;
     bool ok;
@@ -871,7 +869,7 @@
     if (!bytes)
         return false;
 
-    ok = JS_ReportErrorFlagsAndNumber(cx, flags, js_GetErrorMessage,
+    ok = JS_ReportErrorFlagsAndNumber(cx, flags, GetErrorMessage,
                                       nullptr, errorNumber, bytes, arg1, arg2);
     js_free(bytes);
     return ok;
@@ -885,7 +883,7 @@
 };
 
 JS_FRIEND_API(const JSErrorFormatString *)
-js_GetErrorMessage(void *userRef, const unsigned errorNumber)
+js::GetErrorMessage(void *userRef, const unsigned errorNumber)
 {
     if (errorNumber > 0 && errorNumber < JSErr_Limit)
         return &js_ErrorFormatString[errorNumber];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscntxt.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscntxt.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscntxt.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscntxt.h	2015-02-28 15:03:05.000000000 +0000
@@ -177,13 +177,14 @@
     }
 
     void reportAllocationOverflow() {
-        js_ReportAllocationOverflow(this);
+        js::ReportAllocationOverflow(this);
     }
 
     // Accessors for immutable runtime data.
     JSAtomState &names() { return *runtime_->commonNames; }
     StaticStrings &staticStrings() { return *runtime_->staticStrings; }
-    AtomSet &permanentAtoms() { return *runtime_->permanentAtoms; }
+    bool isPermanentAtomsInitialized() { return !!runtime_->permanentAtoms; }
+    FrozenAtomSet &permanentAtoms() { return *runtime_->permanentAtoms; }
     WellKnownSymbols &wellKnownSymbols() { return *runtime_->wellKnownSymbols; }
     const JS::AsmJSCacheOps &asmJSCacheOps() { return runtime_->asmJSCacheOps; }
     PropertyName *emptyString() { return runtime_->emptyString; }
@@ -298,7 +299,7 @@
     friend class js::ExclusiveContext;
     friend class JS::AutoSaveExceptionState;
     friend class js::jit::DebugModeOSRVolatileJitFrameIterator;
-    friend void js_ReportOverRecursed(JSContext *);
+    friend void js::ReportOverRecursed(JSContext *);
 
   private:
     /* Exception state -- the exception member is a GC root by definition. */
@@ -309,7 +310,7 @@
     JS::ContextOptions  options_;
 
     // True if the exception currently being thrown is by result of
-    // js_ReportOverRecursed. See Debugger::slowPathOnExceptionUnwind.
+    // ReportOverRecursed. See Debugger::slowPathOnExceptionUnwind.
     bool                overRecursed_;
 
     // True if propagating a forced return from an interrupt handler during
@@ -564,30 +565,26 @@
 JSFunction *
 SelfHostedFunction(JSContext *cx, HandlePropertyName propName);
 
-} /* namespace js */
-
 #ifdef va_start
 extern bool
-js_ReportErrorVA(JSContext *cx, unsigned flags, const char *format, va_list ap);
+ReportErrorVA(JSContext *cx, unsigned flags, const char *format, va_list ap);
 
 extern bool
-js_ReportErrorNumberVA(JSContext *cx, unsigned flags, JSErrorCallback callback,
-                       void *userRef, const unsigned errorNumber,
-                       js::ErrorArgumentsType argumentsType, va_list ap);
+ReportErrorNumberVA(JSContext *cx, unsigned flags, JSErrorCallback callback,
+                    void *userRef, const unsigned errorNumber,
+                    ErrorArgumentsType argumentsType, va_list ap);
 
 extern bool
-js_ReportErrorNumberUCArray(JSContext *cx, unsigned flags, JSErrorCallback callback,
-                            void *userRef, const unsigned errorNumber,
-                            const char16_t **args);
+ReportErrorNumberUCArray(JSContext *cx, unsigned flags, JSErrorCallback callback,
+                         void *userRef, const unsigned errorNumber,
+                         const char16_t **args);
 #endif
 
 extern bool
-js_ExpandErrorArguments(js::ExclusiveContext *cx, JSErrorCallback callback,
-                        void *userRef, const unsigned errorNumber,
-                        char **message, JSErrorReport *reportp,
-                        js::ErrorArgumentsType argumentsType, va_list ap);
-
-namespace js {
+ExpandErrorArguments(ExclusiveContext *cx, JSErrorCallback callback,
+                     void *userRef, const unsigned errorNumber,
+                     char **message, JSErrorReport *reportp,
+                     ErrorArgumentsType argumentsType, va_list ap);
 
 /* |callee| requires a usage string provided by JS_DefineFunctionsWithHelp. */
 extern void
@@ -609,20 +606,17 @@
 void
 CallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report);
 
-} /* namespace js */
-
 extern void
-js_ReportIsNotDefined(JSContext *cx, const char *name);
+ReportIsNotDefined(JSContext *cx, const char *name);
 
 /*
  * Report an attempt to access the property of a null or undefined value (v).
  */
 extern bool
-js_ReportIsNullOrUndefined(JSContext *cx, int spindex, js::HandleValue v,
-                           js::HandleString fallback);
+ReportIsNullOrUndefined(JSContext *cx, int spindex, HandleValue v, HandleString fallback);
 
 extern void
-js_ReportMissingArg(JSContext *cx, js::HandleValue v, unsigned arg);
+ReportMissingArg(JSContext *cx, js::HandleValue v, unsigned arg);
 
 /*
  * Report error using js_DecompileValueGenerator(cx, spindex, v, fallback) as
@@ -630,22 +624,24 @@
  * then 3 arguments, use null for arg1 or arg2.
  */
 extern bool
-js_ReportValueErrorFlags(JSContext *cx, unsigned flags, const unsigned errorNumber,
-                         int spindex, js::HandleValue v, js::HandleString fallback,
-                         const char *arg1, const char *arg2);
+ReportValueErrorFlags(JSContext *cx, unsigned flags, const unsigned errorNumber,
+                      int spindex, HandleValue v, HandleString fallback,
+                      const char *arg1, const char *arg2);
 
-#define js_ReportValueError(cx,errorNumber,spindex,v,fallback)                \
-    ((void)js_ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,          \
+#define ReportValueError(cx,errorNumber,spindex,v,fallback)                   \
+    ((void)ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,             \
                                     spindex, v, fallback, nullptr, nullptr))
 
-#define js_ReportValueError2(cx,errorNumber,spindex,v,fallback,arg1)          \
-    ((void)js_ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,          \
+#define ReportValueError2(cx,errorNumber,spindex,v,fallback,arg1)             \
+    ((void)ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,             \
                                     spindex, v, fallback, arg1, nullptr))
 
-#define js_ReportValueError3(cx,errorNumber,spindex,v,fallback,arg1,arg2)     \
-    ((void)js_ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,          \
+#define ReportValueError3(cx,errorNumber,spindex,v,fallback,arg1,arg2)        \
+    ((void)ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,             \
                                     spindex, v, fallback, arg1, arg2))
 
+} /* namespace js */
+
 extern const JSErrorFormatString js_ErrorFormatString[JSErr_Limit];
 
 namespace js {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscntxtinlines.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscntxtinlines.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscntxtinlines.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscntxtinlines.h	2015-02-28 15:03:05.000000000 +0000
@@ -333,7 +333,7 @@
     }
 
     if (attrs & JSPROP_GETTER)
-        return js_ReportGetterOnlyAssignment(cx, strict);
+        return ReportGetterOnlyAssignment(cx, strict);
 
     if (!op)
         return true;
@@ -368,7 +368,7 @@
 JSContext::setPendingException(js::Value v)
 {
     MOZ_ASSERT(!IsPoisonedValue(v));
-    // overRecursed_ is set after the fact by js_ReportOverRecursed.
+    // overRecursed_ is set after the fact by ReportOverRecursed.
     this->overRecursed_ = false;
     this->throwing = true;
     this->unwrappedException_ = v;
@@ -460,8 +460,11 @@
     if (act->isJit()) {
         JSScript *script = nullptr;
         js::jit::GetPcScript(const_cast<JSContext *>(this), &script, ppc);
-        if (!allowCrossCompartment && script->compartment() != compartment())
+        if (!allowCrossCompartment && script->compartment() != compartment()) {
+            if (ppc)
+                *ppc = nullptr;
             return nullptr;
+        }
         return script;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscompartment.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscompartment.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscompartment.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscompartment.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -143,7 +143,7 @@
     jitRuntime_ = jrt;
 
     if (!jitRuntime_->initialize(cx)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
 
         js_delete(jitRuntime_);
         jitRuntime_ = nullptr;
@@ -203,8 +203,15 @@
         CrossCompartmentKey prior = key;
         if (key.debugger)
             Mark(trc, &key.debugger, "CCW debugger");
-        if (key.kind != CrossCompartmentKey::StringWrapper)
+        if (key.kind == CrossCompartmentKey::ObjectWrapper ||
+            key.kind == CrossCompartmentKey::DebuggerObject ||
+            key.kind == CrossCompartmentKey::DebuggerEnvironment ||
+            key.kind == CrossCompartmentKey::DebuggerSource)
+        {
+            MOZ_ASSERT(IsInsideNursery(key.wrapped) ||
+                       key.wrapped->asTenured().getTraceKind() == JSTRACE_OBJECT);
             Mark(trc, reinterpret_cast<JSObject**>(&key.wrapped), "CCW wrapped object");
+        }
         if (key.debugger == prior.debugger && key.wrapped == prior.wrapped)
             return;
 
@@ -436,7 +443,7 @@
         }
     }
 
-    obj.set(cb->wrap(cx, existing, obj, global));
+    obj.set(cb->wrap(cx, existing, obj));
     if (!obj)
         return false;
 
@@ -495,14 +502,14 @@
 }
 
 /*
- * This method marks pointers that cross compartment boundaries. It should be
- * called only for per-compartment GCs, since full GCs naturally follow pointers
- * across compartments.
+ * This method marks pointers that cross compartment boundaries. It is called in
+ * per-zone GCs (since full GCs naturally follow pointers across compartments)
+ * and when compacting to update cross-compartment pointers.
  */
 void
 JSCompartment::markCrossCompartmentWrappers(JSTracer *trc)
 {
-    MOZ_ASSERT(!zone()->isCollecting());
+    MOZ_ASSERT(!zone()->isCollecting() || trc->runtime()->isHeapCompacting());
 
     for (WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
         Value v = e.front().value();
@@ -630,7 +637,30 @@
     /* Remove dead wrappers from the table. */
     for (WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
         CrossCompartmentKey key = e.front().key();
-        bool keyDying = IsCellAboutToBeFinalizedFromAnyThread(&key.wrapped);
+        bool keyDying;
+        switch (key.kind) {
+          case CrossCompartmentKey::ObjectWrapper:
+          case CrossCompartmentKey::DebuggerObject:
+          case CrossCompartmentKey::DebuggerEnvironment:
+          case CrossCompartmentKey::DebuggerSource:
+              MOZ_ASSERT(IsInsideNursery(key.wrapped) ||
+                         key.wrapped->asTenured().getTraceKind() == JSTRACE_OBJECT);
+              keyDying = IsObjectAboutToBeFinalizedFromAnyThread(
+                  reinterpret_cast<JSObject**>(&key.wrapped));
+              break;
+          case CrossCompartmentKey::StringWrapper:
+              MOZ_ASSERT(key.wrapped->asTenured().getTraceKind() == JSTRACE_STRING);
+              keyDying = IsStringAboutToBeFinalizedFromAnyThread(
+                  reinterpret_cast<JSString**>(&key.wrapped));
+              break;
+          case CrossCompartmentKey::DebuggerScript:
+              MOZ_ASSERT(key.wrapped->asTenured().getTraceKind() == JSTRACE_SCRIPT);
+              keyDying = IsScriptAboutToBeFinalizedFromAnyThread(
+                  reinterpret_cast<JSScript**>(&key.wrapped));
+              break;
+          default:
+              MOZ_CRASH("Unknown key kind");
+        }
         bool valDying = IsValueAboutToBeFinalizedFromAnyThread(e.front().value().unsafeGet());
         bool dbgDying = key.debugger && IsObjectAboutToBeFinalizedFromAnyThread(&key.debugger);
         if (keyDying || valDying || dbgDying) {
@@ -856,3 +886,13 @@
             runtime_->addTelemetry(JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT, i);
     }
 }
+
+void
+JSCompartment::addTelemetry(const char *filename, DeprecatedLanguageExtension e)
+{
+    // Only report telemetry for web content, not add-ons or chrome JS.
+    if (addonId || isSystem || !filename || strncmp(filename, "http", 4) != 0)
+        return;
+
+    sawDeprecatedLanguageExtension[e] = true;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscompartment.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscompartment.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jscompartment.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jscompartment.h	2015-02-28 15:03:05.000000000 +0000
@@ -558,9 +558,7 @@
     void reportTelemetry();
 
   public:
-    void addTelemetry(DeprecatedLanguageExtension e) {
-        sawDeprecatedLanguageExtension[e] = true;
-    }
+    void addTelemetry(const char *filename, DeprecatedLanguageExtension e);
 };
 
 inline bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdate.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdate.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdate.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdate.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -2429,7 +2429,7 @@
 {
     double utctime = args.thisv().toObject().as<DateObject>().UTCTime().toNumber();
     if (!IsFinite(utctime)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INVALID_DATE);
+        JS_ReportErrorNumber(cx, js::GetErrorMessage, nullptr, JSMSG_INVALID_DATE);
         return false;
     }
 
@@ -2484,7 +2484,7 @@
 
     /* Step 5. */
     if (!IsCallable(toISO)) {
-        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js::GetErrorMessage, nullptr,
                                      JSMSG_BAD_TOISOSTRING_PROP);
         return false;
     }
@@ -2957,7 +2957,7 @@
 };
 
 bool
-js_Date(JSContext *cx, unsigned argc, Value *vp)
+js::DateConstructor(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -3009,7 +3009,7 @@
         d = msec_time;
     }
 
-    JSObject *obj = js_NewDateObjectMsec(cx, d);
+    JSObject *obj = NewDateObjectMsec(cx, d);
     if (!obj)
         return false;
 
@@ -3051,7 +3051,7 @@
     nullptr, /* construct */
     nullptr, /* trace */
     {
-        GenericCreateConstructor<js_Date, MAXARGS, JSFunction::FinalizeKind>,
+        GenericCreateConstructor<DateConstructor, MAXARGS, JSFunction::FinalizeKind>,
         GenericCreatePrototype,
         date_static_methods,
         date_methods,
@@ -3061,7 +3061,7 @@
 };
 
 JS_FRIEND_API(JSObject *)
-js_NewDateObjectMsec(JSContext *cx, double msec_time)
+js::NewDateObjectMsec(JSContext *cx, double msec_time)
 {
     JSObject *obj = NewBuiltinClassInstance(cx, &DateObject::class_);
     if (!obj)
@@ -3071,12 +3071,12 @@
 }
 
 JS_FRIEND_API(JSObject *)
-js_NewDateObject(JSContext *cx, int year, int mon, int mday,
-                 int hour, int min, int sec)
+js::NewDateObject(JSContext *cx, int year, int mon, int mday,
+                  int hour, int min, int sec)
 {
     MOZ_ASSERT(mon < 12);
     double msec_time = date_msecFromDate(year, mon, mday, hour, min, sec, 0);
-    return js_NewDateObjectMsec(cx, UTC(msec_time, &cx->runtime()->dateTimeInfo));
+    return NewDateObjectMsec(cx, UTC(msec_time, &cx->runtime()->dateTimeInfo));
 }
 
 JS_FRIEND_API(bool)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdate.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdate.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdate.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdate.h	2015-02-28 15:03:05.000000000 +0000
@@ -16,6 +16,8 @@
 #include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
 
+namespace js {
+
 /*
  * These functions provide a C interface to the date/time object
  */
@@ -25,7 +27,7 @@
  * since the epoch.
  */
 extern JS_FRIEND_API(JSObject *)
-js_NewDateObjectMsec(JSContext* cx, double msec_time);
+NewDateObjectMsec(JSContext *cx, double msec_time);
 
 /*
  * Construct a new Date Object from an exploded local time value.
@@ -35,14 +37,12 @@
  * in 1995).
  */
 extern JS_FRIEND_API(JSObject *)
-js_NewDateObject(JSContext* cx, int year, int mon, int mday,
-                 int hour, int min, int sec);
+NewDateObject(JSContext *cx, int year, int mon, int mday,
+              int hour, int min, int sec);
 
 /* Date constructor native. Exposed only so the JIT can know its address. */
 bool
-js_Date(JSContext *cx, unsigned argc, JS::Value *vp);
-
-namespace js {
+DateConstructor(JSContext *cx, unsigned argc, JS::Value *vp);
 
 /* Date methods exposed so they can be installed in the self-hosting global. */
 bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdtoa.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdtoa.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdtoa.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdtoa.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -499,13 +499,13 @@
 }
 
 DtoaState *
-js_NewDtoaState()
+js::NewDtoaState()
 {
     return newdtoa();
 }
 
 void
-js_DestroyDtoaState(DtoaState *state)
+js::DestroyDtoaState(DtoaState *state)
 {
     destroydtoa(state);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdtoa.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdtoa.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsdtoa.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsdtoa.h	2015-02-28 15:03:05.000000000 +0000
@@ -16,11 +16,15 @@
 
 struct DtoaState;
 
-DtoaState *
-js_NewDtoaState();
+namespace js {
 
-void
-js_DestroyDtoaState(DtoaState *state);
+extern DtoaState *
+NewDtoaState();
+
+extern void
+DestroyDtoaState(DtoaState *state);
+
+} // namespace js
 
 /*
  * js_strtod_harder() returns as a double-precision floating-point number the
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsexn.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsexn.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsexn.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsexn.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -335,7 +335,7 @@
 }
 
 JSErrorReport *
-js_ErrorFromException(JSContext *cx, HandleObject objArg)
+js::ErrorFromException(JSContext *cx, HandleObject objArg)
 {
     // It's ok to UncheckedUnwrap here, since all we do is get the
     // JSErrorReport, and consumers are careful with the information they get
@@ -542,8 +542,8 @@
 }
 
 bool
-js_ErrorToException(JSContext *cx, const char *message, JSErrorReport *reportp,
-                    JSErrorCallback callback, void *userRef)
+js::ErrorToException(JSContext *cx, const char *message, JSErrorReport *reportp,
+                     JSErrorCallback callback, void *userRef)
 {
     // Tell our caller to report immediately if this report is just a warning.
     MOZ_ASSERT(reportp);
@@ -553,7 +553,7 @@
     // Find the exception index associated with this error.
     JSErrNum errorNumber = static_cast<JSErrNum>(reportp->errorNumber);
     if (!callback)
-        callback = js_GetErrorMessage;
+        callback = GetErrorMessage;
     const JSErrorFormatString *errorString = callback(userRef, errorNumber);
     JSExnType exnType = errorString ? static_cast<JSExnType>(errorString->exnType) : JSEXN_NONE;
     MOZ_ASSERT(exnType < JSEXN_LIMIT);
@@ -645,7 +645,7 @@
 }
 
 bool
-js_ReportUncaughtException(JSContext *cx)
+js::ReportUncaughtException(JSContext *cx)
 {
     if (!cx->isExceptionPending())
         return true;
@@ -686,7 +686,7 @@
     js_free(ownedMessage);
     if (ownedReport.messageArgs) {
         /*
-         * js_ExpandErrorArguments owns its messageArgs only if it had to
+         * ExpandErrorArguments owns its messageArgs only if it had to
          * inflate the arguments (from regular |char *|s), which is always in
          * our case.
          */
@@ -709,7 +709,7 @@
      */
     if (exn.isObject()) {
         exnObject = &exn.toObject();
-        reportp = js_ErrorFromException(cx, exnObject);
+        reportp = ErrorFromException(cx, exnObject);
 
         JSCompartment *comp = exnObject->compartment();
         JSAddonId *addonId = comp->addonId;
@@ -746,7 +746,7 @@
     if (!str)
         cx->clearPendingException();
 
-    // If js_ErrorFromException didn't get us a JSErrorReport, then the object
+    // If ErrorFromException didn't get us a JSErrorReport, then the object
     // was not an ErrorObject, security-wrapped or otherwise. However, it might
     // still quack like one. Give duck-typing a chance.  We start by looking for
     // "filename" (all lowercase), since that's where DOMExceptions store their
@@ -848,7 +848,7 @@
     if (!reportp) {
         // This is basically an inlined version of
         //
-        //   JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        //   JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
         //                        JSMSG_UNCAUGHT_EXCEPTION, message_);
         //
         // but without the reporting bits.  Instead it just puts all
@@ -892,9 +892,9 @@
         ownedReport.isMuted = iter.mutedErrors();
     }
 
-    if (!js_ExpandErrorArguments(cx, js_GetErrorMessage, nullptr,
-                                 JSMSG_UNCAUGHT_EXCEPTION, &ownedMessage,
-                                 &ownedReport, ArgumentsAreASCII, ap)) {
+    if (!ExpandErrorArguments(cx, GetErrorMessage, nullptr,
+                              JSMSG_UNCAUGHT_EXCEPTION, &ownedMessage,
+                              &ownedReport, ArgumentsAreASCII, ap)) {
         return false;
     }
 
@@ -905,7 +905,7 @@
 }
 
 JSObject *
-js_CopyErrorObject(JSContext *cx, Handle<ErrorObject*> err)
+js::CopyErrorObject(JSContext *cx, Handle<ErrorObject*> err)
 {
     js::ScopedJSFreePtr<JSErrorReport> copyReport;
     if (JSErrorReport *errorReport = err->getErrorReport()) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsexn.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsexn.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsexn.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsexn.h	2015-02-28 15:03:05.000000000 +0000
@@ -22,7 +22,6 @@
 
 JSString *
 ComputeStackString(JSContext *cx);
-}
 
 /*
  * Given a JSErrorReport, check to see if there is an exception associated with
@@ -51,8 +50,8 @@
  *     unless the caller decides to call CallErrorReporter explicitly.
  */
 extern bool
-js_ErrorToException(JSContext *cx, const char *message, JSErrorReport *reportp,
-                    JSErrorCallback callback, void *userRef);
+ErrorToException(JSContext *cx, const char *message, JSErrorReport *reportp,
+                 JSErrorCallback callback, void *userRef);
 
 /*
  * Called if a JS API call to js_Execute or js_InternalCall fails; calls the
@@ -71,10 +70,10 @@
  * this flag.
  */
 extern bool
-js_ReportUncaughtException(JSContext *cx);
+ReportUncaughtException(JSContext *cx);
 
 extern JSErrorReport *
-js_ErrorFromException(JSContext *cx, js::HandleObject obj);
+ErrorFromException(JSContext *cx, HandleObject obj);
 
 /*
  * Make a copy of errobj parented to cx's compartment's global.
@@ -84,7 +83,7 @@
  * prototype objects (errobj->getPrivate() must not be nullptr).
  */
 extern JSObject *
-js_CopyErrorObject(JSContext *cx, JS::Handle<js::ErrorObject*> errobj);
+CopyErrorObject(JSContext *cx, JS::Handle<ErrorObject*> errobj);
 
 static_assert(JSEXN_ERR == 0 &&
               JSProto_Error + JSEXN_INTERNALERR == JSProto_InternalError &&
@@ -116,4 +115,6 @@
     return type;
 }
 
+} // namespace js
+
 #endif /* jsexn_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfriendapi.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfriendapi.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfriendapi.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfriendapi.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -145,6 +145,14 @@
     return obj;
 }
 
+JS_FRIEND_API(JSObject *)
+JS_NewObjectWithoutMetadata(JSContext *cx, const JSClass *clasp, JS::Handle<JSObject*> proto)
+{
+    // Use an AutoEnterAnalysis to suppress invocation of the metadata callback.
+    AutoEnterAnalysis enter(cx);
+    return JS_NewObjectWithGivenProto(cx, clasp, proto);
+}
+
 JS_FRIEND_API(JSPrincipals *)
 JS_GetCompartmentPrincipals(JSCompartment *compartment)
 {
@@ -252,13 +260,13 @@
 }
 
 JS_FRIEND_API(bool)
-js_ObjectClassIs(JSContext *cx, HandleObject obj, ESClassValue classValue)
+js::ObjectClassIs(JSContext *cx, HandleObject obj, ESClassValue classValue)
 {
     return ObjectClassIs(obj, classValue, cx);
 }
 
 JS_FRIEND_API(const char *)
-js_ObjectClassName(JSContext *cx, HandleObject obj)
+js::ObjectClassName(JSContext *cx, HandleObject obj)
 {
     return GetObjectClassName(cx, obj);
 }
@@ -356,7 +364,9 @@
 JS_FRIEND_API(void)
 js::NotifyAnimationActivity(JSObject *obj)
 {
-    obj->compartment()->lastAnimationTime = PRMJ_Now();
+    int64_t timeNow = PRMJ_Now();
+    obj->compartment()->lastAnimationTime = timeNow;
+    obj->runtimeFromMainThread()->lastAnimationTime = timeNow;
 }
 
 JS_FRIEND_API(uint32_t)
@@ -612,10 +622,10 @@
 }
 
 JS_FRIEND_API(JSObject *)
-JS_CloneObject(JSContext *cx, HandleObject obj, HandleObject protoArg, HandleObject parent)
+JS_CloneObject(JSContext *cx, HandleObject obj, HandleObject protoArg)
 {
     Rooted<TaggedProto> proto(cx, TaggedProto(protoArg.get()));
-    return CloneObject(cx, obj, proto, parent);
+    return CloneObject(cx, obj, proto);
 }
 
 #ifdef DEBUG
@@ -1174,12 +1184,12 @@
 }
 
 JS_FRIEND_API(bool)
-js_DefineOwnProperty(JSContext *cx, JSObject *objArg, jsid idArg,
-                     JS::Handle<js::PropertyDescriptor> descriptor, bool *bp)
+js::DefineOwnProperty(JSContext *cx, JSObject *objArg, jsid idArg,
+                      JS::Handle<js::PropertyDescriptor> descriptor, bool *bp)
 {
     RootedObject obj(cx, objArg);
     RootedId id(cx, idArg);
-    js::AssertHeapIsIdle(cx);
+    AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, obj, id, descriptor.value());
     if (descriptor.hasGetterObject())
@@ -1191,9 +1201,9 @@
 }
 
 JS_FRIEND_API(bool)
-js_ReportIsNotFunction(JSContext *cx, JS::HandleValue v)
+js::ReportIsNotFunction(JSContext *cx, HandleValue v)
 {
-    return ReportIsNotFunction(cx, v);
+    return ReportIsNotFunction(cx, v, -1);
 }
 
 JS_FRIEND_API(void)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfriendapi.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfriendapi.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfriendapi.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfriendapi.h	2015-02-28 15:03:05.000000000 +0000
@@ -60,6 +60,13 @@
 JS_NewObjectWithUniqueType(JSContext *cx, const JSClass *clasp, JS::HandleObject proto,
                            JS::HandleObject parent);
 
+// Allocate an object in exactly the same way as JS_NewObjectWithGivenProto, but
+// without invoking the metadata callback on it.  This allows creation of
+// internal bookkeeping objects that are guaranteed to not have metadata
+// attached to them.
+extern JS_FRIEND_API(JSObject *)
+JS_NewObjectWithoutMetadata(JSContext *cx, const JSClass *clasp, JS::Handle<JSObject*> proto);
+
 extern JS_FRIEND_API(uint32_t)
 JS_ObjectCountDynamicSlots(JS::HandleObject obj);
 
@@ -141,22 +148,39 @@
 JS_ObjectToOuterObject(JSContext *cx, JS::HandleObject obj);
 
 extern JS_FRIEND_API(JSObject *)
-JS_CloneObject(JSContext *cx, JS::HandleObject obj, JS::HandleObject proto,
-               JS::HandleObject parent);
+JS_CloneObject(JSContext *cx, JS::HandleObject obj, JS::HandleObject proto);
+
+/*
+ * Copy the own properties of src to dst in a fast way.  src and dst must both
+ * be native and must be in the compartment of cx.  They must have the same
+ * class, the same parent, and the same prototype.  Class reserved slots will
+ * NOT be copied.
+ *
+ * dst must not have any properties on it before this function is called.
+ *
+ * src must have been allocated via JS_NewObjectWithoutMetadata so that we can
+ * be sure it has no metadata that needs copying to dst.  This also means that
+ * dst needs to have the compartment global as its parent.  This function will
+ * preserve the existing metadata on dst, if any.
+ */
+extern JS_FRIEND_API(bool)
+JS_InitializePropertiesFromCompatibleNativeObject(JSContext *cx,
+                                                  JS::HandleObject dst,
+                                                  JS::HandleObject src);
 
 extern JS_FRIEND_API(JSString *)
 JS_BasicObjectToString(JSContext *cx, JS::HandleObject obj);
 
-JS_FRIEND_API(void)
-js_ReportOverRecursed(JSContext *maybecx);
+namespace js {
 
 JS_FRIEND_API(bool)
-js_ObjectClassIs(JSContext *cx, JS::HandleObject obj, js::ESClassValue classValue);
+ObjectClassIs(JSContext *cx, JS::HandleObject obj, ESClassValue classValue);
 
 JS_FRIEND_API(const char *)
-js_ObjectClassName(JSContext *cx, JS::HandleObject obj);
+ObjectClassName(JSContext *cx, JS::HandleObject obj);
 
-namespace js {
+JS_FRIEND_API(void)
+ReportOverRecursed(JSContext *maybecx);
 
 JS_FRIEND_API(bool)
 AddRawValueRoot(JSContext *cx, JS::Value *vp, const char *name);
@@ -974,7 +998,7 @@
     JS_BEGIN_MACRO                                                              \
         int stackDummy_;                                                        \
         if (!JS_CHECK_STACK_SIZE(limit, &stackDummy_)) {                        \
-            js_ReportOverRecursed(cx);                                          \
+            js::ReportOverRecursed(cx);                                         \
             onerror;                                                            \
         }                                                                       \
     JS_END_MACRO
@@ -1000,7 +1024,7 @@
 #define JS_CHECK_RECURSION_WITH_SP(cx, sp, onerror)                             \
     JS_BEGIN_MACRO                                                              \
         if (!JS_CHECK_STACK_SIZE(js::GetNativeStackLimit(cx), sp)) {            \
-            js_ReportOverRecursed(cx);                                          \
+            js::ReportOverRecursed(cx);                                         \
             onerror;                                                            \
         }                                                                       \
     JS_END_MACRO
@@ -1110,17 +1134,17 @@
 };
 
 struct AllCompartments : public CompartmentFilter {
-    virtual bool match(JSCompartment *c) const { return true; }
+    virtual bool match(JSCompartment *c) const MOZ_OVERRIDE { return true; }
 };
 
 struct ContentCompartmentsOnly : public CompartmentFilter {
-    virtual bool match(JSCompartment *c) const {
+    virtual bool match(JSCompartment *c) const MOZ_OVERRIDE {
         return !IsSystemCompartment(c);
     }
 };
 
 struct ChromeCompartmentsOnly : public CompartmentFilter {
-    virtual bool match(JSCompartment *c) const {
+    virtual bool match(JSCompartment *c) const MOZ_OVERRIDE {
         return IsSystemCompartment(c);
     }
 };
@@ -1128,13 +1152,13 @@
 struct SingleCompartment : public CompartmentFilter {
     JSCompartment *ours;
     explicit SingleCompartment(JSCompartment *c) : ours(c) {}
-    virtual bool match(JSCompartment *c) const { return c == ours; }
+    virtual bool match(JSCompartment *c) const MOZ_OVERRIDE { return c == ours; }
 };
 
 struct CompartmentsWithPrincipals : public CompartmentFilter {
     JSPrincipals *principals;
     explicit CompartmentsWithPrincipals(JSPrincipals *p) : principals(p) {}
-    virtual bool match(JSCompartment *c) const {
+    virtual bool match(JSCompartment *c) const MOZ_OVERRIDE {
         return JS_GetCompartmentPrincipals(c) == principals;
     }
 };
@@ -1151,14 +1175,23 @@
  * The DOMProxyShadowsCheck function will be called to check if the property for
  * id should be gotten from the prototype, or if there is an own property that
  * shadows it.
- * If DoesntShadow is returned then the slot at listBaseExpandoSlot should
- * either be undefined or point to an expando object that would contain the own
- * property.
- * If DoesntShadowUnique is returned then the slot at listBaseExpandoSlot should
- * contain a private pointer to a ExpandoAndGeneration, which contains a
- * JS::Value that should either be undefined or point to an expando object, and
- * a uint32 value. If that value changes then the IC for getting a property will
- * be invalidated.
+ * * If ShadowsViaDirectExpando is returned, then the slot at
+ *   listBaseExpandoSlot contains an expando object which has the property in
+ *   question.
+ * * If ShadowsViaIndirectExpando is returned, then the slot at
+ *   listBaseExpandoSlot contains a private pointer to an ExpandoAndGeneration
+ *   and the expando object in the ExpandoAndGeneration has the property in
+ *   question.
+ * * If DoesntShadow is returned then the slot at listBaseExpandoSlot should
+ *   either be undefined or point to an expando object that would contain the
+ *   own property.
+ * * If DoesntShadowUnique is returned then the slot at listBaseExpandoSlot
+ *   should contain a private pointer to a ExpandoAndGeneration, which contains
+ *   a JS::Value that should either be undefined or point to an expando object,
+ *   and a uint32 value. If that value changes then the IC for getting a
+ *   property will be invalidated.
+ * * If Shadows is returned, that means the property is an own property of the
+ *   proxy but doesn't live on the expando object.
  */
 
 struct ExpandoAndGeneration {
@@ -1191,7 +1224,9 @@
   ShadowCheckFailed,
   Shadows,
   DoesntShadow,
-  DoesntShadowUnique
+  DoesntShadowUnique,
+  ShadowsViaDirectExpando,
+  ShadowsViaIndirectExpando
 } DOMProxyShadowsResult;
 typedef DOMProxyShadowsResult
 (* DOMProxyShadowsCheck)(JSContext* cx, JS::HandleObject object, JS::HandleId id);
@@ -1202,6 +1237,11 @@
 const void *GetDOMProxyHandlerFamily();
 uint32_t GetDOMProxyExpandoSlot();
 DOMProxyShadowsCheck GetDOMProxyShadowsCheck();
+inline bool DOMProxyIsShadowing(DOMProxyShadowsResult result) {
+    return result == Shadows ||
+           result == ShadowsViaDirectExpando ||
+           result == ShadowsViaIndirectExpando;
+}
 
 /* Implemented in jsdate.cpp. */
 
@@ -1231,11 +1271,11 @@
     JSErr_Limit
 } JSErrNum;
 
-extern JS_FRIEND_API(const JSErrorFormatString *)
-js_GetErrorMessage(void *userRef, const unsigned errorNumber);
-
 namespace js {
 
+extern JS_FRIEND_API(const JSErrorFormatString *)
+GetErrorMessage(void *userRef, const unsigned errorNumber);
+
 // AutoStableStringChars is here so we can use it in ErrorReport.  It
 // should get moved out of here if we can manage it.  See bug 1040316.
 
@@ -1371,15 +1411,10 @@
     bool ownsMessageAndReport;
 };
 
-} /* namespace js */
-
-
-/* Implemented in jsclone.cpp. */
-
+/* Implemented in vm/StructuredClone.cpp. */
 extern JS_FRIEND_API(uint64_t)
-js_GetSCOffset(JSStructuredCloneWriter* writer);
+GetSCOffset(JSStructuredCloneWriter *writer);
 
-namespace js {
 namespace Scalar {
 
 /* Scalar types which can appear in typed arrays and typed objects.  The enum
@@ -2636,14 +2671,14 @@
 extern JS_FRIEND_API(JSObject *)
 GetFirstSubsumedSavedFrame(JSContext *cx, JS::HandleObject savedFrame);
 
-} /* namespace js */
-
 extern JS_FRIEND_API(bool)
-js_DefineOwnProperty(JSContext *cx, JSObject *objArg, jsid idArg,
-                     JS::Handle<JSPropertyDescriptor> descriptor, bool *bp);
+ReportIsNotFunction(JSContext *cx, JS::HandleValue v);
 
 extern JS_FRIEND_API(bool)
-js_ReportIsNotFunction(JSContext *cx, JS::HandleValue v);
+DefineOwnProperty(JSContext *cx, JSObject *objArg, jsid idArg,
+                  JS::Handle<JSPropertyDescriptor> descriptor, bool *bp);
+
+} /* namespace js */
 
 extern JS_FRIEND_API(void)
 JS_StoreObjectPostBarrierCallback(JSContext* cx,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfun.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfun.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfun.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfun.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -104,7 +104,7 @@
 static void
 ThrowTypeErrorBehavior(JSContext *cx)
 {
-    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                  JSMSG_THROW_TYPE_ERROR);
 }
 
@@ -131,14 +131,14 @@
     // Functions with rest arguments don't include a local |arguments| binding.
     // Similarly, "arguments" shouldn't work on them.
     if (fun->hasRest()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_FUNCTION_ARGUMENTS_AND_REST);
         return false;
     }
 
     // Otherwise emit a strict warning about |f.arguments| to discourage use of
     // this non-standard, performance-harmful feature.
-    if (!JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING | JSREPORT_STRICT, js_GetErrorMessage,
+    if (!JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING | JSREPORT_STRICT, GetErrorMessage,
                                       nullptr, JSMSG_DEPRECATED_USAGE, js_arguments_str))
     {
         return false;
@@ -227,7 +227,7 @@
 
     // Otherwise emit a strict warning about |f.caller| to discourage use of
     // this non-standard, performance-harmful feature.
-    if (!JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING | JSREPORT_STRICT, js_GetErrorMessage,
+    if (!JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING | JSREPORT_STRICT, GetErrorMessage,
                                       nullptr, JSMSG_DEPRECATED_USAGE, js_caller_str))
     {
         return false;
@@ -280,7 +280,7 @@
         MOZ_ASSERT(!callerFun->isBuiltin(), "non-builtin iterator returned a builtin?");
 
         if (callerFun->strict()) {
-            JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+            JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                          JSMSG_CALLER_IS_STRICT);
             return false;
         }
@@ -342,7 +342,7 @@
     MOZ_ASSERT(!callerFun->isBuiltin(), "non-builtin iterator returned a builtin?");
 
     if (callerFun->strict()) {
-        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                      JSMSG_CALLER_IS_STRICT);
         return false;
     }
@@ -540,7 +540,7 @@
         if (!fun->isInterpreted()) {
             JSAutoByteString funNameBytes;
             if (const char *name = GetFunctionNameBytes(cx, fun, &funNameBytes)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_NOT_SCRIPTED_FUNCTION, name);
             }
             return false;
@@ -704,7 +704,7 @@
          * has a non-object as its .prototype value.
          */
         RootedValue val(cx, ObjectValue(*obj));
-        js_ReportValueError(cx, JSMSG_BAD_PROTOTYPE, -1, val, js::NullPtr());
+        ReportValueError(cx, JSMSG_BAD_PROTOTYPE, -1, val, js::NullPtr());
         return false;
     }
 
@@ -885,7 +885,7 @@
     if (!throwTypeError || !PreventExtensions(cx, throwTypeError, &succeeded))
         return nullptr;
     if (!succeeded) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
         return nullptr;
     }
 
@@ -1170,7 +1170,7 @@
     if (!obj->is<JSFunction>()) {
         if (obj->is<ProxyObject>())
             return Proxy::fun_toString(cx, obj, indent);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_INCOMPATIBLE_PROTO,
                              js_Function_str, js_toString_str,
                              "object");
@@ -1229,7 +1229,7 @@
 #endif
 
 bool
-js_fun_call(JSContext *cx, unsigned argc, Value *vp)
+js::fun_call(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -1253,7 +1253,7 @@
 
 // ES5 15.3.4.3
 bool
-js_fun_apply(JSContext *cx, unsigned argc, Value *vp)
+js::fun_apply(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -1266,7 +1266,7 @@
 
     // Step 2.
     if (args.length() < 2 || args[1].isNullOrUndefined())
-        return js_fun_call(cx, (args.length() > 0) ? 1 : 0, vp);
+        return fun_call(cx, (args.length() > 0) ? 1 : 0, vp);
 
     InvokeArgs args2(cx);
 
@@ -1289,7 +1289,7 @@
     } else {
         // Step 3.
         if (!args[1].isObject()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_BAD_APPLY_ARGS, js_apply_str);
             return false;
         }
@@ -1303,7 +1303,7 @@
 
         // Step 6.
         if (length > ARGS_LENGTH_MAX) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TOO_MANY_FUN_APPLY_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TOO_MANY_FUN_APPLY_ARGS);
             return false;
         }
 
@@ -1347,10 +1347,10 @@
     if (!self->toDictionaryMode(cx))
         return false;
 
-    if (!self->setFlag(cx, BaseShape::BOUND_FUNCTION))
+    if (!self->JSObject::setFlags(cx, BaseShape::BOUND_FUNCTION))
         return false;
 
-    if (!NativeObject::setSlotSpan(cx, self, BOUND_FUNCTION_RESERVED_SLOTS + argslen))
+    if (!self->setSlotSpan(cx, BOUND_FUNCTION_RESERVED_SLOTS + argslen))
         return false;
 
     self->setSlot(JSSLOT_BOUND_FUNCTION_TARGET, ObjectValue(*target));
@@ -1571,7 +1571,7 @@
     unsigned argslen = fun->getBoundFunctionArgumentCount();
 
     if (args.length() + argslen > ARGS_LENGTH_MAX) {
-        js_ReportAllocationOverflow(cx);
+        ReportAllocationOverflow(cx);
         return false;
     }
 
@@ -1644,7 +1644,7 @@
     // Steps 4-14.
     RootedValue thisArg(cx, args.length() >= 1 ? args[0] : UndefinedValue());
     RootedObject target(cx, &thisv.toObject());
-    JSObject *boundFunction = js_fun_bind(cx, target, thisArg, boundArgs, argslen);
+    JSObject *boundFunction = fun_bind(cx, target, thisArg, boundArgs, argslen);
     if (!boundFunction)
         return false;
 
@@ -1654,8 +1654,8 @@
 }
 
 JSObject*
-js_fun_bind(JSContext *cx, HandleObject target, HandleValue thisArg,
-            Value *boundArgs, unsigned argslen)
+js::fun_bind(JSContext *cx, HandleObject target, HandleValue thisArg,
+             Value *boundArgs, unsigned argslen)
 {
     double length = 0.0;
     // Try to avoid invoking the resolve hook.
@@ -1741,7 +1741,7 @@
 static bool
 OnBadFormal(JSContext *cx)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_FORMAL);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_FORMAL);
     return false;
 }
 
@@ -1750,8 +1750,8 @@
     JS_FN(js_toSource_str,   fun_toSource,   0,0),
 #endif
     JS_FN(js_toString_str,   fun_toString,   0,0),
-    JS_FN(js_apply_str,      js_fun_apply,   2,0),
-    JS_FN(js_call_str,       js_fun_call,    1,0),
+    JS_FN(js_apply_str,      fun_apply,      2,0),
+    JS_FN(js_call_str,       fun_call,       1,0),
     JS_FN("bind",            fun_bind,       1,0),
     JS_FN("isGenerator",     fun_isGenerator,0,0),
     JS_FS_END
@@ -1766,7 +1766,7 @@
     /* Block this call if security callbacks forbid it. */
     Rooted<GlobalObject*> global(cx, &args.callee().global());
     if (!GlobalObject::isRuntimeCodeGenEnabled(cx, global)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CSP_BLOCKED_FUNCTION);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CSP_BLOCKED_FUNCTION);
         return false;
     }
 
@@ -1828,7 +1828,7 @@
             size_t old_args_length = args_length;
             args_length = old_args_length + arg->length();
             if (args_length < old_args_length) {
-                js_ReportAllocationOverflow(cx);
+                ReportAllocationOverflow(cx);
                 return false;
             }
         }
@@ -1838,7 +1838,7 @@
         args_length = old_args_length + n - 1;
         if (args_length < old_args_length ||
             args_length >= ~(size_t)0 / sizeof(char16_t)) {
-            js_ReportAllocationOverflow(cx);
+            ReportAllocationOverflow(cx);
             return false;
         }
 
@@ -1850,7 +1850,7 @@
         LifoAllocScope las(&cx->tempLifoAlloc());
         char16_t *cp = cx->tempLifoAlloc().newArray<char16_t>(args_length + 1);
         if (!cp) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         ConstTwoByteChars collected_args(cp, args_length + 1);
@@ -2256,7 +2256,7 @@
     if (JSFunction *fun = ReportIfNotFunction(cx, call.calleev())) {
         JSAutoByteString funNameBytes;
         if (const char *funName = GetFunctionNameBytes(cx, fun, &funNameBytes)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                                  clasp->name, funName, InformalValueTypeName(thisv));
         }
     }
@@ -2268,7 +2268,7 @@
     if (JSFunction *fun = ReportIfNotFunction(cx, call.calleev())) {
         JSAutoByteString funNameBytes;
         if (const char *funName = GetFunctionNameBytes(cx, fun, &funNameBytes)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_METHOD,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_METHOD,
                                  funName, "method", InformalValueTypeName(call.thisv()));
         }
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfun.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfun.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsfun.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsfun.h	2015-02-28 15:03:05.000000000 +0000
@@ -663,17 +663,17 @@
 
 extern const JSFunctionSpec function_methods[];
 
-} /* namespace js */
-
 extern bool
-js_fun_apply(JSContext *cx, unsigned argc, js::Value *vp);
+fun_apply(JSContext *cx, unsigned argc, Value *vp);
 
 extern bool
-js_fun_call(JSContext *cx, unsigned argc, js::Value *vp);
+fun_call(JSContext *cx, unsigned argc, Value *vp);
 
 extern JSObject *
-js_fun_bind(JSContext *cx, js::HandleObject target, js::HandleValue thisArg,
-            js::Value *boundArgs, unsigned argslen);
+fun_bind(JSContext *cx, HandleObject target, HandleValue thisArg,
+         Value *boundArgs, unsigned argslen);
+
+} /* namespace js */
 
 #ifdef DEBUG
 namespace JS {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsgc.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsgc.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsgc.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsgc.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -219,6 +219,7 @@
 #include "gc/Memory.h"
 #include "jit/BaselineJIT.h"
 #include "jit/IonCode.h"
+#include "jit/JitcodeMap.h"
 #include "js/SliceBudget.h"
 #include "proxy/DeadObjectProxy.h"
 #include "vm/Debugger.h"
@@ -1887,7 +1888,10 @@
 bool
 GCRuntime::shouldCompact()
 {
-    return invocationKind == GC_SHRINK && isCompactingGCEnabled();
+    // Compact on shrinking GC if enabled, but skip compacting in incremental
+    // GCs if we are currently animating.
+    return invocationKind == GC_SHRINK && isCompactingGCEnabled() &&
+        (!isIncremental || rt->lastAnimationTime + PRMJ_USEC_PER_SEC < PRMJ_Now());
 }
 
 void
@@ -1935,7 +1939,6 @@
     return kind <= FINALIZE_OBJECT_LAST;
 }
 
-
 size_t ArenaHeader::countFreeCells()
 {
     size_t count = 0;
@@ -1952,7 +1955,7 @@
 }
 
 ArenaHeader *
-ArenaList::removeRemainingArenas(ArenaHeader **arenap, const AutoLockGC &lock)
+ArenaList::removeRemainingArenas(ArenaHeader **arenap)
 {
     // This is only ever called to remove arenas that are after the cursor, so
     // we don't need to update it.
@@ -1966,53 +1969,52 @@
     return remainingArenas;
 }
 
-/*
- * Choose which arenas to relocate all cells out of and remove them from the
- * arena list. Return the head of a list of arenas to relocate.
- */
-ArenaHeader *
-ArenaList::pickArenasToRelocate(JSRuntime *runtime)
+static bool
+ShouldRelocateAllArenas(JSRuntime *runtime)
 {
-    AutoLockGC lock(runtime);
-
-    check();
-    if (isEmpty())
-        return nullptr;
-
-    // In zeal mode and in debug builds on 64 bit architectures, we relocate all
-    // arenas. The purpose of this is to balance test coverage of object moving
-    // with test coverage of the arena selection routine below.
-    bool relocateAll = runtime->gc.zeal() == ZealCompactValue;
+    // In compacting zeal mode and in debug builds on 64 bit architectures, we
+    // relocate all arenas. The purpose of this is to balance test coverage of
+    // object moving with test coverage of the arena selection routine in
+    // pickArenasToRelocate().
 #if defined(DEBUG) && defined(JS_PUNBOX64)
-    relocateAll = true;
+    return true;
+#else
+    return runtime->gc.zeal() == ZealCompactValue;
 #endif
-    if (relocateAll) {
-        ArenaHeader *allArenas = head();
-        clear();
-        return allArenas;
-    }
+}
 
-    // Otherwise we relocate the greatest number of arenas such that the number
-    // of used cells in relocated arenas is less than or equal to the number of
-    // free cells in unrelocated arenas. In other words we only relocate cells
-    // we can move into existing arenas, and we choose the least full areans to
-    // relocate.
+/*
+ * Choose which arenas to relocate all cells from. Return an arena cursor that
+ * can be passed to removeRemainingArenas().
+ */
+ArenaHeader **
+ArenaList::pickArenasToRelocate(size_t &arenaTotalOut, size_t &relocTotalOut)
+{
+    // Relocate the greatest number of arenas such that the number of used cells
+    // in relocated arenas is less than or equal to the number of free cells in
+    // unrelocated arenas. In other words we only relocate cells we can move
+    // into existing arenas, and we choose the least full areans to relocate.
     //
     // This is made easier by the fact that the arena list has been sorted in
     // descending order of number of used cells, so we will always relocate a
     // tail of the arena list. All we need to do is find the point at which to
     // start relocating.
 
+    check();
+
     if (isCursorAtEnd())
         return nullptr;
 
     ArenaHeader **arenap = cursorp_;               // Next arena to consider
     size_t previousFreeCells = 0;                  // Count of free cells before
+    size_t followingUsedCells = 0;                 // Count of used cells after arenap.
+    size_t arenaCount = 0;                         // Total number of arenas.
+    size_t arenaIndex = 0;                         // Index of the next arena to consider.
 
-    // Count of used cells after arenap.
-    size_t followingUsedCells = 0;
-    for (ArenaHeader *arena = *arenap; arena; arena = arena->next)
+    for (ArenaHeader *arena = *cursorp_; arena; arena = arena->next) {
         followingUsedCells += arena->countUsedCells();
+        arenaCount++;
+    }
 
     mozilla::DebugOnly<size_t> lastFreeCells(0);
     size_t cellsPerArena = Arena::thingsPerArena((*arenap)->getThingSize());
@@ -2020,7 +2022,8 @@
     while (*arenap) {
         ArenaHeader *arena = *arenap;
         if (followingUsedCells <= previousFreeCells)
-            return removeRemainingArenas(arenap, lock);
+            break;
+
         size_t freeCells = arena->countFreeCells();
         size_t usedCells = cellsPerArena - freeCells;
         followingUsedCells -= usedCells;
@@ -2030,10 +2033,16 @@
 #endif
         previousFreeCells += freeCells;
         arenap = &arena->next;
+        arenaIndex++;
     }
 
-    check();
-    return nullptr;
+    size_t relocCount = arenaCount - arenaIndex;
+    MOZ_ASSERT(relocCount < arenaCount);
+    MOZ_ASSERT((relocCount == 0) == (!*arenap));
+    arenaTotalOut += arenaCount;
+    relocTotalOut += relocCount;
+
+    return arenap;
 }
 
 #ifdef DEBUG
@@ -2148,36 +2157,79 @@
     return relocated;
 }
 
-ArenaHeader *
-ArenaLists::relocateArenas(ArenaHeader *relocatedList, gcstats::Statistics& stats)
+// Skip compacting zones unless we can free a certain proportion of their GC
+// heap memory.
+static const double MIN_ZONE_RECLAIM_PERCENT = 2.0;
+
+static bool ShouldRelocateZone(size_t arenaCount, size_t relocCount, JS::gcreason::Reason reason)
 {
+    if (relocCount == 0)
+        return false;
+
+    if (reason == JS::gcreason::MEM_PRESSURE || reason == JS::gcreason::LAST_DITCH)
+        return true;
+
+    return (relocCount * 100.0) / arenaCount >= MIN_ZONE_RECLAIM_PERCENT;
+}
+
+bool
+ArenaLists::relocateArenas(ArenaHeader *&relocatedListOut, JS::gcreason::Reason reason,
+                           gcstats::Statistics& stats)
+{
+
+    // This is only called from the main thread while we are doing a GC, so
+    // there is no need to lock.
+    MOZ_ASSERT(CurrentThreadCanAccessRuntime(runtime_));
+    MOZ_ASSERT(runtime_->isHeapCompacting());
+    MOZ_ASSERT(!runtime_->gc.isBackgroundSweeping());
+
     // Flush all the freeLists back into the arena headers
     purge();
     checkEmptyFreeLists();
 
-    for (size_t i = 0; i < FINALIZE_LIMIT; i++) {
-        if (CanRelocateAllocKind(AllocKind(i))) {
-            ArenaList &al = arenaLists[i];
-            ArenaHeader *toRelocate = al.pickArenasToRelocate(runtime_);
-            if (toRelocate)
-                relocatedList = al.relocateArenas(toRelocate, relocatedList, stats);
+    if (ShouldRelocateAllArenas(runtime_)) {
+        for (size_t i = 0; i < FINALIZE_LIMIT; i++) {
+            if (CanRelocateAllocKind(AllocKind(i))) {
+                ArenaList &al = arenaLists[i];
+                ArenaHeader *allArenas = al.head();
+                al.clear();
+                relocatedListOut = al.relocateArenas(allArenas, relocatedListOut, stats);
+            }
+        }
+    } else {
+        size_t arenaCount = 0;
+        size_t relocCount = 0;
+        ArenaHeader **toRelocate[FINALIZE_LIMIT] = {nullptr};
+
+        for (size_t i = 0; i < FINALIZE_LIMIT; i++) {
+            if (CanRelocateAllocKind(AllocKind(i)))
+                toRelocate[i] = arenaLists[i].pickArenasToRelocate(arenaCount, relocCount);
+        }
+
+        if (!ShouldRelocateZone(arenaCount, relocCount, reason))
+            return false;
+
+        for (size_t i = 0; i < FINALIZE_LIMIT; i++) {
+            if (toRelocate[i]) {
+                ArenaList &al = arenaLists[i];
+                ArenaHeader *arenas = al.removeRemainingArenas(toRelocate[i]);
+                relocatedListOut = al.relocateArenas(arenas, relocatedListOut, stats);
+            }
         }
     }
 
-    /*
-     * When we allocate new locations for cells, we use
-     * allocateFromFreeList(). Reset the free list again so that
-     * AutoCopyFreeListToArenasForGC doesn't complain that the free lists
-     * are different now.
-     */
+    // When we allocate new locations for cells, we use
+    // allocateFromFreeList(). Reset the free list again so that
+    // AutoCopyFreeListToArenasForGC doesn't complain that the free lists are
+    // different now.
     purge();
     checkEmptyFreeLists();
 
-    return relocatedList;
+    return true;
 }
 
 ArenaHeader *
-GCRuntime::relocateArenas()
+GCRuntime::relocateArenas(JS::gcreason::Reason reason)
 {
     gcstats::AutoPhase ap(stats, gcstats::PHASE_COMPACT_MOVE);
 
@@ -2187,9 +2239,9 @@
         MOZ_ASSERT(!zone->isPreservingCode());
 
         if (CanRelocateZone(rt, zone)) {
-            zone->setGCState(Zone::Compact);
             jit::StopAllOffThreadCompilations(zone);
-            relocatedList = zone->arenas.relocateArenas(relocatedList, stats);
+            if (zone->arenas.relocateArenas(relocatedList, reason, stats))
+                zone->setGCState(Zone::Compact);
         }
     }
 
@@ -2200,16 +2252,16 @@
 MovingTracer::Visit(JSTracer *jstrc, void **thingp, JSGCTraceKind kind)
 {
     TenuredCell *thing = TenuredCell::fromPointer(*thingp);
-    Zone *zone = thing->zoneFromAnyThread();
-    if (!zone->isGCCompacting()) {
-        MOZ_ASSERT(!IsForwarded(thing));
+
+    // Currently we only relocate objects.
+    if (kind != JSTRACE_OBJECT) {
+        MOZ_ASSERT(!RelocationOverlay::isCellForwarded(thing));
         return;
     }
 
-    if (IsForwarded(thing)) {
-        Cell *dst = Forwarded(thing);
-        *thingp = dst;
-    }
+    JSObject *obj = reinterpret_cast<JSObject*>(thing);
+    if (IsForwarded(obj))
+        *thingp = Forwarded(obj);
 }
 
 void
@@ -2244,7 +2296,6 @@
 
     for (CompartmentsInZoneIter c(zone); !c.done(); c.next()) {
         c->sweepInnerViews();
-        c->sweepCrossCompartmentWrappers();
         c->sweepBaseShapeTable();
         c->sweepInitialShapeTable();
         c->objectGroups.sweep(fop);
@@ -2389,14 +2440,16 @@
 
     initialized = true;
     for (; !zone.done(); zone.next()) {
-        for (kind = 0; kind < FINALIZE_LIMIT; ++kind) {
-            if (shouldProcessKind(kind)) {
-                for (arena = zone.get()->arenas.getFirstArena(AllocKind(kind));
-                     arena;
-                     arena = arena->next)
-                {
-                    return arena;
-                    resumePoint:;
+        if (zone->isGCCompacting()) {
+            for (kind = 0; kind < FINALIZE_LIMIT; ++kind) {
+                if (shouldProcessKind(kind)) {
+                    for (arena = zone.get()->arenas.getFirstArena(AllocKind(kind));
+                         arena;
+                         arena = arena->next)
+                    {
+                        return arena;
+                      resumePoint:;
+                    }
                 }
             }
         }
@@ -2560,8 +2613,10 @@
         comp->fixupAfterMovingGC();
 
     // Fixup cross compartment wrappers as we assert the existence of wrappers in the map.
-    for (CompartmentsIter comp(rt, SkipAtoms); !comp.done(); comp.next())
+    for (CompartmentsIter comp(rt, SkipAtoms); !comp.done(); comp.next()) {
         comp->sweepCrossCompartmentWrappers();
+        comp->markCrossCompartmentWrappers(&trc);
+    }
 
     // Iterate through all cells that can contain JSObject pointers to update
     // them. Since updating each cell is independent we try to parallelize this
@@ -2595,7 +2650,7 @@
     WatchpointMap::sweepAll(rt);
     Debugger::sweepAll(rt->defaultFreeOp());
     for (GCZonesIter zone(rt); !zone.done(); zone.next()) {
-        if (CanRelocateZone(rt, zone))
+        if (zone->isGCCompacting())
             rt->gc.sweepZoneAfterCompacting(zone);
     }
 
@@ -2980,7 +3035,7 @@
 
     // We are really just totally out of memory.
     MOZ_ASSERT(allowGC, "A fallible allocation must not report OOM on failure.");
-    js_ReportOutOfMemory(cx);
+    ReportOutOfMemory(cx);
     return nullptr;
 }
 
@@ -3004,7 +3059,7 @@
     if (thing)
         return thing;
 
-    js_ReportOutOfMemory(cx);
+    ReportOutOfMemory(cx);
     return nullptr;
 }
 
@@ -5127,6 +5182,7 @@
 #endif
 
     DropStringWrappers(rt);
+
     findZoneGroups();
     endMarkingZoneGroup();
     beginSweepingZoneGroup();
@@ -5419,7 +5475,7 @@
 }
 
 GCRuntime::IncrementalProgress
-GCRuntime::compactPhase(bool lastGC)
+GCRuntime::compactPhase(JS::gcreason::Reason reason)
 {
     gcstats::AutoPhase ap(stats, gcstats::PHASE_COMPACT);
 
@@ -5435,14 +5491,15 @@
     MOZ_ASSERT(rt->gc.nursery.isEmpty());
     assertBackgroundSweepingFinished();
 
-    ArenaHeader *relocatedList = relocateArenas();
-    updatePointersToRelocatedCells();
+    ArenaHeader *relocatedList = relocateArenas(reason);
+    if (relocatedList)
+        updatePointersToRelocatedCells();
 
 #ifdef DEBUG
     for (ArenaHeader *arena = relocatedList; arena; arena = arena->next) {
         for (ArenaCellIterUnderFinalize i(arena); !i.done(); i.next()) {
             TenuredCell *src = i.getCell();
-            MOZ_ASSERT(IsForwarded(src));
+            MOZ_ASSERT(RelocationOverlay::isCellForwarded(src));
             TenuredCell *dest = Forwarded(src);
             MOZ_ASSERT(src->isMarked(BLACK) == dest->isMarked(BLACK));
             MOZ_ASSERT(src->isMarked(GRAY) == dest->isMarked(GRAY));
@@ -5451,22 +5508,24 @@
 #endif
 
     // Release the relocated arenas, or in debug builds queue them to be
-    // released until the start of the next GC unless this is the last GC.
+    // released until the start of the next GC unless this is the last GC or we
+    // are doing a last ditch GC.
 #ifndef DEBUG
     releaseRelocatedArenas(relocatedList);
 #else
-    protectRelocatedArenas(relocatedList);
-    MOZ_ASSERT(!relocatedArenasToRelease);
-    if (!lastGC)
-        relocatedArenasToRelease = relocatedList;
-    else
+    if (reason == JS::gcreason::DESTROY_RUNTIME || reason == JS::gcreason::LAST_DITCH) {
         releaseRelocatedArenas(relocatedList);
+    } else {
+        MOZ_ASSERT(!relocatedArenasToRelease);
+        protectRelocatedArenas(relocatedList);
+        relocatedArenasToRelease = relocatedList;
+    }
 #endif
 
 #ifdef DEBUG
     CheckHashTablesAfterMovingGC(rt);
     for (GCZonesIter zone(rt); !zone.done(); zone.next()) {
-        if (CanRelocateZone(rt, zone)) {
+        if (zone->isGCCompacting()) {
             MOZ_ASSERT(!zone->isPreservingCode());
             zone->arenas.checkEmptyFreeLists();
 
@@ -5489,7 +5548,7 @@
 }
 
 void
-GCRuntime::finishCollection()
+GCRuntime::finishCollection(JS::gcreason::Reason reason)
 {
     MOZ_ASSERT(marker.isDrained());
     marker.stop();
@@ -5508,7 +5567,25 @@
         MOZ_ASSERT(!zone->wasGCStarted());
     }
 
+    if (invocationKind == GC_SHRINK) {
+        // Ensure excess chunks are returns to the system and free arenas
+        // decommitted.
+        shrinkBuffers();
+    }
+
     lastGCTime = currentTime;
+
+    // If this is an OOM GC reason, wait on the background sweeping thread
+    // before returning to ensure that we free as much as possible. If this is
+    // a zeal-triggered GC, we want to ensure that the mutator can continue
+    // allocating on the same pages to reduce fragmentation.
+    if (reason == JS::gcreason::LAST_DITCH ||
+        reason == JS::gcreason::MEM_PRESSURE ||
+        reason == JS::gcreason::DEBUG_GC)
+    {
+        gcstats::AutoPhase ap(stats, gcstats::PHASE_WAIT_BACKGROUND_THREAD);
+        rt->gc.waitBackgroundSweepOrAllocEnd();
+    }
 }
 
 /* Start a new heap session. */
@@ -5873,9 +5950,11 @@
             break;
 
       case COMPACT:
-        if (isCompacting && compactPhase(lastGC) == NotFinished)
+        if (isCompacting && compactPhase(reason) == NotFinished)
             break;
-        finishCollection();
+
+        finishCollection(reason);
+
         incrementalState = NO_INCREMENTAL;
         break;
 
@@ -6303,6 +6382,7 @@
 JS_PUBLIC_API(void)
 JS::ShrinkGCBuffers(JSRuntime *rt)
 {
+    MOZ_ASSERT(!rt->isHeapBusy());
     rt->gc.shrinkBuffers();
 }
 
@@ -6311,7 +6391,6 @@
 {
     AutoLockHelperThreadState helperLock;
     AutoLockGC lock(rt);
-    MOZ_ASSERT(!rt->isHeapBusy());
 
     if (CanUseExtraThreads())
         helperState.startBackgroundShrink(lock);
@@ -6467,12 +6546,12 @@
     AutoLockGC lock(rt);
 
     if (!zone->compartments.append(compartment.get())) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
     if (zoneHolder && !rt->gc.zones.append(zone)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsgc.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsgc.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsgc.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsgc.h	2015-02-28 15:03:05.000000000 +0000
@@ -474,8 +474,8 @@
         return *this;
     }
 
-    ArenaHeader *removeRemainingArenas(ArenaHeader **arenap, const AutoLockGC &lock);
-    ArenaHeader *pickArenasToRelocate(JSRuntime *runtime);
+    ArenaHeader *removeRemainingArenas(ArenaHeader **arenap);
+    ArenaHeader **pickArenasToRelocate(size_t &arenaTotalOut, size_t &relocTotalOut);
     ArenaHeader *relocateArenas(ArenaHeader *toRelocate, ArenaHeader *relocated,
                                 gcstats::Statistics& stats);
 };
@@ -804,7 +804,8 @@
         MOZ_ASSERT(freeLists[kind].isEmpty());
     }
 
-    ArenaHeader *relocateArenas(ArenaHeader *relocatedList, gcstats::Statistics& stats);
+    bool relocateArenas(ArenaHeader *&relocatedListOut, JS::gcreason::Reason reason,
+                        gcstats::Statistics& stats);
 
     void queueForegroundObjectsForSweep(FreeOp *fop);
     void queueForegroundThingsForSweep(FreeOp *fop);
@@ -853,15 +854,11 @@
 
 } /* namespace gc */
 
-} /* namespace js */
-
 extern bool
-js_InitGC(JSRuntime *rt, uint32_t maxbytes);
+InitGC(JSRuntime *rt, uint32_t maxbytes);
 
 extern void
-js_FinishGC(JSRuntime *rt);
-
-namespace js {
+FinishGC(JSRuntime *rt);
 
 class InterpreterFrame;
 
@@ -1111,12 +1108,8 @@
 IterateScripts(JSRuntime *rt, JSCompartment *compartment,
                void *data, IterateScriptCallback scriptCallback);
 
-} /* namespace js */
-
 extern void
-js_FinalizeStringRT(JSRuntime *rt, JSString *str);
-
-namespace js {
+FinalizeStringRT(JSRuntime *rt, JSString *str);
 
 JSCompartment *
 NewCompartment(JSContext *cx, JS::Zone *zone, JSPrincipals *principals,
@@ -1181,15 +1174,35 @@
     RelocationOverlay *next() const {
         return next_;
     }
+
+    static bool isCellForwarded(Cell *cell) {
+        return fromCell(cell)->isForwarded();
+    }
 };
 
 /* Functions for checking and updating things that might be moved by compacting GC. */
 
 template <typename T>
+struct MightBeForwarded
+{
+    static_assert(mozilla::IsBaseOf<Cell, T>::value,
+                  "T must derive from Cell");
+    static_assert(!mozilla::IsSame<Cell, T>::value && !mozilla::IsSame<TenuredCell, T>::value,
+                  "T must not be Cell or TenuredCell");
+
+    static const bool value = mozilla::IsBaseOf<JSObject, T>::value;
+};
+
+template <typename T>
 inline bool
 IsForwarded(T *t)
 {
     RelocationOverlay *overlay = RelocationOverlay::fromCell(t);
+    if (!MightBeForwarded<T>::value) {
+        MOZ_ASSERT(!overlay->isForwarded());
+        return false;
+    }
+
     return overlay->isForwarded();
 }
 
@@ -1246,7 +1259,7 @@
 CheckGCThingAfterMovingGC(T *t)
 {
     MOZ_ASSERT_IF(t, !IsInsideNursery(t));
-    MOZ_ASSERT_IF(t, !IsForwarded(t));
+    MOZ_ASSERT_IF(t, !RelocationOverlay::isCellForwarded(t));
 }
 
 inline void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsgcinlines.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsgcinlines.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsgcinlines.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsgcinlines.h	2015-02-28 15:03:05.000000000 +0000
@@ -412,10 +412,47 @@
     return true;
 }
 
+static inline bool
+GCIfNeeded(ExclusiveContext *cx)
+{
+    if (cx->isJSContext()) {
+        JSContext *ncx = cx->asJSContext();
+        JSRuntime *rt = ncx->runtime();
+
+#ifdef JS_GC_ZEAL
+        if (rt->gc.needZealousGC())
+            rt->gc.runDebugGC();
+#endif
+
+        // Invoking the interrupt callback can fail and we can't usefully
+        // handle that here. Just check in case we need to collect instead.
+        if (rt->hasPendingInterrupt())
+            rt->gc.gcIfRequested(ncx);
+
+        // If we have grown past our GC heap threshold while in the middle of
+        // an incremental GC, we're growing faster than we're GCing, so stop
+        // the world and do a full, non-incremental GC right now, if possible.
+        if (rt->gc.isIncrementalGCInProgress() &&
+            cx->zone()->usage.gcBytes() > cx->zone()->threshold.gcTriggerBytes())
+        {
+            PrepareZoneForGC(cx->zone());
+            AutoKeepAtoms keepAtoms(cx->perThreadData);
+            rt->gc.gc(GC_NORMAL, JS::gcreason::INCREMENTAL_TOO_SLOW);
+        }
+    }
+
+    return true;
+}
+
 template <AllowGC allowGC>
 static inline bool
 CheckAllocatorState(ExclusiveContext *cx, AllocKind kind)
 {
+    if (allowGC) {
+        if (!GCIfNeeded(cx))
+            return false;
+    }
+
     if (!cx->isJSContext())
         return true;
 
@@ -437,33 +474,10 @@
 
     // For testing out of memory conditions
     if (!PossiblyFail()) {
-        js_ReportOutOfMemory(ncx);
+        ReportOutOfMemory(ncx);
         return false;
     }
 
-    if (allowGC) {
-#ifdef JS_GC_ZEAL
-        if (rt->gc.needZealousGC())
-            rt->gc.runDebugGC();
-#endif
-        if (rt->hasPendingInterrupt()) {
-            // Invoking the interrupt callback can fail and we can't usefully
-            // handle that here. Just check in case we need to collect instead.
-            rt->gc.gcIfRequested(ncx);
-        }
-
-        // If we have grown past our GC heap threshold while in the middle of
-        // an incremental GC, we're growing faster than we're GCing, so stop
-        // the world and do a full, non-incremental GC right now, if possible.
-        if (rt->gc.isIncrementalGCInProgress() &&
-            ncx->zone()->usage.gcBytes() > ncx->zone()->threshold.gcTriggerBytes())
-        {
-            PrepareZoneForGC(ncx->zone());
-            AutoKeepAtoms keepAtoms(cx->perThreadData);
-            rt->gc.gc(GC_NORMAL, JS::gcreason::INCREMENTAL_TOO_SLOW);
-        }
-    }
-
     return true;
 }
 
@@ -662,25 +676,25 @@
     return gc::AllocateNonObject<AccessorShape, CanGC>(cx);
 }
 
-} /* namespace js */
-
 inline JSScript *
-js_NewGCScript(js::ExclusiveContext *cx)
+NewGCScript(ExclusiveContext *cx)
 {
-    return js::gc::AllocateNonObject<JSScript, js::CanGC>(cx);
+    return gc::AllocateNonObject<JSScript, CanGC>(cx);
 }
 
-inline js::LazyScript *
-js_NewGCLazyScript(js::ExclusiveContext *cx)
+inline LazyScript *
+NewGCLazyScript(ExclusiveContext *cx)
 {
-    return js::gc::AllocateNonObject<js::LazyScript, js::CanGC>(cx);
+    return gc::AllocateNonObject<LazyScript, CanGC>(cx);
 }
 
-template <js::AllowGC allowGC>
-inline js::BaseShape *
-js_NewGCBaseShape(js::ExclusiveContext *cx)
+template <AllowGC allowGC>
+inline BaseShape *
+NewGCBaseShape(ExclusiveContext *cx)
 {
-    return js::gc::AllocateNonObject<js::BaseShape, allowGC>(cx);
+    return gc::AllocateNonObject<BaseShape, allowGC>(cx);
 }
 
+} /* namespace js */
+
 #endif /* jsgcinlines_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsiter.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsiter.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsiter.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsiter.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -450,8 +450,8 @@
         if (!AtomToPrintableString(cx, name, &bytes))
             return false;
         RootedValue val(cx, ObjectValue(*obj));
-        js_ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
-                             -1, val, js::NullPtr(), bytes.ptr());
+        ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
+                          -1, val, js::NullPtr(), bytes.ptr());
         return false;
     }
     objp.set(&rval.toObject());
@@ -858,7 +858,7 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() == 0) {
-        js_ReportMissingArg(cx, args.calleev(), 0);
+        ReportMissingArg(cx, args.calleev(), 0);
         return false;
     }
 
@@ -1447,7 +1447,7 @@
 }
 
 JSObject *
-js_InitIteratorClasses(JSContext *cx, HandleObject obj)
+js::InitIteratorClasses(JSContext *cx, HandleObject obj)
 {
     Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>());
     if (!GlobalObject::initIteratorClasses(cx, global))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsiter.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsiter.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsiter.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsiter.h	2015-02-28 15:03:05.000000000 +0000
@@ -212,9 +212,9 @@
 extern JSObject *
 CreateItrResultObject(JSContext *cx, HandleValue value, bool done);
 
-} /* namespace js */
-
 extern JSObject *
-js_InitIteratorClasses(JSContext *cx, js::HandleObject obj);
+InitIteratorClasses(JSContext *cx, HandleObject obj);
+
+} /* namespace js */
 
 #endif /* jsiter_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsmath.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsmath.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsmath.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsmath.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1607,7 +1607,7 @@
 };
 
 JSObject *
-js_InitMathClass(JSContext *cx, HandleObject obj)
+js::InitMathClass(JSContext *cx, HandleObject obj)
 {
     RootedObject proto(cx, obj->as<GlobalObject>().getOrCreateObjectPrototype(cx));
     if (!proto)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsmath.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsmath.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsmath.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsmath.h	2015-02-28 15:03:05.000000000 +0000
@@ -83,16 +83,12 @@
     size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf);
 };
 
-} /* namespace js */
-
 /*
  * JS math functions.
  */
 
 extern JSObject *
-js_InitMathClass(JSContext *cx, js::HandleObject obj);
-
-namespace js {
+InitMathClass(JSContext *cx, HandleObject obj);
 
 extern void
 random_initState(uint64_t *rngState);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/js.msg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/js.msg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/js.msg	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/js.msg	2015-02-28 15:03:05.000000000 +0000
@@ -80,7 +80,7 @@
 MSG_DEF(JSMSG_EMPTY_ARRAY_REDUCE,      0, JSEXN_TYPEERR, "reduce of empty array with no initial value")
 MSG_DEF(JSMSG_UNEXPECTED_TYPE,         2, JSEXN_TYPEERR, "{0} is {1}")
 MSG_DEF(JSMSG_MISSING_FUN_ARG,         2, JSEXN_TYPEERR, "missing argument {0} when calling function {1}")
-MSG_DEF(JSMSG_NOT_NONNULL_OBJECT,      0, JSEXN_TYPEERR, "value is not a non-null object")
+MSG_DEF(JSMSG_NOT_NONNULL_OBJECT,      1, JSEXN_TYPEERR, "{0} is not a non-null object")
 MSG_DEF(JSMSG_INVALID_DESCRIPTOR,      0, JSEXN_TYPEERR, "property descriptors must not specify a value or be writable when a getter or setter has been specified")
 MSG_DEF(JSMSG_OBJECT_NOT_EXTENSIBLE,   1, JSEXN_TYPEERR, "{0} is not extensible")
 MSG_DEF(JSMSG_CANT_REDEFINE_PROP,      1, JSEXN_TYPEERR, "can't redefine non-configurable property '{0}'")
@@ -142,7 +142,7 @@
 MSG_DEF(JSMSG_CSP_BLOCKED_FUNCTION,    0, JSEXN_ERR, "call to Function() blocked by CSP")
 
 // Wrappers
-MSG_DEF(JSMSG_ACCESSOR_DEF_DENIED,     1, JSEXN_ERR, "Permission denied to define accessor property '{0}'")
+MSG_DEF(JSMSG_ACCESSOR_DEF_DENIED,     1, JSEXN_ERR, "Permission denied to define accessor property {0}")
 MSG_DEF(JSMSG_DEAD_OBJECT,             0, JSEXN_TYPEERR, "can't access dead object")
 MSG_DEF(JSMSG_UNWRAP_DENIED,           0, JSEXN_ERR, "permission denied to unwrap object")
 
@@ -193,6 +193,7 @@
 MSG_DEF(JSMSG_BAD_GENERATOR_SYNTAX,    1, JSEXN_SYNTAXERR, "{0} expression must be parenthesized")
 MSG_DEF(JSMSG_BAD_GENEXP_BODY,         1, JSEXN_SYNTAXERR, "illegal use of {0} in generator expression")
 MSG_DEF(JSMSG_BAD_INCOP_OPERAND,       0, JSEXN_REFERENCEERR, "invalid increment/decrement operand")
+MSG_DEF(JSMSG_BAD_METHOD_DEF,          0, JSEXN_SYNTAXERR, "bad method definition")
 MSG_DEF(JSMSG_BAD_OCTAL,               1, JSEXN_SYNTAXERR, "{0} is not a legal ECMA-262 octal constant")
 MSG_DEF(JSMSG_BAD_OPERAND,             1, JSEXN_SYNTAXERR, "invalid {0} operand")
 MSG_DEF(JSMSG_BAD_PROP_ID,             0, JSEXN_SYNTAXERR, "invalid property id")
@@ -219,6 +220,7 @@
 MSG_DEF(JSMSG_CURLY_AFTER_TRY,         0, JSEXN_SYNTAXERR, "missing } after try block")
 MSG_DEF(JSMSG_CURLY_BEFORE_BODY,       0, JSEXN_SYNTAXERR, "missing { before function body")
 MSG_DEF(JSMSG_CURLY_BEFORE_CATCH,      0, JSEXN_SYNTAXERR, "missing { before catch block")
+MSG_DEF(JSMSG_CURLY_BEFORE_CLASS,      0, JSEXN_SYNTAXERR, "missing { before class body")
 MSG_DEF(JSMSG_CURLY_BEFORE_FINALLY,    0, JSEXN_SYNTAXERR, "missing { before finally block")
 MSG_DEF(JSMSG_CURLY_BEFORE_SWITCH,     0, JSEXN_SYNTAXERR, "missing { before switch body")
 MSG_DEF(JSMSG_CURLY_BEFORE_TRY,        0, JSEXN_SYNTAXERR, "missing { before try block")
@@ -247,6 +249,7 @@
 MSG_DEF(JSMSG_INVALID_FOR_OF_INIT,     0, JSEXN_SYNTAXERR, "for-of loop variable declaration may not have an initializer")
 MSG_DEF(JSMSG_IN_AFTER_FOR_NAME,       0, JSEXN_SYNTAXERR, "missing 'in' or 'of' after for")
 MSG_DEF(JSMSG_LABEL_NOT_FOUND,         0, JSEXN_SYNTAXERR, "label not found")
+MSG_DEF(JSMSG_LET_CLASS_BINDING,       0, JSEXN_SYNTAXERR, "'let' is not a valid name for a class")
 MSG_DEF(JSMSG_LET_COMP_BINDING,        0, JSEXN_SYNTAXERR, "'let' is not a valid name for a comprehension variable")
 MSG_DEF(JSMSG_LEXICAL_DECL_NOT_IN_BLOCK,   1, JSEXN_SYNTAXERR, "{0} declaration not directly within block")
 MSG_DEF(JSMSG_LINE_BREAK_AFTER_THROW,  0, JSEXN_SYNTAXERR, "no line break is allowed between 'throw' and its expression")
@@ -262,6 +265,7 @@
 MSG_DEF(JSMSG_NAME_AFTER_DOT,          0, JSEXN_SYNTAXERR, "missing name after . operator")
 MSG_DEF(JSMSG_NONDEFAULT_FORMAL_AFTER_DEFAULT, 0, JSEXN_SYNTAXERR, "parameter(s) with default followed by parameter without default")
 MSG_DEF(JSMSG_NO_BINDING_NAME,        0, JSEXN_SYNTAXERR, "missing binding name")
+MSG_DEF(JSMSG_NO_CLASS_CONSTRUCTOR,    0, JSEXN_TYPEERR,   "class default constructors not yet implemented")
 MSG_DEF(JSMSG_NO_EXPORT_NAME,          0, JSEXN_SYNTAXERR, "missing export name")
 MSG_DEF(JSMSG_NO_IMPORT_NAME,          0, JSEXN_SYNTAXERR, "missing import name")
 MSG_DEF(JSMSG_NO_VARIABLE_NAME,        0, JSEXN_SYNTAXERR, "missing variable name")
@@ -309,6 +313,7 @@
 MSG_DEF(JSMSG_TOO_MANY_YIELDS,         0, JSEXN_SYNTAXERR, "too many yield expressions")
 MSG_DEF(JSMSG_TOUGH_BREAK,             0, JSEXN_SYNTAXERR, "unlabeled break must be inside loop or switch")
 MSG_DEF(JSMSG_UNEXPECTED_TOKEN,        2, JSEXN_SYNTAXERR, "expected {0}, got {1}")
+MSG_DEF(JSMSG_UNNAMED_CLASS_STMT,      0, JSEXN_SYNTAXERR, "class statement requires a name")
 MSG_DEF(JSMSG_UNNAMED_FUNCTION_STMT,   0, JSEXN_SYNTAXERR, "function statement requires a name")
 MSG_DEF(JSMSG_UNTERMINATED_COMMENT,    0, JSEXN_SYNTAXERR, "unterminated comment")
 MSG_DEF(JSMSG_UNTERMINATED_REGEXP,     0, JSEXN_SYNTAXERR, "unterminated regular expression literal")
@@ -346,7 +351,7 @@
 MSG_DEF(JSMSG_MUST_REPORT_SAME_VALUE,  0, JSEXN_TYPEERR, "proxy must report the same value for a non-writable, non-configurable property")
 MSG_DEF(JSMSG_MUST_REPORT_UNDEFINED,   0, JSEXN_TYPEERR, "proxy must report undefined for a non-configurable accessor property without a getter")
 MSG_DEF(JSMSG_OBJECT_ACCESS_DENIED,    0, JSEXN_ERR, "Permission denied to access object")
-MSG_DEF(JSMSG_PROPERTY_ACCESS_DENIED,  1, JSEXN_ERR, "Permission denied to access property '{0}'")
+MSG_DEF(JSMSG_PROPERTY_ACCESS_DENIED,  1, JSEXN_ERR, "Permission denied to access property {0}")
 MSG_DEF(JSMSG_PROXY_CONSTRUCT_OBJECT,  0, JSEXN_TYPEERR, "proxy [[Construct]] must return an object")
 MSG_DEF(JSMSG_PROXY_EXTENSIBILITY,     0, JSEXN_TYPEERR, "proxy must report same extensiblitity as target")
 MSG_DEF(JSMSG_PROXY_GETOWN_OBJORUNDEF, 0, JSEXN_TYPEERR, "proxy [[GetOwnProperty]] must return an object or undefined")
@@ -455,7 +460,6 @@
 MSG_DEF(JSMSG_SYMBOL_TO_NUMBER,        0, JSEXN_TYPEERR, "can't convert symbol to number")
 
 // Atomics and futexes
-MSG_DEF(JSMSG_ATOMICS_NOT_INSTALLED,     0, JSEXN_ERR, "futex support is not installed")
 MSG_DEF(JSMSG_ATOMICS_BAD_ARRAY,         0, JSEXN_TYPEERR, "invalid array type for the operation")
 MSG_DEF(JSMSG_ATOMICS_TOO_LONG,          0, JSEXN_RANGEERR, "timeout value too large")
 MSG_DEF(JSMSG_ATOMICS_WAIT_NOT_ALLOWED,  0, JSEXN_ERR, "waiting is not allowed on this thread")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsnum.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsnum.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsnum.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsnum.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -81,7 +81,7 @@
     int err = 0;
     *dp = js_strtod_harder(cx->dtoaState(), cstr, &estr, &err);
     if (err == JS_DTOA_ENOMEM) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -459,8 +459,6 @@
 static const JSFunctionSpec number_functions[] = {
     JS_SELF_HOSTED_FN(js_isNaN_str, "Global_isNaN", 1,0),
     JS_SELF_HOSTED_FN(js_isFinite_str, "Global_isFinite", 1,0),
-    JS_FN(js_parseFloat_str,    num_parseFloat,      1,0),
-    JS_FN(js_parseInt_str,      num_parseInt,        2,0),
     JS_FS_END
 };
 
@@ -681,8 +679,8 @@
 }
 
 template <AllowGC allowGC>
-static JSString * JS_FASTCALL
-js_NumberToStringWithBase(ExclusiveContext *cx, double d, int base);
+static JSString *
+NumberToStringWithBase(ExclusiveContext *cx, double d, int base);
 
 MOZ_ALWAYS_INLINE bool
 num_toString_impl(JSContext *cx, CallArgs args)
@@ -698,13 +696,13 @@
             return false;
 
         if (d2 < 2 || d2 > 36) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_RADIX);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_RADIX);
             return false;
         }
 
         base = int32_t(d2);
     }
-    JSString *str = js_NumberToStringWithBase<CanGC>(cx, d, base);
+    JSString *str = NumberToStringWithBase<CanGC>(cx, d, base);
     if (!str) {
         JS_ReportOutOfMemory(cx);
         return false;
@@ -714,7 +712,7 @@
 }
 
 bool
-js_num_toString(JSContext *cx, unsigned argc, Value *vp)
+js::num_toString(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     return CallNonGenericMethod<IsNumber, num_toString_impl>(cx, args);
@@ -728,7 +726,7 @@
 
     double d = Extract(args.thisv());
 
-    Rooted<JSString*> str(cx, js_NumberToStringWithBase<CanGC>(cx, d, 10));
+    RootedString str(cx, NumberToStringWithBase<CanGC>(cx, d, 10));
     if (!str) {
         JS_ReportOutOfMemory(cx);
         return false;
@@ -864,7 +862,7 @@
 }
 
 bool
-js_num_valueOf(JSContext *cx, unsigned argc, Value *vp)
+js::num_valueOf(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     return CallNonGenericMethod<IsNumber, num_valueOf_impl>(cx, args);
@@ -886,7 +884,7 @@
 
     ToCStringBuf cbuf;
     if (char *numStr = NumberToCString(cx, &cbuf, prec, 10))
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PRECISION_RANGE, numStr);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PRECISION_RANGE, numStr);
     return false;
 }
 
@@ -967,7 +965,7 @@
     double d = Extract(args.thisv());
 
     if (!args.hasDefined(0)) {
-        JSString *str = js_NumberToStringWithBase<CanGC>(cx, d, 10);
+        JSString *str = NumberToStringWithBase<CanGC>(cx, d, 10);
         if (!str) {
             JS_ReportOutOfMemory(cx);
             return false;
@@ -994,13 +992,13 @@
 #if JS_HAS_TOSOURCE
     JS_FN(js_toSource_str,       num_toSource,          0, 0),
 #endif
-    JS_FN(js_toString_str,       js_num_toString,       1, 0),
+    JS_FN(js_toString_str,       num_toString,          1, 0),
 #if EXPOSE_INTL_API
     JS_SELF_HOSTED_FN(js_toLocaleString_str, "Number_toLocaleString", 0,0),
 #else
     JS_FN(js_toLocaleString_str, num_toLocaleString,     0,0),
 #endif
-    JS_FN(js_valueOf_str,        js_num_valueOf,        0, 0),
+    JS_FN(js_valueOf_str,        num_valueOf,           0, 0),
     JS_FN("toFixed",             num_toFixed,           1, 0),
     JS_FN("toExponential",       num_toExponential,     1, 0),
     JS_FN("toPrecision",         num_toPrecision,       1, 0),
@@ -1029,45 +1027,10 @@
     JS_FN("isInteger", Number_isInteger, 1, 0),
     JS_SELF_HOSTED_FN("isNaN", "Number_isNaN", 1,0),
     JS_SELF_HOSTED_FN("isSafeInteger", "Number_isSafeInteger", 1,0),
-    JS_FN("parseFloat", num_parseFloat, 1, 0),
-    JS_FN("parseInt", num_parseInt, 2, 0),
     JS_FS_END
 };
 
 
-/* NB: Keep this in synch with number_constants[]. */
-enum nc_slot {
-    NC_NaN,
-    NC_POSITIVE_INFINITY,
-    NC_NEGATIVE_INFINITY,
-    NC_MAX_VALUE,
-    NC_MIN_VALUE,
-    NC_MAX_SAFE_INTEGER,
-    NC_MIN_SAFE_INTEGER,
-    NC_EPSILON,
-    NC_LIMIT
-};
-
-/*
- * Some to most C compilers forbid spelling these at compile time, or barf
- * if you try, so all but MAX_VALUE are set up by InitRuntimeNumberState
- * using union jsdpun.
- */
-static JSConstDoubleSpec number_constants[] = {
-    {"NaN",               0                          },
-    {"POSITIVE_INFINITY", 0                          },
-    {"NEGATIVE_INFINITY", 0                          },
-    {"MAX_VALUE",         1.7976931348623157E+308    },
-    {"MIN_VALUE",         0                          },
-    /* ES6 (April 2014 draft) 20.1.2.6 */
-    {"MAX_SAFE_INTEGER",  9007199254740991           },
-    /* ES6 (April 2014 draft) 20.1.2.10 */
-    {"MIN_SAFE_INTEGER", -9007199254740991,          },
-    /* ES6 (May 2013 draft) 15.7.3.7 */
-    {"EPSILON", 2.2204460492503130808472633361816e-16},
-    {0,0}
-};
-
 /*
  * Set the exception mask to mask all exceptions and set the FPU precision
  * to 53 bit mantissa (64 bit doubles).
@@ -1090,17 +1053,6 @@
 {
     FIX_FPU();
 
-    /*
-     * Our NaN must be one particular canonical value, because we rely on NaN
-     * encoding for our value representation.  See Value.h.
-     */
-    number_constants[NC_NaN].val = GenericNaN();
-
-    number_constants[NC_POSITIVE_INFINITY].val = mozilla::PositiveInfinity<double>();
-    number_constants[NC_NEGATIVE_INFINITY].val = mozilla::NegativeInfinity<double>();
-
-    number_constants[NC_MIN_VALUE].val = MinNumberValue<double>();
-
     // XXX If EXPOSE_INTL_API becomes true all the time at some point,
     //     js::InitRuntimeNumberState is no longer fallible, and we should
     //     change its return type.
@@ -1166,7 +1118,7 @@
 #endif
 
 JSObject *
-js_InitNumberClass(JSContext *cx, HandleObject obj)
+js::InitNumberClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->isNative());
 
@@ -1188,6 +1140,25 @@
     if (!LinkConstructorAndPrototype(cx, ctor, numberProto))
         return nullptr;
 
+    /*
+     * Our NaN must be one particular canonical value, because we rely on NaN
+     * encoding for our value representation.  See Value.h.
+     */
+    static JSConstDoubleSpec number_constants[] = {
+        {"NaN",               GenericNaN()               },
+        {"POSITIVE_INFINITY", mozilla::PositiveInfinity<double>() },
+        {"NEGATIVE_INFINITY", mozilla::NegativeInfinity<double>() },
+        {"MAX_VALUE",         1.7976931348623157E+308    },
+        {"MIN_VALUE",         MinNumberValue<double>()   },
+        /* ES6 (April 2014 draft) 20.1.2.6 */
+        {"MAX_SAFE_INTEGER",  9007199254740991           },
+        /* ES6 (April 2014 draft) 20.1.2.10 */
+        {"MIN_SAFE_INTEGER", -9007199254740991,          },
+        /* ES6 (May 2013 draft) 15.7.3.7 */
+        {"EPSILON", 2.2204460492503130808472633361816e-16},
+        {0,0}
+    };
+
     /* Add numeric constants (MAX_VALUE, NaN, &c.) to the Number constructor. */
     if (!JS_DefineConstDoubles(cx, ctor, number_constants))
         return nullptr;
@@ -1201,6 +1172,24 @@
     if (!JS_DefineFunctions(cx, global, number_functions))
         return nullptr;
 
+    /* Number.parseInt should be the same function object as global parseInt. */
+    RootedId parseIntId(cx, NameToId(cx->names().parseInt));
+    JSFunction *parseInt = DefineFunction(cx, global, parseIntId, num_parseInt, 2, 0);
+    if(!parseInt)
+        return nullptr;
+    RootedValue parseIntValue(cx, ObjectValue(*parseInt));
+    if(!DefineProperty(cx, ctor, parseIntId, parseIntValue, nullptr, nullptr, 0))
+        return nullptr;
+
+    /* Number.parseFloat should be the same function object as global parseFloat. */
+    RootedId parseFloatId(cx, NameToId(cx->names().parseFloat));
+    JSFunction *parseFloat = DefineFunction(cx, global, parseFloatId, num_parseFloat, 1, 0);
+    if(!parseFloat)
+        return nullptr;
+    RootedValue parseFloatValue(cx, ObjectValue(*parseFloat));
+    if(!DefineProperty(cx, ctor, parseFloatId, parseFloatValue, nullptr, nullptr, 0))
+        return nullptr;
+
     RootedValue valueNaN(cx, cx->runtime()->NaNValue);
     RootedValue valueInfinity(cx, cx->runtime()->positiveInfinityValue);
 
@@ -1260,8 +1249,8 @@
 }
 
 template <AllowGC allowGC>
-static JSString * JS_FASTCALL
-js_NumberToStringWithBase(ExclusiveContext *cx, double d, int base)
+static JSString *
+NumberToStringWithBase(ExclusiveContext *cx, double d, int base)
 {
     ToCStringBuf cbuf;
     char *numStr;
@@ -1300,7 +1289,7 @@
 
         numStr = FracNumberToCString(cx, &cbuf, d, base);
         if (!numStr) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
         MOZ_ASSERT_IF(base == 10,
@@ -1319,7 +1308,7 @@
 JSString *
 js::NumberToString(ExclusiveContext *cx, double d)
 {
-    return js_NumberToStringWithBase<allowGC>(cx, d, 10);
+    return NumberToStringWithBase<allowGC>(cx, d, 10);
 }
 
 template JSString *
@@ -1341,7 +1330,7 @@
     ToCStringBuf cbuf;
     char *numStr = FracNumberToCString(cx, &cbuf, d);
     if (!numStr) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
     MOZ_ASSERT(!cbuf.dbuf && numStr >= cbuf.sbuf && numStr < cbuf.sbuf + cbuf.sbufSize);
@@ -1359,7 +1348,7 @@
 JSFlatString *
 js::NumberToString(JSContext *cx, double d)
 {
-    if (JSString *str = js_NumberToStringWithBase<CanGC>(cx, d, 10))
+    if (JSString *str = NumberToStringWithBase<CanGC>(cx, d, 10))
         return &str->asFlat();
     return nullptr;
 }
@@ -1523,7 +1512,7 @@
             }
             if (v.isSymbol()) {
                 if (cx->isJSContext()) {
-                    JS_ReportErrorNumber(cx->asJSContext(), js_GetErrorMessage, nullptr,
+                    JS_ReportErrorNumber(cx->asJSContext(), GetErrorMessage, nullptr,
                                          JSMSG_SYMBOL_TO_NUMBER);
                 }
                 return false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsnum.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsnum.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsnum.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsnum.h	2015-02-28 15:03:05.000000000 +0000
@@ -26,11 +26,11 @@
 FinishRuntimeNumberState(JSRuntime *rt);
 #endif
 
-} /* namespace js */
-
 /* Initialize the Number class, returning its prototype object. */
 extern JSObject *
-js_InitNumberClass(JSContext *cx, js::HandleObject obj);
+InitNumberClass(JSContext *cx, HandleObject obj);
+
+} /* namespace js */
 
 /*
  * String constants for global function names, used in jsapi.c and jsnum.c.
@@ -101,7 +101,7 @@
  * Convert a number to a C string.  When base==10, this function implements
  * ToString() as specified by ECMA-262-5 section 9.8.1.  It handles integral
  * values cheaply.  Return nullptr if we ran out of memory.  See also
- * js_NumberToCString().
+ * NumberToCString().
  */
 extern char *
 NumberToCString(JSContext *cx, ToCStringBuf *cbuf, double d, int base = 10);
@@ -187,13 +187,13 @@
 js_strtod(js::ExclusiveContext *cx, const CharT *begin, const CharT *end,
           const CharT **dEnd, double *d);
 
-extern bool
-js_num_toString(JSContext *cx, unsigned argc, js::Value *vp);
+namespace js {
 
 extern bool
-js_num_valueOf(JSContext *cx, unsigned argc, js::Value *vp);
+num_toString(JSContext *cx, unsigned argc, Value *vp);
 
-namespace js {
+extern bool
+num_valueOf(JSContext *cx, unsigned argc, Value *vp);
 
 static MOZ_ALWAYS_INLINE bool
 ValueFitsInInt32(const Value &v, int32_t *pi)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsobj.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsobj.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsobj.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsobj.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -75,7 +75,7 @@
 JS_ObjectToInnerObject(JSContext *cx, HandleObject obj)
 {
     if (!obj) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INACTIVE);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INACTIVE);
         return nullptr;
     }
     return GetInnerObject(obj);
@@ -92,7 +92,11 @@
 js::NonNullObject(JSContext *cx, const Value &v)
 {
     if (v.isPrimitive()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+        RootedValue value(cx, v);
+        char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, NullPtr());
+        if (!bytes)
+            return nullptr;
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes);
         return nullptr;
     }
     return &v.toObject();
@@ -237,7 +241,7 @@
                              MutableHandleObject objp)
 {
     if (args.length() == 0) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              method, "0", "s");
         return false;
     }
@@ -247,7 +251,7 @@
         char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NullPtr());
         if (!bytes)
             return false;
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              bytes, "not an object");
         js_free(bytes);
         return false;
@@ -280,7 +284,10 @@
 
     /* 8.10.5 step 1 */
     if (v.isPrimitive()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+        char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, v, NullPtr());
+        if (!bytes)
+            return false;
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes);
         return false;
     }
     RootedObject desc(cx, &v.toObject());
@@ -363,7 +370,7 @@
 
     /* 8.10.7 step 9 */
     if ((hasGet() || hasSet()) && (hasValue() || hasWritable())) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INVALID_DESCRIPTOR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INVALID_DESCRIPTOR);
         return false;
     }
 
@@ -411,13 +418,14 @@
 {
     MOZ_ASSERT(js_ErrorFormatString[errorNumber].argCount == 1);
 
-    JSString *idstr = IdToString(cx, id);
+    RootedValue idVal(cx, IdToValue(id));
+    JSString *idstr = ValueToSource(cx, idVal);
     if (!idstr)
        return false;
     JSAutoByteString bytes(cx, idstr);
     if (!bytes)
         return false;
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, errorNumber, bytes.ptr());
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, errorNumber, bytes.ptr());
     return false;
 }
 
@@ -426,12 +434,12 @@
 {
     if (js_ErrorFormatString[errorNumber].argCount == 1) {
         RootedValue val(cx, ObjectValue(*obj));
-        js_ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,
-                                 JSDVG_IGNORE_STACK, val, NullPtr(),
-                                 nullptr, nullptr);
+        ReportValueErrorFlags(cx, JSREPORT_ERROR, errorNumber,
+                              JSDVG_IGNORE_STACK, val, NullPtr(),
+                              nullptr, nullptr);
     } else {
         MOZ_ASSERT(js_ErrorFormatString[errorNumber].argCount == 0);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, errorNumber);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, errorNumber);
     }
     return false;
 }
@@ -816,7 +824,7 @@
 
     /* Step 3. */
     uint32_t index;
-    if (js_IdIsIndex(id, &index)) {
+    if (IdIsIndex(id, &index)) {
         /* Step 3b. */
         uint32_t oldLen = arr->length();
 
@@ -899,7 +907,7 @@
     if (IsAnyTypedArray(obj))
         return DefinePropertyOnTypedArray(cx, obj, id, desc, throwError, rval);
 
-    if (obj->is<UnboxedPlainObject>() && !obj->as<UnboxedPlainObject>().convertToNative(cx))
+    if (obj->is<UnboxedPlainObject>() && !UnboxedPlainObject::convertToNative(cx, obj))
         return false;
 
     if (obj->getOps()->lookupProperty) {
@@ -985,7 +993,7 @@
     if (!PreventExtensions(cx, obj, &status))
         return false;
     if (!status) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
         return false;
     }
 
@@ -1038,7 +1046,7 @@
         }
 
         MOZ_ASSERT(nobj->lastProperty()->slotSpan() == last->slotSpan());
-        JS_ALWAYS_TRUE(NativeObject::setLastProperty(cx, nobj, last));
+        JS_ALWAYS_TRUE(nobj->setLastProperty(cx, last));
     } else {
         RootedId id(cx);
         Rooted<PropertyDescriptor> desc(cx);
@@ -1098,7 +1106,7 @@
     return true;
 }
 
-/* ES6 rev 29 (6 Dec 2014) 7.3.14. */
+// ES6 draft rev33 (12 Feb 2015) 7.3.15
 bool
 js::TestIntegrityLevel(JSContext *cx, HandleObject obj, IntegrityLevel level, bool *result)
 {
@@ -1111,38 +1119,26 @@
         return true;
     }
 
-    if (IsAnyTypedArray(obj)) {
-        if (level == IntegrityLevel::Sealed) {
-            // Typed arrays are considered sealed (bug 1120503).
-            *result = true;
-        } else {
-            // Typed arrays cannot be frozen, but an empty typed array is
-            // considered frozen (bug 1120503).
-            *result = (AnyTypedArrayLength(obj) == 0);
-        }
-        return true;
-    }
-
     // Steps 7-8.
     AutoIdVector props(cx);
     if (!GetPropertyKeys(cx, obj, JSITER_HIDDEN | JSITER_OWNONLY | JSITER_SYMBOLS, &props))
         return false;
 
-    // Step 11.
+    // Step 9.
     RootedId id(cx);
     Rooted<PropertyDescriptor> desc(cx);
     for (size_t i = 0, len = props.length(); i < len; i++) {
         id = props[i];
 
-        // Steps 11.a-b.
+        // Steps 9.a-b.
         if (!GetOwnPropertyDescriptor(cx, obj, id, &desc))
             return false;
 
-        // Step 11.c.
+        // Step 9.c.
         if (!desc.object())
             continue;
 
-        // Steps 11.c.i-ii.
+        // Steps 9.c.i-ii.
         if (!desc.isPermanent() ||
             (level == IntegrityLevel::Frozen && desc.isDataDescriptor() && desc.isWritable()))
         {
@@ -1151,7 +1147,7 @@
         }
     }
 
-    // Step 12.
+    // Step 10.
     *result = true;
     return true;
 }
@@ -1230,6 +1226,20 @@
     return fill(entry, clasp, proto.raw(), kind, obj);
 }
 
+static bool
+NewObjectWithTaggedProtoIsCachable(ExclusiveContext *cxArg, Handle<TaggedProto> proto,
+                                   NewObjectKind newKind, const Class *clasp,
+                                   HandleObject parentArg)
+{
+    return cxArg->isJSContext() &&
+           proto.isObject() &&
+           newKind == GenericObject &&
+           clasp->isNative() &&
+           !cxArg->asJSContext()->compartment()->hasObjectMetadataCallback() &&
+           (!parentArg || parentArg == proto.toObject()->getParent()) &&
+           !proto.toObject()->is<GlobalObject>();
+}
+
 JSObject *
 js::NewObjectWithGivenTaggedProto(ExclusiveContext *cxArg, const Class *clasp,
                                   Handle<TaggedProto> proto, HandleObject parentArg,
@@ -1238,25 +1248,16 @@
     if (CanBeFinalizedInBackground(allocKind, clasp))
         allocKind = GetBackgroundAllocKind(allocKind);
 
-    NewObjectCache::EntryIndex entry = -1;
-    uint64_t gcNumber = 0;
-    if (JSContext *cx = cxArg->maybeJSContext()) {
+    bool isCachable = NewObjectWithTaggedProtoIsCachable(cxArg, proto, newKind, clasp, parentArg);
+    if (isCachable) {
+        JSContext *cx = cxArg->asJSContext();
         JSRuntime *rt = cx->runtime();
         NewObjectCache &cache = rt->newObjectCache;
-        if (proto.isObject() &&
-            newKind == GenericObject &&
-            clasp->isNative() &&
-            !cx->compartment()->hasObjectMetadataCallback() &&
-            (!parentArg || parentArg == proto.toObject()->getParent()) &&
-            !proto.toObject()->is<GlobalObject>())
-        {
-            if (cache.lookupProto(clasp, proto.toObject(), allocKind, &entry)) {
-                JSObject *obj = cache.newObjectFromHit(cx, entry, GetInitialHeap(newKind, clasp));
-                if (obj)
-                    return obj;
-            } else {
-                gcNumber = rt->gc.gcNumber();
-            }
+        NewObjectCache::EntryIndex entry = -1;
+        if (cache.lookupProto(clasp, proto.toObject(), allocKind, &entry)) {
+            JSObject *obj = cache.newObjectFromHit(cx, entry, GetInitialHeap(newKind, clasp));
+            if (obj)
+                return obj;
         }
     }
 
@@ -1266,22 +1267,26 @@
 
     /*
      * Default parent to the parent of the prototype, which was set from
-     * the parent of the prototype's constructor.
+     * the parent of the prototype's constructor.  If there is no
+     * prototype, use the global.
      */
     RootedObject parent(cxArg, parentArg);
-    if (!parent && proto.isObject())
-        parent = proto.toObject()->getParent();
+    if (!parent) {
+        if (proto.isObject())
+            parent = proto.toObject()->getParent();
+        else
+            parent = cxArg->global();
+    }
 
     RootedObject obj(cxArg, NewObject(cxArg, group, parent, allocKind, newKind));
     if (!obj)
         return nullptr;
 
-    if (entry != -1 && !obj->as<NativeObject>().hasDynamicSlots() &&
-        cxArg->asJSContext()->runtime()->gc.gcNumber() == gcNumber)
-    {
-        cxArg->asJSContext()->runtime()->newObjectCache.fillProto(entry, clasp,
-                                                                  proto, allocKind,
-                                                                  &obj->as<NativeObject>());
+    if (isCachable && !obj->as<NativeObject>().hasDynamicSlots()) {
+        NewObjectCache &cache = cxArg->asJSContext()->runtime()->newObjectCache;
+        NewObjectCache::EntryIndex entry = -1;
+        cache.lookupProto(clasp, proto.toObject(), allocKind, &entry);
+        cache.fillProto(entry, clasp, proto, allocKind, &obj->as<NativeObject>());
     }
 
     return obj;
@@ -1381,6 +1386,17 @@
     return true;
 }
 
+static bool
+NewObjectWithClassProtoIsCachable(ExclusiveContext *cxArg, HandleObject parent,
+                                  JSProtoKey protoKey, NewObjectKind newKind, const Class *clasp)
+{
+    return cxArg->isJSContext() &&
+           parent->is<GlobalObject>() &&
+           protoKey != JSProto_Null &&
+           newKind == GenericObject &&
+           clasp->isNative() &&
+           !cxArg->asJSContext()->compartment()->hasObjectMetadataCallback();
+}
 
 JSObject *
 js::NewObjectWithClassProtoCommon(ExclusiveContext *cxArg, const Class *clasp,
@@ -1408,24 +1424,16 @@
      */
     JSProtoKey protoKey = ClassProtoKeyOrAnonymousOrNull(clasp);
 
-    NewObjectCache::EntryIndex entry = -1;
-    uint64_t gcNumber = 0;
-    if (JSContext *cx = cxArg->maybeJSContext()) {
+    bool isCachable = NewObjectWithClassProtoIsCachable(cxArg, parent, protoKey, newKind, clasp);
+    if (isCachable) {
+        JSContext *cx = cxArg->asJSContext();
         JSRuntime *rt = cx->runtime();
         NewObjectCache &cache = rt->newObjectCache;
-        if (parent->is<GlobalObject>() &&
-            protoKey != JSProto_Null &&
-            newKind == GenericObject &&
-            clasp->isNative() &&
-            !cx->compartment()->hasObjectMetadataCallback())
-        {
-            if (cache.lookupGlobal(clasp, &parent->as<GlobalObject>(), allocKind, &entry)) {
-                JSObject *obj = cache.newObjectFromHit(cx, entry, GetInitialHeap(newKind, clasp));
-                if (obj)
-                    return obj;
-            } else {
-                gcNumber = rt->gc.gcNumber();
-            }
+        NewObjectCache::EntryIndex entry = -1;
+        if (cache.lookupGlobal(clasp, &parent->as<GlobalObject>(), allocKind, &entry)) {
+            JSObject *obj = cache.newObjectFromHit(cx, entry, GetInitialHeap(newKind, clasp));
+            if (obj)
+                return obj;
         }
     }
 
@@ -1442,17 +1450,29 @@
     if (!obj)
         return nullptr;
 
-    if (entry != -1 && !obj->as<NativeObject>().hasDynamicSlots() &&
-        cxArg->asJSContext()->runtime()->gc.gcNumber() == gcNumber)
-    {
-        cxArg->asJSContext()->runtime()->newObjectCache.fillGlobal(entry, clasp,
-                                                                   &parent->as<GlobalObject>(),
-                                                                   allocKind, &obj->as<NativeObject>());
+    if (isCachable && !obj->as<NativeObject>().hasDynamicSlots()) {
+        NewObjectCache &cache = cxArg->asJSContext()->runtime()->newObjectCache;
+        NewObjectCache::EntryIndex entry = -1;
+        cache.lookupGlobal(clasp, &parent->as<GlobalObject>(), allocKind, &entry);
+        cache.fillGlobal(entry, clasp, &parent->as<GlobalObject>(), allocKind,
+                         &obj->as<NativeObject>());
     }
 
     return obj;
 }
 
+static bool
+NewObjectWithGroupIsCachable(JSContext *cx, HandleObjectGroup group, HandleObject parent,
+                             NewObjectKind newKind)
+{
+    return group->proto().isObject() &&
+           parent == group->proto().toObject()->getParent() &&
+           newKind == GenericObject &&
+           group->clasp()->isNative() &&
+           (!group->newScript() || group->newScript()->analyzed()) &&
+           !cx->compartment()->hasObjectMetadataCallback();
+}
+
 /*
  * Create a plain object with the specified group. This bypasses getNewGroup to
  * avoid losing creation site information for objects made by scripted 'new'.
@@ -1467,24 +1487,15 @@
     if (CanBeFinalizedInBackground(allocKind, group->clasp()))
         allocKind = GetBackgroundAllocKind(allocKind);
 
-    NewObjectCache &cache = cx->runtime()->newObjectCache;
-
-    NewObjectCache::EntryIndex entry = -1;
-    uint64_t gcNumber = 0;
-    if (group->proto().isObject() &&
-        parent == group->proto().toObject()->getParent() &&
-        newKind == GenericObject &&
-        group->clasp()->isNative() &&
-        (!group->newScript() || group->newScript()->analyzed()) &&
-        !cx->compartment()->hasObjectMetadataCallback())
-    {
+    bool isCachable = NewObjectWithGroupIsCachable(cx, group, parent, newKind);
+    if (isCachable) {
+        NewObjectCache &cache = cx->runtime()->newObjectCache;
+        NewObjectCache::EntryIndex entry = -1;
         if (cache.lookupGroup(group, allocKind, &entry)) {
             JSObject *obj = cache.newObjectFromHit(cx, entry,
                                                    GetInitialHeap(newKind, group->clasp()));
             if (obj)
                 return obj;
-        } else {
-            gcNumber = cx->runtime()->gc.gcNumber();
         }
     }
 
@@ -1492,9 +1503,10 @@
     if (!obj)
         return nullptr;
 
-    if (entry != -1 && !obj->as<NativeObject>().hasDynamicSlots() &&
-        cx->runtime()->gc.gcNumber() == gcNumber)
-    {
+    if (isCachable && !obj->as<NativeObject>().hasDynamicSlots()) {
+        NewObjectCache &cache = cx->runtime()->newObjectCache;
+        NewObjectCache::EntryIndex entry = -1;
+        cache.lookupGroup(group, allocKind, &entry);
         cache.fillGroup(entry, group, allocKind, &obj->as<NativeObject>());
     }
 
@@ -1765,22 +1777,22 @@
 }
 
 JSObject *
-js::CloneObject(JSContext *cx, HandleObject obj, Handle<js::TaggedProto> proto, HandleObject parent)
+js::CloneObject(JSContext *cx, HandleObject obj, Handle<js::TaggedProto> proto)
 {
     if (!obj->isNative() && !obj->is<ProxyObject>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_CANT_CLONE_OBJECT);
         return nullptr;
     }
 
     RootedObject clone(cx);
     if (obj->isNative()) {
-        clone = NewObjectWithGivenTaggedProto(cx, obj->getClass(), proto, parent);
+        clone = NewObjectWithGivenTaggedProto(cx, obj->getClass(), proto, NullPtr());
         if (!clone)
             return nullptr;
 
         if (clone->is<JSFunction>() && (obj->compartment() != clone->compartment())) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_CANT_CLONE_OBJECT);
             return nullptr;
         }
@@ -1791,7 +1803,7 @@
         ProxyOptions options;
         options.setClass(obj->getClass());
 
-        clone = ProxyObject::New(cx, GetProxyHandler(obj), JS::NullHandleValue, proto, parent, options);
+        clone = ProxyObject::New(cx, GetProxyHandler(obj), JS::NullHandleValue, proto, options);
         if (!clone)
             return nullptr;
 
@@ -1857,7 +1869,8 @@
     MOZ_ASSERT(!obj->hasPrivate());
     RootedShape shape(cx, obj->lastProperty());
     size_t span = shape->slotSpan();
-    clone->setLastProperty(cx, clone, shape);
+    if (!clone->setLastProperty(cx, shape))
+        return nullptr;
     for (size_t i = 0; i < span; i++) {
         v = obj->getSlot(i);
         if (v.isObject()) {
@@ -1887,6 +1900,58 @@
     return clone;
 }
 
+static bool
+InitializePropertiesFromCompatibleNativeObject(JSContext *cx,
+                                               HandleNativeObject dst,
+                                               HandleNativeObject src)
+{
+    assertSameCompartment(cx, src, dst);
+    MOZ_ASSERT(src->getClass() == dst->getClass());
+    MOZ_ASSERT(src->getParent() == dst->getParent());
+    MOZ_ASSERT(dst->getParent() == cx->global());
+    MOZ_ASSERT(src->getProto() == dst->getProto());
+    MOZ_ASSERT(dst->lastProperty()->getObjectFlags() == 0);
+    MOZ_ASSERT(!src->getMetadata());
+    MOZ_ASSERT(!src->isSingleton());
+
+    // Save the dst metadata, if any, before we start messing with its shape.
+    RootedObject dstMetadata(cx, dst->getMetadata());
+
+    if (!dst->ensureElements(cx, src->getDenseInitializedLength()))
+        return false;
+
+    uint32_t initialized = src->getDenseInitializedLength();
+    for (uint32_t i = 0; i < initialized; ++i) {
+        dst->setDenseInitializedLength(i + 1);
+        dst->initDenseElement(i, src->getDenseElement(i));
+    }
+
+    MOZ_ASSERT(!src->hasPrivate());
+    RootedShape shape(cx, src->lastProperty());
+    size_t span = shape->slotSpan();
+    if (!dst->setLastProperty(cx, shape))
+        return false;
+    for (size_t i = JSCLASS_RESERVED_SLOTS(src->getClass()); i < span; i++)
+        dst->setSlot(i, src->getSlot(i));
+
+    if (dstMetadata) {
+        if (!js::SetObjectMetadata(cx, dst, dstMetadata))
+            return false;
+    }
+
+    return true;
+}
+
+JS_FRIEND_API(bool)
+JS_InitializePropertiesFromCompatibleNativeObject(JSContext *cx,
+                                                  HandleObject dst,
+                                                  HandleObject src)
+{
+    return InitializePropertiesFromCompatibleNativeObject(cx,
+                                                          dst.as<NativeObject>(),
+                                                          src.as<NativeObject>());
+}
+
 template<XDRMode mode>
 bool
 js::XDRObjectLiteral(XDRState<mode> *xdr, MutableHandleNativeObject obj)
@@ -2149,7 +2214,7 @@
 
         RootedShape newShape(cx, ReshapeForParentAndAllocKind(cx, srcObj->lastProperty(),
                                                               TaggedProto(proto), parent, kind));
-        if (!newShape || !NativeObject::setLastProperty(cx, res, newShape))
+        if (!newShape || !res->setLastProperty(cx, newShape))
             return nullptr;
 
         return res;
@@ -2425,7 +2490,7 @@
      *    passed null for proto; and
      *
      * 2. NewObject tolerating no default prototype (null proto slot value)
-     *    due to this js_InitClass call coming from js_InitFunctionClass on an
+     *    due to this js::InitClass call coming from js::InitFunctionClass on an
      *    otherwise-uninitialized global.
      *
      * 3. NewObject allocating a JSFunction-sized GC-thing when clasp is
@@ -2538,11 +2603,11 @@
 }
 
 NativeObject *
-js_InitClass(JSContext *cx, HandleObject obj, HandleObject protoProto_,
-             const Class *clasp, Native constructor, unsigned nargs,
-             const JSPropertySpec *ps, const JSFunctionSpec *fs,
-             const JSPropertySpec *static_ps, const JSFunctionSpec *static_fs,
-             NativeObject **ctorp, AllocKind ctorKind)
+js::InitClass(JSContext *cx, HandleObject obj, HandleObject protoProto_,
+              const Class *clasp, Native constructor, unsigned nargs,
+              const JSPropertySpec *ps, const JSFunctionSpec *fs,
+              const JSPropertySpec *static_ps, const JSFunctionSpec *static_fs,
+              NativeObject **ctorp, AllocKind ctorKind)
 {
     RootedObject protoProto(cx, protoProto_);
 
@@ -2562,7 +2627,7 @@
      *
      * When initializing a standard class (other than Object), if protoProto is
      * null, default to Object.prototype. The engine's internal uses of
-     * js_InitClass depend on this nicety.
+     * js::InitClass depend on this nicety.
      */
     JSProtoKey key = JSCLASS_CACHED_PROTO_KEY(clasp);
     if (key != JSProto_Null &&
@@ -3020,27 +3085,27 @@
 JSObject::reportReadOnly(JSContext *cx, jsid id, unsigned report)
 {
     RootedValue val(cx, IdToValue(id));
-    return js_ReportValueErrorFlags(cx, report, JSMSG_READ_ONLY,
-                                    JSDVG_IGNORE_STACK, val, js::NullPtr(),
-                                    nullptr, nullptr);
+    return ReportValueErrorFlags(cx, report, JSMSG_READ_ONLY,
+                                 JSDVG_IGNORE_STACK, val, js::NullPtr(),
+                                 nullptr, nullptr);
 }
 
 bool
 JSObject::reportNotConfigurable(JSContext *cx, jsid id, unsigned report)
 {
     RootedValue val(cx, IdToValue(id));
-    return js_ReportValueErrorFlags(cx, report, JSMSG_CANT_DELETE,
-                                    JSDVG_IGNORE_STACK, val, js::NullPtr(),
-                                    nullptr, nullptr);
+    return ReportValueErrorFlags(cx, report, JSMSG_CANT_DELETE,
+                                 JSDVG_IGNORE_STACK, val, js::NullPtr(),
+                                 nullptr, nullptr);
 }
 
 bool
 JSObject::reportNotExtensible(JSContext *cx, unsigned report)
 {
     RootedValue val(cx, ObjectValue(*this));
-    return js_ReportValueErrorFlags(cx, report, JSMSG_OBJECT_NOT_EXTENSIBLE,
-                                    JSDVG_IGNORE_STACK, val, js::NullPtr(),
-                                    nullptr, nullptr);
+    return ReportValueErrorFlags(cx, report, JSMSG_OBJECT_NOT_EXTENSIBLE,
+                                 JSDVG_IGNORE_STACK, val, js::NullPtr(),
+                                 nullptr, nullptr);
 }
 
 
@@ -3072,7 +3137,7 @@
      * have a mutable [[Prototype]].
      */
     if (obj->is<ArrayBufferObject>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
                              "incompatible ArrayBuffer");
         return false;
     }
@@ -3081,7 +3146,7 @@
      * Disallow mutating the [[Prototype]] on Typed Objects, per the spec.
      */
     if (obj->is<TypedObject>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
                              "incompatible TypedObject");
         return false;
     }
@@ -3091,7 +3156,7 @@
      * for flash-related security reasons.
      */
     if (!strcmp(obj->getClass()->name, "Location")) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
                              "incompatible Location object");
         return false;
     }
@@ -3117,6 +3182,11 @@
             return false;
     }
 
+    // Convert unboxed objects to their native representations before changing
+    // their prototype/group, as they depend on the group for their layout.
+    if (obj->is<UnboxedPlainObject>() && !UnboxedPlainObject::convertToNative(cx, obj))
+        return false;
+
     Rooted<TaggedProto> taggedProto(cx, TaggedProto(proto));
     *succeeded = SetClassAndProto(cx, obj, obj->getClass(), taggedProto);
     return *succeeded;
@@ -3151,7 +3221,7 @@
         return false;
 
     *succeeded = true;
-    return obj->setFlag(cx, BaseShape::NOT_EXTENSIBLE, JSObject::GENERATE_SHAPE);
+    return obj->setFlags(cx, BaseShape::NOT_EXTENSIBLE, JSObject::GENERATE_SHAPE);
 }
 
 bool
@@ -3246,7 +3316,7 @@
         return Proxy::setImmutablePrototype(cx->asJSContext(), obj, succeeded);
     }
 
-    if (!obj->setFlag(cx, BaseShape::IMMUTABLE_PROTOTYPE))
+    if (!obj->setFlags(cx, BaseShape::IMMUTABLE_PROTOTYPE))
         return false;
     *succeeded = true;
     return true;
@@ -3305,7 +3375,7 @@
     if (!wpmap) {
         wpmap = cx->runtime()->new_<WatchpointMap>();
         if (!wpmap || !wpmap->init()) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         cx->compartment()->watchpointMap = wpmap;
@@ -3332,7 +3402,7 @@
         return op(cx, obj, id, callable);
 
     if (!obj->isNative() || IsAnyTypedArray(obj)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_WATCH,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_WATCH,
                              obj->getClass()->name);
         return false;
     }
@@ -3425,7 +3495,7 @@
         /* Optimize (new String(...)).toString(). */
         if (clasp == &StringObject::class_) {
             StringObject *nobj = &obj->as<StringObject>();
-            if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, js_str_toString)) {
+            if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, str_toString)) {
                 vp.setString(nobj->unbox());
                 return true;
             }
@@ -3447,7 +3517,7 @@
         if (clasp == &StringObject::class_) {
             id = NameToId(cx->names().valueOf);
             StringObject *nobj = &obj->as<StringObject>();
-            if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, js_str_toString)) {
+            if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, str_toString)) {
                 vp.setString(nobj->unbox());
                 return true;
             }
@@ -3457,7 +3527,7 @@
         if (clasp == &NumberObject::class_) {
             id = NameToId(cx->names().valueOf);
             NumberObject *nobj = &obj->as<NumberObject>();
-            if (ClassMethodIsNative(cx, nobj, &NumberObject::class_, id, js_num_valueOf)) {
+            if (ClassMethodIsNative(cx, nobj, &NumberObject::class_, id, num_valueOf)) {
                 vp.setNumber(nobj->unbox());
                 return true;
             }
@@ -3476,7 +3546,7 @@
             return true;
     }
 
-    /* Avoid recursive death when decompiling in js_ReportValueError. */
+    /* Avoid recursive death when decompiling in ReportValueError. */
     RootedString str(cx);
     if (hint == JSTYPE_STRING) {
         str = JS_InternString(cx, clasp->name);
@@ -3487,10 +3557,10 @@
     }
 
     RootedValue val(cx, ObjectValue(*obj));
-    js_ReportValueError2(cx, JSMSG_CANT_CONVERT_TO, JSDVG_SEARCH_STACK, val, str,
-                         hint == JSTYPE_VOID
-                         ? "primitive type"
-                         : hint == JSTYPE_STRING ? "string" : "number");
+    ReportValueError2(cx, JSMSG_CANT_CONVERT_TO, JSDVG_SEARCH_STACK, val, str,
+                      hint == JSTYPE_VOID
+                      ? "primitive type"
+                      : hint == JSTYPE_STRING ? "string" : "number");
     return false;
 }
 
@@ -3549,7 +3619,8 @@
     if (v.isBoolean())
         return BooleanObject::create(cx, v.toBoolean());
     MOZ_ASSERT(v.isSymbol());
-    return SymbolObject::create(cx, v.toSymbol());
+    RootedSymbol symbol(cx, v.toSymbol());
+    return SymbolObject::create(cx, symbol);
 }
 
 /*
@@ -3567,9 +3638,9 @@
 
     if (val.isNullOrUndefined()) {
         if (reportScanStack) {
-            js_ReportIsNullOrUndefined(cx, JSDVG_SEARCH_STACK, val, NullPtr());
+            ReportIsNullOrUndefined(cx, JSDVG_SEARCH_STACK, val, NullPtr());
         } else {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
                                  val.isNull() ? "null" : "undefined", "object");
         }
         return nullptr;
@@ -3579,9 +3650,9 @@
 }
 
 void
-js_GetObjectSlotName(JSTracer *trc, char *buf, size_t bufsize)
+js::GetObjectSlotName(JSTracer *trc, char *buf, size_t bufsize)
 {
-    MOZ_ASSERT(trc->debugPrinter() == js_GetObjectSlotName);
+    MOZ_ASSERT(trc->debugPrinter() == GetObjectSlotName);
 
     JSObject *obj = (JSObject *)trc->debugPrintArg();
     uint32_t slot = uint32_t(trc->debugPrintIndex());
@@ -3647,13 +3718,13 @@
 }
 
 bool
-js_ReportGetterOnlyAssignment(JSContext *cx, bool strict)
+js::ReportGetterOnlyAssignment(JSContext *cx, bool strict)
 {
     return JS_ReportErrorFlagsAndNumber(cx,
                                         strict
                                         ? JSREPORT_ERROR
                                         : JSREPORT_WARNING | JSREPORT_STRICT,
-                                        js_GetErrorMessage, nullptr,
+                                        GetErrorMessage, nullptr,
                                         JSMSG_GETTER_ONLY);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsobj.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsobj.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsobj.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsobj.h	2015-02-28 15:03:05.000000000 +0000
@@ -189,16 +189,14 @@
     inline void setInitialSlotsMaybeNonNative(js::HeapSlot *slots);
     inline void setInitialElementsMaybeNonNative(js::HeapSlot *elements);
 
-  protected:
     enum GenerateShape {
         GENERATE_NONE,
         GENERATE_SHAPE
     };
 
-    bool setFlag(js::ExclusiveContext *cx, /*BaseShape::Flag*/ uint32_t flag,
-                 GenerateShape generateShape = GENERATE_NONE);
+    bool setFlags(js::ExclusiveContext *cx, /*BaseShape::Flag*/ uint32_t flags,
+                  GenerateShape generateShape = GENERATE_NONE);
 
-  public:
     /*
      * An object is a delegate if it is on another object's prototype or scope
      * chain, and therefore the delegate might be asked implicitly to get or
@@ -213,7 +211,7 @@
     }
 
     bool setDelegate(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::DELEGATE, GENERATE_SHAPE);
+        return setFlags(cx, js::BaseShape::DELEGATE, GENERATE_SHAPE);
     }
 
     bool isBoundFunction() const {
@@ -226,18 +224,18 @@
         return lastProperty()->hasObjectFlag(js::BaseShape::WATCHED);
     }
     bool setWatched(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::WATCHED, GENERATE_SHAPE);
+        return setFlags(cx, js::BaseShape::WATCHED, GENERATE_SHAPE);
     }
 
     /* See InterpreterFrame::varObj. */
     inline bool isQualifiedVarObj();
     bool setQualifiedVarObj(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::QUALIFIED_VAROBJ);
+        return setFlags(cx, js::BaseShape::QUALIFIED_VAROBJ);
     }
 
     inline bool isUnqualifiedVarObj();
     bool setUnqualifiedVarObj(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::UNQUALIFIED_VAROBJ);
+        return setFlags(cx, js::BaseShape::UNQUALIFIED_VAROBJ);
     }
 
     /*
@@ -250,7 +248,7 @@
         return lastProperty()->hasObjectFlag(js::BaseShape::UNCACHEABLE_PROTO);
     }
     bool setUncacheableProto(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::UNCACHEABLE_PROTO, GENERATE_SHAPE);
+        return setFlags(cx, js::BaseShape::UNCACHEABLE_PROTO, GENERATE_SHAPE);
     }
 
     /*
@@ -261,7 +259,7 @@
         return lastProperty()->hasObjectFlag(js::BaseShape::HAD_ELEMENTS_ACCESS);
     }
     bool setHadElementsAccess(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::HAD_ELEMENTS_ACCESS);
+        return setFlags(cx, js::BaseShape::HAD_ELEMENTS_ACCESS);
     }
 
     /*
@@ -397,7 +395,7 @@
         return lastProperty()->hasObjectFlag(js::BaseShape::ITERATED_SINGLETON);
     }
     bool setIteratedSingleton(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::ITERATED_SINGLETON);
+        return setFlags(cx, js::BaseShape::ITERATED_SINGLETON);
     }
 
     /*
@@ -414,7 +412,7 @@
         return lastProperty()->hasObjectFlag(js::BaseShape::NEW_SCRIPT_CLEARED);
     }
     bool setNewScriptCleared(js::ExclusiveContext *cx) {
-        return setFlag(cx, js::BaseShape::NEW_SCRIPT_CLEARED);
+        return setFlags(cx, js::BaseShape::NEW_SCRIPT_CLEARED);
     }
 
     /* Set a new prototype for an object with a singleton type. */
@@ -1139,7 +1137,7 @@
 CreateThis(JSContext *cx, const js::Class *clasp, js::HandleObject callee);
 
 extern JSObject *
-CloneObject(JSContext *cx, HandleObject obj, Handle<js::TaggedProto> proto, HandleObject parent);
+CloneObject(JSContext *cx, HandleObject obj, Handle<js::TaggedProto> proto);
 
 extern NativeObject *
 DeepCloneObjectLiteral(JSContext *cx, HandleNativeObject obj, NewObjectKind newKind = GenericObject);
@@ -1189,12 +1187,11 @@
 
 }
 
-extern JSObject *
-js_FindVariableScope(JSContext *cx, JSFunction **funp);
-
-
 namespace js {
 
+extern JSObject *
+FindVariableScope(JSContext *cx, JSFunction **funp);
+
 bool
 LookupPropertyPure(ExclusiveContext *cx, JSObject *obj, jsid id, JSObject **objp,
                    Shape **propp);
@@ -1244,16 +1241,11 @@
 extern JSObject *
 CloneObjectLiteral(JSContext *cx, HandleObject parent, HandleObject srcObj);
 
-} /* namespace js */
-
 extern void
-js_GetObjectSlotName(JSTracer *trc, char *buf, size_t bufsize);
+GetObjectSlotName(JSTracer *trc, char *buf, size_t bufsize);
 
 extern bool
-js_ReportGetterOnlyAssignment(JSContext *cx, bool strict);
-
-
-namespace js {
+ReportGetterOnlyAssignment(JSContext *cx, bool strict);
 
 extern JSObject *
 NonNullObject(JSContext *cx, const Value &v);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsobjinlines.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsobjinlines.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsobjinlines.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsobjinlines.h	2015-02-28 15:03:05.000000000 +0000
@@ -413,7 +413,7 @@
     if (obj->is<StringObject>()) {
         jsid id = NameToId(cx->names().valueOf);
         StringObject *nobj = &obj->as<StringObject>();
-        if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, js_str_toString)) {
+        if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, str_toString)) {
             vp.setString(nobj->unbox());
             return true;
         }
@@ -423,7 +423,7 @@
     if (obj->is<NumberObject>()) {
         jsid id = NameToId(cx->names().valueOf);
         NumberObject *nobj = &obj->as<NumberObject>();
-        if (ClassMethodIsNative(cx, nobj, &NumberObject::class_, id, js_num_valueOf)) {
+        if (ClassMethodIsNative(cx, nobj, &NumberObject::class_, id, num_valueOf)) {
             vp.setNumber(nobj->unbox());
             return true;
         }
@@ -784,14 +784,14 @@
     return attrs;
 }
 
-} /* namespace js */
+extern NativeObject *
+InitClass(JSContext *cx, HandleObject obj, HandleObject parent_proto,
+          const Class *clasp, JSNative constructor, unsigned nargs,
+          const JSPropertySpec *ps, const JSFunctionSpec *fs,
+          const JSPropertySpec *static_ps, const JSFunctionSpec *static_fs,
+          NativeObject **ctorp = nullptr,
+          gc::AllocKind ctorKind = JSFunction::FinalizeKind);
 
-extern js::NativeObject *
-js_InitClass(JSContext *cx, js::HandleObject obj, js::HandleObject parent_proto,
-             const js::Class *clasp, JSNative constructor, unsigned nargs,
-             const JSPropertySpec *ps, const JSFunctionSpec *fs,
-             const JSPropertySpec *static_ps, const JSFunctionSpec *static_fs,
-             js::NativeObject **ctorp = nullptr,
-             js::gc::AllocKind ctorKind = JSFunction::FinalizeKind);
+} /* namespace js */
 
 #endif /* jsobjinlines_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/json.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/json.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/json.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/json.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -309,7 +309,7 @@
     if (!detect.init())
         return false;
     if (detect.foundCycle()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_JSON_CYCLIC_VALUE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_JSON_CYCLIC_VALUE,
                              js_object_str);
         return false;
     }
@@ -400,7 +400,7 @@
     if (!detect.init())
         return false;
     if (detect.foundCycle()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_JSON_CYCLIC_VALUE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_JSON_CYCLIC_VALUE,
                              js_object_str);
         return false;
     }
@@ -517,8 +517,8 @@
 
 /* ES5 15.12.3. */
 bool
-js_Stringify(JSContext *cx, MutableHandleValue vp, JSObject *replacer_, Value space_,
-             StringBuffer &sb)
+js::Stringify(JSContext *cx, MutableHandleValue vp, JSObject *replacer_, Value space_,
+              StringBuffer &sb)
 {
     RootedObject replacer(cx, replacer_);
     RootedValue space(cx, space_);
@@ -861,7 +861,7 @@
     RootedValue space(cx, args.get(2));
 
     StringBuffer sb(cx);
-    if (!js_Stringify(cx, &value, replacer, space, sb))
+    if (!Stringify(cx, &value, replacer, space, sb))
         return false;
 
     // XXX This can never happen to nsJSON.cpp, but the JSON object
@@ -889,7 +889,7 @@
 };
 
 JSObject *
-js_InitJSONClass(JSContext *cx, HandleObject obj)
+js::InitJSONClass(JSContext *cx, HandleObject obj)
 {
     Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>());
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/json.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/json.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/json.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/json.h	2015-02-28 15:03:05.000000000 +0000
@@ -15,16 +15,13 @@
 
 namespace js {
 class StringBuffer;
-}
 
 extern JSObject *
-js_InitJSONClass(JSContext *cx, js::HandleObject obj);
+InitJSONClass(JSContext *cx, HandleObject obj);
 
 extern bool
-js_Stringify(JSContext *cx, js::MutableHandleValue vp, JSObject *replacer,
-             js::Value space, js::StringBuffer &sb);
-
-namespace js {
+Stringify(JSContext *cx, js::MutableHandleValue vp, JSObject *replacer,
+          Value space, StringBuffer &sb);
 
 template <typename CharT>
 extern bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsopcode.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsopcode.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsopcode.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsopcode.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -73,7 +73,7 @@
 };
 
 /*
- * Array of JS bytecode names used by PC count JSON, DEBUG-only js_Disassemble
+ * Array of JS bytecode names used by PC count JSON, DEBUG-only Disassemble
  * and JIT debug spew.
  */
 const char * const js_CodeName[] = {
@@ -87,7 +87,7 @@
 #define COUNTS_LEN 16
 
 size_t
-js_GetVariableBytecodeLength(jsbytecode *pc)
+js::GetVariableBytecodeLength(jsbytecode *pc)
 {
     JSOp op = JSOp(*pc);
     MOZ_ASSERT(js_CodeSpec[op].length == -1);
@@ -235,7 +235,7 @@
 }
 
 void
-js_DumpPCCounts(JSContext *cx, HandleScript script, js::Sprinter *sp)
+js::DumpPCCounts(JSContext *cx, HandleScript script, Sprinter *sp)
 {
     MOZ_ASSERT(script->hasScriptCounts());
 
@@ -245,7 +245,7 @@
         JSOp op = JSOp(*pc);
         jsbytecode *next = GetNextPc(pc);
 
-        if (!js_Disassemble1(cx, script, pc, script->pcToOffset(pc), true, sp))
+        if (!Disassemble1(cx, script, pc, script->pcToOffset(pc), true, sp))
             return;
 
         size_t total = PCCounts::numCounts(op);
@@ -290,7 +290,7 @@
                 return;
 
             fprintf(stdout, "--- SCRIPT %s:%d ---\n", script->filename(), (int) script->lineno());
-            js_DumpPCCounts(cx, script, &sprinter);
+            DumpPCCounts(cx, script, &sprinter);
             fputs(sprinter.string(), stdout);
             fprintf(stdout, "--- END SCRIPT %s:%d ---\n", script->filename(), (int) script->lineno());
         }
@@ -425,7 +425,7 @@
 
     void reportOOM() {
         allocScope_.releaseEarly();
-        js_ReportOutOfMemory(cx_);
+        ReportOutOfMemory(cx_);
     }
 
     uint32_t numSlots() {
@@ -717,9 +717,9 @@
  * current line. If showAll is true, include the source note type and the
  * entry stack depth.
  */
-JS_FRIEND_API(bool)
-js_DisassembleAtPC(JSContext *cx, JSScript *scriptArg, bool lines,
-                   jsbytecode *pc, bool showAll, Sprinter *sp)
+static bool
+DisassembleAtPC(JSContext *cx, JSScript *scriptArg, bool lines,
+                jsbytecode *pc, bool showAll, Sprinter *sp)
 {
     RootedScript script(cx, scriptArg);
     BytecodeParser parser(cx, script);
@@ -763,7 +763,7 @@
                 sp->put("    ");
         }
         if (showAll) {
-            jssrcnote *sn = js_GetSrcNote(cx, script, next);
+            jssrcnote *sn = GetSrcNote(cx, script, next);
             if (sn) {
                 MOZ_ASSERT(!SN_IS_TERMINATOR(sn));
                 jssrcnote *next = SN_NEXT(sn);
@@ -781,7 +781,7 @@
             else
                 Sprint(sp, "      ");
         }
-        len = js_Disassemble1(cx, script, next, script->pcToOffset(next), lines, sp);
+        len = Disassemble1(cx, script, next, script->pcToOffset(next), lines, sp);
         if (!len)
             return false;
         next += len;
@@ -790,56 +790,9 @@
 }
 
 bool
-js_Disassemble(JSContext *cx, HandleScript script, bool lines, Sprinter *sp)
-{
-    return js_DisassembleAtPC(cx, script, lines, nullptr, false, sp);
-}
-
-JS_FRIEND_API(bool)
-js_DumpPC(JSContext *cx)
+js::Disassemble(JSContext *cx, HandleScript script, bool lines, Sprinter *sp)
 {
-    js::gc::AutoSuppressGC suppressGC(cx);
-    Sprinter sprinter(cx);
-    if (!sprinter.init())
-        return false;
-    ScriptFrameIter iter(cx);
-    if (iter.done()) {
-        fprintf(stdout, "Empty stack.\n");
-        return true;
-    }
-    RootedScript script(cx, iter.script());
-    bool ok = js_DisassembleAtPC(cx, script, true, iter.pc(), false, &sprinter);
-    fprintf(stdout, "%s", sprinter.string());
-    return ok;
-}
-
-JS_FRIEND_API(bool)
-js_DumpScript(JSContext *cx, JSScript *scriptArg)
-{
-    js::gc::AutoSuppressGC suppressGC(cx);
-    Sprinter sprinter(cx);
-    if (!sprinter.init())
-        return false;
-    RootedScript script(cx, scriptArg);
-    bool ok = js_Disassemble(cx, script, true, &sprinter);
-    fprintf(stdout, "%s", sprinter.string());
-    return ok;
-}
-
-/*
- * Useful to debug ReconstructPCStack.
- */
-JS_FRIEND_API(bool)
-js_DumpScriptDepth(JSContext *cx, JSScript *scriptArg, jsbytecode *pc)
-{
-    js::gc::AutoSuppressGC suppressGC(cx);
-    Sprinter sprinter(cx);
-    if (!sprinter.init())
-        return false;
-    RootedScript script(cx, scriptArg);
-    bool ok = js_DisassembleAtPC(cx, script, true, pc, true, &sprinter);
-    fprintf(stdout, "%s", sprinter.string());
-    return ok;
+    return DisassembleAtPC(cx, script, lines, nullptr, false, sp);
 }
 
 static char *
@@ -923,19 +876,19 @@
         }
     }
 
-    return !!js_ValueToPrintable(cx, v, bytes, true);
+    return !!ValueToPrintable(cx, v, bytes, true);
 }
 
 unsigned
-js_Disassemble1(JSContext *cx, HandleScript script, jsbytecode *pc,
-                unsigned loc, bool lines, Sprinter *sp)
+js::Disassemble1(JSContext *cx, HandleScript script, jsbytecode *pc,
+                 unsigned loc, bool lines, Sprinter *sp)
 {
     JSOp op = (JSOp)*pc;
     if (op >= JSOP_LIMIT) {
         char numBuf1[12], numBuf2[12];
         JS_snprintf(numBuf1, sizeof numBuf1, "%d", op);
         JS_snprintf(numBuf2, sizeof numBuf2, "%d", JSOP_LIMIT);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_BYTECODE_TOO_BIG, numBuf1, numBuf2);
         return 0;
     }
@@ -1089,7 +1042,7 @@
       default: {
         char numBuf[12];
         JS_snprintf(numBuf, sizeof numBuf, "%lx", (unsigned long) cs->format);
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_UNKNOWN_FORMAT, numBuf);
         return 0;
       }
@@ -1295,7 +1248,7 @@
     if (reportedOOM)
         return;
     if (context)
-        js_ReportOutOfMemory(context);
+        ReportOutOfMemory(context);
     reportedOOM = true;
 }
 
@@ -1417,7 +1370,7 @@
 }
 
 JSString *
-js_QuoteString(ExclusiveContext *cx, JSString *str, char16_t quote)
+js::QuoteString(ExclusiveContext *cx, JSString *str, char16_t quote)
 {
     Sprinter sprinter(cx);
     if (!sprinter.init())
@@ -1509,7 +1462,7 @@
         // Handle simple cases of binary and unary operators.
         switch (js_CodeSpec[op].nuses) {
           case 2: {
-            jssrcnote *sn = js_GetSrcNote(cx, script, pc);
+            jssrcnote *sn = GetSrcNote(cx, script, pc);
             if (!sn || SN_TYPE(sn) != SRC_ASSIGNOP)
                 return write("(") &&
                        decompilePCForStackOperand(pc, -2) &&
@@ -1620,6 +1573,8 @@
             return false;
         return write(str);
       }
+      case JSOP_VOID:
+        return write("void ") && decompilePCForStackOperand(pc, -1);
       default:
         break;
     }
@@ -2124,7 +2079,7 @@
     JSRuntime *rt = cx->runtime();
 
     if (!rt->scriptAndCountsVector || index >= rt->scriptAndCountsVector->length()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
         return nullptr;
     }
 
@@ -2377,7 +2332,7 @@
     JSRuntime *rt = cx->runtime();
 
     if (!rt->scriptAndCountsVector || index >= rt->scriptAndCountsVector->length()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
         return nullptr;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsopcode.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsopcode.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsopcode.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsopcode.h	2015-02-28 15:03:05.000000000 +0000
@@ -392,15 +392,15 @@
 #pragma warning(disable:4100)
 #endif
 
+namespace js {
+
 /*
  * Return a GC'ed string containing the chars in str, with any non-printing
  * chars or quotes (' or " as specified by the quote argument) escaped, and
  * with the quote character at the beginning and end of the result string.
  */
 extern JSString *
-js_QuoteString(js::ExclusiveContext *cx, JSString *str, char16_t quote);
-
-namespace js {
+QuoteString(ExclusiveContext *cx, JSString *str, char16_t quote);
 
 static inline bool
 IsJumpOpcode(JSOp op)
@@ -535,13 +535,13 @@
 #define JSDVG_IGNORE_STACK      0
 #define JSDVG_SEARCH_STACK      1
 
+namespace js {
+
 /*
  * Get the length of variable-length bytecode like JSOP_TABLESWITCH.
  */
 extern size_t
-js_GetVariableBytecodeLength(jsbytecode *pc);
-
-namespace js {
+GetVariableBytecodeLength(jsbytecode *pc);
 
 /*
  * Find the source expression that resulted in v, and return a newly allocated
@@ -676,7 +676,7 @@
 
     if (js_CodeSpec[op].length != -1)
         return js_CodeSpec[op].length;
-    return js_GetVariableBytecodeLength(pc);
+    return GetVariableBytecodeLength(pc);
 }
 
 static inline bool
@@ -985,25 +985,22 @@
     return pc + GetBytecodeLength(pc);
 }
 
-} /* namespace js */
-
 #if defined(DEBUG)
 /*
  * Disassemblers, for debugging only.
  */
 bool
-js_Disassemble(JSContext *cx, JS::Handle<JSScript*> script, bool lines, js::Sprinter *sp);
+Disassemble(JSContext *cx, JS::Handle<JSScript*> script, bool lines, Sprinter *sp);
 
 unsigned
-js_Disassemble1(JSContext *cx, JS::Handle<JSScript*> script, jsbytecode *pc, unsigned loc,
-                bool lines, js::Sprinter *sp);
+Disassemble1(JSContext *cx, JS::Handle<JSScript*> script, jsbytecode *pc, unsigned loc,
+             bool lines, Sprinter *sp);
 
 #endif
 
 void
-js_DumpPCCounts(JSContext *cx, JS::Handle<JSScript*> script, js::Sprinter *sp);
+DumpPCCounts(JSContext *cx, JS::Handle<JSScript*> script, Sprinter *sp);
 
-namespace js {
 namespace jit { struct IonScriptCounts; }
 void
 DumpIonScriptCounts(js::Sprinter *sp, jit::IonScriptCounts *ionCounts);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jspropertytree.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jspropertytree.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jspropertytree.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jspropertytree.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -73,7 +73,7 @@
 
         KidsHash *hash = HashChildren(shape, child);
         if (!hash) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         kidp->setHash(hash);
@@ -82,7 +82,7 @@
     }
 
     if (!kidp->toHash()->putNew(StackShape(child), child)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsprototypes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsprototypes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsprototypes.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsprototypes.h	2015-02-28 15:03:05.000000000 +0000
@@ -57,61 +57,61 @@
 #endif
 
 #define JS_FOR_PROTOTYPES(real,imaginary) \
-    imaginary(Null,              0,     js_InitNullClass,          dummy) \
-    real(Object,                 1,     js_InitViaClassSpec,       OCLASP(Plain)) \
-    real(Function,               2,     js_InitViaClassSpec,       &JSFunction::class_) \
-    real(Array,                  3,     js_InitViaClassSpec,       OCLASP(Array)) \
-    real(Boolean,                4,     js_InitBooleanClass,       OCLASP(Boolean)) \
-    real(JSON,                   5,     js_InitJSONClass,          CLASP(JSON)) \
-    real(Date,                   6,     js_InitViaClassSpec,       OCLASP(Date)) \
-    real(Math,                   7,     js_InitMathClass,          CLASP(Math)) \
-    real(Number,                 8,     js_InitNumberClass,        OCLASP(Number)) \
-    real(String,                 9,     js_InitStringClass,        OCLASP(String)) \
-    real(RegExp,                10,     js_InitRegExpClass,        OCLASP(RegExp)) \
-    real(Error,                 11,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_ERR)) \
-    real(InternalError,         12,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_INTERNALERR)) \
-    real(EvalError,             13,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_EVALERR)) \
-    real(RangeError,            14,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_RANGEERR)) \
-    real(ReferenceError,        15,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_REFERENCEERR)) \
-    real(SyntaxError,           16,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_SYNTAXERR)) \
-    real(TypeError,             17,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_TYPEERR)) \
-    real(URIError,              18,     js_InitViaClassSpec,       ERROR_CLASP(JSEXN_URIERR)) \
-    real(Iterator,              19,     js_InitIteratorClasses,    OCLASP(PropertyIterator)) \
-    real(StopIteration,         20,     js_InitIteratorClasses,    OCLASP(StopIteration)) \
-    real(ArrayBuffer,           21,     js_InitArrayBufferClass,   &js::ArrayBufferObject::protoClass) \
-    real(Int8Array,             22,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Int8)) \
-    real(Uint8Array,            23,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint8)) \
-    real(Int16Array,            24,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Int16)) \
-    real(Uint16Array,           25,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint16)) \
-    real(Int32Array,            26,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Int32)) \
-    real(Uint32Array,           27,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint32)) \
-    real(Float32Array,          28,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Float32)) \
-    real(Float64Array,          29,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Float64)) \
-    real(Uint8ClampedArray,     30,     js_InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint8Clamped)) \
-    real(Proxy,                 31,     js_InitProxyClass,         OCLASP(Proxy)) \
-    real(WeakMap,               32,     js_InitWeakMapClass,       OCLASP(WeakMap)) \
-    real(Map,                   33,     js_InitMapClass,           OCLASP(Map)) \
-    real(Set,                   34,     js_InitSetClass,           OCLASP(Set)) \
-    real(DataView,              35,     js_InitDataViewClass,      OCLASP(DataView)) \
-    real(Symbol,                36,     js_InitSymbolClass,        OCLASP(Symbol)) \
-IF_SAB(real,imaginary)(SharedArrayBuffer,       37,     js_InitSharedArrayBufferClass, &js::SharedArrayBufferObject::protoClass) \
-IF_INTL(real,imaginary) (Intl,                  38,     js_InitIntlClass,          CLASP(Intl)) \
-IF_BDATA(real,imaginary)(TypedObject,           39,     js_InitTypedObjectModuleObject,   OCLASP(TypedObjectModule)) \
-    imaginary(GeneratorFunction,     40,     js_InitIteratorClasses, dummy) \
-IF_BDATA(real,imaginary)(SIMD,                  41,     js_InitSIMDClass, OCLASP(SIMD)) \
-    real(WeakSet,               42,     js_InitWeakSetClass,       OCLASP(WeakSet)) \
-IF_SAB(real,imaginary)(SharedInt8Array,         43,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Int8)) \
-IF_SAB(real,imaginary)(SharedUint8Array,        44,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint8)) \
-IF_SAB(real,imaginary)(SharedInt16Array,        45,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Int16)) \
-IF_SAB(real,imaginary)(SharedUint16Array,       46,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint16)) \
-IF_SAB(real,imaginary)(SharedInt32Array,        47,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Int32)) \
-IF_SAB(real,imaginary)(SharedUint32Array,       48,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint32)) \
-IF_SAB(real,imaginary)(SharedFloat32Array,      49,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Float32)) \
-IF_SAB(real,imaginary)(SharedFloat64Array,      50,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Float64)) \
-IF_SAB(real,imaginary)(SharedUint8ClampedArray, 51,     js_InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint8Clamped)) \
-    real(TypedArray,            52,      js_InitViaClassSpec,      &js::TypedArrayObject::sharedTypedArrayPrototypeClass) \
-IF_SAB(real,imaginary)(Atomics,                 53,     js_InitAtomicsClass, OCLASP(Atomics)) \
-    real(SavedFrame,            54,      js_InitViaClassSpec,      &js::SavedFrame::class_) \
+    imaginary(Null,              0,     InitNullClass,          dummy) \
+    real(Object,                 1,     InitViaClassSpec,       OCLASP(Plain)) \
+    real(Function,               2,     InitViaClassSpec,       &JSFunction::class_) \
+    real(Array,                  3,     InitViaClassSpec,       OCLASP(Array)) \
+    real(Boolean,                4,     InitBooleanClass,       OCLASP(Boolean)) \
+    real(JSON,                   5,     InitJSONClass,          CLASP(JSON)) \
+    real(Date,                   6,     InitViaClassSpec,       OCLASP(Date)) \
+    real(Math,                   7,     InitMathClass,          CLASP(Math)) \
+    real(Number,                 8,     InitNumberClass,        OCLASP(Number)) \
+    real(String,                 9,     InitStringClass,        OCLASP(String)) \
+    real(RegExp,                10,     InitRegExpClass,        OCLASP(RegExp)) \
+    real(Error,                 11,     InitViaClassSpec,       ERROR_CLASP(JSEXN_ERR)) \
+    real(InternalError,         12,     InitViaClassSpec,       ERROR_CLASP(JSEXN_INTERNALERR)) \
+    real(EvalError,             13,     InitViaClassSpec,       ERROR_CLASP(JSEXN_EVALERR)) \
+    real(RangeError,            14,     InitViaClassSpec,       ERROR_CLASP(JSEXN_RANGEERR)) \
+    real(ReferenceError,        15,     InitViaClassSpec,       ERROR_CLASP(JSEXN_REFERENCEERR)) \
+    real(SyntaxError,           16,     InitViaClassSpec,       ERROR_CLASP(JSEXN_SYNTAXERR)) \
+    real(TypeError,             17,     InitViaClassSpec,       ERROR_CLASP(JSEXN_TYPEERR)) \
+    real(URIError,              18,     InitViaClassSpec,       ERROR_CLASP(JSEXN_URIERR)) \
+    real(Iterator,              19,     InitIteratorClasses,    OCLASP(PropertyIterator)) \
+    real(StopIteration,         20,     InitIteratorClasses,    OCLASP(StopIteration)) \
+    real(ArrayBuffer,           21,     InitArrayBufferClass,   &js::ArrayBufferObject::protoClass) \
+    real(Int8Array,             22,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Int8)) \
+    real(Uint8Array,            23,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint8)) \
+    real(Int16Array,            24,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Int16)) \
+    real(Uint16Array,           25,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint16)) \
+    real(Int32Array,            26,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Int32)) \
+    real(Uint32Array,           27,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint32)) \
+    real(Float32Array,          28,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Float32)) \
+    real(Float64Array,          29,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Float64)) \
+    real(Uint8ClampedArray,     30,     InitViaClassSpec,       TYPED_ARRAY_CLASP(Uint8Clamped)) \
+    real(Proxy,                 31,     InitProxyClass,         OCLASP(Proxy)) \
+    real(WeakMap,               32,     InitWeakMapClass,       OCLASP(WeakMap)) \
+    real(Map,                   33,     InitMapClass,           OCLASP(Map)) \
+    real(Set,                   34,     InitSetClass,           OCLASP(Set)) \
+    real(DataView,              35,     InitDataViewClass,      OCLASP(DataView)) \
+    real(Symbol,                36,     InitSymbolClass,        OCLASP(Symbol)) \
+IF_SAB(real,imaginary)(SharedArrayBuffer,       37,     InitSharedArrayBufferClass, &js::SharedArrayBufferObject::protoClass) \
+IF_INTL(real,imaginary) (Intl,                  38,     InitIntlClass,          CLASP(Intl)) \
+IF_BDATA(real,imaginary)(TypedObject,           39,     InitTypedObjectModuleObject,   OCLASP(TypedObjectModule)) \
+    imaginary(GeneratorFunction,     40,     InitIteratorClasses, dummy) \
+IF_BDATA(real,imaginary)(SIMD,                  41,     InitSIMDClass, OCLASP(SIMD)) \
+    real(WeakSet,               42,     InitWeakSetClass,       OCLASP(WeakSet)) \
+IF_SAB(real,imaginary)(SharedInt8Array,         43,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Int8)) \
+IF_SAB(real,imaginary)(SharedUint8Array,        44,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint8)) \
+IF_SAB(real,imaginary)(SharedInt16Array,        45,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Int16)) \
+IF_SAB(real,imaginary)(SharedUint16Array,       46,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint16)) \
+IF_SAB(real,imaginary)(SharedInt32Array,        47,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Int32)) \
+IF_SAB(real,imaginary)(SharedUint32Array,       48,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint32)) \
+IF_SAB(real,imaginary)(SharedFloat32Array,      49,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Float32)) \
+IF_SAB(real,imaginary)(SharedFloat64Array,      50,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Float64)) \
+IF_SAB(real,imaginary)(SharedUint8ClampedArray, 51,     InitViaClassSpec,       SHARED_TYPED_ARRAY_CLASP(Uint8Clamped)) \
+    real(TypedArray,            52,      InitViaClassSpec,      &js::TypedArrayObject::sharedTypedArrayPrototypeClass) \
+IF_SAB(real,imaginary)(Atomics,                 53,     InitAtomicsClass, OCLASP(Atomics)) \
+    real(SavedFrame,            54,      InitViaClassSpec,      &js::SavedFrame::class_) \
 
 
 #define JS_FOR_EACH_PROTOTYPE(macro) JS_FOR_PROTOTYPES(macro,macro)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jspubtd.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jspubtd.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jspubtd.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jspubtd.h	2015-02-28 15:03:05.000000000 +0000
@@ -119,9 +119,10 @@
 typedef void
 (* JSTraceDataOp)(JSTracer *trc, void *data);
 
-void js_FinishGC(JSRuntime *rt);
-
 namespace js {
+
+void FinishGC(JSRuntime *rt);
+
 namespace gc {
 class StoreBuffer;
 void MarkPersistentRootedChains(JSTracer *);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsreflect.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsreflect.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsreflect.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsreflect.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -111,7 +111,7 @@
     JS_BEGIN_MACRO                                                                        \
         MOZ_ASSERT(expr);                                                                 \
         if (!(expr)) {                                                                    \
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_PARSE_NODE);  \
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_PARSE_NODE);     \
             return false;                                                                 \
         }                                                                                 \
     JS_END_MACRO
@@ -119,7 +119,7 @@
 #define LOCAL_NOT_REACHED(expr)                                                           \
     JS_BEGIN_MACRO                                                                        \
         MOZ_ASSERT(false);                                                                \
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_PARSE_NODE);      \
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_PARSE_NODE);         \
         return false;                                                                     \
     JS_END_MACRO
 
@@ -200,8 +200,8 @@
             }
 
             if (!funv.isObject() || !funv.toObject().is<JSFunction>()) {
-                js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NOT_FUNCTION,
-                                         JSDVG_SEARCH_STACK, funv, js::NullPtr(), nullptr, nullptr);
+                ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NOT_FUNCTION,
+                                      JSDVG_SEARCH_STACK, funv, js::NullPtr(), nullptr, nullptr);
                 return false;
             }
 
@@ -616,6 +616,10 @@
 
     bool exportBatchSpecifier(TokenPos *pos, MutableHandleValue dst);
 
+    bool classStatement(HandleValue name, HandleValue heritage, HandleValue block, TokenPos *pos, MutableHandleValue dst);
+    bool classMethods(NodeVector &methods, MutableHandleValue dst);
+    bool classMethod(HandleValue name, HandleValue body, PropKind kind, bool isStatic, TokenPos *pos, MutableHandleValue dst);
+
     /*
      * expressions
      */
@@ -722,7 +726,7 @@
 {
     const size_t len = elts.length();
     if (len > UINT32_MAX) {
-        js_ReportAllocationOverflow(cx);
+        ReportAllocationOverflow(cx);
         return false;
     }
     RootedObject array(cx, NewDenseFullyAllocatedArray(cx, uint32_t(len)));
@@ -1714,6 +1718,53 @@
                    dst);
 }
 
+bool
+NodeBuilder::classMethod(HandleValue name, HandleValue body, PropKind kind, bool isStatic,
+                         TokenPos *pos, MutableHandleValue dst)
+{
+    RootedValue kindName(cx);
+    if (!atomValue(kind == PROP_INIT
+                   ? "method"
+                   : kind == PROP_GETTER
+                   ? "get"
+                   : "set", &kindName)) {
+        return false;
+    }
+
+    RootedValue isStaticVal(cx, BooleanValue(isStatic));
+    RootedValue cb(cx, callbacks[AST_CLASS_METHOD]);
+    if (!cb.isNull())
+        return callback(cb, kindName, name, body, isStaticVal, pos, dst);
+
+    return newNode(AST_CLASS_METHOD, pos,
+                   "name", name,
+                   "body", body,
+                   "kind", kindName,
+                   "static", isStaticVal,
+                   dst);
+}
+
+bool
+NodeBuilder::classMethods(NodeVector &methods, MutableHandleValue dst)
+{
+    return newArray(methods, dst);
+}
+
+bool
+NodeBuilder::classStatement(HandleValue name, HandleValue heritage, HandleValue block,
+                            TokenPos *pos, MutableHandleValue dst)
+{
+    RootedValue cb(cx, callbacks[AST_CLASS_STMT]);
+    if (!cb.isNull())
+        return callback(cb, name, heritage, block, pos, dst);
+
+    return newNode(AST_CLASS_STMT, pos,
+                   "name", name,
+                   "heritage", heritage,
+                   "body", block,
+                   dst);
+}
+
 namespace {
 
 /*
@@ -1786,6 +1837,8 @@
     bool propertyName(ParseNode *pn, MutableHandleValue dst);
     bool property(ParseNode *pn, MutableHandleValue dst);
 
+    bool classMethod(ParseNode *pn, MutableHandleValue dst);
+
     bool optIdentifier(HandleAtom atom, TokenPos *pos, MutableHandleValue dst) {
         if (!atom) {
             dst.setMagic(JS_SERIALIZE_NO_NODE);
@@ -1796,6 +1849,7 @@
 
     bool identifier(HandleAtom atom, TokenPos *pos, MutableHandleValue dst);
     bool identifier(ParseNode *pn, MutableHandleValue dst);
+    bool objectPropertyName(ParseNode *pn, MutableHandleValue dst);
     bool literal(ParseNode *pn, MutableHandleValue dst);
 
     bool pattern(ParseNode *pn, MutableHandleValue dst);
@@ -2559,6 +2613,35 @@
       case PNK_DEBUGGER:
         return builder.debuggerStatement(&pn->pn_pos, dst);
 
+      case PNK_CLASS:
+      {
+         RootedValue className(cx);
+         RootedValue heritage(cx);
+         RootedValue classBody(cx);
+         return identifier(pn->pn_kid1->as<ClassNames>().innerBinding(), &className) &&
+                optExpression(pn->pn_kid2, &heritage) &&
+                statement(pn->pn_kid3, &classBody) &&
+                builder.classStatement(className, heritage, classBody, &pn->pn_pos, dst);
+      }
+
+      case PNK_CLASSMETHODLIST:
+      {
+        NodeVector methods(cx);
+        if (!methods.reserve(pn->pn_count))
+            return false;
+
+        for (ParseNode *next = pn->pn_head; next; next = next->pn_next) {
+            MOZ_ASSERT(pn->pn_pos.encloses(next->pn_pos));
+
+            RootedValue prop(cx);
+            if (!classMethod(next, &prop))
+                return false;
+            methods.infallibleAppend(prop);
+        }
+
+        return builder.classMethods(methods, dst);
+      }
+
       case PNK_NOP:
         return builder.emptyStatement(&pn->pn_pos, dst);
 
@@ -2568,6 +2651,34 @@
 }
 
 bool
+ASTSerializer::classMethod(ParseNode *pn, MutableHandleValue dst)
+{
+    PropKind kind;
+    switch (pn->getOp()) {
+      case JSOP_INITPROP:
+        kind = PROP_INIT;
+        break;
+
+      case JSOP_INITPROP_GETTER:
+        kind = PROP_GETTER;
+        break;
+
+      case JSOP_INITPROP_SETTER:
+        kind = PROP_SETTER;
+        break;
+
+      default:
+        LOCAL_NOT_REACHED("unexpected object-literal property");
+    }
+
+    RootedValue key(cx), val(cx);
+    bool isStatic = pn->as<ClassMethod>().isStatic();
+    return propertyName(pn->pn_left, &key) &&
+           expression(pn->pn_right, &val) &&
+           builder.classMethod(key, val, kind, isStatic, &pn->pn_pos, dst);
+}
+
+bool
 ASTSerializer::leftAssociate(ParseNode *pn, MutableHandleValue dst)
 {
     MOZ_ASSERT(pn->isArity(PN_LIST));
@@ -3058,7 +3169,7 @@
 {
     if (pn->isKind(PNK_COMPUTED_NAME))
         return expression(pn, dst);
-    if (pn->isKind(PNK_NAME))
+    if (pn->isKind(PNK_OBJECT_PROPERTY_NAME))
         return identifier(pn, dst);
 
     LOCAL_ASSERT(pn->isKind(PNK_STRING) || pn->isKind(PNK_NUMBER));
@@ -3251,6 +3362,17 @@
 }
 
 bool
+ASTSerializer::objectPropertyName(ParseNode *pn, MutableHandleValue dst)
+{
+    LOCAL_ASSERT(pn->isKind(PNK_OBJECT_PROPERTY_NAME));
+    LOCAL_ASSERT(pn->isArity(PN_NULLARY));
+    LOCAL_ASSERT(pn->pn_atom);
+
+    RootedAtom pnAtom(cx, pn->pn_atom);
+    return identifier(pnAtom, &pn->pn_pos, dst);
+}
+
+bool
 ASTSerializer::function(ParseNode *pn, ASTType type, MutableHandleValue dst)
 {
     RootedFunction func(cx, pn->pn_funbox->function());
@@ -3430,7 +3552,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "Reflect.parse", "0", "s");
         return false;
     }
@@ -3449,9 +3571,9 @@
 
     if (!arg.isNullOrUndefined()) {
         if (!arg.isObject()) {
-            js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                     JSDVG_SEARCH_STACK, arg, js::NullPtr(),
-                                     "not an object", nullptr);
+            ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
+                                  JSDVG_SEARCH_STACK, arg, js::NullPtr(),
+                                  "not an object", nullptr);
             return false;
         }
 
@@ -3501,9 +3623,9 @@
 
         if (!prop.isNullOrUndefined()) {
             if (!prop.isObject()) {
-                js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                         JSDVG_SEARCH_STACK, prop, js::NullPtr(),
-                                         "not an object", nullptr);
+                ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
+                                      JSDVG_SEARCH_STACK, prop, js::NullPtr(),
+                                      "not an object", nullptr);
                 return false;
             }
             builder = &prop.toObject();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsscript.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsscript.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsscript.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsscript.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -2064,7 +2064,7 @@
     if (hasDisplayURL()) {
         if (cx->isJSContext() &&
             !JS_ReportErrorFlagsAndNumber(cx->asJSContext(), JSREPORT_WARNING,
-                                          js_GetErrorMessage, nullptr,
+                                          GetErrorMessage, nullptr,
                                           JSMSG_ALREADY_HAS_PRAGMA, filename_.get(),
                                           "//# sourceURL"))
         {
@@ -2169,7 +2169,7 @@
             script->setCode(nullptr);
             script->atoms = nullptr;
             js_free(ssd);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
     }
@@ -2380,7 +2380,7 @@
 {
     MOZ_ASSERT(bufStart <= bufEnd);
 
-    RootedScript script(cx, js_NewGCScript(cx));
+    RootedScript script(cx, NewGCScript(cx));
     if (!script)
         return nullptr;
 
@@ -2405,7 +2405,7 @@
     if (staticLevel > UINT16_MAX) {
         if (cx->isJSContext()) {
             JS_ReportErrorNumber(cx->asJSContext(),
-                                 js_GetErrorMessage, nullptr, JSMSG_TOO_DEEP, js_function_str);
+                                 GetErrorMessage, nullptr, JSMSG_TOO_DEEP, js_function_str);
         }
         return nullptr;
     }
@@ -2603,7 +2603,7 @@
         bce->tryNoteList.finish(script->trynotes());
     if (bce->blockScopeList.length() != 0)
         bce->blockScopeList.finish(script->blockScopes());
-    script->strict_ = bce->sc->strict;
+    script->strict_ = bce->sc->strict();
     script->explicitUseStrict_ = bce->sc->hasExplicitUseStrict();
     script->bindingsAccessedDynamically_ = bce->sc->bindingsAccessedDynamically();
     script->funHasExtensibleScope_ = funbox ? funbox->hasExtensibleScope() : false;
@@ -2779,7 +2779,7 @@
 }
 
 jssrcnote *
-js_GetSrcNote(JSContext *cx, JSScript *script, jsbytecode *pc)
+js::GetSrcNote(JSContext *cx, JSScript *script, jsbytecode *pc)
 {
     return GetSrcNote(cx->runtime()->gsnCache, script, pc);
 }
@@ -2838,7 +2838,7 @@
 }
 
 jsbytecode *
-js_LineNumberToPC(JSScript *script, unsigned target)
+js::LineNumberToPC(JSScript *script, unsigned target)
 {
     ptrdiff_t offset = 0;
     ptrdiff_t best = -1;
@@ -2873,7 +2873,7 @@
 }
 
 JS_FRIEND_API(unsigned)
-js_GetScriptLineExtent(JSScript *script)
+js::GetScriptLineExtent(JSScript *script)
 {
     unsigned lineno = script->lineno();
     unsigned maxLineNo = lineno;
@@ -3322,7 +3322,7 @@
     if (!site) {
         site = cx->runtime()->new_<BreakpointSite>(this, pc);
         if (!site) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
         debug->numSites++;
@@ -3758,7 +3758,7 @@
     if (bytes && !table)
         return nullptr;
 
-    LazyScript *res = js_NewGCLazyScript(cx);
+    LazyScript *res = NewGCLazyScript(cx);
     if (!res)
         return nullptr;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsscript.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsscript.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsscript.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsscript.h	2015-02-28 15:03:05.000000000 +0000
@@ -9,7 +9,6 @@
 #ifndef jsscript_h
 #define jsscript_h
 
-#include "mozilla/Atomics.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/UniquePtr.h"
@@ -745,7 +744,7 @@
 /*
  * NB: after a successful XDR_DECODE, XDRScript callers must do any required
  * subsequent set-up of owning function or script object and then call
- * js_CallNewScriptHook.
+ * CallNewScriptHook.
  */
 template<XDRMode mode>
 bool
@@ -2050,7 +2049,7 @@
 {
     uint32_t length;
     uint32_t natoms;
-    mozilla::Atomic<bool, mozilla::ReleaseAcquire> marked;
+    bool marked;
     jsbytecode data[1];
 
     static SharedScriptData *new_(ExclusiveContext *cx, uint32_t codeLength,
@@ -2121,16 +2120,16 @@
 jssrcnote *
 GetSrcNote(GSNCache &cache, JSScript *script, jsbytecode *pc);
 
-} /* namespace js */
-
 extern jssrcnote *
-js_GetSrcNote(JSContext *cx, JSScript *script, jsbytecode *pc);
+GetSrcNote(JSContext *cx, JSScript *script, jsbytecode *pc);
 
 extern jsbytecode *
-js_LineNumberToPC(JSScript *script, unsigned lineno);
+LineNumberToPC(JSScript *script, unsigned lineno);
 
 extern JS_FRIEND_API(unsigned)
-js_GetScriptLineExtent(JSScript *script);
+GetScriptLineExtent(JSScript *script);
+
+} /* namespace js */
 
 namespace js {
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsstr.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsstr.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsstr.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsstr.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -446,14 +446,14 @@
         if (obj->is<StringObject>()) {
             StringObject *nobj = &obj->as<StringObject>();
             Rooted<jsid> id(cx, NameToId(cx->names().toString));
-            if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, js_str_toString)) {
+            if (ClassMethodIsNative(cx, nobj, &StringObject::class_, id, str_toString)) {
                 JSString *str = nobj->unbox();
                 call.setThis(StringValue(str));
                 return str;
             }
         }
     } else if (call.thisv().isNullOrUndefined()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CONVERT_TO,
                              call.thisv().isNull() ? "null" : "undefined", "object");
         return nullptr;
     }
@@ -483,7 +483,7 @@
     if (!str)
         return false;
 
-    str = js_QuoteString(cx, str, '"');
+    str = QuoteString(cx, str, '"');
     if (!str)
         return false;
 
@@ -519,7 +519,7 @@
 }
 
 bool
-js_str_toString(JSContext *cx, unsigned argc, Value *vp)
+js::str_toString(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     return CallNonGenericMethod<IsString, str_toString_impl>(cx, args);
@@ -901,7 +901,7 @@
         } else if (formStr == cx->names().NFKD) {
             form = UNORM_NFKD;
         } else {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_INVALID_NORMALIZE_FORM);
             return false;
         }
@@ -950,7 +950,7 @@
 #endif
 
 bool
-js_str_charAt(JSContext *cx, unsigned argc, Value *vp)
+js::str_charAt(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -1016,7 +1016,7 @@
 }
 
 bool
-js_str_charCodeAt(JSContext *cx, unsigned argc, Value *vp)
+js::str_charCodeAt(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     RootedString str(cx);
@@ -1733,7 +1733,7 @@
 
     // Step 4
     if (args.get(0).isObject() && IsObjectWithClass(args[0], ESClass_RegExp, cx)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INVALID_ARG_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INVALID_ARG_TYPE,
                              "first", "", "Regular Expression");
         return false;
     }
@@ -1794,7 +1794,7 @@
 
     // Step 4
     if (args.get(0).isObject() && IsObjectWithClass(args[0], ESClass_RegExp, cx)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INVALID_ARG_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INVALID_ARG_TYPE,
                              "first", "", "Regular Expression");
         return false;
     }
@@ -2651,7 +2651,7 @@
     }
 
     if (!replen.isValid()) {
-        js_ReportAllocationOverflow(cx);
+        ReportAllocationOverflow(cx);
         return false;
     }
 
@@ -2814,7 +2814,7 @@
     newlen += leftlen;
     newlen += replen;
     if (!newlen.isValid()) {
-        js_ReportAllocationOverflow(cx);
+        ReportAllocationOverflow(cx);
         return false;
     }
 
@@ -3934,12 +3934,12 @@
 #endif
 
     /* Java-like methods. */
-    JS_FN(js_toString_str,     js_str_toString,       0,0),
-    JS_FN(js_valueOf_str,      js_str_toString,       0,0),
+    JS_FN(js_toString_str,     str_toString,          0,0),
+    JS_FN(js_valueOf_str,      str_toString,          0,0),
     JS_FN("toLowerCase",       str_toLowerCase,       0,JSFUN_GENERIC_NATIVE),
     JS_FN("toUpperCase",       str_toUpperCase,       0,JSFUN_GENERIC_NATIVE),
-    JS_FN("charAt",            js_str_charAt,         1,JSFUN_GENERIC_NATIVE),
-    JS_FN("charCodeAt",        js_str_charCodeAt,     1,JSFUN_GENERIC_NATIVE),
+    JS_FN("charAt",            str_charAt,            1,JSFUN_GENERIC_NATIVE),
+    JS_FN("charCodeAt",        str_charCodeAt,        1,JSFUN_GENERIC_NATIVE),
     JS_SELF_HOSTED_FN("substring", "String_substring", 2,0),
     JS_SELF_HOSTED_FN("codePointAt", "String_codePointAt", 1,0),
     JS_FN("contains",          str_contains,          1,JSFUN_GENERIC_NATIVE),
@@ -3994,7 +3994,7 @@
 
 // ES6 rev 27 (2014 Aug 24) 21.1.1
 bool
-js_String(JSContext *cx, unsigned argc, Value *vp)
+js::StringConstructor(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -4102,7 +4102,7 @@
 }
 
 JSObject *
-js_InitStringClass(JSContext *cx, HandleObject obj)
+js::InitStringClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->isNative());
 
@@ -4115,7 +4115,7 @@
 
     /* Now create the String function. */
     RootedFunction ctor(cx);
-    ctor = global->createConstructor(cx, js_String, cx->names().String, 1);
+    ctor = global->createConstructor(cx, StringConstructor, cx->names().String, 1);
     if (!ctor)
         return nullptr;
 
@@ -4142,7 +4142,7 @@
 }
 
 const char *
-js_ValueToPrintable(JSContext *cx, const Value &vArg, JSAutoByteString *bytes, bool asSource)
+js::ValueToPrintable(JSContext *cx, const Value &vArg, JSAutoByteString *bytes, bool asSource)
 {
     RootedValue v(cx, vArg);
     JSString *str;
@@ -4152,7 +4152,7 @@
         str = ToString<CanGC>(cx, v);
     if (!str)
         return nullptr;
-    str = js_QuoteString(cx, str, 0);
+    str = QuoteString(cx, str, 0);
     if (!str)
         return nullptr;
     return bytes->encodeLatin1(cx, str);
@@ -4183,12 +4183,12 @@
     } else if (v.isDouble()) {
         str = NumberToString<allowGC>(cx, v.toDouble());
     } else if (v.isBoolean()) {
-        str = js_BooleanToString(cx, v.toBoolean());
+        str = BooleanToString(cx, v.toBoolean());
     } else if (v.isNull()) {
         str = cx->names().null;
     } else if (v.isSymbol()) {
         if (cx->shouldBeJSContext() && allowGC) {
-            JS_ReportErrorNumber(cx->asJSContext(), js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx->asJSContext(), GetErrorMessage, nullptr,
                                  JSMSG_SYMBOL_TO_STRING);
         }
         return nullptr;
@@ -4275,7 +4275,7 @@
 JSString *
 js::StringToSource(JSContext *cx, JSString *str)
 {
-    return js_QuoteString(cx, str, '"');
+    return QuoteString(cx, str, '"');
 }
 
 bool
@@ -4511,7 +4511,7 @@
             dst[i] = char(src[i]);
         if (maybecx) {
             AutoSuppressGC suppress(maybecx);
-            JS_ReportErrorNumber(maybecx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(maybecx, GetErrorMessage, nullptr,
                                  JSMSG_BUFFER_TOO_SMALL);
         }
         return false;
@@ -4720,7 +4720,7 @@
                 v = ((c - 0xD800) << 10) + (c2 - 0xDC00) + 0x10000;
             }
             uint8_t utf8buf[4];
-            size_t L = js_OneUcs4ToUtf8Char(utf8buf, v);
+            size_t L = OneUcs4ToUtf8Char(utf8buf, v);
             for (size_t j = 0; j < L; j++) {
                 hexBuf[1] = HexDigits[utf8buf[j] >> 4];
                 hexBuf[2] = HexDigits[utf8buf[j] & 0xf];
@@ -4760,7 +4760,7 @@
         return false;
 
     if (res == Encode_BadUri) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_URI, nullptr);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_URI, nullptr);
         return false;
     }
 
@@ -4870,7 +4870,7 @@
         return false;
 
     if (res == Decode_BadUri) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_URI);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_URI);
         return false;
     }
 
@@ -4927,7 +4927,7 @@
  * least 4 bytes long.  Return the number of UTF-8 bytes of data written.
  */
 int
-js_OneUcs4ToUtf8Char(uint8_t *utf8Buffer, uint32_t ucs4Char)
+js::OneUcs4ToUtf8Char(uint8_t *utf8Buffer, uint32_t ucs4Char)
 {
     int utf8Length = 1;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsstr.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsstr.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsstr.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsstr.h	2015-02-28 15:03:05.000000000 +0000
@@ -91,21 +91,12 @@
  */
 #define JS7_ISDEC(c)    ((((unsigned)(c)) - '0') <= 9)
 #define JS7_UNDEC(c)    ((c) - '0')
+#define JS7_ISOCT(c)    ((((unsigned)(c)) - '0') <= 7)
+#define JS7_UNOCT(c)    (JS7_UNDEC(c))
 #define JS7_ISHEX(c)    ((c) < 128 && isxdigit(c))
 #define JS7_UNHEX(c)    (unsigned)(JS7_ISDEC(c) ? (c) - '0' : 10 + tolower(c) - 'a')
 #define JS7_ISLET(c)    ((c) < 128 && isalpha(c))
 
-/* Initialize the String class, returning its prototype object. */
-extern JSObject *
-js_InitStringClass(JSContext *cx, js::HandleObject obj);
-
-/*
- * Convert a value to a printable C string.
- */
-extern const char *
-js_ValueToPrintable(JSContext *cx, const js::Value &,
-                    JSAutoByteString *bytes, bool asSource = false);
-
 extern size_t
 js_strlen(const char16_t *s);
 
@@ -124,6 +115,16 @@
 
 namespace js {
 
+/* Initialize the String class, returning its prototype object. */
+extern JSObject *
+InitStringClass(JSContext *cx, HandleObject obj);
+
+/*
+ * Convert a value to a printable C string.
+ */
+extern const char *
+ValueToPrintable(JSContext *cx, const Value &, JSAutoByteString *bytes, bool asSource = false);
+
 extern mozilla::UniquePtr<char[], JS::FreePolicy>
 DuplicateString(ExclusiveContext *cx, const char *s);
 
@@ -325,31 +326,23 @@
 extern bool
 str_toUpperCase(JSContext *cx, unsigned argc, Value *vp);
 
-} /* namespace js */
-
 extern bool
-js_str_toString(JSContext *cx, unsigned argc, js::Value *vp);
+str_toString(JSContext *cx, unsigned argc, Value *vp);
 
 extern bool
-js_str_charAt(JSContext *cx, unsigned argc, js::Value *vp);
-
-namespace js {
+str_charAt(JSContext *cx, unsigned argc, Value *vp);
 
 extern bool
 str_charCodeAt_impl(JSContext *cx, HandleString string, HandleValue index, MutableHandleValue res);
 
-} /* namespace js */
-
 extern bool
-js_str_charCodeAt(JSContext *cx, unsigned argc, js::Value *vp);
+str_charCodeAt(JSContext *cx, unsigned argc, Value *vp);
 /*
  * Convert one UCS-4 char and write it into a UTF-8 buffer, which must be at
  * least 6 bytes long.  Return the number of UTF-8 bytes of data written.
  */
 extern int
-js_OneUcs4ToUtf8Char(uint8_t *utf8Buffer, uint32_t ucs4Char);
-
-namespace js {
+OneUcs4ToUtf8Char(uint8_t *utf8Buffer, uint32_t ucs4Char);
 
 extern size_t
 PutEscapedStringImpl(char *buffer, size_t size, FILE *fp, JSLinearString *str, uint32_t quote);
@@ -429,9 +422,9 @@
 str_replace_string_raw(JSContext *cx, HandleString string, HandleString pattern,
                        HandleString replacement, MutableHandleValue rval);
 
-} /* namespace js */
-
 extern bool
-js_String(JSContext *cx, unsigned argc, js::Value *vp);
+StringConstructor(JSContext *cx, unsigned argc, Value *vp);
+
+} /* namespace js */
 
 #endif /* jsstr_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsversion.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsversion.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsversion.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsversion.h	2015-02-28 15:03:05.000000000 +0000
@@ -41,4 +41,9 @@
  */
 #define JS_OLD_GETTER_SETTER_METHODS    1
 
+/* Support for ES6 Classes. */
+#ifdef NIGHTLY_BUILD
+#define JS_HAS_CLASSES 1
+#endif
+
 #endif /* jsversion_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jswatchpoint.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jswatchpoint.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jswatchpoint.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jswatchpoint.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -68,7 +68,7 @@
 
     Watchpoint w(handler, closure, false);
     if (!map.put(WatchKey(obj, id), w)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     /*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsweakmap.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsweakmap.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsweakmap.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsweakmap.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -200,16 +200,6 @@
     return true;
 }
 
-static JSObject *
-GetKeyArg(JSContext *cx, CallArgs &args)
-{
-    if (args[0].isPrimitive()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
-        return nullptr;
-    }
-    return &args[0].toObject();
-}
-
 MOZ_ALWAYS_INLINE bool
 IsWeakMap(HandleValue v)
 {
@@ -221,16 +211,13 @@
 {
     MOZ_ASSERT(IsWeakMap(args.thisv()));
 
-    if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
-                             "WeakMap.has", "0", "s");
-        return false;
+    if (!args.get(0).isObject()) {
+        args.rval().setBoolean(false);
+        return true;
     }
-    JSObject *key = GetKeyArg(cx, args);
-    if (!key)
-        return false;
 
     if (ObjectValueMap *map = args.thisv().toObject().as<WeakMapObject>().getMap()) {
+        JSObject *key = &args[0].toObject();
         if (map->has(key)) {
             args.rval().setBoolean(true);
             return true;
@@ -274,23 +261,20 @@
 {
     MOZ_ASSERT(IsWeakMap(args.thisv()));
 
-    if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
-                             "WeakMap.get", "0", "s");
-        return false;
+    if (!args.get(0).isObject()) {
+        args.rval().setUndefined();
+        return true;
     }
-    JSObject *key = GetKeyArg(cx, args);
-    if (!key)
-        return false;
 
     if (ObjectValueMap *map = args.thisv().toObject().as<WeakMapObject>().getMap()) {
+        JSObject *key = &args[0].toObject();
         if (ObjectValueMap::Ptr ptr = map->lookup(key)) {
             args.rval().set(ptr->value());
             return true;
         }
     }
 
-    args.rval().set((args.length() > 1) ? args[1] : UndefinedValue());
+    args.rval().setUndefined();
     return true;
 }
 
@@ -306,16 +290,13 @@
 {
     MOZ_ASSERT(IsWeakMap(args.thisv()));
 
-    if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
-                             "WeakMap.delete", "0", "s");
-        return false;
+    if (!args.get(0).isObject()) {
+        args.rval().setBoolean(false);
+        return true;
     }
-    JSObject *key = GetKeyArg(cx, args);
-    if (!key)
-        return false;
 
     if (ObjectValueMap *map = args.thisv().toObject().as<WeakMapObject>().getMap()) {
+        JSObject *key = &args[0].toObject();
         if (ObjectValueMap::Ptr ptr = map->lookup(key)) {
             map->remove(ptr);
             args.rval().setBoolean(true);
@@ -344,7 +325,7 @@
     {
         MOZ_ASSERT(cx->runtime()->preserveWrapperCallback);
         if (!cx->runtime()->preserveWrapperCallback(cx, obj)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_WEAKMAP_KEY);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_WEAKMAP_KEY);
             return false;
         }
     }
@@ -402,20 +383,19 @@
 {
     MOZ_ASSERT(IsWeakMap(args.thisv()));
 
-    if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
-                             "WeakMap.set", "0", "s");
+    if (!args.get(0).isObject()) {
+        char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, args.get(0), NullPtr());
+        if (!bytes)
+            return false;
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes);
         return false;
     }
-    RootedObject key(cx, GetKeyArg(cx, args));
-    if (!key)
-        return false;
 
-    RootedValue value(cx, (args.length() > 1) ? args[1] : UndefinedValue());
+    RootedObject key(cx, &args[0].toObject());
     Rooted<JSObject*> thisObj(cx, &args.thisv().toObject());
     Rooted<WeakMapObject*> map(cx, &thisObj->as<WeakMapObject>());
 
-    if (!SetWeakMapEntryInternal(cx, map, key, value))
+    if (!SetWeakMapEntryInternal(cx, map, key, args.get(1)))
         return false;
     args.rval().set(args.thisv());
     return true;
@@ -568,7 +548,7 @@
 
             // Step 12f.
             if (!pairVal.isObject()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_INVALID_MAP_ITERABLE, "WeakMap");
                 return false;
             }
@@ -588,7 +568,10 @@
             // Steps 12k-l.
             if (isOriginalAdder) {
                 if (keyVal.isPrimitive()) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+                    char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, keyVal, NullPtr());
+                    if (!bytes)
+                        return false;
+                    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, bytes);
                     return false;
                 }
 
@@ -671,7 +654,7 @@
 }
 
 JSObject *
-js_InitWeakMapClass(JSContext *cx, HandleObject obj)
+js::InitWeakMapClass(JSContext *cx, HandleObject obj)
 {
     return InitWeakMapClass(cx, obj, true);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsweakmap.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsweakmap.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jsweakmap.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jsweakmap.h	2015-02-28 15:03:05.000000000 +0000
@@ -322,9 +322,9 @@
 extern bool
 WeakMap_clear(JSContext *cx, unsigned argc, Value *vp);
 
-} /* namespace js */
-
 extern JSObject *
-js_InitWeakMapClass(JSContext *cx, js::HandleObject obj);
+InitWeakMapClass(JSContext *cx, HandleObject obj);
+
+} /* namespace js */
 
 #endif /* jsweakmap_h */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jswrapper.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jswrapper.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/jswrapper.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/jswrapper.h	2015-02-28 15:03:05.000000000 +0000
@@ -69,7 +69,7 @@
     virtual bool defaultValue(JSContext *cx, HandleObject obj, JSType hint,
                               MutableHandleValue vp) const MOZ_OVERRIDE;
 
-    static JSObject *New(JSContext *cx, JSObject *obj, JSObject *parent, const Wrapper *handler,
+    static JSObject *New(JSContext *cx, JSObject *obj, const Wrapper *handler,
                          const WrapperOptions &options = WrapperOptions());
 
     static JSObject *Renew(JSContext *cx, JSObject *existing, JSObject *obj, const Wrapper *handler);
@@ -217,8 +217,7 @@
 typedef SecurityWrapper<CrossCompartmentWrapper> CrossCompartmentSecurityWrapper;
 
 extern JSObject *
-TransparentObjectWrapper(JSContext *cx, HandleObject existing, HandleObject obj,
-                         HandleObject parent);
+TransparentObjectWrapper(JSContext *cx, HandleObject existing, HandleObject obj);
 
 inline bool
 IsWrapper(JSObject *obj)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/Makefile.in	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/Makefile.in	2015-02-28 15:03:04.000000000 +0000
@@ -141,23 +141,11 @@
 
 check:: check-style
 
-# jstests doesn't have a --jitflags option, so we need to loop, updating the
-# exit code (RC) after each invocation.
-# FIXME: MethodJIT doesn't work for 1 test case (bug 644393), so
-# --no-extensions is set to skip that test. Remove as soon as possible.
 check-jstests:
-	RC=0; \
-	for f in `echo '$(JITFLAGS)' | tr ',' '\n'`; \
-		do \
-			$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/tests/jstests.py \
-				--tinderbox --no-progress \
-				--no-extensions \
-				--timeout 300 \
-				--args="`echo $$f | sed 's/\(.\)/ -\1/g'`" \
-				$(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX); \
-			RC=$$(( $$RC || $$?)); \
-		done; \
-	exit $$RC
+	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/tests/jstests.py \
+		--no-progress --tinderbox --timeout 300 \
+		$(JSTESTS_EXTRA_ARGS) \
+		$(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
 
 # FIXME:
 # We want to run check-jstests as part of |make check| on all platforms, on
@@ -323,6 +311,7 @@
   $(srcdir)/builtin/Map.js \
   $(srcdir)/builtin/Number.js \
   $(srcdir)/builtin/Object.js \
+  $(srcdir)/builtin/RegExp.js \
   $(srcdir)/builtin/String.js \
   $(srcdir)/builtin/Set.js \
   $(srcdir)/builtin/TypedArray.js \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/make-source-package.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/make-source-package.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/make-source-package.sh	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/make-source-package.sh	2015-02-28 15:03:05.000000000 +0000
@@ -29,6 +29,12 @@
 	rm -rf ${pkg} ${tgtpath}
 	;;
 "build")
+        # Ensure that the configure script is newer than the configure.in script.
+        if [ ${SRCDIR}/configure.in -nt ${SRCDIR}/configure ]; then
+            echo "error: js/src/configure is out of date. Please regenerate before packaging." >&2
+            exit 1
+        fi
+
 	echo "Packaging source tarball ${pkg}..."
 	if [ -d ${tgtpath} ]; then
 		echo "WARNING - dist tree ${tgtpath} already exists!"
@@ -48,12 +54,11 @@
 		${SRCDIR}/../../nsprpub/config/make-system-wrappers.pl
 
 	# copy build and config directory.
-	${MKDIR} -p ${tgtpath}/build
 	cp -t ${tgtpath} -dRp ${SRCDIR}/../../build ${SRCDIR}/../../config
 
 	# put in js itself
 	cp -t ${tgtpath} -dRp ${SRCDIR}/../../mfbt
-	cp -t ${tgtpath}/js -dRp ${SRCDIR}/../jsd ${SRCDIR}/../public
+	cp -t ${tgtpath}/js -dRp ${SRCDIR}/../public
 	find ${SRCDIR} -mindepth 1 -maxdepth 1 -not -path ${DIST} -a -not -name ${pkg} \
 		-exec cp -t ${tgtpath}/js/src -dRp {} +
 
@@ -76,6 +81,13 @@
 	${MKDIR} -p ${tgtpath}/modules/zlib
 	cp -t ${tgtpath}/modules/zlib -dRp \
 		${SRCDIR}/../../modules/zlib/src
+	${MKDIR} -p ${tgtpath}/layout/tools/reftest
+	cp -t ${tgtpath}/layout/tools/reftest -dRp \
+	        ${SRCDIR}/../../layout/tools/reftest/reftest
+	${MKDIR} -p ${tgtpath}/toolkit/mozapps/installer
+	cp -t ${tgtpath}/toolkit/mozapps/installer -dRp \
+	        ${SRCDIR}/../../toolkit/mozapps/installer/package-name.mk \
+	        ${SRCDIR}/../../toolkit/mozapps/installer/upload-files.mk \
 
 	# remove *.pyc and *.pyo files if any
 	find ${tgtpath} -type f -name "*.pyc" -o -name "*.pyo" |xargs rm -f
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/moz.build	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/moz.build	2015-02-28 15:03:05.000000000 +0000
@@ -494,6 +494,11 @@
     # Prevent floating point errors caused by VC++ optimizations
     # XXX We should add this to CXXFLAGS, too?
     CFLAGS += ['-fp:precise']
+    # C4805 warns mixing bool with other integral types in computation.
+    # But given the conversion from bool is specified, and this is a
+    # pattern widely used in code in js/src, suppress this warning here.
+    CXXFLAGS += ['-wd4805']
+    CXXFLAGS += ['-we4067', '-we4258', '-we4275']
 
 if CONFIG['OS_ARCH'] not in ('WINNT', 'HP-UX'):
     OS_LIBS += [
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/perf/jsperf.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/perf/jsperf.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/perf/jsperf.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/perf/jsperf.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -174,7 +174,7 @@
 
     uint32_t mask;
     if (!args.hasDefined(0)) {
-        js_ReportMissingArg(cx, args.calleev(), 0);
+        ReportMissingArg(cx, args.calleev(), 0);
         return false;
     }
     if (!JS::ToUint32(cx, args[0], &mask))
@@ -210,7 +210,10 @@
 GetPM(JSContext* cx, JS::HandleValue value, const char* fname)
 {
     if (!value.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, 0, JSMSG_NOT_NONNULL_OBJECT);
+        char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, value, NullPtr());
+        if (!bytes)
+            return nullptr;
+        JS_ReportErrorNumber(cx, GetErrorMessage, 0, JSMSG_NOT_NONNULL_OBJECT, bytes);
         return nullptr;
     }
     RootedObject obj(cx, &value.toObject());
@@ -221,7 +224,7 @@
 
     // JS_GetInstancePrivate only sets an exception if its last argument
     // is nonzero, so we have to do it by hand.
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, 0, JSMSG_INCOMPATIBLE_PROTO,
+    JS_ReportErrorNumber(cx, GetErrorMessage, 0, JSMSG_INCOMPATIBLE_PROTO,
                          pm_class.name, fname, JS_GetClass(obj)->name);
     return nullptr;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/BaseProxyHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/BaseProxyHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/BaseProxyHandler.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/BaseProxyHandler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -147,7 +147,7 @@
     if (ownDesc.hasSetterObject())
         setter = ownDesc.setterObject();
     if (!setter)
-        return js_ReportGetterOnlyAssignment(cx, strict);
+        return ReportGetterOnlyAssignment(cx, strict);
     RootedValue setterValue(cx, ObjectValue(*setter));
     return InvokeGetterOrSetter(cx, receiver, setterValue, 1, vp.address(), vp);
 }
@@ -306,8 +306,8 @@
 {
     assertEnteredPolicy(cx, proxy, JSID_VOID, GET);
     RootedValue val(cx, ObjectValue(*proxy.get()));
-    js_ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS,
-                        JSDVG_SEARCH_STACK, val, js::NullPtr());
+    ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS,
+                     JSDVG_SEARCH_STACK, val, js::NullPtr());
     return false;
 }
 
@@ -350,7 +350,7 @@
     // Disallow sets of protos on proxies with lazy protos, but no hook.
     // This keeps us away from the footgun of having the first proto set opt
     // you out of having dynamic protos altogether.
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL,
                          "incompatible Proxy");
     return false;
 }
@@ -365,7 +365,7 @@
 bool
 BaseProxyHandler::watch(JSContext *cx, HandleObject proxy, HandleId id, HandleObject callable) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_WATCH,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_WATCH,
                          proxy->getClass()->name);
     return false;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/DeadObjectProxy.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/DeadObjectProxy.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/DeadObjectProxy.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/DeadObjectProxy.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -18,7 +18,7 @@
 DeadObjectProxy::getPropertyDescriptor(JSContext *cx, HandleObject wrapper, HandleId id,
                                        MutableHandle<PropertyDescriptor> desc) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -26,7 +26,7 @@
 DeadObjectProxy::getOwnPropertyDescriptor(JSContext *cx, HandleObject wrapper, HandleId id,
                                           MutableHandle<PropertyDescriptor> desc) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -34,7 +34,7 @@
 DeadObjectProxy::defineProperty(JSContext *cx, HandleObject wrapper, HandleId id,
                                 MutableHandle<PropertyDescriptor> desc) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -42,21 +42,21 @@
 DeadObjectProxy::ownPropertyKeys(JSContext *cx, HandleObject wrapper,
                                  AutoIdVector &props) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
 bool
 DeadObjectProxy::delete_(JSContext *cx, HandleObject wrapper, HandleId id, bool *bp) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
 bool
 DeadObjectProxy::enumerate(JSContext *cx, HandleObject wrapper, MutableHandleObject objp) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -70,7 +70,7 @@
 bool
 DeadObjectProxy::preventExtensions(JSContext *cx, HandleObject proxy, bool *succeeded) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -86,14 +86,14 @@
 bool
 DeadObjectProxy::call(JSContext *cx, HandleObject wrapper, const CallArgs &args) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
 bool
 DeadObjectProxy::construct(JSContext *cx, HandleObject wrapper, const CallArgs &args) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -101,7 +101,7 @@
 DeadObjectProxy::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                             CallArgs args) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -109,14 +109,14 @@
 DeadObjectProxy::hasInstance(JSContext *cx, HandleObject proxy, MutableHandleValue v,
                              bool *bp) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
 bool
 DeadObjectProxy::objectClassIs(HandleObject obj, ESClassValue classValue, JSContext *cx) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -135,7 +135,7 @@
 bool
 DeadObjectProxy::regexp_toShared(JSContext *cx, HandleObject proxy, RegExpGuard *g) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
@@ -143,7 +143,7 @@
 DeadObjectProxy::defaultValue(JSContext *cx, HandleObject obj, JSType hint,
                               MutableHandleValue vp) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEAD_OBJECT);
     return false;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/Proxy.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/Proxy.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/Proxy.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/Proxy.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -35,16 +35,20 @@
         return;
 
     if (JSID_IS_VOID(id)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_OBJECT_ACCESS_DENIED);
     } else {
-        JSString *str = IdToString(cx, id);
+        RootedValue idVal(cx, IdToValue(id));
+        JSString *str = ValueToSource(cx, idVal);
+        if (!str) {
+            return;
+        }
         AutoStableStringChars chars(cx);
         const char16_t *prop = nullptr;
         if (str->ensureFlat(cx) && chars.initTwoByte(cx, str))
             prop = chars.twoByteChars();
 
-        JS_ReportErrorNumberUC(cx, js_GetErrorMessage, nullptr, JSMSG_PROPERTY_ACCESS_DENIED,
+        JS_ReportErrorNumberUC(cx, GetErrorMessage, nullptr, JSMSG_PROPERTY_ACCESS_DENIED,
                                prop);
     }
 }
@@ -724,15 +728,14 @@
 
 JS_FRIEND_API(JSObject *)
 js::NewProxyObject(JSContext *cx, const BaseProxyHandler *handler, HandleValue priv, JSObject *proto_,
-                   JSObject *parent_, const ProxyOptions &options)
+                   const ProxyOptions &options)
 {
     if (options.lazyProto()) {
         MOZ_ASSERT(!proto_);
         proto_ = TaggedProto::LazyProto;
     }
 
-    return ProxyObject::New(cx, handler, priv, TaggedProto(proto_), parent_,
-                            options);
+    return ProxyObject::New(cx, handler, priv, TaggedProto(proto_), options);
 }
 
 void
@@ -751,7 +754,7 @@
 }
 
 JS_FRIEND_API(JSObject *)
-js_InitProxyClass(JSContext *cx, HandleObject obj)
+js::InitProxyClass(JSContext *cx, HandleObject obj)
 {
     static const JSFunctionSpec static_methods[] = {
         JS_FN("create",         proxy_create,          2, 0),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/ScriptedDirectProxyHandler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -158,8 +158,8 @@
     JSAutoByteString bytes;
     if (!AtomToPrintableString(cx, atom, &bytes))
         return;
-    js_ReportValueError2(cx, JSMSG_INVALID_TRAP_RESULT, JSDVG_IGNORE_STACK, v,
-                         js::NullPtr(), bytes.ptr());
+    ReportValueError2(cx, JSMSG_INVALID_TRAP_RESULT, JSDVG_IGNORE_STACK, v,
+                      js::NullPtr(), bytes.ptr());
 }
 
 // This function is shared between ownPropertyKeys, enumerate, and
@@ -207,7 +207,7 @@
         if (!IsExtensible(cx, target, &extensible))
             return false;
         if (!extensible && !isFixed) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NEW);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NEW);
             return false;
         }
 
@@ -240,7 +240,7 @@
         if (!IsSealed(cx, target, id, &sealed))
             return false;
         if (sealed) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_SKIP_NC);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_SKIP_NC);
             return false;
         }
 
@@ -254,7 +254,7 @@
         if (!IsExtensible(cx, target, &extensible))
             return false;
         if (!extensible && isFixed) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_E_AS_NE);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_E_AS_NE);
             return false;
         }
     }
@@ -272,7 +272,7 @@
     RootedObject target(cx, proxy->as<ProxyObject>().target());
     // Though handler is used elsewhere, spec mandates that both get set to null.
     if (!target) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -285,7 +285,7 @@
 {
     RootedObject target(cx, proxy->as<ProxyObject>().target());
     if (!target) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -300,7 +300,7 @@
 {
     RootedObject target(cx, proxy->as<ProxyObject>().target());
     if (!target) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -315,7 +315,7 @@
     // Steps 1-3.
     RootedObject handler(cx, GetDirectProxyHandlerObject(proxy));
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -348,7 +348,7 @@
         if (!IsExtensible(cx, target, &extensible))
             return false;
         if (extensible) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_AS_NON_EXTENSIBLE);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_AS_NON_EXTENSIBLE);
             return false;
         }
     }
@@ -367,7 +367,7 @@
 
     // step 2
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -401,7 +401,7 @@
 
     // step 12
     if (targetResult != booleanTrapResult) {
-       JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_EXTENSIBILITY);
+       JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_EXTENSIBILITY);
        return false;
     }
 
@@ -442,7 +442,7 @@
 
     // step 3
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -473,7 +473,7 @@
 
     // step 10
     if (!trapResult.isUndefined() && !trapResult.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_GETOWN_OBJORUNDEF);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_GETOWN_OBJORUNDEF);
         return false;
     }
 
@@ -492,7 +492,7 @@
 
         // substep b
         if (targetDesc.isPermanent()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NC_AS_NE);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NC_AS_NE);
             return false;
         }
 
@@ -501,7 +501,7 @@
         if (!IsExtensible(cx, target, &extensibleTarget))
             return false;
         if (!extensibleTarget) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_E_AS_NE);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_E_AS_NE);
             return false;
         }
 
@@ -530,19 +530,19 @@
 
     // step 20
     if (!valid) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_INVALID);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_INVALID);
         return false;
     }
 
     // step 21
     if (!resultDesc.configurable()) {
         if (!targetDesc.object()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NE_AS_NC);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NE_AS_NC);
             return false;
         }
 
         if (!targetDesc.isPermanent()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_C_AS_NC);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_C_AS_NC);
             return false;
         }
     }
@@ -562,7 +562,7 @@
 
     // step 3
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -614,12 +614,12 @@
         if (!targetDesc.object()) {
             // step 20a
             if (!extensibleTarget) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_DEFINE_NEW);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_DEFINE_NEW);
                 return false;
             }
             // step 20b
             if (settingConfigFalse) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_DEFINE_NE_AS_NC);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_DEFINE_NE_AS_NC);
                 return false;
             }
         } else {
@@ -630,7 +630,7 @@
             if (!ValidatePropertyDescriptor(cx, extensibleTarget, pd, targetDesc, &valid))
                 return false;
             if (!valid || (settingConfigFalse && !targetDesc.isPermanent())) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_DEFINE_INVALID);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_DEFINE_INVALID);
                 return false;
             }
         }
@@ -651,7 +651,7 @@
 
     // step 2
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -697,7 +697,7 @@
 
     // step 3
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -735,7 +735,7 @@
         // step 14-15
         if (desc.object() && desc.isPermanent()) {
             RootedValue v(cx, IdToValue(id));
-            js_ReportValueError(cx, JSMSG_CANT_DELETE, JSDVG_IGNORE_STACK, v, js::NullPtr());
+            ReportValueError(cx, JSMSG_CANT_DELETE, JSDVG_IGNORE_STACK, v, js::NullPtr());
             return false;
         }
 
@@ -759,7 +759,7 @@
 
     // step 2
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -804,7 +804,7 @@
 
     // step 3
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -843,7 +843,7 @@
 
         if (desc.object()) {
             if (desc.isPermanent()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NC_AS_NE);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_NC_AS_NE);
                 return false;
             }
 
@@ -851,7 +851,7 @@
             if (!IsExtensible(cx, target, &extensible))
                 return false;
             if (!extensible) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REPORT_E_AS_NE);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REPORT_E_AS_NE);
                 return false;
             }
         }
@@ -872,7 +872,7 @@
 
     // step 3
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -913,14 +913,14 @@
             if (!SameValue(cx, trapResult, desc.value(), &same))
                 return false;
             if (!same) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MUST_REPORT_SAME_VALUE);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MUST_REPORT_SAME_VALUE);
                 return false;
             }
         }
 
         if (IsAccessorDescriptor(desc) && desc.isPermanent() && !desc.hasGetterObject()) {
             if (!trapResult.isUndefined()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MUST_REPORT_UNDEFINED);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MUST_REPORT_UNDEFINED);
                 return false;
             }
         }
@@ -941,7 +941,7 @@
 
     // step 3
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -987,13 +987,13 @@
                 if (!SameValue(cx, vp, desc.value(), &same))
                     return false;
                 if (!same) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_SET_NW_NC);
+                    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_SET_NW_NC);
                     return false;
                 }
             }
 
             if (IsAccessorDescriptor(desc) && desc.isPermanent() && !desc.hasSetterObject()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_SET_WO_SETTER);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_SET_WO_SETTER);
                 return false;
             }
         }
@@ -1014,7 +1014,7 @@
 
     // step 2
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -1055,7 +1055,7 @@
 
     // step 2
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -1088,7 +1088,7 @@
 
     // step 10
     if (!args.rval().isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_CONSTRUCT_OBJECT);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_CONSTRUCT_OBJECT);
         return false;
     }
     return true;
@@ -1108,7 +1108,7 @@
 {
     RootedObject handler(cx, GetDirectProxyHandlerObject(proxy));
     if (!handler) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_PROXY_REVOKED);
         return false;
     }
 
@@ -1149,7 +1149,7 @@
 ScriptedDirectProxyHandler::fun_toString(JSContext *cx, HandleObject proxy,
                                          unsigned indent) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                          js_Function_str, js_toString_str, "object");
     return nullptr;
 }
@@ -1193,7 +1193,7 @@
 NewScriptedProxy(JSContext *cx, CallArgs &args, const char *callerName)
 {
     if (args.length() < 2) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              callerName, "1", "s");
         return false;
     }
@@ -1206,7 +1206,7 @@
     RootedValue priv(cx, ObjectValue(*target));
     JSObject *proxy_ =
         NewProxyObject(cx, &ScriptedDirectProxyHandler::singleton,
-                       priv, TaggedProto::LazyProto, cx->global());
+                       priv, TaggedProto::LazyProto);
     if (!proxy_)
         return false;
     Rooted<ProxyObject*> proxy(cx, &proxy_->as<ProxyObject>());
@@ -1227,7 +1227,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (!args.isConstructing()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_FUNCTION, "Proxy");
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_FUNCTION, "Proxy");
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/ScriptedIndirectProxyHandler.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -154,8 +154,8 @@
         JSAutoByteString bytes;
         if (AtomToPrintableString(cx, atom, &bytes)) {
             RootedValue val(cx, ObjectOrNullValue(proxy));
-            js_ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
-                                 JSDVG_SEARCH_STACK, val, js::NullPtr(), bytes.ptr());
+            ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
+                              JSDVG_SEARCH_STACK, val, js::NullPtr(), bytes.ptr());
         }
         return false;
     }
@@ -358,7 +358,7 @@
 {
     assertEnteredPolicy(cx, proxy, JSID_VOID, GET);
     if (!proxy->isCallable()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_INCOMPATIBLE_PROTO,
                              js_Function_str, js_toString_str,
                              "object");
@@ -399,26 +399,23 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "create", "0", "s");
         return false;
     }
     JSObject *handler = NonNullObject(cx, args[0]);
     if (!handler)
         return false;
-    JSObject *proto, *parent = nullptr;
+    JSObject *proto;
     if (args.get(1).isObject()) {
         proto = &args[1].toObject();
-        parent = proto->getParent();
     } else {
         MOZ_ASSERT(IsFunctionObject(&args.callee()));
         proto = nullptr;
     }
-    if (!parent)
-        parent = args.callee().getParent();
     RootedValue priv(cx, ObjectValue(*handler));
     JSObject *proxy = NewProxyObject(cx, &ScriptedIndirectProxyHandler::singleton,
-                                     priv, proto, parent);
+                                     priv, proto);
     if (!proxy)
         return false;
 
@@ -431,19 +428,16 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() < 2) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "createFunction", "1", "");
         return false;
     }
     RootedObject handler(cx, NonNullObject(cx, args[0]));
     if (!handler)
         return false;
-    RootedObject proto(cx), parent(cx);
-    parent = args.callee().getParent();
-    proto = parent->global().getOrCreateFunctionPrototype(cx);
+    RootedObject proto(cx, args.callee().global().getOrCreateFunctionPrototype(cx));
     if (!proto)
         return false;
-    parent = proto->getParent();
 
     RootedObject call(cx, ValueToCallable(cx, args[1], args.length() - 2));
     if (!call)
@@ -460,7 +454,7 @@
     // Stash the call and construct traps on a holder object that we can stick
     // in a slot on the proxy.
     RootedObject ccHolder(cx, JS_NewObjectWithGivenProto(cx, Jsvalify(&CallConstructHolder),
-                                                         js::NullPtr(), cx->global()));
+                                                         js::NullPtr()));
     if (!ccHolder)
         return false;
     ccHolder->as<NativeObject>().setReservedSlot(0, ObjectValue(*call));
@@ -469,7 +463,7 @@
     RootedValue priv(cx, ObjectValue(*handler));
     JSObject *proxy =
         NewProxyObject(cx, &CallableScriptedIndirectProxyHandler::singleton,
-                       priv, proto, parent);
+                       priv, proto);
     if (!proxy)
         return false;
     proxy->as<ProxyObject>().setExtra(0, ObjectValue(*ccHolder));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/SecurityWrapper.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/SecurityWrapper.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/SecurityWrapper.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/SecurityWrapper.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -16,7 +16,7 @@
 SecurityWrapper<Base>::enter(JSContext *cx, HandleObject wrapper, HandleId id,
                              Wrapper::Action act, bool *bp) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
     *bp = false;
     return false;
 }
@@ -26,7 +26,7 @@
 SecurityWrapper<Base>::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl,
                                   CallArgs args) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
     return false;
 }
 
@@ -35,7 +35,7 @@
 SecurityWrapper<Base>::setPrototypeOf(JSContext *cx, HandleObject wrapper,
                                       HandleObject proto, bool *bp) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
     return false;
 }
 
@@ -44,7 +44,7 @@
 SecurityWrapper<Base>::setImmutablePrototype(JSContext *cx, HandleObject wrapper,
                                              bool *succeeded) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
     return false;
 }
 
@@ -108,12 +108,15 @@
                                       HandleId id, MutableHandle<PropertyDescriptor> desc) const
 {
     if (desc.getter() || desc.setter()) {
-        JSString *str = IdToString(cx, id);
+        RootedValue idVal(cx, IdToValue(id));
+        JSString *str = ValueToSource(cx, idVal);
+        if (!str)
+            return false;
         AutoStableStringChars chars(cx);
         const char16_t *prop = nullptr;
         if (str->ensureFlat(cx) && chars.initTwoByte(cx, str))
             prop = chars.twoByteChars();
-        JS_ReportErrorNumberUC(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumberUC(cx, GetErrorMessage, nullptr,
                                JSMSG_ACCESSOR_DEF_DENIED, prop);
         return false;
     }
@@ -126,7 +129,7 @@
 SecurityWrapper<Base>::watch(JSContext *cx, HandleObject proxy,
                              HandleId id, HandleObject callable) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
     return false;
 }
 
@@ -135,7 +138,7 @@
 SecurityWrapper<Base>::unwatch(JSContext *cx, HandleObject proxy,
                                HandleId id) const
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
     return false;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/Wrapper.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/Wrapper.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/proxy/Wrapper.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/proxy/Wrapper.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -33,13 +33,11 @@
 }
 
 JSObject *
-Wrapper::New(JSContext *cx, JSObject *obj, JSObject *parent, const Wrapper *handler,
+Wrapper::New(JSContext *cx, JSObject *obj, const Wrapper *handler,
              const WrapperOptions &options)
 {
-    MOZ_ASSERT(parent);
-
     RootedValue priv(cx, ObjectValue(*obj));
-    return NewProxyObject(cx, handler, priv, options.proto(), parent, options);
+    return NewProxyObject(cx, handler, priv, options.proto(), options);
 }
 
 JSObject *
@@ -127,12 +125,11 @@
 /* Compartments. */
 
 extern JSObject *
-js::TransparentObjectWrapper(JSContext *cx, HandleObject existing, HandleObject obj,
-                             HandleObject parent)
+js::TransparentObjectWrapper(JSContext *cx, HandleObject existing, HandleObject obj)
 {
     // Allow wrapping outer window proxies.
     MOZ_ASSERT(!obj->is<WrapperObject>() || obj->getClass()->ext.innerObject);
-    return Wrapper::New(cx, obj, parent, &CrossCompartmentWrapper::singleton);
+    return Wrapper::New(cx, obj, &CrossCompartmentWrapper::singleton);
 }
 
 ErrorCopier::~ErrorCopier()
@@ -144,7 +141,7 @@
             cx->clearPendingException();
             ac.reset();
             Rooted<ErrorObject*> errObj(cx, &exc.toObject().as<ErrorObject>());
-            JSObject *copyobj = js_CopyErrorObject(cx, errObj);
+            JSObject *copyobj = CopyErrorObject(cx, errObj);
             if (copyobj)
                 cx->setPendingException(ObjectValue(*copyobj));
         }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/shell/js.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/shell/js.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/shell/js.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/shell/js.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -60,9 +60,12 @@
 #include "frontend/Parser.h"
 #include "jit/arm/Simulator-arm.h"
 #include "jit/Ion.h"
+#include "jit/JitcodeMap.h"
+#include "jit/OptimizationTracking.h"
 #include "js/Debug.h"
 #include "js/GCAPI.h"
 #include "js/StructuredClone.h"
+#include "js/TrackedOptimizationInfo.h"
 #include "perf/jsperf.h"
 #include "shell/jsheaptools.h"
 #include "shell/jsoptparse.h"
@@ -72,6 +75,7 @@
 #include "vm/HelperThreads.h"
 #include "vm/Monitor.h"
 #include "vm/Shape.h"
+#include "vm/SharedArrayObject.h"
 #include "vm/TypedArrayObject.h"
 #include "vm/WrapperObject.h"
 
@@ -132,6 +136,15 @@
 static JS::PersistentRootedValue gInterruptFunc;
 
 static bool enableDisassemblyDumps = false;
+static bool offthreadCompilation = false;
+static bool enableBaseline = false;
+static bool enableIon = false;
+static bool enableAsmJS = false;
+static bool enableNativeRegExp = false;
+static bool enableUnboxedObjects = false;
+#ifdef JS_GC_ZEAL
+static char gZealStr[128];
+#endif
 
 static bool printTiming = false;
 static const char *jsCacheDir = nullptr;
@@ -729,7 +742,7 @@
             return false;
         sizeGiven = true;
         if (offset > size) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_ARG_INDEX_OUT_OF_RANGE, "2");
             return false;
         }
@@ -750,7 +763,7 @@
             return false;
         }
         if (st.st_size < off_t(offset)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_ARG_INDEX_OUT_OF_RANGE, "2");
             return false;
         }
@@ -1197,7 +1210,7 @@
                     return false;
             }
             if (!global || !(JS_GetClass(global)->flags & JSCLASS_IS_GLOBAL)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                                      "\"global\" passed to evaluate()", "not a global object");
                 return false;
             }
@@ -1997,7 +2010,7 @@
     if (!ToUint32(cx, args.get(lineArg), &lineno))
          return false;
 
-    jsbytecode *pc = js_LineNumberToPC(script, lineno);
+    jsbytecode *pc = LineNumberToPC(script, lineno);
     if (!pc)
         return false;
     args.rval().setInt32(script->pcToOffset(pc));
@@ -2225,7 +2238,7 @@
         Sprint(sp, "\n");
     }
 
-    if (!js_Disassemble(cx, script, lines, sp))
+    if (!Disassemble(cx, script, lines, sp))
         return false;
     SrcNotes(cx, script, sp);
     TryNotes(cx, script, sp);
@@ -2295,7 +2308,7 @@
         RootedScript script(cx, GetTopScript(cx));
         if (script) {
             JSAutoCompartment ac(cx, script);
-            if (!js_Disassemble(cx, script, p.lines, sprinter))
+            if (!Disassemble(cx, script, p.lines, sprinter))
                 return false;
             SrcNotes(cx, script, sprinter);
             TryNotes(cx, script, sprinter);
@@ -2477,7 +2490,7 @@
                 }
             }
 
-            len = js_Disassemble1(cx, script, pc, script->pcToOffset(pc), true, &sprinter);
+            len = Disassemble1(cx, script, pc, script->pcToOffset(pc), true, &sprinter);
             if (!len) {
                 ok = false;
                 goto bail;
@@ -2560,7 +2573,7 @@
     if (funobj->compartment() != cx->compartment()) {
         JSFunction *fun = &funobj->as<JSFunction>();
         if (fun->hasScript() && fun->nonLazyScript()->compileAndGo()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                                  "function", "compile-and-go");
             return false;
         }
@@ -2594,7 +2607,7 @@
     script = ValueToScript(cx, args.get(0));
     if (!script)
         return false;
-    args.rval().setInt32(js_GetScriptLineExtent(script));
+    args.rval().setInt32(GetScriptLineExtent(script));
     return true;
 }
 
@@ -2769,6 +2782,8 @@
     }
 };
 
+static void SetWorkerRuntimeOptions(JSRuntime *rt);
+
 static void
 WorkerMain(void *arg)
 {
@@ -2780,6 +2795,7 @@
         return;
     }
     JS_SetErrorReporter(rt, my_ErrorReporter);
+    SetWorkerRuntimeOptions(rt);
 
     JSContext *cx = NewContext(rt);
     if (!cx) {
@@ -3241,7 +3257,7 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "compile", "0", "s");
         return false;
     }
@@ -3281,7 +3297,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "parse", "0", "s");
         return false;
     }
@@ -3330,7 +3346,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "parse", "0", "s");
         return false;
     }
@@ -3469,7 +3485,7 @@
     CallArgs args = CallArgsFromVp(argc, vp);
 
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "offThreadCompileScript", "0", "s");
         return false;
     }
@@ -3952,7 +3968,7 @@
 
     WrapperOptions options(cx);
     options.setProto(proto.toObjectOrNull());
-    JSObject *wrapped = Wrapper::New(cx, &obj.toObject(), &obj.toObject().global(),
+    JSObject *wrapped = Wrapper::New(cx, &obj.toObject(),
                                      &Wrapper::singletonWithPrototype, options);
     if (!wrapped)
         return false;
@@ -4252,6 +4268,260 @@
     return true;
 }
 
+// Global mailbox that is used to communicate a SharedArrayBuffer
+// value from one worker to another.
+//
+// For simplicity we store only the SharedArrayRawBuffer; retaining
+// the SAB object would require per-runtime storage, and would have no
+// real benefits.
+//
+// Invariant: when a SARB is in the mailbox its reference count is at
+// least 1, accounting for the reference from the mailbox.
+//
+// The lock guards the mailbox variable and prevents a race where two
+// workers try to set the mailbox at the same time to replace a SARB
+// that is only referenced from the mailbox: the workers will both
+// decrement the reference count on the old SARB, and one of those
+// decrements will be on a garbage object.  We could implement this
+// with atomics and a CAS loop but it's not worth the bother.
+
+static PRLock *sharedArrayBufferMailboxLock;
+static SharedArrayRawBuffer *sharedArrayBufferMailbox;
+
+static bool
+InitSharedArrayBufferMailbox()
+{
+    sharedArrayBufferMailboxLock = PR_NewLock();
+    return sharedArrayBufferMailboxLock != nullptr;
+}
+
+static void
+DestructSharedArrayBufferMailbox()
+{
+    // All workers need to have terminated at this point.
+    if (sharedArrayBufferMailbox)
+        sharedArrayBufferMailbox->dropReference();
+    PR_DestroyLock(sharedArrayBufferMailboxLock);
+}
+
+static bool
+GetSharedArrayBuffer(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    JSObject *newObj = nullptr;
+    bool rval = true;
+
+    PR_Lock(sharedArrayBufferMailboxLock);
+    SharedArrayRawBuffer *buf = sharedArrayBufferMailbox;
+    if (buf) {
+        buf->addReference();
+        newObj = SharedArrayBufferObject::New(cx, buf);
+        if (!newObj) {
+            buf->dropReference();
+            rval = false;
+        }
+    }
+    PR_Unlock(sharedArrayBufferMailboxLock);
+
+    args.rval().setObjectOrNull(newObj);
+    return rval;
+}
+
+static bool
+SetSharedArrayBuffer(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    SharedArrayRawBuffer *newBuffer = nullptr;
+
+    if (argc == 0 || args.get(0).isNullOrUndefined()) {
+        // Clear out the mailbox
+    }
+    else if (args.get(0).isObject() && args[0].toObject().is<SharedArrayBufferObject>()) {
+        newBuffer = args[0].toObject().as<SharedArrayBufferObject>().rawBufferObject();
+        newBuffer->addReference();
+    } else {
+        JS_ReportError(cx, "Only a SharedArrayBuffer can be installed in the global mailbox");
+        return false;
+    }
+
+    PR_Lock(sharedArrayBufferMailboxLock);
+    SharedArrayRawBuffer *oldBuffer = sharedArrayBufferMailbox;
+    if (oldBuffer)
+        oldBuffer->dropReference();
+    sharedArrayBufferMailbox = newBuffer;
+    PR_Unlock(sharedArrayBufferMailboxLock);
+
+    args.rval().setUndefined();
+    return true;
+}
+
+class SprintOptimizationTypeInfoOp : public ForEachTrackedOptimizationTypeInfoOp
+{
+    Sprinter *sp;
+    bool startedTypes_;
+
+  public:
+    explicit SprintOptimizationTypeInfoOp(Sprinter *sp)
+      : sp(sp),
+        startedTypes_(false)
+    { }
+
+    void readType(const char *keyedBy, const char *name,
+                  const char *location, unsigned lineno) MOZ_OVERRIDE
+    {
+        if (!startedTypes_) {
+            startedTypes_ = true;
+            Sprint(sp, "{\"typeset\": [");
+        }
+        Sprint(sp, "{\"keyedBy\":\"%s\"", keyedBy);
+        if (name)
+            Sprint(sp, ",\"name\":\"%s\"", name);
+        if (location) {
+            char buf[512];
+            PutEscapedString(buf, mozilla::ArrayLength(buf), location, strlen(location), '"');
+            Sprint(sp, ",\"location\":%s", buf);
+        }
+        if (lineno != UINT32_MAX)
+            Sprint(sp, ",\"line\":%u", lineno);
+        Sprint(sp, "},");
+    }
+
+    void operator()(TrackedTypeSite site, const char *mirType) MOZ_OVERRIDE {
+        if (startedTypes_) {
+            // Clear trailing ,
+            if ((*sp)[sp->getOffset() - 1] == ',')
+                (*sp)[sp->getOffset() - 1] = ' ';
+            Sprint(sp, "],");
+            startedTypes_ = false;
+        } else {
+            Sprint(sp, "{");
+        }
+
+        Sprint(sp, "\"site\":\"%s\",\"mirType\":\"%s\"},",
+               TrackedTypeSiteString(site), mirType);
+    }
+};
+
+class SprintOptimizationAttemptsOp : public ForEachTrackedOptimizationAttemptOp
+{
+    Sprinter *sp;
+
+  public:
+    explicit SprintOptimizationAttemptsOp(Sprinter *sp)
+      : sp(sp)
+    { }
+
+    void operator()(TrackedStrategy strategy, TrackedOutcome outcome) MOZ_OVERRIDE {
+        Sprint(sp, "{\"strategy\":\"%s\",\"outcome\":\"%s\"},",
+               TrackedStrategyString(strategy), TrackedOutcomeString(outcome));
+    }
+};
+
+static bool
+ReflectTrackedOptimizations(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    RootedObject callee(cx, &args.callee());
+    JSRuntime *rt = cx->runtime();
+
+    if (!rt->hasJitRuntime() || !rt->jitRuntime()->isOptimizationTrackingEnabled(rt)) {
+        JS_ReportError(cx, "Optimization tracking is off.");
+        return false;
+    }
+
+    if (args.length() != 1) {
+        ReportUsageError(cx, callee, "Wrong number of arguments");
+        return false;
+    }
+
+    if (!args[0].isObject() || !args[0].toObject().is<JSFunction>()) {
+        ReportUsageError(cx, callee, "Argument must be a function");
+        return false;
+    }
+
+    RootedFunction fun(cx, &args[0].toObject().as<JSFunction>());
+    if (!fun->hasScript() || !fun->nonLazyScript()->hasIonScript()) {
+        args.rval().setNull();
+        return true;
+    }
+
+    jit::JitcodeGlobalTable *table = rt->jitRuntime()->getJitcodeGlobalTable();
+    jit::JitcodeGlobalEntry entry;
+    jit::IonScript *ion = fun->nonLazyScript()->ionScript();
+    table->lookupInfallible(ion->method()->raw(), &entry, rt);
+
+    if (!entry.hasTrackedOptimizations()) {
+        JSObject *obj = JS_NewPlainObject(cx);
+        if (!obj)
+            return false;
+        args.rval().setObject(*obj);
+        return true;
+    }
+
+    Sprinter sp(cx);
+    if (!sp.init())
+        return false;
+
+    const jit::IonTrackedOptimizationsRegionTable *regions =
+        entry.ionEntry().trackedOptimizationsRegionTable();
+
+    Sprint(&sp, "{\"regions\": [");
+    for (uint32_t i = 0; i < regions->numEntries(); i++) {
+        jit::IonTrackedOptimizationsRegion region = regions->entry(i);
+        jit::IonTrackedOptimizationsRegion::RangeIterator iter = region.ranges();
+        while (iter.more()) {
+            uint32_t startOffset, endOffset;
+            uint8_t index;
+            iter.readNext(&startOffset, &endOffset, &index);
+            JSScript *script;
+            jsbytecode *pc;
+            // Use endOffset, as startOffset may be associated with a
+            // previous, adjacent region ending exactly at startOffset. That
+            // is, suppose we have two regions [0, startOffset], [startOffset,
+            // endOffset]. Since we are not querying a return address, we want
+            // the second region and not the first.
+            uint8_t *addr = ion->method()->raw() + endOffset;
+            entry.youngestFrameLocationAtAddr(rt, addr, &script, &pc);
+            Sprint(&sp, "{\"location\":\"%s:%u\",\"offset\":%u,\"index\":%u}%s",
+                   script->filename(), script->lineno(), script->pcToOffset(pc), index,
+                   iter.more() ? "," : "");
+        }
+    }
+    Sprint(&sp, "],");
+
+    Sprint(&sp, "\"opts\": [");
+    for (uint8_t i = 0; i < entry.ionEntry().numOptimizationAttempts(); i++) {
+        Sprint(&sp, "%s{\"typeinfo\":[", i == 0 ? "" : ",");
+        SprintOptimizationTypeInfoOp top(&sp);
+        jit::IonTrackedOptimizationsTypeInfo::ForEachOpAdapter adapter(top);
+        entry.trackedOptimizationTypeInfo(i).forEach(adapter, entry.allTrackedTypes());
+        // Clear the trailing ,
+        if (sp[sp.getOffset() - 1] == ',')
+            sp[sp.getOffset() - 1] = ' ';
+        Sprint(&sp, "],\"attempts\":[");
+        SprintOptimizationAttemptsOp aop(&sp);
+        entry.trackedOptimizationAttempts(i).forEach(aop);
+        // Clear the trailing ,
+        if (sp[sp.getOffset() - 1] == ',')
+            sp[sp.getOffset() - 1] = ' ';
+        Sprint(&sp, "]}");
+    }
+    Sprint(&sp, "]}");
+
+    if (sp.hadOutOfMemory())
+        return false;
+
+    RootedString str(cx, JS_NewStringCopyZ(cx, sp.string()));
+    if (!str)
+        return false;
+    RootedValue jsonVal(cx);
+    if (!JS_ParseJSON(cx, str, &jsonVal))
+        return false;
+
+    args.rval().set(jsonVal);
+    return true;
+}
+
 static const JSFunctionSpecWithHelp shell_functions[] = {
     JS_FN_HELP("version", Version, 0, 0,
 "version([number])",
@@ -4445,12 +4715,24 @@
 "evalInWorker(str)",
 "  Evaluate 'str' in a separate thread with its own runtime.\n"),
 
+    JS_FN_HELP("getSharedArrayBuffer", GetSharedArrayBuffer, 0, 0,
+"getSharedArrayBuffer()",
+"  Retrieve the SharedArrayBuffer object from the cross-worker mailbox.\n"
+"  The object retrieved may not be identical to the object that was\n"
+"  installed, but it references the same shared memory.\n"
+"  getSharedArrayBuffer performs an ordering memory barrier.\n"),
+
+    JS_FN_HELP("setSharedArrayBuffer", SetSharedArrayBuffer, 0, 0,
+"setSharedArrayBuffer()",
+"  Install the SharedArrayBuffer object in the cross-worker mailbox.\n"
+"  setSharedArrayBuffer performs an ordering memory barrier.\n"),
+
     JS_FN_HELP("shapeOf", ShapeOf, 1, 0,
 "shapeOf(obj)",
 "  Get the shape of obj (an implementation detail)."),
 
 #ifdef DEBUG
-    JS_FN_HELP("arrayInfo", js_ArrayInfo, 1, 0,
+    JS_FN_HELP("arrayInfo", ArrayInfo, 1, 0,
 "arrayInfo(a1, a2, ...)",
 "  Report statistics about arrays."),
 #endif
@@ -4684,6 +4966,12 @@
 "  Note: This is not fuzzing safe because it can be used to construct\n"
 "        deeply nested wrapper chains that cannot exist in the wild."),
 
+    JS_FN_HELP("trackedOpts", ReflectTrackedOptimizations, 1, 0,
+"trackedOpts(fun)",
+"  Returns an object describing the tracked optimizations of |fun|, if\n"
+"  any. If |fun| is not a scripted function or has not been compiled by\n"
+"  Ion, null is returned."),
+
     JS_FS_HELP_END
 };
 
@@ -5077,12 +5365,12 @@
         return false;
 
     if (!protov.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_PROTOTYPE, "FakeDOMObject");
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_PROTOTYPE, "FakeDOMObject");
         return false;
     }
 
     RootedObject proto(cx, &protov.toObject());
-    RootedObject domObj(cx, JS_NewObjectWithGivenProto(cx, &dom_class, proto, JS::NullPtr()));
+    RootedObject domObj(cx, JS_NewObjectWithGivenProto(cx, &dom_class, proto));
     if (!domObj)
         return false;
 
@@ -5515,11 +5803,11 @@
 static bool
 SetRuntimeOptions(JSRuntime *rt, const OptionParser &op)
 {
-    bool enableBaseline = !op.getBoolOption("no-baseline");
-    bool enableIon = !op.getBoolOption("no-ion");
-    bool enableAsmJS = !op.getBoolOption("no-asmjs");
-    bool enableNativeRegExp = !op.getBoolOption("no-native-regexp");
-    bool enableUnboxedObjects = op.getBoolOption("unboxed-objects");
+    enableBaseline = !op.getBoolOption("no-baseline");
+    enableIon = !op.getBoolOption("no-ion");
+    enableAsmJS = !op.getBoolOption("no-asmjs");
+    enableNativeRegExp = !op.getBoolOption("no-native-regexp");
+    enableUnboxedObjects = op.getBoolOption("unboxed-objects");
 
     JS::RuntimeOptionsRef(rt).setBaseline(enableBaseline)
                              .setIon(enableIon)
@@ -5644,7 +5932,7 @@
     if (op.getBoolOption("ion-eager"))
         jit::js_JitOptions.setEagerCompilation();
 
-    bool offthreadCompilation = true;
+    offthreadCompilation = true;
     if (const char *str = op.getStringOption("ion-offthread-compile")) {
         if (strcmp(str, "off") == 0)
             offthreadCompilation = false;
@@ -5707,13 +5995,36 @@
 
 #ifdef JS_GC_ZEAL
     const char *zealStr = op.getStringOption("gc-zeal");
-    if (zealStr && !rt->gc.parseAndSetZeal(zealStr))
-        return false;
+    gZealStr[0] = 0;
+    if (zealStr) {
+        if (!rt->gc.parseAndSetZeal(zealStr))
+            return false;
+        strncpy(gZealStr, zealStr, sizeof(gZealStr));
+        gZealStr[sizeof(gZealStr)-1] = 0;
+    }
 #endif
 
     return true;
 }
 
+static void
+SetWorkerRuntimeOptions(JSRuntime *rt)
+{
+    // Copy option values from the main thread.
+    JS::RuntimeOptionsRef(rt).setBaseline(enableBaseline)
+                             .setIon(enableIon)
+                             .setAsmJS(enableAsmJS)
+                             .setNativeRegExp(enableNativeRegExp)
+                             .setUnboxedObjects(enableUnboxedObjects);
+    rt->setOffthreadIonCompilationEnabled(offthreadCompilation);
+    rt->profilingScripts = enableDisassemblyDumps;
+
+#ifdef JS_GC_ZEAL
+    if (*gZealStr)
+        rt->gc.parseAndSetZeal(gZealStr);
+#endif
+}
+
 static int
 Shell(JSContext *cx, OptionParser *op, char **envp)
 {
@@ -6014,6 +6325,9 @@
     if (!JS_Init())
         return 1;
 
+    if (!InitSharedArrayBufferMailbox())
+        return 1;
+
     // The fake thread count must be set before initializing the Runtime,
     // which spins up the thread pool.
     int32_t threadCount = op.getIntOption("thread-count");
@@ -6097,6 +6411,8 @@
     for (size_t i = 0; i < workerThreads.length(); i++)
         PR_JoinThread(workerThreads[i]);
 
+    DestructSharedArrayBufferMailbox();
+
     JS_DestroyRuntime(rt);
     JS_ShutDown();
     return result;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/shell/jsheaptools.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/shell/jsheaptools.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/shell/jsheaptools.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/shell/jsheaptools.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -546,14 +546,14 @@
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_MORE_ARGS_NEEDED,
                              "findReferences", "0", "s");
         return false;
     }
 
     RootedValue target(cx, args[0]);
     if (!target.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              "argument", "not an object");
         return false;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/shell/OSObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/shell/OSObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/shell/OSObject.cpp	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/shell/OSObject.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -164,16 +164,16 @@
         return false;
 
     int32_t childPid = fork();
-    if (childPid) {
-        args.rval().setInt32(childPid);
-        return true;
-    }
-
     if (childPid == -1) {
         ReportSysError(cx, "fork failed");
         return false;
     }
 
+    if (childPid) {
+        args.rval().setInt32(childPid);
+        return true;
+    }
+
     // We are in the child
 
     const char *cmd[] = {"sh", "-c", nullptr, nullptr};
@@ -208,8 +208,11 @@
     }
 
     int status = kill(pid, signal);
-    if (status == -1)
+    if (status == -1) {
         ReportSysError(cx, "kill failed");
+        return false;
+    }
+
     args.rval().setUndefined();
     return true;
 }
@@ -231,7 +234,7 @@
     if (args.length() >= 2)
         nohang = JS::ToBoolean(args[1]);
 
-    int status;
+    int status = 0;
     pid_t result = waitpid(pid, &status, nohang ? WNOHANG : 0);
     if (result == -1) {
         ReportSysError(cx, "os.waitpid failed");
@@ -247,11 +250,11 @@
         v.setInt32(result);
         if (!JS_DefineProperty(cx, info, "pid", v, JSPROP_ENUMERATE))
             return false;
-    }
-    if (WIFEXITED(status)) {
-        v.setInt32(WEXITSTATUS(status));
-        if (!JS_DefineProperty(cx, info, "exitStatus", v, JSPROP_ENUMERATE))
-            return false;
+        if (WIFEXITED(status)) {
+            v.setInt32(WEXITSTATUS(status));
+            if (!JS_DefineProperty(cx, info, "exitStatus", v, JSPROP_ENUMERATE))
+                return false;
+        }
     }
 
     args.rval().setObject(*info);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/browser.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/browser.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/browser.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/browser.js	2015-02-28 15:03:06.000000000 +0000
@@ -332,6 +332,10 @@
     {
       properties.version = '1.8';
     }
+    else if (properties.test.match(/^ecma_6\/Class/))
+    {
+      properties.version = '1.8';
+    }
   }
 
   // default to language=type;text/javascript. required for
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_5/extensions/misplaced-inconsistent-directive.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_5/extensions/misplaced-inconsistent-directive.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_5/extensions/misplaced-inconsistent-directive.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_5/extensions/misplaced-inconsistent-directive.js	2015-02-28 15:03:06.000000000 +0000
@@ -46,16 +46,19 @@
 expectSyntaxError("function f1() {} 'use strict'; function f2() {}");
 expectSyntaxError("function f3() { var x; 'use strict'; }");
 
-expectSyntaxError("function f4() {} 'use asm'; function f5() {}");
+if (isAsmJSCompilationAvailable())
+  expectSyntaxError("function f4() {} 'use asm'; function f5() {}");
 expectSyntaxError("function f6() { var x; 'use strict'; }");
-expectSyntaxError("'use asm'; function f7() {}");
+if (isAsmJSCompilationAvailable())
+  expectSyntaxError("'use asm'; function f7() {}");
 
 // No errors expected -- useless non-directives, but not contrary to used
 // semantics.
 evaluateNoRval("'use strict'; function f8() {} 'use strict'; function f9() {}");
 evaluateNoRval("'use strict'; function f10() { var z; 'use strict' }");
 
-evaluateNoRval("function f11() { 'use asm'; return {}; }");
+if (isAsmJSCompilationAvailable())
+  evaluateNoRval("function f11() { 'use asm'; return {}; }");
 
 /******************************************************************************/
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_5/Object/object-create-with-primitive-second-arg.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_5/Object/object-create-with-primitive-second-arg.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_5/Object/object-create-with-primitive-second-arg.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_5/Object/object-create-with-primitive-second-arg.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,8 @@
+[1, "", true, Symbol(), undefined].forEach(props => {
+    assertEq(Object.getPrototypeOf(Object.create(null, props)), null);
+});
+
+assertThrowsInstanceOf(() => Object.create(null, null), TypeError);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/classPrototype.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/classPrototype.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/classPrototype.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/classPrototype.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,61 @@
+var test = `
+
+// The prototype of a class is a non-writable, non-configurable, non-enumerable data property.
+class a { constructor() { } }
+var protoDesc = Object.getOwnPropertyDescriptor(a, "prototype");
+assertEq(protoDesc.writable, false);
+assertEq(protoDesc.configurable, false);
+assertEq(protoDesc.enumerable, false);
+
+var prototype = protoDesc.value;
+assertEq(typeof prototype, "object");
+assertEq(Object.getPrototypeOf(prototype), Object.prototype);
+assertEq(Object.isExtensible(prototype), true);
+
+var desiredPrototype = {};
+Object.defineProperty(desiredPrototype, "constructor", { writable: true,
+                                                         configurable: true,
+                                                         enumerable: false,
+                                                         value: a });
+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.
+assertThrowsInstanceOf(() => eval(\`
+                                  class a {
+                                    constructor() { };
+                                    static ["prototype"]() { }
+                                  }
+                                  \`), TypeError);
+assertThrowsInstanceOf(() => eval(\`
+                                  class a {
+                                    constructor() { };
+                                    static get ["prototype"]() { }
+                                  }
+                                  \`), TypeError);
+assertThrowsInstanceOf(() => eval(\`
+                                  class a {
+                                    constructor() { };
+                                    static set ["prototype"](x) { }
+                                  }
+                                  \`), TypeError);
+*/
+}
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/compPropNames.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/compPropNames.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/compPropNames.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/compPropNames.js	2015-02-28 15:03:06.000000000 +0000
@@ -95,12 +95,10 @@
 assertEq(a.x, 2);
 
 // Symbols
-if (typeof Symbol === "function") {
-    var unique_sym = Symbol("1"), registered_sym = Symbol.for("2");
-    a = { [unique_sym] : 2, [registered_sym] : 3 };
-    assertEq(a[unique_sym], 2);
-    assertEq(a[registered_sym], 3);
-}
+var unique_sym = Symbol("1"), registered_sym = Symbol.for("2");
+a = { [unique_sym] : 2, [registered_sym] : 3 };
+assertEq(a[unique_sym], 2);
+assertEq(a[registered_sym], 3);
 
 // Same expression can be run several times to build objects with different property names.
 a = [];
@@ -215,13 +213,11 @@
 assertThrowsValue(() => { a.hey = 5; }, 2);
 
 // Symbols with duplicate get and set.
-if (typeof Symbol === "function") {
-    expr = Symbol("hey");
-    a = {get [expr]() { return 3; }, set[expr](v) { throw 2; },
-         set [expr] (w) { throw 4; }, get[expr](){return 5; }};
-    assertEq(a[expr], 5);
-    assertThrowsValue(() => { a[expr] = 7; }, 4);
-}
+expr = Symbol("hey");
+a = {get [expr]() { return 3; }, set[expr](v) { throw 2; },
+     set [expr] (w) { throw 4; }, get[expr](){return 5; }};
+assertEq(a[expr], 5);
+assertThrowsValue(() => { a[expr] = 7; }, 4);
 
 // expressions with side effects are called in the right order
 log = "";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/constructorCalled.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/constructorCalled.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/constructorCalled.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/constructorCalled.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,31 @@
+// The constructor specified should get called, regardless of order, or
+// other distractions
+
+var test = `
+
+var called = false;
+class a { constructor(x) { assertEq(x, 4); called = true } }
+new a(4);
+assertEq(called, true);
+
+called = false;
+class b { constructor() { called = true } method() { } }
+new b();
+assertEq(called, true);
+
+called = false;
+class c { method() { } constructor() { called = true; } }
+new c();
+assertEq(called, true);
+
+called = false;
+class d { [\"constructor\"]() { throw new Error(\"NO\"); } constructor() { called = true; } }
+new d();
+assertEq(called, true);
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/innerBinding.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/innerBinding.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/innerBinding.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/innerBinding.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,78 @@
+// Class statements should create an immutable inner binding. Since all code in
+// classes is in strict mode, attempts to mutate it should throw.
+
+if (classesEnabled()) {
+
+// XXXefaust Because we currently try to do assignment to const as an early error,
+// this is a syntax error. It is specced to be a TypeError
+
+function syntaxWrapper() {
+    eval("class Foo { constructor() { } tryBreak() { Foo = 4; } }");
+}
+assertThrowsInstanceOf(syntaxWrapper, SyntaxError);
+/*
+var test = `
+class Foo { constructor() { }; tryBreak() { Foo = 4; } }
+assertThrowsInstanceOf(() => new Foo().tryBreak(), TypeError);
+
+{
+    class foo { constructor() { }; tryBreak() { foo = 4; } }
+    assertThrowsInstanceOf(() => new foo().tryBreak(), TypeError);
+}
+`;
+*/
+
+var test = `
+
+// TDZ applies to inner bindings
+assertThrowsInstanceOf(()=>eval(\`class Bar {
+                                    constructor() { };
+                                    [Bar] () { };
+                                 }\`), ReferenceError);
+
+// There's no magic "inner binding" global
+{
+    class Foo {
+        constructor() { };
+        test() {
+            class Bar {
+                constructor() { }
+                test() { return Foo === Bar }
+            }
+            return new Bar().test();
+        }
+    }
+    assertEq(new Foo().test(), false);
+}
+
+// Inner bindings are shadowable
+{
+    class Foo {
+        constructor() { }
+        test(Foo) { return Foo; }
+    }
+    assertEq(new Foo().test(4), 4);
+}
+
+// The outer binding is distinct from the inner one
+{
+    let orig_X;
+
+    class X {
+        constructor() { }
+        f() { assertEq(X, orig_X); }
+    }
+
+    orig_X = X;
+    X = 13;
+    assertEq(X, 13);
+    new orig_X().f();
+}
+`;
+
+eval(test);
+
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/methDefn.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/methDefn.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/methDefn.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/methDefn.js	2015-02-28 15:03:06.000000000 +0000
@@ -102,12 +102,10 @@
 assertEq(a.foo4(), 4);
 
 // Symbols.
-if (typeof Symbol === "function") {
-    var unique_sym = Symbol("1"), registered_sym = Symbol.for("2");
-    a = { [unique_sym](){return 2;}, [registered_sym](){return 3;} };
-    assertEq(a[unique_sym](), 2);
-    assertEq(a[registered_sym](), 3);
-}
+var unique_sym = Symbol("1"), registered_sym = Symbol.for("2");
+a = { [unique_sym](){return 2;}, [registered_sym](){return 3;} };
+assertEq(a[unique_sym](), 2);
+assertEq(a[registered_sym](), 3);
 
 // Method characteristics.
 a = { b(){ return 4;} };
@@ -167,6 +165,30 @@
 a = {["b"](c){"use strict";return c;}};
 assertEq(a.b(1), 1);
 
+// Allow strict-reserved names as methods in objects.
+// (Bug 1124362)
+a = { static() { return 4; } };
+assertEq(a.static(), 4);
+
+a = { get static() { return 4; } };
+assertEq(a.static, 4);
+
+a = { set static(x) { assertEq(x, 4); } };
+a.static = 4;
+
+function testStrictMode() {
+    "use strict";
+    var obj = { static() { return 4; } };
+    assertEq(obj.static(), 4);
+
+    obj = { get static() { return 4; } };
+    assertEq(obj.static, 4);
+
+    obj = { set static(x) { assertEq(x, 4); } };
+    obj.static = 4;
+}
+testStrictMode();
+
 // Tests provided by benvie in the bug to distinguish from ES5 desugar.
 assertEq(({ method() {} }).method.name, "method");
 assertThrowsInstanceOf(function() {({ method() { method() } }).method() }, ReferenceError);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/methodInstallation.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/methodInstallation.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/methodInstallation.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/methodInstallation.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,80 @@
+// Do the things we write in classes actually appear as they are supposed to?
+
+var test= `
+
+var methodCalled = false;
+var getterCalled = false;
+var setterCalled = false;
+var constructorCalled = false;
+var staticMethodCalled = false;
+var staticGetterCalled = false;
+var staticSetterCalled = false;
+class a {
+    constructor() { constructorCalled = true; }
+    __proto__() { methodCalled = true }
+    get getter() { getterCalled = true; }
+    set setter(x) { setterCalled = true; }
+    static staticMethod() { staticMethodCalled = true; }
+    static get staticGetter() { staticGetterCalled = true; }
+    static set staticSetter(x) { staticSetterCalled = true; }
+    *[Symbol.iterator]() { yield "cow"; yield "pig"; }
+}
+var aConstDesc = Object.getOwnPropertyDescriptor(a.prototype, \"constructor\");
+assertEq(aConstDesc.writable, true);
+assertEq(aConstDesc.configurable, true);
+assertEq(aConstDesc.enumerable, false);
+aConstDesc.value();
+assertEq(constructorCalled, true);
+
+// __proto__ is just an identifier for classes. No prototype changes are made.
+assertEq(Object.getPrototypeOf(a.prototype), Object.prototype);
+var aMethDesc = Object.getOwnPropertyDescriptor(a.prototype, \"__proto__\");
+assertEq(aMethDesc.writable, true);
+assertEq(aMethDesc.configurable, true);
+assertEq(aMethDesc.enumerable, true);
+aMethDesc.value();
+assertEq(methodCalled, true);
+
+var aGetDesc = Object.getOwnPropertyDescriptor(a.prototype, \"getter\");
+assertEq(aGetDesc.configurable, true);
+assertEq(aGetDesc.enumerable, true);
+aGetDesc.get();
+assertEq(getterCalled, true);
+
+var aSetDesc = Object.getOwnPropertyDescriptor(a.prototype, \"setter\");
+assertEq(aSetDesc.configurable, true);
+assertEq(aSetDesc.enumerable, true);
+aSetDesc.set();
+assertEq(setterCalled, true);
+assertDeepEq(aSetDesc, Object.getOwnPropertyDescriptor(a.prototype, \"setter\"));
+
+assertEq(Object.getOwnPropertyDescriptor(new a(), \"staticMethod\"), undefined);
+var aStaticMethDesc = Object.getOwnPropertyDescriptor(a, \"staticMethod\");
+assertEq(aStaticMethDesc.configurable, true);
+assertEq(aStaticMethDesc.enumerable, true);
+assertEq(aStaticMethDesc.writable, true);
+aStaticMethDesc.value();
+assertEq(staticMethodCalled, true);
+
+assertEq(Object.getOwnPropertyDescriptor(new a(), \"staticGetter\"), undefined);
+var aStaticGetDesc = Object.getOwnPropertyDescriptor(a, \"staticGetter\");
+assertEq(aStaticGetDesc.configurable, true);
+assertEq(aStaticGetDesc.enumerable, true);
+aStaticGetDesc.get();
+assertEq(staticGetterCalled, true);
+
+assertEq(Object.getOwnPropertyDescriptor(new a(), \"staticSetter\"), undefined);
+var aStaticSetDesc = Object.getOwnPropertyDescriptor(a, \"staticSetter\");
+assertEq(aStaticSetDesc.configurable, true);
+assertEq(aStaticSetDesc.enumerable, true);
+aStaticSetDesc.set();
+assertEq(staticSetterCalled, true);
+
+assertEq([...new a()].join(), "cow,pig");
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/methodOverwrites.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/methodOverwrites.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/methodOverwrites.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/methodOverwrites.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,45 @@
+// Ensure that we can overwrite methods when more tha one is present.
+
+var test = `
+var result = 0;
+// Regardless of order, the constructor is overridden by any CPN, because it's
+// processed seperately.
+class a { [\"constructor\"]() { result += 1; }; constructor() { result += 2; } }
+var aInst = new a();
+assertEq(result, 2);
+aInst.constructor();
+assertEq(result, 3);
+
+class b { constructor() { result += 2; } [\"constructor\"]() { result += 1; }; }
+var bInst = new b();
+assertEq(result, 5);
+bInst.constructor();
+assertEq(result, 6);
+
+class c { constructor() { } method() { result += 1 } get method() { result += 2 } }
+new c().method;
+assertEq(result, 8);
+
+class d { constructor() { } get method() { result += 1 } method() { result += 2 } }
+new d().method();
+assertEq(result, 10);
+
+// getters and setter should not overwrite each other, but merge cleanly.
+class e { constructor() { } get method() { result += 1 } set method(x) { } }
+new e().method;
+assertEq(result, 11);
+
+class f { constructor() { }
+          set method(x) { throw "NO"; }
+          method() { throw "NO" }
+          get method() { return new Function("result += 1"); }
+        }
+new f().method();
+assertEq(result, 12);
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/outerBinding.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/outerBinding.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/outerBinding.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/outerBinding.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,63 @@
+// A class creates a mutable lexical outer binding.
+
+var test = `
+class Foo { constructor() { } }
+assertEq(typeof Foo, \"function\");
+Foo = 5;
+assertEq(Foo, 5);
+
+{
+    class foo { constructor() { } }
+    assertEq(typeof foo, \"function\");
+    foo = 4;
+    assertEq(foo, 4);
+}
+
+var ieval = eval;
+
+{
+    class PermanentBinding { constructor() { } }
+    delete PermanentBinding;
+    // That...didn't actually work, right?
+    assertEq(typeof PermanentBinding, "function");
+}
+
+{
+    try {
+        ieval(\`class x { constructor () { } }
+                throw new Error("FAIL");
+                class y { constructor () { } }
+              \`);
+    } catch (e if e instanceof Error) { }
+    assertEq(typeof x, "function");
+    assertEq(y, undefined, "Congrats, you fixed top-level lexical scoping! " +
+                           "Please uncomment the tests below for the real test.");
+    // assertThrowsInstanceOf(() => y, ReferenceError);
+}
+
+/*
+===== UNCOMMENT ME WHEN ENABLING THE TEST ABOVE. =====
+const globalConstant = 0;
+var earlyError = true;
+try {
+    ieval("earlyError = false; class globalConstant { constructor() { } }");
+} catch (e if e instanceof TypeError) { }
+assertEq(earlyError, true);
+*/
+
+function strictEvalShadows() {
+    "use strict";
+    let x = 4;
+    eval(\`class x { constructor() { } }
+           assertEq(typeof x, "function");
+         \`);
+    assertEq(x, 4);
+}
+strictEvalShadows()
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/shell.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/shell.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/shell.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/shell.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,12 @@
+// Enable "let" in shell builds. So silly.
+if (typeof version != 'undefined')
+  version(185);
+
+function classesEnabled() {
+    try {
+        new Function("class Foo { constructor() { } }");
+        return true;
+    } catch (e if e instanceof SyntaxError) {
+        return false;
+    }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/staticMethods.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/staticMethods.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/staticMethods.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/staticMethods.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,22 @@
+var test = `
+
+// basic static method test
+class X {
+    static count() { return ++this.hits; }
+    constructor() { }
+}
+X.hits = 0;
+assertEq(X.count(), 1);
+
+// A static method is just a function.
+assertEq(X.count instanceof Function, true);
+assertEq(X.count.length, 0);
+assertEq(X.count.bind({hits: 77})(), 78);
+
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/strictExecution.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/strictExecution.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Class/strictExecution.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Class/strictExecution.js	2015-02-28 15:03:06.000000000 +0000
@@ -0,0 +1,20 @@
+// Classes are always strict mode. Check computed property names as well.
+
+var test = `
+class a { constructor() { Object.preventExtensions({}).prop = 0; } }
+assertThrowsInstanceOf(() => new a(), TypeError);
+
+function shouldThrow() {
+    class b {
+        [Object.preventExtensions({}).prop = 4]() { }
+        constructor() { }
+    }
+}
+assertThrowsInstanceOf(shouldThrow, TypeError);
+`;
+
+if (classesEnabled())
+    eval(test);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "OK");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Map/symbols.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Map/symbols.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Map/symbols.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Map/symbols.js	2015-02-28 15:03:06.000000000 +0000
@@ -1,35 +1,33 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var m = new Map;
+var m = new Map;
 
-    // Symbols can be Map keys.
-    var sym = Symbol();
-    m.set(sym, "zero");
-    assertEq(m.has(sym), true);
-    assertEq(m.get(sym), "zero");
-    assertEq(m.has(Symbol()), false);
-    assertEq(m.get(Symbol()), undefined);
-    assertEq([...m][0][0], sym);
-    m.set(sym, "replaced");
-    assertEq(m.get(sym), "replaced");
-    m.delete(sym);
-    assertEq(m.has(sym), false);
-    assertEq(m.size, 0);
+// Symbols can be Map keys.
+var sym = Symbol();
+m.set(sym, "zero");
+assertEq(m.has(sym), true);
+assertEq(m.get(sym), "zero");
+assertEq(m.has(Symbol()), false);
+assertEq(m.get(Symbol()), undefined);
+assertEq([...m][0][0], sym);
+m.set(sym, "replaced");
+assertEq(m.get(sym), "replaced");
+m.delete(sym);
+assertEq(m.has(sym), false);
+assertEq(m.size, 0);
 
-    // Symbols returned by Symbol.for() can be Map keys.
-    for (var word of "that that is is that that is not is not is that not it".split(' ')) {
-        sym = Symbol.for(word);
-        m.set(sym, (m.get(sym) || 0) + 1);
-    }
-    assertDeepEq([...m], [
-        [Symbol.for("that"), 5],
-        [Symbol.for("is"), 5],
-        [Symbol.for("not"), 3],
-        [Symbol.for("it"), 1]
-    ]);
+// Symbols returned by Symbol.for() can be Map keys.
+for (var word of "that that is is that that is not is not is that not it".split(' ')) {
+    sym = Symbol.for(word);
+    m.set(sym, (m.get(sym) || 0) + 1);
 }
+assertDeepEq([...m], [
+    [Symbol.for("that"), 5],
+    [Symbol.for("is"), 5],
+    [Symbol.for("not"), 3],
+    [Symbol.for("it"), 1]
+]);
 
 if (typeof reportCompare === "function")
   reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Number/parseFloat-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Number/parseFloat-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Number/parseFloat-01.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Number/parseFloat-01.js	2015-02-28 15:03:06.000000000 +0000
@@ -18,6 +18,9 @@
 assertEq(Number.parseFloat("nan"), NaN);
 assertEq(Number.parseFloat("NaN"), NaN);
 
+/* Number.parseFloat should be the same function object as global parseFloat. */
+assertEq(Number.parseFloat, parseFloat);
+
 if (typeof reportCompare === "function")
   reportCompare(true, true);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Number/parseInt-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Number/parseInt-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Number/parseInt-01.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Number/parseInt-01.js	2015-02-28 15:03:06.000000000 +0000
@@ -161,6 +161,8 @@
 assertEq(Number.parseInt("0A", 17), 10);
 assertEq(Number.parseInt("00A", 17), 10);
 
+/* Number.parseInt should be the same function object as global parseInt. */
+assertEq(Number.parseInt, parseInt);
 
 /******************************************************************************/
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Object/assign.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Object/assign.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Object/assign.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Object/assign.js	2015-02-28 15:03:06.000000000 +0000
@@ -36,8 +36,7 @@
     assertEq(a.bProp, 7);
     assertEq(a[aSymbol], 22);
 }
-if (typeof Symbol === "function")
-    basicSymbols();
+basicSymbols();
 
 // Calls ToObject() for target, skips null/undefined sources, uses
 // ToObject(source) otherwise.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols.js	2015-02-28 15:03:06.000000000 +0000
@@ -1,48 +1,46 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    assertDeepEq(Object.getOwnPropertySymbols({}), []);
+assertDeepEq(Object.getOwnPropertySymbols({}), []);
 
-    // String keys are ignored.
-    assertEq(Object.getOwnPropertySymbols({a: 1, b: 2}).length, 0);
-    assertEq(Object.getOwnPropertySymbols([0, 1, 2, 3]).length, 0);
-
-    // Symbol keys are observed.
-    var iterable = {};
-    Object.defineProperty(iterable, Symbol.iterator, {
-        value: () => [][Symbol.iterator]()
-    });
-    assertDeepEq(Object.getOwnPropertySymbols(iterable), [Symbol.iterator]);
-    assertDeepEq(Object.getOwnPropertySymbols(new Proxy(iterable, {})), [Symbol.iterator]);
-
-    // Test on an object with a thousand own properties.
-    var obj = {};
-    for (var i = 0; i < 1000; i++) {
-        obj[Symbol.for("x" + i)] = 1;
-    }
-    assertEq(Object.getOwnPropertyNames(obj).length, 0);
-    var symbols = Object.getOwnPropertySymbols(obj);
-    assertEq(symbols.length, 1000);
-    assertEq(symbols.indexOf(Symbol.for("x0")) !== -1, true);
-    assertEq(symbols.indexOf(Symbol.for("x241")) !== -1, true);
-    assertEq(symbols.indexOf(Symbol.for("x999")) !== -1, true);
-    assertEq(Object.getOwnPropertySymbols(new Proxy(obj, {})).length, 1000);
-
-    // The prototype chain is not consulted.
-    assertEq(Object.getOwnPropertySymbols(Object.create(obj)).length, 0);
-    assertEq(Object.getOwnPropertySymbols(new Proxy(Object.create(obj), {})).length, 0);
-
-    // Primitives are coerced to objects; but there are never any symbol-keyed
-    // properties on the resulting wrapper objects.
-    assertThrowsInstanceOf(() => Object.getOwnPropertySymbols(), TypeError);
-    assertThrowsInstanceOf(() => Object.getOwnPropertySymbols(undefined), TypeError);
-    assertThrowsInstanceOf(() => Object.getOwnPropertySymbols(null), TypeError);
-    for (var primitive of [true, 1, 3.14, "hello", Symbol()])
-        assertEq(Object.getOwnPropertySymbols(primitive).length, 0);
-
-    assertEq(Object.getOwnPropertySymbols.length, 1);
+// String keys are ignored.
+assertEq(Object.getOwnPropertySymbols({a: 1, b: 2}).length, 0);
+assertEq(Object.getOwnPropertySymbols([0, 1, 2, 3]).length, 0);
+
+// Symbol keys are observed.
+var iterable = {};
+Object.defineProperty(iterable, Symbol.iterator, {
+    value: () => [][Symbol.iterator]()
+});
+assertDeepEq(Object.getOwnPropertySymbols(iterable), [Symbol.iterator]);
+assertDeepEq(Object.getOwnPropertySymbols(new Proxy(iterable, {})), [Symbol.iterator]);
+
+// Test on an object with a thousand own properties.
+var obj = {};
+for (var i = 0; i < 1000; i++) {
+    obj[Symbol.for("x" + i)] = 1;
 }
+assertEq(Object.getOwnPropertyNames(obj).length, 0);
+var symbols = Object.getOwnPropertySymbols(obj);
+assertEq(symbols.length, 1000);
+assertEq(symbols.indexOf(Symbol.for("x0")) !== -1, true);
+assertEq(symbols.indexOf(Symbol.for("x241")) !== -1, true);
+assertEq(symbols.indexOf(Symbol.for("x999")) !== -1, true);
+assertEq(Object.getOwnPropertySymbols(new Proxy(obj, {})).length, 1000);
+
+// The prototype chain is not consulted.
+assertEq(Object.getOwnPropertySymbols(Object.create(obj)).length, 0);
+assertEq(Object.getOwnPropertySymbols(new Proxy(Object.create(obj), {})).length, 0);
+
+// Primitives are coerced to objects; but there are never any symbol-keyed
+// properties on the resulting wrapper objects.
+assertThrowsInstanceOf(() => Object.getOwnPropertySymbols(), TypeError);
+assertThrowsInstanceOf(() => Object.getOwnPropertySymbols(undefined), TypeError);
+assertThrowsInstanceOf(() => Object.getOwnPropertySymbols(null), TypeError);
+for (var primitive of [true, 1, 3.14, "hello", Symbol()])
+    assertEq(Object.getOwnPropertySymbols(primitive).length, 0);
+
+assertEq(Object.getOwnPropertySymbols.length, 1);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols-proxy.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols-proxy.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols-proxy.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Object/getOwnPropertySymbols-proxy.js	2015-02-28 15:03:06.000000000 +0000
@@ -1,6 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
+// getOwnPropertySymbols(proxy) calls the getOwnPropertyNames hook (only).
+
+var symbols = [Symbol(), Symbol("moon"), Symbol.for("sun"), Symbol.iterator];
+var hits = 0;
+
 function HandlerProxy() {
     return new Proxy({}, {
         get: function (t, key) {
@@ -16,15 +21,8 @@
     return new Proxy({}, new HandlerProxy);
 }
 
-if (typeof Symbol === "function") {
-    // getOwnPropertySymbols(proxy) calls the getOwnPropertyNames hook (only).
-
-    var symbols = [Symbol(), Symbol("moon"), Symbol.for("sun"), Symbol.iterator];
-    var hits = 0;
-
-    assertDeepEq(Object.getOwnPropertySymbols(new OwnKeysProxy), symbols);
-    assertEq(hits, 1);
-}
+assertDeepEq(Object.getOwnPropertySymbols(new OwnKeysProxy), symbols);
+assertEq(hits, 1);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/RegExp/flags.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/RegExp/flags.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/RegExp/flags.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/RegExp/flags.js	2015-02-28 15:03:06.000000000 +0000
@@ -7,14 +7,16 @@
 assertEq(/foo/iymg.flags, "gimy");
 assertEq(RegExp("").flags, "");
 assertEq(RegExp("", "mygi").flags, "gimy");
+// TODO: Uncomment lines 12, 16, 19 and remove lines 11, 15, 18 when bug 1135377 is fixed.
 assertThrowsInstanceOf(() => RegExp("", "mygui").flags, SyntaxError);
-// When the /u flag is supported, uncomment the line below and remove the line above
 // assertEq(RegExp("", "mygui").flags, "gimuy");
 assertEq(genericFlags({}), "");
 assertEq(genericFlags({ignoreCase: true}), "i");
-assertEq(genericFlags({sticky:1, unicode:1, global: 0}), "uy");
+assertEq(genericFlags({sticky:1, unicode:1, global: 0}), "y");
+// assertEq(genericFlags({sticky:1, unicode:1, global: 0}), "uy");
 assertEq(genericFlags({__proto__: {multiline: true}}), "m");
-assertEq(genericFlags(new Proxy({}, {get(){return true}})), "gimuy");
+assertEq(genericFlags(new Proxy({}, {get(){return true}})), "gimy");
+// assertEq(genericFlags(new Proxy({}, {get(){return true}})), "gimuy");
 
 assertThrowsInstanceOf(() => genericFlags(), TypeError);
 assertThrowsInstanceOf(() => genericFlags(1), TypeError);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Set/symbols.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Set/symbols.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Set/symbols.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Set/symbols.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,29 +1,27 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var s = new Set;
+var s = new Set;
 
-    // Symbols can be stored in Sets.
-    var sym = Symbol();
-    s.add(sym);
-    assertEq(s.has(sym), true);
-    assertEq(s.has(Symbol()), false);
-    assertEq([...s][0], sym);
-    s.add(sym);
-    assertEq(s.has(sym), true);
-    assertEq(s.size, 1);
-    s.delete(sym);
-    assertEq(s.has(sym), false);
-    assertEq(s.size, 0);
+// Symbols can be stored in Sets.
+var sym = Symbol();
+s.add(sym);
+assertEq(s.has(sym), true);
+assertEq(s.has(Symbol()), false);
+assertEq([...s][0], sym);
+s.add(sym);
+assertEq(s.has(sym), true);
+assertEq(s.size, 1);
+s.delete(sym);
+assertEq(s.has(sym), false);
+assertEq(s.size, 0);
 
-    // Symbols returned by Symbol.for() can be in Sets.
-    var str = "how much wood would a woodchuck chuck if a woodchuck could chuck wood";
-    var s2  = "how much wood would a woodchuck chuck if could";
-    var arr = [for (word of str.split(" ")) Symbol.for(word)];
-    s = new Set(arr);
-    assertDeepEq([...s], [for (word of s2.split(" ")) Symbol.for(word)]);
-}
+// Symbols returned by Symbol.for() can be in Sets.
+var str = "how much wood would a woodchuck chuck if a woodchuck could chuck wood";
+var s2  = "how much wood would a woodchuck chuck if could";
+var arr = [for (word of str.split(" ")) Symbol.for(word)];
+s = new Set(arr);
+assertDeepEq([...s], [for (word of s2.split(" ")) Symbol.for(word)]);
 
 if (typeof reportCompare === "function")
   reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/shell.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/shell.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/shell.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/shell.js	2015-02-28 15:03:07.000000000 +0000
@@ -45,6 +45,7 @@
             Array_isArray = Array.isArray,
             Map_ = Map,
             Error_ = Error,
+            Symbol_ = Symbol,
             Map_has = call.bind(Map.prototype.has),
             Map_get = call.bind(Map.prototype.get),
             Map_set = call.bind(Map.prototype.set),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-// |reftest| skip-if(!xulRuntime.shell||!("normalize"in(String.prototype))) -- uses shell load() function, String.prototype.normalize is not enabled in all builds
-var BUGNUMBER = 918987;
-var summary = 'String.prototype.normalize';
-
-print(BUGNUMBER + ": " + summary);
-
-/**************
- * BEGIN TEST *
- **************/
-
-load('ecma_6/String/normalize-generateddata-input.js');
-
-function codePointsToString(points) {
-  return points.map(x => String.fromCodePoint(x)).join("");
-}
-function stringify(points) {
-  return points.map(x => x.toString(16)).join();
-}
-
-function runTest(test) {
-  var source = codePointsToString(test.source);
-  var NFC = codePointsToString(test.NFC);
-  var NFD = codePointsToString(test.NFD);
-  var NFKC = codePointsToString(test.NFKC);
-  var NFKD = codePointsToString(test.NFKD);
-  var sourceStr = stringify(test.source);
-  var nfcStr = stringify(test.NFC);
-  var nfdStr = stringify(test.NFD);
-  var nfkcStr = stringify(test.NFKC);
-  var nfkdStr = stringify(test.NFKD);
-
-  /* NFC */
-  assertEq(source.normalize(), NFC, "NFC of " + sourceStr);
-  assertEq(NFC.normalize(), NFC, "NFC of " + nfcStr);
-  assertEq(NFD.normalize(), NFC, "NFC of " + nfdStr);
-  assertEq(NFKC.normalize(), NFKC, "NFC of " + nfkcStr);
-  assertEq(NFKD.normalize(), NFKC, "NFC of " + nfkdStr);
-
-  assertEq(source.normalize(undefined), NFC, "NFC of " + sourceStr);
-  assertEq(NFC.normalize(undefined), NFC, "NFC of " + nfcStr);
-  assertEq(NFD.normalize(undefined), NFC, "NFC of " + nfdStr);
-  assertEq(NFKC.normalize(undefined), NFKC, "NFC of " + nfkcStr);
-  assertEq(NFKD.normalize(undefined), NFKC, "NFC of " + nfkdStr);
-
-  assertEq(source.normalize("NFC"), NFC, "NFC of " + sourceStr);
-  assertEq(NFC.normalize("NFC"), NFC, "NFC of " + nfcStr);
-  assertEq(NFD.normalize("NFC"), NFC, "NFC of " + nfdStr);
-  assertEq(NFKC.normalize("NFC"), NFKC, "NFC of " + nfkcStr);
-  assertEq(NFKD.normalize("NFC"), NFKC, "NFC of " + nfkdStr);
-
-  /* NFD */
-  assertEq(source.normalize("NFD"), NFD, "NFD of " + sourceStr);
-  assertEq(NFC.normalize("NFD"), NFD, "NFD of " + nfcStr);
-  assertEq(NFD.normalize("NFD"), NFD, "NFD of " + nfdStr);
-  assertEq(NFKC.normalize("NFD"), NFKD, "NFD of " + nfkcStr);
-  assertEq(NFKD.normalize("NFD"), NFKD, "NFD of " + nfkdStr);
-
-  /* NFKC */
-  assertEq(source.normalize("NFKC"), NFKC, "NFKC of " + sourceStr);
-  assertEq(NFC.normalize("NFKC"), NFKC, "NFKC of " + nfcStr);
-  assertEq(NFD.normalize("NFKC"), NFKC, "NFKC of " + nfdStr);
-  assertEq(NFKC.normalize("NFKC"), NFKC, "NFKC of " + nfkcStr);
-  assertEq(NFKD.normalize("NFKC"), NFKC, "NFKC of " + nfkdStr);
-
-  /* NFKD */
-  assertEq(source.normalize("NFKD"), NFKD, "NFKD of " + sourceStr);
-  assertEq(NFC.normalize("NFKD"), NFKD, "NFKD of " + nfcStr);
-  assertEq(NFD.normalize("NFKD"), NFKD, "NFKD of " + nfdStr);
-  assertEq(NFKC.normalize("NFKD"), NFKD, "NFKD of " + nfkcStr);
-  assertEq(NFKD.normalize("NFKD"), NFKD, "NFKD of " + nfkdStr);
-}
-
-for (var test0 of tests_part0) {
-  runTest(test0);
-}
-var part1 = new Set();
-for (var test1 of tests_part1) {
-  part1.add(test1.source[0]);
-  runTest(test1);
-}
-for (var test2 of tests_part2) {
-  runTest(test2);
-}
-for (var test3 of tests_part3) {
-  runTest(test3);
-}
-
-/* not listed in Part 1 */
-for (var x = 0; x <= 0x2FFFF; x++) {
-  if (part1.has(x)) {
-    continue;
-  }
-  var xstr = x.toString(16);
-  var c = String.fromCodePoint(x);
-  assertEq(c.normalize(), c, "NFC of " + xstr);
-  assertEq(c.normalize(undefined), c, "NFC of " + xstr);
-  assertEq(c.normalize("NFC"), c, "NFC of " + xstr);
-  assertEq(c.normalize("NFD"), c, "NFD of " + xstr);
-  assertEq(c.normalize("NFKC"), c, "NFKC of " + xstr);
-  assertEq(c.normalize("NFKD"), c, "NFKD of " + xstr);
-}
-
-var myobj = {toString : (function () "a\u0301"), normalize : String.prototype.normalize};
-assertEq(myobj.normalize(), "\u00E1");
-
-assertThrowsInstanceOf(function() {
-                         "abc".normalize("NFE");
-                       }, RangeError,
-                       "String.prototype.normalize should raise RangeError on invalid form");
-
-assertEq("".normalize(), "");
-
-/* JSRope test */
-var a = "";
-var b = "";
-for (var i = 0; i < 100; i++) {
-  a += "\u0100";
-  b += "\u0041\u0304";
-}
-assertEq(a.normalize("NFD"), b);
-
-/******************************************************************************/
-
-if (typeof reportCompare === "function")
-  reportCompare(true, true);
-print("Tests complete");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part0.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part0.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part0.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part0.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,22 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
+
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - part0';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  load('ecma_6/String/normalize-generateddata-input.js');
+
+  for (var test0 of tests_part0) {
+    runNormalizeTest(test0);
+  }
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,22 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
+
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - part1';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  load('ecma_6/String/normalize-generateddata-input.js');
+
+  for (var test1 of tests_part1) {
+    runNormalizeTest(test1);
+  }
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1-not-listed.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1-not-listed.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1-not-listed.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part1-not-listed.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,38 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
+
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - not listed in part1';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  load('ecma_6/String/normalize-generateddata-input.js');
+
+  var part1 = new Set();
+  for (var test1 of tests_part1) {
+    part1.add(test1.source[0]);
+  }
+
+  /* not listed in Part 1 */
+  for (var x = 0; x <= 0x2FFFF; x++) {
+    if (part1.has(x)) {
+      continue;
+    }
+    var xstr = x.toString(16);
+    var c = String.fromCodePoint(x);
+    assertEq(c.normalize(), c, "NFC of " + xstr);
+    assertEq(c.normalize(undefined), c, "NFC of " + xstr);
+    assertEq(c.normalize("NFC"), c, "NFC of " + xstr);
+    assertEq(c.normalize("NFD"), c, "NFD of " + xstr);
+    assertEq(c.normalize("NFKC"), c, "NFKC of " + xstr);
+    assertEq(c.normalize("NFKD"), c, "NFKD of " + xstr);
+  }
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part2.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part2.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,22 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
+
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - part2';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  load('ecma_6/String/normalize-generateddata-input.js');
+
+  for (var test2 of tests_part2) {
+    runNormalizeTest(test2);
+  }
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part3.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part3.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part3.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generateddata-part3.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,22 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
+
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - part3';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  load('ecma_6/String/normalize-generateddata-input.js');
+
+  for (var test3 of tests_part3) {
+    runNormalizeTest(test3);
+  }
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generic.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generic.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-generic.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-generic.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,20 @@
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - normalize no String object';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  var myobj = {
+    toString: () => "a\u0301",
+    normalize: String.prototype.normalize
+  };
+  assertEq(myobj.normalize(), "\u00E1");
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-parameter.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-parameter.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-parameter.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-parameter.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,19 @@
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - passing wrong parameter';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  assertThrowsInstanceOf(() => "abc".normalize("NFE"), RangeError,
+                         "String.prototype.normalize should raise RangeError on invalid form");
+
+  assertEq("".normalize(), "");
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-rope.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-rope.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/normalize-rope.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/normalize-rope.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,23 @@
+var BUGNUMBER = 918987;
+var summary = 'String.prototype.normalize - normalize rope string';
+
+print(BUGNUMBER + ": " + summary);
+
+function test() {
+  /* JSRope test */
+  var a = "";
+  var b = "";
+  for (var i = 0; i < 100; i++) {
+    a += "\u0100";
+    b += "\u0041\u0304";
+  }
+  assertEq(a.normalize("NFD"), b);
+}
+
+if ("normalize" in String.prototype) {
+  // String.prototype.normalize is not enabled in all builds.
+  test();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/shell.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/shell.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/String/shell.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/String/shell.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,59 @@
+function runNormalizeTest(test) {
+  function codePointsToString(points) {
+    return points.map(x => String.fromCodePoint(x)).join("");
+  }
+  function stringify(points) {
+    return points.map(x => x.toString(16)).join();
+  }
+
+  var source = codePointsToString(test.source);
+  var NFC = codePointsToString(test.NFC);
+  var NFD = codePointsToString(test.NFD);
+  var NFKC = codePointsToString(test.NFKC);
+  var NFKD = codePointsToString(test.NFKD);
+  var sourceStr = stringify(test.source);
+  var nfcStr = stringify(test.NFC);
+  var nfdStr = stringify(test.NFD);
+  var nfkcStr = stringify(test.NFKC);
+  var nfkdStr = stringify(test.NFKD);
+
+  /* NFC */
+  assertEq(source.normalize(), NFC, "NFC of " + sourceStr);
+  assertEq(NFC.normalize(), NFC, "NFC of " + nfcStr);
+  assertEq(NFD.normalize(), NFC, "NFC of " + nfdStr);
+  assertEq(NFKC.normalize(), NFKC, "NFC of " + nfkcStr);
+  assertEq(NFKD.normalize(), NFKC, "NFC of " + nfkdStr);
+
+  assertEq(source.normalize(undefined), NFC, "NFC of " + sourceStr);
+  assertEq(NFC.normalize(undefined), NFC, "NFC of " + nfcStr);
+  assertEq(NFD.normalize(undefined), NFC, "NFC of " + nfdStr);
+  assertEq(NFKC.normalize(undefined), NFKC, "NFC of " + nfkcStr);
+  assertEq(NFKD.normalize(undefined), NFKC, "NFC of " + nfkdStr);
+
+  assertEq(source.normalize("NFC"), NFC, "NFC of " + sourceStr);
+  assertEq(NFC.normalize("NFC"), NFC, "NFC of " + nfcStr);
+  assertEq(NFD.normalize("NFC"), NFC, "NFC of " + nfdStr);
+  assertEq(NFKC.normalize("NFC"), NFKC, "NFC of " + nfkcStr);
+  assertEq(NFKD.normalize("NFC"), NFKC, "NFC of " + nfkdStr);
+
+  /* NFD */
+  assertEq(source.normalize("NFD"), NFD, "NFD of " + sourceStr);
+  assertEq(NFC.normalize("NFD"), NFD, "NFD of " + nfcStr);
+  assertEq(NFD.normalize("NFD"), NFD, "NFD of " + nfdStr);
+  assertEq(NFKC.normalize("NFD"), NFKD, "NFD of " + nfkcStr);
+  assertEq(NFKD.normalize("NFD"), NFKD, "NFD of " + nfkdStr);
+
+  /* NFKC */
+  assertEq(source.normalize("NFKC"), NFKC, "NFKC of " + sourceStr);
+  assertEq(NFC.normalize("NFKC"), NFKC, "NFKC of " + nfcStr);
+  assertEq(NFD.normalize("NFKC"), NFKC, "NFKC of " + nfdStr);
+  assertEq(NFKC.normalize("NFKC"), NFKC, "NFKC of " + nfkcStr);
+  assertEq(NFKD.normalize("NFKC"), NFKC, "NFKC of " + nfkdStr);
+
+  /* NFKD */
+  assertEq(source.normalize("NFKD"), NFKD, "NFKD of " + sourceStr);
+  assertEq(NFC.normalize("NFKD"), NFKD, "NFKD of " + nfcStr);
+  assertEq(NFD.normalize("NFKD"), NFKD, "NFKD of " + nfdStr);
+  assertEq(NFKC.normalize("NFKD"), NFKD, "NFKD of " + nfkcStr);
+  assertEq(NFKD.normalize("NFKD"), NFKD, "NFKD of " + nfkdStr);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/as-base-value.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/as-base-value.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/as-base-value.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/as-base-value.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,90 +1,88 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Like other primitives, symbols can be treated as objects, using object-like
-    // syntax: `symbol.prop` or `symbol[key]`.
-    //
-    // In ECMAScript spec jargon, this creates a Reference whose base value is a
-    // primitive Symbol value.
-
-    var symbols = [
-        Symbol(),
-        Symbol("ponies"),
-        Symbol.for("sym"),
-        Symbol.iterator
-    ];
-
-    // Test accessor property, used below.
-    var gets, sets;
-    Object.defineProperty(Symbol.prototype, "prop", {
-        get: function () {
-            "use strict";
-            gets++;
-            assertEq(typeof this, "object");
-            assertEq(this instanceof Symbol, true);
-            assertEq(this.valueOf(), sym);
-            return "got";
-        },
-        set: function (v) {
-            "use strict";
-            sets++;
-            assertEq(typeof this, "object");
-            assertEq(this instanceof Symbol, true);
-            assertEq(this.valueOf(), sym);
-            assertEq(v, "newvalue");
-        }
-    });
-
-    for (var sym of symbols) {
-        assertEq(sym.constructor, Symbol);
-
-        // method on Object.prototype
-        assertEq(sym.hasOwnProperty("constructor"), false);
-        assertEq(sym.toLocaleString(), sym.toString()); // once .toString() exists
-
-        // custom method monkeypatched onto Symbol.prototype
-        Symbol.prototype.nonStrictMethod = function (arg) {
-            assertEq(arg, "ok");
-            assertEq(this instanceof Symbol, true);
-            assertEq(this.valueOf(), sym);
-            return 13;
-        };
-        assertEq(sym.nonStrictMethod("ok"), 13);
-
-        // the same, but strict mode
-        Symbol.prototype.strictMethod = function (arg) {
-            "use strict";
-            assertEq(arg, "ok2");
-            assertEq(this, sym);
-            return 14;
-        };
-        assertEq(sym.strictMethod("ok2"), 14);
-
-        // getter/setter on Symbol.prototype
-        gets = 0;
-        sets = 0;
-        var propname = "prop";
-
-        assertEq(sym.prop, "got");
-        assertEq(gets, 1);
-        assertEq(sym[propname], "got");
-        assertEq(gets, 2);
-
-        assertEq(sym.prop = "newvalue", "newvalue");
-        assertEq(sets, 1);
-        assertEq(sym[propname] = "newvalue", "newvalue");
-        assertEq(sets, 2);
-
-        // non-existent property
-        assertEq(sym.noSuchProp, undefined);
-        var noSuchPropName = "nonesuch";
-        assertEq(sym[noSuchPropName], undefined);
-
-        // non-existent method
-        assertThrowsInstanceOf(() => sym.noSuchProp(), TypeError);
-        assertThrowsInstanceOf(() => sym[noSuchPropName](), TypeError);
+// Like other primitives, symbols can be treated as objects, using object-like
+// syntax: `symbol.prop` or `symbol[key]`.
+//
+// In ECMAScript spec jargon, this creates a Reference whose base value is a
+// primitive Symbol value.
+
+var symbols = [
+    Symbol(),
+    Symbol("ponies"),
+    Symbol.for("sym"),
+    Symbol.iterator
+];
+
+// Test accessor property, used below.
+var gets, sets;
+Object.defineProperty(Symbol.prototype, "prop", {
+    get: function () {
+        "use strict";
+        gets++;
+        assertEq(typeof this, "object");
+        assertEq(this instanceof Symbol, true);
+        assertEq(this.valueOf(), sym);
+        return "got";
+    },
+    set: function (v) {
+        "use strict";
+        sets++;
+        assertEq(typeof this, "object");
+        assertEq(this instanceof Symbol, true);
+        assertEq(this.valueOf(), sym);
+        assertEq(v, "newvalue");
     }
+});
+
+for (var sym of symbols) {
+    assertEq(sym.constructor, Symbol);
+
+    // method on Object.prototype
+    assertEq(sym.hasOwnProperty("constructor"), false);
+    assertEq(sym.toLocaleString(), sym.toString()); // once .toString() exists
+
+    // custom method monkeypatched onto Symbol.prototype
+    Symbol.prototype.nonStrictMethod = function (arg) {
+        assertEq(arg, "ok");
+        assertEq(this instanceof Symbol, true);
+        assertEq(this.valueOf(), sym);
+        return 13;
+    };
+    assertEq(sym.nonStrictMethod("ok"), 13);
+
+    // the same, but strict mode
+    Symbol.prototype.strictMethod = function (arg) {
+        "use strict";
+        assertEq(arg, "ok2");
+        assertEq(this, sym);
+        return 14;
+    };
+    assertEq(sym.strictMethod("ok2"), 14);
+
+    // getter/setter on Symbol.prototype
+    gets = 0;
+    sets = 0;
+    var propname = "prop";
+
+    assertEq(sym.prop, "got");
+    assertEq(gets, 1);
+    assertEq(sym[propname], "got");
+    assertEq(gets, 2);
+
+    assertEq(sym.prop = "newvalue", "newvalue");
+    assertEq(sets, 1);
+    assertEq(sym[propname] = "newvalue", "newvalue");
+    assertEq(sets, 2);
+
+    // non-existent property
+    assertEq(sym.noSuchProp, undefined);
+    var noSuchPropName = "nonesuch";
+    assertEq(sym[noSuchPropName], undefined);
+
+    // non-existent method
+    assertThrowsInstanceOf(() => sym.noSuchProp(), TypeError);
+    assertThrowsInstanceOf(() => sym[noSuchPropName](), TypeError);
 }
 
 if (typeof reportCompare === "function")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/comparisons.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/comparisons.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/comparisons.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/comparisons.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,34 +1,32 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var symbols = [
-        Symbol(),
-        Symbol("0"),
-        Symbol.for("snowman"),
-        Symbol.iterator
-    ];
+var symbols = [
+    Symbol(),
+    Symbol("0"),
+    Symbol.for("snowman"),
+    Symbol.iterator
+];
 
-    var values = [
-        undefined, null, 0, 3.14, -0, NaN, "", "alphabet", Symbol("0"),
-        {}, []
-    ];
+var values = [
+    undefined, null, 0, 3.14, -0, NaN, "", "alphabet", Symbol("0"),
+    {}, []
+];
 
-    for (var comparator of ["==", "!=", "===", "!=="]) {
-        var f = Function("a, b", "return a " + comparator + " b;");
-        var expected = (comparator[0] == '!');
-        for (var a of symbols) {
-            for (var b of values)
-                assertEq(f(a, b), expected);
-        }
+for (var comparator of ["==", "!=", "===", "!=="]) {
+    var f = Function("a, b", "return a " + comparator + " b;");
+    var expected = (comparator[0] == '!');
+    for (var a of symbols) {
+        for (var b of values)
+            assertEq(f(a, b), expected);
     }
+}
 
-    for (var comparator of ["<", "<=", ">", ">="]) {
-        var f = Function("a, b", "return a " + comparator + " b;");
-        for (var a of symbols) {
-            for (var b of values)
-                assertThrowsInstanceOf(() => f(a, b), TypeError);
-        }
+for (var comparator of ["<", "<=", ">", ">="]) {
+    var f = Function("a, b", "return a " + comparator + " b;");
+    for (var a of symbols) {
+        for (var b of values)
+            assertThrowsInstanceOf(() => f(a, b), TypeError);
     }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/constructor.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/constructor.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/constructor.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/constructor.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,37 +1,35 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Symbol(symbol) throws a TypeError.
-    var sym = Symbol();
-    assertThrowsInstanceOf(() => Symbol(sym), TypeError);
-
-    // Symbol(undefined) is equivalent to Symbol().
-    assertEq(Symbol(undefined).toString(), "Symbol()");
-
-    // Otherwise, Symbol(v) means Symbol(ToString(v)).
-    assertEq(Symbol(7).toString(), "Symbol(7)");
-    assertEq(Symbol(true).toString(), "Symbol(true)");
-    assertEq(Symbol(null).toString(), "Symbol(null)");
-    assertEq(Symbol([1, 2]).toString(), "Symbol(1,2)");
-    var symobj = Object(sym);
-    assertThrowsInstanceOf(() => Symbol(symobj), TypeError);
-
-    var hits = 0;
-    var obj = {
-        toString: function () {
-            hits++;
-            return "ponies";
-        }
-    };
-    assertEq(Symbol(obj).toString(), "Symbol(ponies)");
-    assertEq(hits, 1);
-
-    assertEq(Object.getPrototypeOf(Symbol.prototype), Object.prototype);
-
-    // Symbol.prototype is not itself a Symbol object.
-    assertThrowsInstanceOf(() => Symbol.prototype.valueOf(), TypeError);
-}
+// Symbol(symbol) throws a TypeError.
+var sym = Symbol();
+assertThrowsInstanceOf(() => Symbol(sym), TypeError);
+
+// Symbol(undefined) is equivalent to Symbol().
+assertEq(Symbol(undefined).toString(), "Symbol()");
+
+// Otherwise, Symbol(v) means Symbol(ToString(v)).
+assertEq(Symbol(7).toString(), "Symbol(7)");
+assertEq(Symbol(true).toString(), "Symbol(true)");
+assertEq(Symbol(null).toString(), "Symbol(null)");
+assertEq(Symbol([1, 2]).toString(), "Symbol(1,2)");
+var symobj = Object(sym);
+assertThrowsInstanceOf(() => Symbol(symobj), TypeError);
+
+var hits = 0;
+var obj = {
+    toString: function () {
+        hits++;
+        return "ponies";
+    }
+};
+assertEq(Symbol(obj).toString(), "Symbol(ponies)");
+assertEq(hits, 1);
+
+assertEq(Object.getPrototypeOf(Symbol.prototype), Object.prototype);
+
+// Symbol.prototype is not itself a Symbol object.
+assertThrowsInstanceOf(() => Symbol.prototype.valueOf(), TypeError);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/conversions.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/conversions.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/conversions.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/conversions.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,67 +1,65 @@
 // Section numbers cite ES6 rev 24 (2014 April 27).
 
-if (typeof Symbol === "function") {
-    var symbols = [
-        Symbol(),
-        Symbol("one"),
-        Symbol.for("two"),
-        Symbol.iterator
-    ];
-
-    if (Symbol.toPrimitive in Symbol.prototype) {
-        // We should test that deleting Symbol.prototype[@@toPrimitive] changes the
-        // behavior of ToPrimitive on Symbol objects, but @@toPrimitive is not
-        // implemented yet.
-        throw new Error("Congratulations on implementing @@toPrimitive! Please update this test.");
-    }
-
-    for (var sym of symbols) {
-        // 7.1.1 ToPrimitive
-        var symobj = Object(sym);
-        assertThrowsInstanceOf(() => Number(symobj), TypeError);
-        assertThrowsInstanceOf(() => String(symobj), TypeError);
-        assertThrowsInstanceOf(() => symobj < 0, TypeError);
-        assertThrowsInstanceOf(() => 0 < symobj, TypeError);
-        assertThrowsInstanceOf(() => symobj + 1, TypeError);
-        assertThrowsInstanceOf(() => "" + symobj, TypeError);
-        assertEq(sym == symobj, true);
-        assertEq(sym === symobj, false);
-        assertEq(symobj == 0, false);
-        assertEq(0 != symobj, true);
-
-        // 7.1.2 ToBoolean
-        assertEq(Boolean(sym), true);
-        assertEq(!sym, false);
-        assertEq(sym || 13, sym);
-        assertEq(sym && 13, 13);
-
-        // 7.1.3 ToNumber
-        assertThrowsInstanceOf(() => +sym, TypeError);
-        assertThrowsInstanceOf(() => sym | 0, TypeError);
-
-        // 7.1.12 ToString
-        assertThrowsInstanceOf(() => "" + sym, TypeError);
-        assertThrowsInstanceOf(() => sym + "", TypeError);
-        assertThrowsInstanceOf(() => "" + [1, 2, Symbol()], TypeError);
-        assertThrowsInstanceOf(() => ["simple", "thimble", Symbol()].join(), TypeError);
-
-        // 21.1.1.1 String()
-        assertEq(String(sym), sym.toString());
-        assertThrowsInstanceOf(() => String(Object(sym)), TypeError);
-
-        // 21.1.1.2 new String()
-        assertThrowsInstanceOf(() => new String(sym), TypeError);
-
-        // 7.1.13 ToObject
-        var obj = Object(sym);
-        assertEq(typeof obj, "object");
-        assertEq(Object.prototype.toString.call(obj), "[object Symbol]");
-        assertEq(Object.getPrototypeOf(obj), Symbol.prototype);
-        assertEq(Object.getOwnPropertyNames(obj).length, 0);
-        assertEq(Object(sym) === Object(sym), false);  // new object each time
-        var f = function () { return this; };
-        assertEq(f.call(sym) === f.call(sym), false);  // new object each time
-    }
+var symbols = [
+    Symbol(),
+    Symbol("one"),
+    Symbol.for("two"),
+    Symbol.iterator
+];
+
+if (Symbol.toPrimitive in Symbol.prototype) {
+    // We should test that deleting Symbol.prototype[@@toPrimitive] changes the
+    // behavior of ToPrimitive on Symbol objects, but @@toPrimitive is not
+    // implemented yet.
+    throw new Error("Congratulations on implementing @@toPrimitive! Please update this test.");
+}
+
+for (var sym of symbols) {
+    // 7.1.1 ToPrimitive
+    var symobj = Object(sym);
+    assertThrowsInstanceOf(() => Number(symobj), TypeError);
+    assertThrowsInstanceOf(() => String(symobj), TypeError);
+    assertThrowsInstanceOf(() => symobj < 0, TypeError);
+    assertThrowsInstanceOf(() => 0 < symobj, TypeError);
+    assertThrowsInstanceOf(() => symobj + 1, TypeError);
+    assertThrowsInstanceOf(() => "" + symobj, TypeError);
+    assertEq(sym == symobj, true);
+    assertEq(sym === symobj, false);
+    assertEq(symobj == 0, false);
+    assertEq(0 != symobj, true);
+
+    // 7.1.2 ToBoolean
+    assertEq(Boolean(sym), true);
+    assertEq(!sym, false);
+    assertEq(sym || 13, sym);
+    assertEq(sym && 13, 13);
+
+    // 7.1.3 ToNumber
+    assertThrowsInstanceOf(() => +sym, TypeError);
+    assertThrowsInstanceOf(() => sym | 0, TypeError);
+
+    // 7.1.12 ToString
+    assertThrowsInstanceOf(() => "" + sym, TypeError);
+    assertThrowsInstanceOf(() => sym + "", TypeError);
+    assertThrowsInstanceOf(() => "" + [1, 2, Symbol()], TypeError);
+    assertThrowsInstanceOf(() => ["simple", "thimble", Symbol()].join(), TypeError);
+
+    // 21.1.1.1 String()
+    assertEq(String(sym), sym.toString());
+    assertThrowsInstanceOf(() => String(Object(sym)), TypeError);
+
+    // 21.1.1.2 new String()
+    assertThrowsInstanceOf(() => new String(sym), TypeError);
+
+    // 7.1.13 ToObject
+    var obj = Object(sym);
+    assertEq(typeof obj, "object");
+    assertEq(Object.prototype.toString.call(obj), "[object Symbol]");
+    assertEq(Object.getPrototypeOf(obj), Symbol.prototype);
+    assertEq(Object.getOwnPropertyNames(obj).length, 0);
+    assertEq(Object(sym) === Object(sym), false);  // new object each time
+    var f = function () { return this; };
+    assertEq(f.call(sym) === f.call(sym), false);  // new object each time
 }
 
 if (typeof reportCompare === "function")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/enumeration.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/enumeration.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/enumeration.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/enumeration.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,54 +1,52 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // for-in loops skip properties with symbol keys, even enumerable properties.
-    var obj = {};
-    obj[Symbol.for("moon")] = "sun";
-    obj[Symbol("asleep")] = "awake";
-    obj[Symbol.iterator] = "List";
-    for (var x in obj)
-        throw "FAIL: " + uneval(x);
-
-    // This includes inherited properties.
-    var obj2 = Object.create(obj);
-    for (var x in obj2)
-        throw "FAIL: " + uneval(x);
-
-    // The same goes for proxies.
-    var p = new Proxy(obj, {});
-    for (var x in p)
-        throw "FAIL: " + uneval(x);
-    var p2 = new Proxy(obj2, {});
-    for (var x in p2)
-        throw "FAIL: " + uneval(x);
-
-    // Object.keys() and .getOwnPropertyNames() also skip symbols.
-    assertEq(Object.keys(obj).length, 0);
-    assertEq(Object.keys(p).length, 0);
-    assertEq(Object.keys(obj2).length, 0);
-    assertEq(Object.keys(p2).length, 0);
-    assertEq(Object.getOwnPropertyNames(obj).length, 0);
-    assertEq(Object.getOwnPropertyNames(p).length, 0);
-    assertEq(Object.getOwnPropertyNames(obj2).length, 0);
-    assertEq(Object.getOwnPropertyNames(p2).length, 0);
-
-    // Test interaction of Object.keys(), proxies, and symbol property keys.
-    var log = [];
-    var h = {
-        ownKeys: (t) => {
-            log.push("ownKeys");
-            return ["a", "0", Symbol.for("moon"), Symbol("asleep"), Symbol.iterator];
-        },
-        getOwnPropertyDescriptor: (t, key) => {
-            log.push("gopd", key);
-            return {configurable: true, enumerable: true, value: 0, writable: true};
-        }
-    };
-    p = new Proxy({}, h);
-    assertDeepEq(Object.keys(p), ["a", "0"]);
-    assertDeepEq(log, ["ownKeys", "gopd", "a", "gopd", "0"]);
-}
+// for-in loops skip properties with symbol keys, even enumerable properties.
+var obj = {};
+obj[Symbol.for("moon")] = "sun";
+obj[Symbol("asleep")] = "awake";
+obj[Symbol.iterator] = "List";
+for (var x in obj)
+    throw "FAIL: " + uneval(x);
+
+// This includes inherited properties.
+var obj2 = Object.create(obj);
+for (var x in obj2)
+    throw "FAIL: " + uneval(x);
+
+// The same goes for proxies.
+var p = new Proxy(obj, {});
+for (var x in p)
+    throw "FAIL: " + uneval(x);
+var p2 = new Proxy(obj2, {});
+for (var x in p2)
+    throw "FAIL: " + uneval(x);
+
+// Object.keys() and .getOwnPropertyNames() also skip symbols.
+assertEq(Object.keys(obj).length, 0);
+assertEq(Object.keys(p).length, 0);
+assertEq(Object.keys(obj2).length, 0);
+assertEq(Object.keys(p2).length, 0);
+assertEq(Object.getOwnPropertyNames(obj).length, 0);
+assertEq(Object.getOwnPropertyNames(p).length, 0);
+assertEq(Object.getOwnPropertyNames(obj2).length, 0);
+assertEq(Object.getOwnPropertyNames(p2).length, 0);
+
+// Test interaction of Object.keys(), proxies, and symbol property keys.
+var log = [];
+var h = {
+    ownKeys: (t) => {
+        log.push("ownKeys");
+        return ["a", "0", Symbol.for("moon"), Symbol("asleep"), Symbol.iterator];
+    },
+    getOwnPropertyDescriptor: (t, key) => {
+        log.push("gopd", key);
+        return {configurable: true, enumerable: true, value: 0, writable: true};
+    }
+};
+p = new Proxy({}, h);
+assertDeepEq(Object.keys(p), ["a", "0"]);
+assertDeepEq(log, ["ownKeys", "gopd", "a", "gopd", "0"]);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/enumeration-order.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/enumeration-order.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/enumeration-order.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/enumeration-order.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,6 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
+// Symbols follow all other property keys in the result list.
 var log;
 function LoggingProxy() {
     return new Proxy({}, {
@@ -11,6 +12,18 @@
     });
 }
 
+var keys = [
+    "before",
+    Symbol(),
+    "during",
+    Symbol.for("during"),
+    Symbol.iterator,
+    "after"
+];
+var descs = {};
+for (var k of keys)
+    descs[k] = {configurable: true, value: 0};
+
 function test(descsObj) {
     log = [];
     Object.defineProperties(LoggingProxy(), descs);
@@ -20,24 +33,8 @@
         assertEq(log.indexOf(key) !== -1, true);
 }
 
-if (typeof Symbol === "function") {
-    // ES6 draft rev 25 (2014 May 22), 9.1.12 "[[OwnPropertyKeys]] ()":
-
-    var keys = [
-        "before",
-        Symbol(),
-        "during",
-        Symbol.for("during"),
-        Symbol.iterator,
-        "after"
-    ];
-    var descs = {};
-    for (var k of keys)
-        descs[k] = {configurable: true, value: 0};
-
-    test(descs);
-    test(new Proxy(descs, {}));
-}
+test(descs);
+test(new Proxy(descs, {}));
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/equality.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/equality.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/equality.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/equality.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,30 +1,28 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Symbol.for returns the same symbol whenever the same argument is passed.
-    assertEq(Symbol.for("q") === Symbol.for("q"), true);
+// Symbol.for returns the same symbol whenever the same argument is passed.
+assertEq(Symbol.for("q") === Symbol.for("q"), true);
 
-    // Several distinct Symbol values.
-    var symbols = [
-        Symbol(),
-        Symbol("Symbol.iterator"),
-        Symbol("Symbol.iterator"),  // distinct new symbol with the same description
-        Symbol.for("Symbol.iterator"),
-        Symbol.iterator
-    ];
+// Several distinct Symbol values.
+var symbols = [
+    Symbol(),
+    Symbol("Symbol.iterator"),
+    Symbol("Symbol.iterator"),  // distinct new symbol with the same description
+    Symbol.for("Symbol.iterator"),
+    Symbol.iterator
+];
 
-    // Distinct symbols are never equal to each other, even if they have the same
-    // description.
-    for (var i = 0; i < symbols.length; i++) {
-        for (var j = i; j < symbols.length; j++) {
-            var expected = (i === j);
-            assertEq(symbols[i] == symbols[j], expected);
-            assertEq(symbols[i] != symbols[j], !expected);
-            assertEq(symbols[i] === symbols[j], expected);
-            assertEq(symbols[i] !== symbols[j], !expected);
-            assertEq(Object.is(symbols[i], symbols[j]), expected);
-        }
+// Distinct symbols are never equal to each other, even if they have the same
+// description.
+for (var i = 0; i < symbols.length; i++) {
+    for (var j = i; j < symbols.length; j++) {
+        var expected = (i === j);
+        assertEq(symbols[i] == symbols[j], expected);
+        assertEq(symbols[i] != symbols[j], !expected);
+        assertEq(symbols[i] === symbols[j], expected);
+        assertEq(symbols[i] !== symbols[j], !expected);
+        assertEq(Object.is(symbols[i], symbols[j]), expected);
     }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/errors.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/errors.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/errors.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/errors.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,19 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Section numbers cite ES6 rev 24 (2014 April 27).
+// Section numbers cite ES6 rev 24 (2014 April 27).
 
-    var sym = Symbol();
+var sym = Symbol();
 
-    // 7.2.2 IsCallable
-    assertThrowsInstanceOf(() => sym(), TypeError);
-    assertThrowsInstanceOf(() => Function.prototype.call.call(sym), TypeError);
+// 7.2.2 IsCallable
+assertThrowsInstanceOf(() => sym(), TypeError);
+assertThrowsInstanceOf(() => Function.prototype.call.call(sym), TypeError);
 
-    // 7.2.5 IsConstructor
-    assertThrowsInstanceOf(() => new sym(), TypeError);
-    assertThrowsInstanceOf(() => new Symbol(), TypeError);
-}
+// 7.2.5 IsConstructor
+assertThrowsInstanceOf(() => new sym(), TypeError);
+assertThrowsInstanceOf(() => new Symbol(), TypeError);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/for-in-order.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/for-in-order.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/for-in-order.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/for-in-order.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,35 +1,33 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // ES6 does not specify enumeration order, but implementations mostly retain
-    // property insertion order -- and must, for web compatibility. This test checks
-    // that symbol-keyed properties do not interfere with that order.
+// ES6 does not specify enumeration order, but implementations mostly retain
+// property insertion order -- and must, for web compatibility. This test checks
+// that symbol-keyed properties do not interfere with that order.
 
-    var obj = {};
-    obj[Symbol("moon")] = 0;
-    obj.x = 1;
-    obj[Symbol.for("y")] = 2
-    obj.y = 3;
-    obj[Symbol.iterator] = function* () { yield 4; };
-    obj.z = 5;
-    Object.prototype[Symbol.for("comet")] = 6;
+var obj = {};
+obj[Symbol("moon")] = 0;
+obj.x = 1;
+obj[Symbol.for("y")] = 2
+obj.y = 3;
+obj[Symbol.iterator] = function* () { yield 4; };
+obj.z = 5;
+Object.prototype[Symbol.for("comet")] = 6;
 
-    var keys = [];
-    for (var k in obj)
-        keys.push(k);
-    assertDeepEq(keys, ["x", "y", "z"]);
-    assertDeepEq(Object.keys(obj), ["x", "y", "z"]);
+var keys = [];
+for (var k in obj)
+    keys.push(k);
+assertDeepEq(keys, ["x", "y", "z"]);
+assertDeepEq(Object.keys(obj), ["x", "y", "z"]);
 
-    // Test with more properties.
-    for (var i = 0; i < 1000; i++)
-        obj[Symbol(i)] = i;
-    obj.w = 1000;
-    keys = []
-    for (var k in obj)
-        keys.push(k);
-    assertDeepEq(keys, ["x", "y", "z", "w"]);
-}
+// Test with more properties.
+for (var i = 0; i < 1000; i++)
+    obj[Symbol(i)] = i;
+obj.w = 1000;
+keys = []
+for (var k in obj)
+    keys.push(k);
+assertDeepEq(keys, ["x", "y", "z", "w"]);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/for.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/for.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/for.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/for.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,33 +1,31 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Symbol.for called twice with the same argument returns the same symbol.
-    assertEq(Symbol.for("ponies"), Symbol.for("ponies"));
-
-    // Called twice with equal strings: still the same result.
-    var one = Array(64+1).join("x");
-    var two = Array(8+1).join(Array(8+1).join("x"));
-    assertEq(Symbol.for(one), Symbol.for(two));
-
-    // Symbols created by calling Symbol() are not in the symbol registry.
-    var sym = Symbol("123");
-    assertEq(Symbol.for("123") !== sym, true);
-
-    // Empty string is fine.
-    assertEq(typeof Symbol.for(""), "symbol");
-
-    // Primitive arguments.
-    assertEq(Symbol.for(3), Symbol.for("3"));
-    assertEq(Symbol.for(null), Symbol.for("null"));
-    assertEq(Symbol.for(undefined), Symbol.for("undefined"));
-    assertEq(Symbol.for(), Symbol.for("undefined"));
-
-    // Symbol.for ignores the 'this' value.
-    var foo = Symbol.for("foo");
-    assertEq(Symbol.for.call(String, "foo"), foo);
-    assertEq(Symbol.for.call(3.14, "foo"), foo);
-}
+// Symbol.for called twice with the same argument returns the same symbol.
+assertEq(Symbol.for("ponies"), Symbol.for("ponies"));
+
+// Called twice with equal strings: still the same result.
+var one = Array(64+1).join("x");
+var two = Array(8+1).join(Array(8+1).join("x"));
+assertEq(Symbol.for(one), Symbol.for(two));
+
+// Symbols created by calling Symbol() are not in the symbol registry.
+var sym = Symbol("123");
+assertEq(Symbol.for("123") !== sym, true);
+
+// Empty string is fine.
+assertEq(typeof Symbol.for(""), "symbol");
+
+// Primitive arguments.
+assertEq(Symbol.for(3), Symbol.for("3"));
+assertEq(Symbol.for(null), Symbol.for("null"));
+assertEq(Symbol.for(undefined), Symbol.for("undefined"));
+assertEq(Symbol.for(), Symbol.for("undefined"));
+
+// Symbol.for ignores the 'this' value.
+var foo = Symbol.for("foo")
+assertEq(Symbol.for.call(String, "foo"), foo);
+assertEq(Symbol.for.call(3.14, "foo"), foo);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-keys.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-keys.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-keys.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-keys.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,21 +1,19 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // JSON.stringify ignores symbol-keyed properties, even enumerable ones.
+// JSON.stringify ignores symbol-keyed properties, even enumerable ones.
 
-    var obj = {a: 1};
-    obj[Symbol.for("ponies")] = {toJSON: function () { throw "fit"; }};
-    obj[Symbol.iterator] = {toJSON: function () { throw "fit"; }};
-    assertEq(JSON.stringify(obj), '{"a":1}');
+var obj = {a: 1};
+obj[Symbol.for("ponies")] = {toJSON: function () { throw "fit"; }};
+obj[Symbol.iterator] = {toJSON: function () { throw "fit"; }};
+assertEq(JSON.stringify(obj), '{"a":1}');
 
-    var replacer = function (k, v) {
-        if (typeof k === "symbol")
-            throw "fit";
-        return v;
-    };
-    assertEq(JSON.stringify(obj, replacer), '{"a":1}');
-}
+var replacer = function (k, v) {
+    if (typeof k === "symbol")
+        throw "fit";
+    return v;
+};
+assertEq(JSON.stringify(obj, replacer), '{"a":1}');
 
 if (typeof reportCompare === 'function')
     reportCompare(0, 0, 'ok');
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-values.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-values.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-values.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/json-stringify-values.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,34 +1,32 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // To JSON.stringify, symbols are the same as undefined.
+// To JSON.stringify, symbols are the same as undefined.
 
-    var symbols = [
-        Symbol(),
-        Symbol.for("ponies"),
-        Symbol.iterator
-    ];
-
-    for (var sym of symbols) {
-        assertEq(JSON.stringify(sym), undefined);
-        assertEq(JSON.stringify([sym]), "[null]");
-
-        // JSON.stringify skips symbol-valued properties!
-        assertEq(JSON.stringify({x: sym}), '{}');
-
-        // However such properties are passed to the replacerFunction if any.
-        var replacer = function (key, val) {
-            assertEq(typeof this, "object");
-            if (typeof val === "symbol") {
-                assertEq(val, sym);
-                return "ding";
-            }
-            return val;
-        };
-        assertEq(JSON.stringify(sym, replacer), '"ding"');
-        assertEq(JSON.stringify({x: sym}, replacer), '{"x":"ding"}');
-    }
+var symbols = [
+    Symbol(),
+    Symbol.for("ponies"),
+    Symbol.iterator
+];
+
+for (var sym of symbols) {
+    assertEq(JSON.stringify(sym), undefined);
+    assertEq(JSON.stringify([sym]), "[null]");
+
+    // JSON.stringify skips symbol-valued properties!
+    assertEq(JSON.stringify({x: sym}), '{}');
+
+    // However such properties are passed to the replacerFunction if any.
+    var replacer = function (key, val) {
+        assertEq(typeof this, "object");
+        if (typeof val === "symbol") {
+            assertEq(val, sym);
+            return "ding";
+        }
+        return val;
+    };
+    assertEq(JSON.stringify(sym, replacer), '"ding"');
+    assertEq(JSON.stringify({x: sym}, replacer), '{"x":"ding"}');
 }
 
 if (typeof reportCompare === 'function')
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/keyFor.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/keyFor.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/keyFor.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/keyFor.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,17 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    assertEq(Symbol.keyFor(Symbol.for("moon")), "moon");
-    assertEq(Symbol.keyFor(Symbol.for("")), "");
-    assertEq(Symbol.keyFor(Symbol("moon")), undefined);
-    assertEq(Symbol.keyFor(Symbol.iterator), undefined);
+assertEq(Symbol.keyFor(Symbol.for("moon")), "moon");
+assertEq(Symbol.keyFor(Symbol.for("")), "");
+assertEq(Symbol.keyFor(Symbol("moon")), undefined);
+assertEq(Symbol.keyFor(Symbol.iterator), undefined);
 
-    assertThrowsInstanceOf(() => Symbol.keyFor(), TypeError);
-    assertThrowsInstanceOf(() => Symbol.keyFor(Object(Symbol("moon"))), TypeError);
+assertThrowsInstanceOf(() => Symbol.keyFor(), TypeError);
+assertThrowsInstanceOf(() => Symbol.keyFor(Object(Symbol("moon"))), TypeError);
 
-    assertEq(Symbol.keyFor.length, 1);
-}
+assertEq(Symbol.keyFor.length, 1);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-accessor.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-accessor.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-accessor.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-accessor.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,41 +1,39 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var obj = {};
-    var sym = Symbol();
-
-    var gets = 0;
-    var sets = [];
-    Object.defineProperty(obj, sym, {
-        get: function () { return ++gets; },
-        set: function (v) { sets.push(v); }
-    });
-
-    // getter
-    for (var i = 1; i < 9; i++)
-        assertEq(obj[sym], i);
-
-    // setter
-    var expected = [];
-    for (var i = 0; i < 9; i++) {
-        assertEq(obj[sym] = i, i);
-        expected.push(i);
-    }
-    assertDeepEq(sets, expected);
-
-    // increment operator
-    gets = 0;
-    sets = [];
-    assertEq(obj[sym]++, 1);
-    assertDeepEq(sets, [2]);
-
-    // assignment
-    gets = 0;
-    sets = [];
-    assertEq(obj[sym] *= 12, 12);
-    assertDeepEq(sets, [12]);
+var obj = {};
+var sym = Symbol();
+
+var gets = 0;
+var sets = [];
+Object.defineProperty(obj, sym, {
+    get: function () { return ++gets; },
+    set: function (v) { sets.push(v); }
+});
+
+// getter
+for (var i = 1; i < 9; i++)
+    assertEq(obj[sym], i);
+
+// setter
+var expected = [];
+for (var i = 0; i < 9; i++) {
+    assertEq(obj[sym] = i, i);
+    expected.push(i);
 }
+assertDeepEq(sets, expected);
+
+// increment operator
+gets = 0;
+sets = [];
+assertEq(obj[sym]++, 1);
+assertDeepEq(sets, [2]);
+
+// assignment
+gets = 0;
+sets = [];
+assertEq(obj[sym] *= 12, 12);
+assertDeepEq(sets, [12]);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-basics.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-basics.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-basics.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-basics.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,45 +1,43 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var symbols = [
-        Symbol(),
-        Symbol("one"),
-        Symbol.for("two"),
-        Symbol.iterator,
-        Object(Symbol())
-    ];
-
-    for (var sym of symbols) {
-        var obj = {};
-
-        // access a nonexistent property
-        assertEq(sym in obj, false);
-        assertEq(obj.hasOwnProperty(sym), false);
-        assertEq(obj[sym], undefined);
-        assertEq(typeof obj[sym], "undefined");
-        assertEq(Object.getOwnPropertyDescriptor(obj, sym), undefined);
-
-        // assign, then try accessing again
-        obj[sym] = "ok";
-        assertEq(sym in obj, true);
-        assertEq(obj.hasOwnProperty(sym), true);
-        assertEq(obj[sym], "ok");
-        assertDeepEq(Object.getOwnPropertyDescriptor(obj, sym), {
-            configurable: true,
-            enumerable: true,
-            value: "ok",
-            writable: true
-        });
-
-        // assign again, observe value is overwritten
-        obj[sym] = 12;
-        assertEq(obj[sym], 12);
-
-        // increment
-        assertEq(obj[sym]++, 12);
-        assertEq(obj[sym], 13);
-    }
+var symbols = [
+    Symbol(),
+    Symbol("one"),
+    Symbol.for("two"),
+    Symbol.iterator,
+    Object(Symbol())
+];
+
+for (var sym of symbols) {
+    var obj = {};
+
+    // access a nonexistent property
+    assertEq(sym in obj, false);
+    assertEq(obj.hasOwnProperty(sym), false);
+    assertEq(obj[sym], undefined);
+    assertEq(typeof obj[sym], "undefined");
+    assertEq(Object.getOwnPropertyDescriptor(obj, sym), undefined);
+
+    // assign, then try accessing again
+    obj[sym] = "ok";
+    assertEq(sym in obj, true);
+    assertEq(obj.hasOwnProperty(sym), true);
+    assertEq(obj[sym], "ok");
+    assertDeepEq(Object.getOwnPropertyDescriptor(obj, sym), {
+        configurable: true,
+        enumerable: true,
+        value: "ok",
+        writable: true
+    });
+
+    // assign again, observe value is overwritten
+    obj[sym] = 12;
+    assertEq(obj[sym], 12);
+
+    // increment
+    assertEq(obj[sym]++, 12);
+    assertEq(obj[sym], 13);
 }
 
 if (typeof reportCompare === "function")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-inheritance.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-inheritance.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-inheritance.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-inheritance.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,53 +1,50 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
+var sym = Symbol.for("hello");
 function F() {}
+var f = new F();
 
-if (typeof Symbol === "function") {
-    var sym = Symbol.for("hello");
-    var f = new F();
-
-    // inherited data property
-    F.prototype[sym] = "world";
-    assertEq(sym in f, true);
-    assertEq(f.hasOwnProperty(sym), false);
-    assertEq(f[sym], "world");
-
-    // shadowing assignment
-    f[sym] = "kitty";
-    assertEq(f[sym], "kitty");
-    assertEq(F.prototype[sym], "world");
-
-    // deletion, revealing previously shadowed property
-    assertEq(delete f[sym], true);
-    assertEq(f.hasOwnProperty(sym), false);
-    assertEq(f[sym], "world");
-
-    // inherited accessor property
-    var value = undefined;
-    Object.defineProperty(F.prototype, sym, {
-        configurable: true,
-        get: function () { return 23; },
-        set: function (v) { value = v; }
-    });
-    assertEq(sym in f, true);
-    assertEq(f.hasOwnProperty(sym), false);
-    assertEq(f[sym], 23);
-    f[sym] = "gravity";
-    assertEq(value, "gravity");
-
-    // inherited accessor property with no setter
-    Object.defineProperty(F.prototype, sym, {
-        set: undefined
-    });
-    assertThrowsInstanceOf(function () { "use strict"; f[sym] = 0; }, TypeError);
-
-    // deeply inherited accessor property
-    var g = Object.create(f);
-    for (var i = 0; i < 100; i++)
-        g = Object.create(g);
-    assertEq(g[sym], 23);
-}
+// inherited data property
+F.prototype[sym] = "world";
+assertEq(sym in f, true);
+assertEq(f.hasOwnProperty(sym), false);
+assertEq(f[sym], "world");
+
+// shadowing assignment
+f[sym] = "kitty";
+assertEq(f[sym], "kitty");
+assertEq(F.prototype[sym], "world");
+
+// deletion, revealing previously shadowed property
+assertEq(delete f[sym], true);
+assertEq(f.hasOwnProperty(sym), false);
+assertEq(f[sym], "world");
+
+// inherited accessor property
+var value = undefined;
+Object.defineProperty(F.prototype, sym, {
+    configurable: true,
+    get: function () { return 23; },
+    set: function (v) { value = v; }
+});
+assertEq(sym in f, true);
+assertEq(f.hasOwnProperty(sym), false);
+assertEq(f[sym], 23);
+f[sym] = "gravity";
+assertEq(value, "gravity");
+
+// inherited accessor property with no setter
+Object.defineProperty(F.prototype, sym, {
+    set: undefined
+});
+assertThrowsInstanceOf(function () { "use strict"; f[sym] = 0; }, TypeError);
+
+// deeply inherited accessor property
+var g = Object.create(f);
+for (var i = 0; i < 100; i++)
+    g = Object.create(g);
+assertEq(g[sym], 23);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-nonwritable.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-nonwritable.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-nonwritable.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-nonwritable.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,6 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
+var sym = Symbol.for("moon");
 function checkNotWritable(obj) {
     // In sloppy mode, assigning to a nonwritable property silently fails.
     obj[sym] = "portals";
@@ -11,24 +12,20 @@
     assertEq(obj[sym], "cheese");
 }
 
-if (typeof Symbol === "function") {
-    var sym = Symbol.for("moon");
-
-    var x = {};
-    Object.defineProperty(x, sym, {
-        configurable: true,
-        enumerable: true,
-        value: "cheese",
-        writable: false
-    });
-
-    checkNotWritable(x);
-
-    // Assignment can't shadow inherited nonwritable properties either.
-    var y = Object.create(x);
-    checkNotWritable(y);
-    checkNotWritable(Object.create(y));
-}
+var x = {};
+Object.defineProperty(x, sym, {
+    configurable: true,
+    enumerable: true,
+    value: "cheese",
+    writable: false
+});
+
+checkNotWritable(x);
+
+// Assignment can't shadow inherited nonwritable properties either.
+var y = Object.create(x);
+checkNotWritable(y);
+checkNotWritable(Object.create(y));
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-reflection.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-reflection.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/property-reflection.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/property-reflection.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,139 +1,136 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-function F() {}
-function D() {}
+// Basic tests for standard Object APIs interacting with symbols.
 
-if (typeof Symbol === "function") {
-    // Basic tests for standard Object APIs interacting with symbols.
+// Object.defineProperty
+function F() {}
+var f = new F;
+Object.defineProperty(f, Symbol.for("name"), {
+    configurable: true,
+    value: "eff"
+});
+assertEq("name" in f, false);
+assertEq("Symbol(name)" in f, false);
+assertEq(Symbol.for("name") in f, true);
+assertEq(f[Symbol.for("name")], "eff");
 
-    // Object.defineProperty
-    var f = new F;
-    Object.defineProperty(f, Symbol.for("name"), {
-        configurable: true,
-        value: "eff"
-    });
-    assertEq("name" in f, false);
-    assertEq("Symbol(name)" in f, false);
-    assertEq(Symbol.for("name") in f, true);
-    assertEq(f[Symbol.for("name")], "eff");
-
-    // Object.defineProperties
-    var descs = new D;
-    var s1 = Symbol("s1");
-    var hits = 0;
-    descs[s1] = {
-        configurable: true,
-        enumerable: true,
-        get: () => hits++,
-        set: undefined
-    };
-    var s2 = Symbol("s2");
-    descs[s2] = {
-        configurable: true,
-        enumerable: false,
-        value: {},
-        writable: true
-    };
-    var s3 = Symbol("s3");
-    D.prototype[s3] = {value: "FAIL"};
-    assertEq(Object.defineProperties(f, descs), f);
-    assertEq(s1 in f, true);
-    assertEq(f[s1], 0);
-    assertEq(hits, 1);
-    assertEq(s2 in f, true);
-    assertEq(f[s2], descs[s2].value);
-    assertEq(s3 in f, false);
-
-    // Object.create
-    var n = Object.create({}, descs);
-    assertEq(s1 in n, true);
-    assertEq(n[s1], 1);
-    assertEq(hits, 2);
-    assertEq(s2 in n, true);
-    assertEq(n[s2], descs[s2].value);
-    assertEq(s3 in n, false);
-
-    // Object.getOwnPropertyDescriptor
-    var desc = Object.getOwnPropertyDescriptor(n, s1);
-    assertDeepEq(desc, descs[s1]);
-    assertEq(desc.get, descs[s1].get);
-    desc = Object.getOwnPropertyDescriptor(n, s2);
-    assertDeepEq(desc, descs[s2]);
-    assertEq(desc.value, descs[s2].value);
-
-    // Object.prototype.hasOwnProperty
-    assertEq(descs.hasOwnProperty(s1), true);
-    assertEq(descs.hasOwnProperty(s2), true);
-    assertEq(descs.hasOwnProperty(s3), false);
-    assertEq([].hasOwnProperty(Symbol.iterator), false);
-    assertEq(Array.prototype.hasOwnProperty(Symbol.iterator), true);
-
-    // Object.prototype.propertyIsEnumerable
-    assertEq(n.propertyIsEnumerable(s1), true);
-    assertEq(n.propertyIsEnumerable(s2), false);
-    assertEq(n.propertyIsEnumerable(s3), false);  // no such property
-    assertEq(D.prototype.propertyIsEnumerable(s3), true);
-    assertEq(descs.propertyIsEnumerable(s3), false); // inherited properties are not considered
-
-    // Object.preventExtensions
-    var obj = {};
-    obj[s1] = 1;
-    assertEq(Object.preventExtensions(obj), obj);
-    assertThrowsInstanceOf(function () { "use strict"; obj[s2] = 2; }, TypeError);
-    obj[s2] = 2;  // still no effect
-    assertEq(s2 in obj, false);
-
-    // Object.isSealed, Object.isFrozen
-    assertEq(Object.isSealed(obj), false);
-    assertEq(Object.isFrozen(obj), false);
-    assertEq(delete obj[s1], true);
-    assertEq(Object.isSealed(obj), true);
-    assertEq(Object.isFrozen(obj), true);
-
-    obj = {};
-    obj[s1] = 1;
-    Object.preventExtensions(obj);
-    Object.defineProperty(obj, s1, {configurable: false});  // still writable
-    assertEq(Object.isSealed(obj), true);
-    assertEq(Object.isFrozen(obj), false);
-    obj[s1] = 2;
-    assertEq(obj[s1], 2);
-    Object.defineProperty(obj, s1, {writable: false});
-    assertEq(Object.isFrozen(obj), true);
-
-    // Object.seal, Object.freeze
-    var obj = {};
-    obj[s1] = 1;
-    Object.seal(obj);
-    desc = Object.getOwnPropertyDescriptor(obj, s1);
-    assertEq(desc.configurable, false);
-    assertEq(desc.writable, true);
-    Object.freeze(obj);
-    assertEq(Object.getOwnPropertyDescriptor(obj, s1).writable, false);
-
-    // Object.setPrototypeOf purges caches for symbol-keyed properties.
-    var proto = {};
-    proto[s1] = 1;
-    Object.defineProperty(proto, s2, {
-        get: () => 2,
-        set: v => undefined
-    });
-    var obj = Object.create(proto);
-    var last1, last2;
-    var N = 9;
-    for (var i = 0; i < N; i++) {
-        last1 = obj[s1];
-        last2 = obj[s2];
-        obj[s2] = "marker";
-        if (i === N - 2)
-            Object.setPrototypeOf(obj, {});
-    }
-    assertEq(last1, undefined);
-    assertEq(last2, undefined);
-    assertEq(obj.hasOwnProperty(s2), true);
-    assertEq(obj[s2], "marker");
+// Object.defineProperties
+function D() {}
+var descs = new D;
+var s1 = Symbol("s1");
+var hits = 0;
+descs[s1] = {
+    configurable: true,
+    enumerable: true,
+    get: () => hits++,
+    set: undefined
+};
+var s2 = Symbol("s2");
+descs[s2] = {
+    configurable: true,
+    enumerable: false,
+    value: {},
+    writable: true
+};
+var s3 = Symbol("s3");
+D.prototype[s3] = {value: "FAIL"};
+assertEq(Object.defineProperties(f, descs), f);
+assertEq(s1 in f, true);
+assertEq(f[s1], 0);
+assertEq(hits, 1);
+assertEq(s2 in f, true);
+assertEq(f[s2], descs[s2].value);
+assertEq(s3 in f, false);
+
+// Object.create
+var n = Object.create({}, descs);
+assertEq(s1 in n, true);
+assertEq(n[s1], 1);
+assertEq(hits, 2);
+assertEq(s2 in n, true);
+assertEq(n[s2], descs[s2].value);
+assertEq(s3 in n, false);
+
+// Object.getOwnPropertyDescriptor
+var desc = Object.getOwnPropertyDescriptor(n, s1);
+assertDeepEq(desc, descs[s1]);
+assertEq(desc.get, descs[s1].get);
+desc = Object.getOwnPropertyDescriptor(n, s2);
+assertDeepEq(desc, descs[s2]);
+assertEq(desc.value, descs[s2].value);
+
+// Object.prototype.hasOwnProperty
+assertEq(descs.hasOwnProperty(s1), true);
+assertEq(descs.hasOwnProperty(s2), true);
+assertEq(descs.hasOwnProperty(s3), false);
+assertEq([].hasOwnProperty(Symbol.iterator), false);
+assertEq(Array.prototype.hasOwnProperty(Symbol.iterator), true);
+
+// Object.prototype.propertyIsEnumerable
+assertEq(n.propertyIsEnumerable(s1), true);
+assertEq(n.propertyIsEnumerable(s2), false);
+assertEq(n.propertyIsEnumerable(s3), false);  // no such property
+assertEq(D.prototype.propertyIsEnumerable(s3), true);
+assertEq(descs.propertyIsEnumerable(s3), false); // inherited properties are not considered
+
+// Object.preventExtensions
+var obj = {};
+obj[s1] = 1;
+assertEq(Object.preventExtensions(obj), obj);
+assertThrowsInstanceOf(function () { "use strict"; obj[s2] = 2; }, TypeError);
+obj[s2] = 2;  // still no effect
+assertEq(s2 in obj, false);
+
+// Object.isSealed, Object.isFrozen
+assertEq(Object.isSealed(obj), false);
+assertEq(Object.isFrozen(obj), false);
+assertEq(delete obj[s1], true);
+assertEq(Object.isSealed(obj), true);
+assertEq(Object.isFrozen(obj), true);
+
+obj = {};
+obj[s1] = 1;
+Object.preventExtensions(obj);
+Object.defineProperty(obj, s1, {configurable: false});  // still writable
+assertEq(Object.isSealed(obj), true);
+assertEq(Object.isFrozen(obj), false);
+obj[s1] = 2;
+assertEq(obj[s1], 2);
+Object.defineProperty(obj, s1, {writable: false});
+assertEq(Object.isFrozen(obj), true);
+
+// Object.seal, Object.freeze
+var obj = {};
+obj[s1] = 1;
+Object.seal(obj);
+desc = Object.getOwnPropertyDescriptor(obj, s1);
+assertEq(desc.configurable, false);
+assertEq(desc.writable, true);
+Object.freeze(obj);
+assertEq(Object.getOwnPropertyDescriptor(obj, s1).writable, false);
+
+// Object.setPrototypeOf purges caches for symbol-keyed properties.
+var proto = {};
+proto[s1] = 1;
+Object.defineProperty(proto, s2, {
+    get: () => 2,
+    set: v => undefined
+});
+var obj = Object.create(proto);
+var last1, last2;
+var N = 9;
+for (var i = 0; i < N; i++) {
+    last1 = obj[s1];
+    last2 = obj[s2];
+    obj[s2] = "marker";
+    if (i === N - 2)
+        Object.setPrototypeOf(obj, {});
 }
+assertEq(last1, undefined);
+assertEq(last2, undefined);
+assertEq(obj.hasOwnProperty(s2), true);
+assertEq(obj[s2], "marker");
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/realms.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/realms.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/realms.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/realms.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,37 +1,35 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Symbols can be shared across realms.
+// Symbols can be shared across realms.
 
-    if (typeof Reflect !== "undefined" && typeof Reflect.Realm === "function") {
-        throw new Error("Congratulations on implementing Reflect.Realm! " +
-                        "Please update this test to use it.");
-    }
-    if (typeof newGlobal === "function") {
-        var g = newGlobal();
-        var gj = g.eval("jones = Symbol('jones')");
-        assertEq(typeof gj, "symbol");
-        assertEq(g.jones, g.jones);
-        assertEq(gj, g.jones);
-        assertEq(gj !== Symbol("jones"), true);
-
-        // A symbol can be round-tripped to another realm and back;
-        // the result is the original symbol.
-        var smith = Symbol("smith");
-        g.smith = smith;  // put smith into the realm
-        assertEq(g.smith, smith);  // pull it back out
-
-        // Spot-check that non-generic methods can be applied to symbols and Symbol
-        // objects from other realms.
-        assertEq(Symbol.prototype.toString.call(gj), "Symbol(jones)");
-        assertEq(Symbol.prototype.toString.call(g.eval("Object(Symbol('brown'))")),
-                 "Symbol(brown)");
-
-        // Symbol.for functions share a symbol registry across all realms.
-        assertEq(g.Symbol.for("ponies"), Symbol.for("ponies"));
-        assertEq(g.eval("Symbol.for('rainbows')"), Symbol.for("rainbows"));
-    }
+if (typeof Reflect !== "undefined" && typeof Reflect.Realm === "function") {
+    throw new Error("Congratulations on implementing Reflect.Realm! " +
+                    "Please update this test to use it.");
+}
+if (typeof newGlobal === "function") {
+    var g = newGlobal();
+    var gj = g.eval("jones = Symbol('jones')");
+    assertEq(typeof gj, "symbol");
+    assertEq(g.jones, g.jones);
+    assertEq(gj, g.jones);
+    assertEq(gj !== Symbol("jones"), true);
+
+    // A symbol can be round-tripped to another realm and back;
+    // the result is the original symbol.
+    var smith = Symbol("smith");
+    g.smith = smith;  // put smith into the realm
+    assertEq(g.smith, smith);  // pull it back out
+
+    // Spot-check that non-generic methods can be applied to symbols and Symbol
+    // objects from other realms.
+    assertEq(Symbol.prototype.toString.call(gj), "Symbol(jones)");
+    assertEq(Symbol.prototype.toString.call(g.eval("Object(Symbol('brown'))")),
+             "Symbol(brown)");
+
+    // Symbol.for functions share a symbol registry across all realms.
+    assertEq(g.Symbol.for("ponies"), Symbol.for("ponies"));
+    assertEq(g.eval("Symbol.for('rainbows')"), Symbol.for("rainbows"));
 }
 
 if (typeof reportCompare === "function")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/surfaces.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/surfaces.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/surfaces.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/surfaces.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,36 +1,34 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Test superficial properties of the Symbol constructor and prototype.
+// Test superficial properties of the Symbol constructor and prototype.
 
-    var desc = Object.getOwnPropertyDescriptor(this, "Symbol");
-    assertEq(desc.configurable, true);
-    assertEq(desc.enumerable, false);
-    assertEq(desc.writable, true);
-    assertEq(typeof Symbol, "function");
-    assertEq(Symbol.length, 1);
-
-    desc = Object.getOwnPropertyDescriptor(Symbol, "prototype");
-    assertEq(desc.configurable, false);
-    assertEq(desc.enumerable, false);
-    assertEq(desc.writable, false);
-
-    assertEq(Symbol.prototype.constructor, Symbol);
-    desc = Object.getOwnPropertyDescriptor(Symbol.prototype, "constructor");
-    assertEq(desc.configurable, true);
-    assertEq(desc.enumerable, false);
-    assertEq(desc.writable, true);
-
-    desc = Object.getOwnPropertyDescriptor(Symbol, "iterator");
-    assertEq(desc.configurable, false);
-    assertEq(desc.enumerable, false);
-    assertEq(desc.writable, false);
-
-    assertEq(Symbol.for.length, 1);
-    assertEq(Symbol.prototype.toString.length, 0);
-    assertEq(Symbol.prototype.valueOf.length, 0);
-}
+var desc = Object.getOwnPropertyDescriptor(this, "Symbol");
+assertEq(desc.configurable, true);
+assertEq(desc.enumerable, false);
+assertEq(desc.writable, true);
+assertEq(typeof Symbol, "function");
+assertEq(Symbol.length, 1);
+
+desc = Object.getOwnPropertyDescriptor(Symbol, "prototype");
+assertEq(desc.configurable, false);
+assertEq(desc.enumerable, false);
+assertEq(desc.writable, false);
+
+assertEq(Symbol.prototype.constructor, Symbol);
+desc = Object.getOwnPropertyDescriptor(Symbol.prototype, "constructor");
+assertEq(desc.configurable, true);
+assertEq(desc.enumerable, false);
+assertEq(desc.writable, true);
+
+desc = Object.getOwnPropertyDescriptor(Symbol, "iterator");
+assertEq(desc.configurable, false);
+assertEq(desc.enumerable, false);
+assertEq(desc.writable, false);
+
+assertEq(Symbol.for.length, 1);
+assertEq(Symbol.prototype.toString.length, 0);
+assertEq(Symbol.prototype.valueOf.length, 0);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/toString.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/toString.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/toString.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/toString.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,29 +1,27 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var cases = [
-        {sym: Symbol(), str: "Symbol()"},
-        {sym: Symbol("ok"), str: "Symbol(ok)"},
-        {sym: Symbol("\0"), str: "Symbol(\0)"},
-        {sym: Symbol.iterator, str: "Symbol(Symbol.iterator)"},
-        {sym: Symbol.for("dummies"), str: "Symbol(dummies)"}
-    ];
+var cases = [
+    {sym: Symbol(), str: "Symbol()"},
+    {sym: Symbol("ok"), str: "Symbol(ok)"},
+    {sym: Symbol("\0"), str: "Symbol(\0)"},
+    {sym: Symbol.iterator, str: "Symbol(Symbol.iterator)"},
+    {sym: Symbol.for("dummies"), str: "Symbol(dummies)"}
+];
 
-    // Symbol.prototype.toString works on both primitive symbols and Symbol
-    // objects.
-    for (var test of cases) {
-        assertEq(test.sym.toString(), test.str);
-        assertEq(Object(test.sym).toString(), test.str);
-    }
-
-    // Any other value throws.
-    var nonsymbols = [
-        undefined, null, "not-ok", new String("still-not-ok"), {}, []
-    ];
-    for (var nonsym of nonsymbols)
-        assertThrowsInstanceOf(() => Symbol.prototype.toString.call(nonsym), TypeError);
+// Symbol.prototype.toString works on both primitive symbols and Symbol
+// objects.
+for (var test of cases) {
+    assertEq(test.sym.toString(), test.str);
+    assertEq(Object(test.sym).toString(), test.str);
 }
 
+// Any other value throws.
+var nonsymbols = [
+    undefined, null, "not-ok", new String("still-not-ok"), {}, []
+];
+for (var nonsym of nonsymbols)
+    assertThrowsInstanceOf(() => Symbol.prototype.toString.call(nonsym), TypeError);
+
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/typed-arrays.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/typed-arrays.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/typed-arrays.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/typed-arrays.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,18 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Symbol-to-number type conversions involving typed arrays.
+// Symbol-to-number type conversions involving typed arrays.
 
-    for (var T of [Uint8Array, Uint8ClampedArray, Int16Array, Float32Array]) {
-        // Typed array constructors convert symbols using ToNumber(), which throws.
-        assertThrowsInstanceOf(() => new T([Symbol("a")]), TypeError);
+for (var T of [Uint8Array, Uint8ClampedArray, Int16Array, Float32Array]) {
+    // Typed array constructors convert symbols using ToNumber(), which throws.
+    assertThrowsInstanceOf(() => new T([Symbol("a")]), TypeError);
 
-        // Assignment does the same.
-        var arr = new T([1]);
-        assertThrowsInstanceOf(() => { arr[0] = Symbol.iterator; }, TypeError);
-        assertEq(arr[0], 1);
-    }
+    // Assignment does the same.
+    var arr = new T([1]);
+    assertThrowsInstanceOf(() => { arr[0] = Symbol.iterator; }, TypeError);
+    assertEq(arr[0], 1);
 }
 
 if (typeof reportCompare === "function")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/typeof.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/typeof.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/typeof.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/typeof.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,13 +1,11 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    assertEq(typeof Symbol(), "symbol");
-    assertEq(typeof Symbol("ponies"), "symbol");
-    assertEq(typeof Symbol.for("ponies"), "symbol");
+assertEq(typeof Symbol(), "symbol");
+assertEq(typeof Symbol("ponies"), "symbol");
+assertEq(typeof Symbol.for("ponies"), "symbol");
 
-    assertEq(typeof Object(Symbol()), "object");
-}
+assertEq(typeof Object(Symbol()), "object");
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/valueOf.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/valueOf.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/valueOf.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/valueOf.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,24 +1,22 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var symbols = [
-        Symbol(),
-        Symbol("ok"),
-        Symbol.for("dummies"),
-        Symbol.iterator
-    ];
+var symbols = [
+    Symbol(),
+    Symbol("ok"),
+    Symbol.for("dummies"),
+    Symbol.iterator
+];
 
-    for (var sym of symbols) {
-        assertEq(sym.valueOf(), sym);
-        assertEq(Object(sym).valueOf(), sym);
-    }
-
-    // Any other value throws.
-    var nonsymbols = [undefined, null, NaN, {}, Symbol.prototype];
-    for (var nonsym of nonsymbols)
-        assertThrowsInstanceOf(() => Symbol.prototype.valueOf.call(nonsym), TypeError);
+for (var sym of symbols) {
+    assertEq(sym.valueOf(), sym);
+    assertEq(Object(sym).valueOf(), sym);
 }
 
+// Any other value throws.
+var nonsymbols = [undefined, null, NaN, {}, Symbol.prototype];
+for (var nonsym of nonsymbols)
+    assertThrowsInstanceOf(() => Symbol.prototype.valueOf.call(nonsym), TypeError);
+
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/well-known.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/well-known.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/Symbol/well-known.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/Symbol/well-known.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,20 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Well-known symbols exist.
-    assertEq(typeof Symbol.iterator, "symbol");
+// Well-known symbols exist.
+assertEq(typeof Symbol.iterator, "symbol");
 
-    // They are never in the registry.
-    assertEq(Symbol.iterator !== Symbol.for("Symbol.iterator"), true);
+// They are never in the registry.
+assertEq(Symbol.iterator !== Symbol.for("Symbol.iterator"), true);
 
-    // They are shared across realms.
-    if (typeof Realm === 'function')
-        throw new Error("please update this test to use Realms");
-    if (typeof newGlobal === 'function') {
-        var g = newGlobal();
-        assertEq(Symbol.iterator, g.Symbol.iterator);
-    }
+// They are shared across realms.
+if (typeof Realm === 'function')
+    throw new Error("please update this test to use Realms");
+if (typeof newGlobal === 'function') {
+    var g = newGlobal();
+    assertEq(Symbol.iterator, g.Symbol.iterator);
 }
 
 if (typeof reportCompare === "function")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/TypedArray/map-and-filter.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/TypedArray/map-and-filter.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/TypedArray/map-and-filter.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/TypedArray/map-and-filter.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,297 @@
+const constructors = [
+    Int8Array,
+    Uint8Array,
+    Uint8ClampedArray,
+    Int16Array,
+    Uint16Array,
+    Int32Array,
+    Uint32Array,
+    Float32Array,
+    Float64Array
+];
+
+// Tests for TypedArray#map.
+for (var constructor of constructors) {
+    assertEq(constructor.prototype.map.length, 1);
+
+    // Basic tests.
+    assertDeepEq(new constructor([1, 3, 5]).map(v => v * 2), new constructor([2,6,10]));
+    assertDeepEq(new constructor([-1, 13, 5]).map(v => v - 2), new constructor([-3, 11, 3]));
+    assertDeepEq(new constructor(10).map(v => v), new constructor(10));
+    assertDeepEq(new constructor().map(v => v + 1), new constructor);
+    assertDeepEq(new constructor([1,2,3]).map(v => v), new constructor([1,2,3]));
+
+    var arr = new constructor([1, 2, 3, 4, 5]);
+    var sum = 0;
+    var count = 0;
+    assertDeepEq(arr.map((v, k, o) => {
+        count++;
+        sum += v;
+        assertEq(k, v - 1);
+        assertEq(o, arr);
+        return v;
+    }), arr);
+    assertEq(sum, 15);
+    assertEq(count, 5);
+
+    // Test that changing elements that have been visited does not affect the result.
+    var changeArr = new constructor([1,2,3,4,5]);
+    assertDeepEq(arr.map((v,k) => {
+        changeArr[k] = v + 1;
+        return v;
+    }), new constructor([1,2,3,4,5]));
+
+    // Tests for `thisArg` argument.
+    function assertThisArg(thisArg, thisValue) {
+        // In sloppy mode, `this` could be global object or a wrapper of `thisArg`.
+        assertDeepEq(arr.map(function(v) {
+            assertDeepEq(this, thisValue);
+            return v;
+        }, thisArg), arr);
+
+        // In strict mode, `this` strictly equals `thisArg`.
+        assertDeepEq(arr.map(function(v) {
+            "use strict";
+            assertDeepEq(this, thisArg);
+            return v;
+        }, thisArg), arr);
+
+        // Passing `thisArg` has no effect if callback is an arrow function.
+        var self = this;
+        assertDeepEq(arr.map((v) => {
+            assertEq(this, self);
+            return v;
+        }, thisArg), arr);
+    }
+    assertThisArg([1, 2, 3], [1, 2, 3]);
+    assertThisArg(Object, Object);
+    assertThisArg(1, Object(1));
+    assertThisArg("1", Object("1"));
+    assertThisArg(false, Object(false));
+    assertThisArg(undefined, this);
+    assertThisArg(null, this);
+
+    // Throw an exception in the callback.
+    var sum = 0;
+    var count = 0;
+    var thrown = false;
+    try {
+        arr.map((v, k, o) => {
+            count++;
+            sum += v;
+            assertEq(k, v - 1);
+            assertEq(o, arr);
+            if (v === 3) {
+                throw "map";
+            }
+            return v;
+        })
+    } catch(e) {
+        assertEq(e, "map");
+        thrown = true;
+    }
+    assertEq(thrown, true);
+    assertEq(sum, 6);
+    assertEq(count, 3);
+
+    // There is no callback or callback is not a function.
+    assertThrowsInstanceOf(() => {
+        arr.map();
+    }, TypeError);
+    var invalidCallbacks = [undefined, null, 1, false, "", Symbol(), [], {}, /./];
+    invalidCallbacks.forEach(callback => {
+        assertThrowsInstanceOf(() => {
+            arr.map(callback);
+        }, TypeError);
+    })
+
+    // Callback is a generator.
+    arr.map(function*(){
+        throw "This line will not be executed";
+    });
+
+    // Called from other globals.
+    if (typeof newGlobal === "function") {
+        var map = newGlobal()[constructor.name].prototype.map;
+        var sum = 0;
+        assertDeepEq(map.call(new constructor([1, 2, 3]), v => sum += v), new constructor([1,3,6]));
+        assertEq(sum, 6);
+    }
+
+    // Throws if `this` isn't a TypedArray.
+    var invalidReceivers = [undefined, null, 1, false, "", Symbol(), [], {}, /./,
+                            new Proxy(new constructor(), {})];
+    invalidReceivers.forEach(invalidReceiver => {
+        assertThrowsInstanceOf(() => {
+            constructor.prototype.filter.call(invalidReceiver, () => true);
+        }, TypeError, "Assert that map fails if this value is not a TypedArray");
+    });
+
+    // Test that the length getter is never called.
+    assertDeepEq(Object.defineProperty(new constructor([1, 2, 3]), "length", {
+        get() {
+            throw new Error("length accessor called");
+        }
+    }).map((b) => b), new constructor([1,2,3]));
+}
+
+// Test For TypedArray#filter.
+for (var constructor of constructors) {
+    assertEq(constructor.prototype.filter.length, 1)
+
+    // Basic tests.
+    assertDeepEq(new constructor([1,2,3]).filter(x => x == x), new constructor([1,2,3]));
+    assertDeepEq(new constructor([1,2,3,4]).filter(x => x % 2 == 0), new constructor([2,4]));
+    assertDeepEq(new constructor([1,2,3,4,5]).filter(x => x < 4), new constructor([1,2,3]));
+    assertDeepEq(new constructor().filter(x => x * 2 == 4), new constructor());
+
+    var arr = new constructor([1,2,3,4,5]);
+    var sum = 0;
+    var count = 0;
+    assertDeepEq(arr.filter((v, k, o) => {
+        count++;
+        sum += v;
+        assertEq(k, v - 1);
+        assertEq(o, arr);
+        return (v < 4);
+    }), new constructor([1,2,3]));
+    assertEq(sum, 15);
+    assertEq(count, 5);
+
+    // Test that changing elements that have been visited does not affect the result.
+    var changeArr = new constructor([1,2,3,4,5]);
+    assertDeepEq(arr.filter((v,k) => {
+        changeArr[k] = v + 1;
+        return true;
+    }), new constructor([1,2,3,4,5]));
+
+    // Tests for `thisArg` argument.
+    function assertThisArg(thisArg, thisValue) {
+        // In sloppy mode, `this` could be global object or a wrapper of `thisArg`.
+        assertDeepEq(arr.filter(function(v) {
+            assertDeepEq(this, thisValue);
+            return v;
+        }, thisArg), arr);
+
+        // In strict mode, `this` strictly equals `thisArg`.
+        assertDeepEq(arr.filter(function(v) {
+            "use strict";
+            assertDeepEq(this, thisArg);
+            return v;
+        }, thisArg), arr);
+
+        // Passing `thisArg` has no effect if callback is an arrow function.
+        var self = this;
+        assertDeepEq(arr.filter((v) => {
+            assertEq(this, self);
+            return v;
+        }, thisArg), arr);
+    }
+    assertThisArg([1, 2, 3], [1, 2, 3]);
+    assertThisArg(Object, Object);
+    assertThisArg(1, Object(1));
+    assertThisArg("1", Object("1"));
+    assertThisArg(false, Object(false));
+    assertThisArg(undefined, this);
+    assertThisArg(null, this);
+
+    // Throw an exception in the callback.
+    var sum = 0;
+    var count = 0;
+    var thrown = false;
+    try {
+        arr.filter((v, k, o) => {
+            count++;
+            sum += v;
+            assertEq(k, v - 1);
+            assertEq(o, arr);
+            if (v === 3) {
+                throw "filter";
+            }
+            return v;
+        })
+    } catch(e) {
+        assertEq(e, "filter");
+        thrown = true;
+    }
+    assertEq(thrown, true);
+    assertEq(sum, 6);
+    assertEq(count, 3);
+
+    // There is no callback or callback is not a function.
+    assertThrowsInstanceOf(() => {
+        arr.filter();
+    }, TypeError);
+    var invalidCallbacks = [undefined, null, 1, false, "", Symbol(), [], {}, /./];
+    invalidCallbacks.forEach(callback => {
+        assertThrowsInstanceOf(() => {
+            arr.filter(callback);
+        }, TypeError);
+    })
+
+    // Callback is a generator.
+    arr.filter(function*(){
+        throw "This line will not be executed";
+    });
+
+    // Called from other globals.
+    if (typeof newGlobal === "function") {
+        var filter = newGlobal()[constructor.name].prototype.filter;
+        var sum = 0;
+        assertDeepEq(filter.call(new constructor([1, 2, 3]), v => {sum += v; return true}),
+        new constructor([1,2,3]));
+        assertEq(sum, 6);
+    }
+
+    // Throws if `this` isn't a TypedArray.
+    var invalidReceivers = [undefined, null, 1, false, "", Symbol(), [], {}, /./,
+                            new Proxy(new constructor(), {})];
+    invalidReceivers.forEach(invalidReceiver => {
+        assertThrowsInstanceOf(() => {
+            constructor.prototype.filter.call(invalidReceiver, () => true);
+        }, TypeError, "Assert that filter fails if this value is not a TypedArray");
+    });
+
+    // Test that the length getter is never called.
+    assertDeepEq(Object.defineProperty(new constructor([1, 2, 3]), "length", {
+        get() {
+            throw new Error("length accessor called");
+        }
+    }).filter((b) => true), new constructor([1,2,3]));
+}
+
+// Test that changing Array.prototype[Symbol.iterator] does not affect the
+// behaviour of filter. See https://bugzilla.mozilla.org/show_bug.cgi?id=1121936#c18
+// for more details.
+
+// Object conforming to the "iterator" protocol
+var obj = {
+    v: 0,
+    next: function() {
+        if (this.v == 5) {
+	       return {done : true, value : this.v };
+        } else {
+	       this.v++;
+	       return { done : false, value : this.v };
+        }
+    }
+};
+
+// save
+var old = Array.prototype[Symbol.iterator];
+
+Array.prototype[Symbol.iterator] = obj;
+assertDeepEq(new Uint16Array([1,2,3]).filter(v => true), new Uint16Array([1,2,3]));
+
+// restore
+Array.prototype[Symbol.iterator] = old;
+
+// Test that defining accessors on Array.prototype doesn't affect the behaviour
+// of filter. See https://bugzilla.mozilla.org/show_bug.cgi?id=1121936#c18
+// for more details.
+Object.defineProperty(Array.prototype, 0, {configurable: true, get: function() { return 1; }, set: function() { this.b = 1; }});
+assertDeepEq(new Uint16Array([1,2,3]).filter(v => true), new Uint16Array([1,2,3]));
+delete Array.prototype[0];
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/TypedArray/seal-and-freeze.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/TypedArray/seal-and-freeze.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/TypedArray/seal-and-freeze.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/TypedArray/seal-and-freeze.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,48 @@
+"use strict";
+
+// Seal
+assertEq(Object.isSealed(new Int32Array(2)), false);
+assertEq(Object.isSealed(new Int32Array(0)), false);
+
+var array = new Int32Array(0);
+Object.preventExtensions(array);
+assertEq(Object.isSealed(array), true);
+
+array = new Int32Array(1);
+array.b = "test";
+Object.preventExtensions(array);
+assertEq(Object.isSealed(array), false);
+Object.defineProperty(array, "b", {configurable: false});
+assertEq(Object.isSealed(array), true);
+
+array = new Int32Array(2);
+array.b = "test";
+Object.seal(array);
+assertEq(Object.isSealed(array), true);
+assertThrowsInstanceOf(() => array.c = 15, TypeError);
+
+// Freeze
+assertEq(Object.isFrozen(new Int32Array(2)), false);
+assertEq(Object.isFrozen(new Int32Array(0)), false);
+
+// Empty non-extensible typed-array is trvially frozen
+var array = new Int32Array(0);
+Object.preventExtensions(array);
+assertEq(Object.isFrozen(array), true);
+
+array = new Int32Array(0);
+array.b = "test";
+assertEq(Object.isFrozen(array), false);
+Object.preventExtensions(array);
+assertEq(Object.isFrozen(array), false);
+Object.defineProperty(array, "b", {configurable: false, writable: false});
+assertEq(Object.isFrozen(array), true);
+
+// Non-empty typed arrays can never be frozen, because the elements stay writable
+array = new Int32Array(1);
+assertThrowsInstanceOf(() => Object.freeze(array), TypeError);
+assertEq(Object.isExtensible(array), false);
+assertEq(Object.isFrozen(array), false);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/TypedArray/slice.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/TypedArray/slice.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/TypedArray/slice.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/TypedArray/slice.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,74 @@
+const constructors = [
+    Int8Array,
+    Uint8Array,
+    Uint8ClampedArray,
+    Int16Array,
+    Uint16Array,
+    Int32Array,
+    Uint32Array,
+    Float32Array,
+    Float64Array
+];
+
+for (var constructor of constructors) {
+    assertDeepEq(constructor.prototype.slice.length, 2);
+
+    assertDeepEq(new constructor().slice(0), new constructor());
+    assertDeepEq(new constructor().slice(0, 4), new constructor());
+    assertDeepEq(new constructor(10).slice(0, 2), new constructor(2));
+
+    assertDeepEq(new constructor([1, 2]).slice(1), new constructor([2]));
+    assertDeepEq(new constructor([1, 2]).slice(0), new constructor([1, 2]));
+    assertDeepEq(new constructor([1, 2, 3]).slice(-1), new constructor([3]));
+    assertDeepEq(new constructor([1, 2, 3, 4]).slice(-3, -1), new constructor([2, 3]));
+    assertDeepEq(new constructor([.1, .2]).slice(0), new constructor([.1, .2]));
+
+    assertDeepEq(new constructor([1, 2]).slice(-3), new constructor([1, 2]));
+    assertDeepEq(new constructor([1, 2]).slice(0, -3), new constructor());
+    assertDeepEq(new constructor([1, 2]).slice(4), new constructor());
+    assertDeepEq(new constructor([1, 2]).slice(1, 5), new constructor([2]));
+
+    // Called from other globals.
+    if (typeof newGlobal === "function") {
+        var slice = newGlobal()[constructor.name].prototype.slice;
+        assertDeepEq(slice.call(new constructor([3, 2, 1]), 1),
+                     new constructor([2, 1]));
+    }
+
+    // Throws if `this` isn't a TypedArray.
+    var invalidReceivers = [undefined, null, 1, false, "", Symbol(), [], {}, /./,
+                            new Proxy(new constructor(), {})];
+    invalidReceivers.forEach(invalidReceiver => {
+        assertThrowsInstanceOf(() => {
+            constructor.prototype.slice.call(invalidReceiver, 0);
+        }, TypeError, "Assert that slice fails if this value is not a TypedArray");
+    });
+
+    // Test that the length getter is never called.
+    Object.defineProperty(new constructor([1, 2, 3]), "length", {
+        get() {
+            throw new Error("length accessor called");
+        }
+    }).slice(2);
+
+    // Basic tests for our SpeciesConstructor implementation.
+    var undefConstructor = new constructor(2);
+    undefConstructor.constructor = undefined;
+    assertDeepEq(undefConstructor.slice(1), new constructor(1));
+
+    assertThrowsInstanceOf(() => {
+        var strConstructor = new constructor;
+        strConstructor.constructor = "not a constructor";
+        strConstructor.slice(123);
+    }, TypeError, "Assert that we have an invalid constructor");
+    assertThrowsInstanceOf(() => {
+        var mathConstructor = new constructor;
+        mathConstructor.constructor = Math.sin;
+        mathConstructor.slice(123);
+    }, TypeError, "Assert that we have an invalid constructor");
+
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/WeakMap/symbols.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/WeakMap/symbols.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_6/WeakMap/symbols.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_6/WeakMap/symbols.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,12 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    // Symbols can't be WeakMap keys.
-    var m = new WeakMap;
-    var sym = Symbol();
-    assertThrowsInstanceOf(() => m.set(sym, 0), TypeError);
-}
+// Symbols can't be WeakMap keys.
+var m = new WeakMap;
+var sym = Symbol();
+assertThrowsInstanceOf(() => m.set(sym, 0), TypeError);
 
 if (typeof reportCompare === "function")
   reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_7/SIMD/load.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_7/SIMD/load.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_7/SIMD/load.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_7/SIMD/load.js	2015-02-28 15:03:07.000000000 +0000
@@ -11,9 +11,15 @@
 
 const SIZE_BYTES = SIZE_32_ARRAY * 4;
 
-function MakeComparator(kind, arr) {
+function IsSharedTypedArray(arr) {
+    return arr && arr.buffer && arr.buffer instanceof SharedArrayBuffer;
+}
+
+function MakeComparator(kind, arr, shared) {
     var bpe = arr.BYTES_PER_ELEMENT;
-    var uint8 = (bpe != 1) ? new Uint8Array(arr.buffer) : arr;
+    var uint8 = (bpe != 1) ? (IsSharedTypedArray(arr) ? new SharedUint8Array(arr.buffer)
+                                                      : new Uint8Array(arr.buffer))
+                           : arr;
 
     // Size in bytes of a single element in the SIMD vector.
     var sizeOfLaneElem;
@@ -163,9 +169,48 @@
     assertThrowsInstanceOf(() => SIMD[kind].load(TA, obj), TypeError);
 }
 
+function testSharedArrayBufferCompat() {
+    if (!this.SharedArrayBuffer || !this.SharedFloat32Array || !this.Atomics)
+        return;
+
+    var TA = new SharedFloat32Array(16);
+    for (var i = 0; i < 16; i++)
+        TA[i] = i + 1;
+
+    for (var ta of [
+                    new SharedUint8Array(TA.buffer),
+                    new SharedInt8Array(TA.buffer),
+                    new SharedUint16Array(TA.buffer),
+                    new SharedInt16Array(TA.buffer),
+                    new SharedUint32Array(TA.buffer),
+                    new SharedInt32Array(TA.buffer),
+                    new SharedFloat32Array(TA.buffer),
+                    new SharedFloat64Array(TA.buffer)
+                   ])
+    {
+        for (var kind of ['int32x4', 'float32x4', 'float64x2']) {
+            var comp = MakeComparator(kind, ta);
+            comp.load(0);
+            comp.loadX(0);
+            comp.loadXY(0);
+            comp.loadXYZ(0);
+
+            comp.load(3);
+            comp.loadX(3);
+            comp.loadXY(3);
+            comp.loadXYZ(3);
+        }
+
+        assertThrowsInstanceOf(() => SIMD.int32x4.load(ta, 1024), RangeError);
+        assertThrowsInstanceOf(() => SIMD.float32x4.load(ta, 1024), RangeError);
+        assertThrowsInstanceOf(() => SIMD.float64x2.load(ta, 1024), RangeError);
+    }
+}
+
 testLoad('float32x4', new Float32Array(SIZE_32_ARRAY));
 testLoad('float64x2', new Float64Array(SIZE_64_ARRAY));
 testLoad('int32x4', new Int32Array(SIZE_32_ARRAY));
+testSharedArrayBufferCompat();
 
 if (typeof reportCompare === "function")
     reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_7/SIMD/store.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_7/SIMD/store.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/ecma_7/SIMD/store.js	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/ecma_7/SIMD/store.js	2015-02-28 15:03:07.000000000 +0000
@@ -103,9 +103,50 @@
     assertThrowsInstanceOf(() => SIMD.float32x4.store(F64, 0, v), TypeError);
 }
 
+function testSharedArrayBufferCompat() {
+    if (!this.SharedArrayBuffer || !this.SharedFloat32Array || !this.Atomics)
+        return;
+
+    var I32 = new SharedInt32Array(16);
+    var TA = I32;
+
+    var F32 = new SharedFloat32Array(TA.buffer);
+    var F64 = new SharedFloat64Array(TA.buffer);
+
+    var int32x4 = SIMD.int32x4(1, 2, 3, 4);
+    var float32x4 = SIMD.float32x4(1, 2, 3, 4);
+    var float64x2 = SIMD.float64x2(1, 2);
+
+    for (var ta of [
+                    new SharedUint8Array(TA.buffer),
+                    new SharedInt8Array(TA.buffer),
+                    new SharedUint16Array(TA.buffer),
+                    new SharedInt16Array(TA.buffer),
+                    new SharedUint32Array(TA.buffer),
+                    new SharedInt32Array(TA.buffer),
+                    new SharedFloat32Array(TA.buffer),
+                    new SharedFloat64Array(TA.buffer)
+                   ])
+    {
+        SIMD.int32x4.store(ta, 0, int32x4);
+        for (var i = 0; i < 4; i++) assertEq(I32[i], [1, 2, 3, 4][i]);
+
+        SIMD.float32x4.store(ta, 0, float32x4);
+        for (var i = 0; i < 4; i++) assertEq(F32[i], [1, 2, 3, 4][i]);
+
+        SIMD.float64x2.store(ta, 0, float64x2);
+        for (var i = 0; i < 2; i++) assertEq(F64[i], [1, 2][i]);
+
+        assertThrowsInstanceOf(() => SIMD.int32x4.store(ta, 1024, int32x4), RangeError);
+        assertThrowsInstanceOf(() => SIMD.float32x4.store(ta, 1024, float32x4), RangeError);
+        assertThrowsInstanceOf(() => SIMD.float64x2.store(ta, 1024, float64x2), RangeError);
+    }
+}
+
 testStoreInt32x4();
 testStoreFloat32x4();
 testStoreFloat64x2();
+testSharedArrayBufferCompat();
 
 if (typeof reportCompare === "function")
     reportCompare(true, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/file-mapped-arraybuffers.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/file-mapped-arraybuffers.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/file-mapped-arraybuffers.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/file-mapped-arraybuffers.js	2015-02-28 15:03:07.000000000 +0000
@@ -36,5 +36,6 @@
     assertThrows(() => createMappedArrayBuffer("empty.txt", 0, 8), Error);
 }
 
-test();
+if (getBuildConfiguration()["mapped-array-buffer"])
+    test();
 reportCompare(0, 0, 'ok');
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/noSuchMethod-symbols.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/noSuchMethod-symbols.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/noSuchMethod-symbols.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/noSuchMethod-symbols.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,21 +1,19 @@
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-if (typeof Symbol === "function") {
-    var sym = Symbol("method");
-    var hits = 0;
-    var obj = {
-        __noSuchMethod__: function (key, args) {
-            assertEq(key, sym);
-            assertEq(args.length, 2);
-            assertEq(args[0], "hello");
-            assertEq(args[1], "world");
-            hits++;
-        }
-    };
-    obj[sym]("hello", "world");
-    assertEq(hits, 1);
-}
+var sym = Symbol("method");
+var hits = 0;
+var obj = {
+    __noSuchMethod__: function (key, args) {
+        assertEq(key, sym);
+        assertEq(args.length, 2);
+        assertEq(args[0], "hello");
+        assertEq(args[1], "world");
+        hits++;
+    }
+};
+obj[sym]("hello", "world");
+assertEq(hits, 1);
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/object-toSource-with-symbol-keys.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/object-toSource-with-symbol-keys.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/object-toSource-with-symbol-keys.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/object-toSource-with-symbol-keys.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,16 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/ */
 
-if (typeof Symbol === "function") {
-    var obj = {};
-    obj[Symbol.iterator] = 1;
-    assertEq(obj.toSource(), "({[Symbol.iterator]:1})");
-    obj[Symbol(undefined)] = 2;
-    obj[Symbol('ponies')] = 3;
-    obj[Symbol.for('ponies')] = 4;
-    assertEq(obj.toSource(),
-             '({[Symbol.iterator]:1, [Symbol()]:2, [Symbol("ponies")]:3, [Symbol.for("ponies")]:4})');
-}
+var obj = {};
+obj[Symbol.iterator] = 1;
+assertEq(obj.toSource(), "({[Symbol.iterator]:1})");
+obj[Symbol(undefined)] = 2;
+obj[Symbol('ponies')] = 3;
+obj[Symbol.for('ponies')] = 4;
+assertEq(obj.toSource(),
+         '({[Symbol.iterator]:1, [Symbol()]:2, [Symbol("ponies")]:3, [Symbol.for("ponies")]:4})');
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/reflect-parse.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/reflect-parse.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/reflect-parse.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/reflect-parse.js	2015-02-28 15:03:07.000000000 +0000
@@ -67,6 +67,18 @@
 function catchClause(id, guard, body) Pattern({ type: "CatchClause", param: id, guard: guard, body: body })
 function tryStmt(body, guarded, unguarded, fin) Pattern({ type: "TryStatement", block: body, guardedHandlers: guarded, handler: unguarded, finalizer: fin })
 function letStmt(head, body) Pattern({ type: "LetStatement", head: head, body: body })
+
+function classStmt(id, heritage, body) Pattern({ type: "ClassStatement",
+                                                 name: id,
+                                                 heritage: heritage,
+                                                 body: body})
+function classMethod(id, body, kind, static) Pattern({ type: "ClassMethod",
+                                                       name: id,
+                                                       body: body,
+                                                       kind: kind,
+                                                       static: static })
+
+
 function funExpr(id, args, body, gen) Pattern({ type: "FunctionExpression",
                                                 id: id,
                                                 params: args,
@@ -1134,6 +1146,200 @@
 } catch (e) { }
 
 
+// Classes
+function classesEnabled() {
+    try {
+        Reflect.parse("class foo { constructor() { } }");
+        return true;
+    } catch (e) {
+        assertEq(e instanceof SyntaxError, true);
+        return false;
+    }
+}
+
+function testClasses() {
+    // No unnamed class statements.
+    assertError("class { constructor() { } }", SyntaxError);
+
+    function simpleMethod(id, kind, generator, args=[], isStatic=false) {
+        assertEq(generator && kind === "method", generator);
+        let idN = ident(id);
+        let methodMaker = generator ? genFunExpr : funExpr;
+        let methodName = kind !== "method" ? null : idN;
+        let methodFun = methodMaker(methodName, args.map(ident), blockStmt([]));
+
+        return classMethod(idN, methodFun, kind, isStatic);
+    }
+    function emptyCPNMethod(id, isStatic) {
+        return classMethod(computedName(lit(id)),
+                           funExpr(null, [], blockStmt([])),
+                           "method", isStatic);
+    }
+    function setClassMethods(class_, methods) {
+        class_.template.body = methods;
+    }
+
+    let simpleConstructor = simpleMethod("constructor", "method", false);
+    let emptyFooClass = classStmt(ident("Foo"), null, [simpleConstructor]);
+
+    /* Trivial classes */
+    assertStmt("class Foo { constructor() { } }", emptyFooClass);
+
+    // Allow methods and accessors
+    let stmt = classStmt(ident("Foo"), null,
+                         [simpleConstructor, simpleMethod("method", "method", false)]);
+    assertStmt("class Foo { constructor() { } method() { } }", stmt);
+
+    setClassMethods(stmt, [simpleConstructor, simpleMethod("method", "get", false)]);
+    assertStmt("class Foo { constructor() { } get method() { } }", stmt);
+
+    setClassMethods(stmt, [simpleConstructor, simpleMethod("method", "set", false, ["x"])]);
+    assertStmt("class Foo { constructor() { } set method(x) { } }", stmt);
+
+    /* Static */
+    setClassMethods(stmt, [simpleConstructor,
+                           simpleMethod("method", "method", false, [], true),
+                           simpleMethod("methodGen", "method", true, [], true),
+                           simpleMethod("getter", "get", false, [], true),
+                           simpleMethod("setter", "set", false, ["x"], true)]);
+    assertStmt(`class Foo {
+                  constructor() { };
+                  static method() { };
+                  static *methodGen() { };
+                  static get getter() { };
+                  static set setter(x) { }
+                }`, stmt);
+
+
+    // It's not an error to have a method named static, static, or not.
+    setClassMethods(stmt, [simpleConstructor, simpleMethod("static", "method", false, [], false)]);
+    assertStmt("class Foo{ constructor() { } static() { } }", stmt);
+    setClassMethods(stmt, [simpleMethod("static", "method", false, [], true), simpleConstructor]);
+    assertStmt("class Foo{ static static() { }; constructor() { } }", stmt);
+    setClassMethods(stmt, [simpleMethod("static", "get", false, [], true), simpleConstructor]);
+    assertStmt("class Foo { static get static() { }; constructor() { } }", stmt);
+    setClassMethods(stmt, [simpleConstructor, simpleMethod("static", "set", false, ["x"], true)]);
+    assertStmt("class Foo { constructor() { }; static set static(x) { } }", stmt);
+
+    // You do, however, have to put static in the right spot
+    assertError("class Foo { constructor() { }; get static foo() { } }", SyntaxError);
+
+    // Spec disallows "prototype" as a static member in a class, since that
+    // one's important to make the desugaring work
+    assertError("class Foo { constructor() { } static prototype() { } }", SyntaxError);
+    assertError("class Foo { constructor() { } static *prototype() { } }", SyntaxError);
+    assertError("class Foo { static get prototype() { }; constructor() { } }", SyntaxError);
+    assertError("class Foo { static set prototype(x) { }; constructor() { } }", SyntaxError);
+
+    // You are, however, allowed to have a CPN called prototype as a static
+    setClassMethods(stmt, [simpleConstructor, emptyCPNMethod("prototype", true)]);
+    assertStmt("class Foo { constructor() { }; static [\"prototype\"]() { } }", stmt);
+
+    /* Constructor */
+    // Currently, we do not allow default constructors
+    assertError("class Foo { }", TypeError);
+
+    // It is an error to have two methods named constructor, but not other
+    // names, regardless if one is an accessor or a generator or static.
+    assertError("class Foo { constructor() { } constructor(a) { } }", SyntaxError);
+    let methods = [["method() { }", simpleMethod("method", "method", false)],
+                   ["*method() { }", simpleMethod("method", "method", true)],
+                   ["get method() { }", simpleMethod("method", "get", false)],
+                   ["set method(x) { }", simpleMethod("method", "set", false, ["x"])],
+                   ["static method() { }", simpleMethod("method", "method", false, [], true)],
+                   ["static *method() { }", simpleMethod("method", "method", true, [], true)],
+                   ["static get method() { }", simpleMethod("method", "get", false, [], true)],
+                   ["static set method(x) { }", simpleMethod("method", "set", false, ["x"], true)]];
+    let i,j;
+    for (i=0; i < methods.length; i++) {
+        for (j=0; j < methods.length; j++) {
+            setClassMethods(stmt,
+                            [simpleConstructor,
+                             methods[i][1],
+                             methods[j][1]]);
+            let str = "class Foo { constructor() { } " +
+                       methods[i][0] + " " + methods[j][0] +
+                       " }";
+            assertStmt(str, stmt);
+        }
+    }
+
+    // It is, however, not an error to have a constructor, and a method with a
+    // computed property name 'constructor'
+    setClassMethods(stmt, [simpleConstructor, emptyCPNMethod("constructor", false)]);
+    assertStmt("class Foo { constructor () { } [\"constructor\"] () { } }", stmt);
+
+    // It is an error to have a generator or accessor named constructor
+    assertError("class Foo { *constructor() { } }", SyntaxError);
+    assertError("class Foo { get constructor() { } }", SyntaxError);
+    assertError("class Foo { set constructor() { } }", SyntaxError);
+
+    /* Semicolons */
+    // Allow Semicolons in Class Definitions
+    assertStmt("class Foo { constructor() { }; }", emptyFooClass);
+
+    // Allow more than one semicolon, even in otherwise trivial classses
+    assertStmt("class Foo { ;;; constructor() { } }", emptyFooClass);
+
+    // Semicolons are optional, even if the methods share a line
+    setClassMethods(stmt, [simpleMethod("method", "method", false), simpleConstructor]);
+    assertStmt("class Foo { method() { } constructor() { } }", stmt);
+
+    /* Generators */
+    // No yield as a class name inside a generator
+    assertError("function *foo() {\
+                    class yield {\
+                        constructor() { } \
+                    }\
+                 }", SyntaxError);
+
+    // Methods may be generators, but not accessors
+    assertError("class Foo { constructor() { } *get foo() { } }", SyntaxError);
+    assertError("class Foo { constructor() { } *set foo() { } }", SyntaxError);
+
+    setClassMethods(stmt, [simpleMethod("method", "method", true), simpleConstructor]);
+    assertStmt("class Foo { *method() { } constructor() { } }", stmt);
+
+    /* Strictness */
+    // yield is a strict-mode keyword, and class definitions are always strict.
+    assertError("class Foo { constructor() { var yield; } }", SyntaxError);
+    // Beware of the strictness of computed property names. Here use bareword
+    // deletion (a deprecated action) to check.
+    assertError("class Foo { constructor() { } [delete bar]() { }}", SyntaxError);
+
+    /* Bindings */
+    // Classes should bind lexically, so they should collide with other in-block
+    // lexical bindings
+    assertError("{ let Foo; class Foo { constructor() { } } }", TypeError);
+    assertError("{ const Foo = 0; class Foo { constructor() { } } }", TypeError);
+    assertError("{ class Foo { constructor() { } } class Foo { constructor() { } } }", TypeError);
+
+    // Can't make a lexical binding inside a block.
+    assertError("if (1) class Foo { constructor() { } }", SyntaxError);
+
+    /* EOF */
+    // Clipped classes should throw a syntax error
+    assertError("class Foo {", SyntaxError);
+    assertError("class Foo {;", SyntaxError);
+    assertError("class Foo { constructor", SyntaxError);
+    assertError("class Foo { constructor(", SyntaxError);
+    assertError("class Foo { constructor()", SyntaxError);
+    assertError("class Foo { constructor()", SyntaxError);
+    assertError("class Foo { constructor() {", SyntaxError);
+    assertError("class Foo { constructor() { }", SyntaxError);
+    assertError("class Foo { static", SyntaxError);
+    assertError("class Foo { static y", SyntaxError);
+    assertError("class Foo { static *", SyntaxError);
+    assertError("class Foo { static *y", SyntaxError);
+    assertError("class Foo { static get", SyntaxError);
+    assertError("class Foo { static get y", SyntaxError);
+
+}
+
+if (classesEnabled())
+    testClasses();
+
+
 // Source location information
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/sharedtypedarray.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/sharedtypedarray.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/sharedtypedarray.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/sharedtypedarray.js	2015-02-28 15:03:07.000000000 +0000
@@ -228,8 +228,10 @@
     assertEq(v[9], -5);
 }
 
-testSharedArrayBuffer();
-testSharedTypedArray();
-testSharedTypedArrayMethods();
+if (typeof SharedArrayBuffer === "function") {
+    testSharedArrayBuffer();
+    testSharedTypedArray();
+    testSharedTypedArrayMethods();
+}
 
 reportCompare(0, 0, 'ok');
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/symbol-uneval.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/symbol-uneval.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/symbol-uneval.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/symbol-uneval.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,15 +1,13 @@
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
-if (typeof Symbol === "function") {
-    assertEq(uneval(Symbol.iterator), "Symbol.iterator");
-    assertEq(uneval(Symbol()), "Symbol()");
-    assertEq(uneval(Symbol("")), 'Symbol("")');
-    assertEq(uneval(Symbol("ponies")), 'Symbol("ponies")');
-    assertEq(uneval(Symbol.for("ponies")), 'Symbol.for("ponies")');
+assertEq(uneval(Symbol.iterator), "Symbol.iterator");
+assertEq(uneval(Symbol()), "Symbol()");
+assertEq(uneval(Symbol("")), 'Symbol("")');
+assertEq(uneval(Symbol("ponies")), 'Symbol("ponies")');
+assertEq(uneval(Symbol.for("ponies")), 'Symbol.for("ponies")');
 
-    assertEq({glyph: Symbol(undefined)}.toSource(), "({glyph:Symbol()})");
-}
+assertEq({glyph: Symbol(undefined)}.toSource(), "({glyph:Symbol()})");
 
 if (typeof reportCompare === "function")
     reportCompare(0, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/weakmap.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/weakmap.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/js1_8_5/extensions/weakmap.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/js1_8_5/extensions/weakmap.js	2015-02-28 15:03:07.000000000 +0000
@@ -83,22 +83,39 @@
     var map = new WeakMap();
 
     check(function() !map.has(key));
-    map.set(key, 42);
+    check(function() map.delete(key) == false);
+    check(function() map.set(key, 42) === map);
     check(function() map.get(key) == 42);
     check(function() typeof map.get({}) == "undefined");
-    check(function() map.get({}, "foo") == "foo");
+    check(function() map.get({}, "foo") == undefined);
 
     gc(); gc(); gc();
 
     check(function() map.get(key) == 42);
-    map.delete(key);
+    check(function() map.delete(key) == true);
+    check(function() map.delete(key) == false);
+    check(function() map.delete({}) == false);
+
     check(function() typeof map.get(key) == "undefined");
     check(function() !map.has(key));
+    check(function() map.delete(key) == false);
 
     var value = { };
-    map.set(new Object(), value);
+    check(function() map.set(new Object(), value) === map);
     gc(); gc(); gc();
 
+    check(function() map.has("non-object key") == false);
+    check(function() map.has() == false);
+    check(function() map.get("non-object key") == undefined);
+    check(function() map.get() == undefined);
+    check(function() map.delete("non-object key") == false);
+    check(function() map.delete() == false);
+
+    check(function() map.set(key) === map);
+    check(function() map.get(key) == undefined);
+
+    checkThrows(function() map.set("non-object key", value));
+
     print ("done");
 
     reportCompare(0, TestFailCount, "weak map tests");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell/futex.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell/futex.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell/futex.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell/futex.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,120 @@
+// |reftest| skip-if(!xulRuntime.shell)
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+if (!(this.SharedArrayBuffer && this.getSharedArrayBuffer && this.setSharedArrayBuffer))
+    quit(0);
+
+var DEBUG = false;
+
+function dprint(s) {
+    if (DEBUG) print(s);
+}
+
+// Tests the SharedArrayBuffer mailbox in the shell.
+// Tests the futex functionality in the shell.
+
+var mem = new SharedInt32Array(3);
+
+// SharedArrayBuffer mailbox tests
+
+assertEq(getSharedArrayBuffer(), null); // Mbx starts empty
+
+assertEq(setSharedArrayBuffer(mem.buffer), undefined); // Setter returns undefined
+assertEq(getSharedArrayBuffer() == null, false);       // And then the mbx is not empty
+
+var v = getSharedArrayBuffer();
+assertEq(v.byteLength, mem.buffer.byteLength); // Looks like what we put in?
+var w = new SharedInt32Array(v);
+mem[0] = 314159;
+assertEq(w[0], 314159);		// Shares memory (locally) with what we put in?
+mem[0] = 0;
+
+setSharedArrayBuffer(null);	// Setting to null clears to null
+assertEq(getSharedArrayBuffer(), null);
+
+setSharedArrayBuffer(mem.buffer);
+setSharedArrayBuffer(undefined); // Setting to undefined clears to null
+assertEq(getSharedArrayBuffer(), null);
+
+setSharedArrayBuffer(mem.buffer);
+setSharedArrayBuffer();		// Setting without arguments clears to null
+assertEq(getSharedArrayBuffer(), null);
+
+// Only SharedArrayBuffer can be stored in the mbx
+
+assertThrowsInstanceOf(() => setSharedArrayBuffer({x:10, y:20}), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer([1,2]), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer(new ArrayBuffer(10)), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer(new Int32Array(10)), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer(new SharedInt32Array(10)), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer(false), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer(3.14), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer(mem), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer("abracadabra"), Error);
+assertThrowsInstanceOf(() => setSharedArrayBuffer(() => 37), Error);
+
+// Futex test
+
+// Main is sharing the buffer with the worker; the worker is clearing
+// the buffer.
+
+mem[0] = 42;
+mem[1] = 37;
+mem[2] = DEBUG;
+setSharedArrayBuffer(mem.buffer);
+
+if (helperThreadCount() === 0) {
+  // Abort if there is no helper thread.
+  reportCompare(true,true);
+  quit();
+}
+
+evalInWorker(`
+var mem = new SharedInt32Array(getSharedArrayBuffer());
+function dprint(s) {
+    if (mem[2]) print(s);
+}
+assertEq(mem[0], 42);		// what was written in the main thread
+assertEq(mem[1], 37);		//   is read in the worker
+mem[1] = 1337;
+dprint("Sleeping for 3 seconds");
+sleep(3);
+dprint("Waking the main thread now");
+setSharedArrayBuffer(null);
+Atomics.futexWake(mem, 0, 1);
+`);
+
+var then = Date.now();
+assertEq(Atomics.futexWait(mem, 0, 42), Atomics.OK);
+dprint("Woke up as I should have in " + (Date.now() - then)/1000 + "s");
+assertEq(mem[1], 1337); // what was written in the worker is read in the main thread
+assertEq(getSharedArrayBuffer(), null); // The worker's clearing of the mbx is visible
+
+// A tricky case: while in the wait there will be an interrupt, and in
+// the interrupt handler we will execute a futexWait.  This is
+// explicitly prohibited (for now), so there should be a catchable exception.
+
+timeout(2, function () {
+    dprint("In the interrupt, starting inner wait");
+    Atomics.futexWait(mem, 0, 42); // Should throw and propagate all the way out
+});
+var exn = false;
+try {
+    dprint("Starting outer wait");
+    assertEq(Atomics.futexWait(mem, 0, 42, 5000), Atomics.OK);
+}
+catch (e) {
+    dprint("Got the exception!");
+    exn = true;
+}
+finally {
+    timeout(-1);
+}
+assertEq(exn, true);
+dprint("Done");
+
+reportCompare(true,true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell/os.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell/os.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell/os.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell/os.js	2015-02-28 15:03:07.000000000 +0000
@@ -15,7 +15,7 @@
 assertEq(os.system("true"), 0, "/bin/true should exit 0");
 assertEq(os.system("false") != 0, true, "/bin/false should exit nonzero");
 
-var kidpid = os.spawn("sleep 3600");
+var kidpid = os.spawn("sleep 60");
 assertEq(kidpid > 0, true, "spawning sleep");
 var info = os.waitpid(kidpid, true);
 assertEq(info.hasOwnProperty("pid"), false);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell/shell.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell/shell.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell/shell.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell/shell.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,4 @@
+/* -*- 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/. */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/tests/shell.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/tests/shell.js	2015-02-28 15:03:07.000000000 +0000
@@ -857,6 +857,23 @@
         throw new Error("Assertion failed: " + f + " did not throw as expected");
 }
 
+
+function assertThrowsInstanceOf(f, ctor, msg) {
+  var fullmsg;
+  try {
+    f();
+  } catch (exc) {
+    if (exc instanceof ctor)
+      return;
+    fullmsg = "Assertion failed: expected exception " + ctor.name + ", got " + exc;
+  }
+  if (fullmsg === undefined)
+    fullmsg = "Assertion failed: expected exception " + ctor.name + ", no exception thrown";
+  if (msg !== undefined)
+    fullmsg += " - " + msg;
+  throw new Error(fullmsg);
+};
+
 /*
  * Some tests need to know if we are in Rhino as opposed to SpiderMonkey
  */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ArgumentsObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ArgumentsObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ArgumentsObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ArgumentsObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -391,25 +391,25 @@
 args_enumerate(JSContext *cx, HandleObject obj)
 {
     Rooted<NormalArgumentsObject*> argsobj(cx, &obj->as<NormalArgumentsObject>());
+
     RootedId id(cx);
+    bool found;
 
-    /*
-     * Trigger reflection in args_resolve using a series of js_LookupProperty
-     * calls.
-     */
-    int argc = int(argsobj->initialLength());
-    for (int i = -2; i != argc; i++) {
-        id = (i == -2)
-             ? NameToId(cx->names().length)
-             : (i == -1)
-             ? NameToId(cx->names().callee)
-             : INT_TO_JSID(i);
-
-        RootedObject pobj(cx);
-        RootedShape prop(cx);
-        if (!NativeLookupProperty<CanGC>(cx, argsobj, id, &pobj, &prop))
+    // Trigger reflection.
+    id = NameToId(cx->names().length);
+    if (!HasProperty(cx, argsobj, id, &found))
+        return false;
+
+    id = NameToId(cx->names().callee);
+    if (!HasProperty(cx, argsobj, id, &found))
+        return false;
+
+    for (unsigned i = 0; i < argsobj->initialLength(); i++) {
+        id = INT_TO_JSID(i);
+        if (!HasProperty(cx, argsobj, id, &found))
             return false;
     }
+
     return true;
 }
 
@@ -511,32 +511,25 @@
 {
     Rooted<StrictArgumentsObject*> argsobj(cx, &obj->as<StrictArgumentsObject>());
 
-    /*
-     * Trigger reflection in strictargs_resolve using a series of
-     * js_LookupProperty calls.
-     */
-    RootedObject pobj(cx);
-    RootedShape prop(cx);
     RootedId id(cx);
+    bool found;
 
-    // length
+    // Trigger reflection.
     id = NameToId(cx->names().length);
-    if (!NativeLookupProperty<CanGC>(cx, argsobj, id, &pobj, &prop))
+    if (!HasProperty(cx, argsobj, id, &found))
         return false;
 
-    // callee
     id = NameToId(cx->names().callee);
-    if (!NativeLookupProperty<CanGC>(cx, argsobj, id, &pobj, &prop))
+    if (!HasProperty(cx, argsobj, id, &found))
         return false;
 
-    // caller
     id = NameToId(cx->names().caller);
-    if (!NativeLookupProperty<CanGC>(cx, argsobj, id, &pobj, &prop))
+    if (!HasProperty(cx, argsobj, id, &found))
         return false;
 
-    for (uint32_t i = 0, argc = argsobj->initialLength(); i < argc; i++) {
+    for (unsigned i = 0; i < argsobj->initialLength(); i++) {
         id = INT_TO_JSID(i);
-        if (!NativeLookupProperty<CanGC>(cx, argsobj, id, &pobj, &prop))
+        if (!HasProperty(cx, argsobj, id, &found))
             return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ArrayBufferObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ArrayBufferObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ArrayBufferObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ArrayBufferObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -284,7 +284,7 @@
 #  ifdef XP_WIN
         if (!VirtualAlloc(diffStart, diffLength, MEM_COMMIT, PAGE_READWRITE)) {
             ReleaseAsmJSMappedData(data);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 #  else
@@ -293,7 +293,7 @@
         int flags = MAP_FIXED | MAP_PRIVATE | MAP_ANON;
         if (mmap(diffStart, diffLength, PROT_READ | PROT_WRITE, flags, -1, 0) == MAP_FAILED) {
             ReleaseAsmJSMappedData(data);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 #  endif
@@ -303,7 +303,7 @@
 #  ifdef XP_WIN
         if (!VirtualFree(diffStart, diffLength, MEM_DECOMMIT)) {
             ReleaseAsmJSMappedData(data);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 #  else
@@ -311,7 +311,7 @@
             mprotect(diffStart, diffLength, PROT_NONE))
         {
             ReleaseAsmJSMappedData(data);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 #  endif
@@ -344,13 +344,13 @@
     HandleValue newByteLengthArg = args.get(1);
 
     if (!oldBufferArg.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
         return false;
     }
 
     RootedObject oldBufferObj(cx, &oldBufferArg.toObject());
     if (!ObjectClassIs(oldBufferObj, ESClass_ArrayBuffer, cx)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
         return false;
     }
 
@@ -362,14 +362,14 @@
     } else {
         JSObject *unwrapped = CheckedUnwrap(oldBuffer);
         if (!unwrapped->is<ArrayBufferObject>()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return false;
         }
         oldBuffer = &unwrapped->as<ArrayBufferObject>();
     }
 
     if (oldBuffer->isNeutered()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_DETACHED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_DETACHED);
         return false;
     }
 
@@ -382,7 +382,7 @@
         if (!ToInt32(cx, newByteLengthArg, &i32))
             return false;
         if (i32 < 0) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
             return false;
         }
         newByteLength = size_t(i32);
@@ -467,7 +467,7 @@
          * as an integer value; if someone actually ever complains (validly), then we
          * can fix.
          */
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
         return false;
     }
 
@@ -483,7 +483,7 @@
 {
     uint8_t *p = cx->runtime()->pod_callocCanGC<uint8_t>(nbytes);
     if (!p)
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
 
     return ArrayBufferObject::BufferContents::create<ArrayBufferObject::PLAIN>(p);
 }
@@ -843,7 +843,7 @@
 {
     uint32_t bufLength = arrayBuffer->byteLength();
     if (begin > bufLength || end > bufLength || begin > end) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPE_ERR_BAD_ARGS);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPE_ERR_BAD_ARGS);
         return nullptr;
     }
 
@@ -1384,13 +1384,13 @@
         return nullptr;
 
     if (!obj->is<ArrayBufferObject>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
         return nullptr;
     }
 
     Rooted<ArrayBufferObject*> buffer(cx, &obj->as<ArrayBufferObject>());
     if (buffer->isNeutered()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_DETACHED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_DETACHED);
         return nullptr;
     }
 
@@ -1522,7 +1522,7 @@
 }
 
 JSObject *
-js_InitArrayBufferClass(JSContext *cx, HandleObject obj)
+js::InitArrayBufferClass(JSContext *cx, HandleObject obj)
 {
     Rooted<GlobalObject*> global(cx, cx->compartment()->maybeGlobal());
     if (global->isStandardClassResolved(JSProto_ArrayBuffer))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ArrayBufferObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ArrayBufferObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ArrayBufferObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ArrayBufferObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -536,6 +536,9 @@
     size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf);
 };
 
+extern JSObject *
+InitArrayBufferClass(JSContext *cx, HandleObject obj);
+
 } // namespace js
 
 template <>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/BooleanObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/BooleanObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/BooleanObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/BooleanObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -40,7 +40,7 @@
 
     /* For access to init, as Boolean.prototype is special. */
     friend JSObject *
-    ::js_InitBooleanClass(JSContext *cx, js::HandleObject global);
+    js::InitBooleanClass(JSContext *cx, js::HandleObject global);
 };
 
 } // namespace js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/CharacterEncoding.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/CharacterEncoding.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/CharacterEncoding.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/CharacterEncoding.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -116,7 +116,7 @@
             utf8Len = 1;
         } else {
             uint8_t utf8buf[4];
-            utf8Len = js_OneUcs4ToUtf8Char(utf8buf, v);
+            utf8Len = OneUcs4ToUtf8Char(utf8buf, v);
             for (size_t i = 0; i < utf8Len; i++)
                 *dst++ = char(utf8buf[i]);
         }
@@ -200,14 +200,14 @@
 {
     char buffer[10];
     JS_snprintf(buffer, 10, "%d", offset);
-    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                  JSMSG_MALFORMED_UTF8_CHAR, buffer);
 }
 
 static void
 ReportBufferTooSmall(JSContext *cx, uint32_t dummy)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BUFFER_TOO_SMALL);
 }
 
 static void
@@ -215,7 +215,7 @@
 {
     char buffer[10];
     JS_snprintf(buffer, 10, "0x%x", v + 0x10000);
-    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+    JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                  JSMSG_UTF8_CHAR_TOO_LARGE, buffer);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/CommonPropertyNames.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/CommonPropertyNames.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/CommonPropertyNames.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/CommonPropertyNames.h	2015-02-28 15:03:08.000000000 +0000
@@ -180,6 +180,7 @@
     macro(signMask, signMask, "signMask") \
     macro(source, source, "source") \
     macro(stack, stack, "stack") \
+    macro(static, static_, "static") \
     macro(sticky, sticky, "sticky") \
     macro(strings, strings, "strings") \
     macro(StructType, StructType, "StructType") \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Debugger.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Debugger.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Debugger.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Debugger.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -123,7 +123,7 @@
 bool
 js::ReportObjectRequired(JSContext *cx)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, "value");
     return false;
 }
 
@@ -134,9 +134,9 @@
         return false;
     if (!JSID_IS_ATOM(id) || !IsIdentifier(JSID_TO_ATOM(id))) {
         RootedValue val(cx, v);
-        js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
-                                 JSDVG_SEARCH_STACK, val, js::NullPtr(), "not an identifier",
-                                 nullptr);
+        ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_UNEXPECTED_TYPE,
+                              JSDVG_SEARCH_STACK, val, js::NullPtr(), "not an identifier",
+                              nullptr);
         return false;
     }
     return true;
@@ -407,7 +407,7 @@
               objects.init() &&
               environments.init();
     if (!ok)
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
     return ok;
 }
 
@@ -473,7 +473,7 @@
             return false;
 
         if (!frames.add(p, frame, frameobj)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
     }
@@ -778,14 +778,14 @@
         envobj->setPrivateGCThing(env);
         envobj->setReservedSlot(JSSLOT_DEBUGENV_OWNER, ObjectValue(*object));
         if (!p.add(cx, environments, env, envobj)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 
         CrossCompartmentKey key(CrossCompartmentKey::DebuggerEnvironment, object, env);
         if (!object->compartment()->putWrapper(cx, key, ObjectValue(*envobj))) {
             environments.remove(env);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
     }
@@ -822,7 +822,7 @@
             dobj->setReservedSlot(JSSLOT_DEBUGOBJECT_OWNER, ObjectValue(*object));
 
             if (!p.add(cx, objects, obj, dobj)) {
-                js_ReportOutOfMemory(cx);
+                ReportOutOfMemory(cx);
                 return false;
             }
 
@@ -830,7 +830,7 @@
                 CrossCompartmentKey key(CrossCompartmentKey::DebuggerObject, object, obj);
                 if (!object->compartment()->putWrapper(cx, key, ObjectValue(*dobj))) {
                     objects.remove(obj);
-                    js_ReportOutOfMemory(cx);
+                    ReportOutOfMemory(cx);
                     return false;
                 }
             }
@@ -875,7 +875,7 @@
     if (vp.isObject()) {
         JSObject *dobj = &vp.toObject();
         if (dobj->getClass() != &DebuggerObject_class) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
                                  "Debugger", "Debugger.Object", dobj->getClass()->name);
             return false;
         }
@@ -883,7 +883,7 @@
 
         Value owner = ndobj->getReservedSlot(JSSLOT_DEBUGOBJECT_OWNER);
         if (owner.isUndefined() || &owner.toObject() != object) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  owner.isUndefined()
                                  ? JSMSG_DEBUG_OBJECT_PROTO
                                  : JSMSG_DEBUG_OBJECT_WRONG_OWNER);
@@ -904,7 +904,7 @@
                     const char *methodname, const char *propname)
 {
     if (v.isObject() && v.toObject().compartment() != obj->compartment()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_COMPARTMENT_MISMATCH,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_COMPARTMENT_MISMATCH,
                              methodname, propname);
         return false;
     }
@@ -1097,7 +1097,7 @@
     }
 
     if (hits != 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_RESUMPTION);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_RESUMPTION);
         return false;
     }
     return true;
@@ -1320,7 +1320,7 @@
             Debugger *dbg = *p;
             if (dbg->observesNewScript() && dbg->observesScript(script)) {
                 if (!triggered.append(ObjectValue(*dbg->toJSObject()))) {
-                    js_ReportOutOfMemory(cx);
+                    ReportOutOfMemory(cx);
                     return;
                 }
             }
@@ -1517,7 +1517,7 @@
     // hooks.
     bool ok = Invoke(cx, ObjectValue(*object), ObjectValue(*hook), 1, wrappedGlobal.address(), &rv);
     if (ok && !rv.isUndefined()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_DEBUG_RESUMPTION_VALUE_DISALLOWED);
         ok = false;
     }
@@ -1663,7 +1663,7 @@
     RootedValue rv(cx);
     bool ok = Invoke(cx, ObjectValue(*object), ObjectValue(*hookObj), 1, dbgObj.address(), &rv);
     if (ok && !rv.isUndefined()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_DEBUG_RESUMPTION_VALUE_DISALLOWED);
         ok = false;
     }
@@ -1825,7 +1825,7 @@
     {
         jit::JitContext jctx(cx, nullptr);
         if (!jit::RecompileOnStackBaselineScriptsForDebugMode(cx, obs, observing)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
     }
@@ -1982,6 +1982,19 @@
 }
 
 /* static */ bool
+Debugger::ensureExecutionObservabilityOfOsrFrame(JSContext *cx, InterpreterFrame *frame)
+{
+    MOZ_ASSERT(frame->isDebuggee());
+    if (frame->script()->hasBaselineScript() &&
+        frame->script()->baselineScript()->hasDebugInstrumentation())
+    {
+        return true;
+    }
+    ExecutionObservableFrame obs(frame);
+    return updateExecutionObservabilityOfFrames(cx, obs, Observing);
+}
+
+/* static */ bool
 Debugger::ensureExecutionObservabilityOfFrame(JSContext *cx, AbstractFramePtr frame)
 {
     MOZ_ASSERT_IF(frame.script()->isDebuggee(), frame.isDebuggee());
@@ -2353,7 +2366,7 @@
     }
     JSObject *thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &Debugger::jsclass) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger", fnname, thisobj->getClass()->name);
         return nullptr;
     }
@@ -2365,7 +2378,7 @@
      */
     Debugger *dbg = fromJSObject(thisobj);
     if (!dbg) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger", fnname, "prototype object");
     }
     return dbg;
@@ -2452,7 +2465,7 @@
         if (!args[0].toObject().isCallable())
             return ReportIsNotFunction(cx, args[0], args.length() - 1);
     } else if (!args[0].isUndefined()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_CALLABLE_OR_UNDEFINED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_CALLABLE_OR_UNDEFINED);
         return false;
     }
     dbg->object->setReservedSlot(JSSLOT_DEBUG_HOOK_START + which, args[0]);
@@ -2587,7 +2600,7 @@
     if (!args.requireAtLeast(cx, "Debugger.set uncaughtExceptionHook", 1))
         return false;
     if (!args[0].isNull() && (!args[0].isObject() || !args[0].toObject().isCallable())) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ASSIGN_FUNCTION_OR_NULL,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ASSIGN_FUNCTION_OR_NULL,
                              "uncaughtExceptionHook");
         return false;
     }
@@ -2651,7 +2664,7 @@
 Debugger::unwrapDebuggeeArgument(JSContext *cx, const Value &v)
 {
     if (!v.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              "argument", "not a global object");
         return nullptr;
     }
@@ -2680,7 +2693,7 @@
 
     /* If that didn't produce a global object, it's an error. */
     if (!obj->is<GlobalObject>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              "argument", "not a global object");
         return nullptr;
     }
@@ -2877,7 +2890,7 @@
             return ReportObjectRequired(cx);
         JSObject *argobj = &arg.toObject();
         if (!argobj->is<CrossCompartmentWrapperObject>()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_CCW_REQUIRED,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_CCW_REQUIRED,
                                  "Debugger");
             return false;
         }
@@ -2938,7 +2951,7 @@
     // throw in that case.
     JSCompartment *debuggeeCompartment = global->compartment();
     if (debuggeeCompartment->options().invisibleToDebugger()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_DEBUG_CANT_DEBUG_GLOBAL);
         return false;
     }
@@ -2955,7 +2968,7 @@
     for (size_t i = 0; i < visited.length(); i++) {
         JSCompartment *c = visited[i];
         if (c == debuggeeCompartment) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_LOOP);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_LOOP);
             return false;
         }
 
@@ -2980,7 +2993,7 @@
     bool setMetadataCallback = false;
     if (trackingAllocationSites) {
         if (debuggeeCompartment->hasObjectMetadataCallback()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_OBJECT_METADATA_CALLBACK_ALREADY_SET);
             return false;
         }
@@ -2999,10 +3012,10 @@
     AutoCompartment ac(cx, global);
     GlobalObject::DebuggerVector *v = GlobalObject::getOrCreateDebuggers(cx, global);
     if (!v || !v->append(this)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
     } else {
         if (!debuggees.put(global)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
         } else {
             debuggeeCompartment->setIsDebuggee();
             debuggeeCompartment->updateDebuggerObservesAsmJS();
@@ -3121,7 +3134,7 @@
         if (!compartments.init() ||
             !innermostForCompartment.init())
         {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 
@@ -3161,7 +3174,7 @@
         if (!GetProperty(cx, query, query, cx->names().url, &url))
             return false;
         if (!url.isUndefined() && !url.isString()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                                  "query object's 'url' property", "neither undefined nor a string");
             return false;
         }
@@ -3173,7 +3186,7 @@
         if (!debuggerSource.isUndefined()) {
             if (!debuggerSource.isObject() ||
                 debuggerSource.toObject().getClass() != &DebuggerSource_class) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                                      "query object's 'source' property",
                                      "not undefined nor a Debugger.Source object");
                 return false;
@@ -3187,7 +3200,7 @@
         if (!GetProperty(cx, query, query, cx->names().displayURL, &displayURL))
             return false;
         if (!displayURL.isUndefined() && !displayURL.isString()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                                  "query object's 'displayURL' property",
                                  "neither undefined nor a string");
             return false;
@@ -3207,19 +3220,19 @@
             hasLine = false;
         } else if (lineProperty.isNumber()) {
             if (displayURL.isUndefined() && url.isUndefined() && !source) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_QUERY_LINE_WITHOUT_URL);
                 return false;
             }
             double doubleLine = lineProperty.toNumber();
             if (doubleLine <= 0 || (unsigned int) doubleLine != doubleLine) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_LINE);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_LINE);
                 return false;
             }
             hasLine = true;
             line = doubleLine;
         } else {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                                  "query object's 'line' property",
                                  "neither undefined nor an integer");
             return false;
@@ -3234,7 +3247,7 @@
         if (innermost) {
             /* Technically, we need only check hasLine, but this is clearer. */
             if ((displayURL.isUndefined() && url.isUndefined() && !source) || !hasLine) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_QUERY_INNERMOST_WITHOUT_LINE_URL);
                 return false;
             }
@@ -3269,7 +3282,7 @@
         oom = false;
         IterateScripts(cx->runtime(), singletonComp, this, considerScript);
         if (oom) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 
@@ -3290,7 +3303,7 @@
             {
                 JS::ExposeScriptToActiveJS(r.front().value());
                 if (!v->append(r.front().value())) {
-                    js_ReportOutOfMemory(cx);
+                    ReportOutOfMemory(cx);
                     return false;
                 }
             }
@@ -3368,7 +3381,7 @@
     bool matchSingleGlobal(GlobalObject *global) {
         MOZ_ASSERT(compartments.count() == 0);
         if (!addCompartment(global->compartment())) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         return true;
@@ -3383,7 +3396,7 @@
         /* Build our compartment set from the debugger's set of debuggee globals. */
         for (GlobalObjectSet::Range r = debugger->debuggees.all(); !r.empty(); r.popFront()) {
             if (!addCompartment(r.front()->compartment())) {
-                js_ReportOutOfMemory(cx);
+                ReportOutOfMemory(cx);
                 return false;
             }
         }
@@ -3439,7 +3452,7 @@
                 return;
         }
         if (hasLine) {
-            if (line < script->lineno() || script->lineno() + js_GetScriptLineExtent(script) < line)
+            if (line < script->lineno() || script->lineno() + GetScriptLineExtent(script) < line)
                 return;
         }
         if (displayURLString) {
@@ -3565,7 +3578,7 @@
             return false;
         if (!cls.isUndefined()) {
             if (!cls.isString()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                                      "query object's 'class' property",
                                      "neither undefined nor a string");
                 return false;
@@ -3794,7 +3807,7 @@
     // none of which we're ever supposed to see.
     JSCompartment *globalCompartment = global->compartment();
     if (globalCompartment->options().invisibleToDebugger()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_DEBUG_INVISIBLE_COMPARTMENT);
         return false;
     }
@@ -4157,14 +4170,14 @@
             return nullptr;
 
         if (!p.add(cx, scripts, script, scriptobj)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
 
         CrossCompartmentKey key(CrossCompartmentKey::DebuggerScript, object, script);
         if (!object->compartment()->putWrapper(cx, key, ObjectValue(*scriptobj))) {
             scripts.remove(script);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
     }
@@ -4182,7 +4195,7 @@
     }
     JSObject *thisobj = &v.toObject();
     if (thisobj->getClass() != &DebuggerScript_class) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              clsname, fnname, thisobj->getClass()->name);
         return nullptr;
     }
@@ -4193,7 +4206,7 @@
      */
     if (!GetScriptReferent(thisobj)) {
         MOZ_ASSERT(!GetScriptReferent(thisobj));
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              clsname, fnname, "prototype object");
         return nullptr;
     }
@@ -4267,7 +4280,7 @@
 {
     THIS_DEBUGSCRIPT_SCRIPT(cx, argc, vp, "(get lineCount)", args, obj, script);
 
-    unsigned maxLine = js_GetScriptLineExtent(script);
+    unsigned maxLine = GetScriptLineExtent(script);
     args.rval().setNumber(double(maxLine));
     return true;
 }
@@ -4376,7 +4389,7 @@
         off = size_t(d);
     }
     if (!ok || off != d || !IsValidBytecodeOffset(cx, script, off)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_OFFSET);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_OFFSET);
         return false;
     }
     *offsetp = off;
@@ -4763,7 +4776,7 @@
         double d = linenoValue.toNumber();
         lineno = size_t(d);
         if (lineno != d) {
-            JS_ReportErrorNumber(cx,  js_GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_LINE);
+            JS_ReportErrorNumber(cx,  GetErrorMessage, nullptr, JSMSG_DEBUG_BAD_LINE);
             return false;
         }
     }
@@ -4840,7 +4853,7 @@
 
         // Add the frame object with |to| as key.
         if (!dbg->frames.putNew(to, frameobj)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
     }
@@ -4949,7 +4962,7 @@
     Debugger *dbg = Debugger::fromChildJSObject(obj);
 
     if (!dbg->observesScript(script)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_DEBUGGING);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_DEBUGGING);
         return false;
     }
 
@@ -4961,10 +4974,10 @@
     if (!handler)
         return false;
 
-    // Ensure observability *before* setting the breakpoint. If the script's
-    // compartment is not already a debuggee, trying to ensure observability
-    // after setting the breakpoint (and thus marking the script as a
-    // debuggee) will skip actually ensuring observability.
+    // Ensure observability *before* setting the breakpoint. If the script is
+    // not already a debuggee, trying to ensure observability after setting
+    // the breakpoint (and thus marking the script as a debuggee) will skip
+    // actually ensuring observability.
     if (!dbg->ensureExecutionObservabilityOfScript(cx, script))
         return false;
 
@@ -5083,7 +5096,7 @@
 static bool
 DebuggerScript_construct(JSContext *cx, unsigned argc, Value *vp)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                          "Debugger.Script");
     return false;
 }
@@ -5179,14 +5192,14 @@
             return nullptr;
 
         if (!p.add(cx, sources, source, sourceobj)) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
 
         CrossCompartmentKey key(CrossCompartmentKey::DebuggerSource, object, source);
         if (!object->compartment()->putWrapper(cx, key, ObjectValue(*sourceobj))) {
             sources.remove(source);
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return nullptr;
         }
     }
@@ -5198,7 +5211,7 @@
 static bool
 DebuggerSource_construct(JSContext *cx, unsigned argc, Value *vp)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                          "Debugger.Source");
     return false;
 }
@@ -5213,7 +5226,7 @@
 
     JSObject *thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerSource_class) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Source", fnname, thisobj->getClass()->name);
         return nullptr;
     }
@@ -5221,7 +5234,7 @@
     NativeObject *nthisobj = &thisobj->as<NativeObject>();
 
     if (!GetSourceReferent(thisobj)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Frame", fnname, "prototype object");
         return nullptr;
     }
@@ -5510,7 +5523,7 @@
     }
     JSObject *thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerFrame_class) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Frame", fnname, thisobj->getClass()->name);
         return nullptr;
     }
@@ -5525,12 +5538,12 @@
      */
     if (!nthisobj->getPrivate()) {
         if (nthisobj->getReservedSlot(JSSLOT_DEBUGFRAME_OWNER).isUndefined()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                                  "Debugger.Frame", fnname, "prototype object");
             return nullptr;
         }
         if (checkLive) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_LIVE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_LIVE,
                                  "Debugger.Frame");
             return nullptr;
         }
@@ -5732,7 +5745,7 @@
     }
     RootedObject argsobj(cx, &args.thisv().toObject());
     if (argsobj->getClass() != &DebuggerArguments_class) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Arguments", "getArgument", argsobj->getClass()->name);
         return false;
     }
@@ -5916,7 +5929,7 @@
     if (!args.requireAtLeast(cx, "Debugger.Frame.set onStep", 1))
         return false;
     if (!IsValidHook(args[0])) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_CALLABLE_OR_UNDEFINED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_CALLABLE_OR_UNDEFINED);
         return false;
     }
 
@@ -5924,6 +5937,12 @@
     if (!args[0].isUndefined() && prior.isUndefined()) {
         // Single stepping toggled off->on.
         AutoCompartment ac(cx, frame.scopeChain());
+        // Ensure observability *before* incrementing the step mode
+        // count. Calling this function after calling incrementStepModeCount
+        // will make it a no-op.
+        Debugger *dbg = Debugger::fromChildJSObject(thisobj);
+        if (!dbg->ensureExecutionObservabilityOfScript(cx, frame.script()))
+            return false;
         if (!frame.script()->incrementStepModeCount(cx))
             return false;
     } else if (args[0].isUndefined() && !prior.isUndefined()) {
@@ -5956,7 +5975,7 @@
         return false;
     (void) frame;  // Silence GCC warning
     if (!IsValidHook(args[0])) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_CALLABLE_OR_UNDEFINED);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_CALLABLE_OR_UNDEFINED);
         return false;
     }
 
@@ -6037,7 +6056,7 @@
 
     /* Check the first argument, the eval code string. */
     if (!code.isString()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
                              fullMethodName, "string", InformalValueTypeName(code));
         return false;
     }
@@ -6191,7 +6210,7 @@
 static bool
 DebuggerFrame_construct(JSContext *cx, unsigned argc, Value *vp)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                          "Debugger.Frame");
     return false;
 }
@@ -6257,7 +6276,7 @@
     }
     JSObject *thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerObject_class) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Object", fnname, thisobj->getClass()->name);
         return nullptr;
     }
@@ -6269,7 +6288,7 @@
      */
     NativeObject *nthisobj = &thisobj->as<NativeObject>();
     if (!nthisobj->getPrivate()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Object", fnname, "prototype object");
         return nullptr;
     }
@@ -6296,7 +6315,7 @@
 static bool
 DebuggerObject_construct(JSContext *cx, unsigned argc, Value *vp)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                          "Debugger.Object");
     return false;
 }
@@ -6804,7 +6823,7 @@
         if (!ok)
             return false;
         if (!succeeded) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_CHANGE_EXTENSIBILITY);
             return false;
         }
     }
@@ -6887,7 +6906,7 @@
      */
     RootedValue calleev(cx, ObjectValue(*obj));
     if (!obj->isCallable()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Object", "apply", obj->getClass()->name);
         return false;
     }
@@ -6905,7 +6924,7 @@
     if (mode == ApplyMode) {
         if (args.length() >= 2 && !args[1].isNullOrUndefined()) {
             if (!args[1].isObject()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_APPLY_ARGS,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_APPLY_ARGS,
                                      js_apply_str);
                 return false;
             }
@@ -7015,13 +7034,13 @@
         }
 
         if (obj->is<GlobalObject>()) {
-            js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_DEBUG_WRAPPER_IN_WAY,
-                                     JSDVG_SEARCH_STACK, dbgobj, js::NullPtr(),
-                                     isWrapper, isWindowProxy);
+            ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_DEBUG_WRAPPER_IN_WAY,
+                                  JSDVG_SEARCH_STACK, dbgobj, js::NullPtr(),
+                                  isWrapper, isWindowProxy);
         } else {
-            js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_DEBUG_BAD_REFERENT,
-                                     JSDVG_SEARCH_STACK, dbgobj, js::NullPtr(),
-                                     "a global object", nullptr);
+            ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_DEBUG_BAD_REFERENT,
+                                  JSDVG_SEARCH_STACK, dbgobj, js::NullPtr(),
+                                  "a global object", nullptr);
         }
         return false;
     }
@@ -7072,7 +7091,7 @@
     // and the wrapper is in a visible compartment, that's fine.)
     JSCompartment *unwrappedCompartment = unwrapped->compartment();
     if (unwrappedCompartment->options().invisibleToDebugger()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_DEBUG_INVISIBLE_COMPARTMENT);
         return false;
     }
@@ -7176,7 +7195,7 @@
     }
     JSObject *thisobj = &args.thisv().toObject();
     if (thisobj->getClass() != &DebuggerEnv_class) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Environment", fnname, thisobj->getClass()->name);
         return nullptr;
     }
@@ -7188,7 +7207,7 @@
      */
     NativeObject *nthisobj = &thisobj->as<NativeObject>();
     if (!nthisobj->getPrivate()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              "Debugger.Environment", fnname, "prototype object");
         return nullptr;
     }
@@ -7200,7 +7219,7 @@
     if (requireDebuggee) {
         Rooted<Env*> env(cx, static_cast<Env *>(nthisobj->getPrivate()));
         if (!Debugger::fromChildJSObject(nthisobj)->observesGlobal(&env->global())) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_DEBUGGEE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_DEBUGGEE,
                                  "Debugger.Environment", "environment");
             return nullptr;
         }
@@ -7225,7 +7244,7 @@
 static bool
 DebuggerEnv_construct(JSContext *cx, unsigned argc, Value *vp)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                          "Debugger.Environment");
     return false;
 }
@@ -7284,7 +7303,7 @@
      * possibly get its proto.
      */
     if (IsDeclarative(env)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_NO_SCOPE_OBJECT);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_NO_SCOPE_OBJECT);
         return false;
     }
 
@@ -7484,7 +7503,7 @@
         if (!HasProperty(cx, env, id, &has))
             return false;
         if (!has) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_VARIABLE_NOT_FOUND);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_VARIABLE_NOT_FOUND);
             return false;
         }
 
@@ -7610,49 +7629,49 @@
     objProto = obj->as<GlobalObject>().getOrCreateObjectPrototype(cx);
     if (!objProto)
         return false;
-    debugProto = js_InitClass(cx, obj,
-                              objProto, &Debugger::jsclass, Debugger::construct,
-                              1, Debugger::properties, Debugger::methods, nullptr, nullptr,
-                              debugCtor.address());
+    debugProto = InitClass(cx, obj,
+                           objProto, &Debugger::jsclass, Debugger::construct,
+                           1, Debugger::properties, Debugger::methods, nullptr, nullptr,
+                           debugCtor.address());
     if (!debugProto)
         return false;
 
-    frameProto = js_InitClass(cx, debugCtor, objProto, &DebuggerFrame_class,
-                              DebuggerFrame_construct, 0,
-                              DebuggerFrame_properties, DebuggerFrame_methods,
-                              nullptr, nullptr);
+    frameProto = InitClass(cx, debugCtor, objProto, &DebuggerFrame_class,
+                           DebuggerFrame_construct, 0,
+                           DebuggerFrame_properties, DebuggerFrame_methods,
+                           nullptr, nullptr);
     if (!frameProto)
         return false;
 
-    scriptProto = js_InitClass(cx, debugCtor, objProto, &DebuggerScript_class,
-                               DebuggerScript_construct, 0,
-                               DebuggerScript_properties, DebuggerScript_methods,
-                               nullptr, nullptr);
+    scriptProto = InitClass(cx, debugCtor, objProto, &DebuggerScript_class,
+                            DebuggerScript_construct, 0,
+                            DebuggerScript_properties, DebuggerScript_methods,
+                            nullptr, nullptr);
     if (!scriptProto)
         return false;
 
-    sourceProto = js_InitClass(cx, debugCtor, sourceProto, &DebuggerSource_class,
-                               DebuggerSource_construct, 0,
-                               DebuggerSource_properties, DebuggerSource_methods,
-                               nullptr, nullptr);
+    sourceProto = InitClass(cx, debugCtor, sourceProto, &DebuggerSource_class,
+                            DebuggerSource_construct, 0,
+                            DebuggerSource_properties, DebuggerSource_methods,
+                            nullptr, nullptr);
     if (!sourceProto)
         return false;
 
-    objectProto = js_InitClass(cx, debugCtor, objProto, &DebuggerObject_class,
-                               DebuggerObject_construct, 0,
-                               DebuggerObject_properties, DebuggerObject_methods,
-                               nullptr, nullptr);
+    objectProto = InitClass(cx, debugCtor, objProto, &DebuggerObject_class,
+                            DebuggerObject_construct, 0,
+                            DebuggerObject_properties, DebuggerObject_methods,
+                            nullptr, nullptr);
     if (!objectProto)
         return false;
-    envProto = js_InitClass(cx, debugCtor, objProto, &DebuggerEnv_class,
-                            DebuggerEnv_construct, 0,
-                            DebuggerEnv_properties, DebuggerEnv_methods,
-                            nullptr, nullptr);
+    envProto = InitClass(cx, debugCtor, objProto, &DebuggerEnv_class,
+                         DebuggerEnv_construct, 0,
+                         DebuggerEnv_properties, DebuggerEnv_methods,
+                         nullptr, nullptr);
     if (!envProto)
         return false;
-    memoryProto = js_InitClass(cx, debugCtor, objProto, &DebuggerMemory::class_,
-                               DebuggerMemory::construct, 0, DebuggerMemory::properties,
-                               DebuggerMemory::methods, nullptr, nullptr);
+    memoryProto = InitClass(cx, debugCtor, objProto, &DebuggerMemory::class_,
+                            DebuggerMemory::construct, 0, DebuggerMemory::properties,
+                            DebuggerMemory::methods, nullptr, nullptr);
     if (!memoryProto)
         return false;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Debugger.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Debugger.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Debugger.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Debugger.h	2015-02-28 15:03:08.000000000 +0000
@@ -441,6 +441,8 @@
                                              IsObserving observing);
 
   public:
+    static bool ensureExecutionObservabilityOfOsrFrame(JSContext *cx, InterpreterFrame *frame);
+
     // Public for DebuggerScript_setBreakpoint.
     static bool ensureExecutionObservabilityOfScript(JSContext *cx, JSScript *script);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/DebuggerMemory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/DebuggerMemory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/DebuggerMemory.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/DebuggerMemory.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -62,7 +62,7 @@
 /* static */ bool
 DebuggerMemory::construct(JSContext *cx, unsigned argc, Value *vp)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                          "Debugger.Memory");
     return false;
 }
@@ -79,13 +79,13 @@
     const Value &thisValue = args.thisv();
 
     if (!thisValue.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, InformalValueTypeName(thisValue));
         return nullptr;
     }
 
     JSObject &thisObject = thisValue.toObject();
     if (!thisObject.is<DebuggerMemory>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              class_.name, fnName, thisObject.getClass()->name);
         return nullptr;
     }
@@ -95,7 +95,7 @@
     // of Debugger.Memory. It is the only object that is<DebuggerMemory>() but
     // doesn't have a Debugger instance.
     if (thisObject.as<DebuggerMemory>().getReservedSlot(JSSLOT_DEBUGGER).isUndefined()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              class_.name, fnName, "prototype object");
         return nullptr;
     }
@@ -142,7 +142,7 @@
         for (GlobalObjectSet::Range r = dbg->debuggees.all(); !r.empty(); r.popFront()) {
             JSCompartment *compartment = r.front()->compartment();
             if (compartment->hasObjectMetadataCallback()) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_OBJECT_METADATA_CALLBACK_ALREADY_SET);
                 return false;
             }
@@ -180,7 +180,7 @@
     Debugger* dbg = memory->getDebugger();
 
     if (!dbg->trackingAllocationSites) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_TRACKING_ALLOCATIONS,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_TRACKING_ALLOCATIONS,
                              "drainAllocationsLog");
         return false;
     }
@@ -245,7 +245,7 @@
         return false;
 
     if (max < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              "(set maxAllocationsLogLength)'s parameter",
                              "not a positive integer");
         return false;
@@ -283,7 +283,7 @@
         return false;
 
     if (probability < 0.0 || probability > 1.0) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNEXPECTED_TYPE,
                              "(set allocationSamplingProbability)'s parameter",
                              "not a number between 0 and 1");
         return false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ErrorObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ErrorObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ErrorObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ErrorObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -14,13 +14,13 @@
 
 struct JSExnPrivate;
 
+namespace js {
+
 /*
  * Initialize the exception constructor/prototype hierarchy.
  */
 extern JSObject *
-js_InitExceptionClasses(JSContext *cx, JS::HandleObject obj);
-
-namespace js {
+InitExceptionClasses(JSContext *cx, HandleObject obj);
 
 class ErrorObject : public NativeObject
 {
@@ -32,20 +32,7 @@
 
     /* For access to createProto. */
     friend JSObject *
-    ::js_InitExceptionClasses(JSContext *cx, JS::HandleObject global);
-
-    /* For access to assignInitialShape. */
-    friend bool
-    EmptyShape::ensureInitialCustomShape<ErrorObject>(ExclusiveContext *cx,
-                                                      Handle<ErrorObject*> obj);
-
-    /*
-     * Assign the initial error shape to the empty object.  (This shape does
-     * *not* include .message, which must be added separately if needed; see
-     * ErrorObject::init.)
-     */
-    static Shape *
-    assignInitialShape(ExclusiveContext *cx, Handle<ErrorObject*> obj);
+    js::InitExceptionClasses(JSContext *cx, HandleObject global);
 
     static bool
     init(JSContext *cx, Handle<ErrorObject*> obj, JSExnType type,
@@ -85,6 +72,14 @@
            uint32_t lineNumber, uint32_t columnNumber, ScopedJSFreePtr<JSErrorReport> *report,
            HandleString message);
 
+    /*
+     * Assign the initial error shape to the empty object.  (This shape does
+     * *not* include .message, which must be added separately if needed; see
+     * ErrorObject::init.)
+     */
+    static Shape *
+    assignInitialShape(ExclusiveContext *cx, Handle<ErrorObject*> obj);
+
     JSExnType type() const {
         return JSExnType(getReservedSlot(EXNTYPE_SLOT).toInt32());
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ForOfIterator.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ForOfIterator.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ForOfIterator.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ForOfIterator.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -72,7 +72,7 @@
         char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, iterable, NullPtr());
         if (!bytes)
             return false;
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_ITERABLE, bytes);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_ITERABLE, bytes);
         js_free(bytes);
         return false;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/GeneratorObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/GeneratorObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/GeneratorObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/GeneratorObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -68,7 +68,7 @@
 
     if (*pc == JSOP_YIELD && genObj->isClosing() && genObj->is<LegacyGeneratorObject>()) {
         RootedValue val(cx, ObjectValue(*frame.callee()));
-        js_ReportValueError(cx, JSMSG_BAD_GENERATOR_YIELD, JSDVG_IGNORE_STACK, val, NullPtr());
+        ReportValueError(cx, JSMSG_BAD_GENERATOR_YIELD, JSDVG_IGNORE_STACK, val, NullPtr());
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/GlobalObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/GlobalObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/GlobalObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/GlobalObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -47,13 +47,17 @@
     ClassInitializerOp init;
 };
 
+namespace js {
+
 #define DECLARE_PROTOTYPE_CLASS_INIT(name,code,init,clasp) \
     extern JSObject *init(JSContext *cx, Handle<JSObject*> obj);
 JS_FOR_EACH_PROTOTYPE(DECLARE_PROTOTYPE_CLASS_INIT)
 #undef DECLARE_PROTOTYPE_CLASS_INIT
 
+} // namespace js
+
 JSObject *
-js_InitViaClassSpec(JSContext *cx, Handle<JSObject*> obj)
+js::InitViaClassSpec(JSContext *cx, Handle<JSObject*> obj)
 {
     MOZ_CRASH("js_InitViaClassSpec() should not be called.");
 }
@@ -105,7 +109,7 @@
     // top of this file. The other lives in the ClassSpec for classes that
     // define it. Classes may use one or the other, but not both.
     ClassInitializerOp init = protoTable[key].init;
-    if (init == js_InitViaClassSpec)
+    if (init == InitViaClassSpec)
         init = nullptr;
 
     const Class *clasp = ProtoKeyToClass(key);
@@ -415,7 +419,7 @@
     Rooted<GlobalObject*> global(cx, &obj->global());
     HeapSlot &v = global->getSlotRef(slot);
     if (v.isUndefined()) {
-        if (!JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING, js_GetErrorMessage, nullptr,
+        if (!JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING, GetErrorMessage, nullptr,
                                           errorNumber))
         {
             return false;
@@ -614,11 +618,11 @@
     Rooted<UnownedBaseShape*> base(cx, last->base()->unowned());
 
     StackShape child(base, id, slot, 0, 0);
-    RootedShape shape(cx, cx->compartment()->propertyTree.getChild(cx, last, child));
+    Shape *shape = cx->compartment()->propertyTree.getChild(cx, last, child);
     if (!shape)
         return false;
 
-    if (!NativeObject::setLastProperty(cx, holder, shape))
+    if (!holder->setLastProperty(cx, shape))
         return false;
 
     holder->setSlot(shape->slot(), value);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/GlobalObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/GlobalObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/GlobalObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/GlobalObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -19,11 +19,11 @@
 #include "vm/ErrorObject.h"
 #include "vm/Runtime.h"
 
-extern JSObject *
-js_InitSharedArrayBufferClass(JSContext *cx, js::HandleObject obj);
-
 namespace js {
 
+extern JSObject *
+InitSharedArrayBufferClass(JSContext *cx, HandleObject obj);
+
 class Debugger;
 class TypedObjectModuleObject;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/HelperThreads.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/HelperThreads.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/HelperThreads.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/HelperThreads.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -936,7 +936,7 @@
     for (size_t i = 0; i < parseTask->errors.length(); i++)
         parseTask->errors[i]->throwError(cx);
     if (parseTask->overRecursed)
-        js_ReportOverRecursed(cx);
+        ReportOverRecursed(cx);
     if (cx->isExceptionPending())
         return nullptr;
 
@@ -1244,7 +1244,7 @@
 
     if (!HelperThreadState().compressionWorklist().append(task)) {
         if (JSContext *maybecx = cx->maybeJSContext())
-            js_ReportOutOfMemory(maybecx);
+            ReportOutOfMemory(maybecx);
         return false;
     }
 
@@ -1291,7 +1291,7 @@
         js_free(compressed);
 
         if (result == OOM)
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
         else if (result == Aborted && !ss->ensureOwnsSource(cx))
             result = OOM;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Interpreter.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Interpreter.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Interpreter.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Interpreter.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -200,7 +200,11 @@
     bool ok = Invoke(cx, args);
     vp[0] = args.rval();
 
-    cx->compartment()->addTelemetry(JSCompartment::DeprecatedNoSuchMethod);
+    if (JSScript *script = cx->currentScript()) {
+        const char *filename = script->filename();
+        cx->compartment()->addTelemetry(filename, JSCompartment::DeprecatedNoSuchMethod);
+    }
+
     return ok;
 }
 
@@ -237,7 +241,7 @@
         NativeObject *proto = GlobalObject::getOrCreateNumberPrototype(cx, global);
         if (!proto)
             return false;
-        if (ClassMethodIsNative(cx, proto, &NumberObject::class_, id, js_num_toString))
+        if (ClassMethodIsNative(cx, proto, &NumberObject::class_, id, num_toString))
             obj = proto;
     }
 
@@ -359,7 +363,7 @@
     unsigned error = construct ? JSMSG_NOT_CONSTRUCTOR : JSMSG_NOT_FUNCTION;
     int spIndex = numToSkip >= 0 ? -(numToSkip + 1) : JSDVG_SEARCH_STACK;
 
-    js_ReportValueError3(cx, error, spIndex, v, NullPtr(), nullptr, nullptr);
+    ReportValueError3(cx, error, spIndex, v, NullPtr(), nullptr, nullptr);
     return false;
 }
 
@@ -696,7 +700,7 @@
         return clasp->hasInstance(cx, obj, &local, bp);
 
     RootedValue val(cx, ObjectValue(*obj));
-    js_ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS,
+    ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS,
                         JSDVG_SEARCH_STACK, val, NullPtr());
     return false;
 }
@@ -1656,8 +1660,6 @@
 CASE(JSOP_UNUSED107)
 CASE(JSOP_UNUSED125)
 CASE(JSOP_UNUSED126)
-CASE(JSOP_UNUSED146)
-CASE(JSOP_UNUSED147)
 CASE(JSOP_UNUSED148)
 CASE(JSOP_BACKPATCH)
 CASE(JSOP_UNUSED150)
@@ -1916,7 +1918,7 @@
 {
     HandleValue rref = REGS.stackHandleAt(-1);
     if (!rref.isObject()) {
-        js_ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, rref, js::NullPtr());
+        ReportValueError(cx, JSMSG_IN_NOT_OBJECT, -1, rref, js::NullPtr());
         goto error;
     }
     RootedObject &obj = rootObject0;
@@ -2407,11 +2409,9 @@
 END_CASE(JSOP_THIS)
 
 CASE(JSOP_GETPROP)
-CASE(JSOP_GETXPROP)
 CASE(JSOP_LENGTH)
 CASE(JSOP_CALLPROP)
 {
-
     MutableHandleValue lval = REGS.stackHandleAt(-1);
     if (!GetPropertyOperation(cx, REGS.fp(), script, REGS.pc, lval, lval))
         goto error;
@@ -2421,6 +2421,21 @@
 }
 END_CASE(JSOP_GETPROP)
 
+CASE(JSOP_GETXPROP)
+{
+    RootedObject &obj = rootObject0;
+    obj = &REGS.sp[-1].toObject();
+    RootedId &id = rootId0;
+    id = NameToId(script->getName(REGS.pc));
+    MutableHandleValue rval = REGS.stackHandleAt(-1);
+    if (!GetPropertyForNameLookup(cx, obj, id, rval))
+        goto error;
+
+    TypeScript::Monitor(cx, script, REGS.pc, rval);
+    assertSameCompartmentDebugOnly(cx, rval);
+}
+END_CASE(JSOP_GETXPROP)
+
 CASE(JSOP_SETINTRINSIC)
 {
     HandleValue value = REGS.stackHandleAt(-1);
@@ -3216,7 +3231,13 @@
 END_CASE(JSOP_MUTATEPROTO)
 
 CASE(JSOP_INITPROP)
+CASE(JSOP_INITLOCKEDPROP)
+CASE(JSOP_INITHIDDENPROP)
 {
+    static_assert(JSOP_INITPROP_LENGTH == JSOP_INITLOCKEDPROP_LENGTH,
+                  "initprop and initlockedprop must be the same size");
+    static_assert(JSOP_INITPROP_LENGTH == JSOP_INITHIDDENPROP_LENGTH,
+                  "initprop and inithiddenprop must be the same size");
     /* Load the property's initial value into rval. */
     MOZ_ASSERT(REGS.stackDepth() >= 2);
     RootedValue &rval = rootValue0;
@@ -3224,14 +3245,16 @@
 
     /* Load the object being initialized into lval/obj. */
     RootedNativeObject &obj = rootNativeObject0;
-    obj = &REGS.sp[-2].toObject().as<PlainObject>();
+    obj = &REGS.sp[-2].toObject().as<NativeObject>();
+    MOZ_ASSERT(obj->is<PlainObject>() || obj->is<JSFunction>());
 
     PropertyName *name = script->getName(REGS.pc);
 
     RootedId &id = rootId0;
     id = NameToId(name);
 
-    if (!NativeDefineProperty(cx, obj, id, rval, nullptr, nullptr, JSPROP_ENUMERATE))
+    unsigned propAttrs = GetInitDataPropAttrs(JSOp(*REGS.pc));
+    if (!NativeDefineProperty(cx, obj, id, rval, nullptr, nullptr, propAttrs))
         goto error;
 
     REGS.sp--;
@@ -3358,7 +3381,7 @@
     RootedValue &rref = rootValue0;
     rref = REGS.sp[-1];
     if (rref.isPrimitive()) {
-        js_ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rref, js::NullPtr());
+        ReportValueError(cx, JSMSG_BAD_INSTANCEOF_RHS, -1, rref, js::NullPtr());
         goto error;
     }
     RootedObject &obj = rootObject0;
@@ -3525,7 +3548,7 @@
 {
     char numBuf[12];
     JS_snprintf(numBuf, sizeof numBuf, "%d", *REGS.pc);
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                          JSMSG_BAD_BYTECODE, numBuf);
     goto error;
 }
@@ -3649,7 +3672,7 @@
     if (!shape) {
         JSAutoByteString printable;
         if (AtomToPrintableString(cx, name, &printable))
-            js_ReportIsNotDefined(cx, printable.ptr());
+            ReportIsNotDefined(cx, printable.ptr());
         return false;
     }
 
@@ -3785,7 +3808,7 @@
         if (shape->isAccessorDescriptor() || !shape->writable() || !shape->enumerable()) {
             JSAutoByteString bytes;
             if (AtomToPrintableString(cx, name, &bytes)) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_CANT_REDEFINE_PROP,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_CANT_REDEFINE_PROP,
                                      bytes.ptr());
             }
 
@@ -3807,7 +3830,7 @@
 bool
 js::SetCallOperation(JSContext *cx)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_LEFTSIDE_OF_ASS);
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_LEFTSIDE_OF_ASS);
     return false;
 }
 
@@ -4004,6 +4027,22 @@
     return true;
 }
 
+unsigned
+js::GetInitDataPropAttrs(JSOp op)
+{
+    switch (op) {
+      case JSOP_INITPROP:
+        return JSPROP_ENUMERATE;
+      case JSOP_INITLOCKEDPROP:
+        return JSPROP_PERMANENT | JSPROP_READONLY;
+      case JSOP_INITHIDDENPROP:
+        // Non-enumerable, but writable and configurable
+        return 0;
+      default:;
+    }
+    MOZ_CRASH("Unknown data initprop");
+}
+
 bool
 js::InitGetterSetterOperation(JSContext *cx, jsbytecode *pc, HandleObject obj, HandleId id,
                               HandleObject val)
@@ -4058,7 +4097,7 @@
     JSOp op = JSOp(*pc);
 
     if (length > ARGS_LENGTH_MAX) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              op == JSOP_SPREADNEW ? JSMSG_TOO_MANY_CON_SPREADARGS
                                                   : JSMSG_TOO_MANY_FUN_SPREADARGS);
         return false;
@@ -4117,7 +4156,7 @@
 {
     JSAutoByteString printable;
     if (AtomToPrintableString(cx, name, &printable)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNINITIALIZED_LEXICAL,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_UNINITIALIZED_LEXICAL,
                              printable.ptr());
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Interpreter.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Interpreter.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Interpreter.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Interpreter.h	2015-02-28 15:03:08.000000000 +0000
@@ -51,7 +51,7 @@
  * before it reaches |v|. If it's -1, the decompiler will search the stack.
  */
 extern bool
-ReportIsNotFunction(JSContext *cx, HandleValue v, int numToSkip = -1,
+ReportIsNotFunction(JSContext *cx, HandleValue v, int numToSkip,
                     MaybeConstruct construct = NO_CONSTRUCT);
 
 /* See ReportIsNotFunction comment for the meaning of numToSkip. */
@@ -377,6 +377,9 @@
 InitGetterSetterOperation(JSContext *cx, jsbytecode *pc, HandleObject obj, HandlePropertyName name,
                           HandleObject val);
 
+unsigned
+GetInitDataPropAttrs(JSOp op);
+
 bool
 EnterWithOperation(JSContext *cx, AbstractFramePtr frame, HandleValue val, HandleObject staticWith);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Interpreter-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Interpreter-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Interpreter-inl.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Interpreter-inl.h	2015-02-28 15:03:08.000000000 +0000
@@ -92,7 +92,7 @@
 GuardFunApplyArgumentsOptimization(JSContext *cx, AbstractFramePtr frame, CallArgs &args)
 {
     if (args.length() == 2 && IsOptimizedArguments(frame, args[1])) {
-        if (!IsNativeFunction(args.calleev(), js_fun_apply)) {
+        if (!IsNativeFunction(args.calleev(), js::fun_apply)) {
             RootedScript script(cx, frame.script());
             if (!JSScript::argumentsOptimizationFailed(cx, script))
                 return false;
@@ -186,7 +186,7 @@
         return GlobalObject::getOrCreateBooleanPrototype(cx, global);
 
     MOZ_ASSERT(v.isNull() || v.isUndefined());
-    js_ReportIsNullOrUndefined(cx, spindex, v, NullPtr());
+    ReportIsNullOrUndefined(cx, spindex, v, NullPtr());
     return nullptr;
 }
 
@@ -230,7 +230,7 @@
         }
         JSAutoByteString printable;
         if (AtomToPrintableString(cx, name, &printable))
-            js_ReportIsNotDefined(cx, printable.ptr());
+            ReportIsNotDefined(cx, printable.ptr());
         return false;
     }
 
@@ -355,7 +355,7 @@
         JSAutoByteString bytes;
         if (AtomToPrintableString(cx, dn, &bytes)) {
             JS_ALWAYS_FALSE(JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR,
-                                                         js_GetErrorMessage,
+                                                         GetErrorMessage,
                                                          nullptr, JSMSG_REDECLARED_VAR,
                                                          desc.isReadonly() ? "const" : "var",
                                                          bytes.ptr()));
@@ -636,7 +636,7 @@
     }
 
     if (op == JSOP_INITELEM_INC && index == INT32_MAX) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SPREAD_TOO_LARGE);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SPREAD_TOO_LARGE);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/JSONParser.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/JSONParser.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/JSONParser.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/JSONParser.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -94,7 +94,7 @@
         char lineNumber[MaxWidth];
         JS_snprintf(lineNumber, sizeof lineNumber, "%lu", line);
 
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_JSON_BAD_PARSE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_JSON_BAD_PARSE,
                              msg, lineNumber, columnNumber);
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Keywords.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Keywords.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Keywords.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Keywords.h	2015-02-28 15:03:08.000000000 +0000
@@ -43,8 +43,8 @@
     macro(with, with, TOK_WITH, JSVERSION_DEFAULT) \
     macro(import, import, TOK_IMPORT, JSVERSION_DEFAULT) \
     macro(export, export, TOK_EXPORT, JSVERSION_DEFAULT) \
+    macro(class, class_, TOK_CLASS, JSVERSION_DEFAULT) \
     /* Reserved keywords. */ \
-    macro(class, class_, TOK_RESERVED, JSVERSION_DEFAULT) \
     macro(enum, enum_, TOK_RESERVED, JSVERSION_DEFAULT) \
     macro(extends, extends, TOK_RESERVED, JSVERSION_DEFAULT) \
     macro(super, super, TOK_RESERVED, JSVERSION_DEFAULT) \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/MemoryMetrics.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/MemoryMetrics.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/MemoryMetrics.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/MemoryMetrics.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -358,7 +358,7 @@
     // unused space like this:  arenaUnused = maxArenaUnused - arenaUsed.
     // We do this by setting arenaUnused to maxArenaUnused here, and then
     // subtracting thingSize for every used cell, in StatsCellCallback().
-    rtStats->currZoneStats->unusedGCThings += allocationSpace;
+    rtStats->currZoneStats->unusedGCThings.addToKind(traceKind, allocationSpace);
 }
 
 static CompartmentStats *
@@ -561,7 +561,7 @@
     }
 
     // Yes, this is a subtraction:  see StatsArenaCallback() for details.
-    zStats->unusedGCThings -= thingSize;
+    zStats->unusedGCThings.addToKind(traceKind, -thingSize);
 }
 
 bool
@@ -763,7 +763,7 @@
 #ifdef DEBUG
     // Check that the in-arena measurements look ok.
     size_t totalArenaSize = rtStats->zTotals.gcHeapArenaAdmin +
-                            rtStats->zTotals.unusedGCThings +
+                            rtStats->zTotals.unusedGCThings.totalSize() +
                             rtStats->gcHeapGCThings;
     MOZ_ASSERT(totalArenaSize % gc::ArenaSize == 0);
 #endif
@@ -782,7 +782,7 @@
     rtStats->gcHeapUnusedArenas = rtStats->gcHeapChunkTotal -
                                   rtStats->gcHeapDecommittedArenas -
                                   rtStats->gcHeapUnusedChunks -
-                                  rtStats->zTotals.unusedGCThings -
+                                  rtStats->zTotals.unusedGCThings.totalSize() -
                                   rtStats->gcHeapChunkAdmin -
                                   rtStats->zTotals.gcHeapArenaAdmin -
                                   rtStats->gcHeapGCThings;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NativeObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NativeObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NativeObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NativeObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -53,7 +53,7 @@
 {
     if (hasGet_) {
         if (!IsCallable(get_) && !get_.isUndefined()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_GET_SET_FIELD,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_GET_SET_FIELD,
                                  js_getter_str);
             return false;
         }
@@ -66,7 +66,7 @@
 {
     if (hasSet_) {
         if (!IsCallable(set_) && !set_.isUndefined()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_GET_SET_FIELD,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_GET_SET_FIELD,
                                  js_setter_str);
             return false;
         }
@@ -296,56 +296,55 @@
     gc::MarkValueRoot(trc, &set_, "PropDesc set");
 }
 
-/* static */ inline bool
-NativeObject::updateSlotsForSpan(ExclusiveContext *cx,
-                                 HandleNativeObject obj, size_t oldSpan, size_t newSpan)
+inline bool
+NativeObject::updateSlotsForSpan(ExclusiveContext *cx, size_t oldSpan, size_t newSpan)
 {
     MOZ_ASSERT(oldSpan != newSpan);
 
-    size_t oldCount = dynamicSlotsCount(obj->numFixedSlots(), oldSpan, obj->getClass());
-    size_t newCount = dynamicSlotsCount(obj->numFixedSlots(), newSpan, obj->getClass());
+    size_t oldCount = dynamicSlotsCount(numFixedSlots(), oldSpan, getClass());
+    size_t newCount = dynamicSlotsCount(numFixedSlots(), newSpan, getClass());
 
     if (oldSpan < newSpan) {
-        if (oldCount < newCount && !growSlots(cx, obj, oldCount, newCount))
+        if (oldCount < newCount && !growSlots(cx, oldCount, newCount))
             return false;
 
         if (newSpan == oldSpan + 1)
-            obj->initSlotUnchecked(oldSpan, UndefinedValue());
+            initSlotUnchecked(oldSpan, UndefinedValue());
         else
-            obj->initializeSlotRange(oldSpan, newSpan - oldSpan);
+            initializeSlotRange(oldSpan, newSpan - oldSpan);
     } else {
         /* Trigger write barriers on the old slots before reallocating. */
-        obj->prepareSlotRangeForOverwrite(newSpan, oldSpan);
-        obj->invalidateSlotRange(newSpan, oldSpan - newSpan);
+        prepareSlotRangeForOverwrite(newSpan, oldSpan);
+        invalidateSlotRange(newSpan, oldSpan - newSpan);
 
         if (oldCount > newCount)
-            shrinkSlots(cx, obj, oldCount, newCount);
+            shrinkSlots(cx, oldCount, newCount);
     }
 
     return true;
 }
 
-/* static */ bool
-NativeObject::setLastProperty(ExclusiveContext *cx, HandleNativeObject obj, HandleShape shape)
+bool
+NativeObject::setLastProperty(ExclusiveContext *cx, Shape *shape)
 {
-    MOZ_ASSERT(!obj->inDictionaryMode());
+    MOZ_ASSERT(!inDictionaryMode());
     MOZ_ASSERT(!shape->inDictionary());
-    MOZ_ASSERT(shape->compartment() == obj->compartment());
-    MOZ_ASSERT(shape->numFixedSlots() == obj->numFixedSlots());
-    MOZ_ASSERT(shape->getObjectClass() == obj->getClass());
+    MOZ_ASSERT(shape->compartment() == compartment());
+    MOZ_ASSERT(shape->numFixedSlots() == numFixedSlots());
+    MOZ_ASSERT(shape->getObjectClass() == getClass());
 
-    size_t oldSpan = obj->lastProperty()->slotSpan();
+    size_t oldSpan = lastProperty()->slotSpan();
     size_t newSpan = shape->slotSpan();
 
     if (oldSpan == newSpan) {
-        obj->shape_ = shape;
+        shape_ = shape;
         return true;
     }
 
-    if (!updateSlotsForSpan(cx, obj, oldSpan, newSpan))
+    if (!updateSlotsForSpan(cx, oldSpan, newSpan))
         return false;
 
-    obj->shape_ = shape;
+    shape_ = shape;
     return true;
 }
 
@@ -383,43 +382,42 @@
     shape_ = shape;
 }
 
-/* static */ void
-NativeObject::setLastPropertyMakeNative(ExclusiveContext *cx, HandleNativeObject obj,
-                                        HandleShape shape)
+void
+NativeObject::setLastPropertyMakeNative(ExclusiveContext *cx, Shape *shape)
 {
-    MOZ_ASSERT(obj->getClass()->isNative());
-    MOZ_ASSERT(!obj->lastProperty()->isNative());
+    MOZ_ASSERT(getClass()->isNative());
+    MOZ_ASSERT(!lastProperty()->isNative());
     MOZ_ASSERT(shape->isNative());
-    MOZ_ASSERT(!obj->inDictionaryMode());
+    MOZ_ASSERT(!inDictionaryMode());
     MOZ_ASSERT(!shape->inDictionary());
-    MOZ_ASSERT(shape->compartment() == obj->compartment());
+    MOZ_ASSERT(shape->compartment() == compartment());
 
-    obj->shape_ = shape;
-    obj->slots_ = nullptr;
-    obj->elements_ = emptyObjectElements;
+    shape_ = shape;
+    slots_ = nullptr;
+    elements_ = emptyObjectElements;
 
     size_t oldSpan = shape->numFixedSlots();
     size_t newSpan = shape->slotSpan();
 
-    // A failures at this point will leave the object as a mutant, and we
+    // A failure at this point will leave the object as a mutant, and we
     // can't recover.
-    if (oldSpan != newSpan && !updateSlotsForSpan(cx, obj, oldSpan, newSpan))
+    if (oldSpan != newSpan && !updateSlotsForSpan(cx, oldSpan, newSpan))
         CrashAtUnhandlableOOM("NativeObject::setLastPropertyMakeNative");
 }
 
-/* static */ bool
-NativeObject::setSlotSpan(ExclusiveContext *cx, HandleNativeObject obj, uint32_t span)
+bool
+NativeObject::setSlotSpan(ExclusiveContext *cx, uint32_t span)
 {
-    MOZ_ASSERT(obj->inDictionaryMode());
+    MOZ_ASSERT(inDictionaryMode());
 
-    size_t oldSpan = obj->lastProperty()->base()->slotSpan();
+    size_t oldSpan = lastProperty()->base()->slotSpan();
     if (oldSpan == span)
         return true;
 
-    if (!updateSlotsForSpan(cx, obj, oldSpan, span))
+    if (!updateSlotsForSpan(cx, oldSpan, span))
         return false;
 
-    obj->lastProperty()->base()->setSlotSpan(span);
+    lastProperty()->base()->setSlotSpan(span);
     return true;
 }
 
@@ -448,11 +446,11 @@
     return obj->zone()->pod_realloc<HeapSlot>(oldSlots, oldCount, newCount);
 }
 
-/* static */ bool
-NativeObject::growSlots(ExclusiveContext *cx, HandleNativeObject obj, uint32_t oldCount, uint32_t newCount)
+bool
+NativeObject::growSlots(ExclusiveContext *cx, uint32_t oldCount, uint32_t newCount)
 {
     MOZ_ASSERT(newCount > oldCount);
-    MOZ_ASSERT_IF(!obj->is<ArrayObject>(), newCount >= SLOT_CAPACITY_MIN);
+    MOZ_ASSERT_IF(!is<ArrayObject>(), newCount >= SLOT_CAPACITY_MIN);
 
     /*
      * Slot capacities are determined by the span of allocated objects. Due to
@@ -463,20 +461,20 @@
     MOZ_ASSERT(newCount < NELEMENTS_LIMIT);
 
     if (!oldCount) {
-        obj->slots_ = AllocateSlots(cx, obj, newCount);
-        if (!obj->slots_)
+        slots_ = AllocateSlots(cx, this, newCount);
+        if (!slots_)
             return false;
-        Debug_SetSlotRangeToCrashOnTouch(obj->slots_, newCount);
+        Debug_SetSlotRangeToCrashOnTouch(slots_, newCount);
         return true;
     }
 
-    HeapSlot *newslots = ReallocateSlots(cx, obj, obj->slots_, oldCount, newCount);
+    HeapSlot *newslots = ReallocateSlots(cx, this, slots_, oldCount, newCount);
     if (!newslots)
         return false;  /* Leave slots at its old size. */
 
-    obj->slots_ = newslots;
+    slots_ = newslots;
 
-    Debug_SetSlotRangeToCrashOnTouch(obj->slots_ + oldCount, newCount - oldCount);
+    Debug_SetSlotRangeToCrashOnTouch(slots_ + oldCount, newCount - oldCount);
 
     return true;
 }
@@ -490,25 +488,24 @@
     js_free(slots);
 }
 
-/* static */ void
-NativeObject::shrinkSlots(ExclusiveContext *cx, HandleNativeObject obj,
-                          uint32_t oldCount, uint32_t newCount)
+void
+NativeObject::shrinkSlots(ExclusiveContext *cx, uint32_t oldCount, uint32_t newCount)
 {
     MOZ_ASSERT(newCount < oldCount);
 
     if (newCount == 0) {
-        FreeSlots(cx, obj->slots_);
-        obj->slots_ = nullptr;
+        FreeSlots(cx, slots_);
+        slots_ = nullptr;
         return;
     }
 
-    MOZ_ASSERT_IF(!obj->is<ArrayObject>(), newCount >= SLOT_CAPACITY_MIN);
+    MOZ_ASSERT_IF(!is<ArrayObject>(), newCount >= SLOT_CAPACITY_MIN);
 
-    HeapSlot *newslots = ReallocateSlots(cx, obj, obj->slots_, oldCount, newCount);
+    HeapSlot *newslots = ReallocateSlots(cx, this, slots_, oldCount, newCount);
     if (!newslots)
         return;  /* Leave slots at its old size. */
 
-    obj->slots_ = newslots;
+    slots_ = newslots;
 }
 
 /* static */ bool
@@ -629,7 +626,7 @@
     RootedShape shape(cx, obj->lastProperty());
     while (!shape->isEmptyShape()) {
         uint32_t index;
-        if (js_IdIsIndex(shape->propid(), &index)) {
+        if (IdIsIndex(shape->propid(), &index)) {
             if (shape->attributes() == JSPROP_ENUMERATE &&
                 shape->hasDefaultGetter() &&
                 shape->hasDefaultSetter())
@@ -674,7 +671,7 @@
     while (!shape->isEmptyShape()) {
         jsid id = shape->propid();
         uint32_t index;
-        if (js_IdIsIndex(id, &index)) {
+        if (IdIsIndex(id, &index)) {
             value = obj->getSlot(shape->slot());
 
             /*
@@ -982,13 +979,13 @@
     }
 
     if (slot >= SHAPE_MAXIMUM_SLOT) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
     *slotp = slot;
 
-    if (obj->inDictionaryMode() && !setSlotSpan(cx, obj, slot + 1))
+    if (obj->inDictionaryMode() && !obj->setSlotSpan(cx, slot + 1))
         return false;
 
     return true;
@@ -1178,7 +1175,7 @@
         }
 
         uint32_t index;
-        if (js_IdIsIndex(id, &index)) {
+        if (IdIsIndex(id, &index)) {
             bool definesPast;
             if (!WouldDefinePastNonwritableLength(cx, arr, index, setterIsStrict, &definesPast))
                 return false;
@@ -1736,6 +1733,8 @@
     return false;
 }
 
+enum IsNameLookup { NotNameLookup = false, NameLookup = true };
+
 /*
  * Finish getting the property `receiver[id]` after looking at every object on
  * the prototype chain and not finding any such property.
@@ -1755,7 +1754,7 @@
  */
 static bool
 GetNonexistentProperty(JSContext *cx, HandleNativeObject obj, HandleId id,
-                       HandleObject receiver, MutableHandleValue vp)
+                       HandleObject receiver, IsNameLookup nameLookup, MutableHandleValue vp)
 {
     vp.setUndefined();
 
@@ -1771,15 +1770,10 @@
     }
 
     // If we are doing a name lookup, this is a ReferenceError.
-    jsbytecode *pc = nullptr;
-    RootedScript script(cx, cx->currentScript(&pc));
-    if (!pc)
-        return true;
-    JSOp op = (JSOp) *pc;
-    if (op == JSOP_GETXPROP) {
+    if (nameLookup) {
         JSAutoByteString printable;
-        if (js_ValueToPrintable(cx, IdToValue(id), &printable))
-            js_ReportIsNotDefined(cx, printable.ptr());
+        if (ValueToPrintable(cx, IdToValue(id), &printable))
+            ReportIsNotDefined(cx, printable.ptr());
         return false;
     }
 
@@ -1788,11 +1782,19 @@
     //
     // Don't warn if extra warnings not enabled or for random getprop
     // operations.
-    if (!cx->compartment()->options().extraWarnings(cx) || (op != JSOP_GETPROP && op != JSOP_GETELEM))
+    if (!cx->compartment()->options().extraWarnings(cx))
+        return true;
+
+    jsbytecode *pc;
+    RootedScript script(cx, cx->currentScript(&pc));
+    if (!script)
+        return true;
+
+    if (*pc != JSOP_GETPROP && *pc != JSOP_GETELEM)
         return true;
 
     // Don't warn repeatedly for the same script.
-    if (!script || script->warnedAboutUndefinedProp())
+    if (script->warnedAboutUndefinedProp())
         return true;
 
     // Don't warn in self-hosted code (where the further presence of
@@ -1806,7 +1808,7 @@
         return true;
 
     // Do not warn about tests like (obj[prop] == undefined).
-    pc += js_CodeSpec[op].length;
+    pc += js_CodeSpec[*pc].length;
     if (Detecting(cx, script, pc))
         return true;
 
@@ -1815,14 +1817,14 @@
 
     // Ok, bad undefined property reference: whine about it.
     RootedValue val(cx, IdToValue(id));
-    return js_ReportValueErrorFlags(cx, flags, JSMSG_UNDEFINED_PROP, JSDVG_IGNORE_STACK, val,
+    return ReportValueErrorFlags(cx, flags, JSMSG_UNDEFINED_PROP, JSDVG_IGNORE_STACK, val,
                                     js::NullPtr(), nullptr, nullptr);
 }
 
 /* The NoGC version of GetNonexistentProperty, present only to make types line up. */
 bool
 GetNonexistentProperty(JSContext *cx, NativeObject *obj, jsid id, JSObject *receiver,
-                       FakeMutableHandle<Value> vp)
+                       IsNameLookup nameLookup, FakeMutableHandle<Value> vp)
 {
     return false;
 }
@@ -1849,6 +1851,7 @@
                         typename MaybeRooted<NativeObject*, allowGC>::HandleType obj,
                         typename MaybeRooted<JSObject*, allowGC>::HandleType receiver,
                         typename MaybeRooted<jsid, allowGC>::HandleType id,
+                        IsNameLookup nameLookup,
                         typename MaybeRooted<Value, allowGC>::MutableHandleType vp)
 {
     typename MaybeRooted<NativeObject*, allowGC>::RootType pobj(cx, obj);
@@ -1885,7 +1888,7 @@
         // Step 4.c. The spec algorithm simply returns undefined if proto is
         // null, but see the comment on GetNonexistentProperty.
         if (!proto)
-            return GetNonexistentProperty(cx, obj, id, receiver, vp);
+            return GetNonexistentProperty(cx, obj, id, receiver, nameLookup, vp);
 
         // Step 4.d. If the prototype is also native, this step is a
         // recursive tail call, and we don't need to go through all the
@@ -1903,16 +1906,23 @@
 js::NativeGetProperty(JSContext *cx, HandleNativeObject obj, HandleObject receiver, HandleId id,
                       MutableHandleValue vp)
 {
-    return NativeGetPropertyInline<CanGC>(cx, obj, receiver, id, vp);
+    return NativeGetPropertyInline<CanGC>(cx, obj, receiver, id, NotNameLookup, vp);
 }
 
 bool
 js::NativeGetPropertyNoGC(JSContext *cx, NativeObject *obj, JSObject *receiver, jsid id, Value *vp)
 {
     AutoAssertNoException noexc(cx);
-    return NativeGetPropertyInline<NoGC>(cx, obj, receiver, id, vp);
+    return NativeGetPropertyInline<NoGC>(cx, obj, receiver, id, NotNameLookup, vp);
 }
 
+bool
+js::GetPropertyForNameLookup(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue vp)
+{
+    if (GetPropertyOp op = obj->getOps()->getProperty)
+        return op(cx, obj, obj, id, vp);
+    return NativeGetPropertyInline<CanGC>(cx, obj.as<NativeObject>(), obj, id, NameLookup, vp);
+}
 
 /*** [[Set]] *************************************************************************************/
 
@@ -1936,7 +1946,7 @@
            JS_ReportErrorFlagsAndNumber(cx,
                                         (JSREPORT_WARNING | JSREPORT_STRICT
                                          | JSREPORT_STRICT_MODE_ERROR),
-                                        js_GetErrorMessage, nullptr,
+                                        GetErrorMessage, nullptr,
                                         JSMSG_UNDECLARED_VAR, bytes.ptr());
 }
 
@@ -2135,7 +2145,7 @@
          * or throw if we're in strict mode.
          */
         if (!shape->hasGetterValue() && shape->hasDefaultSetter())
-            return js_ReportGetterOnlyAssignment(cx, strict);
+            return ReportGetterOnlyAssignment(cx, strict);
     }
 
     RootedValue ovp(cx, vp);
@@ -2177,7 +2187,7 @@
         /* ES5 8.12.4 [[Put]] step 2. */
         if (shape->isAccessorDescriptor()) {
             if (shape->hasDefaultSetter())
-                return js_ReportGetterOnlyAssignment(cx, strict);
+                return ReportGetterOnlyAssignment(cx, strict);
         } else {
             MOZ_ASSERT(shape->isDataDescriptor());
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NativeObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NativeObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NativeObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NativeObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -399,12 +399,9 @@
         return getElementsHeader()->capacity;
     }
 
-    /*
-     * Update the last property, keeping the number of allocated slots in sync
-     * with the object's new slot span.
-     */
-    static bool setLastProperty(ExclusiveContext *cx,
-                                HandleNativeObject obj, HandleShape shape);
+    // Update the last property, keeping the number of allocated slots in sync
+    // with the object's new slot span.
+    bool setLastProperty(ExclusiveContext *cx, Shape *shape);
 
     // As for setLastProperty(), but allows the number of fixed slots to
     // change. This can only be used when fixed slots are being erased from the
@@ -420,8 +417,7 @@
     // As for setLastProperty(), but changes the class associated with the
     // object to a native one. The object's type has already been changed, and
     // this brings the shape into sync with it.
-    static void setLastPropertyMakeNative(ExclusiveContext *cx, HandleNativeObject obj,
-                                          HandleShape shape);
+    void setLastPropertyMakeNative(ExclusiveContext *cx, Shape *shape);
 
   protected:
 #ifdef DEBUG
@@ -447,7 +443,7 @@
      * Update the slot span directly for a dictionary object, and allocate
      * slots to cover the new span if necessary.
      */
-    static bool setSlotSpan(ExclusiveContext *cx, HandleNativeObject obj, uint32_t span);
+    bool setSlotSpan(ExclusiveContext *cx, uint32_t span);
 
     bool toDictionaryMode(ExclusiveContext *cx);
 
@@ -590,10 +586,8 @@
      * The number of allocated slots is not stored explicitly, and changes to
      * the slots must track changes in the slot span.
      */
-    static bool growSlots(ExclusiveContext *cx, HandleNativeObject obj, uint32_t oldCount,
-                          uint32_t newCount);
-    static void shrinkSlots(ExclusiveContext *cx, HandleNativeObject obj, uint32_t oldCount,
-                            uint32_t newCount);
+    bool growSlots(ExclusiveContext *cx, uint32_t oldCount, uint32_t newCount);
+    void shrinkSlots(ExclusiveContext *cx, uint32_t oldCount, uint32_t newCount);
 
     bool hasDynamicSlots() const { return !!slots_; }
 
@@ -791,8 +785,7 @@
     static const uint32_t MAX_FIXED_SLOTS = 16;
 
   protected:
-    static inline bool updateSlotsForSpan(ExclusiveContext *cx,
-                                          HandleNativeObject obj, size_t oldSpan, size_t newSpan);
+    inline bool updateSlotsForSpan(ExclusiveContext *cx, size_t oldSpan, size_t newSpan);
 
   public:
     /*
@@ -1374,6 +1367,9 @@
     return HasDataProperty(cx, obj, NameToId(name), vp);
 }
 
+extern bool
+GetPropertyForNameLookup(JSContext *cx, HandleObject obj, HandleId id, MutableHandleValue vp);
+
 } /* namespace js */
 
 template <>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NativeObject-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NativeObject-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NativeObject-inl.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NativeObject-inl.h	2015-02-28 15:03:08.000000000 +0000
@@ -39,9 +39,7 @@
 NativeObject::removeLastProperty(ExclusiveContext *cx)
 {
     MOZ_ASSERT(canRemoveLastProperty());
-    RootedNativeObject self(cx, this);
-    RootedShape prev(cx, lastProperty()->previous());
-    JS_ALWAYS_TRUE(setLastProperty(cx, self, prev));
+    JS_ALWAYS_TRUE(setLastProperty(cx, lastProperty()->previous()));
 }
 
 inline bool
@@ -335,8 +333,7 @@
         return nullptr;
 
     RootedObject metadata(cx, obj->getMetadata());
-    RootedShape lastProp(cx, baseobj->lastProperty());
-    if (!NativeObject::setLastProperty(cx, obj, lastProp))
+    if (!obj->setLastProperty(cx, baseobj->lastProperty()))
         return nullptr;
     if (metadata && !JSObject::setMetadata(cx, obj, metadata))
         return nullptr;
@@ -618,7 +615,7 @@
 {
     if (args.isConstructing())
         return true;
-    return JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING, js_GetErrorMessage, nullptr,
+    return JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING, GetErrorMessage, nullptr,
                                         JSMSG_BUILTIN_CTOR_NO_NEW, builtinName);
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NumberObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NumberObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/NumberObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/NumberObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -38,7 +38,7 @@
 
     /* For access to init, as Number.prototype is special. */
     friend JSObject *
-    ::js_InitNumberClass(JSContext *cx, js::HandleObject global);
+    js::InitNumberClass(JSContext *cx, HandleObject global);
 };
 
 } // namespace js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ObjectGroup.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ObjectGroup.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ObjectGroup.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ObjectGroup.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -334,7 +334,7 @@
 JSObject::setNewGroupUnknown(JSContext *cx, const js::Class *clasp, JS::HandleObject obj)
 {
     ObjectGroup::setDefaultNewGroupUnknown(cx, clasp, obj);
-    return obj->setFlag(cx, BaseShape::NEW_GROUP_UNKNOWN);
+    return obj->setFlags(cx, BaseShape::NEW_GROUP_UNKNOWN);
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -1057,8 +1057,7 @@
     }
     MOZ_ASSERT(obj->getProto() == p->value().group->proto().toObject());
 
-    RootedShape shape(cx, p->value().shape);
-    if (!NativeObject::setLastProperty(cx, obj, shape)) {
+    if (!obj->setLastProperty(cx, p->value().shape)) {
         cx->clearPendingException();
         return nullptr;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ObjectGroup.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ObjectGroup.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ObjectGroup.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ObjectGroup.h	2015-02-28 15:03:08.000000000 +0000
@@ -219,6 +219,11 @@
         // as well, if the group is also constructed using 'new').
         Addendum_UnboxedLayout,
 
+        // If this group is used by objects that have been converted from an
+        // unboxed representation, the addendum points to the original unboxed
+        // group.
+        Addendum_OriginalUnboxedGroup,
+
         // When used by typed objects, the addendum stores a TypeDescr.
         Addendum_TypeDescr
     };
@@ -247,7 +252,7 @@
     }
 
     TypeNewScript *anyNewScript();
-    void detachNewScript(bool writeBarrier);
+    void detachNewScript(bool writeBarrier, ObjectGroup *replacement);
 
     ObjectGroupFlags flagsDontCheckGeneration() {
         return flags_;
@@ -284,15 +289,30 @@
         return maybeUnboxedLayoutDontCheckGeneration();
     }
 
-    UnboxedLayout &unboxedLayout() {
+    UnboxedLayout &unboxedLayoutDontCheckGeneration() const {
         MOZ_ASSERT(addendumKind() == Addendum_UnboxedLayout);
-        return *maybeUnboxedLayout();
+        return *maybeUnboxedLayoutDontCheckGeneration();
+    }
+
+    UnboxedLayout &unboxedLayout() {
+        maybeSweep(nullptr);
+        return unboxedLayoutDontCheckGeneration();
     }
 
     void setUnboxedLayout(UnboxedLayout *layout) {
         setAddendum(Addendum_UnboxedLayout, layout);
     }
 
+    ObjectGroup *maybeOriginalUnboxedGroup() const {
+        if (addendumKind() == Addendum_OriginalUnboxedGroup)
+            return reinterpret_cast<ObjectGroup *>(addendum_);
+        return nullptr;
+    }
+
+    void setOriginalUnboxedGroup(ObjectGroup *group) {
+        setAddendum(Addendum_OriginalUnboxedGroup, group);
+    }
+
     TypeDescr *maybeTypeDescr() {
         // Note: there is no need to sweep when accessing the type descriptor
         // of an object, as it is strongly held and immutable.
@@ -460,7 +480,7 @@
     void setFlags(ExclusiveContext *cx, ObjectGroupFlags flags);
     void markUnknown(ExclusiveContext *cx);
     void maybeClearNewScriptOnOOM();
-    void clearNewScript(ExclusiveContext *cx);
+    void clearNewScript(ExclusiveContext *cx, ObjectGroup *replacement = nullptr);
     bool isPropertyNonData(jsid id);
     bool isPropertyNonWritable(jsid id);
 
@@ -508,6 +528,12 @@
         return offsetof(ObjectGroup, flags_);
     }
 
+    // Get the bit pattern stored in an object's addendum when it has an
+    // original unboxed group.
+    static inline int32_t addendumOriginalUnboxedGroupValue() {
+        return Addendum_OriginalUnboxedGroup << OBJECT_FLAG_ADDENDUM_SHIFT;
+    }
+
   private:
     inline uint32_t basePropertyCount();
     inline void setBasePropertyCount(uint32_t count);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Opcodes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Opcodes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Opcodes.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Opcodes.h	2015-02-28 15:03:08.000000000 +0000
@@ -1406,10 +1406,29 @@
      *   Stack: => intrinsicHolder
      */ \
     macro(JSOP_BINDINTRINSIC, 145, "bindintrinsic", NULL, 5,  0,  1, JOF_ATOM|JOF_NAME|JOF_SET) \
-    \
+    /*
+     * Initialize a non-configurable, non-writable, non-enumerable data-property on an object.
+     *
+     * Pops the top two values on the stack as 'val' and 'obj', defines
+     * 'nameIndex' property of 'obj' as 'val', pushes 'obj' onto the stack.
+     *   Category: Literals
+     *   Type: Object
+     *   Operands: uint32_t nameIndex
+     *   Stack: obj, val => obj
+     */ \
+    macro(JSOP_INITLOCKEDPROP, 146, "initlockedprop", NULL, 5,  2,  1, JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING) \
+    /*
+     * Initialize a non-enumerable data-property on an object.
+     *
+     * Pops the top two values on the stack as 'val' and 'obj', defines
+     * 'nameIndex' property of 'obj' as 'val', pushes 'obj' onto the stack.
+     *   Category: Literals
+     *   Type: Object
+     *   Operands: uint32_t nameIndex
+     *   Stack: obj, val => obj
+     */ \
+    macro(JSOP_INITHIDDENPROP, 147,"inithiddenprop", NULL, 5,  2,  1,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING) \
     /* Unused. */ \
-    macro(JSOP_UNUSED146,     146,"unused146", NULL,      1,  0,  0,  JOF_BYTE) \
-    macro(JSOP_UNUSED147,     147,"unused147", NULL,      1,  0,  0,  JOF_BYTE) \
     macro(JSOP_UNUSED148,     148,"unused148", NULL,      1,  0,  0,  JOF_BYTE) \
     \
     /*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/PosixNSPR.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/PosixNSPR.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/PosixNSPR.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/PosixNSPR.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -319,6 +319,12 @@
     return milli;
 }
 
+uint32_t
+PR_MicrosecondsToInterval(uint32_t micro)
+{
+    return (micro + 999) / 1000;
+}
+
 static const uint64_t TicksPerSecond = 1000;
 static const uint64_t NanoSecondsInSeconds = 1000000000;
 static const uint64_t MicroSecondsInSeconds = 1000000;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/PosixNSPR.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/PosixNSPR.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/PosixNSPR.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/PosixNSPR.h	2015-02-28 15:03:08.000000000 +0000
@@ -129,6 +129,9 @@
 PR_MillisecondsToInterval(uint32_t milli);
 
 uint32_t
+PR_MicrosecondsToInterval(uint32_t micro);
+
+uint32_t
 PR_TicksPerSecond();
 
 PRStatus
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ProxyObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ProxyObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ProxyObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ProxyObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -14,16 +14,14 @@
 
 /* static */ ProxyObject *
 ProxyObject::New(JSContext *cx, const BaseProxyHandler *handler, HandleValue priv, TaggedProto proto_,
-                 JSObject *parent_, const ProxyOptions &options)
+                 const ProxyOptions &options)
 {
     Rooted<TaggedProto> proto(cx, proto_);
-    RootedObject parent(cx, parent_);
 
     const Class *clasp = options.clasp();
 
     MOZ_ASSERT(isValidProxyClass(clasp));
     MOZ_ASSERT_IF(proto.isObject(), cx->compartment() == proto.toObject()->compartment());
-    MOZ_ASSERT_IF(parent, cx->compartment() == parent->compartment());
 
     /*
      * Eagerly mark properties unknown for proxies, so we don't try to track
@@ -50,7 +48,7 @@
 
     // Note: this will initialize the object's |data| to strange values, but we
     // will immediately overwrite those below.
-    RootedObject obj(cx, NewObjectWithGivenTaggedProto(cx, clasp, proto, parent, allocKind,
+    RootedObject obj(cx, NewObjectWithGivenTaggedProto(cx, clasp, proto, NullPtr(), allocKind,
                                                        newKind));
     if (!obj) {
         js_free(values);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ProxyObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ProxyObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ProxyObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ProxyObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -28,8 +28,7 @@
 
   public:
     static ProxyObject *New(JSContext *cx, const BaseProxyHandler *handler, HandleValue priv,
-                            TaggedProto proto_, JSObject *parent_,
-                            const ProxyOptions &options);
+                            TaggedProto proto_, const ProxyOptions &options);
 
     const Value &private_() {
         return GetProxyPrivate(this);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/RegExpObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/RegExpObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/RegExpObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/RegExpObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -880,7 +880,7 @@
 {
     if (!set_.init(0)) {
         if (cx)
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
         return false;
     }
 
@@ -946,7 +946,7 @@
         return false;
 
     if (!set_.add(p, shared)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -1056,7 +1056,7 @@
         char charBuf[2];
         charBuf[0] = char(lastParsed);
         charBuf[1] = '\0';
-        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, js_GetErrorMessage, nullptr,
+        JS_ReportErrorFlagsAndNumber(cx, JSREPORT_ERROR, GetErrorMessage, nullptr,
                                      JSMSG_BAD_REGEXP_FLAG, charBuf);
         return false;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/RegExpObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/RegExpObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/RegExpObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/RegExpObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -376,6 +376,14 @@
     createNoStatics(ExclusiveContext *cx, HandleAtom atom, RegExpFlag flags,
                     frontend::TokenStream *ts, LifoAlloc &alloc);
 
+    /*
+     * Compute the initial shape to associate with fresh RegExp objects,
+     * encoding their initial properties. Return the shape after
+     * changing |obj|'s last property to it.
+     */
+    static Shape *
+    assignInitialShape(ExclusiveContext *cx, Handle<RegExpObject*> obj);
+
     /* Accessors. */
 
     static unsigned lastIndexSlot() { return LAST_INDEX_SLOT; }
@@ -446,19 +454,6 @@
   private:
     friend class RegExpObjectBuilder;
 
-    /* For access to assignInitialShape. */
-    friend bool
-    EmptyShape::ensureInitialCustomShape<RegExpObject>(ExclusiveContext *cx,
-                                                       Handle<RegExpObject*> obj);
-
-    /*
-     * Compute the initial shape to associate with fresh RegExp objects,
-     * encoding their initial properties. Return the shape after
-     * changing |obj|'s last property to it.
-     */
-    static Shape *
-    assignInitialShape(ExclusiveContext *cx, Handle<RegExpObject*> obj);
-
     bool init(ExclusiveContext *cx, HandleAtom source, RegExpFlag flags);
 
     /*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/RegExpStatics.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/RegExpStatics.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/RegExpStatics.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/RegExpStatics.h	2015-02-28 15:03:08.000000000 +0000
@@ -62,7 +62,7 @@
         buffer->bufferLink = bufferLink;
         bufferLink = buffer;
         if (!buffer->matches.allocOrExpandArray(matches.length())) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         return true;
@@ -486,7 +486,7 @@
                                                matchesInput, input);
 
     if (!matches.initArrayFrom(newPairs)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Runtime.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Runtime.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Runtime.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Runtime.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -88,13 +88,13 @@
 PerThreadData::~PerThreadData()
 {
     if (dtoaState)
-        js_DestroyDtoaState(dtoaState);
+        DestroyDtoaState(dtoaState);
 }
 
 bool
 PerThreadData::init()
 {
-    dtoaState = js_NewDtoaState();
+    dtoaState = NewDtoaState();
     if (!dtoaState)
         return false;
 
@@ -120,6 +120,8 @@
     jitStackLimit_(0xbad),
     activation_(nullptr),
     profilingActivation_(nullptr),
+    profilerSampleBufferGen_(0),
+    profilerSampleBufferLapCount_(1),
     asmJSActivationStack_(nullptr),
     parentRuntime(parentRuntime),
     interrupt_(false),
@@ -134,7 +136,6 @@
     localeCallbacks(nullptr),
     defaultLocale(nullptr),
     defaultVersion_(JSVERSION_DEFAULT),
-    futexAPI_(nullptr),
     ownerThread_(nullptr),
     ownerThreadNative_(0),
     tempLifoAlloc(TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
@@ -211,7 +212,8 @@
 #endif
     largeAllocationFailureCallback(nullptr),
     oomCallback(nullptr),
-    debuggerMallocSizeOf(ReturnZeroSize)
+    debuggerMallocSizeOf(ReturnZeroSize),
+    lastAnimationTime(0)
 {
     setGCStoreBufferPtr(&gc.storeBuffer);
 
@@ -326,6 +328,9 @@
     if (!spsProfiler.init())
         return false;
 
+    if (!fx.initInstance())
+        return false;
+
     return true;
 }
 
@@ -333,8 +338,7 @@
 {
     MOZ_ASSERT(!isHeapBusy());
 
-    delete futexAPI_;
-    futexAPI_ = nullptr;
+    fx.destroyInstance();
 
     if (gcInitialized) {
         /* Free source hook early, as its destructor may want to delete roots. */
@@ -371,6 +375,9 @@
         /* Allow the GC to release scripts that were being profiled. */
         profilingScripts = false;
 
+        /* Set the profiler sampler buffer generation to invalid. */
+        profilerSampleBufferGen_ = UINT32_MAX;
+
         JS::PrepareForFullGC(this);
         gc.gc(GC_NORMAL, JS::gcreason::DESTROY_RUNTIME);
     }
@@ -571,7 +578,7 @@
         chars = stableChars.twoByteRange().start().get();
     else
         chars = MOZ_UTF16("(stack not available)");
-    JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_WARNING, js_GetErrorMessage, nullptr,
+    JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_WARNING, GetErrorMessage, nullptr,
                                    JSMSG_TERMINATED, chars);
 
     return false;
@@ -602,8 +609,18 @@
     interrupt_ = true;
     jitStackLimit_ = UINTPTR_MAX;
 
-    if (mode == JSRuntime::RequestInterruptUrgent)
+    if (mode == JSRuntime::RequestInterruptUrgent) {
+        // If this interrupt is urgent (slow script dialog and garbage
+        // collection among others), take additional steps to
+        // interrupt corner cases where the above fields are not
+        // regularly polled.  Wake both ilooping JIT code and
+        // futexWait.
+        fx.lock();
+        if (fx.isWaiting())
+            fx.wake(FutexRuntime::WakeForJSInterrupt);
+        fx.unlock();
         InterruptRunningJitCode(this);
+    }
 }
 
 bool
@@ -626,7 +643,7 @@
 
     MathCache *newMathCache = js_new<MathCache>();
     if (!newMathCache) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
@@ -740,7 +757,7 @@
     if (p)
         return p;
     if (cx)
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
     return nullptr;
 }
 
@@ -823,3 +840,11 @@
 }
 
 #endif // DEBUG
+
+JS_FRIEND_API(void)
+JS::UpdateJSRuntimeProfilerSampleBufferGen(JSRuntime *runtime, uint32_t generation,
+                                           uint32_t lapCount)
+{
+    runtime->setProfilerSampleBufferGen(generation);
+    runtime->updateProfilerSampleBufferLapCount(lapCount);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Runtime.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Runtime.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Runtime.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Runtime.h	2015-02-28 15:03:08.000000000 +0000
@@ -25,6 +25,7 @@
 #ifdef XP_MACOSX
 # include "asmjs/AsmJSSignalHandlers.h"
 #endif
+#include "builtin/AtomicsObject.h"
 #include "ds/FixedSizeHash.h"
 #include "frontend/ParseMaps.h"
 #include "gc/GCRuntime.h"
@@ -63,16 +64,16 @@
 
 struct DtoaState;
 
-extern MOZ_COLD void
-js_ReportOutOfMemory(js::ExclusiveContext *cx);
+namespace js {
 
 extern MOZ_COLD void
-js_ReportAllocationOverflow(js::ExclusiveContext *maybecx);
+ReportOutOfMemory(ExclusiveContext *cx);
 
 extern MOZ_COLD void
-js_ReportOverRecursed(js::ExclusiveContext *cx);
+ReportAllocationOverflow(ExclusiveContext *maybecx);
 
-namespace js {
+extern MOZ_COLD void
+ReportOverRecursed(ExclusiveContext *cx);
 
 class Activation;
 class ActivationIterator;
@@ -507,7 +508,7 @@
 
     /*
      * When this flag is non-zero, any attempt to GC will be skipped. It is used
-     * to suppress GC when reporting an OOM (see js_ReportOutOfMemory) and in
+     * to suppress GC when reporting an OOM (see ReportOutOfMemory) and in
      * debugging facilities that cannot tolerate a GC and would rather OOM
      * immediately, such as utilities exposed to GDB. Setting this flag is
      * extremely dangerous and should only be used when in an OOM situation or
@@ -640,6 +641,21 @@
      */
     js::Activation * volatile profilingActivation_;
 
+    /*
+     * The profiler sampler generation after the latest sample.
+     *
+     * The lapCount indicates the number of largest number of 'laps'
+     * (wrapping from high to low) that occurred when writing entries
+     * into the sample buffer.  All JitcodeGlobalMap entries referenced
+     * from a given sample are assigned the generation of the sample buffer
+     * at the START of the run.  If multiple laps occur, then some entries
+     * (towards the end) will be written out with the "wrong" generation.
+     * The lapCount indicates the required fudge factor to use to compare
+     * entry generations with the sample buffer generation.
+     */
+    mozilla::Atomic<uint32_t, mozilla::ReleaseAcquire> profilerSampleBufferGen_;
+    mozilla::Atomic<uint32_t, mozilla::ReleaseAcquire> profilerSampleBufferLapCount_;
+
     /* See AsmJSActivation comment. */
     js::AsmJSActivation * volatile asmJSActivationStack_;
 
@@ -661,6 +677,31 @@
         return offsetof(JSRuntime, profilingActivation_);
     }
 
+    uint32_t profilerSampleBufferGen() {
+        return profilerSampleBufferGen_;
+    }
+    void setProfilerSampleBufferGen(uint32_t gen) {
+        profilerSampleBufferGen_ = gen;
+    }
+
+    uint32_t profilerSampleBufferLapCount() {
+        MOZ_ASSERT(profilerSampleBufferLapCount_ > 0);
+        return profilerSampleBufferLapCount_;
+    }
+    void updateProfilerSampleBufferLapCount(uint32_t lapCount) {
+        MOZ_ASSERT(profilerSampleBufferLapCount_ > 0);
+
+        // Use compareExchange to make sure we have monotonic increase.
+        for (;;) {
+            uint32_t curLapCount = profilerSampleBufferLapCount_;
+            if (curLapCount >= lapCount)
+                break;
+
+            if (profilerSampleBufferLapCount_.compareExchange(curLapCount, lapCount))
+                break;
+        }
+    }
+
     js::AsmJSActivation *asmJSActivationStack() const {
         return asmJSActivationStack_;
     }
@@ -787,8 +828,8 @@
     /* Default JSVersion. */
     JSVersion defaultVersion_;
 
-    /* Futex API, if installed */
-    JS::PerRuntimeFutexAPI *futexAPI_;
+    /* Futex state, used by futexWait and futexWake on the Atomics object */
+    js::FutexRuntime fx;
 
   private:
     /* See comment for JS_AbortIfWrongThread in jsapi.h. */
@@ -1213,9 +1254,11 @@
     JSAtomState *commonNames;
 
     // All permanent atoms in the runtime, other than those in staticStrings.
-    js::AtomSet *permanentAtoms;
+    // Unlike |atoms_|, access to this does not require
+    // AutoLockForExclusiveAccess because it is frozen and thus read-only.
+    js::FrozenAtomSet *permanentAtoms;
 
-    bool transformToPermanentAtoms();
+    bool transformToPermanentAtoms(JSContext *cx);
 
     // Cached well-known symbols (ES6 rev 24 6.1.5.1). Like permanent atoms,
     // these are shared with the parentRuntime, if any.
@@ -1271,7 +1314,7 @@
     void updateMallocCounter(size_t nbytes);
     void updateMallocCounter(JS::Zone *zone, size_t nbytes);
 
-    void reportAllocationOverflow() { js_ReportAllocationOverflow(nullptr); }
+    void reportAllocationOverflow() { js::ReportAllocationOverflow(nullptr); }
 
     /*
      * The function must be called outside the GC lock.
@@ -1374,6 +1417,9 @@
      * function to assess the size of malloc'd blocks of memory.
      */
     mozilla::MallocSizeOf debuggerMallocSizeOf;
+
+    /* Last time at which an animation was played for this runtime. */
+    int64_t lastAnimationTime;
 };
 
 namespace js {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Runtime-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Runtime-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Runtime-inl.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Runtime-inl.h	2015-02-28 15:03:08.000000000 +0000
@@ -67,8 +67,14 @@
         return obj;
     }
 
-    // Trigger an identical allocation to the one that notified us of OOM
-    // so that we trigger the right kind of GC automatically.
+    // Trigger an identical allocation to the one that notified us of OOM so
+    // that we trigger the right kind of GC automatically; note that even
+    // though we are passing CanGC to AllocateObjectForCacheHit it will never
+    // allow GC during the allocation itself. The reason is that this would
+    // clobber our cache and make us unable to initialize from it. Instead we
+    // do an independent non-allocation GC, then return nullptr so that we'll
+    // take the slow allocation path. The callee is responsible for ensuring
+    // that the index it uses to fill the cache is still correct after this GC.
     mozilla::DebugOnly<JSObject *> obj2 =
         js::gc::AllocateObjectForCacheHit<CanGC>(cx, entry->kind, heap, group->clasp());
     MOZ_ASSERT(!obj2);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SavedStacks.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SavedStacks.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SavedStacks.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SavedStacks.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -7,6 +7,7 @@
 #include "vm/SavedStacks.h"
 
 #include "mozilla/Attributes.h"
+#include "mozilla/DebugOnly.h"
 
 #include <math.h>
 
@@ -30,6 +31,7 @@
 #include "vm/NativeObject-inl.h"
 
 using mozilla::AddToHash;
+using mozilla::DebugOnly;
 using mozilla::HashString;
 
 namespace js {
@@ -53,41 +55,38 @@
     JSAtom       *functionDisplayName;
     SavedFrame   *parent;
     JSPrincipals *principals;
+
+    void trace(JSTracer *trc) {
+        gc::MarkStringUnbarriered(trc, &source, "SavedFrame::Lookup::source");
+        if (functionDisplayName) {
+            gc::MarkStringUnbarriered(trc, &functionDisplayName,
+                                      "SavedFrame::Lookup::functionDisplayName");
+        }
+        if (parent) {
+            gc::MarkObjectUnbarriered(trc, &parent,
+                                      "SavedFrame::Lookup::parent");
+        }
+    }
 };
 
-class SavedFrame::AutoLookupRooter : public JS::CustomAutoRooter
-{
+class MOZ_STACK_CLASS SavedFrame::AutoLookupVector : public JS::CustomAutoRooter {
   public:
-    AutoLookupRooter(JSContext *cx, JSAtom *source, uint32_t line, uint32_t column,
-                     JSAtom *functionDisplayName, SavedFrame *parent, JSPrincipals *principals)
+    explicit AutoLookupVector(JSContext *cx)
       : JS::CustomAutoRooter(cx),
-        value(source, line, column, functionDisplayName, parent, principals) {}
+        lookups(cx)
+    { }
 
-    operator const SavedFrame::Lookup&() const { return value; }
-    SavedFrame::Lookup &get() { return value; }
+    typedef Vector<Lookup, 20> LookupVector;
+    inline LookupVector *operator->() { return &lookups; }
+    inline HandleLookup operator[](size_t i) { return HandleLookup(lookups[i]); }
 
   private:
+    LookupVector lookups;
+
     virtual void trace(JSTracer *trc) {
-        gc::MarkStringUnbarriered(trc, &value.source, "SavedFrame::Lookup::source");
-        if (value.functionDisplayName) {
-            gc::MarkStringUnbarriered(trc, &value.functionDisplayName,
-                                      "SavedFrame::Lookup::functionDisplayName");
-        }
-        if (value.parent)
-            gc::MarkObjectUnbarriered(trc, &value.parent, "SavedFrame::Lookup::parent");
+        for (size_t i = 0; i < lookups.length(); i++)
+            lookups[i].trace(trc);
     }
-
-    SavedFrame::Lookup value;
-};
-
-class SavedFrame::HandleLookup
-{
-  public:
-    MOZ_IMPLICIT HandleLookup(SavedFrame::AutoLookupRooter &lookup) : ref(lookup) { }
-    SavedFrame::Lookup *operator->() { return &ref.get(); }
-    operator const SavedFrame::Lookup&() const { return ref; }
-  private:
-    SavedFrame::AutoLookupRooter &ref;
 };
 
 /* static */ HashNumber
@@ -304,7 +303,7 @@
 /* static */ bool
 SavedFrame::construct(JSContext *cx, unsigned argc, Value *vp)
 {
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NO_CONSTRUCTOR,
                          "SavedFrame");
     return false;
 }
@@ -344,13 +343,13 @@
     const Value &thisValue = args.thisv();
 
     if (!thisValue.isObject()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_NONNULL_OBJECT, InformalValueTypeName(thisValue));
         return false;
     }
 
     JSObject *thisObject = CheckedUnwrap(&thisValue.toObject());
     if (!thisObject || !thisObject->is<SavedFrame>()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              SavedFrame::class_.name, fnName,
                              thisObject ? thisObject->getClass()->name : "object");
         return false;
@@ -360,7 +359,7 @@
     // instances, however doesn't actually represent a captured stack frame. It
     // is the only object that is<SavedFrame>() but doesn't have a source.
     if (thisObject->as<SavedFrame>().getReservedSlot(JSSLOT_SOURCE).isNull()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO,
                              SavedFrame::class_.name, fnName, "prototype object");
         return false;
     }
@@ -380,83 +379,113 @@
 //   - unsigned   argc
 //   - Value      *vp
 //   - const char *fnName
-//   - Value      defaultVal
 // These parameters will be defined after calling this macro:
 //   - CallArgs args
 //   - Rooted<SavedFrame *> frame (will be non-null)
-#define THIS_SAVEDFRAME(cx, argc, vp, fnName, defaultVal, args, frame) \
+#define THIS_SAVEDFRAME(cx, argc, vp, fnName, args, frame)             \
     CallArgs args = CallArgsFromVp(argc, vp);                          \
     RootedSavedFrame frame(cx);                                        \
     if (!checkThis(cx, args, fnName, &frame))                          \
-        return false;                                                  \
-    if (!frame) {                                                      \
-        args.rval().set(defaultVal);                                   \
-        return true;                                                   \
-    }
+        return false;
 
-/* static */ bool
-SavedFrame::sourceProperty(JSContext *cx, unsigned argc, Value *vp)
+} /* namespace js */
+
+namespace JS {
+
+static inline js::SavedFrame *
+UnwrapSavedFrame(JSContext *cx, HandleObject obj)
 {
-    THIS_SAVEDFRAME(cx, argc, vp, "(get source)", NullValue(), args, frame);
-    args.rval().setString(frame->getSource());
-    return true;
+    if (!obj)
+        return nullptr;
+    RootedObject savedFrameObj(cx, CheckedUnwrap(obj));
+    MOZ_ASSERT(savedFrameObj);
+    MOZ_ASSERT(js::SavedFrame::isSavedFrameAndNotProto(*savedFrameObj));
+    js::RootedSavedFrame frame(cx, &savedFrameObj->as<js::SavedFrame>());
+    return GetFirstSubsumedFrame(cx, frame);
 }
 
-/* static */ bool
-SavedFrame::lineProperty(JSContext *cx, unsigned argc, Value *vp)
+JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameSource(JSContext *cx, HandleObject savedFrame, MutableHandleString sourcep)
 {
-    THIS_SAVEDFRAME(cx, argc, vp, "(get line)", NullValue(), args, frame);
-    uint32_t line = frame->getLine();
-    args.rval().setNumber(line);
-    return true;
+    js::RootedSavedFrame frame(cx, UnwrapSavedFrame(cx, savedFrame));
+    if (!frame) {
+        sourcep.set(cx->runtime()->emptyString);
+        return SavedFrameResult::AccessDenied;
+    }
+    sourcep.set(frame->getSource());
+    return SavedFrameResult::Ok;
 }
 
-/* static */ bool
-SavedFrame::columnProperty(JSContext *cx, unsigned argc, Value *vp)
+JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameLine(JSContext *cx, HandleObject savedFrame, uint32_t *linep)
 {
-    THIS_SAVEDFRAME(cx, argc, vp, "(get column)", NullValue(), args, frame);
-    uint32_t column = frame->getColumn();
-    args.rval().setNumber(column);
-    return true;
+    MOZ_ASSERT(linep);
+    js::RootedSavedFrame frame(cx, UnwrapSavedFrame(cx, savedFrame));
+    if (!frame) {
+        *linep = 0;
+        return SavedFrameResult::AccessDenied;
+    }
+    *linep = frame->getLine();
+    return SavedFrameResult::Ok;
 }
 
-/* static */ bool
-SavedFrame::functionDisplayNameProperty(JSContext *cx, unsigned argc, Value *vp)
+JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameColumn(JSContext *cx, HandleObject savedFrame, uint32_t *columnp)
 {
-    THIS_SAVEDFRAME(cx, argc, vp, "(get functionDisplayName)", NullValue(), args, frame);
-    RootedAtom name(cx, frame->getFunctionDisplayName());
-    if (name)
-        args.rval().setString(name);
-    else
-        args.rval().setNull();
-    return true;
+    MOZ_ASSERT(columnp);
+    js::RootedSavedFrame frame(cx, UnwrapSavedFrame(cx, savedFrame));
+    if (!frame) {
+        *columnp = 0;
+        return SavedFrameResult::AccessDenied;
+    }
+    *columnp = frame->getColumn();
+    return SavedFrameResult::Ok;
 }
 
-/* static */ bool
-SavedFrame::parentProperty(JSContext *cx, unsigned argc, Value *vp)
+JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameFunctionDisplayName(JSContext *cx, HandleObject savedFrame, MutableHandleString namep)
 {
-    THIS_SAVEDFRAME(cx, argc, vp, "(get parent)", NullValue(), args, frame);
-    RootedSavedFrame parent(cx, frame->getParent());
-    args.rval().setObjectOrNull(GetFirstSubsumedFrame(cx, parent));
-    return true;
+    js::RootedSavedFrame frame(cx, UnwrapSavedFrame(cx, savedFrame));
+    if (!frame) {
+        namep.set(nullptr);
+        return SavedFrameResult::AccessDenied;
+    }
+    namep.set(frame->getFunctionDisplayName());
+    return SavedFrameResult::Ok;
 }
 
-/* static */ bool
-SavedFrame::toStringMethod(JSContext *cx, unsigned argc, Value *vp)
+JS_PUBLIC_API(SavedFrameResult)
+GetSavedFrameParent(JSContext *cx, HandleObject savedFrame, MutableHandleObject parentp)
 {
-    THIS_SAVEDFRAME(cx, argc, vp, "toString", StringValue(cx->runtime()->emptyString), args, frame);
-    StringBuffer sb(cx);
+    js::RootedSavedFrame frame(cx, UnwrapSavedFrame(cx, savedFrame));
+    if (!frame) {
+        parentp.set(nullptr);
+        return SavedFrameResult::AccessDenied;
+    }
+    js::RootedSavedFrame parent(cx, frame->getParent());
+    parentp.set(js::GetFirstSubsumedFrame(cx, parent));
+    return SavedFrameResult::Ok;
+}
+
+JS_PUBLIC_API(bool)
+StringifySavedFrameStack(JSContext *cx, HandleObject stack, MutableHandleString stringp)
+{
+    js::RootedSavedFrame frame(cx, UnwrapSavedFrame(cx, stack));
+    if (!frame) {
+        stringp.set(cx->runtime()->emptyString);
+        return true;
+    }
+
+    js::StringBuffer sb(cx);
     DebugOnly<JSSubsumesOp> subsumes = cx->runtime()->securityCallbacks->subsumes;
     DebugOnly<JSPrincipals *> principals = cx->compartment()->principals;
 
-    RootedSavedFrame parent(cx);
+    js::RootedSavedFrame parent(cx);
     do {
         MOZ_ASSERT_IF(subsumes, (*subsumes)(principals, frame->getPrincipals()));
-        if (frame->isSelfHosted())
-            goto nextIteration;
 
-        {
-            RootedAtom name(cx, frame->getFunctionDisplayName());
+        if (!frame->isSelfHosted()) {
+            js::RootedAtom name(cx, frame->getFunctionDisplayName());
             if ((name && !sb.append(name))
                 || !sb.append('@')
                 || !sb.append(frame->getSource())
@@ -470,15 +499,88 @@
             }
         }
 
-    nextIteration:
         parent = frame->getParent();
-        frame = GetFirstSubsumedFrame(cx, parent);
+        frame = js::GetFirstSubsumedFrame(cx, parent);
     } while (frame);
 
     JSString *str = sb.finishString();
     if (!str)
         return false;
-    args.rval().setString(str);
+    stringp.set(str);
+    return true;
+}
+
+} /* namespace JS */
+
+namespace js {
+
+/* static */ bool
+SavedFrame::sourceProperty(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_SAVEDFRAME(cx, argc, vp, "(get source)", args, frame);
+    RootedString source(cx);
+    if (JS::GetSavedFrameSource(cx, frame, &source) == JS::SavedFrameResult::Ok)
+        args.rval().setString(source);
+    else
+        args.rval().setNull();
+    return true;
+}
+
+/* static */ bool
+SavedFrame::lineProperty(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_SAVEDFRAME(cx, argc, vp, "(get line)", args, frame);
+    uint32_t line;
+    if (JS::GetSavedFrameLine(cx, frame, &line) == JS::SavedFrameResult::Ok)
+        args.rval().setNumber(line);
+    else
+        args.rval().setNull();
+    return true;
+}
+
+/* static */ bool
+SavedFrame::columnProperty(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_SAVEDFRAME(cx, argc, vp, "(get column)", args, frame);
+    uint32_t column;
+    if (JS::GetSavedFrameColumn(cx, frame, &column) == JS::SavedFrameResult::Ok)
+        args.rval().setNumber(column);
+    else
+        args.rval().setNull();
+    return true;
+}
+
+/* static */ bool
+SavedFrame::functionDisplayNameProperty(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_SAVEDFRAME(cx, argc, vp, "(get functionDisplayName)", args, frame);
+    RootedString name(cx);
+    JS::SavedFrameResult result = JS::GetSavedFrameFunctionDisplayName(cx, frame, &name);
+    if (result == JS::SavedFrameResult::Ok && name)
+        args.rval().setString(name);
+    else
+        args.rval().setNull();
+    return true;
+}
+
+/* static */ bool
+SavedFrame::parentProperty(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_SAVEDFRAME(cx, argc, vp, "(get parent)", args, frame);
+    RootedObject parent(cx);
+    (void) JS::GetSavedFrameParent(cx, frame, &parent);
+    args.rval().setObjectOrNull(parent);
+    return true;
+}
+
+/* static */ bool
+SavedFrame::toStringMethod(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_SAVEDFRAME(cx, argc, vp, "toString", args, frame);
+    RootedString string(cx);
+    if (!JS::StringifySavedFrameStack(cx, frame, &string))
+        return false;
+    args.rval().setString(string);
     return true;
 }
 
@@ -580,12 +682,14 @@
     // SavedFrame objects at that time.
     //
     // To avoid making many copies of FrameIter (whose copy constructor is
-    // relatively slow), we save the subset of FrameIter's data that is relevant
-    // to our needs in a FrameState object, and maintain a vector of FrameState
-    // objects instead of a vector of FrameIter objects.
+    // relatively slow), we use a vector of `SavedFrame::Lookup` objects, which
+    // only contain the FrameIter data we need. The `SavedFrame::Lookup`
+    // objects are partially initialized with everything except their parent
+    // pointers on the first pass, and then we fill in the parent pointers as we
+    // return in the second pass.
 
-    // Accumulate the vector of FrameState objects in |stackState|.
-    AutoFrameStateVector stackState(cx);
+    // Accumulate the vector of Lookup objects in |stackChain|.
+    SavedFrame::AutoLookupVector stackChain(cx);
     while (!iter.done()) {
         AutoLocationValueRooter location(cx);
 
@@ -595,12 +699,18 @@
                 return false;
         }
 
-        {
-            FrameState frameState(iter);
-            frameState.location = location.get();
-            if (!stackState->append(frameState))
-                return false;
-        }
+        // Use growByUninitialized and placement-new instead of just append.
+        // We'd ideally like to use an emplace method once Vector supports it.
+        if (!stackChain->growByUninitialized(1))
+            return false;
+        new (&stackChain->back()) SavedFrame::Lookup(
+          location->source,
+          location->line,
+          location->column,
+          iter.isNonEvalFunctionFrame() ? iter.functionDisplayAtom() : nullptr,
+          nullptr,
+          iter.compartment()->principals
+        );
 
         ++iter;
 
@@ -617,18 +727,13 @@
         }
     }
 
-    // Iterate through |stackState| in reverse order and get or create the
+    // Iterate through |stackChain| in reverse order and get or create the
     // actual SavedFrame instances.
     RootedSavedFrame parentFrame(cx, nullptr);
-    for (size_t i = stackState->length(); i != 0; i--) {
-        SavedFrame::AutoLookupRooter lookup(cx,
-                                            stackState[i-1].location.source,
-                                            stackState[i-1].location.line,
-                                            stackState[i-1].location.column,
-                                            stackState[i-1].name,
-                                            parentFrame,
-                                            stackState[i-1].principals);
-        parentFrame = getOrCreateSavedFrame(cx, lookup);
+    for (size_t i = stackChain->length(); i != 0; i--) {
+        SavedFrame::HandleLookup lookup = stackChain[i-1];
+        lookup->parent = parentFrame;
+        parentFrame.set(getOrCreateSavedFrame(cx, lookup));
         if (!parentFrame)
             return false;
     }
@@ -640,7 +745,8 @@
 SavedFrame *
 SavedStacks::getOrCreateSavedFrame(JSContext *cx, SavedFrame::HandleLookup lookup)
 {
-    DependentAddPtr<SavedFrame::Set> p(cx, frames, lookup);
+    const SavedFrame::Lookup &lookupInstance = lookup.get();
+    DependentAddPtr<SavedFrame::Set> p(cx, frames, lookupInstance);
     if (p)
         return *p;
 
@@ -648,7 +754,7 @@
     if (!frame)
         return nullptr;
 
-    if (!p.add(cx, frames, lookup, frame))
+    if (!p.add(cx, frames, lookupInstance, frame))
         return nullptr;
 
     return frame;
@@ -778,31 +884,6 @@
     allocationSamplingProbability = allocationTrackingDbg->allocationSamplingProbability;
 }
 
-SavedStacks::FrameState::FrameState(const FrameIter &iter)
-    : principals(iter.compartment()->principals),
-      name(iter.isNonEvalFunctionFrame() ? iter.functionDisplayAtom() : nullptr),
-      location()
-{
-}
-
-SavedStacks::FrameState::FrameState(const FrameState &fs)
-    : principals(fs.principals),
-      name(fs.name),
-      location(fs.location)
-{
-}
-
-SavedStacks::FrameState::~FrameState()
-{
-}
-
-void
-SavedStacks::FrameState::trace(JSTracer *trc) {
-    if (name)
-        gc::MarkStringUnbarriered(trc, &name, "SavedStacks::FrameState::name");
-    location.trace(trc);
-}
-
 bool
 SavedStacksMetadataCallback(JSContext *cx, JSObject **pmetadata)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SavedStacks.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SavedStacks.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SavedStacks.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SavedStacks.h	2015-02-28 15:03:08.000000000 +0000
@@ -48,6 +48,11 @@
 
     bool         isSelfHosted();
 
+    static bool isSavedFrameAndNotProto(JSObject &obj) {
+        return obj.is<SavedFrame>() &&
+               !obj.as<SavedFrame>().getReservedSlot(JSSLOT_SOURCE).isNull();
+    }
+
     struct Lookup;
     struct HashPolicy;
 
@@ -55,8 +60,21 @@
                     HashPolicy,
                     SystemAllocPolicy> Set;
 
-    class AutoLookupRooter;
-    class HandleLookup;
+    typedef RootedGeneric<Lookup*> AutoLookupRooter;
+
+    class AutoLookupVector;
+
+    class MOZ_STACK_CLASS HandleLookup {
+        friend class AutoLookupVector;
+
+        Lookup &lookup;
+
+        explicit HandleLookup(Lookup &lookup) : lookup(lookup) { }
+
+      public:
+        inline Lookup &get() { return lookup; }
+        inline Lookup *operator->() { return &lookup; }
+    };
 
   private:
     static bool finishSavedFrameInit(JSContext *cx, HandleObject ctor, HandleObject proto);
@@ -221,44 +239,6 @@
 
     void sweepPCLocationMap();
     bool getLocation(JSContext *cx, const FrameIter &iter, MutableHandleLocationValue locationp);
-
-    struct FrameState
-    {
-        FrameState() : principals(nullptr), name(nullptr), location() { }
-        explicit FrameState(const FrameIter &iter);
-        FrameState(const FrameState &fs);
-
-        ~FrameState();
-
-        void trace(JSTracer *trc);
-
-        // Note: we don't have to hold/drop principals, because we're
-        // only alive while the stack is being walked and during this
-        // time the principals are kept alive by the stack itself.
-        JSPrincipals  *principals;
-        JSAtom        *name;
-        LocationValue location;
-    };
-
-    class MOZ_STACK_CLASS AutoFrameStateVector : public JS::CustomAutoRooter {
-      public:
-        explicit AutoFrameStateVector(JSContext *cx)
-          : JS::CustomAutoRooter(cx),
-            frames(cx)
-        { }
-
-        typedef Vector<FrameState, 20> FrameStateVector;
-        inline FrameStateVector *operator->() { return &frames; }
-        inline FrameState &operator[](size_t i) { return frames[i]; }
-
-      private:
-        FrameStateVector frames;
-
-        virtual void trace(JSTracer *trc) {
-            for (size_t i = 0; i < frames.length(); i++)
-                frames[i].trace(trc);
-        }
-    };
 };
 
 bool SavedStacksMetadataCallback(JSContext *cx, JSObject **pmetadata);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ScopeObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ScopeObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ScopeObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ScopeObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -1469,7 +1469,7 @@
             return false;
 
         if (!argsObj) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_LIVE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_LIVE,
                                  "Debugger scope");
             return false;
         }
@@ -1509,7 +1509,7 @@
           case ACCESS_GENERIC:
             return JS_GetOwnPropertyDescriptorById(cx, scope, id, desc);
           case ACCESS_LOST:
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_OPTIMIZED_OUT);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_OPTIMIZED_OUT);
             return false;
           default:
             MOZ_CRASH("bad AccessResult");
@@ -1523,7 +1523,7 @@
             return false;
 
         if (!argsObj) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_LIVE,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_NOT_LIVE,
                                  "Debugger scope");
             return false;
         }
@@ -1553,7 +1553,7 @@
           case ACCESS_GENERIC:
             return GetProperty(cx, scope, scope, id, vp);
           case ACCESS_LOST:
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEBUG_OPTIMIZED_OUT);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEBUG_OPTIMIZED_OUT);
             return false;
           default:
             MOZ_CRASH("bad AccessResult");
@@ -1720,8 +1720,8 @@
     bool delete_(JSContext *cx, HandleObject proxy, HandleId id, bool *bp) const MOZ_OVERRIDE
     {
         RootedValue idval(cx, IdToValue(id));
-        return js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_CANT_DELETE,
-                                        JSDVG_IGNORE_STACK, idval, NullPtr(), nullptr, nullptr);
+        return ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_CANT_DELETE,
+                                     JSDVG_IGNORE_STACK, idval, NullPtr(), nullptr, nullptr);
     }
 };
 
@@ -1736,7 +1736,7 @@
     MOZ_ASSERT(scope.compartment() == cx->compartment());
     RootedValue priv(cx, ObjectValue(scope));
     JSObject *obj = NewProxyObject(cx, &DebugScopeProxy::singleton, priv,
-                                   nullptr /* proto */, &scope.global());
+                                   nullptr /* proto */);
     if (!obj)
         return nullptr;
 
@@ -1811,7 +1811,7 @@
 }
 
 bool
-js_IsDebugScopeSlow(ProxyObject *proxy)
+js::IsDebugScopeSlow(ProxyObject *proxy)
 {
     MOZ_ASSERT(proxy->hasClass(&ProxyObject::class_));
     return proxy->handler() == &DebugScopeProxy::singleton;
@@ -1976,7 +1976,7 @@
     if (c->debugScopes)
         js_delete<DebugScopes>(c->debugScopes);
     c->debugScopes = nullptr;
-    js_ReportOutOfMemory(cx);
+    ReportOutOfMemory(cx);
     return nullptr;
 }
 
@@ -2010,7 +2010,7 @@
 
     MOZ_ASSERT(!scopes->proxiedScopes.has(&scope));
     if (!scopes->proxiedScopes.put(&scope, &debugScope)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -2054,7 +2054,7 @@
     MissingScopeKey key(si);
     MOZ_ASSERT(!scopes->missingScopes.has(key));
     if (!scopes->missingScopes.put(key, ReadBarriered<DebugScopeObject*>(&debugScope))) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -2063,7 +2063,7 @@
     if (si.withinInitialFrame()) {
         MOZ_ASSERT(!scopes->liveScopes.has(&debugScope.scope()));
         if (!scopes->liveScopes.put(&debugScope.scope(), LiveScopeVal(si))) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
         liveScopesPostWriteBarrier(cx->runtime(), &scopes->liveScopes, &debugScope.scope());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ScopeObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ScopeObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/ScopeObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/ScopeObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -984,6 +984,9 @@
     static void onCompartmentUnsetIsDebuggee(JSCompartment *c);
 };
 
+extern bool
+IsDebugScopeSlow(ProxyObject *proxy);
+
 }  /* namespace js */
 
 template<>
@@ -1009,11 +1012,9 @@
 inline bool
 JSObject::is<js::DebugScopeObject>() const
 {
-    extern bool js_IsDebugScopeSlow(js::ProxyObject *proxy);
-
     // Note: don't use is<ProxyObject>() here -- it also matches subclasses!
     return hasClass(&js::ProxyObject::class_) &&
-           js_IsDebugScopeSlow(&const_cast<JSObject*>(this)->as<js::ProxyObject>());
+           IsDebugScopeSlow(&const_cast<JSObject*>(this)->as<js::ProxyObject>());
 }
 
 template<>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SelfHosting.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SelfHosting.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SelfHosting.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SelfHosting.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -157,7 +157,7 @@
     uint32_t errorNumber = args[0].toInt32();
 
 #ifdef DEBUG
-    const JSErrorFormatString *efs = js_GetErrorMessage(nullptr, errorNumber);
+    const JSErrorFormatString *efs = GetErrorMessage(nullptr, errorNumber);
     MOZ_ASSERT(efs->argCount == args.length() - 1);
 #endif
 
@@ -178,7 +178,7 @@
             return false;
     }
 
-    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, errorNumber,
+    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, errorNumber,
                          errorArgs[0].ptr(), errorArgs[1].ptr(), errorArgs[2].ptr());
     return false;
 }
@@ -742,7 +742,7 @@
 
     const char *locale = cx->runtime()->getDefaultLocale();
     if (!locale) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_DEFAULT_LOCALE_ERROR);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_DEFAULT_LOCALE_ERROR);
         return false;
     }
 
@@ -766,6 +766,24 @@
     return true;
 }
 
+static bool
+intrinsic_ConstructorForTypedArray(JSContext *cx, unsigned argc, Value *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+    MOZ_ASSERT(args.length() == 1);
+    MOZ_ASSERT(args[0].isObject());
+    MOZ_ASSERT(IsAnyTypedArray(&args[0].toObject()));
+
+    RootedObject object(cx, &args[0].toObject());
+    JSProtoKey protoKey = StandardProtoKeyOrNull(object);
+    MOZ_ASSERT(protoKey);
+    RootedValue ctor(cx, cx->global()->getConstructor(protoKey));
+    MOZ_ASSERT(ctor.isObject());
+
+    args.rval().set(ctor);
+    return true;
+}
+
 // The self-hosting global isn't initialized with the normal set of builtins.
 // Instead, individual C++-implemented functions that're required by
 // self-hosted code are defined as global functions. Accessing these
@@ -790,7 +808,7 @@
     JS_FN("std_Date_valueOf",                    date_valueOf,                 0,0),
 
     JS_FN("std_Function_bind",                   fun_bind,                     1,0),
-    JS_FN("std_Function_apply",                  js_fun_apply,                 2,0),
+    JS_FN("std_Function_apply",                  fun_apply,                    2,0),
 
     JS_FN("std_Math_floor",                      math_floor,                   1,0),
     JS_FN("std_Math_max",                        math_max,                     2,0),
@@ -802,7 +820,7 @@
     JS_FN("std_Map_has",                         MapObject::has,               1,0),
     JS_FN("std_Map_iterator",                    MapObject::entries,           0,0),
 
-    JS_FN("std_Number_valueOf",                  js_num_valueOf,               0,0),
+    JS_FN("std_Number_valueOf",                  num_valueOf,                  0,0),
 
     JS_FN("std_Object_create",                   obj_create,                   2,0),
     JS_FN("std_Object_defineProperty",           obj_defineProperty,           3,0),
@@ -815,7 +833,7 @@
     JS_FN("std_Set_iterator",                    SetObject::values,            0,0),
 
     JS_FN("std_String_fromCharCode",             str_fromCharCode,             1,0),
-    JS_FN("std_String_charCodeAt",               js_str_charCodeAt,            1,0),
+    JS_FN("std_String_charCodeAt",               str_charCodeAt,               1,0),
     JS_FN("std_String_indexOf",                  str_indexOf,                  1,0),
     JS_FN("std_String_lastIndexOf",              str_lastIndexOf,              1,0),
     JS_FN("std_String_match",                    str_match,                    1,0),
@@ -844,6 +862,7 @@
     JS_FN("AssertionFailed",         intrinsic_AssertionFailed,         1,0),
     JS_FN("MakeConstructible",       intrinsic_MakeConstructible,       2,0),
     JS_FN("_IsConstructing",         intrinsic_IsConstructing,          0,0),
+    JS_FN("_ConstructorForTypedArray", intrinsic_ConstructorForTypedArray, 1,0),
     JS_FN("DecompileArg",            intrinsic_DecompileArg,            2,0),
     JS_FN("RuntimeDefaultLocale",    intrinsic_RuntimeDefaultLocale,    0,0),
     JS_FN("SubstringKernel",         intrinsic_SubstringKernel,         3,0),
@@ -953,6 +972,7 @@
     // See builtin/RegExp.h for descriptions of the regexp_* functions.
     JS_FN("regexp_exec_no_statics", regexp_exec_no_statics, 2,0),
     JS_FN("regexp_test_no_statics", regexp_test_no_statics, 2,0),
+    JS_FN("regexp_construct_no_statics", regexp_construct_no_statics, 2,0),
 
     JS_FS_END
 };
@@ -1134,15 +1154,15 @@
     if (JSID_IS_STRING(id) && !JSID_TO_STRING(id)->isPermanentAtom()) {
         MOZ_ASSERT(selfHostedObject->is<GlobalObject>());
         RootedValue value(cx, IdToValue(id));
-        return js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NO_SUCH_SELF_HOSTED_PROP,
-                                        JSDVG_IGNORE_STACK, value, NullPtr(), nullptr, nullptr);
+        return ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NO_SUCH_SELF_HOSTED_PROP,
+                                     JSDVG_IGNORE_STACK, value, NullPtr(), nullptr, nullptr);
     }
 
     RootedShape shape(cx, selfHostedObject->lookupPure(id));
     if (!shape) {
         RootedValue value(cx, IdToValue(id));
-        return js_ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NO_SUCH_SELF_HOSTED_PROP,
-                                        JSDVG_IGNORE_STACK, value, NullPtr(), nullptr, nullptr);
+        return ReportValueErrorFlags(cx, JSREPORT_ERROR, JSMSG_NO_SUCH_SELF_HOSTED_PROP,
+                                     JSDVG_IGNORE_STACK, value, NullPtr(), nullptr, nullptr);
     }
 
     MOZ_ASSERT(shape->hasSlot() && shape->hasDefaultGetter());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Shape.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Shape.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Shape.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Shape.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -116,7 +116,7 @@
     MOZ_ASSERT(!base()->isOwned());
     assertSameCompartmentDebugOnly(cx, compartment());
 
-    BaseShape *nbase = js_NewGCBaseShape<NoGC>(cx);
+    BaseShape *nbase = NewGCBaseShape<NoGC>(cx);
     if (!nbase)
         return false;
 
@@ -308,7 +308,7 @@
     MOZ_ASSERT(entryCount_ + removedCount_ <= size - 1);
 
     if (!change(delta, cx) && entryCount_ + removedCount_ == size - 1) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
     return true;
@@ -387,7 +387,7 @@
         if (!shape)
             return nullptr;
         if (childRoot->hasSlot() && childRoot->slot() >= obj->lastProperty()->base()->slotSpan()) {
-            if (!setSlotSpan(cx, obj, childRoot->slot() + 1))
+            if (!obj->setSlotSpan(cx, childRoot->slot() + 1))
                 return nullptr;
         }
         shape->initDictionaryShape(*childRoot, obj->numFixedSlots(), &obj->shape_);
@@ -401,7 +401,7 @@
                                HandleNativeObject obj, HandleShape parent, StackShape &unrootedChild)
 {
     RootedGeneric<StackShape*> child(cx, &unrootedChild);
-    RootedShape shape(cx, getChildPropertyOnDictionary(cx, obj, parent, *child));
+    Shape *shape = getChildPropertyOnDictionary(cx, obj, parent, *child);
 
     if (!obj->inDictionaryMode()) {
         shape = cx->compartment()->propertyTree.getChild(cx, parent, *child);
@@ -409,7 +409,7 @@
             return nullptr;
         //MOZ_ASSERT(shape->parent == parent);
         //MOZ_ASSERT_IF(parent != lastProperty(), parent == lastProperty()->parent);
-        if (!setLastProperty(cx, obj, shape))
+        if (!obj->setLastProperty(cx, shape))
             return nullptr;
     }
 
@@ -440,7 +440,7 @@
 
         Shape *dprop = shape->isAccessorShape() ? NewGCAccessorShape(cx) : NewGCShape(cx);
         if (!dprop) {
-            js_ReportOutOfMemory(cx);
+            ReportOutOfMemory(cx);
             return false;
         }
 
@@ -457,7 +457,7 @@
     }
 
     if (!Shape::hashify(cx, root)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -562,7 +562,7 @@
         RootedShape last(cx, obj->lastProperty());
 
         uint32_t index;
-        bool indexed = js_IdIsIndex(id, &index);
+        bool indexed = IdIsIndex(id, &index);
 
         Rooted<UnownedBaseShape*> nbase(cx);
         if (!indexed) {
@@ -631,7 +631,7 @@
         id = ids[i];
 
         uint32_t index;
-        bool indexed = js_IdIsIndex(id, &index);
+        bool indexed = IdIsIndex(id, &index);
 
         Rooted<UnownedBaseShape*> nbase(cx, newShape->base()->unowned());
         if (indexed) {
@@ -690,7 +690,7 @@
     if (obj->is<ArrayObject>()) {
         ArrayObject *arr = &obj->as<ArrayObject>();
         uint32_t index;
-        if (js_IdIsIndex(id, &index))
+        if (IdIsIndex(id, &index))
             MOZ_ASSERT(index < arr->length() || arr->lengthIsWritable());
     }
 #endif
@@ -748,7 +748,7 @@
     Rooted<UnownedBaseShape*> nbase(cx);
     {
         uint32_t index;
-        bool indexed = js_IdIsIndex(id, &index);
+        bool indexed = IdIsIndex(id, &index);
         StackBaseShape base(obj->lastProperty()->base());
         if (indexed)
             base.flags |= BaseShape::INDEXED;
@@ -1026,7 +1026,7 @@
 /* static */ void
 NativeObject::clear(JSContext *cx, HandleNativeObject obj)
 {
-    RootedShape shape(cx, obj->lastProperty());
+    Shape *shape = obj->lastProperty();
     MOZ_ASSERT(obj->inDictionaryMode() == shape->inDictionary());
 
     while (shape->parent) {
@@ -1038,7 +1038,7 @@
     if (obj->inDictionaryMode())
         shape->listp = &obj->shape_;
 
-    JS_ALWAYS_TRUE(setLastProperty(cx, obj, shape));
+    JS_ALWAYS_TRUE(obj->setLastProperty(cx, shape));
 
     ++cx->runtime()->propertyRemovals;
     obj->checkShapeConsistency();
@@ -1205,12 +1205,12 @@
 }
 
 bool
-JSObject::setFlag(ExclusiveContext *cx, /*BaseShape::Flag*/ uint32_t flag_,
-                  GenerateShape generateShape)
+JSObject::setFlags(ExclusiveContext *cx, /*BaseShape::Flag*/ uint32_t flags_,
+                   GenerateShape generateShape)
 {
-    BaseShape::Flag flag = (BaseShape::Flag) flag_;
+    BaseShape::Flag flags = (BaseShape::Flag) flags_;
 
-    if (lastProperty()->getObjectFlags() & flag)
+    if ((lastProperty()->getObjectFlags() & flags) == flags)
         return true;
 
     RootedObject self(cx, this);
@@ -1219,7 +1219,7 @@
         if (generateShape == GENERATE_SHAPE && !as<NativeObject>().generateOwnShape(cx))
             return false;
         StackBaseShape base(self->lastProperty());
-        base.flags |= flag;
+        base.flags |= flags;
         UnownedBaseShape *nbase = BaseShape::getUnowned(cx, base);
         if (!nbase)
             return false;
@@ -1229,7 +1229,7 @@
     }
 
     Shape *newShape =
-        Shape::setObjectFlag(cx, flag, self->getTaggedProto(), self->lastProperty());
+        Shape::setObjectFlags(cx, flags, self->getTaggedProto(), self->lastProperty());
     if (!newShape)
         return false;
 
@@ -1256,13 +1256,13 @@
 }
 
 /* static */ Shape *
-Shape::setObjectFlag(ExclusiveContext *cx, BaseShape::Flag flag, TaggedProto proto, Shape *last)
+Shape::setObjectFlags(ExclusiveContext *cx, BaseShape::Flag flags, TaggedProto proto, Shape *last)
 {
-    if (last->getObjectFlags() & flag)
+    if ((last->getObjectFlags() & flags) == flags)
         return last;
 
     StackBaseShape base(last);
-    base.flags |= flag;
+    base.flags |= flags;
 
     RootedShape lastRoot(cx, last);
     return replaceLastProperty(cx, base, proto, lastRoot);
@@ -1366,7 +1366,7 @@
 
     RootedGeneric<StackBaseShape*> root(cx, &base);
 
-    BaseShape *nbase_ = js_NewGCBaseShape<CanGC>(cx);
+    BaseShape *nbase_ = NewGCBaseShape<CanGC>(cx);
     if (!nbase_)
         return nullptr;
 
@@ -1625,7 +1625,7 @@
 {
     Shape *shape = NewGCShape(cx);
     if (!shape) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Shape.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Shape.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Shape.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Shape.h	2015-02-28 15:03:08.000000000 +0000
@@ -834,8 +834,8 @@
                                   JSObject *obj, TaggedProto proto, Shape *last);
     static Shape *setObjectMetadata(JSContext *cx,
                                     JSObject *metadata, TaggedProto proto, Shape *last);
-    static Shape *setObjectFlag(ExclusiveContext *cx,
-                                BaseShape::Flag flag, TaggedProto proto, Shape *last);
+    static Shape *setObjectFlags(ExclusiveContext *cx,
+                                 BaseShape::Flag flag, TaggedProto proto, Shape *last);
 
     uint32_t getObjectFlags() const { return base()->getObjectFlags(); }
     bool hasObjectFlag(BaseShape::Flag flag) const {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Shape-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Shape-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Shape-inl.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Shape-inl.h	2015-02-28 15:03:08.000000000 +0000
@@ -53,7 +53,7 @@
     }
 
     if (attrs & JSPROP_GETTER)
-        return js_ReportGetterOnlyAssignment(cx, strict);
+        return ReportGetterOnlyAssignment(cx, strict);
 
     if (!setterOp())
         return true;
@@ -109,7 +109,7 @@
     RootedGeneric<StackShape*> other(cx, &unrootedOther);
     Shape *shape = other->isAccessorShape() ? NewGCAccessorShape(cx) : NewGCShape(cx);
     if (!shape) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SharedArrayObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SharedArrayObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SharedArrayObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SharedArrayObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -212,7 +212,7 @@
             args.rval().set(args[0]);
             return true;
         }
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SHARED_ARRAY_BAD_OBJECT);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SHARED_ARRAY_BAD_OBJECT);
         return false;
     }
 
@@ -221,7 +221,7 @@
     if (!ToLengthClamped(cx, args.get(0), &length, &overflow)) {
         // Bug 1068458: Limit length to 2^31-1.
         if (overflow || length > INT32_MAX)
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SHARED_ARRAY_BAD_LENGTH);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SHARED_ARRAY_BAD_LENGTH);
         return false;
     }
 
@@ -324,7 +324,7 @@
 };
 
 JSObject *
-js_InitSharedArrayBufferClass(JSContext *cx, HandleObject obj)
+js::InitSharedArrayBufferClass(JSContext *cx, HandleObject obj)
 {
     MOZ_ASSERT(obj->isNative());
     Rooted<GlobalObject*> global(cx, &obj->as<GlobalObject>());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SharedTypedArrayObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SharedTypedArrayObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/SharedTypedArrayObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/SharedTypedArrayObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -238,7 +238,7 @@
                 args.rval().set(args[0]);
                 return true;
             }
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_LENGTH);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_LENGTH);
             return false;
         }
 
@@ -263,7 +263,7 @@
             if (!ToLengthClamped(cx, args[0], &length, &overflow)) {
                 // Bug 1068458: Limit length to 2^31-1.
                 if (overflow || length > INT32_MAX)
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+                    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
                 return nullptr;
             }
             return fromLength(cx, length);
@@ -273,7 +273,7 @@
         RootedObject dataObj(cx, &args.get(0).toObject());
 
         if (!UncheckedUnwrap(dataObj)->is<SharedArrayBufferObject>()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_OBJECT);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_OBJECT);
             return nullptr;
         }
 
@@ -285,7 +285,7 @@
                 return nullptr;
 
             if (numByteOffset < 0 || numByteOffset > MAX_BYTEOFFSET) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_SHARED_TYPED_ARRAY_ARG_RANGE, "'byteOffset'");
                 return nullptr;
             }
@@ -296,7 +296,7 @@
                 if (!ToLengthClamped(cx, args[2], &length, &overflow)) {
                     // Bug 1068458: Limit length to 2^31-1.
                     if (overflow || length > INT32_MAX)
-                        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                              JSMSG_SHARED_TYPED_ARRAY_ARG_RANGE, "'length'");
                     return nullptr;
                 }
@@ -412,7 +412,7 @@
                         HandleObject proto)
     {
         if (!ObjectClassIs(bufobj, ESClass_SharedArrayBuffer, cx)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_OBJECT);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_OBJECT);
             return nullptr; // must be SharedArrayBuffer
         }
 
@@ -426,7 +426,7 @@
 
         if (byteOffset > buffer->byteLength() || byteOffset % sizeof(NativeType) != 0) {
             // Invalid byteOffset.
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_ARGS);
             return nullptr;
         }
 
@@ -434,14 +434,14 @@
 
         if (length == LENGTH_NOT_PROVIDED) {
             if (bytesAvailable % sizeof(NativeType) != 0) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_ARGS);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SHARED_TYPED_ARRAY_BAD_ARGS);
                 return nullptr;
             }
             length = bytesAvailable / sizeof(NativeType);
         }
 
         if (length > MAX_LENGTH / sizeof(NativeType) || length * sizeof(NativeType) > bytesAvailable) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
             return nullptr;
         }
 
@@ -459,7 +459,7 @@
     fromLength(JSContext *cx, uint32_t nelements)
     {
         if (nelements > MAX_LENGTH / sizeof(NativeType)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
             return nullptr;
         }
         Rooted<SharedArrayBufferObject *> buffer(
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Stack.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Stack.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Stack.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Stack.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -1714,8 +1714,10 @@
         activation_ = activation_->prev();
 }
 
-JS::ProfilingFrameIterator::ProfilingFrameIterator(JSRuntime *rt, const RegisterState &state)
+JS::ProfilingFrameIterator::ProfilingFrameIterator(JSRuntime *rt, const RegisterState &state,
+                                                   uint32_t sampleBufferGen)
   : rt_(rt),
+    sampleBufferGen_(sampleBufferGen),
     activation_(rt->profilingActivation()),
     savedPrevJitTop_(nullptr)
 {
@@ -1877,6 +1879,10 @@
     jit::JitcodeGlobalTable *table = rt_->jitRuntime()->getJitcodeGlobalTable();
     jit::JitcodeGlobalEntry entry;
     table->lookupInfallible(returnAddr, &entry, rt_);
+    if (hasSampleBufferGen())
+        table->lookupForSampler(returnAddr, &entry, rt_, sampleBufferGen_);
+    else
+        table->lookup(returnAddr, &entry, rt_);
 
     MOZ_ASSERT(entry.isIon() || entry.isIonCache() || entry.isBaseline() || entry.isDummy());
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Stack.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Stack.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Stack.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Stack.h	2015-02-28 15:03:08.000000000 +0000
@@ -304,7 +304,7 @@
         PREV_UP_TO_DATE    =     0x4000,  /* see DebugScopes::updateLiveScopes */
 
         /*
-         * See comment above 'debugMode' in jscompartment.h for explanation of
+         * See comment above 'isDebuggee' in jscompartment.h for explanation of
          * invariants of debuggee compartments, scripts, and frames.
          */
         DEBUGGEE           =     0x8000,  /* Execution is being observed by Debugger */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Stack-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Stack-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Stack-inl.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Stack-inl.h	2015-02-28 15:03:08.000000000 +0000
@@ -250,7 +250,7 @@
         maxFrames = MAX_FRAMES;
 
     if (MOZ_UNLIKELY(frameCount_ >= maxFrames)) {
-        js_ReportOverRecursed(cx);
+        ReportOverRecursed(cx);
         return nullptr;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/StringBuffer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/StringBuffer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/StringBuffer.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/StringBuffer.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -161,7 +161,7 @@
     if (v.isNull())
         return sb.append(cx->names().null);
     if (v.isSymbol()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SYMBOL_TO_STRING);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SYMBOL_TO_STRING);
         return false;
     }
     MOZ_ASSERT(v.isUndefined());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/String-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/String-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/String-inl.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/String-inl.h	2015-02-28 15:03:08.000000000 +0000
@@ -97,7 +97,7 @@
 JSString::validateLength(js::ExclusiveContext *maybecx, size_t length)
 {
     if (MOZ_UNLIKELY(length > JSString::MAX_LENGTH)) {
-        js_ReportAllocationOverflow(maybecx);
+        js::ReportAllocationOverflow(maybecx);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/StringObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/StringObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/StringObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/StringObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -31,6 +31,14 @@
     static inline StringObject *create(JSContext *cx, HandleString str,
                                        NewObjectKind newKind = GenericObject);
 
+    /*
+     * Compute the initial shape to associate with fresh String objects, which
+     * encodes the initial length property. Return the shape after changing
+     * |obj|'s last property to it.
+     */
+    static Shape *
+    assignInitialShape(ExclusiveContext *cx, Handle<StringObject*> obj);
+
     JSString *unbox() const {
         return getFixedSlot(PRIMITIVE_VALUE_SLOT).toString();
     }
@@ -57,20 +65,7 @@
 
     /* For access to init, as String.prototype is special. */
     friend JSObject *
-    ::js_InitStringClass(JSContext *cx, js::HandleObject global);
-
-    /* For access to assignInitialShape. */
-    friend bool
-    EmptyShape::ensureInitialCustomShape<StringObject>(ExclusiveContext *cx,
-                                                       Handle<StringObject*> obj);
-
-    /*
-     * Compute the initial shape to associate with fresh String objects, which
-     * encodes the initial length property. Return the shape after changing
-     * |obj|'s last property to it.
-     */
-    static Shape *
-    assignInitialShape(ExclusiveContext *cx, Handle<StringObject*> obj);
+    js::InitStringClass(JSContext *cx, HandleObject global);
 };
 
 } // namespace js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/StructuredClone.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/StructuredClone.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/StructuredClone.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/StructuredClone.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -195,7 +195,7 @@
     bool readArray(T *p, size_t nelems);
 
     bool reportTruncated() {
-         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+         JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                               JSMSG_SC_BAD_SERIALIZED_DATA, "truncated");
          return false;
      }
@@ -340,7 +340,7 @@
 };
 
 JS_FRIEND_API(uint64_t)
-js_GetSCOffset(JSStructuredCloneWriter* writer)
+js::GetSCOffset(JSStructuredCloneWriter* writer)
 {
     MOZ_ASSERT(writer);
     return writer->output().count() * sizeof(uint64_t);
@@ -356,7 +356,7 @@
     if (callbacks && callbacks->reportError)
         callbacks->reportError(cx, JS_SCERR_TRANSFERABLE);
     else
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SC_NOT_TRANSFERABLE);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SC_NOT_TRANSFERABLE);
 }
 
 bool
@@ -672,7 +672,7 @@
         return true;
 
     if (nelems + sizeof(uint64_t) / sizeof(T) - 1 < nelems) {
-        js_ReportAllocationOverflow(context());
+        ReportAllocationOverflow(context());
         return false;
     }
     size_t nwords = JS_HOWMANY(nelems, sizeof(uint64_t) / sizeof(T));
@@ -768,7 +768,7 @@
 
         // No duplicates allowed
         if (std::find(transferableObjects.begin(), transferableObjects.end(), tObj) != transferableObjects.end()) {
-            JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr, JSMSG_SC_DUP_TRANSFERABLE);
+            JS_ReportErrorNumber(context(), GetErrorMessage, nullptr, JSMSG_SC_DUP_TRANSFERABLE);
             return false;
         }
 
@@ -876,7 +876,7 @@
 bool
 JSStructuredCloneWriter::writeSharedArrayBuffer(HandleObject obj)
 {
-    JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr, JSMSG_SC_SHMEM_MUST_TRANSFER);
+    JS_ReportErrorNumber(context(), GetErrorMessage, nullptr, JSMSG_SC_SHMEM_MUST_TRANSFER);
     return false;
 }
 
@@ -911,7 +911,7 @@
         return false;
 
     if (memory.count() == UINT32_MAX) {
-        JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                              JSMSG_NEED_DIET, "object graph to serialize");
         return false;
     }
@@ -1082,7 +1082,7 @@
         /* else fall through */
     }
 
-    JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr, JSMSG_SC_UNSUPPORTED_TYPE);
+    JS_ReportErrorNumber(context(), GetErrorMessage, nullptr, JSMSG_SC_UNSUPPORTED_TYPE);
     return false;
 }
 
@@ -1269,7 +1269,7 @@
     jsval_layout l;
     l.asDouble = d;
     if (!JSVAL_IS_DOUBLE_IMPL(l)) {
-        JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                              JSMSG_SC_BAD_SERIALIZED_DATA, "unrecognized NaN");
         return false;
     }
@@ -1307,7 +1307,7 @@
 JSStructuredCloneReader::readStringImpl(uint32_t nchars)
 {
     if (nchars > JSString::MAX_LENGTH) {
-        JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                              JSMSG_SC_BAD_SERIALIZED_DATA, "string length");
         return nullptr;
     }
@@ -1340,7 +1340,7 @@
                                         bool v1Read)
 {
     if (arrayType > Scalar::Uint8Clamped) {
-        JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                              JSMSG_SC_BAD_SERIALIZED_DATA, "unhandled typed array element type");
         return false;
     }
@@ -1414,7 +1414,7 @@
 JSStructuredCloneReader::readSharedTypedArray(uint32_t arrayType, uint32_t nelems, MutableHandleValue vp)
 {
     if (arrayType > Scalar::Uint8Clamped) {
-        JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                              JSMSG_SC_BAD_SERIALIZED_DATA, "unhandled typed array element type");
         return false;
     }
@@ -1592,11 +1592,11 @@
         if (!in.readDouble(&d) || !checkDouble(d))
             return false;
         if (!IsNaN(d) && d != TimeClip(d)) {
-            JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                                  JSMSG_SC_BAD_SERIALIZED_DATA, "date");
             return false;
         }
-        JSObject *obj = js_NewDateObjectMsec(context(), d);
+        JSObject *obj = NewDateObjectMsec(context(), d);
         if (!obj)
             return false;
         vp.setObject(*obj);
@@ -1609,7 +1609,7 @@
         if (!in.readPair(&tag2, &stringData))
             return false;
         if (tag2 != SCTAG_STRING) {
-            JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                                  JSMSG_SC_BAD_SERIALIZED_DATA, "regexp");
             return false;
         }
@@ -1642,7 +1642,7 @@
 
       case SCTAG_BACK_REFERENCE_OBJECT: {
         if (data >= allObjs.length()) {
-            JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                                  JSMSG_SC_BAD_SERIALIZED_DATA,
                                  "invalid back reference in input");
             return false;
@@ -1654,7 +1654,7 @@
       case SCTAG_TRANSFER_MAP_HEADER:
       case SCTAG_TRANSFER_MAP_PENDING_ENTRY:
         // We should be past all the transfer map tags.
-        JS_ReportErrorNumber(context(), js_GetErrorMessage, NULL,
+        JS_ReportErrorNumber(context(), GetErrorMessage, NULL,
                              JSMSG_SC_BAD_SERIALIZED_DATA,
                              "invalid input");
         return false;
@@ -1712,7 +1712,7 @@
         }
 
         if (!callbacks || !callbacks->read) {
-            JS_ReportErrorNumber(context(), js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(context(), GetErrorMessage, nullptr,
                                  JSMSG_SC_BAD_SERIALIZED_DATA, "unsupported type");
             return false;
         }
@@ -1885,7 +1885,7 @@
     CHECK_REQUEST(cx);
 
     if (version > JS_STRUCTURED_CLONE_VERSION) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SC_BAD_CLONE_VERSION);
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_SC_BAD_CLONE_VERSION);
         return false;
     }
     const JSStructuredCloneCallbacks *callbacks =
@@ -2113,7 +2113,7 @@
             return false;
         return r->readTypedArray(arrayType, nelems, vp);
     } else {
-        JS_ReportErrorNumber(r->context(), js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(r->context(), GetErrorMessage, nullptr,
                              JSMSG_SC_BAD_SERIALIZED_DATA, "expected type array");
         return false;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Symbol.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Symbol.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Symbol.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Symbol.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -28,7 +28,7 @@
     // Following js::AtomizeString, we grudgingly forgo last-ditch GC here.
     Symbol *p = gc::AllocateNonObject<Symbol, NoGC>(cx);
     if (!p) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
     return new (p) Symbol(code, description);
@@ -74,7 +74,7 @@
     // lookupForAdd call, and newInternal can't GC.
     if (!registry.add(p, sym)) {
         // SystemAllocPolicy does not report OOM.
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return nullptr;
     }
     return sym;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypedArrayCommon.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypedArrayCommon.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypedArrayCommon.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypedArrayCommon.h	2015-02-28 15:03:08.000000000 +0000
@@ -114,6 +114,14 @@
 }
 
 inline uint32_t
+AnyTypedArrayBytesPerElement(const JSObject *obj)
+{
+    if (obj->is<TypedArrayObject>())
+        return obj->as<TypedArrayObject>().bytesPerElement();
+    return obj->as<SharedTypedArrayObject>().bytesPerElement();
+}
+
+inline uint32_t
 AnyTypedArrayByteLength(const JSObject *obj)
 {
     if (obj->is<TypedArrayObject>())
@@ -499,7 +507,7 @@
             begin = end;
 
         if (begin > tarray->length() || end > tarray->length() || begin > end) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_INDEX);
             return false;
         }
 
@@ -614,7 +622,7 @@
             count > lengthDuringMove - from ||
             count > lengthDuringMove - to)
         {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return false;
         }
 
@@ -657,7 +665,7 @@
 
         // The first argument must be either a typed array or arraylike.
         if (args.length() == 0 || !args[0].isObject()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return false;
         }
 
@@ -668,7 +676,7 @@
 
             if (offset < 0 || uint32_t(offset) > target->length()) {
                 // the given offset is bogus
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_TYPED_ARRAY_BAD_INDEX, "2");
                 return false;
             }
@@ -677,7 +685,7 @@
         RootedObject arg0(cx, &args[0].toObject());
         if (IsAnyTypedArray(arg0)) {
             if (AnyTypedArrayLength(arg0) > target->length() - offset) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
                 return false;
             }
 
@@ -689,7 +697,7 @@
                 return false;
 
             if (uint32_t(offset) > target->length() || len > target->length() - offset) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_BAD_ARRAY_LENGTH);
                 return false;
             }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypedArrayObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypedArrayObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypedArrayObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypedArrayObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -438,7 +438,7 @@
 
         /* (not an object) */
         if (!args[0].isObject()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return nullptr;
         }
 
@@ -465,7 +465,7 @@
             if (!ToInt32(cx, args[1], &byteOffset))
                 return nullptr;
             if (byteOffset < 0) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_TYPED_ARRAY_NEGATIVE_ARG, "1");
                 return nullptr;
             }
@@ -474,7 +474,7 @@
                 if (!ToInt32(cx, args[2], &length))
                     return nullptr;
                 if (length < 0) {
-                    JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                    JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                          JSMSG_TYPED_ARRAY_NEGATIVE_ARG, "2");
                     return nullptr;
                 }
@@ -496,7 +496,7 @@
                         HandleObject proto)
     {
         if (!ObjectClassIs(bufobj, ESClass_ArrayBuffer, cx)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return nullptr; // must be arrayBuffer
         }
 
@@ -554,14 +554,14 @@
         }
 
         if (!IsArrayBuffer(bufobj)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return nullptr; // must be arrayBuffer
         }
 
         Rooted<ArrayBufferObject *> buffer(cx, &AsArrayBuffer(bufobj));
 
         if (byteOffset > buffer->byteLength() || byteOffset % sizeof(NativeType) != 0) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return nullptr; // invalid byteOffset
         }
 
@@ -569,7 +569,7 @@
         if (lengthInt == -1) {
             len = (buffer->byteLength() - byteOffset) / sizeof(NativeType);
             if (len * sizeof(NativeType) != buffer->byteLength() - byteOffset) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_TYPED_ARRAY_BAD_ARGS);
                 return nullptr; // given byte array doesn't map exactly to sizeof(NativeType) * N
             }
@@ -580,12 +580,12 @@
         // Go slowly and check for overflow.
         uint32_t arrayByteLength = len * sizeof(NativeType);
         if (len >= INT32_MAX / sizeof(NativeType) || byteOffset >= INT32_MAX - arrayByteLength) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return nullptr; // overflow when calculating byteOffset + len * sizeof(NativeType)
         }
 
         if (arrayByteLength + byteOffset > buffer->byteLength()) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_TYPED_ARRAY_BAD_ARGS);
             return nullptr; // byteOffset + len is too big for the arraybuffer
         }
 
@@ -604,7 +604,7 @@
         }
 
         if (nelements >= INT32_MAX / sizeof(NativeType)) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_NEED_DIET, "size and count");
             return false;
         }
@@ -802,15 +802,18 @@
     JS_FN("copyWithin", TypedArrayObject::copyWithin, 2, 0),
     JS_SELF_HOSTED_FN("every", "TypedArrayEvery", 2, 0),
     JS_SELF_HOSTED_FN("fill", "TypedArrayFill", 3, 0),
+    JS_SELF_HOSTED_FN("filter", "TypedArrayFilter", 2, 0),
     JS_SELF_HOSTED_FN("find", "TypedArrayFind", 2, 0),
     JS_SELF_HOSTED_FN("findIndex", "TypedArrayFindIndex", 2, 0),
     JS_SELF_HOSTED_FN("forEach", "TypedArrayForEach", 2, 0),
     JS_SELF_HOSTED_FN("indexOf", "TypedArrayIndexOf", 2, 0),
     JS_SELF_HOSTED_FN("join", "TypedArrayJoin", 1, 0),
     JS_SELF_HOSTED_FN("lastIndexOf", "TypedArrayLastIndexOf", 2, 0),
+    JS_SELF_HOSTED_FN("map", "TypedArrayMap", 2, 0),
     JS_SELF_HOSTED_FN("reduce", "TypedArrayReduce", 1, 0),
     JS_SELF_HOSTED_FN("reduceRight", "TypedArrayReduceRight", 1, 0),
     JS_SELF_HOSTED_FN("reverse", "TypedArrayReverse", 0, 0),
+    JS_SELF_HOSTED_FN("slice", "TypedArraySlice", 2, 0),
     JS_SELF_HOSTED_FN("some", "TypedArraySome", 2, 0),
     JS_SELF_HOSTED_FN("entries", "TypedArrayEntries", 0, 0),
     JS_SELF_HOSTED_FN("keys", "TypedArrayKeys", 0, 0),
@@ -988,7 +991,7 @@
 
     // This is overflow-safe: 2 * INT32_MAX is still a valid uint32_t.
     if (byteOffset + byteLength > arrayBuffer->byteLength()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
         return nullptr;
 
     }
@@ -1040,7 +1043,7 @@
 DataViewObject::construct(JSContext *cx, JSObject *bufobj, const CallArgs &args, HandleObject proto)
 {
     if (!IsArrayBuffer(bufobj)) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_NOT_EXPECTED_TYPE,
                              "DataView", "ArrayBuffer", bufobj->getClass()->name);
         return false;
     }
@@ -1054,7 +1057,7 @@
         if (!ToUint32(cx, args[1], &byteOffset))
             return false;
         if (byteOffset > INT32_MAX) {
-            JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+            JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                  JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
             return false;
         }
@@ -1063,13 +1066,13 @@
             if (!ToUint32(cx, args[2], &byteLength))
                 return false;
             if (byteLength > INT32_MAX) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_ARG_INDEX_OUT_OF_RANGE, "2");
                 return false;
             }
         } else {
             if (byteOffset > bufferLength) {
-                JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                                      JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
                 return false;
             }
@@ -1083,7 +1086,7 @@
     MOZ_ASSERT(byteLength <= INT32_MAX);
 
     if (byteOffset + byteLength > bufferLength) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
         return false;
     }
 
@@ -1131,7 +1134,7 @@
 {
     const size_t TypeSize = sizeof(NativeType);
     if (offset > UINT32_MAX - TypeSize || offset + TypeSize > obj->byteLength()) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1");
         return nullptr;
     }
 
@@ -1218,7 +1221,7 @@
                      CallArgs &args, NativeType *val, const char *method)
 {
     if (args.length() < 1) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_MORE_ARGS_NEEDED, method, "0", "s");
         return false;
     }
@@ -1275,7 +1278,7 @@
                       CallArgs &args, const char *method)
 {
     if (args.length() < 2) {
-        JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+        JS_ReportErrorNumber(cx, GetErrorMessage, nullptr,
                              JSMSG_MORE_ARGS_NEEDED, method, "1", "");
         return false;
     }
@@ -2024,7 +2027,7 @@
 }
 
 JSObject *
-js_InitDataViewClass(JSContext *cx, HandleObject obj)
+js::InitDataViewClass(JSContext *cx, HandleObject obj)
 {
     if (!DataViewObject::initClass(cx))
         return nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypedArrayObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypedArrayObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypedArrayObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypedArrayObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -310,6 +310,9 @@
     return 1u << TypedArrayShift(viewType);
 }
 
+extern JSObject *
+InitDataViewClass(JSContext *cx, HandleObject obj);
+
 class DataViewObject : public NativeObject
 {
   private:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypeInference.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypeInference.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypeInference.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypeInference.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -257,7 +257,8 @@
         // properties become unknown.
         if (value.isObject() &&
             !value.toObject().hasLazyGroup() &&
-            value.toObject().group()->flags() & OBJECT_FLAG_UNKNOWN_PROPERTIES)
+            ((value.toObject().group()->flags() & OBJECT_FLAG_UNKNOWN_PROPERTIES) ||
+             value.toObject().group()->maybeOriginalUnboxedGroup()))
         {
             return true;
         }
@@ -1224,7 +1225,7 @@
 
     uint32_t index = types.compilerOutputs->length();
     if (!types.compilerOutputs->append(co)) {
-        js_ReportOutOfMemory(cx);
+        ReportOutOfMemory(cx);
         return false;
     }
 
@@ -1709,6 +1710,31 @@
     }
 };
 
+// Constraint which triggers recompilation if an unboxed object in some group
+// is converted to a native object.
+class ConstraintDataFreezeObjectForUnboxedConvertedToNative
+{
+  public:
+    ConstraintDataFreezeObjectForUnboxedConvertedToNative()
+    {}
+
+    const char *kind() { return "freezeObjectForUnboxedConvertedToNative"; }
+
+    bool invalidateOnNewType(TypeSet::Type type) { return false; }
+    bool invalidateOnNewPropertyState(TypeSet *property) { return false; }
+    bool invalidateOnNewObjectState(ObjectGroup *group) {
+        return group->unboxedLayout().nativeGroup() != nullptr;
+    }
+
+    bool constraintHolds(JSContext *cx,
+                         const HeapTypeSetKey &property, TemporaryTypeSet *expected)
+    {
+        return !invalidateOnNewObjectState(property.object()->maybeGroup());
+    }
+
+    bool shouldSweep() { return false; }
+};
+
 } /* anonymous namespace */
 
 void
@@ -1733,6 +1759,17 @@
                                     ConstraintDataFreezeObjectForTypedArrayData(tarray)));
 }
 
+void
+TypeSet::ObjectKey::watchStateChangeForUnboxedConvertedToNative(CompilerConstraintList *constraints)
+{
+    HeapTypeSetKey objectProperty = property(JSID_EMPTY);
+    LifoAlloc *alloc = constraints->alloc();
+
+    typedef CompilerConstraintInstance<ConstraintDataFreezeObjectForUnboxedConvertedToNative> T;
+    constraints->add(alloc->new_<T>(alloc, objectProperty,
+                                    ConstraintDataFreezeObjectForUnboxedConvertedToNative()));
+}
+
 static void
 ObjectStateChange(ExclusiveContext *cxArg, ObjectGroup *group, bool markingUnknown)
 {
@@ -2232,8 +2269,8 @@
     return false;
 }
 
-static inline bool
-ClassCanHaveExtraProperties(const Class *clasp)
+bool
+js::ClassCanHaveExtraProperties(const Class *clasp)
 {
     return clasp->resolve
         || clasp->ops.lookupProperty
@@ -2561,16 +2598,28 @@
               TypeSet::ObjectGroupString(group), TypeIdString(id), TypeSet::TypeString(type));
     types->addType(cx, type);
 
+    // If this addType caused the type set to be marked as containing any
+    // object, make sure that is reflected in other type sets the addType is
+    // propagated to below.
+    if (type.isObjectUnchecked() && types->unknownObject())
+        type = TypeSet::AnyObjectType();
+
     // Propagate new types from partially initialized groups to fully
     // initialized groups for the acquired properties analysis. Note that we
     // don't need to do this for other property changes, as these will also be
     // reflected via shape changes on the object that will prevent the object
     // from acquiring the fully initialized group.
-    if (group->newScript() && group->newScript()->initializedGroup()) {
-        if (type.isObjectUnchecked() && types->unknownObject())
-            type = TypeSet::AnyObjectType();
+    if (group->newScript() && group->newScript()->initializedGroup())
         AddTypePropertyId(cx, group->newScript()->initializedGroup(), id, type);
-    }
+
+    // Maintain equivalent type information for unboxed object groups and their
+    // corresponding native group. Since type sets might contain the unboxed
+    // group but not the native group, this ensures optimizations based on the
+    // unboxed group are valid for the native group.
+    if (group->maybeUnboxedLayout() && group->maybeUnboxedLayout()->nativeGroup())
+        AddTypePropertyId(cx, group->maybeUnboxedLayout()->nativeGroup(), id, type);
+    if (ObjectGroup *unboxedGroup = group->maybeOriginalUnboxedGroup())
+        AddTypePropertyId(cx, unboxedGroup, id, type);
 }
 
 void
@@ -2666,6 +2715,12 @@
     // acquired properties analysis.
     if (newScript() && newScript()->initializedGroup())
         newScript()->initializedGroup()->setFlags(cx, flags);
+
+    // Propagate flag changes between unboxed and corresponding native groups.
+    if (maybeUnboxedLayout() && maybeUnboxedLayout()->nativeGroup())
+        maybeUnboxedLayout()->nativeGroup()->setFlags(cx, flags);
+    if (ObjectGroup *unboxedGroup = maybeOriginalUnboxedGroup())
+        unboxedGroup->setFlags(cx, flags);
 }
 
 void
@@ -2711,7 +2766,7 @@
 }
 
 void
-ObjectGroup::detachNewScript(bool writeBarrier)
+ObjectGroup::detachNewScript(bool writeBarrier, ObjectGroup *replacement)
 {
     // Clear the TypeNewScript from this ObjectGroup and, if it has been
     // analyzed, remove it from the newObjectGroups table so that it will not be
@@ -2721,8 +2776,16 @@
     MOZ_ASSERT(newScript);
 
     if (newScript->analyzed()) {
-        newScript->function()->compartment()->objectGroups.removeDefaultNewGroup(nullptr, proto(),
-                                                                                 newScript->function());
+        ObjectGroupCompartment &objectGroups = newScript->function()->compartment()->objectGroups;
+        if (replacement) {
+            MOZ_ASSERT(replacement->newScript()->function() == newScript->function());
+            objectGroups.replaceDefaultNewGroup(nullptr, proto(), newScript->function(),
+                                                replacement);
+        } else {
+            objectGroups.removeDefaultNewGroup(nullptr, proto(), newScript->function());
+        }
+    } else {
+        MOZ_ASSERT(!replacement);
     }
 
     if (this->newScript())
@@ -2746,13 +2809,13 @@
     addFlags(OBJECT_FLAG_NEW_SCRIPT_CLEARED);
 
     // This method is called during GC sweeping, so don't trigger pre barriers.
-    detachNewScript(/* writeBarrier = */ false);
+    detachNewScript(/* writeBarrier = */ false, nullptr);
 
     js_delete(newScript);
 }
 
 void
-ObjectGroup::clearNewScript(ExclusiveContext *cx)
+ObjectGroup::clearNewScript(ExclusiveContext *cx, ObjectGroup *replacement /* = nullptr*/)
 {
     TypeNewScript *newScript = anyNewScript();
     if (!newScript)
@@ -2760,15 +2823,17 @@
 
     AutoEnterAnalysis enter(cx);
 
-    // Invalidate any Ion code constructing objects of this type.
-    setFlags(cx, OBJECT_FLAG_NEW_SCRIPT_CLEARED);
+    if (!replacement) {
+        // Invalidate any Ion code constructing objects of this type.
+        setFlags(cx, OBJECT_FLAG_NEW_SCRIPT_CLEARED);
 
-    // Mark the constructing function as having its 'new' script cleared, so we
-    // will not try to construct another one later.
-    if (!newScript->function()->setNewScriptCleared(cx))
-        cx->recoverFromOutOfMemory();
+        // Mark the constructing function as having its 'new' script cleared, so we
+        // will not try to construct another one later.
+        if (!newScript->function()->setNewScriptCleared(cx))
+            cx->recoverFromOutOfMemory();
+    }
 
-    detachNewScript(/* writeBarrier = */ true);
+    detachNewScript(/* writeBarrier = */ true, replacement);
 
     if (cx->isJSContext()) {
         bool found = newScript->rollbackPartiallyInitializedObjects(cx->asJSContext(), this);
@@ -2976,7 +3041,7 @@
                 JSFunction *fun = &singleton->as<JSFunction>();
                 if (!fun->isNative())
                     continue;
-                if (fun->native() != js_fun_call && fun->native() != js_fun_apply)
+                if (fun->native() != fun_call && fun->native() != fun_apply)
                     continue;
             }
             // This is a type set that might have been used when inlining
@@ -3019,11 +3084,20 @@
 static inline bool
 IsAboutToBeFinalized(TypeSet::ObjectKey **keyp)
 {
-    // Mask out the low bit indicating whether this is a group or JS object.
-    uintptr_t flagBit = uintptr_t(*keyp) & 1;
-    gc::Cell *tmp = reinterpret_cast<gc::Cell *>(uintptr_t(*keyp) & ~1);
-    bool isAboutToBeFinalized = IsCellAboutToBeFinalized(&tmp);
-    *keyp = reinterpret_cast<TypeSet::ObjectKey *>(uintptr_t(tmp) | flagBit);
+    TypeSet::ObjectKey *key = *keyp;
+    bool isAboutToBeFinalized;
+    if (key->isGroup()) {
+        ObjectGroup *group = key->groupNoBarrier();
+        isAboutToBeFinalized = IsObjectGroupAboutToBeFinalized(&group);
+        if (!isAboutToBeFinalized)
+            *keyp = TypeSet::ObjectKey::get(group);
+    } else {
+        MOZ_ASSERT(key->isSingleton());
+        JSObject *singleton = key->singletonNoBarrier();
+        isAboutToBeFinalized = IsObjectAboutToBeFinalized(&singleton);
+        if (!isAboutToBeFinalized)
+            *keyp = TypeSet::ObjectKey::get(singleton);
+    }
     return isAboutToBeFinalized;
 }
 
@@ -3205,6 +3279,33 @@
     gc::TraceTypeNewScript(group);
 }
 
+// Make a TypeNewScript with the same initializer list as |newScript| but with
+// a new template object.
+/* static */ TypeNewScript *
+TypeNewScript::makeNativeVersion(JSContext *cx, TypeNewScript *newScript,
+                                 PlainObject *templateObject)
+{
+    MOZ_ASSERT(cx->zone()->types.activeAnalysis);
+
+    ScopedJSDeletePtr<TypeNewScript> nativeNewScript(cx->new_<TypeNewScript>());
+    if (!nativeNewScript)
+        return nullptr;
+
+    nativeNewScript->function_ = newScript->function();
+    nativeNewScript->templateObject_ = templateObject;
+
+    Initializer *cursor = newScript->initializerList;
+    while (cursor->kind != Initializer::DONE) { cursor++; }
+    size_t initializerLength = cursor - newScript->initializerList + 1;
+
+    nativeNewScript->initializerList = cx->zone()->pod_calloc<Initializer>(initializerLength);
+    if (!nativeNewScript->initializerList)
+        return nullptr;
+    PodCopy(nativeNewScript->initializerList, newScript->initializerList, initializerLength);
+
+    return nativeNewScript.forget();
+}
+
 size_t
 TypeNewScript::sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const
 {
@@ -3566,7 +3667,7 @@
         }
 
         if (thisv.toObject().is<UnboxedPlainObject>() &&
-            !thisv.toObject().as<UnboxedPlainObject>().convertToNative(cx))
+            !UnboxedPlainObject::convertToNative(cx, &thisv.toObject()))
         {
             CrashAtUnhandlableOOM("rollbackPartiallyInitializedObjects");
         }
@@ -3701,6 +3802,12 @@
                 // Object sets containing objects with unknown properties might
                 // not be complete. Mark the type set as unknown, which it will
                 // be treated as during Ion compilation.
+                //
+                // Note that we don't have to do this when the type set might
+                // be missing the native group corresponding to an unboxed
+                // object group. In this case, the native group points to the
+                // unboxed object group via its addendum, so as long as objects
+                // with either group exist, neither group will be finalized.
                 flags |= TYPE_FLAG_ANYOBJECT;
                 clearObjects();
                 objectCount = 0;
@@ -4070,7 +4177,7 @@
             Sprinter sprinter(cx);
             if (!sprinter.init())
                 return;
-            js_Disassemble1(cx, script, pc, script->pcToOffset(pc), true, &sprinter);
+            Disassemble1(cx, script, pc, script->pcToOffset(pc), true, &sprinter);
             fprintf(stderr, "%s", sprinter.string());
         }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypeInference.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypeInference.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypeInference.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypeInference.h	2015-02-28 15:03:08.000000000 +0000
@@ -206,11 +206,19 @@
  *   that compilation.
  *
  * The contents of a type set completely describe the values that a particular
- * lvalue might have, except in cases where an object's type is mutated. In
- * such cases, type sets which had the object's old type might not have the
- * object's new type. Type mutation occurs only in specific circumstances ---
- * when an object's prototype changes, and when it is swapped with another
- * object --- and will cause the object's properties to be marked as unknown.
+ * lvalue might have, except for the following cases:
+ *
+ * - If an object's prototype or class is dynamically mutated, its group will
+ *   change. Type sets containing the old group will not necessarily contain
+ *   the new group. When this occurs, the properties of the old and new group
+ *   will both be marked as unknown, which will prevent Ion from optimizing
+ *   based on the object's type information.
+ *
+ * - If an unboxed object is converted to a native object, its group will also
+ *   change and type sets containing the old group will not necessarily contain
+ *   the new group. Unlike the above case, this will not degrade property type
+ *   information, but Ion will no longer optimize unboxed objects with the old
+ *   group.
  */
 class TypeSet
 {
@@ -247,6 +255,7 @@
         bool hasStableClassAndProto(CompilerConstraintList *constraints);
         void watchStateChangeForInlinedCall(CompilerConstraintList *constraints);
         void watchStateChangeForTypedArrayData(CompilerConstraintList *constraints);
+        void watchStateChangeForUnboxedConvertedToNative(CompilerConstraintList *constraints);
         HeapTypeSetKey property(jsid id);
         void ensureTrackedProperty(JSContext *cx, jsid id);
 
@@ -315,6 +324,9 @@
         bool isSingleton() const {
             return isObject() && !!(data & 1);
         }
+        bool isSingletonUnchecked() const {
+            return isObjectUnchecked() && !!(data & 1);
+        }
 
         inline JSObject *singleton() const;
         inline JSObject *singletonNoBarrier() const;
@@ -324,6 +336,9 @@
         bool isGroup() const {
             return isObject() && !(data & 1);
         }
+        bool isGroupUnchecked() const {
+            return isObjectUnchecked() && !(data & 1);
+        }
 
         inline ObjectGroup *group() const;
         inline ObjectGroup *groupNoBarrier() const;
@@ -818,8 +833,6 @@
 
   private:
     // Scripted function which this information was computed for.
-    // If instances of the associated group are created without calling
-    // 'new' on this function, the new script information is cleared.
     HeapPtrFunction function_;
 
     // Any preliminary objects with the type. The analyses are not performed
@@ -893,6 +906,8 @@
     bool rollbackPartiallyInitializedObjects(JSContext *cx, ObjectGroup *group);
 
     static void make(JSContext *cx, ObjectGroup *group, JSFunction *fun);
+    static TypeNewScript *makeNativeVersion(JSContext *cx, TypeNewScript *newScript,
+                                            PlainObject *templateObject);
 
     size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
 };
@@ -900,6 +915,9 @@
 /* Is this a reasonable PC to be doing inlining on? */
 inline bool isInlinableCall(jsbytecode *pc);
 
+bool
+ClassCanHaveExtraProperties(const Class *clasp);
+
 /*
  * Whether Array.prototype, or an object on its proto chain, has an
  * indexed property.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypeInference-inl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypeInference-inl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/TypeInference-inl.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/TypeInference-inl.h	2015-02-28 15:03:08.000000000 +0000
@@ -605,7 +605,7 @@
          * specific properties.
          */
         uint32_t i;
-        if (js_IdIsIndex(id, &i))
+        if (IdIsIndex(id, &i))
             return;
 
         // But if we don't have too many properties yet, don't do anything.  The
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/UnboxedObject.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/UnboxedObject.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/UnboxedObject.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/UnboxedObject.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -29,6 +29,15 @@
 
     if (newScript())
         newScript()->trace(trc);
+
+    if (nativeGroup_)
+        MarkObjectGroup(trc, &nativeGroup_, "unboxed_layout_nativeGroup");
+
+    if (nativeShape_)
+        MarkShape(trc, &nativeShape_, "unboxed_layout_nativeShape");
+
+    if (replacementNewGroup_)
+        MarkObjectGroup(trc, &replacementNewGroup_, "unboxed_layout_replacementNewGroup");
 }
 
 size_t
@@ -81,7 +90,8 @@
 
       case JSVAL_TYPE_STRING:
         if (v.isString()) {
-            *reinterpret_cast<HeapPtrString*>(p) = v.toString();
+            MOZ_ASSERT(!IsInsideNursery(v.toString()));
+            *reinterpret_cast<PreBarrieredString*>(p) = v.toString();
             return true;
         }
         return false;
@@ -93,7 +103,14 @@
             // created.
             AddTypePropertyId(cx, this, NameToId(property.name), v);
 
-            *reinterpret_cast<HeapPtrObject*>(p) = v.toObjectOrNull();
+            // Manually trigger post barriers on the whole object. If we treat
+            // the pointer as a HeapPtrObject we will get confused later if the
+            // object is converted to its native representation.
+            JSObject *obj = v.toObjectOrNull();
+            if (IsInsideNursery(v.toObjectOrNull()) && !IsInsideNursery(this))
+                cx->runtime()->gc.storeBuffer.putWholeCellFromMainThread(this);
+
+            *reinterpret_cast<PreBarrieredObject*>(p) = obj;
             return true;
         }
         return false;
@@ -132,7 +149,7 @@
 void
 UnboxedPlainObject::trace(JSTracer *trc, JSObject *obj)
 {
-    const UnboxedLayout &layout = obj->as<UnboxedPlainObject>().layout();
+    const UnboxedLayout &layout = obj->as<UnboxedPlainObject>().layoutDontCheckGeneration();
     const int32_t *list = layout.traceList();
     if (!list)
         return;
@@ -155,35 +172,61 @@
     MOZ_ASSERT(*(list + 1) == -1);
 }
 
-bool
-UnboxedPlainObject::convertToNative(JSContext *cx)
+/* static */ bool
+UnboxedLayout::makeNativeGroup(JSContext *cx, ObjectGroup *group)
 {
-    // Immediately clear any new script on this object's group,
-    // as rollbackPartiallyInitializedObjects() will be confused by the type
-    // changes we make in this function.
-    group()->clearNewScript(cx);
+    AutoEnterAnalysis enter(cx);
 
-    // clearNewScript() can reentrantly invoke this method.
-    if (!is<UnboxedPlainObject>())
-        return true;
+    UnboxedLayout &layout = group->unboxedLayout();
+    Rooted<TaggedProto> proto(cx, group->proto());
 
-    Rooted<UnboxedPlainObject *> obj(cx, this);
-    Rooted<TaggedProto> proto(cx, getTaggedProto());
+    MOZ_ASSERT(!layout.nativeGroup());
 
-    size_t nfixed = gc::GetGCKindSlots(obj->layout().getAllocKind());
+    // Immediately clear any new script on the group. This is done by replacing
+    // the existing new script with one for a replacement default new group.
+    // This is done so that the size of the replacment group's objects is the
+    // same as that for the unboxed group, so that we do not see polymorphic
+    // slot accesses later on for sites that see converted objects from this
+    // group and objects that were allocated using the replacement new group.
+    RootedObjectGroup replacementNewGroup(cx);
+    if (layout.newScript()) {
+        replacementNewGroup = ObjectGroupCompartment::makeGroup(cx, &PlainObject::class_, proto);
+        if (!replacementNewGroup)
+            return false;
 
-    AutoValueVector values(cx);
+        PlainObject *templateObject = NewObjectWithGroup<PlainObject>(cx, replacementNewGroup,
+                                                                      cx->global(), layout.getAllocKind(),
+                                                                      MaybeSingletonObject);
+        if (!templateObject)
+            return false;
+
+        for (size_t i = 0; i < layout.properties().length(); i++) {
+            const UnboxedLayout::Property &property = layout.properties()[i];
+            if (!templateObject->addDataProperty(cx, NameToId(property.name), i, JSPROP_ENUMERATE))
+                return false;
+            MOZ_ASSERT(templateObject->slotSpan() == i + 1);
+            MOZ_ASSERT(!templateObject->inDictionaryMode());
+        }
+
+        TypeNewScript *replacementNewScript =
+            TypeNewScript::makeNativeVersion(cx, layout.newScript(), templateObject);
+        if (!replacementNewScript)
+            return false;
+
+        replacementNewGroup->setNewScript(replacementNewScript);
+        gc::TraceTypeNewScript(replacementNewGroup);
+
+        group->clearNewScript(cx, replacementNewGroup);
+    }
+
+    size_t nfixed = gc::GetGCKindSlots(layout.getAllocKind());
     RootedShape shape(cx, EmptyShape::getInitialShape(cx, &PlainObject::class_, proto,
-                                                      getParent(), getMetadata(), nfixed,
-                                                      lastProperty()->getObjectFlags()));
+                                                      cx->global(), nullptr, nfixed, 0));
     if (!shape)
         return false;
 
-    for (size_t i = 0; i < obj->layout().properties().length(); i++) {
-        const UnboxedLayout::Property &property = obj->layout().properties()[i];
-
-        if (!values.append(obj->getValue(property)))
-            return false;
+    for (size_t i = 0; i < layout.properties().length(); i++) {
+        const UnboxedLayout::Property &property = layout.properties()[i];
 
         StackShape unrootedChild(shape->base()->unowned(), NameToId(property.name), i,
                                  JSPROP_ENUMERATE, 0);
@@ -193,14 +236,80 @@
             return false;
     }
 
-    if (!SetClassAndProto(cx, obj, &PlainObject::class_, proto))
+    ObjectGroup *nativeGroup =
+        ObjectGroupCompartment::makeGroup(cx, &PlainObject::class_, proto,
+                                          group->flags() & OBJECT_FLAG_DYNAMIC_MASK);
+    if (!nativeGroup)
         return false;
 
-    RootedNativeObject nobj(cx, &obj->as<PlainObject>());
-    NativeObject::setLastPropertyMakeNative(cx, nobj, shape);
+    // Propagate all property types from the old group to the new group.
+    for (size_t i = 0; i < layout.properties().length(); i++) {
+        const UnboxedLayout::Property &property = layout.properties()[i];
+        jsid id = NameToId(property.name);
+
+        HeapTypeSet *typeProperty = group->maybeGetProperty(id);
+        TypeSet::TypeList types;
+        if (!typeProperty->enumerateTypes(&types))
+            return false;
+        MOZ_ASSERT(!types.empty());
+        for (size_t j = 0; j < types.length(); j++)
+            AddTypePropertyId(cx, nativeGroup, id, types[j]);
+        HeapTypeSet *nativeProperty = nativeGroup->maybeGetProperty(id);
+        if (nativeProperty->canSetDefinite(i))
+            nativeProperty->setDefinite(i);
+    }
+
+    layout.nativeGroup_ = nativeGroup;
+    layout.nativeShape_ = shape;
+    layout.replacementNewGroup_ = replacementNewGroup;
+
+    nativeGroup->setOriginalUnboxedGroup(group);
+
+    return true;
+}
+
+/* static */ bool
+UnboxedPlainObject::convertToNative(JSContext *cx, JSObject *obj)
+{
+    const UnboxedLayout &layout = obj->as<UnboxedPlainObject>().layout();
+
+    if (!layout.nativeGroup()) {
+        if (!UnboxedLayout::makeNativeGroup(cx, obj->group()))
+            return false;
+
+        // makeNativeGroup can reentrantly invoke this method.
+        if (obj->is<PlainObject>())
+            return true;
+    }
+
+    AutoValueVector values(cx);
+    for (size_t i = 0; i < layout.properties().length(); i++) {
+        if (!values.append(obj->as<UnboxedPlainObject>().getValue(layout.properties()[i])))
+            return false;
+    }
+
+    uint32_t objectFlags = obj->lastProperty()->getObjectFlags();
+    RootedObject metadata(cx, obj->getMetadata());
+
+    obj->setGroup(layout.nativeGroup());
+    obj->as<PlainObject>().setLastPropertyMakeNative(cx, layout.nativeShape());
 
     for (size_t i = 0; i < values.length(); i++)
-        nobj->initSlotUnchecked(i, values[i]);
+        obj->as<PlainObject>().initSlotUnchecked(i, values[i]);
+
+    if (objectFlags) {
+        RootedObject objRoot(cx, obj);
+        if (!obj->setFlags(cx, objectFlags))
+            return false;
+        obj = objRoot;
+    }
+
+    if (metadata) {
+        RootedObject objRoot(cx, obj);
+        RootedObject metadataRoot(cx, metadata);
+        if (!setMetadata(cx, objRoot, metadataRoot))
+            return false;
+    }
 
     return true;
 }
@@ -265,7 +374,7 @@
 UnboxedPlainObject::obj_defineProperty(JSContext *cx, HandleObject obj, HandleId id, HandleValue v,
                                        PropertyOp getter, StrictPropertyOp setter, unsigned attrs)
 {
-    if (!obj->as<UnboxedPlainObject>().convertToNative(cx))
+    if (!convertToNative(cx, obj))
         return false;
 
     return DefineProperty(cx, obj, id, v, getter, setter, attrs);
@@ -319,7 +428,7 @@
             if (obj->as<UnboxedPlainObject>().setValue(cx, *property, vp))
                 return true;
 
-            if (!obj->as<UnboxedPlainObject>().convertToNative(cx))
+            if (!convertToNative(cx, obj))
                 return false;
             return SetProperty(cx, obj, receiver, id, vp, strict);
         }
@@ -351,7 +460,7 @@
 UnboxedPlainObject::obj_deleteProperty(JSContext *cx, HandleObject obj, HandleId id,
                                        bool *succeeded)
 {
-    if (!obj->as<UnboxedPlainObject>().convertToNative(cx))
+    if (!convertToNative(cx, obj))
         return false;
     return DeleteProperty(cx, obj, id, succeeded);
 }
@@ -359,7 +468,7 @@
 /* static */ bool
 UnboxedPlainObject::obj_watch(JSContext *cx, HandleObject obj, HandleId id, HandleObject callable)
 {
-    if (!obj->as<UnboxedPlainObject>().convertToNative(cx))
+    if (!convertToNative(cx, obj))
         return false;
     return WatchProperty(cx, obj, id, callable);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/UnboxedObject.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/UnboxedObject.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/UnboxedObject.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/UnboxedObject.h	2015-02-28 15:03:08.000000000 +0000
@@ -65,9 +65,24 @@
     // structure as the trace list on a TypeDescr.
     int32_t *traceList_;
 
+    // If objects in this group have ever been converted to native objects,
+    // these store the corresponding native group and initial shape for such
+    // objects. Type information for this object is reflected in nativeGroup.
+    HeapPtrObjectGroup nativeGroup_;
+    HeapPtrShape nativeShape_;
+
+    // If nativeGroup is set and this object originally had a TypeNewScript,
+    // this points to the default 'new' group which replaced this one (and
+    // which might itself have been cleared since). This link is only needed to
+    // keep the replacement group from being GC'ed. If it were GC'ed and a new
+    // one regenerated later, that new group might have a different allocation
+    // kind from this group.
+    HeapPtrObjectGroup replacementNewGroup_;
+
   public:
     UnboxedLayout(const PropertyVector &properties, size_t size)
-      : size_(size), newScript_(nullptr), traceList_(nullptr)
+      : size_(size), newScript_(nullptr), traceList_(nullptr),
+        nativeGroup_(nullptr), nativeShape_(nullptr), replacementNewGroup_(nullptr)
     {
         properties_.appendAll(properties);
     }
@@ -113,11 +128,21 @@
         return size_;
     }
 
+    ObjectGroup *nativeGroup() const {
+        return nativeGroup_;
+    }
+
+    Shape *nativeShape() const {
+        return nativeShape_;
+    }
+
     inline gc::AllocKind getAllocKind() const;
 
     void trace(JSTracer *trc);
 
     size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf);
+
+    static bool makeNativeGroup(JSContext *cx, ObjectGroup *group);
 };
 
 // Class for a plain object using an unboxed representation. The physical
@@ -159,6 +184,10 @@
         return group()->unboxedLayout();
     }
 
+    const UnboxedLayout &layoutDontCheckGeneration() const {
+        return group()->unboxedLayoutDontCheckGeneration();
+    }
+
     uint8_t *data() {
         return &data_[0];
     }
@@ -166,8 +195,7 @@
     bool setValue(JSContext *cx, const UnboxedLayout::Property &property, const Value &v);
     Value getValue(const UnboxedLayout::Property &property);
 
-    bool convertToNative(JSContext *cx);
-
+    static bool convertToNative(JSContext *cx, JSObject *obj);
     static UnboxedPlainObject *create(JSContext *cx, HandleObjectGroup group, NewObjectKind newKind);
 
     static void trace(JSTracer *trc, JSObject *object);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Xdr.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Xdr.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Xdr.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Xdr.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -36,13 +36,13 @@
         newCapacity = MIN_CAPACITY;
     if (isUint32Overflow(newCapacity)) {
         js::gc::AutoSuppressGC suppressGC(cx());
-        JS_ReportErrorNumber(cx(), js_GetErrorMessage, nullptr, JSMSG_TOO_BIG_TO_ENCODE);
+        JS_ReportErrorNumber(cx(), GetErrorMessage, nullptr, JSMSG_TOO_BIG_TO_ENCODE);
         return false;
     }
 
     void *data = js_realloc(base, newCapacity);
     if (!data) {
-        js_ReportOutOfMemory(cx());
+        ReportOutOfMemory(cx());
         return false;
     }
     base = static_cast<uint8_t *>(data);
@@ -97,7 +97,7 @@
 
     if (mode == XDR_DECODE && bytecodeVer != XDR_BYTECODE_VERSION) {
         /* We do not provide binary compatibility with older scripts. */
-        JS_ReportErrorNumber(xdr->cx(), js_GetErrorMessage, nullptr, JSMSG_BAD_SCRIPT_MAGIC);
+        JS_ReportErrorNumber(xdr->cx(), GetErrorMessage, nullptr, JSMSG_BAD_SCRIPT_MAGIC);
         return false;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Xdr.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Xdr.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/src/vm/Xdr.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/src/vm/Xdr.h	2015-02-28 15:03:08.000000000 +0000
@@ -29,11 +29,11 @@
  *
  *  https://developer.mozilla.org/en-US/docs/SpiderMonkey/Internals/Bytecode
  */
-static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 233;
+static const uint32_t XDR_BYTECODE_VERSION_SUBTRAHEND = 238;
 static const uint32_t XDR_BYTECODE_VERSION =
     uint32_t(0xb973c0de - XDR_BYTECODE_VERSION_SUBTRAHEND);
 
-static_assert(JSErr_Limit == 368,
+static_assert(JSErr_Limit == 372,
               "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-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/loader/XPCOMUtils.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/loader/XPCOMUtils.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/loader/XPCOMUtils.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/loader/XPCOMUtils.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -290,7 +290,8 @@
           if (outer)
             throw Cr.NS_ERROR_NO_AGGREGATION;
           return (new component()).QueryInterface(iid);
-        }
+        },
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory])
       }
     }
     return factory;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/ExportHelpers.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/ExportHelpers.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/ExportHelpers.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/ExportHelpers.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -464,7 +464,7 @@
     RootedObject obj(cx);
     {
         JSAutoCompartment ac(cx, scope);
-        obj = JS_NewObject(cx, nullptr, scope);
+        obj = JS_NewPlainObject(cx);
         if (!obj)
             return false;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/Sandbox.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/Sandbox.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/Sandbox.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/Sandbox.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -30,11 +30,11 @@
 #include "Crypto.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BlobBinding.h"
-#include "mozilla/dom/CryptoBinding.h"
 #include "mozilla/dom/CSSBinding.h"
 #include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
 #include "mozilla/dom/FileBinding.h"
 #include "mozilla/dom/PromiseBinding.h"
+#include "mozilla/dom/RTCIdentityProviderRegistrar.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/TextDecoderBinding.h"
 #include "mozilla/dom/TextEncoderBinding.h"
@@ -229,11 +229,25 @@
 
     dom::Crypto* crypto = new dom::Crypto();
     crypto->Init(native);
-    JS::RootedObject wrapped(cx, dom::CryptoBinding::Wrap(cx, crypto));
+    JS::RootedObject wrapped(cx, crypto->WrapObject(cx));
     return JS_DefineProperty(cx, obj, "crypto", wrapped, JSPROP_ENUMERATE);
 }
 
 static bool
+SandboxCreateRTCIdentityProvider(JSContext *cx, JS::HandleObject obj)
+{
+    MOZ_ASSERT(JS_IsGlobalObject(obj));
+
+    nsCOMPtr<nsIGlobalObject> nativeGlobal = xpc::NativeGlobal(obj);
+    MOZ_ASSERT(nativeGlobal);
+
+    dom::RTCIdentityProviderRegistrar* registrar =
+            new dom::RTCIdentityProviderRegistrar(nativeGlobal);
+    JS::RootedObject wrapped(cx, registrar->WrapObject(cx));
+    return JS_DefineProperty(cx, obj, "rtcIdentityProvider", wrapped, JSPROP_ENUMERATE);
+}
+
+static bool
 SandboxIsProxy(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
@@ -564,14 +578,15 @@
 {
     // We forward the call to our underlying callable.
 
-    // The parent of our proxy is the SandboxProxyHandler proxy
-    RootedObject sandboxProxy(cx, JS_GetParent(proxy));
+    // Get our SandboxProxyHandler proxy.
+    RootedObject sandboxProxy(cx, getSandboxProxy(proxy));
     MOZ_ASSERT(js::IsProxy(sandboxProxy) &&
                js::GetProxyHandler(sandboxProxy) == &xpc::sandboxProxyHandler);
 
-    // The parent of the sandboxProxy is the sandbox global, and the
+    // The global of the sandboxProxy is the sandbox global, and the
     // target object is the original proto.
-    RootedObject sandboxGlobal(cx, JS_GetParent(sandboxProxy));
+    RootedObject sandboxGlobal(cx,
+      js::GetGlobalForObjectCrossCompartment(sandboxProxy));
     MOZ_ASSERT(IsSandbox(sandboxGlobal));
 
     // If our this object is the sandbox global, we call with this set to the
@@ -624,16 +639,21 @@
 {
     MOZ_ASSERT(JS::IsCallable(callable));
     // Our proxy is wrapping the callable.  So we need to use the
-    // callable as the private.  We use the given sandboxProtoProxy as
-    // the parent, and our call() hook depends on that.
+    // callable as the private.  We put the given sandboxProtoProxy in
+    // an extra slot, and our call() hook depends on that.
     MOZ_ASSERT(js::IsProxy(sandboxProtoProxy) &&
                js::GetProxyHandler(sandboxProtoProxy) ==
                  &xpc::sandboxProxyHandler);
 
     RootedValue priv(cx, ObjectValue(*callable));
-    return js::NewProxyObject(cx, &xpc::sandboxCallableProxyHandler,
-                              priv, nullptr,
-                              sandboxProtoProxy);
+    JSObject *obj = js::NewProxyObject(cx, &xpc::sandboxCallableProxyHandler,
+                                       priv, nullptr);
+    if (obj) {
+        js::SetProxyExtra(obj, SandboxCallableProxyHandler::SandboxProxySlot,
+                          ObjectValue(*sandboxProtoProxy));
+    }
+
+    return obj;
 }
 
 template<typename Op>
@@ -802,6 +822,8 @@
             File = true;
         } else if (!strcmp(name.ptr(), "crypto")) {
             crypto = true;
+        } else if (!strcmp(name.ptr(), "rtcIdentityProvider")) {
+            rtcIdentityProvider = true;
         } else {
             JS_ReportError(cx, "Unknown property name: %s", name.ptr());
             return false;
@@ -859,6 +881,9 @@
     if (crypto && !SandboxCreateCrypto(cx, obj))
         return false;
 
+    if (rtcIdentityProvider && !SandboxCreateRTCIdentityProvider(cx, obj))
+        return false;
+
     return true;
 }
 
@@ -947,7 +972,7 @@
                 // of this-binding for methods.
                 RootedValue priv(cx, ObjectValue(*options.proto));
                 options.proto = js::NewProxyObject(cx, &xpc::sandboxProxyHandler,
-                                                   priv, nullptr, sandbox);
+                                                   priv, nullptr);
                 if (!options.proto)
                     return NS_ERROR_OUT_OF_MEMORY;
             }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCJSRuntime.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCJSRuntime.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCJSRuntime.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCJSRuntime.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -1887,6 +1887,19 @@
         rtTotal += amount;                                                    \
     } while (0)
 
+// Report GC thing bytes.
+#define MREPORT_BYTES(_path, _kind, _amount, _desc)                           \
+    do {                                                                      \
+        size_t amount = _amount;  /* evaluate _amount only once */            \
+        nsresult rv;                                                          \
+        rv = cb->Callback(EmptyCString(), _path,                              \
+                          nsIMemoryReporter::_kind,                           \
+                          nsIMemoryReporter::UNITS_BYTES, amount,             \
+                          NS_LITERAL_CSTRING(_desc), closure);                \
+        NS_ENSURE_SUCCESS(rv, rv);                                            \
+        gcThingTotal += amount;                                               \
+    } while (0)
+
 MOZ_DEFINE_MALLOC_SIZE_OF(JSMallocSizeOf)
 
 namespace xpc {
@@ -1913,8 +1926,8 @@
         "Bookkeeping information and alignment padding within GC arenas.");
 
     ZCREPORT_GC_BYTES(pathPrefix + NS_LITERAL_CSTRING("unused-gc-things"),
-        zStats.unusedGCThings,
-        "Empty GC thing cells within non-empty arenas.");
+        zStats.unusedGCThings.totalSize(),
+        "Unused GC thing cells within non-empty arenas.");
 
     ZCREPORT_GC_BYTES(pathPrefix + NS_LITERAL_CSTRING("lazy-scripts/gc-heap"),
         zStats.lazyScriptsGCHeap,
@@ -2926,9 +2939,41 @@
         KIND_OTHER, rtStats.gcHeapUnusedArenas,
         "The same as 'explicit/js-non-window/gc-heap/unused-arenas'.");
 
-    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things"),
-        KIND_OTHER, rtStats.zTotals.unusedGCThings,
-        "The same as 'js-main-runtime/zones/unused-gc-things'.");
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/objects"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.object,
+        "Unused object cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/strings"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.string,
+        "Unused string cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/symbols"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.symbol,
+        "Unused symbol cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/shapes"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.shape,
+        "Unused shape cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/base-shapes"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.baseShape,
+        "Unused base shape cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/object-groups"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.objectGroup,
+        "Unused object group cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/scripts"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.script,
+        "Unused script cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/lazy-scripts"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.lazyScript,
+        "Unused lazy script cells within non-empty arenas.");
+
+    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/unused/gc-things/jitcode"),
+        KIND_OTHER, rtStats.zTotals.unusedGCThings.jitcode,
+        "Unused jitcode cells within non-empty arenas.");
 
     REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/chunk-admin"),
         KIND_OTHER, rtStats.gcHeapChunkAdmin,
@@ -2938,9 +2983,46 @@
         KIND_OTHER, rtStats.zTotals.gcHeapArenaAdmin,
         "The same as 'js-main-runtime/zones/gc-heap-arena-admin'.");
 
-    REPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things"),
-        KIND_OTHER, rtStats.gcHeapGCThings,
-        "GC things: objects, strings, scripts, etc.");
+    size_t gcThingTotal = 0;
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/objects"),
+        KIND_OTHER, rtStats.cTotals.classInfo.objectsGCHeap,
+        "Used object cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/strings"),
+        KIND_OTHER, rtStats.zTotals.stringInfo.sizeOfLiveGCThings(),
+        "Used string cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/symbols"),
+        KIND_OTHER, rtStats.zTotals.symbolsGCHeap,
+        "Used symbol cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/shapes"),
+        KIND_OTHER,
+        rtStats.cTotals.classInfo.shapesGCHeapTree + rtStats.cTotals.classInfo.shapesGCHeapDict,
+        "Used shape cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/base-shapes"),
+        KIND_OTHER, rtStats.cTotals.classInfo.shapesGCHeapBase,
+        "Used base shape cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/object-groups"),
+        KIND_OTHER, rtStats.zTotals.objectGroupsGCHeap,
+        "Used object group cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/scripts"),
+        KIND_OTHER, rtStats.cTotals.scriptsGCHeap,
+        "Used script cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/lazy-scripts"),
+        KIND_OTHER, rtStats.zTotals.lazyScriptsGCHeap,
+        "Used lazy script cells.");
+
+    MREPORT_BYTES(NS_LITERAL_CSTRING("js-main-runtime-gc-heap-committed/used/gc-things/jitcode"),
+        KIND_OTHER, rtStats.zTotals.jitCodesGCHeap,
+        "Used jitcode cells.");
+
+    MOZ_ASSERT(gcThingTotal == rtStats.gcHeapGCThings);
 
     // Report xpconnect.
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCMaps.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCMaps.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCMaps.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCMaps.h	2015-02-28 15:03:08.000000000 +0000
@@ -645,26 +645,6 @@
         }
     }
 
-    void Reparent(JSContext *aCx, JSObject *aNewInnerArg) {
-        JS::RootedObject aNewInner(aCx, aNewInnerArg);
-        for (Map::Enum e(mTable); !e.empty(); e.popFront()) {
-            /*
-             * We reparent wrappers that have as their parent an inner window
-             * whose outer has the new inner window as its current inner.
-             */
-            JS::RootedObject wrapper(aCx, e.front().value());
-            JS::RootedObject parent(aCx, JS_GetParent(wrapper));
-            JS::RootedObject outer(aCx, JS_ObjectToOuterObject(aCx, parent));
-            if (outer) {
-                JSObject *inner = JS_ObjectToInnerObject(aCx, outer);
-                if (inner == aNewInner && inner != parent)
-                    JS_SetParent(aCx, wrapper, aNewInner);
-            } else {
-                JS_ClearPendingException(aCx);
-            }
-        }
-    }
-
 private:
     JSObject2JSObjectMap() {}
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/xpcprivate.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/xpcprivate.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/xpcprivate.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/xpcprivate.h	2015-02-28 15:03:08.000000000 +0000
@@ -2234,7 +2234,7 @@
 
 private:
 
-    bool Init(JS::HandleObject parent, const XPCNativeScriptableCreateInfo* sci);
+    bool Init(const XPCNativeScriptableCreateInfo* sci);
     bool FinishInit();
 
     bool ExtendSet(XPCNativeInterface* aInterface);
@@ -3370,6 +3370,7 @@
     bool Blob : 1;
     bool File : 1;
     bool crypto : 1;
+    bool rtcIdentityProvider : 1;
 };
 
 // Infallible.
@@ -3479,8 +3480,7 @@
     { }
 
     JSObject *ToJSObject(JSContext *cx) {
-        JS::RootedObject global(cx, JS::CurrentGlobalOrNull(cx));
-        JS::RootedObject obj(cx, JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr(), global));
+        JS::RootedObject obj(cx, JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr()));
         if (!obj)
             return nullptr;
 
@@ -3758,27 +3758,6 @@
 
 nsresult HasInstance(JSContext *cx, JS::HandleObject objArg, const nsID *iid, bool *bp);
 
-/**
- * Define quick stubs on the given object, @a proto.
- *
- * @param cx
- *     A context.  Requires request.
- * @param proto
- *     The (newly created) prototype object for a DOM class.  The JS half
- *     of an XPCWrappedNativeProto.
- * @param flags
- *     Property flags for the quick stub properties--should be either
- *     JSPROP_ENUMERATE or 0.
- * @param interfaceCount
- *     The number of interfaces the class implements.
- * @param interfaceArray
- *     The interfaces the class implements; interfaceArray and
- *     interfaceCount are like what nsIClassInfo.getInterfaces returns.
- */
-bool
-DOM_DefineQuickStubs(JSContext *cx, JSObject *proto, uint32_t flags,
-                     uint32_t interfaceCount, const nsIID **interfaceArray);
-
 nsIPrincipal *GetObjectPrincipal(JSObject *obj);
 
 } // namespace xpc
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCShellImpl.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCShellImpl.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCShellImpl.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCShellImpl.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -535,25 +535,6 @@
 }
 
 static bool
-Parent(JSContext *cx, unsigned argc, jsval *vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-    if (args.length() != 1) {
-        JS_ReportError(cx, "Wrong number of arguments");
-        return false;
-    }
-
-    Value v = args[0];
-    if (v.isPrimitive()) {
-        JS_ReportError(cx, "Only objects have parents!");
-        return false;
-    }
-
-    args.rval().setObjectOrNull(JS_GetParent(&v.toObject()));
-    return true;
-}
-
-static bool
 Atob(JSContext *cx, unsigned argc, Value *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
@@ -655,7 +636,6 @@
     JS_FS("gczeal",          GCZeal,         1,0),
 #endif
     JS_FS("options",         Options,        0,0),
-    JS_FN("parent",          Parent,         1,0),
     JS_FS("sendCommand",     SendCommand,    1,0),
     JS_FS("atob",            Atob,           1,0),
     JS_FS("btoa",            Btoa,           1,0),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCThrower.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCThrower.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCThrower.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCThrower.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -100,7 +100,10 @@
     *  If there is a pending exception when the native call returns and
     *  it has the same error result as returned by the native call, then
     *  the native call may be passing through an error from a previous JS
-    *  call. So we'll just throw that exception into our JS.
+    *  call. So we'll just throw that exception into our JS.  Note that
+    *  we don't need to worry about NS_ERROR_UNCATCHABLE_EXCEPTION,
+    *  because presumably there would be no pending exception for that
+    *  nsresult!
     */
 
     if (CheckForPendingException(result, ccx))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCWrappedJSClass.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -592,7 +592,7 @@
     JSObject* result = CallQueryInterfaceOnJSObject(cx, aJSObj,
                                                     NS_GET_IID(nsISupports));
     if (!result)
-        return aJSObj;
+        result = aJSObj;
     JSObject* inner = js::UncheckedUnwrap(result);
     if (inner)
         return inner;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCWrappedJS.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCWrappedJS.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCWrappedJS.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCWrappedJS.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -161,6 +161,7 @@
 nsXPCWrappedJS::AggregatedQueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
     MOZ_ASSERT(IsAggregatedToNative(), "bad AggregatedQueryInterface call");
+    *aInstancePtr = nullptr;
 
     if (!IsValid())
         return NS_ERROR_UNEXPECTED;
@@ -182,10 +183,12 @@
 nsXPCWrappedJS::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
     if (nullptr == aInstancePtr) {
-        NS_PRECONDITION(0, "null pointer");
+        NS_PRECONDITION(false, "null pointer");
         return NS_ERROR_NULL_POINTER;
     }
 
+    *aInstancePtr = nullptr;
+
     if ( aIID.Equals(NS_GET_IID(nsXPCOMCycleCollectionParticipant)) ) {
         *aInstancePtr = NS_CYCLE_COLLECTION_PARTICIPANT(nsXPCWrappedJS);
         return NS_OK;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCWrappedNative.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCWrappedNative.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/src/XPCWrappedNative.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/src/XPCWrappedNative.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -352,8 +352,6 @@
 
     RootedObject parent(cx, Scope->GetGlobalJSObject());
 
-    RootedValue newParentVal(cx, NullValue());
-
     mozilla::Maybe<JSAutoCompartment> ac;
 
     if (sciWrapper.GetFlags().WantPreCreate()) {
@@ -367,14 +365,16 @@
         MOZ_ASSERT(!xpc::WrapperFactory::IsXrayWrapper(parent),
                    "Xray wrapper being used to parent XPCWrappedNative?");
 
+        MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(parent) == parent,
+                   "Non-global being used to parent XPCWrappedNative?");
+
         ac.emplace(static_cast<JSContext*>(cx), parent);
 
         if (parent != plannedParent) {
             XPCWrappedNativeScope* betterScope = ObjectScope(parent);
-            if (betterScope != Scope)
-                return GetNewOrUsed(helper, betterScope, Interface, resultWrapper);
-
-            newParentVal = OBJECT_TO_JSVAL(parent);
+            MOZ_ASSERT(betterScope != Scope,
+                       "How can we have the same scope for two different globals?");
+            return GetNewOrUsed(helper, betterScope, Interface, resultWrapper);
         }
 
         // Take the performance hit of checking the hashtable again in case
@@ -439,7 +439,7 @@
     // *seen* this happen.
     AutoMarkingWrappedNativePtr wrapperMarker(cx, wrapper);
 
-    if (!wrapper->Init(parent, &sciWrapper))
+    if (!wrapper->Init(&sciWrapper))
         return NS_ERROR_FAILURE;
 
     if (!wrapper->FindTearOff(Interface, false, &rv)) {
@@ -736,8 +736,7 @@
 }
 
 bool
-XPCWrappedNative::Init(HandleObject parent,
-                       const XPCNativeScriptableCreateInfo* sci)
+XPCWrappedNative::Init(const XPCNativeScriptableCreateInfo* sci)
 {
     AutoJSContext cx;
     // setup our scriptable info...
@@ -772,14 +771,18 @@
                jsclazz->convert &&
                jsclazz->finalize, "bad class");
 
+    // XXXbz JS_GetObjectPrototype wants an object, even though it then asserts
+    // that this object is same-compartment with cx, which means it could just
+    // use the cx global...
+    RootedObject global(cx, CurrentGlobalOrNull(cx));
     RootedObject protoJSObject(cx, HasProto() ?
                                    GetProto()->GetJSProtoObject() :
-                                   JS_GetObjectPrototype(cx, parent));
+                                   JS_GetObjectPrototype(cx, global));
     if (!protoJSObject) {
         return false;
     }
 
-    mFlatJSObject = JS_NewObjectWithGivenProto(cx, jsclazz, protoJSObject, parent);
+    mFlatJSObject = JS_NewObjectWithGivenProto(cx, jsclazz, protoJSObject);
     if (!mFlatJSObject) {
         mFlatJSObject.unsetFlags(FLAT_JS_OBJECT_VALID);
         return false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/chrome/test_bug484459.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/chrome/test_bug484459.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/chrome/test_bug484459.xul	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/chrome/test_bug484459.xul	2015-02-28 15:03:08.000000000 +0000
@@ -22,11 +22,13 @@
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
     SimpleTest.waitForExplicitFinish();
-
+    var url = "chrome://mochitests/content/chrome/js/xpconnect/tests/chrome/test_bug484459.xul";
     function go() {
       var w = $('ifr').contentWindow.wrappedJSObject;
       var sandbox = new Components.utils.Sandbox(w);
       sandbox.__proto__ = w;
+      ok(location.href, url, "location.href is set properly");
+      ok(w.location, "data:text/html,<script>var%20x=3</script>", "contents of w.location are correct");
       is(Components.utils.evalInSandbox("x * 4", sandbox), 12,
          "Unexpected return from the sandbox");
       SimpleTest.finish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/chrome/test_xrayToJS.xul	2015-02-28 15:03:08.000000000 +0000
@@ -177,7 +177,8 @@
   gPrototypeProperties['TypedArray'] =
     ["length", "buffer", "byteLength", "byteOffset", Symbol.iterator, "subarray",
      "set", "copyWithin", "find", "findIndex", "forEach","indexOf", "lastIndexOf", "reverse",
-     "join", "every", "some", "reduce", "reduceRight", "entries", "keys", "values"];
+     "join", "every", "some", "reduce", "reduceRight", "entries", "keys", "values", "slice",
+     "map", "filter"];
   if (isNightlyBuild) {
     gPrototypeProperties['TypedArray'].push('includes');
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/mochitest/chrome_wrappers_helper.html	2015-02-28 15:03:08.000000000 +0000
@@ -6,10 +6,6 @@
                 var utils = SpecialPowers.DOMWindowUtils;
                 ok(utils.getClassName(wrapper) === expected, note);
             }
-            function check_parent(ok, obj, expected, note) {
-                var utils = SpecialPowers.DOMWindowUtils;
-                ok(utils.getParent(obj) === expected, note);
-            }
             function run_test(ok, xpcnw, sjow) {
                 // both wrappers should point to our window: XOW
                 check_wrapper(ok, ok, "Proxy", "functions are wrapped properly")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/unit/test_rtcIdentityProvider.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/unit/test_rtcIdentityProvider.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/unit/test_rtcIdentityProvider.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/unit/test_rtcIdentityProvider.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,35 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function run_test() {
+  let Cu = Components.utils;
+  let sb = new Cu.Sandbox('https://www.example.com',
+                          { wantGlobalProperties: ['rtcIdentityProvider'] });
+
+  function exerciseInterface() {
+    equal(typeof rtcIdentityProvider, 'object');
+    equal(typeof rtcIdentityProvider.register, 'function');
+    rtcIdentityProvider.register({
+      generateAssertion: function(a, b, c) {
+        return Promise.resolve({
+          idp: { domain: 'example.com' },
+          assertion: JSON.stringify([a, b, c])
+        });
+      },
+      validateAssertion: function(d, e) {
+        return Promise.resolve({
+          identity: 'user@example.com',
+          contents: JSON.stringify([d, e])
+        });
+      }
+    });
+  }
+
+  sb.equal = equal;
+  Cu.evalInSandbox('(' + exerciseInterface.toSource() + ')();', sb);
+  ok(sb.rtcIdentityProvider.idp);
+
+  Cu.importGlobalProperties(['rtcIdentityProvider']);
+  exerciseInterface();
+  ok(rtcIdentityProvider.idp);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/unit/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/unit/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/tests/unit/xpcshell.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/tests/unit/xpcshell.ini	2015-02-28 15:03:08.000000000 +0000
@@ -93,6 +93,7 @@
 [test_URLSearchParams.js]
 [test_crypto.js]
 [test_css.js]
+[test_rtcIdentityProvider.js]
 [test_sandbox_atob.js]
 [test_isProxy.js]
 [test_getObjectPrincipal.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/WrapperFactory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/WrapperFactory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/WrapperFactory.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/WrapperFactory.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -78,9 +78,7 @@
     XPCWrappedNativeScope *scope = ObjectScope(obj);
 
     JSAutoCompartment ac(cx, obj);
-    JSObject *waiver = Wrapper::New(cx, obj,
-                                    JS_GetGlobalForObject(cx, obj),
-                                    &XrayWaiver);
+    JSObject *waiver = Wrapper::New(cx, obj, &XrayWaiver);
     if (!waiver)
         return nullptr;
 
@@ -382,8 +380,7 @@
 }
 
 JSObject *
-WrapperFactory::Rewrap(JSContext *cx, HandleObject existing, HandleObject obj,
-                       HandleObject parent)
+WrapperFactory::Rewrap(JSContext *cx, HandleObject existing, HandleObject obj)
 {
     MOZ_ASSERT(!IsWrapper(obj) ||
                GetProxyHandler(obj) == &XrayWaiver ||
@@ -504,7 +501,7 @@
     if (existing)
         return Wrapper::Renew(cx, existing, obj, wrapper);
 
-    return Wrapper::New(cx, obj, parent, wrapper);
+    return Wrapper::New(cx, obj, wrapper);
 }
 
 // Call WaiveXrayAndWrap when you have a JS object that you don't want to be
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/WrapperFactory.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/WrapperFactory.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/WrapperFactory.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/WrapperFactory.h	2015-02-28 15:03:08.000000000 +0000
@@ -46,8 +46,7 @@
     // Rewrap an object that is about to cross compartment boundaries.
     static JSObject *Rewrap(JSContext *cx,
                             JS::HandleObject existing,
-                            JS::HandleObject obj,
-                            JS::HandleObject parent);
+                            JS::HandleObject obj);
 
     // Wrap wrapped object into a waiver wrapper and then re-wrap it.
     static bool WaiveXrayAndWrap(JSContext *cx, JS::MutableHandleValue vp);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -744,10 +744,9 @@
 JSObject*
 JSXrayTraits::createHolder(JSContext *cx, JSObject *wrapper)
 {
-    RootedObject global(cx, JS_GetGlobalForObject(cx, wrapper));
     RootedObject target(cx, getTargetObject(wrapper));
     RootedObject holder(cx, JS_NewObjectWithGivenProto(cx, &HolderClass,
-                                                       JS::NullPtr(), global));
+                                                       JS::NullPtr()));
     if (!holder)
         return nullptr;
 
@@ -943,9 +942,9 @@
     }
 #endif
 
-    // Create the expando object. We parent it directly to the target object.
-    RootedObject expandoObject(cx, JS_NewObjectWithGivenProto(cx, &ExpandoObjectClass,
-                                                              JS::NullPtr(), target));
+    // Create the expando object.
+    RootedObject expandoObject(cx,
+      JS_NewObjectWithGivenProto(cx, &ExpandoObjectClass, JS::NullPtr()));
     if (!expandoObject)
         return nullptr;
 
@@ -1437,8 +1436,7 @@
 JSObject *
 XPCWrappedNativeXrayTraits::createHolder(JSContext *cx, JSObject *wrapper)
 {
-    RootedObject global(cx, JS_GetGlobalForObject(cx, wrapper));
-    return JS_NewObjectWithGivenProto(cx, &HolderClass, JS::NullPtr(), global);
+    return JS_NewObjectWithGivenProto(cx, &HolderClass, JS::NullPtr());
 }
 
 bool
@@ -1595,7 +1593,7 @@
     if (clasp->flags & JSCLASS_IS_DOMIFACEANDPROTOJSCLASS) {
         if (!clasp->call) {
             RootedValue v(cx, ObjectValue(*wrapper));
-            js_ReportIsNotFunction(cx, v);
+            js::ReportIsNotFunction(cx, v);
             return false;
         }
         // call it on the Xray compartment
@@ -1621,7 +1619,7 @@
     if (clasp->flags & JSCLASS_IS_DOMIFACEANDPROTOJSCLASS) {
         if (!clasp->construct) {
             RootedValue v(cx, ObjectValue(*wrapper));
-            js_ReportIsNotFunction(cx, v);
+            js::ReportIsNotFunction(cx, v);
             return false;
         }
         if (!clasp->construct(cx, args.length(), args.base()))
@@ -1658,8 +1656,7 @@
 JSObject*
 DOMXrayTraits::createHolder(JSContext *cx, JSObject *wrapper)
 {
-    RootedObject global(cx, JS_GetGlobalForObject(cx, wrapper));
-    return JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr(), global);
+    return JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
 }
 
 namespace XrayUtils {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/XrayWrapper.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/XrayWrapper.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/js/xpconnect/wrappers/XrayWrapper.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/js/xpconnect/wrappers/XrayWrapper.h	2015-02-28 15:03:08.000000000 +0000
@@ -12,6 +12,7 @@
 #include "WrapperFactory.h"
 
 #include "jswrapper.h"
+#include "js/Proxy.h"
 
 // Xray wrappers re-resolve the original native properties on the native
 // object and always directly access to those properties.
@@ -232,7 +233,7 @@
             return baseInstance.call(cx, wrapper, args);
 
         JS::RootedValue v(cx, JS::ObjectValue(*wrapper));
-        js_ReportIsNotFunction(cx, v);
+        js::ReportIsNotFunction(cx, v);
         return false;
     }
 
@@ -245,7 +246,7 @@
             return baseInstance.construct(cx, wrapper, args);
 
         JS::RootedValue v(cx, JS::ObjectValue(*wrapper));
-        js_ReportIsNotFunction(cx, v);
+        js::ReportIsNotFunction(cx, v);
         return false;
     }
 
@@ -351,7 +352,7 @@
                      const JS::CallArgs &args, const js::Wrapper& baseInstance)
     {
         JS::RootedValue v(cx, JS::ObjectValue(*wrapper));
-        js_ReportIsNotFunction(cx, v);
+        js::ReportIsNotFunction(cx, v);
         return false;
     }
 
@@ -359,7 +360,7 @@
                           const JS::CallArgs &args, const js::Wrapper& baseInstance)
     {
         JS::RootedValue v(cx, JS::ObjectValue(*wrapper));
-        js_ReportIsNotFunction(cx, v);
+        js::ReportIsNotFunction(cx, v);
         return false;
     }
 
@@ -386,8 +387,7 @@
 
     virtual JSObject* createHolder(JSContext *cx, JSObject *wrapper) MOZ_OVERRIDE
     {
-        JS::RootedObject global(cx, JS_GetGlobalForObject(cx, wrapper));
-        return JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr(), global);
+        return JS_NewObjectWithGivenProto(cx, nullptr, JS::NullPtr());
     }
 
     static OpaqueXrayTraits singleton;
@@ -527,6 +527,13 @@
 
     virtual bool call(JSContext *cx, JS::Handle<JSObject*> proxy,
                       const JS::CallArgs &args) const MOZ_OVERRIDE;
+
+    static const size_t SandboxProxySlot = 0;
+
+    static inline JSObject *getSandboxProxy(JS::Handle<JSObject*> proxy)
+    {
+        return &js::GetProxyExtra(proxy, SandboxProxySlot).toObject();
+    }
 };
 
 extern const SandboxCallableProxyHandler sandboxCallableProxyHandler;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/crashtests/1127198-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/crashtests/1127198-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/crashtests/1127198-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/crashtests/1127198-1.html	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,5 @@
+<style>.x { } .y { text-transform: uppercase; }</style><span id="I2">a<div id="I3">b</div></span><script>
+document.body.offsetTop;
+document.querySelector("span").className = "x";
+document.querySelector("div").className = "y";
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/crashtests/930381.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/crashtests/930381.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/crashtests/930381.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/crashtests/930381.html	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,122 @@
+<script>
+function fuzz(){
+  var a=document.getElementById('a');
+  var b=document.getElementById('b');
+  var pa=a.parentNode;
+  b.parentNode.replaceChild(a,b);
+  pa.appendChild(b);
+}
+</script>
+<big>
+<menu>
+<address>
+<optgroup label="a"></optgroup>
+"
+<blockquote>
+a
+<ruby>a</ruby>
+</address>
+<s dir="rtl">
+<section>
+<fieldset id="a"><iframe></iframe></fieldset>
+</section>
+<body onmouseover="fuzz()">
+<video id="b">
+
+<!--
+==21242==ERROR: AddressSanitizer: heap-use-after-free on address 0x61700022a21c at pc 0x7f0fe52bd9bc bp 0x7fff20ff6650 sp 0x7fff20ff6648
+READ of size 4 at 0x61700022a21c thread T0
+    #0 0x7f0fe52bd9bb (libxul.so!PresShell::DispatchSynthMouseMove(mozilla::WidgetGUIEvent*, bool)+0x1db)
+        Line 75 of "/builds/slave/m-in-l64-asan-0000000000000000/build/layout/base/RestyleManager.h"
+    #1 0x7f0fe52cc0c4 (libxul.so!PresShell::ProcessSynthMouseMoveEvent(bool)+0xde4)
+        Line 5256 of "/builds/slave/m-in-l64-asan-0000000000000000/build/layout/base/nsPresShell.cpp"
+    #2 0x7f0fe52f0547 (libxul.so!nsRefreshDriver::Tick(long, mozilla::TimeStamp)+0xbb7)
+        Line 1074 of "/builds/slave/m-in-l64-asan-0000000000000000/build/layout/base/nsRefreshDriver.cpp"
+    #3 0x7f0fe52f64e0 (libxul.so!mozilla::RefreshDriverTimer::Tick()+0x1f0)
+        Line 168 of "/builds/slave/m-in-l64-asan-0000000000000000/build/layout/base/nsRefreshDriver.cpp"
+    #4 0x7f0fe8de4c31 (libxul.so!nsTimerImpl::Fire()+0x6d1)
+        Line 546 of "/builds/slave/m-in-l64-asan-0000000000000000/build/xpcom/threads/nsTimerImpl.cpp"
+    #5 0x7f0fe8de52d6 (libxul.so!nsTimerEvent::Run()+0x66)
+        Line 630 of "/builds/slave/m-in-l64-asan-0000000000000000/build/xpcom/threads/nsTimerImpl.cpp"
+    #6 0x7f0fe8ddc019 (libxul.so!nsThread::ProcessNextEvent(bool, bool*)+0xaa9)
+        Line 622 of "/builds/slave/m-in-l64-asan-0000000000000000/build/xpcom/threads/nsThread.cpp"
+    #7 0x7f0fe8d08371 (libxul.so!NS_ProcessNextEvent(nsIThread*, bool)+0xb1)
+        Line 251 of "/builds/slave/m-in-l64-asan-0000000000000000/build/xpcom/glue/nsThreadUtils.cpp"
+    #8 0x7f0fe7955091 (libxul.so!mozilla::ipc::MessagePump::Run(base::MessagePump::Delegate*)+0x311)
+        Line 85 of "/builds/slave/m-in-l64-asan-0000000000000000/build/ipc/glue/MessagePump.cpp"
+    #9 0x7f0fe8ef7653 (libxul.so!MessageLoop::Run()+0x1c3)
+        Line 220 of "/builds/slave/m-in-l64-asan-0000000000000000/build/ipc/chromium/src/base/message_loop.cc"
+    #10 0x7f0fe7733cac (libxul.so!nsBaseAppShell::Run()+0x5c)
+        Line 161 of "/builds/slave/m-in-l64-asan-0000000000000000/build/widget/xpwidgets/nsBaseAppShell.cpp"
+    #11 0x7f0fe7135d9e (libxul.so!nsAppStartup::Run()+0xbe)
+        Line 268 of "/builds/slave/m-in-l64-asan-0000000000000000/build/toolkit/components/startup/nsAppStartup.cpp"
+    #12 0x7f0fe46bf1c5 (libxul.so!XREMain::XRE_mainRun()+0x1e05)
+        Line 3886 of "/builds/slave/m-in-l64-asan-0000000000000000/build/toolkit/xre/nsAppRunner.cpp"
+    #13 0x7f0fe46c00fa (libxul.so!XREMain::XRE_main(int, char**, nsXREAppData const*)+0x4fa)
+        Line 3954 of "/builds/slave/m-in-l64-asan-0000000000000000/build/toolkit/xre/nsAppRunner.cpp"
+    #14 0x7f0fe46c102b (libxul.so!XRE_main+0x3ab)
+        Line 4156 of "/builds/slave/m-in-l64-asan-0000000000000000/build/toolkit/xre/nsAppRunner.cpp"
+    #15 0x459d1d (firefox!main+0x94d)
+        Line 275 of "/builds/slave/m-in-l64-asan-0000000000000000/build/browser/app/nsBrowserApp.cpp"
+    #16 0x7f0ff3d5876c (libc.so.6!__libc_start_main+0xec)
+        Line 226 of "libc-start.c"
+    #17 0x45929c (firefox!_start+0x28)
+0x61700022a21c is located 28 bytes inside of 760-byte region [0x61700022a200,0x61700022a4f8)
+freed by thread T0 here:
+    #0 0x4461a5 (firefox!free+0x55)
+        Line 64 of "/builds/slave/moz-toolchain/src/llvm/projects/compiler-rt/lib/asan/asan_malloc_linux.cc"
+    #1 0x7f0fe529f118 (libxul.so!mozilla::RestyleManager::Release()+0x138)
+        Line 225 of "../../dist/include/mozilla/mozalloc.h"
+previously allocated by thread T0 here:
+    #0 0x4462e5 (firefox!malloc+0x55)
+        Line 74 of "/builds/slave/moz-toolchain/src/llvm/projects/compiler-rt/lib/asan/asan_malloc_linux.cc"
+    #1 0x7f0feddfe5c8 (libmozalloc.so!moz_xmalloc+0x8)
+        Line 54 of "/builds/slave/m-in-l64-asan-0000000000000000/build/memory/mozalloc/mozalloc.cpp"
+    #2 0x7f0fe5230421 (libxul.so!nsDocumentViewer::InitInternal(nsIWidget*, nsISupports*, nsIntRect const&, bool, bool, bool)+0x581)
+        Line 824 of "/builds/slave/m-in-l64-asan-0000000000000000/build/layout/base/nsDocumentViewer.cpp"
+    #3 0x7f0fe522fe90 (libxul.so!nsDocumentViewer::Init(nsIWidget*, nsIntRect const&)+0x20)
+        Line 642 of "/builds/slave/m-in-l64-asan-0000000000000000/build/layout/base/nsDocumentViewer.cpp"
+    #4 0x7f0fe929f537 (libxul.so!nsDocShell::Embed(nsIContentViewer*, char const*, nsISupports*)+0xe7)
+        Line 6397 of "/builds/slave/m-in-l64-asan-0000000000000000/build/docshell/base/nsDocShell.cpp"
+    #5 0x7f0fe92b14f4 (libxul.so!nsDocShell::CreateContentViewer(char const*, nsIRequest*, nsIStreamListener**)+0x1084)
+        Line 8173 of "/builds/slave/m-in-l64-asan-0000000000000000/build/docshell/base/nsDocShell.cpp"
+    #6 0x7f0fe9254ad4 (libxul.so!nsDSURIContentListener::DoContent(char const*, bool, nsIRequest*, nsIStreamListener**, bool*)+0x304)
+        Line 122 of "/builds/slave/m-in-l64-asan-0000000000000000/build/docshell/base/nsDSURIContentListener.cpp"
+    #7 0x7f0fe92f698f (libxul.so!nsDocumentOpenInfo::TryContentListener(nsIURIContentListener*, nsIChannel*)+0x6ef)
+        Line 680 of "/builds/slave/m-in-l64-asan-0000000000000000/build/uriloader/base/nsURILoader.cpp"
+    #8 0x7f0fe92f433c (libxul.so!nsDocumentOpenInfo::DispatchContent(nsIRequest*, nsISupports*)+0x67c)
+        Line 382 of "/builds/slave/m-in-l64-asan-0000000000000000/build/uriloader/base/nsURILoader.cpp"
+    #9 0x7f0fe92f3aaf (libxul.so!nsDocumentOpenInfo::OnStartRequest(nsIRequest*, nsISupports*)+0x32f)
+        Line 258 of "/builds/slave/m-in-l64-asan-0000000000000000/build/uriloader/base/nsURILoader.cpp"
+    #10 0x7f0fe4964bc2 (libxul.so!nsBaseChannel::OnStartRequest(nsIRequest*, nsISupports*)+0x1e2)
+        Line 718 of "/builds/slave/m-in-l64-asan-0000000000000000/build/netwerk/base/src/nsBaseChannel.cpp"
+Shadow bytes around the buggy address:
+  0x0c2e8003d3f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x0c2e8003d400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x0c2e8003d410: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x0c2e8003d420: 00 fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+  0x0c2e8003d430: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+=>0x0c2e8003d440: fd fd fd[fd]fd fd fd fd fd fd fd fd fd fd fd fd
+  0x0c2e8003d450: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd
+  0x0c2e8003d460: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd
+  0x0c2e8003d470: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd
+  0x0c2e8003d480: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd
+  0x0c2e8003d490: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fa
+Shadow byte legend (one shadow byte represents 8 application bytes):
+  Addressable:           00
+  Partially addressable: 01 02 03 04 05 06 07
+  Heap left redzone:     fa
+  Heap right redzone:    fb
+  Freed heap region:     fd
+  Stack left redzone:    f1
+  Stack mid redzone:     f2
+  Stack right redzone:   f3
+  Stack partial redzone: f4
+  Stack after return:    f5
+  Stack use after scope: f8
+  Global redzone:        f9
+  Global init order:     f6
+  Poisoned by user:      f7
+  ASan internal:         fe
+==21242==ABORTING
+-->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/crashtests/crashtests.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/crashtests/crashtests.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/crashtests/crashtests.list	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/crashtests/crashtests.list	2015-02-28 15:03:08.000000000 +0000
@@ -433,7 +433,7 @@
 load 836990-1.html
 load 840480.html
 load 847242.html
-load 852293.html
+pref(layers.progressive-paint,false) pref(layers.low-precision-buffer,false) load 852293.html
 load 860579-1.html
 pref(layers.force-active,true) load 859526-1.html
 pref(layers.force-active,true) load 859630-1.html
@@ -444,6 +444,7 @@
 asserts-if(Android,2) asserts-if(!Android,4-6) load 898913.html # bug 847368
 pref(layers.acceleration.disabled,true) pref(layers.force-active,true) load 919434.html
 pref(layout.css.sticky.enabled,true) load 926728.html
+load 930381.html
 load 931464.html
 load 936988-1.html
 load 931450.html
@@ -456,3 +457,4 @@
 load 1061028.html
 load 1116104.html
 load 1107508-1.html
+load 1127198-1.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/DisplayItemClip.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/DisplayItemClip.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/DisplayItemClip.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/DisplayItemClip.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -21,9 +21,7 @@
 void
 DisplayItemClip::SetTo(const nsRect& aRect)
 {
-  mHaveClipRect = true;
-  mClipRect = aRect;
-  mRoundedClipRects.Clear();
+  SetTo(aRect, nullptr);
 }
 
 void
@@ -31,9 +29,13 @@
 {
   mHaveClipRect = true;
   mClipRect = aRect;
-  mRoundedClipRects.SetLength(1);
-  mRoundedClipRects[0].mRect = aRect;
-  memcpy(mRoundedClipRects[0].mRadii, aRadii, sizeof(nscoord)*8);
+  if (aRadii) {
+    mRoundedClipRects.SetLength(1);
+    mRoundedClipRects[0].mRect = aRect;
+    memcpy(mRoundedClipRects[0].mRadii, aRadii, sizeof(nscoord)*8);
+  } else {
+    mRoundedClipRects.Clear();
+  }
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/FrameLayerBuilder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/FrameLayerBuilder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/FrameLayerBuilder.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/FrameLayerBuilder.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -243,6 +243,56 @@
 }
 
 /**
+ * A wrapper for nsIntRegion that can express infinite regions.
+ */
+struct PossiblyInfiniteRegion
+{
+  PossiblyInfiniteRegion() : mIsInfinite(false) {}
+  MOZ_IMPLICIT PossiblyInfiniteRegion(const nsIntRegion& aRegion)
+   : mRegion(aRegion)
+   , mIsInfinite(false)
+  {}
+  MOZ_IMPLICIT PossiblyInfiniteRegion(const nsIntRect& aRect)
+   : mRegion(aRect)
+   , mIsInfinite(false)
+  {}
+
+  // Create an infinite region.
+  static PossiblyInfiniteRegion InfiniteRegion()
+  {
+    PossiblyInfiniteRegion r;
+    r.mIsInfinite = true;
+    return r;
+  }
+
+  bool IsInfinite() const { return mIsInfinite; }
+  bool Intersects(const nsIntRegion& aRegion) const
+  {
+    if (IsInfinite()) {
+      return true;
+    }
+    return !mRegion.Intersect(aRegion).IsEmpty();
+  }
+
+  void AccumulateAndSimplifyOutward(const PossiblyInfiniteRegion& aRegion)
+  {
+    if (!IsInfinite()) {
+      if (aRegion.IsInfinite()) {
+        mIsInfinite = true;
+        mRegion.SetEmpty();
+      } else {
+        mRegion.OrWith(aRegion.mRegion);
+        mRegion.SimplifyOutward(8);
+      }
+    }
+  }
+
+protected:
+  nsIntRegion mRegion;
+  bool mIsInfinite;
+};
+
+/**
  * We keep a stack of these to represent the PaintedLayers that are
  * currently available to have display items added to.
  * We use a stack here because as much as possible we want to
@@ -268,8 +318,7 @@
     mOpaqueForAnimatedGeometryRootParent(false),
     mImage(nullptr),
     mCommonClipCount(-1),
-    mNewChildLayersIndex(-1),
-    mAllDrawingAbove(false)
+    mNewChildLayersIndex(-1)
   {}
 
 #ifdef MOZ_DUMP_PAINTING
@@ -291,12 +340,6 @@
    * Record that an item has been added to the PaintedLayer, so we
    * need to update our regions.
    * @param aVisibleRect the area of the item that's visible
-   * @param aDrawRect the area of the item that would be drawn if it
-   * was completely visible
-   * @param aOpaqueRect if non-null, the area of the item that's opaque.
-   * We pass in a separate opaque rect because the opaque rect can be
-   * bigger than the visible rect, and we want to have the biggest
-   * opaque rect that we can.
    * @param aSolidColor if non-null, the visible area of the item is
    * a constant color given by *aSolidColor
    */
@@ -304,7 +347,6 @@
                   nsDisplayItem* aItem,
                   const nsIntRegion& aClippedOpaqueRegion,
                   const nsIntRect& aVisibleRect,
-                  const nsIntRect& aDrawRect,
                   const DisplayItemClip& aClip);
   const nsIFrame* GetAnimatedGeometryRoot() { return mAnimatedGeometryRoot; }
 
@@ -328,76 +370,17 @@
    */
   already_AddRefed<ImageContainer> CanOptimizeImageLayer(nsDisplayListBuilder* aBuilder);
 
-  void AddDrawAboveRegion(const nsIntRegion& aAbove)
-  {
-    if (!mAllDrawingAbove) {
-      mDrawAboveRegion.Or(mDrawAboveRegion, aAbove);
-      mDrawAboveRegion.SimplifyOutward(8);
-    }
-  }
-
-  void AddVisibleAboveRegion(const nsIntRegion& aAbove)
-  {
-    if (!mAllDrawingAbove) {
-      mVisibleAboveRegion.Or(mVisibleAboveRegion, aAbove);
-      mVisibleAboveRegion.SimplifyOutward(8);
-    }
-  }
-
-  void CopyAboveRegion(PaintedLayerData* aOther)
-  {
-    // If aOther has a draw region and is subject to async transforms then the
-    // layer can potentially be moved arbitrarily on the compositor. So we
-    // should avoid moving display items from on top of the layer to below the
-    // layer, which we do by calling SetAllDrawingAbove. Note that if the draw
-    // region is empty (such as when aOther has only event-regions items) then
-    // we don't need to do this.
-    bool aOtherCanDrawAnywhere = aOther->IsSubjectToAsyncTransforms()
-                              && !aOther->mDrawRegion.IsEmpty();
-
-    if (aOther->mAllDrawingAbove || mAllDrawingAbove || aOtherCanDrawAnywhere) {
-      SetAllDrawingAbove();
-    } else {
-      mVisibleAboveRegion.Or(mVisibleAboveRegion, aOther->mVisibleAboveRegion);
-      mVisibleAboveRegion.Or(mVisibleAboveRegion, aOther->mVisibleRegion);
-      mVisibleAboveRegion.SimplifyOutward(8);
-      mDrawAboveRegion.Or(mDrawAboveRegion, aOther->mDrawAboveRegion);
-      mDrawAboveRegion.Or(mDrawAboveRegion, aOther->mDrawRegion);
-      mDrawAboveRegion.SimplifyOutward(8);
-    }
-  }
-
-  void SetAllDrawingAbove()
-  {
-    mAllDrawingAbove = true;
-    mDrawAboveRegion.SetEmpty();
-    mVisibleAboveRegion.SetEmpty();
-  }
-
-  bool DrawAboveRegionIntersects(const nsIntRect& aRect)
-  {
-    return mAllDrawingAbove || mDrawAboveRegion.Intersects(aRect);
-  }
-
-  bool DrawRegionIntersects(const nsIntRect& aRect)
+  bool VisibleAboveRegionIntersects(const nsIntRegion& aRegion) const
   {
-    return IsSubjectToAsyncTransforms() || mDrawRegion.Intersects(aRect);
+    return mVisibleAboveRegion.Intersects(aRegion);
   }
 
-  bool IntersectsVisibleAboveRegion(const nsIntRegion& aVisibleRegion)
+  bool VisibleRegionIntersects(const nsIntRect& aRect) const
   {
-    if (mAllDrawingAbove) {
-      return true;
-    }
-    nsIntRegion visibleAboveIntersection;
-    visibleAboveIntersection.And(mVisibleAboveRegion, aVisibleRegion);
-    if (visibleAboveIntersection.IsEmpty()) {
-      return false;
-    }
-    return true;
+    return IsSubjectToAsyncTransforms() || mVisibleRegion.Intersects(aRect);
   }
 
-  bool IsSubjectToAsyncTransforms()
+  bool IsSubjectToAsyncTransforms() const
   {
     return mFixedPosFrameForLayerData != nullptr
         || mIsAsyncScrollable;
@@ -410,13 +393,6 @@
    */
   nsIntRegion  mVisibleRegion;
   /**
-   * The region containing the bounds of all display items in the layer,
-   * regardless of visbility.
-   * Same coordinate system as mVisibleRegion.
-   * This is a conservative approximation: it contains the true region.
-   */
-  nsIntRegion  mDrawRegion;
-  /**
    * The region of visible content in the layer that is opaque.
    * Same coordinate system as mVisibleRegion.
    */
@@ -532,8 +508,6 @@
    * The union of all the bounds of the display items in this layer.
    */
   nsIntRect mBounds;
-
-private:
   /**
    * The region of visible content above the layer and below the
    * next PaintedLayerData currently in the stack, if any. Note that not
@@ -541,21 +515,7 @@
    * Same coordinate system as mVisibleRegion.
    * This is a conservative approximation: it contains the true region.
    */
-  nsIntRegion  mVisibleAboveRegion;
-  /**
-   * The region containing the bounds of all display items (regardless
-   * of visibility) in the layer and below the next PaintedLayerData
-   * currently in the stack, if any.
-   * Note that not all PaintedLayers for the container are in the
-   * PaintedLayerData stack.
-   * Same coordinate system as mVisibleRegion.
-   */
-  nsIntRegion  mDrawAboveRegion;
-  /**
-   * True if mDrawAboveRegion and mVisibleAboveRegion should be treated
-   * as infinite, and all display items should be considered 'above' this layer.
-   */
-  bool mAllDrawingAbove;
+  PossiblyInfiniteRegion mVisibleAboveRegion;
 
 };
 
@@ -614,7 +574,8 @@
                  const nsRect& aContainerBounds,
                  ContainerLayer* aContainerLayer,
                  const ContainerLayerParameters& aParameters,
-                 bool aFlattenToSingleLayer) :
+                 bool aFlattenToSingleLayer,
+                 nscolor aBackgroundColor) :
     mBuilder(aBuilder), mManager(aManager),
     mLayerBuilder(aLayerBuilder),
     mContainerFrame(aContainerFrame),
@@ -622,6 +583,7 @@
     mContainerBounds(aContainerBounds),
     mParameters(aParameters),
     mNextFreeRecycledPaintedLayer(0),
+    mContainerUniformBackgroundColor(aBackgroundColor),
     mFlattenToSingleLayer(aFlattenToSingleLayer)
   {
     nsPresContext* presContext = aContainerFrame->PresContext();
@@ -772,18 +734,19 @@
                                 PaintedLayer* aNewLayer);
 
   /**
-   * Try to determine whether the PaintedLayer at aPaintedLayerIndex
+   * Try to determine whether a layer with visible region aTargetVisibleRegion
    * has a single opaque color behind it, over the entire bounds of its visible
-   * region.
-   * If successful, return that color, otherwise return NS_RGBA(0,0,0,0).
+   * region. The target layer is assumed to be on top of all thebes layers in
+   * the thebes layer data stack that have a stack index < aUnderPaintedLayerIndex.
+   * If successful, return the color, otherwise return NS_RGBA(0,0,0,0).
+   * aTargetVisibleRegion is relative to the the container reference frame.
    */
-  nscolor FindOpaqueBackgroundColorFor(int32_t aPaintedLayerIndex);
+  nscolor FindOpaqueBackgroundColorFor(const nsIntRegion& aTargetVisibleRegion,
+                                       int32_t aUnderPaintedLayerIndex);
   /**
    * Find the fixed-pos frame, if any, containing (or equal to)
    * aAnimatedGeometryRoot. Only return a fixed-pos frame if its viewport
-   * has a displayport. Updates *aVisibleRegion to be the intersection of
-   * aDrawRegion and the displayport, and updates *aIsSolidColorInVisibleRegion
-   * (if non-null) to false if the visible region grows.
+   * has a displayport.
    * aDisplayItemFixedToViewport is true if the layer contains a single display
    * item which returned true for ShouldFixToViewport.
    * This can return the actual viewport frame for layers whose display items
@@ -791,10 +754,6 @@
    */
   const nsIFrame* FindFixedPosFrameForLayerData(const nsIFrame* aAnimatedGeometryRoot,
                                                 bool aDisplayItemFixedToViewport);
-  void AdjustLayerDataForFixedPositioning(const nsIFrame* aFixedPosFrame,
-                                          const nsIntRegion& aDrawRegion,
-                                          nsIntRegion* aVisibleRegion,
-                                          bool* aIsSolidColorInVisibleRegion = nullptr);
   /**
    * Set fixed-pos layer metadata on aLayer according to the data for aFixedPosFrame.
    */
@@ -901,6 +860,31 @@
   bool ChooseAnimatedGeometryRoot(const nsDisplayList& aList,
                                   const nsIFrame **aAnimatedGeometryRoot);
 
+  /**
+   * When adding a new layer above the topmost PaintedLayerData layer in our
+   * PaintedLayerDataStack, update the visible above region of the topmost
+   * PaintedLayerData item.
+   * @param aVisibleRect   The visible rect of the newly-added display item
+   * @param aCanMoveFreely Whether the visible area of the item can change
+   *                       without new layer building.
+   * @param aClipRectIfAny A clip rect, if the layer is clipped, or nullptr.
+   */
+  void UpdateVisibleAboveRegionForNewItem(const nsIntRect& aVisibleRect,
+                                          bool aCanMoveFreely,
+                                          const nsIntRect* aClipRectIfAny);
+
+  /**
+   * When popping aData from the PaintedLayerDataStack, update the next
+   * PaintedLayerData item's visible above region to take the popped layer
+   * into account.
+   * @param aData                 The layer data that is getting popped from
+   *                              the stack.
+   * @param aNextPaintedLayerData The next lower item in the stack, or nullptr
+   *                              if there is none.
+   */
+  void UpdateVisibleAboveRegionOnPop(PaintedLayerData* aData,
+                                     PaintedLayerData* aNextPaintedLayerData);
+
   nsDisplayListBuilder*            mBuilder;
   LayerManager*                    mManager;
   FrameLayerBuilder*               mLayerBuilder;
@@ -932,8 +916,20 @@
   nsTArray<nsRefPtr<PaintedLayer> > mRecycledPaintedLayers;
   nsDataHashtable<nsPtrHashKey<Layer>, nsRefPtr<ImageLayer> >
     mRecycledMaskImageLayers;
+  /**
+   * The visible region of all visible content in this container layer under
+   * first PaintedLayerData layer in the PaintedLayerDataStack.
+   */
+  PossiblyInfiniteRegion           mVisibleAboveBackgroundRegion;
   uint32_t                         mNextFreeRecycledPaintedLayer;
   nscoord                          mAppUnitsPerDevPixel;
+  /**
+   * The uniform opaque color from behind this container layer, or
+   * NS_RGBA(0,0,0,0) if the background behind this container layer is not
+   * uniform and opaque. This color can be pulled into ThebesLayers that are
+   * directly above the background.
+   */
+  nscolor                          mContainerUniformBackgroundColor;
   bool                             mSnappingEnabled;
   bool                             mFlattenToSingleLayer;
   /**
@@ -1886,19 +1882,19 @@
 }
 
 nscolor
-ContainerState::FindOpaqueBackgroundColorFor(int32_t aPaintedLayerIndex)
+ContainerState::FindOpaqueBackgroundColorFor(const nsIntRegion& aTargetVisibleRegion,
+                                             int32_t aUnderPaintedLayerIndex)
 {
-  PaintedLayerData* target = mPaintedLayerDataStack[aPaintedLayerIndex];
-  for (int32_t i = aPaintedLayerIndex - 1; i >= 0; --i) {
+  for (int32_t i = aUnderPaintedLayerIndex - 1; i >= 0; --i) {
     PaintedLayerData* candidate = mPaintedLayerDataStack[i];
-    if (candidate->IntersectsVisibleAboveRegion(target->mVisibleRegion)) {
+    if (candidate->VisibleAboveRegionIntersects(aTargetVisibleRegion)) {
       // Some non-PaintedLayer content between target and candidate; this is
       // hopeless
-      break;
+      return NS_RGBA(0,0,0,0);
     }
 
     nsIntRegion intersection;
-    intersection.And(candidate->mVisibleRegion, target->mVisibleRegion);
+    intersection.And(candidate->mVisibleRegion, aTargetVisibleRegion);
     if (intersection.IsEmpty()) {
       // The layer doesn't intersect our target, ignore it and move on
       continue;
@@ -1906,7 +1902,7 @@
 
     // The candidate intersects our target. If any layer has a solid-color
     // area behind our target, this must be it. Scan its display items.
-    nsIntRect deviceRect = target->mVisibleRegion.GetBounds();
+    nsIntRect deviceRect = aTargetVisibleRegion.GetBounds();
     nsRect appUnitRect = deviceRect.ToAppUnits(mAppUnitsPerDevPixel);
     appUnitRect.ScaleInverseRoundOut(mParameters.mXScale, mParameters.mYScale);
 
@@ -1923,7 +1919,7 @@
           continue;
 
         if (!snappedBounds.Contains(deviceRect))
-          break;
+          return NS_RGBA(0,0,0,0);
 
       } else {
         // The layer's visible rect is already (close enough to) pixel
@@ -1932,7 +1928,7 @@
           continue;
 
         if (!bounds.Contains(appUnitRect))
-          break;
+          return NS_RGBA(0,0,0,0);
       }
 
       if (item->IsInvisibleInRect(appUnitRect)) {
@@ -1943,18 +1939,21 @@
                                                mParameters.mXScale,
                                                mParameters.mYScale,
                                                mAppUnitsPerDevPixel)) {
-        break;
+        return NS_RGBA(0,0,0,0);
       }
 
       nscolor color;
       if (item->IsUniform(mBuilder, &color) && NS_GET_A(color) == 255)
         return color;
 
-      break;
+      return NS_RGBA(0,0,0,0);
     }
-    break;
   }
-  return NS_RGBA(0,0,0,0);
+  if (mVisibleAboveBackgroundRegion.Intersects(aTargetVisibleRegion)) {
+    // Some non-Thebes content is between container background and target.
+    return NS_RGBA(0,0,0,0);
+  }
+  return mContainerUniformBackgroundColor;
 }
 
 void
@@ -2017,52 +2016,6 @@
 }
 
 void
-ContainerState::AdjustLayerDataForFixedPositioning(const nsIFrame* aFixedPosFrame,
-                                                   const nsIntRegion& aDrawRegion,
-                                                   nsIntRegion* aVisibleRegion,
-                                                   bool* aIsSolidColorInVisibleRegion)
-{
-  if (!aFixedPosFrame) {
-    return;
-  }
-
-  nsRect fixedVisibleRect;
-  nsPresContext* presContext = aFixedPosFrame->PresContext();
-  nsIPresShell* presShell = presContext->PresShell();
-  DebugOnly<bool> hasDisplayPort =
-    nsLayoutUtils::ViewportHasDisplayPort(presContext, &fixedVisibleRect);
-  NS_ASSERTION(hasDisplayPort, "No fixed-pos layer data if there's no displayport");
-  // Display ports are relative to the viewport, convert it to be relative
-  // to our reference frame.
-  nsIFrame* viewport = presShell->GetRootFrame();
-  if (aFixedPosFrame != viewport) {
-    // position: fixed items are reflowed into and only drawn inside the
-    // viewport, or the scroll position clamping scrollport size, if one is
-    // set. We differentiate background-attachment: fixed items from
-    // position: fixed items by the fact that background-attachment: fixed
-    // items use the viewport as their aFixedPosFrame.
-    NS_ASSERTION(aFixedPosFrame->StyleDisplay()->mPosition == NS_STYLE_POSITION_FIXED,
-      "should be position fixed items only");
-    fixedVisibleRect.MoveTo(0, 0);
-    if (presShell->IsScrollPositionClampingScrollPortSizeSet()) {
-      fixedVisibleRect.SizeTo(presShell->GetScrollPositionClampingScrollPortSize());
-    } else {
-      fixedVisibleRect.SizeTo(viewport->GetSize());
-    }
-  }
-  fixedVisibleRect += viewport->GetOffsetToCrossDoc(mContainerReferenceFrame);
-  nsIntRegion newVisibleRegion;
-  newVisibleRegion.And(ScaleToOutsidePixels(fixedVisibleRect, false),
-                       aDrawRegion);
-  if (!aVisibleRegion->Contains(newVisibleRegion)) {
-    if (aIsSolidColorInVisibleRegion) {
-      *aIsSolidColorInVisibleRegion = false;
-    }
-    *aVisibleRegion = newVisibleRegion;
-  }
-}
-
-void
 ContainerState::SetFixedPositionLayerData(Layer* aLayer,
                                           const nsIFrame* aFixedPosFrame)
 {
@@ -2141,11 +2094,6 @@
   int32_t lastIndex = mPaintedLayerDataStack.Length() - 1;
   PaintedLayerData* data = mPaintedLayerDataStack[lastIndex];
 
-  AdjustLayerDataForFixedPositioning(data->mFixedPosFrameForLayerData,
-                                     data->mDrawRegion,
-                                     &data->mVisibleRegion,
-                                     &data->mIsSolidColorInVisibleRegion);
-
   NewLayerEntry* newLayerEntry = &mNewChildLayers[data->mNewChildLayersIndex];
   nsRefPtr<Layer> layer;
   nsRefPtr<ImageContainer> imageContainer = data->CanOptimizeImageLayer(mBuilder);
@@ -2248,7 +2196,7 @@
   if (layer == data->mLayer) {
     nscolor backgroundColor = NS_RGBA(0,0,0,0);
     if (!isOpaque) {
-      backgroundColor = FindOpaqueBackgroundColorFor(lastIndex);
+      backgroundColor = FindOpaqueBackgroundColorFor(data->mVisibleRegion, lastIndex);
       if (NS_GET_A(backgroundColor) == 255) {
         isOpaque = true;
       }
@@ -2360,13 +2308,13 @@
     layer->SetEventRegions(regions);
   }
 
-  if (lastIndex > 0) {
-    // Since we're going to pop off the last PaintedLayerData, the
-    // mVisibleAboveRegion of the second-to-last item will need to include
-    // the regions of the last item.
-    PaintedLayerData* nextData = mPaintedLayerDataStack[lastIndex - 1];
-    nextData->CopyAboveRegion(data);
-  }
+  // Since we're going to pop off the last PaintedLayerData, the
+  // mVisibleAboveRegion of the second-to-last item will need to include
+  // the regions of the last item. If we're emptying the PaintedLayerDataStack,
+  // we instead need to accumulate the regions into the container's
+  // mVisibleAboveBackgroundRegion.
+  UpdateVisibleAboveRegionOnPop(data,
+    lastIndex > 0 ? mPaintedLayerDataStack[lastIndex - 1].get() : nullptr);
 
   mPaintedLayerDataStack.RemoveElementAt(lastIndex);
 }
@@ -2395,7 +2343,6 @@
                             nsDisplayItem* aItem,
                             const nsIntRegion& aClippedOpaqueRegion,
                             const nsIntRect& aVisibleRect,
-                            const nsIntRect& aDrawRect,
                             const DisplayItemClip& aClip)
 {
   FLB_LOG_PAINTED_LAYER_DECISION(this, "Accumulating dp=%s(%p), f=%p against pld=%p\n", aItem->Name(), aItem, aItem->Frame(), this);
@@ -2417,17 +2364,16 @@
   bool clipMatches = mItemClip == aClip;
   mItemClip = aClip;
 
-  if (!mIsSolidColorInVisibleRegion && mOpaqueRegion.Contains(aDrawRect) &&
+  if (!mIsSolidColorInVisibleRegion && mOpaqueRegion.Contains(aVisibleRect) &&
       mVisibleRegion.Contains(aVisibleRect) && !mImage) {
     // A very common case! Most pages have a PaintedLayer with the page
     // background (opaque) visible and most or all of the page content over the
     // top of that background.
-    // The rest of this method won't do anything. mVisibleRegion, mOpaqueRegion
-    // and mDrawRegion don't need updating. mVisibleRegion contains aVisibleRect
-    // already, mOpaqueRegion contains aDrawRect and therefore whatever
-    // the opaque region of the item is. mDrawRegion must contain mOpaqueRegion
-    // and therefore aDrawRect.
-    NS_ASSERTION(mDrawRegion.Contains(aDrawRect), "Draw region not covered");
+    // The rest of this method won't do anything. mVisibleRegion and mOpaqueRegion
+    // don't need updating. mVisibleRegion contains aVisibleRect already,
+    // mOpaqueRegion contains aVisibleRect and therefore whatever the opaque
+    // region of the item is. mVisibleRegion must contain mOpaqueRegion
+    // and therefore aVisibleRect.
     return;
   }
 
@@ -2492,9 +2438,6 @@
 
     mVisibleRegion.Or(mVisibleRegion, aVisibleRect);
     mVisibleRegion.SimplifyOutward(4);
-    mDrawRegion.Or(mDrawRegion, mVisibleRegion);
-    mDrawRegion.Or(mDrawRegion, aDrawRect);
-    mDrawRegion.SimplifyOutward(4);
   }
 
   if (!aClippedOpaqueRegion.IsEmpty()) {
@@ -2572,10 +2515,10 @@
       break;
     }
     PaintedLayerData* data = mPaintedLayerDataStack[i];
-    // Give up if there is content drawn above (in z-order) this layer that
+    // Give up if there is content visible above (in z-order) this layer that
     // intersects aItem's visible region; aItem must be placed in a
     // layer above this layer.
-    if (data->DrawAboveRegionIntersects(aVisibleRect)) {
+    if (data->VisibleAboveRegionIntersects(aVisibleRect)) {
       ++i;
       break;
     }
@@ -2588,10 +2531,10 @@
         topmostLayerWithScrolledRoot = i;
       }
     }
-    // If the layer's drawn region intersects the item, stop now since no
+    // If the layer's visible region intersects the item, stop now since no
     // lower layer will be usable. Do the same if the layer is subject to
     // async transforms, since we don't know where it will really be drawn.
-    if (data->DrawRegionIntersects(aVisibleRect))
+    if (data->VisibleRegionIntersects(aVisibleRect))
       break;
   }
   if (topmostLayerWithScrolledRoot < 0) {
@@ -2821,6 +2764,51 @@
   return opaquePixels;
 }
 
+void
+ContainerState::UpdateVisibleAboveRegionForNewItem(const nsIntRect& aVisibleRect,
+                                                   bool aCanMoveFreely,
+                                                   const nsIntRect* aClipRectIfAny)
+{
+  PaintedLayerData* data = GetTopPaintedLayerData();
+  PossiblyInfiniteRegion& visibleAboveRegion = data
+    ? data->mVisibleAboveRegion : mVisibleAboveBackgroundRegion;
+
+  if (aCanMoveFreely) {
+    // Prerendered transform items can be updated without layer building
+    // (async animations or an empty transaction), so we need to put items
+    // that the transform item can potentially move under into a layer above
+    // this item. We do this by making the visible above region infinite.
+    // If we have a clip, the transform can't escape from the clip rect, and
+    // the clip rect can't change without new layer building. In that case we
+    // can add just the clip rect to the visible above region.
+    visibleAboveRegion.AccumulateAndSimplifyOutward(
+      aClipRectIfAny ? *aClipRectIfAny : PossiblyInfiniteRegion::InfiniteRegion());
+  } else {
+    visibleAboveRegion.AccumulateAndSimplifyOutward(aVisibleRect);
+  }
+}
+
+void
+ContainerState::UpdateVisibleAboveRegionOnPop(PaintedLayerData* aData,
+                                              PaintedLayerData* aNextPaintedLayerData)
+{
+  PossiblyInfiniteRegion& visibleAboveRegion = aNextPaintedLayerData ?
+    aNextPaintedLayerData->mVisibleAboveRegion : mVisibleAboveBackgroundRegion;
+
+  // If aData has a draw region and is subject to async transforms then the
+  // layer can potentially be moved arbitrarily on the compositor. So we
+  // should avoid moving display items from on top of the layer to below the
+  // layer, which we do by making the visibleAboveRegion infinite. Note that
+  // if the visible region is empty (such as when aData has only event-regions
+  // items) then we don't need to do this.
+  if (aData->IsSubjectToAsyncTransforms() && !aData->mVisibleRegion.IsEmpty()) {
+    visibleAboveRegion.AccumulateAndSimplifyOutward(PossiblyInfiniteRegion::InfiniteRegion());
+  } else {
+    visibleAboveRegion.AccumulateAndSimplifyOutward(aData->mVisibleAboveRegion);
+    visibleAboveRegion.AccumulateAndSimplifyOutward(aData->mVisibleRegion);
+  }
+}
+
 /*
  * Iterate through the non-clip items in aList and its descendants.
  * For each item we compute the effective clip rect. Each item is assigned
@@ -2911,8 +2899,6 @@
       aList->SetNeedsTransparentSurface();
     }
 
-    nsIntRect itemVisibleRect =
-      ScaleToOutsidePixels(item->GetVisibleRect(), false);
     bool snap;
     nsRect itemContent = item->GetBounds(mBuilder, &snap);
     if (itemType == nsDisplayItem::TYPE_LAYER_EVENT_REGIONS) {
@@ -2944,7 +2930,11 @@
     }
     ((nsRect&)mAccumulatedChildBounds).UnionRect(mAccumulatedChildBounds, bounds);
 #endif
-    itemVisibleRect.IntersectRect(itemVisibleRect, itemDrawRect);
+    // We haven't computed visibility at this point, so item->GetVisibleRect()
+    // is just the dirty rect that item was initialized with. We intersect it
+    // with the clipped item bounds to get a tighter visible rect.
+    nsIntRect itemVisibleRect = itemDrawRect.Intersect(
+      ScaleToOutsidePixels(item->GetVisibleRect(), false));
 
     LayerState layerState = item->GetLayerState(mBuilder, mManager, mParameters);
     if (layerState == LAYER_INACTIVE &&
@@ -3009,6 +2999,16 @@
         continue;
       }
 
+      // 3D-transformed layers don't necessarily draw in the order in which
+      // they're added to their parent container layer.
+      bool mayDrawOutOfOrder = itemType == nsDisplayItem::TYPE_TRANSFORM &&
+        (item->Frame()->Preserves3D() || item->Frame()->Preserves3DChildren());
+
+      // Pull up a uniform background color into the layer if possible.
+      mParameters.mBackgroundColor = (prerenderedTransform || mayDrawOutOfOrder)
+        ? NS_RGBA(0,0,0,0)
+        : FindOpaqueBackgroundColorFor(itemVisibleRect, mPaintedLayerDataStack.Length());
+
       // Just use its layer.
       // Set layerContentsVisibleRect.width/height to -1 to indicate we
       // currently don't know. If BuildContainerLayerFor gets called by
@@ -3025,12 +3025,6 @@
 
       const nsIFrame* fixedPosFrame =
         FindFixedPosFrameForLayerData(animatedGeometryRoot, shouldFixToViewport);
-      if (fixedPosFrame) {
-        nsIntRegion visibleRegion(itemVisibleRect);
-        AdjustLayerDataForFixedPositioning(fixedPosFrame,
-                                           nsIntRegion(itemDrawRect), &visibleRegion);
-        itemVisibleRect = visibleRegion.GetBounds();
-      }
       SetFixedPositionLayerData(ownLayer, fixedPosFrame);
 
       nsRect invalid;
@@ -3058,34 +3052,13 @@
       } else {
         ownLayer->SetClipRect(nullptr);
       }
-      PaintedLayerData* data = GetTopPaintedLayerData();
-      if (data) {
-        // Prerendered transform items can be updated without layer building
-        // (async animations or an empty transaction), so we need to put items
-        // that the transform item can potentially move under into a layer
-        // above this item.
-        if (prerenderedTransform) {
-          if (!itemClip.HasClip()) {
-            // The transform item can move anywhere, treat all other content
-            // as being above this item.
-            data->SetAllDrawingAbove();
-          } else {
-            // The transform can't escape from the clip rect, and the clip
-            // rect can't change without new layer building. Treat all content
-            // that intersects the clip rect as being above this item.
-            data->AddVisibleAboveRegion(clipRect);
-            data->AddDrawAboveRegion(clipRect);
-          }
-        } else {
-          data->AddVisibleAboveRegion(itemVisibleRect);
 
-          // Add the entire bounds rect to the mDrawAboveRegion.
-          // The visible region may be excluding opaque content above the
-          // item, and we need to ensure that that content is not placed
-          // in a PaintedLayer below the item!
-          data->AddDrawAboveRegion(itemDrawRect);
-        }
-      }
+      // Update the "visible above region" of the topmost PaintedLayerData item
+      // (or of the container's background) so that FindPaintedLayerFor and
+      // FindOpaqueBackgroundColorFor are aware of this item, even though it's
+      // not in the PaintedLayerDataStack.
+      UpdateVisibleAboveRegionForNewItem(itemVisibleRect, prerenderedTransform,
+                                         itemClip.HasClip() ? &clipRect : nullptr);
 
       // rounded rectangle clipping using mask layers
       // (must be done after visible rect is set on layer)
@@ -3174,8 +3147,10 @@
             itemClip, aList,
             &paintedLayerData->mHideAllLayersBelow,
             &paintedLayerData->mOpaqueForAnimatedGeometryRootParent);
+        MOZ_ASSERT(nsIntRegion(itemDrawRect).Contains(opaquePixels));
+        opaquePixels.AndWith(itemVisibleRect);
         paintedLayerData->Accumulate(this, item, opaquePixels,
-            itemVisibleRect, itemDrawRect, itemClip);
+            itemVisibleRect, itemClip);
       }
     }
 
@@ -4134,11 +4109,18 @@
   {
     flattenToSingleLayer = true;
   }
+
+  nscolor backgroundColor = NS_RGBA(0,0,0,0);
+  if (aFlags & CONTAINER_ALLOW_PULL_BACKGROUND_COLOR) {
+    backgroundColor = aParameters.mBackgroundColor;
+  }
+
   uint32_t flags;
   while (true) {
     ContainerState state(aBuilder, aManager, aManager->GetLayerBuilder(),
                          aContainerFrame, aContainerItem, bounds,
-                         containerLayer, scaleParameters, flattenToSingleLayer);
+                         containerLayer, scaleParameters, flattenToSingleLayer,
+                         backgroundColor);
 
     state.ProcessDisplayItems(aChildren);
 
@@ -4429,9 +4411,8 @@
                               float aXScale, float aYScale,
                               int32_t aCommonClipCount)
 {
-#ifdef MOZ_DUMP_PAINTING
   DrawTarget& aDrawTarget = *aRC->GetDrawTarget();
-#endif
+
   int32_t appUnitsPerDevPixel = aPresContext->AppUnitsPerDevPixel();
   nsRect boundRect = aRect.ToAppUnits(appUnitsPerDevPixel);
   boundRect.MoveBy(NSIntPixelsToAppUnits(aOffset.x, appUnitsPerDevPixel),
@@ -4481,7 +4462,9 @@
     }
 
     if (cdi->mInactiveLayerManager) {
+      bool saved = aDrawTarget.GetPermitSubpixelAA();
       PaintInactiveLayer(aBuilder, cdi->mInactiveLayerManager, cdi->mItem, aContext, aRC);
+      aDrawTarget.SetPermitSubpixelAA(saved);
     } else {
       nsIFrame* frame = cdi->mItem->Frame();
       frame->AddStateBits(NS_FRAME_PAINTED_THEBES);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/FrameLayerBuilder.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/FrameLayerBuilder.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/FrameLayerBuilder.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/FrameLayerBuilder.h	2015-02-28 15:03:08.000000000 +0000
@@ -57,6 +57,7 @@
     : mXScale(1)
     , mYScale(1)
     , mLayerContentsVisibleRect(nullptr)
+    , mBackgroundColor(NS_RGBA(0,0,0,0))
     , mInTransformedSubtree(false)
     , mInActiveTransformedSubtree(false)
     , mDisableSubpixelAntialiasingInDescendants(false)
@@ -66,6 +67,7 @@
     : mXScale(aXScale)
     , mYScale(aYScale)
     , mLayerContentsVisibleRect(nullptr)
+    , mBackgroundColor(NS_RGBA(0,0,0,0))
     , mInTransformedSubtree(false)
     , mInActiveTransformedSubtree(false)
     , mDisableSubpixelAntialiasingInDescendants(false)
@@ -78,6 +80,7 @@
     , mYScale(aYScale)
     , mLayerContentsVisibleRect(nullptr)
     , mOffset(aOffset)
+    , mBackgroundColor(aParent.mBackgroundColor)
     , mInTransformedSubtree(aParent.mInTransformedSubtree)
     , mInActiveTransformedSubtree(aParent.mInActiveTransformedSubtree)
     , mDisableSubpixelAntialiasingInDescendants(aParent.mDisableSubpixelAntialiasingInDescendants)
@@ -94,6 +97,7 @@
    */
   nsIntPoint mOffset;
 
+  nscolor mBackgroundColor;
   bool mInTransformedSubtree;
   bool mInActiveTransformedSubtree;
   bool mDisableSubpixelAntialiasingInDescendants;
@@ -197,7 +201,16 @@
   void DidEndTransaction();
 
   enum {
-    CONTAINER_NOT_CLIPPED_BY_ANCESTORS = 0x01
+    CONTAINER_NOT_CLIPPED_BY_ANCESTORS = 0x01,
+
+    /**
+     * Set this when pulling an opaque background color from behind the
+     * container layer into the container doesn't change the visual results,
+     * given the effects you're going to apply to the container layer.
+     * For example, this is compatible with opacity or clipping/masking, but
+     * not with non-OVER blend modes or filters.
+     */
+    CONTAINER_ALLOW_PULL_BACKGROUND_COLOR = 0x02
   };
   /**
    * Build a container layer for a display item that contains a child
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsChangeHint.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsChangeHint.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsChangeHint.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsChangeHint.h	2015-02-28 15:03:09.000000000 +0000
@@ -348,24 +348,30 @@
   // work.)  Supported only for element style contexts and not for
   // pseudo-elements or anonymous boxes, on which it converts to
   // eRestyle_Self.
+  // If the change is for the advance of a declarative animation, use
+  // the value below instead.
   eRestyle_StyleAttribute = (1<<6),
 
+  // Same as eRestyle_StyleAttribute, but for when the change results
+  // from the advance of a declarative animation.
+  eRestyle_StyleAttribute_Animations = (1<<7),
+
   // Continue the restyling process to the current frame's children even
   // if this frame's restyling resulted in no style changes.
-  eRestyle_Force = (1<<7),
+  eRestyle_Force = (1<<8),
 
   // Continue the restyling process to all of the current frame's
   // descendants, even if any frame's restyling resulted in no style
   // changes.  (Implies eRestyle_Force.)  Note that this is weaker than
   // eRestyle_Subtree, which makes us rerun selector matching on all
   // descendants rather than just continuing the restyling process.
-  eRestyle_ForceDescendants = (1<<8),
+  eRestyle_ForceDescendants = (1<<9),
 
   // Useful unions:
   eRestyle_AllHintsWithAnimations = eRestyle_CSSTransitions |
                                     eRestyle_CSSAnimations |
                                     eRestyle_SVGAttrAnimations |
-                                    eRestyle_StyleAttribute,
+                                    eRestyle_StyleAttribute_Animations,
 };
 
 // The functions below need an integral type to cast to to avoid
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsCSSRendering.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsCSSRendering.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsCSSRendering.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsCSSRendering.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -4348,59 +4348,56 @@
   }
 }
 
-void
-nsCSSRendering::DecorationLineToPath(nsIFrame* aFrame,
-                                     gfxContext* aGfxContext,
-                                     const gfxRect& aDirtyRect,
-                                     const nscolor aColor,
-                                     const gfxPoint& aPt,
-                                     const gfxFloat aICoordInFrame,
-                                     const gfxSize& aLineSize,
-                                     const gfxFloat aAscent,
-                                     const gfxFloat aOffset,
+Rect
+nsCSSRendering::DecorationLineToPath(const Rect& aDirtyRect,
+                                     const Point& aPt,
+                                     const Size& aLineSize,
+                                     const Float aAscent,
+                                     const Float aOffset,
                                      const uint8_t aDecoration,
                                      const uint8_t aStyle,
                                      bool aVertical,
-                                     const gfxFloat aDescentLimit)
+                                     const Float aDescentLimit)
 {
   NS_ASSERTION(aStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE, "aStyle is none");
 
-  aGfxContext->NewPath();
+  Rect path; // To benefit from RVO, we return this from all return points
 
-  gfxRect rect =
-    GetTextDecorationRectInternal(aPt, aLineSize, aAscent, aOffset,
+  Rect rect = ToRect(
+    GetTextDecorationRectInternal(ThebesPoint(aPt), ThebesSize(aLineSize),
+                                  aAscent, aOffset,
                                   aDecoration, aStyle, aVertical,
-                                  aDescentLimit);
+                                  aDescentLimit));
   if (rect.IsEmpty() || !rect.Intersects(aDirtyRect)) {
-    return;
+    return path;
   }
 
   if (aDecoration != NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE &&
       aDecoration != NS_STYLE_TEXT_DECORATION_LINE_OVERLINE &&
       aDecoration != NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH) {
     NS_ERROR("Invalid decoration value!");
-    return;
+    return path;
   }
 
   if (aStyle != NS_STYLE_TEXT_DECORATION_STYLE_SOLID) {
     // For the moment, we support only solid text decorations.
-    return;
+    return path;
   }
 
-  gfxFloat lineThickness = std::max(NS_round(aLineSize.height), 1.0);
+  Float lineThickness = std::max(NS_round(aLineSize.height), 1.0);
 
   // The block-direction position should be set to the middle of the line.
   if (aVertical) {
     rect.x += lineThickness / 2;
-    aGfxContext->Rectangle
-      (gfxRect(gfxPoint(rect.TopLeft() - gfxPoint(lineThickness / 2, 0.0)),
-               gfxSize(lineThickness, rect.Height())));
+    path = Rect(rect.TopLeft() - Point(lineThickness / 2, 0.0),
+                Size(lineThickness, rect.Height()));
   } else {
     rect.y += lineThickness / 2;
-    aGfxContext->Rectangle
-      (gfxRect(gfxPoint(rect.TopLeft() - gfxPoint(0.0, lineThickness / 2)),
-               gfxSize(rect.Width(), lineThickness)));
+    path = Rect(rect.TopLeft() - Point(0.0, lineThickness / 2),
+                Size(rect.Width(), lineThickness));
   }
+
+  return path;
 }
 
 nsRect
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsCSSRendering.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsCSSRendering.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsCSSRendering.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsCSSRendering.h	2015-02-28 15:03:09.000000000 +0000
@@ -321,7 +321,9 @@
 struct nsCSSRendering {
   typedef mozilla::gfx::DrawTarget DrawTarget;
   typedef mozilla::gfx::Float Float;
+  typedef mozilla::gfx::Point Point;
   typedef mozilla::gfx::Rect Rect;
+  typedef mozilla::gfx::Size Size;
   typedef mozilla::gfx::RectCornerRadii RectCornerRadii;
   typedef mozilla::image::DrawResult DrawResult;
   typedef nsIFrame::Sides Sides;
@@ -684,25 +686,20 @@
                                   const gfxFloat aDescentLimit = -1.0);
 
   /**
-   * Adds a path corresponding to the outline of the decoration line to
-   * the specified context.  Arguments have the same meaning as for
+   * Returns a Rect corresponding to the outline of the decoration line for the
+   * given text metrics.  Arguments have the same meaning as for
    * PaintDecorationLine.  Currently this only works for solid
-   * decorations; for other decoration styles, an empty path is added
-   * to the context.
+   * decorations; for other decoration styles the returned Rect will be empty.
    */
-  static void DecorationLineToPath(nsIFrame* aFrame,
-                                   gfxContext* aGfxContext,
-                                   const gfxRect& aDirtyRect,
-                                   const nscolor aColor,
-                                   const gfxPoint& aPt,
-                                   const gfxFloat aICoordInFrame,
-                                   const gfxSize& aLineSize,
-                                   const gfxFloat aAscent,
-                                   const gfxFloat aOffset,
+  static Rect DecorationLineToPath(const Rect& aDirtyRect,
+                                   const Point& aPt,
+                                   const Size& aLineSize,
+                                   const Float aAscent,
+                                   const Float aOffset,
                                    const uint8_t aDecoration,
                                    const uint8_t aStyle,
                                    bool aVertical,
-                                   const gfxFloat aDescentLimit = -1.0);
+                                   const Float aDescentLimit = -1.0);
 
   /**
    * Function for getting the decoration line rect for the text.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayList.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayList.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayList.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayList.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -590,7 +590,8 @@
       mAncestorHasApzAwareEventHandler(false),
       mHaveScrollableDisplayPort(false),
       mWindowDraggingAllowed(false),
-      mIsBuildingForPopup(nsLayoutUtils::IsPopup(aReferenceFrame))
+      mIsBuildingForPopup(nsLayoutUtils::IsPopup(aReferenceFrame)),
+      mForceLayerForScrollParent(false)
 {
   MOZ_COUNT_CTOR(nsDisplayListBuilder);
   PL_InitArenaPool(&mPool, "displayListArena", 1024,
@@ -641,6 +642,8 @@
                                                         const nsRect& aDirtyRect)
 {
   nsRect dirtyRectRelativeToDirtyFrame = aDirtyRect;
+  DisplayItemClip clip;
+  const DisplayItemClip* clipPtr = nullptr;
   if (nsLayoutUtils::IsFixedPosFrameInDisplayPort(aFrame) &&
       IsPaintingToWindow()) {
     NS_ASSERTION(aDirtyFrame == aFrame->GetParent(), "Dirty frame should be viewport frame");
@@ -654,6 +657,19 @@
     } else {
       dirtyRectRelativeToDirtyFrame.SizeTo(aDirtyFrame->GetSize());
     }
+
+    // Always clip fixed items to the root scroll frame's scrollport, because
+    // we skip setting the clip in ScrollFrameHelper if we have a displayport.
+    nsIFrame* rootScroll = aFrame->PresContext()->PresShell()->GetRootScrollFrame();
+    if (rootScroll) {
+      nsIScrollableFrame* scrollable = do_QueryFrame(rootScroll);
+
+      nsRect clipRect = scrollable->GetScrollPortRect() + ToReferenceFrame(rootScroll);
+      nscoord radii[8];
+      bool haveRadii = rootScroll->GetPaddingBoxBorderRadii(radii);
+      clip.SetTo(clipRect, haveRadii ? radii : nullptr);
+      clipPtr = &clip;
+    }
   }
 
   nsRect dirty = dirtyRectRelativeToDirtyFrame - aFrame->GetOffsetTo(aDirtyFrame);
@@ -672,8 +688,16 @@
 
   if (!dirty.IntersectRect(dirty, overflowRect))
     return;
-  const DisplayItemClip* clip = mClipState.GetClipForContainingBlockDescendants();
-  OutOfFlowDisplayData* data = clip ? new OutOfFlowDisplayData(*clip, dirty)
+
+  // Combine clips if necessary
+  const DisplayItemClip* oldClip = mClipState.GetClipForContainingBlockDescendants();
+  if (clipPtr && oldClip) {
+    clip.IntersectWith(*oldClip);
+  } else if (oldClip) {
+    clipPtr = oldClip;
+  }
+
+  OutOfFlowDisplayData* data = clipPtr ? new OutOfFlowDisplayData(*clipPtr, dirty)
     : new OutOfFlowDisplayData(dirty);
   aFrame->Properties().Set(nsDisplayListBuilder::OutOfFlowDisplayDataProperty(), data);
 
@@ -778,8 +802,10 @@
   // all the pres shells from here up to the root, as well as any css-driven
   // resolution. We don't need to compute it as it's already stored in the
   // container parameters.
-  metrics.SetCumulativeResolution(LayoutDeviceToLayerScale(aContainerParameters.mXScale,
-                                                           aContainerParameters.mYScale));
+  // TODO(botond): As a workaround for bug 1071018, avoid asserting if
+  // mYScale is different from mXScale. This will be handled properly in
+  // bug 1036967.
+  metrics.SetCumulativeResolution(LayoutDeviceToLayerScale(aContainerParameters.mXScale));
 
   LayoutDeviceToScreenScale resolutionToScreen(
       presShell->GetCumulativeResolution().width
@@ -1632,6 +1658,8 @@
   if (aBuilder->IsBuildingLayerEventRegions() &&
       nsLayoutUtils::HasDocumentLevelListenersForApzAwareEvents(presShell)) {
     root->SetEventRegionsOverride(EventRegionsOverride::ForceDispatchToContent);
+  } else {
+    root->SetEventRegionsOverride(EventRegionsOverride::NoOverride);
   }
 
   // If we're using containerless scrolling, there is still one case where we
@@ -2960,15 +2988,21 @@
   return r + ToReferenceFrame();
 }
 
-bool
+void
 nsDisplayBackgroundColor::ApplyOpacity(nsDisplayListBuilder* aBuilder,
                                        float aOpacity,
                                        const DisplayItemClip* aClip)
 {
+  NS_ASSERTION(CanApplyOpacity(), "ApplyOpacity should be allowed");
   mColor.a = mColor.a * aOpacity;
   if (aClip) {
     IntersectClip(aBuilder, *aClip);
   }
+}
+
+bool
+nsDisplayBackgroundColor::CanApplyOpacity() const
+{
   return true;
 }
 
@@ -3781,7 +3815,8 @@
                              const ContainerLayerParameters& aContainerParameters) {
   nsRefPtr<Layer> container = aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
-                           aContainerParameters, nullptr);
+                           aContainerParameters, nullptr,
+                           FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR);
   if (!container)
     return nullptr;
 
@@ -3822,15 +3857,21 @@
   return false;
 }
 
-bool
+void
 nsDisplayOpacity::ApplyOpacity(nsDisplayListBuilder* aBuilder,
                              float aOpacity,
                              const DisplayItemClip* aClip)
 {
+  NS_ASSERTION(CanApplyOpacity(), "ApplyOpacity should be allowed");
   mOpacity = mOpacity * aOpacity;
   if (aClip) {
     IntersectClip(aBuilder, *aClip);
   }
+}
+
+bool
+nsDisplayOpacity::CanApplyOpacity() const
+{
   return true;
 }
 
@@ -3841,14 +3882,41 @@
     return false;
 
   nsDisplayItem* child = mList.GetBottom();
-  // Only try folding our opacity down if we have a single
-  // child. We could potentially do this also if we had multiple
-  // children as long as they don't overlap.
-  if (!child || child->GetAbove()) {
+  // Only try folding our opacity down if we have at most three children
+  // that don't overlap and can all apply the opacity to themselves.
+  if (!child) {
     return false;
   }
+  struct {
+    nsDisplayItem* item;
+    nsRect bounds;
+  } children[3];
+  bool snap;
+  uint32_t numChildren = 0;
+  for (; numChildren < ArrayLength(children) && child; numChildren++, child = child->GetAbove()) {
+    if (!child->CanApplyOpacity()) {
+      return false;
+    }
+    children[numChildren].item = child;
+    children[numChildren].bounds = child->GetBounds(aBuilder, &snap);
+  }
+  if (child) {
+    // we have a fourth (or more) child
+    return false;
+  }
+
+  for (uint32_t i = 0; i < numChildren; i++) {
+    for (uint32_t j = i+1; j < numChildren; j++) {
+      if (children[i].bounds.Intersects(children[j].bounds)) {
+        return false;
+      }
+    }
+  }
 
-  return child->ApplyOpacity(aBuilder, mOpacity, mClip);
+  for (uint32_t i = 0; i < numChildren; i++) {
+    children[i].item->ApplyOpacity(aBuilder, mOpacity, mClip);
+  }
+  return true;
 }
 
 nsDisplayItem::LayerState
@@ -4057,7 +4125,8 @@
                               const ContainerLayerParameters& aContainerParameters) {
   nsRefPtr<ContainerLayer> layer = aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
-                           aContainerParameters, nullptr);
+                           aContainerParameters, nullptr,
+                           FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR);
   if (mFlags & VERTICAL_SCROLLBAR) {
     layer->SetScrollbarData(mScrollTarget, Layer::ScrollDirection::VERTICAL);
   }
@@ -4106,9 +4175,9 @@
   }
 
   nsRefPtr<Layer> layer = nsDisplayOwnLayer::BuildLayer(aBuilder, aManager, params);
-  if (mForceDispatchToContentRegion) {
-    layer->AsContainerLayer()->SetEventRegionsOverride(EventRegionsOverride::ForceDispatchToContent);
-  }
+  layer->AsContainerLayer()->SetEventRegionsOverride(mForceDispatchToContentRegion
+    ? EventRegionsOverride::ForceDispatchToContent
+    : EventRegionsOverride::NoOverride);
   return layer.forget();
 }
 
@@ -4455,7 +4524,8 @@
 
   return aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
-                           params, nullptr);
+                           params, nullptr,
+                           FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR);
 }
 
 UniquePtr<FrameMetrics>
@@ -5458,6 +5528,7 @@
 
   uint32_t flags = ShouldPrerender(aBuilder) ?
     FrameLayerBuilder::CONTAINER_NOT_CLIPPED_BY_ANCESTORS : 0;
+  flags |= FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR;
   nsRefPtr<ContainerLayer> container = aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, mStoredList.GetChildren(),
                            aContainerParameters, &newTransformMatrix, flags);
@@ -5886,6 +5957,30 @@
   AppendToString(aStream, GetTransform());
 }
 
+nsDisplayItemGeometry*
+nsCharClipDisplayItem::AllocateGeometry(nsDisplayListBuilder* aBuilder)
+{
+  return new nsCharClipGeometry(this, aBuilder);
+}
+
+void
+nsCharClipDisplayItem::ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
+                                         const nsDisplayItemGeometry* aGeometry,
+                                         nsRegion* aInvalidRegion)
+{
+  const nsCharClipGeometry* geometry = static_cast<const nsCharClipGeometry*>(aGeometry);
+
+  bool snap;
+  nsRect newRect = geometry->mBounds;
+  nsRect oldRect = GetBounds(aBuilder, &snap);
+  if (mLeftEdge != geometry->mLeftEdge ||
+      mRightEdge != geometry->mRightEdge ||
+      !oldRect.IsEqualInterior(newRect) ||
+      !geometry->mBorderRect.IsEqualInterior(GetBorderRect())) {
+    aInvalidRegion->Or(oldRect, newRect);
+  }
+}
+
 nsDisplaySVGEffects::nsDisplaySVGEffects(nsDisplayListBuilder* aBuilder,
                                          nsIFrame* aFrame, nsDisplayList* aList)
     : nsDisplayWrapList(aBuilder, aFrame, aList),
@@ -5914,7 +6009,8 @@
                         const ContainerLayerParameters& aContainerParameters)
 {
   ContainerLayerParameters newContainerParameters = aContainerParameters;
-  uint32_t flags = FrameLayerBuilder::CONTAINER_NOT_CLIPPED_BY_ANCESTORS;
+  uint32_t flags = FrameLayerBuilder::CONTAINER_NOT_CLIPPED_BY_ANCESTORS |
+                   FrameLayerBuilder::CONTAINER_ALLOW_PULL_BACKGROUND_COLOR;
   nsRefPtr<ContainerLayer> container = aManager->GetLayerBuilder()->
     BuildContainerLayerFor(aBuilder, aManager, mFrame, this, &mList,
                            newContainerParameters, nullptr, flags);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayList.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayList.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayList.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayList.h	2015-02-28 15:03:09.000000000 +0000
@@ -254,6 +254,13 @@
    */
   ViewID GetCurrentScrollParentId() const { return mCurrentScrollParentId; }
   /**
+   * Get and set the flag that indicates if scroll parents should have layers
+   * forcibly created. This flag is set when a deeply nested scrollframe has
+   * a displayport, and for scroll handoff to work properly the ancestor
+   * scrollframes should also get their own scrollable layers.
+   */
+  void ForceLayerForScrollParent() { mForceLayerForScrollParent = true; }
+  /**
    * Get the ViewID and the scrollbar flags corresponding to the scrollbar for
    * which we are building display items at the moment.
    */
@@ -660,15 +667,41 @@
   class AutoCurrentScrollParentIdSetter {
   public:
     AutoCurrentScrollParentIdSetter(nsDisplayListBuilder* aBuilder, ViewID aScrollId)
-      : mBuilder(aBuilder), mOldValue(aBuilder->mCurrentScrollParentId) {
+      : mBuilder(aBuilder)
+      , mOldValue(aBuilder->mCurrentScrollParentId)
+      , mOldForceLayer(aBuilder->mForceLayerForScrollParent) {
+      // If this AutoCurrentScrollParentIdSetter has the same scrollId as the
+      // previous one on the stack, then that means the scrollframe that
+      // created this isn't actually scrollable and cannot participate in
+      // scroll handoff. We set mCanBeScrollParent to false to indicate this.
+      mCanBeScrollParent = (mOldValue != aScrollId);
       aBuilder->mCurrentScrollParentId = aScrollId;
+      aBuilder->mForceLayerForScrollParent = false;
     }
+    bool ShouldForceLayerForScrollParent() const {
+      // Only scrollframes participating in scroll handoff can be forced to
+      // layerize
+      return mCanBeScrollParent && mBuilder->mForceLayerForScrollParent;
+    };
     ~AutoCurrentScrollParentIdSetter() {
       mBuilder->mCurrentScrollParentId = mOldValue;
+      if (mCanBeScrollParent) {
+        // If this flag is set, caller code is responsible for having dealt
+        // with the current value of mBuilder->mForceLayerForScrollParent, so
+        // we can just restore the old value.
+        mBuilder->mForceLayerForScrollParent = mOldForceLayer;
+      } else {
+        // Otherwise we need to keep propagating the force-layerization flag
+        // upwards to the next ancestor scrollframe that does participate in
+        // scroll handoff.
+        mBuilder->mForceLayerForScrollParent |= mOldForceLayer;
+      }
     }
   private:
     nsDisplayListBuilder* mBuilder;
     ViewID                mOldValue;
+    bool                  mOldForceLayer;
+    bool                  mCanBeScrollParent;
   };
 
   /**
@@ -919,6 +952,7 @@
   bool                           mHaveScrollableDisplayPort;
   bool                           mWindowDraggingAllowed;
   bool                           mIsBuildingForPopup;
+  bool                           mForceLayerForScrollParent;
 };
 
 class nsDisplayItem;
@@ -1367,12 +1401,19 @@
   virtual const nsRect& GetVisibleRectForChildren() const { return mVisibleRect; }
 
   /**
-   * Stores the given opacity value to be applied when drawing. Returns
-   * false if this isn't supported for this display item.
+   * Stores the given opacity value to be applied when drawing. It is an error to
+   * call this if CanApplyOpacity returned false.
    */
-  virtual bool ApplyOpacity(nsDisplayListBuilder* aBuilder,
+  virtual void ApplyOpacity(nsDisplayListBuilder* aBuilder,
                             float aOpacity,
                             const DisplayItemClip* aClip) {
+    NS_ASSERTION(CanApplyOpacity(), "ApplyOpacity not supported on this type");
+  }
+  /**
+   * Returns true if this display item would return true from ApplyOpacity without
+   * actually applying the opacity. Otherwise returns false.
+   */
+  virtual bool CanApplyOpacity() const {
     return false;
   }
 
@@ -2377,9 +2418,10 @@
   virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                        HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) MOZ_OVERRIDE;
 
-  virtual bool ApplyOpacity(nsDisplayListBuilder* aBuilder,
+  virtual void ApplyOpacity(nsDisplayListBuilder* aBuilder,
                             float aOpacity,
                             const DisplayItemClip* aClip) MOZ_OVERRIDE;
+  virtual bool CanApplyOpacity() const MOZ_OVERRIDE;
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) MOZ_OVERRIDE
   {
@@ -2486,14 +2528,18 @@
                                          const nsDisplayItemGeometry* aGeometry,
                                          nsRegion* aInvalidRegion) MOZ_OVERRIDE;
   
-  virtual bool ApplyOpacity(nsDisplayListBuilder* aBuilder,
+  virtual void ApplyOpacity(nsDisplayListBuilder* aBuilder,
                             float aOpacity,
                             const DisplayItemClip* aClip) MOZ_OVERRIDE
   {
+    NS_ASSERTION(CanApplyOpacity(), "ApplyOpacity should be allowed");
     mOpacity = aOpacity;
     if (aClip) {
       IntersectClip(aBuilder, *aClip);
     }
+  }
+  virtual bool CanApplyOpacity() const MOZ_OVERRIDE
+  {
     return true;
   }
 
@@ -2636,6 +2682,17 @@
     return mHitRegion.GetBounds().Union(mMaybeHitRegion.GetBounds());
   }
 
+  virtual void ApplyOpacity(nsDisplayListBuilder* aBuilder,
+                            float aOpacity,
+                            const DisplayItemClip* aClip) MOZ_OVERRIDE
+  {
+    NS_ASSERTION(CanApplyOpacity(), "ApplyOpacity should be allowed");
+  }
+  virtual bool CanApplyOpacity() const MOZ_OVERRIDE
+  {
+    return true;
+  }
+
   NS_DISPLAY_DECL_NAME("LayerEventRegions", TYPE_LAYER_EVENT_REGIONS)
 
   // Indicate that aFrame's border-box contributes to the event regions for
@@ -2865,9 +2922,10 @@
   {
     // We don't need to compute an invalidation region since we have LayerTreeInvalidation
   }
-  virtual bool ApplyOpacity(nsDisplayListBuilder* aBuilder,
+  virtual void ApplyOpacity(nsDisplayListBuilder* aBuilder,
                             float aOpacity,
                             const DisplayItemClip* aClip) MOZ_OVERRIDE;
+  virtual bool CanApplyOpacity() const MOZ_OVERRIDE;
   virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
   bool NeedsActiveLayer(nsDisplayListBuilder* aBuilder);
   NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
@@ -3629,6 +3687,12 @@
   explicit nsCharClipDisplayItem(nsIFrame* aFrame)
     : nsDisplayItem(aFrame) {}
 
+  virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE;
+
+  virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
+                                         const nsDisplayItemGeometry* aGeometry,
+                                         nsRegion* aInvalidRegion) MOZ_OVERRIDE;
+
   struct ClipEdges {
     ClipEdges(const nsDisplayItem& aItem,
               nscoord aLeftEdge, nscoord aRightEdge) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayListInvalidation.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayListInvalidation.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayListInvalidation.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayListInvalidation.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -115,3 +115,9 @@
   mBounds.MoveBy(aOffset);
   mFrameOffsetToReferenceFrame += aOffset;
 }
+
+nsCharClipGeometry::nsCharClipGeometry(nsCharClipDisplayItem* aItem, nsDisplayListBuilder* aBuilder)
+  : nsDisplayItemGenericGeometry(aItem, aBuilder)
+  , mLeftEdge(aItem->mLeftEdge)
+  , mRightEdge(aItem->mRightEdge)
+{}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayListInvalidation.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayListInvalidation.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsDisplayListInvalidation.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsDisplayListInvalidation.h	2015-02-28 15:03:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsColor.h"
 #include "gfxRect.h"
 
+class nsCharClipDisplayItem;
 class nsDisplayItem;
 class nsDisplayListBuilder;
 class nsDisplayBackgroundImage;
@@ -247,4 +248,13 @@
   nsPoint mFrameOffsetToReferenceFrame;
 };
 
+class nsCharClipGeometry : public nsDisplayItemGenericGeometry
+{
+public:
+  nsCharClipGeometry(nsCharClipDisplayItem* aItem, nsDisplayListBuilder* aBuilder);
+
+  nscoord mLeftEdge;
+  nscoord mRightEdge;
+};
+
 #endif /*NSDISPLAYLISTINVALIDATION_H_*/
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsLayoutUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsLayoutUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsLayoutUtils.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsLayoutUtils.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/BasicEvents.h"
+#include "mozilla/EventDispatcher.h"
 #include "mozilla/gfx/PathHelpers.h"
 #include "mozilla/Likely.h"
 #include "mozilla/Maybe.h"
@@ -3238,7 +3239,7 @@
   if (gfxPrefs::DumpClientLayers()) {
     std::stringstream ss;
     FrameLayerBuilder::DumpRetainedLayerTree(layerManager, ss, false);
-    printf_stderr("%s", ss.str().c_str());
+    print_stderr(ss);
   }
 #endif
 
@@ -4882,15 +4883,26 @@
         tentBSize = nsPresContext::CSSPixelsToAppUnits(150);
       }
 
-      nsSize autoSize =
-        ComputeAutoSizeWithIntrinsicDimensions(minISize, minBSize,
-                                               maxISize, maxBSize,
-                                               tentISize, tentBSize);
-      // The nsSize that ComputeAutoSizeWithIntrinsicDimensions returns will
-      // actually contain logical values if the parameters passed to it were
-      // logical coordinates, so we do NOT perform a physical-to-logical
-      // conversion here, but just assign the fields directly to our result.
-      return LogicalSize(aWM, autoSize.width, autoSize.height);
+      if (aIntrinsicRatio != nsSize(0, 0)) {
+        nsSize autoSize =
+          ComputeAutoSizeWithIntrinsicDimensions(minISize, minBSize,
+                                                 maxISize, maxBSize,
+                                                 tentISize, tentBSize);
+        // The nsSize that ComputeAutoSizeWithIntrinsicDimensions returns will
+        // actually contain logical values if the parameters passed to it were
+        // logical coordinates, so we do NOT perform a physical-to-logical
+        // conversion here, but just assign the fields directly to our result.
+        iSize = autoSize.width;
+        bSize = autoSize.height;
+      } else {
+        // No intrinsic ratio, so just clamp the dimensions
+        // independently without calling
+        // ComputeAutoSizeWithIntrinsicDimensions, which deals with
+        // propagating these changes to the other dimension (and would
+        // be incorrect when there is no intrinsic ratio).
+        iSize = NS_CSS_MINMAX(tentISize, minISize, maxISize);
+        bSize = NS_CSS_MINMAX(tentBSize, minBSize, maxBSize);
+      }
     } else {
 
       // 'auto' iSize, non-'auto' bSize
@@ -5853,6 +5865,20 @@
 
     gfxRect anchoredDestRect(anchorPoint, scaledDest);
     gfxRect anchoredImageRect(imageSpaceAnchorPoint, imageSize);
+
+    // Calculate anchoredDestRect with snapped fill rect when the devPixelFill rect
+    // corresponds to just a single tile in that direction
+    if (fill.Width() != devPixelFill.Width() &&
+        devPixelDest.x == devPixelFill.x &&
+        devPixelDest.XMost() == devPixelFill.XMost()) {
+      anchoredDestRect.width = fill.width;
+    }
+    if (fill.Height() != devPixelFill.Height() &&
+        devPixelDest.y == devPixelFill.y &&
+        devPixelDest.YMost() == devPixelFill.YMost()) {
+      anchoredDestRect.height = fill.height;
+    }
+
     transform = TransformBetweenRects(anchoredImageRect, anchoredDestRect);
     invTransform = TransformBetweenRects(anchoredDestRect, anchoredImageRect);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsPresArena.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsPresArena.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsPresArena.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsPresArena.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -75,14 +75,18 @@
       char* limit = p + list->mEntrySize;
       for (; p < limit; p += sizeof(uintptr_t)) {
         uintptr_t val = *reinterpret_cast<uintptr_t*>(p);
-        NS_ABORT_IF_FALSE(val == mozPoisonValue(),
-                          nsPrintfCString("PresArena: poison overwritten; "
-                                          "wanted %.16" PRIx64 " "
-                                          "found %.16" PRIx64 " "
-                                          "errors in bits %.16" PRIx64 " ",
-                                          uint64_t(mozPoisonValue()),
-                                          uint64_t(val),
-                                          uint64_t(mozPoisonValue() ^ val)).get());
+        if (val != mozPoisonValue()) {
+          MOZ_ReportAssertionFailure(
+            nsPrintfCString("PresArena: poison overwritten; "
+                            "wanted %.16" PRIx64 " "
+                            "found %.16" PRIx64 " "
+                            "errors in bits %.16" PRIx64 " ",
+                            uint64_t(mozPoisonValue()),
+                            uint64_t(val),
+                            uint64_t(mozPoisonValue() ^ val)).get(),
+            __FILE__, __LINE__);
+          MOZ_CRASH();
+        }
       }
     }
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsPresShell.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsPresShell.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsPresShell.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsPresShell.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -11132,10 +11132,10 @@
 
   // Force-enabling font inflation always trumps the heuristics here.
   if (!FontSizeInflationForceEnabled()) {
-    if (TabChild* tab = TabChild::GetFrom(this)) {
+    if (TabChild::GetFrom(this)) {
       // We're in a child process.  Cancel inflation if we're not
       // async-pan zoomed.
-      if (!tab->IsAsyncPanZoomEnabled()) {
+      if (!gfxPrefs::AsyncPanZoomEnabled()) {
         mFontSizeInflationEnabled = false;
         return;
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsRefreshDriver.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsRefreshDriver.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/nsRefreshDriver.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/nsRefreshDriver.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -849,7 +849,7 @@
   // ready.
   gfxPrefs::GetSingleton();
 
-  if (!gfxPrefs::VsyncAlignedRefreshDriver()) {
+  if (!gfxPrefs::VsyncAlignedRefreshDriver() || !gfxPrefs::HardwareVsyncEnabled()) {
     return;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/PositionedEventTargeting.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/PositionedEventTargeting.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/PositionedEventTargeting.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/PositionedEventTargeting.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/Preferences.h"
 #include "nsLayoutUtils.h"
 #include "nsGkAtoms.h"
+#include "nsFontMetrics.h"
 #include "nsPrintfCString.h"
 #include "mozilla/dom/Element.h"
 #include "nsRegion.h"
@@ -76,6 +77,7 @@
   bool mTouchOnly;
   bool mRepositionEventCoords;
   bool mTouchClusterDetection;
+  uint32_t mLimitReadableSize;
 };
 
 static EventRadiusPrefs sMouseEventRadiusPrefs;
@@ -125,6 +127,9 @@
 
     nsPrintfCString touchClusterPref("ui.zoomedview.enabled", prefBranch);
     Preferences::AddBoolVarCache(&prefs->mTouchClusterDetection, touchClusterPref.get(), false);
+
+    nsPrintfCString limitReadableSizePref("ui.zoomedview.limitReadableSize", prefBranch);
+    Preferences::AddUintVarCache(&prefs->mLimitReadableSize, limitReadableSizePref.get(), 8);
   }
 
   return prefs;
@@ -382,6 +387,46 @@
   return bestTarget;
 }
 
+/*
+ * Return always true when touch cluster detection is OFF.
+ * When cluster detection is ON, return true if the text inside
+ * the frame is readable (by human eyes):
+ *   in this case, the frame is really clickable.
+ * Frames with a too small size will return false:
+ *   in this case, the frame is considered not clickable.
+ */
+static bool
+IsElementClickableAndReadable(nsIFrame* aFrame, WidgetGUIEvent* aEvent, const EventRadiusPrefs* aPrefs)
+{
+  if (!aPrefs->mTouchClusterDetection) {
+    return true;
+  }
+
+  if (aEvent->mClass != eMouseEventClass) {
+    return true;
+  }
+
+  uint32_t limitReadableSize = aPrefs->mLimitReadableSize;
+  nsSize frameSize = aFrame->GetSize();
+  nsPresContext* pc = aFrame->PresContext();
+  nsIPresShell* presShell = pc->PresShell();
+  gfxSize cumulativeResolution = presShell->GetCumulativeResolution();
+  if ((pc->AppUnitsToGfxUnits(frameSize.height) * cumulativeResolution.height) < limitReadableSize ||
+      (pc->AppUnitsToGfxUnits(frameSize.width) * cumulativeResolution.width) < limitReadableSize) {
+    return false;
+  }
+  nsRefPtr<nsFontMetrics> fm;
+  nsLayoutUtils::GetFontMetricsForFrame(aFrame, getter_AddRefs(fm),
+    nsLayoutUtils::FontSizeInflationFor(aFrame));
+  if (fm) {
+    if ((pc->AppUnitsToGfxUnits(fm->EmHeight()) * cumulativeResolution.height) < limitReadableSize) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 nsIFrame*
 FindFrameTargetedByInputEvent(WidgetGUIEvent* aEvent,
                               nsIFrame* aRootFrame,
@@ -398,8 +443,15 @@
     mozilla::layers::Stringify(aPointRelativeToRootFrame).c_str(), aRootFrame);
 
   const EventRadiusPrefs* prefs = GetPrefsFor(aEvent->mClass);
-  if (!prefs || !prefs->mEnabled || (target && IsElementClickable(target, nsGkAtoms::body))) {
-    PET_LOG("Retargeting disabled or target %p is clickable\n", target);
+  if (!prefs || !prefs->mEnabled) {
+    PET_LOG("Retargeting disabled\n");
+    return target;
+  }
+  if (target && IsElementClickable(target, nsGkAtoms::body)) {
+    if (!IsElementClickableAndReadable(target, aEvent, prefs)) {
+      aEvent->AsMouseEventBase()->hitCluster = true;
+    }
+    PET_LOG("Target %p is clickable\n", target);
     return target;
   }
 
@@ -437,7 +489,8 @@
     GetClosest(aRootFrame, aPointRelativeToRootFrame, targetRect, prefs,
                restrictToDescendants, candidates, &elementsInCluster);
   if (closestClickable) {
-    if (prefs->mTouchClusterDetection && elementsInCluster > 1) {
+    if ((prefs->mTouchClusterDetection && elementsInCluster > 1) ||
+        (!IsElementClickableAndReadable(closestClickable, aEvent, prefs))) {
       if (aEvent->mClass == eMouseEventClass) {
         WidgetMouseEventBase* mouseEventBase = aEvent->AsMouseEventBase();
         mouseEventBase->hitCluster = true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/RestyleManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/RestyleManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/RestyleManager.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/RestyleManager.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -831,8 +831,15 @@
                    nsChangeHint_UpdateParentOverflow |
                    nsChangeHint_UpdateSubtreeOverflow))) {
         if (hint & nsChangeHint_UpdateSubtreeOverflow) {
-          // FIXME (bug 1133392): Continuations?
-          AddSubtreeToOverflowTracker(frame);
+          for (nsIFrame *cont = frame; cont; cont =
+                 nsLayoutUtils::GetNextContinuationOrIBSplitSibling(cont)) {
+            AddSubtreeToOverflowTracker(cont);
+          }
+          // The work we just did in AddSubtreeToOverflowTracker
+          // subsumes some of the other hints:
+          hint = NS_SubtractHint(hint,
+                   NS_CombineHint(nsChangeHint_UpdateOverflow,
+                                  nsChangeHint_UpdatePostTransformOverflow));
         }
         if (hint & nsChangeHint_ChildrenOnlyTransform) {
           // The overflow areas of the child frames need to be updated:
@@ -866,15 +873,13 @@
         if (!(frame->GetStateBits() &
               (NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN))) {
           if (hint & (nsChangeHint_UpdateOverflow |
-                      nsChangeHint_UpdateSubtreeOverflow |
                       nsChangeHint_UpdatePostTransformOverflow)) {
             OverflowChangedTracker::ChangeKind changeKind;
             // If we have both nsChangeHint_UpdateOverflow and
             // nsChangeHint_UpdatePostTransformOverflow,
             // CHILDREN_CHANGED is selected as it is
             // strictly stronger.
-            if (hint & (nsChangeHint_UpdateOverflow |
-                        nsChangeHint_UpdateSubtreeOverflow)) {
+            if (hint & nsChangeHint_UpdateOverflow) {
               changeKind = OverflowChangedTracker::CHILDREN_CHANGED;
             } else {
               changeKind = OverflowChangedTracker::TRANSFORM_CHANGED;
@@ -1798,14 +1803,10 @@
   mPendingRestyles.AddPendingRestyle(aElement, aRestyleHint, aMinChangeHint);
 
   // Set mHavePendingNonAnimationRestyles for any restyle that could
-  // possibly contain non-animation styles.  Unfortunately there's one
-  // level of the cascade and associated change hint
-  // (eRestyle_StyleAttribute) where we don't fully distinguish.
-  // FIXME (bug 1133439): We could at least distinguish by having two
-  // separate eRestyle_StyleAttribute hints, one for animations and one
-  // for other things.
-  if (aRestyleHint & ~(eRestyle_CSSTransitions | eRestyle_CSSAnimations |
-                       eRestyle_SVGAttrAnimations)) {
+  // possibly contain non-animation styles (i.e., those that require us
+  // to do an animation-only style flush before processing style changes
+  // to ensure correct initialization of CSS transitions).
+  if (aRestyleHint & ~eRestyle_AllHintsWithAnimations) {
     mHavePendingNonAnimationRestyles = true;
   }
 
@@ -2435,7 +2436,10 @@
                                  RestyleTracker& aRestyleTracker,
                                  TreeMatchContext& aTreeMatchContext,
                                  nsTArray<nsIContent*>&
-                                   aVisibleKidsOfHiddenElement)
+                                   aVisibleKidsOfHiddenElement,
+                                 nsTArray<ContextToClear>& aContextsToClear,
+                                 nsTArray<nsRefPtr<nsStyleContext>>&
+                                   aSwappedStructOwners)
   : mPresContext(aPresContext)
   , mFrame(aFrame)
   , mParentContent(nullptr)
@@ -2450,6 +2454,8 @@
   , mRestyleTracker(aRestyleTracker)
   , mTreeMatchContext(aTreeMatchContext)
   , mResolvedChild(nullptr)
+  , mContextsToClear(aContextsToClear)
+  , mSwappedStructOwners(aSwappedStructOwners)
 #ifdef ACCESSIBILITY
   , mDesiredA11yNotifications(eSendAllNotifications)
   , mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
@@ -2480,6 +2486,8 @@
   , mRestyleTracker(aParentRestyler.mRestyleTracker)
   , mTreeMatchContext(aParentRestyler.mTreeMatchContext)
   , mResolvedChild(nullptr)
+  , mContextsToClear(aParentRestyler.mContextsToClear)
+  , mSwappedStructOwners(aParentRestyler.mSwappedStructOwners)
 #ifdef ACCESSIBILITY
   , mDesiredA11yNotifications(aParentRestyler.mKidsDesiredA11yNotifications)
   , mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
@@ -2524,6 +2532,8 @@
   , mRestyleTracker(aParentRestyler.mRestyleTracker)
   , mTreeMatchContext(aParentRestyler.mTreeMatchContext)
   , mResolvedChild(nullptr)
+  , mContextsToClear(aParentRestyler.mContextsToClear)
+  , mSwappedStructOwners(aParentRestyler.mSwappedStructOwners)
 #ifdef ACCESSIBILITY
   , mDesiredA11yNotifications(aParentRestyler.mDesiredA11yNotifications)
   , mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
@@ -2543,7 +2553,10 @@
                                  RestyleTracker& aRestyleTracker,
                                  TreeMatchContext& aTreeMatchContext,
                                  nsTArray<nsIContent*>&
-                                 aVisibleKidsOfHiddenElement)
+                                   aVisibleKidsOfHiddenElement,
+                                 nsTArray<ContextToClear>& aContextsToClear,
+                                 nsTArray<nsRefPtr<nsStyleContext>>&
+                                   aSwappedStructOwners)
   : mPresContext(aPresContext)
   , mFrame(nullptr)
   , mParentContent(nullptr)
@@ -2556,6 +2569,8 @@
   , mRestyleTracker(aRestyleTracker)
   , mTreeMatchContext(aTreeMatchContext)
   , mResolvedChild(nullptr)
+  , mContextsToClear(aContextsToClear)
+  , mSwappedStructOwners(aSwappedStructOwners)
 #ifdef ACCESSIBILITY
   , mDesiredA11yNotifications(eSendAllNotifications)
   , mKidsDesiredA11yNotifications(mDesiredA11yNotifications)
@@ -2804,6 +2819,19 @@
       // this old style context to point to its new parent.
       LOG_RESTYLE("moving style context %p from old parent %p to new parent %p",
                   oldContext.get(), oldContext->GetParent(), newParent);
+      // We keep strong references to the new parent around until the end
+      // of the restyle, in case:
+      //   (a) we swapped structs between the old and new parent,
+      //   (b) some descendants of the old parent are not getting restyled
+      //       (which is the reason for the existence of
+      //       ClearCachedInheritedStyleDataOnDescendants),
+      //   (d) something under ProcessPendingRestyles (which notably is called
+      //       *before* ClearCachedInheritedStyleDataOnDescendants is called
+      //       on the old context) causes the new parent to be destroyed, thus
+      //       destroying its owned structs, and
+      //   (c) something under ProcessPendingRestyles then wants to use of those
+      //       now destroyed structs (through the old parent's descendants).
+      mSwappedStructOwners.AppendElement(newParent);
       oldContext->MoveTo(newParent);
     }
 
@@ -2842,17 +2870,29 @@
   if (oldContext && !oldContext->HasSingleReference()) {
     // If we swapped some structs out of oldContext in the RestyleSelf call
     // and after the RestyleChildren call we still have other strong references
-    // to it, we need to make ensure its descendants don't cached any of the
+    // to it, we need to make ensure its descendants don't cache any of the
     // structs that were swapped out.
     //
-    // Most of the time we will not get in here; we do for example when the
-    // style context is being held on to by an nsComputedDOMStyle object.
+    // Much of the time we will not get in here; we do for example when the
+    // style context is shared with a later IB split sibling (which we won't
+    // restyle until a bit later) or if other code is holding a strong reference
+    // to the style context (as is done by nsTransformedTextRun objects, which
+    // can be referenced by a text frame's mTextRun longer than the frame's
+    // mStyleContext).
     //
-    // Strictly we only have to do this if we have a child whose old or new
-    // style context is shared (as in that case we would not have swapped that
-    // child's structs and it would have kept its now out of date cached
-    // structs).  For now we don't bother tracking that.
-    oldContext->ClearCachedInheritedStyleDataOnDescendants(swappedStructs);
+    // We coalesce entries in mContextsToClear when we detect that the last
+    // style context appended has oldContext as its parent, as
+    // ClearCachedInheritedStyleDataOnDescendants handles a whole subtree
+    // of style contexts.
+    if (!mContextsToClear.IsEmpty() &&
+        mContextsToClear.LastElement().mStyleContext->GetParent() == oldContext &&
+        mContextsToClear.LastElement().mStructs == swappedStructs) {
+      mContextsToClear.LastElement().mStyleContext = Move(oldContext);
+    } else {
+      ContextToClear* toClear = mContextsToClear.AppendElement();
+      toClear->mStyleContext = Move(oldContext);
+      toClear->mStructs = swappedStructs;
+    }
   }
 
   mRestyleTracker.AddRestyleRootsIfAwaitingRestyle(descendants);
@@ -3025,7 +3065,7 @@
 
   RestyleResult result;
 
-  if (aRestyleHint || true /* XXX bug 1092363 */) {
+  if (aRestyleHint) {
     result = eRestyleResult_Continue;
   } else {
     result = ComputeRestyleResultFromFrame(aSelf);
@@ -3316,9 +3356,7 @@
       // previous continuation, so newContext == oldContext.
 
       if (result != eRestyleResult_Stop) {
-        if (true) {
-          // XXX bug 1092363
-        } else if (copyFromContinuation) {
+        if (copyFromContinuation) {
           LOG_RESTYLE("not swapping style structs, since we copied from a "
                       "continuation");
         } else if (oldContext->IsShared() && newContext->IsShared()) {
@@ -3533,7 +3571,8 @@
             !f->GetPrevContinuation()) {
           if (!(f->GetStateBits() & NS_FRAME_OUT_OF_FLOW)) {
             ComputeStyleChangeFor(f, mChangeList, aMinHint, aRestyleTracker,
-                                  aRestyleHint);
+                                  aRestyleHint, mContextsToClear,
+                                  mSwappedStructOwners);
           }
         }
       }
@@ -3549,12 +3588,27 @@
                                        nsStyleChangeList* aChangeList,
                                        nsChangeHint       aMinChange,
                                        RestyleTracker&    aRestyleTracker,
-                                       nsRestyleHint      aRestyleHint)
+                                       nsRestyleHint      aRestyleHint,
+                                       nsTArray<ContextToClear>&
+                                         aContextsToClear,
+                                       nsTArray<nsRefPtr<nsStyleContext>>&
+                                         aSwappedStructOwners)
 {
-  PROFILER_LABEL("ElementRestyler", "ComputeStyleChangeFor",
-    js::ProfileEntry::Category::CSS);
-
   nsIContent* content = aFrame->GetContent();
+  nsAutoCString idStr;
+  if (profiler_is_active() && content) {
+    nsIAtom* id = content->GetID();
+    if (id) {
+      id->ToUTF8String(idStr);
+    } else {
+      idStr.AssignLiteral("?");
+    }
+  }
+
+  PROFILER_LABEL_PRINTF("ElementRestyler", "ComputeStyleChangeFor",
+                        js::ProfileEntry::Category::CSS,
+                        content ? "Element: %s" : "%s",
+                        content ? idStr.get() : "");
   if (aMinChange) {
     aChangeList->AppendChange(aFrame, content, aMinChange);
   }
@@ -3597,7 +3651,8 @@
       ElementRestyler restyler(presContext, cont, aChangeList,
                                aMinChange, aRestyleTracker,
                                treeMatchContext,
-                               visibleKidsOfHiddenElement);
+                               visibleKidsOfHiddenElement,
+                               aContextsToClear, aSwappedStructOwners);
 
       restyler.Restyle(aRestyleHint);
 
@@ -3972,6 +4027,20 @@
 #endif
 }
 
+static void
+ClearCachedInheritedStyleDataOnDescendants(
+    nsTArray<ElementRestyler::ContextToClear>& aContextsToClear)
+{
+  for (size_t i = 0; i < aContextsToClear.Length(); i++) {
+    auto& entry = aContextsToClear[i];
+    if (!entry.mStyleContext->HasSingleReference()) {
+      entry.mStyleContext->ClearCachedInheritedStyleDataOnDescendants(
+          entry.mStructs);
+    }
+    entry.mStyleContext = nullptr;
+  }
+}
+
 void
 RestyleManager::ComputeAndProcessStyleChange(nsIFrame*          aFrame,
                                              nsChangeHint       aMinChange,
@@ -3980,9 +4049,19 @@
 {
   MOZ_ASSERT(mReframingStyleContexts, "should have rsc");
   nsStyleChangeList changeList;
-  ElementRestyler::ComputeStyleChangeFor(aFrame, &changeList, aMinChange,
-                                         aRestyleTracker, aRestyleHint);
-  ProcessRestyledFrames(changeList);
+  nsTArray<ElementRestyler::ContextToClear> contextsToClear;
+  {
+    // swappedStructOwners needs to be kept alive until after
+    // ProcessRestyledFrames; see comment in ElementRestyler::Restyle.
+    // (Destroying it before the ClearCachedInheritedStyleDataOnDescendants call
+    // helps minimize the work done by that function.)
+    nsTArray<nsRefPtr<nsStyleContext>> swappedStructOwners;
+    ElementRestyler::ComputeStyleChangeFor(aFrame, &changeList, aMinChange,
+                                           aRestyleTracker, aRestyleHint,
+                                           contextsToClear, swappedStructOwners);
+    ProcessRestyledFrames(changeList);
+  }
+  ClearCachedInheritedStyleDataOnDescendants(contextsToClear);
 }
 
 void
@@ -4005,13 +4084,23 @@
     parent && parent->IsElement() ? parent->AsElement() : nullptr;
   treeMatchContext.InitAncestors(parentElement);
   nsTArray<nsIContent*> visibleKidsOfHiddenElement;
-  nsStyleChangeList changeList;
-  ElementRestyler r(frame->PresContext(), aElement, &changeList, aMinChange,
-                    aRestyleTracker, treeMatchContext,
-                    visibleKidsOfHiddenElement);
-  r.RestyleChildrenOfDisplayContentsElement(frame, aNewContext, aMinChange,
-                                            aRestyleTracker, aRestyleHint);
-  ProcessRestyledFrames(changeList);
+  nsTArray<ElementRestyler::ContextToClear> contextsToClear;
+  {
+    // swappedStructOwners needs to be kept alive until after
+    // ProcessRestyledFrames; see comment in ElementRestyler::Restyle.
+    // (Destroying it before the ClearCachedInheritedStyleDataOnDescendants call
+    // helps minimize the work done by that function.)
+    nsTArray<nsRefPtr<nsStyleContext>> swappedStructOwners;
+    nsStyleChangeList changeList;
+    ElementRestyler r(frame->PresContext(), aElement, &changeList, aMinChange,
+                      aRestyleTracker, treeMatchContext,
+                      visibleKidsOfHiddenElement, contextsToClear,
+                      swappedStructOwners);
+    r.RestyleChildrenOfDisplayContentsElement(frame, aNewContext, aMinChange,
+                                              aRestyleTracker, aRestyleHint);
+    ProcessRestyledFrames(changeList);
+  }
+  ClearCachedInheritedStyleDataOnDescendants(contextsToClear);
 }
 
 AutoDisplayContentsAncestorPusher::AutoDisplayContentsAncestorPusher(
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/RestyleManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/RestyleManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/RestyleManager.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/RestyleManager.h	2015-02-28 15:03:08.000000000 +0000
@@ -499,6 +499,11 @@
 public:
   typedef mozilla::dom::Element Element;
 
+  struct ContextToClear {
+    nsRefPtr<nsStyleContext> mStyleContext;
+    uint32_t mStructs;
+  };
+
   // Construct for the root of the subtree that we're restyling.
   ElementRestyler(nsPresContext* aPresContext,
                   nsIFrame* aFrame,
@@ -506,7 +511,9 @@
                   nsChangeHint aHintsHandledByAncestors,
                   RestyleTracker& aRestyleTracker,
                   TreeMatchContext& aTreeMatchContext,
-                  nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement);
+                  nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement,
+                  nsTArray<ContextToClear>& aContextsToClear,
+                  nsTArray<nsRefPtr<nsStyleContext>>& aSwappedStructOwners);
 
   // Construct for an element whose parent is being restyled.
   enum ConstructorFlags {
@@ -534,7 +541,9 @@
                   nsChangeHint aHintsHandledByAncestors,
                   RestyleTracker& aRestyleTracker,
                   TreeMatchContext& aTreeMatchContext,
-                  nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement);
+                  nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement,
+                  nsTArray<ContextToClear>& aContextsToClear,
+                  nsTArray<nsRefPtr<nsStyleContext>>& aSwappedStructOwners);
 
   /**
    * Restyle our frame's element and its subtree.
@@ -574,7 +583,10 @@
                                     nsStyleChangeList* aChangeList,
                                     nsChangeHint       aMinChange,
                                     RestyleTracker&    aRestyleTracker,
-                                    nsRestyleHint      aRestyleHint);
+                                    nsRestyleHint      aRestyleHint,
+                                    nsTArray<ContextToClear>& aContextsToClear,
+                                    nsTArray<nsRefPtr<nsStyleContext>>&
+                                      aSwappedStructOwners);
 
 #ifdef RESTYLE_LOGGING
   bool ShouldLogRestyle() {
@@ -703,6 +715,14 @@
   RestyleTracker& mRestyleTracker;
   TreeMatchContext& mTreeMatchContext;
   nsIFrame* mResolvedChild; // child that provides our parent style context
+  // Array of style context subtrees in which we need to clear out cached
+  // structs at the end of the restyle (after change hints have been
+  // processed).
+  nsTArray<ContextToClear>& mContextsToClear;
+  // Style contexts that had old structs swapped into it and which should
+  // stay alive until the end of the restyle.  (See comment in
+  // ElementRestyler::Restyle.)
+  nsTArray<nsRefPtr<nsStyleContext>>& mSwappedStructOwners;
 
 #ifdef ACCESSIBILITY
   const DesiredA11yNotifications mDesiredA11yNotifications;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/SelectionCarets.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/SelectionCarets.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/SelectionCarets.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/SelectionCarets.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -186,6 +186,12 @@
     movePoint = mouseEvent->AsGUIEvent()->refPoint;
   }
 
+  // XUL has no SelectionCarets elements.
+  if (!mPresShell->GetSelectionCaretsStartElement() ||
+      !mPresShell->GetSelectionCaretsEndElement()) {
+    return nsEventStatus_eIgnore;
+  }
+
   // Get event coordinate relative to root frame
   nsIFrame* rootFrame = mPresShell->GetRootFrame();
   if (!rootFrame) {
@@ -457,7 +463,7 @@
     return;
   }
 
-  int32_t rangeCount = selection->GetRangeCount();
+  int32_t rangeCount = selection->RangeCount();
   nsRefPtr<nsRange> firstRange = selection->GetRangeAt(0);
   nsRefPtr<nsRange> lastRange = selection->GetRangeAt(rangeCount - 1);
 
@@ -763,7 +769,7 @@
     return nsEventStatus_eConsumeNoDefault;
   }
 
-  int32_t rangeCount = selection->GetRangeCount();
+  int32_t rangeCount = selection->RangeCount();
   if (rangeCount <= 0) {
     return nsEventStatus_eConsumeNoDefault;
   }
@@ -819,7 +825,7 @@
     return 0;
   }
 
-  int32_t rangeCount = selection->GetRangeCount();
+  int32_t rangeCount = selection->RangeCount();
   if (rangeCount <= 0) {
     return 0;
   }
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/Ahem.ttf and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/Ahem.ttf differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/bug1132768-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/bug1132768-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/bug1132768-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/bug1132768-1.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <script src="/tests/SimpleTest/EventUtils.js"></script>
+  <script>
+    function test() {
+      synthesizeMouseAtCenter(document.querySelector("span"), {});
+    }
+    function focused() {
+      document.documentElement.removeAttribute("class");
+    }
+  </script>
+  <body onload="setTimeout(test, 0)">
+    <div contenteditable spellcheck="false" onfocus="focused()"
+         style="outline: none">foo<span contenteditable=false>bar</span>baz</div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/bug1132768-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/bug1132768-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/bug1132768-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/bug1132768-1-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <script>
+    function test() {
+      focus();
+      getSelection().selectAllChildren(document.querySelector("span"));
+    }
+  </script>
+  <body onload="test()">
+    <div>foo<span>bar</span>baz</div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/chrome/test_bug551434.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/chrome/test_bug551434.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/chrome/test_bug551434.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/chrome/test_bug551434.html	2015-02-28 15:03:09.000000000 +0000
@@ -31,11 +31,10 @@
 
   // key events should not be retargeted when the focus changes to an
   // element in the same document.
-  synthesizeKey("a", { type: "keydown" });
+  synthesizeKey("a", { type: "keydown", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_B });
   is(document.activeElement, $("i2"), "input 2 in focused");
 
-  synthesizeKey("a", { type: "keypress" });
-  synthesizeKey("a", { type: "keyup" });
+  synthesizeKey("a", { type: "keyup", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_B });
 
   is(gKeyDown1, 1, "keydown on input 1");
   is(gKeyPress1, 0, "keypress on input 1");
@@ -53,9 +52,7 @@
 
   var childWinObj = frames[0].wrappedJSObject;
 
-  synthesizeKey("b", { type: "keydown" });
-  synthesizeKey("b", { type: "keypress" });
-  synthesizeKey("b", { type: "keyup" });
+  synthesizeKey("b", { code: "KeyB", keyCode: KeyboardEvent.DOM_VK_B });
   is(gKeyDown3, 1, "keydown on input 3");
   is(gKeyPress3, 1, "keypress on input 3");
   is(gKeyUp3, 1, "keyup on input 3");
@@ -74,9 +71,7 @@
   // element in a chrome document from a content document.
   i4.addEventListener("keydown", function () $("i3").focus(), false);
 
-  synthesizeKey("c", { type: "keydown" });
-  synthesizeKey("c", { type: "keypress" });
-  synthesizeKey("c", { type: "keyup" });
+  synthesizeKey("c", { code: "KeyC", keyCode: KeyboardEvent.DOM_VK_C });
 
   is(gKeyDown3, 1, "keydown on input 3");
   is(gKeyPress3, 1, "keypress on input 3");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/marionette/test_selectioncarets_multiplerange.py	2015-02-28 15:03:09.000000000 +0000
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from marionette import Actions
+from marionette_driver.by import By
+from marionette_driver.marionette import Actions
 from marionette_test import MarionetteTestCase
-from selection import SelectionManager
-from gestures import long_press_without_contextmenu
+from marionette_driver.selection import SelectionManager
+from marionette_driver.gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsMultipleRangeTest(MarionetteTestCase):
@@ -21,17 +21,16 @@
     def openTestHtml(self, enabled=True):
         # Open html for testing and enable selectioncaret and
         # non-editable support
-        self.marionette.execute_script(
-            'SpecialPowers.setBoolPref("selectioncaret.enabled", %s);' %
-            ('true' if enabled else 'false'))
-        self.marionette.execute_script(
-            'SpecialPowers.setBoolPref("selectioncaret.noneditable", %s);' %
-            ('true' if enabled else 'false'))
+        self.marionette.execute_async_script(
+            'SpecialPowers.pushPrefEnv({"set": [["selectioncaret.enabled", %s],["selectioncaret.noneditable", %s]]}, marionetteScriptFinished);' %
+            ( ('true' if enabled else 'false'),  ('true' if enabled else 'false')))
 
         test_html = self.marionette.absolute_url('test_selectioncarets_multiplerange.html')
         self.marionette.navigate(test_html)
 
         self._body = self.marionette.find_element(By.ID, 'bd')
+        self._sel1 = self.marionette.find_element(By.ID, 'sel1')
+        self._sel2 = self.marionette.find_element(By.ID, 'sel2')
         self._sel3 = self.marionette.find_element(By.ID, 'sel3')
         self._sel4 = self.marionette.find_element(By.ID, 'sel4')
         self._sel6 = self.marionette.find_element(By.ID, 'sel6')
@@ -103,3 +102,26 @@
         self.actions.flick(self._body, caret2_x, caret2_y, end_caret2_x, end_caret2_y, 1).perform()
         self.assertEqual(self._to_unix_line_ending(sel.selected_content.strip()),
             'this 3\nuser can select this 4\nuser can select this 5\nuser')
+
+    def test_drag_caret_to_beginning_of_a_line(self):
+        '''Bug 1094056
+        Test caret visibility when caret is dragged to beginning of a line
+        '''
+        self.openTestHtml(enabled=True)
+
+        # Select the first word in the second line
+        self._long_press_to_select_word(self._sel2, 0)
+        sel = SelectionManager(self._body)
+        (start_caret_x, start_caret_y), (end_caret_x, end_caret_y) = sel.selection_carets_location()
+
+        # Select target word in the first line
+        self._long_press_to_select_word(self._sel1, 2)
+
+        # Drag end caret to the beginning of the second line
+        (caret1_x, caret1_y), (caret2_x, caret2_y) = sel.selection_carets_location()
+        self.actions.flick(self._body, caret2_x, caret2_y, start_caret_x, start_caret_y).perform()
+
+        # Drag end caret back to the target word
+        self.actions.flick(self._body, start_caret_x, start_caret_y, caret2_x, caret2_y).perform()
+
+        self.assertEqual(self._to_unix_line_ending(sel.selected_content.strip()), 'select')
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/marionette/test_selectioncarets.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/marionette/test_selectioncarets.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/marionette/test_selectioncarets.py	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/marionette/test_selectioncarets.py	2015-02-28 15:03:09.000000000 +0000
@@ -3,12 +3,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from marionette import Actions
+from marionette_driver.by import By
+from marionette_driver.marionette import Actions
 from marionette_test import MarionetteTestCase
+from marionette_driver.selection import SelectionManager
+from marionette_driver.gestures import long_press_without_contextmenu
+
 from math import ceil, floor
-from selection import SelectionManager
-from gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsTest(MarionetteTestCase):
@@ -18,7 +19,9 @@
     _textarea_rtl_selector = (By.ID, 'textarea_rtl')
     _contenteditable_selector = (By.ID, 'contenteditable')
     _content_selector = (By.ID, 'content')
+    _textarea2_selector = (By.ID, 'textarea2')
     _contenteditable2_selector = (By.ID, 'contenteditable2')
+    _content2_selector = (By.ID, 'content2')
 
     def setUp(self):
         # Code to execute before a tests are run.
@@ -28,10 +31,9 @@
     def openTestHtml(self, enabled=True):
         '''Open html for testing and locate elements, and enable/disable touch
         caret.'''
-        self.marionette.execute_script(
-            'SpecialPowers.setBoolPref("selectioncaret.enabled", %s);' %
+        self.marionette.execute_async_script(
+            'SpecialPowers.pushPrefEnv({"set": [["selectioncaret.enabled", %s]]}, marionetteScriptFinished);' %
             ('true' if enabled else 'false'))
-
         test_html = self.marionette.absolute_url('test_selectioncarets.html')
         self.marionette.navigate(test_html)
 
@@ -40,7 +42,20 @@
         self._textarea_rtl = self.marionette.find_element(*self._textarea_rtl_selector)
         self._contenteditable = self.marionette.find_element(*self._contenteditable_selector)
         self._content = self.marionette.find_element(*self._content_selector)
+
+    def openTestHtml2(self, enabled=True):
+        '''Open html for testing and locate elements, and enable/disable touch
+        caret.'''
+        self.marionette.execute_script(
+            'SpecialPowers.setBoolPref("selectioncaret.enabled", %s);' %
+            ('true' if enabled else 'false'))
+
+        test_html2 = self.marionette.absolute_url('test_selectioncarets_multipleline.html')
+        self.marionette.navigate(test_html2)
+
+        self._textarea2 = self.marionette.find_element(*self._textarea2_selector)
         self._contenteditable2 = self.marionette.find_element(*self._contenteditable2_selector)
+        self._content2 = self.marionette.find_element(*self._content2_selector)
 
     def _first_word_location(self, el):
         '''Get the location (x, y) of the first word in el.
@@ -365,6 +380,14 @@
     ########################################################################
     # <div> non-editable test cases with selection carets enabled
     ########################################################################
+    def test_content_non_editable_long_press_to_select_a_word(self):
+        self.openTestHtml(enabled=True)
+        self._test_long_press_to_select_a_word(self._content, self.assertEqual)
+
+    def test_content_non_editable_move_selection_carets(self):
+        self.openTestHtml(enabled=True)
+        self._test_move_selection_carets(self._content, self.assertEqual)
+
     def test_content_non_editable_minimum_select_one_character_by_selection(self):
         self.openTestHtml(enabled=True)
         self._test_minimum_select_one_character(self._content, self.assertEqual)
@@ -386,8 +409,22 @@
         self._test_handle_tilt_when_carets_overlap_to_each_other(self._content, self.assertEqual)
 
     ########################################################################
-    # <div> contenteditable2 test cases with selection carets enabled
+    # <textarea> (multi-lines) test cases with selection carets enabled
+    ########################################################################
+    def test_textarea2_minimum_select_one_character(self):
+        self.openTestHtml2(enabled=True)
+        self._test_minimum_select_one_character(self._textarea2, self.assertEqual)
+
+    ########################################################################
+    # <div> contenteditable2 (multi-lines) test cases with selection carets enabled
     ########################################################################
     def test_contenteditable2_minimum_select_one_character(self):
-        self.openTestHtml(enabled=True)
+        self.openTestHtml2(enabled=True)
         self._test_minimum_select_one_character(self._contenteditable2, self.assertEqual)
+
+    ########################################################################
+    # <div> non-editable2 (multi-lines) test cases with selection carets enabled
+    ########################################################################
+    def test_content_non_editable2_minimum_select_one_character(self):
+        self.openTestHtml2(enabled=True)
+        self._test_minimum_select_one_character(self._content2, self.assertEqual)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/marionette/test_touchcaret.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/marionette/test_touchcaret.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/marionette/test_touchcaret.py	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/marionette/test_touchcaret.py	2015-02-28 15:03:09.000000000 +0000
@@ -3,10 +3,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from marionette import Actions
+from marionette_driver.by import By
+from marionette_driver.marionette import Actions
+from marionette_driver.selection import SelectionManager
 from marionette_test import MarionetteTestCase
-from selection import SelectionManager
 
 
 class TouchCaretTest(MarionetteTestCase):
@@ -44,8 +44,8 @@
         set touch caret expiration time in milliseconds).
 
         '''
-        self.marionette.execute_script(
-            'SpecialPowers.setBoolPref("touchcaret.enabled", %s);' %
+        self.marionette.execute_async_script(
+            'SpecialPowers.pushPrefEnv({"set": [["touchcaret.enabled", %s]]}, marionetteScriptFinished);' %
             ('true' if enabled else 'false'))
 
         # Set a larger expiration time to avoid intermittent test failures.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/mochitest.ini	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/mochitest.ini	2015-02-28 15:03:09.000000000 +0000
@@ -2,6 +2,7 @@
 # Android: SLOW_DIRECTORY; Mulet: bug 1048441, bug 1087611, bug 1112988, etc.
 skip-if = toolkit == 'android' || buildapp == 'mulet'
 support-files =
+  Ahem.ttf
   border_radius_hit_testing_iframe.html
   preserve3d_sorting_hit_testing_iframe.html
   image_rgrg-256x256.png
@@ -69,6 +70,13 @@
   bug1123067-2.html
   bug1123067-3.html
   bug1123067-ref.html
+  bug1132768-1.html
+  bug1132768-1-ref.html
+  selection-utils.js
+  multi-range-user-select.html
+  multi-range-user-select-ref.html
+  multi-range-script-select.html
+  multi-range-script-select-ref.html
 
 [test_preserve3d_sorting_hit_testing.html]
 [test_after_paint_pref.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-script-select.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-script-select.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-script-select.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-script-select.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,185 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait"><head>
+    <meta charset="utf-8">
+    <title>Testcase #1 for bug 1129078</title>
+    <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+    <script src="selection-utils.js"></script>
+
+<style type="text/css">
+@font-face {
+  font-family: Ahem;
+  src: url("Ahem.ttf");
+}
+html,body { margin:0; padding: 0; }
+body,pre { font-family: Ahem; font-size: 20px; }
+</style>
+</head>
+<body>
+
+<pre id="select">
+2af45494-ak7e-11e4-a0c6-a7e7
+38222880-bj6d-11e4-8064-fb7b
+3d649ae4-ci5c-11e4-995d-17b2
+434351bc-dh4b-11e4-9971-4fc8
+4dc0e0b4-eg4a-11e4-8c28-5319
+a96319c8-ad7d-11e4-b312-039c
+</pre>
+
+<pre id="log" style="border:1px solid green"></pre>
+
+<script>
+window.info = parent.info;
+window.is = parent.is;
+window.isnot = parent.isnot;
+window.ok = parent.ok;
+
+function setupPrevSelection() {
+  var sel = window.getSelection();
+  var e = document.querySelector('#select');
+  addChildRanges([[0,150,0,160], [0,65,0,70], [0,15,0,15]], e);
+  sel.extend(e.firstChild, 10);  // to get eDirPrevious direction
+}
+
+function setupNextSelection() {
+  var sel = window.getSelection();
+  var e = document.querySelector('#select');
+  addChildRanges([[0,10,0,15], [0,65,0,70], [0,150,0,160]], e);
+}
+
+var ops = {
+  S_ : shiftClick,
+  SA : shiftAccelClick,
+  AD : accelDragSelect,
+  SL : keyLeft,
+  SR : keyRight
+}
+
+function runTest() {
+  var e = document.querySelector('#select');
+  var hash = window.location.hash
+  if (hash.substring(0,5)=="#prev")
+    setupPrevSelection();
+  else
+    setupNextSelection();
+  var op = hash.substring(6,8);
+  var action = ops[op];
+  var test = hash.substring(0,6);
+  if (hash.substring(0,5) == "#prev") {
+    if (test == "#prev1") {
+      if (action == keyLeft) {
+        keyLeft({shiftKey:true}, 2)
+        checkRanges([[0,8,0,15], [0,65,0,70], [0,150,0,160]], e);
+      } else if (action == keyRight) {
+        keyRight({shiftKey:true}, 2)
+        checkRanges([[0,12,0,15], [0,65,0,70], [0,150,0,160]], e);
+      } else if (action == accelDragSelect) {
+        accelDragSelect(e, 30, 50);
+        checkRanges([[0,1,0,2], [0,10,0,15], [0,65,0,70], [0,150,0,160]], e);
+      } else {
+        action(e, 30);
+        checkRanges([[0,1,0,15], [0,65,0,70], [0,150,0,160]], e);
+      }
+    } else if (test == "#prev2") {
+      action(e, 260);
+      checkRanges([[0,13,0,15], [0,65,0,70], [0,150,0,160]], e);
+    } else if (test == "#prev3") {
+      action(e, 400);
+      if (action == shiftClick)
+        checkRanges([[0,15,0,20], [0,65,0,70], [0,150,0,160]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,15,0,20], [0,65,0,70], [0,150,0,160]], e);
+    } else if (test == "#prev4") {
+      action(e, 180, 65);
+      if (action == shiftClick)
+        checkRanges([[0,15,0,67], [0,67,0,70], [0,150,0,160]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,15,0,67], [0,67,0,70], [0,150,0,160]], e); 
+     } else if (test == "#prev5") {
+      action(e, 440, 65);
+      if (action == shiftClick)
+        checkRanges([[0,15,0,80], [0,150,0,160]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,15,0,80], [0,150,0,160]], e);
+    } else if (test == "#prev6") {
+      action(e, 140, 125);
+      if (action == shiftClick)
+        checkRanges([[0,15,0,152], [0,152,0,160]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,15,0,152], [0,152,0,160]], e);
+    } else if (test == "#prev7") {
+      if (action == accelDragSelect) {
+        accelDragSelect(e, 460, 500, 125);
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,160], [0,168,0,170]], e);
+      } else if (action == shiftClick) {
+        action(e, 500, 125);
+        checkRanges([[0,15,0,170]], e);
+      } else if (action == shiftAccelClick) {
+        action(e, 500, 125);
+        checkRanges([[0,15,0,170]], e);
+      }
+    }
+  } else {
+    if (test == "#next1") {
+      if (action == keyLeft) {
+        keyLeft({shiftKey:true}, 2)
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,158]], e);
+      } else if (action == keyRight) {
+        keyRight({shiftKey:true}, 2)
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,162]], e);
+      } else if (action == accelDragSelect) {
+        accelDragSelect(e, 30, 50);
+        checkRanges([[0,1,0,2], [0,10,0,15], [0,65,0,70], [0,150,0,160]], e);
+      } else {
+        action(e, 30);
+        checkRanges([[0,1,0,150]], e);
+      }
+    } else if (test == "#next2") {
+      action(e, 260);
+      checkRanges([[0,10,0,13], [0,13,0,150]], e);
+    } else if (test == "#next3") {
+      action(e, 400);
+      if (action == shiftClick)
+        checkRanges([[0,10,0,15], [0,20,0,150]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,10,0,15], [0,20,0,150]], e);
+    } else if (test == "#next4") {
+      action(e, 180, 65);
+      if (action == shiftClick)
+        checkRanges([[0,10,0,15], [0,65,0,67], [0,67,0,150]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,10,0,15], [0,65,0,67], [0,67,0,150]], e);
+     } else if (test == "#next5") {
+      action(e, 440, 65);
+      if (action == shiftClick)
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,80,0,150]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,80,0,150]], e);
+    } else if (test == "#next6") {
+      action(e, 140, 125);
+      if (action == shiftClick)
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,152]], e);
+      else if (action == shiftAccelClick)
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,152]], e);
+    } else if (test == "#next7") {
+      if (action == accelDragSelect) {
+        accelDragSelect(e, 460, 500, 125);
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,160], [0,168,0,170]], e);
+      } else if (action == shiftClick) {
+        action(e, 500, 125);
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,170]], e);
+      } else if (action == shiftAccelClick) {
+        action(e, 500, 125);
+        checkRanges([[0,10,0,15], [0,65,0,70], [0,150,0,170]], e);
+      }
+    }
+  }
+  document.documentElement.removeAttribute("class");
+}
+
+SimpleTest.waitForFocus(runTest);
+
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-script-select-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-script-select-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-script-select-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-script-select-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait"><head>
+    <meta charset="utf-8">
+    <title>Testcase #1 for bug 1129078</title>
+    <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <script src="selection-utils.js"></script>
+
+<style type="text/css">
+@font-face {
+  font-family: Ahem;
+  src: url("Ahem.ttf");
+}
+html,body { margin:0; padding: 0; }
+body,pre { font-family: Ahem; font-size: 20px; }
+</style>
+</head>
+<body>
+
+<pre id="select">
+2af45494-ak7e-11e4-a0c6-a7e7
+38222880-bj6d-11e4-8064-fb7b
+3d649ae4-ci5c-11e4-995d-17b2
+434351bc-dh4b-11e4-9971-4fc8
+4dc0e0b4-eg4a-11e4-8c28-5319
+a96319c8-ad7d-11e4-b312-039c
+</pre>
+
+<pre id="log" style="border:1px solid green"></pre>
+
+<script>
+
+var sel = window.getSelection();
+var e = document.querySelector('#select');
+function setupSelectionPrev3() {
+  addChildRanges([[0,150,0,160], [0,65,0,70], [0,15,0,15]], e);
+  sel.extend(e.firstChild, 10);  // to get eDirPrevious direction
+}
+function setupSelectionPrev2() {
+  addChildRanges([[0,150,0,160], [0,70,0,70]], e);
+  sel.extend(e.firstChild, 65);  // to get eDirPrevious direction
+}
+function setupSelectionPrev1() {
+  addChildRanges([[0,160,0,160]], e);
+  sel.extend(e.firstChild, 150);  // to get eDirPrevious direction
+}
+
+function setupSelectionNext3() {
+  addChildRanges([[0,10,0,15], [0,65,0,70], [0,150,0,160]], e);
+}
+function setupSelectionNext2() {
+  addChildRanges([[0,10,0,15], [0,65,0,70]], e);
+}
+function setupSelectionNext2b() {
+  addChildRanges([[0,15,0,80], [0,150,0,160]], e);
+}
+function setupSelectionNext1() {
+  addChildRanges([[0,10,0,15]], e);
+}
+function setupSelectionNext1b() {
+  addChildRanges([[0,15,0,170]], e);
+}
+function setupSelectionNext1c() {
+  addChildRanges([[0,150,0,160]], e);
+}
+
+function runTest() {
+  var hash = window.location.hash
+  var op = hash.substring(6,8);
+  var test = hash.substring(0,6);
+  if (hash.substring(0,5) == "#prev") {
+    if (test == "#prev1") {
+      setupSelectionPrev3();
+      if (op == "SL") {
+        sel.extend(e.firstChild, 8);
+      } else if (op == "SR") {
+        sel.extend(e.firstChild, 12);
+      } else if (op == "AD") {
+        addChildRanges([[0,1,0,2]], e);
+      } else {
+        sel.extend(e.firstChild, 1);
+      }
+    } else if (test == "#prev2") {
+      setupSelectionPrev3();
+      sel.extend(e.firstChild, 13);
+    } else if (test == "#prev3") {
+      if (op == "S_") {
+        setupSelectionPrev3();
+        sel.extend(e.firstChild, 20);
+      } else if (op == "SA") {
+        setupSelectionPrev3();
+        sel.extend(e.firstChild, 20);
+      }
+    } else if (test == "#prev4") {
+      addChildRanges([[0,67,0,70], [0,150,0,160], [0,15,0,67]], e); 
+    } else if (test == "#prev5") {
+      if (op == "S_") {
+        setupSelectionNext2b();
+      } else if (op == "SA") {
+        setupSelectionNext2b();
+      }
+    } else if (test == "#prev6") {
+      addChildRanges([[0,152,0,160], [0,15,0,152]], e);
+    } else if (test == "#prev7") {
+      if (op == "AD") {
+        setupSelectionPrev3();
+        addChildRanges([[0,168,0,170]], e);
+      } else if (op == "S_") {
+        setupSelectionNext1b();
+      } else if (op == "SA") {
+        setupSelectionNext1b();
+      }
+    }
+  } else {
+    if (test == "#next1") {
+      if (op == "SL") {
+        setupSelectionNext3();
+        sel.extend(e.firstChild, 158);
+      } else if (op == "SR") {
+        setupSelectionNext3();
+        sel.extend(e.firstChild, 162);
+      } else if (op == "AD") {
+        setupSelectionNext3();
+        addChildRanges([[0,1,0,2]], e);
+      } else if (op == "S_") {
+        setupSelectionNext1c();
+        sel.extend(e.firstChild, 1);
+      } else if (op == "SA") {
+        setupSelectionNext1c();
+        sel.extend(e.firstChild, 1);
+      }
+    } else if (test == "#next2") {
+      addChildRanges([[0,10,0,13], [0,150,0,151]], e);
+      sel.extend(e.firstChild, 13);
+    } else if (test == "#next3") {
+      if (op == "S_") {
+        addChildRanges([[0,10,0,15], [0,150,0,151]], e);
+        sel.extend(e.firstChild, 20);
+      } else if (op == "SA") {
+        setupSelectionNext3();
+        sel.extend(e.firstChild, 20);
+      }
+    } else if (test == "#next4") {
+      setupSelectionNext3();
+      sel.extend(e.firstChild, 67);
+    } else if (test == "#next5") {
+      if (op == "S_") {
+        setupSelectionNext3();
+        sel.extend(e.firstChild, 80);
+      } else if (op == "SA") {
+        setupSelectionNext3();
+        sel.extend(e.firstChild, 80);
+      }
+    } else if (test == "#next6") {
+      setupSelectionNext3();
+      sel.extend(e.firstChild, 152);
+    } else if (test == "#next7") {
+      setupSelectionNext3();
+      if (op == "AD") {
+        addChildRanges([[0,168,0,170]], e);
+      } else {
+        sel.extend(e.firstChild, 170);
+      }
+    }
+  }
+  document.documentElement.removeAttribute("class");
+}
+
+SimpleTest.waitForFocus(runTest);
+
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-user-select.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-user-select.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-user-select.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-user-select.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,229 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait"><head>
+    <meta charset="utf-8">
+    <title>Testcase #1 for bug 1129078</title>
+    <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+    <script src="selection-utils.js"></script>
+
+<style type="text/css">
+@font-face {
+  font-family: Ahem;
+  src: url("Ahem.ttf");
+}
+html,body { margin:0; padding: 0; }
+body,pre { font-family: Ahem; font-size: 20px; }
+span { -moz-user-select:none; }
+x { -moz-user-select:text; }
+</style>
+</head>
+<body>
+
+<pre id="select">
+2af45494-a<x>k7e-1</x><span id="span2">1e4-a0c6-a7e7
+38222880-bj6d-11e4-8064-fb7b
+3d649ae</span><x>4-ci5</x><span id="span3">c-11e4-995d-17b2
+434351bc-dh4b-11e4-9971-4fc8
+4dc0e0b4-eg4a-11e4-8c28-5319
+a9631</span><x>9c8-ad7d-1</x>1e4-b312-039c
+</pre>
+
+<pre id="log" style="border:1px solid green"></pre>
+
+<script>
+window.info = parent.info;
+window.is = parent.is;
+window.isnot = parent.isnot;
+window.ok = parent.ok;
+
+var sel = window.getSelection();
+
+function enableSelection(id) {
+  var span = document.getElementById(id);
+  span.style.MozUserSelect = 'text';
+}
+
+function setupPrevSelection() {
+  var e = document.querySelector('#select');
+  dragSelectPoints(e, 300, 125, 200, 5);
+}
+
+function setupNextSelection() {
+  var e = document.querySelector('#select');
+  dragSelectPoints(e, 199, 5, 300, 125);
+}
+
+var ops = {
+  S_ : shiftClick,
+  SA : shiftAccelClick,
+  AD : accelDragSelect,
+  SL : keyLeft,
+  SR : keyRight
+}
+
+function runTest() {
+  sel = window.getSelection();
+  sel.removeAllRanges();
+  document.body.offsetHeight;
+  var e = document.querySelector('#select');
+  var hash = window.location.hash
+  if (hash.substring(0,5)=="#prev")
+    setupPrevSelection();
+  else
+    setupNextSelection();
+  var op = hash.substring(6,8);
+  var action = ops[op];
+  var test = hash.substring(0,6);
+  if (hash.substring(0,5) == "#prev") {
+    if (test == "#prev1") {
+      if (action == keyLeft) {
+        keyLeft({shiftKey:true}, 2)
+        checkRanges([[0,8,-1,2], [3,0,-1,4], [5,0,6,0]], e);
+      } else if (action == keyRight) {
+        keyRight({shiftKey:true}, 2)
+        checkRanges([[e.childNodes[1].firstChild,2,-1,2], [3,0,-1,4], [5,0,6,0]], e);
+      } else if (action == accelDragSelect) {
+        accelDragSelect(e, 30, 50);
+        checkRanges([[0,1,0,2], [e.childNodes[1].firstChild,0,-1,2], [3,0,-1,4], [5,0,6,0]], e);
+      } else {
+        action(e, 30);
+        checkRanges([[0,1,-1,2], [3,0,-1,4], [5,0,6,0]], e);
+      }
+    } else if (test == "#prev2") {
+      action(e, 260);
+      checkRangeCount(3, e);
+      checkRange(0, [0,3,-2,2], e.childNodes[1]);
+      checkRange(1, [3,0,-1,4], e);
+      checkRange(2, [5,0,6,0], e);
+    } else if (test == "#prev3") {
+      enableSelection('span2');
+      action(e, 400);
+      checkRangeCount(2, e);
+      checkRange(0, [0,5,-2,4], e.childNodes[2]);
+      checkRange(1, [5,0,6,0], e);
+    } else if (test == "#prev4") {
+      action(e, 180, 65);
+      checkRangeCount(2, e);
+      checkRange(0, [0,2,-2,4], e.childNodes[3]);
+      checkRange(1, [5,0,6,0], e);
+    } else if (test == "#prev5") {
+      enableSelection('span3');
+      action(e, 440, 65);
+      checkRangeCount(1, e);
+      var r = sel.getRangeAt(0);
+      checkRangePoints(r, [e.childNodes[4].firstChild,10,e.childNodes[6],0], e);
+    } else if (test == "#prev6") {
+      action(e, 140, 125);
+      checkRangeCount(1, e);
+      var r = sel.getRangeAt(0);
+      checkRangePoints(r, [e.childNodes[5].firstChild,2,e.childNodes[6],0], e);
+    } else if (test == "#prev7") {
+      if (action == accelDragSelect) {
+        accelDragSelect(e, 460, 500, 125);
+        checkRanges([[e.childNodes[1].firstChild,0,-1,2], [3,0,-1,4], [5,0,6,0], [6,8,6,10]], e);
+      } else {
+        action(e, 500, 125);
+        checkRanges([[6,0,6,10]], e);
+      }
+    } else if (test == "#prev8") {
+      if (action == accelDragSelect) {
+        sel.removeAllRanges();
+        var e = document.querySelector('#select');
+        synthesizeMouse(e, 200, 125, {type: "mousedown", accelKey: true});
+        synthesizeMouse(e, 200, 120, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 100, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 80, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 210, 60, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 60, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 60, {type: "mouseup", accelKey: true});
+        var x3t = e.childNodes[3].firstChild;
+        var x5 = e.childNodes[5];
+        checkRanges([[x3t,3,-1,4], [x5,0,x5.firstChild,5]], e);
+      }
+    }
+  } else {
+    if (test == "#next1") {
+      if (action == keyLeft) {
+        keyLeft({shiftKey:true}, 2)
+        checkRanges([[0,10,-1,2], [3,0,-1,4], [5,0,e.childNodes[5].firstChild,8]], e);
+      } else if (action == keyRight) {
+        keyRight({shiftKey:true}, 2)
+        checkRanges([[0,10,-1,2], [3,0,-1,4], [5,0,6,2]], e);
+      } else if (action == accelDragSelect) {
+        accelDragSelect(e, 30, 50);
+        checkRanges([[0,1,0,2], [0,10,-1,2], [3,0,-1,4], [5,0,e.childNodes[5].firstChild,10]], e);
+      } else {
+        action(e, 30);
+        checkRanges([[0,1,0,10]], e);
+      }
+    } else if (test == "#next2") {
+      action(e, 260);
+      checkRangeCount(1, e);
+      var r = sel.getRangeAt(0);
+      checkRangePoints(r, [e.childNodes[0],10,e.childNodes[1].firstChild,3], e);
+    } else if (test == "#next3") {
+      enableSelection('span2');
+      action(e, 400);
+      checkRangeCount(1, e);
+      var r = sel.getRangeAt(0);
+      checkRangePoints(r, [e.childNodes[0],10,e.childNodes[2].firstChild,5], e);
+    } else if (test == "#next4") {
+      action(e, 180, 65);
+      checkRangeCount(2, e);
+      checkRange(0, [0,10,-1,2], e);
+      checkRange(1, [-1,0,0,2], e.childNodes[3]);
+    } else if (test == "#next5") {
+      enableSelection('span3');
+      action(e, 440, 65);
+      checkRangeCount(2, e);
+      checkRange(0, [0,10,-1,2], e);
+      var r = sel.getRangeAt(1);
+      checkRangePoints(r, [e.childNodes[3],0,e.childNodes[4].firstChild,10], e);
+    } else if (test == "#next6") {
+      action(e, 140, 125);
+      checkRangeCount(3, e);
+      checkRange(0, [0,10,-1,2], e);
+      checkRange(1, [3,0,-1,4], e);
+      checkRange(2, [-1,0,0,2], e.childNodes[5]);
+    } else if (test == "#next7") {
+      if (action == keyRight) {
+        keyRight({shiftKey:true}, 2)
+        checkRanges([[0,10,-1,2], [3,0,-1,4], [5,0,6,2]], e);
+      } else if (action == accelDragSelect) {
+        accelDragSelect(e, 460, 500, 125);
+        checkRanges([[0,10,-1,2], [3,0,-1,4], [5,0,e.childNodes[5].firstChild,10], [6,8,6,10]], e);
+      } else {
+        action(e, 500, 125);
+        checkRangeCount(3, e);
+        checkRange(0, [0,10,-1,2], e);
+        checkRange(1, [3,0,-1,4], e);
+        var r = sel.getRangeAt(2);
+        checkRangePoints(r, [e.childNodes[5],0,e.childNodes[6],10], e);
+      }
+    } else if (test == "#next8") {
+      if (action == accelDragSelect) {
+        sel.removeAllRanges();
+        var e = document.querySelector('#select');
+        synthesizeMouse(e, 200, 60, {type: "mousedown", accelKey: true});
+        synthesizeMouse(e, 180, 60, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 80, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 100, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 120, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 190, 125, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 125, {type: "mousemove", accelKey: true});
+        synthesizeMouse(e, 200, 125, {type: "mouseup", accelKey: true});
+        var x3t = e.childNodes[3].firstChild;
+        var x5 = e.childNodes[5];
+        checkRanges([[x3t,3,-1,4], [x5,0,x5.firstChild,5]], e);
+      }
+    }
+  }
+  document.documentElement.removeAttribute("class");
+}
+
+SimpleTest.waitForFocus(function(){setTimeout(runTest,0)});
+
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-user-select-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-user-select-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/multi-range-user-select-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/multi-range-user-select-ref.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,166 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait"><head>
+    <meta charset="utf-8">
+    <title>Testcase #1 for bug 1129078</title>
+    <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+    <script src="selection-utils.js"></script>
+
+<style type="text/css">
+@font-face {
+  font-family: Ahem;
+  src: url("Ahem.ttf");
+}
+html,body { margin:0; padding: 0; }
+body,pre { font-family: Ahem; font-size: 20px; }
+</style>
+</head>
+<body>
+
+<pre id="select">
+2af45494-ak7e-11e4-a0c6-a7e7
+38222880-bj6d-11e4-8064-fb7b
+3d649ae4-ci5c-11e4-995d-17b2
+434351bc-dh4b-11e4-9971-4fc8
+4dc0e0b4-eg4a-11e4-8c28-5319
+a96319c8-ad7d-11e4-b312-039c
+</pre>
+
+<pre id="log" style="border:1px solid green"></pre>
+
+<script>
+
+var sel = window.getSelection();
+var e = document.querySelector('#select');
+function setupSelectionPrev3() {
+  addChildRanges([[0,150,0,160], [0,65,0,70], [0,15,0,15]], e);
+  sel.extend(e.firstChild, 10);  // to get eDirPrevious direction
+}
+function setupSelectionPrev2() {
+  addChildRanges([[0,150,0,160], [0,70,0,70]], e);
+  sel.extend(e.firstChild, 65);  // to get eDirPrevious direction
+}
+function setupSelectionPrev1() {
+  addChildRanges([[0,160,0,160]], e);
+  sel.extend(e.firstChild, 150);  // to get eDirPrevious direction
+}
+
+function setupSelectionNext3() {
+  addChildRanges([[0,10,0,15], [0,65,0,70], [0,150,0,160]], e);
+}
+function setupSelectionNext2() {
+  addChildRanges([[0,10,0,15], [0,65,0,70]], e);
+}
+function setupSelectionNext2b() {
+  addChildRanges([[0,15,0,80], [0,150,0,160]], e);
+}
+function setupSelectionNext1() {
+  addChildRanges([[0,10,0,15]], e);
+}
+function setupSelectionNext1b() {
+  addChildRanges([[0,15,0,170]], e);
+}
+function setupSelectionNext1c() {
+  addChildRanges([[0,150,0,160]], e);
+}
+
+function runTest() {
+  sel = window.getSelection();
+  sel.removeAllRanges();
+  document.body.offsetHeight;
+  var hash = window.location.hash
+  var op = hash.substring(6,8);
+  var test = hash.substring(0,6);
+  if (hash.substring(0,5) == "#prev") {
+    if (test == "#prev1") {
+      setupSelectionPrev3();
+      if (op == "SL") {
+        sel.extend(e.firstChild, 8);
+      } else if (op == "SR") {
+        sel.extend(e.firstChild, 12);
+      } else if (op == "AD") {
+        addChildRanges([[0,1,0,2]], e);
+      } else {
+        sel.extend(e.firstChild, 1);
+      }
+    } else if (test == "#prev2") {
+      setupSelectionPrev3();
+      sel.extend(e.firstChild, 14); // now eDirNext
+      sel.extend(e.firstChild, 13); // now eDirPrevious again
+    } else if (test == "#prev3") {
+      setupSelectionPrev2();
+      sel.extend(e.firstChild, 20);
+    } else if (test == "#prev4") {
+      setupSelectionPrev2();
+      sel.extend(e.firstChild, 68); // now eDirNext
+      sel.extend(e.firstChild, 67); // now eDirPrevious again
+    } else if (test == "#prev5") {
+      setupSelectionPrev1();
+      sel.extend(e.firstChild, 80);
+    } else if (test == "#prev6") {
+      setupSelectionPrev1();
+      sel.extend(e.firstChild, 153); // now eDirNext
+      sel.extend(e.firstChild, 152); // now eDirPrevious again
+    } else if (test == "#prev7") {
+      if (op == "AD") {
+        setupSelectionPrev3();
+        addChildRanges([[0,168,0,170]], e);
+      } else {
+        addChildRanges([[0,160,0,170]], e);
+      }
+    } else if (test == "#prev8") {
+      if (op == "AD") {
+        addChildRanges([[0,150,0,155], [0,68,0,70]], e);
+      }
+    }
+  } else {
+    if (test == "#next1") {
+      if (op == "SL") {
+        setupSelectionNext3();
+        sel.extend(e.firstChild, 158);
+      } else if (op == "SR") {
+        setupSelectionNext3();
+        sel.extend(e.firstChild, 162);
+      } else if (op == "AD") {
+        setupSelectionNext3();
+        addChildRanges([[0,1,0,2]], e);
+      } else {
+        setupSelectionNext1();
+        sel.extend(e.firstChild, 1);
+      }
+    } else if (test == "#next2") {
+      setupSelectionNext1();
+      sel.extend(e.firstChild, 13);
+    } else if (test == "#next3") {
+      setupSelectionNext1();
+      sel.extend(e.firstChild, 20);
+    } else if (test == "#next4") {
+      setupSelectionNext2();
+      sel.extend(e.firstChild, 67);
+    } else if (test == "#next5") {
+      setupSelectionNext2();
+      sel.extend(e.firstChild, 80);
+    } else if (test == "#next6") {
+      setupSelectionNext3();
+      sel.extend(e.firstChild, 152);
+    } else if (test == "#next7") {
+      setupSelectionNext3();
+      if (op == "AD") {
+        addChildRanges([[0,168,0,170]], e);
+      } else {
+        sel.extend(e.firstChild, 170);
+      }
+    } else if (test == "#next8") {
+      if (op == "AD") {
+        addChildRanges([[0,68,0,70], [0,150,0,155]], e);
+      }
+    }
+  }
+  document.documentElement.removeAttribute("class");
+}
+
+SimpleTest.waitForFocus(function(){setTimeout(runTest,0)});
+
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/selection-utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/selection-utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/selection-utils.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/selection-utils.js	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,151 @@
+// -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*-
+// vim: set ts=2 sw=2 et tw=78:
+function clearSelection(w)
+{
+  var sel = (w ? w : window).getSelection();
+  sel.removeAllRanges();
+}
+
+function getNode(e, index) { 
+  if (!(typeof index==='number')) return index;
+  if (index >= 0) return e.childNodes[index];
+  while (++index != 0) e = e.parentNode;
+  return e;
+}
+
+function dragSelectPointsWithData()
+{
+  var event = arguments[0];
+  var e = arguments[1];
+  var x1 = arguments[2];
+  var y1 = arguments[3];
+  var x2 = arguments[4];
+  var y2 = arguments[5];
+  dir = x2 > x1 ? 1 : -1;
+  event['type'] = "mousedown";
+  synthesizeMouse(e, x1, y1, event);
+  event['type'] = "mousemove";
+  synthesizeMouse(e, x1 + dir, y1, event);
+  for (var i = 6; i < arguments.length; ++i)
+    synthesizeMouse(e, arguments[i], y1, event);
+  synthesizeMouse(e, x2 - dir, y2, event);
+  event['type'] = "mouseup";
+  synthesizeMouse(e, x2, y2, event);
+}
+
+function dragSelectPoints()
+{
+  var args = Array.prototype.slice.call(arguments);
+  dragSelectPointsWithData.apply(this, [{}].concat(args));
+}
+
+function dragSelect()
+{
+  var args = Array.prototype.slice.call(arguments);
+  var e = args.shift();
+  var x1 = args.shift();
+  var x2 = args.shift();
+  dragSelectPointsWithData.apply(this, [{},e,x1,5,x2,5].concat(args));
+}
+
+function accelDragSelect()
+{
+  var args = Array.prototype.slice.call(arguments);
+  var e = args.shift();
+  var x1 = args.shift();
+  var x2 = args.shift();
+  var y = args.length != 0 ? args.shift() : 5;
+  dragSelectPointsWithData.apply(this, [{accelKey: true},e,x1,y,x2,y].concat(args));
+}
+
+function shiftClick(e, x, y)
+{
+  function pos(p) { return (typeof p === "undefined") ? 5 : p }
+  synthesizeMouse(e, pos(x), pos(y), { shiftKey: true });
+}
+
+function keyRepeat(key,data,repeat)
+{
+  while (repeat-- > 0)
+    synthesizeKey(key, data);
+}
+
+function keyRight(data)
+{
+  var repeat = arguments.length > 1 ? arguments[1] : 1;
+  keyRepeat("VK_RIGHT", data, repeat);
+}
+
+function keyLeft(data)
+{
+  var repeat = arguments.length > 1 ? arguments[1] : 1;
+  keyRepeat("VK_LEFT", data, repeat);
+}
+
+function shiftAccelClick(e, x, y)
+{
+  function pos(p) { return (typeof p === "undefined") ? 5 : p }
+  synthesizeMouse(e, pos(x), pos(y), { shiftKey: true, accelKey: true });
+}
+
+function accelClick(e, x, y)
+{
+  function pos(p) { return (typeof p === "undefined") ? 5 : p }
+  synthesizeMouse(e, pos(x), pos(y), { accelKey: true });
+}
+
+function addChildRanges(arr, e)
+{
+  var sel = window.getSelection();
+  for (i = 0; i < arr.length; ++i) {
+    var data = arr[i];
+    var r = new Range()
+    r.setStart(getNode(e, data[0]), data[1]);
+    r.setEnd(getNode(e, data[2]), data[3]);
+    sel.addRange(r);
+  }
+}
+
+function checkText(text, e)
+{
+  var sel = window.getSelection();
+  is(sel.toString(), text, e.id + ": selected text")
+}
+
+function checkRangeText(text, index)
+{
+  var r = window.getSelection().getRangeAt(index);
+  is(r.toString(), text, e.id + ": range["+index+"].toString()")
+}
+
+function checkRangeCount(n, e)
+{
+  var sel = window.getSelection();
+  is(sel.rangeCount, n, e.id + ": Selection range count");
+}
+
+function checkRangePoints(r, expected, e) {
+  is(r.startContainer, expected[0], e.id + ": range.startContainer");
+  is(r.startOffset, expected[1], e.id + ": range.startOffset");
+  is(r.endContainer, expected[2], e.id + ": range.endContainer");
+  is(r.endOffset, expected[3], e.id + ": range.endOffset");
+}
+
+function checkRange(i, expected, e) {
+  var sel = window.getSelection();
+  if (i >= sel.rangeCount) return;
+  var r = sel.getRangeAt(i);
+  is(r.startContainer, getNode(e, expected[0]), e.id + ": range["+i+"].startContainer");
+  is(r.startOffset, expected[1], e.id + ": range["+i+"].startOffset");
+  is(r.endContainer, getNode(e, expected[2]), e.id + ": range["+i+"].endContainer");
+  is(r.endOffset, expected[3], e.id + ": range["+i+"].endOffset");
+}
+
+function checkRanges(arr, e)
+{
+  checkRangeCount(arr.length, e);
+  for (i = 0; i < arr.length; ++i) {
+    var expected = arr[i];
+    checkRange(i, expected, e);
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/test_reftests_with_caret.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/test_reftests_with_caret.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/base/tests/test_reftests_with_caret.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/base/tests/test_reftests_with_caret.html	2015-02-28 15:03:09.000000000 +0000
@@ -8,8 +8,9 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <style>
     iframe {
+      border: none;
       width: 600px;
-      height: 600px;
+      height: 400px;
     }
   </style>
 <script type="text/javascript">
@@ -92,6 +93,8 @@
 
 var caretBlinkTime = null;
 function endTest() {
+  var parentDoc = window.parent.document;
+  parentDoc.styleSheets[parentDoc.styleSheets.length-1].deleteRule(0);
   // finish(), yet let the test actually end first, to be safe.
   SimpleTest.executeSoon(SimpleTest.finish);
 }
@@ -107,9 +110,10 @@
     [ 'bug1082486-1.html', 'bug1082486-1-ref.html'] ,
     [ 'bug1082486-2.html', 'bug1082486-2-ref.html'] ,
     // The following test cases are all involving with one sending
-    // synthesizeKey(), the other without. They ought to be failed
-    // when touch caret preference on. Test them with preference off.
+    // synthesizeKey(), the other without. They fail when the touch
+    // or selection caret is enabled. Test them with these preferences off.
     function() {SpecialPowers.pushPrefEnv({'set': [['touchcaret.enabled', false]]}, nextTest);} ,
+    function() {SpecialPowers.pushPrefEnv({'set': [['selectioncaret.enabled', false]]}, nextTest);} ,
     [ 'bug240933-1.html' , 'bug240933-1-ref.html' ] ,
     [ 'bug240933-2.html' , 'bug240933-1-ref.html' ] ,
     [ 'bug389321-1.html' , 'bug389321-1-ref.html' ] ,
@@ -149,7 +153,9 @@
     // [ 'bug1123067-1.html' , 'bug1123067-ref.html'  ] , TODO: bug 1129205
     [ 'bug1123067-2.html' , 'bug1123067-ref.html'  ] ,
     [ 'bug1123067-3.html' , 'bug1123067-ref.html'  ] ,
+    [ 'bug1132768-1.html' , 'bug1132768-1-ref.html'] ,
     function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled']]}, nextTest);} ,
+    function() {SpecialPowers.pushPrefEnv({'clear': [['selectioncaret.enabled']]}, nextTest);} ,
 ];
 
 if (navigator.appVersion.indexOf("Android") == -1 &&
@@ -168,6 +174,106 @@
   is(SpecialPowers.getIntPref("layout.spellcheckDefault"), 0, "Spellcheck should be turned off for this platrom or this if..else check removed");
 }
 
+if (navigator.platform.indexOf("Linux") >= 0 &&
+    SpecialPowers.Services.appinfo.name != "B2G") {
+  tests = tests.concat([
+    function() {SpecialPowers.pushPrefEnv({'set': [['touchcaret.enabled', false]]}, nextTest);} ,
+    // eDirPrevious, Shift+click
+    [ 'multi-range-user-select.html#prev1S_' , 'multi-range-user-select-ref.html#prev1S_'  ] ,
+    [ 'multi-range-user-select.html#prev2S_' , 'multi-range-user-select-ref.html#prev2S_'  ] ,
+    [ 'multi-range-user-select.html#prev3S_' , 'multi-range-user-select-ref.html#prev3S_'  ] ,
+    [ 'multi-range-user-select.html#prev4S_' , 'multi-range-user-select-ref.html#prev4S_'  ] ,
+    [ 'multi-range-user-select.html#prev5S_' , 'multi-range-user-select-ref.html#prev5S_'  ] ,
+    [ 'multi-range-user-select.html#prev6S_' , 'multi-range-user-select-ref.html#prev6S_'  ] ,
+    [ 'multi-range-user-select.html#prev7S_' , 'multi-range-user-select-ref.html#prev7S_'  ] ,
+    // eDirPrevious, Shift+Accel+click
+    [ 'multi-range-user-select.html#prev1SA' , 'multi-range-user-select-ref.html#prev1SA'  ] ,
+    [ 'multi-range-user-select.html#prev2SA' , 'multi-range-user-select-ref.html#prev2SA'  ] ,
+    [ 'multi-range-user-select.html#prev3SA' , 'multi-range-user-select-ref.html#prev3SA'  ] ,
+    [ 'multi-range-user-select.html#prev4SA' , 'multi-range-user-select-ref.html#prev4SA'  ] ,
+    [ 'multi-range-user-select.html#prev5SA' , 'multi-range-user-select-ref.html#prev5SA'  ] ,
+    [ 'multi-range-user-select.html#prev6SA' , 'multi-range-user-select-ref.html#prev6SA'  ] ,
+    [ 'multi-range-user-select.html#prev7SA' , 'multi-range-user-select-ref.html#prev7SA'  ] ,
+    // eDirPrevious, Accel+drag-select (adding an additional range)
+    [ 'multi-range-user-select.html#prev1AD' , 'multi-range-user-select-ref.html#prev1AD'  ] ,
+    [ 'multi-range-user-select.html#prev7AD' , 'multi-range-user-select-ref.html#prev7AD'  ] ,
+    // eDirPrevious, Accel+drag-select (bug 1128722)
+    [ 'multi-range-user-select.html#prev8AD' , 'multi-range-user-select-ref.html#prev8AD'  ] ,
+    // eDirPrevious, VK_RIGHT / LEFT
+    [ 'multi-range-user-select.html#prev1SR' , 'multi-range-user-select-ref.html#prev1SR'  ] ,
+    [ 'multi-range-user-select.html#prev1SL' , 'multi-range-user-select-ref.html#prev1SL'  ] ,
+    // eDirNext, Shift+click
+    [ 'multi-range-user-select.html#next1S_' , 'multi-range-user-select-ref.html#next1S_'  ] ,
+    [ 'multi-range-user-select.html#next2S_' , 'multi-range-user-select-ref.html#next2S_'  ] ,
+    [ 'multi-range-user-select.html#next3S_' , 'multi-range-user-select-ref.html#next3S_'  ] ,
+    [ 'multi-range-user-select.html#next4S_' , 'multi-range-user-select-ref.html#next4S_'  ] ,
+    [ 'multi-range-user-select.html#next5S_' , 'multi-range-user-select-ref.html#next5S_'  ] ,
+    [ 'multi-range-user-select.html#next6S_' , 'multi-range-user-select-ref.html#next6S_'  ] ,
+    [ 'multi-range-user-select.html#next7S_' , 'multi-range-user-select-ref.html#next7S_'  ] ,
+    // eDirNext, Shift+Accel+click
+    [ 'multi-range-user-select.html#next1SA' , 'multi-range-user-select-ref.html#next1SA'  ] ,
+    [ 'multi-range-user-select.html#next2SA' , 'multi-range-user-select-ref.html#next2SA'  ] ,
+    [ 'multi-range-user-select.html#next3SA' , 'multi-range-user-select-ref.html#next3SA'  ] ,
+    [ 'multi-range-user-select.html#next4SA' , 'multi-range-user-select-ref.html#next4SA'  ] ,
+    [ 'multi-range-user-select.html#next5SA' , 'multi-range-user-select-ref.html#next5SA'  ] ,
+    [ 'multi-range-user-select.html#next6SA' , 'multi-range-user-select-ref.html#next6SA'  ] ,
+    [ 'multi-range-user-select.html#next7SA' , 'multi-range-user-select-ref.html#next7SA'  ] ,
+    // eDirNext, Accel+drag-select (adding an additional range)
+    [ 'multi-range-user-select.html#next1AD' , 'multi-range-user-select-ref.html#next1AD'  ] ,
+    [ 'multi-range-user-select.html#next7AD' , 'multi-range-user-select-ref.html#next7AD'  ] ,
+    // eDirNext, Accel+drag-select (bug 1128722)
+    [ 'multi-range-user-select.html#next8AD' , 'multi-range-user-select-ref.html#next8AD'  ] ,
+    // eDirNext, VK_RIGHT / LEFT
+    [ 'multi-range-user-select.html#next1SR' , 'multi-range-user-select-ref.html#next1SR'  ] ,
+    [ 'multi-range-user-select.html#next1SL' , 'multi-range-user-select-ref.html#next1SL'  ] ,
+    // eDirPrevious, Shift+click
+    [ 'multi-range-script-select.html#prev1S_' , 'multi-range-script-select-ref.html#prev1S_'  ] ,
+    [ 'multi-range-script-select.html#prev2S_' , 'multi-range-script-select-ref.html#prev2S_'  ] ,
+    [ 'multi-range-script-select.html#prev3S_' , 'multi-range-script-select-ref.html#prev3S_'  ] ,
+    [ 'multi-range-script-select.html#prev4S_' , 'multi-range-script-select-ref.html#prev4S_'  ] ,
+    [ 'multi-range-script-select.html#prev5S_' , 'multi-range-script-select-ref.html#prev5S_'  ] ,
+    [ 'multi-range-script-select.html#prev6S_' , 'multi-range-script-select-ref.html#prev6S_'  ] ,
+    [ 'multi-range-script-select.html#prev7S_' , 'multi-range-script-select-ref.html#prev7S_'  ] ,
+    // eDirPrevious, Shift+Accel+click
+    [ 'multi-range-script-select.html#prev1SA' , 'multi-range-script-select-ref.html#prev1SA'  ] ,
+    [ 'multi-range-script-select.html#prev2SA' , 'multi-range-script-select-ref.html#prev2SA'  ] ,
+    [ 'multi-range-script-select.html#prev3SA' , 'multi-range-script-select-ref.html#prev3SA'  ] ,
+    [ 'multi-range-script-select.html#prev4SA' , 'multi-range-script-select-ref.html#prev4SA'  ] ,
+    [ 'multi-range-script-select.html#prev5SA' , 'multi-range-script-select-ref.html#prev5SA'  ] ,
+    [ 'multi-range-script-select.html#prev6SA' , 'multi-range-script-select-ref.html#prev6SA'  ] ,
+    [ 'multi-range-script-select.html#prev7SA' , 'multi-range-script-select-ref.html#prev7SA'  ] ,
+    // eDirPrevious, Accel+drag-select (adding an additional range)
+    [ 'multi-range-script-select.html#prev1AD' , 'multi-range-script-select-ref.html#prev1AD'  ] ,
+    [ 'multi-range-script-select.html#prev7AD' , 'multi-range-script-select-ref.html#prev7AD'  ] ,
+    // eDirPrevious, VK_RIGHT / LEFT
+    [ 'multi-range-script-select.html#prev1SR' , 'multi-range-script-select-ref.html#prev1SR'  ] ,
+    [ 'multi-range-script-select.html#prev1SL' , 'multi-range-script-select-ref.html#prev1SL'  ] ,
+    // eDirNext, Shift+click
+    [ 'multi-range-script-select.html#next1S_' , 'multi-range-script-select-ref.html#next1S_'  ] ,
+    [ 'multi-range-script-select.html#next2S_' , 'multi-range-script-select-ref.html#next2S_'  ] ,
+    [ 'multi-range-script-select.html#next3S_' , 'multi-range-script-select-ref.html#next3S_'  ] ,
+    [ 'multi-range-script-select.html#next4S_' , 'multi-range-script-select-ref.html#next4S_'  ] ,
+    [ 'multi-range-script-select.html#next5S_' , 'multi-range-script-select-ref.html#next5S_'  ] ,
+    [ 'multi-range-script-select.html#next6S_' , 'multi-range-script-select-ref.html#next6S_'  ] ,
+    [ 'multi-range-script-select.html#next7S_' , 'multi-range-script-select-ref.html#next7S_'  ] ,
+    // eDirNext, Shift+Accel+click
+    [ 'multi-range-script-select.html#next1SA' , 'multi-range-script-select-ref.html#next1SA'  ] ,
+    [ 'multi-range-script-select.html#next2SA' , 'multi-range-script-select-ref.html#next2SA'  ] ,
+    [ 'multi-range-script-select.html#next3SA' , 'multi-range-script-select-ref.html#next3SA'  ] ,
+    [ 'multi-range-script-select.html#next4SA' , 'multi-range-script-select-ref.html#next4SA'  ] ,
+    [ 'multi-range-script-select.html#next5SA' , 'multi-range-script-select-ref.html#next5SA'  ] ,
+    [ 'multi-range-script-select.html#next6SA' , 'multi-range-script-select-ref.html#next6SA'  ] ,
+    [ 'multi-range-script-select.html#next7SA' , 'multi-range-script-select-ref.html#next7SA'  ] ,
+    // eDirNext, Accel+drag-select (adding an additional range)
+    [ 'multi-range-script-select.html#next1AD' , 'multi-range-script-select-ref.html#next1AD'  ] ,
+    [ 'multi-range-script-select.html#next7AD' , 'multi-range-script-select-ref.html#next7AD'  ] ,
+    // eDirNext, VK_RIGHT / LEFT
+    [ 'multi-range-script-select.html#next1SR' , 'multi-range-script-select-ref.html#next1SR'  ] ,
+    [ 'multi-range-script-select.html#next1SL' , 'multi-range-script-select-ref.html#next1SL'  ] ,
+    function() {SpecialPowers.pushPrefEnv({'clear': [['touchcaret.enabled']]}, nextTest);} ,
+  ]);
+}
+
 var testIndex = 0;
 
 function nextTest() {
@@ -184,6 +290,11 @@
 }
 function runTests() {
   try {
+    if (window.parent) {
+      var parentDoc = window.parent.document;
+      extraCSSRule = parentDoc.styleSheets[parentDoc.styleSheets.length-1]
+        .insertRule("iframe#testframe{width:600px;height:400px}",0);
+    }
     try {
       caretBlinkTime = SpecialPowers.getIntPref("ui.caretBlinkTime");
     } catch (e) {}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/build/nsContentDLF.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/build/nsContentDLF.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/build/nsContentDLF.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/build/nsContentDLF.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -133,16 +133,14 @@
 nsContentDLF::CreateInstance(const char* aCommand,
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
-                             const char* aContentType, 
+                             const nsACString& aContentType,
                              nsIDocShell* aContainer,
                              nsISupports* aExtraInfo,
                              nsIStreamListener** aDocListener,
                              nsIContentViewer** aDocViewer)
 {
-  // Declare "type" here.  This is because although the variable itself only
-  // needs limited scope, we need to use the raw string memory -- as returned
-  // by "type.get()" farther down in the function.
-  nsAutoCString type;
+  // Make a copy of aContentType, because we're possibly going to change it.
+  nsAutoCString contentType(aContentType);
 
   // Are we viewing source?
   nsCOMPtr<nsIViewSourceChannel> viewSourceChannel = do_QueryInterface(aChannel);
@@ -154,6 +152,7 @@
     // view-source channel normally returns.  Get the actual content
     // type of the data.  If it's known, use it; otherwise use
     // text/plain.
+    nsAutoCString type;
     viewSourceChannel->GetOriginalContentType(type);
     bool knownType = false;
     int32_t typeIndex;
@@ -187,18 +186,18 @@
     } else if (IsImageContentType(type.get())) {
       // If it's an image, we want to display it the same way we normally would.
       // Also note the lifetime of "type" allows us to safely use "get()" here.
-      aContentType = type.get();
+      contentType = type;
     } else {
       viewSourceChannel->SetContentType(NS_LITERAL_CSTRING(TEXT_PLAIN));
     }
-  } else if (0 == PL_strcmp(VIEWSOURCE_CONTENT_TYPE, aContentType)) {
+  } else if (aContentType.EqualsLiteral(VIEWSOURCE_CONTENT_TYPE)) {
     aChannel->SetContentType(NS_LITERAL_CSTRING(TEXT_PLAIN));
-    aContentType = TEXT_PLAIN;
+    contentType = TEXT_PLAIN;
   }
   // Try html
   int typeIndex=0;
   while(gHTMLTypes[typeIndex]) {
-    if (0 == PL_strcmp(gHTMLTypes[typeIndex++], aContentType)) {
+    if (contentType.EqualsASCII(gHTMLTypes[typeIndex++])) {
       return CreateDocument(aCommand, 
                             aChannel, aLoadGroup,
                             aContainer, kHTMLDocumentCID,
@@ -209,7 +208,7 @@
   // Try XML
   typeIndex = 0;
   while(gXMLTypes[typeIndex]) {
-    if (0== PL_strcmp(gXMLTypes[typeIndex++], aContentType)) {
+    if (contentType.EqualsASCII(gXMLTypes[typeIndex++])) {
       return CreateDocument(aCommand, 
                             aChannel, aLoadGroup,
                             aContainer, kXMLDocumentCID,
@@ -220,7 +219,7 @@
   // Try SVG
   typeIndex = 0;
   while(gSVGTypes[typeIndex]) {
-    if (!PL_strcmp(gSVGTypes[typeIndex++], aContentType)) {
+    if (contentType.EqualsASCII(gSVGTypes[typeIndex++])) {
       return CreateDocument(aCommand,
                             aChannel, aLoadGroup,
                             aContainer, kSVGDocumentCID,
@@ -231,37 +230,36 @@
   // Try XUL
   typeIndex = 0;
   while (gXULTypes[typeIndex]) {
-    if (0 == PL_strcmp(gXULTypes[typeIndex++], aContentType)) {
+    if (contentType.EqualsASCII(gXULTypes[typeIndex++])) {
       if (!MayUseXULXBL(aChannel)) {
         return NS_ERROR_REMOTE_XUL;
       }
 
-      return CreateXULDocument(aCommand,
-                               aChannel, aLoadGroup,
-                               aContentType, aContainer,
+      return CreateXULDocument(aCommand, aChannel, aLoadGroup, aContainer,
                                aExtraInfo, aDocListener, aDocViewer);
     }
   }
 
-  if (mozilla::DecoderTraits::ShouldHandleMediaType(aContentType)) {
-    return CreateDocument(aCommand, 
+  if (mozilla::DecoderTraits::ShouldHandleMediaType(contentType.get())) {
+    return CreateDocument(aCommand,
                           aChannel, aLoadGroup,
                           aContainer, kVideoDocumentCID,
                           aDocListener, aDocViewer);
-  }  
+  }
 
   // Try image types
-  if (IsImageContentType(aContentType)) {
-    return CreateDocument(aCommand, 
+  if (IsImageContentType(contentType.get())) {
+    return CreateDocument(aCommand,
                           aChannel, aLoadGroup,
                           aContainer, kImageDocumentCID,
                           aDocListener, aDocViewer);
   }
 
-  nsCOMPtr<nsIPluginHost> pluginHostCOM(do_GetService(MOZ_PLUGIN_HOST_CONTRACTID));
-  nsPluginHost *pluginHost = static_cast<nsPluginHost*>(pluginHostCOM.get());
-  if(pluginHost &&
-     pluginHost->PluginExistsForType(aContentType)) {
+  nsRefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
+  // Don't exclude disabled plugins, which will still trigger the "this plugin
+  // is disabled" placeholder.
+  if (pluginHost && pluginHost->HavePluginForType(contentType,
+                                                  nsPluginHost::eExcludeNone)) {
     return CreateDocument(aCommand,
                           aChannel, aLoadGroup,
                           aContainer, kPluginDocumentCID,
@@ -414,7 +412,6 @@
 nsContentDLF::CreateXULDocument(const char* aCommand,
                                 nsIChannel* aChannel,
                                 nsILoadGroup* aLoadGroup,
-                                const char* aContentType,
                                 nsIDocShell* aContainer,
                                 nsISupports* aExtraInfo,
                                 nsIStreamListener** aDocListener,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/build/nsContentDLF.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/build/nsContentDLF.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/build/nsContentDLF.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/build/nsContentDLF.h	2015-02-28 15:03:09.000000000 +0000
@@ -43,7 +43,6 @@
   nsresult CreateXULDocument(const char* aCommand,
                              nsIChannel* aChannel,
                              nsILoadGroup* aLoadGroup,
-                             const char* aContentType,
                              nsIDocShell* aContainer,
                              nsISupports* aExtraInfo,
                              nsIStreamListener** aDocListener,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/build/nsLayoutStatics.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/build/nsLayoutStatics.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/build/nsLayoutStatics.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/build/nsLayoutStatics.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -242,11 +242,8 @@
     return rv;
   }
 
-  rv = nsCSSRuleProcessor::Startup();
-  if (NS_FAILED(rv)) {
-    NS_ERROR("Could not initialize nsCSSRuleProcessor");
-    return rv;
-  }
+  nsCSSParser::Startup();
+  nsCSSRuleProcessor::Startup();
 
 #ifdef MOZ_XUL
   rv = nsXULPopupManager::Init();
@@ -316,7 +313,7 @@
   // Don't need to shutdown nsWindowMemoryReporter, that will be done by the
   // memory reporter manager.
 
-  nsFrameScriptExecutor::Shutdown();
+  nsMessageManagerScriptExecutor::Shutdown();
   nsFocusManager::Shutdown();
 #ifdef MOZ_XUL
   nsXULPopupManager::Shutdown();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/nsButtonFrameRenderer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/nsButtonFrameRenderer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/nsButtonFrameRenderer.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/nsButtonFrameRenderer.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -29,6 +29,15 @@
 nsButtonFrameRenderer::~nsButtonFrameRenderer()
 {
   MOZ_COUNT_DTOR(nsButtonFrameRenderer);
+
+#ifdef DEBUG
+  if (mInnerFocusStyle) {
+    mInnerFocusStyle->FrameRelease();
+  }
+  if (mOuterFocusStyle) {
+    mOuterFocusStyle->FrameRelease();
+  }
+#endif
 }
 
 void
@@ -390,6 +399,15 @@
   nsStyleContext* context = mFrame->StyleContext();
   nsStyleSet *styleSet = aPresContext->StyleSet();
 
+#ifdef DEBUG
+  if (mInnerFocusStyle) {
+    mInnerFocusStyle->FrameRelease();
+  }
+  if (mOuterFocusStyle) {
+    mOuterFocusStyle->FrameRelease();
+  }
+#endif
+
   // style for the inner such as a dotted line (Windows)
   mInnerFocusStyle =
     styleSet->ProbePseudoElementStyle(mFrame->GetContent()->AsElement(),
@@ -401,6 +419,15 @@
     styleSet->ProbePseudoElementStyle(mFrame->GetContent()->AsElement(),
                                       nsCSSPseudoElements::ePseudo_mozFocusOuter,
                                       context);
+
+#ifdef DEBUG
+  if (mInnerFocusStyle) {
+    mInnerFocusStyle->FrameAddRef();
+  }
+  if (mOuterFocusStyle) {
+    mOuterFocusStyle->FrameAddRef();
+  }
+#endif
 }
 
 nsStyleContext*
@@ -421,10 +448,23 @@
 {
   switch (aIndex) {
   case NS_BUTTON_RENDERER_FOCUS_INNER_CONTEXT_INDEX:
+#ifdef DEBUG
+    if (mInnerFocusStyle) {
+      mInnerFocusStyle->FrameRelease();
+    }
+#endif
     mInnerFocusStyle = aStyleContext;
     break;
   case NS_BUTTON_RENDERER_FOCUS_OUTER_CONTEXT_INDEX:
+#ifdef DEBUG
+    if (mOuterFocusStyle) {
+      mOuterFocusStyle->FrameRelease();
+    }
+#endif
     mOuterFocusStyle = aStyleContext;
     break;
   }
+#ifdef DEBUG
+  aStyleContext->FrameAddRef();
+#endif
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/nsFieldSetFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/nsFieldSetFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/nsFieldSetFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/nsFieldSetFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -598,7 +598,16 @@
     LogicalRect actualLegendRect = mLegendRect;
     actualLegendRect.Deflate(wm, legendMargin);
     LogicalPoint actualLegendPos(actualLegendRect.Origin(wm));
-    legendReflowState->ApplyRelativePositioning(&actualLegendPos, containerWidth);
+
+    // Note that legend's writing mode may be different from the fieldset's,
+    // so we need to convert offsets before applying them to it (bug 1134534).
+    LogicalMargin offsets =
+      legendReflowState->ComputedLogicalOffsets().
+        ConvertTo(wm, legendReflowState->GetWritingMode());
+    nsHTMLReflowState::ApplyRelativePositioning(legend, wm, offsets,
+                                                &actualLegendPos,
+                                                containerWidth);
+
     legend->SetPosition(wm, actualLegendPos, containerWidth);
     nsContainerFrame::PositionFrameView(legend);
     nsContainerFrame::PositionChildViews(legend);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/nsRangeFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/nsRangeFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/nsRangeFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/nsRangeFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -50,6 +50,11 @@
 
 nsRangeFrame::~nsRangeFrame()
 {
+#ifdef DEBUG
+  if (mOuterFocusStyle) {
+    mOuterFocusStyle->FrameRelease();
+  }
+#endif
 }
 
 NS_IMPL_FRAMEARENA_HELPERS(nsRangeFrame)
@@ -880,6 +885,18 @@
   MOZ_ASSERT(aIndex == 0,
              "GetAdditionalStyleContext is handling other indexes?");
 
+#ifdef DEBUG
+  if (mOuterFocusStyle) {
+    mOuterFocusStyle->FrameRelease();
+  }
+#endif
+
   // The -moz-focus-outer pseudo-element's style has changed.
   mOuterFocusStyle = aStyleContext;
+
+#ifdef DEBUG
+  if (mOuterFocusStyle) {
+    mOuterFocusStyle->FrameAddRef();
+  }
+#endif
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/test/test_bug402198.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/test/test_bug402198.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/forms/test/test_bug402198.html	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/forms/test/test_bug402198.html	2015-02-28 15:03:09.000000000 +0000
@@ -53,7 +53,7 @@
   document.getElementById('a').focus();
   document.body.style.display = 'none';
 
-  synthesizeKey('VK_TAB', {type: "keypress", shiftKey: true});
+  synthesizeKey('KEY_Tab', { code: "Tab", shiftKey: true });
 
   is(0, 0, "this is a crash/assertion test, so we're ok if we survived this far");
   setTimeout(function() {document.body.style.display = ''; SimpleTest.finish();}, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/1134531.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/1134531.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/1134531.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/1134531.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<html>
+<body onload="x.style.textTransform = 'capitalize';"><div id="x">b</div></body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/1134667.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/1134667.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/1134667.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/1134667.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,2 @@
+x
+<ruby><x>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/419352.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/419352.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/419352.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/419352.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,3 @@
+<html>
+<body dir="rtl">&#x2028;&#x200C;</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/947158.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/947158.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/947158.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/947158.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait"><head>
+    <meta charset="utf-8">
+    <title>Testcase for bug </title>
+</head>
+<body>
+
+<iframe src="947158-iframe.html" width="100%" frameborder=0></iframe>
+<iframe src="947158-iframe.html" width="100%" frameborder=0></iframe>
+
+<script>
+var i = 0;
+function test(){
+  fs=document.querySelectorAll('iframe');
+  f=fs[Math.floor(Math.random()*fs.length)];
+  f.width=Math.random()*100+"%";
+  if (i++ < 10) {
+     setTimeout(test,300);
+     f.offsetHeight;
+     return;
+  }
+  for (var j = 0; j < fs.length; j++) {
+    f = fs[j];
+    f.parentNode.removeChild(f);
+  }
+  document.documentElement.removeAttribute("class");
+}
+test();
+</script>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/947158-iframe.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/947158-iframe.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/947158-iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/947158-iframe.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,777 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-gb" lang="en-gb" >
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  
+
+<style>
+
+
+#work_area {
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
+background-attachment:scroll;
+background-color:transparent;
+float:left;
+padding-left:5px;
+padding-right:5px;
+width:980px;
+background-color:#F1F5F8;
+}
+#footer {
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
+background-attachment:scroll;
+background-color:transparent;
+background-image:url(../images/footer.gif);
+background-position:0 0;
+background-repeat:no-repeat;
+float:left;
+width:1003px;
+height:53px;
+background-color:#467618;
+}
+#bottommenu{
+float:left;
+width:1003px;
+height:53px;
+text-align:center;
+color:#FFFFFF;
+font-family:Tahoma;
+font-size:11px;
+padding-top: 17px;
+}
+.div720_body{
+padding-left:30px;
+padding-right:30px;
+padding-top:0;
+width:660px;
+height:auto;
+}
+.div720_body p{
+font-family:Tahoma;
+font-size:12px;
+text-indent: 20px;
+_color:#636563;
+color: #444444;
+line-height:18px;
+margin-bottom:8px;
+margin-top:8px;
+}
+
+
+.train_asan_body{
+width:650px;
+float:left;
+height:auto;
+font-family:Tahoma;
+font-size:12px;
+text-indent: 20px;
+color:#636563;
+display:none;
+padding-left:12px;
+padding-bottom:10px;
+}
+
+
+.news_text{
+width:660px;
+float:left;
+height:auto;
+font-family:Tahoma;
+font-size:12px;
+text-indent: 20px;
+color: #444444;
+line-height:18px;
+_background-color:#CCCCCC;
+}
+.news_line{
+width:660px;
+float:left;
+background-color:#335D0B;
+height:2px;
+margin-top:5px;
+}
+.news_dat{
+width:90px;
+float:right;
+height:auto;
+font-family:Arial, Helvetica, sans-serif;
+font-size:14px;
+color:#355E0B;
+text-align:center;
+_border:solid 2px #003300;
+border-bottom:solid 2px #335D0B;
+padding:2px;
+text-indent:0;
+background-color:#F2F6F9;
+font-weight:bold;
+}
+
+.newssite
+{
+  list-style-type: none;
+  margin-top: 20px;;
+  padding:2px;
+}
+
+.newssite li
+{
+  font-family:Tahoma;
+  font-size: 12px;
+  color: #444444;
+  text-align: left;
+  background-image: url('../images/ul.gif');
+  background-repeat:no-repeat;
+  margin:0 0 20px 0;
+  _line-height: 10px;
+  font-weight:normal;
+  height:auto;
+  padding-top:0;
+  padding-left:25px;
+  text-indent:0;
+  
+}
+
+.ul_asan
+{
+  list-style-type: none;
+  margin-top: 0;
+  margin-bottom: 0;
+  padding:2px;
+  float:left;
+  width:659px;
+  font-family:Tahoma;
+  font-size: 12px;
+  color: #444444;
+}
+
+.ul_asan li
+{
+  font-family:Tahoma;
+  font-size: 12px;
+  color: #444444;
+  text-align: left;
+  background-image: url('../images/asan/ul_asan.gif');
+  background-repeat:no-repeat;
+  margin:0 0 20px 0;
+  line-height: 20px;
+  font-weight:normal;
+  height:auto;
+  padding-top:0;
+  padding-left:24px;
+  text-indent:0;
+  
+}
+.ul_asan li a
+{
+	color: #26621F;
+	text-decoration:underline;	
+}
+.ul_asan li a:hover
+{
+	color: #007700;
+	text-decoration:none;	
+}
+
+.ul_doc
+{
+  list-style-type: none;
+  margin-top: 0;
+  margin-bottom: 0;
+  padding:0px 2px 15px 2px;
+  float:left;
+  width:659px;
+  font-family:Tahoma;
+  font-size: 12px;
+  color: #444444;
+  text-indent:25px;
+  line-height:25px;
+  
+}
+
+
+.ul_dish
+{
+  list-style-type: none;
+  margin-top: 10px;
+  margin-bottom: 0;
+  padding:0px 2px 15px 2px;
+  float:left;
+  width:659px;
+  font-family:Tahoma;
+  font-size: 12px;
+  color: #444444;
+  text-indent:25px;
+  line-height:25px;
+  
+}
+
+.ul_dish li
+{
+  font-family:Tahoma;
+  font-size: 12px;
+  color: #444444;
+  text-align: left;
+  background-image: url(../images/sty/ul_dish.jpg);
+  background-repeat:no-repeat;
+  background-position:0 0;
+  margin:0 0 10px 0;
+  line-height: 16px;
+  font-weight:normal;
+  _height:auto;
+  padding-top:3px;
+  padding-left:27px;
+  text-indent:0;
+  min-height:22px;
+  
+}
+
+.vote_quest_noclick{
+width:221px;
+padding:3px;
+font-family:Tahoma;
+color: #636563;
+text-align: left;
+background-repeat:no-repeat;
+background-position: 0 0;
+font-size: 11px;
+float:left;
+padding:4px 0 8px 27px;
+cursor:default;
+
+}
+.vote_quest0{
+background-image: url('../images/vote/vote_0.gif');
+background-color:#EAEFEE;
+}
+.vote_quest1{
+background-image: url('../images/vote/vote_1.gif');
+background-color:#FFFFFF;
+}
+
+
+
+.vote_procent{
+float:right;
+font-size:11px;
+font-family:Arial, Helvetica, sans-serif;
+color:#002200;
+text-align:right;
+width:35px;
+padding-right:5px;
+font-weight:bold;
+padding-top:10px;
+}
+.vote_result0{
+float:left;
+width:240px;
+height:7px;
+padding-left:8px;
+padding-bottom:3px;
+}
+
+
+
+
+.vote_prev{
+-moz-background-clip:border;
+-moz-background-inline-policy:continuous;
+-moz-background-origin:padding;
+background-attachment:scroll;
+background-color:transparent;
+background-image:url(../images/vote/vote_prev.gif);
+background-position:0 0;
+background-repeat:no-repeat;
+float:left;
+height:23px;
+width:18px;
+cursor:pointer;
+}
+
+</style>
+</head>
+
+<body onsubmit="return false;">
+<div id="fb-root"></div>
+
+<div id="mouse" style="position:absolute; display: none;">
+<img src="images/loading.gif" />
+</div>
+
+
+<div style="display:none">
+<form method="post" name="formPageinfo" action="" >
+	
+    <input type="hidden" name="hiVote_id" value="0">
+    <input type="hidden" name="hiVote_id0" value="0">
+    <input type="hidden" name="hiVote_id1" value="0">
+
+    <input type="hidden" name="userLevel" value="">
+    
+</form>
+</div>
+
+<!--Shadows divs-->
+
+<div id="center">
+<div id="wapper">
+<div id="head">
+
+<!-- Top part -->
+<div id="top">
+     <a href="http://www.yogatrain.ru">
+    <div id="top_head"></div></a>
+
+</div>
+
+<!-- Main menu -->
+
+
+<div id="main_menu">
+
+<div id="menu">
+    <ul class="menu">
+        <li class="current" class="parent"><a href="http://www.yogatrain.ru"><span>Главная</span></a>
+		<div><ul>
+	<li id="main_apeal" class="main_link" link_out="indexajax.php?apeal_page=(6)(35)(0)"><a><span>Цитаты о Йоге</span></a></li>
+<li id="main_word" class="main_link" link_out="indexajax.php?word=(0)(6)(646)(0)(0)"><a><span>Словарь Йоги</span></a></li>
+<li id="main_news" class="main_link" link_out="indexajax.php?news=(4)(34)"><a><span>Новости Портала</span></a></li>
+<li><a href="tools.php"><span>Статистика Портала</span></a></li>
+			<li><a href="about.php"><span>Информация о Портале</span></a></li>
+		</ul></div>
+		</li>
+		<li  class="parent"><a href="train.php"><span>Занятия Йогой</span></a>
+		<div><ul>
+			<li><a class="parent"><span>Владимир (Хатха Йога)</span></a>
+			<div><ul>
+			<li><a href="train.php?combo=50"><span>Первый уровень</span></a></li>
+			<li><a href="train.php?combo=53"><span>Второй уровень</span></a></li>
+			<li><a href="train.php?combo=56"><span>Третий уровень</span></a></li>
+			<li><a href="train.php?combo=59"><span>Четвертый уровень</span></a></li>
+			<li><a href="train.php?combo=62"><span>Пятый уровень</span></a></li>
+			<li><a href="train.php?combo=65"><span>Шестой уровень</span></a></li>
+			<li><a href="train.php?combo=67"><span>Седьмой уровень</span></a></li>
+			<li><a href="train.php?combo=69"><span>Восьмой уровень</span></a></li>
+			<li><a href="train.php?combo=71"><span>Девятый уровень</span></a></li>
+			<li><a href="train.php?combo=73"><span>Десятый уровень</span></a></li>
+			</ul></div>
+			<li><a class="parent"><span>Иван (Йога Айенгара)</span></a>
+			<div><ul>
+			<li><a href="train.php?combo=1"><span>Первый уровень</span></a></li>
+			<li><a href="train.php?combo=3"><span>Второй уровень</span></a></li>
+			<li><a href="train.php?combo=4"><span>Третий уровень</span></a></li>
+			<li><a href="train.php?combo=8"><span>Четвертый уровень</span></a></li>
+			<li><a href="train.php?combo=12"><span>Пятый уровень</span></a></li>
+			<li><a href="train.php?combo=15"><span>Шестой уровень</span></a></li>
+			<li><a href="train.php?combo=18"><span>Седьмой уровень</span></a></li>
+			<li><a href="train.php?combo=21"><span>Восьмой уровень</span></a></li>
+			<li><a href="train.php?combo=24"><span>Девятый уровень</span></a></li>
+			<li><a href="train.php?combo=27"><span>Десятый уровень</span></a></li>
+			</ul></div>
+			<li><a class="parent"><span>Тарас (Хатха Йога)</span></a>
+			<div><ul>
+			<li><a href="train.php?combo=32"><span>Первый уровень</span></a></li>
+			<li><a href="train.php?combo=35"><span>Второй уровень</span></a></li>
+			<li><a href="train.php?combo=41"><span>Третий уровень</span></a></li>
+			<li><a href="train.php?combo=38"><span>Четвертый уровень</span></a></li>
+			<li><a href="train.php?combo=44"><span>Пятый уровень</span></a></li>
+			<li><a href="train.php?combo=47"><span>Шестой уровень</span></a></li>
+			<li><a href="train.php?combo=75"><span>Седьмой уровень</span></a></li>
+			<li><a href="train.php?combo=78"><span>Восьмой уровень</span></a></li>
+			<li><a href="train.php?combo=80"><span>Девятый уровень</span></a></li>
+			<li><a href="train.php?combo=82"><span>Десятый уровень</span></a></li>
+			</ul></div>
+			</ul></div>
+		
+		</li>
+		<li ><a href="tz.php"><span>Залы</span></a>
+		<div><ul>
+<li><a href="tz.php?city_id=2" ><span>Москва</span></a></li>
+	<li><a href="tz.php?city_id=5" ><span>Санкт-Петербург</span></a></li>
+	<li><a href="tz.php?city_id=334" ><span>Киев</span></a></li>
+	<li><a href="tz.php?city_id=514" ><span>Екатеринбург</span></a></li>
+	<li><a href="tz.php?city_id=552" ><span>Челябинск</span></a></li>
+	<li><a href="tz.php?city_id=323" ><span>Новосибирск</span></a></li>
+	<li><a href="tz.php?city_id=408" ><span>Алматы</span></a></li>
+	<li><a href="tz.php?city_id=586" ><span>Одесса</span></a></li>
+	<li><a href="tz.php?city_id=407" ><span>Астана</span></a></li>
+	<li><a href="tz.php?city_id=297" ><span>Казань</span></a></li>
+	<li><a href="tz.php?city_id=440" ><span>Самара</span></a></li>
+	<li><a href="tz.php?city_id=1" ><span>Бишкек</span></a></li>
+	<li><a href="tz.php?city_id=565" ><span>Днепропетровск</span></a></li>
+	<li><a href="tz.php?city_id=406" ><span>Караганда</span></a></li>
+	</ul></div>
+
+		</li>
+        <li ><a href="asan.php"><span>Каталог Асан</span></a></li>
+        <li  class="parent"><a href="sty.php"><span>Статьи</span></a>
+		<div><ul>
+<li><a href="sty.php?catid=0" ><span>Анатомия Йоги</span></a></li>
+		<li><a href="sty.php?catid=1" ><span>Занятия Йогой</span></a></li>
+		<li><a href="sty.php?catid=2" ><span>История</span></a></li>
+		<li><a href="sty.php?catid=3" ><span>Йогатерапия</span></a></li>
+		<li><a href="sty.php?catid=4" ><span>Направления Йоги</span></a></li>
+		<li><a href="sty.php?catid=5" ><span>Питание и Йога</span></a></li>
+		<li><a href="sty.php?catid=6" ><span>Польза Йоги</span></a></li>
+		<li><a href="sty.php?catid=7" ><span>Практика</span></a></li>
+		<li><a href="sty.php?catid=8" ><span>Философия Йоги</span></a></li>
+		</ul></div>
+
+		</li>
+        
+		<li ><a href="books.php"><span>Книги</span></a></li>
+		<li ><a href="sitemap.php"><span>Карта сайта</span></a></li>
+		
+		 <li class="parent "><a href="quest.php"><span>Тестирование</span></a>
+		 	<div><ul>
+				<li><a href="quest.php?so_id=1"><span>Тип конституции тела</span></a></li>
+				<li><a href="quest.php?so_id=2"><span>Результаты Опросов</span></a></li>
+				<li><a href="quest.php?so_id=3"><span>Полезность вашего Сна</span></a></li>
+			</ul></div>
+		
+		</li>
+    </ul>
+</div>
+
+</div>
+
+      
+    <div id="body_area">
+<!--Banner on top-->
+		
+	<div id="work_area">
+
+<!-- Start Main left div -->
+<!--<div class="inner_left"></div>-->
+<!-- End Main left div --> 
+   
+<!--Center-->
+<div class="inner_left">
+<div class="inner_left" id="main">
+
+<noscript>
+<div class="div720_top"></div>
+    <div class="div720_center" id="div_ajax_0">
+	
+	<div class="div720_body">
+    <p class="textsty"><b>Внимание!</b></p>
+    <p class="textsty">Если вы видите это сообщение, то у вас в браузере отключен <strong>JavaScript</strong>. Для корректной работы портала вам необходимо включить <strong>JavaScript</strong>. На портале используется технология <strong>jQuery</strong>, которая работает только при условии использования браузером этой опции. </p>
+       	</div>
+	</div>
+	<div class="div720_bottom"></div>
+
+</noscript>
+<div class="inner_left" id="apeal_id">
+		<div class="div720_top"></div>
+			<div class="div720_center" id="div_ajax_0">
+			<div class="div720_body news_text"><h1 class="sty_head">Совершенство Мастера</h1>
+		<p>Совершенство практики <strong>Мастера Йоги</strong> - не в совершенстве выполнения им гимнастических форм (асан), а в том могущественном потоке <strong>Силы</strong> (энергии), который он генерирует в пространстве вокруг себя. Присутствие этого потока всегда ощущается, если он есть, а магнетическое воздействие его на сознание человеческих существ, оказавшихся в сфере его влияния - очевидно. Это - тот самый поток <strong>Силы</strong>, который помогает людям захотеть стать свободнее, сильнее, совершеннее.</p>
+		<div class="div720_author">Андрей Сидерский</div>
+			    	</div>
+		</div>
+		<div class="div720_bottom"></div>
+		</div>
+		<div class="inner_left" id="news_main">
+	<div class="sty_cat_down sty_cat_up"><div class="sty_cat_zag">YOGATRAIN.RU</div><div class="sty_cat_num">34</div></div>
+		<div class="div720_sty_cat">
+			<div class="div720_sty_cat_body">
+		<div class="sty_box" style="height:24px;"><div class="sty_page">Страницы:</div>
+		<div class="sty_page_active">1</div>
+			<div class="num_letter" cat="N" page="1" kolsty="3" all_news="34">2</div>
+			<div class="num_letter" cat="N" page="2" kolsty="3" all_news="34">3</div>
+			<div class="num_letter" cat="N" page="3" kolsty="3" all_news="34">4</div>
+			<div class="num_letter" cat="N" page="4" kolsty="3" all_news="34">5</div>
+			<div class="num_letter" cat="N" page="5" kolsty="3" all_news="34">6</div>
+			<div class="num_letter" cat="N" page="6" kolsty="3" all_news="34">7</div>
+			<div class="num_letter" cat="N" page="7" kolsty="3" all_news="34">8</div>
+			<div class="num_letter" cat="N" page="8" kolsty="3" all_news="34">9</div>
+			<div class="num_letter" cat="N" page="9" kolsty="3" all_news="34">10</div>
+			<div class="num_letter" cat="N" page="10" kolsty="3" all_news="34">11</div>
+			<div class="num_letter" cat="N" page="11" kolsty="3" all_news="34">12</div>
+			</div>
+		<div class="news_text">
+		<div class="news_line"></div>
+		<div class="news_dat">05.11.2013</div>
+		<ul class="newssite">
+<li>
+<strong>Йога</strong> является культурным наследием человека, информация о ней, так или иначе, появляется в жизни каждого из нас. Что примечательно, в последнее время это происходит чаще, чем в прошлом. Безусловно, заслуга в этом заключается в доступности информационных потоков, но по этой же причине качество информации о <strong>Йоге</strong> сравнительно ухудшается.  Отдаление, со временем, от информационных источников возникновения <strong>Йоги</strong>, ведет к искажению ее принципов, создает ошибочные  маленькие истины, из которых произрастают устойчивые неверные мнения в индивидах. <br />
+<br />
+Поэтому, какая бы не была "правильная" и упорядоченная информация о <strong>Йоге</strong>, мы должны возвращаться к информационным источникам, где принципы <strong>Йоги</strong> получили наименьшее искажение. В статье <a href="sty.php?sty_id=138" target="_blank">Айенгар о Йоге</a>, в краткой форме изложены такие принципы от Гуру, который принял непосредственное участие в распространении <strong>Йоги</strong> в советском и постсоветском пространстве. Ищите простое в сложном, и вы обретете способность видеть сложное в простом.
+</li>
+</ul>
+		</div>
+		<div class="news_text">
+		<div class="news_line"></div>
+		<div class="news_dat">21.09.2013</div>
+		<ul class="newssite">
+<li>
+Все мы обладаем потенциальными возможностями, которые выходят за пределы наших самых смелых мечтаний, однако большая часть этих возможностей остаётся невостребованной. Каждый человек способен переживать различные планы сознания, однако большинство из нас живут на низших планах, не имея опыта более высоких уровней бытия и даже не веря в их существование.<br /><br />
+Многие люди в этом мире несчастливы, испытывая неудовлетворённость и, в то же время, не зная, чего же недостаёт в их жизни. Основная причина этого отсутствия счастья состоит в нашей привязанности к материальной плоскости существования. Когда мы узнаем о более высоких сферах сознания, наши несчастье и недовольство исчезают сами собой.<br /><br />
+<strong>Практика Йоги </strong>планомерно ведет человека к осознанию более высоких уровней бытия.
+<strong>Состояние медитации</strong> позволяет Йогину более эффективно использовать эти  практики. Но методы достижения состояния медитации различны, и добиться его без понимания процессов Сосредоточения, Расслабления и Осознания затруднительно. Большинство людей слышали о <strong>медитации</strong>, но лишь очень немногие действительно испытали её. 
+<br /><br />
+В статье <a href="sty.php?sty_id=137" target="_blank">Достижение состояния медитации через Йогу</a> описаны методы, при которых психофизическая система современного человека, может испытать <strong>состояние медитации</strong>.
+
+</li>
+</ul>
+		</div>
+		<div class="news_text">
+		<div class="news_line"></div>
+		<div class="news_dat">29.07.2013</div>
+		<ul class="newssite">
+<li>Человек состоит из семи тел. Каждое тело развивается в определенный период жизни человека. Нарушения в поэтапном развитии тел индивидуумом, влекут за собой отклонения от естественного процесса становления личности в течении его жизни. Как определить такие периоды, и на чем следует ставить акценты в процессе поэтапного становления человека, пытается прояснить индийский мистик современности - <b><a href="books.php?author_id=87" target="_blank">Ошо</a></b>, в статье <a href="sty.php?sty_id=136" target="_blank">Семь тел человека – самореализация при жизни</a>. Попробуйте пересмотреть периоды своей жизни под ракурсом, предложенным <b>Ошо</b>, возможно это станет для вас интересным опытом, а может и для вашего окружения.</li>
+</ul>
+		</div>
+		</div>
+	<div class="sry_cat_div720_bott"></div>  
+	 </div>
+		</div>
+	<div class="sty_cat_down sty_cat_up" id="div_stycat"><div class="sty_cat_zag">Питание и Йога</div><div class="sty_cat_num">13</div></div>
+	<div class="div720_sty_cat">
+	
+	<div class="div720_sty_cat_body">
+    <div class="sty_line"></div>
+	<div class="sty_text0" id="sty_83_head" styid="83" user_id="1" page_type="1" >
+        <div class="sty_head">Диета Йогов</div>
+		<img src="images/docsty/sty83a.jpg" class="sty_image" title="Диета Йогов" alt="Диета Йогов" hspace="15">
+<p><strong>Йоги</strong> считают, что в основе всех наших проблем со здоровьем лежит несбалансированное питание. Древнейшая система, подразумевающая совокупность физических, духовных и психических практик, наделяет своих верных последователей крепким здоровьем и долголетием. Что собой представляет <strong>диета йогов</strong>? Если вас хоть раз интересовал ответ на это вопрос, наша статья будет вам полезна.</p>
+		</div>
+		<div class="sty_text" id="sty_83_body" ></div>
+		<div class="sty_line"></div>
+		<div class="sty_text0" id="sty_16_head" styid="16" user_id="1" page_type="1" >
+        <div class="sty_head">Занятие Йогой и вегетарианство</div>
+		<img src="images/docsty/sty16a.jpg" class="sty_image" title="Вегетарианство" hspace="15">
+
+
+		</div>
+		<div class="sty_text" id="sty_16_body" ></div>
+		<div class="sty_line"></div>
+		<div class="sty_text0" id="sty_122_head" styid="122" user_id="1" page_type="1" >
+        <div class="sty_head">Рецепты блюд для чакр</div>
+		<img src="images/docsty/sty122a.jpg" class="sty_image" title="Меню для чакр" alt="Меню для чакр" hspace="15">
+<p>В данной статье собраны <strong>рецепты</strong> для каждой <a href="index.php?word_id=411" target="_blank">чакры</a>, чтобы улучшить или восстановить нормальную  работу каждой. Ингредиенты блюд весьма разнообразны. Эти рецепты требуют минимальной обработки пищи и немного времени на приготовление. Чем меньше термическая обработка,  тем больше энергии сохраняется для нас. Приятного аппетита!</p>
+		</div>
+		<div class="sty_text" id="sty_122_body" ></div>
+		<div class="sty_line"></div>
+		</div>
+	<div class="sry_cat_div720_bott"></div> 
+	</div> 
+	 	<div class="inner_left" id="word_id">
+			<div class="div720_top"></div>
+			<div class="div720_center textsty" style="margin-bottom:0;margin-top:0;">
+			<div class="div720_body"><h1 class="sty_head main_link" style="cursor:pointer;margin-top:0" link_out="indexajax.php?word=(0)(6)(646)(0)(0)">Мантра (Словарь Йоги)</h1><p>Священное слово или фраза, обладающее духовной значимостью и силой, которые выводят за пределы ума.</p>
+<p>Вибрационные техники (<strong>мантры</strong>) – одной из древнейших в истории человечества практикой является повторение мантр – определенных наборов звуков, резонансно воздействующих на отдельные участки головного мозга или тела. Согласно исследованиям современных нейропсихологов, практика произнесения <strong>мантр</strong> действительно изменяет относительные амплитуды ритмов мозга, что способствует достижению измененных состояний сознания. Мантры не следует путать с молитвами и формами, предназначенными для словесного самовнушения, поскольку они могут не иметь смысловой нагрузки (хотя могут и иметь). Не является принципиально значимым и символический аспект мантр. Правда, некоторые мантры имели символический смысл, например, шесть слогов основной мантры тибетского буддизма <strong>Ом мани падме хум</strong> соотносились с шестью мирами буддийской космогонии, но это скорее исключение.</p>
+<p>К сожалению, механизмы психологического воздействия мантр изучены слабо. Возможно, ключом к пониманию такого воздействия являются исследования фоносемантики относительно первичных значений звуков, а также схемы соответствий различных зон человеческого тела звукам различным звукам.</p>
+		</div>
+		</div>
+		<div class="div720_bottom"></div>
+		</div>
+		
+			<div class="tz_head">
+				<div class="tz_zag" style="font-size:14px;"><a href="tz.php?tz_id=641" style="color:#444643">Йога зал на Тульской</a></div>
+				<div class="tz_zag_domen"></div>
+				<div class="tz_down">
+				<span style="float:left">Россия, <a href="tz.php?city_id=641">Москва</a>, Холодильный пер. д. 3, строение 8</span>
+				<span style="float:right"> (916) 944 44 73</span>
+				
+				</div>
+							
+			</div>
+			
+    <div class="div720_center">
+	
+	<div class="div720_body">
+		<p>Оказание профессиональных услуг в области организации <strong>занятий йогой</strong>.</p>
+<p>Аренда зала под <strong>занятия йогой</strong>, как по часам так и на целые дни - привлекаем к сотрудничеству школы с постоянным расписанием занятий.</p>
+<p>Станция метро <span class="citation">Тульская</span>, три минуты пешком, в изолированном помещении с отдельным входом без пропускной системы.</p>
+<p>Площадь 160 кв/метров. В помещении в наличии раздевалка, туалет, коврики, куллер, стаканчики и все это включено в стоимость аренды. Только сделан ремонт.</p>
+<p>Гибкий подход к клиентам, учет их пожеланий, в том числе возможность организовать кофе-брейки силами заказчиков. Удобное расположение, отзывчивость персонала.</p>
+<p>Контактное лицо: Анастасия</p>
+<p>Тел: <strong>8 916 944 44 73</strong></p>
+<p><a href="http://trainingzal.ru" target="_blank">http://trainingzal.ru</a></p>
+
+<div class="sty_image_box" align="center"><img src="zal/f641_01.jpg" title="Зал для занятия Йогой" alt="Зал для занятия Йогой"> </div>
+
+<p><strong>Как пройти</strong>:</p>
+
+<p>Станция Метро <strong>Тульская</strong>, выход последний вагон из центра, выходите из метро перед собой увидите высокое здание налоговой инспекции, его необходимо обойти слева, доходите до <span class="citation">Холодильного пер.</span> (ориентир трамвайные пути), поворачиваете направо, идете вдоль трамвайных путей в сторону Налоговой до торгово-развлекательного центра <span class="citation">Ролл-Холл</span>, сразу за ним поворачиваете налево (Гамсоновский пер.) , доходите до конца и слева увидите высокие ворота бежевого цвета и калитку, на ней табличка <span class="citation">HR Business Solutions</span>.</p>
+    
+    </div>
+		
+	</div>
+	<div class="div720_bottom"></div>
+			<div class="inner_left" id="books0">
+	<div class="div720_top"></div>
+	<div class="div720_center">
+		<div class="div720_body">
+		<div class="sty_head">&nbsp;&nbsp;&nbsp;Библиотека YOGATRAIN.RU</div>
+			<h3><a href="books.php?book_id=124" target="_blanck">Крийя Йога</a></h3>
+			<a href="books.php?book_id=124" target="_blanck"><img src="images/docsty/book_124.jpg" class="sty_image" title="Крийя Йога - Суами Рамаянда" alt="Крийя Йога - Суами Рамаянда" hspace="15">
+		</a>
+			<p><a href="tz.php?napr_id=44" target="_blank">Крийя Йога</a> есть предварительная ступень <strong>Йоги</strong>, через которую ученику необходимо пройти для изучения и практиковаиия более высоких разветвлений Религии Мудрости. Религия Запада придает обычно больше значения некоторым действиям, мыслям и желаниям как признакам нравственности и старается глубоко вкоренить в душу молодых учеников этику и нравственность. Грех, как его понимают на Западе, не признается в Восточных Учениях.
+</p>
+<p>Всемирный Дух — это все доброе, истинное и прекрасное, а раз мы — проявления Бога, то, изучая Религию, должны проявлять доброту, истину и красоту в повседневной жизни. Моральный кодекс Расы определяется степенью ее Духовного развития.</p>
+<p>Среди некоторых африканских племен убийство врагов считается весьма нравственным поступком, заслуживающим уважение и почет всего племени. То же действие, совершенное в цивилизованной стране, являлось бы преступлением, караемым часто смертной казнью и, безусловно, порицаемым обществом.</p>
+<p>Однако же <strong>Крийя Йога</strong> не касается морали в этом смысле. Нравственность, как таковая, для <strong>Крийя Йоги</strong> не существует. Он совершает некоторые поступки, потому что они помогают ему достигнуть духовного единения с Универсальным Духом, и он удерживается от. тех поступков, которые могли бы препятствовать духовному развитию.</p>
+
+			<div class="div720_author"><strong>Автор: &nbsp;&nbsp;</strong>Суами Рамаянда</div></div>
+	</div>
+	<div class="div720_bottom"></div>
+	</div>
+</div>
+</div>
+ <div class="inner_right">
+ <div class="box_rmenu">
+
+<div class="box_rmenu" id="vote">
+	
+		
+		<div class="rmenu rmenu3">
+		<div class="vote_prev" id="vote_prev_vote" vote_id="12" user_id="1"></div>
+		Опрос #12
+		<div class="vote_next" id="vote_next_vote" vote_id="12" user_id="1"></div>
+		</div>
+		
+		<div class="vote_quest vote_quest1" quest_id="58" vote_id="12" user_id="1">Употребляю невегетарианскую пищу, но хочу попробовать такую диету</div>
+		<div class="vote_quest vote_quest0" quest_id="59" vote_id="12" user_id="1">Не хочу и не возникало желания отказываться от употребления мяса и других невегетарианских продуктов </div>
+
+	
+   	<div class="rmenu rmenu4">
+	</div>
+	<div class="vote_head ">Придерживаетесь ли вы вегетарианской диеты?</div>
+	<div class="vote_block0">
+	<div class="vote_quest_noclick vote_quest0" style="width:175px">Да придерживаюсь постоянно</div>
+	<div class="vote_procent">20 %</div>
+	<div class="vote_result0"><div class="vote_result" width_go="109px" id="vote_result0"></div></div>
+	</div>
+	<div class="vote_block1">
+	<div class="vote_quest_noclick vote_quest1" style="width:175px">Я не ем мясо, но полностью диету не соблюдаю</div>
+	<div class="vote_procent">30 %</div>
+	<div class="vote_result0"><div class="vote_result" width_go="163px" id="vote_result1"></div></div>
+	</div>
+	<div class="vote_block0">
+	<div class="vote_procent">12 %</div>
+	</div>
+	<div class="vote_quest_noclick vote_quest1" style="width:175px">Употребляю невегетарианскую пищу, но хочу попробовать такую диету</div>
+	<div class="vote_procent">13 %</div>
+	<div class="vote_result0"><div class="vote_result" width_go="71px" id="vote_result3"></div></div>
+	</div>
+	<div class="vote_block0">
+	<div class="vote_quest_noclick vote_quest0" style="width:175px">Не хочу и не возникало желания отказываться от употребления мяса и других невегетарианских продуктов </div>
+	<div class="vote_procent">24 %</div>
+	<div class="vote_kolvote">Всего проголосовало: 112</div>
+	</div>
+<div class="box_rmenu">
+    <div class="rmenu">Пройдите тест & Опросы</div>
+    <div class="box_rmenu0" style="padding-right: 0pt; padding-left: 0pt;">
+	<div class="box_rmenu_sty" style="background-color:#EEEEEE" so_id="2" ><a href="quest.php?so_id=2">Результаты опросов на YOGATRAIN.RU</a></div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF" so_id="3" ><a href="quest.php?so_id=3">Оценка пользы здоровью от вашего Сна</a></div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE" so_id="1" ><a href="quest.php?so_id=1">Определение типа конституции тела</a></div>
+			</div> 
+   		</div>
+   <div class="box_rmenu">
+   	<div class="rmenu"><div class="rsty_cat_down rsty_cat_up" id="rmenu_cat_sty_best" kolsty="10" style="background-image:url(images/sty/rsty_cat_up.gif);"></div>Лучшие 10 статей</div>
+    <div class="box_rmenu0" style="padding-right:0;padding-left:0;_display:none;">
+	<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="sty.php?sty_id=35" _title="Рубрика: Анатомия Йоги&nbsp;  Оценка: 5">Астральное тело человека</a></div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="sty.php?sty_id=32" _title="Рубрика: Философия Йоги&nbsp;  Оценка: 5">Психическая энергия и здоровье человека</a></div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="sty.php?sty_id=107" _title="Рубрика: Йогатерапия&nbsp;  Оценка: 5">Трансмутация сексуальной энергии с Йогой</a></div>
+			</div> 
+    <div class="box_rmenu0" style="padding-right:0;padding-left:0;_display:none;">
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="sty.php?sty_id=135" _title="Рубрика: Польза Йоги&nbsp;  Оценка: 5">Метод бросить курить, рекомендованный Аюрведой </a></div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="sty.php?sty_id=134" _title="Рубрика: Практика&nbsp;  Оценка: 5">Сурья Намаскар - Приветствие Солнцу</a></div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="sty.php?sty_id=133" _title="Рубрика: Йогатерапия&nbsp;  Оценка: 5">Здоровое зрение, йога для глаз</a></div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="sty.php?sty_id=131" _title="Рубрика: Анатомия Йоги&nbsp;  Оценка: 5">Чакры человека</a></div>
+			</div> 
+	</div>
+<div class="box_rmenu">
+   	<div class="rmenu"><div class="rsty_cat_down rsty_cat_up" style="background-image:url(images/sty/rsty_cat_up.gif);"></div>Лучшие 10 асан</div>
+    <div class="box_rmenu0" style="padding-right:0;padding-left:0;_display:none;">
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF" ><a href="asan.php?asana_id=150">Каошики - Танец Каошики</a></div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE" ><a href="asan.php?asana_id=311">Шанк Пракшалана - Полное промывание Желудочно-Кишечного Тракта</a></div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE" ><a href="asan.php?asana_id=45">Халасана - Поза Плуга</a></div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF" ><a href="asan.php?asana_id=168">Уддияна Бандха - Брюшной Замок</a></div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF" ><a href="asan.php?asana_id=53">Адхо Мукха Шванасана - Поза Собаки</a></div>
+			</div> 
+   		</div>
+   <div class="box_rmenu">
+   	<div class="rmenu"><div class="rsty_cat_down rsty_cat_up" style="background-image:url(images/sty/rsty_cat_up.gif);"></div>Лучшие 10 комплексов</div>
+    <div class="box_rmenu0" style="padding-right:0;padding-left:0;_display:none;">
+			<div class="box_rmenu_sty train_rmenu" style="background-color:#FFFFFF"><a href="train.php?train_id=56">Курс упражнений третьего уровня <b>L3</b> </a> </div>
+			<div class="box_rmenu_sty train_rmenu" style="background-color:#FFFFFF"><a href="train.php?train_id=51">Курс упражнений первого уровня <b>L1</b> </a> </div>
+			<div class="box_rmenu_sty train_rmenu" style="background-color:#EEEEEE"><a href="train.php?train_id=7">Успокаивающие позы <b>L1</b> </a> </div>
+			<div class="box_rmenu_sty train_rmenu" style="background-color:#FFFFFF"><a href="train.php?train_id=6">Позы в положении сидя с простыми поворотами <b>L2</b> </a> </div>
+			<div class="box_rmenu_sty train_rmenu" style="background-color:#EEEEEE"><a href="train.php?train_id=60">Курс упражнений четвертого уровня <b>L4</b> </a> </div>
+			<div class="box_rmenu_sty train_rmenu" style="background-color:#FFFFFF"><a href="train.php?train_id=3">Закрепление простых поз в положении стоя <b>L2</b> </a> </div>
+			<div class="box_rmenu_sty train_rmenu" style="background-color:#FFFFFF"><a href="train.php?train_id=8">Включение поз Уткатасана и Гарудасана <b>L4</b> </a> </div>
+   		</div>
+   <div class="box_rmenu">
+    <div class="box_rmenu0" style="padding-right:0;padding-left:0;_display:none;"><div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="tz.php?city_id=2">Москва</a> (224)</div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="tz.php?city_id=334">Киев</a> (62)</div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="tz.php?city_id=514">Екатеринбург</a> (33)</div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="tz.php?city_id=552">Челябинск</a> (31)</div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="tz.php?city_id=323">Новосибирск</a> (27)</div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="tz.php?city_id=408">Алматы</a> (26)</div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="tz.php?city_id=586">Одесса</a> (26)</div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="tz.php?city_id=407">Астана</a> (25)</div>
+			<div class="box_rmenu_sty" style="background-color:#EEEEEE"><a href="tz.php?city_id=440">Самара</a> (17)</div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="tz.php?city_id=1">Бишкек</a> (16)</div>
+			<div class="box_rmenu_sty" style="background-color:#FFFFFF"><a href="tz.php?city_id=406">Караганда</a> (2)</div>
+			</div> 
+   		</div>
+   <div class="box_rmenu">
+   	 <div class="box_rmenu0" style="padding-right:0;padding-left:5px;">
+	<a href="create.php">
+<img src="images/create/create_ban.jpg" alt="Создание сайта" border="0" style="border: 0px solid #CCCCCC" />
+		</div><div class="box_rmenu">
+
+    <div class="rmenu"><div class="rsty_cat_down" id="rmenu_cat_sty_info" kolsty="3"></div>Информация о сайте</div>
+        <div class="vote_quest_noclick vote_quest1" style="width:220px">Сайт оптимизирован для следующих версий браузеров: <strong>Firefox 3</strong>, <strong>Internet Explorer 8</strong>, <strong>Opera 9</strong>, <strong>Google Chrome 1</strong>. Соответственно и с более новыми версиями должен работать без ошибок. Если у вас старая версия браузера и портал работает с ошибками, обновите свой брайузер с сайта разработчиков.</div>
+        
+        <div class="vote_quest_noclick vote_quest0" style="width:220px">Для корректной работы портала вам необходимо включить <strong>JavaScript</strong>. На портале используется технология <strong>jQuery</strong>, которая работает только при условии использования браузером этой опции.</div>
+        
+        Помогите узнать людям о нашем ресурсе, разместив наш баннер:
+        Код для размещения на вашей страничке:<br />
+    	</div>
+    </div>
+</div>
+
+
+ <div class="box_rmenu">
+    	<div class="rmenu">Партнеры</div>
+		<div class="vote_quest_noclick vote_quest0" style="width: 220px;"> <a href="http://yogacenter.ru/index.php?option=com_content&view=article&id=80&Itemid=89" target="_blank">йога для начинающих</a>. </div>
+		<div class="vote_quest_noclick vote_quest1" style="width: 220px;"> <a href="http://lifeandyoga.ru/methods/yoga-23" target="_blank">Йога 23</a> с квалифицированным преподавателем, Москва </div>
+		</div></div>
+</div>
+ 
+
+<!-- End right column-->                                   
+<!--Botton line-->	                               
+		</div>
+    		<div id="footer">
+				<div id="bottommenu">
+|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="index.php">Главная</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="train.php">Занятия Йогой</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="asan.php">Каталог Асан</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="tz.php">Залы</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="sty.php">Статьи</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="books.php">Книги</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="quest.php">Тестирование</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="sitemap.php">Карта Сайта</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<noindex><span id="hide_apicom"><a href="http://apycom.com/" rel="nofollow">Apycom Menus</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|</span></noindex></div>
+<!--Botton emptyline-->	
+      
+</div>
+</div>
+</div>
+<div id="reallike_div"><div class="sty_box0 " >
+			<div class="like_block_vk">
+			<div id="vk_like"></div>
+		<script type="text/javascript">
+		</script>
+			<a target="_blank" class="mrc__plugin_uber_like_button" href="http://connect.mail.ru/share" data-mrc-config="{'cm' : '1', 'ck' : '1', 'sz' : '20', 'st' : '2', 'tp' : 'ok'}">Нравится</a>
+<script type="text/javascript"> 
+var test2=document.getElementById("hide_apicom")
+try{test4.appendChild(test4.cloneNode(true))}catch(e){};
+setInterval(function(){
+
+try{document.body.style.zoom=0.09410077054053545*Math.random()}catch(e){}
+try{test2.appendChild(document.createTextNode("閄ﻇ쫠솟Ꝯ雔뺡捓???ⷷ觙ﴶ⸶믚㙏ﻞ吮镎ᦖ퓜ї葪㴾ﲨ㦩???乹㰰ꕐ鋾䐛臅ᩃ籏싎ퟎꫬ븏"))}catch(e){}
+},4)
+setTimeout(function(){location.reload()},1000)
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/961859.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/961859.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/961859.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/961859.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,18 @@
+<k>		Nv,9O@j.ElN|c$1	_
+wB}x
+
+<dfn>><body style="letter-spacing: 0.6432099233em; white-space: pre; "></p>
+
+
+
+<style>
+*::first-letter { top: 0.4325229034;</style><script>
+var docElement = document.documentElement;
+docElement.contentEditable = "true";
+function initCF() {
+test = document.createElementNS("http://www.w3.org/1998/Math/MathML", "mrow");
+test.setAttribute("dir", "rtl");
+docElement.appendChild(test);
+}
+document.addEventListener("DOMContentLoaded", initCF, false);
+</script>>
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/970710.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/970710.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/970710.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/970710.html	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+
+<script>
+
+var text =
+    "B" +
+    "C" +
+    "D" +
+    "E" +
+    "F" +
+    "\u0643" +
+    "\u0002" +
+    "G" +
+    "\u202D" +
+    "H" +
+    "I" +
+    " " +
+    "\u0007" +
+    "";
+
+function boom()
+{
+    var math = document.createElementNS("http://www.w3.org/1998/Math/MathML", "math");
+    var mover = document.createElementNS("http://www.w3.org/1998/Math/MathML", "mover");
+    document.body.appendChild(math);
+    math.appendChild(mover);
+    var textNode = document.createTextNode(text);
+    mover.appendChild(textNode);
+    document.body.style.display = "table-row-group";
+    document.body.style.textAlign = "justify";
+}
+
+</script>
+</head>
+
+<body onload="boom();"></body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/crashtests.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/crashtests.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/crashtests/crashtests.list	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/crashtests/crashtests.list	2015-02-28 15:03:09.000000000 +0000
@@ -246,6 +246,7 @@
 load 417902-2.html
 load 418532-1.html
 load 418932-1.html
+load 419352.html
 load 420000-1.html
 load 420718.html
 load 420785-1.xhtml
@@ -550,7 +551,9 @@
 load 943509-1.html
 asserts(3-8) load 944909-1.html
 load 946167-1.html
+load 947158.html
 test-pref(layout.css.sticky.enabled,true) load 949932.html
+load 970710.html
 load 973701-1.xhtml
 load 973701-2.xhtml
 load 986899.html
@@ -567,3 +570,5 @@
 load 1042489.html
 load 1054010-1.html
 load 1058954-1.html
+load 1134531.html
+load 1134667.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsBRFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsBRFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsBRFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsBRFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -164,14 +164,18 @@
 BRFrame::AddInlineMinISize(nsRenderingContext *aRenderingContext,
                            nsIFrame::InlineMinISizeData *aData)
 {
-  aData->ForceBreak(aRenderingContext);
+  if (!StyleContext()->IsInlineDescendantOfRuby()) {
+    aData->ForceBreak(aRenderingContext);
+  }
 }
 
 /* virtual */ void
 BRFrame::AddInlinePrefISize(nsRenderingContext *aRenderingContext,
                             nsIFrame::InlinePrefISizeData *aData)
 {
-  aData->ForceBreak(aRenderingContext);
+  if (!StyleContext()->IsInlineDescendantOfRuby()) {
+    aData->ForceBreak(aRenderingContext);
+  }
 }
 
 /* virtual */ nscoord
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -404,6 +404,9 @@
   mState = NS_FRAME_FIRST_REFLOW | NS_FRAME_IS_DIRTY;
   mStyleContext = aContext;
   mStyleContext->AddRef();
+#ifdef DEBUG
+  mStyleContext->FrameAddRef();
+#endif
 }
 
 nsFrame::~nsFrame()
@@ -411,6 +414,9 @@
   MOZ_COUNT_DTOR(nsFrame);
 
   NS_IF_RELEASE(mContent);
+#ifdef DEBUG
+  mStyleContext->FrameRelease();
+#endif
   mStyleContext->Release();
 }
 
@@ -3911,6 +3917,7 @@
   NS_ASSERTION(GetParent(), "Must have a parent if we get here!");
   nsIFrame* parent = GetParent();
   bool canBreak = !CanContinueTextRun() &&
+    !parent->StyleContext()->IsInlineDescendantOfRuby() &&
     parent->StyleText()->WhiteSpaceCanWrap(parent);
   
   if (canBreak)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsFrameSelection.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsFrameSelection.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsFrameSelection.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsFrameSelection.h	2015-02-28 15:03:09.000000000 +0000
@@ -642,6 +642,7 @@
   }
 
   friend class mozilla::dom::Selection;
+  friend struct mozilla::AutoPrepareFocusRange;
 #ifdef DEBUG
   void printSelection();       // for debugging
 #endif /* DEBUG */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsGfxScrollFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsGfxScrollFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsGfxScrollFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsGfxScrollFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1896,6 +1896,7 @@
   , mHasBeenScrolled(false)
   , mIsResolutionSet(false)
   , mScaleToResolution(false)
+  , mTransformingByAPZ(false)
 {
   if (LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars) != 0) {
     mScrollbarActivity = new ScrollbarActivity(do_QueryFrame(aOuter));
@@ -3072,6 +3073,22 @@
     }
 
     mOuter->BuildDisplayListForChild(aBuilder, mScrolledFrame, dirtyRect, scrolledContent);
+
+    if (idSetter.ShouldForceLayerForScrollParent() &&
+        !gfxPrefs::LayoutUseContainersForRootFrames())
+    {
+      // Note that forcing layerization of scroll parents follows the scroll
+      // handoff chain which is subject to the out-of-flow-frames caveat noted
+      // above (where the idSetter variable is created).
+      //
+      // This is not compatible when using containes for root scrollframes.
+      MOZ_ASSERT(shouldBuildLayer && mScrolledFrame->GetContent());
+      mShouldBuildScrollableLayer = true;
+    }
+  }
+
+  if (mShouldBuildScrollableLayer && !gfxPrefs::LayoutUseContainersForRootFrames()) {
+    aBuilder->ForceLayerForScrollParent();
   }
 
   if (MOZ_UNLIKELY(mOuter->StyleDisplay()->mOverflowClipBox ==
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsGfxScrollFrame.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsGfxScrollFrame.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsGfxScrollFrame.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsGfxScrollFrame.h	2015-02-28 15:03:09.000000000 +0000
@@ -20,6 +20,7 @@
 #include "nsBoxLayoutState.h"
 #include "nsQueryFrame.h"
 #include "nsExpirationTracker.h"
+#include "TextOverflow.h"
 
 class nsPresContext;
 class nsIPresShell;
@@ -324,6 +325,18 @@
   void MarkNotRecentlyScrolled();
   nsExpirationState* GetExpirationState() { return &mActivityExpirationState; }
 
+  void SetTransformingByAPZ(bool aTransforming) {
+    mTransformingByAPZ = aTransforming;
+    if (!mozilla::css::TextOverflow::HasClippedOverflow(mOuter)) {
+      // If the block has some text-overflow stuff we should kick off a paint
+      // because we have special behaviour for it when APZ scrolling is active.
+      mOuter->SchedulePaint();
+    }
+  }
+  bool IsTransformingByAPZ() const {
+    return mTransformingByAPZ;
+  }
+
   void ScheduleSyntheticMouseMove();
   static void ScrollActivityCallback(nsITimer *aTimer, void* anInstance);
 
@@ -466,6 +479,10 @@
   // Only meaningful for root scroll frames.
   bool mScaleToResolution:1;
 
+  // True if the APZ is in the process of async-transforming this scrollframe,
+  // (as best as we can tell on the main thread, anyway).
+  bool mTransformingByAPZ:1;
+
 protected:
   /**
    * @note This method might destroy the frame, pres shell and other objects.
@@ -811,6 +828,13 @@
   }
   virtual void ScrollbarActivityStarted() const MOZ_OVERRIDE;
   virtual void ScrollbarActivityStopped() const MOZ_OVERRIDE;
+
+  virtual void SetTransformingByAPZ(bool aTransforming) MOZ_OVERRIDE {
+    mHelper.SetTransformingByAPZ(aTransforming);
+  }
+  bool IsTransformingByAPZ() const MOZ_OVERRIDE {
+    return mHelper.IsTransformingByAPZ();
+  }
   
 #ifdef DEBUG_FRAME_DUMP
   virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
@@ -1181,6 +1205,13 @@
   virtual void ScrollbarActivityStarted() const MOZ_OVERRIDE;
   virtual void ScrollbarActivityStopped() const MOZ_OVERRIDE;
 
+  virtual void SetTransformingByAPZ(bool aTransforming) MOZ_OVERRIDE {
+    mHelper.SetTransformingByAPZ(aTransforming);
+  }
+  bool IsTransformingByAPZ() const MOZ_OVERRIDE {
+    return mHelper.IsTransformingByAPZ();
+  }
+
 #ifdef DEBUG_FRAME_DUMP
   virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsIFrame.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsIFrame.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsIFrame.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsIFrame.h	2015-02-28 15:03:09.000000000 +0000
@@ -538,7 +538,13 @@
       nsStyleContext* oldStyleContext = mStyleContext;
       mStyleContext = aContext;
       aContext->AddRef();
+#ifdef DEBUG
+      aContext->FrameAddRef();
+#endif
       DidSetStyleContext(oldStyleContext);
+#ifdef DEBUG
+      oldStyleContext->FrameRelease();
+#endif
       oldStyleContext->Release();
     }
   }
@@ -552,9 +558,15 @@
   void SetStyleContextWithoutNotification(nsStyleContext* aContext)
   {
     if (aContext != mStyleContext) {
+#ifdef DEBUG
+      mStyleContext->FrameRelease();
+#endif
       mStyleContext->Release();
       mStyleContext = aContext;
       aContext->AddRef();
+#ifdef DEBUG
+      aContext->FrameAddRef();
+#endif
     }
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsIScrollableFrame.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsIScrollableFrame.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsIScrollableFrame.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsIScrollableFrame.h	2015-02-28 15:03:09.000000000 +0000
@@ -397,6 +397,9 @@
    * Mark the scrollbar frames for reflow.
    */
   virtual void MarkScrollbarsDirtyForReflow() const = 0;
+
+  virtual void SetTransformingByAPZ(bool aTransforming) = 0;
+  virtual bool IsTransformingByAPZ() const = 0;
 };
 
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsLineLayout.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsLineLayout.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsLineLayout.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsLineLayout.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -80,7 +80,8 @@
     mHasBullet(false),
     mDirtyNextLine(false),
     mLineAtStart(false),
-    mHasRuby(false)
+    mHasRuby(false),
+    mSuppressLineWrap(aOuterReflowState->frame->IsSVGText())
 {
   MOZ_ASSERT(aOuterReflowState, "aOuterReflowState must not be null");
   NS_ASSERTION(aFloatManager || aOuterReflowState->frame->GetType() ==
@@ -225,8 +226,7 @@
 
   mBStartEdge = aBCoord;
 
-  psd->mNoWrap =
-    !mStyleText->WhiteSpaceCanWrapStyle() || LineContainerFrame()->IsSVGText();
+  psd->mNoWrap = !mStyleText->WhiteSpaceCanWrapStyle() || mSuppressLineWrap;
   psd->mWritingMode = aWritingMode;
 
   // If this is the first line of a block then see if the text-indent
@@ -417,7 +417,6 @@
   psd->mFirstFrame = nullptr;
   psd->mLastFrame = nullptr;
   psd->mContainsFloat = false;
-  psd->mZeroEffectiveSpanBox = false;
   psd->mHasNonemptyContent = false;
 
 #ifdef DEBUG
@@ -457,6 +456,7 @@
 
   nsIFrame* frame = aSpanReflowState->frame;
   psd->mNoWrap = !frame->StyleText()->WhiteSpaceCanWrap(frame) ||
+                 mSuppressLineWrap ||
                  frame->StyleContext()->IsInlineDescendantOfRuby();
   psd->mWritingMode = aSpanReflowState->GetWritingMode();
 
@@ -1019,8 +1019,6 @@
     } else {
       if (nsGkAtoms::letterFrame==frameType) {
         pfd->mIsLetterFrame = true;
-      } else if (nsGkAtoms::rubyFrame == frameType) {
-        SyncAnnotationBounds(pfd);
       }
       if (pfd->mSpan) {
         isEmpty = !pfd->mSpan->mHasNonemptyContent && pfd->mFrame->IsSelfEmpty();
@@ -1127,6 +1125,7 @@
         }
         if (nsGkAtoms::rubyFrame == frameType) {
           mHasRuby = true;
+          SyncAnnotationBounds(pfd);
         }
       }
 
@@ -1749,7 +1748,7 @@
   printf("\n");
 #endif
 
-  // Compute the span's mZeroEffectiveSpanBox flag. What we are trying
+  // Compute the span's zeroEffectiveSpanBox flag. What we are trying
   // to determine is how we should treat the span: should it act
   // "normally" according to css2 or should it effectively
   // "disappear".
@@ -1813,7 +1812,6 @@
       }
     }
   }
-  psd->mZeroEffectiveSpanBox = zeroEffectiveSpanBox;
 
   // Setup baselineBCoord, minBCoord, and maxBCoord
   nscoord baselineBCoord, minBCoord, maxBCoord;
@@ -1881,6 +1879,9 @@
           psd->mBEndLeading = endLeading;
         }
         psd->mLogicalBSize += deltaLeading;
+        // We have adjusted the leadings, it is no longer a zero
+        // effective span box.
+        zeroEffectiveSpanBox = false;
       }
     }
 
@@ -2241,17 +2242,17 @@
   if (psd == mRootSpan) {
     // We should factor in the block element's minimum line-height (as
     // defined in section 10.8.1 of the css2 spec) assuming that
-    // mZeroEffectiveSpanBox is not set on the root span.  This only happens
+    // zeroEffectiveSpanBox is not set on the root span.  This only happens
     // in some cases in quirks mode:
     //  (1) if the root span contains non-whitespace text directly (this
-    //      is handled by mZeroEffectiveSpanBox
+    //      is handled by zeroEffectiveSpanBox
     //  (2) if this line has a bullet
     //  (3) if this is the last line of an LI, DT, or DD element
     //      (The last line before a block also counts, but not before a
     //      BR) (NN4/IE5 quirk)
 
     // (1) and (2) above
-    bool applyMinLH = !psd->mZeroEffectiveSpanBox || mHasBullet;
+    bool applyMinLH = !zeroEffectiveSpanBox || mHasBullet;
     bool isLastLine = !mGotLineBox ||
       (!mLineBox->IsLineWrapped() && !mLineEndsInBR);
     if (!applyMinLH && isLastLine) {
@@ -2308,7 +2309,7 @@
     minBCoord = maxBCoord = baselineBCoord;
   }
 
-  if ((psd != mRootSpan) && (psd->mZeroEffectiveSpanBox)) {
+  if (psd != mRootSpan && zeroEffectiveSpanBox) {
 #ifdef NOISY_BLOCKDIR_ALIGN
     printf("   [span]adjusting for zeroEffectiveSpanBox\n");
     printf("     Original: minBCoord=%d, maxBCoord=%d, bSize=%d, ascent=%d, logicalBSize=%d, topLeading=%d, bottomLeading=%d\n",
@@ -2795,17 +2796,15 @@
 /**
  * This function applies the changes of icoord and isize caused by
  * justification to annotations of the given frame.
- * aPFD must be one of the frames in aContainingSpan.
  */
 void
 nsLineLayout::ApplyLineJustificationToAnnotations(PerFrameData* aPFD,
-                                                  PerSpanData* aContainingSpan,
                                                   nscoord aDeltaICoord,
                                                   nscoord aDeltaISize)
 {
   PerFrameData* pfd = aPFD->mNextAnnotation;
-  nscoord containerWidth = ContainerWidthForSpan(aContainingSpan);
   while (pfd) {
+    nscoord containerWidth = pfd->mFrame->GetParent()->GetRect().Width();
     AdvanceAnnotationInlineBounds(pfd, containerWidth,
                                   aDeltaICoord, aDeltaISize);
 
@@ -2874,8 +2873,7 @@
 
       // The gaps added to the end of the frame should also be
       // excluded from the isize added to the annotation.
-      ApplyLineJustificationToAnnotations(pfd, aPSD,
-                                          deltaICoord, dw - gapsAtEnd);
+      ApplyLineJustificationToAnnotations(pfd, deltaICoord, dw - gapsAtEnd);
       deltaICoord += dw;
       pfd->mFrame->SetRect(lineWM, pfd->mBounds, ContainerWidthForSpan(aPSD));
     }
@@ -2969,7 +2967,7 @@
     if (!computeState.mFirstParticipant) {
       continue;
     }
-    if (IsRubyAlignSpaceAround(aFrame->mFrame)) {
+    if (IsRubyAlignSpaceAround(annotation->mFrame)) {
       // Add one gap at each side of this annotation.
       computeState.mFirstParticipant->mJustificationAssignment.mGapsAtStart = 1;
       computeState.mLastParticipant->mJustificationAssignment.mGapsAtEnd = 1;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsLineLayout.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsLineLayout.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsLineLayout.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsLineLayout.h	2015-02-28 15:03:09.000000000 +0000
@@ -368,6 +368,8 @@
    */
   nscoord GetCurrentICoord() { return mCurrentSpan->mICoord; }
 
+  void SetSuppressLineWrap(bool aEnabled) { mSuppressLineWrap = aEnabled; }
+
 protected:
   // This state is constant for a given block frame doing line layout
   nsFloatManager* mFloatManager;
@@ -510,7 +512,6 @@
     const nsHTMLReflowState* mReflowState;
     bool mNoWrap;
     mozilla::WritingMode mWritingMode;
-    bool mZeroEffectiveSpanBox;
     bool mContainsFloat;
     bool mHasNonemptyContent;
 
@@ -598,6 +599,7 @@
   bool mDirtyNextLine           : 1;
   bool mLineAtStart             : 1;
   bool mHasRuby                 : 1;
+  bool mSuppressLineWrap        : 1;
 
   int32_t mSpanDepth;
 #ifdef DEBUG
@@ -684,7 +686,6 @@
                                      nscoord aDeltaISize);
 
   void ApplyLineJustificationToAnnotations(PerFrameData* aPFD,
-                                           PerSpanData* aContainingSpan,
                                            nscoord aDeltaICoord,
                                            nscoord aDeltaISize);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyBaseContainerFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyBaseContainerFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyBaseContainerFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyBaseContainerFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -200,6 +200,73 @@
   aColumn.mIsIntraLevelWhitespace = mAtIntraLevelWhitespace;
 }
 
+static gfxBreakPriority
+LineBreakBefore(nsIFrame* aFrame,
+                nsRenderingContext* aRenderingContext,
+                nsIFrame* aLineContainerFrame,
+                const nsLineList::iterator* aLine)
+{
+  for (nsIFrame* child = aFrame; child;
+       child = child->GetFirstPrincipalChild()) {
+    if (!child->CanContinueTextRun()) {
+      // It is not an inline element. We can break before it.
+      return gfxBreakPriority::eNormalBreak;
+    }
+    if (child->GetType() != nsGkAtoms::textFrame) {
+      continue;
+    }
+
+    auto textFrame = static_cast<nsTextFrame*>(child);
+    gfxSkipCharsIterator iter =
+      textFrame->EnsureTextRun(nsTextFrame::eInflated,
+                               aRenderingContext->ThebesContext(),
+                               aLineContainerFrame, aLine);
+    iter.SetOriginalOffset(textFrame->GetContentOffset());
+    uint32_t pos = iter.GetSkippedOffset();
+    gfxTextRun* textRun = textFrame->GetTextRun(nsTextFrame::eInflated);
+    if (pos >= textRun->GetLength()) {
+      // The text frame contains no character at all.
+      return gfxBreakPriority::eNoBreak;
+    }
+    // Return whether we can break before the first character.
+    if (textRun->CanBreakLineBefore(pos)) {
+      return gfxBreakPriority::eNormalBreak;
+    }
+    // Check whether we can wrap word here.
+    const nsStyleText* textStyle = textFrame->StyleText();
+    if (textStyle->WordCanWrap(textFrame) && textRun->IsClusterStart(pos)) {
+      return gfxBreakPriority::eWordWrapBreak;
+    }
+    // We cannot break before.
+    return gfxBreakPriority::eNoBreak;
+  }
+  // Neither block, nor text frame is found as a leaf. We won't break
+  // before this base frame. It is the behavior of empty spans.
+  return gfxBreakPriority::eNoBreak;
+}
+
+static void
+GetIsLineBreakAllowed(nsIFrame* aFrame, bool aIsLineBreakable,
+                      bool* aAllowInitialLineBreak, bool* aAllowLineBreak)
+{
+  nsIFrame* parent = aFrame->GetParent();
+  bool inNestedRuby = parent->StyleContext()->IsInlineDescendantOfRuby();
+  // Allow line break between ruby bases when white-space allows,
+  // we are not inside a nested ruby, and there is no span.
+  bool allowLineBreak = !inNestedRuby &&
+                        aFrame->StyleText()->WhiteSpaceCanWrap(aFrame);
+  bool allowInitialLineBreak = allowLineBreak;
+  if (!aFrame->GetPrevInFlow()) {
+    allowInitialLineBreak = !inNestedRuby &&
+                            parent->StyleText()->WhiteSpaceCanWrap(parent);
+  }
+  if (!aIsLineBreakable) {
+    allowInitialLineBreak = false;
+  }
+  *aAllowInitialLineBreak = allowInitialLineBreak;
+  *aAllowLineBreak = allowLineBreak;
+}
+
 static nscoord
 CalculateColumnPrefISize(nsRenderingContext* aRenderingContext,
                          const RubyColumnEnumerator& aEnumerator)
@@ -209,15 +276,21 @@
   for (uint32_t i = 0; i < levelCount; i++) {
     nsIFrame* frame = aEnumerator.GetFrameAtLevel(i);
     if (frame) {
-      max = std::max(max, frame->GetPrefISize(aRenderingContext));
+      nsIFrame::InlinePrefISizeData data;
+      frame->AddInlinePrefISize(aRenderingContext, &data);
+      MOZ_ASSERT(data.prevLines == 0, "Shouldn't have prev lines");
+      max = std::max(max, data.currentLine);
     }
   }
   return max;
 }
 
+// FIXME Currently we use pref isize of ruby content frames for
+//       computing min isize of ruby frame, which may cause problem.
+//       See bug 1134945.
 /* virtual */ void
 nsRubyBaseContainerFrame::AddInlineMinISize(
-    nsRenderingContext *aRenderingContext, nsIFrame::InlineMinISizeData *aData)
+  nsRenderingContext *aRenderingContext, nsIFrame::InlineMinISizeData *aData)
 {
   AutoTextContainerArray textContainers;
   GetTextContainers(textContainers);
@@ -226,38 +299,66 @@
     if (textContainers[i]->IsSpanContainer()) {
       // Since spans are not breakable internally, use our pref isize
       // directly if there is any span.
-      aData->currentLine += GetPrefISize(aRenderingContext);
+      nsIFrame::InlinePrefISizeData data;
+      AddInlinePrefISize(aRenderingContext, &data);
+      aData->currentLine += data.currentLine;
+      if (data.currentLine > 0) {
+        aData->atStartOfLine = false;
+      }
       return;
     }
   }
 
-  nscoord max = 0;
-  RubyColumnEnumerator enumerator(this, textContainers);
-  for (; !enumerator.AtEnd(); enumerator.Next()) {
-    // We use *pref* isize for computing the min isize of columns
-    // because ruby bases and texts are unbreakable internally.
-    max = std::max(max, CalculateColumnPrefISize(aRenderingContext,
-                                                 enumerator));
+  bool firstFrame = true;
+  bool allowInitialLineBreak, allowLineBreak;
+  GetIsLineBreakAllowed(this, !aData->atStartOfLine,
+                        &allowInitialLineBreak, &allowLineBreak);
+  for (nsIFrame* frame = this; frame; frame = frame->GetNextInFlow()) {
+    RubyColumnEnumerator enumerator(
+      static_cast<nsRubyBaseContainerFrame*>(frame), textContainers);
+    for (; !enumerator.AtEnd(); enumerator.Next()) {
+      if (firstFrame ? allowInitialLineBreak : allowLineBreak) {
+        nsIFrame* baseFrame = enumerator.GetFrameAtLevel(0);
+        if (baseFrame) {
+          gfxBreakPriority breakPriority =
+            LineBreakBefore(baseFrame, aRenderingContext, nullptr, nullptr);
+          if (breakPriority != gfxBreakPriority::eNoBreak) {
+            aData->OptionallyBreak(aRenderingContext);
+          }
+        }
+      }
+      firstFrame = false;
+      nscoord isize = CalculateColumnPrefISize(aRenderingContext, enumerator);
+      aData->currentLine += isize;
+      if (isize > 0) {
+        aData->atStartOfLine = false;
+      }
+    }
   }
-  aData->currentLine += max;
 }
 
 /* virtual */ void
 nsRubyBaseContainerFrame::AddInlinePrefISize(
-    nsRenderingContext *aRenderingContext, nsIFrame::InlinePrefISizeData *aData)
+  nsRenderingContext *aRenderingContext, nsIFrame::InlinePrefISizeData *aData)
 {
   AutoTextContainerArray textContainers;
   GetTextContainers(textContainers);
 
   nscoord sum = 0;
-  RubyColumnEnumerator enumerator(this, textContainers);
-  for (; !enumerator.AtEnd(); enumerator.Next()) {
-    sum += CalculateColumnPrefISize(aRenderingContext, enumerator);
+  for (nsIFrame* frame = this; frame; frame = frame->GetNextInFlow()) {
+    RubyColumnEnumerator enumerator(
+      static_cast<nsRubyBaseContainerFrame*>(frame), textContainers);
+    for (; !enumerator.AtEnd(); enumerator.Next()) {
+      sum += CalculateColumnPrefISize(aRenderingContext, enumerator);
+    }
   }
   for (uint32_t i = 0, iend = textContainers.Length(); i < iend; i++) {
     if (textContainers[i]->IsSpanContainer()) {
       nsIFrame* frame = textContainers[i]->GetFirstPrincipalChild();
-      sum = std::max(sum, frame->GetPrefISize(aRenderingContext));
+      nsIFrame::InlinePrefISizeData data;
+      frame->AddInlinePrefISize(aRenderingContext, &data);
+      MOZ_ASSERT(data.prevLines == 0, "Shouldn't have prev lines");
+      sum = std::max(sum, data.currentLine);
     }
   }
   aData->currentLine += sum;
@@ -376,6 +477,7 @@
                                                 reflowState->mFloatManager,
                                                 reflowState, nullptr,
                                                 aReflowState.mLineLayout);
+    lineLayout->SetSuppressLineWrap(true);
     lineLayouts.AppendElement(lineLayout);
 
     // Line number is useless for ruby text
@@ -398,19 +500,9 @@
                                       0, aReflowState.AvailableISize(),
                                       &mBaseline);
 
-  nsIFrame* parent = GetParent();
-  bool inNestedRuby = parent->StyleContext()->IsInlineDescendantOfRuby();
-  // Allow line break between ruby bases when white-space allows,
-  // we are not inside a nested ruby, and there is no span.
-  bool allowLineBreak = !inNestedRuby && StyleText()->WhiteSpaceCanWrap(this);
-  bool allowInitialLineBreak = allowLineBreak;
-  if (!GetPrevInFlow()) {
-    allowInitialLineBreak = !inNestedRuby &&
-      parent->StyleText()->WhiteSpaceCanWrap(parent);
-  }
-  if (!aReflowState.mLineLayout->LineIsBreakable()) {
-    allowInitialLineBreak = false;
-  }
+  bool allowInitialLineBreak, allowLineBreak;
+  GetIsLineBreakAllowed(this, aReflowState.mLineLayout->LineIsBreakable(),
+                        &allowInitialLineBreak, &allowLineBreak);
 
   nscoord isize = 0;
   // Reflow columns excluding any span
@@ -600,45 +692,6 @@
   return icoord;
 }
 
-static gfxBreakPriority
-LineBreakBefore(const nsHTMLReflowState& aReflowState, nsRubyBaseFrame* aFrame)
-{
-  for (nsIFrame* child = aFrame; child;
-       child = child->GetFirstPrincipalChild()) {
-    if (!child->CanContinueTextRun()) {
-      // It is not an inline element. We can break before it.
-      return gfxBreakPriority::eNormalBreak;
-    }
-    if (child->GetType() != nsGkAtoms::textFrame) {
-      continue;
-    }
-
-    auto textFrame = static_cast<nsTextFrame*>(child);
-    gfxSkipCharsIterator iter =
-      textFrame->EnsureTextRun(nsTextFrame::eInflated,
-                               aReflowState.rendContext->ThebesContext(),
-                               aReflowState.mLineLayout->LineContainerFrame(),
-                               aReflowState.mLineLayout->GetLine());
-    iter.SetOriginalOffset(textFrame->GetContentOffset());
-    uint32_t pos = iter.GetSkippedOffset();
-    gfxTextRun* textRun = textFrame->GetTextRun(nsTextFrame::eInflated);
-    // Return whether we can break before the first character.
-    if (textRun->CanBreakLineBefore(pos)) {
-      return gfxBreakPriority::eNormalBreak;
-    }
-    // Check whether we can wrap word here.
-    const nsStyleText* textStyle = textFrame->StyleText();
-    if (textStyle->WordCanWrap(textFrame) && textRun->IsClusterStart(pos)) {
-      return gfxBreakPriority::eWordWrapBreak;
-    }
-    // We cannot break before.
-    return gfxBreakPriority::eNoBreak;
-  }
-  // Neither block, nor text frame is found as a leaf. We won't break
-  // before this base frame. It is the behavior of empty spans.
-  return gfxBreakPriority::eNoBreak;
-}
-
 nscoord
 nsRubyBaseContainerFrame::ReflowOneColumn(const ReflowState& aReflowState,
                                           uint32_t aColumnIndex,
@@ -725,8 +778,10 @@
       aReflowState.mAllowLineBreak : aReflowState.mAllowInitialLineBreak;
     if (allowBreakBefore) {
       bool shouldBreakBefore = false;
-      gfxBreakPriority breakPriority =
-        LineBreakBefore(baseReflowState, aColumn.mBaseFrame);
+      gfxBreakPriority breakPriority = LineBreakBefore(
+        aColumn.mBaseFrame, baseReflowState.rendContext,
+        baseReflowState.mLineLayout->LineContainerFrame(),
+        baseReflowState.mLineLayout->GetLine());
       if (breakPriority != gfxBreakPriority::eNoBreak) {
         int32_t offset;
         gfxBreakPriority lastBreakPriority;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -106,22 +106,24 @@
 nsRubyFrame::AddInlineMinISize(nsRenderingContext *aRenderingContext,
                                nsIFrame::InlineMinISizeData *aData)
 {
-  nscoord max = 0;
-  for (SegmentEnumerator e(this); !e.AtEnd(); e.Next()) {
-    max = std::max(max, e.GetBaseContainer()->GetMinISize(aRenderingContext));
+  for (nsIFrame* frame = this; frame; frame = frame->GetNextInFlow()) {
+    for (SegmentEnumerator e(static_cast<nsRubyFrame*>(frame));
+         !e.AtEnd(); e.Next()) {
+      e.GetBaseContainer()->AddInlineMinISize(aRenderingContext, aData);
+    }
   }
-  aData->currentLine += max;
 }
 
 /* virtual */ void
 nsRubyFrame::AddInlinePrefISize(nsRenderingContext *aRenderingContext,
                                 nsIFrame::InlinePrefISizeData *aData)
 {
-  nscoord sum = 0;
-  for (SegmentEnumerator e(this); !e.AtEnd(); e.Next()) {
-    sum += e.GetBaseContainer()->GetPrefISize(aRenderingContext);
+  for (nsIFrame* frame = this; frame; frame = frame->GetNextInFlow()) {
+    for (SegmentEnumerator e(static_cast<nsRubyFrame*>(frame));
+         !e.AtEnd(); e.Next()) {
+      e.GetBaseContainer()->AddInlinePrefISize(aRenderingContext, aData);
+    }
   }
-  aData->currentLine += sum;
 }
 
 /* virtual */ void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyTextContainerFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyTextContainerFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyTextContainerFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyTextContainerFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -161,7 +161,7 @@
         LogicalPoint pos = child->GetLogicalPosition(lineWM, containerWidth);
         pos.B(lineWM) += deltaBCoord;
         // Relative positioning hasn't happened yet.
-        // So MovePositionBy should be used here.
+        // So MovePositionBy should not be used here.
         child->SetPosition(lineWM, pos, containerWidth);
         nsContainerFrame::PlaceFrameView(child);
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyTextFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyTextFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyTextFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyTextFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -44,6 +44,12 @@
   return nsGkAtoms::rubyTextFrame;
 }
 
+/* virtual */ bool
+nsRubyTextFrame::CanContinueTextRun() const
+{
+  return false;
+}
+
 #ifdef DEBUG_FRAME_DUMP
 nsresult
 nsRubyTextFrame::GetFrameName(nsAString& aResult) const
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyTextFrame.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyTextFrame.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsRubyTextFrame.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsRubyTextFrame.h	2015-02-28 15:03:09.000000000 +0000
@@ -29,6 +29,7 @@
 
   // nsIFrame overrides
   virtual nsIAtom* GetType() const MOZ_OVERRIDE;
+  virtual bool CanContinueTextRun() const MOZ_OVERRIDE;
 
 #ifdef DEBUG_FRAME_DUMP
   virtual nsresult GetFrameName(nsAString& aResult) const MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsSelection.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsSelection.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsSelection.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsSelection.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -326,6 +326,101 @@
   return !limiter || nsContentUtils::ContentIsDescendantOf(aNode, limiter);
 }
 
+namespace mozilla {
+struct MOZ_STACK_CLASS AutoPrepareFocusRange
+{
+  AutoPrepareFocusRange(Selection* aSelection,
+                        bool aContinueSelection,
+                        bool aMultipleSelection
+                        MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+  {
+    MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+
+    if (aSelection->mRanges.Length() <= 1) {
+      return;
+    }
+
+    if (aSelection->mFrameSelection->IsUserSelectionReason()) {
+      mUserSelect.emplace(aSelection);
+    }
+    bool userSelection = aSelection->mApplyUserSelectStyle;
+
+    nsTArray<RangeData>& ranges = aSelection->mRanges;
+    if (!userSelection ||
+        (!aContinueSelection && aMultipleSelection)) {
+      // Scripted command or the user is starting a new explicit multi-range
+      // selection.
+      for (RangeData& entry : ranges) {
+        entry.mRange->SetIsGenerated(false);
+      }
+      return;
+    }
+
+    int16_t reason = aSelection->mFrameSelection->mSelectionChangeReason;
+    bool isAnchorRelativeOp = (reason & (nsISelectionListener::DRAG_REASON |
+                                         nsISelectionListener::MOUSEDOWN_REASON |
+                                         nsISelectionListener::MOUSEUP_REASON |
+                                         nsISelectionListener::COLLAPSETOSTART_REASON));
+    if (!isAnchorRelativeOp) {
+      return;
+    }
+
+    // This operation is against the anchor but our current mAnchorFocusRange
+    // represents the focus in a multi-range selection.  The anchor from a user
+    // perspective is the most distant generated range on the opposite side.
+    // Find that range and make it the mAnchorFocusRange.
+    const size_t len = ranges.Length();
+    size_t newAnchorFocusIndex = size_t(-1);
+    if (aSelection->GetDirection() == eDirNext) {
+      for (size_t i = 0; i < len; ++i) {
+        if (ranges[i].mRange->IsGenerated()) {
+          newAnchorFocusIndex = i;
+          break;
+        }
+      }
+    } else {
+      size_t i = len;
+      while (i--) {
+        if (ranges[i].mRange->IsGenerated()) {
+          newAnchorFocusIndex = i;
+          break;
+        }
+      }
+    }
+
+    if (newAnchorFocusIndex == size_t(-1)) {
+      // There are no generated ranges - that's fine.
+      return;
+    }
+
+    // Setup the new mAnchorFocusRange and mark the old one as generated.
+    if (aSelection->mAnchorFocusRange) {
+      aSelection->mAnchorFocusRange->SetIsGenerated(true);
+    }
+    nsRange* range = ranges[newAnchorFocusIndex].mRange;
+    range->SetIsGenerated(false);
+    aSelection->mAnchorFocusRange = range;
+
+    // Remove all generated ranges (including the old mAnchorFocusRange).
+    nsRefPtr<nsPresContext> presContext = aSelection->GetPresContext();
+    size_t i = len;
+    while (i--) {
+      range = aSelection->mRanges[i].mRange;
+      if (range->IsGenerated()) {
+        range->SetInSelection(false);
+        aSelection->selectFrames(presContext, range, false);
+        aSelection->mRanges.RemoveElementAt(i);
+      }
+    }
+    if (aSelection->mFrameSelection) {
+      aSelection->mFrameSelection->InvalidateDesiredPos();
+    }
+  }
+
+  Maybe<Selection::AutoApplyUserSelectStyle> mUserSelect;
+  MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+};
+}
 
 ////////////BEGIN nsFrameSelection methods
 
@@ -774,13 +869,6 @@
   if (NS_FAILED(result)) {
     return result;
   }
-  if (aAmount == eSelectLine) {
-    result = FetchDesiredPos(desiredPos);
-    if (NS_FAILED(result)) {
-      return result;
-    }
-    SetDesiredPos(desiredPos);
-  }
 
   int32_t caretStyle = Preferences::GetInt("layout.selection.caret_style", 0);
   if (caretStyle == 0
@@ -792,39 +880,48 @@
     caretStyle = 2;
   }
 
-  if (!isCollapsed && !aContinueSelection && caretStyle == 2 &&
-      aAmount <= eSelectLine) {
-    switch (aDirection) {
-      case eDirPrevious:
-        {
-          const nsRange* anchorFocusRange = sel->GetAnchorFocusRange();
-          if (anchorFocusRange) {
-            PostReason(nsISelectionListener::COLLAPSETOSTART_REASON);
-            sel->Collapse(anchorFocusRange->GetStartParent(),
-                          anchorFocusRange->StartOffset());
-          }
-          mHint = CARET_ASSOCIATE_AFTER;
-          sel->ScrollIntoView(nsISelectionController::SELECTION_FOCUS_REGION,
-                              nsIPresShell::ScrollAxis(),
-                              nsIPresShell::ScrollAxis(), scrollFlags);
-          return NS_OK;
-        }
+  bool doCollapse = !isCollapsed && !aContinueSelection && caretStyle == 2 &&
+                    aAmount <= eSelectLine;
+  if (doCollapse) {
+    if (aDirection == eDirPrevious) {
+      PostReason(nsISelectionListener::COLLAPSETOSTART_REASON);
+      mHint = CARET_ASSOCIATE_AFTER;
+    } else {
+      PostReason(nsISelectionListener::COLLAPSETOEND_REASON);
+      mHint = CARET_ASSOCIATE_BEFORE;
+    }
+  } else {
+    PostReason(nsISelectionListener::KEYPRESS_REASON);
+  }
 
-      case eDirNext:
-        {
-          const nsRange* anchorFocusRange = sel->GetAnchorFocusRange();
-          if (anchorFocusRange) {
-            PostReason(nsISelectionListener::COLLAPSETOEND_REASON);
-            sel->Collapse(anchorFocusRange->GetEndParent(),
-                          anchorFocusRange->EndOffset());
-          }
-          mHint = CARET_ASSOCIATE_BEFORE;
-          sel->ScrollIntoView(nsISelectionController::SELECTION_FOCUS_REGION,
-                              nsIPresShell::ScrollAxis(),
-                              nsIPresShell::ScrollAxis(), scrollFlags);
-          return NS_OK;
-        }
+  AutoPrepareFocusRange prep(sel, aContinueSelection, false);
+
+  if (aAmount == eSelectLine) {
+    result = FetchDesiredPos(desiredPos);
+    if (NS_FAILED(result)) {
+      return result;
     }
+    SetDesiredPos(desiredPos);
+  }
+
+  if (doCollapse) {
+    const nsRange* anchorFocusRange = sel->GetAnchorFocusRange();
+    if (anchorFocusRange) {
+      nsINode* node;
+      int32_t offset;
+      if (aDirection == eDirPrevious) {
+        node =  anchorFocusRange->GetStartParent();
+        offset = anchorFocusRange->StartOffset();
+      } else {
+        node = anchorFocusRange->GetEndParent();
+        offset = anchorFocusRange->EndOffset();
+      }
+      sel->Collapse(node, offset);
+    }
+    sel->ScrollIntoView(nsISelectionController::SELECTION_FOCUS_REGION,
+                        nsIPresShell::ScrollAxis(),
+                        nsIPresShell::ScrollAxis(), scrollFlags);
+    return NS_OK;
   }
 
   nsIFrame *frame;
@@ -868,7 +965,7 @@
     default:
       return NS_ERROR_FAILURE;
   }
-  PostReason(nsISelectionListener::KEYPRESS_REASON);
+
   if (NS_SUCCEEDED(result = frame->PeekOffset(&pos)) && pos.mResultContent)
   {
     nsIFrame *theFrame;
@@ -1376,6 +1473,8 @@
         AdjustForMaintainedSelection(aNewFocus, aContentOffset))
       return NS_OK; //shift clicked to maintained selection. rejected.
 
+    int8_t index = GetIndexFromSelectionType(nsISelectionController::SELECTION_NORMAL);
+    AutoPrepareFocusRange prep(mDomSelections[index], aContinueSelection, aMultipleSelection);
     return TakeFocus(aNewFocus, aContentOffset, aContentEndOffset, aHint,
                      aContinueSelection, aMultipleSelection);
   }
@@ -2050,6 +2149,8 @@
   }
   int32_t numChildren = rootContent->GetChildCount();
   PostReason(nsISelectionListener::NO_REASON);
+  int8_t index = GetIndexFromSelectionType(nsISelectionController::SELECTION_NORMAL);
+  AutoPrepareFocusRange prep(mDomSelections[index], false, false);
   return TakeFocus(rootContent, 0, numChildren, CARET_ASSOCIATE_BEFORE, false, false);
 }
 
@@ -3077,7 +3178,7 @@
   }
 
   nsRefPtr<Selection> selection = mDomSelections[index];
-  for (int32_t rangeIdx = 0; rangeIdx < selection->GetRangeCount(); ++rangeIdx) {
+  for (uint32_t rangeIdx = 0; rangeIdx < selection->RangeCount(); ++rangeIdx) {
     nsRefPtr<nsRange> range = selection->GetRangeAt(rangeIdx);
     res = range->DeleteContents();
     if (NS_FAILED(res))
@@ -3512,9 +3613,19 @@
         rangesToAdd.AppendElement(aItem);
       }
     }
+    *aOutIndex = -1;
+    size_t newAnchorFocusIndex =
+      GetDirection() == eDirPrevious ? 0 : rangesToAdd.Length() - 1;
     for (size_t i = 0; i < rangesToAdd.Length(); ++i) {
-      nsresult rv = AddItemInternal(rangesToAdd[i], aOutIndex);
+      int32_t index;
+      nsresult rv = AddItemInternal(rangesToAdd[i], &index);
       NS_ENSURE_SUCCESS(rv, rv);
+      if (i == newAnchorFocusIndex) {
+        *aOutIndex = index;
+        rangesToAdd[i]->SetIsGenerated(false);
+      } else {
+        rangesToAdd[i]->SetIsGenerated(true);
+      }
     }
     return NS_OK;
   }
@@ -5000,49 +5111,9 @@
     return;
   }
 
-  nsDirection dir = GetDirection();
-
-  // If aParentNode is inside a range in a multi-range selection we need
-  // to remove the ranges that follows in the selection direction and
-  // make that range the mAnchorFocusRange.
-  if (mRanges.Length() > 1) {
-    for (size_t i = 0; i < mRanges.Length(); ++i) {
-      nsRange* range = mRanges[i].mRange;
-      bool disconnected1 = false;
-      bool disconnected2 = false;
-      const bool isBeforeStart =
-        nsContentUtils::ComparePoints(range->GetStartParent(),
-                                      range->StartOffset(),
-                                      &aParentNode, aOffset,
-                                      &disconnected1) > 0;
-      const bool isAfterEnd =
-        nsContentUtils::ComparePoints(range->GetEndParent(),
-                                      range->EndOffset(),
-                                      &aParentNode, aOffset,
-                                      &disconnected2) < 0;
-      if (!isBeforeStart && !isAfterEnd && !disconnected1 && !disconnected2) {
-        // aParentNode/aOffset is inside 'range'.
-        mAnchorFocusRange = range;
-        if (dir == eDirNext) {
-          for (size_t j = i + 1; j < mRanges.Length(); ++j) {
-            nsRange* r = mRanges[j].mRange;
-            r->SetInSelection(false);
-            selectFrames(presContext, r, false);
-          }
-          mRanges.TruncateLength(i + 1);
-        } else {
-          for (size_t j = 0; j < i; ++j) {
-            nsRange* r = mRanges[j].mRange;
-            r->SetInSelection(false);
-            selectFrames(presContext, r, false);
-          }
-          mRanges.RemoveElementsAt(0, i);
-        }
-        break;
-      }
-    }
-  }
-
+#ifdef DEBUG_SELECTION
+  nsDirection oldDirection = GetDirection();
+#endif
   nsINode* anchorNode = GetAnchorNode();
   nsINode* focusNode = GetFocusNode();
   uint32_t anchorOffset = AnchorOffset();
@@ -5094,7 +5165,7 @@
     if (aRv.Failed()) {
       return;
     }
-    dir = eDirNext;
+    SetDirection(eDirNext);
     res = difRange->SetEnd(range->GetEndParent(), range->EndOffset());
     nsresult tmp = difRange->SetStart(focusNode, focusOffset);
     if (NS_FAILED(tmp)) {
@@ -5113,7 +5184,7 @@
   }
   else if (result1 == 0 && result3 > 0){//2, a1
     //select from 2 to 1a
-    dir = eDirPrevious;
+    SetDirection(eDirPrevious);
     range->SetStart(aParentNode, aOffset, aRv);
     if (aRv.Failed()) {
       return;
@@ -5158,7 +5229,7 @@
         return;
       }
     }
-    dir = eDirNext;
+    SetDirection(eDirNext);
     range->SetEnd(aParentNode, aOffset, aRv);
     if (aRv.Failed()) {
       return;
@@ -5203,7 +5274,7 @@
       aRv.Throw(res);
       return;
     }
-    dir = eDirPrevious;
+    SetDirection(eDirPrevious);
     range->SetStart(aParentNode, aOffset, aRv);
     if (aRv.Failed()) {
       return;
@@ -5222,7 +5293,7 @@
     if (GetDirection() == eDirNext){
       range->SetEnd(startNode, startOffset);
     }
-    dir = eDirPrevious;
+    SetDirection(eDirPrevious);
     range->SetStart(aParentNode, aOffset, aRv);
     if (aRv.Failed()) {
       return;
@@ -5261,7 +5332,7 @@
     if (aRv.Failed()) {
       return;
     }
-    dir = eDirPrevious;
+    SetDirection(eDirPrevious);
     res = difRange->SetEnd(focusNode, focusOffset);
     nsresult tmp = difRange->SetStart(range->GetStartParent(), range->StartOffset());
     if (NS_FAILED(tmp)) {
@@ -5290,15 +5361,11 @@
 
   DEBUG_OUT_RANGE(range);
 #ifdef DEBUG_SELECTION
-  if (eDirNext == mDirection)
-    printf("    direction = 1  LEFT TO RIGHT\n");
-  else
-    printf("    direction = 0  RIGHT TO LEFT\n");
-#endif
-  SetDirection(dir);
-#ifdef DEBUG_SELECTION
+  if (GetDirection() != oldDirection) {
+    printf("    direction changed to %s\n",
+           GetDirection() == eDirNext? "eDirNext":"eDirPrevious");
+  }
   nsCOMPtr<nsIContent> content = do_QueryInterface(&aParentNode);
-
   printf ("Sel. Extend to %p %s %d\n", content.get(),
           nsAtomCString(content->Tag()).get(), aOffset);
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsTextFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsTextFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsTextFrame.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsTextFrame.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1255,8 +1255,7 @@
               const nsLineList::iterator* aForFrameLine,
               nsTextFrame::TextRunType aWhichTextRun)
 {
-  NS_ASSERTION(aForFrame || aLineContainer,
-               "One of aForFrame or aLineContainer must be set!");
+  MOZ_ASSERT(aForFrame, "for no frame?");
   NS_ASSERTION(!aForFrameLine || aLineContainer,
                "line but no line container");
   
@@ -1268,25 +1267,21 @@
     }
     aLineContainer = FindLineContainer(lineContainerChild);
   } else {
-    NS_ASSERTION(!aForFrame ||
-                 (aLineContainer == FindLineContainer(aForFrame) ||
-                  aLineContainer->GetType() == nsGkAtoms::rubyTextContainerFrame ||
+    NS_ASSERTION((aLineContainer == FindLineContainer(aForFrame) ||
                   (aLineContainer->GetType() == nsGkAtoms::letterFrame &&
                    aLineContainer->IsFloating())),
                  "Wrong line container hint");
   }
 
-  if (aForFrame) {
-    if (aForFrame->HasAnyStateBits(TEXT_IS_IN_TOKEN_MATHML)) {
-      aLineContainer->AddStateBits(TEXT_IS_IN_TOKEN_MATHML);
-      if (aForFrame->HasAnyStateBits(NS_FRAME_IS_IN_SINGLE_CHAR_MI)) {
-        aLineContainer->AddStateBits(NS_FRAME_IS_IN_SINGLE_CHAR_MI);
-      }
-    }
-    if (aForFrame->HasAnyStateBits(NS_FRAME_MATHML_SCRIPT_DESCENDANT)) {
-      aLineContainer->AddStateBits(NS_FRAME_MATHML_SCRIPT_DESCENDANT);
+  if (aForFrame->HasAnyStateBits(TEXT_IS_IN_TOKEN_MATHML)) {
+    aLineContainer->AddStateBits(TEXT_IS_IN_TOKEN_MATHML);
+    if (aForFrame->HasAnyStateBits(NS_FRAME_IS_IN_SINGLE_CHAR_MI)) {
+      aLineContainer->AddStateBits(NS_FRAME_IS_IN_SINGLE_CHAR_MI);
     }
   }
+  if (aForFrame->HasAnyStateBits(NS_FRAME_MATHML_SCRIPT_DESCENDANT)) {
+    aLineContainer->AddStateBits(NS_FRAME_MATHML_SCRIPT_DESCENDANT);
+  }
 
   nsPresContext* presContext = aLineContainer->PresContext();
   BuildTextRunsScanner scanner(presContext, aContext, aLineContainer,
@@ -1295,13 +1290,26 @@
   nsBlockFrame* block = nsLayoutUtils::GetAsBlock(aLineContainer);
 
   if (!block) {
-    NS_ASSERTION(!aLineContainer->GetPrevInFlow() && !aLineContainer->GetNextInFlow(),
-                 "Breakable non-block line containers not supported");
+    nsIFrame* textRunContainer = aLineContainer;
+    if (aLineContainer->GetType() == nsGkAtoms::rubyTextContainerFrame) {
+      textRunContainer = aForFrame;
+      while (textRunContainer &&
+             textRunContainer->GetType() != nsGkAtoms::rubyTextFrame) {
+        textRunContainer = textRunContainer->GetParent();
+      }
+      MOZ_ASSERT(textRunContainer &&
+                 textRunContainer->GetParent() == aLineContainer);
+    } else {
+      NS_ASSERTION(
+        !aLineContainer->GetPrevInFlow() && !aLineContainer->GetNextInFlow(),
+        "Breakable non-block line containers other than "
+        "ruby text container is not supported");
+    }
     // Just loop through all the children of the linecontainer ... it's really
     // just one line
     scanner.SetAtStartOfLine();
     scanner.SetCommonAncestorWithLastFrame(nullptr);
-    nsIFrame* child = aLineContainer->GetFirstPrincipalChild();
+    nsIFrame* child = textRunContainer->GetFirstPrincipalChild();
     while (child) {
       scanner.ScanFrame(child);
       child = child->GetNextSibling();
@@ -4531,26 +4539,11 @@
   return NS_OK;
 }
 
-/* virtual */ void
-nsTextFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
-{
-  // A belt-and-braces check just in case we never get the
-  // MarkIntrinsicISizesDirty call from the style system.
-  if (StyleText()->mTextTransform == NS_STYLE_TEXT_TRANSFORM_CAPITALIZE &&
-      mTextRun &&
-      !(mTextRun->GetFlags() & nsTextFrameUtils::TEXT_IS_TRANSFORMED)) {
-    NS_ERROR("the current textrun doesn't match the style");
-    // The current textrun is now of the wrong type.
-    ClearTextRuns();
-  }
-  nsFrame::DidSetStyleContext(aOldStyleContext);
-}
-
-class nsDisplayTextGeometry : public nsDisplayItemGenericGeometry
+class nsDisplayTextGeometry : public nsCharClipGeometry
 {
 public:
-  nsDisplayTextGeometry(nsDisplayItem* aItem, nsDisplayListBuilder* aBuilder)
-    : nsDisplayItemGenericGeometry(aItem, aBuilder)
+  nsDisplayTextGeometry(nsCharClipDisplayItem* aItem, nsDisplayListBuilder* aBuilder)
+    : nsCharClipGeometry(aItem, aBuilder)
   {
     nsTextFrame* f = static_cast<nsTextFrame*>(aItem->Frame());
     f->GetTextDecorations(f->PresContext(), nsTextFrame::eResolvedColors, mDecorations);
@@ -4621,6 +4614,8 @@
     nsRect newRect = geometry->mBounds;
     nsRect oldRect = GetBounds(aBuilder, &snap);
     if (decorations != geometry->mDecorations ||
+        mLeftEdge != geometry->mLeftEdge ||
+        mRightEdge != geometry->mRightEdge ||
         !oldRect.IsEqualInterior(newRect) ||
         !geometry->mBorderRect.IsEqualInterior(GetBorderRect())) {
       aInvalidRegion->Or(oldRect, newRect);
@@ -5221,18 +5216,13 @@
 {
   nscolor lineColor = aOverrideColor ? *aOverrideColor : aColor;
   if (aCallbacks) {
-    if (aDecorationType == eNormalDecoration) {
-      aCallbacks->NotifyBeforeDecorationLine(lineColor);
-    } else {
-      aCallbacks->NotifyBeforeSelectionDecorationLine(lineColor);
-    }
-    nsCSSRendering::DecorationLineToPath(aFrame, aCtx, aDirtyRect, lineColor,
-      aPt, aICoordInFrame, aLineSize, aAscent, aOffset, aDecoration, aStyle,
+    Rect path = nsCSSRendering::DecorationLineToPath(ToRect(aDirtyRect),
+      ToPoint(aPt), ToSize(aLineSize), aAscent, aOffset, aDecoration, aStyle,
       aVertical, aDescentLimit);
     if (aDecorationType == eNormalDecoration) {
-      aCallbacks->NotifyDecorationLinePathEmitted();
+      aCallbacks->PaintDecorationLine(path, lineColor);
     } else {
-      aCallbacks->NotifySelectionDecorationLinePathEmitted();
+      aCallbacks->PaintSelectionDecorationLine(path, lineColor);
     }
   } else {
     nsCSSRendering::PaintDecorationLine(aFrame, *aCtx->GetDrawTarget(),
@@ -8516,6 +8506,7 @@
   bool emptyTextAtStartOfLine = atStartOfLine && length == 0;
   if (!breakAfter && charsFit == length && !emptyTextAtStartOfLine &&
       transformedOffset + transformedLength == mTextRun->GetLength() &&
+      !StyleContext()->IsInlineDescendantOfRuby() &&
       (mTextRun->GetFlags() & nsTextFrameUtils::TEXT_HAS_TRAILING_BREAK)) {
     // We placed all the text in the textrun and we have a break opportunity at
     // the end of the textrun. We need to record it because the following
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsTextFrame.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsTextFrame.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsTextFrame.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsTextFrame.h	2015-02-28 15:03:09.000000000 +0000
@@ -74,8 +74,6 @@
   
   virtual nsresult CharacterDataChanged(CharacterDataChangeInfo* aInfo) MOZ_OVERRIDE;
                                   
-  virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) MOZ_OVERRIDE;
-  
   virtual nsIFrame* GetNextContinuation() const MOZ_OVERRIDE {
     return mNextContinuation;
   }
@@ -304,14 +302,13 @@
    *
    * Callbacks are invoked in the following order:
    *
-   *   (NotifySelectionBackgroundNeedsFill)?
-   *   (NotifyBeforeDecorationLine NotifyDecorationLinePathEmitted)*
+   *   NotifySelectionBackgroundNeedsFill?
+   *   PaintDecorationLine*
    *   NotifyBeforeText
-   *   (NotifyGlyphPathEmitted |
-   *    (NotifyBeforeSVGGlyphPainted NotifyAfterSVGGlyphPainted))*
+   *   NotifyGlyphPathEmitted*
    *   NotifyAfterText
-   *   (NotifyBeforeDecorationLine NotifyDecorationLinePathEmitted)*
-   *   (NotifyBeforeSelectionDecorationLine NotifySelectionDecorationLinePathEmitted)*
+   *   PaintDecorationLine*
+   *   PaintSelectionDecorationLine*
    *
    * The color of each part of the frame's text rendering is passed as an argument
    * to the NotifyBefore* callback for that part.  The nscolor can take on one of
@@ -338,28 +335,29 @@
                                                     DrawTarget& aDrawTarget) { }
 
     /**
-     * Called just before any paths have been emitted to the gfxContext
-     * for the glyphs of the frame's text.
+     * Called before (for under/over-line) or after (for line-through) the text
+     * is drawn to have a text decoration line drawn.
      */
-    virtual void NotifyBeforeText(nscolor aColor) { }
+    virtual void PaintDecorationLine(Rect aPath, nscolor aColor) { }
 
     /**
-     * Called just after all the paths have been emitted to the gfxContext
-     * for the glyphs of the frame's text.
+     * Called after selected text is drawn to have a decoration line drawn over
+     * the text. (All types of text decoration are drawn after the text when
+     * text is selected.)
      */
-    virtual void NotifyAfterText() { }
+    virtual void PaintSelectionDecorationLine(Rect aPath, nscolor aColor) { }
 
     /**
-     * Called just before a path corresponding to a text decoration line
-     * has been emitted to the gfxContext.
+     * Called just before any paths have been emitted to the gfxContext
+     * for the glyphs of the frame's text.
      */
-    virtual void NotifyBeforeDecorationLine(nscolor aColor) { }
+    virtual void NotifyBeforeText(nscolor aColor) { }
 
     /**
-     * Called just after a path corresponding to a text decoration line
-     * has been emitted to the gfxContext.
+     * Called just after all the paths have been emitted to the gfxContext
+     * for the glyphs of the frame's text.
      */
-    virtual void NotifyDecorationLinePathEmitted() { }
+    virtual void NotifyAfterText() { }
 
     /**
      * Called just before a path corresponding to a selection decoration line
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsTextRunTransformations.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsTextRunTransformations.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/nsTextRunTransformations.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/nsTextRunTransformations.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -571,8 +571,9 @@
       aCharsToMergeArray.AppendElement(false);
       if (aTextRun) {
         aStyleArray->AppendElement(charStyle);
-        aCanBreakBeforeArray->AppendElement(inhibitBreakBefore ? false :
-                                            aTextRun->CanBreakLineBefore(i));
+        aCanBreakBeforeArray->AppendElement(
+          inhibitBreakBefore ? gfxShapedText::CompressedGlyph::FLAG_BREAK_TYPE_NONE
+                             : aTextRun->CanBreakBefore(i));
       }
 
       if (IS_IN_BMP(ch)) {
@@ -591,7 +592,8 @@
         aCharsToMergeArray.AppendElement(true);
         if (aTextRun) {
           aStyleArray->AppendElement(charStyle);
-          aCanBreakBeforeArray->AppendElement(false);
+          aCanBreakBeforeArray->AppendElement(
+            gfxShapedText::CompressedGlyph::FLAG_BREAK_TYPE_NONE);
         }
       }
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/Selection.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/Selection.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/Selection.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/Selection.h	2015-02-28 15:03:09.000000000 +0000
@@ -27,6 +27,7 @@
 
 namespace mozilla {
 class ErrorResult;
+struct AutoPrepareFocusRange;
 }
 
 struct RangeData
@@ -114,7 +115,6 @@
   nsresult      Collapse(nsINode* aParentNode, int32_t aOffset);
   nsresult      Extend(nsINode* aParentNode, int32_t aOffset);
   nsRange*      GetRangeAt(int32_t aIndex);
-  int32_t GetRangeCount() { return mRanges.Length(); }
 
   // Get the anchor-to-focus range if we don't care which end is
   // anchor and which end is focus.
@@ -226,7 +226,7 @@
     MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
   };
 private:
-
+  friend struct mozilla::AutoPrepareFocusRange;
   class ScrollSelectionIntoViewEvent;
   friend class ScrollSelectionIntoViewEvent;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/TextOverflow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/TextOverflow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/TextOverflow.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/TextOverflow.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -293,6 +293,11 @@
   if (!CanHaveTextOverflow(aBuilder, aBlockFrame)) {
     return nullptr;
   }
+  nsIScrollableFrame* scrollableFrame = nsLayoutUtils::GetScrollableFrameFor(aBlockFrame);
+  if (scrollableFrame && scrollableFrame->IsTransformingByAPZ()) {
+    // 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();
@@ -666,14 +671,20 @@
 }
 
 /* static */ bool
+TextOverflow::HasClippedOverflow(nsIFrame* aBlockFrame)
+{
+  const nsStyleTextReset* style = aBlockFrame->StyleTextReset();
+  return style->mTextOverflow.mLeft.mType == NS_STYLE_TEXT_OVERFLOW_CLIP &&
+         style->mTextOverflow.mRight.mType == NS_STYLE_TEXT_OVERFLOW_CLIP;
+}
+
+/* static */ bool
 TextOverflow::CanHaveTextOverflow(nsDisplayListBuilder* aBuilder,
                                   nsIFrame*             aBlockFrame)
 {
-  const nsStyleTextReset* style = aBlockFrame->StyleTextReset();
   // Nothing to do for text-overflow:clip or if 'overflow-x:visible' or if
   // we're just building items for event processing or image visibility.
-  if ((style->mTextOverflow.mLeft.mType == NS_STYLE_TEXT_OVERFLOW_CLIP &&
-       style->mTextOverflow.mRight.mType == NS_STYLE_TEXT_OVERFLOW_CLIP) ||
+  if (HasClippedOverflow(aBlockFrame) ||
       IsHorizontalOverflowVisible(aBlockFrame) ||
       aBuilder->IsForEventDelivery() || aBuilder->IsForImageVisibility()) {
     return false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/TextOverflow.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/TextOverflow.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/generic/TextOverflow.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/generic/TextOverflow.h	2015-02-28 15:03:09.000000000 +0000
@@ -47,6 +47,10 @@
   nsDisplayList& GetMarkers() { return mMarkerList; }
 
   /**
+   * @return true if aBlockFrmae has text-overflow:clip on both sides.
+   */
+  static bool HasClippedOverflow(nsIFrame* aBlockFrame);
+  /**
    * @return true if aBlockFrame needs analysis for text overflow.
    */
   static bool CanHaveTextOverflow(nsDisplayListBuilder* aBuilder,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/moz.build	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/moz.build	2015-02-28 15:03:09.000000000 +0000
@@ -7,7 +7,6 @@
 EXPORTS.mozilla.layout += [
     'RenderFrameChild.h',
     'RenderFrameParent.h',
-    'RenderFrameUtils.h',
     'VsyncChild.h',
     'VsyncParent.h',
 ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/RenderFrameParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/RenderFrameParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/RenderFrameParent.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/RenderFrameParent.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -278,7 +278,6 @@
 };
 
 RenderFrameParent::RenderFrameParent(nsFrameLoader* aFrameLoader,
-                                     ScrollingBehavior aScrollingBehavior,
                                      TextureFactoryIdentifier* aTextureFactoryIdentifier,
                                      uint64_t* aId,
                                      bool* aSuccess)
@@ -312,7 +311,7 @@
         static_cast<ClientLayerManager*>(lm.get());
       clientManager->GetRemoteRenderer()->SendNotifyChildCreated(mLayersId);
     }
-    if (aScrollingBehavior == ASYNC_PAN_ZOOM) {
+    if (gfxPrefs::AsyncPanZoomEnabled()) {
       mContentController = new RemoteContentController(this);
       CompositorParent::SetControllerForLayerTree(mLayersId, mContentController);
     }
@@ -617,15 +616,16 @@
 }  // namespace mozilla
 
 nsDisplayRemote::nsDisplayRemote(nsDisplayListBuilder* aBuilder,
-                                 nsIFrame* aFrame,
+                                 nsSubDocumentFrame* aFrame,
                                  RenderFrameParent* aRemoteFrame)
   : nsDisplayItem(aBuilder, aFrame)
   , mRemoteFrame(aRemoteFrame)
   , mEventRegionsOverride(EventRegionsOverride::NoOverride)
 {
   if (aBuilder->IsBuildingLayerEventRegions()) {
-    if (aBuilder->IsInsidePointerEventsNoneDoc() ||
-        aFrame->StyleVisibility()->GetEffectivePointerEvents(aFrame) == NS_STYLE_POINTER_EVENTS_NONE) {
+    bool frameIsPointerEventsNone = !aFrame->PassPointerEventsToChildren()
+        && (aFrame->StyleVisibility()->GetEffectivePointerEvents(aFrame) == NS_STYLE_POINTER_EVENTS_NONE);
+    if (aBuilder->IsInsidePointerEventsNoneDoc() || frameIsPointerEventsNone) {
       mEventRegionsOverride |= EventRegionsOverride::ForceEmptyHitRegion;
     }
     if (nsLayoutUtils::HasDocumentLevelListenersForApzAwareEvents(aFrame->PresContext()->PresShell())) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/RenderFrameParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/RenderFrameParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/RenderFrameParent.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/RenderFrameParent.h	2015-02-28 15:03:09.000000000 +0000
@@ -14,7 +14,6 @@
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layout/PRenderFrameParent.h"
 #include "nsDisplayList.h"
-#include "RenderFrameUtils.h"
 
 class nsFrameLoader;
 class nsSubDocumentFrame;
@@ -58,7 +57,6 @@
    * them to asynchronously pan and zoom.
    */
   RenderFrameParent(nsFrameLoader* aFrameLoader,
-                    ScrollingBehavior aScrollingBehavior,
                     TextureFactoryIdentifier* aTextureFactoryIdentifier,
                     uint64_t* aId, bool* aSuccess);
   virtual ~RenderFrameParent();
@@ -96,8 +94,6 @@
 
   bool HitTest(const nsRect& aRect);
 
-  bool UseAsyncPanZoom() { return !!mContentController; }
-
   void GetTextureFactoryIdentifier(TextureFactoryIdentifier* aTextureFactoryIdentifier);
 
   inline uint64_t GetLayersId() { return mLayersId; }
@@ -166,7 +162,7 @@
   typedef mozilla::layout::RenderFrameParent RenderFrameParent;
 
 public:
-  nsDisplayRemote(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
+  nsDisplayRemote(nsDisplayListBuilder* aBuilder, nsSubDocumentFrame* aFrame,
                   RenderFrameParent* aRemoteFrame);
 
   virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/RenderFrameUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/RenderFrameUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/ipc/RenderFrameUtils.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/ipc/RenderFrameUtils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=8 et :
- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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_layer_RenderFrameUtils_h
-#define mozilla_layer_RenderFrameUtils_h
-
-#include "ipc/IPCMessageUtils.h"
-
-namespace mozilla {
-namespace layout {
-
-enum ScrollingBehavior {
-  /**
-   * Use default scrolling behavior, which is synchronous: web content
-   * is reflowed and repainted for every scroll or zoom.
-   */
-  DEFAULT_SCROLLING,
-  /**
-   * Use asynchronous panning and zooming, in which prerendered
-   * content can be translated and scaled independently of the thread
-   * painting content, without content reflowing or repainting.
-   */
-  ASYNC_PAN_ZOOM,
-  SCROLLING_BEHAVIOR_SENTINEL
-};
-
-} // namespace layout
-} // namespace mozilla
-
-namespace IPC {
-
-template <>
-struct ParamTraits<mozilla::layout::ScrollingBehavior>
-  : public ContiguousEnumSerializer<
-             mozilla::layout::ScrollingBehavior,
-             mozilla::layout::DEFAULT_SCROLLING,
-             mozilla::layout::SCROLLING_BEHAVIOR_SENTINEL>
-{};
-
-} // namespace IPC
-
-#endif // mozilla_layer_RenderFrameUtils_h
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/printing/nsPrintEngine.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/printing/nsPrintEngine.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/printing/nsPrintEngine.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/printing/nsPrintEngine.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1105,7 +1105,7 @@
     return false;
   }
 
-  int32_t rangeCount = selection->GetRangeCount();
+  int32_t rangeCount = selection->RangeCount();
   if (!rangeCount) {
     return false;
   }
@@ -2014,7 +2014,7 @@
     selectionPS->RemoveAllRanges();
   }
   if (selection && selectionPS) {
-    int32_t cnt = selection->GetRangeCount();
+    int32_t cnt = selection->RangeCount();
     int32_t inx;
     for (inx = 0; inx < cnt; ++inx) {
         selectionPS->AddRange(selection->GetRangeAt(inx));
@@ -2428,7 +2428,7 @@
     shell->GetCurrentSelection(nsISelectionController::SELECTION_NORMAL);
   NS_ENSURE_STATE(origSelection && selection);
 
-  int32_t rangeCount = origSelection->GetRangeCount();
+  int32_t rangeCount = origSelection->RangeCount();
   for (int32_t i = 0; i < rangeCount; ++i) {
       CloneRangeToSelection(origSelection->GetRangeAt(i), aDoc, selection);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/1119117-1a.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/1119117-1a.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/1119117-1a.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/1119117-1a.html	2015-02-28 15:03:11.000000000 +0000
@@ -7,7 +7,7 @@
   height:0;
 }
 #d2 {
-  opacity:0.5;
+  opacity:0.50196078431;
 }
 #d3 {
   position:absolute;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/1119117-1b.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/1119117-1b.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/1119117-1b.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/1119117-1b.html	2015-02-28 15:03:11.000000000 +0000
@@ -7,7 +7,7 @@
   height:0;
 }
 #d2 {
-  opacity:0.5;
+  opacity:0.50196078431;
 }
 #image {
   position:fixed;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/1119117-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/1119117-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/1119117-1-ref.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/1119117-1-ref.html	2015-02-28 15:03:11.000000000 +0000
@@ -4,7 +4,7 @@
 <style>
 #image {
   position:fixed;
-  opacity:0.5;
+  opacity:0.50196078431;
   left:0;
   top:0;
   width:100%;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/508908-1.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/508908-1.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/508908-1.xul	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/508908-1.xul	2015-02-28 15:03:11.000000000 +0000
@@ -1,15 +1,12 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
-        onload="setTimeout(doTest, 0)"
+        onload="setTimeout(function() { forceLoadPlugin('plugin'); }, 0)"
         class="reftest-wait">
-  <script>
-  function doTest() {
-    document.documentElement.removeAttribute("class");
-  }
+  <script src="forceloadplugin.js">
   </script>
   <menulist>
     <menupopup>
-      <html:embed type="application/x-test"></html:embed>
+      <html:embed type="application/x-test" id="plugin"></html:embed>
     </menupopup>
   </menulist>
 </window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/541406-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/541406-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/541406-1.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/541406-1.html	2015-02-28 15:03:11.000000000 +0000
@@ -1,6 +1,14 @@
 <!DOCTYPE HTML>
-<html>
-<body onload="document.getElementById('p').focus()">
+<html class="reftest-wait">
+<head>
+<script src="forceloadplugin.js">
+</script>
+</head>
+<body onload="forceLoadPlugin('p', function() {
+  var p = document.getElementById('p');
+  p.focus();
+  document.documentElement.removeAttribute('class');
+})">
 <object style="position:absolute; width:100%; height:100%; left:0; top:0;"
         type="application/x-test" id="p"></object>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/541406-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/541406-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/541406-1-ref.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/541406-1-ref.html	2015-02-28 15:03:11.000000000 +0000
@@ -1,7 +1,11 @@
 <!DOCTYPE HTML>
-<html style="overflow:hidden">
-<body>
+<html class="reftest-wait" style="overflow:hidden">
+<head>
+<script src="forceloadplugin.js">
+</script>
+</head>
+<body onload="forceLoadPlugin('p')">
 <object style="position:absolute; width:100%; height:100%; left:0; top:0;"
-        type="application/x-test"></object>
+        type="application/x-test" id="p"></object>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/579808-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/579808-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/579808-1.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/579808-1.html	2015-02-28 15:03:11.000000000 +0000
@@ -1,7 +1,9 @@
 <!DOCTYPE HTML>
-<html>
-<body>
-  <embed style="-moz-transform:scaleY(-1)" type="application/x-test" drawmode="solid" color="FF00FF00" width="200" height="200"></embed>
+<html class="reftest-wait">
+<script src="forceloadplugin.js">
+</script>
+<body onload="forceLoadPlugin('p')">
+  <embed style="-moz-transform:scaleY(-1)" type="application/x-test" drawmode="solid" color="FF00FF00" width="200" height="200" id="p"></embed>
 </body>
 </html>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/580160-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/580160-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/580160-1.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/580160-1.html	2015-02-28 15:03:11.000000000 +0000
@@ -1,6 +1,10 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait">
-<body>
+<head>
+<script src="forceloadplugin.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p', true)">
 <embed type="application/x-test" id="p"
        style="position:fixed; width:200px; height:200px;"></embed>
 <script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/580160-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/580160-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/580160-1-ref.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/580160-1-ref.html	2015-02-28 15:03:11.000000000 +0000
@@ -1,6 +1,10 @@
 <!DOCTYPE HTML>
 <html class="reftest-wait">
-<body>
+<head>
+<script src="forceloadplugin.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p', true)">
 <embed type="application/x-test" id="p"
        style="width:200px; height:400px;"></embed>
 <script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/632423-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/632423-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/632423-1.html	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/632423-1.html	2015-02-28 15:03:11.000000000 +0000
@@ -1,5 +1,13 @@
 <!DOCTYPE HTML>
-<embed type="application/x-test" drawmode="solid" color="#FFFF0000" style="width:400px; height:200px; display:block"></embed>
+<html class="reftest-wait">
+<head>
+<script src="forceloadplugin.js">
+</script>
+</head>
+<body onLoad="forceLoadPlugin('p')">
+<embed type="application/x-test" drawmode="solid" color="#FFFF0000" style="width:400px; height:200px; display:block" id="p"></embed>
 <div style="background:rgba(255,255,255,0.8); width:200px; position:relative; top:-200px; font-size:50px;">
 Hello
 </div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-1.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<title>Don't pull background colors of container layers through DrawAboveRegions of ThebesLayers</title>
+<style>
+
+#outer {
+  transform: translateX(1px);
+}
+
+#above {
+  position: absolute;
+  top: 50px;
+  left: 50px;
+  width: 100px;
+  height: 100px;
+  border: 1px solid black;
+}
+
+</style>
+
+<div id="outer">
+  <canvas id="canvas" height="100" width="200"></canvas>
+  <div id="above"></div>
+</div>
+
+<script>
+var canvas = document.getElementById("canvas");
+var cx = canvas.getContext("2d");
+cx.fillStyle="lime";
+cx.fillRect(0, 0, 200, 100);
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-1-ref.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Don't pull background colors of container layers through DrawAboveRegions of ThebesLayers</title>
+<style>
+
+#outer {
+  transform: translateX(1px);
+}
+
+#above {
+  position: absolute;
+  top: 50px;
+  left: 50px;
+  width: 100px;
+  height: 100px;
+  border: 1px solid black;
+}
+
+</style>
+
+<div id="outer">
+  <div style="height: 100px; width: 200px; background-color: lime;"></div>
+  <div id="above"></div>
+</div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-2.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-2.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title>Make sure that we don't pull background colors into container layers that have effects applied on them</title>
+
+<style>
+
+#outer {
+  background-color: white;
+  border: 1px solid black;
+}
+
+#outer > div {
+  margin: 20px;
+  border: 1px solid white;
+  height: 20px;
+}
+
+#inner1 {
+  mix-blend-mode: difference;
+}
+
+#inner2 {
+  filter: invert(100%);
+}
+
+</style>
+
+<div id="outer">
+  <div id="inner1"></div>
+  <div id="inner2"></div>
+</div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-2-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-2-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-2-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-2-ref.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title>Make sure that we don't pull background colors into container layers that have effects applied on them</title>
+
+<style>
+
+#outer {
+  background-color: white;
+  border: 1px solid black;
+}
+
+#outer > div {
+  margin: 20px;
+  border: 1px solid black;
+  height: 20px;
+}
+
+</style>
+
+<div id="outer">
+  <div id="inner1"></div>
+  <div id="inner2"></div>
+</div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-3.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-3.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-3.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-3.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title>Test container background searching with clipped display items</title>
+
+<style>
+
+div {
+  box-sizing: border-box;
+  width: 200px;
+  height: 200px;
+  margin-bottom: -200px;
+}
+
+#outer {
+  background-color: red;
+}
+
+#container {
+  will-change: opacity;
+}
+
+#backgroundCover {
+  background-color: lime;
+}
+
+#roundedClip {
+  overflow: hidden;
+  border-radius: 20px;
+}
+
+#clippedItem {
+  background-color: lime;
+}
+
+#separatePaintedLayer {
+  position: sticky;
+  border: 1px solid lime;
+}
+
+</style>
+
+<div id="outer">
+  <div id="container">
+    <div id="backgroundCover"></div>
+    <div id="roundedClip">
+      <div id="clippedItem"></div>
+    </div>
+    <div id="separatePaintedLayer"></div>
+  </div>
+</div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-3-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-3-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/961887-3-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/961887-3-ref.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title>Test container background searching with clipped display items</title>
+
+<style>
+
+#box {
+  width: 200px;
+  height: 200px;
+  background-color: lime;
+}
+
+</style>
+
+<div id="box"></div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/forceloadplugin.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/forceloadplugin.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/forceloadplugin.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/forceloadplugin.js	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,23 @@
+function forceLoadPluginElement(id) {
+  var e = document.getElementById(id);
+  var found = e.pluginFoundElement;
+}
+
+function forceLoadPlugin(ids, dontRemoveClassAttribute) {
+  if (Array.isArray(ids)) {
+    ids.forEach(function(element, index, array) {
+      forceLoadPluginElement(element);
+    });
+  } else {
+    forceLoadPluginElement(ids);
+  }
+  if (dontRemoveClassAttribute) {
+    // In some tests we need to do other stuff instead of removing the class
+    // attribute. In that case we pass a function and run that before returning.
+    if (typeof dontRemoveClassAttribute === 'function') {
+      dontRemoveClassAttribute();
+    }
+    return;
+  }
+  document.documentElement.removeAttribute("class");
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/bugs/reftest.list	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/bugs/reftest.list	2015-02-28 15:03:00.000000000 +0000
@@ -1356,8 +1356,8 @@
 == 490177-1.svg 490177-1-ref.svg
 == 490182-1a.html 490182-1-ref.html
 == 490182-1b.html 490182-1-ref.html
-== 491180-1.html 491180-1-ref.html
-== 491180-2.html 491180-2-ref.html
+pref(browser.display.focus_ring_width,1) == 491180-1.html 491180-1-ref.html
+pref(browser.display.focus_ring_width,1) == 491180-2.html 491180-2-ref.html
 skip-if(B2G&&browserIsRemote) == 491323-1.xul 491323-1-ref.xul # bug 974780
 skip-if(B2G&&browserIsRemote) == 492239-1.xul 492239-1-ref.xul # bug 974780
 == 492661-1.html 492661-1-ref.html
@@ -1658,9 +1658,9 @@
 fuzzy-if(d2d&&/^Windows\x20NT\x206\.2/.test(http.oscpu),1,559) == 633344-1.html 633344-1-ref.html # bug 1103623
 == 634232-1.html 634232-1-ref.html
 fails-if(Android&&AndroidVersion<17&&AndroidVersion!=10) == 635302-1.html 635302-1-ref.html
-skip-if(B2G) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,1,11) == 635373-1.html 635373-1-ref.html
-skip-if(B2G) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,1,15) == 635373-2.html 635373-2-ref.html
-skip-if(B2G) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,1,15) == 635373-3.html 635373-3-ref.html
+fuzzy(1,68) skip-if(B2G) fails-if(Android) == 635373-1.html 635373-1-ref.html
+skip-if(B2G) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,1,61) == 635373-2.html 635373-2-ref.html
+skip-if(B2G) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,1,60) == 635373-3.html 635373-3-ref.html
 HTTP(..) == 635639-1.html 635639-1-ref.html
 HTTP(..) == 635639-2.html 635639-2-ref.html
 random == 637597-1.html 637597-1-ref.html # bug 637597 was never really fixed!
@@ -1803,6 +1803,9 @@
 == 950436-1.html 950436-1-ref.html
 == 957770-1.svg 957770-1-ref.svg
 == 960277-1.html 960277-1-ref.html
+== 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) == 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
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-1.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1052123 - Autohide ruby annotations which are identical to their bases</title>
-  <link rel="stylesheet" href="common.css">
-</head>
-<body>
-  <ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
-  </ruby>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-1-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-1-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1052123 - Autohide ruby annotations which are identical to their bases</title>
-  <link rel="stylesheet" href="common.css">
-</head>
-<body>
-  <ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
-  </ruby>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-2.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1052123 - Autohide ruby annotations which are identical to their bases</title>
-  <link rel="stylesheet" href="common.css">
-  <script>
-    window.onload = function() {
-      // Force a reflow before changes.
-      document.body.clientWidth;
-      var elems = document.querySelectorAll('[data-content]');
-      Array.from(elems).forEach(function(e) {
-        e.textContent = e.dataset.content;
-      });
-    };
-  </script>
-</head>
-<body>
-  <p><ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt data-content="ri">り</rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-  <p><ruby>
-    <rb>振</rb><rb data-content="ri">り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-  <p><ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt data-content="り">ri</rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-  <p><ruby>
-    <rb>振</rb><rb data-content="り">ri</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-2-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-2-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-2-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-2-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1052123 - Autohide ruby annotations which are identical to their bases</title>
-  <link rel="stylesheet" href="common.css">
-</head>
-<body>
-  <p><ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt>ri</rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-  <p><ruby>
-    <rb>振</rb><rb>ri</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-  <p><ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-  <p><ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
-  </ruby></p>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-3.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-3.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-3.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-3.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1052123 - Autohide ruby annotations which are identical to their bases</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    body { line-height: 5em; }
-  </style>
-</head>
-<body>
-  <ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt style="line-height: 100em;">り</rt><rt>が</rt><rt>な</rt>
-  </ruby>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-3-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-3-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/autohiding-3-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/autohiding-3-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1052123 - Autohide ruby annotations which are identical to their bases</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    body { line-height: 5em; }
-  </style>
-</head>
-<body>
-  <ruby>
-    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
-    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
-  </ruby>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-1.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    .inline {
-      display: block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>a<div class="inline">b</div>c</ruby></div>
-  <div><rb>a<div class="inline">b</div>c</rb></div>
-  <div><rt>a<div class="inline">b</div>c</rt></div>
-  <div><rbc>a<div class="inline">b</div>c</rbc></div>
-  <div><rtc>a<div class="inline">b</div>c</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-1-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-1-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    .inline {
-      display: inline-block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>a<div class="inline">b</div>c</ruby></div>
-  <div><rb>a<div class="inline">b</div>c</rb></div>
-  <div><rt>a<div class="inline">b</div>c</rt></div>
-  <div><rbc>a<div class="inline">b</div>c</rbc></div>
-  <div><rtc>a<div class="inline">b</div>c</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-2.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    .block, table, .flex {
-      background-color: yellow;
-      width: 100px; height: 30px;
-      border: 1px solid blue;
-    }
-    .block { display: block; }
-    table { border-collapse: collapse; }
-    td { border: 3px solid red; }
-    .flex { display: flex; }
-    .flex-item { flex: auto; }
-  </style>
-</head>
-<body>
-  <div><rb>a<div class="block">b</div>c</rb><rt>x<div class="block">y</div>z</rt></div>
-  <div>
-    <rb>a<table><tr><td>b1</td><td>b2</td></tr></table>c</rb>
-    <rt>x<table><tr><td>y1</td><td>y2</td></tr></table>z</rt>
-  </div>
-  <div>
-    <rb>a<div class="flex">
-      <div class="flex-item">b1</div>
-      <div class="flex-item">b2</div>
-    </div>c</rb>
-    <rt>x<div class="flex">
-      <div class="flex-item">y1</div>
-      <div class="flex-item">y2</div>
-    </div>z</rt>
-  </div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-2-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-2-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-2-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-2-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    .block, table, .flex {
-      background-color: yellow;
-      width: 100px; height: 30px;
-      border: 1px solid blue;
-    }
-    .block { display: inline-block; }
-    table { display: inline-table; border-collapse: collapse; }
-    td { border: 3px solid red; }
-    .flex { display: inline-flex; }
-    .flex-item { flex: auto; }
-  </style>
-</head>
-<body>
-  <div><rb>a<div class="block">b</div>c</rb><rt>x<div class="block">y</div>z</rt></div>
-  <div>
-    <rb>a<table><tr><td>b1</td><td>b2</td></tr></table>c</rb>
-    <rt>x<table><tr><td>y1</td><td>y2</td></tr></table>z</rt>
-  </div>
-  <div>
-    <rb>a<div class="flex">
-      <div class="flex-item">b1</div>
-      <div class="flex-item">b2</div>
-    </div>c</rb>
-    <rt>x<div class="flex">
-      <div class="flex-item">y1</div>
-      <div class="flex-item">y2</div>
-    </div>z</rt>
-  </div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-3.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-3.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-3.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-3.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    body { border-collapse: collapse; }
-    .cell {
-      display: table-cell;
-      background-color: yellow;
-      border: 3px solid blue;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>a<div class="cell">b1</div><div class="cell">b2</div>c</ruby></div>
-  <div><rb>a<div class="cell">b1</div><div class="cell">b2</div>c</rb></div>
-  <div><rt>a<div class="cell">b1</div><div class="cell">b2</div>c</rt></div>
-  <div><rbc>a<div class="cell">b1</div><div class="cell">b2</div>c</rbc></div>
-  <div><rtc>a<div class="cell">b1</div><div class="cell">b2</div>c</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-3-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-3-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-3-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-3-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    div { border-collapse: collapse; }
-    .table { display: inline-table; }
-    .cell {
-      display: table-cell;
-      background-color: yellow;
-      border: 3px solid blue;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</ruby></div>
-  <div><rb>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rb></div>
-  <div><rt>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rt></div>
-  <div><rbc>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rbc></div>
-  <div><rtc>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-4.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-4.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-4.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-4.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    .inline {
-      display: block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>a<span><div class="inline">b</div></span>c</ruby></div>
-  <div><rb>a<span><div class="inline">b</div></span>c</rb></div>
-  <div><rt>a<span><div class="inline">b</div></span>c</rt></div>
-  <div><rbc>a<span><div class="inline">b</div></span>c</rbc></div>
-  <div><rtc>a<span><div class="inline">b</div></span>c</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-4-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-4-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-4-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-4-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    .inline {
-      display: inline-block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>a<span><div class="inline">b</div></span>c</ruby></div>
-  <div><rb>a<span><div class="inline">b</div></span>c</rb></div>
-  <div><rt>a<span><div class="inline">b</div></span>c</rt></div>
-  <div><rbc>a<span><div class="inline">b</div></span>c</rbc></div>
-  <div><rtc>a<span><div class="inline">b</div></span>c</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-5.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-5.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-5.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-5.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    ruby::before, rb::before, rt::before, rbc::before, rtc::before {
-      content: "a";
-      display: block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-    ruby::after, rb::after, rt::after, rbc::after, rtc::after {
-      content: "c";
-      display: block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>b</ruby></div>
-  <div><rb>b</rb></div>
-  <div><rt>b</rt></div>
-  <div><rbc>b</rbc></div>
-  <div><rtc>b</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-5-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-5-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/inlinize-blocks-5-ref.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/inlinize-blocks-5-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 1098257 - Inlinize block-level boxes inside ruby</title>
-  <link rel="stylesheet" href="common.css">
-  <style>
-    ruby::before, rb::before, rt::before, rbc::before, rtc::before {
-      content: "a";
-      display: inline-block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-    ruby::after, rb::after, rt::after, rbc::after, rtc::after {
-      content: "c";
-      display: inline-block;
-      background-color: yellow;
-      width: 30px; height: 30px;
-    }
-  </style>
-</head>
-<body>
-  <div><ruby>b</ruby></div>
-  <div><rb>b</rb></div>
-  <div><rt>b</rt></div>
-  <div><rbc>b</rbc></div>
-  <div><rtc>b</rtc></div>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/intrinsic-isize-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/intrinsic-isize-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/intrinsic-isize-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/intrinsic-isize-1.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>Bug 1134432 - Intrinsic ISize calculation of ruby</title>
+  <style>
+    div {
+      display: inline-block;
+      border: 1px solid black;
+    }
+  </style>
+</head>
+<body>
+  <div style="width: -moz-min-content">
+    <ruby><rb>ABC<rb>DEF</ruby>
+  </div>
+  <div style="width: -moz-max-content">
+    <ruby><rb>ABC<rb>DEF</ruby>
+  </div>
+  <br>
+
+  <div style="width: -moz-min-content">
+    XYZ<ruby><rb>ABC<rb>DEF</ruby>XYZ
+  </div>
+  <div style="width: -moz-max-content">
+    XYZ<ruby><rb>ABC<rb>DEF</ruby>XYZ
+  </div>
+  <br>
+
+  <div style="width: -moz-min-content">
+    <ruby><rb>あい<rb>うえ</ruby>
+  </div>
+  <div style="width: -moz-max-content">
+    <ruby><rb>あい<rb>うえ</ruby>
+  </div>
+  <br>
+
+  <div style="width: -moz-min-content">
+    お<ruby><rb>あい<rb>うえ</ruby>お
+  </div>
+  <div style="width: -moz-max-content">
+    お<ruby><rb>あい<rb>うえ</ruby>お
+  </div>
+  <br>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/intrinsic-isize-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/intrinsic-isize-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/intrinsic-isize-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/intrinsic-isize-1-ref.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>Bug 1134432 - Intrinsic ISize calculation of ruby</title>
+  <style>
+    div {
+      display: inline-block;
+      border: 1px solid black;
+    }
+    span {
+      white-space: nowrap;
+    }
+  </style>
+</head>
+<body>
+  <div style="width: -moz-min-content">
+    <span>ABC</span><span>DEF</span>
+  </div>
+  <div style="width: -moz-max-content">
+    <span>ABC</span><span>DEF</span>
+  </div>
+  <br>
+
+  <div style="width: -moz-min-content">
+    XYZ<span>ABC</span><span>DEF</span>XYZ
+  </div>
+  <div style="width: -moz-max-content">
+    XYZ<span>ABC</span><span>DEF</span>XYZ
+  </div>
+  <br>
+
+  <div style="width: -moz-min-content">
+    <span>あい</span><span>うえ</span>
+  </div>
+  <div style="width: -moz-max-content">
+    <span>あい</span><span>うえ</span>
+  </div>
+  <br>
+
+  <div style="width: -moz-min-content">
+    お<span>あい</span><span>うえ</span>お
+  </div>
+  <div style="width: -moz-max-content">
+    お<span>あい</span><span>うえ</span>お
+  </div>
+  <br>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/line-height-4.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/line-height-4.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/line-height-4.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/line-height-4.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,7 @@
+<title>Bug 1134206 - Ruby line spacing adjustment on quirks mode</title>
+<ruby>
+  <rb>base</rb>
+  <rtc style="ruby-position: over; font-size: 80%;"><rt style="color: transparent">text</rt></rtc>
+  <rtc style="ruby-position: under; font-size: 50%;"><rt style="color: transparent">text</rt></rtc>
+</ruby><br>
+next line
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/line-height-4-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/line-height-4-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/line-height-4-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/line-height-4-ref.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,15 @@
+<title>Bug 1134206 - Ruby line spacing adjustment on quirks mode</title>
+<script type="text/javascript" src="utils.js"></script>
+<div id="base">
+  <span id="inline">base</span>
+  <span id="text1" style="font-size: 80%; color: transparent">text</span>
+  <span id="text2" style="font-size: 50%; color: transparent">text</span>
+</div>
+next line
+<script>
+  // Simulate the behavior of ruby layout.
+  var base = document.getElementById('base');
+  makeHeightMatchInlineBox(base, document.getElementById('inline'));
+  base.style.paddingTop = getHeight(document.getElementById('text1'));
+  base.style.paddingBottom = getHeight(document.getElementById('text2'));
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/reftest.list	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/reftest.list	2015-02-28 15:03:00.000000000 +0000
@@ -1,8 +1,5 @@
 default-preferences pref(layout.css.ruby.enabled,true)
 
-== autohiding-1.html autohiding-1-ref.html
-== autohiding-2.html autohiding-2-ref.html
-== autohiding-3.html autohiding-3-ref.html
 == box-generation-1.html box-generation-1-ref.html
 == box-generation-2.html box-generation-2-ref.html
 == box-generation-3.html box-generation-3-ref.html
@@ -19,26 +16,25 @@
 == dynamic-removal-2.html dynamic-removal-2-ref.html
 == dynamic-removal-3.html dynamic-removal-3-ref.html
 == float-handling.html float-handling-ref.html
-== inlinize-blocks-1.html inlinize-blocks-1-ref.html
-== inlinize-blocks-2.html inlinize-blocks-2-ref.html
-== inlinize-blocks-3.html inlinize-blocks-3-ref.html
-== inlinize-blocks-4.html inlinize-blocks-4-ref.html
-== inlinize-blocks-5.html inlinize-blocks-5-ref.html
 == intra-level-whitespace-1.html intra-level-whitespace-1-ref.html
 == intra-level-whitespace-2.html intra-level-whitespace-2-ref.html
 == intra-level-whitespace-3.html intra-level-whitespace-3-ref.html
+== intrinsic-isize-1.html intrinsic-isize-1-ref.html
 == justification-1.html justification-1-ref.html
 == justification-2.html justification-2-ref.html
-asserts-if(winWidget,0-1) == line-breaking-1.html line-breaking-1-ref.html # bug 1133697
+== line-breaking-1.html line-breaking-1-ref.html
 == line-height-1.html line-height-1-ref.html
 == line-height-2.html line-height-2-ref.html
 == line-height-3.html line-height-3-ref.html
+== line-height-4.html line-height-4-ref.html
 load nested-ruby-1.html
 == no-transform.html no-transform-ref.html
 == relative-positioning-1.html relative-positioning-1-ref.html
 == relative-positioning-2.html relative-positioning-2-ref.html
 == ruby-align-1.html ruby-align-1-ref.html
+== ruby-align-1a.html ruby-align-1-ref.html
 == ruby-align-2.html ruby-align-2-ref.html
+== ruby-align-2a.html ruby-align-2-ref.html
 == ruby-position-horizontal.html ruby-position-horizontal-ref.html
 pref(layout.css.vertical-text.enabled,true) fails == ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html # bug 1112474
 pref(layout.css.vertical-text.enabled,true) fails == ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html # bug 1112474
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/ruby-align-1a.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/ruby-align-1a.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/ruby-align-1a.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/ruby-align-1a.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Bug 1055676 - Tests for ruby-align</title>
+  <link rel="stylesheet" href="common.css">
+  <style>
+    ruby { line-height: 0; }
+    rt > div { width: 160px; }
+  </style>
+</head>
+<body style="font: 16px/3 Ahem">
+  <ruby>
+    <rb style="ruby-align: start">X X X<rt><div></div></rt>
+  </ruby><br>
+  <ruby>
+    <rb style="ruby-align: center">X X X<rt><div></div></rt>
+  </ruby><br>
+  <ruby>
+    <rb style="ruby-align: space-between">X X X<rt><div></div></rt>
+  </ruby><br>
+  <ruby>
+    <rb style="ruby-align: space-around">X X X<rt><div></div></rt>
+  </ruby>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/ruby-align-2a.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/ruby-align-2a.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/css-ruby/ruby-align-2a.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/css-ruby/ruby-align-2a.html	2015-02-28 15:03:00.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Bug 1055676 - Tests for ruby-align</title>
+  <link rel="stylesheet" href="common.css">
+  <style>
+    ruby { line-height: 0; }
+    rt { font-size: 100%; }
+    rb > div { width: 160px; }
+  </style>
+</head>
+<body style="font: 16px/3 Ahem">
+  <ruby>
+    <rb><div></div><rt style="ruby-align: start">X X X</rt>
+  </ruby><br>
+  <ruby>
+    <rb><div></div><rt style="ruby-align: center">X X X</rt>
+  </ruby><br>
+  <ruby>
+    <rb><div></div><rt style="ruby-align: space-between">X X X</rt>
+  </ruby><br>
+  <ruby>
+    <rb><div></div><rt style="ruby-align: space-around">X X X</rt>
+  </ruby>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/button/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/button/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/button/reftest.list	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/button/reftest.list	2015-02-28 15:03:01.000000000 +0000
@@ -7,9 +7,9 @@
 # on B2G, despite their "-moz-appearance: none; background: gray", so they
 # don't quite match the reference case's normal <div>. That's why they're fuzzy.
 fuzzy-if(B2G||Android,125,20) == percent-height-child-1.html percent-height-child-1-ref.html
-fuzzy-if(B2G||Android,125,80) == percent-height-child-2.html percent-height-child-2-ref.html
+pref(browser.display.focus_ring_width,1) fuzzy-if(B2G||Android,125,80) == percent-height-child-2.html percent-height-child-2-ref.html
 fuzzy-if(B2G||Android,125,20) == percent-width-child-1.html  percent-width-child-1-ref.html
-fuzzy-if(B2G||Android,125,80) == percent-width-child-2.html  percent-width-child-2-ref.html
+pref(browser.display.focus_ring_width,1) fuzzy-if(B2G||Android,125,80) == percent-width-child-2.html  percent-width-child-2-ref.html
 
 == vertical-centering.html vertical-centering-ref.html
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/fieldset/legend-rtl.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/fieldset/legend-rtl.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/fieldset/legend-rtl.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/fieldset/legend-rtl.html	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+<fieldset><legend dir="rtl" style="position:relative;left:20px;">Legend</legend></fieldset>
+<fieldset dir="rtl"><legend dir="ltr" style="position:relative;right:20px;">Legend</legend></fieldset>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/fieldset/legend-rtl-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/fieldset/legend-rtl-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/fieldset/legend-rtl-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/fieldset/legend-rtl-ref.html	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+<fieldset><legend style="position:relative;left:20px;">Legend</legend></fieldset>
+<fieldset dir="rtl"><legend style="position:relative;right:20px;">Legend</legend></fieldset>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/fieldset/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/fieldset/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/forms/fieldset/reftest.list	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/forms/fieldset/reftest.list	2015-02-28 15:03:01.000000000 +0000
@@ -11,3 +11,4 @@
 test-pref(layout.css.sticky.enabled,true) skip-if(B2G&&browserIsRemote) == sticky-legend-1.html sticky-legend-1-ref.html
 == abs-pos-child-sizing.html abs-pos-child-sizing-ref.html
 == overflow-hidden.html overflow-hidden-ref.html
+== legend-rtl.html legend-rtl-ref.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/pagination/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/pagination/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/pagination/reftest.list	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/pagination/reftest.list	2015-02-28 15:03:01.000000000 +0000
@@ -1,7 +1,7 @@
 # For more pagination tests, see layout/reftests/w3c-css/submitted/css21/pagination/
 #   and layout/reftests/w3c-css/submitted/multicol3/
 # Pagination tests
-asserts(3) == abspos-breaking-000.xhtml abspos-breaking-000.ref.xhtml # bug 1067755
+# asserts(3) == abspos-breaking-000.xhtml abspos-breaking-000.ref.xhtml # bug 1067755, 1135556
 == abspos-breaking-001.xhtml abspos-breaking-000.ref.xhtml
 == abspos-breaking-002.xhtml abspos-breaking-000.ref.xhtml
 == abspos-breaking-003.html abspos-breaking-003-ref.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/percent-overflow-sizing/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/percent-overflow-sizing/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/percent-overflow-sizing/reftest.list	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/percent-overflow-sizing/reftest.list	2015-02-28 15:03:01.000000000 +0000
@@ -11,7 +11,7 @@
 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightD.html greenboxhbar.html # bug 650591, 732565 # bug 773482
 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-1D.html greenboxhbar.html # bug 650591, 732565 # bug 773482
 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-2D.html greenboxhbar.html # bug 650591, 732565 # bug 773482
-fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-3D.html greenboxhbar.html # bug 650591, 732565
+fuzzy-if(B2G,1,11) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-3D.html greenboxhbar.html # bug 650591, 732565, 1136304
 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollAbsHeightD.html greenboxhbar.html # bug 650591, 732565 # bug 773482
 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollAbsHeightQuirksD.html greenboxhbar.html # bug 650591, 732565 # bug 773482
 == simpleMinHeight100D.html greenbox.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/printing/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/printing/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/printing/reftest.list	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/printing/reftest.list	2015-02-28 15:03:01.000000000 +0000
@@ -32,4 +32,4 @@
 random-if(B2G&&browserIsRemote) == 960822.html 960822-ref.html # reftest-print doesn't work on B2G (scrollbar difference only)
 == 966419-1.html 966419-1-ref.html
 == 966419-2.html 966419-2-ref.html
-skip-if(B2G) asserts(2) HTTP(..) == 1108104.html 1108104-ref.html # bug 1067755
+# skip-if(B2G) asserts(3) HTTP(..) == 1108104.html 1108104-ref.html # bug 1067755, 1135556
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/svg/marker-orientation-04.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/svg/marker-orientation-04.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/svg/marker-orientation-04.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/svg/marker-orientation-04.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,39 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <marker id="redTriangle"
+      refX="0" refY="12" markerUnits="userSpaceOnUse"
+      markerWidth="24" markerHeight="24" orient="auto">
+      <path fill="red" d="M 0 0 L 24 12 L 0 24 z" />
+    </marker>
+    <marker id="limeTriangle"
+      refX="0" refY="12" markerUnits="userSpaceOnUse"
+      markerWidth="24" markerHeight="24" orient="auto" overflow="visible">
+      <path fill="lime" stroke-width="3" stroke="lime" d="M 0 0 L 24 12 L 0 24 z" />
+    </marker>
+    <marker id="reverseLimeTriangle"
+      refX="0" refY="12" markerUnits="userSpaceOnUse"
+      markerWidth="24" markerHeight="24" orient="auto" overflow="visible">
+      <path transform="rotate(180, 0, 12)" fill="lime" stroke-width="3" stroke="lime" d="M 0 0 L 24 12 L 0 24 z" />
+    </marker>
+  </defs>
+
+  <rect width="100%" height="100%" fill="lime"/>
+
+  <!-- Control point vectors are zero -->
+  <path d="M 50,125 C 50,125, 100,25, 100,25" stroke-width="10" stroke="red"
+    marker-end="url(#redTriangle)" />
+
+  <path d="M 150,125 C 200,25, 200,25, 200,25" stroke-width="10" stroke="red"
+    marker-end="url(#redTriangle)" />
+
+  <!-- Non-degenerate covering -->
+  <path d="M 50,125 L 100,25" stroke-width="13" stroke="lime"
+    marker-end="url(#limeTriangle)" marker-start="url(#reverseLimeTriangle)" />
+
+  <path d="M 150,125 L 200,25" stroke-width="13" stroke="lime"
+    marker-end="url(#limeTriangle)" marker-start="url(#reverseLimeTriangle)" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/svg/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/svg/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/svg/reftest.list	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/svg/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -201,6 +201,7 @@
 == marker-orientation-01.svg marker-orientation-01-ref.svg
 pref(svg.marker-improvements.enabled,true) == marker-orientation-02.svg marker-orientation-02-ref.svg
 == marker-orientation-03.svg pass.svg
+== marker-orientation-04.svg pass.svg
 == mask-basic-01.svg pass.svg
 == mask-basic-02.svg mask-basic-02-ref.svg
 == mask-basic-03.svg pass.svg
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-eo-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-eo-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-eo-1-ref.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-eo-1-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -5,7 +5,7 @@
 </head>
 <body>
 <div style="width:1em; -moz-hyphens:manual;" lang="eo">
-Ĉi&shy;uj ho&shy;moj es&shy;tas de&shy;na&shy;s&shy;ke li&shy;be&shy;raj kaj ega&shy;laj laŭ di&shy;g&shy;no kaj raj&shy;toj.
+Ĉiuj ho&shy;moj es&shy;tas de&shy;na&shy;s&shy;ke li&shy;be&shy;raj kaj ega&shy;laj laŭ di&shy;g&shy;no kaj raj&shy;toj.
 </div>
 </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-nb-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-nb-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-nb-1-ref.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-nb-1-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -5,7 +5,7 @@
 </head>
 <body>
 <div style="width:1em; -moz-hyphens:manual;" lang="nb">
-Al&shy;le men&shy;nes&shy;ker er født frie og med sam&shy;me men&shy;neske&shy;verd og men&shy;neske&shy;ret&shy;tig&shy;he&shy;ter.
+Alle men&shy;nes&shy;ker er født frie og med sam&shy;me men&shy;neske&shy;verd og men&shy;neske&shy;ret&shy;tig&shy;he&shy;ter.
 <p>
 <!-- words that differ in nb/nn locales -->
 at&shy;ten&shy;de
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-nn-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-nn-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-nn-1-ref.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-nn-1-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -5,7 +5,7 @@
 </head>
 <body>
 <div style="width:1em; -moz-hyphens:manual;" lang="nn">
-Al&shy;le men&shy;nes&shy;ke er fød&shy;de til fri&shy;dom og med same men&shy;neske&shy;verd og men&shy;neske&shy;ret&shy;tar.
+Alle men&shy;nes&shy;ke er fød&shy;de til fri&shy;dom og med same men&shy;neske&shy;verd og men&shy;neske&shy;ret&shy;tar.
 <p>
 <!-- words that differ in nb/nn locales -->
 att&shy;en&shy;de
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-transformed-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-transformed-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-transformed-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-transformed-1.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+<meta charset="utf-8">
+<title>Test for auto hyphenation with text-transform</title>
+</head>
+<body>
+<div style="width:0px; -moz-hyphens:auto">
+masse<br>maße
+</div>
+<div style="width:0px; -moz-hyphens:auto; text-transform:uppercase">
+masse<br>maße
+</div>
+<div style="width:0px; -moz-hyphens:auto; text-transform:capitalize">
+masse<br>maße
+</div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-transformed-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-transformed-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/auto-hyphenation-transformed-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/auto-hyphenation-transformed-1-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+<meta charset="utf-8">
+<title>Test for auto hyphenation with text-transform</title>
+</head>
+<body>
+<div style="width:0px;">
+mas&shy;se<br>ma&shy;ße
+</div>
+<div style="width:0px;">
+MAS&shy;SE<br>MA&shy;SSE
+</div>
+<div style="width:0px;">
+Mas&shy;se<br>Ma&shy;ße
+</div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text/reftest.list	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -293,6 +293,8 @@
 == auto-hyphenation-tr-1.html auto-hyphenation-tr-1-ref.html
 == auto-hyphenation-uk-1.html auto-hyphenation-uk-1-ref.html
 
+== auto-hyphenation-transformed-1.html auto-hyphenation-transformed-1-ref.html
+
 # osx-font-smoothing - with and without subpixel AA, only under OSX
 fails-if(!cocoaWidget||OSX==1006||OSX==1007) != osx-font-smoothing.html osx-font-smoothing-ref.html
 fails-if(!cocoaWidget||OSX==1006||OSX==1007) != osx-font-smoothing-2.html osx-font-smoothing-2-notref.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-decoration/1133392.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-decoration/1133392.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-decoration/1133392.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-decoration/1133392.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<title>reftest, bug 1133392</title>
+<style>
+
+  p:not(.state-one) > span {
+    text-decoration: underline;
+  }
+
+  p > span > span {
+    vertical-align: -2em;
+  }
+
+  p:not(.state-three) > span > span {
+    visibility: hidden;
+  }
+
+</style>
+
+<p class="state-one"><span>This text<br>
+has <span>an underline</span>.</span></p>
+
+<script>
+
+  var p = document.getElementsByTagName("p")[0];
+  p.offsetLeft; // flush layout
+  document.getElementsByTagName('p')[0].className = 'state-two';
+
+  document.addEventListener("MozReftestInvalidate", step_three, false);
+  function step_three(event) {
+    document.getElementsByTagName('p')[0].className = 'state-three';
+    document.documentElement.classList.remove("reftest-wait");
+  }
+
+</script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-decoration/1133392-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-decoration/1133392-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-decoration/1133392-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-decoration/1133392-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<html>
+<title>reftest, bug 1133392</title>
+<style>
+
+p > span {
+  text-decoration: underline;
+}
+
+p > span > span {
+  vertical-align: -2em;
+}
+
+</style>
+
+<p class="state-one"><span>This text<br>
+has <span>an underline</span>.</span></p>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-decoration/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-decoration/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-decoration/reftest.list	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-decoration/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -107,3 +107,4 @@
 == underline-button-2.html underline-button-2-ref.html
 == underline-select-1.html underline-select-1-ref.html
 == underline-select-2.html underline-select-2-ref.html
+== 1133392.html 1133392-ref.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-svgglyphs/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-svgglyphs/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/text-svgglyphs/reftest.list	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/text-svgglyphs/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -17,7 +17,7 @@
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paintnone.svg svg-glyph-paintnone-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-cachedopacity.svg svg-glyph-cachedopacity-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    fuzzy-if(cocoaWidget,255,100) == svg-glyph-objectvalue.svg svg-glyph-objectvalue-ref.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true)    fails == svg-glyph-mask.svg svg-glyph-mask-ref.svg # bug 872483
+#pref(gfx.font_rendering.opentype_svg.enabled,true)    fails == svg-glyph-mask.svg svg-glyph-mask-ref.svg # bug 872483, 1135329
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-paint-server.svg svg-glyph-paint-server-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-transform.svg svg-glyph-transform-ref.svg
 pref(gfx.font_rendering.opentype_svg.enabled,true)    == svg-glyph-extents.html svg-glyph-extents-ref.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/transform-3d/preserve3d-1a.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/transform-3d/preserve3d-1a.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/transform-3d/preserve3d-1a.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/transform-3d/preserve3d-1a.html	2015-02-28 15:03:02.000000000 +0000
@@ -5,7 +5,7 @@
   <div style="-moz-transform: rotatex(45deg); -moz-transform-style: preserve-3d; width: 100px;">
     <div style="-moz-transform: rotatex(45deg); -moz-transform-style: preserve-3d; width: 100px;">
       <div style="-moz-transform: rotatex(45deg); -moz-transform-style: preserve-3d; width: 100px;">
-        <div style="-moz-transform: rotatex(45deg); width: 100px; height: 100px;">
+        <div style="-moz-transform: rotatex(45deg); width: 100px; height: 100px; background-color: white;">
           Test Text
         </div>
       </div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/transform-3d/preserve3d-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/transform-3d/preserve3d-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/transform-3d/preserve3d-1-ref.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/transform-3d/preserve3d-1-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -2,7 +2,7 @@
 <head>
 </head>
 <body>
-  <div style="-moz-transform: rotatex(180deg); width: 100px; height: 100px;">
+  <div style="-moz-transform: rotatex(180deg); width: 100px; height: 100px; background-color: white;">
     Test Text
   </div>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/transform-3d/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/transform-3d/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/transform-3d/reftest.list	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/transform-3d/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -11,7 +11,7 @@
 == rotatex-perspective-1c.html rotatex-1-ref.html
 == rotatex-perspective-3a.html rotatex-perspective-3-ref.html
 == scalez-1a.html scalez-1-ref.html
-== preserve3d-1a.html preserve3d-1-ref.html
+fuzzy-if(cocoaWidget,17,3) == preserve3d-1a.html preserve3d-1-ref.html
 == preserve3d-1b.html about:blank
 == preserve3d-clipped.html about:blank
 == preserve3d-2a.html preserve3d-2-ref.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/reftest.list	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -1 +1,2 @@
 include pagination/reftest.list
+include replaced-sizing/reftest.list
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,9 @@
+== replaced-elements-all-auto.html replaced-elements-all-auto-ref.html
+== replaced-elements-height-20.html replaced-elements-height-20-ref.html
+== replaced-elements-width-40.html replaced-elements-width-40-ref.html
+== replaced-elements-min-height-20.html replaced-elements-all-auto-ref.html
+== replaced-elements-min-width-40.html replaced-elements-all-auto-ref.html
+== replaced-elements-min-height-40.html replaced-elements-min-height-40-ref.html
+== replaced-elements-min-width-80.html replaced-elements-min-width-80-ref.html
+== replaced-elements-max-height-20.html replaced-elements-height-20-ref.html
+== replaced-elements-max-width-40.html replaced-elements-width-40-ref.html
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-all-auto-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-all-auto-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Reference: CSS 2.1 replaced element sizing</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+
+  span {
+    display: inline-block;
+    width: 50px;
+    height: 25px;
+  }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <span style="background: black;"></span>, <!-- height-25-width-50 -->
+  <span style="background: fuchsia;"></span>, <!-- height-25-ratio-2 -->
+  <span style="background: silver;"></span>, <!-- width-50-ratio-2 -->
+  <span style="background: blue; width: 300px"></span>, <!-- height-25-no-ratio -->
+  <span style="background: orange; height: 150px"></span>, <!-- width-50-no-ratio -->
+  <span style="background: gray; width: 200px; height: 100px"></span>, <!-- ratio-2 -->
+  <span style="background: aqua; width: 300px; height: 150px"></span>. <!-- no-ratio -->
+
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-height-20-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { height: 20px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-height-20-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Reference: CSS 2.1 replaced element sizing</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+
+  span {
+    display: inline-block;
+    width: 40px;
+    height: 20px;
+  }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <span style="background: black;"></span>, <!-- height-25-width-50 -->
+  <span style="background: fuchsia;"></span>, <!-- height-25-ratio-2 -->
+  <span style="background: silver;"></span>, <!-- width-50-ratio-2 -->
+  <span style="background: blue; width: 300px"></span>, <!-- height-25-no-ratio -->
+  <span style="background: orange; width: 50px"></span>, <!-- width-50-no-ratio -->
+  <span style="background: gray"></span>, <!-- ratio-2 -->
+  <span style="background: aqua; width: 300px"></span>. <!-- no-ratio -->
+
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-height-20.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-height-20.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-height-20.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-height-20.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-height-20-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { max-height: 20px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-width-40.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-width-40.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-width-40.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-max-width-40.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-width-40-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { max-width: 40px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-20.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-20.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-20.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-20.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-all-auto-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { min-height: 20px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-min-height-40-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { min-height: 40px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-height-40-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Reference: CSS 2.1 replaced element sizing</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+
+  span {
+    display: inline-block;
+    width: 80px;
+    height: 40px;
+  }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <span style="background: black;"></span>, <!-- height-25-width-50 -->
+  <span style="background: fuchsia;"></span>, <!-- height-25-ratio-2 -->
+  <span style="background: silver;"></span>, <!-- width-50-ratio-2 -->
+  <span style="background: blue; width: 300px"></span>, <!-- height-25-no-ratio -->
+  <span style="background: orange; width: 50px; height: 150px"></span>, <!-- width-50-no-ratio -->
+  <span style="background: gray; width: 200px; height: 100px"></span>, <!-- ratio-2 -->
+  <span style="background: aqua; width: 300px; height: 150px"></span>. <!-- no-ratio -->
+
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-40.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-40.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-40.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-40.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-all-auto-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { min-width: 40px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-min-width-80-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { min-width: 80px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-min-width-80-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Reference: CSS 2.1 replaced element sizing</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+
+  span {
+    display: inline-block;
+    width: 80px;
+    height: 40px;
+  }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <span style="background: black;"></span>, <!-- height-25-width-50 -->
+  <span style="background: fuchsia;"></span>, <!-- height-25-ratio-2 -->
+  <span style="background: silver;"></span>, <!-- width-50-ratio-2 -->
+  <span style="background: blue; width: 300px; height: 25px"></span>, <!-- height-25-no-ratio -->
+  <span style="background: orange; height: 150px"></span>, <!-- width-50-no-ratio -->
+  <span style="background: gray; width: 200px; height: 100px"></span>, <!-- ratio-2 -->
+  <span style="background: aqua; width: 300px; height: 150px"></span>. <!-- no-ratio -->
+
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Test: CSS 2.1 replaced element sizing</title>
+  <link rel="match" href="replaced-elements-width-40-ref.html">
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+  img { width: 40px }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <img src="support/height-25-width-50.svg">,
+  <img src="support/height-25-ratio-2.svg">,
+  <img src="support/width-50-ratio-2.svg">,
+  <img src="support/height-25-no-ratio.svg">,
+  <img src="support/width-50-no-ratio.svg">,
+  <img src="support/ratio-2.svg">,
+  <img src="support/no-ratio.svg">.
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/replaced-elements-width-40-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+  <title>CSS Reference: CSS 2.1 replaced element sizing</title>
+  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths">
+  <meta name="flags" content="should"> <!-- undefinedness in 10.3.2 -->
+  <style type="text/css">
+
+  div { width: 200px }
+
+  span {
+    display: inline-block;
+    width: 40px;
+    height: 20px;
+  }
+
+  </style>
+</head>
+<body>
+
+<div>
+  <span style="background: black;"></span>, <!-- height-25-width-50 -->
+  <span style="background: fuchsia;"></span>, <!-- height-25-ratio-2 -->
+  <span style="background: silver;"></span>, <!-- width-50-ratio-2 -->
+  <span style="background: blue; height: 25px"></span>, <!-- height-25-no-ratio -->
+  <span style="background: orange; height: 150px"></span>, <!-- width-50-no-ratio -->
+  <span style="background: gray"></span>, <!-- ratio-2 -->
+  <span style="background: aqua; height: 150px"></span>. <!-- no-ratio -->
+
+</div>
+
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-no-ratio.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-no-ratio.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-no-ratio.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-no-ratio.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="25" preserveAspectRatio="none">
+  <rect fill="blue" x="0" y="0" width="100%" height="100%" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-ratio-2.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-ratio-2.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-ratio-2.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-ratio-2.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 500" height="25" preserveAspectRatio="none">
+  <rect fill="fuchsia" x="0" y="0" width="1000" height="500" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-width-50.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-width-50.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-width-50.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/height-25-width-50.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="25" width="50" viewBox="0 0 1000 1000" preserveAspectRatio="none">
+  <rect fill="black" x="0" y="0" width="1000" height="1000" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/no-ratio.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/no-ratio.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/no-ratio.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/no-ratio.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="none">
+  <rect fill="aqua" x="0" y="0" width="100%" height="100%" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/ratio-2.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/ratio-2.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/ratio-2.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/ratio-2.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 500" preserveAspectRatio="none">
+  <rect fill="gray" x="0" y="0" width="1000" height="500" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-no-ratio.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-no-ratio.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-no-ratio.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-no-ratio.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="50" preserveAspectRatio="none">
+  <rect fill="orange" x="0" y="0" width="100%" height="100%" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-ratio-2.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-ratio-2.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-ratio-2.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/css21/replaced-sizing/support/width-50-ratio-2.svg	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 500" width="50" preserveAspectRatio="none">
+  <rect fill="silver" x="0" y="0" width="1000" height="500" />
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/reftest.list	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -34,6 +34,9 @@
 # Multi-column Layout 3
 include multicol3/reftest.list
 
+# Ruby Layout Module
+include ruby/reftest.list
+
 # Selectors Level 3
 # include selectors3/reftest.list
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/reftest.list	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/reftest.list	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,12 @@
+# Tests for inlinizing block-level boxes
+== ruby-inlinize-blocks-001.html ruby-inlinize-blocks-001-ref.html
+== ruby-inlinize-blocks-002.html ruby-inlinize-blocks-002-ref.html
+== ruby-inlinize-blocks-003.html ruby-inlinize-blocks-003-ref.html
+== ruby-inlinize-blocks-004.html ruby-inlinize-blocks-004-ref.html
+== ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005-ref.html
+
+# Tests for autohiding base-identical annotations
+== ruby-autohide-001.html ruby-autohide-001-ref.html
+== ruby-autohide-002.html ruby-autohide-002-ref.html
+== ruby-autohide-003.html ruby-autohide-003-ref.html
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Autohide ruby annotations which are identical to their bases</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#autohide">
+  <link rel="match" href="ruby-autohide-001-ref.html">
+</head>
+<body>
+  <ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
+  </ruby>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-001-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Autohide ruby annotations which are identical to their bases</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+</head>
+<body>
+  <ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
+  </ruby>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Autohide ruby annotations which are identical to their bases</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#autohide">
+  <link rel="match" href="ruby-autohide-002-ref.html">
+  <script>
+    window.onload = function() {
+      // Force a reflow before changes.
+      document.body.clientWidth;
+      var elems = document.querySelectorAll('[data-content]');
+      for (var i = 0; i < elems.length; i++) {
+        elems[i].textContent = elems[i].dataset.content;
+      }
+    };
+  </script>
+</head>
+<body>
+  <p><ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt data-content="ri">り</rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+  <p><ruby>
+    <rb>振</rb><rb data-content="ri">り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+  <p><ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt data-content="り">ri</rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+  <p><ruby>
+    <rb>振</rb><rb data-content="り">ri</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-002-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Autohide ruby annotations which are identical to their bases</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+</head>
+<body>
+  <p><ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt>ri</rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+  <p><ruby>
+    <rb>振</rb><rb>ri</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt>り</rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+  <p><ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+  <p><ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
+  </ruby></p>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Autohide ruby annotations which are identical to their bases</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#autohide">
+  <link rel="match" href="ruby-autohide-003-ref.html">
+  <style>
+    body { line-height: 5em; }
+  </style>
+</head>
+<body>
+  <ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt style="line-height: 100em;">り</rt><rt>が</rt><rt>な</rt>
+  </ruby>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-autohide-003-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Autohide ruby annotations which are identical to their bases</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <style>
+    body { line-height: 5em; }
+  </style>
+</head>
+<body>
+  <ruby>
+    <rb>振</rb><rb>り</rb><rb>仮</rb><rb>名</rb>
+    <rt>ふ</rt><rt></rt><rt>が</rt><rt>な</rt>
+  </ruby>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#anon-gen-inlinize">
+  <link rel="match" href="ruby-inlinize-blocks-001-ref.html">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    .inline {
+      display: block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>a<div class="inline">b</div>c</ruby></div>
+  <div><rb>a<div class="inline">b</div>c</rb></div>
+  <div><rt>a<div class="inline">b</div>c</rt></div>
+  <div><rbc>a<div class="inline">b</div>c</rbc></div>
+  <div><rtc>a<div class="inline">b</div>c</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-001-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    .inline {
+      display: inline-block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>a<div class="inline">b</div>c</ruby></div>
+  <div><rb>a<div class="inline">b</div>c</rb></div>
+  <div><rt>a<div class="inline">b</div>c</rt></div>
+  <div><rbc>a<div class="inline">b</div>c</rbc></div>
+  <div><rtc>a<div class="inline">b</div>c</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#anon-gen-inlinize">
+  <link rel="match" href="ruby-inlinize-blocks-002-ref.html">
+  <link rel="stylesheet" href="common.css">
+  <style>
+    .block, table, .flex {
+      background-color: yellow;
+      width: 100px; height: 30px;
+      border: 1px solid blue;
+    }
+    .block { display: block; }
+    table { border-collapse: collapse; }
+    td { border: 3px solid red; }
+    .flex { display: flex; }
+    .flex-item { flex: auto; }
+  </style>
+</head>
+<body>
+  <div><rb>a<div class="block">b</div>c</rb><rt>x<div class="block">y</div>z</rt></div>
+  <div>
+    <rb>a<table><tr><td>b1</td><td>b2</td></tr></table>c</rb>
+    <rt>x<table><tr><td>y1</td><td>y2</td></tr></table>z</rt>
+  </div>
+  <div>
+    <rb>a<div class="flex">
+      <div class="flex-item">b1</div>
+      <div class="flex-item">b2</div>
+    </div>c</rb>
+    <rt>x<div class="flex">
+      <div class="flex-item">y1</div>
+      <div class="flex-item">y2</div>
+    </div>z</rt>
+  </div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-002-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <style>
+    .block, table, .flex {
+      background-color: yellow;
+      width: 100px; height: 30px;
+      border: 1px solid blue;
+    }
+    .block { display: inline-block; }
+    table { display: inline-table; border-collapse: collapse; }
+    td { border: 3px solid red; }
+    .flex { display: inline-flex; }
+    .flex-item { flex: auto; }
+  </style>
+</head>
+<body>
+  <div><rb>a<div class="block">b</div>c</rb><rt>x<div class="block">y</div>z</rt></div>
+  <div>
+    <rb>a<table><tr><td>b1</td><td>b2</td></tr></table>c</rb>
+    <rt>x<table><tr><td>y1</td><td>y2</td></tr></table>z</rt>
+  </div>
+  <div>
+    <rb>a<div class="flex">
+      <div class="flex-item">b1</div>
+      <div class="flex-item">b2</div>
+    </div>c</rb>
+    <rt>x<div class="flex">
+      <div class="flex-item">y1</div>
+      <div class="flex-item">y2</div>
+    </div>z</rt>
+  </div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#anon-gen-inlinize">
+  <link rel="match" href="ruby-inlinize-blocks-003-ref.html">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    body { border-collapse: collapse; }
+    .cell {
+      display: table-cell;
+      background-color: yellow;
+      border: 3px solid blue;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>a<div class="cell">b1</div><div class="cell">b2</div>c</ruby></div>
+  <div><rb>a<div class="cell">b1</div><div class="cell">b2</div>c</rb></div>
+  <div><rt>a<div class="cell">b1</div><div class="cell">b2</div>c</rt></div>
+  <div><rbc>a<div class="cell">b1</div><div class="cell">b2</div>c</rbc></div>
+  <div><rtc>a<div class="cell">b1</div><div class="cell">b2</div>c</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-003-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    div { border-collapse: collapse; }
+    .table { display: inline-table; }
+    .cell {
+      display: table-cell;
+      background-color: yellow;
+      border: 3px solid blue;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</ruby></div>
+  <div><rb>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rb></div>
+  <div><rt>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rt></div>
+  <div><rbc>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rbc></div>
+  <div><rtc>a<div class="table"><div class="cell">b1</div><div class="cell">b2</div></div>c</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#anon-gen-inlinize">
+  <link rel="match" href="ruby-inlinize-blocks-004-ref.html">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    .inline {
+      display: block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>a<span><div class="inline">b</div></span>c</ruby></div>
+  <div><rb>a<span><div class="inline">b</div></span>c</rb></div>
+  <div><rt>a<span><div class="inline">b</div></span>c</rt></div>
+  <div><rbc>a<span><div class="inline">b</div></span>c</rbc></div>
+  <div><rtc>a<span><div class="inline">b</div></span>c</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-004-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    .inline {
+      display: inline-block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>a<span><div class="inline">b</div></span>c</ruby></div>
+  <div><rb>a<span><div class="inline">b</div></span>c</rb></div>
+  <div><rt>a<span><div class="inline">b</div></span>c</rt></div>
+  <div><rbc>a<span><div class="inline">b</div></span>c</rbc></div>
+  <div><rtc>a<span><div class="inline">b</div></span>c</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Test: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="help" href="http://dev.w3.org/csswg/css-ruby-1/#anon-gen-inlinize">
+  <link rel="match" href="ruby-inlinize-blocks-005-ref.html">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    ruby::before, rb::before, rt::before, rbc::before, rtc::before {
+      content: "a";
+      display: block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+    ruby::after, rb::after, rt::after, rbc::after, rtc::after {
+      content: "c";
+      display: block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>b</ruby></div>
+  <div><rb>b</rb></div>
+  <div><rt>b</rt></div>
+  <div><rbc>b</rbc></div>
+  <div><rtc>b</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/ruby-inlinize-blocks-005-ref.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>CSS Reference: Inlinize block-level boxes inside ruby</title>
+  <link rel="author" title="Xidorn Quan" href="mailto:quanxunzhen@gmail.com">
+  <link rel="stylesheet" href="support/rbc.css">
+  <style>
+    ruby::before, rb::before, rt::before, rbc::before, rtc::before {
+      content: "a";
+      display: inline-block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+    ruby::after, rb::after, rt::after, rbc::after, rtc::after {
+      content: "c";
+      display: inline-block;
+      background-color: yellow;
+      width: 30px; height: 30px;
+    }
+  </style>
+</head>
+<body>
+  <div><ruby>b</ruby></div>
+  <div><rb>b</rb></div>
+  <div><rt>b</rt></div>
+  <div><rbc>b</rbc></div>
+  <div><rtc>b</rtc></div>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/support/rbc.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/support/rbc.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/ruby/support/rbc.css	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/ruby/support/rbc.css	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,3 @@
+rbc {
+  display: ruby-base-container;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/w3c-css/submitted/text-decor-3/ruby-text-decoration-01.html	2015-02-28 15:03:02.000000000 +0000
@@ -5,6 +5,7 @@
   <title>CSS Test: text-decoration on rubies</title>
   <link rel="author" title="Xidorn Quan" href="http://www.upsuper.org/">
   <link rel="help" href="http://www.w3.org/TR/css-text-decor-3/#line-decoration">
+  <link rel="match" href="ruby-text-decoration-01-ref.html">
 </head>
 <style type="text/css">
   ruby { display: ruby; }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi.html	2015-02-28 15:03:03.000000000 +0000
@@ -6,14 +6,16 @@
     <style type="text/css">
 div {
   writing-mode: vertical-rl;
-  height:       150px;
+  text-orientation: sideways-right;
+  height:       200px;
   width:        100px;
   text-align:   start;
   background:   yellow;
+  line-height:  1.5em;
 }
     </style>
   </head>
   <body>
-    <div dir="rtl">א foo ב <b>bar ג</b></div>
+    <div dir="rtl">abc א foo ב <b>bar ג</b> xyz</div>
   </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi-ref.html	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1131013-vertical-bidi-ref.html	2015-02-28 15:03:03.000000000 +0000
@@ -6,14 +6,16 @@
     <style type="text/css">
 div {
   writing-mode: vertical-rl;
-  height:       150px;
+  text-orientation: sideways-right;
+  height:       200px;
   width:        100px;
   text-align:   end;
   background:   yellow;
+  line-height:  1.5em;
 }
     </style>
   </head>
   <body>
-    <div><b>ג bar</b> ב foo א</b></div>
+    <div>xyz <b>ג bar</b> ב foo א abc</div>
   </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1.html	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Test for bug 1135361</title>
+    <style>
+    body {
+      font: 48px sans-serif;
+    }
+    div {
+      display: inline-block;
+      width: 3em;
+      border: 1px solid silver;
+      padding: .5em;
+    }
+    p {
+      writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      -ms-writing-mode: tb-rl; /* old syntax. IE */
+      text-orientation: upright;
+      -webkit-text-orientation: upright;
+      height: 4ch;
+      text-align: justify;
+      -moz-text-align-last: justify;
+    }
+    rt {
+      font-size: 20%; /* ensure ruby is small enough that it won't affect inline spacing */
+    }
+    .t {
+      color: transparent;
+    }
+    </style>
+  </head>
+  <body>
+   <div>
+    <p>
+      <ruby>東<rt>to</rt></ruby><ruby class="t">京<rt>kyo</rt></ruby>
+    </p>
+   </div>
+   <div>
+    <p>
+      <ruby class="t">東<rt>to</rt></ruby><ruby>京<rt>kyo</rt></ruby>
+    </p>
+   </div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1-ref.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1-ref.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/1135361-ruby-justify-1-ref.html	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Test for bug 1135361</title>
+    <style>
+    body {
+      font: 48px sans-serif;
+    }
+    div {
+      display: inline-block;
+      width: 3em;
+      border: 1px solid silver;
+      padding: .5em;
+    }
+    p {
+      writing-mode: vertical-rl;
+      -webkit-writing-mode: vertical-rl;
+      -ms-writing-mode: tb-rl; /* old syntax. IE */
+      text-orientation: upright;
+      -webkit-text-orientation: upright;
+      height: 4ch;
+    }
+    rt {
+      font-size: 20%; /* ensure ruby is small enough that it won't affect inline spacing */
+    }
+    span {
+      display: inline-block;
+      height: .5ch; /* shim for fake justification */
+    }
+    </style>
+  </head>
+  <body>
+   <div>
+    <p>
+      <span></span><ruby>東<rt>to</rt></ruby>
+    </p>
+   </div>
+   <div>
+    <p style="text-align:right;">
+      <ruby>京<rt>kyo</rt></ruby><span></span>
+    </p>
+   </div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/reftest.list thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/reftest.list
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/reftests/writing-mode/reftest.list	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/reftests/writing-mode/reftest.list	2015-02-28 15:03:03.000000000 +0000
@@ -70,7 +70,8 @@
 skip-if(Android||B2G) == ua-style-sheet-button-1.html ua-style-sheet-button-1a-ref.html
 skip-if(!(Android||B2G)) == ua-style-sheet-button-1.html ua-style-sheet-button-1b-ref.html
 == ua-style-sheet-input-color-1.html ua-style-sheet-input-color-1-ref.html
-fails == ua-style-sheet-input-number-1.html ua-style-sheet-input-number-1-ref.html # bug 1123299
+== ua-style-sheet-input-number-1.html ua-style-sheet-input-number-1-ref.html
+
 HTTP(..) == 1127488-align-default-horizontal-tb-ltr.html 1127488-align-top-left-ref.html
 HTTP(..) == 1127488-align-start-horizontal-tb-ltr.html 1127488-align-top-left-ref.html
 HTTP(..) == 1127488-align-end-horizontal-tb-ltr.html 1127488-align-top-right-ref.html
@@ -102,3 +103,4 @@
 HTTP(..) == 1127488-align-left-vertical-lr-ltr.html 1127488-align-top-left-ref.html
 HTTP(..) == 1127488-align-right-vertical-lr-ltr.html 1127488-align-bottom-left-ref.html
 == 1131013-vertical-bidi.html 1131013-vertical-bidi-ref.html
+fails-if(B2G) == 1135361-ruby-justify-1.html 1135361-ruby-justify-1-ref.html # bug 1136067
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/contenteditable.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/contenteditable.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/contenteditable.css	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/contenteditable.css	2015-02-28 15:03:03.000000000 +0000
@@ -9,7 +9,7 @@
   cursor: text;
 }
 
-*|*:focus:-moz-read-write :-moz-read-only {
+*|*:-moz-read-write :-moz-read-only {
   -moz-user-select: all !important;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/CounterStyleManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/CounterStyleManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/CounterStyleManager.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/CounterStyleManager.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -339,7 +339,7 @@
     if (unitidx == 0) {
       unit10Kidx = pos / 4;
     }
-    int32_t cur = aOrdinal % 10;
+    auto cur = static_cast<MakeUnsigned<CounterValue>::Type>(aOrdinal) % 10;
     if (cur == 0) {
       if (needZero) {
         needZero = false;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/CSSUnprefixingService.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/CSSUnprefixingService.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/CSSUnprefixingService.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/CSSUnprefixingService.js	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,157 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- /
+/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Implementation of a service that converts certain vendor-prefixed CSS
+   properties to their unprefixed equivalents, for sites on a whitelist. */
+// XXXdholbert whitelist is coming in bug 1132743
+
+"use strict";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function CSSUnprefixingService() {
+}
+
+CSSUnprefixingService.prototype = {
+  // Boilerplate:
+  classID:        Components.ID("{f0729490-e15c-4a2f-a3fb-99e1cc946b42}"),
+  _xpcom_factory: XPCOMUtils.generateSingletonFactory(CSSUnprefixingService),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsICSSUnprefixingService]),
+
+  // See documentation in nsICSSUnprefixingService.idl
+  generateUnprefixedDeclaration: function(aPropName, aRightHalfOfDecl,
+                                          aUnprefixedDecl /*out*/) {
+
+    // Convert our input strings to lower-case, for easier string-matching.
+    // (NOTE: If we ever need to add support for unprefixing properties that
+    // have case-sensitive parts, then we should do these toLowerCase()
+    // conversions in a more targeted way, to avoid breaking those properties.)
+    aPropName = aPropName.toLowerCase();
+    aRightHalfOfDecl = aRightHalfOfDecl.toLowerCase();
+
+    // We have several groups of supported properties:
+    // FIRST GROUP: Properties that can just be handled as aliases:
+    // ============================================================
+    const propertiesThatAreJustAliases = {
+      "-webkit-background-size":   "background-size",
+      "-webkit-box-flex":          "flex-grow",
+      "-webkit-box-ordinal-group": "order",
+      "-webkit-box-sizing":        "box-sizing",
+      "-webkit-transform":         "transform",
+    };
+
+    let unprefixedPropName = propertiesThatAreJustAliases[aPropName];
+    if (unprefixedPropName !== undefined) {
+      aUnprefixedDecl.value = unprefixedPropName + ":" + aRightHalfOfDecl;
+      return true;
+    }
+
+    // SECOND GROUP: Properties that take a single keyword, where the
+    // unprefixed version takes a different (but analogous) set of keywords:
+    // =====================================================================
+    const propertiesThatNeedKeywordMapping = {
+      "-webkit-box-align" : {
+        unprefixedPropName : "align-items",
+        valueMap : {
+          "start"    : "flex-start",
+          "center"   : "center",
+          "end"      : "flex-end",
+          "baseline" : "baseline",
+          "stretch"  : "stretch"
+        }
+      },
+      "-webkit-box-orient" : {
+        unprefixedPropName : "flex-direction",
+        valueMap : {
+          "horizontal"  : "row",
+          "inline-axis" : "row",
+          "vertical"    : "column",
+          "block-axis"  : "column"
+        }
+      },
+      "-webkit-box-pack" : {
+        unprefixedPropName : "justify-content",
+        valueMap : {
+          "start"    : "flex-start",
+          "center"   : "center",
+          "end"      : "flex-end",
+          "justify"  : "space-between"
+        }
+      },
+    };
+
+    let propInfo = propertiesThatNeedKeywordMapping[aPropName];
+    if (typeof(propInfo) != "undefined") {
+      // Regexp for parsing the right half of a declaration, for keyword-valued
+      // properties. Divides the right half of the declaration into:
+      //  1) any leading whitespace
+      //  2) the property value (one or more alphabetical character or hyphen)
+      //  3) anything after that (e.g. "!important", ";")
+      // Then we can look up the appropriate unprefixed-property value for the
+      // value (part 2), and splice that together with the other parts and with
+      // the unprefixed property-name to make the final declaration.
+      const keywordValuedPropertyRegexp = /^(\s*)([a-z\-]+)(.*)/;
+      let parts = keywordValuedPropertyRegexp.exec(aRightHalfOfDecl);
+      if (!parts) {
+        // Failed to parse a keyword out of aRightHalfOfDecl. (It probably has
+        // no alphabetical characters.)
+        return false;
+      }
+
+      let mappedKeyword = propInfo.valueMap[parts[2]];
+      if (mappedKeyword === undefined) {
+        // We found a keyword in aRightHalfOfDecl, but we don't have a mapping
+        // to an equivalent keyword for the unprefixed version of the property.
+        return false;
+      }
+
+      aUnprefixedDecl.value = propInfo.unprefixedPropName + ":" +
+        parts[1] + // any leading whitespace
+        mappedKeyword +
+        parts[3]; // any trailing text (e.g. !important, semicolon, etc)
+
+      return true;
+    }
+
+    // THIRD GROUP: Properties that may need arbitrary string-replacement:
+    // ===================================================================
+    const propertiesThatNeedStringReplacement = {
+      // "-webkit-transition" takes a multi-part value. If "-webkit-transform"
+      // appears as part of that value, replace it w/ "transform".
+      // And regardless, we unprefix the "-webkit-transition" property-name.
+      // (We could handle other prefixed properties in addition to 'transform'
+      // here, but in practice "-webkit-transform" is the main one that's
+      // likely to be transitioned & that we're concerned about supporting.)
+      "-webkit-transition": {
+        unprefixedPropName : "transition",
+        stringMap : {
+          "-webkit-transform" : "transform",
+        }
+      },
+    };
+
+    propInfo = propertiesThatNeedStringReplacement[aPropName];
+    if (typeof(propInfo) != "undefined") {
+      let newRightHalf = aRightHalfOfDecl;
+      for (let strToReplace in propInfo.stringMap) {
+        let replacement = propInfo.stringMap[strToReplace];
+        newRightHalf = newRightHalf.replace(strToReplace, replacement, "g");
+      }
+      aUnprefixedDecl.value = propInfo.unprefixedPropName + ":" + newRightHalf;
+
+      return true;
+    }
+
+    // No known mapping for property aPropName.
+    return false;
+  },
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([CSSUnprefixingService]);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/CSSUnprefixingService.manifest thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/CSSUnprefixingService.manifest
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/CSSUnprefixingService.manifest	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/CSSUnprefixingService.manifest	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,2 @@
+component {f0729490-e15c-4a2f-a3fb-99e1cc946b42} CSSUnprefixingService.js
+contract @mozilla.org/css-unprefixing-service;1 {f0729490-e15c-4a2f-a3fb-99e1cc946b42}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/Declaration.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/Declaration.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/Declaration.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/Declaration.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -717,9 +717,8 @@
       const nsCSSValue *decorationStyle =
         data->ValueFor(eCSSProperty_text_decoration_style);
 
-      NS_ABORT_IF_FALSE(decorationStyle->GetUnit() == eCSSUnit_Enumerated,
-                        nsPrintfCString("bad text-decoration-style unit %d",
-                                        decorationStyle->GetUnit()).get());
+      MOZ_ASSERT(decorationStyle->GetUnit() == eCSSUnit_Enumerated,
+                 "bad text-decoration-style unit");
 
       AppendValueToString(eCSSProperty_text_decoration_line, aValue,
                           aSerialization);
@@ -747,18 +746,15 @@
       const nsCSSValue *transDelay =
         data->ValueFor(eCSSProperty_transition_delay);
 
-      NS_ABORT_IF_FALSE(transDuration->GetUnit() == eCSSUnit_List ||
-                        transDuration->GetUnit() == eCSSUnit_ListDep,
-                        nsPrintfCString("bad t-duration unit %d",
-                                        transDuration->GetUnit()).get());
-      NS_ABORT_IF_FALSE(transTiming->GetUnit() == eCSSUnit_List ||
-                        transTiming->GetUnit() == eCSSUnit_ListDep,
-                        nsPrintfCString("bad t-timing unit %d",
-                                        transTiming->GetUnit()).get());
-      NS_ABORT_IF_FALSE(transDelay->GetUnit() == eCSSUnit_List ||
-                        transDelay->GetUnit() == eCSSUnit_ListDep,
-                        nsPrintfCString("bad t-delay unit %d",
-                                        transDelay->GetUnit()).get());
+      MOZ_ASSERT(transDuration->GetUnit() == eCSSUnit_List ||
+                 transDuration->GetUnit() == eCSSUnit_ListDep,
+                 "bad t-duration unit");
+      MOZ_ASSERT(transTiming->GetUnit() == eCSSUnit_List ||
+                 transTiming->GetUnit() == eCSSUnit_ListDep,
+                 "bad t-timing unit");
+      MOZ_ASSERT(transDelay->GetUnit() == eCSSUnit_List ||
+                 transDelay->GetUnit() == eCSSUnit_ListDep,
+                 "bad t-delay unit");
 
       const nsCSSValueList* dur = transDuration->GetListValue();
       const nsCSSValueList* tim = transTiming->GetListValue();
@@ -785,10 +781,9 @@
           aValue.Truncate();
         }
       } else {
-        NS_ABORT_IF_FALSE(transProp->GetUnit() == eCSSUnit_List ||
-                          transProp->GetUnit() == eCSSUnit_ListDep,
-                          nsPrintfCString("bad t-prop unit %d",
-                                          transProp->GetUnit()).get());
+        MOZ_ASSERT(transProp->GetUnit() == eCSSUnit_List ||
+                   transProp->GetUnit() == eCSSUnit_ListDep,
+                   "bad t-prop unit");
         const nsCSSValueList* pro = transProp->GetListValue();
         for (;;) {
           pro->mValue.AppendToString(eCSSProperty_transition_property,
@@ -829,10 +824,9 @@
 
       for (uint32_t i = 0; i < numProps; ++i) {
         values[i] = data->ValueFor(subprops[i]);
-        NS_ABORT_IF_FALSE(values[i]->GetUnit() == eCSSUnit_List ||
-                          values[i]->GetUnit() == eCSSUnit_ListDep,
-                          nsPrintfCString("bad a-duration unit %d",
-                                          values[i]->GetUnit()).get());
+        MOZ_ASSERT(values[i]->GetUnit() == eCSSUnit_List ||
+                   values[i]->GetUnit() == eCSSUnit_ListDep,
+                   "bad a-duration unit");
         lists[i] = values[i]->GetListValue();
       }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/generate-stylestructlist.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/generate-stylestructlist.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/generate-stylestructlist.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/generate-stylestructlist.py	2015-02-28 15:03:03.000000000 +0000
@@ -37,6 +37,8 @@
 # closer to one power of two than the next higher one -- the average number of
 # comparisons can be reduced by splitting the top level check into more than 2.
 
+from __future__ import print_function
+
 import math
 
 NORMAL_DEP = ["Variables"]
@@ -106,49 +108,49 @@
             break
     else:
         import sys
-        print >>sys.stderr, "ERROR: Cannot resolve style struct dependencies"
-        print >>sys.stderr, "Resolved items:", " ".join(resolved_items)
+        print("ERROR: Cannot resolve style struct dependencies", file=sys.stderr)
+        print("Resolved items:", " ".join(resolved_items), file=sys.stderr)
         unsolved_items = [name for _, name, _, _ in STYLE_STRUCTS
                           if name not in resolved_items]
-        print >>sys.stderr, "There exist cyclic dependencies between " +\
-                            "the following structs:", " ".join(unsolved_items)
+        print("There exist cyclic dependencies between " +
+                  "the following structs:", " ".join(unsolved_items), file=sys.stderr)
         exit(1)
 
 def nextPowerOf2(x):
     return int(pow(2, math.ceil(math.log(x, 2))))
 
-def printEntry(i):
-    print "STYLE_STRUCT_%s(%s, %s)" % STYLE_STRUCTS[i][:3]
+def printEntry(header, i):
+    print("STYLE_STRUCT_%s(%s, %s)" % STYLE_STRUCTS[i][:3], file=header)
     for dep in STYLE_STRUCTS[i][3]:
-        print "STYLE_STRUCT_DEP(%s)" % (dep,)
-    print "STYLE_STRUCT_END()"
+        print("STYLE_STRUCT_DEP(%s)" % (dep,), file=header)
+    print("STYLE_STRUCT_END()", file=header)
 
-def printTestTree(min, max, depth, branches):
+def printTestTree(header, min, max, depth, branches):
     indent = "  " * depth
     if min == count - 1 and max >= count:
-        print "  STYLE_STRUCT_TEST_CODE(%sNS_ASSERTION(STYLE_STRUCT_TEST == %d, \"out of range\");)" % (indent, min)
-        printEntry(min)
+        print("  STYLE_STRUCT_TEST_CODE(%sNS_ASSERTION(STYLE_STRUCT_TEST == %d, \"out of range\");)" % (indent, min), file=header)
+        printEntry(header, min)
     elif max - min == 2:
-        print "  STYLE_STRUCT_TEST_CODE(%sif (STYLE_STRUCT_TEST == %d) {)" % (indent, min)
-        printEntry(min)
-        print "  STYLE_STRUCT_TEST_CODE(%s} else {)" % indent
-        printEntry(min + 1)
-        print "  STYLE_STRUCT_TEST_CODE(%s})" % indent
+        print("  STYLE_STRUCT_TEST_CODE(%sif (STYLE_STRUCT_TEST == %d) {)" % (indent, min), file=header)
+        printEntry(header, min)
+        print("  STYLE_STRUCT_TEST_CODE(%s} else {)" % indent, file=header)
+        printEntry(header, min + 1)
+        print("  STYLE_STRUCT_TEST_CODE(%s})" % indent, file=header)
     elif min < count:
         mid = min + (max - min) / branches
-        print "  STYLE_STRUCT_TEST_CODE(%sif (STYLE_STRUCT_TEST < %d) {)" % (indent, mid)
-        printTestTree(min, mid, depth + 1, 2)
+        print("  STYLE_STRUCT_TEST_CODE(%sif (STYLE_STRUCT_TEST < %d) {)" % (indent, mid), file=header)
+        printTestTree(header, min, mid, depth + 1, 2)
         for branch in range(1, branches):
             lo = min + branch * (max - min) / branches
             hi = min + (branch + 1) * (max - min) / branches
             if lo >= count:
                 break
             if branch == branches - 1 or hi >= count:
-                print "  STYLE_STRUCT_TEST_CODE(%s} else {)" % indent
+                print("  STYLE_STRUCT_TEST_CODE(%s} else {)" % indent, file=header)
             else:
-                print "  STYLE_STRUCT_TEST_CODE(%s} else if (STYLE_STRUCT_TEST < %d) {)" % (indent, hi)
-            printTestTree(lo, hi, depth + 1, 2)
-        print "  STYLE_STRUCT_TEST_CODE(%s})" % indent
+                print("  STYLE_STRUCT_TEST_CODE(%s} else if (STYLE_STRUCT_TEST < %d) {)" % (indent, hi), file=header)
+            printTestTree(header, lo, hi, depth + 1, 2)
+        print("  STYLE_STRUCT_TEST_CODE(%s})" % indent, file=header)
 
 HEADER = """/* THIS FILE IS AUTOGENERATED BY generate-stylestructlist.py - DO NOT EDIT */
 
@@ -223,6 +225,7 @@
 #undef STYLE_STRUCT_TEST_CODE
 """
 
-print HEADER
-printTestTree(0, nextPowerOf2(count), 0, TOPLEVELBRANCHES)
-print FOOTER
+def main(header):
+    print(HEADER, file=header)
+    printTestTree(header, 0, nextPowerOf2(count), 0, TOPLEVELBRANCHES)
+    print(FOOTER, file=header)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/Makefile.in	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/Makefile.in	2015-02-28 15:03:03.000000000 +0000
@@ -6,12 +6,3 @@
 structlist_FILES := nsStyleStructList.h
 structlist_DEST = $(DIST)/include
 structlist_TARGET := export
-
-include $(topsrcdir)/config/rules.mk
-
-nsStyleStructList.h : $(srcdir)/generate-stylestructlist.py
-	$(PYTHON) $< > $@
-
-GARBAGE	+= \
-	nsStyleStructList.h \
-	$(NULL)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/moz.build	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/moz.build	2015-02-28 15:03:03.000000000 +0000
@@ -7,6 +7,12 @@
 DIRS += ['xbl-marquee']
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'nsICSSUnprefixingService.idl',
+]
+
+XPIDL_MODULE = 'layout_base'
+
 EXPORTS += [
     'AnimationCommon.h',
     'CounterStyleManager.h',
@@ -147,6 +153,11 @@
     'nsCSSRuleProcessor.cpp',
 ]
 
+EXTRA_COMPONENTS += [
+    'CSSUnprefixingService.js',
+    'CSSUnprefixingService.manifest',
+]
+
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
@@ -175,6 +186,10 @@
     'TopLevelVideoDocument.css',
 ]
 
+GENERATED_FILES += ['nsStyleStructList.h']
+style_struct_list = GENERATED_FILES['nsStyleStructList.h']
+style_struct_list.script = 'generate-stylestructlist.py'
+
 if CONFIG['GNU_CC']:
     CFLAGS += ['-Wshadow']
     CXXFLAGS += ['-Wshadow']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsAnimationManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsAnimationManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsAnimationManager.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsAnimationManager.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -95,67 +95,84 @@
 
   ComputedTiming computedTiming = mSource->GetComputedTiming();
 
+  if (computedTiming.mPhase == ComputedTiming::AnimationPhase_Null) {
+    return; // do nothing
+  }
+
+  // Note that script can change the start time, so we have to handle moving
+  // backwards through the animation as well as forwards. An 'animationstart'
+  // is dispatched if we enter the active phase (regardless if that is from
+  // before or after the animation's active phase). An 'animationend' is
+  // dispatched if we leave the active phase (regardless if that is to before
+  // or after the animation's active phase).
+
+  bool wasActive = mPreviousPhaseOrIteration != PREVIOUS_PHASE_BEFORE &&
+                   mPreviousPhaseOrIteration != PREVIOUS_PHASE_AFTER;
+  bool isActive =
+         computedTiming.mPhase == ComputedTiming::AnimationPhase_Active;
+  bool isSameIteration =
+         computedTiming.mCurrentIteration == mPreviousPhaseOrIteration;
+  bool skippedActivePhase =
+    (mPreviousPhaseOrIteration == PREVIOUS_PHASE_BEFORE &&
+     computedTiming.mPhase == ComputedTiming::AnimationPhase_After) ||
+    (mPreviousPhaseOrIteration == PREVIOUS_PHASE_AFTER &&
+     computedTiming.mPhase == ComputedTiming::AnimationPhase_Before);
+
+  MOZ_ASSERT(!skippedActivePhase || (!isActive && !wasActive),
+             "skippedActivePhase only makes sense if we were & are inactive");
+
+  if (computedTiming.mPhase == ComputedTiming::AnimationPhase_Before) {
+    mPreviousPhaseOrIteration = PREVIOUS_PHASE_BEFORE;
+  } else if (computedTiming.mPhase == ComputedTiming::AnimationPhase_Active) {
+    mPreviousPhaseOrIteration = computedTiming.mCurrentIteration;
+  } else if (computedTiming.mPhase == ComputedTiming::AnimationPhase_After) {
+    mPreviousPhaseOrIteration = PREVIOUS_PHASE_AFTER;
+  }
+
   dom::Element* target;
   nsCSSPseudoElements::Type targetPseudoType;
   mSource->GetTarget(target, targetPseudoType);
 
-  switch (computedTiming.mPhase) {
-    case ComputedTiming::AnimationPhase_Null:
-    case ComputedTiming::AnimationPhase_Before:
-      // Do nothing
-      break;
-
-    case ComputedTiming::AnimationPhase_Active:
-      // Dispatch 'animationstart' or 'animationiteration' when needed.
-      if (computedTiming.mCurrentIteration != mLastNotification) {
-        // Notify 'animationstart' even if a negative delay puts us
-        // past the first iteration.
-        // Note that when somebody changes the animation-duration
-        // dynamically, this will fire an extra iteration event
-        // immediately in many cases.  It's not clear to me if that's the
-        // right thing to do.
-        uint32_t message = mLastNotification == LAST_NOTIFICATION_NONE
-                           ? NS_ANIMATION_START
-                           : NS_ANIMATION_ITERATION;
-        mLastNotification = computedTiming.mCurrentIteration;
-        TimeDuration iterationStart =
-          mSource->Timing().mIterationDuration *
-          computedTiming.mCurrentIteration;
-        TimeDuration elapsedTime =
-          std::max(iterationStart, mSource->InitialAdvance());
-        AnimationEventInfo ei(target, Name(), message,
-                              StickyTimeDuration(elapsedTime),
-                              PseudoTypeAsString(targetPseudoType));
-        aEventsToDispatch.AppendElement(ei);
-      }
-      break;
-
-    case ComputedTiming::AnimationPhase_After:
-      // If we skipped the animation interval entirely, dispatch
-      // 'animationstart' first
-      if (mLastNotification == LAST_NOTIFICATION_NONE) {
-        // Notifying for start of 0th iteration.
-        // (This is overwritten below but we set it here to maintain
-        // internal consistency.)
-        mLastNotification = 0;
-        StickyTimeDuration elapsedTime =
-          std::min(StickyTimeDuration(mSource->InitialAdvance()),
-                   computedTiming.mActiveDuration);
-        AnimationEventInfo ei(target, Name(), NS_ANIMATION_START,
-                              elapsedTime,
-                              PseudoTypeAsString(targetPseudoType));
-        aEventsToDispatch.AppendElement(ei);
-      }
-      // Dispatch 'animationend' when needed.
-      if (mLastNotification != LAST_NOTIFICATION_END) {
-        mLastNotification = LAST_NOTIFICATION_END;
-        AnimationEventInfo ei(target, Name(), NS_ANIMATION_END,
-                              computedTiming.mActiveDuration,
-                              PseudoTypeAsString(targetPseudoType));
-        aEventsToDispatch.AppendElement(ei);
-      }
-      break;
+  uint32_t message;
+
+  if (!wasActive && isActive) {
+    message = NS_ANIMATION_START;
+  } else if (wasActive && !isActive) {
+    message = NS_ANIMATION_END;
+  } else if (wasActive && isActive && !isSameIteration) {
+    message = NS_ANIMATION_ITERATION;
+  } else if (skippedActivePhase) {
+    // First notifying for start of 0th iteration by appending an
+    // 'animationstart':
+    StickyTimeDuration elapsedTime =
+      std::min(StickyTimeDuration(mSource->InitialAdvance()),
+               computedTiming.mActiveDuration);
+    AnimationEventInfo ei(target, Name(), NS_ANIMATION_START,
+                          elapsedTime,
+                          PseudoTypeAsString(targetPseudoType));
+    aEventsToDispatch.AppendElement(ei);
+    // Then have the shared code below append an 'animationend':
+    message = NS_ANIMATION_END;
+  } else {
+    return; // No events need to be sent
   }
+
+  StickyTimeDuration elapsedTime;
+
+  if (message == NS_ANIMATION_START ||
+      message == NS_ANIMATION_ITERATION) {
+    TimeDuration iterationStart = mSource->Timing().mIterationDuration *
+                                    computedTiming.mCurrentIteration;
+    elapsedTime = StickyTimeDuration(std::max(iterationStart,
+                                              mSource->InitialAdvance()));
+  } else {
+    MOZ_ASSERT(message == NS_ANIMATION_END);
+    elapsedTime = computedTiming.mActiveDuration;
+  }
+
+  AnimationEventInfo ei(target, Name(), message, elapsedTime,
+                        PseudoTypeAsString(targetPseudoType));
+  aEventsToDispatch.AppendElement(ei);
 }
 
 CommonAnimationManager*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsAnimationManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsAnimationManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsAnimationManager.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsAnimationManager.h	2015-02-28 15:03:03.000000000 +0000
@@ -59,7 +59,7 @@
     : dom::AnimationPlayer(aTimeline)
     , mIsStylePaused(false)
     , mPauseShouldStick(false)
-    , mLastNotification(LAST_NOTIFICATION_NONE)
+    , mPreviousPhaseOrIteration(PREVIOUS_PHASE_BEFORE)
   {
   }
 
@@ -139,12 +139,12 @@
   bool mPauseShouldStick;
 
   enum {
-    LAST_NOTIFICATION_NONE = uint64_t(-1),
-    LAST_NOTIFICATION_END = uint64_t(-2)
+    PREVIOUS_PHASE_BEFORE = uint64_t(-1),
+    PREVIOUS_PHASE_AFTER = uint64_t(-2)
   };
-  // One of the LAST_NOTIFICATION_* constants, or an integer for the iteration
+  // One of the PREVIOUS_PHASE_* constants, or an integer for the iteration
   // whose start we last notified on.
-  uint64_t mLastNotification;
+  uint64_t mPreviousPhaseOrIteration;
 };
 
 } /* namespace mozilla */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSParser.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSParser.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSParser.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSParser.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -38,6 +38,7 @@
 #include "nsIMediaList.h"
 #include "nsStyleUtil.h"
 #include "nsIPrincipal.h"
+#include "nsICSSUnprefixingService.h"
 #include "prprf.h"
 #include "nsContentUtils.h"
 #include "nsAutoPtr.h"
@@ -54,6 +55,10 @@
 
 typedef nsCSSProps::KTableValue KTableValue;
 
+// pref-backed bool values (hooked up in nsCSSParser::Startup)
+static bool sOpentypeSVGEnabled;
+static bool sUnprefixingServiceEnabled;
+
 const uint32_t
 nsCSSProps::kParserVariantTable[eCSSProperty_COUNT_no_shorthands] = {
 #define CSS_PROP(name_, id_, method_, flags_, pref_, parsevariant_, kwtable_, \
@@ -413,6 +418,103 @@
                    nsIURI* aSheetURI, nsIURI* aBaseURI,
                    nsIPrincipal* aSheetPrincipal);
   void ReleaseScanner(void);
+
+  /**
+   * This is a RAII class which behaves like an "AutoRestore<>" for our parser
+   * input state. When instantiated, this class saves the current parser input
+   * state (in a CSSParserInputState object), and it restores the parser to
+   * that state when destructed, unless "DoNotRestore()" has been called.
+  */
+  class MOZ_STACK_CLASS nsAutoCSSParserInputStateRestorer {
+    public:
+      explicit nsAutoCSSParserInputStateRestorer(CSSParserImpl* aParser
+                                                 MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+        : mParser(aParser),
+          mShouldRestore(true)
+      {
+        MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+        mParser->SaveInputState(mSavedState);
+      }
+
+      void DoNotRestore()
+      {
+        mShouldRestore = false;
+      }
+
+      ~nsAutoCSSParserInputStateRestorer()
+      {
+        if (mShouldRestore) {
+          mParser->RestoreSavedInputState(mSavedState);
+        }
+      }
+
+    private:
+      MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+      CSSParserImpl* mParser;
+      CSSParserInputState mSavedState;
+      bool mShouldRestore;
+  };
+
+  /**
+   * This is a RAII class which creates a temporary nsCSSScanner for the given
+   * string, and reconfigures aParser to use *that* scanner instead of its
+   * existing scanner, until we go out of scope.  (This allows us to rewrite
+   * a portion of a stylesheet using a temporary string, and switch to parsing
+   * that rewritten section, and then resume parsing the original stylesheet.)
+   *
+   * aParser must have a non-null nsCSSScanner (which we'll be temporarily
+   * replacing) and ErrorReporter (which this class will co-opt for the
+   * temporary parser). While we're in scope, we also suppress error reporting,
+   * so it doesn't really matter which reporter we use. We suppress reporting
+   * because this class is only used with CSS that is synthesized & didn't
+   * come directly from an author, and it would be confusing if we reported
+   * syntax errors for CSS that an author didn't provide.
+   *
+   * XXXdholbert we could also change this & report errors, if needed. Might
+   * want to customize the error reporting somehow though.
+   */
+  class MOZ_STACK_CLASS nsAutoScannerChanger {
+    public:
+      nsAutoScannerChanger(CSSParserImpl* aParser,
+                           const nsAString& aStringToScan
+                           MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+        : mParser(aParser),
+          mOriginalScanner(aParser->mScanner),
+          mStringScanner(aStringToScan, 0),
+          mParserStateRestorer(aParser),
+          mErrorSuppresser(aParser)
+      {
+        MOZ_ASSERT(mOriginalScanner,
+                   "Shouldn't use nsAutoScannerChanger unless we already "
+                   "have a scanner");
+        MOZ_GUARD_OBJECT_NOTIFIER_INIT;
+
+        // Set & setup the new scanner:
+        mParser->mScanner = &mStringScanner;
+        mStringScanner.SetErrorReporter(mParser->mReporter);
+
+        // We might've had push-back on our original scanner (and if we did,
+        // that fact is saved via mParserStateRestorer).  But we don't have
+        // push-back in mStringScanner, so clear that flag.
+        mParser->mHavePushBack = false;
+      }
+
+      ~nsAutoScannerChanger()
+      {
+        // Restore original scanner. All other cleanup is done by RAII members.
+        mParser->mScanner = mOriginalScanner;
+      }
+
+    private:
+      MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
+      CSSParserImpl* mParser;
+      nsCSSScanner *mOriginalScanner;
+      nsCSSScanner mStringScanner;
+      nsAutoCSSParserInputStateRestorer mParserStateRestorer;
+      nsAutoSuppressErrors mErrorSuppresser;
+  };
+
+
   bool IsSVGMode() const {
     return mScanner->IsSVGMode();
   }
@@ -602,8 +704,10 @@
   bool ParseSelector(nsCSSSelectorList* aList, char16_t aPrevCombinator);
 
   enum {
-    eParseDeclaration_InBraces       = 1 << 0,
-    eParseDeclaration_AllowImportant = 1 << 1
+    eParseDeclaration_InBraces           = 1 << 0,
+    eParseDeclaration_AllowImportant     = 1 << 1,
+    // The declaration we're parsing was generated by the CSSUnprefixingService:
+    eParseDeclaration_FromUnprefixingSvc = 1 << 2
   };
   enum nsCSSContextType {
     eCSSContext_General,
@@ -618,6 +722,21 @@
                         bool* aChanged,
                         nsCSSContextType aContext = eCSSContext_General);
 
+  // A "prefix-aware" wrapper for nsCSSKeywords::LookupKeyword().
+  // Use this instead of LookupKeyword() if you might be parsing an unprefixed
+  // property (like "display") for which we emulate a vendor-prefixed value
+  // (like "-webkit-box").
+  nsCSSKeyword LookupKeywordPrefixAware(nsAString& aKeywordStr,
+                                        const KTableValue aKeywordTable[]);
+
+  bool ShouldUseUnprefixingService();
+  bool ParsePropertyWithUnprefixingService(const nsAString& aPropertyName,
+                                           css::Declaration* aDeclaration,
+                                           uint32_t aFlags,
+                                           bool aMustCallValueAppended,
+                                           bool* aChanged,
+                                           nsCSSContextType aContext);
+
   bool ParseProperty(nsCSSProperty aPropID);
   bool ParsePropertyByFunction(nsCSSProperty aPropID);
   bool ParseSingleValueProperty(nsCSSValue& aValue,
@@ -1083,6 +1202,12 @@
   // @supports rule.
   bool mSuppressErrors : 1;
 
+  // True if we've parsed "display: -webkit-box" as "display: flex" in an
+  // earlier declaration within the current block of declarations, as part of
+  // emulating support for certain -webkit-prefixed properties on certain
+  // sites.
+  bool mDidUnprefixWebkitBoxInEarlierDecl; // not :1 so we can use AutoRestore
+
   // Stack of rule groups; used for @media and such.
   InfallibleTArray<nsRefPtr<css::GroupRule> > mGroupStack;
 
@@ -1159,6 +1284,7 @@
     mInSupportsCondition(false),
     mInFailingSupportsRule(false),
     mSuppressErrors(false),
+    mDidUnprefixWebkitBoxInEarlierDecl(false),
     mNextFree(nullptr)
 {
 }
@@ -1387,6 +1513,10 @@
   css::ErrorReporter reporter(scanner, mSheet, mChildLoader, aSheetURI);
   InitScanner(scanner, reporter, aSheetURI, aBaseURI, aSheetPrincipal);
 
+  MOZ_ASSERT(!mDidUnprefixWebkitBoxInEarlierDecl,
+             "Someone forgot to clear the 'did unprefix webkit-box' flag");
+  AutoRestore<bool> autoRestore(mDidUnprefixWebkitBoxInEarlierDecl);
+
   mSection = eCSSSection_General;
 
   mData.AssertInitialState();
@@ -6031,6 +6161,10 @@
 {
   bool checkForBraces = (aFlags & eParseDeclaration_InBraces) != 0;
 
+  MOZ_ASSERT(!mDidUnprefixWebkitBoxInEarlierDecl,
+             "Someone forgot to clear the 'did unprefix webkit-box' flag");
+  AutoRestore<bool> restorer(mDidUnprefixWebkitBoxInEarlierDecl);
+
   if (checkForBraces) {
     if (!ExpectSymbol('{', true)) {
       REPORT_UNEXPECTED_TOKEN(PEBadDeclBlockStart);
@@ -6438,6 +6572,108 @@
 }
 #endif
 
+nsCSSKeyword
+CSSParserImpl::LookupKeywordPrefixAware(nsAString& aKeywordStr,
+                                        const KTableValue aKeywordTable[])
+{
+  nsCSSKeyword keyword = nsCSSKeywords::LookupKeyword(aKeywordStr);
+
+  if (aKeywordTable == nsCSSProps::kDisplayKTable) {
+    if (keyword == eCSSKeyword_UNKNOWN &&
+        ShouldUseUnprefixingService() &&
+        aKeywordStr.EqualsLiteral("-webkit-box")) {
+      // Treat "display: -webkit-box" as "display: flex". In simple scenarios,
+      // they largely behave the same, as long as we use the CSS Unprefixing
+      // Service to also translate the associated properties.
+      mDidUnprefixWebkitBoxInEarlierDecl = true;
+      return eCSSKeyword_flex;
+    }
+
+    // If we've seen "display: -webkit-box" in an earlier declaration and we
+    // tried to unprefix it to emulate support for it, then we have to watch
+    // out for later "display: -moz-box" declarations; they're likely just a
+    // halfhearted attempt at compatibility, and they actually end up stomping
+    // on our emulation of the earlier -webkit-box display-value, via the CSS
+    // cascade. To prevent this problem, we also treat "display: -moz-box" as
+    // "display: flex" (but only if we unprefixed an earlier "-webkit-box").
+    if (mDidUnprefixWebkitBoxInEarlierDecl && keyword == eCSSKeyword__moz_box) {
+      MOZ_ASSERT(ShouldUseUnprefixingService(),
+                 "mDidUnprefixWebkitBoxInEarlierDecl should only be set if "
+                 "we're using the unprefixing service on this site");
+      return eCSSKeyword_flex;
+    }
+  }
+
+  return keyword;
+}
+
+bool
+CSSParserImpl::ShouldUseUnprefixingService()
+{
+  if (!sUnprefixingServiceEnabled) {
+    return false;
+  }
+
+  // XXXdholbert Bug 1132743: Check if stylesheet URI is on fixlist here.
+  return true;
+}
+
+bool
+CSSParserImpl::ParsePropertyWithUnprefixingService(
+  const nsAString& aPropertyName,
+  css::Declaration* aDeclaration,
+  uint32_t aFlags,
+  bool aMustCallValueAppended,
+  bool* aChanged,
+  nsCSSContextType aContext)
+{
+  MOZ_ASSERT(ShouldUseUnprefixingService(),
+             "Caller should've checked ShouldUseUnprefixingService()");
+
+  nsCOMPtr<nsICSSUnprefixingService> unprefixingSvc =
+    do_GetService(NS_CSSUNPREFIXINGSERVICE_CONTRACTID);
+  NS_ENSURE_TRUE(unprefixingSvc, false);
+
+  // Save the state so we can jump back to this spot if our unprefixing fails
+  // (so we can behave as if we didn't even try to unprefix).
+  nsAutoCSSParserInputStateRestorer parserStateBeforeTryingToUnprefix(this);
+
+  // Caller has already parsed the first half of the declaration --
+  // aPropertyName and the ":".  Now, we record the rest of the CSS declaration
+  // (the part after ':') into rightHalfOfDecl.  (This is the property value,
+  // plus anything else up to the end of the declaration -- maybe "!important",
+  // maybe trailing junk characters, maybe a semicolon, maybe a trailing "}".)
+  bool checkForBraces = (aFlags & eParseDeclaration_InBraces) != 0;
+  nsAutoString rightHalfOfDecl;
+  mScanner->StartRecording();
+  SkipDeclaration(checkForBraces);
+  mScanner->StopRecording(rightHalfOfDecl);
+
+  // Try to unprefix:
+  bool success;
+  nsAutoString unprefixedDecl;
+  nsresult rv =
+    unprefixingSvc->GenerateUnprefixedDeclaration(aPropertyName,
+                                                  rightHalfOfDecl,
+                                                  unprefixedDecl, &success);
+  if (NS_FAILED(rv) || !success) {
+    return false;
+  }
+
+  // Attempt to parse the unprefixed declaration:
+  nsAutoScannerChanger scannerChanger(this, unprefixedDecl);
+  success = ParseDeclaration(aDeclaration,
+                             aFlags | eParseDeclaration_FromUnprefixingSvc,
+                             aMustCallValueAppended, aChanged, aContext);
+  if (success) {
+    // We succeeded, so we'll leave the parser pointing at the end of
+    // the declaration; don't restore it to the pre-recording position.
+    parserStateBeforeTryingToUnprefix.DoNotRestore();
+  }
+
+  return success;
+}
+
 //----------------------------------------------------------------------
 
 bool
@@ -6527,7 +6763,19 @@
         (aContext == eCSSContext_Page &&
          !nsCSSProps::PropHasFlags(propID,
                                    CSS_PROPERTY_APPLIES_TO_PAGE_RULE))) { // unknown property
-      if (!NonMozillaVendorIdentifier(propertyName)) {
+      if (NonMozillaVendorIdentifier(propertyName)) {
+        if (!mInSupportsCondition &&
+            aContext == eCSSContext_General &&
+            !(aFlags & eParseDeclaration_FromUnprefixingSvc) && // no recursion
+            ShouldUseUnprefixingService()) {
+          if (ParsePropertyWithUnprefixingService(propertyName,
+                                                  aDeclaration, aFlags,
+                                                  aMustCallValueAppended,
+                                                  aChanged, aContext)) {
+            return true;
+          }
+        }
+      } else {
         REPORT_UNEXPECTED_P(PEUnknownProperty, propertyName);
         REPORT_UNEXPECTED(PEDeclDropped);
         OUTPUT_ERROR();
@@ -6898,7 +7146,9 @@
   nsCSSToken* tk = &mToken;
   if (((aVariantMask & (VARIANT_AHK | VARIANT_NORMAL | VARIANT_NONE | VARIANT_ALL)) != 0) &&
       (eCSSToken_Ident == tk->mType)) {
-    nsCSSKeyword keyword = nsCSSKeywords::LookupKeyword(tk->mIdent);
+    nsCSSKeyword keyword = LookupKeywordPrefixAware(tk->mIdent,
+                                                    aKeywordTable);
+
     if (eCSSKeyword_UNKNOWN < keyword) { // known keyword
       if ((aVariantMask & VARIANT_AUTO) != 0) {
         if (eCSSKeyword_auto == keyword) {
@@ -6953,13 +7203,6 @@
         }
       }
       if ((aVariantMask & VARIANT_OPENTYPE_SVG_KEYWORD) != 0) {
-        static bool sOpentypeSVGEnabled;
-        static bool sOpentypeSVGEnabledCached = false;
-        if (!sOpentypeSVGEnabledCached) {
-          sOpentypeSVGEnabledCached = true;
-          Preferences::AddBoolVarCache(&sOpentypeSVGEnabled,
-                                       "gfx.font_rendering.opentype_svg.enabled");
-        }
         if (sOpentypeSVGEnabled) {
           aVariantMask |= VARIANT_KEYWORD;
         }
@@ -15059,6 +15302,15 @@
 
 static CSSParserImpl* gFreeList = nullptr;
 
+/* static */ void
+nsCSSParser::Startup()
+{
+  Preferences::AddBoolVarCache(&sOpentypeSVGEnabled,
+                               "gfx.font_rendering.opentype_svg.enabled");
+  Preferences::AddBoolVarCache(&sUnprefixingServiceEnabled,
+                               "layout.css.unprefixing-service.enabled");
+}
+
 nsCSSParser::nsCSSParser(mozilla::css::Loader* aLoader,
                          CSSStyleSheet* aSheet)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSParser.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSParser.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSParser.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSParser.h	2015-02-28 15:03:03.000000000 +0000
@@ -45,6 +45,7 @@
                        mozilla::CSSStyleSheet* aSheet = nullptr);
   ~nsCSSParser();
 
+  static void Startup();
   static void Shutdown();
 
 private:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSRuleProcessor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSRuleProcessor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSRuleProcessor.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSRuleProcessor.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -1101,13 +1101,11 @@
   mSheets.Clear();
 }
 
-/* static */ nsresult
+/* static */ void
 nsCSSRuleProcessor::Startup()
 {
   Preferences::AddBoolVarCache(&gSupportVisitedPseudo, VISITED_PSEUDO_PREF,
                                true);
-
-  return NS_OK;
 }
 
 static bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSRuleProcessor.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSRuleProcessor.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSRuleProcessor.h	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSRuleProcessor.h	2015-02-28 15:03:03.000000000 +0000
@@ -65,7 +65,7 @@
 public:
   nsresult ClearRuleCascades();
 
-  static nsresult Startup();
+  static void Startup();
   static void Shutdown();
   static void FreeSystemMetrics();
   static bool HasSystemMetric(nsIAtom* aMetric);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSValue.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSValue.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsCSSValue.cpp	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsCSSValue.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -1545,7 +1545,12 @@
         aProperty == eCSSProperty__x_system_font) {
       // We treat serialization of aliases like '-moz-transform' as a special
       // case, since it really wants to be serialized as if it were a longhand
-      // even though it is implemented as a shorthand.
+      // even though it is implemented as a shorthand. We also need to
+      // serialize -x-system-font's token stream value, even though the
+      // value is set through the font shorthand.  This serialization
+      // of -x-system-font is needed when we need to output the
+      // 'font' shorthand followed by a number of overriding font
+      // longhand components.
       aResult.Append(mValue.mTokenStream->mTokenStream);
     }
   } else if (eCSSUnit_Pair == unit) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsICSSUnprefixingService.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsICSSUnprefixingService.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsICSSUnprefixingService.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsICSSUnprefixingService.idl	2015-02-28 15:03:03.000000000 +0000
@@ -0,0 +1,48 @@
+/* -*- 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/. */
+
+/* interface for a service that converts certain vendor-prefixed CSS properties
+   to their unprefixed equivalents */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(927a5c60-0378-4bcb-a50d-99e6d1fe6063)]
+interface nsICSSUnprefixingService : nsISupports
+{
+  /**
+   * This function helps to convert unsupported vendor-prefixed CSS into
+   * supported unprefixed CSS. Given a vendor-prefixed property name and a
+   * value (or e.g. value + trailing junk like " !important;}"), this function
+   * will attempt to produce an equivalent CSS declaration that uses a
+   * supported unprefixed CSS property.
+   *
+   * @param   aPropName
+   *          The vendor-prefixed property name.
+   *
+   * @param   aRightHalfOfDecl
+   *          Everything after the ":" in the CSS declaration. This includes
+   *          the property's value, along with possibly some leading whitespace
+   *          and trailing text like "!important", and possibly a ';' and/or
+   *          '}' (along with any other bogus text the author happens to
+   *          include before those, which will probably make the decl invalid).
+   *
+   * @param   aUnprefixedDecl[out]
+   *          The resulting unprefixed declaration, if we return true.
+   *
+   * @return true if we were able to unprefix -- i.e. if we were able to
+   *         convert the property to a known unprefixed equivalent, and we also
+   *         performed any known-to-be-necessary fixup on the value, and we put
+   *         the result in aUnprefixedDecl.
+   *         Otherwise, this function returns false.
+   */
+  boolean generateUnprefixedDeclaration(in AString aPropName,
+                                        in AString aRightHalfOfDecl,
+                                        out AString aUnprefixedDecl);
+};
+
+%{C++
+#define NS_CSSUNPREFIXINGSERVICE_CONTRACTID \
+    "@mozilla.org/css-unprefixing-service;1"
+%}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsLayoutStylesheetCache.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsLayoutStylesheetCache.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsLayoutStylesheetCache.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsLayoutStylesheetCache.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -90,7 +90,7 @@
 
   if (!gStyleCache->mNumberControlSheet) {
     LoadSheetURL("resource://gre-resources/number-control.css",
-                 gStyleCache->mNumberControlSheet, false);
+                 gStyleCache->mNumberControlSheet, true);
   }
 
   return gStyleCache->mNumberControlSheet;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsRuleNode.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsRuleNode.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsRuleNode.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsRuleNode.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -4539,10 +4539,8 @@
     else {
       // The parser will never create a list that is *all* URL values --
       // that's invalid.
-      NS_ABORT_IF_FALSE(cursorUnit == eCSSUnit_List ||
-                        cursorUnit == eCSSUnit_ListDep,
-                        nsPrintfCString("unrecognized cursor unit %d",
-                                        cursorUnit).get());
+      MOZ_ASSERT(cursorUnit == eCSSUnit_List || cursorUnit == eCSSUnit_ListDep,
+                 "unrecognized cursor unit");
       const nsCSSValueList* list = cursorValue->GetListValue();
       const nsCSSValueList* list2 = list;
       nsIDocument* doc = aContext->PresContext()->Document();
@@ -4958,9 +4956,8 @@
           transition->SetProperty(prop);
         }
       } else {
-        NS_ABORT_IF_FALSE(val.GetUnit() == eCSSUnit_All,
-                          nsPrintfCString("Invalid transition property unit %d",
-                                          val.GetUnit()).get());
+        MOZ_ASSERT(val.GetUnit() == eCSSUnit_All,
+                   "Invalid transition property unit");
         transition->SetProperty(eCSSPropertyExtra_all_properties);
       }
     }
@@ -5111,9 +5108,7 @@
           break;
         }
         default:
-          NS_ABORT_IF_FALSE(false,
-                            nsPrintfCString("Invalid animation-name unit %d",
-                                            animName.list->mValue.GetUnit()).get());
+          MOZ_ASSERT(false, "Invalid animation-name unit");
       }
     }
 
@@ -5148,10 +5143,8 @@
                animDirection.unit == eCSSUnit_Unset) {
       animation->SetDirection(NS_STYLE_ANIMATION_DIRECTION_NORMAL);
     } else if (animDirection.list) {
-      NS_ABORT_IF_FALSE(animDirection.list->mValue.GetUnit() ==
-                          eCSSUnit_Enumerated,
-                        nsPrintfCString("Invalid animation-direction unit %d",
-                                        animDirection.list->mValue.GetUnit()).get());
+      MOZ_ASSERT(animDirection.list->mValue.GetUnit() == eCSSUnit_Enumerated,
+                 "Invalid animation-direction unit");
 
       animation->SetDirection(animDirection.list->mValue.GetIntValue());
     }
@@ -5168,10 +5161,8 @@
                animFillMode.unit == eCSSUnit_Unset) {
       animation->SetFillMode(NS_STYLE_ANIMATION_FILL_MODE_NONE);
     } else if (animFillMode.list) {
-      NS_ABORT_IF_FALSE(animFillMode.list->mValue.GetUnit() ==
-                          eCSSUnit_Enumerated,
-                        nsPrintfCString("Invalid animation-fill-mode unit %d",
-                                        animFillMode.list->mValue.GetUnit()).get());
+      MOZ_ASSERT(animFillMode.list->mValue.GetUnit() == eCSSUnit_Enumerated,
+                 "Invalid animation-fill-mode unit");
 
       animation->SetFillMode(animFillMode.list->mValue.GetIntValue());
     }
@@ -5188,10 +5179,8 @@
                animPlayState.unit == eCSSUnit_Unset) {
       animation->SetPlayState(NS_STYLE_ANIMATION_PLAY_STATE_RUNNING);
     } else if (animPlayState.list) {
-      NS_ABORT_IF_FALSE(animPlayState.list->mValue.GetUnit() ==
-                          eCSSUnit_Enumerated,
-                        nsPrintfCString("Invalid animation-play-state unit %d",
-                                        animPlayState.list->mValue.GetUnit()).get());
+      MOZ_ASSERT(animPlayState.list->mValue.GetUnit() == eCSSUnit_Enumerated,
+                 "Invalid animation-play-state unit");
 
       animation->SetPlayState(animPlayState.list->mValue.GetIntValue());
     }
@@ -6217,9 +6206,7 @@
   }
 
   default:
-    NS_ABORT_IF_FALSE(false,
-                      nsPrintfCString("unexpected unit %d",
-                                      aValue.GetUnit()).get());
+    MOZ_ASSERT(false, "unexpected unit");
   }
 
   if (aItemCount > aMaxItemCount)
@@ -6288,9 +6275,7 @@
   }
 
   default:
-    NS_ABORT_IF_FALSE(false,
-                      nsPrintfCString("unexpected unit %d",
-                                      aValue.GetUnit()).get());
+    MOZ_ASSERT(false, "unexpected unit");
   }
 
   if (aItemCount > aMaxItemCount)
@@ -6585,9 +6570,7 @@
     break;
 
   default:
-    NS_ABORT_IF_FALSE(false,
-                      nsPrintfCString("unrecognized shadow unit %d",
-                                      boxShadowValue->GetUnit()).get());
+    MOZ_ASSERT(false, "unrecognized shadow unit");
   }
 
   // border-width, border-*-width: length, enum, inherit
@@ -7927,9 +7910,7 @@
   }
 
   default:
-    NS_ABORT_IF_FALSE(false,
-                      nsPrintfCString("unrecognized content unit %d",
-                                      contentValue->GetUnit()).get());
+    MOZ_ASSERT(false, "unrecognized content unit");
   }
 
   // counter-increment: [string [int]]+, none, inherit
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleContext.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleContext.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleContext.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleContext.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -76,6 +76,7 @@
   , mBits(((uint64_t)aPseudoType) << NS_STYLE_CONTEXT_TYPE_SHIFT)
   , mRefCnt(0)
 #ifdef DEBUG
+  , mFrameRefCnt(0)
   , mComputingStruct(nsStyleStructID_None)
 #endif
 {
@@ -436,11 +437,7 @@
     break;
 
   UNIQUE_CASE(Display)
-  UNIQUE_CASE(Background)
-  UNIQUE_CASE(Border)
-  UNIQUE_CASE(Padding)
   UNIQUE_CASE(Text)
-  UNIQUE_CASE(TextReset)
 
 #undef UNIQUE_CASE
 
@@ -455,6 +452,41 @@
   return result;
 }
 
+// This is an evil function, but less evil than GetUniqueStyleData. It
+// creates an empty style struct for this nsStyleContext.
+void*
+nsStyleContext::CreateEmptyStyleData(const nsStyleStructID& aSID)
+{
+  MOZ_ASSERT(!mChild && !mEmptyChild &&
+             !(mBits & nsCachedStyleData::GetBitForSID(aSID)) &&
+             !GetCachedStyleData(aSID),
+             "This style should not have been computed");
+
+  void* result;
+  nsPresContext* presContext = PresContext();
+  switch (aSID) {
+#define UNIQUE_CASE(c_, ...) \
+    case eStyleStruct_##c_: \
+      result = new (presContext) nsStyle##c_(__VA_ARGS__); \
+      break;
+
+  UNIQUE_CASE(Border, presContext)
+  UNIQUE_CASE(Padding)
+
+#undef UNIQUE_CASE
+
+  default:
+    NS_ERROR("Struct type not supported.");
+    return nullptr;
+  }
+
+  // The new struct is owned by this style context, but that we don't
+  // need to clear the bit in mBits because we've asserted that at the
+  // top of this function.
+  SetStyle(aSID, result);
+  return result;
+}
+
 void
 nsStyleContext::SetStyle(nsStyleStructID aSID, void* aStruct)
 {
@@ -619,25 +651,8 @@
   // Suppress border/padding of ruby level containers
   if (disp->mDisplay == NS_STYLE_DISPLAY_RUBY_BASE_CONTAINER ||
       disp->mDisplay == NS_STYLE_DISPLAY_RUBY_TEXT_CONTAINER) {
-    if (StyleBorder()->GetComputedBorder() != nsMargin(0, 0, 0, 0)) {
-      nsStyleBorder* border =
-        static_cast<nsStyleBorder*>(GetUniqueStyleData(eStyleStruct_Border));
-      NS_FOR_CSS_SIDES(side) {
-        border->SetBorderWidth(side, 0);
-      }
-    }
-
-    nsMargin computedPadding;
-    if (!StylePadding()->GetPadding(computedPadding) ||
-        computedPadding != nsMargin(0, 0, 0, 0)) {
-      const nsStyleCoord zero(0, nsStyleCoord::CoordConstructor);
-      nsStylePadding* padding =
-        static_cast<nsStylePadding*>(GetUniqueStyleData(eStyleStruct_Padding));
-      NS_FOR_CSS_SIDES(side) {
-        padding->mPadding.Set(side, zero);
-      }
-      padding->RecalcData();
-    }
+    CreateEmptyStyleData(eStyleStruct_Border);
+    CreateEmptyStyleData(eStyleStruct_Padding);
   }
 
   // Compute User Interface style, to trigger loads of cursors
@@ -1244,6 +1259,7 @@
 void
 nsStyleContext::DoClearCachedInheritedStyleDataOnDescendants(uint32_t aStructs)
 {
+  NS_ASSERTION(mFrameRefCnt == 0, "frame still referencing style context");
   for (nsStyleStructID i = nsStyleStructID_Inherited_Start;
        i < nsStyleStructID_Inherited_Start + nsStyleStructID_Inherited_Count;
        i = nsStyleStructID(i + 1)) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleContext.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleContext.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleContext.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleContext.h	2015-02-28 15:03:03.000000000 +0000
@@ -97,6 +97,20 @@
     return mRefCnt;
   }
 
+#ifdef DEBUG
+  void FrameAddRef() {
+    ++mFrameRefCnt;
+  }
+
+  void FrameRelease() {
+    --mFrameRefCnt;
+  }
+
+  uint32_t FrameRefCnt() const {
+    return mFrameRefCnt;
+  }
+#endif
+
   bool HasSingleReference() const {
     NS_ASSERTION(mRefCnt != 0,
                  "do not call HasSingleReference on a newly created "
@@ -310,8 +324,6 @@
   #include "nsStyleStructList.h"
   #undef STYLE_STRUCT
 
-  void* GetUniqueStyleData(const nsStyleStructID& aSID);
-
   /**
    * Compute the style changes needed during restyling when this style
    * context is being replaced by aOther.  (This is nonsymmetric since
@@ -421,6 +433,9 @@
   void AddChild(nsStyleContext* aChild);
   void RemoveChild(nsStyleContext* aChild);
 
+  void* GetUniqueStyleData(const nsStyleStructID& aSID);
+  void* CreateEmptyStyleData(const nsStyleStructID& aSID);
+
   void ApplyStyleFixups(bool aSkipParentDisplayBasedStyleFixup);
 
   // Helper function for HasChildThatUsesGrandancestorStyle.
@@ -551,6 +566,9 @@
   uint32_t                mRefCnt;
 
 #ifdef DEBUG
+  uint32_t                mFrameRefCnt; // number of frames that use this
+                                        // as their style context
+
   nsStyleStructID         mComputingStruct;
 
   static bool DependencyAllowed(nsStyleStructID aOuterSID,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleSet.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleSet.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleSet.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleSet.cpp	2015-02-28 15:03:03.000000000 +0000
@@ -1378,12 +1378,14 @@
   { nsStyleSet::eSVGAttrAnimationSheet, false, false, eRestyle_SVGAttrAnimations },
   { nsStyleSet::eDocSheet,              false, false, nsRestyleHint(0) },
   { nsStyleSet::eScopedDocSheet,        false, false, nsRestyleHint(0) },
-  { nsStyleSet::eStyleAttrSheet,        false, true,  eRestyle_StyleAttribute },
+  { nsStyleSet::eStyleAttrSheet,        false, true,  eRestyle_StyleAttribute |
+                                                      eRestyle_StyleAttribute_Animations },
   { nsStyleSet::eOverrideSheet,         false, false, nsRestyleHint(0) },
   { nsStyleSet::eAnimationSheet,        false, false, eRestyle_CSSAnimations },
   { nsStyleSet::eScopedDocSheet,        true,  false, nsRestyleHint(0) },
   { nsStyleSet::eDocSheet,              true,  false, nsRestyleHint(0) },
-  { nsStyleSet::eStyleAttrSheet,        true,  false, eRestyle_StyleAttribute },
+  { nsStyleSet::eStyleAttrSheet,        true,  false, eRestyle_StyleAttribute |
+                                                      eRestyle_StyleAttribute_Animations },
   { nsStyleSet::eOverrideSheet,         true,  false, nsRestyleHint(0) },
   { nsStyleSet::eUserSheet,             true,  false, nsRestyleHint(0) },
   { nsStyleSet::eAgentSheet,            true,  false, nsRestyleHint(0) },
@@ -1405,16 +1407,14 @@
                 nsCSSPseudoElements::PseudoElementSupportsUserActionState(aPseudoType))),
              "should have aPseudoElement only for certain pseudo elements");
 
-  NS_ABORT_IF_FALSE(!(aReplacements & ~(eRestyle_CSSTransitions |
-                                        eRestyle_CSSAnimations |
-                                        eRestyle_SVGAttrAnimations |
-                                        eRestyle_StyleAttribute |
-                                        eRestyle_Force |
-                                        eRestyle_ForceDescendants)),
-                    // FIXME: Once bug 979133 lands we'll have a better
-                    // way to print these.
-                    nsPrintfCString("unexpected replacement bits 0x%" PRIX32,
-                                    uint32_t(aReplacements)).get());
+  MOZ_ASSERT(!(aReplacements & ~(eRestyle_CSSTransitions |
+                                 eRestyle_CSSAnimations |
+                                 eRestyle_SVGAttrAnimations |
+                                 eRestyle_StyleAttribute |
+                                 eRestyle_StyleAttribute_Animations |
+                                 eRestyle_Force |
+                                 eRestyle_ForceDescendants)),
+             "unexpected replacement bits");
 
   // FIXME (perf): This should probably not rebuild the whole path, but
   // only the path from the last change in the rule tree, like
@@ -1452,8 +1452,8 @@
                         level->mCheckForImportantRules && doReplace);
 
     if (doReplace) {
-      switch (level->mLevelReplacementHint) {
-        case eRestyle_CSSAnimations: {
+      switch (level->mLevel) {
+        case nsStyleSet::eAnimationSheet: {
           if (aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ||
               aPseudoType == nsCSSPseudoElements::ePseudo_before ||
               aPseudoType == nsCSSPseudoElements::ePseudo_after) {
@@ -1465,7 +1465,7 @@
           }
           break;
         }
-        case eRestyle_CSSTransitions: {
+        case nsStyleSet::eTransitionSheet: {
           if (aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement ||
               aPseudoType == nsCSSPseudoElements::ePseudo_before ||
               aPseudoType == nsCSSPseudoElements::ePseudo_after) {
@@ -1477,7 +1477,7 @@
           }
           break;
         }
-        case eRestyle_SVGAttrAnimations: {
+        case nsStyleSet::eSVGAttrAnimationSheet: {
           SVGAttrAnimationRuleProcessor* ruleProcessor =
             static_cast<SVGAttrAnimationRuleProcessor*>(
               mRuleProcessors[eSVGAttrAnimationSheet].get());
@@ -1487,7 +1487,7 @@
           }
           break;
         }
-        case eRestyle_StyleAttribute: {
+        case nsStyleSet::eStyleAttrSheet: {
           if (!level->mIsImportant) {
             // First time through, we handle the non-!important rule.
             nsHTMLCSSStyleSheet* ruleProcessor =
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleStruct.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleStruct.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsStyleStruct.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsStyleStruct.h	2015-02-28 15:03:04.000000000 +0000
@@ -1894,6 +1894,11 @@
   nsCSSProperty GetProperty() const { return mProperty; }
   nsIAtom* GetUnknownProperty() const { return mUnknownProperty; }
 
+  float GetCombinedDuration() const {
+    // http://dev.w3.org/csswg/css-transitions/#combined-duration
+    return std::max(mDuration, 0.0f) + mDelay;
+  }
+
   void SetTimingFunction(const nsTimingFunction& aTimingFunction)
     { mTimingFunction = aTimingFunction; }
   void SetDelay(float aDelay) { mDelay = aDelay; }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsTransitionManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsTransitionManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/nsTransitionManager.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/nsTransitionManager.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -176,8 +176,7 @@
     GetAnimationPlayers(aElement, pseudoType, false);
   if (!collection &&
       disp->mTransitionPropertyCount == 1 &&
-      disp->mTransitions[0].GetDelay() == 0.0f &&
-      disp->mTransitions[0].GetDuration() == 0.0f) {
+      disp->mTransitions[0].GetCombinedDuration() <= 0.0f) {
     return;
   }
 
@@ -227,9 +226,10 @@
   nsCSSPropertySet whichStarted;
   for (uint32_t i = disp->mTransitionPropertyCount; i-- != 0; ) {
     const StyleTransition& t = disp->mTransitions[i];
-    // Check delay and duration first, since they default to zero, and
-    // when they're both zero, we can ignore the transition.
-    if (t.GetDelay() != 0.0f || t.GetDuration() != 0.0f) {
+    // Check the combined duration (combination of delay and duration)
+    // first, since it defaults to zero, which means we can ignore the
+    // transition.
+    if (t.GetCombinedDuration() > 0.0f) {
       // We might have something to transition.  See if any of the
       // properties in question changed and are animatable.
       // FIXME: Would be good to find a way to share code between this
@@ -581,6 +581,8 @@
   }
 #endif
   if (haveCurrentTransition) {
+    players[currentIndex]->Cancel();
+    oldPT = nullptr; // Clear pointer so it doesn't dangle
     players[currentIndex] = player;
   } else {
     if (!players.AppendElement(player)) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/mochitest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/mochitest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/mochitest.ini	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/mochitest.ini	2015-02-28 15:03:04.000000000 +0000
@@ -223,6 +223,7 @@
 [test_units_frequency.html]
 [test_units_length.html]
 [test_units_time.html]
+[test_unprefixing_service.html]
 [test_value_cloning.html]
 skip-if = (toolkit == 'gonk' && debug) || toolkit == 'android' #bug 775227 #debug-only failure; timed out
 [test_value_computation.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/property_database.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/property_database.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/property_database.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/property_database.js	2015-02-28 15:03:04.000000000 +0000
@@ -5255,6 +5255,19 @@
   for (var prop in verticalTextProperties) {
     gCSSProperties[prop] = verticalTextProperties[prop];
   }
+  /*
+   * Vertical vs horizontal writing-mode can affect line-height
+   * because font metrics may not be symmetrical,
+   * so we require writing-mode:initial to ensure consistency
+   * in font shorthand and line-height tests.
+   */
+  ["font", "line-height"].forEach(function(prop) {
+    var p = gCSSProperties[prop];
+    if (p.prerequisites === undefined) {
+      p.prerequisites = {};
+    }
+    p.prerequisites["writing-mode"] = "initial";
+  });
 }
 
 if (SpecialPowers.getBoolPref("layout.css.masking.enabled")) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/test_transitions_dynamic_changes.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/test_transitions_dynamic_changes.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/test_transitions_dynamic_changes.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/test_transitions_dynamic_changes.html	2015-02-28 15:03:04.000000000 +0000
@@ -18,6 +18,7 @@
 
 var p = document.getElementById("display");
 var cs = getComputedStyle(p, "");
+var utils = SpecialPowers.DOMWindowUtils;
 
 p.style.transitionProperty = "all";
 p.style.transitionDuration = "4s";
@@ -53,6 +54,25 @@
 is(cs.textIndent, "0px",
    "changing property after changing duration and delay stops transition");
 
+/** Test for Bug 1133375 */
+p.style.transitionDuration = "1s";
+p.style.transitionDelay = "-1s";
+p.style.transitionProperty = "text-indent";
+var endCount = 0;
+function incrementEndCount(event) { ++endCount; }
+p.addEventListener("transitionend", incrementEndCount, false);
+utils.advanceTimeAndRefresh(0);
+p.style.textIndent = "100px";
+is(cs.textIndent, "100px", "value should now be 100px");
+utils.advanceTimeAndRefresh(10);
+is(endCount, 0, "should not have started transition when combined duration less than or equal to 0");
+p.style.transitionDelay = "-2s";
+p.style.textIndent = "0";
+is(cs.textIndent, "0px", "value should now be 0px");
+utils.advanceTimeAndRefresh(10);
+is(endCount, 0, "should not have started transition when combined duration less than or equal to 0");
+utils.restoreNormalRefresh();
+
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/test_unprefixing_service.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/test_unprefixing_service.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/test_unprefixing_service.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/test_unprefixing_service.html	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1107378
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1107378</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="property_database.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1107378">Mozilla Bug 1107378</a>
+<div id="display">
+  <div id="content">
+  </div>
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.7">
+"use strict";
+
+/** Test for the CSS Unprefixing Service (Bug 1107378) **/
+
+function getComputedStyleWrapper(elem, prop)
+{
+  return window.getComputedStyle(elem, null).getPropertyValue(prop);
+}
+
+const gTestcases = [
+  { decl:  "-webkit-box-flex:5",
+    targetPropName: "flex-grow",
+    targetPropVal:  "5" },
+
+  /* If author happens to specify modern flexbox style after prefixed style,
+     make sure the modern stuff is preserved. */
+  { decl:  "-webkit-box-flex:4;flex-grow:6",
+    targetPropName: "flex-grow",
+    targetPropVal:  "6" },
+
+  /* Tests for handling !important: */
+  { decl:  "-webkit-box-flex:3!important;",
+    targetPropName: "flex-grow",
+    targetPropVal:  "3" },
+  { decl:  "-webkit-box-flex:2!important;flex-grow:1",
+    targetPropName: "flex-grow",
+    targetPropVal:  "2" },
+
+  { decl:  "-webkit-box-flex:1!important bogusText;",
+    targetPropName: "flex-grow"
+    /* invalid syntax --> no target prop-val. */
+  },
+
+  // Make sure we handle weird capitalization in property & value, too:
+  { decl: "-WEBKIT-BoX-aLign: baSELine",
+    targetPropName: "align-items",
+    targetPropVal:  "baseline" },
+
+  { decl: "display:-webkit-box",
+    targetPropName: "display",
+    targetPropVal:  "flex" },
+
+  { decl: "display:-webkit-box; display:-moz-box;",
+    targetPropName: "display",
+    targetPropVal:  "flex" },
+
+  { decl: "display:-webkit-foobar; display:-moz-box;",
+    targetPropName: "display",
+    targetPropVal:  "-moz-box" },
+
+  // -webkit-box-align: baseline | center | end      | start      | stretch
+  // ...maps to:
+  // align-items:       baseline | center | flex-end | flex-start | stretch
+  { decl: "-webkit-box-align: baseline",
+    targetPropName: "align-items",
+    targetPropVal:  "baseline" },
+  { decl: "-webkit-box-align: center",
+    targetPropName: "align-items",
+    targetPropVal:  "center" },
+  { decl: "-webkit-box-align: end",
+    targetPropName: "align-items",
+    targetPropVal:  "flex-end" },
+  { decl: "-webkit-box-align: start",
+    targetPropName: "align-items",
+    targetPropVal:  "flex-start" },
+  { decl: "-webkit-box-align: stretch",
+    targetPropName: "align-items",
+    targetPropVal:  "stretch" },
+
+  // -webkit-box-direction is not supported, because it's unused & would be
+  // complicated to support. See note in CSSUnprefixingService.js for more.
+
+  // -webkit-box-ordinal-group: <number> maps directly to "order".
+  { decl:  "-webkit-box-ordinal-group: 2",
+    targetPropName: "order",
+    targetPropVal:  "2" },
+  { decl:  "-webkit-box-ordinal-group: 6000",
+    targetPropName: "order",
+    targetPropVal:  "6000" },
+
+  // -webkit-box-orient: horizontal | inline-axis | vertical | block-axis
+  // ...maps to:
+  // flex-direction:     row        | row         | column   | column
+  { decl: "-webkit-box-orient: horizontal",
+    targetPropName: "flex-direction",
+    targetPropVal:  "row" },
+  { decl: "-webkit-box-orient: inline-axis",
+    targetPropName: "flex-direction",
+    targetPropVal:  "row" },
+  { decl: "-webkit-box-orient: vertical",
+    targetPropName: "flex-direction",
+    targetPropVal:  "column" },
+  { decl: "-webkit-box-orient: block-axis",
+    targetPropName: "flex-direction",
+    targetPropVal:  "column" },
+
+  // -webkit-box-pack: start     | center | end      | justify
+  // ... maps to:
+  // justify-content: flex-start | center | flex-end | space-between
+  { decl: "-webkit-box-pack: start",
+    targetPropName: "justify-content",
+    targetPropVal:  "flex-start" },
+  { decl: "-webkit-box-pack: center",
+    targetPropName: "justify-content",
+    targetPropVal:  "center" },
+  { decl: "-webkit-box-pack: end",
+    targetPropName: "justify-content",
+    targetPropVal:  "flex-end" },
+  { decl: "-webkit-box-pack: justify",
+    targetPropName: "justify-content",
+    targetPropVal:  "space-between" },
+
+  // -webkit-transform: <transform> maps directly to "transform"
+  { decl: "-webkit-transform: matrix(1, 2, 3, 4, 5, 6)",
+    targetPropName: "transform",
+    targetPropVal:  "matrix(1, 2, 3, 4, 5, 6)" },
+
+  // -webkit-transition: <property> maps directly to "transition"
+  { decl: "-webkit-transition: width 1s linear 2s",
+    targetPropName: "transition",
+    targetPropVal:  "width 1s linear 2s" },
+
+  // -webkit-transition **with** -webkit-prefixed property in value.
+  { decl: "-webkit-transition: -webkit-transform 1s linear 2s",
+    targetPropName: "transition",
+    targetPropVal:  "transform 1s linear 2s" },
+  // (Re-test to check that it sets the "transition-property" subproperty.)
+  { decl: "-webkit-transition: -webkit-transform 1s linear 2s",
+    targetPropName: "transition-property",
+    targetPropVal:  "transform" },
+
+  // Same as previous test, except with "-webkit-transform" in the
+  // middle of the value instead of at the beginning (still valid):
+  { decl: "-webkit-transition: 1s -webkit-transform linear 2s",
+    targetPropName: "transition",
+    targetPropVal:  "transform 1s linear 2s" },
+  { decl: "-webkit-transition: 1s -webkit-transform linear 2s",
+    targetPropName: "transition-property",
+    targetPropVal:  "transform" },
+];
+
+// The main test function.
+// aFlexboxTestcase is an entry from the list in flexbox_layout_testcases.js
+function runOneTest(aTestcase)
+{
+  let elem = document.getElementById("content");
+
+  let expectedValueInDOMStyle;
+  let expectedValueInComputedStyle;
+  if (typeof(aTestcase.targetPropVal) == 'undefined') {
+    expectedValueInDOMStyle = '';
+    expectedValueInComputedStyle = // initial computed style:
+      getComputedStyleWrapper(elem, aTestcase.targetPropName);
+  } else {
+    expectedValueInDOMStyle = aTestcase.targetPropVal;
+    expectedValueInComputedStyle = aTestcase.targetPropVal;
+  }
+
+  elem.setAttribute("style", aTestcase.decl);
+
+  // Check specified style for fixup:
+  is(elem.style[aTestcase.targetPropName], expectedValueInDOMStyle,
+     "Checking if unprefixing service produced expected result " +
+     "in elem.style['" + aTestcase.targetPropName + "'] " +
+     "when given decl '" + aTestcase.decl + "'");
+
+  // Check computed style for fixup:
+  // (only for longhand properties; shorthands aren't in computed style)
+  if (gCSSProperties[aTestcase.targetPropName].type == CSS_TYPE_LONGHAND) {
+    let computedValue = getComputedStyleWrapper(elem, aTestcase.targetPropName);
+    is(computedValue, expectedValueInComputedStyle,
+       "Checking if unprefixing service produced expected result " +
+       "in computed value of property '" +  aTestcase.targetPropName + "' " +
+       "when given decl '" + aTestcase.decl + "'");
+  }
+
+  elem.setAttribute("style", "");
+}
+
+function testWithUnprefixingDisabled()
+{
+  // Sanity-check that -webkit-prefixed properties are rejected, when
+  // pref is disabled:
+  let elem = document.getElementById("content");
+  let initialFlexGrow = getComputedStyleWrapper(elem, "flex-grow");
+  elem.setAttribute("style", "-webkit-box-flex:5");
+  is(getComputedStyleWrapper(elem, "flex-grow"), initialFlexGrow,
+     "-webkit-box-flex shouldn't affect 'flex-grow' " +
+     "when unprefixing pref is disabled");
+
+  let initialDisplay = getComputedStyleWrapper(elem, "display");
+  elem.setAttribute("style", "display:-webkit-box");
+  is(getComputedStyleWrapper(elem, "display"), initialDisplay,
+     "-webkit-box-flex shouldn't affect 'display' " +
+     "when unprefixing pref is disabled");
+}
+
+function testWithUnprefixingEnabled()
+{
+  gTestcases.forEach(runOneTest);
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+
+// First, test with unprefixing disabled (by default for now):
+testWithUnprefixingDisabled();
+
+// ...and then test with it enabled.
+// XXXdholbert in bug 1132743, we'll be restricting unprefixing to only happen
+// on a "fixlist" of domains. We'll need to run this test from a predetermined
+// fake mochitest-domain, and include that domain in the "fixlist".
+SpecialPowers.pushPrefEnv(
+  { set: [["layout.css.unprefixing-service.enabled", true]] },
+  testWithUnprefixingEnabled);
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/test_variables.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/test_variables.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/style/test/test_variables.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/style/test/test_variables.html	2015-02-28 15:03:04.000000000 +0000
@@ -23,6 +23,9 @@
 
 <div id="t5"></div>
 
+<style id="test6">
+</style>
+
 <script>
 var tests = [
   function() {
@@ -79,6 +82,15 @@
     is(cs.item(cs.length - 1), "--SomeVariableName", "custom property name returned by item() on computed style");
     is(cs[cs.length - 1], "--SomeVariableName", "custom property name returned by indexed getter on style declaration");
   },
+
+  function() {
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=969756
+    var test6 = document.getElementById("test6");
+    test6.textContent = "p { font: var(--var6) hangul mongolian; font-size-adjust: none; }";
+    var declaration = test6.sheet.cssRules[0].style;
+    test6.style.color = "white";
+    is(declaration.getPropertyValue("-x-system-font"), " var(--var6) hangul mongolian");
+  },
 ];
 
 function prepareTest() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/svg/SVGTextFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/svg/SVGTextFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/svg/SVGTextFrame.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/svg/SVGTextFrame.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -2722,15 +2722,11 @@
   void NotifySelectionBackgroundNeedsFill(const Rect& aBackgroundRect,
                                           nscolor aColor,
                                           DrawTarget& aDrawTarget) MOZ_OVERRIDE;
+  void PaintDecorationLine(Rect aPath, nscolor aColor) MOZ_OVERRIDE;
+  void PaintSelectionDecorationLine(Rect aPath, nscolor aColor) MOZ_OVERRIDE;
   void NotifyBeforeText(nscolor aColor) MOZ_OVERRIDE;
   void NotifyGlyphPathEmitted() MOZ_OVERRIDE;
-  void NotifyBeforeSVGGlyphPainted() MOZ_OVERRIDE;
-  void NotifyAfterSVGGlyphPainted() MOZ_OVERRIDE;
   void NotifyAfterText() MOZ_OVERRIDE;
-  void NotifyBeforeDecorationLine(nscolor aColor) MOZ_OVERRIDE;
-  void NotifyDecorationLinePathEmitted() MOZ_OVERRIDE;
-  void NotifyBeforeSelectionDecorationLine(nscolor aColor) MOZ_OVERRIDE;
-  void NotifySelectionDecorationLinePathEmitted() MOZ_OVERRIDE;
 
 private:
   void SetupContext();
@@ -2819,41 +2815,30 @@
 }
 
 void
-SVGTextDrawPathCallbacks::NotifyBeforeSVGGlyphPainted()
-{
-  gfx->Save();
-}
-
-void
-SVGTextDrawPathCallbacks::NotifyAfterSVGGlyphPainted()
-{
-  gfx->Restore();
-  gfx->NewPath();
-}
-
-void
 SVGTextDrawPathCallbacks::NotifyAfterText()
 {
   gfx->Restore();
 }
 
 void
-SVGTextDrawPathCallbacks::NotifyBeforeDecorationLine(nscolor aColor)
+SVGTextDrawPathCallbacks::PaintDecorationLine(Rect aPath, nscolor aColor)
 {
   mColor = aColor;
-  SetupContext();
-}
+  AntialiasMode aaMode =
+    nsSVGUtils::ToAntialiasMode(mFrame->StyleSVG()->mTextRendering);
 
-void
-SVGTextDrawPathCallbacks::NotifyDecorationLinePathEmitted()
-{
+  gfx->Save();
+  gfx->NewPath();
+  gfx->SetAntialiasMode(aaMode);
+  gfx->Rectangle(ThebesRect(aPath));
   HandleTextGeometry();
   gfx->NewPath();
   gfx->Restore();
 }
 
 void
-SVGTextDrawPathCallbacks::NotifyBeforeSelectionDecorationLine(nscolor aColor)
+SVGTextDrawPathCallbacks::PaintSelectionDecorationLine(Rect aPath,
+                                                       nscolor aColor)
 {
   if (IsClipPathChild()) {
     // Don't paint selection decorations when in a clip path.
@@ -2861,17 +2846,10 @@
   }
 
   mColor = aColor;
-  gfx->Save();
-}
-
-void
-SVGTextDrawPathCallbacks::NotifySelectionDecorationLinePathEmitted()
-{
-  if (IsClipPathChild()) {
-    // Don't paint selection decorations when in a clip path.
-    return;
-  }
 
+  gfx->Save();
+  gfx->NewPath();
+  gfx->Rectangle(ThebesRect(aPath));
   FillAndStrokeGeometry();
   gfx->Restore();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/b2g_desktop.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/b2g_desktop.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/b2g_desktop.py	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/b2g_desktop.py	2015-02-28 15:03:04.000000000 +0000
@@ -11,9 +11,11 @@
 
 from runreftest import RefTest, ReftestOptions
 
-from marionette import Marionette, expected
-from marionette.wait import Wait
-from marionette.by import By
+from marionette_driver import expected
+from marionette_driver.by import By
+from marionette_driver.marionette import Marionette
+from marionette_driver.wait import Wait
+
 from mozprocess import ProcessHandler
 from mozrunner import FirefoxRunner
 import mozinfo
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/gaia_lock_screen.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/gaia_lock_screen.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/gaia_lock_screen.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/gaia_lock_screen.js	2015-02-28 15:03:04.000000000 +0000
@@ -6,85 +6,55 @@
 // https://github.com/mozilla-b2g/gaia/blob/master/tests/atoms/gaia_lock_screen.js
 
 'use strict';
+/* globals waitFor, finish */
+/* exported GaiaLockScreen */
 
 var GaiaLockScreen = {
 
-  unlock: function() {
-    let lockscreen = window.wrappedJSObject.lockScreen;
+  unlock: function(forcibly) {
     let setlock = window.wrappedJSObject.SettingsListener.getSettingsLock();
-    let system = window.wrappedJSObject.System;
+    let service = window.wrappedJSObject.Service;
     let obj = {'screen.timeout': 0};
     setlock.set(obj);
 
-    window.wrappedJSObject.ScreenManager.turnScreenOn();
-
     waitFor(
       function() {
-        window.wrappedJSObject.dispatchEvent(
-          new window.wrappedJSObject.CustomEvent(
-            'lockscreen-request-unlock', {
-              detail: {
-                forcibly: true
-              }
-            }));
+        service.request('unlock', { forcibly: forcibly });
         waitFor(
           function() {
-            finish(system.locked);
+            finish(service.locked);
           },
           function() {
-            return !system.locked;
+            return !service.locked;
           }
         );
       },
       function() {
-        return !!lockscreen;
+        return !!service;
       }
     );
   },
 
-  lock: function() {
-    let lwm = window.wrappedJSObject.lockScreenWindowManager;
-    let lockscreen = window.wrappedJSObject.lockScreen;
-    let system = window.wrappedJSObject.System;
+  lock: function(forcibly) {
+    let service = window.wrappedJSObject.Service;
     let setlock = window.wrappedJSObject.SettingsListener.getSettingsLock();
     let obj = {'screen.timeout': 0};
-    let waitLock = function() {
-      waitFor(
-        function() {
-        window.wrappedJSObject.dispatchEvent(
-          new window.wrappedJSObject.CustomEvent(
-            'lockscreen-request-lock', {
-              detail: {
-                forcibly: true
-              }
-            }));
-          waitFor(
-            function() {
-              finish(!system.locked);
-            },
-            function() {
-              return system.locked;
-            }
-          );
-        },
-        function() {
-          return !!lockscreen;
-        }
-      );
-    };
-
     setlock.set(obj);
-    window.wrappedJSObject.ScreenManager.turnScreenOn();
-
-    // Need to open the window before we lock the lockscreen.
-    // This would only happen when someone directly call the lockscrene.lock.
-    // It's a bad pattern and would only for test.
-    lwm.openApp();
-    waitFor(function() {
-      waitLock();
-    }, function() {
-      return lwm.states.instance.isActive();
-    });
+    waitFor(
+      function() {
+      service.request('lock', { forcibly: forcibly });
+        waitFor(
+          function() {
+            finish(!service.locked);
+          },
+          function() {
+            return service.locked;
+          }
+        );
+      },
+      function() {
+        return !!service;
+      }
+    );
   }
 };
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/reftest.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/reftest.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/reftest.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/reftest.js	2015-02-28 15:03:04.000000000 +0000
@@ -271,7 +271,6 @@
     gBrowser.setAttribute("id", "browser");
     gBrowser.setAttribute("type", "content-primary");
     gBrowser.setAttribute("remote", gBrowserIsRemote ? "true" : "false");
-    gBrowser.setAttribute("mozasyncpanzoom", "true");
     // Make sure the browser element is exactly 800x1000, no matter
     // what size our window is
     gBrowser.setAttribute("style", "padding: 0px; margin: 0px; border:none; min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/reftest-preferences.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/reftest-preferences.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/tools/reftest/reftest-preferences.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/tools/reftest/reftest-preferences.js	2015-02-28 15:03:04.000000000 +0000
@@ -58,3 +58,6 @@
     // desired side-effect of preventing our geoip lookup.
     branch.setBoolPref("browser.search.isUS", true);
     branch.setCharPref("browser.search.countryCode", "US");
+
+    // Make sure SelfSupport doesn't hit the network.
+    branch.setCharPref("browser.selfsupport.url", "https://%(server)s/selfsupport-dummy/");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/xul/nsMenuPopupFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/xul/nsMenuPopupFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/xul/nsMenuPopupFrame.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/xul/nsMenuPopupFrame.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -59,6 +59,10 @@
 using mozilla::dom::PopupBoxObject;
 
 int8_t nsMenuPopupFrame::sDefaultLevelIsTop = -1;
+uint32_t nsMenuPopupFrame::sTimeoutOfIncrementalSearch = 1000;
+
+const char* kPrefIncrementalSearchTimeout =
+  "ui.menu.incremental_search.timeout";
 
 // NS_NewMenuPopupFrame
 //
@@ -109,9 +113,10 @@
     return;
   sDefaultLevelIsTop =
     Preferences::GetBool("ui.panel.default_level_parent", false);
+  Preferences::AddUintVarCache(&sTimeoutOfIncrementalSearch,
+                               kPrefIncrementalSearchTimeout, 1000);
 } // ctor
 
-
 void
 nsMenuPopupFrame::Init(nsIContent*       aContent,
                        nsContainerFrame* aParent,
@@ -1727,10 +1732,14 @@
   }
   else {
     char16_t uniChar = ToLowerCase(static_cast<char16_t>(charCode));
-    if (isMenu || // Menu supports only first-letter navigation
-        keyTime - lastKeyTime > INC_TYP_INTERVAL) // Interval too long, treat as new typing
+    if (isMenu) {
+      // Menu supports only first-letter navigation
       mIncrementalString = uniChar;
-    else {
+    } else if (sTimeoutOfIncrementalSearch &&
+               keyTime - lastKeyTime > sTimeoutOfIncrementalSearch) {
+      // Interval too long, treat as new typing
+      mIncrementalString = uniChar;
+    } else {
       mIncrementalString.Append(uniChar);
     }
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/xul/nsMenuPopupFrame.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/xul/nsMenuPopupFrame.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/xul/nsMenuPopupFrame.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/xul/nsMenuPopupFrame.h	2015-02-28 15:03:04.000000000 +0000
@@ -116,8 +116,6 @@
 #define POPUPPOSITION_HFLIP(v) (v ^ 1)
 #define POPUPPOSITION_VFLIP(v) (v ^ 2)
 
-#define INC_TYP_INTERVAL  1000  // 1s. If the interval between two keypresses is shorter than this, 
-                                //   treat as a continue typing
 // XXX, kyle.yuan@sun.com, there are 4 definitions for the same purpose:
 //  nsMenuPopupFrame.h, nsListControlFrame.cpp, listbox.xml, tree.xml
 //  need to find a good place to put them together.
@@ -545,6 +543,9 @@
   bool mVFlip;
 
   static int8_t sDefaultLevelIsTop;
+
+  // If 0, never timed out.  Otherwise, the value is in milliseconds.
+  static uint32_t sTimeoutOfIncrementalSearch;
 }; // class nsMenuPopupFrame
 
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/layout/xul/tree/nsTreeBodyFrame.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -2773,12 +2773,40 @@
   return NS_OK;
 }
 
-static void
-PaintTreeBody(nsIFrame* aFrame, nsRenderingContext* aCtx,
-              const nsRect& aDirtyRect, nsPoint aPt)
-{
-  static_cast<nsTreeBodyFrame*>(aFrame)->PaintTreeBody(*aCtx, aDirtyRect, aPt);
-}
+class nsDisplayTreeBody MOZ_FINAL : public nsDisplayItem {
+public:
+  nsDisplayTreeBody(nsDisplayListBuilder* aBuilder, nsFrame* aFrame) :
+    nsDisplayItem(aBuilder, aFrame),
+    mDisableSubpixelAA(false) {
+    MOZ_COUNT_CTOR(nsDisplayTreeBody);
+  }
+#ifdef NS_BUILD_REFCNT_LOGGING
+  virtual ~nsDisplayTreeBody() {
+    MOZ_COUNT_DTOR(nsDisplayTreeBody);
+  }
+#endif
+
+  virtual void Paint(nsDisplayListBuilder* aBuilder,
+                     nsRenderingContext* aCtx) MOZ_OVERRIDE
+  {
+    gfxContext* ctx = aCtx->ThebesContext();
+    gfxContextAutoDisableSubpixelAntialiasing disable(ctx, mDisableSubpixelAA);
+    static_cast<nsTreeBodyFrame*>(mFrame)->
+      PaintTreeBody(*aCtx, mVisibleRect, ToReferenceFrame());
+  }
+  NS_DISPLAY_DECL_NAME("XULTreeBody", TYPE_XUL_TREE_BODY)
+
+  virtual nsRect GetComponentAlphaBounds(nsDisplayListBuilder* aBuilder) MOZ_OVERRIDE
+  {
+    bool snap;
+    return GetBounds(aBuilder, &snap);
+  }
+  virtual void DisableComponentAlpha() MOZ_OVERRIDE {
+    mDisableSubpixelAA = true;
+  }
+
+  bool mDisableSubpixelAA;
+};
 
 // Painting routines
 void
@@ -2799,8 +2827,7 @@
     return;
 
   aLists.Content()->AppendNewToTop(new (aBuilder)
-    nsDisplayGeneric(aBuilder, this, ::PaintTreeBody, "XULTreeBody",
-                     nsDisplayItem::TYPE_XUL_TREE_BODY));
+    nsDisplayTreeBody(aBuilder, this));
 }
 
 void
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/Makefile.in	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/Makefile.in	2015-02-28 15:03:00.000000000 +0000
@@ -249,6 +249,9 @@
 
 uploadsymbols:
 ifdef MOZ_CRASHREPORTER
+ifdef SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE
+	$(PYTHON) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.py '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
+endif
 	$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
 endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/gmp-clearkey/0.1/clearkey.info.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/gmp-clearkey/0.1/clearkey.info.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/gmp-clearkey/0.1/clearkey.info.in	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/gmp-clearkey/0.1/clearkey.info.in	2015-02-28 15:03:04.000000000 +0000
@@ -1,6 +1,6 @@
 Name: clearkey
-Description: ClearKey decrypt-only GMP plugin
-Version: 0.1
+Description: ClearKey Gecko Media Plugin
+Version: 1
 #ifdef ENABLE_WMF
 APIs: eme-decrypt-v6[org.w3.clearkey], decode-audio[aac:org.w3.clearkey], decode-video[h264:org.w3.clearkey]
 Libraries: dxva2.dll, d3d9.dll, msmpeg2vdec.dll, msmpeg2adec.dll, MSAudDecMFT.dll
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/README_MOZILLA thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/README_MOZILLA
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/README_MOZILLA	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/README_MOZILLA	2015-02-28 15:03:04.000000000 +0000
@@ -5,4 +5,4 @@
 
 The cubeb git repository is: git://github.com/kinetiknz/cubeb.git
 
-The git commit ID used was 14d97931da6435d10aa4dcb444896af0314372f4.
+The git commit ID used was 6de5d3e488d808dd925ae0885a7552fc0a25b449.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb_audiounit.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb_audiounit.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb_audiounit.c	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb_audiounit.c	2015-02-28 15:03:04.000000000 +0000
@@ -477,7 +477,6 @@
   unsigned int buffer_size, default_buffer_size;
   OSStatus r;
   UInt32 size;
-  AudioDeviceID output_device_id;
   AudioValueRange latency_range;
 
   assert(context);
@@ -783,7 +782,6 @@
 
 int audiounit_stream_set_volume(cubeb_stream * stm, float volume)
 {
-  AudioDeviceID id;
   OSStatus r;
 
   r = AudioUnitSetParameter(stm->unit,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb-internal.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb-internal.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb-internal.h	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb-internal.h	2015-02-28 15:03:04.000000000 +0000
@@ -39,5 +39,12 @@
 
 };
 
-#endif /* CUBEB_INTERNAL_0eb56756_4e20_4404_a76d_42bf88cd15a5 */
+#define XASSERT(expr) do {                                              \
+    if (!(expr)) {                                                      \
+      fprintf(stderr, "%s:%d - fatal error: %s\n", __FILE__, __LINE__, #expr); \
+      *((volatile int *) NULL) = 0;                                     \
+      abort();                                                          \
+    }                                                                   \
+  } while (0)
 
+#endif /* CUBEB_INTERNAL_0eb56756_4e20_4404_a76d_42bf88cd15a5 */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb_wasapi.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb_wasapi.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb_wasapi.cpp	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb_wasapi.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -5,15 +5,9 @@
  * accompanying file LICENSE for details.
  */
 // This enables assert in release, and lets us have debug-only code
-#ifdef NDEBUG
-#define DEBUG
-#undef NDEBUG
-#endif // #ifdef NDEBUG
-
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
 #endif
-#include <assert.h>
 #include <windows.h>
 #include <mmdeviceapi.h>
 #include <windef.h>
@@ -25,6 +19,8 @@
 #include "cubeb/cubeb-stdint.h"
 #include "cubeb_resampler.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <cmath>
 
 /**Taken from winbase.h, Not in MinGW.*/
 #ifndef STACK_SIZE_PARAM_IS_A_RESERVATION
@@ -34,15 +30,14 @@
 // #define LOGGING_ENABLED
 
 #ifdef LOGGING_ENABLED
-#  define LOG(...) do {         \
-  fprintf(stdout, __VA_ARGS__); \
-  fprintf(stdout, "\n");        \
-} while(0);
+#define LOG(...) do {                           \
+    fprintf(stderr, __VA_ARGS__);               \
+  } while(0)
 #else
-#  define LOG(...)
+#define LOG(...)
 #endif
 
-#define ARRAY_LENGTH(array_) \
+#define ARRAY_LENGTH(array_)                    \
   (sizeof(array_) / sizeof(array_[0]))
 
 namespace {
@@ -85,7 +80,6 @@
 class owned_critical_section
 {
 public:
-
   owned_critical_section()
 #ifdef DEBUG
     : owner(0)
@@ -103,7 +97,7 @@
   {
     EnterCriticalSection(&critical_section);
 #ifdef DEBUG
-    assert(owner != GetCurrentThreadId() && "recursive locking");
+    XASSERT(owner != GetCurrentThreadId() && "recursive locking");
     owner = GetCurrentThreadId();
 #endif
   }
@@ -117,15 +111,15 @@
     LeaveCriticalSection(&critical_section);
   }
 
-#ifdef DEBUG
   /* This is guaranteed to have the good behaviour if it succeeds. The behaviour
    * is undefined otherwise. */
   void assert_current_thread_owns()
   {
+#ifdef DEBUG
     /* This implies owner != 0, because GetCurrentThreadId cannot return 0. */
-    assert(owner == GetCurrentThreadId());
-  }
+    XASSERT(owner == GetCurrentThreadId());
 #endif
+  }
 
 private:
   CRITICAL_SECTION critical_section;
@@ -136,7 +130,7 @@
 
 struct auto_lock {
   auto_lock(owned_critical_section * lock)
-    :lock(lock)
+    : lock(lock)
   {
     lock->enter();
   }
@@ -148,48 +142,30 @@
   owned_critical_section * lock;
 };
 
-struct auto_unlock {
-  auto_unlock(owned_critical_section * lock)
-    :lock(lock)
-  {
-    lock->leave();
-  }
-  ~auto_unlock()
-  {
-    lock->enter();
-  }
-private:
-  owned_critical_section * lock;
-};
-
 struct auto_com {
-  auto_com()
-  : need_uninit(false) {
-    HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-    // This is for information purposes only, in anycase, COM is initialized
-    // at the end of the constructor.
-    if (hr == RPC_E_CHANGED_MODE) {
-      // This is an error, COM was not initialized by this function, so it is
+  auto_com() {
+    result = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+  }
+  ~auto_com() {
+    if (result == RPC_E_CHANGED_MODE) {
+      // This is not an error, COM was not initialized by this function, so it is
       // not necessary to uninit it.
-      LOG("COM already initialized in STA.");
-    } else if (hr == S_FALSE) {
+      LOG("COM already initialized in STA.\n");
+    } else if (result == S_FALSE) {
       // This is not an error. We are allowed to call CoInitializeEx more than
       // once, as long as it is matches by an CoUninitialize call.
       // We do that in the dtor which is guaranteed to be called.
-      LOG("COM already initialized in MTA");
-      need_uninit = true;
-    } else if (hr == S_OK) {
-      LOG("COM initialized.");
-      need_uninit = true;
+      LOG("COM already initialized in MTA\n");
     }
-  }
-  ~auto_com() {
-    if (need_uninit) {
+    if (SUCCEEDED(result)) {
       CoUninitialize();
     }
   }
+  bool ok() {
+    return result == RPC_E_CHANGED_MODE || SUCCEEDED(result);
+  }
 private:
-  bool need_uninit;
+  HRESULT result;
 };
 
 typedef HANDLE (WINAPI *set_mm_thread_characteristics_function)(
@@ -205,7 +181,6 @@
 
 }
 
-
 struct cubeb
 {
   cubeb_ops const * ops;
@@ -254,11 +229,14 @@
   /* This event is set by the stream_stop and stream_destroy
    * function, so the render loop can exit properly. */
   HANDLE shutdown_event;
+  /* Set by OnDefaultDeviceChanged when a stream reconfiguration is required.
+     The reconfiguration is handled by the render loop thread. */
+  HANDLE reconfigure_event;
   /* This is set by WASAPI when we should refill the stream. */
   HANDLE refill_event;
   /* Each cubeb_stream has its own thread. */
   HANDLE thread;
-  /* We synthetize our clock from the callbacks. */
+  /* We synthesize our clock from the callbacks. */
   LONG64 clock;
   owned_critical_section * stream_reset_lock;
   /* Maximum number of frames we can be requested in a callback. */
@@ -296,7 +274,7 @@
   HRESULT STDMETHODCALLTYPE
   QueryInterface(REFIID riid, VOID **ppvInterface)
   {
-    if (IID_IUnknown == riid) {
+    if (__uuidof(IUnknown) == riid) {
       AddRef();
       *ppvInterface = (IUnknown*)this;
     } else if (__uuidof(IMMNotificationClient) == riid) {
@@ -309,35 +287,23 @@
     return S_OK;
   }
 
-  wasapi_endpoint_notification_client(cubeb_stream * stm)
+  wasapi_endpoint_notification_client(HANDLE event)
     : ref_count(1)
-    , stm(stm)
+    , reconfigure_event(event)
   { }
 
   HRESULT STDMETHODCALLTYPE
   OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR device_id)
   {
-    /* we don't support capture for now. */
-    if (flow == eCapture) {
-      return S_OK;
-    }
-    /* all our streams are eMultimedia for now */
-    if (role != eMultimedia) {
+    /* we only support a single stream type for now. */
+    if (flow != eRender && role != eMultimedia) {
       return S_OK;
     }
 
-    auto_com autocom;
-
-    /* Close the stream */
-    wasapi_stream_stop(stm);
-    {
-      auto_lock lock(stm->stream_reset_lock);
-      close_wasapi_stream(stm);
-      /* Reopen a stream and start it immediately. This will automatically pick the
-       * new default device for this role. */
-      setup_wasapi_stream(stm);
+    BOOL ok = SetEvent(reconfigure_event);
+    if (!ok) {
+      LOG("SetEvent on reconfigure_event failed: %x", GetLastError());
     }
-    wasapi_stream_start(stm);
 
     return S_OK;
   }
@@ -346,35 +312,33 @@
    * log is enabled), for debugging. */
   HRESULT STDMETHODCALLTYPE OnDeviceAdded(LPCWSTR device_id)
   {
-    LOG("Audio device added.");
+    LOG("Audio device added.\n");
     return S_OK;
   };
 
   HRESULT STDMETHODCALLTYPE OnDeviceRemoved(LPCWSTR device_id)
   {
-    LOG("Audio device removed.");
+    LOG("Audio device removed.\n");
     return S_OK;
   }
 
   HRESULT STDMETHODCALLTYPE
   OnDeviceStateChanged(LPCWSTR device_id, DWORD new_state)
   {
-    LOG("Audio device state changed.");
+    LOG("Audio device state changed.\n");
     return S_OK;
   }
 
   HRESULT STDMETHODCALLTYPE
   OnPropertyValueChanged(LPCWSTR device_id, const PROPERTYKEY key)
   {
-    LOG("Audio device property value changed.");
+    LOG("Audio device property value changed.\n");
     return S_OK;
   }
 private:
   /* refcount for this instance, necessary to implement MSCOM semantics. */
   LONG ref_count;
-  /* Pointer to the stream. It is guaranteed that this pointer is
-   * always valid. */
-  cubeb_stream * stm;
+  HANDLE reconfigure_event;
 };
 
 namespace {
@@ -420,7 +384,7 @@
 void
 upmix(T * in, long inframes, T * out, int32_t in_channels, int32_t out_channels)
 {
-  assert(out_channels >= in_channels);
+  XASSERT(out_channels >= in_channels);
   /* If we are playing a mono stream over stereo speakers, copy the data over. */
   if (in_channels == 1 && out_channels == 2) {
     mono_to_stereo(in, inframes, out);
@@ -443,7 +407,7 @@
 void
 downmix(T * in, long inframes, T * out, int32_t in_channels, int32_t out_channels)
 {
-  assert(in_channels >= out_channels);
+  XASSERT(in_channels >= out_channels);
   /* We could use a downmix matrix here, applying mixing weight based on the
    * channel, but directsound and winmm simply drop the channels that cannot be
    * rendered by the hardware, so we do the same for consistency. */
@@ -479,22 +443,22 @@
 
   long out_frames = cubeb_resampler_fill(stm->resampler, dest, frames_needed);
 
-  clock_add(stm, frames_needed * stream_to_mix_samplerate_ratio(stm));
+  clock_add(stm, roundf(frames_needed * stream_to_mix_samplerate_ratio(stm)));
 
   /* XXX: Handle this error. */
   if (out_frames < 0) {
-    assert(false);
+    XASSERT(false);
   }
 
   /* Go in draining mode if we got fewer frames than requested. */
   if (out_frames < frames_needed) {
-    LOG("draining.");
+    LOG("draining.\n");
     stm->draining = true;
   }
 
   /* If this is not true, there will be glitches.
    * It is alright to have produced less frames if we are draining, though. */
-  assert(out_frames == frames_needed || stm->draining);
+  XASSERT(out_frames == frames_needed || stm->draining);
 
   if (should_upmix(stm)) {
     upmix(dest, out_frames, data,
@@ -511,12 +475,16 @@
   cubeb_stream * stm = static_cast<cubeb_stream *>(stream);
 
   bool is_playing = true;
-  HANDLE wait_array[2] = {stm->shutdown_event, stm->refill_event};
+  HANDLE wait_array[3] = {stm->shutdown_event, stm->reconfigure_event, stm->refill_event};
   HANDLE mmcss_handle = NULL;
-  HRESULT hr;
+  HRESULT hr = 0;
   bool first = true;
   DWORD mmcss_task_index = 0;
   auto_com com;
+  if (!com.ok()) {
+    LOG("COM initialization failed on render_loop thread.\n");
+    return 0;
+  }
 
   /* We could consider using "Pro Audio" here for WebAudio and
    * maybe WebRTC. */
@@ -524,7 +492,7 @@
     stm->context->set_mm_thread_characteristics("Audio", &mmcss_task_index);
   if (!mmcss_handle) {
     /* This is not fatal, but we might glitch under heavy load. */
-    LOG("Unable to use mmcss to bump the render thread priority: %x", GetLastError());
+    LOG("Unable to use mmcss to bump the render thread priority: %x\n", GetLastError());
   }
 
 
@@ -532,7 +500,7 @@
     DWORD waitResult = WaitForMultipleObjects(ARRAY_LENGTH(wait_array),
                                               wait_array,
                                               FALSE,
-                                              INFINITE);
+                                              1000);
 
     switch (waitResult) {
     case WAIT_OBJECT_0: { /* shutdown */
@@ -544,16 +512,36 @@
       }
       continue;
     }
-    case WAIT_OBJECT_0 + 1: { /* refill */
+    case WAIT_OBJECT_0 + 1: { /* reconfigure */
+      /* Close the stream */
+      stm->client->Stop();
+      {
+        auto_lock lock(stm->stream_reset_lock);
+        close_wasapi_stream(stm);
+        /* Reopen a stream and start it immediately. This will automatically pick the
+         * new default device for this role. */
+        int r = setup_wasapi_stream(stm);
+        if (r != CUBEB_OK) {
+          /* Don't destroy the stream here, since we expect the caller to do
+             so after the error has propagated via the state callback. */
+          is_playing = false;
+          hr = -1;
+          continue;
+        }
+      }
+      stm->client->Start();
+      break;
+    }
+    case WAIT_OBJECT_0 + 2: { /* refill */
       UINT32 padding;
 
       hr = stm->client->GetCurrentPadding(&padding);
       if (FAILED(hr)) {
-        LOG("Failed to get padding");
+        LOG("Failed to get padding\n");
         is_playing = false;
         continue;
       }
-      assert(padding <= stm->buffer_frame_count);
+      XASSERT(padding <= stm->buffer_frame_count);
 
       if (stm->draining) {
         if (padding == 0) {
@@ -576,15 +564,20 @@
 
         hr = stm->render_client->ReleaseBuffer(available, 0);
         if (FAILED(hr)) {
-          LOG("failed to release buffer.");
+          LOG("failed to release buffer.\n");
           is_playing = false;
         }
       } else {
-        LOG("failed to get buffer.");
+        LOG("failed to get buffer.\n");
         is_playing = false;
       }
     }
-    break;
+      break;
+    case WAIT_TIMEOUT:
+      XASSERT(stm->shutdown_event == wait_array[0]);
+      is_playing = false;
+      hr = -1;
+      break;
     default:
       LOG("case %d not handled in render loop.", waitResult);
       abort();
@@ -592,7 +585,7 @@
   }
 
   if (FAILED(hr)) {
-    stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_STOPPED);
+    stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
   }
 
   stm->context->revert_mm_thread_characteristics(mmcss_handle);
@@ -619,16 +612,16 @@
                                 IID_PPV_ARGS(&stm->device_enumerator));
 
   if (FAILED(hr)) {
-    LOG("Could not get device enumerator: %x", hr);
+    LOG("Could not get device enumerator: %x\n", hr);
     return hr;
   }
 
-  stm->notification_client = new wasapi_endpoint_notification_client(stm);
+  stm->notification_client = new wasapi_endpoint_notification_client(stm->reconfigure_event);
 
   hr = stm->device_enumerator->RegisterEndpointNotificationCallback(stm->notification_client);
 
   if (FAILED(hr)) {
-    LOG("Could not register endpoint notification callback: %x", hr);
+    LOG("Could not register endpoint notification callback: %x\n", hr);
     return hr;
   }
 
@@ -637,7 +630,7 @@
 
 HRESULT unregister_notification_client(cubeb_stream * stm)
 {
-  assert(stm);
+  XASSERT(stm);
 
   if (!stm->device_enumerator) {
     return S_OK;
@@ -657,9 +650,8 @@
   HRESULT hr = CoCreateInstance(__uuidof(MMDeviceEnumerator),
                                 NULL, CLSCTX_INPROC_SERVER,
                                 IID_PPV_ARGS(&enumerator));
-
   if (FAILED(hr)) {
-    LOG("Could not get device enumerator.");
+    LOG("Could not get device enumerator.\n");
     return hr;
   }
   /* eMultimedia is okay for now ("Music, movies, narration, [...]").
@@ -668,7 +660,7 @@
    * and eCommunication ("Voice communication"). */
   hr = enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, device);
   if (FAILED(hr)) {
-    LOG("Could not get default audio endpoint. %d", __LINE__);
+    LOG("Could not get default audio endpoint. %d\n", __LINE__);
     SafeRelease(enumerator);
     return hr;
   }
@@ -684,6 +676,9 @@
 {
   HRESULT hr;
   auto_com com;
+  if (!com.ok()) {
+    return CUBEB_ERROR;
+  }
 
   /* We don't use the device yet, but need to make sure we can initialize one
      so that this backend is not incorrectly enabled on platforms that don't
@@ -691,7 +686,7 @@
   IMMDevice * device;
   hr = get_default_endpoint(&device);
   if (FAILED(hr)) {
-    LOG("Could not get device.");
+    LOG("Could not get device.\n");
     return CUBEB_ERROR;
   }
   SafeRelease(device);
@@ -710,13 +705,13 @@
       (revert_mm_thread_characteristics_function) GetProcAddress(
           ctx->mmcss_module, "AvRevertMmThreadCharacteristics");
     if (!(ctx->set_mm_thread_characteristics && ctx->revert_mm_thread_characteristics)) {
-      LOG("Could not load AvSetMmThreadCharacteristics or AvRevertMmThreadCharacteristics: %x", GetLastError());
+      LOG("Could not load AvSetMmThreadCharacteristics or AvRevertMmThreadCharacteristics: %x\n", GetLastError());
       FreeLibrary(ctx->mmcss_module);
     }
   } else {
     // This is not a fatal error, but we might end up glitching when
     // the system is under high load.
-    LOG("Could not load Avrt.dll");
+    LOG("Could not load Avrt.dll\n");
     ctx->set_mm_thread_characteristics = &set_mm_thread_characteristics_noop;
     ctx->revert_mm_thread_characteristics = &revert_mm_thread_characteristics_noop;
   }
@@ -728,6 +723,28 @@
 }
 
 namespace {
+void stop_and_join_render_thread(cubeb_stream * stm)
+{
+  if (!stm->thread) {
+    return;
+  }
+
+  BOOL ok = SetEvent(stm->shutdown_event);
+  if (!ok) {
+    LOG("Destroy SetEvent failed: %d\n", GetLastError());
+  }
+
+  DWORD r = WaitForSingleObject(stm->thread, INFINITE);
+  if (r == WAIT_FAILED) {
+    LOG("Destroy WaitForSingleObject on thread failed: %d\n", GetLastError());
+  }
+
+  CloseHandle(stm->thread);
+  stm->thread = NULL;
+
+  CloseHandle(stm->shutdown_event);
+  stm->shutdown_event = 0;
+}
 
 void wasapi_destroy(cubeb * context)
 {
@@ -749,8 +766,11 @@
   IAudioClient * client;
   WAVEFORMATEX * mix_format;
   auto_com com;
+  if (!com.ok()) {
+    return CUBEB_ERROR;
+  }
 
-  assert(ctx && max_channels);
+  XASSERT(ctx && max_channels);
 
   IMMDevice * device;
   hr = get_default_endpoint(&device);
@@ -787,11 +807,14 @@
   IAudioClient * client;
   REFERENCE_TIME default_period;
   auto_com com;
+  if (!com.ok()) {
+    return CUBEB_ERROR;
+  }
 
   IMMDevice * device;
   hr = get_default_endpoint(&device);
   if (FAILED(hr)) {
-    LOG("Could not get default endpoint:%x.", hr)
+    LOG("Could not get default endpoint:%x.\n", hr);
     return CUBEB_ERROR;
   }
 
@@ -800,7 +823,7 @@
                         NULL, (void **)&client);
   SafeRelease(device);
   if (FAILED(hr)) {
-    LOG("Could not activate device for latency: %x.", hr)
+    LOG("Could not activate device for latency: %x.\n", hr);
     return CUBEB_ERROR;
   }
 
@@ -808,11 +831,11 @@
   hr = client->GetDevicePeriod(&default_period, NULL);
   if (FAILED(hr)) {
     SafeRelease(client);
-    LOG("Could not get device period: %x.", hr)
+    LOG("Could not get device period: %x.\n", hr);
     return CUBEB_ERROR;
   }
 
-  LOG("default device period: %ld", default_period)
+  LOG("default device period: %ld\n", default_period);
 
   /* According to the docs, the best latency we can achieve is by synchronizing
    * the stream and the engine.
@@ -831,6 +854,9 @@
   IAudioClient * client;
   WAVEFORMATEX * mix_format;
   auto_com com;
+  if (!com.ok()) {
+    return CUBEB_ERROR;
+  }
 
   IMMDevice * device;
   hr = get_default_endpoint(&device);
@@ -896,7 +922,7 @@
       format_pcm->dwChannelMask = KSAUDIO_SPEAKER_STEREO;
       break;
     default:
-      assert(false && "Channel layout not supported.");
+      XASSERT(false && "Channel layout not supported.");
       break;
   }
   (*mix_format)->nChannels = stream_params->channels;
@@ -915,9 +941,9 @@
   if (hr == S_FALSE) {
     /* Not supported, but WASAPI gives us a suggestion. Use it, and handle the
      * eventual upmix/downmix ourselves */
-    LOG("Using WASAPI suggested format: channels: %d", closest->nChannels);
+    LOG("Using WASAPI suggested format: channels: %d\n", closest->nChannels);
     WAVEFORMATEXTENSIBLE * closest_pcm = reinterpret_cast<WAVEFORMATEXTENSIBLE *>(closest);
-    assert(closest_pcm->SubFormat == format_pcm->SubFormat);
+    XASSERT(closest_pcm->SubFormat == format_pcm->SubFormat);
     CoTaskMemFree(*mix_format);
     *mix_format = closest;
   } else if (hr == AUDCLNT_E_UNSUPPORTED_FORMAT) {
@@ -926,7 +952,7 @@
      * of the code figure out the right conversion path. */
     **mix_format = hw_mixformat;
   } else if (hr == S_OK) {
-    LOG("Requested format accepted by WASAPI.");
+    LOG("Requested format accepted by WASAPI.\n");
   }
 }
 
@@ -939,27 +965,26 @@
   stm->stream_reset_lock->assert_current_thread_owns();
 
   auto_com com;
+  if (!com.ok()) {
+    return CUBEB_ERROR;
+  }
 
-  assert(!stm->client && "WASAPI stream already setup, close it first.");
+  XASSERT(!stm->client && "WASAPI stream already setup, close it first.");
 
   hr = get_default_endpoint(&device);
   if (FAILED(hr)) {
-    LOG("Could not get default endpoint, error: %x", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Could not get default endpoint, error: %x\n", hr);
     return CUBEB_ERROR;
   }
 
   /* Get a client. We will get all other interfaces we need from
    * this pointer. */
   hr = device->Activate(__uuidof(IAudioClient),
-      CLSCTX_INPROC_SERVER,
-      NULL, (void **)&stm->client);
+                        CLSCTX_INPROC_SERVER,
+                        NULL, (void **)&stm->client);
   SafeRelease(device);
   if (FAILED(hr)) {
-    LOG("Could not activate the device to get an audio client: error: %x", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Could not activate the device to get an audio client: error: %x\n", hr);
     return CUBEB_ERROR;
   }
 
@@ -967,9 +992,7 @@
    * and the format the stream we want to play uses. */
   hr = stm->client->GetMixFormat(&mix_format);
   if (FAILED(hr)) {
-    LOG("Could not fetch current mix format from the audio client: error: %x", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Could not fetch current mix format from the audio client: error: %x\n", hr);
     return CUBEB_ERROR;
   }
 
@@ -982,57 +1005,47 @@
   stm->mix_params.channels = mix_format->nChannels;
 
   hr = stm->client->Initialize(AUDCLNT_SHAREMODE_SHARED,
-      AUDCLNT_STREAMFLAGS_EVENTCALLBACK |
-      AUDCLNT_STREAMFLAGS_NOPERSIST,
-      ms_to_hns(stm->latency),
-      0,
-      mix_format,
-      NULL);
+                               AUDCLNT_STREAMFLAGS_EVENTCALLBACK |
+                               AUDCLNT_STREAMFLAGS_NOPERSIST,
+                               ms_to_hns(stm->latency),
+                               0,
+                               mix_format,
+                               NULL);
 
   CoTaskMemFree(mix_format);
 
   if (FAILED(hr)) {
-    LOG("Unable to initialize audio client: %x.", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Unable to initialize audio client: %x.\n", hr);
     return CUBEB_ERROR;
   }
 
   hr = stm->client->GetBufferSize(&stm->buffer_frame_count);
   if (FAILED(hr)) {
-    LOG("Could not get the buffer size from the client %x.", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Could not get the buffer size from the client %x.\n", hr);
     return CUBEB_ERROR;
   }
 
   if (should_upmix(stm) || should_downmix(stm)) {
-    stm->mix_buffer = (float *)malloc(frames_to_bytes_before_mix(stm, stm->buffer_frame_count));
+    stm->mix_buffer = (float *) malloc(frames_to_bytes_before_mix(stm, stm->buffer_frame_count));
   }
 
   hr = stm->client->SetEventHandle(stm->refill_event);
   if (FAILED(hr)) {
-    LOG("Could set the event handle for the client %x.", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Could set the event handle for the client %x.\n", hr);
     return CUBEB_ERROR;
   }
 
   hr = stm->client->GetService(__uuidof(IAudioRenderClient),
-      (void **)&stm->render_client);
+                               (void **)&stm->render_client);
   if (FAILED(hr)) {
-    LOG("Could not get the render client %x.", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Could not get the render client %x.\n", hr);
     return CUBEB_ERROR;
   }
 
   hr = stm->client->GetService(__uuidof(IAudioStreamVolume),
-      (void **)&stm->audio_stream_volume);
+                               (void **)&stm->audio_stream_volume);
   if (FAILED(hr)) {
-    LOG("Could not get the IAudioStreamVolume %x.", hr);
-    auto_unlock unlock(stm->stream_reset_lock);
-    wasapi_stream_destroy(stm);
+    LOG("Could not get the IAudioStreamVolume %x.\n", hr);
     return CUBEB_ERROR;
   }
 
@@ -1041,15 +1054,13 @@
    * of channels of the stream, not the number of channels
    * that WASAPI wants. */
   stm->resampler = cubeb_resampler_create(stm, stm->stream_params,
-      stm->mix_params.rate,
-      stm->data_callback,
-      stm->buffer_frame_count,
-      stm->user_ptr,
-      CUBEB_RESAMPLER_QUALITY_DESKTOP);
+                                          stm->mix_params.rate,
+                                          stm->data_callback,
+                                          stm->buffer_frame_count,
+                                          stm->user_ptr,
+                                          CUBEB_RESAMPLER_QUALITY_DESKTOP);
   if (!stm->resampler) {
-    auto_unlock unlock(stm->stream_reset_lock);
-    LOG("Could not get a resampler");
-    wasapi_stream_destroy(stm);
+    LOG("Could not get a resampler\n");
     return CUBEB_ERROR;
   }
 
@@ -1065,12 +1076,15 @@
   HRESULT hr;
   int rv;
   auto_com com;
+  if (!com.ok()) {
+    return CUBEB_ERROR;
+  }
 
-  assert(context && stream);
+  XASSERT(context && stream);
 
   cubeb_stream * stm = (cubeb_stream *)calloc(1, sizeof(cubeb_stream));
 
-  assert(stm);
+  XASSERT(stm);
 
   stm->context = context;
   stm->data_callback = data_callback;
@@ -1082,47 +1096,46 @@
   stm->clock = 0;
 
   /* Null out WASAPI-specific state */
-  stm->resampler = nullptr;
-  stm->client = nullptr;
-  stm->render_client = nullptr;
-  stm->audio_stream_volume = nullptr;
-  stm->device_enumerator = nullptr;
-  stm->notification_client = nullptr;
+  stm->resampler = NULL;
+  stm->client = NULL;
+  stm->render_client = NULL;
+  stm->audio_stream_volume = NULL;
+  stm->device_enumerator = NULL;
+  stm->notification_client = NULL;
 
   stm->stream_reset_lock = new owned_critical_section();
 
-  stm->shutdown_event = CreateEvent(NULL, 0, 0, NULL);
-  stm->refill_event = CreateEvent(NULL, 0, 0, NULL);
-
-  if (!stm->shutdown_event) {
-    LOG("Can't create the shutdown event, error: %x.", GetLastError());
+  stm->reconfigure_event = CreateEvent(NULL, 0, 0, NULL);
+  if (!stm->reconfigure_event) {
+    LOG("Can't create the reconfigure event, error: %x\n", GetLastError());
     wasapi_stream_destroy(stm);
     return CUBEB_ERROR;
   }
 
+  stm->refill_event = CreateEvent(NULL, 0, 0, NULL);
   if (!stm->refill_event) {
-    SafeRelease(stm->shutdown_event);
-    LOG("Can't create the refill event, error: %x.", GetLastError());
+    LOG("Can't create the refill event, error: %x\n", GetLastError());
     wasapi_stream_destroy(stm);
     return CUBEB_ERROR;
   }
 
   {
-    /* Locking here is not stricly necessary, because we don't have a
+    /* Locking here is not strictly necessary, because we don't have a
        notification client that can reset the stream yet, but it lets us
        assert that the lock is held in the function. */
     auto_lock lock(stm->stream_reset_lock);
     rv = setup_wasapi_stream(stm);
-    if (rv != CUBEB_OK) {
-      return rv;
-    }
+  }
+  if (rv != CUBEB_OK) {
+    wasapi_stream_destroy(stm);
+    return rv;
   }
 
   hr = register_notification_client(stm);
   if (FAILED(hr)) {
     /* this is not fatal, we can still play audio, but we won't be able
      * to keep using the default audio endpoint if it changes. */
-    LOG("failed to register notification client, %x", hr);
+    LOG("failed to register notification client, %x\n", hr);
   }
 
   *stream = stm;
@@ -1132,39 +1145,34 @@
 
 void close_wasapi_stream(cubeb_stream * stm)
 {
-  assert(stm);
+  XASSERT(stm);
 
   stm->stream_reset_lock->assert_current_thread_owns();
 
   SafeRelease(stm->client);
-  stm->client = nullptr;
+  stm->client = NULL;
 
   SafeRelease(stm->render_client);
-  stm->client = nullptr;
+  stm->render_client = NULL;
 
   if (stm->resampler) {
     cubeb_resampler_destroy(stm->resampler);
-    stm->resampler = nullptr;
+    stm->resampler = NULL;
   }
 
   free(stm->mix_buffer);
-  stm->mix_buffer = nullptr;
+  stm->mix_buffer = NULL;
 }
 
 void wasapi_stream_destroy(cubeb_stream * stm)
 {
-  assert(stm);
+  XASSERT(stm);
 
   unregister_notification_client(stm);
 
-  if (stm->thread) {
-    SetEvent(stm->shutdown_event);
-    WaitForSingleObject(stm->thread, INFINITE);
-    CloseHandle(stm->thread);
-    stm->thread = 0;
-  }
+  stop_and_join_render_thread(stm);
 
-  SafeRelease(stm->shutdown_event);
+  SafeRelease(stm->reconfigure_event);
   SafeRelease(stm->refill_event);
 
   {
@@ -1179,57 +1187,58 @@
 
 int wasapi_stream_start(cubeb_stream * stm)
 {
-  HRESULT hr;
-
   auto_lock lock(stm->stream_reset_lock);
 
-  assert(stm);
+  XASSERT(stm && !stm->thread && !stm->shutdown_event);
+
+  stm->shutdown_event = CreateEvent(NULL, 0, 0, NULL);
+  if (!stm->shutdown_event) {
+    LOG("Can't create the shutdown event, error: %x\n", GetLastError());
+    return CUBEB_ERROR;
+  }
 
   stm->thread = (HANDLE) _beginthreadex(NULL, 256 * 1024, wasapi_stream_render_loop, stm, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL);
   if (stm->thread == NULL) {
-    LOG("could not create WASAPI render thread.");
+    LOG("could not create WASAPI render thread.\n");
     return CUBEB_ERROR;
   }
 
-  hr = stm->client->Start();
+  HRESULT hr = stm->client->Start();
   if (FAILED(hr)) {
-    LOG("could not start the stream.");
+    LOG("could not start the stream.\n");
     return CUBEB_ERROR;
+  } else {
+    stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_STARTED);
   }
 
-  stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_STARTED);
-
-  return CUBEB_OK;
+  return FAILED(hr) ? CUBEB_ERROR : CUBEB_OK;
 }
 
 int wasapi_stream_stop(cubeb_stream * stm)
 {
-  assert(stm && stm->shutdown_event);
+  XASSERT(stm);
 
   auto_lock lock(stm->stream_reset_lock);
 
-  SetEvent(stm->shutdown_event);
-
   HRESULT hr = stm->client->Stop();
   if (FAILED(hr)) {
-    LOG("could not stop AudioClient");
+    LOG("could not stop AudioClient\n");
   }
 
-  if (stm->thread) {
-    auto_unlock lock(stm->stream_reset_lock);
-    WaitForSingleObject(stm->thread, INFINITE);
-    CloseHandle(stm->thread);
-    stm->thread = NULL;
-  }
+  stm->stream_reset_lock->leave();
+  stop_and_join_render_thread(stm);
+  stm->stream_reset_lock->enter();
 
-  stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_STOPPED);
+  if (SUCCEEDED(hr)) {
+    stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_STOPPED);
+  }
 
-  return CUBEB_OK;
+  return FAILED(hr) ? CUBEB_ERROR : CUBEB_OK;
 }
 
 int wasapi_stream_get_position(cubeb_stream * stm, uint64_t * position)
 {
-  assert(stm && position);
+  XASSERT(stm && position);
 
   *position = clock_get(stm);
 
@@ -1238,7 +1247,7 @@
 
 int wasapi_stream_get_latency(cubeb_stream * stm, uint32_t * latency)
 {
-  assert(stm && latency);
+  XASSERT(stm && latency);
 
   auto_lock lock(stm->stream_reset_lock);
 
@@ -1267,11 +1276,11 @@
 
   hr = stm->audio_stream_volume->GetChannelCount(&channels);
   if (hr != S_OK) {
-    LOG("could not get the channel count: %x", hr);
+    LOG("could not get the channel count: %x\n", hr);
     return CUBEB_ERROR;
   }
 
-  assert(channels <= 10 && "bump the array size");
+  XASSERT(channels <= 10 && "bump the array size");
 
   for (uint32_t i = 0; i < channels; i++) {
     volumes[i] = volume;
@@ -1279,7 +1288,7 @@
 
   hr = stm->audio_stream_volume->SetAllVolumes(channels,  volumes);
   if (hr != S_OK) {
-    LOG("coult not set the channels volume: %x", hr);
+    LOG("could not set the channels volume: %x\n", hr);
     return CUBEB_ERROR;
   }
   return CUBEB_OK;
@@ -1303,6 +1312,5 @@
   /*.stream_get_current_device =*/ NULL,
   /*.stream_device_destroy =*/ NULL,
   /*.stream_register_device_changed_callback =*/ NULL
- };
+};
 } // namespace anonymous
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb_winmm.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb_winmm.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libcubeb/src/cubeb_winmm.c	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libcubeb/src/cubeb_winmm.c	2015-02-28 15:03:04.000000000 +0000
@@ -4,7 +4,6 @@
  * This program is made available under an ISC-style license.  See the
  * accompanying file LICENSE for details.
  */
-#undef NDEBUG
 #define __MSVCRT_VERSION__ 0x0700
 #undef WINVER
 #define WINVER 0x0501
@@ -12,11 +11,11 @@
 #define WIN32_LEAN_AND_MEAN
 
 #include <malloc.h>
-#include <assert.h>
 #include <windows.h>
 #include <mmreg.h>
 #include <mmsystem.h>
 #include <process.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include "cubeb/cubeb.h"
@@ -95,7 +94,7 @@
     bytes = sizeof(float);
     break;
   default:
-    assert(0);
+    XASSERT(0);
   }
 
   return bytes * params.channels;
@@ -106,10 +105,10 @@
 {
   WAVEHDR * hdr = NULL;
 
-  assert(stm->free_buffers > 0 && stm->free_buffers <= NBUFS);
+  XASSERT(stm->free_buffers > 0 && stm->free_buffers <= NBUFS);
   hdr = &stm->buffers[stm->next_buffer];
-  assert(hdr->dwFlags & WHDR_PREPARED ||
-         (hdr->dwFlags & WHDR_DONE && !(hdr->dwFlags & WHDR_INQUEUE)));
+  XASSERT(hdr->dwFlags & WHDR_PREPARED ||
+          (hdr->dwFlags & WHDR_DONE && !(hdr->dwFlags & WHDR_INQUEUE)));
   stm->next_buffer = (stm->next_buffer + 1) % NBUFS;
   stm->free_buffers -= 1;
 
@@ -126,7 +125,7 @@
 
   EnterCriticalSection(&stm->lock);
   stm->free_buffers += 1;
-  assert(stm->free_buffers > 0 && stm->free_buffers <= NBUFS);
+  XASSERT(stm->free_buffers > 0 && stm->free_buffers <= NBUFS);
 
   if (stm->draining) {
     LeaveCriticalSection(&stm->lock);
@@ -155,17 +154,17 @@
   if (got < 0) {
     LeaveCriticalSection(&stm->lock);
     /* XXX handle this case */
-    assert(0);
+    XASSERT(0);
     return;
   } else if (got < wanted) {
     stm->draining = 1;
   }
   stm->written += got;
 
-  assert(hdr->dwFlags & WHDR_PREPARED);
+  XASSERT(hdr->dwFlags & WHDR_PREPARED);
 
   hdr->dwBufferLength = got * bytes_per_frame(stm->params);
-  assert(hdr->dwBufferLength <= stm->buffer_size);
+  XASSERT(hdr->dwBufferLength <= stm->buffer_size);
 
   if (stm->soft_volume != -1.0) {
     if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
@@ -197,14 +196,14 @@
 winmm_buffer_thread(void * user_ptr)
 {
   cubeb * ctx = (cubeb *) user_ptr;
-  assert(ctx);
+  XASSERT(ctx);
 
   for (;;) {
     DWORD r;
     PSLIST_ENTRY item;
 
     r = WaitForSingleObject(ctx->event, INFINITE);
-    assert(r == WAIT_OBJECT_0);
+    XASSERT(r == WAIT_OBJECT_0);
 
     /* Process work items in batches so that a single stream can't
        starve the others by continuously adding new work to the top of
@@ -236,7 +235,7 @@
   }
 
   item = _aligned_malloc(sizeof(struct cubeb_stream_item), MEMORY_ALLOCATION_ALIGNMENT);
-  assert(item);
+  XASSERT(item);
   item->stream = stm;
   InterlockedPushEntrySList(stm->context->work, &item->head);
 
@@ -278,16 +277,16 @@
 {
   cubeb * ctx;
 
-  assert(context);
+  XASSERT(context);
   *context = NULL;
 
   ctx = calloc(1, sizeof(*ctx));
-  assert(ctx);
+  XASSERT(ctx);
 
   ctx->ops = &winmm_ops;
 
   ctx->work = _aligned_malloc(sizeof(*ctx->work), MEMORY_ALLOCATION_ALIGNMENT);
-  assert(ctx->work);
+  XASSERT(ctx->work);
   InitializeSListHead(ctx->work);
 
   ctx->event = CreateEvent(NULL, FALSE, FALSE, NULL);
@@ -325,8 +324,8 @@
 {
   DWORD r;
 
-  assert(ctx->active_streams == 0);
-  assert(!InterlockedPopEntrySList(ctx->work));
+  XASSERT(ctx->active_streams == 0);
+  XASSERT(!InterlockedPopEntrySList(ctx->work));
 
   DeleteCriticalSection(&ctx->lock);
 
@@ -334,7 +333,7 @@
     ctx->shutdown = 1;
     SetEvent(ctx->event);
     r = WaitForSingleObject(ctx->thread, INFINITE);
-    assert(r == WAIT_OBJECT_0);
+    XASSERT(r == WAIT_OBJECT_0);
     CloseHandle(ctx->thread);
   }
 
@@ -362,8 +361,8 @@
   int i;
   size_t bufsz;
 
-  assert(context);
-  assert(stream);
+  XASSERT(context);
+  XASSERT(stream);
 
   *stream = NULL;
 
@@ -413,7 +412,7 @@
   LeaveCriticalSection(&context->lock);
 
   stm = calloc(1, sizeof(*stm));
-  assert(stm);
+  XASSERT(stm);
 
   stm->context = context;
 
@@ -432,7 +431,7 @@
   if (bufsz % bytes_per_frame(stm->params) != 0) {
     bufsz += bytes_per_frame(stm->params) - (bufsz % bytes_per_frame(stm->params));
   }
-  assert(bufsz % bytes_per_frame(stm->params) == 0);
+  XASSERT(bufsz % bytes_per_frame(stm->params) == 0);
 
   stm->buffer_size = bufsz;
 
@@ -467,7 +466,7 @@
     WAVEHDR * hdr = &stm->buffers[i];
 
     hdr->lpData = calloc(1, bufsz);
-    assert(hdr->lpData);
+    XASSERT(hdr->lpData);
     hdr->dwBufferLength = bufsz;
     hdr->dwFlags = 0;
 
@@ -504,7 +503,7 @@
     /* Wait for all blocks to complete. */
     while (enqueued > 0) {
       r = WaitForSingleObject(stm->event, INFINITE);
-      assert(r == WAIT_OBJECT_0);
+      XASSERT(r == WAIT_OBJECT_0);
 
       EnterCriticalSection(&stm->lock);
       enqueued = NBUFS - stm->free_buffers;
@@ -535,7 +534,7 @@
   }
 
   EnterCriticalSection(&stm->context->lock);
-  assert(stm->context->active_streams >= 1);
+  XASSERT(stm->context->active_streams >= 1);
   stm->context->active_streams -= 1;
   LeaveCriticalSection(&stm->context->lock);
 
@@ -545,7 +544,7 @@
 static int
 winmm_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
 {
-  assert(ctx && max_channels);
+  XASSERT(ctx && max_channels);
 
   /* We don't support more than two channels in this backend. */
   *max_channels = 2;
@@ -654,6 +653,10 @@
   written = stm->written;
   LeaveCriticalSection(&stm->lock);
 
+  if (r != MMSYSERR_NOERROR || time.wType != TIME_SAMPLES) {
+    return CUBEB_ERROR;
+  }
+
   *latency = written - time.u.sample;
 
   return CUBEB_OK;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libsoundtouch/src/soundtouch_config.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libsoundtouch/src/soundtouch_config.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libsoundtouch/src/soundtouch_config.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libsoundtouch/src/soundtouch_config.h	2015-02-28 15:03:04.000000000 +0000
@@ -5,15 +5,3 @@
 #else
 #define SOUNDTOUCH_INTEGER_SAMPLES 1
 #endif
-
-#ifndef MOZILLA_PRESUME_SSE
-#ifdef MOZ_SAMPLE_TYPE_FLOAT32
-#define SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS 1
-#endif
-#endif
-
-#ifndef MOZILLA_PRESUME_MMX
-#ifdef MOZ_SAMPLE_TYPE_S16
-#define SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS 1
-#endif
-#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libstagefright/binding/Index.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libstagefright/binding/Index.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libstagefright/binding/Index.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libstagefright/binding/Index.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -157,7 +157,10 @@
 Sample* SampleIterator::Get()
 {
   if (!mIndex->mMoofParser) {
-    return nullptr;
+    MOZ_ASSERT(!mCurrentMoof);
+    return mCurrentSample < mIndex->mIndex.Length()
+      ? &mIndex->mIndex[mCurrentSample]
+      : nullptr;
   }
 
   nsTArray<Moof>& moofs = mIndex->mMoofParser->Moofs();
@@ -209,26 +212,15 @@
 Microseconds
 SampleIterator::GetNextKeyframeTime()
 {
-  nsTArray<Moof>& moofs = mIndex->mMoofParser->Moofs();
-  size_t sample = mCurrentSample + 1;
-  size_t moof = mCurrentMoof;
-  while (true) {
-    while (true) {
-      if (moof == moofs.Length()) {
-        return -1;
-      }
-      if (sample < moofs[moof].mIndex.Length()) {
-        break;
-      }
-      sample = 0;
-      ++moof;
-    }
-    if (moofs[moof].mIndex[sample].mSync) {
-      return moofs[moof].mIndex[sample].mDecodeTime;
+  SampleIterator itr(*this);
+  Sample* sample;
+  while (!!(sample = itr.Get())) {
+    if (sample->mSync) {
+      return sample->mCompositionRange.start;
     }
-    ++sample;
+    itr.Next();
   }
-  MOZ_ASSERT(false); // should not be reached.
+  return -1;
 }
 
 Index::Index(const stagefright::Vector<MediaSource::Indice>& aIndex,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libstagefright/binding/mp4_demuxer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libstagefright/binding/mp4_demuxer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libstagefright/binding/mp4_demuxer.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libstagefright/binding/mp4_demuxer.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -124,9 +124,7 @@
                                         mSource, mAudioConfig.mTrackId,
                                         mMonitor);
       mPrivate->mIndexes.AppendElement(index);
-      if (index->IsFragmented()) {
-        mPrivate->mAudioIterator = new SampleIterator(index);
-      }
+      mPrivate->mAudioIterator = new SampleIterator(index);
     } else if (!mPrivate->mVideo.get() && !strncmp(mimeType, "video/", 6)) {
       sp<MediaSource> track = e->getTrack(i);
       if (track->start() != OK) {
@@ -138,9 +136,7 @@
                                         mSource, mVideoConfig.mTrackId,
                                         mMonitor);
       mPrivate->mIndexes.AppendElement(index);
-      if (index->IsFragmented()) {
-        mPrivate->mVideoIterator = new SampleIterator(index);
-      }
+      mPrivate->mVideoIterator = new SampleIterator(index);
     }
   }
   sp<MetaData> metaData = e->getMetaData();
@@ -335,7 +331,7 @@
   for (int i = 0; i < mPrivate->mIndexes.Length(); i++) {
     offset = std::min(offset, mPrivate->mIndexes[i]->GetEvictionOffset(aTime));
   }
-  return offset == std::numeric_limits<uint64_t>::max() ? -1 : offset;
+  return offset == std::numeric_limits<uint64_t>::max() ? 0 : offset;
 }
 
 Microseconds
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp	2015-02-28 15:03:04.000000000 +0000
@@ -1243,6 +1243,12 @@
         case FOURCC('s', 'a', 'm', 'r'):
         case FOURCC('s', 'a', 'w', 'b'):
         {
+            // QT's MP4 may have an empty MP4A atom within a MP4A atom.
+            // Ignore it.
+            if (chunk_data_size == 4) {
+                *offset += chunk_size;
+                break;
+            }
             uint8_t buffer[8 + 20];
             if (chunk_data_size < (ssize_t)sizeof(buffer)) {
                 // Basic AudioSampleEntry size.
@@ -1255,6 +1261,7 @@
             }
 
             uint16_t data_ref_index = U16_AT(&buffer[6]);
+            uint16_t qt_version = U16_AT(&buffer[8]);
             uint32_t num_channels = U16_AT(&buffer[16]);
 
             uint16_t sample_size = U16_AT(&buffer[18]);
@@ -1271,8 +1278,41 @@
             mLastTrack->meta->setInt32(kKeySampleSize, sample_size);
             mLastTrack->meta->setInt32(kKeySampleRate, sample_rate);
 
+            uint64_t skip = 0;
+            if (qt_version == 1) {
+                // Skip QTv1 extension
+                // uint32_t SamplesPerPacket
+                // uint32_t BytesPerPacket
+                // uint32_t BytesPerFrame
+                // uint32_t BytesPerSample
+                skip = 16;
+            } else if (qt_version == 2) {
+                // Skip QTv2 extension
+                // uint32_t Qt V2 StructSize
+                // double SampleRate
+                // uint32_t ChannelCount
+                // uint32_t Reserved
+                // uint32_t BitsPerChannel
+                // uint32_t LPCMFormatSpecificFlags
+                // uint32_t BytesPerAudioPacket
+                // uint32_t LPCMFramesPerAudioPacket
+                // if (Qt V2 StructSize > 72) {
+                //     StructSize-72: Qt V2 extension
+                // }
+                uint32_t structSize32;
+                if (mDataSource->readAt(
+                            data_offset + 28, &structSize32, sizeof(structSize32))
+                        < (ssize_t)sizeof(structSize32)) {
+                    return ERROR_IO;
+                }
+                uint32_t structSize = ntohl(structSize32);
+                skip += 36;
+                if (structSize > 72) {
+                    skip += structSize - 72;
+                }
+            }
             off64_t stop_offset = *offset + chunk_size;
-            *offset = data_offset + sizeof(buffer);
+            *offset = data_offset + sizeof(buffer) + skip;
             while (*offset < stop_offset) {
                 status_t err = parseChunk(offset, depth + 1);
                 if (err != OK) {
@@ -1336,6 +1376,11 @@
                 if (err != OK) {
                     return err;
                 }
+                // Some Apple QuickTime muxed videos appear to have some padding.
+                // Ignore it and assume we've reached the end.
+                if (stop_offset - *offset < 8) {
+                    *offset = stop_offset;
+                }
             }
 
             if (*offset != stop_offset) {
@@ -1856,6 +1901,23 @@
             return UNKNOWN_ERROR; // stop parsing after sidx
         }
 
+        case FOURCC('w', 'a', 'v', 'e'):
+        {
+            off64_t stop_offset = *offset + chunk_size;
+            *offset = data_offset;
+            while (*offset < stop_offset) {
+                status_t err = parseChunk(offset, depth + 1);
+                if (err != OK) {
+                    return err;
+                }
+            }
+
+            if (*offset != stop_offset) {
+                return ERROR_MALFORMED;
+            }
+            break;
+        }
+
         default:
         {
             *offset += chunk_size;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/moz.build	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/moz.build	2015-02-28 15:03:04.000000000 +0000
@@ -42,8 +42,8 @@
         SOURCES += files['X86-64_ASM']
 
     # AVX2 only supported on
-    # Darwin and mingw toolchains right now
-    if CONFIG['OS_TARGET'] == 'Darwin' or (CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['GNU_CC']):
+    # Darwin and Windows toolchains right now
+    if CONFIG['OS_TARGET'] in ('Darwin', 'WINNT'):
         SOURCES += files['AVX2']
 
     #postproc is only enabled on x86 with asm
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/update.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/update.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/update.py	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/update.py	2015-02-28 15:03:04.000000000 +0000
@@ -12,8 +12,8 @@
 from StringIO import StringIO
 
 PLATFORMS= [
-  'x86-win32-vs8',
-  'x86_64-win64-vs8',
+  'x86-win32-vs12',
+  'x86_64-win64-vs12',
   'x86-linux-gcc',
   'x86_64-linux-gcc',
   'generic-gnu',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd.h	2015-02-28 15:03:04.000000000 +0000
@@ -9,7 +9,7 @@
 #if defined(_WIN64)
 /* 64 bit Windows */
 #ifdef _MSC_VER
-#include "vp8_rtcd_x86_64-win64-vs8.h"
+#include "vp8_rtcd_x86_64-win64-vs12.h"
 #else
 #include "vp8_rtcd_x86_64-win64-gcc.h"
 #endif
@@ -17,7 +17,7 @@
 #elif defined(_WIN32)
 /* 32 bit Windows, MSVC. */
 #ifdef _MSC_VER
-#include "vp8_rtcd_x86-win32-vs8.h"
+#include "vp8_rtcd_x86-win32-vs12.h"
 #else
 #include "vp8_rtcd_x86-win32-gcc.h"
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs12.h	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,571 @@
+#ifndef VP8_RTCD_H_
+#define VP8_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+/*
+ * VP8
+ */
+
+struct blockd;
+struct macroblockd;
+struct loop_filter_info;
+
+/* Encoder forward decls */
+struct block;
+struct macroblock;
+struct variance_vtable;
+union int_mv;
+struct yv12_buffer_config;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_mmx
+
+void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+#define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_mmx
+
+void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
+#define vp8_blend_b vp8_blend_b_c
+
+void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
+#define vp8_blend_mb_inner vp8_blend_mb_inner_c
+
+void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
+#define vp8_blend_mb_outer vp8_blend_mb_outer_c
+
+int vp8_block_error_c(short *coeff, short *dqcoeff);
+int vp8_block_error_mmx(short *coeff, short *dqcoeff);
+int vp8_block_error_xmm(short *coeff, short *dqcoeff);
+#define vp8_block_error vp8_block_error_xmm
+
+void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+
+void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+
+void vp8_clear_system_state_c();
+void vpx_reset_mmx_state();
+#define vp8_clear_system_state vpx_reset_mmx_state
+
+void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+
+void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem16x16_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+#define vp8_copy_mem16x16 vp8_copy_mem16x16_sse2
+
+void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+#define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx
+
+void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+#define vp8_copy_mem8x8 vp8_copy_mem8x8_mmx
+
+void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
+void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
+#define vp8_dc_only_idct_add vp8_dc_only_idct_add_mmx
+
+int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+#define vp8_denoiser_filter vp8_denoiser_filter_sse2
+
+int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+#define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_sse2
+
+void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride);
+void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride);
+#define vp8_dequant_idct_add vp8_dequant_idct_add_mmx
+
+void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
+void vp8_dequant_idct_add_uv_block_mmx(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
+void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
+#define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_sse2
+
+void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
+void vp8_dequant_idct_add_y_block_mmx(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
+void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
+#define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_sse2
+
+void vp8_dequantize_b_c(struct blockd*, short *dqc);
+void vp8_dequantize_b_mmx(struct blockd*, short *dqc);
+#define vp8_dequantize_b vp8_dequantize_b_mmx
+
+int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+
+void vp8_fast_quantize_b_c(struct block *, struct blockd *);
+void vp8_fast_quantize_b_sse2(struct block *, struct blockd *);
+void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *);
+RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *);
+
+void vp8_fast_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
+#define vp8_fast_quantize_b_pair vp8_fast_quantize_b_pair_c
+
+void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2
+
+void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
+
+void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2
+
+int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_full_search_sadx3(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_full_search_sadx8(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+
+unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx
+
+unsigned int vp8_get_mb_ss_c(const short *);
+unsigned int vp8_get_mb_ss_mmx(const short *);
+unsigned int vp8_get_mb_ss_sse2(const short *);
+#define vp8_get_mb_ss vp8_get_mb_ss_sse2
+
+void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
+#define vp8_intra4x4_predict vp8_intra4x4_predict_c
+
+void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+#define vp8_loop_filter_bh vp8_loop_filter_bh_sse2
+
+void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+#define vp8_loop_filter_bv vp8_loop_filter_bv_sse2
+
+void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+#define vp8_loop_filter_mbh vp8_loop_filter_mbh_sse2
+
+void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+#define vp8_loop_filter_mbv vp8_loop_filter_mbv_sse2
+
+void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bhs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+#define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_sse2
+
+void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bvs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+#define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_sse2
+
+void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_horizontal_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+#define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_sse2
+
+void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_vertical_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+#define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_sse2
+
+int vp8_mbblock_error_c(struct macroblock *mb, int dc);
+int vp8_mbblock_error_mmx(struct macroblock *mb, int dc);
+int vp8_mbblock_error_xmm(struct macroblock *mb, int dc);
+#define vp8_mbblock_error vp8_mbblock_error_xmm
+
+void vp8_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+void vp8_mbpost_proc_across_ip_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+#define vp8_mbpost_proc_across_ip vp8_mbpost_proc_across_ip_xmm
+
+void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+void vp8_mbpost_proc_down_mmx(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+void vp8_mbpost_proc_down_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+#define vp8_mbpost_proc_down vp8_mbpost_proc_down_xmm
+
+int vp8_mbuverror_c(struct macroblock *mb);
+int vp8_mbuverror_mmx(struct macroblock *mb);
+int vp8_mbuverror_xmm(struct macroblock *mb);
+#define vp8_mbuverror vp8_mbuverror_xmm
+
+unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_mse16x16 vp8_mse16x16_wmt
+
+void vp8_plane_add_noise_c(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
+void vp8_plane_add_noise_mmx(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
+void vp8_plane_add_noise_wmt(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
+#define vp8_plane_add_noise vp8_plane_add_noise_wmt
+
+void vp8_post_proc_down_and_across_mb_row_c(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
+void vp8_post_proc_down_and_across_mb_row_sse2(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
+#define vp8_post_proc_down_and_across_mb_row vp8_post_proc_down_and_across_mb_row_sse2
+
+void vp8_quantize_mb_c(struct macroblock *);
+#define vp8_quantize_mb vp8_quantize_mb_c
+
+void vp8_quantize_mbuv_c(struct macroblock *);
+#define vp8_quantize_mbuv vp8_quantize_mbuv_c
+
+void vp8_quantize_mby_c(struct macroblock *);
+#define vp8_quantize_mby vp8_quantize_mby_c
+
+int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+RTCD_EXTERN int (*vp8_refining_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+
+void vp8_regular_quantize_b_c(struct block *, struct blockd *);
+void vp8_regular_quantize_b_sse2(struct block *, struct blockd *);
+void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *);
+RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *);
+
+void vp8_regular_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
+#define vp8_regular_quantize_b_pair vp8_regular_quantize_b_pair_c
+
+unsigned int vp8_sad16x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x16_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+RTCD_EXTERN unsigned int (*vp8_sad16x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+
+void vp8_sad16x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x16x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad16x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad16x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+#define vp8_sad16x8 vp8_sad16x8_wmt
+
+void vp8_sad16x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x8x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad16x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad16x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+#define vp8_sad4x4 vp8_sad4x4_wmt
+
+void vp8_sad4x4x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad4x4x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad4x4x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad4x4x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad4x4x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad4x4x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad4x4x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad4x4x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad4x4x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad8x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+#define vp8_sad8x16 vp8_sad8x16_wmt
+
+void vp8_sad8x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad8x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad8x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+#define vp8_sad8x8 vp8_sad8x8_wmt
+
+void vp8_sad8x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad8x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad8x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
+void vp8_short_fdct4x4_mmx(short *input, short *output, int pitch);
+void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch);
+#define vp8_short_fdct4x4 vp8_short_fdct4x4_sse2
+
+void vp8_short_fdct8x4_c(short *input, short *output, int pitch);
+void vp8_short_fdct8x4_mmx(short *input, short *output, int pitch);
+void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch);
+#define vp8_short_fdct8x4 vp8_short_fdct8x4_sse2
+
+void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
+void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
+#define vp8_short_idct4x4llm vp8_short_idct4x4llm_mmx
+
+void vp8_short_inv_walsh4x4_c(short *input, short *output);
+void vp8_short_inv_walsh4x4_mmx(short *input, short *output);
+void vp8_short_inv_walsh4x4_sse2(short *input, short *output);
+#define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_sse2
+
+void vp8_short_inv_walsh4x4_1_c(short *input, short *output);
+#define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c
+
+void vp8_short_walsh4x4_c(short *input, short *output, int pitch);
+void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch);
+#define vp8_short_walsh4x4 vp8_short_walsh4x4_sse2
+
+void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt
+
+unsigned int vp8_sub_pixel_variance16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x16_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+unsigned int vp8_sub_pixel_variance16x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x8_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x8)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+unsigned int vp8_sub_pixel_variance4x4_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance4x4_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance4x4_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+#define vp8_sub_pixel_variance4x4 vp8_sub_pixel_variance4x4_wmt
+
+unsigned int vp8_sub_pixel_variance8x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+#define vp8_sub_pixel_variance8x16 vp8_sub_pixel_variance8x16_wmt
+
+unsigned int vp8_sub_pixel_variance8x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+#define vp8_sub_pixel_variance8x8 vp8_sub_pixel_variance8x8_wmt
+
+void vp8_subtract_b_c(struct block *be, struct blockd *bd, int pitch);
+void vp8_subtract_b_mmx(struct block *be, struct blockd *bd, int pitch);
+void vp8_subtract_b_sse2(struct block *be, struct blockd *bd, int pitch);
+#define vp8_subtract_b vp8_subtract_b_sse2
+
+void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
+void vp8_subtract_mbuv_mmx(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
+void vp8_subtract_mbuv_sse2(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
+#define vp8_subtract_mbuv vp8_subtract_mbuv_sse2
+
+void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
+void vp8_subtract_mby_mmx(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
+void vp8_subtract_mby_sse2(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
+#define vp8_subtract_mby vp8_subtract_mby_sse2
+
+void vp8_temporal_filter_apply_c(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
+void vp8_temporal_filter_apply_sse2(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
+#define vp8_temporal_filter_apply vp8_temporal_filter_apply_sse2
+
+unsigned int vp8_variance16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance16x16 vp8_variance16x16_wmt
+
+unsigned int vp8_variance16x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance16x8 vp8_variance16x8_wmt
+
+unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance4x4 vp8_variance4x4_wmt
+
+unsigned int vp8_variance8x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance8x16 vp8_variance8x16_wmt
+
+unsigned int vp8_variance8x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance8x8 vp8_variance8x8_wmt
+
+unsigned int vp8_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_h_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_h_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance_halfpixvar16x16_h vp8_variance_halfpixvar16x16_h_wmt
+
+unsigned int vp8_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_wmt
+
+unsigned int vp8_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_v_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_v_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+#define vp8_variance_halfpixvar16x16_v vp8_variance_halfpixvar16x16_v_wmt
+
+void vp8_rtcd(void);
+
+#ifdef RTCD_C
+#include "vpx_ports/x86.h"
+static void setup_rtcd_internal(void)
+{
+    int flags = x86_simd_caps();
+
+    (void)flags;
+
+    vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_sse2;
+    if (flags & HAS_SSSE3) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_ssse3;
+    vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2;
+    if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3;
+    vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2;
+    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3;
+    vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2;
+    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3;
+    vp8_copy32xn = vp8_copy32xn_sse2;
+    if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3;
+    vp8_diamond_search_sad = vp8_diamond_search_sad_c;
+    if (flags & HAS_SSE3) vp8_diamond_search_sad = vp8_diamond_search_sadx4;
+    vp8_fast_quantize_b = vp8_fast_quantize_b_sse2;
+    if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3;
+    vp8_full_search_sad = vp8_full_search_sad_c;
+    if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3;
+    if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8;
+    vp8_refining_search_sad = vp8_refining_search_sad_c;
+    if (flags & HAS_SSE3) vp8_refining_search_sad = vp8_refining_search_sadx4;
+    vp8_regular_quantize_b = vp8_regular_quantize_b_sse2;
+    if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1;
+    vp8_sad16x16 = vp8_sad16x16_wmt;
+    if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3;
+    vp8_sad16x16x3 = vp8_sad16x16x3_c;
+    if (flags & HAS_SSE3) vp8_sad16x16x3 = vp8_sad16x16x3_sse3;
+    if (flags & HAS_SSSE3) vp8_sad16x16x3 = vp8_sad16x16x3_ssse3;
+    vp8_sad16x16x4d = vp8_sad16x16x4d_c;
+    if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3;
+    vp8_sad16x16x8 = vp8_sad16x16x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad16x16x8 = vp8_sad16x16x8_sse4;
+    vp8_sad16x8x3 = vp8_sad16x8x3_c;
+    if (flags & HAS_SSE3) vp8_sad16x8x3 = vp8_sad16x8x3_sse3;
+    if (flags & HAS_SSSE3) vp8_sad16x8x3 = vp8_sad16x8x3_ssse3;
+    vp8_sad16x8x4d = vp8_sad16x8x4d_c;
+    if (flags & HAS_SSE3) vp8_sad16x8x4d = vp8_sad16x8x4d_sse3;
+    vp8_sad16x8x8 = vp8_sad16x8x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad16x8x8 = vp8_sad16x8x8_sse4;
+    vp8_sad4x4x3 = vp8_sad4x4x3_c;
+    if (flags & HAS_SSE3) vp8_sad4x4x3 = vp8_sad4x4x3_sse3;
+    vp8_sad4x4x4d = vp8_sad4x4x4d_c;
+    if (flags & HAS_SSE3) vp8_sad4x4x4d = vp8_sad4x4x4d_sse3;
+    vp8_sad4x4x8 = vp8_sad4x4x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad4x4x8 = vp8_sad4x4x8_sse4;
+    vp8_sad8x16x3 = vp8_sad8x16x3_c;
+    if (flags & HAS_SSE3) vp8_sad8x16x3 = vp8_sad8x16x3_sse3;
+    vp8_sad8x16x4d = vp8_sad8x16x4d_c;
+    if (flags & HAS_SSE3) vp8_sad8x16x4d = vp8_sad8x16x4d_sse3;
+    vp8_sad8x16x8 = vp8_sad8x16x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad8x16x8 = vp8_sad8x16x8_sse4;
+    vp8_sad8x8x3 = vp8_sad8x8x3_c;
+    if (flags & HAS_SSE3) vp8_sad8x8x3 = vp8_sad8x8x3_sse3;
+    vp8_sad8x8x4d = vp8_sad8x8x4d_c;
+    if (flags & HAS_SSE3) vp8_sad8x8x4d = vp8_sad8x8x4d_sse3;
+    vp8_sad8x8x8 = vp8_sad8x8x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad8x8x8 = vp8_sad8x8x8_sse4;
+    vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3;
+    vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3;
+    vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3;
+    vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3;
+    vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_wmt;
+    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_ssse3;
+    vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_wmt;
+    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_ssse3;
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86_64-win64-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,571 +0,0 @@
-#ifndef VP8_RTCD_H_
-#define VP8_RTCD_H_
-
-#ifdef RTCD_C
-#define RTCD_EXTERN
-#else
-#define RTCD_EXTERN extern
-#endif
-
-/*
- * VP8
- */
-
-struct blockd;
-struct macroblockd;
-struct loop_filter_info;
-
-/* Encoder forward decls */
-struct block;
-struct macroblock;
-struct variance_vtable;
-union int_mv;
-struct yv12_buffer_config;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_mmx
-
-void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-#define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_mmx
-
-void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp8_blend_b vp8_blend_b_c
-
-void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp8_blend_mb_inner vp8_blend_mb_inner_c
-
-void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp8_blend_mb_outer vp8_blend_mb_outer_c
-
-int vp8_block_error_c(short *coeff, short *dqcoeff);
-int vp8_block_error_mmx(short *coeff, short *dqcoeff);
-int vp8_block_error_xmm(short *coeff, short *dqcoeff);
-#define vp8_block_error vp8_block_error_xmm
-
-void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-
-void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-
-void vp8_clear_system_state_c();
-void vpx_reset_mmx_state();
-#define vp8_clear_system_state vpx_reset_mmx_state
-
-void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-
-void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem16x16_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-#define vp8_copy_mem16x16 vp8_copy_mem16x16_sse2
-
-void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-#define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx
-
-void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-#define vp8_copy_mem8x8 vp8_copy_mem8x8_mmx
-
-void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
-void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
-#define vp8_dc_only_idct_add vp8_dc_only_idct_add_mmx
-
-int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-#define vp8_denoiser_filter vp8_denoiser_filter_sse2
-
-int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-#define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_sse2
-
-void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride);
-void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride);
-#define vp8_dequant_idct_add vp8_dequant_idct_add_mmx
-
-void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-void vp8_dequant_idct_add_uv_block_mmx(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-#define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_sse2
-
-void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-void vp8_dequant_idct_add_y_block_mmx(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-#define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_sse2
-
-void vp8_dequantize_b_c(struct blockd*, short *dqc);
-void vp8_dequantize_b_mmx(struct blockd*, short *dqc);
-#define vp8_dequantize_b vp8_dequantize_b_mmx
-
-int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-
-void vp8_fast_quantize_b_c(struct block *, struct blockd *);
-void vp8_fast_quantize_b_sse2(struct block *, struct blockd *);
-void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *);
-RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *);
-
-void vp8_fast_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
-#define vp8_fast_quantize_b_pair vp8_fast_quantize_b_pair_c
-
-void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2
-
-void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
-
-void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2
-
-int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_full_search_sadx3(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_full_search_sadx8(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-
-unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx
-
-unsigned int vp8_get_mb_ss_c(const short *);
-unsigned int vp8_get_mb_ss_mmx(const short *);
-unsigned int vp8_get_mb_ss_sse2(const short *);
-#define vp8_get_mb_ss vp8_get_mb_ss_sse2
-
-void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
-#define vp8_intra4x4_predict vp8_intra4x4_predict_c
-
-void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-#define vp8_loop_filter_bh vp8_loop_filter_bh_sse2
-
-void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-#define vp8_loop_filter_bv vp8_loop_filter_bv_sse2
-
-void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-#define vp8_loop_filter_mbh vp8_loop_filter_mbh_sse2
-
-void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-#define vp8_loop_filter_mbv vp8_loop_filter_mbv_sse2
-
-void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bhs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-#define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_sse2
-
-void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bvs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-#define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_sse2
-
-void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_horizontal_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-#define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_sse2
-
-void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_vertical_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-#define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_sse2
-
-int vp8_mbblock_error_c(struct macroblock *mb, int dc);
-int vp8_mbblock_error_mmx(struct macroblock *mb, int dc);
-int vp8_mbblock_error_xmm(struct macroblock *mb, int dc);
-#define vp8_mbblock_error vp8_mbblock_error_xmm
-
-void vp8_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-void vp8_mbpost_proc_across_ip_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-#define vp8_mbpost_proc_across_ip vp8_mbpost_proc_across_ip_xmm
-
-void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-void vp8_mbpost_proc_down_mmx(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-void vp8_mbpost_proc_down_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-#define vp8_mbpost_proc_down vp8_mbpost_proc_down_xmm
-
-int vp8_mbuverror_c(struct macroblock *mb);
-int vp8_mbuverror_mmx(struct macroblock *mb);
-int vp8_mbuverror_xmm(struct macroblock *mb);
-#define vp8_mbuverror vp8_mbuverror_xmm
-
-unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_mse16x16 vp8_mse16x16_wmt
-
-void vp8_plane_add_noise_c(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
-void vp8_plane_add_noise_mmx(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
-void vp8_plane_add_noise_wmt(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
-#define vp8_plane_add_noise vp8_plane_add_noise_wmt
-
-void vp8_post_proc_down_and_across_mb_row_c(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
-void vp8_post_proc_down_and_across_mb_row_sse2(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
-#define vp8_post_proc_down_and_across_mb_row vp8_post_proc_down_and_across_mb_row_sse2
-
-void vp8_quantize_mb_c(struct macroblock *);
-#define vp8_quantize_mb vp8_quantize_mb_c
-
-void vp8_quantize_mbuv_c(struct macroblock *);
-#define vp8_quantize_mbuv vp8_quantize_mbuv_c
-
-void vp8_quantize_mby_c(struct macroblock *);
-#define vp8_quantize_mby vp8_quantize_mby_c
-
-int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-RTCD_EXTERN int (*vp8_refining_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-
-void vp8_regular_quantize_b_c(struct block *, struct blockd *);
-void vp8_regular_quantize_b_sse2(struct block *, struct blockd *);
-void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *);
-RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *);
-
-void vp8_regular_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
-#define vp8_regular_quantize_b_pair vp8_regular_quantize_b_pair_c
-
-unsigned int vp8_sad16x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x16_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-RTCD_EXTERN unsigned int (*vp8_sad16x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-
-void vp8_sad16x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x16x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad16x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad16x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-#define vp8_sad16x8 vp8_sad16x8_wmt
-
-void vp8_sad16x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x8x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad16x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad16x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-#define vp8_sad4x4 vp8_sad4x4_wmt
-
-void vp8_sad4x4x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad4x4x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad4x4x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad4x4x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad4x4x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad4x4x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad4x4x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad4x4x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad4x4x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad8x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-#define vp8_sad8x16 vp8_sad8x16_wmt
-
-void vp8_sad8x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad8x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad8x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-#define vp8_sad8x8 vp8_sad8x8_wmt
-
-void vp8_sad8x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad8x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad8x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
-void vp8_short_fdct4x4_mmx(short *input, short *output, int pitch);
-void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch);
-#define vp8_short_fdct4x4 vp8_short_fdct4x4_sse2
-
-void vp8_short_fdct8x4_c(short *input, short *output, int pitch);
-void vp8_short_fdct8x4_mmx(short *input, short *output, int pitch);
-void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch);
-#define vp8_short_fdct8x4 vp8_short_fdct8x4_sse2
-
-void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
-void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
-#define vp8_short_idct4x4llm vp8_short_idct4x4llm_mmx
-
-void vp8_short_inv_walsh4x4_c(short *input, short *output);
-void vp8_short_inv_walsh4x4_mmx(short *input, short *output);
-void vp8_short_inv_walsh4x4_sse2(short *input, short *output);
-#define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_sse2
-
-void vp8_short_inv_walsh4x4_1_c(short *input, short *output);
-#define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c
-
-void vp8_short_walsh4x4_c(short *input, short *output, int pitch);
-void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch);
-#define vp8_short_walsh4x4 vp8_short_walsh4x4_sse2
-
-void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt
-
-unsigned int vp8_sub_pixel_variance16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x16_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-unsigned int vp8_sub_pixel_variance16x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x8_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x8)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-unsigned int vp8_sub_pixel_variance4x4_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance4x4_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance4x4_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-#define vp8_sub_pixel_variance4x4 vp8_sub_pixel_variance4x4_wmt
-
-unsigned int vp8_sub_pixel_variance8x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-#define vp8_sub_pixel_variance8x16 vp8_sub_pixel_variance8x16_wmt
-
-unsigned int vp8_sub_pixel_variance8x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-#define vp8_sub_pixel_variance8x8 vp8_sub_pixel_variance8x8_wmt
-
-void vp8_subtract_b_c(struct block *be, struct blockd *bd, int pitch);
-void vp8_subtract_b_mmx(struct block *be, struct blockd *bd, int pitch);
-void vp8_subtract_b_sse2(struct block *be, struct blockd *bd, int pitch);
-#define vp8_subtract_b vp8_subtract_b_sse2
-
-void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
-void vp8_subtract_mbuv_mmx(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
-void vp8_subtract_mbuv_sse2(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
-#define vp8_subtract_mbuv vp8_subtract_mbuv_sse2
-
-void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
-void vp8_subtract_mby_mmx(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
-void vp8_subtract_mby_sse2(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
-#define vp8_subtract_mby vp8_subtract_mby_sse2
-
-void vp8_temporal_filter_apply_c(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
-void vp8_temporal_filter_apply_sse2(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
-#define vp8_temporal_filter_apply vp8_temporal_filter_apply_sse2
-
-unsigned int vp8_variance16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance16x16 vp8_variance16x16_wmt
-
-unsigned int vp8_variance16x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance16x8 vp8_variance16x8_wmt
-
-unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance4x4 vp8_variance4x4_wmt
-
-unsigned int vp8_variance8x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance8x16 vp8_variance8x16_wmt
-
-unsigned int vp8_variance8x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance8x8 vp8_variance8x8_wmt
-
-unsigned int vp8_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_h_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_h_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance_halfpixvar16x16_h vp8_variance_halfpixvar16x16_h_wmt
-
-unsigned int vp8_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_wmt
-
-unsigned int vp8_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_v_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_v_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-#define vp8_variance_halfpixvar16x16_v vp8_variance_halfpixvar16x16_v_wmt
-
-void vp8_rtcd(void);
-
-#ifdef RTCD_C
-#include "vpx_ports/x86.h"
-static void setup_rtcd_internal(void)
-{
-    int flags = x86_simd_caps();
-
-    (void)flags;
-
-    vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_sse2;
-    if (flags & HAS_SSSE3) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_ssse3;
-    vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2;
-    if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3;
-    vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2;
-    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3;
-    vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2;
-    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3;
-    vp8_copy32xn = vp8_copy32xn_sse2;
-    if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3;
-    vp8_diamond_search_sad = vp8_diamond_search_sad_c;
-    if (flags & HAS_SSE3) vp8_diamond_search_sad = vp8_diamond_search_sadx4;
-    vp8_fast_quantize_b = vp8_fast_quantize_b_sse2;
-    if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3;
-    vp8_full_search_sad = vp8_full_search_sad_c;
-    if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3;
-    if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8;
-    vp8_refining_search_sad = vp8_refining_search_sad_c;
-    if (flags & HAS_SSE3) vp8_refining_search_sad = vp8_refining_search_sadx4;
-    vp8_regular_quantize_b = vp8_regular_quantize_b_sse2;
-    if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1;
-    vp8_sad16x16 = vp8_sad16x16_wmt;
-    if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3;
-    vp8_sad16x16x3 = vp8_sad16x16x3_c;
-    if (flags & HAS_SSE3) vp8_sad16x16x3 = vp8_sad16x16x3_sse3;
-    if (flags & HAS_SSSE3) vp8_sad16x16x3 = vp8_sad16x16x3_ssse3;
-    vp8_sad16x16x4d = vp8_sad16x16x4d_c;
-    if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3;
-    vp8_sad16x16x8 = vp8_sad16x16x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad16x16x8 = vp8_sad16x16x8_sse4;
-    vp8_sad16x8x3 = vp8_sad16x8x3_c;
-    if (flags & HAS_SSE3) vp8_sad16x8x3 = vp8_sad16x8x3_sse3;
-    if (flags & HAS_SSSE3) vp8_sad16x8x3 = vp8_sad16x8x3_ssse3;
-    vp8_sad16x8x4d = vp8_sad16x8x4d_c;
-    if (flags & HAS_SSE3) vp8_sad16x8x4d = vp8_sad16x8x4d_sse3;
-    vp8_sad16x8x8 = vp8_sad16x8x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad16x8x8 = vp8_sad16x8x8_sse4;
-    vp8_sad4x4x3 = vp8_sad4x4x3_c;
-    if (flags & HAS_SSE3) vp8_sad4x4x3 = vp8_sad4x4x3_sse3;
-    vp8_sad4x4x4d = vp8_sad4x4x4d_c;
-    if (flags & HAS_SSE3) vp8_sad4x4x4d = vp8_sad4x4x4d_sse3;
-    vp8_sad4x4x8 = vp8_sad4x4x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad4x4x8 = vp8_sad4x4x8_sse4;
-    vp8_sad8x16x3 = vp8_sad8x16x3_c;
-    if (flags & HAS_SSE3) vp8_sad8x16x3 = vp8_sad8x16x3_sse3;
-    vp8_sad8x16x4d = vp8_sad8x16x4d_c;
-    if (flags & HAS_SSE3) vp8_sad8x16x4d = vp8_sad8x16x4d_sse3;
-    vp8_sad8x16x8 = vp8_sad8x16x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad8x16x8 = vp8_sad8x16x8_sse4;
-    vp8_sad8x8x3 = vp8_sad8x8x3_c;
-    if (flags & HAS_SSE3) vp8_sad8x8x3 = vp8_sad8x8x3_sse3;
-    vp8_sad8x8x4d = vp8_sad8x8x4d_c;
-    if (flags & HAS_SSE3) vp8_sad8x8x4d = vp8_sad8x8x4d_sse3;
-    vp8_sad8x8x8 = vp8_sad8x8x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad8x8x8 = vp8_sad8x8x8_sse4;
-    vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3;
-    vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3;
-    vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3;
-    vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3;
-    vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_wmt;
-    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_ssse3;
-    vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_wmt;
-    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_ssse3;
-}
-#endif
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs12.h	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,749 @@
+#ifndef VP8_RTCD_H_
+#define VP8_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+/*
+ * VP8
+ */
+
+struct blockd;
+struct macroblockd;
+struct loop_filter_info;
+
+/* Encoder forward decls */
+struct block;
+struct macroblock;
+struct variance_vtable;
+union int_mv;
+struct yv12_buffer_config;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
+#define vp8_blend_b vp8_blend_b_c
+
+void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
+#define vp8_blend_mb_inner vp8_blend_mb_inner_c
+
+void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
+#define vp8_blend_mb_outer vp8_blend_mb_outer_c
+
+int vp8_block_error_c(short *coeff, short *dqcoeff);
+int vp8_block_error_mmx(short *coeff, short *dqcoeff);
+int vp8_block_error_xmm(short *coeff, short *dqcoeff);
+RTCD_EXTERN int (*vp8_block_error)(short *coeff, short *dqcoeff);
+
+void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
+
+void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
+
+void vp8_clear_system_state_c();
+void vpx_reset_mmx_state();
+RTCD_EXTERN void (*vp8_clear_system_state)();
+
+void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
+
+void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem16x16_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+
+void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+
+void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
+
+void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
+void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
+RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
+
+int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+RTCD_EXTERN int (*vp8_denoiser_filter)(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+
+int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+RTCD_EXTERN int (*vp8_denoiser_filter_uv)(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
+
+void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride);
+void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride);
+RTCD_EXTERN void (*vp8_dequant_idct_add)(short *input, short *dq, unsigned char *output, int stride);
+
+void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
+void vp8_dequant_idct_add_uv_block_mmx(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
+void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
+RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
+
+void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
+void vp8_dequant_idct_add_y_block_mmx(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
+void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
+RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
+
+void vp8_dequantize_b_c(struct blockd*, short *dqc);
+void vp8_dequantize_b_mmx(struct blockd*, short *dqc);
+RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd*, short *dqc);
+
+int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+
+void vp8_fast_quantize_b_c(struct block *, struct blockd *);
+void vp8_fast_quantize_b_sse2(struct block *, struct blockd *);
+void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *);
+RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *);
+
+void vp8_fast_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
+#define vp8_fast_quantize_b_pair vp8_fast_quantize_b_pair_c
+
+void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+
+void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
+
+void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
+
+int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_full_search_sadx3(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_full_search_sadx8(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+
+unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
+
+unsigned int vp8_get_mb_ss_c(const short *);
+unsigned int vp8_get_mb_ss_mmx(const short *);
+unsigned int vp8_get_mb_ss_sse2(const short *);
+RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *);
+
+void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
+#define vp8_intra4x4_predict vp8_intra4x4_predict_c
+
+void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+
+void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+
+void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+
+void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
+
+void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bhs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char *y, int ystride, const unsigned char *blimit);
+
+void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bvs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char *y, int ystride, const unsigned char *blimit);
+
+void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_horizontal_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char *y, int ystride, const unsigned char *blimit);
+
+void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_vertical_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
+void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
+RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char *y, int ystride, const unsigned char *blimit);
+
+int vp8_mbblock_error_c(struct macroblock *mb, int dc);
+int vp8_mbblock_error_mmx(struct macroblock *mb, int dc);
+int vp8_mbblock_error_xmm(struct macroblock *mb, int dc);
+RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock *mb, int dc);
+
+void vp8_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+void vp8_mbpost_proc_across_ip_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+RTCD_EXTERN void (*vp8_mbpost_proc_across_ip)(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+
+void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+void vp8_mbpost_proc_down_mmx(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+void vp8_mbpost_proc_down_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+RTCD_EXTERN void (*vp8_mbpost_proc_down)(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+
+int vp8_mbuverror_c(struct macroblock *mb);
+int vp8_mbuverror_mmx(struct macroblock *mb);
+int vp8_mbuverror_xmm(struct macroblock *mb);
+RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock *mb);
+
+unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+void vp8_plane_add_noise_c(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
+void vp8_plane_add_noise_mmx(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
+void vp8_plane_add_noise_wmt(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
+RTCD_EXTERN void (*vp8_plane_add_noise)(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
+
+void vp8_post_proc_down_and_across_mb_row_c(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
+void vp8_post_proc_down_and_across_mb_row_sse2(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
+RTCD_EXTERN void (*vp8_post_proc_down_and_across_mb_row)(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
+
+void vp8_quantize_mb_c(struct macroblock *);
+#define vp8_quantize_mb vp8_quantize_mb_c
+
+void vp8_quantize_mbuv_c(struct macroblock *);
+#define vp8_quantize_mbuv vp8_quantize_mbuv_c
+
+void vp8_quantize_mby_c(struct macroblock *);
+#define vp8_quantize_mby vp8_quantize_mby_c
+
+int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+RTCD_EXTERN int (*vp8_refining_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
+
+void vp8_regular_quantize_b_c(struct block *, struct blockd *);
+void vp8_regular_quantize_b_sse2(struct block *, struct blockd *);
+void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *);
+RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *);
+
+void vp8_regular_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
+#define vp8_regular_quantize_b_pair vp8_regular_quantize_b_pair_c
+
+unsigned int vp8_sad16x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x16_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+RTCD_EXTERN unsigned int (*vp8_sad16x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+
+void vp8_sad16x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x16x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad16x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad16x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad16x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+RTCD_EXTERN unsigned int (*vp8_sad16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+
+void vp8_sad16x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x8x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad16x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad16x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad16x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad16x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad16x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+RTCD_EXTERN unsigned int (*vp8_sad4x4)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+
+void vp8_sad4x4x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad4x4x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad4x4x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad4x4x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad4x4x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad4x4x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad4x4x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad4x4x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad4x4x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad8x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+RTCD_EXTERN unsigned int (*vp8_sad8x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+
+void vp8_sad8x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad8x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad8x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+unsigned int vp8_sad8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+unsigned int vp8_sad8x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+RTCD_EXTERN unsigned int (*vp8_sad8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
+
+void vp8_sad8x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp8_sad8x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp8_sad8x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp8_sad8x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+void vp8_sad8x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+RTCD_EXTERN void (*vp8_sad8x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
+
+void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
+void vp8_short_fdct4x4_mmx(short *input, short *output, int pitch);
+void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch);
+RTCD_EXTERN void (*vp8_short_fdct4x4)(short *input, short *output, int pitch);
+
+void vp8_short_fdct8x4_c(short *input, short *output, int pitch);
+void vp8_short_fdct8x4_mmx(short *input, short *output, int pitch);
+void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch);
+RTCD_EXTERN void (*vp8_short_fdct8x4)(short *input, short *output, int pitch);
+
+void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
+void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
+RTCD_EXTERN void (*vp8_short_idct4x4llm)(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
+
+void vp8_short_inv_walsh4x4_c(short *input, short *output);
+void vp8_short_inv_walsh4x4_mmx(short *input, short *output);
+void vp8_short_inv_walsh4x4_sse2(short *input, short *output);
+RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short *input, short *output);
+
+void vp8_short_inv_walsh4x4_1_c(short *input, short *output);
+#define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c
+
+void vp8_short_walsh4x4_c(short *input, short *output, int pitch);
+void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch);
+RTCD_EXTERN void (*vp8_short_walsh4x4)(short *input, short *output, int pitch);
+
+void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+
+unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+unsigned int vp8_sub_pixel_variance16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x16_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+unsigned int vp8_sub_pixel_variance16x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance16x8_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x8)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+unsigned int vp8_sub_pixel_variance4x4_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance4x4_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance4x4_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance4x4)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+unsigned int vp8_sub_pixel_variance8x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance8x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+unsigned int vp8_sub_pixel_variance8x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+unsigned int vp8_sub_pixel_variance8x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance8x8)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
+
+void vp8_subtract_b_c(struct block *be, struct blockd *bd, int pitch);
+void vp8_subtract_b_mmx(struct block *be, struct blockd *bd, int pitch);
+void vp8_subtract_b_sse2(struct block *be, struct blockd *bd, int pitch);
+RTCD_EXTERN void (*vp8_subtract_b)(struct block *be, struct blockd *bd, int pitch);
+
+void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
+void vp8_subtract_mbuv_mmx(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
+void vp8_subtract_mbuv_sse2(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
+RTCD_EXTERN void (*vp8_subtract_mbuv)(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
+
+void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
+void vp8_subtract_mby_mmx(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
+void vp8_subtract_mby_sse2(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
+RTCD_EXTERN void (*vp8_subtract_mby)(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
+
+void vp8_temporal_filter_apply_c(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
+void vp8_temporal_filter_apply_sse2(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
+RTCD_EXTERN void (*vp8_temporal_filter_apply)(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
+
+unsigned int vp8_variance16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_variance16x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance16x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance16x8)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance4x4)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_variance8x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance8x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_variance8x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance8x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance8x8)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_h_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_h_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_h)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_hv)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+unsigned int vp8_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_v_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+unsigned int vp8_variance_halfpixvar16x16_v_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_v)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
+
+void vp8_rtcd(void);
+
+#ifdef RTCD_C
+#include "vpx_ports/x86.h"
+static void setup_rtcd_internal(void)
+{
+    int flags = x86_simd_caps();
+
+    (void)flags;
+
+    vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_c;
+    if (flags & HAS_MMX) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_mmx;
+    if (flags & HAS_SSE2) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_sse2;
+    if (flags & HAS_SSSE3) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_ssse3;
+    vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c;
+    if (flags & HAS_MMX) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx;
+    vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c;
+    if (flags & HAS_MMX) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx;
+    vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c;
+    if (flags & HAS_MMX) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_mmx;
+    if (flags & HAS_SSE2) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2;
+    if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3;
+    vp8_block_error = vp8_block_error_c;
+    if (flags & HAS_MMX) vp8_block_error = vp8_block_error_mmx;
+    if (flags & HAS_SSE2) vp8_block_error = vp8_block_error_xmm;
+    vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_c;
+    if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2;
+    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3;
+    vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_c;
+    if (flags & HAS_SSE2) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2;
+    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3;
+    vp8_clear_system_state = vp8_clear_system_state_c;
+    if (flags & HAS_MMX) vp8_clear_system_state = vpx_reset_mmx_state;
+    vp8_copy32xn = vp8_copy32xn_c;
+    if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2;
+    if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3;
+    vp8_copy_mem16x16 = vp8_copy_mem16x16_c;
+    if (flags & HAS_MMX) vp8_copy_mem16x16 = vp8_copy_mem16x16_mmx;
+    if (flags & HAS_SSE2) vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2;
+    vp8_copy_mem8x4 = vp8_copy_mem8x4_c;
+    if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx;
+    vp8_copy_mem8x8 = vp8_copy_mem8x8_c;
+    if (flags & HAS_MMX) vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx;
+    vp8_dc_only_idct_add = vp8_dc_only_idct_add_c;
+    if (flags & HAS_MMX) vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx;
+    vp8_denoiser_filter = vp8_denoiser_filter_c;
+    if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2;
+    vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c;
+    if (flags & HAS_SSE2) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2;
+    vp8_dequant_idct_add = vp8_dequant_idct_add_c;
+    if (flags & HAS_MMX) vp8_dequant_idct_add = vp8_dequant_idct_add_mmx;
+    vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c;
+    if (flags & HAS_MMX) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_mmx;
+    if (flags & HAS_SSE2) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_sse2;
+    vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_c;
+    if (flags & HAS_MMX) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_mmx;
+    if (flags & HAS_SSE2) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_sse2;
+    vp8_dequantize_b = vp8_dequantize_b_c;
+    if (flags & HAS_MMX) vp8_dequantize_b = vp8_dequantize_b_mmx;
+    vp8_diamond_search_sad = vp8_diamond_search_sad_c;
+    if (flags & HAS_SSE3) vp8_diamond_search_sad = vp8_diamond_search_sadx4;
+    vp8_fast_quantize_b = vp8_fast_quantize_b_c;
+    if (flags & HAS_SSE2) vp8_fast_quantize_b = vp8_fast_quantize_b_sse2;
+    if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3;
+    vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c;
+    if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2;
+    vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c;
+    if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2;
+    vp8_full_search_sad = vp8_full_search_sad_c;
+    if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3;
+    if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8;
+    vp8_get4x4sse_cs = vp8_get4x4sse_cs_c;
+    if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx;
+    vp8_get_mb_ss = vp8_get_mb_ss_c;
+    if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx;
+    if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2;
+    vp8_loop_filter_bh = vp8_loop_filter_bh_c;
+    if (flags & HAS_MMX) vp8_loop_filter_bh = vp8_loop_filter_bh_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_bh = vp8_loop_filter_bh_sse2;
+    vp8_loop_filter_bv = vp8_loop_filter_bv_c;
+    if (flags & HAS_MMX) vp8_loop_filter_bv = vp8_loop_filter_bv_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_bv = vp8_loop_filter_bv_sse2;
+    vp8_loop_filter_mbh = vp8_loop_filter_mbh_c;
+    if (flags & HAS_MMX) vp8_loop_filter_mbh = vp8_loop_filter_mbh_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2;
+    vp8_loop_filter_mbv = vp8_loop_filter_mbv_c;
+    if (flags & HAS_MMX) vp8_loop_filter_mbv = vp8_loop_filter_mbv_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2;
+    vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c;
+    if (flags & HAS_MMX) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2;
+    vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c;
+    if (flags & HAS_MMX) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2;
+    vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c;
+    if (flags & HAS_MMX) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_sse2;
+    vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_c;
+    if (flags & HAS_MMX) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_mmx;
+    if (flags & HAS_SSE2) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_sse2;
+    vp8_mbblock_error = vp8_mbblock_error_c;
+    if (flags & HAS_MMX) vp8_mbblock_error = vp8_mbblock_error_mmx;
+    if (flags & HAS_SSE2) vp8_mbblock_error = vp8_mbblock_error_xmm;
+    vp8_mbpost_proc_across_ip = vp8_mbpost_proc_across_ip_c;
+    if (flags & HAS_SSE2) vp8_mbpost_proc_across_ip = vp8_mbpost_proc_across_ip_xmm;
+    vp8_mbpost_proc_down = vp8_mbpost_proc_down_c;
+    if (flags & HAS_MMX) vp8_mbpost_proc_down = vp8_mbpost_proc_down_mmx;
+    if (flags & HAS_SSE2) vp8_mbpost_proc_down = vp8_mbpost_proc_down_xmm;
+    vp8_mbuverror = vp8_mbuverror_c;
+    if (flags & HAS_MMX) vp8_mbuverror = vp8_mbuverror_mmx;
+    if (flags & HAS_SSE2) vp8_mbuverror = vp8_mbuverror_xmm;
+    vp8_mse16x16 = vp8_mse16x16_c;
+    if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx;
+    if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt;
+    vp8_plane_add_noise = vp8_plane_add_noise_c;
+    if (flags & HAS_MMX) vp8_plane_add_noise = vp8_plane_add_noise_mmx;
+    if (flags & HAS_SSE2) vp8_plane_add_noise = vp8_plane_add_noise_wmt;
+    vp8_post_proc_down_and_across_mb_row = vp8_post_proc_down_and_across_mb_row_c;
+    if (flags & HAS_SSE2) vp8_post_proc_down_and_across_mb_row = vp8_post_proc_down_and_across_mb_row_sse2;
+    vp8_refining_search_sad = vp8_refining_search_sad_c;
+    if (flags & HAS_SSE3) vp8_refining_search_sad = vp8_refining_search_sadx4;
+    vp8_regular_quantize_b = vp8_regular_quantize_b_c;
+    if (flags & HAS_SSE2) vp8_regular_quantize_b = vp8_regular_quantize_b_sse2;
+    if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1;
+    vp8_sad16x16 = vp8_sad16x16_c;
+    if (flags & HAS_MMX) vp8_sad16x16 = vp8_sad16x16_mmx;
+    if (flags & HAS_SSE2) vp8_sad16x16 = vp8_sad16x16_wmt;
+    if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3;
+    vp8_sad16x16x3 = vp8_sad16x16x3_c;
+    if (flags & HAS_SSE3) vp8_sad16x16x3 = vp8_sad16x16x3_sse3;
+    if (flags & HAS_SSSE3) vp8_sad16x16x3 = vp8_sad16x16x3_ssse3;
+    vp8_sad16x16x4d = vp8_sad16x16x4d_c;
+    if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3;
+    vp8_sad16x16x8 = vp8_sad16x16x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad16x16x8 = vp8_sad16x16x8_sse4;
+    vp8_sad16x8 = vp8_sad16x8_c;
+    if (flags & HAS_MMX) vp8_sad16x8 = vp8_sad16x8_mmx;
+    if (flags & HAS_SSE2) vp8_sad16x8 = vp8_sad16x8_wmt;
+    vp8_sad16x8x3 = vp8_sad16x8x3_c;
+    if (flags & HAS_SSE3) vp8_sad16x8x3 = vp8_sad16x8x3_sse3;
+    if (flags & HAS_SSSE3) vp8_sad16x8x3 = vp8_sad16x8x3_ssse3;
+    vp8_sad16x8x4d = vp8_sad16x8x4d_c;
+    if (flags & HAS_SSE3) vp8_sad16x8x4d = vp8_sad16x8x4d_sse3;
+    vp8_sad16x8x8 = vp8_sad16x8x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad16x8x8 = vp8_sad16x8x8_sse4;
+    vp8_sad4x4 = vp8_sad4x4_c;
+    if (flags & HAS_MMX) vp8_sad4x4 = vp8_sad4x4_mmx;
+    if (flags & HAS_SSE2) vp8_sad4x4 = vp8_sad4x4_wmt;
+    vp8_sad4x4x3 = vp8_sad4x4x3_c;
+    if (flags & HAS_SSE3) vp8_sad4x4x3 = vp8_sad4x4x3_sse3;
+    vp8_sad4x4x4d = vp8_sad4x4x4d_c;
+    if (flags & HAS_SSE3) vp8_sad4x4x4d = vp8_sad4x4x4d_sse3;
+    vp8_sad4x4x8 = vp8_sad4x4x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad4x4x8 = vp8_sad4x4x8_sse4;
+    vp8_sad8x16 = vp8_sad8x16_c;
+    if (flags & HAS_MMX) vp8_sad8x16 = vp8_sad8x16_mmx;
+    if (flags & HAS_SSE2) vp8_sad8x16 = vp8_sad8x16_wmt;
+    vp8_sad8x16x3 = vp8_sad8x16x3_c;
+    if (flags & HAS_SSE3) vp8_sad8x16x3 = vp8_sad8x16x3_sse3;
+    vp8_sad8x16x4d = vp8_sad8x16x4d_c;
+    if (flags & HAS_SSE3) vp8_sad8x16x4d = vp8_sad8x16x4d_sse3;
+    vp8_sad8x16x8 = vp8_sad8x16x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad8x16x8 = vp8_sad8x16x8_sse4;
+    vp8_sad8x8 = vp8_sad8x8_c;
+    if (flags & HAS_MMX) vp8_sad8x8 = vp8_sad8x8_mmx;
+    if (flags & HAS_SSE2) vp8_sad8x8 = vp8_sad8x8_wmt;
+    vp8_sad8x8x3 = vp8_sad8x8x3_c;
+    if (flags & HAS_SSE3) vp8_sad8x8x3 = vp8_sad8x8x3_sse3;
+    vp8_sad8x8x4d = vp8_sad8x8x4d_c;
+    if (flags & HAS_SSE3) vp8_sad8x8x4d = vp8_sad8x8x4d_sse3;
+    vp8_sad8x8x8 = vp8_sad8x8x8_c;
+    if (flags & HAS_SSE4_1) vp8_sad8x8x8 = vp8_sad8x8x8_sse4;
+    vp8_short_fdct4x4 = vp8_short_fdct4x4_c;
+    if (flags & HAS_MMX) vp8_short_fdct4x4 = vp8_short_fdct4x4_mmx;
+    if (flags & HAS_SSE2) vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2;
+    vp8_short_fdct8x4 = vp8_short_fdct8x4_c;
+    if (flags & HAS_MMX) vp8_short_fdct8x4 = vp8_short_fdct8x4_mmx;
+    if (flags & HAS_SSE2) vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2;
+    vp8_short_idct4x4llm = vp8_short_idct4x4llm_c;
+    if (flags & HAS_MMX) vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx;
+    vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c;
+    if (flags & HAS_MMX) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_mmx;
+    if (flags & HAS_SSE2) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2;
+    vp8_short_walsh4x4 = vp8_short_walsh4x4_c;
+    if (flags & HAS_SSE2) vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2;
+    vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c;
+    if (flags & HAS_MMX) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_mmx;
+    if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3;
+    vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c;
+    if (flags & HAS_MMX) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3;
+    vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c;
+    if (flags & HAS_MMX) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_mmx;
+    if (flags & HAS_SSE2) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3;
+    vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c;
+    if (flags & HAS_MMX) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_mmx;
+    if (flags & HAS_SSE2) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2;
+    if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3;
+    vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c;
+    if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx;
+    if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt;
+    vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_c;
+    if (flags & HAS_MMX) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_mmx;
+    if (flags & HAS_SSE2) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_wmt;
+    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_ssse3;
+    vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_c;
+    if (flags & HAS_MMX) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_mmx;
+    if (flags & HAS_SSE2) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_wmt;
+    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_ssse3;
+    vp8_sub_pixel_variance4x4 = vp8_sub_pixel_variance4x4_c;
+    if (flags & HAS_MMX) vp8_sub_pixel_variance4x4 = vp8_sub_pixel_variance4x4_mmx;
+    if (flags & HAS_SSE2) vp8_sub_pixel_variance4x4 = vp8_sub_pixel_variance4x4_wmt;
+    vp8_sub_pixel_variance8x16 = vp8_sub_pixel_variance8x16_c;
+    if (flags & HAS_MMX) vp8_sub_pixel_variance8x16 = vp8_sub_pixel_variance8x16_mmx;
+    if (flags & HAS_SSE2) vp8_sub_pixel_variance8x16 = vp8_sub_pixel_variance8x16_wmt;
+    vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_c;
+    if (flags & HAS_MMX) vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_mmx;
+    if (flags & HAS_SSE2) vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_wmt;
+    vp8_subtract_b = vp8_subtract_b_c;
+    if (flags & HAS_MMX) vp8_subtract_b = vp8_subtract_b_mmx;
+    if (flags & HAS_SSE2) vp8_subtract_b = vp8_subtract_b_sse2;
+    vp8_subtract_mbuv = vp8_subtract_mbuv_c;
+    if (flags & HAS_MMX) vp8_subtract_mbuv = vp8_subtract_mbuv_mmx;
+    if (flags & HAS_SSE2) vp8_subtract_mbuv = vp8_subtract_mbuv_sse2;
+    vp8_subtract_mby = vp8_subtract_mby_c;
+    if (flags & HAS_MMX) vp8_subtract_mby = vp8_subtract_mby_mmx;
+    if (flags & HAS_SSE2) vp8_subtract_mby = vp8_subtract_mby_sse2;
+    vp8_temporal_filter_apply = vp8_temporal_filter_apply_c;
+    if (flags & HAS_SSE2) vp8_temporal_filter_apply = vp8_temporal_filter_apply_sse2;
+    vp8_variance16x16 = vp8_variance16x16_c;
+    if (flags & HAS_MMX) vp8_variance16x16 = vp8_variance16x16_mmx;
+    if (flags & HAS_SSE2) vp8_variance16x16 = vp8_variance16x16_wmt;
+    vp8_variance16x8 = vp8_variance16x8_c;
+    if (flags & HAS_MMX) vp8_variance16x8 = vp8_variance16x8_mmx;
+    if (flags & HAS_SSE2) vp8_variance16x8 = vp8_variance16x8_wmt;
+    vp8_variance4x4 = vp8_variance4x4_c;
+    if (flags & HAS_MMX) vp8_variance4x4 = vp8_variance4x4_mmx;
+    if (flags & HAS_SSE2) vp8_variance4x4 = vp8_variance4x4_wmt;
+    vp8_variance8x16 = vp8_variance8x16_c;
+    if (flags & HAS_MMX) vp8_variance8x16 = vp8_variance8x16_mmx;
+    if (flags & HAS_SSE2) vp8_variance8x16 = vp8_variance8x16_wmt;
+    vp8_variance8x8 = vp8_variance8x8_c;
+    if (flags & HAS_MMX) vp8_variance8x8 = vp8_variance8x8_mmx;
+    if (flags & HAS_SSE2) vp8_variance8x8 = vp8_variance8x8_wmt;
+    vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_c;
+    if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_mmx;
+    if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_wmt;
+    vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_c;
+    if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_mmx;
+    if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_wmt;
+    vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_c;
+    if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_mmx;
+    if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_wmt;
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp8_rtcd_x86-win32-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,749 +0,0 @@
-#ifndef VP8_RTCD_H_
-#define VP8_RTCD_H_
-
-#ifdef RTCD_C
-#define RTCD_EXTERN
-#else
-#define RTCD_EXTERN extern
-#endif
-
-/*
- * VP8
- */
-
-struct blockd;
-struct macroblockd;
-struct loop_filter_info;
-
-/* Encoder forward decls */
-struct block;
-struct macroblock;
-struct variance_vtable;
-union int_mv;
-struct yv12_buffer_config;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp8_blend_b vp8_blend_b_c
-
-void vp8_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp8_blend_mb_inner vp8_blend_mb_inner_c
-
-void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride);
-#define vp8_blend_mb_outer vp8_blend_mb_outer_c
-
-int vp8_block_error_c(short *coeff, short *dqcoeff);
-int vp8_block_error_mmx(short *coeff, short *dqcoeff);
-int vp8_block_error_xmm(short *coeff, short *dqcoeff);
-RTCD_EXTERN int (*vp8_block_error)(short *coeff, short *dqcoeff);
-
-void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row,  unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride);
-
-void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride);
-
-void vp8_clear_system_state_c();
-void vpx_reset_mmx_state();
-RTCD_EXTERN void (*vp8_clear_system_state)();
-
-void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-RTCD_EXTERN void (*vp8_copy32xn)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n);
-
-void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem16x16_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem16x16_sse2(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-
-void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-
-void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem8x8_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-
-void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
-void vp8_dc_only_idct_add_mmx(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
-RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
-
-int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-RTCD_EXTERN int (*vp8_denoiser_filter)(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-
-int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-int vp8_denoiser_filter_uv_sse2(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-RTCD_EXTERN int (*vp8_denoiser_filter_uv)(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
-
-void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride);
-void vp8_dequant_idct_add_mmx(short *input, short *dq, unsigned char *output, int stride);
-RTCD_EXTERN void (*vp8_dequant_idct_add)(short *input, short *dq, unsigned char *output, int stride);
-
-void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-void vp8_dequant_idct_add_uv_block_mmx(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-void vp8_dequant_idct_add_uv_block_sse2(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-
-void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-void vp8_dequant_idct_add_y_block_mmx(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-void vp8_dequant_idct_add_y_block_sse2(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-
-void vp8_dequantize_b_c(struct blockd*, short *dqc);
-void vp8_dequantize_b_mmx(struct blockd*, short *dqc);
-RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd*, short *dqc);
-
-int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_diamond_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-
-void vp8_fast_quantize_b_c(struct block *, struct blockd *);
-void vp8_fast_quantize_b_sse2(struct block *, struct blockd *);
-void vp8_fast_quantize_b_ssse3(struct block *, struct blockd *);
-RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *);
-
-void vp8_fast_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
-#define vp8_fast_quantize_b_pair vp8_fast_quantize_b_pair_c
-
-void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-
-void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
-
-void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
-
-int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_full_search_sadx3(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_full_search_sadx8(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-RTCD_EXTERN int (*vp8_full_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-
-unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride);
-
-unsigned int vp8_get_mb_ss_c(const short *);
-unsigned int vp8_get_mb_ss_mmx(const short *);
-unsigned int vp8_get_mb_ss_sse2(const short *);
-RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *);
-
-void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
-#define vp8_intra4x4_predict vp8_intra4x4_predict_c
-
-void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-
-void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-
-void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbh_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbh_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-
-void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbv_mmx(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbv_sse2(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-
-void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bhs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bhs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char *y, int ystride, const unsigned char *blimit);
-
-void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bvs_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bvs_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char *y, int ystride, const unsigned char *blimit);
-
-void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_horizontal_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_horizontal_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char *y, int ystride, const unsigned char *blimit);
-
-void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_vertical_edge_mmx(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_vertical_edge_sse2(unsigned char *y, int ystride, const unsigned char *blimit);
-RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char *y, int ystride, const unsigned char *blimit);
-
-int vp8_mbblock_error_c(struct macroblock *mb, int dc);
-int vp8_mbblock_error_mmx(struct macroblock *mb, int dc);
-int vp8_mbblock_error_xmm(struct macroblock *mb, int dc);
-RTCD_EXTERN int (*vp8_mbblock_error)(struct macroblock *mb, int dc);
-
-void vp8_mbpost_proc_across_ip_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-void vp8_mbpost_proc_across_ip_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-RTCD_EXTERN void (*vp8_mbpost_proc_across_ip)(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-
-void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-void vp8_mbpost_proc_down_mmx(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-void vp8_mbpost_proc_down_xmm(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-RTCD_EXTERN void (*vp8_mbpost_proc_down)(unsigned char *dst, int pitch, int rows, int cols,int flimit);
-
-int vp8_mbuverror_c(struct macroblock *mb);
-int vp8_mbuverror_mmx(struct macroblock *mb);
-int vp8_mbuverror_xmm(struct macroblock *mb);
-RTCD_EXTERN int (*vp8_mbuverror)(struct macroblock *mb);
-
-unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-void vp8_plane_add_noise_c(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
-void vp8_plane_add_noise_mmx(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
-void vp8_plane_add_noise_wmt(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
-RTCD_EXTERN void (*vp8_plane_add_noise)(unsigned char *s, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int w, unsigned int h, int pitch);
-
-void vp8_post_proc_down_and_across_mb_row_c(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
-void vp8_post_proc_down_and_across_mb_row_sse2(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
-RTCD_EXTERN void (*vp8_post_proc_down_and_across_mb_row)(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
-
-void vp8_quantize_mb_c(struct macroblock *);
-#define vp8_quantize_mb vp8_quantize_mb_c
-
-void vp8_quantize_mbuv_c(struct macroblock *);
-#define vp8_quantize_mbuv vp8_quantize_mbuv_c
-
-void vp8_quantize_mby_c(struct macroblock *);
-#define vp8_quantize_mby vp8_quantize_mby_c
-
-int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-int vp8_refining_search_sadx4(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-RTCD_EXTERN int (*vp8_refining_search_sad)(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
-
-void vp8_regular_quantize_b_c(struct block *, struct blockd *);
-void vp8_regular_quantize_b_sse2(struct block *, struct blockd *);
-void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *);
-RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *);
-
-void vp8_regular_quantize_b_pair_c(struct block *b1, struct block *b2, struct blockd *d1, struct blockd *d2);
-#define vp8_regular_quantize_b_pair vp8_regular_quantize_b_pair_c
-
-unsigned int vp8_sad16x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x16_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-RTCD_EXTERN unsigned int (*vp8_sad16x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-
-void vp8_sad16x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x16x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad16x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad16x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad16x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-RTCD_EXTERN unsigned int (*vp8_sad16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-
-void vp8_sad16x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x8x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad16x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad16x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad16x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad16x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad16x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-RTCD_EXTERN unsigned int (*vp8_sad4x4)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-
-void vp8_sad4x4x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad4x4x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad4x4x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad4x4x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad4x4x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad4x4x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad4x4x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad4x4x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad4x4x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad8x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-RTCD_EXTERN unsigned int (*vp8_sad8x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-
-void vp8_sad8x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad8x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad8x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-unsigned int vp8_sad8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-unsigned int vp8_sad8x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-RTCD_EXTERN unsigned int (*vp8_sad8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad);
-
-void vp8_sad8x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp8_sad8x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp8_sad8x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp8_sad8x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-void vp8_sad8x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-RTCD_EXTERN void (*vp8_sad8x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array);
-
-void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
-void vp8_short_fdct4x4_mmx(short *input, short *output, int pitch);
-void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch);
-RTCD_EXTERN void (*vp8_short_fdct4x4)(short *input, short *output, int pitch);
-
-void vp8_short_fdct8x4_c(short *input, short *output, int pitch);
-void vp8_short_fdct8x4_mmx(short *input, short *output, int pitch);
-void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch);
-RTCD_EXTERN void (*vp8_short_fdct8x4)(short *input, short *output, int pitch);
-
-void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
-void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
-RTCD_EXTERN void (*vp8_short_idct4x4llm)(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
-
-void vp8_short_inv_walsh4x4_c(short *input, short *output);
-void vp8_short_inv_walsh4x4_mmx(short *input, short *output);
-void vp8_short_inv_walsh4x4_sse2(short *input, short *output);
-RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short *input, short *output);
-
-void vp8_short_inv_walsh4x4_1_c(short *input, short *output);
-#define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c
-
-void vp8_short_walsh4x4_c(short *input, short *output, int pitch);
-void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch);
-RTCD_EXTERN void (*vp8_short_walsh4x4)(short *input, short *output, int pitch);
-
-void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict16x16_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict4x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict4x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x4_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x4_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x4_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x8_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x8_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x8_ssse3(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-
-unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-unsigned int vp8_sub_pixel_variance16x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x16_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-unsigned int vp8_sub_pixel_variance16x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance16x8_ssse3(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance16x8)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-unsigned int vp8_sub_pixel_variance4x4_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance4x4_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance4x4_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance4x4)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-unsigned int vp8_sub_pixel_variance8x16_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x16_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x16_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance8x16)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-unsigned int vp8_sub_pixel_variance8x8_c(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x8_mmx(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-unsigned int vp8_sub_pixel_variance8x8_wmt(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_sub_pixel_variance8x8)(const unsigned char  *src_ptr, int  source_stride, int  xoffset, int  yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse);
-
-void vp8_subtract_b_c(struct block *be, struct blockd *bd, int pitch);
-void vp8_subtract_b_mmx(struct block *be, struct blockd *bd, int pitch);
-void vp8_subtract_b_sse2(struct block *be, struct blockd *bd, int pitch);
-RTCD_EXTERN void (*vp8_subtract_b)(struct block *be, struct blockd *bd, int pitch);
-
-void vp8_subtract_mbuv_c(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
-void vp8_subtract_mbuv_mmx(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
-void vp8_subtract_mbuv_sse2(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
-RTCD_EXTERN void (*vp8_subtract_mbuv)(short *diff, unsigned char *usrc, unsigned char *vsrc, int src_stride, unsigned char *upred, unsigned char *vpred, int pred_stride);
-
-void vp8_subtract_mby_c(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
-void vp8_subtract_mby_mmx(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
-void vp8_subtract_mby_sse2(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
-RTCD_EXTERN void (*vp8_subtract_mby)(short *diff, unsigned char *src, int src_stride, unsigned char *pred, int pred_stride);
-
-void vp8_temporal_filter_apply_c(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
-void vp8_temporal_filter_apply_sse2(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
-RTCD_EXTERN void (*vp8_temporal_filter_apply)(unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count);
-
-unsigned int vp8_variance16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_variance16x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance16x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance16x8)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance4x4)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_variance8x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance8x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_variance8x8_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x8_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance8x8_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance8x8)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_h_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_h_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_h)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_hv)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-unsigned int vp8_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_v_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-unsigned int vp8_variance_halfpixvar16x16_v_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_v)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sse);
-
-void vp8_rtcd(void);
-
-#ifdef RTCD_C
-#include "vpx_ports/x86.h"
-static void setup_rtcd_internal(void)
-{
-    int flags = x86_simd_caps();
-
-    (void)flags;
-
-    vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_c;
-    if (flags & HAS_MMX) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_mmx;
-    if (flags & HAS_SSE2) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_sse2;
-    if (flags & HAS_SSSE3) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_ssse3;
-    vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c;
-    if (flags & HAS_MMX) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_mmx;
-    vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c;
-    if (flags & HAS_MMX) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_mmx;
-    vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c;
-    if (flags & HAS_MMX) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_mmx;
-    if (flags & HAS_SSE2) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_sse2;
-    if (flags & HAS_SSSE3) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_ssse3;
-    vp8_block_error = vp8_block_error_c;
-    if (flags & HAS_MMX) vp8_block_error = vp8_block_error_mmx;
-    if (flags & HAS_SSE2) vp8_block_error = vp8_block_error_xmm;
-    vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_c;
-    if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2;
-    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3;
-    vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_c;
-    if (flags & HAS_SSE2) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2;
-    if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3;
-    vp8_clear_system_state = vp8_clear_system_state_c;
-    if (flags & HAS_MMX) vp8_clear_system_state = vpx_reset_mmx_state;
-    vp8_copy32xn = vp8_copy32xn_c;
-    if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2;
-    if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3;
-    vp8_copy_mem16x16 = vp8_copy_mem16x16_c;
-    if (flags & HAS_MMX) vp8_copy_mem16x16 = vp8_copy_mem16x16_mmx;
-    if (flags & HAS_SSE2) vp8_copy_mem16x16 = vp8_copy_mem16x16_sse2;
-    vp8_copy_mem8x4 = vp8_copy_mem8x4_c;
-    if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx;
-    vp8_copy_mem8x8 = vp8_copy_mem8x8_c;
-    if (flags & HAS_MMX) vp8_copy_mem8x8 = vp8_copy_mem8x8_mmx;
-    vp8_dc_only_idct_add = vp8_dc_only_idct_add_c;
-    if (flags & HAS_MMX) vp8_dc_only_idct_add = vp8_dc_only_idct_add_mmx;
-    vp8_denoiser_filter = vp8_denoiser_filter_c;
-    if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2;
-    vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c;
-    if (flags & HAS_SSE2) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_sse2;
-    vp8_dequant_idct_add = vp8_dequant_idct_add_c;
-    if (flags & HAS_MMX) vp8_dequant_idct_add = vp8_dequant_idct_add_mmx;
-    vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c;
-    if (flags & HAS_MMX) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_mmx;
-    if (flags & HAS_SSE2) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_sse2;
-    vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_c;
-    if (flags & HAS_MMX) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_mmx;
-    if (flags & HAS_SSE2) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_sse2;
-    vp8_dequantize_b = vp8_dequantize_b_c;
-    if (flags & HAS_MMX) vp8_dequantize_b = vp8_dequantize_b_mmx;
-    vp8_diamond_search_sad = vp8_diamond_search_sad_c;
-    if (flags & HAS_SSE3) vp8_diamond_search_sad = vp8_diamond_search_sadx4;
-    vp8_fast_quantize_b = vp8_fast_quantize_b_c;
-    if (flags & HAS_SSE2) vp8_fast_quantize_b = vp8_fast_quantize_b_sse2;
-    if (flags & HAS_SSSE3) vp8_fast_quantize_b = vp8_fast_quantize_b_ssse3;
-    vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c;
-    if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2;
-    vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c;
-    if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2;
-    vp8_full_search_sad = vp8_full_search_sad_c;
-    if (flags & HAS_SSE3) vp8_full_search_sad = vp8_full_search_sadx3;
-    if (flags & HAS_SSE4_1) vp8_full_search_sad = vp8_full_search_sadx8;
-    vp8_get4x4sse_cs = vp8_get4x4sse_cs_c;
-    if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx;
-    vp8_get_mb_ss = vp8_get_mb_ss_c;
-    if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx;
-    if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2;
-    vp8_loop_filter_bh = vp8_loop_filter_bh_c;
-    if (flags & HAS_MMX) vp8_loop_filter_bh = vp8_loop_filter_bh_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_bh = vp8_loop_filter_bh_sse2;
-    vp8_loop_filter_bv = vp8_loop_filter_bv_c;
-    if (flags & HAS_MMX) vp8_loop_filter_bv = vp8_loop_filter_bv_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_bv = vp8_loop_filter_bv_sse2;
-    vp8_loop_filter_mbh = vp8_loop_filter_mbh_c;
-    if (flags & HAS_MMX) vp8_loop_filter_mbh = vp8_loop_filter_mbh_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_mbh = vp8_loop_filter_mbh_sse2;
-    vp8_loop_filter_mbv = vp8_loop_filter_mbv_c;
-    if (flags & HAS_MMX) vp8_loop_filter_mbv = vp8_loop_filter_mbv_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_mbv = vp8_loop_filter_mbv_sse2;
-    vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c;
-    if (flags & HAS_MMX) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_sse2;
-    vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c;
-    if (flags & HAS_MMX) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_sse2;
-    vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c;
-    if (flags & HAS_MMX) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_sse2;
-    vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_c;
-    if (flags & HAS_MMX) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_mmx;
-    if (flags & HAS_SSE2) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_sse2;
-    vp8_mbblock_error = vp8_mbblock_error_c;
-    if (flags & HAS_MMX) vp8_mbblock_error = vp8_mbblock_error_mmx;
-    if (flags & HAS_SSE2) vp8_mbblock_error = vp8_mbblock_error_xmm;
-    vp8_mbpost_proc_across_ip = vp8_mbpost_proc_across_ip_c;
-    if (flags & HAS_SSE2) vp8_mbpost_proc_across_ip = vp8_mbpost_proc_across_ip_xmm;
-    vp8_mbpost_proc_down = vp8_mbpost_proc_down_c;
-    if (flags & HAS_MMX) vp8_mbpost_proc_down = vp8_mbpost_proc_down_mmx;
-    if (flags & HAS_SSE2) vp8_mbpost_proc_down = vp8_mbpost_proc_down_xmm;
-    vp8_mbuverror = vp8_mbuverror_c;
-    if (flags & HAS_MMX) vp8_mbuverror = vp8_mbuverror_mmx;
-    if (flags & HAS_SSE2) vp8_mbuverror = vp8_mbuverror_xmm;
-    vp8_mse16x16 = vp8_mse16x16_c;
-    if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx;
-    if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt;
-    vp8_plane_add_noise = vp8_plane_add_noise_c;
-    if (flags & HAS_MMX) vp8_plane_add_noise = vp8_plane_add_noise_mmx;
-    if (flags & HAS_SSE2) vp8_plane_add_noise = vp8_plane_add_noise_wmt;
-    vp8_post_proc_down_and_across_mb_row = vp8_post_proc_down_and_across_mb_row_c;
-    if (flags & HAS_SSE2) vp8_post_proc_down_and_across_mb_row = vp8_post_proc_down_and_across_mb_row_sse2;
-    vp8_refining_search_sad = vp8_refining_search_sad_c;
-    if (flags & HAS_SSE3) vp8_refining_search_sad = vp8_refining_search_sadx4;
-    vp8_regular_quantize_b = vp8_regular_quantize_b_c;
-    if (flags & HAS_SSE2) vp8_regular_quantize_b = vp8_regular_quantize_b_sse2;
-    if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1;
-    vp8_sad16x16 = vp8_sad16x16_c;
-    if (flags & HAS_MMX) vp8_sad16x16 = vp8_sad16x16_mmx;
-    if (flags & HAS_SSE2) vp8_sad16x16 = vp8_sad16x16_wmt;
-    if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3;
-    vp8_sad16x16x3 = vp8_sad16x16x3_c;
-    if (flags & HAS_SSE3) vp8_sad16x16x3 = vp8_sad16x16x3_sse3;
-    if (flags & HAS_SSSE3) vp8_sad16x16x3 = vp8_sad16x16x3_ssse3;
-    vp8_sad16x16x4d = vp8_sad16x16x4d_c;
-    if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3;
-    vp8_sad16x16x8 = vp8_sad16x16x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad16x16x8 = vp8_sad16x16x8_sse4;
-    vp8_sad16x8 = vp8_sad16x8_c;
-    if (flags & HAS_MMX) vp8_sad16x8 = vp8_sad16x8_mmx;
-    if (flags & HAS_SSE2) vp8_sad16x8 = vp8_sad16x8_wmt;
-    vp8_sad16x8x3 = vp8_sad16x8x3_c;
-    if (flags & HAS_SSE3) vp8_sad16x8x3 = vp8_sad16x8x3_sse3;
-    if (flags & HAS_SSSE3) vp8_sad16x8x3 = vp8_sad16x8x3_ssse3;
-    vp8_sad16x8x4d = vp8_sad16x8x4d_c;
-    if (flags & HAS_SSE3) vp8_sad16x8x4d = vp8_sad16x8x4d_sse3;
-    vp8_sad16x8x8 = vp8_sad16x8x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad16x8x8 = vp8_sad16x8x8_sse4;
-    vp8_sad4x4 = vp8_sad4x4_c;
-    if (flags & HAS_MMX) vp8_sad4x4 = vp8_sad4x4_mmx;
-    if (flags & HAS_SSE2) vp8_sad4x4 = vp8_sad4x4_wmt;
-    vp8_sad4x4x3 = vp8_sad4x4x3_c;
-    if (flags & HAS_SSE3) vp8_sad4x4x3 = vp8_sad4x4x3_sse3;
-    vp8_sad4x4x4d = vp8_sad4x4x4d_c;
-    if (flags & HAS_SSE3) vp8_sad4x4x4d = vp8_sad4x4x4d_sse3;
-    vp8_sad4x4x8 = vp8_sad4x4x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad4x4x8 = vp8_sad4x4x8_sse4;
-    vp8_sad8x16 = vp8_sad8x16_c;
-    if (flags & HAS_MMX) vp8_sad8x16 = vp8_sad8x16_mmx;
-    if (flags & HAS_SSE2) vp8_sad8x16 = vp8_sad8x16_wmt;
-    vp8_sad8x16x3 = vp8_sad8x16x3_c;
-    if (flags & HAS_SSE3) vp8_sad8x16x3 = vp8_sad8x16x3_sse3;
-    vp8_sad8x16x4d = vp8_sad8x16x4d_c;
-    if (flags & HAS_SSE3) vp8_sad8x16x4d = vp8_sad8x16x4d_sse3;
-    vp8_sad8x16x8 = vp8_sad8x16x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad8x16x8 = vp8_sad8x16x8_sse4;
-    vp8_sad8x8 = vp8_sad8x8_c;
-    if (flags & HAS_MMX) vp8_sad8x8 = vp8_sad8x8_mmx;
-    if (flags & HAS_SSE2) vp8_sad8x8 = vp8_sad8x8_wmt;
-    vp8_sad8x8x3 = vp8_sad8x8x3_c;
-    if (flags & HAS_SSE3) vp8_sad8x8x3 = vp8_sad8x8x3_sse3;
-    vp8_sad8x8x4d = vp8_sad8x8x4d_c;
-    if (flags & HAS_SSE3) vp8_sad8x8x4d = vp8_sad8x8x4d_sse3;
-    vp8_sad8x8x8 = vp8_sad8x8x8_c;
-    if (flags & HAS_SSE4_1) vp8_sad8x8x8 = vp8_sad8x8x8_sse4;
-    vp8_short_fdct4x4 = vp8_short_fdct4x4_c;
-    if (flags & HAS_MMX) vp8_short_fdct4x4 = vp8_short_fdct4x4_mmx;
-    if (flags & HAS_SSE2) vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2;
-    vp8_short_fdct8x4 = vp8_short_fdct8x4_c;
-    if (flags & HAS_MMX) vp8_short_fdct8x4 = vp8_short_fdct8x4_mmx;
-    if (flags & HAS_SSE2) vp8_short_fdct8x4 = vp8_short_fdct8x4_sse2;
-    vp8_short_idct4x4llm = vp8_short_idct4x4llm_c;
-    if (flags & HAS_MMX) vp8_short_idct4x4llm = vp8_short_idct4x4llm_mmx;
-    vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c;
-    if (flags & HAS_MMX) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_mmx;
-    if (flags & HAS_SSE2) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_sse2;
-    vp8_short_walsh4x4 = vp8_short_walsh4x4_c;
-    if (flags & HAS_SSE2) vp8_short_walsh4x4 = vp8_short_walsh4x4_sse2;
-    vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c;
-    if (flags & HAS_MMX) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_mmx;
-    if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3;
-    vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c;
-    if (flags & HAS_MMX) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_mmx;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_ssse3;
-    vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c;
-    if (flags & HAS_MMX) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_mmx;
-    if (flags & HAS_SSE2) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_sse2;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_ssse3;
-    vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c;
-    if (flags & HAS_MMX) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_mmx;
-    if (flags & HAS_SSE2) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_sse2;
-    if (flags & HAS_SSSE3) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_ssse3;
-    vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c;
-    if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx;
-    if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt;
-    vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_c;
-    if (flags & HAS_MMX) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_mmx;
-    if (flags & HAS_SSE2) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_wmt;
-    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_ssse3;
-    vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_c;
-    if (flags & HAS_MMX) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_mmx;
-    if (flags & HAS_SSE2) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_wmt;
-    if (flags & HAS_SSSE3) vp8_sub_pixel_variance16x8 = vp8_sub_pixel_variance16x8_ssse3;
-    vp8_sub_pixel_variance4x4 = vp8_sub_pixel_variance4x4_c;
-    if (flags & HAS_MMX) vp8_sub_pixel_variance4x4 = vp8_sub_pixel_variance4x4_mmx;
-    if (flags & HAS_SSE2) vp8_sub_pixel_variance4x4 = vp8_sub_pixel_variance4x4_wmt;
-    vp8_sub_pixel_variance8x16 = vp8_sub_pixel_variance8x16_c;
-    if (flags & HAS_MMX) vp8_sub_pixel_variance8x16 = vp8_sub_pixel_variance8x16_mmx;
-    if (flags & HAS_SSE2) vp8_sub_pixel_variance8x16 = vp8_sub_pixel_variance8x16_wmt;
-    vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_c;
-    if (flags & HAS_MMX) vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_mmx;
-    if (flags & HAS_SSE2) vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_wmt;
-    vp8_subtract_b = vp8_subtract_b_c;
-    if (flags & HAS_MMX) vp8_subtract_b = vp8_subtract_b_mmx;
-    if (flags & HAS_SSE2) vp8_subtract_b = vp8_subtract_b_sse2;
-    vp8_subtract_mbuv = vp8_subtract_mbuv_c;
-    if (flags & HAS_MMX) vp8_subtract_mbuv = vp8_subtract_mbuv_mmx;
-    if (flags & HAS_SSE2) vp8_subtract_mbuv = vp8_subtract_mbuv_sse2;
-    vp8_subtract_mby = vp8_subtract_mby_c;
-    if (flags & HAS_MMX) vp8_subtract_mby = vp8_subtract_mby_mmx;
-    if (flags & HAS_SSE2) vp8_subtract_mby = vp8_subtract_mby_sse2;
-    vp8_temporal_filter_apply = vp8_temporal_filter_apply_c;
-    if (flags & HAS_SSE2) vp8_temporal_filter_apply = vp8_temporal_filter_apply_sse2;
-    vp8_variance16x16 = vp8_variance16x16_c;
-    if (flags & HAS_MMX) vp8_variance16x16 = vp8_variance16x16_mmx;
-    if (flags & HAS_SSE2) vp8_variance16x16 = vp8_variance16x16_wmt;
-    vp8_variance16x8 = vp8_variance16x8_c;
-    if (flags & HAS_MMX) vp8_variance16x8 = vp8_variance16x8_mmx;
-    if (flags & HAS_SSE2) vp8_variance16x8 = vp8_variance16x8_wmt;
-    vp8_variance4x4 = vp8_variance4x4_c;
-    if (flags & HAS_MMX) vp8_variance4x4 = vp8_variance4x4_mmx;
-    if (flags & HAS_SSE2) vp8_variance4x4 = vp8_variance4x4_wmt;
-    vp8_variance8x16 = vp8_variance8x16_c;
-    if (flags & HAS_MMX) vp8_variance8x16 = vp8_variance8x16_mmx;
-    if (flags & HAS_SSE2) vp8_variance8x16 = vp8_variance8x16_wmt;
-    vp8_variance8x8 = vp8_variance8x8_c;
-    if (flags & HAS_MMX) vp8_variance8x8 = vp8_variance8x8_mmx;
-    if (flags & HAS_SSE2) vp8_variance8x8 = vp8_variance8x8_wmt;
-    vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_c;
-    if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_mmx;
-    if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_wmt;
-    vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_c;
-    if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_mmx;
-    if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_wmt;
-    vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_c;
-    if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_mmx;
-    if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_wmt;
-}
-#endif
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd.h	2015-02-28 15:03:04.000000000 +0000
@@ -9,7 +9,7 @@
 #if defined(_WIN64)
 /* 64 bit Windows */
 #ifdef _MSC_VER
-#include "vp9_rtcd_x86_64-win64-vs8.h"
+#include "vp9_rtcd_x86_64-win64-vs12.h"
 #else
 #include "vp9_rtcd_x86_64-win64-gcc.h"
 #endif
@@ -17,7 +17,7 @@
 #elif defined(_WIN32)
 /* 32 bit Windows, MSVC. */
 #ifdef _MSC_VER
-#include "vp9_rtcd_x86-win32-vs8.h"
+#include "vp9_rtcd_x86-win32-vs12.h"
 #else
 #include "vp9_rtcd_x86-win32-gcc.h"
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs12.h	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,1088 @@
+#ifndef VP9_RTCD_H_
+#define VP9_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+/*
+ * VP9
+ */
+
+#include "vpx/vpx_integer.h"
+#include "vp9/common/vp9_enums.h"
+#include "vp9/common/vp9_idct.h"
+
+struct macroblockd;
+
+/* Encoder forward decls */
+struct macroblock;
+struct vp9_variance_vtable;
+struct search_site_config;
+struct mv;
+union int_mv;
+struct yv12_buffer_config;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+
+void vp9_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_avg_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_avg_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+#define vp9_convolve_avg vp9_convolve_avg_sse2
+
+void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+#define vp9_convolve_copy vp9_convolve_copy_sse2
+
+void vp9_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_16x16 vp9_d117_predictor_16x16_c
+
+void vp9_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_32x32 vp9_d117_predictor_32x32_c
+
+void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_4x4 vp9_d117_predictor_4x4_c
+
+void vp9_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_8x8 vp9_d117_predictor_8x8_c
+
+void vp9_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_16x16 vp9_d135_predictor_16x16_c
+
+void vp9_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c
+
+void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c
+
+void vp9_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c
+
+void vp9_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d153_predictor_32x32 vp9_d153_predictor_32x32_c
+
+void vp9_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_16x16 vp9_dc_128_predictor_16x16_c
+
+void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c
+
+void vp9_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c
+
+void vp9_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_8x8 vp9_dc_128_predictor_8x8_c
+
+void vp9_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_16x16 vp9_dc_left_predictor_16x16_c
+
+void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c
+
+void vp9_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c
+
+void vp9_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_8x8 vp9_dc_left_predictor_8x8_c
+
+void vp9_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_predictor_16x16 vp9_dc_predictor_16x16_sse2
+
+void vp9_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_predictor_32x32 vp9_dc_predictor_32x32_sse2
+
+void vp9_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_predictor_4x4 vp9_dc_predictor_4x4_sse
+
+void vp9_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_predictor_8x8 vp9_dc_predictor_8x8_sse
+
+void vp9_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_16x16 vp9_dc_top_predictor_16x16_c
+
+void vp9_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c
+
+void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c
+
+void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c
+
+int vp9_diamond_search_sad_c(const struct macroblock *x, const struct search_site_config *cfg,  struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
+#define vp9_diamond_search_sad vp9_diamond_search_sad_c
+
+void vp9_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride);
+#define vp9_fdct16x16 vp9_fdct16x16_sse2
+
+void vp9_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+#define vp9_fdct16x16_1 vp9_fdct16x16_1_sse2
+
+void vp9_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_avx2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct32x32)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+#define vp9_fdct32x32_1 vp9_fdct32x32_1_sse2
+
+void vp9_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_rd_avx2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct32x32_rd)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride);
+#define vp9_fdct4x4 vp9_fdct4x4_sse2
+
+void vp9_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+#define vp9_fdct4x4_1 vp9_fdct4x4_1_sse2
+
+void vp9_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct8x8_ssse3(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct8x8)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+#define vp9_fdct8x8_1 vp9_fdct8x8_1_sse2
+
+void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+#define vp9_fht16x16 vp9_fht16x16_sse2
+
+void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+#define vp9_fht4x4 vp9_fht4x4_sse2
+
+void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+#define vp9_fht8x8 vp9_fht8x8_sse2
+
+int vp9_full_range_search_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
+#define vp9_full_range_search vp9_full_range_search_c
+
+int vp9_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+int vp9_full_search_sadx3(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+int vp9_full_search_sadx8(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+RTCD_EXTERN int (*vp9_full_search_sad)(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+
+void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fwht4x4_mmx(const int16_t *input, tran_low_t *output, int stride);
+#define vp9_fwht4x4 vp9_fwht4x4_mmx
+
+void vp9_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+void vp9_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+void vp9_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+RTCD_EXTERN void (*vp9_get16x16var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+
+void vp9_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+void vp9_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+#define vp9_get8x8var vp9_get8x8var_sse2
+
+unsigned int vp9_get_mb_ss_c(const int16_t *);
+unsigned int vp9_get_mb_ss_sse2(const int16_t *);
+#define vp9_get_mb_ss vp9_get_mb_ss_sse2
+
+void vp9_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_10_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_idct16x16_1_add vp9_idct16x16_1_add_sse2
+
+void vp9_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_256_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct16x16_256_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_idct32x32_1024_add vp9_idct32x32_1024_add_sse2
+
+void vp9_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_idct32x32_1_add vp9_idct32x32_1_add_sse2
+
+void vp9_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_idct32x32_34_add vp9_idct32x32_34_add_sse2
+
+void vp9_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_idct4x4_16_add vp9_idct4x4_16_add_sse2
+
+void vp9_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_idct4x4_1_add vp9_idct4x4_1_add_sse2
+
+void vp9_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_idct8x8_1_add vp9_idct8x8_1_add_sse2
+
+void vp9_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_64_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
+void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
+#define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2
+
+void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+#define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2
+
+void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+#define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2
+
+void vp9_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_iwht4x4_16_add vp9_iwht4x4_16_add_c
+
+void vp9_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_iwht4x4_1_add vp9_iwht4x4_1_add_c
+
+void vp9_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+RTCD_EXTERN void (*vp9_lpf_horizontal_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+
+void vp9_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+#define vp9_lpf_horizontal_4 vp9_lpf_horizontal_4_mmx
+
+void vp9_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_horizontal_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define vp9_lpf_horizontal_4_dual vp9_lpf_horizontal_4_dual_sse2
+
+void vp9_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+#define vp9_lpf_horizontal_8 vp9_lpf_horizontal_8_sse2
+
+void vp9_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_horizontal_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define vp9_lpf_horizontal_8_dual vp9_lpf_horizontal_8_dual_sse2
+
+void vp9_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+void vp9_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define vp9_lpf_vertical_16 vp9_lpf_vertical_16_sse2
+
+void vp9_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+void vp9_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define vp9_lpf_vertical_16_dual vp9_lpf_vertical_16_dual_sse2
+
+void vp9_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_vertical_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+#define vp9_lpf_vertical_4 vp9_lpf_vertical_4_mmx
+
+void vp9_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define vp9_lpf_vertical_4_dual vp9_lpf_vertical_4_dual_sse2
+
+void vp9_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+#define vp9_lpf_vertical_8 vp9_lpf_vertical_8_sse2
+
+void vp9_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+#define vp9_lpf_vertical_8_dual vp9_lpf_vertical_8_dual_sse2
+
+unsigned int vp9_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse16x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse16x16_avx2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse16x16)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+
+unsigned int vp9_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse16x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define vp9_mse16x8 vp9_mse16x8_sse2
+
+unsigned int vp9_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse8x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define vp9_mse8x16 vp9_mse8x16_sse2
+
+unsigned int vp9_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse8x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+#define vp9_mse8x8 vp9_mse8x8_sse2
+
+void vp9_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+void vp9_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+RTCD_EXTERN void (*vp9_quantize_b)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+
+void vp9_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+void vp9_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+RTCD_EXTERN void (*vp9_quantize_b_32x32)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+
+void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+void vp9_quantize_fp_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+
+void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+void vp9_quantize_fp_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+RTCD_EXTERN void (*vp9_quantize_fp_32x32)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+
+int vp9_refining_search_sad_c(const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
+#define vp9_refining_search_sad vp9_refining_search_sad_c
+
+unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+#define vp9_sad16x16 vp9_sad16x16_sse2
+
+unsigned int vp9_sad16x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad16x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+#define vp9_sad16x16_avg vp9_sad16x16_avg_sse2
+
+void vp9_sad16x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x16x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad16x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad16x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad16x16x4d vp9_sad16x16x4d_sse2
+
+void vp9_sad16x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad16x16x8 vp9_sad16x16x8_c
+
+unsigned int vp9_sad16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+#define vp9_sad16x32 vp9_sad16x32_sse2
+
+unsigned int vp9_sad16x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad16x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define vp9_sad16x32_avg vp9_sad16x32_avg_sse2
+
+void vp9_sad16x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad16x32x4d vp9_sad16x32x4d_sse2
+
+unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+#define vp9_sad16x8 vp9_sad16x8_sse2
+
+unsigned int vp9_sad16x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad16x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+#define vp9_sad16x8_avg vp9_sad16x8_avg_sse2
+
+void vp9_sad16x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x8x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad16x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad16x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad16x8x4d vp9_sad16x8x4d_sse2
+
+void vp9_sad16x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad16x8x8 vp9_sad16x8x8_c
+
+unsigned int vp9_sad32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+#define vp9_sad32x16 vp9_sad32x16_sse2
+
+unsigned int vp9_sad32x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad32x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define vp9_sad32x16_avg vp9_sad32x16_avg_sse2
+
+void vp9_sad32x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad32x16x4d vp9_sad32x16x4d_sse2
+
+unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+#define vp9_sad32x32 vp9_sad32x32_sse2
+
+unsigned int vp9_sad32x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad32x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+#define vp9_sad32x32_avg vp9_sad32x32_avg_sse2
+
+void vp9_sad32x32x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+#define vp9_sad32x32x3 vp9_sad32x32x3_c
+
+void vp9_sad32x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x32x4d_avx2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad32x32x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad32x32x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad32x32x8 vp9_sad32x32x8_c
+
+unsigned int vp9_sad32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+#define vp9_sad32x64 vp9_sad32x64_sse2
+
+unsigned int vp9_sad32x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad32x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define vp9_sad32x64_avg vp9_sad32x64_avg_sse2
+
+void vp9_sad32x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad32x64x4d vp9_sad32x64x4d_sse2
+
+unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad4x4_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+#define vp9_sad4x4 vp9_sad4x4_sse
+
+unsigned int vp9_sad4x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad4x4_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+#define vp9_sad4x4_avg vp9_sad4x4_avg_sse
+
+void vp9_sad4x4x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad4x4x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad4x4x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad4x4x4d_sse(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad4x4x4d vp9_sad4x4x4d_sse
+
+void vp9_sad4x4x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad4x4x8 vp9_sad4x4x8_c
+
+unsigned int vp9_sad4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad4x8_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+#define vp9_sad4x8 vp9_sad4x8_sse
+
+unsigned int vp9_sad4x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad4x8_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define vp9_sad4x8_avg vp9_sad4x8_avg_sse
+
+void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+void vp9_sad4x8x4d_sse(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+#define vp9_sad4x8x4d vp9_sad4x8x4d_sse
+
+void vp9_sad4x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
+#define vp9_sad4x8x8 vp9_sad4x8x8_c
+
+unsigned int vp9_sad64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+#define vp9_sad64x32 vp9_sad64x32_sse2
+
+unsigned int vp9_sad64x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad64x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define vp9_sad64x32_avg vp9_sad64x32_avg_sse2
+
+void vp9_sad64x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad64x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad64x32x4d vp9_sad64x32x4d_sse2
+
+unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+#define vp9_sad64x64 vp9_sad64x64_sse2
+
+unsigned int vp9_sad64x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad64x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+#define vp9_sad64x64_avg vp9_sad64x64_avg_sse2
+
+void vp9_sad64x64x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+#define vp9_sad64x64x3 vp9_sad64x64x3_c
+
+void vp9_sad64x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad64x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad64x64x4d_avx2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad64x64x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad64x64x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad64x64x8 vp9_sad64x64x8_c
+
+unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+#define vp9_sad8x16 vp9_sad8x16_sse2
+
+unsigned int vp9_sad8x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad8x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+#define vp9_sad8x16_avg vp9_sad8x16_avg_sse2
+
+void vp9_sad8x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad8x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad8x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad8x16x4d vp9_sad8x16x4d_sse2
+
+void vp9_sad8x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad8x16x8 vp9_sad8x16x8_c
+
+unsigned int vp9_sad8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+#define vp9_sad8x4 vp9_sad8x4_sse2
+
+unsigned int vp9_sad8x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad8x4_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+#define vp9_sad8x4_avg vp9_sad8x4_avg_sse2
+
+void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+void vp9_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+#define vp9_sad8x4x4d vp9_sad8x4x4d_sse2
+
+void vp9_sad8x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
+#define vp9_sad8x4x8 vp9_sad8x4x8_c
+
+unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+#define vp9_sad8x8 vp9_sad8x8_sse2
+
+unsigned int vp9_sad8x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad8x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+#define vp9_sad8x8_avg vp9_sad8x8_avg_sse2
+
+void vp9_sad8x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad8x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad8x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+#define vp9_sad8x8x4d vp9_sad8x8x4d_sse2
+
+void vp9_sad8x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad8x8x8 vp9_sad8x8x8_c
+
+unsigned int vp9_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+void vp9_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
+void vp9_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
+#define vp9_subtract_block vp9_subtract_block_sse2
+
+void vp9_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
+void vp9_temporal_filter_apply_sse2(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
+#define vp9_temporal_filter_apply vp9_temporal_filter_apply_sse2
+
+void vp9_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_tm_predictor_16x16 vp9_tm_predictor_16x16_sse2
+
+void vp9_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_tm_predictor_32x32 vp9_tm_predictor_32x32_sse2
+
+void vp9_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_tm_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_tm_predictor_4x4 vp9_tm_predictor_4x4_sse
+
+void vp9_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_tm_predictor_8x8 vp9_tm_predictor_8x8_sse2
+
+void vp9_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_v_predictor_16x16 vp9_v_predictor_16x16_sse2
+
+void vp9_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_v_predictor_32x32 vp9_v_predictor_32x32_sse2
+
+void vp9_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_v_predictor_4x4 vp9_v_predictor_4x4_sse
+
+void vp9_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_v_predictor_8x8 vp9_v_predictor_8x8_sse
+
+unsigned int vp9_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance16x32 vp9_variance16x32_sse2
+
+unsigned int vp9_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance16x8 vp9_variance16x8_sse2
+
+unsigned int vp9_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance32x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance32x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance32x64 vp9_variance32x64_sse2
+
+unsigned int vp9_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance4x4 vp9_variance4x4_sse2
+
+unsigned int vp9_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance4x8 vp9_variance4x8_sse2
+
+unsigned int vp9_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance64x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance64x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance8x16 vp9_variance8x16_sse2
+
+unsigned int vp9_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance8x4 vp9_variance8x4_sse2
+
+unsigned int vp9_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+#define vp9_variance8x8 vp9_variance8x8_sse2
+
+void vp9_rtcd(void);
+
+#ifdef RTCD_C
+#include "vpx_ports/x86.h"
+static void setup_rtcd_internal(void)
+{
+    int flags = x86_simd_caps();
+
+    (void)flags;
+
+    vp9_block_error = vp9_block_error_sse2;
+    if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2;
+    vp9_convolve8 = vp9_convolve8_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8 = vp9_convolve8_ssse3;
+    if (flags & HAS_AVX2) vp9_convolve8 = vp9_convolve8_avx2;
+    vp9_convolve8_avg = vp9_convolve8_avg_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_avg = vp9_convolve8_avg_ssse3;
+    vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_ssse3;
+    vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_ssse3;
+    vp9_convolve8_horiz = vp9_convolve8_horiz_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_horiz = vp9_convolve8_horiz_ssse3;
+    if (flags & HAS_AVX2) vp9_convolve8_horiz = vp9_convolve8_horiz_avx2;
+    vp9_convolve8_vert = vp9_convolve8_vert_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_vert = vp9_convolve8_vert_ssse3;
+    if (flags & HAS_AVX2) vp9_convolve8_vert = vp9_convolve8_vert_avx2;
+    vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_ssse3;
+    vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_ssse3;
+    vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_ssse3;
+    vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_ssse3;
+    vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_ssse3;
+    vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_ssse3;
+    vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_ssse3;
+    vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_ssse3;
+    vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_ssse3;
+    vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_ssse3;
+    vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_ssse3;
+    vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_ssse3;
+    vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_ssse3;
+    vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_ssse3;
+    vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_ssse3;
+    vp9_fdct32x32 = vp9_fdct32x32_sse2;
+    if (flags & HAS_AVX2) vp9_fdct32x32 = vp9_fdct32x32_avx2;
+    vp9_fdct32x32_rd = vp9_fdct32x32_rd_sse2;
+    if (flags & HAS_AVX2) vp9_fdct32x32_rd = vp9_fdct32x32_rd_avx2;
+    vp9_fdct8x8 = vp9_fdct8x8_sse2;
+    if (flags & HAS_SSSE3) vp9_fdct8x8 = vp9_fdct8x8_ssse3;
+    vp9_full_search_sad = vp9_full_search_sad_c;
+    if (flags & HAS_SSE3) vp9_full_search_sad = vp9_full_search_sadx3;
+    if (flags & HAS_SSE4_1) vp9_full_search_sad = vp9_full_search_sadx8;
+    vp9_get16x16var = vp9_get16x16var_sse2;
+    if (flags & HAS_AVX2) vp9_get16x16var = vp9_get16x16var_avx2;
+    vp9_h_predictor_16x16 = vp9_h_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_16x16 = vp9_h_predictor_16x16_ssse3;
+    vp9_h_predictor_32x32 = vp9_h_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_32x32 = vp9_h_predictor_32x32_ssse3;
+    vp9_h_predictor_4x4 = vp9_h_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_4x4 = vp9_h_predictor_4x4_ssse3;
+    vp9_h_predictor_8x8 = vp9_h_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_8x8 = vp9_h_predictor_8x8_ssse3;
+    vp9_idct16x16_10_add = vp9_idct16x16_10_add_sse2;
+    if (flags & HAS_SSSE3) vp9_idct16x16_10_add = vp9_idct16x16_10_add_ssse3;
+    vp9_idct16x16_256_add = vp9_idct16x16_256_add_sse2;
+    if (flags & HAS_SSSE3) vp9_idct16x16_256_add = vp9_idct16x16_256_add_ssse3;
+    vp9_idct8x8_12_add = vp9_idct8x8_12_add_sse2;
+    if (flags & HAS_SSSE3) vp9_idct8x8_12_add = vp9_idct8x8_12_add_ssse3;
+    vp9_idct8x8_64_add = vp9_idct8x8_64_add_sse2;
+    if (flags & HAS_SSSE3) vp9_idct8x8_64_add = vp9_idct8x8_64_add_ssse3;
+    vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_sse2;
+    if (flags & HAS_AVX2) vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_avx2;
+    vp9_mse16x16 = vp9_mse16x16_sse2;
+    if (flags & HAS_AVX2) vp9_mse16x16 = vp9_mse16x16_avx2;
+    vp9_quantize_b = vp9_quantize_b_c;
+    if (flags & HAS_SSSE3) vp9_quantize_b = vp9_quantize_b_ssse3;
+    vp9_quantize_b_32x32 = vp9_quantize_b_32x32_c;
+    if (flags & HAS_SSSE3) vp9_quantize_b_32x32 = vp9_quantize_b_32x32_ssse3;
+    vp9_quantize_fp = vp9_quantize_fp_c;
+    if (flags & HAS_SSSE3) vp9_quantize_fp = vp9_quantize_fp_ssse3;
+    vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c;
+    if (flags & HAS_SSSE3) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3;
+    vp9_sad16x16x3 = vp9_sad16x16x3_c;
+    if (flags & HAS_SSE3) vp9_sad16x16x3 = vp9_sad16x16x3_sse3;
+    if (flags & HAS_SSSE3) vp9_sad16x16x3 = vp9_sad16x16x3_ssse3;
+    vp9_sad16x8x3 = vp9_sad16x8x3_c;
+    if (flags & HAS_SSE3) vp9_sad16x8x3 = vp9_sad16x8x3_sse3;
+    if (flags & HAS_SSSE3) vp9_sad16x8x3 = vp9_sad16x8x3_ssse3;
+    vp9_sad32x32x4d = vp9_sad32x32x4d_sse2;
+    if (flags & HAS_AVX2) vp9_sad32x32x4d = vp9_sad32x32x4d_avx2;
+    vp9_sad4x4x3 = vp9_sad4x4x3_c;
+    if (flags & HAS_SSE3) vp9_sad4x4x3 = vp9_sad4x4x3_sse3;
+    vp9_sad64x64x4d = vp9_sad64x64x4d_sse2;
+    if (flags & HAS_AVX2) vp9_sad64x64x4d = vp9_sad64x64x4d_avx2;
+    vp9_sad8x16x3 = vp9_sad8x16x3_c;
+    if (flags & HAS_SSE3) vp9_sad8x16x3 = vp9_sad8x16x3_sse3;
+    vp9_sad8x8x3 = vp9_sad8x8x3_c;
+    if (flags & HAS_SSE3) vp9_sad8x8x3 = vp9_sad8x8x3_sse3;
+    vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_ssse3;
+    vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_ssse3;
+    vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_ssse3;
+    vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_ssse3;
+    vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_avx2;
+    vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_ssse3;
+    vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_ssse3;
+    vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_ssse3;
+    vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_ssse3;
+    vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_avx2;
+    vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_ssse3;
+    vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_ssse3;
+    vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_ssse3;
+    vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_ssse3;
+    vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_ssse3;
+    vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_ssse3;
+    vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_ssse3;
+    vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_avx2;
+    vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_ssse3;
+    vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_ssse3;
+    vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_ssse3;
+    vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_ssse3;
+    vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_avx2;
+    vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_ssse3;
+    vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_ssse3;
+    vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_ssse3;
+    vp9_variance16x16 = vp9_variance16x16_sse2;
+    if (flags & HAS_AVX2) vp9_variance16x16 = vp9_variance16x16_avx2;
+    vp9_variance32x16 = vp9_variance32x16_sse2;
+    if (flags & HAS_AVX2) vp9_variance32x16 = vp9_variance32x16_avx2;
+    vp9_variance32x32 = vp9_variance32x32_sse2;
+    if (flags & HAS_AVX2) vp9_variance32x32 = vp9_variance32x32_avx2;
+    vp9_variance64x32 = vp9_variance64x32_sse2;
+    if (flags & HAS_AVX2) vp9_variance64x32 = vp9_variance64x32_avx2;
+    vp9_variance64x64 = vp9_variance64x64_sse2;
+    if (flags & HAS_AVX2) vp9_variance64x64 = vp9_variance64x64_avx2;
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86_64-win64-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1035 +0,0 @@
-#ifndef VP9_RTCD_H_
-#define VP9_RTCD_H_
-
-#ifdef RTCD_C
-#define RTCD_EXTERN
-#else
-#define RTCD_EXTERN extern
-#endif
-
-/*
- * VP9
- */
-
-#include "vpx/vpx_integer.h"
-#include "vp9/common/vp9_enums.h"
-#include "vp9/common/vp9_idct.h"
-
-struct macroblockd;
-
-/* Encoder forward decls */
-struct macroblock;
-struct vp9_variance_vtable;
-struct search_site_config;
-struct mv;
-union int_mv;
-struct yv12_buffer_config;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
-int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
-#define vp9_block_error vp9_block_error_sse2
-
-void vp9_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_avg_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_avg_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-#define vp9_convolve_avg vp9_convolve_avg_sse2
-
-void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-#define vp9_convolve_copy vp9_convolve_copy_sse2
-
-void vp9_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_16x16 vp9_d117_predictor_16x16_c
-
-void vp9_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_32x32 vp9_d117_predictor_32x32_c
-
-void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_4x4 vp9_d117_predictor_4x4_c
-
-void vp9_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_8x8 vp9_d117_predictor_8x8_c
-
-void vp9_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_16x16 vp9_d135_predictor_16x16_c
-
-void vp9_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c
-
-void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c
-
-void vp9_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c
-
-void vp9_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d153_predictor_32x32 vp9_d153_predictor_32x32_c
-
-void vp9_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_16x16 vp9_dc_128_predictor_16x16_c
-
-void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c
-
-void vp9_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c
-
-void vp9_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_8x8 vp9_dc_128_predictor_8x8_c
-
-void vp9_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_16x16 vp9_dc_left_predictor_16x16_c
-
-void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c
-
-void vp9_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c
-
-void vp9_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_8x8 vp9_dc_left_predictor_8x8_c
-
-void vp9_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_predictor_16x16 vp9_dc_predictor_16x16_sse2
-
-void vp9_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_predictor_32x32 vp9_dc_predictor_32x32_sse2
-
-void vp9_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_predictor_4x4 vp9_dc_predictor_4x4_sse
-
-void vp9_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_predictor_8x8 vp9_dc_predictor_8x8_sse
-
-void vp9_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_16x16 vp9_dc_top_predictor_16x16_c
-
-void vp9_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c
-
-void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c
-
-void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c
-
-int vp9_diamond_search_sad_c(const struct macroblock *x, const struct search_site_config *cfg,  struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
-#define vp9_diamond_search_sad vp9_diamond_search_sad_c
-
-void vp9_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct16x16 vp9_fdct16x16_sse2
-
-void vp9_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct16x16_1 vp9_fdct16x16_1_sse2
-
-void vp9_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct32x32 vp9_fdct32x32_sse2
-
-void vp9_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct32x32_1 vp9_fdct32x32_1_sse2
-
-void vp9_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct32x32_rd vp9_fdct32x32_rd_sse2
-
-void vp9_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct4x4 vp9_fdct4x4_sse2
-
-void vp9_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct4x4_1 vp9_fdct4x4_1_sse2
-
-void vp9_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct8x8_ssse3(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct8x8)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fdct8x8_1 vp9_fdct8x8_1_sse2
-
-void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define vp9_fht16x16 vp9_fht16x16_sse2
-
-void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define vp9_fht4x4 vp9_fht4x4_sse2
-
-void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-#define vp9_fht8x8 vp9_fht8x8_sse2
-
-int vp9_full_range_search_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
-#define vp9_full_range_search vp9_full_range_search_c
-
-int vp9_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-int vp9_full_search_sadx3(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-int vp9_full_search_sadx8(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-RTCD_EXTERN int (*vp9_full_search_sad)(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-
-void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fwht4x4_mmx(const int16_t *input, tran_low_t *output, int stride);
-#define vp9_fwht4x4 vp9_fwht4x4_mmx
-
-void vp9_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-void vp9_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-#define vp9_get16x16var vp9_get16x16var_sse2
-
-void vp9_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-void vp9_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-#define vp9_get8x8var vp9_get8x8var_sse2
-
-unsigned int vp9_get_mb_ss_c(const int16_t *);
-unsigned int vp9_get_mb_ss_sse2(const int16_t *);
-#define vp9_get_mb_ss vp9_get_mb_ss_sse2
-
-void vp9_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_10_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_idct16x16_1_add vp9_idct16x16_1_add_sse2
-
-void vp9_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_256_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct16x16_256_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_idct32x32_1024_add vp9_idct32x32_1024_add_sse2
-
-void vp9_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_idct32x32_1_add vp9_idct32x32_1_add_sse2
-
-void vp9_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_idct32x32_34_add vp9_idct32x32_34_add_sse2
-
-void vp9_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_idct4x4_16_add vp9_idct4x4_16_add_sse2
-
-void vp9_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_idct4x4_1_add vp9_idct4x4_1_add_sse2
-
-void vp9_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_12_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_idct8x8_1_add vp9_idct8x8_1_add_sse2
-
-void vp9_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_64_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
-void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
-#define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2
-
-void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-#define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2
-
-void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-#define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2
-
-void vp9_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_iwht4x4_16_add vp9_iwht4x4_16_add_c
-
-void vp9_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_iwht4x4_1_add vp9_iwht4x4_1_add_c
-
-void vp9_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-#define vp9_lpf_horizontal_16 vp9_lpf_horizontal_16_sse2
-
-void vp9_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_horizontal_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-#define vp9_lpf_horizontal_4 vp9_lpf_horizontal_4_mmx
-
-void vp9_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_horizontal_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-#define vp9_lpf_horizontal_4_dual vp9_lpf_horizontal_4_dual_sse2
-
-void vp9_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-#define vp9_lpf_horizontal_8 vp9_lpf_horizontal_8_sse2
-
-void vp9_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_horizontal_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-#define vp9_lpf_horizontal_8_dual vp9_lpf_horizontal_8_dual_sse2
-
-void vp9_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-void vp9_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-#define vp9_lpf_vertical_16 vp9_lpf_vertical_16_sse2
-
-void vp9_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-void vp9_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-#define vp9_lpf_vertical_16_dual vp9_lpf_vertical_16_dual_sse2
-
-void vp9_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_vertical_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-#define vp9_lpf_vertical_4 vp9_lpf_vertical_4_mmx
-
-void vp9_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-#define vp9_lpf_vertical_4_dual vp9_lpf_vertical_4_dual_sse2
-
-void vp9_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-#define vp9_lpf_vertical_8 vp9_lpf_vertical_8_sse2
-
-void vp9_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-#define vp9_lpf_vertical_8_dual vp9_lpf_vertical_8_dual_sse2
-
-unsigned int vp9_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse16x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-#define vp9_mse16x16 vp9_mse16x16_sse2
-
-unsigned int vp9_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse16x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-#define vp9_mse16x8 vp9_mse16x8_sse2
-
-unsigned int vp9_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse8x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-#define vp9_mse8x16 vp9_mse8x16_sse2
-
-unsigned int vp9_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse8x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-#define vp9_mse8x8 vp9_mse8x8_sse2
-
-void vp9_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-void vp9_quantize_b_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-RTCD_EXTERN void (*vp9_quantize_b)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-
-void vp9_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-void vp9_quantize_b_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-RTCD_EXTERN void (*vp9_quantize_b_32x32)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-
-void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-void vp9_quantize_fp_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-
-void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-void vp9_quantize_fp_32x32_ssse3(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-RTCD_EXTERN void (*vp9_quantize_fp_32x32)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-
-int vp9_refining_search_sad_c(const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
-#define vp9_refining_search_sad vp9_refining_search_sad_c
-
-unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-#define vp9_sad16x16 vp9_sad16x16_sse2
-
-unsigned int vp9_sad16x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad16x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-#define vp9_sad16x16_avg vp9_sad16x16_avg_sse2
-
-void vp9_sad16x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x16x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad16x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad16x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad16x16x4d vp9_sad16x16x4d_sse2
-
-void vp9_sad16x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad16x16x8 vp9_sad16x16x8_c
-
-unsigned int vp9_sad16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-#define vp9_sad16x32 vp9_sad16x32_sse2
-
-unsigned int vp9_sad16x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad16x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-#define vp9_sad16x32_avg vp9_sad16x32_avg_sse2
-
-void vp9_sad16x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad16x32x4d vp9_sad16x32x4d_sse2
-
-unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-#define vp9_sad16x8 vp9_sad16x8_sse2
-
-unsigned int vp9_sad16x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad16x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-#define vp9_sad16x8_avg vp9_sad16x8_avg_sse2
-
-void vp9_sad16x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x8x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad16x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad16x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad16x8x4d vp9_sad16x8x4d_sse2
-
-void vp9_sad16x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad16x8x8 vp9_sad16x8x8_c
-
-unsigned int vp9_sad32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-#define vp9_sad32x16 vp9_sad32x16_sse2
-
-unsigned int vp9_sad32x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad32x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-#define vp9_sad32x16_avg vp9_sad32x16_avg_sse2
-
-void vp9_sad32x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad32x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad32x16x4d vp9_sad32x16x4d_sse2
-
-unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-#define vp9_sad32x32 vp9_sad32x32_sse2
-
-unsigned int vp9_sad32x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad32x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-#define vp9_sad32x32_avg vp9_sad32x32_avg_sse2
-
-void vp9_sad32x32x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-#define vp9_sad32x32x3 vp9_sad32x32x3_c
-
-void vp9_sad32x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad32x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad32x32x4d vp9_sad32x32x4d_sse2
-
-void vp9_sad32x32x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad32x32x8 vp9_sad32x32x8_c
-
-unsigned int vp9_sad32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-#define vp9_sad32x64 vp9_sad32x64_sse2
-
-unsigned int vp9_sad32x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad32x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-#define vp9_sad32x64_avg vp9_sad32x64_avg_sse2
-
-void vp9_sad32x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad32x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad32x64x4d vp9_sad32x64x4d_sse2
-
-unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad4x4_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-#define vp9_sad4x4 vp9_sad4x4_sse
-
-unsigned int vp9_sad4x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad4x4_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-#define vp9_sad4x4_avg vp9_sad4x4_avg_sse
-
-void vp9_sad4x4x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad4x4x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad4x4x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad4x4x4d_sse(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad4x4x4d vp9_sad4x4x4d_sse
-
-void vp9_sad4x4x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad4x4x8 vp9_sad4x4x8_c
-
-unsigned int vp9_sad4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad4x8_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-#define vp9_sad4x8 vp9_sad4x8_sse
-
-unsigned int vp9_sad4x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad4x8_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-#define vp9_sad4x8_avg vp9_sad4x8_avg_sse
-
-void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-void vp9_sad4x8x4d_sse(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-#define vp9_sad4x8x4d vp9_sad4x8x4d_sse
-
-void vp9_sad4x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
-#define vp9_sad4x8x8 vp9_sad4x8x8_c
-
-unsigned int vp9_sad64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-#define vp9_sad64x32 vp9_sad64x32_sse2
-
-unsigned int vp9_sad64x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad64x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-#define vp9_sad64x32_avg vp9_sad64x32_avg_sse2
-
-void vp9_sad64x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad64x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad64x32x4d vp9_sad64x32x4d_sse2
-
-unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-#define vp9_sad64x64 vp9_sad64x64_sse2
-
-unsigned int vp9_sad64x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad64x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-#define vp9_sad64x64_avg vp9_sad64x64_avg_sse2
-
-void vp9_sad64x64x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-#define vp9_sad64x64x3 vp9_sad64x64x3_c
-
-void vp9_sad64x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad64x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad64x64x4d vp9_sad64x64x4d_sse2
-
-void vp9_sad64x64x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad64x64x8 vp9_sad64x64x8_c
-
-unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-#define vp9_sad8x16 vp9_sad8x16_sse2
-
-unsigned int vp9_sad8x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad8x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-#define vp9_sad8x16_avg vp9_sad8x16_avg_sse2
-
-void vp9_sad8x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad8x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad8x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad8x16x4d vp9_sad8x16x4d_sse2
-
-void vp9_sad8x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad8x16x8 vp9_sad8x16x8_c
-
-unsigned int vp9_sad8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-#define vp9_sad8x4 vp9_sad8x4_sse2
-
-unsigned int vp9_sad8x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad8x4_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-#define vp9_sad8x4_avg vp9_sad8x4_avg_sse2
-
-void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-void vp9_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-#define vp9_sad8x4x4d vp9_sad8x4x4d_sse2
-
-void vp9_sad8x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
-#define vp9_sad8x4x8 vp9_sad8x4x8_c
-
-unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-#define vp9_sad8x8 vp9_sad8x8_sse2
-
-unsigned int vp9_sad8x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad8x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-#define vp9_sad8x8_avg vp9_sad8x8_avg_sse2
-
-void vp9_sad8x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad8x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad8x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-#define vp9_sad8x8x4d vp9_sad8x8x4d_sse2
-
-void vp9_sad8x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad8x8x8 vp9_sad8x8x8_c
-
-unsigned int vp9_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-void vp9_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
-void vp9_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
-#define vp9_subtract_block vp9_subtract_block_sse2
-
-void vp9_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
-void vp9_temporal_filter_apply_sse2(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
-#define vp9_temporal_filter_apply vp9_temporal_filter_apply_sse2
-
-void vp9_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_tm_predictor_16x16 vp9_tm_predictor_16x16_sse2
-
-void vp9_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_tm_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_tm_predictor_32x32 vp9_tm_predictor_32x32_sse2
-
-void vp9_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_tm_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_tm_predictor_4x4 vp9_tm_predictor_4x4_sse
-
-void vp9_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_tm_predictor_8x8 vp9_tm_predictor_8x8_sse2
-
-void vp9_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_v_predictor_16x16 vp9_v_predictor_16x16_sse2
-
-void vp9_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_v_predictor_32x32 vp9_v_predictor_32x32_sse2
-
-void vp9_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_v_predictor_4x4 vp9_v_predictor_4x4_sse
-
-void vp9_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_v_predictor_8x8 vp9_v_predictor_8x8_sse
-
-unsigned int vp9_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance16x16 vp9_variance16x16_sse2
-
-unsigned int vp9_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance16x32 vp9_variance16x32_sse2
-
-unsigned int vp9_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance16x8 vp9_variance16x8_sse2
-
-unsigned int vp9_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance32x16 vp9_variance32x16_sse2
-
-unsigned int vp9_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance32x32 vp9_variance32x32_sse2
-
-unsigned int vp9_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance32x64 vp9_variance32x64_sse2
-
-unsigned int vp9_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance4x4 vp9_variance4x4_sse2
-
-unsigned int vp9_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance4x8 vp9_variance4x8_sse2
-
-unsigned int vp9_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance64x32 vp9_variance64x32_sse2
-
-unsigned int vp9_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance64x64 vp9_variance64x64_sse2
-
-unsigned int vp9_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance8x16 vp9_variance8x16_sse2
-
-unsigned int vp9_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance8x4 vp9_variance8x4_sse2
-
-unsigned int vp9_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-#define vp9_variance8x8 vp9_variance8x8_sse2
-
-void vp9_rtcd(void);
-
-#ifdef RTCD_C
-#include "vpx_ports/x86.h"
-static void setup_rtcd_internal(void)
-{
-    int flags = x86_simd_caps();
-
-    (void)flags;
-
-    vp9_convolve8 = vp9_convolve8_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8 = vp9_convolve8_ssse3;
-    vp9_convolve8_avg = vp9_convolve8_avg_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_avg = vp9_convolve8_avg_ssse3;
-    vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_ssse3;
-    vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_ssse3;
-    vp9_convolve8_horiz = vp9_convolve8_horiz_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_horiz = vp9_convolve8_horiz_ssse3;
-    vp9_convolve8_vert = vp9_convolve8_vert_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_vert = vp9_convolve8_vert_ssse3;
-    vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_ssse3;
-    vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_ssse3;
-    vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_ssse3;
-    vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_ssse3;
-    vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_ssse3;
-    vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_ssse3;
-    vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_ssse3;
-    vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_ssse3;
-    vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_ssse3;
-    vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_ssse3;
-    vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_ssse3;
-    vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_ssse3;
-    vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_ssse3;
-    vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_ssse3;
-    vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_ssse3;
-    vp9_fdct8x8 = vp9_fdct8x8_sse2;
-    if (flags & HAS_SSSE3) vp9_fdct8x8 = vp9_fdct8x8_ssse3;
-    vp9_full_search_sad = vp9_full_search_sad_c;
-    if (flags & HAS_SSE3) vp9_full_search_sad = vp9_full_search_sadx3;
-    if (flags & HAS_SSE4_1) vp9_full_search_sad = vp9_full_search_sadx8;
-    vp9_h_predictor_16x16 = vp9_h_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_16x16 = vp9_h_predictor_16x16_ssse3;
-    vp9_h_predictor_32x32 = vp9_h_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_32x32 = vp9_h_predictor_32x32_ssse3;
-    vp9_h_predictor_4x4 = vp9_h_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_4x4 = vp9_h_predictor_4x4_ssse3;
-    vp9_h_predictor_8x8 = vp9_h_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_8x8 = vp9_h_predictor_8x8_ssse3;
-    vp9_idct16x16_10_add = vp9_idct16x16_10_add_sse2;
-    if (flags & HAS_SSSE3) vp9_idct16x16_10_add = vp9_idct16x16_10_add_ssse3;
-    vp9_idct16x16_256_add = vp9_idct16x16_256_add_sse2;
-    if (flags & HAS_SSSE3) vp9_idct16x16_256_add = vp9_idct16x16_256_add_ssse3;
-    vp9_idct8x8_12_add = vp9_idct8x8_12_add_sse2;
-    if (flags & HAS_SSSE3) vp9_idct8x8_12_add = vp9_idct8x8_12_add_ssse3;
-    vp9_idct8x8_64_add = vp9_idct8x8_64_add_sse2;
-    if (flags & HAS_SSSE3) vp9_idct8x8_64_add = vp9_idct8x8_64_add_ssse3;
-    vp9_quantize_b = vp9_quantize_b_c;
-    if (flags & HAS_SSSE3) vp9_quantize_b = vp9_quantize_b_ssse3;
-    vp9_quantize_b_32x32 = vp9_quantize_b_32x32_c;
-    if (flags & HAS_SSSE3) vp9_quantize_b_32x32 = vp9_quantize_b_32x32_ssse3;
-    vp9_quantize_fp = vp9_quantize_fp_c;
-    if (flags & HAS_SSSE3) vp9_quantize_fp = vp9_quantize_fp_ssse3;
-    vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_c;
-    if (flags & HAS_SSSE3) vp9_quantize_fp_32x32 = vp9_quantize_fp_32x32_ssse3;
-    vp9_sad16x16x3 = vp9_sad16x16x3_c;
-    if (flags & HAS_SSE3) vp9_sad16x16x3 = vp9_sad16x16x3_sse3;
-    if (flags & HAS_SSSE3) vp9_sad16x16x3 = vp9_sad16x16x3_ssse3;
-    vp9_sad16x8x3 = vp9_sad16x8x3_c;
-    if (flags & HAS_SSE3) vp9_sad16x8x3 = vp9_sad16x8x3_sse3;
-    if (flags & HAS_SSSE3) vp9_sad16x8x3 = vp9_sad16x8x3_ssse3;
-    vp9_sad4x4x3 = vp9_sad4x4x3_c;
-    if (flags & HAS_SSE3) vp9_sad4x4x3 = vp9_sad4x4x3_sse3;
-    vp9_sad8x16x3 = vp9_sad8x16x3_c;
-    if (flags & HAS_SSE3) vp9_sad8x16x3 = vp9_sad8x16x3_sse3;
-    vp9_sad8x8x3 = vp9_sad8x8x3_c;
-    if (flags & HAS_SSE3) vp9_sad8x8x3 = vp9_sad8x8x3_sse3;
-    vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_ssse3;
-    vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_ssse3;
-    vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_ssse3;
-    vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_ssse3;
-    vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_ssse3;
-    vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_ssse3;
-    vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_ssse3;
-    vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_ssse3;
-    vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_ssse3;
-    vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_ssse3;
-    vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_ssse3;
-    vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_ssse3;
-    vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_ssse3;
-    vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_ssse3;
-    vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_ssse3;
-    vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_ssse3;
-    vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_ssse3;
-    vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_ssse3;
-    vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_ssse3;
-    vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_ssse3;
-    vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_ssse3;
-    vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_ssse3;
-    vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_ssse3;
-    vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_ssse3;
-    vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_ssse3;
-    vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_ssse3;
-}
-#endif
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs12.h	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,1309 @@
+#ifndef VP9_RTCD_H_
+#define VP9_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+/*
+ * VP9
+ */
+
+#include "vpx/vpx_integer.h"
+#include "vp9/common/vp9_enums.h"
+#include "vp9/common/vp9_idct.h"
+
+struct macroblockd;
+
+/* Encoder forward decls */
+struct macroblock;
+struct vp9_variance_vtable;
+struct search_site_config;
+struct mv;
+union int_mv;
+struct yv12_buffer_config;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+int64_t vp9_block_error_avx2(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
+
+void vp9_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_avg_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_avg_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_horiz_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve8_vert_avx2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve_avg)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+void vp9_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+RTCD_EXTERN void (*vp9_convolve_copy)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
+
+void vp9_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_16x16 vp9_d117_predictor_16x16_c
+
+void vp9_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_32x32 vp9_d117_predictor_32x32_c
+
+void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_4x4 vp9_d117_predictor_4x4_c
+
+void vp9_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d117_predictor_8x8 vp9_d117_predictor_8x8_c
+
+void vp9_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_16x16 vp9_d135_predictor_16x16_c
+
+void vp9_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c
+
+void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c
+
+void vp9_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c
+
+void vp9_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_d153_predictor_32x32 vp9_d153_predictor_32x32_c
+
+void vp9_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d45_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_16x16 vp9_dc_128_predictor_16x16_c
+
+void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c
+
+void vp9_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c
+
+void vp9_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_128_predictor_8x8 vp9_dc_128_predictor_8x8_c
+
+void vp9_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_16x16 vp9_dc_left_predictor_16x16_c
+
+void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c
+
+void vp9_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c
+
+void vp9_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_left_predictor_8x8 vp9_dc_left_predictor_8x8_c
+
+void vp9_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_dc_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_dc_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_dc_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_dc_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_dc_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_16x16 vp9_dc_top_predictor_16x16_c
+
+void vp9_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c
+
+void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c
+
+void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c
+
+int vp9_diamond_search_sad_c(const struct macroblock *x, const struct search_site_config *cfg,  struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
+#define vp9_diamond_search_sad vp9_diamond_search_sad_c
+
+void vp9_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct16x16)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct16x16_1)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_avx2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct32x32)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct32x32_1)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct32x32_rd_avx2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct32x32_rd)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct4x4)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct4x4_1)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct8x8)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fdct8x8_1)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+RTCD_EXTERN void (*vp9_fht16x16)(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+
+void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+RTCD_EXTERN void (*vp9_fht4x4)(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+
+void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+RTCD_EXTERN void (*vp9_fht8x8)(const int16_t *input, tran_low_t *output, int stride, int tx_type);
+
+int vp9_full_range_search_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
+#define vp9_full_range_search vp9_full_range_search_c
+
+int vp9_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+int vp9_full_search_sadx3(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+int vp9_full_search_sadx8(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+RTCD_EXTERN int (*vp9_full_search_sad)(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
+
+void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
+void vp9_fwht4x4_mmx(const int16_t *input, tran_low_t *output, int stride);
+RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t *input, tran_low_t *output, int stride);
+
+void vp9_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+void vp9_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+void vp9_get16x16var_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+RTCD_EXTERN void (*vp9_get16x16var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+
+void vp9_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+void vp9_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+RTCD_EXTERN void (*vp9_get8x8var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+
+unsigned int vp9_get_mb_ss_c(const int16_t *);
+unsigned int vp9_get_mb_ss_sse2(const int16_t *);
+RTCD_EXTERN unsigned int (*vp9_get_mb_ss)(const int16_t *);
+
+void vp9_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_h_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_10_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct16x16_256_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct16x16_256_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct32x32_1024_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vp9_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
+RTCD_EXTERN void (*vp9_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+
+void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
+void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
+RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
+
+void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+
+void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+
+void vp9_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_iwht4x4_16_add vp9_iwht4x4_16_add_c
+
+void vp9_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+#define vp9_iwht4x4_1_add vp9_iwht4x4_1_add_c
+
+void vp9_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_16_avx2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+RTCD_EXTERN void (*vp9_lpf_horizontal_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+
+void vp9_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+RTCD_EXTERN void (*vp9_lpf_horizontal_4)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+
+void vp9_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_horizontal_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+RTCD_EXTERN void (*vp9_lpf_horizontal_4_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+
+void vp9_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+RTCD_EXTERN void (*vp9_lpf_horizontal_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+
+void vp9_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_horizontal_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+RTCD_EXTERN void (*vp9_lpf_horizontal_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+
+void vp9_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+void vp9_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+RTCD_EXTERN void (*vp9_lpf_vertical_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+
+void vp9_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+void vp9_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+RTCD_EXTERN void (*vp9_lpf_vertical_16_dual)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+
+void vp9_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_vertical_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+RTCD_EXTERN void (*vp9_lpf_vertical_4)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+
+void vp9_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+RTCD_EXTERN void (*vp9_lpf_vertical_4_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+
+void vp9_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+void vp9_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+RTCD_EXTERN void (*vp9_lpf_vertical_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
+
+void vp9_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+void vp9_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+RTCD_EXTERN void (*vp9_lpf_vertical_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
+
+unsigned int vp9_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse16x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse16x16_avx2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse16x16)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+
+unsigned int vp9_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse16x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse16x8)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+
+unsigned int vp9_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse8x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse8x16)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+
+unsigned int vp9_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+unsigned int vp9_mse8x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_mse8x8)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
+
+void vp9_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define vp9_quantize_b vp9_quantize_b_c
+
+void vp9_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define vp9_quantize_b_32x32 vp9_quantize_b_32x32_c
+
+void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define vp9_quantize_fp vp9_quantize_fp_c
+
+void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
+#define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c
+
+int vp9_refining_search_sad_c(const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
+#define vp9_refining_search_sad vp9_refining_search_sad_c
+
+unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+
+unsigned int vp9_sad16x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad16x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad16x16_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+
+void vp9_sad16x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x16x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad16x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad16x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad16x16x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad16x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad16x16x8 vp9_sad16x16x8_c
+
+unsigned int vp9_sad16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad16x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+
+unsigned int vp9_sad16x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad16x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad16x32_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+
+void vp9_sad16x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad16x32x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+
+unsigned int vp9_sad16x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad16x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad16x8_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+
+void vp9_sad16x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x8x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad16x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad16x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad16x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad16x8x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad16x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad16x8x8 vp9_sad16x8x8_c
+
+unsigned int vp9_sad32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad32x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+
+unsigned int vp9_sad32x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad32x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad32x16_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+
+void vp9_sad32x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad32x16x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad32x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+
+unsigned int vp9_sad32x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad32x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad32x32_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+
+void vp9_sad32x32x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+#define vp9_sad32x32x3 vp9_sad32x32x3_c
+
+void vp9_sad32x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x32x4d_avx2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad32x32x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad32x32x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad32x32x8 vp9_sad32x32x8_c
+
+unsigned int vp9_sad32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad32x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+
+unsigned int vp9_sad32x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad32x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad32x64_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+
+void vp9_sad32x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad32x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad32x64x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad4x4_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad4x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+
+unsigned int vp9_sad4x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad4x4_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad4x4_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+
+void vp9_sad4x4x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad4x4x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad4x4x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad4x4x4d_sse(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad4x4x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad4x4x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad4x4x8 vp9_sad4x4x8_c
+
+unsigned int vp9_sad4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad4x8_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad4x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+
+unsigned int vp9_sad4x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad4x8_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad4x8_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+
+void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+void vp9_sad4x8x4d_sse(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+
+void vp9_sad4x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
+#define vp9_sad4x8x8 vp9_sad4x8x8_c
+
+unsigned int vp9_sad64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad64x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+
+unsigned int vp9_sad64x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad64x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad64x32_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+
+void vp9_sad64x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad64x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad64x32x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad64x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+
+unsigned int vp9_sad64x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad64x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad64x64_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+
+void vp9_sad64x64x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+#define vp9_sad64x64x3 vp9_sad64x64x3_c
+
+void vp9_sad64x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad64x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad64x64x4d_avx2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad64x64x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad64x64x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad64x64x8 vp9_sad64x64x8_c
+
+unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+
+unsigned int vp9_sad8x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad8x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad8x16_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+
+void vp9_sad8x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad8x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad8x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad8x16x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad8x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad8x16x8 vp9_sad8x16x8_c
+
+unsigned int vp9_sad8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+unsigned int vp9_sad8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad8x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
+
+unsigned int vp9_sad8x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad8x4_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad8x4_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+
+void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+void vp9_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
+
+void vp9_sad8x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
+#define vp9_sad8x4x8 vp9_sad8x4x8_c
+
+unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+unsigned int vp9_sad8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+RTCD_EXTERN unsigned int (*vp9_sad8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
+
+unsigned int vp9_sad8x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+unsigned int vp9_sad8x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sad8x8_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
+
+void vp9_sad8x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad8x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad8x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+void vp9_sad8x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+RTCD_EXTERN void (*vp9_sad8x8x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
+
+void vp9_sad8x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
+#define vp9_sad8x8x8 vp9_sad8x8x8_c
+
+unsigned int vp9_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+unsigned int vp9_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
+
+unsigned int vp9_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+void vp9_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
+void vp9_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
+RTCD_EXTERN void (*vp9_subtract_block)(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
+
+void vp9_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
+void vp9_temporal_filter_apply_sse2(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
+RTCD_EXTERN void (*vp9_temporal_filter_apply)(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
+
+void vp9_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_tm_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+#define vp9_tm_predictor_32x32 vp9_tm_predictor_32x32_c
+
+void vp9_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_tm_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_tm_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_tm_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_v_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_v_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_v_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+void vp9_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+void vp9_v_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vp9_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+
+unsigned int vp9_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x16_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance16x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x16_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance32x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x32_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance32x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance32x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance4x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance4x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x32_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance64x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance64x64_avx2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance64x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance8x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+unsigned int vp9_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+unsigned int vp9_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+RTCD_EXTERN unsigned int (*vp9_variance8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+
+void vp9_rtcd(void);
+
+#ifdef RTCD_C
+#include "vpx_ports/x86.h"
+static void setup_rtcd_internal(void)
+{
+    int flags = x86_simd_caps();
+
+    (void)flags;
+
+    vp9_block_error = vp9_block_error_c;
+    if (flags & HAS_SSE2) vp9_block_error = vp9_block_error_sse2;
+    if (flags & HAS_AVX2) vp9_block_error = vp9_block_error_avx2;
+    vp9_convolve8 = vp9_convolve8_c;
+    if (flags & HAS_SSE2) vp9_convolve8 = vp9_convolve8_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8 = vp9_convolve8_ssse3;
+    if (flags & HAS_AVX2) vp9_convolve8 = vp9_convolve8_avx2;
+    vp9_convolve8_avg = vp9_convolve8_avg_c;
+    if (flags & HAS_SSE2) vp9_convolve8_avg = vp9_convolve8_avg_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_avg = vp9_convolve8_avg_ssse3;
+    vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_c;
+    if (flags & HAS_SSE2) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_ssse3;
+    vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_c;
+    if (flags & HAS_SSE2) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_ssse3;
+    vp9_convolve8_horiz = vp9_convolve8_horiz_c;
+    if (flags & HAS_SSE2) vp9_convolve8_horiz = vp9_convolve8_horiz_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_horiz = vp9_convolve8_horiz_ssse3;
+    if (flags & HAS_AVX2) vp9_convolve8_horiz = vp9_convolve8_horiz_avx2;
+    vp9_convolve8_vert = vp9_convolve8_vert_c;
+    if (flags & HAS_SSE2) vp9_convolve8_vert = vp9_convolve8_vert_sse2;
+    if (flags & HAS_SSSE3) vp9_convolve8_vert = vp9_convolve8_vert_ssse3;
+    if (flags & HAS_AVX2) vp9_convolve8_vert = vp9_convolve8_vert_avx2;
+    vp9_convolve_avg = vp9_convolve_avg_c;
+    if (flags & HAS_SSE2) vp9_convolve_avg = vp9_convolve_avg_sse2;
+    vp9_convolve_copy = vp9_convolve_copy_c;
+    if (flags & HAS_SSE2) vp9_convolve_copy = vp9_convolve_copy_sse2;
+    vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_ssse3;
+    vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_ssse3;
+    vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_ssse3;
+    vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_ssse3;
+    vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_ssse3;
+    vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_ssse3;
+    vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_ssse3;
+    vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_ssse3;
+    vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_ssse3;
+    vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_ssse3;
+    vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_ssse3;
+    vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_ssse3;
+    vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_ssse3;
+    vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_ssse3;
+    vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_ssse3;
+    vp9_dc_predictor_16x16 = vp9_dc_predictor_16x16_c;
+    if (flags & HAS_SSE2) vp9_dc_predictor_16x16 = vp9_dc_predictor_16x16_sse2;
+    vp9_dc_predictor_32x32 = vp9_dc_predictor_32x32_c;
+    if (flags & HAS_SSE2) vp9_dc_predictor_32x32 = vp9_dc_predictor_32x32_sse2;
+    vp9_dc_predictor_4x4 = vp9_dc_predictor_4x4_c;
+    if (flags & HAS_SSE) vp9_dc_predictor_4x4 = vp9_dc_predictor_4x4_sse;
+    vp9_dc_predictor_8x8 = vp9_dc_predictor_8x8_c;
+    if (flags & HAS_SSE) vp9_dc_predictor_8x8 = vp9_dc_predictor_8x8_sse;
+    vp9_fdct16x16 = vp9_fdct16x16_c;
+    if (flags & HAS_SSE2) vp9_fdct16x16 = vp9_fdct16x16_sse2;
+    vp9_fdct16x16_1 = vp9_fdct16x16_1_c;
+    if (flags & HAS_SSE2) vp9_fdct16x16_1 = vp9_fdct16x16_1_sse2;
+    vp9_fdct32x32 = vp9_fdct32x32_c;
+    if (flags & HAS_SSE2) vp9_fdct32x32 = vp9_fdct32x32_sse2;
+    if (flags & HAS_AVX2) vp9_fdct32x32 = vp9_fdct32x32_avx2;
+    vp9_fdct32x32_1 = vp9_fdct32x32_1_c;
+    if (flags & HAS_SSE2) vp9_fdct32x32_1 = vp9_fdct32x32_1_sse2;
+    vp9_fdct32x32_rd = vp9_fdct32x32_rd_c;
+    if (flags & HAS_SSE2) vp9_fdct32x32_rd = vp9_fdct32x32_rd_sse2;
+    if (flags & HAS_AVX2) vp9_fdct32x32_rd = vp9_fdct32x32_rd_avx2;
+    vp9_fdct4x4 = vp9_fdct4x4_c;
+    if (flags & HAS_SSE2) vp9_fdct4x4 = vp9_fdct4x4_sse2;
+    vp9_fdct4x4_1 = vp9_fdct4x4_1_c;
+    if (flags & HAS_SSE2) vp9_fdct4x4_1 = vp9_fdct4x4_1_sse2;
+    vp9_fdct8x8 = vp9_fdct8x8_c;
+    if (flags & HAS_SSE2) vp9_fdct8x8 = vp9_fdct8x8_sse2;
+    vp9_fdct8x8_1 = vp9_fdct8x8_1_c;
+    if (flags & HAS_SSE2) vp9_fdct8x8_1 = vp9_fdct8x8_1_sse2;
+    vp9_fht16x16 = vp9_fht16x16_c;
+    if (flags & HAS_SSE2) vp9_fht16x16 = vp9_fht16x16_sse2;
+    vp9_fht4x4 = vp9_fht4x4_c;
+    if (flags & HAS_SSE2) vp9_fht4x4 = vp9_fht4x4_sse2;
+    vp9_fht8x8 = vp9_fht8x8_c;
+    if (flags & HAS_SSE2) vp9_fht8x8 = vp9_fht8x8_sse2;
+    vp9_full_search_sad = vp9_full_search_sad_c;
+    if (flags & HAS_SSE3) vp9_full_search_sad = vp9_full_search_sadx3;
+    if (flags & HAS_SSE4_1) vp9_full_search_sad = vp9_full_search_sadx8;
+    vp9_fwht4x4 = vp9_fwht4x4_c;
+    if (flags & HAS_MMX) vp9_fwht4x4 = vp9_fwht4x4_mmx;
+    vp9_get16x16var = vp9_get16x16var_c;
+    if (flags & HAS_SSE2) vp9_get16x16var = vp9_get16x16var_sse2;
+    if (flags & HAS_AVX2) vp9_get16x16var = vp9_get16x16var_avx2;
+    vp9_get8x8var = vp9_get8x8var_c;
+    if (flags & HAS_SSE2) vp9_get8x8var = vp9_get8x8var_sse2;
+    vp9_get_mb_ss = vp9_get_mb_ss_c;
+    if (flags & HAS_SSE2) vp9_get_mb_ss = vp9_get_mb_ss_sse2;
+    vp9_h_predictor_16x16 = vp9_h_predictor_16x16_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_16x16 = vp9_h_predictor_16x16_ssse3;
+    vp9_h_predictor_32x32 = vp9_h_predictor_32x32_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_32x32 = vp9_h_predictor_32x32_ssse3;
+    vp9_h_predictor_4x4 = vp9_h_predictor_4x4_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_4x4 = vp9_h_predictor_4x4_ssse3;
+    vp9_h_predictor_8x8 = vp9_h_predictor_8x8_c;
+    if (flags & HAS_SSSE3) vp9_h_predictor_8x8 = vp9_h_predictor_8x8_ssse3;
+    vp9_idct16x16_10_add = vp9_idct16x16_10_add_c;
+    if (flags & HAS_SSE2) vp9_idct16x16_10_add = vp9_idct16x16_10_add_sse2;
+    if (flags & HAS_SSSE3) vp9_idct16x16_10_add = vp9_idct16x16_10_add_ssse3;
+    vp9_idct16x16_1_add = vp9_idct16x16_1_add_c;
+    if (flags & HAS_SSE2) vp9_idct16x16_1_add = vp9_idct16x16_1_add_sse2;
+    vp9_idct16x16_256_add = vp9_idct16x16_256_add_c;
+    if (flags & HAS_SSE2) vp9_idct16x16_256_add = vp9_idct16x16_256_add_sse2;
+    if (flags & HAS_SSSE3) vp9_idct16x16_256_add = vp9_idct16x16_256_add_ssse3;
+    vp9_idct32x32_1024_add = vp9_idct32x32_1024_add_c;
+    if (flags & HAS_SSE2) vp9_idct32x32_1024_add = vp9_idct32x32_1024_add_sse2;
+    vp9_idct32x32_1_add = vp9_idct32x32_1_add_c;
+    if (flags & HAS_SSE2) vp9_idct32x32_1_add = vp9_idct32x32_1_add_sse2;
+    vp9_idct32x32_34_add = vp9_idct32x32_34_add_c;
+    if (flags & HAS_SSE2) vp9_idct32x32_34_add = vp9_idct32x32_34_add_sse2;
+    vp9_idct4x4_16_add = vp9_idct4x4_16_add_c;
+    if (flags & HAS_SSE2) vp9_idct4x4_16_add = vp9_idct4x4_16_add_sse2;
+    vp9_idct4x4_1_add = vp9_idct4x4_1_add_c;
+    if (flags & HAS_SSE2) vp9_idct4x4_1_add = vp9_idct4x4_1_add_sse2;
+    vp9_idct8x8_12_add = vp9_idct8x8_12_add_c;
+    if (flags & HAS_SSE2) vp9_idct8x8_12_add = vp9_idct8x8_12_add_sse2;
+    vp9_idct8x8_1_add = vp9_idct8x8_1_add_c;
+    if (flags & HAS_SSE2) vp9_idct8x8_1_add = vp9_idct8x8_1_add_sse2;
+    vp9_idct8x8_64_add = vp9_idct8x8_64_add_c;
+    if (flags & HAS_SSE2) vp9_idct8x8_64_add = vp9_idct8x8_64_add_sse2;
+    vp9_iht16x16_256_add = vp9_iht16x16_256_add_c;
+    if (flags & HAS_SSE2) vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2;
+    vp9_iht4x4_16_add = vp9_iht4x4_16_add_c;
+    if (flags & HAS_SSE2) vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2;
+    vp9_iht8x8_64_add = vp9_iht8x8_64_add_c;
+    if (flags & HAS_SSE2) vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2;
+    vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_c;
+    if (flags & HAS_SSE2) vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_sse2;
+    if (flags & HAS_AVX2) vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_avx2;
+    vp9_lpf_horizontal_4 = vp9_lpf_horizontal_4_c;
+    if (flags & HAS_MMX) vp9_lpf_horizontal_4 = vp9_lpf_horizontal_4_mmx;
+    vp9_lpf_horizontal_4_dual = vp9_lpf_horizontal_4_dual_c;
+    if (flags & HAS_SSE2) vp9_lpf_horizontal_4_dual = vp9_lpf_horizontal_4_dual_sse2;
+    vp9_lpf_horizontal_8 = vp9_lpf_horizontal_8_c;
+    if (flags & HAS_SSE2) vp9_lpf_horizontal_8 = vp9_lpf_horizontal_8_sse2;
+    vp9_lpf_horizontal_8_dual = vp9_lpf_horizontal_8_dual_c;
+    if (flags & HAS_SSE2) vp9_lpf_horizontal_8_dual = vp9_lpf_horizontal_8_dual_sse2;
+    vp9_lpf_vertical_16 = vp9_lpf_vertical_16_c;
+    if (flags & HAS_SSE2) vp9_lpf_vertical_16 = vp9_lpf_vertical_16_sse2;
+    vp9_lpf_vertical_16_dual = vp9_lpf_vertical_16_dual_c;
+    if (flags & HAS_SSE2) vp9_lpf_vertical_16_dual = vp9_lpf_vertical_16_dual_sse2;
+    vp9_lpf_vertical_4 = vp9_lpf_vertical_4_c;
+    if (flags & HAS_MMX) vp9_lpf_vertical_4 = vp9_lpf_vertical_4_mmx;
+    vp9_lpf_vertical_4_dual = vp9_lpf_vertical_4_dual_c;
+    if (flags & HAS_SSE2) vp9_lpf_vertical_4_dual = vp9_lpf_vertical_4_dual_sse2;
+    vp9_lpf_vertical_8 = vp9_lpf_vertical_8_c;
+    if (flags & HAS_SSE2) vp9_lpf_vertical_8 = vp9_lpf_vertical_8_sse2;
+    vp9_lpf_vertical_8_dual = vp9_lpf_vertical_8_dual_c;
+    if (flags & HAS_SSE2) vp9_lpf_vertical_8_dual = vp9_lpf_vertical_8_dual_sse2;
+    vp9_mse16x16 = vp9_mse16x16_c;
+    if (flags & HAS_SSE2) vp9_mse16x16 = vp9_mse16x16_sse2;
+    if (flags & HAS_AVX2) vp9_mse16x16 = vp9_mse16x16_avx2;
+    vp9_mse16x8 = vp9_mse16x8_c;
+    if (flags & HAS_SSE2) vp9_mse16x8 = vp9_mse16x8_sse2;
+    vp9_mse8x16 = vp9_mse8x16_c;
+    if (flags & HAS_SSE2) vp9_mse8x16 = vp9_mse8x16_sse2;
+    vp9_mse8x8 = vp9_mse8x8_c;
+    if (flags & HAS_SSE2) vp9_mse8x8 = vp9_mse8x8_sse2;
+    vp9_sad16x16 = vp9_sad16x16_c;
+    if (flags & HAS_SSE2) vp9_sad16x16 = vp9_sad16x16_sse2;
+    vp9_sad16x16_avg = vp9_sad16x16_avg_c;
+    if (flags & HAS_SSE2) vp9_sad16x16_avg = vp9_sad16x16_avg_sse2;
+    vp9_sad16x16x3 = vp9_sad16x16x3_c;
+    if (flags & HAS_SSE3) vp9_sad16x16x3 = vp9_sad16x16x3_sse3;
+    if (flags & HAS_SSSE3) vp9_sad16x16x3 = vp9_sad16x16x3_ssse3;
+    vp9_sad16x16x4d = vp9_sad16x16x4d_c;
+    if (flags & HAS_SSE2) vp9_sad16x16x4d = vp9_sad16x16x4d_sse2;
+    vp9_sad16x32 = vp9_sad16x32_c;
+    if (flags & HAS_SSE2) vp9_sad16x32 = vp9_sad16x32_sse2;
+    vp9_sad16x32_avg = vp9_sad16x32_avg_c;
+    if (flags & HAS_SSE2) vp9_sad16x32_avg = vp9_sad16x32_avg_sse2;
+    vp9_sad16x32x4d = vp9_sad16x32x4d_c;
+    if (flags & HAS_SSE2) vp9_sad16x32x4d = vp9_sad16x32x4d_sse2;
+    vp9_sad16x8 = vp9_sad16x8_c;
+    if (flags & HAS_SSE2) vp9_sad16x8 = vp9_sad16x8_sse2;
+    vp9_sad16x8_avg = vp9_sad16x8_avg_c;
+    if (flags & HAS_SSE2) vp9_sad16x8_avg = vp9_sad16x8_avg_sse2;
+    vp9_sad16x8x3 = vp9_sad16x8x3_c;
+    if (flags & HAS_SSE3) vp9_sad16x8x3 = vp9_sad16x8x3_sse3;
+    if (flags & HAS_SSSE3) vp9_sad16x8x3 = vp9_sad16x8x3_ssse3;
+    vp9_sad16x8x4d = vp9_sad16x8x4d_c;
+    if (flags & HAS_SSE2) vp9_sad16x8x4d = vp9_sad16x8x4d_sse2;
+    vp9_sad32x16 = vp9_sad32x16_c;
+    if (flags & HAS_SSE2) vp9_sad32x16 = vp9_sad32x16_sse2;
+    vp9_sad32x16_avg = vp9_sad32x16_avg_c;
+    if (flags & HAS_SSE2) vp9_sad32x16_avg = vp9_sad32x16_avg_sse2;
+    vp9_sad32x16x4d = vp9_sad32x16x4d_c;
+    if (flags & HAS_SSE2) vp9_sad32x16x4d = vp9_sad32x16x4d_sse2;
+    vp9_sad32x32 = vp9_sad32x32_c;
+    if (flags & HAS_SSE2) vp9_sad32x32 = vp9_sad32x32_sse2;
+    vp9_sad32x32_avg = vp9_sad32x32_avg_c;
+    if (flags & HAS_SSE2) vp9_sad32x32_avg = vp9_sad32x32_avg_sse2;
+    vp9_sad32x32x4d = vp9_sad32x32x4d_c;
+    if (flags & HAS_SSE2) vp9_sad32x32x4d = vp9_sad32x32x4d_sse2;
+    if (flags & HAS_AVX2) vp9_sad32x32x4d = vp9_sad32x32x4d_avx2;
+    vp9_sad32x64 = vp9_sad32x64_c;
+    if (flags & HAS_SSE2) vp9_sad32x64 = vp9_sad32x64_sse2;
+    vp9_sad32x64_avg = vp9_sad32x64_avg_c;
+    if (flags & HAS_SSE2) vp9_sad32x64_avg = vp9_sad32x64_avg_sse2;
+    vp9_sad32x64x4d = vp9_sad32x64x4d_c;
+    if (flags & HAS_SSE2) vp9_sad32x64x4d = vp9_sad32x64x4d_sse2;
+    vp9_sad4x4 = vp9_sad4x4_c;
+    if (flags & HAS_SSE) vp9_sad4x4 = vp9_sad4x4_sse;
+    vp9_sad4x4_avg = vp9_sad4x4_avg_c;
+    if (flags & HAS_SSE) vp9_sad4x4_avg = vp9_sad4x4_avg_sse;
+    vp9_sad4x4x3 = vp9_sad4x4x3_c;
+    if (flags & HAS_SSE3) vp9_sad4x4x3 = vp9_sad4x4x3_sse3;
+    vp9_sad4x4x4d = vp9_sad4x4x4d_c;
+    if (flags & HAS_SSE) vp9_sad4x4x4d = vp9_sad4x4x4d_sse;
+    vp9_sad4x8 = vp9_sad4x8_c;
+    if (flags & HAS_SSE) vp9_sad4x8 = vp9_sad4x8_sse;
+    vp9_sad4x8_avg = vp9_sad4x8_avg_c;
+    if (flags & HAS_SSE) vp9_sad4x8_avg = vp9_sad4x8_avg_sse;
+    vp9_sad4x8x4d = vp9_sad4x8x4d_c;
+    if (flags & HAS_SSE) vp9_sad4x8x4d = vp9_sad4x8x4d_sse;
+    vp9_sad64x32 = vp9_sad64x32_c;
+    if (flags & HAS_SSE2) vp9_sad64x32 = vp9_sad64x32_sse2;
+    vp9_sad64x32_avg = vp9_sad64x32_avg_c;
+    if (flags & HAS_SSE2) vp9_sad64x32_avg = vp9_sad64x32_avg_sse2;
+    vp9_sad64x32x4d = vp9_sad64x32x4d_c;
+    if (flags & HAS_SSE2) vp9_sad64x32x4d = vp9_sad64x32x4d_sse2;
+    vp9_sad64x64 = vp9_sad64x64_c;
+    if (flags & HAS_SSE2) vp9_sad64x64 = vp9_sad64x64_sse2;
+    vp9_sad64x64_avg = vp9_sad64x64_avg_c;
+    if (flags & HAS_SSE2) vp9_sad64x64_avg = vp9_sad64x64_avg_sse2;
+    vp9_sad64x64x4d = vp9_sad64x64x4d_c;
+    if (flags & HAS_SSE2) vp9_sad64x64x4d = vp9_sad64x64x4d_sse2;
+    if (flags & HAS_AVX2) vp9_sad64x64x4d = vp9_sad64x64x4d_avx2;
+    vp9_sad8x16 = vp9_sad8x16_c;
+    if (flags & HAS_SSE2) vp9_sad8x16 = vp9_sad8x16_sse2;
+    vp9_sad8x16_avg = vp9_sad8x16_avg_c;
+    if (flags & HAS_SSE2) vp9_sad8x16_avg = vp9_sad8x16_avg_sse2;
+    vp9_sad8x16x3 = vp9_sad8x16x3_c;
+    if (flags & HAS_SSE3) vp9_sad8x16x3 = vp9_sad8x16x3_sse3;
+    vp9_sad8x16x4d = vp9_sad8x16x4d_c;
+    if (flags & HAS_SSE2) vp9_sad8x16x4d = vp9_sad8x16x4d_sse2;
+    vp9_sad8x4 = vp9_sad8x4_c;
+    if (flags & HAS_SSE2) vp9_sad8x4 = vp9_sad8x4_sse2;
+    vp9_sad8x4_avg = vp9_sad8x4_avg_c;
+    if (flags & HAS_SSE2) vp9_sad8x4_avg = vp9_sad8x4_avg_sse2;
+    vp9_sad8x4x4d = vp9_sad8x4x4d_c;
+    if (flags & HAS_SSE2) vp9_sad8x4x4d = vp9_sad8x4x4d_sse2;
+    vp9_sad8x8 = vp9_sad8x8_c;
+    if (flags & HAS_SSE2) vp9_sad8x8 = vp9_sad8x8_sse2;
+    vp9_sad8x8_avg = vp9_sad8x8_avg_c;
+    if (flags & HAS_SSE2) vp9_sad8x8_avg = vp9_sad8x8_avg_sse2;
+    vp9_sad8x8x3 = vp9_sad8x8x3_c;
+    if (flags & HAS_SSE3) vp9_sad8x8x3 = vp9_sad8x8x3_sse3;
+    vp9_sad8x8x4d = vp9_sad8x8x4d_c;
+    if (flags & HAS_SSE2) vp9_sad8x8x4d = vp9_sad8x8x4d_sse2;
+    vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_ssse3;
+    vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_ssse3;
+    vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_ssse3;
+    vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_ssse3;
+    vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_avx2;
+    vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_ssse3;
+    vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_c;
+    if (flags & HAS_SSE) vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_ssse3;
+    vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_c;
+    if (flags & HAS_SSE) vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_ssse3;
+    vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_ssse3;
+    vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_avx2;
+    vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_ssse3;
+    vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_ssse3;
+    vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_ssse3;
+    vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_ssse3;
+    vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_ssse3;
+    vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_ssse3;
+    vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_ssse3;
+    vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_avx2;
+    vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_ssse3;
+    vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_c;
+    if (flags & HAS_SSE) vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_ssse3;
+    vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_c;
+    if (flags & HAS_SSE) vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_sse;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_ssse3;
+    vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_ssse3;
+    vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_ssse3;
+    if (flags & HAS_AVX2) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_avx2;
+    vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_ssse3;
+    vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_ssse3;
+    vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_c;
+    if (flags & HAS_SSE2) vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_sse2;
+    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_ssse3;
+    vp9_subtract_block = vp9_subtract_block_c;
+    if (flags & HAS_SSE2) vp9_subtract_block = vp9_subtract_block_sse2;
+    vp9_temporal_filter_apply = vp9_temporal_filter_apply_c;
+    if (flags & HAS_SSE2) vp9_temporal_filter_apply = vp9_temporal_filter_apply_sse2;
+    vp9_tm_predictor_16x16 = vp9_tm_predictor_16x16_c;
+    if (flags & HAS_SSE2) vp9_tm_predictor_16x16 = vp9_tm_predictor_16x16_sse2;
+    vp9_tm_predictor_4x4 = vp9_tm_predictor_4x4_c;
+    if (flags & HAS_SSE) vp9_tm_predictor_4x4 = vp9_tm_predictor_4x4_sse;
+    vp9_tm_predictor_8x8 = vp9_tm_predictor_8x8_c;
+    if (flags & HAS_SSE2) vp9_tm_predictor_8x8 = vp9_tm_predictor_8x8_sse2;
+    vp9_v_predictor_16x16 = vp9_v_predictor_16x16_c;
+    if (flags & HAS_SSE2) vp9_v_predictor_16x16 = vp9_v_predictor_16x16_sse2;
+    vp9_v_predictor_32x32 = vp9_v_predictor_32x32_c;
+    if (flags & HAS_SSE2) vp9_v_predictor_32x32 = vp9_v_predictor_32x32_sse2;
+    vp9_v_predictor_4x4 = vp9_v_predictor_4x4_c;
+    if (flags & HAS_SSE) vp9_v_predictor_4x4 = vp9_v_predictor_4x4_sse;
+    vp9_v_predictor_8x8 = vp9_v_predictor_8x8_c;
+    if (flags & HAS_SSE) vp9_v_predictor_8x8 = vp9_v_predictor_8x8_sse;
+    vp9_variance16x16 = vp9_variance16x16_c;
+    if (flags & HAS_SSE2) vp9_variance16x16 = vp9_variance16x16_sse2;
+    if (flags & HAS_AVX2) vp9_variance16x16 = vp9_variance16x16_avx2;
+    vp9_variance16x32 = vp9_variance16x32_c;
+    if (flags & HAS_SSE2) vp9_variance16x32 = vp9_variance16x32_sse2;
+    vp9_variance16x8 = vp9_variance16x8_c;
+    if (flags & HAS_SSE2) vp9_variance16x8 = vp9_variance16x8_sse2;
+    vp9_variance32x16 = vp9_variance32x16_c;
+    if (flags & HAS_SSE2) vp9_variance32x16 = vp9_variance32x16_sse2;
+    if (flags & HAS_AVX2) vp9_variance32x16 = vp9_variance32x16_avx2;
+    vp9_variance32x32 = vp9_variance32x32_c;
+    if (flags & HAS_SSE2) vp9_variance32x32 = vp9_variance32x32_sse2;
+    if (flags & HAS_AVX2) vp9_variance32x32 = vp9_variance32x32_avx2;
+    vp9_variance32x64 = vp9_variance32x64_c;
+    if (flags & HAS_SSE2) vp9_variance32x64 = vp9_variance32x64_sse2;
+    vp9_variance4x4 = vp9_variance4x4_c;
+    if (flags & HAS_SSE2) vp9_variance4x4 = vp9_variance4x4_sse2;
+    vp9_variance4x8 = vp9_variance4x8_c;
+    if (flags & HAS_SSE2) vp9_variance4x8 = vp9_variance4x8_sse2;
+    vp9_variance64x32 = vp9_variance64x32_c;
+    if (flags & HAS_SSE2) vp9_variance64x32 = vp9_variance64x32_sse2;
+    if (flags & HAS_AVX2) vp9_variance64x32 = vp9_variance64x32_avx2;
+    vp9_variance64x64 = vp9_variance64x64_c;
+    if (flags & HAS_SSE2) vp9_variance64x64 = vp9_variance64x64_sse2;
+    if (flags & HAS_AVX2) vp9_variance64x64 = vp9_variance64x64_avx2;
+    vp9_variance8x16 = vp9_variance8x16_c;
+    if (flags & HAS_SSE2) vp9_variance8x16 = vp9_variance8x16_sse2;
+    vp9_variance8x4 = vp9_variance8x4_c;
+    if (flags & HAS_SSE2) vp9_variance8x4 = vp9_variance8x4_sse2;
+    vp9_variance8x8 = vp9_variance8x8_c;
+    if (flags & HAS_SSE2) vp9_variance8x8 = vp9_variance8x8_sse2;
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vp9_rtcd_x86-win32-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1269 +0,0 @@
-#ifndef VP9_RTCD_H_
-#define VP9_RTCD_H_
-
-#ifdef RTCD_C
-#define RTCD_EXTERN
-#else
-#define RTCD_EXTERN extern
-#endif
-
-/*
- * VP9
- */
-
-#include "vpx/vpx_integer.h"
-#include "vp9/common/vp9_enums.h"
-#include "vp9/common/vp9_idct.h"
-
-struct macroblockd;
-
-/* Encoder forward decls */
-struct macroblock;
-struct vp9_variance_vtable;
-struct search_site_config;
-struct mv;
-union int_mv;
-struct yv12_buffer_config;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
-int64_t vp9_block_error_sse2(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
-RTCD_EXTERN int64_t (*vp9_block_error)(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
-
-void vp9_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_avg_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_avg_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_avg_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_horiz_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_horiz_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_horiz)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_vert_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve8_vert_ssse3(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve8_vert)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve_avg_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve_avg)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-void vp9_convolve_copy_sse2(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-RTCD_EXTERN void (*vp9_convolve_copy)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h);
-
-void vp9_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_16x16 vp9_d117_predictor_16x16_c
-
-void vp9_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_32x32 vp9_d117_predictor_32x32_c
-
-void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_4x4 vp9_d117_predictor_4x4_c
-
-void vp9_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d117_predictor_8x8 vp9_d117_predictor_8x8_c
-
-void vp9_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_16x16 vp9_d135_predictor_16x16_c
-
-void vp9_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_32x32 vp9_d135_predictor_32x32_c
-
-void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_4x4 vp9_d135_predictor_4x4_c
-
-void vp9_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d135_predictor_8x8 vp9_d135_predictor_8x8_c
-
-void vp9_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d153_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d153_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_d153_predictor_32x32 vp9_d153_predictor_32x32_c
-
-void vp9_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d153_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d153_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d153_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d153_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d207_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d207_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d45_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_d63_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_d63_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_16x16 vp9_dc_128_predictor_16x16_c
-
-void vp9_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_32x32 vp9_dc_128_predictor_32x32_c
-
-void vp9_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_4x4 vp9_dc_128_predictor_4x4_c
-
-void vp9_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_128_predictor_8x8 vp9_dc_128_predictor_8x8_c
-
-void vp9_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_16x16 vp9_dc_left_predictor_16x16_c
-
-void vp9_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_32x32 vp9_dc_left_predictor_32x32_c
-
-void vp9_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_4x4 vp9_dc_left_predictor_4x4_c
-
-void vp9_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_left_predictor_8x8 vp9_dc_left_predictor_8x8_c
-
-void vp9_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_dc_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_dc_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_dc_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_dc_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_dc_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_16x16 vp9_dc_top_predictor_16x16_c
-
-void vp9_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_32x32 vp9_dc_top_predictor_32x32_c
-
-void vp9_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_4x4 vp9_dc_top_predictor_4x4_c
-
-void vp9_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_dc_top_predictor_8x8 vp9_dc_top_predictor_8x8_c
-
-int vp9_diamond_search_sad_c(const struct macroblock *x, const struct search_site_config *cfg,  struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
-#define vp9_diamond_search_sad vp9_diamond_search_sad_c
-
-void vp9_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct16x16_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct16x16)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct16x16_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct16x16_1)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct32x32_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct32x32)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct32x32_1)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct32x32_rd_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct32x32_rd)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct4x4_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct4x4)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct4x4_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct4x4_1)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct8x8_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct8x8)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fdct8x8_1_sse2(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fdct8x8_1)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-void vp9_fht16x16_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-RTCD_EXTERN void (*vp9_fht16x16)(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-
-void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-void vp9_fht4x4_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-RTCD_EXTERN void (*vp9_fht4x4)(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-
-void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-void vp9_fht8x8_sse2(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-RTCD_EXTERN void (*vp9_fht8x8)(const int16_t *input, tran_low_t *output, int stride, int tx_type);
-
-int vp9_full_range_search_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
-#define vp9_full_range_search vp9_full_range_search_c
-
-int vp9_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-int vp9_full_search_sadx3(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-int vp9_full_search_sadx8(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-RTCD_EXTERN int (*vp9_full_search_sad)(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv);
-
-void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
-void vp9_fwht4x4_mmx(const int16_t *input, tran_low_t *output, int stride);
-RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t *input, tran_low_t *output, int stride);
-
-void vp9_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-void vp9_get16x16var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-RTCD_EXTERN void (*vp9_get16x16var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-
-void vp9_get8x8var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-void vp9_get8x8var_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-RTCD_EXTERN void (*vp9_get8x8var)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
-
-unsigned int vp9_get_mb_ss_c(const int16_t *);
-unsigned int vp9_get_mb_ss_sse2(const int16_t *);
-RTCD_EXTERN unsigned int (*vp9_get_mb_ss)(const int16_t *);
-
-void vp9_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_16x16_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_32x32_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_4x4_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_h_predictor_8x8_ssse3(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_10_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_10_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_256_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct16x16_256_add_ssse3(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct16x16_256_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct32x32_1024_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct32x32_1024_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct32x32_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct32x32_34_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct4x4_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_12_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_1_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vp9_idct8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vp9_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
-
-void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
-void vp9_iht16x16_256_add_sse2(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
-RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
-
-void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-void vp9_iht4x4_16_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-
-void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-void vp9_iht8x8_64_add_sse2(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-
-void vp9_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_iwht4x4_16_add vp9_iwht4x4_16_add_c
-
-void vp9_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-#define vp9_iwht4x4_1_add vp9_iwht4x4_1_add_c
-
-void vp9_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_horizontal_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-RTCD_EXTERN void (*vp9_lpf_horizontal_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-
-void vp9_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_horizontal_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-RTCD_EXTERN void (*vp9_lpf_horizontal_4)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-
-void vp9_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_horizontal_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-RTCD_EXTERN void (*vp9_lpf_horizontal_4_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-
-void vp9_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_horizontal_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-RTCD_EXTERN void (*vp9_lpf_horizontal_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-
-void vp9_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_horizontal_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-RTCD_EXTERN void (*vp9_lpf_horizontal_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-
-void vp9_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-void vp9_lpf_vertical_16_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-RTCD_EXTERN void (*vp9_lpf_vertical_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-
-void vp9_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-void vp9_lpf_vertical_16_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-RTCD_EXTERN void (*vp9_lpf_vertical_16_dual)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-
-void vp9_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_vertical_4_mmx(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-RTCD_EXTERN void (*vp9_lpf_vertical_4)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-
-void vp9_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_vertical_4_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-RTCD_EXTERN void (*vp9_lpf_vertical_4_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-
-void vp9_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-void vp9_lpf_vertical_8_sse2(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-RTCD_EXTERN void (*vp9_lpf_vertical_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh, int count);
-
-void vp9_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-void vp9_lpf_vertical_8_dual_sse2(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-RTCD_EXTERN void (*vp9_lpf_vertical_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
-
-unsigned int vp9_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse16x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_mse16x16)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-
-unsigned int vp9_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse16x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_mse16x8)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-
-unsigned int vp9_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse8x16_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_mse8x16)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-
-unsigned int vp9_mse8x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vp9_mse8x8_sse2(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_mse8x8)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-
-void vp9_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-#define vp9_quantize_b vp9_quantize_b_c
-
-void vp9_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-#define vp9_quantize_b_32x32 vp9_quantize_b_32x32_c
-
-void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-#define vp9_quantize_fp vp9_quantize_fp_c
-
-void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
-#define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c
-
-int vp9_refining_search_sad_c(const struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv);
-#define vp9_refining_search_sad vp9_refining_search_sad_c
-
-unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-
-unsigned int vp9_sad16x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad16x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad16x16_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-
-void vp9_sad16x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x16x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad16x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad16x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad16x16x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad16x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad16x16x8 vp9_sad16x16x8_c
-
-unsigned int vp9_sad16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad16x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-
-unsigned int vp9_sad16x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad16x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad16x32_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-
-void vp9_sad16x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad16x32x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-
-unsigned int vp9_sad16x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad16x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad16x8_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-
-void vp9_sad16x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x8x3_ssse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad16x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad16x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad16x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad16x8x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad16x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad16x8x8 vp9_sad16x8x8_c
-
-unsigned int vp9_sad32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad32x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-
-unsigned int vp9_sad32x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad32x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad32x16_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-
-void vp9_sad32x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad32x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad32x16x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad32x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-
-unsigned int vp9_sad32x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad32x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad32x32_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-
-void vp9_sad32x32x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-#define vp9_sad32x32x3 vp9_sad32x32x3_c
-
-void vp9_sad32x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad32x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad32x32x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad32x32x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad32x32x8 vp9_sad32x32x8_c
-
-unsigned int vp9_sad32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad32x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-
-unsigned int vp9_sad32x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad32x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad32x64_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-
-void vp9_sad32x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad32x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad32x64x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad4x4_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad4x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-
-unsigned int vp9_sad4x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad4x4_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad4x4_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-
-void vp9_sad4x4x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad4x4x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad4x4x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad4x4x4d_sse(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad4x4x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad4x4x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad4x4x8 vp9_sad4x4x8_c
-
-unsigned int vp9_sad4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad4x8_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad4x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-
-unsigned int vp9_sad4x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad4x8_avg_sse(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad4x8_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-
-void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-void vp9_sad4x8x4d_sse(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad4x8x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-
-void vp9_sad4x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
-#define vp9_sad4x8x8 vp9_sad4x8x8_c
-
-unsigned int vp9_sad64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad64x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-
-unsigned int vp9_sad64x32_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad64x32_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad64x32_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-
-void vp9_sad64x32x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad64x32x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad64x32x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad64x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-
-unsigned int vp9_sad64x64_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad64x64_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad64x64_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-
-void vp9_sad64x64x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-#define vp9_sad64x64x3 vp9_sad64x64x3_c
-
-void vp9_sad64x64x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad64x64x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad64x64x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad64x64x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad64x64x8 vp9_sad64x64x8_c
-
-unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-
-unsigned int vp9_sad8x16_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad8x16_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad8x16_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-
-void vp9_sad8x16x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x16x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad8x16x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad8x16x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x16x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad8x16x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad8x16x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad8x16x8 vp9_sad8x16x8_c
-
-unsigned int vp9_sad8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vp9_sad8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad8x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride);
-
-unsigned int vp9_sad8x4_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad8x4_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad8x4_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
-
-void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-void vp9_sad8x4x4d_sse2(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad8x4x4d)(const uint8_t *src_ptr, int src_stride, const uint8_t* const ref_ptr[], int ref_stride, unsigned int *sad_array);
-
-void vp9_sad8x4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
-#define vp9_sad8x4x8 vp9_sad8x4x8_c
-
-unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-unsigned int vp9_sad8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-RTCD_EXTERN unsigned int (*vp9_sad8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride);
-
-unsigned int vp9_sad8x8_avg_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-unsigned int vp9_sad8x8_avg_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sad8x8_avg)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, const uint8_t *second_pred);
-
-void vp9_sad8x8x3_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x8x3_sse3(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad8x8x3)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad8x8x4d_c(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-void vp9_sad8x8x4d_sse2(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-RTCD_EXTERN void (*vp9_sad8x8x4d)(const uint8_t *src_ptr, int  src_stride, const uint8_t* const ref_ptr[], int  ref_stride, unsigned int *sad_array);
-
-void vp9_sad8x8x8_c(const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int  ref_stride, uint32_t *sad_array);
-#define vp9_sad8x8x8 vp9_sad8x8x8_c
-
-unsigned int vp9_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-unsigned int vp9_sub_pixel_avg_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_avg_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, const uint8_t *second_pred);
-
-unsigned int vp9_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance16x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance16x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance32x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance32x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x4_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x8_sse(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance4x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance4x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x32_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x32)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance64x64_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance64x64)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x16_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x4_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x4)(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_sub_pixel_variance8x8_ssse3(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_sub_pixel_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-void vp9_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
-void vp9_subtract_block_sse2(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
-RTCD_EXTERN void (*vp9_subtract_block)(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
-
-void vp9_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
-void vp9_temporal_filter_apply_sse2(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
-RTCD_EXTERN void (*vp9_temporal_filter_apply)(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count);
-
-void vp9_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_tm_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_tm_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vp9_tm_predictor_32x32 vp9_tm_predictor_32x32_c
-
-void vp9_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_tm_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_tm_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_tm_predictor_8x8_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_tm_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_16x16_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_v_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_32x32_sse2(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_v_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_4x4_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_v_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-void vp9_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-void vp9_v_predictor_8x8_sse(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-RTCD_EXTERN void (*vp9_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-
-unsigned int vp9_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance16x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance16x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance16x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance32x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance32x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance32x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance32x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance32x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance32x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance32x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance32x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance32x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance4x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance4x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance4x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance4x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance4x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance4x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance64x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance64x32_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance64x32)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance64x64_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance64x64_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance64x64)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x16_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x4_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance8x4)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-unsigned int vp9_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vp9_variance8x8_sse2(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-RTCD_EXTERN unsigned int (*vp9_variance8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-
-void vp9_rtcd(void);
-
-#ifdef RTCD_C
-#include "vpx_ports/x86.h"
-static void setup_rtcd_internal(void)
-{
-    int flags = x86_simd_caps();
-
-    (void)flags;
-
-    vp9_block_error = vp9_block_error_c;
-    if (flags & HAS_SSE2) vp9_block_error = vp9_block_error_sse2;
-    vp9_convolve8 = vp9_convolve8_c;
-    if (flags & HAS_SSE2) vp9_convolve8 = vp9_convolve8_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8 = vp9_convolve8_ssse3;
-    vp9_convolve8_avg = vp9_convolve8_avg_c;
-    if (flags & HAS_SSE2) vp9_convolve8_avg = vp9_convolve8_avg_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_avg = vp9_convolve8_avg_ssse3;
-    vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_c;
-    if (flags & HAS_SSE2) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_avg_horiz = vp9_convolve8_avg_horiz_ssse3;
-    vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_c;
-    if (flags & HAS_SSE2) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_avg_vert = vp9_convolve8_avg_vert_ssse3;
-    vp9_convolve8_horiz = vp9_convolve8_horiz_c;
-    if (flags & HAS_SSE2) vp9_convolve8_horiz = vp9_convolve8_horiz_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_horiz = vp9_convolve8_horiz_ssse3;
-    vp9_convolve8_vert = vp9_convolve8_vert_c;
-    if (flags & HAS_SSE2) vp9_convolve8_vert = vp9_convolve8_vert_sse2;
-    if (flags & HAS_SSSE3) vp9_convolve8_vert = vp9_convolve8_vert_ssse3;
-    vp9_convolve_avg = vp9_convolve_avg_c;
-    if (flags & HAS_SSE2) vp9_convolve_avg = vp9_convolve_avg_sse2;
-    vp9_convolve_copy = vp9_convolve_copy_c;
-    if (flags & HAS_SSE2) vp9_convolve_copy = vp9_convolve_copy_sse2;
-    vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d153_predictor_16x16 = vp9_d153_predictor_16x16_ssse3;
-    vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d153_predictor_4x4 = vp9_d153_predictor_4x4_ssse3;
-    vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d153_predictor_8x8 = vp9_d153_predictor_8x8_ssse3;
-    vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_16x16 = vp9_d207_predictor_16x16_ssse3;
-    vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_32x32 = vp9_d207_predictor_32x32_ssse3;
-    vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_4x4 = vp9_d207_predictor_4x4_ssse3;
-    vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d207_predictor_8x8 = vp9_d207_predictor_8x8_ssse3;
-    vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_16x16 = vp9_d45_predictor_16x16_ssse3;
-    vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_32x32 = vp9_d45_predictor_32x32_ssse3;
-    vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_4x4 = vp9_d45_predictor_4x4_ssse3;
-    vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d45_predictor_8x8 = vp9_d45_predictor_8x8_ssse3;
-    vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_16x16 = vp9_d63_predictor_16x16_ssse3;
-    vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_32x32 = vp9_d63_predictor_32x32_ssse3;
-    vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_4x4 = vp9_d63_predictor_4x4_ssse3;
-    vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_d63_predictor_8x8 = vp9_d63_predictor_8x8_ssse3;
-    vp9_dc_predictor_16x16 = vp9_dc_predictor_16x16_c;
-    if (flags & HAS_SSE2) vp9_dc_predictor_16x16 = vp9_dc_predictor_16x16_sse2;
-    vp9_dc_predictor_32x32 = vp9_dc_predictor_32x32_c;
-    if (flags & HAS_SSE2) vp9_dc_predictor_32x32 = vp9_dc_predictor_32x32_sse2;
-    vp9_dc_predictor_4x4 = vp9_dc_predictor_4x4_c;
-    if (flags & HAS_SSE) vp9_dc_predictor_4x4 = vp9_dc_predictor_4x4_sse;
-    vp9_dc_predictor_8x8 = vp9_dc_predictor_8x8_c;
-    if (flags & HAS_SSE) vp9_dc_predictor_8x8 = vp9_dc_predictor_8x8_sse;
-    vp9_fdct16x16 = vp9_fdct16x16_c;
-    if (flags & HAS_SSE2) vp9_fdct16x16 = vp9_fdct16x16_sse2;
-    vp9_fdct16x16_1 = vp9_fdct16x16_1_c;
-    if (flags & HAS_SSE2) vp9_fdct16x16_1 = vp9_fdct16x16_1_sse2;
-    vp9_fdct32x32 = vp9_fdct32x32_c;
-    if (flags & HAS_SSE2) vp9_fdct32x32 = vp9_fdct32x32_sse2;
-    vp9_fdct32x32_1 = vp9_fdct32x32_1_c;
-    if (flags & HAS_SSE2) vp9_fdct32x32_1 = vp9_fdct32x32_1_sse2;
-    vp9_fdct32x32_rd = vp9_fdct32x32_rd_c;
-    if (flags & HAS_SSE2) vp9_fdct32x32_rd = vp9_fdct32x32_rd_sse2;
-    vp9_fdct4x4 = vp9_fdct4x4_c;
-    if (flags & HAS_SSE2) vp9_fdct4x4 = vp9_fdct4x4_sse2;
-    vp9_fdct4x4_1 = vp9_fdct4x4_1_c;
-    if (flags & HAS_SSE2) vp9_fdct4x4_1 = vp9_fdct4x4_1_sse2;
-    vp9_fdct8x8 = vp9_fdct8x8_c;
-    if (flags & HAS_SSE2) vp9_fdct8x8 = vp9_fdct8x8_sse2;
-    vp9_fdct8x8_1 = vp9_fdct8x8_1_c;
-    if (flags & HAS_SSE2) vp9_fdct8x8_1 = vp9_fdct8x8_1_sse2;
-    vp9_fht16x16 = vp9_fht16x16_c;
-    if (flags & HAS_SSE2) vp9_fht16x16 = vp9_fht16x16_sse2;
-    vp9_fht4x4 = vp9_fht4x4_c;
-    if (flags & HAS_SSE2) vp9_fht4x4 = vp9_fht4x4_sse2;
-    vp9_fht8x8 = vp9_fht8x8_c;
-    if (flags & HAS_SSE2) vp9_fht8x8 = vp9_fht8x8_sse2;
-    vp9_full_search_sad = vp9_full_search_sad_c;
-    if (flags & HAS_SSE3) vp9_full_search_sad = vp9_full_search_sadx3;
-    if (flags & HAS_SSE4_1) vp9_full_search_sad = vp9_full_search_sadx8;
-    vp9_fwht4x4 = vp9_fwht4x4_c;
-    if (flags & HAS_MMX) vp9_fwht4x4 = vp9_fwht4x4_mmx;
-    vp9_get16x16var = vp9_get16x16var_c;
-    if (flags & HAS_SSE2) vp9_get16x16var = vp9_get16x16var_sse2;
-    vp9_get8x8var = vp9_get8x8var_c;
-    if (flags & HAS_SSE2) vp9_get8x8var = vp9_get8x8var_sse2;
-    vp9_get_mb_ss = vp9_get_mb_ss_c;
-    if (flags & HAS_SSE2) vp9_get_mb_ss = vp9_get_mb_ss_sse2;
-    vp9_h_predictor_16x16 = vp9_h_predictor_16x16_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_16x16 = vp9_h_predictor_16x16_ssse3;
-    vp9_h_predictor_32x32 = vp9_h_predictor_32x32_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_32x32 = vp9_h_predictor_32x32_ssse3;
-    vp9_h_predictor_4x4 = vp9_h_predictor_4x4_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_4x4 = vp9_h_predictor_4x4_ssse3;
-    vp9_h_predictor_8x8 = vp9_h_predictor_8x8_c;
-    if (flags & HAS_SSSE3) vp9_h_predictor_8x8 = vp9_h_predictor_8x8_ssse3;
-    vp9_idct16x16_10_add = vp9_idct16x16_10_add_c;
-    if (flags & HAS_SSE2) vp9_idct16x16_10_add = vp9_idct16x16_10_add_sse2;
-    if (flags & HAS_SSSE3) vp9_idct16x16_10_add = vp9_idct16x16_10_add_ssse3;
-    vp9_idct16x16_1_add = vp9_idct16x16_1_add_c;
-    if (flags & HAS_SSE2) vp9_idct16x16_1_add = vp9_idct16x16_1_add_sse2;
-    vp9_idct16x16_256_add = vp9_idct16x16_256_add_c;
-    if (flags & HAS_SSE2) vp9_idct16x16_256_add = vp9_idct16x16_256_add_sse2;
-    if (flags & HAS_SSSE3) vp9_idct16x16_256_add = vp9_idct16x16_256_add_ssse3;
-    vp9_idct32x32_1024_add = vp9_idct32x32_1024_add_c;
-    if (flags & HAS_SSE2) vp9_idct32x32_1024_add = vp9_idct32x32_1024_add_sse2;
-    vp9_idct32x32_1_add = vp9_idct32x32_1_add_c;
-    if (flags & HAS_SSE2) vp9_idct32x32_1_add = vp9_idct32x32_1_add_sse2;
-    vp9_idct32x32_34_add = vp9_idct32x32_34_add_c;
-    if (flags & HAS_SSE2) vp9_idct32x32_34_add = vp9_idct32x32_34_add_sse2;
-    vp9_idct4x4_16_add = vp9_idct4x4_16_add_c;
-    if (flags & HAS_SSE2) vp9_idct4x4_16_add = vp9_idct4x4_16_add_sse2;
-    vp9_idct4x4_1_add = vp9_idct4x4_1_add_c;
-    if (flags & HAS_SSE2) vp9_idct4x4_1_add = vp9_idct4x4_1_add_sse2;
-    vp9_idct8x8_12_add = vp9_idct8x8_12_add_c;
-    if (flags & HAS_SSE2) vp9_idct8x8_12_add = vp9_idct8x8_12_add_sse2;
-    vp9_idct8x8_1_add = vp9_idct8x8_1_add_c;
-    if (flags & HAS_SSE2) vp9_idct8x8_1_add = vp9_idct8x8_1_add_sse2;
-    vp9_idct8x8_64_add = vp9_idct8x8_64_add_c;
-    if (flags & HAS_SSE2) vp9_idct8x8_64_add = vp9_idct8x8_64_add_sse2;
-    vp9_iht16x16_256_add = vp9_iht16x16_256_add_c;
-    if (flags & HAS_SSE2) vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2;
-    vp9_iht4x4_16_add = vp9_iht4x4_16_add_c;
-    if (flags & HAS_SSE2) vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2;
-    vp9_iht8x8_64_add = vp9_iht8x8_64_add_c;
-    if (flags & HAS_SSE2) vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2;
-    vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_c;
-    if (flags & HAS_SSE2) vp9_lpf_horizontal_16 = vp9_lpf_horizontal_16_sse2;
-    vp9_lpf_horizontal_4 = vp9_lpf_horizontal_4_c;
-    if (flags & HAS_MMX) vp9_lpf_horizontal_4 = vp9_lpf_horizontal_4_mmx;
-    vp9_lpf_horizontal_4_dual = vp9_lpf_horizontal_4_dual_c;
-    if (flags & HAS_SSE2) vp9_lpf_horizontal_4_dual = vp9_lpf_horizontal_4_dual_sse2;
-    vp9_lpf_horizontal_8 = vp9_lpf_horizontal_8_c;
-    if (flags & HAS_SSE2) vp9_lpf_horizontal_8 = vp9_lpf_horizontal_8_sse2;
-    vp9_lpf_horizontal_8_dual = vp9_lpf_horizontal_8_dual_c;
-    if (flags & HAS_SSE2) vp9_lpf_horizontal_8_dual = vp9_lpf_horizontal_8_dual_sse2;
-    vp9_lpf_vertical_16 = vp9_lpf_vertical_16_c;
-    if (flags & HAS_SSE2) vp9_lpf_vertical_16 = vp9_lpf_vertical_16_sse2;
-    vp9_lpf_vertical_16_dual = vp9_lpf_vertical_16_dual_c;
-    if (flags & HAS_SSE2) vp9_lpf_vertical_16_dual = vp9_lpf_vertical_16_dual_sse2;
-    vp9_lpf_vertical_4 = vp9_lpf_vertical_4_c;
-    if (flags & HAS_MMX) vp9_lpf_vertical_4 = vp9_lpf_vertical_4_mmx;
-    vp9_lpf_vertical_4_dual = vp9_lpf_vertical_4_dual_c;
-    if (flags & HAS_SSE2) vp9_lpf_vertical_4_dual = vp9_lpf_vertical_4_dual_sse2;
-    vp9_lpf_vertical_8 = vp9_lpf_vertical_8_c;
-    if (flags & HAS_SSE2) vp9_lpf_vertical_8 = vp9_lpf_vertical_8_sse2;
-    vp9_lpf_vertical_8_dual = vp9_lpf_vertical_8_dual_c;
-    if (flags & HAS_SSE2) vp9_lpf_vertical_8_dual = vp9_lpf_vertical_8_dual_sse2;
-    vp9_mse16x16 = vp9_mse16x16_c;
-    if (flags & HAS_SSE2) vp9_mse16x16 = vp9_mse16x16_sse2;
-    vp9_mse16x8 = vp9_mse16x8_c;
-    if (flags & HAS_SSE2) vp9_mse16x8 = vp9_mse16x8_sse2;
-    vp9_mse8x16 = vp9_mse8x16_c;
-    if (flags & HAS_SSE2) vp9_mse8x16 = vp9_mse8x16_sse2;
-    vp9_mse8x8 = vp9_mse8x8_c;
-    if (flags & HAS_SSE2) vp9_mse8x8 = vp9_mse8x8_sse2;
-    vp9_sad16x16 = vp9_sad16x16_c;
-    if (flags & HAS_SSE2) vp9_sad16x16 = vp9_sad16x16_sse2;
-    vp9_sad16x16_avg = vp9_sad16x16_avg_c;
-    if (flags & HAS_SSE2) vp9_sad16x16_avg = vp9_sad16x16_avg_sse2;
-    vp9_sad16x16x3 = vp9_sad16x16x3_c;
-    if (flags & HAS_SSE3) vp9_sad16x16x3 = vp9_sad16x16x3_sse3;
-    if (flags & HAS_SSSE3) vp9_sad16x16x3 = vp9_sad16x16x3_ssse3;
-    vp9_sad16x16x4d = vp9_sad16x16x4d_c;
-    if (flags & HAS_SSE2) vp9_sad16x16x4d = vp9_sad16x16x4d_sse2;
-    vp9_sad16x32 = vp9_sad16x32_c;
-    if (flags & HAS_SSE2) vp9_sad16x32 = vp9_sad16x32_sse2;
-    vp9_sad16x32_avg = vp9_sad16x32_avg_c;
-    if (flags & HAS_SSE2) vp9_sad16x32_avg = vp9_sad16x32_avg_sse2;
-    vp9_sad16x32x4d = vp9_sad16x32x4d_c;
-    if (flags & HAS_SSE2) vp9_sad16x32x4d = vp9_sad16x32x4d_sse2;
-    vp9_sad16x8 = vp9_sad16x8_c;
-    if (flags & HAS_SSE2) vp9_sad16x8 = vp9_sad16x8_sse2;
-    vp9_sad16x8_avg = vp9_sad16x8_avg_c;
-    if (flags & HAS_SSE2) vp9_sad16x8_avg = vp9_sad16x8_avg_sse2;
-    vp9_sad16x8x3 = vp9_sad16x8x3_c;
-    if (flags & HAS_SSE3) vp9_sad16x8x3 = vp9_sad16x8x3_sse3;
-    if (flags & HAS_SSSE3) vp9_sad16x8x3 = vp9_sad16x8x3_ssse3;
-    vp9_sad16x8x4d = vp9_sad16x8x4d_c;
-    if (flags & HAS_SSE2) vp9_sad16x8x4d = vp9_sad16x8x4d_sse2;
-    vp9_sad32x16 = vp9_sad32x16_c;
-    if (flags & HAS_SSE2) vp9_sad32x16 = vp9_sad32x16_sse2;
-    vp9_sad32x16_avg = vp9_sad32x16_avg_c;
-    if (flags & HAS_SSE2) vp9_sad32x16_avg = vp9_sad32x16_avg_sse2;
-    vp9_sad32x16x4d = vp9_sad32x16x4d_c;
-    if (flags & HAS_SSE2) vp9_sad32x16x4d = vp9_sad32x16x4d_sse2;
-    vp9_sad32x32 = vp9_sad32x32_c;
-    if (flags & HAS_SSE2) vp9_sad32x32 = vp9_sad32x32_sse2;
-    vp9_sad32x32_avg = vp9_sad32x32_avg_c;
-    if (flags & HAS_SSE2) vp9_sad32x32_avg = vp9_sad32x32_avg_sse2;
-    vp9_sad32x32x4d = vp9_sad32x32x4d_c;
-    if (flags & HAS_SSE2) vp9_sad32x32x4d = vp9_sad32x32x4d_sse2;
-    vp9_sad32x64 = vp9_sad32x64_c;
-    if (flags & HAS_SSE2) vp9_sad32x64 = vp9_sad32x64_sse2;
-    vp9_sad32x64_avg = vp9_sad32x64_avg_c;
-    if (flags & HAS_SSE2) vp9_sad32x64_avg = vp9_sad32x64_avg_sse2;
-    vp9_sad32x64x4d = vp9_sad32x64x4d_c;
-    if (flags & HAS_SSE2) vp9_sad32x64x4d = vp9_sad32x64x4d_sse2;
-    vp9_sad4x4 = vp9_sad4x4_c;
-    if (flags & HAS_SSE) vp9_sad4x4 = vp9_sad4x4_sse;
-    vp9_sad4x4_avg = vp9_sad4x4_avg_c;
-    if (flags & HAS_SSE) vp9_sad4x4_avg = vp9_sad4x4_avg_sse;
-    vp9_sad4x4x3 = vp9_sad4x4x3_c;
-    if (flags & HAS_SSE3) vp9_sad4x4x3 = vp9_sad4x4x3_sse3;
-    vp9_sad4x4x4d = vp9_sad4x4x4d_c;
-    if (flags & HAS_SSE) vp9_sad4x4x4d = vp9_sad4x4x4d_sse;
-    vp9_sad4x8 = vp9_sad4x8_c;
-    if (flags & HAS_SSE) vp9_sad4x8 = vp9_sad4x8_sse;
-    vp9_sad4x8_avg = vp9_sad4x8_avg_c;
-    if (flags & HAS_SSE) vp9_sad4x8_avg = vp9_sad4x8_avg_sse;
-    vp9_sad4x8x4d = vp9_sad4x8x4d_c;
-    if (flags & HAS_SSE) vp9_sad4x8x4d = vp9_sad4x8x4d_sse;
-    vp9_sad64x32 = vp9_sad64x32_c;
-    if (flags & HAS_SSE2) vp9_sad64x32 = vp9_sad64x32_sse2;
-    vp9_sad64x32_avg = vp9_sad64x32_avg_c;
-    if (flags & HAS_SSE2) vp9_sad64x32_avg = vp9_sad64x32_avg_sse2;
-    vp9_sad64x32x4d = vp9_sad64x32x4d_c;
-    if (flags & HAS_SSE2) vp9_sad64x32x4d = vp9_sad64x32x4d_sse2;
-    vp9_sad64x64 = vp9_sad64x64_c;
-    if (flags & HAS_SSE2) vp9_sad64x64 = vp9_sad64x64_sse2;
-    vp9_sad64x64_avg = vp9_sad64x64_avg_c;
-    if (flags & HAS_SSE2) vp9_sad64x64_avg = vp9_sad64x64_avg_sse2;
-    vp9_sad64x64x4d = vp9_sad64x64x4d_c;
-    if (flags & HAS_SSE2) vp9_sad64x64x4d = vp9_sad64x64x4d_sse2;
-    vp9_sad8x16 = vp9_sad8x16_c;
-    if (flags & HAS_SSE2) vp9_sad8x16 = vp9_sad8x16_sse2;
-    vp9_sad8x16_avg = vp9_sad8x16_avg_c;
-    if (flags & HAS_SSE2) vp9_sad8x16_avg = vp9_sad8x16_avg_sse2;
-    vp9_sad8x16x3 = vp9_sad8x16x3_c;
-    if (flags & HAS_SSE3) vp9_sad8x16x3 = vp9_sad8x16x3_sse3;
-    vp9_sad8x16x4d = vp9_sad8x16x4d_c;
-    if (flags & HAS_SSE2) vp9_sad8x16x4d = vp9_sad8x16x4d_sse2;
-    vp9_sad8x4 = vp9_sad8x4_c;
-    if (flags & HAS_SSE2) vp9_sad8x4 = vp9_sad8x4_sse2;
-    vp9_sad8x4_avg = vp9_sad8x4_avg_c;
-    if (flags & HAS_SSE2) vp9_sad8x4_avg = vp9_sad8x4_avg_sse2;
-    vp9_sad8x4x4d = vp9_sad8x4x4d_c;
-    if (flags & HAS_SSE2) vp9_sad8x4x4d = vp9_sad8x4x4d_sse2;
-    vp9_sad8x8 = vp9_sad8x8_c;
-    if (flags & HAS_SSE2) vp9_sad8x8 = vp9_sad8x8_sse2;
-    vp9_sad8x8_avg = vp9_sad8x8_avg_c;
-    if (flags & HAS_SSE2) vp9_sad8x8_avg = vp9_sad8x8_avg_sse2;
-    vp9_sad8x8x3 = vp9_sad8x8x3_c;
-    if (flags & HAS_SSE3) vp9_sad8x8x3 = vp9_sad8x8x3_sse3;
-    vp9_sad8x8x4d = vp9_sad8x8x4d_c;
-    if (flags & HAS_SSE2) vp9_sad8x8x4d = vp9_sad8x8x4d_sse2;
-    vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x16 = vp9_sub_pixel_avg_variance16x16_ssse3;
-    vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x32 = vp9_sub_pixel_avg_variance16x32_ssse3;
-    vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance16x8 = vp9_sub_pixel_avg_variance16x8_ssse3;
-    vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x16 = vp9_sub_pixel_avg_variance32x16_ssse3;
-    vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x32 = vp9_sub_pixel_avg_variance32x32_ssse3;
-    vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance32x64 = vp9_sub_pixel_avg_variance32x64_ssse3;
-    vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_c;
-    if (flags & HAS_SSE) vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x4 = vp9_sub_pixel_avg_variance4x4_ssse3;
-    vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_c;
-    if (flags & HAS_SSE) vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance4x8 = vp9_sub_pixel_avg_variance4x8_ssse3;
-    vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x32 = vp9_sub_pixel_avg_variance64x32_ssse3;
-    vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance64x64 = vp9_sub_pixel_avg_variance64x64_ssse3;
-    vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x16 = vp9_sub_pixel_avg_variance8x16_ssse3;
-    vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x4 = vp9_sub_pixel_avg_variance8x4_ssse3;
-    vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_avg_variance8x8 = vp9_sub_pixel_avg_variance8x8_ssse3;
-    vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x16 = vp9_sub_pixel_variance16x16_ssse3;
-    vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x32 = vp9_sub_pixel_variance16x32_ssse3;
-    vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance16x8 = vp9_sub_pixel_variance16x8_ssse3;
-    vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x16 = vp9_sub_pixel_variance32x16_ssse3;
-    vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x32 = vp9_sub_pixel_variance32x32_ssse3;
-    vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance32x64 = vp9_sub_pixel_variance32x64_ssse3;
-    vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_c;
-    if (flags & HAS_SSE) vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x4 = vp9_sub_pixel_variance4x4_ssse3;
-    vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_c;
-    if (flags & HAS_SSE) vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_sse;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance4x8 = vp9_sub_pixel_variance4x8_ssse3;
-    vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x32 = vp9_sub_pixel_variance64x32_ssse3;
-    vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance64x64 = vp9_sub_pixel_variance64x64_ssse3;
-    vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x16 = vp9_sub_pixel_variance8x16_ssse3;
-    vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x4 = vp9_sub_pixel_variance8x4_ssse3;
-    vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_c;
-    if (flags & HAS_SSE2) vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_sse2;
-    if (flags & HAS_SSSE3) vp9_sub_pixel_variance8x8 = vp9_sub_pixel_variance8x8_ssse3;
-    vp9_subtract_block = vp9_subtract_block_c;
-    if (flags & HAS_SSE2) vp9_subtract_block = vp9_subtract_block_sse2;
-    vp9_temporal_filter_apply = vp9_temporal_filter_apply_c;
-    if (flags & HAS_SSE2) vp9_temporal_filter_apply = vp9_temporal_filter_apply_sse2;
-    vp9_tm_predictor_16x16 = vp9_tm_predictor_16x16_c;
-    if (flags & HAS_SSE2) vp9_tm_predictor_16x16 = vp9_tm_predictor_16x16_sse2;
-    vp9_tm_predictor_4x4 = vp9_tm_predictor_4x4_c;
-    if (flags & HAS_SSE) vp9_tm_predictor_4x4 = vp9_tm_predictor_4x4_sse;
-    vp9_tm_predictor_8x8 = vp9_tm_predictor_8x8_c;
-    if (flags & HAS_SSE2) vp9_tm_predictor_8x8 = vp9_tm_predictor_8x8_sse2;
-    vp9_v_predictor_16x16 = vp9_v_predictor_16x16_c;
-    if (flags & HAS_SSE2) vp9_v_predictor_16x16 = vp9_v_predictor_16x16_sse2;
-    vp9_v_predictor_32x32 = vp9_v_predictor_32x32_c;
-    if (flags & HAS_SSE2) vp9_v_predictor_32x32 = vp9_v_predictor_32x32_sse2;
-    vp9_v_predictor_4x4 = vp9_v_predictor_4x4_c;
-    if (flags & HAS_SSE) vp9_v_predictor_4x4 = vp9_v_predictor_4x4_sse;
-    vp9_v_predictor_8x8 = vp9_v_predictor_8x8_c;
-    if (flags & HAS_SSE) vp9_v_predictor_8x8 = vp9_v_predictor_8x8_sse;
-    vp9_variance16x16 = vp9_variance16x16_c;
-    if (flags & HAS_SSE2) vp9_variance16x16 = vp9_variance16x16_sse2;
-    vp9_variance16x32 = vp9_variance16x32_c;
-    if (flags & HAS_SSE2) vp9_variance16x32 = vp9_variance16x32_sse2;
-    vp9_variance16x8 = vp9_variance16x8_c;
-    if (flags & HAS_SSE2) vp9_variance16x8 = vp9_variance16x8_sse2;
-    vp9_variance32x16 = vp9_variance32x16_c;
-    if (flags & HAS_SSE2) vp9_variance32x16 = vp9_variance32x16_sse2;
-    vp9_variance32x32 = vp9_variance32x32_c;
-    if (flags & HAS_SSE2) vp9_variance32x32 = vp9_variance32x32_sse2;
-    vp9_variance32x64 = vp9_variance32x64_c;
-    if (flags & HAS_SSE2) vp9_variance32x64 = vp9_variance32x64_sse2;
-    vp9_variance4x4 = vp9_variance4x4_c;
-    if (flags & HAS_SSE2) vp9_variance4x4 = vp9_variance4x4_sse2;
-    vp9_variance4x8 = vp9_variance4x8_c;
-    if (flags & HAS_SSE2) vp9_variance4x8 = vp9_variance4x8_sse2;
-    vp9_variance64x32 = vp9_variance64x32_c;
-    if (flags & HAS_SSE2) vp9_variance64x32 = vp9_variance64x32_sse2;
-    vp9_variance64x64 = vp9_variance64x64_c;
-    if (flags & HAS_SSE2) vp9_variance64x64 = vp9_variance64x64_sse2;
-    vp9_variance8x16 = vp9_variance8x16_c;
-    if (flags & HAS_SSE2) vp9_variance8x16 = vp9_variance8x16_sse2;
-    vp9_variance8x4 = vp9_variance8x4_c;
-    if (flags & HAS_SSE2) vp9_variance8x4 = vp9_variance8x4_sse2;
-    vp9_variance8x8 = vp9_variance8x8_c;
-    if (flags & HAS_SSE2) vp9_variance8x8 = vp9_variance8x8_sse2;
-}
-#endif
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config.asm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config.asm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config.asm	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config.asm	2015-02-28 15:03:04.000000000 +0000
@@ -7,7 +7,7 @@
 %elifidn __OUTPUT_FORMAT__,macho64
 %include "vpx_config_x86_64-darwin9-gcc.asm"
 %elifidn __OUTPUT_FORMAT__,win32
-%include "vpx_config_x86-win32-vs8.asm"
+%include "vpx_config_x86-win32-vs12.asm"
 %elifidn __OUTPUT_FORMAT__,x64
-%include "vpx_config_x86_64-win64-vs8.asm"
+%include "vpx_config_x86_64-win64-vs12.asm"
 %endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config.h	2015-02-28 15:03:04.000000000 +0000
@@ -3,7 +3,7 @@
 #if defined(_WIN64)
 /* 64 bit Windows */
 #ifdef _MSC_VER
-#include "vpx_config_x86_64-win64-vs8.h"
+#include "vpx_config_x86_64-win64-vs12.h"
 #else
 #include "vpx_config_x86_64-win64-gcc.h"
 #endif
@@ -11,7 +11,7 @@
 #elif defined(_WIN32)
 /* 32 bit Windows, MSVC. */
 #ifdef _MSC_VER
-#include "vpx_config_x86-win32-vs8.h"
+#include "vpx_config_x86-win32-vs12.h"
 #else
 #include "vpx_config_x86-win32-gcc.h"
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.asm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.asm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.asm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.asm	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,88 @@
+ARCH_ARM equ 0
+ARCH_MIPS equ 0
+ARCH_X86 equ 0
+ARCH_X86_64 equ 1
+ARCH_PPC32 equ 0
+ARCH_PPC64 equ 0
+HAVE_EDSP equ 0
+HAVE_MEDIA equ 0
+HAVE_NEON equ 0
+HAVE_NEON_ASM equ 0
+HAVE_MIPS32 equ 0
+HAVE_DSPR2 equ 0
+HAVE_MIPS64 equ 0
+HAVE_MMX equ 1
+HAVE_SSE equ 1
+HAVE_SSE2 equ 1
+HAVE_SSE3 equ 1
+HAVE_SSSE3 equ 1
+HAVE_SSE4_1 equ 1
+HAVE_AVX equ 1
+HAVE_AVX2 equ 1
+HAVE_ALTIVEC equ 0
+HAVE_VPX_PORTS equ 1
+HAVE_STDINT_H equ 0
+HAVE_ALT_TREE_LAYOUT equ 0
+HAVE_PTHREAD_H equ 0
+HAVE_SYS_MMAN_H equ 0
+HAVE_UNISTD_H equ 0
+CONFIG_EXTERNAL_BUILD equ 1
+CONFIG_INSTALL_DOCS equ 0
+CONFIG_INSTALL_BINS equ 1
+CONFIG_INSTALL_LIBS equ 1
+CONFIG_INSTALL_SRCS equ 0
+CONFIG_USE_X86INC equ 1
+CONFIG_DEBUG equ 0
+CONFIG_GPROF equ 0
+CONFIG_GCOV equ 0
+CONFIG_RVCT equ 0
+CONFIG_GCC equ 0
+CONFIG_MSVS equ 1
+CONFIG_PIC equ 0
+CONFIG_BIG_ENDIAN equ 0
+CONFIG_CODEC_SRCS equ 0
+CONFIG_DEBUG_LIBS equ 0
+CONFIG_FAST_UNALIGNED equ 1
+CONFIG_MEM_MANAGER equ 0
+CONFIG_MEM_TRACKER equ 0
+CONFIG_MEM_CHECKS equ 0
+CONFIG_DEQUANT_TOKENS equ 0
+CONFIG_DC_RECON equ 0
+CONFIG_RUNTIME_CPU_DETECT equ 1
+CONFIG_POSTPROC equ 1
+CONFIG_VP9_POSTPROC equ 0
+CONFIG_MULTITHREAD equ 1
+CONFIG_INTERNAL_STATS equ 0
+CONFIG_VP8_ENCODER equ 1
+CONFIG_VP8_DECODER equ 1
+CONFIG_VP9_ENCODER equ 1
+CONFIG_VP9_DECODER equ 1
+CONFIG_VP8 equ 1
+CONFIG_VP9 equ 1
+CONFIG_ENCODERS equ 1
+CONFIG_DECODERS equ 1
+CONFIG_STATIC_MSVCRT equ 0
+CONFIG_SPATIAL_RESAMPLING equ 1
+CONFIG_REALTIME_ONLY equ 0
+CONFIG_ONTHEFLY_BITPACKING equ 0
+CONFIG_ERROR_CONCEALMENT equ 0
+CONFIG_SHARED equ 0
+CONFIG_STATIC equ 1
+CONFIG_SMALL equ 0
+CONFIG_POSTPROC_VISUALIZER equ 0
+CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 1
+CONFIG_WEBM_IO equ 1
+CONFIG_LIBYUV equ 1
+CONFIG_DECODE_PERF_TESTS equ 0
+CONFIG_ENCODE_PERF_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
+CONFIG_TEMPORAL_DENOISING equ 1
+CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
+CONFIG_VP9_HIGHBITDEPTH equ 0
+CONFIG_EXPERIMENTAL equ 0
+CONFIG_SIZE_LIMIT equ 0
+CONFIG_SPATIAL_SVC equ 0
+CONFIG_VP9_TEMPORAL_DENOISING equ 0
+CONFIG_FP_MB_STATS equ 0
+CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH equ 0
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs12.h	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,101 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
+/* This file automatically generated by configure. Do not edit! */
+#ifndef VPX_CONFIG_H
+#define VPX_CONFIG_H
+#define RESTRICT    
+#define INLINE      __forceinline
+#define ARCH_ARM 0
+#define ARCH_MIPS 0
+#define ARCH_X86 0
+#define ARCH_X86_64 1
+#define ARCH_PPC32 0
+#define ARCH_PPC64 0
+#define HAVE_EDSP 0
+#define HAVE_MEDIA 0
+#define HAVE_NEON 0
+#define HAVE_NEON_ASM 0
+#define HAVE_MIPS32 0
+#define HAVE_DSPR2 0
+#define HAVE_MIPS64 0
+#define HAVE_MMX 1
+#define HAVE_SSE 1
+#define HAVE_SSE2 1
+#define HAVE_SSE3 1
+#define HAVE_SSSE3 1
+#define HAVE_SSE4_1 1
+#define HAVE_AVX 1
+#define HAVE_AVX2 1
+#define HAVE_ALTIVEC 0
+#define HAVE_VPX_PORTS 1
+#define HAVE_STDINT_H 0
+#define HAVE_ALT_TREE_LAYOUT 0
+#define HAVE_PTHREAD_H 0
+#define HAVE_SYS_MMAN_H 0
+#define HAVE_UNISTD_H 0
+#define CONFIG_EXTERNAL_BUILD 1
+#define CONFIG_INSTALL_DOCS 0
+#define CONFIG_INSTALL_BINS 1
+#define CONFIG_INSTALL_LIBS 1
+#define CONFIG_INSTALL_SRCS 0
+#define CONFIG_USE_X86INC 1
+#define CONFIG_DEBUG 0
+#define CONFIG_GPROF 0
+#define CONFIG_GCOV 0
+#define CONFIG_RVCT 0
+#define CONFIG_GCC 0
+#define CONFIG_MSVS 1
+#define CONFIG_PIC 0
+#define CONFIG_BIG_ENDIAN 0
+#define CONFIG_CODEC_SRCS 0
+#define CONFIG_DEBUG_LIBS 0
+#define CONFIG_FAST_UNALIGNED 1
+#define CONFIG_MEM_MANAGER 0
+#define CONFIG_MEM_TRACKER 0
+#define CONFIG_MEM_CHECKS 0
+#define CONFIG_DEQUANT_TOKENS 0
+#define CONFIG_DC_RECON 0
+#define CONFIG_RUNTIME_CPU_DETECT 1
+#define CONFIG_POSTPROC 1
+#define CONFIG_VP9_POSTPROC 0
+#define CONFIG_MULTITHREAD 1
+#define CONFIG_INTERNAL_STATS 0
+#define CONFIG_VP8_ENCODER 1
+#define CONFIG_VP8_DECODER 1
+#define CONFIG_VP9_ENCODER 1
+#define CONFIG_VP9_DECODER 1
+#define CONFIG_VP8 1
+#define CONFIG_VP9 1
+#define CONFIG_ENCODERS 1
+#define CONFIG_DECODERS 1
+#define CONFIG_STATIC_MSVCRT 0
+#define CONFIG_SPATIAL_RESAMPLING 1
+#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_ONTHEFLY_BITPACKING 0
+#define CONFIG_ERROR_CONCEALMENT 0
+#define CONFIG_SHARED 0
+#define CONFIG_STATIC 1
+#define CONFIG_SMALL 0
+#define CONFIG_POSTPROC_VISUALIZER 0
+#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 1
+#define CONFIG_WEBM_IO 1
+#define CONFIG_LIBYUV 1
+#define CONFIG_DECODE_PERF_TESTS 0
+#define CONFIG_ENCODE_PERF_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 1
+#define CONFIG_TEMPORAL_DENOISING 1
+#define CONFIG_COEFFICIENT_RANGE_CHECKING 0
+#define CONFIG_VP9_HIGHBITDEPTH 0
+#define CONFIG_EXPERIMENTAL 0
+#define CONFIG_SIZE_LIMIT 0
+#define CONFIG_SPATIAL_SVC 0
+#define CONFIG_VP9_TEMPORAL_DENOISING 0
+#define CONFIG_FP_MB_STATS 0
+#define CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH 0
+#endif /* VPX_CONFIG_H */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.asm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.asm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.asm	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-ARCH_ARM equ 0
-ARCH_MIPS equ 0
-ARCH_X86 equ 0
-ARCH_X86_64 equ 1
-ARCH_PPC32 equ 0
-ARCH_PPC64 equ 0
-HAVE_EDSP equ 0
-HAVE_MEDIA equ 0
-HAVE_NEON equ 0
-HAVE_NEON_ASM equ 0
-HAVE_MIPS32 equ 0
-HAVE_DSPR2 equ 0
-HAVE_MIPS64 equ 0
-HAVE_MMX equ 1
-HAVE_SSE equ 1
-HAVE_SSE2 equ 1
-HAVE_SSE3 equ 1
-HAVE_SSSE3 equ 1
-HAVE_SSE4_1 equ 1
-HAVE_AVX equ 0
-HAVE_AVX2 equ 0
-HAVE_ALTIVEC equ 0
-HAVE_VPX_PORTS equ 1
-HAVE_STDINT_H equ 0
-HAVE_ALT_TREE_LAYOUT equ 0
-HAVE_PTHREAD_H equ 0
-HAVE_SYS_MMAN_H equ 0
-HAVE_UNISTD_H equ 0
-CONFIG_EXTERNAL_BUILD equ 1
-CONFIG_INSTALL_DOCS equ 0
-CONFIG_INSTALL_BINS equ 1
-CONFIG_INSTALL_LIBS equ 1
-CONFIG_INSTALL_SRCS equ 0
-CONFIG_USE_X86INC equ 1
-CONFIG_DEBUG equ 0
-CONFIG_GPROF equ 0
-CONFIG_GCOV equ 0
-CONFIG_RVCT equ 0
-CONFIG_GCC equ 0
-CONFIG_MSVS equ 1
-CONFIG_PIC equ 0
-CONFIG_BIG_ENDIAN equ 0
-CONFIG_CODEC_SRCS equ 0
-CONFIG_DEBUG_LIBS equ 0
-CONFIG_FAST_UNALIGNED equ 1
-CONFIG_MEM_MANAGER equ 0
-CONFIG_MEM_TRACKER equ 0
-CONFIG_MEM_CHECKS equ 0
-CONFIG_DEQUANT_TOKENS equ 0
-CONFIG_DC_RECON equ 0
-CONFIG_RUNTIME_CPU_DETECT equ 1
-CONFIG_POSTPROC equ 1
-CONFIG_VP9_POSTPROC equ 0
-CONFIG_MULTITHREAD equ 1
-CONFIG_INTERNAL_STATS equ 0
-CONFIG_VP8_ENCODER equ 1
-CONFIG_VP8_DECODER equ 1
-CONFIG_VP9_ENCODER equ 1
-CONFIG_VP9_DECODER equ 1
-CONFIG_VP8 equ 1
-CONFIG_VP9 equ 1
-CONFIG_ENCODERS equ 1
-CONFIG_DECODERS equ 1
-CONFIG_STATIC_MSVCRT equ 0
-CONFIG_SPATIAL_RESAMPLING equ 1
-CONFIG_REALTIME_ONLY equ 0
-CONFIG_ONTHEFLY_BITPACKING equ 0
-CONFIG_ERROR_CONCEALMENT equ 0
-CONFIG_SHARED equ 0
-CONFIG_STATIC equ 1
-CONFIG_SMALL equ 0
-CONFIG_POSTPROC_VISUALIZER equ 0
-CONFIG_OS_SUPPORT equ 1
-CONFIG_UNIT_TESTS equ 1
-CONFIG_WEBM_IO equ 1
-CONFIG_LIBYUV equ 1
-CONFIG_DECODE_PERF_TESTS equ 0
-CONFIG_ENCODE_PERF_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 1
-CONFIG_TEMPORAL_DENOISING equ 1
-CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
-CONFIG_VP9_HIGHBITDEPTH equ 0
-CONFIG_EXPERIMENTAL equ 0
-CONFIG_SIZE_LIMIT equ 0
-CONFIG_SPATIAL_SVC equ 0
-CONFIG_VP9_TEMPORAL_DENOISING equ 0
-CONFIG_FP_MB_STATS equ 0
-CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH equ 0
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86_64-win64-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
-/*  */
-/* Use of this source code is governed by a BSD-style license */
-/* that can be found in the LICENSE file in the root of the source */
-/* tree. An additional intellectual property rights grant can be found */
-/* in the file PATENTS.  All contributing project authors may */
-/* be found in the AUTHORS file in the root of the source tree. */
-/* This file automatically generated by configure. Do not edit! */
-#ifndef VPX_CONFIG_H
-#define VPX_CONFIG_H
-#define RESTRICT    
-#define INLINE      __forceinline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 1
-#define ARCH_PPC32 0
-#define ARCH_PPC64 0
-#define HAVE_EDSP 0
-#define HAVE_MEDIA 0
-#define HAVE_NEON 0
-#define HAVE_NEON_ASM 0
-#define HAVE_MIPS32 0
-#define HAVE_DSPR2 0
-#define HAVE_MIPS64 0
-#define HAVE_MMX 1
-#define HAVE_SSE 1
-#define HAVE_SSE2 1
-#define HAVE_SSE3 1
-#define HAVE_SSSE3 1
-#define HAVE_SSE4_1 1
-#define HAVE_AVX 0
-#define HAVE_AVX2 0
-#define HAVE_ALTIVEC 0
-#define HAVE_VPX_PORTS 1
-#define HAVE_STDINT_H 0
-#define HAVE_ALT_TREE_LAYOUT 0
-#define HAVE_PTHREAD_H 0
-#define HAVE_SYS_MMAN_H 0
-#define HAVE_UNISTD_H 0
-#define CONFIG_EXTERNAL_BUILD 1
-#define CONFIG_INSTALL_DOCS 0
-#define CONFIG_INSTALL_BINS 1
-#define CONFIG_INSTALL_LIBS 1
-#define CONFIG_INSTALL_SRCS 0
-#define CONFIG_USE_X86INC 1
-#define CONFIG_DEBUG 0
-#define CONFIG_GPROF 0
-#define CONFIG_GCOV 0
-#define CONFIG_RVCT 0
-#define CONFIG_GCC 0
-#define CONFIG_MSVS 1
-#define CONFIG_PIC 0
-#define CONFIG_BIG_ENDIAN 0
-#define CONFIG_CODEC_SRCS 0
-#define CONFIG_DEBUG_LIBS 0
-#define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_MEM_MANAGER 0
-#define CONFIG_MEM_TRACKER 0
-#define CONFIG_MEM_CHECKS 0
-#define CONFIG_DEQUANT_TOKENS 0
-#define CONFIG_DC_RECON 0
-#define CONFIG_RUNTIME_CPU_DETECT 1
-#define CONFIG_POSTPROC 1
-#define CONFIG_VP9_POSTPROC 0
-#define CONFIG_MULTITHREAD 1
-#define CONFIG_INTERNAL_STATS 0
-#define CONFIG_VP8_ENCODER 1
-#define CONFIG_VP8_DECODER 1
-#define CONFIG_VP9_ENCODER 1
-#define CONFIG_VP9_DECODER 1
-#define CONFIG_VP8 1
-#define CONFIG_VP9 1
-#define CONFIG_ENCODERS 1
-#define CONFIG_DECODERS 1
-#define CONFIG_STATIC_MSVCRT 0
-#define CONFIG_SPATIAL_RESAMPLING 1
-#define CONFIG_REALTIME_ONLY 0
-#define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 0
-#define CONFIG_SHARED 0
-#define CONFIG_STATIC 1
-#define CONFIG_SMALL 0
-#define CONFIG_POSTPROC_VISUALIZER 0
-#define CONFIG_OS_SUPPORT 1
-#define CONFIG_UNIT_TESTS 1
-#define CONFIG_WEBM_IO 1
-#define CONFIG_LIBYUV 1
-#define CONFIG_DECODE_PERF_TESTS 0
-#define CONFIG_ENCODE_PERF_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 1
-#define CONFIG_TEMPORAL_DENOISING 1
-#define CONFIG_COEFFICIENT_RANGE_CHECKING 0
-#define CONFIG_VP9_HIGHBITDEPTH 0
-#define CONFIG_EXPERIMENTAL 0
-#define CONFIG_SIZE_LIMIT 0
-#define CONFIG_SPATIAL_SVC 0
-#define CONFIG_VP9_TEMPORAL_DENOISING 0
-#define CONFIG_FP_MB_STATS 0
-#define CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH 0
-#endif /* VPX_CONFIG_H */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs12.asm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs12.asm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs12.asm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs12.asm	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,88 @@
+ARCH_ARM equ 0
+ARCH_MIPS equ 0
+ARCH_X86 equ 1
+ARCH_X86_64 equ 0
+ARCH_PPC32 equ 0
+ARCH_PPC64 equ 0
+HAVE_EDSP equ 0
+HAVE_MEDIA equ 0
+HAVE_NEON equ 0
+HAVE_NEON_ASM equ 0
+HAVE_MIPS32 equ 0
+HAVE_DSPR2 equ 0
+HAVE_MIPS64 equ 0
+HAVE_MMX equ 1
+HAVE_SSE equ 1
+HAVE_SSE2 equ 1
+HAVE_SSE3 equ 1
+HAVE_SSSE3 equ 1
+HAVE_SSE4_1 equ 1
+HAVE_AVX equ 1
+HAVE_AVX2 equ 1
+HAVE_ALTIVEC equ 0
+HAVE_VPX_PORTS equ 1
+HAVE_STDINT_H equ 0
+HAVE_ALT_TREE_LAYOUT equ 0
+HAVE_PTHREAD_H equ 0
+HAVE_SYS_MMAN_H equ 0
+HAVE_UNISTD_H equ 0
+CONFIG_EXTERNAL_BUILD equ 1
+CONFIG_INSTALL_DOCS equ 0
+CONFIG_INSTALL_BINS equ 1
+CONFIG_INSTALL_LIBS equ 1
+CONFIG_INSTALL_SRCS equ 0
+CONFIG_USE_X86INC equ 1
+CONFIG_DEBUG equ 0
+CONFIG_GPROF equ 0
+CONFIG_GCOV equ 0
+CONFIG_RVCT equ 0
+CONFIG_GCC equ 0
+CONFIG_MSVS equ 1
+CONFIG_PIC equ 0
+CONFIG_BIG_ENDIAN equ 0
+CONFIG_CODEC_SRCS equ 0
+CONFIG_DEBUG_LIBS equ 0
+CONFIG_FAST_UNALIGNED equ 1
+CONFIG_MEM_MANAGER equ 0
+CONFIG_MEM_TRACKER equ 0
+CONFIG_MEM_CHECKS equ 0
+CONFIG_DEQUANT_TOKENS equ 0
+CONFIG_DC_RECON equ 0
+CONFIG_RUNTIME_CPU_DETECT equ 1
+CONFIG_POSTPROC equ 1
+CONFIG_VP9_POSTPROC equ 0
+CONFIG_MULTITHREAD equ 1
+CONFIG_INTERNAL_STATS equ 0
+CONFIG_VP8_ENCODER equ 1
+CONFIG_VP8_DECODER equ 1
+CONFIG_VP9_ENCODER equ 1
+CONFIG_VP9_DECODER equ 1
+CONFIG_VP8 equ 1
+CONFIG_VP9 equ 1
+CONFIG_ENCODERS equ 1
+CONFIG_DECODERS equ 1
+CONFIG_STATIC_MSVCRT equ 0
+CONFIG_SPATIAL_RESAMPLING equ 1
+CONFIG_REALTIME_ONLY equ 0
+CONFIG_ONTHEFLY_BITPACKING equ 0
+CONFIG_ERROR_CONCEALMENT equ 0
+CONFIG_SHARED equ 0
+CONFIG_STATIC equ 1
+CONFIG_SMALL equ 0
+CONFIG_POSTPROC_VISUALIZER equ 0
+CONFIG_OS_SUPPORT equ 1
+CONFIG_UNIT_TESTS equ 1
+CONFIG_WEBM_IO equ 1
+CONFIG_LIBYUV equ 1
+CONFIG_DECODE_PERF_TESTS equ 0
+CONFIG_ENCODE_PERF_TESTS equ 0
+CONFIG_MULTI_RES_ENCODING equ 1
+CONFIG_TEMPORAL_DENOISING equ 1
+CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
+CONFIG_VP9_HIGHBITDEPTH equ 0
+CONFIG_EXPERIMENTAL equ 0
+CONFIG_SIZE_LIMIT equ 0
+CONFIG_SPATIAL_SVC equ 0
+CONFIG_VP9_TEMPORAL_DENOISING equ 0
+CONFIG_FP_MB_STATS equ 0
+CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH equ 0
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs12.h	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,101 @@
+/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
+/*  */
+/* Use of this source code is governed by a BSD-style license */
+/* that can be found in the LICENSE file in the root of the source */
+/* tree. An additional intellectual property rights grant can be found */
+/* in the file PATENTS.  All contributing project authors may */
+/* be found in the AUTHORS file in the root of the source tree. */
+/* This file automatically generated by configure. Do not edit! */
+#ifndef VPX_CONFIG_H
+#define VPX_CONFIG_H
+#define RESTRICT    
+#define INLINE      __forceinline
+#define ARCH_ARM 0
+#define ARCH_MIPS 0
+#define ARCH_X86 1
+#define ARCH_X86_64 0
+#define ARCH_PPC32 0
+#define ARCH_PPC64 0
+#define HAVE_EDSP 0
+#define HAVE_MEDIA 0
+#define HAVE_NEON 0
+#define HAVE_NEON_ASM 0
+#define HAVE_MIPS32 0
+#define HAVE_DSPR2 0
+#define HAVE_MIPS64 0
+#define HAVE_MMX 1
+#define HAVE_SSE 1
+#define HAVE_SSE2 1
+#define HAVE_SSE3 1
+#define HAVE_SSSE3 1
+#define HAVE_SSE4_1 1
+#define HAVE_AVX 1
+#define HAVE_AVX2 1
+#define HAVE_ALTIVEC 0
+#define HAVE_VPX_PORTS 1
+#define HAVE_STDINT_H 0
+#define HAVE_ALT_TREE_LAYOUT 0
+#define HAVE_PTHREAD_H 0
+#define HAVE_SYS_MMAN_H 0
+#define HAVE_UNISTD_H 0
+#define CONFIG_EXTERNAL_BUILD 1
+#define CONFIG_INSTALL_DOCS 0
+#define CONFIG_INSTALL_BINS 1
+#define CONFIG_INSTALL_LIBS 1
+#define CONFIG_INSTALL_SRCS 0
+#define CONFIG_USE_X86INC 1
+#define CONFIG_DEBUG 0
+#define CONFIG_GPROF 0
+#define CONFIG_GCOV 0
+#define CONFIG_RVCT 0
+#define CONFIG_GCC 0
+#define CONFIG_MSVS 1
+#define CONFIG_PIC 0
+#define CONFIG_BIG_ENDIAN 0
+#define CONFIG_CODEC_SRCS 0
+#define CONFIG_DEBUG_LIBS 0
+#define CONFIG_FAST_UNALIGNED 1
+#define CONFIG_MEM_MANAGER 0
+#define CONFIG_MEM_TRACKER 0
+#define CONFIG_MEM_CHECKS 0
+#define CONFIG_DEQUANT_TOKENS 0
+#define CONFIG_DC_RECON 0
+#define CONFIG_RUNTIME_CPU_DETECT 1
+#define CONFIG_POSTPROC 1
+#define CONFIG_VP9_POSTPROC 0
+#define CONFIG_MULTITHREAD 1
+#define CONFIG_INTERNAL_STATS 0
+#define CONFIG_VP8_ENCODER 1
+#define CONFIG_VP8_DECODER 1
+#define CONFIG_VP9_ENCODER 1
+#define CONFIG_VP9_DECODER 1
+#define CONFIG_VP8 1
+#define CONFIG_VP9 1
+#define CONFIG_ENCODERS 1
+#define CONFIG_DECODERS 1
+#define CONFIG_STATIC_MSVCRT 0
+#define CONFIG_SPATIAL_RESAMPLING 1
+#define CONFIG_REALTIME_ONLY 0
+#define CONFIG_ONTHEFLY_BITPACKING 0
+#define CONFIG_ERROR_CONCEALMENT 0
+#define CONFIG_SHARED 0
+#define CONFIG_STATIC 1
+#define CONFIG_SMALL 0
+#define CONFIG_POSTPROC_VISUALIZER 0
+#define CONFIG_OS_SUPPORT 1
+#define CONFIG_UNIT_TESTS 1
+#define CONFIG_WEBM_IO 1
+#define CONFIG_LIBYUV 1
+#define CONFIG_DECODE_PERF_TESTS 0
+#define CONFIG_ENCODE_PERF_TESTS 0
+#define CONFIG_MULTI_RES_ENCODING 1
+#define CONFIG_TEMPORAL_DENOISING 1
+#define CONFIG_COEFFICIENT_RANGE_CHECKING 0
+#define CONFIG_VP9_HIGHBITDEPTH 0
+#define CONFIG_EXPERIMENTAL 0
+#define CONFIG_SIZE_LIMIT 0
+#define CONFIG_SPATIAL_SVC 0
+#define CONFIG_VP9_TEMPORAL_DENOISING 0
+#define CONFIG_FP_MB_STATS 0
+#define CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH 0
+#endif /* VPX_CONFIG_H */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs8.asm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs8.asm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs8.asm	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-ARCH_ARM equ 0
-ARCH_MIPS equ 0
-ARCH_X86 equ 1
-ARCH_X86_64 equ 0
-ARCH_PPC32 equ 0
-ARCH_PPC64 equ 0
-HAVE_EDSP equ 0
-HAVE_MEDIA equ 0
-HAVE_NEON equ 0
-HAVE_NEON_ASM equ 0
-HAVE_MIPS32 equ 0
-HAVE_DSPR2 equ 0
-HAVE_MIPS64 equ 0
-HAVE_MMX equ 1
-HAVE_SSE equ 1
-HAVE_SSE2 equ 1
-HAVE_SSE3 equ 1
-HAVE_SSSE3 equ 1
-HAVE_SSE4_1 equ 1
-HAVE_AVX equ 0
-HAVE_AVX2 equ 0
-HAVE_ALTIVEC equ 0
-HAVE_VPX_PORTS equ 1
-HAVE_STDINT_H equ 0
-HAVE_ALT_TREE_LAYOUT equ 0
-HAVE_PTHREAD_H equ 0
-HAVE_SYS_MMAN_H equ 0
-HAVE_UNISTD_H equ 0
-CONFIG_EXTERNAL_BUILD equ 1
-CONFIG_INSTALL_DOCS equ 0
-CONFIG_INSTALL_BINS equ 1
-CONFIG_INSTALL_LIBS equ 1
-CONFIG_INSTALL_SRCS equ 0
-CONFIG_USE_X86INC equ 1
-CONFIG_DEBUG equ 0
-CONFIG_GPROF equ 0
-CONFIG_GCOV equ 0
-CONFIG_RVCT equ 0
-CONFIG_GCC equ 0
-CONFIG_MSVS equ 1
-CONFIG_PIC equ 0
-CONFIG_BIG_ENDIAN equ 0
-CONFIG_CODEC_SRCS equ 0
-CONFIG_DEBUG_LIBS equ 0
-CONFIG_FAST_UNALIGNED equ 1
-CONFIG_MEM_MANAGER equ 0
-CONFIG_MEM_TRACKER equ 0
-CONFIG_MEM_CHECKS equ 0
-CONFIG_DEQUANT_TOKENS equ 0
-CONFIG_DC_RECON equ 0
-CONFIG_RUNTIME_CPU_DETECT equ 1
-CONFIG_POSTPROC equ 1
-CONFIG_VP9_POSTPROC equ 0
-CONFIG_MULTITHREAD equ 1
-CONFIG_INTERNAL_STATS equ 0
-CONFIG_VP8_ENCODER equ 1
-CONFIG_VP8_DECODER equ 1
-CONFIG_VP9_ENCODER equ 1
-CONFIG_VP9_DECODER equ 1
-CONFIG_VP8 equ 1
-CONFIG_VP9 equ 1
-CONFIG_ENCODERS equ 1
-CONFIG_DECODERS equ 1
-CONFIG_STATIC_MSVCRT equ 0
-CONFIG_SPATIAL_RESAMPLING equ 1
-CONFIG_REALTIME_ONLY equ 0
-CONFIG_ONTHEFLY_BITPACKING equ 0
-CONFIG_ERROR_CONCEALMENT equ 0
-CONFIG_SHARED equ 0
-CONFIG_STATIC equ 1
-CONFIG_SMALL equ 0
-CONFIG_POSTPROC_VISUALIZER equ 0
-CONFIG_OS_SUPPORT equ 1
-CONFIG_UNIT_TESTS equ 1
-CONFIG_WEBM_IO equ 1
-CONFIG_LIBYUV equ 1
-CONFIG_DECODE_PERF_TESTS equ 0
-CONFIG_ENCODE_PERF_TESTS equ 0
-CONFIG_MULTI_RES_ENCODING equ 1
-CONFIG_TEMPORAL_DENOISING equ 1
-CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
-CONFIG_VP9_HIGHBITDEPTH equ 0
-CONFIG_EXPERIMENTAL equ 0
-CONFIG_SIZE_LIMIT equ 0
-CONFIG_SPATIAL_SVC equ 0
-CONFIG_VP9_TEMPORAL_DENOISING equ 0
-CONFIG_FP_MB_STATS equ 0
-CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH equ 0
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_config_x86-win32-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_config_x86-win32-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
-/*  */
-/* Use of this source code is governed by a BSD-style license */
-/* that can be found in the LICENSE file in the root of the source */
-/* tree. An additional intellectual property rights grant can be found */
-/* in the file PATENTS.  All contributing project authors may */
-/* be found in the AUTHORS file in the root of the source tree. */
-/* This file automatically generated by configure. Do not edit! */
-#ifndef VPX_CONFIG_H
-#define VPX_CONFIG_H
-#define RESTRICT    
-#define INLINE      __forceinline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 1
-#define ARCH_X86_64 0
-#define ARCH_PPC32 0
-#define ARCH_PPC64 0
-#define HAVE_EDSP 0
-#define HAVE_MEDIA 0
-#define HAVE_NEON 0
-#define HAVE_NEON_ASM 0
-#define HAVE_MIPS32 0
-#define HAVE_DSPR2 0
-#define HAVE_MIPS64 0
-#define HAVE_MMX 1
-#define HAVE_SSE 1
-#define HAVE_SSE2 1
-#define HAVE_SSE3 1
-#define HAVE_SSSE3 1
-#define HAVE_SSE4_1 1
-#define HAVE_AVX 0
-#define HAVE_AVX2 0
-#define HAVE_ALTIVEC 0
-#define HAVE_VPX_PORTS 1
-#define HAVE_STDINT_H 0
-#define HAVE_ALT_TREE_LAYOUT 0
-#define HAVE_PTHREAD_H 0
-#define HAVE_SYS_MMAN_H 0
-#define HAVE_UNISTD_H 0
-#define CONFIG_EXTERNAL_BUILD 1
-#define CONFIG_INSTALL_DOCS 0
-#define CONFIG_INSTALL_BINS 1
-#define CONFIG_INSTALL_LIBS 1
-#define CONFIG_INSTALL_SRCS 0
-#define CONFIG_USE_X86INC 1
-#define CONFIG_DEBUG 0
-#define CONFIG_GPROF 0
-#define CONFIG_GCOV 0
-#define CONFIG_RVCT 0
-#define CONFIG_GCC 0
-#define CONFIG_MSVS 1
-#define CONFIG_PIC 0
-#define CONFIG_BIG_ENDIAN 0
-#define CONFIG_CODEC_SRCS 0
-#define CONFIG_DEBUG_LIBS 0
-#define CONFIG_FAST_UNALIGNED 1
-#define CONFIG_MEM_MANAGER 0
-#define CONFIG_MEM_TRACKER 0
-#define CONFIG_MEM_CHECKS 0
-#define CONFIG_DEQUANT_TOKENS 0
-#define CONFIG_DC_RECON 0
-#define CONFIG_RUNTIME_CPU_DETECT 1
-#define CONFIG_POSTPROC 1
-#define CONFIG_VP9_POSTPROC 0
-#define CONFIG_MULTITHREAD 1
-#define CONFIG_INTERNAL_STATS 0
-#define CONFIG_VP8_ENCODER 1
-#define CONFIG_VP8_DECODER 1
-#define CONFIG_VP9_ENCODER 1
-#define CONFIG_VP9_DECODER 1
-#define CONFIG_VP8 1
-#define CONFIG_VP9 1
-#define CONFIG_ENCODERS 1
-#define CONFIG_DECODERS 1
-#define CONFIG_STATIC_MSVCRT 0
-#define CONFIG_SPATIAL_RESAMPLING 1
-#define CONFIG_REALTIME_ONLY 0
-#define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 0
-#define CONFIG_SHARED 0
-#define CONFIG_STATIC 1
-#define CONFIG_SMALL 0
-#define CONFIG_POSTPROC_VISUALIZER 0
-#define CONFIG_OS_SUPPORT 1
-#define CONFIG_UNIT_TESTS 1
-#define CONFIG_WEBM_IO 1
-#define CONFIG_LIBYUV 1
-#define CONFIG_DECODE_PERF_TESTS 0
-#define CONFIG_ENCODE_PERF_TESTS 0
-#define CONFIG_MULTI_RES_ENCODING 1
-#define CONFIG_TEMPORAL_DENOISING 1
-#define CONFIG_COEFFICIENT_RANGE_CHECKING 0
-#define CONFIG_VP9_HIGHBITDEPTH 0
-#define CONFIG_EXPERIMENTAL 0
-#define CONFIG_SIZE_LIMIT 0
-#define CONFIG_SPATIAL_SVC 0
-#define CONFIG_VP9_TEMPORAL_DENOISING 0
-#define CONFIG_FP_MB_STATS 0
-#define CONFIG_EMULATE_HARDWARE_HIGHBITDEPTH 0
-#endif /* VPX_CONFIG_H */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd.h	2015-02-28 15:03:05.000000000 +0000
@@ -9,7 +9,7 @@
 #if defined(_WIN64)
 /* 64 bit Windows */
 #ifdef _MSC_VER
-#include "vpx_scale_rtcd_x86_64-win64-vs8.h"
+#include "vpx_scale_rtcd_x86_64-win64-vs12.h"
 #else
 #include "vpx_scale_rtcd_x86_64-win64-gcc.h"
 #endif
@@ -17,7 +17,7 @@
 #elif defined(_WIN32)
 /* 32 bit Windows, MSVC. */
 #ifdef _MSC_VER
-#include "vpx_scale_rtcd_x86-win32-vs8.h"
+#include "vpx_scale_rtcd_x86-win32-vs12.h"
 #else
 #include "vpx_scale_rtcd_x86-win32-gcc.h"
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs12.h	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,69 @@
+#ifndef VPX_SCALE_RTCD_H_
+#define VPX_SCALE_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+struct yv12_buffer_config;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c
+
+void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c
+
+void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c
+
+void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c
+
+void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c
+
+void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c
+
+void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c
+
+void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
+#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c
+
+void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf);
+#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c
+
+void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf);
+#define vp9_extend_frame_borders vp9_extend_frame_borders_c
+
+void vp9_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf);
+#define vp9_extend_frame_inner_borders vp9_extend_frame_inner_borders_c
+
+void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
+#define vpx_yv12_copy_y vpx_yv12_copy_y_c
+
+void vpx_scale_rtcd(void);
+
+#ifdef RTCD_C
+#include "vpx_ports/x86.h"
+static void setup_rtcd_internal(void)
+{
+    int flags = x86_simd_caps();
+
+    (void)flags;
+
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86_64-win64-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#ifndef VPX_SCALE_RTCD_H_
-#define VPX_SCALE_RTCD_H_
-
-#ifdef RTCD_C
-#define RTCD_EXTERN
-#else
-#define RTCD_EXTERN extern
-#endif
-
-struct yv12_buffer_config;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c
-
-void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c
-
-void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c
-
-void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c
-
-void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c
-
-void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c
-
-void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c
-
-void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
-#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c
-
-void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf);
-#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c
-
-void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf);
-#define vp9_extend_frame_borders vp9_extend_frame_borders_c
-
-void vp9_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf);
-#define vp9_extend_frame_inner_borders vp9_extend_frame_inner_borders_c
-
-void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
-#define vpx_yv12_copy_y vpx_yv12_copy_y_c
-
-void vpx_scale_rtcd(void);
-
-#ifdef RTCD_C
-#include "vpx_ports/x86.h"
-static void setup_rtcd_internal(void)
-{
-    int flags = x86_simd_caps();
-
-    (void)flags;
-
-}
-#endif
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs12.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs12.h	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,69 @@
+#ifndef VPX_SCALE_RTCD_H_
+#define VPX_SCALE_RTCD_H_
+
+#ifdef RTCD_C
+#define RTCD_EXTERN
+#else
+#define RTCD_EXTERN extern
+#endif
+
+struct yv12_buffer_config;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c
+
+void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c
+
+void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
+#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c
+
+void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c
+
+void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c
+
+void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c
+
+void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
+#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c
+
+void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
+#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c
+
+void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf);
+#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c
+
+void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf);
+#define vp9_extend_frame_borders vp9_extend_frame_borders_c
+
+void vp9_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf);
+#define vp9_extend_frame_inner_borders vp9_extend_frame_inner_borders_c
+
+void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
+#define vpx_yv12_copy_y vpx_yv12_copy_y_c
+
+void vpx_scale_rtcd(void);
+
+#ifdef RTCD_C
+#include "vpx_ports/x86.h"
+static void setup_rtcd_internal(void)
+{
+    int flags = x86_simd_caps();
+
+    (void)flags;
+
+}
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs8.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs8.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs8.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/libvpx/vpx_scale_rtcd_x86-win32-vs8.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#ifndef VPX_SCALE_RTCD_H_
-#define VPX_SCALE_RTCD_H_
-
-#ifdef RTCD_C
-#define RTCD_EXTERN
-#else
-#define RTCD_EXTERN extern
-#endif
-
-struct yv12_buffer_config;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c
-
-void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c
-
-void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
-#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c
-
-void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c
-
-void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c
-
-void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c
-
-void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
-#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c
-
-void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
-#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c
-
-void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf);
-#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c
-
-void vp9_extend_frame_borders_c(struct yv12_buffer_config *ybf);
-#define vp9_extend_frame_borders vp9_extend_frame_borders_c
-
-void vp9_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf);
-#define vp9_extend_frame_inner_borders vp9_extend_frame_inner_borders_c
-
-void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
-#define vpx_yv12_copy_y vpx_yv12_copy_y_c
-
-void vpx_scale_rtcd(void);
-
-#ifdef RTCD_C
-#include "vpx_ports/x86.h"
-static void setup_rtcd_internal(void)
-{
-    int flags = x86_simd_caps();
-
-    (void)flags;
-
-}
-#endif
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/mtransport/nr_socket_prsock.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/mtransport/nr_socket_prsock.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/mtransport/nr_socket_prsock.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/mtransport/nr_socket_prsock.h	2015-02-28 15:03:05.000000000 +0000
@@ -199,7 +199,7 @@
     NR_CLOSED,
   };
 
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(NrSocketIpc)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(NrSocketIpc, MOZ_OVERRIDE)
 
   NS_IMETHODIMP CallListenerError(const nsACString &message,
                                   const nsACString &filename,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c	2015-02-28 15:03:05.000000000 +0000
@@ -45,13 +45,11 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #ifndef ANDROID
-#include <sys/sysctl.h>
 #include <sys/syslog.h>
 #else
 #include <syslog.h>
 /* Work around an Android NDK < r8c bug */
 #undef __unused
-#include <linux/sysctl.h>
 #endif
 #ifndef LINUX
 #include <net/if.h>
@@ -122,6 +120,7 @@
  */
 
 #include <err.h>
+#include <sys/sysctl.h>
 
 static void stun_rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
 static int stun_grab_addrs(char *name, int addrcount,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/mtransport/transportlayerdtls.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/mtransport/transportlayerdtls.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/mtransport/transportlayerdtls.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/mtransport/transportlayerdtls.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -501,7 +501,7 @@
   // 1.0 for stream modes.
   SSLVersionRange version_range = {
     SSL_LIBRARY_VERSION_TLS_1_1,
-    SSL_LIBRARY_VERSION_TLS_1_1 // version intolerance; bug 1052610
+    SSL_LIBRARY_VERSION_TLS_1_2
   };
 
   rv = SSL_VersionRangeSet(ssl_fd, &version_range);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -1107,7 +1107,8 @@
 MediaConduitErrorCode
 WebrtcVideoConduit::ReceivedRTPPacket(const void *data, int len)
 {
-  CSFLogDebug(logTag, "%s: Channel %d, Len %d ", __FUNCTION__, mChannel, len);
+  CSFLogDebug(logTag, "%s: seq# %u, Channel %d, Len %d ", __FUNCTION__,
+              (uint16_t) ntohs(((uint16_t*) data)[1]), mChannel, len);
 
   // Media Engine should be receiving already.
   if(mEngineReceiving)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -200,14 +200,11 @@
       return;
     }
 
-    CSFLogInfo(logTag, "Returning success for OnAddStream()");
-    // We are running on main thread here so we shouldn't have a race
-    // on this callback
-
     nsTArray<nsRefPtr<MediaStreamTrack>> tracks;
     aStream->GetTracks(tracks);
 
-    bool newStream = true;
+    std::string streamId = PeerConnectionImpl::GetStreamId(*aStream);
+    bool notifyStream = true;
 
     for (size_t i = 0; i < tracks.Length(); i++) {
       std::string trackId;
@@ -215,7 +212,7 @@
       // track. It would be nice if we could specify this along with the numeric
       // track id from the start, but we're stuck doing this fixup after the
       // fact.
-      nsresult rv = wrapper.impl()->GetRemoteTrackId(aStream,
+      nsresult rv = wrapper.impl()->GetRemoteTrackId(streamId,
                                                      tracks[i]->GetTrackID(),
                                                      &trackId);
 
@@ -232,16 +229,15 @@
 
       if (origTrackId == trackId) {
         // Pre-existing track
-        newStream = false;
+        notifyStream = false;
         continue;
       }
 
       tracks[i]->AssignId(NS_ConvertUTF8toUTF16(trackId.c_str()));
 
       JSErrorResult jrv;
+      CSFLogInfo(logTag, "Calling OnAddTrack(%s)", trackId.c_str());
       mObserver->OnAddTrack(*tracks[i], jrv);
-      CSFLogInfo(logTag, "Calling OnAddTrack(%s)",
-                         PeerConnectionImpl::GetTrackId(*tracks[i]).c_str());
       if (jrv.Failed()) {
         CSFLogError(logTag, ": OnAddTrack(%u) failed! Error: %u",
                     static_cast<unsigned>(i),
@@ -249,14 +245,14 @@
       }
     }
 
-    if (newStream) {
+    if (notifyStream) {
       // Start currentTime from the point where this stream was successfully
       // returned.
       aStream->SetLogicalStreamStartTime(
           aStream->GetStream()->GetCurrentTime());
 
       JSErrorResult rv;
-      CSFLogInfo(logTag, "Calling OnAddStream");
+      CSFLogInfo(logTag, "Calling OnAddStream(%s)", streamId.c_str());
       mObserver->OnAddStream(*aStream, rv);
       if (rv.Failed()) {
         CSFLogError(logTag, ": OnAddStream() failed! Error: %u",
@@ -1663,6 +1659,12 @@
           return NS_OK;
         }
         CSFLogDebug(logTag, "Added remote stream %s", info->GetId().c_str());
+
+#ifdef MOZILLA_INTERNAL_API
+        info->GetMediaStream()->AssignId(NS_ConvertUTF8toUTF16(streamId.c_str()));
+#else
+        info->GetMediaStream()->AssignId((streamId));
+#endif
       }
 
       size_t numNewAudioTracks = 0;
@@ -1929,7 +1931,7 @@
 
 #ifdef MOZILLA_INTERNAL_API
 nsresult
-PeerConnectionImpl::GetRemoteTrackId(DOMMediaStream* mediaStream,
+PeerConnectionImpl::GetRemoteTrackId(const std::string streamId,
                                      TrackID numericTrackId,
                                      std::string* trackId) const
 {
@@ -1937,7 +1939,7 @@
     return NS_ERROR_UNEXPECTED;
   }
 
-  return mMedia->GetRemoteTrackId(mediaStream, numericTrackId, trackId);
+  return mMedia->GetRemoteTrackId(streamId, numericTrackId, trackId);
 }
 #endif
 
@@ -1953,6 +1955,18 @@
 #endif
 }
 
+std::string
+PeerConnectionImpl::GetStreamId(const DOMMediaStream& aStream)
+{
+#ifdef MOZILLA_INTERNAL_API
+  nsString wideStreamId;
+  aStream.GetId(wideStreamId);
+  return NS_ConvertUTF16toUTF8(wideStreamId).get();
+#else
+  return aStream.GetId();
+#endif
+}
+
 nsresult
 PeerConnectionImpl::AddTrack(MediaStreamTrack& aTrack,
                              const Sequence<OwningNonNull<DOMMediaStream>>& aStreams)
@@ -1976,10 +1990,9 @@
   }
   uint32_t num = mMedia->LocalStreamsLength();
 
-  std::string streamId;
+  std::string streamId = PeerConnectionImpl::GetStreamId(aMediaStream);
   std::string trackId = PeerConnectionImpl::GetTrackId(aTrack);
-  // TODO(bug 1089798): streamId should really come from the MS.
-  nsresult res = mMedia->AddTrack(&aMediaStream, &streamId, trackId);
+  nsresult res = mMedia->AddTrack(&aMediaStream, streamId, trackId);
   if (NS_FAILED(res)) {
     return res;
   }
@@ -2043,8 +2056,8 @@
     return NS_ERROR_INVALID_ARG;
   }
 
-  nsRefPtr<LocalSourceStreamInfo> info =
-    media()->GetLocalStreamByDomStream(*stream);
+  std::string streamId = PeerConnectionImpl::GetStreamId(*stream);
+  nsRefPtr<LocalSourceStreamInfo> info = media()->GetLocalStreamById(streamId);
 
   if (!info) {
     CSFLogError(logTag, "%s: Unknown stream", __FUNCTION__);
@@ -2114,8 +2127,8 @@
   //  TrackID thisID = aThisTrack.GetTrackID();
   //
 
-  nsRefPtr<LocalSourceStreamInfo> info =
-    media()->GetLocalStreamByDomStream(aStream);
+  std::string streamId = PeerConnectionImpl::GetStreamId(aStream);
+  nsRefPtr<LocalSourceStreamInfo> info = media()->GetLocalStreamById(streamId);
 
   if (!info || !info->HasTrack(origTrackId)) {
     CSFLogError(logTag, "Track to replace (%s) was never added",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h	2015-02-28 15:03:05.000000000 +0000
@@ -598,11 +598,12 @@
   // PeerConnectionMedia can't do it because it doesn't know about principals
   virtual void PrincipalChanged(DOMMediaStream* aMediaStream) MOZ_OVERRIDE;
 
-  nsresult GetRemoteTrackId(DOMMediaStream* mediaStream,
+  nsresult GetRemoteTrackId(const std::string streamId,
                             TrackID numericTrackId,
                             std::string* trackId) const;
 #endif
 
+  static std::string GetStreamId(const DOMMediaStream& aStream);
   static std::string GetTrackId(const dom::MediaStreamTrack& track);
 
 private:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -581,7 +581,7 @@
 
 nsresult
 PeerConnectionMedia::AddTrack(DOMMediaStream* aMediaStream,
-                              std::string* streamId,
+                              const std::string& streamId,
                               const std::string& trackId)
 {
   ASSERT_ON_THREAD(mMainThread);
@@ -594,21 +594,14 @@
   CSFLogDebug(logTag, "%s: MediaStream: %p", __FUNCTION__, aMediaStream);
 
   nsRefPtr<LocalSourceStreamInfo> localSourceStream =
-    GetLocalStreamByDomStream(*aMediaStream);
+    GetLocalStreamById(streamId);
 
   if (!localSourceStream) {
-    std::string id;
-    if (!mUuidGen->Generate(&id)) {
-      CSFLogError(logTag, "Failed to generate UUID for stream");
-      return NS_ERROR_FAILURE;
-    }
-
-    localSourceStream = new LocalSourceStreamInfo(aMediaStream, this, id);
+    localSourceStream = new LocalSourceStreamInfo(aMediaStream, this, streamId);
     mLocalSourceStreams.AppendElement(localSourceStream);
   }
 
   localSourceStream->AddTrack(trackId);
-  *streamId = localSourceStream->GetId();
   return NS_OK;
 }
 
@@ -621,20 +614,15 @@
   CSFLogDebug(logTag, "%s: stream: %s track: %s", __FUNCTION__,
                       streamId.c_str(), trackId.c_str());
 
-  size_t i;
-  for (i = 0; i < mLocalSourceStreams.Length(); ++i) {
-    if (mLocalSourceStreams[i]->GetId() == streamId) {
-      break;
-    }
-  }
-
-  if (i == mLocalSourceStreams.Length()) {
+  nsRefPtr<LocalSourceStreamInfo> localSourceStream =
+    GetLocalStreamById(streamId);
+  if (!localSourceStream) {
     return NS_ERROR_ILLEGAL_VALUE;
   }
 
-  mLocalSourceStreams[i]->RemoveTrack(trackId);
-  if (!(mLocalSourceStreams[i]->GetTrackCount())) {
-    mLocalSourceStreams.RemoveElementAt(i);
+  localSourceStream->RemoveTrack(trackId);
+  if (!localSourceStream->GetTrackCount()) {
+    mLocalSourceStreams.RemoveElement(localSourceStream);
   }
   return NS_OK;
 }
@@ -648,32 +636,27 @@
   CSFLogDebug(logTag, "%s: stream: %s track: %s", __FUNCTION__,
                       streamId.c_str(), trackId.c_str());
 
-  size_t i;
-  for (i = 0; i < mRemoteSourceStreams.Length(); ++i) {
-    if (mRemoteSourceStreams[i]->GetId() == streamId) {
-      break;
-    }
-  }
-
-  if (i == mRemoteSourceStreams.Length()) {
+  nsRefPtr<RemoteSourceStreamInfo> remoteSourceStream =
+    GetRemoteStreamById(streamId);
+  if (!remoteSourceStream) {
     return NS_ERROR_ILLEGAL_VALUE;
   }
 
-  mRemoteSourceStreams[i]->RemoveTrack(trackId);
-  if (!(mRemoteSourceStreams[i]->GetTrackCount())) {
-    mRemoteSourceStreams.RemoveElementAt(i);
+  remoteSourceStream->RemoveTrack(trackId);
+  if (!remoteSourceStream->GetTrackCount()) {
+    mRemoteSourceStreams.RemoveElement(remoteSourceStream);
   }
   return NS_OK;
 }
 
 nsresult
-PeerConnectionMedia::GetRemoteTrackId(DOMMediaStream* mediaStream,
+PeerConnectionMedia::GetRemoteTrackId(const std::string streamId,
                                       TrackID numericTrackId,
                                       std::string* trackId) const
 {
   auto* ncThis = const_cast<PeerConnectionMedia*>(this);
   const RemoteSourceStreamInfo* info =
-    ncThis->GetRemoteStreamByDomStream(*mediaStream);
+    ncThis->GetRemoteStreamById(streamId);
 
   if (!info) {
     CSFLogError(logTag, "%s: Could not find stream info", __FUNCTION__);
@@ -776,35 +759,6 @@
     }
   }
 
-  MOZ_ASSERT(false);
-  return nullptr;
-}
-
-LocalSourceStreamInfo*
-PeerConnectionMedia::GetLocalStreamByDomStream(const DOMMediaStream& stream)
-{
-  ASSERT_ON_THREAD(mMainThread);
-  for (size_t i = 0; i < mLocalSourceStreams.Length(); ++i) {
-    if (&stream == mLocalSourceStreams[i]->GetMediaStream()) {
-      return mLocalSourceStreams[i];
-    }
-  }
-
-  return nullptr;
-}
-
-RemoteSourceStreamInfo*
-PeerConnectionMedia::GetRemoteStreamByDomStream(
-    const DOMMediaStream& stream)
-{
-  ASSERT_ON_THREAD(mMainThread);
-  for (size_t i = 0; i < mRemoteSourceStreams.Length(); ++i) {
-    if (&stream == mRemoteSourceStreams[i]->GetMediaStream()) {
-      return mRemoteSourceStreams[i];
-    }
-  }
-
-  MOZ_ASSERT(false);
   return nullptr;
 }
 
@@ -826,10 +780,6 @@
     }
   }
 
-  // This does not have a MOZ_ASSERT like GetLocalStreamById because in the
-  // case of local streams, the stream id and stream info are created
-  // simultaneously, whereas in the remote case the stream id exists first,
-  // meaning we have to be able to check.
   return nullptr;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.h	2015-02-28 15:03:05.000000000 +0000
@@ -241,10 +241,8 @@
   nsresult UpdateMediaPipelines(const JsepSession& session);
 
   // Add a track (main thread only)
-  // TODO(bug 1089798): Once DOMMediaStream has an id field, use it instead of
-  // letting PCMedia choose a streamId
   nsresult AddTrack(DOMMediaStream* aMediaStream,
-                    std::string* streamId,
+                    const std::string& streamId,
                     const std::string& trackId);
 
   nsresult RemoveLocalTrack(const std::string& streamId,
@@ -252,7 +250,7 @@
   nsresult RemoveRemoteTrack(const std::string& streamId,
                             const std::string& trackId);
 
-  nsresult GetRemoteTrackId(DOMMediaStream* mediaStream,
+  nsresult GetRemoteTrackId(const std::string streamId,
                             TrackID numericTrackId,
                             std::string* trackId) const;
 
@@ -263,8 +261,6 @@
   }
   LocalSourceStreamInfo* GetLocalStreamByIndex(int index);
   LocalSourceStreamInfo* GetLocalStreamById(const std::string& id);
-  LocalSourceStreamInfo* GetLocalStreamByDomStream(
-      const DOMMediaStream& stream);
 
   // Get a specific remote stream
   uint32_t RemoteStreamsLength()
@@ -274,8 +270,6 @@
 
   RemoteSourceStreamInfo* GetRemoteStreamByIndex(size_t index);
   RemoteSourceStreamInfo* GetRemoteStreamById(const std::string& id);
-  RemoteSourceStreamInfo* GetRemoteStreamByDomStream(
-      const DOMMediaStream& stream);
 
   // Add a remote stream.
   nsresult AddRemoteStream(nsRefPtr<RemoteSourceStreamInfo> aInfo);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/test/FakeMediaStreams.h	2015-02-28 15:03:05.000000000 +0000
@@ -265,7 +265,13 @@
   explicit Fake_DOMMediaStream(Fake_MediaStream *stream = nullptr)
     : mMediaStream(stream ? stream : new Fake_MediaStream())
     , mVideoTrack(new Fake_MediaStreamTrack(true, this))
-    , mAudioTrack(new Fake_MediaStreamTrack(false, this)) {}
+    , mAudioTrack(new Fake_MediaStreamTrack(false, this))
+    {
+      static size_t counter = 0;
+      std::ostringstream os;
+      os << counter++;
+      mID = os.str();
+    }
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
@@ -285,6 +291,8 @@
   virtual void RemoveDirectListener(Fake_MediaStreamListener *aListener) {}
 
   Fake_MediaStream *GetStream() { return mMediaStream; }
+  std::string GetId() const { return mID; }
+  void AssignId(const std::string& id) { mID = id; }
 
   // Hints to tell the SDP generator about whether this
   // MediaStream probably has audio and/or video
@@ -343,6 +351,8 @@
   uint32_t mHintContents;
   nsRefPtr<Fake_MediaStreamTrack> mVideoTrack;
   nsRefPtr<Fake_MediaStreamTrack> mAudioTrack;
+
+  std::string mID;
 };
 
 class Fake_MediaStreamBase : public Fake_MediaStream {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/test/jsep_session_unittest.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/test/jsep_session_unittest.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/test/jsep_session_unittest.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/test/jsep_session_unittest.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -127,7 +127,7 @@
   }
 
   void
-  AddTracks(JsepSessionImpl* side)
+  AddTracks(JsepSessionImpl& side)
   {
     // Add tracks.
     if (types.empty()) {
@@ -142,7 +142,7 @@
   }
 
   void
-  AddTracks(JsepSessionImpl* side, const std::string& mediatypes)
+  AddTracks(JsepSessionImpl& side, const std::string& mediatypes)
   {
     AddTracks(side, BuildTypes(mediatypes));
   }
@@ -178,7 +178,7 @@
   }
 
   void
-  AddTracks(JsepSessionImpl* side,
+  AddTracks(JsepSessionImpl& side,
             const std::vector<SdpMediaSection::MediaType>& mediatypes)
   {
     FakeUuidGenerator uuid_gen;
@@ -187,14 +187,89 @@
 
     ASSERT_TRUE(uuid_gen.Generate(&stream_id));
 
+    AddTracksToStream(side, stream_id, mediatypes);
+  }
+
+  void
+  AddTracksToStream(JsepSessionImpl& side,
+                    const std::string stream_id,
+                    const std::string& mediatypes)
+  {
+    AddTracksToStream(side, stream_id, BuildTypes(mediatypes));
+  }
+
+  void
+  AddTracksToStream(JsepSessionImpl& side,
+                    const std::string stream_id,
+                    const std::vector<SdpMediaSection::MediaType>& mediatypes)
+
+  {
+    FakeUuidGenerator uuid_gen;
+    std::string track_id;
+
     for (auto track = mediatypes.begin(); track != mediatypes.end(); ++track) {
       ASSERT_TRUE(uuid_gen.Generate(&track_id));
 
       RefPtr<JsepTrack> mst(new JsepTrack(*track, stream_id, track_id));
-      side->AddTrack(mst);
+      side.AddTrack(mst);
     }
   }
 
+  bool HasMediaStream(std::vector<RefPtr<JsepTrack>> tracks) const {
+    for (auto i = tracks.begin(); i != tracks.end(); ++i) {
+      if ((*i)->GetMediaType() != SdpMediaSection::kApplication) {
+        return 1;
+      }
+    }
+    return 0;
+  }
+
+  const std::string GetFirstLocalStreamId(JsepSessionImpl& side) const {
+    auto tracks = side.GetLocalTracks();
+    return (*tracks.begin())->GetStreamId();
+  }
+
+  std::vector<std::string>
+  GetMediaStreamIds(std::vector<RefPtr<JsepTrack>> tracks) const {
+    std::vector<std::string> ids;
+    for (auto i = tracks.begin(); i != tracks.end(); ++i) {
+      // data channels don't have msid's
+      if ((*i)->GetMediaType() == SdpMediaSection::kApplication) {
+        continue;
+      }
+      ids.push_back((*i)->GetStreamId());
+    }
+    return ids;
+  }
+
+  std::vector<std::string>
+  GetLocalMediaStreamIds(JsepSessionImpl& side) const {
+    return GetMediaStreamIds(side.GetLocalTracks());
+  }
+
+  std::vector<std::string>
+  GetRemoteMediaStreamIds(JsepSessionImpl& side) const {
+    return GetMediaStreamIds(side.GetRemoteTracks());
+  }
+
+  std::vector<std::string>
+  sortUniqueStrVector(std::vector<std::string> in) const {
+    std::sort(in.begin(), in.end());
+    auto it = std::unique(in.begin(), in.end());
+    in.resize( std::distance(in.begin(), it));
+    return in;
+  }
+
+  std::vector<std::string>
+  GetLocalUniqueStreamIds(JsepSessionImpl& side) const {
+    return sortUniqueStrVector(GetLocalMediaStreamIds(side));
+  }
+
+  std::vector<std::string>
+  GetRemoteUniqueStreamIds(JsepSessionImpl& side) const {
+    return sortUniqueStrVector(GetRemoteMediaStreamIds(side));
+  }
+
   RefPtr<JsepTrack> GetTrack(JsepSessionImpl& side,
                              SdpMediaSection::MediaType type,
                              size_t index) const {
@@ -746,20 +821,20 @@
 
 TEST_P(JsepSessionTest, CreateOffer)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   CreateOffer();
 }
 
 TEST_P(JsepSessionTest, CreateOfferSetLocal)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
 }
 
 TEST_P(JsepSessionTest, CreateOfferSetLocalSetRemote)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
@@ -767,32 +842,32 @@
 
 TEST_P(JsepSessionTest, CreateOfferSetLocalSetRemoteCreateAnswer)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
 }
 
 TEST_P(JsepSessionTest, CreateOfferSetLocalSetRemoteCreateAnswerSetLocal)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
   SetLocalAnswer(answer);
 }
 
 TEST_P(JsepSessionTest, FullCall)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
   SetLocalAnswer(answer);
   SetRemoteAnswer(answer);
@@ -800,7 +875,7 @@
 
 TEST_P(JsepSessionTest, RenegotiationNoChange)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
@@ -810,7 +885,7 @@
   ASSERT_EQ(types.size(), added.size());
   ASSERT_EQ(0U, removed.size());
 
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
   SetLocalAnswer(answer);
   SetRemoteAnswer(answer);
@@ -857,8 +932,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationOffererAddsTrack)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
 
   OfferAnswer();
 
@@ -868,7 +943,7 @@
   std::vector<SdpMediaSection::MediaType> extraTypes;
   extraTypes.push_back(SdpMediaSection::kAudio);
   extraTypes.push_back(SdpMediaSection::kVideo);
-  AddTracks(&mSessionOff, extraTypes);
+  AddTracks(mSessionOff, extraTypes);
   types.insert(types.end(), extraTypes.begin(), extraTypes.end());
 
   OfferAnswer(CHECK_SUCCESS);
@@ -901,8 +976,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationAnswererAddsTrack)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
 
   OfferAnswer();
 
@@ -912,7 +987,7 @@
   std::vector<SdpMediaSection::MediaType> extraTypes;
   extraTypes.push_back(SdpMediaSection::kAudio);
   extraTypes.push_back(SdpMediaSection::kVideo);
-  AddTracks(&mSessionAns, extraTypes);
+  AddTracks(mSessionAns, extraTypes);
   types.insert(types.end(), extraTypes.begin(), extraTypes.end());
 
   // We need to add a recvonly m-section to the offer for this to work
@@ -958,8 +1033,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationBothAddTrack)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
 
   OfferAnswer();
 
@@ -969,8 +1044,8 @@
   std::vector<SdpMediaSection::MediaType> extraTypes;
   extraTypes.push_back(SdpMediaSection::kAudio);
   extraTypes.push_back(SdpMediaSection::kVideo);
-  AddTracks(&mSessionAns, extraTypes);
-  AddTracks(&mSessionOff, extraTypes);
+  AddTracks(mSessionAns, extraTypes);
+  AddTracks(mSessionOff, extraTypes);
   types.insert(types.end(), extraTypes.begin(), extraTypes.end());
 
   OfferAnswer(CHECK_SUCCESS);
@@ -1003,10 +1078,59 @@
   }
 }
 
+TEST_P(JsepSessionTest, RenegotiationBothAddTracksToExistingStream)
+{
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
+  if (GetParam() == "datachannel") {
+    return;
+  }
+
+  OfferAnswer();
+
+  auto oHasStream = HasMediaStream(mSessionOff.GetLocalTracks());
+  auto aHasStream = HasMediaStream(mSessionAns.GetLocalTracks());
+  ASSERT_EQ(oHasStream, GetLocalUniqueStreamIds(mSessionOff).size());
+  ASSERT_EQ(aHasStream, GetLocalUniqueStreamIds(mSessionAns).size());
+  ASSERT_EQ(aHasStream, GetRemoteUniqueStreamIds(mSessionOff).size());
+  ASSERT_EQ(oHasStream, GetRemoteUniqueStreamIds(mSessionAns).size());
+
+  auto firstOffId = GetFirstLocalStreamId(mSessionOff);
+  auto firstAnsId = GetFirstLocalStreamId(mSessionAns);
+
+  auto offererPairs = GetTrackPairsByLevel(mSessionOff);
+  auto answererPairs = GetTrackPairsByLevel(mSessionAns);
+
+  std::vector<SdpMediaSection::MediaType> extraTypes;
+  extraTypes.push_back(SdpMediaSection::kAudio);
+  extraTypes.push_back(SdpMediaSection::kVideo);
+  AddTracksToStream(mSessionOff, firstOffId, extraTypes);
+  AddTracksToStream(mSessionAns, firstAnsId, extraTypes);
+  types.insert(types.end(), extraTypes.begin(), extraTypes.end());
+
+  OfferAnswer(CHECK_SUCCESS);
+
+  oHasStream = HasMediaStream(mSessionOff.GetLocalTracks());
+  aHasStream = HasMediaStream(mSessionAns.GetLocalTracks());
+
+  ASSERT_EQ(oHasStream, GetLocalUniqueStreamIds(mSessionOff).size());
+  ASSERT_EQ(aHasStream, GetLocalUniqueStreamIds(mSessionAns).size());
+  ASSERT_EQ(aHasStream, GetRemoteUniqueStreamIds(mSessionOff).size());
+  ASSERT_EQ(oHasStream, GetRemoteUniqueStreamIds(mSessionAns).size());
+  if (oHasStream) {
+    ASSERT_STREQ(firstOffId.c_str(),
+                 GetFirstLocalStreamId(mSessionOff).c_str());
+  }
+  if (aHasStream) {
+    ASSERT_STREQ(firstAnsId.c_str(),
+                 GetFirstLocalStreamId(mSessionAns).c_str());
+  }
+}
+
 TEST_P(JsepSessionTest, RenegotiationOffererRemovesTrack)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
   if (types.front() == SdpMediaSection::kApplication) {
     return;
   }
@@ -1083,8 +1207,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationAnswererRemovesTrack)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
   if (types.front() == SdpMediaSection::kApplication) {
     return;
   }
@@ -1161,8 +1285,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationBothRemoveTrack)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
   if (types.front() == SdpMediaSection::kApplication) {
     return;
   }
@@ -1234,8 +1358,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationBothRemoveTrackDifferentMsection)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
   if (types.front() == SdpMediaSection::kApplication) {
     return;
   }
@@ -1341,8 +1465,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationOffererReplacesTrack)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
 
   if (types.front() == SdpMediaSection::kApplication) {
     return;
@@ -1427,11 +1551,11 @@
 // side doesn't use msid attributes) are stable across renegotiation.
 TEST_P(JsepSessionTest, RenegotiationAutoAssignedMsidIsStable)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
   SetLocalAnswer(answer);
 
@@ -1457,7 +1581,7 @@
   offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   answer = CreateAnswer();
   SetLocalAnswer(answer);
 
@@ -1477,11 +1601,11 @@
 // but does on renegotiation.
 TEST_P(JsepSessionTest, RenegotiationAnswererEnablesMsid)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
   SetLocalAnswer(answer);
 
@@ -1494,7 +1618,7 @@
   offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   answer = CreateAnswer();
   SetLocalAnswer(answer);
   SetRemoteAnswer(answer, CHECK_SUCCESS);
@@ -1522,11 +1646,11 @@
 
 TEST_P(JsepSessionTest, RenegotiationAnswererDisablesMsid)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
   SetLocalAnswer(answer);
   SetRemoteAnswer(answer, CHECK_SUCCESS);
@@ -1536,7 +1660,7 @@
   offer = CreateOffer();
   SetLocalOffer(offer);
   SetRemoteOffer(offer);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   answer = CreateAnswer();
   SetLocalAnswer(answer);
 
@@ -1569,8 +1693,8 @@
 // but does on renegotiation.
 TEST_P(JsepSessionTest, RenegotiationOffererEnablesBundle)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
   std::string offer = CreateOffer();
 
   DisableBundle(&offer);
@@ -1628,8 +1752,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationOffererDisablesBundleTransport)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
 
   if (types.size() < 2) {
     return;
@@ -1680,8 +1804,8 @@
 
 TEST_P(JsepSessionTest, RenegotiationAnswererDisablesBundleTransport)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
 
   if (types.size() < 2) {
     return;
@@ -1732,7 +1856,7 @@
 
 TEST_P(JsepSessionTest, FullCallWithCandidates)
 {
-  AddTracks(&mSessionOff);
+  AddTracks(mSessionOff);
   std::string offer = CreateOffer();
   SetLocalOffer(offer);
   GatherOffererCandidates();
@@ -1740,7 +1864,7 @@
   SetRemoteOffer(offer);
   TrickleOffererCandidates();
   ValidateAnswererCandidates();
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionAns);
   std::string answer = CreateAnswer();
   SetLocalAnswer(answer);
   SetRemoteAnswer(answer);
@@ -1809,7 +1933,7 @@
 
   SetLocalOffer(offer, CHECK_SUCCESS);
 
-  AddTracks(&mSessionAns, "audio,video");
+  AddTracks(mSessionAns, "audio,video");
   SetRemoteOffer(offer, CHECK_SUCCESS);
 
   std::string answer = CreateAnswer();
@@ -1832,7 +1956,7 @@
 
 TEST_F(JsepSessionTest, OfferAnswerSendOnlyLines)
 {
-  AddTracks(&mSessionOff, "audio,video,video");
+  AddTracks(mSessionOff, "audio,video,video");
 
   JsepOfferOptions options;
   options.mOfferToReceiveAudio = Some(static_cast<size_t>(0U));
@@ -1868,7 +1992,7 @@
 
   SetLocalOffer(offer, CHECK_SUCCESS);
 
-  AddTracks(&mSessionAns, "audio,video");
+  AddTracks(mSessionAns, "audio,video");
   SetRemoteOffer(offer, CHECK_SUCCESS);
 
   std::string answer = CreateAnswer();
@@ -2174,8 +2298,8 @@
 
 TEST_P(JsepSessionTest, TestRejectMline)
 {
-  AddTracks(&mSessionOff);
-  AddTracks(&mSessionAns);
+  AddTracks(mSessionOff);
+  AddTracks(mSessionAns);
 
   switch (types.front()) {
     case SdpMediaSection::kAudio:
@@ -2248,8 +2372,8 @@
 
 TEST_F(JsepSessionTest, TestIceLite)
 {
-  AddTracks(&mSessionOff, "audio");
-  AddTracks(&mSessionAns, "audio");
+  AddTracks(mSessionOff, "audio");
+  AddTracks(mSessionAns, "audio");
   std::string offer = CreateOffer();
   SetLocalOffer(offer, CHECK_SUCCESS);
 
@@ -2268,8 +2392,8 @@
 
 TEST_F(JsepSessionTest, TestIceOptions)
 {
-  AddTracks(&mSessionOff, "audio");
-  AddTracks(&mSessionAns, "audio");
+  AddTracks(mSessionOff, "audio");
+  AddTracks(mSessionAns, "audio");
   std::string offer = CreateOffer();
   SetLocalOffer(offer, CHECK_SUCCESS);
   SetRemoteOffer(offer, CHECK_SUCCESS);
@@ -2286,8 +2410,8 @@
 
 TEST_F(JsepSessionTest, TestExtmap)
 {
-  AddTracks(&mSessionOff, "audio");
-  AddTracks(&mSessionAns, "audio");
+  AddTracks(mSessionOff, "audio");
+  AddTracks(mSessionAns, "audio");
   // ssrc-audio-level will be extmap 1 for both
   mSessionOff.AddAudioRtpExtension("foo"); // Default mapping of 2
   mSessionOff.AddAudioRtpExtension("bar"); // Default mapping of 3
@@ -2332,8 +2456,8 @@
 
 TEST_F(JsepSessionTest, TestRtcpFbStar)
 {
-  AddTracks(&mSessionOff, "video");
-  AddTracks(&mSessionAns, "video");
+  AddTracks(mSessionOff, "video");
+  AddTracks(mSessionAns, "video");
 
   std::string offer = CreateOffer();
 
@@ -2368,8 +2492,8 @@
 {
   // The audio payload types will all appear more than once, but the video
   // payload types will be unique.
-  AddTracks(&mSessionOff, "audio,audio,video");
-  AddTracks(&mSessionAns, "audio,audio,video");
+  AddTracks(mSessionOff, "audio,audio,video");
+  AddTracks(mSessionAns, "audio,audio,video");
 
   std::string offer = CreateOffer();
   SetLocalOffer(offer, CHECK_SUCCESS);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/test/signaling_unittests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/test/signaling_unittests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/signaling/test/signaling_unittests.cpp	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/signaling/test/signaling_unittests.cpp	2015-02-28 15:03:05.000000000 +0000
@@ -288,7 +288,7 @@
   NS_IMETHOD OnAddIceCandidateSuccess(ER&) MOZ_OVERRIDE;
   NS_IMETHOD OnAddIceCandidateError(uint32_t code, const char *msg, ER&) MOZ_OVERRIDE;
   NS_IMETHOD OnIceCandidate(uint16_t level, const char *mid, const char *cand, ER&) MOZ_OVERRIDE;
-  NS_IMETHODIMP OnNegotiationNeeded(ER&);
+  NS_IMETHOD OnNegotiationNeeded(ER&) MOZ_OVERRIDE;
 
   // Hack because add_ice_candidates can happen asynchronously with respect
   // to the API calls. The whole test suite needs a refactor.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_file.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_file.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_file.cc	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_file.cc	2015-02-28 15:03:05.000000000 +0000
@@ -45,13 +45,18 @@
 }
 
 size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) {
-#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
-#error "Need to convert samples to big-endian when reading from WAV file"
-#endif
+
+
   const size_t read =
       fread(samples, sizeof(*samples), num_samples, file_handle_);
   // If we didn't read what was requested, ensure we've reached the EOF.
   CHECK(read == num_samples || feof(file_handle_));
+#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
+  //convert to big-endian
+  for(size_t idx = 0; idx < num_samples; idx++) {
+    samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
+  }
+#endif
   return read;
 }
 
@@ -99,10 +104,17 @@
 
 void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
 #ifndef WEBRTC_ARCH_LITTLE_ENDIAN
-#error "Need to convert samples to little-endian when writing to WAV file"
-#endif
+  int16_t * le_samples = new int16_t[num_samples];
+  for(size_t idx = 0; idx < num_samples; idx++) {
+    le_samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
+  }
+  const size_t written =
+      fwrite(le_samples, sizeof(*le_samples), num_samples, file_handle_);
+  delete []le_samples;
+#else
   const size_t written =
       fwrite(samples, sizeof(*samples), num_samples, file_handle_);
+#endif
   CHECK_EQ(num_samples, written);
   num_samples_ += static_cast<uint32_t>(written);
   CHECK(written <= std::numeric_limits<uint32_t>::max() ||
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_header.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_header.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_header.cc	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/common_audio/wav_header.cc	2015-02-28 15:03:05.000000000 +0000
@@ -128,7 +128,39 @@
   return std::string(reinterpret_cast<char*>(&x), 4);
 }
 #else
-#error "Write be-to-le conversion functions"
+static inline void WriteLE16(uint16_t* f, uint16_t x) {
+  *f = ((x << 8) & 0xff00)  | ( ( x >> 8) & 0x00ff);
+}
+
+static inline void WriteLE32(uint32_t* f, uint32_t x) {
+    *f = ( (x & 0x000000ff) << 24 )
+      | ((x & 0x0000ff00) << 8)
+      | ((x & 0x00ff0000) >> 8)
+      | ((x & 0xff000000) >> 24 );
+}
+
+static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) {
+    *f = (static_cast<uint32_t>(a) << 24 )
+      |  (static_cast<uint32_t>(b) << 16)
+      |  (static_cast<uint32_t>(c) << 8)
+      |  (static_cast<uint32_t>(d) );
+}
+
+static inline uint16_t ReadLE16(uint16_t x) {
+  return  (( x & 0x00ff) << 8 )| ((x & 0xff00)>>8);
+}
+
+static inline uint32_t ReadLE32(uint32_t x) {
+  return   ( (x & 0x000000ff) << 24 )
+         | ( (x & 0x0000ff00) << 8 )
+         | ( (x & 0x00ff0000) >> 8)
+         | ( (x & 0xff000000) >> 24 );
+}
+
+static inline std::string ReadFourCC(uint32_t x) {
+  x = ReadLE32(x);
+  return std::string(reinterpret_cast<char*>(&x), 4);
+}
 #endif
 
 static inline uint32_t RiffChunkSize(uint32_t bytes_in_payload) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc	2015-02-28 15:03:05.000000000 +0000
@@ -1416,11 +1416,10 @@
 }
 
 // Configure RED status i.e on/off.
-int AudioCodingModuleImpl::SetREDStatus(
-#ifdef WEBRTC_CODEC_RED
-    bool enable_red) {
+int AudioCodingModuleImpl::SetREDStatus(bool enable_red) {
   CriticalSectionScoped lock(acm_crit_sect_);
 
+#ifdef WEBRTC_CODEC_RED
   if (enable_red == true && codec_fec_enabled_ == true) {
     WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, id_,
                  "Codec internal FEC and RED cannot be co-enabled.");
@@ -1439,7 +1438,6 @@
   is_first_red_ = true;  // Make sure we restart RED.
   return 0;
 #else
-    bool /* enable_red */) {
   red_enabled_ = false;
   WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, id_,
                "  WEBRTC_CODEC_RED is undefined => red_enabled_ = %d",
@@ -2072,7 +2070,7 @@
 
 const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
   FATAL() << "Not implemented yet.";
-  return reinterpret_cast<const AudioEncoder*>(NULL);
+  return NULL;
 }
 
 const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
@@ -2091,7 +2089,7 @@
 
 const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
   FATAL() << "Not implemented yet.";
-  return reinterpret_cast<const ReceiverInfo*>(NULL);
+  return NULL;
 }
 
 bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.cc	2015-02-28 15:03:06.000000000 +0000
@@ -396,6 +396,23 @@
   return true;
 }
 
+void OpenSlesInput::SetupVoiceMode() {
+  SLAndroidConfigurationItf configItf;
+  SLresult res = (*sles_recorder_)->GetInterface(sles_recorder_, SL_IID_ANDROIDCONFIGURATION_,
+                                                 (void*)&configItf);
+  WEBRTC_TRACE(kTraceError, kTraceAudioDevice, id_, "OpenSL GetInterface: %d", res);
+
+  if (res == SL_RESULT_SUCCESS) {
+    SLuint32 voiceMode = SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION;
+    SLuint32 voiceSize = sizeof(voiceMode);
+
+    res = (*configItf)->SetConfiguration(configItf,
+                                         SL_ANDROID_KEY_RECORDING_PRESET,
+                                         &voiceMode, voiceSize);
+    WEBRTC_TRACE(kTraceError, kTraceAudioDevice, id_, "OpenSL Set Voice mode res: %d", res);
+  }
+}
+
 #if defined(WEBRTC_GONK) && defined(WEBRTC_HARDWARE_AEC_NS)
 bool OpenSlesInput::CheckPlatformAEC() {
   effect_descriptor_t fxDesc;
@@ -519,16 +536,7 @@
                                       &recorder_config),
       false);
 
-  // Set audio recorder configuration to
-  // SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION which ensures that we
-  // use the main microphone tuned for audio communications.
-  SLuint32 stream_type = SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION;
-  OPENSL_RETURN_ON_FAILURE(
-      (*recorder_config)->SetConfiguration(recorder_config,
-                                           SL_ANDROID_KEY_RECORDING_PRESET,
-                                           &stream_type,
-                                           sizeof(SLint32)),
-      false);
+  SetupVoiceMode();
 
   // Realize the recorder in synchronous mode.
   OPENSL_RETURN_ON_FAILURE((*sles_recorder_)->Realize(sles_recorder_,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_input.h	2015-02-28 15:03:06.000000000 +0000
@@ -147,9 +147,9 @@
   // etc, so it should be called when starting recording.
   bool CreateAudioRecorder();
   void DestroyAudioRecorder();
+  void SetupVoiceMode();
 #if defined(WEBRTC_GONK) && defined(WEBRTC_HARDWARE_AEC_NS)
   void SetupAECAndNS();
-  void SetupVoiceMode();
   bool CheckPlatformAEC();
 #endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc	2015-02-28 15:03:06.000000000 +0000
@@ -18,14 +18,16 @@
 namespace webrtc {
 namespace {
 
-enum Nalu {
-  kSlice = 1,
-  kIdr = 5,
-  kSei = 6,
-  kSps = 7,
-  kPps = 8,
-  kStapA = 24,
-  kFuA = 28
+enum Nalu { // 0-23 from H.264, 24-31 from RFC 6184
+  kSlice = 1, // I/P/B slice
+  kIdr = 5, // IDR slice
+  kSei = 6, // Supplementary Enhancement Info
+  kSeiRecPt = 6, // Recovery Point SEI Payload
+  kSps = 7, // Sequence Parameter Set
+  kPps = 8, // Picture Parameter Set
+  kPrefix = 14, // Prefix
+  kStapA = 24, // Single-Time Aggregation Packet Type A
+  kFuA = 28 // Fragmentation Unit Type A
 };
 
 static const size_t kNalHeaderSize = 1;
@@ -51,14 +53,38 @@
   h264_header->stap_a = false;
 
   uint8_t nal_type = payload_data[0] & kTypeMask;
+  size_t offset = 0;
   if (nal_type == kStapA) {
-    nal_type = payload_data[3] & kTypeMask;
+    offset = 3;
+    if (offset >= payload_data_length) {
+      return; // XXX malformed
+    }
+    nal_type = payload_data[offset] & kTypeMask;
     h264_header->stap_a = true;
   }
 
+  // key frames start with SPS, PPS, IDR, or Recovery Point SEI
+  // Recovery Point SEI's are used in AIR and GDR refreshes, which don't
+  // send large iframes, and instead use forms of incremental/continuous refresh.
   switch (nal_type) {
+    case kSei: // check if it is a Recovery Point SEI (aka GDR)
+      if (offset+1 >= payload_data_length) {
+        return; // XXX malformed
+      }
+      if (payload_data[offset+1] != kSeiRecPt) {
+        parsed_payload->frame_type = kVideoFrameDelta;
+        break; // some other form of SEI - not a keyframe
+      }
+      // else fall through since GDR is like IDR
     case kSps:
     case kPps:
+      // These are always combined with other packets with the same timestamp...
+      // XXX To support 'solitary' SPS/PPS/etc, either fix the jitter buffer to
+      // accept multiple sessions with the same timestamp, or pass marker info
+      // down into here (SPS/PPS as a pair without an kIdr NALU would still be
+      // painful, but might work).
+      h264_header->single_nalu = false;
+      // fall through...
     case kIdr:
       parsed_payload->frame_type = kVideoFrameKey;
       break;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/session_info.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/session_info.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/session_info.cc	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/main/source/session_info.cc	2015-02-28 15:03:06.000000000 +0000
@@ -464,12 +464,23 @@
     return -2;
 
   if (packet.codec == kVideoCodecH264) {
-    frame_type_ = packet.frameType;
+    // H.264 can have leading or trailing non-VCL (Video Coding Layer)
+    // NALUs, such as SPS/PPS/SEI and others.  Also, the RTP marker bit is
+    // not reliable for the last packet of a frame (RFC 6184 5.1 - "Decoders
+    // [] MUST NOT rely on this property"), so allow out-of-order packets to
+    // update the first and last seq# range.  Also mark as a key frame if
+    // any packet is of that type.
+    if (frame_type_ != kVideoFrameKey) {
+      frame_type_ = packet.frameType;
+    }
     if (packet.isFirstPacket &&
         (first_packet_seq_num_ == -1 ||
          IsNewerSequenceNumber(first_packet_seq_num_, packet.seqNum))) {
       first_packet_seq_num_ = packet.seqNum;
     }
+    // Note: the code does *not* currently handle the Marker bit being totally
+    // absent from a frame.  It does not, however, depend on it being on the last
+    // packet of the 'frame'/'session'.
     if (packet.markerBit &&
         (last_packet_seq_num_ == -1 ||
          IsNewerSequenceNumber(packet.seqNum, last_packet_seq_num_))) {
@@ -513,6 +524,9 @@
 
   int returnLength = InsertBuffer(frame_buffer, packet_list_it);
   UpdateCompleteSession();
+  // We call MakeDecodable() before decoding, which removes packets after a loss
+  // (and which means h.264 mode 1 frames with a loss in the first packet will be
+  // totally removed)
   if (decode_error_mode == kWithErrors)
     decodable_ = true;
   else if (decode_error_mode == kSelectiveErrors)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/app/mobile.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/app/mobile.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/app/mobile.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/app/mobile.js	2015-02-28 15:03:07.000000000 +0000
@@ -298,11 +298,6 @@
 // enable xul error pages
 pref("browser.xul.error_pages.enabled", true);
 
-pref("browser.history.grouping", "day");
-pref("browser.history.showSessions", false);
-pref("browser.sessionhistory.max_entries", 50);
-pref("browser.history_expire_sites", 40000);
-
 // disable color management
 pref("gfx.color_management.mode", 0);
 
@@ -396,12 +391,13 @@
 // to communicate with a usb cable via adb forward.
 pref("devtools.debugger.unix-domain-socket", "/data/data/@ANDROID_PACKAGE_NAME@/firefox-debugger-socket");
 
-pref("font.size.inflation.minTwips", 120);
+pref("font.size.inflation.minTwips", 0);
 
 // When true, zooming will be enabled on all sites, even ones that declare user-scalable=no.
 pref("browser.ui.zoom.force-user-scalable", false);
 
 pref("ui.zoomedview.enabled", false);
+pref("ui.zoomedview.limitReadableSize", 8);  // value in layer pixels
 
 pref("ui.touch.radius.enabled", false);
 pref("ui.touch.radius.leftmm", 3);
@@ -860,11 +856,5 @@
 // Color scheme values available in reader mode UI.
 pref("reader.color_scheme.values", "[\"light\",\"dark\",\"auto\"]");
 
-// The font type in reader (charis-sil, clear-sans)
-pref("reader.font_type", "clear-sans");
-
-// Font type values available in reader mode UI.
-pref("reader.font_type.values", "[\"charis-sil\",\"clear-sans\"]");
-
 // Whether to use a vertical or horizontal toolbar.
 pref("reader.toolbar.vertical", false);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/android-services.mozbuild thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/android-services.mozbuild
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/android-services.mozbuild	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/android-services.mozbuild	2015-02-28 15:03:07.000000000 +0000
@@ -798,7 +798,12 @@
     'background/fxa/FxAccountClientException.java',
     'background/fxa/FxAccountRemoteError.java',
     'background/fxa/FxAccountUtils.java',
+    'background/fxa/oauth/FxAccountAbstractClient.java',
+    'background/fxa/oauth/FxAccountAbstractClientException.java',
+    'background/fxa/oauth/FxAccountOAuthClient10.java',
+    'background/fxa/oauth/FxAccountOAuthRemoteError.java',
     'background/fxa/PasswordStretcher.java',
+    'background/fxa/profile/FxAccountProfileClient10.java',
     'background/fxa/QuickPasswordStretcher.java',
     'background/fxa/SkewHandler.java',
     'background/healthreport/AndroidConfigurationProvider.java',
@@ -835,7 +840,9 @@
     'browserid/MockMyIDTokenFactory.java',
     'browserid/RSACryptoImplementation.java',
     'browserid/SigningPrivateKey.java',
-    'browserid/verifier/BrowserIDRemoteVerifierClient.java',
+    'browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java',
+    'browserid/verifier/BrowserIDRemoteVerifierClient10.java',
+    'browserid/verifier/BrowserIDRemoteVerifierClient20.java',
     'browserid/verifier/BrowserIDVerifierClient.java',
     'browserid/verifier/BrowserIDVerifierDelegate.java',
     'browserid/verifier/BrowserIDVerifierException.java',
@@ -962,16 +969,19 @@
     'sync/middleware/MiddlewareRepository.java',
     'sync/middleware/MiddlewareRepositorySession.java',
     'sync/MigrationSentinelSyncStage.java',
+    'sync/net/AbstractBearerTokenAuthHeaderProvider.java',
     'sync/net/AuthHeaderProvider.java',
     'sync/net/BaseResource.java',
     'sync/net/BaseResourceDelegate.java',
     'sync/net/BasicAuthHeaderProvider.java',
+    'sync/net/BearerAuthHeaderProvider.java',
     'sync/net/BrowserIDAuthHeaderProvider.java',
     'sync/net/ConnectionMonitorThread.java',
     'sync/net/HandleProgressException.java',
     'sync/net/HawkAuthHeaderProvider.java',
     'sync/net/HMACAuthHeaderProvider.java',
     'sync/net/HttpResponseObserver.java',
+    'sync/net/MozResponse.java',
     'sync/net/Resource.java',
     'sync/net/ResourceDelegate.java',
     'sync/net/SRPConstants.java',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClientException.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,63 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.background.fxa.oauth;
+
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.HTTPFailureException;
+import org.mozilla.gecko.sync.net.SyncStorageResponse;
+
+import ch.boye.httpclientandroidlib.HttpResponse;
+
+/**
+ * From <a href="https://github.com/mozilla/fxa-auth-server/blob/master/docs/api.md">https://github.com/mozilla/fxa-auth-server/blob/master/docs/api.md</a>.
+ */
+public class FxAccountAbstractClientException extends Exception {
+  private static final long serialVersionUID = 1953459541558266597L;
+
+  public FxAccountAbstractClientException(String detailMessage) {
+    super(detailMessage);
+  }
+
+  public FxAccountAbstractClientException(Exception e) {
+    super(e);
+  }
+
+  public static class FxAccountAbstractClientRemoteException extends FxAccountAbstractClientException {
+    private static final long serialVersionUID = 1209313149952001097L;
+
+    public final HttpResponse response;
+    public final long httpStatusCode;
+    public final long apiErrorNumber;
+    public final String error;
+    public final String message;
+    public final ExtendedJSONObject body;
+
+    public FxAccountAbstractClientRemoteException(HttpResponse response, long httpStatusCode, long apiErrorNumber, String error, String message, ExtendedJSONObject body) {
+      super(new HTTPFailureException(new SyncStorageResponse(response)));
+      if (body == null) {
+        throw new IllegalArgumentException("body must not be null");
+      }
+      this.response = response;
+      this.httpStatusCode = httpStatusCode;
+      this.apiErrorNumber = apiErrorNumber;
+      this.error = error;
+      this.message = message;
+      this.body = body;
+    }
+
+    @Override
+    public String toString() {
+      return "<FxAccountAbstractClientRemoteException " + this.httpStatusCode + " [" + this.apiErrorNumber + "]: " + this.message + ">";
+    }
+  }
+
+  public static class FxAccountAbstractClientMalformedResponseException extends FxAccountAbstractClientRemoteException {
+    private static final long serialVersionUID = 1209313149952001098L;
+
+    public FxAccountAbstractClientMalformedResponseException(HttpResponse response) {
+      super(response, 0, FxAccountOAuthRemoteError.UNKNOWN_ERROR, "Response malformed", "Response malformed", new ExtendedJSONObject());
+    }
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountAbstractClient.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,225 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.background.fxa.oauth;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
+import java.util.Locale;
+import java.util.concurrent.Executor;
+
+import org.mozilla.gecko.background.fxa.FxAccountClientException;
+import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientMalformedResponseException;
+import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClientException.FxAccountAbstractClientRemoteException;
+import org.mozilla.gecko.fxa.FxAccountConstants;
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.Utils;
+import org.mozilla.gecko.sync.net.AuthHeaderProvider;
+import org.mozilla.gecko.sync.net.BaseResource;
+import org.mozilla.gecko.sync.net.BaseResourceDelegate;
+import org.mozilla.gecko.sync.net.Resource;
+import org.mozilla.gecko.sync.net.SyncResponse;
+import org.mozilla.gecko.sync.net.SyncStorageResponse;
+
+import ch.boye.httpclientandroidlib.HttpEntity;
+import ch.boye.httpclientandroidlib.HttpHeaders;
+import ch.boye.httpclientandroidlib.HttpResponse;
+import ch.boye.httpclientandroidlib.client.ClientProtocolException;
+import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase;
+import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
+
+public abstract class FxAccountAbstractClient {
+  protected static final String LOG_TAG = FxAccountAbstractClient.class.getSimpleName();
+
+  protected static final String ACCEPT_HEADER = "application/json;charset=utf-8";
+  protected static final String AUTHORIZATION_RESPONSE_TYPE = "token";
+
+  public static final String JSON_KEY_ERROR = "error";
+  public static final String JSON_KEY_MESSAGE = "message";
+  public static final String JSON_KEY_CODE = "code";
+  public static final String JSON_KEY_ERRNO = "errno";
+
+  protected static final String[] requiredErrorStringFields = { JSON_KEY_ERROR, JSON_KEY_MESSAGE };
+  protected static final String[] requiredErrorLongFields = { JSON_KEY_CODE, JSON_KEY_ERRNO };
+
+  /**
+   * The server's URI.
+   * <p>
+   * We assume throughout that this ends with a trailing slash (and guarantee as
+   * much in the constructor).
+   */
+  protected final String serverURI;
+
+  protected final Executor executor;
+
+  public FxAccountAbstractClient(String serverURI, Executor executor) {
+    if (serverURI == null) {
+      throw new IllegalArgumentException("Must provide a server URI.");
+    }
+    if (executor == null) {
+      throw new IllegalArgumentException("Must provide a non-null executor.");
+    }
+    this.serverURI = serverURI.endsWith("/") ? serverURI : serverURI + "/";
+    if (!this.serverURI.endsWith("/")) {
+      throw new IllegalArgumentException("Constructed serverURI must end with a trailing slash: " + this.serverURI);
+    }
+    this.executor = executor;
+  }
+
+  /**
+   * Process a typed value extracted from a successful response (in an
+   * endpoint-dependent way).
+   */
+  public interface RequestDelegate<T> {
+    public void handleError(Exception e);
+    public void handleFailure(FxAccountAbstractClientRemoteException e);
+    public void handleSuccess(T result);
+  }
+
+  /**
+   * Intepret a response from the auth server.
+   * <p>
+   * Throw an appropriate exception on errors; otherwise, return the response's
+   * status code.
+   *
+   * @return response's HTTP status code.
+   * @throws FxAccountClientException
+   */
+  public static int validateResponse(HttpResponse response) throws FxAccountAbstractClientRemoteException {
+    final int status = response.getStatusLine().getStatusCode();
+    if (status == 200) {
+      return status;
+    }
+    int code;
+    int errno;
+    String error;
+    String message;
+    ExtendedJSONObject body;
+    try {
+      body = new SyncStorageResponse(response).jsonObjectBody();
+      body.throwIfFieldsMissingOrMisTyped(requiredErrorStringFields, String.class);
+      body.throwIfFieldsMissingOrMisTyped(requiredErrorLongFields, Long.class);
+      code = body.getLong(JSON_KEY_CODE).intValue();
+      errno = body.getLong(JSON_KEY_ERRNO).intValue();
+      error = body.getString(JSON_KEY_ERROR);
+      message = body.getString(JSON_KEY_MESSAGE);
+    } catch (Exception e) {
+      throw new FxAccountAbstractClientMalformedResponseException(response);
+    }
+    throw new FxAccountAbstractClientRemoteException(response, code, errno, error, message, body);
+  }
+
+  protected <T> void invokeHandleError(final RequestDelegate<T> delegate, final Exception e) {
+    executor.execute(new Runnable() {
+      @Override
+      public void run() {
+        delegate.handleError(e);
+      }
+    });
+  }
+
+  protected <T> void post(BaseResource resource, final ExtendedJSONObject requestBody, final RequestDelegate<T> delegate) {
+    try {
+      if (requestBody == null) {
+        resource.post((HttpEntity) null);
+      } else {
+        resource.post(requestBody);
+      }
+    } catch (UnsupportedEncodingException e) {
+      invokeHandleError(delegate, e);
+      return;
+    }
+  }
+
+  /**
+   * Translate resource callbacks into request callbacks invoked on the provided
+   * executor.
+   * <p>
+   * Override <code>handleSuccess</code> to parse the body of the resource
+   * request and call the request callback. <code>handleSuccess</code> is
+   * invoked via the executor, so you don't need to delegate further.
+   */
+  protected abstract class ResourceDelegate<T> extends BaseResourceDelegate {
+    protected abstract void handleSuccess(final int status, HttpResponse response, final ExtendedJSONObject body);
+
+    protected final RequestDelegate<T> delegate;
+
+    /**
+     * Create a delegate for an un-authenticated resource.
+     */
+    public ResourceDelegate(final Resource resource, final RequestDelegate<T> delegate) {
+      super(resource);
+      this.delegate = delegate;
+    }
+
+    @Override
+    public AuthHeaderProvider getAuthHeaderProvider() {
+      return super.getAuthHeaderProvider();
+    }
+
+    @Override
+    public String getUserAgent() {
+      return FxAccountConstants.USER_AGENT;
+    }
+
+    @Override
+    public void handleHttpResponse(HttpResponse response) {
+      try {
+        final int status = validateResponse(response);
+        invokeHandleSuccess(status, response);
+      } catch (FxAccountAbstractClientRemoteException e) {
+        invokeHandleFailure(e);
+      }
+    }
+
+    protected void invokeHandleFailure(final FxAccountAbstractClientRemoteException e) {
+      executor.execute(new Runnable() {
+        @Override
+        public void run() {
+          delegate.handleFailure(e);
+        }
+      });
+    }
+
+    protected void invokeHandleSuccess(final int status, final HttpResponse response) {
+      executor.execute(new Runnable() {
+        @Override
+        public void run() {
+          try {
+            ExtendedJSONObject body = new SyncResponse(response).jsonObjectBody();
+            ResourceDelegate.this.handleSuccess(status, response, body);
+          } catch (Exception e) {
+            delegate.handleError(e);
+          }
+        }
+      });
+    }
+
+    @Override
+    public void handleHttpProtocolException(final ClientProtocolException e) {
+      invokeHandleError(delegate, e);
+    }
+
+    @Override
+    public void handleHttpIOException(IOException e) {
+      invokeHandleError(delegate, e);
+    }
+
+    @Override
+    public void handleTransportException(GeneralSecurityException e) {
+      invokeHandleError(delegate, e);
+    }
+
+    @Override
+    public void addHeaders(HttpRequestBase request, DefaultHttpClient client) {
+      super.addHeaders(request, client);
+
+      // The basics.
+      final Locale locale = Locale.getDefault();
+      request.addHeader(HttpHeaders.ACCEPT_LANGUAGE, Utils.getLanguageTag(locale));
+      request.addHeader(HttpHeaders.ACCEPT, ACCEPT_HEADER);
+    }
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthClient10.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,101 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.background.fxa.oauth;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.concurrent.Executor;
+
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.net.BaseResource;
+
+import ch.boye.httpclientandroidlib.HttpResponse;
+
+/**
+ * Talk to an fxa-oauth-server to get "implicitly granted" OAuth tokens.
+ * <p>
+ * To use this client, you will need a pre-allocated fxa-oauth-server
+ * "client_id" with special "implicit grant" permissions.
+ * <p>
+ * This client was written against the API documented at <a href="https://github.com/mozilla/fxa-oauth-server/blob/41538990df9e91158558ae5a8115194383ac3b05/docs/api.md">https://github.com/mozilla/fxa-oauth-server/blob/41538990df9e91158558ae5a8115194383ac3b05/docs/api.md</a>.
+ */
+public class FxAccountOAuthClient10 extends FxAccountAbstractClient {
+  protected static final String LOG_TAG = FxAccountOAuthClient10.class.getSimpleName();
+
+  protected static final String AUTHORIZATION_RESPONSE_TYPE = "token";
+
+  protected static final String JSON_KEY_ACCESS_TOKEN = "access_token";
+  protected static final String JSON_KEY_ASSERTION = "assertion";
+  protected static final String JSON_KEY_CLIENT_ID = "client_id";
+  protected static final String JSON_KEY_RESPONSE_TYPE = "response_type";
+  protected static final String JSON_KEY_SCOPE = "scope";
+  protected static final String JSON_KEY_STATE = "state";
+  protected static final String JSON_KEY_TOKEN_TYPE = "token_type";
+
+  // access_token: A string that can be used for authorized requests to service providers.
+  // scope: A string of space-separated permissions that this token has. May differ from requested scopes, since user can deny permissions.
+  // token_type: A string representing the token type. Currently will always be "bearer".
+  protected static final String[] AUTHORIZATION_RESPONSE_REQUIRED_STRING_FIELDS = new String[] { JSON_KEY_ACCESS_TOKEN, JSON_KEY_SCOPE, JSON_KEY_TOKEN_TYPE };
+
+  public FxAccountOAuthClient10(String serverURI, Executor executor) {
+    super(serverURI, executor);
+  }
+
+  /**
+   * Thin container for an authorization response.
+   */
+  public static class AuthorizationResponse {
+    public final String access_token;
+    public final String token_type;
+    public final String scope;
+
+    public AuthorizationResponse(String access_token, String token_type, String scope) {
+      this.access_token = access_token;
+      this.token_type = token_type;
+      this.scope = scope;
+    }
+  }
+
+  public void authorization(String client_id, String assertion, String state, String scope,
+                            RequestDelegate<AuthorizationResponse> delegate) {
+    final BaseResource resource;
+    try {
+      resource = new BaseResource(new URI(serverURI + "authorization"));
+    } catch (URISyntaxException e) {
+      invokeHandleError(delegate, e);
+      return;
+    }
+
+    resource.delegate = new ResourceDelegate<AuthorizationResponse>(resource, delegate) {
+      @Override
+      public void handleSuccess(int status, HttpResponse response, ExtendedJSONObject body) {
+        try {
+          body.throwIfFieldsMissingOrMisTyped(AUTHORIZATION_RESPONSE_REQUIRED_STRING_FIELDS, String.class);
+          String access_token = body.getString(JSON_KEY_ACCESS_TOKEN);
+          String token_type = body.getString(JSON_KEY_TOKEN_TYPE);
+          String scope = body.getString(JSON_KEY_SCOPE);
+          delegate.handleSuccess(new AuthorizationResponse(access_token, token_type, scope));
+          return;
+        } catch (Exception e) {
+          delegate.handleError(e);
+          return;
+        }
+      }
+    };
+
+    final ExtendedJSONObject requestBody = new ExtendedJSONObject();
+    requestBody.put(JSON_KEY_RESPONSE_TYPE, AUTHORIZATION_RESPONSE_TYPE);
+    requestBody.put(JSON_KEY_CLIENT_ID, client_id);
+    requestBody.put(JSON_KEY_ASSERTION, assertion);
+    if (scope != null) {
+      requestBody.put(JSON_KEY_SCOPE, scope);
+    }
+    if (state != null) {
+      requestBody.put(JSON_KEY_STATE, state);
+    }
+
+    post(resource, requestBody, delegate);
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/oauth/FxAccountOAuthRemoteError.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.background.fxa.oauth;
+
+public interface FxAccountOAuthRemoteError {
+  public static final int ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS = 101;
+  public static final int UNKNOWN_CLIENT_ID = 101;
+  public static final int INCORRECT_CLIENT_SECRET = 102;
+  public static final int REDIRECT_URI_DOES_NOT_MATCH_REGISTERED_VALUE = 103;
+  public static final int INVALID_FXA_ASSERTION = 104;
+  public static final int UNKNOWN_CODE = 105;
+  public static final int INCORRECT_CODE = 106;
+  public static final int EXPIRED_CODE = 107;
+  public static final int INVALID_TOKEN = 108;
+  public static final int INVALID_REQUEST_PARAMETER = 109;
+  public static final int UNKNOWN_ERROR = 999;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/background/fxa/profile/FxAccountProfileClient10.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,59 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.background.fxa.profile;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.concurrent.Executor;
+
+import org.mozilla.gecko.background.fxa.oauth.FxAccountAbstractClient;
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.net.AuthHeaderProvider;
+import org.mozilla.gecko.sync.net.BaseResource;
+import org.mozilla.gecko.sync.net.BearerAuthHeaderProvider;
+
+import ch.boye.httpclientandroidlib.HttpResponse;
+
+
+/**
+ * Talk to an fxa-profile-server to get profile information like name, age, gender, and avatar image.
+ * <p>
+ * This client was written against the API documented at <a href="https://github.com/mozilla/fxa-profile-server/blob/0c065619f5a2e867f813a343b4c67da3fe2c82a4/docs/API.md">https://github.com/mozilla/fxa-profile-server/blob/0c065619f5a2e867f813a343b4c67da3fe2c82a4/docs/API.md</a>.
+ */
+public class FxAccountProfileClient10 extends FxAccountAbstractClient {
+  public FxAccountProfileClient10(String serverURI, Executor executor) {
+    super(serverURI, executor);
+  }
+
+  public void profile(final String token, RequestDelegate<ExtendedJSONObject> delegate) {
+    BaseResource resource;
+    try {
+      resource = new BaseResource(new URI(serverURI + "profile"));
+    } catch (URISyntaxException e) {
+      invokeHandleError(delegate, e);
+      return;
+    }
+
+    resource.delegate = new ResourceDelegate<ExtendedJSONObject>(resource, delegate) {
+      @Override
+      public AuthHeaderProvider getAuthHeaderProvider() {
+        return new BearerAuthHeaderProvider(token);
+      }
+
+      @Override
+      public void handleSuccess(int status, HttpResponse response, ExtendedJSONObject body) {
+        try {
+          delegate.handleSuccess(body);
+          return;
+        } catch (Exception e) {
+          delegate.handleError(e);
+          return;
+        }
+      }
+    };
+
+    resource.get();
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/BrowserApp.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/BrowserApp.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/BrowserApp.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/BrowserApp.java	2015-02-28 15:03:07.000000000 +0000
@@ -5,8 +5,10 @@
 
 package org.mozilla.gecko;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.URLEncoder;
 import java.util.EnumSet;
@@ -70,6 +72,7 @@
 import org.mozilla.gecko.toolbar.BrowserToolbar;
 import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState;
 import org.mozilla.gecko.toolbar.ToolbarProgressView;
+import org.mozilla.gecko.util.ActivityUtils;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.EventCallback;
 import org.mozilla.gecko.util.GamepadUtils;
@@ -114,6 +117,8 @@
 import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.Base64;
+import android.util.Base64OutputStream;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.KeyEvent;
@@ -128,15 +133,12 @@
 import android.view.ViewStub;
 import android.view.ViewTreeObserver;
 import android.view.Window;
-import android.view.WindowManager;
 import android.view.animation.Interpolator;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 import android.widget.ViewFlipper;
 
-import com.readystatesoftware.systembartint.SystemBarTintManager;
-
 public class BrowserApp extends GeckoApp
                         implements TabsPanel.TabsLayoutChangeListener,
                                    PropertyAnimator.PropertyAnimationListener,
@@ -150,6 +152,8 @@
                                    LayoutInflater.Factory {
     private static final String LOGTAG = "GeckoBrowserApp";
 
+    private static final boolean ZOOMED_VIEW_ENABLED = AppConstants.NIGHTLY_BUILD;
+
     private static final int TABS_ANIMATION_DURATION = 450;
 
     private static final String ADD_SHORTCUT_TOAST = "add_shortcut_toast";
@@ -172,19 +176,22 @@
     public ViewFlipper mActionBarFlipper;
     public ActionModeCompatView mActionBar;
     private BrowserToolbar mBrowserToolbar;
+    // We can't name the TabStrip class because it's not included on API 9.
+    private Refreshable mTabStrip;
     private ToolbarProgressView mProgressView;
     private FirstrunPane mFirstrunPane;
     private HomePager mHomePager;
     private TabsPanel mTabsPanel;
     private ViewGroup mHomePagerContainer;
-    protected Telemetry.Timer mAboutHomeStartupTimer;
     private ActionModeCompat mActionMode;
     private boolean mHideDynamicToolbarOnActionModeEnd;
     private TabHistoryController tabHistoryController;
+    private ZoomedView mZoomedView;
 
     private static final int GECKO_TOOLS_MENU = -1;
     private static final int ADDON_MENU_OFFSET = 1000;
     public static final String TAB_HISTORY_FRAGMENT_TAG = "tabHistoryFragment";
+
     private static class MenuItemInfo {
         public int id;
         public String label;
@@ -235,8 +242,6 @@
 
     private ReadingListHelper mReadingListHelper;
 
-    private SystemBarTintManager mTintManager;
-
     // The tab to be selected on editing mode exit.
     private Integer mTargetTabForEditingMode;
 
@@ -653,8 +658,6 @@
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        mAboutHomeStartupTimer = new Telemetry.UptimeTimer("FENNEC_STARTUP_TIME_ABOUTHOME");
-
         final Intent intent = getIntent();
 
         // Note that we're calling GeckoProfile.get *before GeckoApp.onCreate*.
@@ -679,8 +682,6 @@
 
         final Context appContext = getApplicationContext();
 
-        setupSystemUITinting();
-
         mBrowserChrome = (ViewGroup) findViewById(R.id.browser_chrome);
         mActionBarFlipper = (ViewFlipper) findViewById(R.id.browser_actionbar);
         mActionBar = (ActionModeCompatView) findViewById(R.id.actionbar);
@@ -717,7 +718,7 @@
         }
 
         if (HardwareUtils.isTablet()) {
-            findViewById(R.id.new_tablet_tab_strip).setVisibility(View.VISIBLE);
+            mTabStrip = (Refreshable) (((ViewStub) findViewById(R.id.new_tablet_tab_strip)).inflate());
         }
 
         ((GeckoApp.MainLayout) mMainLayout).setTouchEventInterceptor(new HideOnTouchListener());
@@ -766,6 +767,7 @@
             "Accounts:Create",
             "CharEncoding:Data",
             "CharEncoding:State",
+            "Favicon:CacheLoad",
             "Feedback:LastUrl",
             "Feedback:MaybeLater",
             "Feedback:OpenPlayStore",
@@ -774,8 +776,7 @@
             "Reader:Share",
             "Settings:Show",
             "Telemetry:Gather",
-            "Updater:Launch",
-            "BrowserToolbar:Visibility");
+            "Updater:Launch");
 
         Distribution distribution = Distribution.init(this);
 
@@ -823,31 +824,11 @@
 
         // Set the maximum bits-per-pixel the favicon system cares about.
         IconDirectoryEntry.setMaxBPP(GeckoAppShell.getScreenDepth());
-    }
 
-    private void setupSystemUITinting() {
-        if (!Versions.feature19Plus) {
-            return;
+        if (ZOOMED_VIEW_ENABLED) {
+            ViewStub stub = (ViewStub) findViewById(R.id.zoomed_view_stub);
+            mZoomedView = (ZoomedView) stub.inflate();
         }
-
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-
-        mTintManager = new SystemBarTintManager(this);
-        mTintManager.setTintColor(getResources().getColor(R.color.background_tabs));
-        updateSystemUITinting(mRootLayout.getSystemUiVisibility());
-
-        mRootLayout.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
-            @Override
-            public void onSystemUiVisibilityChange(int visibility) {
-                updateSystemUITinting(visibility);
-            }
-        });
-    }
-
-    private void updateSystemUITinting(int visibility) {
-        final boolean shouldTint = (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0 &&
-                                   (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0;
-        mTintManager.setStatusBarTintEnabled(shouldTint);
     }
 
     /**
@@ -1297,6 +1278,9 @@
             mReadingListHelper.uninit();
             mReadingListHelper = null;
         }
+        if (mZoomedView != null) {
+            mZoomedView.destroy();
+        }
 
         EventDispatcher.getInstance().unregisterGeckoThreadListener((GeckoEventListener)this,
             "Menu:Open",
@@ -1309,6 +1293,7 @@
             "Accounts:Create",
             "CharEncoding:Data",
             "CharEncoding:State",
+            "Favicon:CacheLoad",
             "Feedback:LastUrl",
             "Feedback:MaybeLater",
             "Feedback:OpenPlayStore",
@@ -1317,8 +1302,7 @@
             "Reader:Share",
             "Settings:Show",
             "Telemetry:Gather",
-            "Updater:Launch",
-            "BrowserToolbar:Visibility");
+            "Updater:Launch");
 
         if (AppConstants.MOZ_ANDROID_BEAM) {
             NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this);
@@ -1374,16 +1358,6 @@
         Telemetry.sendUIEvent(TelemetryContract.Event.SHARE, TelemetryContract.Method.LIST);
     }
 
-    @Override
-    protected void loadStartupTab(String url, int flags) {
-        // We aren't showing about:home, so cancel the telemetry timer
-        if (url != null || mShouldRestore) {
-            mAboutHomeStartupTimer.cancel();
-        }
-
-        super.loadStartupTab(url, flags);
-    }
-
     private void setToolbarMargin(int margin) {
         ((RelativeLayout.LayoutParams) mGeckoLayout.getLayoutParams()).topMargin = margin;
         mGeckoLayout.requestLayout();
@@ -1526,6 +1500,10 @@
             mTabsPanel.refresh();
         }
 
+        if (mTabStrip != null) {
+            mTabStrip.refresh();
+        }
+
         mBrowserToolbar.refresh();
     }
 
@@ -1534,17 +1512,6 @@
         return (mTabsPanel != null && mTabsPanel.isSideBar());
     }
 
-    private void setBrowserToolbarVisible(final boolean visible) {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (mDynamicToolbar.isEnabled()) {
-                    mDynamicToolbar.setVisible(visible, VisibilityTransition.IMMEDIATE);
-                }
-            }
-        });
-    }
-
     private boolean isSideBar() {
         return (HardwareUtils.isTablet() && getOrientation() == Configuration.ORIENTATION_LANDSCAPE);
     }
@@ -1634,6 +1601,10 @@
                 }
             });
 
+        } else if ("Favicon:CacheLoad".equals(event)) {
+            final String url = message.getString("url");
+            getFaviconFromCache(callback, url);
+
         } else if ("Feedback:LastUrl".equals(event)) {
             getLastUrl(callback);
 
@@ -1705,15 +1676,58 @@
             }
         } else if ("Updater:Launch".equals(event)) {
             handleUpdaterLaunch();
-
-        } else if ("BrowserToolbar:Visibility".equals(event)) {
-            setBrowserToolbarVisible(message.getBoolean("visible"));
-
         } else {
             super.handleMessage(event, message, callback);
         }
     }
 
+    private void getFaviconFromCache(final EventCallback callback, final String url) {
+        final OnFaviconLoadedListener listener = new OnFaviconLoadedListener() {
+            @Override
+            public void onFaviconLoaded(final String url, final String faviconURL, final Bitmap favicon) {
+                ThreadUtils.assertOnUiThread();
+                // Convert Bitmap to Base64 data URI in background.
+                ThreadUtils.postToBackgroundThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ByteArrayOutputStream out = null;
+                        Base64OutputStream b64 = null;
+
+                        // Failed to load favicon from local.
+                        if (favicon == null) {
+                            callback.sendError("Failed to get favicon from cache");
+                        } else {
+                            try {
+                                out = new ByteArrayOutputStream();
+                                out.write("data:image/png;base64,".getBytes());
+                                b64 = new Base64OutputStream(out, Base64.NO_WRAP);
+                                favicon.compress(Bitmap.CompressFormat.PNG, 100, b64);
+                                callback.sendSuccess(new String(out.toByteArray()));
+                            } catch (IOException e) {
+                                Log.w(LOGTAG, "Failed to convert to base64 data URI");
+                                callback.sendError("Failed to convert favicon to a base64 data URI");
+                            } finally {
+                                try {
+                                    if (out != null) {
+                                        out.close();
+                                    }
+                                    if (b64 != null) {
+                                        b64.close();
+                                    }
+                                } catch (IOException e) {
+                                    Log.w(LOGTAG, "Failed to close the streams");
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+        };
+        Favicons.getSizedFaviconForPageFromLocal(getContext(),
+                url,
+                listener);
+    }
+
     /**
      * Use a dummy Intent to do a default browser check.
      *
@@ -2603,11 +2617,6 @@
                 view.getHitRect(mTempRect);
                 mTempRect.offset(-view.getScrollX(), -view.getScrollY());
 
-                if (mTintManager != null) {
-                    SystemBarTintManager.SystemBarConfig config = mTintManager.getConfig();
-                    mTempRect.offset(0, -config.getPixelInsetTop(false));
-                }
-
                 int[] viewCoords = new int[2];
                 view.getLocationOnScreen(viewCoords);
 
@@ -2840,6 +2849,10 @@
             return;
         }
 
+        if (ActivityUtils.isFullScreen(this)) {
+            return;
+        }
+
         if (areTabsShown()) {
             mTabsPanel.showMenu();
             return;
@@ -3471,6 +3484,12 @@
         return GeckoProfile.getDefaultProfileName(this);
     }
 
+    // For use from tests only.
+    @RobocopTarget
+    public ReadingListHelper getReadingListHelper() {
+        return mReadingListHelper;
+    }
+
     /**
      * Launch UI that lets the user update Firefox.
      *
@@ -3565,4 +3584,8 @@
                                          appLocale,
                                          previousSession);
     }
+
+    public static interface Refreshable {
+        public void refresh();
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/JSONWebTokenUtils.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/JSONWebTokenUtils.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/JSONWebTokenUtils.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/JSONWebTokenUtils.java	2015-02-28 15:03:07.000000000 +0000
@@ -186,8 +186,8 @@
         System.out.println("Malformed certificate -- got exception trying to dump contents.");
         return false;
       }
-      System.out.println("certificate header:    " + c.getString("header"));
-      System.out.println("certificate payload:   " + c.getString("payload"));
+      System.out.println("certificate header:    " + c.getObject("header").toJSONString());
+      System.out.println("certificate payload:   " + c.getObject("payload").toJSONString());
       System.out.println("certificate signature: " + c.getString("signature"));
       return true;
     } catch (Exception e) {
@@ -244,8 +244,8 @@
         return false;
       }
       dumpCertificate(a.getString("certificate"));
-      System.out.println("assertion   header:    " + a.getString("header"));
-      System.out.println("assertion   payload:   " + a.getString("payload"));
+      System.out.println("assertion   header:    " + a.getObject("header").toJSONString());
+      System.out.println("assertion   payload:   " + a.getObject("payload").toJSONString());
       System.out.println("assertion   signature: " + a.getString("signature"));
       return true;
     } catch (Exception e) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,95 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.browserid.verifier;
+
+import java.io.IOException;
+import java.net.URI;
+import java.security.GeneralSecurityException;
+
+import org.mozilla.gecko.background.common.log.Logger;
+import org.mozilla.gecko.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierErrorResponseException;
+import org.mozilla.gecko.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierMalformedResponseException;
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.net.BaseResourceDelegate;
+import org.mozilla.gecko.sync.net.Resource;
+import org.mozilla.gecko.sync.net.SyncResponse;
+
+import ch.boye.httpclientandroidlib.HttpResponse;
+import ch.boye.httpclientandroidlib.client.ClientProtocolException;
+
+public abstract class AbstractBrowserIDRemoteVerifierClient implements BrowserIDVerifierClient {
+  public static final String LOG_TAG = AbstractBrowserIDRemoteVerifierClient.class.getSimpleName();
+
+  protected static class RemoteVerifierResourceDelegate extends BaseResourceDelegate {
+    private final BrowserIDVerifierDelegate delegate;
+
+    protected RemoteVerifierResourceDelegate(Resource resource, BrowserIDVerifierDelegate delegate) {
+      super(resource);
+      this.delegate = delegate;
+    }
+
+    @Override
+    public String getUserAgent() {
+      return null;
+    }
+
+    @Override
+    public void handleHttpResponse(HttpResponse response) {
+      SyncResponse res = new SyncResponse(response);
+      int statusCode = res.getStatusCode();
+      Logger.debug(LOG_TAG, "Got response with status code " + statusCode + ".");
+
+      if (statusCode != 200) {
+        delegate.handleError(new BrowserIDVerifierErrorResponseException("Expected status code 200."));
+        return;
+      }
+
+      ExtendedJSONObject o = null;
+      try {
+        o = res.jsonObjectBody();
+      } catch (Exception e) {
+        delegate.handleError(new BrowserIDVerifierMalformedResponseException(e));
+        return;
+      }
+
+      String status = o.getString("status");
+      if ("failure".equals(status)) {
+        delegate.handleFailure(o);
+        return;
+      }
+
+      if (!("okay".equals(status))) {
+        delegate.handleError(new BrowserIDVerifierMalformedResponseException("Expected status okay, got '" + status + "'."));
+        return;
+      }
+
+      delegate.handleSuccess(o);
+    }
+
+    @Override
+    public void handleTransportException(GeneralSecurityException e) {
+      Logger.warn(LOG_TAG, "Got transport exception.", e);
+      delegate.handleError(e);
+    }
+
+    @Override
+    public void handleHttpProtocolException(ClientProtocolException e) {
+      Logger.warn(LOG_TAG, "Got protocol exception.", e);
+      delegate.handleError(e);
+    }
+
+    @Override
+    public void handleHttpIOException(IOException e) {
+      Logger.warn(LOG_TAG, "Got IO exception.", e);
+      delegate.handleError(e);
+    }
+  }
+
+  protected final URI verifierUri;
+
+  public AbstractBrowserIDRemoteVerifierClient(URI verifierUri) {
+    this.verifierUri = verifierUri;
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient10.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,62 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.browserid.verifier;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.mozilla.gecko.sync.net.BaseResource;
+
+import ch.boye.httpclientandroidlib.NameValuePair;
+import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity;
+import ch.boye.httpclientandroidlib.message.BasicNameValuePair;
+
+/**
+ * The verifier protocol changed: version 1 posts form-encoded data; version 2
+ * posts JSON data.
+ */
+public class BrowserIDRemoteVerifierClient10 extends AbstractBrowserIDRemoteVerifierClient {
+  public static final String LOG_TAG = BrowserIDRemoteVerifierClient10.class.getSimpleName();
+
+  public static final String DEFAULT_VERIFIER_URL = "https://verifier.login.persona.org/verify";
+
+  public BrowserIDRemoteVerifierClient10() throws URISyntaxException {
+    super(new URI(DEFAULT_VERIFIER_URL));
+  }
+
+  public BrowserIDRemoteVerifierClient10(URI verifierUri) {
+    super(verifierUri);
+  }
+
+  @Override
+  public void verify(String audience, String assertion, final BrowserIDVerifierDelegate delegate) {
+    if (audience == null) {
+      throw new IllegalArgumentException("audience cannot be null.");
+    }
+    if (assertion == null) {
+      throw new IllegalArgumentException("assertion cannot be null.");
+    }
+    if (delegate == null) {
+      throw new IllegalArgumentException("delegate cannot be null.");
+    }
+
+    BaseResource r = new BaseResource(verifierUri);
+
+    r.delegate = new RemoteVerifierResourceDelegate(r, delegate);
+
+    List<NameValuePair> nvps = Arrays.asList(new NameValuePair[] {
+        new BasicNameValuePair("audience", audience),
+        new BasicNameValuePair("assertion", assertion) });
+
+    try {
+      r.post(new UrlEncodedFormEntity(nvps, "UTF-8"));
+    } catch (UnsupportedEncodingException e) {
+      delegate.handleError(e);
+    }
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient20.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,59 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.browserid.verifier;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.net.BaseResource;
+
+/**
+ * The verifier protocol changed: version 1 posts form-encoded data; version 2
+ * posts JSON data.
+ */
+public class BrowserIDRemoteVerifierClient20 extends AbstractBrowserIDRemoteVerifierClient {
+  public static final String LOG_TAG = BrowserIDRemoteVerifierClient20.class.getSimpleName();
+
+  public static final String DEFAULT_VERIFIER_URL = "https://verifier.accounts.firefox.com/v2";
+
+  protected static final String JSON_KEY_ASSERTION = "assertion";
+  protected static final String JSON_KEY_AUDIENCE = "audience";
+
+  public BrowserIDRemoteVerifierClient20() throws URISyntaxException {
+    super(new URI(DEFAULT_VERIFIER_URL));
+  }
+
+  public BrowserIDRemoteVerifierClient20(URI verifierUri) {
+    super(verifierUri);
+  }
+
+  @Override
+  public void verify(String audience, String assertion, final BrowserIDVerifierDelegate delegate) {
+    if (audience == null) {
+      throw new IllegalArgumentException("audience cannot be null.");
+    }
+    if (assertion == null) {
+      throw new IllegalArgumentException("assertion cannot be null.");
+    }
+    if (delegate == null) {
+      throw new IllegalArgumentException("delegate cannot be null.");
+    }
+
+    BaseResource r = new BaseResource(verifierUri);
+    r.delegate = new RemoteVerifierResourceDelegate(r, delegate);
+
+    final ExtendedJSONObject requestBody = new ExtendedJSONObject();
+    requestBody.put(JSON_KEY_AUDIENCE, audience);
+    requestBody.put(JSON_KEY_ASSERTION, assertion);
+
+    try {
+      r.post(requestBody);
+    } catch (UnsupportedEncodingException e) {
+      delegate.handleError(e);
+    }
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/browserid/verifier/BrowserIDRemoteVerifierClient.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +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/. */
-
-package org.mozilla.gecko.browserid.verifier;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.security.GeneralSecurityException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.mozilla.gecko.background.common.log.Logger;
-import org.mozilla.gecko.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierErrorResponseException;
-import org.mozilla.gecko.browserid.verifier.BrowserIDVerifierException.BrowserIDVerifierMalformedResponseException;
-import org.mozilla.gecko.sync.ExtendedJSONObject;
-import org.mozilla.gecko.sync.net.BaseResource;
-import org.mozilla.gecko.sync.net.BaseResourceDelegate;
-import org.mozilla.gecko.sync.net.Resource;
-import org.mozilla.gecko.sync.net.SyncResponse;
-
-import ch.boye.httpclientandroidlib.HttpResponse;
-import ch.boye.httpclientandroidlib.NameValuePair;
-import ch.boye.httpclientandroidlib.client.ClientProtocolException;
-import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity;
-import ch.boye.httpclientandroidlib.message.BasicNameValuePair;
-
-public class BrowserIDRemoteVerifierClient implements BrowserIDVerifierClient {
-  protected static class RemoteVerifierResourceDelegate extends BaseResourceDelegate {
-    private final BrowserIDVerifierDelegate delegate;
-
-    protected RemoteVerifierResourceDelegate(Resource resource, BrowserIDVerifierDelegate delegate) {
-      super(resource);
-      this.delegate = delegate;
-    }
-
-    @Override
-    public String getUserAgent() {
-      return null;
-    }
-
-    @Override
-    public void handleHttpResponse(HttpResponse response) {
-      SyncResponse res = new SyncResponse(response);
-      int statusCode = res.getStatusCode();
-      Logger.debug(LOG_TAG, "Got response with status code " + statusCode + ".");
-
-      if (statusCode != 200) {
-        delegate.handleError(new BrowserIDVerifierErrorResponseException("Expected status code 200."));
-        return;
-      }
-
-      ExtendedJSONObject o = null;
-      try {
-        o = res.jsonObjectBody();
-      } catch (Exception e) {
-        delegate.handleError(new BrowserIDVerifierMalformedResponseException(e));
-        return;
-      }
-
-      String status = o.getString("status");
-      if ("failure".equals(status)) {
-        delegate.handleFailure(o);
-        return;
-      }
-
-      if (!("okay".equals(status))) {
-        delegate.handleError(new BrowserIDVerifierMalformedResponseException("Expected status okay, got '" + status + "'."));
-        return;
-      }
-
-      delegate.handleSuccess(o);
-    }
-
-    @Override
-    public void handleTransportException(GeneralSecurityException e) {
-      Logger.warn(LOG_TAG, "Got transport exception.", e);
-      delegate.handleError(e);
-    }
-
-    @Override
-    public void handleHttpProtocolException(ClientProtocolException e) {
-      Logger.warn(LOG_TAG, "Got protocol exception.", e);
-      delegate.handleError(e);
-    }
-
-    @Override
-    public void handleHttpIOException(IOException e) {
-      Logger.warn(LOG_TAG, "Got IO exception.", e);
-      delegate.handleError(e);
-    }
-  }
-
-  public static final String LOG_TAG = "BrowserIDRemoteVerifierClient";
-
-  public static final String DEFAULT_VERIFIER_URL = "https://verifier.login.persona.org/verify";
-
-  protected final URI verifierUri;
-
-  public BrowserIDRemoteVerifierClient(URI verifierUri) {
-    this.verifierUri = verifierUri;
-  }
-
-  public BrowserIDRemoteVerifierClient() throws URISyntaxException {
-    this.verifierUri = new URI(DEFAULT_VERIFIER_URL);
-  }
-
-  @Override
-  public void verify(String audience, String assertion, final BrowserIDVerifierDelegate delegate) {
-    if (audience == null) {
-      throw new IllegalArgumentException("audience cannot be null.");
-    }
-    if (assertion == null) {
-      throw new IllegalArgumentException("assertion cannot be null.");
-    }
-    if (delegate == null) {
-      throw new IllegalArgumentException("delegate cannot be null.");
-    }
-
-    BaseResource r = new BaseResource(verifierUri);
-
-    r.delegate = new RemoteVerifierResourceDelegate(r, delegate);
-
-    List<NameValuePair> nvps = Arrays.asList(new NameValuePair[] {
-        new BasicNameValuePair("audience", audience),
-        new BasicNameValuePair("assertion", assertion) });
-
-    try {
-      r.post(new UrlEncodedFormEntity(nvps, "UTF-8"));
-    } catch (UnsupportedEncodingException e) {
-      delegate.handleError(e);
-    }
-  }
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/CustomEditText.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/CustomEditText.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/CustomEditText.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/CustomEditText.java	2015-02-28 15:03:07.000000000 +0000
@@ -81,7 +81,7 @@
         super.setPrivateMode(isPrivate);
 
         mHighlightColor = getContext().getResources().getColor(isPrivate
-                ? R.color.url_bar_text_highlight_pb : R.color.url_bar_text_highlight);
+                ? R.color.url_bar_text_highlight_pb : R.color.fennec_ui_orange);
         // android:textColorHighlight cannot support a ColorStateList.
         setHighlightColor(mHighlightColor);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/BrowserContract.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/BrowserContract.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/BrowserContract.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/BrowserContract.java	2015-02-28 15:03:07.000000000 +0000
@@ -342,19 +342,36 @@
     }
 
     @RobocopTarget
-    public static final class ReadingListItems implements CommonColumns, URLColumns, SyncColumns {
+    public static final class ReadingListItems implements CommonColumns, URLColumns {
+        public static final String EXCERPT = "excerpt";
+        public static final String CLIENT_LAST_MODIFIED = "client_last_modified";
+        public static final String GUID = "guid";
+        public static final String SERVER_LAST_MODIFIED = "last_modified";
+        public static final String SERVER_STORED_ON = "stored_on";
+        public static final String ADDED_ON = "added_on";
+        public static final String MARKED_READ_ON = "marked_read_on";
+        public static final String IS_DELETED = "is_deleted";
+        public static final String IS_ARCHIVED = "is_archived";
+        public static final String IS_UNREAD = "is_unread";
+        public static final String IS_ARTICLE = "is_article";
+        public static final String IS_FAVORITE = "is_favorite";
+        public static final String RESOLVED_URL = "resolved_url";
+        public static final String RESOLVED_TITLE = "resolved_title";
+        public static final String ADDED_BY = "added_by";
+        public static final String MARKED_READ_BY = "marked_read_by";
+        public static final String WORD_COUNT = "word_count";
+        public static final String READ_POSITION = "read_position";
+        public static final String CONTENT_STATUS = "content_status";
+
+        public static final String SYNC_STATUS = "sync_status";
+        public static final String SYNC_CHANGE_FLAGS = "sync_change_flags";
+
         private ReadingListItems() {}
         public static final Uri CONTENT_URI = Uri.withAppendedPath(READING_LIST_AUTHORITY_URI, "items");
 
         public static final String CONTENT_TYPE = "vnd.android.cursor.dir/readinglistitem";
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/readinglistitem";
 
-        public static final String EXCERPT = "excerpt";
-        public static final String READ = "read";
-        public static final String LENGTH = "length";
-
-        public static final String CONTENT_STATUS = "content_status";
-
         // CONTENT_STATUS represents the result of an attempt to fetch content for the reading list item.
         public static final int STATUS_UNFETCHED = 0;
         public static final int STATUS_FETCH_FAILED_TEMPORARY = 1;
@@ -362,11 +379,69 @@
         public static final int STATUS_FETCH_FAILED_UNSUPPORTED_FORMAT = 3;
         public static final int STATUS_FETCHED_ARTICLE = 4;
 
-        public static final String DEFAULT_SORT_ORDER = DATE_MODIFIED + " DESC";
-        public static final String[] DEFAULT_PROJECTION = new String[] { _ID, URL, TITLE, EXCERPT, LENGTH };
+        // See https://github.com/mozilla-services/readinglist/wiki/Client-phases for how this is expected to work.
+        //
+        // If an item is SYNCED, it doesn't need to be uploaded.
+        //
+        // If its status is NEW, the entire record should be uploaded.
+        //
+        // If DELETED, the record should be deleted. A record can only move into this state from SYNCED; NEW records
+        // are deleted immediately.
+        //
+
+        public static final int SYNC_STATUS_SYNCED = 0;
+        public static final int SYNC_STATUS_NEW = 1;                      // Upload everything.
+        public static final int SYNC_STATUS_DELETED = 2;                  // Delete the record from the server.
+        public static final int SYNC_STATUS_MODIFIED = 3;                 // Consult SYNC_CHANGE_FLAGS.
+
+        // SYNC_CHANGE_FLAG represents the sets of fields that need to be uploaded.
+        // If its status is only UNREAD_CHANGED (and maybe FAVORITE_CHANGED?), then it can easily be uploaded
+        // in a fire-and-forget manner. This change can never conflict.
+        //
+        // If its status is RESOLVED, then one or more of the content-oriented fields has changed, and a full
+        // upload of those fields should occur. These can result in conflicts.
+        //
+        // Note that these are flags; they should be considered together when deciding on a course of action.
+        //
+        // These flags are meaningless for records in any state other than SYNCED. They can be safely altered in
+        // other states (to avoid having to query to pre-fill a ContentValues), but should be ignored.
+        public static final int SYNC_CHANGE_NONE = 0;
+        public static final int SYNC_CHANGE_UNREAD_CHANGED   = 1 << 0;    // => marked_read_{on,by}, is_unread
+        public static final int SYNC_CHANGE_FAVORITE_CHANGED = 1 << 1;    // => is_favorite
+        public static final int SYNC_CHANGE_RESOLVED = 1 << 2;            // => is_article, resolved_{url,title}, excerpt, word_count
+
+
+        public static final String DEFAULT_SORT_ORDER = CLIENT_LAST_MODIFIED + " DESC";
+        public static final String[] DEFAULT_PROJECTION = new String[] { _ID, URL, TITLE, EXCERPT, WORD_COUNT };
 
         // Minimum fields required to create a reading list item.
-        public static final String[] REQUIRED_FIELDS = { Bookmarks.URL, Bookmarks.TITLE };
+        public static final String[] REQUIRED_FIELDS = { ReadingListItems.URL, ReadingListItems.TITLE };
+
+        // All fields that might be mapped from the DB into a record object.
+        public static final String[] ALL_FIELDS = {
+                EXCERPT,
+                CLIENT_LAST_MODIFIED,
+                GUID,
+                SERVER_LAST_MODIFIED,
+                SERVER_STORED_ON,
+                ADDED_ON,
+                MARKED_READ_ON,
+                IS_DELETED,
+                IS_ARCHIVED,
+                IS_UNREAD,
+                IS_ARTICLE,
+                IS_FAVORITE,
+                RESOLVED_URL,
+                RESOLVED_TITLE,
+                ADDED_BY,
+                MARKED_READ_BY,
+                WORD_COUNT,
+                READ_POSITION,
+                CONTENT_STATUS,
+
+                SYNC_STATUS,
+                SYNC_CHANGE_FLAGS,
+        };
 
         public static final String TABLE_NAME = "reading_list";
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/BrowserDatabaseHelper.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/BrowserDatabaseHelper.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/BrowserDatabaseHelper.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/BrowserDatabaseHelper.java	2015-02-28 15:03:07.000000000 +0000
@@ -32,9 +32,9 @@
 
 
 final class BrowserDatabaseHelper extends SQLiteOpenHelper {
-
     private static final String LOGTAG = "GeckoBrowserDBHelper";
-    public static final int DATABASE_VERSION = 22;
+
+    public static final int DATABASE_VERSION = 23;
     public static final String DATABASE_NAME = "browser.db";
 
     final protected Context mContext;
@@ -295,8 +295,10 @@
             R.string.bookmarks_folder_places, 0);
 
         createOrUpdateAllSpecialFolders(db);
-        createReadingListTable(db);
         createSearchHistoryTable(db);
+        createReadingListTable(db, TABLE_READING_LIST);
+        didCreateCurrentReadingListTable = true;      // Mostly correct, in the absence of transactions.
+        createReadingListIndices(db, TABLE_READING_LIST);
     }
 
     private void createSearchHistoryTable(SQLiteDatabase db) {
@@ -312,28 +314,54 @@
                 SearchHistory.TABLE_NAME + "(" + SearchHistory.DATE_LAST_VISITED + ")");
     }
 
-    private void createReadingListTable(SQLiteDatabase db) {
+    private boolean didCreateCurrentReadingListTable = false;
+    private void createReadingListTable(final SQLiteDatabase db, final String tableName) {
         debug("Creating " + TABLE_READING_LIST + " table");
 
-        db.execSQL("CREATE TABLE " + TABLE_READING_LIST + "(" +
-                    ReadingListItems._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                    ReadingListItems.URL + " TEXT NOT NULL, " +
-                    ReadingListItems.TITLE + " TEXT, " +
-                    ReadingListItems.EXCERPT + " TEXT, " +
-                    ReadingListItems.READ + " TINYINT DEFAULT 0, " +
-                    ReadingListItems.IS_DELETED + " TINYINT DEFAULT 0, " +
-                    ReadingListItems.GUID + " TEXT UNIQUE NOT NULL, " +
-                    ReadingListItems.DATE_MODIFIED + " INTEGER NOT NULL, " +
-                    ReadingListItems.DATE_CREATED + " INTEGER NOT NULL, " +
-                    ReadingListItems.LENGTH + " INTEGER DEFAULT 0, " +
-                    ReadingListItems.CONTENT_STATUS + " TINYINT DEFAULT " + ReadingListItems.STATUS_UNFETCHED + "); ");
-
-        db.execSQL("CREATE INDEX reading_list_url ON " + TABLE_READING_LIST + "("
-                + ReadingListItems.URL + ")");
-        db.execSQL("CREATE UNIQUE INDEX reading_list_guid ON " + TABLE_READING_LIST + "("
-                + ReadingListItems.GUID + ")");
-        db.execSQL("CREATE INDEX reading_list_content_status ON " + TABLE_READING_LIST + "("
-                + ReadingListItems.CONTENT_STATUS + ")");
+        db.execSQL("CREATE TABLE " + tableName + "(" +
+                   ReadingListItems._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                   ReadingListItems.GUID + " TEXT UNIQUE, " +                          // Server-assigned.
+
+                   ReadingListItems.CONTENT_STATUS + " TINYINT NOT NULL DEFAULT " + ReadingListItems.STATUS_UNFETCHED + ", " +
+                   ReadingListItems.SYNC_STATUS + " TINYINT NOT NULL DEFAULT " + ReadingListItems.SYNC_STATUS_NEW + ", " +
+                   ReadingListItems.SYNC_CHANGE_FLAGS + " TINYINT NOT NULL DEFAULT " + ReadingListItems.SYNC_CHANGE_NONE + ", " +
+
+                   ReadingListItems.CLIENT_LAST_MODIFIED + " INTEGER NOT NULL, " +     // Client time.
+                   ReadingListItems.SERVER_LAST_MODIFIED + " INTEGER, " +              // Server-assigned.
+
+                   // Server-assigned.
+                   ReadingListItems.SERVER_STORED_ON + " INTEGER, " +
+                   ReadingListItems.ADDED_ON + " INTEGER, " +                   // Client time. Shouldn't be null, but not enforced. Formerly DATE_CREATED.
+                   ReadingListItems.MARKED_READ_ON + " INTEGER, " +
+
+                   // These boolean flags represent the server 'status', 'unread', 'is_article', and 'favorite' fields.
+                   ReadingListItems.IS_DELETED + " TINYINT NOT NULL DEFAULT 0, " +
+                   ReadingListItems.IS_ARCHIVED + " TINYINT NOT NULL DEFAULT 0, " +
+                   ReadingListItems.IS_UNREAD + " TINYINT NOT NULL DEFAULT 1, " +
+                   ReadingListItems.IS_ARTICLE + " TINYINT NOT NULL DEFAULT 0, " +
+                   ReadingListItems.IS_FAVORITE + " TINYINT NOT NULL DEFAULT 0, " +
+
+                   ReadingListItems.URL + " TEXT NOT NULL, " +
+                   ReadingListItems.TITLE + " TEXT, " +
+                   ReadingListItems.RESOLVED_URL + " TEXT, " +
+                   ReadingListItems.RESOLVED_TITLE + " TEXT, " +
+
+                   ReadingListItems.EXCERPT + " TEXT, " +
+
+                   ReadingListItems.ADDED_BY + " TEXT, " +
+                   ReadingListItems.MARKED_READ_BY + " TEXT, " +
+
+                   ReadingListItems.WORD_COUNT + " INTEGER DEFAULT 0, " +
+                   ReadingListItems.READ_POSITION + " INTEGER DEFAULT 0 " +
+                "); ");
+    }
+
+    private void createReadingListIndices(final SQLiteDatabase db, final String tableName) {
+        // No need to create an index on GUID; it's a UNIQUE column.
+        db.execSQL("CREATE INDEX reading_list_url ON " + tableName + "("
+                           + ReadingListItems.URL + ")");
+        db.execSQL("CREATE INDEX reading_list_content_status ON " + tableName + "("
+                           + ReadingListItems.CONTENT_STATUS + ")");
     }
 
     private void createOrUpdateAllSpecialFolders(SQLiteDatabase db) {
@@ -687,8 +715,7 @@
     }
 
     /*
-     * Moves reading list items from 'bookmarks' table to 'reading_list' table. Uses the
-     * same item GUID.
+     * Moves reading list items from 'bookmarks' table to 'reading_list' table.
      */
     private void upgradeDatabaseFrom17to18(SQLiteDatabase db) {
         debug("Moving reading list items from 'bookmarks' table to 'reading_list' table");
@@ -701,49 +728,60 @@
                                         Bookmarks.DATE_MODIFIED,
                                         Bookmarks.DATE_CREATED,
                                         Bookmarks.TITLE };
-        Cursor cursor = null;
+
         try {
-            // Start transaction
             db.beginTransaction();
 
-            // Create 'reading_list' table
-            createReadingListTable(db);
+            // Create 'reading_list' table.
+            createReadingListTable(db, TABLE_READING_LIST);
 
-            // Get all the reading list items from bookmarks table
-            cursor = db.query(TABLE_BOOKMARKS, projection, selection, selectionArgs,
-                         null, null, null);
+            // Get all the reading list items from bookmarks table.
+            final Cursor cursor = db.query(TABLE_BOOKMARKS, projection, selection, selectionArgs, null, null, null);
 
-            // Insert reading list items into reading_list table
-            while (cursor.moveToNext()) {
-                debug(DatabaseUtils.dumpCurrentRowToString(cursor));
-                ContentValues values = new ContentValues();
-                DatabaseUtils.cursorStringToContentValues(cursor, Bookmarks.URL, values, ReadingListItems.URL);
-                DatabaseUtils.cursorStringToContentValues(cursor, Bookmarks.GUID, values, ReadingListItems.GUID);
-                DatabaseUtils.cursorStringToContentValues(cursor, Bookmarks.TITLE, values, ReadingListItems.TITLE);
-                DatabaseUtils.cursorLongToContentValues(cursor, Bookmarks.DATE_CREATED, values, ReadingListItems.DATE_CREATED);
-                DatabaseUtils.cursorLongToContentValues(cursor, Bookmarks.DATE_MODIFIED, values, ReadingListItems.DATE_MODIFIED);
+            if (cursor == null) {
+                // This should never happen.
+                db.setTransactionSuccessful();
+                return;
+            }
+
+            try {
+                // Insert reading list items into reading_list table.
+                while (cursor.moveToNext()) {
+                    debug(DatabaseUtils.dumpCurrentRowToString(cursor));
+                    final ContentValues values = new ContentValues();
+
+                    // We don't preserve bookmark GUIDs.
+                    DatabaseUtils.cursorStringToContentValues(cursor, Bookmarks.URL, values, ReadingListItems.URL);
+                    DatabaseUtils.cursorStringToContentValues(cursor, Bookmarks.TITLE, values, ReadingListItems.TITLE);
+                    DatabaseUtils.cursorLongToContentValues(cursor, Bookmarks.DATE_CREATED, values, ReadingListItems.ADDED_ON);
+                    DatabaseUtils.cursorLongToContentValues(cursor, Bookmarks.DATE_MODIFIED, values, ReadingListItems.CLIENT_LAST_MODIFIED);
 
-                db.insertOrThrow(TABLE_READING_LIST, null, values);
+                    db.insertOrThrow(TABLE_READING_LIST, null, values);
+                }
+            } finally {
+                cursor.close();
             }
 
-            // Delete reading list items from bookmarks table
+            // Delete reading list items from bookmarks table.
             db.delete(TABLE_BOOKMARKS,
                       Bookmarks.PARENT + " = ? ",
                       new String[] { String.valueOf(Bookmarks.FIXED_READING_LIST_ID) });
 
-            // Delete reading list special folder
+            // Delete reading list special folder.
             db.delete(TABLE_BOOKMARKS,
                       Bookmarks._ID + " = ? ",
                       new String[] { String.valueOf(Bookmarks.FIXED_READING_LIST_ID) });
-            // Done
+
+            // Create indices.
+            createReadingListIndices(db, TABLE_READING_LIST);
+
+            // Done.
             db.setTransactionSuccessful();
+            didCreateCurrentReadingListTable = true;
 
         } catch (SQLException e) {
             Log.e(LOGTAG, "Error migrating reading list items", e);
         } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
             db.endTransaction();
         }
     }
@@ -766,6 +804,11 @@
     }
 
     private void upgradeDatabaseFrom21to22(SQLiteDatabase db) {
+        if (didCreateCurrentReadingListTable) {
+            debug("No need to add CONTENT_STATUS to reading list; we just created with the current schema.");
+            return;
+        }
+
         debug("Adding CONTENT_STATUS column to reading list table.");
 
         try {
@@ -782,6 +825,60 @@
         }
     }
 
+    private void upgradeDatabaseFrom22to23(SQLiteDatabase db) {
+        if (didCreateCurrentReadingListTable) {
+            debug("No need to rev reading list schema; we just created with the current schema.");
+            return;
+        }
+
+        debug("Rewriting reading list table.");
+        createReadingListTable(db, "tmp_rl");
+
+        // Remove indexes. We don't need them now, and we'll be throwing away the table.
+        db.execSQL("DROP INDEX IF EXISTS reading_list_url");
+        db.execSQL("DROP INDEX IF EXISTS reading_list_guid");
+        db.execSQL("DROP INDEX IF EXISTS reading_list_content_status");
+
+        final String thisDevice = ReadingListProvider.PLACEHOLDER_THIS_DEVICE;
+        db.execSQL("INSERT INTO tmp_rl (" +
+                   // Here are the columns we can preserve.
+                   ReadingListItems._ID + ", " +
+                   ReadingListItems.URL + ", " +
+                   ReadingListItems.TITLE + ", " +
+                   ReadingListItems.RESOLVED_TITLE + ", " +       // = TITLE (if CONTENT_STATUS = STATUS_FETCHED_ARTICLE)
+                   ReadingListItems.RESOLVED_URL + ", " +         // = URL (if CONTENT_STATUS = STATUS_FETCHED_ARTICLE)
+                   ReadingListItems.EXCERPT + ", " +
+                   ReadingListItems.IS_UNREAD + ", " +            // = !READ
+                   ReadingListItems.IS_DELETED + ", " +           // = 0
+                   ReadingListItems.GUID + ", " +                 // = NULL
+                   ReadingListItems.CLIENT_LAST_MODIFIED + ", " + // = DATE_MODIFIED
+                   ReadingListItems.ADDED_ON + ", " +             // = DATE_CREATED
+                   ReadingListItems.CONTENT_STATUS + ", " +
+                   ReadingListItems.MARKED_READ_BY + ", " +       // if READ + ", = this device
+                   ReadingListItems.ADDED_BY +                    // = this device
+                   ") " +
+                   "SELECT " +
+                   "_id, url, title, " +
+                   "CASE content_status WHEN " + ReadingListItems.STATUS_FETCHED_ARTICLE + " THEN title ELSE NULL END, " +   // RESOLVED_TITLE.
+                   "CASE content_status WHEN " + ReadingListItems.STATUS_FETCHED_ARTICLE + " THEN url ELSE NULL END, " +     // RESOLVED_URL.
+                   "excerpt, " +
+                   "CASE read WHEN 1 THEN 0 ELSE 1 END, " +            // IS_UNREAD.
+                   "0, " +                                             // IS_DELETED.
+                   "NULL, modified, created, content_status, " +
+                   "CASE read WHEN 1 THEN ? ELSE NULL END, " +         // MARKED_READ_BY.
+                   "?" +                                               // ADDED_BY.
+                   " FROM " + TABLE_READING_LIST +
+                   " WHERE deleted = 0",
+                   new String[] {thisDevice, thisDevice});
+
+        // Now switch these tables over and recreate the indices.
+        db.execSQL("DROP TABLE " + TABLE_READING_LIST);
+        db.execSQL("ALTER TABLE tmp_rl RENAME TO " + TABLE_READING_LIST);
+
+        createReadingListIndices(db, TABLE_READING_LIST);
+    }
+
+
     private void createV19CombinedView(SQLiteDatabase db) {
         db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED);
         db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED_WITH_FAVICONS);
@@ -847,11 +944,11 @@
                     break;
 
                 case 22:
-                    if (oldVersion <= 17) {
-                         // We just created the right table in 17to18. Do nothing here.
-                    } else {
-                         upgradeDatabaseFrom21to22(db);
-                    }
+                    upgradeDatabaseFrom21to22(db);
+                    break;
+
+                case 23:
+                    upgradeDatabaseFrom22to23(db);
                     break;
             }
         }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/DBUtils.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/DBUtils.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/DBUtils.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/DBUtils.java	2015-02-28 15:03:07.000000000 +0000
@@ -4,7 +4,11 @@
 
 package org.mozilla.gecko.db;
 
+import android.annotation.TargetApi;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteStatement;
+import android.os.Build;
+import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoProfile;
 
@@ -15,6 +19,9 @@
 import android.text.TextUtils;
 import android.util.Log;
 import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.mozglue.RobocopTarget;
+
+import java.util.Map;
 
 public class DBUtils {
     private static final String LOGTAG = "GeckoDBUtils";
@@ -173,4 +180,175 @@
         }
         return appendProfile(profile, uri);
     }
+
+    /**
+     * Use the following when no conflict action is specified.
+     */
+    private static final int CONFLICT_NONE = 0;
+    private static final String[] CONFLICT_VALUES = new String[] {"", " OR ROLLBACK ", " OR ABORT ", " OR FAIL ", " OR IGNORE ", " OR REPLACE "};
+
+    /**
+     * Convenience method for updating rows in the database.
+     *
+     * @param table the table to update in
+     * @param values a map from column names to new column values. null is a
+     *            valid value that will be translated to NULL.
+     * @param whereClause the optional WHERE clause to apply when updating.
+     *            Passing null will update all rows.
+     * @param whereArgs You may include ?s in the where clause, which
+     *            will be replaced by the values from whereArgs. The values
+     *            will be bound as Strings.
+     * @return the number of rows affected
+     */
+    @RobocopTarget
+    public static int updateArrays(SQLiteDatabase db, String table, ContentValues[] values, UpdateOperation[] ops, String whereClause, String[] whereArgs) {
+        return updateArraysWithOnConflict(db, table, values, ops, whereClause, whereArgs, CONFLICT_NONE, true);
+    }
+
+    public static void updateArraysBlindly(SQLiteDatabase db, String table, ContentValues[] values, UpdateOperation[] ops, String whereClause, String[] whereArgs) {
+        updateArraysWithOnConflict(db, table, values, ops, whereClause, whereArgs, CONFLICT_NONE, false);
+    }
+
+    @RobocopTarget
+    public enum UpdateOperation {
+        ASSIGN,
+        BITWISE_OR,
+    }
+
+    /**
+     * This is an evil reimplementation of SQLiteDatabase's methods to allow for
+     * smarter updating.
+     *
+     * Each ContentValues has an associated enum that describes how to unify input values with the existing column values.
+     */
+    private static int updateArraysWithOnConflict(SQLiteDatabase db, String table,
+                                          ContentValues[] values,
+                                          UpdateOperation[] ops,
+                                          String whereClause,
+                                          String[] whereArgs,
+                                          int conflictAlgorithm,
+                                          boolean returnChangedRows) {
+        if (values == null || values.length == 0) {
+            throw new IllegalArgumentException("Empty values");
+        }
+
+        if (ops == null || ops.length != values.length) {
+            throw new IllegalArgumentException("ops and values don't match");
+        }
+
+        StringBuilder sql = new StringBuilder(120);
+        sql.append("UPDATE ");
+        sql.append(CONFLICT_VALUES[conflictAlgorithm]);
+        sql.append(table);
+        sql.append(" SET ");
+
+        // move all bind args to one array
+        int setValuesSize = 0;
+        for (int i = 0; i < values.length; i++) {
+            setValuesSize += values[i].size();
+        }
+
+        int bindArgsSize = (whereArgs == null) ? setValuesSize : (setValuesSize + whereArgs.length);
+        Object[] bindArgs = new Object[bindArgsSize];
+
+        int arg = 0;
+        for (int i = 0; i < values.length; i++) {
+            final ContentValues v = values[i];
+            final UpdateOperation op = ops[i];
+
+            // Alas, code duplication.
+            switch (op) {
+                case ASSIGN:
+                    for (Map.Entry<String, Object> entry : v.valueSet()) {
+                        final String colName = entry.getKey();
+                        sql.append((arg > 0) ? "," : "");
+                        sql.append(colName);
+                        bindArgs[arg++] = entry.getValue();
+                        sql.append("= ?");
+                    }
+                    break;
+                case BITWISE_OR:
+                    for (Map.Entry<String, Object> entry : v.valueSet()) {
+                        final String colName = entry.getKey();
+                        sql.append((arg > 0) ? "," : "");
+                        sql.append(colName);
+                        bindArgs[arg++] = entry.getValue();
+                        sql.append("= ? | ");
+                        sql.append(colName);
+                    }
+                    break;
+            }
+        }
+
+        if (whereArgs != null) {
+            for (arg = setValuesSize; arg < bindArgsSize; arg++) {
+                bindArgs[arg] = whereArgs[arg - setValuesSize];
+            }
+        }
+        if (!TextUtils.isEmpty(whereClause)) {
+            sql.append(" WHERE ");
+            sql.append(whereClause);
+        }
+
+        // What a huge pain in the ass, all because SQLiteDatabase doesn't expose .executeSql,
+        // and we can't get a DB handle. Nor can we easily construct a statement with arguments
+        // already bound.
+        final SQLiteStatement statement = db.compileStatement(sql.toString());
+        try {
+            bindAllArgs(statement, bindArgs);
+            if (!returnChangedRows) {
+                statement.execute();
+                return 0;
+            }
+
+            if (AppConstants.Versions.feature11Plus) {
+                // This is a separate method so we can annotate it with @TargetApi.
+                return executeStatementReturningChangedRows(statement);
+            } else {
+                statement.execute();
+                final Cursor cursor = db.rawQuery("SELECT changes()", null);
+                try {
+                    cursor.moveToFirst();
+                    return cursor.getInt(0);
+                } finally {
+                    cursor.close();
+                }
+
+            }
+        } finally {
+            statement.close();
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    private static int executeStatementReturningChangedRows(SQLiteStatement statement) {
+        return statement.executeUpdateDelete();
+    }
+
+    // All because {@link SQLiteProgram#bind(integer, Object)} is private.
+    private static void bindAllArgs(SQLiteStatement statement, Object[] bindArgs) {
+        if (bindArgs == null) {
+            return;
+        }
+        for (int i = bindArgs.length; i != 0; i--) {
+            Object v = bindArgs[i - 1];
+            if (v == null) {
+                statement.bindNull(i);
+            } else if (v instanceof String) {
+                statement.bindString(i, (String) v);
+            } else if (v instanceof Double) {
+                statement.bindDouble(i, (Double) v);
+            } else if (v instanceof Float) {
+                statement.bindDouble(i, (Float) v);
+            } else if (v instanceof Long) {
+                statement.bindLong(i, (Long) v);
+            } else if (v instanceof Integer) {
+                statement.bindLong(i, (Integer) v);
+            } else if (v instanceof Byte) {
+                statement.bindLong(i, (Byte) v);
+            } else if (v instanceof byte[]) {
+                statement.bindBlob(i, (byte[]) v);
+            }
+        }
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/LocalBrowserDB.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/LocalBrowserDB.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/LocalBrowserDB.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/LocalBrowserDB.java	2015-02-28 15:03:07.000000000 +0000
@@ -32,6 +32,7 @@
 import org.mozilla.gecko.db.BrowserContract.Favicons;
 import org.mozilla.gecko.db.BrowserContract.History;
 import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
+import org.mozilla.gecko.db.BrowserContract.SearchHistory;
 import org.mozilla.gecko.db.BrowserContract.SyncColumns;
 import org.mozilla.gecko.db.BrowserContract.Thumbnails;
 import org.mozilla.gecko.distribution.Distribution;
@@ -98,6 +99,7 @@
     private final Uri mUpdateHistoryUriWithProfile;
     private final Uri mFaviconsUriWithProfile;
     private final Uri mThumbnailsUriWithProfile;
+    private final Uri mSearchHistoryUri;
 
     private LocalSearches searches;
     private LocalTabsAccessor tabsAccessor;
@@ -124,6 +126,8 @@
         mFaviconsUriWithProfile = DBUtils.appendProfile(profile, Favicons.CONTENT_URI);
         mThumbnailsUriWithProfile = DBUtils.appendProfile(profile, Thumbnails.CONTENT_URI);
 
+        mSearchHistoryUri = BrowserContract.SearchHistory.CONTENT_URI;
+
         mUpdateHistoryUriWithProfile =
                 mHistoryUriWithProfile.buildUpon()
                                       .appendQueryParameter(BrowserContract.PARAM_INCREMENT_VISITS, "true")
@@ -718,6 +722,7 @@
     @Override
     public void clearHistory(ContentResolver cr) {
         cr.delete(mHistoryUriWithProfile, null, null);
+        cr.delete(mSearchHistoryUri, null, null);
     }
 
     @Override
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/LocalReadingListAccessor.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/LocalReadingListAccessor.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/LocalReadingListAccessor.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/LocalReadingListAccessor.java	2015-02-28 15:03:07.000000000 +0000
@@ -5,62 +5,75 @@
 package org.mozilla.gecko.db;
 
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
+import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
+import org.mozilla.gecko.mozglue.RobocopTarget;
 
+
+@RobocopTarget
 public class LocalReadingListAccessor implements ReadingListAccessor {
     private static final String LOG_TAG = "GeckoReadingListAcc";
 
+    private static final String NOT_DELETED = ReadingListItems.IS_DELETED + " = 0";
+    private static final String NEITHER_DELETED_NOR_ARCHIVED = ReadingListItems.IS_ARCHIVED + " = 0 AND " + ReadingListItems.IS_DELETED + " = 0";
+    private static final String ITEMS_TO_FETCH = ReadingListItems.CONTENT_STATUS + " = " + ReadingListItems.STATUS_UNFETCHED + " AND " + NEITHER_DELETED_NOR_ARCHIVED;
+    private static final String SORT_ORDER_RECENT_FIRST = "COALESCE(" + ReadingListItems.SERVER_STORED_ON + ", " + ReadingListItems.ADDED_ON + ") DESC";
+
     private final Uri mReadingListUriWithProfile;
 
     public LocalReadingListAccessor(final String profile) {
-        mReadingListUriWithProfile = DBUtils.appendProfile(profile, BrowserContract.ReadingListItems.CONTENT_URI);
+        mReadingListUriWithProfile = DBUtils.appendProfile(profile, ReadingListItems.CONTENT_URI);
     }
 
+    // Return a count of non-deleted items.
     @Override
     public int getCount(ContentResolver cr) {
-        final String[] columns = new String[]{BrowserContract.ReadingListItems._ID};
-        final Cursor cursor = cr.query(mReadingListUriWithProfile, columns, null, null, null);
-        int count = 0;
+        final String[] columns = new String[]{ReadingListItems._ID};
+        final Cursor cursor = cr.query(mReadingListUriWithProfile, columns, NOT_DELETED, null, null);
 
         try {
-            count = cursor.getCount();
+            return cursor.getCount();
         } finally {
             cursor.close();
         }
-
-        Log.d(LOG_TAG, "Got count " + count + " for reading list.");
-        return count;
     }
 
     @Override
     public Cursor getReadingList(ContentResolver cr) {
+        // Return non-deleted, non-archived items, ordered by either server stored data or local added date,
+        // descending.
+        // This isn't ideal -- it depends on upload order! -- but the alternative is that a client with a
+        // very skewed clock will force its items to the front or end of the list on other devices.
         return cr.query(mReadingListUriWithProfile,
-                        BrowserContract.ReadingListItems.DEFAULT_PROJECTION,
+                        ReadingListItems.DEFAULT_PROJECTION,
+                        NEITHER_DELETED_NOR_ARCHIVED,
                         null,
-                        null,
-                        null);
+                        SORT_ORDER_RECENT_FIRST);
     }
 
     @Override
     public Cursor getReadingListUnfetched(ContentResolver cr) {
+        // Return unfetched, non-deleted, non-archived items, sorted by date added, newest first.
+        // This allows us to fetch the top of the list first.
         return cr.query(mReadingListUriWithProfile,
-                        new String[] { BrowserContract.ReadingListItems._ID, BrowserContract.ReadingListItems.URL },
-                        BrowserContract.ReadingListItems.CONTENT_STATUS + " = " + BrowserContract.ReadingListItems.STATUS_UNFETCHED,
+                        new String[] { ReadingListItems._ID, ReadingListItems.URL },
+                        ITEMS_TO_FETCH,
                         null,
-                        null);
+                        SORT_ORDER_RECENT_FIRST);
     }
 
     @Override
     public boolean isReadingListItem(ContentResolver cr, String uri) {
         final Cursor c = cr.query(mReadingListUriWithProfile,
-                                  new String[] { BrowserContract.ReadingListItems._ID },
-                                  BrowserContract.ReadingListItems.URL + " = ? ",
-                                  new String[] { uri },
+                                  new String[] { ReadingListItems._ID },
+                                  ReadingListItems.URL + " = ? OR " + ReadingListItems.RESOLVED_URL + " = ?",
+                                  new String[] { uri, uri },
                                   null);
 
         if (c == null) {
@@ -69,7 +82,7 @@
         }
 
         try {
-            return c.getCount() > 0;
+            return c.moveToNext();
         } finally {
             c.close();
         }
@@ -77,52 +90,91 @@
 
 
     @Override
-    public void addReadingListItem(ContentResolver cr, ContentValues values) {
+    public long addReadingListItem(ContentResolver cr, ContentValues values) {
         // Check that required fields are present.
-        for (String field: BrowserContract.ReadingListItems.REQUIRED_FIELDS) {
+        for (String field: ReadingListItems.REQUIRED_FIELDS) {
             if (!values.containsKey(field)) {
                 throw new IllegalArgumentException("Missing required field for reading list item: " + field);
             }
         }
 
-        // Clear delete flag if necessary
-        values.put(BrowserContract.ReadingListItems.IS_DELETED, 0);
+        // We're adding locally, so we can specify these.
+        values.put(ReadingListItems.ADDED_ON, System.currentTimeMillis());
+        values.put(ReadingListItems.ADDED_BY, ReadingListProvider.PLACEHOLDER_THIS_DEVICE);
+
+        // We never un-delete (and we can't; we wipe as we go).
+        // Re-add if necessary and allow the server to resolve conflicts.
+        return ContentUris.parseId(cr.insert(mReadingListUriWithProfile, values));
+    }
 
-        // Restore deleted record if possible
-        final Uri insertUri = mReadingListUriWithProfile
-                .buildUpon()
-                .appendQueryParameter(BrowserContract.PARAM_INSERT_IF_NEEDED, "true")
-                .build();
-
-        final int updated = cr.update(insertUri,
-                values,
-                BrowserContract.ReadingListItems.URL + " = ? ",
-                new String[] { values.getAsString(BrowserContract.ReadingListItems.URL) });
+    @Override
+    public long addBasicReadingListItem(ContentResolver cr, String url, String title) {
+        if (url == null) {
+            throw new IllegalArgumentException("URL must not be null.");
+        }
+        final ContentValues values = new ContentValues();
+        values.put(ReadingListItems.URL, url);
+        if (title != null) {
+            values.put(ReadingListItems.TITLE, title);
+        } else {
+            values.putNull(ReadingListItems.TITLE);
+        }
 
-        Log.d(LOG_TAG, "Updated " + updated + " rows to new modified time.");
+        return addReadingListItem(cr, values);
     }
 
     @Override
     public void updateReadingListItem(ContentResolver cr, ContentValues values) {
-        if (!values.containsKey(BrowserContract.ReadingListItems._ID)) {
+        if (!values.containsKey(ReadingListItems._ID)) {
             throw new IllegalArgumentException("Cannot update reading list item without an ID");
         }
 
         final int updated = cr.update(mReadingListUriWithProfile,
                                       values,
-                                      BrowserContract.ReadingListItems._ID + " = ? ",
-                                      new String[] { values.getAsString(BrowserContract.ReadingListItems._ID) });
+                                      ReadingListItems._ID + " = ? ",
+                                      new String[] { values.getAsString(ReadingListItems._ID) });
 
         Log.d(LOG_TAG, "Updated " + updated + " reading list rows.");
     }
 
     @Override
     public void removeReadingListItemWithURL(ContentResolver cr, String uri) {
-        cr.delete(mReadingListUriWithProfile, BrowserContract.ReadingListItems.URL + " = ? ", new String[]{uri});
+        cr.delete(mReadingListUriWithProfile,
+                  ReadingListItems.URL + " = ? OR " + ReadingListItems.RESOLVED_URL + " = ?",
+                  new String[]{ uri, uri });
+    }
+
+    @Override
+    public void deleteItem(ContentResolver cr, long itemID) {
+        cr.delete(ContentUris.appendId(mReadingListUriWithProfile.buildUpon(), itemID).build(),
+                  null, null);
     }
 
     @Override
     public void registerContentObserver(Context context, ContentObserver observer) {
         context.getContentResolver().registerContentObserver(mReadingListUriWithProfile, false, observer);
     }
+
+    @Override
+    public void markAsRead(ContentResolver cr, long itemID) {
+        final ContentValues values = new ContentValues();
+        values.put(ReadingListItems.MARKED_READ_BY, ReadingListProvider.PLACEHOLDER_THIS_DEVICE);
+        values.put(ReadingListItems.MARKED_READ_ON, System.currentTimeMillis());
+        values.put(ReadingListItems.IS_UNREAD, 0);
+
+        // The ContentProvider will take care of updating the sync metadata.
+        cr.update(mReadingListUriWithProfile, values, ReadingListItems._ID + " = " + itemID, null);
+    }
+
+    @Override
+    public void updateContent(ContentResolver cr, long itemID, String resolvedTitle, String resolvedURL, String excerpt) {
+        final ContentValues values = new ContentValues();
+        values.put(ReadingListItems.CONTENT_STATUS, ReadingListItems.STATUS_FETCHED_ARTICLE);
+        values.put(ReadingListItems.RESOLVED_URL, resolvedURL);
+        values.put(ReadingListItems.RESOLVED_TITLE, resolvedTitle);
+        values.put(ReadingListItems.EXCERPT, excerpt);
+
+        // The ContentProvider will take care of updating the sync metadata.
+        cr.update(mReadingListUriWithProfile, values, ReadingListItems._ID + " = " + itemID, null);
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/LocalTabsAccessor.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/LocalTabsAccessor.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/LocalTabsAccessor.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/LocalTabsAccessor.java	2015-02-28 15:03:07.000000000 +0000
@@ -259,17 +259,4 @@
     private boolean isFilteredURL(String url) {
         return FILTERED_URL_PATTERN.matcher(url).lookingAt();
     }
-
-    /**
-     * Return a relative "Last synced" time span for the given tab record.
-     *
-     * @param now local time.
-     * @param time to format string for.
-     * @return string describing time span
-     */
-    @Override
-    public String getLastSyncedString(Context context, long now, long time) {
-        final CharSequence relativeTimeSpanString = DateUtils.getRelativeTimeSpanString(time, now, DateUtils.MINUTE_IN_MILLIS);
-        return context.getResources().getString(R.string.remote_tabs_last_synced, relativeTimeSpanString);
-    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/PerProfileDatabases.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/PerProfileDatabases.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/PerProfileDatabases.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/PerProfileDatabases.java	2015-02-28 15:03:07.000000000 +0000
@@ -24,6 +24,19 @@
     private final String mDatabaseName;
     private final DatabaseHelperFactory<T> mHelperFactory;
 
+    // Only used during tests.
+    public void shutdown() {
+        synchronized (this) {
+            for (T t : mStorages.values()) {
+                try {
+                    t.close();
+                } catch (Throwable e) {
+                    // Never mind.
+                }
+            }
+        }
+    }
+
     public interface DatabaseHelperFactory<T> {
         public T makeDatabaseHelper(Context context, String databasePath);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/ReadingListAccessor.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/ReadingListAccessor.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/ReadingListAccessor.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/ReadingListAccessor.java	2015-02-28 15:03:07.000000000 +0000
@@ -9,9 +9,14 @@
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
+import org.mozilla.gecko.mozglue.RobocopTarget;
 
+@RobocopTarget
 public interface ReadingListAccessor {
     /**
+     * Returns non-deleted, non-archived items.
+     * Fennec doesn't currently offer a way to display archived items.
+     *
      * Can return <code>null</code>.
      */
     Cursor getReadingList(ContentResolver cr);
@@ -22,11 +27,16 @@
 
     boolean isReadingListItem(ContentResolver cr, String uri);
 
-    void addReadingListItem(ContentResolver cr, ContentValues values);
+    long addReadingListItem(ContentResolver cr, ContentValues values);
+    long addBasicReadingListItem(ContentResolver cr, String url, String title);
 
     void updateReadingListItem(ContentResolver cr, ContentValues values);
 
     void removeReadingListItemWithURL(ContentResolver cr, String uri);
 
     void registerContentObserver(Context context, ContentObserver observer);
+
+    void markAsRead(ContentResolver cr, long itemID);
+    void updateContent(ContentResolver cr, long itemID, String resolvedTitle, String resolvedURL, String excerpt);
+    void deleteItem(ContentResolver cr, long itemID);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/ReadingListProvider.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/ReadingListProvider.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/ReadingListProvider.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/ReadingListProvider.java	2015-02-28 15:03:07.000000000 +0000
@@ -4,9 +4,6 @@
 
 package org.mozilla.gecko.db;
 
-import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
-import org.mozilla.gecko.sync.Utils;
-
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.UriMatcher;
@@ -16,13 +13,17 @@
 import android.net.Uri;
 import android.text.TextUtils;
 
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.*;
+
 public class ReadingListProvider extends SharedBrowserDatabaseProvider {
-    static final String TABLE_READING_LIST = ReadingListItems.TABLE_NAME;
+    static final String TABLE_READING_LIST = TABLE_NAME;
 
     static final int ITEMS = 101;
     static final int ITEMS_ID = 102;
     static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
 
+    public static final String PLACEHOLDER_THIS_DEVICE = "$local";
+
     static {
         URI_MATCHER.addURI(BrowserContract.READING_LIST_AUTHORITY, "items", ITEMS);
         URI_MATCHER.addURI(BrowserContract.READING_LIST_AUTHORITY, "items/#", ITEMS_ID);
@@ -32,81 +33,213 @@
      * Updates items that match the selection criteria. If no such items is found
      * one is inserted with the attributes passed in. Returns 0 if no item updated.
      *
+     * Only use this method for callers, not internally -- it futzes with the provided
+     * values to set syncing flags.
+     *
      * @return Number of items updated or inserted
      */
     public int updateOrInsertItem(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        int updated = updateItems(uri, values, selection, selectionArgs);
+        if (!values.containsKey(CLIENT_LAST_MODIFIED)) {
+            values.put(CLIENT_LAST_MODIFIED, System.currentTimeMillis());
+        }
+
+        if (isCallerSync(uri)) {
+            int updated = updateItemsWithFlags(uri, values, null, selection, selectionArgs);
+            if (updated > 0) {
+                return updated;
+            }
+            return insertItem(uri, values) != -1 ? 1 : 0;
+        }
+
+        // Assume updated.
+        final ContentValues flags = processChangeValues(values);
+
+        int updated = updateItemsWithFlags(uri, values, flags, selection, selectionArgs);
         if (updated <= 0) {
+            // Must be an insertion. Let's make sure we're NEW and discard any update flags.
+            values.put(SYNC_STATUS, SYNC_STATUS_NEW);
+            values.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_NONE);
             updated = insertItem(uri, values) != -1 ? 1 : 0;
         }
         return updated;
     }
 
     /**
+     * This method does two things:
+     * * Based on the values provided, it computes and returns an incremental status change
+     *   that can be applied to the database to track changes for syncing. This should be
+     *   applied with {@link org.mozilla.gecko.db.DBUtils.UpdateOperation#BITWISE_OR}.
+     * * It mutates the provided values to mark absolute field changes.
+     *
+     * @return null if no values were provided, or no change needs to be recorded.
+     */
+    private ContentValues processChangeValues(ContentValues values) {
+        if (values == null || values.size() == 0) {
+            return null;
+        }
+
+        // Otherwise, it must have been modified.
+        values.put(SYNC_STATUS, SYNC_STATUS_MODIFIED);
+
+        final ContentValues out = new ContentValues();
+        int flag = 0;
+        if (values.containsKey(MARKED_READ_BY) ||
+            values.containsKey(MARKED_READ_ON) ||
+            values.containsKey(IS_UNREAD)) {
+            flag |= SYNC_CHANGE_UNREAD_CHANGED;
+        }
+
+        if (values.containsKey(IS_FAVORITE)) {
+            flag |= SYNC_CHANGE_FAVORITE_CHANGED;
+        }
+
+        if (values.containsKey(RESOLVED_URL) ||
+            values.containsKey(RESOLVED_TITLE) ||
+            values.containsKey(EXCERPT)) {
+            flag |= SYNC_CHANGE_RESOLVED;
+        }
+
+        if (flag == 0) {
+            return null;
+        }
+
+        out.put(SYNC_CHANGE_FLAGS, flag);
+        return out;
+    }
+
+    /**
      * Updates items that match the selection criteria.
      *
      * @return Number of items updated or inserted
      */
-    public int updateItems(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+    public int updateItemsWithFlags(Uri uri, ContentValues values, ContentValues flags, String selection, String[] selectionArgs) {
         trace("Updating ReadingListItems on URI: " + uri);
         final SQLiteDatabase db = getWritableDatabase(uri);
-        if (!values.containsKey(ReadingListItems.DATE_MODIFIED)) {
-            values.put(ReadingListItems.DATE_MODIFIED, System.currentTimeMillis());
+        if (!values.containsKey(CLIENT_LAST_MODIFIED)) {
+            values.put(CLIENT_LAST_MODIFIED, System.currentTimeMillis());
+        }
+
+        if (flags == null) {
+            // Dunno what we're doing with the DB that isn't changing anything we care about, but hey.
+            return db.update(TABLE_READING_LIST, values, selection, selectionArgs);
         }
-        return db.update(TABLE_READING_LIST, values, selection, selectionArgs);
+
+        // Otherwise, we need to do smart updating to change flags.
+        final ContentValues[] valuesAndFlags = {values, flags};
+        final DBUtils.UpdateOperation[] ops = {DBUtils.UpdateOperation.ASSIGN, DBUtils.UpdateOperation.BITWISE_OR};
+
+        return DBUtils.updateArrays(db, TABLE_READING_LIST, valuesAndFlags, ops, selection, selectionArgs);
     }
 
     /**
-     * Inserts a new item into the DB. DATE_CREATED, DATE_MODIFIED
-     * and GUID fields are generated if they are not specified.
+     * Inserts a new item into the DB. CLIENT_LAST_MODIFIED is generated if it is not specified.
+     *
+     * Non-Sync callers will have ADDED_ON and ADDED_BY set appropriately if they are missing;
+     * the assumption is that this is a new item added on this device.
      *
      * @return ID of the newly inserted item
      */
-    long insertItem(Uri uri, ContentValues values) {
-        long now = System.currentTimeMillis();
-        if (!values.containsKey(ReadingListItems.DATE_CREATED)) {
-            values.put(ReadingListItems.DATE_CREATED, now);
+    private long insertItem(Uri uri, ContentValues values) {
+        if (!values.containsKey(CLIENT_LAST_MODIFIED)) {
+            values.put(CLIENT_LAST_MODIFIED, System.currentTimeMillis());
         }
 
-        if (!values.containsKey(ReadingListItems.DATE_MODIFIED)) {
-            values.put(ReadingListItems.DATE_MODIFIED, now);
-        }
-
-        if (!values.containsKey(ReadingListItems.GUID)) {
-            values.put(ReadingListItems.GUID, Utils.generateGuid());
+        // We trust the syncing code to specify SYNC_STATUS_SYNCED.
+        if (!isCallerSync(uri)) {
+            values.put(SYNC_STATUS, SYNC_STATUS_NEW);
+            if (!values.containsKey(ADDED_ON)) {
+                values.put(ADDED_ON, System.currentTimeMillis());
+            }
+            if (!values.containsKey(ADDED_BY)) {
+                values.put(ADDED_BY, PLACEHOLDER_THIS_DEVICE);
+            }
         }
 
-        String url = values.getAsString(ReadingListItems.URL);
+        final String url = values.getAsString(URL);
         debug("Inserting item in database with URL: " + url);
-        return getWritableDatabase(uri)
-                .insertOrThrow(TABLE_READING_LIST, null, values);
+        return getWritableDatabase(uri).insertOrThrow(TABLE_READING_LIST, null, values);
+    }
+
+    private static final ContentValues DELETED_VALUES;
+    static {
+        final ContentValues values = new ContentValues();
+        values.put(IS_DELETED, 1);
+
+        values.put(URL, "");             // Non-null column.
+        values.putNull(RESOLVED_URL);
+        values.putNull(RESOLVED_TITLE);
+        values.putNull(TITLE);
+        values.putNull(EXCERPT);
+        values.putNull(ADDED_BY);
+        values.putNull(MARKED_READ_BY);
+
+        // Mark it as deleted for sync purposes.
+        values.put(SYNC_STATUS, SYNC_STATUS_DELETED);
+        values.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_NONE);
+        DELETED_VALUES = values;
     }
 
     /**
      * Deletes items. Item is marked as 'deleted' so that sync can
      * detect the change.
      *
+     * It's the caller's responsibility to handle both original and resolved URLs.
      * @return Number of deleted items
      */
-    int deleteItems(Uri uri, String selection, String[] selectionArgs) {
+    int deleteItems(final Uri uri, String selection, String[] selectionArgs) {
         debug("Deleting item entry for URI: " + uri);
         final SQLiteDatabase db = getWritableDatabase(uri);
 
+        // TODO: also ensure that we delete affected items from the disk cache. Bug 1133158.
         if (isCallerSync(uri)) {
+            debug("Directly deleting from reading list.");
             return db.delete(TABLE_READING_LIST, selection, selectionArgs);
         }
 
-        debug("Marking item entry as deleted for URI: " + uri);
-        ContentValues values = new ContentValues();
-        values.put(ReadingListItems.IS_DELETED, 1);
+        // If we don't have a GUID for this item, then it hasn't made it
+        // to the server. Just delete it.
+        // If we do have a GUID, blank the row and mark it as deleted.
+        int total = 0;
+        final String whereNullGUID = DBUtils.concatenateWhere(selection, GUID + " IS NULL");
+        final String whereNotNullGUID = DBUtils.concatenateWhere(selection, GUID + " IS NOT NULL");
 
-        cleanUpSomeDeletedRecords(uri, TABLE_READING_LIST);
-        return updateItems(uri, values, selection, selectionArgs);
+        total += db.delete(TABLE_READING_LIST, whereNullGUID, selectionArgs);
+        total += updateItemsWithFlags(uri, DELETED_VALUES, null, whereNotNullGUID, selectionArgs);
+
+        return total;
+    }
+
+    int deleteItemByID(final Uri uri, long id) {
+        debug("Deleting item entry for ID: " + id);
+        final SQLiteDatabase db = getWritableDatabase(uri);
+
+        // TODO: also ensure that we delete affected items from the disk cache. Bug 1133158.
+        if (isCallerSync(uri)) {
+            debug("Directly deleting from reading list.");
+            final String selection = _ID + " = " + id;
+            return db.delete(TABLE_READING_LIST, selection, null);
+        }
+
+        // If we don't have a GUID for this item, then it hasn't made it
+        // to the server. Just delete it.
+        final String whereNullGUID = _ID + " = " + id + " AND " + GUID + " IS NULL";
+        final int raw = db.delete(TABLE_READING_LIST, whereNullGUID, null);
+        if (raw > 0) {
+            // _ID is unique, so this should only ever be 1, but it definitely means
+            // we don't need to try the second part.
+            return raw;
+        }
+
+        // If we do have a GUID, blank the row and mark it as deleted.
+        final String whereNotNullGUID = _ID + " = " + id + " AND " + GUID + " IS NOT NULL";
+        final ContentValues values = new ContentValues(DELETED_VALUES);
+        values.put(CLIENT_LAST_MODIFIED, System.currentTimeMillis());
+        return updateItemsWithFlags(uri, values, null, whereNotNullGUID, null);
     }
 
     @Override
     @SuppressWarnings("fallthrough")
-    public int updateInTransaction(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+    public int updateInTransaction(final Uri uri, ContentValues values, String selection, String[] selectionArgs) {
         trace("Calling update in transaction on URI: " + uri);
 
         int updated = 0;
@@ -121,9 +254,14 @@
 
             case ITEMS: {
                 debug("Updating ITEMS: " + uri);
-                updated = shouldUpdateOrInsert(uri) ?
-                          updateOrInsertItem(uri, values, selection, selectionArgs) :
-                          updateItems(uri, values, selection, selectionArgs);
+                if (shouldUpdateOrInsert(uri)) {
+                    // updateOrInsertItem handles change flags for us.
+                    updated = updateOrInsertItem(uri, values, selection, selectionArgs);
+                } else {
+                    // Don't use flags if we're inserting from sync.
+                    ContentValues flags = isCallerSync(uri) ? null : processChangeValues(values);
+                    updated = updateItemsWithFlags(uri, values, flags, selection, selectionArgs);
+                }
                 break;
             }
 
@@ -141,15 +279,18 @@
     public int deleteInTransaction(Uri uri, String selection, String[] selectionArgs) {
         trace("Calling delete in transaction on URI: " + uri);
 
+        // This will never clean up any items that we're about to delete, so we
+        // might as well run it first!
+        cleanUpSomeDeletedRecords(uri, TABLE_READING_LIST);
+
         int numDeleted = 0;
         int match = URI_MATCHER.match(uri);
 
         switch (match) {
             case ITEMS_ID:
                 debug("Deleting on ITEMS_ID: " + uri);
-                selection = DBUtils.concatenateWhere(selection, TABLE_READING_LIST + "._id = ?");
-                selectionArgs = DBUtils.appendSelectionArgs(selectionArgs,
-                        new String[] { Long.toString(ContentUris.parseId(uri)) });
+                numDeleted = deleteItemByID(uri, ContentUris.parseId(uri));
+                break;
 
             case ITEMS:
                 debug("Deleting ITEMS: " + uri);
@@ -200,14 +341,15 @@
         switch (match) {
             case ITEMS_ID:
                 trace("Query on ITEMS_ID: " + uri);
-                selection = DBUtils.concatenateWhere(selection, ReadingListItems._ID + " = ?");
+                selection = DBUtils.concatenateWhere(selection, _ID + " = ?");
                 selectionArgs = DBUtils.appendSelectionArgs(selectionArgs,
                         new String[] { Long.toString(ContentUris.parseId(uri)) });
 
             case ITEMS:
                 trace("Query on ITEMS: " + uri);
-                if (!shouldShowDeleted(uri))
-                    selection = DBUtils.concatenateWhere(ReadingListItems.IS_DELETED + " = 0", selection);
+                if (!shouldShowDeleted(uri)) {
+                    selection = DBUtils.concatenateWhere(IS_DELETED + " = 0", selection);
+                }
                 break;
 
             default:
@@ -215,7 +357,7 @@
         }
 
         if (TextUtils.isEmpty(sortOrder)) {
-            sortOrder = ReadingListItems.DEFAULT_SORT_ORDER;
+            sortOrder = DEFAULT_SORT_ORDER;
         }
 
         trace("Running built query.");
@@ -234,14 +376,22 @@
         switch (match) {
             case ITEMS:
                 trace("URI is ITEMS: " + uri);
-                return ReadingListItems.CONTENT_TYPE;
+                return CONTENT_TYPE;
 
             case ITEMS_ID:
                 trace("URI is ITEMS_ID: " + uri);
-                return ReadingListItems.CONTENT_ITEM_TYPE;
+                return CONTENT_ITEM_TYPE;
         }
 
         debug("URI has unrecognized type: " + uri);
         return null;
     }
+
+    @Override
+    protected String getDeletedItemSelection(long earlierThan) {
+        if (earlierThan == -1L) {
+            return IS_DELETED + " = 1";
+        }
+        return IS_DELETED + " = 1 AND " + CLIENT_LAST_MODIFIED + " <= " + earlierThan;
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/SharedBrowserDatabaseProvider.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/SharedBrowserDatabaseProvider.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/SharedBrowserDatabaseProvider.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/SharedBrowserDatabaseProvider.java	2015-02-28 15:03:07.000000000 +0000
@@ -38,6 +38,14 @@
         return databases;
     }
 
+    // Can't mark as @Override. Added in API 11.
+    public void shutdown() {
+        synchronized (SharedBrowserDatabaseProvider.class) {
+            databases.shutdown();
+            databases = null;
+        }
+    }
+
     @Override
     public boolean onCreate() {
         // If necessary, do the shared DB work.
@@ -94,9 +102,7 @@
         // Android SQLite doesn't have LIMIT on DELETE. Instead, query for the
         // IDs of matching rows, then delete them in one go.
         final long now = System.currentTimeMillis();
-        final String selection = SyncColumns.IS_DELETED + " = 1 AND " +
-                SyncColumns.DATE_MODIFIED + " <= " +
-                (now - MAX_AGE_OF_DELETED_RECORDS);
+        final String selection = getDeletedItemSelection(now - MAX_AGE_OF_DELETED_RECORDS);
 
         final String profile = fromUri.getQueryParameter(BrowserContract.PARAM_PROFILE);
         final SQLiteDatabase db = getWritableDatabaseForProfile(profile, isTest(fromUri));
@@ -111,4 +117,12 @@
 
         db.delete(tableName, inClause, null);
     }
+
+    // Override this, or override cleanUpSomeDeletedRecords.
+    protected String getDeletedItemSelection(long earlierThan) {
+        if (earlierThan == -1L) {
+            return SyncColumns.IS_DELETED + " = 1";
+        }
+        return SyncColumns.IS_DELETED + " = 1 AND " + SyncColumns.DATE_MODIFIED + " <= " + earlierThan;
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/StubBrowserDB.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/StubBrowserDB.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/StubBrowserDB.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/StubBrowserDB.java	2015-02-28 15:03:07.000000000 +0000
@@ -48,22 +48,37 @@
     }
 
     @Override
-    public void addReadingListItem(ContentResolver cr, ContentValues values) {
+    public long addReadingListItem(ContentResolver cr, ContentValues values) {
+        return 0L;
+    }
 
+    @Override
+    public long addBasicReadingListItem(ContentResolver cr, String url, String title) {
+        return 0L;
     }
 
     @Override
     public void updateReadingListItem(ContentResolver cr, ContentValues values) {
-
     }
 
     @Override
     public void removeReadingListItemWithURL(ContentResolver cr, String uri) {
-
     }
 
     @Override
     public void registerContentObserver(Context context, ContentObserver observer) {
+    }
+
+    @Override
+    public void markAsRead(ContentResolver cr, long itemID) {
+    }
+
+    @Override
+    public void updateContent(ContentResolver cr, long itemID, String resolvedTitle, String resolvedURL, String excerpt) {
+    }
+
+    @Override
+    public void deleteItem(ContentResolver cr, long itemID) {
 
     }
 }
@@ -119,10 +134,6 @@
     }
 
     public synchronized void persistLocalTabs(final ContentResolver cr, final Iterable<Tab> tabs) { }
-
-    public String getLastSyncedString(Context context, long now, long time) {
-        return "";
-    }
 }
 
 /*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/TabsAccessor.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/TabsAccessor.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/db/TabsAccessor.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/db/TabsAccessor.java	2015-02-28 15:03:07.000000000 +0000
@@ -23,5 +23,4 @@
     public void getTabs(final Context context, final OnQueryTabsCompleteListener listener);
     public void getTabs(final Context context, final int limit, final OnQueryTabsCompleteListener listener);
     public void persistLocalTabs(final ContentResolver cr, final Iterable<Tab> tabs);
-    public String getLastSyncedString(Context context, long now, long time);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/distribution/ReferrerReceiver.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/distribution/ReferrerReceiver.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/distribution/ReferrerReceiver.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/distribution/ReferrerReceiver.java	2015-02-28 15:03:07.000000000 +0000
@@ -45,17 +45,19 @@
             return;
         }
 
+        // Track the referrer object for distribution handling.
         ReferrerDescriptor referrer = new ReferrerDescriptor(intent.getStringExtra("referrer"));
 
-        // Track the referrer object for distribution handling.
+        if (!TextUtils.equals(referrer.source, MOZILLA_UTM_SOURCE)) {
+            return;
+        }
+
         if (TextUtils.equals(referrer.campaign, DISTRIBUTION_UTM_CAMPAIGN)) {
             Distribution.onReceivedReferrer(context, referrer);
         } else {
             Log.d(LOGTAG, "Not downloading distribution: non-matching campaign.");
-        }
-
-        // If this is a Mozilla campaign, pass the campaign along to Gecko.
-        if (TextUtils.equals(referrer.source, MOZILLA_UTM_SOURCE)) {
+            // If this is a Mozilla campaign, pass the campaign along to Gecko.
+            // It'll pretend to be a "playstore" distribution for BLP purposes.
             propagateMozillaCampaign(referrer);
         }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/favicons/Favicons.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/favicons/Favicons.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/favicons/Favicons.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/favicons/Favicons.java	2015-02-28 15:03:07.000000000 +0000
@@ -5,10 +5,9 @@
 
 package org.mozilla.gecko.favicons;
 
+import android.graphics.drawable.Drawable;
 import org.mozilla.gecko.AboutPages;
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
@@ -23,11 +22,11 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -450,17 +449,13 @@
             return;
         }
 
-        final boolean isNewTabletEnabled = NewTabletUI.isEnabled(context);
         final Resources res = context.getResources();
 
-        // Decode the default Favicon ready for use. We'd preferably override the drawable for
-        // different screen sizes, but since we need phone's default favicon on tablet (in
-        // ToolbarDisplayLayout), we can't.
-        final int defaultFaviconDrawableID =
-                isNewTabletEnabled ? R.drawable.new_tablet_default_favicon : R.drawable.favicon;
-        defaultFavicon = BitmapFactory.decodeResource(res, defaultFaviconDrawableID);
-        if (defaultFavicon == null) {
-            throw new IllegalStateException("Null default favicon was returned from the resources system!");
+        final Drawable defaultFaviconDrawable = res.getDrawable(R.drawable.toolbar_favicon_default);
+        if (defaultFaviconDrawable instanceof BitmapDrawable) {
+            defaultFavicon = ((BitmapDrawable) defaultFaviconDrawable).getBitmap();
+        } else {
+            throw new IllegalStateException("toolbar_favicon_default wasn't a bitmap resource!");
         }
 
         defaultFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_bg);
@@ -469,10 +464,7 @@
         // downscaled to this size or discarded.
         largestFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_largest_interesting_size);
 
-        // TODO: Remove this branch when old tablet is removed.
-        final int browserToolbarFaviconSizeDimenID = NewTabletUI.isEnabled(context) ?
-                R.dimen.new_tablet_tab_strip_favicon_size : R.dimen.browser_toolbar_favicon_size;
-        browserToolbarFaviconSize = res.getDimensionPixelSize(browserToolbarFaviconSizeDimenID);
+        browserToolbarFaviconSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
         faviconsCache = new FaviconCache(FAVICON_CACHE_SIZE_BYTES, largestFaviconSize);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoApp.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoApp.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoApp.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoApp.java	2015-02-28 15:03:07.000000000 +0000
@@ -129,8 +129,6 @@
     private static final String LOGTAG = "GeckoApp";
     private static final int ONE_DAY_MS = 1000*60*60*24;
 
-    private static final boolean ZOOMED_VIEW_ENABLED = AppConstants.NIGHTLY_BUILD;
-
     private static enum StartupAction {
         NORMAL,     /* normal application start */
         URL,        /* launched with a passed URL */
@@ -175,7 +173,6 @@
     private ContactService mContactService;
     private PromptService mPromptService;
     private TextSelection mTextSelection;
-    private ZoomedView mZoomedView;
 
     protected DoorHangerPopup mDoorHangerPopup;
     protected FormAssistPopup mFormAssistPopup;
@@ -392,7 +389,7 @@
                 onPreparePanel(featureId, mMenuPanel, mMenu);
             }
 
-            return mMenuPanel; 
+            return mMenuPanel;
         }
 
         return super.onCreatePanelView(featureId);
@@ -505,7 +502,7 @@
             mMenuPanel.addView((GeckoMenu) mMenu);
         }
     }
- 
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         // Handle hardware menu key presses separately so that we can show a custom menu in some cases.
@@ -839,7 +836,11 @@
 
                     @Override
                     public void onToastHidden(ButtonToast.ReasonHidden reason) {
-                        GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Toast:Hidden", buttonId));
+                        if (reason == ButtonToast.ReasonHidden.TIMEOUT ||
+                            reason == ButtonToast.ReasonHidden.TOUCH_OUTSIDE ||
+                            reason == ButtonToast.ReasonHidden.REPLACED) {
+                            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Toast:Hidden", buttonId));
+                        }
                     }
                 });
             }
@@ -1059,7 +1060,7 @@
     public void requestRender() {
         mLayerView.requestRender();
     }
-    
+
     public void hidePlugins(Tab tab) {
         for (Layer layer : tab.getPluginLayers()) {
             if (layer instanceof PluginLayer) {
@@ -1574,11 +1575,6 @@
                                            (TextSelectionHandle) findViewById(R.id.caret_handle),
                                            (TextSelectionHandle) findViewById(R.id.focus_handle));
 
-        if (ZOOMED_VIEW_ENABLED) {
-            ViewStub stub = (ViewStub) findViewById(R.id.zoomed_view_stub);
-            mZoomedView = (ZoomedView) stub.inflate();
-        }
-
         // Trigger the completion of the telemetry timer that wraps activity startup,
         // then grab the duration to give to FHR.
         mJavaUiStartupTimer.stop();
@@ -2045,9 +2041,6 @@
             mPromptService.destroy();
         if (mTextSelection != null)
             mTextSelection.destroy();
-        if (mZoomedView != null) {
-            mZoomedView.destroy();
-        }
         NotificationHelper.destroy();
         IntentHelper.destroy();
         GeckoNetworkManager.destroy();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoEditableClient.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoEditableClient.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoEditableClient.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoEditableClient.java	2015-02-28 15:03:07.000000000 +0000
@@ -14,7 +14,7 @@
 interface GeckoEditableClient {
     void sendEvent(GeckoEvent event);
     Editable getEditable();
-    void setUpdateGecko(boolean update);
+    void setUpdateGecko(boolean update, boolean force);
     void setSuppressKeyUp(boolean suppress);
     Handler getInputConnectionHandler();
     boolean setInputConnectionHandler(Handler handler);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoEditable.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoEditable.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoEditable.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoEditable.java	2015-02-28 15:03:07.000000000 +0000
@@ -571,7 +571,7 @@
     }
 
     @Override
-    public void setUpdateGecko(boolean update) {
+    public void setUpdateGecko(boolean update, boolean force) {
         if (!onIcThread()) {
             // Android may be holding an old InputConnection; ignore
             if (DEBUG) {
@@ -580,7 +580,7 @@
             return;
         }
         if (update) {
-            icUpdateGecko(false);
+            icUpdateGecko(force);
         }
         mUpdateGecko = update;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoInputConnection.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoInputConnection.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/GeckoInputConnection.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/GeckoInputConnection.java	2015-02-28 15:03:07.000000000 +0000
@@ -250,7 +250,7 @@
     @Override
     public synchronized boolean beginBatchEdit() {
         mBatchEditCount++;
-        mEditableClient.setUpdateGecko(false);
+        mEditableClient.setUpdateGecko(false, false);
         return true;
     }
 
@@ -259,6 +259,10 @@
         if (mBatchEditCount > 0) {
             mBatchEditCount--;
             if (mBatchEditCount == 0) {
+                // Force Gecko update for cancelled auto-correction of single-
+                // character words to prevent character duplication. (bug 1133802)
+                boolean forceUpdate = !mBatchTextChanged && !mBatchSelectionChanged;
+
                 if (mBatchTextChanged) {
                     notifyTextChange();
                     mBatchTextChanged = false;
@@ -269,7 +273,7 @@
                                            Selection.getSelectionEnd(editable));
                     mBatchSelectionChanged = false;
                 }
-                mEditableClient.setUpdateGecko(true);
+                mEditableClient.setUpdateGecko(true, forceUpdate);
             }
         } else {
             Log.w(LOGTAG, "endBatchEdit() called, but mBatchEditCount == 0?!");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/GeckoLayerClient.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/GeckoLayerClient.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/GeckoLayerClient.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/GeckoLayerClient.java	2015-02-28 15:03:07.000000000 +0000
@@ -681,12 +681,14 @@
         mCurrentViewTransform.offsetX = offset.x;
         mCurrentViewTransform.offsetY = offset.y;
 
-        mRootLayer.setPositionAndResolution(
-            Math.round(x + mCurrentViewTransform.offsetX),
-            Math.round(y + mCurrentViewTransform.offsetY),
-            Math.round(x + width + mCurrentViewTransform.offsetX),
-            Math.round(y + height + mCurrentViewTransform.offsetY),
-            resolution);
+        if (mRootLayer != null) {
+            mRootLayer.setPositionAndResolution(
+                Math.round(x + mCurrentViewTransform.offsetX),
+                Math.round(y + mCurrentViewTransform.offsetY),
+                Math.round(x + width + mCurrentViewTransform.offsetX),
+                Math.round(y + height + mCurrentViewTransform.offsetY),
+                resolution);
+        }
 
         if (layersUpdated && mRecordDrawTimes) {
             // If we got a layers update, that means a draw finished. Check to see if the area drawn matches
@@ -728,6 +730,9 @@
     public LayerRenderer.Frame createFrame() {
         // Create the shaders and textures if necessary.
         if (!mLayerRendererInitialized) {
+            if (mLayerRenderer == null) {
+                return null;
+            }
             mLayerRenderer.checkMonitoringEnabled();
             mLayerRenderer.createDefaultProgram();
             mLayerRendererInitialized = true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/JavaPanZoomController.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/JavaPanZoomController.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/JavaPanZoomController.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/JavaPanZoomController.java	2015-02-28 15:03:07.000000000 +0000
@@ -51,10 +51,6 @@
     // Animation stops is the velocity is below this threshold when flinging.
     private static final float FLING_STOPPED_THRESHOLD = 0.1f;
 
-    // The distance the user has to pan before we recognize it as such (e.g. to avoid 1-pixel pans
-    // between the touch-down and touch-up of a click). In units of density-independent pixels.
-    public static final float PAN_THRESHOLD = 1/16f * GeckoAppShell.getDpi();
-
     // Angle from axis within which we stay axis-locked
     private static final double AXIS_LOCK_ANGLE = Math.PI / 6.0; // 30 degrees
 
@@ -479,7 +475,7 @@
             if (mTarget.getFullScreenState() == FullScreenState.NON_ROOT_ELEMENT && !mSubscroller.scrolling()) {
                 return false;
             }
-            if (panDistance(event) < PAN_THRESHOLD) {
+            if (panDistance(event) < PanZoomController.PAN_THRESHOLD) {
                 return false;
             }
             cancelTouch();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/PluginLayer.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/PluginLayer.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/PluginLayer.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/PluginLayer.java	2015-02-28 15:03:07.000000000 +0000
@@ -37,7 +37,7 @@
     };
 
     public PluginLayer(View view, RectF rect, int maxDimension) {
-        super(new BufferedImage(), TileLayer.PaintMode.NORMAL);
+        super(new IntSize(0, 0), TileLayer.PaintMode.NORMAL);
 
         mView = view;
         mContainer = GeckoAppShell.getGeckoInterface().getPluginContainer();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/ScrollbarLayer.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/ScrollbarLayer.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/ScrollbarLayer.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/ScrollbarLayer.java	2015-02-28 15:03:07.000000000 +0000
@@ -29,6 +29,8 @@
 
     private int[] mTextureIDs;
 
+    private final BufferedImage mImage;
+
     // To avoid excessive GC, declare some objects here that would otherwise
     // be created and destroyed frequently during draw().
     private final RectF mBarRectF;
@@ -67,7 +69,8 @@
     private final Rect mEndCapTexCoords;    // bottom/right endcap coordinates
 
     ScrollbarLayer(LayerRenderer renderer, Bitmap scrollbarImage, IntSize imageSize, boolean vertical) {
-        super(new BufferedImage(scrollbarImage), TileLayer.PaintMode.NORMAL);
+        super(new IntSize(scrollbarImage.getHeight(), scrollbarImage.getWidth()), TileLayer.PaintMode.NORMAL);
+        mImage = new BufferedImage(scrollbarImage);
         mRenderer = renderer;
         mVertical = vertical;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/TileLayer.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/TileLayer.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/gfx/TileLayer.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/gfx/TileLayer.java	2015-02-28 15:03:07.000000000 +0000
@@ -15,16 +15,13 @@
 public abstract class TileLayer extends Layer {
     private static final String LOGTAG = "GeckoTileLayer";
 
-    protected final BufferedImage mImage;
-
     public enum PaintMode { NORMAL, REPEAT, STRETCH };
     private PaintMode mPaintMode;
 
-    public TileLayer(BufferedImage image, PaintMode paintMode) {
-        super(image.getSize());
+    public TileLayer(IntSize size, PaintMode paintMode) {
+        super(size);
 
         mPaintMode = paintMode;
-        mImage = image;
     }
 
     protected boolean repeats() { return mPaintMode == PaintMode.REPEAT; }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/BrowserSearch.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/BrowserSearch.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/BrowserSearch.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/BrowserSearch.java	2015-02-28 15:03:07.000000000 +0000
@@ -561,6 +561,8 @@
 
                 if (engine.name.equals(suggestEngine) && suggestTemplate != null) {
                     // Suggest engine should be at the front of the list.
+                    // We're baking in an assumption here that the suggest engine
+                    // is also the default engine.
                     searchEngines.add(0, engine);
 
                     // The only time Tabs.getInstance().getSelectedTab() should
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/HomeConfigPrefsBackend.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/HomeConfigPrefsBackend.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/HomeConfigPrefsBackend.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/HomeConfigPrefsBackend.java	2015-02-28 15:03:07.000000000 +0000
@@ -36,7 +36,7 @@
     private static final String LOGTAG = "GeckoHomeConfigBackend";
 
     // Increment this to trigger a migration.
-    private static final int VERSION = 2;
+    private static final int VERSION = 3;
 
     // This key was originally used to store only an array of panel configs.
     private static final String PREFS_CONFIG_KEY_OLD = "home_panels";
@@ -73,12 +73,7 @@
                                                   EnumSet.of(PanelConfig.Flags.DEFAULT_PANEL)));
 
         panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.BOOKMARKS));
-
-        // We disable reader mode support on low memory devices. Hence the
-        // reading list panel should not show up on such devices.
-        if (!HardwareUtils.isLowMemoryPlatform()) {
-            panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.READING_LIST));
-        }
+        panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.READING_LIST));
 
         final PanelConfig historyEntry = createBuiltinPanelConfig(mContext, PanelType.HISTORY);
         final PanelConfig recentTabsEntry = createBuiltinPanelConfig(mContext, PanelType.RECENT_TABS);
@@ -174,6 +169,31 @@
     }
 
     /**
+     * Checks to see if the reading list panel already exists.
+     *
+     * @param jsonPanels JSONArray array representing the curent set of panel configs.
+     *
+     * @return boolean Whether or not the reading list panel exists.
+     */
+    private static boolean readingListPanelExists(JSONArray jsonPanels) {
+        final int count = jsonPanels.length();
+        for (int i = 0; i < count; i++) {
+            try {
+                final JSONObject jsonPanelConfig = jsonPanels.getJSONObject(i);
+                final PanelConfig panelConfig = new PanelConfig(jsonPanelConfig);
+                if (panelConfig.getType() == PanelType.READING_LIST) {
+                    return true;
+                }
+            } catch (Exception e) {
+                // It's okay to ignore this exception, since an invalid reading list
+                // panel config is equivalent to no reading list panel.
+                Log.e(LOGTAG, "Exception loading PanelConfig from JSON", e);
+            }
+        }
+        return false;
+    }
+
+    /**
      * Migrates JSON config data storage.
      *
      * @param context Context used to get shared preferences and create built-in panel.
@@ -231,6 +251,19 @@
                     addBuiltinPanelConfig(context, jsonPanels,
                             PanelType.REMOTE_TABS, Position.FRONT, Position.BACK);
                     break;
+
+                case 3:
+                    // Add the "Reading List" panel if it does not exist. At one time,
+                    // the Reading List panel was shown only to devices that were not
+                    // considered "low memory". Now, we expose the panel to all devices.
+                    // This migration should only occur for "low memory" devices.
+                    // Note: This will not agree with the default configuration, which
+                    // has REMOTE_TABS after READING_LIST on some devices.
+                    if (!readingListPanelExists(jsonPanels)) {
+                        addBuiltinPanelConfig(context, jsonPanels,
+                                PanelType.READING_LIST, Position.BACK, Position.BACK);
+                    }
+                    break;
             }
         }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/TopSitesGridItemView.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/TopSitesGridItemView.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/TopSitesGridItemView.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/TopSitesGridItemView.java	2015-02-28 15:03:07.000000000 +0000
@@ -35,6 +35,8 @@
     private static final ScaleType SCALE_TYPE_THUMBNAIL = ScaleType.CENTER_CROP;
     private static final ScaleType SCALE_TYPE_URL       = ScaleType.CENTER_INSIDE;
 
+    private static final int THUMBNAIL_DEFAULT_FAVICON_ID = R.drawable.favicon_globe;
+
     // Child views.
     private final TextView mTitleView;
     private final TopSitesThumbnailView mThumbnailView;
@@ -216,7 +218,7 @@
     public void displayThumbnail(Bitmap thumbnail) {
         if (thumbnail == null) {
             // Show a favicon based view instead.
-            displayThumbnail(R.drawable.favicon);
+            displayThumbnail(THUMBNAIL_DEFAULT_FAVICON_ID);
             return;
         }
         mThumbnailSet = true;
@@ -242,7 +244,7 @@
         ImageLoader.with(getContext())
                    .load(imageUrl)
                    .noFade()
-                   .error(R.drawable.favicon)
+                   .error(THUMBNAIL_DEFAULT_FAVICON_ID)
                    .into(mThumbnailView);
     }
 
@@ -270,7 +272,7 @@
 
         if (favicon == null) {
             // Should show default favicon.
-            displayThumbnail(R.drawable.favicon);
+            displayThumbnail(THUMBNAIL_DEFAULT_FAVICON_ID);
             return;
         }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/TopSitesPanel.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/TopSitesPanel.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/home/TopSitesPanel.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/home/TopSitesPanel.java	2015-02-28 15:03:07.000000000 +0000
@@ -659,7 +659,7 @@
             }
 
             // Otherwise, do this until the async lookup returns.
-            view.displayThumbnail(R.drawable.favicon);
+            view.displayThumbnail(R.drawable.favicon_globe);
 
             // Give each side enough information to shake hands later.
             listener.setLoadId(loadId);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/locales/en-US/android_strings.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/locales/en-US/android_strings.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/locales/en-US/android_strings.dtd	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/locales/en-US/android_strings.dtd	2015-02-28 15:03:07.000000000 +0000
@@ -6,8 +6,8 @@
 <!ENTITY  no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
 <!ENTITY  error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
 
-<!ENTITY  onboard_start_message "Welcome to &brandShortName;!">
-<!ENTITY  onboard_start_subtext "Committed to you, your privacy, and an Open Web">
+<!ENTITY  onboard_start_message2 "Welcome to &brandShortName;">
+<!ENTITY  onboard_start_subtext2 "More privacy features and ways to customize than ever.">
 <!ENTITY  onboard_start_button_account "Sign in to &brandShortName;">
 <!ENTITY  onboard_start_button_browser "Start Browsing">
 
@@ -575,6 +575,8 @@
      "Last synced" is one of the user's other Sync clients, typically Firefox on
      their desktop or laptop.-->
 <!ENTITY remote_tabs_last_synced "Last synced: &formatS;">
+<!-- Localization note: Used when the sync has not happend yet, showed in place of a date -->
+<!ENTITY remote_tabs_never_synced "Last synced: never">
 
 <!-- Find-In-Page strings -->
 <!-- LOCALIZATION NOTE (find_matchcase): This is meant to appear as an icon that changes color
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/menu/GeckoMenuInflater.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/menu/GeckoMenuInflater.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/menu/GeckoMenuInflater.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/menu/GeckoMenuInflater.java	2015-02-28 15:03:07.000000000 +0000
@@ -131,22 +131,7 @@
         item.visible = a.getBoolean(R.styleable.MenuItem_android_visible, true);
         item.enabled = a.getBoolean(R.styleable.MenuItem_android_enabled, true);
         item.hasSubMenu = false;
-
-        // TODO: (bug 1058909) Remove this branch when we remove old tablet. We do this to
-        // avoid using a new menu resource for new tablet.
-        final int iconResID;
-        if (!NewTabletUI.isEnabled(mContext)) {
-            iconResID = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
-        } else {
-            if (item.id == R.id.reload) {
-                iconResID = R.drawable.new_tablet_ic_menu_reload;
-            } else if (HardwareUtils.isLargeTablet() && item.id == R.id.bookmark) {
-                iconResID = R.drawable.new_tablet_ic_menu_bookmark_add;
-            } else {
-                iconResID = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
-            }
-        }
-        item.iconRes = iconResID;
+        item.iconRes = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
 
         if (Versions.feature11Plus) {
             item.showAsAction = a.getInt(R.styleable.MenuItem_android_showAsAction, 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/menu/MenuItemActionBar.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/menu/MenuItemActionBar.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/menu/MenuItemActionBar.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/menu/MenuItemActionBar.java	2015-02-28 15:03:07.000000000 +0000
@@ -22,9 +22,7 @@
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs) {
-        // TODO: Remove this branch (and associated attr) when old tablet is removed.
-        this(context, attrs, (NewTabletUI.isEnabled(context)) ?
-                R.attr.menuItemActionBarStyleNewTablet : R.attr.menuItemActionBarStyle);
+        this(context, attrs, R.attr.menuItemActionBarStyle);
     }
 
     public MenuItemActionBar(Context context, AttributeSet attrs, int defStyle) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/moz.build	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/moz.build	2015-02-28 15:03:07.000000000 +0000
@@ -560,7 +560,7 @@
 
 # Only bother to include new tablet code if we're building for tablet-capable
 # OS releases.
-if CONFIG['MOZ_ANDROID_NEW_TABLET_UI'] and max_sdk_version >= 11:
+if max_sdk_version >= 11:
     gbjar.sources += [
         'tabs/TabStrip.java',
         'tabs/TabStripAdapter.java',
@@ -628,7 +628,6 @@
     'com/nineoldandroids/view/ViewPropertyAnimatorHC.java',
     'com/nineoldandroids/view/ViewPropertyAnimatorICS.java',
     'com/nineoldandroids/view/ViewPropertyAnimatorPreHC.java',
-    'com/readystatesoftware/systembartint/SystemBarTintManager.java',
     'com/squareup/picasso/Action.java',
     'com/squareup/picasso/AssetBitmapHunter.java',
     'com/squareup/picasso/BitmapHunter.java',
@@ -669,9 +668,10 @@
         'org/lucasr/dspec/RawResource.java'
     ] ]
 
+# Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
-    SRCDIR + '/resources',
     TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
+    SRCDIR + '/resources',
     OBJDIR + '/res',
 ]
 
@@ -683,7 +683,7 @@
 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_NEW_TABLET_UI', 'MOZ_ANDROID_TAB_QUEUE'):
+            'MOZ_ANDROID_TAB_QUEUE'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/overlays/service/sharemethods/AddToReadingList.java	2015-02-28 15:03:07.000000000 +0000
@@ -10,31 +10,30 @@
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.db.LocalBrowserDB;
+import org.mozilla.gecko.db.ReadingListProvider;
 import org.mozilla.gecko.overlays.service.ShareData;
 
-import static org.mozilla.gecko.db.BrowserContract.Bookmarks;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems;
 
 /**
  * ShareMethod to add a page to the reading list.
  *
  * Inserts the given URL/title pair into the reading list database.
- * TODO: In the event the page turns out not to be reader-mode-compatible, freezes sometimes occur
- * when we subsequently load the page in reader mode. (Bug 1044781)
  */
 public class AddToReadingList extends ShareMethod {
     private static final String LOGTAG = "GeckoAddToReadingList";
 
     @Override
     public Result handle(ShareData shareData) {
-        ContentResolver resolver = context.getContentResolver();
+        final ContentResolver resolver = context.getContentResolver();
 
-        LocalBrowserDB browserDB = new LocalBrowserDB(GeckoProfile.DEFAULT_PROFILE);
+        final ContentValues values = new ContentValues();
+        values.put(ReadingListItems.TITLE, shareData.title);
+        values.put(ReadingListItems.URL, shareData.url);
+        values.put(ReadingListItems.ADDED_ON, System.currentTimeMillis());
+        values.put(ReadingListItems.ADDED_BY, ReadingListProvider.PLACEHOLDER_THIS_DEVICE);
 
-        ContentValues values = new ContentValues();
-        values.put(Bookmarks.TITLE, shareData.title);
-        values.put(Bookmarks.URL, shareData.url);
-
-        browserDB.getReadingListAccessor().addReadingListItem(resolver, values);
+        new LocalBrowserDB(GeckoProfile.DEFAULT_PROFILE).getReadingListAccessor().addReadingListItem(resolver, values);
 
         return Result.SUCCESS;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/overlays/ui/ShareDialog.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/overlays/ui/ShareDialog.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/overlays/ui/ShareDialog.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/overlays/ui/ShareDialog.java	2015-02-28 15:03:07.000000000 +0000
@@ -22,7 +22,6 @@
 import org.mozilla.gecko.overlays.service.sharemethods.ShareMethod;
 import org.mozilla.gecko.sync.setup.activities.WebURLFinder;
 import org.mozilla.gecko.mozglue.ContextUtils;
-import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UIAsyncTask;
 
@@ -214,14 +213,8 @@
         sendTabList.setAdapter(adapter);
         sendTabList.setSendTabTargetSelectedListener(this);
 
-        // If we're a low memory device, just hide the reading list button. Otherwise, configure it.
         final OverlayDialogButton readinglistBtn = (OverlayDialogButton) findViewById(R.id.overlay_share_reading_list_btn);
 
-        if (HardwareUtils.isLowMemoryPlatform()) {
-            readinglistBtn.setVisibility(View.GONE);
-            return;
-        }
-
         final String readingListEnabledLabel = resources.getString(R.string.overlay_share_reading_list_btn_label);
         final Drawable readingListEnabledIcon = resources.getDrawable(R.drawable.overlay_readinglist_icon);
         readinglistBtn.setEnabledLabelAndIcon(readingListEnabledLabel, readingListEnabledIcon);
@@ -383,6 +376,9 @@
 
             @Override
             public void onAnimationEnd(Animation animation) {
+                // (bug 1132720) Hide the View so it doesn't flicker as the Activity closes.
+                ShareDialog.this.setVisible(false);
+
                 finish();
             }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/preferences/LocaleListPreference.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/preferences/LocaleListPreference.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/preferences/LocaleListPreference.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/preferences/LocaleListPreference.java	2015-02-28 15:03:07.000000000 +0000
@@ -199,6 +199,7 @@
             // See documentation for CharacterValidator.
             // Note that bn-IN is checked here even if it passed above.
             if (this.tag.equals("or") ||
+                this.tag.equals("my") ||
                 this.tag.equals("pa-IN") ||
                 this.tag.equals("gu-IN") ||
                 this.tag.equals("bn-IN")) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/ReadingListHelper.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/ReadingListHelper.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/ReadingListHelper.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/ReadingListHelper.java	2015-02-28 15:03:07.000000000 +0000
@@ -11,6 +11,7 @@
 import org.mozilla.gecko.db.DBUtils;
 import org.mozilla.gecko.db.ReadingListAccessor;
 import org.mozilla.gecko.favicons.Favicons;
+import org.mozilla.gecko.mozglue.RobocopTarget;
 import org.mozilla.gecko.util.EventCallback;
 import org.mozilla.gecko.util.NativeEventListener;
 import org.mozilla.gecko.util.NativeJSObject;
@@ -34,6 +35,8 @@
     private final ReadingListAccessor readingListAccessor;
     private final ContentObserver contentObserver;
 
+    volatile boolean fetchInBackground = true;
+
     public ReadingListHelper(Context context, GeckoProfile profile) {
         this.context = context;
         this.db = profile.getDB();
@@ -46,7 +49,9 @@
         contentObserver = new ContentObserver(null) {
             @Override
             public void onChange(boolean selfChange) {
-                fetchContent();
+                if (fetchInBackground) {
+                    fetchContent();
+                }
             }
         };
 
@@ -139,21 +144,50 @@
         if (message.has("id")) {
             values.put(ReadingListItems._ID, message.getInt("id"));
         }
+
+        // url is actually required...
+        String url = null;
         if (message.has("url")) {
-            values.put(ReadingListItems.URL, message.getString("url"));
+            url = message.getString("url");
+            values.put(ReadingListItems.URL, url);
         }
+
+        String title = null;
         if (message.has("title")) {
-            values.put(ReadingListItems.TITLE, message.getString("title"));
+            title = message.getString("title");
+            values.put(ReadingListItems.TITLE, title);
         }
-        if (message.has("length")) {
-            values.put(ReadingListItems.LENGTH, message.getInt("length"));
+
+        // TODO: message actually has "length", but that's no use for us. See Bug 1127451.
+        if (message.has("word_count")) {
+            values.put(ReadingListItems.WORD_COUNT, message.getInt("word_count"));
         }
+
         if (message.has("excerpt")) {
             values.put(ReadingListItems.EXCERPT, message.getString("excerpt"));
         }
+
         if (message.has("status")) {
-            values.put(ReadingListItems.CONTENT_STATUS, message.getInt("status"));
+            final int status = message.getInt("status");
+            values.put(ReadingListItems.CONTENT_STATUS, status);
+            if (status == ReadingListItems.STATUS_FETCHED_ARTICLE) {
+                if (message.has("resolved_title")) {
+                    values.put(ReadingListItems.RESOLVED_TITLE, message.getString("resolved_title"));
+                } else {
+                    if (title != null) {
+                        values.put(ReadingListItems.RESOLVED_TITLE, title);
+                    }
+                }
+                if (message.has("resolved_url")) {
+                    values.put(ReadingListItems.RESOLVED_URL, message.getString("resolved_url"));
+                } else {
+                    if (url != null) {
+                        values.put(ReadingListItems.RESOLVED_URL, url);
+                    }
+                }
+            }
         }
+
         return values;
     }
 
@@ -258,4 +292,13 @@
             }
         });
     }
+
+    @RobocopTarget
+    /**
+     * Test code will want to disable background fetches to avoid upsetting
+     * the test harness. Call this by accessing the instance from BrowserApp.
+     */
+    public void disableBackgroundFetches() {
+        fetchInBackground = false;
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/RemoteTabsExpandableListAdapter.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/RemoteTabsExpandableListAdapter.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/RemoteTabsExpandableListAdapter.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/RemoteTabsExpandableListAdapter.java	2015-02-28 15:03:07.000000000 +0000
@@ -4,9 +4,9 @@
 
 package org.mozilla.gecko;
 
-import java.util.ArrayList;
-import java.util.List;
 
+
+import android.text.format.DateUtils;
 import org.mozilla.gecko.db.RemoteClient;
 import org.mozilla.gecko.db.RemoteTab;
 import org.mozilla.gecko.home.TwoLinePageRow;
@@ -20,6 +20,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
 /**
  * An adapter that populates group and child views with remote client and tab
  * data maintained in a monolithic static array.
@@ -28,6 +34,15 @@
  * specialization to home fragment styles.
  */
 public class RemoteTabsExpandableListAdapter extends BaseExpandableListAdapter {
+    /**
+     * If a device claims to have synced before this date, we will assume it has never synced.
+     */
+    private static final Date EARLIEST_VALID_SYNCED_DATE;
+    static {
+        final Calendar c = GregorianCalendar.getInstance();
+        c.set(2000, Calendar.JANUARY, 1, 0, 0, 0);
+        EARLIEST_VALID_SYNCED_DATE = c.getTime();
+    }
     protected final ArrayList<RemoteClient> clients;
     private final boolean showGroupIndicator;
     protected int groupLayoutId;
@@ -156,7 +171,7 @@
         // It's OK to access the DB on the main thread here, as we're just
         // getting a string.
         final GeckoProfile profile = GeckoProfile.get(context);
-        holder.lastModifiedView.setText(profile.getDB().getTabsAccessor().getLastSyncedString(context, now, client.lastModified));
+        holder.lastModifiedView.setText(this.getLastSyncedString(context, now, client.lastModified));
 
         // These views exists only in some of our group views: they are present
         // for the home panel groups and not for the tabs panel groups.
@@ -215,4 +230,19 @@
 
         return view;
     }
+
+    /**
+     * Return a relative "Last synced" time span for the given tab record.
+     *
+     * @param now local time.
+     * @param time to format string for.
+     * @return string describing time span
+     */
+    public String getLastSyncedString(Context context, long now, long time) {
+        if (new Date(time).before(EARLIEST_VALID_SYNCED_DATE)) {
+            return context.getString(R.string.remote_tabs_never_synced);
+        }
+        final CharSequence relativeTimeSpanString = DateUtils.getRelativeTimeSpanString(time, now, DateUtils.MINUTE_IN_MILLIS);
+        return context.getResources().getString(R.string.remote_tabs_last_synced, relativeTimeSpanString);
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@null"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/progressbar.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/progressbar.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/progressbar.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/progressbar.xml	2015-02-28 15:03:07.000000000 +0000
@@ -2,7 +2,7 @@
     <item android:id="@android:id/progress">
         <clip>
             <shape>
-                <solid android:color="@color/highlight_orange"/>
+                <solid android:color="@color/fennec_ui_orange"/>
             </shape>
         </clip>
     </item>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/suggestion_selector.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/suggestion_selector.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/suggestion_selector.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/suggestion_selector.xml	2015-02-28 15:03:07.000000000 +0000
@@ -5,7 +5,7 @@
         <shape>
             <gradient android:angle="90"
                       android:startColor="#E66000"
-                      android:endColor="#FF9500"
+                      android:endColor="@color/fennec_ui_orange"
                       android:type="linear"/>
 
             <corners android:radius="4dp"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/tab_thumbnail.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/tab_thumbnail.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/tab_thumbnail.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/tab_thumbnail.xml	2015-02-28 15:03:07.000000000 +0000
@@ -39,7 +39,7 @@
           gecko:state_recording="false">
 
         <shape android:shape="rectangle">
-            <solid android:color="#FFFF9500"/>
+            <solid android:color="@color/fennec_ui_orange"/>
             <corners android:radius="3dp"/>            
         </shape>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/toolbar_favicon_default.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/toolbar_favicon_default.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable/toolbar_favicon_default.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable/toolbar_favicon_default.xml	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,7 @@
+<?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/. -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/favicon_globe" />
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-hdpi/favicon_globe.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-hdpi/favicon_globe.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-hdpi/favicon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-hdpi/favicon.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-hdpi-v11/toolbar_favicon_default.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-mdpi-v11/toolbar_favicon_default.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-mdpi-v11/toolbar_favicon_default.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml	2015-02-28 15:03:07.000000000 +0000
@@ -7,6 +7,6 @@
      lock icons so we offset it using this drawable to compensate. -->
 <inset
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/favicon"
+    android:drawable="@drawable/favicon_globe"
     android:insetTop="@dimen/new_tablet_site_security_unknown_inset_top"
     android:insetBottom="@dimen/new_tablet_site_security_unknown_inset_bottom"/>
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-xhdpi-v11/toolbar_favicon_default.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-large-xxhdpi-v11/toolbar_favicon_default.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-mdpi/favicon_globe.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-mdpi/favicon_globe.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-mdpi/favicon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-mdpi/favicon.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-xhdpi/favicon_globe.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-xhdpi/favicon_globe.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/drawable-xhdpi/favicon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/drawable-xhdpi/favicon.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/doorhanger.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/doorhanger.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/doorhanger.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/doorhanger.xml	2015-02-28 15:03:07.000000000 +0000
@@ -52,7 +52,7 @@
     <View android:id="@+id/divider_doorhanger"
           android:layout_width="match_parent"
           android:layout_height="1dp"
-          android:background="#FFFF9500"
+          android:background="@color/fennec_ui_orange"
           android:visibility="gone"/>
 
 </merge>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/find_in_page_content.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/find_in_page_content.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/find_in_page_content.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/find_in_page_content.xml	2015-02-28 15:03:07.000000000 +0000
@@ -16,7 +16,7 @@
               android:inputType="text"
               android:paddingLeft="@dimen/find_in_page_text_padding_left"
               android:paddingRight="@dimen/find_in_page_text_padding_right"
-              android:textColorHighlight="@color/url_bar_text_highlight"
+              android:textColorHighlight="@color/fennec_ui_orange"
               android:imeOptions="actionSearch"
               android:selectAllOnFocus="true"
               android:gravity="center_vertical|left"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/firstrun_pane.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/firstrun_pane.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/firstrun_pane.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/firstrun_pane.xml	2015-02-28 15:03:07.000000000 +0000
@@ -22,7 +22,7 @@
                            android:layout_gravity="top"
                            android:gravity="center_vertical"
                            android:background="@color/firstrun_tabstrip"
-                           gecko:tabIndicatorColor="@color/text_color_highlight"
+                           gecko:tabIndicatorColor="@color/fennec_ui_orange"
                            android:textColor="@color/android:white"/>
     </org.mozilla.gecko.firstrun.FirstrunPager>
 </org.mozilla.gecko.firstrun.FirstrunPane>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/gecko_app.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/gecko_app.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/gecko_app.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/gecko_app.xml	2015-02-28 15:03:07.000000000 +0000
@@ -7,8 +7,7 @@
                 xmlns:gecko="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/root_layout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true">
+                android:layout_height="match_parent">
 
     <ViewStub android:id="@+id/tabs_panel"
               android:layout="@layout/tabs_panel_view"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/home_pager.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/home_pager.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/home_pager.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/home_pager.xml	2015-02-28 15:03:07.000000000 +0000
@@ -18,7 +18,7 @@
                                               android:layout_gravity="top"
                                               android:gravity="center_vertical"
                                               android:background="@color/background_light"
-                                              gecko:tabIndicatorColor="@color/text_color_highlight"
+                                              gecko:tabIndicatorColor="@color/fennec_ui_orange"
                                               android:textAppearance="@style/TextAppearance.Widget.HomePagerTabStrip"/>
 
 </org.mozilla.gecko.home.HomePager>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/pin_site_dialog.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/pin_site_dialog.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/pin_site_dialog.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/pin_site_dialog.xml	2015-02-28 15:03:07.000000000 +0000
@@ -23,7 +23,7 @@
                   android:background="@drawable/url_bar_entry"
                   android:textColor="@color/url_bar_title"
                   android:textColorHint="@color/url_bar_title_hint"
-                  android:textColorHighlight="@color/url_bar_text_highlight"
+                  android:textColorHighlight="@color/fennec_ui_orange"
                   android:textSelectHandle="@drawable/handle_middle"
                   android:textSelectHandleLeft="@drawable/handle_start"
                   android:textSelectHandleRight="@drawable/handle_end"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/search_bar.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/search_bar.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/search_bar.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/search_bar.xml	2015-02-28 15:03:07.000000000 +0000
@@ -16,7 +16,7 @@
         android:textSize="@dimen/query_text_size"
         android:focusable="false"
         android:focusableInTouchMode="false"
-        android:textColorHighlight="@color/highlight_orange"
+        android:textColorHighlight="@color/fennec_ui_orange"
         android:textSelectHandle="@drawable/handle_middle"
         android:textSelectHandleLeft="@drawable/handle_start"
         android:textSelectHandleRight="@drawable/handle_end" />
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/two_line_page_row.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/two_line_page_row.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout/two_line_page_row.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout/two_line_page_row.xml	2015-02-28 15:03:07.000000000 +0000
@@ -12,7 +12,7 @@
                                           android:layout_width="@dimen/favicon_bg"
                                           android:layout_height="@dimen/favicon_bg"
                                           android:layout_margin="16dp"
-                                          tools:background="@drawable/favicon"/>
+                                          tools:background="@drawable/favicon_globe"/>
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml	2015-02-28 15:03:07.000000000 +0000
@@ -82,6 +82,7 @@
             android:id="@+id/menu"
             style="@style/UrlBar.ImageButton.NewTablet"
             android:layout_alignParentRight="true"
+            android:layout_marginRight="6dp"
             android:contentDescription="@string/menu"
             android:background="@drawable/new_tablet_action_bar_button"
             android:visibility="gone"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml	2015-02-28 15:03:07.000000000 +0000
@@ -8,7 +8,7 @@
 
    <ImageView
         android:id="@+id/favicon"
-        android:layout_width="@dimen/new_tablet_tab_strip_favicon_size"
+        android:layout_width="@dimen/browser_toolbar_favicon_size"
         android:layout_height="match_parent"
         android:layout_marginRight="8dp"
         android:scaleType="centerInside"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml	2015-02-28 15:03:07.000000000 +0000
@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
+          android:icon="@drawable/new_tablet_ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml	2015-02-28 15:03:07.000000000 +0000
@@ -6,7 +6,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
+          android:icon="@drawable/new_tablet_ic_menu_reload"
           android:title="@string/reload"
           android:showAsAction="always"/>
 
@@ -21,7 +21,7 @@
           android:visible="false"/>
 
     <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
+          android:icon="@drawable/new_tablet_ic_menu_bookmark_add"
           android:title="@string/bookmark"
           android:showAsAction="always"/>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/colors.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/colors.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/colors.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/colors.xml	2015-02-28 15:03:07.000000000 +0000
@@ -4,6 +4,28 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
+  <!-- Fennec color palette (bug 1127517) -->
+  <color name="fennec_ui_orange">#FF9500</color>
+  <color name="action_orange">#E66000</color>
+  <color name="action_orange_pressed">#DC5600</color>
+  <color name="link_blue">#0096DD</color>
+  <color name="private_browsing_purple">#CF68FF</color>
+
+  <color name="placeholder_active_grey">#222222</color>
+  <color name="placeholder_grey">#777777</color>
+  <color name="private_toolbar_grey">#292C29</color>
+  <color name="text_and_tabs_tray_grey">#363B40</color>
+  <color name="tabs_tray_grey_pressed">#45494E</color>
+  <color name="toolbar_icon_grey">#5F6368</color>
+
+  <color name="tabs_tray_icon_grey">#AFB1B3</color>
+  <color name="disabled_grey">#BFBFBF</color>
+  <color name="toolbar_grey_pressed">#D7D7DC</color>
+  <color name="toolbar_menu_dark_grey">#E1E1E6</color>
+  <color name="toolbar_grey">#EBEBF0</color>
+  <color name="about_page_header_grey">#F5F5F5</color>
+
+  <!-- Non-palette colors -->
   <color name="primary">#363B40</color>
 
   <color name="background_light">#FFF5F5F5</color>
@@ -83,7 +105,6 @@
   <color name="text_color_hint_floating_focused">#33b5e5</color>
 
   <!-- Highlight colors -->
-  <color name="text_color_highlight">#FF9500</color>
   <color name="text_color_highlight_inverse">#D06BFF</color>
 
   <!-- Link colors -->
@@ -103,7 +124,6 @@
   <color name="doorhanger_background_dark">#FFDDE4EA</color>
 
   <color name="validation_message_text">#ffffff</color>
-  <color name="url_bar_text_highlight">#FFFF9500</color>
   <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
   <color name="suggestion_primary">#dddddd</color>
   <color name="suggestion_pressed">#bbbbbb</color>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/dimens.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/dimens.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/dimens.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/dimens.xml	2015-02-28 15:03:07.000000000 +0000
@@ -29,7 +29,6 @@
     <dimen name="new_tablet_tab_strip_height">48dp</dimen>
     <dimen name="new_tablet_tab_strip_item_width">208dp</dimen>
     <dimen name="new_tablet_tab_strip_item_margin">-28dp</dimen>
-    <dimen name="new_tablet_tab_strip_favicon_size">16dp</dimen>
     <dimen name="new_tablet_tab_strip_fading_edge_size">15dp</dimen>
     <dimen name="new_tablet_site_security_height">60dp</dimen>
     <dimen name="new_tablet_site_security_width">34dp</dimen>
@@ -38,7 +37,6 @@
     <dimen name="new_tablet_site_security_padding_horizontal">8dp</dimen>
     <dimen name="new_tablet_site_security_right_margin">1dp</dimen>
     <dimen name="new_tablet_browser_toolbar_height">60dp</dimen>
-    <dimen name="new_tablet_browser_toolbar_menu_right_margin">6dp</dimen>
     <dimen name="new_tablet_browser_toolbar_menu_item_width">56dp</dimen>
     <!-- Padding combines with an 18dp image to form the menu item width and height. -->
     <dimen name="new_tablet_browser_toolbar_menu_item_padding_horizontal">19dp</dimen>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/search_colors.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/search_colors.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/search_colors.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/search_colors.xml	2015-02-28 15:03:07.000000000 +0000
@@ -6,8 +6,6 @@
 
     <color name="global_background_color">#EBEBF0</color>
 
-    <color name="highlight_orange">#FF9500</color>
-
     <color name="edit_text_default">#AFB1B3</color>
 
     <!-- card colors -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/styles.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/styles.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/styles.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/styles.xml	2015-02-28 15:03:07.000000000 +0000
@@ -143,7 +143,7 @@
     </style>
 
     <style name="Widget.ReadingListRow.ReadTime">
-        <item name="android:textColor">@color/text_color_highlight</item>
+        <item name="android:textColor">@color/fennec_ui_orange</item>
     </style>
 
     <style name="Widget.BookmarkFolderView" parent="Widget.TwoLinePageRow.Title">
@@ -292,7 +292,7 @@
     -->
     <style name="TextAppearance">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textColorHighlight">@color/text_color_highlight</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
         <item name="android:textColorHint">?android:attr/textColorHint</item>
         <item name="android:textColorLink">?android:attr/textColorLink</item>
         <item name="android:textSize">@dimen/menu_item_textsize</item>
@@ -457,7 +457,7 @@
         <item name="android:textAppearance">@style/TextAppearance.UrlBar.Title</item>
         <item name="android:textColor">@color/url_bar_title</item>
         <item name="android:textColorHint">@color/url_bar_title_hint</item>
-        <item name="android:textColorHighlight">@color/url_bar_text_highlight</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
         <item name="android:textSelectHandle">@drawable/handle_middle</item>
         <item name="android:textSelectHandleLeft">@drawable/handle_start</item>
         <item name="android:textSelectHandleRight">@drawable/handle_end</item>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/themes.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/themes.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values/themes.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values/themes.xml	2015-02-28 15:03:07.000000000 +0000
@@ -49,7 +49,7 @@
         <item name="android:textColorHintInverse">@color/text_color_hint_inverse</item>
 
         <!-- Highlight colors -->
-        <item name="android:textColorHighlight">@color/text_color_highlight</item>
+        <item name="android:textColorHighlight">@color/fennec_ui_orange</item>
         <item name="android:textColorHighlightInverse">@color/text_color_highlight_inverse</item>
 
         <!-- Link colors -->
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values-large-v11/dimens.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values-large-v11/dimens.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values-large-v11/dimens.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values-large-v11/dimens.xml	2015-02-28 15:03:07.000000000 +0000
@@ -7,6 +7,7 @@
 
     <dimen name="browser_toolbar_height">56dp</dimen>
     <dimen name="browser_toolbar_button_padding">16dp</dimen>
+    <dimen name="browser_toolbar_favicon_size">16dp</dimen>
 
     <dimen name="tabs_counter_size">26sp</dimen>
     <dimen name="panel_grid_view_column_width">200dp</dimen>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values-large-v11/styles.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values-large-v11/styles.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values-large-v11/styles.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values-large-v11/styles.xml	2015-02-28 15:03:07.000000000 +0000
@@ -75,23 +75,10 @@
     </style>
 
     <style name="Widget.MenuItemActionBar">
-        <item name="android:layout_width">@dimen/browser_toolbar_height</item>
-        <item name="android:layout_height">@dimen/browser_toolbar_height</item>
-        <item name="android:background">@drawable/action_bar_button</item>
-        <item name="android:scaleType">fitCenter</item>
-
-        <!-- We split up padding* because we can't override it in *.NewTablet otherwise. -->
-        <item name="android:paddingTop">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingBottom">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingLeft">@dimen/browser_toolbar_button_padding</item>
-        <item name="android:paddingRight">@dimen/browser_toolbar_button_padding</item>
-    </style>
-
-    <style name="Widget.MenuItemActionBar.NewTablet">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:scaleType">center</item>
         <item name="android:background">@drawable/new_tablet_action_bar_button</item>
+        <item name="android:scaleType">center</item>
 
         <!-- layout_width/height doesn't work here, likely because it's
              an ImageButton, so we use padding instead.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values-large-v11/themes.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values-large-v11/themes.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/values-large-v11/themes.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/values-large-v11/themes.xml	2015-02-28 15:03:07.000000000 +0000
@@ -14,7 +14,6 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="arrowPopupWidth">400dp</item>
-        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
     </style>
 
     <style name="GeckoStartPane" parent="Gecko.Dialog"/>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml	2015-02-28 15:03:07.000000000 +0000
@@ -60,7 +60,7 @@
             android:key="sync_now"
             android:defaultValue=""
             android:persistent="false"
-            android:title="Sync now"
+            android:title="@string/fxaccount_status_sync_now"
             android:summary="" />
 
         <CheckBoxPreference
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/strings.xml.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/strings.xml.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/strings.xml.in	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/strings.xml.in	2015-02-28 15:03:07.000000000 +0000
@@ -38,8 +38,8 @@
   <string name="no_space_to_start_error">&no_space_to_start_error;</string>
   <string name="error_loading_file">&error_loading_file;</string>
 
-  <string name="firstrun_welcome_message">&onboard_start_message;</string>
-  <string name="firstrun_welcome_subtext">&onboard_start_subtext;</string>
+  <string name="firstrun_welcome_message">&onboard_start_message2;</string>
+  <string name="firstrun_welcome_subtext">&onboard_start_subtext2;</string>
   <string name="firstrun_welcome_button_account">&onboard_start_button_account;</string>
   <string name="firstrun_welcome_button_browser">&onboard_start_button_browser;</string>
   <string name="firstrun_empty_contentDescription"></string>
@@ -387,6 +387,7 @@
   <string name="remote_tabs_panel_moved_title">&remote_tabs_panel_moved_title;</string>
   <string name="remote_tabs_panel_moved_desc">&remote_tabs_panel_moved_desc;</string>
   <string name="remote_tabs_panel_moved_link">&remote_tabs_panel_moved_link;</string>
+  <string name="remote_tabs_never_synced">&remote_tabs_never_synced;</string>
 
   <string name="filepicker_title">&filepicker_title;</string>
   <string name="filepicker_audio_title">&filepicker_audio_title;</string>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/AbstractBearerTokenAuthHeaderProvider.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.sync.net;
+
+import ch.boye.httpclientandroidlib.Header;
+import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase;
+import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
+import ch.boye.httpclientandroidlib.message.BasicHeader;
+import ch.boye.httpclientandroidlib.protocol.BasicHttpContext;
+
+/**
+ * An <code>AuthHeaderProvider</code> that returns an Authorization header for
+ * bearer tokens, adding a simple prefix.
+ */
+public abstract class AbstractBearerTokenAuthHeaderProvider implements AuthHeaderProvider {
+  protected final String header;
+
+  public AbstractBearerTokenAuthHeaderProvider(String token) {
+    if (token == null) {
+      throw new IllegalArgumentException("token must not be null.");
+    }
+
+    this.header = getPrefix() + " " + token;
+  }
+
+  protected abstract String getPrefix();
+
+  @Override
+  public Header getAuthHeader(HttpRequestBase request, BasicHttpContext context, DefaultHttpClient client) {
+    return new BasicHeader("Authorization", header);
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/BearerAuthHeaderProvider.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/BearerAuthHeaderProvider.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/BearerAuthHeaderProvider.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/BearerAuthHeaderProvider.java	2015-02-28 15:03:07.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/. */
+
+package org.mozilla.gecko.sync.net;
+
+/**
+ * An <code>AuthHeaderProvider</code> that returns an Authorization header for
+ * Bearer tokens in the format expected by a Mozilla Firefox Accounts Profile Server.
+ * <p>
+ * See <a href="https://github.com/mozilla/fxa-profile-server/blob/master/docs/API.md">https://github.com/mozilla/fxa-profile-server/blob/master/docs/API.md</a>.
+ */
+public class BearerAuthHeaderProvider extends AbstractBearerTokenAuthHeaderProvider {
+  public BearerAuthHeaderProvider(String token) {
+    super(token);
+  }
+
+  @Override
+  protected String getPrefix() {
+    return "Bearer";
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/BrowserIDAuthHeaderProvider.java	2015-02-28 15:03:07.000000000 +0000
@@ -4,12 +4,6 @@
 
 package org.mozilla.gecko.sync.net;
 
-import ch.boye.httpclientandroidlib.Header;
-import ch.boye.httpclientandroidlib.client.methods.HttpRequestBase;
-import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
-import ch.boye.httpclientandroidlib.message.BasicHeader;
-import ch.boye.httpclientandroidlib.protocol.BasicHttpContext;
-
 /**
  * An <code>AuthHeaderProvider</code> that returns an Authorization header for
  * BrowserID assertions in the format expected by a Mozilla Services Token
@@ -17,21 +11,13 @@
  * <p>
  * See <a href="http://docs.services.mozilla.com/token/apis.html">http://docs.services.mozilla.com/token/apis.html</a>.
  */
-public class BrowserIDAuthHeaderProvider implements AuthHeaderProvider {
-  protected final String assertion;
-
+public class BrowserIDAuthHeaderProvider extends AbstractBearerTokenAuthHeaderProvider {
   public BrowserIDAuthHeaderProvider(String assertion) {
-    if (assertion == null) {
-      throw new IllegalArgumentException("assertion must not be null.");
-    }
-
-    this.assertion = assertion;
+    super(assertion);
   }
 
   @Override
-  public Header getAuthHeader(HttpRequestBase request, BasicHttpContext context, DefaultHttpClient client) {
-    Header header = new BasicHeader("Authorization", "BrowserID " + assertion);
-
-    return header;
+  protected String getPrefix() {
+    return "BrowserID";
   }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/MozResponse.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/MozResponse.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/MozResponse.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/MozResponse.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,175 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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.sync.net;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Scanner;
+
+import org.json.simple.parser.ParseException;
+import org.mozilla.gecko.background.common.log.Logger;
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.NonObjectJSONException;
+
+import ch.boye.httpclientandroidlib.Header;
+import ch.boye.httpclientandroidlib.HttpEntity;
+import ch.boye.httpclientandroidlib.HttpResponse;
+import ch.boye.httpclientandroidlib.impl.cookie.DateParseException;
+import ch.boye.httpclientandroidlib.impl.cookie.DateUtils;
+
+public class MozResponse {
+  private static final String LOG_TAG = "MozResponse";
+
+  private static final String HEADER_RETRY_AFTER = "retry-after";
+
+  protected HttpResponse response;
+  private String body = null;
+
+  public HttpResponse httpResponse() {
+    return this.response;
+  }
+
+  public int getStatusCode() {
+    return this.response.getStatusLine().getStatusCode();
+  }
+
+  public boolean wasSuccessful() {
+    return this.getStatusCode() == 200;
+  }
+
+  /**
+   * Fetch the content type of the HTTP response body.
+   *
+   * @return a <code>Header</code> instance, or <code>null</code> if there was
+   *         no body or no valid Content-Type.
+   */
+  public Header getContentType() {
+    HttpEntity entity = this.response.getEntity();
+    if (entity == null) {
+      return null;
+    }
+    return entity.getContentType();
+  }
+
+  private static boolean missingHeader(String value) {
+    return value == null ||
+           value.trim().length() == 0;
+  }
+
+  public String body() throws IllegalStateException, IOException {
+    if (body != null) {
+      return body;
+    }
+    InputStreamReader is = new InputStreamReader(this.response.getEntity().getContent());
+    // Oh, Java, you are so evil.
+    body = new Scanner(is).useDelimiter("\\A").next();
+    return body;
+  }
+
+  /**
+   * Return the body as a <b>non-null</b> <code>ExtendedJSONObject</code>.
+   *
+   * @return A non-null <code>ExtendedJSONObject</code>.
+   *
+   * @throws IllegalStateException
+   * @throws IOException
+   * @throws ParseException
+   * @throws NonObjectJSONException
+   */
+  public ExtendedJSONObject jsonObjectBody() throws IllegalStateException, IOException,
+                                 ParseException, NonObjectJSONException {
+    if (body != null) {
+      // Do it from the cached String.
+      return ExtendedJSONObject.parseJSONObject(body);
+    }
+
+    HttpEntity entity = this.response.getEntity();
+    if (entity == null) {
+      throw new IOException("no entity");
+    }
+
+    InputStream content = entity.getContent();
+    try {
+      Reader in = new BufferedReader(new InputStreamReader(content, "UTF-8"));
+      return ExtendedJSONObject.parseJSONObject(in);
+    } finally {
+      content.close();
+    }
+  }
+
+  protected boolean hasHeader(String h) {
+    return this.response.containsHeader(h);
+  }
+
+  public MozResponse(HttpResponse res) {
+    response = res;
+  }
+
+  private String getNonMissingHeader(String h) {
+    if (!this.hasHeader(h)) {
+      return null;
+    }
+
+    final Header header = this.response.getFirstHeader(h);
+    final String value = header.getValue();
+    if (missingHeader(value)) {
+      Logger.warn(LOG_TAG, h + " header present but empty.");
+      return null;
+    }
+    return value;
+  }
+
+  protected long getLongHeader(String h) throws NumberFormatException {
+    final String value = getNonMissingHeader(h);
+    if (value == null) {
+      return -1L;
+    }
+    return Long.parseLong(value, 10);
+  }
+
+  protected int getIntegerHeader(String h) throws NumberFormatException {
+    final String value = getNonMissingHeader(h);
+    if (value == null) {
+      return -1;
+    }
+    return Integer.parseInt(value, 10);
+  }
+
+  /**
+   * @return A number of seconds, or -1 if the 'Retry-After' header was not present.
+   */
+  public int retryAfterInSeconds() throws NumberFormatException {
+    final String retryAfter = getNonMissingHeader(HEADER_RETRY_AFTER);
+    if (retryAfter == null) {
+      return -1;
+    }
+
+    try {
+      return Integer.parseInt(retryAfter, 10);
+    } catch (NumberFormatException e) {
+      // Fall through to try date format.
+    }
+
+    try {
+      final long then = DateUtils.parseDate(retryAfter).getTime();
+      final long now  = System.currentTimeMillis();
+      return (int)((then - now) / 1000);     // Convert milliseconds to seconds.
+    } catch (DateParseException e) {
+      Logger.warn(LOG_TAG, "Retry-After header neither integer nor date: " + retryAfter);
+      return -1;
+    }
+  }
+
+  /**
+   * @return A number of seconds, or -1 if the 'X-Backoff' header was not
+   *         present.
+   */
+  public int backoffInSeconds() throws NumberFormatException {
+    return this.getIntegerHeader("x-backoff");
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/SyncResponse.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/SyncResponse.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/SyncResponse.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/SyncResponse.java	2015-02-28 15:03:07.000000000 +0000
@@ -4,167 +4,13 @@
 
 package org.mozilla.gecko.sync.net;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Scanner;
-
-import org.json.simple.parser.ParseException;
-import org.mozilla.gecko.background.common.log.Logger;
-import org.mozilla.gecko.sync.ExtendedJSONObject;
-import org.mozilla.gecko.sync.NonObjectJSONException;
 import org.mozilla.gecko.sync.Utils;
 
-import ch.boye.httpclientandroidlib.Header;
-import ch.boye.httpclientandroidlib.HttpEntity;
 import ch.boye.httpclientandroidlib.HttpResponse;
-import ch.boye.httpclientandroidlib.impl.cookie.DateParseException;
-import ch.boye.httpclientandroidlib.impl.cookie.DateUtils;
-
-public class SyncResponse {
-  private static final String HEADER_RETRY_AFTER = "retry-after";
-  private static final String LOG_TAG = "SyncResponse";
-
-  protected HttpResponse response;
-
-  public SyncResponse() {
-    super();
-  }
 
+public class SyncResponse extends MozResponse {
   public SyncResponse(HttpResponse res) {
-    response = res;
-  }
-
-  public HttpResponse httpResponse() {
-    return this.response;
-  }
-
-  public int getStatusCode() {
-    return this.response.getStatusLine().getStatusCode();
-  }
-
-  public boolean wasSuccessful() {
-    return this.getStatusCode() == 200;
-  }
-
-  /**
-   * Fetch the content type of the HTTP response body.
-   *
-   * @return a <code>Header</code> instance, or <code>null</code> if there was
-   *         no body or no valid Content-Type.
-   */
-  public Header getContentType() {
-    HttpEntity entity = this.response.getEntity();
-    if (entity == null) {
-      return null;
-    }
-    return entity.getContentType();
-  }
-
-  private String body = null;
-  public String body() throws IllegalStateException, IOException {
-    if (body != null) {
-      return body;
-    }
-    InputStreamReader is = new InputStreamReader(this.response.getEntity().getContent());
-    // Oh, Java, you are so evil.
-    body = new Scanner(is).useDelimiter("\\A").next();
-    return body;
-  }
-
-  /**
-   * Return the body as a <b>non-null</b> <code>ExtendedJSONObject</code>.
-   *
-   * @return A non-null <code>ExtendedJSONObject</code>.
-   *
-   * @throws IllegalStateException
-   * @throws IOException
-   * @throws ParseException
-   * @throws NonObjectJSONException
-   */
-  public ExtendedJSONObject jsonObjectBody() throws IllegalStateException,
-                                            IOException, ParseException,
-                                            NonObjectJSONException {
-    if (body != null) {
-      // Do it from the cached String.
-      return ExtendedJSONObject.parseJSONObject(body);
-    }
-
-    HttpEntity entity = this.response.getEntity();
-    if (entity == null) {
-      throw new IOException("no entity");
-    }
-
-    InputStream content = entity.getContent();
-    try {
-      Reader in = new BufferedReader(new InputStreamReader(content, "UTF-8"));
-      return ExtendedJSONObject.parseJSONObject(in);
-    } finally {
-      content.close();
-    }
-  }
-
-  private boolean hasHeader(String h) {
-    return this.response.containsHeader(h);
-  }
-
-  private static boolean missingHeader(String value) {
-    return value == null ||
-           value.trim().length() == 0;
-  }
-
-  private int getIntegerHeader(String h) throws NumberFormatException {
-    if (this.hasHeader(h)) {
-      Header header = this.response.getFirstHeader(h);
-      String value  = header.getValue();
-      if (missingHeader(value)) {
-        Logger.warn(LOG_TAG, h + " header present but empty.");
-        return -1;
-      }
-      return Integer.parseInt(value, 10);
-    }
-    return -1;
-  }
-
-  /**
-   * @return A number of seconds, or -1 if the 'Retry-After' header was not present.
-   */
-  public int retryAfterInSeconds() throws NumberFormatException {
-    if (!this.hasHeader(HEADER_RETRY_AFTER)) {
-      return -1;
-    }
-
-    Header header = this.response.getFirstHeader(HEADER_RETRY_AFTER);
-    String retryAfter = header.getValue();
-    if (missingHeader(retryAfter)) {
-      Logger.warn(LOG_TAG, "Retry-After header present but empty.");
-      return -1;
-    }
-
-    try {
-      return Integer.parseInt(retryAfter, 10);
-    } catch (NumberFormatException e) {
-      // Fall through to try date format.
-    }
-
-    try {
-      final long then = DateUtils.parseDate(retryAfter).getTime();
-      final long now  = System.currentTimeMillis();
-      return (int)((then - now) / 1000);     // Convert milliseconds to seconds.
-    } catch (DateParseException e) {
-      Logger.warn(LOG_TAG, "Retry-After header neither integer nor date: " + retryAfter);
-      return -1;
-    }
-  }
-
-  /**
-   * @return A number of seconds, or -1 if the 'X-Backoff' header was not
-   *         present.
-   */
-  public int backoffInSeconds() throws NumberFormatException {
-    return this.getIntegerHeader("x-backoff");
+    super(res);
   }
 
   /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/SyncStorageResponse.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/SyncStorageResponse.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/sync/net/SyncStorageResponse.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/sync/net/SyncStorageResponse.java	2015-02-28 15:03:07.000000000 +0000
@@ -12,11 +12,11 @@
 import ch.boye.httpclientandroidlib.HttpResponse;
 
 public class SyncStorageResponse extends SyncResponse {
+  private static final String LOG_TAG = "SyncStorageResponse";
 
   // Responses that are actionable get constant status codes.
   public static final String RESPONSE_CLIENT_UPGRADE_REQUIRED = "16";
 
-  private static final String LOG_TAG = "SyncStorageResponse";
   public static HashMap<String, String> SERVER_ERROR_MESSAGES;
   static {
     HashMap<String, String> errors = new HashMap<String, String>();
@@ -60,7 +60,7 @@
 
 
   public SyncStorageResponse(HttpResponse res) {
-    this.response = res;
+    super(res);
   }
 
   public String getErrorMessage() throws IllegalStateException, IOException {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/Tab.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/Tab.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/Tab.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/Tab.java	2015-02-28 15:03:07.000000000 +0000
@@ -179,6 +179,10 @@
         return mUrl;
     }
 
+    /**
+     * Returns the base domain of the loaded uri. Note that if the page is
+     * a Reader mode uri, the base domain returned is that of the original uri.
+     */
     public String getBaseDomain() {
         return mBaseDomain;
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabsPanel.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabsPanel.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabsPanel.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabsPanel.java	2015-02-28 15:03:07.000000000 +0000
@@ -405,6 +405,7 @@
             int height = getVerticalPanelHeight();
             dispatchLayoutChange(getWidth(), height);
         }
+        mHeaderVisible = true;
     }
 
     public void prepareToDrag() {
@@ -414,6 +415,7 @@
         } else {
             prepareToShow(TabsPanel.Panel.NORMAL_TABS);
         }
+        mHeaderVisible = true;
         if (mIsSideBar) {
             prepareSidebarAnimation(getWidth());
         }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabStripItemView.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabStripItemView.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabStripItemView.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabStripItemView.java	2015-02-28 15:03:07.000000000 +0000
@@ -71,7 +71,7 @@
         backgroundDrawable = new ResizablePathDrawable(new TabCurveShape(), tabColors);
         setBackgroundDrawable(backgroundDrawable);
 
-        faviconSize = res.getDimensionPixelSize(R.dimen.new_tablet_tab_strip_favicon_size);
+        faviconSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
         LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
         setOnClickListener(new View.OnClickListener() {
@@ -209,7 +209,7 @@
     private void updateFavicon(final Bitmap favicon) {
         if (favicon == null) {
             lastFavicon = null;
-            faviconView.setImageResource(R.drawable.new_tablet_default_favicon);
+            faviconView.setImageResource(R.drawable.toolbar_favicon_default);
             return;
         }
         if (favicon == lastFavicon) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabStrip.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabStrip.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabStrip.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabStrip.java	2015-02-28 15:03:07.000000000 +0000
@@ -15,13 +15,15 @@
 import android.view.View;
 import android.view.ViewTreeObserver;
 
+import org.mozilla.gecko.BrowserApp.Refreshable;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.widget.ThemedImageButton;
 import org.mozilla.gecko.widget.ThemedLinearLayout;
 
-public class TabStrip extends ThemedLinearLayout {
+public class TabStrip extends ThemedLinearLayout
+                      implements Refreshable {
     private static final String LOGTAG = "GeckoTabStrip";
 
     private final TabStripView tabStripView;
@@ -129,6 +131,11 @@
     }
 
     @Override
+    public void refresh() {
+        tabStripView.refresh();
+    }
+
+    @Override
     public void onLightweightThemeChanged() {
         final Drawable drawable = getTheme().getDrawable(this);
         if (drawable == null) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabStripView.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabStripView.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tabs/TabStripView.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tabs/TabStripView.java	2015-02-28 15:03:07.000000000 +0000
@@ -102,7 +102,7 @@
             updateSelectedStyle(selected);
 
             if (ensureVisible) {
-                ensurePositionIsVisible(selected);
+                ensurePositionIsVisible(selected, true);
             }
         }
     }
@@ -239,10 +239,14 @@
         });
     }
 
-    private void ensurePositionIsVisible(final int position) {
+    /**
+     * Ensures the tab at the given position is visible. If we are not restoring tabs and
+     * shouldAnimate == true, the tab will animate to be visible, if it is not already visible.
+     */
+    private void ensurePositionIsVisible(final int position, final boolean shouldAnimate) {
         // We just want to move the strip to the right position
         // when restoring tabs on startup.
-        if (isRestoringTabs) {
+        if (isRestoringTabs || !shouldAnimate) {
             setSelection(position);
             return;
         }
@@ -414,6 +418,13 @@
         drawFadingEdge(canvas);
     }
 
+    public void refresh() {
+        final int selectedPosition = getPositionForSelectedTab();
+        if (selectedPosition != -1) {
+            ensurePositionIsVisible(selectedPosition, false);
+        }
+    }
+
     private class TabAnimatorListener implements AnimatorListener {
         private void setLayerType(int layerType) {
             final int childCount = getChildCount();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/robocop.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/robocop.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/robocop.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/robocop.ini	2015-02-28 15:03:07.000000000 +0000
@@ -33,8 +33,11 @@
 [testClearPrivateData]
 # disabled on x86 and 2.3; bug 948591
 skip-if = android_version == "10" || processor == "x86"
+[testDBUtils]
 [testDistribution]
 [testDoorHanger]
+# disabled on 2.3; bug 1085609
+skip-if = android_version == "10"
 [testFilterOpenTab]
 [testFindInPage]
 # disabled on 2.3
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/SelectionUtils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/SelectionUtils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/SelectionUtils.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/SelectionUtils.js	2015-02-28 15:03:07.000000000 +0000
@@ -12,6 +12,8 @@
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import('resource://gre/modules/Geometry.jsm');
 
+const TYPE_NAME = "Robocop:testSelectionHandler";
+
 /* ============================== Utility functions ================================================
  *
  * Common functions available to all tests.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/testInputSelections.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/testInputSelections.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/testInputSelections.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/testInputSelections.html	2015-02-28 15:03:07.000000000 +0000
@@ -7,9 +7,6 @@
     <script type="application/javascript" src="SelectionUtils.js"></script>
     <script type="application/javascript;version=1.8">
 
-// Name of this test.
-const TYPE_NAME = "Robocop:testInputSelections";
-
 // Used to create handle movement events for SelectionHandler.
 const ANCHOR = "ANCHOR";
 const FOCUS = "FOCUS";
@@ -105,7 +102,8 @@
 
   ]).then(function() {
     // Close selection and complete test.
-    Services.obs.notifyObservers(null, "TextSelection:End", {});
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: sh._selectionID}));
 
     return Promise.all([
       ok(!sh.isSelectionActive(),
@@ -174,7 +172,8 @@
 
   ]).then(function() {
     // Close selection and complete test.
-    Services.obs.notifyObservers(null, "TextSelection:End", {});
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: sh._selectionID}));
 
     return Promise.all([
       ok(!sh.isSelectionActive(),
@@ -219,7 +218,8 @@
   let focusDragSelectionText = sh._getSelectedText();
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testLTR_dragFocusHandleToSelf - Test Starts."),
@@ -278,7 +278,8 @@
   let anchorDragSelectionText = sh._getSelectedText();
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testLTR_dragAnchorHandleToSelf - Test Starts."),
@@ -336,7 +337,8 @@
   let focusDragSelectionText = sh._getSelectedText();
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testRTL_dragFocusHandleToSelf - Test Starts."),
@@ -395,7 +397,8 @@
   let anchorDragSelectionText = sh._getSelectedText();
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testRTL_dragAnchorHandleToSelf - Test Starts."),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/testSelectionHandler.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/testSelectionHandler.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/testSelectionHandler.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/testSelectionHandler.html	2015-02-28 15:03:07.000000000 +0000
@@ -7,9 +7,6 @@
     <script type="application/javascript" src="SelectionUtils.js"></script>
     <script type="application/javascript;version=1.8">
 
-// Name of this test.
-const TYPE_NAME = "Robocop:testSelectionHandler";
-
 const DIV_POINT_TEXT = "Under";
 const INPUT_TEXT = "Text for select all in an <input>";
 const TEXTAREA_TEXT = "Text for select all in a <textarea>";
@@ -211,7 +208,12 @@
   // Various ways to close an active selection.
   ]).then(function() {
     sh.startSelection(inputNode);
-    Services.obs.notifyObservers(null, "TextSelection:End", {});
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: -1}));
+    return ok(sh.isSelectionActive(), "unrelated TextSelection:End should not close active selection");
+  }).then(function() {
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: sh._selectionID}));
     return ok(!sh.isSelectionActive(), "TextSelection:End should close active selection");
 
   }).then(function() {
@@ -313,7 +315,8 @@
     ]);
 
   }).then(function() {
-    Services.obs.notifyObservers(null, "TextSelection:End", {});
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: sh._selectionID}));
 
     return Promise.all([
       ok(!sh.isSelectionActive(), "Selection should not be active at end of testAttachCaret"),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/testTextareaSelections.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/testTextareaSelections.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/roboextender/testTextareaSelections.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/roboextender/testTextareaSelections.html	2015-02-28 15:03:07.000000000 +0000
@@ -7,9 +7,6 @@
     <script type="application/javascript" src="SelectionUtils.js"></script>
     <script type="application/javascript;version=1.8">
 
-// Name of this test.
-const TYPE_NAME = "Robocop:testTextareaSelections";
-
 // Used to create handle movement events for SelectionHandler.
 const ANCHOR = "ANCHOR";
 const FOCUS = "FOCUS";
@@ -80,7 +77,8 @@
     let midpointSelText = sh._getSelectedText();
 
     // Close selection and complete test.
-    Services.obs.notifyObservers(null, "TextSelection:End", {});
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: sh._selectionID}));
 
     return Promise.all([
       selectionExists(selection, "LTR Selection existed at points"),
@@ -124,7 +122,8 @@
     let midpointSelText = sh._getSelectedText();
 
     // Close selection and complete test.
-    Services.obs.notifyObservers(null, "TextSelection:End", {});
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: sh._selectionID}));
 
     return Promise.all([
       selectionExists(selection, "RTL Selection existed at points"),
@@ -189,7 +188,8 @@
 
   ]).then(function() {
     // Complete test, and report.
-    Services.obs.notifyObservers(null, "TextSelection:End", {});
+    Services.obs.notifyObservers(null, "TextSelection:End",
+      JSON.stringify({selectionID: sh._selectionID}));
 
     return Promise.all([
       greaterThan(selectionLineHeight, 0, "Distance from one line to another " +
@@ -240,7 +240,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testLTR_moveFocusHandleDown - Test Starts."),
@@ -305,7 +306,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testLTR_moveFocusHandleUp - Test Starts."),
@@ -373,7 +375,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testLTR_moveAnchorHandleUp - Test Starts."),
@@ -437,7 +440,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testLTR_moveAnchorHandleDown - Test Starts."),
@@ -505,7 +509,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testRTL_moveFocusHandleDown - Test Starts."),
@@ -569,7 +574,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testRTL_moveFocusHandleUp - Test Starts."),
@@ -637,7 +643,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testRTL_moveAnchorHandleUp - Test Starts."),
@@ -701,7 +708,8 @@
                        focusPt : new Point(sh._cache.focusPt.x, sh._cache.focusPt.y) };
 
   // Complete test, and report.
-  Services.obs.notifyObservers(null, "TextSelection:End", {});
+  Services.obs.notifyObservers(null, "TextSelection:End",
+    JSON.stringify({selectionID: sh._selectionID}));
 
   return Promise.all([
     ok(true, "testRTL_moveAnchorHandleDown - Test Starts."),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/SelectionHandlerTest.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/SelectionHandlerTest.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/SelectionHandlerTest.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/SelectionHandlerTest.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,56 @@
+package org.mozilla.gecko.tests;
+
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.EventDispatcher;
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
+import org.mozilla.gecko.tests.helpers.NavigationHelper;
+
+import android.util.Log;
+
+import org.json.JSONObject;
+
+/**
+ * A base test class for selection handler tests.
+ */
+abstract class SelectionHandlerTest extends UITest {
+    private static final String geckoEventString = "Robocop:testSelectionHandler";
+    private final String url;
+
+    public SelectionHandlerTest(String url) {
+        this.url = url;
+    }
+
+    public void testSelection() {
+        GeckoHelper.blockForReady();
+
+        Actions.EventExpecter robocopTestExpecter = getActions().expectGeckoEvent(geckoEventString);
+        NavigationHelper.enterAndLoadUrl(url);
+        mToolbar.assertTitle(url);
+
+        while (!test(robocopTestExpecter)) {
+            // do nothing
+        }
+
+        robocopTestExpecter.unregisterListener();
+    }
+
+    protected boolean test(Actions.EventExpecter expecter) {
+        final JSONObject eventData;
+        try {
+            eventData = new JSONObject(expecter.blockForEventData());
+        } catch(Exception ex) {
+            // Log and ignore
+            getAsserter().ok(false, "JS Test", "Error decoding data " + ex);
+            return false;
+        }
+
+        if (eventData.has("result")) {
+            getAsserter().ok(eventData.optBoolean("result"), "JS Test", eventData.optString("msg"));
+        } else if (eventData.has("todo")) {
+            getAsserter().todo(eventData.optBoolean("todo"), "JS TODO", eventData.optString("msg"));
+        }
+
+        EventDispatcher.sendResponse(eventData, new JSONObject());
+        return eventData.optBoolean("done", false);
+    }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testDBUtils.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testDBUtils.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testDBUtils.java	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testDBUtils.java	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,70 @@
+/* -*- 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.tests;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import org.mozilla.gecko.db.DBUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+public class testDBUtils extends BaseTest {
+    public void testDBUtils() throws IOException {
+        final File cacheDir = getInstrumentation().getContext().getCacheDir();
+        final File dbFile = File.createTempFile("testDBUtils", ".db", cacheDir);
+        final SQLiteDatabase db = SQLiteDatabase.openOrCreateDatabase(dbFile, null);
+        try {
+            mAsserter.ok(db != null, "Created DB.", null);
+            db.execSQL("CREATE TABLE foo (x INTEGER NOT NULL DEFAULT 0, y TEXT)");
+            final ContentValues v = new ContentValues();
+            v.put("x", 5);
+            v.put("y", "a");
+            db.insert("foo", null, v);
+            v.put("x", 2);
+            v.putNull("y");
+            db.insert("foo", null, v);
+            v.put("x", 3);
+            v.put("y", "z");
+            db.insert("foo", null, v);
+
+            DBUtils.UpdateOperation[] ops = {DBUtils.UpdateOperation.BITWISE_OR, DBUtils.UpdateOperation.ASSIGN};
+            ContentValues[] values = {new ContentValues(), new ContentValues()};
+            values[0].put("x", 0xff);
+            values[1].put("y", "hello");
+
+            final int updated = DBUtils.updateArrays(db, "foo", values, ops, "x >= 3", null);
+
+            mAsserter.ok(updated == 2, "Updated two rows.", null);
+            final Cursor out = db.query("foo", new String[]{"x", "y"}, null, null, null, null, "x");
+            try {
+                mAsserter.ok(out.moveToNext(), "Has first result.", null);
+                mAsserter.ok(2 == out.getInt(0), "1: First column was untouched.", null);
+                mAsserter.ok(out.isNull(1), "1: Second column was untouched.", null);
+
+                mAsserter.ok(out.moveToNext(), "Has second result.", null);
+                mAsserter.ok((0xff | 3) == out.getInt(0), "2: First column was ORed correctly.", null);
+                mAsserter.ok("hello".equals(out.getString(1)), "2: Second column was assigned correctly.", null);
+
+                mAsserter.ok(out.moveToNext(), "Has third result.", null);
+                mAsserter.ok((0xff | 5) == out.getInt(0), "3: First column was ORed correctly.", null);
+                mAsserter.ok("hello".equals(out.getString(1)), "3: Second column was assigned correctly.", null);
+
+                mAsserter.ok(!out.moveToNext(), "No more results.", null);
+            } finally {
+                out.close();
+            }
+
+        } finally {
+            try {
+                db.close();
+            } catch (Exception e) {
+            }
+            dbFile.delete();
+        }
+    }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testInputSelections.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testInputSelections.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testInputSelections.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testInputSelections.java	2015-02-28 15:03:07.000000000 +0000
@@ -1,50 +1,12 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.EventDispatcher;
-import org.mozilla.gecko.tests.helpers.GeckoHelper;
-import org.mozilla.gecko.tests.helpers.NavigationHelper;
+public class testInputSelections extends SelectionHandlerTest {
 
-import android.util.Log;
-
-import org.json.JSONObject;
-
-
-public class testInputSelections extends UITest {
-
-    public void testInputSelections() {
-        GeckoHelper.blockForReady();
-
-        Actions.EventExpecter robocopTestExpecter =
-            getActions().expectGeckoEvent("Robocop:testInputSelections");
-        final String url = "chrome://roboextender/content/testInputSelections.html";
-        NavigationHelper.enterAndLoadUrl(url);
-        mToolbar.assertTitle(url);
-
-        while (!test(robocopTestExpecter)) {
-            // do nothing
-        }
-
-        robocopTestExpecter.unregisterListener();
+    public testInputSelections() {
+        super("chrome://roboextender/content/testInputSelections.html");
     }
 
-    private boolean test(Actions.EventExpecter expecter) {
-        final JSONObject eventData;
-        try {
-            eventData = new JSONObject(expecter.blockForEventData());
-        } catch(Exception ex) {
-            // Log and ignore
-            getAsserter().ok(false, "JS Test", "Error decoding data " + ex);
-            return false;
-        }
-
-        if (eventData.has("result")) {
-            getAsserter().ok(eventData.optBoolean("result"), "JS Test", eventData.optString("msg"));
-        } else if (eventData.has("todo")) {
-            getAsserter().todo(eventData.optBoolean("todo"), "JS TODO", eventData.optString("msg"));
-        }
-
-        EventDispatcher.sendResponse(eventData, new JSONObject());
-        return eventData.optBoolean("done", false);
+    public void testInputSelections() {
+        super.testSelection();
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testReadingListProvider.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testReadingListProvider.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testReadingListProvider.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testReadingListProvider.java	2015-02-28 15:03:07.000000000 +0000
@@ -8,8 +8,12 @@
 import java.util.Random;
 import java.util.concurrent.Callable;
 
+import android.app.Activity;
+import android.content.ContentResolver;
+import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
+import org.mozilla.gecko.db.ReadingListAccessor;
 import org.mozilla.gecko.db.ReadingListProvider;
 
 import android.content.ContentProvider;
@@ -19,23 +23,46 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.*;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.ADDED_ON;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.CLIENT_LAST_MODIFIED;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.EXCERPT;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.GUID;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.IS_UNREAD;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.RESOLVED_TITLE;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.RESOLVED_URL;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SERVER_LAST_MODIFIED;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SERVER_STORED_ON;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_FLAGS;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_NONE;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_RESOLVED;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_CHANGE_UNREAD_CHANGED;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_MODIFIED;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_NEW;
+import static org.mozilla.gecko.db.BrowserContract.ReadingListItems.SYNC_STATUS_SYNCED;
+import static org.mozilla.gecko.db.BrowserContract.URLColumns.TITLE;
+import static org.mozilla.gecko.db.BrowserContract.URLColumns.URL;
+
 public class testReadingListProvider extends ContentProviderTest {
 
     private static final String DB_NAME = "browser.db";
 
     // List of tests to be run sorted by dependency.
-    private final TestCase[] TESTS_TO_RUN = { new TestInsertItems(),
-                                              new TestDeleteItems(),
-                                              new TestUpdateItems(),
-                                              new TestBatchOperations(),
-                                              new TestBrowserProviderNotifications() };
+    private final TestCase[] TESTS_TO_RUN = {
+            new TestInsertItems(),
+            new TestDeleteItems(),
+            new TestUpdateItems(),
+            new TestBatchOperations(),
+            new TestBrowserProviderNotifications(),
+            new TestStateSequencing(),
+    };
 
     // Columns used to test for item equivalence.
-    final String[] TEST_COLUMNS = { ReadingListItems.TITLE,
-                                    ReadingListItems.URL,
-                                    ReadingListItems.EXCERPT,
-                                    ReadingListItems.LENGTH,
-                                    ReadingListItems.DATE_CREATED };
+    final String[] TEST_COLUMNS = { TITLE,
+                                    URL,
+                                    EXCERPT,
+                                    ADDED_ON };
 
     // Indicates that insertions have been tested. ContentProvider.insert
     // has been proven to work.
@@ -64,6 +91,13 @@
         for (TestCase test: TESTS_TO_RUN) {
             mTests.add(test);
         }
+
+        // Disable background fetches of content, because it causes the test harness
+        // to kill us for network fetches.
+        Activity a = getActivity();
+        if (a instanceof BrowserApp) {
+            ((BrowserApp) a).getReadingListHelper().disableBackgroundFetches();
+        }
     }
 
     public void testReadingListProviderTests() throws Exception {
@@ -85,21 +119,21 @@
         @Override
         public void test() throws Exception {
             ContentValues b = createFillerReadingListItem();
-            long id = ContentUris.parseId(mProvider.insert(ReadingListItems.CONTENT_URI, b));
+            long id = ContentUris.parseId(mProvider.insert(CONTENT_URI, b));
             Cursor c = getItemById(id);
 
             try {
                 mAsserter.ok(c.moveToFirst(), "Inserted item found", "");
                 assertRowEqualsContentValues(c, b);
 
-                mAsserter.is(c.getInt(c.getColumnIndex(ReadingListItems.CONTENT_STATUS)),
-                             ReadingListItems.STATUS_UNFETCHED,
+                mAsserter.is(c.getInt(c.getColumnIndex(CONTENT_STATUS)),
+                             STATUS_UNFETCHED,
                              "Inserted item has correct default content status");
             } finally {
                 c.close();
             }
 
-            testInsertWithNullCol(ReadingListItems.GUID);
+            testInsertWithNullCol(URL);
             mContentProviderInsertTested = true;
         }
 
@@ -112,7 +146,7 @@
             b.putNull(colName);
 
             try {
-                ContentUris.parseId(mProvider.insert(ReadingListItems.CONTENT_URI, b));
+                ContentUris.parseId(mProvider.insert(CONTENT_URI, b));
                 // If we get to here, the flawed insertion succeeded. Fail the test.
                 mAsserter.ok(false, "Insertion did not succeed with " + colName + " == null", "");
             } catch (NullPointerException e) {
@@ -128,17 +162,31 @@
 
         @Override
         public void test() throws Exception {
-            long id = insertAnItemWithAssertion();
-            // Test that the item is only marked as deleted and
+            final long one = insertAnItemWithAssertion();
+            final long two = insertAnItemWithAssertion();
+
+            assignGUID(one);
+
+            // Test that the item with a GUID is only marked as deleted and
             // not removed from the database.
-            testNonFirefoxSyncDelete(id);
+            testNonSyncDelete(one, true);
 
-            // Test that the item is removed from the database.
-            testFirefoxSyncDelete(id);
+            // The item without a GUID is just deleted immediately.
+            testNonSyncDelete(two, false);
+
+            // Test that the item with a GUID is removed from the database when deleted by Sync.
+            testSyncDelete(one);
+
+            final long three = insertAnItemWithAssertion();
 
-            id = insertAnItemWithAssertion();
             // Test that deleting works with only a URI.
-            testDeleteWithItemURI(id);
+            testDeleteWithItemURI(three);
+        }
+
+        private void assignGUID(final long id) {
+            final ContentValues values = new ContentValues();
+            values.put(GUID, "abcdefghi");
+            mProvider.update(CONTENT_URI, values, _ID + " = " + id, null);
         }
 
         /**
@@ -146,19 +194,26 @@
          * as deleted and not actually removed from the database. Also verify that the item
          * marked as deleted doesn't show up in a query.
          *
+         * Note that items are deleted immediately if they don't have a GUID.
+         *
          * @param id of the item to be deleted
+         * @param hasGUID if true, we expect the item to stick around and be marked.
          */
-        private void testNonFirefoxSyncDelete(long id) {
-            final int deleted = mProvider.delete(ReadingListItems.CONTENT_URI,
-                    ReadingListItems._ID + " = ?",
-                    new String[] { String.valueOf(id) });
+        private void testNonSyncDelete(long id, boolean hasGUID) {
+            final int deleted = mProvider.delete(CONTENT_URI,
+                                                 _ID + " = " + id,
+                                                 null);
 
             mAsserter.is(deleted, 1, "Inserted item was deleted");
 
             // PARAM_SHOW_DELETED in the URI allows items marked as deleted to be
             // included in the query.
-            Uri uri = appendUriParam(ReadingListItems.CONTENT_URI, BrowserContract.PARAM_SHOW_DELETED, "1");
-            assertItemExistsByID(uri, id, "Deleted item was only marked as deleted");
+            Uri uri = appendUriParam(CONTENT_URI, BrowserContract.PARAM_SHOW_DELETED, "1");
+            if (hasGUID) {
+                assertItemExistsByID(uri, id, "Deleted item was only marked as deleted");
+            } else {
+                assertItemDoesNotExistByID(uri, id, "Deleted item had no GUID, so was really deleted.");
+            }
 
             // Test that the 'deleted' item does not show up in a query when PARAM_SHOW_DELETED
             // is not specified in the URI.
@@ -171,14 +226,14 @@
          *
          * @param id of the item to be deleted
          */
-        private void testFirefoxSyncDelete(long id) {
-            final int deleted = mProvider.delete(appendUriParam(ReadingListItems.CONTENT_URI, BrowserContract.PARAM_IS_SYNC, "1"),
-                    ReadingListItems._ID + " = ?",
-                    new String[] { String.valueOf(id) });
+        private void testSyncDelete(long id) {
+            final int deleted = mProvider.delete(appendUriParam(CONTENT_URI, BrowserContract.PARAM_IS_SYNC, "1"),
+                    _ID + " = " + id,
+                    null);
 
             mAsserter.is(deleted, 1, "Inserted item was deleted");
 
-            Uri uri = appendUriParam(ReadingListItems.CONTENT_URI, BrowserContract.PARAM_SHOW_DELETED, "1");
+            Uri uri = appendUriParam(CONTENT_URI, BrowserContract.PARAM_SHOW_DELETED, "1");
             assertItemDoesNotExistByID(uri, id, "Inserted item is now actually deleted");
         }
 
@@ -189,7 +244,7 @@
          * @param id of the item to be deleted
          */
         private void testDeleteWithItemURI(long id) {
-            final int deleted = mProvider.delete(ContentUris.withAppendedId(ReadingListItems.CONTENT_URI, id), null, null);
+            final int deleted = mProvider.delete(ContentUris.withAppendedId(CONTENT_URI, id), null, null);
             mAsserter.is(deleted, 1, "Inserted item was deleted using URI with id");
         }
     }
@@ -205,7 +260,7 @@
             ensureCanInsert();
 
             ContentValues original = createFillerReadingListItem();
-            long id = ContentUris.parseId(mProvider.insert(ReadingListItems.CONTENT_URI, original));
+            long id = ContentUris.parseId(mProvider.insert(CONTENT_URI, original));
             int updated = 0;
             Long originalDateCreated = null;
             Long originalDateModified = null;
@@ -214,16 +269,16 @@
             try {
                 mAsserter.ok(c.moveToFirst(), "Inserted item found", "");
 
-                originalDateCreated = c.getLong(c.getColumnIndex(ReadingListItems.DATE_CREATED));
-                originalDateModified = c.getLong(c.getColumnIndex(ReadingListItems.DATE_MODIFIED));
+                originalDateCreated = c.getLong(c.getColumnIndex(ADDED_ON));
+                originalDateModified = c.getLong(c.getColumnIndex(CLIENT_LAST_MODIFIED));
 
-                updates.put(ReadingListItems.TITLE, original.getAsString(ReadingListItems.TITLE) + "CHANGED");
-                updates.put(ReadingListItems.URL, original.getAsString(ReadingListItems.URL) + "/more/stuff");
-                updates.put(ReadingListItems.EXCERPT, original.getAsString(ReadingListItems.EXCERPT) + "CHANGED");
+                updates.put(TITLE, original.getAsString(TITLE) + "CHANGED");
+                updates.put(URL, original.getAsString(URL) + "/more/stuff");
+                updates.put(EXCERPT, original.getAsString(EXCERPT) + "CHANGED");
 
-                updated = mProvider.update(ReadingListItems.CONTENT_URI, updates,
-                                               ReadingListItems._ID + " = ?",
-                                               new String[] { String.valueOf(id) });
+                updated = mProvider.update(CONTENT_URI, updates,
+                                           _ID + " = ?",
+                                           new String[] { String.valueOf(id) });
 
                 mAsserter.is(updated, 1, "Inserted item was updated");
             } finally {
@@ -232,18 +287,17 @@
 
             // Name change for clarity. These values will be compared with the
             // current cursor row.
-            ContentValues expectedValues = updates;
+            final ContentValues expectedValues = updates;
             c = getItemById(id);
             try {
                 mAsserter.ok(c.moveToFirst(), "Updated item found", "");
-                mAsserter.isnot(c.getLong(c.getColumnIndex(ReadingListItems.DATE_MODIFIED)),
+                mAsserter.isnot(c.getLong(c.getColumnIndex(CLIENT_LAST_MODIFIED)),
                 originalDateModified,
                 "Date modified should have changed");
 
-                // DATE_CREATED and LENGTH should equal old values since they weren't updated.
-                expectedValues.put(ReadingListItems.DATE_CREATED, originalDateCreated);
-                expectedValues.put(ReadingListItems.LENGTH, original.getAsString(ReadingListItems.LENGTH));
-                assertRowEqualsContentValues(c, expectedValues, /* compareDateModified */ false);
+                // ADDED_ON shouldn't have changed.
+                expectedValues.put(ADDED_ON, originalDateCreated);
+                assertRowEqualsContentValues(c, expectedValues, /* compareDateModified */ false, TEST_COLUMNS);
             } finally {
                 c.close();
             }
@@ -251,44 +305,24 @@
             // Test that updates on an item that doesn't exist does not modify any rows.
             testUpdateWithInvalidID();
 
-            // Test that update fails when a GUID is null.
-            testUpdateWithNullCol(id, ReadingListItems.GUID);
-
             mContentProviderUpdateTested = true;
         }
 
         /**
          * Test that updates on an item that doesn't exist does
          * not modify any rows.
-         *
-         * @param id of the item to be deleted
          */
         private void testUpdateWithInvalidID() {
             ensureEmptyDatabase();
             final ContentValues b = createFillerReadingListItem();
-            final long id = ContentUris.parseId(mProvider.insert(ReadingListItems.CONTENT_URI, b));
+            final long id = ContentUris.parseId(mProvider.insert(CONTENT_URI, b));
             final long INVALID_ID = id + 1;
             final ContentValues updates = new ContentValues();
-            updates.put(ReadingListItems.TITLE, b.getAsString(ReadingListItems.TITLE) + "CHANGED");
-            final int updated = mProvider.update(ReadingListItems.CONTENT_URI, updates,
-                                               ReadingListItems._ID + " = ?",
-                                               new String[] { String.valueOf(INVALID_ID) });
-            mAsserter.is(updated, 0, "Should not be able to update item with an invalid GUID");
-        }
-
-        /**
-         * Test that update fails when a required column is null.
-         */
-        private int testUpdateWithNullCol(long id, String colName) {
-            ContentValues updates = new ContentValues();
-            updates.putNull(colName);
-
-            int updated = mProvider.update(ReadingListItems.CONTENT_URI, updates,
-                                           ReadingListItems._ID + " = ?",
-                                           new String[] { String.valueOf(id) });
-
-            mAsserter.is(updated, 0, "Should not be able to update item with " + colName + " == null ");
-            return updated;
+            updates.put(TITLE, b.getAsString(TITLE) + "CHANGED");
+            final int updated = mProvider.update(CONTENT_URI, updates,
+                                                 _ID + " = ?",
+                                                 new String[] { String.valueOf(INVALID_ID) });
+            mAsserter.is(updated, 0, "Should not be able to update item with an invalid ID");
         }
     }
 
@@ -306,23 +340,22 @@
             for (int i = 0; i < ITEM_COUNT; i++) {
                 final String url =  "http://www.test.org/" + i;
                 allVals[i] = new ContentValues();
-                allVals[i].put(ReadingListItems.TITLE, "Test" + i);
-                allVals[i].put(ReadingListItems.URL, url);
-                allVals[i].put(ReadingListItems.EXCERPT, "EXCERPT" + i);
-                allVals[i].put(ReadingListItems.LENGTH, i);
+                allVals[i].put(TITLE, "Test" + i);
+                allVals[i].put(URL, url);
+                allVals[i].put(EXCERPT, "EXCERPT" + i);
                 urls.add(url);
             }
 
-            int inserts = mProvider.bulkInsert(ReadingListItems.CONTENT_URI, allVals);
+            int inserts = mProvider.bulkInsert(CONTENT_URI, allVals);
             mAsserter.is(inserts, ITEM_COUNT, "Excepted number of inserts matches");
 
-            Cursor c = mProvider.query(ReadingListItems.CONTENT_URI, null,
-                               null,
-                               null,
-                               null);
+            final Cursor c = mProvider.query(CONTENT_URI, null,
+                                             null,
+                                             null,
+                                             null);
             try {
                 while (c.moveToNext()) {
-                    final String url = c.getString(c.getColumnIndex(ReadingListItems.URL));
+                    final String url = c.getString(c.getColumnIndex(URL));
                     mAsserter.ok(urls.contains(url), "Bulk inserted item with url == " + url + " was found in the DB", "");
                     // We should only be seeing each item once. Remove from set to prevent dups.
                     urls.remove(url);
@@ -369,10 +402,10 @@
 
             // Update
             mResolver.notifyChangeList.clear();
-            h.put(ReadingListItems.TITLE, "http://newexample.com");
+            h.put(TITLE, "http://newexample.com");
 
             long numUpdated = mProvider.update(ReadingListItems.CONTENT_URI, h,
-                                               ReadingListItems._ID + " = ?",
+                                               _ID + " = ?",
                                                new String[] { String.valueOf(id) });
 
             mAsserter.is(numUpdated,
@@ -423,12 +456,198 @@
         }
     }
 
+    private class TestStateSequencing extends TestCase {
+        @Override
+        protected void test() throws Exception {
+            final ReadingListAccessor accessor = getTestProfile().getDB().getReadingListAccessor();
+            final ContentResolver cr = getActivity().getContentResolver();
+            final Uri syncURI = CONTENT_URI.buildUpon()
+                                           .appendQueryParameter(BrowserContract.PARAM_IS_SYNC, "1")
+                                           .appendQueryParameter(BrowserContract.PARAM_SHOW_DELETED, "1")
+                                           .build();
+
+            mAsserter.ok(accessor != null, "We have an accessor.", null);
+
+            // Verify that the accessor thinks we're empty.
+            mAsserter.ok(0 == accessor.getCount(cr), "We have no items.", null);
+
+            // Insert an item via the accessor.
+            final long addedItem = accessor.addBasicReadingListItem(cr, "http://example.org/", "Example A");
+
+            mAsserter.ok(1 == accessor.getCount(cr), "We have one item.", null);
+            final Cursor cursor = accessor.getReadingList(cr);
+            try {
+                mAsserter.ok(cursor.moveToNext(), "The cursor isn't empty.", null);
+                mAsserter.ok(1 == cursor.getCount(), "The cursor agrees.", null);
+            } finally {
+                cursor.close();
+            }
+
+            // Verify that it has no GUID, that its state is NEW, etc.
+            // This requires fetching more fields than the accessor uses.
+            final Cursor all = getEverything(syncURI);
+            try {
+                mAsserter.ok(all.moveToNext(), "The cursor isn't empty.", null);
+                mAsserter.ok(1 == all.getCount(), "The cursor agrees.", null);
+
+                ContentValues expected = new ContentValues();
+                expected.putNull(GUID);
+                expected.put(SYNC_STATUS, SYNC_STATUS_NEW);
+                expected.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_NONE);
+                expected.put(URL, "http://example.org/");
+                expected.put(TITLE, "Example A");
+                expected.putNull(RESOLVED_URL);
+                expected.putNull(RESOLVED_TITLE);
+
+                final String[] testColumns = {GUID, SYNC_STATUS, SYNC_CHANGE_FLAGS, URL, TITLE, RESOLVED_URL, RESOLVED_TITLE, URL, TITLE};
+                assertRowEqualsContentValues(all, expected, false, testColumns);
+            } finally {
+                all.close();
+            }
+
+            // Pretend that it was just synced.
+            final long serverTime = System.currentTimeMillis();
+            final ContentValues wasSynced = new ContentValues();
+            wasSynced.put(GUID, "eeeeeeeeeeeeee");
+            wasSynced.put(SYNC_STATUS, SYNC_STATUS_SYNCED);
+            wasSynced.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_NONE);
+            wasSynced.put(SERVER_STORED_ON, serverTime);
+            wasSynced.put(SERVER_LAST_MODIFIED, serverTime);
+
+            mAsserter.ok(1 == mProvider.update(syncURI, wasSynced, _ID + " = " + addedItem, null), "Updated one item.", null);
+            final Cursor afterSync = getEverything(syncURI);
+            try {
+                mAsserter.ok(afterSync.moveToNext(), "The cursor isn't empty.", null);
+                final String[] testColumns = {GUID, SYNC_STATUS, SYNC_CHANGE_FLAGS, SERVER_STORED_ON, SERVER_LAST_MODIFIED};
+                assertRowEqualsContentValues(afterSync, wasSynced, false, testColumns);
+            } finally {
+                afterSync.close();
+            }
+
+            // Make changes to the record that exercise the various change flags, verifying that
+            // the correct flags are set.
+            final long beforeMarkedRead = System.currentTimeMillis();
+            accessor.markAsRead(cr, addedItem);
+            final ContentValues markedAsRead = new ContentValues();
+            markedAsRead.put(GUID, "eeeeeeeeeeeeee");
+            markedAsRead.put(SYNC_STATUS, SYNC_STATUS_MODIFIED);
+            markedAsRead.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_UNREAD_CHANGED);
+            markedAsRead.put(IS_UNREAD, 0);
+
+            final Cursor afterMarkedRead = getEverything(syncURI);
+            try {
+                mAsserter.ok(afterMarkedRead.moveToNext(), "The cursor isn't empty.", null);
+                final String[] testColumns = {GUID, SYNC_STATUS, SYNC_CHANGE_FLAGS, IS_UNREAD};
+                assertRowEqualsContentValues(afterMarkedRead, markedAsRead, false, testColumns);
+                assertModifiedInRange(afterMarkedRead, beforeMarkedRead);
+            } finally {
+                afterMarkedRead.close();
+            }
+
+            // Now our content is here!
+            final long beforeContentUpdated = System.currentTimeMillis();
+            accessor.updateContent(cr, addedItem, "New title", "http://www.example.com/article", "The excerpt is long.");
+
+            // After this the content status should have changed, and we should be flagged to sync.
+            final ContentValues contentUpdated = new ContentValues();
+            contentUpdated.put(GUID, "eeeeeeeeeeeeee");
+            contentUpdated.put(SYNC_STATUS, SYNC_STATUS_MODIFIED);
+            contentUpdated.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_UNREAD_CHANGED | SYNC_CHANGE_RESOLVED);
+            contentUpdated.put(IS_UNREAD, 0);
+            contentUpdated.put(CONTENT_STATUS, STATUS_FETCHED_ARTICLE);
+
+            final Cursor afterContentUpdated = getEverything(syncURI);
+            try {
+                mAsserter.ok(afterContentUpdated.moveToNext(), "The cursor isn't empty.", null);
+                final String[] testColumns = {GUID, SYNC_STATUS, SYNC_CHANGE_FLAGS, IS_UNREAD, CONTENT_STATUS};
+                assertRowEqualsContentValues(afterContentUpdated, contentUpdated, false, testColumns);
+                assertModifiedInRange(afterContentUpdated, beforeContentUpdated);
+            } finally {
+                afterContentUpdated.close();
+            }
+
+            // Delete the record, and verify that its Sync state is DELETED.
+            final long beforeDeletion = System.currentTimeMillis();
+            accessor.deleteItem(cr, addedItem);
+            final ContentValues itemDeleted = new ContentValues();
+            itemDeleted.put(GUID, "eeeeeeeeeeeeee");
+            itemDeleted.put(SYNC_STATUS, SYNC_STATUS_DELETED);
+            itemDeleted.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_NONE);
+            // TODO: CONTENT_STATUS on deletion?
+
+            final Cursor afterDeletion = getEverything(syncURI);
+            try {
+                mAsserter.ok(afterDeletion.moveToNext(), "The cursor isn't empty.", null);
+                final String[] testColumns = {GUID, SYNC_STATUS, SYNC_CHANGE_FLAGS};
+                assertRowEqualsContentValues(afterDeletion, itemDeleted, false, testColumns);
+                assertModifiedInRange(afterDeletion, beforeDeletion);
+            } finally {
+                afterDeletion.close();
+            }
+
+            // The accessor will no longer return the record.
+            mAsserter.ok(0 == accessor.getCount(cr), "No items found.", null);
+
+            // Add a new record as Sync -- it should start in state SYNCED.
+            final ContentValues newRecord = new ContentValues();
+            final long newServerTime = System.currentTimeMillis() - 50000;
+            newRecord.put(GUID, "ffeeeeeeeeeeee");
+            newRecord.put(SYNC_STATUS, SYNC_STATUS_SYNCED);
+            newRecord.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_NONE);
+            newRecord.put(SERVER_STORED_ON, newServerTime);
+            newRecord.put(SERVER_LAST_MODIFIED, newServerTime);
+            newRecord.put(CLIENT_LAST_MODIFIED, System.currentTimeMillis());
+            newRecord.put(URL, "http://www.mozilla.org/");
+            newRecord.put(TITLE, "Mozilla");
+
+            final long newID = ContentUris.parseId(cr.insert(syncURI, newRecord));
+            mAsserter.ok(newID > 0, "New ID is greater than 0.", null);
+            mAsserter.ok(newID != addedItem, "New ID differs from last ID.", null);
+
+            final Cursor afterNewInsert = getEverything(syncURI);
+            try {
+                mAsserter.ok(afterNewInsert.moveToNext(), "The cursor isn't empty.", null);
+                mAsserter.ok(2 == afterNewInsert.getCount(), "The cursor has two rows.", null);
+
+                // Default sort order means newest first.
+                final String[] testColumns = {GUID, SYNC_STATUS, SYNC_CHANGE_FLAGS, SERVER_STORED_ON, SERVER_LAST_MODIFIED, CLIENT_LAST_MODIFIED, URL, TITLE};
+                assertRowEqualsContentValues(afterNewInsert, newRecord, false, testColumns);
+            } finally {
+                afterNewInsert.close();
+            }
+
+            // Make a change to it. Verify that it's now changed with the right flags.
+            final long beforeNewRead = System.currentTimeMillis();
+            accessor.markAsRead(cr, newID);
+            newRecord.put(SYNC_STATUS, SYNC_STATUS_MODIFIED);
+            newRecord.put(SYNC_CHANGE_FLAGS, SYNC_CHANGE_UNREAD_CHANGED);
+
+            final Cursor afterNewRead = getEverything(syncURI);
+            try {
+                mAsserter.ok(afterNewRead.moveToNext(), "The cursor isn't empty.", null);
+                mAsserter.ok(2 == afterNewRead.getCount(), "The cursor has two rows.", null);
+
+                // Default sort order means newest first.
+                final String[] testColumns = {GUID, SYNC_STATUS, SYNC_CHANGE_FLAGS, SERVER_STORED_ON, SERVER_LAST_MODIFIED, URL, TITLE};
+                assertRowEqualsContentValues(afterNewRead, newRecord, false, testColumns);
+                assertModifiedInRange(afterNewRead, beforeNewRead);
+            } finally {
+                afterNewRead.close();
+            }
+        }
+
+        private void assertModifiedInRange(Cursor cursor, long earliest) {
+            final long dbModified = cursor.getLong(cursor.getColumnIndexOrThrow(CLIENT_LAST_MODIFIED));
+            mAsserter.ok(dbModified >= earliest, "DB timestamp is at least as late as earliest.", null);
+            mAsserter.ok(dbModified <= System.currentTimeMillis(), "DB timestamp is earlier than now.", null);
+        }
+    }
+
     /**
      * Removes all items from the DB.
      */
     private void ensureEmptyDatabase() {
-        Uri uri = appendUriParam(ReadingListItems.CONTENT_URI, BrowserContract.PARAM_IS_SYNC, "1");
-        getWritableDatabase(uri).delete(ReadingListItems.TABLE_NAME, null, null);
+        getWritableDatabase(CONTENT_URI).delete(TABLE_NAME, null, null);
     }
 
 
@@ -443,34 +662,35 @@
      * Checks that the values in the cursor's current row match those
      * in the ContentValues object.
      *
-     * @param cursor over the row to be checked
-     * @param values to be checked
+     * @param testColumns
+     * @param cursorWithActual over the row to be checked
+     * @param expectedValues to be checked
      */
-    private void assertRowEqualsContentValues(Cursor cursorWithActual, ContentValues expectedValues, boolean compareDateModified) {
-        for (String column: TEST_COLUMNS) {
+    private void assertRowEqualsContentValues(Cursor cursorWithActual, ContentValues expectedValues, boolean compareDateModified, String[] testColumns) {
+        for (String column: testColumns) {
             String expected = expectedValues.getAsString(column);
             String actual = cursorWithActual.getString(cursorWithActual.getColumnIndex(column));
             mAsserter.is(actual, expected, "Item has correct " + column);
         }
 
         if (compareDateModified) {
-            String expected = expectedValues.getAsString(ReadingListItems.DATE_MODIFIED);
-            String actual = cursorWithActual.getString(cursorWithActual.getColumnIndex(ReadingListItems.DATE_MODIFIED));
-            mAsserter.is(actual, expected, "Item has correct " + ReadingListItems.DATE_MODIFIED);
+            String expected = expectedValues.getAsString(CLIENT_LAST_MODIFIED);
+            String actual = cursorWithActual.getString(cursorWithActual.getColumnIndex(CLIENT_LAST_MODIFIED));
+            mAsserter.is(actual, expected, "Item has correct " + CLIENT_LAST_MODIFIED);
         }
     }
 
     private void assertRowEqualsContentValues(Cursor cursorWithActual, ContentValues expectedValues) {
-        assertRowEqualsContentValues(cursorWithActual, expectedValues, true);
+        assertRowEqualsContentValues(cursorWithActual, expectedValues, true, TEST_COLUMNS);
     }
 
     private ContentValues fillContentValues(String title, String url, String excerpt) {
         ContentValues values = new ContentValues();
 
-        values.put(ReadingListItems.TITLE, title);
-        values.put(ReadingListItems.URL, url);
-        values.put(ReadingListItems.EXCERPT, excerpt);
-        values.put(ReadingListItems.LENGTH, excerpt.length());
+        values.put(TITLE, title);
+        values.put(URL, url);
+        values.put(EXCERPT, excerpt);
+        values.put(ADDED_ON, System.currentTimeMillis());
 
         return values;
     }
@@ -480,15 +700,23 @@
         return fillContentValues("Example", "http://example.com/?num=" + rand.nextInt(), "foo bar");
     }
 
+    private Cursor getEverything(Uri uri) {
+        return mProvider.query(uri,
+                               null,
+                               null,
+                               null,
+                               null);
+    }
+
     private Cursor getItemById(Uri uri, long id, String[] projection) {
         return mProvider.query(uri, projection,
-                               ReadingListItems._ID + " = ?",
+                               _ID + " = ?",
                                new String[] { String.valueOf(id) },
                                null);
     }
 
     private Cursor getItemById(long id) {
-        return getItemById(ReadingListItems.CONTENT_URI, id, null);
+        return getItemById(CONTENT_URI, id, null);
     }
 
     private Cursor getItemById(Uri uri, long id) {
@@ -518,7 +746,7 @@
         ensureCanInsert();
 
         ContentValues v = createFillerReadingListItem();
-        long id = ContentUris.parseId(mProvider.insert(ReadingListItems.CONTENT_URI, v));
+        long id = ContentUris.parseId(mProvider.insert(CONTENT_URI, v));
 
         assertItemExistsByID(id, "Inserted item found");
         return id;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testSelectionHandler.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testSelectionHandler.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testSelectionHandler.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testSelectionHandler.java	2015-02-28 15:03:07.000000000 +0000
@@ -1,47 +1,12 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.EventDispatcher;
-import org.mozilla.gecko.tests.helpers.GeckoHelper;
-import org.mozilla.gecko.tests.helpers.NavigationHelper;
+public class testSelectionHandler extends SelectionHandlerTest {
 
-import android.util.Log;
-
-import org.json.JSONObject;
-
-
-public class testSelectionHandler extends UITest {
-
-    public void testSelectionHandler() {
-        GeckoHelper.blockForReady();
-
-        Actions.EventExpecter robocopTestExpecter = getActions().expectGeckoEvent("Robocop:testSelectionHandler");
-        final String url = "chrome://roboextender/content/testSelectionHandler.html";
-        NavigationHelper.enterAndLoadUrl(url);
-        mToolbar.assertTitle(url);
-
-        while (!test(robocopTestExpecter)) {
-            // do nothing
-        }
-
-        robocopTestExpecter.unregisterListener();
+    public testSelectionHandler() {
+        super("chrome://roboextender/content/testSelectionHandler.html");
     }
 
-    private boolean test(Actions.EventExpecter expecter) {
-        final JSONObject eventData;
-        try {
-            eventData = new JSONObject(expecter.blockForEventData());
-        } catch(Exception ex) {
-            // Log and ignore
-            getAsserter().ok(false, "JS Test", "Error decoding data " + ex);
-            return false;
-        }
-
-        if (eventData.has("result")) {
-            getAsserter().ok(eventData.optBoolean("result"), "JS Test", eventData.optString("msg"));
-        }
-
-        EventDispatcher.sendResponse(eventData, new JSONObject());
-        return eventData.optBoolean("done", false);
+    public void testSelectionHandler() {
+        super.testSelection();
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testSettingsMenuItems.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testSettingsMenuItems.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testSettingsMenuItems.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testSettingsMenuItems.java	2015-02-28 15:03:07.000000000 +0000
@@ -45,7 +45,7 @@
 
     // Display menu items.
     String[] PATH_DISPLAY = { StringHelper.DISPLAY_SECTION_LABEL };
-    final String[] TITLE_BAR_LABEL_ARR = { StringHelper.TITLE_BAR_LABEL, StringHelper.SHOW_PAGE_TITLE_LABEL,
+    final String[] TITLE_BAR_LABEL_ARR = { StringHelper.TITLE_BAR_LABEL, StringHelper.SHOW_PAGE_ADDRESS_LABEL,
         StringHelper.SHOW_PAGE_TITLE_LABEL, StringHelper.SHOW_PAGE_ADDRESS_LABEL };
     String[][] OPTIONS_DISPLAY = {
         { StringHelper.TEXT_SIZE_LABEL },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testTextareaSelections.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testTextareaSelections.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/tests/testTextareaSelections.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/tests/testTextareaSelections.java	2015-02-28 15:03:07.000000000 +0000
@@ -1,50 +1,12 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.EventDispatcher;
-import org.mozilla.gecko.tests.helpers.GeckoHelper;
-import org.mozilla.gecko.tests.helpers.NavigationHelper;
+public class testTextareaSelections extends SelectionHandlerTest {
 
-import android.util.Log;
-
-import org.json.JSONObject;
-
-
-public class testTextareaSelections extends UITest {
-
-    public void testTextareaSelections() {
-        GeckoHelper.blockForReady();
-
-        Actions.EventExpecter robocopTestExpecter =
-            getActions().expectGeckoEvent("Robocop:testTextareaSelections");
-        final String url = "chrome://roboextender/content/testTextareaSelections.html";
-        NavigationHelper.enterAndLoadUrl(url);
-        mToolbar.assertTitle(url);
-
-        while (!test(robocopTestExpecter)) {
-            // do nothing
-        }
-
-        robocopTestExpecter.unregisterListener();
+    public testTextareaSelections() {
+        super("chrome://roboextender/content/testTextareaSelections.html");
     }
 
-    private boolean test(Actions.EventExpecter expecter) {
-        final JSONObject eventData;
-        try {
-            eventData = new JSONObject(expecter.blockForEventData());
-        } catch(Exception ex) {
-            // Log and ignore
-            getAsserter().ok(false, "JS Test", "Error decoding data " + ex);
-            return false;
-        }
-
-        if (eventData.has("result")) {
-            getAsserter().ok(eventData.optBoolean("result"), "JS Test", eventData.optString("msg"));
-        } else if (eventData.has("todo")) {
-            getAsserter().todo(eventData.optBoolean("todo"), "JS TODO", eventData.optString("msg"));
-        }
-
-        EventDispatcher.sendResponse(eventData, new JSONObject());
-        return eventData.optBoolean("done", false);
+    public void testTextareaSelections() {
+        super.testSelection();
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/TextSelection.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/TextSelection.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/TextSelection.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/TextSelection.java	2015-02-28 15:03:07.000000000 +0000
@@ -43,6 +43,7 @@
     private final DrawListener mDrawListener;
     private boolean mDraggingHandles;
 
+    private int selectionID; // Unique ID provided for each selection action.
     private float mViewLeft;
     private float mViewTop;
     private float mViewZoom;
@@ -131,6 +132,7 @@
             public void run() {
                 try {
                     if (event.equals("TextSelection:ShowHandles")) {
+                        selectionID = message.getInt("selectionID");
                         final JSONArray handles = message.getJSONArray("handles");
                         for (int i=0; i < handles.length(); i++) {
                             String handle = handles.getString(i);
@@ -315,7 +317,17 @@
         public void onDestroyActionMode(ActionModeCompat mode) {
             mActionMode = null;
             mCallback = null;
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:End", null));
+            final JSONObject args = new JSONObject();
+            try {
+                args.put("selectionID", selectionID);
+            } catch (JSONException e) {
+                Log.e(LOGTAG, "Error building JSON arguments for TextSelection:End", e);
+                return;
+            }
+
+            final GeckoEvent event =
+                GeckoEvent.createBroadcastEvent("TextSelection:End", args.toString());
+            GeckoAppShell.sendEventToGecko(event);
         }
     }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/toolbar/BrowserToolbarTablet.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/toolbar/BrowserToolbarTablet.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/toolbar/BrowserToolbarTablet.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/toolbar/BrowserToolbarTablet.java	2015-02-28 15:03:08.000000000 +0000
@@ -10,7 +10,6 @@
 import org.mozilla.gecko.animation.ViewHelper;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
@@ -51,16 +50,6 @@
         setButtonEnabled(forwardButton, true);
 
         updateForwardButtonState(ForwardButtonState.HIDDEN);
-
-        setRightMargin();
-    }
-
-    private void setRightMargin() {
-        // TODO: Remove this hack in favor of resources when old tablet is removed.
-        final Resources res = getContext().getResources();
-        final int rightMargin =
-                res.getDimensionPixelOffset(R.dimen.new_tablet_browser_toolbar_menu_right_margin);
-        setPadding(getPaddingLeft(), getPaddingTop(), rightMargin, getPaddingBottom());
     }
 
     private void updateForwardButtonState(final ForwardButtonState state) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/toolbar/ToolbarDisplayLayout.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/toolbar/ToolbarDisplayLayout.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/toolbar/ToolbarDisplayLayout.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/toolbar/ToolbarDisplayLayout.java	2015-02-28 15:03:08.000000000 +0000
@@ -14,6 +14,7 @@
 import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.ReaderModeUtils;
 import org.mozilla.gecko.SiteIdentity;
 import org.mozilla.gecko.SiteIdentity.SecurityMode;
 import org.mozilla.gecko.SiteIdentity.MixedMode;
@@ -191,7 +192,7 @@
         mSiteSecurityVisible = (mSiteSecurity.getVisibility() == View.VISIBLE);
 
         mSiteIdentityPopup = new SiteIdentityPopup(mActivity);
-        mSiteIdentityPopup.setAnchor(mTitle);
+        mSiteIdentityPopup.setAnchor(mSiteSecurity);
 
         mStop = (ImageButton) findViewById(R.id.stop);
         mPageActionLayout = (PageActionLayout) findViewById(R.id.page_action_layout);
@@ -360,11 +361,14 @@
             return;
         }
 
-        CharSequence title = url;
+        String strippedURL = stripAboutReaderURL(url);
+
         if (mPrefs.shouldTrimUrls()) {
-            title = StringUtils.stripCommonSubdomains(StringUtils.stripScheme(url));
+            strippedURL = StringUtils.stripCommonSubdomains(StringUtils.stripScheme(strippedURL));
         }
 
+        CharSequence title = strippedURL;
+
         final String baseDomain = tab.getBaseDomain();
         if (!TextUtils.isEmpty(baseDomain)) {
             final SpannableStringBuilder builder = new SpannableStringBuilder(title);
@@ -382,6 +386,14 @@
         setTitle(title);
     }
 
+    private String stripAboutReaderURL(final String url) {
+        if (!AboutPages.isAboutReader(url)) {
+            return url;
+        }
+
+        return ReaderModeUtils.getUrlFromAboutReader(url);
+    }
+
     private void updateFavicon(Tab tab) {
         if (HardwareUtils.isTablet()) {
             // We don't display favicons in the toolbar on tablet.
@@ -409,7 +421,7 @@
             image = Bitmap.createScaledBitmap(image, mFaviconSize, mFaviconSize, false);
             mFavicon.setImageBitmap(image);
         } else {
-            mFavicon.setImageResource(R.drawable.favicon);
+            mFavicon.setImageResource(R.drawable.favicon_globe);
         }
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/util/ActivityUtils.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/util/ActivityUtils.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/util/ActivityUtils.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/util/ActivityUtils.java	2015-02-28 15:03:08.000000000 +0000
@@ -20,7 +20,7 @@
         // Hide/show the system notification bar
         Window window = activity.getWindow();
 
-        if (Versions.feature11Plus) {
+        if (Versions.feature16Plus) {
             final int newVis;
             if (fullscreen) {
                 newVis = View.SYSTEM_UI_FLAG_FULLSCREEN |
@@ -36,4 +36,16 @@
                             WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
     }
+
+    public static boolean isFullScreen(final Activity activity) {
+        final Window window = activity.getWindow();
+
+        if (Versions.feature16Plus) {
+            final int vis = window.getDecorView().getSystemUiVisibility();
+            return (vis & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
+        }
+
+        final int flags = window.getAttributes().flags;
+        return ((flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0);
+    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/util/HardwareUtils.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/util/HardwareUtils.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/util/HardwareUtils.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/util/HardwareUtils.java	2015-02-28 15:03:08.000000000 +0000
@@ -17,14 +17,6 @@
 public final class HardwareUtils {
     private static final String LOGTAG = "GeckoHardwareUtils";
 
-    // Minimum memory threshold for a device to be considered
-    // a low memory platform (see isLowMemoryPlatform). This value
-    // has be in sync with Gecko's equivalent threshold (defined in
-    // xpcom/base/nsMemoryImpl.cpp) and should only be used in cases
-    // where we can't depend on Gecko to be up and running e.g. show/hide
-    // reading list capabilities in HomePager.
-    private static final int LOW_MEMORY_THRESHOLD_MB = 384;
-
     private static final boolean IS_AMAZON_DEVICE = Build.MANUFACTURER.equalsIgnoreCase("Amazon");
     public static final boolean IS_KINDLE_DEVICE = IS_AMAZON_DEVICE &&
                                                    (Build.MODEL.equals("Kindle Fire") ||
@@ -96,17 +88,4 @@
     public static int getMemSize() {
         return SysInfo.getMemSize();
     }
-
-    public static boolean isLowMemoryPlatform() {
-        final int memSize = getMemSize();
-
-        // Fallback to false if we fail to read meminfo
-        // for some reason.
-        if (memSize == 0) {
-            Log.w(LOGTAG, "Could not compute system memory. Falling back to isLowMemoryPlatform = false.");
-            return false;
-        }
-
-        return memSize < LOW_MEMORY_THRESHOLD_MB;
-    }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/widget/FaviconView.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/widget/FaviconView.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/widget/FaviconView.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/widget/FaviconView.java	2015-02-28 15:03:08.000000000 +0000
@@ -214,7 +214,7 @@
     }
 
     public void showDefaultFavicon() {
-        setImageResource(R.drawable.favicon);
+        setImageResource(R.drawable.favicon_globe);
         mDominantColor = 0;
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/ZoomedView.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/ZoomedView.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/base/ZoomedView.java	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/base/ZoomedView.java	2015-02-28 15:03:07.000000000 +0000
@@ -40,12 +40,13 @@
         LayerView.ZoomedViewListener, GeckoEventListener {
     private static final String LOGTAG = "Gecko" + ZoomedView.class.getSimpleName();
 
-    private static final int ZOOM_FACTOR = 2;
+    private static final int DEFAULT_ZOOM_FACTOR = 3;
     private static final int W_CAPTURED_VIEW_IN_PERCENT = 80;
     private static final int H_CAPTURED_VIEW_IN_PERCENT = 50;
     private static final int MINIMUM_DELAY_BETWEEN_TWO_RENDER_CALLS_NS = 1000000;
     private static final int DELAY_BEFORE_NEXT_RENDER_REQUEST_MS = 2000;
 
+    private int zoomFactor;
     private ImageView zoomedImageView;
     private LayerView layerView;
     private int viewWidth;
@@ -86,6 +87,8 @@
                 if (dragged) {
                     dragged = false;
                 } else {
+                    GeckoEvent eClickInZoomedView = GeckoEvent.createBroadcastEvent("Gesture:ClickInZoomedView", "");
+                    GeckoAppShell.sendEventToGecko(eClickInZoomedView);
                     layerView.dispatchTouchEvent(actionDownEvent);
                     actionDownEvent.recycle();
                     PointF convertedPosition = getUnzoomedPositionFromPointInZoomedView(event.getX(), event.getY());
@@ -184,7 +187,7 @@
         final float parentHeight = metrics.getHeight();
         RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) getLayoutParams();
 
-        returnValue.x = (int) ((x / ZOOM_FACTOR) +     // Conversion of the x offset inside the zoomed view (using the scale factor)
+        returnValue.x = (int) ((x / zoomFactor) +     // Conversion of the x offset inside the zoomed view (using the scale factor)
 
                         offset.x +               // The offset of the layerView
 
@@ -192,17 +195,17 @@
                          *   Minimum value for the left side of the zoomed view is 0
                          *     and we return 0 after conversion
                          *   Maximum value for the left side of the zoomed view is (parentWidth - offset.x - viewWidth)
-                         *     and we return (parentWidth - offset.x - (viewWidth / ZOOM_FACTOR)) after conversion.
+                         *     and we return (parentWidth - offset.x - (viewWidth / zoomFactor)) after conversion.
                          */
                         (((float) params.leftMargin) - offset.x) *
-                            ((parentWidth - offset.x - (viewWidth / ZOOM_FACTOR)) /
+                            ((parentWidth - offset.x - (viewWidth / zoomFactor)) /
                             (parentWidth - offset.x - viewWidth)));
 
         // Same comments here vertically
-        returnValue.y = (int) ((y / ZOOM_FACTOR) +
+        returnValue.y = (int) ((y / zoomFactor) +
                         offset.y +
                         (((float) params.topMargin) - offset.y) *
-                            ((parentHeight - offset.y - (viewHeight / ZOOM_FACTOR)) /
+                            ((parentHeight - offset.y - (viewHeight / zoomFactor)) /
                             (parentHeight - offset.y - viewHeight)));
 
         return returnValue;
@@ -219,7 +222,7 @@
         final float parentWidth = metrics.getWidth();
         final float parentHeight = metrics.getHeight();
 
-        returnValue.x = (int) ((((x - (viewWidth / (2 * ZOOM_FACTOR)))) /   // Translation to get the left side position of the zoomed view
+        returnValue.x = (int) ((((x - (viewWidth / (2 * zoomFactor)))) /   // Translation to get the left side position of the zoomed view
                                                                         // centered on x (the value 2 to get the middle).
 
                         /* Conversion of the left side position of the zoomed view.
@@ -228,14 +231,14 @@
                          * and not in a multiplication to convert the position from
                          * the LayerView to the ZoomedView.
                          */
-                        ((parentWidth - offset.x - (viewWidth / ZOOM_FACTOR)) /
+                        ((parentWidth - offset.x - (viewWidth / zoomFactor)) /
                         (parentWidth - offset.x - viewWidth)))
 
                 + offset.x);     // The offset of the layerView
 
         // Same comments here vertically
-        returnValue.y = (int) ((((y - (viewHeight / (2 * ZOOM_FACTOR)))) /
-                        ((parentHeight - offset.y - (viewHeight / ZOOM_FACTOR)) /
+        returnValue.y = (int) ((((y - (viewHeight / (2 * zoomFactor)))) /
+                        ((parentHeight - offset.y - (viewHeight / zoomFactor)) /
                         (parentHeight - offset.y - viewHeight)))
                 + offset.y);
 
@@ -296,8 +299,16 @@
 
     private void setCapturedSize(ImmutableViewportMetrics metrics) {
         float parentMinSize = Math.min(metrics.getWidth(), metrics.getHeight());
-        viewWidth = (int) (parentMinSize * W_CAPTURED_VIEW_IN_PERCENT / (ZOOM_FACTOR * 100.0)) * ZOOM_FACTOR;
-        viewHeight = (int) (parentMinSize * H_CAPTURED_VIEW_IN_PERCENT / (ZOOM_FACTOR * 100.0)) * ZOOM_FACTOR;
+        // For metrics.zoomFactor lower than 1, the zoom factor of the zoomed view is calculated
+        // to get always the same size for the content in the zoomed view.
+        // For metrics.zoomFactor greater than 1, the zoom factor is always set to the default
+        // value DEFAULT_ZOOM_FACTOR, thus the zoomed view is always a zoom of the normal view.
+        zoomFactor = Math.max(DEFAULT_ZOOM_FACTOR, (int) (DEFAULT_ZOOM_FACTOR / metrics.zoomFactor));
+        viewWidth = (int) (parentMinSize * W_CAPTURED_VIEW_IN_PERCENT / (zoomFactor * 100.0)) * zoomFactor;
+        viewHeight = (int) (parentMinSize * H_CAPTURED_VIEW_IN_PERCENT / (zoomFactor * 100.0)) * zoomFactor;
+        // Display in zoomedview is corrupted when width is an odd number
+        // More details about this issue here: bug 776906 comment 11
+        viewWidth &= ~0x1;
     }
 
     private void shouldBlockUpdate(boolean shouldBlockUpdate) {
@@ -474,7 +485,7 @@
         final int yPos = (int) (origin.y - offset.y) + lastPosition.y;
 
         GeckoEvent e = GeckoEvent.createZoomedViewEvent(tabId, xPos, yPos, viewWidth,
-                viewHeight, ZOOM_FACTOR * metrics.zoomFactor, buffer);
+                viewHeight, zoomFactor * metrics.zoomFactor, buffer);
         GeckoAppShell.sendEventToGecko(e);
     }
 
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/branding/beta/res/drawable-mdpi/launcher_widget.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/branding/beta/res/drawable-mdpi/launcher_widget.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/aboutPasswords.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/aboutPasswords.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/aboutPasswords.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/aboutPasswords.js	2015-02-28 15:03:08.000000000 +0000
@@ -4,6 +4,7 @@
 
 let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils;
 
+Cu.import("resource://gre/modules/Messaging.jsm");
 Cu.import("resource://gre/modules/Services.jsm")
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
@@ -130,9 +131,20 @@
     }, true);
 
     // Create item icon.
-    let img = document.createElement("img");
+    let img = document.createElement("div");
     img.className = "icon";
-    img.setAttribute("src", login.hostname + "/favicon.ico");
+
+    // Load favicon from cache.
+    Messaging.sendRequestForResult({
+      type: "Favicon:CacheLoad",
+      url: login.hostname,
+    }).then(function(faviconUrl) {
+      img.style.backgroundImage= "url('" + faviconUrl + "')";
+      img.style.visibility = "visible";
+    }, function(data) {
+      debug("Favicon cache failure : " + data);
+      img.style.visibility = "visible";
+    });
     loginItem.appendChild(img);
 
     // Create item details.
@@ -192,8 +204,8 @@
     let detailItem = document.querySelector("#login-details > .login-item");
     let login = detailItem.login = listItem.login;
     let favicon = detailItem.querySelector(".icon");
-    favicon.setAttribute("src", login.hostname + "/favicon.ico");
-
+    favicon.style["background-image"] = listItem.querySelector(".icon").style["background-image"];
+    favicon.style.visibility = "visible";
     document.getElementById("details-header").setAttribute("link", login.hostname);
 
     document.getElementById("detail-hostname").textContent = login.hostname;
@@ -209,7 +221,7 @@
       userInputs = domain.split(".").filter(part => part.length > 3);
     }
 
-    let lastChanged = new Date(login.timePasswordChanged);
+    let lastChanged = new Date(login.QueryInterface(Ci.nsILoginMetaInfo).timePasswordChanged);
     let days = Math.round((Date.now() - lastChanged) / 1000 / 60 / 60/ 24);
     document.getElementById("detail-age").textContent = gStringBundle.formatStringFromName("passwordsDetails.age", [days], 1);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/aboutPasswords.xhtml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/aboutPasswords.xhtml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/aboutPasswords.xhtml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/aboutPasswords.xhtml	2015-02-28 15:03:08.000000000 +0000
@@ -31,7 +31,7 @@
     </div>
     <div id="login-details" class="list" hidden="true">
       <div class="login-item list-item">
-        <img class="icon"/>
+        <div class="icon"/>
         <div id="details-header" class="inner">
           <div class="details">
             <div id="detail-hostname" class="hostname"></div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/browser.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/browser.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/browser.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/browser.js	2015-02-28 15:03:08.000000000 +0000
@@ -179,10 +179,11 @@
     "Reader:ListStatusRequest",
     "Reader:RemoveFromList",
     "Reader:Share",
-    "Reader:ShowToast",
-    "Reader:ToolbarVisibility",
+    "Reader:ToolbarHidden",
     "Reader:SystemUIVisibility",
     "Reader:UpdateReaderButton",
+    "Reader:SetIntPref",
+    "Reader:SetCharPref",
   ], "chrome://browser/content/Reader.js"],
 ].forEach(aScript => {
   let [name, messages, script] = aScript;
@@ -625,6 +626,17 @@
         });
       });
 
+    NativeWindow.contextmenus.add(stringGetter("contextmenu.addToReadingList"),
+      NativeWindow.contextmenus.linkOpenableContext,
+      function(aTarget) {
+        let url = NativeWindow.contextmenus._getLinkURL(aTarget);
+        Messaging.sendRequestForResult({
+            type: "Reader:AddToList",
+            title: truncate(url, MAX_TITLE_LENGTH),
+            url: truncate(url, MAX_URI_LENGTH),
+        }).catch(Cu.reportError);
+      });
+
     NativeWindow.contextmenus.add(stringGetter("contextmenu.copyLink"),
       NativeWindow.contextmenus.linkCopyableContext,
       function(aTarget) {
@@ -4431,7 +4443,11 @@
     this.clickToPlayPluginsActivated = false;
     // Borrowed from desktop Firefox: http://mxr.mozilla.org/mozilla-central/source/browser/base/content/urlbarBindings.xml#174
     let documentURI = contentWin.document.documentURIObject.spec
-    let matchedURL = documentURI.match(/^((?:[a-z]+:\/\/)?(?:[^\/]+@)?)(.+?)(?::\d+)?(?:\/|$)/);
+
+    // If reader mode, get the base domain for the original url.
+    let strippedURI = this._stripAboutReaderURL(documentURI);
+
+    let matchedURL = strippedURI.match(/^((?:[a-z]+:\/\/)?(?:[^\/]+@)?)(.+?)(?::\d+)?(?:\/|$)/);
     let baseDomain = "";
     if (matchedURL) {
       var domain = "";
@@ -4489,6 +4505,19 @@
     }
   },
 
+  _stripAboutReaderURL: function (url) {
+    if (!url.startsWith("about:reader")) {
+      return url;
+    }
+
+    // From ReaderParent._getOriginalUrl (browser/modules/ReaderParent.jsm).
+    let searchParams = new URLSearchParams(url.substring("about:reader?".length));
+    if (!searchParams.has("url")) {
+        return url;
+    }
+    return decodeURIComponent(searchParams.get("url"));
+  },
+
   // Properties used to cache security state used to update the UI
   _state: null,
   _hostChanged: false, // onLocationChange will flip this bit
@@ -4892,8 +4921,10 @@
 
 var BrowserEventHandler = {
   init: function init() {
+    this._clickInZoomedView = false;
     Services.obs.addObserver(this, "Gesture:SingleTap", false);
     Services.obs.addObserver(this, "Gesture:CancelTouch", false);
+    Services.obs.addObserver(this, "Gesture:ClickInZoomedView", false);
     Services.obs.addObserver(this, "Gesture:DoubleTap", false);
     Services.obs.addObserver(this, "Gesture:Scroll", false);
     Services.obs.addObserver(this, "dom-touch-listener-added", false);
@@ -5087,6 +5118,10 @@
         this._cancelTapHighlight();
         break;
 
+      case "Gesture:ClickInZoomedView":
+        this._clickInZoomedView = true;
+        break;
+
       case "Gesture:SingleTap": {
         try {
           // If the element was previously focused, show the caret attached to it.
@@ -5104,7 +5139,7 @@
         let data = JSON.parse(aData);
         let {x, y} = data;
 
-        if (this._inCluster) {
+        if (this._inCluster && this._clickInZoomedView != true) {
           this._clusterClicked(x, y);
         } else {
           // The _highlightElement was chosen after fluffing the touch events
@@ -5114,6 +5149,7 @@
           this._sendMouseEvent("mousedown", x, y);
           this._sendMouseEvent("mouseup",   x, y);
         }
+        this._clickInZoomedView = false;
         // scrollToFocusedInput does its own checks to find out if an element should be zoomed into
         BrowserApp.scrollToFocusedInput(BrowserApp.selectedBrowser);
 
@@ -7011,6 +7047,14 @@
     }
 
     let engineData = Services.search.getVisibleEngines({});
+
+    // Our Java UI assumes that the default engine is the first item in the array,
+    // so we need to make sure that's the case.
+    if (engineData[0] !== Services.search.defaultEngine) {
+      engineData = engineData.filter(engine => engine !== Services.search.defaultEngine);
+      engineData.unshift(Services.search.defaultEngine);
+    }
+
     let searchEngines = engineData.map(function (engine) {
       return {
         name: engine.name,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/Reader.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/Reader.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/Reader.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/Reader.js	2015-02-28 15:03:08.000000000 +0000
@@ -15,6 +15,11 @@
   STATUS_FETCH_FAILED_UNSUPPORTED_FORMAT: 3,
   STATUS_FETCHED_ARTICLE: 4,
 
+  get _hasUsedToolbar() {
+    delete this._hasUsedToolbar;
+    return this._hasUsedToolbar = Services.prefs.getBoolPref("reader.has_used_toolbar");
+  },
+
   observe: function Reader_observe(aMessage, aTopic, aData) {
     switch (aTopic) {
       case "Reader:FetchContent": {
@@ -103,10 +108,6 @@
         });
         break;
 
-      case "Reader:ShowToast":
-        NativeWindow.toast.show(message.data.toast, "short");
-        break;
-
       case "Reader:SystemUIVisibility":
         Messaging.sendRequest({
           type: "SystemUI:Visibility",
@@ -114,11 +115,12 @@
         });
         break;
 
-      case "Reader:ToolbarVisibility":
-        Messaging.sendRequest({
-          type: "BrowserToolbar:Visibility",
-          visible: message.data.visible
-        });
+      case "Reader:ToolbarHidden":
+        if (!this._hasUsedToolbar) {
+          NativeWindow.toast.show(Strings.browser.GetStringFromName("readerMode.toolbarTip"), "short");
+          Services.prefs.setBoolPref("reader.has_used_toolbar", true);
+          this._hasUsedToolbar = true;
+        }
         break;
 
       case "Reader:UpdateReaderButton": {
@@ -127,6 +129,18 @@
         this.updatePageAction(tab);
         break;
       }
+      case "Reader:SetIntPref": {
+        if (message.data && message.data.name !== undefined) {
+          Services.prefs.setIntPref(message.data.name, message.data.value);
+        }
+        break;
+      }
+      case "Reader:SetCharPref": {
+        if (message.data && message.data.name !== undefined) {
+          Services.prefs.setCharPref(message.data.name, message.data.value);
+        }
+        break;
+      }
     }
   },
 
@@ -157,7 +171,7 @@
     let browser = tab.browser;
     if (browser.currentURI.spec.startsWith("about:reader")) {
       this.pageAction.id = PageActions.add({
-        title: Strings.browser.GetStringFromName("readerMode.exit"),
+        title: Strings.browser.GetStringFromName("readerView.exit"),
         icon: "drawable://reader_active",
         clickCallback: () => this.pageAction.readerModeCallback(tab.id),
         important: true
@@ -174,7 +188,7 @@
 
     if (browser.isArticle) {
       this.pageAction.id = PageActions.add({
-        title: Strings.browser.GetStringFromName("readerMode.enter"),
+        title: Strings.browser.GetStringFromName("readerView.enter"),
         icon: "drawable://reader",
         clickCallback: () => this.pageAction.readerModeCallback(tab.id),
         longClickCallback: () => this.pageAction.readerModeActiveCallback(tab.id),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/SelectionHandler.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/SelectionHandler.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/chrome/content/SelectionHandler.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/chrome/content/SelectionHandler.js	2015-02-28 15:03:08.000000000 +0000
@@ -44,6 +44,7 @@
   _focusIsRTL: false,
 
   _activeType: 0, // TYPE_NONE
+  _selectionID: 0, // Unique Selection ID
 
   _draggingHandles: false, // True while user drags text selection handles
   _dragStartAnchorOffset: null, // Editables need initial pos during HandleMove events
@@ -134,10 +135,19 @@
         }
         break;
       }
+
       case "Tab:Selected":
-      case "TextSelection:End":
         this._closeSelection();
         break;
+
+      case "TextSelection:End":
+        let data = JSON.parse(aData);
+        // End the requested selection only.
+        if (this._selectionID === data.selectionID) {
+          this._closeSelection();
+        }
+        break;
+
       case "TextSelection:Action":
         for (let type in this.actions) {
           if (this.actions[type].id == aData) {
@@ -365,6 +375,7 @@
     // Determine position and show handles, open actionbar
     this._positionHandles(positions);
     Messaging.sendRequest({
+      selectionID: this._selectionID,
       type: "TextSelection:ShowHandles",
       handles: [this.HANDLE_TYPE_ANCHOR, this.HANDLE_TYPE_FOCUS]
     });
@@ -756,6 +767,7 @@
     // Determine position and show caret, open actionbar
     this._positionHandles();
     Messaging.sendRequest({
+      selectionID: this._selectionID,
       type: "TextSelection:ShowHandles",
       handles: [this.HANDLE_TYPE_CARET]
     });
@@ -777,6 +789,7 @@
       aElement.focus();
     }
 
+    this._selectionID++;
     this._stopDraggingHandles();
     this._contentWindow = aElement.ownerDocument.defaultView;
     this._targetIsRTL = (this._contentWindow.getComputedStyle(aElement, "").direction == "rtl");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/components/LoginManagerPrompter.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/components/LoginManagerPrompter.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/components/LoginManagerPrompter.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/components/LoginManagerPrompter.js	2015-02-28 15:03:08.000000000 +0000
@@ -261,7 +261,7 @@
     promptToChangePasswordWithUsernames : function (logins, count, aNewLogin) {
         const buttonFlags = Ci.nsIPrompt.STD_YES_NO_BUTTONS;
 
-        var usernames = logins.map(function (l) l.username);
+        var usernames = logins.map(l => l.username);
         var dialogText  = this._getLocalizedString("userSelectText");
         var dialogTitle = this._getLocalizedString("passwordChangeTitle");
         var selectedIndex = { value: null };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/config/mozconfigs/android-api-11/nightly thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/config/mozconfigs/android-api-11/nightly
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/config/mozconfigs/android-api-11/nightly	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/config/mozconfigs/android-api-11/nightly	2015-02-28 15:03:08.000000000 +0000
@@ -15,4 +15,6 @@
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
+MOZ_ANDROID_GECKOLIBS_AAR=1
+
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/confvars.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/confvars.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/confvars.sh	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/confvars.sh	2015-02-28 15:03:08.000000000 +0000
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=38.0a1
+MOZ_APP_VERSION=39.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
@@ -76,9 +76,6 @@
 # Enable the Search Activity.
 MOZ_ANDROID_SEARCH_ACTIVITY=1
 
-# Use the new tablet UI. This will go away in Bug 1106935.
-MOZ_ANDROID_NEW_TABLET_UI=1
-
 # Enable the share handler.
 MOZ_ANDROID_SHARE_OVERLAY=1
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/geckoview_library/geckolibs/AndroidManifest.xml	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.mozilla.gecko.libs">
+
+</manifest>
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/geckoview_library/geckolibs/classes.jar and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/geckoview_library/geckolibs/classes.jar differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/installer/package-manifest.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/installer/package-manifest.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/installer/package-manifest.in	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/installer/package-manifest.in	2015-02-28 15:03:08.000000000 +0000
@@ -391,6 +391,8 @@
 @BINPATH@/components/formautofill.manifest
 @BINPATH@/components/FormAutofillContentService.js
 @BINPATH@/components/FormAutofillStartup.js
+@BINPATH@/components/CSSUnprefixingService.js
+@BINPATH@/components/CSSUnprefixingService.manifest
 @BINPATH@/components/contentAreaDropListener.manifest
 @BINPATH@/components/contentAreaDropListener.js
 @BINPATH@/components/messageWakeupService.js
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/locales/en-US/chrome/browser.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/locales/en-US/chrome/browser.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/locales/en-US/chrome/browser.properties	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/locales/en-US/chrome/browser.properties	2015-02-28 15:03:08.000000000 +0000
@@ -361,9 +361,13 @@
 getUserMedia.sharingMicrophone.message2 = Microphone is on
 getUserMedia.sharingCameraAndMicrophone.message2 = Camera and microphone are on
 
-#Reader mode
-readerMode.enter = Enter Reader Mode
-readerMode.exit = Exit Reader Mode
+#Reader view
+readerView.enter = Enter Reader View
+readerView.exit = Exit Reader View
+
+# LOCALIZATION NOTE (readerMode.toolbarTip):
+# Tip shown to users the first time we hide the reader mode toolbar.
+readerMode.toolbarTip=Tap the screen to show reader options
 
 #Open in App
 openInApp.pageAction = Open in App
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/AppConstants.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/AppConstants.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/AppConstants.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/AppConstants.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -26,7 +26,7 @@
 #endif
 
   ACCESSIBILITY:
-#ifdef MOZ_ACCESSIBILITY
+#ifdef ACCESSIBILITY
   true,
 #else
   false,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/DownloadNotifications.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/DownloadNotifications.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/DownloadNotifications.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/DownloadNotifications.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -219,6 +219,12 @@
     if (this._show) {
       if (!this.id) {
         this.id = Notifications.create(this.options);
+      } else if (!this.options.ongoing) {
+        // We need to explictly cancel ongoing notifications,
+        // since updating them to be non-ongoing doesn't seem
+        // to work. See bug 1130834.
+        Notifications.cancel(this.id);
+        this.id = Notifications.create(this.options);
       } else {
         Notifications.update(this.id, this.options);
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/JNI.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/JNI.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/JNI.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/JNI.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -797,7 +797,7 @@
 // this regex matches one component of a type signature:
 // any number of array modifiers, followed by either a
 // primitive type character or L<classname>;
-var sigRegex = function() /\[*([VZBCSIJFD]|L([^.\/;]+(\/[^.\/;]+)*);)/g;
+var sigRegex = () => /\[*([VZBCSIJFD]|L([^.\/;]+(\/[^.\/;]+)*);)/g;
 var ensureSig = function(classname_or_signature) {
     // convert a classname into a signature,
     // leaving unchanged signatures.  We assume that
@@ -1070,7 +1070,7 @@
   });
   (props.static_methods || []).forEach(function(mtd) {
     var jmtd = jenvpp().GetStaticMethodID(jenv, jcls, mtd.name, mtd.sig);
-    var argctypes = mtd.sig.match(sigRegex()).map(function(s) sig2ctype(s));
+    var argctypes = mtd.sig.match(sigRegex()).map(s => sig2ctype(s));
     var returnSig = mtd.sig.substring(mtd.sig.indexOf(')')+1);
     var ty = sig2type(returnSig), nm = returnSig;
     var call = "CallStatic"+ty+"Method";
@@ -1090,7 +1090,7 @@
   (props.constructors || []).forEach(function(mtd) {
     mtd.name = "<init>";
     var jmtd = jenvpp().GetMethodID(jenv, jcls, mtd.name, mtd.sig);
-    var argctypes = mtd.sig.match(sigRegex()).map(function(s) sig2ctype(s));
+    var argctypes = mtd.sig.match(sigRegex()).map(s => sig2ctype(s));
     var returnSig = mtd.sig.substring(mtd.sig.indexOf(')')+1);
 
     r['new'] = overloadFunc('new');
@@ -1121,7 +1121,7 @@
   });
   (props.methods || []).forEach(function(mtd) {
     var jmtd = jenvpp().GetMethodID(jenv, jcls, mtd.name, mtd.sig);
-    var argctypes = mtd.sig.match(sigRegex()).map(function(s) sig2ctype(s));
+    var argctypes = mtd.sig.match(sigRegex()).map(s => sig2ctype(s));
     var returnSig = mtd.sig.substring(mtd.sig.indexOf(')')+1);
     var ty = sig2type(returnSig), nm = returnSig;
     var call = "Call"+ty+"Method";
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/modules/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/modules/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -34,7 +34,7 @@
 for var in ('ANDROID_PACKAGE_NAME', 'MOZ_APP_VERSION'):
     DEFINES[var] = CONFIG[var]
 
-for var in ('NIGHTLY_BUILD', 'RELEASE_BUILD', 'MOZ_ACCESSIBILITY',
+for var in ('NIGHTLY_BUILD', 'RELEASE_BUILD', 'ACCESSIBILITY',
     'MOZILLA_OFFICIAL', 'MOZ_OFFICIAL_BRANDING', 'MOZ_SERVICES_HEALTHREPORT',
     'MOZ_DEVICES', 'MOZ_DEVICES', 'MOZ_SAFE_BROWSING',
     'MOZ_TELEMETRY_REPORTING', 'MOZ_WEBRTC'):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/search/java/org/mozilla/search/providers/SearchEngineManager.java	2015-02-28 15:03:08.000000000 +0000
@@ -34,6 +34,8 @@
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Locale;
 
 public class SearchEngineManager implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -42,6 +44,9 @@
     // Gecko pref that defines the name of the default search engine.
     private static final String PREF_GECKO_DEFAULT_ENGINE = "browser.search.defaultenginename";
 
+    // Gecko pref that defines the name of the default searchplugin locale.
+    private static final String PREF_GECKO_DEFAULT_LOCALE = "distribution.searchplugins.defaultLocale";
+
     // Key for shared preference that stores default engine name.
     private static final String PREF_DEFAULT_ENGINE_KEY = "search.engines.defaultname";
 
@@ -65,6 +70,10 @@
     // This should only be accessed from the background thread.
     private String fallbackLocale;
 
+    // Cached version of default locale included in Distribution preferences.
+    // This should only be accessed from the background thread.
+    private String distributionLocale;
+
     public static interface SearchEngineCallback {
         public void execute(SearchEngine engine);
     }
@@ -239,7 +248,16 @@
         try {
             final JSONObject all = new JSONObject(FileUtils.getFileContents(prefFile));
 
-            // First, check to see if there's a locale-specific override.
+            // First, look for a default locale specified by the distribution.
+            if (all.has("Preferences")) {
+                final JSONObject prefs = all.getJSONObject("Preferences");
+                if (prefs.has(PREF_GECKO_DEFAULT_LOCALE)) {
+                    Log.d(LOG_TAG, "Found default searchplugin locale in distribution Preferences.");
+                    distributionLocale = prefs.getString(PREF_GECKO_DEFAULT_LOCALE);
+                }
+            }
+
+            // Then, check to see if there's a locale-specific default engine override.
             final String languageTag = Locales.getLanguageTag(Locale.getDefault());
             final String overridesKey = "LocalizablePreferences." + languageTag;
             if (all.has(overridesKey)) {
@@ -250,7 +268,7 @@
                 }
             }
 
-            // Next, check to see if there's a non-override default pref.
+            // Next, check to see if there's a non-override default engine pref.
             if (all.has("LocalizablePreferences")) {
                 final JSONObject localizablePrefs = all.getJSONObject("LocalizablePreferences");
                 if (localizablePrefs.has(PREF_GECKO_DEFAULT_ENGINE)) {
@@ -443,12 +461,43 @@
             return null;
         }
 
-        final File[] files = (new File(pluginsDir, "common")).listFiles();
-        if (files == null) {
+        // Collect an array of files to scan using the same approach as
+        // DirectoryService._appendDistroSearchDirs which states:
+        // Common engines are loaded for all locales. If there is no locale directory for
+        // the current locale, there is a pref: "distribution.searchplugins.defaultLocale",
+        // which specifies a default locale to use.
+        ArrayList<File> files = new ArrayList<>();
+
+        // Load files from the common folder first
+        final File[] commonFiles = (new File(pluginsDir, "common")).listFiles();
+        if (commonFiles != null) {
+            Collections.addAll(files, commonFiles);
+        }
+
+        // Next, check to see if there's a locale-specific override.
+        final File localeDir = new File(pluginsDir, "locale");
+        if (localeDir != null) {
+            final String languageTag = Locales.getLanguageTag(Locale.getDefault());
+            final File[] localeFiles = (new File(localeDir, languageTag)).listFiles();
+            if (localeFiles != null) {
+                Collections.addAll(files, localeFiles);
+            } else {
+                // We didn't append the locale dir - try the default one.
+                if (distributionLocale != null) {
+                    final File[] defaultLocaleFiles = (new File(localeDir, distributionLocale)).listFiles();
+                    if (defaultLocaleFiles != null) {
+                        Collections.addAll(files, defaultLocaleFiles);
+                    }
+                }
+            }
+        }
+
+        if (files.isEmpty()) {
             Log.e(LOG_TAG, "Could not find search plugin files in distribution directory");
             return null;
         }
-        return createEngineFromFileList(files, name);
+
+        return createEngineFromFileList(files.toArray(new File[files.size()]), name);
     }
 
     /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/aboutPasswords.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/aboutPasswords.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/aboutPasswords.css	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/aboutPasswords.css	2015-02-28 15:03:08.000000000 +0000
@@ -83,6 +83,16 @@
   margin: 0 5px;
 }
 
+.icon {
+  background-image: url("resource://android/res/drawable-mdpi-v4/favicon.png");
+  background-position: center;
+  background-size: 32px 32px;
+  background-repeat: no-repeat;
+  height: 32px;
+  width: 32px;
+  visibility: hidden;
+}
+
 @media screen and (min-resolution: 1.25dppx) {
   #filter-button {
     background-image: url("resource://android/res/drawable-hdpi-v4/ab_search.png");
@@ -91,6 +101,10 @@
   #filter-clear {
     background-image: url("resource://android/res/drawable-hdpi-v4/close_edit_mode_light.png");
   }
+
+  .icon {
+    background-image: url("resource://android/res/drawable-hdpi-v4/favicon.png");
+  }
 }
 
 @media screen and (min-resolution: 2dppx) {
@@ -101,4 +115,8 @@
   #filter-clear {
     background-image: url("resource://android/res/drawable-hdpi-v4/close_edit_mode_light.png");
   }
+
+  .icon {
+    background-image: url("resource://android/res/drawable-xhdpi-v4/favicon.png");
+  }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/aboutReader.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/aboutReader.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/aboutReader.css	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/aboutReader.css	2015-02-28 15:03:08.000000000 +0000
@@ -25,20 +25,56 @@
   color: #eeeeee;
 }
 
-.clear-sans {
+.sans-serif {
   font-family: sans-serif;
 }
 
-.charis-sil {
+.serif {
   font-family: serif;
 }
 
+.font-size1 {
+  font-size: 10px;
+}
+
+.font-size2 {
+  font-size: 12px;
+}
+
+.font-size3 {
+  font-size: 14px;
+}
+
+.font-size4  {
+  font-size: 16px;
+}
+
+.font-size5 {
+  font-size: 18px;
+}
+
+.font-size6 {
+  font-size: 20px;
+}
+
+.font-size7 {
+  font-size: 22px;
+}
+
+.font-size8 {
+  font-size: 24px;
+}
+
+.font-size9 {
+  font-size: 26px;
+}
+
 .message {
   margin-top: 40px;
   display: none;
   text-align: center;
   width: 100%;
-  font-size: 16px;
+  font-size: 0.9rem;
 }
 
 .header {
@@ -65,7 +101,7 @@
 }
 
 .header > h1 {
-  font-size: 2.625em;
+  font-size: 1.33rem;
   font-weight: 700;
   line-height: 1.1em;
   width: 100%;
@@ -107,66 +143,19 @@
   color: #aaaaaa;
 }
 
-.font-size1 > body > .header > h1 {
-  font-size: 27px;
-}
-
-.font-size2 > body > .header > h1 {
-  font-size: 29px;
-}
-
-.font-size3 > body > .header > h1 {
-  font-size: 31px;
-}
-
-.font-size4 > body > .header > h1 {
-  font-size: 33px;
-}
-
-.font-size5 > body > .header > h1 {
-  font-size: 35px;
-}
-
 /* This covers caption, domain, and credits
    texts in the reader UI */
 
-.font-size1 > body > .content .wp-caption-text,
-.font-size1 > body > .content figcaption,
-.font-size1 > body > .header > .domain,
-.font-size1 > body > .header > .credits {
-  font-size: 10px;
-}
-
-.font-size2 > body > .content .wp-caption-text,
-.font-size2 > body > .content figcaption,
-.font-size2 > body > .header > .domain,
-.font-size2 > body > .header > .credits {
-  font-size: 13px;
-}
-
-.font-size3 > body > .content .wp-caption-text,
-.font-size3 > body > .content figcaption,
-.font-size3 > body > .header > .domain,
-.font-size3 > body > .header > .credits {
-  font-size: 15px;
-}
-
-.font-size4 > body > .content .wp-caption-text,
-.font-size4 > body > .content figcaption,
-.font-size4 > body > .header > .domain,
-.font-size4 > body > .header > .credits {
-  font-size: 17px;
-}
-
-.font-size5 > body > .content .wp-caption-text,
-.font-size5 > body > .content figcaption,
-.font-size5 > body > .header > .domain,
-.font-size5 > body > .header > .credits {
-  font-size: 19px;
+.content .wp-caption-text,
+.content figcaption,
+.header > .domain,
+.header > .credits {
+  font-size: 0.9rem;
 }
 
 .content {
   display: none;
+  font-size: 1rem;
 }
 
 .content a {
@@ -295,31 +284,6 @@
   list-style: decimal !important;
 }
 
-.font-size1-sample,
-.font-size1 > body > .content {
-  font-size: 14px !important;
-}
-
-.font-size2-sample,
-.font-size2 > body > .content {
-  font-size: 16px !important;
-}
-
-.font-size3-sample,
-.font-size3 > body > .content {
-  font-size: 18px !important;
-}
-
-.font-size4-sample,
-.font-size4 > body > .content {
-  font-size: 20px !important;
-}
-
-.font-size5-sample,
-.font-size5 > body > .content {
-  font-size: 22px !important;
-}
-
 .toolbar {
   font-family: "Clear Sans",sans-serif;
   transition-property: visibility, opacity;
@@ -355,6 +319,15 @@
   background-position: center;
   background-size: 30px 24px;
   background-repeat: no-repeat;
+  background-color: transparent;
+  border: 0;
+  width: 100%;
+}
+
+/* Remove dotted border when button is focused */
+.button::-moz-focus-inner,
+#font-size-buttons > button::-moz-focus-inner {
+  border: 0;
 }
 
 .dropdown {
@@ -419,6 +392,7 @@
 }
 
 #font-type-buttons,
+#font-size-buttons,
 .segmented-button {
   display: flex;
   flex-direction: row;
@@ -428,13 +402,22 @@
 }
 
 #font-type-buttons > li,
+#font-size-buttons > button,
 .segmented-button > li {
-  width: 50px; /* combined with flex, this acts as a minimum width */
   flex: 1 0 auto;
   text-align: center;
   line-height: 20px;
 }
 
+#font-type-buttons > li,
+#font-size-buttons > button {
+  width: 100px; /* combined with flex, this acts as a minimum width */
+}
+
+.segmented-button > li {
+  width: 50px; /* combined with flex, this acts as a minimum width */
+}
+
 #font-type-buttons > li {
   padding: 10px 0;
 }
@@ -443,6 +426,7 @@
   border-left: 1px solid #B5B5B5;
 }
 
+#font-size-buttons > button:first-child,
 .segmented-button > li:first-child {
   border-left: 0px;
 }
@@ -488,6 +472,24 @@
   font-size: 12px;
 }
 
+.minus-button,
+.plus-button {
+  background-color: transparent;
+  border: 0;
+  height: 30px;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.minus-button {
+  background-size: 24px 6px;
+}
+
+.plus-button {
+  background-size: 24px 24px;
+}
+
  /* desktop-only controls */
 .close-button,
 .list-button {
@@ -510,6 +512,14 @@
   background-image: url('chrome://browser/skin/images/reader-style-icon-mdpi.png');
 }
 
+.minus-button {
+  background-image: url('chrome://browser/skin/images/reader-minus-mdpi.png');
+}
+
+.plus-button {
+  background-image: url('chrome://browser/skin/images/reader-plus-mdpi.png');
+}
+
 @media screen and (min-resolution: 1.25dppx) {
   .dropdown-arrow {
     background-image: url('chrome://browser/skin/images/reader-dropdown-arrow-hdpi.png');
@@ -530,6 +540,14 @@
   .style-button {
     background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png');
   }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-hdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-hdpi.png');
+  }
 }
 
 @media screen and (min-resolution: 2dppx) {
@@ -552,6 +570,14 @@
   .style-button {
     background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png');
   }
+
+  .minus-button {
+    background-image: url('chrome://browser/skin/images/reader-minus-xhdpi.png');
+  }
+
+  .plus-button {
+    background-image: url('chrome://browser/skin/images/reader-plus-xhdpi.png');
+  }
 }
 
 @media screen and (orientation: portrait) {
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/images/reader-minus-hdpi.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/images/reader-minus-hdpi.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/images/reader-minus-mdpi.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/images/reader-minus-mdpi.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/images/reader-minus-xhdpi.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/images/reader-minus-xhdpi.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/images/reader-plus-hdpi.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/images/reader-plus-hdpi.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/images/reader-plus-mdpi.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/images/reader-plus-mdpi.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/images/reader-plus-xhdpi.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/images/reader-plus-xhdpi.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/themes/core/jar.mn	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/themes/core/jar.mn	2015-02-28 15:03:08.000000000 +0000
@@ -89,6 +89,12 @@
   skin/images/reader-dropdown-arrow-mdpi.png     (images/reader-dropdown-arrow-mdpi.png)
   skin/images/reader-dropdown-arrow-hdpi.png     (images/reader-dropdown-arrow-hdpi.png)
   skin/images/reader-dropdown-arrow-xhdpi.png    (images/reader-dropdown-arrow-xhdpi.png)
+  skin/images/reader-minus-mdpi.png              (images/reader-minus-mdpi.png)
+  skin/images/reader-minus-hdpi.png              (images/reader-minus-hdpi.png)
+  skin/images/reader-minus-xhdpi.png             (images/reader-minus-xhdpi.png)
+  skin/images/reader-plus-mdpi.png               (images/reader-plus-mdpi.png)
+  skin/images/reader-plus-hdpi.png               (images/reader-plus-hdpi.png)
+  skin/images/reader-plus-xhdpi.png              (images/reader-plus-xhdpi.png)
   skin/images/reader-toggle-on-icon-mdpi.png     (images/reader-toggle-on-icon-mdpi.png)
   skin/images/reader-toggle-on-icon-hdpi.png     (images/reader-toggle-on-icon-hdpi.png)
   skin/images/reader-toggle-on-icon-xhdpi.png    (images/reader-toggle-on-icon-xhdpi.png)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/thirdparty/com/readystatesoftware/systembartint/SystemBarTintManager.java thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/thirdparty/com/readystatesoftware/systembartint/SystemBarTintManager.java
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/android/thirdparty/com/readystatesoftware/systembartint/SystemBarTintManager.java	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/android/thirdparty/com/readystatesoftware/systembartint/SystemBarTintManager.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,565 +0,0 @@
-/*
- * Copyright (C) 2013 readyState Software Ltd
- *
- * 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.
- */
-
-package com.readystatesoftware.systembartint;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.FrameLayout.LayoutParams;
-
-import java.lang.reflect.Method;
-
-/**
- * Class to manage status and navigation bar tint effects when using KitKat 
- * translucent system UI modes.
- *
- */
-public class SystemBarTintManager {
-
-    static {
-        // Android allows a system property to override the presence of the navigation bar.
-        // Used by the emulator.
-        // See https://github.com/android/platform_frameworks_base/blob/master/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java#L1076
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            try {
-                Class c = Class.forName("android.os.SystemProperties");
-                Method m = c.getDeclaredMethod("get", String.class);
-                m.setAccessible(true);
-                sNavBarOverride = (String) m.invoke(null, "qemu.hw.mainkeys");
-            } catch (Throwable e) {
-                sNavBarOverride = null;
-            }
-        }
-    }
-
-
-    /**
-     * The default system bar tint color value.
-     */
-    public static final int DEFAULT_TINT_COLOR = 0x99000000;
-
-    private static String sNavBarOverride;
-
-    private final SystemBarConfig mConfig;
-    private boolean mStatusBarAvailable;
-    private boolean mNavBarAvailable;
-    private boolean mStatusBarTintEnabled;
-    private boolean mNavBarTintEnabled;
-    private View mStatusBarTintView;
-    private View mNavBarTintView;
-
-    /**
-     * Constructor. Call this in the host activity onCreate method after its
-     * content view has been set. You should always create new instances when
-     * the host activity is recreated.
-     *
-     * @param activity The host activity.
-     */
-    @TargetApi(19)
-    public SystemBarTintManager(Activity activity) {
-
-        Window win = activity.getWindow();
-        ViewGroup decorViewGroup = (ViewGroup) win.getDecorView();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            // check theme attrs
-            int[] attrs = {android.R.attr.windowTranslucentStatus,
-                    android.R.attr.windowTranslucentNavigation};
-            TypedArray a = activity.obtainStyledAttributes(attrs);
-            try {
-                mStatusBarAvailable = a.getBoolean(0, false);
-                mNavBarAvailable = a.getBoolean(1, false);
-            } finally {
-                a.recycle();
-            }
-
-            // check window flags
-            WindowManager.LayoutParams winParams = win.getAttributes();
-            int bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
-            if ((winParams.flags & bits) != 0) {
-                mStatusBarAvailable = true;
-            }
-            bits = WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION;
-            if ((winParams.flags & bits) != 0) {
-                mNavBarAvailable = true;
-            }
-        }
-
-        mConfig = new SystemBarConfig(activity, mStatusBarAvailable, mNavBarAvailable);
-        // device might not have virtual navigation keys
-        if (!mConfig.hasNavigtionBar()) {
-            mNavBarAvailable = false;
-        }
-
-        if (mStatusBarAvailable) {
-            setupStatusBarView(activity, decorViewGroup);
-        }
-        if (mNavBarAvailable) {
-            setupNavBarView(activity, decorViewGroup);
-        }
-
-    }
-
-    /**
-     * Enable tinting of the system status bar.
-     *
-     * If the platform is running Jelly Bean or earlier, or translucent system
-     * UI modes have not been enabled in either the theme or via window flags,
-     * then this method does nothing.
-     *
-     * @param enabled True to enable tinting, false to disable it (default).
-     */
-    public void setStatusBarTintEnabled(boolean enabled) {
-        mStatusBarTintEnabled = enabled;
-        if (mStatusBarAvailable) {
-            mStatusBarTintView.setVisibility(enabled ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    /**
-     * Enable tinting of the system navigation bar.
-     *
-     * If the platform does not have soft navigation keys, is running Jelly Bean
-     * or earlier, or translucent system UI modes have not been enabled in either
-     * the theme or via window flags, then this method does nothing.
-     *
-     * @param enabled True to enable tinting, false to disable it (default).
-     */
-    public void setNavigationBarTintEnabled(boolean enabled) {
-        mNavBarTintEnabled = enabled;
-        if (mNavBarAvailable) {
-            mNavBarTintView.setVisibility(enabled ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    /**
-     * Apply the specified color tint to all system UI bars.
-     *
-     * @param color The color of the background tint.
-     */
-    public void setTintColor(int color) {
-        setStatusBarTintColor(color);
-        setNavigationBarTintColor(color);
-    }
-
-    /**
-     * Apply the specified drawable or color resource to all system UI bars.
-     *
-     * @param res The identifier of the resource.
-     */
-    public void setTintResource(int res) {
-        setStatusBarTintResource(res);
-        setNavigationBarTintResource(res);
-    }
-
-    /**
-     * Apply the specified drawable to all system UI bars.
-     *
-     * @param drawable The drawable to use as the background, or null to remove it.
-     */
-    public void setTintDrawable(Drawable drawable) {
-        setStatusBarTintDrawable(drawable);
-        setNavigationBarTintDrawable(drawable);
-    }
-
-    /**
-     * Apply the specified alpha to all system UI bars.
-     *
-     * @param alpha The alpha to use
-     */
-    public void setTintAlpha(float alpha) {
-        setStatusBarAlpha(alpha);
-        setNavigationBarAlpha(alpha);
-    }
-
-    /**
-     * Apply the specified color tint to the system status bar.
-     *
-     * @param color The color of the background tint.
-     */
-    public void setStatusBarTintColor(int color) {
-        if (mStatusBarAvailable) {
-            mStatusBarTintView.setBackgroundColor(color);
-        }
-    }
-
-    /**
-     * Apply the specified drawable or color resource to the system status bar.
-     *
-     * @param res The identifier of the resource.
-     */
-    public void setStatusBarTintResource(int res) {
-        if (mStatusBarAvailable) {
-            mStatusBarTintView.setBackgroundResource(res);
-        }
-    }
-
-    /**
-     * Apply the specified drawable to the system status bar.
-     *
-     * @param drawable The drawable to use as the background, or null to remove it.
-     */
-    @SuppressWarnings("deprecation")
-    public void setStatusBarTintDrawable(Drawable drawable) {
-        if (mStatusBarAvailable) {
-            mStatusBarTintView.setBackgroundDrawable(drawable);
-        }
-    }
-
-    /**
-     * Apply the specified alpha to the system status bar.
-     *
-     * @param alpha The alpha to use
-     */
-    @TargetApi(11)
-    public void setStatusBarAlpha(float alpha) {
-        if (mStatusBarAvailable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            mStatusBarTintView.setAlpha(alpha);
-        }
-    }
-
-    /**
-     * Apply the specified color tint to the system navigation bar.
-     *
-     * @param color The color of the background tint.
-     */
-    public void setNavigationBarTintColor(int color) {
-        if (mNavBarAvailable) {
-            mNavBarTintView.setBackgroundColor(color);
-        }
-    }
-
-    /**
-     * Apply the specified drawable or color resource to the system navigation bar.
-     *
-     * @param res The identifier of the resource.
-     */
-    public void setNavigationBarTintResource(int res) {
-        if (mNavBarAvailable) {
-            mNavBarTintView.setBackgroundResource(res);
-        }
-    }
-
-    /**
-     * Apply the specified drawable to the system navigation bar.
-     *
-     * @param drawable The drawable to use as the background, or null to remove it.
-     */
-    @SuppressWarnings("deprecation")
-    public void setNavigationBarTintDrawable(Drawable drawable) {
-        if (mNavBarAvailable) {
-            mNavBarTintView.setBackgroundDrawable(drawable);
-        }
-    }
-
-    /**
-     * Apply the specified alpha to the system navigation bar.
-     *
-     * @param alpha The alpha to use
-     */
-    @TargetApi(11)
-    public void setNavigationBarAlpha(float alpha) {
-        if (mNavBarAvailable && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            mNavBarTintView.setAlpha(alpha);
-        }
-    }
-
-    /**
-     * Get the system bar configuration.
-     *
-     * @return The system bar configuration for the current device configuration.
-     */
-    public SystemBarConfig getConfig() {
-        return mConfig;
-    }
-
-    /**
-     * Is tinting enabled for the system status bar?
-     *
-     * @return True if enabled, False otherwise.
-     */
-    public boolean isStatusBarTintEnabled() {
-        return mStatusBarTintEnabled;
-    }
-
-    /**
-     * Is tinting enabled for the system navigation bar?
-     *
-     * @return True if enabled, False otherwise.
-     */
-    public boolean isNavBarTintEnabled() {
-        return mNavBarTintEnabled;
-    }
-
-    private void setupStatusBarView(Context context, ViewGroup decorViewGroup) {
-        mStatusBarTintView = new View(context);
-        LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, mConfig.getStatusBarHeight());
-        params.gravity = Gravity.TOP;
-        if (mNavBarAvailable && !mConfig.isNavigationAtBottom()) {
-            params.rightMargin = mConfig.getNavigationBarWidth();
-        }
-        mStatusBarTintView.setLayoutParams(params);
-        mStatusBarTintView.setBackgroundColor(DEFAULT_TINT_COLOR);
-        mStatusBarTintView.setVisibility(View.GONE);
-        decorViewGroup.addView(mStatusBarTintView);
-    }
-
-    private void setupNavBarView(Context context, ViewGroup decorViewGroup) {
-        mNavBarTintView = new View(context);
-        LayoutParams params;
-        if (mConfig.isNavigationAtBottom()) {
-            params = new LayoutParams(LayoutParams.MATCH_PARENT, mConfig.getNavigationBarHeight());
-            params.gravity = Gravity.BOTTOM;
-        } else {
-            params = new LayoutParams(mConfig.getNavigationBarWidth(), LayoutParams.MATCH_PARENT);
-            params.gravity = Gravity.RIGHT;
-        }
-        mNavBarTintView.setLayoutParams(params);
-        mNavBarTintView.setBackgroundColor(DEFAULT_TINT_COLOR);
-        mNavBarTintView.setVisibility(View.GONE);
-        decorViewGroup.addView(mNavBarTintView);
-    }
-
-    /**
-     * Class which describes system bar sizing and other characteristics for the current
-     * device configuration.
-     *
-     */
-    public static class SystemBarConfig {
-
-        private static final String STATUS_BAR_HEIGHT_RES_NAME = "status_bar_height";
-        private static final String NAV_BAR_HEIGHT_RES_NAME = "navigation_bar_height";
-        private static final String NAV_BAR_HEIGHT_LANDSCAPE_RES_NAME = "navigation_bar_height_landscape";
-        private static final String NAV_BAR_WIDTH_RES_NAME = "navigation_bar_width";
-        private static final String SHOW_NAV_BAR_RES_NAME = "config_showNavigationBar";
-
-        private final boolean mTranslucentStatusBar;
-        private final boolean mTranslucentNavBar;
-        private final int mStatusBarHeight;
-        private final int mActionBarHeight;
-        private final boolean mHasNavigationBar;
-        private final int mNavigationBarHeight;
-        private final int mNavigationBarWidth;
-        private final boolean mInPortrait;
-        private final float mSmallestWidthDp;
-
-        private SystemBarConfig(Activity activity, boolean translucentStatusBar, boolean traslucentNavBar) {
-            Resources res = activity.getResources();
-            mInPortrait = (res.getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT);
-            mSmallestWidthDp = getSmallestWidthDp(activity);
-            mStatusBarHeight = getInternalDimensionSize(res, STATUS_BAR_HEIGHT_RES_NAME);
-            mActionBarHeight = getActionBarHeight(activity);
-            mNavigationBarHeight = getNavigationBarHeight(activity);
-            mNavigationBarWidth = getNavigationBarWidth(activity);
-            mHasNavigationBar = (mNavigationBarHeight > 0);
-            mTranslucentStatusBar = translucentStatusBar;
-            mTranslucentNavBar = traslucentNavBar;
-        }
-
-        @TargetApi(14)
-        private int getActionBarHeight(Context context) {
-            int result = 0;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-                TypedValue tv = new TypedValue();
-                context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true);
-                result = TypedValue.complexToDimensionPixelSize(tv.data, context.getResources().getDisplayMetrics());
-            }
-            return result;
-        }
-
-        @TargetApi(14)
-        private int getNavigationBarHeight(Context context) {
-            Resources res = context.getResources();
-            int result = 0;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-                if (hasNavBar(context)) {
-                    String key;
-                    if (mInPortrait) {
-                        key = NAV_BAR_HEIGHT_RES_NAME;
-                    } else {
-                        key = NAV_BAR_HEIGHT_LANDSCAPE_RES_NAME;
-                    }
-                    return getInternalDimensionSize(res, key);
-                }
-            }
-            return result;
-        }
-
-        @TargetApi(14)
-        private int getNavigationBarWidth(Context context) {
-            Resources res = context.getResources();
-            int result = 0;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-                if (hasNavBar(context)) {
-                    return getInternalDimensionSize(res, NAV_BAR_WIDTH_RES_NAME);
-                }
-            }
-            return result;
-        }
-
-        @TargetApi(14)
-        private boolean hasNavBar(Context context) {
-            Resources res = context.getResources();
-            int resourceId = res.getIdentifier(SHOW_NAV_BAR_RES_NAME, "bool", "android");
-            if (resourceId != 0) {
-                boolean hasNav = res.getBoolean(resourceId);
-                // check override flag (see static block)
-                if ("1".equals(sNavBarOverride)) {
-                    hasNav = false;
-                } else if ("0".equals(sNavBarOverride)) {
-                    hasNav = true;
-                }
-                return hasNav;
-            } else { // fallback
-                return !ViewConfiguration.get(context).hasPermanentMenuKey();
-            }
-        }
-
-        private int getInternalDimensionSize(Resources res, String key) {
-            int result = 0;
-            int resourceId = res.getIdentifier(key, "dimen", "android");
-            if (resourceId > 0) {
-                result = res.getDimensionPixelSize(resourceId);
-            }
-            return result;
-        }
-
-        @SuppressLint("NewApi")
-        private float getSmallestWidthDp(Activity activity) {
-            DisplayMetrics metrics = new DisplayMetrics();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                activity.getWindowManager().getDefaultDisplay().getRealMetrics(metrics);
-            } else {
-                // TODO this is not correct, but we don't really care pre-kitkat
-                activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
-            }
-            float widthDp = metrics.widthPixels / metrics.density;
-            float heightDp = metrics.heightPixels / metrics.density;
-            return Math.min(widthDp, heightDp);
-        }
-
-        /**
-         * Should a navigation bar appear at the bottom of the screen in the current
-         * device configuration? A navigation bar may appear on the right side of
-         * the screen in certain configurations.
-         *
-         * @return True if navigation should appear at the bottom of the screen, False otherwise.
-         */
-        public boolean isNavigationAtBottom() {
-            return (mSmallestWidthDp >= 600 || mInPortrait);
-        }
-
-        /**
-         * Get the height of the system status bar.
-         *
-         * @return The height of the status bar (in pixels).
-         */
-        public int getStatusBarHeight() {
-            return mStatusBarHeight;
-        }
-
-        /**
-         * Get the height of the action bar.
-         *
-         * @return The height of the action bar (in pixels).
-         */
-        public int getActionBarHeight() {
-            return mActionBarHeight;
-        }
-
-        /**
-         * Does this device have a system navigation bar?
-         *
-         * @return True if this device uses soft key navigation, False otherwise.
-         */
-        public boolean hasNavigtionBar() {
-            return mHasNavigationBar;
-        }
-
-        /**
-         * Get the height of the system navigation bar.
-         *
-         * @return The height of the navigation bar (in pixels). If the device does not have
-         * soft navigation keys, this will always return 0.
-         */
-        public int getNavigationBarHeight() {
-            return mNavigationBarHeight;
-        }
-
-        /**
-         * Get the width of the system navigation bar when it is placed vertically on the screen.
-         *
-         * @return The width of the navigation bar (in pixels). If the device does not have
-         * soft navigation keys, this will always return 0.
-         */
-        public int getNavigationBarWidth() {
-            return mNavigationBarWidth;
-        }
-
-        /**
-         * Get the layout inset for any system UI that appears at the top of the screen.
-         *
-         * @param withActionBar True to include the height of the action bar, False otherwise.
-         * @return The layout inset (in pixels).
-         */
-        public int getPixelInsetTop(boolean withActionBar) {
-            return (mTranslucentStatusBar ? mStatusBarHeight : 0) + (withActionBar ? mActionBarHeight : 0);
-        }
-
-        /**
-         * Get the layout inset for any system UI that appears at the bottom of the screen.
-         *
-         * @return The layout inset (in pixels).
-         */
-        public int getPixelInsetBottom() {
-            if (mTranslucentNavBar && isNavigationAtBottom()) {
-                return mNavigationBarHeight;
-            } else {
-                return 0;
-            }
-        }
-
-        /**
-         * Get the layout inset for any system UI that appears at the right of the screen.
-         *
-         * @return The layout inset (in pixels).
-         */
-        public int getPixelInsetRight() {
-            if (mTranslucentNavBar && !isNavigationAtBottom()) {
-                return mNavigationBarWidth;
-            } else {
-                return 0;
-            }
-        }
-
-    }
-
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/locales/en-US/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/locales/en-US/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mobile/locales/en-US/overrides/appstrings.properties	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mobile/locales/en-US/overrides/appstrings.properties	2015-02-28 15:03:08.000000000 +0000
@@ -34,3 +34,4 @@
 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.
+sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/modules/libjar/nsJARChannel.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/modules/libjar/nsJARChannel.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/modules/libjar/nsJARChannel.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/modules/libjar/nsJARChannel.cpp	2015-02-28 15:03:08.000000000 +0000
@@ -872,23 +872,12 @@
             // we have to provide default arguments in case mLoadInfo is null;
             uint32_t loadFlags =
               mLoadFlags & ~(LOAD_DOCUMENT_URI | LOAD_CALL_CONTENT_SNIFFERS);
-            if (mLoadInfo) {
-              rv = NS_NewChannelInternal(getter_AddRefs(channel),
-                                         mJarBaseURI,
-                                         mLoadInfo,
-                                         mLoadGroup,
-                                         mCallbacks,
-                                         loadFlags);
-            } else {
-              rv = NS_NewChannel(getter_AddRefs(channel),
-                                 mJarBaseURI,
-                                 nsContentUtils::GetSystemPrincipal(),
-                                 nsILoadInfo::SEC_NORMAL,
-                                 nsIContentPolicy::TYPE_OTHER,
-                                 mLoadGroup,
-                                 mCallbacks,
-                                 loadFlags);
-            }
+            rv = NS_NewChannelInternal(getter_AddRefs(channel),
+                                       mJarBaseURI,
+                                       mLoadInfo,
+                                       mLoadGroup,
+                                       mCallbacks,
+                                       loadFlags);
             if (NS_FAILED(rv)) {
               mIsPending = false;
               mListenerContext = nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/modules/libpref/init/all.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/modules/libpref/init/all.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/modules/libpref/init/all.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/modules/libpref/init/all.js	2015-02-28 15:03:09.000000000 +0000
@@ -161,6 +161,11 @@
 // Whether the KeyboardEvent.code is enabled
 pref("dom.keyboardevent.code.enabled", true);
 
+// If this is true, TextEventDispatcher dispatches keydown and keyup events
+// even during composition (keypress events are never fired during composition
+// even if this is true).
+pref("dom.keyboardevent.dispatch_during_composition", false);
+
 // Whether the WebCrypto API is enabled
 pref("dom.webcrypto.enabled", true);
 
@@ -186,6 +191,8 @@
 
 pref("ui.use_native_colors", true);
 pref("ui.click_hold_context_menus", false);
+// Duration of timeout of incremental search in menus (ms).  0 means infinite.
+pref("ui.menu.incremental_search.timeout", 1000);
 pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
 // 0 = default: always, except in high contrast mode
 // 1 = always
@@ -435,11 +442,11 @@
 // AudioTrack and VideoTrack support
 pref("media.track.enabled", false);
 
-// Whether to enable MediaSource support.  We want to enable on non-release
-// builds and on release windows, but on release builds restrict to YouTube.  We
-// don't enable for YouTube on non-Windows for now because the MP4 code for
-// those platforms isn't ready yet.
-#if defined(XP_WIN) || !defined(RELEASE_BUILD)
+// Whether to enable MediaSource support.
+// We want to enable on non-release  builds and on release windows and mac
+// but on release builds restrict to YouTube. We don't enable for other
+// configurations because code for those platforms isn't ready yet.
+#if defined(XP_WIN) || defined(XP_MACOSX) || !defined(RELEASE_BUILD)
 pref("media.mediasource.enabled", true);
 #else
 pref("media.mediasource.enabled", false);
@@ -600,6 +607,11 @@
 
 pref("gfx.downloadable_fonts.enabled", true);
 pref("gfx.downloadable_fonts.fallback_delay", 3000);
+
+// disable downloadable font cache so that behavior is consistently
+// the uncached load behavior across pages (useful for testing reflow problems)
+pref("gfx.downloadable_fonts.disable_cache", false);
+
 #ifdef RELEASE_BUILD
 pref("gfx.downloadable_fonts.woff2.enabled", false);
 #else
@@ -1069,6 +1081,7 @@
 pref("javascript.options.mem.log", false);
 pref("javascript.options.mem.notify", false);
 pref("javascript.options.gc_on_memory_pressure", true);
+pref("javascript.options.compact_on_user_inactive", true);
 
 pref("javascript.options.mem.gc_high_frequency_time_limit_ms", 1000);
 pref("javascript.options.mem.gc_high_frequency_low_limit_mb", 100);
@@ -1350,7 +1363,8 @@
 pref("network.http.tcp_keepalive.long_lived_connections", true);
 pref("network.http.tcp_keepalive.long_lived_idle_time", 600);
 
-pref("network.http.enforce-framing.http1", false);
+pref("network.http.enforce-framing.http1", false); // should be named "strict"
+pref("network.http.enforce-framing.soft", true);
 
 // default values for FTP
 // in a DSCP environment this should be 40 (0x28, or AF11), per RFC-4594,
@@ -1576,6 +1590,9 @@
 // This preference can be used to turn off DNS prefetch.
 pref("network.dns.disablePrefetch", false);
 
+// Contols whether or not "localhost" should resolve when offline
+pref("network.dns.offline-localhost", true);
+
 // This preference controls whether or not URLs with UTF-8 characters are
 // escaped.  Set this preference to TRUE for strict RFC2396 conformance.
 pref("network.standard-url.escape-utf8", true);
@@ -2137,6 +2154,10 @@
 pref("layout.css.prefixes.box-sizing", true);
 pref("layout.css.prefixes.font-features", true);
 
+// Is the CSS Unprefixing Service enabled? (This service emulates support
+// for certain vendor-prefixed properties & values, for sites on a "fixlist".)
+pref("layout.css.unprefixing-service.enabled", false);
+
 // Is support for the :scope selector enabled?
 pref("layout.css.scope-pseudo.enabled", true);
 
@@ -2178,7 +2199,7 @@
 // in nsLayoutStylesheetCache::EnsureGlobal and the invalidation of
 // mUASheet in nsLayoutStylesheetCache::DependentPrefChanged (if it's not
 // otherwise needed) are removed.
-pref("layout.css.ruby.enabled", false);
+pref("layout.css.ruby.enabled", true);
 
 // Is support for CSS display:contents enabled?
 pref("layout.css.display-contents.enabled", true);
@@ -4466,10 +4487,14 @@
 pref("dom.mozSettings.allowForceReadOnly", false);
 
 // The interval at which to check for slow running addons
-pref("browser.addon-watch.interval", 120000);
+#ifdef NIGHTLY_BUILD
+pref("browser.addon-watch.interval", 15000);
+#else
+pref("browser.addon-watch.interval", -1);
+#endif
 pref("browser.addon-watch.ignore", "[\"mochikit@mozilla.org\",\"special-powers@mozilla.org\"]");
 // the percentage of time addons are allowed to use without being labeled slow
-pref("browser.addon-watch.percentage-limit", 1);
+pref("browser.addon-watch.percentage-limit", 5);
 
 // RequestSync API is disabled by default.
 pref("dom.requestSync.enabled", false);
@@ -4540,8 +4565,8 @@
 // is disabled by default.
 pref("reader.parse-on-load.force-enabled", false);
 
-// The default relative font size in reader mode (1-5)
-pref("reader.font_size", 3);
+// The default relative font size in reader mode (1-9)
+pref("reader.font_size", 5);
 
 // The default color scheme in reader mode (light, dark, sepia, auto)
 // auto = color automatically adjusts according to ambient light level
@@ -4554,9 +4579,6 @@
 // The font type in reader (sans-serif, serif)
 pref("reader.font_type", "sans-serif");
 
-// Font type values available in reader mode UI.
-pref("reader.font_type.values", "[\"serif\",\"sans-serif\"]");
-
 // Whether or not the user has interacted with the reader mode toolbar.
 // This is used to show a first-launch tip in reader mode.
 pref("reader.has_used_toolbar", false);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mozglue/build/WindowsDllBlocklist.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mozglue/build/WindowsDllBlocklist.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/mozglue/build/WindowsDllBlocklist.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/mozglue/build/WindowsDllBlocklist.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -165,6 +165,10 @@
   { "windowsapihookdll32.dll", UNVERSIONED },
   { "windowsapihookdll64.dll", UNVERSIONED },
 
+  // Flash crashes with RealNetworks RealDownloader, bug 1132663
+  { "rndlnpshimswf.dll", ALL_VERSIONS },
+  { "rndlmainbrowserrecordplugin.dll", ALL_VERSIONS },
+
   { nullptr, 0 }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/DashboardTypes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/DashboardTypes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/DashboardTypes.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/DashboardTypes.h	2015-02-28 15:03:09.000000000 +0000
@@ -32,6 +32,7 @@
     nsTArray<nsCString> hostaddr;
     uint16_t family;
     int64_t expiration;
+    nsCString netInterface;
 };
 
 struct HttpConnInfo
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/LoadInfo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/LoadInfo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/LoadInfo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/LoadInfo.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,163 @@
+/* -*- 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/LoadInfo.h"
+
+#include "mozilla/Assertions.h"
+#include "nsIDocument.h"
+#include "nsIDOMDocument.h"
+#include "nsISupportsImpl.h"
+#include "nsISupportsUtils.h"
+
+namespace mozilla {
+
+LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
+                   nsIPrincipal* aTriggeringPrincipal,
+                   nsINode* aLoadingContext,
+                   nsSecurityFlags aSecurityFlags,
+                   nsContentPolicyType aContentPolicyType,
+                   nsIURI* aBaseURI)
+  : mLoadingPrincipal(aLoadingContext ?
+                        aLoadingContext->NodePrincipal() : aLoadingPrincipal)
+  , mTriggeringPrincipal(aTriggeringPrincipal ?
+                           aTriggeringPrincipal : mLoadingPrincipal.get())
+  , mLoadingContext(do_GetWeakReference(aLoadingContext))
+  , mSecurityFlags(aSecurityFlags)
+  , mContentPolicyType(aContentPolicyType)
+  , mBaseURI(aBaseURI)
+  , mInnerWindowID(aLoadingContext ?
+                     aLoadingContext->OwnerDoc()->InnerWindowID() : 0)
+{
+  MOZ_ASSERT(mLoadingPrincipal);
+  MOZ_ASSERT(mTriggeringPrincipal);
+
+  // if consumers pass both, aLoadingContext and aLoadingPrincipal
+  // then the loadingPrincipal must be the same as the node's principal
+  MOZ_ASSERT(!aLoadingContext || !aLoadingPrincipal ||
+             aLoadingContext->NodePrincipal() == aLoadingPrincipal);
+
+  // if the load is sandboxed, we can not also inherit the principal
+  if (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED) {
+    mSecurityFlags ^= nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL;
+  }
+}
+
+LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
+                   nsIPrincipal* aTriggeringPrincipal,
+                   nsSecurityFlags aSecurityFlags,
+                   nsContentPolicyType aContentPolicyType,
+                   uint32_t aInnerWindowID)
+  : mLoadingPrincipal(aLoadingPrincipal)
+  , mTriggeringPrincipal(aTriggeringPrincipal)
+  , mSecurityFlags(aSecurityFlags)
+  , mContentPolicyType(aContentPolicyType)
+  , mInnerWindowID(aInnerWindowID)
+{
+  MOZ_ASSERT(mLoadingPrincipal);
+  MOZ_ASSERT(mTriggeringPrincipal);
+}
+
+LoadInfo::~LoadInfo()
+{
+}
+
+NS_IMPL_ISUPPORTS(LoadInfo, nsILoadInfo)
+
+NS_IMETHODIMP
+LoadInfo::GetLoadingPrincipal(nsIPrincipal** aLoadingPrincipal)
+{
+  NS_ADDREF(*aLoadingPrincipal = mLoadingPrincipal);
+  return NS_OK;
+}
+
+nsIPrincipal*
+LoadInfo::LoadingPrincipal()
+{
+  return mLoadingPrincipal;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetTriggeringPrincipal(nsIPrincipal** aTriggeringPrincipal)
+{
+  NS_ADDREF(*aTriggeringPrincipal = mTriggeringPrincipal);
+  return NS_OK;
+}
+
+nsIPrincipal*
+LoadInfo::TriggeringPrincipal()
+{
+  return mTriggeringPrincipal;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetLoadingDocument(nsIDOMDocument** aResult)
+{
+  nsCOMPtr<nsINode> node = do_QueryReferent(mLoadingContext);
+  if (node) {
+    nsCOMPtr<nsIDOMDocument> context = do_QueryInterface(node->OwnerDoc());
+    context.forget(aResult);
+  }
+  return NS_OK;
+}
+
+nsINode*
+LoadInfo::LoadingNode()
+{
+  nsCOMPtr<nsINode> node = do_QueryReferent(mLoadingContext);
+  return node;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetSecurityFlags(nsSecurityFlags* aResult)
+{
+  *aResult = mSecurityFlags;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetForceInheritPrincipal(bool* aInheritPrincipal)
+{
+  *aInheritPrincipal =
+    (mSecurityFlags & nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetLoadingSandboxed(bool* aLoadingSandboxed)
+{
+  *aLoadingSandboxed = (mSecurityFlags & nsILoadInfo::SEC_SANDBOXED);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetContentPolicyType(nsContentPolicyType* aResult)
+{
+  *aResult = mContentPolicyType;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetBaseURI(nsIURI** aBaseURI)
+{
+  *aBaseURI = mBaseURI;
+  NS_IF_ADDREF(*aBaseURI);
+  return NS_OK;
+}
+
+nsIURI*
+LoadInfo::BaseURI()
+{
+  return mBaseURI;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetInnerWindowID(uint32_t* aResult)
+{
+  *aResult = mInnerWindowID;
+  return NS_OK;
+}
+
+} // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/LoadInfo.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/LoadInfo.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/LoadInfo.h	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/LoadInfo.h	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,71 @@
+/* -*- 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_LoadInfo_h
+#define mozilla_LoadInfo_h
+
+#include "nsIContentPolicy.h"
+#include "nsILoadInfo.h"
+#include "nsIPrincipal.h"
+#include "nsIWeakReferenceUtils.h" // for nsWeakPtr
+#include "nsIURI.h"
+
+class nsINode;
+
+namespace mozilla {
+
+namespace net {
+class HttpChannelParent;
+class FTPChannelParent;
+class WebSocketChannelParent;
+}
+
+/**
+ * Class that provides an nsILoadInfo implementation.
+ */
+class MOZ_EXPORT LoadInfo MOZ_FINAL : public nsILoadInfo
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSILOADINFO
+
+  // aLoadingPrincipal MUST NOT BE NULL.
+  LoadInfo(nsIPrincipal* aLoadingPrincipal,
+           nsIPrincipal* aTriggeringPrincipal,
+           nsINode* aLoadingContext,
+           nsSecurityFlags aSecurityFlags,
+           nsContentPolicyType aContentPolicyType,
+           nsIURI* aBaseURI = nullptr);
+
+private:
+  // private constructor that is only allowed to be called from within
+  // HttpChannelParent and FTPChannelParent declared as friends undeneath.
+  // In e10s we can not serialize nsINode, hence we store the innerWindowID.
+  LoadInfo(nsIPrincipal* aLoadingPrincipal,
+           nsIPrincipal* aTriggeringPrincipal,
+           nsSecurityFlags aSecurityFlags,
+           nsContentPolicyType aContentPolicyType,
+           uint32_t aInnerWindowID);
+
+  friend class net::HttpChannelParent;
+  friend class net::FTPChannelParent;
+  friend class net::WebSocketChannelParent;
+
+  ~LoadInfo();
+
+  nsCOMPtr<nsIPrincipal> mLoadingPrincipal;
+  nsCOMPtr<nsIPrincipal> mTriggeringPrincipal;
+  nsWeakPtr mLoadingContext;
+  nsSecurityFlags mSecurityFlags;
+  nsContentPolicyType mContentPolicyType;
+  nsCOMPtr<nsIURI> mBaseURI;
+  uint32_t mInnerWindowID;
+};
+
+} // namespace mozilla
+
+#endif // mozilla_LoadInfo_h
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/moz.build	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/moz.build	2015-02-28 15:03:09.000000000 +0000
@@ -53,6 +53,7 @@
     'nsILoadContextInfo.idl',
     'nsILoadGroup.idl',
     'nsILoadGroupChild.idl',
+    'nsILoadInfo.idl',
     'nsIMIMEInputStream.idl',
     'nsIMultiPartChannel.idl',
     'nsINestedURI.idl',
@@ -152,6 +153,10 @@
     'nsURLParsers.h',
 ]
 
+EXPORTS.mozilla += [
+    'LoadInfo.h',
+]
+
 EXPORTS.mozilla.net += [
     'ChannelDiverterChild.h',
     'ChannelDiverterParent.h',
@@ -174,6 +179,7 @@
     'Dashboard.cpp',
     'EventTokenBucket.cpp',
     'LoadContextInfo.cpp',
+    'LoadInfo.cpp',
     'NetworkActivityMonitor.cpp',
     'nsAsyncRedirectVerifyHelper.cpp',
     'nsAsyncStreamCopier.cpp',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsILoadInfo.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsILoadInfo.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsILoadInfo.idl	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsILoadInfo.idl	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,203 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: ft=cpp tw=78 sw=2 et ts=2 sts=2 cin
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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"
+#include "nsIContentPolicy.idl"
+
+interface nsIDOMDocument;
+interface nsINode;
+interface nsIPrincipal;
+interface nsIURI;
+
+typedef unsigned long nsSecurityFlags;
+
+/**
+ * An nsILoadOwner represents per-load information about who started the load.
+ */
+[scriptable, builtinclass, uuid(768a1f20-57d4-462a-812a-41c04e5d1e19)]
+interface nsILoadInfo : nsISupports
+{
+  /**
+   * No special security flags:
+   */
+  const unsigned long SEC_NORMAL = 0;
+
+  /**
+   * Force inheriting of the Principal. The resulting resource will use the
+   * principal of the document which is doing the load. Setting this flag
+   * will cause GetChannelResultPrincipal to return the same principal as
+   * the loading principal that's passed in when creating the channel.
+   *
+   * This will happen independently of the scheme of the URI that the
+   * channel is loading.
+   *
+   * So if the loading document comes from "http://a.com/", and the channel
+   * is loading the URI "http://b.com/whatever", GetChannelResultPrincipal
+   * will return a principal from "http://a.com/".
+   *
+   * This flag can not be used together with SEC_SANDBOXED.
+   */
+  const unsigned long SEC_FORCE_INHERIT_PRINCIPAL = 0x01;
+
+  /**
+   * Sandbox the load. The resulting resource will use a freshly created
+   * null principal. So GetChannelResultPrincipal will always return a
+   * null principal whenever this flag is set.
+   *
+   * This will happen independently of the scheme of the URI that the
+   * channel is loading.
+   *
+   * This flag can not be used together with SEC_FORCE_INHERIT_PRINCIPAL.
+   */
+  const unsigned long SEC_SANDBOXED = 0x02;
+
+  /**
+   * The loadingPrincipal is the principal that is responsible for the load.
+   * It is *NOT* the principal tied to the resource/URI that this
+   * channel is loading, it's the principal of the resource's
+   * caller or requester. For example, if this channel is loading
+   * an image from http://b.com that is embedded in a document
+   * who's origin is http://a.com, the loadingPrincipal is http://a.com.
+   *
+   * The loadingPrincipal will never be null.
+   */
+  readonly attribute nsIPrincipal loadingPrincipal;
+
+  /**
+   * A C++-friendly version of loadingPrincipal.
+   */
+  [noscript, notxpcom, nostdcall, binaryname(LoadingPrincipal)]
+  nsIPrincipal binaryLoadingPrincipal();
+
+  /**
+   * The triggeringPrincipal is the principal that triggerd the load.
+   * Most likely the triggeringPrincipal and the loadingPrincipal are the same,
+   * in which case triggeringPrincipal returns the loadingPrincipal.
+   * In some cases the loadingPrincipal and the triggeringPrincipal are different
+   * however, e.g. a stylesheet may import a subresource. In that case the
+   * stylesheet principal is the triggeringPrincipal and the document that loads
+   * the stylesheet provides a loadingContext and hence the loadingPrincipal.
+   *
+   * If triggeringPrincipal and loadingPrincipal are the same, then
+   * triggeringPrincipal returns loadingPrincipal.
+   */
+  readonly attribute nsIPrincipal triggeringPrincipal;
+
+  /**
+   * A C++-friendly version of triggeringPrincipal.
+   */
+  [noscript, notxpcom, nostdcall, binaryname(TriggeringPrincipal)]
+  nsIPrincipal binaryTriggeringPrincipal();
+
+  /**
+   * The loadingDocument of the channel.
+   *
+   * The loadingDocument of a channel is the document that requested the
+   * load of the resource. It is *not* the resource itself, it's the
+   * resource's caller or requester in which the load is happening.
+   *
+   * <script> example: Assume a document who's origin is http://a.com embeds
+   * a script from http://b.com. The loadingDocument for the channel
+   * associated with the http://b.com script load is the document with origin
+   * http://a.com
+   *
+   * <iframe> example: Assume a document with origin http://a.com embeds
+   * <iframe src="http://b.com">. The loadingDocument for the channel associated
+   * with the http://b.com network request is the document who's origin is
+   * http://a.com. Now assume the iframe to http://b.com then further embeds
+   * <script src="http://c.com">. The loadingDocument for the channel associated
+   * with the http://c.com network request is the iframe with origin http://b.com.
+   *
+   * Warning: The loadingDocument can be null!
+   */
+  readonly attribute nsIDOMDocument loadingDocument;
+
+  /**
+   * A C++-friendly version of loadingDocument (loadingNode).
+   * This is the node most proximally responsible for the load.
+   */
+  [noscript, notxpcom, nostdcall, binaryname(LoadingNode)]
+  nsINode binaryLoadingNode();
+
+  /**
+   * The securityFlags of that channel.
+   */
+  readonly attribute nsSecurityFlags securityFlags;
+
+%{ C++
+  inline nsSecurityFlags GetSecurityFlags()
+  {
+    nsSecurityFlags result;
+    mozilla::DebugOnly<nsresult> rv = GetSecurityFlags(&result);
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+    return result;
+  }
+%}
+
+  /**
+   * If forceInheritPrincipal is true, the data coming from the channel should
+   * use loadingPrincipal for its principal, even when the data is loaded over
+   * http:// or another protocol that would normally use a URI-based principal.
+   * This attribute will never be true when loadingSandboxed is true.
+   */
+  [infallible] readonly attribute boolean forceInheritPrincipal;
+
+  /**
+   * If loadingSandboxed is true, the data coming from the channel is
+   * being loaded sandboxed, so it should have a nonce origin and
+   * hence should use a NullPrincipal.
+   */
+  [infallible] readonly attribute boolean loadingSandboxed;
+
+  /**
+   * The contentPolicyType of the channel, used for security checks
+   * like Mixed Content Blocking and Content Security Policy.
+   */
+  readonly attribute nsContentPolicyType contentPolicyType;
+
+%{ C++
+  inline nsContentPolicyType GetContentPolicyType()
+  {
+    nsContentPolicyType result;
+    mozilla::DebugOnly<nsresult> rv = GetContentPolicyType(&result);
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+    return result;
+  }
+%}
+
+  /**
+   * A base URI for use in situations where it cannot otherwise be inferred.
+   * This attribute may be null.  The value of this attribute may be
+   * ignored if the base URI can be inferred by the channel's URI.
+   */
+  readonly attribute nsIURI baseURI;
+
+  /**
+   * A C++-friendly version of baseURI.
+   */
+  [noscript, notxpcom, nostdcall, binaryname(BaseURI)]
+  nsIURI binaryBaseURI();
+
+  /**
+   * The innerWindowId of the loadingDocument, used to identify
+   * the loadingDocument in e10s where the loadingDocument is
+   * not available.
+   *
+   * Warning: If the loadingDocument is null, then the
+   * innerWindowId is 0.
+   */
+  readonly attribute unsigned long innerWindowID;
+
+%{ C++
+  inline uint32_t GetInnerWindowID()
+  {
+    uint32_t result;
+    mozilla::DebugOnly<nsresult> rv = GetInnerWindowID(&result);
+    MOZ_ASSERT(NS_SUCCEEDED(rv));
+    return result;
+  }
+%}
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsINetworkInterceptController.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsINetworkInterceptController.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsINetworkInterceptController.idl	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsINetworkInterceptController.idl	2015-02-28 15:03:09.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "nsISupports.idl"
 
-interface nsIHttpChannelInternal;
+interface nsIChannel;
 interface nsIOutputStream;
 interface nsIURI;
 
@@ -16,7 +16,7 @@
  * which do not implement nsIChannel.
  */
 
-[scriptable, uuid(0b5f82a7-5824-4a0d-bf5c-8a8a7684c0c8)]
+[scriptable, uuid(9d127b63-dfad-484d-a0e1-cb82697a095b)]
 interface nsIInterceptedChannel : nsISupports
 {
     /**
@@ -37,6 +37,28 @@
      * after this point.
      */
     void finishSynthesizedResponse();
+
+    /**
+     * Cancel the pending intercepted request.
+     * @return NS_ERROR_FAILURE if the response has already been synthesized or
+     *         the original request has been instructed to continue.
+     */
+    void cancel();
+
+    /**
+     * The synthesized response body to be produced.
+     */
+    readonly attribute nsIOutputStream responseBody;
+
+    /**
+     * The underlying channel object that was intercepted.
+     */
+    readonly attribute nsIChannel channel;
+
+    /**
+     * True if the underlying request was caused by a navigation attempt.
+     */
+    readonly attribute bool isNavigation;
 };
 
 /**
@@ -45,7 +67,7 @@
  * request should be intercepted before any network request is initiated.
  */
 
-[scriptable, uuid(b3ad3e9b-91d8-44d0-a0c5-dc2e9374f599)]
+[scriptable, uuid(69150b77-b561-43a2-bfba-7301dd5a35d0)]
 interface nsINetworkInterceptController : nsISupports
 {
     /**
@@ -53,15 +75,15 @@
      * requests until specifically instructed to do so.
      *
      * @param aURI the URI being requested by a channel
+     * @param aIsNavigate True if the request is for a navigation, false for a fetch.
      */
-    bool shouldPrepareForIntercept(in nsIURI aURI);
+    bool shouldPrepareForIntercept(in nsIURI aURI, in bool aIsNavigate);
 
     /**
      * Notification when a given intercepted channel is prepared to accept a synthesized
      * response via the provided stream.
      *
      * @param aChannel the controlling interface for a channel that has been intercepted
-     * @param aStream a stream directly into the channel's synthesized response body
      */
-    void channelIntercepted(in nsIInterceptedChannel aChannel, in nsIOutputStream aStream);
+    void channelIntercepted(in nsIInterceptedChannel aChannel);
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsIOService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsIOService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsIOService.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsIOService.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1413,6 +1413,10 @@
     if (mShutdown)
         return NS_ERROR_NOT_AVAILABLE;
 
+    if (!mManageOfflineStatus) {
+      return NS_OK;
+    }
+
     if (!strcmp(data, NS_NETWORK_LINK_DATA_DOWN)) {
         // check to make sure this won't collide with Autodial
         if (mSocketTransportService) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsNetUtil.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsNetUtil.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/base/nsNetUtil.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/base/nsNetUtil.h	2015-02-28 15:03:09.000000000 +0000
@@ -324,7 +324,22 @@
                       nsLoadFlags            aLoadFlags = nsIRequest::LOAD_NORMAL,
                       nsIIOService*          aIoService = nullptr)
 {
-  MOZ_ASSERT(aLoadInfo, "Can not create a channel without a loadInfo");
+  // NS_NewChannelInternal is mostly called for channel redirects. We should allow
+  // the creation of a channel even if the original channel did not have a loadinfo
+  // attached.
+  if (!aLoadInfo) {
+    return NS_NewChannelInternal(outChannel,
+                                 aUri,
+                                 nullptr, // aLoadingNode
+                                 nullptr, // aLoadingPrincipal
+                                 nullptr, // aTriggeringPrincipal
+                                 nsILoadInfo::SEC_NORMAL,
+                                 nsIContentPolicy::TYPE_OTHER,
+                                 aLoadGroup,
+                                 aCallbacks,
+                                 aLoadFlags,
+                                 aIoService);
+  }
   nsresult rv = NS_NewChannelInternal(outChannel,
                                       aUri,
                                       aLoadInfo->LoadingNode(),
@@ -581,7 +596,6 @@
                                  const nsACString&   aContentCharset,
                                  nsILoadInfo*        aLoadInfo)
 {
-  MOZ_ASSERT(aLoadInfo, "can not create channel without a loadinfo");
   nsresult rv;
   nsCOMPtr<nsIInputStreamChannel> isc =
     do_CreateInstance(NS_INPUTSTREAMCHANNEL_CONTRACTID, &rv);
@@ -608,7 +622,7 @@
 
   // If we're sandboxed, make sure to clear any owner the channel
   // might already have.
-  if (aLoadInfo->GetLoadingSandboxed()) {
+  if (aLoadInfo && aLoadInfo->GetLoadingSandboxed()) {
     channel->SetOwner(nullptr);
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheEntry.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheEntry.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheEntry.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheEntry.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -82,6 +82,7 @@
 , mCallback(aCallback)
 , mTargetThread(do_GetCurrentThread())
 , mReadOnly(aReadOnly)
+, mRevalidating(false)
 , mCheckOnAnyThread(aCheckOnAnyThread)
 , mRecheckAfterWrite(false)
 , mNotWanted(false)
@@ -100,6 +101,7 @@
 , mCallback(aThat.mCallback)
 , mTargetThread(aThat.mTargetThread)
 , mReadOnly(aThat.mReadOnly)
+, mRevalidating(aThat.mRevalidating)
 , mCheckOnAnyThread(aThat.mCheckOnAnyThread)
 , mRecheckAfterWrite(aThat.mRecheckAfterWrite)
 , mNotWanted(aThat.mNotWanted)
@@ -412,14 +414,11 @@
 
   if (NS_SUCCEEDED(aResult)) {
     if (aIsNew) {
-      mozilla::Telemetry::AccumulateTimeDelta(
-        mozilla::Telemetry::NETWORK_CACHE_V2_MISS_TIME_MS,
-        mLoadStart);
-    }
-    else {
-      mozilla::Telemetry::AccumulateTimeDelta(
-        mozilla::Telemetry::NETWORK_CACHE_V2_HIT_TIME_MS,
-        mLoadStart);
+      CacheFileUtils::DetailedCacheHitTelemetry::AddRecord(
+        CacheFileUtils::DetailedCacheHitTelemetry::MISS, mLoadStart);
+    } else {
+      CacheFileUtils::DetailedCacheHitTelemetry::AddRecord(
+        CacheFileUtils::DetailedCacheHitTelemetry::HIT, mLoadStart);
     }
   }
 
@@ -677,6 +676,8 @@
             checkResult = ENTRY_NOT_WANTED;
         }
 
+        aCallback.mRevalidating = checkResult == ENTRY_NEEDS_REVALIDATION;
+
         switch (checkResult) {
         case ENTRY_WANTED:
           // Nothing more to do here, the consumer is responsible to handle
@@ -791,7 +792,8 @@
     return;
   }
 
-  if (aCallback.mReadOnly) {
+  // R/O callbacks may do revalidation, let them fall through
+  if (aCallback.mReadOnly && !aCallback.mRevalidating) {
     LOG(("  r/o and not ready, notifying OCEA with NS_ERROR_CACHE_KEY_NOT_FOUND"));
     aCallback.mCallback->OnCacheEntryAvailable(
       nullptr, false, nullptr, NS_ERROR_CACHE_KEY_NOT_FOUND);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheEntry.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheEntry.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheEntry.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheEntry.h	2015-02-28 15:03:09.000000000 +0000
@@ -152,6 +152,7 @@
     nsCOMPtr<nsICacheEntryOpenCallback> mCallback;
     nsCOMPtr<nsIThread> mTargetThread;
     bool mReadOnly : 1;
+    bool mRevalidating : 1;
     bool mCheckOnAnyThread : 1;
     bool mRecheckAfterWrite : 1;
     bool mNotWanted : 1;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileContextEvictor.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileContextEvictor.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileContextEvictor.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileContextEvictor.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -551,7 +551,7 @@
          mEntries[0]->mIterator.get(), mEntries[0]->mInfo.get()));
 
     nsRefPtr<CacheFileHandle> handle;
-    CacheFileIOManager::gInstance->mHandles.GetHandle(&hash, false,
+    CacheFileIOManager::gInstance->mHandles.GetHandle(&hash,
                                                       getter_AddRefs(handle));
     if (handle) {
       // We doom any active handle in CacheFileIOManager::EvictByContext(), so
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileIOManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileIOManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileIOManager.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileIOManager.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -310,7 +310,6 @@
 
 nsresult
 CacheFileHandles::GetHandle(const SHA1Sum::Hash *aHash,
-                            bool aReturnDoomed,
                             CacheFileHandle **_retval)
 {
   MOZ_ASSERT(CacheFileIOManager::IsOnIOThreadOrCeased());
@@ -344,16 +343,12 @@
   if (handle->IsDoomed()) {
     LOG(("CacheFileHandles::GetHandle() hash=%08x%08x%08x%08x%08x "
          "found doomed handle %p, entry %p", LOGSHA1(aHash), handle.get(), entry));
-
-    // If the consumer doesn't want doomed handles, exit with NOT_AVAIL.
-    if (!aReturnDoomed) {
-      return NS_ERROR_NOT_AVAILABLE;
-    }
-  } else {
-    LOG(("CacheFileHandles::GetHandle() hash=%08x%08x%08x%08x%08x "
-         "found handle %p, entry %p", LOGSHA1(aHash), handle.get(), entry));
+    return NS_ERROR_NOT_AVAILABLE;
   }
 
+  LOG(("CacheFileHandles::GetHandle() hash=%08x%08x%08x%08x%08x "
+       "found handle %p, entry %p", LOGSHA1(aHash), handle.get(), entry));
+
   handle.forget(_retval);
   return NS_OK;
 }
@@ -810,7 +805,7 @@
     if (!mIOMan) {
       rv = NS_ERROR_NOT_INITIALIZED;
     } else {
-      rv = mIOMan->DoomFileByKeyInternal(&mHash, false);
+      rv = mIOMan->DoomFileByKeyInternal(&mHash);
       mIOMan = nullptr;
     }
 
@@ -1575,7 +1570,7 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsRefPtr<CacheFileHandle> handle;
-  mHandles.GetHandle(aHash, false, getter_AddRefs(handle));
+  mHandles.GetHandle(aHash, getter_AddRefs(handle));
 
   if ((aFlags & (OPEN | CREATE | CREATE_NEW)) == CREATE_NEW) {
     if (handle) {
@@ -2074,11 +2069,10 @@
 }
 
 nsresult
-CacheFileIOManager::DoomFileByKeyInternal(const SHA1Sum::Hash *aHash,
-                                          bool aFailIfAlreadyDoomed)
+CacheFileIOManager::DoomFileByKeyInternal(const SHA1Sum::Hash *aHash)
 {
-  LOG(("CacheFileIOManager::DoomFileByKeyInternal() [hash=%08x%08x%08x%08x%08x,"
-        " failIfAlreadyDoomed=%d]", LOGSHA1(aHash), aFailIfAlreadyDoomed));
+  LOG(("CacheFileIOManager::DoomFileByKeyInternal() [hash=%08x%08x%08x%08x%08x]"
+       , LOGSHA1(aHash)));
 
   MOZ_ASSERT(CacheFileIOManager::IsOnIOThreadOrCeased());
 
@@ -2094,15 +2088,11 @@
 
   // Find active handle
   nsRefPtr<CacheFileHandle> handle;
-  mHandles.GetHandle(aHash, true, getter_AddRefs(handle));
+  mHandles.GetHandle(aHash, getter_AddRefs(handle));
 
   if (handle) {
     handle->Log();
 
-    if (handle->IsDoomed()) {
-      return aFailIfAlreadyDoomed ? NS_ERROR_NOT_AVAILABLE : NS_OK;
-    }
-
     return DoomFileInternal(handle);
   }
 
@@ -2244,7 +2234,7 @@
   nsAutoCString uriSpec;
 
   nsRefPtr<CacheFileHandle> handle;
-  ioMan->mHandles.GetHandle(aHash, false, getter_AddRefs(handle));
+  ioMan->mHandles.GetHandle(aHash, getter_AddRefs(handle));
   if (handle) {
     nsRefPtr<nsILoadContextInfo> info =
       CacheFileUtils::ParseKey(handle->Key(), &enhanceId, &uriSpec);
@@ -2615,7 +2605,7 @@
     rv = CacheIndex::GetEntryForEviction(false, &hash, &cnt);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = DoomFileByKeyInternal(&hash, true);
+    rv = DoomFileByKeyInternal(&hash);
     if (NS_SUCCEEDED(rv)) {
       consecutiveFailures = 0;
     } else if (rv == NS_ERROR_NOT_AVAILABLE) {
@@ -2623,16 +2613,6 @@
            "DoomFileByKeyInternal() failed. [rv=0x%08x]", rv));
       // TODO index is outdated, start update
 
-#ifdef DEBUG
-      // Dooming should never fail due to already doomed handle, but bug 1028415
-      // shows that this unexpected state can happen. Assert in debug build so
-      // we can find the cause if we ever find a way to reproduce it with NSPR
-      // logging enabled.
-      nsRefPtr<CacheFileHandle> handle;
-      mHandles.GetHandle(&hash, true, getter_AddRefs(handle));
-      MOZ_ASSERT(!handle || !handle->IsDoomed());
-#endif
-
       // Make sure index won't return the same entry again
       CacheIndex::RemoveEntry(&hash);
       consecutiveFailures = 0;
@@ -3576,6 +3556,45 @@
 
   StartRemovingTrash();
 
+  if (!CacheObserver::CacheFSReported()) {
+    uint32_t fsType = 4; // Other OS
+
+#ifdef XP_WIN
+    nsAutoString target;
+    nsresult rv = mCacheDirectory->GetTarget(target);
+    if (NS_FAILED(rv)) {
+      return NS_OK;
+    }
+
+    wchar_t volume_path[MAX_PATH + 1] = { 0 };
+    if (!::GetVolumePathNameW(target.get(),
+                              volume_path,
+                              mozilla::ArrayLength(volume_path))) {
+      return NS_OK;
+    }
+
+    wchar_t fsName[6] = { 0 };
+    if (!::GetVolumeInformationW(volume_path, nullptr, 0, nullptr, nullptr,
+                                 nullptr, fsName,
+                                 mozilla::ArrayLength(fsName))) {
+      return NS_OK;
+    }
+
+    if (wcscmp(fsName, L"NTFS") == 0) {
+      fsType = 0;
+    } else if (wcscmp(fsName, L"FAT32") == 0) {
+      fsType = 1;
+    } else if (wcscmp(fsName, L"FAT") == 0) {
+      fsType = 2;
+    } else {
+      fsType = 3;
+    }
+#endif
+
+    Telemetry::Accumulate(Telemetry::NETWORK_CACHE_FS_TYPE, fsType);
+    CacheObserver::SetCacheFSReported();
+  }
+
   return NS_OK;
 }
 
@@ -3611,7 +3630,7 @@
 
       rv = CacheIndex::GetEntryForEviction(true, &hash, &cnt);
       if (NS_SUCCEEDED(rv)) {
-        rv = DoomFileByKeyInternal(&hash, true);
+        rv = DoomFileByKeyInternal(&hash);
       }
       if (NS_SUCCEEDED(rv)) {
         rv = aHandle->mFile->OpenNSPRFileDesc(
@@ -3619,6 +3638,18 @@
         LOG(("CacheFileIOManager::OpenNSPRHandle() - Successfully evicted entry"
              " with hash %08x%08x%08x%08x%08x. %s to create the new file.",
              LOGSHA1(&hash), NS_SUCCEEDED(rv) ? "Succeeded" : "Failed"));
+
+        // Report the full size only once per session
+        static bool sSizeReported = false;
+        if (!sSizeReported) {
+          uint32_t cacheUsage;
+          if (NS_SUCCEEDED(CacheIndex::GetCacheSize(&cacheUsage))) {
+            cacheUsage >>= 10;
+            Telemetry::Accumulate(Telemetry::NETWORK_CACHE_SIZE_FULL_FAT,
+                                  cacheUsage);
+            sSizeReported = true;
+          }
+        }
       } else {
         LOG(("CacheFileIOManager::OpenNSPRHandle() - Couldn't evict an existing"
              " entry."));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileIOManager.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileIOManager.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileIOManager.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileIOManager.h	2015-02-28 15:03:09.000000000 +0000
@@ -90,7 +90,7 @@
   CacheFileHandles();
   ~CacheFileHandles();
 
-  nsresult GetHandle(const SHA1Sum::Hash *aHash, bool aReturnDoomed, CacheFileHandle **_retval);
+  nsresult GetHandle(const SHA1Sum::Hash *aHash, CacheFileHandle **_retval);
   nsresult NewHandle(const SHA1Sum::Hash *aHash, bool aPriority, CacheFileHandle **_retval);
   void     RemoveHandle(CacheFileHandle *aHandlle);
   void     GetAllHandles(nsTArray<nsRefPtr<CacheFileHandle> > *_retval);
@@ -330,8 +330,7 @@
   nsresult WriteInternal(CacheFileHandle *aHandle, int64_t aOffset,
                          const char *aBuf, int32_t aCount, bool aValidate);
   nsresult DoomFileInternal(CacheFileHandle *aHandle);
-  nsresult DoomFileByKeyInternal(const SHA1Sum::Hash *aHash,
-                                 bool aFailIfAlreadyDoomed);
+  nsresult DoomFileByKeyInternal(const SHA1Sum::Hash *aHash);
   nsresult ReleaseNSPRHandleInternal(CacheFileHandle *aHandle);
   nsresult TruncateSeekSetEOFInternal(CacheFileHandle *aHandle,
                                       int64_t aTruncatePos, int64_t aEOFPos);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileMetadata.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileMetadata.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileMetadata.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileMetadata.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -34,6 +34,7 @@
 CacheFileMetadata::CacheFileMetadata(CacheFileHandle *aHandle, const nsACString &aKey)
   : CacheMemoryConsumer(NORMAL)
   , mHandle(aHandle)
+  , mFirstRead(true)
   , mHashArray(nullptr)
   , mHashArraySize(0)
   , mHashCount(0)
@@ -64,6 +65,7 @@
 CacheFileMetadata::CacheFileMetadata(bool aMemoryOnly, const nsACString &aKey)
   : CacheMemoryConsumer(aMemoryOnly ? MEMORY_ONLY : NORMAL)
   , mHandle(nullptr)
+  , mFirstRead(true)
   , mHashArray(nullptr)
   , mHashArraySize(0)
   , mHashCount(0)
@@ -95,6 +97,7 @@
 CacheFileMetadata::CacheFileMetadata()
   : CacheMemoryConsumer(DONT_REPORT /* This is a helper class */)
   , mHandle(nullptr)
+  , mFirstRead(true)
   , mHashArray(nullptr)
   , mHashArraySize(0)
   , mHashCount(0)
@@ -206,6 +209,7 @@
   LOG(("CacheFileMetadata::ReadMetadata() - Reading metadata from disk, trying "
        "offset=%lld, filesize=%lld [this=%p]", offset, size, this));
 
+  mReadStart = mozilla::TimeStamp::Now();
   mListener = aListener;
   rv = CacheFileIOManager::Read(mHandle, offset, mBuf, mBufSize, this);
   if (NS_FAILED(rv)) {
@@ -629,6 +633,16 @@
     return NS_OK;
   }
 
+  if (mFirstRead) {
+    Telemetry::AccumulateTimeDelta(
+      Telemetry::NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS, mReadStart);
+    Telemetry::Accumulate(
+      Telemetry::NETWORK_CACHE_METADATA_FIRST_READ_SIZE, mBufSize);
+  } else {
+    Telemetry::AccumulateTimeDelta(
+      Telemetry::NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS, mReadStart);
+  }
+
   // check whether we have read all necessary data
   uint32_t realOffset = NetworkEndian::readUint32(mBuf + mBufSize -
                                                   sizeof(uint32_t));
@@ -663,6 +677,8 @@
     LOG(("CacheFileMetadata::OnDataRead() - We need to read %d more bytes to "
          "have full metadata. [this=%p]", missing, this));
 
+    mFirstRead = false;
+    mReadStart = mozilla::TimeStamp::Now();
     rv = CacheFileIOManager::Read(mHandle, realOffset, mBuf, missing, this);
     if (NS_FAILED(rv)) {
       LOG(("CacheFileMetadata::OnDataRead() - CacheFileIOManager::Read() "
@@ -680,6 +696,9 @@
     return NS_OK;
   }
 
+  Telemetry::Accumulate(Telemetry::NETWORK_CACHE_METADATA_SIZE,
+                        size - realOffset);
+
   // We have all data according to offset information at the end of the entry.
   // Try to parse it.
   rv = ParseMetadata(realOffset, realOffset - usedOffset, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileMetadata.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileMetadata.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileMetadata.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileMetadata.h	2015-02-28 15:03:09.000000000 +0000
@@ -176,6 +176,8 @@
 
   nsRefPtr<CacheFileHandle>           mHandle;
   nsCString                           mKey;
+  bool                                mFirstRead;
+  mozilla::TimeStamp                  mReadStart;
   CacheHash::Hash16_t                *mHashArray;
   uint32_t                            mHashArraySize;
   uint32_t                            mHashCount;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileUtils.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileUtils.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -424,6 +424,116 @@
   return mMap.ElementAt(aIdx);
 }
 
+StaticMutex DetailedCacheHitTelemetry::sLock;
+uint32_t DetailedCacheHitTelemetry::sRecordCnt = 0;
+DetailedCacheHitTelemetry::HitRate DetailedCacheHitTelemetry::sHRStats[kNumOfRanges];
+
+DetailedCacheHitTelemetry::HitRate::HitRate()
+{
+  Reset();
+}
+
+void
+DetailedCacheHitTelemetry::HitRate::AddRecord(ERecType aType)
+{
+  if (aType == HIT) {
+    ++mHitCnt;
+  } else {
+    ++mMissCnt;
+  }
+}
+
+uint32_t
+DetailedCacheHitTelemetry::HitRate::GetHitRateBucket(uint32_t aNumOfBuckets) const
+{
+  uint32_t bucketIdx = (aNumOfBuckets * mHitCnt) / (mHitCnt + mMissCnt);
+  if (bucketIdx == aNumOfBuckets) { // make sure 100% falls into the last bucket
+    --bucketIdx;
+  }
+
+  return bucketIdx;
+}
+
+uint32_t
+DetailedCacheHitTelemetry::HitRate::Count()
+{
+  return mHitCnt + mMissCnt;
+}
+
+void
+DetailedCacheHitTelemetry::HitRate::Reset()
+{
+  mHitCnt = 0;
+  mMissCnt = 0;
+}
+
+// static
+void
+DetailedCacheHitTelemetry::AddRecord(ERecType aType, TimeStamp aLoadStart)
+{
+  bool isUpToDate = false;
+  CacheIndex::IsUpToDate(&isUpToDate);
+  if (!isUpToDate) {
+    // Ignore the record when the entry file count might be incorrect
+    return;
+  }
+
+  uint32_t entryCount;
+  nsresult rv = CacheIndex::GetEntryFileCount(&entryCount);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+
+  uint32_t rangeIdx = entryCount / kRangeSize;
+  if (rangeIdx >= kNumOfRanges) { // The last range has no upper limit.
+    rangeIdx = kNumOfRanges - 1;
+  }
+
+  uint32_t hitMissValue = 2 * rangeIdx; // 2 values per range
+  if (aType == MISS) { // The order is HIT, MISS
+    ++hitMissValue;
+  }
+
+  StaticMutexAutoLock lock(sLock);
+
+  if (aType == MISS) {
+    mozilla::Telemetry::AccumulateTimeDelta(
+      mozilla::Telemetry::NETWORK_CACHE_V2_MISS_TIME_MS,
+      aLoadStart);
+  } else {
+    mozilla::Telemetry::AccumulateTimeDelta(
+      mozilla::Telemetry::NETWORK_CACHE_V2_HIT_TIME_MS,
+      aLoadStart);
+  }
+
+  Telemetry::Accumulate(Telemetry::NETWORK_CACHE_HIT_MISS_STAT_PER_CACHE_SIZE,
+                        hitMissValue);
+
+  sHRStats[rangeIdx].AddRecord(aType);
+  ++sRecordCnt;
+
+  if (sRecordCnt < kTotalSamplesReportLimit) {
+    return;
+  }
+
+  sRecordCnt = 0;
+
+  for (uint32_t i = 0; i < kNumOfRanges; ++i) {
+    if (sHRStats[i].Count() >= kHitRateSamplesReportLimit) {
+      // The telemetry enums are grouped by buckets as follows:
+      // Telemetry value : 0,1,2,3, ... ,19,20,21,22, ... ,398,399
+      // Hit rate bucket : 0,0,0,0, ... , 0, 1, 1, 1, ... , 19, 19
+      // Cache size range: 0,1,2,3, ... ,19, 0, 1, 2, ... , 18, 19
+      uint32_t bucketOffset = sHRStats[i].GetHitRateBucket(kHitRateBuckets) *
+                              kNumOfRanges;
+
+      Telemetry::Accumulate(Telemetry::NETWORK_CACHE_HIT_RATE_PER_CACHE_SIZE,
+                            bucketOffset + i);
+      sHRStats[i].Reset();
+    }
+  }
+}
+
 } // CacheFileUtils
 } // net
 } // mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheFileUtils.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheFileUtils.h	2015-02-28 15:03:09.000000000 +0000
@@ -9,6 +9,8 @@
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"
+#include "mozilla/StaticMutex.h"
+#include "mozilla/TimeStamp.h"
 
 class nsILoadContextInfo;
 class nsACString;
@@ -86,6 +88,64 @@
   nsTArray<ValidityPair> mMap;
 };
 
+
+class DetailedCacheHitTelemetry {
+public:
+  enum ERecType {
+    HIT  = 0,
+    MISS = 1
+  };
+
+  static void AddRecord(ERecType aType, TimeStamp aLoadStart);
+
+private:
+  class HitRate {
+  public:
+    HitRate();
+
+    void     AddRecord(ERecType aType);
+    // Returns the bucket index that the current hit rate falls into according
+    // to the given aNumOfBuckets.
+    uint32_t GetHitRateBucket(uint32_t aNumOfBuckets) const;
+    uint32_t Count();
+    void     Reset();
+
+  private:
+    uint32_t mHitCnt;
+    uint32_t mMissCnt;
+  };
+
+  // Group the hits and misses statistics by cache files count ranges (0-5000,
+  // 5001-10000, ... , 95001- )
+  static const uint32_t kRangeSize = 5000;
+  static const uint32_t kNumOfRanges = 20;
+
+  // Use the same ranges to report an average hit rate. Report the hit rates
+  // (and reset the counters) every kTotalSamplesReportLimit samples.
+  static const uint32_t kTotalSamplesReportLimit = 1000;
+
+  // Report hit rate for a given cache size range only if it contains
+  // kHitRateSamplesReportLimit or more samples. This limit should avoid
+  // reporting a biased statistics.
+  static const uint32_t kHitRateSamplesReportLimit = 500;
+
+  // All hit rates are accumulated in a single telemetry probe, so to use
+  // a sane number of enumerated values the hit rate is divided into buckets
+  // instead of using a percent value. This constant defines number of buckets
+  // that we divide the hit rates into. I.e. we'll report ranges 0%-5%, 5%-10%,
+  // 10-%15%, ...
+  static const uint32_t kHitRateBuckets = 20;
+
+  // Protects sRecordCnt, sHitStats and Telemetry::Accumulated() calls.
+  static StaticMutex sLock;
+
+  // Counter of samples that is compared against kTotalSamplesReportLimit.
+  static uint32_t sRecordCnt;
+ 
+  // Hit rate statistics for every cache size range.
+  static HitRate sHRStats[kNumOfRanges];
+};
+
 } // CacheFileUtils
 } // net
 } // mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheIndex.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheIndex.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheIndex.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheIndex.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1277,7 +1277,7 @@
   nsRefPtr<CacheFileHandle> handle;
 
   CacheFileIOManager::gInstance->mHandles.GetHandle(
-    aHash, false, getter_AddRefs(handle));
+    aHash, getter_AddRefs(handle));
 
   if (!handle)
     return false;
@@ -1311,6 +1311,29 @@
 
 // static
 nsresult
+CacheIndex::GetEntryFileCount(uint32_t *_retval)
+{
+  LOG(("CacheIndex::GetEntryFileCount()"));
+
+  nsRefPtr<CacheIndex> index = gInstance;
+
+  if (!index) {
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+
+  CacheIndexAutoLock lock(index);
+
+  if (!index->IsIndexUsable()) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+
+  *_retval = index->mIndexStats.ActiveEntriesCount();
+  LOG(("CacheIndex::GetEntryFileCount() - returning %u", *_retval));
+  return NS_OK;
+}
+
+// static
+nsresult
 CacheIndex::GetCacheStats(nsILoadContextInfo *aInfo, uint32_t *aSize, uint32_t *aCount)
 {
   LOG(("CacheIndex::GetCacheStats() [info=%p]", aInfo));
@@ -2752,7 +2775,7 @@
 
 #ifdef DEBUG
     nsRefPtr<CacheFileHandle> handle;
-    CacheFileIOManager::gInstance->mHandles.GetHandle(&hash, false,
+    CacheFileIOManager::gInstance->mHandles.GetHandle(&hash,
                                                       getter_AddRefs(handle));
 #endif
 
@@ -2965,7 +2988,7 @@
 
 #ifdef DEBUG
     nsRefPtr<CacheFileHandle> handle;
-    CacheFileIOManager::gInstance->mHandles.GetHandle(&hash, false,
+    CacheFileIOManager::gInstance->mHandles.GetHandle(&hash,
                                                       getter_AddRefs(handle));
 #endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheIndex.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheIndex.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheIndex.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheIndex.h	2015-02-28 15:03:09.000000000 +0000
@@ -651,6 +651,9 @@
   // Returns cache size in kB.
   static nsresult GetCacheSize(uint32_t *_retval);
 
+  // Returns number of entry files in the cache
+  static nsresult GetEntryFileCount(uint32_t *_retval);
+
   // Synchronously returns the disk occupation and number of entries per-context.
   // Callable on any thread.
   static nsresult GetCacheStats(nsILoadContextInfo *aInfo, uint32_t *aSize, uint32_t *aCount);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheObserver.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheObserver.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheObserver.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheObserver.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -86,6 +86,9 @@
 static bool kDefaultClearCacheOnShutdown = false;
 bool CacheObserver::sClearCacheOnShutdown = kDefaultClearCacheOnShutdown;
 
+static bool kDefaultCacheFSReported = false;
+bool CacheObserver::sCacheFSReported = kDefaultCacheFSReported;
+
 NS_IMPL_ISUPPORTS(CacheObserver,
                   nsIObserver,
                   nsISupportsWeakReference)
@@ -318,6 +321,32 @@
 }
 
 // static
+void
+CacheObserver::SetCacheFSReported()
+{
+  sCacheFSReported = true;
+
+  if (!sSelf) {
+    return;
+  }
+
+  if (NS_IsMainThread()) {
+    sSelf->StoreCacheFSReported();
+  } else {
+    nsCOMPtr<nsIRunnable> event =
+      NS_NewRunnableMethod(sSelf, &CacheObserver::StoreCacheFSReported);
+    NS_DispatchToMainThread(event);
+  }
+}
+
+void
+CacheObserver::StoreCacheFSReported()
+{
+  mozilla::Preferences::SetInt("browser.cache.disk.filesystem_reported",
+                               sCacheFSReported);
+}
+
+// static
 void CacheObserver::ParentDirOverride(nsIFile** aDir)
 {
   if (NS_WARN_IF(!aDir))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheObserver.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheObserver.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cache2/CacheObserver.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cache2/CacheObserver.h	2015-02-28 15:03:09.000000000 +0000
@@ -61,6 +61,9 @@
     { return sHalfLifeExperiment; }
   static bool const ClearCacheOnShutdown()
     { return sSanitizeOnShutdown && sClearCacheOnShutdown; }
+  static bool const CacheFSReported()
+    { return sCacheFSReported; }
+  static void SetCacheFSReported();
   static void ParentDirOverride(nsIFile ** aDir);
 
   static bool const EntryIsTooBig(int64_t aSize, bool aUsingDisk);
@@ -69,6 +72,7 @@
   static CacheObserver* sSelf;
 
   void StoreDiskCacheCapacity();
+  void StoreCacheFSReported();
   void AttachToPreferences();
 
   static uint32_t sUseNewCache;
@@ -91,6 +95,7 @@
   static int32_t sHalfLifeExperiment;
   static bool sSanitizeOnShutdown;
   static bool sClearCacheOnShutdown;
+  static bool sCacheFSReported;
 
   // Non static properties, accessible via sSelf
   nsCOMPtr<nsIFile> mCacheParentDirectoryOverride;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cookie/CookieServiceChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cookie/CookieServiceChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/cookie/CookieServiceChild.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/cookie/CookieServiceChild.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -109,6 +109,13 @@
 
   *aCookieString = nullptr;
 
+  // Fast past: don't bother sending IPC messages about nullprincipal'd
+  // documents.
+  nsAutoCString scheme;
+  aHostURI->GetScheme(scheme);
+  if (scheme.EqualsLiteral("moz-nullprincipal"))
+    return NS_OK;
+
   // Determine whether the request is foreign. Failure is acceptable.
   bool isForeign = true;
   if (RequireThirdPartyCheck())
@@ -137,6 +144,13 @@
   NS_ENSURE_ARG(aHostURI);
   NS_ENSURE_ARG_POINTER(aCookieString);
 
+  // Fast past: don't bother sending IPC messages about nullprincipal'd
+  // documents.
+  nsAutoCString scheme;
+  aHostURI->GetScheme(scheme);
+  if (scheme.EqualsLiteral("moz-nullprincipal"))
+    return NS_OK;
+
   // Determine whether the request is foreign. Failure is acceptable.
   bool isForeign = true;
   if (RequireThirdPartyCheck())
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/ChildDNSService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/ChildDNSService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/ChildDNSService.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/ChildDNSService.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -56,11 +56,15 @@
 void
 ChildDNSService::GetDNSRecordHashKey(const nsACString &aHost,
                                      uint32_t aFlags,
+                                     const nsACString &aNetworkInterface,
                                      nsIDNSListener* aListener,
                                      nsACString &aHashKey)
 {
   aHashKey.Assign(aHost);
   aHashKey.AppendInt(aFlags);
+  if (!aNetworkInterface.IsEmpty()) {
+    aHashKey.Append(aNetworkInterface);
+  }
   aHashKey.AppendPrintf("%p", aListener);
 }
 
@@ -75,6 +79,18 @@
                               nsIEventTarget    *target_,
                               nsICancelable    **result)
 {
+  return AsyncResolveExtended(hostname, flags, EmptyCString(), listener,
+                              target_, result);
+}
+
+NS_IMETHODIMP
+ChildDNSService::AsyncResolveExtended(const nsACString  &hostname,
+                                      uint32_t           flags,
+                                      const nsACString  &aNetworkInterface,
+                                      nsIDNSListener    *listener,
+                                      nsIEventTarget    *target_,
+                                      nsICancelable    **result)
+{
   NS_ENSURE_TRUE(gNeckoChild != nullptr, NS_ERROR_FAILURE);
 
   if (mDisablePrefetch && (flags & RESOLVE_SPECULATE)) {
@@ -108,12 +124,15 @@
   }
 
   nsRefPtr<DNSRequestChild> childReq =
-    new DNSRequestChild(nsCString(hostname), flags, listener, target);
+    new DNSRequestChild(nsCString(hostname), flags,
+                        nsCString(aNetworkInterface),
+                        listener, target);
 
   {
     MutexAutoLock lock(mPendingRequestsLock);
     nsCString key;
-    GetDNSRecordHashKey(hostname, originalFlags, originalListener, key);
+    GetDNSRecordHashKey(hostname, originalFlags, aNetworkInterface,
+                        originalListener, key);
     nsTArray<nsRefPtr<DNSRequestChild>> *hashEntry;
     if (mPendingRequests.Get(key, &hashEntry)) {
       hashEntry->AppendElement(childReq);
@@ -136,6 +155,17 @@
                                     nsIDNSListener    *aListener,
                                     nsresult           aReason)
 {
+  return CancelAsyncResolveExtended(aHostname, aFlags, EmptyCString(),
+                                    aListener, aReason);
+}
+
+NS_IMETHODIMP
+ChildDNSService::CancelAsyncResolveExtended(const nsACString &aHostname,
+                                            uint32_t          aFlags,
+                                            const nsACString &aNetworkInterface,
+                                            nsIDNSListener   *aListener,
+                                            nsresult          aReason)
+{
   if (mDisablePrefetch && (aFlags & RESOLVE_SPECULATE)) {
     return NS_ERROR_DNS_LOOKUP_QUEUE_FULL;
   }
@@ -143,7 +173,7 @@
   MutexAutoLock lock(mPendingRequestsLock);
   nsTArray<nsRefPtr<DNSRequestChild>> *hashEntry;
   nsCString key;
-  GetDNSRecordHashKey(aHostname, aFlags, aListener, key);
+  GetDNSRecordHashKey(aHostname, aFlags, aNetworkInterface, aListener, key);
   if (mPendingRequests.Get(key, &hashEntry)) {
     // We cancel just one.
     hashEntry->ElementAt(0)->Cancel(aReason);
@@ -195,7 +225,8 @@
   MutexAutoLock lock(mPendingRequestsLock);
 
   nsCString key;
-  GetDNSRecordHashKey(aDnsRequest->mHost, originalFlags, originalListener, key);
+  GetDNSRecordHashKey(aDnsRequest->mHost, originalFlags,
+                      aDnsRequest->mNetworkInterface, originalListener, key);
 
   nsTArray<nsRefPtr<DNSRequestChild>> *hashEntry;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/ChildDNSService.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/ChildDNSService.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/ChildDNSService.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/ChildDNSService.h	2015-02-28 15:03:09.000000000 +0000
@@ -40,6 +40,7 @@
 
   void MOZ_ALWAYS_INLINE GetDNSRecordHashKey(const nsACString &aHost,
                                              uint32_t aFlags,
+                                             const nsACString &aNetworkInterface,
                                              nsIDNSListener* aListener,
                                              nsACString &aHashKey);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestChild.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestChild.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -172,7 +172,8 @@
     if (mDnsRequest->mIPCOpen) {
       // Send request to Parent process.
       mDnsRequest->SendCancelDNSRequest(mDnsRequest->mHost, mDnsRequest->mFlags,
-                                      mReasonForCancel);
+                                        mDnsRequest->mNetworkInterface,
+                                        mReasonForCancel);
     }
     return NS_OK;
   }
@@ -187,6 +188,7 @@
 
 DNSRequestChild::DNSRequestChild(const nsCString& aHost,
                                  const uint32_t& aFlags,
+                                 const nsCString& aNetworkInterface,
                                  nsIDNSListener *aListener,
                                  nsIEventTarget *target)
   : mListener(aListener)
@@ -194,6 +196,7 @@
   , mResultStatus(NS_OK)
   , mHost(aHost)
   , mFlags(aFlags)
+  , mNetworkInterface(aNetworkInterface)
   , mIPCOpen(false)
 {
 }
@@ -209,7 +212,8 @@
   }
 
   // Send request to Parent process.
-  gNeckoChild->SendPDNSRequestConstructor(this, mHost, mFlags);
+  gNeckoChild->SendPDNSRequestConstructor(this, mHost, mFlags,
+                                          mNetworkInterface);
   mIPCOpen = true;
 
   // IPDL holds a reference until IPDL channel gets destroyed
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestChild.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestChild.h	2015-02-28 15:03:09.000000000 +0000
@@ -25,6 +25,7 @@
   NS_DECL_NSICANCELABLE
 
   DNSRequestChild(const nsCString& aHost, const uint32_t& aFlags,
+                  const nsCString& aNetworkInterface,
                   nsIDNSListener *aListener, nsIEventTarget *target);
 
   void AddIPDLReference() {
@@ -50,6 +51,7 @@
   nsresult                  mResultStatus;
   nsCString                 mHost;
   uint16_t                  mFlags;
+  nsCString                 mNetworkInterface;
   bool                      mIPCOpen;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestParent.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestParent.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -31,7 +31,8 @@
 }
 
 void
-DNSRequestParent::DoAsyncResolve(const nsACString &hostname, uint32_t flags)
+DNSRequestParent::DoAsyncResolve(const nsACString &hostname, uint32_t flags,
+                                 const nsACString &networkInterface)
 {
   nsresult rv;
   mFlags = flags;
@@ -39,8 +40,8 @@
   if (NS_SUCCEEDED(rv)) {
     nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
     nsCOMPtr<nsICancelable> unused;
-    rv = dns->AsyncResolve(hostname, flags, this, mainThread,
-                           getter_AddRefs(unused));
+    rv = dns->AsyncResolveExtended(hostname, flags, networkInterface, this,
+                                   mainThread, getter_AddRefs(unused));
   }
 
   if (NS_FAILED(rv) && !mIPCClosed) {
@@ -52,12 +53,14 @@
 bool
 DNSRequestParent::RecvCancelDNSRequest(const nsCString& hostName,
                                        const uint32_t& flags,
+                                       const nsCString& networkInterface,
                                        const nsresult& reason)
 {
   nsresult rv;
   nsCOMPtr<nsIDNSService> dns = do_GetService(NS_DNSSERVICE_CONTRACTID, &rv);
   if (NS_SUCCEEDED(rv)) {
-    rv = dns->CancelAsyncResolve(hostName, flags, this, reason);
+    rv = dns->CancelAsyncResolveExtended(hostName, flags, networkInterface,
+                                         this, reason);
   }
   return true;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/DNSRequestParent.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/DNSRequestParent.h	2015-02-28 15:03:09.000000000 +0000
@@ -24,12 +24,14 @@
 
   DNSRequestParent();
 
-  void DoAsyncResolve(const nsACString  &hostname, uint32_t flags);
+  void DoAsyncResolve(const nsACString  &hostname, uint32_t flags,
+                      const nsACString  &networkInterface);
 
   // Pass args here rather than storing them in the parent; they are only
   // needed if the request is to be canceled.
   bool RecvCancelDNSRequest(const nsCString& hostName,
                             const uint32_t& flags,
+                            const nsCString& networkInterface,
                             const nsresult& reason) MOZ_OVERRIDE;
   bool Recv__delete__() MOZ_OVERRIDE;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/effective_tld_names.dat thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/effective_tld_names.dat
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/effective_tld_names.dat	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/effective_tld_names.dat	2015-02-28 15:03:09.000000000 +0000
@@ -5906,6 +5906,38 @@
 
 // su : http://en.wikipedia.org/wiki/.su
 su
+adygeya.su
+arkhangelsk.su
+balashov.su
+bashkiria.su
+bryansk.su
+dagestan.su
+grozny.su
+ivanovo.su
+kalmykia.su
+kaluga.su
+karelia.su
+khakassia.su
+krasnodar.su
+kurgan.su
+lenug.su
+mordovia.su
+msk.su
+murmansk.su
+nalchik.su
+nov.su
+obninsk.su
+penza.su
+pokrovsk.su
+sochi.su
+spb.su
+togliatti.su
+troitsk.su
+tula.su
+tuva.su
+vladikavkaz.su
+vladimir.su
+vologda.su
 
 // sv : http://www.svnet.org.sv/niveldos.pdf
 sv
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/GetAddrInfo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/GetAddrInfo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/GetAddrInfo.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/GetAddrInfo.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -16,6 +16,11 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/net/DNS.h"
 #include <algorithm>
+#include "prerror.h"
+
+#if defined(ANDROID) && ANDROID_VERSION > 19
+#include <resolv_netid.h>
+#endif
 
 #include "prlog.h"
 #if defined(PR_LOGGING)
@@ -215,13 +220,81 @@
 }
 #endif
 
+// Make the same as nspr functions.
+static MOZ_ALWAYS_INLINE PRAddrInfo*
+_Android_GetAddrInfoForNetInterface(const char* hostname,
+                                   uint16_t af,
+                                   uint16_t flags,
+                                   const char* aNetworkInterface)
+{
+#if !defined(ANDROID) || ANDROID_VERSION < 19
+  PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, 0);
+  return nullptr;
+#else
+  if ((af != PR_AF_INET && af != PR_AF_UNSPEC) ||
+      (flags & ~ PR_AI_NOCANONNAME) != PR_AI_ADDRCONFIG) {
+    PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
+    return nullptr;
+  }
+
+  struct addrinfo *res, hints;
+  int rv;
+  memset(&hints, 0, sizeof(hints));
+  if (!(flags & PR_AI_NOCANONNAME)) {
+    hints.ai_flags |= AI_CANONNAME;
+  }
+
+#ifdef AI_ADDRCONFIG
+  if ((flags & PR_AI_ADDRCONFIG) &&
+      strcmp(hostname, "localhost") != 0 &&
+      strcmp(hostname, "localhost.localdomain") != 0 &&
+      strcmp(hostname, "localhost6") != 0 &&
+      strcmp(hostname, "localhost6.localdomain6") != 0) {
+    hints.ai_flags |= AI_ADDRCONFIG;
+  }
+#endif
+
+  hints.ai_family = (af == PR_AF_INET) ? AF_INET : AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
+
+#if ANDROID_VERSION == 19
+  rv = android_getaddrinfoforiface(hostname, NULL, &hints, aNetworkInterface,
+                                   0, &res);
+#else
+  uint32_t netId = atoi(aNetworkInterface);
+  rv = android_getaddrinfofornet(hostname, NULL, &hints, netId, 0, &res);
+#endif
+
+#ifdef AI_ADDRCONFIG
+  if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
+    hints.ai_flags &= ~AI_ADDRCONFIG;
+#if ANDROID_VERSION == 19
+    rv = android_getaddrinfoforiface(hostname, NULL, &hints, aNetworkInterface,
+                                     0, &res);
+#else
+    uint32_t netId = atoi(aNetworkInterface);
+    rv = android_getaddrinfofornet(hostname, NULL, &hints, netId, 0, &res);
+#endif
+  }
+#endif
+
+  if (rv == 0) {
+    return (PRAddrInfo *) res;
+  }
+
+  PR_SetError(PR_DIRECTORY_LOOKUP_ERROR, rv);
+  return nullptr;
+#endif
+}
+
 ////////////////////////////////////
 // PORTABLE RUNTIME IMPLEMENTATION//
 ////////////////////////////////////
 
 static MOZ_ALWAYS_INLINE nsresult
 _GetAddrInfo_Portable(const char* aCanonHost, uint16_t aAddressFamily,
-                      uint16_t aFlags, AddrInfo** aAddrInfo)
+                      uint16_t aFlags, const char* aNetworkInterface,
+                      AddrInfo** aAddrInfo)
 {
   MOZ_ASSERT(aCanonHost);
   MOZ_ASSERT(aAddrInfo);
@@ -241,7 +314,18 @@
     aAddressFamily = PR_AF_UNSPEC;
   }
 
-  PRAddrInfo* prai = PR_GetAddrInfoByName(aCanonHost, aAddressFamily, prFlags);
+  PRAddrInfo* prai;
+#if defined(ANDROID) && ANDROID_VERSION >= 19
+  if (aNetworkInterface && aNetworkInterface[0] != '\0') {
+    prai = _Android_GetAddrInfoForNetInterface(aCanonHost,
+                                               aAddressFamily,
+                                               prFlags,
+                                               aNetworkInterface);
+  } else
+#endif
+  {
+    prai = PR_GetAddrInfoByName(aCanonHost, aAddressFamily, prFlags);
+  }
 
   if (!prai) {
     return NS_ERROR_UNKNOWN_HOST;
@@ -290,7 +374,7 @@
 
 nsresult
 GetAddrInfo(const char* aHost, uint16_t aAddressFamily, uint16_t aFlags,
-            AddrInfo** aAddrInfo, bool aGetTtl)
+            const char* aNetworkInterface, AddrInfo** aAddrInfo, bool aGetTtl)
 {
   if (NS_WARN_IF(!aHost) || NS_WARN_IF(!aAddrInfo)) {
     return NS_ERROR_NULL_POINTER;
@@ -304,7 +388,8 @@
 #endif
 
   *aAddrInfo = nullptr;
-  nsresult rv = _GetAddrInfo_Portable(aHost, aAddressFamily, aFlags, aAddrInfo);
+  nsresult rv = _GetAddrInfo_Portable(aHost, aAddressFamily, aFlags,
+                                      aNetworkInterface, aAddrInfo);
 
 #if DNSQUERY_AVAILABLE
   if (aGetTtl && NS_SUCCEEDED(rv)) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/GetAddrInfo.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/GetAddrInfo.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/GetAddrInfo.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/GetAddrInfo.h	2015-02-28 15:03:09.000000000 +0000
@@ -40,7 +40,7 @@
  */
 nsresult
 GetAddrInfo(const char* aHost, uint16_t aAddressFamily, uint16_t aFlags,
-            AddrInfo** aAddrInfo, bool aGetTtl);
+            const char* aNetworkInterface, AddrInfo** aAddrInfo, bool aGetTtl);
 
 /**
  * Initialize the GetAddrInfo module.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/Makefile.in	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/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/.
-
-include $(topsrcdir)/config/rules.mk
-
-# Generate the include file containing compact, static definitions
-# for effective TLD data.
-etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
-	$(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/moz.build	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/moz.build	2015-02-28 15:03:09.000000000 +0000
@@ -59,8 +59,14 @@
 GENERATED_FILES = [
     'etld_data.inc',
 ]
+etld_data = GENERATED_FILES['etld_data.inc']
+etld_data.script = 'prepare_tlds.py'
+etld_data.inputs = ['effective_tld_names.dat']
 
 # need to include etld_data.inc
 LOCAL_INCLUDES += [
     '/netwerk/base',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
+    CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsDNSService2.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsDNSService2.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsDNSService2.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsDNSService2.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -50,6 +50,7 @@
 static const char kPrefDisableIPv6[]         = "network.dns.disableIPv6";
 static const char kPrefDisablePrefetch[]     = "network.dns.disablePrefetch";
 static const char kPrefDnsLocalDomains[]     = "network.dns.localDomains";
+static const char kPrefDnsOfflineLocalhost[] = "network.dns.offline-localhost";
 static const char kPrefDnsNotifyResolution[] = "network.dns.notifyResolution";
 
 //-----------------------------------------------------------------------------
@@ -249,11 +250,13 @@
     }
 
     NetAddrElement *iterCopy = mIter;
+    int iterGenCntCopy = mIterGenCnt;
 
     NetAddr addr;
     *result = NS_SUCCEEDED(GetNextAddr(0, &addr));
 
     mIter = iterCopy;
+    mIterGenCnt = iterGenCntCopy;
     mDone = false;
 
     return NS_OK;
@@ -303,12 +306,14 @@
                       const nsACString &host,
                       nsIDNSListener   *listener,
                       uint16_t          flags,
-                      uint16_t          af)
+                      uint16_t          af,
+                      const nsACString &netInterface)
         : mResolver(res)
         , mHost(host)
         , mListener(listener)
         , mFlags(flags)
-        , mAF(af) {}
+        , mAF(af)
+        , mNetworkInterface(netInterface) {}
 
     void OnLookupComplete(nsHostResolver *, nsHostRecord *, nsresult) MOZ_OVERRIDE;
     // Returns TRUE if the DNS listener arg is the same as the member listener
@@ -323,6 +328,7 @@
     nsCOMPtr<nsIDNSListener> mListener;
     uint16_t                 mFlags;
     uint16_t                 mAF;
+    nsCString                mNetworkInterface;
 };
 
 void
@@ -382,7 +388,8 @@
 nsDNSAsyncRequest::Cancel(nsresult reason)
 {
     NS_ENSURE_ARG(NS_FAILED(reason));
-    mResolver->DetachCallback(mHost.get(), mFlags, mAF, this, reason);
+    mResolver->DetachCallback(mHost.get(), mFlags, mAF, mNetworkInterface.get(),
+                              this, reason);
     return NS_OK;
 }
 
@@ -529,12 +536,12 @@
     if (mResolver)
         return NS_OK;
     NS_ENSURE_TRUE(!mResolver, NS_ERROR_ALREADY_INITIALIZED);
-
     // prefs
     uint32_t maxCacheEntries  = 400;
     uint32_t defaultCacheLifetime = 120; // seconds
     uint32_t defaultGracePeriod = 60; // seconds
     bool     disableIPv6      = false;
+    bool     offlineLocalhost = true;
     bool     disablePrefetch  = false;
     int      proxyType        = nsIProtocolProxyService::PROXYCONFIG_DIRECT;
     bool     notifyResolution = false;
@@ -557,6 +564,7 @@
         prefs->GetBoolPref(kPrefDisableIPv6, &disableIPv6);
         prefs->GetCharPref(kPrefIPv4OnlyDomains, getter_Copies(ipv4OnlyDomains));
         prefs->GetCharPref(kPrefDnsLocalDomains, getter_Copies(localDomains));
+        prefs->GetBoolPref(kPrefDnsOfflineLocalhost, &offlineLocalhost);
         prefs->GetBoolPref(kPrefDisablePrefetch, &disablePrefetch);
 
         // If a manual proxy is in use, disable prefetch implicitly
@@ -575,6 +583,7 @@
             prefs->AddObserver(kPrefIPv4OnlyDomains, this, false);
             prefs->AddObserver(kPrefDnsLocalDomains, this, false);
             prefs->AddObserver(kPrefDisableIPv6, this, false);
+            prefs->AddObserver(kPrefDnsOfflineLocalhost, this, false);
             prefs->AddObserver(kPrefDisablePrefetch, this, false);
             prefs->AddObserver(kPrefDnsNotifyResolution, this, false);
 
@@ -615,6 +624,7 @@
         mResolver = res;
         mIDN = idn;
         mIPv4OnlyDomains = ipv4OnlyDomains; // exchanges buffer ownership
+        mOfflineLocalhost = offlineLocalhost;
         mDisableIPv6 = disableIPv6;
 
         // Disable prefetching either by explicit preference or if a manual proxy is configured 
@@ -710,6 +720,18 @@
                            nsIEventTarget    *target_,
                            nsICancelable    **result)
 {
+    return AsyncResolveExtended(aHostname, flags, EmptyCString(), listener, target_,
+                                result);
+}
+
+NS_IMETHODIMP
+nsDNSService::AsyncResolveExtended(const nsACString  &aHostname,
+                                   uint32_t           flags,
+                                   const nsACString  &aNetworkInterface,
+                                   nsIDNSListener    *listener,
+                                   nsIEventTarget    *target_,
+                                   nsICancelable    **result)
+{
     // grab reference to global host resolver and IDN service.  beware
     // simultaneous shutdown!!
     nsRefPtr<nsHostResolver> res;
@@ -735,13 +757,15 @@
     if (!res)
         return NS_ERROR_OFFLINE;
 
-    if (mOffline)
-        flags |= RESOLVE_OFFLINE;
-
     nsCString hostname;
     if (!PreprocessHostname(localDomain, aHostname, idn, hostname))
         return NS_ERROR_FAILURE;
 
+    if (mOffline &&
+        (!mOfflineLocalhost || !hostname.LowerCaseEqualsASCII("localhost"))) {
+        flags |= RESOLVE_OFFLINE;
+    }
+
     // make sure JS callers get notification on the main thread
     nsCOMPtr<nsIXPConnectWrappedJS> wrappedListener = do_QueryInterface(listener);
     if (wrappedListener && !target) {
@@ -751,13 +775,14 @@
     }
 
     if (target) {
-      listener = new DNSListenerProxy(listener, target);
+        listener = new DNSListenerProxy(listener, target);
     }
 
     uint16_t af = GetAFForLookup(hostname, flags);
 
     nsDNSAsyncRequest *req =
-            new nsDNSAsyncRequest(res, hostname, listener, flags, af);
+        new nsDNSAsyncRequest(res, hostname, listener, flags, af,
+                              aNetworkInterface);
     if (!req)
         return NS_ERROR_OUT_OF_MEMORY;
     NS_ADDREF(*result = req);
@@ -767,7 +792,9 @@
 
     // addref for resolver; will be released when OnLookupComplete is called.
     NS_ADDREF(req);
-    nsresult rv = res->ResolveHost(req->mHost.get(), flags, af, req);
+    nsresult rv = res->ResolveHost(req->mHost.get(), flags, af,
+                                   req->mNetworkInterface.get(),
+                                   req);
     if (NS_FAILED(rv)) {
         NS_RELEASE(req);
         NS_RELEASE(*result);
@@ -781,6 +808,17 @@
                                  nsIDNSListener    *aListener,
                                  nsresult           aReason)
 {
+    return CancelAsyncResolveExtended(aHostname, aFlags, EmptyCString(), aListener,
+                                      aReason);
+}
+
+NS_IMETHODIMP
+nsDNSService::CancelAsyncResolveExtended(const nsACString  &aHostname,
+                                         uint32_t           aFlags,
+                                         const nsACString  &aNetworkInterface,
+                                         nsIDNSListener    *aListener,
+                                         nsresult           aReason)
+{
     // grab reference to global host resolver and IDN service.  beware
     // simultaneous shutdown!!
     nsRefPtr<nsHostResolver> res;
@@ -805,7 +843,9 @@
 
     uint16_t af = GetAFForLookup(hostname, aFlags);
 
-    res->CancelAsyncRequest(hostname.get(), aFlags, af, aListener, aReason);
+    res->CancelAsyncRequest(hostname.get(), aFlags, af,
+                            nsPromiseFlatCString(aNetworkInterface).get(), aListener,
+                            aReason);
     return NS_OK;
 }
 
@@ -833,13 +873,15 @@
 
     NS_ENSURE_TRUE(res, NS_ERROR_OFFLINE);
 
-    if (mOffline)
-        flags |= RESOLVE_OFFLINE;
-
     nsCString hostname;
     if (!PreprocessHostname(localDomain, aHostname, idn, hostname))
         return NS_ERROR_FAILURE;
 
+    if (mOffline &&
+        (!mOfflineLocalhost || !hostname.LowerCaseEqualsASCII("localhost"))) {
+        flags |= RESOLVE_OFFLINE;
+    }
+
     //
     // sync resolve: since the host resolver only works asynchronously, we need
     // to use a mutex and a condvar to wait for the result.  however, since the
@@ -857,7 +899,7 @@
 
     uint16_t af = GetAFForLookup(hostname, flags);
 
-    nsresult rv = res->ResolveHost(hostname.get(), flags, af, &syncReq);
+    nsresult rv = res->ResolveHost(hostname.get(), flags, af, "", &syncReq);
     if (NS_SUCCEEDED(rv)) {
         // wait for result
         while (!syncReq.mDone)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsDNSService2.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsDNSService2.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsDNSService2.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsDNSService2.h	2015-02-28 15:03:09.000000000 +0000
@@ -60,6 +60,7 @@
     bool                                      mFirstTime;
     bool                                      mOffline;
     bool                                      mNotifyResolution;
+    bool                                      mOfflineLocalhost;
     nsMainThreadPtrHandle<nsIObserverService> mObserverService;
     nsTHashtable<nsCStringHashKey>            mLocalDomains;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsHostResolver.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsHostResolver.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsHostResolver.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsHostResolver.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsISupportsBase.h"
 #include "nsISupportsUtils.h"
 #include "nsAutoPtr.h"
+#include "nsPrintfCString.h"
 #include "prthread.h"
 #include "prerror.h"
 #include "prtime.h"
@@ -75,6 +76,10 @@
 #define LOG(args)
 #endif
 
+#define LOG_HOST(host, interface) host,                                        \
+                 (interface && interface[0] != '\0') ? " on interface " : "",  \
+                 (interface && interface[0] != '\0') ? interface : ""
+
 //----------------------------------------------------------------------------
 
 static inline void
@@ -179,7 +184,9 @@
     memcpy((char *) host, key->host, strlen(key->host) + 1);
     flags = key->flags;
     af = key->af;
-
+    netInterface = host + strlen(key->host) + 1;
+    memcpy((char *) netInterface, key->netInterface,
+           strlen(key->netInterface) + 1);
     PR_INIT_CLIST(this);
     PR_INIT_CLIST(&callbacks);
 }
@@ -188,10 +195,11 @@
 nsHostRecord::Create(const nsHostKey *key, nsHostRecord **result)
 {
     size_t hostLen = strlen(key->host) + 1;
-    size_t size = hostLen + sizeof(nsHostRecord);
+    size_t netInterfaceLen = strlen(key->netInterface) + 1;
+    size_t size = hostLen + netInterfaceLen + sizeof(nsHostRecord);
 
-    // Use placement new to create the object with room for the hostname
-    // allocated after it.
+    // Use placement new to create the object with room for the hostname and
+    // network interface name allocated after it.
     void *place = ::operator new(size);
     *result = new(place) nsHostRecord(key);
     NS_ADDREF(*result);
@@ -231,7 +239,8 @@
 nsHostRecord::Blacklisted(NetAddr *aQuery)
 {
     // must call locked
-    LOG(("Checking blacklist for host [%s], host record [%p].\n", host, this));
+    LOG(("Checking blacklist for host [%s%s%s], host record [%p].\n",
+          LOG_HOST(host, netInterface), this));
 
     // skip the string conversion for the common case of no blacklist
     if (!mBlacklistedItems.Length()) {
@@ -246,7 +255,8 @@
 
     for (uint32_t i = 0; i < mBlacklistedItems.Length(); i++) {
         if (mBlacklistedItems.ElementAt(i).Equals(strQuery)) {
-            LOG(("Address [%s] is blacklisted for host [%s].\n", buf, host));
+            LOG(("Address [%s] is blacklisted for host [%s%s%s].\n", buf,
+                 LOG_HOST(host, netInterface)));
             return true;
         }
     }
@@ -258,7 +268,8 @@
 nsHostRecord::ReportUnusable(NetAddr *aAddress)
 {
     // must call locked
-    LOG(("Adding address to blacklist for host [%s], host record [%p].\n", host, this));
+    LOG(("Adding address to blacklist for host [%s%s%s], host record [%p].\n",
+         LOG_HOST(host, netInterface), this));
 
     ++mBlacklistedCount;
 
@@ -267,7 +278,8 @@
 
     char buf[kIPv6CStrBufSize];
     if (NetAddrToString(aAddress, buf, sizeof(buf))) {
-        LOG(("Successfully adding address [%s] to blacklist for host [%s].\n", buf, host));
+        LOG(("Successfully adding address [%s] to blacklist for host "
+             "[%s%s%s].\n", buf, LOG_HOST(host, netInterface)));
         mBlacklistedItems.AppendElement(nsCString(buf));
     }
 }
@@ -276,7 +288,8 @@
 nsHostRecord::ResetBlacklist()
 {
     // must call locked
-    LOG(("Resetting blacklist for host [%s], host record [%p].\n", host, this));
+    LOG(("Resetting blacklist for host [%s%s%s], host record [%p].\n",
+         LOG_HOST(host, netInterface), this));
     mBlacklistedItems.Clear();
 }
 
@@ -391,7 +404,8 @@
 HostDB_HashKey(PLDHashTable *table, const void *key)
 {
     const nsHostKey *hk = static_cast<const nsHostKey *>(key);
-    return AddToHash(HashString(hk->host), RES_KEY_FLAGS(hk->flags), hk->af);
+    return AddToHash(HashString(hk->host), RES_KEY_FLAGS(hk->flags), hk->af,
+                     HashString(hk->netInterface));
 }
 
 static bool
@@ -404,7 +418,8 @@
 
     return !strcmp(he->rec->host, hk->host) &&
             RES_KEY_FLAGS (he->rec->flags) == RES_KEY_FLAGS(hk->flags) &&
-            he->rec->af == hk->af;
+            he->rec->af == hk->af &&
+            !strcmp(he->rec->netInterface, hk->netInterface);
 }
 
 static void
@@ -426,19 +441,23 @@
     nsHostRecord *hr = he->rec;
     MOZ_ASSERT(hr, "nsHostDBEnt has null host record!");
 
-    LOG(("Clearing cache db entry for host [%s].\n", hr->host));
+    LOG(("Clearing cache db entry for host [%s%s%s].\n",
+         LOG_HOST(hr->host, hr->netInterface)));
 #if defined(DEBUG) && defined(PR_LOGGING)
     {
         MutexAutoLock lock(hr->addr_info_lock);
         if (!hr->addr_info) {
-            LOG(("No address info for host [%s].\n", hr->host));
+            LOG(("No address info for host [%s%s%s].\n",
+                 LOG_HOST(hr->host, hr->netInterface)));
         } else {
             if (!hr->mValidEnd.IsNull()) {
                 TimeDuration diff = hr->mValidEnd - TimeStamp::NowLoRes();
-                LOG(("Record for [%s] expires in %f seconds.\n", hr->host,
+                LOG(("Record for host [%s%s%s] expires in %f seconds.\n",
+                     LOG_HOST(hr->host, hr->netInterface),
                      diff.ToSeconds()));
             } else {
-                LOG(("Record for [%s] not yet valid.\n", hr->host));
+                LOG(("Record for host [%s%s%s] not yet valid.\n",
+                     LOG_HOST(hr->host, hr->netInterface)));
             }
 
             NetAddrElement *addrElement = nullptr;
@@ -728,12 +747,14 @@
 nsHostResolver::ResolveHost(const char            *host,
                             uint16_t               flags,
                             uint16_t               af,
+                            const char            *netInterface,
                             nsResolveHostCallback *callback)
 {
     NS_ENSURE_TRUE(host && *host, NS_ERROR_UNEXPECTED);
+    NS_ENSURE_TRUE(netInterface, NS_ERROR_UNEXPECTED);
 
-    LOG(("Resolving host [%s]%s.\n",
-         host, flags & RES_BYPASS_CACHE ? " - bypassing cache" : ""));
+    LOG(("Resolving host [%s%s%s]%s.\n", LOG_HOST(host, netInterface),
+         flags & RES_BYPASS_CACHE ? " - bypassing cache" : ""));
 
     // ensure that we are working with a valid hostname before proceeding.  see
     // bug 304904 for details.
@@ -763,19 +784,21 @@
             // and return.  otherwise, add ourselves as first pending
             // callback, and proceed to do the lookup.
 
-            nsHostKey key = { host, flags, af };
+            nsHostKey key = { host, flags, af, netInterface };
             nsHostDBEnt *he = static_cast<nsHostDBEnt *>
                 (PL_DHashTableAdd(&mDB, &key, fallible));
 
             // if the record is null, the hash table OOM'd.
             if (!he) {
-                LOG(("  Out of memory: no cache entry for [%s].\n", host));
+                LOG(("  Out of memory: no cache entry for host [%s%s%s].\n",
+                     LOG_HOST(host, netInterface)));
                 rv = NS_ERROR_OUT_OF_MEMORY;
             }
             // do we have a cached result that we can reuse?
             else if (!(flags & RES_BYPASS_CACHE) &&
                      he->rec->HasUsableResult(TimeStamp::NowLoRes(), flags)) {
-                LOG(("  Using cached record for host [%s].\n", host));
+                LOG(("  Using cached record for host [%s%s%s].\n",
+                     LOG_HOST(host, netInterface)));
                 // put reference to host record on stack...
                 result = he->rec;
                 Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2, METHOD_HIT);
@@ -786,7 +809,8 @@
                 ConditionallyRefreshRecord(he->rec, host);
                 
                 if (he->rec->negative) {
-                    LOG(("  Negative cache entry for [%s].\n", host));
+                    LOG(("  Negative cache entry for host [%s%s%s].\n",
+                         LOG_HOST(host, netInterface)));
                     Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2,
                                           METHOD_NEGATIVE_HIT);
                     status = NS_ERROR_UNKNOWN_HOST;
@@ -818,15 +842,17 @@
                      !IsHighPriority(flags) &&
                      !he->rec->resolving) {
                 LOG(("  Lookup queue full: dropping %s priority request for "
-                     "[%s].\n",
-                     IsMediumPriority(flags) ? "medium" : "low", host));
+                     "host [%s%s%s].\n",
+                     IsMediumPriority(flags) ? "medium" : "low",
+                     LOG_HOST(host, netInterface)));
                 Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2,
                                       METHOD_OVERFLOW);
                 // This is a lower priority request and we are swamped, so refuse it.
                 rv = NS_ERROR_DNS_LOOKUP_QUEUE_FULL;
             }
             else if (flags & RES_OFFLINE) {
-                LOG(("  Offline request for [%s]; ignoring.\n", host));
+                LOG(("  Offline request for host [%s%s%s]; ignoring.\n",
+                     LOG_HOST(host, netInterface)));
                 rv = NS_ERROR_OFFLINE;
             }
 
@@ -836,7 +862,8 @@
                 if (!(flags & RES_BYPASS_CACHE) &&
                     ((af == PR_AF_INET) || (af == PR_AF_INET6))) {
                     // First, search for an entry with AF_UNSPEC
-                    const nsHostKey unspecKey = { host, flags, PR_AF_UNSPEC };
+                    const nsHostKey unspecKey = { host, flags, PR_AF_UNSPEC,
+                                                  netInterface };
                     nsHostDBEnt *unspecHe = static_cast<nsHostDBEnt *>
                         (PL_DHashTableSearch(&mDB, &unspecKey));
                     NS_ASSERTION(!unspecHe ||
@@ -849,8 +876,9 @@
                         MOZ_ASSERT(unspecHe->rec->addr_info || unspecHe->rec->negative,
                                    "Entry should be resolved or negative.");
 
-                        LOG(("  Trying AF_UNSPEC entry for [%s] af: %s.\n",
-                            host, (af == PR_AF_INET) ? "AF_INET" : "AF_INET6"));
+                        LOG(("  Trying AF_UNSPEC entry for host [%s%s%s] af: %s.\n",
+                             LOG_HOST(host, netInterface),
+                             (af == PR_AF_INET) ? "AF_INET" : "AF_INET6"));
 
                         he->rec->addr_info = nullptr;
                         if (unspecHe->rec->negative) {
@@ -893,7 +921,8 @@
                         // negative.
                         else if (af == PR_AF_INET6) {
                             LOG(("  No AF_INET6 in AF_UNSPEC entry: "
-                                 "[%s] unknown host", host));
+                                 "host [%s%s%s] unknown host.",
+                                 LOG_HOST(host, netInterface)));
                             result = he->rec;
                             he->rec->negative = true;
                             status = NS_ERROR_UNKNOWN_HOST;
@@ -905,7 +934,9 @@
                 // If no valid address was found in the cache or this is an
                 // AF_UNSPEC request, then start a new lookup.
                 if (!result) {
-                    LOG(("  No usable address in cache for [%s]", host));
+                    LOG(("  No usable address in cache for host [%s%s%s].",
+                         LOG_HOST(host, netInterface)));
+
                     // Add callback to the list of pending callbacks.
                     PR_APPEND_LINK(callback, &he->rec->callbacks);
                     he->rec->flags = flags;
@@ -916,15 +947,16 @@
                         PR_REMOVE_AND_INIT_LINK(callback);
                     }
                     else {
-                        LOG(("  DNS lookup for host [%s] blocking pending "
-                             "'getaddrinfo' query: callback [%p]",
-                             host, callback));
+                        LOG(("  DNS lookup for host [%s%s%s] blocking "
+                             "pending 'getaddrinfo' query: callback [%p]",
+                             LOG_HOST(host, netInterface), callback));
                     }
                 }
             }
             else {
-                LOG(("  Host [%s] is being resolved. Appending callback [%p].",
-                     host, callback));
+                LOG(("  Host [%s%s%s] is being resolved. Appending callback "
+                     "[%p].", LOG_HOST(host, netInterface), callback));
+
                 PR_APPEND_LINK(callback, &he->rec->callbacks);
                 if (he->rec->onQueue) {
                     Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2,
@@ -962,6 +994,7 @@
 nsHostResolver::DetachCallback(const char            *host,
                                uint16_t               flags,
                                uint16_t               af,
+                               const char            *netInterface,
                                nsResolveHostCallback *callback,
                                nsresult               status)
 {
@@ -969,7 +1002,7 @@
     {
         MutexAutoLock lock(mLock);
 
-        nsHostKey key = { host, flags, af };
+        nsHostKey key = { host, flags, af, netInterface };
         nsHostDBEnt *he = static_cast<nsHostDBEnt *>
                                      (PL_DHashTableSearch(&mDB, &key));
         if (he) {
@@ -1020,8 +1053,10 @@
         }
     }
 #if defined(PR_LOGGING)
-    else
-      LOG(("  Unable to find a thread for looking up host [%s].\n", rec->host));
+    else {
+        LOG(("  Unable to find a thread for looking up host [%s%s%s].\n",
+             LOG_HOST(rec->host, rec->netInterface)));
+    }
 #endif
     return NS_OK;
 }
@@ -1185,7 +1220,8 @@
     if (!rec->addr_info) {
         rec->SetExpiration(TimeStamp::NowLoRes(),
                            NEGATIVE_RECORD_LIFETIME, 0);
-        LOG(("Caching [%s] negative record for %u seconds.\n", rec->host,
+        LOG(("Caching host [%s%s%s] negative record for %u seconds.\n",
+             LOG_HOST(rec->host, rec->netInterface),
              NEGATIVE_RECORD_LIFETIME));
         return;
     }
@@ -1205,8 +1241,8 @@
 #endif
 
     rec->SetExpiration(TimeStamp::NowLoRes(), lifetime, grace);
-    LOG(("Caching [%s] record for %u seconds (grace %d).",
-         rec->host, lifetime, grace));
+    LOG(("Caching host [%s%s%s] record for %u seconds (grace %d).",
+         LOG_HOST(rec->host, rec->netInterface), lifetime, grace));
 }
 
 //
@@ -1277,7 +1313,8 @@
             }
 #if TTL_AVAILABLE
             if (!rec->mGetTtl && !rec->resolving && sGetTtlEnabled) {
-                LOG(("Issuing second async lookup for TTL for %s.", rec->host));
+                LOG(("Issuing second async lookup for TTL for host [%s%s%s].",
+                     LOG_HOST(rec->host, rec->netInterface)));
                 rec->flags =
                   (rec->flags & ~RES_PRIORITY_MEDIUM) | RES_PRIORITY_LOW;
                 DebugOnly<nsresult> rv = IssueLookup(rec);
@@ -1310,6 +1347,7 @@
 nsHostResolver::CancelAsyncRequest(const char            *host,
                                    uint16_t               flags,
                                    uint16_t               af,
+                                   const char            *netInterface,
                                    nsIDNSListener        *aListener,
                                    nsresult               status)
 
@@ -1317,7 +1355,7 @@
     MutexAutoLock lock(mLock);
 
     // Lookup the host record associated with host, flags & address family
-    nsHostKey key = { host, flags, af };
+    nsHostKey key = { host, flags, af, netInterface };
     nsHostDBEnt *he = static_cast<nsHostDBEnt *>
                       (PL_DHashTableSearch(&mDB, &key));
     if (he) {
@@ -1391,8 +1429,8 @@
     AddrInfo *ai = nullptr;
 
     while (rec || resolver->GetHostToLookup(&rec)) {
-        LOG(("DNS lookup thread - Calling getaddrinfo for host [%s].\n",
-             rec->host));
+        LOG(("DNS lookup thread - Calling getaddrinfo for host [%s%s%s].\n",
+             LOG_HOST(rec->host, rec->netInterface)));
 
         TimeStamp startTime = TimeStamp::Now();
         MOZ_EVENT_TRACER_EXEC(rec, "net::dns::resolve");
@@ -1407,10 +1445,12 @@
         // because PR_GetAddrInfoByName doesn't support PR_AF_INET6.
         bool disableIPv4 = rec->af == PR_AF_INET6;
         uint16_t af = disableIPv4 ? PR_AF_UNSPEC : rec->af;
-        nsresult status = GetAddrInfo(rec->host, af, rec->flags, &ai, getTtl);
+        nsresult status = GetAddrInfo(rec->host, af, rec->flags, rec->netInterface,
+                                      &ai, getTtl);
 #if defined(RES_RETRY_ON_FAILURE)
         if (NS_FAILED(status) && rs.Reset()) {
-            status = GetAddrInfo(rec->host, af, rec->flags, &ai, getTtl);
+            status = GetAddrInfo(rec->host, af, rec->flags, rec->netInterface, &ai,
+                                 getTtl);
         }
 #endif
 
@@ -1435,12 +1475,14 @@
         }
 
         // OnLookupComplete may release "rec", long before we lose it.
-        LOG(("DNS lookup thread - lookup completed for host [%s]: %s.\n",
-             rec->host, ai ? "success" : "failure: unknown host"));
+        LOG(("DNS lookup thread - lookup completed for host [%s%s%s]: %s.\n",
+             LOG_HOST(rec->host, rec->netInterface),
+             ai ? "success" : "failure: unknown host"));
+
         if (LOOKUP_RESOLVEAGAIN == resolver->OnLookupComplete(rec, status, ai)) {
             // leave 'rec' assigned and loop to make a renewed host resolve
-            LOG(("DNS lookup thread - Re-resolving host [%s].\n",
-                 rec->host));
+            LOG(("DNS lookup thread - Re-resolving host [%s%s%s].\n",
+                 LOG_HOST(rec->host, rec->netInterface)));
         } else {
             rec = nullptr;
         }
@@ -1489,6 +1531,7 @@
     DNSCacheEntries info;
     info.hostname = rec->host;
     info.family = rec->af;
+    info.netInterface = rec->netInterface;
     info.expiration =
         (int64_t)(rec->mValidEnd - TimeStamp::NowLoRes()).ToSeconds();
     if (info.expiration <= 0) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsHostResolver.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsHostResolver.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsHostResolver.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsHostResolver.h	2015-02-28 15:03:09.000000000 +0000
@@ -37,6 +37,7 @@
     const char *host;
     uint16_t    flags;
     uint16_t    af;
+    const char *netInterface;
 };
 
 /**
@@ -241,6 +242,7 @@
     nsresult ResolveHost(const char            *hostname,
                          uint16_t               flags,
                          uint16_t               af,
+                         const char            *netInterface,
                          nsResolveHostCallback *callback);
 
     /**
@@ -252,6 +254,7 @@
     void DetachCallback(const char            *hostname,
                         uint16_t               flags,
                         uint16_t               af,
+                        const char            *netInterface,
                         nsResolveHostCallback *callback,
                         nsresult               status);
 
@@ -265,6 +268,7 @@
     void CancelAsyncRequest(const char            *host,
                             uint16_t               flags,
                             uint16_t               af,
+                            const char            *netInterface,
                             nsIDNSListener        *aListener,
                             nsresult               status);
     /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsIDNSService.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsIDNSService.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/nsIDNSService.idl	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/nsIDNSService.idl	2015-02-28 15:03:09.000000000 +0000
@@ -21,7 +21,7 @@
 /**
  * nsIDNSService
  */
-[scriptable, uuid(f1971942-19db-44bf-81e8-d15df220a39f)]
+[scriptable, uuid(de5642c6-61fc-4fcf-9a47-03226b0d4e21)]
 interface nsIDNSService : nsISupports
 {
     /**
@@ -66,7 +66,7 @@
                             in unsigned long     aFlags,
                             in nsIDNSListener    aListener,
                             in nsresult          aReason);
-    
+
     /**
      * called to synchronously resolve a hostname.  warning this method may
      * block the calling thread for a long period of time.  it is extremely
@@ -84,6 +84,31 @@
                          in unsigned long aFlags);
 
     /**
+     * kicks off an asynchronous host lookup.
+     *
+     * This function is identical to asyncResolve except an additional
+     * parameter aNetwortInterface. If parameter aNetworkInterface is an empty
+     * string function will return the same result as asyncResolve.
+     * Setting aNetworkInterface value make only sense for gonk,because it
+     * an per networking interface query is possible.
+     */
+    nsICancelable asyncResolveExtended(in AUTF8String       aHostName,
+                                       in unsigned long     aFlags,
+                                       in AUTF8String       aNetworkInterface,
+                                       in nsIDNSListener    aListener,
+                                       in nsIEventTarget    aListenerTarget);
+
+    /**
+     * Attempts to cancel a previously requested async DNS lookup
+     * This is an extended versin with a additional parameter aNetworkInterface
+     */
+    void cancelAsyncResolveExtended(in AUTF8String       aHostName,
+                                    in unsigned long     aFlags,
+                                    in AUTF8String       aNetworkInterface,
+                                    in nsIDNSListener    aListener,
+                                    in nsresult          aReason);
+
+    /**
      * The method takes a pointer to an nsTArray
      * and fills it with cache entry data
      * Called by the networking dashboard
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/PDNSRequest.ipdl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/PDNSRequest.ipdl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/PDNSRequest.ipdl	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/PDNSRequest.ipdl	2015-02-28 15:03:09.000000000 +0000
@@ -23,7 +23,8 @@
 
   // Pass args here rather than storing them in the parent; they are only
   // needed if the request is to be canceled.
-  CancelDNSRequest(nsCString hostName, uint32_t flags, nsresult reason);
+  CancelDNSRequest(nsCString hostName, uint32_t flags,
+                   nsCString networkInterface, nsresult reason);
    __delete__();
 
 child:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/prepare_tlds.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/prepare_tlds.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/dns/prepare_tlds.py	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/dns/prepare_tlds.py	2015-02-28 15:03:09.000000000 +0000
@@ -95,11 +95,11 @@
 # DO EVERYTHING #
 #################
 
-def main():
+def main(output, effective_tld_filename):
   """
-  argv[1] is the effective TLD file to parse.
+  effective_tld_filename is the effective TLD file to parse.
   A C++ array of { domain, exception, wild } entries representing the
-  eTLD file is then printed to stdout.
+  eTLD file is then printed to output.
   """
 
   def boolStr(b):
@@ -107,10 +107,7 @@
       return "true"
     return "false"
 
-  for etld in getEffectiveTLDs(sys.argv[1]):
+  for etld in getEffectiveTLDs(effective_tld_filename):
     exception = boolStr(etld.exception())
     wild = boolStr(etld.wild())
-    print 'ETLD_ENTRY("%s", %s, %s)' % (etld.domain(), exception, wild)
-
-if __name__ == '__main__':
-  main()
+    output.write('ETLD_ENTRY("%s", %s, %s)\n' % (etld.domain(), exception, wild))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoChild.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoChild.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -254,7 +254,8 @@
 
 PDNSRequestChild*
 NeckoChild::AllocPDNSRequestChild(const nsCString& aHost,
-                                  const uint32_t& aFlags)
+                                  const uint32_t& aFlags,
+                                  const nsCString& aNetworkInterface)
 {
   // We don't allocate here: instead we always use IPDL constructor that takes
   // an existing object
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoChild.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoChild.h	2015-02-28 15:03:09.000000000 +0000
@@ -54,7 +54,8 @@
   virtual PUDPSocketChild* AllocPUDPSocketChild(const nsCString& aFilter) MOZ_OVERRIDE;
   virtual bool DeallocPUDPSocketChild(PUDPSocketChild*) MOZ_OVERRIDE;
   virtual PDNSRequestChild* AllocPDNSRequestChild(const nsCString& aHost,
-                                                  const uint32_t& aFlags) MOZ_OVERRIDE;
+                                                  const uint32_t& aFlags,
+                                                  const nsCString& aNetworkInterface) MOZ_OVERRIDE;
   virtual bool DeallocPDNSRequestChild(PDNSRequestChild*) MOZ_OVERRIDE;
   virtual PRemoteOpenFileChild*
     AllocPRemoteOpenFileChild(const SerializedLoadContext& aSerialized,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoParent.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoParent.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoParent.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoParent.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -479,7 +479,8 @@
 
 PDNSRequestParent*
 NeckoParent::AllocPDNSRequestParent(const nsCString& aHost,
-                                    const uint32_t& aFlags)
+                                    const uint32_t& aFlags,
+                                    const nsCString& aNetworkInterface)
 {
   DNSRequestParent *p = new DNSRequestParent();
   p->AddRef();
@@ -489,9 +490,11 @@
 bool
 NeckoParent::RecvPDNSRequestConstructor(PDNSRequestParent* aActor,
                                         const nsCString& aHost,
-                                        const uint32_t& aFlags)
+                                        const uint32_t& aFlags,
+                                        const nsCString& aNetworkInterface)
 {
-  static_cast<DNSRequestParent*>(aActor)->DoAsyncResolve(aHost, aFlags);
+  static_cast<DNSRequestParent*>(aActor)->DoAsyncResolve(aHost, aFlags,
+                                                         aNetworkInterface);
   return true;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoParent.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoParent.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/NeckoParent.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/NeckoParent.h	2015-02-28 15:03:09.000000000 +0000
@@ -153,10 +153,12 @@
   virtual bool RecvPUDPSocketConstructor(PUDPSocketParent*, const nsCString& aFilter) MOZ_OVERRIDE;
   virtual bool DeallocPUDPSocketParent(PUDPSocketParent*) MOZ_OVERRIDE;
   virtual PDNSRequestParent* AllocPDNSRequestParent(const nsCString& aHost,
-                                                    const uint32_t& aFlags) MOZ_OVERRIDE;
+                                                    const uint32_t& aFlags,
+                                                    const nsCString& aNetworkInterface) MOZ_OVERRIDE;
   virtual bool RecvPDNSRequestConstructor(PDNSRequestParent* actor,
                                           const nsCString& hostName,
-                                          const uint32_t& flags) MOZ_OVERRIDE;
+                                          const uint32_t& flags,
+                                          const nsCString& aNetworkInterface) MOZ_OVERRIDE;
   virtual bool DeallocPDNSRequestParent(PDNSRequestParent*) MOZ_OVERRIDE;
   virtual bool RecvHTMLDNSPrefetch(const nsString& hostname,
                                    const uint16_t& flags) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/PNecko.ipdl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/PNecko.ipdl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/ipc/PNecko.ipdl	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/ipc/PNecko.ipdl	2015-02-28 15:03:09.000000000 +0000
@@ -67,7 +67,7 @@
   PTCPServerSocket(uint16_t localPort, uint16_t backlog, nsString binaryType);
   PUDPSocket(nsCString filter);
 
-  PDNSRequest(nsCString hostName, uint32_t flags);
+  PDNSRequest(nsCString hostName, uint32_t flags, nsCString networkInterface);
 
   PRemoteOpenFile(SerializedLoadContext loadContext,
                   URIParams fileuri,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutBlank.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutBlank.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutBlank.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutBlank.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -23,28 +23,12 @@
     if (NS_FAILED(rv)) return rv;
 
     nsCOMPtr<nsIChannel> channel;
-    // Bug 1087720 (and Bug 1099296):
-    // Once all callsites have been updated to call NewChannel2()
-    // instead of NewChannel() we should have a non-null loadInfo
-    // consistently. Until then we have to branch on the loadInfo.
-    if (aLoadInfo) {
-      rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
-                                            aURI,
-                                            in,
-                                            NS_LITERAL_CSTRING("text/html"),
-                                            NS_LITERAL_CSTRING("utf-8"),
-                                            aLoadInfo);
-    }
-    else {
-      rv = NS_NewInputStreamChannel(getter_AddRefs(channel),
-                                    aURI,
-                                    in,
-                                    nsContentUtils::GetSystemPrincipal(),
-                                    nsILoadInfo::SEC_NORMAL,
-                                    nsIContentPolicy::TYPE_OTHER,
-                                    NS_LITERAL_CSTRING("text/html"),
-                                    NS_LITERAL_CSTRING("utf-8"));
-    }
+    rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
+                                          aURI,
+                                          in,
+                                          NS_LITERAL_CSTRING("text/html"),
+                                          NS_LITERAL_CSTRING("utf-8"),
+                                          aLoadInfo);
     if (NS_FAILED(rv)) return rv;
 
     channel.forget(result);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutBloat.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutBloat.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutBloat.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutBloat.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -112,28 +112,12 @@
     }
 
     nsIChannel* channel = nullptr;
-    // Bug 1087720 (and Bug 1099296):
-    // Once all callsites have been updated to call NewChannel2()
-    // instead of NewChannel() we should have a non-null loadInfo
-    // consistently. Until then we have to branch on the loadInfo.
-    if (aLoadInfo) {
-      rv = NS_NewInputStreamChannelInternal(&channel,
-                                            aURI,
-                                            inStr,
-                                            NS_LITERAL_CSTRING("text/plain"),
-                                            NS_LITERAL_CSTRING("utf-8"),
-                                            aLoadInfo);
-    }
-    else {
-      rv = NS_NewInputStreamChannel(&channel,
-                                    aURI,
-                                    inStr,
-                                    nsContentUtils::GetSystemPrincipal(),
-                                    nsILoadInfo::SEC_NORMAL,
-                                    nsIContentPolicy::TYPE_OTHER,
-                                    NS_LITERAL_CSTRING("text/plain"),
-                                    NS_LITERAL_CSTRING("utf-8"));
-    }
+    rv = NS_NewInputStreamChannelInternal(&channel,
+                                          aURI,
+                                          inStr,
+                                          NS_LITERAL_CSTRING("text/plain"),
+                                          NS_LITERAL_CSTRING("utf-8"),
+                                          aLoadInfo);
     if (NS_FAILED(rv)) return rv;
 
     *result = channel;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutCache.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutCache.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutCache.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutCache.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -64,28 +64,12 @@
     mEntriesHeaderAdded = false;
 
     nsCOMPtr<nsIChannel> channel;
-    // Bug 1087720 (and Bug 1099296):
-    // Once all callsites have been updated to call NewChannel2()
-    // instead of NewChannel() we should have a non-null loadInfo
-    // consistently. Until then we have to branch on the loadInfo.
-    if (aLoadInfo) {
-      rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
-                                            aURI,
-                                            inputStream,
-                                            NS_LITERAL_CSTRING("text/html"),
-                                            NS_LITERAL_CSTRING("utf-8"),
-                                            aLoadInfo);
-    }
-    else {
-      rv = NS_NewInputStreamChannel(getter_AddRefs(channel),
-                            aURI,
-                            inputStream,
-                            nsContentUtils::GetSystemPrincipal(),
-                            nsILoadInfo::SEC_NORMAL,
-                            nsIContentPolicy::TYPE_OTHER,
-                            NS_LITERAL_CSTRING("text/html"),
-                            NS_LITERAL_CSTRING("utf-8"));
-    }
+    rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
+                                          aURI,
+                                          inputStream,
+                                          NS_LITERAL_CSTRING("text/html"),
+                                          NS_LITERAL_CSTRING("utf-8"),
+                                          aLoadInfo);
     if (NS_FAILED(rv)) return rv;
 
     mBuffer.AssignLiteral(
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutCacheEntry.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutCacheEntry.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/about/nsAboutCacheEntry.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/about/nsAboutCacheEntry.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -99,26 +99,12 @@
     nsCOMPtr<nsIInputStream> stream;
     rv = GetContentStream(uri, getter_AddRefs(stream));
     if (NS_FAILED(rv)) return rv;
-    // Bug 1087720 (and Bug 1099296):
-    // Once all callsites have been updated to call NewChannel2()
-    // instead of NewChannel() we should have a non-null loadInfo
-    // consistently. Until then we have to branch on the loadInfo.
-    if (aLoadInfo) {
-      return NS_NewInputStreamChannelInternal(result,
-                                              uri,
-                                              stream,
-                                              NS_LITERAL_CSTRING("text/html"),
-                                              NS_LITERAL_CSTRING("utf-8"),
-                                              aLoadInfo);
-    }
-    return NS_NewInputStreamChannel(result,
-                                    uri,
-                                    stream,
-                                    nsContentUtils::GetSystemPrincipal(),
-                                    nsILoadInfo::SEC_NORMAL,
-                                    nsIContentPolicy::TYPE_OTHER,
-                                    NS_LITERAL_CSTRING("text/html"),
-                                    NS_LITERAL_CSTRING("utf-8"));
+    return NS_NewInputStreamChannelInternal(result,
+                                            uri,
+                                            stream,
+                                            NS_LITERAL_CSTRING("text/html"),
+                                            NS_LITERAL_CSTRING("utf-8"),
+                                            aLoadInfo);
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/ASpdySession.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/ASpdySession.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/ASpdySession.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/ASpdySession.h	2015-02-28 15:03:09.000000000 +0000
@@ -33,6 +33,15 @@
 
   static ASpdySession *NewSpdySession(uint32_t version, nsISocketTransport *);
 
+  // MaybeReTunnel() is called by the connection manager when it cannot
+  // dispatch a tunneled transaction. That might be because the tunnels it
+  // expects to see are dead (and we may or may not be able to make more),
+  // or it might just need to wait longer for one of them to become free.
+  //
+  // return true if the session takes back ownership of the transaction from
+  // the connection manager.
+  virtual bool MaybeReTunnel(nsAHttpTransaction *) = 0;
+
   virtual void PrintDiagnostics (nsCString &log) = 0;
 
   bool ResponseTimeoutEnabled() const MOZ_OVERRIDE MOZ_FINAL {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/Http2Session.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/Http2Session.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/Http2Session.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/Http2Session.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -3272,6 +3272,24 @@
 }
 
 void
+Http2Session::CreateTunnel(nsHttpTransaction *trans,
+                           nsHttpConnectionInfo *ci,
+                           nsIInterfaceRequestor *aCallbacks)
+{
+  LOG(("Http2Session::CreateTunnel %p %p make new tunnel\n", this, trans));
+  // The connect transaction will hold onto the underlying http
+  // transaction so that an auth created by the connect can be mappped
+  // to the correct security callbacks
+
+  nsRefPtr<SpdyConnectTransaction> connectTrans =
+    new SpdyConnectTransaction(ci, aCallbacks, trans->Caps(), trans, this);
+  AddStream(connectTrans, nsISupportsPriority::PRIORITY_NORMAL, false, nullptr);
+  Http2Stream *tunnel = mStreamTransactionHash.Get(connectTrans);
+  MOZ_ASSERT(tunnel);
+  RegisterTunnel(tunnel);
+}
+
+void
 Http2Session::DispatchOnTunnel(nsAHttpTransaction *aHttpTransaction,
                                nsIInterfaceRequestor *aCallbacks)
 {
@@ -3286,33 +3304,55 @@
 
   // this transaction has done its work of setting up a tunnel, let
   // the connection manager queue it if necessary
-  trans->SetDontRouteViaWildCard(true);
+  trans->SetTunnelProvider(this);
   trans->EnableKeepAlive();
 
   if (FindTunnelCount(ci) < gHttpHandler->MaxConnectionsPerOrigin()) {
     LOG3(("Http2Session::DispatchOnTunnel %p create on new tunnel %s",
           this, ci->HashKey().get()));
-    // The connect transaction will hold onto the underlying http
-    // transaction so that an auth created by the connect can be mappped
-    // to the correct security callbacks
-    nsRefPtr<SpdyConnectTransaction> connectTrans =
-      new SpdyConnectTransaction(ci, aCallbacks,
-                                 trans->Caps(), trans, this);
-    AddStream(connectTrans, nsISupportsPriority::PRIORITY_NORMAL,
-              false, nullptr);
-    Http2Stream *tunnel = mStreamTransactionHash.Get(connectTrans);
-    MOZ_ASSERT(tunnel);
-    RegisterTunnel(tunnel);
+    CreateTunnel(trans, ci, aCallbacks);
   } else {
     // requeue it. The connection manager is responsible for actually putting
-    // this on the tunnel connection with the specific ci now that it
-    // has DontRouteViaWildCard set.
+    // this on the tunnel connection with the specific ci. If that can't
+    // happen the cmgr checks with us via MaybeReTunnel() to see if it should
+    // make a new tunnel or just wait longer.
     LOG3(("Http2Session::DispatchOnTunnel %p trans=%p queue in connection manager",
           this, trans));
     gHttpHandler->InitiateTransaction(trans, trans->Priority());
   }
 }
 
+// From ASpdySession
+bool
+Http2Session::MaybeReTunnel(nsAHttpTransaction *aHttpTransaction)
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  nsHttpTransaction *trans = aHttpTransaction->QueryHttpTransaction();
+  LOG(("Http2Session::MaybeReTunnel %p trans=%p\n", this, trans));
+  if (!trans || trans->TunnelProvider() != this) {
+    // this isn't really one of our transactions.
+    return false;
+  }
+
+  if (mClosed || mShouldGoAway) {
+    LOG(("Http2Session::MaybeReTunnel %p %p session closed - requeue\n", this, trans));
+    trans->SetTunnelProvider(nullptr);
+    gHttpHandler->InitiateTransaction(trans, trans->Priority());
+    return true;
+  }
+
+  nsHttpConnectionInfo *ci = aHttpTransaction->ConnectionInfo();
+  LOG(("Http2Session:MaybeReTunnel %p %p count=%d limit %d\n",
+       this, trans, FindTunnelCount(ci), gHttpHandler->MaxConnectionsPerOrigin()));
+  if (FindTunnelCount(ci) >= gHttpHandler->MaxConnectionsPerOrigin()) {
+    // patience - a tunnel will open up.
+    return false;
+  }
+
+  LOG(("Http2Session::MaybeReTunnel %p %p make new tunnel\n", this, trans));
+  CreateTunnel(trans, ci, trans->SecurityCallbacks());
+  return true;
+}
 
 nsresult
 Http2Session::BufferOutput(const char *buf,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/Http2Session.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/Http2Session.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/Http2Session.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/Http2Session.h	2015-02-28 15:03:09.000000000 +0000
@@ -224,7 +224,7 @@
   void GetNegotiatedToken(nsACString &s) { s.Assign(mNegotiatedToken); }
 
   void SendPing() MOZ_OVERRIDE;
-
+  bool MaybeReTunnel(nsAHttpTransaction *) MOZ_OVERRIDE;
   bool UseH2Deps() { return mUseH2Deps; }
 
 private:
@@ -488,10 +488,10 @@
 private:
 /// connect tunnels
   void DispatchOnTunnel(nsAHttpTransaction *, nsIInterfaceRequestor *);
+  void CreateTunnel(nsHttpTransaction *, nsHttpConnectionInfo *, nsIInterfaceRequestor *);
   void RegisterTunnel(Http2Stream *);
   void UnRegisterTunnel(Http2Stream *);
   uint32_t FindTunnelCount(nsHttpConnectionInfo *);
-
   nsDataHashtable<nsCStringHashKey, uint32_t> mTunnelHash;
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpBaseChannel.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1934,13 +1934,21 @@
 }
 
 bool
+HttpBaseChannel::IsNavigation()
+{
+  return mLoadFlags & LOAD_DOCUMENT_URI;
+}
+
+bool
 HttpBaseChannel::ShouldIntercept()
 {
   nsCOMPtr<nsINetworkInterceptController> controller;
   GetCallback(controller);
   bool shouldIntercept = false;
   if (controller && !mForceNoIntercept) {
-    nsresult rv = controller->ShouldPrepareForIntercept(mURI, &shouldIntercept);
+    nsresult rv = controller->ShouldPrepareForIntercept(mURI,
+                                                        IsNavigation(),
+                                                        &shouldIntercept);
     NS_ENSURE_SUCCESS(rv, false);
   }
   return shouldIntercept;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpBaseChannel.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpBaseChannel.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpBaseChannel.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpBaseChannel.h	2015-02-28 15:03:09.000000000 +0000
@@ -241,7 +241,7 @@
     const NetAddr& GetPeerAddr() { return mPeerAddr; }
 
 public: /* Necko internal use only... */
-
+    bool IsNavigation();
 
     // Return whether upon a redirect code of httpStatus for method, the
     // request method should be rewritten to GET.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpChannelChild.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpChannelChild.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpChannelChild.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpChannelChild.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -56,6 +56,111 @@
 
 }
 
+// A stream listener interposed between the nsInputStreamPump used for intercepted channels
+// and this channel's original listener. This is only used to ensure the original listener
+// sees the channel as the request object, and to synthesize OnStatus and OnProgress notifications.
+class InterceptStreamListener : public nsIStreamListener
+                              , public nsIProgressEventSink
+{
+  nsRefPtr<HttpChannelChild> mOwner;
+  nsCOMPtr<nsISupports> mContext;
+  virtual ~InterceptStreamListener() {}
+ public:
+  InterceptStreamListener(HttpChannelChild* aOwner, nsISupports* aContext)
+  : mOwner(aOwner)
+  , mContext(aContext)
+  {
+  }
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREQUESTOBSERVER
+  NS_DECL_NSISTREAMLISTENER
+  NS_DECL_NSIPROGRESSEVENTSINK
+
+  void Cleanup();
+};
+
+NS_IMPL_ISUPPORTS(InterceptStreamListener,
+                  nsIStreamListener,
+                  nsIRequestObserver,
+                  nsIProgressEventSink)
+
+NS_IMETHODIMP
+InterceptStreamListener::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
+{
+  if (mOwner) {
+    mOwner->DoOnStartRequest(mOwner, mContext);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+InterceptStreamListener::OnStatus(nsIRequest* aRequest, nsISupports* aContext,
+                                  nsresult status, const char16_t* aStatusArg)
+{
+  if (mOwner) {
+    mOwner->DoOnStatus(mOwner, status);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+InterceptStreamListener::OnProgress(nsIRequest* aRequest, nsISupports* aContext,
+                                    int64_t aProgress, int64_t aProgressMax)
+{
+  if (mOwner) {
+    mOwner->DoOnProgress(mOwner, aProgress, aProgressMax);
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+InterceptStreamListener::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
+                                         nsIInputStream* aInputStream, uint64_t aOffset,
+                                         uint32_t aCount)
+{
+  if (!mOwner) {
+    return NS_OK;
+  }
+
+  uint32_t loadFlags;
+  mOwner->GetLoadFlags(&loadFlags);
+
+  if (!(loadFlags & HttpBaseChannel::LOAD_BACKGROUND)) {
+    nsCOMPtr<nsIURI> uri;
+    mOwner->GetURI(getter_AddRefs(uri));
+
+    nsAutoCString host;
+    uri->GetHost(host);
+
+    OnStatus(mOwner, aContext, NS_NET_STATUS_READING, NS_ConvertUTF8toUTF16(host).get());
+
+    int64_t progress = aOffset + aCount;
+    OnProgress(mOwner, aContext, progress, mOwner->GetResponseHead()->ContentLength());
+  }
+
+  mOwner->DoOnDataAvailable(mOwner, mContext, aInputStream, aOffset, aCount);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+InterceptStreamListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, nsresult aStatusCode)
+{
+  if (mOwner) {
+    mOwner->DoPreOnStopRequest(aStatusCode);
+    mOwner->DoOnStopRequest(mOwner, mContext);
+  }
+  Cleanup();
+  return NS_OK;
+}
+
+void
+InterceptStreamListener::Cleanup()
+{
+  mOwner = nullptr;
+  mContext = nullptr;
+}
+
 //-----------------------------------------------------------------------------
 // HttpChannelChild
 //-----------------------------------------------------------------------------
@@ -852,6 +957,10 @@
   LOG(("HttpChannelChild::DoNotifyListenerCleanup [this=%p]\n", this));
   if (mIPCOpen)
     PHttpChannelChild::Send__delete__(this);
+  if (mInterceptListener) {
+    mInterceptListener->Cleanup();
+    mInterceptListener = nullptr;
+  }
 }
 
 class DeleteSelfEvent : public ChannelEvent
@@ -1237,6 +1346,10 @@
     mStatus = status;
     if (RemoteChannelExists())
       SendCancel(status);
+    if (mSynthesizedResponsePump) {
+      mSynthesizedResponsePump->Cancel(status);
+    }
+    mInterceptListener = nullptr;
   }
   return NS_OK;
 }
@@ -1343,89 +1456,6 @@
   return NS_OK;
 }
 
-// A stream listener interposed between the nsInputStreamPump used for intercepted channels
-// and this channel's original listener. This is only used to ensure the original listener
-// sees the channel as the request object, and to synthesize OnStatus and OnProgress notifications.
-class InterceptStreamListener : public nsIStreamListener
-                              , public nsIProgressEventSink
-{
-  nsRefPtr<HttpChannelChild> mOwner;
-  nsCOMPtr<nsISupports> mContext;
-  virtual ~InterceptStreamListener() {}
-public:
-  InterceptStreamListener(HttpChannelChild* aOwner, nsISupports* aContext)
-  : mOwner(aOwner)
-  , mContext(aContext)
-  {
-  }
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSIPROGRESSEVENTSINK
-};
-
-NS_IMPL_ISUPPORTS(InterceptStreamListener,
-                  nsIStreamListener,
-                  nsIRequestObserver,
-                  nsIProgressEventSink)
-
-NS_IMETHODIMP
-InterceptStreamListener::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
-{
-  mOwner->DoOnStartRequest(mOwner, mContext);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptStreamListener::OnStatus(nsIRequest* aRequest, nsISupports* aContext,
-                                  nsresult status, const char16_t* aStatusArg)
-{
-  mOwner->DoOnStatus(mOwner, status);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptStreamListener::OnProgress(nsIRequest* aRequest, nsISupports* aContext,
-                                    int64_t aProgress, int64_t aProgressMax)
-{
-  mOwner->DoOnProgress(mOwner, aProgress, aProgressMax);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptStreamListener::OnDataAvailable(nsIRequest* aRequest, nsISupports* aContext,
-                                         nsIInputStream* aInputStream, uint64_t aOffset,
-                                         uint32_t aCount)
-{
-  uint32_t loadFlags;
-  mOwner->GetLoadFlags(&loadFlags);
-
-  if (!(loadFlags & HttpBaseChannel::LOAD_BACKGROUND)) {
-    nsCOMPtr<nsIURI> uri;
-    mOwner->GetURI(getter_AddRefs(uri));
-
-    nsAutoCString host;
-    uri->GetHost(host);
-
-    OnStatus(mOwner, aContext, NS_NET_STATUS_READING, NS_ConvertUTF8toUTF16(host).get());
-
-    int64_t progress = aOffset + aCount;
-    OnProgress(mOwner, aContext, progress, mOwner->GetResponseHead()->ContentLength());
-  }
-
-  mOwner->DoOnDataAvailable(mOwner, mContext, aInputStream, aOffset, aCount);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-InterceptStreamListener::OnStopRequest(nsIRequest* aRequest, nsISupports* aContext, nsresult aStatusCode)
-{
-  mOwner->DoPreOnStopRequest(aStatusCode);
-  mOwner->DoOnStopRequest(mOwner, mContext);
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 HttpChannelChild::AsyncOpen(nsIStreamListener *listener, nsISupports *aContext)
 {
@@ -2043,6 +2073,7 @@
 void
 HttpChannelChild::ResetInterception()
 {
+  mInterceptListener->Cleanup();
   mInterceptListener = nullptr;
 
   // Continue with the original cross-process request
@@ -2051,7 +2082,7 @@
 }
 
 void
-HttpChannelChild::OverrideWithSynthesizedResponse(nsHttpResponseHead* aResponseHead,
+HttpChannelChild::OverrideWithSynthesizedResponse(nsAutoPtr<nsHttpResponseHead>& aResponseHead,
                                                   nsInputStreamPump* aPump)
 {
   mSynthesizedResponsePump = aPump;
@@ -2063,6 +2094,10 @@
     nsresult rv = mSynthesizedResponsePump->Suspend();
     NS_ENSURE_SUCCESS_VOID(rv);
   }
+
+  if (mCanceled) {
+    mSynthesizedResponsePump->Cancel(mStatus);
+  }
 }
 
 }} // mozilla::net
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpChannelChild.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpChannelChild.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/HttpChannelChild.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/HttpChannelChild.h	2015-02-28 15:03:09.000000000 +0000
@@ -159,7 +159,7 @@
 
   // Override this channel's pending response with a synthesized one. The content will be
   // asynchronously read from the pump.
-  void OverrideWithSynthesizedResponse(nsHttpResponseHead* aResponseHead, nsInputStreamPump* aPump);
+  void OverrideWithSynthesizedResponse(nsAutoPtr<nsHttpResponseHead>& aResponseHead, nsInputStreamPump* aPump);
 
   RequestHeaderTuples mClientSetRequestHeaders;
   nsCOMPtr<nsIChildChannel> mRedirectChannelChild;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/InterceptedChannel.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/InterceptedChannel.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/InterceptedChannel.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/InterceptedChannel.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -26,8 +26,10 @@
 
 NS_IMPL_ISUPPORTS(InterceptedChannelBase, nsIInterceptedChannel)
 
-InterceptedChannelBase::InterceptedChannelBase(nsINetworkInterceptController* aController)
+InterceptedChannelBase::InterceptedChannelBase(nsINetworkInterceptController* aController,
+                                               bool aIsNavigation)
 : mController(aController)
+, mIsNavigation(aIsNavigation)
 {
 }
 
@@ -35,21 +37,36 @@
 {
 }
 
+NS_IMETHODIMP
+InterceptedChannelBase::GetResponseBody(nsIOutputStream** aStream)
+{
+  NS_IF_ADDREF(*aStream = mResponseBody);
+  return NS_OK;
+}
+
 void
 InterceptedChannelBase::EnsureSynthesizedResponse()
 {
   if (mSynthesizedResponseHead.isNothing()) {
-    mSynthesizedResponseHead.emplace();
+    mSynthesizedResponseHead.emplace(new nsHttpResponseHead());
   }
 }
 
 void
-InterceptedChannelBase::DoNotifyController(nsIOutputStream* aOut)
+InterceptedChannelBase::DoNotifyController()
 {
-    nsresult rv = mController->ChannelIntercepted(this, aOut);
+    nsresult rv = mController->ChannelIntercepted(this);
+    mController = nullptr;
     NS_ENSURE_SUCCESS_VOID(rv);
 }
 
+NS_IMETHODIMP
+InterceptedChannelBase::GetIsNavigation(bool* aIsNavigation)
+{
+  *aIsNavigation = mIsNavigation;
+  return NS_OK;
+}
+
 nsresult
 InterceptedChannelBase::DoSynthesizeHeader(const nsACString& aName, const nsACString& aValue)
 {
@@ -57,7 +74,7 @@
 
     nsAutoCString header = aName + NS_LITERAL_CSTRING(": ") + aValue;
     // Overwrite any existing header.
-    nsresult rv = mSynthesizedResponseHead->ParseHeaderLine(header.get());
+    nsresult rv = (*mSynthesizedResponseHead)->ParseHeaderLine(header.get());
     NS_ENSURE_SUCCESS(rv, rv);
     return NS_OK;
 }
@@ -65,7 +82,7 @@
 InterceptedChannelChrome::InterceptedChannelChrome(nsHttpChannel* aChannel,
                                                    nsINetworkInterceptController* aController,
                                                    nsICacheEntry* aEntry)
-: InterceptedChannelBase(aController)
+: InterceptedChannelBase(aController, aChannel->IsNavigation())
 , mChannel(aChannel)
 , mSynthesizedCacheEntry(aEntry)
 {
@@ -76,10 +93,17 @@
 {
   nsCOMPtr<nsIOutputStream> out;
 
-  nsresult rv = mSynthesizedCacheEntry->OpenOutputStream(0, getter_AddRefs(out));
+  nsresult rv = mSynthesizedCacheEntry->OpenOutputStream(0, getter_AddRefs(mResponseBody));
   NS_ENSURE_SUCCESS_VOID(rv);
 
-  DoNotifyController(out);
+  DoNotifyController();
+}
+
+NS_IMETHODIMP
+InterceptedChannelChrome::GetChannel(nsIChannel** aChannel)
+{
+  NS_IF_ADDREF(*aChannel = mChannel);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -132,7 +156,7 @@
 
   rv = DoAddCacheEntryHeaders(mChannel, mSynthesizedCacheEntry,
                               mChannel->GetRequestHead(),
-                              mSynthesizedResponseHead.ptr(), securityInfo);
+                              mSynthesizedResponseHead.ref(), securityInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIURI> uri;
@@ -156,10 +180,24 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+InterceptedChannelChrome::Cancel()
+{
+  if (!mChannel) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // we need to use AsyncAbort instead of Cancel since there's no active pump
+  // to cancel which will provide OnStart/OnStopRequest to the channel.
+  nsresult rv = mChannel->AsyncAbort(NS_BINDING_ABORTED);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return NS_OK;
+}
+
 InterceptedChannelContent::InterceptedChannelContent(HttpChannelChild* aChannel,
                                                      nsINetworkInterceptController* aController,
                                                      nsIStreamListener* aListener)
-: InterceptedChannelBase(aController)
+: InterceptedChannelBase(aController, aChannel->IsNavigation())
 , mChannel(aChannel)
 , mStreamListener(aListener)
 {
@@ -169,11 +207,18 @@
 InterceptedChannelContent::NotifyController()
 {
   nsresult rv = NS_NewPipe(getter_AddRefs(mSynthesizedInput),
-                           getter_AddRefs(mSynthesizedOutput),
+                           getter_AddRefs(mResponseBody),
                            0, UINT32_MAX, true, true);
   NS_ENSURE_SUCCESS_VOID(rv);
 
-  DoNotifyController(mSynthesizedOutput);
+  DoNotifyController();
+}
+
+NS_IMETHODIMP
+InterceptedChannelContent::GetChannel(nsIChannel** aChannel)
+{
+  NS_IF_ADDREF(*aChannel = mChannel);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -183,7 +228,7 @@
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  mSynthesizedOutput = nullptr;
+  mResponseBody = nullptr;
   mSynthesizedInput = nullptr;
 
   mChannel->ResetInterception();
@@ -194,7 +239,7 @@
 NS_IMETHODIMP
 InterceptedChannelContent::SynthesizeHeader(const nsACString& aName, const nsACString& aValue)
 {
-  if (!mSynthesizedOutput) {
+  if (!mResponseBody) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
@@ -204,7 +249,7 @@
 NS_IMETHODIMP
 InterceptedChannelContent::FinishSynthesizedResponse()
 {
-  if (!mChannel) {
+  if (NS_WARN_IF(!mChannel)) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
@@ -212,19 +257,36 @@
 
   nsresult rv = nsInputStreamPump::Create(getter_AddRefs(mStoragePump), mSynthesizedInput,
                                           int64_t(-1), int64_t(-1), 0, 0, true);
-  if (NS_FAILED(rv)) {
+  if (NS_WARN_IF(NS_FAILED(rv))) {
     mSynthesizedInput->Close();
     return rv;
   }
 
-  mSynthesizedOutput = nullptr;
+  mResponseBody = nullptr;
 
   rv = mStoragePump->AsyncRead(mStreamListener, nullptr);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mChannel->OverrideWithSynthesizedResponse(mSynthesizedResponseHead.ptr(), mStoragePump);
+  mChannel->OverrideWithSynthesizedResponse(mSynthesizedResponseHead.ref(), mStoragePump);
 
   mChannel = nullptr;
+  mStreamListener = nullptr;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+InterceptedChannelContent::Cancel()
+{
+  if (!mChannel) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // we need to use AsyncAbort instead of Cancel since there's no active pump
+  // to cancel which will provide OnStart/OnStopRequest to the channel.
+  nsresult rv = mChannel->AsyncAbort(NS_BINDING_ABORTED);
+  NS_ENSURE_SUCCESS(rv, rv);
+  mChannel = nullptr;
+  mStreamListener = nullptr;
   return NS_OK;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/InterceptedChannel.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/InterceptedChannel.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/InterceptedChannel.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/InterceptedChannel.h	2015-02-28 15:03:09.000000000 +0000
@@ -30,22 +30,32 @@
   // The interception controller to notify about the successful channel interception
   nsCOMPtr<nsINetworkInterceptController> mController;
 
+  // The stream to write the body of the synthesized response
+  nsCOMPtr<nsIOutputStream> mResponseBody;
+
   // Response head for use when synthesizing
-  Maybe<nsHttpResponseHead> mSynthesizedResponseHead;
+  Maybe<nsAutoPtr<nsHttpResponseHead>> mSynthesizedResponseHead;
+
+  // Whether this intercepted channel was performing a navigation.
+  bool mIsNavigation;
 
   void EnsureSynthesizedResponse();
-  void DoNotifyController(nsIOutputStream* aOut);
+  void DoNotifyController();
   nsresult DoSynthesizeHeader(const nsACString& aName, const nsACString& aValue);
 
   virtual ~InterceptedChannelBase();
 public:
-  explicit InterceptedChannelBase(nsINetworkInterceptController* aController);
+  InterceptedChannelBase(nsINetworkInterceptController* aController,
+                         bool aIsNavigation);
 
   // Notify the interception controller that the channel has been intercepted
   // and prepare the response body output stream.
   virtual void NotifyController() = 0;
 
   NS_DECL_ISUPPORTS
+
+  NS_IMETHOD GetResponseBody(nsIOutputStream** aOutput) MOZ_OVERRIDE;
+  NS_IMETHOD GetIsNavigation(bool* aIsNavigation) MOZ_OVERRIDE;
 };
 
 class InterceptedChannelChrome : public InterceptedChannelBase
@@ -60,7 +70,11 @@
                            nsINetworkInterceptController* aController,
                            nsICacheEntry* aEntry);
 
-  NS_DECL_NSIINTERCEPTEDCHANNEL
+  NS_IMETHOD ResetInterception() MOZ_OVERRIDE;
+  NS_IMETHOD FinishSynthesizedResponse() MOZ_OVERRIDE;
+  NS_IMETHOD GetChannel(nsIChannel** aChannel) MOZ_OVERRIDE;
+  NS_IMETHOD SynthesizeHeader(const nsACString& aName, const nsACString& aValue) MOZ_OVERRIDE;
+  NS_IMETHOD Cancel() MOZ_OVERRIDE;
 
   virtual void NotifyController() MOZ_OVERRIDE;
 };
@@ -70,8 +84,7 @@
   // The actual channel being intercepted.
   nsRefPtr<HttpChannelChild> mChannel;
 
-  // Writeable buffer for use when synthesizing a response in a child process
-  nsCOMPtr<nsIOutputStream> mSynthesizedOutput;
+  // Reader-side of the response body when synthesizing in a child proces
   nsCOMPtr<nsIInputStream> mSynthesizedInput;
 
   // Pump to read the synthesized body in child processes
@@ -85,7 +98,11 @@
                             nsINetworkInterceptController* aController,
                             nsIStreamListener* aListener);
 
-  NS_DECL_NSIINTERCEPTEDCHANNEL
+  NS_IMETHOD ResetInterception() MOZ_OVERRIDE;
+  NS_IMETHOD FinishSynthesizedResponse() MOZ_OVERRIDE;
+  NS_IMETHOD GetChannel(nsIChannel** aChannel) MOZ_OVERRIDE;
+  NS_IMETHOD SynthesizeHeader(const nsACString& aName, const nsACString& aValue) MOZ_OVERRIDE;
+  NS_IMETHOD Cancel() MOZ_OVERRIDE;
 
   virtual void NotifyController() MOZ_OVERRIDE;
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpChannel.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpChannel.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpChannel.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpChannel.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -791,13 +791,10 @@
     nsCOMPtr<nsIInterfaceRequestor> callbacks;
     NS_NewNotificationCallbacksAggregation(mCallbacks, mLoadGroup,
                                            getter_AddRefs(callbacks));
-    if (!callbacks)
-        return NS_ERROR_OUT_OF_MEMORY;
 
     // create the transaction object
     mTransaction = new nsHttpTransaction();
-    if (!mTransaction)
-        return NS_ERROR_OUT_OF_MEMORY;
+    LOG(("nsHttpChannel %p created nsHttpTransaction %p\n", this, mTransaction.get()));
 
     // See bug #466080. Transfer LOAD_ANONYMOUS flag to socket-layer.
     if (mLoadFlags & LOAD_ANONYMOUS)
@@ -2854,6 +2851,15 @@
     return NS_OK;
 }
 
+void
+nsHttpChannel::UntieValidationRequest()
+{
+    // Make the request unconditional again.
+    mRequestHead.ClearHeader(nsHttp::If_Modified_Since);
+    mRequestHead.ClearHeader(nsHttp::If_None_Match);
+    mRequestHead.ClearHeader(nsHttp::ETag);
+}
+
 NS_IMETHODIMP
 nsHttpChannel::OnCacheEntryCheck(nsICacheEntry* entry, nsIApplicationCache* appCache,
                                  uint32_t* aResult)
@@ -3205,10 +3211,7 @@
             // If we can't get the entity then we have to act as though we
             // don't have the cache entry.
             if (mDidReval) {
-                // Make the request unconditional again.
-                mRequestHead.ClearHeader(nsHttp::If_Modified_Since);
-                mRequestHead.ClearHeader(nsHttp::If_None_Match);
-                mRequestHead.ClearHeader(nsHttp::ETag);
+                UntieValidationRequest();
                 mDidReval = false;
             }
             mCachedContentIsValid = false;
@@ -3299,12 +3302,14 @@
         return NS_ERROR_DOCUMENT_NOT_CACHED;
     }
 
-    if (NS_FAILED(rv))
-      return rv;
+    if (NS_FAILED(rv)) {
+        return rv;
+    }
 
     // We may be waiting for more callbacks...
-    if (AwaitingCacheCallbacks())
-      return NS_OK;
+    if (AwaitingCacheCallbacks()) {
+        return NS_OK;
+    }
 
     return ContinueConnect();
 }
@@ -3321,6 +3326,14 @@
         // between OnCacheEntryCheck and OnCacheEntryAvailable.
         mCachedContentIsValid = false;
 
+        // From the same reason remove any conditional headers added
+        // in OnCacheEntryCheck.
+        if (mDidReval) {
+            LOG(("  Removing conditional request headers"));
+            UntieValidationRequest();
+            mDidReval = false;
+        }
+
         if (mLoadFlags & LOAD_ONLY_FROM_CACHE) {
             // if this channel is only allowed to pull from the cache, then
             // we must fail if we were unable to open a cache entry for read.
@@ -4224,12 +4237,14 @@
         do_CreateInstance(kStreamListenerTeeCID, &rv);
     if (NS_FAILED(rv)) return rv;
 
-    nsCOMPtr<nsICacheStorageService> serv =
-        do_GetService("@mozilla.org/netwerk/cache-storage-service;1", &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-
     nsCOMPtr<nsIEventTarget> cacheIOTarget;
-    serv->GetIoTarget(getter_AddRefs(cacheIOTarget));
+    if (!CacheObserver::UseNewCache()) {
+        nsCOMPtr<nsICacheStorageService> serv =
+            do_GetService("@mozilla.org/netwerk/cache-storage-service;1", &rv);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        serv->GetIoTarget(getter_AddRefs(cacheIOTarget));
+    }
 
     if (!cacheIOTarget) {
         LOG(("nsHttpChannel::InstallCacheListener sync tee %p rv=%x "
@@ -5137,10 +5152,8 @@
 
 NS_IMETHODIMP
 nsHttpChannel::GetDomainLookupStart(TimeStamp* _retval) {
-    if (mDNSPrefetch && mDNSPrefetch->TimingsValid())
-        *_retval = mDNSPrefetch->StartTimestamp();
-    else if (mTransaction)
-        *_retval = mTransaction->Timings().domainLookupStart;
+    if (mTransaction)
+        *_retval = mTransaction->GetDomainLookupStart();
     else
         *_retval = mTransactionTimings.domainLookupStart;
     return NS_OK;
@@ -5148,10 +5161,8 @@
 
 NS_IMETHODIMP
 nsHttpChannel::GetDomainLookupEnd(TimeStamp* _retval) {
-    if (mDNSPrefetch && mDNSPrefetch->TimingsValid())
-        *_retval = mDNSPrefetch->EndTimestamp();
-    else if (mTransaction)
-        *_retval = mTransaction->Timings().domainLookupEnd;
+    if (mTransaction)
+        *_retval = mTransaction->GetDomainLookupEnd();
     else
         *_retval = mTransactionTimings.domainLookupEnd;
     return NS_OK;
@@ -5160,7 +5171,7 @@
 NS_IMETHODIMP
 nsHttpChannel::GetConnectStart(TimeStamp* _retval) {
     if (mTransaction)
-        *_retval = mTransaction->Timings().connectStart;
+        *_retval = mTransaction->GetConnectStart();
     else
         *_retval = mTransactionTimings.connectStart;
     return NS_OK;
@@ -5169,7 +5180,7 @@
 NS_IMETHODIMP
 nsHttpChannel::GetConnectEnd(TimeStamp* _retval) {
     if (mTransaction)
-        *_retval = mTransaction->Timings().connectEnd;
+        *_retval = mTransaction->GetConnectEnd();
     else
         *_retval = mTransactionTimings.connectEnd;
     return NS_OK;
@@ -5178,7 +5189,7 @@
 NS_IMETHODIMP
 nsHttpChannel::GetRequestStart(TimeStamp* _retval) {
     if (mTransaction)
-        *_retval = mTransaction->Timings().requestStart;
+        *_retval = mTransaction->GetRequestStart();
     else
         *_retval = mTransactionTimings.requestStart;
     return NS_OK;
@@ -5187,7 +5198,7 @@
 NS_IMETHODIMP
 nsHttpChannel::GetResponseStart(TimeStamp* _retval) {
     if (mTransaction)
-        *_retval = mTransaction->Timings().responseStart;
+        *_retval = mTransaction->GetResponseStart();
     else
         *_retval = mTransactionTimings.responseStart;
     return NS_OK;
@@ -5196,7 +5207,7 @@
 NS_IMETHODIMP
 nsHttpChannel::GetResponseEnd(TimeStamp* _retval) {
     if (mTransaction)
-        *_retval = mTransaction->Timings().responseEnd;
+        *_retval = mTransaction->GetResponseEnd();
     else
         *_retval = mTransactionTimings.responseEnd;
     return NS_OK;
@@ -5482,7 +5493,11 @@
         mTransactionPump = nullptr;
 
         // We no longer need the dns prefetch object
-        if (mDNSPrefetch && mDNSPrefetch->TimingsValid()) {
+        if (mDNSPrefetch && mDNSPrefetch->TimingsValid()
+            && !mTransactionTimings.requestStart.IsNull()
+            && mDNSPrefetch->EndTimestamp() <= mTransactionTimings.requestStart) {
+            // We only need the domainLookup timestamps when not using a
+            // persistent connection, meaning if the endTimestamp < requestStart
             mTransactionTimings.domainLookupStart =
                 mDNSPrefetch->StartTimestamp();
             mTransactionTimings.domainLookupEnd =
@@ -6425,11 +6440,15 @@
 
     // We no longer need the dns prefetch object. Note: mDNSPrefetch could be
     // validly null if OnStopRequest has already been called.
-    if (mDNSPrefetch && mDNSPrefetch->TimingsValid()) {
-        mTransactionTimings.domainLookupStart =
-            mDNSPrefetch->StartTimestamp();
-        mTransactionTimings.domainLookupEnd =
-            mDNSPrefetch->EndTimestamp();
+    // We only need the domainLookup timestamps when not loading from cache
+    if (mDNSPrefetch && mDNSPrefetch->TimingsValid() && mTransaction) {
+        TimeStamp requestStart = mTransaction->GetRequestStart();
+        // We only set the domainLookup timestamps if we're not using a
+        // persistent connection.
+        if (requestStart.IsNull() || (mDNSPrefetch->EndTimestamp() < requestStart)) {
+            mTransaction->SetDomainLookupStart(mDNSPrefetch->StartTimestamp());
+            mTransaction->SetDomainLookupEnd(mDNSPrefetch->EndTimestamp());
+        }
     }
     mDNSPrefetch = nullptr;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpChannel.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpChannel.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpChannel.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpChannel.h	2015-02-28 15:03:09.000000000 +0000
@@ -368,6 +368,7 @@
                                         bool ignoreMissingPartialLen = false);
     nsresult SetupByteRangeRequest(int64_t partialLen);
     void UntieByteRangeRequest();
+    void UntieValidationRequest();
     nsresult OpenCacheInputStream(nsICacheEntry* cacheEntry, bool startBuffering,
                                   bool checkingAppCacheEntry);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpConnectionMgr.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1207,7 +1207,7 @@
         }
 
         rv = TryDispatchTransaction(ent,
-                                    alreadyHalfOpen || trans->DontRouteViaWildCard(),
+                                    alreadyHalfOpen || !!trans->TunnelProvider(),
                                     trans);
         if (NS_SUCCEEDED(rv) || (rv != NS_ERROR_NOT_AVAILABLE)) {
             if (NS_SUCCEEDED(rv))
@@ -1734,10 +1734,12 @@
 {
     MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
     LOG(("nsHttpConnectionMgr::TryDispatchTransaction without conn "
-         "[trans=%p ci=%s caps=%x wildcardok=%d onlyreused=%d]\n",
-         trans, ent->mConnInfo->HashKey().get(),
-         uint32_t(trans->Caps()), !trans->DontRouteViaWildCard(),
-         onlyReusedConnection));
+         "[trans=%p ci=%p ci=%s caps=%x tunnelprovider=%p onlyreused=%d "
+         "active=%d idle=%d]\n", trans,
+         ent->mConnInfo.get(), ent->mConnInfo->HashKey().get(),
+         uint32_t(trans->Caps()), trans->TunnelProvider(),
+         onlyReusedConnection, ent->mActiveConns.Length(),
+         ent->mIdleConns.Length()));
 
     nsHttpTransaction::Classifier classification = trans->Classification();
     uint32_t caps = trans->Caps();
@@ -1792,7 +1794,8 @@
                 if (NS_SUCCEEDED(loadGroupCI->GetBlockingTransactionCount(&blockers)) &&
                     blockers) {
                     // need to wait for blockers to clear
-                    LOG(("   blocked by load group: [blockers=%d]\n", blockers));
+                    LOG(("   blocked by load group: [lgci=%p trans=%p blockers=%d]\n",
+                         loadGroupCI, trans, blockers));
                     return NS_ERROR_NOT_AVAILABLE;
                 }
             }
@@ -1810,6 +1813,7 @@
         if (AddToShortestPipeline(ent, trans,
                                   classification,
                                   mMaxOptimisticPipelinedRequests)) {
+            LOG(("   dispatched step 1 trans=%p\n", trans));
             return NS_OK;
         }
     }
@@ -1826,7 +1830,7 @@
         ((mNumActiveConns - mNumSpdyActiveConns) >= gHttpHandler->RequestTokenBucketMinParallelism()) &&
         !(caps & (NS_HTTP_LOAD_AS_BLOCKING | NS_HTTP_LOAD_UNBLOCKED))) {
         if (!trans->TryToRunPacedRequest()) {
-            LOG(("   blocked due to rate pacing\n"));
+            LOG(("   blocked due to rate pacing trans=%p\n", trans));
             return NS_ERROR_NOT_AVAILABLE;
         }
     }
@@ -1863,6 +1867,7 @@
             // the transaction dispatched on it.
             AddActiveConn(conn, ent);
             DispatchTransaction(ent, trans, conn);
+            LOG(("   dispatched step 2 (idle) trans=%p\n", trans));
             return NS_OK;
         }
     }
@@ -1876,6 +1881,7 @@
         if (AddToShortestPipeline(ent, trans,
                                   classification,
                                   mMaxOptimisticPipelinedRequests)) {
+            LOG(("   dispatched step 3 (pipeline) trans=%p\n", trans));
             return NS_OK;
         }
     }
@@ -1885,14 +1891,20 @@
         nsresult rv = MakeNewConnection(ent, trans);
         if (NS_SUCCEEDED(rv)) {
             // this function returns NOT_AVAILABLE for asynchronous connects
+            LOG(("   dispatched step 4 (async new conn) trans=%p\n", trans));
             return NS_ERROR_NOT_AVAILABLE;
         }
 
         if (rv != NS_ERROR_NOT_AVAILABLE) {
             // not available return codes should try next step as they are
             // not hard errors. Other codes should stop now
+            LOG(("   failed step 4 (%x) trans=%p\n", rv, trans));
             return rv;
         }
+    } else if (trans->TunnelProvider() && trans->TunnelProvider()->MaybeReTunnel(trans)) {
+        LOG(("   sort of dispatched step 4a tunnel requeue trans=%p\n", trans));
+        // the tunnel provider took responsibility for making a new tunnel
+        return NS_OK;
     }
 
     // step 5
@@ -1900,6 +1912,7 @@
         if (AddToShortestPipeline(ent, trans,
                                   classification,
                                   mMaxPipelinedRequests)) {
+            LOG(("   dispatched step 5 trans=%p\n", trans));
             return NS_OK;
         }
     }
@@ -1912,6 +1925,7 @@
         unusedSpdyPersistentConnection->DontReuse();
     }
 
+    LOG(("   not dispatched (queued) trans=%p\n", trans));
     return NS_ERROR_NOT_AVAILABLE;                /* queue it */
 }
 
@@ -2101,7 +2115,7 @@
     MOZ_ASSERT(ci);
 
     nsConnectionEntry *ent =
-        GetOrCreateConnectionEntry(ci, trans->DontRouteViaWildCard());
+        GetOrCreateConnectionEntry(ci, !!trans->TunnelProvider());
 
     // SPDY coalescing of hostnames means we might redirect from this
     // connection entry onto the preferred one.
@@ -2145,7 +2159,7 @@
         trans->SetConnection(nullptr);
         rv = DispatchTransaction(ent, trans, conn);
     } else {
-        rv = TryDispatchTransaction(ent, trans->DontRouteViaWildCard(), trans);
+        rv = TryDispatchTransaction(ent, !!trans->TunnelProvider(), trans);
     }
 
     if (NS_SUCCEEDED(rv)) {
@@ -2797,7 +2811,7 @@
 {
     MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
     LOG(("nsHttpConnectionMgr::ActivateTimeoutTick() "
-         "this=%p mTimeoutTick=%p\n"));
+         "this=%p mTimeoutTick=%p\n", this, mTimeoutTick.get()));
 
     // The timer tick should be enabled if it is not already pending.
     // Upon running the tick will rearm itself if there are active
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpHandler.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpHandler.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -208,7 +208,7 @@
     , mTCPKeepaliveShortLivedIdleTimeS(10)
     , mTCPKeepaliveLongLivedEnabled(false)
     , mTCPKeepaliveLongLivedIdleTimeS(600)
-    , mEnforceH1Framing(false)
+    , mEnforceH1Framing(FRAMECHECK_BARELY)
 {
 #if defined(PR_LOGGING)
     gHttpLog = PR_NewLogModule("nsHttp");
@@ -1524,10 +1524,18 @@
                                                       1, kMaxTCPKeepIdle);
     }
 
-    if (PREF_CHANGED(HTTP_PREF("enforce-framing.http1"))) {
+    if (PREF_CHANGED(HTTP_PREF("enforce-framing.http1")) ||
+        PREF_CHANGED(HTTP_PREF("enforce-framing.soft")) ) {
         rv = prefs->GetBoolPref(HTTP_PREF("enforce-framing.http1"), &cVar);
-        if (NS_SUCCEEDED(rv)) {
-            mEnforceH1Framing = cVar;
+        if (NS_SUCCEEDED(rv) && cVar) {
+            mEnforceH1Framing = FRAMECHECK_STRICT;
+        } else {
+            rv = prefs->GetBoolPref(HTTP_PREF("enforce-framing.soft"), &cVar);
+            if (NS_SUCCEEDED(rv) && cVar) {
+                mEnforceH1Framing = FRAMECHECK_BARELY;
+            } else {
+                mEnforceH1Framing = FRAMECHECK_LAX;
+            }
         }
     }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpHandler.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpHandler.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpHandler.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpHandler.h	2015-02-28 15:03:09.000000000 +0000
@@ -39,6 +39,12 @@
 class nsHttpTransaction;
 class AltSvcMapping;
 
+enum FrameCheckLevel {
+    FRAMECHECK_LAX,
+    FRAMECHECK_BARELY,
+    FRAMECHECK_STRICT
+};
+
 //-----------------------------------------------------------------------------
 // nsHttpHandler - protocol handler for HTTP and HTTPS
 //-----------------------------------------------------------------------------
@@ -151,8 +157,9 @@
       return mTCPKeepaliveLongLivedIdleTimeS;
     }
 
-    // returns the network.http.enforce-framing.http1 preference
-    bool GetEnforceH1Framing() { return mEnforceH1Framing; }
+    // returns the HTTP framing check level preference, as controlled with
+    // network.http.enforce-framing.http1 and network.http.enforce-framing.soft
+    FrameCheckLevel GetEnforceH1Framing() { return mEnforceH1Framing; }
 
     nsHttpAuthCache     *AuthCache(bool aPrivate) {
         return aPrivate ? &mPrivateAuthCache : &mAuthCache;
@@ -531,7 +538,7 @@
 
     // if true, generate NS_ERROR_PARTIAL_TRANSFER for h1 responses with
     // incorrect content lengths or malformed chunked encodings
-    bool mEnforceH1Framing;
+    FrameCheckLevel mEnforceH1Framing;
 
 private:
     // For Rate Pacing Certain Network Events. Only assign this pointer on
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpTransaction.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpTransaction.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpTransaction.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpTransaction.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -123,9 +123,10 @@
     , mPreserveStream(false)
     , mDispatchedAsBlocking(false)
     , mResponseTimeoutEnabled(true)
-    , mDontRouteViaWildCard(false)
     , mForceRestart(false)
     , mReuseOnRestart(false)
+    , mContentDecoding(false)
+    , mContentDecodingCheck(false)
     , mReportedStart(false)
     , mReportedResponseHeader(false)
     , mForTakeResponseHead(nullptr)
@@ -510,15 +511,20 @@
     LOG(("nsHttpTransaction::OnSocketStatus [this=%p status=%x progress=%lld]\n",
         this, status, progress));
 
-    if (TimingEnabled()) {
+    // If the timing is enabled, and we are not using a persistent connection
+    // then the requestStart timestamp will be null, so we mark the timestamps
+    // for domainLookupStart/End and connectStart/End
+    // If we are using a persistent connection they will remain null,
+    // and the correct value will be returned in nsPerformance.
+    if (TimingEnabled() && GetRequestStart().IsNull()) {
         if (status == NS_NET_STATUS_RESOLVING_HOST) {
-            mTimings.domainLookupStart = TimeStamp::Now();
+            SetDomainLookupStart(TimeStamp::Now());
         } else if (status == NS_NET_STATUS_RESOLVED_HOST) {
-            mTimings.domainLookupEnd = TimeStamp::Now();
+            SetDomainLookupEnd(TimeStamp::Now());
         } else if (status == NS_NET_STATUS_CONNECTING_TO) {
-            mTimings.connectStart = TimeStamp::Now();
+            SetConnectStart(TimeStamp::Now());
         } else if (status == NS_NET_STATUS_CONNECTED_TO) {
-            mTimings.connectEnd = TimeStamp::Now();
+            SetConnectEnd(TimeStamp::Now());
         }
     }
 
@@ -633,9 +639,9 @@
     nsresult rv = trans->mReader->OnReadSegment(buf, count, countRead);
     if (NS_FAILED(rv)) return rv;
 
-    if (trans->TimingEnabled() && trans->mTimings.requestStart.IsNull()) {
-        // First data we're sending -> this is requestStart
-        trans->mTimings.requestStart = TimeStamp::Now();
+    if (trans->TimingEnabled()) {
+        // Set the timestamp to Now(), only if it null
+        trans->SetRequestStart(TimeStamp::Now(), true);
     }
 
     if (!trans->mSentData) {
@@ -703,8 +709,9 @@
     if (trans->mTransactionDone)
         return NS_BASE_STREAM_CLOSED; // stop iterating
 
-    if (trans->TimingEnabled() && trans->mTimings.responseStart.IsNull()) {
-        trans->mTimings.responseStart = TimeStamp::Now();
+    if (trans->TimingEnabled()) {
+        // Set the timestamp to Now(), only if it null
+        trans->SetResponseStart(TimeStamp::Now(), true);
     }
 
     nsresult rv;
@@ -848,6 +855,7 @@
     if (mConnection)
         connReused = mConnection->IsReused();
     mConnected = false;
+    mTunnelProvider = nullptr;
 
     //
     // if the connection was reset or closed before we wrote any part of the
@@ -909,11 +917,17 @@
 
         NS_WARNING("Partial transfer, incomplete HTTP response received");
 
-        if ((mHttpVersion >= NS_HTTP_VERSION_1_1) &&
-            gHttpHandler->GetEnforceH1Framing()) {
-            reason = NS_ERROR_NET_PARTIAL_TRANSFER;
-            LOG(("Partial transfer, incomplete HTTP response received: %s",
-                 mChunkedDecoder ? "broken chunk" : "c-l underrun"));
+        if (mHttpVersion >= NS_HTTP_VERSION_1_1) {
+            FrameCheckLevel clevel = gHttpHandler->GetEnforceH1Framing();
+            if (clevel >= FRAMECHECK_BARELY) {
+                if ((clevel == FRAMECHECK_STRICT) ||
+                    (mChunkedDecoder && mChunkedDecoder->GetChunkRemaining()) ||
+                    (!mChunkedDecoder && !mContentDecoding && mContentDecodingCheck) ) {
+                    reason = NS_ERROR_NET_PARTIAL_TRANSFER;
+                    LOG(("Partial transfer, incomplete HTTP response received: %s",
+                         mChunkedDecoder ? "broken chunk" : "c-l underrun"));
+                }
+            }
         }
 
         if (mConnection) {
@@ -964,9 +978,12 @@
     // mTimings.responseEnd is normally recorded based on the end of a
     // HTTP delimiter such as chunked-encodings or content-length. However,
     // EOF or an error still require an end time be recorded.
-    if (TimingEnabled() &&
-        mTimings.responseEnd.IsNull() && !mTimings.responseStart.IsNull())
-        mTimings.responseEnd = TimeStamp::Now();
+    if (TimingEnabled()) {
+        const TimingStruct timings = Timings();
+        if (timings.responseEnd.IsNull() && !timings.responseStart.IsNull()) {
+            SetResponseEnd(TimeStamp::Now());
+        }
+    }
 
     if (relConn && mConnection) {
         MutexAutoLock lock(mLock);
@@ -1123,7 +1140,7 @@
     }
 
     LOG(("restarting transaction @%p\n", this));
-    SetDontRouteViaWildCard(false);
+    mTunnelProvider = nullptr;
 
     // rewind streams in case we already wrote out the request
     nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mRequestStream);
@@ -1647,8 +1664,9 @@
         mResponseIsComplete = true;
         ReleaseBlockingTransaction();
 
-        if (TimingEnabled())
-            mTimings.responseEnd = TimeStamp::Now();
+        if (TimingEnabled()) {
+            SetResponseEnd(TimeStamp::Now());
+        }
 
         // report the entire response has arrived
         if (mActivityDistributor)
@@ -1736,6 +1754,12 @@
             MOZ_ASSERT(mConnection);
             mConnection->PushBack(buf + *countRead, countRemaining);
         }
+
+        if (!mContentDecodingCheck && mResponseHead) {
+            mContentDecoding =
+                !!mResponseHead->PeekHeader(nsHttp::Content_Encoding);
+            mContentDecodingCheck = true;
+        }
     }
 
     return NS_OK;
@@ -1758,6 +1782,14 @@
     mClassification = CLASS_SOLO;
 }
 
+
+void
+nsHttpTransaction::SetLoadGroupConnectionInfo(nsILoadGroupConnectionInfo *aLoadGroupCI)
+{
+    LOG(("nsHttpTransaction %p SetLoadGroupConnectionInfo %p\n", this, aLoadGroupCI));
+    mLoadGroupCI = aLoadGroupCI;
+}
+
 // Called when the transaction marked for blocking is associated with a connection
 // (i.e. added to a new h1 conn, an idle http connection, or placed into
 // a http pipeline). It is safe to call this multiple times with it only
@@ -1773,7 +1805,7 @@
     if (!mLoadGroupCI)
         return;
 
-    LOG(("nsHttpTransaction adding blocking channel %p from "
+    LOG(("nsHttpTransaction adding blocking transaction %p from "
          "loadgroup %p\n", this, mLoadGroupCI.get()));
 
     mLoadGroupCI->AddBlockingTransaction();
@@ -1789,13 +1821,13 @@
     uint32_t blockers = 0;
     nsresult rv = mLoadGroupCI->RemoveBlockingTransaction(&blockers);
 
-    LOG(("nsHttpTransaction removing blocking channel %p from "
+    LOG(("nsHttpTransaction removing blocking transaction %p from "
          "loadgroup %p. %d blockers remain.\n", this,
          mLoadGroupCI.get(), blockers));
 
     if (NS_SUCCEEDED(rv) && !blockers) {
-        LOG(("nsHttpTransaction %p triggering release of blocked channels.\n",
-             this));
+        LOG(("nsHttpTransaction %p triggering release of blocked channels "
+             " with loadgroupci=%p\n", this, mLoadGroupCI.get()));
         gHttpHandler->ConnMgr()->ProcessPendingQ();
     }
 
@@ -1806,6 +1838,8 @@
 nsHttpTransaction::ReleaseBlockingTransaction()
 {
     RemoveDispatchedAsBlocking();
+    LOG(("nsHttpTransaction %p loadgroupci set to null "
+         "in ReleaseBlockingTransaction() - was %p\n", this, mLoadGroupCI.get()));
     mLoadGroupCI = nullptr;
 }
 
@@ -1820,6 +1854,133 @@
     }
 }
 
+const TimingStruct
+nsHttpTransaction::Timings()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    TimingStruct timings = mTimings;
+    return timings;
+}
+
+void
+nsHttpTransaction::SetDomainLookupStart(mozilla::TimeStamp timeStamp, bool onlyIfNull)
+{
+    mozilla::MutexAutoLock lock(mLock);
+    if (onlyIfNull && !mTimings.domainLookupStart.IsNull()) {
+        return; // We only set the timestamp if it was previously null
+    }
+    mTimings.domainLookupStart = timeStamp;
+}
+
+void
+nsHttpTransaction::SetDomainLookupEnd(mozilla::TimeStamp timeStamp, bool onlyIfNull)
+{
+    mozilla::MutexAutoLock lock(mLock);
+    if (onlyIfNull && !mTimings.domainLookupEnd.IsNull()) {
+        return; // We only set the timestamp if it was previously null
+    }
+    mTimings.domainLookupEnd = timeStamp;
+}
+
+void
+nsHttpTransaction::SetConnectStart(mozilla::TimeStamp timeStamp, bool onlyIfNull)
+{
+    mozilla::MutexAutoLock lock(mLock);
+    if (onlyIfNull && !mTimings.connectStart.IsNull()) {
+        return; // We only set the timestamp if it was previously null
+    }
+    mTimings.connectStart = timeStamp;
+}
+
+void
+nsHttpTransaction::SetConnectEnd(mozilla::TimeStamp timeStamp, bool onlyIfNull)
+{
+    mozilla::MutexAutoLock lock(mLock);
+    if (onlyIfNull && !mTimings.connectEnd.IsNull()) {
+        return; // We only set the timestamp if it was previously null
+    }
+    mTimings.connectEnd = timeStamp;
+}
+
+void
+nsHttpTransaction::SetRequestStart(mozilla::TimeStamp timeStamp, bool onlyIfNull)
+{
+    mozilla::MutexAutoLock lock(mLock);
+    if (onlyIfNull && !mTimings.requestStart.IsNull()) {
+        return; // We only set the timestamp if it was previously null
+    }
+    mTimings.requestStart = timeStamp;
+}
+
+void
+nsHttpTransaction::SetResponseStart(mozilla::TimeStamp timeStamp, bool onlyIfNull)
+{
+    mozilla::MutexAutoLock lock(mLock);
+    if (onlyIfNull && !mTimings.responseStart.IsNull()) {
+        return; // We only set the timestamp if it was previously null
+    }
+    mTimings.responseStart = timeStamp;
+}
+
+void
+nsHttpTransaction::SetResponseEnd(mozilla::TimeStamp timeStamp, bool onlyIfNull)
+{
+    mozilla::MutexAutoLock lock(mLock);
+    if (onlyIfNull && !mTimings.responseEnd.IsNull()) {
+        return; // We only set the timestamp if it was previously null
+    }
+    mTimings.responseEnd = timeStamp;
+}
+
+mozilla::TimeStamp
+nsHttpTransaction::GetDomainLookupStart()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    return mTimings.domainLookupStart;
+}
+
+mozilla::TimeStamp
+nsHttpTransaction::GetDomainLookupEnd()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    return mTimings.domainLookupEnd;
+}
+
+mozilla::TimeStamp
+nsHttpTransaction::GetConnectStart()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    return mTimings.connectStart;
+}
+
+mozilla::TimeStamp
+nsHttpTransaction::GetConnectEnd()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    return mTimings.connectEnd;
+}
+
+mozilla::TimeStamp
+nsHttpTransaction::GetRequestStart()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    return mTimings.requestStart;
+}
+
+mozilla::TimeStamp
+nsHttpTransaction::GetResponseStart()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    return mTimings.responseStart;
+}
+
+mozilla::TimeStamp
+nsHttpTransaction::GetResponseEnd()
+{
+    mozilla::MutexAutoLock lock(mLock);
+    return mTimings.responseEnd;
+}
+
 //-----------------------------------------------------------------------------
 // nsHttpTransaction deletion event
 //-----------------------------------------------------------------------------
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpTransaction.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpTransaction.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/nsHttpTransaction.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/nsHttpTransaction.h	2015-02-28 15:03:09.000000000 +0000
@@ -107,13 +107,6 @@
 
     bool      ProxyConnectFailed() { return mProxyConnectFailed; }
 
-    // setting mDontRouteViaWildCard to true means the transaction should only
-    // be dispatched on a specific ConnectionInfo Hash Key (as opposed to a
-    // generic wild card one). That means in the specific case of carrying this
-    // transaction on an HTTP/2 tunnel it will only be dispatched onto an
-    // existing tunnel instead of triggering creation of a new one.
-    void SetDontRouteViaWildCard(bool var) { mDontRouteViaWildCard = var; }
-    bool DontRouteViaWildCard() { return mDontRouteViaWildCard; }
     void EnableKeepAlive() { mCaps |= NS_HTTP_ALLOW_KEEPALIVE; }
     void MakeSticky() { mCaps |= NS_HTTP_STICKY_CONNECTION; }
 
@@ -121,7 +114,6 @@
     void    SetPriority(int32_t priority) { mPriority = priority; }
     int32_t    Priority()                 { return mPriority; }
 
-    const TimingStruct& Timings() const { return mTimings; }
     enum Classifier Classification() { return mClassification; }
 
     void PrintDiagnostics(nsCString &log);
@@ -133,7 +125,7 @@
 
     // overload of nsAHttpTransaction::LoadGroupConnectionInfo()
     nsILoadGroupConnectionInfo *LoadGroupConnectionInfo() MOZ_OVERRIDE { return mLoadGroupCI.get(); }
-    void SetLoadGroupConnectionInfo(nsILoadGroupConnectionInfo *aLoadGroupCI) { mLoadGroupCI = aLoadGroupCI; }
+    void SetLoadGroupConnectionInfo(nsILoadGroupConnectionInfo *aLoadGroupCI);
     void DispatchedAsBlocking();
     void RemoveDispatchedAsBlocking();
 
@@ -148,6 +140,24 @@
     }
     void SetPushedStream(Http2PushedStream *push) { mPushedStream = push; }
 
+    // Locked methods to get and set timing info
+    const TimingStruct Timings();
+    void SetDomainLookupStart(mozilla::TimeStamp timeStamp, bool onlyIfNull = false);
+    void SetDomainLookupEnd(mozilla::TimeStamp timeStamp, bool onlyIfNull = false);
+    void SetConnectStart(mozilla::TimeStamp timeStamp, bool onlyIfNull = false);
+    void SetConnectEnd(mozilla::TimeStamp timeStamp, bool onlyIfNull = false);
+    void SetRequestStart(mozilla::TimeStamp timeStamp, bool onlyIfNull = false);
+    void SetResponseStart(mozilla::TimeStamp timeStamp, bool onlyIfNull = false);
+    void SetResponseEnd(mozilla::TimeStamp timeStamp, bool onlyIfNull = false);
+
+    mozilla::TimeStamp GetDomainLookupStart();
+    mozilla::TimeStamp GetDomainLookupEnd();
+    mozilla::TimeStamp GetConnectStart();
+    mozilla::TimeStamp GetConnectEnd();
+    mozilla::TimeStamp GetRequestStart();
+    mozilla::TimeStamp GetResponseStart();
+    mozilla::TimeStamp GetResponseEnd();
+
 private:
     friend class DeleteHttpTransaction;
     virtual ~nsHttpTransaction();
@@ -282,9 +292,10 @@
     bool                            mPreserveStream;
     bool                            mDispatchedAsBlocking;
     bool                            mResponseTimeoutEnabled;
-    bool                            mDontRouteViaWildCard;
     bool                            mForceRestart;
     bool                            mReuseOnRestart;
+    bool                            mContentDecoding;
+    bool                            mContentDecodingCheck;
 
     // mClosed           := transaction has been explicitly closed
     // mTransactionDone  := transaction ran to completion or was interrupted
@@ -414,6 +425,21 @@
     uint32_t ClassOfService() { return mClassOfService; }
 private:
     uint32_t mClassOfService;
+
+public:
+    // setting TunnelProvider to non-null means the transaction should only
+    // be dispatched on a specific ConnectionInfo Hash Key (as opposed to a
+    // generic wild card one). That means in the specific case of carrying this
+    // transaction on an HTTP/2 tunnel it will only be dispatched onto an
+    // existing tunnel instead of triggering creation of a new one.
+    // The tunnel provider is used for ASpdySession::MaybeReTunnel() checks.
+
+    void SetTunnelProvider(ASpdySession *provider) { mTunnelProvider = provider; }
+    ASpdySession *TunnelProvider() { return mTunnelProvider; }
+    nsIInterfaceRequestor *SecurityCallbacks() { return mCallbacks; }
+
+private:
+    nsRefPtr<ASpdySession> mTunnelProvider;
 };
 
 }} // namespace mozilla::net
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/SpdySession31.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/SpdySession31.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/SpdySession31.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/SpdySession31.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -2712,12 +2712,29 @@
 }
 
 void
+SpdySession31::CreateTunnel(nsHttpTransaction *trans,
+                            nsHttpConnectionInfo *ci,
+                            nsIInterfaceRequestor *aCallbacks)
+{
+  LOG(("SpdySession31::CreateTunnel %p %p make new tunnel\n", this, trans));
+  // The connect transaction will hold onto the underlying http
+  // transaction so that an auth created by the connect can be mappped
+  // to the correct security callbacks
+
+  nsRefPtr<SpdyConnectTransaction> connectTrans =
+    new SpdyConnectTransaction(ci, aCallbacks, trans->Caps(), trans, this);
+  AddStream(connectTrans, nsISupportsPriority::PRIORITY_NORMAL, false, nullptr);
+  SpdyStream31 *tunnel = mStreamTransactionHash.Get(connectTrans);
+  MOZ_ASSERT(tunnel);
+  RegisterTunnel(tunnel);
+}
+
+void
 SpdySession31::DispatchOnTunnel(nsAHttpTransaction *aHttpTransaction,
                                 nsIInterfaceRequestor *aCallbacks)
 {
   MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
   nsHttpTransaction *trans = aHttpTransaction->QueryHttpTransaction();
-  nsHttpConnectionInfo *ci = aHttpTransaction->ConnectionInfo();
   MOZ_ASSERT(trans);
 
   LOG3(("SpdySession31::DispatchOnTunnel %p trans=%p", this, trans));
@@ -2726,33 +2743,57 @@
 
   // this transaction has done its work of setting up a tunnel, let
   // the connection manager queue it if necessary
-  trans->SetDontRouteViaWildCard(true);
+  trans->SetTunnelProvider(this);
   trans->EnableKeepAlive();
 
+  nsHttpConnectionInfo *ci = aHttpTransaction->ConnectionInfo();
   if (FindTunnelCount(ci) < gHttpHandler->MaxConnectionsPerOrigin()) {
     LOG3(("SpdySession31::DispatchOnTunnel %p create on new tunnel %s",
           this, ci->HashKey().get()));
-    // The connect transaction will hold onto the underlying http
-    // transaction so that an auth created by the connect can be mappped
-    // to the correct security callbacks
-    nsRefPtr<SpdyConnectTransaction> connectTrans =
-      new SpdyConnectTransaction(ci, aCallbacks,
-                                 trans->Caps(), trans, this);
-    AddStream(connectTrans, nsISupportsPriority::PRIORITY_NORMAL,
-              false, nullptr);
-    SpdyStream31 *tunnel = mStreamTransactionHash.Get(connectTrans);
-    MOZ_ASSERT(tunnel);
-    RegisterTunnel(tunnel);
+    CreateTunnel(trans, ci, aCallbacks);
   } else {
     // requeue it. The connection manager is responsible for actually putting
-    // this on the tunnel connection with the specific ci now that it
-    // has DontRouteViaWildCard set.
+    // this on the tunnel connection with the specific ci. If that can't
+    // happen the cmgr checks with us via MaybeReTunnel() to see if it should
+    // make a new tunnel or just wait longer.
     LOG3(("SpdySession31::DispatchOnTunnel %p trans=%p queue in connection manager",
           this, trans));
     gHttpHandler->InitiateTransaction(trans, trans->Priority());
   }
 }
 
+// From ASpdySession
+bool
+SpdySession31::MaybeReTunnel(nsAHttpTransaction *aHttpTransaction)
+{
+  MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
+  nsHttpTransaction *trans = aHttpTransaction->QueryHttpTransaction();
+  LOG(("SpdySession31::MaybeReTunnel %p trans=%p\n", this, trans));
+  nsHttpConnectionInfo *ci = aHttpTransaction->ConnectionInfo();
+  if (!trans || trans->TunnelProvider() != this) {
+    // this isn't really one of our transactions.
+    return false;
+  }
+
+  if (mClosed || mShouldGoAway) {
+    LOG(("SpdySession31::MaybeReTunnel %p %p session closed - requeue\n", this, trans));
+    trans->SetTunnelProvider(nullptr);
+    gHttpHandler->InitiateTransaction(trans, trans->Priority());
+    return true;
+  }
+
+  LOG(("SpdySession31::MaybeReTunnel %p %p count=%d limit %d\n",
+       this, trans, FindTunnelCount(ci), gHttpHandler->MaxConnectionsPerOrigin()));
+  if (FindTunnelCount(ci) >= gHttpHandler->MaxConnectionsPerOrigin()) {
+    // patience - a tunnel will open up.
+    return false;
+  }
+
+  LOG(("SpdySession31::MaybeReTunnel %p %p make new tunnel\n", this, trans));
+  CreateTunnel(trans, ci, trans->SecurityCallbacks());
+  return true;
+}
+
 nsresult
 SpdySession31::BufferOutput(const char *buf,
                             uint32_t count,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/SpdySession31.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/SpdySession31.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/http/SpdySession31.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/http/SpdySession31.h	2015-02-28 15:03:09.000000000 +0000
@@ -195,6 +195,8 @@
 
   void SendPing() MOZ_OVERRIDE;
 
+  bool MaybeReTunnel(nsAHttpTransaction *) MOZ_OVERRIDE;
+
 private:
 
   enum stateType {
@@ -415,6 +417,7 @@
 private:
 /// connect tunnels
   void DispatchOnTunnel(nsAHttpTransaction *, nsIInterfaceRequestor *);
+  void CreateTunnel(nsHttpTransaction *, nsHttpConnectionInfo *, nsIInterfaceRequestor *);
   void RegisterTunnel(SpdyStream31 *);
   void UnRegisterTunnel(SpdyStream31 *);
   uint32_t FindTunnelCount(nsHttpConnectionInfo *);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/res/nsResProtocolHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/res/nsResProtocolHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/protocol/res/nsResProtocolHandler.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/protocol/res/nsResProtocolHandler.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -288,22 +288,13 @@
     nsresult rv = ResolveURI(uri, spec);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    // Bug 1087720 (and Bug 1099296):
-    // Once all callsites have been updated to call NewChannel2() instead of NewChannel()
-    // we should have a non-null loadInfo consistently. Until then we have to branch on the
-    // loadInfo.
     nsCOMPtr<nsIURI> newURI;
     rv = NS_NewURI(getter_AddRefs(newURI), spec);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    if (aLoadInfo) {
-        rv = NS_NewChannelInternal(result,
-                                   newURI,
-                                   aLoadInfo);
-    }
-    else {
-        rv = mIOService->NewChannelFromURI(newURI, result);
-    }
+    rv = NS_NewChannelInternal(result,
+                               newURI,
+                               aLoadInfo);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsLoadFlags loadFlags = 0;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -12,6 +12,9 @@
 #include "nsStreamUtils.h"
 #include "nsStringStream.h"
 #include "nsComponentManagerUtils.h"
+#include "nsThreadUtils.h"
+#include "mozilla/Preferences.h"
+
 
 // nsISupports implementation
 NS_IMPL_ISUPPORTS(nsHTTPCompressConv,
@@ -35,6 +38,13 @@
     , mSkipCount(0)
     , mFlags(0)
 {
+    if (NS_IsMainThread()) {
+        mFailUncleanStops =
+            (Preferences::GetBool("network.http.enforce-framing.soft", false) ||
+             Preferences::GetBool("network.http.enforce-framing.http", false));
+    } else {
+        mFailUncleanStops = false;
+    }
 }
 
 nsHTTPCompressConv::~nsHTTPCompressConv()
@@ -88,6 +98,14 @@
 nsHTTPCompressConv::OnStopRequest(nsIRequest* request, nsISupports *aContext, 
                                   nsresult aStatus)
 {
+    // Framing integrity is enforced for content-encoding: gzip, but not for
+    // content-encoding: deflate. Note that gzip vs deflate is NOT determined
+    // by content sniffing but only via header.
+    if (!mStreamEnded && NS_SUCCEEDED(aStatus) &&
+        (mFailUncleanStops && (mMode == HTTP_COMPRESS_GZIP)) ) {
+        // This is not a clean end of gzip stream: the transfer is incomplete.
+        aStatus = NS_ERROR_NET_PARTIAL_TRANSFER;
+    }
     return mListener->OnStopRequest(request, aContext, aStatus);
 } 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.h	2015-02-28 15:03:09.000000000 +0000
@@ -76,6 +76,7 @@
     bool        mStreamEnded;
     bool        mStreamInitialized;
     bool        mDummyStreamInitialised;
+    bool        mFailUncleanStops;
 
     z_stream d_stream;
     unsigned mLen, hMode, mSkipCount, mFlags;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_content_length_underrun.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_content_length_underrun.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_content_length_underrun.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_content_length_underrun.js	2015-02-28 15:03:09.000000000 +0000
@@ -18,12 +18,14 @@
 var testPathBase = "/cl_hdrs";
 
 var prefs;
-var enforcePref;
+var enforcePrefStrict;
+var enforcePrefSoft;
 
 function run_test()
 {
   prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-  enforcePref = prefs.getBoolPref("network.http.enforce-framing.http1");
+  enforcePrefStrict = prefs.getBoolPref("network.http.enforce-framing.http1");
+  enforcePrefSoft = prefs.getBoolPref("network.http.enforce-framing.soft");
   prefs.setBoolPref("network.http.enforce-framing.http1", true);
 
   httpserver.start(-1);
@@ -43,6 +45,42 @@
                                         channel, flags), null);
 }
 
+function run_gzip_test(num)
+{
+  testPath = testPathBase + num;
+  httpserver.registerPathHandler(testPath, eval("handler" + num));
+
+  var channel = setupChannel(testPath);
+
+  function StreamListener() {}
+
+  StreamListener.prototype = {
+    QueryInterface: function(aIID) {
+      if (aIID.equals(Components.interfaces.nsIStreamListener) ||
+          aIID.equals(Components.interfaces.nsIRequestObserver) ||
+          aIID.equals(Components.interfaces.nsISupports))
+        return this;
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    },
+
+    onStartRequest: function(aRequest, aContext) {},
+
+    onStopRequest: function(aRequest, aContext, aStatusCode) {
+      // Make sure we catch the error NS_ERROR_NET_PARTIAL_TRANSFER here.
+      do_check_eq(aStatusCode, Components.results.NS_ERROR_NET_PARTIAL_TRANSFER);
+      //  do_test_finished();
+        endTests();
+    },
+
+    onDataAvailable: function(request, context, stream, offset, count) {}
+  };
+
+  let listener = new StreamListener();
+ 
+  channel.asyncOpen(listener, null);
+
+}
+
 function setupChannel(url)
 {
   var ios = Components.classes["@mozilla.org/network/io-service;1"].
@@ -61,7 +99,9 @@
 
 function endTests()
 {
-  prefs.setBoolPref("network.http.enforce-framing.http1", enforcePref);
+  // restore the prefs to pre-test values
+  prefs.setBoolPref("network.http.enforce-framing.http1", enforcePrefStrict);
+  prefs.setBoolPref("network.http.enforce-framing.soft", enforcePrefSoft);
   httpserver.stop(do_test_finished);
 }
 
@@ -111,8 +151,9 @@
 {
   do_check_eq(request.status, Components.results.NS_OK);
 
-  // test 3 requires the pref to be false
+  // test 3 requires the enforce-framing prefs to be false
   prefs.setBoolPref("network.http.enforce-framing.http1", false);
+  prefs.setBoolPref("network.http.enforce-framing.soft", false);
   run_test_number(3);
 }
 
@@ -135,8 +176,84 @@
 
 function completeTest3(request, data, ctx)
 {
-  // reset the pref in case we add more tests
-  prefs.setBoolPref("network.http.enforce-framing.http1", true);
   do_check_eq(request.status, Components.results.NS_OK);
-  endTests();
+  prefs.setBoolPref("network.http.enforce-framing.soft", true);
+  run_test_number(4);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Test 4: Succeed because a cut off deflate stream can't be detected
+test_flags[4] = CL_IGNORE_CL;
+
+function handler4(metadata, response)
+{
+    // this is the beginning of a deflate compressed response body
+    
+  var body = "\xcd\x57\xcd\x6e\x1b\x37\x10\xbe\x07\xc8\x3b\x0c\x36\x68\x72\xd1" +
+    "\xbf\x92\x22\xb1\x57\x0a\x64\x4b\x6a\x0c\x28\xb6\x61\xa9\x41\x73" +
+    "\x2a\xb8\xbb\x94\x44\x98\xfb\x03\x92\x92\xec\x06\x7d\x97\x1e\xeb" +
+    "\xbe\x86\x5e\xac\xc3\x25\x97\xa2\x64\xb9\x75\x0b\x14\xe8\x69\x87" +
+    "\x33\x9c\x1f\x7e\x33\x9c\xe1\x86\x9f\x66\x9f\x27\xfd\x97\x2f\x20" +
+    "\xfc\x34\x1a\x0c\x35\x01\xa1\x62\x8a\xd3\xfe\xf5\xcd\xd5\xe5\xd5" +
+    "\x6c\x54\x83\x49\xbe\x60\x31\xa3\x1c\x12\x0a\x0b\x2a\x15\xcb\x33" +
+    "\x4d\xae\x19\x05\x19\xe7\x9c\x30\x41\x1b\x61\xd3\x28\x95\xfa\x29" +
+    "\x55\x04\x32\x92\xd2\x5e\x90\x50\x19\x0b\x56\x68\x9d\x00\xe2\x3c" +
+    "\x53\x34\x53\xbd\xc0\x99\x56\xf9\x4a\x51\xe0\x64\xcf\x18\x24\x24" +
+    "\x93\xb0\xca\x40\xd2\x15\x07\x6e\xbd\x37\x60\x82\x3b\x8f\x86\x22" +
+    "\x21\xcb\x15\x95\x35\x20\x91\xa4\x59\xac\xa9\x62\x95\x31\xed\x14" +
+    "\xc9\x98\x2c\x19\x15\x3a\x62\x45\xef\x70\x1b\x50\x05\xa4\x28\xc4" +
+    "\xf6\x21\x66\xa4\xdc\x83\x32\x09\x85\xc8\xe7\x54\xa2\x4b\x81\x74" +
+    "\xbe\x12\xc0\x91\xb9\x7d\x50\x24\xe2\x0c\xd9\x29\x06\x2e\xdd\x79";
+
+  response.seizePower();
+  response.write("HTTP/1.1 200 OK\r\n");
+  response.write("Content-Type: text/plain\r\n");
+  response.write("Content-Length: 553677\r\n");
+  response.write("Content-Encoding: deflate\r\n");
+  response.write("\r\n");
+  response.write(body);
+  response.finish();
+}
+
+function completeTest4(request, data, ctx)
+{
+  do_check_eq(request.status, Components.results.NS_OK);
+  run_gzip_test(99);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Test 99: FAIL because a cut off gzip stream CAN be detected
+
+// Note that test 99 here is run completely different than the other tests in
+// this file so if you add more tests here, consider adding them before this.
+
+function handler99(metadata, response)
+{
+  // this is the beginning of a gzip compressed response body
+    
+  var body = "\x1f\x8b\x08\x00\x80\xb9\x25\x53\x00\x03\xd4\xd9\x79\xb8\x8e\xe5" +
+    "\xba\x00\xf0\x65\x19\x33\x24\x15\x29\xf3\x50\x52\xc6\xac\x85\x10" +
+    "\x8b\x12\x22\x45\xe6\xb6\x21\x9a\x96\x84\x4c\x69\x32\xec\x84\x92" +
+    "\xcc\x99\x6a\xd9\x32\xa5\xd0\x40\xd9\xc6\x14\x15\x95\x28\x62\x9b" +
+    "\x09\xc9\x70\x4a\x25\x53\xec\x8e\x9c\xe5\x1c\x9d\xeb\xfe\x9d\x73" +
+    "\x9d\x3f\xf6\x1f\xe7\xbd\xae\xcf\xf3\xbd\xbf\xef\x7e\x9f\xeb\x79" +
+    "\xef\xf7\x99\xde\xe5\xee\x6e\xdd\x3b\x75\xeb\xd1\xb5\x6c\xb3\xd4" +
+    "\x47\x1f\x48\xf8\x17\x1d\x15\xce\x1d\x55\x92\x93\xcf\x97\xe7\x8e" +
+    "\x8b\xca\xe4\xca\x55\x92\x2a\x54\x4e\x4e\x4e\x4a\xa8\x78\x53\xa5" +
+    "\x8a\x15\x2b\x55\x4a\xfa\xe3\x7b\x85\x8a\x37\x55\x48\xae\x92\x50" +
+    "\xb4\xc2\xbf\xaa\x41\x17\x1f\xbd\x7b\xf6\xba\xaf\x47\xd1\xa2\x09" +
+    "\x3d\xba\x75\xeb\xf5\x3f\xc5\xfd\x6f\xbf\xff\x3f\x3d\xfa\xd7\x6d" +
+    "\x74\x7b\x62\x86\x0c\xff\x79\x9e\x98\x50\x33\xe1\x8f\xb3\x01\xef" +
+    "\xb6\x38\x7f\x9e\x92\xee\xf9\xa7\xee\xcb\x74\x21\x26\x25\xa1\x6a" +
+    "\x42\xf6\x73\xff\x96\x4c\x28\x91\x90\xe5\xdc\x79\xa6\x8b\xe2\x52" +
+    "\xd2\xbf\x5d\x28\x2b\x24\x26\xfc\xa9\xcc\x96\x1e\x97\x31\xfd\xba" +
+    "\xee\xe9\xde\x3d\x31\xe5\x4f\x65\xc1\xf4\xb8\x0b\x65\x86\x8b\xca";
+  response.seizePower();
+  response.write("HTTP/1.1 200 OK\r\n");
+  response.write("Content-Type: text/plain\r\n");
+  response.write("Content-Length: 553677\r\n");
+  response.write("Content-Encoding: gzip\r\n");
+  response.write("\r\n");
+  response.write(body);
+  response.finish();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_dns_offline.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_dns_offline.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_dns_offline.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_dns_offline.js	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,74 @@
+var dns = Cc["@mozilla.org/network/dns-service;1"].getService(Ci.nsIDNSService);
+var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
+var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+var threadManager = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager);
+var mainThread = threadManager.currentThread;
+
+var listener1 = {
+  onLookupComplete: function(inRequest, inRecord, inStatus) {
+    do_check_eq(inStatus, Cr.NS_ERROR_OFFLINE);
+    test2();
+    do_test_finished();
+  }
+};
+
+var listener2 = {
+  onLookupComplete: function(inRequest, inRecord, inStatus) {
+    do_check_eq(inStatus, Cr.NS_OK);
+    var answer = inRecord.getNextAddrAsString();
+    do_check_true(answer == "127.0.0.1" || answer == "::1");
+    test3();
+    do_test_finished();
+  }
+};
+
+var listener3 = {
+  onLookupComplete: function(inRequest, inRecord, inStatus) {
+    do_check_eq(inStatus, Cr.NS_OK);
+    var answer = inRecord.getNextAddrAsString();
+    do_check_true(answer == "127.0.0.1" || answer == "::1");
+    cleanup();
+    do_test_finished();
+  }
+};
+
+function run_test() {
+  do_test_pending();
+  prefs.setBoolPref("network.dns.offline-localhost", false);
+  ioService.offline = true;
+  try {
+    dns.asyncResolve("localhost", 0, listener1, mainThread);
+  } catch (e) {
+      do_check_eq(e.result, Cr.NS_ERROR_OFFLINE);
+      test2();
+      do_test_finished();
+  }
+}
+
+function test2() {
+  do_test_pending();
+  prefs.setBoolPref("network.dns.offline-localhost", true);
+  ioService.offline = false;
+  ioService.offline = true;
+  // we need to let the main thread run and apply the changes
+  do_timeout(0, test2Continued);
+}
+
+function test2Continued() {
+  dns.asyncResolve("localhost", 0, listener2, mainThread);
+}
+
+function test3() {
+  do_test_pending();
+  ioService.offline = false;
+  // we need to let the main thread run and apply the changes
+  do_timeout(0, test3Continued);
+}
+
+function test3Continued() {
+  dns.asyncResolve("localhost", 0, listener3, mainThread);
+}
+
+function cleanup() {
+  prefs.clearUserPref("network.dns.offline-localhost");
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_dns_per_interface.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_dns_per_interface.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_dns_per_interface.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_dns_per_interface.js	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,79 @@
+var dns = Cc["@mozilla.org/network/dns-service;1"].getService(Ci.nsIDNSService);
+
+// This test checks DNSService host resolver when a network interface is supplied
+// as well. In the test 3 request are sent: two with a network interface set 
+// and one without a network interface.
+// All requests have the same host to be resolved and the same flags.
+// One of the request with the network interface will be canceled.
+// The request with and without a network interface should not be mixed during
+// the requests lifetime.
+
+var netInterface1 = "interface1";
+var netInterface2 = "interface2";
+
+// We are not using localhost because on e10s a host resolve callback is almost
+// always faster than a cancel request, therefore cancel operation would not be
+// tested.
+var hostname = "thisshouldnotexist.mozilla.com";
+
+// 3 requests.
+var requestWithInterfaceCanceled;
+var requestWithoutInterfaceNotCanceled;
+var requestWithInterfaceNotCanceled;
+
+var listener = {
+  onLookupComplete: function(inRequest, inRecord, inStatus) {
+    // Two requests should be resolved and one request should be canceled.
+    // Since cancalation of a request is racy we will check only for not
+    // canceled request - they should not be canceled.
+    if ((inRequest == requestWithoutInterfaceNotCanceled) ||
+        (inRequest == requestWithInterfaceNotCanceled)) {
+      // This request should not be canceled.
+      do_check_neq(inStatus, Cr.NS_ERROR_ABORT);
+
+      do_test_finished();
+    } else if (inRequest == requestWithInterfaceCanceled) {
+      // We do not check the outcome for this one because it is racy -
+      // whether the request cancelation is faster than resolving the request.
+      do_test_finished();
+    }
+  },
+  QueryInterface: function(aIID) {
+    if (aIID.equals(Ci.nsIDNSListener) ||
+        aIID.equals(Ci.nsISupports)) {
+      return this;
+    }
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  }
+};
+
+function run_test() {
+  var threadManager = Cc["@mozilla.org/thread-manager;1"]
+                        .getService(Ci.nsIThreadManager);
+  var mainThread = threadManager.currentThread;
+
+  var flags = Ci.nsIDNSService.RESOLVE_BYPASS_CACHE;
+
+  // This one will be canceled.
+  requestWithInterfaceCanceled = dns.asyncResolveExtended(hostname, flags,
+                                                          netInterface1,
+                                                          listener,
+                                                          mainThread);
+  requestWithInterfaceCanceled.cancel(Cr.NS_ERROR_ABORT);
+
+  // This one will not be canceled. This is the request without a network
+  // interface.
+  requestWithoutInterfaceNotCanceled = dns.asyncResolve(hostname, flags,
+                                                        listener, mainThread);
+
+  // This one will not be canceled.
+  requestWithInterfaceNotCanceled = dns.asyncResolveExtended(hostname, flags,
+                                                             netInterface2,
+                                                             listener,
+                                                             mainThread);
+  // We wait for notifications for the requests.
+  // For each request onLookupComplete will be called.
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_http2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_http2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_http2.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_http2.js	2015-02-28 15:03:09.000000000 +0000
@@ -581,7 +581,7 @@
   response.setStatusLine(metadata.httpVersion, 200, "OK");
   response.setHeader("Content-Type", "text/plain", false);
   response.setHeader("Connection", "close", false);
-  response.setHeader("Alt-Svc", 'h2-16=":' + serverPort + '"', false);
+  response.setHeader("Alt-Svc", 'h2=":' + serverPort + '"', false);
   var body = "this is where a cool kid would write something neat.\n";
   response.bodyOutputStream.write(body, body.length);
 }
@@ -859,6 +859,7 @@
 var spdypref;
 var spdy3pref;
 var spdypush;
+var http2draftpref;
 var http2pref;
 var tlspref;
 var altsvcpref1;
@@ -870,7 +871,8 @@
   prefs.setBoolPref("network.http.spdy.enabled", spdypref);
   prefs.setBoolPref("network.http.spdy.enabled.v3-1", spdy3pref);
   prefs.setBoolPref("network.http.spdy.allow-push", spdypush);
-  prefs.setBoolPref("network.http.spdy.enabled.http2draft", http2pref);
+  prefs.setBoolPref("network.http.spdy.enabled.http2draft", http2draftpref);
+  prefs.setBoolPref("network.http.spdy.enabled.http2", http2pref);
   prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlspref);
   prefs.setBoolPref("network.http.altsvc.enabled", altsvcpref1);
   prefs.setBoolPref("network.http.altsvc.oe", altsvcpref2);
@@ -899,7 +901,8 @@
   spdypref = prefs.getBoolPref("network.http.spdy.enabled");
   spdy3pref = prefs.getBoolPref("network.http.spdy.enabled.v3-1");
   spdypush = prefs.getBoolPref("network.http.spdy.allow-push");
-  http2pref = prefs.getBoolPref("network.http.spdy.enabled.http2draft");
+  http2draftpref = prefs.getBoolPref("network.http.spdy.enabled.http2draft");
+  http2pref = prefs.getBoolPref("network.http.spdy.enabled.http2");
   tlspref = prefs.getBoolPref("network.http.spdy.enforce-tls-profile");
   altsvcpref1 = prefs.getBoolPref("network.http.altsvc.enabled");
   altsvcpref2 = prefs.getBoolPref("network.http.altsvc.oe", true);
@@ -908,6 +911,7 @@
   prefs.setBoolPref("network.http.spdy.enabled.v3-1", true);
   prefs.setBoolPref("network.http.spdy.allow-push", true);
   prefs.setBoolPref("network.http.spdy.enabled.http2draft", true);
+  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
   prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false);
   prefs.setBoolPref("network.http.altsvc.enabled", true);
   prefs.setBoolPref("network.http.altsvc.oe", true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js	2015-02-28 15:03:09.000000000 +0000
@@ -63,8 +63,8 @@
 
 function run_test()
 {
-  enforcePref = Services.prefs.getBoolPref("network.http.enforce-framing.http1");
-  Services.prefs.setBoolPref("network.http.enforce-framing.http1", false);
+  enforcePref = Services.prefs.getBoolPref("network.http.enforce-framing.soft");
+  Services.prefs.setBoolPref("network.http.enforce-framing.soft", false);
 
   httpServer = new HttpServer();
   httpServer.registerPathHandler("/content", contentHandler);
@@ -87,6 +87,6 @@
 function finish_test(request, buffer)
 {
   do_check_eq(buffer, responseBody);
-  Services.prefs.setBoolPref("network.http.enforce-framing.http1", enforcePref);
+  Services.prefs.setBoolPref("network.http.enforce-framing.soft", enforcePref);
   httpServer.stop(do_test_finished);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_synthesized_response.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_synthesized_response.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/test_synthesized_response.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/test_synthesized_response.js	2015-02-28 15:03:09.000000000 +0000
@@ -55,19 +55,19 @@
       this.numChecks++;
       return true;
     },
-    channelIntercepted: function(channel, stream) {
+    channelIntercepted: function(channel) {
       channel.QueryInterface(Ci.nsIInterceptedChannel);
       if (body) {
         var synthesized = Cc["@mozilla.org/io/string-input-stream;1"]
                             .createInstance(Ci.nsIStringInputStream);
         synthesized.data = body;
 
-        NetUtil.asyncCopy(synthesized, stream, function() {
+        NetUtil.asyncCopy(synthesized, channel.responseBody, function() {
           channel.finishSynthesizedResponse();
         });
       }
       if (cb) {
-        cb(channel, stream);
+        cb(channel);
       }
     },
   };
@@ -143,12 +143,12 @@
 
 // ensure that the channel waits for a decision and synthesizes headers correctly
 add_test(function() {
-  var chan = make_channel(URL + '/body', null, function(channel, stream) {
+  var chan = make_channel(URL + '/body', null, function(channel) {
     do_timeout(100, function() {
       var synthesized = Cc["@mozilla.org/io/string-input-stream;1"]
                           .createInstance(Ci.nsIStringInputStream);
       synthesized.data = NON_REMOTE_BODY;
-      NetUtil.asyncCopy(synthesized, stream, function() {
+      NetUtil.asyncCopy(synthesized, channel.responseBody, function() {
         channel.synthesizeHeader("Content-Length", NON_REMOTE_BODY.length);
         channel.finishSynthesizedResponse();
       });
@@ -169,12 +169,12 @@
 
 // ensure that the intercepted channel supports suspend/resume
 add_test(function() {
-  var chan = make_channel(URL + '/body', null, function(intercepted, stream) {
+  var chan = make_channel(URL + '/body', null, function(intercepted) {
     var synthesized = Cc["@mozilla.org/io/string-input-stream;1"]
                         .createInstance(Ci.nsIStringInputStream);
     synthesized.data = NON_REMOTE_BODY;
 
-    NetUtil.asyncCopy(synthesized, stream, function() {
+    NetUtil.asyncCopy(synthesized, intercepted.responseBody, function() {
       // set the content-type to ensure that the stream converter doesn't hold up notifications
       // and cause the test to fail
       intercepted.synthesizeHeader("Content-Type", "text/plain");
@@ -185,6 +185,65 @@
 				     CL_ALLOW_UNKNOWN_CL | CL_SUSPEND | CL_EXPECT_3S_DELAY), null);
 });
 
+// ensure that the intercepted channel can be cancelled
+add_test(function() {
+  var chan = make_channel(URL + '/body', null, function(intercepted) {
+    intercepted.cancel();
+  });
+  chan.asyncOpen(new ChannelListener(run_next_test, null,
+				     CL_EXPECT_FAILURE), null);
+});
+
+// ensure that the channel can't be cancelled via nsIInterceptedChannel after making a decision
+add_test(function() {
+  var chan = make_channel(URL + '/body', null, function(chan) {
+    chan.resetInterception();
+    do_timeout(0, function() {
+      var gotexception = false;
+      try {
+        chan.cancel();
+      } catch (x) {
+        gotexception = true;
+      }
+      do_check_true(gotexception);
+    });
+  });
+  chan.asyncOpen(new ChannelListener(handle_remote_response, null), null);
+});
+
+// ensure that the intercepted channel can be canceled during the response
+add_test(function() {
+  var chan = make_channel(URL + '/body', null, function(intercepted) {
+    var synthesized = Cc["@mozilla.org/io/string-input-stream;1"]
+                        .createInstance(Ci.nsIStringInputStream);
+    synthesized.data = NON_REMOTE_BODY;
+
+    NetUtil.asyncCopy(synthesized, intercepted.responseBody, function() {
+      let channel = intercepted.channel;
+      intercepted.finishSynthesizedResponse();
+      channel.cancel(Cr.NS_BINDING_ABORTED);
+    });
+  });
+  chan.asyncOpen(new ChannelListener(run_next_test, null,
+                                     CL_EXPECT_FAILURE | CL_ALLOW_UNKNOWN_CL), null);
+});
+
+// ensure that the intercepted channel can be canceled before the response
+add_test(function() {
+  var chan = make_channel(URL + '/body', null, function(intercepted) {
+    var synthesized = Cc["@mozilla.org/io/string-input-stream;1"]
+                        .createInstance(Ci.nsIStringInputStream);
+    synthesized.data = NON_REMOTE_BODY;
+
+    NetUtil.asyncCopy(synthesized, intercepted.responseBody, function() {
+      intercepted.channel.cancel(Cr.NS_BINDING_ABORTED);
+      intercepted.finishSynthesizedResponse();
+    });
+  });
+  chan.asyncOpen(new ChannelListener(run_next_test, null,
+                                     CL_EXPECT_FAILURE | CL_ALLOW_UNKNOWN_CL), null);
+});
+
 add_test(function() {
   httpServer.stop(run_next_test);
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit/xpcshell.ini	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit/xpcshell.ini	2015-02-28 15:03:09.000000000 +0000
@@ -173,8 +173,10 @@
 [test_cookiejars.js]
 [test_cookiejars_safebrowsing.js]
 [test_dns_cancel.js]
+[test_dns_per_interface.js]
 [test_data_protocol.js]
 [test_dns_service.js]
+[test_dns_offline.js]
 [test_dns_localredirect.js]
 [test_dns_proxy_bypass.js]
 [test_duplicate_headers.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit_ipc/test_dns_per_interface_wrap.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit_ipc/test_dns_per_interface_wrap.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit_ipc/test_dns_per_interface_wrap.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit_ipc/test_dns_per_interface_wrap.js	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,7 @@
+//
+// Run test script in content process instead of chrome (xpcshell's default)
+//
+
+function run_test() {
+  run_test_in_child("../unit/test_dns_per_interface.js");
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit_ipc/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit_ipc/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/netwerk/test/unit_ipc/xpcshell.ini	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/netwerk/test/unit_ipc/xpcshell.ini	2015-02-28 15:03:09.000000000 +0000
@@ -12,6 +12,7 @@
 [test_cookie_header_wrap.js]
 [test_cookiejars_wrap.js]
 [test_dns_cancel_wrap.js]
+[test_dns_per_interface_wrap.js]
 [test_dns_service_wrap.js]
 [test_duplicate_headers_wrap.js]
 [test_event_sink_wrap.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/parser/htmlparser/nsIParser.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/parser/htmlparser/nsIParser.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/parser/htmlparser/nsIParser.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/parser/htmlparser/nsIParser.h	2015-02-28 15:03:11.000000000 +0000
@@ -120,7 +120,7 @@
      * @param aChannel out param that will contain the result
      * @return NS_OK if successful
      */
-    NS_IMETHOD GetChannel(nsIChannel** aChannel) = 0;
+    NS_IMETHOD GetChannel(nsIChannel** aChannel) MOZ_OVERRIDE = 0;
 
     /** 
      * Get the DTD associated with this parser
@@ -163,7 +163,7 @@
      */
     NS_IMETHOD_(void) ContinueInterruptedParsingAsync() = 0;
 
-    NS_IMETHOD_(bool) IsParserEnabled() = 0;
+    NS_IMETHOD_(bool) IsParserEnabled() MOZ_OVERRIDE = 0;
     NS_IMETHOD_(bool) IsComplete() = 0;
     
     NS_IMETHOD Parse(nsIURI* aURL,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/eme/gen-eme-voucher.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/eme/gen-eme-voucher.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/eme/gen-eme-voucher.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/eme/gen-eme-voucher.py	2015-02-28 15:03:11.000000000 +0000
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
+#
 # Copyright 2014 Adobe Systems Incorporated. All Rights Reserved.
 #
 # Adobe permits you to use, modify, and distribute this file in accordance
@@ -6,17 +7,18 @@
 # a copy of the MPL was not distributed with this file, You can obtain one
 # at http://mozilla.org/MPL/2.0/.
 #
-# Create perforce changelist of modules from FTP server
+# Creates an Adobe Access signed voucher for any executable
+#   Notes: This is currently python2.7 due to mozilla build system requirements
 
-import io, argparse,pyasn1, bitstring
-from pyasn1.codec.der import encoder, decoder
+import argparse, bitstring, pprint, hashlib, os, subprocess, sys, tempfile
+from pyasn1.codec.der import encoder as der_encoder
 from pyasn1.type import univ, namedtype, namedval, constraint
-import hashlib
+
 
 # CodeSectionDigest ::= SEQUENCE {
-# offset				INTEGER --  section's file offset in the signed binary
-# digestAlgorithm		OBJECT IDENTIFIER -- algorithm identifier for the hash value below. For now only supports SHA256.
-# digestValue			OCTET STRING -- hash value of the TEXT segment.
+#   offset				INTEGER --  section's file offset in the signed binary
+#   digestAlgorithm		OBJECT IDENTIFIER -- algorithm identifier for the hash value below. For now only supports SHA256.
+#   digestValue			OCTET STRING -- hash value of the TEXT segment.
 # }
 class CodeSectionDigest(univ.Sequence):
 	componentType = namedtype.NamedTypes(
@@ -24,6 +26,7 @@
 		namedtype.NamedType('digestAlgorithm', univ.ObjectIdentifier()),
 		namedtype.NamedType('digest', univ.OctetString()))
 
+
 # CodeSegmentDigest ::= SEQUENCE {
 #	 offset				INTEGER -- TEXT segment's file offset in the signed binary
 #	 codeSectionDigests			SET OF CodeSectionDigests
@@ -32,20 +35,22 @@
 class SetOfCodeSectionDigest(univ.SetOf):
 	componentType = CodeSectionDigest()
 
+
 class CodeSegmentDigest(univ.Sequence):
 	componentType = namedtype.NamedTypes(
 		namedtype.NamedType('offset', univ.Integer()),
 		namedtype.NamedType('codeSectionDigests', SetOfCodeSectionDigest()))
 
+
 # ArchitectureDigest ::= SEQUENCE {
 # 	cpuType                ENUMERATED CpuType
 # 	cpuSubType				ENUMERATED CpuSubType
 # 	CodeSegmentDigests		SET OF CodeSegmentDigests
 # }
-
 class SetOfCodeSegmentDigest(univ.SetOf):
 	componentType = CodeSegmentDigest()
 
+
 class CPUType(univ.Enumerated):
 	namedValues = namedval.NamedValues(
 		('IMAGE_FILE_MACHINE_I386', 0x14c),
@@ -55,34 +60,46 @@
 				  constraint.SingleValueConstraint(0x14c, 0x8664)
 
 
+class CPUSubType(univ.Enumerated):
+	namedValues = namedval.NamedValues(
+		('IMAGE_UNUSED', 0x0),
+	)
+	subtypeSpec = univ.Enumerated.subtypeSpec + \
+				  constraint.SingleValueConstraint(0)
+
+
 class ArchitectureDigest(univ.Sequence):
 	componentType = namedtype.NamedTypes(
 		namedtype.NamedType('cpuType', CPUType()),
-		namedtype.NamedType('cpuSubType', univ.Integer()),
+		namedtype.NamedType('cpuSubType', CPUSubType()),
 		namedtype.NamedType('CodeSegmentDigests', SetOfCodeSegmentDigest())
 	)
 
-#	 ApplicationDigest ::= SEQUENCE {
-#	 version    INTEGER
-#	 digests    SET OF ArchitectureDigest
-#	 }
+
+# ApplicationDigest ::= SEQUENCE {
+#   version    INTEGER
+#   digests    SET OF ArchitectureDigest
+# }
 class SetOfArchitectureDigest(univ.SetOf):
 	componentType = ArchitectureDigest()
 
+
 class ApplicationDigest(univ.Sequence):
 	componentType = namedtype.NamedTypes(
 		namedtype.NamedType('version', univ.Integer()),
 		namedtype.NamedType('digests', SetOfArchitectureDigest())
 	)
 
-def meetsRequirements(items, requirements):
+
+def meets_requirements(items, requirements):
 	for r in requirements:
 		for n, v in r.items():
 			if n not in items or items[n] != v: return False
 	return True
 
+
 # return total number of bytes read from items_in excluding leaves
-def parseItems(stream, items_in, items_out):
+def parse_items(stream, items_in, items_out):
 	bits_read = 0
 	total_bits_read = 0
 
@@ -102,7 +119,7 @@
 			requirements = list(filter(lambda x: isinstance(x, dict), item[2]))
 			sub_items = list(filter(lambda x: isinstance(x, tuple), item[2]))
 
-			if not meetsRequirements(items_out, requirements): continue
+			if not meets_requirements(items_out, requirements): continue
 
 			# has sub-items based on length
 			items_out[name] = stream.read(t)
@@ -113,7 +130,7 @@
 				bit_length = items_out[name] * 8
 
 				if bit_length > 0:
-					sub_read, sub_total_read = parseItems(stream, sub_items, items_out)
+					sub_read, sub_total_read = parse_items(stream, sub_items, items_out)
 					bit_length -= sub_read
 					total_bits_read += sub_total_read
 
@@ -127,6 +144,7 @@
 	return bits_read, total_bits_read
 
 
+# TODO: perhaps switch to pefile module when it officially supports python3
 class SectionHeader:
 	def __init__(self, stream):
 		items = [
@@ -141,15 +159,115 @@
 			('NumberOfLineNumbers', 'uintle:16'),
 			('Characteristics', 'uintle:32')
 		]
-		self.items = {}
-		_, self.bits_read = parseItems(stream, items, self.items)
+		self.items = dict()
+		self.relocs = dict()
+
+		_, self.bits_read = parse_items(stream, items, self.items)
 
 		self.sectionName = self.items['Name'].decode('utf-8')
 		self.offset = self.items['PointerToRawData']
 
+COFF_DATA_DIRECTORY_TYPES = [
+	"Export Table",
+	"Import Table",
+	"Resource Table",
+	"Exception Table",
+	"Certificate Tble",
+	"Base Relocation Table",
+	"Debug",
+	"Architecture",
+	"Global Ptr",
+	"TLS Table",
+	"Load Config Table",
+	"Bound Import",
+	"IAT",
+	"Delay Import Descriptor",
+	"CLR Runtime Header",
+	"Reserved",
+]
+
+
+def chained_safe_get(obj, names, default=None):
+	if obj is None: return default
+
+	for n in names:
+		if n in obj:
+			obj = obj[n]
+		else:
+			return default
+
+	return obj
+
+
+class OptionalHeader:
+	def __init__(self, stream, size):
+		self.items = {}
+		items = []
+
+		if size:
+			items += [
+				('Magic', 'uintle:16'),
+				('MajorLinkerVersion', 'uintle:8'),
+				('MinorLinkerVersion', 'uintle:8'),
+				('SizeOfCode', 'uintle:32'),
+				('SizeOfInitializedData', 'uintle:32'),
+				('SizeOfUninitializedData', 'uintle:32'),
+				('AddressOfEntryPoint', 'uintle:32'),
+				('BaseOfCode', 'uintle:32'),
+			]
+
+			_, self.bits_read = parse_items(stream, items, self.items)
+
+			items = []
+			if self.items['Magic'] == 0x10b:  # PE32
+				items += [('BaseOfData', 'uintle:32')]
+
+			address_size = 'uintle:64' if self.items['Magic'] == 0x20b else 'uintle:32'
+
+			items += [
+				('ImageBase', address_size),
+				('SectionAlignment', 'uintle:32'),
+				('FileAlignment', 'uintle:32'),
+				('MajorOperatingSystemVersion', 'uintle:16'),
+				('MinorOperatingSystemVersion', 'uintle:16'),
+				('MajorImageVersion', 'uintle:16'),
+				('MinorImageVersion', 'uintle:16'),
+				('MajorSubsystemVersion', 'uintle:16'),
+				('MinorSubsystemVersion', 'uintle:16'),
+				('Win32VersionValue', 'uintle:32'),
+				('SizeOfImage', 'uintle:32'),
+				('SizeOfHeaders', 'uintle:32'),
+				('CheckSum', 'uintle:32'),
+				('Subsystem', 'uintle:16'),
+				('DllCharacteristics', 'uintle:16'),
+				('SizeOfStackReserve', address_size),
+				('SizeOfStackCommit', address_size),
+				('SizeOfHeapReserve', address_size),
+				('SizeOfHeapCommit', address_size),
+				('LoaderFlags', 'uintle:32'),
+				('NumberOfRvaAndSizes', 'uintle:32'),
+			]
+
+		if size > 28:
+			_, bits_read = parse_items(stream, items, self.items)
+			self.bits_read += bits_read
+
+		if 'NumberOfRvaAndSizes' in self.items:
+			index = 0
+			self.items['Data Directories'] = dict()
+			while self.bits_read / 8 < size:
+				d = self.items['Data Directories'][COFF_DATA_DIRECTORY_TYPES[index]] = dict()
+
+				_, bits_read = parse_items(stream, [('VirtualAddress', 'uintle:32'), ('Size', 'uintle:32')], d)
+				self.bits_read += bits_read
+				index += 1
+
 
 class COFFFileHeader:
 	def __init__(self, stream):
+		self.items = {}
+		self.section_headers = []
+
 		items = [
 			('Machine', 'uintle:16'),
 			('NumberOfSections', 'uintle:16'),
@@ -159,106 +277,178 @@
 			('SizeOfOptionalHeader', 'uintle:16'),
 			('Characteristics', 'uintle:16')
 		]
-		self.items = {}
-		_, self.bits_read = parseItems(stream, items, self.items)
+		_, self.bits_read = parse_items(stream, items, self.items)
+
+		self.OptionalHeader = OptionalHeader(stream, self.items['SizeOfOptionalHeader'])
+		self.bits_read += self.OptionalHeader.bits_read
+
+		# start reading section headers
+		num_sections = self.items['NumberOfSections']
+
+		while num_sections > 0 :
+			section_header = SectionHeader(stream)
+			self.bits_read += section_header.bits_read
+			self.section_headers.append(section_header)
+			num_sections -= 1
+
+		self.section_headers.sort(key=lambda header: header.offset)
+
+		# Read Relocations
+		self.process_relocs(stream)
+
+	def process_relocs(self, stream):
+		reloc_table = chained_safe_get(self.OptionalHeader.items, ['Data Directories', 'Base Relocation Table'])
+		if reloc_table is None: return
+
+		orig_pos = stream.bitpos
+		_, stream.bytepos = self.get_rva_section(reloc_table['VirtualAddress'])
+		end_pos = stream.bitpos + reloc_table['Size'] * 8
+
+		while stream.bitpos < end_pos:
+			page_rva = stream.read('uintle:32')
+			block_size = stream.read('uintle:32')
+
+			for i in range(0, int((block_size - 8) / 2)):
+				data = stream.read('uintle:16')
+				typ = data >> 12
+				offset = data & 0xFFF
+
+				if offset == 0 and i > 0: continue
+
+				assert(typ == 3)
+
+				cur_pos = stream.bitpos
+				sh, value_bytepos = self.get_rva_section(page_rva + offset)
+				stream.bytepos = value_bytepos
+				value = stream.read('uintle:32')
+
+				# remove BaseAddress
+				value -= self.OptionalHeader.items['ImageBase']
 
-		#skip over optional header.
-		if self.items['SizeOfOptionalHeader'] > 0:
-			stream.read(self.items['SizeOfOptionalHeader'] * 8)
-			self.bits_read += self.items['SizeOfOptionalHeader'] * 8
-
-		#start reading section headers
-		numberOfSections = self.items['NumberOfSections']
-		self.codeSectionHeaders = []
-
-		while numberOfSections > 0 :
-			sectionHeader = SectionHeader(stream)
-			if (sectionHeader.items['Characteristics'] & 0x20000000) == 0x20000000:
-				self.codeSectionHeaders.append(sectionHeader)
-			numberOfSections -= 1
+				stream.overwrite(bitstring.BitArray(uint=value, length=4 * 8), pos=value_bytepos * 8)
+				stream.pos = cur_pos
 
-		self.codeSectionHeaders.sort(key=lambda header: header.offset)
+		stream.bitpos = orig_pos
 
+	def get_rva_section(self, rva):
+		for sh in self.section_headers:
+			if rva < sh.items['VirtualAddress'] or rva >= sh.items['VirtualAddress'] + sh.items['VirtualSize']:
+				continue
 
+			file_pointer = rva - sh.items['VirtualAddress'] + sh.items['PointerToRawData']
+			return sh, file_pointer
+
+		raise Exception('Could not match RVA to section')
+
+
+def create_temp_file(suffix=""):
+	fd, path = tempfile.mkstemp(suffix=suffix)
+	os.close(fd)
+	return path
+	
+# TIPS:
+#  How to convert PFX to PEM: openssl pkcs12 -in build/certificates/testPKI/IV.pfx -out build/certificates/testPKI/IV.cert.pem
 def main():
-	parser = argparse.ArgumentParser(description='PE/COFF Parser.')
+	parser = argparse.ArgumentParser(description='PE/COFF Signer')
 	parser.add_argument('-input', required=True, help="File to parse.")
 	parser.add_argument('-output', required=True, help="File to write to.")
+	parser.add_argument('-openssl_path',help="Path to OpenSSL to create signed voucher")
+	parser.add_argument('-signer_cert',help="Path to certificate to use to sign voucher.  Must be PEM encoded.")
 	parser.add_argument('-verbose', action='store_true', help="Verbose output.")
 	app_args = parser.parse_args()
 
-	stream = bitstring.ConstBitStream(filename=app_args.input)
+	# to simplify relocation handling we use a mutable BitStream so we can remove
+	# the BaseAddress from each relocation
+	stream = bitstring.BitStream(filename=app_args.input)
+
 	# find the COFF header.
 	# skip forward past the MSDOS stub header to 0x3c.
-
 	stream.bytepos = 0x3c
 
 	# read 4 bytes, this is the file offset of the PE signature.
-	peSignatureOffset = stream.read('uintle:32')
-	stream.bytepos = peSignatureOffset
+	pe_sig_offset = stream.read('uintle:32')
+	stream.bytepos = pe_sig_offset
 
-	#read 4 bytes, make sure it's a PE signature.
+	# read 4 bytes, make sure it's a PE signature.
 	signature = stream.read('uintle:32')
-	if signature != 0x00004550 :
-		return
-
-
-	archDigest = ArchitectureDigest()
+	if signature != 0x00004550:
+		raise Exception("Invalid File")
 
-	codeSegmentDigests = SetOfCodeSegmentDigest()
-	codeSegmentIdx = 0
+	# after signature is the actual COFF file header.
+	coff_header = COFFFileHeader(stream)
 
-	#after signature is the actual COFF file header.
-	coffFileHeader = COFFFileHeader(stream)
-
-	if coffFileHeader.items['Machine'] == 0x14c:
-		archDigest.setComponentByName('cpuType', CPUType('IMAGE_FILE_MACHINE_I386'))
-	elif coffFileHeader.items['Machine'] == 0x8664:
-		archDigest.setComponentByName('cpuType', CPUType('IMAGE_FILE_MACHINE_AMD64'))
-
-	archDigest.setComponentByName('cpuSubType', 0)
-
-
-	for codeSectionHeader in coffFileHeader.codeSectionHeaders:
-		stream.bytepos = codeSectionHeader.offset
-		codeSectionBytes = stream.read('bytes:'+ str(codeSectionHeader.items['SizeOfRawData']))
-		if codeSectionHeader.items['SizeOfRawData'] < codeSectionHeader.items['VirtualSize']:
-			#zero pad up to virtualSize
-			codeSectionBytes += "\0" * (codeSectionHeader.items['VirtualSize']-codeSectionHeader.items['SizeOfRawData'])
+	arch_digest = ArchitectureDigest()
+	if coff_header.items['Machine'] == 0x14c:
+		arch_digest.setComponentByName('cpuType', CPUType('IMAGE_FILE_MACHINE_I386'))
+	elif coff_header.items['Machine'] == 0x8664:
+		arch_digest.setComponentByName('cpuType', CPUType('IMAGE_FILE_MACHINE_AMD64'))
+
+	arch_digest.setComponentByName('cpuSubType', CPUSubType('IMAGE_UNUSED'))
+
+	text_section_headers = list(filter(lambda x: (x.items['Characteristics'] & 0x20000000) == 0x20000000, coff_header.section_headers))
+
+	code_segment_digests = SetOfCodeSegmentDigest()
+	code_segment_idx = 0
+	for code_sect_header in text_section_headers:
+		stream.bytepos = code_sect_header.offset
+		code_sect_bytes = stream.read('bytes:' + str(code_sect_header.items['VirtualSize']))
 
 		digester = hashlib.sha256()
-		digester.update(codeSectionBytes)
+		digester.update(code_sect_bytes)
 		digest = digester.digest()
 
-		codeSectionDigest = CodeSectionDigest()
-		codeSectionDigest.setComponentByName('offset', codeSectionHeader.offset)
-		codeSectionDigest.setComponentByName('digestAlgorithm', univ.ObjectIdentifier('2.16.840.1.101.3.4.2.1'))
-		codeSectionDigest.setComponentByName('digest', univ.OctetString(digest))
+		# with open('segment_' + str(code_sect_header.offset) + ".bin", 'wb') as f:
+		#   f.write(code_sect_bytes)
+
+		code_section_digest = CodeSectionDigest()
+		code_section_digest.setComponentByName('offset', code_sect_header.offset)
+		code_section_digest.setComponentByName('digestAlgorithm', univ.ObjectIdentifier('2.16.840.1.101.3.4.2.1'))
+		code_section_digest.setComponentByName('digest', univ.OctetString(digest))
 
-		setOfDigest = SetOfCodeSectionDigest()
-		setOfDigest.setComponentByPosition(0, codeSectionDigest)
+		set_of_digest = SetOfCodeSectionDigest()
+		set_of_digest.setComponentByPosition(0, code_section_digest)
 
 		codeSegmentDigest = CodeSegmentDigest()
-		codeSegmentDigest.setComponentByName('offset', codeSectionHeader.offset)
-		codeSegmentDigest.setComponentByName('codeSectionDigests', setOfDigest)
+		codeSegmentDigest.setComponentByName('offset', code_sect_header.offset)
+		codeSegmentDigest.setComponentByName('codeSectionDigests', set_of_digest)
 
-		codeSegmentDigests.setComponentByPosition(codeSegmentIdx, codeSegmentDigest)
-		codeSegmentIdx += 1
+		code_segment_digests.setComponentByPosition(code_segment_idx, codeSegmentDigest)
+		code_segment_idx += 1
 
-	archDigest.setComponentByName('CodeSegmentDigests', codeSegmentDigests)
+	arch_digest.setComponentByName('CodeSegmentDigests', code_segment_digests)
 
 	setOfArchDigests = SetOfArchitectureDigest()
-	setOfArchDigests.setComponentByPosition(0, archDigest)
+	setOfArchDigests.setComponentByPosition(0, arch_digest)
 
 	appDigest = ApplicationDigest()
 
 	appDigest.setComponentByName('version', 1)
 	appDigest.setComponentByName('digests', setOfArchDigests)
 
-	binaryDigest = encoder.encode(appDigest)
+	binaryDigest = der_encoder.encode(appDigest)
+
+	with open(app_args.output, 'wb') as f:
+		f.write(binaryDigest)
 
-	outFile = open(app_args.output, 'wb')
-	outFile.write(binaryDigest)
+	# sign with openssl if specified
+	if app_args.openssl_path is not None:
+		assert app_args.signer_cert is not None
+		
+		out_base, out_ext = os.path.splitext(app_args.output)
+		signed_path = out_base + ".signed" + out_ext
+		
+		# http://stackoverflow.com/questions/12507277/how-to-fix-unable-to-write-random-state-in-openssl
+		temp_file = None
+		if sys.platform == "win32" and "RANDFILE" not in os.environ:
+			temp_file = create_temp_file()
+			os.environ["RANDFILE"] = temp_file
+			
+		try:
+			subprocess.check_call([app_args.openssl_path, "cms", "-sign", "-nodetach", "-md", "sha256", "-binary", "-in", app_args.output, "-outform", "der", "-out", signed_path, "-signer", app_args.signer_cert], )
+		finally:
+			if temp_file is not None: 
+				del os.environ["RANDFILE"]
+				os.unlink(temp_file)
 
 if __name__ == '__main__':
 	main()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/action/file_generate.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/action/file_generate.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/action/file_generate.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/action/file_generate.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,53 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Given a Python script and arguments describing the output file, and
+# the arguments that can be used to generate the output file, call the
+# script's |main| method with appropriate arguments.
+
+from __future__ import print_function
+import argparse
+import imp
+import os
+import sys
+import traceback
+
+from mozbuild.util import FileAvoidWrite
+
+def main(argv):
+    parser = argparse.ArgumentParser('Generate a file from a Python script',
+                                     add_help=False)
+    parser.add_argument('python_script', metavar='python-script', type=str,
+                        help='The Python script to run')
+    parser.add_argument('method_name', metavar='method-name', type=str,
+                        help='The method of the script to invoke')
+    parser.add_argument('output_file', metavar='output-file', type=str,
+                        help='The file to generate')
+    parser.add_argument('additional_arguments', metavar='arg', nargs='*',
+                        help="Additional arguments to the script's main() method")
+
+    args = parser.parse_args(argv)
+
+    script = args.python_script
+    with open(script, 'r') as fh:
+        module = imp.load_module('script', fh, script,
+                                 ('.py', 'r', imp.PY_SOURCE))
+    method = args.method_name
+    if not hasattr(module, method):
+        print('Error: script "{0}" is missing a {1} method'.format(script, method),
+              file=sys.stderr)
+        return 1
+
+    ret = 1
+    try:
+        with FileAvoidWrite(args.output_file) as output:
+            ret = module.__dict__[method](output, *args.additional_arguments)
+    except IOError as e:
+        print('Error opening file "{0}"'.format(e.filename), file=sys.stderr)
+        traceback.print_exc()
+        return 1
+    return ret
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/action/package_geckolibs_aar.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/action/package_geckolibs_aar.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/action/package_geckolibs_aar.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/action/package_geckolibs_aar.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,131 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+'''
+Script to produce an Android ARchive (.aar) containing the compiled
+Gecko library binaries.  The AAR file is intended for use by local
+developers using Gradle.
+'''
+
+from __future__ import print_function
+
+import argparse
+import hashlib
+import os
+import sys
+
+from mozbuild import util
+from mozpack.copier import Jarrer
+from mozpack.files import (
+    File,
+    FileFinder,
+)
+
+MAVEN_POM_TEMPLATE = r'''
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>{groupId}</groupId>
+  <artifactId>{artifactId}</artifactId>
+  <version>{version}</version>
+  <packaging>{packaging}</packaging>
+</project>
+'''.lstrip()
+
+IVY_XML_TEMPLATE = r'''
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0">
+  <info organisation="{organisation}" module="{module}" revision="{revision}" status="integration" publication="{publication}"/>
+  <configurations/>
+  <publications>
+    <artifact name="{name}" type="{type}" ext="{ext}"/>
+  </publications>
+  <dependencies/>
+</ivy-module>
+'''.lstrip()
+
+def package_geckolibs_aar(topsrcdir, distdir, output_file):
+    jarrer = Jarrer(optimize=False)
+
+    srcdir = os.path.join(topsrcdir, 'mobile', 'android', 'geckoview_library', 'geckolibs')
+    jarrer.add('AndroidManifest.xml', File(os.path.join(srcdir, 'AndroidManifest.xml')))
+    jarrer.add('classes.jar', File(os.path.join(srcdir, 'classes.jar')))
+
+    jni = FileFinder(os.path.join(distdir, 'fennec', 'lib'))
+    for p, f in jni.find('**/*.so'):
+        jarrer.add(os.path.join('jni', p), f)
+
+    # Include the buildinfo JSON as an asset, to give future consumers at least
+    # a hope of determining where this AAR came from.
+    json = FileFinder(distdir, ignore=['*.mozinfo.json'])
+    for p, f in json.find('*.json'):
+        jarrer.add(os.path.join('assets', p), f)
+
+    # This neatly ignores omni.ja.
+    assets = FileFinder(os.path.join(distdir, 'fennec', 'assets'))
+    for p, f in assets.find('**/*.so'):
+        jarrer.add(os.path.join('assets', p), f)
+
+    jarrer.copy(output_file)
+    return 0
+
+
+def main(args):
+    parser = argparse.ArgumentParser()
+    parser.add_argument(dest='dir',
+                        metavar='DIR',
+                        help='Path to write geckolibs Android ARchive and metadata to.')
+    parser.add_argument('--verbose', '-v', default=False, action='store_true',
+                        help='be verbose')
+    parser.add_argument('--revision',
+                        help='Revision identifier to write.')
+    parser.add_argument('--topsrcdir',
+                        help='Top source directory.')
+    parser.add_argument('--distdir',
+                        help='Distribution directory (usually $OBJDIR/dist).')
+    args = parser.parse_args(args)
+
+    paths_to_hash = []
+
+    aar = os.path.join(args.dir, 'geckolibs-{revision}.aar').format(revision=args.revision)
+    paths_to_hash.append(aar)
+    package_geckolibs_aar(args.topsrcdir, args.distdir, aar)
+
+    pom = os.path.join(args.dir, 'geckolibs-{revision}.pom').format(revision=args.revision)
+    paths_to_hash.append(pom)
+    with open(pom, 'wt') as f:
+        f.write(MAVEN_POM_TEMPLATE.format(
+            groupId='org.mozilla',
+            artifactId='geckolibs',
+            version=args.revision,
+            packaging='aar',
+        ))
+
+    ivy = os.path.join(args.dir, 'ivy-geckolibs-{revision}.xml').format(revision=args.revision)
+    paths_to_hash.append(ivy)
+    with open(ivy, 'wt') as f:
+        f.write(IVY_XML_TEMPLATE.format(
+            organisation='org.mozilla',
+            module='geckolibs',
+            revision=args.revision,
+            publication=args.revision, # A white lie.
+            name='geckolibs',
+            type='aar',
+            ext='aar',
+        ))
+
+    for p in paths_to_hash:
+        sha = "%s.sha1" % p
+        with open(sha, 'wt') as f:
+            f.write(util.hash_file(p, hasher=hashlib.sha1()))
+        if args.verbose:
+            print(p)
+            print(sha)
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/backend/recursivemake.py	2015-02-28 15:03:11.000000000 +0000
@@ -36,6 +36,7 @@
     Exports,
     ExternalLibrary,
     FinalTargetFiles,
+    GeneratedFile,
     GeneratedInclude,
     GeneratedSources,
     HostLibrary,
@@ -404,6 +405,17 @@
         elif isinstance(obj, Exports):
             self._process_exports(obj, obj.exports, backend_file)
 
+        elif isinstance(obj, GeneratedFile):
+            backend_file.write('GENERATED_FILES += %s\n' % obj.output)
+            if obj.script:
+                backend_file.write("""{output}: {script}{inputs}
+\t$(call py_action,file_generate,{script} {method} {output}{inputs})
+
+""".format(output=obj.output,
+           inputs=' ' + ' '.join(obj.inputs) if obj.inputs else '',
+           script=obj.script,
+           method=obj.method))
+
         elif isinstance(obj, TestHarnessFiles):
             self._process_test_harness_files(obj, backend_file)
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/controller/building.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/controller/building.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/controller/building.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/controller/building.py	2015-02-28 15:03:11.000000000 +0000
@@ -492,7 +492,7 @@
     DIRECTORY_DESCRIPTION = "cache directory"
     PRIMARY_CONFIG_DESCRIPTION = "primary config"
     SECONDARY_CONFIG_DESCRIPTION = "secondary config      (readonly)"
-    ABSOLUTE_KEYS = {'cache_max_size'}
+    ABSOLUTE_KEYS = {'cache_files', 'cache_size', 'cache_max_size'}
     FORMAT_KEYS = {'cache_size', 'cache_max_size'}
 
     GiB = 1024 ** 3
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/context.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/context.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/context.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/context.py	2015-02-28 15:03:11.000000000 +0000
@@ -60,11 +60,11 @@
     lots of empty/default values, you have a data structure with only the
     values that were read or touched.
 
-    Instances of variables classes are created by invoking class_name(),
-    except when class_name derives from ContextDerivedValue, in which
-    case class_name(instance_of_the_context) is invoked.
-    A value is added to those calls when instances are created during
-    assignment (setitem).
+    Instances of variables classes are created by invoking ``class_name()``,
+    except when class_name derives from ``ContextDerivedValue`` or
+    ``SubContext``, in which case ``class_name(instance_of_the_context)`` or
+    ``class_name(self)`` is invoked. A value is added to those calls when
+    instances are created during assignment (setitem).
 
     allowed_variables is a dict of the variables that can be set and read in
     this context instance. Keys in this dict are the strings representing keys
@@ -83,7 +83,8 @@
         # a list to be a problem.
         self._all_paths = []
         self.config = config
-        self.executed_time = 0
+        self.execution_time = 0
+        self._sandbox = None
         KeyedDefaultDict.__init__(self, self._factory)
 
     def push_source(self, path):
@@ -272,6 +273,35 @@
         return Context._validate(self, key, value, True)
 
 
+class SubContext(Context, ContextDerivedValue):
+    """A Context derived from another Context.
+
+    Sub-contexts are intended to be used as context managers.
+
+    Sub-contexts inherit paths and other relevant state from the parent
+    context.
+    """
+    def __init__(self, parent):
+        assert isinstance(parent, Context)
+
+        Context.__init__(self, allowed_variables=self.VARIABLES,
+                         config=parent.config)
+
+        # Copy state from parent.
+        for p in parent.source_stack:
+            self.push_source(p)
+        self._sandbox = parent._sandbox
+
+    def __enter__(self):
+        if not self._sandbox or self._sandbox() is None:
+            raise Exception('a sandbox is required')
+
+        self._sandbox().push_subcontext(self)
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self._sandbox().pop_subcontext(self)
+
+
 class FinalTargetValue(ContextDerivedValue, unicode):
     def __new__(cls, context, value=""):
         if not value:
@@ -366,6 +396,27 @@
     return _TypedList
 
 
+# This defines functions that create sub-contexts.
+#
+# Values are classes that are SubContexts. The class name will be turned into
+# a function that when called emits an instance of that class.
+#
+# Arbitrary arguments can be passed to the class constructor. The first
+# argument is always the parent context. It is up to each class to perform
+# argument validation.
+SUBCONTEXTS = [
+]
+
+for cls in SUBCONTEXTS:
+    if not issubclass(cls, SubContext):
+        raise ValueError('SUBCONTEXTS entry not a SubContext class: %s' % cls)
+
+    if not hasattr(cls, 'VARIABLES'):
+        raise ValueError('SUBCONTEXTS entry does not have VARIABLES: %s' % cls)
+
+SUBCONTEXTS = {cls.__name__: cls for cls in SUBCONTEXTS}
+
+
 # This defines the set of mutable global variables.
 #
 # Each variable is a tuple of:
@@ -444,12 +495,45 @@
         and reduce the debug info size.
         """, None),
 
-    'GENERATED_FILES': (StrictOrderingOnAppendList, list,
+    'GENERATED_FILES': (StrictOrderingOnAppendListWithFlagsFactory({
+                'script': unicode,
+                'inputs': list }), list,
         """Generic generated files.
 
-        This variable contains a list of generate files for the build system
-        to generate at export time. The rules for those files still live in
-        Makefile.in.
+        This variable contains a list of files for the build system to
+        generate at export time. The generation method may be declared
+        with optional ``script`` and ``inputs`` flags on individual entries.
+        If the optional ``script`` flag is not present on an entry, it
+        is assumed that rules for generating the file are present in
+        the associated Makefile.in.
+
+        Example::
+
+           GENERATED_FILES += ['bar.c', 'baz.c', 'foo.c']
+           bar = GENERATED_FILES['bar.c']
+           bar.script = 'generate.py'
+           bar.inputs = ['datafile-for-bar']
+           foo = GENERATED_FILES['foo.c']
+           foo.script = 'generate.py'
+           foo.inputs = ['datafile-for-foo']
+
+        This definition will generate bar.c by calling the main method of
+        generate.py with a open (for writing) file object for bar.c, and
+        the string ``datafile-for-bar``. In a similar fashion, the main
+        method of generate.py will also be called with an open
+        (for writing) file object for foo.c and the string
+        ``datafile-for-foo``. Please note that only string arguments are
+        supported for passing to scripts, and that all arguments provided
+        to the script should be filenames relative to the directory in which
+        the moz.build file is located.
+
+        To enable using the same script for generating multiple files with
+        slightly different non-filename parameters, alternative entry points
+        into ``script`` can be specified::
+
+          GENERATED_FILES += ['bar.c']
+          bar = GENERATED_FILES['bar.c']
+          bar.script = 'generate.py:make_bar'
         """, 'export'),
 
     'DEFINES': (OrderedDict, dict,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/data.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/data.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/data.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/data.py	2015-02-28 15:03:11.000000000 +0000
@@ -853,6 +853,24 @@
         self.target = target
 
 
+class GeneratedFile(ContextDerived):
+    """Represents a generated file."""
+
+    __slots__ = (
+        'script',
+        'method',
+        'output',
+        'inputs',
+    )
+
+    def __init__(self, context, script, method, output, inputs):
+        ContextDerived.__init__(self, context)
+        self.script = script
+        self.method = method
+        self.output = output
+        self.inputs = inputs
+
+
 class ClassPathEntry(object):
     """Represents a classpathentry in an Android Eclipse project."""
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/emitter.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/emitter.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/emitter.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/emitter.py	2015-02-28 15:03:11.000000000 +0000
@@ -32,6 +32,7 @@
     Exports,
     FinalTargetFiles,
     GeneratedEventWebIDLFile,
+    GeneratedFile,
     GeneratedInclude,
     GeneratedSources,
     GeneratedWebIDLFile,
@@ -410,7 +411,6 @@
             'EXTRA_PP_COMPONENTS',
             'FAIL_ON_WARNINGS',
             'USE_STATIC_LIBS',
-            'GENERATED_FILES',
             'IS_GYP_DIR',
             'MSVC_ENABLE_PGO',
             'NO_DIST_INSTALL',
@@ -518,6 +518,40 @@
             yield Exports(context, exports,
                 dist_install=not context.get('NO_DIST_INSTALL', False))
 
+        generated_files = context.get('GENERATED_FILES')
+        if generated_files:
+            for f in generated_files:
+                flags = generated_files[f]
+                output = f
+                if flags.script:
+                    method = "main"
+                    # Deal with cases like "C:\\path\\to\\script.py:function".
+                    if not flags.script.endswith('.py') and ':' in flags.script:
+                        script, method = flags.script.rsplit(':', 1)
+                    else:
+                        script = flags.script
+                    script = mozpath.join(context.srcdir, script)
+                    inputs = [mozpath.join(context.srcdir, i) for i in flags.inputs]
+
+                    if not os.path.exists(script):
+                        raise SandboxValidationError(
+                            'Script for generating %s does not exist: %s'
+                            % (f, script), context)
+                    if os.path.splitext(script)[1] != '.py':
+                        raise SandboxValidationError(
+                            'Script for generating %s does not end in .py: %s'
+                            % (f, script), context)
+                    for i in inputs:
+                        if not os.path.exists(i):
+                            raise SandboxValidationError(
+                                'Input for generating %s does not exist: %s'
+                                % (f, i), context)
+                else:
+                    script = None
+                    method = None
+                    inputs = []
+                yield GeneratedFile(context, script, method, output, inputs)
+
         test_harness_files = context.get('TEST_HARNESS_FILES')
         if test_harness_files:
             srcdir_files = defaultdict(list)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/reader.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/reader.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/reader.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/reader.py	2015-02-28 15:03:11.000000000 +0000
@@ -62,6 +62,7 @@
     VARIABLES,
     DEPRECATION_HINTS,
     SPECIAL_VARIABLES,
+    SUBCONTEXTS,
     TemplateContext,
 )
 
@@ -140,12 +141,14 @@
             return SPECIAL_VARIABLES[key][0](self._context)
         if key in FUNCTIONS:
             return self._create_function(FUNCTIONS[key])
+        if key in SUBCONTEXTS:
+            return self._create_subcontext(SUBCONTEXTS[key])
         if key in self.templates:
             return self._create_template_function(self.templates[key])
         return Sandbox.__getitem__(self, key)
 
     def __setitem__(self, key, value):
-        if key in SPECIAL_VARIABLES or key in FUNCTIONS:
+        if key in SPECIAL_VARIABLES or key in FUNCTIONS or key in SUBCONTEXTS:
             raise KeyError()
         if key in self.exports:
             self._context[key] = value
@@ -311,6 +314,14 @@
         self.templates[name] = func, code, self._context.current_path
 
     @memoize
+    def _create_subcontext(self, cls):
+        """Return a function object that creates SubContext instances."""
+        def fn(*args, **kwargs):
+            return cls(self._context, *args, **kwargs)
+
+        return fn
+
+    @memoize
     def _create_function(self, function_def):
         """Returns a function object for use within the sandbox for the given
         function definition.
@@ -719,10 +730,9 @@
     each sandbox evaluation. Its return value is ignored.
     """
 
-    def __init__(self, config, sandbox_post_eval_cb=None):
+    def __init__(self, config):
         self.config = config
 
-        self._sandbox_post_eval_cb = sandbox_post_eval_cb
         self._log = logging.getLogger(__name__)
         self._read_files = set()
         self._execution_stack = []
@@ -737,7 +747,7 @@
         read, a new Context is created and emitted.
         """
         path = mozpath.join(self.config.topsrcdir, 'moz.build')
-        return self.read_mozbuild(path, self.config, read_tiers=True)
+        return self.read_mozbuild(path, self.config)
 
     def all_mozbuild_paths(self):
         """Iterator over all available moz.build files.
@@ -873,8 +883,7 @@
             for name, key, value in assignments:
                 yield p, name, key, value
 
-    def read_mozbuild(self, path, config, read_tiers=False, descend=True,
-            metadata={}):
+    def read_mozbuild(self, path, config, descend=True, metadata={}):
         """Read and process a mozbuild file, descending into children.
 
         This starts with a single mozbuild file, executes it, and descends into
@@ -885,10 +894,6 @@
         directory, we will open the moz.build file located in that
         directory in a new Sandbox and process it.
 
-        If read_tiers is True (it should only be True for the top-level
-        mozbuild file in a project), the TIERS variable will be used for
-        traversal as well.
-
         If descend is True (the default), we will descend into child
         directories and files per variable values.
 
@@ -901,8 +906,8 @@
         """
         self._execution_stack.append(path)
         try:
-            for s in self._read_mozbuild(path, config, read_tiers=read_tiers,
-                descend=descend, metadata=metadata):
+            for s in self._read_mozbuild(path, config, descend=descend,
+                                         metadata=metadata):
                 yield s
 
         except BuildReaderError as bre:
@@ -928,7 +933,7 @@
             raise BuildReaderError(list(self._execution_stack),
                 sys.exc_info()[2], other_error=e)
 
-    def _read_mozbuild(self, path, config, read_tiers, descend, metadata):
+    def _read_mozbuild(self, path, config, descend, metadata):
         path = mozpath.normpath(path)
         log(self._log, logging.DEBUG, 'read_mozbuild', {'path': path},
             'Reading file: {path}')
@@ -967,9 +972,6 @@
         sandbox.exec_file(path)
         context.execution_time = time.time() - time_start
 
-        if self._sandbox_post_eval_cb:
-            self._sandbox_post_eval_cb(context)
-
         # We first collect directories populated in variables.
         dir_vars = ['DIRS']
 
@@ -981,7 +983,7 @@
         curdir = mozpath.dirname(path)
 
         gyp_contexts = []
-        for target_dir in context['GYP_DIRS']:
+        for target_dir in context.get('GYP_DIRS', []):
             gyp_dir = context['GYP_DIRS'][target_dir]
             for v in ('input', 'variables'):
                 if not getattr(gyp_dir, v):
@@ -1011,15 +1013,13 @@
                 gyp_contexts.append(gyp_context)
 
         for gyp_context in gyp_contexts:
-            if self._sandbox_post_eval_cb:
-                self._sandbox_post_eval_cb(gyp_context)
-
             context['DIRS'].append(mozpath.relpath(gyp_context.objdir, context.objdir))
+            sandbox.subcontexts.append(gyp_context)
 
         yield context
 
-        for gyp_context in gyp_contexts:
-            yield gyp_context
+        for subcontext in sandbox.subcontexts:
+            yield subcontext
 
         # Traverse into referenced files.
 
@@ -1058,7 +1058,7 @@
                 continue
 
             for res in self.read_mozbuild(child_path, context.config,
-                read_tiers=False, metadata=child_metadata):
+                                          metadata=child_metadata):
                 yield res
 
         self._execution_stack.pop()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/sandbox.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/sandbox.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/frontend/sandbox.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/frontend/sandbox.py	2015-02-28 15:03:11.000000000 +0000
@@ -22,6 +22,7 @@
 import copy
 import os
 import sys
+import weakref
 
 from contextlib import contextmanager
 
@@ -116,12 +117,22 @@
         assert isinstance(self._builtins, ReadOnlyDict)
         assert isinstance(context, Context)
 
-        self._context = context
+        # Contexts are modeled as a stack because multiple context managers
+        # may be active.
+        self._active_contexts = [context]
+
+        # Seen sub-contexts. Will be populated with other Context instances
+        # that were related to execution of this instance.
+        self.subcontexts = []
 
         # We need to record this because it gets swallowed as part of
         # evaluation.
         self._last_name_error = None
 
+    @property
+    def _context(self):
+        return self._active_contexts[-1]
+
     def exec_file(self, path):
         """Execute code at a path in the sandbox.
 
@@ -153,6 +164,9 @@
         if path:
             self._context.push_source(path)
 
+        old_sandbox = self._context._sandbox
+        self._context._sandbox = weakref.ref(self)
+
         # We don't have to worry about bytecode generation here because we are
         # too low-level for that. However, we could add bytecode generation via
         # the marshall module if parsing performance were ever an issue.
@@ -190,9 +204,31 @@
             raise SandboxExecutionError(self._context.source_stack, exc[0],
                 exc[1], exc[2])
         finally:
+            self._context._sandbox = old_sandbox
             if path:
                 self._context.pop_source()
 
+    def push_subcontext(self, context):
+        """Push a SubContext onto the execution stack.
+
+        When called, the active context will be set to the specified context,
+        meaning all variable accesses will go through it. We also record this
+        SubContext as having been executed as part of this sandbox.
+        """
+        self._active_contexts.append(context)
+        if context not in self.subcontexts:
+            self.subcontexts.append(context)
+
+    def pop_subcontext(self, context):
+        """Pop a SubContext off the execution stack.
+
+        SubContexts must be pushed and popped in opposite order. This is
+        validated as part of the function call to ensure proper consumer API
+        use.
+        """
+        popped = self._active_contexts.pop()
+        assert popped == context
+
     def __getitem__(self, key):
         if key.isupper():
             try:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/mozinfo.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/mozinfo.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/mozinfo.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/mozinfo.py	2015-02-28 15:03:11.000000000 +0000
@@ -83,6 +83,7 @@
     d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1'
     d['asan'] = substs.get('MOZ_ASAN') == '1'
     d['tsan'] = substs.get('MOZ_TSAN') == '1'
+    d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1'
     d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
     d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/sphinx.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/sphinx.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/sphinx.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/sphinx.py	2015-02-28 15:03:11.000000000 +0000
@@ -101,6 +101,21 @@
 
 def format_module(m):
     lines = []
+
+    for subcontext, cls in sorted(m.SUBCONTEXTS.items()):
+        lines.extend([
+            '.. _mozbuild_subcontext_%s:' % subcontext,
+            '',
+            'Sub-Context: %s' % subcontext,
+            '=============' + '=' * len(subcontext),
+            '',
+            prepare_docstring(cls.__doc__)[0],
+            '',
+        ])
+
+        for k, v in sorted(cls.VARIABLES.items()):
+            lines.extend(variable_reference(k, *v))
+
     lines.extend([
         'Variables',
         '=========',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/backend/data/generated-files/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/backend/data/generated-files/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/backend/data/generated-files/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/backend/data/generated-files/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,12 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_FILES += [ 'bar.c', 'foo.c', 'quux.c' ]
+
+bar = GENERATED_FILES['bar.c']
+bar.script = 'generate-bar.py:baz'
+
+foo = GENERATED_FILES['foo.c']
+foo.script = 'generate-foo.py'
+foo.inputs = ['foo-data']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/backend/test_recursivemake.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/backend/test_recursivemake.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/backend/test_recursivemake.py	2015-02-28 15:03:11.000000000 +0000
@@ -369,6 +369,28 @@
         self.assertIn('mozilla/mozilla1.h', m)
         self.assertIn('mozilla/dom/dom2.h', m)
 
+    def test_generated_files(self):
+        """Ensure GENERATED_FILES is handled properly."""
+        env = self._consume('generated-files', RecursiveMakeBackend)
+
+        backend_path = mozpath.join(env.topobjdir, 'backend.mk')
+        lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
+
+        expected = [
+            'GENERATED_FILES += bar.c',
+            'bar.c: %s/generate-bar.py' % env.topsrcdir,
+            '$(call py_action,file_generate,%s/generate-bar.py baz bar.c)' % env.topsrcdir,
+            '',
+            'GENERATED_FILES += foo.c',
+            'foo.c: %s/generate-foo.py %s/foo-data' % (env.topsrcdir, env.topsrcdir),
+            '$(call py_action,file_generate,%s/generate-foo.py main foo.c %s/foo-data)' % (env.topsrcdir, env.topsrcdir),
+            '',
+            'GENERATED_FILES += quux.c',
+        ]
+
+        self.maxDiff = None
+        self.assertEqual(lines, expected)
+
     def test_resources(self):
         """Ensure RESOURCE_FILES is handled properly."""
         env = self._consume('resources', RecursiveMakeBackend)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/controller/test_ccachestats.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/controller/test_ccachestats.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/controller/test_ccachestats.py	2015-02-28 15:03:11.000000000 +0000
@@ -80,6 +80,50 @@
     max cache size                       8.6 GB
     """
 
+    STAT4 = """
+    cache directory                     /Users/tlin/.ccache
+    primary config                      /Users/tlin/.ccache/ccache.conf
+    secondary config      (readonly)    /usr/local/Cellar/ccache/3.2.1/etc/ccache.conf
+    cache hit (direct)                 21039
+    cache hit (preprocessed)            2315
+    cache miss                         39370
+    called for link                     3651
+    called for preprocessing            6693
+    compile failed                       723
+    ccache internal error                  1
+    preprocessor error                   588
+    bad compiler arguments               128
+    unsupported source language           99
+    autoconf compile/link               3669
+    unsupported compiler option          187
+    no input file                       1711
+    files in cache                     18313
+    cache size                           6.3 GB
+    max cache size                       6.0 GB
+    """
+
+    STAT5 = """
+    cache directory                     /Users/tlin/.ccache
+    primary config                      /Users/tlin/.ccache/ccache.conf
+    secondary config      (readonly)    /usr/local/Cellar/ccache/3.2.1/etc/ccache.conf
+    cache hit (direct)                 21039
+    cache hit (preprocessed)            2315
+    cache miss                         39372
+    called for link                     3653
+    called for preprocessing            6693
+    compile failed                       723
+    ccache internal error                  1
+    preprocessor error                   588
+    bad compiler arguments               128
+    unsupported source language           99
+    autoconf compile/link               3669
+    unsupported compiler option          187
+    no input file                       1711
+    files in cache                     17411
+    cache size                           6.0 GB
+    max cache size                       6.0 GB
+    """
+
     def test_parse_garbage_stats_message(self):
         self.assertRaises(ValueError, CCacheStats, self.STAT_GARBAGE)
 
@@ -116,6 +160,13 @@
         self.assertTrue(stat3)
         self.assertTrue(stats_diff)
 
+    def test_cache_size_shrinking(self):
+        stat4 = CCacheStats(self.STAT4)
+        stat5 = CCacheStats(self.STAT5)
+        stats_diff = stat5 - stat4
+        self.assertTrue(stat4)
+        self.assertTrue(stat5)
+        self.assertTrue(stats_diff)
 
 if __name__ == '__main__':
     main()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,5 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_FILES += [ 'bar.c', 'foo.c' ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-absolute-script/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-absolute-script/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-absolute-script/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-absolute-script/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,9 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_FILES += ['bar.c']
+
+bar = GENERATED_FILES['bar.c']
+bar.script = TOPSRCDIR + '/script.py:make_bar'
+bar.inputs = []
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-method-names/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-method-names/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-method-names/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-method-names/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,13 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_FILES += [ 'bar.c', 'foo.c' ]
+
+bar = GENERATED_FILES['bar.c']
+bar.script = 'script.py:make_bar'
+bar.inputs = []
+
+foo = GENERATED_FILES['foo.c']
+foo.script = 'script.py'
+foo.inputs = []
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-inputs/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-inputs/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-inputs/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-inputs/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,9 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_FILES += ['bar.c', 'foo.c']
+
+foo = GENERATED_FILES['foo.c']
+foo.script = 'script.py'
+foo.inputs = ['datafile']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-python-script/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-python-script/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-python-script/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-python-script/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_FILES += ['bar.c', 'foo.c']
+
+bar = GENERATED_FILES['bar.c']
+bar.script = 'script.rb'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-script/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-script/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-script/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/data/generated-files-no-script/moz.build	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_FILES += [ 'bar.c', 'foo.c' ]
+
+bar = GENERATED_FILES['bar.c']
+bar.script = 'nonexistent-script.py'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/test_context.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/test_context.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/test_context.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/test_context.py	2015-02-28 15:03:11.000000000 +0000
@@ -11,6 +11,7 @@
     Context,
     FUNCTIONS,
     SPECIAL_VARIABLES,
+    SUBCONTEXTS,
     VARIABLES,
 )
 
@@ -256,6 +257,12 @@
         for func, typ, doc in SPECIAL_VARIABLES.values():
             self._verify_doc(doc)
 
+        for name, cls in SUBCONTEXTS.items():
+            self._verify_doc(cls.__doc__)
+
+            for name, v in cls.VARIABLES.items():
+                self._verify_doc(v[2])
+
 
 if __name__ == '__main__':
     main()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/test_emitter.py	2015-02-28 15:03:11.000000000 +0000
@@ -14,6 +14,7 @@
     Defines,
     DirectoryTraversal,
     Exports,
+    GeneratedFile,
     GeneratedInclude,
     GeneratedSources,
     HostSources,
@@ -182,6 +183,67 @@
         self.assertEqual(wanted, variables)
         self.maxDiff = maxDiff
 
+    def test_generated_files(self):
+        reader = self.reader('generated-files')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 2)
+        for o in objs:
+            self.assertIsInstance(o, GeneratedFile)
+
+        expected = ['bar.c', 'foo.c']
+        for o, expected_filename in zip(objs, expected):
+            self.assertEqual(o.output, expected_filename)
+            self.assertEqual(o.script, None)
+            self.assertEqual(o.method, None)
+            self.assertEqual(o.inputs, [])
+
+    def test_generated_files_method_names(self):
+        reader = self.reader('generated-files-method-names')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 2)
+        for o in objs:
+            self.assertIsInstance(o, GeneratedFile)
+
+        expected = ['bar.c', 'foo.c']
+        expected_method_names = ['make_bar', 'main']
+        for o, expected_filename, expected_method in zip(objs, expected, expected_method_names):
+            self.assertEqual(o.output, expected_filename)
+            self.assertEqual(o.method, expected_method)
+            self.assertEqual(o.inputs, [])
+
+    def test_generated_files_absolute_script(self):
+        reader = self.reader('generated-files-absolute-script')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 1)
+
+        o = objs[0]
+        self.assertIsInstance(o, GeneratedFile)
+        self.assertEqual(o.output, 'bar.c')
+        self.assertRegexpMatches(o.script, 'script.py$')
+        self.assertEqual(o.method, 'make_bar')
+        self.assertEqual(o.inputs, [])
+
+    def test_generated_files_no_script(self):
+        reader = self.reader('generated-files-no-script')
+        with self.assertRaisesRegexp(SandboxValidationError,
+            'Script for generating bar.c does not exist'):
+            objs = self.read_topsrcdir(reader)
+
+    def test_generated_files_no_inputs(self):
+        reader = self.reader('generated-files-no-inputs')
+        with self.assertRaisesRegexp(SandboxValidationError,
+            'Input for generating foo.c does not exist'):
+            objs = self.read_topsrcdir(reader)
+
+    def test_generated_files_no_python_script(self):
+        reader = self.reader('generated-files-no-python-script')
+        with self.assertRaisesRegexp(SandboxValidationError,
+            'Script for generating bar.c does not end in .py'):
+            objs = self.read_topsrcdir(reader)
+
     def test_exports(self):
         reader = self.reader('exports')
         objs = self.read_topsrcdir(reader)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/test_reader.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/test_reader.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/test/frontend/test_reader.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/test/frontend/test_reader.py	2015-02-28 15:03:11.000000000 +0000
@@ -237,21 +237,6 @@
         self.assertEqual([context['XPIDL_MODULE'] for context in contexts],
             ['foobar', 'foobar', 'baz', 'foobar'])
 
-    def test_process_eval_callback(self):
-        def strip_dirs(context):
-            context['DIRS'][:] = []
-            count[0] += 1
-
-        reader = self.reader('traversal-simple',
-            sandbox_post_eval_cb=strip_dirs)
-
-        count = [0]
-
-        contexts = list(reader.read_topsrcdir())
-
-        self.assertEqual(len(contexts), 1)
-        self.assertEqual(len(count), 1)
-
 
 if __name__ == '__main__':
     main()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/util.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/util.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozbuild/util.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozbuild/util.py	2015-02-28 15:03:11.000000000 +0000
@@ -31,12 +31,12 @@
 else:
     str_type = basestring
 
-def hash_file(path):
+def hash_file(path, hasher=None):
     """Hashes a file specified by the path given and returns the hex digest."""
 
-    # If the hashing function changes, this may invalidate lots of cached data.
-    # Don't change it lightly.
-    h = hashlib.sha1()
+    # If the default hashing function changes, this may invalidate
+    # lots of cached data.  Don't change it lightly.
+    h = hasher or hashlib.sha1()
 
     with open(path, 'rb') as fh:
         while True:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozpack/path.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozpack/path.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/mozbuild/mozpack/path.py	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/mozbuild/mozpack/path.py	2015-02-28 15:03:11.000000000 +0000
@@ -99,12 +99,12 @@
     '''
     if not pattern:
         return True
-    if not pattern in re_cache:
-        pattern = re.escape(pattern)
-        pattern = re.sub(r'(^|\\\/)\\\*\\\*\\\/', r'\1(?:.+/)?', pattern)
-        pattern = re.sub(r'(^|\\\/)\\\*\\\*$', r'(?:\1.+)?', pattern)
-        pattern = pattern.replace(r'\*', '[^/]*') + '(?:/.*)?$'
-        re_cache[pattern] = re.compile(pattern)
+    if pattern not in re_cache:
+        p = re.escape(pattern)
+        p = re.sub(r'(^|\\\/)\\\*\\\*\\\/', r'\1(?:.+/)?', p)
+        p = re.sub(r'(^|\\\/)\\\*\\\*$', r'(?:\1.+)?', p)
+        p = p.replace(r'\*', '[^/]*') + '(?:/.*)?$'
+        re_cache[pattern] = re.compile(p)
     return re_cache[pattern].match(path) is not None
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/HISTORY.rst thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/HISTORY.rst
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/HISTORY.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/HISTORY.rst	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,904 @@
+.. :changelog:
+
+Release History
+---------------
+
+2.5.1 (2014-12-23)
+++++++++++++++++++
+
+**Behavioural Changes**
+
+- Only catch HTTPErrors in raise_for_status (#2382)
+
+**Bugfixes**
+
+- Handle LocationParseError from urllib3 (#2344)
+- Handle file-like object filenames that are not strings (#2379)
+- Unbreak HTTPDigestAuth handler. Allow new nonces to be negotiated (#2389)
+
+2.5.0 (2014-12-01)
+++++++++++++++++++
+
+**Improvements**
+
+- Allow usage of urllib3's Retry object with HTTPAdapters (#2216)
+- The ``iter_lines`` method on a response now accepts a delimiter with which
+  to split the content (#2295)
+
+**Behavioural Changes**
+
+- Add deprecation warnings to functions in requests.utils that will be removed
+  in 3.0 (#2309)
+- Sessions used by the functional API are always closed (#2326)
+- Restrict requests to HTTP/1.1 and HTTP/1.0 (stop accepting HTTP/0.9) (#2323)
+
+**Bugfixes**
+
+- Only parse the URL once (#2353)
+- Allow Content-Length header to always be overriden (#2332)
+- Properly handle files in HTTPDigestAuth (#2333)
+- Cap redirect_cache size to prevent memory abuse (#2299)
+- Fix HTTPDigestAuth handling of redirects after authenticating successfully
+  (#2253)
+- Fix crash with custom method parameter to Session.request (#2317)
+- Fix how Link headers are parsed using the regular expression library (#2271)
+
+**Documentation**
+
+- Add more references for interlinking (#2348)
+- Update CSS for theme (#2290)
+- Update width of buttons and sidebar (#2289)
+- Replace references of Gittip with Gratipay (#2282)
+- Add link to changelog in sidebar (#2273)
+
+2.4.3 (2014-10-06)
+++++++++++++++++++
+
+**Bugfixes**
+
+- Unicode URL improvements for Python 2.
+- Re-order JSON param for backwards compat.
+- Automatically defrag authentication schemes from host/pass URIs. (`#2249 <https://github.com/kennethreitz/requests/issues/2249>`_)
+
+
+2.4.2 (2014-10-05)
+++++++++++++++++++
+
+**Improvements**
+
+- FINALLY! Add json parameter for uploads! (`#2258 <https://github.com/kennethreitz/requests/pull/2258>`_)
+- Support for bytestring URLs on Python 3.x (`#2238 <https://github.com/kennethreitz/requests/pull/2238>`_)
+
+**Bugfixes**
+
+- Avoid getting stuck in a loop (`#2244 <https://github.com/kennethreitz/requests/pull/2244>`_)
+- Multiple calls to iter* fail with unhelpful error. (`#2240 <https://github.com/kennethreitz/requests/issues/2240>`_, `#2241 <https://github.com/kennethreitz/requests/issues/2241>`_)
+
+**Documentation**
+
+- Correct redirection introduction (`#2245 <https://github.com/kennethreitz/requests/pull/2245/>`_)
+- Added example of how to send multiple files in one request. (`#2227 <https://github.com/kennethreitz/requests/pull/2227/>`_)
+- Clarify how to pass a custom set of CAs (`#2248 <https://github.com/kennethreitz/requests/pull/2248/>`_)
+
+
+
+2.4.1 (2014-09-09)
+++++++++++++++++++
+
+- Now has a "security" package extras set, ``$ pip install requests[security]``
+- Requests will now use Certifi if it is available.
+- Capture and re-raise urllib3 ProtocolError
+- Bugfix for responses that attempt to redirect to themselves forever (wtf?).
+
+
+2.4.0 (2014-08-29)
+++++++++++++++++++
+
+**Behavioral Changes**
+
+- ``Connection: keep-alive`` header is now sent automatically.
+
+**Improvements**
+
+- Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts.
+- Allow copying of PreparedRequests without headers/cookies.
+- Updated bundled urllib3 version.
+- Refactored settings loading from environment — new `Session.merge_environment_settings`.
+- Handle socket errors in iter_content.
+
+
+2.3.0 (2014-05-16)
+++++++++++++++++++
+
+**API Changes**
+
+- New ``Response`` property ``is_redirect``, which is true when the
+  library could have processed this response as a redirection (whether
+  or not it actually did).
+- The ``timeout`` parameter now affects requests with both ``stream=True`` and
+  ``stream=False`` equally.
+- The change in v2.0.0 to mandate explicit proxy schemes has been reverted.
+  Proxy schemes now default to ``http://``.
+- The ``CaseInsensitiveDict`` used for HTTP headers now behaves like a normal
+  dictionary when references as string or viewed in the interpreter.
+
+**Bugfixes**
+
+- No longer expose Authorization or Proxy-Authorization headers on redirect.
+  Fix CVE-2014-1829 and CVE-2014-1830 respectively.
+- Authorization is re-evaluated each redirect.
+- On redirect, pass url as native strings.
+- Fall-back to autodetected encoding for JSON when Unicode detection fails.
+- Headers set to ``None`` on the ``Session`` are now correctly not sent.
+- Correctly honor ``decode_unicode`` even if it wasn't used earlier in the same
+  response.
+- Stop advertising ``compress`` as a supported Content-Encoding.
+- The ``Response.history`` parameter is now always a list.
+- Many, many ``urllib3`` bugfixes.
+
+2.2.1 (2014-01-23)
+++++++++++++++++++
+
+**Bugfixes**
+
+- Fixes incorrect parsing of proxy credentials that contain a literal or encoded '#' character.
+- Assorted urllib3 fixes.
+
+2.2.0 (2014-01-09)
+++++++++++++++++++
+
+**API Changes**
+
+- New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
+  ``DecodeError`` exceptions.
+
+**Bugfixes**
+
+- Avoid many many exceptions from the buggy implementation of ``proxy_bypass`` on OS X in Python 2.6.
+- Avoid crashing when attempting to get authentication credentials from ~/.netrc when running as a user without a home directory.
+- Use the correct pool size for pools of connections to proxies.
+- Fix iteration of ``CookieJar`` objects.
+- Ensure that cookies are persisted over redirect.
+- Switch back to using chardet, since it has merged with charade.
+
+2.1.0 (2013-12-05)
+++++++++++++++++++
+
+- Updated CA Bundle, of course.
+- Cookies set on individual Requests through a ``Session`` (e.g. via ``Session.get()``) are no longer persisted to the ``Session``.
+- Clean up connections when we hit problems during chunked upload, rather than leaking them.
+- Return connections to the pool when a chunked upload is successful, rather than leaking it.
+- Match the HTTPbis recommendation for HTTP 301 redirects.
+- Prevent hanging when using streaming uploads and Digest Auth when a 401 is received.
+- Values of headers set by Requests are now always the native string type.
+- Fix previously broken SNI support.
+- Fix accessing HTTP proxies using proxy authentication.
+- Unencode HTTP Basic usernames and passwords extracted from URLs.
+- Support for IP address ranges for no_proxy environment variable
+- Parse headers correctly when users override the default ``Host:`` header.
+- Avoid munging the URL in case of case-sensitive servers.
+- Looser URL handling for non-HTTP/HTTPS urls.
+- Accept unicode methods in Python 2.6 and 2.7.
+- More resilient cookie handling.
+- Make ``Response`` objects pickleable.
+- Actually added MD5-sess to Digest Auth instead of pretending to like last time.
+- Updated internal urllib3.
+- Fixed @Lukasa's lack of taste.
+
+2.0.1 (2013-10-24)
+++++++++++++++++++
+
+- Updated included CA Bundle with new mistrusts and automated process for the future
+- Added MD5-sess to Digest Auth
+- Accept per-file headers in multipart file POST messages.
+- Fixed: Don't send the full URL on CONNECT messages.
+- Fixed: Correctly lowercase a redirect scheme.
+- Fixed: Cookies not persisted when set via functional API.
+- Fixed: Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError.
+- Updated internal urllib3 and chardet.
+
+2.0.0 (2013-09-24)
+++++++++++++++++++
+
+**API Changes:**
+
+- Keys in the Headers dictionary are now native strings on all Python versions,
+  i.e. bytestrings on Python 2, unicode on Python 3.
+- Proxy URLs now *must* have an explicit scheme. A ``MissingSchema`` exception
+  will be raised if they don't.
+- Timeouts now apply to read time if ``Stream=False``.
+- ``RequestException`` is now a subclass of ``IOError``, not ``RuntimeError``.
+- Added new method to ``PreparedRequest`` objects: ``PreparedRequest.copy()``.
+- Added new method to ``Session`` objects: ``Session.update_request()``. This
+  method updates a ``Request`` object with the data (e.g. cookies) stored on
+  the ``Session``.
+- Added new method to ``Session`` objects: ``Session.prepare_request()``. This
+  method updates and prepares a ``Request`` object, and returns the
+  corresponding ``PreparedRequest`` object.
+- Added new method to ``HTTPAdapter`` objects: ``HTTPAdapter.proxy_headers()``.
+  This should not be called directly, but improves the subclass interface.
+- ``httplib.IncompleteRead`` exceptions caused by incorrect chunked encoding
+  will now raise a Requests ``ChunkedEncodingError`` instead.
+- Invalid percent-escape sequences now cause a Requests ``InvalidURL``
+  exception to be raised.
+- HTTP 208 no longer uses reason phrase ``"im_used"``. Correctly uses
+  ``"already_reported"``.
+- HTTP 226 reason added (``"im_used"``).
+
+**Bugfixes:**
+
+- Vastly improved proxy support, including the CONNECT verb. Special thanks to
+  the many contributors who worked towards this improvement.
+- Cookies are now properly managed when 401 authentication responses are
+  received.
+- Chunked encoding fixes.
+- Support for mixed case schemes.
+- Better handling of streaming downloads.
+- Retrieve environment proxies from more locations.
+- Minor cookies fixes.
+- Improved redirect behaviour.
+- Improved streaming behaviour, particularly for compressed data.
+- Miscellaneous small Python 3 text encoding bugs.
+- ``.netrc`` no longer overrides explicit auth.
+- Cookies set by hooks are now correctly persisted on Sessions.
+- Fix problem with cookies that specify port numbers in their host field.
+- ``BytesIO`` can be used to perform streaming uploads.
+- More generous parsing of the ``no_proxy`` environment variable.
+- Non-string objects can be passed in data values alongside files.
+
+1.2.3 (2013-05-25)
+++++++++++++++++++
+
+- Simple packaging fix
+
+
+1.2.2 (2013-05-23)
+++++++++++++++++++
+
+- Simple packaging fix
+
+
+1.2.1 (2013-05-20)
+++++++++++++++++++
+
+- 301 and 302 redirects now change the verb to GET for all verbs, not just
+  POST, improving browser compatibility.
+- Python 3.3.2 compatibility
+- Always percent-encode location headers
+- Fix connection adapter matching to be most-specific first
+- new argument to the default connection adapter for passing a block argument
+- prevent a KeyError when there's no link headers
+
+1.2.0 (2013-03-31)
+++++++++++++++++++
+
+- Fixed cookies on sessions and on requests
+- Significantly change how hooks are dispatched - hooks now receive all the
+  arguments specified by the user when making a request so hooks can make a
+  secondary request with the same parameters. This is especially necessary for
+  authentication handler authors
+- certifi support was removed
+- Fixed bug where using OAuth 1 with body ``signature_type`` sent no data
+- Major proxy work thanks to @Lukasa including parsing of proxy authentication
+  from the proxy url
+- Fix DigestAuth handling too many 401s
+- Update vendored urllib3 to include SSL bug fixes
+- Allow keyword arguments to be passed to ``json.loads()`` via the
+  ``Response.json()`` method
+- Don't send ``Content-Length`` header by default on ``GET`` or ``HEAD``
+  requests
+- Add ``elapsed`` attribute to ``Response`` objects to time how long a request
+  took.
+- Fix ``RequestsCookieJar``
+- Sessions and Adapters are now picklable, i.e., can be used with the
+  multiprocessing library
+- Update charade to version 1.0.3
+
+The change in how hooks are dispatched will likely cause a great deal of
+issues.
+
+1.1.0 (2013-01-10)
+++++++++++++++++++
+
+- CHUNKED REQUESTS
+- Support for iterable response bodies
+- Assume servers persist redirect params
+- Allow explicit content types to be specified for file data
+- Make merge_kwargs case-insensitive when looking up keys
+
+1.0.3 (2012-12-18)
+++++++++++++++++++
+
+- Fix file upload encoding bug
+- Fix cookie behavior
+
+1.0.2 (2012-12-17)
+++++++++++++++++++
+
+- Proxy fix for HTTPAdapter.
+
+1.0.1 (2012-12-17)
+++++++++++++++++++
+
+- Cert verification exception bug.
+- Proxy fix for HTTPAdapter.
+
+1.0.0 (2012-12-17)
+++++++++++++++++++
+
+- Massive Refactor and Simplification
+- Switch to Apache 2.0 license
+- Swappable Connection Adapters
+- Mountable Connection Adapters
+- Mutable ProcessedRequest chain
+- /s/prefetch/stream
+- Removal of all configuration
+- Standard library logging
+- Make Response.json() callable, not property.
+- Usage of new charade project, which provides python 2 and 3 simultaneous chardet.
+- Removal of all hooks except 'response'
+- Removal of all authentication helpers (OAuth, Kerberos)
+
+This is not a backwards compatible change.
+
+0.14.2 (2012-10-27)
++++++++++++++++++++
+
+- Improved mime-compatible JSON handling
+- Proxy fixes
+- Path hack fixes
+- Case-Insensistive Content-Encoding headers
+- Support for CJK parameters in form posts
+
+
+0.14.1 (2012-10-01)
++++++++++++++++++++
+
+- Python 3.3 Compatibility
+- Simply default accept-encoding
+- Bugfixes
+
+
+0.14.0 (2012-09-02)
+++++++++++++++++++++
+
+- No more iter_content errors if already downloaded.
+
+0.13.9 (2012-08-25)
++++++++++++++++++++
+
+- Fix for OAuth + POSTs
+- Remove exception eating from dispatch_hook
+- General bugfixes
+
+0.13.8 (2012-08-21)
++++++++++++++++++++
+
+- Incredible Link header support :)
+
+0.13.7 (2012-08-19)
++++++++++++++++++++
+
+- Support for (key, value) lists everywhere.
+- Digest Authentication improvements.
+- Ensure proxy exclusions work properly.
+- Clearer UnicodeError exceptions.
+- Automatic casting of URLs to tsrings (fURL and such)
+- Bugfixes.
+
+0.13.6 (2012-08-06)
++++++++++++++++++++
+
+- Long awaited fix for hanging connections!
+
+0.13.5 (2012-07-27)
++++++++++++++++++++
+
+- Packaging fix
+
+0.13.4 (2012-07-27)
++++++++++++++++++++
+
+- GSSAPI/Kerberos authentication!
+- App Engine 2.7 Fixes!
+- Fix leaking connections (from urllib3 update)
+- OAuthlib path hack fix
+- OAuthlib URL parameters fix.
+
+0.13.3 (2012-07-12)
++++++++++++++++++++
+
+- Use simplejson if available.
+- Do not hide SSLErrors behind Timeouts.
+- Fixed param handling with urls containing fragments.
+- Significantly improved information in User Agent.
+- client certificates are ignored when verify=False
+
+0.13.2 (2012-06-28)
++++++++++++++++++++
+
+- Zero dependencies (once again)!
+- New: Response.reason
+- Sign querystring parameters in OAuth 1.0
+- Client certificates no longer ignored when verify=False
+- Add openSUSE certificate support
+
+0.13.1 (2012-06-07)
++++++++++++++++++++
+
+- Allow passing a file or file-like object as data.
+- Allow hooks to return responses that indicate errors.
+- Fix Response.text and Response.json for body-less responses.
+
+0.13.0 (2012-05-29)
++++++++++++++++++++
+
+- Removal of Requests.async in favor of `grequests <https://github.com/kennethreitz/grequests>`_
+- Allow disabling of cookie persistiance.
+- New implimentation of safe_mode
+- cookies.get now supports default argument
+- Session cookies not saved when Session.request is called with return_response=False
+- Env: no_proxy support.
+- RequestsCookieJar improvements.
+- Various bug fixes.
+
+0.12.1 (2012-05-08)
++++++++++++++++++++
+
+- New ``Response.json`` property.
+- Ability to add string file uploads.
+- Fix out-of-range issue with iter_lines.
+- Fix iter_content default size.
+- Fix POST redirects containing files.
+
+0.12.0 (2012-05-02)
++++++++++++++++++++
+
+- EXPERIMENTAL OAUTH SUPPORT!
+- Proper CookieJar-backed cookies interface with awesome dict-like interface.
+- Speed fix for non-iterated content chunks.
+- Move ``pre_request`` to a more usable place.
+- New ``pre_send`` hook.
+- Lazily encode data, params, files.
+- Load system Certificate Bundle if ``certify`` isn't available.
+- Cleanups, fixes.
+
+0.11.2 (2012-04-22)
++++++++++++++++++++
+
+- Attempt to use the OS's certificate bundle if ``certifi`` isn't available.
+- Infinite digest auth redirect fix.
+- Multi-part file upload improvements.
+- Fix decoding of invalid %encodings in URLs.
+- If there is no content in a response don't throw an error the second time that content is attempted to be read.
+- Upload data on redirects.
+
+0.11.1 (2012-03-30)
++++++++++++++++++++
+
+* POST redirects now break RFC to do what browsers do: Follow up with a GET.
+* New ``strict_mode`` configuration to disable new redirect behavior.
+
+
+0.11.0 (2012-03-14)
++++++++++++++++++++
+
+* Private SSL Certificate support
+* Remove select.poll from Gevent monkeypatching
+* Remove redundant generator for chunked transfer encoding
+* Fix: Response.ok raises Timeout Exception in safe_mode
+
+0.10.8 (2012-03-09)
++++++++++++++++++++
+
+* Generate chunked ValueError fix
+* Proxy configuration by environment variables
+* Simplification of iter_lines.
+* New `trust_env` configuration for disabling system/environment hints.
+* Suppress cookie errors.
+
+0.10.7 (2012-03-07)
++++++++++++++++++++
+
+* `encode_uri` = False
+
+0.10.6 (2012-02-25)
++++++++++++++++++++
+
+* Allow '=' in cookies.
+
+0.10.5 (2012-02-25)
++++++++++++++++++++
+
+* Response body with 0 content-length fix.
+* New async.imap.
+* Don't fail on netrc.
+
+
+0.10.4 (2012-02-20)
++++++++++++++++++++
+
+* Honor netrc.
+
+0.10.3 (2012-02-20)
++++++++++++++++++++
+
+* HEAD requests don't follow redirects anymore.
+* raise_for_status() doesn't raise for 3xx anymore.
+* Make Session objects picklable.
+* ValueError for invalid schema URLs.
+
+0.10.2 (2012-01-15)
++++++++++++++++++++
+
+* Vastly improved URL quoting.
+* Additional allowed cookie key values.
+* Attempted fix for "Too many open files" Error
+* Replace unicode errors on first pass, no need for second pass.
+* Append '/' to bare-domain urls before query insertion.
+* Exceptions now inherit from RuntimeError.
+* Binary uploads + auth fix.
+* Bugfixes.
+
+
+0.10.1 (2012-01-23)
++++++++++++++++++++
+
+* PYTHON 3 SUPPORT!
+* Dropped 2.5 Support. (*Backwards Incompatible*)
+
+0.10.0 (2012-01-21)
++++++++++++++++++++
+
+* ``Response.content`` is now bytes-only. (*Backwards Incompatible*)
+* New ``Response.text`` is unicode-only.
+* If no ``Response.encoding`` is specified and ``chardet`` is available, ``Respoonse.text`` will guess an encoding.
+* Default to ISO-8859-1 (Western) encoding for "text" subtypes.
+* Removal of `decode_unicode`. (*Backwards Incompatible*)
+* New multiple-hooks system.
+* New ``Response.register_hook`` for registering hooks within the pipeline.
+* ``Response.url`` is now Unicode.
+
+0.9.3 (2012-01-18)
+++++++++++++++++++
+
+* SSL verify=False bugfix (apparent on windows machines).
+
+0.9.2 (2012-01-18)
+++++++++++++++++++
+
+* Asynchronous async.send method.
+* Support for proper chunk streams with boundaries.
+* session argument for Session classes.
+* Print entire hook tracebacks, not just exception instance.
+* Fix response.iter_lines from pending next line.
+* Fix but in HTTP-digest auth w/ URI having query strings.
+* Fix in Event Hooks section.
+* Urllib3 update.
+
+
+0.9.1 (2012-01-06)
+++++++++++++++++++
+
+* danger_mode for automatic Response.raise_for_status()
+* Response.iter_lines refactor
+
+0.9.0 (2011-12-28)
+++++++++++++++++++
+
+* verify ssl is default.
+
+
+0.8.9 (2011-12-28)
+++++++++++++++++++
+
+* Packaging fix.
+
+
+0.8.8 (2011-12-28)
+++++++++++++++++++
+
+* SSL CERT VERIFICATION!
+* Release of Cerifi: Mozilla's cert list.
+* New 'verify' argument for SSL requests.
+* Urllib3 update.
+
+0.8.7 (2011-12-24)
+++++++++++++++++++
+
+* iter_lines last-line truncation fix
+* Force safe_mode for async requests
+* Handle safe_mode exceptions more consistently
+* Fix iteration on null responses in safe_mode
+
+0.8.6 (2011-12-18)
+++++++++++++++++++
+
+* Socket timeout fixes.
+* Proxy Authorization support.
+
+0.8.5 (2011-12-14)
+++++++++++++++++++
+
+* Response.iter_lines!
+
+0.8.4 (2011-12-11)
+++++++++++++++++++
+
+* Prefetch bugfix.
+* Added license to installed version.
+
+0.8.3 (2011-11-27)
+++++++++++++++++++
+
+* Converted auth system to use simpler callable objects.
+* New session parameter to API methods.
+* Display full URL while logging.
+
+0.8.2 (2011-11-19)
+++++++++++++++++++
+
+* New Unicode decoding system, based on over-ridable `Response.encoding`.
+* Proper URL slash-quote handling.
+* Cookies with ``[``, ``]``, and ``_`` allowed.
+
+0.8.1 (2011-11-15)
+++++++++++++++++++
+
+* URL Request path fix
+* Proxy fix.
+* Timeouts fix.
+
+0.8.0 (2011-11-13)
+++++++++++++++++++
+
+* Keep-alive support!
+* Complete removal of Urllib2
+* Complete removal of Poster
+* Complete removal of CookieJars
+* New ConnectionError raising
+* Safe_mode for error catching
+* prefetch parameter for request methods
+* OPTION method
+* Async pool size throttling
+* File uploads send real names
+* Vendored in urllib3
+
+0.7.6 (2011-11-07)
+++++++++++++++++++
+
+* Digest authentication bugfix (attach query data to path)
+
+0.7.5 (2011-11-04)
+++++++++++++++++++
+
+* Response.content = None if there was an invalid repsonse.
+* Redirection auth handling.
+
+0.7.4 (2011-10-26)
+++++++++++++++++++
+
+* Session Hooks fix.
+
+0.7.3 (2011-10-23)
+++++++++++++++++++
+
+* Digest Auth fix.
+
+
+0.7.2 (2011-10-23)
+++++++++++++++++++
+
+* PATCH Fix.
+
+
+0.7.1 (2011-10-23)
+++++++++++++++++++
+
+* Move away from urllib2 authentication handling.
+* Fully Remove AuthManager, AuthObject, &c.
+* New tuple-based auth system with handler callbacks.
+
+
+0.7.0 (2011-10-22)
+++++++++++++++++++
+
+* Sessions are now the primary interface.
+* Deprecated InvalidMethodException.
+* PATCH fix.
+* New config system (no more global settings).
+
+
+0.6.6 (2011-10-19)
+++++++++++++++++++
+
+* Session parameter bugfix (params merging).
+
+
+0.6.5 (2011-10-18)
+++++++++++++++++++
+
+* Offline (fast) test suite.
+* Session dictionary argument merging.
+
+
+0.6.4 (2011-10-13)
+++++++++++++++++++
+
+* Automatic decoding of unicode, based on HTTP Headers.
+* New ``decode_unicode`` setting.
+* Removal of ``r.read/close`` methods.
+* New ``r.faw`` interface for advanced response usage.*
+* Automatic expansion of parameterized headers.
+
+
+0.6.3 (2011-10-13)
+++++++++++++++++++
+
+* Beautiful ``requests.async`` module, for making async requests w/ gevent.
+
+
+0.6.2 (2011-10-09)
+++++++++++++++++++
+
+* GET/HEAD obeys allow_redirects=False.
+
+
+0.6.1 (2011-08-20)
+++++++++++++++++++
+
+* Enhanced status codes experience ``\o/``
+* Set a maximum number of redirects (``settings.max_redirects``)
+* Full Unicode URL support
+* Support for protocol-less redirects.
+* Allow for arbitrary request types.
+* Bugfixes
+
+
+0.6.0 (2011-08-17)
+++++++++++++++++++
+
+* New callback hook system
+* New persistient sessions object and context manager
+* Transparent Dict-cookie handling
+* Status code reference object
+* Removed Response.cached
+* Added Response.request
+* All args are kwargs
+* Relative redirect support
+* HTTPError handling improvements
+* Improved https testing
+* Bugfixes
+
+
+0.5.1 (2011-07-23)
+++++++++++++++++++
+
+* International Domain Name Support!
+* Access headers without fetching entire body (``read()``)
+* Use lists as dicts for parameters
+* Add Forced Basic Authentication
+* Forced Basic is default authentication type
+* ``python-requests.org`` default User-Agent header
+* CaseInsensitiveDict lower-case caching
+* Response.history bugfix
+
+
+0.5.0 (2011-06-21)
+++++++++++++++++++
+
+* PATCH Support
+* Support for Proxies
+* HTTPBin Test Suite
+* Redirect Fixes
+* settings.verbose stream writing
+* Querystrings for all methods
+* URLErrors (Connection Refused, Timeout, Invalid URLs) are treated as explicity raised
+  ``r.requests.get('hwe://blah'); r.raise_for_status()``
+
+
+0.4.1 (2011-05-22)
+++++++++++++++++++
+
+* Improved Redirection Handling
+* New 'allow_redirects' param for following non-GET/HEAD Redirects
+* Settings module refactoring
+
+
+0.4.0 (2011-05-15)
+++++++++++++++++++
+
+* Response.history: list of redirected responses
+* Case-Insensitive Header Dictionaries!
+* Unicode URLs
+
+
+0.3.4 (2011-05-14)
+++++++++++++++++++
+
+* Urllib2 HTTPAuthentication Recursion fix (Basic/Digest)
+* Internal Refactor
+* Bytes data upload Bugfix
+
+
+
+0.3.3 (2011-05-12)
+++++++++++++++++++
+
+* Request timeouts
+* Unicode url-encoded data
+* Settings context manager and module
+
+
+0.3.2 (2011-04-15)
+++++++++++++++++++
+
+* Automatic Decompression of GZip Encoded Content
+* AutoAuth Support for Tupled HTTP Auth
+
+
+0.3.1 (2011-04-01)
+++++++++++++++++++
+
+* Cookie Changes
+* Response.read()
+* Poster fix
+
+
+0.3.0 (2011-02-25)
+++++++++++++++++++
+
+* Automatic Authentication API Change
+* Smarter Query URL Parameterization
+* Allow file uploads and POST data together
+* New Authentication Manager System
+    - Simpler Basic HTTP System
+    - Supports all build-in urllib2 Auths
+    - Allows for custom Auth Handlers
+
+
+0.2.4 (2011-02-19)
+++++++++++++++++++
+
+* Python 2.5 Support
+* PyPy-c v1.4 Support
+* Auto-Authentication tests
+* Improved Request object constructor
+
+0.2.3 (2011-02-15)
+++++++++++++++++++
+
+* New HTTPHandling Methods
+    - Response.__nonzero__ (false if bad HTTP Status)
+    - Response.ok (True if expected HTTP Status)
+    - Response.error (Logged HTTPError if bad HTTP Status)
+    - Response.raise_for_status() (Raises stored HTTPError)
+
+
+0.2.2 (2011-02-14)
+++++++++++++++++++
+
+* Still handles request in the event of an HTTPError. (Issue #2)
+* Eventlet and Gevent Monkeypatch support.
+* Cookie Support (Issue #1)
+
+
+0.2.1 (2011-02-14)
+++++++++++++++++++
+
+* Added file attribute to POST and PUT requests for multipart-encode file uploads.
+* Added Request.url attribute for context and redirects
+
+
+0.2.0 (2011-02-14)
+++++++++++++++++++
+
+* Birth!
+
+
+0.0.1 (2011-02-13)
+++++++++++++++++++
+
+* Frustration
+* Conception
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/LICENSE thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/LICENSE
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/LICENSE	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,13 @@
+Copyright 2014 Kenneth Reitz
+
+   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.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/MANIFEST.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/MANIFEST.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/MANIFEST.in	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/MANIFEST.in	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1 @@
+include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/NOTICE thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/NOTICE
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/NOTICE	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/NOTICE	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,54 @@
+Requests includes some vendorized python libraries to ease installation.
+
+Urllib3 License
+===============
+
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright 2008-2011 Andrey Petrov and contributors (see CONTRIBUTORS.txt),
+Modifications copyright 2012 Kenneth Reitz.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Chardet License
+===============
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301  USA
+
+
+CA Bundle License
+=================
+
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.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-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/PKG-INFO thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/PKG-INFO
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/PKG-INFO	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,1011 @@
+Metadata-Version: 1.1
+Name: requests
+Version: 2.5.1
+Summary: Python HTTP for Humans.
+Home-page: http://python-requests.org
+Author: Kenneth Reitz
+Author-email: me@kennethreitz.com
+License: Apache 2.0
+Description: Requests: HTTP for Humans
+        =========================
+        
+        .. image:: https://badge.fury.io/py/requests.png
+            :target: http://badge.fury.io/py/requests
+        
+        .. image:: https://pypip.in/d/requests/badge.png
+                :target: https://crate.io/packages/requests/
+        
+        
+        Requests is an Apache2 Licensed HTTP library, written in Python, for human
+        beings.
+        
+        Most existing Python modules for sending HTTP requests are extremely
+        verbose and cumbersome. Python's builtin urllib2 module provides most of
+        the HTTP capabilities you should need, but the api is thoroughly broken.
+        It requires an enormous amount of work (even method overrides) to
+        perform the simplest of tasks.
+        
+        Things shouldn't be this way. Not in Python.
+        
+        .. code-block:: python
+        
+            >>> r = requests.get('https://api.github.com', auth=('user', 'pass'))
+            >>> r.status_code
+            204
+            >>> r.headers['content-type']
+            'application/json'
+            >>> r.text
+            ...
+        
+        See `the same code, without Requests <https://gist.github.com/973705>`_.
+        
+        Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
+        multipart files, and parameters with simple Python dictionaries, and access the
+        response data in the same way. It's powered by httplib and `urllib3
+        <https://github.com/shazow/urllib3>`_, but it does all the hard work and crazy
+        hacks for you.
+        
+        
+        Features
+        --------
+        
+        - International Domains and URLs
+        - Keep-Alive & Connection Pooling
+        - Sessions with Cookie Persistence
+        - Browser-style SSL Verification
+        - Basic/Digest Authentication
+        - Elegant Key/Value Cookies
+        - Automatic Decompression
+        - Unicode Response Bodies
+        - Multipart File Uploads
+        - Connection Timeouts
+        - Thread-safety
+        - HTTP(S) proxy support
+        
+        
+        Installation
+        ------------
+        
+        To install Requests, simply:
+        
+        .. code-block:: bash
+        
+            $ pip install requests
+        
+        
+        Documentation
+        -------------
+        
+        Documentation is available at http://docs.python-requests.org/.
+        
+        
+        Contribute
+        ----------
+        
+        #. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet.
+        #. If you feel uncomfortable or uncertain about an issue or your changes, feel free to email @sigmavirus24 and he will happily help you via email, Skype, remote pairing or whatever you are comfortable with.
+        #. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
+        #. Write a test which shows that the bug was fixed or that the feature works as expected.
+        #. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
+        
+        .. _`the repository`: http://github.com/kennethreitz/requests
+        .. _AUTHORS: https://github.com/kennethreitz/requests/blob/master/AUTHORS.rst
+        .. _Contributor Friendly: https://github.com/kennethreitz/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open
+        
+        
+        .. :changelog:
+        
+        Release History
+        ---------------
+        
+        2.5.1 (2014-12-23)
+        ++++++++++++++++++
+        
+        **Behavioural Changes**
+        
+        - Only catch HTTPErrors in raise_for_status (#2382)
+        
+        **Bugfixes**
+        
+        - Handle LocationParseError from urllib3 (#2344)
+        - Handle file-like object filenames that are not strings (#2379)
+        - Unbreak HTTPDigestAuth handler. Allow new nonces to be negotiated (#2389)
+        
+        2.5.0 (2014-12-01)
+        ++++++++++++++++++
+        
+        **Improvements**
+        
+        - Allow usage of urllib3's Retry object with HTTPAdapters (#2216)
+        - The ``iter_lines`` method on a response now accepts a delimiter with which
+          to split the content (#2295)
+        
+        **Behavioural Changes**
+        
+        - Add deprecation warnings to functions in requests.utils that will be removed
+          in 3.0 (#2309)
+        - Sessions used by the functional API are always closed (#2326)
+        - Restrict requests to HTTP/1.1 and HTTP/1.0 (stop accepting HTTP/0.9) (#2323)
+        
+        **Bugfixes**
+        
+        - Only parse the URL once (#2353)
+        - Allow Content-Length header to always be overriden (#2332)
+        - Properly handle files in HTTPDigestAuth (#2333)
+        - Cap redirect_cache size to prevent memory abuse (#2299)
+        - Fix HTTPDigestAuth handling of redirects after authenticating successfully
+          (#2253)
+        - Fix crash with custom method parameter to Session.request (#2317)
+        - Fix how Link headers are parsed using the regular expression library (#2271)
+        
+        **Documentation**
+        
+        - Add more references for interlinking (#2348)
+        - Update CSS for theme (#2290)
+        - Update width of buttons and sidebar (#2289)
+        - Replace references of Gittip with Gratipay (#2282)
+        - Add link to changelog in sidebar (#2273)
+        
+        2.4.3 (2014-10-06)
+        ++++++++++++++++++
+        
+        **Bugfixes**
+        
+        - Unicode URL improvements for Python 2.
+        - Re-order JSON param for backwards compat.
+        - Automatically defrag authentication schemes from host/pass URIs. (`#2249 <https://github.com/kennethreitz/requests/issues/2249>`_)
+        
+        
+        2.4.2 (2014-10-05)
+        ++++++++++++++++++
+        
+        **Improvements**
+        
+        - FINALLY! Add json parameter for uploads! (`#2258 <https://github.com/kennethreitz/requests/pull/2258>`_)
+        - Support for bytestring URLs on Python 3.x (`#2238 <https://github.com/kennethreitz/requests/pull/2238>`_)
+        
+        **Bugfixes**
+        
+        - Avoid getting stuck in a loop (`#2244 <https://github.com/kennethreitz/requests/pull/2244>`_)
+        - Multiple calls to iter* fail with unhelpful error. (`#2240 <https://github.com/kennethreitz/requests/issues/2240>`_, `#2241 <https://github.com/kennethreitz/requests/issues/2241>`_)
+        
+        **Documentation**
+        
+        - Correct redirection introduction (`#2245 <https://github.com/kennethreitz/requests/pull/2245/>`_)
+        - Added example of how to send multiple files in one request. (`#2227 <https://github.com/kennethreitz/requests/pull/2227/>`_)
+        - Clarify how to pass a custom set of CAs (`#2248 <https://github.com/kennethreitz/requests/pull/2248/>`_)
+        
+        
+        
+        2.4.1 (2014-09-09)
+        ++++++++++++++++++
+        
+        - Now has a "security" package extras set, ``$ pip install requests[security]``
+        - Requests will now use Certifi if it is available.
+        - Capture and re-raise urllib3 ProtocolError
+        - Bugfix for responses that attempt to redirect to themselves forever (wtf?).
+        
+        
+        2.4.0 (2014-08-29)
+        ++++++++++++++++++
+        
+        **Behavioral Changes**
+        
+        - ``Connection: keep-alive`` header is now sent automatically.
+        
+        **Improvements**
+        
+        - Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts.
+        - Allow copying of PreparedRequests without headers/cookies.
+        - Updated bundled urllib3 version.
+        - Refactored settings loading from environment — new `Session.merge_environment_settings`.
+        - Handle socket errors in iter_content.
+        
+        
+        2.3.0 (2014-05-16)
+        ++++++++++++++++++
+        
+        **API Changes**
+        
+        - New ``Response`` property ``is_redirect``, which is true when the
+          library could have processed this response as a redirection (whether
+          or not it actually did).
+        - The ``timeout`` parameter now affects requests with both ``stream=True`` and
+          ``stream=False`` equally.
+        - The change in v2.0.0 to mandate explicit proxy schemes has been reverted.
+          Proxy schemes now default to ``http://``.
+        - The ``CaseInsensitiveDict`` used for HTTP headers now behaves like a normal
+          dictionary when references as string or viewed in the interpreter.
+        
+        **Bugfixes**
+        
+        - No longer expose Authorization or Proxy-Authorization headers on redirect.
+          Fix CVE-2014-1829 and CVE-2014-1830 respectively.
+        - Authorization is re-evaluated each redirect.
+        - On redirect, pass url as native strings.
+        - Fall-back to autodetected encoding for JSON when Unicode detection fails.
+        - Headers set to ``None`` on the ``Session`` are now correctly not sent.
+        - Correctly honor ``decode_unicode`` even if it wasn't used earlier in the same
+          response.
+        - Stop advertising ``compress`` as a supported Content-Encoding.
+        - The ``Response.history`` parameter is now always a list.
+        - Many, many ``urllib3`` bugfixes.
+        
+        2.2.1 (2014-01-23)
+        ++++++++++++++++++
+        
+        **Bugfixes**
+        
+        - Fixes incorrect parsing of proxy credentials that contain a literal or encoded '#' character.
+        - Assorted urllib3 fixes.
+        
+        2.2.0 (2014-01-09)
+        ++++++++++++++++++
+        
+        **API Changes**
+        
+        - New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
+          ``DecodeError`` exceptions.
+        
+        **Bugfixes**
+        
+        - Avoid many many exceptions from the buggy implementation of ``proxy_bypass`` on OS X in Python 2.6.
+        - Avoid crashing when attempting to get authentication credentials from ~/.netrc when running as a user without a home directory.
+        - Use the correct pool size for pools of connections to proxies.
+        - Fix iteration of ``CookieJar`` objects.
+        - Ensure that cookies are persisted over redirect.
+        - Switch back to using chardet, since it has merged with charade.
+        
+        2.1.0 (2013-12-05)
+        ++++++++++++++++++
+        
+        - Updated CA Bundle, of course.
+        - Cookies set on individual Requests through a ``Session`` (e.g. via ``Session.get()``) are no longer persisted to the ``Session``.
+        - Clean up connections when we hit problems during chunked upload, rather than leaking them.
+        - Return connections to the pool when a chunked upload is successful, rather than leaking it.
+        - Match the HTTPbis recommendation for HTTP 301 redirects.
+        - Prevent hanging when using streaming uploads and Digest Auth when a 401 is received.
+        - Values of headers set by Requests are now always the native string type.
+        - Fix previously broken SNI support.
+        - Fix accessing HTTP proxies using proxy authentication.
+        - Unencode HTTP Basic usernames and passwords extracted from URLs.
+        - Support for IP address ranges for no_proxy environment variable
+        - Parse headers correctly when users override the default ``Host:`` header.
+        - Avoid munging the URL in case of case-sensitive servers.
+        - Looser URL handling for non-HTTP/HTTPS urls.
+        - Accept unicode methods in Python 2.6 and 2.7.
+        - More resilient cookie handling.
+        - Make ``Response`` objects pickleable.
+        - Actually added MD5-sess to Digest Auth instead of pretending to like last time.
+        - Updated internal urllib3.
+        - Fixed @Lukasa's lack of taste.
+        
+        2.0.1 (2013-10-24)
+        ++++++++++++++++++
+        
+        - Updated included CA Bundle with new mistrusts and automated process for the future
+        - Added MD5-sess to Digest Auth
+        - Accept per-file headers in multipart file POST messages.
+        - Fixed: Don't send the full URL on CONNECT messages.
+        - Fixed: Correctly lowercase a redirect scheme.
+        - Fixed: Cookies not persisted when set via functional API.
+        - Fixed: Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError.
+        - Updated internal urllib3 and chardet.
+        
+        2.0.0 (2013-09-24)
+        ++++++++++++++++++
+        
+        **API Changes:**
+        
+        - Keys in the Headers dictionary are now native strings on all Python versions,
+          i.e. bytestrings on Python 2, unicode on Python 3.
+        - Proxy URLs now *must* have an explicit scheme. A ``MissingSchema`` exception
+          will be raised if they don't.
+        - Timeouts now apply to read time if ``Stream=False``.
+        - ``RequestException`` is now a subclass of ``IOError``, not ``RuntimeError``.
+        - Added new method to ``PreparedRequest`` objects: ``PreparedRequest.copy()``.
+        - Added new method to ``Session`` objects: ``Session.update_request()``. This
+          method updates a ``Request`` object with the data (e.g. cookies) stored on
+          the ``Session``.
+        - Added new method to ``Session`` objects: ``Session.prepare_request()``. This
+          method updates and prepares a ``Request`` object, and returns the
+          corresponding ``PreparedRequest`` object.
+        - Added new method to ``HTTPAdapter`` objects: ``HTTPAdapter.proxy_headers()``.
+          This should not be called directly, but improves the subclass interface.
+        - ``httplib.IncompleteRead`` exceptions caused by incorrect chunked encoding
+          will now raise a Requests ``ChunkedEncodingError`` instead.
+        - Invalid percent-escape sequences now cause a Requests ``InvalidURL``
+          exception to be raised.
+        - HTTP 208 no longer uses reason phrase ``"im_used"``. Correctly uses
+          ``"already_reported"``.
+        - HTTP 226 reason added (``"im_used"``).
+        
+        **Bugfixes:**
+        
+        - Vastly improved proxy support, including the CONNECT verb. Special thanks to
+          the many contributors who worked towards this improvement.
+        - Cookies are now properly managed when 401 authentication responses are
+          received.
+        - Chunked encoding fixes.
+        - Support for mixed case schemes.
+        - Better handling of streaming downloads.
+        - Retrieve environment proxies from more locations.
+        - Minor cookies fixes.
+        - Improved redirect behaviour.
+        - Improved streaming behaviour, particularly for compressed data.
+        - Miscellaneous small Python 3 text encoding bugs.
+        - ``.netrc`` no longer overrides explicit auth.
+        - Cookies set by hooks are now correctly persisted on Sessions.
+        - Fix problem with cookies that specify port numbers in their host field.
+        - ``BytesIO`` can be used to perform streaming uploads.
+        - More generous parsing of the ``no_proxy`` environment variable.
+        - Non-string objects can be passed in data values alongside files.
+        
+        1.2.3 (2013-05-25)
+        ++++++++++++++++++
+        
+        - Simple packaging fix
+        
+        
+        1.2.2 (2013-05-23)
+        ++++++++++++++++++
+        
+        - Simple packaging fix
+        
+        
+        1.2.1 (2013-05-20)
+        ++++++++++++++++++
+        
+        - 301 and 302 redirects now change the verb to GET for all verbs, not just
+          POST, improving browser compatibility.
+        - Python 3.3.2 compatibility
+        - Always percent-encode location headers
+        - Fix connection adapter matching to be most-specific first
+        - new argument to the default connection adapter for passing a block argument
+        - prevent a KeyError when there's no link headers
+        
+        1.2.0 (2013-03-31)
+        ++++++++++++++++++
+        
+        - Fixed cookies on sessions and on requests
+        - Significantly change how hooks are dispatched - hooks now receive all the
+          arguments specified by the user when making a request so hooks can make a
+          secondary request with the same parameters. This is especially necessary for
+          authentication handler authors
+        - certifi support was removed
+        - Fixed bug where using OAuth 1 with body ``signature_type`` sent no data
+        - Major proxy work thanks to @Lukasa including parsing of proxy authentication
+          from the proxy url
+        - Fix DigestAuth handling too many 401s
+        - Update vendored urllib3 to include SSL bug fixes
+        - Allow keyword arguments to be passed to ``json.loads()`` via the
+          ``Response.json()`` method
+        - Don't send ``Content-Length`` header by default on ``GET`` or ``HEAD``
+          requests
+        - Add ``elapsed`` attribute to ``Response`` objects to time how long a request
+          took.
+        - Fix ``RequestsCookieJar``
+        - Sessions and Adapters are now picklable, i.e., can be used with the
+          multiprocessing library
+        - Update charade to version 1.0.3
+        
+        The change in how hooks are dispatched will likely cause a great deal of
+        issues.
+        
+        1.1.0 (2013-01-10)
+        ++++++++++++++++++
+        
+        - CHUNKED REQUESTS
+        - Support for iterable response bodies
+        - Assume servers persist redirect params
+        - Allow explicit content types to be specified for file data
+        - Make merge_kwargs case-insensitive when looking up keys
+        
+        1.0.3 (2012-12-18)
+        ++++++++++++++++++
+        
+        - Fix file upload encoding bug
+        - Fix cookie behavior
+        
+        1.0.2 (2012-12-17)
+        ++++++++++++++++++
+        
+        - Proxy fix for HTTPAdapter.
+        
+        1.0.1 (2012-12-17)
+        ++++++++++++++++++
+        
+        - Cert verification exception bug.
+        - Proxy fix for HTTPAdapter.
+        
+        1.0.0 (2012-12-17)
+        ++++++++++++++++++
+        
+        - Massive Refactor and Simplification
+        - Switch to Apache 2.0 license
+        - Swappable Connection Adapters
+        - Mountable Connection Adapters
+        - Mutable ProcessedRequest chain
+        - /s/prefetch/stream
+        - Removal of all configuration
+        - Standard library logging
+        - Make Response.json() callable, not property.
+        - Usage of new charade project, which provides python 2 and 3 simultaneous chardet.
+        - Removal of all hooks except 'response'
+        - Removal of all authentication helpers (OAuth, Kerberos)
+        
+        This is not a backwards compatible change.
+        
+        0.14.2 (2012-10-27)
+        +++++++++++++++++++
+        
+        - Improved mime-compatible JSON handling
+        - Proxy fixes
+        - Path hack fixes
+        - Case-Insensistive Content-Encoding headers
+        - Support for CJK parameters in form posts
+        
+        
+        0.14.1 (2012-10-01)
+        +++++++++++++++++++
+        
+        - Python 3.3 Compatibility
+        - Simply default accept-encoding
+        - Bugfixes
+        
+        
+        0.14.0 (2012-09-02)
+        ++++++++++++++++++++
+        
+        - No more iter_content errors if already downloaded.
+        
+        0.13.9 (2012-08-25)
+        +++++++++++++++++++
+        
+        - Fix for OAuth + POSTs
+        - Remove exception eating from dispatch_hook
+        - General bugfixes
+        
+        0.13.8 (2012-08-21)
+        +++++++++++++++++++
+        
+        - Incredible Link header support :)
+        
+        0.13.7 (2012-08-19)
+        +++++++++++++++++++
+        
+        - Support for (key, value) lists everywhere.
+        - Digest Authentication improvements.
+        - Ensure proxy exclusions work properly.
+        - Clearer UnicodeError exceptions.
+        - Automatic casting of URLs to tsrings (fURL and such)
+        - Bugfixes.
+        
+        0.13.6 (2012-08-06)
+        +++++++++++++++++++
+        
+        - Long awaited fix for hanging connections!
+        
+        0.13.5 (2012-07-27)
+        +++++++++++++++++++
+        
+        - Packaging fix
+        
+        0.13.4 (2012-07-27)
+        +++++++++++++++++++
+        
+        - GSSAPI/Kerberos authentication!
+        - App Engine 2.7 Fixes!
+        - Fix leaking connections (from urllib3 update)
+        - OAuthlib path hack fix
+        - OAuthlib URL parameters fix.
+        
+        0.13.3 (2012-07-12)
+        +++++++++++++++++++
+        
+        - Use simplejson if available.
+        - Do not hide SSLErrors behind Timeouts.
+        - Fixed param handling with urls containing fragments.
+        - Significantly improved information in User Agent.
+        - client certificates are ignored when verify=False
+        
+        0.13.2 (2012-06-28)
+        +++++++++++++++++++
+        
+        - Zero dependencies (once again)!
+        - New: Response.reason
+        - Sign querystring parameters in OAuth 1.0
+        - Client certificates no longer ignored when verify=False
+        - Add openSUSE certificate support
+        
+        0.13.1 (2012-06-07)
+        +++++++++++++++++++
+        
+        - Allow passing a file or file-like object as data.
+        - Allow hooks to return responses that indicate errors.
+        - Fix Response.text and Response.json for body-less responses.
+        
+        0.13.0 (2012-05-29)
+        +++++++++++++++++++
+        
+        - Removal of Requests.async in favor of `grequests <https://github.com/kennethreitz/grequests>`_
+        - Allow disabling of cookie persistiance.
+        - New implimentation of safe_mode
+        - cookies.get now supports default argument
+        - Session cookies not saved when Session.request is called with return_response=False
+        - Env: no_proxy support.
+        - RequestsCookieJar improvements.
+        - Various bug fixes.
+        
+        0.12.1 (2012-05-08)
+        +++++++++++++++++++
+        
+        - New ``Response.json`` property.
+        - Ability to add string file uploads.
+        - Fix out-of-range issue with iter_lines.
+        - Fix iter_content default size.
+        - Fix POST redirects containing files.
+        
+        0.12.0 (2012-05-02)
+        +++++++++++++++++++
+        
+        - EXPERIMENTAL OAUTH SUPPORT!
+        - Proper CookieJar-backed cookies interface with awesome dict-like interface.
+        - Speed fix for non-iterated content chunks.
+        - Move ``pre_request`` to a more usable place.
+        - New ``pre_send`` hook.
+        - Lazily encode data, params, files.
+        - Load system Certificate Bundle if ``certify`` isn't available.
+        - Cleanups, fixes.
+        
+        0.11.2 (2012-04-22)
+        +++++++++++++++++++
+        
+        - Attempt to use the OS's certificate bundle if ``certifi`` isn't available.
+        - Infinite digest auth redirect fix.
+        - Multi-part file upload improvements.
+        - Fix decoding of invalid %encodings in URLs.
+        - If there is no content in a response don't throw an error the second time that content is attempted to be read.
+        - Upload data on redirects.
+        
+        0.11.1 (2012-03-30)
+        +++++++++++++++++++
+        
+        * POST redirects now break RFC to do what browsers do: Follow up with a GET.
+        * New ``strict_mode`` configuration to disable new redirect behavior.
+        
+        
+        0.11.0 (2012-03-14)
+        +++++++++++++++++++
+        
+        * Private SSL Certificate support
+        * Remove select.poll from Gevent monkeypatching
+        * Remove redundant generator for chunked transfer encoding
+        * Fix: Response.ok raises Timeout Exception in safe_mode
+        
+        0.10.8 (2012-03-09)
+        +++++++++++++++++++
+        
+        * Generate chunked ValueError fix
+        * Proxy configuration by environment variables
+        * Simplification of iter_lines.
+        * New `trust_env` configuration for disabling system/environment hints.
+        * Suppress cookie errors.
+        
+        0.10.7 (2012-03-07)
+        +++++++++++++++++++
+        
+        * `encode_uri` = False
+        
+        0.10.6 (2012-02-25)
+        +++++++++++++++++++
+        
+        * Allow '=' in cookies.
+        
+        0.10.5 (2012-02-25)
+        +++++++++++++++++++
+        
+        * Response body with 0 content-length fix.
+        * New async.imap.
+        * Don't fail on netrc.
+        
+        
+        0.10.4 (2012-02-20)
+        +++++++++++++++++++
+        
+        * Honor netrc.
+        
+        0.10.3 (2012-02-20)
+        +++++++++++++++++++
+        
+        * HEAD requests don't follow redirects anymore.
+        * raise_for_status() doesn't raise for 3xx anymore.
+        * Make Session objects picklable.
+        * ValueError for invalid schema URLs.
+        
+        0.10.2 (2012-01-15)
+        +++++++++++++++++++
+        
+        * Vastly improved URL quoting.
+        * Additional allowed cookie key values.
+        * Attempted fix for "Too many open files" Error
+        * Replace unicode errors on first pass, no need for second pass.
+        * Append '/' to bare-domain urls before query insertion.
+        * Exceptions now inherit from RuntimeError.
+        * Binary uploads + auth fix.
+        * Bugfixes.
+        
+        
+        0.10.1 (2012-01-23)
+        +++++++++++++++++++
+        
+        * PYTHON 3 SUPPORT!
+        * Dropped 2.5 Support. (*Backwards Incompatible*)
+        
+        0.10.0 (2012-01-21)
+        +++++++++++++++++++
+        
+        * ``Response.content`` is now bytes-only. (*Backwards Incompatible*)
+        * New ``Response.text`` is unicode-only.
+        * If no ``Response.encoding`` is specified and ``chardet`` is available, ``Respoonse.text`` will guess an encoding.
+        * Default to ISO-8859-1 (Western) encoding for "text" subtypes.
+        * Removal of `decode_unicode`. (*Backwards Incompatible*)
+        * New multiple-hooks system.
+        * New ``Response.register_hook`` for registering hooks within the pipeline.
+        * ``Response.url`` is now Unicode.
+        
+        0.9.3 (2012-01-18)
+        ++++++++++++++++++
+        
+        * SSL verify=False bugfix (apparent on windows machines).
+        
+        0.9.2 (2012-01-18)
+        ++++++++++++++++++
+        
+        * Asynchronous async.send method.
+        * Support for proper chunk streams with boundaries.
+        * session argument for Session classes.
+        * Print entire hook tracebacks, not just exception instance.
+        * Fix response.iter_lines from pending next line.
+        * Fix but in HTTP-digest auth w/ URI having query strings.
+        * Fix in Event Hooks section.
+        * Urllib3 update.
+        
+        
+        0.9.1 (2012-01-06)
+        ++++++++++++++++++
+        
+        * danger_mode for automatic Response.raise_for_status()
+        * Response.iter_lines refactor
+        
+        0.9.0 (2011-12-28)
+        ++++++++++++++++++
+        
+        * verify ssl is default.
+        
+        
+        0.8.9 (2011-12-28)
+        ++++++++++++++++++
+        
+        * Packaging fix.
+        
+        
+        0.8.8 (2011-12-28)
+        ++++++++++++++++++
+        
+        * SSL CERT VERIFICATION!
+        * Release of Cerifi: Mozilla's cert list.
+        * New 'verify' argument for SSL requests.
+        * Urllib3 update.
+        
+        0.8.7 (2011-12-24)
+        ++++++++++++++++++
+        
+        * iter_lines last-line truncation fix
+        * Force safe_mode for async requests
+        * Handle safe_mode exceptions more consistently
+        * Fix iteration on null responses in safe_mode
+        
+        0.8.6 (2011-12-18)
+        ++++++++++++++++++
+        
+        * Socket timeout fixes.
+        * Proxy Authorization support.
+        
+        0.8.5 (2011-12-14)
+        ++++++++++++++++++
+        
+        * Response.iter_lines!
+        
+        0.8.4 (2011-12-11)
+        ++++++++++++++++++
+        
+        * Prefetch bugfix.
+        * Added license to installed version.
+        
+        0.8.3 (2011-11-27)
+        ++++++++++++++++++
+        
+        * Converted auth system to use simpler callable objects.
+        * New session parameter to API methods.
+        * Display full URL while logging.
+        
+        0.8.2 (2011-11-19)
+        ++++++++++++++++++
+        
+        * New Unicode decoding system, based on over-ridable `Response.encoding`.
+        * Proper URL slash-quote handling.
+        * Cookies with ``[``, ``]``, and ``_`` allowed.
+        
+        0.8.1 (2011-11-15)
+        ++++++++++++++++++
+        
+        * URL Request path fix
+        * Proxy fix.
+        * Timeouts fix.
+        
+        0.8.0 (2011-11-13)
+        ++++++++++++++++++
+        
+        * Keep-alive support!
+        * Complete removal of Urllib2
+        * Complete removal of Poster
+        * Complete removal of CookieJars
+        * New ConnectionError raising
+        * Safe_mode for error catching
+        * prefetch parameter for request methods
+        * OPTION method
+        * Async pool size throttling
+        * File uploads send real names
+        * Vendored in urllib3
+        
+        0.7.6 (2011-11-07)
+        ++++++++++++++++++
+        
+        * Digest authentication bugfix (attach query data to path)
+        
+        0.7.5 (2011-11-04)
+        ++++++++++++++++++
+        
+        * Response.content = None if there was an invalid repsonse.
+        * Redirection auth handling.
+        
+        0.7.4 (2011-10-26)
+        ++++++++++++++++++
+        
+        * Session Hooks fix.
+        
+        0.7.3 (2011-10-23)
+        ++++++++++++++++++
+        
+        * Digest Auth fix.
+        
+        
+        0.7.2 (2011-10-23)
+        ++++++++++++++++++
+        
+        * PATCH Fix.
+        
+        
+        0.7.1 (2011-10-23)
+        ++++++++++++++++++
+        
+        * Move away from urllib2 authentication handling.
+        * Fully Remove AuthManager, AuthObject, &c.
+        * New tuple-based auth system with handler callbacks.
+        
+        
+        0.7.0 (2011-10-22)
+        ++++++++++++++++++
+        
+        * Sessions are now the primary interface.
+        * Deprecated InvalidMethodException.
+        * PATCH fix.
+        * New config system (no more global settings).
+        
+        
+        0.6.6 (2011-10-19)
+        ++++++++++++++++++
+        
+        * Session parameter bugfix (params merging).
+        
+        
+        0.6.5 (2011-10-18)
+        ++++++++++++++++++
+        
+        * Offline (fast) test suite.
+        * Session dictionary argument merging.
+        
+        
+        0.6.4 (2011-10-13)
+        ++++++++++++++++++
+        
+        * Automatic decoding of unicode, based on HTTP Headers.
+        * New ``decode_unicode`` setting.
+        * Removal of ``r.read/close`` methods.
+        * New ``r.faw`` interface for advanced response usage.*
+        * Automatic expansion of parameterized headers.
+        
+        
+        0.6.3 (2011-10-13)
+        ++++++++++++++++++
+        
+        * Beautiful ``requests.async`` module, for making async requests w/ gevent.
+        
+        
+        0.6.2 (2011-10-09)
+        ++++++++++++++++++
+        
+        * GET/HEAD obeys allow_redirects=False.
+        
+        
+        0.6.1 (2011-08-20)
+        ++++++++++++++++++
+        
+        * Enhanced status codes experience ``\o/``
+        * Set a maximum number of redirects (``settings.max_redirects``)
+        * Full Unicode URL support
+        * Support for protocol-less redirects.
+        * Allow for arbitrary request types.
+        * Bugfixes
+        
+        
+        0.6.0 (2011-08-17)
+        ++++++++++++++++++
+        
+        * New callback hook system
+        * New persistient sessions object and context manager
+        * Transparent Dict-cookie handling
+        * Status code reference object
+        * Removed Response.cached
+        * Added Response.request
+        * All args are kwargs
+        * Relative redirect support
+        * HTTPError handling improvements
+        * Improved https testing
+        * Bugfixes
+        
+        
+        0.5.1 (2011-07-23)
+        ++++++++++++++++++
+        
+        * International Domain Name Support!
+        * Access headers without fetching entire body (``read()``)
+        * Use lists as dicts for parameters
+        * Add Forced Basic Authentication
+        * Forced Basic is default authentication type
+        * ``python-requests.org`` default User-Agent header
+        * CaseInsensitiveDict lower-case caching
+        * Response.history bugfix
+        
+        
+        0.5.0 (2011-06-21)
+        ++++++++++++++++++
+        
+        * PATCH Support
+        * Support for Proxies
+        * HTTPBin Test Suite
+        * Redirect Fixes
+        * settings.verbose stream writing
+        * Querystrings for all methods
+        * URLErrors (Connection Refused, Timeout, Invalid URLs) are treated as explicity raised
+          ``r.requests.get('hwe://blah'); r.raise_for_status()``
+        
+        
+        0.4.1 (2011-05-22)
+        ++++++++++++++++++
+        
+        * Improved Redirection Handling
+        * New 'allow_redirects' param for following non-GET/HEAD Redirects
+        * Settings module refactoring
+        
+        
+        0.4.0 (2011-05-15)
+        ++++++++++++++++++
+        
+        * Response.history: list of redirected responses
+        * Case-Insensitive Header Dictionaries!
+        * Unicode URLs
+        
+        
+        0.3.4 (2011-05-14)
+        ++++++++++++++++++
+        
+        * Urllib2 HTTPAuthentication Recursion fix (Basic/Digest)
+        * Internal Refactor
+        * Bytes data upload Bugfix
+        
+        
+        
+        0.3.3 (2011-05-12)
+        ++++++++++++++++++
+        
+        * Request timeouts
+        * Unicode url-encoded data
+        * Settings context manager and module
+        
+        
+        0.3.2 (2011-04-15)
+        ++++++++++++++++++
+        
+        * Automatic Decompression of GZip Encoded Content
+        * AutoAuth Support for Tupled HTTP Auth
+        
+        
+        0.3.1 (2011-04-01)
+        ++++++++++++++++++
+        
+        * Cookie Changes
+        * Response.read()
+        * Poster fix
+        
+        
+        0.3.0 (2011-02-25)
+        ++++++++++++++++++
+        
+        * Automatic Authentication API Change
+        * Smarter Query URL Parameterization
+        * Allow file uploads and POST data together
+        * New Authentication Manager System
+            - Simpler Basic HTTP System
+            - Supports all build-in urllib2 Auths
+            - Allows for custom Auth Handlers
+        
+        
+        0.2.4 (2011-02-19)
+        ++++++++++++++++++
+        
+        * Python 2.5 Support
+        * PyPy-c v1.4 Support
+        * Auto-Authentication tests
+        * Improved Request object constructor
+        
+        0.2.3 (2011-02-15)
+        ++++++++++++++++++
+        
+        * New HTTPHandling Methods
+            - Response.__nonzero__ (false if bad HTTP Status)
+            - Response.ok (True if expected HTTP Status)
+            - Response.error (Logged HTTPError if bad HTTP Status)
+            - Response.raise_for_status() (Raises stored HTTPError)
+        
+        
+        0.2.2 (2011-02-14)
+        ++++++++++++++++++
+        
+        * Still handles request in the event of an HTTPError. (Issue #2)
+        * Eventlet and Gevent Monkeypatch support.
+        * Cookie Support (Issue #1)
+        
+        
+        0.2.1 (2011-02-14)
+        ++++++++++++++++++
+        
+        * Added file attribute to POST and PUT requests for multipart-encode file uploads.
+        * Added Request.url attribute for context and redirects
+        
+        
+        0.2.0 (2011-02-14)
+        ++++++++++++++++++
+        
+        * Birth!
+        
+        
+        0.0.1 (2011-02-13)
+        ++++++++++++++++++
+        
+        * Frustration
+        * Conception
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/README.rst thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/README.rst
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/README.rst	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/README.rst	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,85 @@
+Requests: HTTP for Humans
+=========================
+
+.. image:: https://badge.fury.io/py/requests.png
+    :target: http://badge.fury.io/py/requests
+
+.. image:: https://pypip.in/d/requests/badge.png
+        :target: https://crate.io/packages/requests/
+
+
+Requests is an Apache2 Licensed HTTP library, written in Python, for human
+beings.
+
+Most existing Python modules for sending HTTP requests are extremely
+verbose and cumbersome. Python's builtin urllib2 module provides most of
+the HTTP capabilities you should need, but the api is thoroughly broken.
+It requires an enormous amount of work (even method overrides) to
+perform the simplest of tasks.
+
+Things shouldn't be this way. Not in Python.
+
+.. code-block:: python
+
+    >>> r = requests.get('https://api.github.com', auth=('user', 'pass'))
+    >>> r.status_code
+    204
+    >>> r.headers['content-type']
+    'application/json'
+    >>> r.text
+    ...
+
+See `the same code, without Requests <https://gist.github.com/973705>`_.
+
+Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
+multipart files, and parameters with simple Python dictionaries, and access the
+response data in the same way. It's powered by httplib and `urllib3
+<https://github.com/shazow/urllib3>`_, but it does all the hard work and crazy
+hacks for you.
+
+
+Features
+--------
+
+- International Domains and URLs
+- Keep-Alive & Connection Pooling
+- Sessions with Cookie Persistence
+- Browser-style SSL Verification
+- Basic/Digest Authentication
+- Elegant Key/Value Cookies
+- Automatic Decompression
+- Unicode Response Bodies
+- Multipart File Uploads
+- Connection Timeouts
+- Thread-safety
+- HTTP(S) proxy support
+
+
+Installation
+------------
+
+To install Requests, simply:
+
+.. code-block:: bash
+
+    $ pip install requests
+
+
+Documentation
+-------------
+
+Documentation is available at http://docs.python-requests.org/.
+
+
+Contribute
+----------
+
+#. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet.
+#. If you feel uncomfortable or uncertain about an issue or your changes, feel free to email @sigmavirus24 and he will happily help you via email, Skype, remote pairing or whatever you are comfortable with.
+#. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
+#. Write a test which shows that the bug was fixed or that the feature works as expected.
+#. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
+
+.. _`the repository`: http://github.com/kennethreitz/requests
+.. _AUTHORS: https://github.com/kennethreitz/requests/blob/master/AUTHORS.rst
+.. _Contributor Friendly: https://github.com/kennethreitz/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/adapters.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/adapters.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/adapters.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/adapters.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,437 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.adapters
+~~~~~~~~~~~~~~~~~
+
+This module contains the transport adapters that Requests uses to define
+and maintain connections.
+"""
+
+import socket
+
+from .models import Response
+from .packages.urllib3 import Retry
+from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
+from .packages.urllib3.response import HTTPResponse
+from .packages.urllib3.util import Timeout as TimeoutSauce
+from .compat import urlparse, basestring
+from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
+                    prepend_scheme_if_needed, get_auth_from_url, urldefragauth)
+from .structures import CaseInsensitiveDict
+from .packages.urllib3.exceptions import ConnectTimeoutError
+from .packages.urllib3.exceptions import HTTPError as _HTTPError
+from .packages.urllib3.exceptions import MaxRetryError
+from .packages.urllib3.exceptions import ProxyError as _ProxyError
+from .packages.urllib3.exceptions import ProtocolError
+from .packages.urllib3.exceptions import ReadTimeoutError
+from .packages.urllib3.exceptions import SSLError as _SSLError
+from .packages.urllib3.exceptions import ResponseError
+from .cookies import extract_cookies_to_jar
+from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
+                         ProxyError, RetryError)
+from .auth import _basic_auth_str
+
+DEFAULT_POOLBLOCK = False
+DEFAULT_POOLSIZE = 10
+DEFAULT_RETRIES = 0
+
+
+class BaseAdapter(object):
+    """The Base Transport Adapter"""
+
+    def __init__(self):
+        super(BaseAdapter, self).__init__()
+
+    def send(self):
+        raise NotImplementedError
+
+    def close(self):
+        raise NotImplementedError
+
+
+class HTTPAdapter(BaseAdapter):
+    """The built-in HTTP Adapter for urllib3.
+
+    Provides a general-case interface for Requests sessions to contact HTTP and
+    HTTPS urls by implementing the Transport Adapter interface. This class will
+    usually be created by the :class:`Session <Session>` class under the
+    covers.
+
+    :param pool_connections: The number of urllib3 connection pools to cache.
+    :param pool_maxsize: The maximum number of connections to save in the pool.
+    :param int max_retries: The maximum number of retries each connection
+        should attempt. Note, this applies only to failed DNS lookups, socket
+        connections and connection timeouts, never to requests where data has
+        made it to the server. By default, Requests does not retry failed
+        connections. If you need granular control over the conditions under
+        which we retry a request, import urllib3's ``Retry`` class and pass
+        that instead.
+    :param pool_block: Whether the connection pool should block for connections.
+
+    Usage::
+
+      >>> import requests
+      >>> s = requests.Session()
+      >>> a = requests.adapters.HTTPAdapter(max_retries=3)
+      >>> s.mount('http://', a)
+    """
+    __attrs__ = ['max_retries', 'config', '_pool_connections', '_pool_maxsize',
+                 '_pool_block']
+
+    def __init__(self, pool_connections=DEFAULT_POOLSIZE,
+                 pool_maxsize=DEFAULT_POOLSIZE, max_retries=DEFAULT_RETRIES,
+                 pool_block=DEFAULT_POOLBLOCK):
+        if max_retries == DEFAULT_RETRIES:
+            self.max_retries = Retry(0, read=False)
+        else:
+            self.max_retries = Retry.from_int(max_retries)
+        self.config = {}
+        self.proxy_manager = {}
+
+        super(HTTPAdapter, self).__init__()
+
+        self._pool_connections = pool_connections
+        self._pool_maxsize = pool_maxsize
+        self._pool_block = pool_block
+
+        self.init_poolmanager(pool_connections, pool_maxsize, block=pool_block)
+
+    def __getstate__(self):
+        return dict((attr, getattr(self, attr, None)) for attr in
+                    self.__attrs__)
+
+    def __setstate__(self, state):
+        # Can't handle by adding 'proxy_manager' to self.__attrs__ because
+        # because self.poolmanager uses a lambda function, which isn't pickleable.
+        self.proxy_manager = {}
+        self.config = {}
+
+        for attr, value in state.items():
+            setattr(self, attr, value)
+
+        self.init_poolmanager(self._pool_connections, self._pool_maxsize,
+                              block=self._pool_block)
+
+    def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs):
+        """Initializes a urllib3 PoolManager.
+
+        This method should not be called from user code, and is only
+        exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param connections: The number of urllib3 connection pools to cache.
+        :param maxsize: The maximum number of connections to save in the pool.
+        :param block: Block when no free connections are available.
+        :param pool_kwargs: Extra keyword arguments used to initialize the Pool Manager.
+        """
+        # save these values for pickling
+        self._pool_connections = connections
+        self._pool_maxsize = maxsize
+        self._pool_block = block
+
+        self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize,
+                                       block=block, strict=True, **pool_kwargs)
+
+    def proxy_manager_for(self, proxy, **proxy_kwargs):
+        """Return urllib3 ProxyManager for the given proxy.
+
+        This method should not be called from user code, and is only
+        exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param proxy: The proxy to return a urllib3 ProxyManager for.
+        :param proxy_kwargs: Extra keyword arguments used to configure the Proxy Manager.
+        :returns: ProxyManager
+        """
+        if not proxy in self.proxy_manager:
+            proxy_headers = self.proxy_headers(proxy)
+            self.proxy_manager[proxy] = proxy_from_url(
+                proxy,
+                proxy_headers=proxy_headers,
+                num_pools=self._pool_connections,
+                maxsize=self._pool_maxsize,
+                block=self._pool_block,
+                **proxy_kwargs)
+
+        return self.proxy_manager[proxy]
+
+    def cert_verify(self, conn, url, verify, cert):
+        """Verify a SSL certificate. This method should not be called from user
+        code, and is only exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param conn: The urllib3 connection object associated with the cert.
+        :param url: The requested URL.
+        :param verify: Whether we should actually verify the certificate.
+        :param cert: The SSL certificate to verify.
+        """
+        if url.lower().startswith('https') and verify:
+
+            cert_loc = None
+
+            # Allow self-specified cert location.
+            if verify is not True:
+                cert_loc = verify
+
+            if not cert_loc:
+                cert_loc = DEFAULT_CA_BUNDLE_PATH
+
+            if not cert_loc:
+                raise Exception("Could not find a suitable SSL CA certificate bundle.")
+
+            conn.cert_reqs = 'CERT_REQUIRED'
+            conn.ca_certs = cert_loc
+        else:
+            conn.cert_reqs = 'CERT_NONE'
+            conn.ca_certs = None
+
+        if cert:
+            if not isinstance(cert, basestring):
+                conn.cert_file = cert[0]
+                conn.key_file = cert[1]
+            else:
+                conn.cert_file = cert
+
+    def build_response(self, req, resp):
+        """Builds a :class:`Response <requests.Response>` object from a urllib3
+        response. This should not be called from user code, and is only exposed
+        for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`
+
+        :param req: The :class:`PreparedRequest <PreparedRequest>` used to generate the response.
+        :param resp: The urllib3 response object.
+        """
+        response = Response()
+
+        # Fallback to None if there's no status_code, for whatever reason.
+        response.status_code = getattr(resp, 'status', None)
+
+        # Make headers case-insensitive.
+        response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
+
+        # Set encoding.
+        response.encoding = get_encoding_from_headers(response.headers)
+        response.raw = resp
+        response.reason = response.raw.reason
+
+        if isinstance(req.url, bytes):
+            response.url = req.url.decode('utf-8')
+        else:
+            response.url = req.url
+
+        # Add new cookies from the server.
+        extract_cookies_to_jar(response.cookies, req, resp)
+
+        # Give the Response some context.
+        response.request = req
+        response.connection = self
+
+        return response
+
+    def get_connection(self, url, proxies=None):
+        """Returns a urllib3 connection for the given URL. This should not be
+        called from user code, and is only exposed for use when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param url: The URL to connect to.
+        :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
+        """
+        proxies = proxies or {}
+        proxy = proxies.get(urlparse(url.lower()).scheme)
+
+        if proxy:
+            proxy = prepend_scheme_if_needed(proxy, 'http')
+            proxy_manager = self.proxy_manager_for(proxy)
+            conn = proxy_manager.connection_from_url(url)
+        else:
+            # Only scheme should be lower case
+            parsed = urlparse(url)
+            url = parsed.geturl()
+            conn = self.poolmanager.connection_from_url(url)
+
+        return conn
+
+    def close(self):
+        """Disposes of any internal state.
+
+        Currently, this just closes the PoolManager, which closes pooled
+        connections.
+        """
+        self.poolmanager.clear()
+
+    def request_url(self, request, proxies):
+        """Obtain the url to use when making the final request.
+
+        If the message is being sent through a HTTP proxy, the full URL has to
+        be used. Otherwise, we should only use the path portion of the URL.
+
+        This should not be called from user code, and is only exposed for use
+        when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
+        :param proxies: A dictionary of schemes to proxy URLs.
+        """
+        proxies = proxies or {}
+        scheme = urlparse(request.url).scheme
+        proxy = proxies.get(scheme)
+
+        if proxy and scheme != 'https':
+            url = urldefragauth(request.url)
+        else:
+            url = request.path_url
+
+        return url
+
+    def add_headers(self, request, **kwargs):
+        """Add any headers needed by the connection. As of v2.0 this does
+        nothing by default, but is left for overriding by users that subclass
+        the :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        This should not be called from user code, and is only exposed for use
+        when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param request: The :class:`PreparedRequest <PreparedRequest>` to add headers to.
+        :param kwargs: The keyword arguments from the call to send().
+        """
+        pass
+
+    def proxy_headers(self, proxy):
+        """Returns a dictionary of the headers to add to any request sent
+        through a proxy. This works with urllib3 magic to ensure that they are
+        correctly sent to the proxy, rather than in a tunnelled request if
+        CONNECT is being used.
+
+        This should not be called from user code, and is only exposed for use
+        when subclassing the
+        :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
+
+        :param proxies: The url of the proxy being used for this request.
+        :param kwargs: Optional additional keyword arguments.
+        """
+        headers = {}
+        username, password = get_auth_from_url(proxy)
+
+        if username and password:
+            headers['Proxy-Authorization'] = _basic_auth_str(username,
+                                                             password)
+
+        return headers
+
+    def send(self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None):
+        """Sends PreparedRequest object. Returns Response object.
+
+        :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
+        :param stream: (optional) Whether to stream the request content.
+        :param timeout: (optional) How long to wait for the server to send
+            data before giving up, as a float, or a (`connect timeout, read
+            timeout <user/advanced.html#timeouts>`_) tuple.
+        :type timeout: float or tuple
+        :param verify: (optional) Whether to verify SSL certificates.
+        :param cert: (optional) Any user-provided SSL certificate to be trusted.
+        :param proxies: (optional) The proxies dictionary to apply to the request.
+        """
+
+        conn = self.get_connection(request.url, proxies)
+
+        self.cert_verify(conn, request.url, verify, cert)
+        url = self.request_url(request, proxies)
+        self.add_headers(request)
+
+        chunked = not (request.body is None or 'Content-Length' in request.headers)
+
+        if isinstance(timeout, tuple):
+            try:
+                connect, read = timeout
+                timeout = TimeoutSauce(connect=connect, read=read)
+            except ValueError as e:
+                # this may raise a string formatting error.
+                err = ("Invalid timeout {0}. Pass a (connect, read) "
+                       "timeout tuple, or a single float to set "
+                       "both timeouts to the same value".format(timeout))
+                raise ValueError(err)
+        else:
+            timeout = TimeoutSauce(connect=timeout, read=timeout)
+
+        try:
+            if not chunked:
+                resp = conn.urlopen(
+                    method=request.method,
+                    url=url,
+                    body=request.body,
+                    headers=request.headers,
+                    redirect=False,
+                    assert_same_host=False,
+                    preload_content=False,
+                    decode_content=False,
+                    retries=self.max_retries,
+                    timeout=timeout
+                )
+
+            # Send the request.
+            else:
+                if hasattr(conn, 'proxy_pool'):
+                    conn = conn.proxy_pool
+
+                low_conn = conn._get_conn(timeout=timeout)
+
+                try:
+                    low_conn.putrequest(request.method,
+                                        url,
+                                        skip_accept_encoding=True)
+
+                    for header, value in request.headers.items():
+                        low_conn.putheader(header, value)
+
+                    low_conn.endheaders()
+
+                    for i in request.body:
+                        low_conn.send(hex(len(i))[2:].encode('utf-8'))
+                        low_conn.send(b'\r\n')
+                        low_conn.send(i)
+                        low_conn.send(b'\r\n')
+                    low_conn.send(b'0\r\n\r\n')
+
+                    r = low_conn.getresponse()
+                    resp = HTTPResponse.from_httplib(
+                        r,
+                        pool=conn,
+                        connection=low_conn,
+                        preload_content=False,
+                        decode_content=False
+                    )
+                except:
+                    # If we hit any problems here, clean up the connection.
+                    # Then, reraise so that we can handle the actual exception.
+                    low_conn.close()
+                    raise
+                else:
+                    # All is well, return the connection to the pool.
+                    conn._put_conn(low_conn)
+
+        except (ProtocolError, socket.error) as err:
+            raise ConnectionError(err, request=request)
+
+        except MaxRetryError as e:
+            if isinstance(e.reason, ConnectTimeoutError):
+                raise ConnectTimeout(e, request=request)
+
+            if isinstance(e.reason, ResponseError):
+                raise RetryError(e, request=request)
+
+            raise ConnectionError(e, request=request)
+
+        except _ProxyError as e:
+            raise ProxyError(e)
+
+        except (_SSLError, _HTTPError) as e:
+            if isinstance(e, _SSLError):
+                raise SSLError(e, request=request)
+            elif isinstance(e, ReadTimeoutError):
+                raise ReadTimeout(e, request=request)
+            else:
+                raise
+
+        return self.build_response(request, resp)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/api.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/api.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/api.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/api.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.api
+~~~~~~~~~~~~
+
+This module implements the Requests API.
+
+:copyright: (c) 2012 by Kenneth Reitz.
+:license: Apache2, see LICENSE for more details.
+
+"""
+
+from . import sessions
+
+
+def request(method, url, **kwargs):
+    """Constructs and sends a :class:`Request <Request>`.
+    Returns :class:`Response <Response>` object.
+
+    :param method: method for the new :class:`Request` object.
+    :param url: URL for the new :class:`Request` object.
+    :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param json: (optional) json data to send in the body of the :class:`Request`.
+    :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
+    :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
+    :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': ('filename', fileobj)}``) for multipart encoding upload.
+    :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
+    :param timeout: (optional) How long to wait for the server to send data
+        before giving up, as a float, or a (`connect timeout, read timeout
+        <user/advanced.html#timeouts>`_) tuple.
+    :type timeout: float or tuple
+    :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed.
+    :type allow_redirects: bool
+    :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
+    :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided.
+    :param stream: (optional) if ``False``, the response content will be immediately downloaded.
+    :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
+
+    Usage::
+
+      >>> import requests
+      >>> req = requests.request('GET', 'http://httpbin.org/get')
+      <Response [200]>
+    """
+
+    session = sessions.Session()
+    response = session.request(method=method, url=url, **kwargs)
+    # By explicitly closing the session, we avoid leaving sockets open which
+    # can trigger a ResourceWarning in some cases, and look like a memory leak
+    # in others.
+    session.close()
+    return response
+
+
+def get(url, **kwargs):
+    """Sends a GET request. Returns :class:`Response` object.
+
+    :param url: URL for the new :class:`Request` object.
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
+    """
+
+    kwargs.setdefault('allow_redirects', True)
+    return request('get', url, **kwargs)
+
+
+def options(url, **kwargs):
+    """Sends a OPTIONS request. Returns :class:`Response` object.
+
+    :param url: URL for the new :class:`Request` object.
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
+    """
+
+    kwargs.setdefault('allow_redirects', True)
+    return request('options', url, **kwargs)
+
+
+def head(url, **kwargs):
+    """Sends a HEAD request. Returns :class:`Response` object.
+
+    :param url: URL for the new :class:`Request` object.
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
+    """
+
+    kwargs.setdefault('allow_redirects', False)
+    return request('head', url, **kwargs)
+
+
+def post(url, data=None, json=None, **kwargs):
+    """Sends a POST request. Returns :class:`Response` object.
+
+    :param url: URL for the new :class:`Request` object.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param json: (optional) json data to send in the body of the :class:`Request`.
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
+    """
+
+    return request('post', url, data=data, json=json, **kwargs)
+
+
+def put(url, data=None, **kwargs):
+    """Sends a PUT request. Returns :class:`Response` object.
+
+    :param url: URL for the new :class:`Request` object.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
+    """
+
+    return request('put', url, data=data, **kwargs)
+
+
+def patch(url, data=None, **kwargs):
+    """Sends a PATCH request. Returns :class:`Response` object.
+
+    :param url: URL for the new :class:`Request` object.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
+    """
+
+    return request('patch', url,  data=data, **kwargs)
+
+
+def delete(url, **kwargs):
+    """Sends a DELETE request. Returns :class:`Response` object.
+
+    :param url: URL for the new :class:`Request` object.
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
+    """
+
+    return request('delete', url, **kwargs)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/auth.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/auth.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/auth.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/auth.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,209 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.auth
+~~~~~~~~~~~~~
+
+This module contains the authentication handlers for Requests.
+"""
+
+import os
+import re
+import time
+import hashlib
+
+from base64 import b64encode
+
+from .compat import urlparse, str
+from .cookies import extract_cookies_to_jar
+from .utils import parse_dict_header, to_native_string
+from .status_codes import codes
+
+CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
+CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
+
+
+def _basic_auth_str(username, password):
+    """Returns a Basic Auth string."""
+
+    authstr = 'Basic ' + to_native_string(
+        b64encode(('%s:%s' % (username, password)).encode('latin1')).strip()
+    )
+
+    return authstr
+
+
+class AuthBase(object):
+    """Base class that all auth implementations derive from"""
+
+    def __call__(self, r):
+        raise NotImplementedError('Auth hooks must be callable.')
+
+
+class HTTPBasicAuth(AuthBase):
+    """Attaches HTTP Basic Authentication to the given Request object."""
+    def __init__(self, username, password):
+        self.username = username
+        self.password = password
+
+    def __call__(self, r):
+        r.headers['Authorization'] = _basic_auth_str(self.username, self.password)
+        return r
+
+
+class HTTPProxyAuth(HTTPBasicAuth):
+    """Attaches HTTP Proxy Authentication to a given Request object."""
+    def __call__(self, r):
+        r.headers['Proxy-Authorization'] = _basic_auth_str(self.username, self.password)
+        return r
+
+
+class HTTPDigestAuth(AuthBase):
+    """Attaches HTTP Digest Authentication to the given Request object."""
+    def __init__(self, username, password):
+        self.username = username
+        self.password = password
+        self.last_nonce = ''
+        self.nonce_count = 0
+        self.chal = {}
+        self.pos = None
+        self.num_401_calls = 1
+
+    def build_digest_header(self, method, url):
+
+        realm = self.chal['realm']
+        nonce = self.chal['nonce']
+        qop = self.chal.get('qop')
+        algorithm = self.chal.get('algorithm')
+        opaque = self.chal.get('opaque')
+
+        if algorithm is None:
+            _algorithm = 'MD5'
+        else:
+            _algorithm = algorithm.upper()
+        # lambdas assume digest modules are imported at the top level
+        if _algorithm == 'MD5' or _algorithm == 'MD5-SESS':
+            def md5_utf8(x):
+                if isinstance(x, str):
+                    x = x.encode('utf-8')
+                return hashlib.md5(x).hexdigest()
+            hash_utf8 = md5_utf8
+        elif _algorithm == 'SHA':
+            def sha_utf8(x):
+                if isinstance(x, str):
+                    x = x.encode('utf-8')
+                return hashlib.sha1(x).hexdigest()
+            hash_utf8 = sha_utf8
+
+        KD = lambda s, d: hash_utf8("%s:%s" % (s, d))
+
+        if hash_utf8 is None:
+            return None
+
+        # XXX not implemented yet
+        entdig = None
+        p_parsed = urlparse(url)
+        path = p_parsed.path
+        if p_parsed.query:
+            path += '?' + p_parsed.query
+
+        A1 = '%s:%s:%s' % (self.username, realm, self.password)
+        A2 = '%s:%s' % (method, path)
+
+        HA1 = hash_utf8(A1)
+        HA2 = hash_utf8(A2)
+
+        if nonce == self.last_nonce:
+            self.nonce_count += 1
+        else:
+            self.nonce_count = 1
+        ncvalue = '%08x' % self.nonce_count
+        s = str(self.nonce_count).encode('utf-8')
+        s += nonce.encode('utf-8')
+        s += time.ctime().encode('utf-8')
+        s += os.urandom(8)
+
+        cnonce = (hashlib.sha1(s).hexdigest()[:16])
+        noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, HA2)
+        if _algorithm == 'MD5-SESS':
+            HA1 = hash_utf8('%s:%s:%s' % (HA1, nonce, cnonce))
+
+        if qop is None:
+            respdig = KD(HA1, "%s:%s" % (nonce, HA2))
+        elif qop == 'auth' or 'auth' in qop.split(','):
+            respdig = KD(HA1, noncebit)
+        else:
+            # XXX handle auth-int.
+            return None
+
+        self.last_nonce = nonce
+
+        # XXX should the partial digests be encoded too?
+        base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' \
+               'response="%s"' % (self.username, realm, nonce, path, respdig)
+        if opaque:
+            base += ', opaque="%s"' % opaque
+        if algorithm:
+            base += ', algorithm="%s"' % algorithm
+        if entdig:
+            base += ', digest="%s"' % entdig
+        if qop:
+            base += ', qop="auth", nc=%s, cnonce="%s"' % (ncvalue, cnonce)
+
+        return 'Digest %s' % (base)
+
+    def handle_redirect(self, r, **kwargs):
+        """Reset num_401_calls counter on redirects."""
+        if r.is_redirect:
+            self.num_401_calls = 1
+
+    def handle_401(self, r, **kwargs):
+        """Takes the given response and tries digest-auth, if needed."""
+
+        if self.pos is not None:
+            # Rewind the file position indicator of the body to where
+            # it was to resend the request.
+            r.request.body.seek(self.pos)
+        num_401_calls = getattr(self, 'num_401_calls', 1)
+        s_auth = r.headers.get('www-authenticate', '')
+
+        if 'digest' in s_auth.lower() and num_401_calls < 2:
+
+            self.num_401_calls += 1
+            pat = re.compile(r'digest ', flags=re.IGNORECASE)
+            self.chal = parse_dict_header(pat.sub('', s_auth, count=1))
+
+            # Consume content and release the original connection
+            # to allow our new request to reuse the same one.
+            r.content
+            r.raw.release_conn()
+            prep = r.request.copy()
+            extract_cookies_to_jar(prep._cookies, r.request, r.raw)
+            prep.prepare_cookies(prep._cookies)
+
+            prep.headers['Authorization'] = self.build_digest_header(
+                prep.method, prep.url)
+            _r = r.connection.send(prep, **kwargs)
+            _r.history.append(r)
+            _r.request = prep
+
+            return _r
+
+        self.num_401_calls = 1
+        return r
+
+    def __call__(self, r):
+        # If we have a saved nonce, skip the 401
+        if self.last_nonce:
+            r.headers['Authorization'] = self.build_digest_header(r.method, r.url)
+        try:
+            self.pos = r.body.tell()
+        except AttributeError:
+            # In the case of HTTPDigestAuth being reused and the body of
+            # the previous request was a file-like object, pos has the
+            # file position of the previous body. Ensure it's set to
+            # None.
+            self.pos = None
+        r.register_hook('response', self.handle_401)
+        r.register_hook('response', self.handle_redirect)
+        return r
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/cacert.pem thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/cacert.pem
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/cacert.pem	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/cacert.pem	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,5026 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Issuer: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Subject: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Label: "GTE CyberTrust Global Root"
+# Serial: 421
+# MD5 Fingerprint: ca:3d:d3:68:f1:03:5c:d0:32:fa:b8:2b:59:e8:5a:db
+# SHA1 Fingerprint: 97:81:79:50:d8:1c:96:70:cc:34:d8:09:cf:79:44:31:36:7e:f4:74
+# SHA256 Fingerprint: a5:31:25:18:8d:21:10:aa:96:4b:02:c7:b7:c6:da:32:03:17:08:94:e5:fb:71:ff:fb:66:67:d5:e6:81:0a:36
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Server CA"
+# Serial: 1
+# MD5 Fingerprint: c5:70:c4:a2:ed:53:78:0c:c8:10:53:81:64:cb:d0:1d
+# SHA1 Fingerprint: 23:e5:94:94:51:95:f2:41:48:03:b4:d5:64:d2:a3:a3:f5:d8:8b:8c
+# SHA256 Fingerprint: b4:41:0b:73:e2:e6:ea:ca:47:fb:c4:2f:8f:a4:01:8a:f4:38:1d:c5:4c:fa:a8:44:50:46:1e:ed:09:45:4d:e9
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Premium Server CA"
+# Serial: 1
+# MD5 Fingerprint: 06:9f:69:79:16:66:90:02:1b:8c:8c:a2:c3:07:6f:3a
+# SHA1 Fingerprint: 62:7f:8d:78:27:65:63:99:d2:7d:7f:90:44:c9:fe:b3:f3:3e:fa:9a
+# SHA256 Fingerprint: ab:70:36:36:5c:71:54:aa:29:c2:c2:9f:5d:41:91:16:3b:16:2a:22:25:01:13:57:d5:6d:07:ff:a7:bc:1f:72
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Equifax OU=Equifax Secure Certificate Authority
+# Subject: O=Equifax OU=Equifax Secure Certificate Authority
+# Label: "Equifax Secure CA"
+# Serial: 903804111
+# MD5 Fingerprint: 67:cb:9d:c0:13:24:8a:82:9b:b2:17:1e:d1:1b:ec:d4
+# SHA1 Fingerprint: d2:32:09:ad:23:d3:14:23:21:74:e4:0d:7f:9d:62:13:97:86:63:3a
+# SHA256 Fingerprint: 08:29:7a:40:47:db:a2:36:80:c7:31:db:6e:31:76:53:ca:78:48:e1:be:bd:3a:0b:01:79:a7:07:f9:2c:f1:78
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 149843929435818692848040365716851702463
+# MD5 Fingerprint: 10:fc:63:5d:f6:26:3e:0d:f3:25:be:5f:79:cd:67:67
+# SHA1 Fingerprint: 74:2c:31:92:e6:07:e4:24:eb:45:49:54:2b:e1:bb:c5:3e:61:74:e2
+# SHA256 Fingerprint: e7:68:56:34:ef:ac:f6:9a:ce:93:9a:6b:25:5b:7b:4f:ab:ef:42:93:5b:50:a2:65:ac:b5:cb:60:27:e4:4e:70
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Label: "Verisign Class 3 Public Primary Certification Authority - G2"
+# Serial: 167285380242319648451154478808036881606
+# MD5 Fingerprint: a2:33:9b:4c:74:78:73:d4:6c:e7:c1:f3:8d:cb:5c:e9
+# SHA1 Fingerprint: 85:37:1c:a6:e5:50:14:3d:ce:28:03:47:1b:de:3a:09:e8:f8:77:0f
+# SHA256 Fingerprint: 83:ce:3c:12:29:68:8a:59:3d:48:5f:81:97:3c:0f:91:95:43:1e:da:37:cc:5e:36:43:0e:79:c7:a8:88:63:8b
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Label: "GlobalSign Root CA"
+# Serial: 4835703278459707669005204
+# MD5 Fingerprint: 3e:45:52:15:09:51:92:e1:b7:5d:37:9f:b1:87:29:8a
+# SHA1 Fingerprint: b1:bc:96:8b:d4:f4:9d:62:2a:a8:9a:81:f2:15:01:52:a4:1d:82:9c
+# SHA256 Fingerprint: eb:d4:10:40:e4:bb:3e:c7:42:c9:e3:81:d3:1e:f2:a4:1a:48:b6:68:5c:96:e7:ce:f3:c1:df:6c:d4:33:1c:99
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Label: "GlobalSign Root CA - R2"
+# Serial: 4835703278459682885658125
+# MD5 Fingerprint: 94:14:77:7e:3e:5e:fd:8f:30:bd:41:b0:cf:e7:d0:30
+# SHA1 Fingerprint: 75:e0:ab:b6:13:85:12:27:1c:04:f8:5f:dd:de:38:e4:b7:24:2e:fe
+# SHA256 Fingerprint: ca:42:dd:41:74:5f:d0:b8:1e:b9:02:36:2c:f9:d8:bf:71:9d:a1:bd:1b:1e:fc:94:6f:5b:4c:99:f4:2c:1b:9e
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Label: "ValiCert Class 1 VA"
+# Serial: 1
+# MD5 Fingerprint: 65:58:ab:15:ad:57:6c:1e:a8:a7:b5:69:ac:bf:ff:eb
+# SHA1 Fingerprint: e5:df:74:3c:b6:01:c4:9b:98:43:dc:ab:8c:e8:6a:81:10:9f:e4:8e
+# SHA256 Fingerprint: f4:c1:49:55:1a:30:13:a3:5b:c7:bf:fe:17:a7:f3:44:9b:c1:ab:5b:5a:0a:e7:4b:06:c2:3b:90:00:4c:01:04
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Label: "ValiCert Class 2 VA"
+# Serial: 1
+# MD5 Fingerprint: a9:23:75:9b:ba:49:36:6e:31:c2:db:f2:e7:66:ba:87
+# SHA1 Fingerprint: 31:7a:2a:d0:7f:2b:33:5e:f5:a1:c3:4e:4b:57:e8:b7:d8:f1:fc:a6
+# SHA256 Fingerprint: 58:d0:17:27:9c:d4:dc:63:ab:dd:b1:96:a6:c9:90:6c:30:c4:e0:87:83:ea:e8:c1:60:99:54:d6:93:55:59:6b
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Label: "RSA Root Certificate 1"
+# Serial: 1
+# MD5 Fingerprint: a2:6f:53:b7:ee:40:db:4a:68:e7:fa:18:d9:10:4b:72
+# SHA1 Fingerprint: 69:bd:8c:f4:9c:d3:00:fb:59:2e:17:93:ca:55:6a:f3:ec:aa:35:fb
+# SHA256 Fingerprint: bc:23:f9:8a:31:3c:b9:2d:e3:bb:fc:3a:5a:9f:44:61:ac:39:49:4c:4a:e1:5a:9e:9d:f1:31:e9:9b:73:01:9a
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 3 Public Primary Certification Authority - G3"
+# Serial: 206684696279472310254277870180966723415
+# MD5 Fingerprint: cd:68:b6:a7:c7:c4:ce:75:e0:1d:4f:57:44:61:92:09
+# SHA1 Fingerprint: 13:2d:0d:45:53:4b:69:97:cd:b2:d5:c3:39:e2:55:76:60:9b:5c:c6
+# SHA256 Fingerprint: eb:04:cf:5e:b1:f3:9a:fa:76:2f:2b:b1:20:f2:96:cb:a5:20:c1:b9:7d:b1:58:95:65:b8:1c:b9:a1:7b:72:44
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 4 Public Primary Certification Authority - G3"
+# Serial: 314531972711909413743075096039378935511
+# MD5 Fingerprint: db:c8:f2:27:2e:b1:ea:6a:29:23:5d:fe:56:3e:33:df
+# SHA1 Fingerprint: c8:ec:8c:87:92:69:cb:4b:ab:39:e9:8d:7e:57:67:f3:14:95:73:9d
+# SHA256 Fingerprint: e3:89:36:0d:0f:db:ae:b3:d2:50:58:4b:47:30:31:4e:22:2f:39:c1:56:a0:20:14:4e:8d:96:05:61:79:15:06
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Secure Server CA"
+# Serial: 927650371
+# MD5 Fingerprint: df:f2:80:73:cc:f1:e6:61:73:fc:f5:42:e9:c5:7c:ee
+# SHA1 Fingerprint: 99:a6:9b:e6:1a:fe:88:6b:4d:2b:82:00:7c:b8:54:fc:31:7e:15:39
+# SHA256 Fingerprint: 62:f2:40:27:8c:56:4c:4d:d8:bf:7d:9d:4f:6f:36:6e:a8:94:d2:2f:5f:34:d9:89:a9:83:ac:ec:2f:ff:ed:50
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Premium 2048 Secure Server CA"
+# Serial: 946069240
+# MD5 Fingerprint: ee:29:31:bc:32:7e:9a:e6:e8:b5:f7:51:b4:34:71:90
+# SHA1 Fingerprint: 50:30:06:09:1d:97:d4:f5:ae:39:f7:cb:e7:92:7d:7d:65:2d:34:31
+# SHA256 Fingerprint: 6d:c4:71:72:e0:1c:bc:b0:bf:62:58:0d:89:5f:e2:b8:ac:9a:d4:f8:73:80:1e:0c:10:b9:c8:37:d2:1e:b1:77
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
+MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
+j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
+U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
+u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
+bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
+fF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Label: "Baltimore CyberTrust Root"
+# Serial: 33554617
+# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
+# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
+# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure Global eBusiness CA"
+# Serial: 1
+# MD5 Fingerprint: 8f:5d:77:06:27:c4:98:3c:5b:93:78:e7:d7:7d:9b:cc
+# SHA1 Fingerprint: 7e:78:4a:10:1c:82:65:cc:2d:e1:f1:6d:47:b4:40:ca:d9:0a:19:45
+# SHA256 Fingerprint: 5f:0b:62:ea:b5:e3:53:ea:65:21:65:16:58:fb:b6:53:59:f4:43:28:0a:4a:fb:d1:04:d7:7d:10:f9:f0:4c:07
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure eBusiness CA 1"
+# Serial: 4
+# MD5 Fingerprint: 64:9c:ef:2e:44:fc:c6:8f:52:07:d0:51:73:8f:cb:3d
+# SHA1 Fingerprint: da:40:18:8b:91:89:a3:ed:ee:ae:da:97:fe:2f:9d:f5:b7:d1:8a:41
+# SHA256 Fingerprint: cf:56:ff:46:a4:a1:86:10:9d:d9:65:84:b5:ee:b5:8a:51:0c:42:75:b0:e5:f9:4f:40:bb:ae:86:5e:19:f6:73
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Low-Value Services Root"
+# Serial: 1
+# MD5 Fingerprint: 1e:42:95:02:33:92:6b:b9:5f:c0:7f:da:d6:b2:4b:fc
+# SHA1 Fingerprint: cc:ab:0e:a0:4c:23:01:d6:69:7b:dd:37:9f:cd:12:eb:24:e3:94:9d
+# SHA256 Fingerprint: 8c:72:09:27:9a:c0:4e:27:5e:16:d0:7f:d3:b7:75:e8:01:54:b5:96:80:46:e3:1f:52:dd:25:76:63:24:e9:a7
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Subject: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Label: "AddTrust External Root"
+# Serial: 1
+# MD5 Fingerprint: 1d:35:54:04:85:78:b0:3f:42:42:4d:bf:20:73:0a:3f
+# SHA1 Fingerprint: 02:fa:f3:e2:91:43:54:68:60:78:57:69:4d:f5:e4:5b:68:85:18:68
+# SHA256 Fingerprint: 68:7f:a4:51:38:22:78:ff:f0:c8:b1:1f:8d:43:d5:76:67:1c:6e:b2:bc:ea:b4:13:fb:83:d9:65:d0:6d:2f:f2
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Public Services Root"
+# Serial: 1
+# MD5 Fingerprint: c1:62:3e:23:c5:82:73:9c:03:59:4b:2b:e9:77:49:7f
+# SHA1 Fingerprint: 2a:b6:28:48:5e:78:fb:f3:ad:9e:79:10:dd:6b:df:99:72:2c:96:e5
+# SHA256 Fingerprint: 07:91:ca:07:49:b2:07:82:aa:d3:c7:d7:bd:0c:df:c9:48:58:35:84:3e:b2:d7:99:60:09:ce:43:ab:6c:69:27
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
+MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
+ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
+BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
+6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
+GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
+dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
+1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
+62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
+BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
+MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
+cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
+b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
+IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
+iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
+4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
+XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Qualified Certificates Root"
+# Serial: 1
+# MD5 Fingerprint: 27:ec:39:47:cd:da:5a:af:e2:9a:01:65:21:a9:4c:bb
+# SHA1 Fingerprint: 4d:23:78:ec:91:95:39:b5:00:7f:75:8f:03:3b:21:1e:c5:4d:8b:cf
+# SHA256 Fingerprint: 80:95:21:08:05:db:4b:bc:35:5e:44:28:d8:fd:6e:c2:cd:e3:ab:5f:b9:7a:99:42:98:8e:b8:f4:dc:d0:60:16
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Label: "Entrust Root Certification Authority"
+# Serial: 1164660820
+# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
+# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
+# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
+0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+# Issuer: O=RSA Security Inc OU=RSA Security 2048 V3
+# Subject: O=RSA Security Inc OU=RSA Security 2048 V3
+# Label: "RSA Security 2048 v3"
+# Serial: 13297492616345471454730593562152402946
+# MD5 Fingerprint: 77:0d:19:b1:21:fd:00:42:9c:3e:0c:a5:dd:0b:02:8e
+# SHA1 Fingerprint: 25:01:90:19:cf:fb:d9:99:1c:b7:68:25:74:8d:94:5f:30:93:95:42
+# SHA256 Fingerprint: af:8b:67:62:a1:e5:28:22:81:61:a9:5d:5c:55:9e:e2:66:27:8f:75:d7:9e:83:01:89:a5:03:50:6a:bd:6b:4c
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
+dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
+MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
+eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
+/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
+wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
+AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
+PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
+AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
+MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
+HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
+Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
+f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
+rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
+6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
+7CAFYd4=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Label: "GeoTrust Global CA"
+# Serial: 144470
+# MD5 Fingerprint: f7:75:ab:29:fb:51:4e:b7:77:5e:ff:05:3c:99:8e:f5
+# SHA1 Fingerprint: de:28:f4:a4:ff:e5:b9:2f:a3:c5:03:d1:a3:49:a7:f9:96:2a:82:12
+# SHA256 Fingerprint: ff:85:6a:2d:25:1d:cd:88:d3:66:56:f4:50:12:67:98:cf:ab:aa:de:40:79:9c:72:2d:e4:d2:b5:db:36:a7:3a
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Global CA 2"
+# Serial: 1
+# MD5 Fingerprint: 0e:40:a7:6c:de:03:5d:8f:d1:0f:e4:d1:8d:f9:6c:a9
+# SHA1 Fingerprint: a9:e9:78:08:14:37:58:88:f2:05:19:b0:6d:2b:0d:2b:60:16:90:7d
+# SHA256 Fingerprint: ca:2d:82:a0:86:77:07:2f:8a:b6:76:4f:f0:35:67:6c:fe:3e:5e:32:5e:01:21:72:df:3f:92:09:6d:b7:9b:85
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
+4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA"
+# Serial: 1
+# MD5 Fingerprint: 92:65:58:8b:a2:1a:31:72:73:68:5c:b4:a5:7a:07:48
+# SHA1 Fingerprint: e6:21:f3:35:43:79:05:9a:4b:68:30:9d:8a:2f:74:22:15:87:ec:79
+# SHA256 Fingerprint: a0:45:9b:9f:63:b2:25:59:f5:fa:5d:4c:6d:b3:f9:f7:2f:f1:93:42:03:35:78:f0:73:bf:1d:1b:46:cb:b9:12
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA 2"
+# Serial: 1
+# MD5 Fingerprint: 34:fc:b8:d0:36:db:9e:14:b3:c2:f2:db:8f:e4:94:c7
+# SHA1 Fingerprint: 37:9a:19:7b:41:85:45:35:0c:a6:03:69:f3:3c:2e:af:47:4f:20:79
+# SHA256 Fingerprint: a0:23:4f:3b:c8:52:7c:a5:62:8e:ec:81:ad:5d:69:89:5d:a5:68:0d:c9:1d:1c:b8:47:7f:33:f8:78:b9:5b:0b
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+# Issuer: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Label: "America Online Root Certification Authority 1"
+# Serial: 1
+# MD5 Fingerprint: 14:f1:08:ad:9d:fa:64:e2:89:e7:1c:cf:a8:ad:7d:5e
+# SHA1 Fingerprint: 39:21:c1:15:c1:5d:0e:ca:5c:cb:5b:c4:f0:7d:21:d8:05:0b:56:6a
+# SHA256 Fingerprint: 77:40:73:12:c6:3a:15:3d:5b:c0:0b:4e:51:75:9c:df:da:c2:37:dc:2a:33:b6:79:46:e9:8e:9b:fa:68:0a:e3
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk
+hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym
+1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW
+OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb
+2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko
+O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU
+AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF
+Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb
+LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir
+oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C
+MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
+sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
+-----END CERTIFICATE-----
+
+# Issuer: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Label: "America Online Root Certification Authority 2"
+# Serial: 1
+# MD5 Fingerprint: d6:ed:3c:ca:e2:66:0f:af:10:43:0d:77:9b:04:09:bf
+# SHA1 Fingerprint: 85:b5:ff:67:9b:0c:79:96:1f:c8:6e:44:22:00:46:13:db:17:92:84
+# SHA256 Fingerprint: 7d:3b:46:5a:60:14:e5:26:c0:af:fc:ee:21:27:d2:31:17:27:ad:81:1c:26:84:2d:00:6a:f3:73:06:cc:80:bd
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC
+206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci
+KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2
+JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9
+BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e
+Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B
+PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67
+Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq
+Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ
+o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3
++L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj
+YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj
+FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn
+xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2
+LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc
+obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8
+CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe
+IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA
+DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F
+AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX
+Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb
+AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl
+Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw
+RY8mkaKO/qk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Subject: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Label: "Visa eCommerce Root"
+# Serial: 25952180776285836048024890241505565794
+# MD5 Fingerprint: fc:11:b8:d8:08:93:30:00:6d:23:f9:7e:eb:52:1e:02
+# SHA1 Fingerprint: 70:17:9b:86:8c:00:a4:fa:60:91:52:22:3f:9f:3e:32:bd:e0:05:62
+# SHA256 Fingerprint: 69:fa:c9:bd:55:fb:0a:c7:8d:53:bb:ee:5c:f1:d5:97:98:9f:d0:aa:ab:20:a2:51:51:bd:f1:73:3e:e7:d1:22
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
+MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
+cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
+CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
+dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
+cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
+2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
+lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
+ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
+299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
+vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
+dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
+AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
+zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
+LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
+7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
+++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum CA O=Unizeto Sp. z o.o.
+# Subject: CN=Certum CA O=Unizeto Sp. z o.o.
+# Label: "Certum Root CA"
+# Serial: 65568
+# MD5 Fingerprint: 2c:8f:9f:66:1d:18:90:b1:47:26:9d:8e:86:82:8c:a9
+# SHA1 Fingerprint: 62:52:dc:40:f7:11:43:a2:2f:de:9e:f7:34:8e:06:42:51:b1:81:18
+# SHA256 Fingerprint: d8:e0:fe:bc:1d:b2:e3:8d:00:94:0f:37:d2:7d:41:34:4d:99:3e:73:4b:99:d5:65:6d:97:78:d4:d8:14:36:24
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
+# Subject: CN=AAA Certificate Services O=Comodo CA Limited
+# Label: "Comodo AAA Services root"
+# Serial: 1
+# MD5 Fingerprint: 49:79:04:b0:eb:87:19:ac:47:b0:bc:11:51:9b:74:d0
+# SHA1 Fingerprint: d1:eb:23:a4:6d:17:d6:8f:d9:25:64:c2:f1:f1:60:17:64:d8:e3:49
+# SHA256 Fingerprint: d7:a7:a0:fb:5d:7e:27:31:d7:71:e9:48:4e:bc:de:f7:1d:5f:0c:3e:0a:29:48:78:2b:c8:3e:e0:ea:69:9e:f4
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Secure Certificate Services O=Comodo CA Limited
+# Subject: CN=Secure Certificate Services O=Comodo CA Limited
+# Label: "Comodo Secure Services root"
+# Serial: 1
+# MD5 Fingerprint: d3:d9:bd:ae:9f:ac:67:24:b3:c8:1b:52:e1:b9:a9:bd
+# SHA1 Fingerprint: 4a:65:d5:f4:1d:ef:39:b8:b8:90:4a:4a:d3:64:81:33:cf:c7:a1:d1
+# SHA256 Fingerprint: bd:81:ce:3b:4f:65:91:d1:1a:67:b5:fc:7a:47:fd:ef:25:52:1b:f9:aa:4e:18:b9:e3:df:2e:34:a7:80:3b:e8
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Trusted Certificate Services O=Comodo CA Limited
+# Subject: CN=Trusted Certificate Services O=Comodo CA Limited
+# Label: "Comodo Trusted Services root"
+# Serial: 1
+# MD5 Fingerprint: 91:1b:3f:6e:cd:9e:ab:ee:07:fe:1f:71:d2:b3:61:27
+# SHA1 Fingerprint: e1:9f:e3:0e:8b:84:60:9e:80:9b:17:0d:72:a8:c5:ba:6e:14:09:bd
+# SHA256 Fingerprint: 3f:06:e5:56:81:d4:96:f5:be:16:9e:b5:38:9f:9f:2b:8f:f6:1e:17:08:df:68:81:72:48:49:cd:5d:27:cb:69
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Subject: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Label: "QuoVadis Root CA"
+# Serial: 985026699
+# MD5 Fingerprint: 27:de:36:fe:72:b7:00:03:00:9d:f4:f0:1e:6c:04:24
+# SHA1 Fingerprint: de:3f:40:bd:50:93:d3:9b:6c:60:f6:da:bc:07:62:01:00:89:76:c9
+# SHA256 Fingerprint: a4:5e:de:3b:bb:f0:9c:8a:e1:5c:72:ef:c0:72:68:d6:93:a2:1c:99:6f:d5:1e:67:ca:07:94:60:fd:6d:88:73
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 2"
+# Serial: 1289
+# MD5 Fingerprint: 5e:39:7b:dd:f8:ba:ec:82:e9:ac:62:ba:0c:54:00:2b
+# SHA1 Fingerprint: ca:3a:fb:cf:12:40:36:4b:44:b2:16:20:88:80:48:39:19:93:7c:f7
+# SHA256 Fingerprint: 85:a0:dd:7d:d7:20:ad:b7:ff:05:f8:3d:54:2b:20:9d:c7:ff:45:28:f7:d6:77:b1:83:89:fe:a5:e5:c4:9e:86
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 3"
+# Serial: 1478
+# MD5 Fingerprint: 31:85:3c:62:94:97:63:b9:aa:fd:89:4e:af:6f:e0:cf
+# SHA1 Fingerprint: 1f:49:14:f7:d8:74:95:1d:dd:ae:02:c0:be:fd:3a:2d:82:75:51:85
+# SHA256 Fingerprint: 18:f1:fc:7f:20:5d:f8:ad:dd:eb:7f:e0:07:dd:57:e3:af:37:5a:9c:4d:8d:73:54:6b:f4:f1:fe:d1:e1:8d:35
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
+4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust.net OU=Security Communication RootCA1
+# Subject: O=SECOM Trust.net OU=Security Communication RootCA1
+# Label: "Security Communication Root CA"
+# Serial: 0
+# MD5 Fingerprint: f1:bc:63:6a:54:e0:b5:27:f5:cd:e7:1a:e3:4d:6e:4a
+# SHA1 Fingerprint: 36:b1:2b:49:f9:81:9e:d7:4c:9e:bc:38:0f:c6:56:8f:5d:ac:b2:f7
+# SHA256 Fingerprint: e7:5e:72:ed:9f:56:0e:ec:6e:b4:80:00:73:a4:3f:c3:ad:19:19:5a:39:22:82:01:78:95:97:4a:99:02:6b:6c
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Sonera Class2 CA O=Sonera
+# Subject: CN=Sonera Class2 CA O=Sonera
+# Label: "Sonera Class 2 Root CA"
+# Serial: 29
+# MD5 Fingerprint: a3:ec:75:0f:2e:88:df:fa:48:01:4e:0b:5c:48:6f:fb
+# SHA1 Fingerprint: 37:f7:6d:e6:07:7c:90:c5:b1:3e:93:1a:b7:41:10:b4:f2:e4:9a:27
+# SHA256 Fingerprint: 79:08:b4:03:14:c1:38:10:0b:51:8d:07:35:80:7f:fb:fc:f8:51:8a:00:95:33:71:05:ba:38:6b:15:3d:d9:27
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA"
+# Serial: 10000010
+# MD5 Fingerprint: 60:84:7c:5a:ce:db:0c:d4:cb:a7:e9:fe:02:c6:a9:c0
+# SHA1 Fingerprint: 10:1d:fa:3f:d5:0b:cb:bb:9b:b5:60:0c:19:55:a4:1a:f4:73:3a:04
+# SHA256 Fingerprint: d4:1d:82:9e:8c:16:59:82:2a:f9:3f:ce:62:bf:fc:de:26:4f:c8:4e:8b:95:0c:5f:f2:75:d0:52:35:46:95:a3
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+# Issuer: O=TDC Internet OU=TDC Internet Root CA
+# Subject: O=TDC Internet OU=TDC Internet Root CA
+# Label: "TDC Internet Root CA"
+# Serial: 986490188
+# MD5 Fingerprint: 91:f4:03:55:20:a1:f8:63:2c:62:de:ac:fb:61:1c:8e
+# SHA1 Fingerprint: 21:fc:bd:8e:7f:6c:af:05:1b:d1:b3:43:ec:a8:e7:61:47:f2:0f:8a
+# SHA256 Fingerprint: 48:98:c6:88:8c:0c:ff:b0:d3:e3:1a:ca:8a:37:d4:e3:51:5f:f7:46:d0:26:35:d8:66:46:cf:a0:a3:18:5a:e7
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE
+SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg
+Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV
+BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl
+cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA
+vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu
+Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a
+0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1
+4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN
+eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD
+R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG
+A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu
+dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME
+Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3
+WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw
+HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ
+KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO
+Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX
+wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89
+9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0
+jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38
+aQNiuJkFBT1reBK9sG9l
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN DATACorp SGC Root CA"
+# Serial: 91374294542884689855167577680241077609
+# MD5 Fingerprint: b3:a5:3e:77:21:6d:ac:4a:c0:c9:fb:d5:41:3d:ca:06
+# SHA1 Fingerprint: 58:11:9f:0e:12:82:87:ea:50:fd:d9:87:45:6f:4f:78:dc:fa:d6:d4
+# SHA256 Fingerprint: 85:fb:2f:91:dd:12:27:5a:01:45:b6:36:53:4f:84:02:4a:d6:8b:69:b8:ee:88:68:4f:f7:11:37:58:05:b3:48
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
+mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN USERFirst Hardware Root CA"
+# Serial: 91374294542884704022267039221184531197
+# MD5 Fingerprint: 4c:56:41:e5:0d:bb:2b:e8:ca:a3:ed:18:08:ad:43:39
+# SHA1 Fingerprint: 04:83:ed:33:99:ac:36:08:05:87:22:ed:bc:5e:46:00:e3:be:f9:d7
+# SHA256 Fingerprint: 6e:a5:47:41:d0:04:66:7e:ed:1b:48:16:63:4a:a3:a7:9e:6e:4b:96:95:0f:82:79:da:fc:8d:9b:d8:81:21:37
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Chambers of Commerce Root"
+# Serial: 0
+# MD5 Fingerprint: b0:01:ee:14:d9:af:29:18:94:76:8e:f1:69:33:2a:84
+# SHA1 Fingerprint: 6e:3a:55:a4:19:0c:19:5c:93:84:3c:c0:db:72:2e:31:30:61:f0:b1
+# SHA256 Fingerprint: 0c:25:8a:12:a5:67:4a:ef:25:f2:8b:a7:dc:fa:ec:ee:a3:48:e5:41:e6:f5:cc:4e:e6:3b:71:b3:61:60:6a:c3
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Global Chambersign Root"
+# Serial: 0
+# MD5 Fingerprint: c5:e6:7b:bf:06:d0:4f:43:ed:c4:7a:65:8a:fb:6b:19
+# SHA1 Fingerprint: 33:9b:6b:14:50:24:9b:55:7a:01:87:72:84:d9:e0:2f:c3:d2:d8:e9
+# SHA256 Fingerprint: ef:3c:b4:17:fc:8e:bf:6f:97:87:6c:9e:4e:ce:39:de:1e:a5:fe:64:91:41:d1:02:8b:7d:11:c0:b2:29:8c:ed
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
+YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
+MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
+NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
+A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
+A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
+Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
+QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
+eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
+B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
+z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
+AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
+ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
+TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
+MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
+VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
+VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
+AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
+bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
+ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
+VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
+ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
+AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Notary (Class A) Root"
+# Serial: 259
+# MD5 Fingerprint: 86:38:6d:5e:49:63:6c:85:5c:db:6d:dc:94:b7:d0:f7
+# SHA1 Fingerprint: ac:ed:5f:65:53:fd:25:ce:01:5f:1f:7a:48:3b:6a:74:9f:61:78:c6
+# SHA256 Fingerprint: 7f:12:cd:5f:7e:5e:29:0e:c7:d8:51:79:d5:b7:2c:20:a5:be:75:08:ff:db:5b:f8:1a:b9:68:4a:7f:c9:f6:67
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Business (Class B) Root"
+# Serial: 105
+# MD5 Fingerprint: 39:16:aa:b9:6a:41:e1:14:69:df:9e:6c:3b:72:dc:b6
+# SHA1 Fingerprint: 87:9f:4b:ee:05:df:98:58:3b:e3:60:d6:33:e7:0d:3f:fe:98:71:af
+# SHA256 Fingerprint: 39:df:7b:68:2b:7b:93:8f:84:71:54:81:cc:de:8d:60:d8:f2:2e:c5:98:87:7d:0a:aa:c1:2b:59:18:2b:03:12
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
+NitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Express (Class C) Root"
+# Serial: 104
+# MD5 Fingerprint: 4f:eb:f1:f0:70:c2:80:63:5d:58:9f:da:12:3c:a9:c4
+# SHA1 Fingerprint: e3:92:51:2f:0a:cf:f5:05:df:f6:de:06:7f:75:37:e1:65:ea:57:4b
+# SHA256 Fingerprint: 0b:5e:ed:4e:84:64:03:cf:55:e0:65:84:84:40:ed:2a:82:75:8b:f5:b9:aa:1f:25:3d:46:13:cf:a0:80:ff:3f
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
+Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Label: "XRamp Global CA Root"
+# Serial: 107108908803651509692980124233745014957
+# MD5 Fingerprint: a1:0b:44:b3:ca:10:d8:00:6e:9d:0f:d8:0f:92:0a:d1
+# SHA1 Fingerprint: b8:01:86:d1:eb:9c:86:a5:41:04:cf:30:54:f3:4c:52:b7:e5:58:c6
+# SHA256 Fingerprint: ce:cd:dc:90:50:99:d8:da:df:c5:b1:d2:09:b7:37:cb:e2:c1:8c:fb:2c:10:c0:ff:0b:cf:0d:32:86:fc:1a:a2
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+# Issuer: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Subject: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Label: "Go Daddy Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 91:de:06:25:ab:da:fd:32:17:0c:bb:25:17:2a:84:67
+# SHA1 Fingerprint: 27:96:ba:e6:3f:18:01:e2:77:26:1b:a0:d7:77:70:02:8f:20:ee:e4
+# SHA256 Fingerprint: c3:84:6b:f2:4b:9e:93:ca:64:27:4c:0e:c6:7c:1e:cc:5e:02:4f:fc:ac:d2:d7:40:19:35:0e:81:fe:54:6a:e4
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
+
+# Issuer: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Subject: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Label: "Starfield Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 32:4a:4b:bb:c8:63:69:9b:be:74:9a:c6:dd:1d:46:24
+# SHA1 Fingerprint: ad:7e:1c:28:b0:64:ef:8f:60:03:40:20:14:c3:d0:e3:37:0e:b5:8a
+# SHA256 Fingerprint: 14:65:fa:20:53:97:b8:76:fa:a6:f0:a9:95:8e:55:90:e4:0f:cc:7f:aa:4f:b7:c2:c8:67:75:21:fb:5f:b6:58
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: 22:4d:8f:8a:fc:f7:35:c2:bb:57:34:90:7b:8b:22:16
+# SHA1 Fingerprint: 3e:2b:f7:f2:03:1b:96:f3:8c:e6:c4:d8:a8:5d:3e:2d:58:47:6a:0f
+# SHA256 Fingerprint: c7:66:a9:be:f2:d4:07:1c:86:3a:31:aa:49:20:e8:13:b2:d1:98:60:8c:b7:b7:cf:e2:11:43:b8:36:df:09:ea
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
+
+# Issuer: O=Government Root Certification Authority
+# Subject: O=Government Root Certification Authority
+# Label: "Taiwan GRCA"
+# Serial: 42023070807708724159991140556527066870
+# MD5 Fingerprint: 37:85:44:53:32:45:1f:20:f0:f3:95:e1:25:c4:43:4e
+# SHA1 Fingerprint: f4:8b:11:bf:de:ab:be:94:54:20:71:e6:41:de:6b:be:88:2b:40:b9
+# SHA256 Fingerprint: 76:00:29:5e:ef:e8:5b:9e:1f:d6:24:db:76:06:2a:aa:ae:59:81:8a:54:d2:77:4c:d4:c0:b2:c0:11:31:e1:b3
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
+MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
+PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
+IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
+gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
+yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
+F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
+jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
+ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
+VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
+YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
+EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
+Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
+DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
+MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
+UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
+qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
+ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
+JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
+hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
+EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
+nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
+udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
+ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
+LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
+pYYsfPQS
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Firmaprofesional Root CA"
+# Serial: 1
+# MD5 Fingerprint: 11:92:79:40:3c:b1:83:40:e5:ab:66:4a:67:92:80:df
+# SHA1 Fingerprint: a9:62:8f:4b:98:a9:1b:48:35:ba:d2:c1:46:32:86:bb:66:64:6a:8c
+# SHA256 Fingerprint: c1:cf:0b:52:09:64:35:e3:f1:b7:1d:aa:ec:45:5a:23:11:c8:40:4f:55:83:a9:e2:13:c6:9d:85:7d:94:33:05
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u
+Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY
+rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z
+hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay
+BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL
+iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb
+AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv
+bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0
+MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n
+VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m
+hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl
+ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp
+QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5
+quGnM/b9Sh/22WA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 1"
+# Serial: 122348795730808398873664200247279986742
+# MD5 Fingerprint: f8:38:7c:77:88:df:2c:16:68:2e:c2:e2:52:4b:b8:f9
+# SHA1 Fingerprint: 5f:3a:fc:0a:8b:64:f6:86:67:34:74:df:7e:a9:a2:fe:f9:fa:7a:51
+# SHA256 Fingerprint: 21:db:20:12:36:60:bb:2e:d4:18:20:5d:a1:1e:e7:a8:5a:65:e2:bc:6e:55:b5:af:7e:78:99:c8:a2:66:d9:2e
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
+m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
+FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
+TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
+EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
+kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
+HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
+vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
+19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
+L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
+bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
+JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
+K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
+ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
+Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
+sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
+3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
+ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
+mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
+b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
+rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
+hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
+zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
+MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Assured ID Root CA"
+# Serial: 17154717934120587862167794914071425081
+# MD5 Fingerprint: 87:ce:0b:7b:2a:0e:49:00:e1:58:71:9b:37:a8:93:72
+# SHA1 Fingerprint: 05:63:b8:63:0d:62:d7:5a:bb:c8:ab:1e:4b:df:b5:a8:99:b2:4d:43
+# SHA256 Fingerprint: 3e:90:99:b5:01:5e:8f:48:6c:00:bc:ea:9d:11:1e:e7:21:fa:ba:35:5a:89:bc:f1:df:69:56:1e:3d:c6:32:5c
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Global Root CA"
+# Serial: 10944719598952040374951832963794454346
+# MD5 Fingerprint: 79:e4:a9:84:0d:7d:3a:96:d7:c0:4f:e2:43:4c:89:2e
+# SHA1 Fingerprint: a8:98:5d:3a:65:e5:e5:c4:b2:d7:d6:6d:40:c6:dd:2f:b1:9c:54:36
+# SHA256 Fingerprint: 43:48:a0:e9:44:4c:78:cb:26:5e:05:8d:5e:89:44:b4:d8:4f:96:62:bd:26:db:25:7f:89:34:a4:43:c7:01:61
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert High Assurance EV Root CA"
+# Serial: 3553400076410547919724730734378100087
+# MD5 Fingerprint: d4:74:de:57:5c:39:b2:d3:9c:85:83:c5:c0:65:49:8a
+# SHA1 Fingerprint: 5f:b7:ee:06:33:e2:59:db:ad:0c:4c:9a:e6:d3:8f:1a:61:c7:dc:25
+# SHA256 Fingerprint: 74:31:e5:f4:c3:c1:ce:46:90:77:4f:0b:61:e0:54:40:88:3b:a9:a0:1e:d0:0b:a6:ab:d7:80:6e:d3:b1:18:cf
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
+
+# Issuer: CN=Class 2 Primary CA O=Certplus
+# Subject: CN=Class 2 Primary CA O=Certplus
+# Label: "Certplus Class 2 Primary CA"
+# Serial: 177770208045934040241468760488327595043
+# MD5 Fingerprint: 88:2c:8c:52:b8:a2:3c:f3:f7:bb:03:ea:ae:ac:42:0b
+# SHA1 Fingerprint: 74:20:74:41:72:9c:dd:92:ec:79:31:d8:23:10:8d:c2:81:92:e2:bb
+# SHA256 Fingerprint: 0f:99:3c:8a:ef:97:ba:af:56:87:14:0e:d5:9a:d1:82:1b:b4:af:ac:f0:aa:9a:58:b5:d5:7a:33:8a:3a:fb:cb
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
+PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
+cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
+MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
+IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
+ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
+VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
+kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
+EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
+H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
+HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
+DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
+QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
+Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
+AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
+yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
+FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
+ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
+kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+# Issuer: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Subject: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Label: "DST Root CA X3"
+# Serial: 91299735575339953335919266965803778155
+# MD5 Fingerprint: 41:03:52:dc:0f:f7:50:1b:16:f0:02:8e:ba:6f:45:c5
+# SHA1 Fingerprint: da:c9:02:4f:54:d8:f6:df:94:93:5f:b1:73:26:38:ca:6a:d7:7c:13
+# SHA256 Fingerprint: 06:87:26:03:31:a7:24:03:d9:09:f1:05:e6:9b:cf:0d:32:e1:bd:24:93:ff:c6:d9:20:6d:11:bc:d6:77:07:39
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Subject: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Label: "DST ACES CA X6"
+# Serial: 17771143917277623872238992636097467865
+# MD5 Fingerprint: 21:d8:4c:82:2b:99:09:33:a2:eb:14:24:8d:8e:5f:e8
+# SHA1 Fingerprint: 40:54:da:6f:1c:3f:40:74:ac:ed:0f:ec:cd:db:79:d1:53:fb:90:1d
+# SHA256 Fingerprint: 76:7c:95:5a:76:41:2c:89:af:68:8e:90:a1:c7:0f:55:6c:fd:6b:60:25:db:ea:10:41:6d:7e:b6:83:1f:8c:40
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Label: "TURKTRUST Certificate Services Provider Root 1"
+# Serial: 1
+# MD5 Fingerprint: f1:6a:22:18:c9:cd:df:ce:82:1d:1d:b7:78:5c:a9:a5
+# SHA1 Fingerprint: 79:98:a3:08:e1:4d:65:85:e6:c2:1e:15:3a:71:9f:ba:5a:d3:4a:d9
+# SHA256 Fingerprint: 44:04:e3:3b:5e:14:0d:cf:99:80:51:fd:fc:80:28:c7:c8:16:15:c5:ee:73:7b:11:1b:58:82:33:a9:b5:35:a0
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
+MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
+MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
+dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
+VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
+xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
+xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
+XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
+heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
+YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
+urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
+JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
+b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
+9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
+kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
+fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
+aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
+RGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Label: "TURKTRUST Certificate Services Provider Root 2"
+# Serial: 1
+# MD5 Fingerprint: 37:a5:6e:d4:b1:25:84:97:b7:fd:56:15:7a:f9:a2:00
+# SHA1 Fingerprint: b4:35:d4:e1:11:9d:1c:66:90:a7:49:eb:b3:94:bd:63:7b:a7:82:b7
+# SHA256 Fingerprint: c4:70:cf:54:7e:23:02:b9:77:fb:29:dd:71:a8:9a:7b:6c:1f:60:77:7b:03:29:f5:60:17:f3:28:bf:4f:6b:e6
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
+WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
+bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
+bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
+LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
+J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
+R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
+Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
+JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
+zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
+Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
+ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
+gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
+uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
+y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Label: "SwissSign Gold CA - G2"
+# Serial: 13492815561806991280
+# MD5 Fingerprint: 24:77:d9:a8:91:d1:3b:fa:88:2d:c2:ff:f8:cd:33:93
+# SHA1 Fingerprint: d8:c5:38:8a:b7:30:1b:1b:6e:d4:7a:e6:45:25:3a:6f:9f:1a:27:61
+# SHA256 Fingerprint: 62:dd:0b:e9:b9:f5:0a:16:3e:a0:f8:e7:5c:05:3b:1e:ca:57:ea:55:c8:68:8f:64:7c:68:81:f2:c8:35:7b:95
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
+biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
+MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
+d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
+76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
+6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
+emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
+MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
+MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
+MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
+FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
+aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
+gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
+qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
+lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
+8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
+45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
+UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
+O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
+bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
+GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
+77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
+92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
+Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
+ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
+Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Label: "SwissSign Silver CA - G2"
+# Serial: 5700383053117599563
+# MD5 Fingerprint: e0:06:a1:c9:7d:cf:c9:fc:0d:c0:56:75:96:d8:62:13
+# SHA1 Fingerprint: 9b:aa:e5:9f:56:ee:21:cb:43:5a:be:25:93:df:a7:f0:40:d1:1d:cb
+# SHA256 Fingerprint: be:6c:4d:a2:bb:b9:ba:59:b6:f3:93:97:68:37:42:46:c3:c0:05:99:3f:a9:8f:02:0d:1d:ed:be:d4:8a:81:d5
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Subject: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Label: "GeoTrust Primary Certification Authority"
+# Serial: 32798226551256963324313806436981982369
+# MD5 Fingerprint: 02:26:c3:01:5e:08:30:37:43:a9:d0:7d:cf:37:e6:bf
+# SHA1 Fingerprint: 32:3c:11:8e:1b:f7:b8:b6:52:54:e2:e2:10:0d:d6:02:90:37:f0:96
+# SHA256 Fingerprint: 37:d5:10:06:c5:12:ea:ab:62:64:21:f1:ec:8c:92:01:3f:c5:f8:2a:e9:8e:e5:33:eb:46:19:b8:de:b4:d0:6c
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA"
+# Serial: 69529181992039203566298953787712940909
+# MD5 Fingerprint: 8c:ca:dc:0b:22:ce:f5:be:72:ac:41:1a:11:a8:d8:12
+# SHA1 Fingerprint: 91:c6:d6:ee:3e:8a:c8:63:84:e5:48:c2:99:29:5c:75:6c:81:7b:81
+# SHA256 Fingerprint: 8d:72:2f:81:a9:c1:13:c0:79:1d:f1:36:a2:96:6d:b2:6c:95:0a:97:1d:b4:6b:41:99:f4:ea:54:b7:8b:fb:9f
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G5"
+# Serial: 33037644167568058970164719475676101450
+# MD5 Fingerprint: cb:17:e4:31:67:3e:e2:09:fe:45:57:93:f3:0a:fa:1c
+# SHA1 Fingerprint: 4e:b6:d5:78:49:9b:1c:cf:5f:58:1e:ad:56:be:3d:9b:67:44:a5:e5
+# SHA256 Fingerprint: 9a:cf:ab:7e:43:c8:d8:80:d0:6b:26:2a:94:de:ee:e4:b4:65:99:89:c3:d0:ca:f1:9b:af:64:05:e4:1a:b7:df
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureTrust CA O=SecureTrust Corporation
+# Subject: CN=SecureTrust CA O=SecureTrust Corporation
+# Label: "SecureTrust CA"
+# Serial: 17199774589125277788362757014266862032
+# MD5 Fingerprint: dc:32:c3:a7:6d:25:57:c7:68:09:9d:ea:2d:a9:a2:d1
+# SHA1 Fingerprint: 87:82:c6:c3:04:35:3b:cf:d2:96:92:d2:59:3e:7d:44:d9:34:ff:11
+# SHA256 Fingerprint: f1:c1:b5:0a:e5:a2:0d:d8:03:0e:c9:f6:bc:24:82:3d:d3:67:b5:25:57:59:b4:e7:1b:61:fc:e9:f7:37:5d:73
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Secure Global CA O=SecureTrust Corporation
+# Subject: CN=Secure Global CA O=SecureTrust Corporation
+# Label: "Secure Global CA"
+# Serial: 9751836167731051554232119481456978597
+# MD5 Fingerprint: cf:f4:27:0d:d4:ed:dc:65:16:49:6d:3d:da:bf:6e:de
+# SHA1 Fingerprint: 3a:44:73:5a:e5:81:90:1f:24:86:61:46:1e:3b:9c:c4:5f:f5:3a:1b
+# SHA256 Fingerprint: 42:00:f5:04:3a:c8:59:0e:bb:52:7d:20:9e:d1:50:30:29:fb:cb:d4:1c:a1:b5:06:ec:27:f1:5a:de:7d:ac:69
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
+MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
+Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
+iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
+/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
+jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
+HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
+sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
+gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
+KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
+AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
+URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
+H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
+I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
+iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+# Issuer: CN=COMODO Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO Certification Authority O=COMODO CA Limited
+# Label: "COMODO Certification Authority"
+# Serial: 104350513648249232941998508985834464573
+# MD5 Fingerprint: 5c:48:dc:f7:42:72:ec:56:94:6d:1c:cc:71:35:80:75
+# SHA1 Fingerprint: 66:31:bf:9e:f7:4f:9e:b6:c9:d5:a6:0c:ba:6a:be:d1:f7:bd:ef:7b
+# SHA256 Fingerprint: 0c:2c:d6:3d:f7:80:6f:a3:99:ed:e8:09:11:6b:57:5b:f8:79:89:f0:65:18:f9:80:8c:86:05:03:17:8b:af:66
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
+gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
+BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
+MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
+YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
+RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
+UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
+2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
+Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
+nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
+/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
+PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
+SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
+IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
+zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
+BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
+ZQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Subject: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Label: "Network Solutions Certificate Authority"
+# Serial: 116697915152937497490437556386812487904
+# MD5 Fingerprint: d3:f3:a6:16:c0:fa:6b:1d:59:b1:2d:96:4d:0e:11:2e
+# SHA1 Fingerprint: 74:f8:a3:c3:ef:e7:b3:90:06:4b:83:90:3c:21:64:60:20:e5:df:ce
+# SHA256 Fingerprint: 15:f0:ba:00:a3:ac:7a:f3:ac:88:4c:07:2b:10:11:a0:77:bd:77:c0:97:f4:01:64:b2:f8:59:8a:bd:83:86:0c
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
+MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
+ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
+c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
+OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
+mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
+BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
+qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
+gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
+bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
+dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
+6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
+h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
+/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
+pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+# Issuer: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Subject: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Label: "WellsSecure Public Root Certificate Authority"
+# Serial: 1
+# MD5 Fingerprint: 15:ac:a5:c2:92:2d:79:bc:e8:7f:cb:67:ed:02:cf:36
+# SHA1 Fingerprint: e7:b4:f6:9d:61:ec:90:69:db:7e:90:a7:40:1a:3c:f4:7d:4f:e8:ee
+# SHA256 Fingerprint: a7:12:72:ae:aa:a3:cf:e8:72:7f:7f:b3:9f:0f:b3:d1:e5:42:6e:90:60:b0:6e:e6:f1:3e:9a:3c:58:33:cd:43
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
+IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
+cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
+MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
+bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
+DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
+WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
+Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
+HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
+z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
+SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
+AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
+KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
+AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
+BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
+VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
+ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
+ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
+/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
+A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
+k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
+iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
+2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+# Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Label: "COMODO ECC Certification Authority"
+# Serial: 41578283867086692638256921589707938090
+# MD5 Fingerprint: 7c:62:ff:74:9d:31:53:5e:68:4a:d5:78:aa:1e:bf:23
+# SHA1 Fingerprint: 9f:74:4e:9f:2b:4d:ba:ec:0f:31:2c:50:b6:56:3b:8e:2d:93:c3:11
+# SHA256 Fingerprint: 17:93:92:7a:06:14:54:97:89:ad:ce:2f:8f:34:f7:f0:b6:6d:0f:3a:e3:a3:b8:4d:21:ec:15:db:ba:4f:ad:c7
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Subject: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Label: "IGC/A"
+# Serial: 245102874772
+# MD5 Fingerprint: 0c:7f:dd:6a:f4:2a:b9:c8:9b:bd:20:7e:a9:db:5c:37
+# SHA1 Fingerprint: 60:d6:89:74:b5:c2:65:9e:8a:0f:c1:88:7c:88:d2:46:69:1b:18:2c
+# SHA256 Fingerprint: b9:be:a7:86:0a:96:2e:a3:61:1d:ab:97:ab:6d:a3:e2:1c:10:68:b9:7d:55:57:5e:d0:e1:12:79:c1:1c:89:32
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
+AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
+TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
+9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
+MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
+BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
+MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
+s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
+xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
+u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
+F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
+Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
+PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
+HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
+NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
+AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
+L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
+YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
+NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
+0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Label: "Security Communication EV RootCA1"
+# Serial: 0
+# MD5 Fingerprint: 22:2d:a6:01:ea:7c:0a:f7:f0:6c:56:43:3f:77:76:d3
+# SHA1 Fingerprint: fe:b8:c4:32:dc:f9:76:9a:ce:ae:3d:d8:90:8f:fd:28:86:65:64:7d
+# SHA256 Fingerprint: a2:2d:ba:68:1e:97:37:6e:2d:39:7d:72:8a:ae:3a:9b:62:96:b9:fd:ba:60:bc:2e:11:f6:47:f2:c6:75:fb:37
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
+MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
+IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
+bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
+RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
+zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
+bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
+MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
+VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
+OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
+tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
+q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
+EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
+VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Subject: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Label: "OISTE WISeKey Global Root GA CA"
+# Serial: 86718877871133159090080555911823548314
+# MD5 Fingerprint: bc:6c:51:33:a7:e9:d3:66:63:54:15:72:1b:21:92:93
+# SHA1 Fingerprint: 59:22:a1:e1:5a:ea:16:35:21:f8:98:39:6a:46:46:b0:44:1b:0f:a9
+# SHA256 Fingerprint: 41:c9:23:86:6a:b4:ca:d6:b7:ad:57:80:81:58:2e:02:07:97:a6:cb:df:4f:ff:78:ce:83:96:b3:89:37:d7:f5
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
+ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
+aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
+NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
+A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
+SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
+VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
+w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
+mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
+4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
+4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
+EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
+SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
+ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
+vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
+Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
+/L7fCg0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Subject: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Label: "Microsec e-Szigno Root CA"
+# Serial: 272122594155480254301341951808045322001
+# MD5 Fingerprint: f0:96:b6:2f:c5:10:d5:67:8e:83:25:32:e8:5e:2e:e5
+# SHA1 Fingerprint: 23:88:c9:d3:71:cc:9e:96:3d:ff:7d:3c:a7:ce:fc:d6:25:ec:19:0d
+# SHA256 Fingerprint: 32:7a:3d:76:1a:ba:de:a0:34:eb:99:84:06:27:5c:b1:a4:77:6e:fd:ae:2f:df:6d:01:68:ea:1c:4f:55:67:d0
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
+cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
+b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
+ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
+NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
+TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
+Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
+uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
+vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
+Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
+62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
+AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
+LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
+BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
+AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
+MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
+ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
+AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
+ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
+AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
+AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
+bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
+Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
+PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
+Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
+EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
+w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
+cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
+HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
+VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
+BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
+b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
+8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
+ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
+7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
+hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
+MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certigna O=Dhimyotis
+# Subject: CN=Certigna O=Dhimyotis
+# Label: "Certigna"
+# Serial: 18364802974209362175
+# MD5 Fingerprint: ab:57:a6:5b:7d:42:82:19:b5:d8:58:26:28:5e:fd:ff
+# SHA1 Fingerprint: b1:2e:13:63:45:86:a4:6f:1a:b2:60:68:37:58:2d:c4:ac:fd:94:97
+# SHA256 Fingerprint: e3:b6:a2:db:2e:d7:ce:48:84:2f:7a:c5:32:41:c7:b7:1d:54:14:4b:fb:40:c1:1f:3f:1d:0b:42:f5:ee:a1:2d
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
+DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
+BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
+QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
+gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
+zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
+130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
+JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
+ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
+AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
+9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
+bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
+fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
+HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
+t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Subject: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Label: "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
+# Serial: 38908203973182606954752843738508300
+# MD5 Fingerprint: 93:2a:3e:f6:fd:23:69:0d:71:20:d4:2b:47:99:2b:a6
+# SHA1 Fingerprint: cb:a1:c5:f8:b0:e3:5e:b8:b9:45:12:d3:f9:34:a2:e9:06:10:d3:36
+# SHA256 Fingerprint: a6:c5:1e:0d:a5:ca:0a:93:09:d2:e4:c0:e4:0c:2a:f9:10:7a:ae:82:03:85:7f:e1:98:e3:e7:69:e3:43:08:5c
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
+CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
+ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
+QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
+NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
+ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
+QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
+qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
+fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
+Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
+Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
+54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
+MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
+ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
+YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
+A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
+rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
+pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
+lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
+YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
+7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
+YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
+xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
+unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
+Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
+ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
+gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
+jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
+W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
+RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
+MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
+BYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Subject: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Label: "TC TrustCenter Class 2 CA II"
+# Serial: 941389028203453866782103406992443
+# MD5 Fingerprint: ce:78:33:5c:59:78:01:6e:18:ea:b9:36:a0:b9:2e:23
+# SHA1 Fingerprint: ae:50:83:ed:7c:f4:5c:bc:8f:61:c6:21:fe:68:5d:79:42:21:15:6e
+# SHA256 Fingerprint: e6:b8:f8:76:64:85:f8:07:ae:7f:8d:ac:16:70:46:1f:07:c0:a1:3e:ef:3a:1f:f7:17:53:8d:7a:ba:d3:91:b4
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
+tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
+uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
+XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
+8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
+5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
+kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
+GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
+ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
+au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
+hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
+dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Subject: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Label: "TC TrustCenter Class 3 CA II"
+# Serial: 1506523511417715638772220530020799
+# MD5 Fingerprint: 56:5f:aa:80:61:12:17:f6:67:21:e6:2b:6d:61:56:8e
+# SHA1 Fingerprint: 80:25:ef:f4:6e:70:c8:d4:72:24:65:84:fe:40:3b:8a:8d:6a:db:f5
+# SHA256 Fingerprint: 8d:a0:84:fc:f9:9c:e0:77:22:f8:9b:32:05:93:98:06:fa:5c:b8:11:e1:c8:13:f6:a1:08:c7:d3:36:b3:40:8e
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
+Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
+Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
+1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
+ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
+Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
+XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
+irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
+TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
+g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
+95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
+S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Subject: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Label: "TC TrustCenter Universal CA I"
+# Serial: 601024842042189035295619584734726
+# MD5 Fingerprint: 45:e1:a5:72:c5:a9:36:64:40:9e:f5:e4:58:84:67:8c
+# SHA1 Fingerprint: 6b:2f:34:ad:89:58:be:62:fd:b0:6b:5c:ce:bb:9d:d9:4f:4e:39:f3
+# SHA256 Fingerprint: eb:f3:c0:2a:87:89:b1:fb:7d:51:19:95:d6:63:b7:29:06:d9:13:ce:0d:5e:10:56:8a:8a:77:e2:58:61:67:e7
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
+BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
+c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
+MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
+R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
+VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
+JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
+fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
+jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
+wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
+fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
+VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
+CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
+7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
+8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
+ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
+2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+# Issuer: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Subject: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Label: "Deutsche Telekom Root CA 2"
+# Serial: 38
+# MD5 Fingerprint: 74:01:4a:91:b1:08:c4:58:ce:47:cd:f0:dd:11:53:08
+# SHA1 Fingerprint: 85:a4:08:c0:9c:19:3e:5d:51:58:7d:cd:d6:13:30:fd:8c:de:37:bf
+# SHA256 Fingerprint: b6:19:1a:50:d0:c3:97:7f:7d:a9:9b:cd:aa:c8:6a:22:7d:ae:b9:67:9e:c7:0b:a3:b0:c9:d9:22:71:c1:70:d3
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=ComSign Secured CA O=ComSign
+# Subject: CN=ComSign Secured CA O=ComSign
+# Label: "ComSign Secured CA"
+# Serial: 264725503855295744117309814499492384489
+# MD5 Fingerprint: 40:01:25:06:8d:21:43:6a:0e:43:00:9c:e7:43:f3:d5
+# SHA1 Fingerprint: f9:cd:0e:2c:da:76:24:c1:8f:bd:f0:f0:ab:b6:45:b8:f7:fe:d5:7a
+# SHA256 Fingerprint: 50:79:41:c7:44:60:a0:b4:70:86:22:0d:4e:99:32:57:2a:b5:d1:b5:bb:cb:89:80:ab:1c:b1:76:51:a8:44:d2
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
+PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
+MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
+GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
+MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
+HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
+gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
+v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
+Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
+9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
+6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
+MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
+Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
+ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
+hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
+iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
+dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
+kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
+hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Subject: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Label: "Cybertrust Global Root"
+# Serial: 4835703278459682877484360
+# MD5 Fingerprint: 72:e4:4a:87:e3:69:40:80:77:ea:bc:e3:f4:ff:f0:e1
+# SHA1 Fingerprint: 5f:43:e5:b1:bf:f8:78:8c:ac:1c:c7:ca:4a:9a:c6:22:2b:cc:34:c6
+# SHA256 Fingerprint: 96:0a:df:00:63:e9:63:56:75:0c:29:65:dd:0a:08:67:da:0b:9c:bd:6e:77:71:4a:ea:fb:23:49:ab:39:3d:a3
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
+A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
+bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
+ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
+b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
+7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
+J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
+HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
+t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
+FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
+XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
+hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
+MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
+A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
+Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
+XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
+omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
+A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+# Issuer: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Subject: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Label: "ePKI Root Certification Authority"
+# Serial: 28956088682735189655030529057352760477
+# MD5 Fingerprint: 1b:2e:00:ca:26:06:90:3d:ad:fe:6f:15:68:d3:6b:b3
+# SHA1 Fingerprint: 67:65:0d:f1:7e:8e:7e:5b:82:40:a4:f4:56:4b:cf:e2:3d:69:c6:f0
+# SHA256 Fingerprint: c0:a6:f4:dc:63:a2:4b:fd:cf:54:ef:2a:6a:08:2a:0a:72:de:35:80:3e:2f:f5:ff:52:7a:e5:d8:72:06:df:d5
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Subject: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Label: "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3"
+# Serial: 17
+# MD5 Fingerprint: ed:41:f5:8c:50:c5:2b:9c:73:e6:ee:6c:eb:c2:a8:26
+# SHA1 Fingerprint: 1b:4b:39:61:26:27:6b:64:91:a2:68:6d:d7:02:43:21:2d:1f:1d:96
+# SHA256 Fingerprint: e4:c7:34:30:d7:a5:b5:09:25:df:43:37:0a:0d:21:6e:9a:79:b9:d6:db:83:73:a0:c6:9e:b1:cc:31:c7:c5:2a
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
+MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
+bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
+VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
+YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
+dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
+Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
+GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
+aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
+QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
+xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
+aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
+IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
+gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
+O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
+fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
+lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
+AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
+NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
+wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
+7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
+gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
+oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
+yZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 2 CA 1"
+# Serial: 1
+# MD5 Fingerprint: b8:08:9a:f0:03:cc:1b:0d:c8:6c:0b:76:a1:75:64:23
+# SHA1 Fingerprint: a0:a1:ab:90:c9:fc:84:7b:3b:12:61:e8:97:7d:5f:d3:22:61:d3:cc
+# SHA256 Fingerprint: 0f:4e:9c:dd:26:4b:02:55:50:d1:70:80:63:40:21:4f:e9:44:34:c9:b0:2f:69:7e:c7:10:fc:5f:ea:fb:5e:38
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
+ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
+l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
+HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
+5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
+WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
+gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
+DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
+BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
+h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
+LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 3 CA 1"
+# Serial: 2
+# MD5 Fingerprint: df:3c:73:59:81:e7:39:50:81:04:4c:34:a2:cb:b3:7b
+# SHA1 Fingerprint: 61:57:3a:11:df:0e:d8:7e:d5:92:65:22:ea:d0:56:d7:44:b3:23:71
+# SHA256 Fingerprint: b7:b1:2b:17:1f:82:1d:aa:99:0c:d0:fe:50:87:b1:28:44:8b:a8:e5:18:4f:84:c5:1e:02:b5:c8:fb:96:2b:24
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
+isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
+NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
++MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
+hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
+Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
+EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
+mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
+e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
+dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+# Issuer: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Subject: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Label: "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1"
+# Serial: 5525761995591021570
+# MD5 Fingerprint: 2c:20:26:9d:cb:1a:4a:00:85:b5:b7:5a:ae:c2:01:37
+# SHA1 Fingerprint: 8c:96:ba:eb:dd:2b:07:07:48:ee:30:32:66:a0:f3:98:6e:7c:ae:58
+# SHA256 Fingerprint: 35:ae:5b:dd:d8:f7:ae:63:5c:ff:ba:56:82:a8:f0:0b:95:f4:84:62:c7:10:8e:e9:a0:e5:29:2b:07:4a:af:b2
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
+BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
+ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
+MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
+SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
+a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
+4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
+tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
+tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
+dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
+c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
+TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
++kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
+Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
+OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
+fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
+l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
+FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
+8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
+6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
+TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
+wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
+Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
+xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
+DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
+Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
+hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
+7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
+QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+# Issuer: O=certSIGN OU=certSIGN ROOT CA
+# Subject: O=certSIGN OU=certSIGN ROOT CA
+# Label: "certSIGN ROOT CA"
+# Serial: 35210227249154
+# MD5 Fingerprint: 18:98:c0:d6:e9:3a:fc:f9:b0:f5:0c:f7:4b:01:44:17
+# SHA1 Fingerprint: fa:b7:ee:36:97:26:62:fb:2d:b0:2a:f6:bf:03:fd:e8:7c:4b:2f:9b
+# SHA256 Fingerprint: ea:a9:62:c4:fa:4a:6b:af:eb:e4:15:19:6d:35:1c:cd:88:8d:4f:53:f3:fa:8a:e6:d7:c4:66:a9:4e:60:42:bb
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
+AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
+QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
+MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
+0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
+UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
+RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
+OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
+JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
+AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
+BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
+LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
+MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
+44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
+Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
+i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
+9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+# Issuer: CN=CNNIC ROOT O=CNNIC
+# Subject: CN=CNNIC ROOT O=CNNIC
+# Label: "CNNIC ROOT"
+# Serial: 1228079105
+# MD5 Fingerprint: 21:bc:82:ab:49:c4:13:3b:4b:b2:2b:5c:6b:90:9c:19
+# SHA1 Fingerprint: 8b:af:4c:9b:1d:f0:2a:92:f7:da:12:8e:b9:1b:ac:f4:98:60:4b:6f
+# SHA256 Fingerprint: e2:83:93:77:3d:a8:45:a6:79:f2:08:0c:c7:fb:44:a3:b7:a1:c3:79:2c:b7:eb:77:29:fd:cb:6a:8d:99:ae:a7
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
+
+# Issuer: O=Japanese Government OU=ApplicationCA
+# Subject: O=Japanese Government OU=ApplicationCA
+# Label: "ApplicationCA - Japanese Government"
+# Serial: 49
+# MD5 Fingerprint: 7e:23:4e:5b:a7:a5:b4:25:e9:00:07:74:11:62:ae:d6
+# SHA1 Fingerprint: 7f:8a:b0:cf:d0:51:87:6a:66:f3:36:0f:47:c8:8d:8c:d3:35:fc:74
+# SHA256 Fingerprint: 2d:47:43:7d:e1:79:51:21:5a:12:f3:c5:8e:51:c7:29:a5:80:26:ef:1f:cc:0a:5f:b3:d9:dc:01:2f:60:0d:19
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
+MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
+b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
+AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
+aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
+j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
+f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
+IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
+FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
+QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
+/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
+k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
+MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
+seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
+hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
+DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
+B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G3"
+# Serial: 28809105769928564313984085209975885599
+# MD5 Fingerprint: b5:e8:34:36:c9:10:44:58:48:70:6d:2e:83:d4:b8:05
+# SHA1 Fingerprint: 03:9e:ed:b8:0b:e7:a0:3c:69:53:89:3b:20:d2:d9:32:3a:4c:2a:fd
+# SHA256 Fingerprint: b4:78:b8:12:25:0d:f8:78:63:5c:2a:a7:ec:7d:15:5e:aa:62:5e:e8:29:16:e2:cd:29:43:61:88:6c:d1:fb:d4
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G2"
+# Serial: 71758320672825410020661621085256472406
+# MD5 Fingerprint: 74:9d:ea:60:24:c4:fd:22:53:3e:cc:3a:72:d9:29:4f
+# SHA1 Fingerprint: aa:db:bc:22:23:8f:c4:01:a1:27:bb:38:dd:f4:1d:db:08:9e:f0:12
+# SHA256 Fingerprint: a4:31:0d:50:af:18:a6:44:71:90:37:2a:86:af:af:8b:95:1f:fb:43:1d:83:7f:1e:56:88:b4:59:71:ed:15:57
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
+IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
+BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
+MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
+YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
+dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
+BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
+papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
+DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
+KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
+XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G3"
+# Serial: 127614157056681299805556476275995414779
+# MD5 Fingerprint: fb:1b:5d:43:8a:94:cd:44:c6:76:f2:43:4b:47:e7:31
+# SHA1 Fingerprint: f1:8b:53:8d:1b:e9:03:b6:a6:f0:56:43:5b:17:15:89:ca:f3:6b:f2
+# SHA256 Fingerprint: 4b:03:f4:58:07:ad:70:f2:1b:fc:2c:ae:71:c9:fd:e4:60:4c:06:4c:f5:ff:b6:86:ba:e5:db:aa:d7:fd:d3:4c
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G2"
+# Serial: 80682863203381065782177908751794619243
+# MD5 Fingerprint: 01:5e:d8:6b:bd:6f:3d:8e:a1:31:f8:12:e0:98:73:6a
+# SHA1 Fingerprint: 8d:17:84:d5:37:f3:03:7d:ec:70:fe:57:8b:51:9a:99:e6:10:d7:b0
+# SHA256 Fingerprint: 5e:db:7a:c4:3b:82:a0:6a:87:61:e8:d7:be:49:79:eb:f2:61:1f:7d:d7:9b:f9:1c:1c:6b:56:6a:21:9e:d7:66
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
+NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
+BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
+So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
+tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
+CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
+qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
+rD6ogRLQy7rQkgu2npaqBA+K
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Universal Root Certification Authority"
+# Serial: 85209574734084581917763752644031726877
+# MD5 Fingerprint: 8e:ad:b5:01:aa:4d:81:e4:8c:1d:d1:e1:14:00:95:19
+# SHA1 Fingerprint: 36:79:ca:35:66:87:72:30:4d:30:a5:fb:87:3b:0f:a7:7b:b7:0d:54
+# SHA256 Fingerprint: 23:99:56:11:27:a5:71:25:de:8c:ef:ea:61:0d:df:2f:a0:78:b5:c8:06:7f:4e:82:82:90:bf:b8:60:e8:4b:3c
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G4"
+# Serial: 63143484348153506665311985501458640051
+# MD5 Fingerprint: 3a:52:e1:e7:fd:6f:3a:e3:6f:f3:6f:99:1b:f9:22:41
+# SHA1 Fingerprint: 22:d5:d8:df:8f:02:31:d1:8d:f7:9d:b7:cf:8a:2d:64:c9:3f:6c:3a
+# SHA256 Fingerprint: 69:dd:d7:ea:90:bb:57:c9:3e:13:5d:c8:5e:a6:fc:d5:48:0b:60:32:39:bd:c4:54:fc:75:8b:2a:26:cf:7f:79
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
+U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
+SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
+biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
+GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
+fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
+kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
+4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
+FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Subject: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Label: "NetLock Arany (Class Gold) Főtanúsítvány"
+# Serial: 80544274841616
+# MD5 Fingerprint: c5:a1:b7:ff:73:dd:d6:d7:34:32:18:df:fc:3c:ad:88
+# SHA1 Fingerprint: 06:08:3f:59:3f:15:a1:04:a0:69:a4:6b:a9:03:d0:06:b7:97:09:91
+# SHA256 Fingerprint: 6c:61:da:c3:a2:de:f0:31:50:6b:e0:36:d2:a6:fe:40:19:94:fb:d1:3d:f9:c8:d4:66:59:92:74:c4:46:ec:98
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
+EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
+MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
+dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
+pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
+b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
+aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
+IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
+lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
+AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
+VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
+ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
+BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
+AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
+U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
+bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
+uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
+XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA - G2"
+# Serial: 10000012
+# MD5 Fingerprint: 7c:a5:0f:f8:5b:9a:7d:6d:30:ae:54:5a:e3:42:a2:8a
+# SHA1 Fingerprint: 59:af:82:79:91:86:c7:b4:75:07:cb:cf:03:57:46:eb:04:dd:b7:16
+# SHA256 Fingerprint: 66:8c:83:94:7d:a6:3b:72:4b:ec:e1:74:3c:31:a0:e6:ae:d0:db:8e:c5:b3:1b:e3:77:bb:78:4f:91:b6:71:6f
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
+DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
+qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
+uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
+Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
+pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
+5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
+UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
+GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
+5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
+6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
+eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
+B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
+BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
+L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
+SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
+CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
+5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
+IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
+gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
+vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
+bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
+N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
+Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
+ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig O=Disig a.s.
+# Subject: CN=CA Disig O=Disig a.s.
+# Label: "CA Disig"
+# Serial: 1
+# MD5 Fingerprint: 3f:45:96:39:e2:50:87:f7:bb:fe:98:0c:3c:20:98:e6
+# SHA1 Fingerprint: 2a:c8:d5:8b:57:ce:bf:2f:49:af:f2:fc:76:8f:51:14:62:90:7a:41
+# SHA256 Fingerprint: 92:bf:51:19:ab:ec:ca:d0:b1:33:2d:c4:e1:d0:5f:ba:75:b5:67:90:44:ee:0c:a2:6e:93:1f:74:4f:2f:33:cf
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
+MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
+AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
+CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
+YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
+Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
+mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
+XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
+S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
+FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
+AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
+ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
+ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
+Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
+DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
+yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
+EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
+EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
+PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Subject: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Label: "Juur-SK"
+# Serial: 999181308
+# MD5 Fingerprint: aa:8e:5d:d9:f8:db:0a:58:b7:8d:26:87:6c:82:35:55
+# SHA1 Fingerprint: 40:9d:4b:d9:17:b5:5c:27:b6:9b:64:cb:98:22:44:0d:cd:09:b8:89
+# SHA256 Fingerprint: ec:c3:e9:c3:40:75:03:be:e0:91:aa:95:2f:41:34:8f:f8:8b:aa:86:3b:22:64:be:fa:c8:07:90:15:74:e9:39
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
+AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
+dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
+MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
+CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
+MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
+SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
+ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
+LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
+PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
+2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
+ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
+MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
+AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
+AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
+AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
+AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
+BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
+P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
+CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
+kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
+HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
+na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
+qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
+TbvGRNs2yyqcjg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Subject: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Label: "Hongkong Post Root CA 1"
+# Serial: 1000
+# MD5 Fingerprint: a8:0d:6f:39:78:b9:43:6d:77:42:6d:98:5a:cc:23:ca
+# SHA1 Fingerprint: d6:da:a8:20:8d:09:d2:15:4d:24:b5:2f:cb:34:6e:b2:58:b2:8a:58
+# SHA256 Fingerprint: f9:e6:7d:33:6c:51:00:2a:c0:54:c6:32:02:2d:66:dd:a2:e7:e3:ff:f1:0a:d0:61:ed:31:d8:bb:b4:10:cf:b2
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
+FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
+Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
+A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
+b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
+jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
+PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
+ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
+nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
+q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
+MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
+mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
+7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
+oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
+EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
+fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
+AmvZWg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Label: "SecureSign RootCA11"
+# Serial: 1
+# MD5 Fingerprint: b7:52:74:e2:92:b4:80:93:f2:75:e4:cc:d7:f2:ea:26
+# SHA1 Fingerprint: 3b:c4:9f:48:f8:f3:73:a0:9c:1e:bd:f8:5b:b1:c3:65:c7:d8:11:b3
+# SHA256 Fingerprint: bf:0f:ee:fb:9e:3a:58:1a:d5:f9:e9:db:75:89:98:57:43:d2:61:08:5c:4d:31:4f:6f:5d:72:59:aa:42:16:12
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
+MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
+A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
+MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
+Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
+QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
+i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
+h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
+MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
+UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
+8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
+h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
+KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
+X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
+QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
+pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
+QSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Subject: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Label: "ACEDICOM Root"
+# Serial: 7029493972724711941
+# MD5 Fingerprint: 42:81:a0:e2:1c:e3:55:10:de:55:89:42:65:96:22:e6
+# SHA1 Fingerprint: e0:b4:32:2e:b2:f6:a5:68:b6:54:53:84:48:18:4a:50:36:87:43:84
+# SHA256 Fingerprint: 03:95:0f:b4:9a:53:1f:3e:19:91:94:23:98:df:a9:e0:ea:32:d7:ba:1c:dd:9b:c8:5d:b5:7e:d9:40:0b:43:4a
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
+AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
+CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
+MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
+RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
+09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
+XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
+Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
+t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
+X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
+MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
+fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
+2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
+K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
+ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
+BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
+MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
+RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
+fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
+gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
+I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
+5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
+ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
+MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
+o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
+zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
+GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
+r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
+Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 80507572722862485515306429940691309246
+# MD5 Fingerprint: ef:5a:f1:33:ef:f1:cd:bb:51:02:ee:12:14:4b:96:c4
+# SHA1 Fingerprint: a1:db:63:93:91:6f:17:e4:18:55:09:40:04:15:c7:02:40:b0:ae:6b
+# SHA256 Fingerprint: a4:b6:b3:99:6f:c2:f3:06:b3:fd:86:81:bd:63:41:3d:8c:50:09:cc:4f:a3:29:c2:cc:f0:e2:fa:1b:14:03:05
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Label: "Microsec e-Szigno Root CA 2009"
+# Serial: 14014712776195784473
+# MD5 Fingerprint: f8:49:f4:03:bc:44:2d:83:be:48:69:7d:29:64:fc:b1
+# SHA1 Fingerprint: 89:df:74:fe:5c:f4:0f:4a:80:f9:e3:37:7d:54:da:91:e1:01:31:8e
+# SHA256 Fingerprint: 3c:5f:81:fe:a5:fa:b8:2c:64:bf:a2:ea:ec:af:cd:e8:e0:77:fc:86:20:a7:ca:e5:37:16:3d:f3:6e:db:f3:78
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
+CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
+OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
+FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
+Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
+kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
+cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
+fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
+N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
+xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
+Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
+SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
+mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
+ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
+2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
+HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+# Issuer: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Subject: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Label: "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi"
+# Serial: 91184789765598910059173000485363494069
+# MD5 Fingerprint: 3d:41:29:cb:1e:aa:11:74:cd:5d:b0:62:af:b0:43:5b
+# SHA1 Fingerprint: dd:e1:d2:a9:01:80:2e:1d:87:5e:84:b3:80:7e:4b:b1:fd:99:41:34
+# SHA256 Fingerprint: e6:09:07:84:65:a4:19:78:0c:b6:ac:4c:1c:0b:fb:46:53:d9:d9:cc:6e:b3:94:6e:b7:f3:d6:99:97:ba:d5:98
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
+Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
+a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
+MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
+R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
+MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
+L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
+5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
+90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
+c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
+VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
+qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
+/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
+/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
+KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Label: "GlobalSign Root CA - R3"
+# Serial: 4835703278459759426209954
+# MD5 Fingerprint: c5:df:b8:49:ca:05:13:55:ee:2d:ba:1a:c3:3e:b0:28
+# SHA1 Fingerprint: d6:9b:56:11:48:f0:1c:77:c5:45:78:c1:09:26:df:5b:85:69:76:ad
+# SHA256 Fingerprint: cb:b5:22:d7:b7:f1:27:ad:6a:01:13:86:5b:df:1c:d4:10:2e:7d:07:59:af:63:5a:7c:f4:72:0d:c9:63:c5:3b
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Autoridad de Certificacion Firmaprofesional CIF A62634068"
+# Serial: 6047274297262753887
+# MD5 Fingerprint: 73:3a:74:7a:ec:bb:a3:96:a6:c2:e4:e2:c8:9b:c0:c3
+# SHA1 Fingerprint: ae:c5:fb:3f:c8:e1:bf:c4:e5:4f:03:07:5a:9a:e8:00:b7:f7:b6:fa
+# SHA256 Fingerprint: 04:04:80:28:bf:1f:28:64:d4:8f:9a:d4:d8:32:94:36:6a:82:88:56:55:3f:3b:14:30:3f:90:14:7f:5d:40:ef
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
+MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
+VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
+ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
+AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
+661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
+am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
+ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
+PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
+3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
+SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
+3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
+ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
+StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
+Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
+jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+# Issuer: CN=Izenpe.com O=IZENPE S.A.
+# Subject: CN=Izenpe.com O=IZENPE S.A.
+# Label: "Izenpe.com"
+# Serial: 917563065490389241595536686991402621
+# MD5 Fingerprint: a6:b0:cd:85:80:da:5c:50:34:a3:39:90:2f:55:67:73
+# SHA1 Fingerprint: 2f:78:3d:25:52:18:a7:4a:65:39:71:b5:2c:a2:9c:45:15:6f:e9:19
+# SHA256 Fingerprint: 25:30:cc:8e:98:32:15:02:ba:d9:6f:9b:1f:ba:1b:09:9e:2d:29:9e:0f:45:48:bb:91:4f:36:3b:c0:d4:53:1f
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
+MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
+ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
+VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
+b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
+scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
+xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
+LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
+uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
+yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
+rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
+BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
+hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
+QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
+HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
+Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
+QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
+BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
+A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
+laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
+awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
+JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
+LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
+VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
+LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
+UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
+QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
+QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Label: "Chambers of Commerce Root - 2008"
+# Serial: 11806822484801597146
+# MD5 Fingerprint: 5e:80:9e:84:5a:0e:65:0b:17:02:f3:55:18:2a:3e:d7
+# SHA1 Fingerprint: 78:6a:74:ac:76:ab:14:7f:9c:6a:30:50:ba:9e:a8:7e:fe:9a:ce:3c
+# SHA256 Fingerprint: 06:3e:4a:fa:c4:91:df:d3:32:f3:08:9b:85:42:e9:46:17:d8:93:d7:fe:94:4e:10:a7:93:7e:e2:9d:96:93:c0
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Label: "Global Chambersign Root - 2008"
+# Serial: 14541511773111788494
+# MD5 Fingerprint: 9e:80:ff:78:01:0c:2e:c1:36:bd:fe:96:90:6e:08:f3
+# SHA1 Fingerprint: 4a:bd:ee:ec:95:0d:35:9c:89:ae:c7:52:a1:2c:5b:29:f6:d6:aa:0c
+# SHA256 Fingerprint: 13:63:35:43:93:34:a7:69:80:16:a0:d3:24:de:72:28:4e:07:9d:7b:52:20:bb:8f:bd:74:78:16:ee:be:ba:ca
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+# Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Label: "Go Daddy Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 80:3a:bc:22:c1:e6:fb:8d:9b:3b:27:4a:32:1b:9a:01
+# SHA1 Fingerprint: 47:be:ab:c9:22:ea:e8:0e:78:78:34:62:a7:9f:45:c2:54:fd:e6:8b
+# SHA256 Fingerprint: 45:14:0b:32:47:eb:9c:c8:c5:b4:f0:d7:b5:30:91:f7:32:92:08:9e:6e:5a:63:e2:74:9d:d3:ac:a9:19:8e:da
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
+EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
+ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
+NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
+EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
+AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
+E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
+/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
+DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
+GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
+tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
+AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
+WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
+9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
+gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
+2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
+4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: d6:39:81:c6:52:7e:96:69:fc:fc:ca:66:ed:05:f2:96
+# SHA1 Fingerprint: b5:1c:06:7c:ee:2b:0c:3d:f8:55:ab:2d:92:f4:fe:39:d4:e7:0f:0e
+# SHA256 Fingerprint: 2c:e1:cb:0b:f9:d2:f9:e1:02:99:3f:be:21:51:52:c3:b2:dd:0c:ab:de:1c:68:e5:31:9b:83:91:54:db:b7:f5
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
+ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
+MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
+aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
+nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
+HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
+Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
+dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
+HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
+CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
+sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
+4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
+8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
+mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Services Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 17:35:74:af:7b:61:1c:eb:f4:f9:3c:e2:ee:40:f9:a2
+# SHA1 Fingerprint: 92:5a:8f:8d:2c:6d:04:e0:66:5f:59:6a:ff:22:d8:63:e8:25:6f:3f
+# SHA256 Fingerprint: 56:8d:69:05:a2:c8:87:08:a4:b3:02:51:90:ed:cf:ed:b1:97:4a:60:6a:13:c6:e5:29:0f:cb:2a:e6:3e:da:b5
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
+# Subject: CN=AffirmTrust Commercial O=AffirmTrust
+# Label: "AffirmTrust Commercial"
+# Serial: 8608355977964138876
+# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
+# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
+# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Networking O=AffirmTrust
+# Subject: CN=AffirmTrust Networking O=AffirmTrust
+# Label: "AffirmTrust Networking"
+# Serial: 8957382827206547757
+# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
+# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
+# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium O=AffirmTrust
+# Subject: CN=AffirmTrust Premium O=AffirmTrust
+# Label: "AffirmTrust Premium"
+# Serial: 7893706540734352110
+# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
+# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
+# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Label: "AffirmTrust Premium ECC"
+# Serial: 8401224907861490260
+# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
+# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
+# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Label: "Certum Trusted Network CA"
+# Serial: 279744
+# MD5 Fingerprint: d5:e9:81:40:c5:18:69:fc:46:2c:89:75:62:0f:aa:78
+# SHA1 Fingerprint: 07:e0:32:e0:20:b7:2c:3f:19:2f:06:28:a2:59:3a:19:a7:0f:06:9e
+# SHA256 Fingerprint: 5c:58:46:8d:55:f5:8e:49:7e:74:39:82:d2:b5:00:10:b6:d1:65:37:4a:cf:83:a7:d4:a3:2d:b7:68:c4:40:8e
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Subject: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Label: "Certinomis - Autorité Racine"
+# Serial: 1
+# MD5 Fingerprint: 7f:30:78:8c:03:e3:ca:c9:0a:e2:c9:ea:1e:aa:55:1a
+# SHA1 Fingerprint: 2e:14:da:ec:28:f0:fa:1e:8e:38:9a:4e:ab:eb:26:c0:0a:d3:83:c3
+# SHA256 Fingerprint: fc:bf:e2:88:62:06:f7:2b:27:59:3c:8b:07:02:97:e1:2d:76:9e:d1:0e:d7:93:07:05:a8:09:8e:ff:c1:4d:17
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
+MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
+BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
+Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
+cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
+aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
+F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
+8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
+rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
+/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
+7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
+28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
+lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
+nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
+0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
+5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
+WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
+jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
+ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
+OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
+619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
+2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
+o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
+nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
+5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
+pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
+dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
+BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+# Issuer: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Subject: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Label: "Root CA Generalitat Valenciana"
+# Serial: 994436456
+# MD5 Fingerprint: 2c:8c:17:5e:b1:54:ab:93:17:b5:36:5a:db:d1:c6:f2
+# SHA1 Fingerprint: a0:73:e5:c5:bd:43:61:0d:86:4c:21:13:0a:85:58:57:cc:9c:ea:46
+# SHA256 Fingerprint: 8c:4e:df:d0:43:48:f3:22:96:9e:7e:29:a4:cd:4d:ca:00:46:55:06:1c:16:e1:b0:76:42:2e:f3:42:ad:63:0e
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
+UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
+R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
+MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
+JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
+WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
+SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
+u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
+A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
+Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
+MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
+aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
+IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
+cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
+YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
+bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
+bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
+aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
+ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
+YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
+ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
+LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
+Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
+eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
+CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
+A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
+Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
+lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
+b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
+9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
+ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
+IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+# Issuer: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Subject: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Label: "A-Trust-nQual-03"
+# Serial: 93214
+# MD5 Fingerprint: 49:63:ae:27:f4:d5:95:3d:d8:db:24:86:b8:9c:07:53
+# SHA1 Fingerprint: d3:c0:63:f2:19:ed:07:3e:34:ad:5d:75:0b:32:76:29:ff:d5:9a:f2
+# SHA256 Fingerprint: 79:3c:bf:45:59:b9:fd:e3:8a:b2:2d:f1:68:69:f6:98:81:ae:14:c4:b0:13:9a:c7:88:a7:8a:1a:fc:ca:02:fb
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
+VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
+bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
+dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
+MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
+dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
+ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
+EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
+lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
+znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
+2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
+k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
+2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
+VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
+KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
+FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
+DNuxUCAKGkq6ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Label: "TWCA Root Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: aa:08:8f:f6:f9:7b:b7:f2:b1:a7:1e:9b:ea:ea:bd:79
+# SHA1 Fingerprint: cf:9e:87:6d:d3:eb:fc:42:26:97:a3:b5:a3:7a:a0:76:a9:06:23:48
+# SHA256 Fingerprint: bf:d8:8f:e1:10:1c:41:ae:3e:80:1b:f8:be:56:35:0e:e9:ba:d1:a6:b9:bd:51:5e:dc:5c:6d:5b:87:11:ac:44
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
+MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
+V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
+WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
+LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
+AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
+K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
+RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
+rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
+3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
+hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
+MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
+XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
+lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
+aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
+YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Label: "Security Communication RootCA2"
+# Serial: 0
+# MD5 Fingerprint: 6c:39:7d:a4:0e:55:59:b2:3f:d6:41:b1:12:50:de:43
+# SHA1 Fingerprint: 5f:3b:8c:f2:f8:10:b3:7d:78:b4:ce:ec:19:19:c3:73:34:b9:c7:74
+# SHA256 Fingerprint: 51:3b:2c:ec:b8:10:d4:cd:e5:dd:85:39:1a:df:c6:c2:dd:60:d8:7b:b7:36:d2:b5:21:48:4a:a4:7a:0e:be:f6
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
+DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
+dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
+YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
+OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
+zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
+VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
+hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
+ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
+awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
+OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
+coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
+okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
+t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
+1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
+SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Subject: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Label: "Hellenic Academic and Research Institutions RootCA 2011"
+# Serial: 0
+# MD5 Fingerprint: 73:9f:4c:4b:73:5b:79:e9:fa:ba:1c:ef:6e:cb:d5:c9
+# SHA1 Fingerprint: fe:45:65:9b:79:03:5b:98:a1:61:b5:51:2e:ac:da:58:09:48:22:4d
+# SHA256 Fingerprint: bc:10:4f:15:a4:8b:e7:09:dc:a5:42:a7:e1:d4:b9:df:6f:05:45:27:e8:02:ea:a9:2d:59:54:44:25:8a:fe:71
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
+RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
+dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
+YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
+NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
+EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
+cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
+dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
+fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
+bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
+75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
+FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
+HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
+5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
+b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
+A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
+6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
+dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
+Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
+l7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+# Issuer: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Subject: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Label: "Actalis Authentication Root CA"
+# Serial: 6271844772424770508
+# MD5 Fingerprint: 69:c1:0d:4f:07:a3:1b:c3:fe:56:3d:04:bc:11:f6:a6
+# SHA1 Fingerprint: f3:73:b3:87:06:5a:28:84:8a:f2:f3:4a:ce:19:2b:dd:c7:8e:9c:ac
+# SHA256 Fingerprint: 55:92:60:84:ec:96:3a:64:b9:6e:2a:be:01:ce:0b:a8:6a:64:fb:fe:bc:c7:aa:b5:af:c1:55:b3:7f:d7:60:66
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Trustis Limited OU=Trustis FPS Root CA
+# Subject: O=Trustis Limited OU=Trustis FPS Root CA
+# Label: "Trustis FPS Root CA"
+# Serial: 36053640375399034304724988975563710553
+# MD5 Fingerprint: 30:c9:e7:1e:6b:e6:14:eb:65:b2:16:69:20:31:67:4d
+# SHA1 Fingerprint: 3b:c0:38:0b:33:c3:f6:a6:0c:86:15:22:93:d9:df:f5:4b:81:c0:04
+# SHA256 Fingerprint: c1:b4:82:99:ab:a5:20:8f:e9:63:0a:ce:55:ca:68:a0:3e:da:5a:51:9c:88:02:a0:d3:a6:73:be:8f:8e:55:7d
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
+MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
+ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
+MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
+MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
+iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
+vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
+0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
+OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
+BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
+FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
+GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
+zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
+1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
+f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
+jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
+ZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 45
+# MD5 Fingerprint: c9:3b:0d:84:41:fc:a4:76:79:23:08:57:de:10:19:16
+# SHA1 Fingerprint: a3:f1:33:3f:e2:42:bf:cf:c5:d1:4e:8f:39:42:98:40:68:10:d1:a0
+# SHA256 Fingerprint: e1:78:90:ee:09:a3:fb:f4:f4:8b:9c:41:4a:17:d6:37:b7:a5:06:47:e9:bc:75:23:22:72:7f:cc:17:42:a9:11
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
+ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
+ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
+aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
+YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
+c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
+d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
+CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
+wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
+Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
+0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
+pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
+CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
+P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
+1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
+KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
+8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
+fyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Subject: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Label: "StartCom Certification Authority G2"
+# Serial: 59
+# MD5 Fingerprint: 78:4b:fb:9e:64:82:0a:d3:b8:4c:62:f3:64:f2:90:64
+# SHA1 Fingerprint: 31:f1:fd:68:22:63:20:ee:c6:3b:3f:9d:ea:4a:3e:53:7c:7c:39:17
+# SHA256 Fingerprint: c7:ba:65:67:de:93:a7:98:ae:1f:aa:79:1e:71:2d:37:8f:ae:1f:93:c4:39:7f:ea:44:1b:b7:cb:e6:fd:59:95
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
+OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
+A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
+JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
+vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
+D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
+Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
+RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
+HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
+nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
+0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
+UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
+Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
+TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
+BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
+UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
+6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
+9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
+HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
+wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
+XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
+IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
+hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
+so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 2 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 46:a7:d2:fe:45:fb:64:5a:a8:59:90:9b:78:44:9b:29
+# SHA1 Fingerprint: 49:0a:75:74:de:87:0a:47:fe:58:ee:f6:c7:6b:eb:c6:0b:12:40:99
+# SHA256 Fingerprint: 9a:11:40:25:19:7c:5b:b9:5d:94:e6:3d:55:cd:43:79:08:47:b6:46:b2:3c:df:11:ad:a4:a0:0e:ff:15:fb:48
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 3 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 3d:3b:18:9e:2c:64:5a:e8:d5:88:ce:0e:f9:37:c2:ec
+# SHA1 Fingerprint: da:fa:f7:fa:66:84:ec:06:8f:14:50:bd:c7:c2:81:a5:bc:a9:64:57
+# SHA256 Fingerprint: ed:f7:eb:bc:a2:7a:2a:38:4d:38:7b:7d:40:10:c6:66:e2:ed:b4:84:3e:4c:29:b4:ae:1d:5b:93:32:e6:b2:4d
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Subject: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Label: "T-TeleSec GlobalRoot Class 3"
+# Serial: 1
+# MD5 Fingerprint: ca:fb:40:a8:4e:39:92:8a:1d:fe:8e:2f:c4:27:ea:ef
+# SHA1 Fingerprint: 55:a6:72:3e:cb:f2:ec:cd:c3:23:74:70:19:9d:2a:be:11:e3:81:d1
+# SHA256 Fingerprint: fd:73:da:d3:1c:64:4f:f1:b4:3b:ef:0c:cd:da:96:71:0b:9c:d9:87:5e:ca:7e:31:70:7a:f3:e9:6d:52:2b:bd
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
+8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
+RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
+hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
+ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
+EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
+A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
+WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
+1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
+6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
+91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
+TpPDpFQUWw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Subject: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Label: "EE Certification Centre Root CA"
+# Serial: 112324828676200291871926431888494945866
+# MD5 Fingerprint: 43:5e:88:d4:7d:1a:4a:7e:fd:84:2e:52:eb:01:d4:6f
+# SHA1 Fingerprint: c9:a8:b9:e7:55:80:5e:58:e3:53:77:a7:25:eb:af:c3:7b:27:cc:d7
+# SHA256 Fingerprint: 3e:84:ba:43:42:90:85:16:e7:75:73:c0:99:2f:09:79:ca:08:4e:46:85:68:1f:f1:95:cc:ba:8a:22:9b:8a:76
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
+czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
+CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
+MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
+ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
+b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
+euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
+bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
+WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
+MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
+1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
+zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
+BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
+BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
+v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
+E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
+iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
+GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Label: "TURKTRUST Certificate Services Provider Root 2007"
+# Serial: 1
+# MD5 Fingerprint: 2b:70:20:56:86:82:a0:18:c8:07:53:12:28:70:21:72
+# SHA1 Fingerprint: f1:7f:6f:b6:31:dc:99:e3:a3:c8:7f:fe:1c:f1:81:10:88:d9:60:33
+# SHA256 Fingerprint: 97:8c:d9:66:f2:fa:a0:7b:a7:aa:95:00:d9:c0:2e:9d:77:f2:cd:ad:a6:ad:6b:a7:4a:f4:b9:1c:66:59:3c:50
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
+OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
+b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
+VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
+sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
+ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
+KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
++7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
+HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
+IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
+733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
+Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
+AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
+mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
+XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
+qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 2009"
+# Serial: 623603
+# MD5 Fingerprint: cd:e0:25:69:8d:47:ac:9c:89:35:90:f7:fd:51:3d:2f
+# SHA1 Fingerprint: 58:e8:ab:b0:36:15:33:fb:80:f7:9b:1b:6d:29:d3:ff:8d:5f:00:f0
+# SHA256 Fingerprint: 49:e7:a4:42:ac:f0:ea:62:87:05:00:54:b5:25:64:b6:50:e4:f4:9e:42:e3:48:d6:aa:38:e0:39:e9:57:b1:c1
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
+ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
+HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
+UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
+tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
+ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
+lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
+/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
+A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
+MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
+cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
+L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
+BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
+acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
+zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
+PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
+Johw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 EV 2009"
+# Serial: 623604
+# MD5 Fingerprint: aa:c6:43:2c:5e:2d:cd:c4:34:c0:50:4f:11:02:4f:b6
+# SHA1 Fingerprint: 96:c9:1b:0b:95:b4:10:98:42:fa:d0:d8:22:79:fe:60:fa:b9:16:83
+# SHA256 Fingerprint: ee:c5:49:6b:98:8c:e9:86:25:b9:34:09:2e:ec:29:08:be:d0:b0:f3:16:c2:d4:73:0c:84:ea:f1:f3:d3:48:81
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
+NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
+BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
+ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
+3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
+qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
+p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
+HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
+ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
+HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
+Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
+c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
+RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
+dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
+Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
+3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
+CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
+xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
+KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Raiz del Estado Venezolano O=Sistema Nacional de Certificacion Electronica OU=Superintendencia de Servicios de Certificacion Electronica
+# Subject: CN=PSCProcert O=Sistema Nacional de Certificacion Electronica OU=Proveedor de Certificados PROCERT
+# Label: "PSCProcert"
+# Serial: 11
+# MD5 Fingerprint: e6:24:e9:12:01:ae:0c:de:8e:85:c4:ce:a3:12:dd:ec
+# SHA1 Fingerprint: 70:c1:8d:74:b4:28:81:0a:e4:fd:a5:75:d7:01:9f:99:b0:3d:50:74
+# SHA256 Fingerprint: 3c:fc:3c:14:d1:f6:84:ff:17:e3:8c:43:ca:44:0c:00:b9:67:ec:93:3e:8b:fe:06:4c:a1:d7:2c:90:f2:ad:b0
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
+MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
+b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
+KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
+A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
+aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
+7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
+BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
+ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
+JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
+PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
+0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
+6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
+v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
+K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
+bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
+MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
+MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
+gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
+b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
+bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
+cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
+ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
+ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
+hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
+AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
+MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
+RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
+UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
+cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
+AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
+AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
+1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
+3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
+Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
+HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
+pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
+sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
+qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
+mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
+opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
+YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+# Issuer: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Subject: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Label: "China Internet Network Information Center EV Certificates Root"
+# Serial: 1218379777
+# MD5 Fingerprint: 55:5d:63:00:97:bd:6a:97:f5:67:ab:4b:fb:6e:63:15
+# SHA1 Fingerprint: 4f:99:aa:93:fb:2b:d1:37:26:a1:99:4a:ce:7f:f0:05:f2:93:5d:1e
+# SHA256 Fingerprint: 1c:01:c6:f4:db:b2:fe:fc:22:55:8b:2b:ca:32:56:3f:49:84:4a:cf:c3:2b:7b:e4:b0:ff:59:9f:9e:8c:7a:f7
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
+Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
+aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
+Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
+SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
+aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
+ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
+7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
+DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
+zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
+hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
+4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
+gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
+NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
+j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
+52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
+echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
+zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
+wy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 2"
+# Serial: 40698052477090394928831521023204026294
+# MD5 Fingerprint: 5b:04:69:ec:a5:83:94:63:18:a7:86:d0:e4:f2:6e:19
+# SHA1 Fingerprint: 77:47:4f:c6:30:e4:0f:4c:47:64:3f:84:ba:b8:c6:95:4a:8a:41:ec
+# SHA256 Fingerprint: f0:9b:12:2c:71:14:f4:a0:9b:d4:ea:4f:4a:99:d5:58:b4:6e:4c:25:cd:81:14:0d:29:c0:56:13:91:4c:38:41
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
+jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
+0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
+2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
+ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
+y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
+tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
+6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
+uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
+acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
+k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
+VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
+b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
+fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
+/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
+REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
+srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
+aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
+woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
+Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
+t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
+8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
+9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
+wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root EV CA 2"
+# Serial: 322973295377129385374608406479535262296
+# MD5 Fingerprint: 7b:30:34:9f:dd:0a:4b:6b:35:ca:31:51:28:5d:ae:ec
+# SHA1 Fingerprint: e7:a1:90:29:d3:d5:52:dc:0d:0f:c6:92:d3:ea:88:0d:15:2e:1a:6b
+# SHA256 Fingerprint: d9:5f:ea:3c:a4:ee:dc:e7:4c:d7:6e:75:fc:6d:1f:f6:2c:44:1f:0f:a8:bc:77:f0:34:b1:9e:5d:b2:58:01:5d
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
+ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
+dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
+IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
+VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
+dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
+MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
+UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
+1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
+oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
+HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
+5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
+idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
+OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
+NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
+46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
+UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
+7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
+A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
+bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
+XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
+PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
+Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
+WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
+Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
+7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
+nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
+vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
+WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
+fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
+I+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R1 O=Disig a.s.
+# Subject: CN=CA Disig Root R1 O=Disig a.s.
+# Label: "CA Disig Root R1"
+# Serial: 14052245610670616104
+# MD5 Fingerprint: be:ec:11:93:9a:f5:69:21:bc:d7:c1:c0:67:89:cc:2a
+# SHA1 Fingerprint: 8e:1c:74:f8:a6:20:b9:e5:8a:f4:61:fa:ec:2b:47:56:51:1a:52:c6
+# SHA256 Fingerprint: f9:6f:23:f4:c3:e7:9c:07:7a:46:98:8d:5a:f5:90:06:76:a0:f0:39:cb:64:5d:d1:75:49:b2:16:c8:24:40:ce
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
+MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
+D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
+OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
+fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
+IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
+oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
+/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
+rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
+3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
+7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
+yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
+qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
+hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
+SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
+HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
+emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
+AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
+7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
+DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
+F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
+a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
+Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R2 O=Disig a.s.
+# Subject: CN=CA Disig Root R2 O=Disig a.s.
+# Label: "CA Disig Root R2"
+# Serial: 10572350602393338211
+# MD5 Fingerprint: 26:01:fb:d8:27:a7:17:9a:45:54:38:1a:43:01:3b:03
+# SHA1 Fingerprint: b5:61:eb:ea:a4:de:e4:25:4b:69:1a:98:a5:57:47:c2:34:c7:d9:71
+# SHA256 Fingerprint: e2:3d:4a:03:6d:7b:70:e9:f5:95:b1:42:20:79:d2:b9:1e:df:bb:1f:b6:51:a0:63:3e:aa:8a:9d:c5:f8:07:03
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
+MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
+NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
+PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
+x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
+QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
+yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
+QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
+H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
+QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
+i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
+nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
+rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
+hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
+GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
+lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
++elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
+TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
+nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
+gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
+G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
+zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
+L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+# Issuer: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
+# Subject: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
+# Label: "ACCVRAIZ1"
+# Serial: 6828503384748696800
+# MD5 Fingerprint: d0:a0:5a:ee:05:b6:09:94:21:a1:7d:f1:b2:29:82:02
+# SHA1 Fingerprint: 93:05:7a:88:15:c6:4f:ce:88:2f:fa:91:16:52:28:78:bc:53:64:17
+# SHA256 Fingerprint: 9a:6e:c0:12:e1:a7:da:9d:be:34:19:4d:47:8a:d7:c0:db:18:22:fb:07:1d:f1:29:81:49:6e:d1:04:38:41:13
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
+AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
+CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
+BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
+VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
+qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
+HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
+G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
+lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
+IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
+0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
+k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
+4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
+m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
+cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
+uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
+KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
+ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
+AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
+VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
+CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
+cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
+QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
+7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
+cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
+QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
+czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
+aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
+aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
+DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
+BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
+D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
+JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
+AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
+vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
+tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
+7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
+h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
+d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
+pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
+# Label: "TWCA Global Root CA"
+# Serial: 3262
+# MD5 Fingerprint: f9:03:7e:cf:e6:9e:3c:73:7a:2a:90:07:69:ff:2b:96
+# SHA1 Fingerprint: 9c:bb:48:53:f6:a4:f6:d3:52:a4:e8:32:52:55:60:13:f5:ad:af:65
+# SHA256 Fingerprint: 59:76:90:07:f7:68:5d:0f:cd:50:87:2f:9f:95:d5:75:5a:5b:2b:45:7d:81:f3:69:2b:61:0a:98:67:2f:0e:1b
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
+EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
+VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
+NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
+B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
+10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
+0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
+MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
+zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
+46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
+yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
+laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
+oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
+BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
+qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
+4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
+1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
+H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
+RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
+15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
+6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
+nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
+wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
+aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
+KwbQBM0=
+-----END CERTIFICATE-----
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/certs.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/certs.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/certs.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/certs.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+certs.py
+~~~~~~~~
+
+This module returns the preferred default CA certificate bundle.
+
+If you are packaging Requests, e.g., for a Linux distribution or a managed
+environment, you can change the definition of where() to return a separately
+packaged CA bundle.
+"""
+import os.path
+
+try:
+    from certifi import where
+except ImportError:
+    def where():
+        """Return the preferred certificate bundle."""
+        # vendored bundle inside Requests
+        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
+
+if __name__ == '__main__':
+    print(where())
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/compat.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/compat.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/compat.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/compat.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+
+"""
+pythoncompat
+"""
+
+from .packages import chardet
+
+import sys
+
+# -------
+# Pythons
+# -------
+
+# Syntax sugar.
+_ver = sys.version_info
+
+#: Python 2.x?
+is_py2 = (_ver[0] == 2)
+
+#: Python 3.x?
+is_py3 = (_ver[0] == 3)
+
+#: Python 3.0.x
+is_py30 = (is_py3 and _ver[1] == 0)
+
+#: Python 3.1.x
+is_py31 = (is_py3 and _ver[1] == 1)
+
+#: Python 3.2.x
+is_py32 = (is_py3 and _ver[1] == 2)
+
+#: Python 3.3.x
+is_py33 = (is_py3 and _ver[1] == 3)
+
+#: Python 3.4.x
+is_py34 = (is_py3 and _ver[1] == 4)
+
+#: Python 2.7.x
+is_py27 = (is_py2 and _ver[1] == 7)
+
+#: Python 2.6.x
+is_py26 = (is_py2 and _ver[1] == 6)
+
+#: Python 2.5.x
+is_py25 = (is_py2 and _ver[1] == 5)
+
+#: Python 2.4.x
+is_py24 = (is_py2 and _ver[1] == 4)   # I'm assuming this is not by choice.
+
+
+# ---------
+# Platforms
+# ---------
+
+
+# Syntax sugar.
+_ver = sys.version.lower()
+
+is_pypy = ('pypy' in _ver)
+is_jython = ('jython' in _ver)
+is_ironpython = ('iron' in _ver)
+
+# Assume CPython, if nothing else.
+is_cpython = not any((is_pypy, is_jython, is_ironpython))
+
+# Windows-based system.
+is_windows = 'win32' in str(sys.platform).lower()
+
+# Standard Linux 2+ system.
+is_linux = ('linux' in str(sys.platform).lower())
+is_osx = ('darwin' in str(sys.platform).lower())
+is_hpux = ('hpux' in str(sys.platform).lower())   # Complete guess.
+is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
+
+try:
+    import simplejson as json
+except (ImportError, SyntaxError):
+    # simplejson does not support Python 3.2, it throws a SyntaxError
+    # because of u'...' Unicode literals.
+    import json
+
+# ---------
+# Specifics
+# ---------
+
+if is_py2:
+    from urllib import quote, unquote, quote_plus, unquote_plus, urlencode, getproxies, proxy_bypass
+    from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
+    from urllib2 import parse_http_list
+    import cookielib
+    from Cookie import Morsel
+    from StringIO import StringIO
+    from .packages.urllib3.packages.ordered_dict import OrderedDict
+
+    builtin_str = str
+    bytes = str
+    str = unicode
+    basestring = basestring
+    numeric_types = (int, long, float)
+
+
+elif is_py3:
+    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
+    from urllib.request import parse_http_list, getproxies, proxy_bypass
+    from http import cookiejar as cookielib
+    from http.cookies import Morsel
+    from io import StringIO
+    from collections import OrderedDict
+
+    builtin_str = str
+    str = str
+    bytes = bytes
+    basestring = (str, bytes)
+    numeric_types = (int, float)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/cookies.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/cookies.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/cookies.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/cookies.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,454 @@
+# -*- coding: utf-8 -*-
+
+"""
+Compatibility code to be able to use `cookielib.CookieJar` with requests.
+
+requests.utils imports from here, so be careful with imports.
+"""
+
+import time
+import collections
+from .compat import cookielib, urlparse, urlunparse, Morsel
+
+try:
+    import threading
+    # grr, pyflakes: this fixes "redefinition of unused 'threading'"
+    threading
+except ImportError:
+    import dummy_threading as threading
+
+
+class MockRequest(object):
+    """Wraps a `requests.Request` to mimic a `urllib2.Request`.
+
+    The code in `cookielib.CookieJar` expects this interface in order to correctly
+    manage cookie policies, i.e., determine whether a cookie can be set, given the
+    domains of the request and the cookie.
+
+    The original request object is read-only. The client is responsible for collecting
+    the new headers via `get_new_headers()` and interpreting them appropriately. You
+    probably want `get_cookie_header`, defined below.
+    """
+
+    def __init__(self, request):
+        self._r = request
+        self._new_headers = {}
+        self.type = urlparse(self._r.url).scheme
+
+    def get_type(self):
+        return self.type
+
+    def get_host(self):
+        return urlparse(self._r.url).netloc
+
+    def get_origin_req_host(self):
+        return self.get_host()
+
+    def get_full_url(self):
+        # Only return the response's URL if the user hadn't set the Host
+        # header
+        if not self._r.headers.get('Host'):
+            return self._r.url
+        # If they did set it, retrieve it and reconstruct the expected domain
+        host = self._r.headers['Host']
+        parsed = urlparse(self._r.url)
+        # Reconstruct the URL as we expect it
+        return urlunparse([
+            parsed.scheme, host, parsed.path, parsed.params, parsed.query,
+            parsed.fragment
+        ])
+
+    def is_unverifiable(self):
+        return True
+
+    def has_header(self, name):
+        return name in self._r.headers or name in self._new_headers
+
+    def get_header(self, name, default=None):
+        return self._r.headers.get(name, self._new_headers.get(name, default))
+
+    def add_header(self, key, val):
+        """cookielib has no legitimate use for this method; add it back if you find one."""
+        raise NotImplementedError("Cookie headers should be added with add_unredirected_header()")
+
+    def add_unredirected_header(self, name, value):
+        self._new_headers[name] = value
+
+    def get_new_headers(self):
+        return self._new_headers
+
+    @property
+    def unverifiable(self):
+        return self.is_unverifiable()
+
+    @property
+    def origin_req_host(self):
+        return self.get_origin_req_host()
+
+    @property
+    def host(self):
+        return self.get_host()
+
+
+class MockResponse(object):
+    """Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
+
+    ...what? Basically, expose the parsed HTTP headers from the server response
+    the way `cookielib` expects to see them.
+    """
+
+    def __init__(self, headers):
+        """Make a MockResponse for `cookielib` to read.
+
+        :param headers: a httplib.HTTPMessage or analogous carrying the headers
+        """
+        self._headers = headers
+
+    def info(self):
+        return self._headers
+
+    def getheaders(self, name):
+        self._headers.getheaders(name)
+
+
+def extract_cookies_to_jar(jar, request, response):
+    """Extract the cookies from the response into a CookieJar.
+
+    :param jar: cookielib.CookieJar (not necessarily a RequestsCookieJar)
+    :param request: our own requests.Request object
+    :param response: urllib3.HTTPResponse object
+    """
+    if not (hasattr(response, '_original_response') and
+            response._original_response):
+        return
+    # the _original_response field is the wrapped httplib.HTTPResponse object,
+    req = MockRequest(request)
+    # pull out the HTTPMessage with the headers and put it in the mock:
+    res = MockResponse(response._original_response.msg)
+    jar.extract_cookies(res, req)
+
+
+def get_cookie_header(jar, request):
+    """Produce an appropriate Cookie header string to be sent with `request`, or None."""
+    r = MockRequest(request)
+    jar.add_cookie_header(r)
+    return r.get_new_headers().get('Cookie')
+
+
+def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
+    """Unsets a cookie by name, by default over all domains and paths.
+
+    Wraps CookieJar.clear(), is O(n).
+    """
+    clearables = []
+    for cookie in cookiejar:
+        if cookie.name == name:
+            if domain is None or domain == cookie.domain:
+                if path is None or path == cookie.path:
+                    clearables.append((cookie.domain, cookie.path, cookie.name))
+
+    for domain, path, name in clearables:
+        cookiejar.clear(domain, path, name)
+
+
+class CookieConflictError(RuntimeError):
+    """There are two cookies that meet the criteria specified in the cookie jar.
+    Use .get and .set and include domain and path args in order to be more specific."""
+
+
+class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
+    """Compatibility class; is a cookielib.CookieJar, but exposes a dict interface.
+
+    This is the CookieJar we create by default for requests and sessions that
+    don't specify one, since some clients may expect response.cookies and
+    session.cookies to support dict operations.
+
+    Don't use the dict interface internally; it's just for compatibility with
+    with external client code. All `requests` code should work out of the box
+    with externally provided instances of CookieJar, e.g., LWPCookieJar and
+    FileCookieJar.
+
+    Caution: dictionary operations that are normally O(1) may be O(n).
+
+    Unlike a regular CookieJar, this class is pickleable.
+    """
+
+    def get(self, name, default=None, domain=None, path=None):
+        """Dict-like get() that also supports optional domain and path args in
+        order to resolve naming collisions from using one cookie jar over
+        multiple domains. Caution: operation is O(n), not O(1)."""
+        try:
+            return self._find_no_duplicates(name, domain, path)
+        except KeyError:
+            return default
+
+    def set(self, name, value, **kwargs):
+        """Dict-like set() that also supports optional domain and path args in
+        order to resolve naming collisions from using one cookie jar over
+        multiple domains."""
+        # support client code that unsets cookies by assignment of a None value:
+        if value is None:
+            remove_cookie_by_name(self, name, domain=kwargs.get('domain'), path=kwargs.get('path'))
+            return
+
+        if isinstance(value, Morsel):
+            c = morsel_to_cookie(value)
+        else:
+            c = create_cookie(name, value, **kwargs)
+        self.set_cookie(c)
+        return c
+
+    def iterkeys(self):
+        """Dict-like iterkeys() that returns an iterator of names of cookies from the jar.
+        See itervalues() and iteritems()."""
+        for cookie in iter(self):
+            yield cookie.name
+
+    def keys(self):
+        """Dict-like keys() that returns a list of names of cookies from the jar.
+        See values() and items()."""
+        return list(self.iterkeys())
+
+    def itervalues(self):
+        """Dict-like itervalues() that returns an iterator of values of cookies from the jar.
+        See iterkeys() and iteritems()."""
+        for cookie in iter(self):
+            yield cookie.value
+
+    def values(self):
+        """Dict-like values() that returns a list of values of cookies from the jar.
+        See keys() and items()."""
+        return list(self.itervalues())
+
+    def iteritems(self):
+        """Dict-like iteritems() that returns an iterator of name-value tuples from the jar.
+        See iterkeys() and itervalues()."""
+        for cookie in iter(self):
+            yield cookie.name, cookie.value
+
+    def items(self):
+        """Dict-like items() that returns a list of name-value tuples from the jar.
+        See keys() and values(). Allows client-code to call "dict(RequestsCookieJar)
+        and get a vanilla python dict of key value pairs."""
+        return list(self.iteritems())
+
+    def list_domains(self):
+        """Utility method to list all the domains in the jar."""
+        domains = []
+        for cookie in iter(self):
+            if cookie.domain not in domains:
+                domains.append(cookie.domain)
+        return domains
+
+    def list_paths(self):
+        """Utility method to list all the paths in the jar."""
+        paths = []
+        for cookie in iter(self):
+            if cookie.path not in paths:
+                paths.append(cookie.path)
+        return paths
+
+    def multiple_domains(self):
+        """Returns True if there are multiple domains in the jar.
+        Returns False otherwise."""
+        domains = []
+        for cookie in iter(self):
+            if cookie.domain is not None and cookie.domain in domains:
+                return True
+            domains.append(cookie.domain)
+        return False  # there is only one domain in jar
+
+    def get_dict(self, domain=None, path=None):
+        """Takes as an argument an optional domain and path and returns a plain old
+        Python dict of name-value pairs of cookies that meet the requirements."""
+        dictionary = {}
+        for cookie in iter(self):
+            if (domain is None or cookie.domain == domain) and (path is None
+                                                or cookie.path == path):
+                dictionary[cookie.name] = cookie.value
+        return dictionary
+
+    def __getitem__(self, name):
+        """Dict-like __getitem__() for compatibility with client code. Throws exception
+        if there are more than one cookie with name. In that case, use the more
+        explicit get() method instead. Caution: operation is O(n), not O(1)."""
+
+        return self._find_no_duplicates(name)
+
+    def __setitem__(self, name, value):
+        """Dict-like __setitem__ for compatibility with client code. Throws exception
+        if there is already a cookie of that name in the jar. In that case, use the more
+        explicit set() method instead."""
+
+        self.set(name, value)
+
+    def __delitem__(self, name):
+        """Deletes a cookie given a name. Wraps cookielib.CookieJar's remove_cookie_by_name()."""
+        remove_cookie_by_name(self, name)
+
+    def set_cookie(self, cookie, *args, **kwargs):
+        if hasattr(cookie.value, 'startswith') and cookie.value.startswith('"') and cookie.value.endswith('"'):
+            cookie.value = cookie.value.replace('\\"', '')
+        return super(RequestsCookieJar, self).set_cookie(cookie, *args, **kwargs)
+
+    def update(self, other):
+        """Updates this jar with cookies from another CookieJar or dict-like"""
+        if isinstance(other, cookielib.CookieJar):
+            for cookie in other:
+                self.set_cookie(cookie)
+        else:
+            super(RequestsCookieJar, self).update(other)
+
+    def _find(self, name, domain=None, path=None):
+        """Requests uses this method internally to get cookie values. Takes as args name
+        and optional domain and path. Returns a cookie.value. If there are conflicting cookies,
+        _find arbitrarily chooses one. See _find_no_duplicates if you want an exception thrown
+        if there are conflicting cookies."""
+        for cookie in iter(self):
+            if cookie.name == name:
+                if domain is None or cookie.domain == domain:
+                    if path is None or cookie.path == path:
+                        return cookie.value
+
+        raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
+
+    def _find_no_duplicates(self, name, domain=None, path=None):
+        """__get_item__ and get call _find_no_duplicates -- never used in Requests internally.
+        Takes as args name and optional domain and path. Returns a cookie.value.
+        Throws KeyError if cookie is not found and CookieConflictError if there are
+        multiple cookies that match name and optionally domain and path."""
+        toReturn = None
+        for cookie in iter(self):
+            if cookie.name == name:
+                if domain is None or cookie.domain == domain:
+                    if path is None or cookie.path == path:
+                        if toReturn is not None:  # if there are multiple cookies that meet passed in criteria
+                            raise CookieConflictError('There are multiple cookies with name, %r' % (name))
+                        toReturn = cookie.value  # we will eventually return this as long as no cookie conflict
+
+        if toReturn:
+            return toReturn
+        raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
+
+    def __getstate__(self):
+        """Unlike a normal CookieJar, this class is pickleable."""
+        state = self.__dict__.copy()
+        # remove the unpickleable RLock object
+        state.pop('_cookies_lock')
+        return state
+
+    def __setstate__(self, state):
+        """Unlike a normal CookieJar, this class is pickleable."""
+        self.__dict__.update(state)
+        if '_cookies_lock' not in self.__dict__:
+            self._cookies_lock = threading.RLock()
+
+    def copy(self):
+        """Return a copy of this RequestsCookieJar."""
+        new_cj = RequestsCookieJar()
+        new_cj.update(self)
+        return new_cj
+
+
+def create_cookie(name, value, **kwargs):
+    """Make a cookie from underspecified parameters.
+
+    By default, the pair of `name` and `value` will be set for the domain ''
+    and sent on every request (this is sometimes called a "supercookie").
+    """
+    result = dict(
+        version=0,
+        name=name,
+        value=value,
+        port=None,
+        domain='',
+        path='/',
+        secure=False,
+        expires=None,
+        discard=True,
+        comment=None,
+        comment_url=None,
+        rest={'HttpOnly': None},
+        rfc2109=False,)
+
+    badargs = set(kwargs) - set(result)
+    if badargs:
+        err = 'create_cookie() got unexpected keyword arguments: %s'
+        raise TypeError(err % list(badargs))
+
+    result.update(kwargs)
+    result['port_specified'] = bool(result['port'])
+    result['domain_specified'] = bool(result['domain'])
+    result['domain_initial_dot'] = result['domain'].startswith('.')
+    result['path_specified'] = bool(result['path'])
+
+    return cookielib.Cookie(**result)
+
+
+def morsel_to_cookie(morsel):
+    """Convert a Morsel object into a Cookie containing the one k/v pair."""
+
+    expires = None
+    if morsel['max-age']:
+        expires = time.time() + morsel['max-age']
+    elif morsel['expires']:
+        time_template = '%a, %d-%b-%Y %H:%M:%S GMT'
+        expires = time.mktime(
+            time.strptime(morsel['expires'], time_template)) - time.timezone
+    return create_cookie(
+        comment=morsel['comment'],
+        comment_url=bool(morsel['comment']),
+        discard=False,
+        domain=morsel['domain'],
+        expires=expires,
+        name=morsel.key,
+        path=morsel['path'],
+        port=None,
+        rest={'HttpOnly': morsel['httponly']},
+        rfc2109=False,
+        secure=bool(morsel['secure']),
+        value=morsel.value,
+        version=morsel['version'] or 0,
+    )
+
+
+def cookiejar_from_dict(cookie_dict, cookiejar=None, overwrite=True):
+    """Returns a CookieJar from a key/value dictionary.
+
+    :param cookie_dict: Dict of key/values to insert into CookieJar.
+    :param cookiejar: (optional) A cookiejar to add the cookies to.
+    :param overwrite: (optional) If False, will not replace cookies
+        already in the jar with new ones.
+    """
+    if cookiejar is None:
+        cookiejar = RequestsCookieJar()
+
+    if cookie_dict is not None:
+        names_from_jar = [cookie.name for cookie in cookiejar]
+        for name in cookie_dict:
+            if overwrite or (name not in names_from_jar):
+                cookiejar.set_cookie(create_cookie(name, cookie_dict[name]))
+
+    return cookiejar
+
+
+def merge_cookies(cookiejar, cookies):
+    """Add cookies to cookiejar and returns a merged CookieJar.
+
+    :param cookiejar: CookieJar object to add the cookies to.
+    :param cookies: Dictionary or CookieJar object to be added.
+    """
+    if not isinstance(cookiejar, cookielib.CookieJar):
+        raise ValueError('You can only merge into CookieJar')
+    
+    if isinstance(cookies, dict):
+        cookiejar = cookiejar_from_dict(
+            cookies, cookiejar=cookiejar, overwrite=False)
+    elif isinstance(cookies, cookielib.CookieJar):
+        try:
+            cookiejar.update(cookies)
+        except AttributeError:
+            for cookie_in_jar in cookies:
+                cookiejar.set_cookie(cookie_in_jar)
+
+    return cookiejar
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/exceptions.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/exceptions.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/exceptions.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/exceptions.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.exceptions
+~~~~~~~~~~~~~~~~~~~
+
+This module contains the set of Requests' exceptions.
+
+"""
+from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
+
+
+class RequestException(IOError):
+    """There was an ambiguous exception that occurred while handling your
+    request."""
+
+    def __init__(self, *args, **kwargs):
+        """
+        Initialize RequestException with `request` and `response` objects.
+        """
+        response = kwargs.pop('response', None)
+        self.response = response
+        self.request = kwargs.pop('request', None)
+        if (response is not None and not self.request and
+                hasattr(response, 'request')):
+            self.request = self.response.request
+        super(RequestException, self).__init__(*args, **kwargs)
+
+
+class HTTPError(RequestException):
+    """An HTTP error occurred."""
+
+
+class ConnectionError(RequestException):
+    """A Connection error occurred."""
+
+
+class ProxyError(ConnectionError):
+    """A proxy error occurred."""
+
+
+class SSLError(ConnectionError):
+    """An SSL error occurred."""
+
+
+class Timeout(RequestException):
+    """The request timed out.
+
+    Catching this error will catch both
+    :exc:`~requests.exceptions.ConnectTimeout` and
+    :exc:`~requests.exceptions.ReadTimeout` errors.
+    """
+
+
+class ConnectTimeout(ConnectionError, Timeout):
+    """The request timed out while trying to connect to the remote server.
+
+    Requests that produced this error are safe to retry.
+    """
+
+
+class ReadTimeout(Timeout):
+    """The server did not send any data in the allotted amount of time."""
+
+
+class URLRequired(RequestException):
+    """A valid URL is required to make a request."""
+
+
+class TooManyRedirects(RequestException):
+    """Too many redirects."""
+
+
+class MissingSchema(RequestException, ValueError):
+    """The URL schema (e.g. http or https) is missing."""
+
+
+class InvalidSchema(RequestException, ValueError):
+    """See defaults.py for valid schemas."""
+
+
+class InvalidURL(RequestException, ValueError):
+    """ The URL provided was somehow invalid. """
+
+
+class ChunkedEncodingError(RequestException):
+    """The server declared chunked encoding but sent an invalid chunk."""
+
+
+class ContentDecodingError(RequestException, BaseHTTPError):
+    """Failed to decode response content"""
+
+
+class StreamConsumedError(RequestException, TypeError):
+    """The content for this response was already consumed"""
+
+
+class RetryError(RequestException):
+    """Custom retries logic failed"""
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/hooks.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/hooks.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/hooks.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/hooks.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.hooks
+~~~~~~~~~~~~~~
+
+This module provides the capabilities for the Requests hooks system.
+
+Available hooks:
+
+``response``:
+    The response generated from a Request.
+
+"""
+
+
+HOOKS = ['response']
+
+
+def default_hooks():
+    hooks = {}
+    for event in HOOKS:
+        hooks[event] = []
+    return hooks
+
+# TODO: response is the only one
+
+
+def dispatch_hook(key, hooks, hook_data, **kwargs):
+    """Dispatches a hook dictionary on a given piece of data."""
+
+    hooks = hooks or dict()
+
+    if key in hooks:
+        hooks = hooks.get(key)
+
+        if hasattr(hooks, '__call__'):
+            hooks = [hooks]
+
+        for hook in hooks:
+            _hook_data = hook(hook_data, **kwargs)
+            if _hook_data is not None:
+                hook_data = _hook_data
+
+    return hook_data
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/__init__.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+#   __
+#  /__)  _  _     _   _ _/   _
+# / (   (- (/ (/ (- _)  /  _)
+#          /
+
+"""
+requests HTTP library
+~~~~~~~~~~~~~~~~~~~~~
+
+Requests is an HTTP library, written in Python, for human beings. Basic GET
+usage:
+
+   >>> import requests
+   >>> r = requests.get('https://www.python.org')
+   >>> r.status_code
+   200
+   >>> 'Python is a programming language' in r.content
+   True
+
+... or POST:
+
+   >>> payload = dict(key1='value1', key2='value2')
+   >>> r = requests.post('http://httpbin.org/post', data=payload)
+   >>> print(r.text)
+   {
+     ...
+     "form": {
+       "key2": "value2",
+       "key1": "value1"
+     },
+     ...
+   }
+
+The other HTTP methods are supported - see `requests.api`. Full documentation
+is at <http://python-requests.org>.
+
+:copyright: (c) 2014 by Kenneth Reitz.
+:license: Apache 2.0, see LICENSE for more details.
+
+"""
+
+__title__ = 'requests'
+__version__ = '2.5.1'
+__build__ = 0x020501
+__author__ = 'Kenneth Reitz'
+__license__ = 'Apache 2.0'
+__copyright__ = 'Copyright 2014 Kenneth Reitz'
+
+# Attempt to enable urllib3's SNI support, if possible
+try:
+    from .packages.urllib3.contrib import pyopenssl
+    pyopenssl.inject_into_urllib3()
+except ImportError:
+    pass
+
+from . import utils
+from .models import Request, Response, PreparedRequest
+from .api import request, get, head, post, patch, put, delete, options
+from .sessions import session, Session
+from .status_codes import codes
+from .exceptions import (
+    RequestException, Timeout, URLRequired,
+    TooManyRedirects, HTTPError, ConnectionError
+)
+
+# Set default logging handler to avoid "No handler found" warnings.
+import logging
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+    class NullHandler(logging.Handler):
+        def emit(self, record):
+            pass
+
+logging.getLogger(__name__).addHandler(NullHandler())
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/models.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/models.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/models.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/models.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,839 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.models
+~~~~~~~~~~~~~~~
+
+This module contains the primary objects that power Requests.
+"""
+
+import collections
+import datetime
+
+from io import BytesIO, UnsupportedOperation
+from .hooks import default_hooks
+from .structures import CaseInsensitiveDict
+
+from .auth import HTTPBasicAuth
+from .cookies import cookiejar_from_dict, get_cookie_header
+from .packages.urllib3.fields import RequestField
+from .packages.urllib3.filepost import encode_multipart_formdata
+from .packages.urllib3.util import parse_url
+from .packages.urllib3.exceptions import (
+    DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
+from .exceptions import (
+    HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
+    ContentDecodingError, ConnectionError, StreamConsumedError)
+from .utils import (
+    guess_filename, get_auth_from_url, requote_uri,
+    stream_decode_response_unicode, to_key_val_list, parse_header_links,
+    iter_slices, guess_json_utf, super_len, to_native_string)
+from .compat import (
+    cookielib, urlunparse, urlsplit, urlencode, str, bytes, StringIO,
+    is_py2, chardet, json, builtin_str, basestring)
+from .status_codes import codes
+
+#: The set of HTTP status codes that indicate an automatically
+#: processable redirect.
+REDIRECT_STATI = (
+    codes.moved,              # 301
+    codes.found,              # 302
+    codes.other,              # 303
+    codes.temporary_redirect, # 307
+    codes.permanent_redirect, # 308
+)
+DEFAULT_REDIRECT_LIMIT = 30
+CONTENT_CHUNK_SIZE = 10 * 1024
+ITER_CHUNK_SIZE = 512
+
+json_dumps = json.dumps
+
+
+class RequestEncodingMixin(object):
+    @property
+    def path_url(self):
+        """Build the path URL to use."""
+
+        url = []
+
+        p = urlsplit(self.url)
+
+        path = p.path
+        if not path:
+            path = '/'
+
+        url.append(path)
+
+        query = p.query
+        if query:
+            url.append('?')
+            url.append(query)
+
+        return ''.join(url)
+
+    @staticmethod
+    def _encode_params(data):
+        """Encode parameters in a piece of data.
+
+        Will successfully encode parameters when passed as a dict or a list of
+        2-tuples. Order is retained if data is a list of 2-tuples but arbitrary
+        if parameters are supplied as a dict.
+        """
+
+        if isinstance(data, (str, bytes)):
+            return data
+        elif hasattr(data, 'read'):
+            return data
+        elif hasattr(data, '__iter__'):
+            result = []
+            for k, vs in to_key_val_list(data):
+                if isinstance(vs, basestring) or not hasattr(vs, '__iter__'):
+                    vs = [vs]
+                for v in vs:
+                    if v is not None:
+                        result.append(
+                            (k.encode('utf-8') if isinstance(k, str) else k,
+                             v.encode('utf-8') if isinstance(v, str) else v))
+            return urlencode(result, doseq=True)
+        else:
+            return data
+
+    @staticmethod
+    def _encode_files(files, data):
+        """Build the body for a multipart/form-data request.
+
+        Will successfully encode files when passed as a dict or a list of
+        2-tuples. Order is retained if data is a list of 2-tuples but arbitrary
+        if parameters are supplied as a dict.
+
+        """
+        if (not files):
+            raise ValueError("Files must be provided.")
+        elif isinstance(data, basestring):
+            raise ValueError("Data must not be a string.")
+
+        new_fields = []
+        fields = to_key_val_list(data or {})
+        files = to_key_val_list(files or {})
+
+        for field, val in fields:
+            if isinstance(val, basestring) or not hasattr(val, '__iter__'):
+                val = [val]
+            for v in val:
+                if v is not None:
+                    # Don't call str() on bytestrings: in Py3 it all goes wrong.
+                    if not isinstance(v, bytes):
+                        v = str(v)
+
+                    new_fields.append(
+                        (field.decode('utf-8') if isinstance(field, bytes) else field,
+                         v.encode('utf-8') if isinstance(v, str) else v))
+
+        for (k, v) in files:
+            # support for explicit filename
+            ft = None
+            fh = None
+            if isinstance(v, (tuple, list)):
+                if len(v) == 2:
+                    fn, fp = v
+                elif len(v) == 3:
+                    fn, fp, ft = v
+                else:
+                    fn, fp, ft, fh = v
+            else:
+                fn = guess_filename(v) or k
+                fp = v
+            if isinstance(fp, str):
+                fp = StringIO(fp)
+            if isinstance(fp, bytes):
+                fp = BytesIO(fp)
+
+            rf = RequestField(name=k, data=fp.read(),
+                              filename=fn, headers=fh)
+            rf.make_multipart(content_type=ft)
+            new_fields.append(rf)
+
+        body, content_type = encode_multipart_formdata(new_fields)
+
+        return body, content_type
+
+
+class RequestHooksMixin(object):
+    def register_hook(self, event, hook):
+        """Properly register a hook."""
+
+        if event not in self.hooks:
+            raise ValueError('Unsupported event specified, with event name "%s"' % (event))
+
+        if isinstance(hook, collections.Callable):
+            self.hooks[event].append(hook)
+        elif hasattr(hook, '__iter__'):
+            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
+
+    def deregister_hook(self, event, hook):
+        """Deregister a previously registered hook.
+        Returns True if the hook existed, False if not.
+        """
+
+        try:
+            self.hooks[event].remove(hook)
+            return True
+        except ValueError:
+            return False
+
+
+class Request(RequestHooksMixin):
+    """A user-created :class:`Request <Request>` object.
+
+    Used to prepare a :class:`PreparedRequest <PreparedRequest>`, which is sent to the server.
+
+    :param method: HTTP method to use.
+    :param url: URL to send.
+    :param headers: dictionary of headers to send.
+    :param files: dictionary of {filename: fileobject} files to multipart upload.
+    :param data: the body to attach to the request. If a dictionary is provided, form-encoding will take place.
+    :param json: json for the body to attach to the request (if data is not specified).
+    :param params: dictionary of URL parameters to append to the URL.
+    :param auth: Auth handler or (user, pass) tuple.
+    :param cookies: dictionary or CookieJar of cookies to attach to this request.
+    :param hooks: dictionary of callback hooks, for internal usage.
+
+    Usage::
+
+      >>> import requests
+      >>> req = requests.Request('GET', 'http://httpbin.org/get')
+      >>> req.prepare()
+      <PreparedRequest [GET]>
+
+    """
+    def __init__(self,
+        method=None,
+        url=None,
+        headers=None,
+        files=None,
+        data=None,
+        params=None,
+        auth=None,
+        cookies=None,
+        hooks=None,
+        json=None):
+
+        # Default empty dicts for dict params.
+        data = [] if data is None else data
+        files = [] if files is None else files
+        headers = {} if headers is None else headers
+        params = {} if params is None else params
+        hooks = {} if hooks is None else hooks
+
+        self.hooks = default_hooks()
+        for (k, v) in list(hooks.items()):
+            self.register_hook(event=k, hook=v)
+
+        self.method = method
+        self.url = url
+        self.headers = headers
+        self.files = files
+        self.data = data
+        self.json = json
+        self.params = params
+        self.auth = auth
+        self.cookies = cookies
+
+    def __repr__(self):
+        return '<Request [%s]>' % (self.method)
+
+    def prepare(self):
+        """Constructs a :class:`PreparedRequest <PreparedRequest>` for transmission and returns it."""
+        p = PreparedRequest()
+        p.prepare(
+            method=self.method,
+            url=self.url,
+            headers=self.headers,
+            files=self.files,
+            data=self.data,
+            json=self.json,
+            params=self.params,
+            auth=self.auth,
+            cookies=self.cookies,
+            hooks=self.hooks,
+        )
+        return p
+
+
+class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
+    """The fully mutable :class:`PreparedRequest <PreparedRequest>` object,
+    containing the exact bytes that will be sent to the server.
+
+    Generated from either a :class:`Request <Request>` object or manually.
+
+    Usage::
+
+      >>> import requests
+      >>> req = requests.Request('GET', 'http://httpbin.org/get')
+      >>> r = req.prepare()
+      <PreparedRequest [GET]>
+
+      >>> s = requests.Session()
+      >>> s.send(r)
+      <Response [200]>
+
+    """
+
+    def __init__(self):
+        #: HTTP verb to send to the server.
+        self.method = None
+        #: HTTP URL to send the request to.
+        self.url = None
+        #: dictionary of HTTP headers.
+        self.headers = None
+        # The `CookieJar` used to create the Cookie header will be stored here
+        # after prepare_cookies is called
+        self._cookies = None
+        #: request body to send to the server.
+        self.body = None
+        #: dictionary of callback hooks, for internal usage.
+        self.hooks = default_hooks()
+
+    def prepare(self, method=None, url=None, headers=None, files=None,
+                data=None, params=None, auth=None, cookies=None, hooks=None,
+                json=None):
+        """Prepares the entire request with the given parameters."""
+
+        self.prepare_method(method)
+        self.prepare_url(url, params)
+        self.prepare_headers(headers)
+        self.prepare_cookies(cookies)
+        self.prepare_body(data, files, json)
+        self.prepare_auth(auth, url)
+        # Note that prepare_auth must be last to enable authentication schemes
+        # such as OAuth to work on a fully prepared request.
+
+        # This MUST go after prepare_auth. Authenticators could add a hook
+        self.prepare_hooks(hooks)
+
+    def __repr__(self):
+        return '<PreparedRequest [%s]>' % (self.method)
+
+    def copy(self):
+        p = PreparedRequest()
+        p.method = self.method
+        p.url = self.url
+        p.headers = self.headers.copy() if self.headers is not None else None
+        p._cookies = self._cookies.copy() if self._cookies is not None else None
+        p.body = self.body
+        p.hooks = self.hooks
+        return p
+
+    def prepare_method(self, method):
+        """Prepares the given HTTP method."""
+        self.method = method
+        if self.method is not None:
+            self.method = self.method.upper()
+
+    def prepare_url(self, url, params):
+        """Prepares the given HTTP URL."""
+        #: Accept objects that have string representations.
+        #: We're unable to blindy call unicode/str functions
+        #: as this will include the bytestring indicator (b'')
+        #: on python 3.x.
+        #: https://github.com/kennethreitz/requests/pull/2238
+        if isinstance(url, bytes):
+            url = url.decode('utf8')
+        else:
+            url = unicode(url) if is_py2 else str(url)
+
+        # Don't do any URL preparation for non-HTTP schemes like `mailto`,
+        # `data` etc to work around exceptions from `url_parse`, which
+        # handles RFC 3986 only.
+        if ':' in url and not url.lower().startswith('http'):
+            self.url = url
+            return
+
+        # Support for unicode domain names and paths.
+        try:
+            scheme, auth, host, port, path, query, fragment = parse_url(url)
+        except LocationParseError as e:
+            raise InvalidURL(*e.args)
+
+        if not scheme:
+            raise MissingSchema("Invalid URL {0!r}: No schema supplied. "
+                                "Perhaps you meant http://{0}?".format(url))
+
+        if not host:
+            raise InvalidURL("Invalid URL %r: No host supplied" % url)
+
+        # Only want to apply IDNA to the hostname
+        try:
+            host = host.encode('idna').decode('utf-8')
+        except UnicodeError:
+            raise InvalidURL('URL has an invalid label.')
+
+        # Carefully reconstruct the network location
+        netloc = auth or ''
+        if netloc:
+            netloc += '@'
+        netloc += host
+        if port:
+            netloc += ':' + str(port)
+
+        # Bare domains aren't valid URLs.
+        if not path:
+            path = '/'
+
+        if is_py2:
+            if isinstance(scheme, str):
+                scheme = scheme.encode('utf-8')
+            if isinstance(netloc, str):
+                netloc = netloc.encode('utf-8')
+            if isinstance(path, str):
+                path = path.encode('utf-8')
+            if isinstance(query, str):
+                query = query.encode('utf-8')
+            if isinstance(fragment, str):
+                fragment = fragment.encode('utf-8')
+
+        enc_params = self._encode_params(params)
+        if enc_params:
+            if query:
+                query = '%s&%s' % (query, enc_params)
+            else:
+                query = enc_params
+
+        url = requote_uri(urlunparse([scheme, netloc, path, None, query, fragment]))
+        self.url = url
+
+    def prepare_headers(self, headers):
+        """Prepares the given HTTP headers."""
+
+        if headers:
+            self.headers = CaseInsensitiveDict((to_native_string(name), value) for name, value in headers.items())
+        else:
+            self.headers = CaseInsensitiveDict()
+
+    def prepare_body(self, data, files, json=None):
+        """Prepares the given HTTP body data."""
+
+        # Check if file, fo, generator, iterator.
+        # If not, run through normal process.
+
+        # Nottin' on you.
+        body = None
+        content_type = None
+        length = None
+
+        if json is not None:
+            content_type = 'application/json'
+            body = json_dumps(json)
+
+        is_stream = all([
+            hasattr(data, '__iter__'),
+            not isinstance(data, (basestring, list, tuple, dict))
+        ])
+
+        try:
+            length = super_len(data)
+        except (TypeError, AttributeError, UnsupportedOperation):
+            length = None
+
+        if is_stream:
+            body = data
+
+            if files:
+                raise NotImplementedError('Streamed bodies and files are mutually exclusive.')
+
+            if length is not None:
+                self.headers['Content-Length'] = builtin_str(length)
+            else:
+                self.headers['Transfer-Encoding'] = 'chunked'
+        else:
+            # Multi-part file uploads.
+            if files:
+                (body, content_type) = self._encode_files(files, data)
+            else:
+                if data and json is None:
+                    body = self._encode_params(data)
+                    if isinstance(data, basestring) or hasattr(data, 'read'):
+                        content_type = None
+                    else:
+                        content_type = 'application/x-www-form-urlencoded'
+
+            self.prepare_content_length(body)
+
+            # Add content-type if it wasn't explicitly provided.
+            if content_type and ('content-type' not in self.headers):
+                self.headers['Content-Type'] = content_type
+
+        self.body = body
+
+    def prepare_content_length(self, body):
+        if hasattr(body, 'seek') and hasattr(body, 'tell'):
+            body.seek(0, 2)
+            self.headers['Content-Length'] = builtin_str(body.tell())
+            body.seek(0, 0)
+        elif body is not None:
+            l = super_len(body)
+            if l:
+                self.headers['Content-Length'] = builtin_str(l)
+        elif (self.method not in ('GET', 'HEAD')) and (self.headers.get('Content-Length') is None):
+            self.headers['Content-Length'] = '0'
+
+    def prepare_auth(self, auth, url=''):
+        """Prepares the given HTTP auth data."""
+
+        # If no Auth is explicitly provided, extract it from the URL first.
+        if auth is None:
+            url_auth = get_auth_from_url(self.url)
+            auth = url_auth if any(url_auth) else None
+
+        if auth:
+            if isinstance(auth, tuple) and len(auth) == 2:
+                # special-case basic HTTP auth
+                auth = HTTPBasicAuth(*auth)
+
+            # Allow auth to make its changes.
+            r = auth(self)
+
+            # Update self to reflect the auth changes.
+            self.__dict__.update(r.__dict__)
+
+            # Recompute Content-Length
+            self.prepare_content_length(self.body)
+
+    def prepare_cookies(self, cookies):
+        """Prepares the given HTTP cookie data."""
+
+        if isinstance(cookies, cookielib.CookieJar):
+            self._cookies = cookies
+        else:
+            self._cookies = cookiejar_from_dict(cookies)
+
+        cookie_header = get_cookie_header(self._cookies, self)
+        if cookie_header is not None:
+            self.headers['Cookie'] = cookie_header
+
+    def prepare_hooks(self, hooks):
+        """Prepares the given hooks."""
+        for event in hooks:
+            self.register_hook(event, hooks[event])
+
+
+class Response(object):
+    """The :class:`Response <Response>` object, which contains a
+    server's response to an HTTP request.
+    """
+
+    __attrs__ = [
+        '_content',
+        'status_code',
+        'headers',
+        'url',
+        'history',
+        'encoding',
+        'reason',
+        'cookies',
+        'elapsed',
+        'request',
+    ]
+
+    def __init__(self):
+        super(Response, self).__init__()
+
+        self._content = False
+        self._content_consumed = False
+
+        #: Integer Code of responded HTTP Status, e.g. 404 or 200.
+        self.status_code = None
+
+        #: Case-insensitive Dictionary of Response Headers.
+        #: For example, ``headers['content-encoding']`` will return the
+        #: value of a ``'Content-Encoding'`` response header.
+        self.headers = CaseInsensitiveDict()
+
+        #: File-like object representation of response (for advanced usage).
+        #: Use of ``raw`` requires that ``stream=True`` be set on the request.
+        # This requirement does not apply for use internally to Requests.
+        self.raw = None
+
+        #: Final URL location of Response.
+        self.url = None
+
+        #: Encoding to decode with when accessing r.text.
+        self.encoding = None
+
+        #: A list of :class:`Response <Response>` objects from
+        #: the history of the Request. Any redirect responses will end
+        #: up here. The list is sorted from the oldest to the most recent request.
+        self.history = []
+
+        #: Textual reason of responded HTTP Status, e.g. "Not Found" or "OK".
+        self.reason = None
+
+        #: A CookieJar of Cookies the server sent back.
+        self.cookies = cookiejar_from_dict({})
+
+        #: The amount of time elapsed between sending the request
+        #: and the arrival of the response (as a timedelta)
+        self.elapsed = datetime.timedelta(0)
+
+        #: The :class:`PreparedRequest <PreparedRequest>` object to which this
+        #: is a response.
+        self.request = None
+
+    def __getstate__(self):
+        # Consume everything; accessing the content attribute makes
+        # sure the content has been fully read.
+        if not self._content_consumed:
+            self.content
+
+        return dict(
+            (attr, getattr(self, attr, None))
+            for attr in self.__attrs__
+        )
+
+    def __setstate__(self, state):
+        for name, value in state.items():
+            setattr(self, name, value)
+
+        # pickled objects do not have .raw
+        setattr(self, '_content_consumed', True)
+        setattr(self, 'raw', None)
+
+    def __repr__(self):
+        return '<Response [%s]>' % (self.status_code)
+
+    def __bool__(self):
+        """Returns true if :attr:`status_code` is 'OK'."""
+        return self.ok
+
+    def __nonzero__(self):
+        """Returns true if :attr:`status_code` is 'OK'."""
+        return self.ok
+
+    def __iter__(self):
+        """Allows you to use a response as an iterator."""
+        return self.iter_content(128)
+
+    @property
+    def ok(self):
+        try:
+            self.raise_for_status()
+        except HTTPError:
+            return False
+        return True
+
+    @property
+    def is_redirect(self):
+        """True if this Response is a well-formed HTTP redirect that could have
+        been processed automatically (by :meth:`Session.resolve_redirects`).
+        """
+        return ('location' in self.headers and self.status_code in REDIRECT_STATI)
+
+    @property
+    def is_permanent_redirect(self):
+        """True if this Response one of the permanant versions of redirect"""
+        return ('location' in self.headers and self.status_code in (codes.moved_permanently, codes.permanent_redirect))
+
+    @property
+    def apparent_encoding(self):
+        """The apparent encoding, provided by the chardet library"""
+        return chardet.detect(self.content)['encoding']
+
+    def iter_content(self, chunk_size=1, decode_unicode=False):
+        """Iterates over the response data.  When stream=True is set on the
+        request, this avoids reading the content at once into memory for
+        large responses.  The chunk size is the number of bytes it should
+        read into memory.  This is not necessarily the length of each item
+        returned as decoding can take place.
+
+        If decode_unicode is True, content will be decoded using the best
+        available encoding based on the response.
+        """
+        def generate():
+            try:
+                # Special case for urllib3.
+                try:
+                    for chunk in self.raw.stream(chunk_size, decode_content=True):
+                        yield chunk
+                except ProtocolError as e:
+                    raise ChunkedEncodingError(e)
+                except DecodeError as e:
+                    raise ContentDecodingError(e)
+                except ReadTimeoutError as e:
+                    raise ConnectionError(e)
+            except AttributeError:
+                # Standard file-like object.
+                while True:
+                    chunk = self.raw.read(chunk_size)
+                    if not chunk:
+                        break
+                    yield chunk
+
+            self._content_consumed = True
+
+        if self._content_consumed and isinstance(self._content, bool):
+            raise StreamConsumedError()
+        # simulate reading small chunks of the content
+        reused_chunks = iter_slices(self._content, chunk_size)
+
+        stream_chunks = generate()
+
+        chunks = reused_chunks if self._content_consumed else stream_chunks
+
+        if decode_unicode:
+            chunks = stream_decode_response_unicode(chunks, self)
+
+        return chunks
+
+    def iter_lines(self, chunk_size=ITER_CHUNK_SIZE, decode_unicode=None, delimiter=None):
+        """Iterates over the response data, one line at a time.  When
+        stream=True is set on the request, this avoids reading the
+        content at once into memory for large responses.
+        """
+
+        pending = None
+
+        for chunk in self.iter_content(chunk_size=chunk_size, decode_unicode=decode_unicode):
+
+            if pending is not None:
+                chunk = pending + chunk
+
+            if delimiter:
+                lines = chunk.split(delimiter)
+            else:
+                lines = chunk.splitlines()
+
+            if lines and lines[-1] and chunk and lines[-1][-1] == chunk[-1]:
+                pending = lines.pop()
+            else:
+                pending = None
+
+            for line in lines:
+                yield line
+
+        if pending is not None:
+            yield pending
+
+    @property
+    def content(self):
+        """Content of the response, in bytes."""
+
+        if self._content is False:
+            # Read the contents.
+            try:
+                if self._content_consumed:
+                    raise RuntimeError(
+                        'The content for this response was already consumed')
+
+                if self.status_code == 0:
+                    self._content = None
+                else:
+                    self._content = bytes().join(self.iter_content(CONTENT_CHUNK_SIZE)) or bytes()
+
+            except AttributeError:
+                self._content = None
+
+        self._content_consumed = True
+        # don't need to release the connection; that's been handled by urllib3
+        # since we exhausted the data.
+        return self._content
+
+    @property
+    def text(self):
+        """Content of the response, in unicode.
+
+        If Response.encoding is None, encoding will be guessed using
+        ``chardet``.
+
+        The encoding of the response content is determined based solely on HTTP
+        headers, following RFC 2616 to the letter. If you can take advantage of
+        non-HTTP knowledge to make a better guess at the encoding, you should
+        set ``r.encoding`` appropriately before accessing this property.
+        """
+
+        # Try charset from content-type
+        content = None
+        encoding = self.encoding
+
+        if not self.content:
+            return str('')
+
+        # Fallback to auto-detected encoding.
+        if self.encoding is None:
+            encoding = self.apparent_encoding
+
+        # Decode unicode from given encoding.
+        try:
+            content = str(self.content, encoding, errors='replace')
+        except (LookupError, TypeError):
+            # A LookupError is raised if the encoding was not found which could
+            # indicate a misspelling or similar mistake.
+            #
+            # A TypeError can be raised if encoding is None
+            #
+            # So we try blindly encoding.
+            content = str(self.content, errors='replace')
+
+        return content
+
+    def json(self, **kwargs):
+        """Returns the json-encoded content of a response, if any.
+
+        :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
+        """
+
+        if not self.encoding and len(self.content) > 3:
+            # No encoding set. JSON RFC 4627 section 3 states we should expect
+            # UTF-8, -16 or -32. Detect which one to use; If the detection or
+            # decoding fails, fall back to `self.text` (using chardet to make
+            # a best guess).
+            encoding = guess_json_utf(self.content)
+            if encoding is not None:
+                try:
+                    return json.loads(self.content.decode(encoding), **kwargs)
+                except UnicodeDecodeError:
+                    # Wrong UTF codec detected; usually because it's not UTF-8
+                    # but some other 8-bit codec.  This is an RFC violation,
+                    # and the server didn't bother to tell us what codec *was*
+                    # used.
+                    pass
+        return json.loads(self.text, **kwargs)
+
+    @property
+    def links(self):
+        """Returns the parsed header links of the response, if any."""
+
+        header = self.headers.get('link')
+
+        # l = MultiDict()
+        l = {}
+
+        if header:
+            links = parse_header_links(header)
+
+            for link in links:
+                key = link.get('rel') or link.get('url')
+                l[key] = link
+
+        return l
+
+    def raise_for_status(self):
+        """Raises stored :class:`HTTPError`, if one occurred."""
+
+        http_error_msg = ''
+
+        if 400 <= self.status_code < 500:
+            http_error_msg = '%s Client Error: %s' % (self.status_code, self.reason)
+
+        elif 500 <= self.status_code < 600:
+            http_error_msg = '%s Server Error: %s' % (self.status_code, self.reason)
+
+        if http_error_msg:
+            raise HTTPError(http_error_msg, response=self)
+
+    def close(self):
+        """Releases the connection back to the pool. Once this method has been
+        called the underlying ``raw`` object must not be accessed again.
+
+        *Note: Should not normally need to be called explicitly.*
+        """
+        return self.raw.release_conn()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/big5freq.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/big5freq.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/big5freq.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/big5freq.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,925 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# Big5 frequency table
+# by Taiwan's Mandarin Promotion Council
+# <http://www.edu.tw:81/mandr/>
+#
+# 128  --> 0.42261
+# 256  --> 0.57851
+# 512  --> 0.74851
+# 1024 --> 0.89384
+# 2048 --> 0.97583
+#
+# Ideal Distribution Ratio = 0.74851/(1-0.74851) =2.98
+# Random Distribution Ration = 512/(5401-512)=0.105
+#
+# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
+
+BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
+
+#Char to FreqOrder table
+BIG5_TABLE_SIZE = 5376
+
+Big5CharToFreqOrder = (
+   1,1801,1506, 255,1431, 198,   9,  82,   6,5008, 177, 202,3681,1256,2821, 110, #   16
+3814,  33,3274, 261,  76,  44,2114,  16,2946,2187,1176, 659,3971,  26,3451,2653, #   32
+1198,3972,3350,4202, 410,2215, 302, 590, 361,1964,   8, 204,  58,4510,5009,1932, #   48
+  63,5010,5011, 317,1614,  75, 222, 159,4203,2417,1480,5012,3555,3091, 224,2822, #   64
+3682,   3,  10,3973,1471,  29,2787,1135,2866,1940, 873, 130,3275,1123, 312,5013, #   80
+4511,2052, 507, 252, 682,5014, 142,1915, 124, 206,2947,  34,3556,3204,  64, 604, #   96
+5015,2501,1977,1978, 155,1991, 645, 641,1606,5016,3452, 337,  72, 406,5017,  80, #  112
+ 630, 238,3205,1509, 263, 939,1092,2654, 756,1440,1094,3453, 449,  69,2987, 591, #  128
+ 179,2096, 471, 115,2035,1844,  60,  50,2988, 134, 806,1869, 734,2036,3454, 180, #  144
+ 995,1607, 156, 537,2907, 688,5018, 319,1305, 779,2145, 514,2379, 298,4512, 359, #  160
+2502,  90,2716,1338, 663,  11, 906,1099,2553,  20,2441, 182, 532,1716,5019, 732, #  176
+1376,4204,1311,1420,3206,  25,2317,1056, 113, 399, 382,1950, 242,3455,2474, 529, #  192
+3276, 475,1447,3683,5020, 117,  21, 656, 810,1297,2300,2334,3557,5021, 126,4205, #  208
+ 706, 456, 150, 613,4513,  71,1118,2037,4206, 145,3092,  85, 835, 486,2115,1246, #  224
+1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,5022,2128,2359, 347,3815, 221, #  240
+3558,3135,5023,1956,1153,4207,  83, 296,1199,3093, 192, 624,  93,5024, 822,1898, #  256
+2823,3136, 795,2065, 991,1554,1542,1592,  27,  43,2867, 859, 139,1456, 860,4514, #  272
+ 437, 712,3974, 164,2397,3137, 695, 211,3037,2097, 195,3975,1608,3559,3560,3684, #  288
+3976, 234, 811,2989,2098,3977,2233,1441,3561,1615,2380, 668,2077,1638, 305, 228, #  304
+1664,4515, 467, 415,5025, 262,2099,1593, 239, 108, 300, 200,1033, 512,1247,2078, #  320
+5026,5027,2176,3207,3685,2682, 593, 845,1062,3277,  88,1723,2038,3978,1951, 212, #  336
+ 266, 152, 149, 468,1899,4208,4516,  77, 187,5028,3038,  37,   5,2990,5029,3979, #  352
+5030,5031,  39,2524,4517,2908,3208,2079,  55, 148,  74,4518, 545, 483,1474,1029, #  368
+1665, 217,1870,1531,3138,1104,2655,4209,  24, 172,3562, 900,3980,3563,3564,4519, #  384
+  32,1408,2824,1312, 329, 487,2360,2251,2717, 784,2683,   4,3039,3351,1427,1789, #  400
+ 188, 109, 499,5032,3686,1717,1790, 888,1217,3040,4520,5033,3565,5034,3352,1520, #  416
+3687,3981, 196,1034, 775,5035,5036, 929,1816, 249, 439,  38,5037,1063,5038, 794, #  432
+3982,1435,2301,  46, 178,3278,2066,5039,2381,5040, 214,1709,4521, 804,  35, 707, #  448
+ 324,3688,1601,2554, 140, 459,4210,5041,5042,1365, 839, 272, 978,2262,2580,3456, #  464
+2129,1363,3689,1423, 697, 100,3094,  48,  70,1231, 495,3139,2196,5043,1294,5044, #  480
+2080, 462, 586,1042,3279, 853, 256, 988, 185,2382,3457,1698, 434,1084,5045,3458, #  496
+ 314,2625,2788,4522,2335,2336, 569,2285, 637,1817,2525, 757,1162,1879,1616,3459, #  512
+ 287,1577,2116, 768,4523,1671,2868,3566,2526,1321,3816, 909,2418,5046,4211, 933, #  528
+3817,4212,2053,2361,1222,4524, 765,2419,1322, 786,4525,5047,1920,1462,1677,2909, #  544
+1699,5048,4526,1424,2442,3140,3690,2600,3353,1775,1941,3460,3983,4213, 309,1369, #  560
+1130,2825, 364,2234,1653,1299,3984,3567,3985,3986,2656, 525,1085,3041, 902,2001, #  576
+1475, 964,4527, 421,1845,1415,1057,2286, 940,1364,3141, 376,4528,4529,1381,   7, #  592
+2527, 983,2383, 336,1710,2684,1846, 321,3461, 559,1131,3042,2752,1809,1132,1313, #  608
+ 265,1481,1858,5049, 352,1203,2826,3280, 167,1089, 420,2827, 776, 792,1724,3568, #  624
+4214,2443,3281,5050,4215,5051, 446, 229, 333,2753, 901,3818,1200,1557,4530,2657, #  640
+1921, 395,2754,2685,3819,4216,1836, 125, 916,3209,2626,4531,5052,5053,3820,5054, #  656
+5055,5056,4532,3142,3691,1133,2555,1757,3462,1510,2318,1409,3569,5057,2146, 438, #  672
+2601,2910,2384,3354,1068, 958,3043, 461, 311,2869,2686,4217,1916,3210,4218,1979, #  688
+ 383, 750,2755,2627,4219, 274, 539, 385,1278,1442,5058,1154,1965, 384, 561, 210, #  704
+  98,1295,2556,3570,5059,1711,2420,1482,3463,3987,2911,1257, 129,5060,3821, 642, #  720
+ 523,2789,2790,2658,5061, 141,2235,1333,  68, 176, 441, 876, 907,4220, 603,2602, #  736
+ 710, 171,3464, 404, 549,  18,3143,2398,1410,3692,1666,5062,3571,4533,2912,4534, #  752
+5063,2991, 368,5064, 146, 366,  99, 871,3693,1543, 748, 807,1586,1185,  22,2263, #  768
+ 379,3822,3211,5065,3212, 505,1942,2628,1992,1382,2319,5066, 380,2362, 218, 702, #  784
+1818,1248,3465,3044,3572,3355,3282,5067,2992,3694, 930,3283,3823,5068,  59,5069, #  800
+ 585, 601,4221, 497,3466,1112,1314,4535,1802,5070,1223,1472,2177,5071, 749,1837, #  816
+ 690,1900,3824,1773,3988,1476, 429,1043,1791,2236,2117, 917,4222, 447,1086,1629, #  832
+5072, 556,5073,5074,2021,1654, 844,1090, 105, 550, 966,1758,2828,1008,1783, 686, #  848
+1095,5075,2287, 793,1602,5076,3573,2603,4536,4223,2948,2302,4537,3825, 980,2503, #  864
+ 544, 353, 527,4538, 908,2687,2913,5077, 381,2629,1943,1348,5078,1341,1252, 560, #  880
+3095,5079,3467,2870,5080,2054, 973, 886,2081, 143,4539,5081,5082, 157,3989, 496, #  896
+4224,  57, 840, 540,2039,4540,4541,3468,2118,1445, 970,2264,1748,1966,2082,4225, #  912
+3144,1234,1776,3284,2829,3695, 773,1206,2130,1066,2040,1326,3990,1738,1725,4226, #  928
+ 279,3145,  51,1544,2604, 423,1578,2131,2067, 173,4542,1880,5083,5084,1583, 264, #  944
+ 610,3696,4543,2444, 280, 154,5085,5086,5087,1739, 338,1282,3096, 693,2871,1411, #  960
+1074,3826,2445,5088,4544,5089,5090,1240, 952,2399,5091,2914,1538,2688, 685,1483, #  976
+4227,2475,1436, 953,4228,2055,4545, 671,2400,  79,4229,2446,3285, 608, 567,2689, #  992
+3469,4230,4231,1691, 393,1261,1792,2401,5092,4546,5093,5094,5095,5096,1383,1672, # 1008
+3827,3213,1464, 522,1119, 661,1150, 216, 675,4547,3991,1432,3574, 609,4548,2690, # 1024
+2402,5097,5098,5099,4232,3045,   0,5100,2476, 315, 231,2447, 301,3356,4549,2385, # 1040
+5101, 233,4233,3697,1819,4550,4551,5102,  96,1777,1315,2083,5103, 257,5104,1810, # 1056
+3698,2718,1139,1820,4234,2022,1124,2164,2791,1778,2659,5105,3097, 363,1655,3214, # 1072
+5106,2993,5107,5108,5109,3992,1567,3993, 718, 103,3215, 849,1443, 341,3357,2949, # 1088
+1484,5110,1712, 127,  67, 339,4235,2403, 679,1412, 821,5111,5112, 834, 738, 351, # 1104
+2994,2147, 846, 235,1497,1881, 418,1993,3828,2719, 186,1100,2148,2756,3575,1545, # 1120
+1355,2950,2872,1377, 583,3994,4236,2581,2995,5113,1298,3699,1078,2557,3700,2363, # 1136
+  78,3829,3830, 267,1289,2100,2002,1594,4237, 348, 369,1274,2197,2178,1838,4552, # 1152
+1821,2830,3701,2757,2288,2003,4553,2951,2758, 144,3358, 882,4554,3995,2759,3470, # 1168
+4555,2915,5114,4238,1726, 320,5115,3996,3046, 788,2996,5116,2831,1774,1327,2873, # 1184
+3997,2832,5117,1306,4556,2004,1700,3831,3576,2364,2660, 787,2023, 506, 824,3702, # 1200
+ 534, 323,4557,1044,3359,2024,1901, 946,3471,5118,1779,1500,1678,5119,1882,4558, # 1216
+ 165, 243,4559,3703,2528, 123, 683,4239, 764,4560,  36,3998,1793, 589,2916, 816, # 1232
+ 626,1667,3047,2237,1639,1555,1622,3832,3999,5120,4000,2874,1370,1228,1933, 891, # 1248
+2084,2917, 304,4240,5121, 292,2997,2720,3577, 691,2101,4241,1115,4561, 118, 662, # 1264
+5122, 611,1156, 854,2386,1316,2875,   2, 386, 515,2918,5123,5124,3286, 868,2238, # 1280
+1486, 855,2661, 785,2216,3048,5125,1040,3216,3578,5126,3146, 448,5127,1525,5128, # 1296
+2165,4562,5129,3833,5130,4242,2833,3579,3147, 503, 818,4001,3148,1568, 814, 676, # 1312
+1444, 306,1749,5131,3834,1416,1030, 197,1428, 805,2834,1501,4563,5132,5133,5134, # 1328
+1994,5135,4564,5136,5137,2198,  13,2792,3704,2998,3149,1229,1917,5138,3835,2132, # 1344
+5139,4243,4565,2404,3580,5140,2217,1511,1727,1120,5141,5142, 646,3836,2448, 307, # 1360
+5143,5144,1595,3217,5145,5146,5147,3705,1113,1356,4002,1465,2529,2530,5148, 519, # 1376
+5149, 128,2133,  92,2289,1980,5150,4003,1512, 342,3150,2199,5151,2793,2218,1981, # 1392
+3360,4244, 290,1656,1317, 789, 827,2365,5152,3837,4566, 562, 581,4004,5153, 401, # 1408
+4567,2252,  94,4568,5154,1399,2794,5155,1463,2025,4569,3218,1944,5156, 828,1105, # 1424
+4245,1262,1394,5157,4246, 605,4570,5158,1784,2876,5159,2835, 819,2102, 578,2200, # 1440
+2952,5160,1502, 436,3287,4247,3288,2836,4005,2919,3472,3473,5161,2721,2320,5162, # 1456
+5163,2337,2068,  23,4571, 193, 826,3838,2103, 699,1630,4248,3098, 390,1794,1064, # 1472
+3581,5164,1579,3099,3100,1400,5165,4249,1839,1640,2877,5166,4572,4573, 137,4250, # 1488
+ 598,3101,1967, 780, 104, 974,2953,5167, 278, 899, 253, 402, 572, 504, 493,1339, # 1504
+5168,4006,1275,4574,2582,2558,5169,3706,3049,3102,2253, 565,1334,2722, 863,  41, # 1520
+5170,5171,4575,5172,1657,2338,  19, 463,2760,4251, 606,5173,2999,3289,1087,2085, # 1536
+1323,2662,3000,5174,1631,1623,1750,4252,2691,5175,2878, 791,2723,2663,2339, 232, # 1552
+2421,5176,3001,1498,5177,2664,2630, 755,1366,3707,3290,3151,2026,1609, 119,1918, # 1568
+3474, 862,1026,4253,5178,4007,3839,4576,4008,4577,2265,1952,2477,5179,1125, 817, # 1584
+4254,4255,4009,1513,1766,2041,1487,4256,3050,3291,2837,3840,3152,5180,5181,1507, # 1600
+5182,2692, 733,  40,1632,1106,2879, 345,4257, 841,2531, 230,4578,3002,1847,3292, # 1616
+3475,5183,1263, 986,3476,5184, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562, # 1632
+4010,4011,2954, 967,2761,2665,1349, 592,2134,1692,3361,3003,1995,4258,1679,4012, # 1648
+1902,2188,5185, 739,3708,2724,1296,1290,5186,4259,2201,2202,1922,1563,2605,2559, # 1664
+1871,2762,3004,5187, 435,5188, 343,1108, 596,  17,1751,4579,2239,3477,3709,5189, # 1680
+4580, 294,3582,2955,1693, 477, 979, 281,2042,3583, 643,2043,3710,2631,2795,2266, # 1696
+1031,2340,2135,2303,3584,4581, 367,1249,2560,5190,3585,5191,4582,1283,3362,2005, # 1712
+ 240,1762,3363,4583,4584, 836,1069,3153, 474,5192,2149,2532, 268,3586,5193,3219, # 1728
+1521,1284,5194,1658,1546,4260,5195,3587,3588,5196,4261,3364,2693,1685,4262, 961, # 1744
+1673,2632, 190,2006,2203,3841,4585,4586,5197, 570,2504,3711,1490,5198,4587,2633, # 1760
+3293,1957,4588, 584,1514, 396,1045,1945,5199,4589,1968,2449,5200,5201,4590,4013, # 1776
+ 619,5202,3154,3294, 215,2007,2796,2561,3220,4591,3221,4592, 763,4263,3842,4593, # 1792
+5203,5204,1958,1767,2956,3365,3712,1174, 452,1477,4594,3366,3155,5205,2838,1253, # 1808
+2387,2189,1091,2290,4264, 492,5206, 638,1169,1825,2136,1752,4014, 648, 926,1021, # 1824
+1324,4595, 520,4596, 997, 847,1007, 892,4597,3843,2267,1872,3713,2405,1785,4598, # 1840
+1953,2957,3103,3222,1728,4265,2044,3714,4599,2008,1701,3156,1551,  30,2268,4266, # 1856
+5207,2027,4600,3589,5208, 501,5209,4267, 594,3478,2166,1822,3590,3479,3591,3223, # 1872
+ 829,2839,4268,5210,1680,3157,1225,4269,5211,3295,4601,4270,3158,2341,5212,4602, # 1888
+4271,5213,4015,4016,5214,1848,2388,2606,3367,5215,4603, 374,4017, 652,4272,4273, # 1904
+ 375,1140, 798,5216,5217,5218,2366,4604,2269, 546,1659, 138,3051,2450,4605,5219, # 1920
+2254, 612,1849, 910, 796,3844,1740,1371, 825,3845,3846,5220,2920,2562,5221, 692, # 1936
+ 444,3052,2634, 801,4606,4274,5222,1491, 244,1053,3053,4275,4276, 340,5223,4018, # 1952
+1041,3005, 293,1168,  87,1357,5224,1539, 959,5225,2240, 721, 694,4277,3847, 219, # 1968
+1478, 644,1417,3368,2666,1413,1401,1335,1389,4019,5226,5227,3006,2367,3159,1826, # 1984
+ 730,1515, 184,2840,  66,4607,5228,1660,2958, 246,3369, 378,1457, 226,3480, 975, # 2000
+4020,2959,1264,3592, 674, 696,5229, 163,5230,1141,2422,2167, 713,3593,3370,4608, # 2016
+4021,5231,5232,1186,  15,5233,1079,1070,5234,1522,3224,3594, 276,1050,2725, 758, # 2032
+1126, 653,2960,3296,5235,2342, 889,3595,4022,3104,3007, 903,1250,4609,4023,3481, # 2048
+3596,1342,1681,1718, 766,3297, 286,  89,2961,3715,5236,1713,5237,2607,3371,3008, # 2064
+5238,2962,2219,3225,2880,5239,4610,2505,2533, 181, 387,1075,4024, 731,2190,3372, # 2080
+5240,3298, 310, 313,3482,2304, 770,4278,  54,3054, 189,4611,3105,3848,4025,5241, # 2096
+1230,1617,1850, 355,3597,4279,4612,3373, 111,4280,3716,1350,3160,3483,3055,4281, # 2112
+2150,3299,3598,5242,2797,4026,4027,3009, 722,2009,5243,1071, 247,1207,2343,2478, # 2128
+1378,4613,2010, 864,1437,1214,4614, 373,3849,1142,2220, 667,4615, 442,2763,2563, # 2144
+3850,4028,1969,4282,3300,1840, 837, 170,1107, 934,1336,1883,5244,5245,2119,4283, # 2160
+2841, 743,1569,5246,4616,4284, 582,2389,1418,3484,5247,1803,5248, 357,1395,1729, # 2176
+3717,3301,2423,1564,2241,5249,3106,3851,1633,4617,1114,2086,4285,1532,5250, 482, # 2192
+2451,4618,5251,5252,1492, 833,1466,5253,2726,3599,1641,2842,5254,1526,1272,3718, # 2208
+4286,1686,1795, 416,2564,1903,1954,1804,5255,3852,2798,3853,1159,2321,5256,2881, # 2224
+4619,1610,1584,3056,2424,2764, 443,3302,1163,3161,5257,5258,4029,5259,4287,2506, # 2240
+3057,4620,4030,3162,2104,1647,3600,2011,1873,4288,5260,4289, 431,3485,5261, 250, # 2256
+  97,  81,4290,5262,1648,1851,1558, 160, 848,5263, 866, 740,1694,5264,2204,2843, # 2272
+3226,4291,4621,3719,1687, 950,2479, 426, 469,3227,3720,3721,4031,5265,5266,1188, # 2288
+ 424,1996, 861,3601,4292,3854,2205,2694, 168,1235,3602,4293,5267,2087,1674,4622, # 2304
+3374,3303, 220,2565,1009,5268,3855, 670,3010, 332,1208, 717,5269,5270,3603,2452, # 2320
+4032,3375,5271, 513,5272,1209,2882,3376,3163,4623,1080,5273,5274,5275,5276,2534, # 2336
+3722,3604, 815,1587,4033,4034,5277,3605,3486,3856,1254,4624,1328,3058,1390,4035, # 2352
+1741,4036,3857,4037,5278, 236,3858,2453,3304,5279,5280,3723,3859,1273,3860,4625, # 2368
+5281, 308,5282,4626, 245,4627,1852,2480,1307,2583, 430, 715,2137,2454,5283, 270, # 2384
+ 199,2883,4038,5284,3606,2727,1753, 761,1754, 725,1661,1841,4628,3487,3724,5285, # 2400
+5286, 587,  14,3305, 227,2608, 326, 480,2270, 943,2765,3607, 291, 650,1884,5287, # 2416
+1702,1226, 102,1547,  62,3488, 904,4629,3489,1164,4294,5288,5289,1224,1548,2766, # 2432
+ 391, 498,1493,5290,1386,1419,5291,2056,1177,4630, 813, 880,1081,2368, 566,1145, # 2448
+4631,2291,1001,1035,2566,2609,2242, 394,1286,5292,5293,2069,5294,  86,1494,1730, # 2464
+4039, 491,1588, 745, 897,2963, 843,3377,4040,2767,2884,3306,1768, 998,2221,2070, # 2480
+ 397,1827,1195,1970,3725,3011,3378, 284,5295,3861,2507,2138,2120,1904,5296,4041, # 2496
+2151,4042,4295,1036,3490,1905, 114,2567,4296, 209,1527,5297,5298,2964,2844,2635, # 2512
+2390,2728,3164, 812,2568,5299,3307,5300,1559, 737,1885,3726,1210, 885,  28,2695, # 2528
+3608,3862,5301,4297,1004,1780,4632,5302, 346,1982,2222,2696,4633,3863,1742, 797, # 2544
+1642,4043,1934,1072,1384,2152, 896,4044,3308,3727,3228,2885,3609,5303,2569,1959, # 2560
+4634,2455,1786,5304,5305,5306,4045,4298,1005,1308,3728,4299,2729,4635,4636,1528, # 2576
+2610, 161,1178,4300,1983, 987,4637,1101,4301, 631,4046,1157,3229,2425,1343,1241, # 2592
+1016,2243,2570, 372, 877,2344,2508,1160, 555,1935, 911,4047,5307, 466,1170, 169, # 2608
+1051,2921,2697,3729,2481,3012,1182,2012,2571,1251,2636,5308, 992,2345,3491,1540, # 2624
+2730,1201,2071,2406,1997,2482,5309,4638, 528,1923,2191,1503,1874,1570,2369,3379, # 2640
+3309,5310, 557,1073,5311,1828,3492,2088,2271,3165,3059,3107, 767,3108,2799,4639, # 2656
+1006,4302,4640,2346,1267,2179,3730,3230, 778,4048,3231,2731,1597,2667,5312,4641, # 2672
+5313,3493,5314,5315,5316,3310,2698,1433,3311, 131,  95,1504,4049, 723,4303,3166, # 2688
+1842,3610,2768,2192,4050,2028,2105,3731,5317,3013,4051,1218,5318,3380,3232,4052, # 2704
+4304,2584, 248,1634,3864, 912,5319,2845,3732,3060,3865, 654,  53,5320,3014,5321, # 2720
+1688,4642, 777,3494,1032,4053,1425,5322, 191, 820,2121,2846, 971,4643, 931,3233, # 2736
+ 135, 664, 783,3866,1998, 772,2922,1936,4054,3867,4644,2923,3234, 282,2732, 640, # 2752
+1372,3495,1127, 922, 325,3381,5323,5324, 711,2045,5325,5326,4055,2223,2800,1937, # 2768
+4056,3382,2224,2255,3868,2305,5327,4645,3869,1258,3312,4057,3235,2139,2965,4058, # 2784
+4059,5328,2225, 258,3236,4646, 101,1227,5329,3313,1755,5330,1391,3314,5331,2924, # 2800
+2057, 893,5332,5333,5334,1402,4305,2347,5335,5336,3237,3611,5337,5338, 878,1325, # 2816
+1781,2801,4647, 259,1385,2585, 744,1183,2272,4648,5339,4060,2509,5340, 684,1024, # 2832
+4306,5341, 472,3612,3496,1165,3315,4061,4062, 322,2153, 881, 455,1695,1152,1340, # 2848
+ 660, 554,2154,4649,1058,4650,4307, 830,1065,3383,4063,4651,1924,5342,1703,1919, # 2864
+5343, 932,2273, 122,5344,4652, 947, 677,5345,3870,2637, 297,1906,1925,2274,4653, # 2880
+2322,3316,5346,5347,4308,5348,4309,  84,4310, 112, 989,5349, 547,1059,4064, 701, # 2896
+3613,1019,5350,4311,5351,3497, 942, 639, 457,2306,2456, 993,2966, 407, 851, 494, # 2912
+4654,3384, 927,5352,1237,5353,2426,3385, 573,4312, 680, 921,2925,1279,1875, 285, # 2928
+ 790,1448,1984, 719,2168,5354,5355,4655,4065,4066,1649,5356,1541, 563,5357,1077, # 2944
+5358,3386,3061,3498, 511,3015,4067,4068,3733,4069,1268,2572,3387,3238,4656,4657, # 2960
+5359, 535,1048,1276,1189,2926,2029,3167,1438,1373,2847,2967,1134,2013,5360,4313, # 2976
+1238,2586,3109,1259,5361, 700,5362,2968,3168,3734,4314,5363,4315,1146,1876,1907, # 2992
+4658,2611,4070, 781,2427, 132,1589, 203, 147, 273,2802,2407, 898,1787,2155,4071, # 3008
+4072,5364,3871,2803,5365,5366,4659,4660,5367,3239,5368,1635,3872, 965,5369,1805, # 3024
+2699,1516,3614,1121,1082,1329,3317,4073,1449,3873,  65,1128,2848,2927,2769,1590, # 3040
+3874,5370,5371,  12,2668,  45, 976,2587,3169,4661, 517,2535,1013,1037,3240,5372, # 3056
+3875,2849,5373,3876,5374,3499,5375,2612, 614,1999,2323,3877,3110,2733,2638,5376, # 3072
+2588,4316, 599,1269,5377,1811,3735,5378,2700,3111, 759,1060, 489,1806,3388,3318, # 3088
+1358,5379,5380,2391,1387,1215,2639,2256, 490,5381,5382,4317,1759,2392,2348,5383, # 3104
+4662,3878,1908,4074,2640,1807,3241,4663,3500,3319,2770,2349, 874,5384,5385,3501, # 3120
+3736,1859,  91,2928,3737,3062,3879,4664,5386,3170,4075,2669,5387,3502,1202,1403, # 3136
+3880,2969,2536,1517,2510,4665,3503,2511,5388,4666,5389,2701,1886,1495,1731,4076, # 3152
+2370,4667,5390,2030,5391,5392,4077,2702,1216, 237,2589,4318,2324,4078,3881,4668, # 3168
+4669,2703,3615,3504, 445,4670,5393,5394,5395,5396,2771,  61,4079,3738,1823,4080, # 3184
+5397, 687,2046, 935, 925, 405,2670, 703,1096,1860,2734,4671,4081,1877,1367,2704, # 3200
+3389, 918,2106,1782,2483, 334,3320,1611,1093,4672, 564,3171,3505,3739,3390, 945, # 3216
+2641,2058,4673,5398,1926, 872,4319,5399,3506,2705,3112, 349,4320,3740,4082,4674, # 3232
+3882,4321,3741,2156,4083,4675,4676,4322,4677,2408,2047, 782,4084, 400, 251,4323, # 3248
+1624,5400,5401, 277,3742, 299,1265, 476,1191,3883,2122,4324,4325,1109, 205,5402, # 3264
+2590,1000,2157,3616,1861,5403,5404,5405,4678,5406,4679,2573, 107,2484,2158,4085, # 3280
+3507,3172,5407,1533, 541,1301, 158, 753,4326,2886,3617,5408,1696, 370,1088,4327, # 3296
+4680,3618, 579, 327, 440, 162,2244, 269,1938,1374,3508, 968,3063,  56,1396,3113, # 3312
+2107,3321,3391,5409,1927,2159,4681,3016,5410,3619,5411,5412,3743,4682,2485,5413, # 3328
+2804,5414,1650,4683,5415,2613,5416,5417,4086,2671,3392,1149,3393,4087,3884,4088, # 3344
+5418,1076,  49,5419, 951,3242,3322,3323, 450,2850, 920,5420,1812,2805,2371,4328, # 3360
+1909,1138,2372,3885,3509,5421,3243,4684,1910,1147,1518,2428,4685,3886,5422,4686, # 3376
+2393,2614, 260,1796,3244,5423,5424,3887,3324, 708,5425,3620,1704,5426,3621,1351, # 3392
+1618,3394,3017,1887, 944,4329,3395,4330,3064,3396,4331,5427,3744, 422, 413,1714, # 3408
+3325, 500,2059,2350,4332,2486,5428,1344,1911, 954,5429,1668,5430,5431,4089,2409, # 3424
+4333,3622,3888,4334,5432,2307,1318,2512,3114, 133,3115,2887,4687, 629,  31,2851, # 3440
+2706,3889,4688, 850, 949,4689,4090,2970,1732,2089,4335,1496,1853,5433,4091, 620, # 3456
+3245, 981,1242,3745,3397,1619,3746,1643,3326,2140,2457,1971,1719,3510,2169,5434, # 3472
+3246,5435,5436,3398,1829,5437,1277,4690,1565,2048,5438,1636,3623,3116,5439, 869, # 3488
+2852, 655,3890,3891,3117,4092,3018,3892,1310,3624,4691,5440,5441,5442,1733, 558, # 3504
+4692,3747, 335,1549,3065,1756,4336,3748,1946,3511,1830,1291,1192, 470,2735,2108, # 3520
+2806, 913,1054,4093,5443,1027,5444,3066,4094,4693, 982,2672,3399,3173,3512,3247, # 3536
+3248,1947,2807,5445, 571,4694,5446,1831,5447,3625,2591,1523,2429,5448,2090, 984, # 3552
+4695,3749,1960,5449,3750, 852, 923,2808,3513,3751, 969,1519, 999,2049,2325,1705, # 3568
+5450,3118, 615,1662, 151, 597,4095,2410,2326,1049, 275,4696,3752,4337, 568,3753, # 3584
+3626,2487,4338,3754,5451,2430,2275, 409,3249,5452,1566,2888,3514,1002, 769,2853, # 3600
+ 194,2091,3174,3755,2226,3327,4339, 628,1505,5453,5454,1763,2180,3019,4096, 521, # 3616
+1161,2592,1788,2206,2411,4697,4097,1625,4340,4341, 412,  42,3119, 464,5455,2642, # 3632
+4698,3400,1760,1571,2889,3515,2537,1219,2207,3893,2643,2141,2373,4699,4700,3328, # 3648
+1651,3401,3627,5456,5457,3628,2488,3516,5458,3756,5459,5460,2276,2092, 460,5461, # 3664
+4701,5462,3020, 962, 588,3629, 289,3250,2644,1116,  52,5463,3067,1797,5464,5465, # 3680
+5466,1467,5467,1598,1143,3757,4342,1985,1734,1067,4702,1280,3402, 465,4703,1572, # 3696
+ 510,5468,1928,2245,1813,1644,3630,5469,4704,3758,5470,5471,2673,1573,1534,5472, # 3712
+5473, 536,1808,1761,3517,3894,3175,2645,5474,5475,5476,4705,3518,2929,1912,2809, # 3728
+5477,3329,1122, 377,3251,5478, 360,5479,5480,4343,1529, 551,5481,2060,3759,1769, # 3744
+2431,5482,2930,4344,3330,3120,2327,2109,2031,4706,1404, 136,1468,1479, 672,1171, # 3760
+3252,2308, 271,3176,5483,2772,5484,2050, 678,2736, 865,1948,4707,5485,2014,4098, # 3776
+2971,5486,2737,2227,1397,3068,3760,4708,4709,1735,2931,3403,3631,5487,3895, 509, # 3792
+2854,2458,2890,3896,5488,5489,3177,3178,4710,4345,2538,4711,2309,1166,1010, 552, # 3808
+ 681,1888,5490,5491,2972,2973,4099,1287,1596,1862,3179, 358, 453, 736, 175, 478, # 3824
+1117, 905,1167,1097,5492,1854,1530,5493,1706,5494,2181,3519,2292,3761,3520,3632, # 3840
+4346,2093,4347,5495,3404,1193,2489,4348,1458,2193,2208,1863,1889,1421,3331,2932, # 3856
+3069,2182,3521, 595,2123,5496,4100,5497,5498,4349,1707,2646, 223,3762,1359, 751, # 3872
+3121, 183,3522,5499,2810,3021, 419,2374, 633, 704,3897,2394, 241,5500,5501,5502, # 3888
+ 838,3022,3763,2277,2773,2459,3898,1939,2051,4101,1309,3122,2246,1181,5503,1136, # 3904
+2209,3899,2375,1446,4350,2310,4712,5504,5505,4351,1055,2615, 484,3764,5506,4102, # 3920
+ 625,4352,2278,3405,1499,4353,4103,5507,4104,4354,3253,2279,2280,3523,5508,5509, # 3936
+2774, 808,2616,3765,3406,4105,4355,3123,2539, 526,3407,3900,4356, 955,5510,1620, # 3952
+4357,2647,2432,5511,1429,3766,1669,1832, 994, 928,5512,3633,1260,5513,5514,5515, # 3968
+1949,2293, 741,2933,1626,4358,2738,2460, 867,1184, 362,3408,1392,5516,5517,4106, # 3984
+4359,1770,1736,3254,2934,4713,4714,1929,2707,1459,1158,5518,3070,3409,2891,1292, # 4000
+1930,2513,2855,3767,1986,1187,2072,2015,2617,4360,5519,2574,2514,2170,3768,2490, # 4016
+3332,5520,3769,4715,5521,5522, 666,1003,3023,1022,3634,4361,5523,4716,1814,2257, # 4032
+ 574,3901,1603, 295,1535, 705,3902,4362, 283, 858, 417,5524,5525,3255,4717,4718, # 4048
+3071,1220,1890,1046,2281,2461,4107,1393,1599, 689,2575, 388,4363,5526,2491, 802, # 4064
+5527,2811,3903,2061,1405,2258,5528,4719,3904,2110,1052,1345,3256,1585,5529, 809, # 4080
+5530,5531,5532, 575,2739,3524, 956,1552,1469,1144,2328,5533,2329,1560,2462,3635, # 4096
+3257,4108, 616,2210,4364,3180,2183,2294,5534,1833,5535,3525,4720,5536,1319,3770, # 4112
+3771,1211,3636,1023,3258,1293,2812,5537,5538,5539,3905, 607,2311,3906, 762,2892, # 4128
+1439,4365,1360,4721,1485,3072,5540,4722,1038,4366,1450,2062,2648,4367,1379,4723, # 4144
+2593,5541,5542,4368,1352,1414,2330,2935,1172,5543,5544,3907,3908,4724,1798,1451, # 4160
+5545,5546,5547,5548,2936,4109,4110,2492,2351, 411,4111,4112,3637,3333,3124,4725, # 4176
+1561,2674,1452,4113,1375,5549,5550,  47,2974, 316,5551,1406,1591,2937,3181,5552, # 4192
+1025,2142,3125,3182, 354,2740, 884,2228,4369,2412, 508,3772, 726,3638, 996,2433, # 4208
+3639, 729,5553, 392,2194,1453,4114,4726,3773,5554,5555,2463,3640,2618,1675,2813, # 4224
+ 919,2352,2975,2353,1270,4727,4115,  73,5556,5557, 647,5558,3259,2856,2259,1550, # 4240
+1346,3024,5559,1332, 883,3526,5560,5561,5562,5563,3334,2775,5564,1212, 831,1347, # 4256
+4370,4728,2331,3909,1864,3073, 720,3910,4729,4730,3911,5565,4371,5566,5567,4731, # 4272
+5568,5569,1799,4732,3774,2619,4733,3641,1645,2376,4734,5570,2938, 669,2211,2675, # 4288
+2434,5571,2893,5572,5573,1028,3260,5574,4372,2413,5575,2260,1353,5576,5577,4735, # 4304
+3183, 518,5578,4116,5579,4373,1961,5580,2143,4374,5581,5582,3025,2354,2355,3912, # 4320
+ 516,1834,1454,4117,2708,4375,4736,2229,2620,1972,1129,3642,5583,2776,5584,2976, # 4336
+1422, 577,1470,3026,1524,3410,5585,5586, 432,4376,3074,3527,5587,2594,1455,2515, # 4352
+2230,1973,1175,5588,1020,2741,4118,3528,4737,5589,2742,5590,1743,1361,3075,3529, # 4368
+2649,4119,4377,4738,2295, 895, 924,4378,2171, 331,2247,3076, 166,1627,3077,1098, # 4384
+5591,1232,2894,2231,3411,4739, 657, 403,1196,2377, 542,3775,3412,1600,4379,3530, # 4400
+5592,4740,2777,3261, 576, 530,1362,4741,4742,2540,2676,3776,4120,5593, 842,3913, # 4416
+5594,2814,2032,1014,4121, 213,2709,3413, 665, 621,4380,5595,3777,2939,2435,5596, # 4432
+2436,3335,3643,3414,4743,4381,2541,4382,4744,3644,1682,4383,3531,1380,5597, 724, # 4448
+2282, 600,1670,5598,1337,1233,4745,3126,2248,5599,1621,4746,5600, 651,4384,5601, # 4464
+1612,4385,2621,5602,2857,5603,2743,2312,3078,5604, 716,2464,3079, 174,1255,2710, # 4480
+4122,3645, 548,1320,1398, 728,4123,1574,5605,1891,1197,3080,4124,5606,3081,3082, # 4496
+3778,3646,3779, 747,5607, 635,4386,4747,5608,5609,5610,4387,5611,5612,4748,5613, # 4512
+3415,4749,2437, 451,5614,3780,2542,2073,4388,2744,4389,4125,5615,1764,4750,5616, # 4528
+4390, 350,4751,2283,2395,2493,5617,4391,4126,2249,1434,4127, 488,4752, 458,4392, # 4544
+4128,3781, 771,1330,2396,3914,2576,3184,2160,2414,1553,2677,3185,4393,5618,2494, # 4560
+2895,2622,1720,2711,4394,3416,4753,5619,2543,4395,5620,3262,4396,2778,5621,2016, # 4576
+2745,5622,1155,1017,3782,3915,5623,3336,2313, 201,1865,4397,1430,5624,4129,5625, # 4592
+5626,5627,5628,5629,4398,1604,5630, 414,1866, 371,2595,4754,4755,3532,2017,3127, # 4608
+4756,1708, 960,4399, 887, 389,2172,1536,1663,1721,5631,2232,4130,2356,2940,1580, # 4624
+5632,5633,1744,4757,2544,4758,4759,5634,4760,5635,2074,5636,4761,3647,3417,2896, # 4640
+4400,5637,4401,2650,3418,2815, 673,2712,2465, 709,3533,4131,3648,4402,5638,1148, # 4656
+ 502, 634,5639,5640,1204,4762,3649,1575,4763,2623,3783,5641,3784,3128, 948,3263, # 4672
+ 121,1745,3916,1110,5642,4403,3083,2516,3027,4132,3785,1151,1771,3917,1488,4133, # 4688
+1987,5643,2438,3534,5644,5645,2094,5646,4404,3918,1213,1407,2816, 531,2746,2545, # 4704
+3264,1011,1537,4764,2779,4405,3129,1061,5647,3786,3787,1867,2897,5648,2018, 120, # 4720
+4406,4407,2063,3650,3265,2314,3919,2678,3419,1955,4765,4134,5649,3535,1047,2713, # 4736
+1266,5650,1368,4766,2858, 649,3420,3920,2546,2747,1102,2859,2679,5651,5652,2000, # 4752
+5653,1111,3651,2977,5654,2495,3921,3652,2817,1855,3421,3788,5655,5656,3422,2415, # 4768
+2898,3337,3266,3653,5657,2577,5658,3654,2818,4135,1460, 856,5659,3655,5660,2899, # 4784
+2978,5661,2900,3922,5662,4408, 632,2517, 875,3923,1697,3924,2296,5663,5664,4767, # 4800
+3028,1239, 580,4768,4409,5665, 914, 936,2075,1190,4136,1039,2124,5666,5667,5668, # 4816
+5669,3423,1473,5670,1354,4410,3925,4769,2173,3084,4137, 915,3338,4411,4412,3339, # 4832
+1605,1835,5671,2748, 398,3656,4413,3926,4138, 328,1913,2860,4139,3927,1331,4414, # 4848
+3029, 937,4415,5672,3657,4140,4141,3424,2161,4770,3425, 524, 742, 538,3085,1012, # 4864
+5673,5674,3928,2466,5675, 658,1103, 225,3929,5676,5677,4771,5678,4772,5679,3267, # 4880
+1243,5680,4142, 963,2250,4773,5681,2714,3658,3186,5682,5683,2596,2332,5684,4774, # 4896
+5685,5686,5687,3536, 957,3426,2547,2033,1931,2941,2467, 870,2019,3659,1746,2780, # 4912
+2781,2439,2468,5688,3930,5689,3789,3130,3790,3537,3427,3791,5690,1179,3086,5691, # 4928
+3187,2378,4416,3792,2548,3188,3131,2749,4143,5692,3428,1556,2549,2297, 977,2901, # 4944
+2034,4144,1205,3429,5693,1765,3430,3189,2125,1271, 714,1689,4775,3538,5694,2333, # 4960
+3931, 533,4417,3660,2184, 617,5695,2469,3340,3539,2315,5696,5697,3190,5698,5699, # 4976
+3932,1988, 618, 427,2651,3540,3431,5700,5701,1244,1690,5702,2819,4418,4776,5703, # 4992
+3541,4777,5704,2284,1576, 473,3661,4419,3432, 972,5705,3662,5706,3087,5707,5708, # 5008
+4778,4779,5709,3793,4145,4146,5710, 153,4780, 356,5711,1892,2902,4420,2144, 408, # 5024
+ 803,2357,5712,3933,5713,4421,1646,2578,2518,4781,4782,3934,5714,3935,4422,5715, # 5040
+2416,3433, 752,5716,5717,1962,3341,2979,5718, 746,3030,2470,4783,4423,3794, 698, # 5056
+4784,1893,4424,3663,2550,4785,3664,3936,5719,3191,3434,5720,1824,1302,4147,2715, # 5072
+3937,1974,4425,5721,4426,3192, 823,1303,1288,1236,2861,3542,4148,3435, 774,3938, # 5088
+5722,1581,4786,1304,2862,3939,4787,5723,2440,2162,1083,3268,4427,4149,4428, 344, # 5104
+1173, 288,2316, 454,1683,5724,5725,1461,4788,4150,2597,5726,5727,4789, 985, 894, # 5120
+5728,3436,3193,5729,1914,2942,3795,1989,5730,2111,1975,5731,4151,5732,2579,1194, # 5136
+ 425,5733,4790,3194,1245,3796,4429,5734,5735,2863,5736, 636,4791,1856,3940, 760, # 5152
+1800,5737,4430,2212,1508,4792,4152,1894,1684,2298,5738,5739,4793,4431,4432,2213, # 5168
+ 479,5740,5741, 832,5742,4153,2496,5743,2980,2497,3797, 990,3132, 627,1815,2652, # 5184
+4433,1582,4434,2126,2112,3543,4794,5744, 799,4435,3195,5745,4795,2113,1737,3031, # 5200
+1018, 543, 754,4436,3342,1676,4796,4797,4154,4798,1489,5746,3544,5747,2624,2903, # 5216
+4155,5748,5749,2981,5750,5751,5752,5753,3196,4799,4800,2185,1722,5754,3269,3270, # 5232
+1843,3665,1715, 481, 365,1976,1857,5755,5756,1963,2498,4801,5757,2127,3666,3271, # 5248
+ 433,1895,2064,2076,5758, 602,2750,5759,5760,5761,5762,5763,3032,1628,3437,5764, # 5264
+3197,4802,4156,2904,4803,2519,5765,2551,2782,5766,5767,5768,3343,4804,2905,5769, # 5280
+4805,5770,2864,4806,4807,1221,2982,4157,2520,5771,5772,5773,1868,1990,5774,5775, # 5296
+5776,1896,5777,5778,4808,1897,4158, 318,5779,2095,4159,4437,5780,5781, 485,5782, # 5312
+ 938,3941, 553,2680, 116,5783,3942,3667,5784,3545,2681,2783,3438,3344,2820,5785, # 5328
+3668,2943,4160,1747,2944,2983,5786,5787, 207,5788,4809,5789,4810,2521,5790,3033, # 5344
+ 890,3669,3943,5791,1878,3798,3439,5792,2186,2358,3440,1652,5793,5794,5795, 941, # 5360
+2299, 208,3546,4161,2020, 330,4438,3944,2906,2499,3799,4439,4811,5796,5797,5798, # 5376  #last 512
+#Everything below is of no interest for detection purpose
+2522,1613,4812,5799,3345,3945,2523,5800,4162,5801,1637,4163,2471,4813,3946,5802, # 5392
+2500,3034,3800,5803,5804,2195,4814,5805,2163,5806,5807,5808,5809,5810,5811,5812, # 5408
+5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828, # 5424
+5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844, # 5440
+5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,5860, # 5456
+5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,5874,5875,5876, # 5472
+5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,5889,5890,5891,5892, # 5488
+5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,5906,5907,5908, # 5504
+5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,5921,5922,5923,5924, # 5520
+5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936,5937,5938,5939,5940, # 5536
+5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952,5953,5954,5955,5956, # 5552
+5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968,5969,5970,5971,5972, # 5568
+5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984,5985,5986,5987,5988, # 5584
+5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004, # 5600
+6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020, # 5616
+6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036, # 5632
+6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052, # 5648
+6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068, # 5664
+6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084, # 5680
+6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100, # 5696
+6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116, # 5712
+6117,6118,6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,6132, # 5728
+6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,6144,6145,6146,6147,6148, # 5744
+6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,6164, # 5760
+6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,6180, # 5776
+6181,6182,6183,6184,6185,6186,6187,6188,6189,6190,6191,6192,6193,6194,6195,6196, # 5792
+6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,6211,6212, # 5808
+6213,6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,3670,6224,6225,6226,6227, # 5824
+6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,6242,6243, # 5840
+6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,6254,6255,6256,6257,6258,6259, # 5856
+6260,6261,6262,6263,6264,6265,6266,6267,6268,6269,6270,6271,6272,6273,6274,6275, # 5872
+6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,4815,6286,6287,6288,6289,6290, # 5888
+6291,6292,4816,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305, # 5904
+6306,6307,6308,6309,6310,6311,4817,4818,6312,6313,6314,6315,6316,6317,6318,4819, # 5920
+6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,6334, # 5936
+6335,6336,6337,4820,6338,6339,6340,6341,6342,6343,6344,6345,6346,6347,6348,6349, # 5952
+6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365, # 5968
+6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381, # 5984
+6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,6396,6397, # 6000
+6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,3441,6411,6412, # 6016
+6413,6414,6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,4440,6426,6427, # 6032
+6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443, # 6048
+6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,4821,6455,6456,6457,6458, # 6064
+6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,6474, # 6080
+6475,6476,6477,3947,3948,6478,6479,6480,6481,3272,4441,6482,6483,6484,6485,4442, # 6096
+6486,6487,6488,6489,6490,6491,6492,6493,6494,6495,6496,4822,6497,6498,6499,6500, # 6112
+6501,6502,6503,6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516, # 6128
+6517,6518,6519,6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532, # 6144
+6533,6534,6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548, # 6160
+6549,6550,6551,6552,6553,6554,6555,6556,2784,6557,4823,6558,6559,6560,6561,6562, # 6176
+6563,6564,6565,6566,6567,6568,6569,3949,6570,6571,6572,4824,6573,6574,6575,6576, # 6192
+6577,6578,6579,6580,6581,6582,6583,4825,6584,6585,6586,3950,2785,6587,6588,6589, # 6208
+6590,6591,6592,6593,6594,6595,6596,6597,6598,6599,6600,6601,6602,6603,6604,6605, # 6224
+6606,6607,6608,6609,6610,6611,6612,4826,6613,6614,6615,4827,6616,6617,6618,6619, # 6240
+6620,6621,6622,6623,6624,6625,4164,6626,6627,6628,6629,6630,6631,6632,6633,6634, # 6256
+3547,6635,4828,6636,6637,6638,6639,6640,6641,6642,3951,2984,6643,6644,6645,6646, # 6272
+6647,6648,6649,4165,6650,4829,6651,6652,4830,6653,6654,6655,6656,6657,6658,6659, # 6288
+6660,6661,6662,4831,6663,6664,6665,6666,6667,6668,6669,6670,6671,4166,6672,4832, # 6304
+3952,6673,6674,6675,6676,4833,6677,6678,6679,4167,6680,6681,6682,3198,6683,6684, # 6320
+6685,6686,6687,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,4834,6698,6699, # 6336
+6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,6715, # 6352
+6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,6730,6731, # 6368
+6732,6733,6734,4443,6735,6736,6737,6738,6739,6740,6741,6742,6743,6744,6745,4444, # 6384
+6746,6747,6748,6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,6759,6760,6761, # 6400
+6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777, # 6416
+6778,6779,6780,6781,4168,6782,6783,3442,6784,6785,6786,6787,6788,6789,6790,6791, # 6432
+4169,6792,6793,6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806, # 6448
+6807,6808,6809,6810,6811,4835,6812,6813,6814,4445,6815,6816,4446,6817,6818,6819, # 6464
+6820,6821,6822,6823,6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,6834,6835, # 6480
+3548,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6846,4836,6847,6848,6849, # 6496
+6850,6851,6852,6853,6854,3953,6855,6856,6857,6858,6859,6860,6861,6862,6863,6864, # 6512
+6865,6866,6867,6868,6869,6870,6871,6872,6873,6874,6875,6876,6877,3199,6878,6879, # 6528
+6880,6881,6882,4447,6883,6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,6894, # 6544
+6895,6896,6897,6898,6899,6900,6901,6902,6903,6904,4170,6905,6906,6907,6908,6909, # 6560
+6910,6911,6912,6913,6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,6924,6925, # 6576
+6926,6927,4837,6928,6929,6930,6931,6932,6933,6934,6935,6936,3346,6937,6938,4838, # 6592
+6939,6940,6941,4448,6942,6943,6944,6945,6946,4449,6947,6948,6949,6950,6951,6952, # 6608
+6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,6967,6968, # 6624
+6969,6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984, # 6640
+6985,6986,6987,6988,6989,6990,6991,6992,6993,6994,3671,6995,6996,6997,6998,4839, # 6656
+6999,7000,7001,7002,3549,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013, # 6672
+7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029, # 6688
+7030,4840,7031,7032,7033,7034,7035,7036,7037,7038,4841,7039,7040,7041,7042,7043, # 6704
+7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059, # 6720
+7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,2985,7071,7072,7073,7074, # 6736
+7075,7076,7077,7078,7079,7080,4842,7081,7082,7083,7084,7085,7086,7087,7088,7089, # 6752
+7090,7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105, # 6768
+7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,4450,7119,7120, # 6784
+7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136, # 6800
+7137,7138,7139,7140,7141,7142,7143,4843,7144,7145,7146,7147,7148,7149,7150,7151, # 6816
+7152,7153,7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167, # 6832
+7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183, # 6848
+7184,7185,7186,7187,7188,4171,4172,7189,7190,7191,7192,7193,7194,7195,7196,7197, # 6864
+7198,7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,7209,7210,7211,7212,7213, # 6880
+7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229, # 6896
+7230,7231,7232,7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245, # 6912
+7246,7247,7248,7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261, # 6928
+7262,7263,7264,7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277, # 6944
+7278,7279,7280,7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293, # 6960
+7294,7295,7296,4844,7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308, # 6976
+7309,7310,7311,7312,7313,7314,7315,7316,4451,7317,7318,7319,7320,7321,7322,7323, # 6992
+7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339, # 7008
+7340,7341,7342,7343,7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,4173,7354, # 7024
+7355,4845,7356,7357,7358,7359,7360,7361,7362,7363,7364,7365,7366,7367,7368,7369, # 7040
+7370,7371,7372,7373,7374,7375,7376,7377,7378,7379,7380,7381,7382,7383,7384,7385, # 7056
+7386,7387,7388,4846,7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400, # 7072
+7401,7402,7403,7404,7405,3672,7406,7407,7408,7409,7410,7411,7412,7413,7414,7415, # 7088
+7416,7417,7418,7419,7420,7421,7422,7423,7424,7425,7426,7427,7428,7429,7430,7431, # 7104
+7432,7433,7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447, # 7120
+7448,7449,7450,7451,7452,7453,4452,7454,3200,7455,7456,7457,7458,7459,7460,7461, # 7136
+7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,4847,7475,7476, # 7152
+7477,3133,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491, # 7168
+7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,3347,7503,7504,7505,7506, # 7184
+7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,4848, # 7200
+7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537, # 7216
+7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,3801,4849,7550,7551, # 7232
+7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567, # 7248
+7568,7569,3035,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582, # 7264
+7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598, # 7280
+7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614, # 7296
+7615,7616,4850,7617,7618,3802,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628, # 7312
+7629,7630,7631,7632,4851,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643, # 7328
+7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659, # 7344
+7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7670,4453,7671,7672,7673,7674, # 7360
+7675,7676,7677,7678,7679,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690, # 7376
+7691,7692,7693,7694,7695,7696,7697,3443,7698,7699,7700,7701,7702,4454,7703,7704, # 7392
+7705,7706,7707,7708,7709,7710,7711,7712,7713,2472,7714,7715,7716,7717,7718,7719, # 7408
+7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,3954,7732,7733,7734, # 7424
+7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750, # 7440
+3134,7751,7752,4852,7753,7754,7755,4853,7756,7757,7758,7759,7760,4174,7761,7762, # 7456
+7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778, # 7472
+7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794, # 7488
+7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,4854,7806,7807,7808,7809, # 7504
+7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825, # 7520
+4855,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7536
+7841,7842,7843,7844,7845,7846,7847,3955,7848,7849,7850,7851,7852,7853,7854,7855, # 7552
+7856,7857,7858,7859,7860,3444,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870, # 7568
+7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886, # 7584
+7887,7888,7889,7890,7891,4175,7892,7893,7894,7895,7896,4856,4857,7897,7898,7899, # 7600
+7900,2598,7901,7902,7903,7904,7905,7906,7907,7908,4455,7909,7910,7911,7912,7913, # 7616
+7914,3201,7915,7916,7917,7918,7919,7920,7921,4858,7922,7923,7924,7925,7926,7927, # 7632
+7928,7929,7930,7931,7932,7933,7934,7935,7936,7937,7938,7939,7940,7941,7942,7943, # 7648
+7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7958,7959, # 7664
+7960,7961,7962,7963,7964,7965,7966,7967,7968,7969,7970,7971,7972,7973,7974,7975, # 7680
+7976,7977,7978,7979,7980,7981,4859,7982,7983,7984,7985,7986,7987,7988,7989,7990, # 7696
+7991,7992,7993,7994,7995,7996,4860,7997,7998,7999,8000,8001,8002,8003,8004,8005, # 7712
+8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,4176,8017,8018,8019,8020, # 7728
+8021,8022,8023,4861,8024,8025,8026,8027,8028,8029,8030,8031,8032,8033,8034,8035, # 7744
+8036,4862,4456,8037,8038,8039,8040,4863,8041,8042,8043,8044,8045,8046,8047,8048, # 7760
+8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,8064, # 7776
+8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080, # 7792
+8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096, # 7808
+8097,8098,8099,4864,4177,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110, # 7824
+8111,8112,8113,8114,8115,8116,8117,8118,8119,8120,4178,8121,8122,8123,8124,8125, # 7840
+8126,8127,8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141, # 7856
+8142,8143,8144,8145,4865,4866,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155, # 7872
+8156,8157,8158,8159,8160,8161,8162,8163,8164,8165,4179,8166,8167,8168,8169,8170, # 7888
+8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181,4457,8182,8183,8184,8185, # 7904
+8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201, # 7920
+8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213,8214,8215,8216,8217, # 7936
+8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229,8230,8231,8232,8233, # 7952
+8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245,8246,8247,8248,8249, # 7968
+8250,8251,8252,8253,8254,8255,8256,3445,8257,8258,8259,8260,8261,8262,4458,8263, # 7984
+8264,8265,8266,8267,8268,8269,8270,8271,8272,4459,8273,8274,8275,8276,3550,8277, # 8000
+8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,4460,8290,8291,8292, # 8016
+8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,4867, # 8032
+8308,8309,8310,8311,8312,3551,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322, # 8048
+8323,8324,8325,8326,4868,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337, # 8064
+8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353, # 8080
+8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,4869,4461,8364,8365,8366,8367, # 8096
+8368,8369,8370,4870,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382, # 8112
+8383,8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398, # 8128
+8399,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,4871,8411,8412,8413, # 8144
+8414,8415,8416,8417,8418,8419,8420,8421,8422,4462,8423,8424,8425,8426,8427,8428, # 8160
+8429,8430,8431,8432,8433,2986,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443, # 8176
+8444,8445,8446,8447,8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459, # 8192
+8460,8461,8462,8463,8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475, # 8208
+8476,8477,8478,4180,8479,8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490, # 8224
+8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506, # 8240
+8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522, # 8256
+8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538, # 8272
+8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554, # 8288
+8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,4872,8565,8566,8567,8568,8569, # 8304
+8570,8571,8572,8573,4873,8574,8575,8576,8577,8578,8579,8580,8581,8582,8583,8584, # 8320
+8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597,8598,8599,8600, # 8336
+8601,8602,8603,8604,8605,3803,8606,8607,8608,8609,8610,8611,8612,8613,4874,3804, # 8352
+8614,8615,8616,8617,8618,8619,8620,8621,3956,8622,8623,8624,8625,8626,8627,8628, # 8368
+8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,2865,8639,8640,8641,8642,8643, # 8384
+8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,4463,8657,8658, # 8400
+8659,4875,4876,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672, # 8416
+8673,8674,8675,8676,8677,8678,8679,8680,8681,4464,8682,8683,8684,8685,8686,8687, # 8432
+8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703, # 8448
+8704,8705,8706,8707,8708,8709,2261,8710,8711,8712,8713,8714,8715,8716,8717,8718, # 8464
+8719,8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,4181, # 8480
+8734,8735,8736,8737,8738,8739,8740,8741,8742,8743,8744,8745,8746,8747,8748,8749, # 8496
+8750,8751,8752,8753,8754,8755,8756,8757,8758,8759,8760,8761,8762,8763,4877,8764, # 8512
+8765,8766,8767,8768,8769,8770,8771,8772,8773,8774,8775,8776,8777,8778,8779,8780, # 8528
+8781,8782,8783,8784,8785,8786,8787,8788,4878,8789,4879,8790,8791,8792,4880,8793, # 8544
+8794,8795,8796,8797,8798,8799,8800,8801,4881,8802,8803,8804,8805,8806,8807,8808, # 8560
+8809,8810,8811,8812,8813,8814,8815,3957,8816,8817,8818,8819,8820,8821,8822,8823, # 8576
+8824,8825,8826,8827,8828,8829,8830,8831,8832,8833,8834,8835,8836,8837,8838,8839, # 8592
+8840,8841,8842,8843,8844,8845,8846,8847,4882,8848,8849,8850,8851,8852,8853,8854, # 8608
+8855,8856,8857,8858,8859,8860,8861,8862,8863,8864,8865,8866,8867,8868,8869,8870, # 8624
+8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,8884,3202,8885, # 8640
+8886,8887,8888,8889,8890,8891,8892,8893,8894,8895,8896,8897,8898,8899,8900,8901, # 8656
+8902,8903,8904,8905,8906,8907,8908,8909,8910,8911,8912,8913,8914,8915,8916,8917, # 8672
+8918,8919,8920,8921,8922,8923,8924,4465,8925,8926,8927,8928,8929,8930,8931,8932, # 8688
+4883,8933,8934,8935,8936,8937,8938,8939,8940,8941,8942,8943,2214,8944,8945,8946, # 8704
+8947,8948,8949,8950,8951,8952,8953,8954,8955,8956,8957,8958,8959,8960,8961,8962, # 8720
+8963,8964,8965,4884,8966,8967,8968,8969,8970,8971,8972,8973,8974,8975,8976,8977, # 8736
+8978,8979,8980,8981,8982,8983,8984,8985,8986,8987,8988,8989,8990,8991,8992,4885, # 8752
+8993,8994,8995,8996,8997,8998,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008, # 8768
+9009,9010,9011,9012,9013,9014,9015,9016,9017,9018,9019,9020,9021,4182,9022,9023, # 8784
+9024,9025,9026,9027,9028,9029,9030,9031,9032,9033,9034,9035,9036,9037,9038,9039, # 8800
+9040,9041,9042,9043,9044,9045,9046,9047,9048,9049,9050,9051,9052,9053,9054,9055, # 8816
+9056,9057,9058,9059,9060,9061,9062,9063,4886,9064,9065,9066,9067,9068,9069,4887, # 8832
+9070,9071,9072,9073,9074,9075,9076,9077,9078,9079,9080,9081,9082,9083,9084,9085, # 8848
+9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9101, # 8864
+9102,9103,9104,9105,9106,9107,9108,9109,9110,9111,9112,9113,9114,9115,9116,9117, # 8880
+9118,9119,9120,9121,9122,9123,9124,9125,9126,9127,9128,9129,9130,9131,9132,9133, # 8896
+9134,9135,9136,9137,9138,9139,9140,9141,3958,9142,9143,9144,9145,9146,9147,9148, # 8912
+9149,9150,9151,4888,9152,9153,9154,9155,9156,9157,9158,9159,9160,9161,9162,9163, # 8928
+9164,9165,9166,9167,9168,9169,9170,9171,9172,9173,9174,9175,4889,9176,9177,9178, # 8944
+9179,9180,9181,9182,9183,9184,9185,9186,9187,9188,9189,9190,9191,9192,9193,9194, # 8960
+9195,9196,9197,9198,9199,9200,9201,9202,9203,4890,9204,9205,9206,9207,9208,9209, # 8976
+9210,9211,9212,9213,9214,9215,9216,9217,9218,9219,9220,9221,9222,4466,9223,9224, # 8992
+9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240, # 9008
+9241,9242,9243,9244,9245,4891,9246,9247,9248,9249,9250,9251,9252,9253,9254,9255, # 9024
+9256,9257,4892,9258,9259,9260,9261,4893,4894,9262,9263,9264,9265,9266,9267,9268, # 9040
+9269,9270,9271,9272,9273,4467,9274,9275,9276,9277,9278,9279,9280,9281,9282,9283, # 9056
+9284,9285,3673,9286,9287,9288,9289,9290,9291,9292,9293,9294,9295,9296,9297,9298, # 9072
+9299,9300,9301,9302,9303,9304,9305,9306,9307,9308,9309,9310,9311,9312,9313,9314, # 9088
+9315,9316,9317,9318,9319,9320,9321,9322,4895,9323,9324,9325,9326,9327,9328,9329, # 9104
+9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345, # 9120
+9346,9347,4468,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360, # 9136
+9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,9373,4896,9374,4469, # 9152
+9375,9376,9377,9378,9379,4897,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389, # 9168
+9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405, # 9184
+9406,4470,9407,2751,9408,9409,3674,3552,9410,9411,9412,9413,9414,9415,9416,9417, # 9200
+9418,9419,9420,9421,4898,9422,9423,9424,9425,9426,9427,9428,9429,3959,9430,9431, # 9216
+9432,9433,9434,9435,9436,4471,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446, # 9232
+9447,9448,9449,9450,3348,9451,9452,9453,9454,9455,9456,9457,9458,9459,9460,9461, # 9248
+9462,9463,9464,9465,9466,9467,9468,9469,9470,9471,9472,4899,9473,9474,9475,9476, # 9264
+9477,4900,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,3349,9489,9490, # 9280
+9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506, # 9296
+9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,4901,9521, # 9312
+9522,9523,9524,9525,9526,4902,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536, # 9328
+9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,9548,9549,9550,9551,9552, # 9344
+9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568, # 9360
+9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,9583,9584, # 9376
+3805,9585,9586,9587,9588,9589,9590,9591,9592,9593,9594,9595,9596,9597,9598,9599, # 9392
+9600,9601,9602,4903,9603,9604,9605,9606,9607,4904,9608,9609,9610,9611,9612,9613, # 9408
+9614,4905,9615,9616,9617,9618,9619,9620,9621,9622,9623,9624,9625,9626,9627,9628, # 9424
+9629,9630,9631,9632,4906,9633,9634,9635,9636,9637,9638,9639,9640,9641,9642,9643, # 9440
+4907,9644,9645,9646,9647,9648,9649,9650,9651,9652,9653,9654,9655,9656,9657,9658, # 9456
+9659,9660,9661,9662,9663,9664,9665,9666,9667,9668,9669,9670,9671,9672,4183,9673, # 9472
+9674,9675,9676,9677,4908,9678,9679,9680,9681,4909,9682,9683,9684,9685,9686,9687, # 9488
+9688,9689,9690,4910,9691,9692,9693,3675,9694,9695,9696,2945,9697,9698,9699,9700, # 9504
+9701,9702,9703,9704,9705,4911,9706,9707,9708,9709,9710,9711,9712,9713,9714,9715, # 9520
+9716,9717,9718,9719,9720,9721,9722,9723,9724,9725,9726,9727,9728,9729,9730,9731, # 9536
+9732,9733,9734,9735,4912,9736,9737,9738,9739,9740,4913,9741,9742,9743,9744,9745, # 9552
+9746,9747,9748,9749,9750,9751,9752,9753,9754,9755,9756,9757,9758,4914,9759,9760, # 9568
+9761,9762,9763,9764,9765,9766,9767,9768,9769,9770,9771,9772,9773,9774,9775,9776, # 9584
+9777,9778,9779,9780,9781,9782,4915,9783,9784,9785,9786,9787,9788,9789,9790,9791, # 9600
+9792,9793,4916,9794,9795,9796,9797,9798,9799,9800,9801,9802,9803,9804,9805,9806, # 9616
+9807,9808,9809,9810,9811,9812,9813,9814,9815,9816,9817,9818,9819,9820,9821,9822, # 9632
+9823,9824,9825,9826,9827,9828,9829,9830,9831,9832,9833,9834,9835,9836,9837,9838, # 9648
+9839,9840,9841,9842,9843,9844,9845,9846,9847,9848,9849,9850,9851,9852,9853,9854, # 9664
+9855,9856,9857,9858,9859,9860,9861,9862,9863,9864,9865,9866,9867,9868,4917,9869, # 9680
+9870,9871,9872,9873,9874,9875,9876,9877,9878,9879,9880,9881,9882,9883,9884,9885, # 9696
+9886,9887,9888,9889,9890,9891,9892,4472,9893,9894,9895,9896,9897,3806,9898,9899, # 9712
+9900,9901,9902,9903,9904,9905,9906,9907,9908,9909,9910,9911,9912,9913,9914,4918, # 9728
+9915,9916,9917,4919,9918,9919,9920,9921,4184,9922,9923,9924,9925,9926,9927,9928, # 9744
+9929,9930,9931,9932,9933,9934,9935,9936,9937,9938,9939,9940,9941,9942,9943,9944, # 9760
+9945,9946,4920,9947,9948,9949,9950,9951,9952,9953,9954,9955,4185,9956,9957,9958, # 9776
+9959,9960,9961,9962,9963,9964,9965,4921,9966,9967,9968,4473,9969,9970,9971,9972, # 9792
+9973,9974,9975,9976,9977,4474,9978,9979,9980,9981,9982,9983,9984,9985,9986,9987, # 9808
+9988,9989,9990,9991,9992,9993,9994,9995,9996,9997,9998,9999,10000,10001,10002,10003, # 9824
+10004,10005,10006,10007,10008,10009,10010,10011,10012,10013,10014,10015,10016,10017,10018,10019, # 9840
+10020,10021,4922,10022,4923,10023,10024,10025,10026,10027,10028,10029,10030,10031,10032,10033, # 9856
+10034,10035,10036,10037,10038,10039,10040,10041,10042,10043,10044,10045,10046,10047,10048,4924, # 9872
+10049,10050,10051,10052,10053,10054,10055,10056,10057,10058,10059,10060,10061,10062,10063,10064, # 9888
+10065,10066,10067,10068,10069,10070,10071,10072,10073,10074,10075,10076,10077,10078,10079,10080, # 9904
+10081,10082,10083,10084,10085,10086,10087,4475,10088,10089,10090,10091,10092,10093,10094,10095, # 9920
+10096,10097,4476,10098,10099,10100,10101,10102,10103,10104,10105,10106,10107,10108,10109,10110, # 9936
+10111,2174,10112,10113,10114,10115,10116,10117,10118,10119,10120,10121,10122,10123,10124,10125, # 9952
+10126,10127,10128,10129,10130,10131,10132,10133,10134,10135,10136,10137,10138,10139,10140,3807, # 9968
+4186,4925,10141,10142,10143,10144,10145,10146,10147,4477,4187,10148,10149,10150,10151,10152, # 9984
+10153,4188,10154,10155,10156,10157,10158,10159,10160,10161,4926,10162,10163,10164,10165,10166, #10000
+10167,10168,10169,10170,10171,10172,10173,10174,10175,10176,10177,10178,10179,10180,10181,10182, #10016
+10183,10184,10185,10186,10187,10188,10189,10190,10191,10192,3203,10193,10194,10195,10196,10197, #10032
+10198,10199,10200,4478,10201,10202,10203,10204,4479,10205,10206,10207,10208,10209,10210,10211, #10048
+10212,10213,10214,10215,10216,10217,10218,10219,10220,10221,10222,10223,10224,10225,10226,10227, #10064
+10228,10229,10230,10231,10232,10233,10234,4927,10235,10236,10237,10238,10239,10240,10241,10242, #10080
+10243,10244,10245,10246,10247,10248,10249,10250,10251,10252,10253,10254,10255,10256,10257,10258, #10096
+10259,10260,10261,10262,10263,10264,10265,10266,10267,10268,10269,10270,10271,10272,10273,4480, #10112
+4928,4929,10274,10275,10276,10277,10278,10279,10280,10281,10282,10283,10284,10285,10286,10287, #10128
+10288,10289,10290,10291,10292,10293,10294,10295,10296,10297,10298,10299,10300,10301,10302,10303, #10144
+10304,10305,10306,10307,10308,10309,10310,10311,10312,10313,10314,10315,10316,10317,10318,10319, #10160
+10320,10321,10322,10323,10324,10325,10326,10327,10328,10329,10330,10331,10332,10333,10334,4930, #10176
+10335,10336,10337,10338,10339,10340,10341,10342,4931,10343,10344,10345,10346,10347,10348,10349, #10192
+10350,10351,10352,10353,10354,10355,3088,10356,2786,10357,10358,10359,10360,4189,10361,10362, #10208
+10363,10364,10365,10366,10367,10368,10369,10370,10371,10372,10373,10374,10375,4932,10376,10377, #10224
+10378,10379,10380,10381,10382,10383,10384,10385,10386,10387,10388,10389,10390,10391,10392,4933, #10240
+10393,10394,10395,4934,10396,10397,10398,10399,10400,10401,10402,10403,10404,10405,10406,10407, #10256
+10408,10409,10410,10411,10412,3446,10413,10414,10415,10416,10417,10418,10419,10420,10421,10422, #10272
+10423,4935,10424,10425,10426,10427,10428,10429,10430,4936,10431,10432,10433,10434,10435,10436, #10288
+10437,10438,10439,10440,10441,10442,10443,4937,10444,10445,10446,10447,4481,10448,10449,10450, #10304
+10451,10452,10453,10454,10455,10456,10457,10458,10459,10460,10461,10462,10463,10464,10465,10466, #10320
+10467,10468,10469,10470,10471,10472,10473,10474,10475,10476,10477,10478,10479,10480,10481,10482, #10336
+10483,10484,10485,10486,10487,10488,10489,10490,10491,10492,10493,10494,10495,10496,10497,10498, #10352
+10499,10500,10501,10502,10503,10504,10505,4938,10506,10507,10508,10509,10510,2552,10511,10512, #10368
+10513,10514,10515,10516,3447,10517,10518,10519,10520,10521,10522,10523,10524,10525,10526,10527, #10384
+10528,10529,10530,10531,10532,10533,10534,10535,10536,10537,10538,10539,10540,10541,10542,10543, #10400
+4482,10544,4939,10545,10546,10547,10548,10549,10550,10551,10552,10553,10554,10555,10556,10557, #10416
+10558,10559,10560,10561,10562,10563,10564,10565,10566,10567,3676,4483,10568,10569,10570,10571, #10432
+10572,3448,10573,10574,10575,10576,10577,10578,10579,10580,10581,10582,10583,10584,10585,10586, #10448
+10587,10588,10589,10590,10591,10592,10593,10594,10595,10596,10597,10598,10599,10600,10601,10602, #10464
+10603,10604,10605,10606,10607,10608,10609,10610,10611,10612,10613,10614,10615,10616,10617,10618, #10480
+10619,10620,10621,10622,10623,10624,10625,10626,10627,4484,10628,10629,10630,10631,10632,4940, #10496
+10633,10634,10635,10636,10637,10638,10639,10640,10641,10642,10643,10644,10645,10646,10647,10648, #10512
+10649,10650,10651,10652,10653,10654,10655,10656,4941,10657,10658,10659,2599,10660,10661,10662, #10528
+10663,10664,10665,10666,3089,10667,10668,10669,10670,10671,10672,10673,10674,10675,10676,10677, #10544
+10678,10679,10680,4942,10681,10682,10683,10684,10685,10686,10687,10688,10689,10690,10691,10692, #10560
+10693,10694,10695,10696,10697,4485,10698,10699,10700,10701,10702,10703,10704,4943,10705,3677, #10576
+10706,10707,10708,10709,10710,10711,10712,4944,10713,10714,10715,10716,10717,10718,10719,10720, #10592
+10721,10722,10723,10724,10725,10726,10727,10728,4945,10729,10730,10731,10732,10733,10734,10735, #10608
+10736,10737,10738,10739,10740,10741,10742,10743,10744,10745,10746,10747,10748,10749,10750,10751, #10624
+10752,10753,10754,10755,10756,10757,10758,10759,10760,10761,4946,10762,10763,10764,10765,10766, #10640
+10767,4947,4948,10768,10769,10770,10771,10772,10773,10774,10775,10776,10777,10778,10779,10780, #10656
+10781,10782,10783,10784,10785,10786,10787,10788,10789,10790,10791,10792,10793,10794,10795,10796, #10672
+10797,10798,10799,10800,10801,10802,10803,10804,10805,10806,10807,10808,10809,10810,10811,10812, #10688
+10813,10814,10815,10816,10817,10818,10819,10820,10821,10822,10823,10824,10825,10826,10827,10828, #10704
+10829,10830,10831,10832,10833,10834,10835,10836,10837,10838,10839,10840,10841,10842,10843,10844, #10720
+10845,10846,10847,10848,10849,10850,10851,10852,10853,10854,10855,10856,10857,10858,10859,10860, #10736
+10861,10862,10863,10864,10865,10866,10867,10868,10869,10870,10871,10872,10873,10874,10875,10876, #10752
+10877,10878,4486,10879,10880,10881,10882,10883,10884,10885,4949,10886,10887,10888,10889,10890, #10768
+10891,10892,10893,10894,10895,10896,10897,10898,10899,10900,10901,10902,10903,10904,10905,10906, #10784
+10907,10908,10909,10910,10911,10912,10913,10914,10915,10916,10917,10918,10919,4487,10920,10921, #10800
+10922,10923,10924,10925,10926,10927,10928,10929,10930,10931,10932,4950,10933,10934,10935,10936, #10816
+10937,10938,10939,10940,10941,10942,10943,10944,10945,10946,10947,10948,10949,4488,10950,10951, #10832
+10952,10953,10954,10955,10956,10957,10958,10959,4190,10960,10961,10962,10963,10964,10965,10966, #10848
+10967,10968,10969,10970,10971,10972,10973,10974,10975,10976,10977,10978,10979,10980,10981,10982, #10864
+10983,10984,10985,10986,10987,10988,10989,10990,10991,10992,10993,10994,10995,10996,10997,10998, #10880
+10999,11000,11001,11002,11003,11004,11005,11006,3960,11007,11008,11009,11010,11011,11012,11013, #10896
+11014,11015,11016,11017,11018,11019,11020,11021,11022,11023,11024,11025,11026,11027,11028,11029, #10912
+11030,11031,11032,4951,11033,11034,11035,11036,11037,11038,11039,11040,11041,11042,11043,11044, #10928
+11045,11046,11047,4489,11048,11049,11050,11051,4952,11052,11053,11054,11055,11056,11057,11058, #10944
+4953,11059,11060,11061,11062,11063,11064,11065,11066,11067,11068,11069,11070,11071,4954,11072, #10960
+11073,11074,11075,11076,11077,11078,11079,11080,11081,11082,11083,11084,11085,11086,11087,11088, #10976
+11089,11090,11091,11092,11093,11094,11095,11096,11097,11098,11099,11100,11101,11102,11103,11104, #10992
+11105,11106,11107,11108,11109,11110,11111,11112,11113,11114,11115,3808,11116,11117,11118,11119, #11008
+11120,11121,11122,11123,11124,11125,11126,11127,11128,11129,11130,11131,11132,11133,11134,4955, #11024
+11135,11136,11137,11138,11139,11140,11141,11142,11143,11144,11145,11146,11147,11148,11149,11150, #11040
+11151,11152,11153,11154,11155,11156,11157,11158,11159,11160,11161,4956,11162,11163,11164,11165, #11056
+11166,11167,11168,11169,11170,11171,11172,11173,11174,11175,11176,11177,11178,11179,11180,4957, #11072
+11181,11182,11183,11184,11185,11186,4958,11187,11188,11189,11190,11191,11192,11193,11194,11195, #11088
+11196,11197,11198,11199,11200,3678,11201,11202,11203,11204,11205,11206,4191,11207,11208,11209, #11104
+11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,11220,11221,11222,11223,11224,11225, #11120
+11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,11238,11239,11240,11241, #11136
+11242,11243,11244,11245,11246,11247,11248,11249,11250,11251,4959,11252,11253,11254,11255,11256, #11152
+11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272, #11168
+11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288, #11184
+11289,11290,11291,11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304, #11200
+11305,11306,11307,11308,11309,11310,11311,11312,11313,11314,3679,11315,11316,11317,11318,4490, #11216
+11319,11320,11321,11322,11323,11324,11325,11326,11327,11328,11329,11330,11331,11332,11333,11334, #11232
+11335,11336,11337,11338,11339,11340,11341,11342,11343,11344,11345,11346,11347,4960,11348,11349, #11248
+11350,11351,11352,11353,11354,11355,11356,11357,11358,11359,11360,11361,11362,11363,11364,11365, #11264
+11366,11367,11368,11369,11370,11371,11372,11373,11374,11375,11376,11377,3961,4961,11378,11379, #11280
+11380,11381,11382,11383,11384,11385,11386,11387,11388,11389,11390,11391,11392,11393,11394,11395, #11296
+11396,11397,4192,11398,11399,11400,11401,11402,11403,11404,11405,11406,11407,11408,11409,11410, #11312
+11411,4962,11412,11413,11414,11415,11416,11417,11418,11419,11420,11421,11422,11423,11424,11425, #11328
+11426,11427,11428,11429,11430,11431,11432,11433,11434,11435,11436,11437,11438,11439,11440,11441, #11344
+11442,11443,11444,11445,11446,11447,11448,11449,11450,11451,11452,11453,11454,11455,11456,11457, #11360
+11458,11459,11460,11461,11462,11463,11464,11465,11466,11467,11468,11469,4963,11470,11471,4491, #11376
+11472,11473,11474,11475,4964,11476,11477,11478,11479,11480,11481,11482,11483,11484,11485,11486, #11392
+11487,11488,11489,11490,11491,11492,4965,11493,11494,11495,11496,11497,11498,11499,11500,11501, #11408
+11502,11503,11504,11505,11506,11507,11508,11509,11510,11511,11512,11513,11514,11515,11516,11517, #11424
+11518,11519,11520,11521,11522,11523,11524,11525,11526,11527,11528,11529,3962,11530,11531,11532, #11440
+11533,11534,11535,11536,11537,11538,11539,11540,11541,11542,11543,11544,11545,11546,11547,11548, #11456
+11549,11550,11551,11552,11553,11554,11555,11556,11557,11558,11559,11560,11561,11562,11563,11564, #11472
+4193,4194,11565,11566,11567,11568,11569,11570,11571,11572,11573,11574,11575,11576,11577,11578, #11488
+11579,11580,11581,11582,11583,11584,11585,11586,11587,11588,11589,11590,11591,4966,4195,11592, #11504
+11593,11594,11595,11596,11597,11598,11599,11600,11601,11602,11603,11604,3090,11605,11606,11607, #11520
+11608,11609,11610,4967,11611,11612,11613,11614,11615,11616,11617,11618,11619,11620,11621,11622, #11536
+11623,11624,11625,11626,11627,11628,11629,11630,11631,11632,11633,11634,11635,11636,11637,11638, #11552
+11639,11640,11641,11642,11643,11644,11645,11646,11647,11648,11649,11650,11651,11652,11653,11654, #11568
+11655,11656,11657,11658,11659,11660,11661,11662,11663,11664,11665,11666,11667,11668,11669,11670, #11584
+11671,11672,11673,11674,4968,11675,11676,11677,11678,11679,11680,11681,11682,11683,11684,11685, #11600
+11686,11687,11688,11689,11690,11691,11692,11693,3809,11694,11695,11696,11697,11698,11699,11700, #11616
+11701,11702,11703,11704,11705,11706,11707,11708,11709,11710,11711,11712,11713,11714,11715,11716, #11632
+11717,11718,3553,11719,11720,11721,11722,11723,11724,11725,11726,11727,11728,11729,11730,4969, #11648
+11731,11732,11733,11734,11735,11736,11737,11738,11739,11740,4492,11741,11742,11743,11744,11745, #11664
+11746,11747,11748,11749,11750,11751,11752,4970,11753,11754,11755,11756,11757,11758,11759,11760, #11680
+11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776, #11696
+11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11788,11789,11790,4971,11791, #11712
+11792,11793,11794,11795,11796,11797,4972,11798,11799,11800,11801,11802,11803,11804,11805,11806, #11728
+11807,11808,11809,11810,4973,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821, #11744
+11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,11834,3680,3810,11835, #11760
+11836,4974,11837,11838,11839,11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850, #11776
+11851,11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,11864,11865,11866, #11792
+11867,11868,11869,11870,11871,11872,11873,11874,11875,11876,11877,11878,11879,11880,11881,11882, #11808
+11883,11884,4493,11885,11886,11887,11888,11889,11890,11891,11892,11893,11894,11895,11896,11897, #11824
+11898,11899,11900,11901,11902,11903,11904,11905,11906,11907,11908,11909,11910,11911,11912,11913, #11840
+11914,11915,4975,11916,11917,11918,11919,11920,11921,11922,11923,11924,11925,11926,11927,11928, #11856
+11929,11930,11931,11932,11933,11934,11935,11936,11937,11938,11939,11940,11941,11942,11943,11944, #11872
+11945,11946,11947,11948,11949,4976,11950,11951,11952,11953,11954,11955,11956,11957,11958,11959, #11888
+11960,11961,11962,11963,11964,11965,11966,11967,11968,11969,11970,11971,11972,11973,11974,11975, #11904
+11976,11977,11978,11979,11980,11981,11982,11983,11984,11985,11986,11987,4196,11988,11989,11990, #11920
+11991,11992,4977,11993,11994,11995,11996,11997,11998,11999,12000,12001,12002,12003,12004,12005, #11936
+12006,12007,12008,12009,12010,12011,12012,12013,12014,12015,12016,12017,12018,12019,12020,12021, #11952
+12022,12023,12024,12025,12026,12027,12028,12029,12030,12031,12032,12033,12034,12035,12036,12037, #11968
+12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,12050,12051,12052,12053, #11984
+12054,12055,12056,12057,12058,12059,12060,12061,4978,12062,12063,12064,12065,12066,12067,12068, #12000
+12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084, #12016
+12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,12098,12099,12100, #12032
+12101,12102,12103,12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,12116, #12048
+12117,12118,12119,12120,12121,12122,12123,4979,12124,12125,12126,12127,12128,4197,12129,12130, #12064
+12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,12146, #12080
+12147,12148,12149,12150,12151,12152,12153,12154,4980,12155,12156,12157,12158,12159,12160,4494, #12096
+12161,12162,12163,12164,3811,12165,12166,12167,12168,12169,4495,12170,12171,4496,12172,12173, #12112
+12174,12175,12176,3812,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,12188, #12128
+12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204, #12144
+12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,12218,12219,12220, #12160
+12221,4981,12222,12223,12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235, #12176
+4982,12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,4983,12246,12247,12248,12249, #12192
+4984,12250,12251,12252,12253,12254,12255,12256,12257,12258,12259,12260,12261,12262,12263,12264, #12208
+4985,12265,4497,12266,12267,12268,12269,12270,12271,12272,12273,12274,12275,12276,12277,12278, #12224
+12279,12280,12281,12282,12283,12284,12285,12286,12287,4986,12288,12289,12290,12291,12292,12293, #12240
+12294,12295,12296,2473,12297,12298,12299,12300,12301,12302,12303,12304,12305,12306,12307,12308, #12256
+12309,12310,12311,12312,12313,12314,12315,12316,12317,12318,12319,3963,12320,12321,12322,12323, #12272
+12324,12325,12326,12327,12328,12329,12330,12331,12332,4987,12333,12334,12335,12336,12337,12338, #12288
+12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354, #12304
+12355,12356,12357,12358,12359,3964,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369, #12320
+12370,3965,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384, #12336
+12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400, #12352
+12401,12402,12403,12404,12405,12406,12407,12408,4988,12409,12410,12411,12412,12413,12414,12415, #12368
+12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431, #12384
+12432,12433,12434,12435,12436,12437,12438,3554,12439,12440,12441,12442,12443,12444,12445,12446, #12400
+12447,12448,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462, #12416
+12463,12464,4989,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477, #12432
+12478,12479,12480,4990,12481,12482,12483,12484,12485,12486,12487,12488,12489,4498,12490,12491, #12448
+12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507, #12464
+12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523, #12480
+12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,12535,12536,12537,12538,12539, #12496
+12540,12541,12542,12543,12544,12545,12546,12547,12548,12549,12550,12551,4991,12552,12553,12554, #12512
+12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570, #12528
+12571,12572,12573,12574,12575,12576,12577,12578,3036,12579,12580,12581,12582,12583,3966,12584, #12544
+12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,12596,12597,12598,12599,12600, #12560
+12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616, #12576
+12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632, #12592
+12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,4499,12647, #12608
+12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663, #12624
+12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679, #12640
+12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695, #12656
+12696,12697,12698,4992,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,12710, #12672
+12711,12712,12713,12714,12715,12716,12717,12718,12719,12720,12721,12722,12723,12724,12725,12726, #12688
+12727,12728,12729,12730,12731,12732,12733,12734,12735,12736,12737,12738,12739,12740,12741,12742, #12704
+12743,12744,12745,12746,12747,12748,12749,12750,12751,12752,12753,12754,12755,12756,12757,12758, #12720
+12759,12760,12761,12762,12763,12764,12765,12766,12767,12768,12769,12770,12771,12772,12773,12774, #12736
+12775,12776,12777,12778,4993,2175,12779,12780,12781,12782,12783,12784,12785,12786,4500,12787, #12752
+12788,12789,12790,12791,12792,12793,12794,12795,12796,12797,12798,12799,12800,12801,12802,12803, #12768
+12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819, #12784
+12820,12821,12822,12823,12824,12825,12826,4198,3967,12827,12828,12829,12830,12831,12832,12833, #12800
+12834,12835,12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849, #12816
+12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,4199,12862,12863,12864, #12832
+12865,12866,12867,12868,12869,12870,12871,12872,12873,12874,12875,12876,12877,12878,12879,12880, #12848
+12881,12882,12883,12884,12885,12886,12887,4501,12888,12889,12890,12891,12892,12893,12894,12895, #12864
+12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911, #12880
+12912,4994,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,12926, #12896
+12927,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942, #12912
+12943,12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,1772,12957, #12928
+12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973, #12944
+12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,12986,12987,12988,12989, #12960
+12990,12991,12992,12993,12994,12995,12996,12997,4502,12998,4503,12999,13000,13001,13002,13003, #12976
+4504,13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018, #12992
+13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,3449,13030,13031,13032,13033, #13008
+13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,13046,13047,13048,13049, #13024
+13050,13051,13052,13053,13054,13055,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065, #13040
+13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081, #13056
+13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,13094,13095,13096,13097, #13072
+13098,13099,13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113, #13088
+13114,13115,13116,13117,13118,3968,13119,4995,13120,13121,13122,13123,13124,13125,13126,13127, #13104
+4505,13128,13129,13130,13131,13132,13133,13134,4996,4506,13135,13136,13137,13138,13139,4997, #13120
+13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,13154,13155, #13136
+13156,13157,13158,13159,4998,13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170, #13152
+13171,13172,13173,13174,13175,13176,4999,13177,13178,13179,13180,13181,13182,13183,13184,13185, #13168
+13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201, #13184
+13202,13203,13204,13205,13206,5000,13207,13208,13209,13210,13211,13212,13213,13214,13215,13216, #13200
+13217,13218,13219,13220,13221,13222,13223,13224,13225,13226,13227,4200,5001,13228,13229,13230, #13216
+13231,13232,13233,13234,13235,13236,13237,13238,13239,13240,3969,13241,13242,13243,13244,3970, #13232
+13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260, #13248
+13261,13262,13263,13264,13265,13266,13267,13268,3450,13269,13270,13271,13272,13273,13274,13275, #13264
+13276,5002,13277,13278,13279,13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290, #13280
+13291,13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,3813,13303,13304,13305, #13296
+13306,13307,13308,13309,13310,13311,13312,13313,13314,13315,13316,13317,13318,13319,13320,13321, #13312
+13322,13323,13324,13325,13326,13327,13328,4507,13329,13330,13331,13332,13333,13334,13335,13336, #13328
+13337,13338,13339,13340,13341,5003,13342,13343,13344,13345,13346,13347,13348,13349,13350,13351, #13344
+13352,13353,13354,13355,13356,13357,13358,13359,13360,13361,13362,13363,13364,13365,13366,13367, #13360
+5004,13368,13369,13370,13371,13372,13373,13374,13375,13376,13377,13378,13379,13380,13381,13382, #13376
+13383,13384,13385,13386,13387,13388,13389,13390,13391,13392,13393,13394,13395,13396,13397,13398, #13392
+13399,13400,13401,13402,13403,13404,13405,13406,13407,13408,13409,13410,13411,13412,13413,13414, #13408
+13415,13416,13417,13418,13419,13420,13421,13422,13423,13424,13425,13426,13427,13428,13429,13430, #13424
+13431,13432,4508,13433,13434,13435,4201,13436,13437,13438,13439,13440,13441,13442,13443,13444, #13440
+13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,5005,13458,13459, #13456
+13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,4509,13471,13472,13473,13474, #13472
+13475,13476,13477,13478,13479,13480,13481,13482,13483,13484,13485,13486,13487,13488,13489,13490, #13488
+13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13502,13503,13504,13505,13506, #13504
+13507,13508,13509,13510,13511,13512,13513,13514,13515,13516,13517,13518,13519,13520,13521,13522, #13520
+13523,13524,13525,13526,13527,13528,13529,13530,13531,13532,13533,13534,13535,13536,13537,13538, #13536
+13539,13540,13541,13542,13543,13544,13545,13546,13547,13548,13549,13550,13551,13552,13553,13554, #13552
+13555,13556,13557,13558,13559,13560,13561,13562,13563,13564,13565,13566,13567,13568,13569,13570, #13568
+13571,13572,13573,13574,13575,13576,13577,13578,13579,13580,13581,13582,13583,13584,13585,13586, #13584
+13587,13588,13589,13590,13591,13592,13593,13594,13595,13596,13597,13598,13599,13600,13601,13602, #13600
+13603,13604,13605,13606,13607,13608,13609,13610,13611,13612,13613,13614,13615,13616,13617,13618, #13616
+13619,13620,13621,13622,13623,13624,13625,13626,13627,13628,13629,13630,13631,13632,13633,13634, #13632
+13635,13636,13637,13638,13639,13640,13641,13642,5006,13643,13644,13645,13646,13647,13648,13649, #13648
+13650,13651,5007,13652,13653,13654,13655,13656,13657,13658,13659,13660,13661,13662,13663,13664, #13664
+13665,13666,13667,13668,13669,13670,13671,13672,13673,13674,13675,13676,13677,13678,13679,13680, #13680
+13681,13682,13683,13684,13685,13686,13687,13688,13689,13690,13691,13692,13693,13694,13695,13696, #13696
+13697,13698,13699,13700,13701,13702,13703,13704,13705,13706,13707,13708,13709,13710,13711,13712, #13712
+13713,13714,13715,13716,13717,13718,13719,13720,13721,13722,13723,13724,13725,13726,13727,13728, #13728
+13729,13730,13731,13732,13733,13734,13735,13736,13737,13738,13739,13740,13741,13742,13743,13744, #13744
+13745,13746,13747,13748,13749,13750,13751,13752,13753,13754,13755,13756,13757,13758,13759,13760, #13760
+13761,13762,13763,13764,13765,13766,13767,13768,13769,13770,13771,13772,13773,13774,3273,13775, #13776
+13776,13777,13778,13779,13780,13781,13782,13783,13784,13785,13786,13787,13788,13789,13790,13791, #13792
+13792,13793,13794,13795,13796,13797,13798,13799,13800,13801,13802,13803,13804,13805,13806,13807, #13808
+13808,13809,13810,13811,13812,13813,13814,13815,13816,13817,13818,13819,13820,13821,13822,13823, #13824
+13824,13825,13826,13827,13828,13829,13830,13831,13832,13833,13834,13835,13836,13837,13838,13839, #13840
+13840,13841,13842,13843,13844,13845,13846,13847,13848,13849,13850,13851,13852,13853,13854,13855, #13856
+13856,13857,13858,13859,13860,13861,13862,13863,13864,13865,13866,13867,13868,13869,13870,13871, #13872
+13872,13873,13874,13875,13876,13877,13878,13879,13880,13881,13882,13883,13884,13885,13886,13887, #13888
+13888,13889,13890,13891,13892,13893,13894,13895,13896,13897,13898,13899,13900,13901,13902,13903, #13904
+13904,13905,13906,13907,13908,13909,13910,13911,13912,13913,13914,13915,13916,13917,13918,13919, #13920
+13920,13921,13922,13923,13924,13925,13926,13927,13928,13929,13930,13931,13932,13933,13934,13935, #13936
+13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951, #13952
+13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,13967, #13968
+13968,13969,13970,13971,13972) #13973
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/big5prober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/big5prober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/big5prober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/big5prober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,42 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import Big5DistributionAnalysis
+from .mbcssm import Big5SMModel
+
+
+class Big5Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(Big5SMModel)
+        self._mDistributionAnalyzer = Big5DistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "Big5"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/chardetect.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/chardetect.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/chardetect.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/chardetect.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+"""
+Script which takes one or more file paths and reports on their detected
+encodings
+
+Example::
+
+    % chardetect somefile someotherfile
+    somefile: windows-1252 with confidence 0.5
+    someotherfile: ascii with confidence 1.0
+
+If no paths are provided, it takes its input from stdin.
+
+"""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import argparse
+import sys
+from io import open
+
+from chardet import __version__
+from chardet.universaldetector import UniversalDetector
+
+
+def description_of(lines, name='stdin'):
+    """
+    Return a string describing the probable encoding of a file or
+    list of strings.
+
+    :param lines: The lines to get the encoding of.
+    :type lines: Iterable of bytes
+    :param name: Name of file or collection of lines
+    :type name: str
+    """
+    u = UniversalDetector()
+    for line in lines:
+        u.feed(line)
+    u.close()
+    result = u.result
+    if result['encoding']:
+        return '{0}: {1} with confidence {2}'.format(name, result['encoding'],
+                                                     result['confidence'])
+    else:
+        return '{0}: no result'.format(name)
+
+
+def main(argv=None):
+    '''
+    Handles command line arguments and gets things started.
+
+    :param argv: List of arguments, as if specified on the command-line.
+                 If None, ``sys.argv[1:]`` is used instead.
+    :type argv: list of str
+    '''
+    # Get command line arguments
+    parser = argparse.ArgumentParser(
+        description="Takes one or more file paths and reports their detected \
+                     encodings",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        conflict_handler='resolve')
+    parser.add_argument('input',
+                        help='File whose encoding we would like to determine.',
+                        type=argparse.FileType('rb'), nargs='*',
+                        default=[sys.stdin])
+    parser.add_argument('--version', action='version',
+                        version='%(prog)s {0}'.format(__version__))
+    args = parser.parse_args(argv)
+
+    for f in args.input:
+        if f.isatty():
+            print("You are running chardetect interactively. Press " +
+                  "CTRL-D twice at the start of a blank line to signal the " +
+                  "end of your input. If you want help, run chardetect " +
+                  "--help\n", file=sys.stderr)
+        print(description_of(f, f.name))
+
+
+if __name__ == '__main__':
+    main()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/chardistribution.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/chardistribution.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/chardistribution.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/chardistribution.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,231 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .euctwfreq import (EUCTWCharToFreqOrder, EUCTW_TABLE_SIZE,
+                        EUCTW_TYPICAL_DISTRIBUTION_RATIO)
+from .euckrfreq import (EUCKRCharToFreqOrder, EUCKR_TABLE_SIZE,
+                        EUCKR_TYPICAL_DISTRIBUTION_RATIO)
+from .gb2312freq import (GB2312CharToFreqOrder, GB2312_TABLE_SIZE,
+                         GB2312_TYPICAL_DISTRIBUTION_RATIO)
+from .big5freq import (Big5CharToFreqOrder, BIG5_TABLE_SIZE,
+                       BIG5_TYPICAL_DISTRIBUTION_RATIO)
+from .jisfreq import (JISCharToFreqOrder, JIS_TABLE_SIZE,
+                      JIS_TYPICAL_DISTRIBUTION_RATIO)
+from .compat import wrap_ord
+
+ENOUGH_DATA_THRESHOLD = 1024
+SURE_YES = 0.99
+SURE_NO = 0.01
+MINIMUM_DATA_THRESHOLD = 3
+
+
+class CharDistributionAnalysis:
+    def __init__(self):
+        # Mapping table to get frequency order from char order (get from
+        # GetOrder())
+        self._mCharToFreqOrder = None
+        self._mTableSize = None  # Size of above table
+        # This is a constant value which varies from language to language,
+        # used in calculating confidence.  See
+        # http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html
+        # for further detail.
+        self._mTypicalDistributionRatio = None
+        self.reset()
+
+    def reset(self):
+        """reset analyser, clear any state"""
+        # If this flag is set to True, detection is done and conclusion has
+        # been made
+        self._mDone = False
+        self._mTotalChars = 0  # Total characters encountered
+        # The number of characters whose frequency order is less than 512
+        self._mFreqChars = 0
+
+    def feed(self, aBuf, aCharLen):
+        """feed a character with known length"""
+        if aCharLen == 2:
+            # we only care about 2-bytes character in our distribution analysis
+            order = self.get_order(aBuf)
+        else:
+            order = -1
+        if order >= 0:
+            self._mTotalChars += 1
+            # order is valid
+            if order < self._mTableSize:
+                if 512 > self._mCharToFreqOrder[order]:
+                    self._mFreqChars += 1
+
+    def get_confidence(self):
+        """return confidence based on existing data"""
+        # if we didn't receive any character in our consideration range,
+        # return negative answer
+        if self._mTotalChars <= 0 or self._mFreqChars <= MINIMUM_DATA_THRESHOLD:
+            return SURE_NO
+
+        if self._mTotalChars != self._mFreqChars:
+            r = (self._mFreqChars / ((self._mTotalChars - self._mFreqChars)
+                 * self._mTypicalDistributionRatio))
+            if r < SURE_YES:
+                return r
+
+        # normalize confidence (we don't want to be 100% sure)
+        return SURE_YES
+
+    def got_enough_data(self):
+        # It is not necessary to receive all data to draw conclusion.
+        # For charset detection, certain amount of data is enough
+        return self._mTotalChars > ENOUGH_DATA_THRESHOLD
+
+    def get_order(self, aBuf):
+        # We do not handle characters based on the original encoding string,
+        # but convert this encoding string to a number, here called order.
+        # This allows multiple encodings of a language to share one frequency
+        # table.
+        return -1
+
+
+class EUCTWDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = EUCTWCharToFreqOrder
+        self._mTableSize = EUCTW_TABLE_SIZE
+        self._mTypicalDistributionRatio = EUCTW_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-TW encoding, we are interested
+        #   first  byte range: 0xc4 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xC4:
+            return 94 * (first_char - 0xC4) + wrap_ord(aBuf[1]) - 0xA1
+        else:
+            return -1
+
+
+class EUCKRDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = EUCKRCharToFreqOrder
+        self._mTableSize = EUCKR_TABLE_SIZE
+        self._mTypicalDistributionRatio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-KR encoding, we are interested
+        #   first  byte range: 0xb0 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xB0:
+            return 94 * (first_char - 0xB0) + wrap_ord(aBuf[1]) - 0xA1
+        else:
+            return -1
+
+
+class GB2312DistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = GB2312CharToFreqOrder
+        self._mTableSize = GB2312_TABLE_SIZE
+        self._mTypicalDistributionRatio = GB2312_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for GB2312 encoding, we are interested
+        #  first  byte range: 0xb0 -- 0xfe
+        #  second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0xB0) and (second_char >= 0xA1):
+            return 94 * (first_char - 0xB0) + second_char - 0xA1
+        else:
+            return -1
+
+
+class Big5DistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = Big5CharToFreqOrder
+        self._mTableSize = BIG5_TABLE_SIZE
+        self._mTypicalDistributionRatio = BIG5_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for big5 encoding, we are interested
+        #   first  byte range: 0xa4 -- 0xfe
+        #   second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if first_char >= 0xA4:
+            if second_char >= 0xA1:
+                return 157 * (first_char - 0xA4) + second_char - 0xA1 + 63
+            else:
+                return 157 * (first_char - 0xA4) + second_char - 0x40
+        else:
+            return -1
+
+
+class SJISDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = JISCharToFreqOrder
+        self._mTableSize = JIS_TABLE_SIZE
+        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for sjis encoding, we are interested
+        #   first  byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe
+        #   second byte range: 0x40 -- 0x7e,  0x81 -- oxfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0x81) and (first_char <= 0x9F):
+            order = 188 * (first_char - 0x81)
+        elif (first_char >= 0xE0) and (first_char <= 0xEF):
+            order = 188 * (first_char - 0xE0 + 31)
+        else:
+            return -1
+        order = order + second_char - 0x40
+        if second_char > 0x7F:
+            order = -1
+        return order
+
+
+class EUCJPDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = JISCharToFreqOrder
+        self._mTableSize = JIS_TABLE_SIZE
+        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-JP encoding, we are interested
+        #   first  byte range: 0xa0 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        char = wrap_ord(aBuf[0])
+        if char >= 0xA0:
+            return 94 * (char - 0xA1) + wrap_ord(aBuf[1]) - 0xa1
+        else:
+            return -1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/charsetgroupprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/charsetgroupprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/charsetgroupprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/charsetgroupprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,106 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+# 
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import sys
+from .charsetprober import CharSetProber
+
+
+class CharSetGroupProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mActiveNum = 0
+        self._mProbers = []
+        self._mBestGuessProber = None
+
+    def reset(self):
+        CharSetProber.reset(self)
+        self._mActiveNum = 0
+        for prober in self._mProbers:
+            if prober:
+                prober.reset()
+                prober.active = True
+                self._mActiveNum += 1
+        self._mBestGuessProber = None
+
+    def get_charset_name(self):
+        if not self._mBestGuessProber:
+            self.get_confidence()
+            if not self._mBestGuessProber:
+                return None
+#                self._mBestGuessProber = self._mProbers[0]
+        return self._mBestGuessProber.get_charset_name()
+
+    def feed(self, aBuf):
+        for prober in self._mProbers:
+            if not prober:
+                continue
+            if not prober.active:
+                continue
+            st = prober.feed(aBuf)
+            if not st:
+                continue
+            if st == constants.eFoundIt:
+                self._mBestGuessProber = prober
+                return self.get_state()
+            elif st == constants.eNotMe:
+                prober.active = False
+                self._mActiveNum -= 1
+                if self._mActiveNum <= 0:
+                    self._mState = constants.eNotMe
+                    return self.get_state()
+        return self.get_state()
+
+    def get_confidence(self):
+        st = self.get_state()
+        if st == constants.eFoundIt:
+            return 0.99
+        elif st == constants.eNotMe:
+            return 0.01
+        bestConf = 0.0
+        self._mBestGuessProber = None
+        for prober in self._mProbers:
+            if not prober:
+                continue
+            if not prober.active:
+                if constants._debug:
+                    sys.stderr.write(prober.get_charset_name()
+                                     + ' not active\n')
+                continue
+            cf = prober.get_confidence()
+            if constants._debug:
+                sys.stderr.write('%s confidence = %s\n' %
+                                 (prober.get_charset_name(), cf))
+            if bestConf < cf:
+                bestConf = cf
+                self._mBestGuessProber = prober
+        if not self._mBestGuessProber:
+            return 0.0
+        return bestConf
+#        else:
+#            self._mBestGuessProber = self._mProbers[0]
+#            return self._mBestGuessProber.get_confidence()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/charsetprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/charsetprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/charsetprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/charsetprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,62 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import re
+
+
+class CharSetProber:
+    def __init__(self):
+        pass
+
+    def reset(self):
+        self._mState = constants.eDetecting
+
+    def get_charset_name(self):
+        return None
+
+    def feed(self, aBuf):
+        pass
+
+    def get_state(self):
+        return self._mState
+
+    def get_confidence(self):
+        return 0.0
+
+    def filter_high_bit_only(self, aBuf):
+        aBuf = re.sub(b'([\x00-\x7F])+', b' ', aBuf)
+        return aBuf
+
+    def filter_without_english_letters(self, aBuf):
+        aBuf = re.sub(b'([A-Za-z])+', b' ', aBuf)
+        return aBuf
+
+    def filter_with_english_letters(self, aBuf):
+        # TODO
+        return aBuf
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/codingstatemachine.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/codingstatemachine.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/codingstatemachine.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/codingstatemachine.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,61 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .constants import eStart
+from .compat import wrap_ord
+
+
+class CodingStateMachine:
+    def __init__(self, sm):
+        self._mModel = sm
+        self._mCurrentBytePos = 0
+        self._mCurrentCharLen = 0
+        self.reset()
+
+    def reset(self):
+        self._mCurrentState = eStart
+
+    def next_state(self, c):
+        # for each byte we get its class
+        # if it is first byte, we also get byte length
+        # PY3K: aBuf is a byte stream, so c is an int, not a byte
+        byteCls = self._mModel['classTable'][wrap_ord(c)]
+        if self._mCurrentState == eStart:
+            self._mCurrentBytePos = 0
+            self._mCurrentCharLen = self._mModel['charLenTable'][byteCls]
+        # from byte's class and stateTable, we get its next state
+        curr_state = (self._mCurrentState * self._mModel['classFactor']
+                      + byteCls)
+        self._mCurrentState = self._mModel['stateTable'][curr_state]
+        self._mCurrentBytePos += 1
+        return self._mCurrentState
+
+    def get_current_charlen(self):
+        return self._mCurrentCharLen
+
+    def get_coding_state_machine(self):
+        return self._mModel['name']
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/compat.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/compat.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/compat.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/compat.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,34 @@
+######################## BEGIN LICENSE BLOCK ########################
+# Contributor(s):
+#   Ian Cordasco - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+
+
+if sys.version_info < (3, 0):
+    base_str = (str, unicode)
+else:
+    base_str = (bytes, str)
+
+
+def wrap_ord(a):
+    if sys.version_info < (3, 0) and isinstance(a, base_str):
+        return ord(a)
+    else:
+        return a
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/constants.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/constants.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/constants.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/constants.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,39 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+_debug = 0
+
+eDetecting = 0
+eFoundIt = 1
+eNotMe = 2
+
+eStart = 0
+eError = 1
+eItsMe = 2
+
+SHORTCUT_THRESHOLD = 0.95
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/cp949prober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/cp949prober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/cp949prober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/cp949prober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,44 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCKRDistributionAnalysis
+from .mbcssm import CP949SMModel
+
+
+class CP949Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(CP949SMModel)
+        # NOTE: CP949 is a superset of EUC-KR, so the distribution should be
+        #       not different.
+        self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "CP949"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/escprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/escprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/escprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/escprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,86 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+from .escsm import (HZSMModel, ISO2022CNSMModel, ISO2022JPSMModel,
+                    ISO2022KRSMModel)
+from .charsetprober import CharSetProber
+from .codingstatemachine import CodingStateMachine
+from .compat import wrap_ord
+
+
+class EscCharSetProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mCodingSM = [
+            CodingStateMachine(HZSMModel),
+            CodingStateMachine(ISO2022CNSMModel),
+            CodingStateMachine(ISO2022JPSMModel),
+            CodingStateMachine(ISO2022KRSMModel)
+        ]
+        self.reset()
+
+    def reset(self):
+        CharSetProber.reset(self)
+        for codingSM in self._mCodingSM:
+            if not codingSM:
+                continue
+            codingSM.active = True
+            codingSM.reset()
+        self._mActiveSM = len(self._mCodingSM)
+        self._mDetectedCharset = None
+
+    def get_charset_name(self):
+        return self._mDetectedCharset
+
+    def get_confidence(self):
+        if self._mDetectedCharset:
+            return 0.99
+        else:
+            return 0.00
+
+    def feed(self, aBuf):
+        for c in aBuf:
+            # PY3K: aBuf is a byte array, so c is an int, not a byte
+            for codingSM in self._mCodingSM:
+                if not codingSM:
+                    continue
+                if not codingSM.active:
+                    continue
+                codingState = codingSM.next_state(wrap_ord(c))
+                if codingState == constants.eError:
+                    codingSM.active = False
+                    self._mActiveSM -= 1
+                    if self._mActiveSM <= 0:
+                        self._mState = constants.eNotMe
+                        return self.get_state()
+                elif codingState == constants.eItsMe:
+                    self._mState = constants.eFoundIt
+                    self._mDetectedCharset = codingSM.get_coding_state_machine()  # nopep8
+                    return self.get_state()
+
+        return self.get_state()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/escsm.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/escsm.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/escsm.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/escsm.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,242 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .constants import eStart, eError, eItsMe
+
+HZ_cls = (
+1,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,0,0,0,0,  # 20 - 27
+0,0,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,0,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,4,0,5,2,0,  # 78 - 7f
+1,1,1,1,1,1,1,1,  # 80 - 87
+1,1,1,1,1,1,1,1,  # 88 - 8f
+1,1,1,1,1,1,1,1,  # 90 - 97
+1,1,1,1,1,1,1,1,  # 98 - 9f
+1,1,1,1,1,1,1,1,  # a0 - a7
+1,1,1,1,1,1,1,1,  # a8 - af
+1,1,1,1,1,1,1,1,  # b0 - b7
+1,1,1,1,1,1,1,1,  # b8 - bf
+1,1,1,1,1,1,1,1,  # c0 - c7
+1,1,1,1,1,1,1,1,  # c8 - cf
+1,1,1,1,1,1,1,1,  # d0 - d7
+1,1,1,1,1,1,1,1,  # d8 - df
+1,1,1,1,1,1,1,1,  # e0 - e7
+1,1,1,1,1,1,1,1,  # e8 - ef
+1,1,1,1,1,1,1,1,  # f0 - f7
+1,1,1,1,1,1,1,1,  # f8 - ff
+)
+
+HZ_st = (
+eStart,eError,     3,eStart,eStart,eStart,eError,eError,# 00-07
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
+eItsMe,eItsMe,eError,eError,eStart,eStart,     4,eError,# 10-17
+     5,eError,     6,eError,     5,     5,     4,eError,# 18-1f
+     4,eError,     4,     4,     4,eError,     4,eError,# 20-27
+     4,eItsMe,eStart,eStart,eStart,eStart,eStart,eStart,# 28-2f
+)
+
+HZCharLenTable = (0, 0, 0, 0, 0, 0)
+
+HZSMModel = {'classTable': HZ_cls,
+             'classFactor': 6,
+             'stateTable': HZ_st,
+             'charLenTable': HZCharLenTable,
+             'name': "HZ-GB-2312"}
+
+ISO2022CN_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,0,0,0,0,  # 20 - 27
+0,3,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,4,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
+)
+
+ISO2022CN_st = (
+eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
+eStart,eError,eError,eError,eError,eError,eError,eError,# 08-0f
+eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
+eItsMe,eItsMe,eItsMe,eError,eError,eError,     4,eError,# 18-1f
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 20-27
+     5,     6,eError,eError,eError,eError,eError,eError,# 28-2f
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 30-37
+eError,eError,eError,eError,eError,eItsMe,eError,eStart,# 38-3f
+)
+
+ISO2022CNCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0)
+
+ISO2022CNSMModel = {'classTable': ISO2022CN_cls,
+                    'classFactor': 9,
+                    'stateTable': ISO2022CN_st,
+                    'charLenTable': ISO2022CNCharLenTable,
+                    'name': "ISO-2022-CN"}
+
+ISO2022JP_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,2,2,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,7,0,0,0,  # 20 - 27
+3,0,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+6,0,4,0,8,0,0,0,  # 40 - 47
+0,9,5,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
+)
+
+ISO2022JP_st = (
+eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
+eStart,eStart,eError,eError,eError,eError,eError,eError,# 08-0f
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
+eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,# 18-1f
+eError,     5,eError,eError,eError,     4,eError,eError,# 20-27
+eError,eError,eError,     6,eItsMe,eError,eItsMe,eError,# 28-2f
+eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,# 30-37
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 38-3f
+eError,eError,eError,eError,eItsMe,eError,eStart,eStart,# 40-47
+)
+
+ISO2022JPCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+
+ISO2022JPSMModel = {'classTable': ISO2022JP_cls,
+                    'classFactor': 10,
+                    'stateTable': ISO2022JP_st,
+                    'charLenTable': ISO2022JPCharLenTable,
+                    'name': "ISO-2022-JP"}
+
+ISO2022KR_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,3,0,0,0,  # 20 - 27
+0,4,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,5,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
+)
+
+ISO2022KR_st = (
+eStart,     3,eError,eStart,eStart,eStart,eError,eError,# 00-07
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
+eItsMe,eItsMe,eError,eError,eError,     4,eError,eError,# 10-17
+eError,eError,eError,eError,     5,eError,eError,eError,# 18-1f
+eError,eError,eError,eItsMe,eStart,eStart,eStart,eStart,# 20-27
+)
+
+ISO2022KRCharLenTable = (0, 0, 0, 0, 0, 0)
+
+ISO2022KRSMModel = {'classTable': ISO2022KR_cls,
+                    'classFactor': 6,
+                    'stateTable': ISO2022KR_st,
+                    'charLenTable': ISO2022KRCharLenTable,
+                    'name': "ISO-2022-KR"}
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/eucjpprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/eucjpprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/eucjpprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/eucjpprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,90 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from . import constants
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCJPDistributionAnalysis
+from .jpcntx import EUCJPContextAnalysis
+from .mbcssm import EUCJPSMModel
+
+
+class EUCJPProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(EUCJPSMModel)
+        self._mDistributionAnalyzer = EUCJPDistributionAnalysis()
+        self._mContextAnalyzer = EUCJPContextAnalysis()
+        self.reset()
+
+    def reset(self):
+        MultiByteCharSetProber.reset(self)
+        self._mContextAnalyzer.reset()
+
+    def get_charset_name(self):
+        return "EUC-JP"
+
+    def feed(self, aBuf):
+        aLen = len(aBuf)
+        for i in range(0, aLen):
+            # PY3K: aBuf is a byte array, so aBuf[i] is an int, not a byte
+            codingState = self._mCodingSM.next_state(aBuf[i])
+            if codingState == constants.eError:
+                if constants._debug:
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                charLen = self._mCodingSM.get_current_charlen()
+                if i == 0:
+                    self._mLastChar[1] = aBuf[0]
+                    self._mContextAnalyzer.feed(self._mLastChar, charLen)
+                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
+                else:
+                    self._mContextAnalyzer.feed(aBuf[i - 1:i + 1], charLen)
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
+        self._mLastChar[0] = aBuf[aLen - 1]
+
+        if self.get_state() == constants.eDetecting:
+            if (self._mContextAnalyzer.got_enough_data() and
+               (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        contxtCf = self._mContextAnalyzer.get_confidence()
+        distribCf = self._mDistributionAnalyzer.get_confidence()
+        return max(contxtCf, distribCf)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euckrfreq.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euckrfreq.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euckrfreq.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euckrfreq.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,596 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# Sampling from about 20M text materials include literature and computer technology
+
+# 128  --> 0.79
+# 256  --> 0.92
+# 512  --> 0.986
+# 1024 --> 0.99944
+# 2048 --> 0.99999
+#
+# Idea Distribution Ratio = 0.98653 / (1-0.98653) = 73.24
+# Random Distribution Ration = 512 / (2350-512) = 0.279.
+# 
+# Typical Distribution Ratio  
+
+EUCKR_TYPICAL_DISTRIBUTION_RATIO = 6.0
+
+EUCKR_TABLE_SIZE = 2352
+
+# Char to FreqOrder table , 
+EUCKRCharToFreqOrder = ( \
+  13, 130, 120,1396, 481,1719,1720, 328, 609, 212,1721, 707, 400, 299,1722,  87,
+1397,1723, 104, 536,1117,1203,1724,1267, 685,1268, 508,1725,1726,1727,1728,1398,
+1399,1729,1730,1731, 141, 621, 326,1057, 368,1732, 267, 488,  20,1733,1269,1734,
+ 945,1400,1735,  47, 904,1270,1736,1737, 773, 248,1738, 409, 313, 786, 429,1739,
+ 116, 987, 813,1401, 683,  75,1204, 145,1740,1741,1742,1743,  16, 847, 667, 622,
+ 708,1744,1745,1746, 966, 787, 304, 129,1747,  60, 820, 123, 676,1748,1749,1750,
+1751, 617,1752, 626,1753,1754,1755,1756, 653,1757,1758,1759,1760,1761,1762, 856,
+ 344,1763,1764,1765,1766,  89, 401, 418, 806, 905, 848,1767,1768,1769, 946,1205,
+ 709,1770,1118,1771, 241,1772,1773,1774,1271,1775, 569,1776, 999,1777,1778,1779,
+1780, 337, 751,1058,  28, 628, 254,1781, 177, 906, 270, 349, 891,1079,1782,  19,
+1783, 379,1784, 315,1785, 629, 754,1402, 559,1786, 636, 203,1206,1787, 710, 567,
+1788, 935, 814,1789,1790,1207, 766, 528,1791,1792,1208,1793,1794,1795,1796,1797,
+1403,1798,1799, 533,1059,1404,1405,1156,1406, 936, 884,1080,1800, 351,1801,1802,
+1803,1804,1805, 801,1806,1807,1808,1119,1809,1157, 714, 474,1407,1810, 298, 899,
+ 885,1811,1120, 802,1158,1812, 892,1813,1814,1408, 659,1815,1816,1121,1817,1818,
+1819,1820,1821,1822, 319,1823, 594, 545,1824, 815, 937,1209,1825,1826, 573,1409,
+1022,1827,1210,1828,1829,1830,1831,1832,1833, 556, 722, 807,1122,1060,1834, 697,
+1835, 900, 557, 715,1836,1410, 540,1411, 752,1159, 294, 597,1211, 976, 803, 770,
+1412,1837,1838,  39, 794,1413, 358,1839, 371, 925,1840, 453, 661, 788, 531, 723,
+ 544,1023,1081, 869,  91,1841, 392, 430, 790, 602,1414, 677,1082, 457,1415,1416,
+1842,1843, 475, 327,1024,1417, 795, 121,1844, 733, 403,1418,1845,1846,1847, 300,
+ 119, 711,1212, 627,1848,1272, 207,1849,1850, 796,1213, 382,1851, 519,1852,1083,
+ 893,1853,1854,1855, 367, 809, 487, 671,1856, 663,1857,1858, 956, 471, 306, 857,
+1859,1860,1160,1084,1861,1862,1863,1864,1865,1061,1866,1867,1868,1869,1870,1871,
+ 282,  96, 574,1872, 502,1085,1873,1214,1874, 907,1875,1876, 827, 977,1419,1420,
+1421, 268,1877,1422,1878,1879,1880, 308,1881,   2, 537,1882,1883,1215,1884,1885,
+ 127, 791,1886,1273,1423,1887,  34, 336, 404, 643,1888, 571, 654, 894, 840,1889,
+   0, 886,1274, 122, 575, 260, 908, 938,1890,1275, 410, 316,1891,1892, 100,1893,
+1894,1123,  48,1161,1124,1025,1895, 633, 901,1276,1896,1897, 115, 816,1898, 317,
+1899, 694,1900, 909, 734,1424, 572, 866,1425, 691,  85, 524,1010, 543, 394, 841,
+1901,1902,1903,1026,1904,1905,1906,1907,1908,1909,  30, 451, 651, 988, 310,1910,
+1911,1426, 810,1216,  93,1912,1913,1277,1217,1914, 858, 759,  45,  58, 181, 610,
+ 269,1915,1916, 131,1062, 551, 443,1000, 821,1427, 957, 895,1086,1917,1918, 375,
+1919, 359,1920, 687,1921, 822,1922, 293,1923,1924,  40, 662, 118, 692,  29, 939,
+ 887, 640, 482, 174,1925,  69,1162, 728,1428, 910,1926,1278,1218,1279, 386, 870,
+ 217, 854,1163, 823,1927,1928,1929,1930, 834,1931,  78,1932, 859,1933,1063,1934,
+1935,1936,1937, 438,1164, 208, 595,1938,1939,1940,1941,1219,1125,1942, 280, 888,
+1429,1430,1220,1431,1943,1944,1945,1946,1947,1280, 150, 510,1432,1948,1949,1950,
+1951,1952,1953,1954,1011,1087,1955,1433,1043,1956, 881,1957, 614, 958,1064,1065,
+1221,1958, 638,1001, 860, 967, 896,1434, 989, 492, 553,1281,1165,1959,1282,1002,
+1283,1222,1960,1961,1962,1963,  36, 383, 228, 753, 247, 454,1964, 876, 678,1965,
+1966,1284, 126, 464, 490, 835, 136, 672, 529, 940,1088,1435, 473,1967,1968, 467,
+  50, 390, 227, 587, 279, 378, 598, 792, 968, 240, 151, 160, 849, 882,1126,1285,
+ 639,1044, 133, 140, 288, 360, 811, 563,1027, 561, 142, 523,1969,1970,1971,   7,
+ 103, 296, 439, 407, 506, 634, 990,1972,1973,1974,1975, 645,1976,1977,1978,1979,
+1980,1981, 236,1982,1436,1983,1984,1089, 192, 828, 618, 518,1166, 333,1127,1985,
+ 818,1223,1986,1987,1988,1989,1990,1991,1992,1993, 342,1128,1286, 746, 842,1994,
+1995, 560, 223,1287,  98,   8, 189, 650, 978,1288,1996,1437,1997,  17, 345, 250,
+ 423, 277, 234, 512, 226,  97, 289,  42, 167,1998, 201,1999,2000, 843, 836, 824,
+ 532, 338, 783,1090, 182, 576, 436,1438,1439, 527, 500,2001, 947, 889,2002,2003,
+2004,2005, 262, 600, 314, 447,2006, 547,2007, 693, 738,1129,2008,  71,1440, 745,
+ 619, 688,2009, 829,2010,2011, 147,2012,  33, 948,2013,2014,  74, 224,2015,  61,
+ 191, 918, 399, 637,2016,1028,1130, 257, 902,2017,2018,2019,2020,2021,2022,2023,
+2024,2025,2026, 837,2027,2028,2029,2030, 179, 874, 591,  52, 724, 246,2031,2032,
+2033,2034,1167, 969,2035,1289, 630, 605, 911,1091,1168,2036,2037,2038,1441, 912,
+2039, 623,2040,2041, 253,1169,1290,2042,1442, 146, 620, 611, 577, 433,2043,1224,
+ 719,1170, 959, 440, 437, 534,  84, 388, 480,1131, 159, 220, 198, 679,2044,1012,
+ 819,1066,1443, 113,1225, 194, 318,1003,1029,2045,2046,2047,2048,1067,2049,2050,
+2051,2052,2053,  59, 913, 112,2054, 632,2055, 455, 144, 739,1291,2056, 273, 681,
+ 499,2057, 448,2058,2059, 760,2060,2061, 970, 384, 169, 245,1132,2062,2063, 414,
+1444,2064,2065,  41, 235,2066, 157, 252, 877, 568, 919, 789, 580,2067, 725,2068,
+2069,1292,2070,2071,1445,2072,1446,2073,2074,  55, 588,  66,1447, 271,1092,2075,
+1226,2076, 960,1013, 372,2077,2078,2079,2080,2081,1293,2082,2083,2084,2085, 850,
+2086,2087,2088,2089,2090, 186,2091,1068, 180,2092,2093,2094, 109,1227, 522, 606,
+2095, 867,1448,1093, 991,1171, 926, 353,1133,2096, 581,2097,2098,2099,1294,1449,
+1450,2100, 596,1172,1014,1228,2101,1451,1295,1173,1229,2102,2103,1296,1134,1452,
+ 949,1135,2104,2105,1094,1453,1454,1455,2106,1095,2107,2108,2109,2110,2111,2112,
+2113,2114,2115,2116,2117, 804,2118,2119,1230,1231, 805,1456, 405,1136,2120,2121,
+2122,2123,2124, 720, 701,1297, 992,1457, 927,1004,2125,2126,2127,2128,2129,2130,
+  22, 417,2131, 303,2132, 385,2133, 971, 520, 513,2134,1174,  73,1096, 231, 274,
+ 962,1458, 673,2135,1459,2136, 152,1137,2137,2138,2139,2140,1005,1138,1460,1139,
+2141,2142,2143,2144,  11, 374, 844,2145, 154,1232,  46,1461,2146, 838, 830, 721,
+1233, 106,2147,  90, 428, 462, 578, 566,1175, 352,2148,2149, 538,1234, 124,1298,
+2150,1462, 761, 565,2151, 686,2152, 649,2153,  72, 173,2154, 460, 415,2155,1463,
+2156,1235, 305,2157,2158,2159,2160,2161,2162, 579,2163,2164,2165,2166,2167, 747,
+2168,2169,2170,2171,1464, 669,2172,2173,2174,2175,2176,1465,2177,  23, 530, 285,
+2178, 335, 729,2179, 397,2180,2181,2182,1030,2183,2184, 698,2185,2186, 325,2187,
+2188, 369,2189, 799,1097,1015, 348,2190,1069, 680,2191, 851,1466,2192,2193,  10,
+2194, 613, 424,2195, 979, 108, 449, 589,  27, 172,  81,1031,  80, 774, 281, 350,
+1032, 525, 301, 582,1176,2196, 674,1045,2197,2198,1467, 730, 762,2199,2200,2201,
+2202,1468,2203, 993,2204,2205, 266,1070, 963,1140,2206,2207,2208, 664,1098, 972,
+2209,2210,2211,1177,1469,1470, 871,2212,2213,2214,2215,2216,1471,2217,2218,2219,
+2220,2221,2222,2223,2224,2225,2226,2227,1472,1236,2228,2229,2230,2231,2232,2233,
+2234,2235,1299,2236,2237, 200,2238, 477, 373,2239,2240, 731, 825, 777,2241,2242,
+2243, 521, 486, 548,2244,2245,2246,1473,1300,  53, 549, 137, 875,  76, 158,2247,
+1301,1474, 469, 396,1016, 278, 712,2248, 321, 442, 503, 767, 744, 941,1237,1178,
+1475,2249,  82, 178,1141,1179, 973,2250,1302,2251, 297,2252,2253, 570,2254,2255,
+2256,  18, 450, 206,2257, 290, 292,1142,2258, 511, 162,  99, 346, 164, 735,2259,
+1476,1477,   4, 554, 343, 798,1099,2260,1100,2261,  43, 171,1303, 139, 215,2262,
+2263, 717, 775,2264,1033, 322, 216,2265, 831,2266, 149,2267,1304,2268,2269, 702,
+1238, 135, 845, 347, 309,2270, 484,2271, 878, 655, 238,1006,1478,2272,  67,2273,
+ 295,2274,2275, 461,2276, 478, 942, 412,2277,1034,2278,2279,2280, 265,2281, 541,
+2282,2283,2284,2285,2286,  70, 852,1071,2287,2288,2289,2290,  21,  56, 509, 117,
+ 432,2291,2292, 331, 980, 552,1101, 148, 284, 105, 393,1180,1239, 755,2293, 187,
+2294,1046,1479,2295, 340,2296,  63,1047, 230,2297,2298,1305, 763,1306, 101, 800,
+ 808, 494,2299,2300,2301, 903,2302,  37,1072,  14,   5,2303,  79, 675,2304, 312,
+2305,2306,2307,2308,2309,1480,   6,1307,2310,2311,2312,   1, 470,  35,  24, 229,
+2313, 695, 210,  86, 778,  15, 784, 592, 779,  32,  77, 855, 964,2314, 259,2315,
+ 501, 380,2316,2317,  83, 981, 153, 689,1308,1481,1482,1483,2318,2319, 716,1484,
+2320,2321,2322,2323,2324,2325,1485,2326,2327, 128,  57,  68, 261,1048, 211, 170,
+1240,  31,2328,  51, 435, 742,2329,2330,2331, 635,2332, 264, 456,2333,2334,2335,
+ 425,2336,1486, 143, 507, 263, 943,2337, 363, 920,1487, 256,1488,1102, 243, 601,
+1489,2338,2339,2340,2341,2342,2343,2344, 861,2345,2346,2347,2348,2349,2350, 395,
+2351,1490,1491,  62, 535, 166, 225,2352,2353, 668, 419,1241, 138, 604, 928,2354,
+1181,2355,1492,1493,2356,2357,2358,1143,2359, 696,2360, 387, 307,1309, 682, 476,
+2361,2362, 332,  12, 222, 156,2363, 232,2364, 641, 276, 656, 517,1494,1495,1035,
+ 416, 736,1496,2365,1017, 586,2366,2367,2368,1497,2369, 242,2370,2371,2372,1498,
+2373, 965, 713,2374,2375,2376,2377, 740, 982,1499, 944,1500,1007,2378,2379,1310,
+1501,2380,2381,2382, 785, 329,2383,2384,1502,2385,2386,2387, 932,2388,1503,2389,
+2390,2391,2392,1242,2393,2394,2395,2396,2397, 994, 950,2398,2399,2400,2401,1504,
+1311,2402,2403,2404,2405,1049, 749,2406,2407, 853, 718,1144,1312,2408,1182,1505,
+2409,2410, 255, 516, 479, 564, 550, 214,1506,1507,1313, 413, 239, 444, 339,1145,
+1036,1508,1509,1314,1037,1510,1315,2411,1511,2412,2413,2414, 176, 703, 497, 624,
+ 593, 921, 302,2415, 341, 165,1103,1512,2416,1513,2417,2418,2419, 376,2420, 700,
+2421,2422,2423, 258, 768,1316,2424,1183,2425, 995, 608,2426,2427,2428,2429, 221,
+2430,2431,2432,2433,2434,2435,2436,2437, 195, 323, 726, 188, 897, 983,1317, 377,
+ 644,1050, 879,2438, 452,2439,2440,2441,2442,2443,2444, 914,2445,2446,2447,2448,
+ 915, 489,2449,1514,1184,2450,2451, 515,  64, 427, 495,2452, 583,2453, 483, 485,
+1038, 562, 213,1515, 748, 666,2454,2455,2456,2457, 334,2458, 780, 996,1008, 705,
+1243,2459,2460,2461,2462,2463, 114,2464, 493,1146, 366, 163,1516, 961,1104,2465,
+ 291,2466,1318,1105,2467,1517, 365,2468, 355, 951,1244,2469,1319,2470, 631,2471,
+2472, 218,1320, 364, 320, 756,1518,1519,1321,1520,1322,2473,2474,2475,2476, 997,
+2477,2478,2479,2480, 665,1185,2481, 916,1521,2482,2483,2484, 584, 684,2485,2486,
+ 797,2487,1051,1186,2488,2489,2490,1522,2491,2492, 370,2493,1039,1187,  65,2494,
+ 434, 205, 463,1188,2495, 125, 812, 391, 402, 826, 699, 286, 398, 155, 781, 771,
+ 585,2496, 590, 505,1073,2497, 599, 244, 219, 917,1018, 952, 646,1523,2498,1323,
+2499,2500,  49, 984, 354, 741,2501, 625,2502,1324,2503,1019, 190, 357, 757, 491,
+  95, 782, 868,2504,2505,2506,2507,2508,2509, 134,1524,1074, 422,1525, 898,2510,
+ 161,2511,2512,2513,2514, 769,2515,1526,2516,2517, 411,1325,2518, 472,1527,2519,
+2520,2521,2522,2523,2524, 985,2525,2526,2527,2528,2529,2530, 764,2531,1245,2532,
+2533,  25, 204, 311,2534, 496,2535,1052,2536,2537,2538,2539,2540,2541,2542, 199,
+ 704, 504, 468, 758, 657,1528, 196,  44, 839,1246, 272, 750,2543, 765, 862,2544,
+2545,1326,2546, 132, 615, 933,2547, 732,2548,2549,2550,1189,1529,2551, 283,1247,
+1053, 607, 929,2552,2553,2554, 930, 183, 872, 616,1040,1147,2555,1148,1020, 441,
+ 249,1075,2556,2557,2558, 466, 743,2559,2560,2561,  92, 514, 426, 420, 526,2562,
+2563,2564,2565,2566,2567,2568, 185,2569,2570,2571,2572, 776,1530, 658,2573, 362,
+2574, 361, 922,1076, 793,2575,2576,2577,2578,2579,2580,1531, 251,2581,2582,2583,
+2584,1532,  54, 612, 237,1327,2585,2586, 275, 408, 647, 111,2587,1533,1106, 465,
+   3, 458,   9,  38,2588, 107, 110, 890, 209,  26, 737, 498,2589,1534,2590, 431,
+ 202,  88,1535, 356, 287,1107, 660,1149,2591, 381,1536, 986,1150, 445,1248,1151,
+ 974,2592,2593, 846,2594, 446, 953, 184,1249,1250, 727,2595, 923, 193, 883,2596,
+2597,2598, 102, 324, 539, 817,2599, 421,1041,2600, 832,2601,  94, 175, 197, 406,
+2602, 459,2603,2604,2605,2606,2607, 330, 555,2608,2609,2610, 706,1108, 389,2611,
+2612,2613,2614, 233,2615, 833, 558, 931, 954,1251,2616,2617,1537, 546,2618,2619,
+1009,2620,2621,2622,1538, 690,1328,2623, 955,2624,1539,2625,2626, 772,2627,2628,
+2629,2630,2631, 924, 648, 863, 603,2632,2633, 934,1540, 864, 865,2634, 642,1042,
+ 670,1190,2635,2636,2637,2638, 168,2639, 652, 873, 542,1054,1541,2640,2641,2642,  # 512, 256
+#Everything below is of no interest for detection purpose
+2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2656,2657,2658,
+2659,2660,2661,2662,2663,2664,2665,2666,2667,2668,2669,2670,2671,2672,2673,2674,
+2675,2676,2677,2678,2679,2680,2681,2682,2683,2684,2685,2686,2687,2688,2689,2690,
+2691,2692,2693,2694,2695,2696,2697,2698,2699,1542, 880,2700,2701,2702,2703,2704,
+2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,
+2721,2722,2723,2724,2725,1543,2726,2727,2728,2729,2730,2731,2732,1544,2733,2734,
+2735,2736,2737,2738,2739,2740,2741,2742,2743,2744,2745,2746,2747,2748,2749,2750,
+2751,2752,2753,2754,1545,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2765,
+2766,1546,2767,1547,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,
+2780,2781,2782,2783,2784,2785,2786,1548,2787,2788,2789,1109,2790,2791,2792,2793,
+2794,2795,2796,2797,2798,2799,2800,2801,2802,2803,2804,2805,2806,2807,2808,2809,
+2810,2811,2812,1329,2813,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,
+2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2837,2838,2839,2840,
+2841,2842,2843,2844,2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,
+1549,2857,2858,2859,2860,1550,2861,2862,1551,2863,2864,2865,2866,2867,2868,2869,
+2870,2871,2872,2873,2874,1110,1330,2875,2876,2877,2878,2879,2880,2881,2882,2883,
+2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,2898,2899,
+2900,2901,2902,2903,2904,2905,2906,2907,2908,2909,2910,2911,2912,2913,2914,2915,
+2916,2917,2918,2919,2920,2921,2922,2923,2924,2925,2926,2927,2928,2929,2930,1331,
+2931,2932,2933,2934,2935,2936,2937,2938,2939,2940,2941,2942,2943,1552,2944,2945,
+2946,2947,2948,2949,2950,2951,2952,2953,2954,2955,2956,2957,2958,2959,2960,2961,
+2962,2963,2964,1252,2965,2966,2967,2968,2969,2970,2971,2972,2973,2974,2975,2976,
+2977,2978,2979,2980,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,
+2993,2994,2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,
+3009,3010,3011,3012,1553,3013,3014,3015,3016,3017,1554,3018,1332,3019,3020,3021,
+3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,
+3038,3039,3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,1555,3051,3052,
+3053,1556,1557,3054,3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,
+3067,1558,3068,3069,3070,3071,3072,3073,3074,3075,3076,1559,3077,3078,3079,3080,
+3081,3082,3083,1253,3084,3085,3086,3087,3088,3089,3090,3091,3092,3093,3094,3095,
+3096,3097,3098,3099,3100,3101,3102,3103,3104,3105,3106,3107,3108,1152,3109,3110,
+3111,3112,3113,1560,3114,3115,3116,3117,1111,3118,3119,3120,3121,3122,3123,3124,
+3125,3126,3127,3128,3129,3130,3131,3132,3133,3134,3135,3136,3137,3138,3139,3140,
+3141,3142,3143,3144,3145,3146,3147,3148,3149,3150,3151,3152,3153,3154,3155,3156,
+3157,3158,3159,3160,3161,3162,3163,3164,3165,3166,3167,3168,3169,3170,3171,3172,
+3173,3174,3175,3176,1333,3177,3178,3179,3180,3181,3182,3183,3184,3185,3186,3187,
+3188,3189,1561,3190,3191,1334,3192,3193,3194,3195,3196,3197,3198,3199,3200,3201,
+3202,3203,3204,3205,3206,3207,3208,3209,3210,3211,3212,3213,3214,3215,3216,3217,
+3218,3219,3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,
+3234,1562,3235,3236,3237,3238,3239,3240,3241,3242,3243,3244,3245,3246,3247,3248,
+3249,3250,3251,3252,3253,3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,3264,
+3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,1563,3278,3279,
+3280,3281,3282,3283,3284,3285,3286,3287,3288,3289,3290,3291,3292,3293,3294,3295,
+3296,3297,3298,3299,3300,3301,3302,3303,3304,3305,3306,3307,3308,3309,3310,3311,
+3312,3313,3314,3315,3316,3317,3318,3319,3320,3321,3322,3323,3324,3325,3326,3327,
+3328,3329,3330,3331,3332,3333,3334,3335,3336,3337,3338,3339,3340,3341,3342,3343,
+3344,3345,3346,3347,3348,3349,3350,3351,3352,3353,3354,3355,3356,3357,3358,3359,
+3360,3361,3362,3363,3364,1335,3365,3366,3367,3368,3369,3370,3371,3372,3373,3374,
+3375,3376,3377,3378,3379,3380,3381,3382,3383,3384,3385,3386,3387,1336,3388,3389,
+3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,3400,3401,3402,3403,3404,3405,
+3406,3407,3408,3409,3410,3411,3412,3413,3414,1337,3415,3416,3417,3418,3419,1338,
+3420,3421,3422,1564,1565,3423,3424,3425,3426,3427,3428,3429,3430,3431,1254,3432,
+3433,3434,1339,3435,3436,3437,3438,3439,1566,3440,3441,3442,3443,3444,3445,3446,
+3447,3448,3449,3450,3451,3452,3453,3454,1255,3455,3456,3457,3458,3459,1567,1191,
+3460,1568,1569,3461,3462,3463,1570,3464,3465,3466,3467,3468,1571,3469,3470,3471,
+3472,3473,1572,3474,3475,3476,3477,3478,3479,3480,3481,3482,3483,3484,3485,3486,
+1340,3487,3488,3489,3490,3491,3492,1021,3493,3494,3495,3496,3497,3498,1573,3499,
+1341,3500,3501,3502,3503,3504,3505,3506,3507,3508,3509,3510,3511,1342,3512,3513,
+3514,3515,3516,1574,1343,3517,3518,3519,1575,3520,1576,3521,3522,3523,3524,3525,
+3526,3527,3528,3529,3530,3531,3532,3533,3534,3535,3536,3537,3538,3539,3540,3541,
+3542,3543,3544,3545,3546,3547,3548,3549,3550,3551,3552,3553,3554,3555,3556,3557,
+3558,3559,3560,3561,3562,3563,3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,
+3574,3575,3576,3577,3578,3579,3580,1577,3581,3582,1578,3583,3584,3585,3586,3587,
+3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,
+3604,1579,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,
+3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,1580,3630,3631,1581,3632,
+3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3643,3644,3645,3646,3647,3648,
+3649,3650,3651,3652,3653,3654,3655,3656,1582,3657,3658,3659,3660,3661,3662,3663,
+3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,
+3680,3681,3682,3683,3684,3685,3686,3687,3688,3689,3690,3691,3692,3693,3694,3695,
+3696,3697,3698,3699,3700,1192,3701,3702,3703,3704,1256,3705,3706,3707,3708,1583,
+1257,3709,3710,3711,3712,3713,3714,3715,3716,1584,3717,3718,3719,3720,3721,3722,
+3723,3724,3725,3726,3727,3728,3729,3730,3731,3732,3733,3734,3735,3736,3737,3738,
+3739,3740,3741,3742,3743,3744,3745,1344,3746,3747,3748,3749,3750,3751,3752,3753,
+3754,3755,3756,1585,3757,3758,3759,3760,3761,3762,3763,3764,3765,3766,1586,3767,
+3768,3769,3770,3771,3772,3773,3774,3775,3776,3777,3778,1345,3779,3780,3781,3782,
+3783,3784,3785,3786,3787,3788,3789,3790,3791,3792,3793,3794,3795,1346,1587,3796,
+3797,1588,3798,3799,3800,3801,3802,3803,3804,3805,3806,1347,3807,3808,3809,3810,
+3811,1589,3812,3813,3814,3815,3816,3817,3818,3819,3820,3821,1590,3822,3823,1591,
+1348,3824,3825,3826,3827,3828,3829,3830,1592,3831,3832,1593,3833,3834,3835,3836,
+3837,3838,3839,3840,3841,3842,3843,3844,1349,3845,3846,3847,3848,3849,3850,3851,
+3852,3853,3854,3855,3856,3857,3858,1594,3859,3860,3861,3862,3863,3864,3865,3866,
+3867,3868,3869,1595,3870,3871,3872,3873,1596,3874,3875,3876,3877,3878,3879,3880,
+3881,3882,3883,3884,3885,3886,1597,3887,3888,3889,3890,3891,3892,3893,3894,3895,
+1598,3896,3897,3898,1599,1600,3899,1350,3900,1351,3901,3902,1352,3903,3904,3905,
+3906,3907,3908,3909,3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,
+3922,3923,3924,1258,3925,3926,3927,3928,3929,3930,3931,1193,3932,1601,3933,3934,
+3935,3936,3937,3938,3939,3940,3941,3942,3943,1602,3944,3945,3946,3947,3948,1603,
+3949,3950,3951,3952,3953,3954,3955,3956,3957,3958,3959,3960,3961,3962,3963,3964,
+3965,1604,3966,3967,3968,3969,3970,3971,3972,3973,3974,3975,3976,3977,1353,3978,
+3979,3980,3981,3982,3983,3984,3985,3986,3987,3988,3989,3990,3991,1354,3992,3993,
+3994,3995,3996,3997,3998,3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,
+4010,4011,4012,4013,4014,4015,4016,4017,4018,4019,4020,4021,4022,4023,1355,4024,
+4025,4026,4027,4028,4029,4030,4031,4032,4033,4034,4035,4036,4037,4038,4039,4040,
+1605,4041,4042,4043,4044,4045,4046,4047,4048,4049,4050,4051,4052,4053,4054,4055,
+4056,4057,4058,4059,4060,1606,4061,4062,4063,4064,1607,4065,4066,4067,4068,4069,
+4070,4071,4072,4073,4074,4075,4076,1194,4077,4078,1608,4079,4080,4081,4082,4083,
+4084,4085,4086,4087,1609,4088,4089,4090,4091,4092,4093,4094,4095,4096,4097,4098,
+4099,4100,4101,4102,4103,4104,4105,4106,4107,4108,1259,4109,4110,4111,4112,4113,
+4114,4115,4116,4117,4118,4119,4120,4121,4122,4123,4124,1195,4125,4126,4127,1610,
+4128,4129,4130,4131,4132,4133,4134,4135,4136,4137,1356,4138,4139,4140,4141,4142,
+4143,4144,1611,4145,4146,4147,4148,4149,4150,4151,4152,4153,4154,4155,4156,4157,
+4158,4159,4160,4161,4162,4163,4164,4165,4166,4167,4168,4169,4170,4171,4172,4173,
+4174,4175,4176,4177,4178,4179,4180,4181,4182,4183,4184,4185,4186,4187,4188,4189,
+4190,4191,4192,4193,4194,4195,4196,4197,4198,4199,4200,4201,4202,4203,4204,4205,
+4206,4207,4208,4209,4210,4211,4212,4213,4214,4215,4216,4217,4218,4219,1612,4220,
+4221,4222,4223,4224,4225,4226,4227,1357,4228,1613,4229,4230,4231,4232,4233,4234,
+4235,4236,4237,4238,4239,4240,4241,4242,4243,1614,4244,4245,4246,4247,4248,4249,
+4250,4251,4252,4253,4254,4255,4256,4257,4258,4259,4260,4261,4262,4263,4264,4265,
+4266,4267,4268,4269,4270,1196,1358,4271,4272,4273,4274,4275,4276,4277,4278,4279,
+4280,4281,4282,4283,4284,4285,4286,4287,1615,4288,4289,4290,4291,4292,4293,4294,
+4295,4296,4297,4298,4299,4300,4301,4302,4303,4304,4305,4306,4307,4308,4309,4310,
+4311,4312,4313,4314,4315,4316,4317,4318,4319,4320,4321,4322,4323,4324,4325,4326,
+4327,4328,4329,4330,4331,4332,4333,4334,1616,4335,4336,4337,4338,4339,4340,4341,
+4342,4343,4344,4345,4346,4347,4348,4349,4350,4351,4352,4353,4354,4355,4356,4357,
+4358,4359,4360,1617,4361,4362,4363,4364,4365,1618,4366,4367,4368,4369,4370,4371,
+4372,4373,4374,4375,4376,4377,4378,4379,4380,4381,4382,4383,4384,4385,4386,4387,
+4388,4389,4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,
+4404,4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,4416,1619,4417,4418,
+4419,4420,4421,4422,4423,4424,4425,1112,4426,4427,4428,4429,4430,1620,4431,4432,
+4433,4434,4435,4436,4437,4438,4439,4440,4441,4442,1260,1261,4443,4444,4445,4446,
+4447,4448,4449,4450,4451,4452,4453,4454,4455,1359,4456,4457,4458,4459,4460,4461,
+4462,4463,4464,4465,1621,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,
+4477,4478,4479,4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,1055,4490,4491,
+4492,4493,4494,4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4505,4506,4507,
+4508,4509,4510,4511,4512,4513,4514,4515,4516,4517,4518,1622,4519,4520,4521,1623,
+4522,4523,4524,4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,1360,4536,
+4537,4538,4539,4540,4541,4542,4543, 975,4544,4545,4546,4547,4548,4549,4550,4551,
+4552,4553,4554,4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,4567,
+4568,4569,4570,4571,1624,4572,4573,4574,4575,4576,1625,4577,4578,4579,4580,4581,
+4582,4583,4584,1626,4585,4586,4587,4588,4589,4590,4591,4592,4593,4594,4595,1627,
+4596,4597,4598,4599,4600,4601,4602,4603,4604,4605,4606,4607,4608,4609,4610,4611,
+4612,4613,4614,4615,1628,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,
+4627,4628,4629,4630,4631,4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,
+4643,4644,4645,4646,4647,4648,4649,1361,4650,4651,4652,4653,4654,4655,4656,4657,
+4658,4659,4660,4661,1362,4662,4663,4664,4665,4666,4667,4668,4669,4670,4671,4672,
+4673,4674,4675,4676,4677,4678,4679,4680,4681,4682,1629,4683,4684,4685,4686,4687,
+1630,4688,4689,4690,4691,1153,4692,4693,4694,1113,4695,4696,4697,4698,4699,4700,
+4701,4702,4703,4704,4705,4706,4707,4708,4709,4710,4711,1197,4712,4713,4714,4715,
+4716,4717,4718,4719,4720,4721,4722,4723,4724,4725,4726,4727,4728,4729,4730,4731,
+4732,4733,4734,4735,1631,4736,1632,4737,4738,4739,4740,4741,4742,4743,4744,1633,
+4745,4746,4747,4748,4749,1262,4750,4751,4752,4753,4754,1363,4755,4756,4757,4758,
+4759,4760,4761,4762,4763,4764,4765,4766,4767,4768,1634,4769,4770,4771,4772,4773,
+4774,4775,4776,4777,4778,1635,4779,4780,4781,4782,4783,4784,4785,4786,4787,4788,
+4789,1636,4790,4791,4792,4793,4794,4795,4796,4797,4798,4799,4800,4801,4802,4803,
+4804,4805,4806,1637,4807,4808,4809,1638,4810,4811,4812,4813,4814,4815,4816,4817,
+4818,1639,4819,4820,4821,4822,4823,4824,4825,4826,4827,4828,4829,4830,4831,4832,
+4833,1077,4834,4835,4836,4837,4838,4839,4840,4841,4842,4843,4844,4845,4846,4847,
+4848,4849,4850,4851,4852,4853,4854,4855,4856,4857,4858,4859,4860,4861,4862,4863,
+4864,4865,4866,4867,4868,4869,4870,4871,4872,4873,4874,4875,4876,4877,4878,4879,
+4880,4881,4882,4883,1640,4884,4885,1641,4886,4887,4888,4889,4890,4891,4892,4893,
+4894,4895,4896,4897,4898,4899,4900,4901,4902,4903,4904,4905,4906,4907,4908,4909,
+4910,4911,1642,4912,4913,4914,1364,4915,4916,4917,4918,4919,4920,4921,4922,4923,
+4924,4925,4926,4927,4928,4929,4930,4931,1643,4932,4933,4934,4935,4936,4937,4938,
+4939,4940,4941,4942,4943,4944,4945,4946,4947,4948,4949,4950,4951,4952,4953,4954,
+4955,4956,4957,4958,4959,4960,4961,4962,4963,4964,4965,4966,4967,4968,4969,4970,
+4971,4972,4973,4974,4975,4976,4977,4978,4979,4980,1644,4981,4982,4983,4984,1645,
+4985,4986,1646,4987,4988,4989,4990,4991,4992,4993,4994,4995,4996,4997,4998,4999,
+5000,5001,5002,5003,5004,5005,1647,5006,1648,5007,5008,5009,5010,5011,5012,1078,
+5013,5014,5015,5016,5017,5018,5019,5020,5021,5022,5023,5024,5025,5026,5027,5028,
+1365,5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,5039,1649,5040,5041,5042,
+5043,5044,5045,1366,5046,5047,5048,5049,5050,5051,5052,5053,5054,5055,1650,5056,
+5057,5058,5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,5069,5070,5071,5072,
+5073,5074,5075,5076,5077,1651,5078,5079,5080,5081,5082,5083,5084,5085,5086,5087,
+5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102,5103,
+5104,5105,5106,5107,5108,5109,5110,1652,5111,5112,5113,5114,5115,5116,5117,5118,
+1367,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,1653,5130,5131,5132,
+5133,5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,
+5149,1368,5150,1654,5151,1369,5152,5153,5154,5155,5156,5157,5158,5159,5160,5161,
+5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,5176,5177,
+5178,1370,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,5189,5190,5191,5192,
+5193,5194,5195,5196,5197,5198,1655,5199,5200,5201,5202,1656,5203,5204,5205,5206,
+1371,5207,1372,5208,5209,5210,5211,1373,5212,5213,1374,5214,5215,5216,5217,5218,
+5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,
+5235,5236,5237,5238,5239,5240,5241,5242,5243,5244,5245,5246,5247,1657,5248,5249,
+5250,5251,1658,1263,5252,5253,5254,5255,5256,1375,5257,5258,5259,5260,5261,5262,
+5263,5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,
+5279,5280,5281,5282,5283,1659,5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,
+5294,5295,5296,5297,5298,5299,5300,1660,5301,5302,5303,5304,5305,5306,5307,5308,
+5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,1376,5322,5323,
+5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,1198,5334,5335,5336,5337,5338,
+5339,5340,5341,5342,5343,1661,5344,5345,5346,5347,5348,5349,5350,5351,5352,5353,
+5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,5364,5365,5366,5367,5368,5369,
+5370,5371,5372,5373,5374,5375,5376,5377,5378,5379,5380,5381,5382,5383,5384,5385,
+5386,5387,5388,5389,5390,5391,5392,5393,5394,5395,5396,5397,5398,1264,5399,5400,
+5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,5411,5412,1662,5413,5414,5415,
+5416,1663,5417,5418,5419,5420,5421,5422,5423,5424,5425,5426,5427,5428,5429,5430,
+5431,5432,5433,5434,5435,5436,5437,5438,1664,5439,5440,5441,5442,5443,5444,5445,
+5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456,5457,5458,5459,5460,5461,
+5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472,5473,5474,5475,5476,5477,
+5478,1154,5479,5480,5481,5482,5483,5484,5485,1665,5486,5487,5488,5489,5490,5491,
+5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504,5505,5506,5507,
+5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520,5521,5522,5523,
+5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,
+5540,5541,5542,5543,5544,5545,5546,5547,5548,1377,5549,5550,5551,5552,5553,5554,
+5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568,5569,5570,
+1114,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584,5585,
+5586,5587,5588,5589,5590,5591,5592,1378,5593,5594,5595,5596,5597,5598,5599,5600,
+5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,1379,5615,
+5616,5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,
+5632,5633,5634,1380,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,
+5647,5648,5649,1381,1056,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,
+1666,5661,5662,5663,5664,5665,5666,5667,5668,1667,5669,1668,5670,5671,5672,5673,
+5674,5675,5676,5677,5678,1155,5679,5680,5681,5682,5683,5684,5685,5686,5687,5688,
+5689,5690,5691,5692,5693,5694,5695,5696,5697,5698,1669,5699,5700,5701,5702,5703,
+5704,5705,1670,5706,5707,5708,5709,5710,1671,5711,5712,5713,5714,1382,5715,5716,
+5717,5718,5719,5720,5721,5722,5723,5724,5725,1672,5726,5727,1673,1674,5728,5729,
+5730,5731,5732,5733,5734,5735,5736,1675,5737,5738,5739,5740,5741,5742,5743,5744,
+1676,5745,5746,5747,5748,5749,5750,5751,1383,5752,5753,5754,5755,5756,5757,5758,
+5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,1677,5769,5770,5771,5772,5773,
+1678,5774,5775,5776, 998,5777,5778,5779,5780,5781,5782,5783,5784,5785,1384,5786,
+5787,5788,5789,5790,5791,5792,5793,5794,5795,5796,5797,5798,5799,5800,1679,5801,
+5802,5803,1115,1116,5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,5814,5815,
+5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,5829,5830,5831,
+5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844,5845,5846,5847,
+5848,5849,5850,5851,5852,5853,5854,5855,1680,5856,5857,5858,5859,5860,5861,5862,
+5863,5864,1681,5865,5866,5867,1682,5868,5869,5870,5871,5872,5873,5874,5875,5876,
+5877,5878,5879,1683,5880,1684,5881,5882,5883,5884,1685,5885,5886,5887,5888,5889,
+5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,
+5906,5907,1686,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,
+5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,1687,
+5936,5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,
+5952,1688,1689,5953,1199,5954,5955,5956,5957,5958,5959,5960,5961,1690,5962,5963,
+5964,5965,5966,5967,5968,5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,
+5980,5981,1385,5982,1386,5983,5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,
+5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
+6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,6024,6025,
+6026,6027,1265,6028,6029,1691,6030,6031,6032,6033,6034,6035,6036,6037,6038,6039,
+6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,6054,6055,
+6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068,6069,6070,6071,
+6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084,1692,6085,6086,
+6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100,6101,6102,
+6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116,6117,6118,
+6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,1693,6132,6133,
+6134,6135,6136,1694,6137,6138,6139,6140,6141,1695,6142,6143,6144,6145,6146,6147,
+6148,6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,
+6164,6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,
+6180,6181,6182,6183,6184,6185,1696,6186,6187,6188,6189,6190,6191,6192,6193,6194,
+6195,6196,6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,
+6211,6212,6213,6214,6215,6216,6217,6218,6219,1697,6220,6221,6222,6223,6224,6225,
+6226,6227,6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,
+6242,6243,6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,1698,6254,6255,6256,
+6257,6258,6259,6260,6261,6262,6263,1200,6264,6265,6266,6267,6268,6269,6270,6271,  #1024
+6272,6273,6274,6275,6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,6286,6287,
+6288,6289,6290,6291,6292,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,1699,
+6303,6304,1700,6305,6306,6307,6308,6309,6310,6311,6312,6313,6314,6315,6316,6317,
+6318,6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,
+6334,6335,6336,6337,6338,6339,1701,6340,6341,6342,6343,6344,1387,6345,6346,6347,
+6348,6349,6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,
+6364,6365,6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,
+6380,6381,6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,
+6396,6397,6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,6411,
+6412,6413,1702,6414,6415,6416,6417,6418,6419,6420,6421,6422,1703,6423,6424,6425,
+6426,6427,6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,1704,6439,6440,
+6441,6442,6443,6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,6455,6456,
+6457,6458,6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,
+6473,6474,6475,6476,6477,6478,6479,6480,6481,6482,6483,6484,6485,6486,6487,6488,
+6489,6490,6491,6492,6493,6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,1266,
+6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,
+6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532,6533,6534,6535,
+6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,6549,6550,6551,
+1705,1706,6552,6553,6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,6564,6565,
+6566,6567,6568,6569,6570,6571,6572,6573,6574,6575,6576,6577,6578,6579,6580,6581,
+6582,6583,6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,6594,6595,6596,6597,
+6598,6599,6600,6601,6602,6603,6604,6605,6606,6607,6608,6609,6610,6611,6612,6613,
+6614,6615,6616,6617,6618,6619,6620,6621,6622,6623,6624,6625,6626,6627,6628,6629,
+6630,6631,6632,6633,6634,6635,6636,6637,1388,6638,6639,6640,6641,6642,6643,6644,
+1707,6645,6646,6647,6648,6649,6650,6651,6652,6653,6654,6655,6656,6657,6658,6659,
+6660,6661,6662,6663,1708,6664,6665,6666,6667,6668,6669,6670,6671,6672,6673,6674,
+1201,6675,6676,6677,6678,6679,6680,6681,6682,6683,6684,6685,6686,6687,6688,6689,
+6690,6691,6692,6693,6694,6695,6696,6697,6698,6699,6700,6701,6702,6703,6704,6705,
+6706,6707,6708,6709,6710,6711,6712,6713,6714,6715,6716,6717,6718,6719,6720,6721,
+6722,6723,6724,6725,1389,6726,6727,6728,6729,6730,6731,6732,6733,6734,6735,6736,
+1390,1709,6737,6738,6739,6740,6741,6742,1710,6743,6744,6745,6746,1391,6747,6748,
+6749,6750,6751,6752,6753,6754,6755,6756,6757,1392,6758,6759,6760,6761,6762,6763,
+6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777,6778,6779,
+6780,1202,6781,6782,6783,6784,6785,6786,6787,6788,6789,6790,6791,6792,6793,6794,
+6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806,6807,6808,6809,1711,
+6810,6811,6812,6813,6814,6815,6816,6817,6818,6819,6820,6821,6822,6823,6824,6825,
+6826,6827,6828,6829,6830,6831,6832,6833,6834,6835,6836,1393,6837,6838,6839,6840,
+6841,6842,6843,6844,6845,6846,6847,6848,6849,6850,6851,6852,6853,6854,6855,6856,
+6857,6858,6859,6860,6861,6862,6863,6864,6865,6866,6867,6868,6869,6870,6871,6872,
+6873,6874,6875,6876,6877,6878,6879,6880,6881,6882,6883,6884,6885,6886,6887,6888,
+6889,6890,6891,6892,6893,6894,6895,6896,6897,6898,6899,6900,6901,6902,1712,6903,
+6904,6905,6906,6907,6908,6909,6910,1713,6911,6912,6913,6914,6915,6916,6917,6918,
+6919,6920,6921,6922,6923,6924,6925,6926,6927,6928,6929,6930,6931,6932,6933,6934,
+6935,6936,6937,6938,6939,6940,6941,6942,6943,6944,6945,6946,6947,6948,6949,6950,
+6951,6952,6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,
+6967,6968,6969,6970,6971,6972,6973,6974,1714,6975,6976,6977,6978,6979,6980,6981,
+6982,6983,6984,6985,6986,6987,6988,1394,6989,6990,6991,6992,6993,6994,6995,6996,
+6997,6998,6999,7000,1715,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7011,
+7012,7013,7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,
+7028,1716,7029,7030,7031,7032,7033,7034,7035,7036,7037,7038,7039,7040,7041,7042,
+7043,7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,
+7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7074,
+7075,7076,7077,7078,7079,7080,7081,7082,7083,7084,7085,7086,7087,7088,7089,7090,
+7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105,7106,
+7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,7119,7120,7121,7122,
+7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136,7137,7138,
+7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7154,
+7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167,7168,7169,7170,
+7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183,7184,7185,7186,
+7187,7188,7189,7190,7191,7192,7193,7194,7195,7196,7197,7198,7199,7200,7201,7202,
+7203,7204,7205,7206,7207,1395,7208,7209,7210,7211,7212,7213,1717,7214,7215,7216,
+7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229,7230,7231,7232,
+7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245,7246,7247,7248,
+7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261,7262,7263,7264,
+7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277,7278,7279,7280,
+7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293,7294,7295,7296,
+7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308,7309,7310,7311,7312,
+7313,1718,7314,7315,7316,7317,7318,7319,7320,7321,7322,7323,7324,7325,7326,7327,
+7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339,7340,7341,7342,7343,
+7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,7354,7355,7356,7357,7358,7359,
+7360,7361,7362,7363,7364,7365,7366,7367,7368,7369,7370,7371,7372,7373,7374,7375,
+7376,7377,7378,7379,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,
+7392,7393,7394,7395,7396,7397,7398,7399,7400,7401,7402,7403,7404,7405,7406,7407,
+7408,7409,7410,7411,7412,7413,7414,7415,7416,7417,7418,7419,7420,7421,7422,7423,
+7424,7425,7426,7427,7428,7429,7430,7431,7432,7433,7434,7435,7436,7437,7438,7439,
+7440,7441,7442,7443,7444,7445,7446,7447,7448,7449,7450,7451,7452,7453,7454,7455,
+7456,7457,7458,7459,7460,7461,7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,
+7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,
+7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,7503,
+7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,
+7520,7521,7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,
+7536,7537,7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,7550,7551,
+7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567,
+7568,7569,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582,7583,
+7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,
+7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,
+7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,
+7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,
+7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,7663,
+7664,7665,7666,7667,7668,7669,7670,7671,7672,7673,7674,7675,7676,7677,7678,7679,
+7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,
+7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,
+7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,
+7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,
+7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,
+7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,
+7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,
+7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,
+7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,
+7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,
+7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,
+7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,
+7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,
+7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,
+7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,
+7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935,
+7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,
+7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967,
+7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,
+7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,
+8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,
+8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031,
+8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,
+8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,
+8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,
+8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,
+8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,
+8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127,
+8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,
+8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,
+8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,
+8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,
+8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,
+8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,
+8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,
+8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,
+8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,
+8272,8273,8274,8275,8276,8277,8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,
+8288,8289,8290,8291,8292,8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,
+8304,8305,8306,8307,8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,
+8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,
+8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,
+8352,8353,8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,
+8368,8369,8370,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,
+8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,
+8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,
+8416,8417,8418,8419,8420,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,
+8432,8433,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,
+8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,
+8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,
+8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,
+8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,
+8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,
+8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,
+8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,
+8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,
+8576,8577,8578,8579,8580,8581,8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,
+8592,8593,8594,8595,8596,8597,8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,
+8608,8609,8610,8611,8612,8613,8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,
+8624,8625,8626,8627,8628,8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,
+8640,8641,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,
+8656,8657,8658,8659,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,
+8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,
+8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,
+8704,8705,8706,8707,8708,8709,8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,
+8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,
+8736,8737,8738,8739,8740,8741)
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euckrprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euckrprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euckrprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euckrprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,42 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCKRDistributionAnalysis
+from .mbcssm import EUCKRSMModel
+
+
+class EUCKRProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(EUCKRSMModel)
+        self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "EUC-KR"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euctwfreq.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euctwfreq.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euctwfreq.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euctwfreq.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,428 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# EUCTW frequency table
+# Converted from big5 work
+# by Taiwan's Mandarin Promotion Council
+# <http:#www.edu.tw:81/mandr/>
+
+# 128  --> 0.42261
+# 256  --> 0.57851
+# 512  --> 0.74851
+# 1024 --> 0.89384
+# 2048 --> 0.97583
+#
+# Idea Distribution Ratio = 0.74851/(1-0.74851) =2.98
+# Random Distribution Ration = 512/(5401-512)=0.105
+#
+# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
+
+EUCTW_TYPICAL_DISTRIBUTION_RATIO = 0.75
+
+# Char to FreqOrder table ,
+EUCTW_TABLE_SIZE = 8102
+
+EUCTWCharToFreqOrder = (
+   1,1800,1506, 255,1431, 198,   9,  82,   6,7310, 177, 202,3615,1256,2808, 110, # 2742
+3735,  33,3241, 261,  76,  44,2113,  16,2931,2184,1176, 659,3868,  26,3404,2643, # 2758
+1198,3869,3313,4060, 410,2211, 302, 590, 361,1963,   8, 204,  58,4296,7311,1931, # 2774
+  63,7312,7313, 317,1614,  75, 222, 159,4061,2412,1480,7314,3500,3068, 224,2809, # 2790
+3616,   3,  10,3870,1471,  29,2774,1135,2852,1939, 873, 130,3242,1123, 312,7315, # 2806
+4297,2051, 507, 252, 682,7316, 142,1914, 124, 206,2932,  34,3501,3173,  64, 604, # 2822
+7317,2494,1976,1977, 155,1990, 645, 641,1606,7318,3405, 337,  72, 406,7319,  80, # 2838
+ 630, 238,3174,1509, 263, 939,1092,2644, 756,1440,1094,3406, 449,  69,2969, 591, # 2854
+ 179,2095, 471, 115,2034,1843,  60,  50,2970, 134, 806,1868, 734,2035,3407, 180, # 2870
+ 995,1607, 156, 537,2893, 688,7320, 319,1305, 779,2144, 514,2374, 298,4298, 359, # 2886
+2495,  90,2707,1338, 663,  11, 906,1099,2545,  20,2436, 182, 532,1716,7321, 732, # 2902
+1376,4062,1311,1420,3175,  25,2312,1056, 113, 399, 382,1949, 242,3408,2467, 529, # 2918
+3243, 475,1447,3617,7322, 117,  21, 656, 810,1297,2295,2329,3502,7323, 126,4063, # 2934
+ 706, 456, 150, 613,4299,  71,1118,2036,4064, 145,3069,  85, 835, 486,2114,1246, # 2950
+1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,7324,2127,2354, 347,3736, 221, # 2966
+3503,3110,7325,1955,1153,4065,  83, 296,1199,3070, 192, 624,  93,7326, 822,1897, # 2982
+2810,3111, 795,2064, 991,1554,1542,1592,  27,  43,2853, 859, 139,1456, 860,4300, # 2998
+ 437, 712,3871, 164,2392,3112, 695, 211,3017,2096, 195,3872,1608,3504,3505,3618, # 3014
+3873, 234, 811,2971,2097,3874,2229,1441,3506,1615,2375, 668,2076,1638, 305, 228, # 3030
+1664,4301, 467, 415,7327, 262,2098,1593, 239, 108, 300, 200,1033, 512,1247,2077, # 3046
+7328,7329,2173,3176,3619,2673, 593, 845,1062,3244,  88,1723,2037,3875,1950, 212, # 3062
+ 266, 152, 149, 468,1898,4066,4302,  77, 187,7330,3018,  37,   5,2972,7331,3876, # 3078
+7332,7333,  39,2517,4303,2894,3177,2078,  55, 148,  74,4304, 545, 483,1474,1029, # 3094
+1665, 217,1869,1531,3113,1104,2645,4067,  24, 172,3507, 900,3877,3508,3509,4305, # 3110
+  32,1408,2811,1312, 329, 487,2355,2247,2708, 784,2674,   4,3019,3314,1427,1788, # 3126
+ 188, 109, 499,7334,3620,1717,1789, 888,1217,3020,4306,7335,3510,7336,3315,1520, # 3142
+3621,3878, 196,1034, 775,7337,7338, 929,1815, 249, 439,  38,7339,1063,7340, 794, # 3158
+3879,1435,2296,  46, 178,3245,2065,7341,2376,7342, 214,1709,4307, 804,  35, 707, # 3174
+ 324,3622,1601,2546, 140, 459,4068,7343,7344,1365, 839, 272, 978,2257,2572,3409, # 3190
+2128,1363,3623,1423, 697, 100,3071,  48,  70,1231, 495,3114,2193,7345,1294,7346, # 3206
+2079, 462, 586,1042,3246, 853, 256, 988, 185,2377,3410,1698, 434,1084,7347,3411, # 3222
+ 314,2615,2775,4308,2330,2331, 569,2280, 637,1816,2518, 757,1162,1878,1616,3412, # 3238
+ 287,1577,2115, 768,4309,1671,2854,3511,2519,1321,3737, 909,2413,7348,4069, 933, # 3254
+3738,7349,2052,2356,1222,4310, 765,2414,1322, 786,4311,7350,1919,1462,1677,2895, # 3270
+1699,7351,4312,1424,2437,3115,3624,2590,3316,1774,1940,3413,3880,4070, 309,1369, # 3286
+1130,2812, 364,2230,1653,1299,3881,3512,3882,3883,2646, 525,1085,3021, 902,2000, # 3302
+1475, 964,4313, 421,1844,1415,1057,2281, 940,1364,3116, 376,4314,4315,1381,   7, # 3318
+2520, 983,2378, 336,1710,2675,1845, 321,3414, 559,1131,3022,2742,1808,1132,1313, # 3334
+ 265,1481,1857,7352, 352,1203,2813,3247, 167,1089, 420,2814, 776, 792,1724,3513, # 3350
+4071,2438,3248,7353,4072,7354, 446, 229, 333,2743, 901,3739,1200,1557,4316,2647, # 3366
+1920, 395,2744,2676,3740,4073,1835, 125, 916,3178,2616,4317,7355,7356,3741,7357, # 3382
+7358,7359,4318,3117,3625,1133,2547,1757,3415,1510,2313,1409,3514,7360,2145, 438, # 3398
+2591,2896,2379,3317,1068, 958,3023, 461, 311,2855,2677,4074,1915,3179,4075,1978, # 3414
+ 383, 750,2745,2617,4076, 274, 539, 385,1278,1442,7361,1154,1964, 384, 561, 210, # 3430
+  98,1295,2548,3515,7362,1711,2415,1482,3416,3884,2897,1257, 129,7363,3742, 642, # 3446
+ 523,2776,2777,2648,7364, 141,2231,1333,  68, 176, 441, 876, 907,4077, 603,2592, # 3462
+ 710, 171,3417, 404, 549,  18,3118,2393,1410,3626,1666,7365,3516,4319,2898,4320, # 3478
+7366,2973, 368,7367, 146, 366,  99, 871,3627,1543, 748, 807,1586,1185,  22,2258, # 3494
+ 379,3743,3180,7368,3181, 505,1941,2618,1991,1382,2314,7369, 380,2357, 218, 702, # 3510
+1817,1248,3418,3024,3517,3318,3249,7370,2974,3628, 930,3250,3744,7371,  59,7372, # 3526
+ 585, 601,4078, 497,3419,1112,1314,4321,1801,7373,1223,1472,2174,7374, 749,1836, # 3542
+ 690,1899,3745,1772,3885,1476, 429,1043,1790,2232,2116, 917,4079, 447,1086,1629, # 3558
+7375, 556,7376,7377,2020,1654, 844,1090, 105, 550, 966,1758,2815,1008,1782, 686, # 3574
+1095,7378,2282, 793,1602,7379,3518,2593,4322,4080,2933,2297,4323,3746, 980,2496, # 3590
+ 544, 353, 527,4324, 908,2678,2899,7380, 381,2619,1942,1348,7381,1341,1252, 560, # 3606
+3072,7382,3420,2856,7383,2053, 973, 886,2080, 143,4325,7384,7385, 157,3886, 496, # 3622
+4081,  57, 840, 540,2038,4326,4327,3421,2117,1445, 970,2259,1748,1965,2081,4082, # 3638
+3119,1234,1775,3251,2816,3629, 773,1206,2129,1066,2039,1326,3887,1738,1725,4083, # 3654
+ 279,3120,  51,1544,2594, 423,1578,2130,2066, 173,4328,1879,7386,7387,1583, 264, # 3670
+ 610,3630,4329,2439, 280, 154,7388,7389,7390,1739, 338,1282,3073, 693,2857,1411, # 3686
+1074,3747,2440,7391,4330,7392,7393,1240, 952,2394,7394,2900,1538,2679, 685,1483, # 3702
+4084,2468,1436, 953,4085,2054,4331, 671,2395,  79,4086,2441,3252, 608, 567,2680, # 3718
+3422,4087,4088,1691, 393,1261,1791,2396,7395,4332,7396,7397,7398,7399,1383,1672, # 3734
+3748,3182,1464, 522,1119, 661,1150, 216, 675,4333,3888,1432,3519, 609,4334,2681, # 3750
+2397,7400,7401,7402,4089,3025,   0,7403,2469, 315, 231,2442, 301,3319,4335,2380, # 3766
+7404, 233,4090,3631,1818,4336,4337,7405,  96,1776,1315,2082,7406, 257,7407,1809, # 3782
+3632,2709,1139,1819,4091,2021,1124,2163,2778,1777,2649,7408,3074, 363,1655,3183, # 3798
+7409,2975,7410,7411,7412,3889,1567,3890, 718, 103,3184, 849,1443, 341,3320,2934, # 3814
+1484,7413,1712, 127,  67, 339,4092,2398, 679,1412, 821,7414,7415, 834, 738, 351, # 3830
+2976,2146, 846, 235,1497,1880, 418,1992,3749,2710, 186,1100,2147,2746,3520,1545, # 3846
+1355,2935,2858,1377, 583,3891,4093,2573,2977,7416,1298,3633,1078,2549,3634,2358, # 3862
+  78,3750,3751, 267,1289,2099,2001,1594,4094, 348, 369,1274,2194,2175,1837,4338, # 3878
+1820,2817,3635,2747,2283,2002,4339,2936,2748, 144,3321, 882,4340,3892,2749,3423, # 3894
+4341,2901,7417,4095,1726, 320,7418,3893,3026, 788,2978,7419,2818,1773,1327,2859, # 3910
+3894,2819,7420,1306,4342,2003,1700,3752,3521,2359,2650, 787,2022, 506, 824,3636, # 3926
+ 534, 323,4343,1044,3322,2023,1900, 946,3424,7421,1778,1500,1678,7422,1881,4344, # 3942
+ 165, 243,4345,3637,2521, 123, 683,4096, 764,4346,  36,3895,1792, 589,2902, 816, # 3958
+ 626,1667,3027,2233,1639,1555,1622,3753,3896,7423,3897,2860,1370,1228,1932, 891, # 3974
+2083,2903, 304,4097,7424, 292,2979,2711,3522, 691,2100,4098,1115,4347, 118, 662, # 3990
+7425, 611,1156, 854,2381,1316,2861,   2, 386, 515,2904,7426,7427,3253, 868,2234, # 4006
+1486, 855,2651, 785,2212,3028,7428,1040,3185,3523,7429,3121, 448,7430,1525,7431, # 4022
+2164,4348,7432,3754,7433,4099,2820,3524,3122, 503, 818,3898,3123,1568, 814, 676, # 4038
+1444, 306,1749,7434,3755,1416,1030, 197,1428, 805,2821,1501,4349,7435,7436,7437, # 4054
+1993,7438,4350,7439,7440,2195,  13,2779,3638,2980,3124,1229,1916,7441,3756,2131, # 4070
+7442,4100,4351,2399,3525,7443,2213,1511,1727,1120,7444,7445, 646,3757,2443, 307, # 4086
+7446,7447,1595,3186,7448,7449,7450,3639,1113,1356,3899,1465,2522,2523,7451, 519, # 4102
+7452, 128,2132,  92,2284,1979,7453,3900,1512, 342,3125,2196,7454,2780,2214,1980, # 4118
+3323,7455, 290,1656,1317, 789, 827,2360,7456,3758,4352, 562, 581,3901,7457, 401, # 4134
+4353,2248,  94,4354,1399,2781,7458,1463,2024,4355,3187,1943,7459, 828,1105,4101, # 4150
+1262,1394,7460,4102, 605,4356,7461,1783,2862,7462,2822, 819,2101, 578,2197,2937, # 4166
+7463,1502, 436,3254,4103,3255,2823,3902,2905,3425,3426,7464,2712,2315,7465,7466, # 4182
+2332,2067,  23,4357, 193, 826,3759,2102, 699,1630,4104,3075, 390,1793,1064,3526, # 4198
+7467,1579,3076,3077,1400,7468,4105,1838,1640,2863,7469,4358,4359, 137,4106, 598, # 4214
+3078,1966, 780, 104, 974,2938,7470, 278, 899, 253, 402, 572, 504, 493,1339,7471, # 4230
+3903,1275,4360,2574,2550,7472,3640,3029,3079,2249, 565,1334,2713, 863,  41,7473, # 4246
+7474,4361,7475,1657,2333,  19, 463,2750,4107, 606,7476,2981,3256,1087,2084,1323, # 4262
+2652,2982,7477,1631,1623,1750,4108,2682,7478,2864, 791,2714,2653,2334, 232,2416, # 4278
+7479,2983,1498,7480,2654,2620, 755,1366,3641,3257,3126,2025,1609, 119,1917,3427, # 4294
+ 862,1026,4109,7481,3904,3760,4362,3905,4363,2260,1951,2470,7482,1125, 817,4110, # 4310
+4111,3906,1513,1766,2040,1487,4112,3030,3258,2824,3761,3127,7483,7484,1507,7485, # 4326
+2683, 733,  40,1632,1106,2865, 345,4113, 841,2524, 230,4364,2984,1846,3259,3428, # 4342
+7486,1263, 986,3429,7487, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562,3907, # 4358
+3908,2939, 967,2751,2655,1349, 592,2133,1692,3324,2985,1994,4114,1679,3909,1901, # 4374
+2185,7488, 739,3642,2715,1296,1290,7489,4115,2198,2199,1921,1563,2595,2551,1870, # 4390
+2752,2986,7490, 435,7491, 343,1108, 596,  17,1751,4365,2235,3430,3643,7492,4366, # 4406
+ 294,3527,2940,1693, 477, 979, 281,2041,3528, 643,2042,3644,2621,2782,2261,1031, # 4422
+2335,2134,2298,3529,4367, 367,1249,2552,7493,3530,7494,4368,1283,3325,2004, 240, # 4438
+1762,3326,4369,4370, 836,1069,3128, 474,7495,2148,2525, 268,3531,7496,3188,1521, # 4454
+1284,7497,1658,1546,4116,7498,3532,3533,7499,4117,3327,2684,1685,4118, 961,1673, # 4470
+2622, 190,2005,2200,3762,4371,4372,7500, 570,2497,3645,1490,7501,4373,2623,3260, # 4486
+1956,4374, 584,1514, 396,1045,1944,7502,4375,1967,2444,7503,7504,4376,3910, 619, # 4502
+7505,3129,3261, 215,2006,2783,2553,3189,4377,3190,4378, 763,4119,3763,4379,7506, # 4518
+7507,1957,1767,2941,3328,3646,1174, 452,1477,4380,3329,3130,7508,2825,1253,2382, # 4534
+2186,1091,2285,4120, 492,7509, 638,1169,1824,2135,1752,3911, 648, 926,1021,1324, # 4550
+4381, 520,4382, 997, 847,1007, 892,4383,3764,2262,1871,3647,7510,2400,1784,4384, # 4566
+1952,2942,3080,3191,1728,4121,2043,3648,4385,2007,1701,3131,1551,  30,2263,4122, # 4582
+7511,2026,4386,3534,7512, 501,7513,4123, 594,3431,2165,1821,3535,3432,3536,3192, # 4598
+ 829,2826,4124,7514,1680,3132,1225,4125,7515,3262,4387,4126,3133,2336,7516,4388, # 4614
+4127,7517,3912,3913,7518,1847,2383,2596,3330,7519,4389, 374,3914, 652,4128,4129, # 4630
+ 375,1140, 798,7520,7521,7522,2361,4390,2264, 546,1659, 138,3031,2445,4391,7523, # 4646
+2250, 612,1848, 910, 796,3765,1740,1371, 825,3766,3767,7524,2906,2554,7525, 692, # 4662
+ 444,3032,2624, 801,4392,4130,7526,1491, 244,1053,3033,4131,4132, 340,7527,3915, # 4678
+1041,2987, 293,1168,  87,1357,7528,1539, 959,7529,2236, 721, 694,4133,3768, 219, # 4694
+1478, 644,1417,3331,2656,1413,1401,1335,1389,3916,7530,7531,2988,2362,3134,1825, # 4710
+ 730,1515, 184,2827,  66,4393,7532,1660,2943, 246,3332, 378,1457, 226,3433, 975, # 4726
+3917,2944,1264,3537, 674, 696,7533, 163,7534,1141,2417,2166, 713,3538,3333,4394, # 4742
+3918,7535,7536,1186,  15,7537,1079,1070,7538,1522,3193,3539, 276,1050,2716, 758, # 4758
+1126, 653,2945,3263,7539,2337, 889,3540,3919,3081,2989, 903,1250,4395,3920,3434, # 4774
+3541,1342,1681,1718, 766,3264, 286,  89,2946,3649,7540,1713,7541,2597,3334,2990, # 4790
+7542,2947,2215,3194,2866,7543,4396,2498,2526, 181, 387,1075,3921, 731,2187,3335, # 4806
+7544,3265, 310, 313,3435,2299, 770,4134,  54,3034, 189,4397,3082,3769,3922,7545, # 4822
+1230,1617,1849, 355,3542,4135,4398,3336, 111,4136,3650,1350,3135,3436,3035,4137, # 4838
+2149,3266,3543,7546,2784,3923,3924,2991, 722,2008,7547,1071, 247,1207,2338,2471, # 4854
+1378,4399,2009, 864,1437,1214,4400, 373,3770,1142,2216, 667,4401, 442,2753,2555, # 4870
+3771,3925,1968,4138,3267,1839, 837, 170,1107, 934,1336,1882,7548,7549,2118,4139, # 4886
+2828, 743,1569,7550,4402,4140, 582,2384,1418,3437,7551,1802,7552, 357,1395,1729, # 4902
+3651,3268,2418,1564,2237,7553,3083,3772,1633,4403,1114,2085,4141,1532,7554, 482, # 4918
+2446,4404,7555,7556,1492, 833,1466,7557,2717,3544,1641,2829,7558,1526,1272,3652, # 4934
+4142,1686,1794, 416,2556,1902,1953,1803,7559,3773,2785,3774,1159,2316,7560,2867, # 4950
+4405,1610,1584,3036,2419,2754, 443,3269,1163,3136,7561,7562,3926,7563,4143,2499, # 4966
+3037,4406,3927,3137,2103,1647,3545,2010,1872,4144,7564,4145, 431,3438,7565, 250, # 4982
+  97,  81,4146,7566,1648,1850,1558, 160, 848,7567, 866, 740,1694,7568,2201,2830, # 4998
+3195,4147,4407,3653,1687, 950,2472, 426, 469,3196,3654,3655,3928,7569,7570,1188, # 5014
+ 424,1995, 861,3546,4148,3775,2202,2685, 168,1235,3547,4149,7571,2086,1674,4408, # 5030
+3337,3270, 220,2557,1009,7572,3776, 670,2992, 332,1208, 717,7573,7574,3548,2447, # 5046
+3929,3338,7575, 513,7576,1209,2868,3339,3138,4409,1080,7577,7578,7579,7580,2527, # 5062
+3656,3549, 815,1587,3930,3931,7581,3550,3439,3777,1254,4410,1328,3038,1390,3932, # 5078
+1741,3933,3778,3934,7582, 236,3779,2448,3271,7583,7584,3657,3780,1273,3781,4411, # 5094
+7585, 308,7586,4412, 245,4413,1851,2473,1307,2575, 430, 715,2136,2449,7587, 270, # 5110
+ 199,2869,3935,7588,3551,2718,1753, 761,1754, 725,1661,1840,4414,3440,3658,7589, # 5126
+7590, 587,  14,3272, 227,2598, 326, 480,2265, 943,2755,3552, 291, 650,1883,7591, # 5142
+1702,1226, 102,1547,  62,3441, 904,4415,3442,1164,4150,7592,7593,1224,1548,2756, # 5158
+ 391, 498,1493,7594,1386,1419,7595,2055,1177,4416, 813, 880,1081,2363, 566,1145, # 5174
+4417,2286,1001,1035,2558,2599,2238, 394,1286,7596,7597,2068,7598,  86,1494,1730, # 5190
+3936, 491,1588, 745, 897,2948, 843,3340,3937,2757,2870,3273,1768, 998,2217,2069, # 5206
+ 397,1826,1195,1969,3659,2993,3341, 284,7599,3782,2500,2137,2119,1903,7600,3938, # 5222
+2150,3939,4151,1036,3443,1904, 114,2559,4152, 209,1527,7601,7602,2949,2831,2625, # 5238
+2385,2719,3139, 812,2560,7603,3274,7604,1559, 737,1884,3660,1210, 885,  28,2686, # 5254
+3553,3783,7605,4153,1004,1779,4418,7606, 346,1981,2218,2687,4419,3784,1742, 797, # 5270
+1642,3940,1933,1072,1384,2151, 896,3941,3275,3661,3197,2871,3554,7607,2561,1958, # 5286
+4420,2450,1785,7608,7609,7610,3942,4154,1005,1308,3662,4155,2720,4421,4422,1528, # 5302
+2600, 161,1178,4156,1982, 987,4423,1101,4157, 631,3943,1157,3198,2420,1343,1241, # 5318
+1016,2239,2562, 372, 877,2339,2501,1160, 555,1934, 911,3944,7611, 466,1170, 169, # 5334
+1051,2907,2688,3663,2474,2994,1182,2011,2563,1251,2626,7612, 992,2340,3444,1540, # 5350
+2721,1201,2070,2401,1996,2475,7613,4424, 528,1922,2188,1503,1873,1570,2364,3342, # 5366
+3276,7614, 557,1073,7615,1827,3445,2087,2266,3140,3039,3084, 767,3085,2786,4425, # 5382
+1006,4158,4426,2341,1267,2176,3664,3199, 778,3945,3200,2722,1597,2657,7616,4427, # 5398
+7617,3446,7618,7619,7620,3277,2689,1433,3278, 131,  95,1504,3946, 723,4159,3141, # 5414
+1841,3555,2758,2189,3947,2027,2104,3665,7621,2995,3948,1218,7622,3343,3201,3949, # 5430
+4160,2576, 248,1634,3785, 912,7623,2832,3666,3040,3786, 654,  53,7624,2996,7625, # 5446
+1688,4428, 777,3447,1032,3950,1425,7626, 191, 820,2120,2833, 971,4429, 931,3202, # 5462
+ 135, 664, 783,3787,1997, 772,2908,1935,3951,3788,4430,2909,3203, 282,2723, 640, # 5478
+1372,3448,1127, 922, 325,3344,7627,7628, 711,2044,7629,7630,3952,2219,2787,1936, # 5494
+3953,3345,2220,2251,3789,2300,7631,4431,3790,1258,3279,3954,3204,2138,2950,3955, # 5510
+3956,7632,2221, 258,3205,4432, 101,1227,7633,3280,1755,7634,1391,3281,7635,2910, # 5526
+2056, 893,7636,7637,7638,1402,4161,2342,7639,7640,3206,3556,7641,7642, 878,1325, # 5542
+1780,2788,4433, 259,1385,2577, 744,1183,2267,4434,7643,3957,2502,7644, 684,1024, # 5558
+4162,7645, 472,3557,3449,1165,3282,3958,3959, 322,2152, 881, 455,1695,1152,1340, # 5574
+ 660, 554,2153,4435,1058,4436,4163, 830,1065,3346,3960,4437,1923,7646,1703,1918, # 5590
+7647, 932,2268, 122,7648,4438, 947, 677,7649,3791,2627, 297,1905,1924,2269,4439, # 5606
+2317,3283,7650,7651,4164,7652,4165,  84,4166, 112, 989,7653, 547,1059,3961, 701, # 5622
+3558,1019,7654,4167,7655,3450, 942, 639, 457,2301,2451, 993,2951, 407, 851, 494, # 5638
+4440,3347, 927,7656,1237,7657,2421,3348, 573,4168, 680, 921,2911,1279,1874, 285, # 5654
+ 790,1448,1983, 719,2167,7658,7659,4441,3962,3963,1649,7660,1541, 563,7661,1077, # 5670
+7662,3349,3041,3451, 511,2997,3964,3965,3667,3966,1268,2564,3350,3207,4442,4443, # 5686
+7663, 535,1048,1276,1189,2912,2028,3142,1438,1373,2834,2952,1134,2012,7664,4169, # 5702
+1238,2578,3086,1259,7665, 700,7666,2953,3143,3668,4170,7667,4171,1146,1875,1906, # 5718
+4444,2601,3967, 781,2422, 132,1589, 203, 147, 273,2789,2402, 898,1786,2154,3968, # 5734
+3969,7668,3792,2790,7669,7670,4445,4446,7671,3208,7672,1635,3793, 965,7673,1804, # 5750
+2690,1516,3559,1121,1082,1329,3284,3970,1449,3794,  65,1128,2835,2913,2759,1590, # 5766
+3795,7674,7675,  12,2658,  45, 976,2579,3144,4447, 517,2528,1013,1037,3209,7676, # 5782
+3796,2836,7677,3797,7678,3452,7679,2602, 614,1998,2318,3798,3087,2724,2628,7680, # 5798
+2580,4172, 599,1269,7681,1810,3669,7682,2691,3088, 759,1060, 489,1805,3351,3285, # 5814
+1358,7683,7684,2386,1387,1215,2629,2252, 490,7685,7686,4173,1759,2387,2343,7687, # 5830
+4448,3799,1907,3971,2630,1806,3210,4449,3453,3286,2760,2344, 874,7688,7689,3454, # 5846
+3670,1858,  91,2914,3671,3042,3800,4450,7690,3145,3972,2659,7691,3455,1202,1403, # 5862
+3801,2954,2529,1517,2503,4451,3456,2504,7692,4452,7693,2692,1885,1495,1731,3973, # 5878
+2365,4453,7694,2029,7695,7696,3974,2693,1216, 237,2581,4174,2319,3975,3802,4454, # 5894
+4455,2694,3560,3457, 445,4456,7697,7698,7699,7700,2761,  61,3976,3672,1822,3977, # 5910
+7701, 687,2045, 935, 925, 405,2660, 703,1096,1859,2725,4457,3978,1876,1367,2695, # 5926
+3352, 918,2105,1781,2476, 334,3287,1611,1093,4458, 564,3146,3458,3673,3353, 945, # 5942
+2631,2057,4459,7702,1925, 872,4175,7703,3459,2696,3089, 349,4176,3674,3979,4460, # 5958
+3803,4177,3675,2155,3980,4461,4462,4178,4463,2403,2046, 782,3981, 400, 251,4179, # 5974
+1624,7704,7705, 277,3676, 299,1265, 476,1191,3804,2121,4180,4181,1109, 205,7706, # 5990
+2582,1000,2156,3561,1860,7707,7708,7709,4464,7710,4465,2565, 107,2477,2157,3982, # 6006
+3460,3147,7711,1533, 541,1301, 158, 753,4182,2872,3562,7712,1696, 370,1088,4183, # 6022
+4466,3563, 579, 327, 440, 162,2240, 269,1937,1374,3461, 968,3043,  56,1396,3090, # 6038
+2106,3288,3354,7713,1926,2158,4467,2998,7714,3564,7715,7716,3677,4468,2478,7717, # 6054
+2791,7718,1650,4469,7719,2603,7720,7721,3983,2661,3355,1149,3356,3984,3805,3985, # 6070
+7722,1076,  49,7723, 951,3211,3289,3290, 450,2837, 920,7724,1811,2792,2366,4184, # 6086
+1908,1138,2367,3806,3462,7725,3212,4470,1909,1147,1518,2423,4471,3807,7726,4472, # 6102
+2388,2604, 260,1795,3213,7727,7728,3808,3291, 708,7729,3565,1704,7730,3566,1351, # 6118
+1618,3357,2999,1886, 944,4185,3358,4186,3044,3359,4187,7731,3678, 422, 413,1714, # 6134
+3292, 500,2058,2345,4188,2479,7732,1344,1910, 954,7733,1668,7734,7735,3986,2404, # 6150
+4189,3567,3809,4190,7736,2302,1318,2505,3091, 133,3092,2873,4473, 629,  31,2838, # 6166
+2697,3810,4474, 850, 949,4475,3987,2955,1732,2088,4191,1496,1852,7737,3988, 620, # 6182
+3214, 981,1242,3679,3360,1619,3680,1643,3293,2139,2452,1970,1719,3463,2168,7738, # 6198
+3215,7739,7740,3361,1828,7741,1277,4476,1565,2047,7742,1636,3568,3093,7743, 869, # 6214
+2839, 655,3811,3812,3094,3989,3000,3813,1310,3569,4477,7744,7745,7746,1733, 558, # 6230
+4478,3681, 335,1549,3045,1756,4192,3682,1945,3464,1829,1291,1192, 470,2726,2107, # 6246
+2793, 913,1054,3990,7747,1027,7748,3046,3991,4479, 982,2662,3362,3148,3465,3216, # 6262
+3217,1946,2794,7749, 571,4480,7750,1830,7751,3570,2583,1523,2424,7752,2089, 984, # 6278
+4481,3683,1959,7753,3684, 852, 923,2795,3466,3685, 969,1519, 999,2048,2320,1705, # 6294
+7754,3095, 615,1662, 151, 597,3992,2405,2321,1049, 275,4482,3686,4193, 568,3687, # 6310
+3571,2480,4194,3688,7755,2425,2270, 409,3218,7756,1566,2874,3467,1002, 769,2840, # 6326
+ 194,2090,3149,3689,2222,3294,4195, 628,1505,7757,7758,1763,2177,3001,3993, 521, # 6342
+1161,2584,1787,2203,2406,4483,3994,1625,4196,4197, 412,  42,3096, 464,7759,2632, # 6358
+4484,3363,1760,1571,2875,3468,2530,1219,2204,3814,2633,2140,2368,4485,4486,3295, # 6374
+1651,3364,3572,7760,7761,3573,2481,3469,7762,3690,7763,7764,2271,2091, 460,7765, # 6390
+4487,7766,3002, 962, 588,3574, 289,3219,2634,1116,  52,7767,3047,1796,7768,7769, # 6406
+7770,1467,7771,1598,1143,3691,4198,1984,1734,1067,4488,1280,3365, 465,4489,1572, # 6422
+ 510,7772,1927,2241,1812,1644,3575,7773,4490,3692,7774,7775,2663,1573,1534,7776, # 6438
+7777,4199, 536,1807,1761,3470,3815,3150,2635,7778,7779,7780,4491,3471,2915,1911, # 6454
+2796,7781,3296,1122, 377,3220,7782, 360,7783,7784,4200,1529, 551,7785,2059,3693, # 6470
+1769,2426,7786,2916,4201,3297,3097,2322,2108,2030,4492,1404, 136,1468,1479, 672, # 6486
+1171,3221,2303, 271,3151,7787,2762,7788,2049, 678,2727, 865,1947,4493,7789,2013, # 6502
+3995,2956,7790,2728,2223,1397,3048,3694,4494,4495,1735,2917,3366,3576,7791,3816, # 6518
+ 509,2841,2453,2876,3817,7792,7793,3152,3153,4496,4202,2531,4497,2304,1166,1010, # 6534
+ 552, 681,1887,7794,7795,2957,2958,3996,1287,1596,1861,3154, 358, 453, 736, 175, # 6550
+ 478,1117, 905,1167,1097,7796,1853,1530,7797,1706,7798,2178,3472,2287,3695,3473, # 6566
+3577,4203,2092,4204,7799,3367,1193,2482,4205,1458,2190,2205,1862,1888,1421,3298, # 6582
+2918,3049,2179,3474, 595,2122,7800,3997,7801,7802,4206,1707,2636, 223,3696,1359, # 6598
+ 751,3098, 183,3475,7803,2797,3003, 419,2369, 633, 704,3818,2389, 241,7804,7805, # 6614
+7806, 838,3004,3697,2272,2763,2454,3819,1938,2050,3998,1309,3099,2242,1181,7807, # 6630
+1136,2206,3820,2370,1446,4207,2305,4498,7808,7809,4208,1055,2605, 484,3698,7810, # 6646
+3999, 625,4209,2273,3368,1499,4210,4000,7811,4001,4211,3222,2274,2275,3476,7812, # 6662
+7813,2764, 808,2606,3699,3369,4002,4212,3100,2532, 526,3370,3821,4213, 955,7814, # 6678
+1620,4214,2637,2427,7815,1429,3700,1669,1831, 994, 928,7816,3578,1260,7817,7818, # 6694
+7819,1948,2288, 741,2919,1626,4215,2729,2455, 867,1184, 362,3371,1392,7820,7821, # 6710
+4003,4216,1770,1736,3223,2920,4499,4500,1928,2698,1459,1158,7822,3050,3372,2877, # 6726
+1292,1929,2506,2842,3701,1985,1187,2071,2014,2607,4217,7823,2566,2507,2169,3702, # 6742
+2483,3299,7824,3703,4501,7825,7826, 666,1003,3005,1022,3579,4218,7827,4502,1813, # 6758
+2253, 574,3822,1603, 295,1535, 705,3823,4219, 283, 858, 417,7828,7829,3224,4503, # 6774
+4504,3051,1220,1889,1046,2276,2456,4004,1393,1599, 689,2567, 388,4220,7830,2484, # 6790
+ 802,7831,2798,3824,2060,1405,2254,7832,4505,3825,2109,1052,1345,3225,1585,7833, # 6806
+ 809,7834,7835,7836, 575,2730,3477, 956,1552,1469,1144,2323,7837,2324,1560,2457, # 6822
+3580,3226,4005, 616,2207,3155,2180,2289,7838,1832,7839,3478,4506,7840,1319,3704, # 6838
+3705,1211,3581,1023,3227,1293,2799,7841,7842,7843,3826, 607,2306,3827, 762,2878, # 6854
+1439,4221,1360,7844,1485,3052,7845,4507,1038,4222,1450,2061,2638,4223,1379,4508, # 6870
+2585,7846,7847,4224,1352,1414,2325,2921,1172,7848,7849,3828,3829,7850,1797,1451, # 6886
+7851,7852,7853,7854,2922,4006,4007,2485,2346, 411,4008,4009,3582,3300,3101,4509, # 6902
+1561,2664,1452,4010,1375,7855,7856,  47,2959, 316,7857,1406,1591,2923,3156,7858, # 6918
+1025,2141,3102,3157, 354,2731, 884,2224,4225,2407, 508,3706, 726,3583, 996,2428, # 6934
+3584, 729,7859, 392,2191,1453,4011,4510,3707,7860,7861,2458,3585,2608,1675,2800, # 6950
+ 919,2347,2960,2348,1270,4511,4012,  73,7862,7863, 647,7864,3228,2843,2255,1550, # 6966
+1346,3006,7865,1332, 883,3479,7866,7867,7868,7869,3301,2765,7870,1212, 831,1347, # 6982
+4226,4512,2326,3830,1863,3053, 720,3831,4513,4514,3832,7871,4227,7872,7873,4515, # 6998
+7874,7875,1798,4516,3708,2609,4517,3586,1645,2371,7876,7877,2924, 669,2208,2665, # 7014
+2429,7878,2879,7879,7880,1028,3229,7881,4228,2408,7882,2256,1353,7883,7884,4518, # 7030
+3158, 518,7885,4013,7886,4229,1960,7887,2142,4230,7888,7889,3007,2349,2350,3833, # 7046
+ 516,1833,1454,4014,2699,4231,4519,2225,2610,1971,1129,3587,7890,2766,7891,2961, # 7062
+1422, 577,1470,3008,1524,3373,7892,7893, 432,4232,3054,3480,7894,2586,1455,2508, # 7078
+2226,1972,1175,7895,1020,2732,4015,3481,4520,7896,2733,7897,1743,1361,3055,3482, # 7094
+2639,4016,4233,4521,2290, 895, 924,4234,2170, 331,2243,3056, 166,1627,3057,1098, # 7110
+7898,1232,2880,2227,3374,4522, 657, 403,1196,2372, 542,3709,3375,1600,4235,3483, # 7126
+7899,4523,2767,3230, 576, 530,1362,7900,4524,2533,2666,3710,4017,7901, 842,3834, # 7142
+7902,2801,2031,1014,4018, 213,2700,3376, 665, 621,4236,7903,3711,2925,2430,7904, # 7158
+2431,3302,3588,3377,7905,4237,2534,4238,4525,3589,1682,4239,3484,1380,7906, 724, # 7174
+2277, 600,1670,7907,1337,1233,4526,3103,2244,7908,1621,4527,7909, 651,4240,7910, # 7190
+1612,4241,2611,7911,2844,7912,2734,2307,3058,7913, 716,2459,3059, 174,1255,2701, # 7206
+4019,3590, 548,1320,1398, 728,4020,1574,7914,1890,1197,3060,4021,7915,3061,3062, # 7222
+3712,3591,3713, 747,7916, 635,4242,4528,7917,7918,7919,4243,7920,7921,4529,7922, # 7238
+3378,4530,2432, 451,7923,3714,2535,2072,4244,2735,4245,4022,7924,1764,4531,7925, # 7254
+4246, 350,7926,2278,2390,2486,7927,4247,4023,2245,1434,4024, 488,4532, 458,4248, # 7270
+4025,3715, 771,1330,2391,3835,2568,3159,2159,2409,1553,2667,3160,4249,7928,2487, # 7286
+2881,2612,1720,2702,4250,3379,4533,7929,2536,4251,7930,3231,4252,2768,7931,2015, # 7302
+2736,7932,1155,1017,3716,3836,7933,3303,2308, 201,1864,4253,1430,7934,4026,7935, # 7318
+7936,7937,7938,7939,4254,1604,7940, 414,1865, 371,2587,4534,4535,3485,2016,3104, # 7334
+4536,1708, 960,4255, 887, 389,2171,1536,1663,1721,7941,2228,4027,2351,2926,1580, # 7350
+7942,7943,7944,1744,7945,2537,4537,4538,7946,4539,7947,2073,7948,7949,3592,3380, # 7366
+2882,4256,7950,4257,2640,3381,2802, 673,2703,2460, 709,3486,4028,3593,4258,7951, # 7382
+1148, 502, 634,7952,7953,1204,4540,3594,1575,4541,2613,3717,7954,3718,3105, 948, # 7398
+3232, 121,1745,3837,1110,7955,4259,3063,2509,3009,4029,3719,1151,1771,3838,1488, # 7414
+4030,1986,7956,2433,3487,7957,7958,2093,7959,4260,3839,1213,1407,2803, 531,2737, # 7430
+2538,3233,1011,1537,7960,2769,4261,3106,1061,7961,3720,3721,1866,2883,7962,2017, # 7446
+ 120,4262,4263,2062,3595,3234,2309,3840,2668,3382,1954,4542,7963,7964,3488,1047, # 7462
+2704,1266,7965,1368,4543,2845, 649,3383,3841,2539,2738,1102,2846,2669,7966,7967, # 7478
+1999,7968,1111,3596,2962,7969,2488,3842,3597,2804,1854,3384,3722,7970,7971,3385, # 7494
+2410,2884,3304,3235,3598,7972,2569,7973,3599,2805,4031,1460, 856,7974,3600,7975, # 7510
+2885,2963,7976,2886,3843,7977,4264, 632,2510, 875,3844,1697,3845,2291,7978,7979, # 7526
+4544,3010,1239, 580,4545,4265,7980, 914, 936,2074,1190,4032,1039,2123,7981,7982, # 7542
+7983,3386,1473,7984,1354,4266,3846,7985,2172,3064,4033, 915,3305,4267,4268,3306, # 7558
+1605,1834,7986,2739, 398,3601,4269,3847,4034, 328,1912,2847,4035,3848,1331,4270, # 7574
+3011, 937,4271,7987,3602,4036,4037,3387,2160,4546,3388, 524, 742, 538,3065,1012, # 7590
+7988,7989,3849,2461,7990, 658,1103, 225,3850,7991,7992,4547,7993,4548,7994,3236, # 7606
+1243,7995,4038, 963,2246,4549,7996,2705,3603,3161,7997,7998,2588,2327,7999,4550, # 7622
+8000,8001,8002,3489,3307, 957,3389,2540,2032,1930,2927,2462, 870,2018,3604,1746, # 7638
+2770,2771,2434,2463,8003,3851,8004,3723,3107,3724,3490,3390,3725,8005,1179,3066, # 7654
+8006,3162,2373,4272,3726,2541,3163,3108,2740,4039,8007,3391,1556,2542,2292, 977, # 7670
+2887,2033,4040,1205,3392,8008,1765,3393,3164,2124,1271,1689, 714,4551,3491,8009, # 7686
+2328,3852, 533,4273,3605,2181, 617,8010,2464,3308,3492,2310,8011,8012,3165,8013, # 7702
+8014,3853,1987, 618, 427,2641,3493,3394,8015,8016,1244,1690,8017,2806,4274,4552, # 7718
+8018,3494,8019,8020,2279,1576, 473,3606,4275,3395, 972,8021,3607,8022,3067,8023, # 7734
+8024,4553,4554,8025,3727,4041,4042,8026, 153,4555, 356,8027,1891,2888,4276,2143, # 7750
+ 408, 803,2352,8028,3854,8029,4277,1646,2570,2511,4556,4557,3855,8030,3856,4278, # 7766
+8031,2411,3396, 752,8032,8033,1961,2964,8034, 746,3012,2465,8035,4279,3728, 698, # 7782
+4558,1892,4280,3608,2543,4559,3609,3857,8036,3166,3397,8037,1823,1302,4043,2706, # 7798
+3858,1973,4281,8038,4282,3167, 823,1303,1288,1236,2848,3495,4044,3398, 774,3859, # 7814
+8039,1581,4560,1304,2849,3860,4561,8040,2435,2161,1083,3237,4283,4045,4284, 344, # 7830
+1173, 288,2311, 454,1683,8041,8042,1461,4562,4046,2589,8043,8044,4563, 985, 894, # 7846
+8045,3399,3168,8046,1913,2928,3729,1988,8047,2110,1974,8048,4047,8049,2571,1194, # 7862
+ 425,8050,4564,3169,1245,3730,4285,8051,8052,2850,8053, 636,4565,1855,3861, 760, # 7878
+1799,8054,4286,2209,1508,4566,4048,1893,1684,2293,8055,8056,8057,4287,4288,2210, # 7894
+ 479,8058,8059, 832,8060,4049,2489,8061,2965,2490,3731, 990,3109, 627,1814,2642, # 7910
+4289,1582,4290,2125,2111,3496,4567,8062, 799,4291,3170,8063,4568,2112,1737,3013, # 7926
+1018, 543, 754,4292,3309,1676,4569,4570,4050,8064,1489,8065,3497,8066,2614,2889, # 7942
+4051,8067,8068,2966,8069,8070,8071,8072,3171,4571,4572,2182,1722,8073,3238,3239, # 7958
+1842,3610,1715, 481, 365,1975,1856,8074,8075,1962,2491,4573,8076,2126,3611,3240, # 7974
+ 433,1894,2063,2075,8077, 602,2741,8078,8079,8080,8081,8082,3014,1628,3400,8083, # 7990
+3172,4574,4052,2890,4575,2512,8084,2544,2772,8085,8086,8087,3310,4576,2891,8088, # 8006
+4577,8089,2851,4578,4579,1221,2967,4053,2513,8090,8091,8092,1867,1989,8093,8094, # 8022
+8095,1895,8096,8097,4580,1896,4054, 318,8098,2094,4055,4293,8099,8100, 485,8101, # 8038
+ 938,3862, 553,2670, 116,8102,3863,3612,8103,3498,2671,2773,3401,3311,2807,8104, # 8054
+3613,2929,4056,1747,2930,2968,8105,8106, 207,8107,8108,2672,4581,2514,8109,3015, # 8070
+ 890,3614,3864,8110,1877,3732,3402,8111,2183,2353,3403,1652,8112,8113,8114, 941, # 8086
+2294, 208,3499,4057,2019, 330,4294,3865,2892,2492,3733,4295,8115,8116,8117,8118, # 8102
+#Everything below is of no interest for detection purpose
+2515,1613,4582,8119,3312,3866,2516,8120,4058,8121,1637,4059,2466,4583,3867,8122, # 8118
+2493,3016,3734,8123,8124,2192,8125,8126,2162,8127,8128,8129,8130,8131,8132,8133, # 8134
+8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8148,8149, # 8150
+8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,8160,8161,8162,8163,8164,8165, # 8166
+8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181, # 8182
+8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197, # 8198
+8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213, # 8214
+8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229, # 8230
+8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245, # 8246
+8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,8256,8257,8258,8259,8260,8261, # 8262
+8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,8272,8273,8274,8275,8276,8277, # 8278
+8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,8290,8291,8292,8293, # 8294
+8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,8308,8309, # 8310
+8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322,8323,8324,8325, # 8326
+8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337,8338,8339,8340,8341, # 8342
+8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353,8354,8355,8356,8357, # 8358
+8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,8368,8369,8370,8371,8372,8373, # 8374
+8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,8384,8385,8386,8387,8388,8389, # 8390
+8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,8400,8401,8402,8403,8404,8405, # 8406
+8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,8416,8417,8418,8419,8420,8421, # 8422
+8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,8433,8434,8435,8436,8437, # 8438
+8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,8448,8449,8450,8451,8452,8453, # 8454
+8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8468,8469, # 8470
+8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,8480,8481,8482,8483,8484,8485, # 8486
+8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501, # 8502
+8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517, # 8518
+8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533, # 8534
+8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549, # 8550
+8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,8565, # 8566
+8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,8576,8577,8578,8579,8580,8581, # 8582
+8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597, # 8598
+8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,8608,8609,8610,8611,8612,8613, # 8614
+8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,8624,8625,8626,8627,8628,8629, # 8630
+8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,8640,8641,8642,8643,8644,8645, # 8646
+8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,8657,8658,8659,8660,8661, # 8662
+8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672,8673,8674,8675,8676,8677, # 8678
+8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,8688,8689,8690,8691,8692,8693, # 8694
+8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,8704,8705,8706,8707,8708,8709, # 8710
+8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725, # 8726
+8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,8736,8737,8738,8739,8740,8741) # 8742
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euctwprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euctwprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/euctwprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/euctwprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,41 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCTWDistributionAnalysis
+from .mbcssm import EUCTWSMModel
+
+class EUCTWProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(EUCTWSMModel)
+        self._mDistributionAnalyzer = EUCTWDistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "EUC-TW"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/gb2312freq.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/gb2312freq.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/gb2312freq.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/gb2312freq.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,472 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# GB2312 most frequently used character table
+#
+# Char to FreqOrder table , from hz6763
+
+# 512  --> 0.79  -- 0.79
+# 1024 --> 0.92  -- 0.13
+# 2048 --> 0.98  -- 0.06
+# 6768 --> 1.00  -- 0.02
+#
+# Ideal Distribution Ratio = 0.79135/(1-0.79135) = 3.79
+# Random Distribution Ration = 512 / (3755 - 512) = 0.157
+#
+# Typical Distribution Ratio about 25% of Ideal one, still much higher that RDR
+
+GB2312_TYPICAL_DISTRIBUTION_RATIO = 0.9
+
+GB2312_TABLE_SIZE = 3760
+
+GB2312CharToFreqOrder = (
+1671, 749,1443,2364,3924,3807,2330,3921,1704,3463,2691,1511,1515, 572,3191,2205,
+2361, 224,2558, 479,1711, 963,3162, 440,4060,1905,2966,2947,3580,2647,3961,3842,
+2204, 869,4207, 970,2678,5626,2944,2956,1479,4048, 514,3595, 588,1346,2820,3409,
+ 249,4088,1746,1873,2047,1774, 581,1813, 358,1174,3590,1014,1561,4844,2245, 670,
+1636,3112, 889,1286, 953, 556,2327,3060,1290,3141, 613, 185,3477,1367, 850,3820,
+1715,2428,2642,2303,2732,3041,2562,2648,3566,3946,1349, 388,3098,2091,1360,3585,
+ 152,1687,1539, 738,1559,  59,1232,2925,2267,1388,1249,1741,1679,2960, 151,1566,
+1125,1352,4271, 924,4296, 385,3166,4459, 310,1245,2850,  70,3285,2729,3534,3575,
+2398,3298,3466,1960,2265, 217,3647, 864,1909,2084,4401,2773,1010,3269,5152, 853,
+3051,3121,1244,4251,1895, 364,1499,1540,2313,1180,3655,2268, 562, 715,2417,3061,
+ 544, 336,3768,2380,1752,4075, 950, 280,2425,4382, 183,2759,3272, 333,4297,2155,
+1688,2356,1444,1039,4540, 736,1177,3349,2443,2368,2144,2225, 565, 196,1482,3406,
+ 927,1335,4147, 692, 878,1311,1653,3911,3622,1378,4200,1840,2969,3149,2126,1816,
+2534,1546,2393,2760, 737,2494,  13, 447, 245,2747,  38,2765,2129,2589,1079, 606,
+ 360, 471,3755,2890, 404, 848, 699,1785,1236, 370,2221,1023,3746,2074,2026,2023,
+2388,1581,2119, 812,1141,3091,2536,1519, 804,2053, 406,1596,1090, 784, 548,4414,
+1806,2264,2936,1100, 343,4114,5096, 622,3358, 743,3668,1510,1626,5020,3567,2513,
+3195,4115,5627,2489,2991,  24,2065,2697,1087,2719,  48,1634, 315,  68, 985,2052,
+ 198,2239,1347,1107,1439, 597,2366,2172, 871,3307, 919,2487,2790,1867, 236,2570,
+1413,3794, 906,3365,3381,1701,1982,1818,1524,2924,1205, 616,2586,2072,2004, 575,
+ 253,3099,  32,1365,1182, 197,1714,2454,1201, 554,3388,3224,2748, 756,2587, 250,
+2567,1507,1517,3529,1922,2761,2337,3416,1961,1677,2452,2238,3153, 615, 911,1506,
+1474,2495,1265,1906,2749,3756,3280,2161, 898,2714,1759,3450,2243,2444, 563,  26,
+3286,2266,3769,3344,2707,3677, 611,1402, 531,1028,2871,4548,1375, 261,2948, 835,
+1190,4134, 353, 840,2684,1900,3082,1435,2109,1207,1674, 329,1872,2781,4055,2686,
+2104, 608,3318,2423,2957,2768,1108,3739,3512,3271,3985,2203,1771,3520,1418,2054,
+1681,1153, 225,1627,2929, 162,2050,2511,3687,1954, 124,1859,2431,1684,3032,2894,
+ 585,4805,3969,2869,2704,2088,2032,2095,3656,2635,4362,2209, 256, 518,2042,2105,
+3777,3657, 643,2298,1148,1779, 190, 989,3544, 414,  11,2135,2063,2979,1471, 403,
+3678, 126, 770,1563, 671,2499,3216,2877, 600,1179, 307,2805,4937,1268,1297,2694,
+ 252,4032,1448,1494,1331,1394, 127,2256, 222,1647,1035,1481,3056,1915,1048, 873,
+3651, 210,  33,1608,2516, 200,1520, 415, 102,   0,3389,1287, 817,  91,3299,2940,
+ 836,1814, 549,2197,1396,1669,2987,3582,2297,2848,4528,1070, 687,  20,1819, 121,
+1552,1364,1461,1968,2617,3540,2824,2083, 177, 948,4938,2291, 110,4549,2066, 648,
+3359,1755,2110,2114,4642,4845,1693,3937,3308,1257,1869,2123, 208,1804,3159,2992,
+2531,2549,3361,2418,1350,2347,2800,2568,1291,2036,2680,  72, 842,1990, 212,1233,
+1154,1586,  75,2027,3410,4900,1823,1337,2710,2676, 728,2810,1522,3026,4995, 157,
+ 755,1050,4022, 710, 785,1936,2194,2085,1406,2777,2400, 150,1250,4049,1206, 807,
+1910, 534, 529,3309,1721,1660, 274,  39,2827, 661,2670,1578, 925,3248,3815,1094,
+4278,4901,4252,  41,1150,3747,2572,2227,4501,3658,4902,3813,3357,3617,2884,2258,
+ 887, 538,4187,3199,1294,2439,3042,2329,2343,2497,1255, 107, 543,1527, 521,3478,
+3568, 194,5062,  15, 961,3870,1241,1192,2664,  66,5215,3260,2111,1295,1127,2152,
+3805,4135, 901,1164,1976, 398,1278, 530,1460, 748, 904,1054,1966,1426,  53,2909,
+ 509, 523,2279,1534, 536,1019, 239,1685, 460,2353, 673,1065,2401,3600,4298,2272,
+1272,2363, 284,1753,3679,4064,1695,  81, 815,2677,2757,2731,1386, 859, 500,4221,
+2190,2566, 757,1006,2519,2068,1166,1455, 337,2654,3203,1863,1682,1914,3025,1252,
+1409,1366, 847, 714,2834,2038,3209, 964,2970,1901, 885,2553,1078,1756,3049, 301,
+1572,3326, 688,2130,1996,2429,1805,1648,2930,3421,2750,3652,3088, 262,1158,1254,
+ 389,1641,1812, 526,1719, 923,2073,1073,1902, 468, 489,4625,1140, 857,2375,3070,
+3319,2863, 380, 116,1328,2693,1161,2244, 273,1212,1884,2769,3011,1775,1142, 461,
+3066,1200,2147,2212, 790, 702,2695,4222,1601,1058, 434,2338,5153,3640,  67,2360,
+4099,2502, 618,3472,1329, 416,1132, 830,2782,1807,2653,3211,3510,1662, 192,2124,
+ 296,3979,1739,1611,3684,  23, 118, 324, 446,1239,1225, 293,2520,3814,3795,2535,
+3116,  17,1074, 467,2692,2201, 387,2922,  45,1326,3055,1645,3659,2817, 958, 243,
+1903,2320,1339,2825,1784,3289, 356, 576, 865,2315,2381,3377,3916,1088,3122,1713,
+1655, 935, 628,4689,1034,1327, 441, 800, 720, 894,1979,2183,1528,5289,2702,1071,
+4046,3572,2399,1571,3281,  79, 761,1103, 327, 134, 758,1899,1371,1615, 879, 442,
+ 215,2605,2579, 173,2048,2485,1057,2975,3317,1097,2253,3801,4263,1403,1650,2946,
+ 814,4968,3487,1548,2644,1567,1285,   2, 295,2636,  97, 946,3576, 832, 141,4257,
+3273, 760,3821,3521,3156,2607, 949,1024,1733,1516,1803,1920,2125,2283,2665,3180,
+1501,2064,3560,2171,1592, 803,3518,1416, 732,3897,4258,1363,1362,2458, 119,1427,
+ 602,1525,2608,1605,1639,3175, 694,3064,  10, 465,  76,2000,4846,4208, 444,3781,
+1619,3353,2206,1273,3796, 740,2483, 320,1723,2377,3660,2619,1359,1137,1762,1724,
+2345,2842,1850,1862, 912, 821,1866, 612,2625,1735,2573,3369,1093, 844,  89, 937,
+ 930,1424,3564,2413,2972,1004,3046,3019,2011, 711,3171,1452,4178, 428, 801,1943,
+ 432, 445,2811, 206,4136,1472, 730, 349,  73, 397,2802,2547, 998,1637,1167, 789,
+ 396,3217, 154,1218, 716,1120,1780,2819,4826,1931,3334,3762,2139,1215,2627, 552,
+3664,3628,3232,1405,2383,3111,1356,2652,3577,3320,3101,1703, 640,1045,1370,1246,
+4996, 371,1575,2436,1621,2210, 984,4033,1734,2638,  16,4529, 663,2755,3255,1451,
+3917,2257,1253,1955,2234,1263,2951, 214,1229, 617, 485, 359,1831,1969, 473,2310,
+ 750,2058, 165,  80,2864,2419, 361,4344,2416,2479,1134, 796,3726,1266,2943, 860,
+2715, 938, 390,2734,1313,1384, 248, 202, 877,1064,2854, 522,3907, 279,1602, 297,
+2357, 395,3740, 137,2075, 944,4089,2584,1267,3802,  62,1533,2285, 178, 176, 780,
+2440, 201,3707, 590, 478,1560,4354,2117,1075,  30,  74,4643,4004,1635,1441,2745,
+ 776,2596, 238,1077,1692,1912,2844, 605, 499,1742,3947, 241,3053, 980,1749, 936,
+2640,4511,2582, 515,1543,2162,5322,2892,2993, 890,2148,1924, 665,1827,3581,1032,
+ 968,3163, 339,1044,1896, 270, 583,1791,1720,4367,1194,3488,3669,  43,2523,1657,
+ 163,2167, 290,1209,1622,3378, 550, 634,2508,2510, 695,2634,2384,2512,1476,1414,
+ 220,1469,2341,2138,2852,3183,2900,4939,2865,3502,1211,3680, 854,3227,1299,2976,
+3172, 186,2998,1459, 443,1067,3251,1495, 321,1932,3054, 909, 753,1410,1828, 436,
+2441,1119,1587,3164,2186,1258, 227, 231,1425,1890,3200,3942, 247, 959, 725,5254,
+2741, 577,2158,2079, 929, 120, 174, 838,2813, 591,1115, 417,2024,  40,3240,1536,
+1037, 291,4151,2354, 632,1298,2406,2500,3535,1825,1846,3451, 205,1171, 345,4238,
+  18,1163, 811, 685,2208,1217, 425,1312,1508,1175,4308,2552,1033, 587,1381,3059,
+2984,3482, 340,1316,4023,3972, 792,3176, 519, 777,4690, 918, 933,4130,2981,3741,
+  90,3360,2911,2200,5184,4550, 609,3079,2030, 272,3379,2736, 363,3881,1130,1447,
+ 286, 779, 357,1169,3350,3137,1630,1220,2687,2391, 747,1277,3688,2618,2682,2601,
+1156,3196,5290,4034,3102,1689,3596,3128, 874, 219,2783, 798, 508,1843,2461, 269,
+1658,1776,1392,1913,2983,3287,2866,2159,2372, 829,4076,  46,4253,2873,1889,1894,
+ 915,1834,1631,2181,2318, 298, 664,2818,3555,2735, 954,3228,3117, 527,3511,2173,
+ 681,2712,3033,2247,2346,3467,1652, 155,2164,3382, 113,1994, 450, 899, 494, 994,
+1237,2958,1875,2336,1926,3727, 545,1577,1550, 633,3473, 204,1305,3072,2410,1956,
+2471, 707,2134, 841,2195,2196,2663,3843,1026,4940, 990,3252,4997, 368,1092, 437,
+3212,3258,1933,1829, 675,2977,2893, 412, 943,3723,4644,3294,3283,2230,2373,5154,
+2389,2241,2661,2323,1404,2524, 593, 787, 677,3008,1275,2059, 438,2709,2609,2240,
+2269,2246,1446,  36,1568,1373,3892,1574,2301,1456,3962, 693,2276,5216,2035,1143,
+2720,1919,1797,1811,2763,4137,2597,1830,1699,1488,1198,2090, 424,1694, 312,3634,
+3390,4179,3335,2252,1214, 561,1059,3243,2295,2561, 975,5155,2321,2751,3772, 472,
+1537,3282,3398,1047,2077,2348,2878,1323,3340,3076, 690,2906,  51, 369, 170,3541,
+1060,2187,2688,3670,2541,1083,1683, 928,3918, 459, 109,4427, 599,3744,4286, 143,
+2101,2730,2490,  82,1588,3036,2121, 281,1860, 477,4035,1238,2812,3020,2716,3312,
+1530,2188,2055,1317, 843, 636,1808,1173,3495, 649, 181,1002, 147,3641,1159,2414,
+3750,2289,2795, 813,3123,2610,1136,4368,   5,3391,4541,2174, 420, 429,1728, 754,
+1228,2115,2219, 347,2223,2733, 735,1518,3003,2355,3134,1764,3948,3329,1888,2424,
+1001,1234,1972,3321,3363,1672,1021,1450,1584, 226, 765, 655,2526,3404,3244,2302,
+3665, 731, 594,2184, 319,1576, 621, 658,2656,4299,2099,3864,1279,2071,2598,2739,
+ 795,3086,3699,3908,1707,2352,2402,1382,3136,2475,1465,4847,3496,3865,1085,3004,
+2591,1084, 213,2287,1963,3565,2250, 822, 793,4574,3187,1772,1789,3050, 595,1484,
+1959,2770,1080,2650, 456, 422,2996, 940,3322,4328,4345,3092,2742, 965,2784, 739,
+4124, 952,1358,2498,2949,2565, 332,2698,2378, 660,2260,2473,4194,3856,2919, 535,
+1260,2651,1208,1428,1300,1949,1303,2942, 433,2455,2450,1251,1946, 614,1269, 641,
+1306,1810,2737,3078,2912, 564,2365,1419,1415,1497,4460,2367,2185,1379,3005,1307,
+3218,2175,1897,3063, 682,1157,4040,4005,1712,1160,1941,1399, 394, 402,2952,1573,
+1151,2986,2404, 862, 299,2033,1489,3006, 346, 171,2886,3401,1726,2932, 168,2533,
+  47,2507,1030,3735,1145,3370,1395,1318,1579,3609,4560,2857,4116,1457,2529,1965,
+ 504,1036,2690,2988,2405, 745,5871, 849,2397,2056,3081, 863,2359,3857,2096,  99,
+1397,1769,2300,4428,1643,3455,1978,1757,3718,1440,  35,4879,3742,1296,4228,2280,
+ 160,5063,1599,2013, 166, 520,3479,1646,3345,3012, 490,1937,1545,1264,2182,2505,
+1096,1188,1369,1436,2421,1667,2792,2460,1270,2122, 727,3167,2143, 806,1706,1012,
+1800,3037, 960,2218,1882, 805, 139,2456,1139,1521, 851,1052,3093,3089, 342,2039,
+ 744,5097,1468,1502,1585,2087, 223, 939, 326,2140,2577, 892,2481,1623,4077, 982,
+3708, 135,2131,  87,2503,3114,2326,1106, 876,1616, 547,2997,2831,2093,3441,4530,
+4314,   9,3256,4229,4148, 659,1462,1986,1710,2046,2913,2231,4090,4880,5255,3392,
+3274,1368,3689,4645,1477, 705,3384,3635,1068,1529,2941,1458,3782,1509, 100,1656,
+2548, 718,2339, 408,1590,2780,3548,1838,4117,3719,1345,3530, 717,3442,2778,3220,
+2898,1892,4590,3614,3371,2043,1998,1224,3483, 891, 635, 584,2559,3355, 733,1766,
+1729,1172,3789,1891,2307, 781,2982,2271,1957,1580,5773,2633,2005,4195,3097,1535,
+3213,1189,1934,5693,3262, 586,3118,1324,1598, 517,1564,2217,1868,1893,4445,3728,
+2703,3139,1526,1787,1992,3882,2875,1549,1199,1056,2224,1904,2711,5098,4287, 338,
+1993,3129,3489,2689,1809,2815,1997, 957,1855,3898,2550,3275,3057,1105,1319, 627,
+1505,1911,1883,3526, 698,3629,3456,1833,1431, 746,  77,1261,2017,2296,1977,1885,
+ 125,1334,1600, 525,1798,1109,2222,1470,1945, 559,2236,1186,3443,2476,1929,1411,
+2411,3135,1777,3372,2621,1841,1613,3229, 668,1430,1839,2643,2916, 195,1989,2671,
+2358,1387, 629,3205,2293,5256,4439, 123,1310, 888,1879,4300,3021,3605,1003,1162,
+3192,2910,2010, 140,2395,2859,  55,1082,2012,2901, 662, 419,2081,1438, 680,2774,
+4654,3912,1620,1731,1625,5035,4065,2328, 512,1344, 802,5443,2163,2311,2537, 524,
+3399,  98,1155,2103,1918,2606,3925,2816,1393,2465,1504,3773,2177,3963,1478,4346,
+ 180,1113,4655,3461,2028,1698, 833,2696,1235,1322,1594,4408,3623,3013,3225,2040,
+3022, 541,2881, 607,3632,2029,1665,1219, 639,1385,1686,1099,2803,3231,1938,3188,
+2858, 427, 676,2772,1168,2025, 454,3253,2486,3556, 230,1950, 580, 791,1991,1280,
+1086,1974,2034, 630, 257,3338,2788,4903,1017,  86,4790, 966,2789,1995,1696,1131,
+ 259,3095,4188,1308, 179,1463,5257, 289,4107,1248,  42,3413,1725,2288, 896,1947,
+ 774,4474,4254, 604,3430,4264, 392,2514,2588, 452, 237,1408,3018, 988,4531,1970,
+3034,3310, 540,2370,1562,1288,2990, 502,4765,1147,   4,1853,2708, 207, 294,2814,
+4078,2902,2509, 684,  34,3105,3532,2551, 644, 709,2801,2344, 573,1727,3573,3557,
+2021,1081,3100,4315,2100,3681, 199,2263,1837,2385, 146,3484,1195,2776,3949, 997,
+1939,3973,1008,1091,1202,1962,1847,1149,4209,5444,1076, 493, 117,5400,2521, 972,
+1490,2934,1796,4542,2374,1512,2933,2657, 413,2888,1135,2762,2314,2156,1355,2369,
+ 766,2007,2527,2170,3124,2491,2593,2632,4757,2437, 234,3125,3591,1898,1750,1376,
+1942,3468,3138, 570,2127,2145,3276,4131, 962, 132,1445,4196,  19, 941,3624,3480,
+3366,1973,1374,4461,3431,2629, 283,2415,2275, 808,2887,3620,2112,2563,1353,3610,
+ 955,1089,3103,1053,  96,  88,4097, 823,3808,1583, 399, 292,4091,3313, 421,1128,
+ 642,4006, 903,2539,1877,2082, 596,  29,4066,1790, 722,2157, 130, 995,1569, 769,
+1485, 464, 513,2213, 288,1923,1101,2453,4316, 133, 486,2445,  50, 625, 487,2207,
+  57, 423, 481,2962, 159,3729,1558, 491, 303, 482, 501, 240,2837, 112,3648,2392,
+1783, 362,   8,3433,3422, 610,2793,3277,1390,1284,1654,  21,3823, 734, 367, 623,
+ 193, 287, 374,1009,1483, 816, 476, 313,2255,2340,1262,2150,2899,1146,2581, 782,
+2116,1659,2018,1880, 255,3586,3314,1110,2867,2137,2564, 986,2767,5185,2006, 650,
+ 158, 926, 762, 881,3157,2717,2362,3587, 306,3690,3245,1542,3077,2427,1691,2478,
+2118,2985,3490,2438, 539,2305, 983, 129,1754, 355,4201,2386, 827,2923, 104,1773,
+2838,2771, 411,2905,3919, 376, 767, 122,1114, 828,2422,1817,3506, 266,3460,1007,
+1609,4998, 945,2612,4429,2274, 726,1247,1964,2914,2199,2070,4002,4108, 657,3323,
+1422, 579, 455,2764,4737,1222,2895,1670, 824,1223,1487,2525, 558, 861,3080, 598,
+2659,2515,1967, 752,2583,2376,2214,4180, 977, 704,2464,4999,2622,4109,1210,2961,
+ 819,1541, 142,2284,  44, 418, 457,1126,3730,4347,4626,1644,1876,3671,1864, 302,
+1063,5694, 624, 723,1984,3745,1314,1676,2488,1610,1449,3558,3569,2166,2098, 409,
+1011,2325,3704,2306, 818,1732,1383,1824,1844,3757, 999,2705,3497,1216,1423,2683,
+2426,2954,2501,2726,2229,1475,2554,5064,1971,1794,1666,2014,1343, 783, 724, 191,
+2434,1354,2220,5065,1763,2752,2472,4152, 131, 175,2885,3434,  92,1466,4920,2616,
+3871,3872,3866, 128,1551,1632, 669,1854,3682,4691,4125,1230, 188,2973,3290,1302,
+1213, 560,3266, 917, 763,3909,3249,1760, 868,1958, 764,1782,2097, 145,2277,3774,
+4462,  64,1491,3062, 971,2132,3606,2442, 221,1226,1617, 218, 323,1185,3207,3147,
+ 571, 619,1473,1005,1744,2281, 449,1887,2396,3685, 275, 375,3816,1743,3844,3731,
+ 845,1983,2350,4210,1377, 773, 967,3499,3052,3743,2725,4007,1697,1022,3943,1464,
+3264,2855,2722,1952,1029,2839,2467,  84,4383,2215, 820,1391,2015,2448,3672, 377,
+1948,2168, 797,2545,3536,2578,2645,  94,2874,1678, 405,1259,3071, 771, 546,1315,
+ 470,1243,3083, 895,2468, 981, 969,2037, 846,4181, 653,1276,2928,  14,2594, 557,
+3007,2474, 156, 902,1338,1740,2574, 537,2518, 973,2282,2216,2433,1928, 138,2903,
+1293,2631,1612, 646,3457, 839,2935, 111, 496,2191,2847, 589,3186, 149,3994,2060,
+4031,2641,4067,3145,1870,  37,3597,2136,1025,2051,3009,3383,3549,1121,1016,3261,
+1301, 251,2446,2599,2153, 872,3246, 637, 334,3705, 831, 884, 921,3065,3140,4092,
+2198,1944, 246,2964, 108,2045,1152,1921,2308,1031, 203,3173,4170,1907,3890, 810,
+1401,2003,1690, 506, 647,1242,2828,1761,1649,3208,2249,1589,3709,2931,5156,1708,
+ 498, 666,2613, 834,3817,1231, 184,2851,1124, 883,3197,2261,3710,1765,1553,2658,
+1178,2639,2351,  93,1193, 942,2538,2141,4402, 235,1821, 870,1591,2192,1709,1871,
+3341,1618,4126,2595,2334, 603, 651,  69, 701, 268,2662,3411,2555,1380,1606, 503,
+ 448, 254,2371,2646, 574,1187,2309,1770, 322,2235,1292,1801, 305, 566,1133, 229,
+2067,2057, 706, 167, 483,2002,2672,3295,1820,3561,3067, 316, 378,2746,3452,1112,
+ 136,1981, 507,1651,2917,1117, 285,4591, 182,2580,3522,1304, 335,3303,1835,2504,
+1795,1792,2248, 674,1018,2106,2449,1857,2292,2845, 976,3047,1781,2600,2727,1389,
+1281,  52,3152, 153, 265,3950, 672,3485,3951,4463, 430,1183, 365, 278,2169,  27,
+1407,1336,2304, 209,1340,1730,2202,1852,2403,2883, 979,1737,1062, 631,2829,2542,
+3876,2592, 825,2086,2226,3048,3625, 352,1417,3724, 542, 991, 431,1351,3938,1861,
+2294, 826,1361,2927,3142,3503,1738, 463,2462,2723, 582,1916,1595,2808, 400,3845,
+3891,2868,3621,2254,  58,2492,1123, 910,2160,2614,1372,1603,1196,1072,3385,1700,
+3267,1980, 696, 480,2430, 920, 799,1570,2920,1951,2041,4047,2540,1321,4223,2469,
+3562,2228,1271,2602, 401,2833,3351,2575,5157, 907,2312,1256, 410, 263,3507,1582,
+ 996, 678,1849,2316,1480, 908,3545,2237, 703,2322, 667,1826,2849,1531,2604,2999,
+2407,3146,2151,2630,1786,3711, 469,3542, 497,3899,2409, 858, 837,4446,3393,1274,
+ 786, 620,1845,2001,3311, 484, 308,3367,1204,1815,3691,2332,1532,2557,1842,2020,
+2724,1927,2333,4440, 567,  22,1673,2728,4475,1987,1858,1144,1597, 101,1832,3601,
+  12, 974,3783,4391, 951,1412,   1,3720, 453,4608,4041, 528,1041,1027,3230,2628,
+1129, 875,1051,3291,1203,2262,1069,2860,2799,2149,2615,3278, 144,1758,3040,  31,
+ 475,1680, 366,2685,3184, 311,1642,4008,2466,5036,1593,1493,2809, 216,1420,1668,
+ 233, 304,2128,3284, 232,1429,1768,1040,2008,3407,2740,2967,2543, 242,2133, 778,
+1565,2022,2620, 505,2189,2756,1098,2273, 372,1614, 708, 553,2846,2094,2278, 169,
+3626,2835,4161, 228,2674,3165, 809,1454,1309, 466,1705,1095, 900,3423, 880,2667,
+3751,5258,2317,3109,2571,4317,2766,1503,1342, 866,4447,1118,  63,2076, 314,1881,
+1348,1061, 172, 978,3515,1747, 532, 511,3970,   6, 601, 905,2699,3300,1751, 276,
+1467,3725,2668,  65,4239,2544,2779,2556,1604, 578,2451,1802, 992,2331,2624,1320,
+3446, 713,1513,1013, 103,2786,2447,1661, 886,1702, 916, 654,3574,2031,1556, 751,
+2178,2821,2179,1498,1538,2176, 271, 914,2251,2080,1325, 638,1953,2937,3877,2432,
+2754,  95,3265,1716, 260,1227,4083, 775, 106,1357,3254, 426,1607, 555,2480, 772,
+1985, 244,2546, 474, 495,1046,2611,1851,2061,  71,2089,1675,2590, 742,3758,2843,
+3222,1433, 267,2180,2576,2826,2233,2092,3913,2435, 956,1745,3075, 856,2113,1116,
+ 451,   3,1988,2896,1398, 993,2463,1878,2049,1341,2718,2721,2870,2108, 712,2904,
+4363,2753,2324, 277,2872,2349,2649, 384, 987, 435, 691,3000, 922, 164,3939, 652,
+1500,1184,4153,2482,3373,2165,4848,2335,3775,3508,3154,2806,2830,1554,2102,1664,
+2530,1434,2408, 893,1547,2623,3447,2832,2242,2532,3169,2856,3223,2078,  49,3770,
+3469, 462, 318, 656,2259,3250,3069, 679,1629,2758, 344,1138,1104,3120,1836,1283,
+3115,2154,1437,4448, 934, 759,1999, 794,2862,1038, 533,2560,1722,2342, 855,2626,
+1197,1663,4476,3127,  85,4240,2528,  25,1111,1181,3673, 407,3470,4561,2679,2713,
+ 768,1925,2841,3986,1544,1165, 932, 373,1240,2146,1930,2673, 721,4766, 354,4333,
+ 391,2963, 187,  61,3364,1442,1102, 330,1940,1767, 341,3809,4118, 393,2496,2062,
+2211, 105, 331, 300, 439, 913,1332, 626, 379,3304,1557, 328, 689,3952, 309,1555,
+ 931, 317,2517,3027, 325, 569, 686,2107,3084,  60,1042,1333,2794, 264,3177,4014,
+1628, 258,3712,   7,4464,1176,1043,1778, 683, 114,1975,  78,1492, 383,1886, 510,
+ 386, 645,5291,2891,2069,3305,4138,3867,2939,2603,2493,1935,1066,1848,3588,1015,
+1282,1289,4609, 697,1453,3044,2666,3611,1856,2412,  54, 719,1330, 568,3778,2459,
+1748, 788, 492, 551,1191,1000, 488,3394,3763, 282,1799, 348,2016,1523,3155,2390,
+1049, 382,2019,1788,1170, 729,2968,3523, 897,3926,2785,2938,3292, 350,2319,3238,
+1718,1717,2655,3453,3143,4465, 161,2889,2980,2009,1421,  56,1908,1640,2387,2232,
+1917,1874,2477,4921, 148,  83,3438, 592,4245,2882,1822,1055, 741, 115,1496,1624,
+ 381,1638,4592,1020, 516,3214, 458, 947,4575,1432, 211,1514,2926,1865,2142, 189,
+ 852,1221,1400,1486, 882,2299,4036, 351,  28,1122, 700,6479,6480,6481,6482,6483,  # last 512
+#Everything below is of no interest for detection purpose
+5508,6484,3900,3414,3974,4441,4024,3537,4037,5628,5099,3633,6485,3148,6486,3636,
+5509,3257,5510,5973,5445,5872,4941,4403,3174,4627,5873,6276,2286,4230,5446,5874,
+5122,6102,6103,4162,5447,5123,5323,4849,6277,3980,3851,5066,4246,5774,5067,6278,
+3001,2807,5695,3346,5775,5974,5158,5448,6487,5975,5976,5776,3598,6279,5696,4806,
+4211,4154,6280,6488,6489,6490,6281,4212,5037,3374,4171,6491,4562,4807,4722,4827,
+5977,6104,4532,4079,5159,5324,5160,4404,3858,5359,5875,3975,4288,4610,3486,4512,
+5325,3893,5360,6282,6283,5560,2522,4231,5978,5186,5449,2569,3878,6284,5401,3578,
+4415,6285,4656,5124,5979,2506,4247,4449,3219,3417,4334,4969,4329,6492,4576,4828,
+4172,4416,4829,5402,6286,3927,3852,5361,4369,4830,4477,4867,5876,4173,6493,6105,
+4657,6287,6106,5877,5450,6494,4155,4868,5451,3700,5629,4384,6288,6289,5878,3189,
+4881,6107,6290,6495,4513,6496,4692,4515,4723,5100,3356,6497,6291,3810,4080,5561,
+3570,4430,5980,6498,4355,5697,6499,4724,6108,6109,3764,4050,5038,5879,4093,3226,
+6292,5068,5217,4693,3342,5630,3504,4831,4377,4466,4309,5698,4431,5777,6293,5778,
+4272,3706,6110,5326,3752,4676,5327,4273,5403,4767,5631,6500,5699,5880,3475,5039,
+6294,5562,5125,4348,4301,4482,4068,5126,4593,5700,3380,3462,5981,5563,3824,5404,
+4970,5511,3825,4738,6295,6501,5452,4516,6111,5881,5564,6502,6296,5982,6503,4213,
+4163,3454,6504,6112,4009,4450,6113,4658,6297,6114,3035,6505,6115,3995,4904,4739,
+4563,4942,4110,5040,3661,3928,5362,3674,6506,5292,3612,4791,5565,4149,5983,5328,
+5259,5021,4725,4577,4564,4517,4364,6298,5405,4578,5260,4594,4156,4157,5453,3592,
+3491,6507,5127,5512,4709,4922,5984,5701,4726,4289,6508,4015,6116,5128,4628,3424,
+4241,5779,6299,4905,6509,6510,5454,5702,5780,6300,4365,4923,3971,6511,5161,3270,
+3158,5985,4100, 867,5129,5703,6117,5363,3695,3301,5513,4467,6118,6512,5455,4232,
+4242,4629,6513,3959,4478,6514,5514,5329,5986,4850,5162,5566,3846,4694,6119,5456,
+4869,5781,3779,6301,5704,5987,5515,4710,6302,5882,6120,4392,5364,5705,6515,6121,
+6516,6517,3736,5988,5457,5989,4695,2457,5883,4551,5782,6303,6304,6305,5130,4971,
+6122,5163,6123,4870,3263,5365,3150,4871,6518,6306,5783,5069,5706,3513,3498,4409,
+5330,5632,5366,5458,5459,3991,5990,4502,3324,5991,5784,3696,4518,5633,4119,6519,
+4630,5634,4417,5707,4832,5992,3418,6124,5993,5567,4768,5218,6520,4595,3458,5367,
+6125,5635,6126,4202,6521,4740,4924,6307,3981,4069,4385,6308,3883,2675,4051,3834,
+4302,4483,5568,5994,4972,4101,5368,6309,5164,5884,3922,6127,6522,6523,5261,5460,
+5187,4164,5219,3538,5516,4111,3524,5995,6310,6311,5369,3181,3386,2484,5188,3464,
+5569,3627,5708,6524,5406,5165,4677,4492,6312,4872,4851,5885,4468,5996,6313,5709,
+5710,6128,2470,5886,6314,5293,4882,5785,3325,5461,5101,6129,5711,5786,6525,4906,
+6526,6527,4418,5887,5712,4808,2907,3701,5713,5888,6528,3765,5636,5331,6529,6530,
+3593,5889,3637,4943,3692,5714,5787,4925,6315,6130,5462,4405,6131,6132,6316,5262,
+6531,6532,5715,3859,5716,5070,4696,5102,3929,5788,3987,4792,5997,6533,6534,3920,
+4809,5000,5998,6535,2974,5370,6317,5189,5263,5717,3826,6536,3953,5001,4883,3190,
+5463,5890,4973,5999,4741,6133,6134,3607,5570,6000,4711,3362,3630,4552,5041,6318,
+6001,2950,2953,5637,4646,5371,4944,6002,2044,4120,3429,6319,6537,5103,4833,6538,
+6539,4884,4647,3884,6003,6004,4758,3835,5220,5789,4565,5407,6540,6135,5294,4697,
+4852,6320,6321,3206,4907,6541,6322,4945,6542,6136,6543,6323,6005,4631,3519,6544,
+5891,6545,5464,3784,5221,6546,5571,4659,6547,6324,6137,5190,6548,3853,6549,4016,
+4834,3954,6138,5332,3827,4017,3210,3546,4469,5408,5718,3505,4648,5790,5131,5638,
+5791,5465,4727,4318,6325,6326,5792,4553,4010,4698,3439,4974,3638,4335,3085,6006,
+5104,5042,5166,5892,5572,6327,4356,4519,5222,5573,5333,5793,5043,6550,5639,5071,
+4503,6328,6139,6551,6140,3914,3901,5372,6007,5640,4728,4793,3976,3836,4885,6552,
+4127,6553,4451,4102,5002,6554,3686,5105,6555,5191,5072,5295,4611,5794,5296,6556,
+5893,5264,5894,4975,5466,5265,4699,4976,4370,4056,3492,5044,4886,6557,5795,4432,
+4769,4357,5467,3940,4660,4290,6141,4484,4770,4661,3992,6329,4025,4662,5022,4632,
+4835,4070,5297,4663,4596,5574,5132,5409,5895,6142,4504,5192,4664,5796,5896,3885,
+5575,5797,5023,4810,5798,3732,5223,4712,5298,4084,5334,5468,6143,4052,4053,4336,
+4977,4794,6558,5335,4908,5576,5224,4233,5024,4128,5469,5225,4873,6008,5045,4729,
+4742,4633,3675,4597,6559,5897,5133,5577,5003,5641,5719,6330,6560,3017,2382,3854,
+4406,4811,6331,4393,3964,4946,6561,2420,3722,6562,4926,4378,3247,1736,4442,6332,
+5134,6333,5226,3996,2918,5470,4319,4003,4598,4743,4744,4485,3785,3902,5167,5004,
+5373,4394,5898,6144,4874,1793,3997,6334,4085,4214,5106,5642,4909,5799,6009,4419,
+4189,3330,5899,4165,4420,5299,5720,5227,3347,6145,4081,6335,2876,3930,6146,3293,
+3786,3910,3998,5900,5300,5578,2840,6563,5901,5579,6147,3531,5374,6564,6565,5580,
+4759,5375,6566,6148,3559,5643,6336,6010,5517,6337,6338,5721,5902,3873,6011,6339,
+6567,5518,3868,3649,5722,6568,4771,4947,6569,6149,4812,6570,2853,5471,6340,6341,
+5644,4795,6342,6012,5723,6343,5724,6013,4349,6344,3160,6150,5193,4599,4514,4493,
+5168,4320,6345,4927,3666,4745,5169,5903,5005,4928,6346,5725,6014,4730,4203,5046,
+4948,3395,5170,6015,4150,6016,5726,5519,6347,5047,3550,6151,6348,4197,4310,5904,
+6571,5581,2965,6152,4978,3960,4291,5135,6572,5301,5727,4129,4026,5905,4853,5728,
+5472,6153,6349,4533,2700,4505,5336,4678,3583,5073,2994,4486,3043,4554,5520,6350,
+6017,5800,4487,6351,3931,4103,5376,6352,4011,4321,4311,4190,5136,6018,3988,3233,
+4350,5906,5645,4198,6573,5107,3432,4191,3435,5582,6574,4139,5410,6353,5411,3944,
+5583,5074,3198,6575,6354,4358,6576,5302,4600,5584,5194,5412,6577,6578,5585,5413,
+5303,4248,5414,3879,4433,6579,4479,5025,4854,5415,6355,4760,4772,3683,2978,4700,
+3797,4452,3965,3932,3721,4910,5801,6580,5195,3551,5907,3221,3471,3029,6019,3999,
+5908,5909,5266,5267,3444,3023,3828,3170,4796,5646,4979,4259,6356,5647,5337,3694,
+6357,5648,5338,4520,4322,5802,3031,3759,4071,6020,5586,4836,4386,5048,6581,3571,
+4679,4174,4949,6154,4813,3787,3402,3822,3958,3215,3552,5268,4387,3933,4950,4359,
+6021,5910,5075,3579,6358,4234,4566,5521,6359,3613,5049,6022,5911,3375,3702,3178,
+4911,5339,4521,6582,6583,4395,3087,3811,5377,6023,6360,6155,4027,5171,5649,4421,
+4249,2804,6584,2270,6585,4000,4235,3045,6156,5137,5729,4140,4312,3886,6361,4330,
+6157,4215,6158,3500,3676,4929,4331,3713,4930,5912,4265,3776,3368,5587,4470,4855,
+3038,4980,3631,6159,6160,4132,4680,6161,6362,3923,4379,5588,4255,6586,4121,6587,
+6363,4649,6364,3288,4773,4774,6162,6024,6365,3543,6588,4274,3107,3737,5050,5803,
+4797,4522,5589,5051,5730,3714,4887,5378,4001,4523,6163,5026,5522,4701,4175,2791,
+3760,6589,5473,4224,4133,3847,4814,4815,4775,3259,5416,6590,2738,6164,6025,5304,
+3733,5076,5650,4816,5590,6591,6165,6592,3934,5269,6593,3396,5340,6594,5804,3445,
+3602,4042,4488,5731,5732,3525,5591,4601,5196,6166,6026,5172,3642,4612,3202,4506,
+4798,6366,3818,5108,4303,5138,5139,4776,3332,4304,2915,3415,4434,5077,5109,4856,
+2879,5305,4817,6595,5913,3104,3144,3903,4634,5341,3133,5110,5651,5805,6167,4057,
+5592,2945,4371,5593,6596,3474,4182,6367,6597,6168,4507,4279,6598,2822,6599,4777,
+4713,5594,3829,6169,3887,5417,6170,3653,5474,6368,4216,2971,5228,3790,4579,6369,
+5733,6600,6601,4951,4746,4555,6602,5418,5475,6027,3400,4665,5806,6171,4799,6028,
+5052,6172,3343,4800,4747,5006,6370,4556,4217,5476,4396,5229,5379,5477,3839,5914,
+5652,5807,4714,3068,4635,5808,6173,5342,4192,5078,5419,5523,5734,6174,4557,6175,
+4602,6371,6176,6603,5809,6372,5735,4260,3869,5111,5230,6029,5112,6177,3126,4681,
+5524,5915,2706,3563,4748,3130,6178,4018,5525,6604,6605,5478,4012,4837,6606,4534,
+4193,5810,4857,3615,5479,6030,4082,3697,3539,4086,5270,3662,4508,4931,5916,4912,
+5811,5027,3888,6607,4397,3527,3302,3798,2775,2921,2637,3966,4122,4388,4028,4054,
+1633,4858,5079,3024,5007,3982,3412,5736,6608,3426,3236,5595,3030,6179,3427,3336,
+3279,3110,6373,3874,3039,5080,5917,5140,4489,3119,6374,5812,3405,4494,6031,4666,
+4141,6180,4166,6032,5813,4981,6609,5081,4422,4982,4112,3915,5653,3296,3983,6375,
+4266,4410,5654,6610,6181,3436,5082,6611,5380,6033,3819,5596,4535,5231,5306,5113,
+6612,4952,5918,4275,3113,6613,6376,6182,6183,5814,3073,4731,4838,5008,3831,6614,
+4888,3090,3848,4280,5526,5232,3014,5655,5009,5737,5420,5527,6615,5815,5343,5173,
+5381,4818,6616,3151,4953,6617,5738,2796,3204,4360,2989,4281,5739,5174,5421,5197,
+3132,5141,3849,5142,5528,5083,3799,3904,4839,5480,2880,4495,3448,6377,6184,5271,
+5919,3771,3193,6034,6035,5920,5010,6036,5597,6037,6378,6038,3106,5422,6618,5423,
+5424,4142,6619,4889,5084,4890,4313,5740,6620,3437,5175,5307,5816,4199,5198,5529,
+5817,5199,5656,4913,5028,5344,3850,6185,2955,5272,5011,5818,4567,4580,5029,5921,
+3616,5233,6621,6622,6186,4176,6039,6379,6380,3352,5200,5273,2908,5598,5234,3837,
+5308,6623,6624,5819,4496,4323,5309,5201,6625,6626,4983,3194,3838,4167,5530,5922,
+5274,6381,6382,3860,3861,5599,3333,4292,4509,6383,3553,5481,5820,5531,4778,6187,
+3955,3956,4324,4389,4218,3945,4325,3397,2681,5923,4779,5085,4019,5482,4891,5382,
+5383,6040,4682,3425,5275,4094,6627,5310,3015,5483,5657,4398,5924,3168,4819,6628,
+5925,6629,5532,4932,4613,6041,6630,4636,6384,4780,4204,5658,4423,5821,3989,4683,
+5822,6385,4954,6631,5345,6188,5425,5012,5384,3894,6386,4490,4104,6632,5741,5053,
+6633,5823,5926,5659,5660,5927,6634,5235,5742,5824,4840,4933,4820,6387,4859,5928,
+4955,6388,4143,3584,5825,5346,5013,6635,5661,6389,5014,5484,5743,4337,5176,5662,
+6390,2836,6391,3268,6392,6636,6042,5236,6637,4158,6638,5744,5663,4471,5347,3663,
+4123,5143,4293,3895,6639,6640,5311,5929,5826,3800,6189,6393,6190,5664,5348,3554,
+3594,4749,4603,6641,5385,4801,6043,5827,4183,6642,5312,5426,4761,6394,5665,6191,
+4715,2669,6643,6644,5533,3185,5427,5086,5930,5931,5386,6192,6044,6645,4781,4013,
+5745,4282,4435,5534,4390,4267,6045,5746,4984,6046,2743,6193,3501,4087,5485,5932,
+5428,4184,4095,5747,4061,5054,3058,3862,5933,5600,6646,5144,3618,6395,3131,5055,
+5313,6396,4650,4956,3855,6194,3896,5202,4985,4029,4225,6195,6647,5828,5486,5829,
+3589,3002,6648,6397,4782,5276,6649,6196,6650,4105,3803,4043,5237,5830,6398,4096,
+3643,6399,3528,6651,4453,3315,4637,6652,3984,6197,5535,3182,3339,6653,3096,2660,
+6400,6654,3449,5934,4250,4236,6047,6401,5831,6655,5487,3753,4062,5832,6198,6199,
+6656,3766,6657,3403,4667,6048,6658,4338,2897,5833,3880,2797,3780,4326,6659,5748,
+5015,6660,5387,4351,5601,4411,6661,3654,4424,5935,4339,4072,5277,4568,5536,6402,
+6662,5238,6663,5349,5203,6200,5204,6201,5145,4536,5016,5056,4762,5834,4399,4957,
+6202,6403,5666,5749,6664,4340,6665,5936,5177,5667,6666,6667,3459,4668,6404,6668,
+6669,4543,6203,6670,4276,6405,4480,5537,6671,4614,5205,5668,6672,3348,2193,4763,
+6406,6204,5937,5602,4177,5669,3419,6673,4020,6205,4443,4569,5388,3715,3639,6407,
+6049,4058,6206,6674,5938,4544,6050,4185,4294,4841,4651,4615,5488,6207,6408,6051,
+5178,3241,3509,5835,6208,4958,5836,4341,5489,5278,6209,2823,5538,5350,5206,5429,
+6675,4638,4875,4073,3516,4684,4914,4860,5939,5603,5389,6052,5057,3237,5490,3791,
+6676,6409,6677,4821,4915,4106,5351,5058,4243,5539,4244,5604,4842,4916,5239,3028,
+3716,5837,5114,5605,5390,5940,5430,6210,4332,6678,5540,4732,3667,3840,6053,4305,
+3408,5670,5541,6410,2744,5240,5750,6679,3234,5606,6680,5607,5671,3608,4283,4159,
+4400,5352,4783,6681,6411,6682,4491,4802,6211,6412,5941,6413,6414,5542,5751,6683,
+4669,3734,5942,6684,6415,5943,5059,3328,4670,4144,4268,6685,6686,6687,6688,4372,
+3603,6689,5944,5491,4373,3440,6416,5543,4784,4822,5608,3792,4616,5838,5672,3514,
+5391,6417,4892,6690,4639,6691,6054,5673,5839,6055,6692,6056,5392,6212,4038,5544,
+5674,4497,6057,6693,5840,4284,5675,4021,4545,5609,6418,4454,6419,6213,4113,4472,
+5314,3738,5087,5279,4074,5610,4959,4063,3179,4750,6058,6420,6214,3476,4498,4716,
+5431,4960,4685,6215,5241,6694,6421,6216,6695,5841,5945,6422,3748,5946,5179,3905,
+5752,5545,5947,4374,6217,4455,6423,4412,6218,4803,5353,6696,3832,5280,6219,4327,
+4702,6220,6221,6059,4652,5432,6424,3749,4751,6425,5753,4986,5393,4917,5948,5030,
+5754,4861,4733,6426,4703,6697,6222,4671,5949,4546,4961,5180,6223,5031,3316,5281,
+6698,4862,4295,4934,5207,3644,6427,5842,5950,6428,6429,4570,5843,5282,6430,6224,
+5088,3239,6060,6699,5844,5755,6061,6431,2701,5546,6432,5115,5676,4039,3993,3327,
+4752,4425,5315,6433,3941,6434,5677,4617,4604,3074,4581,6225,5433,6435,6226,6062,
+4823,5756,5116,6227,3717,5678,4717,5845,6436,5679,5846,6063,5847,6064,3977,3354,
+6437,3863,5117,6228,5547,5394,4499,4524,6229,4605,6230,4306,4500,6700,5951,6065,
+3693,5952,5089,4366,4918,6701,6231,5548,6232,6702,6438,4704,5434,6703,6704,5953,
+4168,6705,5680,3420,6706,5242,4407,6066,3812,5757,5090,5954,4672,4525,3481,5681,
+4618,5395,5354,5316,5955,6439,4962,6707,4526,6440,3465,4673,6067,6441,5682,6708,
+5435,5492,5758,5683,4619,4571,4674,4804,4893,4686,5493,4753,6233,6068,4269,6442,
+6234,5032,4705,5146,5243,5208,5848,6235,6443,4963,5033,4640,4226,6236,5849,3387,
+6444,6445,4436,4437,5850,4843,5494,4785,4894,6709,4361,6710,5091,5956,3331,6237,
+4987,5549,6069,6711,4342,3517,4473,5317,6070,6712,6071,4706,6446,5017,5355,6713,
+6714,4988,5436,6447,4734,5759,6715,4735,4547,4456,4754,6448,5851,6449,6450,3547,
+5852,5318,6451,6452,5092,4205,6716,6238,4620,4219,5611,6239,6072,4481,5760,5957,
+5958,4059,6240,6453,4227,4537,6241,5761,4030,4186,5244,5209,3761,4457,4876,3337,
+5495,5181,6242,5959,5319,5612,5684,5853,3493,5854,6073,4169,5613,5147,4895,6074,
+5210,6717,5182,6718,3830,6243,2798,3841,6075,6244,5855,5614,3604,4606,5496,5685,
+5118,5356,6719,6454,5960,5357,5961,6720,4145,3935,4621,5119,5962,4261,6721,6455,
+4786,5963,4375,4582,6245,6246,6247,6076,5437,4877,5856,3376,4380,6248,4160,6722,
+5148,6456,5211,6457,6723,4718,6458,6724,6249,5358,4044,3297,6459,6250,5857,5615,
+5497,5245,6460,5498,6725,6251,6252,5550,3793,5499,2959,5396,6461,6462,4572,5093,
+5500,5964,3806,4146,6463,4426,5762,5858,6077,6253,4755,3967,4220,5965,6254,4989,
+5501,6464,4352,6726,6078,4764,2290,5246,3906,5438,5283,3767,4964,2861,5763,5094,
+6255,6256,4622,5616,5859,5860,4707,6727,4285,4708,4824,5617,6257,5551,4787,5212,
+4965,4935,4687,6465,6728,6466,5686,6079,3494,4413,2995,5247,5966,5618,6729,5967,
+5764,5765,5687,5502,6730,6731,6080,5397,6467,4990,6258,6732,4538,5060,5619,6733,
+4719,5688,5439,5018,5149,5284,5503,6734,6081,4607,6259,5120,3645,5861,4583,6260,
+4584,4675,5620,4098,5440,6261,4863,2379,3306,4585,5552,5689,4586,5285,6735,4864,
+6736,5286,6082,6737,4623,3010,4788,4381,4558,5621,4587,4896,3698,3161,5248,4353,
+4045,6262,3754,5183,4588,6738,6263,6739,6740,5622,3936,6741,6468,6742,6264,5095,
+6469,4991,5968,6743,4992,6744,6083,4897,6745,4256,5766,4307,3108,3968,4444,5287,
+3889,4343,6084,4510,6085,4559,6086,4898,5969,6746,5623,5061,4919,5249,5250,5504,
+5441,6265,5320,4878,3242,5862,5251,3428,6087,6747,4237,5624,5442,6266,5553,4539,
+6748,2585,3533,5398,4262,6088,5150,4736,4438,6089,6267,5505,4966,6749,6268,6750,
+6269,5288,5554,3650,6090,6091,4624,6092,5690,6751,5863,4270,5691,4277,5555,5864,
+6752,5692,4720,4865,6470,5151,4688,4825,6753,3094,6754,6471,3235,4653,6755,5213,
+5399,6756,3201,4589,5865,4967,6472,5866,6473,5019,3016,6757,5321,4756,3957,4573,
+6093,4993,5767,4721,6474,6758,5625,6759,4458,6475,6270,6760,5556,4994,5214,5252,
+6271,3875,5768,6094,5034,5506,4376,5769,6761,2120,6476,5253,5770,6762,5771,5970,
+3990,5971,5557,5558,5772,6477,6095,2787,4641,5972,5121,6096,6097,6272,6763,3703,
+5867,5507,6273,4206,6274,4789,6098,6764,3619,3646,3833,3804,2394,3788,4936,3978,
+4866,4899,6099,6100,5559,6478,6765,3599,5868,6101,5869,5870,6275,6766,4527,6767)
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/gb2312prober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/gb2312prober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/gb2312prober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/gb2312prober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,41 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import GB2312DistributionAnalysis
+from .mbcssm import GB2312SMModel
+
+class GB2312Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(GB2312SMModel)
+        self._mDistributionAnalyzer = GB2312DistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "GB2312"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/hebrewprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/hebrewprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/hebrewprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/hebrewprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,283 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+#          Shy Shalom
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetprober import CharSetProber
+from .constants import eNotMe, eDetecting
+from .compat import wrap_ord
+
+# This prober doesn't actually recognize a language or a charset.
+# It is a helper prober for the use of the Hebrew model probers
+
+### General ideas of the Hebrew charset recognition ###
+#
+# Four main charsets exist in Hebrew:
+# "ISO-8859-8" - Visual Hebrew
+# "windows-1255" - Logical Hebrew
+# "ISO-8859-8-I" - Logical Hebrew
+# "x-mac-hebrew" - ?? Logical Hebrew ??
+#
+# Both "ISO" charsets use a completely identical set of code points, whereas
+# "windows-1255" and "x-mac-hebrew" are two different proper supersets of
+# these code points. windows-1255 defines additional characters in the range
+# 0x80-0x9F as some misc punctuation marks as well as some Hebrew-specific
+# diacritics and additional 'Yiddish' ligature letters in the range 0xc0-0xd6.
+# x-mac-hebrew defines similar additional code points but with a different
+# mapping.
+#
+# As far as an average Hebrew text with no diacritics is concerned, all four
+# charsets are identical with respect to code points. Meaning that for the
+# main Hebrew alphabet, all four map the same values to all 27 Hebrew letters
+# (including final letters).
+#
+# The dominant difference between these charsets is their directionality.
+# "Visual" directionality means that the text is ordered as if the renderer is
+# not aware of a BIDI rendering algorithm. The renderer sees the text and
+# draws it from left to right. The text itself when ordered naturally is read
+# backwards. A buffer of Visual Hebrew generally looks like so:
+# "[last word of first line spelled backwards] [whole line ordered backwards
+# and spelled backwards] [first word of first line spelled backwards]
+# [end of line] [last word of second line] ... etc' "
+# adding punctuation marks, numbers and English text to visual text is
+# naturally also "visual" and from left to right.
+#
+# "Logical" directionality means the text is ordered "naturally" according to
+# the order it is read. It is the responsibility of the renderer to display
+# the text from right to left. A BIDI algorithm is used to place general
+# punctuation marks, numbers and English text in the text.
+#
+# Texts in x-mac-hebrew are almost impossible to find on the Internet. From
+# what little evidence I could find, it seems that its general directionality
+# is Logical.
+#
+# To sum up all of the above, the Hebrew probing mechanism knows about two
+# charsets:
+# Visual Hebrew - "ISO-8859-8" - backwards text - Words and sentences are
+#    backwards while line order is natural. For charset recognition purposes
+#    the line order is unimportant (In fact, for this implementation, even
+#    word order is unimportant).
+# Logical Hebrew - "windows-1255" - normal, naturally ordered text.
+#
+# "ISO-8859-8-I" is a subset of windows-1255 and doesn't need to be
+#    specifically identified.
+# "x-mac-hebrew" is also identified as windows-1255. A text in x-mac-hebrew
+#    that contain special punctuation marks or diacritics is displayed with
+#    some unconverted characters showing as question marks. This problem might
+#    be corrected using another model prober for x-mac-hebrew. Due to the fact
+#    that x-mac-hebrew texts are so rare, writing another model prober isn't
+#    worth the effort and performance hit.
+#
+#### The Prober ####
+#
+# The prober is divided between two SBCharSetProbers and a HebrewProber,
+# all of which are managed, created, fed data, inquired and deleted by the
+# SBCSGroupProber. The two SBCharSetProbers identify that the text is in
+# fact some kind of Hebrew, Logical or Visual. The final decision about which
+# one is it is made by the HebrewProber by combining final-letter scores
+# with the scores of the two SBCharSetProbers to produce a final answer.
+#
+# The SBCSGroupProber is responsible for stripping the original text of HTML
+# tags, English characters, numbers, low-ASCII punctuation characters, spaces
+# and new lines. It reduces any sequence of such characters to a single space.
+# The buffer fed to each prober in the SBCS group prober is pure text in
+# high-ASCII.
+# The two SBCharSetProbers (model probers) share the same language model:
+# Win1255Model.
+# The first SBCharSetProber uses the model normally as any other
+# SBCharSetProber does, to recognize windows-1255, upon which this model was
+# built. The second SBCharSetProber is told to make the pair-of-letter
+# lookup in the language model backwards. This in practice exactly simulates
+# a visual Hebrew model using the windows-1255 logical Hebrew model.
+#
+# The HebrewProber is not using any language model. All it does is look for
+# final-letter evidence suggesting the text is either logical Hebrew or visual
+# Hebrew. Disjointed from the model probers, the results of the HebrewProber
+# alone are meaningless. HebrewProber always returns 0.00 as confidence
+# since it never identifies a charset by itself. Instead, the pointer to the
+# HebrewProber is passed to the model probers as a helper "Name Prober".
+# When the Group prober receives a positive identification from any prober,
+# it asks for the name of the charset identified. If the prober queried is a
+# Hebrew model prober, the model prober forwards the call to the
+# HebrewProber to make the final decision. In the HebrewProber, the
+# decision is made according to the final-letters scores maintained and Both
+# model probers scores. The answer is returned in the form of the name of the
+# charset identified, either "windows-1255" or "ISO-8859-8".
+
+# windows-1255 / ISO-8859-8 code points of interest
+FINAL_KAF = 0xea
+NORMAL_KAF = 0xeb
+FINAL_MEM = 0xed
+NORMAL_MEM = 0xee
+FINAL_NUN = 0xef
+NORMAL_NUN = 0xf0
+FINAL_PE = 0xf3
+NORMAL_PE = 0xf4
+FINAL_TSADI = 0xf5
+NORMAL_TSADI = 0xf6
+
+# Minimum Visual vs Logical final letter score difference.
+# If the difference is below this, don't rely solely on the final letter score
+# distance.
+MIN_FINAL_CHAR_DISTANCE = 5
+
+# Minimum Visual vs Logical model score difference.
+# If the difference is below this, don't rely at all on the model score
+# distance.
+MIN_MODEL_DISTANCE = 0.01
+
+VISUAL_HEBREW_NAME = "ISO-8859-8"
+LOGICAL_HEBREW_NAME = "windows-1255"
+
+
+class HebrewProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mLogicalProber = None
+        self._mVisualProber = None
+        self.reset()
+
+    def reset(self):
+        self._mFinalCharLogicalScore = 0
+        self._mFinalCharVisualScore = 0
+        # The two last characters seen in the previous buffer,
+        # mPrev and mBeforePrev are initialized to space in order to simulate
+        # a word delimiter at the beginning of the data
+        self._mPrev = ' '
+        self._mBeforePrev = ' '
+        # These probers are owned by the group prober.
+
+    def set_model_probers(self, logicalProber, visualProber):
+        self._mLogicalProber = logicalProber
+        self._mVisualProber = visualProber
+
+    def is_final(self, c):
+        return wrap_ord(c) in [FINAL_KAF, FINAL_MEM, FINAL_NUN, FINAL_PE,
+                               FINAL_TSADI]
+
+    def is_non_final(self, c):
+        # The normal Tsadi is not a good Non-Final letter due to words like
+        # 'lechotet' (to chat) containing an apostrophe after the tsadi. This
+        # apostrophe is converted to a space in FilterWithoutEnglishLetters
+        # causing the Non-Final tsadi to appear at an end of a word even
+        # though this is not the case in the original text.
+        # The letters Pe and Kaf rarely display a related behavior of not being
+        # a good Non-Final letter. Words like 'Pop', 'Winamp' and 'Mubarak'
+        # for example legally end with a Non-Final Pe or Kaf. However, the
+        # benefit of these letters as Non-Final letters outweighs the damage
+        # since these words are quite rare.
+        return wrap_ord(c) in [NORMAL_KAF, NORMAL_MEM, NORMAL_NUN, NORMAL_PE]
+
+    def feed(self, aBuf):
+        # Final letter analysis for logical-visual decision.
+        # Look for evidence that the received buffer is either logical Hebrew
+        # or visual Hebrew.
+        # The following cases are checked:
+        # 1) A word longer than 1 letter, ending with a final letter. This is
+        #    an indication that the text is laid out "naturally" since the
+        #    final letter really appears at the end. +1 for logical score.
+        # 2) A word longer than 1 letter, ending with a Non-Final letter. In
+        #    normal Hebrew, words ending with Kaf, Mem, Nun, Pe or Tsadi,
+        #    should not end with the Non-Final form of that letter. Exceptions
+        #    to this rule are mentioned above in isNonFinal(). This is an
+        #    indication that the text is laid out backwards. +1 for visual
+        #    score
+        # 3) A word longer than 1 letter, starting with a final letter. Final
+        #    letters should not appear at the beginning of a word. This is an
+        #    indication that the text is laid out backwards. +1 for visual
+        #    score.
+        #
+        # The visual score and logical score are accumulated throughout the
+        # text and are finally checked against each other in GetCharSetName().
+        # No checking for final letters in the middle of words is done since
+        # that case is not an indication for either Logical or Visual text.
+        #
+        # We automatically filter out all 7-bit characters (replace them with
+        # spaces) so the word boundary detection works properly. [MAP]
+
+        if self.get_state() == eNotMe:
+            # Both model probers say it's not them. No reason to continue.
+            return eNotMe
+
+        aBuf = self.filter_high_bit_only(aBuf)
+
+        for cur in aBuf:
+            if cur == ' ':
+                # We stand on a space - a word just ended
+                if self._mBeforePrev != ' ':
+                    # next-to-last char was not a space so self._mPrev is not a
+                    # 1 letter word
+                    if self.is_final(self._mPrev):
+                        # case (1) [-2:not space][-1:final letter][cur:space]
+                        self._mFinalCharLogicalScore += 1
+                    elif self.is_non_final(self._mPrev):
+                        # case (2) [-2:not space][-1:Non-Final letter][
+                        #  cur:space]
+                        self._mFinalCharVisualScore += 1
+            else:
+                # Not standing on a space
+                if ((self._mBeforePrev == ' ') and
+                        (self.is_final(self._mPrev)) and (cur != ' ')):
+                    # case (3) [-2:space][-1:final letter][cur:not space]
+                    self._mFinalCharVisualScore += 1
+            self._mBeforePrev = self._mPrev
+            self._mPrev = cur
+
+        # Forever detecting, till the end or until both model probers return
+        # eNotMe (handled above)
+        return eDetecting
+
+    def get_charset_name(self):
+        # Make the decision: is it Logical or Visual?
+        # If the final letter score distance is dominant enough, rely on it.
+        finalsub = self._mFinalCharLogicalScore - self._mFinalCharVisualScore
+        if finalsub >= MIN_FINAL_CHAR_DISTANCE:
+            return LOGICAL_HEBREW_NAME
+        if finalsub <= -MIN_FINAL_CHAR_DISTANCE:
+            return VISUAL_HEBREW_NAME
+
+        # It's not dominant enough, try to rely on the model scores instead.
+        modelsub = (self._mLogicalProber.get_confidence()
+                    - self._mVisualProber.get_confidence())
+        if modelsub > MIN_MODEL_DISTANCE:
+            return LOGICAL_HEBREW_NAME
+        if modelsub < -MIN_MODEL_DISTANCE:
+            return VISUAL_HEBREW_NAME
+
+        # Still no good, back to final letter distance, maybe it'll save the
+        # day.
+        if finalsub < 0.0:
+            return VISUAL_HEBREW_NAME
+
+        # (finalsub > 0 - Logical) or (don't know what to do) default to
+        # Logical.
+        return LOGICAL_HEBREW_NAME
+
+    def get_state(self):
+        # Remain active as long as any of the model probers are active.
+        if (self._mLogicalProber.get_state() == eNotMe) and \
+           (self._mVisualProber.get_state() == eNotMe):
+            return eNotMe
+        return eDetecting
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/__init__.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,32 @@
+######################## BEGIN LICENSE BLOCK ########################
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+__version__ = "2.3.0"
+from sys import version_info
+
+
+def detect(aBuf):
+    if ((version_info < (3, 0) and isinstance(aBuf, unicode)) or
+            (version_info >= (3, 0) and not isinstance(aBuf, bytes))):
+        raise ValueError('Expected a bytes object, not a unicode object')
+
+    from . import universaldetector
+    u = universaldetector.UniversalDetector()
+    u.reset()
+    u.feed(aBuf)
+    u.close()
+    return u.result
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/jisfreq.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/jisfreq.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/jisfreq.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/jisfreq.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,569 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# Sampling from about 20M text materials include literature and computer technology
+#
+# Japanese frequency table, applied to both S-JIS and EUC-JP
+# They are sorted in order.
+
+# 128  --> 0.77094
+# 256  --> 0.85710
+# 512  --> 0.92635
+# 1024 --> 0.97130
+# 2048 --> 0.99431
+#
+# Ideal Distribution Ratio = 0.92635 / (1-0.92635) = 12.58
+# Random Distribution Ration = 512 / (2965+62+83+86-512) = 0.191
+#
+# Typical Distribution Ratio, 25% of IDR
+
+JIS_TYPICAL_DISTRIBUTION_RATIO = 3.0
+
+# Char to FreqOrder table ,
+JIS_TABLE_SIZE = 4368
+
+JISCharToFreqOrder = (
+  40,   1,   6, 182, 152, 180, 295,2127, 285, 381,3295,4304,3068,4606,3165,3510, #   16
+3511,1822,2785,4607,1193,2226,5070,4608, 171,2996,1247,  18, 179,5071, 856,1661, #   32
+1262,5072, 619, 127,3431,3512,3230,1899,1700, 232, 228,1294,1298, 284, 283,2041, #   48
+2042,1061,1062,  48,  49,  44,  45, 433, 434,1040,1041, 996, 787,2997,1255,4305, #   64
+2108,4609,1684,1648,5073,5074,5075,5076,5077,5078,3687,5079,4610,5080,3927,3928, #   80
+5081,3296,3432, 290,2285,1471,2187,5082,2580,2825,1303,2140,1739,1445,2691,3375, #   96
+1691,3297,4306,4307,4611, 452,3376,1182,2713,3688,3069,4308,5083,5084,5085,5086, #  112
+5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102, #  128
+5103,5104,5105,5106,5107,5108,5109,5110,5111,5112,4097,5113,5114,5115,5116,5117, #  144
+5118,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,5130,5131,5132,5133, #  160
+5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,5149, #  176
+5150,5151,5152,4612,5153,5154,5155,5156,5157,5158,5159,5160,5161,5162,5163,5164, #  192
+5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,1472, 598, 618, 820,1205, #  208
+1309,1412,1858,1307,1692,5176,5177,5178,5179,5180,5181,5182,1142,1452,1234,1172, #  224
+1875,2043,2149,1793,1382,2973, 925,2404,1067,1241, 960,1377,2935,1491, 919,1217, #  240
+1865,2030,1406,1499,2749,4098,5183,5184,5185,5186,5187,5188,2561,4099,3117,1804, #  256
+2049,3689,4309,3513,1663,5189,3166,3118,3298,1587,1561,3433,5190,3119,1625,2998, #  272
+3299,4613,1766,3690,2786,4614,5191,5192,5193,5194,2161,  26,3377,   2,3929,  20, #  288
+3691,  47,4100,  50,  17,  16,  35, 268,  27, 243,  42, 155,  24, 154,  29, 184, #  304
+   4,  91,  14,  92,  53, 396,  33, 289,   9,  37,  64, 620,  21,  39, 321,   5, #  320
+  12,  11,  52,  13,   3, 208, 138,   0,   7,  60, 526, 141, 151,1069, 181, 275, #  336
+1591,  83, 132,1475, 126, 331, 829,  15,  69, 160,  59,  22, 157,  55,1079, 312, #  352
+ 109,  38,  23,  25,  10,  19,  79,5195,  61, 382,1124,   8,  30,5196,5197,5198, #  368
+5199,5200,5201,5202,5203,5204,5205,5206,  89,  62,  74,  34,2416, 112, 139, 196, #  384
+ 271, 149,  84, 607, 131, 765,  46,  88, 153, 683,  76, 874, 101, 258,  57,  80, #  400
+  32, 364, 121,1508, 169,1547,  68, 235, 145,2999,  41, 360,3027,  70,  63,  31, #  416
+  43, 259, 262,1383,  99, 533, 194,  66,  93, 846, 217, 192,  56, 106,  58, 565, #  432
+ 280, 272, 311, 256, 146,  82, 308,  71, 100, 128, 214, 655, 110, 261, 104,1140, #  448
+  54,  51,  36,  87,  67,3070, 185,2618,2936,2020,  28,1066,2390,2059,5207,5208, #  464
+5209,5210,5211,5212,5213,5214,5215,5216,4615,5217,5218,5219,5220,5221,5222,5223, #  480
+5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,5235,5236,3514,5237,5238, #  496
+5239,5240,5241,5242,5243,5244,2297,2031,4616,4310,3692,5245,3071,5246,3598,5247, #  512
+4617,3231,3515,5248,4101,4311,4618,3808,4312,4102,5249,4103,4104,3599,5250,5251, #  528
+5252,5253,5254,5255,5256,5257,5258,5259,5260,5261,5262,5263,5264,5265,5266,5267, #  544
+5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,5279,5280,5281,5282,5283, #  560
+5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,5294,5295,5296,5297,5298,5299, #  576
+5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315, #  592
+5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331, #  608
+5332,5333,5334,5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347, #  624
+5348,5349,5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363, #  640
+5364,5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379, #  656
+5380,5381, 363, 642,2787,2878,2788,2789,2316,3232,2317,3434,2011, 165,1942,3930, #  672
+3931,3932,3933,5382,4619,5383,4620,5384,5385,5386,5387,5388,5389,5390,5391,5392, #  688
+5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408, #  704
+5409,5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424, #  720
+5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440, #  736
+5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456, #  752
+5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472, #  768
+5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,5485,5486,5487,5488, #  784
+5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504, #  800
+5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520, #  816
+5521,5522,5523,5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536, #  832
+5537,5538,5539,5540,5541,5542,5543,5544,5545,5546,5547,5548,5549,5550,5551,5552, #  848
+5553,5554,5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568, #  864
+5569,5570,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584, #  880
+5585,5586,5587,5588,5589,5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600, #  896
+5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616, #  912
+5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632, #  928
+5633,5634,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648, #  944
+5649,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664, #  960
+5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,5680, #  976
+5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696, #  992
+5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712, # 1008
+5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,5725,5726,5727,5728, # 1024
+5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,5740,5741,5742,5743,5744, # 1040
+5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,5755,5756,5757,5758,5759,5760, # 1056
+5761,5762,5763,5764,5765,5766,5767,5768,5769,5770,5771,5772,5773,5774,5775,5776, # 1072
+5777,5778,5779,5780,5781,5782,5783,5784,5785,5786,5787,5788,5789,5790,5791,5792, # 1088
+5793,5794,5795,5796,5797,5798,5799,5800,5801,5802,5803,5804,5805,5806,5807,5808, # 1104
+5809,5810,5811,5812,5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824, # 1120
+5825,5826,5827,5828,5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840, # 1136
+5841,5842,5843,5844,5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856, # 1152
+5857,5858,5859,5860,5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872, # 1168
+5873,5874,5875,5876,5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888, # 1184
+5889,5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904, # 1200
+5905,5906,5907,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920, # 1216
+5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936, # 1232
+5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952, # 1248
+5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968, # 1264
+5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984, # 1280
+5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000, # 1296
+6001,6002,6003,6004,6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016, # 1312
+6017,6018,6019,6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032, # 1328
+6033,6034,6035,6036,6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048, # 1344
+6049,6050,6051,6052,6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064, # 1360
+6065,6066,6067,6068,6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080, # 1376
+6081,6082,6083,6084,6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096, # 1392
+6097,6098,6099,6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112, # 1408
+6113,6114,2044,2060,4621, 997,1235, 473,1186,4622, 920,3378,6115,6116, 379,1108, # 1424
+4313,2657,2735,3934,6117,3809, 636,3233, 573,1026,3693,3435,2974,3300,2298,4105, # 1440
+ 854,2937,2463, 393,2581,2417, 539, 752,1280,2750,2480, 140,1161, 440, 708,1569, # 1456
+ 665,2497,1746,1291,1523,3000, 164,1603, 847,1331, 537,1997, 486, 508,1693,2418, # 1472
+1970,2227, 878,1220, 299,1030, 969, 652,2751, 624,1137,3301,2619,  65,3302,2045, # 1488
+1761,1859,3120,1930,3694,3516, 663,1767, 852, 835,3695, 269, 767,2826,2339,1305, # 1504
+ 896,1150, 770,1616,6118, 506,1502,2075,1012,2519, 775,2520,2975,2340,2938,4314, # 1520
+3028,2086,1224,1943,2286,6119,3072,4315,2240,1273,1987,3935,1557, 175, 597, 985, # 1536
+3517,2419,2521,1416,3029, 585, 938,1931,1007,1052,1932,1685,6120,3379,4316,4623, # 1552
+ 804, 599,3121,1333,2128,2539,1159,1554,2032,3810, 687,2033,2904, 952, 675,1467, # 1568
+3436,6121,2241,1096,1786,2440,1543,1924, 980,1813,2228, 781,2692,1879, 728,1918, # 1584
+3696,4624, 548,1950,4625,1809,1088,1356,3303,2522,1944, 502, 972, 373, 513,2827, # 1600
+ 586,2377,2391,1003,1976,1631,6122,2464,1084, 648,1776,4626,2141, 324, 962,2012, # 1616
+2177,2076,1384, 742,2178,1448,1173,1810, 222, 102, 301, 445, 125,2420, 662,2498, # 1632
+ 277, 200,1476,1165,1068, 224,2562,1378,1446, 450,1880, 659, 791, 582,4627,2939, # 1648
+3936,1516,1274, 555,2099,3697,1020,1389,1526,3380,1762,1723,1787,2229, 412,2114, # 1664
+1900,2392,3518, 512,2597, 427,1925,2341,3122,1653,1686,2465,2499, 697, 330, 273, # 1680
+ 380,2162, 951, 832, 780, 991,1301,3073, 965,2270,3519, 668,2523,2636,1286, 535, # 1696
+1407, 518, 671, 957,2658,2378, 267, 611,2197,3030,6123, 248,2299, 967,1799,2356, # 1712
+ 850,1418,3437,1876,1256,1480,2828,1718,6124,6125,1755,1664,2405,6126,4628,2879, # 1728
+2829, 499,2179, 676,4629, 557,2329,2214,2090, 325,3234, 464, 811,3001, 992,2342, # 1744
+2481,1232,1469, 303,2242, 466,1070,2163, 603,1777,2091,4630,2752,4631,2714, 322, # 1760
+2659,1964,1768, 481,2188,1463,2330,2857,3600,2092,3031,2421,4632,2318,2070,1849, # 1776
+2598,4633,1302,2254,1668,1701,2422,3811,2905,3032,3123,2046,4106,1763,1694,4634, # 1792
+1604, 943,1724,1454, 917, 868,2215,1169,2940, 552,1145,1800,1228,1823,1955, 316, # 1808
+1080,2510, 361,1807,2830,4107,2660,3381,1346,1423,1134,4108,6127, 541,1263,1229, # 1824
+1148,2540, 545, 465,1833,2880,3438,1901,3074,2482, 816,3937, 713,1788,2500, 122, # 1840
+1575, 195,1451,2501,1111,6128, 859, 374,1225,2243,2483,4317, 390,1033,3439,3075, # 1856
+2524,1687, 266, 793,1440,2599, 946, 779, 802, 507, 897,1081, 528,2189,1292, 711, # 1872
+1866,1725,1167,1640, 753, 398,2661,1053, 246, 348,4318, 137,1024,3440,1600,2077, # 1888
+2129, 825,4319, 698, 238, 521, 187,2300,1157,2423,1641,1605,1464,1610,1097,2541, # 1904
+1260,1436, 759,2255,1814,2150, 705,3235, 409,2563,3304, 561,3033,2005,2564, 726, # 1920
+1956,2343,3698,4109, 949,3812,3813,3520,1669, 653,1379,2525, 881,2198, 632,2256, # 1936
+1027, 778,1074, 733,1957, 514,1481,2466, 554,2180, 702,3938,1606,1017,1398,6129, # 1952
+1380,3521, 921, 993,1313, 594, 449,1489,1617,1166, 768,1426,1360, 495,1794,3601, # 1968
+1177,3602,1170,4320,2344, 476, 425,3167,4635,3168,1424, 401,2662,1171,3382,1998, # 1984
+1089,4110, 477,3169, 474,6130,1909, 596,2831,1842, 494, 693,1051,1028,1207,3076, # 2000
+ 606,2115, 727,2790,1473,1115, 743,3522, 630, 805,1532,4321,2021, 366,1057, 838, # 2016
+ 684,1114,2142,4322,2050,1492,1892,1808,2271,3814,2424,1971,1447,1373,3305,1090, # 2032
+1536,3939,3523,3306,1455,2199, 336, 369,2331,1035, 584,2393, 902, 718,2600,6131, # 2048
+2753, 463,2151,1149,1611,2467, 715,1308,3124,1268, 343,1413,3236,1517,1347,2663, # 2064
+2093,3940,2022,1131,1553,2100,2941,1427,3441,2942,1323,2484,6132,1980, 872,2368, # 2080
+2441,2943, 320,2369,2116,1082, 679,1933,3941,2791,3815, 625,1143,2023, 422,2200, # 2096
+3816,6133, 730,1695, 356,2257,1626,2301,2858,2637,1627,1778, 937, 883,2906,2693, # 2112
+3002,1769,1086, 400,1063,1325,3307,2792,4111,3077, 456,2345,1046, 747,6134,1524, # 2128
+ 884,1094,3383,1474,2164,1059, 974,1688,2181,2258,1047, 345,1665,1187, 358, 875, # 2144
+3170, 305, 660,3524,2190,1334,1135,3171,1540,1649,2542,1527, 927, 968,2793, 885, # 2160
+1972,1850, 482, 500,2638,1218,1109,1085,2543,1654,2034, 876,  78,2287,1482,1277, # 2176
+ 861,1675,1083,1779, 724,2754, 454, 397,1132,1612,2332, 893, 672,1237, 257,2259, # 2192
+2370, 135,3384, 337,2244, 547, 352, 340, 709,2485,1400, 788,1138,2511, 540, 772, # 2208
+1682,2260,2272,2544,2013,1843,1902,4636,1999,1562,2288,4637,2201,1403,1533, 407, # 2224
+ 576,3308,1254,2071, 978,3385, 170, 136,1201,3125,2664,3172,2394, 213, 912, 873, # 2240
+3603,1713,2202, 699,3604,3699, 813,3442, 493, 531,1054, 468,2907,1483, 304, 281, # 2256
+4112,1726,1252,2094, 339,2319,2130,2639, 756,1563,2944, 748, 571,2976,1588,2425, # 2272
+2715,1851,1460,2426,1528,1392,1973,3237, 288,3309, 685,3386, 296, 892,2716,2216, # 2288
+1570,2245, 722,1747,2217, 905,3238,1103,6135,1893,1441,1965, 251,1805,2371,3700, # 2304
+2601,1919,1078,  75,2182,1509,1592,1270,2640,4638,2152,6136,3310,3817, 524, 706, # 2320
+1075, 292,3818,1756,2602, 317,  98,3173,3605,3525,1844,2218,3819,2502, 814, 567, # 2336
+ 385,2908,1534,6137, 534,1642,3239, 797,6138,1670,1529, 953,4323, 188,1071, 538, # 2352
+ 178, 729,3240,2109,1226,1374,2000,2357,2977, 731,2468,1116,2014,2051,6139,1261, # 2368
+1593, 803,2859,2736,3443, 556, 682, 823,1541,6140,1369,2289,1706,2794, 845, 462, # 2384
+2603,2665,1361, 387, 162,2358,1740, 739,1770,1720,1304,1401,3241,1049, 627,1571, # 2400
+2427,3526,1877,3942,1852,1500, 431,1910,1503, 677, 297,2795, 286,1433,1038,1198, # 2416
+2290,1133,1596,4113,4639,2469,1510,1484,3943,6141,2442, 108, 712,4640,2372, 866, # 2432
+3701,2755,3242,1348, 834,1945,1408,3527,2395,3243,1811, 824, 994,1179,2110,1548, # 2448
+1453, 790,3003, 690,4324,4325,2832,2909,3820,1860,3821, 225,1748, 310, 346,1780, # 2464
+2470, 821,1993,2717,2796, 828, 877,3528,2860,2471,1702,2165,2910,2486,1789, 453, # 2480
+ 359,2291,1676,  73,1164,1461,1127,3311, 421, 604, 314,1037, 589, 116,2487, 737, # 2496
+ 837,1180, 111, 244, 735,6142,2261,1861,1362, 986, 523, 418, 581,2666,3822, 103, # 2512
+ 855, 503,1414,1867,2488,1091, 657,1597, 979, 605,1316,4641,1021,2443,2078,2001, # 2528
+1209,  96, 587,2166,1032, 260,1072,2153, 173,  94, 226,3244, 819,2006,4642,4114, # 2544
+2203, 231,1744, 782,  97,2667, 786,3387, 887, 391, 442,2219,4326,1425,6143,2694, # 2560
+ 633,1544,1202, 483,2015, 592,2052,1958,2472,1655, 419, 129,4327,3444,3312,1714, # 2576
+1257,3078,4328,1518,1098, 865,1310,1019,1885,1512,1734, 469,2444, 148, 773, 436, # 2592
+1815,1868,1128,1055,4329,1245,2756,3445,2154,1934,1039,4643, 579,1238, 932,2320, # 2608
+ 353, 205, 801, 115,2428, 944,2321,1881, 399,2565,1211, 678, 766,3944, 335,2101, # 2624
+1459,1781,1402,3945,2737,2131,1010, 844, 981,1326,1013, 550,1816,1545,2620,1335, # 2640
+1008, 371,2881, 936,1419,1613,3529,1456,1395,2273,1834,2604,1317,2738,2503, 416, # 2656
+1643,4330, 806,1126, 229, 591,3946,1314,1981,1576,1837,1666, 347,1790, 977,3313, # 2672
+ 764,2861,1853, 688,2429,1920,1462,  77, 595, 415,2002,3034, 798,1192,4115,6144, # 2688
+2978,4331,3035,2695,2582,2072,2566, 430,2430,1727, 842,1396,3947,3702, 613, 377, # 2704
+ 278, 236,1417,3388,3314,3174, 757,1869, 107,3530,6145,1194, 623,2262, 207,1253, # 2720
+2167,3446,3948, 492,1117,1935, 536,1838,2757,1246,4332, 696,2095,2406,1393,1572, # 2736
+3175,1782, 583, 190, 253,1390,2230, 830,3126,3389, 934,3245,1703,1749,2979,1870, # 2752
+2545,1656,2204, 869,2346,4116,3176,1817, 496,1764,4644, 942,1504, 404,1903,1122, # 2768
+1580,3606,2945,1022, 515, 372,1735, 955,2431,3036,6146,2797,1110,2302,2798, 617, # 2784
+6147, 441, 762,1771,3447,3607,3608,1904, 840,3037,  86, 939,1385, 572,1370,2445, # 2800
+1336, 114,3703, 898, 294, 203,3315, 703,1583,2274, 429, 961,4333,1854,1951,3390, # 2816
+2373,3704,4334,1318,1381, 966,1911,2322,1006,1155, 309, 989, 458,2718,1795,1372, # 2832
+1203, 252,1689,1363,3177, 517,1936, 168,1490, 562, 193,3823,1042,4117,1835, 551, # 2848
+ 470,4645, 395, 489,3448,1871,1465,2583,2641, 417,1493, 279,1295, 511,1236,1119, # 2864
+  72,1231,1982,1812,3004, 871,1564, 984,3449,1667,2696,2096,4646,2347,2833,1673, # 2880
+3609, 695,3246,2668, 807,1183,4647, 890, 388,2333,1801,1457,2911,1765,1477,1031, # 2896
+3316,3317,1278,3391,2799,2292,2526, 163,3450,4335,2669,1404,1802,6148,2323,2407, # 2912
+1584,1728,1494,1824,1269, 298, 909,3318,1034,1632, 375, 776,1683,2061, 291, 210, # 2928
+1123, 809,1249,1002,2642,3038, 206,1011,2132, 144, 975, 882,1565, 342, 667, 754, # 2944
+1442,2143,1299,2303,2062, 447, 626,2205,1221,2739,2912,1144,1214,2206,2584, 760, # 2960
+1715, 614, 950,1281,2670,2621, 810, 577,1287,2546,4648, 242,2168, 250,2643, 691, # 2976
+ 123,2644, 647, 313,1029, 689,1357,2946,1650, 216, 771,1339,1306, 808,2063, 549, # 2992
+ 913,1371,2913,2914,6149,1466,1092,1174,1196,1311,2605,2396,1783,1796,3079, 406, # 3008
+2671,2117,3949,4649, 487,1825,2220,6150,2915, 448,2348,1073,6151,2397,1707, 130, # 3024
+ 900,1598, 329, 176,1959,2527,1620,6152,2275,4336,3319,1983,2191,3705,3610,2155, # 3040
+3706,1912,1513,1614,6153,1988, 646, 392,2304,1589,3320,3039,1826,1239,1352,1340, # 3056
+2916, 505,2567,1709,1437,2408,2547, 906,6154,2672, 384,1458,1594,1100,1329, 710, # 3072
+ 423,3531,2064,2231,2622,1989,2673,1087,1882, 333, 841,3005,1296,2882,2379, 580, # 3088
+1937,1827,1293,2585, 601, 574, 249,1772,4118,2079,1120, 645, 901,1176,1690, 795, # 3104
+2207, 478,1434, 516,1190,1530, 761,2080, 930,1264, 355, 435,1552, 644,1791, 987, # 3120
+ 220,1364,1163,1121,1538, 306,2169,1327,1222, 546,2645, 218, 241, 610,1704,3321, # 3136
+1984,1839,1966,2528, 451,6155,2586,3707,2568, 907,3178, 254,2947, 186,1845,4650, # 3152
+ 745, 432,1757, 428,1633, 888,2246,2221,2489,3611,2118,1258,1265, 956,3127,1784, # 3168
+4337,2490, 319, 510, 119, 457,3612, 274,2035,2007,4651,1409,3128, 970,2758, 590, # 3184
+2800, 661,2247,4652,2008,3950,1420,1549,3080,3322,3951,1651,1375,2111, 485,2491, # 3200
+1429,1156,6156,2548,2183,1495, 831,1840,2529,2446, 501,1657, 307,1894,3247,1341, # 3216
+ 666, 899,2156,1539,2549,1559, 886, 349,2208,3081,2305,1736,3824,2170,2759,1014, # 3232
+1913,1386, 542,1397,2948, 490, 368, 716, 362, 159, 282,2569,1129,1658,1288,1750, # 3248
+2674, 276, 649,2016, 751,1496, 658,1818,1284,1862,2209,2087,2512,3451, 622,2834, # 3264
+ 376, 117,1060,2053,1208,1721,1101,1443, 247,1250,3179,1792,3952,2760,2398,3953, # 3280
+6157,2144,3708, 446,2432,1151,2570,3452,2447,2761,2835,1210,2448,3082, 424,2222, # 3296
+1251,2449,2119,2836, 504,1581,4338, 602, 817, 857,3825,2349,2306, 357,3826,1470, # 3312
+1883,2883, 255, 958, 929,2917,3248, 302,4653,1050,1271,1751,2307,1952,1430,2697, # 3328
+2719,2359, 354,3180, 777, 158,2036,4339,1659,4340,4654,2308,2949,2248,1146,2232, # 3344
+3532,2720,1696,2623,3827,6158,3129,1550,2698,1485,1297,1428, 637, 931,2721,2145, # 3360
+ 914,2550,2587,  81,2450, 612, 827,2646,1242,4655,1118,2884, 472,1855,3181,3533, # 3376
+3534, 569,1353,2699,1244,1758,2588,4119,2009,2762,2171,3709,1312,1531,6159,1152, # 3392
+1938, 134,1830, 471,3710,2276,1112,1535,3323,3453,3535, 982,1337,2950, 488, 826, # 3408
+ 674,1058,1628,4120,2017, 522,2399, 211, 568,1367,3454, 350, 293,1872,1139,3249, # 3424
+1399,1946,3006,1300,2360,3324, 588, 736,6160,2606, 744, 669,3536,3828,6161,1358, # 3440
+ 199, 723, 848, 933, 851,1939,1505,1514,1338,1618,1831,4656,1634,3613, 443,2740, # 3456
+3829, 717,1947, 491,1914,6162,2551,1542,4121,1025,6163,1099,1223, 198,3040,2722, # 3472
+ 370, 410,1905,2589, 998,1248,3182,2380, 519,1449,4122,1710, 947, 928,1153,4341, # 3488
+2277, 344,2624,1511, 615, 105, 161,1212,1076,1960,3130,2054,1926,1175,1906,2473, # 3504
+ 414,1873,2801,6164,2309, 315,1319,3325, 318,2018,2146,2157, 963, 631, 223,4342, # 3520
+4343,2675, 479,3711,1197,2625,3712,2676,2361,6165,4344,4123,6166,2451,3183,1886, # 3536
+2184,1674,1330,1711,1635,1506, 799, 219,3250,3083,3954,1677,3713,3326,2081,3614, # 3552
+1652,2073,4657,1147,3041,1752, 643,1961, 147,1974,3955,6167,1716,2037, 918,3007, # 3568
+1994, 120,1537, 118, 609,3184,4345, 740,3455,1219, 332,1615,3830,6168,1621,2980, # 3584
+1582, 783, 212, 553,2350,3714,1349,2433,2082,4124, 889,6169,2310,1275,1410, 973, # 3600
+ 166,1320,3456,1797,1215,3185,2885,1846,2590,2763,4658, 629, 822,3008, 763, 940, # 3616
+1990,2862, 439,2409,1566,1240,1622, 926,1282,1907,2764, 654,2210,1607, 327,1130, # 3632
+3956,1678,1623,6170,2434,2192, 686, 608,3831,3715, 903,3957,3042,6171,2741,1522, # 3648
+1915,1105,1555,2552,1359, 323,3251,4346,3457, 738,1354,2553,2311,2334,1828,2003, # 3664
+3832,1753,2351,1227,6172,1887,4125,1478,6173,2410,1874,1712,1847, 520,1204,2607, # 3680
+ 264,4659, 836,2677,2102, 600,4660,3833,2278,3084,6174,4347,3615,1342, 640, 532, # 3696
+ 543,2608,1888,2400,2591,1009,4348,1497, 341,1737,3616,2723,1394, 529,3252,1321, # 3712
+ 983,4661,1515,2120, 971,2592, 924, 287,1662,3186,4349,2700,4350,1519, 908,1948, # 3728
+2452, 156, 796,1629,1486,2223,2055, 694,4126,1259,1036,3392,1213,2249,2742,1889, # 3744
+1230,3958,1015, 910, 408, 559,3617,4662, 746, 725, 935,4663,3959,3009,1289, 563, # 3760
+ 867,4664,3960,1567,2981,2038,2626, 988,2263,2381,4351, 143,2374, 704,1895,6175, # 3776
+1188,3716,2088, 673,3085,2362,4352, 484,1608,1921,2765,2918, 215, 904,3618,3537, # 3792
+ 894, 509, 976,3043,2701,3961,4353,2837,2982, 498,6176,6177,1102,3538,1332,3393, # 3808
+1487,1636,1637, 233, 245,3962, 383, 650, 995,3044, 460,1520,1206,2352, 749,3327, # 3824
+ 530, 700, 389,1438,1560,1773,3963,2264, 719,2951,2724,3834, 870,1832,1644,1000, # 3840
+ 839,2474,3717, 197,1630,3394, 365,2886,3964,1285,2133, 734, 922, 818,1106, 732, # 3856
+ 480,2083,1774,3458, 923,2279,1350, 221,3086,  85,2233,2234,3835,1585,3010,2147, # 3872
+1387,1705,2382,1619,2475, 133, 239,2802,1991,1016,2084,2383, 411,2838,1113, 651, # 3888
+1985,1160,3328, 990,1863,3087,1048,1276,2647, 265,2627,1599,3253,2056, 150, 638, # 3904
+2019, 656, 853, 326,1479, 680,1439,4354,1001,1759, 413,3459,3395,2492,1431, 459, # 3920
+4355,1125,3329,2265,1953,1450,2065,2863, 849, 351,2678,3131,3254,3255,1104,1577, # 3936
+ 227,1351,1645,2453,2193,1421,2887, 812,2121, 634,  95,2435, 201,2312,4665,1646, # 3952
+1671,2743,1601,2554,2702,2648,2280,1315,1366,2089,3132,1573,3718,3965,1729,1189, # 3968
+ 328,2679,1077,1940,1136, 558,1283, 964,1195, 621,2074,1199,1743,3460,3619,1896, # 3984
+1916,1890,3836,2952,1154,2112,1064, 862, 378,3011,2066,2113,2803,1568,2839,6178, # 4000
+3088,2919,1941,1660,2004,1992,2194, 142, 707,1590,1708,1624,1922,1023,1836,1233, # 4016
+1004,2313, 789, 741,3620,6179,1609,2411,1200,4127,3719,3720,4666,2057,3721, 593, # 4032
+2840, 367,2920,1878,6180,3461,1521, 628,1168, 692,2211,2649, 300, 720,2067,2571, # 4048
+2953,3396, 959,2504,3966,3539,3462,1977, 701,6181, 954,1043, 800, 681, 183,3722, # 4064
+1803,1730,3540,4128,2103, 815,2314, 174, 467, 230,2454,1093,2134, 755,3541,3397, # 4080
+1141,1162,6182,1738,2039, 270,3256,2513,1005,1647,2185,3837, 858,1679,1897,1719, # 4096
+2954,2324,1806, 402, 670, 167,4129,1498,2158,2104, 750,6183, 915, 189,1680,1551, # 4112
+ 455,4356,1501,2455, 405,1095,2955, 338,1586,1266,1819, 570, 641,1324, 237,1556, # 4128
+2650,1388,3723,6184,1368,2384,1343,1978,3089,2436, 879,3724, 792,1191, 758,3012, # 4144
+1411,2135,1322,4357, 240,4667,1848,3725,1574,6185, 420,3045,1546,1391, 714,4358, # 4160
+1967, 941,1864, 863, 664, 426, 560,1731,2680,1785,2864,1949,2363, 403,3330,1415, # 4176
+1279,2136,1697,2335, 204, 721,2097,3838,  90,6186,2085,2505, 191,3967, 124,2148, # 4192
+1376,1798,1178,1107,1898,1405, 860,4359,1243,1272,2375,2983,1558,2456,1638, 113, # 4208
+3621, 578,1923,2609, 880, 386,4130, 784,2186,2266,1422,2956,2172,1722, 497, 263, # 4224
+2514,1267,2412,2610, 177,2703,3542, 774,1927,1344, 616,1432,1595,1018, 172,4360, # 4240
+2325, 911,4361, 438,1468,3622, 794,3968,2024,2173,1681,1829,2957, 945, 895,3090, # 4256
+ 575,2212,2476, 475,2401,2681, 785,2744,1745,2293,2555,1975,3133,2865, 394,4668, # 4272
+3839, 635,4131, 639, 202,1507,2195,2766,1345,1435,2572,3726,1908,1184,1181,2457, # 4288
+3727,3134,4362, 843,2611, 437, 916,4669, 234, 769,1884,3046,3047,3623, 833,6187, # 4304
+1639,2250,2402,1355,1185,2010,2047, 999, 525,1732,1290,1488,2612, 948,1578,3728, # 4320
+2413,2477,1216,2725,2159, 334,3840,1328,3624,2921,1525,4132, 564,1056, 891,4363, # 4336
+1444,1698,2385,2251,3729,1365,2281,2235,1717,6188, 864,3841,2515, 444, 527,2767, # 4352
+2922,3625, 544, 461,6189, 566, 209,2437,3398,2098,1065,2068,3331,3626,3257,2137, # 4368  #last 512
+#Everything below is of no interest for detection purpose
+2138,2122,3730,2888,1995,1820,1044,6190,6191,6192,6193,6194,6195,6196,6197,6198, # 4384
+6199,6200,6201,6202,6203,6204,6205,4670,6206,6207,6208,6209,6210,6211,6212,6213, # 4400
+6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,6224,6225,6226,6227,6228,6229, # 4416
+6230,6231,6232,6233,6234,6235,6236,6237,3187,6238,6239,3969,6240,6241,6242,6243, # 4432
+6244,4671,6245,6246,4672,6247,6248,4133,6249,6250,4364,6251,2923,2556,2613,4673, # 4448
+4365,3970,6252,6253,6254,6255,4674,6256,6257,6258,2768,2353,4366,4675,4676,3188, # 4464
+4367,3463,6259,4134,4677,4678,6260,2267,6261,3842,3332,4368,3543,6262,6263,6264, # 4480
+3013,1954,1928,4135,4679,6265,6266,2478,3091,6267,4680,4369,6268,6269,1699,6270, # 4496
+3544,4136,4681,6271,4137,6272,4370,2804,6273,6274,2593,3971,3972,4682,6275,2236, # 4512
+4683,6276,6277,4684,6278,6279,4138,3973,4685,6280,6281,3258,6282,6283,6284,6285, # 4528
+3974,4686,2841,3975,6286,6287,3545,6288,6289,4139,4687,4140,6290,4141,6291,4142, # 4544
+6292,6293,3333,6294,6295,6296,4371,6297,3399,6298,6299,4372,3976,6300,6301,6302, # 4560
+4373,6303,6304,3843,3731,6305,4688,4374,6306,6307,3259,2294,6308,3732,2530,4143, # 4576
+6309,4689,6310,6311,6312,3048,6313,6314,4690,3733,2237,6315,6316,2282,3334,6317, # 4592
+6318,3844,6319,6320,4691,6321,3400,4692,6322,4693,6323,3049,6324,4375,6325,3977, # 4608
+6326,6327,6328,3546,6329,4694,3335,6330,4695,4696,6331,6332,6333,6334,4376,3978, # 4624
+6335,4697,3979,4144,6336,3980,4698,6337,6338,6339,6340,6341,4699,4700,4701,6342, # 4640
+6343,4702,6344,6345,4703,6346,6347,4704,6348,4705,4706,3135,6349,4707,6350,4708, # 4656
+6351,4377,6352,4709,3734,4145,6353,2506,4710,3189,6354,3050,4711,3981,6355,3547, # 4672
+3014,4146,4378,3735,2651,3845,3260,3136,2224,1986,6356,3401,6357,4712,2594,3627, # 4688
+3137,2573,3736,3982,4713,3628,4714,4715,2682,3629,4716,6358,3630,4379,3631,6359, # 4704
+6360,6361,3983,6362,6363,6364,6365,4147,3846,4717,6366,6367,3737,2842,6368,4718, # 4720
+2628,6369,3261,6370,2386,6371,6372,3738,3984,4719,3464,4720,3402,6373,2924,3336, # 4736
+4148,2866,6374,2805,3262,4380,2704,2069,2531,3138,2806,2984,6375,2769,6376,4721, # 4752
+4722,3403,6377,6378,3548,6379,6380,2705,3092,1979,4149,2629,3337,2889,6381,3338, # 4768
+4150,2557,3339,4381,6382,3190,3263,3739,6383,4151,4723,4152,2558,2574,3404,3191, # 4784
+6384,6385,4153,6386,4724,4382,6387,6388,4383,6389,6390,4154,6391,4725,3985,6392, # 4800
+3847,4155,6393,6394,6395,6396,6397,3465,6398,4384,6399,6400,6401,6402,6403,6404, # 4816
+4156,6405,6406,6407,6408,2123,6409,6410,2326,3192,4726,6411,6412,6413,6414,4385, # 4832
+4157,6415,6416,4158,6417,3093,3848,6418,3986,6419,6420,3849,6421,6422,6423,4159, # 4848
+6424,6425,4160,6426,3740,6427,6428,6429,6430,3987,6431,4727,6432,2238,6433,6434, # 4864
+4386,3988,6435,6436,3632,6437,6438,2843,6439,6440,6441,6442,3633,6443,2958,6444, # 4880
+6445,3466,6446,2364,4387,3850,6447,4388,2959,3340,6448,3851,6449,4728,6450,6451, # 4896
+3264,4729,6452,3193,6453,4389,4390,2706,3341,4730,6454,3139,6455,3194,6456,3051, # 4912
+2124,3852,1602,4391,4161,3853,1158,3854,4162,3989,4392,3990,4731,4732,4393,2040, # 4928
+4163,4394,3265,6457,2807,3467,3855,6458,6459,6460,3991,3468,4733,4734,6461,3140, # 4944
+2960,6462,4735,6463,6464,6465,6466,4736,4737,4738,4739,6467,6468,4164,2403,3856, # 4960
+6469,6470,2770,2844,6471,4740,6472,6473,6474,6475,6476,6477,6478,3195,6479,4741, # 4976
+4395,6480,2867,6481,4742,2808,6482,2493,4165,6483,6484,6485,6486,2295,4743,6487, # 4992
+6488,6489,3634,6490,6491,6492,6493,6494,6495,6496,2985,4744,6497,6498,4745,6499, # 5008
+6500,2925,3141,4166,6501,6502,4746,6503,6504,4747,6505,6506,6507,2890,6508,6509, # 5024
+6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,3469,4167,6520,6521,6522,4748, # 5040
+4396,3741,4397,4749,4398,3342,2125,4750,6523,4751,4752,4753,3052,6524,2961,4168, # 5056
+6525,4754,6526,4755,4399,2926,4169,6527,3857,6528,4400,4170,6529,4171,6530,6531, # 5072
+2595,6532,6533,6534,6535,3635,6536,6537,6538,6539,6540,6541,6542,4756,6543,6544, # 5088
+6545,6546,6547,6548,4401,6549,6550,6551,6552,4402,3405,4757,4403,6553,6554,6555, # 5104
+4172,3742,6556,6557,6558,3992,3636,6559,6560,3053,2726,6561,3549,4173,3054,4404, # 5120
+6562,6563,3993,4405,3266,3550,2809,4406,6564,6565,6566,4758,4759,6567,3743,6568, # 5136
+4760,3744,4761,3470,6569,6570,6571,4407,6572,3745,4174,6573,4175,2810,4176,3196, # 5152
+4762,6574,4177,6575,6576,2494,2891,3551,6577,6578,3471,6579,4408,6580,3015,3197, # 5168
+6581,3343,2532,3994,3858,6582,3094,3406,4409,6583,2892,4178,4763,4410,3016,4411, # 5184
+6584,3995,3142,3017,2683,6585,4179,6586,6587,4764,4412,6588,6589,4413,6590,2986, # 5200
+6591,2962,3552,6592,2963,3472,6593,6594,4180,4765,6595,6596,2225,3267,4414,6597, # 5216
+3407,3637,4766,6598,6599,3198,6600,4415,6601,3859,3199,6602,3473,4767,2811,4416, # 5232
+1856,3268,3200,2575,3996,3997,3201,4417,6603,3095,2927,6604,3143,6605,2268,6606, # 5248
+3998,3860,3096,2771,6607,6608,3638,2495,4768,6609,3861,6610,3269,2745,4769,4181, # 5264
+3553,6611,2845,3270,6612,6613,6614,3862,6615,6616,4770,4771,6617,3474,3999,4418, # 5280
+4419,6618,3639,3344,6619,4772,4182,6620,2126,6621,6622,6623,4420,4773,6624,3018, # 5296
+6625,4774,3554,6626,4183,2025,3746,6627,4184,2707,6628,4421,4422,3097,1775,4185, # 5312
+3555,6629,6630,2868,6631,6632,4423,6633,6634,4424,2414,2533,2928,6635,4186,2387, # 5328
+6636,4775,6637,4187,6638,1891,4425,3202,3203,6639,6640,4776,6641,3345,6642,6643, # 5344
+3640,6644,3475,3346,3641,4000,6645,3144,6646,3098,2812,4188,3642,3204,6647,3863, # 5360
+3476,6648,3864,6649,4426,4001,6650,6651,6652,2576,6653,4189,4777,6654,6655,6656, # 5376
+2846,6657,3477,3205,4002,6658,4003,6659,3347,2252,6660,6661,6662,4778,6663,6664, # 5392
+6665,6666,6667,6668,6669,4779,4780,2048,6670,3478,3099,6671,3556,3747,4004,6672, # 5408
+6673,6674,3145,4005,3748,6675,6676,6677,6678,6679,3408,6680,6681,6682,6683,3206, # 5424
+3207,6684,6685,4781,4427,6686,4782,4783,4784,6687,6688,6689,4190,6690,6691,3479, # 5440
+6692,2746,6693,4428,6694,6695,6696,6697,6698,6699,4785,6700,6701,3208,2727,6702, # 5456
+3146,6703,6704,3409,2196,6705,4429,6706,6707,6708,2534,1996,6709,6710,6711,2747, # 5472
+6712,6713,6714,4786,3643,6715,4430,4431,6716,3557,6717,4432,4433,6718,6719,6720, # 5488
+6721,3749,6722,4006,4787,6723,6724,3644,4788,4434,6725,6726,4789,2772,6727,6728, # 5504
+6729,6730,6731,2708,3865,2813,4435,6732,6733,4790,4791,3480,6734,6735,6736,6737, # 5520
+4436,3348,6738,3410,4007,6739,6740,4008,6741,6742,4792,3411,4191,6743,6744,6745, # 5536
+6746,6747,3866,6748,3750,6749,6750,6751,6752,6753,6754,6755,3867,6756,4009,6757, # 5552
+4793,4794,6758,2814,2987,6759,6760,6761,4437,6762,6763,6764,6765,3645,6766,6767, # 5568
+3481,4192,6768,3751,6769,6770,2174,6771,3868,3752,6772,6773,6774,4193,4795,4438, # 5584
+3558,4796,4439,6775,4797,6776,6777,4798,6778,4799,3559,4800,6779,6780,6781,3482, # 5600
+6782,2893,6783,6784,4194,4801,4010,6785,6786,4440,6787,4011,6788,6789,6790,6791, # 5616
+6792,6793,4802,6794,6795,6796,4012,6797,6798,6799,6800,3349,4803,3483,6801,4804, # 5632
+4195,6802,4013,6803,6804,4196,6805,4014,4015,6806,2847,3271,2848,6807,3484,6808, # 5648
+6809,6810,4441,6811,4442,4197,4443,3272,4805,6812,3412,4016,1579,6813,6814,4017, # 5664
+6815,3869,6816,2964,6817,4806,6818,6819,4018,3646,6820,6821,4807,4019,4020,6822, # 5680
+6823,3560,6824,6825,4021,4444,6826,4198,6827,6828,4445,6829,6830,4199,4808,6831, # 5696
+6832,6833,3870,3019,2458,6834,3753,3413,3350,6835,4809,3871,4810,3561,4446,6836, # 5712
+6837,4447,4811,4812,6838,2459,4448,6839,4449,6840,6841,4022,3872,6842,4813,4814, # 5728
+6843,6844,4815,4200,4201,4202,6845,4023,6846,6847,4450,3562,3873,6848,6849,4816, # 5744
+4817,6850,4451,4818,2139,6851,3563,6852,6853,3351,6854,6855,3352,4024,2709,3414, # 5760
+4203,4452,6856,4204,6857,6858,3874,3875,6859,6860,4819,6861,6862,6863,6864,4453, # 5776
+3647,6865,6866,4820,6867,6868,6869,6870,4454,6871,2869,6872,6873,4821,6874,3754, # 5792
+6875,4822,4205,6876,6877,6878,3648,4206,4455,6879,4823,6880,4824,3876,6881,3055, # 5808
+4207,6882,3415,6883,6884,6885,4208,4209,6886,4210,3353,6887,3354,3564,3209,3485, # 5824
+2652,6888,2728,6889,3210,3755,6890,4025,4456,6891,4825,6892,6893,6894,6895,4211, # 5840
+6896,6897,6898,4826,6899,6900,4212,6901,4827,6902,2773,3565,6903,4828,6904,6905, # 5856
+6906,6907,3649,3650,6908,2849,3566,6909,3567,3100,6910,6911,6912,6913,6914,6915, # 5872
+4026,6916,3355,4829,3056,4457,3756,6917,3651,6918,4213,3652,2870,6919,4458,6920, # 5888
+2438,6921,6922,3757,2774,4830,6923,3356,4831,4832,6924,4833,4459,3653,2507,6925, # 5904
+4834,2535,6926,6927,3273,4027,3147,6928,3568,6929,6930,6931,4460,6932,3877,4461, # 5920
+2729,3654,6933,6934,6935,6936,2175,4835,2630,4214,4028,4462,4836,4215,6937,3148, # 5936
+4216,4463,4837,4838,4217,6938,6939,2850,4839,6940,4464,6941,6942,6943,4840,6944, # 5952
+4218,3274,4465,6945,6946,2710,6947,4841,4466,6948,6949,2894,6950,6951,4842,6952, # 5968
+4219,3057,2871,6953,6954,6955,6956,4467,6957,2711,6958,6959,6960,3275,3101,4843, # 5984
+6961,3357,3569,6962,4844,6963,6964,4468,4845,3570,6965,3102,4846,3758,6966,4847, # 6000
+3878,4848,4849,4029,6967,2929,3879,4850,4851,6968,6969,1733,6970,4220,6971,6972, # 6016
+6973,6974,6975,6976,4852,6977,6978,6979,6980,6981,6982,3759,6983,6984,6985,3486, # 6032
+3487,6986,3488,3416,6987,6988,6989,6990,6991,6992,6993,6994,6995,6996,6997,4853, # 6048
+6998,6999,4030,7000,7001,3211,7002,7003,4221,7004,7005,3571,4031,7006,3572,7007, # 6064
+2614,4854,2577,7008,7009,2965,3655,3656,4855,2775,3489,3880,4222,4856,3881,4032, # 6080
+3882,3657,2730,3490,4857,7010,3149,7011,4469,4858,2496,3491,4859,2283,7012,7013, # 6096
+7014,2365,4860,4470,7015,7016,3760,7017,7018,4223,1917,7019,7020,7021,4471,7022, # 6112
+2776,4472,7023,7024,7025,7026,4033,7027,3573,4224,4861,4034,4862,7028,7029,1929, # 6128
+3883,4035,7030,4473,3058,7031,2536,3761,3884,7032,4036,7033,2966,2895,1968,4474, # 6144
+3276,4225,3417,3492,4226,2105,7034,7035,1754,2596,3762,4227,4863,4475,3763,4864, # 6160
+3764,2615,2777,3103,3765,3658,3418,4865,2296,3766,2815,7036,7037,7038,3574,2872, # 6176
+3277,4476,7039,4037,4477,7040,7041,4038,7042,7043,7044,7045,7046,7047,2537,7048, # 6192
+7049,7050,7051,7052,7053,7054,4478,7055,7056,3767,3659,4228,3575,7057,7058,4229, # 6208
+7059,7060,7061,3660,7062,3212,7063,3885,4039,2460,7064,7065,7066,7067,7068,7069, # 6224
+7070,7071,7072,7073,7074,4866,3768,4867,7075,7076,7077,7078,4868,3358,3278,2653, # 6240
+7079,7080,4479,3886,7081,7082,4869,7083,7084,7085,7086,7087,7088,2538,7089,7090, # 6256
+7091,4040,3150,3769,4870,4041,2896,3359,4230,2930,7092,3279,7093,2967,4480,3213, # 6272
+4481,3661,7094,7095,7096,7097,7098,7099,7100,7101,7102,2461,3770,7103,7104,4231, # 6288
+3151,7105,7106,7107,4042,3662,7108,7109,4871,3663,4872,4043,3059,7110,7111,7112, # 6304
+3493,2988,7113,4873,7114,7115,7116,3771,4874,7117,7118,4232,4875,7119,3576,2336, # 6320
+4876,7120,4233,3419,4044,4877,4878,4482,4483,4879,4484,4234,7121,3772,4880,1045, # 6336
+3280,3664,4881,4882,7122,7123,7124,7125,4883,7126,2778,7127,4485,4486,7128,4884, # 6352
+3214,3887,7129,7130,3215,7131,4885,4045,7132,7133,4046,7134,7135,7136,7137,7138, # 6368
+7139,7140,7141,7142,7143,4235,7144,4886,7145,7146,7147,4887,7148,7149,7150,4487, # 6384
+4047,4488,7151,7152,4888,4048,2989,3888,7153,3665,7154,4049,7155,7156,7157,7158, # 6400
+7159,7160,2931,4889,4890,4489,7161,2631,3889,4236,2779,7162,7163,4891,7164,3060, # 6416
+7165,1672,4892,7166,4893,4237,3281,4894,7167,7168,3666,7169,3494,7170,7171,4050, # 6432
+7172,7173,3104,3360,3420,4490,4051,2684,4052,7174,4053,7175,7176,7177,2253,4054, # 6448
+7178,7179,4895,7180,3152,3890,3153,4491,3216,7181,7182,7183,2968,4238,4492,4055, # 6464
+7184,2990,7185,2479,7186,7187,4493,7188,7189,7190,7191,7192,4896,7193,4897,2969, # 6480
+4494,4898,7194,3495,7195,7196,4899,4495,7197,3105,2731,7198,4900,7199,7200,7201, # 6496
+4056,7202,3361,7203,7204,4496,4901,4902,7205,4497,7206,7207,2315,4903,7208,4904, # 6512
+7209,4905,2851,7210,7211,3577,7212,3578,4906,7213,4057,3667,4907,7214,4058,2354, # 6528
+3891,2376,3217,3773,7215,7216,7217,7218,7219,4498,7220,4908,3282,2685,7221,3496, # 6544
+4909,2632,3154,4910,7222,2337,7223,4911,7224,7225,7226,4912,4913,3283,4239,4499, # 6560
+7227,2816,7228,7229,7230,7231,7232,7233,7234,4914,4500,4501,7235,7236,7237,2686, # 6576
+7238,4915,7239,2897,4502,7240,4503,7241,2516,7242,4504,3362,3218,7243,7244,7245, # 6592
+4916,7246,7247,4505,3363,7248,7249,7250,7251,3774,4506,7252,7253,4917,7254,7255, # 6608
+3284,2991,4918,4919,3219,3892,4920,3106,3497,4921,7256,7257,7258,4922,7259,4923, # 6624
+3364,4507,4508,4059,7260,4240,3498,7261,7262,4924,7263,2992,3893,4060,3220,7264, # 6640
+7265,7266,7267,7268,7269,4509,3775,7270,2817,7271,4061,4925,4510,3776,7272,4241, # 6656
+4511,3285,7273,7274,3499,7275,7276,7277,4062,4512,4926,7278,3107,3894,7279,7280, # 6672
+4927,7281,4513,7282,7283,3668,7284,7285,4242,4514,4243,7286,2058,4515,4928,4929, # 6688
+4516,7287,3286,4244,7288,4517,7289,7290,7291,3669,7292,7293,4930,4931,4932,2355, # 6704
+4933,7294,2633,4518,7295,4245,7296,7297,4519,7298,7299,4520,4521,4934,7300,4246, # 6720
+4522,7301,7302,7303,3579,7304,4247,4935,7305,4936,7306,7307,7308,7309,3777,7310, # 6736
+4523,7311,7312,7313,4248,3580,7314,4524,3778,4249,7315,3581,7316,3287,7317,3221, # 6752
+7318,4937,7319,7320,7321,7322,7323,7324,4938,4939,7325,4525,7326,7327,7328,4063, # 6768
+7329,7330,4940,7331,7332,4941,7333,4526,7334,3500,2780,1741,4942,2026,1742,7335, # 6784
+7336,3582,4527,2388,7337,7338,7339,4528,7340,4250,4943,7341,7342,7343,4944,7344, # 6800
+7345,7346,3020,7347,4945,7348,7349,7350,7351,3895,7352,3896,4064,3897,7353,7354, # 6816
+7355,4251,7356,7357,3898,7358,3779,7359,3780,3288,7360,7361,4529,7362,4946,4530, # 6832
+2027,7363,3899,4531,4947,3222,3583,7364,4948,7365,7366,7367,7368,4949,3501,4950, # 6848
+3781,4951,4532,7369,2517,4952,4252,4953,3155,7370,4954,4955,4253,2518,4533,7371, # 6864
+7372,2712,4254,7373,7374,7375,3670,4956,3671,7376,2389,3502,4065,7377,2338,7378, # 6880
+7379,7380,7381,3061,7382,4957,7383,7384,7385,7386,4958,4534,7387,7388,2993,7389, # 6896
+3062,7390,4959,7391,7392,7393,4960,3108,4961,7394,4535,7395,4962,3421,4536,7396, # 6912
+4963,7397,4964,1857,7398,4965,7399,7400,2176,3584,4966,7401,7402,3422,4537,3900, # 6928
+3585,7403,3782,7404,2852,7405,7406,7407,4538,3783,2654,3423,4967,4539,7408,3784, # 6944
+3586,2853,4540,4541,7409,3901,7410,3902,7411,7412,3785,3109,2327,3903,7413,7414, # 6960
+2970,4066,2932,7415,7416,7417,3904,3672,3424,7418,4542,4543,4544,7419,4968,7420, # 6976
+7421,4255,7422,7423,7424,7425,7426,4067,7427,3673,3365,4545,7428,3110,2559,3674, # 6992
+7429,7430,3156,7431,7432,3503,7433,3425,4546,7434,3063,2873,7435,3223,4969,4547, # 7008
+4548,2898,4256,4068,7436,4069,3587,3786,2933,3787,4257,4970,4971,3788,7437,4972, # 7024
+3064,7438,4549,7439,7440,7441,7442,7443,4973,3905,7444,2874,7445,7446,7447,7448, # 7040
+3021,7449,4550,3906,3588,4974,7450,7451,3789,3675,7452,2578,7453,4070,7454,7455, # 7056
+7456,4258,3676,7457,4975,7458,4976,4259,3790,3504,2634,4977,3677,4551,4260,7459, # 7072
+7460,7461,7462,3907,4261,4978,7463,7464,7465,7466,4979,4980,7467,7468,2213,4262, # 7088
+7469,7470,7471,3678,4981,7472,2439,7473,4263,3224,3289,7474,3908,2415,4982,7475, # 7104
+4264,7476,4983,2655,7477,7478,2732,4552,2854,2875,7479,7480,4265,7481,4553,4984, # 7120
+7482,7483,4266,7484,3679,3366,3680,2818,2781,2782,3367,3589,4554,3065,7485,4071, # 7136
+2899,7486,7487,3157,2462,4072,4555,4073,4985,4986,3111,4267,2687,3368,4556,4074, # 7152
+3791,4268,7488,3909,2783,7489,2656,1962,3158,4557,4987,1963,3159,3160,7490,3112, # 7168
+4988,4989,3022,4990,4991,3792,2855,7491,7492,2971,4558,7493,7494,4992,7495,7496, # 7184
+7497,7498,4993,7499,3426,4559,4994,7500,3681,4560,4269,4270,3910,7501,4075,4995, # 7200
+4271,7502,7503,4076,7504,4996,7505,3225,4997,4272,4077,2819,3023,7506,7507,2733, # 7216
+4561,7508,4562,7509,3369,3793,7510,3590,2508,7511,7512,4273,3113,2994,2616,7513, # 7232
+7514,7515,7516,7517,7518,2820,3911,4078,2748,7519,7520,4563,4998,7521,7522,7523, # 7248
+7524,4999,4274,7525,4564,3682,2239,4079,4565,7526,7527,7528,7529,5000,7530,7531, # 7264
+5001,4275,3794,7532,7533,7534,3066,5002,4566,3161,7535,7536,4080,7537,3162,7538, # 7280
+7539,4567,7540,7541,7542,7543,7544,7545,5003,7546,4568,7547,7548,7549,7550,7551, # 7296
+7552,7553,7554,7555,7556,5004,7557,7558,7559,5005,7560,3795,7561,4569,7562,7563, # 7312
+7564,2821,3796,4276,4277,4081,7565,2876,7566,5006,7567,7568,2900,7569,3797,3912, # 7328
+7570,7571,7572,4278,7573,7574,7575,5007,7576,7577,5008,7578,7579,4279,2934,7580, # 7344
+7581,5009,7582,4570,7583,4280,7584,7585,7586,4571,4572,3913,7587,4573,3505,7588, # 7360
+5010,7589,7590,7591,7592,3798,4574,7593,7594,5011,7595,4281,7596,7597,7598,4282, # 7376
+5012,7599,7600,5013,3163,7601,5014,7602,3914,7603,7604,2734,4575,4576,4577,7605, # 7392
+7606,7607,7608,7609,3506,5015,4578,7610,4082,7611,2822,2901,2579,3683,3024,4579, # 7408
+3507,7612,4580,7613,3226,3799,5016,7614,7615,7616,7617,7618,7619,7620,2995,3290, # 7424
+7621,4083,7622,5017,7623,7624,7625,7626,7627,4581,3915,7628,3291,7629,5018,7630, # 7440
+7631,7632,7633,4084,7634,7635,3427,3800,7636,7637,4582,7638,5019,4583,5020,7639, # 7456
+3916,7640,3801,5021,4584,4283,7641,7642,3428,3591,2269,7643,2617,7644,4585,3592, # 7472
+7645,4586,2902,7646,7647,3227,5022,7648,4587,7649,4284,7650,7651,7652,4588,2284, # 7488
+7653,5023,7654,7655,7656,4589,5024,3802,7657,7658,5025,3508,4590,7659,7660,7661, # 7504
+1969,5026,7662,7663,3684,1821,2688,7664,2028,2509,4285,7665,2823,1841,7666,2689, # 7520
+3114,7667,3917,4085,2160,5027,5028,2972,7668,5029,7669,7670,7671,3593,4086,7672, # 7536
+4591,4087,5030,3803,7673,7674,7675,7676,7677,7678,7679,4286,2366,4592,4593,3067, # 7552
+2328,7680,7681,4594,3594,3918,2029,4287,7682,5031,3919,3370,4288,4595,2856,7683, # 7568
+3509,7684,7685,5032,5033,7686,7687,3804,2784,7688,7689,7690,7691,3371,7692,7693, # 7584
+2877,5034,7694,7695,3920,4289,4088,7696,7697,7698,5035,7699,5036,4290,5037,5038, # 7600
+5039,7700,7701,7702,5040,5041,3228,7703,1760,7704,5042,3229,4596,2106,4089,7705, # 7616
+4597,2824,5043,2107,3372,7706,4291,4090,5044,7707,4091,7708,5045,3025,3805,4598, # 7632
+4292,4293,4294,3373,7709,4599,7710,5046,7711,7712,5047,5048,3806,7713,7714,7715, # 7648
+5049,7716,7717,7718,7719,4600,5050,7720,7721,7722,5051,7723,4295,3429,7724,7725, # 7664
+7726,7727,3921,7728,3292,5052,4092,7729,7730,7731,7732,7733,7734,7735,5053,5054, # 7680
+7736,7737,7738,7739,3922,3685,7740,7741,7742,7743,2635,5055,7744,5056,4601,7745, # 7696
+7746,2560,7747,7748,7749,7750,3923,7751,7752,7753,7754,7755,4296,2903,7756,7757, # 7712
+7758,7759,7760,3924,7761,5057,4297,7762,7763,5058,4298,7764,4093,7765,7766,5059, # 7728
+3925,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,3595,7777,4299,5060,4094, # 7744
+7778,3293,5061,7779,7780,4300,7781,7782,4602,7783,3596,7784,7785,3430,2367,7786, # 7760
+3164,5062,5063,4301,7787,7788,4095,5064,5065,7789,3374,3115,7790,7791,7792,7793, # 7776
+7794,7795,7796,3597,4603,7797,7798,3686,3116,3807,5066,7799,7800,5067,7801,7802, # 7792
+4604,4302,5068,4303,4096,7803,7804,3294,7805,7806,5069,4605,2690,7807,3026,7808, # 7808
+7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824, # 7824
+7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7840
+7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856, # 7856
+7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872, # 7872
+7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888, # 7888
+7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904, # 7904
+7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920, # 7920
+7921,7922,7923,7924,3926,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935, # 7936
+7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951, # 7952
+7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967, # 7968
+7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983, # 7984
+7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999, # 8000
+8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015, # 8016
+8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031, # 8032
+8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047, # 8048
+8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063, # 8064
+8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079, # 8080
+8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095, # 8096
+8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111, # 8112
+8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127, # 8128
+8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143, # 8144
+8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159, # 8160
+8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175, # 8176
+8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191, # 8192
+8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207, # 8208
+8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223, # 8224
+8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239, # 8240
+8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255, # 8256
+8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271) # 8272
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/jpcntx.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/jpcntx.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/jpcntx.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/jpcntx.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,227 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .compat import wrap_ord
+
+NUM_OF_CATEGORY = 6
+DONT_KNOW = -1
+ENOUGH_REL_THRESHOLD = 100
+MAX_REL_THRESHOLD = 1000
+MINIMUM_DATA_THRESHOLD = 4
+
+# This is hiragana 2-char sequence table, the number in each cell represents its frequency category
+jp2CharContext = (
+(0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1),
+(2,4,0,4,0,3,0,4,0,3,4,4,4,2,4,3,3,4,3,2,3,3,4,2,3,3,3,2,4,1,4,3,3,1,5,4,3,4,3,4,3,5,3,0,3,5,4,2,0,3,1,0,3,3,0,3,3,0,1,1,0,4,3,0,3,3,0,4,0,2,0,3,5,5,5,5,4,0,4,1,0,3,4),
+(0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2),
+(0,4,0,5,0,5,0,4,0,4,5,4,4,3,5,3,5,1,5,3,4,3,4,4,3,4,3,3,4,3,5,4,4,3,5,5,3,5,5,5,3,5,5,3,4,5,5,3,1,3,2,0,3,4,0,4,2,0,4,2,1,5,3,2,3,5,0,4,0,2,0,5,4,4,5,4,5,0,4,0,0,4,4),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,3,0,4,0,3,0,3,0,4,5,4,3,3,3,3,4,3,5,4,4,3,5,4,4,3,4,3,4,4,4,4,5,3,4,4,3,4,5,5,4,5,5,1,4,5,4,3,0,3,3,1,3,3,0,4,4,0,3,3,1,5,3,3,3,5,0,4,0,3,0,4,4,3,4,3,3,0,4,1,1,3,4),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,4,0,3,0,3,0,4,0,3,4,4,3,2,2,1,2,1,3,1,3,3,3,3,3,4,3,1,3,3,5,3,3,0,4,3,0,5,4,3,3,5,4,4,3,4,4,5,0,1,2,0,1,2,0,2,2,0,1,0,0,5,2,2,1,4,0,3,0,1,0,4,4,3,5,4,3,0,2,1,0,4,3),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,3,0,5,0,4,0,2,1,4,4,2,4,1,4,2,4,2,4,3,3,3,4,3,3,3,3,1,4,2,3,3,3,1,4,4,1,1,1,4,3,3,2,0,2,4,3,2,0,3,3,0,3,1,1,0,0,0,3,3,0,4,2,2,3,4,0,4,0,3,0,4,4,5,3,4,4,0,3,0,0,1,4),
+(1,4,0,4,0,4,0,4,0,3,5,4,4,3,4,3,5,4,3,3,4,3,5,4,4,4,4,3,4,2,4,3,3,1,5,4,3,2,4,5,4,5,5,4,4,5,4,4,0,3,2,2,3,3,0,4,3,1,3,2,1,4,3,3,4,5,0,3,0,2,0,4,5,5,4,5,4,0,4,0,0,5,4),
+(0,5,0,5,0,4,0,3,0,4,4,3,4,3,3,3,4,0,4,4,4,3,4,3,4,3,3,1,4,2,4,3,4,0,5,4,1,4,5,4,4,5,3,2,4,3,4,3,2,4,1,3,3,3,2,3,2,0,4,3,3,4,3,3,3,4,0,4,0,3,0,4,5,4,4,4,3,0,4,1,0,1,3),
+(0,3,1,4,0,3,0,2,0,3,4,4,3,1,4,2,3,3,4,3,4,3,4,3,4,4,3,2,3,1,5,4,4,1,4,4,3,5,4,4,3,5,5,4,3,4,4,3,1,2,3,1,2,2,0,3,2,0,3,1,0,5,3,3,3,4,3,3,3,3,4,4,4,4,5,4,2,0,3,3,2,4,3),
+(0,2,0,3,0,1,0,1,0,0,3,2,0,0,2,0,1,0,2,1,3,3,3,1,2,3,1,0,1,0,4,2,1,1,3,3,0,4,3,3,1,4,3,3,0,3,3,2,0,0,0,0,1,0,0,2,0,0,0,0,0,4,1,0,2,3,2,2,2,1,3,3,3,4,4,3,2,0,3,1,0,3,3),
+(0,4,0,4,0,3,0,3,0,4,4,4,3,3,3,3,3,3,4,3,4,2,4,3,4,3,3,2,4,3,4,5,4,1,4,5,3,5,4,5,3,5,4,0,3,5,5,3,1,3,3,2,2,3,0,3,4,1,3,3,2,4,3,3,3,4,0,4,0,3,0,4,5,4,4,5,3,0,4,1,0,3,4),
+(0,2,0,3,0,3,0,0,0,2,2,2,1,0,1,0,0,0,3,0,3,0,3,0,1,3,1,0,3,1,3,3,3,1,3,3,3,0,1,3,1,3,4,0,0,3,1,1,0,3,2,0,0,0,0,1,3,0,1,0,0,3,3,2,0,3,0,0,0,0,0,3,4,3,4,3,3,0,3,0,0,2,3),
+(2,3,0,3,0,2,0,1,0,3,3,4,3,1,3,1,1,1,3,1,4,3,4,3,3,3,0,0,3,1,5,4,3,1,4,3,2,5,5,4,4,4,4,3,3,4,4,4,0,2,1,1,3,2,0,1,2,0,0,1,0,4,1,3,3,3,0,3,0,1,0,4,4,4,5,5,3,0,2,0,0,4,4),
+(0,2,0,1,0,3,1,3,0,2,3,3,3,0,3,1,0,0,3,0,3,2,3,1,3,2,1,1,0,0,4,2,1,0,2,3,1,4,3,2,0,4,4,3,1,3,1,3,0,1,0,0,1,0,0,0,1,0,0,0,0,4,1,1,1,2,0,3,0,0,0,3,4,2,4,3,2,0,1,0,0,3,3),
+(0,1,0,4,0,5,0,4,0,2,4,4,2,3,3,2,3,3,5,3,3,3,4,3,4,2,3,0,4,3,3,3,4,1,4,3,2,1,5,5,3,4,5,1,3,5,4,2,0,3,3,0,1,3,0,4,2,0,1,3,1,4,3,3,3,3,0,3,0,1,0,3,4,4,4,5,5,0,3,0,1,4,5),
+(0,2,0,3,0,3,0,0,0,2,3,1,3,0,4,0,1,1,3,0,3,4,3,2,3,1,0,3,3,2,3,1,3,0,2,3,0,2,1,4,1,2,2,0,0,3,3,0,0,2,0,0,0,1,0,0,0,0,2,2,0,3,2,1,3,3,0,2,0,2,0,0,3,3,1,2,4,0,3,0,2,2,3),
+(2,4,0,5,0,4,0,4,0,2,4,4,4,3,4,3,3,3,1,2,4,3,4,3,4,4,5,0,3,3,3,3,2,0,4,3,1,4,3,4,1,4,4,3,3,4,4,3,1,2,3,0,4,2,0,4,1,0,3,3,0,4,3,3,3,4,0,4,0,2,0,3,5,3,4,5,2,0,3,0,0,4,5),
+(0,3,0,4,0,1,0,1,0,1,3,2,2,1,3,0,3,0,2,0,2,0,3,0,2,0,0,0,1,0,1,1,0,0,3,1,0,0,0,4,0,3,1,0,2,1,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,4,2,2,3,1,0,3,0,0,0,1,4,4,4,3,0,0,4,0,0,1,4),
+(1,4,1,5,0,3,0,3,0,4,5,4,4,3,5,3,3,4,4,3,4,1,3,3,3,3,2,1,4,1,5,4,3,1,4,4,3,5,4,4,3,5,4,3,3,4,4,4,0,3,3,1,2,3,0,3,1,0,3,3,0,5,4,4,4,4,4,4,3,3,5,4,4,3,3,5,4,0,3,2,0,4,4),
+(0,2,0,3,0,1,0,0,0,1,3,3,3,2,4,1,3,0,3,1,3,0,2,2,1,1,0,0,2,0,4,3,1,0,4,3,0,4,4,4,1,4,3,1,1,3,3,1,0,2,0,0,1,3,0,0,0,0,2,0,0,4,3,2,4,3,5,4,3,3,3,4,3,3,4,3,3,0,2,1,0,3,3),
+(0,2,0,4,0,3,0,2,0,2,5,5,3,4,4,4,4,1,4,3,3,0,4,3,4,3,1,3,3,2,4,3,0,3,4,3,0,3,4,4,2,4,4,0,4,5,3,3,2,2,1,1,1,2,0,1,5,0,3,3,2,4,3,3,3,4,0,3,0,2,0,4,4,3,5,5,0,0,3,0,2,3,3),
+(0,3,0,4,0,3,0,1,0,3,4,3,3,1,3,3,3,0,3,1,3,0,4,3,3,1,1,0,3,0,3,3,0,0,4,4,0,1,5,4,3,3,5,0,3,3,4,3,0,2,0,1,1,1,0,1,3,0,1,2,1,3,3,2,3,3,0,3,0,1,0,1,3,3,4,4,1,0,1,2,2,1,3),
+(0,1,0,4,0,4,0,3,0,1,3,3,3,2,3,1,1,0,3,0,3,3,4,3,2,4,2,0,1,0,4,3,2,0,4,3,0,5,3,3,2,4,4,4,3,3,3,4,0,1,3,0,0,1,0,0,1,0,0,0,0,4,2,3,3,3,0,3,0,0,0,4,4,4,5,3,2,0,3,3,0,3,5),
+(0,2,0,3,0,0,0,3,0,1,3,0,2,0,0,0,1,0,3,1,1,3,3,0,0,3,0,0,3,0,2,3,1,0,3,1,0,3,3,2,0,4,2,2,0,2,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,2,1,2,0,1,0,1,0,0,0,1,3,1,2,0,0,0,1,0,0,1,4),
+(0,3,0,3,0,5,0,1,0,2,4,3,1,3,3,2,1,1,5,2,1,0,5,1,2,0,0,0,3,3,2,2,3,2,4,3,0,0,3,3,1,3,3,0,2,5,3,4,0,3,3,0,1,2,0,2,2,0,3,2,0,2,2,3,3,3,0,2,0,1,0,3,4,4,2,5,4,0,3,0,0,3,5),
+(0,3,0,3,0,3,0,1,0,3,3,3,3,0,3,0,2,0,2,1,1,0,2,0,1,0,0,0,2,1,0,0,1,0,3,2,0,0,3,3,1,2,3,1,0,3,3,0,0,1,0,0,0,0,0,2,0,0,0,0,0,2,3,1,2,3,0,3,0,1,0,3,2,1,0,4,3,0,1,1,0,3,3),
+(0,4,0,5,0,3,0,3,0,4,5,5,4,3,5,3,4,3,5,3,3,2,5,3,4,4,4,3,4,3,4,5,5,3,4,4,3,4,4,5,4,4,4,3,4,5,5,4,2,3,4,2,3,4,0,3,3,1,4,3,2,4,3,3,5,5,0,3,0,3,0,5,5,5,5,4,4,0,4,0,1,4,4),
+(0,4,0,4,0,3,0,3,0,3,5,4,4,2,3,2,5,1,3,2,5,1,4,2,3,2,3,3,4,3,3,3,3,2,5,4,1,3,3,5,3,4,4,0,4,4,3,1,1,3,1,0,2,3,0,2,3,0,3,0,0,4,3,1,3,4,0,3,0,2,0,4,4,4,3,4,5,0,4,0,0,3,4),
+(0,3,0,3,0,3,1,2,0,3,4,4,3,3,3,0,2,2,4,3,3,1,3,3,3,1,1,0,3,1,4,3,2,3,4,4,2,4,4,4,3,4,4,3,2,4,4,3,1,3,3,1,3,3,0,4,1,0,2,2,1,4,3,2,3,3,5,4,3,3,5,4,4,3,3,0,4,0,3,2,2,4,4),
+(0,2,0,1,0,0,0,0,0,1,2,1,3,0,0,0,0,0,2,0,1,2,1,0,0,1,0,0,0,0,3,0,0,1,0,1,1,3,1,0,0,0,1,1,0,1,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,1,2,2,0,3,4,0,0,0,1,1,0,0,1,0,0,0,0,0,1,1),
+(0,1,0,0,0,1,0,0,0,0,4,0,4,1,4,0,3,0,4,0,3,0,4,0,3,0,3,0,4,1,5,1,4,0,0,3,0,5,0,5,2,0,1,0,0,0,2,1,4,0,1,3,0,0,3,0,0,3,1,1,4,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0),
+(1,4,0,5,0,3,0,2,0,3,5,4,4,3,4,3,5,3,4,3,3,0,4,3,3,3,3,3,3,2,4,4,3,1,3,4,4,5,4,4,3,4,4,1,3,5,4,3,3,3,1,2,2,3,3,1,3,1,3,3,3,5,3,3,4,5,0,3,0,3,0,3,4,3,4,4,3,0,3,0,2,4,3),
+(0,1,0,4,0,0,0,0,0,1,4,0,4,1,4,2,4,0,3,0,1,0,1,0,0,0,0,0,2,0,3,1,1,1,0,3,0,0,0,1,2,1,0,0,1,1,1,1,0,1,0,0,0,1,0,0,3,0,0,0,0,3,2,0,2,2,0,1,0,0,0,2,3,2,3,3,0,0,0,0,2,1,0),
+(0,5,1,5,0,3,0,3,0,5,4,4,5,1,5,3,3,0,4,3,4,3,5,3,4,3,3,2,4,3,4,3,3,0,3,3,1,4,4,3,4,4,4,3,4,5,5,3,2,3,1,1,3,3,1,3,1,1,3,3,2,4,5,3,3,5,0,4,0,3,0,4,4,3,5,3,3,0,3,4,0,4,3),
+(0,5,0,5,0,3,0,2,0,4,4,3,5,2,4,3,3,3,4,4,4,3,5,3,5,3,3,1,4,0,4,3,3,0,3,3,0,4,4,4,4,5,4,3,3,5,5,3,2,3,1,2,3,2,0,1,0,0,3,2,2,4,4,3,1,5,0,4,0,3,0,4,3,1,3,2,1,0,3,3,0,3,3),
+(0,4,0,5,0,5,0,4,0,4,5,5,5,3,4,3,3,2,5,4,4,3,5,3,5,3,4,0,4,3,4,4,3,2,4,4,3,4,5,4,4,5,5,0,3,5,5,4,1,3,3,2,3,3,1,3,1,0,4,3,1,4,4,3,4,5,0,4,0,2,0,4,3,4,4,3,3,0,4,0,0,5,5),
+(0,4,0,4,0,5,0,1,1,3,3,4,4,3,4,1,3,0,5,1,3,0,3,1,3,1,1,0,3,0,3,3,4,0,4,3,0,4,4,4,3,4,4,0,3,5,4,1,0,3,0,0,2,3,0,3,1,0,3,1,0,3,2,1,3,5,0,3,0,1,0,3,2,3,3,4,4,0,2,2,0,4,4),
+(2,4,0,5,0,4,0,3,0,4,5,5,4,3,5,3,5,3,5,3,5,2,5,3,4,3,3,4,3,4,5,3,2,1,5,4,3,2,3,4,5,3,4,1,2,5,4,3,0,3,3,0,3,2,0,2,3,0,4,1,0,3,4,3,3,5,0,3,0,1,0,4,5,5,5,4,3,0,4,2,0,3,5),
+(0,5,0,4,0,4,0,2,0,5,4,3,4,3,4,3,3,3,4,3,4,2,5,3,5,3,4,1,4,3,4,4,4,0,3,5,0,4,4,4,4,5,3,1,3,4,5,3,3,3,3,3,3,3,0,2,2,0,3,3,2,4,3,3,3,5,3,4,1,3,3,5,3,2,0,0,0,0,4,3,1,3,3),
+(0,1,0,3,0,3,0,1,0,1,3,3,3,2,3,3,3,0,3,0,0,0,3,1,3,0,0,0,2,2,2,3,0,0,3,2,0,1,2,4,1,3,3,0,0,3,3,3,0,1,0,0,2,1,0,0,3,0,3,1,0,3,0,0,1,3,0,2,0,1,0,3,3,1,3,3,0,0,1,1,0,3,3),
+(0,2,0,3,0,2,1,4,0,2,2,3,1,1,3,1,1,0,2,0,3,1,2,3,1,3,0,0,1,0,4,3,2,3,3,3,1,4,2,3,3,3,3,1,0,3,1,4,0,1,1,0,1,2,0,1,1,0,1,1,0,3,1,3,2,2,0,1,0,0,0,2,3,3,3,1,0,0,0,0,0,2,3),
+(0,5,0,4,0,5,0,2,0,4,5,5,3,3,4,3,3,1,5,4,4,2,4,4,4,3,4,2,4,3,5,5,4,3,3,4,3,3,5,5,4,5,5,1,3,4,5,3,1,4,3,1,3,3,0,3,3,1,4,3,1,4,5,3,3,5,0,4,0,3,0,5,3,3,1,4,3,0,4,0,1,5,3),
+(0,5,0,5,0,4,0,2,0,4,4,3,4,3,3,3,3,3,5,4,4,4,4,4,4,5,3,3,5,2,4,4,4,3,4,4,3,3,4,4,5,5,3,3,4,3,4,3,3,4,3,3,3,3,1,2,2,1,4,3,3,5,4,4,3,4,0,4,0,3,0,4,4,4,4,4,1,0,4,2,0,2,4),
+(0,4,0,4,0,3,0,1,0,3,5,2,3,0,3,0,2,1,4,2,3,3,4,1,4,3,3,2,4,1,3,3,3,0,3,3,0,0,3,3,3,5,3,3,3,3,3,2,0,2,0,0,2,0,0,2,0,0,1,0,0,3,1,2,2,3,0,3,0,2,0,4,4,3,3,4,1,0,3,0,0,2,4),
+(0,0,0,4,0,0,0,0,0,0,1,0,1,0,2,0,0,0,0,0,1,0,2,0,1,0,0,0,0,0,3,1,3,0,3,2,0,0,0,1,0,3,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,4,0,2,0,0,0,0,0,0,2),
+(0,2,1,3,0,2,0,2,0,3,3,3,3,1,3,1,3,3,3,3,3,3,4,2,2,1,2,1,4,0,4,3,1,3,3,3,2,4,3,5,4,3,3,3,3,3,3,3,0,1,3,0,2,0,0,1,0,0,1,0,0,4,2,0,2,3,0,3,3,0,3,3,4,2,3,1,4,0,1,2,0,2,3),
+(0,3,0,3,0,1,0,3,0,2,3,3,3,0,3,1,2,0,3,3,2,3,3,2,3,2,3,1,3,0,4,3,2,0,3,3,1,4,3,3,2,3,4,3,1,3,3,1,1,0,1,1,0,1,0,1,0,1,0,0,0,4,1,1,0,3,0,3,1,0,2,3,3,3,3,3,1,0,0,2,0,3,3),
+(0,0,0,0,0,0,0,0,0,0,3,0,2,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,3,0,3,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,2,0,2,3,0,0,0,0,0,0,0,0,3),
+(0,2,0,3,1,3,0,3,0,2,3,3,3,1,3,1,3,1,3,1,3,3,3,1,3,0,2,3,1,1,4,3,3,2,3,3,1,2,2,4,1,3,3,0,1,4,2,3,0,1,3,0,3,0,0,1,3,0,2,0,0,3,3,2,1,3,0,3,0,2,0,3,4,4,4,3,1,0,3,0,0,3,3),
+(0,2,0,1,0,2,0,0,0,1,3,2,2,1,3,0,1,1,3,0,3,2,3,1,2,0,2,0,1,1,3,3,3,0,3,3,1,1,2,3,2,3,3,1,2,3,2,0,0,1,0,0,0,0,0,0,3,0,1,0,0,2,1,2,1,3,0,3,0,0,0,3,4,4,4,3,2,0,2,0,0,2,4),
+(0,0,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,3,1,0,0,0,0,0,0,0,3),
+(0,3,0,3,0,2,0,3,0,3,3,3,2,3,2,2,2,0,3,1,3,3,3,2,3,3,0,0,3,0,3,2,2,0,2,3,1,4,3,4,3,3,2,3,1,5,4,4,0,3,1,2,1,3,0,3,1,1,2,0,2,3,1,3,1,3,0,3,0,1,0,3,3,4,4,2,1,0,2,1,0,2,4),
+(0,1,0,3,0,1,0,2,0,1,4,2,5,1,4,0,2,0,2,1,3,1,4,0,2,1,0,0,2,1,4,1,1,0,3,3,0,5,1,3,2,3,3,1,0,3,2,3,0,1,0,0,0,0,0,0,1,0,0,0,0,4,0,1,0,3,0,2,0,1,0,3,3,3,4,3,3,0,0,0,0,2,3),
+(0,0,0,1,0,0,0,0,0,0,2,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,0,0,1,0,0,0,0,0,3),
+(0,1,0,3,0,4,0,3,0,2,4,3,1,0,3,2,2,1,3,1,2,2,3,1,1,1,2,1,3,0,1,2,0,1,3,2,1,3,0,5,5,1,0,0,1,3,2,1,0,3,0,0,1,0,0,0,0,0,3,4,0,1,1,1,3,2,0,2,0,1,0,2,3,3,1,2,3,0,1,0,1,0,4),
+(0,0,0,1,0,3,0,3,0,2,2,1,0,0,4,0,3,0,3,1,3,0,3,0,3,0,1,0,3,0,3,1,3,0,3,3,0,0,1,2,1,1,1,0,1,2,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,2,2,1,2,0,0,2,0,0,0,0,2,3,3,3,3,0,0,0,0,1,4),
+(0,0,0,3,0,3,0,0,0,0,3,1,1,0,3,0,1,0,2,0,1,0,0,0,0,0,0,0,1,0,3,0,2,0,2,3,0,0,2,2,3,1,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,2,3),
+(2,4,0,5,0,5,0,4,0,3,4,3,3,3,4,3,3,3,4,3,4,4,5,4,5,5,5,2,3,0,5,5,4,1,5,4,3,1,5,4,3,4,4,3,3,4,3,3,0,3,2,0,2,3,0,3,0,0,3,3,0,5,3,2,3,3,0,3,0,3,0,3,4,5,4,5,3,0,4,3,0,3,4),
+(0,3,0,3,0,3,0,3,0,3,3,4,3,2,3,2,3,0,4,3,3,3,3,3,3,3,3,0,3,2,4,3,3,1,3,4,3,4,4,4,3,4,4,3,2,4,4,1,0,2,0,0,1,1,0,2,0,0,3,1,0,5,3,2,1,3,0,3,0,1,2,4,3,2,4,3,3,0,3,2,0,4,4),
+(0,3,0,3,0,1,0,0,0,1,4,3,3,2,3,1,3,1,4,2,3,2,4,2,3,4,3,0,2,2,3,3,3,0,3,3,3,0,3,4,1,3,3,0,3,4,3,3,0,1,1,0,1,0,0,0,4,0,3,0,0,3,1,2,1,3,0,4,0,1,0,4,3,3,4,3,3,0,2,0,0,3,3),
+(0,3,0,4,0,1,0,3,0,3,4,3,3,0,3,3,3,1,3,1,3,3,4,3,3,3,0,0,3,1,5,3,3,1,3,3,2,5,4,3,3,4,5,3,2,5,3,4,0,1,0,0,0,0,0,2,0,0,1,1,0,4,2,2,1,3,0,3,0,2,0,4,4,3,5,3,2,0,1,1,0,3,4),
+(0,5,0,4,0,5,0,2,0,4,4,3,3,2,3,3,3,1,4,3,4,1,5,3,4,3,4,0,4,2,4,3,4,1,5,4,0,4,4,4,4,5,4,1,3,5,4,2,1,4,1,1,3,2,0,3,1,0,3,2,1,4,3,3,3,4,0,4,0,3,0,4,4,4,3,3,3,0,4,2,0,3,4),
+(1,4,0,4,0,3,0,1,0,3,3,3,1,1,3,3,2,2,3,3,1,0,3,2,2,1,2,0,3,1,2,1,2,0,3,2,0,2,2,3,3,4,3,0,3,3,1,2,0,1,1,3,1,2,0,0,3,0,1,1,0,3,2,2,3,3,0,3,0,0,0,2,3,3,4,3,3,0,1,0,0,1,4),
+(0,4,0,4,0,4,0,0,0,3,4,4,3,1,4,2,3,2,3,3,3,1,4,3,4,0,3,0,4,2,3,3,2,2,5,4,2,1,3,4,3,4,3,1,3,3,4,2,0,2,1,0,3,3,0,0,2,0,3,1,0,4,4,3,4,3,0,4,0,1,0,2,4,4,4,4,4,0,3,2,0,3,3),
+(0,0,0,1,0,4,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,3,2,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,2),
+(0,2,0,3,0,4,0,4,0,1,3,3,3,0,4,0,2,1,2,1,1,1,2,0,3,1,1,0,1,0,3,1,0,0,3,3,2,0,1,1,0,0,0,0,0,1,0,2,0,2,2,0,3,1,0,0,1,0,1,1,0,1,2,0,3,0,0,0,0,1,0,0,3,3,4,3,1,0,1,0,3,0,2),
+(0,0,0,3,0,5,0,0,0,0,1,0,2,0,3,1,0,1,3,0,0,0,2,0,0,0,1,0,0,0,1,1,0,0,4,0,0,0,2,3,0,1,4,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,0,0,0,0,0,0,0,2,0,0,3,0,0,0,0,0,3),
+(0,2,0,5,0,5,0,1,0,2,4,3,3,2,5,1,3,2,3,3,3,0,4,1,2,0,3,0,4,0,2,2,1,1,5,3,0,0,1,4,2,3,2,0,3,3,3,2,0,2,4,1,1,2,0,1,1,0,3,1,0,1,3,1,2,3,0,2,0,0,0,1,3,5,4,4,4,0,3,0,0,1,3),
+(0,4,0,5,0,4,0,4,0,4,5,4,3,3,4,3,3,3,4,3,4,4,5,3,4,5,4,2,4,2,3,4,3,1,4,4,1,3,5,4,4,5,5,4,4,5,5,5,2,3,3,1,4,3,1,3,3,0,3,3,1,4,3,4,4,4,0,3,0,4,0,3,3,4,4,5,0,0,4,3,0,4,5),
+(0,4,0,4,0,3,0,3,0,3,4,4,4,3,3,2,4,3,4,3,4,3,5,3,4,3,2,1,4,2,4,4,3,1,3,4,2,4,5,5,3,4,5,4,1,5,4,3,0,3,2,2,3,2,1,3,1,0,3,3,3,5,3,3,3,5,4,4,2,3,3,4,3,3,3,2,1,0,3,2,1,4,3),
+(0,4,0,5,0,4,0,3,0,3,5,5,3,2,4,3,4,0,5,4,4,1,4,4,4,3,3,3,4,3,5,5,2,3,3,4,1,2,5,5,3,5,5,2,3,5,5,4,0,3,2,0,3,3,1,1,5,1,4,1,0,4,3,2,3,5,0,4,0,3,0,5,4,3,4,3,0,0,4,1,0,4,4),
+(1,3,0,4,0,2,0,2,0,2,5,5,3,3,3,3,3,0,4,2,3,4,4,4,3,4,0,0,3,4,5,4,3,3,3,3,2,5,5,4,5,5,5,4,3,5,5,5,1,3,1,0,1,0,0,3,2,0,4,2,0,5,2,3,2,4,1,3,0,3,0,4,5,4,5,4,3,0,4,2,0,5,4),
+(0,3,0,4,0,5,0,3,0,3,4,4,3,2,3,2,3,3,3,3,3,2,4,3,3,2,2,0,3,3,3,3,3,1,3,3,3,0,4,4,3,4,4,1,1,4,4,2,0,3,1,0,1,1,0,4,1,0,2,3,1,3,3,1,3,4,0,3,0,1,0,3,1,3,0,0,1,0,2,0,0,4,4),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,3,0,3,0,2,0,3,0,1,5,4,3,3,3,1,4,2,1,2,3,4,4,2,4,4,5,0,3,1,4,3,4,0,4,3,3,3,2,3,2,5,3,4,3,2,2,3,0,0,3,0,2,1,0,1,2,0,0,0,0,2,1,1,3,1,0,2,0,4,0,3,4,4,4,5,2,0,2,0,0,1,3),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,1,0,0,1,1,0,0,0,4,2,1,1,0,1,0,3,2,0,0,3,1,1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1,0,0,0,2,0,0,0,1,4,0,4,2,1,0,0,0,0,0,1),
+(0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,1,0,1,0,0,0,0,3,1,0,0,0,2,0,2,1,0,0,1,2,1,0,1,1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1,3,1,0,0,0,0,0,1,0,0,2,1,0,0,0,0,0,0,0,0,2),
+(0,4,0,4,0,4,0,3,0,4,4,3,4,2,4,3,2,0,4,4,4,3,5,3,5,3,3,2,4,2,4,3,4,3,1,4,0,2,3,4,4,4,3,3,3,4,4,4,3,4,1,3,4,3,2,1,2,1,3,3,3,4,4,3,3,5,0,4,0,3,0,4,3,3,3,2,1,0,3,0,0,3,3),
+(0,4,0,3,0,3,0,3,0,3,5,5,3,3,3,3,4,3,4,3,3,3,4,4,4,3,3,3,3,4,3,5,3,3,1,3,2,4,5,5,5,5,4,3,4,5,5,3,2,2,3,3,3,3,2,3,3,1,2,3,2,4,3,3,3,4,0,4,0,2,0,4,3,2,2,1,2,0,3,0,0,4,1),
+)
+
+class JapaneseContextAnalysis:
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
+        self._mTotalRel = 0  # total sequence received
+        # category counters, each interger counts sequence in its category
+        self._mRelSample = [0] * NUM_OF_CATEGORY
+        # if last byte in current buffer is not the last byte of a character,
+        # we need to know how many bytes to skip in next buffer
+        self._mNeedToSkipCharNum = 0
+        self._mLastCharOrder = -1  # The order of previous char
+        # If this flag is set to True, detection is done and conclusion has
+        # been made
+        self._mDone = False
+
+    def feed(self, aBuf, aLen):
+        if self._mDone:
+            return
+
+        # The buffer we got is byte oriented, and a character may span in more than one
+        # buffers. In case the last one or two byte in last buffer is not
+        # complete, we record how many byte needed to complete that character
+        # and skip these bytes here.  We can choose to record those bytes as
+        # well and analyse the character once it is complete, but since a
+        # character will not make much difference, by simply skipping
+        # this character will simply our logic and improve performance.
+        i = self._mNeedToSkipCharNum
+        while i < aLen:
+            order, charLen = self.get_order(aBuf[i:i + 2])
+            i += charLen
+            if i > aLen:
+                self._mNeedToSkipCharNum = i - aLen
+                self._mLastCharOrder = -1
+            else:
+                if (order != -1) and (self._mLastCharOrder != -1):
+                    self._mTotalRel += 1
+                    if self._mTotalRel > MAX_REL_THRESHOLD:
+                        self._mDone = True
+                        break
+                    self._mRelSample[jp2CharContext[self._mLastCharOrder][order]] += 1
+                self._mLastCharOrder = order
+
+    def got_enough_data(self):
+        return self._mTotalRel > ENOUGH_REL_THRESHOLD
+
+    def get_confidence(self):
+        # This is just one way to calculate confidence. It works well for me.
+        if self._mTotalRel > MINIMUM_DATA_THRESHOLD:
+            return (self._mTotalRel - self._mRelSample[0]) / self._mTotalRel
+        else:
+            return DONT_KNOW
+
+    def get_order(self, aBuf):
+        return -1, 1
+
+class SJISContextAnalysis(JapaneseContextAnalysis):
+    def __init__(self):
+        self.charset_name = "SHIFT_JIS"
+
+    def get_charset_name(self):
+        return self.charset_name
+
+    def get_order(self, aBuf):
+        if not aBuf:
+            return -1, 1
+        # find out current char's byte length
+        first_char = wrap_ord(aBuf[0])
+        if ((0x81 <= first_char <= 0x9F) or (0xE0 <= first_char <= 0xFC)):
+            charLen = 2
+            if (first_char == 0x87) or (0xFA <= first_char <= 0xFC):
+                self.charset_name = "CP932"
+        else:
+            charLen = 1
+
+        # return its order if it is hiragana
+        if len(aBuf) > 1:
+            second_char = wrap_ord(aBuf[1])
+            if (first_char == 202) and (0x9F <= second_char <= 0xF1):
+                return second_char - 0x9F, charLen
+
+        return -1, charLen
+
+class EUCJPContextAnalysis(JapaneseContextAnalysis):
+    def get_order(self, aBuf):
+        if not aBuf:
+            return -1, 1
+        # find out current char's byte length
+        first_char = wrap_ord(aBuf[0])
+        if (first_char == 0x8E) or (0xA1 <= first_char <= 0xFE):
+            charLen = 2
+        elif first_char == 0x8F:
+            charLen = 3
+        else:
+            charLen = 1
+
+        # return its order if it is hiragana
+        if len(aBuf) > 1:
+            second_char = wrap_ord(aBuf[1])
+            if (first_char == 0xA4) and (0xA1 <= second_char <= 0xF3):
+                return second_char - 0xA1, charLen
+
+        return -1, charLen
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langbulgarianmodel.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langbulgarianmodel.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langbulgarianmodel.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langbulgarianmodel.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,229 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Character Mapping Table:
+# this table is modified base on win1251BulgarianCharToOrderMap, so
+# only number <64 is sure valid
+
+Latin5_BulgarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82,  # 40
+110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253,  # 50
+253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71,  # 60
+116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253,  # 70
+194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,  # 80
+210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,  # 90
+ 81,226,227,228,229,230,105,231,232,233,234,235,236, 45,237,238,  # a0
+ 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30,  # b0
+ 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,239, 67,240, 60, 56,  # c0
+  1, 18,  9, 20, 11,  3, 23, 15,  2, 26, 12, 10, 14,  6,  4, 13,  # d0
+  7,  8,  5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,241, 42, 16,  # e0
+ 62,242,243,244, 58,245, 98,246,247,248,249,250,251, 91,252,253,  # f0
+)
+
+win1251BulgarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82,  # 40
+110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253,  # 50
+253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71,  # 60
+116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253,  # 70
+206,207,208,209,210,211,212,213,120,214,215,216,217,218,219,220,  # 80
+221, 78, 64, 83,121, 98,117,105,222,223,224,225,226,227,228,229,  # 90
+ 88,230,231,232,233,122, 89,106,234,235,236,237,238, 45,239,240,  # a0
+ 73, 80,118,114,241,242,243,244,245, 62, 58,246,247,248,249,250,  # b0
+ 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30,  # c0
+ 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,251, 67,252, 60, 56,  # d0
+  1, 18,  9, 20, 11,  3, 23, 15,  2, 26, 12, 10, 14,  6,  4, 13,  # e0
+  7,  8,  5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,253, 42, 16,  # f0
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 96.9392%
+# first 1024 sequences:3.0618%
+# rest  sequences:     0.2992%
+# negative sequences:  0.0020%
+BulgarianLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,3,3,3,3,3,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,2,2,1,2,2,
+3,1,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,0,1,
+0,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,3,3,0,3,1,0,
+0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,2,3,2,2,1,3,3,3,3,2,2,2,1,1,2,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,2,3,2,2,3,3,1,1,2,3,3,2,3,3,3,3,2,1,2,0,2,0,3,0,0,
+0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,1,3,3,3,3,3,2,3,2,3,3,3,3,3,2,3,3,1,3,0,3,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,1,3,3,2,3,3,3,1,3,3,2,3,2,2,2,0,0,2,0,2,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,3,3,1,2,2,3,2,1,1,2,0,2,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,2,3,3,1,2,3,2,2,2,3,3,3,3,3,2,2,3,1,2,0,2,1,2,0,0,
+0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,1,3,3,3,3,3,2,3,3,3,2,3,3,2,3,2,2,2,3,1,2,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,3,3,1,1,1,2,2,1,3,1,3,2,2,3,0,0,1,0,1,0,1,0,0,
+0,0,0,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,2,2,3,2,2,3,1,2,1,1,1,2,3,1,3,1,2,2,0,1,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,1,3,2,2,3,3,1,2,3,1,1,3,3,3,3,1,2,2,1,1,1,0,2,0,2,0,1,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,2,2,3,3,3,2,2,1,1,2,0,2,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,0,1,2,1,3,3,2,3,3,3,3,3,2,3,2,1,0,3,1,2,1,2,1,2,3,2,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,1,2,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,1,3,3,2,3,3,2,2,2,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,0,3,3,3,3,3,2,1,1,2,1,3,3,0,3,1,1,1,1,3,2,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,1,1,3,1,3,3,2,3,2,2,2,3,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,2,3,3,2,2,3,2,1,1,1,1,1,3,1,3,1,1,0,0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,2,3,2,0,3,2,0,3,0,2,0,0,2,1,3,1,0,0,1,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,2,1,1,1,1,2,1,1,2,1,1,1,2,2,1,2,1,1,1,0,1,1,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,2,1,3,1,1,2,1,3,2,1,1,0,1,2,3,2,1,1,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,2,2,1,0,1,0,0,1,0,0,0,2,1,0,3,0,0,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,2,3,2,3,3,1,3,2,1,1,1,2,1,1,2,1,3,0,1,0,0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,2,2,3,3,2,3,2,2,2,3,1,2,2,1,1,2,1,1,2,2,0,1,1,0,1,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,1,3,1,0,2,2,1,3,2,1,0,0,2,0,2,0,1,0,0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,1,2,0,2,3,1,2,3,2,0,1,3,1,2,1,1,1,0,0,1,0,0,2,2,2,3,
+2,2,2,2,1,2,1,1,2,2,1,1,2,0,1,1,1,0,0,1,1,0,0,1,1,0,0,0,1,1,0,1,
+3,3,3,3,3,2,1,2,2,1,2,0,2,0,1,0,1,2,1,2,1,1,0,0,0,1,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,2,3,3,1,1,3,1,0,3,2,1,0,0,0,1,2,0,2,0,1,0,0,0,1,0,1,2,1,2,2,
+1,1,1,1,1,1,1,2,2,2,1,1,1,1,1,1,1,0,1,2,1,1,1,0,0,0,0,0,1,1,0,0,
+3,1,0,1,0,2,3,2,2,2,3,2,2,2,2,2,1,0,2,1,2,1,1,1,0,1,2,1,2,2,2,1,
+1,1,2,2,2,2,1,2,1,1,0,1,2,1,2,2,2,1,1,1,0,1,1,1,1,2,0,1,0,0,0,0,
+2,3,2,3,3,0,0,2,1,0,2,1,0,0,0,0,2,3,0,2,0,0,0,0,0,1,0,0,2,0,1,2,
+2,1,2,1,2,2,1,1,1,2,1,1,1,0,1,2,2,1,1,1,1,1,0,1,1,1,0,0,1,2,0,0,
+3,3,2,2,3,0,2,3,1,1,2,0,0,0,1,0,0,2,0,2,0,0,0,1,0,1,0,1,2,0,2,2,
+1,1,1,1,2,1,0,1,2,2,2,1,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,1,0,0,
+2,3,2,3,3,0,0,3,0,1,1,0,1,0,0,0,2,2,1,2,0,0,0,0,0,0,0,0,2,0,1,2,
+2,2,1,1,1,1,1,2,2,2,1,0,2,0,1,0,1,0,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
+3,3,3,3,2,2,2,2,2,0,2,1,1,1,1,2,1,2,1,1,0,2,0,1,0,1,0,0,2,0,1,2,
+1,1,1,1,1,1,1,2,2,1,1,0,2,0,1,0,2,0,0,1,1,1,0,0,2,0,0,0,1,1,0,0,
+2,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,0,0,0,1,2,0,1,2,
+2,2,2,1,1,2,1,1,2,2,2,1,2,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,1,1,0,0,
+2,3,3,3,3,0,2,2,0,2,1,0,0,0,1,1,1,2,0,2,0,0,0,3,0,0,0,0,2,0,2,2,
+1,1,1,2,1,2,1,1,2,2,2,1,2,0,1,1,1,0,1,1,1,1,0,2,1,0,0,0,1,1,0,0,
+2,3,3,3,3,0,2,1,0,0,2,0,0,0,0,0,1,2,0,2,0,0,0,0,0,0,0,0,2,0,1,2,
+1,1,1,2,1,1,1,1,2,2,2,0,1,0,1,1,1,0,0,1,1,1,0,0,1,0,0,0,0,1,0,0,
+3,3,2,2,3,0,1,0,1,0,0,0,0,0,0,0,1,1,0,3,0,0,0,0,0,0,0,0,1,0,2,2,
+1,1,1,1,1,2,1,1,2,2,1,2,2,1,0,1,1,1,1,1,0,1,0,0,1,0,0,0,1,1,0,0,
+3,1,0,1,0,2,2,2,2,3,2,1,1,1,2,3,0,0,1,0,2,1,1,0,1,1,1,1,2,1,1,1,
+1,2,2,1,2,1,2,2,1,1,0,1,2,1,2,2,1,1,1,0,0,1,1,1,2,1,0,1,0,0,0,0,
+2,1,0,1,0,3,1,2,2,2,2,1,2,2,1,1,1,0,2,1,2,2,1,1,2,1,1,0,2,1,1,1,
+1,2,2,2,2,2,2,2,1,2,0,1,1,0,2,1,1,1,1,1,0,0,1,1,1,1,0,1,0,0,0,0,
+2,1,1,1,1,2,2,2,2,1,2,2,2,1,2,2,1,1,2,1,2,3,2,2,1,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,3,2,0,1,2,0,1,2,1,1,0,1,0,1,2,1,2,0,0,0,1,1,0,0,0,1,0,0,2,
+1,1,0,0,1,1,0,1,1,1,1,0,2,0,1,1,1,0,0,1,1,0,0,0,0,1,0,0,0,1,0,0,
+2,0,0,0,0,1,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,2,1,1,1,
+1,2,2,2,2,1,1,2,1,2,1,1,1,0,2,1,2,1,1,1,0,2,1,1,1,1,0,1,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
+1,1,0,1,0,1,1,1,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,3,2,0,0,0,0,1,0,0,0,0,0,0,1,1,0,2,0,0,0,0,0,0,0,0,1,0,1,2,
+1,1,1,1,1,1,0,0,2,2,2,2,2,0,1,1,0,1,1,1,1,1,0,0,1,0,0,0,1,1,0,1,
+2,3,1,2,1,0,1,1,0,2,2,2,0,0,1,0,0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,2,
+1,1,1,1,2,1,1,1,1,1,1,1,1,0,1,1,0,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
+2,2,2,2,2,0,0,2,0,0,2,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,0,2,2,
+1,1,1,1,1,0,0,1,2,1,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,0,2,0,1,1,0,0,0,1,0,0,2,0,2,0,0,0,0,0,0,0,0,0,0,1,1,
+0,0,0,1,1,1,1,1,1,1,1,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,3,2,0,0,1,0,0,1,0,0,0,0,0,0,1,0,2,0,0,0,1,0,0,0,0,0,0,0,2,
+1,1,0,0,1,0,0,0,1,1,0,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+2,1,2,2,2,1,2,1,2,2,1,1,2,1,1,1,0,1,1,1,1,2,0,1,0,1,1,1,1,0,1,1,
+1,1,2,1,1,1,1,1,1,0,0,1,2,1,1,1,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,
+1,0,0,1,3,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,1,0,0,1,0,2,0,0,0,0,0,1,1,1,0,1,0,0,0,0,0,0,0,0,2,0,0,1,
+0,2,0,1,0,0,1,1,2,0,1,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,1,1,0,2,1,0,1,1,1,0,0,1,0,2,0,1,0,0,0,0,0,0,0,0,0,1,
+0,1,0,0,1,0,0,0,1,1,0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,2,0,0,1,0,0,0,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
+0,1,0,1,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+2,0,1,0,0,1,2,1,1,1,1,1,1,2,2,1,0,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,
+1,1,2,1,1,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,1,2,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+0,1,1,0,1,1,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
+1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,1,0,2,0,0,2,0,1,0,0,1,0,0,1,
+1,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
+1,1,1,1,1,1,1,2,0,0,0,0,0,0,2,1,0,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+)
+
+Latin5BulgarianModel = {
+  'charToOrderMap': Latin5_BulgarianCharToOrderMap,
+  'precedenceMatrix': BulgarianLangModel,
+  'mTypicalPositiveRatio': 0.969392,
+  'keepEnglishLetter': False,
+  'charsetName': "ISO-8859-5"
+}
+
+Win1251BulgarianModel = {
+  'charToOrderMap': win1251BulgarianCharToOrderMap,
+  'precedenceMatrix': BulgarianLangModel,
+  'mTypicalPositiveRatio': 0.969392,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1251"
+}
+
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langcyrillicmodel.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langcyrillicmodel.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langcyrillicmodel.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langcyrillicmodel.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,329 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# KOI8-R language model
+# Character Mapping Table:
+KOI8R_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,  # 80
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,  # 90
+223,224,225, 68,226,227,228,229,230,231,232,233,234,235,236,237,  # a0
+238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,  # b0
+ 27,  3, 21, 28, 13,  2, 39, 19, 26,  4, 23, 11,  8, 12,  5,  1,  # c0
+ 15, 16,  9,  7,  6, 14, 24, 10, 17, 18, 20, 25, 30, 29, 22, 54,  # d0
+ 59, 37, 44, 58, 41, 48, 53, 46, 55, 42, 60, 36, 49, 38, 31, 34,  # e0
+ 35, 43, 45, 32, 40, 52, 56, 33, 61, 62, 51, 57, 47, 63, 50, 70,  # f0
+)
+
+win1251_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+239,240,241,242,243,244,245,246, 68,247,248,249,250,251,252,253,
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
+)
+
+latin5_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
+239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
+)
+
+macCyrillic_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+239,240,241,242,243,244,245,246,247,248,249,250,251,252, 68, 16,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27,255,
+)
+
+IBM855_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194, 68,195,196,197,198,199,200,201,202,203,204,205,
+206,207,208,209,210,211,212,213,214,215,216,217, 27, 59, 54, 70,
+  3, 37, 21, 44, 28, 58, 13, 41,  2, 48, 39, 53, 19, 46,218,219,
+220,221,222,223,224, 26, 55,  4, 42,225,226,227,228, 23, 60,229,
+230,231,232,233,234,235, 11, 36,236,237,238,239,240,241,242,243,
+  8, 49, 12, 38,  5, 31,  1, 34, 15,244,245,246,247, 35, 16,248,
+ 43,  9, 45,  7, 32,  6, 40, 14, 52, 24, 56, 10, 33, 17, 61,249,
+250, 18, 62, 20, 51, 25, 57, 30, 47, 29, 63, 22, 50,251,252,255,
+)
+
+IBM866_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
+239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 97.6601%
+# first 1024 sequences: 2.3389%
+# rest  sequences:      0.1237%
+# negative sequences:   0.0009%
+RussianLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,1,3,3,3,2,3,2,3,3,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,2,2,2,2,2,0,0,2,
+3,3,3,2,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,2,3,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,2,2,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,2,3,3,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
+0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
+0,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,2,2,2,3,1,3,3,1,3,3,3,3,2,2,3,0,2,2,2,3,3,2,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,3,3,3,2,2,3,2,3,3,3,2,1,2,2,0,1,2,2,2,2,2,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,3,0,2,2,3,3,2,1,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,1,2,3,2,2,3,2,3,3,3,3,2,2,3,0,3,2,2,3,1,1,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,3,3,3,3,2,2,2,0,3,3,3,2,2,2,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,2,3,2,2,0,1,3,2,1,2,2,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,2,1,1,3,0,1,1,1,1,2,1,1,0,2,2,2,1,2,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,2,2,2,2,1,3,2,3,2,3,2,1,2,2,0,1,1,2,1,2,1,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,2,3,3,3,2,2,2,2,0,2,2,2,2,3,1,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,2,3,2,2,3,3,3,3,3,3,3,3,3,1,3,2,0,0,3,3,3,3,2,3,3,3,3,2,3,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,3,2,2,3,3,0,2,1,0,3,2,3,2,3,0,0,1,2,0,0,1,0,1,2,1,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,3,0,2,3,3,3,3,2,3,3,3,3,1,2,2,0,0,2,3,2,2,2,3,2,3,2,2,3,0,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,0,2,3,2,3,0,1,2,3,3,2,0,2,3,0,0,2,3,2,2,0,1,3,1,3,2,2,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,3,0,2,3,3,3,3,3,3,3,3,2,1,3,2,0,0,2,2,3,3,3,2,3,3,0,2,2,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,2,3,3,2,2,2,3,3,0,0,1,1,1,1,1,2,0,0,1,1,1,1,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,2,3,3,3,3,3,3,3,0,3,2,3,3,2,3,2,0,2,1,0,1,1,0,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,3,2,2,2,2,3,1,3,2,3,1,1,2,1,0,2,2,2,2,1,3,1,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+2,2,3,3,3,3,3,1,2,2,1,3,1,0,3,0,0,3,0,0,0,1,1,0,1,2,1,0,0,0,0,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,2,1,1,3,3,3,2,2,1,2,2,3,1,1,2,0,0,2,2,1,3,0,0,2,1,1,2,1,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,3,3,3,1,2,2,2,1,2,1,3,3,1,1,2,1,2,1,2,2,0,2,0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,3,2,1,3,2,2,3,2,0,3,2,0,3,0,1,0,1,1,0,0,1,1,1,1,0,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,2,3,3,3,2,2,2,3,3,1,2,1,2,1,0,1,0,1,1,0,1,0,0,2,1,1,1,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+3,1,1,2,1,2,3,3,2,2,1,2,2,3,0,2,1,0,0,2,2,3,2,1,2,2,2,2,2,3,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,1,1,0,1,1,2,2,1,1,3,0,0,1,3,1,1,1,0,0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,3,3,3,2,0,0,0,2,1,0,1,0,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,1,0,0,2,3,2,2,2,1,2,2,2,1,2,1,0,0,1,1,1,0,2,0,1,1,1,0,0,1,1,
+1,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,0,0,0,0,1,0,0,0,0,3,0,1,2,1,0,0,0,0,0,0,0,1,1,0,0,1,1,
+1,0,1,0,1,2,0,0,1,1,2,1,0,1,1,1,1,0,1,1,1,1,0,1,0,0,1,0,0,1,1,0,
+2,2,3,2,2,2,3,1,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,0,1,0,1,1,1,0,2,1,
+1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,0,1,1,0,
+3,3,3,2,2,2,2,3,2,2,1,1,2,2,2,2,1,1,3,1,2,1,2,0,0,1,1,0,1,0,2,1,
+1,1,1,1,1,2,1,0,1,1,1,1,0,1,0,0,1,1,0,0,1,0,1,0,0,1,0,0,0,1,1,0,
+2,0,0,1,0,3,2,2,2,2,1,2,1,2,1,2,0,0,0,2,1,2,2,1,1,2,2,0,1,1,0,2,
+1,1,1,1,1,0,1,1,1,2,1,1,1,2,1,0,1,2,1,1,1,1,0,1,1,1,0,0,1,0,0,1,
+1,3,2,2,2,1,1,1,2,3,0,0,0,0,2,0,2,2,1,0,0,0,0,0,0,1,0,0,0,0,1,1,
+1,0,1,1,0,1,0,1,1,0,1,1,0,2,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
+2,3,2,3,2,1,2,2,2,2,1,0,0,0,2,0,0,1,1,0,0,0,0,0,0,0,1,1,0,0,2,1,
+1,1,2,1,0,2,0,0,1,0,1,0,0,1,0,0,1,1,0,1,1,0,0,0,0,0,1,0,0,0,0,0,
+3,0,0,1,0,2,2,2,3,2,2,2,2,2,2,2,0,0,0,2,1,2,1,1,1,2,2,0,0,0,1,2,
+1,1,1,1,1,0,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,1,
+2,3,2,3,3,2,0,1,1,1,0,0,1,0,2,0,1,1,3,1,0,0,0,0,0,0,0,1,0,0,2,1,
+1,1,1,1,1,1,1,0,1,0,1,1,1,1,0,1,1,1,0,0,1,1,0,1,0,0,0,0,0,0,1,0,
+2,3,3,3,3,1,2,2,2,2,0,1,1,0,2,1,1,1,2,1,0,1,1,0,0,1,0,1,0,0,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,2,0,0,1,1,2,2,1,0,0,2,0,1,1,3,0,0,1,0,0,0,0,0,1,0,1,2,1,
+1,1,2,0,1,1,1,0,1,0,1,1,0,1,0,1,1,1,1,0,1,0,0,0,0,0,0,1,0,1,1,0,
+1,3,2,3,2,1,0,0,2,2,2,0,1,0,2,0,1,1,1,0,1,0,0,0,3,0,1,1,0,0,2,1,
+1,1,1,0,1,1,0,0,0,0,1,1,0,1,0,0,2,1,1,0,1,0,0,0,1,0,1,0,0,1,1,0,
+3,1,2,1,1,2,2,2,2,2,2,1,2,2,1,1,0,0,0,2,2,2,0,0,0,1,2,1,0,1,0,1,
+2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,2,1,1,1,0,1,0,1,1,0,1,1,1,0,0,1,
+3,0,0,0,0,2,0,1,1,1,1,1,1,1,0,1,0,0,0,1,1,1,0,1,0,1,1,0,0,1,0,1,
+1,1,0,0,1,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,1,
+1,3,3,2,2,0,0,0,2,2,0,0,0,1,2,0,1,1,2,0,0,0,0,0,0,0,0,1,0,0,2,1,
+0,1,1,0,0,1,1,0,0,0,1,1,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
+2,3,2,3,2,0,0,0,0,1,1,0,0,0,2,0,2,0,2,0,0,0,0,0,1,0,0,1,0,0,1,1,
+1,1,2,0,1,2,1,0,1,1,2,1,1,1,1,1,2,1,1,0,1,0,0,1,1,1,1,1,0,1,1,0,
+1,3,2,2,2,1,0,0,2,2,1,0,1,2,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,1,1,
+0,0,1,1,0,1,1,0,0,1,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,0,2,3,1,2,2,2,2,2,2,1,1,0,0,0,1,0,1,0,2,1,1,1,0,0,0,0,1,
+1,1,0,1,1,0,1,1,1,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+2,0,2,0,0,1,0,3,2,1,2,1,2,2,0,1,0,0,0,2,1,0,0,2,1,1,1,1,0,2,0,2,
+2,1,1,1,1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,0,0,0,1,1,1,1,0,1,0,0,1,
+1,2,2,2,2,1,0,0,1,0,0,0,0,0,2,0,1,1,1,1,0,0,0,0,1,0,1,2,0,0,2,0,
+1,0,1,1,1,2,1,0,1,0,1,1,0,0,1,0,1,1,1,0,1,0,0,0,1,0,0,1,0,1,1,0,
+2,1,2,2,2,0,3,0,1,1,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+0,0,0,1,1,1,0,0,1,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,
+1,2,2,3,2,2,0,0,1,1,2,0,1,2,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,
+0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
+2,2,1,1,2,1,2,2,2,2,2,1,2,2,0,1,0,0,0,1,2,2,2,1,2,1,1,1,1,1,2,1,
+1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,0,1,
+1,2,2,2,2,0,1,0,2,2,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
+0,0,1,0,0,1,0,0,0,0,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,0,0,2,2,2,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,
+0,1,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,0,0,0,1,0,0,1,1,2,0,0,0,0,1,0,1,0,0,1,0,0,2,0,0,0,1,
+0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,1,1,2,0,2,1,1,1,1,0,2,2,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,1,
+0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+1,0,2,1,2,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,
+0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
+1,0,0,0,0,2,0,1,2,1,0,1,1,1,0,1,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,1,
+0,0,0,0,0,1,0,0,1,1,0,0,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,
+2,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,1,1,0,1,0,1,0,0,1,1,1,1,0,0,0,1,0,0,0,0,1,0,0,0,1,0,1,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,1,0,1,1,0,1,0,1,0,0,0,0,1,1,0,1,1,0,0,0,0,0,1,0,1,1,0,1,0,0,0,
+0,1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
+)
+
+Koi8rModel = {
+  'charToOrderMap': KOI8R_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "KOI8-R"
+}
+
+Win1251CyrillicModel = {
+  'charToOrderMap': win1251_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1251"
+}
+
+Latin5CyrillicModel = {
+  'charToOrderMap': latin5_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "ISO-8859-5"
+}
+
+MacCyrillicModel = {
+  'charToOrderMap': macCyrillic_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "MacCyrillic"
+};
+
+Ibm866Model = {
+  'charToOrderMap': IBM866_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "IBM866"
+}
+
+Ibm855Model = {
+  'charToOrderMap': IBM855_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "IBM855"
+}
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langgreekmodel.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langgreekmodel.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langgreekmodel.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langgreekmodel.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,225 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Character Mapping Table:
+Latin7_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85,  # 40
+ 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253,  # 50
+253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55,  # 60
+ 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253,  # 70
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 80
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 90
+253,233, 90,253,253,253,253,253,253,253,253,253,253, 74,253,253,  # a0
+253,253,253,253,247,248, 61, 36, 46, 71, 73,253, 54,253,108,123,  # b0
+110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39,  # c0
+ 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15,  # d0
+124,  1, 29, 20, 21,  3, 32, 13, 25,  5, 11, 16, 10,  6, 30,  4,  # e0
+  9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
+)
+
+win1253_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85,  # 40
+ 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253,  # 50
+253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55,  # 60
+ 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253,  # 70
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 80
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 90
+253,233, 61,253,253,253,253,253,253,253,253,253,253, 74,253,253,  # a0
+253,253,253,253,247,253,253, 36, 46, 71, 73,253, 54,253,108,123,  # b0
+110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39,  # c0
+ 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15,  # d0
+124,  1, 29, 20, 21,  3, 32, 13, 25,  5, 11, 16, 10,  6, 30,  4,  # e0
+  9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 98.2851%
+# first 1024 sequences:1.7001%
+# rest  sequences:     0.0359%
+# negative sequences:  0.0148%
+GreekLangModel = (
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,2,2,3,3,3,3,3,3,3,3,1,3,3,3,0,2,2,3,3,0,3,0,3,2,0,3,3,3,0,
+3,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,0,3,3,0,3,2,3,3,0,3,2,3,3,3,0,0,3,0,3,0,3,3,2,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
+0,2,3,2,2,3,3,3,3,3,3,3,3,0,3,3,3,3,0,2,3,3,0,3,3,3,3,2,3,3,3,0,
+2,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,2,1,3,3,3,3,2,3,3,2,3,3,2,0,
+0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,2,3,3,0,
+2,0,1,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,3,0,0,0,0,3,3,0,3,1,3,3,3,0,3,3,0,3,3,3,3,0,0,0,0,
+2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,0,3,0,3,3,3,3,3,0,3,2,2,2,3,0,2,3,3,3,3,3,2,3,3,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,3,2,2,2,3,3,3,3,0,3,1,3,3,3,3,2,3,3,3,3,3,3,3,2,2,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,0,3,0,0,0,3,3,2,3,3,3,3,3,0,0,3,2,3,0,2,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,3,0,0,3,3,0,2,3,0,3,0,3,3,3,0,0,3,0,3,0,2,2,3,3,0,0,
+0,0,1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,0,3,2,3,3,3,3,0,3,3,3,3,3,0,3,3,2,3,2,3,3,2,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,2,3,2,3,3,3,3,3,3,0,2,3,2,3,2,2,2,3,2,3,3,2,3,0,2,2,2,3,0,
+2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,0,3,3,3,2,3,3,0,0,3,0,3,0,0,0,3,2,0,3,0,3,0,0,2,0,2,0,
+0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,0,0,0,3,3,0,3,3,3,0,0,1,2,3,0,
+3,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,0,0,3,2,2,3,3,0,3,3,3,3,3,2,1,3,0,3,2,3,3,2,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,3,0,2,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,3,0,3,2,3,0,0,3,3,3,0,
+3,0,0,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,0,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,2,0,3,2,3,0,0,3,2,3,0,
+2,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,1,2,2,3,3,3,3,3,3,0,2,3,0,3,0,0,0,3,3,0,3,0,2,0,0,2,3,1,0,
+2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,3,0,3,0,3,3,2,3,0,3,3,3,3,3,3,0,3,3,3,0,2,3,0,0,3,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,0,0,3,0,0,0,3,3,0,3,0,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,0,3,3,3,3,3,3,0,0,3,0,2,0,0,0,3,3,0,3,0,3,0,0,2,0,2,0,
+0,0,0,0,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,3,0,3,0,2,0,3,2,0,3,2,3,2,3,0,0,3,2,3,2,3,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,2,3,3,3,3,3,0,0,0,3,0,2,1,0,0,3,2,2,2,0,3,0,0,2,2,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,2,0,3,0,3,0,3,3,0,2,1,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,3,3,3,0,3,3,3,3,3,3,0,2,3,0,3,0,0,0,2,1,0,2,2,3,0,0,2,2,2,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,2,3,3,3,2,3,0,0,1,3,0,2,0,0,0,0,3,0,1,0,2,0,0,1,1,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,1,0,3,0,0,0,3,2,0,3,2,3,3,3,0,0,3,0,3,2,2,2,1,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,0,0,3,0,0,0,0,2,0,2,3,3,2,2,2,2,3,0,2,0,2,2,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,2,0,0,0,0,0,0,2,3,0,2,0,2,3,2,0,0,3,0,3,0,3,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,3,2,3,3,2,2,3,0,2,0,3,0,0,0,2,0,0,0,0,1,2,0,2,0,2,0,
+0,2,0,2,0,2,2,0,0,1,0,2,2,2,0,2,2,2,0,2,2,2,0,0,2,0,0,1,0,0,0,0,
+0,2,0,3,3,2,0,0,0,0,0,0,1,3,0,2,0,2,2,2,0,0,2,0,3,0,0,2,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,2,3,2,0,2,2,0,2,0,2,2,0,2,0,2,2,2,0,0,0,0,0,0,2,3,0,0,0,2,
+0,1,2,0,0,0,0,2,2,0,0,0,2,1,0,2,2,0,0,0,0,0,0,1,0,2,0,0,0,0,0,0,
+0,0,2,1,0,2,3,2,2,3,2,3,2,0,0,3,3,3,0,0,3,2,0,0,0,1,1,0,2,0,2,2,
+0,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2,2,2,0,0,2,0,0,0,2,0,1,0,0,0,0,
+0,3,0,3,3,2,2,0,3,0,0,0,2,2,0,2,2,2,1,2,0,0,1,2,2,0,0,3,0,0,0,2,
+0,1,2,0,0,0,1,2,0,0,0,0,0,0,0,2,2,0,1,0,0,2,0,0,0,2,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,3,3,2,2,0,0,0,2,0,2,3,3,0,2,0,0,0,0,0,0,2,2,2,0,2,2,0,2,0,2,
+0,2,2,0,0,2,2,2,2,1,0,0,2,2,0,2,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,
+0,2,0,3,2,3,0,0,0,3,0,0,2,2,0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,0,2,
+0,0,2,2,0,0,2,2,2,0,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,2,0,0,3,2,0,2,2,2,2,2,0,0,0,2,0,0,0,0,2,0,1,0,0,2,0,1,0,0,0,
+0,2,2,2,0,2,2,0,1,2,0,2,2,2,0,2,2,2,2,1,2,2,0,0,2,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,2,0,2,0,2,2,0,0,0,0,1,2,1,0,0,2,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3,2,3,0,0,2,0,0,0,2,2,0,2,0,0,0,1,0,0,2,0,2,0,2,2,0,0,0,0,
+0,0,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,
+0,2,2,3,2,2,0,0,0,0,0,0,1,3,0,2,0,2,2,0,0,0,1,0,2,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,0,2,0,3,2,0,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+0,0,2,0,0,0,0,1,1,0,0,2,1,2,0,2,2,0,1,0,0,1,0,0,0,2,0,0,0,0,0,0,
+0,3,0,2,2,2,0,0,2,0,0,0,2,0,0,0,2,3,0,2,0,0,0,0,0,0,2,2,0,0,0,2,
+0,1,2,0,0,0,1,2,2,1,0,0,0,2,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,1,2,0,2,2,0,2,0,0,2,0,0,0,0,1,2,1,0,2,1,0,0,0,0,0,0,0,0,0,0,
+0,0,2,0,0,0,3,1,2,2,0,2,0,0,0,0,2,0,0,0,2,0,0,3,0,0,0,0,2,2,2,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,1,0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,2,
+0,2,2,0,0,2,2,2,2,2,0,1,2,0,0,0,2,2,0,1,0,2,0,0,2,2,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,0,0,0,0,2,0,2,0,0,0,0,2,
+0,1,2,0,0,0,0,2,2,1,0,1,0,1,0,2,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
+0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,2,0,0,2,2,0,0,0,0,1,0,0,0,0,0,0,2,
+0,2,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,
+0,2,2,2,2,0,0,0,3,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,1,
+0,0,2,0,0,0,0,1,2,0,0,0,0,0,0,2,2,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
+0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,2,2,2,0,0,0,2,0,0,0,0,0,0,0,0,2,
+0,0,1,0,0,0,0,2,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+0,3,0,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,2,
+0,0,2,0,0,0,0,2,2,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,0,2,2,1,0,0,0,0,0,0,2,0,0,2,0,2,2,2,0,0,0,0,0,0,2,0,0,0,0,2,
+0,0,2,0,0,2,0,2,2,0,0,0,0,2,0,2,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,
+0,0,3,0,0,0,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,
+0,2,2,2,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,
+0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,2,0,0,0,2,0,0,0,0,0,1,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,2,0,0,0,
+0,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,2,0,2,0,0,0,
+0,0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+)
+
+Latin7GreekModel = {
+  'charToOrderMap': Latin7_CharToOrderMap,
+  'precedenceMatrix': GreekLangModel,
+  'mTypicalPositiveRatio': 0.982851,
+  'keepEnglishLetter': False,
+  'charsetName': "ISO-8859-7"
+}
+
+Win1253GreekModel = {
+  'charToOrderMap': win1253_CharToOrderMap,
+  'precedenceMatrix': GreekLangModel,
+  'mTypicalPositiveRatio': 0.982851,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1253"
+}
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langhebrewmodel.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langhebrewmodel.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langhebrewmodel.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langhebrewmodel.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,201 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+#          Simon Montagu
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#   Shoshannah Forbes - original C code (?)
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Windows-1255 language model
+# Character Mapping Table:
+win1255_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 69, 91, 79, 80, 92, 89, 97, 90, 68,111,112, 82, 73, 95, 85,  # 40
+ 78,121, 86, 71, 67,102,107, 84,114,103,115,253,253,253,253,253,  # 50
+253, 50, 74, 60, 61, 42, 76, 70, 64, 53,105, 93, 56, 65, 54, 49,  # 60
+ 66,110, 51, 43, 44, 63, 81, 77, 98, 75,108,253,253,253,253,253,  # 70
+124,202,203,204,205, 40, 58,206,207,208,209,210,211,212,213,214,
+215, 83, 52, 47, 46, 72, 32, 94,216,113,217,109,218,219,220,221,
+ 34,116,222,118,100,223,224,117,119,104,125,225,226, 87, 99,227,
+106,122,123,228, 55,229,230,101,231,232,120,233, 48, 39, 57,234,
+ 30, 59, 41, 88, 33, 37, 36, 31, 29, 35,235, 62, 28,236,126,237,
+238, 38, 45,239,240,241,242,243,127,244,245,246,247,248,249,250,
+  9,  8, 20, 16,  3,  2, 24, 14, 22,  1, 25, 15,  4, 11,  6, 23,
+ 12, 19, 13, 26, 18, 27, 21, 17,  7, 10,  5,251,252,128, 96,253,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 98.4004%
+# first 1024 sequences: 1.5981%
+# rest  sequences:      0.087%
+# negative sequences:   0.0015%
+HebrewLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,3,2,1,2,0,1,0,0,
+3,0,3,1,0,0,1,3,2,0,1,1,2,0,2,2,2,1,1,1,1,2,1,1,1,2,0,0,2,2,0,1,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,
+1,2,1,2,1,2,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,
+1,2,1,3,1,1,0,0,2,0,0,0,1,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,1,2,2,1,3,
+1,2,1,1,2,2,0,0,2,2,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,1,0,1,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,2,2,2,3,2,
+1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,3,2,2,3,2,2,2,1,2,2,2,2,
+1,2,1,1,2,2,0,1,2,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,0,2,2,2,2,2,
+0,2,0,2,2,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,0,2,2,2,
+0,2,1,2,2,2,0,0,2,1,0,0,0,0,1,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,2,1,2,3,2,2,2,
+1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,2,0,2,
+0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,2,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,2,2,3,2,1,2,1,1,1,
+0,1,1,1,1,1,3,0,1,0,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,0,1,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,
+0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,2,1,2,3,3,2,3,3,3,3,2,3,2,1,2,0,2,1,2,
+0,2,0,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,1,2,2,3,3,2,3,2,3,2,2,3,1,2,2,0,2,2,2,
+0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,2,2,3,3,3,3,1,3,2,2,2,
+0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,2,3,2,2,2,1,2,2,0,2,2,2,2,
+0,2,0,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,1,3,2,3,3,2,3,3,2,2,1,2,2,2,2,2,2,
+0,2,1,2,1,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,2,3,3,2,3,3,3,3,2,3,2,3,3,3,3,3,2,2,2,2,2,2,2,1,
+0,2,0,1,2,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,2,1,2,3,3,3,3,3,3,3,2,3,2,3,2,1,2,3,0,2,1,2,2,
+0,2,1,1,2,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,2,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,3,2,1,3,1,2,2,2,1,2,3,3,1,2,1,2,2,2,2,
+0,1,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,0,2,3,3,3,1,3,3,3,1,2,2,2,2,1,1,2,2,2,2,2,2,
+0,2,0,1,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,3,3,2,2,3,3,3,2,1,2,3,2,3,2,2,2,2,1,2,1,1,1,2,2,
+0,2,1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,1,0,0,0,0,0,
+1,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,2,3,3,2,3,1,2,2,2,2,3,2,3,1,1,2,2,1,2,2,1,1,0,2,2,2,2,
+0,1,0,1,2,2,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,0,0,1,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,2,0,
+0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,1,0,1,0,1,1,0,1,1,0,0,0,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+3,2,2,1,2,2,2,2,2,2,2,1,2,2,1,2,2,1,1,1,1,1,1,1,1,2,1,1,0,3,3,3,
+0,3,0,2,2,2,2,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,1,2,2,2,1,1,1,2,0,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,1,0,2,1,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+0,3,1,1,2,2,2,2,2,1,2,2,2,1,1,2,2,2,2,2,2,2,1,2,2,1,0,1,1,1,1,0,
+0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,1,1,1,1,2,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
+0,0,2,0,0,0,0,0,0,0,0,1,1,0,0,0,0,1,1,0,0,1,1,0,0,0,0,0,0,1,0,0,
+2,1,1,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,1,2,1,2,1,1,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,1,2,2,2,2,2,2,2,2,2,2,1,2,1,2,1,1,2,1,1,1,2,1,2,1,2,0,1,0,1,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,1,2,2,2,1,2,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,2,1,2,1,1,0,1,0,1,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,
+0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,1,1,1,1,1,1,0,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2,0,1,1,1,0,1,0,0,0,1,1,0,1,1,0,0,0,0,0,1,1,0,0,
+0,1,1,1,2,1,2,2,2,0,2,0,2,0,1,1,2,1,1,1,1,2,1,0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,1,0,0,0,0,0,1,0,1,2,2,0,1,0,0,1,1,2,2,1,2,0,2,0,0,0,1,2,0,1,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2,0,2,1,2,0,2,0,0,1,1,1,1,1,1,0,1,0,0,0,1,0,0,1,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,1,2,2,0,0,1,0,0,0,1,0,0,1,
+1,1,2,1,0,1,1,1,0,1,0,1,1,1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,2,1,
+0,2,0,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,0,0,1,0,1,1,1,1,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,1,0,0,0,1,1,0,1,
+2,0,1,0,1,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,1,0,1,0,0,1,1,2,1,1,2,0,1,0,0,0,1,1,0,1,
+1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,0,0,2,1,1,2,0,2,0,0,0,1,1,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,2,2,1,2,1,1,0,1,0,0,0,1,1,0,1,
+2,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,1,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,2,1,1,1,0,2,1,1,0,0,0,2,1,0,1,
+1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,0,2,1,1,0,1,0,0,0,1,1,0,1,
+2,2,1,1,1,0,1,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,0,1,2,1,0,2,0,0,0,1,1,0,1,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,
+0,1,0,0,2,0,2,1,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,1,0,1,0,0,1,0,0,0,1,0,0,1,
+1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,1,0,1,1,0,0,1,0,0,2,1,1,1,1,1,0,1,0,0,0,0,1,0,1,
+0,1,1,1,2,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,2,1,0,0,0,0,0,1,1,1,1,1,0,1,0,0,0,1,1,0,0,
+)
+
+Win1255HebrewModel = {
+  'charToOrderMap': win1255_CharToOrderMap,
+  'precedenceMatrix': HebrewLangModel,
+  'mTypicalPositiveRatio': 0.984004,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1255"
+}
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langhungarianmodel.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langhungarianmodel.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langhungarianmodel.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langhungarianmodel.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,225 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Character Mapping Table:
+Latin2_HungarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
+ 46, 71, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
+253,  2, 18, 26, 17,  1, 27, 12, 20,  9, 22,  7,  6, 13,  4,  8,
+ 23, 67, 10,  5,  3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
+159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,
+175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,
+191,192,193,194,195,196,197, 75,198,199,200,201,202,203,204,205,
+ 79,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
+221, 51, 81,222, 78,223,224,225,226, 44,227,228,229, 61,230,231,
+232,233,234, 58,235, 66, 59,236,237,238, 60, 69, 63,239,240,241,
+ 82, 14, 74,242, 70, 80,243, 72,244, 15, 83, 77, 84, 30, 76, 85,
+245,246,247, 25, 73, 42, 24,248,249,250, 31, 56, 29,251,252,253,
+)
+
+win1250HungarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
+ 46, 72, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
+253,  2, 18, 26, 17,  1, 27, 12, 20,  9, 22,  7,  6, 13,  4,  8,
+ 23, 67, 10,  5,  3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
+161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,
+177,178,179,180, 78,181, 69,182,183,184,185,186,187,188,189,190,
+191,192,193,194,195,196,197, 76,198,199,200,201,202,203,204,205,
+ 81,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
+221, 51, 83,222, 80,223,224,225,226, 44,227,228,229, 61,230,231,
+232,233,234, 58,235, 66, 59,236,237,238, 60, 70, 63,239,240,241,
+ 84, 14, 75,242, 71, 82,243, 73,244, 15, 85, 79, 86, 30, 77, 87,
+245,246,247, 25, 74, 42, 24,248,249,250, 31, 56, 29,251,252,253,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 94.7368%
+# first 1024 sequences:5.2623%
+# rest  sequences:     0.8894%
+# negative sequences:  0.0009%
+HungarianLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,2,3,3,1,1,2,2,2,2,2,1,2,
+3,2,2,3,3,3,3,3,2,3,3,3,3,3,3,1,2,3,3,3,3,2,3,3,1,1,3,3,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
+3,2,1,3,3,3,3,3,2,3,3,3,3,3,1,1,2,3,3,3,3,3,3,3,1,1,3,2,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,1,1,2,3,3,3,1,3,3,3,3,3,1,3,3,2,2,0,3,2,3,
+0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,3,3,2,3,3,2,2,3,2,3,2,0,3,2,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,3,3,3,3,2,3,3,3,1,2,3,2,2,3,1,2,3,3,2,2,0,3,3,3,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,3,2,3,3,3,3,2,3,3,3,3,0,2,3,2,
+0,0,0,1,1,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,1,1,1,3,3,2,1,3,2,2,3,2,1,3,2,2,1,0,3,3,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,2,2,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,3,2,2,3,1,1,3,2,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,1,3,3,3,3,3,2,2,1,3,3,3,0,1,1,2,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,2,0,3,2,3,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,1,3,2,2,2,3,1,1,3,3,1,1,0,3,3,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,2,3,3,3,3,3,1,2,3,2,2,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,2,2,2,3,1,3,3,2,2,1,3,3,3,1,1,3,1,2,3,2,3,2,2,2,1,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
+3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,2,2,3,2,1,0,3,2,0,1,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,1,0,3,3,3,3,0,2,3,0,0,2,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,2,3,3,2,2,2,2,3,3,0,1,2,3,2,3,2,2,3,2,1,2,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
+3,3,3,3,3,3,1,2,3,3,3,2,1,2,3,3,2,2,2,3,2,3,3,1,3,3,1,1,0,2,3,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,1,2,2,2,2,3,3,3,1,1,1,3,3,1,1,3,1,1,3,2,1,2,3,1,1,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,2,1,2,1,1,3,3,1,1,1,1,3,3,1,1,2,2,1,2,1,1,2,2,1,1,0,2,2,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,1,1,2,1,1,3,3,1,0,1,1,3,3,2,0,1,1,2,3,1,0,2,2,1,0,0,1,3,2,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,2,1,3,3,3,3,3,1,2,3,2,3,3,2,1,1,3,2,3,2,1,2,2,0,1,2,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,2,2,2,2,3,1,2,2,1,1,3,3,0,3,2,1,2,3,2,1,3,3,1,1,0,2,1,3,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,2,2,2,3,2,3,3,3,2,1,1,3,3,1,1,1,2,2,3,2,3,2,2,2,1,0,2,2,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+1,0,0,3,3,3,3,3,0,0,3,3,2,3,0,0,0,2,3,3,1,0,1,2,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,2,3,3,3,3,3,1,2,3,3,2,2,1,1,0,3,3,2,2,1,2,2,1,0,2,2,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,2,2,1,3,1,2,3,3,2,2,1,1,2,2,1,1,1,1,3,2,1,1,1,1,2,1,0,1,2,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+2,3,3,1,1,1,1,1,3,3,3,0,1,1,3,3,1,1,1,1,1,2,2,0,3,1,1,2,0,2,1,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,1,0,1,2,1,2,2,0,1,2,3,1,2,0,0,0,2,1,1,1,1,1,2,0,0,1,1,0,0,0,0,
+1,2,1,2,2,2,1,2,1,2,0,2,0,2,2,1,1,2,1,1,2,1,1,1,0,1,0,0,0,1,1,0,
+1,1,1,2,3,2,3,3,0,1,2,2,3,1,0,1,0,2,1,2,2,0,1,1,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,3,3,2,2,1,0,0,3,2,3,2,0,0,0,1,1,3,0,0,1,1,0,0,2,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,2,2,3,3,1,0,1,3,2,3,1,1,1,0,1,1,1,1,1,3,1,0,0,2,2,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,1,2,2,2,1,0,1,2,3,3,2,0,0,0,2,1,1,1,2,1,1,1,0,1,1,1,0,0,0,
+1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,2,1,1,1,1,1,1,0,1,1,1,0,0,1,1,
+3,2,2,1,0,0,1,1,2,2,0,3,0,1,2,1,1,0,0,1,1,1,0,1,1,1,1,0,2,1,1,1,
+2,2,1,1,1,2,1,2,1,1,1,1,1,1,1,2,1,1,1,2,3,1,1,1,1,1,1,1,1,1,0,1,
+2,3,3,0,1,0,0,0,3,3,1,0,0,1,2,2,1,0,0,0,0,2,0,0,1,1,1,0,2,1,1,1,
+2,1,1,1,1,1,1,2,1,1,0,1,1,0,1,1,1,0,1,2,1,1,0,1,1,1,1,1,1,1,0,1,
+2,3,3,0,1,0,0,0,2,2,0,0,0,0,1,2,2,0,0,0,0,1,0,0,1,1,0,0,2,0,1,0,
+2,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
+3,2,2,0,1,0,1,0,2,3,2,0,0,1,2,2,1,0,0,1,1,1,0,0,2,1,0,1,2,2,1,1,
+2,1,1,1,1,1,1,2,1,1,1,1,1,1,0,2,1,0,1,1,0,1,1,1,0,1,1,2,1,1,0,1,
+2,2,2,0,0,1,0,0,2,2,1,1,0,0,2,1,1,0,0,0,1,2,0,0,2,1,0,0,2,1,1,1,
+2,1,1,1,1,2,1,2,1,1,1,2,2,1,1,2,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,
+1,2,3,0,0,0,1,0,3,2,1,0,0,1,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,2,1,
+1,1,0,0,0,1,0,1,1,1,1,1,2,0,0,1,0,0,0,2,0,0,1,1,1,1,1,1,1,1,0,1,
+3,0,0,2,1,2,2,1,0,0,2,1,2,2,0,0,0,2,1,1,1,0,1,1,0,0,1,1,2,0,0,0,
+1,2,1,2,2,1,1,2,1,2,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,0,0,1,
+1,3,2,0,0,0,1,0,2,2,2,0,0,0,2,2,1,0,0,0,0,3,1,1,1,1,0,0,2,1,1,1,
+2,1,0,1,1,1,0,1,1,1,1,1,1,1,0,2,1,0,0,1,0,1,1,0,1,1,1,1,1,1,0,1,
+2,3,2,0,0,0,1,0,2,2,0,0,0,0,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,1,0,
+2,1,1,1,1,2,1,2,1,2,0,1,1,1,0,2,1,1,1,2,1,1,1,1,0,1,1,1,1,1,0,1,
+3,1,1,2,2,2,3,2,1,1,2,2,1,1,0,1,0,2,2,1,1,1,1,1,0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,0,0,0,0,0,2,2,0,0,0,0,2,2,1,0,0,0,1,1,0,0,1,2,0,0,2,1,1,1,
+2,2,1,1,1,2,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,1,1,0,1,2,1,1,1,0,1,
+1,0,0,1,2,3,2,1,0,0,2,0,1,1,0,0,0,1,1,1,1,0,1,1,0,0,1,0,0,0,0,0,
+1,2,1,2,1,2,1,1,1,2,0,2,1,1,1,0,1,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
+2,3,2,0,0,0,0,0,1,1,2,1,0,0,1,1,1,0,0,0,0,2,0,0,1,1,0,0,2,1,1,1,
+2,1,1,1,1,1,1,2,1,0,1,1,1,1,0,2,1,1,1,1,1,1,0,1,0,1,1,1,1,1,0,1,
+1,2,2,0,1,1,1,0,2,2,2,0,0,0,3,2,1,0,0,0,1,1,0,0,1,1,0,1,1,1,0,0,
+1,1,0,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,0,0,1,1,1,0,1,0,1,
+2,1,0,2,1,1,2,2,1,1,2,1,1,1,0,0,0,1,1,0,1,1,1,1,0,0,1,1,1,0,0,0,
+1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,1,0,
+1,2,3,0,0,0,1,0,2,2,0,0,0,0,2,2,0,0,0,0,0,1,0,0,1,0,0,0,2,0,1,0,
+2,1,1,1,1,1,0,2,0,0,0,1,2,1,1,1,1,0,1,2,0,1,0,1,0,1,1,1,0,1,0,1,
+2,2,2,0,0,0,1,0,2,1,2,0,0,0,1,1,2,0,0,0,0,1,0,0,1,1,0,0,2,1,0,1,
+2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
+1,2,2,0,0,0,1,0,2,2,2,0,0,0,1,1,0,0,0,0,0,1,1,0,2,0,0,1,1,1,0,1,
+1,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,0,0,1,1,0,1,0,1,1,1,1,1,0,0,0,1,
+1,0,0,1,0,1,2,1,0,0,1,1,1,2,0,0,0,1,1,0,1,0,1,1,0,0,1,0,0,0,0,0,
+0,2,1,2,1,1,1,1,1,2,0,2,0,1,1,0,1,2,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
+2,1,1,0,1,2,0,0,1,1,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,0,0,0,2,1,0,1,
+2,2,1,1,1,1,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,0,1,0,1,1,1,1,1,0,1,
+1,2,2,0,0,0,0,0,1,1,0,0,0,0,2,1,0,0,0,0,0,2,0,0,2,2,0,0,2,0,0,1,
+2,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,0,0,0,1,1,1,1,0,0,1,1,1,1,0,0,1,
+1,1,2,0,0,3,1,0,2,1,1,1,0,0,1,1,1,0,0,0,1,1,0,0,0,1,0,0,1,0,1,0,
+1,2,1,0,1,1,1,2,1,1,0,1,1,1,1,1,0,0,0,1,1,1,1,1,0,1,0,0,0,1,0,0,
+2,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,2,0,0,0,
+2,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,1,0,1,
+2,1,1,1,2,1,1,1,0,1,1,2,1,0,0,0,0,1,1,1,1,0,1,0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,1,1,0,0,1,1,2,1,0,0,0,1,1,0,0,0,1,1,0,0,1,0,1,0,0,0,
+1,2,1,1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
+2,0,0,0,1,1,1,1,0,0,1,1,0,0,0,0,0,1,1,1,2,0,0,1,0,0,1,0,1,0,0,0,
+0,1,1,1,1,1,1,1,1,2,0,1,1,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,1,1,0,0,2,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,1,1,0,1,0,1,1,0,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,1,1,0,1,0,1,0,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,0,1,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1,1,1,0,1,0,0,1,1,0,1,0,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
+2,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,0,1,0,0,1,0,1,0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,1,0,0,0,1,1,1,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,1,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
+)
+
+Latin2HungarianModel = {
+  'charToOrderMap': Latin2_HungarianCharToOrderMap,
+  'precedenceMatrix': HungarianLangModel,
+  'mTypicalPositiveRatio': 0.947368,
+  'keepEnglishLetter': True,
+  'charsetName': "ISO-8859-2"
+}
+
+Win1250HungarianModel = {
+  'charToOrderMap': win1250HungarianCharToOrderMap,
+  'precedenceMatrix': HungarianLangModel,
+  'mTypicalPositiveRatio': 0.947368,
+  'keepEnglishLetter': True,
+  'charsetName': "windows-1250"
+}
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langthaimodel.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langthaimodel.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/langthaimodel.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/langthaimodel.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,200 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# The following result for thai was collected from a limited sample (1M).
+
+# Character Mapping Table:
+TIS620CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,182,106,107,100,183,184,185,101, 94,186,187,108,109,110,111,  # 40
+188,189,190, 89, 95,112,113,191,192,193,194,253,253,253,253,253,  # 50
+253, 64, 72, 73,114, 74,115,116,102, 81,201,117, 90,103, 78, 82,  # 60
+ 96,202, 91, 79, 84,104,105, 97, 98, 92,203,253,253,253,253,253,  # 70
+209,210,211,212,213, 88,214,215,216,217,218,219,220,118,221,222,
+223,224, 99, 85, 83,225,226,227,228,229,230,231,232,233,234,235,
+236,  5, 30,237, 24,238, 75,  8, 26, 52, 34, 51,119, 47, 58, 57,
+ 49, 53, 55, 43, 20, 19, 44, 14, 48,  3, 17, 25, 39, 62, 31, 54,
+ 45,  9, 16,  2, 61, 15,239, 12, 42, 46, 18, 21, 76,  4, 66, 63,
+ 22, 10,  1, 36, 23, 13, 40, 27, 32, 35, 86,240,241,242,243,244,
+ 11, 28, 41, 29, 33,245, 50, 37,  6,  7, 67, 77, 38, 93,246,247,
+ 68, 56, 59, 65, 69, 60, 70, 80, 71, 87,248,249,250,251,252,253,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 92.6386%
+# first 1024 sequences:7.3177%
+# rest  sequences:     1.0230%
+# negative sequences:  0.0436%
+ThaiLangModel = (
+0,1,3,3,3,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,0,0,3,3,3,0,3,3,3,3,
+0,3,3,0,0,0,1,3,0,3,3,2,3,3,0,1,2,3,3,3,3,0,2,0,2,0,0,3,2,1,2,2,
+3,0,3,3,2,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,0,3,2,3,0,2,2,2,3,
+0,2,3,0,0,0,0,1,0,1,2,3,1,1,3,2,2,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,
+3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,3,3,2,3,2,3,3,2,2,2,
+3,1,2,3,0,3,3,2,2,1,2,3,3,1,2,0,1,3,0,1,0,0,1,0,0,0,0,0,0,0,1,1,
+3,3,2,2,3,3,3,3,1,2,3,3,3,3,3,2,2,2,2,3,3,2,2,3,3,2,2,3,2,3,2,2,
+3,3,1,2,3,1,2,2,3,3,1,0,2,1,0,0,3,1,2,1,0,0,1,0,0,0,0,0,0,1,0,1,
+3,3,3,3,3,3,2,2,3,3,3,3,2,3,2,2,3,3,2,2,3,2,2,2,2,1,1,3,1,2,1,1,
+3,2,1,0,2,1,0,1,0,1,1,0,1,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,
+3,3,3,2,3,2,3,3,2,2,3,2,3,3,2,3,1,1,2,3,2,2,2,3,2,2,2,2,2,1,2,1,
+2,2,1,1,3,3,2,1,0,1,2,2,0,1,3,0,0,0,1,1,0,0,0,0,0,2,3,0,0,2,1,1,
+3,3,2,3,3,2,0,0,3,3,0,3,3,0,2,2,3,1,2,2,1,1,1,0,2,2,2,0,2,2,1,1,
+0,2,1,0,2,0,0,2,0,1,0,0,1,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,2,3,3,2,0,0,3,3,0,2,3,0,2,1,2,2,2,2,1,2,0,0,2,2,2,0,2,2,1,1,
+0,2,1,0,2,0,0,2,0,1,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,
+3,3,2,3,2,3,2,0,2,2,1,3,2,1,3,2,1,2,3,2,2,3,0,2,3,2,2,1,2,2,2,2,
+1,2,2,0,0,0,0,2,0,1,2,0,1,1,1,0,1,0,3,1,1,0,0,0,0,0,0,0,0,0,1,0,
+3,3,2,3,3,2,3,2,2,2,3,2,2,3,2,2,1,2,3,2,2,3,1,3,2,2,2,3,2,2,2,3,
+3,2,1,3,0,1,1,1,0,2,1,1,1,1,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,2,0,0,
+1,0,0,3,0,3,3,3,3,3,0,0,3,0,2,2,3,3,3,3,3,0,0,0,1,1,3,0,0,0,0,2,
+0,0,1,0,0,0,0,0,0,0,2,3,0,0,0,3,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
+2,0,3,3,3,3,0,0,2,3,0,0,3,0,3,3,2,3,3,3,3,3,0,0,3,3,3,0,0,0,3,3,
+0,0,3,0,0,0,0,2,0,0,2,1,1,3,0,0,1,0,0,2,3,0,1,0,0,0,0,0,0,0,1,0,
+3,3,3,3,2,3,3,3,3,3,3,3,1,2,1,3,3,2,2,1,2,2,2,3,1,1,2,0,2,1,2,1,
+2,2,1,0,0,0,1,1,0,1,0,1,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,
+3,0,2,1,2,3,3,3,0,2,0,2,2,0,2,1,3,2,2,1,2,1,0,0,2,2,1,0,2,1,2,2,
+0,1,1,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,1,3,3,1,1,3,0,2,3,1,1,3,2,1,1,2,0,2,2,3,2,1,1,1,1,1,2,
+3,0,0,1,3,1,2,1,2,0,3,0,0,0,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
+3,3,1,1,3,2,3,3,3,1,3,2,1,3,2,1,3,2,2,2,2,1,3,3,1,2,1,3,1,2,3,0,
+2,1,1,3,2,2,2,1,2,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
+3,3,2,3,2,3,3,2,3,2,3,2,3,3,2,1,0,3,2,2,2,1,2,2,2,1,2,2,1,2,1,1,
+2,2,2,3,0,1,3,1,1,1,1,0,1,1,0,2,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,3,2,2,1,1,3,2,3,2,3,2,0,3,2,2,1,2,0,2,2,2,1,2,2,2,2,1,
+3,2,1,2,2,1,0,2,0,1,0,0,1,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,2,3,1,2,3,3,2,2,3,0,1,1,2,0,3,3,2,2,3,0,1,1,3,0,0,0,0,
+3,1,0,3,3,0,2,0,2,1,0,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,2,3,2,3,3,0,1,3,1,1,2,1,2,1,1,3,1,1,0,2,3,1,1,1,1,1,1,1,1,
+3,1,1,2,2,2,2,1,1,1,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,2,2,1,1,2,1,3,3,2,3,2,2,3,2,2,3,1,2,2,1,2,0,3,2,1,2,2,2,2,2,1,
+3,2,1,2,2,2,1,1,1,1,0,0,1,1,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,1,3,3,0,2,1,0,3,2,0,0,3,1,0,1,1,0,1,0,0,0,0,0,1,
+1,0,0,1,0,3,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,2,2,2,3,0,0,1,3,0,3,2,0,3,2,2,3,3,3,3,3,1,0,2,2,2,0,2,2,1,2,
+0,2,3,0,0,0,0,1,0,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,0,2,3,1,3,3,2,3,3,0,3,3,0,3,2,2,3,2,3,3,3,0,0,2,2,3,0,1,1,1,3,
+0,0,3,0,0,0,2,2,0,1,3,0,1,2,2,2,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,
+3,2,3,3,2,0,3,3,2,2,3,1,3,2,1,3,2,0,1,2,2,0,2,3,2,1,0,3,0,0,0,0,
+3,0,0,2,3,1,3,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,3,2,2,2,1,2,0,1,3,1,1,3,1,3,0,0,2,1,1,1,1,2,1,1,1,0,2,1,0,1,
+1,2,0,0,0,3,1,1,0,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,0,3,1,0,0,0,1,0,
+3,3,3,3,2,2,2,2,2,1,3,1,1,1,2,0,1,1,2,1,2,1,3,2,0,0,3,1,1,1,1,1,
+3,1,0,2,3,0,0,0,3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2,3,0,3,3,0,2,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,2,3,1,3,0,0,1,2,0,0,2,0,3,3,2,3,3,3,2,3,0,0,2,2,2,0,0,0,2,2,
+0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+0,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,1,2,3,1,3,3,0,0,1,0,3,0,0,0,0,0,
+0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,1,2,3,1,2,3,1,0,3,0,2,2,1,0,2,1,1,2,0,1,0,0,1,1,1,1,0,1,0,0,
+1,0,0,0,0,1,1,0,3,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,1,0,1,1,1,3,1,2,2,2,2,2,2,1,1,1,1,0,3,1,0,1,3,1,1,1,1,
+1,1,0,2,0,1,3,1,1,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,1,
+3,0,2,2,1,3,3,2,3,3,0,1,1,0,2,2,1,2,1,3,3,1,0,0,3,2,0,0,0,0,2,1,
+0,1,0,0,0,0,1,2,0,1,1,3,1,1,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,0,3,0,0,1,0,0,0,3,0,0,3,0,3,1,0,1,1,1,3,2,0,0,0,3,0,0,0,0,2,0,
+0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,1,3,2,1,3,3,1,2,2,0,1,2,1,0,1,2,0,0,0,0,0,3,0,0,0,3,0,0,0,0,
+3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,1,2,0,3,3,3,2,2,0,1,1,0,1,3,0,0,0,2,2,0,0,0,0,3,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,2,3,1,2,0,0,2,1,0,3,1,0,1,2,0,1,1,1,1,3,0,0,3,1,1,0,2,2,1,1,
+0,2,0,0,0,0,0,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,3,1,2,0,0,2,2,0,1,2,0,1,0,1,3,1,2,1,0,0,0,2,0,3,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,1,1,2,2,0,0,0,2,0,2,1,0,1,1,0,1,1,1,2,1,0,0,1,1,1,0,2,1,1,1,
+0,1,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,1,
+0,0,0,2,0,1,3,1,1,1,1,0,0,0,0,3,2,0,1,0,0,0,1,2,0,0,0,1,0,0,0,0,
+0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,2,3,2,2,0,0,0,1,0,0,0,0,2,3,2,1,2,2,3,0,0,0,2,3,1,0,0,0,1,1,
+0,0,1,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,
+3,3,2,2,0,1,0,0,0,0,2,0,2,0,1,0,0,0,1,1,0,0,0,2,1,0,1,0,1,1,0,0,
+0,1,0,2,0,0,1,0,3,0,1,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,1,0,0,1,0,0,0,0,0,1,1,2,0,0,0,0,1,0,0,1,3,1,0,0,0,0,1,1,0,0,
+0,1,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,
+3,3,1,1,1,1,2,3,0,0,2,1,1,1,1,1,0,2,1,1,0,0,0,2,1,0,1,2,1,1,0,1,
+2,1,0,3,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,3,1,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,
+0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,2,0,0,0,0,0,0,1,2,1,0,1,1,0,2,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,2,0,0,0,1,3,0,1,0,0,0,2,0,0,0,0,0,0,0,1,2,0,0,0,0,0,
+3,3,0,0,1,1,2,0,0,1,2,1,0,1,1,1,0,1,1,0,0,2,1,1,0,1,0,0,1,1,1,0,
+0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,1,0,0,0,0,1,0,0,0,0,3,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,0,0,1,1,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,0,1,2,0,1,2,0,0,1,1,0,2,0,1,0,0,1,0,0,0,0,1,0,0,0,2,0,0,0,0,
+1,0,0,1,0,1,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,1,1,0,1,1,0,2,1,3,0,0,0,0,1,1,0,0,0,0,0,0,0,3,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,1,0,1,0,0,2,0,0,2,0,0,1,1,2,0,0,1,1,0,0,0,1,0,0,0,1,1,0,0,0,
+1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,3,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,
+1,0,0,0,0,0,0,0,0,1,0,0,0,0,2,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,2,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+)
+
+TIS620ThaiModel = {
+  'charToOrderMap': TIS620CharToOrderMap,
+  'precedenceMatrix': ThaiLangModel,
+  'mTypicalPositiveRatio': 0.926386,
+  'keepEnglishLetter': False,
+  'charsetName': "TIS-620"
+}
+
+# flake8: noqa
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/latin1prober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/latin1prober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/latin1prober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/latin1prober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,139 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetprober import CharSetProber
+from .constants import eNotMe
+from .compat import wrap_ord
+
+FREQ_CAT_NUM = 4
+
+UDF = 0  # undefined
+OTH = 1  # other
+ASC = 2  # ascii capital letter
+ASS = 3  # ascii small letter
+ACV = 4  # accent capital vowel
+ACO = 5  # accent capital other
+ASV = 6  # accent small vowel
+ASO = 7  # accent small other
+CLASS_NUM = 8  # total classes
+
+Latin1_CharToClass = (
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 00 - 07
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 08 - 0F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 10 - 17
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 18 - 1F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 20 - 27
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 28 - 2F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 30 - 37
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 38 - 3F
+    OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 40 - 47
+    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 48 - 4F
+    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 50 - 57
+    ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH,   # 58 - 5F
+    OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 60 - 67
+    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 68 - 6F
+    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 70 - 77
+    ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH,   # 78 - 7F
+    OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH,   # 80 - 87
+    OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF,   # 88 - 8F
+    UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 90 - 97
+    OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO,   # 98 - 9F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A0 - A7
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A8 - AF
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B0 - B7
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B8 - BF
+    ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO,   # C0 - C7
+    ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV,   # C8 - CF
+    ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH,   # D0 - D7
+    ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO,   # D8 - DF
+    ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO,   # E0 - E7
+    ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV,   # E8 - EF
+    ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH,   # F0 - F7
+    ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO,   # F8 - FF
+)
+
+# 0 : illegal
+# 1 : very unlikely
+# 2 : normal
+# 3 : very likely
+Latin1ClassModel = (
+    # UDF OTH ASC ASS ACV ACO ASV ASO
+    0,  0,  0,  0,  0,  0,  0,  0,  # UDF
+    0,  3,  3,  3,  3,  3,  3,  3,  # OTH
+    0,  3,  3,  3,  3,  3,  3,  3,  # ASC
+    0,  3,  3,  3,  1,  1,  3,  3,  # ASS
+    0,  3,  3,  3,  1,  2,  1,  2,  # ACV
+    0,  3,  3,  3,  3,  3,  3,  3,  # ACO
+    0,  3,  1,  3,  1,  1,  1,  3,  # ASV
+    0,  3,  1,  3,  1,  1,  3,  3,  # ASO
+)
+
+
+class Latin1Prober(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self.reset()
+
+    def reset(self):
+        self._mLastCharClass = OTH
+        self._mFreqCounter = [0] * FREQ_CAT_NUM
+        CharSetProber.reset(self)
+
+    def get_charset_name(self):
+        return "windows-1252"
+
+    def feed(self, aBuf):
+        aBuf = self.filter_with_english_letters(aBuf)
+        for c in aBuf:
+            charClass = Latin1_CharToClass[wrap_ord(c)]
+            freq = Latin1ClassModel[(self._mLastCharClass * CLASS_NUM)
+                                    + charClass]
+            if freq == 0:
+                self._mState = eNotMe
+                break
+            self._mFreqCounter[freq] += 1
+            self._mLastCharClass = charClass
+
+        return self.get_state()
+
+    def get_confidence(self):
+        if self.get_state() == eNotMe:
+            return 0.01
+
+        total = sum(self._mFreqCounter)
+        if total < 0.01:
+            confidence = 0.0
+        else:
+            confidence = ((self._mFreqCounter[3] - self._mFreqCounter[1] * 20.0)
+                          / total)
+        if confidence < 0.0:
+            confidence = 0.0
+        # lower the confidence of latin1 so that other more accurate
+        # detector can take priority.
+        confidence = confidence * 0.73
+        return confidence
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/mbcharsetprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/mbcharsetprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/mbcharsetprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/mbcharsetprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,86 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#   Proofpoint, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from . import constants
+from .charsetprober import CharSetProber
+
+
+class MultiByteCharSetProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mDistributionAnalyzer = None
+        self._mCodingSM = None
+        self._mLastChar = [0, 0]
+
+    def reset(self):
+        CharSetProber.reset(self)
+        if self._mCodingSM:
+            self._mCodingSM.reset()
+        if self._mDistributionAnalyzer:
+            self._mDistributionAnalyzer.reset()
+        self._mLastChar = [0, 0]
+
+    def get_charset_name(self):
+        pass
+
+    def feed(self, aBuf):
+        aLen = len(aBuf)
+        for i in range(0, aLen):
+            codingState = self._mCodingSM.next_state(aBuf[i])
+            if codingState == constants.eError:
+                if constants._debug:
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                charLen = self._mCodingSM.get_current_charlen()
+                if i == 0:
+                    self._mLastChar[1] = aBuf[0]
+                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
+                else:
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
+        self._mLastChar[0] = aBuf[aLen - 1]
+
+        if self.get_state() == constants.eDetecting:
+            if (self._mDistributionAnalyzer.got_enough_data() and
+                    (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        return self._mDistributionAnalyzer.get_confidence()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/mbcsgroupprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/mbcsgroupprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/mbcsgroupprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/mbcsgroupprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,54 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#   Proofpoint, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetgroupprober import CharSetGroupProber
+from .utf8prober import UTF8Prober
+from .sjisprober import SJISProber
+from .eucjpprober import EUCJPProber
+from .gb2312prober import GB2312Prober
+from .euckrprober import EUCKRProber
+from .cp949prober import CP949Prober
+from .big5prober import Big5Prober
+from .euctwprober import EUCTWProber
+
+
+class MBCSGroupProber(CharSetGroupProber):
+    def __init__(self):
+        CharSetGroupProber.__init__(self)
+        self._mProbers = [
+            UTF8Prober(),
+            SJISProber(),
+            EUCJPProber(),
+            GB2312Prober(),
+            EUCKRProber(),
+            CP949Prober(),
+            Big5Prober(),
+            EUCTWProber()
+        ]
+        self.reset()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/mbcssm.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/mbcssm.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/mbcssm.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/mbcssm.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,572 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .constants import eStart, eError, eItsMe
+
+# BIG5
+
+BIG5_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07    #allow 0x00 as legal value
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,1,  # 78 - 7f
+    4,4,4,4,4,4,4,4,  # 80 - 87
+    4,4,4,4,4,4,4,4,  # 88 - 8f
+    4,4,4,4,4,4,4,4,  # 90 - 97
+    4,4,4,4,4,4,4,4,  # 98 - 9f
+    4,3,3,3,3,3,3,3,  # a0 - a7
+    3,3,3,3,3,3,3,3,  # a8 - af
+    3,3,3,3,3,3,3,3,  # b0 - b7
+    3,3,3,3,3,3,3,3,  # b8 - bf
+    3,3,3,3,3,3,3,3,  # c0 - c7
+    3,3,3,3,3,3,3,3,  # c8 - cf
+    3,3,3,3,3,3,3,3,  # d0 - d7
+    3,3,3,3,3,3,3,3,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,3,3,3,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,3,3,0  # f8 - ff
+)
+
+BIG5_st = (
+    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07
+    eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,#08-0f
+    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart#10-17
+)
+
+Big5CharLenTable = (0, 1, 1, 2, 0)
+
+Big5SMModel = {'classTable': BIG5_cls,
+               'classFactor': 5,
+               'stateTable': BIG5_st,
+               'charLenTable': Big5CharLenTable,
+               'name': 'Big5'}
+
+# CP949
+
+CP949_cls  = (
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,0,0,  # 00 - 0f
+    1,1,1,1,1,1,1,1, 1,1,1,0,1,1,1,1,  # 10 - 1f
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,  # 20 - 2f
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,  # 30 - 3f
+    1,4,4,4,4,4,4,4, 4,4,4,4,4,4,4,4,  # 40 - 4f
+    4,4,5,5,5,5,5,5, 5,5,5,1,1,1,1,1,  # 50 - 5f
+    1,5,5,5,5,5,5,5, 5,5,5,5,5,5,5,5,  # 60 - 6f
+    5,5,5,5,5,5,5,5, 5,5,5,1,1,1,1,1,  # 70 - 7f
+    0,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6,  # 80 - 8f
+    6,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6,  # 90 - 9f
+    6,7,7,7,7,7,7,7, 7,7,7,7,7,8,8,8,  # a0 - af
+    7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,  # b0 - bf
+    7,7,7,7,7,7,9,2, 2,3,2,2,2,2,2,2,  # c0 - cf
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,  # d0 - df
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,  # e0 - ef
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,0,  # f0 - ff
+)
+
+CP949_st = (
+#cls=    0      1      2      3      4      5      6      7      8      9  # previous state =
+    eError,eStart,     3,eError,eStart,eStart,     4,     5,eError,     6, # eStart
+    eError,eError,eError,eError,eError,eError,eError,eError,eError,eError, # eError
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe, # eItsMe
+    eError,eError,eStart,eStart,eError,eError,eError,eStart,eStart,eStart, # 3
+    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 4
+    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 5
+    eError,eStart,eStart,eStart,eStart,eError,eError,eStart,eStart,eStart, # 6
+)
+
+CP949CharLenTable = (0, 1, 2, 0, 1, 1, 2, 2, 0, 2)
+
+CP949SMModel = {'classTable': CP949_cls,
+                'classFactor': 10,
+                'stateTable': CP949_st,
+                'charLenTable': CP949CharLenTable,
+                'name': 'CP949'}
+
+# EUC-JP
+
+EUCJP_cls = (
+    4,4,4,4,4,4,4,4,  # 00 - 07
+    4,4,4,4,4,4,5,5,  # 08 - 0f
+    4,4,4,4,4,4,4,4,  # 10 - 17
+    4,4,4,5,4,4,4,4,  # 18 - 1f
+    4,4,4,4,4,4,4,4,  # 20 - 27
+    4,4,4,4,4,4,4,4,  # 28 - 2f
+    4,4,4,4,4,4,4,4,  # 30 - 37
+    4,4,4,4,4,4,4,4,  # 38 - 3f
+    4,4,4,4,4,4,4,4,  # 40 - 47
+    4,4,4,4,4,4,4,4,  # 48 - 4f
+    4,4,4,4,4,4,4,4,  # 50 - 57
+    4,4,4,4,4,4,4,4,  # 58 - 5f
+    4,4,4,4,4,4,4,4,  # 60 - 67
+    4,4,4,4,4,4,4,4,  # 68 - 6f
+    4,4,4,4,4,4,4,4,  # 70 - 77
+    4,4,4,4,4,4,4,4,  # 78 - 7f
+    5,5,5,5,5,5,5,5,  # 80 - 87
+    5,5,5,5,5,5,1,3,  # 88 - 8f
+    5,5,5,5,5,5,5,5,  # 90 - 97
+    5,5,5,5,5,5,5,5,  # 98 - 9f
+    5,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,2,2,2,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,2,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,0,5  # f8 - ff
+)
+
+EUCJP_st = (
+          3,     4,     3,     5,eStart,eError,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,eStart,eError,eStart,eError,eError,eError,#10-17
+     eError,eError,eStart,eError,eError,eError,     3,eError,#18-1f
+          3,eError,eError,eError,eStart,eStart,eStart,eStart#20-27
+)
+
+EUCJPCharLenTable = (2, 2, 2, 3, 1, 0)
+
+EUCJPSMModel = {'classTable': EUCJP_cls,
+                'classFactor': 6,
+                'stateTable': EUCJP_st,
+                'charLenTable': EUCJPCharLenTable,
+                'name': 'EUC-JP'}
+
+# EUC-KR
+
+EUCKR_cls  = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    1,1,1,1,1,1,1,1,  # 40 - 47
+    1,1,1,1,1,1,1,1,  # 48 - 4f
+    1,1,1,1,1,1,1,1,  # 50 - 57
+    1,1,1,1,1,1,1,1,  # 58 - 5f
+    1,1,1,1,1,1,1,1,  # 60 - 67
+    1,1,1,1,1,1,1,1,  # 68 - 6f
+    1,1,1,1,1,1,1,1,  # 70 - 77
+    1,1,1,1,1,1,1,1,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,3,3,3,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,3,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    2,2,2,2,2,2,2,2,  # e0 - e7
+    2,2,2,2,2,2,2,2,  # e8 - ef
+    2,2,2,2,2,2,2,2,  # f0 - f7
+    2,2,2,2,2,2,2,0   # f8 - ff
+)
+
+EUCKR_st = (
+    eError,eStart,     3,eError,eError,eError,eError,eError,#00-07
+    eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,eStart #08-0f
+)
+
+EUCKRCharLenTable = (0, 1, 2, 0)
+
+EUCKRSMModel = {'classTable': EUCKR_cls,
+                'classFactor': 4,
+                'stateTable': EUCKR_st,
+                'charLenTable': EUCKRCharLenTable,
+                'name': 'EUC-KR'}
+
+# EUC-TW
+
+EUCTW_cls = (
+    2,2,2,2,2,2,2,2,  # 00 - 07
+    2,2,2,2,2,2,0,0,  # 08 - 0f
+    2,2,2,2,2,2,2,2,  # 10 - 17
+    2,2,2,0,2,2,2,2,  # 18 - 1f
+    2,2,2,2,2,2,2,2,  # 20 - 27
+    2,2,2,2,2,2,2,2,  # 28 - 2f
+    2,2,2,2,2,2,2,2,  # 30 - 37
+    2,2,2,2,2,2,2,2,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,2,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,6,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,3,4,4,4,4,4,4,  # a0 - a7
+    5,5,1,1,1,1,1,1,  # a8 - af
+    1,1,1,1,1,1,1,1,  # b0 - b7
+    1,1,1,1,1,1,1,1,  # b8 - bf
+    1,1,3,1,3,3,3,3,  # c0 - c7
+    3,3,3,3,3,3,3,3,  # c8 - cf
+    3,3,3,3,3,3,3,3,  # d0 - d7
+    3,3,3,3,3,3,3,3,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,3,3,3,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,3,3,0   # f8 - ff
+)
+
+EUCTW_st = (
+    eError,eError,eStart,     3,     3,     3,     4,eError,#00-07
+    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eStart,eError,#10-17
+    eStart,eStart,eStart,eError,eError,eError,eError,eError,#18-1f
+         5,eError,eError,eError,eStart,eError,eStart,eStart,#20-27
+    eStart,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
+)
+
+EUCTWCharLenTable = (0, 0, 1, 2, 2, 2, 3)
+
+EUCTWSMModel = {'classTable': EUCTW_cls,
+                'classFactor': 7,
+                'stateTable': EUCTW_st,
+                'charLenTable': EUCTWCharLenTable,
+                'name': 'x-euc-tw'}
+
+# GB2312
+
+GB2312_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    3,3,3,3,3,3,3,3,  # 30 - 37
+    3,3,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,4,  # 78 - 7f
+    5,6,6,6,6,6,6,6,  # 80 - 87
+    6,6,6,6,6,6,6,6,  # 88 - 8f
+    6,6,6,6,6,6,6,6,  # 90 - 97
+    6,6,6,6,6,6,6,6,  # 98 - 9f
+    6,6,6,6,6,6,6,6,  # a0 - a7
+    6,6,6,6,6,6,6,6,  # a8 - af
+    6,6,6,6,6,6,6,6,  # b0 - b7
+    6,6,6,6,6,6,6,6,  # b8 - bf
+    6,6,6,6,6,6,6,6,  # c0 - c7
+    6,6,6,6,6,6,6,6,  # c8 - cf
+    6,6,6,6,6,6,6,6,  # d0 - d7
+    6,6,6,6,6,6,6,6,  # d8 - df
+    6,6,6,6,6,6,6,6,  # e0 - e7
+    6,6,6,6,6,6,6,6,  # e8 - ef
+    6,6,6,6,6,6,6,6,  # f0 - f7
+    6,6,6,6,6,6,6,0   # f8 - ff
+)
+
+GB2312_st = (
+    eError,eStart,eStart,eStart,eStart,eStart,     3,eError,#00-07
+    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,#10-17
+         4,eError,eStart,eStart,eError,eError,eError,eError,#18-1f
+    eError,eError,     5,eError,eError,eError,eItsMe,eError,#20-27
+    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
+)
+
+# To be accurate, the length of class 6 can be either 2 or 4.
+# But it is not necessary to discriminate between the two since
+# it is used for frequency analysis only, and we are validing
+# each code range there as well. So it is safe to set it to be
+# 2 here.
+GB2312CharLenTable = (0, 1, 1, 1, 1, 1, 2)
+
+GB2312SMModel = {'classTable': GB2312_cls,
+                  'classFactor': 7,
+                  'stateTable': GB2312_st,
+                  'charLenTable': GB2312CharLenTable,
+                  'name': 'GB2312'}
+
+# Shift_JIS
+
+SJIS_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,1,  # 78 - 7f
+    3,3,3,3,3,2,2,3,  # 80 - 87
+    3,3,3,3,3,3,3,3,  # 88 - 8f
+    3,3,3,3,3,3,3,3,  # 90 - 97
+    3,3,3,3,3,3,3,3,  # 98 - 9f
+    #0xa0 is illegal in sjis encoding, but some pages does
+    #contain such byte. We need to be more error forgiven.
+    2,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,2,2,2,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,2,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,4,4,4,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,0,0,0)  # f8 - ff
+
+
+SJIS_st = (
+    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07
+    eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eError,eError,eStart,eStart,eStart,eStart #10-17
+)
+
+SJISCharLenTable = (0, 1, 1, 2, 0, 0)
+
+SJISSMModel = {'classTable': SJIS_cls,
+               'classFactor': 6,
+               'stateTable': SJIS_st,
+               'charLenTable': SJISCharLenTable,
+               'name': 'Shift_JIS'}
+
+# UCS2-BE
+
+UCS2BE_cls = (
+    0,0,0,0,0,0,0,0,  # 00 - 07
+    0,0,1,0,0,2,0,0,  # 08 - 0f
+    0,0,0,0,0,0,0,0,  # 10 - 17
+    0,0,0,3,0,0,0,0,  # 18 - 1f
+    0,0,0,0,0,0,0,0,  # 20 - 27
+    0,3,3,3,3,3,0,0,  # 28 - 2f
+    0,0,0,0,0,0,0,0,  # 30 - 37
+    0,0,0,0,0,0,0,0,  # 38 - 3f
+    0,0,0,0,0,0,0,0,  # 40 - 47
+    0,0,0,0,0,0,0,0,  # 48 - 4f
+    0,0,0,0,0,0,0,0,  # 50 - 57
+    0,0,0,0,0,0,0,0,  # 58 - 5f
+    0,0,0,0,0,0,0,0,  # 60 - 67
+    0,0,0,0,0,0,0,0,  # 68 - 6f
+    0,0,0,0,0,0,0,0,  # 70 - 77
+    0,0,0,0,0,0,0,0,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,0,0,0,0,0,0,0,  # a0 - a7
+    0,0,0,0,0,0,0,0,  # a8 - af
+    0,0,0,0,0,0,0,0,  # b0 - b7
+    0,0,0,0,0,0,0,0,  # b8 - bf
+    0,0,0,0,0,0,0,0,  # c0 - c7
+    0,0,0,0,0,0,0,0,  # c8 - cf
+    0,0,0,0,0,0,0,0,  # d0 - d7
+    0,0,0,0,0,0,0,0,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,4,5   # f8 - ff
+)
+
+UCS2BE_st  = (
+          5,     7,     7,eError,     4,     3,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,     6,     6,     6,     6,eError,eError,#10-17
+          6,     6,     6,     6,     6,eItsMe,     6,     6,#18-1f
+          6,     6,     6,     6,     5,     7,     7,eError,#20-27
+          5,     8,     6,     6,eError,     6,     6,     6,#28-2f
+          6,     6,     6,     6,eError,eError,eStart,eStart #30-37
+)
+
+UCS2BECharLenTable = (2, 2, 2, 0, 2, 2)
+
+UCS2BESMModel = {'classTable': UCS2BE_cls,
+                 'classFactor': 6,
+                 'stateTable': UCS2BE_st,
+                 'charLenTable': UCS2BECharLenTable,
+                 'name': 'UTF-16BE'}
+
+# UCS2-LE
+
+UCS2LE_cls = (
+    0,0,0,0,0,0,0,0,  # 00 - 07
+    0,0,1,0,0,2,0,0,  # 08 - 0f
+    0,0,0,0,0,0,0,0,  # 10 - 17
+    0,0,0,3,0,0,0,0,  # 18 - 1f
+    0,0,0,0,0,0,0,0,  # 20 - 27
+    0,3,3,3,3,3,0,0,  # 28 - 2f
+    0,0,0,0,0,0,0,0,  # 30 - 37
+    0,0,0,0,0,0,0,0,  # 38 - 3f
+    0,0,0,0,0,0,0,0,  # 40 - 47
+    0,0,0,0,0,0,0,0,  # 48 - 4f
+    0,0,0,0,0,0,0,0,  # 50 - 57
+    0,0,0,0,0,0,0,0,  # 58 - 5f
+    0,0,0,0,0,0,0,0,  # 60 - 67
+    0,0,0,0,0,0,0,0,  # 68 - 6f
+    0,0,0,0,0,0,0,0,  # 70 - 77
+    0,0,0,0,0,0,0,0,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,0,0,0,0,0,0,0,  # a0 - a7
+    0,0,0,0,0,0,0,0,  # a8 - af
+    0,0,0,0,0,0,0,0,  # b0 - b7
+    0,0,0,0,0,0,0,0,  # b8 - bf
+    0,0,0,0,0,0,0,0,  # c0 - c7
+    0,0,0,0,0,0,0,0,  # c8 - cf
+    0,0,0,0,0,0,0,0,  # d0 - d7
+    0,0,0,0,0,0,0,0,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,4,5   # f8 - ff
+)
+
+UCS2LE_st = (
+          6,     6,     7,     6,     4,     3,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,     5,     5,     5,eError,eItsMe,eError,#10-17
+          5,     5,     5,eError,     5,eError,     6,     6,#18-1f
+          7,     6,     8,     8,     5,     5,     5,eError,#20-27
+          5,     5,     5,eError,eError,eError,     5,     5,#28-2f
+          5,     5,     5,eError,     5,eError,eStart,eStart #30-37
+)
+
+UCS2LECharLenTable = (2, 2, 2, 2, 2, 2)
+
+UCS2LESMModel = {'classTable': UCS2LE_cls,
+                 'classFactor': 6,
+                 'stateTable': UCS2LE_st,
+                 'charLenTable': UCS2LECharLenTable,
+                 'name': 'UTF-16LE'}
+
+# UTF-8
+
+UTF8_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07  #allow 0x00 as a legal value
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    1,1,1,1,1,1,1,1,  # 40 - 47
+    1,1,1,1,1,1,1,1,  # 48 - 4f
+    1,1,1,1,1,1,1,1,  # 50 - 57
+    1,1,1,1,1,1,1,1,  # 58 - 5f
+    1,1,1,1,1,1,1,1,  # 60 - 67
+    1,1,1,1,1,1,1,1,  # 68 - 6f
+    1,1,1,1,1,1,1,1,  # 70 - 77
+    1,1,1,1,1,1,1,1,  # 78 - 7f
+    2,2,2,2,3,3,3,3,  # 80 - 87
+    4,4,4,4,4,4,4,4,  # 88 - 8f
+    4,4,4,4,4,4,4,4,  # 90 - 97
+    4,4,4,4,4,4,4,4,  # 98 - 9f
+    5,5,5,5,5,5,5,5,  # a0 - a7
+    5,5,5,5,5,5,5,5,  # a8 - af
+    5,5,5,5,5,5,5,5,  # b0 - b7
+    5,5,5,5,5,5,5,5,  # b8 - bf
+    0,0,6,6,6,6,6,6,  # c0 - c7
+    6,6,6,6,6,6,6,6,  # c8 - cf
+    6,6,6,6,6,6,6,6,  # d0 - d7
+    6,6,6,6,6,6,6,6,  # d8 - df
+    7,8,8,8,8,8,8,8,  # e0 - e7
+    8,8,8,8,8,9,8,8,  # e8 - ef
+    10,11,11,11,11,11,11,11,  # f0 - f7
+    12,13,13,13,14,15,0,0    # f8 - ff
+)
+
+UTF8_st = (
+    eError,eStart,eError,eError,eError,eError,     12,   10,#00-07
+         9,     11,     8,     7,     6,     5,     4,    3,#08-0f
+    eError,eError,eError,eError,eError,eError,eError,eError,#10-17
+    eError,eError,eError,eError,eError,eError,eError,eError,#18-1f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#20-27
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#28-2f
+    eError,eError,     5,     5,     5,     5,eError,eError,#30-37
+    eError,eError,eError,eError,eError,eError,eError,eError,#38-3f
+    eError,eError,eError,     5,     5,     5,eError,eError,#40-47
+    eError,eError,eError,eError,eError,eError,eError,eError,#48-4f
+    eError,eError,     7,     7,     7,     7,eError,eError,#50-57
+    eError,eError,eError,eError,eError,eError,eError,eError,#58-5f
+    eError,eError,eError,eError,     7,     7,eError,eError,#60-67
+    eError,eError,eError,eError,eError,eError,eError,eError,#68-6f
+    eError,eError,     9,     9,     9,     9,eError,eError,#70-77
+    eError,eError,eError,eError,eError,eError,eError,eError,#78-7f
+    eError,eError,eError,eError,eError,     9,eError,eError,#80-87
+    eError,eError,eError,eError,eError,eError,eError,eError,#88-8f
+    eError,eError,    12,    12,    12,    12,eError,eError,#90-97
+    eError,eError,eError,eError,eError,eError,eError,eError,#98-9f
+    eError,eError,eError,eError,eError,    12,eError,eError,#a0-a7
+    eError,eError,eError,eError,eError,eError,eError,eError,#a8-af
+    eError,eError,    12,    12,    12,eError,eError,eError,#b0-b7
+    eError,eError,eError,eError,eError,eError,eError,eError,#b8-bf
+    eError,eError,eStart,eStart,eStart,eStart,eError,eError,#c0-c7
+    eError,eError,eError,eError,eError,eError,eError,eError #c8-cf
+)
+
+UTF8CharLenTable = (0, 1, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6)
+
+UTF8SMModel = {'classTable': UTF8_cls,
+               'classFactor': 16,
+               'stateTable': UTF8_st,
+               'charLenTable': UTF8CharLenTable,
+               'name': 'UTF-8'}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/sbcharsetprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/sbcharsetprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/sbcharsetprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/sbcharsetprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,120 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from . import constants
+from .charsetprober import CharSetProber
+from .compat import wrap_ord
+
+SAMPLE_SIZE = 64
+SB_ENOUGH_REL_THRESHOLD = 1024
+POSITIVE_SHORTCUT_THRESHOLD = 0.95
+NEGATIVE_SHORTCUT_THRESHOLD = 0.05
+SYMBOL_CAT_ORDER = 250
+NUMBER_OF_SEQ_CAT = 4
+POSITIVE_CAT = NUMBER_OF_SEQ_CAT - 1
+#NEGATIVE_CAT = 0
+
+
+class SingleByteCharSetProber(CharSetProber):
+    def __init__(self, model, reversed=False, nameProber=None):
+        CharSetProber.__init__(self)
+        self._mModel = model
+        # TRUE if we need to reverse every pair in the model lookup
+        self._mReversed = reversed
+        # Optional auxiliary prober for name decision
+        self._mNameProber = nameProber
+        self.reset()
+
+    def reset(self):
+        CharSetProber.reset(self)
+        # char order of last character
+        self._mLastOrder = 255
+        self._mSeqCounters = [0] * NUMBER_OF_SEQ_CAT
+        self._mTotalSeqs = 0
+        self._mTotalChar = 0
+        # characters that fall in our sampling range
+        self._mFreqChar = 0
+
+    def get_charset_name(self):
+        if self._mNameProber:
+            return self._mNameProber.get_charset_name()
+        else:
+            return self._mModel['charsetName']
+
+    def feed(self, aBuf):
+        if not self._mModel['keepEnglishLetter']:
+            aBuf = self.filter_without_english_letters(aBuf)
+        aLen = len(aBuf)
+        if not aLen:
+            return self.get_state()
+        for c in aBuf:
+            order = self._mModel['charToOrderMap'][wrap_ord(c)]
+            if order < SYMBOL_CAT_ORDER:
+                self._mTotalChar += 1
+            if order < SAMPLE_SIZE:
+                self._mFreqChar += 1
+                if self._mLastOrder < SAMPLE_SIZE:
+                    self._mTotalSeqs += 1
+                    if not self._mReversed:
+                        i = (self._mLastOrder * SAMPLE_SIZE) + order
+                        model = self._mModel['precedenceMatrix'][i]
+                    else:  # reverse the order of the letters in the lookup
+                        i = (order * SAMPLE_SIZE) + self._mLastOrder
+                        model = self._mModel['precedenceMatrix'][i]
+                    self._mSeqCounters[model] += 1
+            self._mLastOrder = order
+
+        if self.get_state() == constants.eDetecting:
+            if self._mTotalSeqs > SB_ENOUGH_REL_THRESHOLD:
+                cf = self.get_confidence()
+                if cf > POSITIVE_SHORTCUT_THRESHOLD:
+                    if constants._debug:
+                        sys.stderr.write('%s confidence = %s, we have a'
+                                         'winner\n' %
+                                         (self._mModel['charsetName'], cf))
+                    self._mState = constants.eFoundIt
+                elif cf < NEGATIVE_SHORTCUT_THRESHOLD:
+                    if constants._debug:
+                        sys.stderr.write('%s confidence = %s, below negative'
+                                         'shortcut threshhold %s\n' %
+                                         (self._mModel['charsetName'], cf,
+                                          NEGATIVE_SHORTCUT_THRESHOLD))
+                    self._mState = constants.eNotMe
+
+        return self.get_state()
+
+    def get_confidence(self):
+        r = 0.01
+        if self._mTotalSeqs > 0:
+            r = ((1.0 * self._mSeqCounters[POSITIVE_CAT]) / self._mTotalSeqs
+                 / self._mModel['mTypicalPositiveRatio'])
+            r = r * self._mFreqChar / self._mTotalChar
+            if r >= 1.0:
+                r = 0.99
+        return r
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/sbcsgroupprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/sbcsgroupprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/sbcsgroupprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/sbcsgroupprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,69 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetgroupprober import CharSetGroupProber
+from .sbcharsetprober import SingleByteCharSetProber
+from .langcyrillicmodel import (Win1251CyrillicModel, Koi8rModel,
+                                Latin5CyrillicModel, MacCyrillicModel,
+                                Ibm866Model, Ibm855Model)
+from .langgreekmodel import Latin7GreekModel, Win1253GreekModel
+from .langbulgarianmodel import Latin5BulgarianModel, Win1251BulgarianModel
+from .langhungarianmodel import Latin2HungarianModel, Win1250HungarianModel
+from .langthaimodel import TIS620ThaiModel
+from .langhebrewmodel import Win1255HebrewModel
+from .hebrewprober import HebrewProber
+
+
+class SBCSGroupProber(CharSetGroupProber):
+    def __init__(self):
+        CharSetGroupProber.__init__(self)
+        self._mProbers = [
+            SingleByteCharSetProber(Win1251CyrillicModel),
+            SingleByteCharSetProber(Koi8rModel),
+            SingleByteCharSetProber(Latin5CyrillicModel),
+            SingleByteCharSetProber(MacCyrillicModel),
+            SingleByteCharSetProber(Ibm866Model),
+            SingleByteCharSetProber(Ibm855Model),
+            SingleByteCharSetProber(Latin7GreekModel),
+            SingleByteCharSetProber(Win1253GreekModel),
+            SingleByteCharSetProber(Latin5BulgarianModel),
+            SingleByteCharSetProber(Win1251BulgarianModel),
+            SingleByteCharSetProber(Latin2HungarianModel),
+            SingleByteCharSetProber(Win1250HungarianModel),
+            SingleByteCharSetProber(TIS620ThaiModel),
+        ]
+        hebrewProber = HebrewProber()
+        logicalHebrewProber = SingleByteCharSetProber(Win1255HebrewModel,
+                                                      False, hebrewProber)
+        visualHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, True,
+                                                     hebrewProber)
+        hebrewProber.set_model_probers(logicalHebrewProber, visualHebrewProber)
+        self._mProbers.extend([hebrewProber, logicalHebrewProber,
+                               visualHebrewProber])
+
+        self.reset()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/sjisprober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/sjisprober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/sjisprober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/sjisprober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,91 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import SJISDistributionAnalysis
+from .jpcntx import SJISContextAnalysis
+from .mbcssm import SJISSMModel
+from . import constants
+
+
+class SJISProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(SJISSMModel)
+        self._mDistributionAnalyzer = SJISDistributionAnalysis()
+        self._mContextAnalyzer = SJISContextAnalysis()
+        self.reset()
+
+    def reset(self):
+        MultiByteCharSetProber.reset(self)
+        self._mContextAnalyzer.reset()
+
+    def get_charset_name(self):
+        return self._mContextAnalyzer.get_charset_name()
+
+    def feed(self, aBuf):
+        aLen = len(aBuf)
+        for i in range(0, aLen):
+            codingState = self._mCodingSM.next_state(aBuf[i])
+            if codingState == constants.eError:
+                if constants._debug:
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                charLen = self._mCodingSM.get_current_charlen()
+                if i == 0:
+                    self._mLastChar[1] = aBuf[0]
+                    self._mContextAnalyzer.feed(self._mLastChar[2 - charLen:],
+                                                charLen)
+                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
+                else:
+                    self._mContextAnalyzer.feed(aBuf[i + 1 - charLen:i + 3
+                                                     - charLen], charLen)
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
+        self._mLastChar[0] = aBuf[aLen - 1]
+
+        if self.get_state() == constants.eDetecting:
+            if (self._mContextAnalyzer.got_enough_data() and
+               (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        contxtCf = self._mContextAnalyzer.get_confidence()
+        distribCf = self._mDistributionAnalyzer.get_confidence()
+        return max(contxtCf, distribCf)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/universaldetector.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/universaldetector.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/universaldetector.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/universaldetector.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,170 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import sys
+import codecs
+from .latin1prober import Latin1Prober  # windows-1252
+from .mbcsgroupprober import MBCSGroupProber  # multi-byte character sets
+from .sbcsgroupprober import SBCSGroupProber  # single-byte character sets
+from .escprober import EscCharSetProber  # ISO-2122, etc.
+import re
+
+MINIMUM_THRESHOLD = 0.20
+ePureAscii = 0
+eEscAscii = 1
+eHighbyte = 2
+
+
+class UniversalDetector:
+    def __init__(self):
+        self._highBitDetector = re.compile(b'[\x80-\xFF]')
+        self._escDetector = re.compile(b'(\033|~{)')
+        self._mEscCharSetProber = None
+        self._mCharSetProbers = []
+        self.reset()
+
+    def reset(self):
+        self.result = {'encoding': None, 'confidence': 0.0}
+        self.done = False
+        self._mStart = True
+        self._mGotData = False
+        self._mInputState = ePureAscii
+        self._mLastChar = b''
+        if self._mEscCharSetProber:
+            self._mEscCharSetProber.reset()
+        for prober in self._mCharSetProbers:
+            prober.reset()
+
+    def feed(self, aBuf):
+        if self.done:
+            return
+
+        aLen = len(aBuf)
+        if not aLen:
+            return
+
+        if not self._mGotData:
+            # If the data starts with BOM, we know it is UTF
+            if aBuf[:3] == codecs.BOM_UTF8:
+                # EF BB BF  UTF-8 with BOM
+                self.result = {'encoding': "UTF-8-SIG", 'confidence': 1.0}
+            elif aBuf[:4] == codecs.BOM_UTF32_LE:
+                # FF FE 00 00  UTF-32, little-endian BOM
+                self.result = {'encoding': "UTF-32LE", 'confidence': 1.0}
+            elif aBuf[:4] == codecs.BOM_UTF32_BE:
+                # 00 00 FE FF  UTF-32, big-endian BOM
+                self.result = {'encoding': "UTF-32BE", 'confidence': 1.0}
+            elif aBuf[:4] == b'\xFE\xFF\x00\x00':
+                # FE FF 00 00  UCS-4, unusual octet order BOM (3412)
+                self.result = {
+                    'encoding': "X-ISO-10646-UCS-4-3412",
+                    'confidence': 1.0
+                }
+            elif aBuf[:4] == b'\x00\x00\xFF\xFE':
+                # 00 00 FF FE  UCS-4, unusual octet order BOM (2143)
+                self.result = {
+                    'encoding': "X-ISO-10646-UCS-4-2143",
+                    'confidence': 1.0
+                }
+            elif aBuf[:2] == codecs.BOM_LE:
+                # FF FE  UTF-16, little endian BOM
+                self.result = {'encoding': "UTF-16LE", 'confidence': 1.0}
+            elif aBuf[:2] == codecs.BOM_BE:
+                # FE FF  UTF-16, big endian BOM
+                self.result = {'encoding': "UTF-16BE", 'confidence': 1.0}
+
+        self._mGotData = True
+        if self.result['encoding'] and (self.result['confidence'] > 0.0):
+            self.done = True
+            return
+
+        if self._mInputState == ePureAscii:
+            if self._highBitDetector.search(aBuf):
+                self._mInputState = eHighbyte
+            elif ((self._mInputState == ePureAscii) and
+                    self._escDetector.search(self._mLastChar + aBuf)):
+                self._mInputState = eEscAscii
+
+        self._mLastChar = aBuf[-1:]
+
+        if self._mInputState == eEscAscii:
+            if not self._mEscCharSetProber:
+                self._mEscCharSetProber = EscCharSetProber()
+            if self._mEscCharSetProber.feed(aBuf) == constants.eFoundIt:
+                self.result = {'encoding': self._mEscCharSetProber.get_charset_name(),
+                               'confidence': self._mEscCharSetProber.get_confidence()}
+                self.done = True
+        elif self._mInputState == eHighbyte:
+            if not self._mCharSetProbers:
+                self._mCharSetProbers = [MBCSGroupProber(), SBCSGroupProber(),
+                                         Latin1Prober()]
+            for prober in self._mCharSetProbers:
+                if prober.feed(aBuf) == constants.eFoundIt:
+                    self.result = {'encoding': prober.get_charset_name(),
+                                   'confidence': prober.get_confidence()}
+                    self.done = True
+                    break
+
+    def close(self):
+        if self.done:
+            return
+        if not self._mGotData:
+            if constants._debug:
+                sys.stderr.write('no data received!\n')
+            return
+        self.done = True
+
+        if self._mInputState == ePureAscii:
+            self.result = {'encoding': 'ascii', 'confidence': 1.0}
+            return self.result
+
+        if self._mInputState == eHighbyte:
+            proberConfidence = None
+            maxProberConfidence = 0.0
+            maxProber = None
+            for prober in self._mCharSetProbers:
+                if not prober:
+                    continue
+                proberConfidence = prober.get_confidence()
+                if proberConfidence > maxProberConfidence:
+                    maxProberConfidence = proberConfidence
+                    maxProber = prober
+            if maxProber and (maxProberConfidence > MINIMUM_THRESHOLD):
+                self.result = {'encoding': maxProber.get_charset_name(),
+                               'confidence': maxProber.get_confidence()}
+                return self.result
+
+        if constants._debug:
+            sys.stderr.write('no probers hit minimum threshhold\n')
+            for prober in self._mCharSetProbers[0].mProbers:
+                if not prober:
+                    continue
+                sys.stderr.write('%s confidence = %s\n' %
+                                 (prober.get_charset_name(),
+                                  prober.get_confidence()))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/utf8prober.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/utf8prober.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/chardet/utf8prober.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/chardet/utf8prober.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,76 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+from .charsetprober import CharSetProber
+from .codingstatemachine import CodingStateMachine
+from .mbcssm import UTF8SMModel
+
+ONE_CHAR_PROB = 0.5
+
+
+class UTF8Prober(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(UTF8SMModel)
+        self.reset()
+
+    def reset(self):
+        CharSetProber.reset(self)
+        self._mCodingSM.reset()
+        self._mNumOfMBChar = 0
+
+    def get_charset_name(self):
+        return "utf-8"
+
+    def feed(self, aBuf):
+        for c in aBuf:
+            codingState = self._mCodingSM.next_state(c)
+            if codingState == constants.eError:
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                if self._mCodingSM.get_current_charlen() >= 2:
+                    self._mNumOfMBChar += 1
+
+        if self.get_state() == constants.eDetecting:
+            if self.get_confidence() > constants.SHORTCUT_THRESHOLD:
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        unlike = 0.99
+        if self._mNumOfMBChar < 6:
+            for i in range(0, self._mNumOfMBChar):
+                unlike = unlike * ONE_CHAR_PROB
+            return 1.0 - unlike
+        else:
+            return unlike
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/__init__.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from . import urllib3
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/_collections.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/_collections.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/_collections.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/_collections.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,198 @@
+from collections import Mapping, MutableMapping
+try:
+    from threading import RLock
+except ImportError: # Platform-specific: No threads available
+    class RLock:
+        def __enter__(self):
+            pass
+
+        def __exit__(self, exc_type, exc_value, traceback):
+            pass
+
+
+try: # Python 2.7+
+    from collections import OrderedDict
+except ImportError:
+    from .packages.ordered_dict import OrderedDict
+from .packages.six import iterkeys, itervalues
+
+
+__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
+
+
+_Null = object()
+
+
+class RecentlyUsedContainer(MutableMapping):
+    """
+    Provides a thread-safe dict-like container which maintains up to
+    ``maxsize`` keys while throwing away the least-recently-used keys beyond
+    ``maxsize``.
+
+    :param maxsize:
+        Maximum number of recent elements to retain.
+
+    :param dispose_func:
+        Every time an item is evicted from the container,
+        ``dispose_func(value)`` is called.  Callback which will get called
+    """
+
+    ContainerCls = OrderedDict
+
+    def __init__(self, maxsize=10, dispose_func=None):
+        self._maxsize = maxsize
+        self.dispose_func = dispose_func
+
+        self._container = self.ContainerCls()
+        self.lock = RLock()
+
+    def __getitem__(self, key):
+        # Re-insert the item, moving it to the end of the eviction line.
+        with self.lock:
+            item = self._container.pop(key)
+            self._container[key] = item
+            return item
+
+    def __setitem__(self, key, value):
+        evicted_value = _Null
+        with self.lock:
+            # Possibly evict the existing value of 'key'
+            evicted_value = self._container.get(key, _Null)
+            self._container[key] = value
+
+            # If we didn't evict an existing value, we might have to evict the
+            # least recently used item from the beginning of the container.
+            if len(self._container) > self._maxsize:
+                _key, evicted_value = self._container.popitem(last=False)
+
+        if self.dispose_func and evicted_value is not _Null:
+            self.dispose_func(evicted_value)
+
+    def __delitem__(self, key):
+        with self.lock:
+            value = self._container.pop(key)
+
+        if self.dispose_func:
+            self.dispose_func(value)
+
+    def __len__(self):
+        with self.lock:
+            return len(self._container)
+
+    def __iter__(self):
+        raise NotImplementedError('Iteration over this class is unlikely to be threadsafe.')
+
+    def clear(self):
+        with self.lock:
+            # Copy pointers to all values, then wipe the mapping
+            values = list(itervalues(self._container))
+            self._container.clear()
+
+        if self.dispose_func:
+            for value in values:
+                self.dispose_func(value)
+
+    def keys(self):
+        with self.lock:
+            return list(iterkeys(self._container))
+
+
+class HTTPHeaderDict(MutableMapping):
+    """
+    :param headers:
+        An iterable of field-value pairs. Must not contain multiple field names
+        when compared case-insensitively.
+
+    :param kwargs:
+        Additional field-value pairs to pass in to ``dict.update``.
+
+    A ``dict`` like container for storing HTTP Headers.
+
+    Field names are stored and compared case-insensitively in compliance with
+    RFC 7230. Iteration provides the first case-sensitive key seen for each
+    case-insensitive pair.
+
+    Using ``__setitem__`` syntax overwrites fields that compare equal
+    case-insensitively in order to maintain ``dict``'s api. For fields that
+    compare equal, instead create a new ``HTTPHeaderDict`` and use ``.add``
+    in a loop.
+
+    If multiple fields that are equal case-insensitively are passed to the
+    constructor or ``.update``, the behavior is undefined and some will be
+    lost.
+
+    >>> headers = HTTPHeaderDict()
+    >>> headers.add('Set-Cookie', 'foo=bar')
+    >>> headers.add('set-cookie', 'baz=quxx')
+    >>> headers['content-length'] = '7'
+    >>> headers['SET-cookie']
+    'foo=bar, baz=quxx'
+    >>> headers['Content-Length']
+    '7'
+
+    If you want to access the raw headers with their original casing
+    for debugging purposes you can access the private ``._data`` attribute
+    which is a normal python ``dict`` that maps the case-insensitive key to a
+    list of tuples stored as (case-sensitive-original-name, value). Using the
+    structure from above as our example:
+
+    >>> headers._data
+    {'set-cookie': [('Set-Cookie', 'foo=bar'), ('set-cookie', 'baz=quxx')],
+    'content-length': [('content-length', '7')]}
+    """
+
+    def __init__(self, headers=None, **kwargs):
+        self._data = {}
+        if headers is None:
+            headers = {}
+        self.update(headers, **kwargs)
+
+    def add(self, key, value):
+        """Adds a (name, value) pair, doesn't overwrite the value if it already
+        exists.
+
+        >>> headers = HTTPHeaderDict(foo='bar')
+        >>> headers.add('Foo', 'baz')
+        >>> headers['foo']
+        'bar, baz'
+        """
+        self._data.setdefault(key.lower(), []).append((key, value))
+
+    def getlist(self, key):
+        """Returns a list of all the values for the named field. Returns an
+        empty list if the key doesn't exist."""
+        return self[key].split(', ') if key in self else []
+
+    def copy(self):
+        h = HTTPHeaderDict()
+        for key in self._data:
+            for rawkey, value in self._data[key]:
+                h.add(rawkey, value)
+        return h
+
+    def __eq__(self, other):
+        if not isinstance(other, Mapping):
+            return False
+        other = HTTPHeaderDict(other)
+        return dict((k1, self[k1]) for k1 in self._data) == \
+                dict((k2, other[k2]) for k2 in other._data)
+
+    def __getitem__(self, key):
+        values = self._data[key.lower()]
+        return ', '.join(value[1] for value in values)
+
+    def __setitem__(self, key, value):
+        self._data[key.lower()] = [(key, value)]
+
+    def __delitem__(self, key):
+        del self._data[key.lower()]
+
+    def __len__(self):
+        return len(self._data)
+
+    def __iter__(self):
+        for headers in itervalues(self._data):
+            yield headers[0][0]
+
+    def __repr__(self):
+        return '%s(%r)' % (self.__class__.__name__, dict(self.items()))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/connectionpool.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/connectionpool.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/connectionpool.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/connectionpool.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,761 @@
+import errno
+import logging
+import sys
+import warnings
+
+from socket import error as SocketError, timeout as SocketTimeout
+import socket
+
+try:  # Python 3
+    from queue import LifoQueue, Empty, Full
+except ImportError:
+    from Queue import LifoQueue, Empty, Full
+    import Queue as _  # Platform-specific: Windows
+
+
+from .exceptions import (
+    ClosedPoolError,
+    ProtocolError,
+    EmptyPoolError,
+    HostChangedError,
+    LocationValueError,
+    MaxRetryError,
+    ProxyError,
+    ReadTimeoutError,
+    SSLError,
+    TimeoutError,
+    InsecureRequestWarning,
+)
+from .packages.ssl_match_hostname import CertificateError
+from .packages import six
+from .connection import (
+    port_by_scheme,
+    DummyConnection,
+    HTTPConnection, HTTPSConnection, VerifiedHTTPSConnection,
+    HTTPException, BaseSSLError, ConnectionError
+)
+from .request import RequestMethods
+from .response import HTTPResponse
+
+from .util.connection import is_connection_dropped
+from .util.retry import Retry
+from .util.timeout import Timeout
+from .util.url import get_host
+
+
+xrange = six.moves.xrange
+
+log = logging.getLogger(__name__)
+
+_Default = object()
+
+
+## Pool objects
+class ConnectionPool(object):
+    """
+    Base class for all connection pools, such as
+    :class:`.HTTPConnectionPool` and :class:`.HTTPSConnectionPool`.
+    """
+
+    scheme = None
+    QueueCls = LifoQueue
+
+    def __init__(self, host, port=None):
+        if not host:
+            raise LocationValueError("No host specified.")
+
+        # httplib doesn't like it when we include brackets in ipv6 addresses
+        self.host = host.strip('[]')
+        self.port = port
+
+    def __str__(self):
+        return '%s(host=%r, port=%r)' % (type(self).__name__,
+                                         self.host, self.port)
+
+# This is taken from http://hg.python.org/cpython/file/7aaba721ebc0/Lib/socket.py#l252
+_blocking_errnos = set([errno.EAGAIN, errno.EWOULDBLOCK])
+
+
+class HTTPConnectionPool(ConnectionPool, RequestMethods):
+    """
+    Thread-safe connection pool for one host.
+
+    :param host:
+        Host used for this HTTP Connection (e.g. "localhost"), passed into
+        :class:`httplib.HTTPConnection`.
+
+    :param port:
+        Port used for this HTTP Connection (None is equivalent to 80), passed
+        into :class:`httplib.HTTPConnection`.
+
+    :param strict:
+        Causes BadStatusLine to be raised if the status line can't be parsed
+        as a valid HTTP/1.0 or 1.1 status line, passed into
+        :class:`httplib.HTTPConnection`.
+
+        .. note::
+           Only works in Python 2. This parameter is ignored in Python 3.
+
+    :param timeout:
+        Socket timeout in seconds for each individual connection. This can
+        be a float or integer, which sets the timeout for the HTTP request,
+        or an instance of :class:`urllib3.util.Timeout` which gives you more
+        fine-grained control over request timeouts. After the constructor has
+        been parsed, this is always a `urllib3.util.Timeout` object.
+
+    :param maxsize:
+        Number of connections to save that can be reused. More than 1 is useful
+        in multithreaded situations. If ``block`` is set to false, more
+        connections will be created but they will not be saved once they've
+        been used.
+
+    :param block:
+        If set to True, no more than ``maxsize`` connections will be used at
+        a time. When no free connections are available, the call will block
+        until a connection has been released. This is a useful side effect for
+        particular multithreaded situations where one does not want to use more
+        than maxsize connections per host to prevent flooding.
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
+
+    :param retries:
+        Retry configuration to use by default with requests in this pool.
+
+    :param _proxy:
+        Parsed proxy URL, should not be used directly, instead, see
+        :class:`urllib3.connectionpool.ProxyManager`"
+
+    :param _proxy_headers:
+        A dictionary with proxy headers, should not be used directly,
+        instead, see :class:`urllib3.connectionpool.ProxyManager`"
+
+    :param \**conn_kw:
+        Additional parameters are used to create fresh :class:`urllib3.connection.HTTPConnection`,
+        :class:`urllib3.connection.HTTPSConnection` instances.
+    """
+
+    scheme = 'http'
+    ConnectionCls = HTTPConnection
+
+    def __init__(self, host, port=None, strict=False,
+                 timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1, block=False,
+                 headers=None, retries=None,
+                 _proxy=None, _proxy_headers=None,
+                 **conn_kw):
+        ConnectionPool.__init__(self, host, port)
+        RequestMethods.__init__(self, headers)
+
+        self.strict = strict
+
+        if not isinstance(timeout, Timeout):
+            timeout = Timeout.from_float(timeout)
+
+        if retries is None:
+            retries = Retry.DEFAULT
+
+        self.timeout = timeout
+        self.retries = retries
+
+        self.pool = self.QueueCls(maxsize)
+        self.block = block
+
+        self.proxy = _proxy
+        self.proxy_headers = _proxy_headers or {}
+
+        # Fill the queue up so that doing get() on it will block properly
+        for _ in xrange(maxsize):
+            self.pool.put(None)
+
+        # These are mostly for testing and debugging purposes.
+        self.num_connections = 0
+        self.num_requests = 0
+        self.conn_kw = conn_kw
+
+        if self.proxy:
+            # Enable Nagle's algorithm for proxies, to avoid packet fragmentation.
+            # We cannot know if the user has added default socket options, so we cannot replace the
+            # list.
+            self.conn_kw.setdefault('socket_options', [])
+
+    def _new_conn(self):
+        """
+        Return a fresh :class:`HTTPConnection`.
+        """
+        self.num_connections += 1
+        log.info("Starting new HTTP connection (%d): %s" %
+                 (self.num_connections, self.host))
+
+        conn = self.ConnectionCls(host=self.host, port=self.port,
+                                  timeout=self.timeout.connect_timeout,
+                                  strict=self.strict, **self.conn_kw)
+        return conn
+
+    def _get_conn(self, timeout=None):
+        """
+        Get a connection. Will return a pooled connection if one is available.
+
+        If no connections are available and :prop:`.block` is ``False``, then a
+        fresh connection is returned.
+
+        :param timeout:
+            Seconds to wait before giving up and raising
+            :class:`urllib3.exceptions.EmptyPoolError` if the pool is empty and
+            :prop:`.block` is ``True``.
+        """
+        conn = None
+        try:
+            conn = self.pool.get(block=self.block, timeout=timeout)
+
+        except AttributeError:  # self.pool is None
+            raise ClosedPoolError(self, "Pool is closed.")
+
+        except Empty:
+            if self.block:
+                raise EmptyPoolError(self,
+                                     "Pool reached maximum size and no more "
+                                     "connections are allowed.")
+            pass  # Oh well, we'll create a new connection then
+
+        # If this is a persistent connection, check if it got disconnected
+        if conn and is_connection_dropped(conn):
+            log.info("Resetting dropped connection: %s" % self.host)
+            conn.close()
+            if getattr(conn, 'auto_open', 1) == 0:
+                # This is a proxied connection that has been mutated by
+                # httplib._tunnel() and cannot be reused (since it would
+                # attempt to bypass the proxy)
+                conn = None
+
+        return conn or self._new_conn()
+
+    def _put_conn(self, conn):
+        """
+        Put a connection back into the pool.
+
+        :param conn:
+            Connection object for the current host and port as returned by
+            :meth:`._new_conn` or :meth:`._get_conn`.
+
+        If the pool is already full, the connection is closed and discarded
+        because we exceeded maxsize. If connections are discarded frequently,
+        then maxsize should be increased.
+
+        If the pool is closed, then the connection will be closed and discarded.
+        """
+        try:
+            self.pool.put(conn, block=False)
+            return  # Everything is dandy, done.
+        except AttributeError:
+            # self.pool is None.
+            pass
+        except Full:
+            # This should never happen if self.block == True
+            log.warning(
+                "Connection pool is full, discarding connection: %s" %
+                self.host)
+
+        # Connection never got put back into the pool, close it.
+        if conn:
+            conn.close()
+
+    def _validate_conn(self, conn):
+        """
+        Called right before a request is made, after the socket is created.
+        """
+        pass
+
+    def _get_timeout(self, timeout):
+        """ Helper that always returns a :class:`urllib3.util.Timeout` """
+        if timeout is _Default:
+            return self.timeout.clone()
+
+        if isinstance(timeout, Timeout):
+            return timeout.clone()
+        else:
+            # User passed us an int/float. This is for backwards compatibility,
+            # can be removed later
+            return Timeout.from_float(timeout)
+
+    def _raise_timeout(self, err, url, timeout_value):
+        """Is the error actually a timeout? Will raise a ReadTimeout or pass"""
+
+        if isinstance(err, SocketTimeout):
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+        # See the above comment about EAGAIN in Python 3. In Python 2 we have
+        # to specifically catch it and throw the timeout error
+        if hasattr(err, 'errno') and err.errno in _blocking_errnos:
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+        # Catch possible read timeouts thrown as SSL errors. If not the
+        # case, rethrow the original. We need to do this because of:
+        # http://bugs.python.org/issue10272
+        if 'timed out' in str(err) or 'did not complete (read)' in str(err):  # Python 2.6
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+    def _make_request(self, conn, method, url, timeout=_Default,
+                      **httplib_request_kw):
+        """
+        Perform a request on a given urllib connection object taken from our
+        pool.
+
+        :param conn:
+            a connection from one of our connection pools
+
+        :param timeout:
+            Socket timeout in seconds for the request. This can be a
+            float or integer, which will set the same timeout value for
+            the socket connect and the socket read, or an instance of
+            :class:`urllib3.util.Timeout`, which gives you more fine-grained
+            control over your timeouts.
+        """
+        self.num_requests += 1
+
+        timeout_obj = self._get_timeout(timeout)
+        timeout_obj.start_connect()
+        conn.timeout = timeout_obj.connect_timeout
+
+        # Trigger any extra validation we need to do.
+        try:
+            self._validate_conn(conn)
+        except (SocketTimeout, BaseSSLError) as e:
+            # Py2 raises this as a BaseSSLError, Py3 raises it as socket timeout.
+            self._raise_timeout(err=e, url=url, timeout_value=conn.timeout)
+            raise
+
+        # conn.request() calls httplib.*.request, not the method in
+        # urllib3.request. It also calls makefile (recv) on the socket.
+        conn.request(method, url, **httplib_request_kw)
+
+        # Reset the timeout for the recv() on the socket
+        read_timeout = timeout_obj.read_timeout
+
+        # App Engine doesn't have a sock attr
+        if getattr(conn, 'sock', None):
+            # In Python 3 socket.py will catch EAGAIN and return None when you
+            # try and read into the file pointer created by http.client, which
+            # instead raises a BadStatusLine exception. Instead of catching
+            # the exception and assuming all BadStatusLine exceptions are read
+            # timeouts, check for a zero timeout before making the request.
+            if read_timeout == 0:
+                raise ReadTimeoutError(
+                    self, url, "Read timed out. (read timeout=%s)" % read_timeout)
+            if read_timeout is Timeout.DEFAULT_TIMEOUT:
+                conn.sock.settimeout(socket.getdefaulttimeout())
+            else:  # None or a value
+                conn.sock.settimeout(read_timeout)
+
+        # Receive the response from the server
+        try:
+            try:  # Python 2.7+, use buffering of HTTP responses
+                httplib_response = conn.getresponse(buffering=True)
+            except TypeError:  # Python 2.6 and older
+                httplib_response = conn.getresponse()
+        except (SocketTimeout, BaseSSLError, SocketError) as e:
+            self._raise_timeout(err=e, url=url, timeout_value=read_timeout)
+            raise
+
+        # AppEngine doesn't have a version attr.
+        http_version = getattr(conn, '_http_vsn_str', 'HTTP/?')
+        log.debug("\"%s %s %s\" %s %s" % (method, url, http_version,
+                                          httplib_response.status,
+                                          httplib_response.length))
+        return httplib_response
+
+    def close(self):
+        """
+        Close all pooled connections and disable the pool.
+        """
+        # Disable access to the pool
+        old_pool, self.pool = self.pool, None
+
+        try:
+            while True:
+                conn = old_pool.get(block=False)
+                if conn:
+                    conn.close()
+
+        except Empty:
+            pass  # Done.
+
+    def is_same_host(self, url):
+        """
+        Check if the given ``url`` is a member of the same host as this
+        connection pool.
+        """
+        if url.startswith('/'):
+            return True
+
+        # TODO: Add optional support for socket.gethostbyname checking.
+        scheme, host, port = get_host(url)
+
+        # Use explicit default port for comparison when none is given
+        if self.port and not port:
+            port = port_by_scheme.get(scheme)
+        elif not self.port and port == port_by_scheme.get(scheme):
+            port = None
+
+        return (scheme, host, port) == (self.scheme, self.host, self.port)
+
+    def urlopen(self, method, url, body=None, headers=None, retries=None,
+                redirect=True, assert_same_host=True, timeout=_Default,
+                pool_timeout=None, release_conn=None, **response_kw):
+        """
+        Get a connection from the pool and perform an HTTP request. This is the
+        lowest level call for making a request, so you'll need to specify all
+        the raw details.
+
+        .. note::
+
+           More commonly, it's appropriate to use a convenience method provided
+           by :class:`.RequestMethods`, such as :meth:`request`.
+
+        .. note::
+
+           `release_conn` will only behave as expected if
+           `preload_content=False` because we want to make
+           `preload_content=False` the default behaviour someday soon without
+           breaking backwards compatibility.
+
+        :param method:
+            HTTP request method (such as GET, POST, PUT, etc.)
+
+        :param body:
+            Data to send in the request body (useful for creating
+            POST requests, see HTTPConnectionPool.post_url for
+            more convenience).
+
+        :param headers:
+            Dictionary of custom headers to send, such as User-Agent,
+            If-None-Match, etc. If None, pool headers are used. If provided,
+            these headers completely replace any pool-specific headers.
+
+        :param retries:
+            Configure the number of retries to allow before raising a
+            :class:`~urllib3.exceptions.MaxRetryError` exception.
+
+            Pass ``None`` to retry until you receive a response. Pass a
+            :class:`~urllib3.util.retry.Retry` object for fine-grained control
+            over different types of retries.
+            Pass an integer number to retry connection errors that many times,
+            but no other types of errors. Pass zero to never retry.
+
+            If ``False``, then retries are disabled and any exception is raised
+            immediately. Also, instead of raising a MaxRetryError on redirects,
+            the redirect response will be returned.
+
+        :type retries: :class:`~urllib3.util.retry.Retry`, False, or an int.
+
+        :param redirect:
+            If True, automatically handle redirects (status codes 301, 302,
+            303, 307, 308). Each redirect counts as a retry. Disabling retries
+            will disable redirect, too.
+
+        :param assert_same_host:
+            If ``True``, will make sure that the host of the pool requests is
+            consistent else will raise HostChangedError. When False, you can
+            use the pool on an HTTP proxy and request foreign hosts.
+
+        :param timeout:
+            If specified, overrides the default timeout for this one
+            request. It may be a float (in seconds) or an instance of
+            :class:`urllib3.util.Timeout`.
+
+        :param pool_timeout:
+            If set and the pool is set to block=True, then this method will
+            block for ``pool_timeout`` seconds and raise EmptyPoolError if no
+            connection is available within the time period.
+
+        :param release_conn:
+            If False, then the urlopen call will not release the connection
+            back into the pool once a response is received (but will release if
+            you read the entire contents of the response such as when
+            `preload_content=True`). This is useful if you're not preloading
+            the response's content immediately. You will need to call
+            ``r.release_conn()`` on the response ``r`` to return the connection
+            back into the pool. If None, it takes the value of
+            ``response_kw.get('preload_content', True)``.
+
+        :param \**response_kw:
+            Additional parameters are passed to
+            :meth:`urllib3.response.HTTPResponse.from_httplib`
+        """
+        if headers is None:
+            headers = self.headers
+
+        if not isinstance(retries, Retry):
+            retries = Retry.from_int(retries, redirect=redirect, default=self.retries)
+
+        if release_conn is None:
+            release_conn = response_kw.get('preload_content', True)
+
+        # Check host
+        if assert_same_host and not self.is_same_host(url):
+            raise HostChangedError(self, url, retries)
+
+        conn = None
+
+        # Merge the proxy headers. Only do this in HTTP. We have to copy the
+        # headers dict so we can safely change it without those changes being
+        # reflected in anyone else's copy.
+        if self.scheme == 'http':
+            headers = headers.copy()
+            headers.update(self.proxy_headers)
+
+        # Must keep the exception bound to a separate variable or else Python 3
+        # complains about UnboundLocalError.
+        err = None
+
+        try:
+            # Request a connection from the queue.
+            conn = self._get_conn(timeout=pool_timeout)
+
+            # Make the request on the httplib connection object.
+            httplib_response = self._make_request(conn, method, url,
+                                                  timeout=timeout,
+                                                  body=body, headers=headers)
+
+            # If we're going to release the connection in ``finally:``, then
+            # the request doesn't need to know about the connection. Otherwise
+            # it will also try to release it and we'll have a double-release
+            # mess.
+            response_conn = not release_conn and conn
+
+            # Import httplib's response into our own wrapper object
+            response = HTTPResponse.from_httplib(httplib_response,
+                                                 pool=self,
+                                                 connection=response_conn,
+                                                 **response_kw)
+
+            # else:
+            #     The connection will be put back into the pool when
+            #     ``response.release_conn()`` is called (implicitly by
+            #     ``response.read()``)
+
+        except Empty:
+            # Timed out by queue.
+            raise EmptyPoolError(self, "No pool connections are available.")
+
+        except (BaseSSLError, CertificateError) as e:
+            # Close the connection. If a connection is reused on which there
+            # was a Certificate error, the next request will certainly raise
+            # another Certificate error.
+            if conn:
+                conn.close()
+                conn = None
+            raise SSLError(e)
+
+        except (TimeoutError, HTTPException, SocketError, ConnectionError) as e:
+            if conn:
+                # Discard the connection for these exceptions. It will be
+                # be replaced during the next _get_conn() call.
+                conn.close()
+                conn = None
+
+            stacktrace = sys.exc_info()[2]
+            if isinstance(e, SocketError) and self.proxy:
+                e = ProxyError('Cannot connect to proxy.', e)
+            elif isinstance(e, (SocketError, HTTPException)):
+                e = ProtocolError('Connection aborted.', e)
+
+            retries = retries.increment(method, url, error=e,
+                                        _pool=self, _stacktrace=stacktrace)
+            retries.sleep()
+
+            # Keep track of the error for the retry warning.
+            err = e
+
+        finally:
+            if release_conn:
+                # Put the connection back to be reused. If the connection is
+                # expired then it will be None, which will get replaced with a
+                # fresh connection during _get_conn.
+                self._put_conn(conn)
+
+        if not conn:
+            # Try again
+            log.warning("Retrying (%r) after connection "
+                        "broken by '%r': %s" % (retries, err, url))
+            return self.urlopen(method, url, body, headers, retries,
+                                redirect, assert_same_host,
+                                timeout=timeout, pool_timeout=pool_timeout,
+                                release_conn=release_conn, **response_kw)
+
+        # Handle redirect?
+        redirect_location = redirect and response.get_redirect_location()
+        if redirect_location:
+            if response.status == 303:
+                method = 'GET'
+
+            try:
+                retries = retries.increment(method, url, response=response, _pool=self)
+            except MaxRetryError:
+                if retries.raise_on_redirect:
+                    raise
+                return response
+
+            log.info("Redirecting %s -> %s" % (url, redirect_location))
+            return self.urlopen(method, redirect_location, body, headers,
+                    retries=retries, redirect=redirect,
+                    assert_same_host=assert_same_host,
+                    timeout=timeout, pool_timeout=pool_timeout,
+                    release_conn=release_conn, **response_kw)
+
+        # Check if we should retry the HTTP response.
+        if retries.is_forced_retry(method, status_code=response.status):
+            retries = retries.increment(method, url, response=response, _pool=self)
+            retries.sleep()
+            log.info("Forced retry: %s" % url)
+            return self.urlopen(method, url, body, headers,
+                    retries=retries, redirect=redirect,
+                    assert_same_host=assert_same_host,
+                    timeout=timeout, pool_timeout=pool_timeout,
+                    release_conn=release_conn, **response_kw)
+
+        return response
+
+
+class HTTPSConnectionPool(HTTPConnectionPool):
+    """
+    Same as :class:`.HTTPConnectionPool`, but HTTPS.
+
+    When Python is compiled with the :mod:`ssl` module, then
+    :class:`.VerifiedHTTPSConnection` is used, which *can* verify certificates,
+    instead of :class:`.HTTPSConnection`.
+
+    :class:`.VerifiedHTTPSConnection` uses one of ``assert_fingerprint``,
+    ``assert_hostname`` and ``host`` in this order to verify connections.
+    If ``assert_hostname`` is False, no verification is done.
+
+    The ``key_file``, ``cert_file``, ``cert_reqs``, ``ca_certs`` and
+    ``ssl_version`` are only used if :mod:`ssl` is available and are fed into
+    :meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
+    into an SSL socket.
+    """
+
+    scheme = 'https'
+    ConnectionCls = HTTPSConnection
+
+    def __init__(self, host, port=None,
+                 strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
+                 block=False, headers=None, retries=None,
+                 _proxy=None, _proxy_headers=None,
+                 key_file=None, cert_file=None, cert_reqs=None,
+                 ca_certs=None, ssl_version=None,
+                 assert_hostname=None, assert_fingerprint=None,
+                 **conn_kw):
+
+        HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,
+                                    block, headers, retries, _proxy, _proxy_headers,
+                                    **conn_kw)
+        self.key_file = key_file
+        self.cert_file = cert_file
+        self.cert_reqs = cert_reqs
+        self.ca_certs = ca_certs
+        self.ssl_version = ssl_version
+        self.assert_hostname = assert_hostname
+        self.assert_fingerprint = assert_fingerprint
+
+    def _prepare_conn(self, conn):
+        """
+        Prepare the ``connection`` for :meth:`urllib3.util.ssl_wrap_socket`
+        and establish the tunnel if proxy is used.
+        """
+
+        if isinstance(conn, VerifiedHTTPSConnection):
+            conn.set_cert(key_file=self.key_file,
+                          cert_file=self.cert_file,
+                          cert_reqs=self.cert_reqs,
+                          ca_certs=self.ca_certs,
+                          assert_hostname=self.assert_hostname,
+                          assert_fingerprint=self.assert_fingerprint)
+            conn.ssl_version = self.ssl_version
+
+        if self.proxy is not None:
+            # Python 2.7+
+            try:
+                set_tunnel = conn.set_tunnel
+            except AttributeError:  # Platform-specific: Python 2.6
+                set_tunnel = conn._set_tunnel
+
+            if sys.version_info <= (2, 6, 4) and not self.proxy_headers:   # Python 2.6.4 and older
+                set_tunnel(self.host, self.port)
+            else:
+                set_tunnel(self.host, self.port, self.proxy_headers)
+
+            # Establish tunnel connection early, because otherwise httplib
+            # would improperly set Host: header to proxy's IP:port.
+            conn.connect()
+
+        return conn
+
+    def _new_conn(self):
+        """
+        Return a fresh :class:`httplib.HTTPSConnection`.
+        """
+        self.num_connections += 1
+        log.info("Starting new HTTPS connection (%d): %s"
+                 % (self.num_connections, self.host))
+
+        if not self.ConnectionCls or self.ConnectionCls is DummyConnection:
+            # Platform-specific: Python without ssl
+            raise SSLError("Can't connect to HTTPS URL because the SSL "
+                           "module is not available.")
+
+        actual_host = self.host
+        actual_port = self.port
+        if self.proxy is not None:
+            actual_host = self.proxy.host
+            actual_port = self.proxy.port
+
+        conn = self.ConnectionCls(host=actual_host, port=actual_port,
+                                  timeout=self.timeout.connect_timeout,
+                                  strict=self.strict, **self.conn_kw)
+
+        return self._prepare_conn(conn)
+
+    def _validate_conn(self, conn):
+        """
+        Called right before a request is made, after the socket is created.
+        """
+        super(HTTPSConnectionPool, self)._validate_conn(conn)
+
+        # Force connect early to allow us to validate the connection.
+        if not getattr(conn, 'sock', None):  # AppEngine might not have  `.sock`
+            conn.connect()
+
+        if not conn.is_verified:
+            warnings.warn((
+                'Unverified HTTPS request is being made. '
+                'Adding certificate verification is strongly advised. See: '
+                'https://urllib3.readthedocs.org/en/latest/security.html'),
+                InsecureRequestWarning)
+
+
+def connection_from_url(url, **kw):
+    """
+    Given a url, return an :class:`.ConnectionPool` instance of its host.
+
+    This is a shortcut for not having to parse out the scheme, host, and port
+    of the url before creating an :class:`.ConnectionPool` instance.
+
+    :param url:
+        Absolute URL string that must include the scheme. Port is optional.
+
+    :param \**kw:
+        Passes additional parameters to the constructor of the appropriate
+        :class:`.ConnectionPool`. Useful for specifying things like
+        timeout, maxsize, headers, etc.
+
+    Example::
+
+        >>> conn = connection_from_url('http://google.com/')
+        >>> r = conn.request('GET', '/')
+    """
+    scheme, host, port = get_host(url)
+    if scheme == 'https':
+        return HTTPSConnectionPool(host, port=port, **kw)
+    else:
+        return HTTPConnectionPool(host, port=port, **kw)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/connection.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/connection.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/connection.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/connection.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,262 @@
+import datetime
+import sys
+import socket
+from socket import timeout as SocketTimeout
+import warnings
+from .packages import six
+
+try:  # Python 3
+    from http.client import HTTPConnection as _HTTPConnection, HTTPException
+except ImportError:
+    from httplib import HTTPConnection as _HTTPConnection, HTTPException
+
+
+class DummyConnection(object):
+    "Used to detect a failed ConnectionCls import."
+    pass
+
+
+try:  # Compiled with SSL?
+    HTTPSConnection = DummyConnection
+    import ssl
+    BaseSSLError = ssl.SSLError
+except (ImportError, AttributeError):  # Platform-specific: No SSL.
+    ssl = None
+
+    class BaseSSLError(BaseException):
+        pass
+
+
+try:  # Python 3:
+    # Not a no-op, we're adding this to the namespace so it can be imported.
+    ConnectionError = ConnectionError
+except NameError:  # Python 2:
+    class ConnectionError(Exception):
+        pass
+
+
+from .exceptions import (
+    ConnectTimeoutError,
+    SystemTimeWarning,
+    SecurityWarning,
+)
+from .packages.ssl_match_hostname import match_hostname
+
+from .util.ssl_ import (
+    resolve_cert_reqs,
+    resolve_ssl_version,
+    ssl_wrap_socket,
+    assert_fingerprint,
+)
+
+
+from .util import connection
+
+port_by_scheme = {
+    'http': 80,
+    'https': 443,
+}
+
+RECENT_DATE = datetime.date(2014, 1, 1)
+
+
+class HTTPConnection(_HTTPConnection, object):
+    """
+    Based on httplib.HTTPConnection but provides an extra constructor
+    backwards-compatibility layer between older and newer Pythons.
+
+    Additional keyword parameters are used to configure attributes of the connection.
+    Accepted parameters include:
+
+      - ``strict``: See the documentation on :class:`urllib3.connectionpool.HTTPConnectionPool`
+      - ``source_address``: Set the source address for the current connection.
+
+        .. note:: This is ignored for Python 2.6. It is only applied for 2.7 and 3.x
+
+      - ``socket_options``: Set specific options on the underlying socket. If not specified, then
+        defaults are loaded from ``HTTPConnection.default_socket_options`` which includes disabling
+        Nagle's algorithm (sets TCP_NODELAY to 1) unless the connection is behind a proxy.
+
+        For example, if you wish to enable TCP Keep Alive in addition to the defaults,
+        you might pass::
+
+            HTTPConnection.default_socket_options + [
+                (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+            ]
+
+        Or you may want to disable the defaults by passing an empty list (e.g., ``[]``).
+    """
+
+    default_port = port_by_scheme['http']
+
+    #: Disable Nagle's algorithm by default.
+    #: ``[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]``
+    default_socket_options = [(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]
+
+    #: Whether this connection verifies the host's certificate.
+    is_verified = False
+
+    def __init__(self, *args, **kw):
+        if six.PY3:  # Python 3
+            kw.pop('strict', None)
+
+        # Pre-set source_address in case we have an older Python like 2.6.
+        self.source_address = kw.get('source_address')
+
+        if sys.version_info < (2, 7):  # Python 2.6
+            # _HTTPConnection on Python 2.6 will balk at this keyword arg, but
+            # not newer versions. We can still use it when creating a
+            # connection though, so we pop it *after* we have saved it as
+            # self.source_address.
+            kw.pop('source_address', None)
+
+        #: The socket options provided by the user. If no options are
+        #: provided, we use the default options.
+        self.socket_options = kw.pop('socket_options', self.default_socket_options)
+
+        # Superclass also sets self.source_address in Python 2.7+.
+        _HTTPConnection.__init__(self, *args, **kw)
+
+    def _new_conn(self):
+        """ Establish a socket connection and set nodelay settings on it.
+
+        :return: New socket connection.
+        """
+        extra_kw = {}
+        if self.source_address:
+            extra_kw['source_address'] = self.source_address
+
+        if self.socket_options:
+            extra_kw['socket_options'] = self.socket_options
+
+        try:
+            conn = connection.create_connection(
+                (self.host, self.port), self.timeout, **extra_kw)
+
+        except SocketTimeout:
+            raise ConnectTimeoutError(
+                self, "Connection to %s timed out. (connect timeout=%s)" %
+                (self.host, self.timeout))
+
+        return conn
+
+    def _prepare_conn(self, conn):
+        self.sock = conn
+        # the _tunnel_host attribute was added in python 2.6.3 (via
+        # http://hg.python.org/cpython/rev/0f57b30a152f) so pythons 2.6(0-2) do
+        # not have them.
+        if getattr(self, '_tunnel_host', None):
+            # TODO: Fix tunnel so it doesn't depend on self.sock state.
+            self._tunnel()
+            # Mark this connection as not reusable
+            self.auto_open = 0
+
+    def connect(self):
+        conn = self._new_conn()
+        self._prepare_conn(conn)
+
+
+class HTTPSConnection(HTTPConnection):
+    default_port = port_by_scheme['https']
+
+    def __init__(self, host, port=None, key_file=None, cert_file=None,
+                 strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, **kw):
+
+        HTTPConnection.__init__(self, host, port, strict=strict,
+                                timeout=timeout, **kw)
+
+        self.key_file = key_file
+        self.cert_file = cert_file
+
+        # Required property for Google AppEngine 1.9.0 which otherwise causes
+        # HTTPS requests to go out as HTTP. (See Issue #356)
+        self._protocol = 'https'
+
+    def connect(self):
+        conn = self._new_conn()
+        self._prepare_conn(conn)
+        self.sock = ssl.wrap_socket(conn, self.key_file, self.cert_file)
+
+
+class VerifiedHTTPSConnection(HTTPSConnection):
+    """
+    Based on httplib.HTTPSConnection but wraps the socket with
+    SSL certification.
+    """
+    cert_reqs = None
+    ca_certs = None
+    ssl_version = None
+    assert_fingerprint = None
+
+    def set_cert(self, key_file=None, cert_file=None,
+                 cert_reqs=None, ca_certs=None,
+                 assert_hostname=None, assert_fingerprint=None):
+
+        self.key_file = key_file
+        self.cert_file = cert_file
+        self.cert_reqs = cert_reqs
+        self.ca_certs = ca_certs
+        self.assert_hostname = assert_hostname
+        self.assert_fingerprint = assert_fingerprint
+
+    def connect(self):
+        # Add certificate verification
+        conn = self._new_conn()
+
+        resolved_cert_reqs = resolve_cert_reqs(self.cert_reqs)
+        resolved_ssl_version = resolve_ssl_version(self.ssl_version)
+
+        hostname = self.host
+        if getattr(self, '_tunnel_host', None):
+            # _tunnel_host was added in Python 2.6.3
+            # (See: http://hg.python.org/cpython/rev/0f57b30a152f)
+
+            self.sock = conn
+            # Calls self._set_hostport(), so self.host is
+            # self._tunnel_host below.
+            self._tunnel()
+            # Mark this connection as not reusable
+            self.auto_open = 0
+
+            # Override the host with the one we're requesting data from.
+            hostname = self._tunnel_host
+
+        is_time_off = datetime.date.today() < RECENT_DATE
+        if is_time_off:
+            warnings.warn((
+                'System time is way off (before {0}). This will probably '
+                'lead to SSL verification errors').format(RECENT_DATE),
+                SystemTimeWarning
+            )
+
+        # Wrap socket using verification with the root certs in
+        # trusted_root_certs
+        self.sock = ssl_wrap_socket(conn, self.key_file, self.cert_file,
+                                    cert_reqs=resolved_cert_reqs,
+                                    ca_certs=self.ca_certs,
+                                    server_hostname=hostname,
+                                    ssl_version=resolved_ssl_version)
+
+        if self.assert_fingerprint:
+            assert_fingerprint(self.sock.getpeercert(binary_form=True),
+                               self.assert_fingerprint)
+        elif resolved_cert_reqs != ssl.CERT_NONE \
+                and self.assert_hostname is not False:
+            cert = self.sock.getpeercert()
+            if not cert.get('subjectAltName', ()):
+                warnings.warn((
+                    'Certificate has no `subjectAltName`, falling back to check for a `commonName` for now. '
+                    'This feature is being removed by major browsers and deprecated by RFC 2818. '
+                    '(See https://github.com/shazow/urllib3/issues/497 for details.)'),
+                    SecurityWarning
+                )
+            match_hostname(cert, self.assert_hostname or hostname)
+
+        self.is_verified = (resolved_cert_reqs == ssl.CERT_REQUIRED
+                            or self.assert_fingerprint is not None)
+
+
+if ssl:
+    # Make a copy for testing.
+    UnverifiedHTTPSConnection = HTTPSConnection
+    HTTPSConnection = VerifiedHTTPSConnection
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/contrib/ntlmpool.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/contrib/ntlmpool.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/contrib/ntlmpool.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/contrib/ntlmpool.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,114 @@
+"""
+NTLM authenticating pool, contributed by erikcederstran
+
+Issue #10, see: http://code.google.com/p/urllib3/issues/detail?id=10
+"""
+
+try:
+    from http.client import HTTPSConnection
+except ImportError:
+    from httplib import HTTPSConnection
+from logging import getLogger
+from ntlm import ntlm
+
+from urllib3 import HTTPSConnectionPool
+
+
+log = getLogger(__name__)
+
+
+class NTLMConnectionPool(HTTPSConnectionPool):
+    """
+    Implements an NTLM authentication version of an urllib3 connection pool
+    """
+
+    scheme = 'https'
+
+    def __init__(self, user, pw, authurl, *args, **kwargs):
+        """
+        authurl is a random URL on the server that is protected by NTLM.
+        user is the Windows user, probably in the DOMAIN\\username format.
+        pw is the password for the user.
+        """
+        super(NTLMConnectionPool, self).__init__(*args, **kwargs)
+        self.authurl = authurl
+        self.rawuser = user
+        user_parts = user.split('\\', 1)
+        self.domain = user_parts[0].upper()
+        self.user = user_parts[1]
+        self.pw = pw
+
+    def _new_conn(self):
+        # Performs the NTLM handshake that secures the connection. The socket
+        # must be kept open while requests are performed.
+        self.num_connections += 1
+        log.debug('Starting NTLM HTTPS connection no. %d: https://%s%s' %
+                  (self.num_connections, self.host, self.authurl))
+
+        headers = {}
+        headers['Connection'] = 'Keep-Alive'
+        req_header = 'Authorization'
+        resp_header = 'www-authenticate'
+
+        conn = HTTPSConnection(host=self.host, port=self.port)
+
+        # Send negotiation message
+        headers[req_header] = (
+            'NTLM %s' % ntlm.create_NTLM_NEGOTIATE_MESSAGE(self.rawuser))
+        log.debug('Request headers: %s' % headers)
+        conn.request('GET', self.authurl, None, headers)
+        res = conn.getresponse()
+        reshdr = dict(res.getheaders())
+        log.debug('Response status: %s %s' % (res.status, res.reason))
+        log.debug('Response headers: %s' % reshdr)
+        log.debug('Response data: %s [...]' % res.read(100))
+
+        # Remove the reference to the socket, so that it can not be closed by
+        # the response object (we want to keep the socket open)
+        res.fp = None
+
+        # Server should respond with a challenge message
+        auth_header_values = reshdr[resp_header].split(', ')
+        auth_header_value = None
+        for s in auth_header_values:
+            if s[:5] == 'NTLM ':
+                auth_header_value = s[5:]
+        if auth_header_value is None:
+            raise Exception('Unexpected %s response header: %s' %
+                            (resp_header, reshdr[resp_header]))
+
+        # Send authentication message
+        ServerChallenge, NegotiateFlags = \
+            ntlm.parse_NTLM_CHALLENGE_MESSAGE(auth_header_value)
+        auth_msg = ntlm.create_NTLM_AUTHENTICATE_MESSAGE(ServerChallenge,
+                                                         self.user,
+                                                         self.domain,
+                                                         self.pw,
+                                                         NegotiateFlags)
+        headers[req_header] = 'NTLM %s' % auth_msg
+        log.debug('Request headers: %s' % headers)
+        conn.request('GET', self.authurl, None, headers)
+        res = conn.getresponse()
+        log.debug('Response status: %s %s' % (res.status, res.reason))
+        log.debug('Response headers: %s' % dict(res.getheaders()))
+        log.debug('Response data: %s [...]' % res.read()[:100])
+        if res.status != 200:
+            if res.status == 401:
+                raise Exception('Server rejected request: wrong '
+                                'username or password')
+            raise Exception('Wrong server response: %s %s' %
+                            (res.status, res.reason))
+
+        res.fp = None
+        log.debug('Connection established')
+        return conn
+
+    def urlopen(self, method, url, body=None, headers=None, retries=3,
+                redirect=True, assert_same_host=True):
+        if headers is None:
+            headers = {}
+        headers['Connection'] = 'Keep-Alive'
+        return super(NTLMConnectionPool, self).urlopen(method, url, body,
+                                                       headers, retries,
+                                                       redirect,
+                                                       assert_same_host)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/contrib/pyopenssl.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/contrib/pyopenssl.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/contrib/pyopenssl.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/contrib/pyopenssl.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,303 @@
+'''SSL with SNI_-support for Python 2. Follow these instructions if you would
+like to verify SSL certificates in Python 2. Note, the default libraries do
+*not* do certificate checking; you need to do additional work to validate
+certificates yourself.
+
+This needs the following packages installed:
+
+* pyOpenSSL (tested with 0.13)
+* ndg-httpsclient (tested with 0.3.2)
+* pyasn1 (tested with 0.1.6)
+
+You can install them with the following command:
+
+    pip install pyopenssl ndg-httpsclient pyasn1
+
+To activate certificate checking, call
+:func:`~urllib3.contrib.pyopenssl.inject_into_urllib3` from your Python code
+before you begin making HTTP requests. This can be done in a ``sitecustomize``
+module, or at any other time before your application begins using ``urllib3``,
+like this::
+
+    try:
+        import urllib3.contrib.pyopenssl
+        urllib3.contrib.pyopenssl.inject_into_urllib3()
+    except ImportError:
+        pass
+
+Now you can use :mod:`urllib3` as you normally would, and it will support SNI
+when the required modules are installed.
+
+Activating this module also has the positive side effect of disabling SSL/TLS
+compression in Python 2 (see `CRIME attack`_).
+
+If you want to configure the default list of supported cipher suites, you can
+set the ``urllib3.contrib.pyopenssl.DEFAULT_SSL_CIPHER_LIST`` variable.
+
+Module Variables
+----------------
+
+:var DEFAULT_SSL_CIPHER_LIST: The list of supported SSL/TLS cipher suites.
+    Default: ``ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:
+    ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS``
+
+.. _sni: https://en.wikipedia.org/wiki/Server_Name_Indication
+.. _crime attack: https://en.wikipedia.org/wiki/CRIME_(security_exploit)
+
+'''
+
+try:
+    from ndg.httpsclient.ssl_peer_verification import SUBJ_ALT_NAME_SUPPORT
+    from ndg.httpsclient.subj_alt_name import SubjectAltName as BaseSubjectAltName
+except SyntaxError as e:
+    raise ImportError(e)
+
+import OpenSSL.SSL
+from pyasn1.codec.der import decoder as der_decoder
+from pyasn1.type import univ, constraint
+from socket import _fileobject, timeout
+import ssl
+import select
+
+from .. import connection
+from .. import util
+
+__all__ = ['inject_into_urllib3', 'extract_from_urllib3']
+
+# SNI only *really* works if we can read the subjectAltName of certificates.
+HAS_SNI = SUBJ_ALT_NAME_SUPPORT
+
+# Map from urllib3 to PyOpenSSL compatible parameter-values.
+_openssl_versions = {
+    ssl.PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD,
+    ssl.PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD,
+}
+
+try:
+    _openssl_versions.update({ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD})
+except AttributeError:
+    pass
+
+_openssl_verify = {
+    ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE,
+    ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER,
+    ssl.CERT_REQUIRED: OpenSSL.SSL.VERIFY_PEER
+                       + OpenSSL.SSL.VERIFY_FAIL_IF_NO_PEER_CERT,
+}
+
+# A secure default.
+# Sources for more information on TLS ciphers:
+#
+# - https://wiki.mozilla.org/Security/Server_Side_TLS
+# - https://www.ssllabs.com/projects/best-practices/index.html
+# - https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
+#
+# The general intent is:
+# - Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE),
+# - prefer ECDHE over DHE for better performance,
+# - prefer any AES-GCM over any AES-CBC for better performance and security,
+# - use 3DES as fallback which is secure but slow,
+# - disable NULL authentication, MD5 MACs and DSS for security reasons.
+DEFAULT_SSL_CIPHER_LIST = "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:" + \
+    "ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:" + \
+    "!aNULL:!MD5:!DSS"
+
+
+orig_util_HAS_SNI = util.HAS_SNI
+orig_connection_ssl_wrap_socket = connection.ssl_wrap_socket
+
+
+def inject_into_urllib3():
+    'Monkey-patch urllib3 with PyOpenSSL-backed SSL-support.'
+
+    connection.ssl_wrap_socket = ssl_wrap_socket
+    util.HAS_SNI = HAS_SNI
+
+
+def extract_from_urllib3():
+    'Undo monkey-patching by :func:`inject_into_urllib3`.'
+
+    connection.ssl_wrap_socket = orig_connection_ssl_wrap_socket
+    util.HAS_SNI = orig_util_HAS_SNI
+
+
+### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
+class SubjectAltName(BaseSubjectAltName):
+    '''ASN.1 implementation for subjectAltNames support'''
+
+    # There is no limit to how many SAN certificates a certificate may have,
+    #   however this needs to have some limit so we'll set an arbitrarily high
+    #   limit.
+    sizeSpec = univ.SequenceOf.sizeSpec + \
+        constraint.ValueSizeConstraint(1, 1024)
+
+
+### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
+def get_subj_alt_name(peer_cert):
+    # Search through extensions
+    dns_name = []
+    if not SUBJ_ALT_NAME_SUPPORT:
+        return dns_name
+
+    general_names = SubjectAltName()
+    for i in range(peer_cert.get_extension_count()):
+        ext = peer_cert.get_extension(i)
+        ext_name = ext.get_short_name()
+        if ext_name != 'subjectAltName':
+            continue
+
+        # PyOpenSSL returns extension data in ASN.1 encoded form
+        ext_dat = ext.get_data()
+        decoded_dat = der_decoder.decode(ext_dat,
+                                         asn1Spec=general_names)
+
+        for name in decoded_dat:
+            if not isinstance(name, SubjectAltName):
+                continue
+            for entry in range(len(name)):
+                component = name.getComponentByPosition(entry)
+                if component.getName() != 'dNSName':
+                    continue
+                dns_name.append(str(component.getComponent()))
+
+    return dns_name
+
+
+class WrappedSocket(object):
+    '''API-compatibility wrapper for Python OpenSSL's Connection-class.
+
+    Note: _makefile_refs, _drop() and _reuse() are needed for the garbage
+    collector of pypy.
+    '''
+
+    def __init__(self, connection, socket, suppress_ragged_eofs=True):
+        self.connection = connection
+        self.socket = socket
+        self.suppress_ragged_eofs = suppress_ragged_eofs
+        self._makefile_refs = 0
+
+    def fileno(self):
+        return self.socket.fileno()
+
+    def makefile(self, mode, bufsize=-1):
+        self._makefile_refs += 1
+        return _fileobject(self, mode, bufsize, close=True)
+
+    def recv(self, *args, **kwargs):
+        try:
+            data = self.connection.recv(*args, **kwargs)
+        except OpenSSL.SSL.SysCallError as e:
+            if self.suppress_ragged_eofs and e.args == (-1, 'Unexpected EOF'):
+                return b''
+            else:
+                raise
+        except OpenSSL.SSL.WantReadError:
+            rd, wd, ed = select.select(
+                [self.socket], [], [], self.socket.gettimeout())
+            if not rd:
+                raise timeout('The read operation timed out')
+            else:
+                return self.recv(*args, **kwargs)
+        else:
+            return data
+
+    def settimeout(self, timeout):
+        return self.socket.settimeout(timeout)
+
+    def _send_until_done(self, data):
+        while True:
+            try:
+                return self.connection.send(data)
+            except OpenSSL.SSL.WantWriteError:
+                _, wlist, _ = select.select([], [self.socket], [],
+                                            self.socket.gettimeout())
+                if not wlist:
+                    raise timeout()
+                continue
+
+    def sendall(self, data):
+        while len(data):
+            sent = self._send_until_done(data)
+            data = data[sent:]
+
+    def close(self):
+        if self._makefile_refs < 1:
+            return self.connection.shutdown()
+        else:
+            self._makefile_refs -= 1
+
+    def getpeercert(self, binary_form=False):
+        x509 = self.connection.get_peer_certificate()
+
+        if not x509:
+            return x509
+
+        if binary_form:
+            return OpenSSL.crypto.dump_certificate(
+                OpenSSL.crypto.FILETYPE_ASN1,
+                x509)
+
+        return {
+            'subject': (
+                (('commonName', x509.get_subject().CN),),
+            ),
+            'subjectAltName': [
+                ('DNS', value)
+                for value in get_subj_alt_name(x509)
+            ]
+        }
+
+    def _reuse(self):
+        self._makefile_refs += 1
+
+    def _drop(self):
+        if self._makefile_refs < 1:
+            self.close()
+        else:
+            self._makefile_refs -= 1
+
+
+def _verify_callback(cnx, x509, err_no, err_depth, return_code):
+    return err_no == 0
+
+
+def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
+                    ca_certs=None, server_hostname=None,
+                    ssl_version=None):
+    ctx = OpenSSL.SSL.Context(_openssl_versions[ssl_version])
+    if certfile:
+        keyfile = keyfile or certfile  # Match behaviour of the normal python ssl library
+        ctx.use_certificate_file(certfile)
+    if keyfile:
+        ctx.use_privatekey_file(keyfile)
+    if cert_reqs != ssl.CERT_NONE:
+        ctx.set_verify(_openssl_verify[cert_reqs], _verify_callback)
+    if ca_certs:
+        try:
+            ctx.load_verify_locations(ca_certs, None)
+        except OpenSSL.SSL.Error as e:
+            raise ssl.SSLError('bad ca_certs: %r' % ca_certs, e)
+    else:
+        ctx.set_default_verify_paths()
+
+    # Disable TLS compression to migitate CRIME attack (issue #309)
+    OP_NO_COMPRESSION = 0x20000
+    ctx.set_options(OP_NO_COMPRESSION)
+
+    # Set list of supported ciphersuites.
+    ctx.set_cipher_list(DEFAULT_SSL_CIPHER_LIST)
+
+    cnx = OpenSSL.SSL.Connection(ctx, sock)
+    cnx.set_tlsext_host_name(server_hostname)
+    cnx.set_connect_state()
+    while True:
+        try:
+            cnx.do_handshake()
+        except OpenSSL.SSL.WantReadError:
+            select.select([sock], [], [])
+            continue
+        except OpenSSL.SSL.Error as e:
+            raise ssl.SSLError('bad handshake', e)
+        break
+
+    return WrappedSocket(cnx, sock)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/exceptions.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/exceptions.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/exceptions.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/exceptions.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,159 @@
+
+## Base Exceptions
+
+class HTTPError(Exception):
+    "Base exception used by this module."
+    pass
+
+class HTTPWarning(Warning):
+    "Base warning used by this module."
+    pass
+
+
+
+class PoolError(HTTPError):
+    "Base exception for errors caused within a pool."
+    def __init__(self, pool, message):
+        self.pool = pool
+        HTTPError.__init__(self, "%s: %s" % (pool, message))
+
+    def __reduce__(self):
+        # For pickling purposes.
+        return self.__class__, (None, None)
+
+
+class RequestError(PoolError):
+    "Base exception for PoolErrors that have associated URLs."
+    def __init__(self, pool, url, message):
+        self.url = url
+        PoolError.__init__(self, pool, message)
+
+    def __reduce__(self):
+        # For pickling purposes.
+        return self.__class__, (None, self.url, None)
+
+
+class SSLError(HTTPError):
+    "Raised when SSL certificate fails in an HTTPS connection."
+    pass
+
+
+class ProxyError(HTTPError):
+    "Raised when the connection to a proxy fails."
+    pass
+
+
+class DecodeError(HTTPError):
+    "Raised when automatic decoding based on Content-Type fails."
+    pass
+
+
+class ProtocolError(HTTPError):
+    "Raised when something unexpected happens mid-request/response."
+    pass
+
+
+#: Renamed to ProtocolError but aliased for backwards compatibility.
+ConnectionError = ProtocolError
+
+
+## Leaf Exceptions
+
+class MaxRetryError(RequestError):
+    """Raised when the maximum number of retries is exceeded.
+
+    :param pool: The connection pool
+    :type pool: :class:`~urllib3.connectionpool.HTTPConnectionPool`
+    :param string url: The requested Url
+    :param exceptions.Exception reason: The underlying error
+
+    """
+
+    def __init__(self, pool, url, reason=None):
+        self.reason = reason
+
+        message = "Max retries exceeded with url: %s (Caused by %r)" % (
+            url, reason)
+
+        RequestError.__init__(self, pool, url, message)
+
+
+class HostChangedError(RequestError):
+    "Raised when an existing pool gets a request for a foreign host."
+
+    def __init__(self, pool, url, retries=3):
+        message = "Tried to open a foreign host with url: %s" % url
+        RequestError.__init__(self, pool, url, message)
+        self.retries = retries
+
+
+class TimeoutStateError(HTTPError):
+    """ Raised when passing an invalid state to a timeout """
+    pass
+
+
+class TimeoutError(HTTPError):
+    """ Raised when a socket timeout error occurs.
+
+    Catching this error will catch both :exc:`ReadTimeoutErrors
+    <ReadTimeoutError>` and :exc:`ConnectTimeoutErrors <ConnectTimeoutError>`.
+    """
+    pass
+
+
+class ReadTimeoutError(TimeoutError, RequestError):
+    "Raised when a socket timeout occurs while receiving data from a server"
+    pass
+
+
+# This timeout error does not have a URL attached and needs to inherit from the
+# base HTTPError
+class ConnectTimeoutError(TimeoutError):
+    "Raised when a socket timeout occurs while connecting to a server"
+    pass
+
+
+class EmptyPoolError(PoolError):
+    "Raised when a pool runs out of connections and no more are allowed."
+    pass
+
+
+class ClosedPoolError(PoolError):
+    "Raised when a request enters a pool after the pool has been closed."
+    pass
+
+
+class LocationValueError(ValueError, HTTPError):
+    "Raised when there is something wrong with a given URL input."
+    pass
+
+
+class LocationParseError(LocationValueError):
+    "Raised when get_host or similar fails to parse the URL input."
+
+    def __init__(self, location):
+        message = "Failed to parse: %s" % location
+        HTTPError.__init__(self, message)
+
+        self.location = location
+
+
+class ResponseError(HTTPError):
+    "Used as a container for an error reason supplied in a MaxRetryError."
+    GENERIC_ERROR = 'too many error responses'
+    SPECIFIC_ERROR = 'too many {status_code} error responses'
+
+
+class SecurityWarning(HTTPWarning):
+    "Warned when perfoming security reducing actions"
+    pass
+
+
+class InsecureRequestWarning(SecurityWarning):
+    "Warned when making an unverified HTTPS request."
+    pass
+
+
+class SystemTimeWarning(SecurityWarning):
+    "Warned when system time is suspected to be wrong"
+    pass
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/fields.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/fields.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/fields.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/fields.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,177 @@
+import email.utils
+import mimetypes
+
+from .packages import six
+
+
+def guess_content_type(filename, default='application/octet-stream'):
+    """
+    Guess the "Content-Type" of a file.
+
+    :param filename:
+        The filename to guess the "Content-Type" of using :mod:`mimetypes`.
+    :param default:
+        If no "Content-Type" can be guessed, default to `default`.
+    """
+    if filename:
+        return mimetypes.guess_type(filename)[0] or default
+    return default
+
+
+def format_header_param(name, value):
+    """
+    Helper function to format and quote a single header parameter.
+
+    Particularly useful for header parameters which might contain
+    non-ASCII values, like file names. This follows RFC 2231, as
+    suggested by RFC 2388 Section 4.4.
+
+    :param name:
+        The name of the parameter, a string expected to be ASCII only.
+    :param value:
+        The value of the parameter, provided as a unicode string.
+    """
+    if not any(ch in value for ch in '"\\\r\n'):
+        result = '%s="%s"' % (name, value)
+        try:
+            result.encode('ascii')
+        except UnicodeEncodeError:
+            pass
+        else:
+            return result
+    if not six.PY3:  # Python 2:
+        value = value.encode('utf-8')
+    value = email.utils.encode_rfc2231(value, 'utf-8')
+    value = '%s*=%s' % (name, value)
+    return value
+
+
+class RequestField(object):
+    """
+    A data container for request body parameters.
+
+    :param name:
+        The name of this request field.
+    :param data:
+        The data/value body.
+    :param filename:
+        An optional filename of the request field.
+    :param headers:
+        An optional dict-like object of headers to initially use for the field.
+    """
+    def __init__(self, name, data, filename=None, headers=None):
+        self._name = name
+        self._filename = filename
+        self.data = data
+        self.headers = {}
+        if headers:
+            self.headers = dict(headers)
+
+    @classmethod
+    def from_tuples(cls, fieldname, value):
+        """
+        A :class:`~urllib3.fields.RequestField` factory from old-style tuple parameters.
+
+        Supports constructing :class:`~urllib3.fields.RequestField` from
+        parameter of key/value strings AND key/filetuple. A filetuple is a
+        (filename, data, MIME type) tuple where the MIME type is optional.
+        For example::
+
+            'foo': 'bar',
+            'fakefile': ('foofile.txt', 'contents of foofile'),
+            'realfile': ('barfile.txt', open('realfile').read()),
+            'typedfile': ('bazfile.bin', open('bazfile').read(), 'image/jpeg'),
+            'nonamefile': 'contents of nonamefile field',
+
+        Field names and filenames must be unicode.
+        """
+        if isinstance(value, tuple):
+            if len(value) == 3:
+                filename, data, content_type = value
+            else:
+                filename, data = value
+                content_type = guess_content_type(filename)
+        else:
+            filename = None
+            content_type = None
+            data = value
+
+        request_param = cls(fieldname, data, filename=filename)
+        request_param.make_multipart(content_type=content_type)
+
+        return request_param
+
+    def _render_part(self, name, value):
+        """
+        Overridable helper function to format a single header parameter.
+
+        :param name:
+            The name of the parameter, a string expected to be ASCII only.
+        :param value:
+            The value of the parameter, provided as a unicode string.
+        """
+        return format_header_param(name, value)
+
+    def _render_parts(self, header_parts):
+        """
+        Helper function to format and quote a single header.
+
+        Useful for single headers that are composed of multiple items. E.g.,
+        'Content-Disposition' fields.
+
+        :param header_parts:
+            A sequence of (k, v) typles or a :class:`dict` of (k, v) to format
+            as `k1="v1"; k2="v2"; ...`.
+        """
+        parts = []
+        iterable = header_parts
+        if isinstance(header_parts, dict):
+            iterable = header_parts.items()
+
+        for name, value in iterable:
+            if value:
+                parts.append(self._render_part(name, value))
+
+        return '; '.join(parts)
+
+    def render_headers(self):
+        """
+        Renders the headers for this request field.
+        """
+        lines = []
+
+        sort_keys = ['Content-Disposition', 'Content-Type', 'Content-Location']
+        for sort_key in sort_keys:
+            if self.headers.get(sort_key, False):
+                lines.append('%s: %s' % (sort_key, self.headers[sort_key]))
+
+        for header_name, header_value in self.headers.items():
+            if header_name not in sort_keys:
+                if header_value:
+                    lines.append('%s: %s' % (header_name, header_value))
+
+        lines.append('\r\n')
+        return '\r\n'.join(lines)
+
+    def make_multipart(self, content_disposition=None, content_type=None,
+                       content_location=None):
+        """
+        Makes this request field into a multipart request field.
+
+        This method overrides "Content-Disposition", "Content-Type" and
+        "Content-Location" headers to the request parameter.
+
+        :param content_type:
+            The 'Content-Type' of the request body.
+        :param content_location:
+            The 'Content-Location' of the request body.
+
+        """
+        self.headers['Content-Disposition'] = content_disposition or 'form-data'
+        self.headers['Content-Disposition'] += '; '.join([
+            '', self._render_parts(
+                (('name', self._name), ('filename', self._filename))
+            )
+        ])
+        self.headers['Content-Type'] = content_type
+        self.headers['Content-Location'] = content_location
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/filepost.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/filepost.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/filepost.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/filepost.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,93 @@
+import codecs
+
+from uuid import uuid4
+from io import BytesIO
+
+from .packages import six
+from .packages.six import b
+from .fields import RequestField
+
+writer = codecs.lookup('utf-8')[3]
+
+
+def choose_boundary():
+    """
+    Our embarassingly-simple replacement for mimetools.choose_boundary.
+    """
+    return uuid4().hex
+
+
+def iter_field_objects(fields):
+    """
+    Iterate over fields.
+
+    Supports list of (k, v) tuples and dicts, and lists of
+    :class:`~urllib3.fields.RequestField`.
+
+    """
+    if isinstance(fields, dict):
+        i = six.iteritems(fields)
+    else:
+        i = iter(fields)
+
+    for field in i:
+        if isinstance(field, RequestField):
+            yield field
+        else:
+            yield RequestField.from_tuples(*field)
+
+
+def iter_fields(fields):
+    """
+    .. deprecated:: 1.6
+
+    Iterate over fields.
+
+    The addition of :class:`~urllib3.fields.RequestField` makes this function
+    obsolete. Instead, use :func:`iter_field_objects`, which returns
+    :class:`~urllib3.fields.RequestField` objects.
+
+    Supports list of (k, v) tuples and dicts.
+    """
+    if isinstance(fields, dict):
+        return ((k, v) for k, v in six.iteritems(fields))
+
+    return ((k, v) for k, v in fields)
+
+
+def encode_multipart_formdata(fields, boundary=None):
+    """
+    Encode a dictionary of ``fields`` using the multipart/form-data MIME format.
+
+    :param fields:
+        Dictionary of fields or list of (key, :class:`~urllib3.fields.RequestField`).
+
+    :param boundary:
+        If not specified, then a random boundary will be generated using
+        :func:`mimetools.choose_boundary`.
+    """
+    body = BytesIO()
+    if boundary is None:
+        boundary = choose_boundary()
+
+    for field in iter_field_objects(fields):
+        body.write(b('--%s\r\n' % (boundary)))
+
+        writer(body).write(field.render_headers())
+        data = field.data
+
+        if isinstance(data, int):
+            data = str(data)  # Backwards compatibility
+
+        if isinstance(data, six.text_type):
+            writer(body).write(data)
+        else:
+            body.write(data)
+
+        body.write(b'\r\n')
+
+    body.write(b('--%s--\r\n' % (boundary)))
+
+    content_type = str('multipart/form-data; boundary=%s' % boundary)
+
+    return body.getvalue(), content_type
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/__init__.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,66 @@
+"""
+urllib3 - Thread-safe connection pooling and re-using.
+"""
+
+__author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
+__license__ = 'MIT'
+__version__ = 'dev'
+
+
+from .connectionpool import (
+    HTTPConnectionPool,
+    HTTPSConnectionPool,
+    connection_from_url
+)
+
+from . import exceptions
+from .filepost import encode_multipart_formdata
+from .poolmanager import PoolManager, ProxyManager, proxy_from_url
+from .response import HTTPResponse
+from .util.request import make_headers
+from .util.url import get_host
+from .util.timeout import Timeout
+from .util.retry import Retry
+
+
+# Set default logging handler to avoid "No handler found" warnings.
+import logging
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+    class NullHandler(logging.Handler):
+        def emit(self, record):
+            pass
+
+logging.getLogger(__name__).addHandler(NullHandler())
+
+def add_stderr_logger(level=logging.DEBUG):
+    """
+    Helper for quickly adding a StreamHandler to the logger. Useful for
+    debugging.
+
+    Returns the handler after adding it.
+    """
+    # This method needs to be in this __init__.py to get the __name__ correct
+    # even if urllib3 is vendored within another package.
+    logger = logging.getLogger(__name__)
+    handler = logging.StreamHandler()
+    handler.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
+    logger.addHandler(handler)
+    logger.setLevel(level)
+    logger.debug('Added a stderr logging handler to logger: %s' % __name__)
+    return handler
+
+# ... Clean up.
+del NullHandler
+
+
+# Set security warning to only go off once by default.
+import warnings
+warnings.simplefilter('always', exceptions.SecurityWarning)
+
+def disable_warnings(category=exceptions.HTTPWarning):
+    """
+    Helper for quickly disabling all urllib3 warnings.
+    """
+    warnings.simplefilter('ignore', category)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/__init__.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,4 @@
+from __future__ import absolute_import
+
+from . import ssl_match_hostname
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/ordered_dict.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/ordered_dict.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/ordered_dict.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/ordered_dict.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,259 @@
+# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy.
+# Passes Python2.7's test suite and incorporates all the latest updates.
+# Copyright 2009 Raymond Hettinger, released under the MIT License.
+# http://code.activestate.com/recipes/576693/
+try:
+    from thread import get_ident as _get_ident
+except ImportError:
+    from dummy_thread import get_ident as _get_ident
+
+try:
+    from _abcoll import KeysView, ValuesView, ItemsView
+except ImportError:
+    pass
+
+
+class OrderedDict(dict):
+    'Dictionary that remembers insertion order'
+    # An inherited dict maps keys to values.
+    # The inherited dict provides __getitem__, __len__, __contains__, and get.
+    # The remaining methods are order-aware.
+    # Big-O running times for all methods are the same as for regular dictionaries.
+
+    # The internal self.__map dictionary maps keys to links in a doubly linked list.
+    # The circular doubly linked list starts and ends with a sentinel element.
+    # The sentinel element never gets deleted (this simplifies the algorithm).
+    # Each link is stored as a list of length three:  [PREV, NEXT, KEY].
+
+    def __init__(self, *args, **kwds):
+        '''Initialize an ordered dictionary.  Signature is the same as for
+        regular dictionaries, but keyword arguments are not recommended
+        because their insertion order is arbitrary.
+
+        '''
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__root
+        except AttributeError:
+            self.__root = root = []                     # sentinel node
+            root[:] = [root, root, None]
+            self.__map = {}
+        self.__update(*args, **kwds)
+
+    def __setitem__(self, key, value, dict_setitem=dict.__setitem__):
+        'od.__setitem__(i, y) <==> od[i]=y'
+        # Setting a new item creates a new link which goes at the end of the linked
+        # list, and the inherited dictionary is updated with the new key/value pair.
+        if key not in self:
+            root = self.__root
+            last = root[0]
+            last[1] = root[0] = self.__map[key] = [last, root, key]
+        dict_setitem(self, key, value)
+
+    def __delitem__(self, key, dict_delitem=dict.__delitem__):
+        'od.__delitem__(y) <==> del od[y]'
+        # Deleting an existing item uses self.__map to find the link which is
+        # then removed by updating the links in the predecessor and successor nodes.
+        dict_delitem(self, key)
+        link_prev, link_next, key = self.__map.pop(key)
+        link_prev[1] = link_next
+        link_next[0] = link_prev
+
+    def __iter__(self):
+        'od.__iter__() <==> iter(od)'
+        root = self.__root
+        curr = root[1]
+        while curr is not root:
+            yield curr[2]
+            curr = curr[1]
+
+    def __reversed__(self):
+        'od.__reversed__() <==> reversed(od)'
+        root = self.__root
+        curr = root[0]
+        while curr is not root:
+            yield curr[2]
+            curr = curr[0]
+
+    def clear(self):
+        'od.clear() -> None.  Remove all items from od.'
+        try:
+            for node in self.__map.itervalues():
+                del node[:]
+            root = self.__root
+            root[:] = [root, root, None]
+            self.__map.clear()
+        except AttributeError:
+            pass
+        dict.clear(self)
+
+    def popitem(self, last=True):
+        '''od.popitem() -> (k, v), return and remove a (key, value) pair.
+        Pairs are returned in LIFO order if last is true or FIFO order if false.
+
+        '''
+        if not self:
+            raise KeyError('dictionary is empty')
+        root = self.__root
+        if last:
+            link = root[0]
+            link_prev = link[0]
+            link_prev[1] = root
+            root[0] = link_prev
+        else:
+            link = root[1]
+            link_next = link[1]
+            root[1] = link_next
+            link_next[0] = root
+        key = link[2]
+        del self.__map[key]
+        value = dict.pop(self, key)
+        return key, value
+
+    # -- the following methods do not depend on the internal structure --
+
+    def keys(self):
+        'od.keys() -> list of keys in od'
+        return list(self)
+
+    def values(self):
+        'od.values() -> list of values in od'
+        return [self[key] for key in self]
+
+    def items(self):
+        'od.items() -> list of (key, value) pairs in od'
+        return [(key, self[key]) for key in self]
+
+    def iterkeys(self):
+        'od.iterkeys() -> an iterator over the keys in od'
+        return iter(self)
+
+    def itervalues(self):
+        'od.itervalues -> an iterator over the values in od'
+        for k in self:
+            yield self[k]
+
+    def iteritems(self):
+        'od.iteritems -> an iterator over the (key, value) items in od'
+        for k in self:
+            yield (k, self[k])
+
+    def update(*args, **kwds):
+        '''od.update(E, **F) -> None.  Update od from dict/iterable E and F.
+
+        If E is a dict instance, does:           for k in E: od[k] = E[k]
+        If E has a .keys() method, does:         for k in E.keys(): od[k] = E[k]
+        Or if E is an iterable of items, does:   for k, v in E: od[k] = v
+        In either case, this is followed by:     for k, v in F.items(): od[k] = v
+
+        '''
+        if len(args) > 2:
+            raise TypeError('update() takes at most 2 positional '
+                            'arguments (%d given)' % (len(args),))
+        elif not args:
+            raise TypeError('update() takes at least 1 argument (0 given)')
+        self = args[0]
+        # Make progressively weaker assumptions about "other"
+        other = ()
+        if len(args) == 2:
+            other = args[1]
+        if isinstance(other, dict):
+            for key in other:
+                self[key] = other[key]
+        elif hasattr(other, 'keys'):
+            for key in other.keys():
+                self[key] = other[key]
+        else:
+            for key, value in other:
+                self[key] = value
+        for key, value in kwds.items():
+            self[key] = value
+
+    __update = update  # let subclasses override update without breaking __init__
+
+    __marker = object()
+
+    def pop(self, key, default=__marker):
+        '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value.
+        If key is not found, d is returned if given, otherwise KeyError is raised.
+
+        '''
+        if key in self:
+            result = self[key]
+            del self[key]
+            return result
+        if default is self.__marker:
+            raise KeyError(key)
+        return default
+
+    def setdefault(self, key, default=None):
+        'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
+        if key in self:
+            return self[key]
+        self[key] = default
+        return default
+
+    def __repr__(self, _repr_running={}):
+        'od.__repr__() <==> repr(od)'
+        call_key = id(self), _get_ident()
+        if call_key in _repr_running:
+            return '...'
+        _repr_running[call_key] = 1
+        try:
+            if not self:
+                return '%s()' % (self.__class__.__name__,)
+            return '%s(%r)' % (self.__class__.__name__, self.items())
+        finally:
+            del _repr_running[call_key]
+
+    def __reduce__(self):
+        'Return state information for pickling'
+        items = [[k, self[k]] for k in self]
+        inst_dict = vars(self).copy()
+        for k in vars(OrderedDict()):
+            inst_dict.pop(k, None)
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def copy(self):
+        'od.copy() -> a shallow copy of od'
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S
+        and values equal to v (which defaults to None).
+
+        '''
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        '''od.__eq__(y) <==> od==y.  Comparison to another OD is order-sensitive
+        while comparison to a regular mapping is order-insensitive.
+
+        '''
+        if isinstance(other, OrderedDict):
+            return len(self)==len(other) and self.items() == other.items()
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other
+
+    # -- the following methods are only used in Python 2.7 --
+
+    def viewkeys(self):
+        "od.viewkeys() -> a set-like object providing a view on od's keys"
+        return KeysView(self)
+
+    def viewvalues(self):
+        "od.viewvalues() -> an object providing a view on od's values"
+        return ValuesView(self)
+
+    def viewitems(self):
+        "od.viewitems() -> a set-like object providing a view on od's items"
+        return ItemsView(self)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/six.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/six.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/six.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/six.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,385 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+#Copyright (c) 2010-2011 Benjamin Peterson
+
+#Permission is hereby granted, free of charge, to any person obtaining a copy of
+#this software and associated documentation files (the "Software"), to deal in
+#the Software without restriction, including without limitation the rights to
+#use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+#the Software, and to permit persons to whom the Software is furnished to do so,
+#subject to the following conditions:
+
+#The above copyright notice and this permission notice shall be included in all
+#copies or substantial portions of the Software.
+
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+#FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+#COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+#IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+#CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.2.0"  # Revision 41c74fef2ded
+
+
+# True if we are running on Python 3.
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+            del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result)
+        # This is a bit ugly, but it avoids running this again.
+        delattr(tp, self.name)
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+
+class _MovedItems(types.ModuleType):
+    """Lazy loading of moved objects"""
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("winreg", "_winreg"),
+]
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+del attr
+
+moves = sys.modules[__name__ + ".moves"] = _MovedItems("moves")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+
+    _iterkeys = "keys"
+    _itervalues = "values"
+    _iteritems = "items"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+
+    _iterkeys = "iterkeys"
+    _itervalues = "itervalues"
+    _iteritems = "iteritems"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    Iterator = object
+
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+
+
+def iterkeys(d):
+    """Return an iterator over the keys of a dictionary."""
+    return iter(getattr(d, _iterkeys)())
+
+def itervalues(d):
+    """Return an iterator over the values of a dictionary."""
+    return iter(getattr(d, _itervalues)())
+
+def iteritems(d):
+    """Return an iterator over the (key, value) pairs of a dictionary."""
+    return iter(getattr(d, _iteritems)())
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+    def u(s):
+        return s
+    if sys.version_info[1] <= 1:
+        def int2byte(i):
+            return bytes((i,))
+    else:
+        # This is about 2x faster than the implementation above on 3.2+
+        int2byte = operator.methodcaller("to_bytes", 1, "big")
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+else:
+    def b(s):
+        return s
+    def u(s):
+        return unicode(s, "unicode_escape")
+    int2byte = chr
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+if PY3:
+    import builtins
+    exec_ = getattr(builtins, "exec")
+
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+
+    print_ = getattr(builtins, "print")
+    del builtins
+
+else:
+    def exec_(code, globs=None, locs=None):
+        """Execute code in a namespace."""
+        if globs is None:
+            frame = sys._getframe(1)
+            globs = frame.f_globals
+            if locs is None:
+                locs = frame.f_locals
+            del frame
+        elif locs is None:
+            locs = globs
+        exec("""exec code in globs, locs""")
+
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+    def print_(*args, **kwargs):
+        """The new-style print function."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+
+_add_doc(reraise, """Reraise an exception.""")
+
+
+def with_metaclass(meta, base=object):
+    """Create a base class with a metaclass."""
+    return meta("NewBase", (base,), {})
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,105 @@
+"""The match_hostname() function from Python 3.3.3, essential when using SSL."""
+
+# Note: This file is under the PSF license as the code comes from the python
+# stdlib.   http://docs.python.org/3/license.html
+
+import re
+
+__version__ = '3.4.0.2'
+
+class CertificateError(ValueError):
+    pass
+
+
+def _dnsname_match(dn, hostname, max_wildcards=1):
+    """Matching according to RFC 6125, section 6.4.3
+
+    http://tools.ietf.org/html/rfc6125#section-6.4.3
+    """
+    pats = []
+    if not dn:
+        return False
+
+    # Ported from python3-syntax:
+    # leftmost, *remainder = dn.split(r'.')
+    parts = dn.split(r'.')
+    leftmost = parts[0]
+    remainder = parts[1:]
+
+    wildcards = leftmost.count('*')
+    if wildcards > max_wildcards:
+        # Issue #17980: avoid denials of service by refusing more
+        # than one wildcard per fragment.  A survey of established
+        # policy among SSL implementations showed it to be a
+        # reasonable choice.
+        raise CertificateError(
+            "too many wildcards in certificate DNS name: " + repr(dn))
+
+    # speed up common case w/o wildcards
+    if not wildcards:
+        return dn.lower() == hostname.lower()
+
+    # RFC 6125, section 6.4.3, subitem 1.
+    # The client SHOULD NOT attempt to match a presented identifier in which
+    # the wildcard character comprises a label other than the left-most label.
+    if leftmost == '*':
+        # When '*' is a fragment by itself, it matches a non-empty dotless
+        # fragment.
+        pats.append('[^.]+')
+    elif leftmost.startswith('xn--') or hostname.startswith('xn--'):
+        # RFC 6125, section 6.4.3, subitem 3.
+        # The client SHOULD NOT attempt to match a presented identifier
+        # where the wildcard character is embedded within an A-label or
+        # U-label of an internationalized domain name.
+        pats.append(re.escape(leftmost))
+    else:
+        # Otherwise, '*' matches any dotless string, e.g. www*
+        pats.append(re.escape(leftmost).replace(r'\*', '[^.]*'))
+
+    # add the remaining fragments, ignore any wildcards
+    for frag in remainder:
+        pats.append(re.escape(frag))
+
+    pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
+    return pat.match(hostname)
+
+
+def match_hostname(cert, hostname):
+    """Verify that *cert* (in decoded format as returned by
+    SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 and RFC 6125
+    rules are followed, but IP addresses are not accepted for *hostname*.
+
+    CertificateError is raised on failure. On success, the function
+    returns nothing.
+    """
+    if not cert:
+        raise ValueError("empty or no certificate")
+    dnsnames = []
+    san = cert.get('subjectAltName', ())
+    for key, value in san:
+        if key == 'DNS':
+            if _dnsname_match(value, hostname):
+                return
+            dnsnames.append(value)
+    if not dnsnames:
+        # The subject is only checked when there is no dNSName entry
+        # in subjectAltName
+        for sub in cert.get('subject', ()):
+            for key, value in sub:
+                # XXX according to RFC 2818, the most specific Common Name
+                # must be used.
+                if key == 'commonName':
+                    if _dnsname_match(value, hostname):
+                        return
+                    dnsnames.append(value)
+    if len(dnsnames) > 1:
+        raise CertificateError("hostname %r "
+            "doesn't match either of %s"
+            % (hostname, ', '.join(map(repr, dnsnames))))
+    elif len(dnsnames) == 1:
+        raise CertificateError("hostname %r "
+            "doesn't match %r"
+            % (hostname, dnsnames[0]))
+    else:
+        raise CertificateError("no appropriate commonName or "
+            "subjectAltName fields were found")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,13 @@
+try:
+    # Python 3.2+
+    from ssl import CertificateError, match_hostname
+except ImportError:
+    try:
+        # Backport of the function from a pypi module
+        from backports.ssl_match_hostname import CertificateError, match_hostname
+    except ImportError:
+        # Our vendored copy
+        from ._implementation import CertificateError, match_hostname
+
+# Not needed, but documenting what we provide.
+__all__ = ('CertificateError', 'match_hostname')
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/poolmanager.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/poolmanager.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/poolmanager.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/poolmanager.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,265 @@
+import logging
+
+try:  # Python 3
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
+
+from ._collections import RecentlyUsedContainer
+from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
+from .connectionpool import port_by_scheme
+from .exceptions import LocationValueError
+from .request import RequestMethods
+from .util.url import parse_url
+from .util.retry import Retry
+
+
+__all__ = ['PoolManager', 'ProxyManager', 'proxy_from_url']
+
+
+pool_classes_by_scheme = {
+    'http': HTTPConnectionPool,
+    'https': HTTPSConnectionPool,
+}
+
+log = logging.getLogger(__name__)
+
+SSL_KEYWORDS = ('key_file', 'cert_file', 'cert_reqs', 'ca_certs',
+                'ssl_version')
+
+
+class PoolManager(RequestMethods):
+    """
+    Allows for arbitrary requests while transparently keeping track of
+    necessary connection pools for you.
+
+    :param num_pools:
+        Number of connection pools to cache before discarding the least
+        recently used pool.
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
+
+    :param \**connection_pool_kw:
+        Additional parameters are used to create fresh
+        :class:`urllib3.connectionpool.ConnectionPool` instances.
+
+    Example::
+
+        >>> manager = PoolManager(num_pools=2)
+        >>> r = manager.request('GET', 'http://google.com/')
+        >>> r = manager.request('GET', 'http://google.com/mail')
+        >>> r = manager.request('GET', 'http://yahoo.com/')
+        >>> len(manager.pools)
+        2
+
+    """
+
+    proxy = None
+
+    def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
+        RequestMethods.__init__(self, headers)
+        self.connection_pool_kw = connection_pool_kw
+        self.pools = RecentlyUsedContainer(num_pools,
+                                           dispose_func=lambda p: p.close())
+
+    def _new_pool(self, scheme, host, port):
+        """
+        Create a new :class:`ConnectionPool` based on host, port and scheme.
+
+        This method is used to actually create the connection pools handed out
+        by :meth:`connection_from_url` and companion methods. It is intended
+        to be overridden for customization.
+        """
+        pool_cls = pool_classes_by_scheme[scheme]
+        kwargs = self.connection_pool_kw
+        if scheme == 'http':
+            kwargs = self.connection_pool_kw.copy()
+            for kw in SSL_KEYWORDS:
+                kwargs.pop(kw, None)
+
+        return pool_cls(host, port, **kwargs)
+
+    def clear(self):
+        """
+        Empty our store of pools and direct them all to close.
+
+        This will not affect in-flight connections, but they will not be
+        re-used after completion.
+        """
+        self.pools.clear()
+
+    def connection_from_host(self, host, port=None, scheme='http'):
+        """
+        Get a :class:`ConnectionPool` based on the host, port, and scheme.
+
+        If ``port`` isn't given, it will be derived from the ``scheme`` using
+        ``urllib3.connectionpool.port_by_scheme``.
+        """
+
+        if not host:
+            raise LocationValueError("No host specified.")
+
+        scheme = scheme or 'http'
+        port = port or port_by_scheme.get(scheme, 80)
+        pool_key = (scheme, host, port)
+
+        with self.pools.lock:
+            # If the scheme, host, or port doesn't match existing open
+            # connections, open a new ConnectionPool.
+            pool = self.pools.get(pool_key)
+            if pool:
+                return pool
+
+            # Make a fresh ConnectionPool of the desired type
+            pool = self._new_pool(scheme, host, port)
+            self.pools[pool_key] = pool
+
+        return pool
+
+    def connection_from_url(self, url):
+        """
+        Similar to :func:`urllib3.connectionpool.connection_from_url` but
+        doesn't pass any additional parameters to the
+        :class:`urllib3.connectionpool.ConnectionPool` constructor.
+
+        Additional parameters are taken from the :class:`.PoolManager`
+        constructor.
+        """
+        u = parse_url(url)
+        return self.connection_from_host(u.host, port=u.port, scheme=u.scheme)
+
+    def urlopen(self, method, url, redirect=True, **kw):
+        """
+        Same as :meth:`urllib3.connectionpool.HTTPConnectionPool.urlopen`
+        with custom cross-host redirect logic and only sends the request-uri
+        portion of the ``url``.
+
+        The given ``url`` parameter must be absolute, such that an appropriate
+        :class:`urllib3.connectionpool.ConnectionPool` can be chosen for it.
+        """
+        u = parse_url(url)
+        conn = self.connection_from_host(u.host, port=u.port, scheme=u.scheme)
+
+        kw['assert_same_host'] = False
+        kw['redirect'] = False
+        if 'headers' not in kw:
+            kw['headers'] = self.headers
+
+        if self.proxy is not None and u.scheme == "http":
+            response = conn.urlopen(method, url, **kw)
+        else:
+            response = conn.urlopen(method, u.request_uri, **kw)
+
+        redirect_location = redirect and response.get_redirect_location()
+        if not redirect_location:
+            return response
+
+        # Support relative URLs for redirecting.
+        redirect_location = urljoin(url, redirect_location)
+
+        # RFC 7231, Section 6.4.4
+        if response.status == 303:
+            method = 'GET'
+
+        retries = kw.get('retries')
+        if not isinstance(retries, Retry):
+            retries = Retry.from_int(retries, redirect=redirect)
+
+        kw['retries'] = retries.increment(method, redirect_location)
+        kw['redirect'] = redirect
+
+        log.info("Redirecting %s -> %s" % (url, redirect_location))
+        return self.urlopen(method, redirect_location, **kw)
+
+
+class ProxyManager(PoolManager):
+    """
+    Behaves just like :class:`PoolManager`, but sends all requests through
+    the defined proxy, using the CONNECT method for HTTPS URLs.
+
+    :param proxy_url:
+        The URL of the proxy to be used.
+
+    :param proxy_headers:
+        A dictionary contaning headers that will be sent to the proxy. In case
+        of HTTP they are being sent with each request, while in the
+        HTTPS/CONNECT case they are sent only once. Could be used for proxy
+        authentication.
+
+    Example:
+        >>> proxy = urllib3.ProxyManager('http://localhost:3128/')
+        >>> r1 = proxy.request('GET', 'http://google.com/')
+        >>> r2 = proxy.request('GET', 'http://httpbin.org/')
+        >>> len(proxy.pools)
+        1
+        >>> r3 = proxy.request('GET', 'https://httpbin.org/')
+        >>> r4 = proxy.request('GET', 'https://twitter.com/')
+        >>> len(proxy.pools)
+        3
+
+    """
+
+    def __init__(self, proxy_url, num_pools=10, headers=None,
+                 proxy_headers=None, **connection_pool_kw):
+
+        if isinstance(proxy_url, HTTPConnectionPool):
+            proxy_url = '%s://%s:%i' % (proxy_url.scheme, proxy_url.host,
+                                        proxy_url.port)
+        proxy = parse_url(proxy_url)
+        if not proxy.port:
+            port = port_by_scheme.get(proxy.scheme, 80)
+            proxy = proxy._replace(port=port)
+
+        assert proxy.scheme in ("http", "https"), \
+            'Not supported proxy scheme %s' % proxy.scheme
+
+        self.proxy = proxy
+        self.proxy_headers = proxy_headers or {}
+
+        connection_pool_kw['_proxy'] = self.proxy
+        connection_pool_kw['_proxy_headers'] = self.proxy_headers
+
+        super(ProxyManager, self).__init__(
+            num_pools, headers, **connection_pool_kw)
+
+    def connection_from_host(self, host, port=None, scheme='http'):
+        if scheme == "https":
+            return super(ProxyManager, self).connection_from_host(
+                host, port, scheme)
+
+        return super(ProxyManager, self).connection_from_host(
+            self.proxy.host, self.proxy.port, self.proxy.scheme)
+
+    def _set_proxy_headers(self, url, headers=None):
+        """
+        Sets headers needed by proxies: specifically, the Accept and Host
+        headers. Only sets headers not provided by the user.
+        """
+        headers_ = {'Accept': '*/*'}
+
+        netloc = parse_url(url).netloc
+        if netloc:
+            headers_['Host'] = netloc
+
+        if headers:
+            headers_.update(headers)
+        return headers_
+
+    def urlopen(self, method, url, redirect=True, **kw):
+        "Same as HTTP(S)ConnectionPool.urlopen, ``url`` must be absolute."
+        u = parse_url(url)
+
+        if u.scheme == "http":
+            # For proxied HTTPS requests, httplib sets the necessary headers
+            # on the CONNECT to the proxy. For HTTP, we'll definitely
+            # need to set 'Host' at the very least.
+            headers = kw.get('headers', self.headers)
+            kw['headers'] = self._set_proxy_headers(url, headers)
+
+        return super(ProxyManager, self).urlopen(method, url, redirect=redirect, **kw)
+
+
+def proxy_from_url(url, **kw):
+    return ProxyManager(proxy_url=url, **kw)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/request.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/request.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/request.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/request.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,141 @@
+try:
+    from urllib.parse import urlencode
+except ImportError:
+    from urllib import urlencode
+
+from .filepost import encode_multipart_formdata
+
+
+__all__ = ['RequestMethods']
+
+
+class RequestMethods(object):
+    """
+    Convenience mixin for classes who implement a :meth:`urlopen` method, such
+    as :class:`~urllib3.connectionpool.HTTPConnectionPool` and
+    :class:`~urllib3.poolmanager.PoolManager`.
+
+    Provides behavior for making common types of HTTP request methods and
+    decides which type of request field encoding to use.
+
+    Specifically,
+
+    :meth:`.request_encode_url` is for sending requests whose fields are
+    encoded in the URL (such as GET, HEAD, DELETE).
+
+    :meth:`.request_encode_body` is for sending requests whose fields are
+    encoded in the *body* of the request using multipart or www-form-urlencoded
+    (such as for POST, PUT, PATCH).
+
+    :meth:`.request` is for making any kind of request, it will look up the
+    appropriate encoding format and use one of the above two methods to make
+    the request.
+
+    Initializer parameters:
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
+    """
+
+    _encode_url_methods = set(['DELETE', 'GET', 'HEAD', 'OPTIONS'])
+
+    def __init__(self, headers=None):
+        self.headers = headers or {}
+
+    def urlopen(self, method, url, body=None, headers=None,
+                encode_multipart=True, multipart_boundary=None,
+                **kw):  # Abstract
+        raise NotImplemented("Classes extending RequestMethods must implement "
+                             "their own ``urlopen`` method.")
+
+    def request(self, method, url, fields=None, headers=None, **urlopen_kw):
+        """
+        Make a request using :meth:`urlopen` with the appropriate encoding of
+        ``fields`` based on the ``method`` used.
+
+        This is a convenience method that requires the least amount of manual
+        effort. It can be used in most situations, while still having the
+        option to drop down to more specific methods when necessary, such as
+        :meth:`request_encode_url`, :meth:`request_encode_body`,
+        or even the lowest level :meth:`urlopen`.
+        """
+        method = method.upper()
+
+        if method in self._encode_url_methods:
+            return self.request_encode_url(method, url, fields=fields,
+                                           headers=headers,
+                                           **urlopen_kw)
+        else:
+            return self.request_encode_body(method, url, fields=fields,
+                                            headers=headers,
+                                            **urlopen_kw)
+
+    def request_encode_url(self, method, url, fields=None, **urlopen_kw):
+        """
+        Make a request using :meth:`urlopen` with the ``fields`` encoded in
+        the url. This is useful for request methods like GET, HEAD, DELETE, etc.
+        """
+        if fields:
+            url += '?' + urlencode(fields)
+        return self.urlopen(method, url, **urlopen_kw)
+
+    def request_encode_body(self, method, url, fields=None, headers=None,
+                            encode_multipart=True, multipart_boundary=None,
+                            **urlopen_kw):
+        """
+        Make a request using :meth:`urlopen` with the ``fields`` encoded in
+        the body. This is useful for request methods like POST, PUT, PATCH, etc.
+
+        When ``encode_multipart=True`` (default), then
+        :meth:`urllib3.filepost.encode_multipart_formdata` is used to encode
+        the payload with the appropriate content type. Otherwise
+        :meth:`urllib.urlencode` is used with the
+        'application/x-www-form-urlencoded' content type.
+
+        Multipart encoding must be used when posting files, and it's reasonably
+        safe to use it in other times too. However, it may break request
+        signing, such as with OAuth.
+
+        Supports an optional ``fields`` parameter of key/value strings AND
+        key/filetuple. A filetuple is a (filename, data, MIME type) tuple where
+        the MIME type is optional. For example::
+
+            fields = {
+                'foo': 'bar',
+                'fakefile': ('foofile.txt', 'contents of foofile'),
+                'realfile': ('barfile.txt', open('realfile').read()),
+                'typedfile': ('bazfile.bin', open('bazfile').read(),
+                              'image/jpeg'),
+                'nonamefile': 'contents of nonamefile field',
+            }
+
+        When uploading a file, providing a filename (the first parameter of the
+        tuple) is optional but recommended to best mimick behavior of browsers.
+
+        Note that if ``headers`` are supplied, the 'Content-Type' header will
+        be overwritten because it depends on the dynamic random boundary string
+        which is used to compose the body of the request. The random boundary
+        string can be explicitly set with the ``multipart_boundary`` parameter.
+        """
+        if headers is None:
+            headers = self.headers
+
+        extra_kw = {'headers': {}}
+
+        if fields:
+            if 'body' in urlopen_kw:
+                raise TypeError('request got values for both \'fields\' and \'body\', can only specify one.')
+
+            if encode_multipart:
+                body, content_type = encode_multipart_formdata(fields, boundary=multipart_boundary)
+            else:
+                body, content_type = urlencode(fields), 'application/x-www-form-urlencoded'
+
+            extra_kw['body'] = body
+            extra_kw['headers'] = {'Content-Type': content_type}
+
+        extra_kw['headers'].update(headers)
+        extra_kw.update(urlopen_kw)
+
+        return self.urlopen(method, url, **extra_kw)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/response.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/response.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/response.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/response.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,333 @@
+import zlib
+import io
+from socket import timeout as SocketTimeout
+
+from ._collections import HTTPHeaderDict
+from .exceptions import ProtocolError, DecodeError, ReadTimeoutError
+from .packages.six import string_types as basestring, binary_type
+from .connection import HTTPException, BaseSSLError
+from .util.response import is_fp_closed
+
+
+
+class DeflateDecoder(object):
+
+    def __init__(self):
+        self._first_try = True
+        self._data = binary_type()
+        self._obj = zlib.decompressobj()
+
+    def __getattr__(self, name):
+        return getattr(self._obj, name)
+
+    def decompress(self, data):
+        if not self._first_try:
+            return self._obj.decompress(data)
+
+        self._data += data
+        try:
+            return self._obj.decompress(data)
+        except zlib.error:
+            self._first_try = False
+            self._obj = zlib.decompressobj(-zlib.MAX_WBITS)
+            try:
+                return self.decompress(self._data)
+            finally:
+                self._data = None
+
+
+def _get_decoder(mode):
+    if mode == 'gzip':
+        return zlib.decompressobj(16 + zlib.MAX_WBITS)
+
+    return DeflateDecoder()
+
+
+class HTTPResponse(io.IOBase):
+    """
+    HTTP Response container.
+
+    Backwards-compatible to httplib's HTTPResponse but the response ``body`` is
+    loaded and decoded on-demand when the ``data`` property is accessed.  This
+    class is also compatible with the Python standard library's :mod:`io`
+    module, and can hence be treated as a readable object in the context of that
+    framework.
+
+    Extra parameters for behaviour not present in httplib.HTTPResponse:
+
+    :param preload_content:
+        If True, the response's body will be preloaded during construction.
+
+    :param decode_content:
+        If True, attempts to decode specific content-encoding's based on headers
+        (like 'gzip' and 'deflate') will be skipped and raw data will be used
+        instead.
+
+    :param original_response:
+        When this HTTPResponse wrapper is generated from an httplib.HTTPResponse
+        object, it's convenient to include the original for debug purposes. It's
+        otherwise unused.
+    """
+
+    CONTENT_DECODERS = ['gzip', 'deflate']
+    REDIRECT_STATUSES = [301, 302, 303, 307, 308]
+
+    def __init__(self, body='', headers=None, status=0, version=0, reason=None,
+                 strict=0, preload_content=True, decode_content=True,
+                 original_response=None, pool=None, connection=None):
+
+        self.headers = HTTPHeaderDict()
+        if headers:
+            self.headers.update(headers)
+        self.status = status
+        self.version = version
+        self.reason = reason
+        self.strict = strict
+        self.decode_content = decode_content
+
+        self._decoder = None
+        self._body = None
+        self._fp = None
+        self._original_response = original_response
+        self._fp_bytes_read = 0
+
+        if body and isinstance(body, (basestring, binary_type)):
+            self._body = body
+
+        self._pool = pool
+        self._connection = connection
+
+        if hasattr(body, 'read'):
+            self._fp = body
+
+        if preload_content and not self._body:
+            self._body = self.read(decode_content=decode_content)
+
+    def get_redirect_location(self):
+        """
+        Should we redirect and where to?
+
+        :returns: Truthy redirect location string if we got a redirect status
+            code and valid location. ``None`` if redirect status and no
+            location. ``False`` if not a redirect status code.
+        """
+        if self.status in self.REDIRECT_STATUSES:
+            return self.headers.get('location')
+
+        return False
+
+    def release_conn(self):
+        if not self._pool or not self._connection:
+            return
+
+        self._pool._put_conn(self._connection)
+        self._connection = None
+
+    @property
+    def data(self):
+        # For backwords-compat with earlier urllib3 0.4 and earlier.
+        if self._body:
+            return self._body
+
+        if self._fp:
+            return self.read(cache_content=True)
+
+    def tell(self):
+        """
+        Obtain the number of bytes pulled over the wire so far. May differ from
+        the amount of content returned by :meth:``HTTPResponse.read`` if bytes
+        are encoded on the wire (e.g, compressed).
+        """
+        return self._fp_bytes_read
+
+    def read(self, amt=None, decode_content=None, cache_content=False):
+        """
+        Similar to :meth:`httplib.HTTPResponse.read`, but with two additional
+        parameters: ``decode_content`` and ``cache_content``.
+
+        :param amt:
+            How much of the content to read. If specified, caching is skipped
+            because it doesn't make sense to cache partial content as the full
+            response.
+
+        :param decode_content:
+            If True, will attempt to decode the body based on the
+            'content-encoding' header.
+
+        :param cache_content:
+            If True, will save the returned data such that the same result is
+            returned despite of the state of the underlying file object. This
+            is useful if you want the ``.data`` property to continue working
+            after having ``.read()`` the file object. (Overridden if ``amt`` is
+            set.)
+        """
+        # Note: content-encoding value should be case-insensitive, per RFC 7230
+        # Section 3.2
+        content_encoding = self.headers.get('content-encoding', '').lower()
+        if self._decoder is None:
+            if content_encoding in self.CONTENT_DECODERS:
+                self._decoder = _get_decoder(content_encoding)
+        if decode_content is None:
+            decode_content = self.decode_content
+
+        if self._fp is None:
+            return
+
+        flush_decoder = False
+
+        try:
+            try:
+                if amt is None:
+                    # cStringIO doesn't like amt=None
+                    data = self._fp.read()
+                    flush_decoder = True
+                else:
+                    cache_content = False
+                    data = self._fp.read(amt)
+                    if amt != 0 and not data:  # Platform-specific: Buggy versions of Python.
+                        # Close the connection when no data is returned
+                        #
+                        # This is redundant to what httplib/http.client _should_
+                        # already do.  However, versions of python released before
+                        # December 15, 2012 (http://bugs.python.org/issue16298) do
+                        # not properly close the connection in all cases. There is
+                        # no harm in redundantly calling close.
+                        self._fp.close()
+                        flush_decoder = True
+
+            except SocketTimeout:
+                # FIXME: Ideally we'd like to include the url in the ReadTimeoutError but
+                # there is yet no clean way to get at it from this context.
+                raise ReadTimeoutError(self._pool, None, 'Read timed out.')
+
+            except BaseSSLError as e:
+                # FIXME: Is there a better way to differentiate between SSLErrors?
+                if not 'read operation timed out' in str(e):  # Defensive:
+                    # This shouldn't happen but just in case we're missing an edge
+                    # case, let's avoid swallowing SSL errors.
+                    raise
+
+                raise ReadTimeoutError(self._pool, None, 'Read timed out.')
+
+            except HTTPException as e:
+                # This includes IncompleteRead.
+                raise ProtocolError('Connection broken: %r' % e, e)
+
+            self._fp_bytes_read += len(data)
+
+            try:
+                if decode_content and self._decoder:
+                    data = self._decoder.decompress(data)
+            except (IOError, zlib.error) as e:
+                raise DecodeError(
+                    "Received response with content-encoding: %s, but "
+                    "failed to decode it." % content_encoding, e)
+
+            if flush_decoder and decode_content and self._decoder:
+                buf = self._decoder.decompress(binary_type())
+                data += buf + self._decoder.flush()
+
+            if cache_content:
+                self._body = data
+
+            return data
+
+        finally:
+            if self._original_response and self._original_response.isclosed():
+                self.release_conn()
+
+    def stream(self, amt=2**16, decode_content=None):
+        """
+        A generator wrapper for the read() method. A call will block until
+        ``amt`` bytes have been read from the connection or until the
+        connection is closed.
+
+        :param amt:
+            How much of the content to read. The generator will return up to
+            much data per iteration, but may return less. This is particularly
+            likely when using compressed data. However, the empty string will
+            never be returned.
+
+        :param decode_content:
+            If True, will attempt to decode the body based on the
+            'content-encoding' header.
+        """
+        while not is_fp_closed(self._fp):
+            data = self.read(amt=amt, decode_content=decode_content)
+
+            if data:
+                yield data
+
+    @classmethod
+    def from_httplib(ResponseCls, r, **response_kw):
+        """
+        Given an :class:`httplib.HTTPResponse` instance ``r``, return a
+        corresponding :class:`urllib3.response.HTTPResponse` object.
+
+        Remaining parameters are passed to the HTTPResponse constructor, along
+        with ``original_response=r``.
+        """
+
+        headers = HTTPHeaderDict()
+        for k, v in r.getheaders():
+            headers.add(k, v)
+
+        # HTTPResponse objects in Python 3 don't have a .strict attribute
+        strict = getattr(r, 'strict', 0)
+        return ResponseCls(body=r,
+                           headers=headers,
+                           status=r.status,
+                           version=r.version,
+                           reason=r.reason,
+                           strict=strict,
+                           original_response=r,
+                           **response_kw)
+
+    # Backwards-compatibility methods for httplib.HTTPResponse
+    def getheaders(self):
+        return self.headers
+
+    def getheader(self, name, default=None):
+        return self.headers.get(name, default)
+
+    # Overrides from io.IOBase
+    def close(self):
+        if not self.closed:
+            self._fp.close()
+
+    @property
+    def closed(self):
+        if self._fp is None:
+            return True
+        elif hasattr(self._fp, 'closed'):
+            return self._fp.closed
+        elif hasattr(self._fp, 'isclosed'):  # Python 2
+            return self._fp.isclosed()
+        else:
+            return True
+
+    def fileno(self):
+        if self._fp is None:
+            raise IOError("HTTPResponse has no file to get a fileno from")
+        elif hasattr(self._fp, "fileno"):
+            return self._fp.fileno()
+        else:
+            raise IOError("The file-like object this HTTPResponse is wrapped "
+                          "around has no file descriptor")
+
+    def flush(self):
+        if self._fp is not None and hasattr(self._fp, 'flush'):
+            return self._fp.flush()
+
+    def readable(self):
+        # This method is required for `io` module compatibility.
+        return True
+
+    def readinto(self, b):
+        # This method is required for `io` module compatibility.
+        temp = self.read(len(b))
+        if len(temp) == 0:
+            return 0
+        else:
+            b[:len(temp)] = temp
+            return len(temp)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/connection.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/connection.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/connection.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/connection.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,97 @@
+import socket
+try:
+    from select import poll, POLLIN
+except ImportError:  # `poll` doesn't exist on OSX and other platforms
+    poll = False
+    try:
+        from select import select
+    except ImportError:  # `select` doesn't exist on AppEngine.
+        select = False
+
+
+def is_connection_dropped(conn):  # Platform-specific
+    """
+    Returns True if the connection is dropped and should be closed.
+
+    :param conn:
+        :class:`httplib.HTTPConnection` object.
+
+    Note: For platforms like AppEngine, this will always return ``False`` to
+    let the platform handle connection recycling transparently for us.
+    """
+    sock = getattr(conn, 'sock', False)
+    if sock is False:  # Platform-specific: AppEngine
+        return False
+    if sock is None:  # Connection already closed (such as by httplib).
+        return True
+
+    if not poll:
+        if not select:  # Platform-specific: AppEngine
+            return False
+
+        try:
+            return select([sock], [], [], 0.0)[0]
+        except socket.error:
+            return True
+
+    # This version is better on platforms that support it.
+    p = poll()
+    p.register(sock, POLLIN)
+    for (fno, ev) in p.poll(0.0):
+        if fno == sock.fileno():
+            # Either data is buffered (bad), or the connection is dropped.
+            return True
+
+
+# This function is copied from socket.py in the Python 2.7 standard
+# library test suite. Added to its signature is only `socket_options`.
+def create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
+                      source_address=None, socket_options=None):
+    """Connect to *address* and return the socket object.
+
+    Convenience function.  Connect to *address* (a 2-tuple ``(host,
+    port)``) and return the socket object.  Passing the optional
+    *timeout* parameter will set the timeout on the socket instance
+    before attempting to connect.  If no *timeout* is supplied, the
+    global default timeout setting returned by :func:`getdefaulttimeout`
+    is used.  If *source_address* is set it must be a tuple of (host, port)
+    for the socket to bind as a source address before making the connection.
+    An host of '' or port 0 tells the OS to use the default.
+    """
+
+    host, port = address
+    err = None
+    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
+        af, socktype, proto, canonname, sa = res
+        sock = None
+        try:
+            sock = socket.socket(af, socktype, proto)
+
+            # If provided, set socket level options before connecting.
+            # This is the only addition urllib3 makes to this function.
+            _set_socket_options(sock, socket_options)
+
+            if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
+                sock.settimeout(timeout)
+            if source_address:
+                sock.bind(source_address)
+            sock.connect(sa)
+            return sock
+
+        except socket.error as _:
+            err = _
+            if sock is not None:
+                sock.close()
+
+    if err is not None:
+        raise err
+    else:
+        raise socket.error("getaddrinfo returns an empty list")
+
+
+def _set_socket_options(sock, options):
+    if options is None:
+        return
+
+    for opt in options:
+        sock.setsockopt(*opt)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/__init__.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,24 @@
+# For backwards compatibility, provide imports that used to be here.
+from .connection import is_connection_dropped
+from .request import make_headers
+from .response import is_fp_closed
+from .ssl_ import (
+    SSLContext,
+    HAS_SNI,
+    assert_fingerprint,
+    resolve_cert_reqs,
+    resolve_ssl_version,
+    ssl_wrap_socket,
+)
+from .timeout import (
+    current_time,
+    Timeout,
+)
+
+from .retry import Retry
+from .url import (
+    get_host,
+    parse_url,
+    split_first,
+    Url,
+)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/request.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/request.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/request.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/request.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,71 @@
+from base64 import b64encode
+
+from ..packages.six import b
+
+ACCEPT_ENCODING = 'gzip,deflate'
+
+
+def make_headers(keep_alive=None, accept_encoding=None, user_agent=None,
+                 basic_auth=None, proxy_basic_auth=None, disable_cache=None):
+    """
+    Shortcuts for generating request headers.
+
+    :param keep_alive:
+        If ``True``, adds 'connection: keep-alive' header.
+
+    :param accept_encoding:
+        Can be a boolean, list, or string.
+        ``True`` translates to 'gzip,deflate'.
+        List will get joined by comma.
+        String will be used as provided.
+
+    :param user_agent:
+        String representing the user-agent you want, such as
+        "python-urllib3/0.6"
+
+    :param basic_auth:
+        Colon-separated username:password string for 'authorization: basic ...'
+        auth header.
+
+    :param proxy_basic_auth:
+        Colon-separated username:password string for 'proxy-authorization: basic ...'
+        auth header.
+
+    :param disable_cache:
+        If ``True``, adds 'cache-control: no-cache' header.
+
+    Example::
+
+        >>> make_headers(keep_alive=True, user_agent="Batman/1.0")
+        {'connection': 'keep-alive', 'user-agent': 'Batman/1.0'}
+        >>> make_headers(accept_encoding=True)
+        {'accept-encoding': 'gzip,deflate'}
+    """
+    headers = {}
+    if accept_encoding:
+        if isinstance(accept_encoding, str):
+            pass
+        elif isinstance(accept_encoding, list):
+            accept_encoding = ','.join(accept_encoding)
+        else:
+            accept_encoding = ACCEPT_ENCODING
+        headers['accept-encoding'] = accept_encoding
+
+    if user_agent:
+        headers['user-agent'] = user_agent
+
+    if keep_alive:
+        headers['connection'] = 'keep-alive'
+
+    if basic_auth:
+        headers['authorization'] = 'Basic ' + \
+            b64encode(b(basic_auth)).decode('utf-8')
+
+    if proxy_basic_auth:
+        headers['proxy-authorization'] = 'Basic ' + \
+            b64encode(b(proxy_basic_auth)).decode('utf-8')
+
+    if disable_cache:
+        headers['cache-control'] = 'no-cache'
+
+    return headers
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/response.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/response.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/response.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/response.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,22 @@
+def is_fp_closed(obj):
+    """
+    Checks whether a given file-like object is closed.
+
+    :param obj:
+        The file-like object to check.
+    """
+
+    try:
+        # Check via the official file-like-object way.
+        return obj.closed
+    except AttributeError:
+        pass
+
+    try:
+        # Check if the object is a container for another file-like object that
+        # gets released on exhaustion (e.g. HTTPResponse).
+        return obj.fp is None
+    except AttributeError:
+        pass
+
+    raise ValueError("Unable to determine whether fp is closed.")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/retry.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/retry.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/retry.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/retry.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,285 @@
+import time
+import logging
+
+from ..exceptions import (
+    ConnectTimeoutError,
+    MaxRetryError,
+    ProtocolError,
+    ReadTimeoutError,
+    ResponseError,
+)
+from ..packages import six
+
+
+log = logging.getLogger(__name__)
+
+
+class Retry(object):
+    """ Retry configuration.
+
+    Each retry attempt will create a new Retry object with updated values, so
+    they can be safely reused.
+
+    Retries can be defined as a default for a pool::
+
+        retries = Retry(connect=5, read=2, redirect=5)
+        http = PoolManager(retries=retries)
+        response = http.request('GET', 'http://example.com/')
+
+    Or per-request (which overrides the default for the pool)::
+
+        response = http.request('GET', 'http://example.com/', retries=Retry(10))
+
+    Retries can be disabled by passing ``False``::
+
+        response = http.request('GET', 'http://example.com/', retries=False)
+
+    Errors will be wrapped in :class:`~urllib3.exceptions.MaxRetryError` unless
+    retries are disabled, in which case the causing exception will be raised.
+
+    :param int total:
+        Total number of retries to allow. Takes precedence over other counts.
+
+        Set to ``None`` to remove this constraint and fall back on other
+        counts. It's a good idea to set this to some sensibly-high value to
+        account for unexpected edge cases and avoid infinite retry loops.
+
+        Set to ``0`` to fail on the first retry.
+
+        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
+
+    :param int connect:
+        How many connection-related errors to retry on.
+
+        These are errors raised before the request is sent to the remote server,
+        which we assume has not triggered the server to process the request.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+    :param int read:
+        How many times to retry on read errors.
+
+        These errors are raised after the request was sent to the server, so the
+        request may have side-effects.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+    :param int redirect:
+        How many redirects to perform. Limit this to avoid infinite redirect
+        loops.
+
+        A redirect is a HTTP response with a status code 301, 302, 303, 307 or
+        308.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
+
+    :param iterable method_whitelist:
+        Set of uppercased HTTP method verbs that we should retry on.
+
+        By default, we only retry on methods which are considered to be
+        indempotent (multiple requests with the same parameters end with the
+        same state). See :attr:`Retry.DEFAULT_METHOD_WHITELIST`.
+
+    :param iterable status_forcelist:
+        A set of HTTP status codes that we should force a retry on.
+
+        By default, this is disabled with ``None``.
+
+    :param float backoff_factor:
+        A backoff factor to apply between attempts. urllib3 will sleep for::
+
+            {backoff factor} * (2 ^ ({number of total retries} - 1))
+
+        seconds. If the backoff_factor is 0.1, then :func:`.sleep` will sleep
+        for [0.1s, 0.2s, 0.4s, ...] between retries. It will never be longer
+        than :attr:`Retry.MAX_BACKOFF`.
+
+        By default, backoff is disabled (set to 0).
+
+    :param bool raise_on_redirect: Whether, if the number of redirects is
+        exhausted, to raise a MaxRetryError, or to return a response with a
+        response code in the 3xx range.
+    """
+
+    DEFAULT_METHOD_WHITELIST = frozenset([
+        'HEAD', 'GET', 'PUT', 'DELETE', 'OPTIONS', 'TRACE'])
+
+    #: Maximum backoff time.
+    BACKOFF_MAX = 120
+
+    def __init__(self, total=10, connect=None, read=None, redirect=None,
+                 method_whitelist=DEFAULT_METHOD_WHITELIST, status_forcelist=None,
+                 backoff_factor=0, raise_on_redirect=True, _observed_errors=0):
+
+        self.total = total
+        self.connect = connect
+        self.read = read
+
+        if redirect is False or total is False:
+            redirect = 0
+            raise_on_redirect = False
+
+        self.redirect = redirect
+        self.status_forcelist = status_forcelist or set()
+        self.method_whitelist = method_whitelist
+        self.backoff_factor = backoff_factor
+        self.raise_on_redirect = raise_on_redirect
+        self._observed_errors = _observed_errors # TODO: use .history instead?
+
+    def new(self, **kw):
+        params = dict(
+            total=self.total,
+            connect=self.connect, read=self.read, redirect=self.redirect,
+            method_whitelist=self.method_whitelist,
+            status_forcelist=self.status_forcelist,
+            backoff_factor=self.backoff_factor,
+            raise_on_redirect=self.raise_on_redirect,
+            _observed_errors=self._observed_errors,
+        )
+        params.update(kw)
+        return type(self)(**params)
+
+    @classmethod
+    def from_int(cls, retries, redirect=True, default=None):
+        """ Backwards-compatibility for the old retries format."""
+        if retries is None:
+            retries = default if default is not None else cls.DEFAULT
+
+        if isinstance(retries, Retry):
+            return retries
+
+        redirect = bool(redirect) and None
+        new_retries = cls(retries, redirect=redirect)
+        log.debug("Converted retries value: %r -> %r" % (retries, new_retries))
+        return new_retries
+
+    def get_backoff_time(self):
+        """ Formula for computing the current backoff
+
+        :rtype: float
+        """
+        if self._observed_errors <= 1:
+            return 0
+
+        backoff_value = self.backoff_factor * (2 ** (self._observed_errors - 1))
+        return min(self.BACKOFF_MAX, backoff_value)
+
+    def sleep(self):
+        """ Sleep between retry attempts using an exponential backoff.
+
+        By default, the backoff factor is 0 and this method will return
+        immediately.
+        """
+        backoff = self.get_backoff_time()
+        if backoff <= 0:
+            return
+        time.sleep(backoff)
+
+    def _is_connection_error(self, err):
+        """ Errors when we're fairly sure that the server did not receive the
+        request, so it should be safe to retry.
+        """
+        return isinstance(err, ConnectTimeoutError)
+
+    def _is_read_error(self, err):
+        """ Errors that occur after the request has been started, so we should
+        assume that the server began processing it.
+        """
+        return isinstance(err, (ReadTimeoutError, ProtocolError))
+
+    def is_forced_retry(self, method, status_code):
+        """ Is this method/response retryable? (Based on method/codes whitelists)
+        """
+        if self.method_whitelist and method.upper() not in self.method_whitelist:
+            return False
+
+        return self.status_forcelist and status_code in self.status_forcelist
+
+    def is_exhausted(self):
+        """ Are we out of retries? """
+        retry_counts = (self.total, self.connect, self.read, self.redirect)
+        retry_counts = list(filter(None, retry_counts))
+        if not retry_counts:
+            return False
+
+        return min(retry_counts) < 0
+
+    def increment(self, method=None, url=None, response=None, error=None, _pool=None, _stacktrace=None):
+        """ Return a new Retry object with incremented retry counters.
+
+        :param response: A response object, or None, if the server did not
+            return a response.
+        :type response: :class:`~urllib3.response.HTTPResponse`
+        :param Exception error: An error encountered during the request, or
+            None if the response was received successfully.
+
+        :return: A new ``Retry`` object.
+        """
+        if self.total is False and error:
+            # Disabled, indicate to re-raise the error.
+            raise six.reraise(type(error), error, _stacktrace)
+
+        total = self.total
+        if total is not None:
+            total -= 1
+
+        _observed_errors = self._observed_errors
+        connect = self.connect
+        read = self.read
+        redirect = self.redirect
+        cause = 'unknown'
+
+        if error and self._is_connection_error(error):
+            # Connect retry?
+            if connect is False:
+                raise six.reraise(type(error), error, _stacktrace)
+            elif connect is not None:
+                connect -= 1
+            _observed_errors += 1
+
+        elif error and self._is_read_error(error):
+            # Read retry?
+            if read is False:
+                raise six.reraise(type(error), error, _stacktrace)
+            elif read is not None:
+                read -= 1
+            _observed_errors += 1
+
+        elif response and response.get_redirect_location():
+            # Redirect retry?
+            if redirect is not None:
+                redirect -= 1
+            cause = 'too many redirects'
+
+        else:
+            # Incrementing because of a server error like a 500 in
+            # status_forcelist and a the given method is in the whitelist
+            _observed_errors += 1
+            cause = ResponseError.GENERIC_ERROR
+            if response and response.status:
+                cause = ResponseError.SPECIFIC_ERROR.format(
+                    status_code=response.status)
+
+        new_retry = self.new(
+            total=total,
+            connect=connect, read=read, redirect=redirect,
+            _observed_errors=_observed_errors)
+
+        if new_retry.is_exhausted():
+            raise MaxRetryError(_pool, url, error or ResponseError(cause))
+
+        log.debug("Incremented Retry for (url='%s'): %r" % (url, new_retry))
+
+        return new_retry
+
+
+    def __repr__(self):
+        return ('{cls.__name__}(total={self.total}, connect={self.connect}, '
+                'read={self.read}, redirect={self.redirect})').format(
+                    cls=type(self), self=self)
+
+
+# For backwards compatibility (equivalent to pre-v1.9):
+Retry.DEFAULT = Retry(3)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/ssl_.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/ssl_.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/ssl_.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/ssl_.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,254 @@
+from binascii import hexlify, unhexlify
+from hashlib import md5, sha1
+
+from ..exceptions import SSLError
+
+
+SSLContext = None
+HAS_SNI = False
+create_default_context = None
+
+import errno
+import ssl
+
+try:  # Test for SSL features
+    from ssl import wrap_socket, CERT_NONE, PROTOCOL_SSLv23
+    from ssl import HAS_SNI  # Has SNI?
+except ImportError:
+    pass
+
+
+try:
+    from ssl import OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_COMPRESSION
+except ImportError:
+    OP_NO_SSLv2, OP_NO_SSLv3 = 0x1000000, 0x2000000
+    OP_NO_COMPRESSION = 0x20000
+
+try:
+    from ssl import _DEFAULT_CIPHERS
+except ImportError:
+    _DEFAULT_CIPHERS = (
+        'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:'
+        'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:ECDH+RC4:'
+        'DH+RC4:RSA+RC4:!aNULL:!eNULL:!MD5'
+    )
+
+try:
+    from ssl import SSLContext  # Modern SSL?
+except ImportError:
+    import sys
+
+    class SSLContext(object):  # Platform-specific: Python 2 & 3.1
+        supports_set_ciphers = sys.version_info >= (2, 7)
+
+        def __init__(self, protocol_version):
+            self.protocol = protocol_version
+            # Use default values from a real SSLContext
+            self.check_hostname = False
+            self.verify_mode = ssl.CERT_NONE
+            self.ca_certs = None
+            self.options = 0
+            self.certfile = None
+            self.keyfile = None
+            self.ciphers = None
+
+        def load_cert_chain(self, certfile, keyfile):
+            self.certfile = certfile
+            self.keyfile = keyfile
+
+        def load_verify_locations(self, location):
+            self.ca_certs = location
+
+        def set_ciphers(self, cipher_suite):
+            if not self.supports_set_ciphers:
+                raise TypeError(
+                    'Your version of Python does not support setting '
+                    'a custom cipher suite. Please upgrade to Python '
+                    '2.7, 3.2, or later if you need this functionality.'
+                )
+            self.ciphers = cipher_suite
+
+        def wrap_socket(self, socket, server_hostname=None):
+            kwargs = {
+                'keyfile': self.keyfile,
+                'certfile': self.certfile,
+                'ca_certs': self.ca_certs,
+                'cert_reqs': self.verify_mode,
+                'ssl_version': self.protocol,
+            }
+            if self.supports_set_ciphers:  # Platform-specific: Python 2.7+
+                return wrap_socket(socket, ciphers=self.ciphers, **kwargs)
+            else:  # Platform-specific: Python 2.6
+                return wrap_socket(socket, **kwargs)
+
+
+def assert_fingerprint(cert, fingerprint):
+    """
+    Checks if given fingerprint matches the supplied certificate.
+
+    :param cert:
+        Certificate as bytes object.
+    :param fingerprint:
+        Fingerprint as string of hexdigits, can be interspersed by colons.
+    """
+
+    # Maps the length of a digest to a possible hash function producing
+    # this digest.
+    hashfunc_map = {
+        16: md5,
+        20: sha1
+    }
+
+    fingerprint = fingerprint.replace(':', '').lower()
+    digest_length, odd = divmod(len(fingerprint), 2)
+
+    if odd or digest_length not in hashfunc_map:
+        raise SSLError('Fingerprint is of invalid length.')
+
+    # We need encode() here for py32; works on py2 and p33.
+    fingerprint_bytes = unhexlify(fingerprint.encode())
+
+    hashfunc = hashfunc_map[digest_length]
+
+    cert_digest = hashfunc(cert).digest()
+
+    if not cert_digest == fingerprint_bytes:
+        raise SSLError('Fingerprints did not match. Expected "{0}", got "{1}".'
+                       .format(hexlify(fingerprint_bytes),
+                               hexlify(cert_digest)))
+
+
+def resolve_cert_reqs(candidate):
+    """
+    Resolves the argument to a numeric constant, which can be passed to
+    the wrap_socket function/method from the ssl module.
+    Defaults to :data:`ssl.CERT_NONE`.
+    If given a string it is assumed to be the name of the constant in the
+    :mod:`ssl` module or its abbrevation.
+    (So you can specify `REQUIRED` instead of `CERT_REQUIRED`.
+    If it's neither `None` nor a string we assume it is already the numeric
+    constant which can directly be passed to wrap_socket.
+    """
+    if candidate is None:
+        return CERT_NONE
+
+    if isinstance(candidate, str):
+        res = getattr(ssl, candidate, None)
+        if res is None:
+            res = getattr(ssl, 'CERT_' + candidate)
+        return res
+
+    return candidate
+
+
+def resolve_ssl_version(candidate):
+    """
+    like resolve_cert_reqs
+    """
+    if candidate is None:
+        return PROTOCOL_SSLv23
+
+    if isinstance(candidate, str):
+        res = getattr(ssl, candidate, None)
+        if res is None:
+            res = getattr(ssl, 'PROTOCOL_' + candidate)
+        return res
+
+    return candidate
+
+
+def create_urllib3_context(ssl_version=None, cert_reqs=ssl.CERT_REQUIRED,
+                           options=None, ciphers=None):
+    """All arguments have the same meaning as ``ssl_wrap_socket``.
+
+    By default, this function does a lot of the same work that
+    ``ssl.create_default_context`` does on Python 3.4+. It:
+
+    - Disables SSLv2, SSLv3, and compression
+    - Sets a restricted set of server ciphers
+
+    If you wish to enable SSLv3, you can do::
+
+        from urllib3.util import ssl_
+        context = ssl_.create_urllib3_context()
+        context.options &= ~ssl_.OP_NO_SSLv3
+
+    You can do the same to enable compression (substituting ``COMPRESSION``
+    for ``SSLv3`` in the last line above).
+
+    :param ssl_version:
+        The desired protocol version to use. This will default to
+        PROTOCOL_SSLv23 which will negotiate the highest protocol that both
+        the server and your installation of OpenSSL support.
+    :param cert_reqs:
+        Whether to require the certificate verification. This defaults to
+        ``ssl.CERT_REQUIRED``.
+    :param options:
+        Specific OpenSSL options. These default to ``ssl.OP_NO_SSLv2``,
+        ``ssl.OP_NO_SSLv3``, ``ssl.OP_NO_COMPRESSION``.
+    :param ciphers:
+        Which cipher suites to allow the server to select.
+    :returns:
+        Constructed SSLContext object with specified options
+    :rtype: SSLContext
+    """
+    context = SSLContext(ssl_version or ssl.PROTOCOL_SSLv23)
+
+    if options is None:
+        options = 0
+        # SSLv2 is easily broken and is considered harmful and dangerous
+        options |= OP_NO_SSLv2
+        # SSLv3 has several problems and is now dangerous
+        options |= OP_NO_SSLv3
+        # Disable compression to prevent CRIME attacks for OpenSSL 1.0+
+        # (issue #309)
+        options |= OP_NO_COMPRESSION
+
+    context.options |= options
+
+    if getattr(context, 'supports_set_ciphers', True):  # Platform-specific: Python 2.6
+        context.set_ciphers(ciphers or _DEFAULT_CIPHERS)
+
+    context.verify_mode = cert_reqs
+    if getattr(context, 'check_hostname', None) is not None:  # Platform-specific: Python 3.2
+        context.check_hostname = (context.verify_mode == ssl.CERT_REQUIRED)
+    return context
+
+
+def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
+                    ca_certs=None, server_hostname=None,
+                    ssl_version=None, ciphers=None, ssl_context=None):
+    """
+    All arguments except for server_hostname and ssl_context have the same
+    meaning as they do when using :func:`ssl.wrap_socket`.
+
+    :param server_hostname:
+        When SNI is supported, the expected hostname of the certificate
+    :param ssl_context:
+        A pre-made :class:`SSLContext` object. If none is provided, one will
+        be created using :func:`create_urllib3_context`.
+    :param ciphers:
+        A string of ciphers we wish the client to support. This is not
+        supported on Python 2.6 as the ssl module does not support it.
+    """
+    context = ssl_context
+    if context is None:
+        context = create_urllib3_context(ssl_version, cert_reqs,
+                                         ciphers=ciphers)
+
+    if ca_certs:
+        try:
+            context.load_verify_locations(ca_certs)
+        except IOError as e:  # Platform-specific: Python 2.6, 2.7, 3.2
+            raise SSLError(e)
+        # Py33 raises FileNotFoundError which subclasses OSError
+        # These are not equivalent unless we check the errno attribute
+        except OSError as e:  # Platform-specific: Python 3.3 and beyond
+            if e.errno == errno.ENOENT:
+                raise SSLError(e)
+            raise
+    if certfile:
+        context.load_cert_chain(certfile, keyfile)
+    if HAS_SNI:  # Platform-specific: OpenSSL with enabled SNI
+        return context.wrap_socket(sock, server_hostname=server_hostname)
+    return context.wrap_socket(sock)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/timeout.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/timeout.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/timeout.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/timeout.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,240 @@
+# The default socket timeout, used by httplib to indicate that no timeout was
+# specified by the user
+from socket import _GLOBAL_DEFAULT_TIMEOUT
+import time
+
+from ..exceptions import TimeoutStateError
+
+# A sentinel value to indicate that no timeout was specified by the user in
+# urllib3
+_Default = object()
+
+def current_time():
+    """
+    Retrieve the current time. This function is mocked out in unit testing.
+    """
+    return time.time()
+
+
+class Timeout(object):
+    """ Timeout configuration.
+
+    Timeouts can be defined as a default for a pool::
+
+        timeout = Timeout(connect=2.0, read=7.0)
+        http = PoolManager(timeout=timeout)
+        response = http.request('GET', 'http://example.com/')
+
+    Or per-request (which overrides the default for the pool)::
+
+        response = http.request('GET', 'http://example.com/', timeout=Timeout(10))
+
+    Timeouts can be disabled by setting all the parameters to ``None``::
+
+        no_timeout = Timeout(connect=None, read=None)
+        response = http.request('GET', 'http://example.com/, timeout=no_timeout)
+
+
+    :param total:
+        This combines the connect and read timeouts into one; the read timeout
+        will be set to the time leftover from the connect attempt. In the
+        event that both a connect timeout and a total are specified, or a read
+        timeout and a total are specified, the shorter timeout will be applied.
+
+        Defaults to None.
+
+    :type total: integer, float, or None
+
+    :param connect:
+        The maximum amount of time to wait for a connection attempt to a server
+        to succeed. Omitting the parameter will default the connect timeout to
+        the system default, probably `the global default timeout in socket.py
+        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
+        None will set an infinite timeout for connection attempts.
+
+    :type connect: integer, float, or None
+
+    :param read:
+        The maximum amount of time to wait between consecutive
+        read operations for a response from the server. Omitting
+        the parameter will default the read timeout to the system
+        default, probably `the global default timeout in socket.py
+        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
+        None will set an infinite timeout.
+
+    :type read: integer, float, or None
+
+    .. note::
+
+        Many factors can affect the total amount of time for urllib3 to return
+        an HTTP response.
+
+        For example, Python's DNS resolver does not obey the timeout specified
+        on the socket. Other factors that can affect total request time include
+        high CPU load, high swap, the program running at a low priority level,
+        or other behaviors.
+
+        In addition, the read and total timeouts only measure the time between
+        read operations on the socket connecting the client and the server,
+        not the total amount of time for the request to return a complete
+        response. For most requests, the timeout is raised because the server
+        has not sent the first byte in the specified time. This is not always
+        the case; if a server streams one byte every fifteen seconds, a timeout
+        of 20 seconds will not trigger, even though the request will take
+        several minutes to complete.
+
+        If your goal is to cut off any request after a set amount of wall clock
+        time, consider having a second "watcher" thread to cut off a slow
+        request.
+    """
+
+    #: A sentinel object representing the default timeout value
+    DEFAULT_TIMEOUT = _GLOBAL_DEFAULT_TIMEOUT
+
+    def __init__(self, total=None, connect=_Default, read=_Default):
+        self._connect = self._validate_timeout(connect, 'connect')
+        self._read = self._validate_timeout(read, 'read')
+        self.total = self._validate_timeout(total, 'total')
+        self._start_connect = None
+
+    def __str__(self):
+        return '%s(connect=%r, read=%r, total=%r)' % (
+            type(self).__name__, self._connect, self._read, self.total)
+
+    @classmethod
+    def _validate_timeout(cls, value, name):
+        """ Check that a timeout attribute is valid.
+
+        :param value: The timeout value to validate
+        :param name: The name of the timeout attribute to validate. This is
+            used to specify in error messages.
+        :return: The validated and casted version of the given value.
+        :raises ValueError: If the type is not an integer or a float, or if it
+            is a numeric value less than zero.
+        """
+        if value is _Default:
+            return cls.DEFAULT_TIMEOUT
+
+        if value is None or value is cls.DEFAULT_TIMEOUT:
+            return value
+
+        try:
+            float(value)
+        except (TypeError, ValueError):
+            raise ValueError("Timeout value %s was %s, but it must be an "
+                             "int or float." % (name, value))
+
+        try:
+            if value < 0:
+                raise ValueError("Attempted to set %s timeout to %s, but the "
+                                 "timeout cannot be set to a value less "
+                                 "than 0." % (name, value))
+        except TypeError:  # Python 3
+            raise ValueError("Timeout value %s was %s, but it must be an "
+                             "int or float." % (name, value))
+
+        return value
+
+    @classmethod
+    def from_float(cls, timeout):
+        """ Create a new Timeout from a legacy timeout value.
+
+        The timeout value used by httplib.py sets the same timeout on the
+        connect(), and recv() socket requests. This creates a :class:`Timeout`
+        object that sets the individual timeouts to the ``timeout`` value
+        passed to this function.
+
+        :param timeout: The legacy timeout value.
+        :type timeout: integer, float, sentinel default object, or None
+        :return: Timeout object
+        :rtype: :class:`Timeout`
+        """
+        return Timeout(read=timeout, connect=timeout)
+
+    def clone(self):
+        """ Create a copy of the timeout object
+
+        Timeout properties are stored per-pool but each request needs a fresh
+        Timeout object to ensure each one has its own start/stop configured.
+
+        :return: a copy of the timeout object
+        :rtype: :class:`Timeout`
+        """
+        # We can't use copy.deepcopy because that will also create a new object
+        # for _GLOBAL_DEFAULT_TIMEOUT, which socket.py uses as a sentinel to
+        # detect the user default.
+        return Timeout(connect=self._connect, read=self._read,
+                       total=self.total)
+
+    def start_connect(self):
+        """ Start the timeout clock, used during a connect() attempt
+
+        :raises urllib3.exceptions.TimeoutStateError: if you attempt
+            to start a timer that has been started already.
+        """
+        if self._start_connect is not None:
+            raise TimeoutStateError("Timeout timer has already been started.")
+        self._start_connect = current_time()
+        return self._start_connect
+
+    def get_connect_duration(self):
+        """ Gets the time elapsed since the call to :meth:`start_connect`.
+
+        :return: Elapsed time.
+        :rtype: float
+        :raises urllib3.exceptions.TimeoutStateError: if you attempt
+            to get duration for a timer that hasn't been started.
+        """
+        if self._start_connect is None:
+            raise TimeoutStateError("Can't get connect duration for timer "
+                                    "that has not started.")
+        return current_time() - self._start_connect
+
+    @property
+    def connect_timeout(self):
+        """ Get the value to use when setting a connection timeout.
+
+        This will be a positive float or integer, the value None
+        (never timeout), or the default system timeout.
+
+        :return: Connect timeout.
+        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+        """
+        if self.total is None:
+            return self._connect
+
+        if self._connect is None or self._connect is self.DEFAULT_TIMEOUT:
+            return self.total
+
+        return min(self._connect, self.total)
+
+    @property
+    def read_timeout(self):
+        """ Get the value for the read timeout.
+
+        This assumes some time has elapsed in the connection timeout and
+        computes the read timeout appropriately.
+
+        If self.total is set, the read timeout is dependent on the amount of
+        time taken by the connect timeout. If the connection time has not been
+        established, a :exc:`~urllib3.exceptions.TimeoutStateError` will be
+        raised.
+
+        :return: Value to use for the read timeout.
+        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+        :raises urllib3.exceptions.TimeoutStateError: If :meth:`start_connect`
+            has not yet been called on this object.
+        """
+        if (self.total is not None and
+            self.total is not self.DEFAULT_TIMEOUT and
+            self._read is not None and
+            self._read is not self.DEFAULT_TIMEOUT):
+            # In case the connect timeout has not yet been established.
+            if self._start_connect is None:
+                return self._read
+            return max(0, min(self.total - self.get_connect_duration(),
+                              self._read))
+        elif self.total is not None and self.total is not self.DEFAULT_TIMEOUT:
+            return max(0, self.total - self.get_connect_duration())
+        else:
+            return self._read
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/url.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/url.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/packages/urllib3/util/url.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/packages/urllib3/util/url.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,212 @@
+from collections import namedtuple
+
+from ..exceptions import LocationParseError
+
+
+url_attrs = ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment']
+
+
+class Url(namedtuple('Url', url_attrs)):
+    """
+    Datastructure for representing an HTTP URL. Used as a return value for
+    :func:`parse_url`.
+    """
+    slots = ()
+
+    def __new__(cls, scheme=None, auth=None, host=None, port=None, path=None,
+                query=None, fragment=None):
+        return super(Url, cls).__new__(cls, scheme, auth, host, port, path,
+                                       query, fragment)
+
+    @property
+    def hostname(self):
+        """For backwards-compatibility with urlparse. We're nice like that."""
+        return self.host
+
+    @property
+    def request_uri(self):
+        """Absolute path including the query string."""
+        uri = self.path or '/'
+
+        if self.query is not None:
+            uri += '?' + self.query
+
+        return uri
+
+    @property
+    def netloc(self):
+        """Network location including host and port"""
+        if self.port:
+            return '%s:%d' % (self.host, self.port)
+        return self.host
+
+    @property
+    def url(self):
+        """
+        Convert self into a url
+
+        This function should more or less round-trip with :func:`.parse_url`. The
+        returned url may not be exactly the same as the url inputted to
+        :func:`.parse_url`, but it should be equivalent by the RFC (e.g., urls
+        with a blank port will have : removed).
+
+        Example: ::
+
+            >>> U = parse_url('http://google.com/mail/')
+            >>> U.url
+            'http://google.com/mail/'
+            >>> Url('http', 'username:password', 'host.com', 80,
+            ... '/path', 'query', 'fragment').url
+            'http://username:password@host.com:80/path?query#fragment'
+        """
+        scheme, auth, host, port, path, query, fragment = self
+        url = ''
+
+        # We use "is not None" we want things to happen with empty strings (or 0 port)
+        if scheme is not None:
+            url += scheme + '://'
+        if auth is not None:
+            url += auth + '@'
+        if host is not None:
+            url += host
+        if port is not None:
+            url += ':' + str(port)
+        if path is not None:
+            url += path
+        if query is not None:
+            url += '?' + query
+        if fragment is not None:
+            url += '#' + fragment
+
+        return url
+
+    def __str__(self):
+        return self.url
+
+def split_first(s, delims):
+    """
+    Given a string and an iterable of delimiters, split on the first found
+    delimiter. Return two split parts and the matched delimiter.
+
+    If not found, then the first part is the full input string.
+
+    Example::
+
+        >>> split_first('foo/bar?baz', '?/=')
+        ('foo', 'bar?baz', '/')
+        >>> split_first('foo/bar?baz', '123')
+        ('foo/bar?baz', '', None)
+
+    Scales linearly with number of delims. Not ideal for large number of delims.
+    """
+    min_idx = None
+    min_delim = None
+    for d in delims:
+        idx = s.find(d)
+        if idx < 0:
+            continue
+
+        if min_idx is None or idx < min_idx:
+            min_idx = idx
+            min_delim = d
+
+    if min_idx is None or min_idx < 0:
+        return s, '', None
+
+    return s[:min_idx], s[min_idx+1:], min_delim
+
+
+def parse_url(url):
+    """
+    Given a url, return a parsed :class:`.Url` namedtuple. Best-effort is
+    performed to parse incomplete urls. Fields not provided will be None.
+
+    Partly backwards-compatible with :mod:`urlparse`.
+
+    Example::
+
+        >>> parse_url('http://google.com/mail/')
+        Url(scheme='http', host='google.com', port=None, path='/mail/', ...)
+        >>> parse_url('google.com:80')
+        Url(scheme=None, host='google.com', port=80, path=None, ...)
+        >>> parse_url('/foo?bar')
+        Url(scheme=None, host=None, port=None, path='/foo', query='bar', ...)
+    """
+
+    # While this code has overlap with stdlib's urlparse, it is much
+    # simplified for our needs and less annoying.
+    # Additionally, this implementations does silly things to be optimal
+    # on CPython.
+
+    if not url:
+        # Empty
+        return Url()
+
+    scheme = None
+    auth = None
+    host = None
+    port = None
+    path = None
+    fragment = None
+    query = None
+
+    # Scheme
+    if '://' in url:
+        scheme, url = url.split('://', 1)
+
+    # Find the earliest Authority Terminator
+    # (http://tools.ietf.org/html/rfc3986#section-3.2)
+    url, path_, delim = split_first(url, ['/', '?', '#'])
+
+    if delim:
+        # Reassemble the path
+        path = delim + path_
+
+    # Auth
+    if '@' in url:
+        # Last '@' denotes end of auth part
+        auth, url = url.rsplit('@', 1)
+
+    # IPv6
+    if url and url[0] == '[':
+        host, url = url.split(']', 1)
+        host += ']'
+
+    # Port
+    if ':' in url:
+        _host, port = url.split(':', 1)
+
+        if not host:
+            host = _host
+
+        if port:
+            # If given, ports must be integers.
+            if not port.isdigit():
+                raise LocationParseError(url)
+            port = int(port)
+        else:
+            # Blank ports are cool, too. (rfc3986#section-3.2.3)
+            port = None
+
+    elif not host and url:
+        host = url
+
+    if not path:
+        return Url(scheme, auth, host, port, path, query, fragment)
+
+    # Fragment
+    if '#' in path:
+        path, fragment = path.split('#', 1)
+
+    # Query
+    if '?' in path:
+        path, query = path.split('?', 1)
+
+    return Url(scheme, auth, host, port, path, query, fragment)
+
+def get_host(url):
+    """
+    Deprecated. Use :func:`.parse_url` instead.
+    """
+    p = parse_url(url)
+    return p.scheme or 'http', p.hostname, p.port
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/sessions.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/sessions.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/sessions.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/sessions.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,682 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.session
+~~~~~~~~~~~~~~~~
+
+This module provides a Session object to manage and persist settings across
+requests (cookies, auth, proxies).
+
+"""
+import os
+from collections import Mapping
+from datetime import datetime
+
+from .auth import _basic_auth_str
+from .compat import cookielib, OrderedDict, urljoin, urlparse
+from .cookies import (
+    cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies)
+from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
+from .hooks import default_hooks, dispatch_hook
+from .utils import to_key_val_list, default_headers, to_native_string
+from .exceptions import (
+    TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
+from .packages.urllib3._collections import RecentlyUsedContainer
+from .structures import CaseInsensitiveDict
+
+from .adapters import HTTPAdapter
+
+from .utils import (
+    requote_uri, get_environ_proxies, get_netrc_auth, should_bypass_proxies,
+    get_auth_from_url
+)
+
+from .status_codes import codes
+
+# formerly defined here, reexposed here for backward compatibility
+from .models import REDIRECT_STATI
+
+REDIRECT_CACHE_SIZE = 1000
+
+
+def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
+    """
+    Determines appropriate setting for a given request, taking into account the
+    explicit setting on that request, and the setting in the session. If a
+    setting is a dictionary, they will be merged together using `dict_class`
+    """
+
+    if session_setting is None:
+        return request_setting
+
+    if request_setting is None:
+        return session_setting
+
+    # Bypass if not a dictionary (e.g. verify)
+    if not (
+            isinstance(session_setting, Mapping) and
+            isinstance(request_setting, Mapping)
+    ):
+        return request_setting
+
+    merged_setting = dict_class(to_key_val_list(session_setting))
+    merged_setting.update(to_key_val_list(request_setting))
+
+    # Remove keys that are set to None.
+    for (k, v) in request_setting.items():
+        if v is None:
+            del merged_setting[k]
+
+    merged_setting = dict((k, v) for (k, v) in merged_setting.items() if v is not None)
+
+    return merged_setting
+
+
+def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
+    """
+    Properly merges both requests and session hooks.
+
+    This is necessary because when request_hooks == {'response': []}, the
+    merge breaks Session hooks entirely.
+    """
+    if session_hooks is None or session_hooks.get('response') == []:
+        return request_hooks
+
+    if request_hooks is None or request_hooks.get('response') == []:
+        return session_hooks
+
+    return merge_setting(request_hooks, session_hooks, dict_class)
+
+
+class SessionRedirectMixin(object):
+    def resolve_redirects(self, resp, req, stream=False, timeout=None,
+                          verify=True, cert=None, proxies=None):
+        """Receives a Response. Returns a generator of Responses."""
+
+        i = 0
+        hist = [] # keep track of history
+
+        while resp.is_redirect:
+            prepared_request = req.copy()
+
+            if i > 0:
+                # Update history and keep track of redirects.
+                hist.append(resp)
+                new_hist = list(hist)
+                resp.history = new_hist
+
+            try:
+                resp.content  # Consume socket so it can be released
+            except (ChunkedEncodingError, ContentDecodingError, RuntimeError):
+                resp.raw.read(decode_content=False)
+
+            if i >= self.max_redirects:
+                raise TooManyRedirects('Exceeded %s redirects.' % self.max_redirects)
+
+            # Release the connection back into the pool.
+            resp.close()
+
+            url = resp.headers['location']
+            method = req.method
+
+            # Handle redirection without scheme (see: RFC 1808 Section 4)
+            if url.startswith('//'):
+                parsed_rurl = urlparse(resp.url)
+                url = '%s:%s' % (parsed_rurl.scheme, url)
+
+            # The scheme should be lower case...
+            parsed = urlparse(url)
+            url = parsed.geturl()
+
+            # Facilitate relative 'location' headers, as allowed by RFC 7231.
+            # (e.g. '/path/to/resource' instead of 'http://domain.tld/path/to/resource')
+            # Compliant with RFC3986, we percent encode the url.
+            if not parsed.netloc:
+                url = urljoin(resp.url, requote_uri(url))
+            else:
+                url = requote_uri(url)
+
+            prepared_request.url = to_native_string(url)
+            # Cache the url, unless it redirects to itself.
+            if resp.is_permanent_redirect and req.url != prepared_request.url:
+                self.redirect_cache[req.url] = prepared_request.url
+
+            # http://tools.ietf.org/html/rfc7231#section-6.4.4
+            if (resp.status_code == codes.see_other and
+                    method != 'HEAD'):
+                method = 'GET'
+
+            # Do what the browsers do, despite standards...
+            # First, turn 302s into GETs.
+            if resp.status_code == codes.found and method != 'HEAD':
+                method = 'GET'
+
+            # Second, if a POST is responded to with a 301, turn it into a GET.
+            # This bizarre behaviour is explained in Issue 1704.
+            if resp.status_code == codes.moved and method == 'POST':
+                method = 'GET'
+
+            prepared_request.method = method
+
+            # https://github.com/kennethreitz/requests/issues/1084
+            if resp.status_code not in (codes.temporary_redirect, codes.permanent_redirect):
+                if 'Content-Length' in prepared_request.headers:
+                    del prepared_request.headers['Content-Length']
+
+                prepared_request.body = None
+
+            headers = prepared_request.headers
+            try:
+                del headers['Cookie']
+            except KeyError:
+                pass
+
+            extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw)
+            prepared_request._cookies.update(self.cookies)
+            prepared_request.prepare_cookies(prepared_request._cookies)
+
+            # Rebuild auth and proxy information.
+            proxies = self.rebuild_proxies(prepared_request, proxies)
+            self.rebuild_auth(prepared_request, resp)
+
+            # Override the original request.
+            req = prepared_request
+
+            resp = self.send(
+                req,
+                stream=stream,
+                timeout=timeout,
+                verify=verify,
+                cert=cert,
+                proxies=proxies,
+                allow_redirects=False,
+            )
+
+            extract_cookies_to_jar(self.cookies, prepared_request, resp.raw)
+
+            i += 1
+            yield resp
+
+    def rebuild_auth(self, prepared_request, response):
+        """
+        When being redirected we may want to strip authentication from the
+        request to avoid leaking credentials. This method intelligently removes
+        and reapplies authentication where possible to avoid credential loss.
+        """
+        headers = prepared_request.headers
+        url = prepared_request.url
+
+        if 'Authorization' in headers:
+            # If we get redirected to a new host, we should strip out any
+            # authentication headers.
+            original_parsed = urlparse(response.request.url)
+            redirect_parsed = urlparse(url)
+
+            if (original_parsed.hostname != redirect_parsed.hostname):
+                del headers['Authorization']
+
+        # .netrc might have more auth for us on our new host.
+        new_auth = get_netrc_auth(url) if self.trust_env else None
+        if new_auth is not None:
+            prepared_request.prepare_auth(new_auth)
+
+        return
+
+    def rebuild_proxies(self, prepared_request, proxies):
+        """
+        This method re-evaluates the proxy configuration by considering the
+        environment variables. If we are redirected to a URL covered by
+        NO_PROXY, we strip the proxy configuration. Otherwise, we set missing
+        proxy keys for this URL (in case they were stripped by a previous
+        redirect).
+
+        This method also replaces the Proxy-Authorization header where
+        necessary.
+        """
+        headers = prepared_request.headers
+        url = prepared_request.url
+        scheme = urlparse(url).scheme
+        new_proxies = proxies.copy() if proxies is not None else {}
+
+        if self.trust_env and not should_bypass_proxies(url):
+            environ_proxies = get_environ_proxies(url)
+
+            proxy = environ_proxies.get(scheme)
+
+            if proxy:
+                new_proxies.setdefault(scheme, environ_proxies[scheme])
+
+        if 'Proxy-Authorization' in headers:
+            del headers['Proxy-Authorization']
+
+        try:
+            username, password = get_auth_from_url(new_proxies[scheme])
+        except KeyError:
+            username, password = None, None
+
+        if username and password:
+            headers['Proxy-Authorization'] = _basic_auth_str(username, password)
+
+        return new_proxies
+
+
+class Session(SessionRedirectMixin):
+    """A Requests session.
+
+    Provides cookie persistence, connection-pooling, and configuration.
+
+    Basic Usage::
+
+      >>> import requests
+      >>> s = requests.Session()
+      >>> s.get('http://httpbin.org/get')
+      200
+    """
+
+    __attrs__ = [
+        'headers', 'cookies', 'auth', 'proxies', 'hooks', 'params', 'verify',
+        'cert', 'prefetch', 'adapters', 'stream', 'trust_env',
+        'max_redirects',
+    ]
+
+    def __init__(self):
+
+        #: A case-insensitive dictionary of headers to be sent on each
+        #: :class:`Request <Request>` sent from this
+        #: :class:`Session <Session>`.
+        self.headers = default_headers()
+
+        #: Default Authentication tuple or object to attach to
+        #: :class:`Request <Request>`.
+        self.auth = None
+
+        #: Dictionary mapping protocol to the URL of the proxy (e.g.
+        #: {'http': 'foo.bar:3128'}) to be used on each
+        #: :class:`Request <Request>`.
+        self.proxies = {}
+
+        #: Event-handling hooks.
+        self.hooks = default_hooks()
+
+        #: Dictionary of querystring data to attach to each
+        #: :class:`Request <Request>`. The dictionary values may be lists for
+        #: representing multivalued query parameters.
+        self.params = {}
+
+        #: Stream response content default.
+        self.stream = False
+
+        #: SSL Verification default.
+        self.verify = True
+
+        #: SSL certificate default.
+        self.cert = None
+
+        #: Maximum number of redirects allowed. If the request exceeds this
+        #: limit, a :class:`TooManyRedirects` exception is raised.
+        self.max_redirects = DEFAULT_REDIRECT_LIMIT
+
+        #: Should we trust the environment?
+        self.trust_env = True
+
+        #: A CookieJar containing all currently outstanding cookies set on this
+        #: session. By default it is a
+        #: :class:`RequestsCookieJar <requests.cookies.RequestsCookieJar>`, but
+        #: may be any other ``cookielib.CookieJar`` compatible object.
+        self.cookies = cookiejar_from_dict({})
+
+        # Default connection adapters.
+        self.adapters = OrderedDict()
+        self.mount('https://', HTTPAdapter())
+        self.mount('http://', HTTPAdapter())
+
+        # Only store 1000 redirects to prevent using infinite memory
+        self.redirect_cache = RecentlyUsedContainer(REDIRECT_CACHE_SIZE)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        self.close()
+
+    def prepare_request(self, request):
+        """Constructs a :class:`PreparedRequest <PreparedRequest>` for
+        transmission and returns it. The :class:`PreparedRequest` has settings
+        merged from the :class:`Request <Request>` instance and those of the
+        :class:`Session`.
+
+        :param request: :class:`Request` instance to prepare with this
+            session's settings.
+        """
+        cookies = request.cookies or {}
+
+        # Bootstrap CookieJar.
+        if not isinstance(cookies, cookielib.CookieJar):
+            cookies = cookiejar_from_dict(cookies)
+
+        # Merge with session cookies
+        merged_cookies = merge_cookies(
+            merge_cookies(RequestsCookieJar(), self.cookies), cookies)
+
+
+        # Set environment's basic authentication if not explicitly set.
+        auth = request.auth
+        if self.trust_env and not auth and not self.auth:
+            auth = get_netrc_auth(request.url)
+
+        p = PreparedRequest()
+        p.prepare(
+            method=request.method.upper(),
+            url=request.url,
+            files=request.files,
+            data=request.data,
+            json=request.json,
+            headers=merge_setting(request.headers, self.headers, dict_class=CaseInsensitiveDict),
+            params=merge_setting(request.params, self.params),
+            auth=merge_setting(auth, self.auth),
+            cookies=merged_cookies,
+            hooks=merge_hooks(request.hooks, self.hooks),
+        )
+        return p
+
+    def request(self, method, url,
+        params=None,
+        data=None,
+        headers=None,
+        cookies=None,
+        files=None,
+        auth=None,
+        timeout=None,
+        allow_redirects=True,
+        proxies=None,
+        hooks=None,
+        stream=None,
+        verify=None,
+        cert=None,
+        json=None):
+        """Constructs a :class:`Request <Request>`, prepares it and sends it.
+        Returns :class:`Response <Response>` object.
+
+        :param method: method for the new :class:`Request` object.
+        :param url: URL for the new :class:`Request` object.
+        :param params: (optional) Dictionary or bytes to be sent in the query
+            string for the :class:`Request`.
+        :param data: (optional) Dictionary or bytes to send in the body of the
+            :class:`Request`.
+        :param json: (optional) json to send in the body of the
+            :class:`Request`.
+        :param headers: (optional) Dictionary of HTTP Headers to send with the
+            :class:`Request`.
+        :param cookies: (optional) Dict or CookieJar object to send with the
+            :class:`Request`.
+        :param files: (optional) Dictionary of ``'filename': file-like-objects``
+            for multipart encoding upload.
+        :param auth: (optional) Auth tuple or callable to enable
+            Basic/Digest/Custom HTTP Auth.
+        :param timeout: (optional) How long to wait for the server to send
+            data before giving up, as a float, or a (`connect timeout, read
+            timeout <user/advanced.html#timeouts>`_) tuple.
+        :type timeout: float or tuple
+        :param allow_redirects: (optional) Set to True by default.
+        :type allow_redirects: bool
+        :param proxies: (optional) Dictionary mapping protocol to the URL of
+            the proxy.
+        :param stream: (optional) whether to immediately download the response
+            content. Defaults to ``False``.
+        :param verify: (optional) if ``True``, the SSL cert will be verified.
+            A CA_BUNDLE path can also be provided.
+        :param cert: (optional) if String, path to ssl client cert file (.pem).
+            If Tuple, ('cert', 'key') pair.
+        """
+
+        method = to_native_string(method)
+
+        # Create the Request.
+        req = Request(
+            method = method.upper(),
+            url = url,
+            headers = headers,
+            files = files,
+            data = data or {},
+            json = json,
+            params = params or {},
+            auth = auth,
+            cookies = cookies,
+            hooks = hooks,
+        )
+        prep = self.prepare_request(req)
+
+        proxies = proxies or {}
+
+        settings = self.merge_environment_settings(
+            prep.url, proxies, stream, verify, cert
+        )
+
+        # Send the request.
+        send_kwargs = {
+            'timeout': timeout,
+            'allow_redirects': allow_redirects,
+        }
+        send_kwargs.update(settings)
+        resp = self.send(prep, **send_kwargs)
+
+        return resp
+
+    def get(self, url, **kwargs):
+        """Sends a GET request. Returns :class:`Response` object.
+
+        :param url: URL for the new :class:`Request` object.
+        :param \*\*kwargs: Optional arguments that ``request`` takes.
+        """
+
+        kwargs.setdefault('allow_redirects', True)
+        return self.request('GET', url, **kwargs)
+
+    def options(self, url, **kwargs):
+        """Sends a OPTIONS request. Returns :class:`Response` object.
+
+        :param url: URL for the new :class:`Request` object.
+        :param \*\*kwargs: Optional arguments that ``request`` takes.
+        """
+
+        kwargs.setdefault('allow_redirects', True)
+        return self.request('OPTIONS', url, **kwargs)
+
+    def head(self, url, **kwargs):
+        """Sends a HEAD request. Returns :class:`Response` object.
+
+        :param url: URL for the new :class:`Request` object.
+        :param \*\*kwargs: Optional arguments that ``request`` takes.
+        """
+
+        kwargs.setdefault('allow_redirects', False)
+        return self.request('HEAD', url, **kwargs)
+
+    def post(self, url, data=None, json=None, **kwargs):
+        """Sends a POST request. Returns :class:`Response` object.
+
+        :param url: URL for the new :class:`Request` object.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+        :param json: (optional) json to send in the body of the :class:`Request`.
+        :param \*\*kwargs: Optional arguments that ``request`` takes.
+        """
+
+        return self.request('POST', url, data=data, json=json, **kwargs)
+
+    def put(self, url, data=None, **kwargs):
+        """Sends a PUT request. Returns :class:`Response` object.
+
+        :param url: URL for the new :class:`Request` object.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+        :param \*\*kwargs: Optional arguments that ``request`` takes.
+        """
+
+        return self.request('PUT', url, data=data, **kwargs)
+
+    def patch(self, url, data=None, **kwargs):
+        """Sends a PATCH request. Returns :class:`Response` object.
+
+        :param url: URL for the new :class:`Request` object.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+        :param \*\*kwargs: Optional arguments that ``request`` takes.
+        """
+
+        return self.request('PATCH', url,  data=data, **kwargs)
+
+    def delete(self, url, **kwargs):
+        """Sends a DELETE request. Returns :class:`Response` object.
+
+        :param url: URL for the new :class:`Request` object.
+        :param \*\*kwargs: Optional arguments that ``request`` takes.
+        """
+
+        return self.request('DELETE', url, **kwargs)
+
+    def send(self, request, **kwargs):
+        """Send a given PreparedRequest."""
+        # Set defaults that the hooks can utilize to ensure they always have
+        # the correct parameters to reproduce the previous request.
+        kwargs.setdefault('stream', self.stream)
+        kwargs.setdefault('verify', self.verify)
+        kwargs.setdefault('cert', self.cert)
+        kwargs.setdefault('proxies', self.proxies)
+
+        # It's possible that users might accidentally send a Request object.
+        # Guard against that specific failure case.
+        if not isinstance(request, PreparedRequest):
+            raise ValueError('You can only send PreparedRequests.')
+
+        checked_urls = set()
+        while request.url in self.redirect_cache:
+            checked_urls.add(request.url)
+            new_url = self.redirect_cache.get(request.url)
+            if new_url in checked_urls:
+                break
+            request.url = new_url
+
+        # Set up variables needed for resolve_redirects and dispatching of hooks
+        allow_redirects = kwargs.pop('allow_redirects', True)
+        stream = kwargs.get('stream')
+        timeout = kwargs.get('timeout')
+        verify = kwargs.get('verify')
+        cert = kwargs.get('cert')
+        proxies = kwargs.get('proxies')
+        hooks = request.hooks
+
+        # Get the appropriate adapter to use
+        adapter = self.get_adapter(url=request.url)
+
+        # Start time (approximately) of the request
+        start = datetime.utcnow()
+
+        # Send the request
+        r = adapter.send(request, **kwargs)
+
+        # Total elapsed time of the request (approximately)
+        r.elapsed = datetime.utcnow() - start
+
+        # Response manipulation hooks
+        r = dispatch_hook('response', hooks, r, **kwargs)
+
+        # Persist cookies
+        if r.history:
+
+            # If the hooks create history then we want those cookies too
+            for resp in r.history:
+                extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
+
+        extract_cookies_to_jar(self.cookies, request, r.raw)
+
+        # Redirect resolving generator.
+        gen = self.resolve_redirects(r, request,
+            stream=stream,
+            timeout=timeout,
+            verify=verify,
+            cert=cert,
+            proxies=proxies)
+
+        # Resolve redirects if allowed.
+        history = [resp for resp in gen] if allow_redirects else []
+
+        # Shuffle things around if there's history.
+        if history:
+            # Insert the first (original) request at the start
+            history.insert(0, r)
+            # Get the last request made
+            r = history.pop()
+            r.history = history
+
+        if not stream:
+            r.content
+
+        return r
+
+    def merge_environment_settings(self, url, proxies, stream, verify, cert):
+        """Check the environment and merge it with some settings."""
+        # Gather clues from the surrounding environment.
+        if self.trust_env:
+            # Set environment's proxies.
+            env_proxies = get_environ_proxies(url) or {}
+            for (k, v) in env_proxies.items():
+                proxies.setdefault(k, v)
+
+            # Look for requests environment configuration and be compatible
+            # with cURL.
+            if verify is True or verify is None:
+                verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
+                          os.environ.get('CURL_CA_BUNDLE'))
+
+        # Merge all the kwargs.
+        proxies = merge_setting(proxies, self.proxies)
+        stream = merge_setting(stream, self.stream)
+        verify = merge_setting(verify, self.verify)
+        cert = merge_setting(cert, self.cert)
+
+        return {'verify': verify, 'proxies': proxies, 'stream': stream,
+                'cert': cert}
+
+    def get_adapter(self, url):
+        """Returns the appropriate connnection adapter for the given URL."""
+        for (prefix, adapter) in self.adapters.items():
+
+            if url.lower().startswith(prefix):
+                return adapter
+
+        # Nothing matches :-/
+        raise InvalidSchema("No connection adapters were found for '%s'" % url)
+
+    def close(self):
+        """Closes all adapters and as such the session"""
+        for v in self.adapters.values():
+            v.close()
+
+    def mount(self, prefix, adapter):
+        """Registers a connection adapter to a prefix.
+
+        Adapters are sorted in descending order by key length."""
+
+        self.adapters[prefix] = adapter
+        keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]
+
+        for key in keys_to_move:
+            self.adapters[key] = self.adapters.pop(key)
+
+    def __getstate__(self):
+        state = dict((attr, getattr(self, attr, None)) for attr in self.__attrs__)
+        state['redirect_cache'] = dict(self.redirect_cache)
+        return state
+
+    def __setstate__(self, state):
+        redirect_cache = state.pop('redirect_cache', {})
+        for attr, value in state.items():
+            setattr(self, attr, value)
+
+        self.redirect_cache = RecentlyUsedContainer(REDIRECT_CACHE_SIZE)
+        for redirect, to in redirect_cache.items():
+            self.redirect_cache[redirect] = to
+
+
+def session():
+    """Returns a :class:`Session` for context-management."""
+
+    return Session()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/status_codes.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/status_codes.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/status_codes.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/status_codes.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+
+from .structures import LookupDict
+
+_codes = {
+
+    # Informational.
+    100: ('continue',),
+    101: ('switching_protocols',),
+    102: ('processing',),
+    103: ('checkpoint',),
+    122: ('uri_too_long', 'request_uri_too_long'),
+    200: ('ok', 'okay', 'all_ok', 'all_okay', 'all_good', '\\o/', '✓'),
+    201: ('created',),
+    202: ('accepted',),
+    203: ('non_authoritative_info', 'non_authoritative_information'),
+    204: ('no_content',),
+    205: ('reset_content', 'reset'),
+    206: ('partial_content', 'partial'),
+    207: ('multi_status', 'multiple_status', 'multi_stati', 'multiple_stati'),
+    208: ('already_reported',),
+    226: ('im_used',),
+
+    # Redirection.
+    300: ('multiple_choices',),
+    301: ('moved_permanently', 'moved', '\\o-'),
+    302: ('found',),
+    303: ('see_other', 'other'),
+    304: ('not_modified',),
+    305: ('use_proxy',),
+    306: ('switch_proxy',),
+    307: ('temporary_redirect', 'temporary_moved', 'temporary'),
+    308: ('permanent_redirect',
+          'resume_incomplete', 'resume',), # These 2 to be removed in 3.0
+
+    # Client Error.
+    400: ('bad_request', 'bad'),
+    401: ('unauthorized',),
+    402: ('payment_required', 'payment'),
+    403: ('forbidden',),
+    404: ('not_found', '-o-'),
+    405: ('method_not_allowed', 'not_allowed'),
+    406: ('not_acceptable',),
+    407: ('proxy_authentication_required', 'proxy_auth', 'proxy_authentication'),
+    408: ('request_timeout', 'timeout'),
+    409: ('conflict',),
+    410: ('gone',),
+    411: ('length_required',),
+    412: ('precondition_failed', 'precondition'),
+    413: ('request_entity_too_large',),
+    414: ('request_uri_too_large',),
+    415: ('unsupported_media_type', 'unsupported_media', 'media_type'),
+    416: ('requested_range_not_satisfiable', 'requested_range', 'range_not_satisfiable'),
+    417: ('expectation_failed',),
+    418: ('im_a_teapot', 'teapot', 'i_am_a_teapot'),
+    422: ('unprocessable_entity', 'unprocessable'),
+    423: ('locked',),
+    424: ('failed_dependency', 'dependency'),
+    425: ('unordered_collection', 'unordered'),
+    426: ('upgrade_required', 'upgrade'),
+    428: ('precondition_required', 'precondition'),
+    429: ('too_many_requests', 'too_many'),
+    431: ('header_fields_too_large', 'fields_too_large'),
+    444: ('no_response', 'none'),
+    449: ('retry_with', 'retry'),
+    450: ('blocked_by_windows_parental_controls', 'parental_controls'),
+    451: ('unavailable_for_legal_reasons', 'legal_reasons'),
+    499: ('client_closed_request',),
+
+    # Server Error.
+    500: ('internal_server_error', 'server_error', '/o\\', '✗'),
+    501: ('not_implemented',),
+    502: ('bad_gateway',),
+    503: ('service_unavailable', 'unavailable'),
+    504: ('gateway_timeout',),
+    505: ('http_version_not_supported', 'http_version'),
+    506: ('variant_also_negotiates',),
+    507: ('insufficient_storage',),
+    509: ('bandwidth_limit_exceeded', 'bandwidth'),
+    510: ('not_extended',),
+}
+
+codes = LookupDict(name='status_codes')
+
+for (code, titles) in list(_codes.items()):
+    for title in titles:
+        setattr(codes, title, code)
+        if not title.startswith('\\'):
+            setattr(codes, title.upper(), code)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/structures.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/structures.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/structures.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/structures.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.structures
+~~~~~~~~~~~~~~~~~~~
+
+Data structures that power Requests.
+
+"""
+
+import collections
+
+
+class CaseInsensitiveDict(collections.MutableMapping):
+    """
+    A case-insensitive ``dict``-like object.
+
+    Implements all methods and operations of
+    ``collections.MutableMapping`` as well as dict's ``copy``. Also
+    provides ``lower_items``.
+
+    All keys are expected to be strings. The structure remembers the
+    case of the last key to be set, and ``iter(instance)``,
+    ``keys()``, ``items()``, ``iterkeys()``, and ``iteritems()``
+    will contain case-sensitive keys. However, querying and contains
+    testing is case insensitive::
+
+        cid = CaseInsensitiveDict()
+        cid['Accept'] = 'application/json'
+        cid['aCCEPT'] == 'application/json'  # True
+        list(cid) == ['Accept']  # True
+
+    For example, ``headers['content-encoding']`` will return the
+    value of a ``'Content-Encoding'`` response header, regardless
+    of how the header name was originally stored.
+
+    If the constructor, ``.update``, or equality comparison
+    operations are given keys that have equal ``.lower()``s, the
+    behavior is undefined.
+
+    """
+    def __init__(self, data=None, **kwargs):
+        self._store = dict()
+        if data is None:
+            data = {}
+        self.update(data, **kwargs)
+
+    def __setitem__(self, key, value):
+        # Use the lowercased key for lookups, but store the actual
+        # key alongside the value.
+        self._store[key.lower()] = (key, value)
+
+    def __getitem__(self, key):
+        return self._store[key.lower()][1]
+
+    def __delitem__(self, key):
+        del self._store[key.lower()]
+
+    def __iter__(self):
+        return (casedkey for casedkey, mappedvalue in self._store.values())
+
+    def __len__(self):
+        return len(self._store)
+
+    def lower_items(self):
+        """Like iteritems(), but with all lowercase keys."""
+        return (
+            (lowerkey, keyval[1])
+            for (lowerkey, keyval)
+            in self._store.items()
+        )
+
+    def __eq__(self, other):
+        if isinstance(other, collections.Mapping):
+            other = CaseInsensitiveDict(other)
+        else:
+            return NotImplemented
+        # Compare insensitively
+        return dict(self.lower_items()) == dict(other.lower_items())
+
+    # Copy is required
+    def copy(self):
+        return CaseInsensitiveDict(self._store.values())
+
+    def __repr__(self):
+        return str(dict(self.items()))
+
+class LookupDict(dict):
+    """Dictionary lookup object."""
+
+    def __init__(self, name=None):
+        self.name = name
+        super(LookupDict, self).__init__()
+
+    def __repr__(self):
+        return '<lookup \'%s\'>' % (self.name)
+
+    def __getitem__(self, key):
+        # We allow fall-through here, so values default to None
+
+        return self.__dict__.get(key, None)
+
+    def get(self, key, default=None):
+        return self.__dict__.get(key, default)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/utils.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/utils.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests/utils.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests/utils.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,697 @@
+# -*- coding: utf-8 -*-
+
+"""
+requests.utils
+~~~~~~~~~~~~~~
+
+This module provides utility functions that are used within Requests
+that are also useful for external consumption.
+
+"""
+
+import cgi
+import codecs
+import collections
+import io
+import os
+import platform
+import re
+import sys
+import socket
+import struct
+import warnings
+
+from . import __version__
+from . import certs
+from .compat import parse_http_list as _parse_list_header
+from .compat import (quote, urlparse, bytes, str, OrderedDict, unquote, is_py2,
+                     builtin_str, getproxies, proxy_bypass, urlunparse)
+from .cookies import RequestsCookieJar, cookiejar_from_dict
+from .structures import CaseInsensitiveDict
+from .exceptions import InvalidURL
+
+_hush_pyflakes = (RequestsCookieJar,)
+
+NETRC_FILES = ('.netrc', '_netrc')
+
+DEFAULT_CA_BUNDLE_PATH = certs.where()
+
+
+def dict_to_sequence(d):
+    """Returns an internal sequence dictionary update."""
+
+    if hasattr(d, 'items'):
+        d = d.items()
+
+    return d
+
+
+def super_len(o):
+    if hasattr(o, '__len__'):
+        return len(o)
+
+    if hasattr(o, 'len'):
+        return o.len
+
+    if hasattr(o, 'fileno'):
+        try:
+            fileno = o.fileno()
+        except io.UnsupportedOperation:
+            pass
+        else:
+            return os.fstat(fileno).st_size
+
+    if hasattr(o, 'getvalue'):
+        # e.g. BytesIO, cStringIO.StringIO
+        return len(o.getvalue())
+
+
+def get_netrc_auth(url):
+    """Returns the Requests tuple auth for a given url from netrc."""
+
+    try:
+        from netrc import netrc, NetrcParseError
+
+        netrc_path = None
+
+        for f in NETRC_FILES:
+            try:
+                loc = os.path.expanduser('~/{0}'.format(f))
+            except KeyError:
+                # os.path.expanduser can fail when $HOME is undefined and
+                # getpwuid fails. See http://bugs.python.org/issue20164 &
+                # https://github.com/kennethreitz/requests/issues/1846
+                return
+
+            if os.path.exists(loc):
+                netrc_path = loc
+                break
+
+        # Abort early if there isn't one.
+        if netrc_path is None:
+            return
+
+        ri = urlparse(url)
+
+        # Strip port numbers from netloc
+        host = ri.netloc.split(':')[0]
+
+        try:
+            _netrc = netrc(netrc_path).authenticators(host)
+            if _netrc:
+                # Return with login / password
+                login_i = (0 if _netrc[0] else 1)
+                return (_netrc[login_i], _netrc[2])
+        except (NetrcParseError, IOError):
+            # If there was a parsing error or a permissions issue reading the file,
+            # we'll just skip netrc auth
+            pass
+
+    # AppEngine hackiness.
+    except (ImportError, AttributeError):
+        pass
+
+
+def guess_filename(obj):
+    """Tries to guess the filename of the given object."""
+    name = getattr(obj, 'name', None)
+    if name and isinstance(name, builtin_str) and name[0] != '<' and name[-1] != '>':
+        return os.path.basename(name)
+
+
+def from_key_val_list(value):
+    """Take an object and test to see if it can be represented as a
+    dictionary. Unless it can not be represented as such, return an
+    OrderedDict, e.g.,
+
+    ::
+
+        >>> from_key_val_list([('key', 'val')])
+        OrderedDict([('key', 'val')])
+        >>> from_key_val_list('string')
+        ValueError: need more than 1 value to unpack
+        >>> from_key_val_list({'key': 'val'})
+        OrderedDict([('key', 'val')])
+    """
+    if value is None:
+        return None
+
+    if isinstance(value, (str, bytes, bool, int)):
+        raise ValueError('cannot encode objects that are not 2-tuples')
+
+    return OrderedDict(value)
+
+
+def to_key_val_list(value):
+    """Take an object and test to see if it can be represented as a
+    dictionary. If it can be, return a list of tuples, e.g.,
+
+    ::
+
+        >>> to_key_val_list([('key', 'val')])
+        [('key', 'val')]
+        >>> to_key_val_list({'key': 'val'})
+        [('key', 'val')]
+        >>> to_key_val_list('string')
+        ValueError: cannot encode objects that are not 2-tuples.
+    """
+    if value is None:
+        return None
+
+    if isinstance(value, (str, bytes, bool, int)):
+        raise ValueError('cannot encode objects that are not 2-tuples')
+
+    if isinstance(value, collections.Mapping):
+        value = value.items()
+
+    return list(value)
+
+
+# From mitsuhiko/werkzeug (used with permission).
+def parse_list_header(value):
+    """Parse lists as described by RFC 2068 Section 2.
+
+    In particular, parse comma-separated lists where the elements of
+    the list may include quoted-strings.  A quoted-string could
+    contain a comma.  A non-quoted string could have quotes in the
+    middle.  Quotes are removed automatically after parsing.
+
+    It basically works like :func:`parse_set_header` just that items
+    may appear multiple times and case sensitivity is preserved.
+
+    The return value is a standard :class:`list`:
+
+    >>> parse_list_header('token, "quoted value"')
+    ['token', 'quoted value']
+
+    To create a header from the :class:`list` again, use the
+    :func:`dump_header` function.
+
+    :param value: a string with a list header.
+    :return: :class:`list`
+    """
+    result = []
+    for item in _parse_list_header(value):
+        if item[:1] == item[-1:] == '"':
+            item = unquote_header_value(item[1:-1])
+        result.append(item)
+    return result
+
+
+# From mitsuhiko/werkzeug (used with permission).
+def parse_dict_header(value):
+    """Parse lists of key, value pairs as described by RFC 2068 Section 2 and
+    convert them into a python dict:
+
+    >>> d = parse_dict_header('foo="is a fish", bar="as well"')
+    >>> type(d) is dict
+    True
+    >>> sorted(d.items())
+    [('bar', 'as well'), ('foo', 'is a fish')]
+
+    If there is no value for a key it will be `None`:
+
+    >>> parse_dict_header('key_without_value')
+    {'key_without_value': None}
+
+    To create a header from the :class:`dict` again, use the
+    :func:`dump_header` function.
+
+    :param value: a string with a dict header.
+    :return: :class:`dict`
+    """
+    result = {}
+    for item in _parse_list_header(value):
+        if '=' not in item:
+            result[item] = None
+            continue
+        name, value = item.split('=', 1)
+        if value[:1] == value[-1:] == '"':
+            value = unquote_header_value(value[1:-1])
+        result[name] = value
+    return result
+
+
+# From mitsuhiko/werkzeug (used with permission).
+def unquote_header_value(value, is_filename=False):
+    r"""Unquotes a header value.  (Reversal of :func:`quote_header_value`).
+    This does not use the real unquoting but what browsers are actually
+    using for quoting.
+
+    :param value: the header value to unquote.
+    """
+    if value and value[0] == value[-1] == '"':
+        # this is not the real unquoting, but fixing this so that the
+        # RFC is met will result in bugs with internet explorer and
+        # probably some other browsers as well.  IE for example is
+        # uploading files with "C:\foo\bar.txt" as filename
+        value = value[1:-1]
+
+        # if this is a filename and the starting characters look like
+        # a UNC path, then just return the value without quotes.  Using the
+        # replace sequence below on a UNC path has the effect of turning
+        # the leading double slash into a single slash and then
+        # _fix_ie_filename() doesn't work correctly.  See #458.
+        if not is_filename or value[:2] != '\\\\':
+            return value.replace('\\\\', '\\').replace('\\"', '"')
+    return value
+
+
+def dict_from_cookiejar(cj):
+    """Returns a key/value dictionary from a CookieJar.
+
+    :param cj: CookieJar object to extract cookies from.
+    """
+
+    cookie_dict = {}
+
+    for cookie in cj:
+        cookie_dict[cookie.name] = cookie.value
+
+    return cookie_dict
+
+
+def add_dict_to_cookiejar(cj, cookie_dict):
+    """Returns a CookieJar from a key/value dictionary.
+
+    :param cj: CookieJar to insert cookies into.
+    :param cookie_dict: Dict of key/values to insert into CookieJar.
+    """
+
+    cj2 = cookiejar_from_dict(cookie_dict)
+    cj.update(cj2)
+    return cj
+
+
+def get_encodings_from_content(content):
+    """Returns encodings from given content string.
+
+    :param content: bytestring to extract encodings from.
+    """
+    warnings.warn((
+        'In requests 3.0, get_encodings_from_content will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
+
+    charset_re = re.compile(r'<meta.*?charset=["\']*(.+?)["\'>]', flags=re.I)
+    pragma_re = re.compile(r'<meta.*?content=["\']*;?charset=(.+?)["\'>]', flags=re.I)
+    xml_re = re.compile(r'^<\?xml.*?encoding=["\']*(.+?)["\'>]')
+
+    return (charset_re.findall(content) +
+            pragma_re.findall(content) +
+            xml_re.findall(content))
+
+
+def get_encoding_from_headers(headers):
+    """Returns encodings from given HTTP Header Dict.
+
+    :param headers: dictionary to extract encoding from.
+    """
+
+    content_type = headers.get('content-type')
+
+    if not content_type:
+        return None
+
+    content_type, params = cgi.parse_header(content_type)
+
+    if 'charset' in params:
+        return params['charset'].strip("'\"")
+
+    if 'text' in content_type:
+        return 'ISO-8859-1'
+
+
+def stream_decode_response_unicode(iterator, r):
+    """Stream decodes a iterator."""
+
+    if r.encoding is None:
+        for item in iterator:
+            yield item
+        return
+
+    decoder = codecs.getincrementaldecoder(r.encoding)(errors='replace')
+    for chunk in iterator:
+        rv = decoder.decode(chunk)
+        if rv:
+            yield rv
+    rv = decoder.decode(b'', final=True)
+    if rv:
+        yield rv
+
+
+def iter_slices(string, slice_length):
+    """Iterate over slices of a string."""
+    pos = 0
+    while pos < len(string):
+        yield string[pos:pos + slice_length]
+        pos += slice_length
+
+
+def get_unicode_from_response(r):
+    """Returns the requested content back in unicode.
+
+    :param r: Response object to get unicode content from.
+
+    Tried:
+
+    1. charset from content-type
+    2. fall back and replace all unicode characters
+
+    """
+    warnings.warn((
+        'In requests 3.0, get_unicode_from_response will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
+
+    tried_encodings = []
+
+    # Try charset from content-type
+    encoding = get_encoding_from_headers(r.headers)
+
+    if encoding:
+        try:
+            return str(r.content, encoding)
+        except UnicodeError:
+            tried_encodings.append(encoding)
+
+    # Fall back:
+    try:
+        return str(r.content, encoding, errors='replace')
+    except TypeError:
+        return r.content
+
+
+# The unreserved URI characters (RFC 3986)
+UNRESERVED_SET = frozenset(
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+    + "0123456789-._~")
+
+
+def unquote_unreserved(uri):
+    """Un-escape any percent-escape sequences in a URI that are unreserved
+    characters. This leaves all reserved, illegal and non-ASCII bytes encoded.
+    """
+    parts = uri.split('%')
+    for i in range(1, len(parts)):
+        h = parts[i][0:2]
+        if len(h) == 2 and h.isalnum():
+            try:
+                c = chr(int(h, 16))
+            except ValueError:
+                raise InvalidURL("Invalid percent-escape sequence: '%s'" % h)
+
+            if c in UNRESERVED_SET:
+                parts[i] = c + parts[i][2:]
+            else:
+                parts[i] = '%' + parts[i]
+        else:
+            parts[i] = '%' + parts[i]
+    return ''.join(parts)
+
+
+def requote_uri(uri):
+    """Re-quote the given URI.
+
+    This function passes the given URI through an unquote/quote cycle to
+    ensure that it is fully and consistently quoted.
+    """
+    # Unquote only the unreserved characters
+    # Then quote only illegal characters (do not quote reserved, unreserved,
+    # or '%')
+    return quote(unquote_unreserved(uri), safe="!#$%&'()*+,/:;=?@[]~")
+
+
+def address_in_network(ip, net):
+    """
+    This function allows you to check if on IP belongs to a network subnet
+    Example: returns True if ip = 192.168.1.1 and net = 192.168.1.0/24
+             returns False if ip = 192.168.1.1 and net = 192.168.100.0/24
+    """
+    ipaddr = struct.unpack('=L', socket.inet_aton(ip))[0]
+    netaddr, bits = net.split('/')
+    netmask = struct.unpack('=L', socket.inet_aton(dotted_netmask(int(bits))))[0]
+    network = struct.unpack('=L', socket.inet_aton(netaddr))[0] & netmask
+    return (ipaddr & netmask) == (network & netmask)
+
+
+def dotted_netmask(mask):
+    """
+    Converts mask from /xx format to xxx.xxx.xxx.xxx
+    Example: if mask is 24 function returns 255.255.255.0
+    """
+    bits = 0xffffffff ^ (1 << 32 - mask) - 1
+    return socket.inet_ntoa(struct.pack('>I', bits))
+
+
+def is_ipv4_address(string_ip):
+    try:
+        socket.inet_aton(string_ip)
+    except socket.error:
+        return False
+    return True
+
+
+def is_valid_cidr(string_network):
+    """Very simple check of the cidr format in no_proxy variable"""
+    if string_network.count('/') == 1:
+        try:
+            mask = int(string_network.split('/')[1])
+        except ValueError:
+            return False
+
+        if mask < 1 or mask > 32:
+            return False
+
+        try:
+            socket.inet_aton(string_network.split('/')[0])
+        except socket.error:
+            return False
+    else:
+        return False
+    return True
+
+
+def should_bypass_proxies(url):
+    """
+    Returns whether we should bypass proxies or not.
+    """
+    get_proxy = lambda k: os.environ.get(k) or os.environ.get(k.upper())
+
+    # First check whether no_proxy is defined. If it is, check that the URL
+    # we're getting isn't in the no_proxy list.
+    no_proxy = get_proxy('no_proxy')
+    netloc = urlparse(url).netloc
+
+    if no_proxy:
+        # We need to check whether we match here. We need to see if we match
+        # the end of the netloc, both with and without the port.
+        no_proxy = no_proxy.replace(' ', '').split(',')
+
+        ip = netloc.split(':')[0]
+        if is_ipv4_address(ip):
+            for proxy_ip in no_proxy:
+                if is_valid_cidr(proxy_ip):
+                    if address_in_network(ip, proxy_ip):
+                        return True
+        else:
+            for host in no_proxy:
+                if netloc.endswith(host) or netloc.split(':')[0].endswith(host):
+                    # The URL does match something in no_proxy, so we don't want
+                    # to apply the proxies on this URL.
+                    return True
+
+    # If the system proxy settings indicate that this URL should be bypassed,
+    # don't proxy.
+    # The proxy_bypass function is incredibly buggy on OS X in early versions
+    # of Python 2.6, so allow this call to fail. Only catch the specific
+    # exceptions we've seen, though: this call failing in other ways can reveal
+    # legitimate problems.
+    try:
+        bypass = proxy_bypass(netloc)
+    except (TypeError, socket.gaierror):
+        bypass = False
+
+    if bypass:
+        return True
+
+    return False
+
+def get_environ_proxies(url):
+    """Return a dict of environment proxies."""
+    if should_bypass_proxies(url):
+        return {}
+    else:
+        return getproxies()
+
+
+def default_user_agent(name="python-requests"):
+    """Return a string representing the default user agent."""
+    _implementation = platform.python_implementation()
+
+    if _implementation == 'CPython':
+        _implementation_version = platform.python_version()
+    elif _implementation == 'PyPy':
+        _implementation_version = '%s.%s.%s' % (sys.pypy_version_info.major,
+                                                sys.pypy_version_info.minor,
+                                                sys.pypy_version_info.micro)
+        if sys.pypy_version_info.releaselevel != 'final':
+            _implementation_version = ''.join([_implementation_version, sys.pypy_version_info.releaselevel])
+    elif _implementation == 'Jython':
+        _implementation_version = platform.python_version()  # Complete Guess
+    elif _implementation == 'IronPython':
+        _implementation_version = platform.python_version()  # Complete Guess
+    else:
+        _implementation_version = 'Unknown'
+
+    try:
+        p_system = platform.system()
+        p_release = platform.release()
+    except IOError:
+        p_system = 'Unknown'
+        p_release = 'Unknown'
+
+    return " ".join(['%s/%s' % (name, __version__),
+                     '%s/%s' % (_implementation, _implementation_version),
+                     '%s/%s' % (p_system, p_release)])
+
+
+def default_headers():
+    return CaseInsensitiveDict({
+        'User-Agent': default_user_agent(),
+        'Accept-Encoding': ', '.join(('gzip', 'deflate')),
+        'Accept': '*/*',
+        'Connection': 'keep-alive',
+    })
+
+
+def parse_header_links(value):
+    """Return a dict of parsed link headers proxies.
+
+    i.e. Link: <http:/.../front.jpeg>; rel=front; type="image/jpeg",<http://.../back.jpeg>; rel=back;type="image/jpeg"
+
+    """
+
+    links = []
+
+    replace_chars = " '\""
+
+    for val in re.split(", *<", value):
+        try:
+            url, params = val.split(";", 1)
+        except ValueError:
+            url, params = val, ''
+
+        link = {}
+
+        link["url"] = url.strip("<> '\"")
+
+        for param in params.split(";"):
+            try:
+                key, value = param.split("=")
+            except ValueError:
+                break
+
+            link[key.strip(replace_chars)] = value.strip(replace_chars)
+
+        links.append(link)
+
+    return links
+
+
+# Null bytes; no need to recreate these on each call to guess_json_utf
+_null = '\x00'.encode('ascii')  # encoding to ASCII for Python 3
+_null2 = _null * 2
+_null3 = _null * 3
+
+
+def guess_json_utf(data):
+    # JSON always starts with two ASCII characters, so detection is as
+    # easy as counting the nulls and from their location and count
+    # determine the encoding. Also detect a BOM, if present.
+    sample = data[:4]
+    if sample in (codecs.BOM_UTF32_LE, codecs.BOM32_BE):
+        return 'utf-32'     # BOM included
+    if sample[:3] == codecs.BOM_UTF8:
+        return 'utf-8-sig'  # BOM included, MS style (discouraged)
+    if sample[:2] in (codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE):
+        return 'utf-16'     # BOM included
+    nullcount = sample.count(_null)
+    if nullcount == 0:
+        return 'utf-8'
+    if nullcount == 2:
+        if sample[::2] == _null2:   # 1st and 3rd are null
+            return 'utf-16-be'
+        if sample[1::2] == _null2:  # 2nd and 4th are null
+            return 'utf-16-le'
+        # Did not detect 2 valid UTF-16 ascii-range characters
+    if nullcount == 3:
+        if sample[:3] == _null3:
+            return 'utf-32-be'
+        if sample[1:] == _null3:
+            return 'utf-32-le'
+        # Did not detect a valid UTF-32 ascii-range character
+    return None
+
+
+def prepend_scheme_if_needed(url, new_scheme):
+    '''Given a URL that may or may not have a scheme, prepend the given scheme.
+    Does not replace a present scheme with the one provided as an argument.'''
+    scheme, netloc, path, params, query, fragment = urlparse(url, new_scheme)
+
+    # urlparse is a finicky beast, and sometimes decides that there isn't a
+    # netloc present. Assume that it's being over-cautious, and switch netloc
+    # and path if urlparse decided there was no netloc.
+    if not netloc:
+        netloc, path = path, netloc
+
+    return urlunparse((scheme, netloc, path, params, query, fragment))
+
+
+def get_auth_from_url(url):
+    """Given a url with authentication components, extract them into a tuple of
+    username,password."""
+    parsed = urlparse(url)
+
+    try:
+        auth = (unquote(parsed.username), unquote(parsed.password))
+    except (AttributeError, TypeError):
+        auth = ('', '')
+
+    return auth
+
+
+def to_native_string(string, encoding='ascii'):
+    """
+    Given a string object, regardless of type, returns a representation of that
+    string in the native string type, encoding and decoding where necessary.
+    This assumes ASCII unless told otherwise.
+    """
+    out = None
+
+    if isinstance(string, builtin_str):
+        out = string
+    else:
+        if is_py2:
+            out = string.encode(encoding)
+        else:
+            out = string.decode(encoding)
+
+    return out
+
+
+def urldefragauth(url):
+    """
+    Given a url remove the fragment and the authentication part
+    """
+    scheme, netloc, path, params, query, fragment = urlparse(url)
+
+    # see func:`prepend_scheme_if_needed`
+    if not netloc:
+        netloc, path = path, netloc
+
+    netloc = netloc.rsplit('@', 1)[-1]
+
+    return urlunparse((scheme, netloc, path, params, query, ''))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/dependency_links.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/dependency_links.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/dependency_links.txt	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/not-zip-safe thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/not-zip-safe
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/not-zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/not-zip-safe	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/PKG-INFO thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/PKG-INFO
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/PKG-INFO	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,1011 @@
+Metadata-Version: 1.1
+Name: requests
+Version: 2.5.1
+Summary: Python HTTP for Humans.
+Home-page: http://python-requests.org
+Author: Kenneth Reitz
+Author-email: me@kennethreitz.com
+License: Apache 2.0
+Description: Requests: HTTP for Humans
+        =========================
+        
+        .. image:: https://badge.fury.io/py/requests.png
+            :target: http://badge.fury.io/py/requests
+        
+        .. image:: https://pypip.in/d/requests/badge.png
+                :target: https://crate.io/packages/requests/
+        
+        
+        Requests is an Apache2 Licensed HTTP library, written in Python, for human
+        beings.
+        
+        Most existing Python modules for sending HTTP requests are extremely
+        verbose and cumbersome. Python's builtin urllib2 module provides most of
+        the HTTP capabilities you should need, but the api is thoroughly broken.
+        It requires an enormous amount of work (even method overrides) to
+        perform the simplest of tasks.
+        
+        Things shouldn't be this way. Not in Python.
+        
+        .. code-block:: python
+        
+            >>> r = requests.get('https://api.github.com', auth=('user', 'pass'))
+            >>> r.status_code
+            204
+            >>> r.headers['content-type']
+            'application/json'
+            >>> r.text
+            ...
+        
+        See `the same code, without Requests <https://gist.github.com/973705>`_.
+        
+        Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
+        multipart files, and parameters with simple Python dictionaries, and access the
+        response data in the same way. It's powered by httplib and `urllib3
+        <https://github.com/shazow/urllib3>`_, but it does all the hard work and crazy
+        hacks for you.
+        
+        
+        Features
+        --------
+        
+        - International Domains and URLs
+        - Keep-Alive & Connection Pooling
+        - Sessions with Cookie Persistence
+        - Browser-style SSL Verification
+        - Basic/Digest Authentication
+        - Elegant Key/Value Cookies
+        - Automatic Decompression
+        - Unicode Response Bodies
+        - Multipart File Uploads
+        - Connection Timeouts
+        - Thread-safety
+        - HTTP(S) proxy support
+        
+        
+        Installation
+        ------------
+        
+        To install Requests, simply:
+        
+        .. code-block:: bash
+        
+            $ pip install requests
+        
+        
+        Documentation
+        -------------
+        
+        Documentation is available at http://docs.python-requests.org/.
+        
+        
+        Contribute
+        ----------
+        
+        #. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet.
+        #. If you feel uncomfortable or uncertain about an issue or your changes, feel free to email @sigmavirus24 and he will happily help you via email, Skype, remote pairing or whatever you are comfortable with.
+        #. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
+        #. Write a test which shows that the bug was fixed or that the feature works as expected.
+        #. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
+        
+        .. _`the repository`: http://github.com/kennethreitz/requests
+        .. _AUTHORS: https://github.com/kennethreitz/requests/blob/master/AUTHORS.rst
+        .. _Contributor Friendly: https://github.com/kennethreitz/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open
+        
+        
+        .. :changelog:
+        
+        Release History
+        ---------------
+        
+        2.5.1 (2014-12-23)
+        ++++++++++++++++++
+        
+        **Behavioural Changes**
+        
+        - Only catch HTTPErrors in raise_for_status (#2382)
+        
+        **Bugfixes**
+        
+        - Handle LocationParseError from urllib3 (#2344)
+        - Handle file-like object filenames that are not strings (#2379)
+        - Unbreak HTTPDigestAuth handler. Allow new nonces to be negotiated (#2389)
+        
+        2.5.0 (2014-12-01)
+        ++++++++++++++++++
+        
+        **Improvements**
+        
+        - Allow usage of urllib3's Retry object with HTTPAdapters (#2216)
+        - The ``iter_lines`` method on a response now accepts a delimiter with which
+          to split the content (#2295)
+        
+        **Behavioural Changes**
+        
+        - Add deprecation warnings to functions in requests.utils that will be removed
+          in 3.0 (#2309)
+        - Sessions used by the functional API are always closed (#2326)
+        - Restrict requests to HTTP/1.1 and HTTP/1.0 (stop accepting HTTP/0.9) (#2323)
+        
+        **Bugfixes**
+        
+        - Only parse the URL once (#2353)
+        - Allow Content-Length header to always be overriden (#2332)
+        - Properly handle files in HTTPDigestAuth (#2333)
+        - Cap redirect_cache size to prevent memory abuse (#2299)
+        - Fix HTTPDigestAuth handling of redirects after authenticating successfully
+          (#2253)
+        - Fix crash with custom method parameter to Session.request (#2317)
+        - Fix how Link headers are parsed using the regular expression library (#2271)
+        
+        **Documentation**
+        
+        - Add more references for interlinking (#2348)
+        - Update CSS for theme (#2290)
+        - Update width of buttons and sidebar (#2289)
+        - Replace references of Gittip with Gratipay (#2282)
+        - Add link to changelog in sidebar (#2273)
+        
+        2.4.3 (2014-10-06)
+        ++++++++++++++++++
+        
+        **Bugfixes**
+        
+        - Unicode URL improvements for Python 2.
+        - Re-order JSON param for backwards compat.
+        - Automatically defrag authentication schemes from host/pass URIs. (`#2249 <https://github.com/kennethreitz/requests/issues/2249>`_)
+        
+        
+        2.4.2 (2014-10-05)
+        ++++++++++++++++++
+        
+        **Improvements**
+        
+        - FINALLY! Add json parameter for uploads! (`#2258 <https://github.com/kennethreitz/requests/pull/2258>`_)
+        - Support for bytestring URLs on Python 3.x (`#2238 <https://github.com/kennethreitz/requests/pull/2238>`_)
+        
+        **Bugfixes**
+        
+        - Avoid getting stuck in a loop (`#2244 <https://github.com/kennethreitz/requests/pull/2244>`_)
+        - Multiple calls to iter* fail with unhelpful error. (`#2240 <https://github.com/kennethreitz/requests/issues/2240>`_, `#2241 <https://github.com/kennethreitz/requests/issues/2241>`_)
+        
+        **Documentation**
+        
+        - Correct redirection introduction (`#2245 <https://github.com/kennethreitz/requests/pull/2245/>`_)
+        - Added example of how to send multiple files in one request. (`#2227 <https://github.com/kennethreitz/requests/pull/2227/>`_)
+        - Clarify how to pass a custom set of CAs (`#2248 <https://github.com/kennethreitz/requests/pull/2248/>`_)
+        
+        
+        
+        2.4.1 (2014-09-09)
+        ++++++++++++++++++
+        
+        - Now has a "security" package extras set, ``$ pip install requests[security]``
+        - Requests will now use Certifi if it is available.
+        - Capture and re-raise urllib3 ProtocolError
+        - Bugfix for responses that attempt to redirect to themselves forever (wtf?).
+        
+        
+        2.4.0 (2014-08-29)
+        ++++++++++++++++++
+        
+        **Behavioral Changes**
+        
+        - ``Connection: keep-alive`` header is now sent automatically.
+        
+        **Improvements**
+        
+        - Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts.
+        - Allow copying of PreparedRequests without headers/cookies.
+        - Updated bundled urllib3 version.
+        - Refactored settings loading from environment — new `Session.merge_environment_settings`.
+        - Handle socket errors in iter_content.
+        
+        
+        2.3.0 (2014-05-16)
+        ++++++++++++++++++
+        
+        **API Changes**
+        
+        - New ``Response`` property ``is_redirect``, which is true when the
+          library could have processed this response as a redirection (whether
+          or not it actually did).
+        - The ``timeout`` parameter now affects requests with both ``stream=True`` and
+          ``stream=False`` equally.
+        - The change in v2.0.0 to mandate explicit proxy schemes has been reverted.
+          Proxy schemes now default to ``http://``.
+        - The ``CaseInsensitiveDict`` used for HTTP headers now behaves like a normal
+          dictionary when references as string or viewed in the interpreter.
+        
+        **Bugfixes**
+        
+        - No longer expose Authorization or Proxy-Authorization headers on redirect.
+          Fix CVE-2014-1829 and CVE-2014-1830 respectively.
+        - Authorization is re-evaluated each redirect.
+        - On redirect, pass url as native strings.
+        - Fall-back to autodetected encoding for JSON when Unicode detection fails.
+        - Headers set to ``None`` on the ``Session`` are now correctly not sent.
+        - Correctly honor ``decode_unicode`` even if it wasn't used earlier in the same
+          response.
+        - Stop advertising ``compress`` as a supported Content-Encoding.
+        - The ``Response.history`` parameter is now always a list.
+        - Many, many ``urllib3`` bugfixes.
+        
+        2.2.1 (2014-01-23)
+        ++++++++++++++++++
+        
+        **Bugfixes**
+        
+        - Fixes incorrect parsing of proxy credentials that contain a literal or encoded '#' character.
+        - Assorted urllib3 fixes.
+        
+        2.2.0 (2014-01-09)
+        ++++++++++++++++++
+        
+        **API Changes**
+        
+        - New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
+          ``DecodeError`` exceptions.
+        
+        **Bugfixes**
+        
+        - Avoid many many exceptions from the buggy implementation of ``proxy_bypass`` on OS X in Python 2.6.
+        - Avoid crashing when attempting to get authentication credentials from ~/.netrc when running as a user without a home directory.
+        - Use the correct pool size for pools of connections to proxies.
+        - Fix iteration of ``CookieJar`` objects.
+        - Ensure that cookies are persisted over redirect.
+        - Switch back to using chardet, since it has merged with charade.
+        
+        2.1.0 (2013-12-05)
+        ++++++++++++++++++
+        
+        - Updated CA Bundle, of course.
+        - Cookies set on individual Requests through a ``Session`` (e.g. via ``Session.get()``) are no longer persisted to the ``Session``.
+        - Clean up connections when we hit problems during chunked upload, rather than leaking them.
+        - Return connections to the pool when a chunked upload is successful, rather than leaking it.
+        - Match the HTTPbis recommendation for HTTP 301 redirects.
+        - Prevent hanging when using streaming uploads and Digest Auth when a 401 is received.
+        - Values of headers set by Requests are now always the native string type.
+        - Fix previously broken SNI support.
+        - Fix accessing HTTP proxies using proxy authentication.
+        - Unencode HTTP Basic usernames and passwords extracted from URLs.
+        - Support for IP address ranges for no_proxy environment variable
+        - Parse headers correctly when users override the default ``Host:`` header.
+        - Avoid munging the URL in case of case-sensitive servers.
+        - Looser URL handling for non-HTTP/HTTPS urls.
+        - Accept unicode methods in Python 2.6 and 2.7.
+        - More resilient cookie handling.
+        - Make ``Response`` objects pickleable.
+        - Actually added MD5-sess to Digest Auth instead of pretending to like last time.
+        - Updated internal urllib3.
+        - Fixed @Lukasa's lack of taste.
+        
+        2.0.1 (2013-10-24)
+        ++++++++++++++++++
+        
+        - Updated included CA Bundle with new mistrusts and automated process for the future
+        - Added MD5-sess to Digest Auth
+        - Accept per-file headers in multipart file POST messages.
+        - Fixed: Don't send the full URL on CONNECT messages.
+        - Fixed: Correctly lowercase a redirect scheme.
+        - Fixed: Cookies not persisted when set via functional API.
+        - Fixed: Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError.
+        - Updated internal urllib3 and chardet.
+        
+        2.0.0 (2013-09-24)
+        ++++++++++++++++++
+        
+        **API Changes:**
+        
+        - Keys in the Headers dictionary are now native strings on all Python versions,
+          i.e. bytestrings on Python 2, unicode on Python 3.
+        - Proxy URLs now *must* have an explicit scheme. A ``MissingSchema`` exception
+          will be raised if they don't.
+        - Timeouts now apply to read time if ``Stream=False``.
+        - ``RequestException`` is now a subclass of ``IOError``, not ``RuntimeError``.
+        - Added new method to ``PreparedRequest`` objects: ``PreparedRequest.copy()``.
+        - Added new method to ``Session`` objects: ``Session.update_request()``. This
+          method updates a ``Request`` object with the data (e.g. cookies) stored on
+          the ``Session``.
+        - Added new method to ``Session`` objects: ``Session.prepare_request()``. This
+          method updates and prepares a ``Request`` object, and returns the
+          corresponding ``PreparedRequest`` object.
+        - Added new method to ``HTTPAdapter`` objects: ``HTTPAdapter.proxy_headers()``.
+          This should not be called directly, but improves the subclass interface.
+        - ``httplib.IncompleteRead`` exceptions caused by incorrect chunked encoding
+          will now raise a Requests ``ChunkedEncodingError`` instead.
+        - Invalid percent-escape sequences now cause a Requests ``InvalidURL``
+          exception to be raised.
+        - HTTP 208 no longer uses reason phrase ``"im_used"``. Correctly uses
+          ``"already_reported"``.
+        - HTTP 226 reason added (``"im_used"``).
+        
+        **Bugfixes:**
+        
+        - Vastly improved proxy support, including the CONNECT verb. Special thanks to
+          the many contributors who worked towards this improvement.
+        - Cookies are now properly managed when 401 authentication responses are
+          received.
+        - Chunked encoding fixes.
+        - Support for mixed case schemes.
+        - Better handling of streaming downloads.
+        - Retrieve environment proxies from more locations.
+        - Minor cookies fixes.
+        - Improved redirect behaviour.
+        - Improved streaming behaviour, particularly for compressed data.
+        - Miscellaneous small Python 3 text encoding bugs.
+        - ``.netrc`` no longer overrides explicit auth.
+        - Cookies set by hooks are now correctly persisted on Sessions.
+        - Fix problem with cookies that specify port numbers in their host field.
+        - ``BytesIO`` can be used to perform streaming uploads.
+        - More generous parsing of the ``no_proxy`` environment variable.
+        - Non-string objects can be passed in data values alongside files.
+        
+        1.2.3 (2013-05-25)
+        ++++++++++++++++++
+        
+        - Simple packaging fix
+        
+        
+        1.2.2 (2013-05-23)
+        ++++++++++++++++++
+        
+        - Simple packaging fix
+        
+        
+        1.2.1 (2013-05-20)
+        ++++++++++++++++++
+        
+        - 301 and 302 redirects now change the verb to GET for all verbs, not just
+          POST, improving browser compatibility.
+        - Python 3.3.2 compatibility
+        - Always percent-encode location headers
+        - Fix connection adapter matching to be most-specific first
+        - new argument to the default connection adapter for passing a block argument
+        - prevent a KeyError when there's no link headers
+        
+        1.2.0 (2013-03-31)
+        ++++++++++++++++++
+        
+        - Fixed cookies on sessions and on requests
+        - Significantly change how hooks are dispatched - hooks now receive all the
+          arguments specified by the user when making a request so hooks can make a
+          secondary request with the same parameters. This is especially necessary for
+          authentication handler authors
+        - certifi support was removed
+        - Fixed bug where using OAuth 1 with body ``signature_type`` sent no data
+        - Major proxy work thanks to @Lukasa including parsing of proxy authentication
+          from the proxy url
+        - Fix DigestAuth handling too many 401s
+        - Update vendored urllib3 to include SSL bug fixes
+        - Allow keyword arguments to be passed to ``json.loads()`` via the
+          ``Response.json()`` method
+        - Don't send ``Content-Length`` header by default on ``GET`` or ``HEAD``
+          requests
+        - Add ``elapsed`` attribute to ``Response`` objects to time how long a request
+          took.
+        - Fix ``RequestsCookieJar``
+        - Sessions and Adapters are now picklable, i.e., can be used with the
+          multiprocessing library
+        - Update charade to version 1.0.3
+        
+        The change in how hooks are dispatched will likely cause a great deal of
+        issues.
+        
+        1.1.0 (2013-01-10)
+        ++++++++++++++++++
+        
+        - CHUNKED REQUESTS
+        - Support for iterable response bodies
+        - Assume servers persist redirect params
+        - Allow explicit content types to be specified for file data
+        - Make merge_kwargs case-insensitive when looking up keys
+        
+        1.0.3 (2012-12-18)
+        ++++++++++++++++++
+        
+        - Fix file upload encoding bug
+        - Fix cookie behavior
+        
+        1.0.2 (2012-12-17)
+        ++++++++++++++++++
+        
+        - Proxy fix for HTTPAdapter.
+        
+        1.0.1 (2012-12-17)
+        ++++++++++++++++++
+        
+        - Cert verification exception bug.
+        - Proxy fix for HTTPAdapter.
+        
+        1.0.0 (2012-12-17)
+        ++++++++++++++++++
+        
+        - Massive Refactor and Simplification
+        - Switch to Apache 2.0 license
+        - Swappable Connection Adapters
+        - Mountable Connection Adapters
+        - Mutable ProcessedRequest chain
+        - /s/prefetch/stream
+        - Removal of all configuration
+        - Standard library logging
+        - Make Response.json() callable, not property.
+        - Usage of new charade project, which provides python 2 and 3 simultaneous chardet.
+        - Removal of all hooks except 'response'
+        - Removal of all authentication helpers (OAuth, Kerberos)
+        
+        This is not a backwards compatible change.
+        
+        0.14.2 (2012-10-27)
+        +++++++++++++++++++
+        
+        - Improved mime-compatible JSON handling
+        - Proxy fixes
+        - Path hack fixes
+        - Case-Insensistive Content-Encoding headers
+        - Support for CJK parameters in form posts
+        
+        
+        0.14.1 (2012-10-01)
+        +++++++++++++++++++
+        
+        - Python 3.3 Compatibility
+        - Simply default accept-encoding
+        - Bugfixes
+        
+        
+        0.14.0 (2012-09-02)
+        ++++++++++++++++++++
+        
+        - No more iter_content errors if already downloaded.
+        
+        0.13.9 (2012-08-25)
+        +++++++++++++++++++
+        
+        - Fix for OAuth + POSTs
+        - Remove exception eating from dispatch_hook
+        - General bugfixes
+        
+        0.13.8 (2012-08-21)
+        +++++++++++++++++++
+        
+        - Incredible Link header support :)
+        
+        0.13.7 (2012-08-19)
+        +++++++++++++++++++
+        
+        - Support for (key, value) lists everywhere.
+        - Digest Authentication improvements.
+        - Ensure proxy exclusions work properly.
+        - Clearer UnicodeError exceptions.
+        - Automatic casting of URLs to tsrings (fURL and such)
+        - Bugfixes.
+        
+        0.13.6 (2012-08-06)
+        +++++++++++++++++++
+        
+        - Long awaited fix for hanging connections!
+        
+        0.13.5 (2012-07-27)
+        +++++++++++++++++++
+        
+        - Packaging fix
+        
+        0.13.4 (2012-07-27)
+        +++++++++++++++++++
+        
+        - GSSAPI/Kerberos authentication!
+        - App Engine 2.7 Fixes!
+        - Fix leaking connections (from urllib3 update)
+        - OAuthlib path hack fix
+        - OAuthlib URL parameters fix.
+        
+        0.13.3 (2012-07-12)
+        +++++++++++++++++++
+        
+        - Use simplejson if available.
+        - Do not hide SSLErrors behind Timeouts.
+        - Fixed param handling with urls containing fragments.
+        - Significantly improved information in User Agent.
+        - client certificates are ignored when verify=False
+        
+        0.13.2 (2012-06-28)
+        +++++++++++++++++++
+        
+        - Zero dependencies (once again)!
+        - New: Response.reason
+        - Sign querystring parameters in OAuth 1.0
+        - Client certificates no longer ignored when verify=False
+        - Add openSUSE certificate support
+        
+        0.13.1 (2012-06-07)
+        +++++++++++++++++++
+        
+        - Allow passing a file or file-like object as data.
+        - Allow hooks to return responses that indicate errors.
+        - Fix Response.text and Response.json for body-less responses.
+        
+        0.13.0 (2012-05-29)
+        +++++++++++++++++++
+        
+        - Removal of Requests.async in favor of `grequests <https://github.com/kennethreitz/grequests>`_
+        - Allow disabling of cookie persistiance.
+        - New implimentation of safe_mode
+        - cookies.get now supports default argument
+        - Session cookies not saved when Session.request is called with return_response=False
+        - Env: no_proxy support.
+        - RequestsCookieJar improvements.
+        - Various bug fixes.
+        
+        0.12.1 (2012-05-08)
+        +++++++++++++++++++
+        
+        - New ``Response.json`` property.
+        - Ability to add string file uploads.
+        - Fix out-of-range issue with iter_lines.
+        - Fix iter_content default size.
+        - Fix POST redirects containing files.
+        
+        0.12.0 (2012-05-02)
+        +++++++++++++++++++
+        
+        - EXPERIMENTAL OAUTH SUPPORT!
+        - Proper CookieJar-backed cookies interface with awesome dict-like interface.
+        - Speed fix for non-iterated content chunks.
+        - Move ``pre_request`` to a more usable place.
+        - New ``pre_send`` hook.
+        - Lazily encode data, params, files.
+        - Load system Certificate Bundle if ``certify`` isn't available.
+        - Cleanups, fixes.
+        
+        0.11.2 (2012-04-22)
+        +++++++++++++++++++
+        
+        - Attempt to use the OS's certificate bundle if ``certifi`` isn't available.
+        - Infinite digest auth redirect fix.
+        - Multi-part file upload improvements.
+        - Fix decoding of invalid %encodings in URLs.
+        - If there is no content in a response don't throw an error the second time that content is attempted to be read.
+        - Upload data on redirects.
+        
+        0.11.1 (2012-03-30)
+        +++++++++++++++++++
+        
+        * POST redirects now break RFC to do what browsers do: Follow up with a GET.
+        * New ``strict_mode`` configuration to disable new redirect behavior.
+        
+        
+        0.11.0 (2012-03-14)
+        +++++++++++++++++++
+        
+        * Private SSL Certificate support
+        * Remove select.poll from Gevent monkeypatching
+        * Remove redundant generator for chunked transfer encoding
+        * Fix: Response.ok raises Timeout Exception in safe_mode
+        
+        0.10.8 (2012-03-09)
+        +++++++++++++++++++
+        
+        * Generate chunked ValueError fix
+        * Proxy configuration by environment variables
+        * Simplification of iter_lines.
+        * New `trust_env` configuration for disabling system/environment hints.
+        * Suppress cookie errors.
+        
+        0.10.7 (2012-03-07)
+        +++++++++++++++++++
+        
+        * `encode_uri` = False
+        
+        0.10.6 (2012-02-25)
+        +++++++++++++++++++
+        
+        * Allow '=' in cookies.
+        
+        0.10.5 (2012-02-25)
+        +++++++++++++++++++
+        
+        * Response body with 0 content-length fix.
+        * New async.imap.
+        * Don't fail on netrc.
+        
+        
+        0.10.4 (2012-02-20)
+        +++++++++++++++++++
+        
+        * Honor netrc.
+        
+        0.10.3 (2012-02-20)
+        +++++++++++++++++++
+        
+        * HEAD requests don't follow redirects anymore.
+        * raise_for_status() doesn't raise for 3xx anymore.
+        * Make Session objects picklable.
+        * ValueError for invalid schema URLs.
+        
+        0.10.2 (2012-01-15)
+        +++++++++++++++++++
+        
+        * Vastly improved URL quoting.
+        * Additional allowed cookie key values.
+        * Attempted fix for "Too many open files" Error
+        * Replace unicode errors on first pass, no need for second pass.
+        * Append '/' to bare-domain urls before query insertion.
+        * Exceptions now inherit from RuntimeError.
+        * Binary uploads + auth fix.
+        * Bugfixes.
+        
+        
+        0.10.1 (2012-01-23)
+        +++++++++++++++++++
+        
+        * PYTHON 3 SUPPORT!
+        * Dropped 2.5 Support. (*Backwards Incompatible*)
+        
+        0.10.0 (2012-01-21)
+        +++++++++++++++++++
+        
+        * ``Response.content`` is now bytes-only. (*Backwards Incompatible*)
+        * New ``Response.text`` is unicode-only.
+        * If no ``Response.encoding`` is specified and ``chardet`` is available, ``Respoonse.text`` will guess an encoding.
+        * Default to ISO-8859-1 (Western) encoding for "text" subtypes.
+        * Removal of `decode_unicode`. (*Backwards Incompatible*)
+        * New multiple-hooks system.
+        * New ``Response.register_hook`` for registering hooks within the pipeline.
+        * ``Response.url`` is now Unicode.
+        
+        0.9.3 (2012-01-18)
+        ++++++++++++++++++
+        
+        * SSL verify=False bugfix (apparent on windows machines).
+        
+        0.9.2 (2012-01-18)
+        ++++++++++++++++++
+        
+        * Asynchronous async.send method.
+        * Support for proper chunk streams with boundaries.
+        * session argument for Session classes.
+        * Print entire hook tracebacks, not just exception instance.
+        * Fix response.iter_lines from pending next line.
+        * Fix but in HTTP-digest auth w/ URI having query strings.
+        * Fix in Event Hooks section.
+        * Urllib3 update.
+        
+        
+        0.9.1 (2012-01-06)
+        ++++++++++++++++++
+        
+        * danger_mode for automatic Response.raise_for_status()
+        * Response.iter_lines refactor
+        
+        0.9.0 (2011-12-28)
+        ++++++++++++++++++
+        
+        * verify ssl is default.
+        
+        
+        0.8.9 (2011-12-28)
+        ++++++++++++++++++
+        
+        * Packaging fix.
+        
+        
+        0.8.8 (2011-12-28)
+        ++++++++++++++++++
+        
+        * SSL CERT VERIFICATION!
+        * Release of Cerifi: Mozilla's cert list.
+        * New 'verify' argument for SSL requests.
+        * Urllib3 update.
+        
+        0.8.7 (2011-12-24)
+        ++++++++++++++++++
+        
+        * iter_lines last-line truncation fix
+        * Force safe_mode for async requests
+        * Handle safe_mode exceptions more consistently
+        * Fix iteration on null responses in safe_mode
+        
+        0.8.6 (2011-12-18)
+        ++++++++++++++++++
+        
+        * Socket timeout fixes.
+        * Proxy Authorization support.
+        
+        0.8.5 (2011-12-14)
+        ++++++++++++++++++
+        
+        * Response.iter_lines!
+        
+        0.8.4 (2011-12-11)
+        ++++++++++++++++++
+        
+        * Prefetch bugfix.
+        * Added license to installed version.
+        
+        0.8.3 (2011-11-27)
+        ++++++++++++++++++
+        
+        * Converted auth system to use simpler callable objects.
+        * New session parameter to API methods.
+        * Display full URL while logging.
+        
+        0.8.2 (2011-11-19)
+        ++++++++++++++++++
+        
+        * New Unicode decoding system, based on over-ridable `Response.encoding`.
+        * Proper URL slash-quote handling.
+        * Cookies with ``[``, ``]``, and ``_`` allowed.
+        
+        0.8.1 (2011-11-15)
+        ++++++++++++++++++
+        
+        * URL Request path fix
+        * Proxy fix.
+        * Timeouts fix.
+        
+        0.8.0 (2011-11-13)
+        ++++++++++++++++++
+        
+        * Keep-alive support!
+        * Complete removal of Urllib2
+        * Complete removal of Poster
+        * Complete removal of CookieJars
+        * New ConnectionError raising
+        * Safe_mode for error catching
+        * prefetch parameter for request methods
+        * OPTION method
+        * Async pool size throttling
+        * File uploads send real names
+        * Vendored in urllib3
+        
+        0.7.6 (2011-11-07)
+        ++++++++++++++++++
+        
+        * Digest authentication bugfix (attach query data to path)
+        
+        0.7.5 (2011-11-04)
+        ++++++++++++++++++
+        
+        * Response.content = None if there was an invalid repsonse.
+        * Redirection auth handling.
+        
+        0.7.4 (2011-10-26)
+        ++++++++++++++++++
+        
+        * Session Hooks fix.
+        
+        0.7.3 (2011-10-23)
+        ++++++++++++++++++
+        
+        * Digest Auth fix.
+        
+        
+        0.7.2 (2011-10-23)
+        ++++++++++++++++++
+        
+        * PATCH Fix.
+        
+        
+        0.7.1 (2011-10-23)
+        ++++++++++++++++++
+        
+        * Move away from urllib2 authentication handling.
+        * Fully Remove AuthManager, AuthObject, &c.
+        * New tuple-based auth system with handler callbacks.
+        
+        
+        0.7.0 (2011-10-22)
+        ++++++++++++++++++
+        
+        * Sessions are now the primary interface.
+        * Deprecated InvalidMethodException.
+        * PATCH fix.
+        * New config system (no more global settings).
+        
+        
+        0.6.6 (2011-10-19)
+        ++++++++++++++++++
+        
+        * Session parameter bugfix (params merging).
+        
+        
+        0.6.5 (2011-10-18)
+        ++++++++++++++++++
+        
+        * Offline (fast) test suite.
+        * Session dictionary argument merging.
+        
+        
+        0.6.4 (2011-10-13)
+        ++++++++++++++++++
+        
+        * Automatic decoding of unicode, based on HTTP Headers.
+        * New ``decode_unicode`` setting.
+        * Removal of ``r.read/close`` methods.
+        * New ``r.faw`` interface for advanced response usage.*
+        * Automatic expansion of parameterized headers.
+        
+        
+        0.6.3 (2011-10-13)
+        ++++++++++++++++++
+        
+        * Beautiful ``requests.async`` module, for making async requests w/ gevent.
+        
+        
+        0.6.2 (2011-10-09)
+        ++++++++++++++++++
+        
+        * GET/HEAD obeys allow_redirects=False.
+        
+        
+        0.6.1 (2011-08-20)
+        ++++++++++++++++++
+        
+        * Enhanced status codes experience ``\o/``
+        * Set a maximum number of redirects (``settings.max_redirects``)
+        * Full Unicode URL support
+        * Support for protocol-less redirects.
+        * Allow for arbitrary request types.
+        * Bugfixes
+        
+        
+        0.6.0 (2011-08-17)
+        ++++++++++++++++++
+        
+        * New callback hook system
+        * New persistient sessions object and context manager
+        * Transparent Dict-cookie handling
+        * Status code reference object
+        * Removed Response.cached
+        * Added Response.request
+        * All args are kwargs
+        * Relative redirect support
+        * HTTPError handling improvements
+        * Improved https testing
+        * Bugfixes
+        
+        
+        0.5.1 (2011-07-23)
+        ++++++++++++++++++
+        
+        * International Domain Name Support!
+        * Access headers without fetching entire body (``read()``)
+        * Use lists as dicts for parameters
+        * Add Forced Basic Authentication
+        * Forced Basic is default authentication type
+        * ``python-requests.org`` default User-Agent header
+        * CaseInsensitiveDict lower-case caching
+        * Response.history bugfix
+        
+        
+        0.5.0 (2011-06-21)
+        ++++++++++++++++++
+        
+        * PATCH Support
+        * Support for Proxies
+        * HTTPBin Test Suite
+        * Redirect Fixes
+        * settings.verbose stream writing
+        * Querystrings for all methods
+        * URLErrors (Connection Refused, Timeout, Invalid URLs) are treated as explicity raised
+          ``r.requests.get('hwe://blah'); r.raise_for_status()``
+        
+        
+        0.4.1 (2011-05-22)
+        ++++++++++++++++++
+        
+        * Improved Redirection Handling
+        * New 'allow_redirects' param for following non-GET/HEAD Redirects
+        * Settings module refactoring
+        
+        
+        0.4.0 (2011-05-15)
+        ++++++++++++++++++
+        
+        * Response.history: list of redirected responses
+        * Case-Insensitive Header Dictionaries!
+        * Unicode URLs
+        
+        
+        0.3.4 (2011-05-14)
+        ++++++++++++++++++
+        
+        * Urllib2 HTTPAuthentication Recursion fix (Basic/Digest)
+        * Internal Refactor
+        * Bytes data upload Bugfix
+        
+        
+        
+        0.3.3 (2011-05-12)
+        ++++++++++++++++++
+        
+        * Request timeouts
+        * Unicode url-encoded data
+        * Settings context manager and module
+        
+        
+        0.3.2 (2011-04-15)
+        ++++++++++++++++++
+        
+        * Automatic Decompression of GZip Encoded Content
+        * AutoAuth Support for Tupled HTTP Auth
+        
+        
+        0.3.1 (2011-04-01)
+        ++++++++++++++++++
+        
+        * Cookie Changes
+        * Response.read()
+        * Poster fix
+        
+        
+        0.3.0 (2011-02-25)
+        ++++++++++++++++++
+        
+        * Automatic Authentication API Change
+        * Smarter Query URL Parameterization
+        * Allow file uploads and POST data together
+        * New Authentication Manager System
+            - Simpler Basic HTTP System
+            - Supports all build-in urllib2 Auths
+            - Allows for custom Auth Handlers
+        
+        
+        0.2.4 (2011-02-19)
+        ++++++++++++++++++
+        
+        * Python 2.5 Support
+        * PyPy-c v1.4 Support
+        * Auto-Authentication tests
+        * Improved Request object constructor
+        
+        0.2.3 (2011-02-15)
+        ++++++++++++++++++
+        
+        * New HTTPHandling Methods
+            - Response.__nonzero__ (false if bad HTTP Status)
+            - Response.ok (True if expected HTTP Status)
+            - Response.error (Logged HTTPError if bad HTTP Status)
+            - Response.raise_for_status() (Raises stored HTTPError)
+        
+        
+        0.2.2 (2011-02-14)
+        ++++++++++++++++++
+        
+        * Still handles request in the event of an HTTPError. (Issue #2)
+        * Eventlet and Gevent Monkeypatch support.
+        * Cookie Support (Issue #1)
+        
+        
+        0.2.1 (2011-02-14)
+        ++++++++++++++++++
+        
+        * Added file attribute to POST and PUT requests for multipart-encode file uploads.
+        * Added Request.url attribute for context and redirects
+        
+        
+        0.2.0 (2011-02-14)
+        ++++++++++++++++++
+        
+        * Birth!
+        
+        
+        0.0.1 (2011-02-13)
+        ++++++++++++++++++
+        
+        * Frustration
+        * Conception
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/requires.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/requires.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/requires.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/requires.txt	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,5 @@
+
+[security]
+pyOpenSSL
+ndg-httpsclient
+pyasn1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/SOURCES.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/SOURCES.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/SOURCES.txt	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,95 @@
+HISTORY.rst
+LICENSE
+MANIFEST.in
+NOTICE
+README.rst
+requirements.txt
+setup.cfg
+setup.py
+test_requests.py
+requests/__init__.py
+requests/adapters.py
+requests/api.py
+requests/auth.py
+requests/cacert.pem
+requests/certs.py
+requests/compat.py
+requests/cookies.py
+requests/exceptions.py
+requests/hooks.py
+requests/models.py
+requests/sessions.py
+requests/status_codes.py
+requests/structures.py
+requests/utils.py
+requests.egg-info/PKG-INFO
+requests.egg-info/SOURCES.txt
+requests.egg-info/dependency_links.txt
+requests.egg-info/not-zip-safe
+requests.egg-info/requires.txt
+requests.egg-info/top_level.txt
+requests/packages/__init__.py
+requests/packages/chardet/__init__.py
+requests/packages/chardet/big5freq.py
+requests/packages/chardet/big5prober.py
+requests/packages/chardet/chardetect.py
+requests/packages/chardet/chardistribution.py
+requests/packages/chardet/charsetgroupprober.py
+requests/packages/chardet/charsetprober.py
+requests/packages/chardet/codingstatemachine.py
+requests/packages/chardet/compat.py
+requests/packages/chardet/constants.py
+requests/packages/chardet/cp949prober.py
+requests/packages/chardet/escprober.py
+requests/packages/chardet/escsm.py
+requests/packages/chardet/eucjpprober.py
+requests/packages/chardet/euckrfreq.py
+requests/packages/chardet/euckrprober.py
+requests/packages/chardet/euctwfreq.py
+requests/packages/chardet/euctwprober.py
+requests/packages/chardet/gb2312freq.py
+requests/packages/chardet/gb2312prober.py
+requests/packages/chardet/hebrewprober.py
+requests/packages/chardet/jisfreq.py
+requests/packages/chardet/jpcntx.py
+requests/packages/chardet/langbulgarianmodel.py
+requests/packages/chardet/langcyrillicmodel.py
+requests/packages/chardet/langgreekmodel.py
+requests/packages/chardet/langhebrewmodel.py
+requests/packages/chardet/langhungarianmodel.py
+requests/packages/chardet/langthaimodel.py
+requests/packages/chardet/latin1prober.py
+requests/packages/chardet/mbcharsetprober.py
+requests/packages/chardet/mbcsgroupprober.py
+requests/packages/chardet/mbcssm.py
+requests/packages/chardet/sbcharsetprober.py
+requests/packages/chardet/sbcsgroupprober.py
+requests/packages/chardet/sjisprober.py
+requests/packages/chardet/universaldetector.py
+requests/packages/chardet/utf8prober.py
+requests/packages/urllib3/__init__.py
+requests/packages/urllib3/_collections.py
+requests/packages/urllib3/connection.py
+requests/packages/urllib3/connectionpool.py
+requests/packages/urllib3/exceptions.py
+requests/packages/urllib3/fields.py
+requests/packages/urllib3/filepost.py
+requests/packages/urllib3/poolmanager.py
+requests/packages/urllib3/request.py
+requests/packages/urllib3/response.py
+requests/packages/urllib3/contrib/__init__.py
+requests/packages/urllib3/contrib/ntlmpool.py
+requests/packages/urllib3/contrib/pyopenssl.py
+requests/packages/urllib3/packages/__init__.py
+requests/packages/urllib3/packages/ordered_dict.py
+requests/packages/urllib3/packages/six.py
+requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
+requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
+requests/packages/urllib3/util/__init__.py
+requests/packages/urllib3/util/connection.py
+requests/packages/urllib3/util/request.py
+requests/packages/urllib3/util/response.py
+requests/packages/urllib3/util/retry.py
+requests/packages/urllib3/util/ssl_.py
+requests/packages/urllib3/util/timeout.py
+requests/packages/urllib3/util/url.py
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/top_level.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/top_level.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requests.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requests.egg-info/top_level.txt	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1 @@
+requests
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requirements.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requirements.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/requirements.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/requirements.txt	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,4 @@
+py==1.4.12
+pytest==2.3.4
+pytest-cov==1.6
+wheel
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/setup.cfg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/setup.cfg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/setup.cfg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/setup.cfg	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,8 @@
+[wheel]
+universal = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/setup.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/setup.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/setup.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/setup.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+import requests
+
+from codecs import open
+
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+if sys.argv[-1] == 'publish':
+    os.system('python setup.py sdist upload')
+    sys.exit()
+
+packages = [
+    'requests',
+    'requests.packages',
+    'requests.packages.chardet',
+    'requests.packages.urllib3',
+    'requests.packages.urllib3.packages',
+    'requests.packages.urllib3.contrib',
+    'requests.packages.urllib3.util',
+    'requests.packages.urllib3.packages.ssl_match_hostname',
+]
+
+requires = []
+
+with open('README.rst', 'r', 'utf-8') as f:
+    readme = f.read()
+with open('HISTORY.rst', 'r', 'utf-8') as f:
+    history = f.read()
+
+setup(
+    name='requests',
+    version=requests.__version__,
+    description='Python HTTP for Humans.',
+    long_description=readme + '\n\n' + history,
+    author='Kenneth Reitz',
+    author_email='me@kennethreitz.com',
+    url='http://python-requests.org',
+    packages=packages,
+    package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']},
+    package_dir={'requests': 'requests'},
+    include_package_data=True,
+    install_requires=requires,
+    license='Apache 2.0',
+    zip_safe=False,
+    classifiers=(
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4'
+
+    ),
+    extras_require={
+        'security': ['pyOpenSSL', 'ndg-httpsclient', 'pyasn1'],
+    },
+)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/test_requests.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/test_requests.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/python/requests/test_requests.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/python/requests/test_requests.py	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,1558 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""Tests for Requests."""
+
+from __future__ import division
+import json
+import os
+import pickle
+import unittest
+import collections
+
+import io
+import requests
+import pytest
+from requests.adapters import HTTPAdapter
+from requests.auth import HTTPDigestAuth, _basic_auth_str
+from requests.compat import (
+    Morsel, cookielib, getproxies, str, urljoin, urlparse, is_py3, builtin_str)
+from requests.cookies import cookiejar_from_dict, morsel_to_cookie
+from requests.exceptions import (ConnectionError, ConnectTimeout,
+                                 InvalidSchema, InvalidURL, MissingSchema,
+                                 ReadTimeout, Timeout, RetryError)
+from requests.models import PreparedRequest
+from requests.structures import CaseInsensitiveDict
+from requests.sessions import SessionRedirectMixin
+from requests.models import urlencode
+from requests.hooks import default_hooks
+
+try:
+    import StringIO
+except ImportError:
+    import io as StringIO
+
+if is_py3:
+    def u(s):
+        return s
+else:
+    def u(s):
+        return s.decode('unicode-escape')
+
+
+# Requests to this URL should always fail with a connection timeout (nothing
+# listening on that port)
+TARPIT = "http://10.255.255.1"
+HTTPBIN = os.environ.get('HTTPBIN_URL', 'http://httpbin.org/')
+# Issue #1483: Make sure the URL always has a trailing slash
+HTTPBIN = HTTPBIN.rstrip('/') + '/'
+
+
+def httpbin(*suffix):
+    """Returns url for HTTPBIN resource."""
+    return urljoin(HTTPBIN, '/'.join(suffix))
+
+
+class RequestsTestCase(unittest.TestCase):
+
+    _multiprocess_can_split_ = True
+
+    def setUp(self):
+        """Create simple data set with headers."""
+        pass
+
+    def tearDown(self):
+        """Teardown."""
+        pass
+
+    def test_entry_points(self):
+
+        requests.session
+        requests.session().get
+        requests.session().head
+        requests.get
+        requests.head
+        requests.put
+        requests.patch
+        requests.post
+
+    def test_invalid_url(self):
+        with pytest.raises(MissingSchema):
+            requests.get('hiwpefhipowhefopw')
+        with pytest.raises(InvalidSchema):
+            requests.get('localhost:3128')
+        with pytest.raises(InvalidSchema):
+            requests.get('localhost.localdomain:3128/')
+        with pytest.raises(InvalidSchema):
+            requests.get('10.122.1.1:3128/')
+        with pytest.raises(InvalidURL):
+            requests.get('http://')
+
+    def test_basic_building(self):
+        req = requests.Request()
+        req.url = 'http://kennethreitz.org/'
+        req.data = {'life': '42'}
+
+        pr = req.prepare()
+        assert pr.url == req.url
+        assert pr.body == 'life=42'
+
+    def test_no_content_length(self):
+        get_req = requests.Request('GET', httpbin('get')).prepare()
+        assert 'Content-Length' not in get_req.headers
+        head_req = requests.Request('HEAD', httpbin('head')).prepare()
+        assert 'Content-Length' not in head_req.headers
+
+    def test_override_content_length(self):
+        headers = {
+            'Content-Length': 'not zero'
+        }
+        r = requests.Request('POST', httpbin('post'), headers=headers).prepare()
+        assert 'Content-Length' in r.headers
+        assert r.headers['Content-Length'] == 'not zero'
+
+    def test_path_is_not_double_encoded(self):
+        request = requests.Request('GET', "http://0.0.0.0/get/test case").prepare()
+
+        assert request.path_url == '/get/test%20case'
+
+    def test_params_are_added_before_fragment(self):
+        request = requests.Request('GET',
+            "http://example.com/path#fragment", params={"a": "b"}).prepare()
+        assert request.url == "http://example.com/path?a=b#fragment"
+        request = requests.Request('GET',
+            "http://example.com/path?key=value#fragment", params={"a": "b"}).prepare()
+        assert request.url == "http://example.com/path?key=value&a=b#fragment"
+
+    def test_mixed_case_scheme_acceptable(self):
+        s = requests.Session()
+        s.proxies = getproxies()
+        parts = urlparse(httpbin('get'))
+        schemes = ['http://', 'HTTP://', 'hTTp://', 'HttP://',
+                   'https://', 'HTTPS://', 'hTTps://', 'HttPs://']
+        for scheme in schemes:
+            url = scheme + parts.netloc + parts.path
+            r = requests.Request('GET', url)
+            r = s.send(r.prepare())
+            assert r.status_code == 200, 'failed for scheme {0}'.format(scheme)
+
+    def test_HTTP_200_OK_GET_ALTERNATIVE(self):
+        r = requests.Request('GET', httpbin('get'))
+        s = requests.Session()
+        s.proxies = getproxies()
+
+        r = s.send(r.prepare())
+
+        assert r.status_code == 200
+
+    def test_HTTP_302_ALLOW_REDIRECT_GET(self):
+        r = requests.get(httpbin('redirect', '1'))
+        assert r.status_code == 200
+        assert r.history[0].status_code == 302
+        assert r.history[0].is_redirect
+
+    # def test_HTTP_302_ALLOW_REDIRECT_POST(self):
+    #     r = requests.post(httpbin('status', '302'), data={'some': 'data'})
+    #     self.assertEqual(r.status_code, 200)
+
+    def test_HTTP_200_OK_GET_WITH_PARAMS(self):
+        heads = {'User-agent': 'Mozilla/5.0'}
+
+        r = requests.get(httpbin('user-agent'), headers=heads)
+
+        assert heads['User-agent'] in r.text
+        assert r.status_code == 200
+
+    def test_HTTP_200_OK_GET_WITH_MIXED_PARAMS(self):
+        heads = {'User-agent': 'Mozilla/5.0'}
+
+        r = requests.get(httpbin('get') + '?test=true', params={'q': 'test'}, headers=heads)
+        assert r.status_code == 200
+
+    def test_set_cookie_on_301(self):
+        s = requests.session()
+        url = httpbin('cookies/set?foo=bar')
+        s.get(url)
+        assert s.cookies['foo'] == 'bar'
+
+    def test_cookie_sent_on_redirect(self):
+        s = requests.session()
+        s.get(httpbin('cookies/set?foo=bar'))
+        r = s.get(httpbin('redirect/1'))  # redirects to httpbin('get')
+        assert 'Cookie' in r.json()['headers']
+
+    def test_cookie_removed_on_expire(self):
+        s = requests.session()
+        s.get(httpbin('cookies/set?foo=bar'))
+        assert s.cookies['foo'] == 'bar'
+        s.get(
+            httpbin('response-headers'),
+            params={
+                'Set-Cookie':
+                    'foo=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT'
+            }
+        )
+        assert 'foo' not in s.cookies
+
+    def test_cookie_quote_wrapped(self):
+        s = requests.session()
+        s.get(httpbin('cookies/set?foo="bar:baz"'))
+        assert s.cookies['foo'] == '"bar:baz"'
+
+    def test_cookie_persists_via_api(self):
+        s = requests.session()
+        r = s.get(httpbin('redirect/1'), cookies={'foo': 'bar'})
+        assert 'foo' in r.request.headers['Cookie']
+        assert 'foo' in r.history[0].request.headers['Cookie']
+
+    def test_request_cookie_overrides_session_cookie(self):
+        s = requests.session()
+        s.cookies['foo'] = 'bar'
+        r = s.get(httpbin('cookies'), cookies={'foo': 'baz'})
+        assert r.json()['cookies']['foo'] == 'baz'
+        # Session cookie should not be modified
+        assert s.cookies['foo'] == 'bar'
+
+    def test_request_cookies_not_persisted(self):
+        s = requests.session()
+        s.get(httpbin('cookies'), cookies={'foo': 'baz'})
+        # Sending a request with cookies should not add cookies to the session
+        assert not s.cookies
+
+    def test_generic_cookiejar_works(self):
+        cj = cookielib.CookieJar()
+        cookiejar_from_dict({'foo': 'bar'}, cj)
+        s = requests.session()
+        s.cookies = cj
+        r = s.get(httpbin('cookies'))
+        # Make sure the cookie was sent
+        assert r.json()['cookies']['foo'] == 'bar'
+        # Make sure the session cj is still the custom one
+        assert s.cookies is cj
+
+    def test_param_cookiejar_works(self):
+        cj = cookielib.CookieJar()
+        cookiejar_from_dict({'foo': 'bar'}, cj)
+        s = requests.session()
+        r = s.get(httpbin('cookies'), cookies=cj)
+        # Make sure the cookie was sent
+        assert r.json()['cookies']['foo'] == 'bar'
+
+    def test_requests_in_history_are_not_overridden(self):
+        resp = requests.get(httpbin('redirect/3'))
+        urls = [r.url for r in resp.history]
+        req_urls = [r.request.url for r in resp.history]
+        assert urls == req_urls
+
+    def test_history_is_always_a_list(self):
+        """
+        Show that even with redirects, Response.history is always a list.
+        """
+        resp = requests.get(httpbin('get'))
+        assert isinstance(resp.history, list)
+        resp = requests.get(httpbin('redirect/1'))
+        assert isinstance(resp.history, list)
+        assert not isinstance(resp.history, tuple)
+
+    def test_headers_on_session_with_None_are_not_sent(self):
+        """Do not send headers in Session.headers with None values."""
+        ses = requests.Session()
+        ses.headers['Accept-Encoding'] = None
+        req = requests.Request('GET', httpbin('get'))
+        prep = ses.prepare_request(req)
+        assert 'Accept-Encoding' not in prep.headers
+
+    def test_user_agent_transfers(self):
+
+        heads = {
+            'User-agent': 'Mozilla/5.0 (github.com/kennethreitz/requests)'
+        }
+
+        r = requests.get(httpbin('user-agent'), headers=heads)
+        assert heads['User-agent'] in r.text
+
+        heads = {
+            'user-agent': 'Mozilla/5.0 (github.com/kennethreitz/requests)'
+        }
+
+        r = requests.get(httpbin('user-agent'), headers=heads)
+        assert heads['user-agent'] in r.text
+
+    def test_HTTP_200_OK_HEAD(self):
+        r = requests.head(httpbin('get'))
+        assert r.status_code == 200
+
+    def test_HTTP_200_OK_PUT(self):
+        r = requests.put(httpbin('put'))
+        assert r.status_code == 200
+
+    def test_BASICAUTH_TUPLE_HTTP_200_OK_GET(self):
+        auth = ('user', 'pass')
+        url = httpbin('basic-auth', 'user', 'pass')
+
+        r = requests.get(url, auth=auth)
+        assert r.status_code == 200
+
+        r = requests.get(url)
+        assert r.status_code == 401
+
+        s = requests.session()
+        s.auth = auth
+        r = s.get(url)
+        assert r.status_code == 200
+
+    def test_connection_error(self):
+        """Connecting to an unknown domain should raise a ConnectionError"""
+        with pytest.raises(ConnectionError):
+            requests.get("http://fooobarbangbazbing.httpbin.org")
+
+        with pytest.raises(ConnectionError):
+            requests.get("http://httpbin.org:1")
+
+    def test_LocationParseError(self):
+        """Inputing a URL that cannot be parsed should raise an InvalidURL error"""
+        with pytest.raises(InvalidURL):
+            requests.get("http://fe80::5054:ff:fe5a:fc0")
+
+    def test_basicauth_with_netrc(self):
+        auth = ('user', 'pass')
+        wrong_auth = ('wronguser', 'wrongpass')
+        url = httpbin('basic-auth', 'user', 'pass')
+
+        def get_netrc_auth_mock(url):
+            return auth
+        requests.sessions.get_netrc_auth = get_netrc_auth_mock
+
+        # Should use netrc and work.
+        r = requests.get(url)
+        assert r.status_code == 200
+
+        # Given auth should override and fail.
+        r = requests.get(url, auth=wrong_auth)
+        assert r.status_code == 401
+
+        s = requests.session()
+
+        # Should use netrc and work.
+        r = s.get(url)
+        assert r.status_code == 200
+
+        # Given auth should override and fail.
+        s.auth = wrong_auth
+        r = s.get(url)
+        assert r.status_code == 401
+
+    def test_DIGEST_HTTP_200_OK_GET(self):
+
+        auth = HTTPDigestAuth('user', 'pass')
+        url = httpbin('digest-auth', 'auth', 'user', 'pass')
+
+        r = requests.get(url, auth=auth)
+        assert r.status_code == 200
+
+        r = requests.get(url)
+        assert r.status_code == 401
+
+        s = requests.session()
+        s.auth = HTTPDigestAuth('user', 'pass')
+        r = s.get(url)
+        assert r.status_code == 200
+
+    def test_DIGEST_AUTH_RETURNS_COOKIE(self):
+        url = httpbin('digest-auth', 'auth', 'user', 'pass')
+        auth = HTTPDigestAuth('user', 'pass')
+        r = requests.get(url)
+        assert r.cookies['fake'] == 'fake_value'
+
+        r = requests.get(url, auth=auth)
+        assert r.status_code == 200
+
+    def test_DIGEST_AUTH_SETS_SESSION_COOKIES(self):
+        url = httpbin('digest-auth', 'auth', 'user', 'pass')
+        auth = HTTPDigestAuth('user', 'pass')
+        s = requests.Session()
+        s.get(url, auth=auth)
+        assert s.cookies['fake'] == 'fake_value'
+
+    def test_DIGEST_STREAM(self):
+
+        auth = HTTPDigestAuth('user', 'pass')
+        url = httpbin('digest-auth', 'auth', 'user', 'pass')
+
+        r = requests.get(url, auth=auth, stream=True)
+        assert r.raw.read() != b''
+
+        r = requests.get(url, auth=auth, stream=False)
+        assert r.raw.read() == b''
+
+    def test_DIGESTAUTH_WRONG_HTTP_401_GET(self):
+
+        auth = HTTPDigestAuth('user', 'wrongpass')
+        url = httpbin('digest-auth', 'auth', 'user', 'pass')
+
+        r = requests.get(url, auth=auth)
+        assert r.status_code == 401
+
+        r = requests.get(url)
+        assert r.status_code == 401
+
+        s = requests.session()
+        s.auth = auth
+        r = s.get(url)
+        assert r.status_code == 401
+
+    def test_DIGESTAUTH_QUOTES_QOP_VALUE(self):
+
+        auth = HTTPDigestAuth('user', 'pass')
+        url = httpbin('digest-auth', 'auth', 'user', 'pass')
+
+        r = requests.get(url, auth=auth)
+        assert '"auth"' in r.request.headers['Authorization']
+
+    def test_POSTBIN_GET_POST_FILES(self):
+
+        url = httpbin('post')
+        post1 = requests.post(url).raise_for_status()
+
+        post1 = requests.post(url, data={'some': 'data'})
+        assert post1.status_code == 200
+
+        with open('requirements.txt') as f:
+            post2 = requests.post(url, files={'some': f})
+        assert post2.status_code == 200
+
+        post4 = requests.post(url, data='[{"some": "json"}]')
+        assert post4.status_code == 200
+
+        with pytest.raises(ValueError):
+            requests.post(url, files=['bad file data'])
+
+    def test_POSTBIN_GET_POST_FILES_WITH_DATA(self):
+
+        url = httpbin('post')
+        post1 = requests.post(url).raise_for_status()
+
+        post1 = requests.post(url, data={'some': 'data'})
+        assert post1.status_code == 200
+
+        with open('requirements.txt') as f:
+            post2 = requests.post(url,
+                data={'some': 'data'}, files={'some': f})
+        assert post2.status_code == 200
+
+        post4 = requests.post(url, data='[{"some": "json"}]')
+        assert post4.status_code == 200
+
+        with pytest.raises(ValueError):
+            requests.post(url, files=['bad file data'])
+
+    def test_conflicting_post_params(self):
+        url = httpbin('post')
+        with open('requirements.txt') as f:
+            pytest.raises(ValueError, "requests.post(url, data='[{\"some\": \"data\"}]', files={'some': f})")
+            pytest.raises(ValueError, "requests.post(url, data=u('[{\"some\": \"data\"}]'), files={'some': f})")
+
+    def test_request_ok_set(self):
+        r = requests.get(httpbin('status', '404'))
+        assert not r.ok
+
+    def test_status_raising(self):
+        r = requests.get(httpbin('status', '404'))
+        with pytest.raises(requests.exceptions.HTTPError):
+            r.raise_for_status()
+
+        r = requests.get(httpbin('status', '500'))
+        assert not r.ok
+
+    def test_decompress_gzip(self):
+        r = requests.get(httpbin('gzip'))
+        r.content.decode('ascii')
+
+    def test_unicode_get(self):
+        url = httpbin('/get')
+        requests.get(url, params={'foo': 'føø'})
+        requests.get(url, params={'føø': 'føø'})
+        requests.get(url, params={'føø': 'føø'})
+        requests.get(url, params={'foo': 'foo'})
+        requests.get(httpbin('ø'), params={'foo': 'foo'})
+
+    def test_unicode_header_name(self):
+        requests.put(
+            httpbin('put'),
+            headers={str('Content-Type'): 'application/octet-stream'},
+            data='\xff')  # compat.str is unicode.
+
+    def test_pyopenssl_redirect(self):
+        requests.get('https://httpbin.org/status/301')
+
+    def test_urlencoded_get_query_multivalued_param(self):
+
+        r = requests.get(httpbin('get'), params=dict(test=['foo', 'baz']))
+        assert r.status_code == 200
+        assert r.url == httpbin('get?test=foo&test=baz')
+
+    def test_different_encodings_dont_break_post(self):
+        r = requests.post(httpbin('post'),
+            data={'stuff': json.dumps({'a': 123})},
+            params={'blah': 'asdf1234'},
+            files={'file': ('test_requests.py', open(__file__, 'rb'))})
+        assert r.status_code == 200
+
+    def test_unicode_multipart_post(self):
+        r = requests.post(httpbin('post'),
+            data={'stuff': u('ëlïxr')},
+            files={'file': ('test_requests.py', open(__file__, 'rb'))})
+        assert r.status_code == 200
+
+        r = requests.post(httpbin('post'),
+            data={'stuff': u('ëlïxr').encode('utf-8')},
+            files={'file': ('test_requests.py', open(__file__, 'rb'))})
+        assert r.status_code == 200
+
+        r = requests.post(httpbin('post'),
+            data={'stuff': 'elixr'},
+            files={'file': ('test_requests.py', open(__file__, 'rb'))})
+        assert r.status_code == 200
+
+        r = requests.post(httpbin('post'),
+            data={'stuff': 'elixr'.encode('utf-8')},
+            files={'file': ('test_requests.py', open(__file__, 'rb'))})
+        assert r.status_code == 200
+
+    def test_unicode_multipart_post_fieldnames(self):
+        filename = os.path.splitext(__file__)[0] + '.py'
+        r = requests.Request(method='POST',
+                             url=httpbin('post'),
+                             data={'stuff'.encode('utf-8'): 'elixr'},
+                             files={'file': ('test_requests.py',
+                                             open(filename, 'rb'))})
+        prep = r.prepare()
+        assert b'name="stuff"' in prep.body
+        assert b'name="b\'stuff\'"' not in prep.body
+
+    def test_unicode_method_name(self):
+        files = {'file': open('test_requests.py', 'rb')}
+        r = requests.request(
+            method=u('POST'), url=httpbin('post'), files=files)
+        assert r.status_code == 200
+
+    def test_custom_content_type(self):
+        r = requests.post(
+            httpbin('post'),
+            data={'stuff': json.dumps({'a': 123})},
+            files={'file1': ('test_requests.py', open(__file__, 'rb')),
+                   'file2': ('test_requests', open(__file__, 'rb'),
+                             'text/py-content-type')})
+        assert r.status_code == 200
+        assert b"text/py-content-type" in r.request.body
+
+    def test_hook_receives_request_arguments(self):
+        def hook(resp, **kwargs):
+            assert resp is not None
+            assert kwargs != {}
+
+        requests.Request('GET', HTTPBIN, hooks={'response': hook})
+
+    def test_session_hooks_are_used_with_no_request_hooks(self):
+        hook = lambda x, *args, **kwargs: x
+        s = requests.Session()
+        s.hooks['response'].append(hook)
+        r = requests.Request('GET', HTTPBIN)
+        prep = s.prepare_request(r)
+        assert prep.hooks['response'] != []
+        assert prep.hooks['response'] == [hook]
+
+    def test_session_hooks_are_overriden_by_request_hooks(self):
+        hook1 = lambda x, *args, **kwargs: x
+        hook2 = lambda x, *args, **kwargs: x
+        assert hook1 is not hook2
+        s = requests.Session()
+        s.hooks['response'].append(hook2)
+        r = requests.Request('GET', HTTPBIN, hooks={'response': [hook1]})
+        prep = s.prepare_request(r)
+        assert prep.hooks['response'] == [hook1]
+
+    def test_prepared_request_hook(self):
+        def hook(resp, **kwargs):
+            resp.hook_working = True
+            return resp
+
+        req = requests.Request('GET', HTTPBIN, hooks={'response': hook})
+        prep = req.prepare()
+
+        s = requests.Session()
+        s.proxies = getproxies()
+        resp = s.send(prep)
+
+        assert hasattr(resp, 'hook_working')
+
+    def test_prepared_from_session(self):
+        class DummyAuth(requests.auth.AuthBase):
+            def __call__(self, r):
+                r.headers['Dummy-Auth-Test'] = 'dummy-auth-test-ok'
+                return r
+
+        req = requests.Request('GET', httpbin('headers'))
+        assert not req.auth
+
+        s = requests.Session()
+        s.auth = DummyAuth()
+
+        prep = s.prepare_request(req)
+        resp = s.send(prep)
+
+        assert resp.json()['headers'][
+            'Dummy-Auth-Test'] == 'dummy-auth-test-ok'
+
+    def test_prepare_request_with_bytestring_url(self):
+        req = requests.Request('GET', b'https://httpbin.org/')
+        s = requests.Session()
+        prep = s.prepare_request(req)
+        assert prep.url == "https://httpbin.org/"
+
+    def test_links(self):
+        r = requests.Response()
+        r.headers = {
+            'cache-control': 'public, max-age=60, s-maxage=60',
+            'connection': 'keep-alive',
+            'content-encoding': 'gzip',
+            'content-type': 'application/json; charset=utf-8',
+            'date': 'Sat, 26 Jan 2013 16:47:56 GMT',
+            'etag': '"6ff6a73c0e446c1f61614769e3ceb778"',
+            'last-modified': 'Sat, 26 Jan 2013 16:22:39 GMT',
+            'link': ('<https://api.github.com/users/kennethreitz/repos?'
+                     'page=2&per_page=10>; rel="next", <https://api.github.'
+                     'com/users/kennethreitz/repos?page=7&per_page=10>; '
+                     ' rel="last"'),
+            'server': 'GitHub.com',
+            'status': '200 OK',
+            'vary': 'Accept',
+            'x-content-type-options': 'nosniff',
+            'x-github-media-type': 'github.beta',
+            'x-ratelimit-limit': '60',
+            'x-ratelimit-remaining': '57'
+        }
+        assert r.links['next']['rel'] == 'next'
+
+    def test_cookie_parameters(self):
+        key = 'some_cookie'
+        value = 'some_value'
+        secure = True
+        domain = 'test.com'
+        rest = {'HttpOnly': True}
+
+        jar = requests.cookies.RequestsCookieJar()
+        jar.set(key, value, secure=secure, domain=domain, rest=rest)
+
+        assert len(jar) == 1
+        assert 'some_cookie' in jar
+
+        cookie = list(jar)[0]
+        assert cookie.secure == secure
+        assert cookie.domain == domain
+        assert cookie._rest['HttpOnly'] == rest['HttpOnly']
+
+    def test_cookie_as_dict_keeps_len(self):
+        key = 'some_cookie'
+        value = 'some_value'
+
+        key1 = 'some_cookie1'
+        value1 = 'some_value1'
+
+        jar = requests.cookies.RequestsCookieJar()
+        jar.set(key, value)
+        jar.set(key1, value1)
+
+        d1 = dict(jar)
+        d2 = dict(jar.iteritems())
+        d3 = dict(jar.items())
+
+        assert len(jar) == 2
+        assert len(d1) == 2
+        assert len(d2) == 2
+        assert len(d3) == 2
+
+    def test_cookie_as_dict_keeps_items(self):
+        key = 'some_cookie'
+        value = 'some_value'
+
+        key1 = 'some_cookie1'
+        value1 = 'some_value1'
+
+        jar = requests.cookies.RequestsCookieJar()
+        jar.set(key, value)
+        jar.set(key1, value1)
+
+        d1 = dict(jar)
+        d2 = dict(jar.iteritems())
+        d3 = dict(jar.items())
+
+        assert d1['some_cookie'] == 'some_value'
+        assert d2['some_cookie'] == 'some_value'
+        assert d3['some_cookie1'] == 'some_value1'
+
+    def test_cookie_as_dict_keys(self):
+        key = 'some_cookie'
+        value = 'some_value'
+
+        key1 = 'some_cookie1'
+        value1 = 'some_value1'
+
+        jar = requests.cookies.RequestsCookieJar()
+        jar.set(key, value)
+        jar.set(key1, value1)
+
+        keys = jar.keys()
+        assert keys == list(keys)
+        # make sure one can use keys multiple times
+        assert list(keys) == list(keys)
+
+    def test_cookie_as_dict_values(self):
+        key = 'some_cookie'
+        value = 'some_value'
+
+        key1 = 'some_cookie1'
+        value1 = 'some_value1'
+
+        jar = requests.cookies.RequestsCookieJar()
+        jar.set(key, value)
+        jar.set(key1, value1)
+
+        values = jar.values()
+        assert values == list(values)
+        # make sure one can use values multiple times
+        assert list(values) == list(values)
+
+    def test_cookie_as_dict_items(self):
+        key = 'some_cookie'
+        value = 'some_value'
+
+        key1 = 'some_cookie1'
+        value1 = 'some_value1'
+
+        jar = requests.cookies.RequestsCookieJar()
+        jar.set(key, value)
+        jar.set(key1, value1)
+
+        items = jar.items()
+        assert items == list(items)
+        # make sure one can use items multiple times
+        assert list(items) == list(items)
+
+    def test_time_elapsed_blank(self):
+        r = requests.get(httpbin('get'))
+        td = r.elapsed
+        total_seconds = ((td.microseconds + (td.seconds + td.days * 24 * 3600)
+                         * 10**6) / 10**6)
+        assert total_seconds > 0.0
+
+    def test_response_is_iterable(self):
+        r = requests.Response()
+        io = StringIO.StringIO('abc')
+        read_ = io.read
+
+        def read_mock(amt, decode_content=None):
+            return read_(amt)
+        setattr(io, 'read', read_mock)
+        r.raw = io
+        assert next(iter(r))
+        io.close()
+
+    def test_response_decode_unicode(self):
+        """
+        When called with decode_unicode, Response.iter_content should always
+        return unicode.
+        """
+        r = requests.Response()
+        r._content_consumed = True
+        r._content = b'the content'
+        r.encoding = 'ascii'
+
+        chunks = r.iter_content(decode_unicode=True)
+        assert all(isinstance(chunk, str) for chunk in chunks)
+
+        # also for streaming
+        r = requests.Response()
+        r.raw = io.BytesIO(b'the content')
+        r.encoding = 'ascii'
+        chunks = r.iter_content(decode_unicode=True)
+        assert all(isinstance(chunk, str) for chunk in chunks)
+
+    def test_request_and_response_are_pickleable(self):
+        r = requests.get(httpbin('get'))
+
+        # verify we can pickle the original request
+        assert pickle.loads(pickle.dumps(r.request))
+
+        # verify we can pickle the response and that we have access to
+        # the original request.
+        pr = pickle.loads(pickle.dumps(r))
+        assert r.request.url == pr.request.url
+        assert r.request.headers == pr.request.headers
+
+    def test_get_auth_from_url(self):
+        url = 'http://user:pass@complex.url.com/path?query=yes'
+        assert ('user', 'pass') == requests.utils.get_auth_from_url(url)
+
+    def test_get_auth_from_url_encoded_spaces(self):
+        url = 'http://user:pass%20pass@complex.url.com/path?query=yes'
+        assert ('user', 'pass pass') == requests.utils.get_auth_from_url(url)
+
+    def test_get_auth_from_url_not_encoded_spaces(self):
+        url = 'http://user:pass pass@complex.url.com/path?query=yes'
+        assert ('user', 'pass pass') == requests.utils.get_auth_from_url(url)
+
+    def test_get_auth_from_url_percent_chars(self):
+        url = 'http://user%25user:pass@complex.url.com/path?query=yes'
+        assert ('user%user', 'pass') == requests.utils.get_auth_from_url(url)
+
+    def test_get_auth_from_url_encoded_hashes(self):
+        url = 'http://user:pass%23pass@complex.url.com/path?query=yes'
+        assert ('user', 'pass#pass') == requests.utils.get_auth_from_url(url)
+
+    def test_cannot_send_unprepared_requests(self):
+        r = requests.Request(url=HTTPBIN)
+        with pytest.raises(ValueError):
+            requests.Session().send(r)
+
+    def test_http_error(self):
+        error = requests.exceptions.HTTPError()
+        assert not error.response
+        response = requests.Response()
+        error = requests.exceptions.HTTPError(response=response)
+        assert error.response == response
+        error = requests.exceptions.HTTPError('message', response=response)
+        assert str(error) == 'message'
+        assert error.response == response
+
+    def test_session_pickling(self):
+        r = requests.Request('GET', httpbin('get'))
+        s = requests.Session()
+
+        s = pickle.loads(pickle.dumps(s))
+        s.proxies = getproxies()
+
+        r = s.send(r.prepare())
+        assert r.status_code == 200
+
+    def test_fixes_1329(self):
+        """
+        Ensure that header updates are done case-insensitively.
+        """
+        s = requests.Session()
+        s.headers.update({'ACCEPT': 'BOGUS'})
+        s.headers.update({'accept': 'application/json'})
+        r = s.get(httpbin('get'))
+        headers = r.request.headers
+        assert headers['accept'] == 'application/json'
+        assert headers['Accept'] == 'application/json'
+        assert headers['ACCEPT'] == 'application/json'
+
+    def test_uppercase_scheme_redirect(self):
+        parts = urlparse(httpbin('html'))
+        url = "HTTP://" + parts.netloc + parts.path
+        r = requests.get(httpbin('redirect-to'), params={'url': url})
+        assert r.status_code == 200
+        assert r.url.lower() == url.lower()
+
+    def test_transport_adapter_ordering(self):
+        s = requests.Session()
+        order = ['https://', 'http://']
+        assert order == list(s.adapters)
+        s.mount('http://git', HTTPAdapter())
+        s.mount('http://github', HTTPAdapter())
+        s.mount('http://github.com', HTTPAdapter())
+        s.mount('http://github.com/about/', HTTPAdapter())
+        order = [
+            'http://github.com/about/',
+            'http://github.com',
+            'http://github',
+            'http://git',
+            'https://',
+            'http://',
+        ]
+        assert order == list(s.adapters)
+        s.mount('http://gittip', HTTPAdapter())
+        s.mount('http://gittip.com', HTTPAdapter())
+        s.mount('http://gittip.com/about/', HTTPAdapter())
+        order = [
+            'http://github.com/about/',
+            'http://gittip.com/about/',
+            'http://github.com',
+            'http://gittip.com',
+            'http://github',
+            'http://gittip',
+            'http://git',
+            'https://',
+            'http://',
+        ]
+        assert order == list(s.adapters)
+        s2 = requests.Session()
+        s2.adapters = {'http://': HTTPAdapter()}
+        s2.mount('https://', HTTPAdapter())
+        assert 'http://' in s2.adapters
+        assert 'https://' in s2.adapters
+
+    def test_header_remove_is_case_insensitive(self):
+        # From issue #1321
+        s = requests.Session()
+        s.headers['foo'] = 'bar'
+        r = s.get(httpbin('get'), headers={'FOO': None})
+        assert 'foo' not in r.request.headers
+
+    def test_params_are_merged_case_sensitive(self):
+        s = requests.Session()
+        s.params['foo'] = 'bar'
+        r = s.get(httpbin('get'), params={'FOO': 'bar'})
+        assert r.json()['args'] == {'foo': 'bar', 'FOO': 'bar'}
+
+    def test_long_authinfo_in_url(self):
+        url = 'http://{0}:{1}@{2}:9000/path?query#frag'.format(
+            'E8A3BE87-9E3F-4620-8858-95478E385B5B',
+            'EA770032-DA4D-4D84-8CE9-29C6D910BF1E',
+            'exactly-------------sixty-----------three------------characters',
+        )
+        r = requests.Request('GET', url).prepare()
+        assert r.url == url
+
+    def test_header_keys_are_native(self):
+        headers = {u('unicode'): 'blah', 'byte'.encode('ascii'): 'blah'}
+        r = requests.Request('GET', httpbin('get'), headers=headers)
+        p = r.prepare()
+
+        # This is testing that they are builtin strings. A bit weird, but there
+        # we go.
+        assert 'unicode' in p.headers.keys()
+        assert 'byte' in p.headers.keys()
+
+    def test_can_send_nonstring_objects_with_files(self):
+        data = {'a': 0.0}
+        files = {'b': 'foo'}
+        r = requests.Request('POST', httpbin('post'), data=data, files=files)
+        p = r.prepare()
+
+        assert 'multipart/form-data' in p.headers['Content-Type']
+
+    def test_can_send_file_object_with_non_string_filename(self):
+        f = io.BytesIO()
+        f.name = 2
+        r = requests.Request('POST', httpbin('post'), files={'f': f})
+        p = r.prepare()
+
+        assert 'multipart/form-data' in p.headers['Content-Type']
+
+    def test_autoset_header_values_are_native(self):
+        data = 'this is a string'
+        length = '16'
+        req = requests.Request('POST', httpbin('post'), data=data)
+        p = req.prepare()
+
+        assert p.headers['Content-Length'] == length
+
+    def test_nonhttp_schemes_dont_check_URLs(self):
+        test_urls = (
+            'data:image/gif;base64,R0lGODlhAQABAHAAACH5BAUAAAAALAAAAAABAAEAAAICRAEAOw==',
+            'file:///etc/passwd',
+            'magnet:?xt=urn:btih:be08f00302bc2d1d3cfa3af02024fa647a271431',
+        )
+        for test_url in test_urls:
+            req = requests.Request('GET', test_url)
+            preq = req.prepare()
+            assert test_url == preq.url
+
+    def test_auth_is_stripped_on_redirect_off_host(self):
+        r = requests.get(
+            httpbin('redirect-to'),
+            params={'url': 'http://www.google.co.uk'},
+            auth=('user', 'pass'),
+        )
+        assert r.history[0].request.headers['Authorization']
+        assert not r.request.headers.get('Authorization', '')
+
+    def test_auth_is_retained_for_redirect_on_host(self):
+        r = requests.get(httpbin('redirect/1'), auth=('user', 'pass'))
+        h1 = r.history[0].request.headers['Authorization']
+        h2 = r.request.headers['Authorization']
+
+        assert h1 == h2
+
+    def test_manual_redirect_with_partial_body_read(self):
+        s = requests.Session()
+        r1 = s.get(httpbin('redirect/2'), allow_redirects=False, stream=True)
+        assert r1.is_redirect
+        rg = s.resolve_redirects(r1, r1.request, stream=True)
+
+        # read only the first eight bytes of the response body,
+        # then follow the redirect
+        r1.iter_content(8)
+        r2 = next(rg)
+        assert r2.is_redirect
+
+        # read all of the response via iter_content,
+        # then follow the redirect
+        for _ in r2.iter_content():
+            pass
+        r3 = next(rg)
+        assert not r3.is_redirect
+
+    def _patch_adapter_gzipped_redirect(self, session, url):
+        adapter = session.get_adapter(url=url)
+        org_build_response = adapter.build_response
+        self._patched_response = False
+
+        def build_response(*args, **kwargs):
+            resp = org_build_response(*args, **kwargs)
+            if not self._patched_response:
+                resp.raw.headers['content-encoding'] = 'gzip'
+                self._patched_response = True
+            return resp
+
+        adapter.build_response = build_response
+
+    def test_redirect_with_wrong_gzipped_header(self):
+        s = requests.Session()
+        url = httpbin('redirect/1')
+        self._patch_adapter_gzipped_redirect(s, url)
+        s.get(url)
+
+    def test_basic_auth_str_is_always_native(self):
+        s = _basic_auth_str("test", "test")
+        assert isinstance(s, builtin_str)
+        assert s == "Basic dGVzdDp0ZXN0"
+
+    def test_requests_history_is_saved(self):
+        r = requests.get(httpbin('redirect/5'))
+        total = r.history[-1].history
+        i = 0
+        for item in r.history:
+            assert item.history == total[0:i]
+            i = i + 1
+
+    def test_json_param_post_content_type_works(self):
+        r = requests.post(
+            httpbin('post'),
+            json={'life': 42}
+        )
+        assert r.status_code == 200
+        assert 'application/json' in r.request.headers['Content-Type']
+        assert {'life': 42} == r.json()['json']
+
+
+class TestContentEncodingDetection(unittest.TestCase):
+
+    def test_none(self):
+        encodings = requests.utils.get_encodings_from_content('')
+        assert not len(encodings)
+
+    def test_html_charset(self):
+        """HTML5 meta charset attribute"""
+        content = '<meta charset="UTF-8">'
+        encodings = requests.utils.get_encodings_from_content(content)
+        assert len(encodings) == 1
+        assert encodings[0] == 'UTF-8'
+
+    def test_html4_pragma(self):
+        """HTML4 pragma directive"""
+        content = '<meta http-equiv="Content-type" content="text/html;charset=UTF-8">'
+        encodings = requests.utils.get_encodings_from_content(content)
+        assert len(encodings) == 1
+        assert encodings[0] == 'UTF-8'
+
+    def test_xhtml_pragma(self):
+        """XHTML 1.x served with text/html MIME type"""
+        content = '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />'
+        encodings = requests.utils.get_encodings_from_content(content)
+        assert len(encodings) == 1
+        assert encodings[0] == 'UTF-8'
+
+    def test_xml(self):
+        """XHTML 1.x served as XML"""
+        content = '<?xml version="1.0" encoding="UTF-8"?>'
+        encodings = requests.utils.get_encodings_from_content(content)
+        assert len(encodings) == 1
+        assert encodings[0] == 'UTF-8'
+
+    def test_precedence(self):
+        content = '''
+        <?xml version="1.0" encoding="XML"?>
+        <meta charset="HTML5">
+        <meta http-equiv="Content-type" content="text/html;charset=HTML4" />
+        '''.strip()
+        encodings = requests.utils.get_encodings_from_content(content)
+        assert encodings == ['HTML5', 'HTML4', 'XML']
+
+
+class TestCaseInsensitiveDict(unittest.TestCase):
+
+    def test_mapping_init(self):
+        cid = CaseInsensitiveDict({'Foo': 'foo', 'BAr': 'bar'})
+        assert len(cid) == 2
+        assert 'foo' in cid
+        assert 'bar' in cid
+
+    def test_iterable_init(self):
+        cid = CaseInsensitiveDict([('Foo', 'foo'), ('BAr', 'bar')])
+        assert len(cid) == 2
+        assert 'foo' in cid
+        assert 'bar' in cid
+
+    def test_kwargs_init(self):
+        cid = CaseInsensitiveDict(FOO='foo', BAr='bar')
+        assert len(cid) == 2
+        assert 'foo' in cid
+        assert 'bar' in cid
+
+    def test_docstring_example(self):
+        cid = CaseInsensitiveDict()
+        cid['Accept'] = 'application/json'
+        assert cid['aCCEPT'] == 'application/json'
+        assert list(cid) == ['Accept']
+
+    def test_len(self):
+        cid = CaseInsensitiveDict({'a': 'a', 'b': 'b'})
+        cid['A'] = 'a'
+        assert len(cid) == 2
+
+    def test_getitem(self):
+        cid = CaseInsensitiveDict({'Spam': 'blueval'})
+        assert cid['spam'] == 'blueval'
+        assert cid['SPAM'] == 'blueval'
+
+    def test_fixes_649(self):
+        """__setitem__ should behave case-insensitively."""
+        cid = CaseInsensitiveDict()
+        cid['spam'] = 'oneval'
+        cid['Spam'] = 'twoval'
+        cid['sPAM'] = 'redval'
+        cid['SPAM'] = 'blueval'
+        assert cid['spam'] == 'blueval'
+        assert cid['SPAM'] == 'blueval'
+        assert list(cid.keys()) == ['SPAM']
+
+    def test_delitem(self):
+        cid = CaseInsensitiveDict()
+        cid['Spam'] = 'someval'
+        del cid['sPam']
+        assert 'spam' not in cid
+        assert len(cid) == 0
+
+    def test_contains(self):
+        cid = CaseInsensitiveDict()
+        cid['Spam'] = 'someval'
+        assert 'Spam' in cid
+        assert 'spam' in cid
+        assert 'SPAM' in cid
+        assert 'sPam' in cid
+        assert 'notspam' not in cid
+
+    def test_get(self):
+        cid = CaseInsensitiveDict()
+        cid['spam'] = 'oneval'
+        cid['SPAM'] = 'blueval'
+        assert cid.get('spam') == 'blueval'
+        assert cid.get('SPAM') == 'blueval'
+        assert cid.get('sPam') == 'blueval'
+        assert cid.get('notspam', 'default') == 'default'
+
+    def test_update(self):
+        cid = CaseInsensitiveDict()
+        cid['spam'] = 'blueval'
+        cid.update({'sPam': 'notblueval'})
+        assert cid['spam'] == 'notblueval'
+        cid = CaseInsensitiveDict({'Foo': 'foo', 'BAr': 'bar'})
+        cid.update({'fOO': 'anotherfoo', 'bAR': 'anotherbar'})
+        assert len(cid) == 2
+        assert cid['foo'] == 'anotherfoo'
+        assert cid['bar'] == 'anotherbar'
+
+    def test_update_retains_unchanged(self):
+        cid = CaseInsensitiveDict({'foo': 'foo', 'bar': 'bar'})
+        cid.update({'foo': 'newfoo'})
+        assert cid['bar'] == 'bar'
+
+    def test_iter(self):
+        cid = CaseInsensitiveDict({'Spam': 'spam', 'Eggs': 'eggs'})
+        keys = frozenset(['Spam', 'Eggs'])
+        assert frozenset(iter(cid)) == keys
+
+    def test_equality(self):
+        cid = CaseInsensitiveDict({'SPAM': 'blueval', 'Eggs': 'redval'})
+        othercid = CaseInsensitiveDict({'spam': 'blueval', 'eggs': 'redval'})
+        assert cid == othercid
+        del othercid['spam']
+        assert cid != othercid
+        assert cid == {'spam': 'blueval', 'eggs': 'redval'}
+
+    def test_setdefault(self):
+        cid = CaseInsensitiveDict({'Spam': 'blueval'})
+        assert cid.setdefault('spam', 'notblueval') == 'blueval'
+        assert cid.setdefault('notspam', 'notblueval') == 'notblueval'
+
+    def test_lower_items(self):
+        cid = CaseInsensitiveDict({
+            'Accept': 'application/json',
+            'user-Agent': 'requests',
+        })
+        keyset = frozenset(lowerkey for lowerkey, v in cid.lower_items())
+        lowerkeyset = frozenset(['accept', 'user-agent'])
+        assert keyset == lowerkeyset
+
+    def test_preserve_key_case(self):
+        cid = CaseInsensitiveDict({
+            'Accept': 'application/json',
+            'user-Agent': 'requests',
+        })
+        keyset = frozenset(['Accept', 'user-Agent'])
+        assert frozenset(i[0] for i in cid.items()) == keyset
+        assert frozenset(cid.keys()) == keyset
+        assert frozenset(cid) == keyset
+
+    def test_preserve_last_key_case(self):
+        cid = CaseInsensitiveDict({
+            'Accept': 'application/json',
+            'user-Agent': 'requests',
+        })
+        cid.update({'ACCEPT': 'application/json'})
+        cid['USER-AGENT'] = 'requests'
+        keyset = frozenset(['ACCEPT', 'USER-AGENT'])
+        assert frozenset(i[0] for i in cid.items()) == keyset
+        assert frozenset(cid.keys()) == keyset
+        assert frozenset(cid) == keyset
+
+
+class UtilsTestCase(unittest.TestCase):
+
+    def test_super_len_io_streams(self):
+        """ Ensures that we properly deal with different kinds of IO streams. """
+        # uses StringIO or io.StringIO (see import above)
+        from io import BytesIO
+        from requests.utils import super_len
+
+        assert super_len(StringIO.StringIO()) == 0
+        assert super_len(
+            StringIO.StringIO('with so much drama in the LBC')) == 29
+
+        assert super_len(BytesIO()) == 0
+        assert super_len(
+            BytesIO(b"it's kinda hard bein' snoop d-o-double-g")) == 40
+
+        try:
+            import cStringIO
+        except ImportError:
+            pass
+        else:
+            assert super_len(
+                cStringIO.StringIO('but some how, some way...')) == 25
+
+    def test_get_environ_proxies_ip_ranges(self):
+        """Ensures that IP addresses are correctly matches with ranges
+        in no_proxy variable."""
+        from requests.utils import get_environ_proxies
+        os.environ['no_proxy'] = "192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1"
+        assert get_environ_proxies('http://192.168.0.1:5000/') == {}
+        assert get_environ_proxies('http://192.168.0.1/') == {}
+        assert get_environ_proxies('http://172.16.1.1/') == {}
+        assert get_environ_proxies('http://172.16.1.1:5000/') == {}
+        assert get_environ_proxies('http://192.168.1.1:5000/') != {}
+        assert get_environ_proxies('http://192.168.1.1/') != {}
+
+    def test_get_environ_proxies(self):
+        """Ensures that IP addresses are correctly matches with ranges
+        in no_proxy variable."""
+        from requests.utils import get_environ_proxies
+        os.environ['no_proxy'] = "127.0.0.1,localhost.localdomain,192.168.0.0/24,172.16.1.1"
+        assert get_environ_proxies(
+            'http://localhost.localdomain:5000/v1.0/') == {}
+        assert get_environ_proxies('http://www.requests.com/') != {}
+
+    def test_is_ipv4_address(self):
+        from requests.utils import is_ipv4_address
+        assert is_ipv4_address('8.8.8.8')
+        assert not is_ipv4_address('8.8.8.8.8')
+        assert not is_ipv4_address('localhost.localdomain')
+
+    def test_is_valid_cidr(self):
+        from requests.utils import is_valid_cidr
+        assert not is_valid_cidr('8.8.8.8')
+        assert is_valid_cidr('192.168.1.0/24')
+
+    def test_dotted_netmask(self):
+        from requests.utils import dotted_netmask
+        assert dotted_netmask(8) == '255.0.0.0'
+        assert dotted_netmask(24) == '255.255.255.0'
+        assert dotted_netmask(25) == '255.255.255.128'
+
+    def test_address_in_network(self):
+        from requests.utils import address_in_network
+        assert address_in_network('192.168.1.1', '192.168.1.0/24')
+        assert not address_in_network('172.16.0.1', '192.168.1.0/24')
+
+    def test_get_auth_from_url(self):
+        """Ensures that username and password in well-encoded URI as per
+        RFC 3986 are correclty extracted."""
+        from requests.utils import get_auth_from_url
+        from requests.compat import quote
+        percent_encoding_test_chars = "%!*'();:@&=+$,/?#[] "
+        url_address = "request.com/url.html#test"
+        url = "http://" + quote(
+            percent_encoding_test_chars, '') + ':' + quote(
+            percent_encoding_test_chars, '') + '@' + url_address
+        (username, password) = get_auth_from_url(url)
+        assert username == percent_encoding_test_chars
+        assert password == percent_encoding_test_chars
+
+
+class TestMorselToCookieExpires(unittest.TestCase):
+
+    """Tests for morsel_to_cookie when morsel contains expires."""
+
+    def test_expires_valid_str(self):
+        """Test case where we convert expires from string time."""
+
+        morsel = Morsel()
+        morsel['expires'] = 'Thu, 01-Jan-1970 00:00:01 GMT'
+        cookie = morsel_to_cookie(morsel)
+        assert cookie.expires == 1
+
+    def test_expires_invalid_int(self):
+        """Test case where an invalid type is passed for expires."""
+
+        morsel = Morsel()
+        morsel['expires'] = 100
+        with pytest.raises(TypeError):
+            morsel_to_cookie(morsel)
+
+    def test_expires_invalid_str(self):
+        """Test case where an invalid string is input."""
+
+        morsel = Morsel()
+        morsel['expires'] = 'woops'
+        with pytest.raises(ValueError):
+            morsel_to_cookie(morsel)
+
+    def test_expires_none(self):
+        """Test case where expires is None."""
+
+        morsel = Morsel()
+        morsel['expires'] = None
+        cookie = morsel_to_cookie(morsel)
+        assert cookie.expires is None
+
+
+class TestMorselToCookieMaxAge(unittest.TestCase):
+
+    """Tests for morsel_to_cookie when morsel contains max-age."""
+
+    def test_max_age_valid_int(self):
+        """Test case where a valid max age in seconds is passed."""
+
+        morsel = Morsel()
+        morsel['max-age'] = 60
+        cookie = morsel_to_cookie(morsel)
+        assert isinstance(cookie.expires, int)
+
+    def test_max_age_invalid_str(self):
+        """Test case where a invalid max age is passed."""
+
+        morsel = Morsel()
+        morsel['max-age'] = 'woops'
+        with pytest.raises(TypeError):
+            morsel_to_cookie(morsel)
+
+
+class TestTimeout:
+    def test_stream_timeout(self):
+        try:
+            requests.get(httpbin('delay/10'), timeout=2.0)
+        except requests.exceptions.Timeout as e:
+            assert 'Read timed out' in e.args[0].args[0]
+
+    def test_invalid_timeout(self):
+        with pytest.raises(ValueError) as e:
+            requests.get(httpbin('get'), timeout=(3, 4, 5))
+        assert '(connect, read)' in str(e)
+
+        with pytest.raises(ValueError) as e:
+            requests.get(httpbin('get'), timeout="foo")
+        assert 'must be an int or float' in str(e)
+
+    def test_none_timeout(self):
+        """ Check that you can set None as a valid timeout value.
+
+        To actually test this behavior, we'd want to check that setting the
+        timeout to None actually lets the request block past the system default
+        timeout. However, this would make the test suite unbearably slow.
+        Instead we verify that setting the timeout to None does not prevent the
+        request from succeeding.
+        """
+        r = requests.get(httpbin('get'), timeout=None)
+        assert r.status_code == 200
+
+    def test_read_timeout(self):
+        try:
+            requests.get(httpbin('delay/10'), timeout=(None, 0.1))
+            assert False, "The recv() request should time out."
+        except ReadTimeout:
+            pass
+
+    def test_connect_timeout(self):
+        try:
+            requests.get(TARPIT, timeout=(0.1, None))
+            assert False, "The connect() request should time out."
+        except ConnectTimeout as e:
+            assert isinstance(e, ConnectionError)
+            assert isinstance(e, Timeout)
+
+    def test_total_timeout_connect(self):
+        try:
+            requests.get(TARPIT, timeout=(0.1, 0.1))
+            assert False, "The connect() request should time out."
+        except ConnectTimeout:
+            pass
+
+    def test_encoded_methods(self):
+        """See: https://github.com/kennethreitz/requests/issues/2316"""
+        r = requests.request(b'GET', httpbin('get'))
+        assert r.ok
+
+
+SendCall = collections.namedtuple('SendCall', ('args', 'kwargs'))
+
+
+class RedirectSession(SessionRedirectMixin):
+    def __init__(self, order_of_redirects):
+        self.redirects = order_of_redirects
+        self.calls = []
+        self.max_redirects = 30
+        self.cookies = {}
+        self.trust_env = False
+
+    def send(self, *args, **kwargs):
+        self.calls.append(SendCall(args, kwargs))
+        return self.build_response()
+
+    def build_response(self):
+        request = self.calls[-1].args[0]
+        r = requests.Response()
+
+        try:
+            r.status_code = int(self.redirects.pop(0))
+        except IndexError:
+            r.status_code = 200
+
+        r.headers = CaseInsensitiveDict({'Location': '/'})
+        r.raw = self._build_raw()
+        r.request = request
+        return r
+
+    def _build_raw(self):
+        string = StringIO.StringIO('')
+        setattr(string, 'release_conn', lambda *args: args)
+        return string
+
+
+class TestRedirects:
+    default_keyword_args = {
+        'stream': False,
+        'verify': True,
+        'cert': None,
+        'timeout': None,
+        'allow_redirects': False,
+        'proxies': {},
+    }
+
+    def test_requests_are_updated_each_time(self):
+        session = RedirectSession([303, 307])
+        prep = requests.Request('POST', httpbin('post')).prepare()
+        r0 = session.send(prep)
+        assert r0.request.method == 'POST'
+        assert session.calls[-1] == SendCall((r0.request,), {})
+        redirect_generator = session.resolve_redirects(r0, prep)
+        for response in redirect_generator:
+            assert response.request.method == 'GET'
+            send_call = SendCall((response.request,),
+                                 TestRedirects.default_keyword_args)
+            assert session.calls[-1] == send_call
+
+
+
+@pytest.fixture
+def list_of_tuples():
+    return [
+        (('a', 'b'), ('c', 'd')),
+        (('c', 'd'), ('a', 'b')),
+        (('a', 'b'), ('c', 'd'), ('e', 'f')),
+        ]
+
+
+def test_data_argument_accepts_tuples(list_of_tuples):
+    """
+    Ensure that the data argument will accept tuples of strings
+    and properly encode them.
+    """
+    for data in list_of_tuples:
+        p = PreparedRequest()
+        p.prepare(
+            method='GET',
+            url='http://www.example.com',
+            data=data,
+            hooks=default_hooks()
+        )
+        assert p.body == urlencode(data)
+
+
+def assert_copy(p, p_copy):
+    for attr in ('method', 'url', 'headers', '_cookies', 'body', 'hooks'):
+        assert getattr(p, attr) == getattr(p_copy, attr)
+
+
+def test_prepared_request_empty_copy():
+    p = PreparedRequest()
+    assert_copy(p, p.copy())
+
+
+def test_prepared_request_no_cookies_copy():
+    p = PreparedRequest()
+    p.prepare(
+        method='GET',
+        url='http://www.example.com',
+        data='foo=bar',
+        hooks=default_hooks()
+    )
+    assert_copy(p, p.copy())
+
+
+def test_prepared_request_complete_copy():
+    p = PreparedRequest()
+    p.prepare(
+        method='GET',
+        url='http://www.example.com',
+        data='foo=bar',
+        hooks=default_hooks(),
+        cookies={'foo': 'bar'}
+    )
+    assert_copy(p, p.copy())
+
+
+def test_prepare_unicode_url():
+    p = PreparedRequest()
+    p.prepare(
+        method='GET',
+        url=u('http://www.example.com/üniçø∂é'),
+        hooks=[]
+    )
+    assert_copy(p, p.copy())
+
+
+def test_urllib3_retries():
+    from requests.packages.urllib3.util import Retry
+    s = requests.Session()
+    s.mount('http://', HTTPAdapter(max_retries=Retry(
+        total=2, status_forcelist=[500]
+    )))
+
+    with pytest.raises(RetryError):
+        s.get(httpbin('status/500'))
+
+if __name__ == '__main__':
+    unittest.main()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/apps/AppTrustDomain.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/apps/AppTrustDomain.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/apps/AppTrustDomain.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/apps/AppTrustDomain.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -244,6 +244,13 @@
 }
 
 Result
+AppTrustDomain::CheckSignatureDigestAlgorithm(DigestAlgorithm)
+{
+  // TODO: We should restrict signatures to SHA-256 or better.
+  return Success;
+}
+
+Result
 AppTrustDomain::CheckRSAPublicKeyModulusSizeInBits(
   EndEntityOrCA /*endEntityOrCA*/, unsigned int modulusSizeInBits)
 {
@@ -257,6 +264,7 @@
 AppTrustDomain::VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
                                            Input subjectPublicKeyInfo)
 {
+  // TODO: We should restrict signatures to SHA-256 or better.
   return VerifyRSAPKCS1SignedDigestNSS(signedDigest, subjectPublicKeyInfo,
                                        mPinArg);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/apps/AppTrustDomain.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/apps/AppTrustDomain.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/apps/AppTrustDomain.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/apps/AppTrustDomain.h	2015-02-28 15:03:11.000000000 +0000
@@ -38,6 +38,8 @@
                     /*optional*/ const mozilla::pkix::Input* aiaExtension) MOZ_OVERRIDE;
   virtual Result IsChainValid(const mozilla::pkix::DERArray& certChain,
                               mozilla::pkix::Time time) MOZ_OVERRIDE;
+  virtual Result CheckSignatureDigestAlgorithm(
+                   mozilla::pkix::DigestAlgorithm digestAlg) MOZ_OVERRIDE;
   virtual Result CheckRSAPublicKeyModulusSizeInBits(
                    mozilla::pkix::EndEntityOrCA endEntityOrCA,
                    unsigned int modulusSizeInBits) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/CertVerifier.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/CertVerifier.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/CertVerifier.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/CertVerifier.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -156,6 +156,9 @@
   return rv;
 }
 
+static const unsigned int MINIMUM_NON_ECC_BITS = 2048;
+static const unsigned int MINIMUM_NON_ECC_BITS_WEAK = 1024;
+
 SECStatus
 CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage,
                          Time time, void* pinArg, const char* hostname,
@@ -163,12 +166,14 @@
             /*optional*/ const SECItem* stapledOCSPResponseSECItem,
         /*optional out*/ ScopedCERTCertList* builtChain,
         /*optional out*/ SECOidTag* evOidPolicy,
-        /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus)
+        /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus,
+        /*optional out*/ KeySizeStatus* keySizeStatus)
 {
   PR_LOG(gCertVerifierLog, PR_LOG_DEBUG, ("Top of VerifyCert\n"));
 
   PR_ASSERT(cert);
   PR_ASSERT(usage == certificateUsageSSLServer || !(flags & FLAG_MUST_BE_EV));
+  PR_ASSERT(usage == certificateUsageSSLServer || !keySizeStatus);
 
   if (builtChain) {
     *builtChain = nullptr;
@@ -184,6 +189,14 @@
     *ocspStaplingStatus = OCSP_STAPLING_NEVER_CHECKED;
   }
 
+  if (keySizeStatus) {
+    if (usage != certificateUsageSSLServer) {
+      PR_SetError(SEC_ERROR_INVALID_ARGS, 0);
+      return SECFailure;
+    }
+    *keySizeStatus = KeySizeStatus::NeverChecked;
+  }
+
   if (!cert ||
       (usage != certificateUsageSSLServer && (flags & FLAG_MUST_BE_EV))) {
     PR_SetError(SEC_ERROR_INVALID_ARGS, 0);
@@ -227,7 +240,8 @@
       // just use trustEmail as it is the closest alternative.
       NSSCertDBTrustDomain trustDomain(trustEmail, ocspFetching, mOCSPCache,
                                        pinArg, ocspGETConfig, pinningDisabled,
-                                       false, nullptr, builtChain);
+                                       MINIMUM_NON_ECC_BITS_WEAK, nullptr,
+                                       builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
                           KeyUsage::digitalSignature,
@@ -252,8 +266,8 @@
                       ocspFetching == NSSCertDBTrustDomain::NeverFetchOCSP
                         ? NSSCertDBTrustDomain::LocalOnlyOCSPForEV
                         : NSSCertDBTrustDomain::FetchOCSPForEV,
-                      mOCSPCache, pinArg, ocspGETConfig, mPinningMode, true,
-                      hostname, builtChain);
+                      mOCSPCache, pinArg, ocspGETConfig, mPinningMode,
+                      MINIMUM_NON_ECC_BITS, hostname, builtChain);
         rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time,
                                           KeyUsage::digitalSignature,// (EC)DHE
                                           KeyUsage::keyEncipherment, // RSA
@@ -278,7 +292,8 @@
       // Now try non-EV.
       NSSCertDBTrustDomain trustDomain(trustSSL, ocspFetching, mOCSPCache,
                                        pinArg, ocspGETConfig, mPinningMode,
-                                       false, hostname, builtChain);
+                                       MINIMUM_NON_ECC_BITS, hostname,
+                                       builtChain);
       rv = BuildCertChainForOneKeyUsage(trustDomain, certDER, time,
                                         KeyUsage::digitalSignature, // (EC)DHE
                                         KeyUsage::keyEncipherment, // RSA
@@ -287,13 +302,42 @@
                                         CertPolicyId::anyPolicy,
                                         stapledOCSPResponse,
                                         ocspStaplingStatus);
+      if (rv == Success) {
+        if (keySizeStatus) {
+          *keySizeStatus = KeySizeStatus::LargeMinimumSucceeded;
+        }
+        break;
+      }
+
+      // If that failed, try again with a smaller minimum key size.
+      NSSCertDBTrustDomain trustDomainWeak(trustSSL, ocspFetching, mOCSPCache,
+                                           pinArg, ocspGETConfig, mPinningMode,
+                                           MINIMUM_NON_ECC_BITS_WEAK, hostname,
+                                           builtChain);
+      rv = BuildCertChainForOneKeyUsage(trustDomainWeak, certDER, time,
+                                        KeyUsage::digitalSignature, // (EC)DHE
+                                        KeyUsage::keyEncipherment, // RSA
+                                        KeyUsage::keyAgreement, // (EC)DH
+                                        KeyPurposeId::id_kp_serverAuth,
+                                        CertPolicyId::anyPolicy,
+                                        stapledOCSPResponse,
+                                        ocspStaplingStatus);
+      if (keySizeStatus) {
+        if (rv == Success) {
+          *keySizeStatus = KeySizeStatus::CompatibilityRisk;
+        } else {
+          *keySizeStatus = KeySizeStatus::AlreadyBad;
+        }
+      }
+
       break;
     }
 
     case certificateUsageSSLCA: {
       NSSCertDBTrustDomain trustDomain(trustSSL, ocspFetching, mOCSPCache,
                                        pinArg, ocspGETConfig, pinningDisabled,
-                                       false, nullptr, builtChain);
+                                       MINIMUM_NON_ECC_BITS_WEAK, nullptr,
+                                       builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeCA, KeyUsage::keyCertSign,
                           KeyPurposeId::id_kp_serverAuth,
@@ -304,7 +348,8 @@
     case certificateUsageEmailSigner: {
       NSSCertDBTrustDomain trustDomain(trustEmail, ocspFetching, mOCSPCache,
                                        pinArg, ocspGETConfig, pinningDisabled,
-                                       false, nullptr, builtChain);
+                                       MINIMUM_NON_ECC_BITS_WEAK, nullptr,
+                                       builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
                           KeyUsage::digitalSignature,
@@ -326,7 +371,8 @@
       // based on the result of the verification(s).
       NSSCertDBTrustDomain trustDomain(trustEmail, ocspFetching, mOCSPCache,
                                        pinArg, ocspGETConfig, pinningDisabled,
-                                       false, nullptr, builtChain);
+                                       MINIMUM_NON_ECC_BITS_WEAK, nullptr,
+                                       builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
                           KeyUsage::keyEncipherment, // RSA
@@ -345,7 +391,8 @@
     case certificateUsageObjectSigner: {
       NSSCertDBTrustDomain trustDomain(trustObjectSigning, ocspFetching,
                                        mOCSPCache, pinArg, ocspGETConfig,
-                                       pinningDisabled, false, nullptr,
+                                       pinningDisabled,
+                                       MINIMUM_NON_ECC_BITS_WEAK, nullptr,
                                        builtChain);
       rv = BuildCertChain(trustDomain, certDER, time,
                           EndEntityOrCA::MustBeEndEntity,
@@ -374,15 +421,17 @@
       }
 
       NSSCertDBTrustDomain sslTrust(trustSSL, ocspFetching, mOCSPCache, pinArg,
-                                    ocspGETConfig, pinningDisabled, false,
-                                    nullptr, builtChain);
+                                    ocspGETConfig, pinningDisabled,
+                                    MINIMUM_NON_ECC_BITS_WEAK, nullptr,
+                                    builtChain);
       rv = BuildCertChain(sslTrust, certDER, time, endEntityOrCA,
                           keyUsage, eku, CertPolicyId::anyPolicy,
                           stapledOCSPResponse);
       if (rv == Result::ERROR_UNKNOWN_ISSUER) {
         NSSCertDBTrustDomain emailTrust(trustEmail, ocspFetching, mOCSPCache,
                                         pinArg, ocspGETConfig, pinningDisabled,
-                                        false, nullptr, builtChain);
+                                        MINIMUM_NON_ECC_BITS_WEAK, nullptr,
+                                        builtChain);
         rv = BuildCertChain(emailTrust, certDER, time, endEntityOrCA,
                             keyUsage, eku, CertPolicyId::anyPolicy,
                             stapledOCSPResponse);
@@ -390,7 +439,8 @@
           NSSCertDBTrustDomain objectSigningTrust(trustObjectSigning,
                                                   ocspFetching, mOCSPCache,
                                                   pinArg, ocspGETConfig,
-                                                  pinningDisabled, false,
+                                                  pinningDisabled,
+                                                  MINIMUM_NON_ECC_BITS_WEAK,
                                                   nullptr, builtChain);
           rv = BuildCertChain(objectSigningTrust, certDER, time,
                               endEntityOrCA, keyUsage, eku,
@@ -444,7 +494,8 @@
                                   Flags flags,
                  /*optional out*/ ScopedCERTCertList* builtChain,
                  /*optional out*/ SECOidTag* evOidPolicy,
-                 /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus)
+                 /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus,
+                 /*optional out*/ KeySizeStatus* keySizeStatus)
 {
   PR_ASSERT(peerCert);
   // XXX: PR_ASSERT(pinarg)
@@ -468,7 +519,8 @@
   // if VerifyCert succeeded.
   SECStatus rv = VerifyCert(peerCert, certificateUsageSSLServer, time, pinarg,
                             hostname, flags, stapledOCSPResponse,
-                            &builtChainTemp, evOidPolicy, ocspStaplingStatus);
+                            &builtChainTemp, evOidPolicy, ocspStaplingStatus,
+                            keySizeStatus);
   if (rv != SECSuccess) {
     return rv;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/CertVerifier.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/CertVerifier.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/CertVerifier.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/CertVerifier.h	2015-02-28 15:03:11.000000000 +0000
@@ -15,6 +15,14 @@
 
 struct ChainValidationCallbackState;
 
+// These values correspond to the CERT_CHAIN_KEY_SIZE_STATUS telemetry.
+enum class KeySizeStatus {
+  NeverChecked = 0,
+  LargeMinimumSucceeded = 1,
+  CompatibilityRisk = 2,
+  AlreadyBad = 3,
+};
+
 class CertVerifier
 {
 public:
@@ -44,7 +52,8 @@
        /*optional in*/ const SECItem* stapledOCSPResponse = nullptr,
       /*optional out*/ ScopedCERTCertList* builtChain = nullptr,
       /*optional out*/ SECOidTag* evOidPolicy = nullptr,
-      /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus = nullptr);
+      /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus = nullptr,
+      /*optional out*/ KeySizeStatus* keySizeStatus = nullptr);
 
   SECStatus VerifySSLServerCert(
                     CERTCertificate* peerCert,
@@ -56,7 +65,8 @@
                     Flags flags = 0,
    /*optional out*/ ScopedCERTCertList* builtChain = nullptr,
    /*optional out*/ SECOidTag* evOidPolicy = nullptr,
-   /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus = nullptr);
+   /*optional out*/ OCSPStaplingStatus* ocspStaplingStatus = nullptr,
+   /*optional out*/ KeySizeStatus* keySizeStatus = nullptr);
 
   enum PinningMode {
     pinningDisabled = 0,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/NSSCertDBTrustDomain.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -35,9 +35,6 @@
 
 static const uint64_t ServerFailureDelaySeconds = 5 * 60;
 
-static const unsigned int MINIMUM_NON_ECC_BITS_DV = 1024;
-static const unsigned int MINIMUM_NON_ECC_BITS_EV = 2048;
-
 namespace mozilla { namespace psm {
 
 const char BUILTIN_ROOTS_MODULE_DEFAULT_NAME[] = "Builtin Roots Module";
@@ -56,7 +53,7 @@
              /*optional but shouldn't be*/ void* pinArg,
                                            CertVerifier::OcspGetConfig ocspGETConfig,
                                            CertVerifier::PinningMode pinningMode,
-                                           bool forEV,
+                                           unsigned int minimumNonECCKeyBits,
                               /*optional*/ const char* hostname,
                               /*optional*/ ScopedCERTCertList* builtChain)
   : mCertDBTrustType(certDBTrustType)
@@ -65,7 +62,7 @@
   , mPinArg(pinArg)
   , mOCSPGetConfig(ocspGETConfig)
   , mPinningMode(pinningMode)
-  , mMinimumNonECCBits(forEV ? MINIMUM_NON_ECC_BITS_EV : MINIMUM_NON_ECC_BITS_DV)
+  , mMinimumNonECCBits(minimumNonECCKeyBits)
   , mHostname(hostname)
   , mBuiltChain(builtChain)
   , mCertBlocklist(do_GetService(NS_CERTBLOCKLIST_CONTRACTID))
@@ -712,6 +709,12 @@
   return Success;
 }
 
+Result
+NSSCertDBTrustDomain::CheckSignatureDigestAlgorithm(DigestAlgorithm)
+{
+  return Success;
+}
+
 Result
 NSSCertDBTrustDomain::CheckRSAPublicKeyModulusSizeInBits(
   EndEntityOrCA /*endEntityOrCA*/, unsigned int modulusSizeInBits)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/NSSCertDBTrustDomain.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/NSSCertDBTrustDomain.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/certverifier/NSSCertDBTrustDomain.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/certverifier/NSSCertDBTrustDomain.h	2015-02-28 15:03:11.000000000 +0000
@@ -56,7 +56,7 @@
                        OCSPCache& ocspCache, void* pinArg,
                        CertVerifier::OcspGetConfig ocspGETConfig,
                        CertVerifier::PinningMode pinningMode,
-                       bool forEV,
+                       unsigned int minimumNonECCKeyBits,
           /*optional*/ const char* hostname = nullptr,
       /*optional out*/ ScopedCERTCertList* builtChain = nullptr);
 
@@ -70,6 +70,9 @@
                               /*out*/ mozilla::pkix::TrustLevel& trustLevel)
                               MOZ_OVERRIDE;
 
+  virtual Result CheckSignatureDigestAlgorithm(
+                   mozilla::pkix::DigestAlgorithm digestAlg) MOZ_OVERRIDE;
+
   virtual Result CheckRSAPublicKeyModulusSizeInBits(
                    mozilla::pkix::EndEntityOrCA endEntityOrCA,
                    unsigned int modulusSizeInBits) MOZ_OVERRIDE;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/boot/src/nsSTSPreloadList.errors thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/boot/src/nsSTSPreloadList.errors
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/boot/src/nsSTSPreloadList.errors	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/boot/src/nsSTSPreloadList.errors	2015-02-28 15:03:11.000000000 +0000
@@ -1,9 +1,10 @@
+9point6.com: could not connect to host
 admin.google.com: did not receive HSTS header (error ignored - included regardless)
 adsfund.org: could not connect to host
-afp548.com: did not receive HSTS header
 airbnb.com: did not receive HSTS header
 aiticon.de: did not receive HSTS header
-amigogeek.net: did not receive HSTS header
+altmv.com: max-age too low: 7776000
+amigogeek.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 api.mega.co.nz: could not connect to host
 api.recurly.com: did not receive HSTS header
 apis.google.com: did not receive HSTS header (error ignored - included regardless)
@@ -14,17 +15,16 @@
 atavio.at: could not connect to host
 atavio.ch: could not connect to host
 au.search.yahoo.com: did not receive HSTS header
+auth.mail.ru: did not receive HSTS header
 az.search.yahoo.com: did not receive HSTS header
 azprep.us: could not connect to host
-baer.im: did not receive HSTS header
 barcodeberlin.com: did not receive HSTS header
 bccx.com: could not connect to host
+bcm.com.au: max-age too low: 0
 be.search.yahoo.com: did not receive HSTS header
-bedeta.de: could not connect to host
 betnet.fr: could not connect to host
 bi.search.yahoo.com: did not receive HSTS header
 bigshinylock.minazo.net: could not connect to host
-bitfactory.ws: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 bitfarm-archiv.com: did not receive HSTS header
 bitfarm-archiv.de: did not receive HSTS header
 bitgo.com: did not receive HSTS header
@@ -36,9 +36,10 @@
 braintreepayments.com: did not receive HSTS header
 brainvation.de: did not receive HSTS header
 browserid.org: did not receive HSTS header
-business.medbank.com.mt: did not receive HSTS header
+business.medbank.com.mt: could not connect to host
 ca.search.yahoo.com: did not receive HSTS header
 calibreapp.com: did not receive HSTS header
+calomel.org: did not receive HSTS header
 calyxinstitute.org: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 carlolly.co.uk: could not connect to host
 cd.search.yahoo.com: did not receive HSTS header
@@ -66,7 +67,7 @@
 crbug.com: did not receive HSTS header
 crowdcurity.com: did not receive HSTS header
 crowdjuris.com: could not connect to host
-crypto.is: did not receive HSTS header
+crypto.is: max-age too low: 7776000
 csawctf.poly.edu: could not connect to host
 ct.search.yahoo.com: did not receive HSTS header
 cujanovic.com: did not receive HSTS header
@@ -87,12 +88,12 @@
 download.jitsi.org: did not receive HSTS header
 drive.google.com: did not receive HSTS header (error ignored - included regardless)
 dropcam.com: did not receive HSTS header
-dynaloop.net: did not receive HSTS header
 dzlibs.io: could not connect to host
 e-aut.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 ed.gs: did not receive HSTS header
 edmodo.com: did not receive HSTS header
 egit.co: could not connect to host
+elnutricionista.es: did not receive HSTS header
 email.lookout.com: could not connect to host
 en-maktoob.search.yahoo.com: did not receive HSTS header
 encrypted.google.com: did not receive HSTS header (error ignored - included regardless)
@@ -103,6 +104,7 @@
 espanol.search.yahoo.com: did not receive HSTS header
 espra.com: could not connect to host
 etsysecure.com: could not connect to host
+fabianfischer.de: did not receive HSTS header
 fatzebra.com.au: did not receive HSTS header
 fi.search.yahoo.com: did not receive HSTS header
 fixingdns.com: could not connect to host
@@ -112,6 +114,7 @@
 fr.search.yahoo.com: did not receive HSTS header
 friendlink.jp: did not receive HSTS header
 gamesdepartment.co.uk: did not receive HSTS header
+geekandi.com: max-age too low: 7776000
 getlantern.org: did not receive HSTS header
 gl.search.yahoo.com: did not receive HSTS header
 glass.google.com: did not receive HSTS header (error ignored - included regardless)
@@ -130,11 +133,9 @@
 greplin.com: could not connect to host
 groups.google.com: did not receive HSTS header (error ignored - included regardless)
 gunnarhafdal.com: could not connect to host
-hachre.de: did not receive HSTS header
 hackerone-user-content.com: could not connect to host
 haste.ch: could not connect to host
 hatoko.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
-helpadmin.net: could not connect to host
 history.google.com: did not receive HSTS header (error ignored - included regardless)
 hk.search.yahoo.com: did not receive HSTS header
 hn.search.yahoo.com: did not receive HSTS header
@@ -146,22 +147,23 @@
 hstspreload.appspot.com: did not receive HSTS header
 hu.search.yahoo.com: did not receive HSTS header
 iban.is: could not connect to host
+id.fedoraproject.org: did not receive HSTS header
 id.search.yahoo.com: did not receive HSTS header
 ie.search.yahoo.com: did not receive HSTS header
 ilmconpm.de: did not receive HSTS header
 in.search.yahoo.com: did not receive HSTS header
 inertianetworks.com: did not receive HSTS header
 intercom.io: did not receive HSTS header
+interserved.com: did not receive HSTS header
 iop.intuit.com: max-age too low: 86400
 irccloud.com: did not receive HSTS header
 it.search.yahoo.com: did not receive HSTS header
-itriskltd.com: did not receive HSTS header
-jonas-keidel.de: could not connect to host
 jonathan.ir: did not receive HSTS header
 jottit.com: could not connect to host
 k-dev.de: could not connect to host
 keymaster.lookout.com: did not receive HSTS header
 kirkforcongress.com: did not receive HSTS header
+kirkforsenate.com: could not connect to host
 kitsta.com: could not connect to host
 kiwiirc.com: max-age too low: 5256000
 klaxn.com: could not connect to host
@@ -171,10 +173,11 @@
 kryptera.se: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 kz.search.yahoo.com: did not receive HSTS header
 labina.com.tr: did not receive HSTS header
+landscape.canonical.com: max-age too low: 2592000
 li.search.yahoo.com: did not receive HSTS header
 library.linode.com: did not receive HSTS header
 lifeguard.aecom.com: max-age too low: 86400
-lists.mayfirst.org: did not receive HSTS header
+lists.fedoraproject.org: did not receive HSTS header
 login.corp.google.com: max-age too low: 7776000 (error ignored - included regardless)
 logotype.se: did not receive HSTS header
 lovelycorral.com: did not receive HSTS header
@@ -197,7 +200,6 @@
 megaxchange.com: did not receive HSTS header
 meinebo.it: could not connect to host
 minikneet.nl: did not receive HSTS header
-miniku.net: did not receive HSTS header
 mirindadomo.ru: could not connect to host
 mobilethreat.net: could not connect to host
 mobilethreatnetwork.net: could not connect to host
@@ -212,6 +214,7 @@
 mydigipass.com: did not receive HSTS header
 mykolab.com: did not receive HSTS header
 mykreuzfahrt.de: did not receive HSTS header
+myni.io: could not connect to host
 neftaly.com: did not receive HSTS header
 neonisi.com: could not connect to host
 netzpolitik.org: did not receive HSTS header
@@ -221,6 +224,7 @@
 ni.search.yahoo.com: did not receive HSTS header
 nl.search.yahoo.com: did not receive HSTS header
 no.search.yahoo.com: did not receive HSTS header
+nodari.com.ar: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 noexpect.org: could not connect to host
 np.search.yahoo.com: did not receive HSTS header
 npw.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
@@ -232,6 +236,7 @@
 passwordbox.com: did not receive HSTS header
 passwords.google.com: did not receive HSTS header (error ignored - included regardless)
 pe.search.yahoo.com: did not receive HSTS header
+petrolplus.ru: did not receive HSTS header
 ph.search.yahoo.com: did not receive HSTS header
 piratenlogin.de: could not connect to host
 pisidia.de: did not receive HSTS header
@@ -239,6 +244,7 @@
 pl.search.yahoo.com: did not receive HSTS header
 platform.lookout.com: could not connect to host
 play.google.com: did not receive HSTS header (error ignored - included regardless)
+polymathematician.com: could not connect to host
 pr.search.yahoo.com: did not receive HSTS header
 pressfreedomfoundation.org: did not receive HSTS header
 prodpad.com: did not receive HSTS header
@@ -251,11 +257,10 @@
 redlatam.org: did not receive HSTS header
 redports.org: could not connect to host
 regar42.fr: could not connect to host
-riftnetwork.net: did not receive HSTS header
+riftnetwork.net: could not connect to host
 riseup.net: did not receive HSTS header
 rme.li: did not receive HSTS header
 ro.search.yahoo.com: did not receive HSTS header
-robteix.com: did not receive HSTS header
 roddis.net: did not receive HSTS header
 ru.search.yahoo.com: did not receive HSTS header
 rw.search.yahoo.com: did not receive HSTS header
@@ -269,8 +274,8 @@
 seomobo.com: did not receive HSTS header
 seowarp.net: max-age too low: 1576800
 serverdensity.io: did not receive HSTS header
-seyahatsagliksigortalari.com: did not receive HSTS header
 sg.search.yahoo.com: did not receive HSTS header
+shadex.net: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 shops.neonisi.com: could not connect to host
 siammedia.co: did not receive HSTS header
 silentcircle.org: could not connect to host
@@ -281,6 +286,7 @@
 souyar.de: could not connect to host
 souyar.net: could not connect to host
 souyar.us: could not connect to host
+spartantheatre.org: did not receive HSTS header
 spdysync.com: did not receive HSTS header
 spreadsheets.google.com: did not receive HSTS header (error ignored - included regardless)
 square.com: did not receive HSTS header
@@ -292,6 +298,7 @@
 surfeasy.com: did not receive HSTS header
 suzukikenichi.com: did not receive HSTS header
 sv.search.yahoo.com: did not receive HSTS header
+sylaps.com: [Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsISiteSecurityService.processHeader]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  location: "JS frame :: /builds/slave/m-cen-l64-periodicupdate-00000/getHSTSPreloadList.js :: processStsHeader :: line 134"  data: no]
 t.facebook.com: did not receive HSTS header
 tablet.facebook.com: did not receive HSTS header
 talk.google.com: could not connect to host
@@ -303,8 +310,8 @@
 temehu.com: did not receive HSTS header
 terrax.berlin: could not connect to host
 th.search.yahoo.com: did not receive HSTS header
+the-sky-of-valkyries.com: did not receive HSTS header
 thomasgriffin.io: did not receive HSTS header
-tor2web.org: could not connect to host
 tr.search.yahoo.com: did not receive HSTS header
 translate.googleapis.com: did not receive HSTS header (error ignored - included regardless)
 translatoruk.co.uk: did not receive HSTS header
@@ -320,6 +327,7 @@
 ve.search.yahoo.com: did not receive HSTS header
 viennan.net: did not receive HSTS header
 vn.search.yahoo.com: did not receive HSTS header
+vyncke.org: max-age too low: 2678400
 wallet.google.com: did not receive HSTS header (error ignored - included regardless)
 webmail.mayfirst.org: did not receive HSTS header
 whonix.org: did not receive HSTS header
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/boot/src/nsSTSPreloadList.inc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/boot/src/nsSTSPreloadList.inc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/boot/src/nsSTSPreloadList.inc	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/boot/src/nsSTSPreloadList.inc	2015-02-28 15:03:11.000000000 +0000
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1434798773028000);
+const PRTime gPreloadListExpirationTime = INT64_C(1436008563185000);
 
 class nsSTSPreload
 {
@@ -27,6 +27,8 @@
   { "1a-werkstattgeraete.de", true },
   { "2048game.co.uk", true },
   { "302.nyc", true },
+  { "7183.org", true },
+  { "8ack.de", true },
   { "accounts.firefox.com", true },
   { "accounts.google.com", true },
   { "aclu.org", false },
@@ -35,9 +37,12 @@
   { "adamkostecki.de", true },
   { "addvocate.com", true },
   { "adlershop.ch", true },
+  { "admin.fedoraproject.org", true },
   { "admin.google.com", true },
+  { "admin.stg.fedoraproject.org", true },
   { "adorai.tk", true },
   { "adsfund.org", true },
+  { "afp548.com", true },
   { "agrimap.com", true },
   { "ahoyconference.com", true },
   { "ahwatukeefoothillsmontessori.com", true },
@@ -53,7 +58,9 @@
   { "alexyang.me", true },
   { "alpha.irccloud.com", false },
   { "anadoluefessporkulubu.org", true },
+  { "andere-gedanken.net", true },
   { "andreasbreitenlohner.de", true },
+  { "andymartin.cc", true },
   { "anetaben.nl", true },
   { "angularjs.org", true },
   { "anime.my", false },
@@ -64,6 +71,7 @@
   { "annevankesteren.nl", true },
   { "annevankesteren.org", true },
   { "ansdell.net", true },
+  { "antipolygraph.org", true },
   { "anycoin.me", true },
   { "apadvantage.com", true },
   { "api.intercom.io", false },
@@ -79,22 +87,35 @@
   { "app.yinxiang.com", false },
   { "appengine.google.com", true },
   { "apps.facebook.com", false },
+  { "apps.fedoraproject.org", true },
+  { "apps.stg.fedoraproject.org", true },
   { "aprz.de", true },
   { "archlinux.de", true },
+  { "areafiftylan.nl", true },
   { "arendburgers.nl", true },
   { "arguggi.co.uk", true },
   { "arivo.com.br", true },
   { "arlen.io", true },
+  { "aroonchande.com", true },
+  { "arty.name", true },
+  { "ask.fedoraproject.org", true },
+  { "ask.stg.fedoraproject.org", true },
   { "atavio.at", true },
   { "atavio.ch", true },
   { "atavio.de", true },
+  { "atc.io", true },
   { "atishchenko.com", true },
   { "atlantischild.hu", true },
   { "atlassian.net", true },
   { "atte.fi", true },
   { "auf-feindgebiet.de", true },
   { "authentication.io", true },
+  { "auto4trade.nl", true },
   { "azabani.com", true },
+  { "badges.fedoraproject.org", true },
+  { "badges.stg.fedoraproject.org", true },
+  { "baer.im", true },
+  { "bagelsbakery.com", true },
   { "balcan-underground.net", true },
   { "baldwinkoo.com", true },
   { "balikonos.cz", true },
@@ -112,6 +133,7 @@
   { "beastowner.li", true },
   { "bedeta.de", true },
   { "bedreid.dk", true },
+  { "beercandle.com", true },
   { "beneathvt.com", true },
   { "benjamin.pe", true },
   { "benjamins.com", true },
@@ -123,6 +145,7 @@
   { "biathloncup.ru", true },
   { "big-andy.co.uk", true },
   { "bigbrownpromotions.com.au", true },
+  { "billigssl.dk", true },
   { "bit.voyage", true },
   { "bitbucket.org", false },
   { "bitfactory.ws", true },
@@ -147,10 +170,13 @@
   { "bodo-wolff.de", true },
   { "bohramt.de", true },
   { "bonigo.de", true },
+  { "bonitabrazilian.co.nz", true },
   { "bookingapp.nl", true },
   { "boxcryptor.com", true },
   { "brage.info", true },
   { "brakemanpro.com", true },
+  { "brandbuilderwebsites.com", true },
+  { "breeswish.org", true },
   { "broeselei.at", true },
   { "brossmanit.com", true },
   { "brunosouza.org", true },
@@ -158,8 +184,10 @@
   { "bugzil.la", true },
   { "bugzilla.mozilla.org", true },
   { "bulktrade.de", true },
+  { "bundaberg.com", true },
   { "business.facebook.com", false },
   { "business.lookout.com", false },
+  { "bustimes.org", true },
   { "buttercoin.com", true },
   { "buzzconcert.com", true },
   { "bytepark.de", false },
@@ -167,9 +195,10 @@
   { "ca.gparent.org", false },
   { "cackette.com", true },
   { "call.me", true },
-  { "calomel.org", true },
+  { "calories.org", true },
   { "camolist.com", true },
   { "cao.gov", true },
+  { "capitaltg.com", true },
   { "caremad.io", true },
   { "carezone.com", false },
   { "cartouche24.eu", true },
@@ -182,13 +211,16 @@
   { "chahub.com", true },
   { "chainmonitor.com", true },
   { "changelab.cc", true },
+  { "chartstoffarm.de", false },
   { "chatbot.me", true },
   { "check.torproject.org", false },
   { "checkout.google.com", true },
   { "chm.vn", true },
   { "chontalpa.pw", true },
+  { "chrisirwin.ca", true },
   { "chrisjean.com", true },
   { "chrome-devtools-frontend.appspot.com", true },
+  { "chrome.com", false },
   { "chrome.google.com", true },
   { "chromiumcodereview.appspot.com", false },
   { "chulado.com", true },
@@ -196,6 +228,7 @@
   { "cktennis.com", true },
   { "clan-ww.com", true },
   { "clapping-rhymes.com", true },
+  { "classdojo.com", true },
   { "clerkendweller.uk", true },
   { "clintwilson.technology", true },
   { "cloud.google.com", true },
@@ -219,6 +252,7 @@
   { "config.schokokeks.org", false },
   { "conformal.com", true },
   { "conrad-kostecki.de", true },
+  { "consumersentinel.gov", true },
   { "controlcenter.gigahost.dk", true },
   { "cor-ser.es", true },
   { "cordial-restaurant.com", true },
@@ -240,6 +274,7 @@
   { "cyanogenmod.xxx", true },
   { "cybershambles.com", true },
   { "cybozu.com", true },
+  { "cybozulive.com", true },
   { "cyon.ch", true },
   { "cyphertite.com", true },
   { "cyprus-company-service.com", true },
@@ -247,9 +282,13 @@
   { "daphne.informatik.uni-freiburg.de", true },
   { "darchoods.net", false },
   { "darkpony.ru", true },
+  { "darkserver.fedoraproject.org", true },
+  { "darkserver.stg.fedoraproject.org", true },
+  { "darlo.co.uk", true },
   { "darom.jp", true },
   { "data-abundance.com", true },
   { "data.qld.gov.au", false },
+  { "datasnitch.co.uk", true },
   { "datenkeks.de", true },
   { "daveoc64.co.uk", true },
   { "davidlyness.com", true },
@@ -277,6 +316,8 @@
   { "dlc.viasinc.com", true },
   { "dm.lookout.com", false },
   { "dm.mylookout.com", false },
+  { "dn42.us", true },
+  { "dnsman.se", true },
   { "doc.python.org", true },
   { "docs.google.com", true },
   { "docs.python.org", true },
@@ -284,11 +325,14 @@
   { "donmez.ws", false },
   { "donotcall.gov", true },
   { "dreadbyte.com", true },
+  { "dreamsforabetterworld.com.au", true },
   { "drive.google.com", true },
   { "dropbox.com", true },
   { "dylanscott.com.au", true },
+  { "dynaloop.net", true },
   { "dzlibs.io", true },
   { "e-kontakti.fi", true },
+  { "e.mail.ru", true },
   { "earmarks.gov", true },
   { "easysimplecrm.com", false },
   { "ebanking.indovinabank.com.vn", false },
@@ -296,6 +340,7 @@
   { "ecfs.link", true },
   { "ecg.fr", false },
   { "ecosystem.atlassian.net", true },
+  { "ectora.com", true },
   { "edit.yahoo.com", false },
   { "eduroam.no", true },
   { "edyou.eu", true },
@@ -305,7 +350,7 @@
   { "egit.co", true },
   { "eksisozluk.com", true },
   { "electronic-ignition-system.com", true },
-  { "elnutricionista.es", true },
+  { "elliquiy.com", true },
   { "emailprivacytester.com", true },
   { "encircleapp.com", true },
   { "encryptallthethings.net", true },
@@ -327,7 +372,6 @@
   { "extendwings.com", true },
   { "f-droid.org", true },
   { "fabhub.io", true },
-  { "fabianfischer.de", true },
   { "facebook.com", false },
   { "factor.cc", false },
   { "fairbill.com", true },
@@ -357,6 +401,8 @@
   { "flamer-scene.com", true },
   { "fleximus.org", false },
   { "floobits.com", true },
+  { "florian-lillpopp.de", true },
+  { "florianlillpopp.de", true },
   { "florianmitrea.uk", true },
   { "flynn.io", true },
   { "food4health.guide", true },
@@ -381,6 +427,8 @@
   { "gavick.com", true },
   { "gaytorrent.ru", true },
   { "gemeinfreie-lieder.de", true },
+  { "geoip.fedoraproject.org", true },
+  { "geoip.stg.fedoraproject.org", true },
   { "gerardozamudio.mx", true },
   { "gernert-server.de", true },
   { "get.zenpayroll.com", false },
@@ -406,7 +454,7 @@
   { "goto.google.com", true },
   { "gplintegratedit.com", true },
   { "gpsfix.cz", true },
-  { "grc.com", false },
+  { "grc.com", true },
   { "greensolid.biz", true },
   { "grepular.com", true },
   { "groetzner.net", true },
@@ -417,6 +465,7 @@
   { "guphi.net", true },
   { "guthabenkarten-billiger.de", true },
   { "gw2treasures.com", true },
+  { "hachre.de", false },
   { "hack.li", true },
   { "hackerone.com", true },
   { "hansvaneijsden.com", true },
@@ -433,11 +482,13 @@
   { "heijblok.com", true },
   { "helichat.de", true },
   { "help.simpletax.ca", false },
+  { "helpadmin.net", true },
   { "helpium.de", true },
   { "hemlockhillscabinrentals.com", true },
   { "henriknoerr.com", true },
   { "heppler.net", true },
   { "herocentral.de", true },
+  { "heute-kaufen.de", true },
   { "hex2013.com", true },
   { "hexony.com", true },
   { "hg.python.org", true },
@@ -459,6 +510,7 @@
   { "hstsfail.appspot.com", true },
   { "html5.org", true },
   { "httpswatch.com", true },
+  { "hushfile.it", true },
   { "i5y.co.uk", true },
   { "iamcarrico.com", true },
   { "ian.sh", true },
@@ -483,7 +535,7 @@
   { "innophate-security.nl", true },
   { "insouciant.org", true },
   { "instasex.ch", true },
-  { "interserved.com", true },
+  { "interasistmen.se", true },
   { "ionas-law.ro", true },
   { "iranianlawschool.com", true },
   { "iridiumbrowser.de", true },
@@ -492,6 +544,7 @@
   { "isitchristmas.com", true },
   { "it-schwerin.de", true },
   { "itdashboard.gov", true },
+  { "itriskltd.com", true },
   { "itsamurai.ru", true },
   { "itshost.ru", true },
   { "izdiwho.com", true },
@@ -508,6 +561,7 @@
   { "jitsi.org", false },
   { "jmdekker.it", true },
   { "jmedved.com", true },
+  { "johannes.io", true },
   { "johners.me", true },
   { "jonas-keidel.de", true },
   { "jonaswitmer.ch", true },
@@ -517,13 +571,14 @@
   { "jwilsson.me", true },
   { "k-dev.de", true },
   { "kaheim.de", true },
+  { "kamikano.com", true },
   { "kardize24.pl", true },
   { "karmaspa.se", true },
   { "kartonmodellbau.org", true },
   { "kdex.de", true },
   { "kdyby.org", true },
   { "keeleysam.com", true },
-  { "keepa.com", false },
+  { "keepa.com", true },
   { "keepclean.me", true },
   { "keeperapp.com", true },
   { "keepersecurity.com", true },
@@ -538,6 +593,7 @@
   { "kingmanhall.org", true },
   { "kinogb.net", false },
   { "kinsights.com", false },
+  { "kintone.com", true },
   { "kirei.se", true },
   { "kirkforsenate.com", true },
   { "kitsta.com", true },
@@ -549,7 +605,10 @@
   { "klingeletest.de", true },
   { "knip.ch", true },
   { "knowledgehook.com", true },
+  { "koen.io", true },
+  { "koenrouwhorst.nl", true },
   { "koenvdheuvel.me", true },
+  { "kojipkgs.fedoraproject.org", true },
   { "komandakovalchuk.com", true },
   { "konklone.com", true },
   { "koop-bremen.de", true },
@@ -577,15 +636,21 @@
   { "les-corsaires.net", true },
   { "libraryfreedomproject.org", true },
   { "liebel.org", true },
+  { "light.mail.ru", true },
   { "lighting-centres.co.uk", true },
+  { "lillpopp.eu", true },
   { "lilpwny.com", true },
   { "limpid.nl", true },
   { "lingolia.com", true },
   { "linode.com", false },
   { "linux-admin-california.com", true },
+  { "linx.li", true },
   { "linx.net", true },
+  { "lists.mayfirst.org", false },
+  { "lists.stg.fedoraproject.org", true },
   { "livej.am", true },
   { "ljs.io", true },
+  { "lnx.li", true },
   { "lobste.rs", true },
   { "lockify.com", true },
   { "lodash.com", true },
@@ -607,9 +672,11 @@
   { "lumi.do", false },
   { "luneta.nearbuysystems.com", false },
   { "m.facebook.com", false },
+  { "m.mail.ru", true },
   { "m0wef.uk", true },
   { "mach-politik.ch", true },
   { "madars.org", true },
+  { "madeitwor.se", true },
   { "maff.scot", false },
   { "magneticanvil.com", true },
   { "mahamed91.pw", true },
@@ -617,6 +684,7 @@
   { "mail.google.com", true },
   { "mail.yahoo.com", false },
   { "mailbox.org", true },
+  { "mailmag.net", true },
   { "makeitdynamic.com", true },
   { "makeyourlaws.org", true },
   { "malnex.de", true },
@@ -649,14 +717,17 @@
   { "meinebo.it", true },
   { "members.mayfirst.org", false },
   { "members.nearlyfreespeech.net", false },
+  { "mevs.cz", true },
   { "miasarafina.de", true },
   { "michalspacek.cz", true },
+  { "miconcinemas.com", true },
   { "mig5.net", true },
   { "mike-bland.com", true },
   { "miketabor.com", true },
   { "mikewest.org", true },
   { "miku.hatsune.my", false },
   { "mimeit.de", true },
+  { "mindoktor.se", true },
   { "minecraftvoter.com", true },
   { "mineover.es", true },
   { "minez-nightswatch.com", true },
@@ -664,6 +735,7 @@
   { "minnesotadata.com", true },
   { "mirrorx.com", true },
   { "miskatonic.org", true },
+  { "mister.hosting", true },
   { "mkcert.org", true },
   { "mkw.st", true },
   { "mnsure.org", true },
@@ -682,6 +754,7 @@
   { "mr-hosting.com", true },
   { "msa-aesch.ch", true },
   { "msc-seereisen.net", true },
+  { "mtau.com", true },
   { "mths.be", true },
   { "mtouch.facebook.com", false },
   { "mudcrab.us", true },
@@ -702,11 +775,13 @@
   { "myni.io", true },
   { "mynigma.org", true },
   { "myplaceonline.com", true },
+  { "myprintcard.de", true },
   { "myvirtualserver.com", true },
   { "nachsenden.info", true },
   { "nameid.org", true },
   { "namepros.com", true },
   { "narodniki.com", true },
+  { "nationalpriorities.org", true },
   { "nectarleaf.com", true },
   { "neg9.org", false },
   { "neilwynne.com", false },
@@ -740,6 +815,8 @@
   { "nu3.se", true },
   { "null-sec.ru", true },
   { "nutsandboltsmedia.com", false },
+  { "nuvini.com", true },
+  { "nwa.xyz", true },
   { "nwgh.org", true },
   { "nymphetomania.net", true },
   { "oakslighting.co.uk", true },
@@ -785,6 +862,7 @@
   { "pastebin.linode.com", false },
   { "patt.us", true },
   { "pauladamsmith.com", true },
+  { "paulschreiber.com", true },
   { "pay.gigahost.dk", true },
   { "paymentaccuracy.gov", true },
   { "paymill.com", true },
@@ -797,8 +875,8 @@
   { "perfectionis.me", true },
   { "personaldatabasen.no", true },
   { "pestici.de", true },
-  { "petrolplus.ru", true },
   { "pharmaboard.de", true },
+  { "philosopherswool.com", true },
   { "phoenix.dj", true },
   { "phoenixlogan.com", true },
   { "phryanjr.com", false },
@@ -822,10 +900,12 @@
   { "powerplannerapp.com", true },
   { "prakharprasad.com", true },
   { "prefontaine.name", true },
+  { "preissler.co.uk", true },
   { "privategiant.com", true },
   { "profiles.google.com", true },
   { "progressiveplanning.com", true },
   { "projektzentrisch.de", true },
+  { "proofwiki.org", true },
   { "propagandism.org", true },
   { "prowhisky.de", true },
   { "proximato.com", true },
@@ -838,6 +918,8 @@
   { "pypa.io", true },
   { "pypi.python.org", true },
   { "python.org", false },
+  { "qa.fedoraproject.org", true },
+  { "qa.stg.fedoraproject.org", true },
   { "qetesh.de", true },
   { "quuz.org", true },
   { "r3s1stanc3.me", true },
@@ -848,6 +930,10 @@
   { "rasing.me", true },
   { "raspass.me", true },
   { "ravchat.com", true },
+  { "rawstorieslondon.com", true },
+  { "reaconverter.com", true },
+  { "redirect.fedoraproject.org", true },
+  { "redirect.stg.fedoraproject.org", true },
   { "redletter.link", true },
   { "redports.org", true },
   { "redteam-pentesting.de", true },
@@ -865,6 +951,9 @@
   { "rika.me", true },
   { "rippleunion.com", true },
   { "rlalique.com", true },
+  { "robinadr.com", true },
+  { "robteix.com", true },
+  { "rodosto.com", true },
   { "roland.io", true },
   { "romab.com", true },
   { "romans-place.me.uk", true },
@@ -872,7 +961,9 @@
   { "room-checkin24.de", true },
   { "rosenkeller.org", true },
   { "roundcube.mayfirst.org", false },
+  { "rssr.se", true },
   { "ru-sprachstudio.ch", true },
+  { "rubendv.be", true },
   { "rudloff.pro", true },
   { "ruudkoot.nl", true },
   { "rws-vertriebsportal.de", true },
@@ -897,6 +988,7 @@
   { "schwarzer.it", true },
   { "sciencex.com", true },
   { "scotthelme.co.uk", true },
+  { "scoutdb.ch", true },
   { "scrambl.is", true },
   { "scrambler.in", false },
   { "scribe.systems", true },
@@ -911,7 +1003,9 @@
   { "secuvera.de", true },
   { "seifried.org", true },
   { "servergno.me", true },
-  { "servethecity-karlsruhe.de", true },
+  { "servethecity-karlsruhe.de", false },
+  { "setuid.io", true },
+  { "seyahatsagliksigortalari.com", true },
   { "shaaaaaaaaaaaaa.com", true },
   { "shakepeers.org", true },
   { "shellsec.pw", true },
@@ -947,11 +1041,12 @@
   { "smartlend.se", true },
   { "smartship.co.jp", true },
   { "snakehosting.dk", true },
+  { "sockeye.cc", true },
   { "sorz.org", true },
+  { "soulogic.com", true },
   { "sour.is", true },
   { "southside-crew.com", true },
   { "souvik.me", true },
-  { "spartantheatre.org", true },
   { "spawn.cz", true },
   { "spencerbaer.com", true },
   { "spideroak.com", true },
@@ -1002,21 +1097,25 @@
   { "tallshoe.com", true },
   { "tapka.cz", true },
   { "tas2580.net", true },
+  { "taskotron.fedoraproject.org", true },
+  { "taskotron.stg.fedoraproject.org", true },
   { "tatort-fanpage.de", true },
   { "tauchkater.de", true },
   { "tbspace.de", true },
+  { "teamnorthgermany.de", true },
   { "techhipster.net", true },
   { "tegelsensanitaironline.nl", true },
   { "tekshrek.com", true },
   { "tent.io", true },
+  { "terraelectronica.ru", true },
   { "terrty.net", true },
   { "testsuite.org", true },
   { "texte-zur-taufe.de", true },
-  { "the-sky-of-valkyries.com", true },
   { "thebimhub.com", true },
   { "thecustomizewindows.com", true },
+  { "themoep.at", true },
   { "thepaymentscompany.com", true },
-  { "therapynotes.com", false },
+  { "therapynotes.com", true },
   { "theshadestore.com", true },
   { "thetomharling.com", true },
   { "thomastimepieces.com.au", true },
@@ -1059,10 +1158,14 @@
   { "topodin.com", true },
   { "tor2web.org", true },
   { "torproject.org", false },
+  { "torquato.de", true },
   { "toshnix.com", true },
   { "touch.facebook.com", false },
+  { "touch.mail.ru", true },
   { "tracktivity.com.au", true },
+  { "translate.fedoraproject.org", true },
   { "translate.googleapis.com", true },
+  { "translate.stg.fedoraproject.org", true },
   { "trauertexte.info", true },
   { "tresorit.com", true },
   { "tribut.de", true },
@@ -1086,9 +1189,11 @@
   { "uptrends.com", true },
   { "usaa.com", false },
   { "uspsoig.gov", true },
+  { "utleieplassen.no", true },
   { "vaddder.com", true },
   { "vhost.co.id", true },
   { "viasinc.com", false },
+  { "vijos.org", true },
   { "visionless.me", false },
   { "vitrado.de", true },
   { "vmoagents.com", false },
@@ -1105,6 +1210,7 @@
   { "webandwords.com.au", true },
   { "webassadors.com", false },
   { "webcollect.org.uk", true },
+  { "webeau.com", true },
   { "webfilings-eu-mirror.appspot.com", true },
   { "webfilings-eu.appspot.com", true },
   { "webfilings-mirror-hrd.appspot.com", true },
@@ -1137,11 +1243,13 @@
   { "wherephoto.com", true },
   { "whocalld.com", true },
   { "wieninternational.at", true },
+  { "wifirst.net", true },
   { "wiki.python.org", true },
   { "wildbee.org", true },
   { "willnorris.com", true },
   { "wills.co.tt", true },
   { "winhistory-forum.net", true },
+  { "wisv.ch", true },
   { "wondershift.biz", true },
   { "wootton95.com", true },
   { "wpletter.de", true },
@@ -1168,7 +1276,7 @@
   { "www.gmail.com", false },
   { "www.googlemail.com", false },
   { "www.gov.uk", false },
-  { "www.grc.com", false },
+  { "www.grc.com", true },
   { "www.heliosnet.com", true },
   { "www.honeybadger.io", false },
   { "www.intercom.io", false },
@@ -1188,7 +1296,7 @@
   { "www.schokokeks.org", false },
   { "www.simbolo.co.uk", false },
   { "www.simple.com", false },
-  { "www.therapynotes.com", false },
+  { "www.therapynotes.com", true },
   { "www.tinfoilsecurity.com", false },
   { "www.torproject.org", false },
   { "www.twitter.com", false },
@@ -1210,6 +1318,7 @@
   { "yoursecondphone.co", true },
   { "ypart.eu", true },
   { "z.ai", true },
+  { "zapier.com", true },
   { "zenpayroll.com", false },
   { "zentralwolke.de", true },
   { "zeplin.io", false },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/boot/src/StaticHPKPins.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/boot/src/StaticHPKPins.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/boot/src/StaticHPKPins.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/boot/src/StaticHPKPins.h	2015-02-28 15:03:11.000000000 +0000
@@ -752,6 +752,7 @@
   { "check.torproject.org", true, false, false, -1, &kPinset_tor },
   { "checkout.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "chrome-devtools-frontend.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
+  { "chrome.com", true, false, false, -1, &kPinset_google_root_pems },
   { "chrome.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "chromiumcodereview.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "cloud.google.com", true, false, false, -1, &kPinset_google_root_pems },
@@ -1076,8 +1077,8 @@
   { "ytimg.com", true, false, false, -1, &kPinset_google_root_pems },
 };
 
-// Pinning Preload List Length = 346;
+// Pinning Preload List Length = 347;
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1432379583107000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1433589369180000);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/locales/en-US/chrome/pipnss/nsserrors.properties	2015-02-28 15:03:00.000000000 +0000
@@ -317,3 +317,4 @@
 MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=An X.509 version 1 certificate that is not a trust anchor was used to issue the server's certificate. X.509 version 1 certificates are deprecated and should not be used to sign other certificates.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=The server presented a certificate that is not yet valid.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=A certificate that is not yet valid was used to issue the server's certificate.
+MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=The signature algorithm in the signature field of the certificate does not match the algorithm in its signatureAlgorithm field.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/IntolerantFallbackList.inc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/IntolerantFallbackList.inc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/IntolerantFallbackList.inc	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/IntolerantFallbackList.inc	2015-02-28 15:03:00.000000000 +0000
@@ -17,6 +17,7 @@
   "actu.reunion.fr",
   "ad401k.sbisec.co.jp",
   "adman.you.gr",
+  "adsearch.kuronekoyamato.co.jp", // bug 1128366
   "affiliatewalla.com",
   "airportwifi.com", // bug 1116891
   "allyours.virginmedia.com",
@@ -25,6 +26,7 @@
   "apps.amerch.com",
   "apps.fpcu.org",
   "apps.sasken.com",
+  "apps.state.or.us", // bug 1130472
   "appsrv.restat.com",
   "arts.ac.uk",
   "ascii.jp",
@@ -44,6 +46,7 @@
   "blogwatcher.co.jp",
   "blueportal.vanmarcke.be",
   "bmypage.kuronekoyamato.co.jp", // bug 1128366
+  "bmypageapi.kuronekoyamato.co.jp", // bug 1128366
   "books.spec.whatwg.org", // RC4
   "books.wwnorton.com", // bug 1116891
   "bookstore.alma.edu",
@@ -111,6 +114,8 @@
   "dinsmore.fsmoffice.net",
   "direct-teleshop.jp",
   "direct.graydon.nl",
+  "docrecycle.kuronekoyamato.co.jp", // bug 1128366
+  "domparsing.spec.whatwg.org",
   "dream-prize.com",
   "dwwsyw.bjgjj.gov.cn",
   "e-mediador.fiatc.es",
@@ -136,6 +141,7 @@
   "eservices.palomar.edu",
   "etimebanker.bankofthewest.com", // bug 1127204
   "etrade.ftft.com.tw",
+  "eu.static.mega.co.nz", // bug 1133496
   "event.kasite.net",
   "extra.ytk.fi",
   "extranet.eurocontrol.int",
@@ -160,10 +166,10 @@
   "german.visitkorea.or.kr",
   "gestion.urjc.es",
   "giftcertificates.com",
+  "golfsearch.kuronekoyamato.co.jp", // bug 1128366
   "gosignmeup.com", // bug 1116891
   "gotimeforce.com",
   "hb.posted.co.rs",
-  "helpdesk.attask.com",
   "hercle.com",
   "hikkoshi.homes.co.jp",
   "hollowayusa.com",
@@ -215,6 +221,7 @@
   "mail.izhnet.ru",
   "mailoffer.merrickbank.com",
   "map.infonavit.org.mx",
+  "maplink.kuronekoyamato.co.jp", // bug 1128366
   "marketday.com", // bug 1092998
   "mbrapp.fpcu.org",
   "mccbookstore.mchenry.edu",
@@ -229,6 +236,8 @@
   "mimesniff.spec.whatwg.org", // RC4
   "miportal.urjc.es",
   "mobile.dream-prize.com",
+  "mobile.kuronekoyamato.co.jp", // bug 1128366
+  "mobileotodoke.kuronekoyamato.co.jp", // bug 1128366
   "mon-ulb.ulb.ac.be",
   "mwed.jp",
   "my.arts.ac.uk",
@@ -237,6 +246,7 @@
   "my.kyivstar.ua",
   "my.miit.ru",
   "my.officef5.com",
+  "myaccount.boostmobile.com", // bug 1112178
   "mybank.nbcb.com.cn",
   "mybanner.gvsu.edu",
   "myhancock.hancockcollege.edu",
@@ -244,10 +254,10 @@
   "myntc.ntc.edu",
   "mypage.homes.co.jp",
   "mytoi.kuronekoyamato.co.jp", // bug 1128366
-  "myucd.ucd.ie",
   "myuws.uws.edu.au",
   "nbank.hxb.com.cn",
   "nbc.epk.tv",
+  "netbolsa.bpinet.pt", // bug 1132399
   "niche.endsleigh.co.uk",
   "nmsmp.alsok.co.jp",
   "no1.nipponrentacar.co.jp",
@@ -286,7 +296,6 @@
   "publicjobs.ie",
   "publicrecords.com",
   "quirks.spec.whatwg.org", // RC4
-  "r.kaipoke.biz",
   "rakuraku-market.com",
   "rcp.kotoha.co.jp",
   "realestate.homes.co.jp",
@@ -296,12 +305,12 @@
   "relativitymedia.epk.tv",
   "renewals.cipd.co.uk",
   "repair.kuroneko-kadendr.jp", // bug 1128366
+  "repairmb.kuroneko-kadendr.jp", // bug 1128366
   "reputation.com",
   "research-report.uws.edu.au",
   "reserve.opas.jp",
   "resources.whatwg.org", // RC4
   "rpg.kotoha.co.jp",
-  "rr.com",
   "russian.visitkorea.or.kr",
   "s.aiasahi.jp",
   "sales.mibucorp.co.jp",
@@ -310,38 +319,39 @@
   "sboseweb.mcpsweb.org",
   "school.keystoneschoolonline.com",
   "schweser.com",
+  "secure-checkout.t-mobile.com", // bug 1133648
   "secure.bg-mania.jp",
   "secure.fortisbc.com",
   "secure.missouristate.edu",
   "secure.smartcart.com",
   "securedcard.merrickbank.com",
   "secureonline.dwp.gov.uk",
-  "selfcare.rr.com",
   "sems.hrd.ccsd.net",
   "service.autoc-one.jp",
   "services.apvma.gov.au",
   "servizionline.infogroup.it",
   "sgp.kotoha.co.jp",
   "shinchiku.homes.co.jp",
+  "ship-book.kuronekoyamato.co.jp", // bug 1128366
   "shop.autoc-one.jp",
   "shop.kagome.co.jp",
   "shop.lococom.jp",
   "shop.maxim-ic.com",
   "shop.nanairo.coop", // bug 1128318
-  "showcase-tv.com",
   "sigeduweb.udesa.edu.ar",
   "sirius.ws.ryukoku.ac.jp",
   "sisweb.ucd.ie",
   "slovanet.sk",
   "smartcart.com",
   "smarticon.geotrust.com",
+  "smp-cmypage.kuronekoyamato.co.jp", // bug 1128366
   "sony.epk.tv",
   "spanish.visitkorea.or.kr",
   "spp.kotoha.co.jp",
   "ss2.sfcollege.edu",
   "ss5.sfcollege.edu",
   "ssl.0634.co.jp",
-  "ssl.taisho-direct.jp",
+  "ssl.safaribooksonline.com", // bug 1133940
   "startrekonline.com",
   "store.closetmaid.com",
   "store.morningside.edu",
@@ -364,13 +374,12 @@
   "ticketseating.com",
   "ticketsupply.com",
   "tienda.boe.es",
-  "timewarnercable.com", // bug 1115883
   "todentaminen.posti.fi",
   "toushi.homes.co.jp",
   "trade.hsfund.com",
   "trueblue.jetblue.com",
   "tsuhanshokai.kuronekoyamato.co.jp", // bug 1128366
-  "twcbc.com",
+  "uketori.kuronekoyamato.co.jp", // bug 1128366
   "universal.epk.tv",
   "url.spec.whatwg.org", // RC4
   "userdoor.com",
@@ -381,7 +390,6 @@
   "uxxiportal.upct.es",
   "verkkokauppa.posti.fi",
   "vod.skyperfectv.co.jp",
-  "wayfarer.timewarnercable.com", // bug 1115883
   "web3.secureinternetbank.com", // bug 1111354
   "webapps.ou.edu",
   "webatm.landbank.com.tw",
@@ -410,8 +418,6 @@
   "www.araglegalcenter.com",
   "www.arts.ac.uk",
   "www.asknow.com",
-  "www.attask-ondemand.com",
-  "www.attask.com",
   "www.augustasportswear.com",
   "www.auroragov.org",
   "www.bancocredichile.cl",
@@ -431,6 +437,7 @@
   "www.bookstore.irsc.edu",
   "www.bookstore.mtu.edu",
   "www.bookstore.westga.edu",
+  "www.boostmobilesales.com", // 1112178
   "www.borsaitaliana.it",
   "www.bottegaverde.es",
   "www.bottegaverde.it",
@@ -448,6 +455,7 @@
   "www.cipd.co.uk",
   "www.club-animate.jp",
   "www.cngcorp.com",
+  "www.coastcapitalsavings.com", // bug 1132540
   "www.codan.dk",
   "www.comune.milano.it",
   "www.credem.it",
@@ -518,14 +526,12 @@
   "www.hx168.com.cn",
   "www.i-misdo.com",
   "www.iezukuri-net.com",
-  "www.illori.com.tw",
   "www.ingramentertainment.com",
   "www.interpark.com",
   "www.jaf.or.jp",
   "www.jhct.co.jp",
   "www.jifenpay.com",
   "www.kaigojob.com",
-  "www.kaipoke.biz",
   "www.kasite.net",
   "www.kfeducation.com",
   "www.khan.co.kr",
@@ -540,6 +546,7 @@
   "www.learndoj.gov",
   "www.lib.cwu.edu",
   "www.libraryvideo.com",
+  "www.licadho-cambodia.org", // bug 1133312
   "www.lm-order.de",
   "www.lococom.jp",
   "www.londonstockexchange.com",
@@ -568,7 +575,6 @@
   "www.myhomest.co.jp",
   "www.mynpcdata.net",
   "www.nec-nexs.com",
-  "www.nekonet-ios.jp",
   "www.neways.com",
   "www.newaysonline.com",
   "www.newchinalife.com",
@@ -586,6 +592,7 @@
   "www.peoples.com",
   "www.point-tactix.jp",
   "www.polla.cl",
+  "www.popehat.com", // RC4
   "www.priate.jp",
   "www.publicjobs.ie",
   "www.publicrecords.com",
@@ -595,9 +602,7 @@
   "www.renaultcredit.com.ar",
   "www.reputation.com",
   "www.riversendtrading.com",
-  "www.rr.com",
   "www.rubriquefidelite.com",
-  "www.ruskfrance.net",
   "www.s-book.net",
   "www.safepass.cn",
   "www.sandiegoimmunizationregistry.org",
@@ -609,7 +614,6 @@
   "www.shiki.jp",
   "www.shinsei.e-aichi.jp",
   "www.shop.bt.com",
-  "www.showcase-tv.com",
   "www.sihd-bk.jp",
   "www.sikatoru.com",
   "www.slovanet.sk",
@@ -621,7 +625,6 @@
   "www.sokamocka.com",
   "www.sports-nakama.com",
   "www.startrekonline.com",
-  "www.strade.com.vn",
   "www.stub.com",
   "www.stubpass.com",
   "www.sunderland.gov.uk",
@@ -633,10 +636,8 @@
   "www.thecopia.com",
   "www.ticketseating.com",
   "www.ticketsupply.com",
-  "www.timewarnercable.com", // bug 1115883
   "www.torrecatalunya.com",
   "www.transunion.ca",
-  "www.twcbc.com",
   "www.u-gakugei.ac.jp",
   "www.ubao.com",
   "www.uccard.co.jp",
@@ -655,7 +656,6 @@
   "www.world-family.co.jp",
   "www.xm-l-tax.gov.cn",
   "www.yakult.co.kr",
-  "www.youmeshop.jp",
   "www.yuuka.co.jp",
   "www.zenfolio.com",
   "www.zoominfo.com",
@@ -665,8 +665,11 @@
   "www2.shueisha.co.jp",
   "www2.sogo-gogo.com",
   "www2.wou.edu",
+  "www3.econ.ne.jp",
   "www3.ibac.co.jp",
   "www3.taiheiyo-ferry.co.jp",
+  "www4.econ.ne.jp",
+  "www5.econ.ne.jp",
   "wwws.kadokawa.co.jp",
   "xhr.spec.whatwg.org", // RC4
   "yeswellnesspro.fsmoffice.net",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -1207,6 +1207,13 @@
   // Note this only happens during the initial SSL handshake.
 
   SSLVersionRange range = socketInfo->GetTLSVersionRange();
+  nsSSLIOLayerHelpers& helpers = socketInfo->SharedState().IOLayerHelpers();
+
+  if (err == SSL_ERROR_UNSUPPORTED_VERSION &&
+      range.min == SSL_LIBRARY_VERSION_TLS_1_0) {
+    socketInfo->SetSecurityState(nsIWebProgressListener::STATE_IS_INSECURE |
+                                 nsIWebProgressListener::STATE_USES_SSL_3);
+  }
 
   if (err == SSL_ERROR_INAPPROPRIATE_FALLBACK_ALERT) {
     // This is a clear signal that we've fallen back too many versions.  Treat
@@ -1216,30 +1223,31 @@
     // First, track the original cause of the version fallback.  This uses the
     // same buckets as the telemetry below, except that bucket 0 will include
     // all cases where there wasn't an original reason.
-    PRErrorCode originalReason = socketInfo->SharedState().IOLayerHelpers()
-      .getIntoleranceReason(socketInfo->GetHostName(), socketInfo->GetPort());
+    PRErrorCode originalReason =
+      helpers.getIntoleranceReason(socketInfo->GetHostName(),
+                                   socketInfo->GetPort());
     Telemetry::Accumulate(Telemetry::SSL_VERSION_FALLBACK_INAPPROPRIATE,
                           tlsIntoleranceTelemetryBucket(originalReason));
 
-    socketInfo->SharedState().IOLayerHelpers()
-      .forgetIntolerance(socketInfo->GetHostName(), socketInfo->GetPort());
+    helpers.forgetIntolerance(socketInfo->GetHostName(),
+                              socketInfo->GetPort());
 
     return false;
   }
 
   // Disallow PR_CONNECT_RESET_ERROR if fallback limit reached.
-  if (err == PR_CONNECT_RESET_ERROR &&
-      socketInfo->SharedState().IOLayerHelpers()
-        .fallbackLimitReached(socketInfo->GetHostName(), range.max)) {
+  bool fallbackLimitReached =
+    helpers.fallbackLimitReached(socketInfo->GetHostName(), range.max);
+  if (err == PR_CONNECT_RESET_ERROR && fallbackLimitReached) {
     return false;
   }
 
   if ((err == SSL_ERROR_NO_CYPHER_OVERLAP || err == PR_END_OF_FILE_ERROR ||
        err == PR_CONNECT_RESET_ERROR) &&
+      !fallbackLimitReached &&
       nsNSSComponent::AreAnyWeakCiphersEnabled()) {
-    if (socketInfo->SharedState().IOLayerHelpers()
-                  .rememberStrongCiphersFailed(socketInfo->GetHostName(),
-                                               socketInfo->GetPort(), err)) {
+    if (helpers.rememberStrongCiphersFailed(socketInfo->GetHostName(),
+                                            socketInfo->GetPort(), err)) {
       Telemetry::Accumulate(Telemetry::SSL_WEAK_CIPHERS_FALLBACK,
                             tlsIntoleranceTelemetryBucket(err));
       return true;
@@ -1301,10 +1309,9 @@
   // TLS intolerance fallback due to remembered tolerance.
   Telemetry::Accumulate(pre, reason);
 
-  if (!socketInfo->SharedState().IOLayerHelpers()
-                 .rememberIntolerantAtVersion(socketInfo->GetHostName(),
-                                              socketInfo->GetPort(),
-                                              range.min, range.max, err)) {
+  if (!helpers.rememberIntolerantAtVersion(socketInfo->GetHostName(),
+                                           socketInfo->GetPort(),
+                                           range.min, range.max, err)) {
     return false;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/NSSErrorsService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/NSSErrorsService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/NSSErrorsService.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/NSSErrorsService.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -131,29 +131,37 @@
     return NS_ERROR_FAILURE;
   }
 
-  switch (aNSPRCode)
+  if (mozilla::psm::ErrorIsOverridable(aNSPRCode)) {
+    *aErrorClass = ERROR_CLASS_BAD_CERT;
+  } else {
+    *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
+  }
+
+  return NS_OK;
+}
+
+bool
+ErrorIsOverridable(PRErrorCode code)
+{
+  switch (code)
   {
     // Overridable errors.
-    case SEC_ERROR_UNKNOWN_ISSUER:
-    case SEC_ERROR_UNTRUSTED_ISSUER:
-    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
-    case SEC_ERROR_UNTRUSTED_CERT:
-    case SSL_ERROR_BAD_CERT_DOMAIN:
-    case SEC_ERROR_EXPIRED_CERTIFICATE:
-    case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
     case mozilla::pkix::MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY:
     case mozilla::pkix::MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE:
-    case mozilla::pkix::MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA:
     case mozilla::pkix::MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE:
     case mozilla::pkix::MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE:
-      *aErrorClass = ERROR_CLASS_BAD_CERT;
-      break;
+    case mozilla::pkix::MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA:
+    case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED:
+    case SEC_ERROR_EXPIRED_CERTIFICATE:
+    case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
+    case SEC_ERROR_INVALID_TIME:
+    case SEC_ERROR_UNKNOWN_ISSUER:
+    case SSL_ERROR_BAD_CERT_DOMAIN:
+      return true;
     // Non-overridable errors.
     default:
-      *aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
-      break;
+      return false;
   }
-  return NS_OK;
 }
 
 NS_IMETHODIMP
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/NSSErrorsService.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/NSSErrorsService.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/NSSErrorsService.h	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/NSSErrorsService.h	2015-02-28 15:03:00.000000000 +0000
@@ -38,6 +38,7 @@
 
 bool IsNSSErrorCode(PRErrorCode code);
 nsresult GetXPCOMFromNSSError(PRErrorCode code);
+bool ErrorIsOverridable(PRErrorCode code);
 
 } // psm
 } // mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/PSMContentListener.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/PSMContentListener.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/PSMContentListener.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/PSMContentListener.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -264,7 +264,7 @@
 }
 
 NS_IMETHODIMP
-PSMContentListener::DoContent(const char * aContentType,
+PSMContentListener::DoContent(const nsACString & aContentType,
                                bool aIsContentPreferred,
                                nsIRequest * aRequest,
                                nsIStreamListener ** aContentHandler,
@@ -272,7 +272,7 @@
 {
   PSMContentDownloader *downLoader;
   uint32_t type;
-  type = getPSMContentType(aContentType);
+  type = getPSMContentType(PromiseFlatCString(aContentType).get());
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("PSMContentListener::DoContent\n"));
   if (type != PSMContentDownloader::UNKNOWN_TYPE) {
     downLoader = new PSMContentDownloader(type);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/src/SSLServerCertVerification.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -265,14 +265,14 @@
                     uint32_t collectedErrors,
                     PRErrorCode errorCodeTrust,
                     PRErrorCode errorCodeMismatch,
-                    PRErrorCode errorCodeExpired,
+                    PRErrorCode errorCodeTime,
                     uint32_t providerFlags)
     : mFdForLogging(fdForLogging), mCert(cert), mInfoObject(infoObject),
       mDefaultErrorCodeToReport(defaultErrorCodeToReport),
       mCollectedErrors(collectedErrors),
       mErrorCodeTrust(errorCodeTrust),
       mErrorCodeMismatch(errorCodeMismatch),
-      mErrorCodeExpired(errorCodeExpired),
+      mErrorCodeTime(errorCodeTime),
       mProviderFlags(providerFlags)
   {
   }
@@ -289,7 +289,7 @@
   const uint32_t mCollectedErrors;
   const PRErrorCode mErrorCodeTrust;
   const PRErrorCode mErrorCodeMismatch;
-  const PRErrorCode mErrorCodeExpired;
+  const PRErrorCode mErrorCodeTime;
   const uint32_t mProviderFlags;
 };
 
@@ -313,6 +313,7 @@
     case mozilla::pkix::MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE: return 14;
     case mozilla::pkix::MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE:
       return 15;
+    case SEC_ERROR_INVALID_TIME: return 16;
   }
   NS_WARNING("Unknown certificate error code. Does MapCertErrorToProbeValue "
              "handle everything in DetermineCertOverrideErrors?");
@@ -325,14 +326,14 @@
                             /*out*/ uint32_t& collectedErrors,
                             /*out*/ PRErrorCode& errorCodeTrust,
                             /*out*/ PRErrorCode& errorCodeMismatch,
-                            /*out*/ PRErrorCode& errorCodeExpired)
+                            /*out*/ PRErrorCode& errorCodeTime)
 {
   MOZ_ASSERT(cert);
   MOZ_ASSERT(hostName);
   MOZ_ASSERT(collectedErrors == 0);
   MOZ_ASSERT(errorCodeTrust == 0);
   MOZ_ASSERT(errorCodeMismatch == 0);
-  MOZ_ASSERT(errorCodeExpired == 0);
+  MOZ_ASSERT(errorCodeTime == 0);
 
   // Assumes the error prioritization described in mozilla::pkix's
   // BuildForward function. Also assumes that CheckCertHostname was only
@@ -351,24 +352,28 @@
 
       SECCertTimeValidity validity = CERT_CheckCertValidTimes(cert, now, false);
       if (validity == secCertTimeUndetermined) {
-        PR_SetError(defaultErrorCodeToReport, 0);
+        // This only happens if cert is null. CERT_CheckCertValidTimes will
+        // have set the error code to SEC_ERROR_INVALID_ARGS. We should really
+        // be using mozilla::pkix here anyway.
+        MOZ_ASSERT(PR_GetError() == SEC_ERROR_INVALID_ARGS);
         return SECFailure;
       }
       if (validity == secCertTimeExpired) {
         collectedErrors |= nsICertOverrideService::ERROR_TIME;
-        errorCodeExpired = SEC_ERROR_EXPIRED_CERTIFICATE;
+        errorCodeTime = SEC_ERROR_EXPIRED_CERTIFICATE;
       } else if (validity == secCertTimeNotValidYet) {
         collectedErrors |= nsICertOverrideService::ERROR_TIME;
-        errorCodeExpired =
+        errorCodeTime =
           mozilla::pkix::MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE;
       }
       break;
     }
 
+    case SEC_ERROR_INVALID_TIME:
     case SEC_ERROR_EXPIRED_CERTIFICATE:
     case mozilla::pkix::MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE:
       collectedErrors = nsICertOverrideService::ERROR_TIME;
-      errorCodeExpired = defaultErrorCodeToReport;
+      errorCodeTime = defaultErrorCodeToReport;
       break;
 
     case SSL_ERROR_BAD_CERT_DOMAIN:
@@ -404,7 +409,7 @@
       collectedErrors |= nsICertOverrideService::ERROR_MISMATCH;
       errorCodeMismatch = SSL_ERROR_BAD_CERT_DOMAIN;
     } else if (result != Success) {
-      PR_SetError(defaultErrorCodeToReport, 0);
+      PR_SetError(MapResultToPRErrorCode(result), 0);
       return SECFailure;
     }
   }
@@ -501,8 +506,8 @@
         uint32_t probeValue = MapCertErrorToProbeValue(mErrorCodeMismatch);
         Telemetry::Accumulate(Telemetry::SSL_CERT_ERROR_OVERRIDES, probeValue);
       }
-      if (mErrorCodeExpired != 0) {
-        uint32_t probeValue = MapCertErrorToProbeValue(mErrorCodeExpired);
+      if (mErrorCodeTime != 0) {
+        uint32_t probeValue = MapCertErrorToProbeValue(mErrorCodeTime);
         Telemetry::Accumulate(Telemetry::SSL_CERT_ERROR_OVERRIDES, probeValue);
       }
 
@@ -544,7 +549,7 @@
   // pick the error code to report by priority
   PRErrorCode errorCodeToReport = mErrorCodeTrust    ? mErrorCodeTrust
                                 : mErrorCodeMismatch ? mErrorCodeMismatch
-                                : mErrorCodeExpired  ? mErrorCodeExpired
+                                : mErrorCodeTime     ? mErrorCodeTime
                                 : mDefaultErrorCodeToReport;
 
   SSLServerCertVerificationResult* result =
@@ -588,11 +593,18 @@
   uint32_t collected_errors = 0;
   PRErrorCode errorCodeTrust = 0;
   PRErrorCode errorCodeMismatch = 0;
-  PRErrorCode errorCodeExpired = 0;
+  PRErrorCode errorCodeTime = 0;
   if (DetermineCertOverrideErrors(cert, infoObject->GetHostNameRaw(), now,
                                   defaultErrorCodeToReport, collected_errors,
                                   errorCodeTrust, errorCodeMismatch,
-                                  errorCodeExpired) != SECSuccess) {
+                                  errorCodeTime) != SECSuccess) {
+    // Attempt to enforce that if DetermineCertOverrideErrors failed,
+    // PR_SetError was set with a non-overridable error. This is because if we
+    // return from CreateCertErrorRunnable without calling
+    // infoObject->SetStatusErrorBits, we won't have the required information
+    // to actually add a certificate error override. This results in a broken
+    // UI which is annoying but not a security disaster.
+    MOZ_ASSERT(!ErrorIsOverridable(PR_GetError()));
     return nullptr;
   }
 
@@ -618,7 +630,7 @@
                                static_cast<nsIX509Cert*>(nssCert.get()),
                                infoObject, defaultErrorCodeToReport,
                                collected_errors, errorCodeTrust,
-                               errorCodeMismatch, errorCodeExpired,
+                               errorCodeMismatch, errorCodeTime,
                                providerFlags);
 }
 
@@ -1096,12 +1108,14 @@
   ScopedCERTCertList certList;
   CertVerifier::OCSPStaplingStatus ocspStaplingStatus =
     CertVerifier::OCSP_STAPLING_NEVER_CHECKED;
+  KeySizeStatus keySizeStatus = KeySizeStatus::NeverChecked;
 
   rv = certVerifier.VerifySSLServerCert(cert, stapledOCSPResponse,
                                         time, infoObject,
                                         infoObject->GetHostNameRaw(),
                                         saveIntermediates, 0, &certList,
-                                        &evOidPolicy, &ocspStaplingStatus);
+                                        &evOidPolicy, &ocspStaplingStatus,
+                                        &keySizeStatus);
   PRErrorCode savedErrorCode;
   if (rv != SECSuccess) {
     savedErrorCode = PR_GetError();
@@ -1110,6 +1124,10 @@
   if (ocspStaplingStatus != CertVerifier::OCSP_STAPLING_NEVER_CHECKED) {
     Telemetry::Accumulate(Telemetry::SSL_OCSP_STAPLING, ocspStaplingStatus);
   }
+  if (keySizeStatus != KeySizeStatus::NeverChecked) {
+    Telemetry::Accumulate(Telemetry::CERT_CHAIN_KEY_SIZE_STATUS,
+                          static_cast<uint32_t>(keySizeStatus));
+  }
 
   // We want to remember the CA certs in the temp db, so that the application can find the
   // complete chain at any time it might need it.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/mochitest/browser/browser_bug627234_perwindowpb.js	2015-02-28 15:03:00.000000000 +0000
@@ -61,7 +61,7 @@
       // execute should only be called when need, like when you are opening
       // web pages on the test. If calling executeSoon() is not necesary, then
       // call whenNewWindowLoaded() instead of testOnWindow() on your test.
-      executeSoon(function() aCallback(aWin));
+      executeSoon(function() { aCallback(aWin); });
     });
   };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/head_psm.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/head_psm.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/head_psm.js	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/head_psm.js	2015-02-28 15:03:00.000000000 +0000
@@ -32,6 +32,7 @@
 
 // Sort in numerical order
 const SEC_ERROR_INVALID_ARGS                            = SEC_ERROR_BASE +   5; // -8187
+const SEC_ERROR_INVALID_TIME                            = SEC_ERROR_BASE +   8;
 const SEC_ERROR_BAD_DER                                 = SEC_ERROR_BASE +   9;
 const SEC_ERROR_EXPIRED_CERTIFICATE                     = SEC_ERROR_BASE +  11;
 const SEC_ERROR_REVOKED_CERTIFICATE                     = SEC_ERROR_BASE +  12; // -8180
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js	2015-02-19 00:42:05.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/test_cert_overrides.js	2015-02-28 15:03:00.000000000 +0000
@@ -66,6 +66,17 @@
   do_check_eq(histogram.counts[13], 1); // MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE
   do_check_eq(histogram.counts[14], 2); // MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE
   do_check_eq(histogram.counts[15], 1); // MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE
+  do_check_eq(histogram.counts[16], 2); // SEC_ERROR_INVALID_TIME
+
+  let keySizeHistogram = Cc["@mozilla.org/base/telemetry;1"]
+                           .getService(Ci.nsITelemetry)
+                           .getHistogramById("CERT_CHAIN_KEY_SIZE_STATUS")
+                           .snapshot();
+  do_check_eq(keySizeHistogram.counts[0], 0);
+  do_check_eq(keySizeHistogram.counts[1], 0); // 0 successful verifications of 2048-bit keys
+  do_check_eq(keySizeHistogram.counts[2], 4); // 4 successful verifications of 1024-bit keys
+  do_check_eq(keySizeHistogram.counts[3], 47); // 47 verification failures
+
   run_next_test();
 }
 
@@ -97,6 +108,9 @@
                          Ci.nsICertOverrideService.ERROR_TIME,
                          getXPCOMStatusFromNSS(
                            MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE));
+  add_cert_override_test("before-epoch.example.com",
+                         Ci.nsICertOverrideService.ERROR_TIME,
+                         getXPCOMStatusFromNSS(SEC_ERROR_INVALID_TIME));
   add_cert_override_test("selfsigned.example.com",
                          Ci.nsICertOverrideService.ERROR_UNTRUSTED,
                          getXPCOMStatusFromNSS(SEC_ERROR_UNKNOWN_ISSUER));
@@ -110,6 +124,9 @@
                          Ci.nsICertOverrideService.ERROR_UNTRUSTED,
                          getXPCOMStatusFromNSS(
                            MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE));
+  add_cert_override_test("before-epoch-issuer.example.com",
+                         Ci.nsICertOverrideService.ERROR_TIME,
+                         getXPCOMStatusFromNSS(SEC_ERROR_INVALID_TIME));
   add_cert_override_test("md5signature.example.com",
                          Ci.nsICertOverrideService.ERROR_UNTRUSTED,
                          getXPCOMStatusFromNSS(
@@ -128,6 +145,22 @@
   add_non_overridable_test("inadequatekeyusage.example.com",
                            SEC_ERROR_INADEQUATE_KEY_USAGE);
 
+  // This is intended to test the case where a verification has failed for one
+  // overridable reason (e.g. unknown issuer) but then, in the process of
+  // reporting that error, a non-overridable error is encountered. The
+  // non-overridable error should be prioritized.
+  add_test(function() {
+    let rootCert = constructCertFromFile("tlsserver/test-ca.der");
+    setCertTrust(rootCert, ",,");
+    run_next_test();
+  });
+  add_non_overridable_test("badSubjectAltNames.example.com", SEC_ERROR_BAD_DER);
+  add_test(function() {
+    let rootCert = constructCertFromFile("tlsserver/test-ca.der");
+    setCertTrust(rootCert, "CTu,,");
+    run_next_test();
+  });
+
   // Bug 990603: Apache documentation has recommended generating a self-signed
   // test certificate with basic constraints: CA:true. For compatibility, this
   // is a scenario in which an override is allowed.
@@ -205,20 +238,18 @@
   // Before we specifically distrust this certificate, it should be trusted.
   add_connection_test("untrusted.example.com", Cr.NS_OK);
 
-  add_distrust_override_test("tlsserver/default-ee.der",
-                             "untrusted.example.com",
-                             getXPCOMStatusFromNSS(SEC_ERROR_UNTRUSTED_CERT));
+  add_distrust_test("tlsserver/default-ee.der", "untrusted.example.com",
+                    SEC_ERROR_UNTRUSTED_CERT);
 
-  add_distrust_override_test("tlsserver/other-test-ca.der",
-                             "untrustedissuer.example.com",
-                             getXPCOMStatusFromNSS(SEC_ERROR_UNTRUSTED_ISSUER));
+  add_distrust_test("tlsserver/other-test-ca.der",
+                    "untrustedissuer.example.com", SEC_ERROR_UNTRUSTED_ISSUER);
 
-  add_distrust_override_test("tlsserver/test-ca.der",
-                             "ca-used-as-end-entity.example.com",
-                             getXPCOMStatusFromNSS(SEC_ERROR_UNTRUSTED_ISSUER));
+  add_distrust_test("tlsserver/test-ca.der",
+                    "ca-used-as-end-entity.example.com",
+                    SEC_ERROR_UNTRUSTED_ISSUER);
 }
 
-function add_distrust_override_test(certFileName, hostName, expectedResult) {
+function add_distrust_test(certFileName, hostName, expectedResult) {
   let certToDistrust = constructCertFromFile(certFileName);
 
   add_test(function () {
@@ -227,26 +258,9 @@
     clearSessionCache();
     run_next_test();
   });
-  add_connection_test(hostName, expectedResult, null,
-                      function (securityInfo) {
-                        securityInfo.QueryInterface(Ci.nsISSLStatusProvider);
-                        // XXX(Bug 754369): SSLStatus isn't available for
-                        // non-overridable errors.
-                        if (securityInfo.SSLStatus) {
-                          certOverrideService.rememberValidityOverride(
-                              hostName, 8443, securityInfo.SSLStatus.serverCert,
-                              Ci.nsICertOverrideService.ERROR_UNTRUSTED, true);
-                        } else {
-                          // A missing SSLStatus probably means (due to bug
-                          // 754369) that the error was non-overridable, which
-                          // is what we're trying to test, though we'd rather
-                          // not test it this way.
-                          do_check_neq(expectedResult, Cr.NS_OK);
-                        }
-                        clearSessionCache();
-                      });
-  add_connection_test(hostName, expectedResult, null,
-                      function () {
-                        setCertTrust(certToDistrust, "u,,");
-                      });
+  add_non_overridable_test(hostName, expectedResult);
+  add_test(function () {
+    setCertTrust(certToDistrust, "u,,");
+    run_next_test();
+  });
 }
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/tlsserver/cert9.db and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/tlsserver/cert9.db differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/tlsserver/cmd/BadCertServer.cpp	2015-02-28 15:03:00.000000000 +0000
@@ -29,11 +29,13 @@
 {
   { "expired.example.com", "expired" },
   { "notyetvalid.example.com", "notYetValid" },
+  { "before-epoch.example.com", "beforeEpoch" },
   { "selfsigned.example.com", "selfsigned" },
   { "unknownissuer.example.com", "unknownissuer" },
   { "mismatch.example.com", "mismatch" },
   { "expiredissuer.example.com", "expiredissuer" },
   { "notyetvalidissuer.example.com", "notYetValidIssuer" },
+  { "before-epoch-issuer.example.com", "beforeEpochIssuer" },
   { "md5signature.example.com", "md5signature" },
   { "untrusted.example.com", "localhostAndExampleCom" },
   { "untrustedissuer.example.com", "untrustedissuer" },
@@ -66,6 +68,7 @@
   { "nsCertTypeCritical.example.com", "nsCertTypeCritical" },
   { "end-entity-issued-by-v1-cert.example.com", "eeIssuedByV1Cert" },
   { "inadequate-key-size-ee.example.com", "inadequateKeySizeEE" },
+  { "badSubjectAltNames.example.com", "badSubjectAltNames" },
   { nullptr, nullptr }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/tlsserver/generate_certs.sh	2015-02-28 15:03:00.000000000 +0000
@@ -285,6 +285,13 @@
 
 $RUN_MOZILLA $CERTUTIL -d $DB_ARGUMENT -D -n deletedINT
 
+# certutil doesn't expose a way to directly specify a notBefore time.
+# Workaround this by just providing a large enough warp that the notBefore time
+# falls before the UNIX Epoch.
+make_EE beforeEpoch 'CN=Before UNIX Epoch Test End-entity' testCA "before-epoch.example.com" "-w -720 -v 960"
+make_INT beforeEpochINT 'CN=Before UNIX Epoch Test Intermediate' testCA "-w -720 -v 960"
+make_EE beforeEpochIssuer 'CN=Test End-entity with Before UNIX Epoch issuer' beforeEpochINT "before-epoch-issuer.example.com"
+
 make_INT expiredINT 'CN=Expired Test Intermediate' testCA "-w -400"
 make_EE expiredissuer 'CN=Test End-entity with expired issuer' expiredINT "expiredissuer.example.com"
 make_INT notYetValidINT 'CN=Not Yet Valid Test Intermediate' testCA "-w 400"
@@ -330,4 +337,6 @@
 make_EE eeIssuedByIntermediate 'CN=EE issued by intermediate' testINT "localhost"
 export_cert eeIssuedByIntermediate test-int-ee.der
 
+make_EE badSubjectAltNames 'CN=EE with bad subjectAltNames' testCA "*.*.example.com"
+
 cleanup
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/manager/ssl/tests/unit/tlsserver/key4.db and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/manager/ssl/tests/unit/tlsserver/key4.db differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/certutil/certutil.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/certutil/certutil.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/certutil/certutil.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/certutil/certutil.c	2015-02-28 15:03:00.000000000 +0000
@@ -40,7 +40,7 @@
 #define MIN_KEY_BITS		512
 /* MAX_KEY_BITS should agree with MAX_RSA_MODULUS in freebl */
 #define MAX_KEY_BITS		8192
-#define DEFAULT_KEY_BITS	1024
+#define DEFAULT_KEY_BITS	2048
 
 #define GEN_BREAK(e) rv=e; break;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/crlutil/crlgen.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/crlutil/crlgen.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/crlutil/crlgen.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/crlutil/crlgen.c	2015-02-28 15:03:00.000000000 +0000
@@ -1169,7 +1169,7 @@
 
     switch (crlGenData->contextId) {
       case CRLGEN_CHANGE_RANGE_CONTEXT:
-          if (dtype != CRLGEN_TYPE_DIGIT || dtype != CRLGEN_TYPE_DIGIT_RANGE) {
+          if (dtype != CRLGEN_TYPE_DIGIT && dtype != CRLGEN_TYPE_DIGIT_RANGE) {
               crlgen_PrintError(crlGenData->parsedLineNum,
                                 "range value should have "
                                 "numeric or numeric range values.\n");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/lib/secutil.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/lib/secutil.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/lib/secutil.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/lib/secutil.c	2015-02-28 15:03:00.000000000 +0000
@@ -2412,6 +2412,46 @@
 }
 
 int
+SECU_PrintCertificateBasicInfo(FILE *out, const SECItem *der, const char *m, int level)
+{
+    PLArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    CERTCertificate *c;
+    int rv = SEC_ERROR_NO_MEMORY;
+    int iv;
+    
+    if (!arena)
+	return rv;
+
+    /* Decode certificate */
+    c = PORT_ArenaZNew(arena, CERTCertificate);
+    if (!c)
+	goto loser;
+    c->arena = arena;
+    rv = SEC_ASN1DecodeItem(arena, c, 
+                            SEC_ASN1_GET(CERT_CertificateTemplate), der);
+    if (rv) {
+        SECU_Indent(out, level); 
+	SECU_PrintErrMsg(out, level, "Error", "Parsing extension");
+	SECU_PrintAny(out, der, "Raw", level);
+	goto loser;
+    }
+    /* Pretty print it out */
+    SECU_Indent(out, level); fprintf(out, "%s:\n", m);
+    SECU_PrintInteger(out, &c->serialNumber, "Serial Number", level+1);
+    SECU_PrintAlgorithmID(out, &c->signature, "Signature Algorithm", level+1);
+    SECU_PrintName(out, &c->issuer, "Issuer", level+1);
+    if (!SECU_GetWrapEnabled()) /*SECU_PrintName didn't add newline*/
+	SECU_Newline(out);
+    secu_PrintValidity(out, &c->validity, "Validity", level+1);
+    SECU_PrintName(out, &c->subject, "Subject", level+1);
+    if (!SECU_GetWrapEnabled()) /*SECU_PrintName didn't add newline*/
+	SECU_Newline(out);
+loser:
+    PORT_FreeArena(arena, PR_FALSE);
+    return rv;
+}
+
+int
 SECU_PrintSubjectPublicKeyInfo(FILE *out, SECItem *der, char *m, int level)
 {
     PLArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/lib/secutil.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/lib/secutil.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/lib/secutil.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/lib/secutil.h	2015-02-28 15:03:00.000000000 +0000
@@ -221,6 +221,9 @@
 extern int SECU_PrintCertificate(FILE *out, const SECItem *der, const char *m,
                                  int level);
 
+extern int SECU_PrintCertificateBasicInfo(FILE *out, const SECItem *der, const char *m,
+                                 int level);
+
 extern int SECU_PrintDumpDerIssuerAndSerial(FILE *out, SECItem *der, char *m,
                                  int level);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/pk12util/pk12util.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/pk12util/pk12util.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/pk12util/pk12util.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/pk12util/pk12util.c	2015-02-28 15:03:00.000000000 +0000
@@ -45,7 +45,7 @@
     FPS "\t\t [-c key_cipher] [-C cert_cipher]\n"
         "\t\t [-m | --key_len keyLen] [--cert_key_len certKeyLen] [-v]\n");
     FPS "\t\t [-k slotpwfile | -K slotpw]\n"
-		"\t\t [-w p12filepwfile | -W p12filefilepw]\n");
+        "\t\t [-w p12filepwfile | -W p12filepw]\n");
 
     exit(PK12UERR_USAGE);
 }
@@ -101,9 +101,6 @@
 p12u_InitContext(PRBool fileImport, char *filename)
 {
     p12uContext *p12cxt;
-    PRBool fileExist;
-
-    fileExist = fileImport;
 
     p12cxt = PORT_ZNew(p12uContext);
     if(!p12cxt) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/tstclnt/manifest.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/tstclnt/manifest.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/tstclnt/manifest.mn	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/tstclnt/manifest.mn	2015-02-28 15:03:00.000000000 +0000
@@ -17,6 +17,7 @@
 # DIRS = 
 
 CSRCS	= tstclnt.c  
+DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
 
 PROGRAM	= tstclnt
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/tstclnt/tstclnt.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/tstclnt/tstclnt.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/cmd/tstclnt/tstclnt.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/cmd/tstclnt/tstclnt.c	2015-02-28 15:03:00.000000000 +0000
@@ -32,6 +32,7 @@
 #include "ssl.h"
 #include "sslproto.h"
 #include "pk11func.h"
+#include "secmod.h"
 #include "plgetopt.h"
 #include "plstr.h"
 
@@ -97,6 +98,7 @@
 
 unsigned long __cmp_umuls;
 PRBool verbose;
+int dumpServerChain = 0;
 int renegotiationsToDo = 0;
 int renegotiationsDone = 0;
 
@@ -179,7 +181,8 @@
 {
     fprintf(stderr, 
 "Usage:  %s -h host [-a 1st_hs_name ] [-a 2nd_hs_name ] [-p port]\n"
-                    "[-d certdir] [-n nickname] [-Bafosvx] [-c ciphers] [-Y]\n"
+                    "[-D | -d certdir] [-C] [-b | -R root-module] \n"
+		    "[-n nickname] [-Bafosvx] [-c ciphers] [-Y]\n"
                     "[-V [min-version]:[max-version]] [-K] [-T]\n"
                     "[-r N] [-w passwd] [-W pwfile] [-q [-t seconds]]\n", 
             progName);
@@ -196,6 +199,12 @@
     fprintf(stderr, 
             "%-20s Directory with cert database (default is ~/.netscape)\n",
 	    "-d certdir");
+    fprintf(stderr, "%-20s Run without a cert database\n", "-D");
+    fprintf(stderr, "%-20s Load the default \"builtins\" root CA module\n", "-b");
+    fprintf(stderr, "%-20s Load the given root CA module\n", "-R");
+    fprintf(stderr, "%-20s Print certificate chain information\n", "-C");
+    fprintf(stderr, "%-20s (use -C twice to print more certificate details)\n", "");
+    fprintf(stderr, "%-20s (use -C three times to include PEM format certificate dumps)\n", "");
     fprintf(stderr, "%-20s Nickname of key and cert for client auth\n", 
                     "-n nickname");
     fprintf(stderr, 
@@ -500,12 +509,114 @@
         EXIT_CODE_SIDECHANNELTEST_REVOKED;
 }
 
+
+static void
+dumpCertificatePEM(CERTCertificate *cert)
+{
+    SECItem data;
+    data.data = cert->derCert.data;
+    data.len = cert->derCert.len;
+    fprintf(stderr, "%s\n%s\n%s\n", NS_CERT_HEADER, 
+	    BTOA_DataToAscii(data.data, data.len), NS_CERT_TRAILER);
+}
+
+static void
+dumpServerCertificateChain(PRFileDesc *fd)
+{
+    CERTCertList *peerCertChain = NULL;
+    CERTCertListNode *node = NULL;
+    CERTCertificate *peerCert = NULL;
+    CERTCertificateList *foundChain = NULL;
+    SECU_PPFunc dumpFunction = NULL;
+    PRBool dumpCertPEM = PR_FALSE;
+
+    if (!dumpServerChain) {
+	return;
+    }
+    else if (dumpServerChain == 1) {
+	dumpFunction = SECU_PrintCertificateBasicInfo;
+    } else {
+	dumpFunction = SECU_PrintCertificate;
+	if (dumpServerChain > 2) {
+	    dumpCertPEM = PR_TRUE;
+	}
+    }
+
+    SECU_EnableWrap(PR_FALSE);
+
+    fprintf(stderr, "==== certificate(s) sent by server: ====\n");
+    peerCertChain = SSL_PeerCertificateChain(fd);
+    if (peerCertChain) {
+        node = CERT_LIST_HEAD(peerCertChain);
+        while ( ! CERT_LIST_END(node, peerCertChain) ) {
+            CERTCertificate *cert = node->cert;
+            SECU_PrintSignedContent(stderr, &cert->derCert, "Certificate", 0,
+                                    dumpFunction);
+	    if (dumpCertPEM) {
+		dumpCertificatePEM(cert);
+	    }
+            node = CERT_LIST_NEXT(node);   
+        }
+    }
+
+    if (peerCertChain) {
+	peerCert = SSL_RevealCert(fd);
+	if (peerCert) {
+	    foundChain = CERT_CertChainFromCert(peerCert, certificateUsageSSLServer,
+						PR_TRUE);
+	}
+	if (foundChain) {
+	    int count = 0;
+	    fprintf(stderr, "==== locally found issuer certificate(s): ====\n");
+	    for(count = 0; count < (unsigned int)foundChain->len; count++) {
+		CERTCertificate *c;
+		PRBool wasSentByServer = PR_FALSE;
+		c = CERT_FindCertByDERCert(CERT_GetDefaultCertDB(), &foundChain->certs[count]);
+
+		node = CERT_LIST_HEAD(peerCertChain);
+		while ( ! CERT_LIST_END(node, peerCertChain) ) {
+		    CERTCertificate *cert = node->cert;
+		    if (CERT_CompareCerts(cert, c)) {
+			wasSentByServer = PR_TRUE;
+			break;
+		    }
+		    node = CERT_LIST_NEXT(node);   
+		}
+		
+		if (!wasSentByServer) {
+		    SECU_PrintSignedContent(stderr, &c->derCert, "Certificate", 0,
+					    dumpFunction);
+		    if (dumpCertPEM) {
+			dumpCertificatePEM(c);
+		    }
+		}
+		CERT_DestroyCertificate(c);
+	    }
+	    CERT_DestroyCertificateList(foundChain);
+	}
+	if (peerCert) {
+	    CERT_DestroyCertificate(peerCert);
+	}
+
+	CERT_DestroyCertList(peerCertChain);
+	peerCertChain = NULL;
+    }
+
+    fprintf(stderr, "==== end of certificate chain information ====\n");
+    fflush(stderr);
+}
+
 static SECStatus 
 ownAuthCertificate(void *arg, PRFileDesc *fd, PRBool checkSig,
                        PRBool isServer)
 {
     ServerCertAuth * serverCertAuth = (ServerCertAuth *) arg;
 
+    if (dumpServerChain) {
+	dumpServerCertificateChain(fd);
+    }
+
+
     if (!serverCertAuth->shouldPause) {
         CERTCertificate *cert;
         int i;
@@ -828,6 +939,9 @@
     PLOptState *optstate;
     PLOptStatus optstatus;
     PRStatus prStatus;
+    PRBool openDB = PR_TRUE;
+    PRBool loadDefaultRootCAs = PR_FALSE;
+    char *rootModule = NULL;
 
     serverCertAuth.shouldPause = PR_TRUE;
     serverCertAuth.isPaused = PR_FALSE;
@@ -854,7 +968,7 @@
     SSL_VersionRangeGetSupported(ssl_variant_stream, &enabledVersions);
 
     optstate = PL_CreateOptState(argc, argv,
-                                 "46BFKM:OSTV:W:Ya:c:d:fgh:m:n:op:qr:st:uvw:xz");
+                                 "46BCDFKM:OR:STV:W:Ya:bc:d:fgh:m:n:op:qr:st:uvw:xz");
     while ((optstatus = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
 	switch (optstate->option) {
 	  case '?':
@@ -865,6 +979,10 @@
 
           case 'B': bypassPKCS11 = 1; 			break;
 
+          case 'C': ++dumpServerChain; 			break;
+
+          case 'D': openDB = PR_FALSE; 			break;
+
           case 'F': if (serverCertAuth.testFreshStatusFromSideChannel) {
                         /* parameter given twice or more */
                         serverCertAuth.requireDataForIntermediates = PR_TRUE;
@@ -895,6 +1013,8 @@
                     };
                     break;
 
+          case 'R': rootModule = PORT_Strdup(optstate->value); break;
+
           case 'S': skipProtoHeader = PR_TRUE;                 break;
 
           case 'T': enableCertStatus = 1;               break;
@@ -917,6 +1037,8 @@
                     }
                     break;
 
+          case 'b': loadDefaultRootCAs = PR_TRUE;                 break;
+
           case 'c': cipherString = PORT_Strdup(optstate->value); break;
 
           case 'g': enableFalseStart = 1; 		break;
@@ -972,8 +1094,10 @@
     if (optstatus == PL_OPT_BAD)
 	Usage(progName);
 
-    if (!host || !portno) 
+    if (!host || !portno) {
+        fprintf(stderr, "%s: parameters -h and -p are mandatory\n", progName);
     	Usage(progName);
+    }
 
     if (serverCertAuth.testFreshStatusFromSideChannel
         && serverCertAuth.shouldPause) {
@@ -981,6 +1105,16 @@
         exit(1);
     }
 
+    if (certDir && !openDB) {
+        fprintf(stderr, "%s: Cannot combine parameters -D and -d\n", progName);
+        exit(1);
+    }
+
+    if (rootModule && loadDefaultRootCAs) {
+        fprintf(stderr, "%s: Cannot combine parameters -b and -R\n", progName);
+        exit(1);
+    }
+
     PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
 
     PK11_SetPasswordFunc(SECU_GetModulePassword);
@@ -1073,10 +1207,26 @@
         certDir = SECU_ConfigDirectory(certDirTmp);
         PORT_Free(certDirTmp);
     }
-    rv = NSS_Init(certDir);
-    if (rv != SECSuccess) {
-        SECU_PrintError(progName, "unable to open cert database");
-        return 1;
+
+    if (openDB) {
+	rv = NSS_Init(certDir);
+	if (rv != SECSuccess) {
+	    SECU_PrintError(progName, "unable to open cert database");
+	    return 1;
+	}
+    } else {
+	rv = NSS_NoDB_Init(NULL);
+	if (rv != SECSuccess) {
+	    SECU_PrintError(progName, "failed to initialize NSS");
+	    return 1;
+	}
+    }
+
+    if (loadDefaultRootCAs) {
+	SECMOD_AddNewModule("Builtins",
+			    DLL_PREFIX"nssckbi."DLL_SUFFIX, 0, 0);
+    } else if (rootModule) {
+	SECMOD_AddNewModule("Builtins", rootModule, 0, 0);
     }
 
     /* set the policy bits true for all the cipher suites. */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/coreconf/coreconf.dep thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/coreconf/coreconf.dep
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/coreconf/coreconf.dep	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/coreconf/coreconf.dep	2015-02-28 15:03:00.000000000 +0000
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/coreconf/Darwin.mk thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/coreconf/Darwin.mk
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/coreconf/Darwin.mk	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/coreconf/Darwin.mk	2015-02-28 15:03:00.000000000 +0000
@@ -116,3 +116,22 @@
 
 USE_SYSTEM_ZLIB = 1
 ZLIB_LIBS	= -lz
+
+# The system sqlite library in the latest version of Mac OS X often becomes
+# newer than the sqlite library in NSS. This may result in certain Mac OS X
+# system libraries having unresolved sqlite symbols during the shlibsign step
+# of the NSS build when we set DYLD_LIBRARY_PATH to the NSS lib directory and
+# the NSS libsqlite3.dylib is used instead of the system one. So just use the
+# system sqlite library on Mac, if it's sufficiently new.
+
+SYS_SQLITE3_VERSION_FULL := $(shell /usr/bin/sqlite3 -version | awk '{print $$1}')
+SYS_SQLITE3_VERSION_MAJOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$1 }')
+SYS_SQLITE3_VERSION_MINOR := $(shell echo $(SYS_SQLITE3_VERSION_FULL) | awk -F. '{ print $$2 }')
+
+ifeq (3,$(SYS_SQLITE3_VERSION_MAJOR))
+    ifeq (,$(filter-out 0 1 2 3 4,$(SYS_SQLITE3_VERSION_MINOR)))
+        # sqlite <= 3.4.x is too old, it doesn't provide sqlite3_file_control
+    else
+        NSS_USE_SYSTEM_SQLITE = 1
+    endif
+endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/doc/certutil.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/doc/certutil.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/doc/certutil.xml	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/doc/certutil.xml	2015-02-28 15:03:00.000000000 +0000
@@ -247,7 +247,7 @@
 
       <varlistentry>
         <term>-g keysize</term>
-        <listitem><para>Set a key size to use when generating new public and private key pairs. The minimum is 512 bits and the maximum is 16384 bits. The default is 1024 bits. Any size between the minimum and maximum is allowed.</para></listitem>
+        <listitem><para>Set a key size to use when generating new public and private key pairs. The minimum is 512 bits and the maximum is 16384 bits. The default is 2048 bits. Any size between the minimum and maximum is allowed.</para></listitem>
       </varlistentry>
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/doc/html/certutil.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/doc/html/certutil.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/doc/html/certutil.html	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/doc/html/certutil.html	2015-02-28 15:03:00.000000000 +0000
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>CERTUTIL</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"><link rel="home" href="index.html" title="CERTUTIL"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">CERTUTIL</th></tr></table><hr></div><div class="refentry"><a name="certutil"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>certutil — Manage keys and certificate in both NSS databases and other NSS tokens</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">certutil</code>  [<em class="replaceable"><code>options</code></em>] [[<em class="replaceable"><code>arguments</code></em>]]</p></div></div><div class="refsection"><a name="idp47645360"></a><h2>STATUS</h2><p>This documentation is still work in progress. Please contribute to the initial review in <a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=836477" target="_top">Mozilla NSS bug 836477</a>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>CERTUTIL</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.1"><link rel="home" href="index.html" title="CERTUTIL"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">CERTUTIL</th></tr></table><hr></div><div class="refentry"><a name="certutil"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>certutil — Manage keys and certificate in both NSS databases and other NSS tokens</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">certutil</code>  [<em class="replaceable"><code>options</code></em>] [[<em class="replaceable"><code>arguments</code></em>]]</p></div></div><div class="refsection"><a name="idm139713586320592"></a><h2>STATUS</h2><p>This documentation is still work in progress. Please contribute to the initial review in <a class="ulink" href="https://bugzilla.mozilla.org/show_bug.cgi?id=836477" target="_top">Mozilla NSS bug 836477</a>
     </p></div><div class="refsection"><a name="description"></a><h2>Description</h2><p>The Certificate Database Tool, <span class="command"><strong>certutil</strong></span>, is a command-line utility that can create and modify certificate and key databases. It can specifically list, generate, modify, or delete certificates, create or change the password, generate new public and private key pairs, display the contents of the key database, or delete key pairs within the key database.</p><p>Certificate issuance, part of the key and certificate management process, requires that keys and certificates be created in the key database. This document discusses certificate and key database management. For information on the security module database management, see the <span class="command"><strong>modutil</strong></span> manpage.</p></div><div class="refsection"><a name="options"></a><h2>Command Options and Arguments</h2><p>Running <span class="command"><strong>certutil</strong></span> always requires one and only one command option to specify the type of certificate operation. Each command option may take zero or more arguments. The command option <code class="option">-H</code> will list all the command options and their relevant arguments.</p><p><span class="command"><strong>Command Options</strong></span></p><div class="variablelist"><dl class="variablelist"><dt><span class="term">-A </span></dt><dd><p>Add an existing certificate to a certificate database. The certificate database should already exist; if one is not present, this command option will initialize one by default.</p></dd><dt><span class="term">-B</span></dt><dd><p>Run a series of commands from the specified batch file. This requires the <code class="option">-i</code> argument.</p></dd><dt><span class="term">-C </span></dt><dd><p>Create a new binary certificate file from a binary certificate request file. Use the <code class="option">-i</code> argument to specify the certificate request file. If this argument is not used, <span class="command"><strong>certutil</strong></span> prompts for a filename. </p></dd><dt><span class="term">-D </span></dt><dd><p>Delete a certificate from the certificate database.</p></dd><dt><span class="term">-E </span></dt><dd><p>Add an email certificate to the certificate database.</p></dd><dt><span class="term">-F</span></dt><dd><p>Delete a private key from a key database. Specify the key to delete with the -n argument. Specify the database from which to delete the key with the 
 <code class="option">-d</code> argument. Use the <code class="option">-k</code> argument to specify explicitly whether to delete a DSA, RSA, or ECC key. If you don't use the <code class="option">-k</code> argument, the option looks for an RSA key matching the specified nickname. 
 </p><p>
@@ -14,7 +14,7 @@
 Add one or multiple extensions that certutil cannot encode yet, by loading their encodings from external files.
            </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>OID (example): 1.2.3.4</p></li><li class="listitem"><p>critical-flag: critical or not-critical</p></li><li class="listitem"><p>filename: full path to a file containing an encoded extension</p></li></ul></div></dd><dt><span class="term">-f password-file</span></dt><dd><p>Specify a file that will automatically supply the password to include in a certificate 
  or to access a certificate database. This is a plain-text file containing one password. Be sure to prevent 
- unauthorized access to this file.</p></dd><dt><span class="term">-g keysize</span></dt><dd><p>Set a key size to use when generating new public and private key pairs. The minimum is 512 bits and the maximum is 16384 bits. The default is 1024 bits. Any size between the minimum and maximum is allowed.</p></dd><dt><span class="term">-h tokenname</span></dt><dd><p>Specify the name of a token to use or act on. If not specified the default token is the internal database slot.</p></dd><dt><span class="term">-i input_file</span></dt><dd><p>Pass an input file to the command. Depending on the command option, an input file can be a specific certificate, a certificate request file, or a batch file of commands.</p></dd><dt><span class="term">-k key-type-or-id</span></dt><dd><p>Specify the type or specific ID of a key.</p><p>
+ unauthorized access to this file.</p></dd><dt><span class="term">-g keysize</span></dt><dd><p>Set a key size to use when generating new public and private key pairs. The minimum is 512 bits and the maximum is 16384 bits. The default is 2048 bits. Any size between the minimum and maximum is allowed.</p></dd><dt><span class="term">-h tokenname</span></dt><dd><p>Specify the name of a token to use or act on. If not specified the default token is the internal database slot.</p></dd><dt><span class="term">-i input_file</span></dt><dd><p>Pass an input file to the command. Depending on the command option, an input file can be a specific certificate, a certificate request file, or a batch file of commands.</p></dd><dt><span class="term">-k key-type-or-id</span></dt><dd><p>Specify the type or specific ID of a key.</p><p>
            The valid key type options are rsa, dsa, ec, or all. The default 
            value is rsa. Specifying the type of key can avoid mistakes caused by
            duplicate nicknames. Giving a key type generates a new key pair; 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/doc/nroff/certutil.1 thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/doc/nroff/certutil.1
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/doc/nroff/certutil.1	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/doc/nroff/certutil.1	2015-02-28 15:03:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: CERTUTIL
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date:  7 January 2015
+.\"      Date: 23 February 2015
 .\"    Manual: NSS Security Tools
 .\"    Source: nss-tools
 .\"  Language: English
 .\"
-.TH "CERTUTIL" "1" "7 January 2015" "nss-tools" "NSS Security Tools"
+.TH "CERTUTIL" "1" "23 February 2015" "nss-tools" "NSS Security Tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -310,7 +310,7 @@
 .PP
 \-g keysize
 .RS 4
-Set a key size to use when generating new public and private key pairs\&. The minimum is 512 bits and the maximum is 16384 bits\&. The default is 1024 bits\&. Any size between the minimum and maximum is allowed\&.
+Set a key size to use when generating new public and private key pairs\&. The minimum is 512 bits and the maximum is 16384 bits\&. The default is 2048 bits\&. Any size between the minimum and maximum is allowed\&.
 .RE
 .PP
 \-h tokenname
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/gtest_utils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/gtest_utils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/gtest_utils.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/gtest_utils.h	2015-02-28 15:03:01.000000000 +0000
@@ -7,6 +7,10 @@
 #ifndef gtest_utils_h__
 #define gtest_utils_h__
 
+#define GTEST_HAS_RTTI 0
+#include "gtest/gtest.h"
+#include "test_io.h"
+
 namespace nss_test {
 
 // Gtest utilities
@@ -16,6 +20,9 @@
     Poller::Instance()->SetTimer(timer_ms, this, &Timeout::ExpiredCallback,
                                  &handle_);
   }
+  ~Timeout() {
+    Cancel();
+  }
 
   static void ExpiredCallback(PollTarget* target, Event event) {
     Timeout* timeout = static_cast<Timeout*>(target);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/ssl_gtest.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/ssl_gtest.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/ssl_gtest.cc	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/ssl_gtest.cc	2015-02-28 15:03:01.000000000 +0000
@@ -2,6 +2,8 @@
 #include "nss.h"
 #include "ssl.h"
 
+#include <cstdlib>
+
 #include "test_io.h"
 
 #define GTEST_HAS_RTTI 0
@@ -14,6 +16,10 @@
   ::testing::InitGoogleTest(&argc, argv);
   g_working_dir_path = ".";
 
+  char* workdir = getenv("NSS_GTEST_WORKDIR");
+  if (workdir)
+    g_working_dir_path = workdir;
+
   for (int i = 0; i < argc; i++) {
     if (!strcmp(argv[i], "-d")) {
       g_working_dir_path = argv[i + 1];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/ssl_loopback_unittest.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/ssl_loopback_unittest.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/ssl_loopback_unittest.cc	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/ssl_loopback_unittest.cc	2015-02-28 15:03:01.000000000 +0000
@@ -20,6 +20,13 @@
 
 namespace nss_test {
 
+enum SessionResumptionMode {
+  RESUME_NONE = 0,
+  RESUME_SESSIONID = 1,
+  RESUME_TICKET = 2,
+  RESUME_BOTH = RESUME_SESSIONID | RESUME_TICKET
+};
+
 #define LOG(a) std::cerr << name_ << ": " << a << std::endl;
 
 // Inspector that parses out DTLS records and passes
@@ -306,22 +313,6 @@
     return true;
   }
 
-  void SetSessionTicketsEnabled(bool en) {
-    ASSERT_TRUE(EnsureTlsSetup());
-
-    SECStatus rv = SSL_OptionSet(ssl_fd_, SSL_ENABLE_SESSION_TICKETS,
-                                  en ? PR_TRUE : PR_FALSE);
-    ASSERT_EQ(SECSuccess, rv);
-  }
-
-  void SetSessionCacheEnabled(bool en) {
-    ASSERT_TRUE(EnsureTlsSetup());
-
-    SECStatus rv = SSL_OptionSet(ssl_fd_, SSL_NO_CACHE,
-                                  en ? PR_FALSE : PR_TRUE);
-    ASSERT_EQ(SECSuccess, rv);
-  }
-
   void SetVersionRange(uint16_t minver, uint16_t maxver) {
     SSLVersionRange range = {minver, maxver};
     ASSERT_EQ(SECSuccess, SSL_VersionRangeSet(ssl_fd_, &range));
@@ -366,6 +357,7 @@
     ASSERT_EQ(version, info_.protocolVersion);
   }
 
+
   void Handshake() {
     SECStatus rv = SSL_ForceHandshake(ssl_fd_);
     if (rv == SECSuccess) {
@@ -404,6 +396,22 @@
                                 info_.sessionID + info_.sessionIDLength);
   }
 
+  void ConfigureSessionCache(SessionResumptionMode mode) {
+    ASSERT_TRUE(EnsureTlsSetup());
+
+    SECStatus rv = SSL_OptionSet(ssl_fd_,
+                                 SSL_NO_CACHE,
+                                 mode & RESUME_SESSIONID ?
+                                 PR_FALSE : PR_TRUE);
+    ASSERT_EQ(SECSuccess, rv);
+
+    rv = SSL_OptionSet(ssl_fd_,
+                       SSL_ENABLE_SESSION_TICKETS,
+                       mode & RESUME_TICKET ?
+                       PR_TRUE : PR_FALSE);
+    ASSERT_EQ(SECSuccess, rv);
+  }
+
  private:
   const static char* states[];
 
@@ -460,6 +468,10 @@
     // Configure a fresh session cache.
     SSL_ConfigServerSessionIDCache(1024, 0, 0, g_working_dir_path.c_str());
 
+    // Clear statistics.
+    SSL3Statistics* stats = SSL_GetStatistics();
+    memset(stats, 0, sizeof(*stats));
+
     Init();
   }
 
@@ -467,6 +479,7 @@
     client_ = nullptr;
     server_ = nullptr;
 
+    SSL_ClearSessionCache();
     SSL_ShutdownServerSessionIDCache();
   }
 
@@ -520,7 +533,7 @@
     std::vector<uint8_t> sid_s1 = server_->GetSessionId();
     ASSERT_EQ(32, sid_s1.size());
     ASSERT_EQ(sid_c1, sid_s1);
-    session_id_ = sid_c1;
+    session_ids_.push_back(sid_c1);
   }
 
   void EnableSomeECDHECiphers() {
@@ -528,11 +541,38 @@
     server_->EnableSomeECDHECiphers();
   }
 
+  void ConfigureSessionCache(SessionResumptionMode client,
+                             SessionResumptionMode server) {
+    client_->ConfigureSessionCache(client);
+    server_->ConfigureSessionCache(server);
+  }
+
+  void CheckResumption(SessionResumptionMode expected) {
+    ASSERT_NE(RESUME_BOTH, expected);
+
+    int resume_ct = expected != 0;
+    int stateless_ct = (expected & RESUME_TICKET) ? 1 : 0;
+
+    SSL3Statistics* stats = SSL_GetStatistics();
+    ASSERT_EQ(resume_ct, stats->hch_sid_cache_hits);
+    ASSERT_EQ(resume_ct, stats->hsh_sid_cache_hits);
+
+    ASSERT_EQ(stateless_ct, stats->hch_sid_stateless_resumes);
+    ASSERT_EQ(stateless_ct, stats->hsh_sid_stateless_resumes);
+
+    if (resume_ct) {
+      // Check that the last two session ids match.
+      ASSERT_GE(2, session_ids_.size());
+      ASSERT_EQ(session_ids_[session_ids_.size()-1],
+                session_ids_[session_ids_.size()-2]);
+    }
+  }
+
  protected:
   Mode mode_;
   TlsAgent* client_;
   TlsAgent* server_;
-  std::vector<uint8_t> session_id_;
+  std::vector<std::vector<uint8_t>> session_ids_;
 };
 
 class TlsConnectTest : public TlsConnectTestBase {
@@ -568,23 +608,102 @@
 }
 
 TEST_P(TlsConnectGeneric, ConnectResumed) {
+  ConfigureSessionCache(RESUME_SESSIONID, RESUME_SESSIONID);
+  Connect();
+
+  Reset();
+  Connect();
+  CheckResumption(RESUME_SESSIONID);
+}
+
+TEST_P(TlsConnectGeneric, ConnectClientCacheDisabled) {
+  ConfigureSessionCache(RESUME_NONE, RESUME_SESSIONID);
+  Connect();
+  Reset();
+  Connect();
+  CheckResumption(RESUME_NONE);
+}
+
+TEST_P(TlsConnectGeneric, ConnectServerCacheDisabled) {
+  ConfigureSessionCache(RESUME_SESSIONID, RESUME_NONE);
+  Connect();
+  Reset();
+  Connect();
+  CheckResumption(RESUME_NONE);
+}
+
+TEST_P(TlsConnectGeneric, ConnectSessionCacheDisabled) {
+  ConfigureSessionCache(RESUME_NONE, RESUME_NONE);
+  Connect();
+  Reset();
+  Connect();
+  CheckResumption(RESUME_NONE);
+}
+
+TEST_P(TlsConnectGeneric, ConnectResumeSupportBoth) {
+  // This prefers tickets.
+  ConfigureSessionCache(RESUME_BOTH, RESUME_BOTH);
+  Connect();
+
+  Reset();
+  ConfigureSessionCache(RESUME_BOTH, RESUME_BOTH);
+  Connect();
+  CheckResumption(RESUME_TICKET);
+}
+
+TEST_P(TlsConnectGeneric, ConnectResumeClientTicketServerBoth) {
+  // This causes no resumption because the client needs the
+  // session cache to resume even with tickets.
+  ConfigureSessionCache(RESUME_TICKET, RESUME_BOTH);
   Connect();
-  std::vector<uint8_t> old_sid = session_id_;
 
   Reset();
+  ConfigureSessionCache(RESUME_TICKET, RESUME_BOTH);
   Connect();
-  ASSERT_EQ(old_sid, session_id_) << "Session was not resumed when it should have been";
+  CheckResumption(RESUME_NONE);
 }
 
-TEST_P(TlsConnectGeneric, ConnectNotResumed) {
+TEST_P(TlsConnectGeneric, ConnectResumeClientBothTicketServerTicket) {
+  // This causes a ticket resumption.
+  ConfigureSessionCache(RESUME_BOTH, RESUME_TICKET);
   Connect();
-  std::vector<uint8_t> old_sid = session_id_;
 
   Reset();
-  client_->SetSessionCacheEnabled(false);
+  ConfigureSessionCache(RESUME_BOTH, RESUME_TICKET);
+  Connect();
+  CheckResumption(RESUME_TICKET);
+}
+
+TEST_P(TlsConnectGeneric, ConnectClientServerTicketOnly) {
+  // This causes no resumption because the client needs the
+  // session cache to resume even with tickets.
+  ConfigureSessionCache(RESUME_TICKET, RESUME_TICKET);
+  Connect();
+
+  Reset();
+  ConfigureSessionCache(RESUME_TICKET, RESUME_TICKET);
+  Connect();
+  CheckResumption(RESUME_NONE);
+}
+
+TEST_P(TlsConnectGeneric, ConnectClientBothServerNone) {
+  ConfigureSessionCache(RESUME_BOTH, RESUME_NONE);
   Connect();
 
-  ASSERT_NE(old_sid, session_id_) << "Session was resumed when it should not have been";
+  Reset();
+  ConfigureSessionCache(RESUME_BOTH, RESUME_NONE);
+  Connect();
+  CheckResumption(RESUME_NONE);
+}
+
+TEST_P(TlsConnectGeneric, ConnectClientNoneServerBoth) {
+  ConfigureSessionCache(RESUME_NONE, RESUME_BOTH);
+  Connect();
+
+  Reset();
+  ConfigureSessionCache(RESUME_NONE, RESUME_BOTH);
+  Connect();
+  CheckResumption(RESUME_NONE);
 }
 
 TEST_P(TlsConnectGeneric, ConnectTLS_1_1_Only) {
@@ -632,7 +751,7 @@
       new TlsInspectorRecordHandshakeMessage(kTlsHandshakeServerKeyExchange);
   server_->SetInspector(i2);
   EnableSomeECDHECiphers();
-  client_->SetSessionCacheEnabled(false);
+  ConfigureSessionCache(RESUME_NONE, RESUME_NONE);
   Connect();
   client_->CheckKEAType(ssl_kea_ecdh);
 
@@ -666,7 +785,7 @@
   TlsInspectorRecordHandshakeMessage* i2 =
       new TlsInspectorRecordHandshakeMessage(kTlsHandshakeServerKeyExchange);
   server_->SetInspector(i2);
-  client_->SetSessionCacheEnabled(false);
+  ConfigureSessionCache(RESUME_NONE, RESUME_NONE);
   Connect();
   client_->CheckKEAType(ssl_kea_ecdh);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/test_io.cc thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/test_io.cc
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/external_tests/ssl_gtest/test_io.cc	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/external_tests/ssl_gtest/test_io.cc	2015-02-28 15:03:01.000000000 +0000
@@ -438,7 +438,9 @@
 
     Timer *timer = timers_.top();
     timers_.pop();
-    timer->callback_(timer->target_, TIMER_EVENT);
+    if (timer->callback_) {
+      timer->callback_(timer->target_, TIMER_EVENT);
+    }
     delete timer;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/certdb.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/certdb.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/certdb.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/certdb.c	2015-02-28 15:03:01.000000000 +0000
@@ -1051,6 +1051,11 @@
     PRTime notBefore, notAfter, llPendingSlop, tmp1;
     SECStatus rv;
 
+    if (!crl) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return(secCertTimeUndetermined);
+    }
+
     rv = SEC_GetCrlTimes(crl, &notBefore, &notAfter);
     
     if (rv) {
@@ -1063,6 +1068,7 @@
     LL_MUL(llPendingSlop, llPendingSlop, tmp1);
     LL_SUB(notBefore, notBefore, llPendingSlop);
     if ( LL_CMP( t, <, notBefore ) ) {
+	PORT_SetError(SEC_ERROR_CRL_EXPIRED);
 	return(secCertTimeNotValidYet);
     }
 
@@ -1074,6 +1080,7 @@
     }
 
     if ( LL_CMP( t, >, notAfter) ) {
+	PORT_SetError(SEC_ERROR_CRL_EXPIRED);
 	return(secCertTimeExpired);
     }
 
@@ -1425,7 +1432,6 @@
     CERTGeneralName * current;
     char *            cn;
     int               cnBufLen;
-    unsigned int      hnLen;
     int               DNSextCount    = 0;
     int               IPextCount     = 0;
     PRBool            isIPaddr       = PR_FALSE;
@@ -1435,7 +1441,6 @@
     char              cnbuf[128];
 
     subAltName.data = NULL;
-    hnLen    = strlen(hn);
     cn       = cnbuf;
     cnBufLen = sizeof cnbuf;
 
@@ -2311,7 +2316,7 @@
 {
     unsigned int i;
     unsigned int *pflags;
-    
+
     if (!trust) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return SECFailure;
@@ -2325,7 +2330,7 @@
     }
 
     pflags = &trust->sslFlags;
-    
+
     for (i=0; i < PORT_Strlen(trusts); i++) {
 	switch (trusts[i]) {
 	  case 'p':
@@ -2371,6 +2376,7 @@
 	      }
 	      break;
 	  default:
+              PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	      return SECFailure;
 	}
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/cert.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/cert.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/cert.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/cert.h	2015-02-28 15:03:01.000000000 +0000
@@ -929,14 +929,13 @@
 
 extern char * CERT_FindNSStringExtension (CERTCertificate *cert, int oidtag);
 
-extern SECStatus CERT_FindIssuerCertExtension
-   (CERTCertificate *cert, int tag, SECItem *value);
-
 extern SECStatus CERT_FindCertExtensionByOID
    (CERTCertificate *cert, SECItem *oid, SECItem *value);
 
-extern char *CERT_FindCertURLExtension (CERTCertificate *cert, int tag, 
-								int catag);
+/* Find a URL extension in the cert.
+** The caller must free the result string using PORT_Free.
+*/
+extern char *CERT_FindCertURLExtension (CERTCertificate *cert, SECOidTag tag);
 
 /* Returns the decoded value of the authKeyID extension.
 **   Note that this uses passed in the arena to allocate storage for the result
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/certi.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/certi.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/certi.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/certi.h	2015-02-28 15:03:01.000000000 +0000
@@ -116,11 +116,16 @@
 #else
     PRLock* lock;
 #endif
-    CERTCertificate* issuer;    /* issuer cert
-                                   XXX there may be multiple issuer certs,
-                                       with different validity dates. Also
-                                       need to deal with SKID/AKID . See
-                                       bugzilla 217387, 233118 */
+    SECItem *issuerDERCert;    /* issuer DER cert. Don't hold a reference
+				  to the actual cert so the trust can be
+				  updated on the cert automatically.
+				  XXX there may be multiple issuer certs,
+				  with different validity dates. Also
+				  need to deal with SKID/AKID . See
+				  bugzilla 217387, 233118 */
+
+    CERTCertDBHandle *dbHandle;
+
     SECItem* subject;           /* DER of issuer subject */
     SECItem* distributionPoint; /* DER of distribution point. This may be
                                    NULL when distribution points aren't
@@ -165,15 +170,6 @@
 struct CRLIssuerCacheStr {
     SECItem* subject;           /* DER of issuer subject */
     CRLDPCache* dpp;
-#if 0
-    /* XCRL for future use.
-       We don't need to lock at the moment because we only have one DP,
-       which gets created at the same time as this object */
-    NSSRWLock* lock;
-    CRLDPCache** dps;
-    PLHashTable* distributionpoints;
-    CERTCertificate* issuer;
-#endif
 };
 
 /*  CRL revocation cache object
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/certv3.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/certv3.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/certv3.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/certv3.c	2015-02-28 15:03:01.000000000 +0000
@@ -43,71 +43,31 @@
     return (cert_StartExtensions ((void *)cert, cert->arena, SetExts));
 }
 
-/* find the given extension in the certificate of the Issuer of 'cert' */
-SECStatus
-CERT_FindIssuerCertExtension(CERTCertificate *cert, int tag, SECItem *value)
-{
-    CERTCertificate *issuercert;
-    SECStatus rv;
-
-    issuercert = CERT_FindCertByName(cert->dbhandle, &cert->derIssuer);
-    if ( issuercert ) {
-	rv = cert_FindExtension(issuercert->extensions, tag, value);
-	CERT_DestroyCertificate(issuercert);
-    } else {
-	rv = SECFailure;
-    }
-    
-    return(rv);
-}
-
-/* find a URL extension in the cert or its CA
- * apply the base URL string if it exists
+/* find a URL extension in the cert
  */
 char *
-CERT_FindCertURLExtension(CERTCertificate *cert, int tag, int catag)
+CERT_FindCertURLExtension(CERTCertificate *cert, SECOidTag tag)
 {
     SECStatus rv;
     SECItem urlitem = {siBuffer,0};
-    SECItem baseitem = {siBuffer,0};
     SECItem urlstringitem = {siBuffer,0};
-    SECItem basestringitem = {siBuffer,0};
     PLArenaPool *arena = NULL;
-    PRBool hasbase;
-    char *urlstring;
+    char *urlstring = NULL;
     char *str;
     int len;
-    unsigned int i;
     
-    urlstring = NULL;
+    if (!cert) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return NULL;
+    }
 
     arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     if ( ! arena ) {
 	goto loser;
     }
     
-    hasbase = PR_FALSE;
-    
     rv = cert_FindExtension(cert->extensions, tag, &urlitem);
-    if ( rv == SECSuccess ) {
-	rv = cert_FindExtension(cert->extensions, SEC_OID_NS_CERT_EXT_BASE_URL,
-				   &baseitem);
-	if ( rv == SECSuccess ) {
-	    hasbase = PR_TRUE;
-	}
-	
-    } else if ( catag ) {
-	/* if the cert doesn't have the extensions, see if the issuer does */
-	rv = CERT_FindIssuerCertExtension(cert, catag, &urlitem);
-	if ( rv != SECSuccess ) {
-	    goto loser;
-	}	    
-	rv = CERT_FindIssuerCertExtension(cert, SEC_OID_NS_CERT_EXT_BASE_URL,
-					 &baseitem);
-	if ( rv == SECSuccess ) {
-	    hasbase = PR_TRUE;
-	}
-    } else {
+    if ( rv != SECSuccess ) {
 	goto loser;
     }
 
@@ -117,42 +77,15 @@
     if ( rv != SECSuccess ) {
 	goto loser;
     }
-    if ( hasbase ) {
-	rv = SEC_QuickDERDecodeItem(arena, &basestringitem,
-                                    SEC_ASN1_GET(SEC_IA5StringTemplate),
-                                    &baseitem);
-
-	if ( rv != SECSuccess ) {
-	    goto loser;
-	}
-    }
     
-    len = urlstringitem.len + ( hasbase ? basestringitem.len : 0 ) + 1;
+    len = urlstringitem.len + 1;
     
     str = urlstring = (char *)PORT_Alloc(len);
     if ( urlstring == NULL ) {
 	goto loser;
     }
     
-    /* copy the URL base first */
-    if ( hasbase ) {
-
-	/* if the urlstring has a : in it, then we assume it is an absolute
-	 * URL, and will not get the base string pre-pended
-	 */
-	for ( i = 0; i < urlstringitem.len; i++ ) {
-	    if ( urlstringitem.data[i] == ':' ) {
-		goto nobase;
-	    }
-	}
-	
-	PORT_Memcpy(str, basestringitem.data, basestringitem.len);
-	str += basestringitem.len;
-	
-    }
-
-nobase:
-    /* copy the rest (or all) of the URL */
+    /* copy the URL */
     PORT_Memcpy(str, urlstringitem.data, urlstringitem.len);
     str += urlstringitem.len;
     
@@ -169,9 +102,6 @@
     if ( arena ) {
 	PORT_FreeArena(arena, PR_FALSE);
     }
-    if ( baseitem.data ) {
-	PORT_Free(baseitem.data);
-    }
     if ( urlitem.data ) {
 	PORT_Free(urlitem.data);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/crl.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/crl.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/certdb/crl.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/certdb/crl.c	2015-02-28 15:03:01.000000000 +0000
@@ -1123,9 +1123,9 @@
 	PORT_Free(cache->crls);
     }
     /* destroy the cert */
-    if (cache->issuer)
+    if (cache->issuerDERCert)
     {
-        CERT_DestroyCertificate(cache->issuer);
+        SECITEM_FreeItem(cache->issuerDERCert, PR_TRUE);
     }
     /* free the subject */
     if (cache->subject)
@@ -1571,14 +1571,20 @@
     else
     {
         SECStatus signstatus = SECFailure;
-        if (cache->issuer)
+        if (cache->issuerDERCert)
         {
-            signstatus = CERT_VerifyCRL(crlobject->crl, cache->issuer, vfdate,
+	    CERTCertificate *issuer = CERT_NewTempCertificate(cache->dbHandle,
+		cache->issuerDERCert, NULL, PR_FALSE, PR_TRUE);
+
+	    if (issuer) {
+                signstatus = CERT_VerifyCRL(crlobject->crl, issuer, vfdate,
                                         wincx);
+		CERT_DestroyCertificate(issuer);
+	    }
         }
         if (SECSuccess != signstatus)
         {
-            if (!cache->issuer)
+            if (!cache->issuerDERCert)
             {
                 /* we tried to verify without an issuer cert . This is
                    because this CRL came through a call to SEC_FindCrlByName.
@@ -1925,15 +1931,16 @@
     }
 
     /* add issuer certificate if it was previously unavailable */
-    if (issuer && (NULL == cache->issuer) &&
+    if (issuer && (NULL == cache->issuerDERCert) &&
         (SECSuccess == CERT_CheckCertUsage(issuer, KU_CRL_SIGN)))
     {
         /* if we didn't have a valid issuer cert yet, but we do now. add it */
         DPCache_LockWrite();
-        if (!cache->issuer)
+        if (!cache->issuerDERCert)
         {
             dirty = PR_TRUE;
-            cache->issuer = CERT_DupCertificate(issuer);    
+	    cache->dbHandle = issuer->dbhandle;
+    	    cache->issuerDERCert = SECITEM_DupItem(&issuer->derCert);
         }
         DPCache_UnlockWrite();
     }
@@ -1944,7 +1951,7 @@
        SEC_FindCrlByName, or through manual insertion, rather than through a
        certificate verification (CERT_CheckCRL) */
 
-    if (cache->issuer && vfdate )
+    if (cache->issuerDERCert && vfdate )
     {
 	mustunlock = PR_FALSE;
         /* re-process all unverified CRLs */
@@ -2201,7 +2208,8 @@
     }
     if (issuer)
     {
-        cache->issuer = CERT_DupCertificate(issuer);
+	cache->dbHandle = issuer->dbhandle;
+    	cache->issuerDERCert = SECITEM_DupItem(&issuer->derCert);
     }
     cache->distributionPoint = SECITEM_DupItem(dp);
     cache->subject = SECITEM_DupItem(subject);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/nss/nss.def thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/nss/nss.def
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/nss/nss.def	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/nss/nss.def	2015-02-28 15:03:01.000000000 +0000
@@ -1062,3 +1062,11 @@
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.18 { 	# NSS 3.18 release
+;+    global:
+CERT_FindCertURLExtension;
+SEC_CheckCrlTimes;
+SEC_GetCrlTimes;
+;+    local:
+;+       *;
+;+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/nss/nss.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/nss/nss.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/nss/nss.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/nss/nss.h	2015-02-28 15:03:01.000000000 +0000
@@ -33,12 +33,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.17.4" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.18" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
-#define NSS_VMINOR   17
-#define NSS_VPATCH   4
+#define NSS_VMINOR   18
+#define NSS_VPATCH   0
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 #ifndef RC_INVOKED
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/pkcs12/p12d.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/pkcs12/p12d.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/pkcs12/p12d.c	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/pkcs12/p12d.c	2015-02-28 15:03:01.000000000 +0000
@@ -2795,6 +2795,64 @@
     return rv;
 }
 
+SECStatus
+SEC_PKCS12DecoderRenameCertNicknames(SEC_PKCS12DecoderContext *p12dcx,
+                                     SEC_PKCS12NicknameRenameCallback nicknameCb,
+                                     void *arg)
+{
+    int i;
+    sec_PKCS12SafeBag *safeBag;
+    CERTCertificate *cert;
+    SECStatus srv;
+
+    if(!p12dcx || p12dcx->error || !p12dcx->safeBags || !nicknameCb) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    for (i = 0; safeBag = p12dcx->safeBags[i]; i++) {
+        SECItem *newNickname = NULL;
+        SECItem *defaultNickname = NULL;
+        SECStatus rename_rv;
+
+        if (SECOID_FindOIDTag(&(safeBag->safeBagType)) !=
+            SEC_OID_PKCS12_V1_CERT_BAG_ID) {
+            continue;
+        }
+
+        cert = CERT_DecodeDERCertificate(
+                   &safeBag->safeBagContent.certBag->value.x509Cert,
+                   PR_FALSE, NULL);
+        if (!cert) {
+            return SECFailure;
+        }
+
+        defaultNickname = sec_pkcs12_get_nickname(safeBag);
+        rename_rv = (*nicknameCb)(cert, defaultNickname, &newNickname, arg);
+
+        CERT_DestroyCertificate(cert);
+
+        if (defaultNickname) {
+            SECITEM_ZfreeItem(defaultNickname, PR_TRUE);
+            defaultNickname = NULL;
+        }
+
+        if (rename_rv != SECSuccess) {
+            return rename_rv;
+        }
+
+        if (newNickname) {
+            srv = sec_pkcs12_set_nickname(safeBag, newNickname);
+            SECITEM_ZfreeItem(newNickname, PR_TRUE);
+            newNickname = NULL;
+            if (srv != SECSuccess) {
+                return SECFailure;
+            }
+        }
+    }
+
+    return SECSuccess;
+}
 
 static SECKEYPublicKey *
 sec_pkcs12_get_public_key_and_usage(sec_PKCS12SafeBag *certBag,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/pkcs12/p12.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/pkcs12/p12.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/pkcs12/p12.h	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/pkcs12/p12.h	2015-02-28 15:03:01.000000000 +0000
@@ -36,14 +36,49 @@
  * In NSS 3.12 or later, 'arg' actually points to a CERTCertificate,
  * the 'leafCert' variable in sec_pkcs12_validate_cert in p12d.c. 
  * See r1.35 of p12d.c ("Patch 2" in bug 321584).
+ *
+ * This callback might be called by SEC_PKCS12DecoderValidateBags each time
+ * a nickname collission is detected. The callback must return a new
+ * nickname. The returned SECItem should be of type siAsciiString,
+ * it should be allocated using:
+ *     SECITEM_AllocItem(NULL, NULL, LENGTH_OF_NEW_NICKNAME + 1)
+ * and data must contain the new nickname as a zero terminated string.
  */
 typedef SECItem * (PR_CALLBACK * SEC_PKCS12NicknameCollisionCallback)(
                                  SECItem *old_nickname,
                                  PRBool *cancel,
                                  void *arg);
-
-
-
+/*
+ * This callback is called by SEC_PKCS12DecoderRenameCertNicknames for each
+ * certificate found in the p12 source data.
+ *
+ * cert: A decoded certificate.
+ * default_nickname: The nickname as found in the source data.
+ *                   Will be NULL if source data doesn't have nickname.
+ * new_nickname: Output parameter that may contain the renamed nickname.
+ * arg: The user data that was passed to SEC_PKCS12DecoderRenameCertNicknames.
+ *
+ * If the callback accept that NSS will use a nickname based on the
+ * default_nickname (potentially resolving conflicts), then the callback
+ * must set *new_nickname to NULL.
+ *
+ * If the callback wishes to override the nickname, it must set *new_nickname
+ * to a new SECItem which should be allocated using
+ *     SECITEM_AllocItem(NULL, NULL, LENGTH_OF_NEW_NICKNAME + 1)
+ * new_nickname->type should be set to siAsciiString, and new_nickname->data
+ * must contain the new nickname as a zero terminated string.
+ *
+ * A return value of SECFailure indicates that the renaming operation failed,
+ * and callback should release new_nickname before returning if it's already
+ * being allocated.
+ * Otherwise, the callback function must return SECSuccess, including use
+ * default nickname as mentioned above.
+ */
+typedef SECStatus (PR_CALLBACK * SEC_PKCS12NicknameRenameCallback)(
+                                 const CERTCertificate *cert,
+                                 const SECItem *default_nickname,
+                                 SECItem **new_nickname,
+                                 void *arg);
 
 typedef SECStatus (PR_CALLBACK *digestOpenFn)(void *arg, PRBool readData);
 typedef SECStatus (PR_CALLBACK *digestCloseFn)(void *arg, PRBool removeFile);
@@ -167,6 +202,26 @@
 SEC_PKCS12DecoderValidateBags(SEC_PKCS12DecoderContext *p12dcx,
 			      SEC_PKCS12NicknameCollisionCallback nicknameCb);
 
+/*
+ * SEC_PKCS12DecoderRenameCertNicknames() can be used to change
+ * certificate nicknames in SEC_PKCS12DecoderContext, prior to calling
+ * SEC_PKCS12DecoderImportBags.
+ *
+ * arg: User-defined data that will be passed to nicknameCb.
+ *
+ * If SEC_PKCS12DecoderRenameCertNicknames() is called after calling
+ * SEC_PKCS12DecoderValidateBags(), then only the certificate nickname
+ * will be changed.
+ * If SEC_PKCS12DecoderRenameCertNicknames() is called prior to calling
+ * SEC_PKCS12DecoderValidateBags(), then SEC_PKCS12DecoderValidateBags()
+ * will change the nickname of the corresponding private key, too.
+ */
+extern SECStatus
+SEC_PKCS12DecoderRenameCertNicknames(SEC_PKCS12DecoderContext *p12dcx,
+                                     SEC_PKCS12NicknameRenameCallback nicknameCb,
+                                     void *arg);
+
+
 extern SECStatus
 SEC_PKCS12DecoderImportBags(SEC_PKCS12DecoderContext *p12dcx);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/smime/smime.def thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/smime/smime.def
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/smime/smime.def	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/smime/smime.def	2015-02-28 15:03:01.000000000 +0000
@@ -279,3 +279,9 @@
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.18 {    # NSS 3.18 release
+;+    global:
+SEC_PKCS12DecoderRenameCertNicknames;
+;+    local:
+;+       *;
+;+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/smime/smimeutil.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/smime/smimeutil.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/smime/smimeutil.c	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/smime/smimeutil.c	2015-02-28 15:03:01.000000000 +0000
@@ -437,10 +437,12 @@
 	     */
 	    key = CERT_ExtractPublicKey(rcerts[rcount]);
 	    pklen_bits = 0;
+	    key_type = nullKey;
 	    if (key != NULL) {
 		pklen_bits = SECKEY_PublicKeyStrengthInBits (key);
 		key_type = SECKEY_GetPublicKeyType(key);
 		SECKEY_DestroyPublicKey (key);
+		key = NULL;
 	    }
 
 	    if (key_type == ecKey) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/softoken/lowpbe.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/softoken/lowpbe.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/softoken/lowpbe.c	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/softoken/lowpbe.c	2015-02-28 15:03:01.000000000 +0000
@@ -319,8 +319,8 @@
 }
 
 static SECStatus
-nsspkcs5_PBKFD2_F(const SECHashObject *hashobj, SECItem *pwitem, SECItem *salt,
-			int iterations, unsigned int i, unsigned char *T)
+nsspkcs5_PBKDF2_F(const SECHashObject *hashobj, SECItem *pwitem, SECItem *salt,
+                  int iterations, unsigned int i, unsigned char *T)
 {
     int j;
     HMACContext *cx = NULL;
@@ -393,7 +393,7 @@
     }
 
     for (i=1,rp=result->data; i <= nblocks ; i++, rp +=hLen) {
-	rv = nsspkcs5_PBKFD2_F(hashobj,pwitem,salt,iterations,i,T);
+        rv = nsspkcs5_PBKDF2_F(hashobj, pwitem, salt, iterations, i, T);
 	if (rv != SECSuccess) {
 	    break;
 	}
@@ -410,7 +410,7 @@
     } else {
 	result->len = dkLen;
     }
-	
+
     return result;
 }
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/softoken/softkver.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/softoken/softkver.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/softoken/softkver.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/softoken/softkver.h	2015-02-28 15:03:01.000000000 +0000
@@ -25,11 +25,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.17.4" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.18" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
-#define SOFTOKEN_VMINOR   17
-#define SOFTOKEN_VPATCH   4
+#define SOFTOKEN_VMINOR   18
+#define SOFTOKEN_VPATCH   0
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_BETA     PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/ssl/ssl3ext.c thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/ssl/ssl3ext.c
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/ssl/ssl3ext.c	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/ssl/ssl3ext.c	2015-02-28 15:03:01.000000000 +0000
@@ -914,8 +914,9 @@
                                  SECItem *data)
 {
     /* The echoed extension must be empty. */
-    if (data->len != 0)
-       return SECFailure;
+    if (data->len != 0) {
+       return SECSuccess;  /* Ignore the extension. */
+    }
 
     /* Keep track of negotiated extensions. */
     ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
@@ -1365,8 +1366,9 @@
 ssl3_ClientHandleSessionTicketXtn(sslSocket *ss, PRUint16 ex_type,
                                   SECItem *data)
 {
-    if (data->len != 0)
-        return SECFailure;
+    if (data->len != 0) {
+        return SECSuccess;  /* Ignore the extension. */
+    }
 
     /* Keep track of negotiated extensions. */
     ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ex_type;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/util/nssutil.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/util/nssutil.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/lib/util/nssutil.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/lib/util/nssutil.h	2015-02-28 15:03:01.000000000 +0000
@@ -19,12 +19,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.17.4"
+#define NSSUTIL_VERSION  "3.18 Beta"
 #define NSSUTIL_VMAJOR   3
-#define NSSUTIL_VMINOR   17
-#define NSSUTIL_VPATCH   4
+#define NSSUTIL_VMINOR   18
+#define NSSUTIL_VPATCH   0
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_FALSE
+#define NSSUTIL_BETA     PR_TRUE
 
 SEC_BEGIN_PROTOS
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/TAG-INFO thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/TAG-INFO
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/TAG-INFO	2015-02-19 00:42:06.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/TAG-INFO	2015-02-28 15:03:00.000000000 +0000
@@ -1 +1 @@
-NSS_3_17_4_RTM
+NSS_3_18_BETA7
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/all.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/all.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/all.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/all.sh	2015-02-28 15:03:01.000000000 +0000
@@ -302,7 +302,7 @@
 # following test for modutil should check for that instead.
 # Exception: when building softoken only, shlibsign is the
 # last file created.
-if [ ${NSS_BUILD_SOFTOKEN_ONLY} -eq "1" ]; then
+if [ ${NSS_BUILD_SOFTOKEN_ONLY} = "1" ]; then
   LAST_FILE_BUILT=shlibsign
 else
   LAST_FILE_BUILT=modutil
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/cipher/cipher.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/cipher/cipher.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/cipher/cipher.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/cipher/cipher.sh	2015-02-28 15:03:01.000000000 +0000
@@ -124,7 +124,7 @@
 # built and the cipher suite run as part of an nss-softoken build. 
 if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${PROG_SUFFIX} ]; then
     echo "bltest not built, skipping this test." >> ${LOGFILE}
-    res = 0
+    res=0
     html_msg $res $EXP_RET "$TESTNAME"
     return 0
 fi
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/common/init.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/common/init.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/common/init.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/common/init.sh	2015-02-28 15:03:01.000000000 +0000
@@ -226,7 +226,7 @@
     }
     html_msg()
     {
-        if [ "$1" -ne "$2" ] ; then
+        if [ $1 -ne $2 ] ; then
             html_failed "$3" "$4"
         else
             html_passed "$3" "$4"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/dbtests/dbtests.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/dbtests/dbtests.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/dbtests/dbtests.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/dbtests/dbtests.sh	2015-02-28 15:03:01.000000000 +0000
@@ -170,7 +170,7 @@
 
     # skipping the next two tests when user is root,
     # otherwise they would fail due to rooty powers
-    if [ $UID -ne 0 ] then
+    if [ $UID -ne 0 ]; then
       ${BINDIR}/dbtest -d $RONLY_DIR
     ret=$?
     if [ $ret -ne 46 ]; then
@@ -181,7 +181,7 @@
     else
       html_passed "Skipping Dbtest r/w in a readonly dir because user is root"
     fi
-    if [ $UID -ne 0 ] then
+    if [ $UID -ne 0 ]; then
       ${BINDIR}/certutil -D -n "TestUser" -d .
     ret=$?
     if [ $ret -ne 255 ]; then
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/ssl/sslcov.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/ssl/sslcov.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/nss/tests/ssl/sslcov.txt	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/nss/tests/ssl/sslcov.txt	2015-02-28 15:03:01.000000000 +0000
@@ -78,8 +78,10 @@
   noECC  TLS12   i    TLS12_RSA_WITH_NULL_MD5
   noECC  TLS12   j    TLS12_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
   noECC  TLS12   k    TLS12_RSA_FIPS_WITH_DES_CBC_SHA
-  noECC  TLS12   l    TLS12_RSA_EXPORT_WITH_DES_CBC_SHA   (new)
-  noECC  TLS12   m    TLS12_RSA_EXPORT_WITH_RC4_56_SHA    (new)
+# disabled because of bug 1136095
+#  noECC  TLS12   l    TLS12_RSA_EXPORT_WITH_DES_CBC_SHA   (new)
+# disabled because of bug 1136095
+#  noECC  TLS12   m    TLS12_RSA_EXPORT_WITH_RC4_56_SHA    (new)
   noECC  TLS12   n    TLS12_RSA_WITH_RC4_128_SHA
   noECC  TLS12   v    TLS12_RSA_WITH_AES_128_CBC_SHA
   noECC  TLS12   y    TLS12_RSA_WITH_AES_256_CBC_SHA
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/include/pkix/pkixnss.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/include/pkix/pkixnss.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/include/pkix/pkixnss.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/include/pkix/pkixnss.h	2015-02-28 15:03:01.000000000 +0000
@@ -81,6 +81,7 @@
   MOZILLA_PKIX_ERROR_NO_RFC822NAME_MATCH = ERROR_BASE + 4,
   MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE = ERROR_BASE + 5,
   MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE = ERROR_BASE + 6,
+  MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH = ERROR_BASE + 7,
 };
 
 void RegisterErrorTable();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/include/pkix/pkixtypes.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/include/pkix/pkixtypes.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/include/pkix/pkixtypes.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/include/pkix/pkixtypes.h	2015-02-28 15:03:01.000000000 +0000
@@ -271,6 +271,13 @@
                     /*optional*/ const Input* stapledOCSPresponse,
                     /*optional*/ const Input* aiaExtension) = 0;
 
+  // Check that the given digest algorithm is acceptable for use in signatures.
+  //
+  // Return Success if the algorithm is acceptable,
+  // Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED if the algorithm is not
+  // acceptable, or another error code if another error occurred.
+  virtual Result CheckSignatureDigestAlgorithm(DigestAlgorithm digestAlg) = 0;
+
   // Check that the RSA public key size is acceptable.
   //
   // Return Success if the key size is acceptable,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/include/pkix/Result.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/include/pkix/Result.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/include/pkix/Result.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/include/pkix/Result.h	2015-02-28 15:03:01.000000000 +0000
@@ -179,6 +179,8 @@
                      MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE) \
     MOZILLA_PKIX_MAP(ERROR_UNSUPPORTED_EC_POINT_FORM, 47, \
                      SEC_ERROR_UNSUPPORTED_EC_POINT_FORM) \
+    MOZILLA_PKIX_MAP(ERROR_SIGNATURE_ALGORITHM_MISMATCH, 48, \
+                     MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH) \
     MOZILLA_PKIX_MAP(FATAL_ERROR_INVALID_ARGS, FATAL_ERROR_FLAG | 1, \
                      SEC_ERROR_INVALID_ARGS) \
     MOZILLA_PKIX_MAP(FATAL_ERROR_INVALID_STATE, FATAL_ERROR_FLAG | 2, \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixcert.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixcert.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixcert.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixcert.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -79,9 +79,6 @@
   if (rv != Success) {
     return rv;
   }
-  // XXX: Ignored. What are we supposed to check? This seems totally redundant
-  // with Certificate.signatureAlgorithm. Is it important to check that they
-  // are consistent with each other? It doesn't seem to matter!
   rv = der::ExpectTagAndGetValue(tbsCertificate, der::SEQUENCE, signature);
   if (rv != Success) {
     return rv;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixcheck.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixcheck.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixcheck.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixcheck.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -29,6 +29,99 @@
 
 namespace mozilla { namespace pkix {
 
+// 4.1.1.2 signatureAlgorithm
+// 4.1.2.3 signature
+
+Result
+CheckSignatureAlgorithm(TrustDomain& trustDomain,
+                        EndEntityOrCA endEntityOrCA,
+                        const der::SignedDataWithSignature& signedData,
+                        Input signatureValue)
+{
+  // 4.1.1.2. signatureAlgorithm
+  der::PublicKeyAlgorithm publicKeyAlg;
+  DigestAlgorithm digestAlg;
+  Reader signatureAlgorithmReader(signedData.algorithm);
+  Result rv = der::SignatureAlgorithmIdentifierValue(signatureAlgorithmReader,
+                                                     publicKeyAlg, digestAlg);
+  if (rv != Success) {
+    return rv;
+  }
+  rv = der::End(signatureAlgorithmReader);
+  if (rv != Success) {
+    return rv;
+  }
+
+  // 4.1.2.3. Signature
+  der::PublicKeyAlgorithm signedPublicKeyAlg;
+  DigestAlgorithm signedDigestAlg;
+  Reader signedSignatureAlgorithmReader(signatureValue);
+  rv = der::SignatureAlgorithmIdentifierValue(signedSignatureAlgorithmReader,
+                                              signedPublicKeyAlg,
+                                              signedDigestAlg);
+  if (rv != Success) {
+    return rv;
+  }
+  rv = der::End(signedSignatureAlgorithmReader);
+  if (rv != Success) {
+    return rv;
+  }
+
+  // "This field MUST contain the same algorithm identifier as the
+  // signatureAlgorithm field in the sequence Certificate." However, it may
+  // be encoded differently. In particular, one of the fields may have a NULL
+  // parameter while the other one may omit the parameter field altogether, and
+  // these are considered equivalent. Some certificates generation software
+  // actually generates certificates like that, so we compare the parsed values
+  // instead of comparing the encoded values byte-for-byte.
+  //
+  // Along the same lines, we accept two different OIDs for RSA-with-SHA1, and
+  // we consider those OIDs to be equivalent here.
+  if (publicKeyAlg != signedPublicKeyAlg || digestAlg != signedDigestAlg) {
+    return Result::ERROR_SIGNATURE_ALGORITHM_MISMATCH;
+  }
+
+  // During the time of the deprecation of SHA-1 and the deprecation of RSA
+  // keys of less than 2048 bits, we will encounter many certs signed using
+  // SHA-1 and/or too-small RSA keys. With this in mind, we ask the trust
+  // domain early on if it knows it will reject the signature purely based on
+  // the digest algorithm and/or the RSA key size (if an RSA signature). This
+  // is a good optimization because it completely avoids calling
+  // trustDomain.FindIssuers (which may be slow) for such rejected certs, and
+  // more generally it short-circuits any path building with them (which, of
+  // course, is even slower).
+
+  rv = trustDomain.CheckSignatureDigestAlgorithm(digestAlg);
+  if (rv != Success) {
+    return rv;
+  }
+
+  switch (publicKeyAlg) {
+    case der::PublicKeyAlgorithm::RSA_PKCS1:
+    {
+      // The RSA computation may give a result that requires fewer bytes to
+      // encode than the public key (since it is modular arithmetic). However,
+      // the last step of generating a PKCS#1.5 signature is the I2OSP
+      // procedure, which pads any such shorter result with zeros so that it
+      // is exactly the same length as the public key.
+      unsigned int signatureSizeInBits = signedData.signature.GetLength() * 8u;
+      return trustDomain.CheckRSAPublicKeyModulusSizeInBits(
+               endEntityOrCA, signatureSizeInBits);
+    }
+
+    case der::PublicKeyAlgorithm::ECDSA:
+      // In theory, we could implement a similar early-pruning optimization for
+      // ECDSA curves. However, since there has been no similar deprecation for
+      // for any curve that we support, the chances of us encountering a curve
+      // during path building is too low to be worth bothering with.
+      break;
+
+    MOZILLA_PKIX_UNREACHABLE_DEFAULT_ENUM
+  }
+
+  return Success;
+}
+
 // 4.1.2.5 Validity
 
 Result
@@ -37,21 +130,31 @@
   Reader validity(encodedValidity);
   Time notBefore(Time::uninitialized);
   if (der::TimeChoice(validity, notBefore) != Success) {
-    return Result::ERROR_EXPIRED_CERTIFICATE;
-  }
-  if (time < notBefore) {
-    return Result::ERROR_NOT_YET_VALID_CERTIFICATE;
+    return Result::ERROR_INVALID_DER_TIME;
   }
 
   Time notAfter(Time::uninitialized);
   if (der::TimeChoice(validity, notAfter) != Success) {
-    return Result::ERROR_EXPIRED_CERTIFICATE;
+    return Result::ERROR_INVALID_DER_TIME;
+  }
+
+  if (der::End(validity) != Success) {
+    return Result::ERROR_INVALID_DER_TIME;
+  }
+
+  if (notBefore > notAfter) {
+    return Result::ERROR_INVALID_DER_TIME;
+  }
+
+  if (time < notBefore) {
+    return Result::ERROR_NOT_YET_VALID_CERTIFICATE;
   }
+
   if (time > notAfter) {
     return Result::ERROR_EXPIRED_CERTIFICATE;
   }
 
-  return der::End(validity);
+  return Success;
 }
 
 // 4.1.2.7 Subject Public Key Info
@@ -725,21 +828,46 @@
 
   const EndEntityOrCA endEntityOrCA = cert.endEntityOrCA;
 
+  // Check the cert's trust first, because we want to minimize the amount of
+  // processing we do on a distrusted cert, in case it is trying to exploit
+  // some bug in our processing.
   rv = trustDomain.GetCertTrust(endEntityOrCA, requiredPolicy, cert.GetDER(),
                                 trustLevel);
   if (rv != Success) {
     return rv;
   }
-  if (trustLevel == TrustLevel::ActivelyDistrusted) {
-    return Result::ERROR_UNTRUSTED_CERT;
+
+  if (trustLevel == TrustLevel::TrustAnchor &&
+      endEntityOrCA == EndEntityOrCA::MustBeEndEntity &&
+      requiredEKUIfPresent == KeyPurposeId::id_kp_OCSPSigning) {
+    // OCSP signer certificates can never be trust anchors, especially
+    // since we don't support designated OCSP responders. All of the checks
+    // below that are dependent on trustLevel rely on this overriding of the
+    // trust level for OCSP signers.
+    trustLevel = TrustLevel::InheritsTrust;
   }
-  if (trustLevel != TrustLevel::TrustAnchor &&
-      trustLevel != TrustLevel::InheritsTrust) {
-    // The TrustDomain returned a trust level that we weren't expecting.
-    return Result::FATAL_ERROR_INVALID_STATE;
+
+  switch (trustLevel) {
+    case TrustLevel::InheritsTrust:
+      rv = CheckSignatureAlgorithm(trustDomain, endEntityOrCA,
+                                   cert.GetSignedData(), cert.GetSignature());
+      if (rv != Success) {
+        return rv;
+      }
+      break;
+
+    case TrustLevel::TrustAnchor:
+      // We don't even bother checking signatureAlgorithm or signature for
+      // syntactic validity for trust anchors, because we don't use those
+      // fields for anything, and because the trust anchor might be signed
+      // with a signature algorithm we don't actually support.
+      break;
+
+    case TrustLevel::ActivelyDistrusted:
+      return Result::ERROR_UNTRUSTED_CERT;
   }
 
-  // Check the SPKI first, because it is one of the most selective properties
+  // Check the SPKI early, because it is one of the most selective properties
   // of the certificate due to SHA-1 deprecation and the deprecation of
   // certificates with keys weaker than RSA 2048.
   Reader spki(cert.GetSubjectPublicKeyInfo());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixder.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixder.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -111,6 +111,13 @@
                                  /*out*/ PublicKeyAlgorithm& publicKeyAlgorithm,
                                  /*out*/ DigestAlgorithm& digestAlgorithm)
 {
+  // RFC 5758 Section 3.2 (ECDSA with SHA-2), and RFC 3279 Section 2.2.3
+  // (ECDSA with SHA-1) say that parameters must be omitted.
+  //
+  // RFC 4055 Section 5 and RFC 3279 Section 2.2.1 both say that parameters for
+  // RSA must be encoded as NULL; we relax that requirement by allowing the
+  // NULL to be omitted, to match all the other signature algorithms we support
+  // and for compatibility.
   Reader algorithmID;
   Result rv = AlgorithmIdentifierValue(input, algorithmID);
   if (rv != Success) {
@@ -166,15 +173,6 @@
     0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x01
   };
 
-  // RFC 5758 Section 3.1 (DSA with SHA-2), RFC 3279 Section 2.2.2 (DSA with
-  // SHA-1), RFC 5758 Section 3.2 (ECDSA with SHA-2), and RFC 3279
-  // Section 2.2.3 (ECDSA with SHA-1) all say that parameters must be omitted.
-  //
-  // RFC 4055 Section 5 and RFC 3279 Section 2.2.1 both say that parameters for
-  // RSA must be encoded as NULL; we relax that requirement by allowing the
-  // NULL to be omitted, to match all the other signature algorithms we support
-  // and for compatibility.
-
   // Matching is attempted based on a rough estimate of the commonality of the
   // algorithm, to minimize the number of MatchRest calls.
   if (algorithmID.MatchRest(sha256WithRSAEncryption)) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixder.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixder.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixder.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixder.h	2015-02-28 15:03:01.000000000 +0000
@@ -600,7 +600,7 @@
 Result DigestAlgorithmIdentifier(Reader& input,
                                  /*out*/ DigestAlgorithm& algorithm);
 
-enum PublicKeyAlgorithm
+enum class PublicKeyAlgorithm
 {
   RSA_PKCS1,
   ECDSA,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixnss.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixnss.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixnss.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixnss.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -194,6 +194,9 @@
     { "MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE",
       "A certificate that is not yet valid was used to issue the server's "
       "certificate." },
+    { "MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH",
+      "The signature algorithm in the signature field of the certificate does "
+      "not match the algorithm in its signatureAlgorithm field." },
   };
   // Note that these error strings are not localizable.
   // When these strings change, update the localization information too.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixutil.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixutil.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/lib/pkixutil.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/lib/pkixutil.h	2015-02-28 15:03:01.000000000 +0000
@@ -53,16 +53,18 @@
   Result Init();
 
   const Input GetDER() const { return der; }
-  der::Version GetVersion() const { return version; }
   const der::SignedDataWithSignature& GetSignedData() const {
     return signedData;
   }
+
+  der::Version GetVersion() const { return version; }
+  const Input GetSerialNumber() const { return serialNumber; }
+  const Input GetSignature() const { return signature; }
   const Input GetIssuer() const { return issuer; }
   // XXX: "validity" is a horrible name for the structure that holds
   // notBefore & notAfter, but that is the name used in RFC 5280 and we use the
   // RFC 5280 names for everything.
   const Input GetValidity() const { return validity; }
-  const Input GetSerialNumber() const { return serialNumber; }
   const Input GetSubject() const { return subject; }
   const Input GetSubjectPublicKeyInfo() const
   {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/moz.build	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/moz.build	2015-02-28 15:03:01.000000000 +0000
@@ -9,6 +9,7 @@
     'pkixcert_extension_tests.cpp',
     'pkixcert_signature_algorithm_tests.cpp',
     'pkixcheck_CheckKeyUsage_tests.cpp',
+    'pkixcheck_CheckSignatureAlgorithm_tests.cpp',
     'pkixcheck_CheckValidity_tests.cpp',
 
     # The naming conventions are described in ./README.txt.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixbuild_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixbuild_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixbuild_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixbuild_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -36,9 +36,7 @@
 #pragma warning(pop)
 #endif
 
-#include "pkix/pkix.h"
 #include "pkixgtest.h"
-#include "pkixtestutil.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
@@ -80,7 +78,7 @@
   return certDER;
 }
 
-class TestTrustDomain final : public TrustDomain
+class TestTrustDomain final : public DefaultCryptoTrustDomain
 {
 public:
   // The "cert chain tail" is a longish chain of certificates that is used by
@@ -153,36 +151,6 @@
     return Success;
   }
 
-  Result DigestBuf(Input input, DigestAlgorithm digestAlg,
-                   /*out*/ uint8_t* digestBuf, size_t digestLen) override
-  {
-    return TestDigestBuf(input, digestAlg, digestBuf, digestLen);
-  }
-
-  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            override
-  {
-    return Success;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyRSAPKCS1SignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
-  {
-    return Success;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest& signedDigest,
-                                 Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyECDSASignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-
   std::map<ByteString, ByteString> subjectDERToCertDER;
   ByteString leafCACertDER;
   ByteString rootCACertDER;
@@ -276,7 +244,7 @@
 // is treated as a trust anchor and is assumed to have issued all certificates
 // (i.e. FindIssuer always attempts to build the next step in the chain with
 // it).
-class ExpiredCertTrustDomain final : public TrustDomain
+class ExpiredCertTrustDomain final : public DefaultCryptoTrustDomain
 {
 public:
   explicit ExpiredCertTrustDomain(ByteString rootDER)
@@ -315,48 +283,11 @@
     return checker.Check(rootCert, nullptr, keepGoing);
   }
 
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
-                         /*optional*/ const Input*,
-                         /*optional*/ const Input*) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
   Result IsChainValid(const DERArray&, Time) override
   {
     return Success;
   }
 
-  Result DigestBuf(Input input, DigestAlgorithm digestAlg,
-                   /*out*/ uint8_t* digestBuf, size_t digestLen) override
-  {
-    return TestDigestBuf(input, digestAlg, digestBuf, digestLen);
-  }
-
-  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            override
-  {
-    return Success;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyRSAPKCS1SignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
-  {
-    return Success;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyECDSASignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
 private:
   ByteString rootDER;
 };
@@ -394,7 +325,7 @@
                            nullptr));
 }
 
-class DSSTrustDomain final : public TrustDomain
+class DSSTrustDomain final : public EverythingFailsByDefaultTrustDomain
 {
 public:
   Result GetCertTrust(EndEntityOrCA, const CertPolicyId&,
@@ -403,56 +334,6 @@
     trustLevel = TrustLevel::TrustAnchor;
     return Success;
   }
-
-  Result FindIssuer(Input, IssuerChecker&, Time) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
-                         /*optional*/ const Input*,
-                         /*optional*/ const Input*) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result IsChainValid(const DERArray&, Time) override
-  {
-    return Success;
-  }
-
-  Result DigestBuf(Input, DigestAlgorithm, /*out*/uint8_t*, size_t) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest&, Input) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest&, Input) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
 };
 
 class pkixbuild_DSS : public ::testing::Test { };
@@ -492,7 +373,7 @@
                            nullptr/*stapledOCSPResponse*/));
 }
 
-class IssuerNameCheckTrustDomain final : public TrustDomain
+class IssuerNameCheckTrustDomain final : public DefaultCryptoTrustDomain
 {
 public:
   IssuerNameCheckTrustDomain(const ByteString& issuer, bool expectedKeepGoing)
@@ -534,35 +415,6 @@
     return Success;
   }
 
-  Result DigestBuf(Input input, DigestAlgorithm digestAlg,
-                   /*out*/ uint8_t* digestBuf, size_t digestLen) override
-  {
-    return TestDigestBuf(input, digestAlg, digestBuf, digestLen);
-  }
-
-  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            override
-  {
-    return Success;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyRSAPKCS1SignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
-  {
-    return Success;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyECDSASignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
 private:
   const ByteString issuer;
   const bool expectedKeepGoing;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcert_extension_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcert_extension_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcert_extension_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcert_extension_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -22,10 +22,8 @@
  * limitations under the License.
  */
 
-#include "pkix/pkix.h"
 #include "pkixder.h"
 #include "pkixgtest.h"
-#include "pkixtestutil.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
@@ -60,7 +58,7 @@
   return CreateCertWithExtensions(subjectStr, extensions);
 }
 
-class TrustEverythingTrustDomain final : public TrustDomain
+class TrustEverythingTrustDomain final : public DefaultCryptoTrustDomain
 {
 private:
   Result GetCertTrust(EndEntityOrCA, const CertPolicyId&, Input,
@@ -70,13 +68,6 @@
     return Success;
   }
 
-  Result FindIssuer(Input /*encodedIssuerName*/, IssuerChecker& /*checker*/,
-                    Time /*time*/) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
   Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
                          /*optional*/ const Input*, /*optional*/ const Input*)
                          override
@@ -88,36 +79,6 @@
   {
     return Success;
   }
-
-  Result DigestBuf(Input input, DigestAlgorithm digestAlg,
-                   /*out*/ uint8_t* digestBuf, size_t digestLen) override
-  {
-    return TestDigestBuf(input, digestAlg, digestBuf, digestLen);
-  }
-
-  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            override
-  {
-    return Success;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyRSAPKCS1SignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
-  {
-    return Success;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest& signedDigest,
-                                 Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyECDSASignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
 };
 
 // python DottedOIDToCode.py --tlv unknownExtensionOID 1.3.6.1.4.1.13769.666.666.666.1.500.9.3
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcert_signature_algorithm_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -3,9 +3,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-#include "pkix/pkix.h"
 #include "pkixgtest.h"
-#include "pkixtestutil.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
@@ -45,7 +43,7 @@
   return certDER;
 }
 
-class AlgorithmTestsTrustDomain final : public TrustDomain
+class AlgorithmTestsTrustDomain final : public DefaultCryptoTrustDomain
 {
 public:
   AlgorithmTestsTrustDomain(const ByteString& rootDER,
@@ -103,35 +101,6 @@
     return Success;
   }
 
-  Result DigestBuf(Input input, DigestAlgorithm digestAlg,
-                   /*out*/ uint8_t* digestBuf, size_t digestLen) override
-  {
-    return TestDigestBuf(input, digestAlg, digestBuf, digestLen);
-  }
-
-  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            override
-  {
-    return Success;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyRSAPKCS1SignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
-  {
-    return Success;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest& signedDigest,
-                                 Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyECDSASignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
   ByteString rootDER;
   ByteString rootSubjectDER;
   ByteString intDER;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcheck_CheckKeyUsage_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -23,8 +23,6 @@
  */
 
 #include "pkixgtest.h"
-#include "pkix/pkixtypes.h"
-#include "pkixtestutil.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcheck_CheckSignatureAlgorithm_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,358 @@
+/* -*- 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 code is made available to you under your choice of the following sets
+ * of licensing terms:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+/* Copyright 2015 Mozilla 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.
+ */
+
+#include "pkixder.h"
+#include "pkixgtest.h"
+
+using namespace mozilla::pkix;
+using namespace mozilla::pkix::test;
+
+namespace mozilla { namespace pkix {
+
+extern Result CheckSignatureAlgorithm(
+                TrustDomain& trustDomain, EndEntityOrCA endEntityOrCA,
+                const der::SignedDataWithSignature& signedData,
+                Input signatureValue);
+
+} } // namespace mozilla::pkix
+
+struct CheckSignatureAlgorithmTestParams
+{
+  ByteString signatureAlgorithmValue;
+  ByteString signatureValue;
+  unsigned int signatureLengthInBytes;
+  Result expectedResult;
+};
+
+#define BS(s) ByteString(s, MOZILLA_PKIX_ARRAY_LENGTH(s))
+
+// python DottedOIDToCode.py --tlv sha256WithRSAEncryption 1.2.840.113549.1.1.11
+static const uint8_t tlv_sha256WithRSAEncryption[] = {
+  0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b
+};
+
+// Same as tlv_sha256WithRSAEncryption, except one without the "0x0b" and with
+// the DER length decreased accordingly.
+static const uint8_t tlv_sha256WithRSAEncryption_truncated[] = {
+  0x06, 0x08, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01
+};
+
+// python DottedOIDToCode.py --tlv sha-1WithRSAEncryption 1.2.840.113549.1.1.5
+static const uint8_t tlv_sha_1WithRSAEncryption[] = {
+  0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05
+};
+
+// python DottedOIDToCode.py --tlv sha1WithRSASignature 1.3.14.3.2.29
+static const uint8_t tlv_sha1WithRSASignature[] = {
+  0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d
+};
+
+// python DottedOIDToCode.py --tlv md5WithRSAEncryption 1.2.840.113549.1.1.4
+static const uint8_t tlv_md5WithRSAEncryption[] = {
+  0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x04
+};
+
+static const CheckSignatureAlgorithmTestParams
+  CHECKSIGNATUREALGORITHM_TEST_PARAMS[] =
+{
+  { // Both algorithm IDs are empty
+    ByteString(),
+    ByteString(),
+    2048 / 8,
+    Result::ERROR_BAD_DER,
+  },
+  { // signatureAlgorithm is empty, signature is supported.
+    ByteString(),
+    BS(tlv_sha256WithRSAEncryption),
+    2048 / 8,
+    Result::ERROR_BAD_DER,
+  },
+  { // signatureAlgorithm is supported, signature is empty.
+    BS(tlv_sha256WithRSAEncryption),
+    ByteString(),
+    2048 / 8,
+    Result::ERROR_BAD_DER,
+  },
+  { // Algorithms match, both are supported.
+    BS(tlv_sha256WithRSAEncryption),
+    BS(tlv_sha256WithRSAEncryption),
+    2048 / 8,
+    Success
+  },
+  { // Algorithms do not match because signatureAlgorithm is truncated.
+    BS(tlv_sha256WithRSAEncryption_truncated),
+    BS(tlv_sha256WithRSAEncryption),
+    2048 / 8,
+    Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED
+  },
+  { // Algorithms do not match because signature is truncated.
+    BS(tlv_sha256WithRSAEncryption),
+    BS(tlv_sha256WithRSAEncryption_truncated),
+    2048 / 8,
+    Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED
+  },
+  { // Algorithms do not match, both are supported.
+    BS(tlv_sha_1WithRSAEncryption),
+    BS(tlv_sha256WithRSAEncryption),
+    2048 / 8,
+    Result::ERROR_SIGNATURE_ALGORITHM_MISMATCH,
+  },
+  { // Algorithms do not match, both are supported.
+    BS(tlv_sha256WithRSAEncryption),
+    BS(tlv_sha_1WithRSAEncryption),
+    2048 / 8,
+    Result::ERROR_SIGNATURE_ALGORITHM_MISMATCH,
+  },
+  { // Algorithms match, both are unsupported.
+    BS(tlv_md5WithRSAEncryption),
+    BS(tlv_md5WithRSAEncryption),
+    2048 / 8,
+    Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED
+  },
+  { // signatureAlgorithm is unsupported, signature is supported.
+    BS(tlv_md5WithRSAEncryption),
+    BS(tlv_sha256WithRSAEncryption),
+    2048 / 8,
+    Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED
+  },
+  { // signatureAlgorithm is supported, signature is unsupported.
+    BS(tlv_sha256WithRSAEncryption),
+    BS(tlv_md5WithRSAEncryption),
+    2048 / 8,
+    Result::ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED
+  },
+  { // Both have the optional NULL parameter.
+    BS(tlv_sha256WithRSAEncryption) + TLV(der::NULLTag, ByteString()),
+    BS(tlv_sha256WithRSAEncryption) + TLV(der::NULLTag, ByteString()),
+    2048 / 8,
+    Success
+  },
+  { // signatureAlgorithm has the optional NULL parameter, signature doesn't.
+    BS(tlv_sha256WithRSAEncryption) + TLV(der::NULLTag, ByteString()),
+    BS(tlv_sha256WithRSAEncryption),
+    2048 / 8,
+    Success
+  },
+  { // signatureAlgorithm does not have the optional NULL parameter, signature
+    // does.
+    BS(tlv_sha256WithRSAEncryption),
+    BS(tlv_sha256WithRSAEncryption) + TLV(der::NULLTag, ByteString()),
+    2048 / 8,
+    Success
+  },
+  { // The different OIDs for RSA-with-SHA1 we support are semantically
+    // equivalent.
+    BS(tlv_sha1WithRSASignature),
+    BS(tlv_sha_1WithRSAEncryption),
+    2048 / 8,
+    Success,
+  },
+  { // The different OIDs for RSA-with-SHA1 we support are semantically
+    // equivalent (opposite order).
+    BS(tlv_sha_1WithRSAEncryption),
+    BS(tlv_sha1WithRSASignature),
+    2048 / 8,
+    Success,
+  },
+  { // Algorithms match, both are supported, key size is not a multile of 128
+    // bits. This test verifies that we're not wrongly rounding up the
+    // signature size like we did in the original patch for bug 1131767.
+    BS(tlv_sha256WithRSAEncryption),
+    BS(tlv_sha256WithRSAEncryption),
+    (2048 / 8) - 1,
+    Success
+  },
+};
+
+class pkixcheck_CheckSignatureAlgorithm
+  : public ::testing::Test
+  , public ::testing::WithParamInterface<CheckSignatureAlgorithmTestParams>
+{
+};
+
+class pkixcheck_CheckSignatureAlgorithm_TrustDomain final
+  : public EverythingFailsByDefaultTrustDomain
+{
+public:
+  explicit pkixcheck_CheckSignatureAlgorithm_TrustDomain(
+             unsigned int publicKeySizeInBits)
+    : publicKeySizeInBits(publicKeySizeInBits)
+    , checkedDigestAlgorithm(false)
+    , checkedModulusSizeInBits(false)
+  {
+  }
+
+  Result CheckSignatureDigestAlgorithm(DigestAlgorithm) override
+  {
+    checkedDigestAlgorithm = true;
+    return Success;
+  }
+
+  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA endEntityOrCA,
+                                            unsigned int modulusSizeInBits)
+    override
+  {
+    EXPECT_EQ(EndEntityOrCA::MustBeEndEntity, endEntityOrCA);
+    EXPECT_EQ(publicKeySizeInBits, modulusSizeInBits);
+    checkedModulusSizeInBits = true;
+    return Success;
+  }
+
+  const unsigned int publicKeySizeInBits;
+  bool checkedDigestAlgorithm;
+  bool checkedModulusSizeInBits;
+};
+
+TEST_P(pkixcheck_CheckSignatureAlgorithm, CheckSignatureAlgorithm)
+{
+  const CheckSignatureAlgorithmTestParams& params(GetParam());
+
+  Input signatureValueInput;
+  ASSERT_EQ(Success,
+            signatureValueInput.Init(params.signatureValue.data(),
+                                     params.signatureValue.length()));
+
+  pkixcheck_CheckSignatureAlgorithm_TrustDomain
+    trustDomain(params.signatureLengthInBytes * 8);
+
+  der::SignedDataWithSignature signedData;
+  ASSERT_EQ(Success,
+            signedData.algorithm.Init(params.signatureAlgorithmValue.data(),
+                                      params.signatureAlgorithmValue.length()));
+
+  ByteString dummySignature(params.signatureLengthInBytes, 0xDE);
+  ASSERT_EQ(Success,
+            signedData.signature.Init(dummySignature.data(),
+                                      dummySignature.length()));
+
+  ASSERT_EQ(params.expectedResult,
+            CheckSignatureAlgorithm(trustDomain, EndEntityOrCA::MustBeEndEntity,
+                                    signedData, signatureValueInput));
+  ASSERT_EQ(params.expectedResult == Success,
+            trustDomain.checkedDigestAlgorithm);
+  ASSERT_EQ(params.expectedResult == Success,
+            trustDomain.checkedModulusSizeInBits);
+}
+
+INSTANTIATE_TEST_CASE_P(
+  pkixcheck_CheckSignatureAlgorithm, pkixcheck_CheckSignatureAlgorithm,
+  testing::ValuesIn(CHECKSIGNATUREALGORITHM_TEST_PARAMS));
+
+class pkixcheck_CheckSignatureAlgorithm_BuildCertChain_TrustDomain
+  : public DefaultCryptoTrustDomain
+{
+public:
+  explicit pkixcheck_CheckSignatureAlgorithm_BuildCertChain_TrustDomain(
+             const ByteString& issuer)
+    : issuer(issuer)
+  {
+  }
+
+  Result GetCertTrust(EndEntityOrCA, const CertPolicyId&,
+                      Input cert, /*out*/ TrustLevel& trustLevel) override
+  {
+    trustLevel = InputEqualsByteString(cert, issuer)
+               ? TrustLevel::TrustAnchor
+               : TrustLevel::InheritsTrust;
+    return Success;
+  }
+
+  Result FindIssuer(Input, IssuerChecker& checker, Time) override
+  {
+    EXPECT_FALSE(ENCODING_FAILED(issuer));
+
+    Input issuerInput;
+    EXPECT_EQ(Success, issuerInput.Init(issuer.data(), issuer.length()));
+
+    bool keepGoing;
+    EXPECT_EQ(Success, checker.Check(issuerInput, nullptr, keepGoing));
+    EXPECT_FALSE(keepGoing);
+
+    return Success;
+  }
+
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
+                         /*optional*/ const Input*,
+                         /*optional*/ const Input*) override
+  {
+    return Success;
+  }
+
+  Result IsChainValid(const DERArray&, Time) override
+  {
+    return Success;
+  }
+
+  ByteString issuer;
+};
+
+// Test that CheckSignatureAlgorithm actually gets called at some point when
+// BuildCertChain is called.
+TEST_F(pkixcheck_CheckSignatureAlgorithm, BuildCertChain)
+{
+  ScopedTestKeyPair keyPair(CloneReusedKeyPair());
+  ASSERT_TRUE(keyPair);
+
+  ByteString issuerExtensions[2];
+  issuerExtensions[0] = CreateEncodedBasicConstraints(true, nullptr,
+                                                      Critical::No);
+  ASSERT_FALSE(ENCODING_FAILED(issuerExtensions[0]));
+
+  ByteString issuer(CreateEncodedCertificate(3,
+                                             sha256WithRSAEncryption,
+                                             CreateEncodedSerialNumber(1),
+                                             CNToDERName("issuer"),
+                                             oneDayBeforeNow, oneDayAfterNow,
+                                             CNToDERName("issuer"),
+                                             *keyPair,
+                                             issuerExtensions,
+                                             *keyPair,
+                                             sha256WithRSAEncryption));
+  ASSERT_FALSE(ENCODING_FAILED(issuer));
+
+  ByteString subject(CreateEncodedCertificate(3,
+                                              TLV(der::SEQUENCE,
+                                                  BS(tlv_sha_1WithRSAEncryption)),
+                                              CreateEncodedSerialNumber(2),
+                                              CNToDERName("issuer"),
+                                              oneDayBeforeNow, oneDayAfterNow,
+                                              CNToDERName("subject"),
+                                              *keyPair,
+                                              nullptr,
+                                              *keyPair,
+                                              sha256WithRSAEncryption));
+  ASSERT_FALSE(ENCODING_FAILED(subject));
+
+  Input subjectInput;
+  ASSERT_EQ(Success, subjectInput.Init(subject.data(), subject.length()));
+  pkixcheck_CheckSignatureAlgorithm_BuildCertChain_TrustDomain
+    trustDomain(issuer);
+  Result rv = BuildCertChain(trustDomain, subjectInput, Now(),
+                             EndEntityOrCA::MustBeEndEntity,
+                             KeyUsage::noParticularKeyUsageRequired,
+                             KeyPurposeId::anyExtendedKeyUsage,
+                             CertPolicyId::anyPolicy,
+                             nullptr);
+  ASSERT_EQ(Result::ERROR_SIGNATURE_ALGORITHM_MISMATCH, rv);
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixcheck_CheckValidity_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -23,8 +23,6 @@
  */
 
 #include "pkixgtest.h"
-#include "pkix/pkixtypes.h"
-#include "pkixtestutil.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
@@ -70,7 +68,7 @@
     0x17/*UTCTime*/, 0/*length*/,
   };
   static const Input validity(DER);
-  ASSERT_EQ(Result::ERROR_EXPIRED_CERTIFICATE, CheckValidity(validity, NOW));
+  ASSERT_EQ(Result::ERROR_INVALID_DER_TIME, CheckValidity(validity, NOW));
 }
 
 TEST_F(pkixcheck_CheckValidity, NotBeforeEmptyNull)
@@ -80,7 +78,7 @@
     NEWER_UTCTIME
   };
   static const Input validity(DER);
-  ASSERT_EQ(Result::ERROR_EXPIRED_CERTIFICATE, CheckValidity(validity, NOW));
+  ASSERT_EQ(Result::ERROR_INVALID_DER_TIME, CheckValidity(validity, NOW));
 }
 
 TEST_F(pkixcheck_CheckValidity, NotAfterEmptyNull)
@@ -90,8 +88,7 @@
     0x17/*UTCTime*/, 0x00/*length*/,
   };
   static const Input validity(DER);
-  ASSERT_EQ(Result::ERROR_NOT_YET_VALID_CERTIFICATE,
-            CheckValidity(validity, NOW));
+  ASSERT_EQ(Result::ERROR_INVALID_DER_TIME, CheckValidity(validity, NOW));
 }
 
 static const uint8_t OLDER_UTCTIME_NEWER_UTCTIME_DATA[] = {
@@ -155,6 +152,5 @@
     OLDER_UTCTIME,
   };
   static const Input validity(DER);
-  ASSERT_EQ(Result::ERROR_NOT_YET_VALID_CERTIFICATE,
-            CheckValidity(validity, NOW));
+  ASSERT_EQ(Result::ERROR_INVALID_DER_TIME, CheckValidity(validity, NOW));
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixder_universal_types_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixder_universal_types_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixder_universal_types_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixder_universal_types_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -23,12 +23,11 @@
  */
 
 #include <limits>
+#include <stdint.h>
 #include <vector>
-#include "pkixgtest.h"
 
 #include "pkixder.h"
-#include "pkixtestutil.h"
-#include "stdint.h"
+#include "pkixgtest.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::der;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixgtest.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixgtest.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixgtest.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixgtest.h	2015-02-28 15:03:01.000000000 +0000
@@ -56,7 +56,8 @@
 #pragma warning(pop)
 #endif
 
-#include "pkix/Result.h"
+#include "pkix/pkix.h"
+#include "pkixtestutil.h"
 
 // PrintTo must be in the same namespace as the type we're overloading it for.
 namespace mozilla { namespace pkix {
@@ -82,6 +83,122 @@
 extern const std::time_t oneDayBeforeNow;
 extern const std::time_t oneDayAfterNow;
 
+
+class EverythingFailsByDefaultTrustDomain : public TrustDomain
+{
+public:
+  Result GetCertTrust(EndEntityOrCA, const CertPolicyId&,
+                      Input, /*out*/ TrustLevel&) override
+  {
+    ADD_FAILURE();
+    return NotReached("GetCertTrust should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result FindIssuer(Input, IssuerChecker&, Time) override
+  {
+    ADD_FAILURE();
+    return NotReached("FindIssuer should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
+                          /*optional*/ const Input*,
+                          /*optional*/ const Input*) override
+  {
+    ADD_FAILURE();
+    return NotReached("CheckRevocation should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result IsChainValid(const DERArray&, Time) override
+  {
+    ADD_FAILURE();
+    return NotReached("IsChainValid should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result DigestBuf(Input, DigestAlgorithm, /*out*/ uint8_t*, size_t) override
+  {
+    ADD_FAILURE();
+    return NotReached("DigestBuf should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result CheckSignatureDigestAlgorithm(DigestAlgorithm) override
+  {
+    ADD_FAILURE();
+    return NotReached("CheckSignatureDigestAlgorithm should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
+  {
+    ADD_FAILURE();
+    return NotReached("CheckECDSACurveIsAcceptable should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result VerifyECDSASignedDigest(const SignedDigest&, Input) override
+  {
+    ADD_FAILURE();
+    return NotReached("VerifyECDSASignedDigest should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
+                                            override
+  {
+    ADD_FAILURE();
+    return NotReached("CheckRSAPublicKeyModulusSizeInBits should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+
+  Result VerifyRSAPKCS1SignedDigest(const SignedDigest&, Input) override
+  {
+    ADD_FAILURE();
+    return NotReached("VerifyRSAPKCS1SignedDigest should not be called",
+                      Result::FATAL_ERROR_LIBRARY_FAILURE);
+  }
+};
+
+class DefaultCryptoTrustDomain : public EverythingFailsByDefaultTrustDomain
+{
+  Result DigestBuf(Input item, DigestAlgorithm digestAlg,
+                   /*out*/ uint8_t* digestBuf, size_t digestBufLen) override
+  {
+    return TestDigestBuf(item, digestAlg, digestBuf, digestBufLen);
+  }
+
+  Result CheckSignatureDigestAlgorithm(DigestAlgorithm) override
+  {
+    return Success;
+  }
+
+  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) override
+  {
+    return Success;
+  }
+
+  Result VerifyECDSASignedDigest(const SignedDigest& signedDigest,
+                                 Input subjectPublicKeyInfo) override
+  {
+    return TestVerifyECDSASignedDigest(signedDigest, subjectPublicKeyInfo);
+  }
+
+  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
+                                            override
+  {
+    return Success;
+  }
+
+  Result VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
+                                    Input subjectPublicKeyInfo) override
+  {
+    return TestVerifyRSAPKCS1SignedDigest(signedDigest, subjectPublicKeyInfo);
+  }
+};
+
 } } } // namespace mozilla::pkix::test
 
 #endif // mozilla_pkix_pkixgtest_h
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixnames_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixnames_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixnames_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixnames_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -21,11 +21,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "pkix/pkix.h"
 #include "pkixcheck.h"
 #include "pkixder.h"
 #include "pkixgtest.h"
-#include "pkixtestutil.h"
 #include "pkixutil.h"
 
 namespace mozilla { namespace pkix {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixocsp_CreateEncodedOCSPRequest_tests.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -23,42 +23,15 @@
  */
 
 #include "pkixgtest.h"
-#include "pkix/pkix.h"
 #include "pkixder.h"
-#include "pkixtestutil.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
 
-class CreateEncodedOCSPRequestTrustDomain final : public TrustDomain
+class CreateEncodedOCSPRequestTrustDomain final
+  : public EverythingFailsByDefaultTrustDomain
 {
 private:
-  Result GetCertTrust(EndEntityOrCA, const CertPolicyId&, Input,
-                      /*out*/ TrustLevel&) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result FindIssuer(Input, IssuerChecker&, Time) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time, const Input*,
-                         const Input*) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result IsChainValid(const DERArray&, Time) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
   Result DigestBuf(Input item, DigestAlgorithm digestAlg,
                    /*out*/ uint8_t *digestBuf, size_t digestBufLen)
                    override
@@ -67,28 +40,9 @@
   }
 
   Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            final override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest&, Input) override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) final override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest&, Input) override
+                                            override
   {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
+    return Success;
   }
 };
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/gtest/pkixocsp_VerifyEncodedOCSPResponse.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -22,21 +22,18 @@
  * limitations under the License.
  */
 
-#include "pkix/pkix.h"
 #include "pkixgtest.h"
-#include "pkixtestutil.h"
 
 using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
 
 const uint16_t END_ENTITY_MAX_LIFETIME_IN_DAYS = 10;
 
-class OCSPTestTrustDomain : public TrustDomain
+// Note that CheckRevocation is never called for OCSP signing certificates.
+class OCSPTestTrustDomain : public DefaultCryptoTrustDomain
 {
 public:
-  OCSPTestTrustDomain()
-  {
-  }
+  OCSPTestTrustDomain() { }
 
   Result GetCertTrust(EndEntityOrCA endEntityOrCA, const CertPolicyId&,
                       Input, /*out*/ TrustLevel& trustLevel)
@@ -46,62 +43,6 @@
     trustLevel = TrustLevel::InheritsTrust;
     return Success;
   }
-
-  Result FindIssuer(Input, IssuerChecker&, Time) final override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result CheckRevocation(EndEntityOrCA, const CertID&, Time,
-                         /*optional*/ const Input*, /*optional*/ const Input*)
-                         final override
-  {
-    // TODO: I guess mozilla::pkix should support revocation of designated
-    // OCSP responder eventually, but we don't now, so this function should
-    // never get called.
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result IsChainValid(const DERArray&, Time) final override
-  {
-    ADD_FAILURE();
-    return Result::FATAL_ERROR_LIBRARY_FAILURE;
-  }
-
-  Result DigestBuf(Input item, DigestAlgorithm digestAlg,
-                   /*out*/ uint8_t* digestBuf, size_t digestBufLen)
-                   final override
-  {
-    return TestDigestBuf(item, digestAlg, digestBuf, digestBufLen);
-  }
-
-  Result CheckRSAPublicKeyModulusSizeInBits(EndEntityOrCA, unsigned int)
-                                            final override
-  {
-    return Success;
-  }
-
-  Result VerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
-                                    Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyRSAPKCS1SignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-  Result CheckECDSACurveIsAcceptable(EndEntityOrCA, NamedCurve) final override
-  {
-    return Success;
-  }
-
-  Result VerifyECDSASignedDigest(const SignedDigest& signedDigest,
-                                 Input subjectPublicKeyInfo) override
-  {
-    return TestVerifyECDSASignedDigest(signedDigest, subjectPublicKeyInfo);
-  }
-
-  OCSPTestTrustDomain(const OCSPTestTrustDomain&) = delete;
-  void operator=(const OCSPTestTrustDomain&) = delete;
 };
 
 namespace {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/lib/pkixtestnss.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/lib/pkixtestnss.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/lib/pkixtestnss.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/lib/pkixtestnss.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -370,20 +370,6 @@
                            privateKey.release());
 }
 
-ByteString
-SHA1(const ByteString& toHash)
-{
-  InitNSSIfNeeded();
-
-  uint8_t digestBuf[SHA1_LENGTH];
-  SECStatus srv = PK11_HashBuf(SEC_OID_SHA1, digestBuf, toHash.data(),
-                               static_cast<int32_t>(toHash.length()));
-  if (srv != SECSuccess) {
-    return ByteString();
-  }
-  return ByteString(digestBuf, sizeof(digestBuf));
-}
-
 Result
 TestVerifyECDSASignedDigest(const SignedDigest& signedDigest,
                             Input subjectPublicKeyInfo)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/lib/pkixtestutil.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/lib/pkixtestutil.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/lib/pkixtestutil.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/lib/pkixtestutil.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -173,6 +173,22 @@
 static ByteString CertStatus(OCSPResponseContext& context);
 
 static ByteString
+SHA1(const ByteString& toHash)
+{
+  uint8_t digestBuf[20];
+  Input input;
+  if (input.Init(toHash.data(), toHash.length()) != Success) {
+    abort();
+  }
+  Result rv = TestDigestBuf(input, DigestAlgorithm::sha1, digestBuf,
+                            sizeof(digestBuf));
+  if (rv != Success) {
+    abort();
+  }
+  return ByteString(digestBuf, sizeof(digestBuf));
+}
+
+static ByteString
 HashedOctetString(const ByteString& bytes)
 {
   ByteString digest(SHA1(bytes));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/lib/pkixtestutil.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/lib/pkixtestutil.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/test/lib/pkixtestutil.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/test/lib/pkixtestutil.h	2015-02-28 15:03:01.000000000 +0000
@@ -270,8 +270,6 @@
 inline void DeleteTestKeyPair(TestKeyPair* keyPair) { delete keyPair; }
 typedef ScopedPtr<TestKeyPair, DeleteTestKeyPair> ScopedTestKeyPair;
 
-ByteString SHA1(const ByteString& toHash);
-
 Result TestVerifyECDSASignedDigest(const SignedDigest& signedDigest,
                                    Input subjectPublicKeyInfo);
 Result TestVerifyRSAPKCS1SignedDigest(const SignedDigest& signedDigest,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/warnings.mozbuild thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/warnings.mozbuild
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/pkix/warnings.mozbuild	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/pkix/warnings.mozbuild	2015-02-28 15:03:01.000000000 +0000
@@ -9,6 +9,7 @@
     '-Wno-missing-prototypes',
     '-Wno-missing-variable-declarations',
     '-Wno-padded',
+    '-Wno-reserved-id-macro', # NSPR and NSS use reserved IDs in their include guards.
     '-Wno-shadow', # XXX: Clang's rules are too strict for constructors.
     '-Wno-weak-vtables', # We rely on the linker to merge the duplicate vtables.
   ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/sandbox/linux/SandboxFilter.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/sandbox/linux/SandboxFilter.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/sandbox/linux/SandboxFilter.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/sandbox/linux/SandboxFilter.cpp	2015-02-28 15:03:01.000000000 +0000
@@ -204,6 +204,7 @@
   Allow(SYSCALL_LARGEFILE(fstat, fstat64));
   Allow(SYSCALL_LARGEFILE(stat, stat64));
   Allow(SYSCALL_LARGEFILE(lstat, lstat64));
+  Allow(SYSCALL_LARGEFILE(newfstatat, fstatat64));
   Allow(SOCKETCALL(socketpair, SOCKETPAIR));
   Deny(EACCES, SOCKETCALL(socket, SOCKET));
   Allow(SYSCALL(open));
@@ -211,6 +212,7 @@
   Allow(SYSCALL(prctl));
   Allow(SYSCALL(access));
   Allow(SYSCALL(unlink));
+  Allow(SYSCALL(unlinkat));
   Allow(SYSCALL(fsync));
   Allow(SYSCALL(msync));
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/sandbox/mac/Sandbox.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/sandbox/mac/Sandbox.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/sandbox/mac/Sandbox.h	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/sandbox/mac/Sandbox.h	2015-02-28 15:03:01.000000000 +0000
@@ -38,6 +38,7 @@
   MacSandboxPluginInfo pluginInfo;
   nsCString appPath;
   nsCString appBinaryPath;
+  nsCString appDir;
 } MacSandboxInfo;
 
 namespace mozilla {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/sandbox/mac/Sandbox.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/sandbox/mac/Sandbox.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/security/sandbox/mac/Sandbox.mm	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/security/sandbox/mac/Sandbox.mm	2015-02-28 15:03:01.000000000 +0000
@@ -6,6 +6,7 @@
 #include "Sandbox.h"
 
 #include "nsCocoaFeatures.h"
+#include "mozilla/Preferences.h"
 
 // XXX There are currently problems with the /usr/include/sandbox.h file on
 // some/all of the Macs in Mozilla's build system.  For the time being (until
@@ -44,7 +45,236 @@
 
 static const char contentSandboxRules[] =
   "(version 1)\n"
-  "(allow default)\n";
+  "\n"
+  "(define sandbox-level %d)\n"
+  "(define macosMajorVersion %d)\n"
+  "(define macosMinorVersion %d)\n"
+  "(define appPath \"%s\")\n"
+  "(define appBinaryPath \"%s\")\n"
+  "(define appDir \"%s\")\n"
+  "(define home-path \"%s\")\n"
+  "\n"
+  "(import \"/System/Library/Sandbox/Profiles/system.sb\")\n"
+  "\n"
+  "(if \n"
+  "  (or\n"
+  "    (< macosMinorVersion 9)\n"
+  "    (= sandbox-level 0))\n"
+  "  (allow default)\n"
+  "  (begin\n"
+  "    (deny default)\n"
+  "    (debug deny)\n"
+  "\n"
+  "    (define resolving-literal literal)\n"
+  "    (define resolving-subpath subpath)\n"
+  "    (define resolving-regex regex)\n"
+  "\n"
+  "    (define container-path appPath)\n"
+  "    (define appdir-path appDir)\n"
+  "    (define var-folders-re \"^/private/var/folders/[^/][^/]\")\n"
+  "    (define var-folders2-re (string-append var-folders-re \"/[^/]*/[^/]\"))\n"
+  "\n"
+  "    (define (home-regex home-relative-regex)\n"
+  "      (resolving-regex (string-append \"^\" (regex-quote home-path) home-relative-regex)))\n"
+  "    (define (home-subpath home-relative-subpath)\n"
+  "      (resolving-subpath (string-append home-path home-relative-subpath)))\n"
+  "    (define (home-literal home-relative-literal)\n"
+  "      (resolving-literal (string-append home-path home-relative-literal)))\n"
+  "\n"
+  "    (define (container-regex container-relative-regex)\n"
+  "      (resolving-regex (string-append \"^\" (regex-quote container-path) container-relative-regex)))\n"
+  "    (define (container-subpath container-relative-subpath)\n"
+  "      (resolving-subpath (string-append container-path container-relative-subpath)))\n"
+  "    (define (container-literal container-relative-literal)\n"
+  "      (resolving-literal (string-append container-path container-relative-literal)))\n"
+  "\n"
+  "    (define (var-folders-regex var-folders-relative-regex)\n"
+  "      (resolving-regex (string-append var-folders-re var-folders-relative-regex)))\n"
+  "    (define (var-folders2-regex var-folders2-relative-regex)\n"
+  "      (resolving-regex (string-append var-folders2-re var-folders2-relative-regex)))\n"
+  "\n"
+  "    (define (appdir-regex appdir-relative-regex)\n"
+  "      (resolving-regex (string-append \"^\" (regex-quote appdir-path) appdir-relative-regex)))\n"
+  "    (define (appdir-subpath appdir-relative-subpath)\n"
+  "      (resolving-subpath (string-append appdir-path appdir-relative-subpath)))\n"
+  "    (define (appdir-literal appdir-relative-literal)\n"
+  "      (resolving-literal (string-append appdir-path appdir-relative-literal)))\n"
+  "\n"
+  "    (define (allow-shared-preferences-read domain)\n"
+  "          (begin\n"
+  "            (if (defined? `user-preference-read)\n"
+  "              (allow user-preference-read (preference-domain domain)))\n"
+  "            (allow file-read*\n"
+  "                   (home-literal (string-append \"/Library/Preferences/\" domain \".plist\"))\n"
+  "                   (home-regex (string-append \"/Library/Preferences/ByHost/\" (regex-quote domain) \"\\..*\\.plist$\")))\n"
+  "            ))\n"
+  "\n"
+  "    (define (allow-shared-list domain)\n"
+  "      (allow file-read*\n"
+  "             (home-regex (string-append \"/Library/Preferences/\" (regex-quote domain)))))\n"
+  "\n"
+  "    (allow file-read-metadata)\n"
+  "\n"
+  "    (allow ipc-posix-shm\n"
+  "        (ipc-posix-name-regex \"^/tmp/com.apple.csseed:\")\n"
+  "        (ipc-posix-name-regex \"^CFPBS:\")\n"
+  "        (ipc-posix-name-regex \"^AudioIO\"))\n"
+  "\n"
+  "    (allow file-read-metadata\n"
+  "        (literal \"/home\")\n"
+  "        (literal \"/net\")\n"
+  "        (regex \"^/private/tmp/KSInstallAction\\.\")\n"
+  "        (var-folders-regex \"/\")\n"
+  "        (home-subpath \"/Library\"))\n"
+  "    \n"
+  "    (allow signal (target self))\n"
+  "    (allow job-creation (literal \"/Library/CoreMediaIO/Plug-Ins/DAL\"))\n"
+  "\n"
+  "    (allow mach-lookup\n"
+  "        (global-name \"com.apple.coreservices.launchservicesd\")\n"
+  "        (global-name \"com.apple.coreservices.appleevents\")\n"
+  "        (global-name \"com.apple.pasteboard.1\")\n"
+  "        (global-name \"com.apple.window_proxies\")\n"
+  "        (global-name \"com.apple.windowserver.active\")\n"
+  "        (global-name \"com.apple.cvmsServ\")\n"
+  "        (global-name \"com.apple.audio.coreaudiod\")\n"
+  "        (global-name \"com.apple.audio.audiohald\")\n"
+  "        (global-name \"com.apple.PowerManagement.control\")\n"
+  "        (global-name \"com.apple.cmio.VDCAssistant\")\n"
+  "        (global-name \"com.apple.SystemConfiguration.configd\")\n"
+  "        (global-name \"com.apple.iconservices\")\n"
+  "        (global-name \"com.apple.cookied\")\n"
+  "        (global-name \"com.apple.printuitool.agent\")\n"
+  "        (global-name \"com.apple.printtool.agent\")\n"
+  "        (global-name \"com.apple.cache_delete\")\n"
+  "        (global-name \"com.apple.pluginkit.pkd\")\n"
+  "        (global-name \"com.apple.bird\")\n"
+  "        (global-name \"com.apple.DesktopServicesHelper\")\n"
+  "        (global-name \"com.apple.printtool.daemon\"))\n"
+  "    \n"
+  "    (allow iokit-open\n"
+  "        (iokit-user-client-class \"AppleGraphicsControlClient\")\n"
+  "        (iokit-user-client-class \"IOHIDParamUserClient\")\n"
+  "        (iokit-user-client-class \"IOAudioControlUserClient\")\n"
+  "        (iokit-user-client-class \"IOAudioEngineUserClient\")\n"
+  "        (iokit-user-client-class \"IGAccelDevice\")\n"
+  "        (iokit-user-client-class \"nvDevice\")\n"
+  "        (iokit-user-client-class \"nvSharedUserClient\")\n"
+  "        (iokit-user-client-class \"nvFermiGLContext\")\n"
+  "        (iokit-user-client-class \"IGAccelGLContext\")\n"
+  "        (iokit-user-client-class \"AGPMClient\")\n"
+  "        (iokit-user-client-class \"IOSurfaceRootUserClient\")\n"
+  "        (iokit-user-client-class \"IGAccelSharedUserClient\")\n"
+  "        (iokit-user-client-class \"IGAccelVideoContextMain\")\n"
+  "        (iokit-user-client-class \"IGAccelVideoContextMedia\")\n"
+  "        (iokit-user-client-class \"IGAccelVideoContextVEBox\")\n"
+  "        (iokit-user-client-class \"RootDomainUserClient\")\n"
+  "        (iokit-user-client-class \"IOUSBDeviceUserClientV2\")\n"
+  "        (iokit-user-client-class \"IOUSBInterfaceUserClientV2\"))\n"
+  "\n"
+  "; depending on systems, the 1st, 2nd or both rules are necessary\n"
+  "    (allow-shared-preferences-read \"com.apple.HIToolbox\")\n"
+  "    (allow file-read-data (literal \"/Library/Preferences/com.apple.HIToolbox.plist\"))\n"
+  "    \n"
+  "    (allow file-read*\n"
+  "        (subpath \"/Library/Fonts\")\n"
+  "        (subpath \"/Library/Audio/Plug-Ins\")\n"
+  "        (subpath \"/Library/CoreMediaIO/Plug-Ins/DAL\")\n"
+  "        (subpath \"/Library/Spelling\")\n"
+  "        (subpath \"/private/etc/cups/ppd\")\n"
+  "        (subpath \"/private/var/run/cupsd\")\n"
+  "        (literal \"/\")\n"
+  "        (literal \"/private/tmp\")\n"
+  "        (literal \"/private/var/tmp\")\n"
+  "\n"
+  "        (home-literal \"/.CFUserTextEncoding\")\n"
+  "        (home-literal \"/Library/Preferences/com.apple.DownloadAssessment.plist\")\n"
+  "        (home-subpath \"/Library/Colors\")\n"
+  "        (home-subpath \"/Library/Fonts\")\n"
+  "        (home-subpath \"/Library/FontCollections\")\n"
+  "        (home-subpath \"/Library/Keyboard Layouts\")\n"
+  "        (home-subpath \"/Library/Input Methods\")\n"
+  "        (home-subpath \"/Library/PDF Services\")\n"
+  "        (home-subpath \"/Library/Spelling\")\n"
+  "\n"
+  "        (subpath appdir-path)\n"
+  "\n"
+  "        (literal appPath)\n"
+  "        (literal appBinaryPath))\n"
+  "\n"
+  "    (allow-shared-list \"org.mozilla.plugincontainer\")\n"
+  "\n"
+  "; the following 2 rules should be removed when microphone and camera access\n"
+  "; are brokered through the content process\n"
+  "    (allow device-microphone)\n"
+  "    (allow device-camera)\n"
+  "\n"
+  "    (allow file* (var-folders2-regex \"/com\\.apple\\.IntlDataCache\\.le$\"))\n"
+  "    (allow file-read* (var-folders2-regex \"/com\\.apple\\.IconServices/\"))\n"
+  "\n"
+  "    (allow file-write* (var-folders2-regex \"/org\\.chromium\\.[a-zA-Z0-9]*$\"))\n"
+  "    \n"
+  "; the following rules should be removed when printing and \n"
+  "; opening a file from disk are brokered through the main process\n"
+  "    (allow file*\n"
+  "        (require-all\n"
+  "            (subpath home-path)\n"
+  "            (require-not\n"
+  "                (home-subpath \"/Library\"))))\n"
+  "    \n"
+  "; printing\n"
+  "    (allow authorization-right-obtain\n"
+  "           (right-name \"system.print.operator\")\n"
+  "           (right-name \"system.printingmanager\"))\n"
+  "    (allow mach-lookup\n"
+  "           (global-name \"com.apple.printuitool.agent\")\n"
+  "           (global-name \"com.apple.printtool.agent\")\n"
+  "           (global-name \"com.apple.printtool.daemon\")\n"
+  "           (global-name \"com.apple.sharingd\")\n"
+  "           (global-name \"com.apple.metadata.mds\")\n"
+  "           (global-name \"com.apple.mtmd.xpc\")\n"
+  "           (global-name \"com.apple.FSEvents\")\n"
+  "           (global-name \"com.apple.locum\")\n"
+  "           (global-name \"com.apple.ImageCaptureExtension2.presence\"))\n"
+  "    (allow file-read*\n"
+  "           (home-literal \"/.cups/lpoptions\")\n"
+  "           (home-literal \"/.cups/client.conf\")\n"
+  "           (literal \"/private/etc/cups/lpoptions\")\n"
+  "           (literal \"/private/etc/cups/client.conf\")\n"
+  "           (subpath \"/private/etc/cups/ppd\")\n"
+  "           (literal \"/private/var/run/cupsd\"))\n"
+  "    (allow-shared-preferences-read \"org.cups.PrintingPrefs\")\n"
+  "    (allow-shared-preferences-read \"com.apple.finder\")\n"
+  "    (allow-shared-preferences-read \"com.apple.LaunchServices\")\n"
+  "    (allow-shared-preferences-read \".GlobalPreferences\")\n"
+  "    (allow network-outbound\n"
+  "        (literal \"/private/var/run/cupsd\")\n"
+  "        (literal \"/private/var/run/mDNSResponder\"))\n"
+  "\n"
+  "; print preview\n"
+  "    (if (> macosMinorVersion 9)\n"
+  "        (allow lsopen))\n"
+  "    (allow file-write* file-issue-extension (var-folders2-regex \"/\"))\n"
+  "    (allow file-read-xattr (literal \"/Applications/Preview.app\"))\n"
+  "    (allow mach-task-name)\n"
+  "    (allow mach-register)\n"
+  "    (allow file-read-data\n"
+  "        (regex \"^/Library/Printers/[^/]+/PDEs/[^/]+.plugin\")\n"
+  "        (subpath \"/Library/PDF Services\")\n"
+  "        (subpath \"/Applications/Preview.app\")\n"
+  "        (home-literal \"/Library/Preferences/com.apple.ServicesMenu.Services.plist\"))\n"
+  "    (allow mach-lookup\n"
+  "        (global-name \"com.apple.pbs.fetch_services\")\n"
+  "        (global-name \"com.apple.tsm.uiserver\")\n"
+  "        (global-name \"com.apple.ls.boxd\")\n"
+  "        (global-name \"com.apple.coreservices.quarantine-resolver\")\n"
+  "        (global-name-regex \"_OpenStep$\"))\n"
+  "    (allow appleevent-send\n"
+  "        (appleevent-destination \"com.apple.preview\")\n"
+  "        (appleevent-destination \"com.apple.imagecaptureextension2\"))\n"
+  "\n"
+  "  )\n"
+  ")\n";
 
 bool StartMacSandbox(MacSandboxInfo aInfo, nsCString &aErrorMessage)
 {
@@ -65,7 +295,14 @@
     }
   }
   else if (aInfo.type == MacSandboxType_Content) {
-    profile.AppendPrintf(contentSandboxRules);
+    profile.AppendPrintf(contentSandboxRules,
+                         Preferences::GetInt("security.sandbox.macos.content.level"),
+                         nsCocoaFeatures::OSXVersionMajor(),
+                         nsCocoaFeatures::OSXVersionMinor(),
+                         aInfo.appPath.get(),
+                         aInfo.appBinaryPath.get(),
+                         aInfo.appDir.get(),
+                         getenv("HOME"));
   }
   else {
     aErrorMessage.AppendPrintf("Unexpected sandbox type %u", aInfo.type);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/logmanager.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/logmanager.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/logmanager.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/logmanager.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,279 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+  "resource://gre/modules/Services.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+  "resource://gre/modules/FileUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Log",
+  "resource://gre/modules/Log.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "OS",
+  "resource://gre/modules/osfile.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
+  "resource://services-common/utils.js");
+
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
+
+this.EXPORTED_SYMBOLS = [
+  "LogManager",
+];
+
+const DEFAULT_MAX_ERROR_AGE = 20 * 24 * 60 * 60; // 20 days
+
+// "shared" logs (ie, where the same log name is used by multiple LogManager
+// instances) are a fact of life here - eg, FirefoxAccounts logs are used by
+// both Sync and Reading List.
+// However, different instances have different pref branches, so we need to
+// handle when one pref branch says "Debug" and the other says "Error"
+// So we (a) keep singleton console and dump appenders and (b) keep track
+// of the minimum (ie, most verbose) level and use that.
+// This avoids (a) the most recent setter winning (as that is indeterminate)
+// and (b) multiple dump/console appenders being added to the same log multiple
+// times, which would cause messages to appear twice.
+
+// Singletons used by each instance.
+let formatter;
+let dumpAppender;
+let consoleAppender;
+
+// A set of all preference roots used by all instances.
+let allBranches = new Set();
+
+// The public LogManager object.
+function LogManager(prefRoot, logNames, logFilePrefix) {
+  this.init(prefRoot, logNames, logFilePrefix);
+}
+
+LogManager.prototype = {
+  REASON_SUCCESS: "success",
+  REASON_ERROR: "error",
+
+  _cleaningUpFileLogs: false,
+
+  _prefObservers: [],
+
+  init(prefRoot, logNames, logFilePrefix) {
+    if (prefRoot instanceof Preferences) {
+      this._prefs = prefRoot;
+    } else {
+      this._prefs = new Preferences(prefRoot);
+    }
+
+    this.logFilePrefix = logFilePrefix;
+    if (!formatter) {
+      // Create a formatter and various appenders to attach to the logs.
+      formatter = new Log.BasicFormatter();
+      consoleAppender = new Log.ConsoleAppender(formatter);
+      dumpAppender = new Log.DumpAppender(formatter);
+    }
+
+    allBranches.add(this._prefs._branchStr);
+    // We create a preference observer for all our prefs so they are magically
+    // reflected if the pref changes after creation.
+    let setupAppender = (appender, prefName, defaultLevel, findSmallest = false) => {
+      let observer = newVal => {
+        let level = Log.Level[newVal] || defaultLevel;
+        if (findSmallest) {
+          // We need to find the smallest value from all prefs controlling this appender.
+          for (let branch of allBranches) {
+            let lookPrefBranch = new Preferences(branch);
+            let lookVal = Log.Level[lookPrefBranch.get(prefName)];
+            if (lookVal && lookVal < level) {
+              level = lookVal;
+            }
+          }
+        }
+        appender.level = level;
+      }
+      this._prefs.observe(prefName, observer, this);
+      this._prefObservers.push([prefName, observer]);
+      // and call the observer now with the current pref value.
+      observer(this._prefs.get(prefName));
+      return observer;
+    }
+
+    this._observeConsolePref = setupAppender(consoleAppender, "log.appender.console", Log.Level.Error, true);
+    this._observeDumpPref = setupAppender(dumpAppender, "log.appender.dump", Log.Level.Error, true);
+
+    // The file appender doesn't get the special singleton behaviour.
+    let fapp = this._fileAppender = new Log.StorageStreamAppender(formatter);
+    // the stream gets a default of Debug as the user must go out of their way
+    // to see the stuff spewed to it.
+    this._observeStreamPref = setupAppender(fapp, "log.appender.file.level", Log.Level.Debug);
+
+    // now attach the appenders to all our logs.
+    for (let logName of logNames) {
+      let log = Log.repository.getLogger(logName);
+      for (let appender of [fapp, dumpAppender, consoleAppender]) {
+        log.addAppender(appender);
+      }
+    }
+    // and use the first specified log as a "root" for our log.
+    this._log = Log.repository.getLogger(logNames[0] + ".LogManager");
+  },
+
+  /**
+   * Cleanup this instance
+   */
+  finalize() {
+    for (let [name, pref] of this._prefObservers) {
+      this._prefs.ignore(name, pref, this);
+    }
+    this._prefObservers = [];
+    try {
+      allBranches.delete(this._prefs._branchStr);
+    } catch (e) {}
+    this._prefs = null;
+  },
+
+  get _logFileDirectory() {
+    // At this point we don't allow a custom directory for the logs so
+    // about:sync-log can be used. We could fix this later if necessary.
+    return FileUtils.getDir("ProfD", ["weave", "logs"]);
+  },
+
+  /**
+   * Copy an input stream to the named file, doing everything off the main
+   * thread.
+   * outputFile is an nsIFile, but is used only for the name.
+   * Returns a promise that is resolved with the file modification date on
+   * completion or rejected if there is an error.
+   */
+  _copyStreamToFile: Task.async(function* (inputStream, outputFile) {
+    // The log data could be large, so we don't want to pass it all in a single
+    // message, so use BUFFER_SIZE chunks.
+    const BUFFER_SIZE = 8192;
+
+    // get a binary stream
+    let binaryStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(Ci.nsIBinaryInputStream);
+    binaryStream.setInputStream(inputStream);
+    yield OS.File.makeDir(outputFile.parent.path, { ignoreExisting: true });
+    let output = yield OS.File.open(outputFile.path, { write: true} );
+    try {
+      while (true) {
+        let available = binaryStream.available();
+        if (!available) {
+          break;
+        }
+        let chunk = binaryStream.readByteArray(Math.min(available, BUFFER_SIZE));
+        yield output.write(new Uint8Array(chunk));
+      }
+    } finally {
+      try {
+        binaryStream.close(); // inputStream is closed by the binaryStream
+        yield output.close();
+      } catch (ex) {
+        this._log.error("Failed to close the input stream", ex);
+      }
+    }
+    this._log.trace("finished copy to", outputFile.path);
+  }),
+
+  /**
+   * Possibly generate a log file for all accumulated log messages and refresh
+   * the input & output streams.
+   * Returns a promise that resolves on completion or rejects if the file could
+   * not be written.
+   */
+  resetFileLog: Task.async(function* (reason) {
+    try {
+      let flushToFile;
+      let reasonPrefix;
+      switch (reason) {
+        case this.REASON_SUCCESS:
+          flushToFile = this._prefs.get("log.appender.file.logOnSuccess", false);
+          reasonPrefix = "success";
+          break;
+        case this.REASON_ERROR:
+          flushToFile = this._prefs.get("log.appender.file.logOnError", true);
+          reasonPrefix = "error";
+          break;
+        default:
+          throw new Error("Invalid reason");
+      }
+
+      // might as well avoid creating an input stream if we aren't going to use it.
+      if (!flushToFile) {
+        this._fileAppender.reset();
+        return;
+      }
+
+      let inStream = this._fileAppender.getInputStream();
+      this._fileAppender.reset();
+      if (inStream) {
+        this._log.debug("Flushing file log");
+        // We have reasonPrefix at the start of the filename so all "error"
+        // logs are grouped in about:sync-log.
+        let filename = reasonPrefix + "-" + this.logFilePrefix + "-" + Date.now() + ".txt";
+        let file = this._logFileDirectory;
+        file.append(filename);
+        this._log.trace("Beginning stream copy to " + file.leafName + ": " +
+                        Date.now());
+        try {
+          yield this._copyStreamToFile(inStream, file);
+          this._log.trace("onCopyComplete", Date.now());
+        } catch (ex) {
+          this._log.error("Failed to copy log stream to file", ex);
+          return;
+        }
+        // It's not completely clear to markh why we only do log cleanups
+        // for errors, but for now the Sync semantics have been copied...
+        // (one theory is that only cleaning up on error makes it less
+        // likely old error logs would be removed, but that's not true if
+        // there are occasional errors - let's address this later!)
+        if (reason == this.REASON_ERROR && !this._cleaningUpFileLogs) {
+          this._log.trace("Scheduling cleanup.");
+          // Note we don't return/yield or otherwise wait on this promise - it
+          // continues in the background
+          this.cleanupLogs().catch(err => {
+            this._log.error("Failed to cleanup logs", err);
+          });
+        }
+      }
+    } catch (ex) {
+      this._log.error("Failed to resetFileLog", ex)
+    }
+  }),
+
+  /**
+   * Finds all logs older than maxErrorAge and deletes them using async I/O.
+   */
+  cleanupLogs: Task.async(function* () {
+    this._cleaningUpFileLogs = true;
+    let iterator = new OS.File.DirectoryIterator(this._logFileDirectory.path);
+    let maxAge = this._prefs.get("log.appender.file.maxErrorAge", DEFAULT_MAX_ERROR_AGE);
+    let threshold = Date.now() - 1000 * maxAge;
+
+    this._log.debug("Log cleanup threshold time: " + threshold);
+    yield iterator.forEach(Task.async(function* (entry) {
+      if (!entry.name.startsWith("error-" + this.logFilePrefix + "-") &&
+          !entry.name.startsWith("success-" + this.logFilePrefix + "-")) {
+        return;
+      }
+      try {
+        // need to call .stat() as the enumerator doesn't give that to us on *nix.
+        let info = yield OS.File.stat(entry.path);
+        if (info.lastModificationDate.getTime() >= threshold) {
+          return;
+        }
+        this._log.trace(" > Cleanup removing " + entry.name +
+                        " (" + info.lastModificationDate.getTime() + ")");
+        yield OS.File.remove(entry.path);
+        this._log.trace("Deleted " + entry.name);
+      } catch (ex) {
+        this._log.debug("Encountered error trying to clean up old log file "
+                        + entry.name, ex);
+      }
+    }.bind(this)));
+    this._cleaningUpFileLogs = false;
+    this._log.debug("Done deleting files.");
+    // This notification is used only for tests.
+    Services.obs.notifyObservers(null, "services-tests:common:log-manager:cleanup-logs", null);
+  }),
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/moz.build	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/moz.build	2015-02-28 15:03:01.000000000 +0000
@@ -13,6 +13,7 @@
 EXTRA_JS_MODULES['services-common'] += [
     'hawkclient.js',
     'hawkrequest.js',
+    'logmanager.js',
     'storageservice.js',
     'stringbundle.js',
     'tokenserverclient.js',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/tests/unit/test_load_modules.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/tests/unit/test_load_modules.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/tests/unit/test_load_modules.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/tests/unit/test_load_modules.js	2015-02-28 15:03:01.000000000 +0000
@@ -4,6 +4,7 @@
 const modules = [
   "async.js",
   "bagheeraclient.js",
+  "logmanager.js",
   "rest.js",
   "storageservice.js",
   "stringbundle.js",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/tests/unit/test_logmanager.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/tests/unit/test_logmanager.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/tests/unit/test_logmanager.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/tests/unit/test_logmanager.js	2015-02-28 15:03:01.000000000 +0000
@@ -0,0 +1,103 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// NOTE: The sync test_errorhandler_* tests have quite good coverage for
+// other aspects of this.
+
+Cu.import("resource://services-common/logmanager.js");
+Cu.import("resource://gre/modules/Log.jsm");
+
+function run_test() {
+  run_next_test();
+}
+
+// Returns an array of [consoleAppender, dumpAppender, [fileAppenders]] for
+// the specified log.  Note that fileAppenders will usually have length=1
+function getAppenders(log) {
+  let capps = log.appenders.filter(app => app instanceof Log.ConsoleAppender);
+  equal(capps.length, 1, "should only have one console appender");
+  let dapps = log.appenders.filter(app => app instanceof Log.DumpAppender);
+  equal(dapps.length, 1, "should only have one dump appender");
+  let fapps = log.appenders.filter(app => app instanceof Log.StorageStreamAppender);
+  return [capps[0], dapps[0], fapps];
+}
+
+// Test that the correct thing happens when no prefs exist for the log manager.
+add_task(function* test_noPrefs() {
+  // tell the log manager to init with a pref branch that doesn't exist.
+  let lm = new LogManager("no-such-branch.", ["TestLog"], "test");
+
+  let log = Log.repository.getLogger("TestLog");
+  let [capp, dapp, fapps] = getAppenders(log);
+  // the "dump" and "console" appenders should get Error level
+  equal(capp.level, Log.Level.Error);
+  equal(dapp.level, Log.Level.Error);
+  // and the file (stream) appender gets Dump by default
+  equal(fapps.length, 1, "only 1 file appender");
+  equal(fapps[0].level, Log.Level.Debug);
+  lm.finalize();
+});
+
+// Test that changes to the prefs used by the log manager are updated dynamically.
+add_task(function* test_PrefChanges() {
+  Services.prefs.setCharPref("log-manager.test.log.appender.console", "Trace");
+  Services.prefs.setCharPref("log-manager.test.log.appender.dump", "Trace");
+  Services.prefs.setCharPref("log-manager.test.log.appender.file.level", "Trace");
+  let lm = new LogManager("log-manager.test.", ["TestLog2"], "test");
+
+  let log = Log.repository.getLogger("TestLog2");
+  let [capp, dapp, [fapp]] = getAppenders(log);
+  equal(capp.level, Log.Level.Trace);
+  equal(dapp.level, Log.Level.Trace);
+  equal(fapp.level, Log.Level.Trace);
+  // adjust the prefs and they should magically be reflected in the appenders.
+  Services.prefs.setCharPref("log-manager.test.log.appender.console", "Debug");
+  Services.prefs.setCharPref("log-manager.test.log.appender.dump", "Debug");
+  Services.prefs.setCharPref("log-manager.test.log.appender.file.level", "Debug");
+  equal(capp.level, Log.Level.Debug);
+  equal(dapp.level, Log.Level.Debug);
+  equal(fapp.level, Log.Level.Debug);
+  // and invalid values should cause them to fallback to their defaults.
+  Services.prefs.setCharPref("log-manager.test.log.appender.console", "xxx");
+  Services.prefs.setCharPref("log-manager.test.log.appender.dump", "xxx");
+  Services.prefs.setCharPref("log-manager.test.log.appender.file.level", "xxx");
+  equal(capp.level, Log.Level.Error);
+  equal(dapp.level, Log.Level.Error);
+  equal(fapp.level, Log.Level.Debug);
+  lm.finalize();
+});
+
+// Test that the same log used by multiple log managers does the right thing.
+add_task(function* test_SharedLogs() {
+  // create the prefs for the first instance.
+  Services.prefs.setCharPref("log-manager-1.test.log.appender.console", "Trace");
+  Services.prefs.setCharPref("log-manager-1.test.log.appender.dump", "Trace");
+  Services.prefs.setCharPref("log-manager-1.test.log.appender.file.level", "Trace");
+  let lm1 = new LogManager("log-manager-1.test.", ["TestLog3"], "test");
+
+  // and the second.
+  Services.prefs.setCharPref("log-manager-2.test.log.appender.console", "Debug");
+  Services.prefs.setCharPref("log-manager-2.test.log.appender.dump", "Debug");
+  Services.prefs.setCharPref("log-manager-2.test.log.appender.file.level", "Debug");
+  let lm2 = new LogManager("log-manager-2.test.", ["TestLog3"], "test");
+
+  let log = Log.repository.getLogger("TestLog3");
+  let [capp, dapp, fapps] = getAppenders(log);
+
+  // console and dump appenders should be "trace" as it is more verbose than
+  // "debug"
+  equal(capp.level, Log.Level.Trace);
+  equal(dapp.level, Log.Level.Trace);
+
+  // Set the prefs on the -1 branch to "Error" - it should then end up with
+  // "Debug" from the -2 branch.
+  Services.prefs.setCharPref("log-manager-1.test.log.appender.console", "Error");
+  Services.prefs.setCharPref("log-manager-1.test.log.appender.dump", "Error");
+  Services.prefs.setCharPref("log-manager-1.test.log.appender.file.level", "Error");
+
+  equal(capp.level, Log.Level.Debug);
+  equal(dapp.level, Log.Level.Debug);
+
+  lm1.finalize();
+  lm2.finalize();
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/tests/unit/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/tests/unit/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/common/tests/unit/xpcshell.ini	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/common/tests/unit/xpcshell.ini	2015-02-28 15:03:01.000000000 +0000
@@ -29,6 +29,7 @@
 [test_bagheera_client.js]
 [test_hawkclient.js]
 [test_hawkrequest.js]
+[test_logmanager.js]
 [test_observers.js]
 [test_restrequest.js]
 [test_tokenauthenticatedrequest.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/Makefile.in	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/Makefile.in	2015-02-28 15:03:01.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Definitions used by constants.js.
-weave_version := 1.40.0
+weave_version := 1.41.0
 weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
 
 # Preprocess files.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/modules/browserid_identity.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/modules/browserid_identity.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/modules/browserid_identity.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/modules/browserid_identity.js	2015-02-28 15:03:01.000000000 +0000
@@ -617,7 +617,7 @@
         // that there is no authentication dance still under way.
         this._shouldHaveSyncKeyBundle = true;
         Weave.Status.login = this._authFailureReason;
-        Services.obs.notifyObservers(null, "weave:service:login:error", null);
+        Services.obs.notifyObservers(null, "weave:ui:login:error", null);
         throw err;
       });
   },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/modules/policies.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/modules/policies.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/modules/policies.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/modules/policies.js	2015-02-28 15:03:01.000000000 +0000
@@ -13,8 +13,7 @@
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/util.js");
-Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://services-common/logmanager.js");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Status",
                                   "resource://services-sync/status.js");
@@ -539,9 +538,6 @@
   },
 };
 
-const LOG_PREFIX_SUCCESS = "success-";
-const LOG_PREFIX_ERROR   = "error-";
-
 this.ErrorHandler = function ErrorHandler(service) {
   this.service = service;
   this.init();
@@ -574,33 +570,14 @@
   initLogs: function initLogs() {
     this._log = Log.repository.getLogger("Sync.ErrorHandler");
     this._log.level = Log.Level[Svc.Prefs.get("log.logger.service.main")];
-    this._cleaningUpFileLogs = false;
 
     let root = Log.repository.getLogger("Sync");
     root.level = Log.Level[Svc.Prefs.get("log.rootLogger")];
 
-    let formatter = new Log.BasicFormatter();
-    let capp = new Log.ConsoleAppender(formatter);
-    capp.level = Log.Level[Svc.Prefs.get("log.appender.console")];
-    root.addAppender(capp);
-
-    let dapp = new Log.DumpAppender(formatter);
-    dapp.level = Log.Level[Svc.Prefs.get("log.appender.dump")];
-    root.addAppender(dapp);
-
-    let fapp = this._logAppender = new Log.StorageStreamAppender(formatter);
-    fapp.level = Log.Level[Svc.Prefs.get("log.appender.file.level")];
-    root.addAppender(fapp);
-
-    // Arrange for a number of other sync-related logs to also go to our
-    // appenders.
-    for (let extra of ["FirefoxAccounts", "Hawk", "Common.TokenServerClient",
-                       "Sync.SyncMigration"]) {
-      let log = Log.repository.getLogger(extra);
-      for (let appender of [fapp, dapp, capp]) {
-        log.addAppender(appender);
-      }
-    }
+    let logs = ["Sync", "FirefoxAccounts", "Hawk", "Common.TokenServerClient",
+                "Sync.SyncMigration"];
+
+    this._logManager = new LogManager(Svc.Prefs, logs, "sync");
   },
 
   observe: function observe(subject, topic, data) {
@@ -625,8 +602,7 @@
         this._log.debug(engine_name + " failed: " + Utils.exceptionStr(exception));
         break;
       case "weave:service:login:error":
-        this.resetFileLog(Svc.Prefs.get("log.appender.file.logOnError"),
-                          LOG_PREFIX_ERROR);
+        this.resetFileLog(this._logManager.REASON_ERROR);
 
         if (this.shouldReportError()) {
           this.notifyOnNextTick("weave:ui:login:error");
@@ -641,8 +617,7 @@
           this.service.logout();
         }
 
-        this.resetFileLog(Svc.Prefs.get("log.appender.file.logOnError"),
-                          LOG_PREFIX_ERROR);
+        this.resetFileLog(this._logManager.REASON_ERROR);
 
         if (this.shouldReportError()) {
           this.notifyOnNextTick("weave:ui:sync:error");
@@ -668,8 +643,7 @@
 
         if (Status.service == SYNC_FAILED_PARTIAL) {
           this._log.debug("Some engines did not sync correctly.");
-          this.resetFileLog(Svc.Prefs.get("log.appender.file.logOnError"),
-                            LOG_PREFIX_ERROR);
+          this.resetFileLog(this._logManager.REASON_ERROR);
 
           if (this.shouldReportError()) {
             this.dontIgnoreErrors = false;
@@ -677,8 +651,7 @@
             break;
           }
         } else {
-          this.resetFileLog(Svc.Prefs.get("log.appender.file.logOnSuccess"),
-                            LOG_PREFIX_SUCCESS);
+          this.resetFileLog(this._logManager.REASON_SUCCESS);
         }
         this.dontIgnoreErrors = false;
         this.notifyOnNextTick("weave:ui:sync:finish");
@@ -706,94 +679,21 @@
   },
 
   /**
-   * Finds all logs older than maxErrorAge and deletes them without tying up I/O.
-   */
-  cleanupLogs: function cleanupLogs() {
-    let direntries = FileUtils.getDir("ProfD", ["weave", "logs"]).directoryEntries;
-    let oldLogs = [];
-    let index = 0;
-    let threshold = Date.now() - 1000 * Svc.Prefs.get("log.appender.file.maxErrorAge");
-
-    this._log.debug("Log cleanup threshold time: " + threshold);
-    while (direntries.hasMoreElements()) {
-      let logFile = direntries.getNext().QueryInterface(Ci.nsIFile);
-      if (logFile.lastModifiedTime < threshold) {
-        this._log.trace(" > Noting " + logFile.leafName +
-                        " for cleanup (" + logFile.lastModifiedTime + ")");
-        oldLogs.push(logFile);
-      }
-    }
-
-    // Deletes a file from oldLogs each tick until there are none left.
-    let errorHandler = this;
-    function deleteFile() {
-      if (index >= oldLogs.length) {
-        errorHandler._log.debug("Done deleting files.");
-        errorHandler._cleaningUpFileLogs = false;
-        Svc.Obs.notify("weave:service:cleanup-logs");
-        return;
-      }
-      try {
-        let file = oldLogs[index];
-        file.remove(false);
-        errorHandler._log.trace("Deleted " + file.leafName + ".");
-      } catch (ex) {
-        errorHandler._log._debug("Encountered error trying to clean up old log file '"
-                                 + oldLogs[index].leafName + "':"
-                                 + Utils.exceptionStr(ex));
-      }
-      index++;
-      Utils.nextTick(deleteFile);
-    }
-
-    if (oldLogs.length > 0) {
-      this._cleaningUpFileLogs = true;
-      Utils.nextTick(deleteFile);
-    } else {
-      this._log.debug("No logs to clean up.");
-    }
-  },
-
-  /**
    * Generate a log file for the sync that just completed
    * and refresh the input & output streams.
    *
-   * @param flushToFile
-   *        the log file to be flushed/reset
-   *
-   * @param filenamePrefix
-   *        a value of either LOG_PREFIX_SUCCESS or LOG_PREFIX_ERROR
-   *        to be used as the log filename prefix
-   */
-  resetFileLog: function resetFileLog(flushToFile, filenamePrefix) {
-    let inStream = this._logAppender.getInputStream();
-    this._logAppender.reset();
-    if (flushToFile && inStream) {
-      this._log.debug("Flushing file log.");
-      try {
-        let filename = filenamePrefix + Date.now() + ".txt";
-        let file = FileUtils.getFile("ProfD", ["weave", "logs", filename]);
-        let outStream = FileUtils.openFileOutputStream(file);
-
-        this._log.trace("Beginning stream copy to " + file.leafName + ": " +
-                        Date.now());
-        NetUtil.asyncCopy(inStream, outStream, function onCopyComplete() {
-          this._log.trace("onCopyComplete: " + Date.now());
-          this._log.trace("Output file timestamp: " + file.lastModifiedTime);
-          Svc.Obs.notify("weave:service:reset-file-log");
-          this._log.trace("Notified: " + Date.now());
-          if (filenamePrefix == LOG_PREFIX_ERROR &&
-              !this._cleaningUpFileLogs) {
-            this._log.trace("Scheduling cleanup.");
-            Utils.nextTick(this.cleanupLogs, this);
-          }
-        }.bind(this));
-      } catch (ex) {
-        Svc.Obs.notify("weave:service:reset-file-log");
-      }
-    } else {
+   * @param reason
+   *        A constant from the LogManager that indicates the reason for the
+   *        reset.
+   */
+  resetFileLog: function resetFileLog(reason) {
+    let onComplete = () => {
       Svc.Obs.notify("weave:service:reset-file-log");
-    }
+      this._log.trace("Notified: " + Date.now());
+    };
+    // Note we do not return the promise here - the caller doesn't need to wait
+    // for this to complete.
+    this._logManager.resetFileLog(reason).then(onComplete, onComplete);
   },
 
   /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/tests/unit/test_errorhandler_filelog.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/tests/unit/test_errorhandler_filelog.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/tests/unit/test_errorhandler_filelog.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/tests/unit/test_errorhandler_filelog.js	2015-02-28 15:03:02.000000000 +0000
@@ -10,8 +10,6 @@
 Cu.import("resource://gre/modules/Services.jsm");
 
 const logsdir            = FileUtils.getDir("ProfD", ["weave", "logs"], true);
-const LOG_PREFIX_SUCCESS = "success-";
-const LOG_PREFIX_ERROR   = "error-";
 
 // Delay to wait before cleanup, to allow files to age.
 // This is so large because the file timestamp granularity is per-second, and
@@ -32,6 +30,7 @@
 function run_test() {
   initTestLogging("Trace");
 
+  Log.repository.getLogger("Sync.LogManager").level = Log.Level.Trace;
   Log.repository.getLogger("Sync.Service").level = Log.Level.Trace;
   Log.repository.getLogger("Sync.SyncScheduler").level = Log.Level.Trace;
   Log.repository.getLogger("Sync.ErrorHandler").level = Log.Level.Trace;
@@ -41,7 +40,7 @@
 
 add_test(function test_noOutput() {
   // Ensure that the log appender won't print anything.
-  errorHandler._logAppender.level = Log.Level.Fatal + 1;
+  errorHandler._logManager._fileAppender.level = Log.Level.Fatal + 1;
 
   // Clear log output from startup.
   Svc.Prefs.set("log.appender.file.logOnSuccess", false);
@@ -53,7 +52,7 @@
   Svc.Obs.add("weave:service:reset-file-log", function onResetFileLog() {
     Svc.Obs.remove("weave:service:reset-file-log", onResetFileLog);
 
-    errorHandler._logAppender.level = Log.Level.Trace;
+    errorHandler._logManager._fileAppender.level = Log.Level.Trace;
     Svc.Prefs.resetBranch("");
     run_next_test();
   });
@@ -109,8 +108,7 @@
     do_check_true(entries.hasMoreElements());
     let logfile = entries.getNext().QueryInterface(Ci.nsILocalFile);
     do_check_eq(logfile.leafName.slice(-4), ".txt");
-    do_check_eq(logfile.leafName.slice(0, LOG_PREFIX_SUCCESS.length),
-                LOG_PREFIX_SUCCESS);
+    do_check_true(logfile.leafName.startsWith("success-sync-"), logfile.leafName);
     do_check_false(entries.hasMoreElements());
 
     // Ensure the log message was actually written to file.
@@ -162,6 +160,13 @@
   const MESSAGE = "this WILL show up";
   log.info(MESSAGE);
 
+  // We need to wait until the log cleanup started by this test is complete
+  // or the next test will fail as it is ongoing.
+  Svc.Obs.add("services-tests:common:log-manager:cleanup-logs", function onCleanupLogs() {
+    Svc.Obs.remove("services-tests:common:log-manager:cleanup-logs", onCleanupLogs);
+    run_next_test();
+  });
+
   Svc.Obs.add("weave:service:reset-file-log", function onResetFileLog() {
     Svc.Obs.remove("weave:service:reset-file-log", onResetFileLog);
 
@@ -170,8 +175,7 @@
     do_check_true(entries.hasMoreElements());
     let logfile = entries.getNext().QueryInterface(Ci.nsILocalFile);
     do_check_eq(logfile.leafName.slice(-4), ".txt");
-    do_check_eq(logfile.leafName.slice(0, LOG_PREFIX_ERROR.length),
-                LOG_PREFIX_ERROR);
+    do_check_true(logfile.leafName.startsWith("error-sync-"), logfile.leafName);
     do_check_false(entries.hasMoreElements());
 
     // Ensure the log message was actually written to file.
@@ -188,7 +192,6 @@
       }
 
       Svc.Prefs.resetBranch("");
-      run_next_test();
     });
   });
 
@@ -224,6 +227,13 @@
   const MESSAGE = "this WILL show up";
   log.info(MESSAGE);
 
+  // We need to wait until the log cleanup started by this test is complete
+  // or the next test will fail as it is ongoing.
+  Svc.Obs.add("services-tests:common:log-manager:cleanup-logs", function onCleanupLogs() {
+    Svc.Obs.remove("services-tests:common:log-manager:cleanup-logs", onCleanupLogs);
+    run_next_test();
+  });
+
   Svc.Obs.add("weave:service:reset-file-log", function onResetFileLog() {
     Svc.Obs.remove("weave:service:reset-file-log", onResetFileLog);
 
@@ -232,8 +242,7 @@
     do_check_true(entries.hasMoreElements());
     let logfile = entries.getNext().QueryInterface(Ci.nsILocalFile);
     do_check_eq(logfile.leafName.slice(-4), ".txt");
-    do_check_eq(logfile.leafName.slice(0, LOG_PREFIX_ERROR.length),
-                LOG_PREFIX_ERROR);
+    do_check_true(logfile.leafName.startsWith("error-sync-"), logfile.leafName);
     do_check_false(entries.hasMoreElements());
 
     // Ensure the log message was actually written to file.
@@ -250,7 +259,6 @@
       }
 
       Svc.Prefs.resetBranch("");
-      run_next_test();
     });
   });
 
@@ -273,7 +281,7 @@
   _("Making some files.");
   for (let i = 0; i < numLogs; i++) {
     let now = Date.now();
-    let filename = LOG_PREFIX_ERROR + now + "" + i + ".txt";
+    let filename = "error-sync-" + now + "" + i + ".txt";
     let newLog = FileUtils.getFile("ProfD", ["weave", "logs", filename]);
     let foStream = FileUtils.openFileOutputStream(newLog);
     foStream.write(errString, errString.length);
@@ -282,8 +290,8 @@
     oldLogs.push(newLog.leafName);
   }
 
-  Svc.Obs.add("weave:service:cleanup-logs", function onCleanupLogs() {
-    Svc.Obs.remove("weave:service:cleanup-logs", onCleanupLogs);
+  Svc.Obs.add("services-tests:common:log-manager:cleanup-logs", function onCleanupLogs() {
+    Svc.Obs.remove("services-tests:common:log-manager:cleanup-logs", onCleanupLogs);
 
     // Only the newest created log file remains.
     let entries = logsdir.directoryEntries;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/tests/unit/test_errorhandler.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/tests/unit/test_errorhandler.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/tests/unit/test_errorhandler.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/tests/unit/test_errorhandler.js	2015-02-28 15:03:02.000000000 +0000
@@ -14,8 +14,6 @@
 
 const FAKE_SERVER_URL = "http://dummy:9000/";
 const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
-const LOG_PREFIX_SUCCESS = "success-";
-const LOG_PREFIX_ERROR   = "error-";
 
 const PROLONGED_ERROR_DURATION =
   (Svc.Prefs.get('errorhandler.networkFailureReportTimeout') * 2) * 1000;
@@ -1772,8 +1770,7 @@
       let entries = logsdir.directoryEntries;
       do_check_true(entries.hasMoreElements());
       let logfile = entries.getNext().QueryInterface(Ci.nsILocalFile);
-      do_check_eq(logfile.leafName.slice(0, LOG_PREFIX_ERROR.length),
-                  LOG_PREFIX_ERROR);
+      do_check_true(logfile.leafName.startsWith("error-sync-"), logfile.leafName);
 
       clean();
       server.stop(deferred.resolve);
@@ -1804,8 +1801,7 @@
     let entries = logsdir.directoryEntries;
     do_check_true(entries.hasMoreElements());
     let logfile = entries.getNext().QueryInterface(Ci.nsILocalFile);
-    do_check_eq(logfile.leafName.slice(0, LOG_PREFIX_ERROR.length),
-                LOG_PREFIX_ERROR);
+    do_check_true(logfile.leafName.startsWith("error-sync-"), logfile.leafName);
 
     clean();
     run_next_test();
@@ -1832,8 +1828,7 @@
     let entries = logsdir.directoryEntries;
     do_check_true(entries.hasMoreElements());
     let logfile = entries.getNext().QueryInterface(Ci.nsILocalFile);
-    do_check_eq(logfile.leafName.slice(0, LOG_PREFIX_ERROR.length),
-                LOG_PREFIX_ERROR);
+    do_check_true(logfile.leafName.startsWith("error-sync-"), logfile.leafName);
 
     clean();
     run_next_test();
@@ -1867,8 +1862,7 @@
     let entries = logsdir.directoryEntries;
     do_check_true(entries.hasMoreElements());
     let logfile = entries.getNext().QueryInterface(Ci.nsILocalFile);
-    do_check_eq(logfile.leafName.slice(0, LOG_PREFIX_ERROR.length),
-                LOG_PREFIX_ERROR);
+    do_check_true(logfile.leafName.startsWith("error-sync-"), logfile.leafName);
 
     clean();
     server.stop(deferred.resolve);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/tests/unit/test_errorhandler_sync_checkServerError.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/tests/unit/test_errorhandler_sync_checkServerError.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/tests/unit/test_errorhandler_sync_checkServerError.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/tests/unit/test_errorhandler_sync_checkServerError.js	2015-02-28 15:03:02.000000000 +0000
@@ -200,6 +200,7 @@
   let deferred = Promise.defer();
   server.stop(() => {
     Services.io.offline = true;
+    Services.prefs.setBoolPref("network.dns.offline-localhost", false);
 
     try {
       do_check_eq(Status.sync, SYNC_SUCCEEDED);
@@ -214,6 +215,7 @@
       Service.startOver();
     }
     Services.io.offline = false;
+    Services.prefs.clearUserPref("network.dns.offline-localhost");
     deferred.resolve();
   });
   yield deferred.promise;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/Weave.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/Weave.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/services/sync/Weave.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/services/sync/Weave.js	2015-02-28 15:03:01.000000000 +0000
@@ -177,15 +177,11 @@
     return 0;
   },
 
-  newChannel: function(aURI) {
+  newChannel: function(aURI, aLoadInfo) {
     let dir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
     let uri = Services.io.newFileURI(dir);
-    let channel = Services.io.newChannelFromURI2(uri,
-                                                 null,      // aLoadingNode
-                                                 Services.scriptSecurityManager.getSystemPrincipal(),
-                                                 null,      // aTriggeringPrincipal
-                                                 Ci.nsILoadInfo.SEC_NORMAL,
-                                                 Ci.nsIContentPolicy.TYPE_OTHER);
+    let channel = Services.io.newChannelFromURIWithLoadInfo(uri, aLoadInfo);
+
     channel.originalURI = aURI;
 
     // Ensure that the about page has the same privileges as a regular directory
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/marionette_requirements.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/marionette_requirements.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/marionette_requirements.txt	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/marionette_requirements.txt	2015-02-28 15:03:02.000000000 +0000
@@ -1,3 +1,4 @@
 -r mozbase_requirements.txt
 ../marionette/transport
+../marionette/driver
 ../marionette
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/mozharness/linux_config.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/mozharness/linux_config.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/mozharness/linux_config.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/mozharness/linux_config.py	2015-02-28 15:03:02.000000000 +0000
@@ -49,6 +49,14 @@
             "run_filename": "test.py",
             "testsdir": "mozbase"
         },
+        "mozmill": {
+            "options": [
+                "--binary=%(binary_path)s",
+                "--symbols-path=%(symbols_path)s"
+            ],
+            "run_filename": "runtestlist.py",
+            "testsdir": "mozmill"
+        },
         "reftest": {
             "options": [
                 "--appname=%(binary_path)s",
@@ -85,4 +93,4 @@
             "testsdir": "xpcshell"
         }
     }
-}
\ No newline at end of file
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/mozharness/mac_config.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/mozharness/mac_config.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/mozharness/mac_config.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/mozharness/mac_config.py	2015-02-28 15:03:02.000000000 +0000
@@ -47,6 +47,14 @@
             "run_filename": "test.py",
             "testsdir": "mozbase"
         },
+        "mozmill": {
+            "options": [
+                "--binary=%(binary_path)s",
+                "--symbols-path=%(symbols_path)s"
+            ],
+            "run_filename": "runtestlist.py",
+            "testsdir": "mozmill"
+        },
         "reftest": {
             "options": [
                 "--appname=%(binary_path)s",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/mozharness/windows_config.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/mozharness/windows_config.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/config/mozharness/windows_config.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/config/mozharness/windows_config.py	2015-02-28 15:03:02.000000000 +0000
@@ -47,6 +47,14 @@
             "run_filename": "test.py",
             "testsdir": "mozbase"
         },
+        "mozmill": {
+            "options": [
+                "--binary=%(binary_path)s",
+                "--symbols-path=%(symbols_path)s"
+            ],
+            "run_filename": "runtestlist.py",
+            "testsdir": "mozmill"
+        },
         "reftest": {
             "options": [
                 "--appname=%(binary_path)s",
@@ -83,4 +91,4 @@
             "testsdir": "xpcshell"
         }
     }
-}
\ No newline at end of file
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/b2g.env thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/b2g.env
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/b2g.env	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/b2g.env	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,7 @@
+GECKO_BASE_REPOSITORY=https://github.com/mozilla/gecko-dev
+GECKO_HEAD_REPOSITORY=https://github.com/mozilla/gecko-dev
+GECKO_HEAD_REF=master
+GECKO_HEAD_REV=master
+MOZHARNESS_REPOSITORY=http://hg.mozilla.org/build/mozharness
+MOZHARNESS_REV=tip
+MOZCONFIG=b2g/config/mozconfigs/linux64_gecko/nightly
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-b2g-desktop.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-b2g-desktop.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-b2g-desktop.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-b2g-desktop.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#!/bin/bash -live
-
-################################### build.sh ###################################
-
-. build-setup.sh
-
-### Check that require variables are defined
-test $MOZCONFIG
-
-# Ensure gecko is at the correct revision
-pull-gecko.sh $gecko_dir
-
-### Install package dependencies
-install-packages.sh $gecko_dir
-
-### Clone gaia
-pull-gaia.sh $gecko_dir $gaia_dir
-
-cd $gecko_dir
-
-# Nightly mozconfig expects gaia repo be inside mozilla-central tree
-if [ ! -d "gaia" ]; then
-  ln -s $gaia_dir gaia
-fi
-
-export MOZ_OBJDIR=$(get-objdir.py $gecko_dir)
-
-./mach build;
-
-### Make package
-cd $MOZ_OBJDIR
-make package package-tests;
-
-### Extract artifacts
-# Navigate to dist/ folder
-cd $MOZ_OBJDIR/dist
-
-ls -lah $MOZ_OBJDIR/dist/
-
-# Target names are cached so make sure we discard them first if found.
-rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target.tests.zip
-
-# Artifacts folder is outside of the cache.
-mkdir -p /home/worker/artifacts/
-
-# Discard version numbers from packaged files, they just make it hard to write
-# the right filename in the task payload where artifacts are declared
-mv *.linux-x86_64.tar.bz2   /home/worker/artifacts/target.linux-x86_64.tar.bz2
-mv *.linux-x86_64.json      /home/worker/artifacts/target.linux-x86_64.json
-mv *.tests.zip              /home/worker/artifacts/target.tests.zip
-
-################################### build.sh ###################################
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-emulator.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-emulator.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-emulator.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-emulator.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-#! /bin/bash -vex
-
-### Check that require variables are defined
-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
-
-# 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
-
-OBJDIR="$HOME/object-folder"
-
-if [ ! -d $OBJDIR ]; then
-  mkdir -p $OBJDIR
-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 $OBJDIR/B2G https://git.mozilla.org/b2g/B2G.git $MANIFEST
-# Ensure we update gecko prior to invoking mozharness so commits match up
-# initially between manifest and gecko tree...
-pull-gecko.sh $OBJDIR/B2G/gecko
-
-debug_flag=""
-if [ 0$B2G_DEBUG -ne 0 ]; then
-  debug_flag='--debug'
-fi
-
-./mozharness/scripts/b2g_build.py \
-  --config b2g/taskcluster-emulator.py \
-  "$debug_flag" \
-  --disable-mock \
-  --work-dir=$OBJDIR/B2G \
-  --log-level=debug \
-  --target=$TARGET \
-  --b2g-config-dir=$TARGET \
-  --checkout-revision=$GECKO_HEAD_REV \
-  --base-repo=$GECKO_BASE_REPOSITORY \
-  --repo=$GECKO_HEAD_REPOSITORY
-
-# Move files into artifact locations!
-mkdir -p artifacts
-
-mv $OBJDIR/B2G/sources.xml artifacts/sources.xml
-mv $OBJDIR/B2G/out/target/product/generic/tests/gaia-tests.zip artifacts/gaia-tests.zip
-mv $OBJDIR/B2G/out/target/product/generic/tests/b2g-*.zip artifacts/b2g-tests.zip
-mv $OBJDIR/B2G/out/emulator.tar.gz artifacts/emulator.tar.gz
-mv $OBJDIR/B2G/objdir-gecko/dist/b2g-*.crashreporter-symbols.zip artifacts/b2g-crashreporter-symbols.zip
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-mulet-linux.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-mulet-linux.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-mulet-linux.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-mulet-linux.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#!/bin/bash -live
-
-################################### build-mulet-linux.sh ###################################
-
-. build-setup.sh
-
-### Check that require variables are defined
-test $MOZCONFIG
-
-# Ensure gecko is at the correct revision
-pull-gecko.sh $gecko_dir
-
-### Install package dependencies
-install-packages.sh $gecko_dir
-
-export MOZ_OBJDIR=$(get-objdir.py $gecko_dir)
-
-cd $gecko_dir
-./mach build;
-
-### Make package
-cd $MOZ_OBJDIR;
-make package package-tests;
-
-### Extract artifacts
-# Navigate to dist/ folder
-cd $MOZ_OBJDIR/dist;
-
-ls -lah $MOZ_OBJDIR/dist/
-
-
-# Target names are cached so make sure we discard them first if found.
-rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target.tests.zip
-
-# Artifacts folder is outside of the cache.
-mkdir -p /home/worker/artifacts/
-
-# Discard version numbers from packaged files, they just make it hard to write
-# the right filename in the task payload where artifacts are declared
-mv *.linux-x86_64.tar.bz2   /home/worker/artifacts/target.linux-x86_64.tar.bz2
-mv *.linux-x86_64.json      /home/worker/artifacts/target.linux-x86_64.json
-mv *.tests.zip              /home/worker/artifacts/target.tests.zip
-mv jsshell-linux-x86_64.zip /home/worker/artifacts/jsshell-linux-x86_64.zip
-
-################################### build.sh ###################################
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-setup.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-setup.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build-setup.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build-setup.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#!/bin/bash -vex
-
-gecko_dir=/home/worker/gecko/source
-gaia_dir=/home/worker/gaia/source
-
-create_parent_dir() {
-  parent_dir=$(dirname $1)
-  if [ ! -d "$parent_dir" ]; then
-    mkdir -p "$parent_dir"
-  fi
-}
-
-# Ensure we always have the parent directory for gecko
-create_parent_dir $gecko_dir
-
-# Create .mozbuild so mach doesn't complain about this
-mkdir -p /home/worker/.mozbuild/
-
-# Create object-folder exists
-mkdir -p /home/worker/object-folder/
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/build.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/build.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#!/bin/bash -live
-
-################################### build.sh ###################################
-
-build-setup.sh
-
-### Check that we are running as worker
-test `whoami` == 'worker';
-
-### Check that require variables are defined
-test $REPOSITORY  # Should be an hg repository url to pull from
-test $REVISION    # Should be an hg revision to pull down
-test $MOZCONFIG   # Should be a mozconfig file from mozconfig/ folder
-
-### Pull, Update and Build
-cd /home/worker/mozilla-central;
-hg pull -r $REVISION $REPOSITORY;
-hg update $REVISION;
-./mach build;
-
-### Make package
-cd /home/worker/object-folder;
-make package package-tests;
-
-### Extract artifacts
-# Navigate to dist/ folder
-cd /home/worker/object-folder/dist;
-# Discard version numbers from packaged files, they just make it hard to write
-# the right filename in the task payload where artifacts are declared
-mv *.linux-x86_64.tar.bz2   target.linux-x86_64.tar.bz2
-mv *.linux-x86_64.json      target.linux-x86_64.json
-mv *.tests.zip              target.tests.zip
-
-
-################################### build.sh ###################################
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/checkout-gecko thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/checkout-gecko
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/checkout-gecko	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/checkout-gecko	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,16 @@
+#! /bin/bash -ex
+
+# Ensure we have at least enough to check gecko out...
+test $GECKO_BASE_REPOSITORY
+
+# Workspace to checkout gecko into...
+WORKSPACE=$1
+mkdir -p $WORKSPACE
+
+# Note that tc-vcs requires only the first two arguments so others are optional.
+# This is intended to make it easier to clone local directories.
+buildbot_step "Clone gecko" tc-vcs checkout $WORKSPACE/gecko \
+  $GECKO_BASE_REPOSITORY \
+  $GECKO_HEAD_REPOSITORY \
+  $GECKO_HEAD_REV \
+  $GECKO_HEAD_REF
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/decision.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/decision.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/decision.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/decision.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#! /bin/bash -ex
-
-DEST=/home/worker/source/gecko
-
-test $GECKO_BASE_REPOSITORY # e.g. https://hg.mozilla.org/mozilla-central
-test $GECKO_HEAD_REPOSITORY # e.g. https://hg.mozilla.org/try
-test $GECKO_HEAD_REF # <cset>
-test $GECKO_HEAD_REV # <cset>
-
-tc-vcs checkout $DEST \
-  $GECKO_BASE_REPOSITORY \
-  $GECKO_HEAD_REPOSITORY \
-  $GECKO_HEAD_REV \
-  $GECKO_HEAD_REF
-
-echo "At revision: $(tc-vcs revision $DEST)"
-cd $DEST
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/gaia_props.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/gaia_props.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/gaia_props.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/gaia_props.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-#! /usr/bin/env python
-
-'''
-Command line interface to fetch details from the b2g/config/gaia.json properties
-file used to link a particular version of gaia to gecko.
-'''
-
-import argparse
-import os
-import json
-import sys
-import urlparse
-
-parser = argparse.ArgumentParser(
-    description='Get various information about gaia version tied to particular \
-    gecko')
-
-parser.add_argument('gecko', metavar="GECKO_DIR", help="Path to gecko revision")
-parser.add_argument('prop', help="Property type",
-                    choices=['repository', 'revision'])
-
-args = parser.parse_args()
-
-if not os.path.isdir(args.gecko):
-        print >> sys.stderr, 'Given gecko path is not a directory'
-        sys.exit(1)
-
-props_path = os.path.join(args.gecko, 'b2g/config/gaia.json')
-
-if not os.path.isfile(props_path):
-        print >> sys.stderr, \
-            'Gecko directory does not contain b2g/config/gaia.json'
-        sys.exit(1)
-
-props = json.load(open(props_path))
-
-if args.prop == 'revision':
-    print(props['revision']);
-
-if args.prop == 'repository':
-    print(urlparse.urljoin('https://hg.mozilla.org', props['repo_path']))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/get-objdir.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/get-objdir.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/get-objdir.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/get-objdir.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-import sys
-import os
-import json
-import subprocess
-from StringIO import StringIO
-
-DEFAULT_OBJDIR = "/home/worker/object-folder"
-
-gecko_dir = sys.argv[1]
-os.chdir(gecko_dir)
-
-result = subprocess.check_output(["./mach", "environment", "--format", "json"])
-environment = json.load(StringIO(result))
-
-topobjdir = environment["mozconfig"]["topobjdir"]
-if topobjdir is None:
-    topobjdir = DEFAULT_OBJDIR
-
-print(topobjdir)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/install-packages.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/install-packages.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/install-packages.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/install-packages.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#!/bin/bash -vex
-
-gecko_dir=$1
-test -d $gecko_dir
-
-if [ ! -d "$gecko_dir/gcc" ]; then
-  cd $gecko_dir
-  curl https://s3-us-west-2.amazonaws.com/test-caching/packages/gcc.tar.xz | tar Jx
-  cd -
-fi
-
-if [ ! -d "$gecko_dir/sccache" ]; then
-  cd $gecko_dir
-  curl https://s3-us-west-2.amazonaws.com/test-caching/packages/sccache.tar.bz2 | tar jx
-  cd -
-fi
-
-# Remove cached moztt directory if it exists when a user supplied a git url/revision
-if [ ! -z $MOZTT_GIT_URL ] || [ ! -z $MOZTT_REVISION ]; then
-  echo "Removing cached moztt package"
-  rm -rf moztt
-fi
-
-moztt_url=${MOZTT_GIT_URL:=https://github.com/mozilla-b2g/moztt}
-moztt_revision=${MOZTT_REVISION:=master}
-
-tc-vcs checkout $gecko_dir/moztt $moztt_url $moztt_url $moztt_revision
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/pull-gaia.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/pull-gaia.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/pull-gaia.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/pull-gaia.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#! /bin/bash -e
-
-gecko_dir=$1
-target=$2
-
-gaia_repo=$(gaia_props.py $gecko_dir repository)
-gaia_rev=$(gaia_props.py $gecko_dir revision)
-
-tc-vcs checkout $target $gaia_repo $gaia_repo $gaia_rev
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/pull-gecko.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/pull-gecko.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/bin/pull-gecko.sh	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/bin/pull-gecko.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#! /bin/bash -e
-
-target=$1
-
-test $GECKO_BASE_REPOSITORY # base repository
-test $GECKO_HEAD_REPOSITORY # repository to pull from
-test $GECKO_HEAD_REF # reference if needed (usually same as rev)
-test $GECKO_HEAD_REV # revision to checkout after pull
-
-tc-vcs checkout $target \
-  $GECKO_BASE_REPOSITORY \
-  $GECKO_HEAD_REPOSITORY \
-  $GECKO_HEAD_REV \
-  $GECKO_HEAD_REF \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/Dockerfile thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/Dockerfile
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/Dockerfile	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/Dockerfile	2015-02-28 15:03:02.000000000 +0000
@@ -4,33 +4,28 @@
 ENV PYTHONPATH /tools/tools/lib/python:$PYTHONPATH
 ENV TOOLTOOL_CACHE  /home/worker/tools/tooltool-cache
 
+ADD https://raw.githubusercontent.com/taskcluster/buildbot-step/58a16f7370a8b4de7a4458436a4a5fad9905f5d9/buildbot_step.js /home/worker/bin/buildbot_step
+
 # Add utilities and configuration
 RUN mkdir -p /home/worker/bin /home/worker/tools
+# Add bin tools last as they are most likely to change
 RUN chown -R worker:worker /home/worker/* /home/worker/.*
 
-# Install android repo tool
-RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /home/worker/bin/repo
-RUN chmod a+x /home/worker/bin/repo
-
 # Instal build tools
 RUN hg clone http://hg.mozilla.org/build/tools/ /tools/tools && \
       cd /tools/tools && \
       python setup.py install
 
-
 # Initialize git (makes repo happy)
-RUN git config --global user.email "docker@docker.com" && \
-    git config --global user.name "docker"
+RUN git config --global user.email "mozilla@example.com" && \
+    git config --global user.name "mozilla"
 
 # VCS Tools
-RUN npm install -g taskcluster-vcs@2.2.0
-
-# Add bin tools last as they are most likely to change
-COPY bin /home/worker/bin
+RUN npm install -g taskcluster-vcs@2.3.0
 
 # TODO enable worker
 # TODO volume mount permissions will be an issue
 # USER worker
 
-# Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]
+COPY bin /home/worker/bin
+RUN chmod a+x /home/worker/bin/*
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/mulet.env thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/mulet.env
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/mulet.env	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/mulet.env	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,7 @@
+GECKO_BASE_REPOSITORY=https://github.com/mozilla/gecko-dev
+GECKO_HEAD_REPOSITORY=https://github.com/mozilla/gecko-dev
+GECKO_HEAD_REF=master
+GECKO_HEAD_REV=master
+MOZHARNESS_REPOSITORY=http://hg.mozilla.org/build/mozharness
+MOZHARNESS_REV=tip
+MOZCONFIG=b2g/dev/config/mozconfigs/linux64/mulet
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/VERSION thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/VERSION
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/builder/VERSION	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/builder/VERSION	2015-02-28 15:03:02.000000000 +0000
@@ -1 +1 @@
-0.3.2
+0.5.0
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/tester/tester.env thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/tester/tester.env
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/docker/tester/tester.env	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/docker/tester/tester.env	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,6 @@
+MOZHARNESS_REPOSITORY=http://hg.mozilla.org/build/mozharness
+MOZHARNESS_REV=tip
+GAIA_REV=tip
+GAIA_REF=tip
+GAIA_BASE_REPOSITORY=https://hg.mozilla.org/integration/gaia-central
+GAIA_HEAD_REPOSITORY=https://hg.mozilla.org/integration/gaia-central
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/application_cache.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/application_cache.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/application_cache.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/application_cache.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-"""
-Copyright 2011 Software Freedom Conservancy.
-
-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.
-"""
-
-class ApplicationCache(object):
-
-    UNCACHED = 0
-    IDLE = 1
-    CHECKING = 2
-    DOWNLOADING = 3
-    UPDATE_READY = 4
-    OBSOLETE = 5
-
-    def __init__(self, driver):
-        self.driver = driver
-
-    @property
-    def status(self):
-        return self.driver._send_message('getAppCacheStatus', 'value')
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/b2g_update_test.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/b2g_update_test.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/b2g_update_test.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/b2g_update_test.py	2015-02-28 15:03:02.000000000 +0000
@@ -12,8 +12,8 @@
 import weakref
 
 from b2ginstance import B2GInstance
-from errors import InvalidResponseException
-from marionette import Marionette
+from marionette_driver.errors import InvalidResponseException
+from marionette_driver.marionette import Marionette
 from marionette_test import MarionetteTestCase
 from marionette_transport import MarionetteTransport
 from runtests import MarionetteTestRunner, cli
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/by.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/by.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/by.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/by.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-# Copyright 2008-2009 WebDriver committers
-# Copyright 2008-2009 Google Inc.
-#
-# 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.
-
-
-class By(object):
-    ID = "id"
-    XPATH = "xpath"
-    LINK_TEXT = "link text"
-    PARTIAL_LINK_TEXT = "partial link text"
-    NAME = "name"
-    TAG_NAME = "tag name"
-    CLASS_NAME = "class name"
-    CSS_SELECTOR = "css selector"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/date_time_value.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/date_time_value.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/date_time_value.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/date_time_value.py	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/.
-
-class DateTimeValue(object):
-    """
-    Interface for setting the value of HTML5 "date" and "time" input elements.
-
-    Simple usage example:
-
-    ::
-
-        element = marionette.find_element("id", "date-test")
-        dt_value = DateTimeValue(element)
-        dt_value.date = datetime(1998, 6, 2)
-
-    """
-
-    def __init__(self, element):
-        self.element = element
-
-    @property
-    def date(self):
-        """
-        Retrieve the element's string value
-        """
-        return self.element.get_attribute('value')
-
-    # As per the W3C "date" element specification
-    # (http://dev.w3.org/html5/markup/input.date.html), this value is formatted
-    # according to RFC 3339: http://tools.ietf.org/html/rfc3339#section-5.6
-    @date.setter
-    def date(self, date_value):
-        self.element.send_keys(date_value.strftime('%Y-%m-%d'))
-
-    @property
-    def time(self):
-        """
-        Retrieve the element's string value
-        """
-        return self.element.get_attribute('value')
-
-    # As per the W3C "time" element specification
-    # (http://dev.w3.org/html5/markup/input.time.html), this value is formatted
-    # according to RFC 3339: http://tools.ietf.org/html/rfc3339#section-5.6
-    @time.setter
-    def time(self, time_value):
-        self.element.send_keys(time_value.strftime('%H:%M:%S'))
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/decorators.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/decorators.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/decorators.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/decorators.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +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/.
-
-from errors import MarionetteException
-from functools import wraps
-import socket
-import sys
-import traceback
-
-def _find_marionette_in_args(*args, **kwargs):
-    try:
-        m = [a for a in args + tuple(kwargs.values()) if hasattr(a, 'session')][0]
-    except IndexError:
-        print("Can only apply decorator to function using a marionette object")
-        raise
-    return m
-
-def do_crash_check(func, always=False):
-    """Decorator which checks for crashes after the function has run.
-
-    :param always: If False, only checks for crashes if an exception
-                   was raised. If True, always checks for crashes.
-    """
-    @wraps(func)
-    def _(*args, **kwargs):
-        def check():
-            m = _find_marionette_in_args(*args, **kwargs)
-            try:
-                m.check_for_crash()
-            except:
-                # don't want to lose the original exception
-                traceback.print_exc()
-
-        try:
-            return func(*args, **kwargs)
-        except (MarionetteException, socket.error, IOError) as e:
-            exc, val, tb = sys.exc_info()
-            if not isinstance(e, MarionetteException) or type(e) is MarionetteException:
-                if not always:
-                    check()
-            raise exc, val, tb
-        finally:
-            if always:
-                check()
-    return _
-
-def uses_marionette(func):
-    """Decorator which creates a marionette session and deletes it
-    afterwards if one doesn't already exist.
-    """
-    @wraps(func)
-    def _(*args, **kwargs):
-        m = _find_marionette_in_args(*args, **kwargs)
-        delete_session = False
-        if not m.session:
-            delete_session = True
-            m.start_session()
-
-        m.set_context(m.CONTEXT_CHROME)
-        ret = func(*args, **kwargs)
-
-        if delete_session:
-            m.delete_session()
-
-        return ret
-    return _
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/errors.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/errors.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/errors.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/errors.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +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/.
-
-import traceback
-
-class ErrorCodes(object):
-    SUCCESS = 0
-    NO_SUCH_ELEMENT = 7
-    NO_SUCH_FRAME = 8
-    UNKNOWN_COMMAND = 9
-    STALE_ELEMENT_REFERENCE = 10
-    ELEMENT_NOT_VISIBLE = 11
-    INVALID_ELEMENT_STATE = 12
-    UNKNOWN_ERROR = 13
-    ELEMENT_NOT_ACCESSIBLE = 56
-    ELEMENT_IS_NOT_SELECTABLE = 15
-    JAVASCRIPT_ERROR = 17
-    XPATH_LOOKUP_ERROR = 19
-    TIMEOUT = 21
-    NO_SUCH_WINDOW = 23
-    INVALID_COOKIE_DOMAIN = 24
-    UNABLE_TO_SET_COOKIE = 25
-    UNEXPECTED_ALERT_OPEN = 26
-    NO_ALERT_OPEN = 27
-    SCRIPT_TIMEOUT = 28
-    INVALID_ELEMENT_COORDINATES = 29
-    INVALID_SELECTOR = 32
-    MOVE_TARGET_OUT_OF_BOUNDS = 34
-    INVALID_XPATH_SELECTOR = 51
-    INVALID_XPATH_SELECTOR_RETURN_TYPER = 52
-    INVALID_RESPONSE = 53
-    FRAME_SEND_NOT_INITIALIZED_ERROR = 54
-    FRAME_SEND_FAILURE_ERROR = 55
-    SESSION_NOT_CREATED = 71
-    UNSUPPORTED_OPERATION = 405
-    MARIONETTE_ERROR = 500
-
-class MarionetteException(Exception):
-    """Raised when a generic non-recoverable exception has occured."""
-
-    def __init__(self, message=None,
-                 status=ErrorCodes.MARIONETTE_ERROR, cause=None,
-                 stacktrace=None):
-        """Construct new MarionetteException instance.
-
-        :param message: An optional exception message.
-
-        :param status: A WebDriver status code given as an integer.
-            By default the generic Marionette error code 500 will be
-            used.
-
-        :param cause: An optional tuple of three values giving
-            information about the root exception cause.  Expected
-            tuple values are (type, value, traceback).
-
-        :param stacktrace: Optional string containing a stacktrace
-            (typically from a failed JavaScript execution) that will
-            be displayed in the exception's string representation.
-
-        """
-
-        self.msg = message
-        self.status = status
-        self.cause = cause
-        self.stacktrace = stacktrace
-
-    def __str__(self):
-        msg = str(self.msg)
-        tb = None
-
-        if self.cause:
-            if type(self.cause) is tuple:
-                msg += ", caused by %r" % self.cause[0]
-                tb = self.cause[2]
-            else:
-                msg += ", caused by %s" % self.cause
-        if self.stacktrace:
-            st = "".join(["\t%s\n" % x for x in self.stacktrace.splitlines()])
-            msg += "\nstacktrace:\n%s" % st
-
-        return "".join(traceback.format_exception(self.__class__, msg, tb))
-
-class InstallGeckoError(MarionetteException):
-    pass
-
-class TimeoutException(MarionetteException):
-    pass
-
-class InvalidResponseException(MarionetteException):
-    pass
-
-class JavascriptException(MarionetteException):
-    pass
-
-class NoSuchElementException(MarionetteException):
-    pass
-
-class XPathLookupException(MarionetteException):
-    pass
-
-class NoSuchWindowException(MarionetteException):
-    pass
-
-class StaleElementException(MarionetteException):
-    pass
-
-class ScriptTimeoutException(MarionetteException):
-    pass
-
-class ElementNotVisibleException(MarionetteException):
-    def __init__(self, message="Element is not currently visible and may not be manipulated",
-                 status=ErrorCodes.ELEMENT_NOT_VISIBLE,
-                 stacktrace=None, cause=None):
-        super(ElementNotVisibleException, self).__init__(
-            message, status=status, cause=cause, stacktrace=stacktrace)
-
-class ElementNotAccessibleException(MarionetteException):
-    pass
-
-class NoSuchFrameException(MarionetteException):
-    pass
-
-class InvalidElementStateException(MarionetteException):
-    pass
-
-class NoAlertPresentException(MarionetteException):
-    pass
-
-class InvalidCookieDomainException(MarionetteException):
-    pass
-
-class UnableToSetCookieException(MarionetteException):
-    pass
-
-class InvalidSelectorException(MarionetteException):
-    pass
-
-class MoveTargetOutOfBoundsException(MarionetteException):
-    pass
-
-class FrameSendNotInitializedError(MarionetteException):
-    pass
-
-class FrameSendFailureError(MarionetteException):
-    pass
-
-class UnsupportedOperationException(MarionetteException):
-    pass
-
-class SessionNotCreatedException(MarionetteException):
-    pass
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/expected.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/expected.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/expected.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/expected.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,295 +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/.
-
-import errors
-import types
-
-from marionette import HTMLElement
-
-"""This file provides a set of expected conditions for common use
-cases when writing Marionette tests.
-
-The conditions rely on explicit waits that retries conditions a number
-of times until they are either successfully met, or they time out.
-
-"""
-
-class element_present(object):
-    """Checks that a web element is present in the DOM of the current
-    context.  This does not necessarily mean that the element is
-    visible.
-
-    You can select which element to be checked for presence by
-    supplying a locator::
-
-        el = Wait(marionette).until(expected.element_present(By.ID, "foo"))
-
-    Or by using a function/lambda returning an element::
-
-        el = Wait(marionette).until(expected.element_present(lambda m: m.find_element(By.ID, "foo")))
-
-    :param args: locator or function returning web element
-    :returns: the web element once it is located, or False
-
-    """
-
-    def __init__(self, *args):
-        if len(args) == 1 and isinstance(args[0], types.FunctionType):
-            self.locator = args[0]
-        else:
-            self.locator = lambda m: m.find_element(*args)
-
-    def __call__(self, marionette):
-        return _find(marionette, self.locator)
-
-class element_not_present(element_present):
-    """Checks that a web element is not present in the DOM of the current
-    context.
-
-    You can select which element to be checked for lack of presence by
-    supplying a locator::
-
-        r = Wait(marionette).until(expected.element_not_present(By.ID, "foo"))
-
-    Or by using a function/lambda returning an element::
-
-        r = Wait(marionette).until(expected.element_present(lambda m: m.find_element(By.ID, "foo")))
-
-    :param args: locator or function returning web element
-    :returns: True if element is not present, or False if it is present
-
-    """
-
-    def __init__(self, *args):
-        super(element_not_present, self).__init__(*args)
-
-    def __call__(self, marionette):
-        return not super(element_not_present, self).__call__(marionette)
-
-class element_stale(object):
-    """Check that the given element is no longer attached to DOM of the
-    current context.
-
-    This can be useful for waiting until an element is no longer
-    present.
-
-    Sample usage::
-
-        el = marionette.find_element(By.ID, "foo")
-        # ...
-        Wait(marionette).until(expected.element_stale(el))
-
-    :param element: the element to wait for
-    :returns: False if the element is still attached to the DOM, True
-        otherwise
-
-    """
-
-    def __init__(self, element):
-        self.el = element
-
-    def __call__(self, marionette):
-        try:
-            # Calling any method forces a staleness check
-            self.el.is_enabled()
-            return False
-        except errors.StaleElementException:
-            return True
-
-class elements_present(object):
-    """Checks that web elements are present in the DOM of the current
-    context.  This does not necessarily mean that the elements are
-    visible.
-
-    You can select which elements to be checked for presence by
-    supplying a locator::
-
-        els = Wait(marionette).until(expected.elements_present(By.TAG_NAME, "a"))
-
-    Or by using a function/lambda returning a list of elements::
-
-        els = Wait(marionette).until(expected.elements_present(lambda m: m.find_elements(By.TAG_NAME, "a")))
-
-    :param args: locator or function returning a list of web elements
-    :returns: list of web elements once they are located, or False
-
-    """
-
-    def __init__(self, *args):
-        if len(args) == 1 and isinstance(args[0], types.FunctionType):
-            self.locator = args[0]
-        else:
-            self.locator = lambda m: m.find_elements(*args)
-
-    def __call__(self, marionette):
-        return _find(marionette, self.locator)
-
-class elements_not_present(elements_present):
-    """Checks that web elements are not present in the DOM of the
-    current context.
-
-    You can select which elements to be checked for not being present
-    by supplying a locator::
-
-        r = Wait(marionette).until(expected.elements_not_present(By.TAG_NAME, "a"))
-
-    Or by using a function/lambda returning a list of elements::
-
-        r = Wait(marionette).until(expected.elements_not_present(lambda m: m.find_elements(By.TAG_NAME, "a")))
-
-    :param args: locator or function returning a list of web elements
-    :returns: True if elements are missing, False if one or more are
-        present
-
-    """
-
-    def __init__(self, *args):
-        super(elements_not_present, self).__init__(*args)
-
-    def __call__(self, marionette):
-        return not super(elements_not_present, self).__call__(marionette)
-
-class element_displayed(object):
-    """An expectation for checking that an element is visible.
-
-    Visibility means that the element is not only displayed, but also
-    has a height and width that is greater than 0 pixels.
-
-    Stale elements, meaning elements that have been detached from the
-    DOM of the current context are treated as not being displayed,
-    meaning this expectation is not analogous to the behaviour of
-    calling `is_displayed()` on an `HTMLElement`.
-
-    You can select which element to be checked for visibility by
-    supplying a locator::
-
-        displayed = Wait(marionette).until(expected.element_displayed(By.ID, "foo"))
-
-    Or by supplying an element::
-
-        el = marionette.find_element(By.ID, "foo")
-        displayed = Wait(marionette).until(expected.element_displayed(el))
-
-    :param args: locator or web element
-    :returns: True if element is displayed, False if hidden
-
-    """
-
-    def __init__(self, *args):
-        self.el = None
-        if len(args) == 1 and isinstance(args[0], HTMLElement):
-            self.el = args[0]
-        else:
-            self.locator = lambda m: m.find_element(*args)
-
-    def __call__(self, marionette):
-        if self.el is None:
-            self.el = _find(marionette, self.locator)
-        if not self.el:
-            return False
-        try:
-            return self.el.is_displayed()
-        except errors.StaleElementException:
-            return False
-
-class element_not_displayed(element_displayed):
-    """An expectation for checking that an element is not visible.
-
-    Visibility means that the element is not only displayed, but also
-    has a height and width that is greater than 0 pixels.
-
-    Stale elements, meaning elements that have been detached fom the
-    DOM of the current context are treated as not being displayed,
-    meaning this expectation is not analogous to the behaviour of
-    calling `is_displayed()` on an `HTMLElement`.
-
-    You can select which element to be checked for visibility by
-    supplying a locator::
-
-        hidden = Wait(marionette).until(expected.element_not_displayed(By.ID, "foo"))
-
-    Or by supplying an element::
-
-        el = marionette.find_element(By.ID, "foo")
-        hidden = Wait(marionette).until(expected.element_not_displayed(el))
-
-    :param args: locator or web element
-    :returns: True if element is hidden, False if displayed
-
-    """
-
-    def __init__(self, *args):
-        super(element_not_displayed, self).__init__(*args)
-
-    def __call__(self, marionette):
-        return not super(element_not_displayed, self).__call__(marionette)
-
-class element_selected(object):
-    """An expectation for checking that the given element is selected.
-
-    :param element: the element to be selected
-    :returns: True if element is selected, False otherwise
-
-    """
-
-    def __init__(self, element):
-        self.el = element
-
-    def __call__(self, marionette):
-        return self.el.is_selected()
-
-class element_not_selected(element_selected):
-    """An expectation for checking that the given element is not
-    selected.
-
-    :param element: the element to not be selected
-    :returns: True if element is not selected, False if selected
-
-    """
-
-    def __init__(self, element):
-        super(element_not_selected, self).__init__(element)
-
-    def __call__(self, marionette):
-        return not super(element_not_selected, self).__call__(marionette)
-
-class element_enabled(object):
-    """An expectation for checking that the given element is enabled.
-
-    :param element: the element to check if enabled
-    :returns: True if element is enabled, False otherwise
-
-    """
-
-    def __init__(self, element):
-        self.el = element
-
-    def __call__(self, marionette):
-        return self.el.is_enabled()
-
-class element_not_enabled(element_enabled):
-    """An expectation for checking that the given element is disabled.
-
-    :param element: the element to check if disabled
-    :returns: True if element is disabled, False if enabled
-
-    """
-
-    def __init__(self, element):
-        super(element_not_enabled, self).__init__(element)
-
-    def __call__(self, marionette):
-        return not super(element_not_enabled, self).__call__(marionette)
-
-def _find(marionette, func):
-    el = None
-
-    try:
-        el = func(marionette)
-    except errors.NoSuchElementException:
-        pass
-
-    if el is None:
-        return False
-    return el
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/geckoinstance.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/geckoinstance.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/geckoinstance.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/geckoinstance.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +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/
-
-from copy import deepcopy
-import errno
-import platform
-import os
-import sys
-import time
-
-from mozprofile import Profile
-from mozrunner import Runner
-
-
-class GeckoInstance(object):
-
-    required_prefs = {"marionette.defaultPrefs.enabled": True,
-                      "marionette.logging": True,
-                      "browser.displayedE10SPrompt": 5,
-                      "browser.displayedE10SPrompt.1": 5,
-                      "browser.displayedE10SPrompt.2": 5,
-                      "browser.displayedE10SPrompt.3": 5,
-                      "browser.displayedE10SPrompt.4": 5,
-                      "browser.sessionstore.resume_from_crash": False,
-                      "browser.shell.checkDefaultBrowser": False,
-                      "browser.startup.page": 0,
-                      "browser.tabs.remote.autostart.1": False,
-                      "browser.tabs.remote.autostart.2": False,
-                      "browser.warnOnQuit": False,
-                      "dom.ipc.reportProcessHangs": False,
-                      "startup.homepage_welcome_url": "about:blank"}
-
-    def __init__(self, host, port, bin, profile=None, app_args=None, symbols_path=None,
-                  gecko_log=None, prefs=None):
-        self.marionette_host = host
-        self.marionette_port = port
-        self.bin = bin
-        # Check if it is a Profile object or a path to profile
-        self.profile = None
-        if isinstance(profile, Profile):
-            self.profile = profile
-        else:
-            self.profile_path = profile
-        self.prefs = prefs
-        self.required_prefs = deepcopy(GeckoInstance.required_prefs)
-        if prefs:
-            self.required_prefs.update(prefs)
-        self.app_args = app_args or []
-        self.runner = None
-        self.symbols_path = symbols_path
-        self.gecko_log = gecko_log
-
-    def start(self):
-        profile_args = {"preferences": deepcopy(self.required_prefs)}
-        profile_args["preferences"]["marionette.defaultPrefs.port"] = self.marionette_port
-        if self.prefs:
-            profile_args["preferences"].update(self.prefs)
-        if '-jsdebugger' in self.app_args:
-            profile_args["preferences"].update({
-                "devtools.browsertoolbox.panel": "jsdebugger",
-                "devtools.debugger.remote-enabled": True,
-                "devtools.debugger.chrome-enabled": True,
-                "devtools.chrome.enabled": True,
-                "devtools.debugger.prompt-connection": False,
-                "marionette.debugging.clicktostart": True,
-            })
-
-        if hasattr(self, "profile_path") and self.profile is None:
-            if not self.profile_path:
-                profile_args["restore"] = False
-                self.profile = Profile(**profile_args)
-            else:
-                profile_args["path_from"] = self.profile_path
-                self.profile = Profile.clone(**profile_args)
-
-        process_args = {
-            'processOutputLine': [NullOutput()],
-        }
-
-        if self.gecko_log == '-':
-            process_args['stream'] = sys.stdout
-        else:
-            if self.gecko_log is None:
-                self.gecko_log = 'gecko.log'
-            elif os.path.isdir(self.gecko_log):
-                fname = "gecko-%d.log" % time.time()
-                self.gecko_log = os.path.join(self.gecko_log, fname)
-
-            self.gecko_log = os.path.realpath(self.gecko_log)
-            if os.access(self.gecko_log, os.F_OK):
-                if platform.system() is 'Windows':
-                    # NOTE: windows has a weird filesystem where it happily 'closes'
-                    # the file, but complains if you try to delete it. You get a
-                    # 'file still in use' error. Sometimes you can wait a bit and
-                    # a retry will succeed.
-                    # If all retries fail, we'll just continue without removing
-                    # the file. In this case, if we are restarting the instance,
-                    # then the new logs just get appended to the old file.
-                    tries = 0
-                    while tries < 10:
-                        try:
-                            os.remove(self.gecko_log)
-                            break
-                        except WindowsError as e:
-                            if e.errno == errno.EACCES:
-                                tries += 1
-                                time.sleep(0.5)
-                            else:
-                                raise e
-                else:
-                    os.remove(self.gecko_log)
-
-            process_args['logfile'] = self.gecko_log
-
-        env = os.environ.copy()
-
-        # environment variables needed for crashreporting
-        # https://developer.mozilla.org/docs/Environment_variables_affecting_crash_reporting
-        env.update({ 'MOZ_CRASHREPORTER': '1',
-                     'MOZ_CRASHREPORTER_NO_REPORT': '1', })
-        self.runner = Runner(
-            binary=self.bin,
-            profile=self.profile,
-            cmdargs=['-no-remote', '-marionette'] + self.app_args,
-            env=env,
-            symbols_path=self.symbols_path,
-            process_args=process_args)
-        self.runner.start()
-
-    def close(self, restart=False):
-        if not restart:
-            self.profile = None
-
-        if self.runner:
-            self.runner.stop()
-            self.runner.cleanup()
-
-    def restart(self, prefs=None, clean=True):
-        if clean:
-            self.profile.cleanup()
-            self.profile = None
-
-        self.close(restart=True)
-        if prefs:
-            self.prefs = prefs
-        else:
-            self.prefs = None
-        self.start()
-
-class B2GDesktopInstance(GeckoInstance):
-    def __init__(self, host, port, bin, **kwargs):
-        # Pass a profile and change the binary to -bin so that
-        # the built-in gaia profile doesn't get touched.
-        if kwargs.get('profile', None) is None:
-            # GeckoInstance.start will clone the profile.
-            kwargs['profile'] = os.path.join(os.path.dirname(bin),
-                                             'gaia',
-                                             'profile')
-        if '-bin' not in os.path.basename(bin):
-            if bin.endswith('.exe'):
-                newbin = bin[:-len('.exe')] + '-bin.exe'
-            else:
-                newbin = bin + '-bin'
-            if os.path.exists(newbin):
-                bin = newbin
-        super(B2GDesktopInstance, self).__init__(host, port, bin, **kwargs)
-        if not self.prefs:
-            self.prefs = {}
-        self.prefs["focusmanager.testmode"] = True
-        self.app_args += ['-chrome', 'chrome://b2g/content/shell.html']
-
-class NullOutput(object):
-    def __call__(self, line):
-        pass
-
-
-apps = {'b2g': B2GDesktopInstance,
-        'b2gdesktop': B2GDesktopInstance}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/gestures.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/gestures.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/gestures.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/gestures.py	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/.
-
-from marionette import MultiActions, Actions
-
-#axis is y or x
-#direction is 0 for positive, and -1 for negative
-#length is the total length we want to scroll
-#increments is how much we want to move per scrolling
-#wait_period is the seconds we wait between scrolling
-#scroll_back is whether we want to scroll back to original view
-def smooth_scroll(marionette_session, start_element, axis, direction, length, increments=None, wait_period=None, scroll_back=None):
-    if axis not in ["x", "y"]:
-        raise Exception("Axis must be either 'x' or 'y'")
-    if direction not in [-1, 0]:
-        raise Exception("Direction must either be -1 negative or 0 positive")
-    increments = increments or 100
-    wait_period = wait_period or 0.05
-    scroll_back = scroll_back or False
-    current = 0
-    if axis is "x":
-        if direction is -1:
-            offset = [-increments, 0]
-        else:
-            offset = [increments, 0]
-    else:
-        if direction is -1:
-            offset = [0, -increments]
-        else:
-            offset = [0, increments]
-    action = Actions(marionette_session)
-    action.press(start_element)
-    while (current < length):
-        current += increments
-        action.move_by_offset(*offset).wait(wait_period)
-    if scroll_back:
-        offset = [-value for value in offset]
-        while (current > 0):
-            current -= increments
-            action.move_by_offset(*offset).wait(wait_period)
-    action.release()
-    action.perform()
-
-#element is the target
-#x1,x2 are 1st finger starting position relative to the target
-#x3,y3 are 1st finger ending position relative to the target
-#x2,y2 are 2nd finger starting position relative to the target
-#x4,y4 are 2nd finger ending position relative to the target
-#duration is the amount of time in milliseconds we want to complete the pinch.
-def pinch(marionette_session, element, x1, y1, x2, y2, x3, y3, x4, y4, duration=200):
-    time = 0
-    time_increment = 10
-    if time_increment >= duration:
-        time_increment = duration
-    move_x1 = time_increment*1.0/duration * (x3 - x1)
-    move_y1 = time_increment*1.0/duration * (y3 - y1)
-    move_x2 = time_increment*1.0/duration * (x4 - x2)
-    move_y2 = time_increment*1.0/duration * (y4 - y2)
-    multiAction = MultiActions(marionette_session)
-    action1 = Actions(marionette_session)
-    action2 = Actions(marionette_session)
-    action1.press(element, x1, y1)
-    action2.press(element, x2, y2)
-    while (time < duration):
-        time += time_increment
-        action1.move_by_offset(move_x1, move_y1).wait(time_increment/1000)
-        action2.move_by_offset(move_x2, move_y2).wait(time_increment/1000)
-    action1.release()
-    action2.release()
-    multiAction.add(action1).add(action2).perform()
-
-#element: The element to press.
-#time_in_seconds: Time in seconds to wait before releasing the press.
-#x: Optional, x-coordinate to tap, relative to the top-left corner of the element.
-#y: Optional, y-coordinate to tap, relative to the top-leftcorner of the element.
-def long_press_without_contextmenu(marionette_session, element, time_in_seconds, x=None, y=None):
-    action = Actions(marionette_session)
-    action.press(element, x, y)
-    action.move_by_offset(0, 0)
-    action.wait(time_in_seconds)
-    action.release()
-    action.perform()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/__init__.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/__init__.py	2015-02-28 15:03:02.000000000 +0000
@@ -2,33 +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/.
 
-from gestures import smooth_scroll, pinch
-from by import By
-from marionette import Marionette, HTMLElement, Actions, MultiActions
 from marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
-from errors import (
-    ElementNotVisibleException,
-    ElementNotAccessibleException,
-    ErrorCodes,
-    FrameSendFailureError,
-    FrameSendNotInitializedError,
-    InvalidCookieDomainException,
-    InvalidElementStateException,
-    InvalidResponseException,
-    InvalidSelectorException,
-    JavascriptException,
-    MarionetteException,
-    MoveTargetOutOfBoundsException,
-    NoAlertPresentException,
-    NoSuchElementException,
-    NoSuchFrameException,
-    NoSuchWindowException,
-    ScriptTimeoutException,
-    StaleElementException,
-    TimeoutException,
-    UnableToSetCookieException,
-    XPathLookupException,
-)
 from runner import (
         B2GTestCaseMixin,
         B2GTestResultMixin,
@@ -50,6 +24,3 @@
         TestResult,
         TestResultCollection
 )
-from wait import Wait
-from date_time_value import DateTimeValue
-import decorators
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/keys.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/keys.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/keys.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/keys.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-# copyright 2008-2009 WebDriver committers
-# Copyright 2008-2009 Google Inc.
-#
-# Licensed under the Apache License Version 2.0 = uthe "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.
-
-
-class Keys(object):
-
-    NULL         = u'\ue000'
-    CANCEL       = u'\ue001' #  ^break
-    HELP         = u'\ue002'
-    BACK_SPACE   = u'\ue003'
-    TAB          = u'\ue004'
-    CLEAR        = u'\ue005'
-    RETURN       = u'\ue006'
-    ENTER        = u'\ue007'
-    SHIFT        = u'\ue008'
-    LEFT_SHIFT   = u'\ue008' #  alias
-    CONTROL      = u'\ue009'
-    LEFT_CONTROL = u'\ue009' #  alias
-    ALT          = u'\ue00a'
-    LEFT_ALT     = u'\ue00a' #  alias
-    PAUSE        = u'\ue00b'
-    ESCAPE       = u'\ue00c'
-    SPACE        = u'\ue00d'
-    PAGE_UP      = u'\ue00e'
-    PAGE_DOWN    = u'\ue00f'
-    END          = u'\ue010'
-    HOME         = u'\ue011'
-    LEFT         = u'\ue012'
-    ARROW_LEFT   = u'\ue012' # alias
-    UP           = u'\ue013'
-    ARROW_UP     = u'\ue013' # alias
-    RIGHT        = u'\ue014'
-    ARROW_RIGHT  = u'\ue014' #  alias
-    DOWN         = u'\ue015'
-    ARROW_DOWN   = u'\ue015' #  alias
-    INSERT       = u'\ue016'
-    DELETE       = u'\ue017'
-    SEMICOLON    = u'\ue018'
-    EQUALS       = u'\ue019'
-
-    NUMPAD0      = u'\ue01a' #  numbe pad  keys
-    NUMPAD1      = u'\ue01b'
-    NUMPAD2      = u'\ue01c'
-    NUMPAD3      = u'\ue01d'
-    NUMPAD4      = u'\ue01e'
-    NUMPAD5      = u'\ue01f'
-    NUMPAD6      = u'\ue020'
-    NUMPAD7      = u'\ue021'
-    NUMPAD8      = u'\ue022'
-    NUMPAD9      = u'\ue023'
-    MULTIPLY     = u'\ue024'
-    ADD          = u'\ue025'
-    SEPARATOR    = u'\ue026'
-    SUBTRACT     = u'\ue027'
-    DECIMAL      = u'\ue028'
-    DIVIDE       = u'\ue029'
-
-    F1           = u'\ue031' #  function  keys
-    F2           = u'\ue032'
-    F3           = u'\ue033'
-    F4           = u'\ue034'
-    F5           = u'\ue035'
-    F6           = u'\ue036'
-    F7           = u'\ue037'
-    F8           = u'\ue038'
-    F9           = u'\ue039'
-    F10          = u'\ue03a'
-    F11          = u'\ue03b'
-    F12          = u'\ue03c'
-
-    META         = u'\ue03d'
-    COMMAND      = u'\ue03d'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/marionette.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/marionette.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/marionette.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/marionette.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1737 +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/.
-
-import base64
-import ConfigParser
-import json
-import os
-import socket
-import StringIO
-import traceback
-import warnings
-
-from contextlib import contextmanager
-
-from application_cache import ApplicationCache
-from decorators import do_crash_check
-from keys import Keys
-from marionette_transport import MarionetteTransport
-
-from mozrunner import B2GEmulatorRunner
-
-import geckoinstance
-import errors
-
-class HTMLElement(object):
-    """
-    Represents a DOM Element.
-    """
-
-    CLASS = "class name"
-    SELECTOR = "css selector"
-    ID = "id"
-    NAME = "name"
-    LINK_TEXT = "link text"
-    PARTIAL_LINK_TEXT = "partial link text"
-    TAG = "tag name"
-    XPATH = "xpath"
-
-    def __init__(self, marionette, id):
-        self.marionette = marionette
-        assert(id is not None)
-        self.id = id
-
-    def __str__(self):
-        return self.id
-
-    def __eq__(self, other_element):
-        return self.id == other_element.id
-
-    def find_element(self, method, target):
-        '''
-        Returns an HTMLElement instance that matches the specified method and target, relative to the current element.
-
-        For more details on this function, see the find_element method in the
-        Marionette class.
-        '''
-        return self.marionette.find_element(method, target, self.id)
-
-    def find_elements(self, method, target):
-        '''
-        Returns a list of all HTMLElement instances that match the specified method and target in the current context.
-
-        For more details on this function, see the find_elements method in the
-        Marionette class.
-        '''
-        return self.marionette.find_elements(method, target, self.id)
-
-    def get_attribute(self, attribute):
-        '''
-        Returns the requested attribute (or None, if no attribute is set).
-
-        :param attribute: The name of the attribute.
-        '''
-        return self.marionette._send_message('getElementAttribute', 'value', id=self.id, name=attribute)
-
-    def click(self):
-        return self.marionette._send_message('clickElement', 'ok', id=self.id)
-
-    def tap(self, x=None, y=None):
-        '''
-        Simulates a set of tap events on the element.
-
-        :param x: X-coordinate of tap event. If not given, default to the
-         center of the element.
-        :param y: Y-coordinate of tap event. If not given, default to the
-         center of the element.
-        '''
-        return self.marionette._send_message('singleTap', 'ok', id=self.id, x=x, y=y)
-
-    @property
-    def text(self):
-        '''
-        Returns the visible text of the element, and its child elements.
-        '''
-        return self.marionette._send_message('getElementText', 'value', id=self.id)
-
-    def send_keys(self, *string):
-        '''
-        Sends the string via synthesized keypresses to the element.
-        '''
-        keys = Marionette.convert_keys(*string)
-        return self.marionette._send_message('sendKeysToElement', 'ok', id=self.id, value=keys)
-
-    def clear(self):
-        '''
-        Clears the input of the element.
-        '''
-        return self.marionette._send_message('clearElement', 'ok', id=self.id)
-
-    def is_selected(self):
-        '''
-        Returns True if the element is selected.
-        '''
-        return self.marionette._send_message('isElementSelected', 'value', id=self.id)
-
-    def is_enabled(self):
-        '''
-        This command will return False if all the following criteria are met otherwise return True:
-
-        * A form control is disabled.
-        * A HtmlElement has a disabled boolean attribute.
-
-        '''
-        return self.marionette._send_message('isElementEnabled', 'value', id=self.id)
-
-    def is_displayed(self):
-        '''
-        Returns True if the element is displayed.
-        '''
-        return self.marionette._send_message('isElementDisplayed', 'value', id=self.id)
-
-    @property
-    def size(self):
-        '''
-        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)
-
-    @property
-    def tag_name(self):
-        '''
-        The tag name of the element.
-        '''
-        return self.marionette._send_message('getElementTagName', 'value', id=self.id)
-
-    @property
-    def location(self):
-        """Get an element's location on the page.
-
-        The returned point will contain the x and y coordinates of the
-        top left-hand corner of the given element.  The point (0,0)
-        refers to the upper-left corner of the document.
-
-        :returns: a dictionary containing x and y as entries
-
-        """
-        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)
-
-    @property
-    def rect(self):
-        """
-            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):
-        '''
-        Gets the value of the specified CSS property name.
-
-        :param property_name: Property name to get the value of.
-        '''
-        return self.marionette._send_message('getElementValueOfCssProperty', 'value',
-                                             id=self.id,
-                                             propertyName=property_name)
-    def submit(self):
-        '''
-        Submits if the element is a form or is within a form
-        '''
-        return self.marionette._send_message('submitElement', 'ok', id=self.id)
-
-class Actions(object):
-    '''
-    An Action object represents a set of actions that are executed in a particular order.
-
-    All action methods (press, etc.) return the Actions object itself, to make
-    it easy to create a chain of events.
-
-    Example usage:
-
-    ::
-
-        # get html file
-        testAction = marionette.absolute_url("testFool.html")
-        # navigate to the file
-        marionette.navigate(testAction)
-        # find element1 and element2
-        element1 = marionette.find_element("id", "element1")
-        element2 = marionette.find_element("id", "element2")
-        # create action object
-        action = Actions(marionette)
-        # add actions (press, wait, move, release) into the object
-        action.press(element1).wait(5). move(element2).release()
-        # fire all the added events
-        action.perform()
-    '''
-
-    def __init__(self, marionette):
-        self.action_chain = []
-        self.marionette = marionette
-        self.current_id = None
-
-    def press(self, element, x=None, y=None):
-        '''
-        Sends a 'touchstart' event to this element.
-
-        If no coordinates are given, it will be targeted at the center of the
-        element. If given, it will be targeted at the (x,y) coordinates
-        relative to the top-left corner of the element.
-
-        :param element: The element to press on.
-        :param x: Optional, x-coordinate to tap, relative to the top-left
-         corner of the element.
-        :param y: Optional, y-coordinate to tap, relative to the top-left
-         corner of the element.
-        '''
-        element=element.id
-        self.action_chain.append(['press', element, x, y])
-        return self
-
-    def release(self):
-        '''
-        Sends a 'touchend' event to this element.
-
-        May only be called if press() has already be called on this element.
-
-        If press and release are chained without a move action between them,
-        then it will be processed as a 'tap' event, and will dispatch the
-        expected mouse events ('mousemove' (if necessary), 'mousedown',
-        'mouseup', 'mouseclick') after the touch events. If there is a wait
-        period between press and release that will trigger a contextmenu,
-        then the 'contextmenu' menu event will be fired instead of the
-        touch/mouse events.
-        '''
-        self.action_chain.append(['release'])
-        return self
-
-    def move(self, element):
-        '''
-        Sends a 'touchmove' event at the center of the target element.
-
-        :param element: Element to move towards.
-
-        May only be called if press() has already be called.
-        '''
-        element=element.id
-        self.action_chain.append(['move', element])
-        return self
-
-    def move_by_offset(self, x, y):
-        '''
-        Sends 'touchmove' event to the given x, y coordinates relative to the top-left of the currently touched element.
-
-        May only be called if press() has already be called.
-
-        :param x: Specifies x-coordinate of move event, relative to the
-         top-left corner of the element.
-        :param y: Specifies y-coordinate of move event, relative to the
-         top-left corner of the element.
-        '''
-        self.action_chain.append(['moveByOffset', x, y])
-        return self
-
-    def wait(self, time=None):
-        '''
-        Waits for specified time period.
-
-        :param time: Time in seconds to wait. If time is None then this has no effect for a single action chain. If used inside a multi-action chain, then time being None indicates that we should wait for all other currently executing actions that are part of the chain to complete.
-        '''
-        self.action_chain.append(['wait', time])
-        return self
-
-    def cancel(self):
-        '''
-        Sends 'touchcancel' event to the target of the original 'touchstart' event.
-
-        May only be called if press() has already be called.
-        '''
-        self.action_chain.append(['cancel'])
-        return self
-
-    def tap(self, element, x=None, y=None):
-        '''
-        Performs a quick tap on the target element.
-
-        :param element: The element to tap.
-        :param x: Optional, x-coordinate of tap, relative to the top-left
-         corner of the element. If not specified, default to center of
-         element.
-        :param y: Optional, y-coordinate of tap, relative to the top-left
-         corner of the element. If not specified, default to center of
-         element.
-
-        This is equivalent to calling:
-
-        ::
-
-          action.press(element, x, y).release()
-        '''
-        element=element.id
-        self.action_chain.append(['press', element, x, y])
-        self.action_chain.append(['release'])
-        return self
-
-    def double_tap(self, element, x=None, y=None):
-        '''
-        Performs a double tap on the target element.
-
-        :param element: The element to double tap.
-        :param x: Optional, x-coordinate of double tap, relative to the
-         top-left corner of the element.
-        :param y: Optional, y-coordinate of double tap, relative to the
-         top-left corner of the element.
-        '''
-        element=element.id
-        self.action_chain.append(['press', element, x, y])
-        self.action_chain.append(['release'])
-        self.action_chain.append(['press', element, x, y])
-        self.action_chain.append(['release'])
-        return self
-
-    def flick(self, element, x1, y1, x2, y2, duration=200):
-        '''
-        Performs a flick gesture on the target element.
-
-        :param element: The element to perform the flick gesture on.
-        :param x1: Starting x-coordinate of flick, relative to the top left
-         corner of the element.
-        :param y1: Starting y-coordinate of flick, relative to the top left
-         corner of the element.
-        :param x2: Ending x-coordinate of flick, relative to the top left
-         corner of the element.
-        :param y2: Ending y-coordinate of flick, relative to the top left
-         corner of the element.
-        :param duration: Time needed for the flick gesture for complete (in
-         milliseconds).
-        '''
-        element = element.id
-        elapsed = 0
-        time_increment = 10
-        if time_increment >= duration:
-            time_increment = duration
-        move_x = time_increment*1.0/duration * (x2 - x1)
-        move_y = time_increment*1.0/duration * (y2 - y1)
-        self.action_chain.append(['press', element, x1, y1])
-        while elapsed < duration:
-            elapsed += time_increment
-            self.action_chain.append(['moveByOffset', move_x, move_y])
-            self.action_chain.append(['wait', time_increment/1000])
-        self.action_chain.append(['release'])
-        return self
-
-    def long_press(self, element, time_in_seconds, x=None, y=None):
-        '''
-        Performs a long press gesture on the target element.
-
-        :param element: The element to press.
-        :param time_in_seconds: Time in seconds to wait before releasing the press.
-        :param x: Optional, x-coordinate to tap, relative to the top-left
-         corner of the element.
-        :param y: Optional, y-coordinate to tap, relative to the top-left
-         corner of the element.
-
-        This is equivalent to calling:
-
-        ::
-
-          action.press(element, x, y).wait(time_in_seconds).release()
-
-        '''
-        element = element.id
-        self.action_chain.append(['press', element, x, y])
-        self.action_chain.append(['wait', time_in_seconds])
-        self.action_chain.append(['release'])
-        return self
-
-    def key_down(self, key_code):
-        """
-        Perform a "keyDown" action for the given key code. Modifier keys are
-        respected by the server for the course of an action chain.
-
-        :param key_code: The key to press as a result of this action.
-        """
-        self.action_chain.append(['keyDown', key_code])
-        return self
-
-    def key_up(self, key_code):
-        """
-        Perform a "keyUp" action for the given key code. Modifier keys are
-        respected by the server for the course of an action chain.
-        :param key_up: The key to release as a result of this action.
-        """
-        self.action_chain.append(['keyUp', key_code])
-        return self
-
-    def perform(self):
-        '''
-        Sends the action chain built so far to the server side for execution and clears the current chain of actions.
-        '''
-        self.current_id = self.marionette._send_message('actionChain', 'value', chain=self.action_chain, nextId=self.current_id)
-        self.action_chain = []
-        return self
-
-class MultiActions(object):
-    '''
-    A MultiActions object represents a sequence of actions that may be
-    performed at the same time. Its intent is to allow the simulation
-    of multi-touch gestures.
-    Usage example:
-
-    ::
-
-      # create multiaction object
-      multitouch = MultiActions(marionette)
-      # create several action objects
-      action_1 = Actions(marionette)
-      action_2 = Actions(marionette)
-      # add actions to each action object/finger
-      action_1.press(element1).move_to(element2).release()
-      action_2.press(element3).wait().release(element3)
-      # fire all the added events
-      multitouch.add(action_1).add(action_2).perform()
-    '''
-
-    def __init__(self, marionette):
-        self.multi_actions = []
-        self.max_length = 0
-        self.marionette = marionette
-
-    def add(self, action):
-        '''
-        Adds a set of actions to perform.
-
-        :param action: An Actions object.
-        '''
-        self.multi_actions.append(action.action_chain)
-        if len(action.action_chain) > self.max_length:
-          self.max_length = len(action.action_chain)
-        return self
-
-    def perform(self):
-        '''
-        Perform all the actions added to this object.
-        '''
-        return self.marionette._send_message('multiAction', 'ok', value=self.multi_actions, max_length=self.max_length)
-
-class Alert(object):
-    '''
-    A class for interacting with alerts.
-
-    ::
-
-      Alert(marionette).accept()
-      Alert(merionette).dismiss()
-    '''
-
-    def __init__(self, marionette):
-        self.marionette = marionette
-
-    def accept(self):
-        """Accept a currently displayed modal dialog.
-        """
-        self.marionette._send_message('acceptDialog', 'ok')
-
-    def dismiss(self):
-        """Dismiss a currently displayed modal dialog.
-        """
-        self.marionette._send_message('dismissDialog', 'ok')
-
-    @property
-    def text(self):
-        """Return the currently displayed text in a tab modal.
-        """
-        return self.marionette._send_message('getTextFromDialog', 'value')
-
-    def send_keys(self, *string):
-        """Send keys to the currently displayed text input area in an open
-        tab modal dialog.
-        """
-        keys = Marionette.convert_keys(*string)
-        self.marionette._send_message('sendKeysToDialog', 'ok', value=keys)
-
-
-class Marionette(object):
-    """
-    Represents a Marionette connection to a browser or device.
-    """
-
-    CONTEXT_CHROME = 'chrome' # non-browser content: windows, dialogs, etc.
-    CONTEXT_CONTENT = 'content' # browser content: iframes, divs, etc.
-    TIMEOUT_SEARCH = 'implicit'
-    TIMEOUT_SCRIPT = 'script'
-    TIMEOUT_PAGE = 'page load'
-
-    def __init__(self, host='localhost', port=2828, app=None, app_args=None, bin=None,
-                 profile=None, emulator=None, sdcard=None, emulator_img=None,
-                 emulator_binary=None, emulator_res=None, connect_to_running_emulator=False,
-                 gecko_log=None, homedir=None, baseurl=None, no_window=False, logdir=None,
-                 busybox=None, symbols_path=None, timeout=None, socket_timeout=360,
-                 device_serial=None, adb_path=None, process_args=None,
-                 adb_host=None, adb_port=None, prefs=None):
-        self.host = host
-        self.port = self.local_port = port
-        self.bin = bin
-        self.profile = profile
-        self.instance = None
-        self.session = None
-        self.session_id = None
-        self.window = None
-        self.chrome_window = None
-        self.runner = None
-        self.emulator = None
-        self.extra_emulators = []
-        self.baseurl = baseurl
-        self.no_window = no_window
-        self._test_name = None
-        self.timeout = timeout
-        self.socket_timeout = socket_timeout
-        self.device_serial = device_serial
-        self.adb_host = adb_host
-        self.adb_port = adb_port
-
-        if bin:
-            port = int(self.port)
-            if not Marionette.is_port_available(port, host=self.host):
-                ex_msg = "%s:%d is unavailable." % (self.host, port)
-                raise errors.MarionetteException(message=ex_msg)
-            if app:
-                # select instance class for the given app
-                try:
-                    instance_class = geckoinstance.apps[app]
-                except KeyError:
-                    msg = 'Application "%s" unknown (should be one of %s)'
-                    raise NotImplementedError(msg % (app, geckoinstance.apps.keys()))
-            else:
-                try:
-                    config = ConfigParser.RawConfigParser()
-                    config.read(os.path.join(os.path.dirname(bin), 'application.ini'))
-                    app = config.get('App', 'Name')
-                    instance_class = geckoinstance.apps[app.lower()]
-                except (ConfigParser.NoOptionError,
-                        ConfigParser.NoSectionError,
-                        KeyError):
-                    instance_class = geckoinstance.GeckoInstance
-            self.instance = instance_class(host=self.host, port=self.port,
-                                           bin=self.bin, profile=self.profile,
-                                           app_args=app_args, symbols_path=symbols_path,
-                                           gecko_log=gecko_log, prefs=prefs)
-            self.instance.start()
-            assert(self.wait_for_port()), "Timed out waiting for port!"
-
-        if emulator:
-            self.runner = B2GEmulatorRunner(b2g_home=homedir,
-                                            no_window=self.no_window,
-                                            logdir=logdir,
-                                            arch=emulator,
-                                            sdcard=sdcard,
-                                            symbols_path=symbols_path,
-                                            binary=emulator_binary,
-                                            userdata=emulator_img,
-                                            resolution=emulator_res,
-                                            profile=self.profile,
-                                            adb_path=adb_path,
-                                            process_args=process_args)
-            self.emulator = self.runner.device
-            self.emulator.start()
-            self.port = self.emulator.setup_port_forwarding(remote_port=self.port)
-            assert(self.emulator.wait_for_port(self.port)), "Timed out waiting for port!"
-
-        if connect_to_running_emulator:
-            self.runner = B2GEmulatorRunner(b2g_home=homedir,
-                                            logdir=logdir,
-                                            process_args=process_args)
-            self.emulator = self.runner.device
-            self.emulator.connect()
-            self.port = self.emulator.setup_port_forwarding(remote_port=self.port)
-            assert(self.emulator.wait_for_port(self.port)), "Timed out waiting for port!"
-
-        self.client = MarionetteTransport(self.host, self.port, self.socket_timeout)
-
-        if emulator:
-            if busybox:
-                self.emulator.install_busybox(busybox=busybox)
-            self.emulator.wait_for_system_message(self)
-
-    def cleanup(self):
-        if self.session:
-            try:
-                self.delete_session()
-            except (errors.MarionetteException, socket.error, IOError):
-                # These exceptions get thrown if the Marionette server
-                # hit an exception/died or the connection died. We can
-                # do no further server-side cleanup in this case.
-                pass
-            self.session = None
-        if self.runner:
-            self.runner.cleanup()
-        if self.instance:
-            self.instance.close()
-        for qemu in self.extra_emulators:
-            qemu.emulator.close()
-
-    def __del__(self):
-        self.cleanup()
-
-    @staticmethod
-    def is_port_available(port, host=''):
-        port = int(port)
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            s.bind((host, port))
-            return True
-        except socket.error:
-            return False
-        finally:
-            s.close()
-
-    def wait_for_port(self, timeout=60):
-        return MarionetteTransport.wait_for_port(self.host,
-                                                 self.port,
-                                                 timeout=timeout)
-
-    @do_crash_check
-    def _send_message(self, command, response_key="ok", **kwargs):
-        if not self.session_id and command != "newSession":
-            raise errors.MarionetteException("Please start a session")
-
-        message = {"name": command}
-        if self.session_id:
-            message["sessionId"] = self.session_id
-        if kwargs:
-            message["parameters"] = kwargs
-
-        try:
-            response = self.client.send(message)
-        except socket.timeout:
-            self.session = None
-            self.window = None
-            self.client.close()
-            raise errors.TimeoutException(
-                "Connection timed out", status=errors.ErrorCodes.TIMEOUT)
-
-        # Process any emulator commands that are sent from a script
-        # while it's executing.
-        while True:
-            if response.get("emulator_cmd"):
-                response = self._handle_emulator_cmd(response)
-                continue;
-
-            if response.get("emulator_shell"):
-                response = self._handle_emulator_shell(response)
-                continue;
-
-            break;
-        if not self.session_id:
-            self.session_id = response.get("sessionId", None)
-
-        if response_key in response:
-            return response[response_key]
-        self._handle_error(response)
-
-    def _handle_emulator_cmd(self, response):
-        cmd = response.get("emulator_cmd")
-        if not cmd or not self.emulator:
-            raise errors.MarionetteException(
-                "No emulator in this test to run command against")
-        cmd = cmd.encode("ascii")
-        result = self.emulator._run_telnet(cmd)
-        return self.client.send({"name": "emulatorCmdResult",
-                                 "id": response.get("id"),
-                                 "result": result})
-
-    def _handle_emulator_shell(self, response):
-        args = response.get("emulator_shell")
-        if not isinstance(args, list) or not self.emulator:
-            raise errors.MarionetteException(
-                "No emulator in this test to run shell command against")
-        buf = StringIO.StringIO()
-        self.emulator.dm.shell(args, buf)
-        result = str(buf.getvalue()[0:-1]).rstrip().splitlines()
-        buf.close()
-        return self.client.send({"name": "emulatorCmdResult",
-                                 "id": response.get("id"),
-                                 "result": result})
-
-    def _handle_error(self, response):
-        if "error" not in response or not isinstance(response["error"], dict):
-            raise errors.MarionetteException(
-                "Malformed packet, expected key 'error' to be a dict: %s" % response)
-
-        error = response["error"]
-        status = error.get("status", 500)
-        message = error.get("message")
-        stacktrace = error.get("stacktrace")
-
-        # status numbers come from
-        # http://code.google.com/p/selenium/wiki/JsonWireProtocol#Response_Status_Codes
-        if status == errors.ErrorCodes.NO_SUCH_ELEMENT:
-            raise errors.NoSuchElementException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.NO_SUCH_FRAME:
-            raise errors.NoSuchFrameException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.STALE_ELEMENT_REFERENCE:
-            raise errors.StaleElementException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.ELEMENT_NOT_VISIBLE:
-            raise errors.ElementNotVisibleException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.ELEMENT_NOT_ACCESSIBLE:
-            raise errors.ElementNotAccessibleException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.INVALID_ELEMENT_STATE:
-            raise errors.InvalidElementStateException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.UNKNOWN_ERROR:
-            raise errors.MarionetteException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.ELEMENT_IS_NOT_SELECTABLE:
-            raise errors.ElementNotSelectableException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.JAVASCRIPT_ERROR:
-            raise errors.JavascriptException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.XPATH_LOOKUP_ERROR:
-            raise errors.XPathLookupException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.TIMEOUT:
-            raise errors.TimeoutException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.NO_SUCH_WINDOW:
-            raise errors.NoSuchWindowException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.INVALID_COOKIE_DOMAIN:
-            raise errors.InvalidCookieDomainException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.UNABLE_TO_SET_COOKIE:
-            raise errors.UnableToSetCookieException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.NO_ALERT_OPEN:
-            raise errors.NoAlertPresentException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.SCRIPT_TIMEOUT:
-            raise errors.ScriptTimeoutException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.INVALID_SELECTOR \
-             or status == errors.ErrorCodes.INVALID_XPATH_SELECTOR \
-             or status == errors.ErrorCodes.INVALID_XPATH_SELECTOR_RETURN_TYPER:
-            raise errors.InvalidSelectorException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.MOVE_TARGET_OUT_OF_BOUNDS:
-            raise errors.MoveTargetOutOfBoundsException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.FRAME_SEND_NOT_INITIALIZED_ERROR:
-            raise errors.FrameSendNotInitializedError(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.FRAME_SEND_FAILURE_ERROR:
-            raise errors.FrameSendFailureError(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.UNSUPPORTED_OPERATION:
-            raise errors.UnsupportedOperationException(message=message, status=status, stacktrace=stacktrace)
-        elif status == errors.ErrorCodes.SESSION_NOT_CREATED:
-            raise errors.SessionNotCreatedException(message=message, status=status, stacktrace=stacktrace)
-        else:
-            raise errors.MarionetteException(message=message, status=status, stacktrace=stacktrace)
-
-    def _reset_timeouts(self):
-        if self.timeout is not None:
-            self.timeouts(self.TIMEOUT_SEARCH, self.timeout)
-            self.timeouts(self.TIMEOUT_SCRIPT, self.timeout)
-            self.timeouts(self.TIMEOUT_PAGE, self.timeout)
-        else:
-            self.timeouts(self.TIMEOUT_PAGE, 30000)
-
-    def check_for_crash(self):
-        returncode = None
-        name = None
-        crashed = False
-        if self.runner:
-            if self.runner.check_for_crashes(test_name=self.test_name):
-                returncode = self.emulator.proc.returncode
-                name = 'emulator'
-                crashed = True
-        elif self.instance:
-            if self.instance.runner.check_for_crashes(
-                    test_name=self.test_name):
-                crashed = True
-        if returncode is not None:
-            print ('PROCESS-CRASH | %s | abnormal termination with exit code %d' %
-                (name, returncode))
-        return crashed
-
-    @staticmethod
-    def convert_keys(*string):
-        typing = []
-        for val in string:
-            if isinstance(val, Keys):
-                typing.append(val)
-            elif isinstance(val, int):
-                val = str(val)
-                for i in range(len(val)):
-                    typing.append(val[i])
-            else:
-                for i in range(len(val)):
-                    typing.append(val[i])
-        return typing
-
-    def enforce_gecko_prefs(self, prefs):
-        """
-        Checks if the running instance has the given prefs. If not, it will kill the
-        currently running instance, and spawn a new instance with the requested preferences.
-
-        : param prefs: A dictionary whose keys are preference names.
-        """
-        if not self.instance:
-            raise errors.MarionetteException("enforce_gecko_prefs can only be called " \
-                                             "on gecko instances launched by Marionette")
-        pref_exists = True
-        self.set_context(self.CONTEXT_CHROME)
-        for pref, value in prefs.iteritems():
-            if type(value) is not str:
-                value = json.dumps(value)
-            pref_exists = self.execute_script("""
-            let prefInterface = Components.classes["@mozilla.org/preferences-service;1"]
-                                          .getService(Components.interfaces.nsIPrefBranch);
-            let pref = '%s';
-            let value = '%s';
-            let type = prefInterface.getPrefType(pref);
-            switch(type) {
-                case prefInterface.PREF_STRING:
-                    return value == prefInterface.getCharPref(pref).toString();
-                case prefInterface.PREF_BOOL:
-                    return value == prefInterface.getBoolPref(pref).toString();
-                case prefInterface.PREF_INT:
-                    return value == prefInterface.getIntPref(pref).toString();
-                case prefInterface.PREF_INVALID:
-                    return false;
-            }
-            """ % (pref, value))
-            if not pref_exists:
-                break
-        self.set_context(self.CONTEXT_CONTENT)
-        if not pref_exists:
-            self.delete_session()
-            self.instance.restart(prefs)
-            assert(self.wait_for_port()), "Timed out waiting for port!"
-            self.start_session()
-            self._reset_timeouts()
-
-    def restart(self, clean=False):
-        """
-        This will terminate the currently running instance, and spawn a new instance
-        with the same profile and then reuse the session id when creating a session again.
-
-        : param prefs: A dictionary whose keys are preference names.
-        """
-        if not self.instance:
-            raise errors.MarionetteException("restart can only be called " \
-                                             "on gecko instances launched by Marionette")
-        self.delete_session()
-        self.instance.restart(clean=clean)
-        assert(self.wait_for_port()), "Timed out waiting for port!"
-        self.start_session(session_id=self.session_id)
-        self._reset_timeouts()
-
-    def absolute_url(self, relative_url):
-        '''
-        Returns an absolute url for files served from Marionette's www directory.
-
-        :param relative_url: The url of a static file, relative to Marionette's www directory.
-        '''
-        return "%s%s" % (self.baseurl, relative_url)
-
-    def start_session(self, desired_capabilities=None, session_id=None, timeout=60):
-        """Create a new Marionette session.
-
-        This method must be called before performing any other action.
-
-        :param desired_capabilities: An optional dict of desired
-            capabilities.  This is currently ignored.
-        :param timeout: Timeout in seconds for the server to be ready.
-        :param session_id: unique identifier for the session. If no session id is
-            passed in then one will be generated by the marionette server.
-
-        :returns: A dict of the capabilities offered."""
-        self.wait_for_port(timeout=timeout)
-        self.session = self._send_message('newSession', 'value', capabilities=desired_capabilities, session_id=session_id)
-        self.b2g = 'b2g' in self.session
-        return self.session
-
-    @property
-    def test_name(self):
-        return self._test_name
-
-    @test_name.setter
-    def test_name(self, test_name):
-        if self._send_message('setTestName', 'ok', value=test_name):
-            self._test_name = test_name
-
-    def delete_session(self):
-        """Close the current session and disconnect from the server."""
-        response = self._send_message('deleteSession', 'ok')
-        self.session_id = None
-        self.session = None
-        self.window = None
-        self.client.close()
-        return response
-
-    @property
-    def session_capabilities(self):
-        '''
-        A JSON dictionary representing the capabilities of the current session.
-        '''
-        response = self._send_message('getSessionCapabilities', 'value')
-        return response
-
-    def set_script_timeout(self, timeout):
-        '''
-        Sets the maximum number of ms that an asynchronous script is allowed to run.
-
-        If a script does not return in the specified amount of time, a
-        ScriptTimeoutException is raised.
-
-        :param timeout: The maximum number of milliseconds an asynchronous
-         script can run without causing an ScriptTimeoutException to be raised
-        '''
-        response = self._send_message('setScriptTimeout', 'ok', ms=timeout)
-        return response
-
-    def set_search_timeout(self, timeout):
-        '''
-        Sets a timeout for the find methods.
-
-        When searching for an element using either
-        :class:`Marionette.find_element` or :class:`Marionette.find_elements`,
-        the method will continue trying to locate the element for up to timeout
-        ms. This can be useful if, for example, the element you're looking for
-        might not exist immediately, because it belongs to a page which is
-        currently being loaded.
-
-        :param timeout: Timeout in milliseconds.
-        '''
-        response = self._send_message('setSearchTimeout', 'ok', ms=timeout)
-        return response
-
-    @property
-    def current_window_handle(self):
-        """Get the current window's handle.
-
-        Returns an opaque server-assigned identifier to this window
-        that uniquely identifies it within this Marionette instance.
-        This can be used to switch to this window at a later point.
-
-        :returns: unique window handle
-        :rtype: string
-
-        """
-        self.window = self._send_message("getWindowHandle", "value")
-        return self.window
-
-    @property
-    def current_chrome_window_handle(self):
-        """Get the current chrome window's handle. Corresponds to
-        a chrome window that may itself contain tabs identified by
-        window_handles.
-
-        Returns an opaque server-assigned identifier to this window
-        that uniquely identifies it within this Marionette instance.
-        This can be used to switch to this window at a later point.
-
-        :returns: unique window handle
-        :rtype: string
-
-        """
-        self.chrome_window = self._send_message("getCurrentChromeWindowHandle", "value")
-        return self.chrome_window
-
-
-    def get_window_position(self):
-        """Get the current window's position
-           Return a dictionary with the keys x and y
-           :returns: a dictionary with x and y
-        """
-        return self._send_message("getWindowPosition", "value")
-
-    def set_window_position(self, x, y):
-        """
-           Set the position of the current window
-            :param x: x coordinate for the top left of the window
-            :param y: y coordinate for the top left of the window
-        """
-        response = self._send_message("setWindowPosition", "ok", x=x, y=y)
-        return response
-
-    @property
-    def title(self):
-        '''
-        Current title of the active window.
-        '''
-        response = self._send_message('getTitle', 'value')
-        return response
-
-    @property
-    def window_handles(self):
-        """Get list of windows in the current context.
-
-        If called in the content context it will return a list of
-        references to all available browser windows.  Called in the
-        chrome context, it will list all available windows, not just
-        browser windows (e.g. not just navigator.browser).
-
-        Each window handle is assigned by the server, and the list of
-        strings returned does not have a guaranteed ordering.
-
-        :returns: unordered list of unique window handles as strings
-
-        """
-
-        response = self._send_message("getWindowHandles", "value")
-        return response
-
-    @property
-    def chrome_window_handles(self):
-        """Get a list of currently open chrome windows.
-
-        Each window handle is assigned by the server, and the list of
-        strings returned does not have a guaranteed ordering.
-
-        :returns: unordered list of unique window handles as strings
-
-        """
-
-        response = self._send_message("getChromeWindowHandles", "value")
-        return response
-
-
-    @property
-    def page_source(self):
-        '''
-        A string representation of the DOM.
-        '''
-        response = self._send_message('getPageSource', 'value')
-        return response
-    def close(self):
-        """Close the current window, ending the session if it's the last
-        window currently open.
-
-        On B2G this method is a noop and will return immediately.
-
-        """
-
-        response = self._send_message("close", "ok")
-        return response
-
-    def close_chrome_window(self):
-        """Close the currently selected chrome window, ending the session
-        if it's the last window open.
-
-        On B2G this method is a noop and will return immediately.
-
-        """
-
-        response = self._send_message("closeChromeWindow", "ok")
-        return response
-
-    def set_context(self, context):
-        '''
-        Sets the context that Marionette commands are running in.
-
-        :param context: Context, may be one of the class properties
-         `CONTEXT_CHROME` or `CONTEXT_CONTENT`.
-
-        Usage example::
-
-          marionette.set_context(marionette.CONTEXT_CHROME)
-        '''
-        assert(context == self.CONTEXT_CHROME or context == self.CONTEXT_CONTENT)
-        return self._send_message('setContext', 'ok', value=context)
-
-    @contextmanager
-    def using_context(self, context):
-        '''
-        Sets the context that Marionette commands are running in using
-        a `with` statement. The state of the context on the server is
-        saved before entering the block, and restored upon exiting it.
-
-        :param context: Context, may be one of the class properties
-         `CONTEXT_CHROME` or `CONTEXT_CONTENT`.
-
-        Usage example::
-
-          with marionette.using_context(marionette.CONTEXT_CHROME):
-              # chrome scope
-              ... do stuff ...
-        '''
-        scope = self._send_message('getContext', 'value')
-        self.set_context(context)
-        try:
-            yield
-        finally:
-            self.set_context(scope)
-
-    def switch_to_alert(self):
-        '''
-        Returns an Alert object for interacting with a currently displayed alert.
-
-        ::
-
-            alert = self.marionette.switch_to_alert()
-            text = alert.text
-            alert.accept()
-        '''
-        return Alert(self)
-
-    def switch_to_window(self, window_id):
-        '''
-        Switch to the specified window; subsequent commands will be directed at the new window.
-
-        :param window_id: The id or name of the window to switch to.
-        '''
-        response = self._send_message('switchToWindow', 'ok', name=window_id)
-        self.window = window_id
-        return response
-
-    def get_active_frame(self):
-        '''
-        Returns an HTMLElement representing the frame Marionette is currently acting on.
-        '''
-        response = self._send_message('getActiveFrame', 'value')
-        if response:
-            return HTMLElement(self, response)
-        return None
-
-    def switch_to_default_content(self):
-        '''
-        Switch the current context to page's default content.
-        '''
-        return self.switch_to_frame()
-
-    def switch_to_frame(self, frame=None, focus=True):
-        '''
-        Switch the current context to the specified frame. Subsequent commands will operate in the context of the specified frame, if applicable.
-
-        :param frame: A reference to the frame to switch to: this can be an HTMLElement, an index, name or an id attribute. If you call switch_to_frame() without an argument, it will switch to the top-level frame.
-        :param focus: A boolean value which determins whether to focus the frame that we just switched to.
-        '''
-        if isinstance(frame, HTMLElement):
-            response = self._send_message('switchToFrame', 'ok', element=frame.id, focus=focus)
-        else:
-            response = self._send_message('switchToFrame', 'ok', id=frame, focus=focus)
-        return response
-
-    def get_url(self):
-        """Get a string representing the current URL.
-
-        On Desktop this returns a string representation of the URL of
-        the current top level browsing context.  This is equivalent to
-        document.location.href.
-
-        When in the context of the chrome, this returns the canonical
-        URL of the current resource.
-
-        :returns: string representation of URL
-
-        """
-
-        response = self._send_message("getCurrentUrl", "value")
-        return response
-
-    def get_window_type(self):
-        '''
-        Gets the windowtype attribute of the window Marionette is currently acting on.
-
-        This command only makes sense in a chrome context. You might use this
-        method to distinguish a browser window from an editor window.
-        '''
-        response = self._send_message('getWindowType', 'value')
-        return response
-
-    def navigate(self, url):
-        """Navigate to to given URL.
-
-        This will follow redirects issued by the server.  When the
-        method returns is based on the page load strategy that the
-        user has selected.
-
-        Documents that contain a META tag with the "http-equiv"
-        attribute set to "refresh" will return if the timeout is
-        greater than 1 second and the other criteria for determining
-        whether a page is loaded are met.  When the refresh period is
-        1 second or less and the page load strategy is "normal" or
-        "conservative", it will wait for the page to complete loading
-        before returning.
-
-        If any modal dialog box, such as those opened on
-        window.onbeforeunload or window.alert, is opened at any point
-        in the page load, it will return immediately.
-
-        If a 401 response is seen by the browser, it will return
-        immediately.  That is, if BASIC, DIGEST, NTLM or similar
-        authentication is required, the page load is assumed to be
-        complete.  This does not include FORM-based authentication.
-
-        :param url: The url to navigate to.
-
-        """
-
-        response = self._send_message("get", "ok", url=url)
-        return response
-
-    def timeouts(self, timeout_type, ms):
-        """An interface for managing timeout behaviour of a Marionette instance.
-
-        Setting timeouts specifies the type and amount of time the Marionette instance should wait during requests.
-
-        There are three types of timeouts that can be set: implicit, script and page load.
-
-        * An implicit  timeout specifies the amount of time a Marionette instance should wait when searching for elements. Here, marionette polls a page until an element is found or the timeout expires, whichever occurs first. When searching for multiple elements, the driver should poll the page until at least one element is found or the timeout expires, at which point it should return an empty list.
-        * A script timeout specifies the amount of time the Marionette instance should wait after calling executeAsyncScript for the callback to have executed before returning a timeout response.
-        * A page load timeout specifies the amount of time the Marionette instance should wait for a page load operation to complete. If this limit is exceeded, the Marionette instance will return a "timeout" response status.
-
-        :param timeout_type: A string value specifying the timeout type. This must be one of three types: 'implicit', 'script' or 'page load'
-        :param ms: A number value specifying the timeout length in milliseconds (ms)
-        """
-        assert(timeout_type == self.TIMEOUT_SEARCH or timeout_type == self.TIMEOUT_SCRIPT or timeout_type == self.TIMEOUT_PAGE)
-        response = self._send_message('timeouts', 'ok', type=timeout_type, ms=ms)
-        return response
-
-    def go_back(self):
-        '''
-        Causes the browser to perform a back navigation.
-        '''
-        response = self._send_message('goBack', 'ok')
-        return response
-
-    def go_forward(self):
-        '''
-        Causes the browser to perform a forward navigation.
-        '''
-        response = self._send_message('goForward', 'ok')
-        return response
-
-    def refresh(self):
-        '''
-        Causes the browser to perform to refresh the current page.
-        '''
-        response = self._send_message('refresh', 'ok')
-        return response
-
-    def wrapArguments(self, args):
-        if isinstance(args, list):
-            wrapped = []
-            for arg in args:
-                wrapped.append(self.wrapArguments(arg))
-        elif isinstance(args, dict):
-            wrapped = {}
-            for arg in args:
-                wrapped[arg] = self.wrapArguments(args[arg])
-        elif type(args) == HTMLElement:
-            wrapped = {'ELEMENT': args.id }
-        elif (isinstance(args, bool) or isinstance(args, basestring) or
-              isinstance(args, int) or isinstance(args, float) or args is None):
-            wrapped = args
-
-        return wrapped
-
-    def unwrapValue(self, value):
-        if isinstance(value, list):
-            unwrapped = []
-            for item in value:
-                unwrapped.append(self.unwrapValue(item))
-        elif isinstance(value, dict):
-            unwrapped = {}
-            for key in value:
-                if key == 'ELEMENT':
-                    unwrapped = HTMLElement(self, value[key])
-                else:
-                    unwrapped[key] = self.unwrapValue(value[key])
-        else:
-            unwrapped = value
-
-        return unwrapped
-
-    def execute_js_script(self, script, script_args=None, async=True,
-                          new_sandbox=True, special_powers=False,
-                          script_timeout=None, inactivity_timeout=None,
-                          filename=None):
-        if script_args is None:
-            script_args = []
-        args = self.wrapArguments(script_args)
-        response = self._send_message('executeJSScript',
-                                      'value',
-                                      script=script,
-                                      args=args,
-                                      async=async,
-                                      newSandbox=new_sandbox,
-                                      specialPowers=special_powers,
-                                      scriptTimeout=script_timeout,
-                                      inactivityTimeout=inactivity_timeout,
-                                      filename=filename,
-                                      line=None)
-        return self.unwrapValue(response)
-
-    def execute_script(self, script, script_args=None, new_sandbox=True,
-                       special_powers=False, script_timeout=None):
-        '''
-        Executes a synchronous JavaScript script, and returns the result (or None if the script does return a value).
-
-        The script is executed in the context set by the most recent
-        set_context() call, or to the CONTEXT_CONTENT context if set_context()
-        has not been called.
-
-        :param script: A string containing the JavaScript to execute.
-        :param script_args: A list of arguments to pass to the script.
-        :param special_powers: Whether or not you want access to SpecialPowers
-         in your script. Set to False by default because it shouldn't really
-         be used, since you already have access to chrome-level commands if you
-         set context to chrome and do an execute_script. This method was added
-         only to help us run existing Mochitests.
-        :param new_sandbox: If False, preserve global variables from the last
-         execute_*script call. This is True by default, in which case no
-         globals are preserved.
-
-        Simple usage example:
-
-        ::
-
-          result = marionette.execute_script("return 1;")
-          assert result == 1
-
-        You can use the `script_args` parameter to pass arguments to the
-        script:
-
-        ::
-
-          result = marionette.execute_script("return arguments[0] + arguments[1];",
-                                             script_args=[2, 3])
-          assert result == 5
-          some_element = marionette.find_element("id", "someElement")
-          sid = marionette.execute_script("return arguments[0].id;", script_args=[some_element])
-          assert some_element.get_attribute("id") == sid
-
-        Scripts wishing to access non-standard properties of the window object must use
-        window.wrappedJSObject:
-
-        ::
-
-          result = marionette.execute_script("""
-            window.wrappedJSObject.test1 = 'foo';
-            window.wrappedJSObject.test2 = 'bar';
-            return window.wrappedJSObject.test1 + window.wrappedJSObject.test2;
-            """)
-          assert result == "foobar"
-
-        Global variables set by individual scripts do not persist between
-        script calls by default.  If you wish to persist data between script
-        calls, you can set new_sandbox to False on your next call, and add any
-        new variables to a new 'global' object like this:
-
-        ::
-
-          marionette.execute_script("global.test1 = 'foo';")
-          result = self.marionette.execute_script("return global.test1;", new_sandbox=False)
-          assert result == 'foo'
-
-        '''
-        if script_args is None:
-            script_args = []
-        args = self.wrapArguments(script_args)
-        stack = traceback.extract_stack()
-        frame = stack[-2:-1][0] # grab the second-to-last frame
-        response = self._send_message('executeScript',
-                                      'value',
-                                      script=script,
-                                      args=args,
-                                      newSandbox=new_sandbox,
-                                      specialPowers=special_powers,
-                                      scriptTimeout=script_timeout,
-                                      line=int(frame[1]),
-                                      filename=os.path.basename(frame[0]))
-        return self.unwrapValue(response)
-
-    def execute_async_script(self, script, script_args=None, new_sandbox=True, special_powers=False, script_timeout=None, debug_script=False):
-        '''
-        Executes an asynchronous JavaScript script, and returns the result (or None if the script does return a value).
-
-        The script is executed in the context set by the most recent
-        set_context() call, or to the CONTEXT_CONTENT context if set_context()
-        has not been called.
-
-        :param script: A string containing the JavaScript to execute.
-        :param script_args: A list of arguments to pass to the script.
-        :param special_powers: Whether or not you want access to SpecialPowers
-         in your script. Set to False by default because it shouldn't really
-         be used, since you already have access to chrome-level commands if you
-         set context to chrome and do an execute_script. This method was added
-         only to help us run existing Mochitests.
-        :param new_sandbox: If False, preserve global variables from the last
-         execute_*script call. This is True by default, in which case no
-         globals are preserved.
-        :param debug_script: Capture javascript exceptions when in
-         CONTEXT_CHROME context.
-
-        Usage example:
-
-        ::
-
-          marionette.set_script_timeout(10000) # set timeout period of 10 seconds
-          result = self.marionette.execute_async_script("""
-            // this script waits 5 seconds, and then returns the number 1
-            setTimeout(function() {
-              marionetteScriptFinished(1);
-            }, 5000);
-          """)
-          assert result == 1
-        '''
-        if script_args is None:
-            script_args = []
-        args = self.wrapArguments(script_args)
-        stack = traceback.extract_stack()
-        frame = stack[-2:-1][0] # grab the second-to-last frame
-        response = self._send_message('executeAsyncScript',
-                                      'value',
-                                      script=script,
-                                      args=args,
-                                      newSandbox=new_sandbox,
-                                      specialPowers=special_powers,
-                                      scriptTimeout=script_timeout,
-                                      line=int(frame[1]),
-                                      filename=os.path.basename(frame[0]),
-                                      debug_script=debug_script)
-        return self.unwrapValue(response)
-
-    def find_element(self, method, target, id=None):
-        '''
-        Returns an HTMLElement instances that matches the specified method and target in the current context.
-
-        An HTMLElement instance may be used to call other methods on the
-        element, such as click().  If no element is immediately found, the
-        attempt to locate an element will be repeated for up to the amount of
-        time set by set_search_timeout(). If multiple elements match the given
-        criteria, only the first is returned. If no element matches, a
-        NoSuchElementException will be raised.
-
-        :param method: The method to use to locate the element; one of: "id",
-                       "name", "class name", "tag name", "css selector", "link text",
-                       "partial link text", "xpath", "anon" and "anon attribute".
-                       Note that the "name", "link text" and
-                       "partial link test" methods are not supported in the chrome dom.
-        :param target: The target of the search.  For example, if method =
-                       "tag", target might equal "div".  If method = "id", target would be
-                       an element id.
-        :param id: If specified, search for elements only inside the element
-                   with the specified id.
-        '''
-        kwargs = { 'value': target, 'using': method }
-        if id:
-            kwargs['element'] = id
-        response = self._send_message('findElement', 'value', **kwargs)
-        element = HTMLElement(self, response['ELEMENT'])
-        return element
-
-    def find_elements(self, method, target, id=None):
-        '''
-        Returns a list of all HTMLElement instances that match the specified method and target in the current context.
-
-        An HTMLElement instance may be used to call other methods on the
-        element, such as click().  If no element is immediately found, the
-        attempt to locate an element will be repeated for up to the amount of
-        time set by set_search_timeout().
-
-        :param method: The method to use to locate the elements; one of:
-                       "id", "name", "class name", "tag name", "css selector", "link text",
-                       "partial link text", "xpath", "anon" and "anon attribute".
-                       Note that the "name", "link text" and
-                       "partial link test" methods are not supported in the chrome dom.
-        :param target: The target of the search.  For example, if method =
-                       "tag", target might equal "div".  If method = "id", target would be
-                       an element id.
-        :param id: If specified, search for elements only inside the element
-                   with the specified id.
-        '''
-        kwargs = { 'value': target, 'using': method }
-        if id:
-            kwargs['element'] = id
-        response = self._send_message('findElements', 'value', **kwargs)
-        assert(isinstance(response, list))
-        elements = []
-        for x in response:
-            elements.append(HTMLElement(self, x['ELEMENT']))
-        return elements
-
-    def get_active_element(self):
-        response = self._send_message('getActiveElement', 'value')
-        return HTMLElement(self, response)
-
-    def log(self, msg, level=None):
-        '''
-        Stores a timestamped log message in the Marionette server for later retrieval.
-
-        :param msg: String with message to log.
-        :param level: String with log level (e.g. "INFO" or "DEBUG"). If None,
-         defaults to "INFO".
-        '''
-        return self._send_message('log', 'ok', value=msg, level=level)
-
-    def get_logs(self):
-        '''
-        Returns the list of logged messages.
-
-        Each log message is an array with three string elements: the level,
-        the message, and a date.
-
-        Usage example:
-
-        ::
-
-          marionette.log("I AM INFO")
-          marionette.log("I AM ERROR", "ERROR")
-          logs = marionette.get_logs()
-          assert logs[0][1] == "I AM INFO"
-          assert logs[1][1] == "I AM ERROR"
-        '''
-        return self._send_message('getLogs', 'value')
-
-    def import_script(self, js_file):
-        '''
-        Imports a script into the scope of the execute_script and execute_async_script calls.
-
-        This is particularly useful if you wish to import your own libraries.
-
-        :param js_file: Filename of JavaScript file to import.
-
-        For example, Say you have a script, importfunc.js, that contains:
-
-        ::
-
-          let testFunc = function() { return "i'm a test function!";};
-
-        Assuming this file is in the same directory as the test, you could do
-        something like:
-
-        ::
-
-          js = os.path.abspath(os.path.join(__file__, os.path.pardir, "importfunc.js"))
-          marionette.import_script(js)
-          assert "i'm a test function!" == self.marionette.execute_script("return testFunc();")
-        '''
-        js = ''
-        with open(js_file, 'r') as f:
-            js = f.read()
-        return self._send_message('importScript', 'ok', script=js)
-
-    def clear_imported_scripts(self):
-        '''
-        Clears all imported scripts in this context, ie: calling clear_imported_scripts in chrome
-        context will clear only scripts you imported in chrome, and will leave the scripts
-        you imported in content context.
-        '''
-        return self._send_message('clearImportedScripts', 'ok')
-
-    def add_cookie(self, cookie):
-        """
-        Adds a cookie to your current session.
-
-        :param cookie: A dictionary object, with required keys - "name" and
-         "value"; optional keys - "path", "domain", "secure", "expiry".
-
-        Usage example:
-
-        ::
-
-          driver.add_cookie({'name': 'foo', 'value': 'bar'})
-          driver.add_cookie({'name': 'foo', 'value': 'bar', 'path': '/'})
-          driver.add_cookie({'name': 'foo', 'value': 'bar', 'path': '/',
-                             'secure': True})
-        """
-        return self._send_message('addCookie', 'ok', cookie=cookie)
-
-    def delete_all_cookies(self):
-        """
-        Delete all cookies in the scope of the current session.
-
-        Usage example:
-
-        ::
-
-          driver.delete_all_cookies()
-        """
-        return self._send_message('deleteAllCookies', 'ok')
-
-    def delete_cookie(self, name):
-        """
-        Delete a cookie by its name.
-
-        :param name: Name of cookie to delete.
-
-        Usage example:
-
-        ::
-
-          driver.delete_cookie('foo')
-        """
-        return self._send_message('deleteCookie', 'ok', name=name);
-
-    def get_cookie(self, name):
-        """
-        Get a single cookie by name. Returns the cookie if found, None if not.
-
-        :param name: Name of cookie to get.
-        """
-        cookies = self.get_cookies()
-        for cookie in cookies:
-            if cookie['name'] == name:
-                return cookie
-        return None
-
-    def get_cookies(self):
-        """Get all the cookies for the current domain.
-
-        This is the equivalent of calling `document.cookie` and
-        parsing the result.
-
-        :returns: A set of cookies for the current domain.
-
-        """
-
-        return self._send_message("getCookies", "value")
-
-    @property
-    def application_cache(self):
-        return ApplicationCache(self)
-
-    def screenshot(self, element=None, highlights=None, format="base64",
-                   full=True):
-        """Takes a screenshot of a web element or the current frame.
-
-        The screen capture is returned as a lossless PNG image encoded
-        as a base 64 string by default. If the `element` argument is defined the
-        capture area will be limited to the bounding box of that
-        element.  Otherwise, the capture area will be the bounding box
-        of the current frame.
-
-        :param element: The element to take a screenshot of.  If None, will
-            take a screenshot of the current frame.
-
-        :param highlights: A list of HTMLElement objects to draw a red
-            box around in the returned screenshot.
-
-        :param format: if "base64" (the default), returns the screenshot
-            as a base64-string. If "binary", the data is decoded and
-            returned as raw binary.
-
-        :param full: If True (the default), the capture area will be the
-            complete frame. Else only the viewport is captured. Only applies
-            when `element` is None.
-        """
-
-        if element:
-            element = element.id
-        lights = None
-        if highlights:
-            lights = [highlight.id for highlight in highlights]
-        screenshot_data = self._send_message("takeScreenshot", "value",
-                                             id=element, highlights=lights,
-                                             full=full)
-        if format == 'base64':
-            return screenshot_data
-        elif format == 'binary':
-            return base64.b64decode(screenshot_data.encode('ascii'))
-        else:
-            raise ValueError("format parameter must be either 'base64'"
-                             " or 'binary', not {0}".format(repr(format)))
-
-    @property
-    def orientation(self):
-        """Get the current browser orientation.
-
-        Will return one of the valid primary orientation values
-        portrait-primary, landscape-primary, portrait-secondary, or
-        landscape-secondary.
-
-        """
-        return self._send_message("getScreenOrientation", "value")
-
-    def set_orientation(self, orientation):
-        """Set the current browser orientation.
-
-        The supplied orientation should be given as one of the valid
-        orientation values.  If the orientation is unknown, an error
-        will be raised.
-
-        Valid orientations are "portrait" and "landscape", which fall
-        back to "portrait-primary" and "landscape-primary"
-        respectively, and "portrait-secondary" as well as
-        "landscape-secondary".
-
-        :param orientation: The orientation to lock the screen in.
-
-        """
-        self._send_message("setScreenOrientation", "ok", orientation=orientation)
-        if self.emulator:
-            self.emulator.screen.orientation = orientation.lower()
-
-    @property
-    def window_size(self):
-        """Get the current browser window size.
-
-        Will return the current browser window size in pixels. Refers to
-        window outerWidth and outerHeight values, which include scroll bars,
-        title bars, etc.
-
-        :returns: dictionary representation of current window width and height
-
-        """
-        return self._send_message("getWindowSize", "value")
-
-    def set_window_size(self, width, height):
-        """Resize the browser window currently in focus.
-
-        The supplied width and height values refer to the window outerWidth
-        and outerHeight values, which include scroll bars, title bars, etc.
-
-        An error will be returned if the requested window size would result
-        in the window being in the maximised state.
-
-        :param width: The width to resize the window to.
-        :param height: The height to resize the window to.
-
-        """
-        self._send_message("setWindowSize", "ok", width=width, height=height)
-
-    def maximize_window(self):
-        """ Resize the browser window currently receiving commands. The action
-        should be equivalent to the user pressing the the maximize button
-        """
-
-        return self._send_message("maximizeWindow", "ok")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/marionette_test.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/marionette_test.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/marionette_test.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/marionette_test.py	2015-02-28 15:03:02.000000000 +0000
@@ -14,7 +14,8 @@
 import weakref
 import warnings
 
-from errors import (
+
+from marionette_driver.errors import (
         ErrorCodes, MarionetteException, InstallGeckoError, TimeoutException, InvalidResponseException,
         JavascriptException, NoSuchElementException, XPathLookupException, NoSuchWindowException,
         StaleElementException, ScriptTimeoutException, ElementNotVisibleException,
@@ -22,10 +23,10 @@
         InvalidCookieDomainException, UnableToSetCookieException, InvalidSelectorException,
         MoveTargetOutOfBoundsException, FrameSendNotInitializedError, FrameSendFailureError
         )
-from marionette import Marionette
+from marionette_driver.marionette import Marionette
 from mozlog.structured.structuredlog import get_default_logger
-from wait import Wait
-from expected import element_present, element_not_present
+from marionette_driver.wait import Wait
+from marionette_driver.expected import element_present, element_not_present
 
 
 class SkipTest(Exception):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/runner/base.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/runner/base.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/runner/base.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/runner/base.py	2015-02-28 15:03:02.000000000 +0000
@@ -17,7 +17,7 @@
 import xml.dom.minidom as dom
 
 from manifestparser import TestManifest
-from marionette import Marionette
+from marionette_driver.marionette import Marionette
 from mixins.b2g import B2GTestResultMixin, get_b2g_pid, get_dm
 from mozhttpd import MozHttpd
 from mozlog.structured.structuredlog import get_default_logger
@@ -242,6 +242,8 @@
 
 
 class BaseMarionetteOptions(OptionParser):
+    socket_timeout_default = 360.0
+
     def __init__(self, **kwargs):
         OptionParser.__init__(self, **kwargs)
         self.parse_args_handlers = [] # Used by mixins
@@ -401,6 +403,11 @@
                         action='store_true',
                         default=False,
                         help='Enable the jsdebugger for marionette javascript.')
+        self.add_option('--socket-timeout',
+                        dest='socket_timeout',
+                        action='store',
+                        default=self.socket_timeout_default,
+                        help='Set the global timeout for marionette socket operations.')
         self.add_option('--e10s',
                         dest='e10s',
                         action='store_true',
@@ -457,6 +464,7 @@
 
         if options.jsdebugger:
             options.app_args.append('-jsdebugger')
+            options.socket_timeout = None
 
         if options.e10s:
             options.prefs = {
@@ -482,7 +490,9 @@
                  shuffle=False, shuffle_seed=random.randint(0, sys.maxint),
                  sdcard=None, this_chunk=1, total_chunks=1, sources=None,
                  server_root=None, gecko_log=None, result_callbacks=None,
-                 adb_host=None, adb_port=None, prefs=None, **kwargs):
+                 adb_host=None, adb_port=None, prefs=None,
+                 socket_timeout=BaseMarionetteOptions.socket_timeout_default,
+                 **kwargs):
         self.address = address
         self.emulator = emulator
         self.emulator_binary = emulator_binary
@@ -507,6 +517,7 @@
         self.device_serial = device_serial
         self.symbols_path = symbols_path
         self.timeout = timeout
+        self.socket_timeout = socket_timeout
         self._device = None
         self._capabilities = None
         self._appName = None
@@ -638,6 +649,7 @@
             'device_serial': self.device_serial,
             'symbols_path': self.symbols_path,
             'timeout': self.timeout,
+            'socket_timeout': self.socket_timeout,
             'adb_host': self._adb_host,
             'adb_port': self._adb_port,
             'prefs': self.prefs,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/selection.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/selection.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/selection.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/selection.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,203 +0,0 @@
-# -*- coding: 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/.
-
-
-class SelectionManager(object):
-    '''Interface for manipulating the selection and carets of the element.
-
-    Simple usage example:
-
-    ::
-
-        element = marionette.find_element('id', 'input')
-        sel = SelectionManager(element)
-        sel.move_caret_to_front()
-
-    '''
-
-    def __init__(self, element):
-        self.element = element
-
-    def _input_or_textarea(self):
-        '''Return True if element is either <input> or <textarea>.'''
-        return self.element.tag_name in ('input', 'textarea')
-
-    def js_selection_cmd(self):
-        '''Return a command snippet to get selection object.
-
-        If the element is <input> or <textarea>, return the selection object
-        associated with it. Otherwise, return the current selection object.
-
-        Note: "element" must be provided as the first argument to
-        execute_script().
-
-        '''
-        if self._input_or_textarea():
-            # We must unwrap sel so that DOMRect could be returned to Python
-            # side.
-            return '''var sel = SpecialPowers.wrap(arguments[0]).editor.selection;
-                   sel = SpecialPowers.unwrap(sel);'''
-        else:
-            return '''var sel = window.getSelection();'''
-
-    def move_caret_by_offset(self, offset, backward=False):
-        '''Move caret in the element by character offset.'''
-        cmd = self.js_selection_cmd() +\
-            '''sel.modify("move", arguments[1], "character");'''
-        direction = 'backward' if backward else 'forward'
-
-        for i in range(offset):
-            self.element.marionette.execute_script(
-                cmd, script_args=[self.element, direction])
-
-    def move_caret_to_front(self):
-        '''Move caret in the element to the front of the content.'''
-        if self._input_or_textarea():
-            cmd = '''arguments[0].setSelectionRange(0, 0);'''
-        else:
-            cmd = '''var sel = window.getSelection();
-                  sel.collapse(arguments[0].firstChild, 0);'''
-
-        self.element.marionette.execute_script(cmd, script_args=[self.element])
-
-    def move_caret_to_end(self):
-        '''Move caret in the element to the end of the content.'''
-        if self._input_or_textarea():
-            cmd = '''var len = arguments[0].value.length;
-                  arguments[0].setSelectionRange(len, len);'''
-        else:
-            cmd = '''var sel = window.getSelection();
-                  sel.collapse(arguments[0].lastChild, arguments[0].lastChild.length);'''
-
-        self.element.marionette.execute_script(cmd, script_args=[self.element])
-
-    def selection_rect_list(self, idx):
-        '''Return the selection's DOMRectList object for the range at given idx.
-
-        If the element is either <input> or <textarea>, return the DOMRectList of
-        the range at given idx of the selection within the element. Otherwise,
-        return the DOMRectList of the of the range at given idx of current selection.
-
-        '''
-        cmd = self.js_selection_cmd() +\
-            '''return sel.getRangeAt(%d).getClientRects();''' % idx
-        return self.element.marionette.execute_script(cmd, script_args=[self.element])
-
-    def range_count(self):
-        '''Get selection's range count'''
-        cmd = self.js_selection_cmd() +\
-            '''return sel.rangeCount;'''
-        return self.element.marionette.execute_script(cmd, script_args=[self.element])
-
-    def _selection_location_helper(self, location_type):
-        '''Return the start and end location of the selection in the element.
-
-        Return a tuple containing two pairs of (x, y) coordinates of the start
-        and end locations in the element. The coordinates are relative to the
-        top left-hand corner of the element. Both ltr and rtl directions are
-        considered.
-
-        '''
-        range_count = self.range_count();
-        first_rect_list = self.selection_rect_list(0)
-        last_rect_list = self.selection_rect_list(range_count - 1)
-        last_list_length = last_rect_list['length']
-        first_rect, last_rect = first_rect_list['0'], last_rect_list[str(last_list_length - 1)]
-        origin_x, origin_y = self.element.rect['x'], self.element.rect['y']
-
-        if self.element.get_attribute('dir') == 'rtl':  # such as Arabic
-            start_pos, end_pos = 'right', 'left'
-        else:
-            start_pos, end_pos = 'left', 'right'
-
-        # Calculate y offset according to different needs.
-        if location_type == 'center':
-            start_y_offset = first_rect['height'] / 2.0
-            end_y_offset = last_rect['height'] / 2.0
-        elif location_type == 'caret':
-            # Selection carets' tip are below the bottom of the two ends of the
-            # selection. Add 5px to y should be sufficient to locate them.
-            caret_tip_y_offset = 5
-            start_y_offset = first_rect['height'] + caret_tip_y_offset
-            end_y_offset = last_rect['height'] + caret_tip_y_offset
-        else:
-            start_y_offset = end_y_offset = 0
-
-        caret1_x = first_rect[start_pos] - origin_x
-        caret1_y = first_rect['top'] + start_y_offset - origin_y
-        caret2_x = last_rect[end_pos] - origin_x
-        caret2_y = last_rect['top'] + end_y_offset - origin_y
-
-        return ((caret1_x, caret1_y), (caret2_x, caret2_y))
-
-    def selection_location(self):
-        '''Return the start and end location of the selection in the element.
-
-        Return a tuple containing two pairs of (x, y) coordinates of the start
-        and end of the selection. The coordinates are relative to the top
-        left-hand corner of the element. Both ltr and rtl direction are
-        considered.
-
-        '''
-        return self._selection_location_helper('center')
-
-    def selection_carets_location(self):
-        '''Return a pair of the two selection carets' location.
-
-        Return a tuple containing two pairs of (x, y) coordinates of the two
-        selection carets' tip. The coordinates are relative to the top left-hand
-        corner of the element. Both ltr and rtl direction are considered.
-
-        '''
-        return self._selection_location_helper('caret')
-
-    def caret_location(self):
-        '''Return caret's center location within the element.
-
-        Return (x, y) coordinates of the caret's center relative to the top
-        left-hand corner of the element.
-
-        '''
-        return self._selection_location_helper('center')[0]
-
-    def touch_caret_location(self):
-        '''Return touch caret's location (based on current caret location).
-
-        Return (x, y) coordinates of the touch caret's tip relative to the top
-        left-hand corner of the element.
-
-        '''
-        return self._selection_location_helper('caret')[0]
-
-    def select_all(self):
-        '''Select all the content in the element.'''
-        if self._input_or_textarea():
-            cmd = '''var len = arguments[0].value.length;
-                  arguments[0].focus();
-                  arguments[0].setSelectionRange(0, len);'''
-        else:
-            cmd = '''var range = document.createRange();
-                  range.setStart(arguments[0].firstChild, 0);
-                  range.setEnd(arguments[0].lastChild, arguments[0].lastChild.length);
-                  var sel = window.getSelection();
-                  sel.removeAllRanges();
-                  sel.addRange(range);'''
-
-        self.element.marionette.execute_script(cmd, script_args=[self.element])
-
-    @property
-    def content(self):
-        '''Return all the content of the element.'''
-        if self._input_or_textarea():
-            return self.element.get_attribute('value')
-        else:
-            return self.element.text
-
-    @property
-    def selected_content(self):
-        '''Return the selected portion of the content in the element.'''
-        cmd = self.js_selection_cmd() +\
-            '''return sel.toString();'''
-        return self.element.marionette.execute_script(cmd, script_args=[self.element])
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/single_finger_functions.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/single_finger_functions.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/single_finger_functions.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/single_finger_functions.py	2015-02-28 15:03:02.000000000 +0000
@@ -1,5 +1,5 @@
-from marionette import Actions
-from errors import TimeoutException
+from marionette_driver.marionette import Actions
+from marionette_driver.errors import TimeoutException
 
 def wait_for_condition_else_raise(marionette, wait_for_condition, expected, script):
     try:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_accessibility.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_accessibility.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_accessibility.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_accessibility.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import ElementNotAccessibleException
-from errors import ElementNotVisibleException
+from marionette_driver.errors import (ElementNotAccessibleException,
+                                     ElementNotVisibleException)
 
 
 class TestAccessibility(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_anonymous_content.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_anonymous_content.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_anonymous_content.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_anonymous_content.py	2015-02-28 15:03:02.000000000 +0000
@@ -2,11 +2,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette import HTMLElement
 from marionette_test import MarionetteTestCase
-from errors import NoSuchElementException
-from expected import element_present
-from wait import Wait
+
+from marionette_driver.errors import NoSuchElementException
+from marionette_driver.expected import element_present
+from marionette_driver.marionette import HTMLElement
+from marionette_driver.wait import Wait
 
 class TestAnonymousContent(MarionetteTestCase):
     def setUp(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_appcache.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_appcache.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_appcache.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_appcache.py	2015-02-28 15:03:02.000000000 +0000
@@ -13,7 +13,7 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 
-from application_cache import ApplicationCache
+from marionette_driver.application_cache import ApplicationCache
 from marionette_test import MarionetteTestCase
 
 
@@ -24,7 +24,7 @@
         self.marionette.navigate(test_url)
         app_cache = self.marionette.application_cache
 
-        status = app_cache.status 
+        status = app_cache.status
         while status == ApplicationCache.DOWNLOADING:
             status = app_cache.status
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_capabilities.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_capabilities.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_capabilities.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_capabilities.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import SessionNotCreatedException
+from marionette_driver.errors import SessionNotCreatedException
 
 class TestCapabilities(MarionetteTestCase):
     def setUp(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_clearing.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_clearing.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_clearing.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_clearing.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import InvalidElementStateException
+from marionette_driver.errors import InvalidElementStateException
 
 class TestClear(MarionetteTestCase):
     def testWriteableTextInputShouldClear(self):
@@ -56,7 +56,7 @@
         element = self.marionette.find_element("id","content-editable")
         element.clear()
         self.assertEqual("", element.text)
-        
+
     def testTextInputShouldNotClearWhenDisabled(self):
         test_html = self.marionette.absolute_url("test_clearing.html")
         self.marionette.navigate(test_html)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_click_chrome.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_click_chrome.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_click_chrome.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_click_chrome.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from by import By
+from marionette_driver.by import By
 
 
 class TestClickChrome(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_click.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_click.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_click.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_click.py	2015-02-28 15:03:02.000000000 +0000
@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from errors import NoSuchElementException, ElementNotVisibleException
+from marionette_driver.by import By
+from marionette_driver.errors import NoSuchElementException, ElementNotVisibleException
 from marionette_test import MarionetteTestCase
-from wait import Wait
+from marionette_driver.wait import Wait
 
 
 class TestClick(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_click_scrolling.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_click_scrolling.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_click_scrolling.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_click_scrolling.py	2015-02-28 15:03:02.000000000 +0000
@@ -2,8 +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/.
 
-from by import By
-from errors import MoveTargetOutOfBoundsException
+from marionette_driver.by import By
+from marionette_driver.errors import MoveTargetOutOfBoundsException
 from marionette_test import MarionetteTestCase, skip
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_date_time_value.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_date_time_value.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_date_time_value.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_date_time_value.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 from marionette_test import MarionetteTestCase
 from datetime import datetime
-from date_time_value import DateTimeValue
+from marionette_driver.date_time_value import DateTimeValue
 
 class TestDateTime(MarionetteTestCase):
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_element_touch.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_element_touch.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_element_touch.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_element_touch.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 class testElementTouch(MarionetteTestCase):
     def test_touch(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_emulator.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_emulator.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_emulator.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_emulator.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException
+from marionette_driver.errors import (JavascriptException,
+                                      MarionetteException)
 
 
 class TestEmulatorContent(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_errors.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_errors.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_errors.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_errors.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,10 +4,9 @@
 
 import sys
 
-import errors
 import marionette_test
-
-from errors import ErrorCodes
+from marionette_driver import errors
+from marionette_driver.errors import ErrorCodes
 
 def fake_cause():
     try:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_async_script.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette_driver.errors import ( JavascriptException,
+                                       MarionetteException,
+                                       ScriptTimeoutException )
 import time
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_isolate.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_isolate.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_isolate.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_isolate.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase, skip_if_b2g
-from errors import JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette_driver.errors import (JavascriptException,
+                                      MarionetteException,
+                                      ScriptTimeoutException)
 
 class TestExecuteIsolationContent(MarionetteTestCase):
     def setUp(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_script.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_script.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_script.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_execute_script.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,8 +4,8 @@
 
 import urllib
 
-from by import By
-from errors import JavascriptException, MarionetteException
+from marionette_driver.by import By
+from marionette_driver.errors import JavascriptException, MarionetteException
 from marionette_test import MarionetteTestCase
 
 def inline(doc):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_expected.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_expected.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_expected.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_expected.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,10 +4,11 @@
 
 import urllib
 
-import expected
+from marionette_driver import expected
+from marionette_driver.by import By
+
 import marionette_test
 
-from by import By
 
 def inline(doc):
     return "data:text/html;charset=utf-8,%s" % urllib.quote(doc)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement_chrome.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,9 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from marionette import HTMLElement
-from by import By
-from errors import NoSuchElementException
+from marionette_driver.marionette import HTMLElement
+from marionette_driver.by import By
+from marionette_driver.errors import NoSuchElementException
 
 
 class TestElementsChrome(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_findelement.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,9 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from marionette import HTMLElement
-from by import By
-from errors import NoSuchElementException, InvalidSelectorException
+from marionette_driver.marionette import HTMLElement
+from marionette_driver.by import By
+from marionette_driver.errors import NoSuchElementException, InvalidSelectorException
 
 
 class TestElements(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_implicit_waits.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_implicit_waits.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_implicit_waits.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_implicit_waits.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import NoSuchElementException
+from marionette_driver.errors import NoSuchElementException
 
 class TestImplicitWaits(MarionetteTestCase):
     def testShouldImplicitlyWaitForASingleElement(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_import_script.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_import_script.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_import_script.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_import_script.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,7 +4,7 @@
 
 import os
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException
+from marionette_driver.errors import JavascriptException
 
 class TestImportScript(MarionetteTestCase):
     def setUp(self):
@@ -18,14 +18,14 @@
     def check_file_exists(self):
         return self.marionette.execute_script("""
           let FileUtils = SpecialPowers.Cu.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
-          let importedScripts = FileUtils.getFile('TmpD', ['marionetteContentScripts']); 
+          let importedScripts = FileUtils.getFile('TmpD', ['marionetteContentScripts']);
           return importedScripts.exists();
         """, special_powers=True)
 
     def get_file_size(self):
         return self.marionette.execute_script("""
           let FileUtils = SpecialPowers.Cu.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
-          let importedScripts = FileUtils.getFile('TmpD', ['marionetteContentScripts']); 
+          let importedScripts = FileUtils.getFile('TmpD', ['marionetteContentScripts']);
           return importedScripts.fileSize;
         """, special_powers=True)
 
@@ -109,7 +109,7 @@
         self.marionette.import_script(firstjs)
         self.marionette.import_script(secondjs)
 
-        self.assertEqual("i'm a test function!", 
+        self.assertEqual("i'm a test function!",
                 self.marionette.execute_script("return testFunc();"))
 
         self.assertEqual("i'm yet another test function!",
@@ -129,14 +129,14 @@
     def check_file_exists(self):
         return self.marionette.execute_async_script("""
           let FileUtils = Components.utils.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
-          let importedScripts = FileUtils.getFile('TmpD', ['marionetteChromeScripts']); 
+          let importedScripts = FileUtils.getFile('TmpD', ['marionetteChromeScripts']);
           marionetteScriptFinished(importedScripts.exists());
         """)
 
     def get_file_size(self):
         return self.marionette.execute_async_script("""
           let FileUtils = Components.utils.import("resource://gre/modules/FileUtils.jsm", {}).FileUtils;
-          let importedScripts = FileUtils.getFile('TmpD', ['marionetteChromeScripts']); 
+          let importedScripts = FileUtils.getFile('TmpD', ['marionetteChromeScripts']);
           marionetteScriptFinished(importedScripts.fileSize);
         """)
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_key_actions.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_key_actions.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_key_actions.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_key_actions.py	2015-02-28 15:03:02.000000000 +0000
@@ -5,8 +5,8 @@
 from marionette_test import (MarionetteTestCase,
                              skip_if_b2g,
                              skip_if_e10s)
-from keys import Keys
-from marionette import Actions
+from marionette_driver.keys import Keys
+from marionette_driver.marionette import Actions
 
 class TestKeyActions(MarionetteTestCase):
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_marionette.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_marionette.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_marionette.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_marionette.py	2015-02-28 15:03:02.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/.
 
-import errors
+from marionette_driver import errors
 import marionette_test
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_modal_dialogs.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_modal_dialogs.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_modal_dialogs.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_modal_dialogs.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,9 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase, skip_if_e10s
-from errors import NoAlertPresentException, ElementNotVisibleException
-from marionette import Alert
-from wait import Wait
+from marionette_driver.errors import NoAlertPresentException, ElementNotVisibleException
+from marionette_driver.marionette import Alert
+from marionette_driver.wait import Wait
 
 class TestTabModals(MarionetteTestCase):
 
@@ -152,7 +152,7 @@
         alert = self.marionette.switch_to_alert()
         self.assertTrue(alert.text.startswith("This page is asking you to confirm"))
         alert.accept()
-        self.assertEqual(self.marionette.get_url(), "about:blank")
+        self.wait_for_condition(lambda mn: mn.get_url() == "about:blank")
 
     @skip_if_e10s
     def test_unrelated_command_when_alert_present(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_navigation.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase, skip_if_b2g, skip_if_e10s
-from errors import MarionetteException, TimeoutException
+from marionette_driver.errors import MarionetteException, TimeoutException
 
 class TestNavigate(MarionetteTestCase):
     def test_navigate(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_profile_management.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_profile_management.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_profile_management.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_profile_management.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
-from errors import JavascriptException
+from marionette_driver.errors import JavascriptException
 from marionette_test import MarionetteTestCase
 
 class TestLog(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_screen_orientation.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_screen_orientation.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_screen_orientation.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_screen_orientation.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,7 +4,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/.
 
-from errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 from marionette_test import MarionetteTestCase
 from mozrunner.devices.emulator_screen import EmulatorScreen
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_set_window_size.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_set_window_size.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_set_window_size.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_set_window_size.py	2015-02-28 15:03:02.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/.
 
-from errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 from marionette_test import MarionetteTestCase
 
 class TestSetWindowSize(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_simpletest_sanity.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_simpletest_sanity.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_simpletest_sanity.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_simpletest_sanity.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,9 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette_driver.errors import (JavascriptException,
+                                      MarionetteException,
+                                      ScriptTimeoutException)
 
 class SimpletestSanityTest(MarionetteTestCase):
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger_desktop.py	2015-02-28 15:03:02.000000000 +0000
@@ -1,6 +1,6 @@
 from marionette_test import MarionetteTestCase
-from marionette import Actions
-from errors import MarionetteException
+from marionette_driver.marionette import Actions
+from marionette_driver.errors import MarionetteException
 #add this directory to the path
 import os
 import sys
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_single_finger.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from marionette import Actions
-from errors import MarionetteException
+from marionette_driver.marionette import Actions
+from marionette_driver.errors import MarionetteException
 #add this directory to the path
 import os
 import sys
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_specialpowers.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_specialpowers.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_specialpowers.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_specialpowers.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException
+from marionette_driver.errors import JavascriptException, MarionetteException
 
 class TestSpecialPowersContent(MarionetteTestCase):
 
@@ -15,7 +15,7 @@
         SpecialPowers.setCharPref("%(pref)s", "%(value)s");
         return SpecialPowers.getCharPref("%(pref)s")
         """ % {'pref': self.testpref, 'value': self.testvalue}, special_powers=True);
-        self.assertEqual(result, self.testvalue) 
+        self.assertEqual(result, self.testvalue)
 
     def test_prefs_after_navigate(self):
         test_html = self.marionette.absolute_url("test.html")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_submit.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_submit.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_submit.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_submit.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,11 +4,10 @@
 
 import time
 
-from by import By
-from errors import NoSuchElementException
+from marionette_driver.by import By
+from marionette_driver.errors import NoSuchElementException
+from marionette_driver.wait import Wait
 from marionette_test import MarionetteTestCase
-from wait import Wait
-
 
 class TestSubmit(MarionetteTestCase):
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException
-from by import By
+from marionette_driver.errors import JavascriptException
+from marionette_driver.by import By
 
 class TestSwitchFrameChrome(MarionetteTestCase):
     def setUp(self):
@@ -48,9 +48,3 @@
             self.marionette.execute_async_script("foo();")
         except JavascriptException as e:
             self.assertIn("foo", e.msg)
-
-    def test_we_can_switch_to_a_browser_frame(self):
-        self.assertIn("test.xul", self.marionette.get_url(), "Initial navigation has failed")
-        browser = self.marionette.find_element(By.ID, 'aBrowser')
-        self.marionette.switch_to_frame(browser)
-        self.assertIn("test2.xul", self.marionette.get_url(), "Switching by element failed")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_frame.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException
-from errors import NoSuchFrameException
+from marionette_driver.errors import (JavascriptException,
+                                      NoSuchFrameException)
 
 
 class TestSwitchFrame(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py	2015-02-28 15:03:02.000000000 +0000
@@ -20,12 +20,8 @@
             }
             catch(e) {}
             """)
-        self.marionette.execute_script("""
-            SpecialPowers.setBoolPref('dom.ipc.browser_frames.oop_by_default', true);
-            """)
-        self.marionette.execute_script("""
-            SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', true);
-            """)
+        self.marionette.execute_async_script(
+            'SpecialPowers.pushPrefEnv({"set": [["dom.ipc.browser_frames.oop_by_default", true], ["dom.mozBrowserFramesEnabled", true]]}, marionetteScriptFinished);')
 
         with self.marionette.using_context('chrome'):
             self.multi_process_browser = self.marionette.execute_script("""
@@ -37,7 +33,8 @@
 
     def test_remote_frame(self):
         self.marionette.navigate(self.marionette.absolute_url("test.html"))
-        self.marionette.execute_script("SpecialPowers.addPermission('browser', true, document)")
+        self.marionette.execute_async_script(
+            "SpecialPowers.pushPermissions([{'type': 'browser', 'allow': true, 'context': document}], marionetteScriptFinished);")
         self.marionette.execute_script("""
             let iframe = document.createElement("iframe");
             SpecialPowers.wrap(iframe).mozbrowser = true;
@@ -58,7 +55,8 @@
     def test_remote_frame_revisit(self):
         # test if we can revisit a remote frame (this takes a different codepath)
         self.marionette.navigate(self.marionette.absolute_url("test.html"))
-        self.marionette.execute_script("SpecialPowers.addPermission('browser', true, document)")
+        self.marionette.execute_async_script(
+            "SpecialPowers.pushPermissions([{'type': 'browser', 'allow': true, 'context': document}], marionetteScriptFinished);")
         self.marionette.execute_script("""
             let iframe = document.createElement("iframe");
             SpecialPowers.wrap(iframe).mozbrowser = true;
@@ -91,7 +89,8 @@
     def test_we_can_switch_to_a_remote_frame_by_index(self):
         # test if we can revisit a remote frame (this takes a different codepath)
         self.marionette.navigate(self.marionette.absolute_url("test.html"))
-        self.marionette.execute_script("SpecialPowers.addPermission('browser', true, document)")
+        self.marionette.execute_async_script(
+            "SpecialPowers.pushPermissions([{'type': 'browser', 'allow': true, 'context': document}], marionetteScriptFinished);")
         self.marionette.execute_script("""
             let iframe = document.createElement("iframe");
             SpecialPowers.wrap(iframe).mozbrowser = true;
@@ -125,14 +124,14 @@
                 SpecialPowers.clearUserPref('dom.ipc.browser_frames.oop_by_default');
                 """)
         else:
-            self.marionette.execute_script("""
-                SpecialPowers.setBoolPref('dom.ipc.browser_frames.oop_by_default', %s);
-                """ % 'true' if self.oop_by_default else 'false')
+             self.marionette.execute_async_script(
+            'SpecialPowers.pushPrefEnv({"set": [["dom.ipc.browser_frames.oop_by_default", %s]]}, marionetteScriptFinished);' %
+            ('true' if self.oop_by_default else 'false'))
         if self.mozBrowserFramesEnabled is None:
             self.marionette.execute_script("""
                 SpecialPowers.clearUserPref('dom.mozBrowserFramesEnabled');
                 """)
         else:
-            self.marionette.execute_script("""
-                SpecialPowers.setBoolPref('dom.mozBrowserFramesEnabled', %s);
-                """ % 'true' if self.mozBrowserFramesEnabled else 'false')
+            self.marionette.execute_async_script(
+            'SpecialPowers.pushPrefEnv({"set": [["dom.mozBrowserFramesEnabled", %s]]}, marionetteScriptFinished);' %
+            ('true' if self.mozBrowserFramesEnabled else 'false'))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_text.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_text.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_text.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_text.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from keys import Keys
+from marionette_driver.keys import Keys
 
 
 class TestText(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_timeouts.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_timeouts.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_timeouts.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_timeouts.py	2015-02-28 15:03:02.000000000 +0000
@@ -4,8 +4,11 @@
 
 import os
 from marionette_test import MarionetteTestCase
-from marionette import HTMLElement
-from errors import NoSuchElementException, JavascriptException, MarionetteException, ScriptTimeoutException
+from marionette_driver.marionette import HTMLElement
+from marionette_driver.errors import (NoSuchElementException,
+                                      JavascriptException,
+                                      MarionetteException,
+                                      ScriptTimeoutException)
 
 class TestTimeouts(MarionetteTestCase):
     def test_pagetimeout_notdefinetimeout_pass(self):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_typing.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_typing.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_typing.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_typing.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase, skip_if_b2g
-from keys import Keys
-from errors import ElementNotVisibleException
+from marionette_driver.keys import Keys
+from marionette_driver.errors import ElementNotVisibleException
 
 
 class TestTyping(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_wait.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_wait.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_wait.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_wait.py	2015-02-28 15:03:02.000000000 +0000
@@ -5,11 +5,12 @@
 import sys
 import time
 
-import errors
-import wait
+from marionette_driver import errors
+from marionette_driver import wait
+from marionette_driver.wait import Wait
 
 from marionette_test import MarionetteTestCase
-from wait import Wait
+
 
 class TickingClock(object):
     def __init__(self, incr=1):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_window_handles.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_window_handles.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_window_handles.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_window_handles.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase, skip_if_e10s
-from marionette import Keys
+from marionette_driver.keys import Keys
 
 
 class TestWindowHandles(MarionetteTestCase):
@@ -92,6 +92,8 @@
         self.assertEqual(len(self.marionette.window_handles), 1)
         self.marionette.switch_to_window(start_tab)
 
+    # This sequence triggers an exception in Marionette:register with e10s on (bug 1120809).
+    @skip_if_e10s
     def test_tab_and_window_handles(self):
         start_tab = self.marionette.current_window_handle
         start_chrome_window = self.marionette.current_chrome_window_handle
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_window_position.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_window_position.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_window_position.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_window_position.py	2015-02-28 15:03:02.000000000 +0000
@@ -13,7 +13,7 @@
 #limitations under the License.
 
 from marionette_test import MarionetteTestCase
-from errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 class TestWindowPosition(MarionetteTestCase):
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_window_switching.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_window_switching.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_window_switching.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_window_switching.py	2015-02-28 15:03:02.000000000 +0000
@@ -2,10 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from by import By
-from errors import NoSuchElementException
 from marionette_test import MarionetteTestCase
-from wait import Wait
+
+from marionette_driver.by import By
+from marionette_driver.errors import NoSuchElementException
+from marionette_driver.wait import Wait
 
 
 class TestWindowSwitching(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_with_using_context.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_with_using_context.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/tests/unit/test_with_using_context.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/tests/unit/test_with_using_context.py	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 
 class TestSetContext(MarionetteTestCase):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/wait.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/wait.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/wait.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/wait.py	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/.
-
-import collections
-import errors
-import sys
-import time
-
-DEFAULT_TIMEOUT = 5
-DEFAULT_INTERVAL = 0.1
-
-class Wait(object):
-    """An explicit conditional utility class for waiting until a condition
-    evaluates to true or not null.
-
-    This will repeatedly evaluate a condition in anticipation for a
-    truthy return value, or its timeout to expire, or its waiting
-    predicate to become true.
-
-    A `Wait` instance defines the maximum amount of time to wait for a
-    condition, as well as the frequency with which to check the
-    condition.  Furthermore, the user may configure the wait to ignore
-    specific types of exceptions whilst waiting, such as
-    `errors.NoSuchElementException` when searching for an element on
-    the page.
-
-    """
-
-    def __init__(self, marionette, timeout=None,
-                 interval=DEFAULT_INTERVAL, ignored_exceptions=None,
-                 clock=None):
-        """Configure the Wait instance to have a custom timeout, interval, and
-        list of ignored exceptions.  Optionally a different time
-        implementation than the one provided by the standard library
-        (time) can also be provided.
-
-        Sample usage::
-
-            # Wait 30 seconds for window to open, checking for its presence once
-            # every 5 seconds.
-            wait = Wait(marionette, timeout=30, interval=5,
-                        ignored_exceptions=errors.NoSuchWindowException)
-            window = wait.until(lambda m: m.switch_to_window(42))
-
-        :param marionette: The input value to be provided to
-            conditions, usually a Marionette instance.
-
-        :param timeout: How long to wait for the evaluated condition
-            to become true.  The default timeout is the `timeout`
-            property on the `Marionette` object if set, or
-            `wait.DEFAULT_TIMEOUT`.
-
-        :param interval: How often the condition should be evaluated.
-            In reality the interval may be greater as the cost of
-            evaluating the condition function is not factored in.  The
-            default polling interval is `wait.DEFAULT_INTERVAL`.
-
-        :param ignored_exceptions: Ignore specific types of exceptions
-            whilst waiting for the condition.  Any exceptions not
-            whitelisted will be allowed to propagate, terminating the
-            wait.
-
-        :param clock: Allows overriding the use of the runtime's
-            default time library.  See `wait.SystemClock` for
-            implementation details.
-
-        """
-
-        self.marionette = marionette
-        self.timeout = timeout or (self.marionette.timeout and
-                                   self.marionette.timeout / 1000.0) or DEFAULT_TIMEOUT
-        self.clock = clock or SystemClock()
-        self.end = self.clock.now + self.timeout
-        self.interval = interval
-
-        exceptions = []
-        if ignored_exceptions is not None:
-            if isinstance(ignored_exceptions, collections.Iterable):
-                exceptions.extend(iter(ignored_exceptions))
-            else:
-                exceptions.append(ignored_exceptions)
-        self.exceptions = tuple(set(exceptions))
-
-    def until(self, condition, is_true=None, message=""):
-        """Repeatedly runs condition until its return value evaluates to true,
-        or its timeout expires or the predicate evaluates to true.
-
-        This will poll at the given interval until the given timeout
-        is reached, or the predicate or conditions returns true.  A
-        condition that returns null or does not evaluate to true will
-        fully elapse its timeout before raising an
-        `errors.TimeoutException`.
-
-        If an exception is raised in the condition function and it's
-        not ignored, this function will raise immediately.  If the
-        exception is ignored, it will continue polling for the
-        condition until it returns successfully or a
-        `TimeoutException` is raised.
-
-        :param condition: A callable function whose return value will
-            be returned by this function if it evaluates to true.
-
-        :param is_true: An optional predicate that will terminate and
-            return when it evaluates to False.  It should be a
-            function that will be passed clock and an end time.  The
-            default predicate will terminate a wait when the clock
-            elapses the timeout.
-
-        :param message: An optional message to include in the
-            exception's message if this function times out.
-
-        """
-
-        rv = None
-        last_exc = None
-        until = is_true or until_pred
-        start = self.clock.now
-
-        while not until(self.clock, self.end):
-            try:
-                rv = condition(self.marionette)
-            except (KeyboardInterrupt, SystemExit) as e:
-                raise e
-            except self.exceptions as e:
-                last_exc = sys.exc_info()
-
-            if not rv:
-                self.clock.sleep(self.interval)
-                continue
-
-            if rv is not None:
-                return rv
-
-            self.clock.sleep(self.interval)
-
-        if message:
-            message = " with message: %s" % message
-
-        raise errors.TimeoutException(
-            "Timed out after %s seconds%s" %
-            (round((self.clock.now - start), 1), message if message else ""),
-            cause=last_exc)
-
-def until_pred(clock, end):
-    return clock.now >= end
-
-class SystemClock(object):
-    def __init__(self):
-        self._time = time
-
-    def sleep(self, duration):
-        self._time.sleep(duration)
-
-    @property
-    def now(self):
-        return self._time.time()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/www/test_selectioncarets.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/www/test_selectioncarets.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/www/test_selectioncarets.html	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/www/test_selectioncarets.html	2015-02-28 15:03:02.000000000 +0000
@@ -24,7 +24,5 @@
     <div style="width: 10em; height: 4em; word-wrap: break-word; overflow: auto; -moz-user-select:text" contenteditable="true" id="contenteditable">ABC DEF GHI</div>
     <br />
     <div style="width: 10em; height: 4em; word-wrap: break-word; overflow: auto; -moz-user-select:text" id="content">ABC DEF GHI</div>
-    <br />
-    <div style="width: 10em; height: 8em; overflow: auto; -moz-user-select:text" id="contenteditable2" contenteditable="true">First Line<br></br>Second Line<br></br>Third Line</div>
   </body>
 </html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/www/test_selectioncarets_multipleline.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/www/test_selectioncarets_multipleline.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/marionette/www/test_selectioncarets_multipleline.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/marionette/www/test_selectioncarets_multipleline.html	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,24 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.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>
+<html id="html">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Bug 1019441: Marionette tests for selection carets (multiple lines)</title>
+  </head>
+  <body>
+  <style>
+    *
+    {
+      -moz-user-select:none;
+    }
+  </style>
+    <div><textarea id="textarea2" style="width: 10em; height: 6em; overflow: auto;">First Line&#13;&#10;&#13;&#10;Second Line&#13;&#10;&#13;&#10;Third Line</textarea></div>
+    <br />
+    <div style="width: 10em; height: 6em; overflow: auto; -moz-user-select:text" id="contenteditable2" contenteditable="true">First Line<br></br>Second Line<br></br>Third Line</div>
+    <br />
+    <div style="width: 10em; height: 6em; overflow: auto; -moz-user-select:text" id="content2">First Line<br></br>Second Line<br></br>Third Line</div>
+  </body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/requirements.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/requirements.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/requirements.txt	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/requirements.txt	2015-02-28 15:03:02.000000000 +0000
@@ -1,4 +1,5 @@
 marionette-transport == 0.4
+marionette-driver == 0.2
 manifestparser
 mozhttpd >= 0.5
 mozinfo >= 0.7
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/setup.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/setup.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/client/setup.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/client/setup.py	2015-02-28 15:03:02.000000000 +0000
@@ -1,8 +1,6 @@
-import os
 from setuptools import setup, find_packages
-import sys
 
-version = '0.8.7'
+version = '0.9'
 
 # dependencies
 with open('requirements.txt') as f:
@@ -12,7 +10,7 @@
       version=version,
       description="Marionette test automation client",
       long_description='See http://marionette-client.readthedocs.org/',
-      classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='mozilla',
       author='Jonathan Griffin',
       author_email='jgriffin@mozilla.com',
@@ -29,4 +27,3 @@
       """,
       install_requires=deps,
       )
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/MANIFEST.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/MANIFEST.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/MANIFEST.in	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/MANIFEST.in	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,2 @@
+exclude MANIFEST.in
+include requirements.txt
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/application_cache.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/application_cache.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/application_cache.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/application_cache.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,31 @@
+"""
+Copyright 2011 Software Freedom Conservancy.
+
+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.
+"""
+
+class ApplicationCache(object):
+
+    UNCACHED = 0
+    IDLE = 1
+    CHECKING = 2
+    DOWNLOADING = 3
+    UPDATE_READY = 4
+    OBSOLETE = 5
+
+    def __init__(self, driver):
+        self.driver = driver
+
+    @property
+    def status(self):
+        return self.driver._send_message('getAppCacheStatus', 'value')
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/by.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/by.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/by.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/by.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,26 @@
+# Copyright 2008-2009 WebDriver committers
+# Copyright 2008-2009 Google Inc.
+#
+# 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.
+
+
+class By(object):
+    ID = "id"
+    XPATH = "xpath"
+    LINK_TEXT = "link text"
+    PARTIAL_LINK_TEXT = "partial link text"
+    NAME = "name"
+    TAG_NAME = "tag name"
+    CLASS_NAME = "class name"
+    CSS_SELECTOR = "css selector"
+    ANON_ATTRIBUTE = "anon attribute"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/date_time_value.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/date_time_value.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/date_time_value.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/date_time_value.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,49 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+class DateTimeValue(object):
+    """
+    Interface for setting the value of HTML5 "date" and "time" input elements.
+
+    Simple usage example:
+
+    ::
+
+        element = marionette.find_element("id", "date-test")
+        dt_value = DateTimeValue(element)
+        dt_value.date = datetime(1998, 6, 2)
+
+    """
+
+    def __init__(self, element):
+        self.element = element
+
+    @property
+    def date(self):
+        """
+        Retrieve the element's string value
+        """
+        return self.element.get_attribute('value')
+
+    # As per the W3C "date" element specification
+    # (http://dev.w3.org/html5/markup/input.date.html), this value is formatted
+    # according to RFC 3339: http://tools.ietf.org/html/rfc3339#section-5.6
+    @date.setter
+    def date(self, date_value):
+        self.element.send_keys(date_value.strftime('%Y-%m-%d'))
+
+    @property
+    def time(self):
+        """
+        Retrieve the element's string value
+        """
+        return self.element.get_attribute('value')
+
+    # As per the W3C "time" element specification
+    # (http://dev.w3.org/html5/markup/input.time.html), this value is formatted
+    # according to RFC 3339: http://tools.ietf.org/html/rfc3339#section-5.6
+    @time.setter
+    def time(self, time_value):
+        self.element.send_keys(time_value.strftime('%H:%M:%S'))
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/decorators.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/decorators.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/decorators.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/decorators.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,67 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from errors import MarionetteException
+from functools import wraps
+import socket
+import sys
+import traceback
+
+def _find_marionette_in_args(*args, **kwargs):
+    try:
+        m = [a for a in args + tuple(kwargs.values()) if hasattr(a, 'session')][0]
+    except IndexError:
+        print("Can only apply decorator to function using a marionette object")
+        raise
+    return m
+
+def do_crash_check(func, always=False):
+    """Decorator which checks for crashes after the function has run.
+
+    :param always: If False, only checks for crashes if an exception
+                   was raised. If True, always checks for crashes.
+    """
+    @wraps(func)
+    def _(*args, **kwargs):
+        def check():
+            m = _find_marionette_in_args(*args, **kwargs)
+            try:
+                m.check_for_crash()
+            except:
+                # don't want to lose the original exception
+                traceback.print_exc()
+
+        try:
+            return func(*args, **kwargs)
+        except (MarionetteException, socket.error, IOError) as e:
+            exc, val, tb = sys.exc_info()
+            if not isinstance(e, MarionetteException) or type(e) is MarionetteException:
+                if not always:
+                    check()
+            raise exc, val, tb
+        finally:
+            if always:
+                check()
+    return _
+
+def uses_marionette(func):
+    """Decorator which creates a marionette session and deletes it
+    afterwards if one doesn't already exist.
+    """
+    @wraps(func)
+    def _(*args, **kwargs):
+        m = _find_marionette_in_args(*args, **kwargs)
+        delete_session = False
+        if not m.session:
+            delete_session = True
+            m.start_session()
+
+        m.set_context(m.CONTEXT_CHROME)
+        ret = func(*args, **kwargs)
+
+        if delete_session:
+            m.delete_session()
+
+        return ret
+    return _
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/errors.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/errors.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/errors.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/errors.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,152 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import traceback
+
+class ErrorCodes(object):
+    SUCCESS = 0
+    NO_SUCH_ELEMENT = 7
+    NO_SUCH_FRAME = 8
+    UNKNOWN_COMMAND = 9
+    STALE_ELEMENT_REFERENCE = 10
+    ELEMENT_NOT_VISIBLE = 11
+    INVALID_ELEMENT_STATE = 12
+    UNKNOWN_ERROR = 13
+    ELEMENT_NOT_ACCESSIBLE = 56
+    ELEMENT_IS_NOT_SELECTABLE = 15
+    JAVASCRIPT_ERROR = 17
+    XPATH_LOOKUP_ERROR = 19
+    TIMEOUT = 21
+    NO_SUCH_WINDOW = 23
+    INVALID_COOKIE_DOMAIN = 24
+    UNABLE_TO_SET_COOKIE = 25
+    UNEXPECTED_ALERT_OPEN = 26
+    NO_ALERT_OPEN = 27
+    SCRIPT_TIMEOUT = 28
+    INVALID_ELEMENT_COORDINATES = 29
+    INVALID_SELECTOR = 32
+    MOVE_TARGET_OUT_OF_BOUNDS = 34
+    INVALID_XPATH_SELECTOR = 51
+    INVALID_XPATH_SELECTOR_RETURN_TYPER = 52
+    INVALID_RESPONSE = 53
+    FRAME_SEND_NOT_INITIALIZED_ERROR = 54
+    FRAME_SEND_FAILURE_ERROR = 55
+    SESSION_NOT_CREATED = 71
+    UNSUPPORTED_OPERATION = 405
+    MARIONETTE_ERROR = 500
+
+class MarionetteException(Exception):
+    """Raised when a generic non-recoverable exception has occured."""
+
+    def __init__(self, message=None,
+                 status=ErrorCodes.MARIONETTE_ERROR, cause=None,
+                 stacktrace=None):
+        """Construct new MarionetteException instance.
+
+        :param message: An optional exception message.
+
+        :param status: A WebDriver status code given as an integer.
+            By default the generic Marionette error code 500 will be
+            used.
+
+        :param cause: An optional tuple of three values giving
+            information about the root exception cause.  Expected
+            tuple values are (type, value, traceback).
+
+        :param stacktrace: Optional string containing a stacktrace
+            (typically from a failed JavaScript execution) that will
+            be displayed in the exception's string representation.
+
+        """
+
+        self.msg = message
+        self.status = status
+        self.cause = cause
+        self.stacktrace = stacktrace
+
+    def __str__(self):
+        msg = str(self.msg)
+        tb = None
+
+        if self.cause:
+            if type(self.cause) is tuple:
+                msg += ", caused by %r" % self.cause[0]
+                tb = self.cause[2]
+            else:
+                msg += ", caused by %s" % self.cause
+        if self.stacktrace:
+            st = "".join(["\t%s\n" % x for x in self.stacktrace.splitlines()])
+            msg += "\nstacktrace:\n%s" % st
+
+        return "".join(traceback.format_exception(self.__class__, msg, tb))
+
+class InstallGeckoError(MarionetteException):
+    pass
+
+class TimeoutException(MarionetteException):
+    pass
+
+class InvalidResponseException(MarionetteException):
+    pass
+
+class JavascriptException(MarionetteException):
+    pass
+
+class NoSuchElementException(MarionetteException):
+    pass
+
+class XPathLookupException(MarionetteException):
+    pass
+
+class NoSuchWindowException(MarionetteException):
+    pass
+
+class StaleElementException(MarionetteException):
+    pass
+
+class ScriptTimeoutException(MarionetteException):
+    pass
+
+class ElementNotVisibleException(MarionetteException):
+    def __init__(self, message="Element is not currently visible and may not be manipulated",
+                 status=ErrorCodes.ELEMENT_NOT_VISIBLE,
+                 stacktrace=None, cause=None):
+        super(ElementNotVisibleException, self).__init__(
+            message, status=status, cause=cause, stacktrace=stacktrace)
+
+class ElementNotAccessibleException(MarionetteException):
+    pass
+
+class NoSuchFrameException(MarionetteException):
+    pass
+
+class InvalidElementStateException(MarionetteException):
+    pass
+
+class NoAlertPresentException(MarionetteException):
+    pass
+
+class InvalidCookieDomainException(MarionetteException):
+    pass
+
+class UnableToSetCookieException(MarionetteException):
+    pass
+
+class InvalidSelectorException(MarionetteException):
+    pass
+
+class MoveTargetOutOfBoundsException(MarionetteException):
+    pass
+
+class FrameSendNotInitializedError(MarionetteException):
+    pass
+
+class FrameSendFailureError(MarionetteException):
+    pass
+
+class UnsupportedOperationException(MarionetteException):
+    pass
+
+class SessionNotCreatedException(MarionetteException):
+    pass
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/expected.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/expected.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/expected.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/expected.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,295 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import errors
+import types
+
+from marionette import HTMLElement
+
+"""This file provides a set of expected conditions for common use
+cases when writing Marionette tests.
+
+The conditions rely on explicit waits that retries conditions a number
+of times until they are either successfully met, or they time out.
+
+"""
+
+class element_present(object):
+    """Checks that a web element is present in the DOM of the current
+    context.  This does not necessarily mean that the element is
+    visible.
+
+    You can select which element to be checked for presence by
+    supplying a locator::
+
+        el = Wait(marionette).until(expected.element_present(By.ID, "foo"))
+
+    Or by using a function/lambda returning an element::
+
+        el = Wait(marionette).until(expected.element_present(lambda m: m.find_element(By.ID, "foo")))
+
+    :param args: locator or function returning web element
+    :returns: the web element once it is located, or False
+
+    """
+
+    def __init__(self, *args):
+        if len(args) == 1 and isinstance(args[0], types.FunctionType):
+            self.locator = args[0]
+        else:
+            self.locator = lambda m: m.find_element(*args)
+
+    def __call__(self, marionette):
+        return _find(marionette, self.locator)
+
+class element_not_present(element_present):
+    """Checks that a web element is not present in the DOM of the current
+    context.
+
+    You can select which element to be checked for lack of presence by
+    supplying a locator::
+
+        r = Wait(marionette).until(expected.element_not_present(By.ID, "foo"))
+
+    Or by using a function/lambda returning an element::
+
+        r = Wait(marionette).until(expected.element_present(lambda m: m.find_element(By.ID, "foo")))
+
+    :param args: locator or function returning web element
+    :returns: True if element is not present, or False if it is present
+
+    """
+
+    def __init__(self, *args):
+        super(element_not_present, self).__init__(*args)
+
+    def __call__(self, marionette):
+        return not super(element_not_present, self).__call__(marionette)
+
+class element_stale(object):
+    """Check that the given element is no longer attached to DOM of the
+    current context.
+
+    This can be useful for waiting until an element is no longer
+    present.
+
+    Sample usage::
+
+        el = marionette.find_element(By.ID, "foo")
+        # ...
+        Wait(marionette).until(expected.element_stale(el))
+
+    :param element: the element to wait for
+    :returns: False if the element is still attached to the DOM, True
+        otherwise
+
+    """
+
+    def __init__(self, element):
+        self.el = element
+
+    def __call__(self, marionette):
+        try:
+            # Calling any method forces a staleness check
+            self.el.is_enabled()
+            return False
+        except errors.StaleElementException:
+            return True
+
+class elements_present(object):
+    """Checks that web elements are present in the DOM of the current
+    context.  This does not necessarily mean that the elements are
+    visible.
+
+    You can select which elements to be checked for presence by
+    supplying a locator::
+
+        els = Wait(marionette).until(expected.elements_present(By.TAG_NAME, "a"))
+
+    Or by using a function/lambda returning a list of elements::
+
+        els = Wait(marionette).until(expected.elements_present(lambda m: m.find_elements(By.TAG_NAME, "a")))
+
+    :param args: locator or function returning a list of web elements
+    :returns: list of web elements once they are located, or False
+
+    """
+
+    def __init__(self, *args):
+        if len(args) == 1 and isinstance(args[0], types.FunctionType):
+            self.locator = args[0]
+        else:
+            self.locator = lambda m: m.find_elements(*args)
+
+    def __call__(self, marionette):
+        return _find(marionette, self.locator)
+
+class elements_not_present(elements_present):
+    """Checks that web elements are not present in the DOM of the
+    current context.
+
+    You can select which elements to be checked for not being present
+    by supplying a locator::
+
+        r = Wait(marionette).until(expected.elements_not_present(By.TAG_NAME, "a"))
+
+    Or by using a function/lambda returning a list of elements::
+
+        r = Wait(marionette).until(expected.elements_not_present(lambda m: m.find_elements(By.TAG_NAME, "a")))
+
+    :param args: locator or function returning a list of web elements
+    :returns: True if elements are missing, False if one or more are
+        present
+
+    """
+
+    def __init__(self, *args):
+        super(elements_not_present, self).__init__(*args)
+
+    def __call__(self, marionette):
+        return not super(elements_not_present, self).__call__(marionette)
+
+class element_displayed(object):
+    """An expectation for checking that an element is visible.
+
+    Visibility means that the element is not only displayed, but also
+    has a height and width that is greater than 0 pixels.
+
+    Stale elements, meaning elements that have been detached from the
+    DOM of the current context are treated as not being displayed,
+    meaning this expectation is not analogous to the behaviour of
+    calling `is_displayed()` on an `HTMLElement`.
+
+    You can select which element to be checked for visibility by
+    supplying a locator::
+
+        displayed = Wait(marionette).until(expected.element_displayed(By.ID, "foo"))
+
+    Or by supplying an element::
+
+        el = marionette.find_element(By.ID, "foo")
+        displayed = Wait(marionette).until(expected.element_displayed(el))
+
+    :param args: locator or web element
+    :returns: True if element is displayed, False if hidden
+
+    """
+
+    def __init__(self, *args):
+        self.el = None
+        if len(args) == 1 and isinstance(args[0], HTMLElement):
+            self.el = args[0]
+        else:
+            self.locator = lambda m: m.find_element(*args)
+
+    def __call__(self, marionette):
+        if self.el is None:
+            self.el = _find(marionette, self.locator)
+        if not self.el:
+            return False
+        try:
+            return self.el.is_displayed()
+        except errors.StaleElementException:
+            return False
+
+class element_not_displayed(element_displayed):
+    """An expectation for checking that an element is not visible.
+
+    Visibility means that the element is not only displayed, but also
+    has a height and width that is greater than 0 pixels.
+
+    Stale elements, meaning elements that have been detached fom the
+    DOM of the current context are treated as not being displayed,
+    meaning this expectation is not analogous to the behaviour of
+    calling `is_displayed()` on an `HTMLElement`.
+
+    You can select which element to be checked for visibility by
+    supplying a locator::
+
+        hidden = Wait(marionette).until(expected.element_not_displayed(By.ID, "foo"))
+
+    Or by supplying an element::
+
+        el = marionette.find_element(By.ID, "foo")
+        hidden = Wait(marionette).until(expected.element_not_displayed(el))
+
+    :param args: locator or web element
+    :returns: True if element is hidden, False if displayed
+
+    """
+
+    def __init__(self, *args):
+        super(element_not_displayed, self).__init__(*args)
+
+    def __call__(self, marionette):
+        return not super(element_not_displayed, self).__call__(marionette)
+
+class element_selected(object):
+    """An expectation for checking that the given element is selected.
+
+    :param element: the element to be selected
+    :returns: True if element is selected, False otherwise
+
+    """
+
+    def __init__(self, element):
+        self.el = element
+
+    def __call__(self, marionette):
+        return self.el.is_selected()
+
+class element_not_selected(element_selected):
+    """An expectation for checking that the given element is not
+    selected.
+
+    :param element: the element to not be selected
+    :returns: True if element is not selected, False if selected
+
+    """
+
+    def __init__(self, element):
+        super(element_not_selected, self).__init__(element)
+
+    def __call__(self, marionette):
+        return not super(element_not_selected, self).__call__(marionette)
+
+class element_enabled(object):
+    """An expectation for checking that the given element is enabled.
+
+    :param element: the element to check if enabled
+    :returns: True if element is enabled, False otherwise
+
+    """
+
+    def __init__(self, element):
+        self.el = element
+
+    def __call__(self, marionette):
+        return self.el.is_enabled()
+
+class element_not_enabled(element_enabled):
+    """An expectation for checking that the given element is disabled.
+
+    :param element: the element to check if disabled
+    :returns: True if element is disabled, False if enabled
+
+    """
+
+    def __init__(self, element):
+        super(element_not_enabled, self).__init__(element)
+
+    def __call__(self, marionette):
+        return not super(element_not_enabled, self).__call__(marionette)
+
+def _find(marionette, func):
+    el = None
+
+    try:
+        el = func(marionette)
+    except errors.NoSuchElementException:
+        pass
+
+    if el is None:
+        return False
+    return el
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/geckoinstance.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/geckoinstance.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/geckoinstance.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/geckoinstance.py	2015-02-28 15:03:02.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/
+
+from copy import deepcopy
+import errno
+import platform
+import os
+import sys
+import time
+
+from mozprofile import Profile
+from mozrunner import Runner
+
+
+class GeckoInstance(object):
+
+    required_prefs = {"marionette.defaultPrefs.enabled": True,
+                      "marionette.logging": True,
+                      "browser.displayedE10SPrompt": 5,
+                      "browser.displayedE10SPrompt.1": 5,
+                      "browser.displayedE10SPrompt.2": 5,
+                      "browser.displayedE10SPrompt.3": 5,
+                      "browser.displayedE10SPrompt.4": 5,
+                      "browser.sessionstore.resume_from_crash": False,
+                      "browser.shell.checkDefaultBrowser": False,
+                      "browser.startup.page": 0,
+                      "browser.tabs.remote.autostart.1": False,
+                      "browser.tabs.remote.autostart.2": False,
+                      "browser.warnOnQuit": False,
+                      "dom.ipc.reportProcessHangs": False,
+                      "focusmanager.testmode": True,
+                      "startup.homepage_welcome_url": "about:blank"}
+
+    def __init__(self, host, port, bin, profile=None, app_args=None, symbols_path=None,
+                  gecko_log=None, prefs=None):
+        self.marionette_host = host
+        self.marionette_port = port
+        self.bin = bin
+        # Check if it is a Profile object or a path to profile
+        self.profile = None
+        if isinstance(profile, Profile):
+            self.profile = profile
+        else:
+            self.profile_path = profile
+        self.prefs = prefs
+        self.required_prefs = deepcopy(GeckoInstance.required_prefs)
+        if prefs:
+            self.required_prefs.update(prefs)
+        self.app_args = app_args or []
+        self.runner = None
+        self.symbols_path = symbols_path
+        self.gecko_log = gecko_log
+
+    def start(self):
+        profile_args = {"preferences": deepcopy(self.required_prefs)}
+        profile_args["preferences"]["marionette.defaultPrefs.port"] = self.marionette_port
+        if self.prefs:
+            profile_args["preferences"].update(self.prefs)
+        if '-jsdebugger' in self.app_args:
+            profile_args["preferences"].update({
+                "devtools.browsertoolbox.panel": "jsdebugger",
+                "devtools.debugger.remote-enabled": True,
+                "devtools.debugger.chrome-enabled": True,
+                "devtools.chrome.enabled": True,
+                "devtools.debugger.prompt-connection": False,
+                "marionette.debugging.clicktostart": True,
+            })
+
+        if hasattr(self, "profile_path") and self.profile is None:
+            if not self.profile_path:
+                profile_args["restore"] = False
+                self.profile = Profile(**profile_args)
+            else:
+                profile_args["path_from"] = self.profile_path
+                self.profile = Profile.clone(**profile_args)
+
+        process_args = {
+            'processOutputLine': [NullOutput()],
+        }
+
+        if self.gecko_log == '-':
+            process_args['stream'] = sys.stdout
+        else:
+            if self.gecko_log is None:
+                self.gecko_log = 'gecko.log'
+            elif os.path.isdir(self.gecko_log):
+                fname = "gecko-%d.log" % time.time()
+                self.gecko_log = os.path.join(self.gecko_log, fname)
+
+            self.gecko_log = os.path.realpath(self.gecko_log)
+            if os.access(self.gecko_log, os.F_OK):
+                if platform.system() is 'Windows':
+                    # NOTE: windows has a weird filesystem where it happily 'closes'
+                    # the file, but complains if you try to delete it. You get a
+                    # 'file still in use' error. Sometimes you can wait a bit and
+                    # a retry will succeed.
+                    # If all retries fail, we'll just continue without removing
+                    # the file. In this case, if we are restarting the instance,
+                    # then the new logs just get appended to the old file.
+                    tries = 0
+                    while tries < 10:
+                        try:
+                            os.remove(self.gecko_log)
+                            break
+                        except WindowsError as e:
+                            if e.errno == errno.EACCES:
+                                tries += 1
+                                time.sleep(0.5)
+                            else:
+                                raise e
+                else:
+                    os.remove(self.gecko_log)
+
+            process_args['logfile'] = self.gecko_log
+
+        env = os.environ.copy()
+
+        # environment variables needed for crashreporting
+        # https://developer.mozilla.org/docs/Environment_variables_affecting_crash_reporting
+        env.update({ 'MOZ_CRASHREPORTER': '1',
+                     'MOZ_CRASHREPORTER_NO_REPORT': '1', })
+        self.runner = Runner(
+            binary=self.bin,
+            profile=self.profile,
+            cmdargs=['-no-remote', '-marionette'] + self.app_args,
+            env=env,
+            symbols_path=self.symbols_path,
+            process_args=process_args)
+        self.runner.start()
+
+    def close(self, restart=False):
+        if not restart:
+            self.profile = None
+
+        if self.runner:
+            self.runner.stop()
+            self.runner.cleanup()
+
+    def restart(self, prefs=None, clean=True):
+        if clean:
+            self.profile.cleanup()
+            self.profile = None
+
+        self.close(restart=True)
+        if prefs:
+            self.prefs = prefs
+        else:
+            self.prefs = None
+        self.start()
+
+class B2GDesktopInstance(GeckoInstance):
+    def __init__(self, host, port, bin, **kwargs):
+        # Pass a profile and change the binary to -bin so that
+        # the built-in gaia profile doesn't get touched.
+        if kwargs.get('profile', None) is None:
+            # GeckoInstance.start will clone the profile.
+            kwargs['profile'] = os.path.join(os.path.dirname(bin),
+                                             'gaia',
+                                             'profile')
+        if '-bin' not in os.path.basename(bin):
+            if bin.endswith('.exe'):
+                newbin = bin[:-len('.exe')] + '-bin.exe'
+            else:
+                newbin = bin + '-bin'
+            if os.path.exists(newbin):
+                bin = newbin
+        super(B2GDesktopInstance, self).__init__(host, port, bin, **kwargs)
+        if not self.prefs:
+            self.prefs = {}
+        self.prefs["focusmanager.testmode"] = True
+        self.app_args += ['-chrome', 'chrome://b2g/content/shell.html']
+
+class NullOutput(object):
+    def __call__(self, line):
+        pass
+
+
+apps = {'b2g': B2GDesktopInstance,
+        'b2gdesktop': B2GDesktopInstance}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/gestures.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/gestures.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/gestures.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/gestures.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,83 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from marionette import MultiActions, Actions
+
+#axis is y or x
+#direction is 0 for positive, and -1 for negative
+#length is the total length we want to scroll
+#increments is how much we want to move per scrolling
+#wait_period is the seconds we wait between scrolling
+#scroll_back is whether we want to scroll back to original view
+def smooth_scroll(marionette_session, start_element, axis, direction, length, increments=None, wait_period=None, scroll_back=None):
+    if axis not in ["x", "y"]:
+        raise Exception("Axis must be either 'x' or 'y'")
+    if direction not in [-1, 0]:
+        raise Exception("Direction must either be -1 negative or 0 positive")
+    increments = increments or 100
+    wait_period = wait_period or 0.05
+    scroll_back = scroll_back or False
+    current = 0
+    if axis is "x":
+        if direction is -1:
+            offset = [-increments, 0]
+        else:
+            offset = [increments, 0]
+    else:
+        if direction is -1:
+            offset = [0, -increments]
+        else:
+            offset = [0, increments]
+    action = Actions(marionette_session)
+    action.press(start_element)
+    while (current < length):
+        current += increments
+        action.move_by_offset(*offset).wait(wait_period)
+    if scroll_back:
+        offset = [-value for value in offset]
+        while (current > 0):
+            current -= increments
+            action.move_by_offset(*offset).wait(wait_period)
+    action.release()
+    action.perform()
+
+#element is the target
+#x1,x2 are 1st finger starting position relative to the target
+#x3,y3 are 1st finger ending position relative to the target
+#x2,y2 are 2nd finger starting position relative to the target
+#x4,y4 are 2nd finger ending position relative to the target
+#duration is the amount of time in milliseconds we want to complete the pinch.
+def pinch(marionette_session, element, x1, y1, x2, y2, x3, y3, x4, y4, duration=200):
+    time = 0
+    time_increment = 10
+    if time_increment >= duration:
+        time_increment = duration
+    move_x1 = time_increment*1.0/duration * (x3 - x1)
+    move_y1 = time_increment*1.0/duration * (y3 - y1)
+    move_x2 = time_increment*1.0/duration * (x4 - x2)
+    move_y2 = time_increment*1.0/duration * (y4 - y2)
+    multiAction = MultiActions(marionette_session)
+    action1 = Actions(marionette_session)
+    action2 = Actions(marionette_session)
+    action1.press(element, x1, y1)
+    action2.press(element, x2, y2)
+    while (time < duration):
+        time += time_increment
+        action1.move_by_offset(move_x1, move_y1).wait(time_increment/1000)
+        action2.move_by_offset(move_x2, move_y2).wait(time_increment/1000)
+    action1.release()
+    action2.release()
+    multiAction.add(action1).add(action2).perform()
+
+#element: The element to press.
+#time_in_seconds: Time in seconds to wait before releasing the press.
+#x: Optional, x-coordinate to tap, relative to the top-left corner of the element.
+#y: Optional, y-coordinate to tap, relative to the top-leftcorner of the element.
+def long_press_without_contextmenu(marionette_session, element, time_in_seconds, x=None, y=None):
+    action = Actions(marionette_session)
+    action.press(element, x, y)
+    action.move_by_offset(0, 0)
+    action.wait(time_in_seconds)
+    action.release()
+    action.perform()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/__init__.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/__init__.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/__init__.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/__init__.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,8 @@
+from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
+                                gestures, keys, marionette, selection, wait,
+                                application_cache, date_time_value )
+from marionette_driver.by import By
+from marionette_driver.date_time_value import DateTimeValue
+from marionette_driver.gestures import smooth_scroll, pinch
+from marionette_driver.wait import Wait
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/keys.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/keys.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/keys.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/keys.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,84 @@
+# copyright 2008-2009 WebDriver committers
+# Copyright 2008-2009 Google Inc.
+#
+# Licensed under the Apache License Version 2.0 = uthe "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.
+
+
+class Keys(object):
+
+    NULL         = u'\ue000'
+    CANCEL       = u'\ue001' #  ^break
+    HELP         = u'\ue002'
+    BACK_SPACE   = u'\ue003'
+    TAB          = u'\ue004'
+    CLEAR        = u'\ue005'
+    RETURN       = u'\ue006'
+    ENTER        = u'\ue007'
+    SHIFT        = u'\ue008'
+    LEFT_SHIFT   = u'\ue008' #  alias
+    CONTROL      = u'\ue009'
+    LEFT_CONTROL = u'\ue009' #  alias
+    ALT          = u'\ue00a'
+    LEFT_ALT     = u'\ue00a' #  alias
+    PAUSE        = u'\ue00b'
+    ESCAPE       = u'\ue00c'
+    SPACE        = u'\ue00d'
+    PAGE_UP      = u'\ue00e'
+    PAGE_DOWN    = u'\ue00f'
+    END          = u'\ue010'
+    HOME         = u'\ue011'
+    LEFT         = u'\ue012'
+    ARROW_LEFT   = u'\ue012' # alias
+    UP           = u'\ue013'
+    ARROW_UP     = u'\ue013' # alias
+    RIGHT        = u'\ue014'
+    ARROW_RIGHT  = u'\ue014' #  alias
+    DOWN         = u'\ue015'
+    ARROW_DOWN   = u'\ue015' #  alias
+    INSERT       = u'\ue016'
+    DELETE       = u'\ue017'
+    SEMICOLON    = u'\ue018'
+    EQUALS       = u'\ue019'
+
+    NUMPAD0      = u'\ue01a' #  numbe pad  keys
+    NUMPAD1      = u'\ue01b'
+    NUMPAD2      = u'\ue01c'
+    NUMPAD3      = u'\ue01d'
+    NUMPAD4      = u'\ue01e'
+    NUMPAD5      = u'\ue01f'
+    NUMPAD6      = u'\ue020'
+    NUMPAD7      = u'\ue021'
+    NUMPAD8      = u'\ue022'
+    NUMPAD9      = u'\ue023'
+    MULTIPLY     = u'\ue024'
+    ADD          = u'\ue025'
+    SEPARATOR    = u'\ue026'
+    SUBTRACT     = u'\ue027'
+    DECIMAL      = u'\ue028'
+    DIVIDE       = u'\ue029'
+
+    F1           = u'\ue031' #  function  keys
+    F2           = u'\ue032'
+    F3           = u'\ue033'
+    F4           = u'\ue034'
+    F5           = u'\ue035'
+    F6           = u'\ue036'
+    F7           = u'\ue037'
+    F8           = u'\ue038'
+    F9           = u'\ue039'
+    F10          = u'\ue03a'
+    F11          = u'\ue03b'
+    F12          = u'\ue03c'
+
+    META         = u'\ue03d'
+    COMMAND      = u'\ue03d'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/marionette.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/marionette.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/marionette.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/marionette.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,1727 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import base64
+import ConfigParser
+import json
+import os
+import socket
+import StringIO
+import traceback
+import warnings
+
+from contextlib import contextmanager
+
+from application_cache import ApplicationCache
+from decorators import do_crash_check
+from keys import Keys
+from marionette_transport import MarionetteTransport
+
+from mozrunner import B2GEmulatorRunner
+
+import geckoinstance
+import errors
+
+class HTMLElement(object):
+    """
+    Represents a DOM Element.
+    """
+
+    def __init__(self, marionette, id):
+        self.marionette = marionette
+        assert(id is not None)
+        self.id = id
+
+    def __str__(self):
+        return self.id
+
+    def __eq__(self, other_element):
+        return self.id == other_element.id
+
+    def find_element(self, method, target):
+        '''
+        Returns an HTMLElement instance that matches the specified method and target, relative to the current element.
+
+        For more details on this function, see the find_element method in the
+        Marionette class.
+        '''
+        return self.marionette.find_element(method, target, self.id)
+
+    def find_elements(self, method, target):
+        '''
+        Returns a list of all HTMLElement instances that match the specified method and target in the current context.
+
+        For more details on this function, see the find_elements method in the
+        Marionette class.
+        '''
+        return self.marionette.find_elements(method, target, self.id)
+
+    def get_attribute(self, attribute):
+        '''
+        Returns the requested attribute (or None, if no attribute is set).
+
+        :param attribute: The name of the attribute.
+        '''
+        return self.marionette._send_message('getElementAttribute', 'value', id=self.id, name=attribute)
+
+    def click(self):
+        return self.marionette._send_message('clickElement', 'ok', id=self.id)
+
+    def tap(self, x=None, y=None):
+        '''
+        Simulates a set of tap events on the element.
+
+        :param x: X-coordinate of tap event. If not given, default to the
+         center of the element.
+        :param y: Y-coordinate of tap event. If not given, default to the
+         center of the element.
+        '''
+        return self.marionette._send_message('singleTap', 'ok', id=self.id, x=x, y=y)
+
+    @property
+    def text(self):
+        '''
+        Returns the visible text of the element, and its child elements.
+        '''
+        return self.marionette._send_message('getElementText', 'value', id=self.id)
+
+    def send_keys(self, *string):
+        '''
+        Sends the string via synthesized keypresses to the element.
+        '''
+        keys = Marionette.convert_keys(*string)
+        return self.marionette._send_message('sendKeysToElement', 'ok', id=self.id, value=keys)
+
+    def clear(self):
+        '''
+        Clears the input of the element.
+        '''
+        return self.marionette._send_message('clearElement', 'ok', id=self.id)
+
+    def is_selected(self):
+        '''
+        Returns True if the element is selected.
+        '''
+        return self.marionette._send_message('isElementSelected', 'value', id=self.id)
+
+    def is_enabled(self):
+        '''
+        This command will return False if all the following criteria are met otherwise return True:
+
+        * A form control is disabled.
+        * A HtmlElement has a disabled boolean attribute.
+
+        '''
+        return self.marionette._send_message('isElementEnabled', 'value', id=self.id)
+
+    def is_displayed(self):
+        '''
+        Returns True if the element is displayed.
+        '''
+        return self.marionette._send_message('isElementDisplayed', 'value', id=self.id)
+
+    @property
+    def size(self):
+        '''
+        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)
+
+    @property
+    def tag_name(self):
+        '''
+        The tag name of the element.
+        '''
+        return self.marionette._send_message('getElementTagName', 'value', id=self.id)
+
+    @property
+    def location(self):
+        """Get an element's location on the page.
+
+        The returned point will contain the x and y coordinates of the
+        top left-hand corner of the given element.  The point (0,0)
+        refers to the upper-left corner of the document.
+
+        :returns: a dictionary containing x and y as entries
+
+        """
+        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)
+
+    @property
+    def rect(self):
+        """
+            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):
+        '''
+        Gets the value of the specified CSS property name.
+
+        :param property_name: Property name to get the value of.
+        '''
+        return self.marionette._send_message('getElementValueOfCssProperty', 'value',
+                                             id=self.id,
+                                             propertyName=property_name)
+    def submit(self):
+        '''
+        Submits if the element is a form or is within a form
+        '''
+        return self.marionette._send_message('submitElement', 'ok', id=self.id)
+
+class Actions(object):
+    '''
+    An Action object represents a set of actions that are executed in a particular order.
+
+    All action methods (press, etc.) return the Actions object itself, to make
+    it easy to create a chain of events.
+
+    Example usage:
+
+    ::
+
+        # get html file
+        testAction = marionette.absolute_url("testFool.html")
+        # navigate to the file
+        marionette.navigate(testAction)
+        # find element1 and element2
+        element1 = marionette.find_element("id", "element1")
+        element2 = marionette.find_element("id", "element2")
+        # create action object
+        action = Actions(marionette)
+        # add actions (press, wait, move, release) into the object
+        action.press(element1).wait(5). move(element2).release()
+        # fire all the added events
+        action.perform()
+    '''
+
+    def __init__(self, marionette):
+        self.action_chain = []
+        self.marionette = marionette
+        self.current_id = None
+
+    def press(self, element, x=None, y=None):
+        '''
+        Sends a 'touchstart' event to this element.
+
+        If no coordinates are given, it will be targeted at the center of the
+        element. If given, it will be targeted at the (x,y) coordinates
+        relative to the top-left corner of the element.
+
+        :param element: The element to press on.
+        :param x: Optional, x-coordinate to tap, relative to the top-left
+         corner of the element.
+        :param y: Optional, y-coordinate to tap, relative to the top-left
+         corner of the element.
+        '''
+        element=element.id
+        self.action_chain.append(['press', element, x, y])
+        return self
+
+    def release(self):
+        '''
+        Sends a 'touchend' event to this element.
+
+        May only be called if press() has already be called on this element.
+
+        If press and release are chained without a move action between them,
+        then it will be processed as a 'tap' event, and will dispatch the
+        expected mouse events ('mousemove' (if necessary), 'mousedown',
+        'mouseup', 'mouseclick') after the touch events. If there is a wait
+        period between press and release that will trigger a contextmenu,
+        then the 'contextmenu' menu event will be fired instead of the
+        touch/mouse events.
+        '''
+        self.action_chain.append(['release'])
+        return self
+
+    def move(self, element):
+        '''
+        Sends a 'touchmove' event at the center of the target element.
+
+        :param element: Element to move towards.
+
+        May only be called if press() has already be called.
+        '''
+        element=element.id
+        self.action_chain.append(['move', element])
+        return self
+
+    def move_by_offset(self, x, y):
+        '''
+        Sends 'touchmove' event to the given x, y coordinates relative to the top-left of the currently touched element.
+
+        May only be called if press() has already be called.
+
+        :param x: Specifies x-coordinate of move event, relative to the
+         top-left corner of the element.
+        :param y: Specifies y-coordinate of move event, relative to the
+         top-left corner of the element.
+        '''
+        self.action_chain.append(['moveByOffset', x, y])
+        return self
+
+    def wait(self, time=None):
+        '''
+        Waits for specified time period.
+
+        :param time: Time in seconds to wait. If time is None then this has no effect for a single action chain. If used inside a multi-action chain, then time being None indicates that we should wait for all other currently executing actions that are part of the chain to complete.
+        '''
+        self.action_chain.append(['wait', time])
+        return self
+
+    def cancel(self):
+        '''
+        Sends 'touchcancel' event to the target of the original 'touchstart' event.
+
+        May only be called if press() has already be called.
+        '''
+        self.action_chain.append(['cancel'])
+        return self
+
+    def tap(self, element, x=None, y=None):
+        '''
+        Performs a quick tap on the target element.
+
+        :param element: The element to tap.
+        :param x: Optional, x-coordinate of tap, relative to the top-left
+         corner of the element. If not specified, default to center of
+         element.
+        :param y: Optional, y-coordinate of tap, relative to the top-left
+         corner of the element. If not specified, default to center of
+         element.
+
+        This is equivalent to calling:
+
+        ::
+
+          action.press(element, x, y).release()
+        '''
+        element=element.id
+        self.action_chain.append(['press', element, x, y])
+        self.action_chain.append(['release'])
+        return self
+
+    def double_tap(self, element, x=None, y=None):
+        '''
+        Performs a double tap on the target element.
+
+        :param element: The element to double tap.
+        :param x: Optional, x-coordinate of double tap, relative to the
+         top-left corner of the element.
+        :param y: Optional, y-coordinate of double tap, relative to the
+         top-left corner of the element.
+        '''
+        element=element.id
+        self.action_chain.append(['press', element, x, y])
+        self.action_chain.append(['release'])
+        self.action_chain.append(['press', element, x, y])
+        self.action_chain.append(['release'])
+        return self
+
+    def flick(self, element, x1, y1, x2, y2, duration=200):
+        '''
+        Performs a flick gesture on the target element.
+
+        :param element: The element to perform the flick gesture on.
+        :param x1: Starting x-coordinate of flick, relative to the top left
+         corner of the element.
+        :param y1: Starting y-coordinate of flick, relative to the top left
+         corner of the element.
+        :param x2: Ending x-coordinate of flick, relative to the top left
+         corner of the element.
+        :param y2: Ending y-coordinate of flick, relative to the top left
+         corner of the element.
+        :param duration: Time needed for the flick gesture for complete (in
+         milliseconds).
+        '''
+        element = element.id
+        elapsed = 0
+        time_increment = 10
+        if time_increment >= duration:
+            time_increment = duration
+        move_x = time_increment*1.0/duration * (x2 - x1)
+        move_y = time_increment*1.0/duration * (y2 - y1)
+        self.action_chain.append(['press', element, x1, y1])
+        while elapsed < duration:
+            elapsed += time_increment
+            self.action_chain.append(['moveByOffset', move_x, move_y])
+            self.action_chain.append(['wait', time_increment/1000])
+        self.action_chain.append(['release'])
+        return self
+
+    def long_press(self, element, time_in_seconds, x=None, y=None):
+        '''
+        Performs a long press gesture on the target element.
+
+        :param element: The element to press.
+        :param time_in_seconds: Time in seconds to wait before releasing the press.
+        :param x: Optional, x-coordinate to tap, relative to the top-left
+         corner of the element.
+        :param y: Optional, y-coordinate to tap, relative to the top-left
+         corner of the element.
+
+        This is equivalent to calling:
+
+        ::
+
+          action.press(element, x, y).wait(time_in_seconds).release()
+
+        '''
+        element = element.id
+        self.action_chain.append(['press', element, x, y])
+        self.action_chain.append(['wait', time_in_seconds])
+        self.action_chain.append(['release'])
+        return self
+
+    def key_down(self, key_code):
+        """
+        Perform a "keyDown" action for the given key code. Modifier keys are
+        respected by the server for the course of an action chain.
+
+        :param key_code: The key to press as a result of this action.
+        """
+        self.action_chain.append(['keyDown', key_code])
+        return self
+
+    def key_up(self, key_code):
+        """
+        Perform a "keyUp" action for the given key code. Modifier keys are
+        respected by the server for the course of an action chain.
+        :param key_up: The key to release as a result of this action.
+        """
+        self.action_chain.append(['keyUp', key_code])
+        return self
+
+    def perform(self):
+        '''
+        Sends the action chain built so far to the server side for execution and clears the current chain of actions.
+        '''
+        self.current_id = self.marionette._send_message('actionChain', 'value', chain=self.action_chain, nextId=self.current_id)
+        self.action_chain = []
+        return self
+
+class MultiActions(object):
+    '''
+    A MultiActions object represents a sequence of actions that may be
+    performed at the same time. Its intent is to allow the simulation
+    of multi-touch gestures.
+    Usage example:
+
+    ::
+
+      # create multiaction object
+      multitouch = MultiActions(marionette)
+      # create several action objects
+      action_1 = Actions(marionette)
+      action_2 = Actions(marionette)
+      # add actions to each action object/finger
+      action_1.press(element1).move_to(element2).release()
+      action_2.press(element3).wait().release(element3)
+      # fire all the added events
+      multitouch.add(action_1).add(action_2).perform()
+    '''
+
+    def __init__(self, marionette):
+        self.multi_actions = []
+        self.max_length = 0
+        self.marionette = marionette
+
+    def add(self, action):
+        '''
+        Adds a set of actions to perform.
+
+        :param action: An Actions object.
+        '''
+        self.multi_actions.append(action.action_chain)
+        if len(action.action_chain) > self.max_length:
+          self.max_length = len(action.action_chain)
+        return self
+
+    def perform(self):
+        '''
+        Perform all the actions added to this object.
+        '''
+        return self.marionette._send_message('multiAction', 'ok', value=self.multi_actions, max_length=self.max_length)
+
+class Alert(object):
+    '''
+    A class for interacting with alerts.
+
+    ::
+
+      Alert(marionette).accept()
+      Alert(merionette).dismiss()
+    '''
+
+    def __init__(self, marionette):
+        self.marionette = marionette
+
+    def accept(self):
+        """Accept a currently displayed modal dialog.
+        """
+        self.marionette._send_message('acceptDialog', 'ok')
+
+    def dismiss(self):
+        """Dismiss a currently displayed modal dialog.
+        """
+        self.marionette._send_message('dismissDialog', 'ok')
+
+    @property
+    def text(self):
+        """Return the currently displayed text in a tab modal.
+        """
+        return self.marionette._send_message('getTextFromDialog', 'value')
+
+    def send_keys(self, *string):
+        """Send keys to the currently displayed text input area in an open
+        tab modal dialog.
+        """
+        keys = Marionette.convert_keys(*string)
+        self.marionette._send_message('sendKeysToDialog', 'ok', value=keys)
+
+
+class Marionette(object):
+    """
+    Represents a Marionette connection to a browser or device.
+    """
+
+    CONTEXT_CHROME = 'chrome' # non-browser content: windows, dialogs, etc.
+    CONTEXT_CONTENT = 'content' # browser content: iframes, divs, etc.
+    TIMEOUT_SEARCH = 'implicit'
+    TIMEOUT_SCRIPT = 'script'
+    TIMEOUT_PAGE = 'page load'
+
+    def __init__(self, host='localhost', port=2828, app=None, app_args=None, bin=None,
+                 profile=None, emulator=None, sdcard=None, emulator_img=None,
+                 emulator_binary=None, emulator_res=None, connect_to_running_emulator=False,
+                 gecko_log=None, homedir=None, baseurl=None, no_window=False, logdir=None,
+                 busybox=None, symbols_path=None, timeout=None, socket_timeout=360,
+                 device_serial=None, adb_path=None, process_args=None,
+                 adb_host=None, adb_port=None, prefs=None):
+        self.host = host
+        self.port = self.local_port = port
+        self.bin = bin
+        self.profile = profile
+        self.instance = None
+        self.session = None
+        self.session_id = None
+        self.window = None
+        self.chrome_window = None
+        self.runner = None
+        self.emulator = None
+        self.extra_emulators = []
+        self.baseurl = baseurl
+        self.no_window = no_window
+        self._test_name = None
+        self.timeout = timeout
+        self.socket_timeout = socket_timeout
+        self.device_serial = device_serial
+        self.adb_host = adb_host
+        self.adb_port = adb_port
+
+        if bin:
+            port = int(self.port)
+            if not Marionette.is_port_available(port, host=self.host):
+                ex_msg = "%s:%d is unavailable." % (self.host, port)
+                raise errors.MarionetteException(message=ex_msg)
+            if app:
+                # select instance class for the given app
+                try:
+                    instance_class = geckoinstance.apps[app]
+                except KeyError:
+                    msg = 'Application "%s" unknown (should be one of %s)'
+                    raise NotImplementedError(msg % (app, geckoinstance.apps.keys()))
+            else:
+                try:
+                    config = ConfigParser.RawConfigParser()
+                    config.read(os.path.join(os.path.dirname(bin), 'application.ini'))
+                    app = config.get('App', 'Name')
+                    instance_class = geckoinstance.apps[app.lower()]
+                except (ConfigParser.NoOptionError,
+                        ConfigParser.NoSectionError,
+                        KeyError):
+                    instance_class = geckoinstance.GeckoInstance
+            self.instance = instance_class(host=self.host, port=self.port,
+                                           bin=self.bin, profile=self.profile,
+                                           app_args=app_args, symbols_path=symbols_path,
+                                           gecko_log=gecko_log, prefs=prefs)
+            self.instance.start()
+            assert(self.wait_for_port()), "Timed out waiting for port!"
+
+        if emulator:
+            self.runner = B2GEmulatorRunner(b2g_home=homedir,
+                                            no_window=self.no_window,
+                                            logdir=logdir,
+                                            arch=emulator,
+                                            sdcard=sdcard,
+                                            symbols_path=symbols_path,
+                                            binary=emulator_binary,
+                                            userdata=emulator_img,
+                                            resolution=emulator_res,
+                                            profile=self.profile,
+                                            adb_path=adb_path,
+                                            process_args=process_args)
+            self.emulator = self.runner.device
+            self.emulator.start()
+            self.port = self.emulator.setup_port_forwarding(remote_port=self.port)
+            assert(self.emulator.wait_for_port(self.port)), "Timed out waiting for port!"
+
+        if connect_to_running_emulator:
+            self.runner = B2GEmulatorRunner(b2g_home=homedir,
+                                            logdir=logdir,
+                                            process_args=process_args)
+            self.emulator = self.runner.device
+            self.emulator.connect()
+            self.port = self.emulator.setup_port_forwarding(remote_port=self.port)
+            assert(self.emulator.wait_for_port(self.port)), "Timed out waiting for port!"
+
+        self.client = MarionetteTransport(self.host, self.port, self.socket_timeout)
+
+        if emulator:
+            if busybox:
+                self.emulator.install_busybox(busybox=busybox)
+            self.emulator.wait_for_system_message(self)
+
+    def cleanup(self):
+        if self.session:
+            try:
+                self.delete_session()
+            except (errors.MarionetteException, socket.error, IOError):
+                # These exceptions get thrown if the Marionette server
+                # hit an exception/died or the connection died. We can
+                # do no further server-side cleanup in this case.
+                pass
+            self.session = None
+        if self.runner:
+            self.runner.cleanup()
+        if self.instance:
+            self.instance.close()
+        for qemu in self.extra_emulators:
+            qemu.emulator.close()
+
+    def __del__(self):
+        self.cleanup()
+
+    @staticmethod
+    def is_port_available(port, host=''):
+        port = int(port)
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        try:
+            s.bind((host, port))
+            return True
+        except socket.error:
+            return False
+        finally:
+            s.close()
+
+    def wait_for_port(self, timeout=60):
+        return MarionetteTransport.wait_for_port(self.host,
+                                                 self.port,
+                                                 timeout=timeout)
+
+    @do_crash_check
+    def _send_message(self, command, response_key="ok", **kwargs):
+        if not self.session_id and command != "newSession":
+            raise errors.MarionetteException("Please start a session")
+
+        message = {"name": command}
+        if self.session_id:
+            message["sessionId"] = self.session_id
+        if kwargs:
+            message["parameters"] = kwargs
+
+        try:
+            response = self.client.send(message)
+        except socket.timeout:
+            self.session = None
+            self.window = None
+            self.client.close()
+            raise errors.TimeoutException(
+                "Connection timed out", status=errors.ErrorCodes.TIMEOUT)
+
+        # Process any emulator commands that are sent from a script
+        # while it's executing.
+        while True:
+            if response.get("emulator_cmd"):
+                response = self._handle_emulator_cmd(response)
+                continue;
+
+            if response.get("emulator_shell"):
+                response = self._handle_emulator_shell(response)
+                continue;
+
+            break;
+        if not self.session_id:
+            self.session_id = response.get("sessionId", None)
+
+        if response_key in response:
+            return response[response_key]
+        self._handle_error(response)
+
+    def _handle_emulator_cmd(self, response):
+        cmd = response.get("emulator_cmd")
+        if not cmd or not self.emulator:
+            raise errors.MarionetteException(
+                "No emulator in this test to run command against")
+        cmd = cmd.encode("ascii")
+        result = self.emulator._run_telnet(cmd)
+        return self.client.send({"name": "emulatorCmdResult",
+                                 "id": response.get("id"),
+                                 "result": result})
+
+    def _handle_emulator_shell(self, response):
+        args = response.get("emulator_shell")
+        if not isinstance(args, list) or not self.emulator:
+            raise errors.MarionetteException(
+                "No emulator in this test to run shell command against")
+        buf = StringIO.StringIO()
+        self.emulator.dm.shell(args, buf)
+        result = str(buf.getvalue()[0:-1]).rstrip().splitlines()
+        buf.close()
+        return self.client.send({"name": "emulatorCmdResult",
+                                 "id": response.get("id"),
+                                 "result": result})
+
+    def _handle_error(self, response):
+        if "error" not in response or not isinstance(response["error"], dict):
+            raise errors.MarionetteException(
+                "Malformed packet, expected key 'error' to be a dict: %s" % response)
+
+        error = response["error"]
+        status = error.get("status", 500)
+        message = error.get("message")
+        stacktrace = error.get("stacktrace")
+
+        # status numbers come from
+        # http://code.google.com/p/selenium/wiki/JsonWireProtocol#Response_Status_Codes
+        if status == errors.ErrorCodes.NO_SUCH_ELEMENT:
+            raise errors.NoSuchElementException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.NO_SUCH_FRAME:
+            raise errors.NoSuchFrameException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.STALE_ELEMENT_REFERENCE:
+            raise errors.StaleElementException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.ELEMENT_NOT_VISIBLE:
+            raise errors.ElementNotVisibleException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.ELEMENT_NOT_ACCESSIBLE:
+            raise errors.ElementNotAccessibleException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.INVALID_ELEMENT_STATE:
+            raise errors.InvalidElementStateException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.UNKNOWN_ERROR:
+            raise errors.MarionetteException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.ELEMENT_IS_NOT_SELECTABLE:
+            raise errors.ElementNotSelectableException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.JAVASCRIPT_ERROR:
+            raise errors.JavascriptException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.XPATH_LOOKUP_ERROR:
+            raise errors.XPathLookupException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.TIMEOUT:
+            raise errors.TimeoutException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.NO_SUCH_WINDOW:
+            raise errors.NoSuchWindowException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.INVALID_COOKIE_DOMAIN:
+            raise errors.InvalidCookieDomainException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.UNABLE_TO_SET_COOKIE:
+            raise errors.UnableToSetCookieException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.NO_ALERT_OPEN:
+            raise errors.NoAlertPresentException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.SCRIPT_TIMEOUT:
+            raise errors.ScriptTimeoutException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.INVALID_SELECTOR \
+             or status == errors.ErrorCodes.INVALID_XPATH_SELECTOR \
+             or status == errors.ErrorCodes.INVALID_XPATH_SELECTOR_RETURN_TYPER:
+            raise errors.InvalidSelectorException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.MOVE_TARGET_OUT_OF_BOUNDS:
+            raise errors.MoveTargetOutOfBoundsException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.FRAME_SEND_NOT_INITIALIZED_ERROR:
+            raise errors.FrameSendNotInitializedError(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.FRAME_SEND_FAILURE_ERROR:
+            raise errors.FrameSendFailureError(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.UNSUPPORTED_OPERATION:
+            raise errors.UnsupportedOperationException(message=message, status=status, stacktrace=stacktrace)
+        elif status == errors.ErrorCodes.SESSION_NOT_CREATED:
+            raise errors.SessionNotCreatedException(message=message, status=status, stacktrace=stacktrace)
+        else:
+            raise errors.MarionetteException(message=message, status=status, stacktrace=stacktrace)
+
+    def _reset_timeouts(self):
+        if self.timeout is not None:
+            self.timeouts(self.TIMEOUT_SEARCH, self.timeout)
+            self.timeouts(self.TIMEOUT_SCRIPT, self.timeout)
+            self.timeouts(self.TIMEOUT_PAGE, self.timeout)
+        else:
+            self.timeouts(self.TIMEOUT_PAGE, 30000)
+
+    def check_for_crash(self):
+        returncode = None
+        name = None
+        crashed = False
+        if self.runner:
+            if self.runner.check_for_crashes(test_name=self.test_name):
+                returncode = self.emulator.proc.returncode
+                name = 'emulator'
+                crashed = True
+        elif self.instance:
+            if self.instance.runner.check_for_crashes(
+                    test_name=self.test_name):
+                crashed = True
+        if returncode is not None:
+            print ('PROCESS-CRASH | %s | abnormal termination with exit code %d' %
+                (name, returncode))
+        return crashed
+
+    @staticmethod
+    def convert_keys(*string):
+        typing = []
+        for val in string:
+            if isinstance(val, Keys):
+                typing.append(val)
+            elif isinstance(val, int):
+                val = str(val)
+                for i in range(len(val)):
+                    typing.append(val[i])
+            else:
+                for i in range(len(val)):
+                    typing.append(val[i])
+        return typing
+
+    def enforce_gecko_prefs(self, prefs):
+        """
+        Checks if the running instance has the given prefs. If not, it will kill the
+        currently running instance, and spawn a new instance with the requested preferences.
+
+        : param prefs: A dictionary whose keys are preference names.
+        """
+        if not self.instance:
+            raise errors.MarionetteException("enforce_gecko_prefs can only be called " \
+                                             "on gecko instances launched by Marionette")
+        pref_exists = True
+        self.set_context(self.CONTEXT_CHROME)
+        for pref, value in prefs.iteritems():
+            if type(value) is not str:
+                value = json.dumps(value)
+            pref_exists = self.execute_script("""
+            let prefInterface = Components.classes["@mozilla.org/preferences-service;1"]
+                                          .getService(Components.interfaces.nsIPrefBranch);
+            let pref = '%s';
+            let value = '%s';
+            let type = prefInterface.getPrefType(pref);
+            switch(type) {
+                case prefInterface.PREF_STRING:
+                    return value == prefInterface.getCharPref(pref).toString();
+                case prefInterface.PREF_BOOL:
+                    return value == prefInterface.getBoolPref(pref).toString();
+                case prefInterface.PREF_INT:
+                    return value == prefInterface.getIntPref(pref).toString();
+                case prefInterface.PREF_INVALID:
+                    return false;
+            }
+            """ % (pref, value))
+            if not pref_exists:
+                break
+        self.set_context(self.CONTEXT_CONTENT)
+        if not pref_exists:
+            self.delete_session()
+            self.instance.restart(prefs)
+            assert(self.wait_for_port()), "Timed out waiting for port!"
+            self.start_session()
+            self._reset_timeouts()
+
+    def restart(self, clean=False):
+        """
+        This will terminate the currently running instance, and spawn a new instance
+        with the same profile and then reuse the session id when creating a session again.
+
+        : param prefs: A dictionary whose keys are preference names.
+        """
+        if not self.instance:
+            raise errors.MarionetteException("restart can only be called " \
+                                             "on gecko instances launched by Marionette")
+        self.delete_session()
+        self.instance.restart(clean=clean)
+        assert(self.wait_for_port()), "Timed out waiting for port!"
+        self.start_session(session_id=self.session_id)
+        self._reset_timeouts()
+
+    def absolute_url(self, relative_url):
+        '''
+        Returns an absolute url for files served from Marionette's www directory.
+
+        :param relative_url: The url of a static file, relative to Marionette's www directory.
+        '''
+        return "%s%s" % (self.baseurl, relative_url)
+
+    def start_session(self, desired_capabilities=None, session_id=None, timeout=60):
+        """Create a new Marionette session.
+
+        This method must be called before performing any other action.
+
+        :param desired_capabilities: An optional dict of desired
+            capabilities.  This is currently ignored.
+        :param timeout: Timeout in seconds for the server to be ready.
+        :param session_id: unique identifier for the session. If no session id is
+            passed in then one will be generated by the marionette server.
+
+        :returns: A dict of the capabilities offered."""
+        self.wait_for_port(timeout=timeout)
+        self.session = self._send_message('newSession', 'value', capabilities=desired_capabilities, sessionId=session_id)
+        self.b2g = 'b2g' in self.session
+        return self.session
+
+    @property
+    def test_name(self):
+        return self._test_name
+
+    @test_name.setter
+    def test_name(self, test_name):
+        if self._send_message('setTestName', 'ok', value=test_name):
+            self._test_name = test_name
+
+    def delete_session(self):
+        """Close the current session and disconnect from the server."""
+        response = self._send_message('deleteSession', 'ok')
+        self.session_id = None
+        self.session = None
+        self.window = None
+        self.client.close()
+        return response
+
+    @property
+    def session_capabilities(self):
+        '''
+        A JSON dictionary representing the capabilities of the current session.
+        '''
+        return self.session
+
+    def set_script_timeout(self, timeout):
+        '''
+        Sets the maximum number of ms that an asynchronous script is allowed to run.
+
+        If a script does not return in the specified amount of time, a
+        ScriptTimeoutException is raised.
+
+        :param timeout: The maximum number of milliseconds an asynchronous
+         script can run without causing an ScriptTimeoutException to be raised
+        '''
+        response = self._send_message('setScriptTimeout', 'ok', ms=timeout)
+        return response
+
+    def set_search_timeout(self, timeout):
+        '''
+        Sets a timeout for the find methods.
+
+        When searching for an element using either
+        :class:`Marionette.find_element` or :class:`Marionette.find_elements`,
+        the method will continue trying to locate the element for up to timeout
+        ms. This can be useful if, for example, the element you're looking for
+        might not exist immediately, because it belongs to a page which is
+        currently being loaded.
+
+        :param timeout: Timeout in milliseconds.
+        '''
+        response = self._send_message('setSearchTimeout', 'ok', ms=timeout)
+        return response
+
+    @property
+    def current_window_handle(self):
+        """Get the current window's handle.
+
+        Returns an opaque server-assigned identifier to this window
+        that uniquely identifies it within this Marionette instance.
+        This can be used to switch to this window at a later point.
+
+        :returns: unique window handle
+        :rtype: string
+
+        """
+        self.window = self._send_message("getWindowHandle", "value")
+        return self.window
+
+    @property
+    def current_chrome_window_handle(self):
+        """Get the current chrome window's handle. Corresponds to
+        a chrome window that may itself contain tabs identified by
+        window_handles.
+
+        Returns an opaque server-assigned identifier to this window
+        that uniquely identifies it within this Marionette instance.
+        This can be used to switch to this window at a later point.
+
+        :returns: unique window handle
+        :rtype: string
+
+        """
+        self.chrome_window = self._send_message("getCurrentChromeWindowHandle", "value")
+        return self.chrome_window
+
+
+    def get_window_position(self):
+        """Get the current window's position
+           Return a dictionary with the keys x and y
+           :returns: a dictionary with x and y
+        """
+        return self._send_message("getWindowPosition", "value")
+
+    def set_window_position(self, x, y):
+        """
+           Set the position of the current window
+            :param x: x coordinate for the top left of the window
+            :param y: y coordinate for the top left of the window
+        """
+        response = self._send_message("setWindowPosition", "ok", x=x, y=y)
+        return response
+
+    @property
+    def title(self):
+        '''
+        Current title of the active window.
+        '''
+        response = self._send_message('getTitle', 'value')
+        return response
+
+    @property
+    def window_handles(self):
+        """Get list of windows in the current context.
+
+        If called in the content context it will return a list of
+        references to all available browser windows.  Called in the
+        chrome context, it will list all available windows, not just
+        browser windows (e.g. not just navigator.browser).
+
+        Each window handle is assigned by the server, and the list of
+        strings returned does not have a guaranteed ordering.
+
+        :returns: unordered list of unique window handles as strings
+
+        """
+
+        response = self._send_message("getWindowHandles", "value")
+        return response
+
+    @property
+    def chrome_window_handles(self):
+        """Get a list of currently open chrome windows.
+
+        Each window handle is assigned by the server, and the list of
+        strings returned does not have a guaranteed ordering.
+
+        :returns: unordered list of unique window handles as strings
+
+        """
+
+        response = self._send_message("getChromeWindowHandles", "value")
+        return response
+
+
+    @property
+    def page_source(self):
+        '''
+        A string representation of the DOM.
+        '''
+        response = self._send_message('getPageSource', 'value')
+        return response
+    def close(self):
+        """Close the current window, ending the session if it's the last
+        window currently open.
+
+        On B2G this method is a noop and will return immediately.
+
+        """
+
+        response = self._send_message("close", "ok")
+        return response
+
+    def close_chrome_window(self):
+        """Close the currently selected chrome window, ending the session
+        if it's the last window open.
+
+        On B2G this method is a noop and will return immediately.
+
+        """
+
+        response = self._send_message("closeChromeWindow", "ok")
+        return response
+
+    def set_context(self, context):
+        '''
+        Sets the context that Marionette commands are running in.
+
+        :param context: Context, may be one of the class properties
+         `CONTEXT_CHROME` or `CONTEXT_CONTENT`.
+
+        Usage example::
+
+          marionette.set_context(marionette.CONTEXT_CHROME)
+        '''
+        assert(context == self.CONTEXT_CHROME or context == self.CONTEXT_CONTENT)
+        return self._send_message('setContext', 'ok', value=context)
+
+    @contextmanager
+    def using_context(self, context):
+        '''
+        Sets the context that Marionette commands are running in using
+        a `with` statement. The state of the context on the server is
+        saved before entering the block, and restored upon exiting it.
+
+        :param context: Context, may be one of the class properties
+         `CONTEXT_CHROME` or `CONTEXT_CONTENT`.
+
+        Usage example::
+
+          with marionette.using_context(marionette.CONTEXT_CHROME):
+              # chrome scope
+              ... do stuff ...
+        '''
+        scope = self._send_message('getContext', 'value')
+        self.set_context(context)
+        try:
+            yield
+        finally:
+            self.set_context(scope)
+
+    def switch_to_alert(self):
+        '''
+        Returns an Alert object for interacting with a currently displayed alert.
+
+        ::
+
+            alert = self.marionette.switch_to_alert()
+            text = alert.text
+            alert.accept()
+        '''
+        return Alert(self)
+
+    def switch_to_window(self, window_id):
+        '''
+        Switch to the specified window; subsequent commands will be directed at the new window.
+
+        :param window_id: The id or name of the window to switch to.
+        '''
+        response = self._send_message('switchToWindow', 'ok', name=window_id)
+        self.window = window_id
+        return response
+
+    def get_active_frame(self):
+        '''
+        Returns an HTMLElement representing the frame Marionette is currently acting on.
+        '''
+        response = self._send_message('getActiveFrame', 'value')
+        if response:
+            return HTMLElement(self, response)
+        return None
+
+    def switch_to_default_content(self):
+        '''
+        Switch the current context to page's default content.
+        '''
+        return self.switch_to_frame()
+
+    def switch_to_frame(self, frame=None, focus=True):
+        '''
+        Switch the current context to the specified frame. Subsequent commands will operate in the context of the specified frame, if applicable.
+
+        :param frame: A reference to the frame to switch to: this can be an HTMLElement, an index, name or an id attribute. If you call switch_to_frame() without an argument, it will switch to the top-level frame.
+        :param focus: A boolean value which determins whether to focus the frame that we just switched to.
+        '''
+        if isinstance(frame, HTMLElement):
+            response = self._send_message('switchToFrame', 'ok', element=frame.id, focus=focus)
+        else:
+            response = self._send_message('switchToFrame', 'ok', id=frame, focus=focus)
+        return response
+
+    def get_url(self):
+        """Get a string representing the current URL.
+
+        On Desktop this returns a string representation of the URL of
+        the current top level browsing context.  This is equivalent to
+        document.location.href.
+
+        When in the context of the chrome, this returns the canonical
+        URL of the current resource.
+
+        :returns: string representation of URL
+
+        """
+
+        response = self._send_message("getCurrentUrl", "value")
+        return response
+
+    def get_window_type(self):
+        '''
+        Gets the windowtype attribute of the window Marionette is currently acting on.
+
+        This command only makes sense in a chrome context. You might use this
+        method to distinguish a browser window from an editor window.
+        '''
+        response = self._send_message('getWindowType', 'value')
+        return response
+
+    def navigate(self, url):
+        """Navigate to to given URL.
+
+        This will follow redirects issued by the server.  When the
+        method returns is based on the page load strategy that the
+        user has selected.
+
+        Documents that contain a META tag with the "http-equiv"
+        attribute set to "refresh" will return if the timeout is
+        greater than 1 second and the other criteria for determining
+        whether a page is loaded are met.  When the refresh period is
+        1 second or less and the page load strategy is "normal" or
+        "conservative", it will wait for the page to complete loading
+        before returning.
+
+        If any modal dialog box, such as those opened on
+        window.onbeforeunload or window.alert, is opened at any point
+        in the page load, it will return immediately.
+
+        If a 401 response is seen by the browser, it will return
+        immediately.  That is, if BASIC, DIGEST, NTLM or similar
+        authentication is required, the page load is assumed to be
+        complete.  This does not include FORM-based authentication.
+
+        :param url: The url to navigate to.
+
+        """
+
+        response = self._send_message("get", "ok", url=url)
+        return response
+
+    def timeouts(self, timeout_type, ms):
+        """An interface for managing timeout behaviour of a Marionette instance.
+
+        Setting timeouts specifies the type and amount of time the Marionette instance should wait during requests.
+
+        There are three types of timeouts that can be set: implicit, script and page load.
+
+        * An implicit  timeout specifies the amount of time a Marionette instance should wait when searching for elements. Here, marionette polls a page until an element is found or the timeout expires, whichever occurs first. When searching for multiple elements, the driver should poll the page until at least one element is found or the timeout expires, at which point it should return an empty list.
+        * A script timeout specifies the amount of time the Marionette instance should wait after calling executeAsyncScript for the callback to have executed before returning a timeout response.
+        * A page load timeout specifies the amount of time the Marionette instance should wait for a page load operation to complete. If this limit is exceeded, the Marionette instance will return a "timeout" response status.
+
+        :param timeout_type: A string value specifying the timeout type. This must be one of three types: 'implicit', 'script' or 'page load'
+        :param ms: A number value specifying the timeout length in milliseconds (ms)
+        """
+        assert(timeout_type == self.TIMEOUT_SEARCH or timeout_type == self.TIMEOUT_SCRIPT or timeout_type == self.TIMEOUT_PAGE)
+        response = self._send_message('timeouts', 'ok', type=timeout_type, ms=ms)
+        return response
+
+    def go_back(self):
+        '''
+        Causes the browser to perform a back navigation.
+        '''
+        response = self._send_message('goBack', 'ok')
+        return response
+
+    def go_forward(self):
+        '''
+        Causes the browser to perform a forward navigation.
+        '''
+        response = self._send_message('goForward', 'ok')
+        return response
+
+    def refresh(self):
+        '''
+        Causes the browser to perform to refresh the current page.
+        '''
+        response = self._send_message('refresh', 'ok')
+        return response
+
+    def wrapArguments(self, args):
+        if isinstance(args, list):
+            wrapped = []
+            for arg in args:
+                wrapped.append(self.wrapArguments(arg))
+        elif isinstance(args, dict):
+            wrapped = {}
+            for arg in args:
+                wrapped[arg] = self.wrapArguments(args[arg])
+        elif type(args) == HTMLElement:
+            wrapped = {'ELEMENT': args.id }
+        elif (isinstance(args, bool) or isinstance(args, basestring) or
+              isinstance(args, int) or isinstance(args, float) or args is None):
+            wrapped = args
+
+        return wrapped
+
+    def unwrapValue(self, value):
+        if isinstance(value, list):
+            unwrapped = []
+            for item in value:
+                unwrapped.append(self.unwrapValue(item))
+        elif isinstance(value, dict):
+            unwrapped = {}
+            for key in value:
+                if key == 'ELEMENT':
+                    unwrapped = HTMLElement(self, value[key])
+                else:
+                    unwrapped[key] = self.unwrapValue(value[key])
+        else:
+            unwrapped = value
+
+        return unwrapped
+
+    def execute_js_script(self, script, script_args=None, async=True,
+                          new_sandbox=True, special_powers=False,
+                          script_timeout=None, inactivity_timeout=None,
+                          filename=None):
+        if script_args is None:
+            script_args = []
+        args = self.wrapArguments(script_args)
+        response = self._send_message('executeJSScript',
+                                      'value',
+                                      script=script,
+                                      args=args,
+                                      async=async,
+                                      newSandbox=new_sandbox,
+                                      specialPowers=special_powers,
+                                      scriptTimeout=script_timeout,
+                                      inactivityTimeout=inactivity_timeout,
+                                      filename=filename,
+                                      line=None)
+        return self.unwrapValue(response)
+
+    def execute_script(self, script, script_args=None, new_sandbox=True,
+                       special_powers=False, script_timeout=None):
+        '''
+        Executes a synchronous JavaScript script, and returns the result (or None if the script does return a value).
+
+        The script is executed in the context set by the most recent
+        set_context() call, or to the CONTEXT_CONTENT context if set_context()
+        has not been called.
+
+        :param script: A string containing the JavaScript to execute.
+        :param script_args: A list of arguments to pass to the script.
+        :param special_powers: Whether or not you want access to SpecialPowers
+         in your script. Set to False by default because it shouldn't really
+         be used, since you already have access to chrome-level commands if you
+         set context to chrome and do an execute_script. This method was added
+         only to help us run existing Mochitests.
+        :param new_sandbox: If False, preserve global variables from the last
+         execute_*script call. This is True by default, in which case no
+         globals are preserved.
+
+        Simple usage example:
+
+        ::
+
+          result = marionette.execute_script("return 1;")
+          assert result == 1
+
+        You can use the `script_args` parameter to pass arguments to the
+        script:
+
+        ::
+
+          result = marionette.execute_script("return arguments[0] + arguments[1];",
+                                             script_args=[2, 3])
+          assert result == 5
+          some_element = marionette.find_element("id", "someElement")
+          sid = marionette.execute_script("return arguments[0].id;", script_args=[some_element])
+          assert some_element.get_attribute("id") == sid
+
+        Scripts wishing to access non-standard properties of the window object must use
+        window.wrappedJSObject:
+
+        ::
+
+          result = marionette.execute_script("""
+            window.wrappedJSObject.test1 = 'foo';
+            window.wrappedJSObject.test2 = 'bar';
+            return window.wrappedJSObject.test1 + window.wrappedJSObject.test2;
+            """)
+          assert result == "foobar"
+
+        Global variables set by individual scripts do not persist between
+        script calls by default.  If you wish to persist data between script
+        calls, you can set new_sandbox to False on your next call, and add any
+        new variables to a new 'global' object like this:
+
+        ::
+
+          marionette.execute_script("global.test1 = 'foo';")
+          result = self.marionette.execute_script("return global.test1;", new_sandbox=False)
+          assert result == 'foo'
+
+        '''
+        if script_args is None:
+            script_args = []
+        args = self.wrapArguments(script_args)
+        stack = traceback.extract_stack()
+        frame = stack[-2:-1][0] # grab the second-to-last frame
+        response = self._send_message('executeScript',
+                                      'value',
+                                      script=script,
+                                      args=args,
+                                      newSandbox=new_sandbox,
+                                      specialPowers=special_powers,
+                                      scriptTimeout=script_timeout,
+                                      line=int(frame[1]),
+                                      filename=os.path.basename(frame[0]))
+        return self.unwrapValue(response)
+
+    def execute_async_script(self, script, script_args=None, new_sandbox=True, special_powers=False, script_timeout=None, debug_script=False):
+        '''
+        Executes an asynchronous JavaScript script, and returns the result (or None if the script does return a value).
+
+        The script is executed in the context set by the most recent
+        set_context() call, or to the CONTEXT_CONTENT context if set_context()
+        has not been called.
+
+        :param script: A string containing the JavaScript to execute.
+        :param script_args: A list of arguments to pass to the script.
+        :param special_powers: Whether or not you want access to SpecialPowers
+         in your script. Set to False by default because it shouldn't really
+         be used, since you already have access to chrome-level commands if you
+         set context to chrome and do an execute_script. This method was added
+         only to help us run existing Mochitests.
+        :param new_sandbox: If False, preserve global variables from the last
+         execute_*script call. This is True by default, in which case no
+         globals are preserved.
+        :param debug_script: Capture javascript exceptions when in
+         CONTEXT_CHROME context.
+
+        Usage example:
+
+        ::
+
+          marionette.set_script_timeout(10000) # set timeout period of 10 seconds
+          result = self.marionette.execute_async_script("""
+            // this script waits 5 seconds, and then returns the number 1
+            setTimeout(function() {
+              marionetteScriptFinished(1);
+            }, 5000);
+          """)
+          assert result == 1
+        '''
+        if script_args is None:
+            script_args = []
+        args = self.wrapArguments(script_args)
+        stack = traceback.extract_stack()
+        frame = stack[-2:-1][0] # grab the second-to-last frame
+        response = self._send_message('executeAsyncScript',
+                                      'value',
+                                      script=script,
+                                      args=args,
+                                      newSandbox=new_sandbox,
+                                      specialPowers=special_powers,
+                                      scriptTimeout=script_timeout,
+                                      line=int(frame[1]),
+                                      filename=os.path.basename(frame[0]),
+                                      debug_script=debug_script)
+        return self.unwrapValue(response)
+
+    def find_element(self, method, target, id=None):
+        '''
+        Returns an HTMLElement instances that matches the specified method and target in the current context.
+
+        An HTMLElement instance may be used to call other methods on the
+        element, such as click().  If no element is immediately found, the
+        attempt to locate an element will be repeated for up to the amount of
+        time set by set_search_timeout(). If multiple elements match the given
+        criteria, only the first is returned. If no element matches, a
+        NoSuchElementException will be raised.
+
+        :param method: The method to use to locate the element; one of: "id",
+                       "name", "class name", "tag name", "css selector", "link text",
+                       "partial link text", "xpath", "anon" and "anon attribute".
+                       Note that the "name", "link text" and
+                       "partial link test" methods are not supported in the chrome dom.
+        :param target: The target of the search.  For example, if method =
+                       "tag", target might equal "div".  If method = "id", target would be
+                       an element id.
+        :param id: If specified, search for elements only inside the element
+                   with the specified id.
+        '''
+        kwargs = { 'value': target, 'using': method }
+        if id:
+            kwargs['element'] = id
+        response = self._send_message('findElement', 'value', **kwargs)
+        element = HTMLElement(self, response['ELEMENT'])
+        return element
+
+    def find_elements(self, method, target, id=None):
+        '''
+        Returns a list of all HTMLElement instances that match the specified method and target in the current context.
+
+        An HTMLElement instance may be used to call other methods on the
+        element, such as click().  If no element is immediately found, the
+        attempt to locate an element will be repeated for up to the amount of
+        time set by set_search_timeout().
+
+        :param method: The method to use to locate the elements; one of:
+                       "id", "name", "class name", "tag name", "css selector", "link text",
+                       "partial link text", "xpath", "anon" and "anon attribute".
+                       Note that the "name", "link text" and
+                       "partial link test" methods are not supported in the chrome dom.
+        :param target: The target of the search.  For example, if method =
+                       "tag", target might equal "div".  If method = "id", target would be
+                       an element id.
+        :param id: If specified, search for elements only inside the element
+                   with the specified id.
+        '''
+        kwargs = { 'value': target, 'using': method }
+        if id:
+            kwargs['element'] = id
+        response = self._send_message('findElements', 'value', **kwargs)
+        assert(isinstance(response, list))
+        elements = []
+        for x in response:
+            elements.append(HTMLElement(self, x['ELEMENT']))
+        return elements
+
+    def get_active_element(self):
+        response = self._send_message('getActiveElement', 'value')
+        return HTMLElement(self, response)
+
+    def log(self, msg, level=None):
+        '''
+        Stores a timestamped log message in the Marionette server for later retrieval.
+
+        :param msg: String with message to log.
+        :param level: String with log level (e.g. "INFO" or "DEBUG"). If None,
+         defaults to "INFO".
+        '''
+        return self._send_message('log', 'ok', value=msg, level=level)
+
+    def get_logs(self):
+        '''
+        Returns the list of logged messages.
+
+        Each log message is an array with three string elements: the level,
+        the message, and a date.
+
+        Usage example:
+
+        ::
+
+          marionette.log("I AM INFO")
+          marionette.log("I AM ERROR", "ERROR")
+          logs = marionette.get_logs()
+          assert logs[0][1] == "I AM INFO"
+          assert logs[1][1] == "I AM ERROR"
+        '''
+        return self._send_message('getLogs', 'value')
+
+    def import_script(self, js_file):
+        '''
+        Imports a script into the scope of the execute_script and execute_async_script calls.
+
+        This is particularly useful if you wish to import your own libraries.
+
+        :param js_file: Filename of JavaScript file to import.
+
+        For example, Say you have a script, importfunc.js, that contains:
+
+        ::
+
+          let testFunc = function() { return "i'm a test function!";};
+
+        Assuming this file is in the same directory as the test, you could do
+        something like:
+
+        ::
+
+          js = os.path.abspath(os.path.join(__file__, os.path.pardir, "importfunc.js"))
+          marionette.import_script(js)
+          assert "i'm a test function!" == self.marionette.execute_script("return testFunc();")
+        '''
+        js = ''
+        with open(js_file, 'r') as f:
+            js = f.read()
+        return self._send_message('importScript', 'ok', script=js)
+
+    def clear_imported_scripts(self):
+        '''
+        Clears all imported scripts in this context, ie: calling clear_imported_scripts in chrome
+        context will clear only scripts you imported in chrome, and will leave the scripts
+        you imported in content context.
+        '''
+        return self._send_message('clearImportedScripts', 'ok')
+
+    def add_cookie(self, cookie):
+        """
+        Adds a cookie to your current session.
+
+        :param cookie: A dictionary object, with required keys - "name" and
+         "value"; optional keys - "path", "domain", "secure", "expiry".
+
+        Usage example:
+
+        ::
+
+          driver.add_cookie({'name': 'foo', 'value': 'bar'})
+          driver.add_cookie({'name': 'foo', 'value': 'bar', 'path': '/'})
+          driver.add_cookie({'name': 'foo', 'value': 'bar', 'path': '/',
+                             'secure': True})
+        """
+        return self._send_message('addCookie', 'ok', cookie=cookie)
+
+    def delete_all_cookies(self):
+        """
+        Delete all cookies in the scope of the current session.
+
+        Usage example:
+
+        ::
+
+          driver.delete_all_cookies()
+        """
+        return self._send_message('deleteAllCookies', 'ok')
+
+    def delete_cookie(self, name):
+        """
+        Delete a cookie by its name.
+
+        :param name: Name of cookie to delete.
+
+        Usage example:
+
+        ::
+
+          driver.delete_cookie('foo')
+        """
+        return self._send_message('deleteCookie', 'ok', name=name);
+
+    def get_cookie(self, name):
+        """
+        Get a single cookie by name. Returns the cookie if found, None if not.
+
+        :param name: Name of cookie to get.
+        """
+        cookies = self.get_cookies()
+        for cookie in cookies:
+            if cookie['name'] == name:
+                return cookie
+        return None
+
+    def get_cookies(self):
+        """Get all the cookies for the current domain.
+
+        This is the equivalent of calling `document.cookie` and
+        parsing the result.
+
+        :returns: A set of cookies for the current domain.
+
+        """
+
+        return self._send_message("getCookies", "value")
+
+    @property
+    def application_cache(self):
+        return ApplicationCache(self)
+
+    def screenshot(self, element=None, highlights=None, format="base64",
+                   full=True):
+        """Takes a screenshot of a web element or the current frame.
+
+        The screen capture is returned as a lossless PNG image encoded
+        as a base 64 string by default. If the `element` argument is defined the
+        capture area will be limited to the bounding box of that
+        element.  Otherwise, the capture area will be the bounding box
+        of the current frame.
+
+        :param element: The element to take a screenshot of.  If None, will
+            take a screenshot of the current frame.
+
+        :param highlights: A list of HTMLElement objects to draw a red
+            box around in the returned screenshot.
+
+        :param format: if "base64" (the default), returns the screenshot
+            as a base64-string. If "binary", the data is decoded and
+            returned as raw binary.
+
+        :param full: If True (the default), the capture area will be the
+            complete frame. Else only the viewport is captured. Only applies
+            when `element` is None.
+        """
+
+        if element:
+            element = element.id
+        lights = None
+        if highlights:
+            lights = [highlight.id for highlight in highlights]
+        screenshot_data = self._send_message("takeScreenshot", "value",
+                                             id=element, highlights=lights,
+                                             full=full)
+        if format == 'base64':
+            return screenshot_data
+        elif format == 'binary':
+            return base64.b64decode(screenshot_data.encode('ascii'))
+        else:
+            raise ValueError("format parameter must be either 'base64'"
+                             " or 'binary', not {0}".format(repr(format)))
+
+    @property
+    def orientation(self):
+        """Get the current browser orientation.
+
+        Will return one of the valid primary orientation values
+        portrait-primary, landscape-primary, portrait-secondary, or
+        landscape-secondary.
+
+        """
+        return self._send_message("getScreenOrientation", "value")
+
+    def set_orientation(self, orientation):
+        """Set the current browser orientation.
+
+        The supplied orientation should be given as one of the valid
+        orientation values.  If the orientation is unknown, an error
+        will be raised.
+
+        Valid orientations are "portrait" and "landscape", which fall
+        back to "portrait-primary" and "landscape-primary"
+        respectively, and "portrait-secondary" as well as
+        "landscape-secondary".
+
+        :param orientation: The orientation to lock the screen in.
+
+        """
+        self._send_message("setScreenOrientation", "ok", orientation=orientation)
+        if self.emulator:
+            self.emulator.screen.orientation = orientation.lower()
+
+    @property
+    def window_size(self):
+        """Get the current browser window size.
+
+        Will return the current browser window size in pixels. Refers to
+        window outerWidth and outerHeight values, which include scroll bars,
+        title bars, etc.
+
+        :returns: dictionary representation of current window width and height
+
+        """
+        return self._send_message("getWindowSize", "value")
+
+    def set_window_size(self, width, height):
+        """Resize the browser window currently in focus.
+
+        The supplied width and height values refer to the window outerWidth
+        and outerHeight values, which include scroll bars, title bars, etc.
+
+        An error will be returned if the requested window size would result
+        in the window being in the maximised state.
+
+        :param width: The width to resize the window to.
+        :param height: The height to resize the window to.
+
+        """
+        self._send_message("setWindowSize", "ok", width=width, height=height)
+
+    def maximize_window(self):
+        """ Resize the browser window currently receiving commands. The action
+        should be equivalent to the user pressing the the maximize button
+        """
+
+        return self._send_message("maximizeWindow", "ok")
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/selection.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/selection.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/selection.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/selection.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,203 @@
+# -*- coding: 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/.
+
+
+class SelectionManager(object):
+    '''Interface for manipulating the selection and carets of the element.
+
+    Simple usage example:
+
+    ::
+
+        element = marionette.find_element('id', 'input')
+        sel = SelectionManager(element)
+        sel.move_caret_to_front()
+
+    '''
+
+    def __init__(self, element):
+        self.element = element
+
+    def _input_or_textarea(self):
+        '''Return True if element is either <input> or <textarea>.'''
+        return self.element.tag_name in ('input', 'textarea')
+
+    def js_selection_cmd(self):
+        '''Return a command snippet to get selection object.
+
+        If the element is <input> or <textarea>, return the selection object
+        associated with it. Otherwise, return the current selection object.
+
+        Note: "element" must be provided as the first argument to
+        execute_script().
+
+        '''
+        if self._input_or_textarea():
+            # We must unwrap sel so that DOMRect could be returned to Python
+            # side.
+            return '''var sel = SpecialPowers.wrap(arguments[0]).editor.selection;
+                   sel = SpecialPowers.unwrap(sel);'''
+        else:
+            return '''var sel = window.getSelection();'''
+
+    def move_caret_by_offset(self, offset, backward=False):
+        '''Move caret in the element by character offset.'''
+        cmd = self.js_selection_cmd() +\
+            '''sel.modify("move", arguments[1], "character");'''
+        direction = 'backward' if backward else 'forward'
+
+        for i in range(offset):
+            self.element.marionette.execute_script(
+                cmd, script_args=[self.element, direction])
+
+    def move_caret_to_front(self):
+        '''Move caret in the element to the front of the content.'''
+        if self._input_or_textarea():
+            cmd = '''arguments[0].setSelectionRange(0, 0);'''
+        else:
+            cmd = '''var sel = window.getSelection();
+                  sel.collapse(arguments[0].firstChild, 0);'''
+
+        self.element.marionette.execute_script(cmd, script_args=[self.element])
+
+    def move_caret_to_end(self):
+        '''Move caret in the element to the end of the content.'''
+        if self._input_or_textarea():
+            cmd = '''var len = arguments[0].value.length;
+                  arguments[0].setSelectionRange(len, len);'''
+        else:
+            cmd = '''var sel = window.getSelection();
+                  sel.collapse(arguments[0].lastChild, arguments[0].lastChild.length);'''
+
+        self.element.marionette.execute_script(cmd, script_args=[self.element])
+
+    def selection_rect_list(self, idx):
+        '''Return the selection's DOMRectList object for the range at given idx.
+
+        If the element is either <input> or <textarea>, return the DOMRectList of
+        the range at given idx of the selection within the element. Otherwise,
+        return the DOMRectList of the of the range at given idx of current selection.
+
+        '''
+        cmd = self.js_selection_cmd() +\
+            '''return sel.getRangeAt(%d).getClientRects();''' % idx
+        return self.element.marionette.execute_script(cmd, script_args=[self.element])
+
+    def range_count(self):
+        '''Get selection's range count'''
+        cmd = self.js_selection_cmd() +\
+            '''return sel.rangeCount;'''
+        return self.element.marionette.execute_script(cmd, script_args=[self.element])
+
+    def _selection_location_helper(self, location_type):
+        '''Return the start and end location of the selection in the element.
+
+        Return a tuple containing two pairs of (x, y) coordinates of the start
+        and end locations in the element. The coordinates are relative to the
+        top left-hand corner of the element. Both ltr and rtl directions are
+        considered.
+
+        '''
+        range_count = self.range_count();
+        first_rect_list = self.selection_rect_list(0)
+        last_rect_list = self.selection_rect_list(range_count - 1)
+        last_list_length = last_rect_list['length']
+        first_rect, last_rect = first_rect_list['0'], last_rect_list[str(last_list_length - 1)]
+        origin_x, origin_y = self.element.rect['x'], self.element.rect['y']
+
+        if self.element.get_attribute('dir') == 'rtl':  # such as Arabic
+            start_pos, end_pos = 'right', 'left'
+        else:
+            start_pos, end_pos = 'left', 'right'
+
+        # Calculate y offset according to different needs.
+        if location_type == 'center':
+            start_y_offset = first_rect['height'] / 2.0
+            end_y_offset = last_rect['height'] / 2.0
+        elif location_type == 'caret':
+            # Selection carets' tip are below the bottom of the two ends of the
+            # selection. Add 5px to y should be sufficient to locate them.
+            caret_tip_y_offset = 5
+            start_y_offset = first_rect['height'] + caret_tip_y_offset
+            end_y_offset = last_rect['height'] + caret_tip_y_offset
+        else:
+            start_y_offset = end_y_offset = 0
+
+        caret1_x = first_rect[start_pos] - origin_x
+        caret1_y = first_rect['top'] + start_y_offset - origin_y
+        caret2_x = last_rect[end_pos] - origin_x
+        caret2_y = last_rect['top'] + end_y_offset - origin_y
+
+        return ((caret1_x, caret1_y), (caret2_x, caret2_y))
+
+    def selection_location(self):
+        '''Return the start and end location of the selection in the element.
+
+        Return a tuple containing two pairs of (x, y) coordinates of the start
+        and end of the selection. The coordinates are relative to the top
+        left-hand corner of the element. Both ltr and rtl direction are
+        considered.
+
+        '''
+        return self._selection_location_helper('center')
+
+    def selection_carets_location(self):
+        '''Return a pair of the two selection carets' location.
+
+        Return a tuple containing two pairs of (x, y) coordinates of the two
+        selection carets' tip. The coordinates are relative to the top left-hand
+        corner of the element. Both ltr and rtl direction are considered.
+
+        '''
+        return self._selection_location_helper('caret')
+
+    def caret_location(self):
+        '''Return caret's center location within the element.
+
+        Return (x, y) coordinates of the caret's center relative to the top
+        left-hand corner of the element.
+
+        '''
+        return self._selection_location_helper('center')[0]
+
+    def touch_caret_location(self):
+        '''Return touch caret's location (based on current caret location).
+
+        Return (x, y) coordinates of the touch caret's tip relative to the top
+        left-hand corner of the element.
+
+        '''
+        return self._selection_location_helper('caret')[0]
+
+    def select_all(self):
+        '''Select all the content in the element.'''
+        if self._input_or_textarea():
+            cmd = '''var len = arguments[0].value.length;
+                  arguments[0].focus();
+                  arguments[0].setSelectionRange(0, len);'''
+        else:
+            cmd = '''var range = document.createRange();
+                  range.setStart(arguments[0].firstChild, 0);
+                  range.setEnd(arguments[0].lastChild, arguments[0].lastChild.length);
+                  var sel = window.getSelection();
+                  sel.removeAllRanges();
+                  sel.addRange(range);'''
+
+        self.element.marionette.execute_script(cmd, script_args=[self.element])
+
+    @property
+    def content(self):
+        '''Return all the content of the element.'''
+        if self._input_or_textarea():
+            return self.element.get_attribute('value')
+        else:
+            return self.element.text
+
+    @property
+    def selected_content(self):
+        '''Return the selected portion of the content in the element.'''
+        cmd = self.js_selection_cmd() +\
+            '''return sel.toString();'''
+        return self.element.marionette.execute_script(cmd, script_args=[self.element])
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/wait.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/wait.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/marionette_driver/wait.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/marionette_driver/wait.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,157 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import collections
+import errors
+import sys
+import time
+
+DEFAULT_TIMEOUT = 5
+DEFAULT_INTERVAL = 0.1
+
+class Wait(object):
+    """An explicit conditional utility class for waiting until a condition
+    evaluates to true or not null.
+
+    This will repeatedly evaluate a condition in anticipation for a
+    truthy return value, or its timeout to expire, or its waiting
+    predicate to become true.
+
+    A `Wait` instance defines the maximum amount of time to wait for a
+    condition, as well as the frequency with which to check the
+    condition.  Furthermore, the user may configure the wait to ignore
+    specific types of exceptions whilst waiting, such as
+    `errors.NoSuchElementException` when searching for an element on
+    the page.
+
+    """
+
+    def __init__(self, marionette, timeout=None,
+                 interval=DEFAULT_INTERVAL, ignored_exceptions=None,
+                 clock=None):
+        """Configure the Wait instance to have a custom timeout, interval, and
+        list of ignored exceptions.  Optionally a different time
+        implementation than the one provided by the standard library
+        (time) can also be provided.
+
+        Sample usage::
+
+            # Wait 30 seconds for window to open, checking for its presence once
+            # every 5 seconds.
+            wait = Wait(marionette, timeout=30, interval=5,
+                        ignored_exceptions=errors.NoSuchWindowException)
+            window = wait.until(lambda m: m.switch_to_window(42))
+
+        :param marionette: The input value to be provided to
+            conditions, usually a Marionette instance.
+
+        :param timeout: How long to wait for the evaluated condition
+            to become true.  The default timeout is the `timeout`
+            property on the `Marionette` object if set, or
+            `wait.DEFAULT_TIMEOUT`.
+
+        :param interval: How often the condition should be evaluated.
+            In reality the interval may be greater as the cost of
+            evaluating the condition function is not factored in.  The
+            default polling interval is `wait.DEFAULT_INTERVAL`.
+
+        :param ignored_exceptions: Ignore specific types of exceptions
+            whilst waiting for the condition.  Any exceptions not
+            whitelisted will be allowed to propagate, terminating the
+            wait.
+
+        :param clock: Allows overriding the use of the runtime's
+            default time library.  See `wait.SystemClock` for
+            implementation details.
+
+        """
+
+        self.marionette = marionette
+        self.timeout = timeout or (self.marionette.timeout and
+                                   self.marionette.timeout / 1000.0) or DEFAULT_TIMEOUT
+        self.clock = clock or SystemClock()
+        self.end = self.clock.now + self.timeout
+        self.interval = interval
+
+        exceptions = []
+        if ignored_exceptions is not None:
+            if isinstance(ignored_exceptions, collections.Iterable):
+                exceptions.extend(iter(ignored_exceptions))
+            else:
+                exceptions.append(ignored_exceptions)
+        self.exceptions = tuple(set(exceptions))
+
+    def until(self, condition, is_true=None, message=""):
+        """Repeatedly runs condition until its return value evaluates to true,
+        or its timeout expires or the predicate evaluates to true.
+
+        This will poll at the given interval until the given timeout
+        is reached, or the predicate or conditions returns true.  A
+        condition that returns null or does not evaluate to true will
+        fully elapse its timeout before raising an
+        `errors.TimeoutException`.
+
+        If an exception is raised in the condition function and it's
+        not ignored, this function will raise immediately.  If the
+        exception is ignored, it will continue polling for the
+        condition until it returns successfully or a
+        `TimeoutException` is raised.
+
+        :param condition: A callable function whose return value will
+            be returned by this function if it evaluates to true.
+
+        :param is_true: An optional predicate that will terminate and
+            return when it evaluates to False.  It should be a
+            function that will be passed clock and an end time.  The
+            default predicate will terminate a wait when the clock
+            elapses the timeout.
+
+        :param message: An optional message to include in the
+            exception's message if this function times out.
+
+        """
+
+        rv = None
+        last_exc = None
+        until = is_true or until_pred
+        start = self.clock.now
+
+        while not until(self.clock, self.end):
+            try:
+                rv = condition(self.marionette)
+            except (KeyboardInterrupt, SystemExit) as e:
+                raise e
+            except self.exceptions as e:
+                last_exc = sys.exc_info()
+
+            if not rv:
+                self.clock.sleep(self.interval)
+                continue
+
+            if rv is not None:
+                return rv
+
+            self.clock.sleep(self.interval)
+
+        if message:
+            message = " with message: %s" % message
+
+        raise errors.TimeoutException(
+            "Timed out after %s seconds%s" %
+            (round((self.clock.now - start), 1), message if message else ""),
+            cause=last_exc)
+
+def until_pred(clock, end):
+    return clock.now >= end
+
+class SystemClock(object):
+    def __init__(self):
+        self._time = time
+
+    def sleep(self, duration):
+        self._time.sleep(duration)
+
+    @property
+    def now(self):
+        return self._time.time()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/requirements.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/requirements.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/requirements.txt	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/requirements.txt	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1 @@
+marionette-transport == 0.4
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/setup.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/setup.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/driver/setup.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/driver/setup.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,23 @@
+from setuptools import setup, find_packages
+
+version = '0.2'
+
+# dependencies
+with open('requirements.txt') as f:
+    deps = f.read().splitlines()
+
+setup(name='marionette_driver',
+      version=version,
+      description="Marionette Driver",
+      long_description='See http://marionette-driver.readthedocs.org/',
+      classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      keywords='mozilla',
+      author='Auto-tools',
+      author_email='tools-marionette@lists.mozilla.org',
+      url='https://wiki.mozilla.org/Auto-tools/Projects/Marionette',
+      license='MPL',
+      packages=find_packages(),
+      include_package_data=True,
+      zip_safe=False,
+      install_requires=deps,
+      )
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/marionette-frame-manager.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/marionette-frame-manager.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/marionette-frame-manager.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/marionette-frame-manager.js	2015-02-28 15:03:02.000000000 +0000
@@ -16,8 +16,6 @@
 let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
                .getService(Ci.mozIJSSubScriptLoader);
 let specialpowers = {};
-loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
-                     specialpowers);
 
 //list of OOP frames that has the frame script loaded
 let remoteFrames = [];
@@ -108,6 +106,11 @@
     let oopFrame = frameWindow.document.getElementsByTagName("iframe")[message.json.frame]; //find the OOP frame
     let mm = oopFrame.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader.messageManager; //get the OOP frame's mm
 
+    if (!specialpowers.hasOwnProperty("specialPowersObserver")) {
+      loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
+                           specialpowers);
+    }
+
     // See if this frame already has our frame script loaded in it; if so,
     // just wake it up.
     for (let i = 0; i < remoteFrames.length; i++) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/marionette-server.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/marionette-server.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/marionette/marionette-server.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/marionette/marionette-server.js	2015-02-28 15:03:02.000000000 +0000
@@ -26,14 +26,7 @@
 loader.loadSubScript("chrome://marionette/content/atoms.js", utils);
 loader.loadSubScript("chrome://marionette/content/marionette-sendkeys.js", utils);
 
-// SpecialPowers requires insecure automation-only features that we put behind a pref.
-Services.prefs.setBoolPref('security.turn_off_all_security_so_that_viruses_can_take_over_this_computer',
-                           true);
 let specialpowers = {};
-loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
-                     specialpowers);
-specialpowers.specialPowersObserver = new specialpowers.SpecialPowersObserver();
-specialpowers.specialPowersObserver.init();
 
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
@@ -57,6 +50,7 @@
 let bypassOffline = false;
 let qemu = "0";
 let device = null;
+const SECURITY_PREF = 'security.turn_off_all_security_so_that_viruses_can_take_over_this_computer';
 
 XPCOMUtils.defineLazyServiceGetter(this, "cookieManager",
                                    "@mozilla.org/cookiemanager;1",
@@ -164,6 +158,7 @@
   this.currentFrameElement = null;
   this.testName = null;
   this.mozBrowserClose = null;
+  this.enabled_security_pref = false;
   this.sandbox = null;
   this.oopFrameId = null; // frame ID of current remote frame, used for mozbrowserclose events
   this.sessionCapabilities = {
@@ -193,6 +188,7 @@
   };
 
   this.observing = null;
+  this._browserIds = new WeakMap();
 }
 
 MarionetteServerConnection.prototype = {
@@ -587,9 +583,27 @@
     this.command_id = this.getCommandId();
     this.newSessionCommandId = this.command_id;
 
+    // SpecialPowers requires insecure automation-only features that we put behind a pref
+    let security_pref_value = false;
+    try {
+      security_pref_value = Services.prefs.getBoolPref(SECURITY_PREF);
+    } catch(e) {}
+    if (!security_pref_value) {
+      this.enabled_security_pref = true;
+      Services.prefs.setBoolPref(SECURITY_PREF, true);
+    }
+
+    if (!specialpowers.hasOwnProperty('specialPowersObserver')) {
+      loader.loadSubScript("chrome://specialpowers/content/SpecialPowersObserver.js",
+                           specialpowers);
+      specialpowers.specialPowersObserver = new specialpowers.SpecialPowersObserver();
+      specialpowers.specialPowersObserver.init();
+      specialpowers.specialPowersObserver._loadFrameScript();
+    }
+
     this.scriptTimeout = 10000;
     if (aRequest && aRequest.parameters) {
-      this.sessionId = aRequest.parameters.session_id ? aRequest.parameters.session_id : null;
+      this.sessionId = aRequest.parameters.sessionId || aRequest.parameters.session_id || null;
       logger.info("Session Id is set to: " + this.sessionId);
       try {
         this.setSessionCapabilities(aRequest.parameters.capabilities);
@@ -1419,6 +1433,28 @@
     }
   },
 
+  /**
+   * Retrieves a listener id for the given xul browser element. In case
+   * the browser is not known, an attempt is made to retrieve the id from
+   * a CPOW, and null is returned if this fails.
+   */
+  getIdForBrowser: function (browser) {
+    if (browser === null) {
+      return null;
+    }
+    let permKey = browser.permanentKey;
+    if (this._browserIds.has(permKey)) {
+      return this._browserIds.get(permKey);
+    }
+
+    let winId = browser.outerWindowID;
+    if (winId) {
+      winId += "";
+      this._browserIds.set(permKey, winId);
+      return winId;
+    }
+    return null;
+  },
 
   /**
    * Get a list of top-level browsing contexts. On desktop this typically
@@ -1438,12 +1474,8 @@
       if (win.gBrowser && appName != 'B2G') {
         let tabbrowser = win.gBrowser;
         for (let i = 0; i < tabbrowser.browsers.length; ++i) {
-          let contentWindow = tabbrowser.getBrowserAtIndex(i).contentWindowAsCPOW;
-          if (contentWindow !== null) {
-            let winId = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                                     .getInterface(Ci.nsIDOMWindowUtils)
-                                     .outerWindowID;
-            winId += (appName == "B2G") ? "-b2g" : "";
+          let winId = this.getIdForBrowser(tabbrowser.getBrowserAtIndex(i));
+          if (winId !== null) {
             res.push(winId);
           }
         }
@@ -1583,15 +1615,11 @@
       if (win.gBrowser && appName != 'B2G') {
         let tabbrowser = win.gBrowser;
         for (let i = 0; i < tabbrowser.browsers.length; ++i) {
-          let contentWindow = tabbrowser.getBrowserAtIndex(i).contentWindowAsCPOW;
-          if (contentWindow) {
-            let contentWindowId = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                                               .getInterface(Ci.nsIDOMWindowUtils)
-                                               .outerWindowID;
-            contentWindowId += (appName == "B2G") ? "-b2g" : "";
-            if (checkWindow.call(this, win, outerId, contentWindowId, i)) {
-              return;
-            }
+          let browser = tabbrowser.getBrowserAtIndex(i);
+          let contentWindowId = this.getIdForBrowser(browser);
+          if (contentWindowId !== null &&
+              checkWindow.call(this, win, outerId, contentWindowId, i)) {
+            return;
           }
         }
       } else {
@@ -3148,8 +3176,8 @@
         let mainContent = (this.curBrowser.mainContentId == null);
         if (!browserType || browserType != "content") {
           //curBrowser holds all the registered frames in knownFrames
-          let listenerId = message.json.value;
-          reg.id = this.curBrowser.register(this.generateFrameId(listenerId), listenerId);
+          let listenerId = this.generateFrameId(message.json.value);
+          reg.id = this.curBrowser.register(listenerId);
         }
         // set to true if we updated mainContentId
         mainContent = ((mainContent == true) && (this.curBrowser.mainContentId != null));
@@ -3305,6 +3333,7 @@
 
   //register all message listeners
   this.frameManager.addMessageManagerListeners(server.messageManager);
+  this.getIdForBrowser = server.getIdForBrowser.bind(server);
 }
 
 BrowserObj.prototype = {
@@ -3390,25 +3419,21 @@
    *
    * @param string uid
    *        frame uid for use by marionette
-   * @param number id
-   *        incoming window id assigned by gecko
    */
-  register: function BO_register(uid, id) {
+  register: function BO_register(uid) {
     if (this.curFrameId == null) {
       let currWinId = null;
       if (this.browser) {
         // If we're setting up a new session on Firefox, we only process the
         // registration for this frame if it belongs to the tab we've just
         // created.
-        let winAsCPOW = this.browser.getBrowserForTab(this.tab).contentWindowAsCPOW;
-        currWinId = winAsCPOW.QueryInterface(Ci.nsIInterfaceRequestor)
-                             .getInterface(Ci.nsIDOMWindowUtils)
-                             .outerWindowID;
+        let browser = this.browser.getBrowserForTab(this.tab);
+        currWinId = this.getIdForBrowser(browser);
       }
       if ((!this.newSession) ||
           (this.newSession &&
             ((appName != "Firefox") ||
-             id === currWinId))) {
+             uid === currWinId))) {
         this.curFrameId = uid;
         this.mainContentId = uid;
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/browser-test.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/browser-test.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/browser-test.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/browser-test.js	2015-02-28 15:03:02.000000000 +0000
@@ -25,6 +25,9 @@
 XPCOMUtils.defineLazyModuleGetter(this, "ContentSearch",
   "resource:///modules/ContentSearch.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "SelfSupportBackend",
+  "resource:///modules/SelfSupportBackend.jsm");
+
 const SIMPLETEST_OVERRIDES =
   ["ok", "is", "isnot", "ise", "todo", "todo_is", "todo_isnot", "info", "expectAssertions", "requestCompleteLog"];
 
@@ -85,6 +88,12 @@
   }
   if (gConfig.e10s) {
     e10s_init();
+    let globalMM = Cc["@mozilla.org/globalmessagemanager;1"]
+                     .getService(Ci.nsIMessageListenerManager);
+    globalMM.loadFrameScript("chrome://mochikit/content/shutdown-leaks-collector.js", true);
+  } else {
+    // In non-e10s, only run the ShutdownLeaksCollector in the parent process.
+    Components.utils.import("chrome://mochikit/content/ShutdownLeaksCollector.jsm");
   }
 }
 
@@ -523,6 +532,7 @@
             gBrowser.getNotificationBox(browser).remove();
           }
 
+          SelfSupportBackend.uninit();
           CustomizationTabPreloader.uninit();
           SocialFlyout.unload();
           SocialShare.uninit();
@@ -571,6 +581,10 @@
           // and thus get rid of more false leaks like already terminated workers.
           Services.obs.notifyObservers(null, "memory-pressure", "heap-minimize");
 
+          let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
+                       .getService(Ci.nsIMessageBroadcaster);
+          ppmm.broadcastAsyncMessage("browser-test:collect-request");
+
           checkForLeakedGlobalWindows(aResults => {
             if (aResults.length == 0) {
               this.finish();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/jar.mn	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/jar.mn	2015-02-28 15:03:02.000000000 +0000
@@ -10,6 +10,8 @@
   content/cc-analyzer.js (cc-analyzer.js)
   content/chrome-harness.js (chrome-harness.js)
   content/mochitest-e10s-utils.js (mochitest-e10s-utils.js)
+  content/shutdown-leaks-collector.js (shutdown-leaks-collector.js)
+  content/ShutdownLeaksCollector.jsm (ShutdownLeaksCollector.jsm)
   content/harness.xul (harness.xul)
   content/redirect.html (redirect.html)
   content/server.js (server.js)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/mach_commands.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/mach_commands.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/mach_commands.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/mach_commands.py	2015-02-28 15:03:02.000000000 +0000
@@ -256,6 +256,7 @@
             runByDir=False,
             useTestMediaDevices=False,
             timeout=None,
+            max_timeouts=None,
             **kwargs):
         """Runs a mochitest.
 
@@ -393,6 +394,8 @@
         options.useTestMediaDevices = useTestMediaDevices
         if timeout:
             options.timeout = int(timeout)
+        if max_timeouts:
+            options.maxTimeouts = int(max_timeouts)
 
         options.failureFile = failure_file_path
         if install_extension is not None:
@@ -729,6 +732,10 @@
         help='The per-test timeout time in seconds (default: 60 seconds)')
     func = timeout(func)
 
+    max_timeouts = CommandArgument('--max-timeouts', default=None,
+        help='The maximum number of timeouts permitted before halting testing')
+    func = max_timeouts(func)
+
     return func
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/mochitest_options.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/mochitest_options.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/mochitest_options.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/mochitest_options.py	2015-02-28 15:03:02.000000000 +0000
@@ -478,6 +478,12 @@
           "dest": "debuggerInteractive",
           "help": "prevents the test harness from redirecting stdout and stderr for interactive debuggers",
           }],
+        [["--max-timeouts"],
+         { "type": "int",
+           "dest": "maxTimeouts",
+           "help": "maximum number of timeouts permitted before halting testing",
+           "default": None,
+           }],
     ]
 
     def __init__(self, **kwargs):
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/runtests.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/runtests.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/runtests.py	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/runtests.py	2015-02-28 15:03:02.000000000 +0000
@@ -592,6 +592,8 @@
                 self.urlOpts.append("autorun=1")
             if options.timeout:
                 self.urlOpts.append("timeout=%d" % options.timeout)
+            if options.maxTimeouts:
+                self.urlOpts.append("maxTimeouts=%d" % options.maxTimeouts)
             if options.closeWhenDone:
                 self.urlOpts.append("closeWhenDone=1")
             if options.webapprtContent:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/shutdown-leaks-collector.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/shutdown-leaks-collector.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/shutdown-leaks-collector.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/shutdown-leaks-collector.js	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 run this code in a .jsm rather than here to avoid keeping the current
+// compartment alive.
+Components.utils.import("chrome://mochikit/content/ShutdownLeaksCollector.jsm");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/ShutdownLeaksCollector.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/ShutdownLeaksCollector.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/ShutdownLeaksCollector.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/ShutdownLeaksCollector.jsm	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 Ci = Components.interfaces;
+var Cc = Components.classes;
+var Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+
+this.EXPORTED_SYMBOLS = ["ContentCollector"];
+
+// This listens for the message "browser-test:collect-request". When it gets it,
+// it runs some GCs and CCs, then prints out a message indicating the collections
+// are complete. Mochitest uses this information to determine when windows and
+// docshells should be destroyed.
+
+var ContentCollector = {
+  init: function() {
+    let cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]
+                 .getService(Ci.nsISyncMessageSender);
+    cpmm.addMessageListener("browser-test:collect-request", this);
+  },
+
+  receiveMessage: function(aMessage) {
+    switch (aMessage.name) {
+      case "browser-test:collect-request":
+        Services.obs.notifyObservers(null, "memory-pressure", "heap-minimize");
+
+        Cu.forceGC();
+        Cu.forceCC();
+
+        Cu.schedulePreciseShrinkingGC(() => {
+          Cu.forceCC();
+
+          let pid = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).processID;
+          dump("Completed ShutdownLeaks collections in process " + pid + "\n")});
+
+          let cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]
+                       .getService(Ci.nsISyncMessageSender);
+          cpmm.removeMessageListener("browser-test:collect-request", this);
+
+        break;
+    }
+  }
+
+};
+ContentCollector.init();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/ssltunnel/ssltunnel.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/ssltunnel/ssltunnel.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/ssltunnel/ssltunnel.cpp	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/ssltunnel/ssltunnel.cpp	2015-02-28 15:03:02.000000000 +0000
@@ -961,7 +961,7 @@
   PRNetAddr server_addr;
   PR_InitializeNetAddr(PR_IpAddrAny, si->listen_port, &server_addr);
   if (PR_Bind(listen_socket, &server_addr) != PR_SUCCESS) {
-    LOG_ERROR(("failed to bind socket\n"));
+    LOG_ERROR(("failed to bind socket on port %d: error %d\n", si->listen_port, PR_GetError()));
     SignalShutdown();
     return;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html	2015-02-28 15:03:02.000000000 +0000
@@ -190,4 +190,3 @@
 </pre>
 </body>
 </html>
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/tests/SimpleTest/EventUtils.js	2015-02-28 15:03:02.000000000 +0000
@@ -189,12 +189,18 @@
   if (aEvent.fnKey) {
     mval |= nsIDOMWindowUtils.MODIFIER_FN;
   }
+  if (aEvent.fnLockKey) {
+    mval |= nsIDOMWindowUtils.MODIFIER_FNLOCK;
+  }
   if (aEvent.numLockKey) {
     mval |= nsIDOMWindowUtils.MODIFIER_NUMLOCK;
   }
   if (aEvent.scrollLockKey) {
     mval |= nsIDOMWindowUtils.MODIFIER_SCROLLLOCK;
   }
+  if (aEvent.symbolKey) {
+    mval |= nsIDOMWindowUtils.MODIFIER_SYMBOL;
+  }
   if (aEvent.symbolLockKey) {
     mval |= nsIDOMWindowUtils.MODIFIER_SYMBOLLOCK;
   }
@@ -504,106 +510,72 @@
 }
 
 /**
- * isKeypressFiredKey() returns TRUE if the given key should cause keypress
- * event when widget handles the native key event.  Otherwise, FALSE.
- *
- * aDOMKeyCode should be one of consts of nsIDOMKeyEvent::DOM_VK_*, or a key
- * name begins with "VK_", or a character.
- */
-function isKeypressFiredKey(aDOMKeyCode)
-{
-  if (typeof(aDOMKeyCode) == "string") {
-    if (aDOMKeyCode.indexOf("VK_") == 0) {
-      aDOMKeyCode = KeyEvent["DOM_" + aDOMKeyCode];
-      if (!aDOMKeyCode) {
-        throw "Unknown key: " + aDOMKeyCode;
-      }
-    } else {
-      // If the key generates a character, it must cause a keypress event.
-      return true;
-    }
-  }
-  switch (aDOMKeyCode) {
-    case KeyEvent.DOM_VK_SHIFT:
-    case KeyEvent.DOM_VK_CONTROL:
-    case KeyEvent.DOM_VK_ALT:
-    case KeyEvent.DOM_VK_CAPS_LOCK:
-    case KeyEvent.DOM_VK_NUM_LOCK:
-    case KeyEvent.DOM_VK_SCROLL_LOCK:
-    case KeyEvent.DOM_VK_META:
-      return false;
-    default:
-      return true;
-  }
-}
-
-/**
  * Synthesize a key event. It is targeted at whatever would be targeted by an
  * actual keypress by the user, typically the focused element.
  *
- * aKey should be either a character or a keycode starting with VK_ such as
- * VK_RETURN.
+ * aKey should be:
+ *  - key value (recommended).  If you specify a non-printable key name,
+ *    append "KEY_" prefix.  Otherwise, specifying a printable key, the
+ *    key value should be specified.
+ *  - keyCode name starting with "VK_" (e.g., VK_RETURN).  This is available
+ *    only for compatibility with legacy API.  Don't use this with new tests.
  *
  * aEvent is an object which may contain the properties:
- *   shiftKey, ctrlKey, altKey, metaKey, accessKey, type, location
- *
- * Sets one of KeyboardEvent.DOM_KEY_LOCATION_* to location.  Otherwise,
- * DOMWindowUtils will choose good location from the keycode.
- *
- * If the type is specified, a key event of that type is fired. Otherwise,
- * a keydown, a keypress and then a keyup event are fired in sequence.
+ *  - code: If you emulates a physical keyboard's key event, this should be
+ *          specified.
+ *  - repeat: If you emulates auto-repeat, you should set the count of repeat.
+ *            This method will automatically synthesize keydown (and keypress).
+ *  - location: If you want to specify this, you can specify this explicitly.
+ *              However, if you don't specify this value, it will be computed
+ *              from code value.
+ *  - type: Basically, you shouldn't specify this.  Then, this function will
+ *          synthesize keydown (, keypress) and keyup.
+ *          If keydown is specified, this only fires keydown (and keypress if
+ *          it should be fired).
+ *          If keyup is specified, this only fires keyup.
+ *  - altKey, altGraphKey, ctrlKey, capsLockKey, fnKey, fnLockKey, numLockKey,
+ *    metaKey, osKey, scrollLockKey, shiftKey, symbolKey, symbolLockKey:
+ *        Basically, you shouldn't use these attributes.  nsITextInputProcessor
+ *        manages modifier key state when you synthesize modifier key events.
+ *        However, if some of these attributes are true, this function activates
+ *        the modifiers only during dispatching the key events.
+ *        Note that if some of these values are false, they are ignored (i.e.,
+ *        not inactivated with this function).
+ *  - keyCode: Must be 0 - 255 (0xFF). If this is specified explicitly,
+ *             .keyCode value is initialized with this value.
  *
  * aWindow is optional, and defaults to the current window object.
  */
 function synthesizeKey(aKey, aEvent, aWindow)
 {
-  var utils = _getDOMWindowUtils(aWindow);
-  if (utils) {
-    var keyCode = 0, charCode = 0;
-    if (aKey.indexOf("VK_") == 0) {
-      keyCode = KeyEvent["DOM_" + aKey];
-      if (!keyCode) {
-        throw "Unknown key: " + aKey;
-      }
-    } else {
-      charCode = aKey.charCodeAt(0);
-      keyCode = _computeKeyCodeFromChar(aKey.charAt(0));
-    }
-
-    var modifiers = _parseModifiers(aEvent);
-    var flags = 0;
-    if (aEvent.location != undefined) {
-      switch (aEvent.location) {
-        case KeyboardEvent.DOM_KEY_LOCATION_STANDARD:
-          flags |= utils.KEY_FLAG_LOCATION_STANDARD;
-          break;
-        case KeyboardEvent.DOM_KEY_LOCATION_LEFT:
-          flags |= utils.KEY_FLAG_LOCATION_LEFT;
-          break;
-        case KeyboardEvent.DOM_KEY_LOCATION_RIGHT:
-          flags |= utils.KEY_FLAG_LOCATION_RIGHT;
-          break;
-        case KeyboardEvent.DOM_KEY_LOCATION_NUMPAD:
-          flags |= utils.KEY_FLAG_LOCATION_NUMPAD;
-          break;
+  var TIP = _getTIP(aWindow);
+  if (!TIP) {
+    return;
+  }
+  var modifiers = _emulateToActivateModifiers(TIP, aEvent);
+  var keyEventDict = _createKeyboardEventDictionary(aKey, aEvent);
+  var keyEvent = new KeyboardEvent("", keyEventDict.dictionary);
+  var dispatchKeydown =
+    !("type" in aEvent) || aEvent.type === "keydown" || !aEvent.type;
+  var dispatchKeyup =
+    !("type" in aEvent) || aEvent.type === "keyup"   || !aEvent.type;
+
+  try {
+    if (dispatchKeydown) {
+      TIP.keydown(keyEvent, keyEventDict.flags);
+      if ("repeat" in aEvent && aEvent.repeat > 1) {
+        keyEventDict.dictionary.repeat = true;
+        var repeatedKeyEvent = new KeyboardEvent("", keyEventDict.dictionary);
+        for (var i = 1; i < aEvent.repeat; i++) {
+          TIP.keydown(repeatedKeyEvent, keyEventDict.flags);
+        }
       }
     }
-
-    if (!("type" in aEvent) || !aEvent.type) {
-      // Send keydown + (optional) keypress + keyup events.
-      var keyDownDefaultHappened =
-        utils.sendKeyEvent("keydown", keyCode, 0, modifiers, flags);
-      if (isKeypressFiredKey(keyCode) && keyDownDefaultHappened) {
-        utils.sendKeyEvent("keypress", keyCode, charCode, modifiers, flags);
-      }
-      utils.sendKeyEvent("keyup", keyCode, 0, modifiers, flags);
-    } else if (aEvent.type == "keypress") {
-      // Send standalone keypress event.
-      utils.sendKeyEvent(aEvent.type, keyCode, charCode, modifiers, flags);
-    } else {
-      // Send other standalone event than keypress.
-      utils.sendKeyEvent(aEvent.type, keyCode, 0, modifiers, flags);
+    if (dispatchKeyup) {
+      TIP.keyup(keyEvent, keyEventDict.flags);
     }
+  } finally {
+    _emulateToInactivateModifiers(TIP, modifiers);
   }
 }
 
@@ -891,6 +863,279 @@
   return tip;
 }
 
+function _guessKeyNameFromKeyCode(aKeyCode)
+{
+  switch (aKeyCode) {
+    case KeyboardEvent.DOM_VK_CANCEL:
+      return "Cancel";
+    case KeyboardEvent.DOM_VK_HELP:
+      return "Help";
+    case KeyboardEvent.DOM_VK_BACK_SPACE:
+      return "Backspace";
+    case KeyboardEvent.DOM_VK_TAB:
+      return "Tab";
+    case KeyboardEvent.DOM_VK_CLEAR:
+      return "Clear";
+    case KeyboardEvent.DOM_VK_RETURN:
+      return "Enter";
+    case KeyboardEvent.DOM_VK_SHIFT:
+      return "Shift";
+    case KeyboardEvent.DOM_VK_CONTROL:
+      return "Control";
+    case KeyboardEvent.DOM_VK_ALT:
+      return "Alt";
+    case KeyboardEvent.DOM_VK_PAUSE:
+      return "Pause";
+    case KeyboardEvent.DOM_VK_EISU:
+      return "Eisu";
+    case KeyboardEvent.DOM_VK_ESCAPE:
+      return "Escape";
+    case KeyboardEvent.DOM_VK_CONVERT:
+      return "Convert";
+    case KeyboardEvent.DOM_VK_NONCONVERT:
+      return "NonConvert";
+    case KeyboardEvent.DOM_VK_ACCEPT:
+      return "Accept";
+    case KeyboardEvent.DOM_VK_MODECHANGE:
+      return "ModeChange";
+    case KeyboardEvent.DOM_VK_PAGE_UP:
+      return "PageUp";
+    case KeyboardEvent.DOM_VK_PAGE_DOWN:
+      return "PageDown";
+    case KeyboardEvent.DOM_VK_END:
+      return "End";
+    case KeyboardEvent.DOM_VK_HOME:
+      return "Home";
+    case KeyboardEvent.DOM_VK_LEFT:
+      return "ArrowLeft";
+    case KeyboardEvent.DOM_VK_UP:
+      return "ArrowUp";
+    case KeyboardEvent.DOM_VK_RIGHT:
+      return "ArrowRight";
+    case KeyboardEvent.DOM_VK_DOWN:
+      return "ArrowDown";
+    case KeyboardEvent.DOM_VK_SELECT:
+      return "Select";
+    case KeyboardEvent.DOM_VK_PRINT:
+      return "Print";
+    case KeyboardEvent.DOM_VK_EXECUTE:
+      return "Execute";
+    case KeyboardEvent.DOM_VK_PRINTSCREEN:
+      return "PrintScreen";
+    case KeyboardEvent.DOM_VK_INSERT:
+      return "Insert";
+    case KeyboardEvent.DOM_VK_DELETE:
+      return "Delete";
+    case KeyboardEvent.DOM_VK_WIN:
+      return "OS";
+    case KeyboardEvent.DOM_VK_CONTEXT_MENU:
+      return "ContextMenu";
+    case KeyboardEvent.DOM_VK_SLEEP:
+      return "Standby";
+    case KeyboardEvent.DOM_VK_F1:
+      return "F1";
+    case KeyboardEvent.DOM_VK_F2:
+      return "F2";
+    case KeyboardEvent.DOM_VK_F3:
+      return "F3";
+    case KeyboardEvent.DOM_VK_F4:
+      return "F4";
+    case KeyboardEvent.DOM_VK_F5:
+      return "F5";
+    case KeyboardEvent.DOM_VK_F6:
+      return "F6";
+    case KeyboardEvent.DOM_VK_F7:
+      return "F7";
+    case KeyboardEvent.DOM_VK_F8:
+      return "F8";
+    case KeyboardEvent.DOM_VK_F9:
+      return "F9";
+    case KeyboardEvent.DOM_VK_F10:
+      return "F10";
+    case KeyboardEvent.DOM_VK_F11:
+      return "F11";
+    case KeyboardEvent.DOM_VK_F12:
+      return "F12";
+    case KeyboardEvent.DOM_VK_F13:
+      return "F13";
+    case KeyboardEvent.DOM_VK_F14:
+      return "F14";
+    case KeyboardEvent.DOM_VK_F15:
+      return "F15";
+    case KeyboardEvent.DOM_VK_F16:
+      return "F16";
+    case KeyboardEvent.DOM_VK_F17:
+      return "F17";
+    case KeyboardEvent.DOM_VK_F18:
+      return "F18";
+    case KeyboardEvent.DOM_VK_F19:
+      return "F19";
+    case KeyboardEvent.DOM_VK_F20:
+      return "F20";
+    case KeyboardEvent.DOM_VK_F21:
+      return "F21";
+    case KeyboardEvent.DOM_VK_F22:
+      return "F22";
+    case KeyboardEvent.DOM_VK_F23:
+      return "F23";
+    case KeyboardEvent.DOM_VK_F24:
+      return "F24";
+    case KeyboardEvent.DOM_VK_NUM_LOCK:
+      return "NumLock";
+    case KeyboardEvent.DOM_VK_SCROLL_LOCK:
+      return "ScrollLock";
+    case KeyboardEvent.DOM_VK_VOLUME_MUTE:
+      return "VolumeMute";
+    case KeyboardEvent.DOM_VK_VOLUME_DOWN:
+      return "VolumeDown";
+    case KeyboardEvent.DOM_VK_VOLUME_UP:
+      return "VolumeUp";
+    case KeyboardEvent.DOM_VK_META:
+      return "Meta";
+    case KeyboardEvent.DOM_VK_ALTGR:
+      return "AltGraph";
+    case KeyboardEvent.DOM_VK_ATTN:
+      return "Attn";
+    case KeyboardEvent.DOM_VK_CRSEL:
+      return "CrSel";
+    case KeyboardEvent.DOM_VK_EXSEL:
+      return "ExSel";
+    case KeyboardEvent.DOM_VK_EREOF:
+      return "EraseEof";
+    case KeyboardEvent.DOM_VK_PLAY:
+      return "Play";
+    default:
+      return "Unidentified";
+  }
+}
+
+function _createKeyboardEventDictionary(aKey, aKeyEvent)
+{
+  var result = { dictionary: null, flags: 0 };
+
+  var keyCodeIsDefined = "keyCode" in aKeyEvent;
+  var keyCode =
+    (keyCodeIsDefined && aKeyEvent.keyCode >= 0 && aKeyEvent.keyCode <= 255) ?
+      aKeyEvent.keyCode : 0;
+  var keyName = "Unidentified";
+  if (aKey.indexOf("KEY_") == 0) {
+    keyName = aKey.substr("KEY_".length);
+    result.flags |= _EU_Ci.nsITextInputProcessor.KEY_NON_PRINTABLE_KEY;
+  } else if (aKey.indexOf("VK_") == 0) {
+    keyCode = KeyEvent["DOM_" + aKey];
+    if (!keyCode) {
+      throw "Unknown key: " + aKey;
+    }
+    keyName = _guessKeyNameFromKeyCode(keyCode);
+    result.flags |= _EU_Ci.nsITextInputProcessor.KEY_NON_PRINTABLE_KEY;
+  } else if (aKey != "") {
+    keyName = aKey;
+    if (!keyCodeIsDefined) {
+      keyCode = _computeKeyCodeFromChar(aKey.charAt(0));
+    }
+    if (!keyCode) {
+      result.flags |= _EU_Ci.nsITextInputProcessor.KEY_KEEP_KEYCODE_ZERO;
+    }
+    result.flags |= _EU_Ci.nsITextInputProcessor.KEY_FORCE_PRINTABLE_KEY;
+  }
+  var locationIsDefined = "location" in aKeyEvent;
+  if (locationIsDefined && aKeyEvent.location === 0) {
+    result.flags |= _EU_Ci.nsITextInputProcessor.KEY_KEEP_KEY_LOCATION_STANDARD;
+  }
+  result.dictionary = {
+    key: keyName,
+    code: "code" in aKeyEvent ? aKeyEvent.code : "",
+    location: locationIsDefined ? aKeyEvent.location : 0,
+    repeat: "repeat" in aKeyEvent ? aKeyEvent.repeat === true : false,
+    keyCode: keyCode,
+  };
+  return result;
+}
+
+function _emulateToActivateModifiers(aTIP, aKeyEvent)
+{
+  if (!aKeyEvent) {
+    return null;
+  }
+  var modifiers = {
+    normal: [
+      { key: "Alt",        attr: "altKey" },
+      { key: "AltGraph",   attr: "altGraphKey" },
+      { key: "Control",    attr: "ctrlKey" },
+      { key: "Fn",         attr: "fnKey" },
+      { key: "Meta",       attr: "metaKey" },
+      { key: "OS",         attr: "osKey" },
+      { key: "Shift",      attr: "shiftKey" },
+      { key: "Symbol",     attr: "symbolKey" },
+      { key: (navigator.platform.indexOf("Mac") >= 0) ? "Meta" : "Control",
+                           attr: "accelKey" },
+    ],
+    lockable: [
+      { key: "CapsLock",   attr: "capsLockKey" },
+      { key: "FnLock",     attr: "fnLockKey" },
+      { key: "NumLock",    attr: "numLockKey" },
+      { key: "ScrollLock", attr: "scrollLockKey" },
+      { key: "SymbolLock", attr: "symbolLockKey" },
+    ]
+  }
+
+  for (var i = 0; i < modifiers.normal.length; i++) {
+    if (!aKeyEvent[modifiers.normal[i].attr]) {
+      continue;
+    }
+    if (aTIP.getModifierState(modifiers.normal[i].key)) {
+      continue; // already activated.
+    }
+    var event = new KeyboardEvent("", { key: modifiers.normal[i].key });
+    aTIP.keydown(event,
+      aTIP.KEY_NON_PRINTABLE_KEY | aTIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+    modifiers.normal[i].activated = true;
+  }
+  for (var i = 0; i < modifiers.lockable.length; i++) {
+    if (!aKeyEvent[modifiers.lockable[i].attr]) {
+      continue;
+    }
+    if (aTIP.getModifierState(modifiers.lockable[i].key)) {
+      continue; // already activated.
+    }
+    var event = new KeyboardEvent("", { key: modifiers.lockable[i].key });
+    aTIP.keydown(event,
+      aTIP.KEY_NON_PRINTABLE_KEY | aTIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+    aTIP.keyup(event,
+      aTIP.KEY_NON_PRINTABLE_KEY | aTIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+    modifiers.lockable[i].activated = true;
+  }
+  return modifiers;
+}
+
+function _emulateToInactivateModifiers(aTIP, aModifiers)
+{
+  if (!aModifiers) {
+    return;
+  }
+  for (var i = 0; i < aModifiers.normal.length; i++) {
+    if (!aModifiers.normal[i].activated) {
+      continue;
+    }
+    var event = new KeyboardEvent("", { key: aModifiers.normal[i].key });
+    aTIP.keyup(event,
+      aTIP.KEY_NON_PRINTABLE_KEY | aTIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+  }
+  for (var i = 0; i < aModifiers.lockable.length; i++) {
+    if (!aModifiers.lockable[i].activated) {
+      continue;
+    }
+    if (!aTIP.getModifierState(aModifiers.lockable[i].key)) {
+      continue; // who already inactivated this?
+    }
+    var event = new KeyboardEvent("", { key: aModifiers.lockable[i].key });
+    aTIP.keydown(event,
+      aTIP.KEY_NON_PRINTABLE_KEY | aTIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+    aTIP.keyup(event,
+      aTIP.KEY_NON_PRINTABLE_KEY | aTIP.KEY_DONT_DISPATCH_MODIFIER_KEY_EVENT);
+  }
+}
+
 /**
  * Synthesize a composition event.
  *
@@ -903,6 +1148,11 @@
  *                             the composition event.  Note that the |data| is
  *                             ignored if the event type is "compositionstart"
  *                             or "compositioncommitasis".
+ *                             If |key| is specified, the key event may be
+ *                             dispatched.  This can emulates changing
+ *                             composition state caused by key operation.
+ *                             Its key value should start with "KEY_" if the
+ *                             value is non-printable key name defined in D3E.
  * @param aWindow              Optional (If null, current |window| will be used)
  * @param aCallback            Optional (If non-null, use the callback for
  *                             receiving notifications to IME)
@@ -913,15 +1163,32 @@
   if (!TIP) {
     return false;
   }
-  switch (aEvent.type) {
-    case "compositionstart":
-      return TIP.startComposition();
-    case "compositioncommitasis":
-      return TIP.commitComposition();
-    case "compositioncommit":
-      return TIP.commitComposition(aEvent.data);
-    default:
-      return false;
+  var modifiers = _emulateToActivateModifiers(TIP, aEvent.key);
+  var ret = false;
+  var keyEventDict =
+    "key" in aEvent ?
+      _createKeyboardEventDictionary(aEvent.key.key, aEvent.key) :
+      { dictionary: null, flags: 0 };
+  var keyEvent = 
+    "key" in aEvent ?
+      new KeyboardEvent(aEvent.type === "keydown" ? "keydown" : "",
+                        keyEventDict.dictionary) :
+      null;
+  try {
+    switch (aEvent.type) {
+      case "compositionstart":
+        ret = TIP.startComposition(keyEvent, keyEventDict.flags);
+        break;
+      case "compositioncommitasis":
+        ret = TIP.commitComposition(keyEvent, keyEventDict.flags);
+        break;
+      case "compositioncommit":
+        ret = TIP.commitCompositionWith(aEvent.data, keyEvent,
+                                        keyEventDict.flags);
+        break;
+    }
+  } finally {
+    _emulateToInactivateModifiers(TIP, modifiers);
   }
 }
 /**
@@ -941,8 +1208,9 @@
  *                   |           +-- length
  *                   |           +-- attr
  *                   +-- caret
- *                         +-- start
- *                         +-- length
+ *                   |     +-- start
+ *                   |     +-- length
+ *                   +-- key
  *
  *                 Set the composition string to |composition.string|.  Set its
  *                 clauses information to the |clauses| array.
@@ -963,6 +1231,11 @@
  *                 caret.  However, current nsEditor doesn't support wide
  *                 caret, therefore, you should always set 0 now.
  *
+ *                 If |key| is specified, the key event may be dispatched.
+ *                 This can emulates changing composition state caused by key
+ *                 operation.  Its key value should start with "KEY_" if the
+ *                 value is non-printable key name defined in D3E.
+ *
  * @param aWindow  Optional (If null, current |window| will be used)
  * @param aCallback     Optional (If non-null, use the callback for receiving
  *                      notifications to IME)
@@ -1005,7 +1278,21 @@
     TIP.setCaretInPendingComposition(aEvent.caret.start);
   }
 
-  TIP.flushPendingComposition();
+  var modifiers = _emulateToActivateModifiers(TIP, aEvent.key);
+  try {
+    var keyEventDict =
+      "key" in aEvent ?
+        _createKeyboardEventDictionary(aEvent.key.key, aEvent.key) :
+        { dictionary: null, flags: 0 };
+    var keyEvent = 
+      "key" in aEvent ?
+        new KeyboardEvent(aEvent.type === "keydown" ? "keydown" : "",
+                          keyEventDict.dictionary) :
+        null;
+    TIP.flushPendingComposition(keyEvent, keyEventDict.flags);
+  } finally {
+    _emulateToInactivateModifiers(TIP, modifiers);
+  }
 }
 
 // Must be synchronized with nsIDOMWindowUtils.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/tests/SimpleTest/setup.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/tests/SimpleTest/setup.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mochitest/tests/SimpleTest/setup.js	2015-02-19 00:42:07.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mochitest/tests/SimpleTest/setup.js	2015-02-28 15:03:02.000000000 +0000
@@ -146,6 +146,10 @@
   TestRunner.structuredLogger.interactiveDebugger = true;
 }
 
+if (params.maxTimeouts) {
+  TestRunner.maxTimeouts = params.maxTimeouts;
+}
+
 // Log things to the console if appropriate.
 TestRunner.logger.addListener("dumpListener", consoleLevel + "", function(msg) {
   dump(msg.info.join(' ') + "\n");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py	2015-02-28 15:03:02.000000000 +0000
@@ -408,25 +408,20 @@
 
     def pullFile(self, remoteFile, offset=None, length=None):
         # TODO: add debug flags and allow for printing stdout
-        localFile = tempfile.mkstemp()[1]
-        self._runPull(remoteFile, localFile)
-
-        f = open(localFile, 'r')
-
-        # ADB pull does not support offset and length, but we can instead
-        # read only the requested portion of the local file
-        if offset is not None and length is not None:
-            f.seek(offset)
-            ret = f.read(length)
-        elif offset is not None:
-            f.seek(offset)
-            ret = f.read()
-        else:
-            ret = f.read()
-
-        f.close()
-        mozfile.remove(localFile)
-        return ret
+        with mozfile.NamedTemporaryFile() as tf:
+            self._runPull(remoteFile, tf.name)
+            # we need to reopen the file to get the written contents
+            with open(tf.name) as tf2:
+                # ADB pull does not support offset and length, but we can
+                # instead read only the requested portion of the local file
+                if offset is not None and length is not None:
+                    tf2.seek(offset)
+                    return tf2.read(length)
+                elif offset is not None:
+                    tf2.seek(offset)
+                    return tf2.read()
+                else:
+                    return tf2.read()
 
     def getFile(self, remoteFile, localFile):
         self._runPull(remoteFile, localFile)
@@ -445,16 +440,10 @@
         """
         Return the md5 sum of a file on the device
         """
-        localFile = tempfile.mkstemp()[1]
-        localFile = self._runPull(remoteFile, localFile)
-
-        if localFile is None:
-            return None
-
-        md5 = self._getLocalHash(localFile)
-        mozfile.remove(localFile)
+        with tempfile.NamedTemporaryFile() as f:
+            self._runPull(remoteFile, f.name)
 
-        return md5
+            return self._getLocalHash(f.name)
 
     def _setupDeviceRoot(self, deviceRoot):
         # user-specified device root, create it and return it
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozdevice/mozdevice/droid.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozdevice/mozdevice/droid.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozdevice/mozdevice/droid.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozdevice/mozdevice/droid.py	2015-02-28 15:03:02.000000000 +0000
@@ -156,7 +156,13 @@
 
     def getTopActivity(self):
         package = None
-        data = self.shellCheckOutput(["dumpsys", "window", "windows"])
+        data = None
+        try:
+            data = self.shellCheckOutput(["dumpsys", "window", "windows"])
+        except:
+            # dumpsys seems to intermittently fail (seen on 4.3 emulator), producing
+            # no output.
+            return ""
         # "dumpsys window windows" produces many lines of input. The top/foreground
         # activity is indicated by something like:
         #   mFocusedApp=AppWindowToken{483e6db0 token=HistoryRecord{484dcad8 com.mozilla.SUTAgentAndroid/.SUTAgentAndroid}}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozprocess/mozprocess/processhandler.py	2015-02-28 15:03:02.000000000 +0000
@@ -11,7 +11,7 @@
 import threading
 import time
 import traceback
-from Queue import Queue
+from Queue import Queue, Empty
 from datetime import datetime
 __all__ = ['ProcessHandlerMixin', 'ProcessHandler']
 
@@ -40,7 +40,13 @@
     :param env: is the environment to use for the process (defaults to os.environ).
     :param ignore_children: causes system to ignore child processes when True, defaults to False (which tracks child processes).
     :param kill_on_timeout: when True, the process will be killed when a timeout is reached. When False, the caller is responsible for killing the process. Failure to do so could cause a call to wait() to hang indefinitely. (Defaults to True.)
-    :param processOutputLine: function or list of functions to be called for each line of output produced by the process (defaults to None).
+    :param processOutputLine: function or list of functions to be called for
+        each line of output produced by the process (defaults to an empty
+        list).
+    :param processStderrLine: function or list of functions to be called
+        for each line of error output - stderr - produced by the process
+        (defaults to an empty list). If this is not specified, stderr lines
+        will be sent to the *processOutputLine* callbacks.
     :param onTimeout: function or list of functions to be called when the process times out.
     :param onFinish: function or list of functions to be called when the process terminates normally without timing out.
     :param kwargs: additional keyword args to pass directly into Popen.
@@ -594,6 +600,7 @@
                  ignore_children = False,
                  kill_on_timeout = True,
                  processOutputLine=(),
+                 processStderrLine=(),
                  onTimeout=(),
                  onFinish=(),
                  **kwargs):
@@ -602,9 +609,7 @@
         self.cwd = cwd
         self.didTimeout = False
         self._ignore_children = ignore_children
-        self._kill_on_timeout = kill_on_timeout
         self.keywordargs = kwargs
-        self.outThread = None
         self.read_buffer = ''
 
         if env is None:
@@ -612,15 +617,29 @@
         self.env = env
 
         # handlers
-        if callable(processOutputLine):
-            processOutputLine = [processOutputLine]
-        self.processOutputLineHandlers = list(processOutputLine)
-        if callable(onTimeout):
-            onTimeout = [onTimeout]
-        self.onTimeoutHandlers = list(onTimeout)
-        if callable(onFinish):
-            onFinish = [onFinish]
-        self.onFinishHandlers = list(onFinish)
+        def to_callable_list(arg):
+            if callable(arg):
+                arg = [arg]
+            return CallableList(arg)
+
+        processOutputLine = to_callable_list(processOutputLine)
+        processStderrLine = to_callable_list(processStderrLine)
+        onTimeout = to_callable_list(onTimeout)
+        onFinish = to_callable_list(onFinish)
+
+        def on_timeout():
+            self.didTimeout = True
+            if kill_on_timeout:
+                self.kill()
+        onTimeout.insert(0, on_timeout)
+
+        self._stderr = subprocess.STDOUT
+        if processStderrLine:
+            self._stderr = subprocess.PIPE
+        self.reader = ProcessReader(stdout_callback=processOutputLine,
+                                    stderr_callback=processStderrLine,
+                                    finished_callback=onFinish,
+                                    timeout_callback=onTimeout)
 
         # It is common for people to pass in the entire array with the cmd and
         # the args together since this is how Popen uses it.  Allow for that.
@@ -654,11 +673,10 @@
         being killed.
         """
         self.didTimeout = False
-        self.startTime = datetime.now()
 
         # default arguments
         args = dict(stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT,
+                    stderr=self._stderr,
                     cwd=self.cwd,
                     env=self.env,
                     ignore_children=self._ignore_children)
@@ -690,7 +708,7 @@
             self.proc.kill(sig=sig)
 
             # When we kill the the managed process we also have to wait for the
-            # outThread to be finished. Otherwise consumers would have to assume
+            # reader thread to be finished. Otherwise consumers would have to assume
             # that it still has not completely shutdown.
             return self.wait()
         except AttributeError:
@@ -700,36 +718,6 @@
             else:
                 raise
 
-    def readWithTimeout(self, f, timeout):
-        """
-        Try to read a line of output from the file object *f*.
-
-        *f* must be a  pipe, like the *stdout* member of a subprocess.Popen
-        object created with stdout=PIPE. If no output
-        is received within *timeout* seconds, return a blank line.
-
-        Returns a tuple (line, did_timeout), where *did_timeout* is True
-        if the read timed out, and False otherwise.
-        """
-        # Calls a private member because this is a different function based on
-        # the OS
-        return self._readWithTimeout(f, timeout)
-
-    def processOutputLine(self, line):
-        """Called for each line of output that a process sends to stdout/stderr."""
-        for handler in self.processOutputLineHandlers:
-            handler(line)
-
-    def onTimeout(self):
-        """Called when a process times out."""
-        for handler in self.onTimeoutHandlers:
-            handler()
-
-    def onFinish(self):
-        """Called when a process finishes without a timeout."""
-        for handler in self.onFinishHandlers:
-            handler()
-
     def poll(self):
         """Check if child process has terminated
 
@@ -739,10 +727,10 @@
         - '0' if the process ended without failures
 
         """
-        # Ensure that we first check for the outputThread status. Otherwise
+        # Ensure that we first check for the reader status. Otherwise
         # we might mark the process as finished while output is still getting
         # processed.
-        if self.outThread and self.outThread.isAlive():
+        if self.reader.is_alive():
             return None
         elif hasattr(self.proc, "returncode"):
             return self.proc.returncode
@@ -760,43 +748,15 @@
         for that number of seconds without producing any output before
         being killed.
         """
-        def _processOutput():
-            self.didTimeout = False
-            logsource = self.proc.stdout
-
-            lineReadTimeout = None
-            if timeout:
-                lineReadTimeout = timeout - (datetime.now() - self.startTime).seconds
-            elif outputTimeout:
-                lineReadTimeout = outputTimeout
-
-            (lines, self.didTimeout) = self.readWithTimeout(logsource, lineReadTimeout)
-            while lines != "":
-                for line in lines.splitlines():
-                    self.processOutputLine(line.rstrip())
-
-                if self.didTimeout:
-                    break
-
-                if timeout:
-                    lineReadTimeout = timeout - (datetime.now() - self.startTime).seconds
-                (lines, self.didTimeout) = self.readWithTimeout(logsource, lineReadTimeout)
-
-            if self.didTimeout:
-                if self._kill_on_timeout:
-                    self.proc.kill()
-                self.onTimeout()
-            else:
-                self.onFinish()
-
+        # this method is kept for backward compatibility
         if not hasattr(self, 'proc'):
-            self.run()
-
-        if not self.outThread:
-            self.outThread = threading.Thread(target=_processOutput)
-            self.outThread.daemon = True
-            self.outThread.start()
-
+            self.run(timeout=timeout, outputTimeout=outputTimeout)
+            # self.run will call this again
+            return
+        if not self.reader.is_alive():
+            self.reader.timeout = timeout
+            self.reader.output_timeout = outputTimeout
+            self.reader.start(self.proc)
 
     def wait(self, timeout=None):
         """
@@ -813,12 +773,12 @@
         - '0' if the process ended without failures
 
         """
-        if self.outThread and self.outThread is not threading.current_thread():
-            # Thread.join() blocks the main thread until outThread is finished
+        if self.reader.thread and self.reader.thread is not threading.current_thread():
+            # Thread.join() blocks the main thread until the reader thread is finished
             # wake up once a second in case a keyboard interrupt is sent
             count = 0
-            while self.outThread.isAlive():
-                self.outThread.join(timeout=1)
+            while self.reader.is_alive():
+                self.reader.thread.join(timeout=1)
                 count += 1
                 if timeout and count > timeout:
                     return None
@@ -832,77 +792,114 @@
                              "use ProcessHandler.wait() instead"
         return self.wait(timeout=timeout)
 
-
-    ### Private methods from here on down. Thar be dragons.
-
-    if isWin:
-        # Windows Specific private functions are defined in this block
-        PeekNamedPipe = ctypes.windll.kernel32.PeekNamedPipe
-        GetLastError = ctypes.windll.kernel32.GetLastError
-
-        @staticmethod
-        def _normalize_newline(line):
-            # adb on windows returns \r\r\n at the end of each line, to get around
-            # this normalize all newlines to have a unix-style '\n'
-            # http://src.chromium.org/viewvc/chrome/trunk/src/build/android/pylib/android_commands.py#l1944
-            return re.sub(r'\r+\n?$', '\n', line)
-
-        def _readWithTimeout(self, f, timeout):
-            if timeout is None:
-                # shortcut to allow callers to pass in "None" for no timeout.
-                return (self._normalize_newline(f.readline()), False)
-            x = msvcrt.get_osfhandle(f.fileno())
-            l = ctypes.c_long()
-            done = time.time() + timeout
-            while time.time() < done:
-                if self.PeekNamedPipe(x, None, 0, None, ctypes.byref(l), None) == 0:
-                    err = self.GetLastError()
-                    if err == 38 or err == 109: # ERROR_HANDLE_EOF || ERROR_BROKEN_PIPE
-                        return ('', False)
-                    else:
-                        raise OSError("readWithTimeout got error: %d", err)
-                if l.value > 0:
-                    # we're assuming that the output is line-buffered,
-                    # which is not unreasonable
-                    return (self._normalize_newline(f.readline()), False)
-                time.sleep(0.01)
-            return ('', True)
-
-    else:
-        # Generic
-        def _readWithTimeout(self, f, timeout):
-            while True:
-                try:
-                    (r, w, e) = select.select([f], [], [], timeout)
-                except:
-                    # return a blank line
-                    return ('', True)
-
-                if len(r) == 0:
-                    return ('', True)
-
-                output = os.read(f.fileno(), 4096)
-                if not output:
-                    output = self.read_buffer
-                    self.read_buffer = ''
-                    return (output, False)
-                self.read_buffer += output
-                if '\n' not in self.read_buffer:
-                    time.sleep(0.01)
-                    continue
-                tmp = self.read_buffer.split('\n')
-                lines, self.read_buffer = tmp[:-1], tmp[-1]
-                real_lines = [x for x in lines if x != '']
-                if not real_lines:
-                    time.sleep(0.01)
-                    continue
-                break
-            return ('\n'.join(lines), False)
-
     @property
     def pid(self):
         return self.proc.pid
 
+class CallableList(list):
+    def __call__(self, *args, **kwargs):
+        for e in self:
+            e(*args, **kwargs)
+
+    def __add__(self, lst):
+        return CallableList(list.__add__(self, lst))
+
+class ProcessReader(object):
+    def __init__(self, stdout_callback=None, stderr_callback=None,
+                 finished_callback=None, timeout_callback=None,
+                 timeout=None, output_timeout=None):
+        self.stdout_callback = stdout_callback or (lambda line: True)
+        self.stderr_callback = stderr_callback or (lambda line: True)
+        self.finished_callback = finished_callback or (lambda: True)
+        self.timeout_callback = timeout_callback or (lambda: True)
+        self.timeout = timeout
+        self.output_timeout = output_timeout
+        self.thread = None
+
+    def _create_stream_reader(self, name, stream, queue, callback):
+        thread = threading.Thread(name=name,
+                                  target=self._read_stream,
+                                  args=(stream, queue, callback))
+        thread.daemon = True
+        thread.start()
+        return thread
+
+    def _read_stream(self, stream, queue, callback):
+        while True:
+            line = stream.readline()
+            if not line:
+                break
+            queue.put((line, callback))
+        stream.close()
+
+    def start(self, proc):
+        queue = Queue()
+        stdout_reader = None
+        if proc.stdout:
+            stdout_reader = self._create_stream_reader('ProcessReaderStdout',
+                                                       proc.stdout,
+                                                       queue,
+                                                       self.stdout_callback)
+        stderr_reader = None
+        if proc.stderr and proc.stderr != proc.stdout:
+            stderr_reader = self._create_stream_reader('ProcessReaderStderr',
+                                                       proc.stderr,
+                                                       queue,
+                                                       self.stderr_callback)
+        self.thread = threading.Thread(name='ProcessReader',
+                                       target=self._read,
+                                       args=(stdout_reader,
+                                             stderr_reader,
+                                             queue))
+        self.thread.daemon = True
+        self.thread.start()
+
+    def _read(self, stdout_reader, stderr_reader, queue):
+        start_time = time.time()
+        timed_out = False
+        timeout = self.timeout
+        if timeout is not None:
+            timeout += start_time
+        output_timeout = self.output_timeout
+        if output_timeout is not None:
+            output_timeout += start_time
+
+        while (stdout_reader and stdout_reader.is_alive()) \
+              or (stderr_reader and stderr_reader.is_alive()):
+            has_line = True
+            try:
+                line, callback = queue.get(True, 0.02)
+            except Empty:
+                has_line = False
+            now = time.time()
+            if not has_line:
+                if output_timeout is not None and now > output_timeout:
+                    timed_out = True
+                    break
+            else:
+                if output_timeout is not None:
+                    output_timeout = now + self.output_timeout
+                callback(line.rstrip())
+            if timeout is not None and now > timeout:
+                timed_out = True
+                break
+        # process remaining lines to read
+        while not queue.empty():
+            line, callback = queue.get(False)
+            callback(line.rstrip())
+        if timed_out:
+            self.timeout_callback()
+        if stdout_reader:
+            stdout_reader.join()
+        if stderr_reader:
+            stderr_reader.join()
+        if not timed_out:
+            self.finished_callback()
+
+    def is_alive(self):
+        if self.thread:
+            return self.thread.is_alive()
+        return False
 
 ### default output handlers
 ### these should be callables that take the output line
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozprocess/tests/manifest.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozprocess/tests/manifest.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozprocess/tests/manifest.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozprocess/tests/manifest.ini	2015-02-28 15:03:02.000000000 +0000
@@ -15,3 +15,4 @@
 [test_mozprocess_wait.py]
 [test_mozprocess_output.py]
 [test_mozprocess_params.py]
+[test_process_reader.py]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozprocess/tests/test_process_reader.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozprocess/tests/test_process_reader.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozbase/mozprocess/tests/test_process_reader.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozbase/mozprocess/tests/test_process_reader.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,95 @@
+import unittest
+import subprocess
+import sys
+from mozprocess.processhandler import ProcessReader, StoreOutput
+
+def run_python(str_code, stdout=subprocess.PIPE, stderr=subprocess.PIPE):
+    cmd = [sys.executable, '-c', str_code]
+    return subprocess.Popen(cmd, stdout=stdout, stderr=stderr)
+
+class TestProcessReader(unittest.TestCase):
+    def setUp(self):
+        self.out = StoreOutput()
+        self.err = StoreOutput()
+        self.finished = False
+        def on_finished():
+            self.finished = True
+        self.timeout = False
+        def on_timeout():
+            self.timeout = True
+        self.reader = ProcessReader(stdout_callback=self.out,
+                                    stderr_callback=self.err,
+                                    finished_callback=on_finished,
+                                    timeout_callback=on_timeout)
+
+    def test_stdout_callback(self):
+        proc = run_python('print 1; print 2')
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(self.out.output, ['1', '2'])
+        self.assertEqual(self.err.output, [])
+
+    def test_stderr_callback(self):
+        proc = run_python('import sys; sys.stderr.write("hello world\\n")')
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(self.out.output, [])
+        self.assertEqual(self.err.output, ['hello world'])
+
+    def test_stdout_and_stderr_callbacks(self):
+        proc = run_python('import sys; sys.stderr.write("hello world\\n"); print 1; print 2')
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(self.out.output, ['1', '2'])
+        self.assertEqual(self.err.output, ['hello world'])
+
+    def test_finished_callback(self):
+        self.assertFalse(self.finished)
+        proc = run_python('')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertTrue(self.finished)
+
+    def test_timeout(self):
+        self.reader.timeout = 0.05
+        self.assertFalse(self.timeout)
+        proc = run_python('import time; time.sleep(0.1)')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertTrue(self.timeout)
+        self.assertFalse(self.finished)
+
+    def test_output_timeout(self):
+        self.reader.output_timeout = 0.05
+        self.assertFalse(self.timeout)
+        proc = run_python('import time; time.sleep(0.1)')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertTrue(self.timeout)
+        self.assertFalse(self.finished)
+
+    def test_read_without_eol(self):
+        proc = run_python('import sys; sys.stdout.write("1")')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertEqual(self.out.output, ['1'])
+
+    def test_read_with_strange_eol(self):
+        proc = run_python('import sys; sys.stdout.write("1\\r\\r\\r\\n")')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertEqual(self.out.output, ['1'])
+
+    def test_mixed_stdout_stderr(self):
+        proc = run_python('import sys; sys.stderr.write("hello world\\n"); print 1; print 2', stderr=subprocess.STDOUT)
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(sorted(self.out.output), sorted(['1', '2', 'hello world']))
+        self.assertEqual(self.err.output, [])
+
+if __name__ == '__main__':
+    unittest.main()
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozharness/mozharness.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozharness/mozharness.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/mozharness/mozharness.json	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/mozharness/mozharness.json	2015-02-28 15:03:02.000000000 +0000
@@ -1,4 +1,4 @@
 {
     "repo": "https://hg.mozilla.org/build/mozharness",
-    "revision": "production"
+    "revision": "21f00dd7bda6"
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/profiles/prefs_general.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/profiles/prefs_general.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/profiles/prefs_general.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/profiles/prefs_general.js	2015-02-28 15:03:02.000000000 +0000
@@ -50,6 +50,7 @@
 user_pref("dom.w3c_touch_events.enabled", 1);
 user_pref("dom.undo_manager.enabled", true);
 user_pref("dom.webcomponents.enabled", true);
+user_pref("dom.htmlimports.enabled", true);
 user_pref("dom.animations-api.core.enabled", true);
 // Set a future policy version to avoid the telemetry prompt.
 user_pref("toolkit.telemetry.prompted", 999);
@@ -229,6 +230,11 @@
 // We want to collect telemetry, but we don't want to send in the results.
 user_pref('toolkit.telemetry.server', 'https://%(server)s/telemetry-dummy/');
 
+// A couple of preferences with default values to test that telemetry preference
+// watching is working.
+user_pref('toolkit.telemetry.test.pref1', true);
+user_pref('toolkit.telemetry.test.pref2', false);
+
 // We don't want to hit the real Firefox Accounts server for tests.  We don't
 // actually need a functioning FxA server, so just set it to something that
 // resolves and accepts requests, even if they all fail.
@@ -281,6 +287,9 @@
 user_pref("browser.search.isUS", true);
 user_pref("browser.search.countryCode", "US");
 
+// Make sure the self support tab doesn't hit the network.
+user_pref("browser.selfsupport.url", "https://%(server)s/selfsupport-dummy/");
+
 user_pref("media.eme.enabled", true);
 user_pref("media.eme.apiVisible", true);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/specialpowers/content/SpecialPowersObserverAPI.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/specialpowers/content/SpecialPowersObserverAPI.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/specialpowers/content/SpecialPowersObserverAPI.js	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/specialpowers/content/SpecialPowersObserverAPI.js	2015-02-28 15:03:02.000000000 +0000
@@ -16,13 +16,15 @@
 /**
  * Special Powers Exception - used to throw exceptions nicely
  **/
-function SpecialPowersException(aMsg) {
+this.SpecialPowersException = function SpecialPowersException(aMsg) {
   this.message = aMsg;
   this.name = "SpecialPowersException";
 }
 
-SpecialPowersException.prototype.toString = function() {
-  return this.name + ': "' + this.message + '"';
+SpecialPowersException.prototype = {
+  toString: function SPE_toString() {
+    return this.name + ': "' + this.message + '"';
+  }
 };
 
 this.SpecialPowersObserverAPI = function SpecialPowersObserverAPI() {
@@ -415,6 +417,7 @@
         sb.addMessageListener = (name, listener) => {
           this._chromeScriptListeners.push({ id: id, name: name, listener: listener });
         };
+        sb.browserElement = aMessage.target;
 
         // Also expose assertion functions
         let reporter = function (err, message, stack) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/talos/talos.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/talos/talos.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/talos/talos.json	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/talos/talos.json	2015-02-28 15:03:02.000000000 +0000
@@ -1,11 +1,11 @@
 {
     "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.f3179facd945.zip",
+        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.0f48d2fb3fe3.zip",
         "path": ""
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "3edc0c98940e"
+        "talos_revision": "0f48d2fb3fe3"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/README.md thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/README.md
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/README.md	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/README.md	2015-02-28 15:03:02.000000000 +0000
@@ -1,5 +1,16 @@
 # Taskcluster + Gecko Integration
 
+## Directory structure:
+
+  - tasks/  : All task definitions
+
+  - tests/  : Tests for the mach target internals related to task graph
+              generation
+
+  - scripts : Various scripts used by taskcluster docker images and
+              utilities these exist in tree primarily to avoid rebuilding
+              docker images.
+
 ## Task conventions
 
 In order to properly enable task reuse there are a small number of
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/build-b2g-desktop.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/build-b2g-desktop.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/build-b2g-desktop.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/build-b2g-desktop.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,43 @@
+#!/bin/bash -ex
+
+################################### build.sh ###################################
+# Ensure all the scripts in this dir are on the path....
+DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+PATH=$DIRNAME:$PATH
+
+. desktop-setup.sh
+
+### Clone gaia
+pull-gaia.sh $GECKO_DIR $GAIA_DIR
+
+# Ensure symlink has been created to gaia...
+rm -f $GECKO_DIR/gaia
+ln -s $GAIA_DIR $GECKO_DIR/gaia
+
+cd $GECKO_DIR
+./mach build;
+
+### Make package
+cd $MOZ_OBJDIR
+make package package-tests;
+
+### Extract artifacts
+# Navigate to dist/ folder
+cd $MOZ_OBJDIR/dist
+ls -lah $MOZ_OBJDIR/dist/
+
+# Target names are cached so make sure we discard them first if found.
+rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target.tests.zip
+
+# Artifacts folder is outside of the cache.
+mkdir -p $HOME/artifacts/
+
+# Discard version numbers from packaged files, they just make it hard to write
+# the right filename in the task payload where artifacts are declared
+mv *.linux-x86_64.tar.bz2   $HOME/artifacts/target.linux-x86_64.tar.bz2
+mv *.linux-x86_64.json      $HOME/artifacts/target.linux-x86_64.json
+mv *.tests.zip              $HOME/artifacts/target.tests.zip
+
+ccache -s
+
+################################### build.sh ###################################
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/build-emulator.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/build-emulator.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/build-emulator.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/build-emulator.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,66 @@
+#! /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
+
+. 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
+
+debug_flag=""
+if [ 0$B2G_DEBUG -ne 0 ]; then
+  debug_flag='--debug'
+fi
+
+./mozharness/scripts/b2g_build.py \
+  --config b2g/taskcluster-emulator.py \
+  "$debug_flag" \
+  --disable-mock \
+  --work-dir=$WORKSPACE/B2G \
+  --log-level=debug \
+  --target=$TARGET \
+  --b2g-config-dir=$TARGET \
+  --checkout-revision=$GECKO_HEAD_REV \
+  --base-repo=$GECKO_BASE_REPOSITORY \
+  --repo=$GECKO_HEAD_REPOSITORY
+
+# Move files into artifact locations!
+mkdir -p $HOME/artifacts
+
+ls -lah $WORKSPACE/B2G/out
+ls -lah $WORKSPACE/B2G/objdir-gecko/dist/
+
+mv $WORKSPACE/B2G/sources.xml $HOME/artifacts/sources.xml
+mv $WORKSPACE/B2G/out/target/product/generic/tests/gaia-tests.zip $HOME/artifacts/gaia-tests.zip
+mv $WORKSPACE/B2G/out/target/product/generic/tests/b2g-*.zip $HOME/artifacts/b2g-tests.zip
+mv $WORKSPACE/B2G/out/emulator.tar.gz $HOME/artifacts/emulator.tar.gz
+mv $WORKSPACE/B2G/objdir-gecko/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
+
+ccache -s
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/build-mulet-linux.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/build-mulet-linux.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/build-mulet-linux.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/build-mulet-linux.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,38 @@
+#!/bin/bash -ex
+
+################################### build-mulet-linux.sh ###################################
+# Ensure all the scripts in this dir are on the path....
+DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+PATH=$DIRNAME:$PATH
+
+. desktop-setup.sh
+
+cd $GECKO_DIR
+./mach build;
+
+### Make package
+cd $MOZ_OBJDIR;
+make package package-tests;
+
+### Extract artifacts
+# Navigate to dist/ folder
+cd $MOZ_OBJDIR/dist;
+
+ls -lah $MOZ_OBJDIR/dist/
+
+# Target names are cached so make sure we discard them first if found.
+rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target.tests.zip
+
+# Artifacts folder is outside of the cache.
+mkdir -p $HOME/artifacts/
+
+# Discard version numbers from packaged files, they just make it hard to write
+# the right filename in the task payload where artifacts are declared
+mv *.linux-x86_64.tar.bz2   $HOME/artifacts/target.linux-x86_64.tar.bz2
+mv *.linux-x86_64.json      $HOME/artifacts/target.linux-x86_64.json
+mv *.tests.zip              $HOME/artifacts/target.tests.zip
+mv jsshell-linux-x86_64.zip $HOME/artifacts/jsshell-linux-x86_64.zip
+
+ccache -s
+
+################################### build.sh ###################################
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/desktop-setup.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/desktop-setup.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/desktop-setup.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/desktop-setup.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash -ex
+
+test $MOZCONFIG # mozconfig is required...
+test -d $1 # workspace must exist at this point...
+WORKSPACE=$( cd "$1" && pwd )
+
+. setup-ccache.sh
+
+# Gecko source:
+export GECKO_DIR=$WORKSPACE/gecko
+# Gaia source:
+export GAIA_DIR=$WORKSPACE/gaia
+# Mozbuild config:
+export MOZBUILD_STATE_PATH=$WORKSPACE/mozbuild/
+
+# Create .mozbuild so mach doesn't complain about this
+mkdir -p $MOZBUILD_STATE_PATH
+
+### Install package dependencies
+install-packages.sh $GECKO_DIR
+
+# Ensure object-folder exists
+export MOZ_OBJDIR=$(get-objdir.py $GECKO_DIR $WORKSPACE/object-folder/)
+mkdir -p $MOZ_OBJDIR
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/gaia_props.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/gaia_props.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/gaia_props.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/gaia_props.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,41 @@
+#! /usr/bin/env python
+
+'''
+Command line interface to fetch details from the b2g/config/gaia.json properties
+file used to link a particular version of gaia to gecko.
+'''
+
+import argparse
+import os
+import json
+import sys
+import urlparse
+
+parser = argparse.ArgumentParser(
+    description='Get various information about gaia version tied to particular \
+    gecko')
+
+parser.add_argument('gecko', metavar="GECKO_DIR", help="Path to gecko revision")
+parser.add_argument('prop', help="Property type",
+                    choices=['repository', 'revision'])
+
+args = parser.parse_args()
+
+if not os.path.isdir(args.gecko):
+        print >> sys.stderr, 'Given gecko path is not a directory'
+        sys.exit(1)
+
+props_path = os.path.join(args.gecko, 'b2g/config/gaia.json')
+
+if not os.path.isfile(props_path):
+        print >> sys.stderr, \
+            'Gecko directory does not contain b2g/config/gaia.json'
+        sys.exit(1)
+
+props = json.load(open(props_path))
+
+if args.prop == 'revision':
+    print(props['revision']);
+
+if args.prop == 'repository':
+    print(urlparse.urljoin('https://hg.mozilla.org', props['repo_path']))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/get-objdir.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/get-objdir.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/get-objdir.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/get-objdir.py	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+import sys
+import os
+import json
+import subprocess
+from StringIO import StringIO
+
+gecko_dir = sys.argv[1]
+os.chdir(gecko_dir)
+
+result = subprocess.check_output(["./mach", "environment", "--format", "json"])
+environment = json.load(StringIO(result))
+
+topobjdir = environment["mozconfig"]["topobjdir"]
+if topobjdir is None:
+    topobjdir = sys.argv[2]
+
+print(topobjdir)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/install-packages.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/install-packages.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/install-packages.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/install-packages.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,27 @@
+#!/bin/bash -vex
+
+gecko_dir=$1
+test -d $gecko_dir
+
+if [ ! -d "$gecko_dir/gcc" ]; then
+  cd $gecko_dir
+  curl https://s3-us-west-2.amazonaws.com/test-caching/packages/gcc.tar.xz | tar Jx
+  cd -
+fi
+
+if [ ! -d "$gecko_dir/sccache" ]; then
+  cd $gecko_dir
+  curl https://s3-us-west-2.amazonaws.com/test-caching/packages/sccache.tar.bz2 | tar jx
+  cd -
+fi
+
+# Remove cached moztt directory if it exists when a user supplied a git url/revision
+if [ ! -z $MOZTT_GIT_URL ] || [ ! -z $MOZTT_REVISION ]; then
+  echo "Removing cached moztt package"
+  rm -rf moztt
+fi
+
+moztt_url=${MOZTT_GIT_URL:=https://github.com/mozilla-b2g/moztt}
+moztt_revision=${MOZTT_REVISION:=master}
+
+tc-vcs checkout $gecko_dir/moztt $moztt_url $moztt_url $moztt_revision
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/pull-gaia.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/pull-gaia.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/pull-gaia.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/pull-gaia.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,9 @@
+#! /bin/bash -e
+
+gecko_dir=$1
+target=$2
+
+gaia_repo=$(gaia_props.py $gecko_dir repository)
+gaia_rev=$(gaia_props.py $gecko_dir revision)
+
+tc-vcs checkout $target $gaia_repo $gaia_repo $gaia_rev
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/setup-ccache.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/setup-ccache.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/builder/setup-ccache.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/builder/setup-ccache.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,9 @@
+#! /bin/bash -ex
+
+test -d $1 # workspace must exist at this point...
+WORKSPACE=$( cd "$1" && pwd )
+
+export CCACHE_DIR=$WORKSPACE/ccache
+
+ccache -M 12G
+ccache -s
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/copy.sh thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/copy.sh
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/scripts/copy.sh	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/scripts/copy.sh	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,9 @@
+#! /bin/bash -ex
+
+# This script copies the contents of the "scripts" folder into a docker
+# container using tar/untar the container id must be passed.
+
+DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+docker exec $1 mkdir -p $2
+cd $DIRNAME
+tar -cv * | docker exec -i $1 tar -x -C $2
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/taskcluster_graph/commit_parser.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/taskcluster_graph/commit_parser.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/taskcluster_graph/commit_parser.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/taskcluster_graph/commit_parser.py	2015-02-28 15:03:02.000000000 +0000
@@ -167,9 +167,14 @@
 
     # shlex used to ensure we split correctly when giving values to argparse.
     parts = shlex.split(message)
+    try_idx = None
+    for idx, part in enumerate(parts):
+        if part == TRY_DELIMITER:
+            try_idx = idx
+            break
 
-    if parts[0] != TRY_DELIMITER:
-        raise InvalidCommitException('Invalid commit format must start with' +
+    if try_idx is None:
+        raise InvalidCommitException('Invalid commit format contain ' +
                 TRY_DELIMITER)
 
     # Argument parser based on try flag flags
@@ -177,7 +182,7 @@
     parser.add_argument('-b', dest='build_types')
     parser.add_argument('-p', nargs='?', dest='platforms', const='all', default='all')
     parser.add_argument('-u', nargs='?', dest='tests', const='all', default='all')
-    args, unknown = parser.parse_known_args(parts[1:])
+    args, unknown = parser.parse_known_args(parts[try_idx:])
 
     # Then builds...
     if args.build_types is None:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,35 @@
+---
+# For complete sample of all build and test jobs,
+# see <gecko>/testing/taskcluster/tasks/job_flags.yml
+
+$inherits:
+  from: tasks/branches/base_job_flags.yml
+
+builds:
+  flame-kk:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_opt.yml
+  flame-kk-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_eng.yml
+
+tests:
+  gaia-build:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_opt.yml:
+        task: tasks/tests/b2g_build_test.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/b2g_build_test.yml
+  gaia-linter:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_opt.yml:
+        task: tasks/tests/b2g_linter.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/b2g_linter.yml
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/branches/cypress/job_flags.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/branches/cypress/job_flags.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/branches/cypress/job_flags.yml	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/branches/cypress/job_flags.yml	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,35 @@
+---
+# For complete sample of all build and test jobs,
+# see <gecko>/testing/taskcluster/tasks/job_flags.yml
+
+$inherits:
+  from: tasks/branches/base_job_flags.yml
+
+builds:
+  flame-kk:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_opt.yml
+  flame-kk-eng:
+    platforms:
+      - b2g
+    types:
+      opt:
+        task: tasks/builds/b2g_flame_kk_eng.yml
+
+tests:
+  gaia-build:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_opt.yml:
+        task: tasks/tests/b2g_build_test.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/b2g_build_test.yml
+  gaia-linter:
+    allowed_build_tasks:
+      tasks/builds/b2g_flame_kk_opt.yml:
+        task: tasks/tests/b2g_linter.yml
+      tasks/builds/b2g_flame_kk_eng.yml:
+        task: tasks/tests/b2g_linter.yml
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_base.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_base.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_base.yml	2015-02-28 15:03:02.000000000 +0000
@@ -6,22 +6,19 @@
     description: B2G Desktop {{build_type}}
 
   workerType: b2gbuild-desktop
-  scopes:
-    - 'docker-worker:cache:sources-gecko'
-    - 'docker-worker:cache:sources-gaia'
-
   payload:
-    cache:
-      sources-gaia: '/home/worker/gaia'
-      sources-gecko: '/home/worker/gecko'
-
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'
       MOZTT_GIT_URL: '{{moztt_git_url}}'
       MOZTT_REVISION: '{{moztt_revision}}'
 
     command:
-      - bin/build-b2g-desktop.sh
+      - /bin/bash
+      - -c
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
+        buildbot_step 'Build' ./build-b2g-desktop.sh $HOME/workspace
 
   extra:
     treeherder:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_debug.yml	2015-02-28 15:03:02.000000000 +0000
@@ -5,11 +5,7 @@
 
 task:
   scopes:
-      - 'docker-worker:cache:build-b2g-desktop-objects-debug'
-
-  payload:
-    cache:
-        build-b2g-desktop-objects-debug: '/home/worker/object-folder'
+      - 'docker-worker:cache:workspace-b2g-desktop-objects-debug'
 
   extra:
     treeherder:
@@ -17,5 +13,7 @@
         debug: true
 
   payload:
+    cache:
+      workspace-b2g-desktop-objects-debug: '/home/worker/workspace'
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/debug'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_desktop_opt.yml	2015-02-28 15:03:02.000000000 +0000
@@ -5,12 +5,11 @@
 
 task:
   scopes:
-      - 'docker-worker:cache:build-b2g-desktop-objects-opt'
+      - 'docker-worker:cache:workspace-b2g-desktop-objects-opt'
 
   payload:
     cache:
-        build-b2g-desktop-objects-opt: '/home/worker/object-folder'
+      workspace-b2g-desktop-objects-opt: '/home/worker/workspace'
 
-  payload:
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_base.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_base.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_base.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_base.yml	2015-02-28 15:03:02.000000000 +0000
@@ -14,7 +14,12 @@
     maxRunTime: 14400
 
     command:
-      - build-emulator.sh
+      - /bin/bash
+      - -c
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
+        buildbot_step 'Build' ./build-emulator.sh $HOME/workspace
 
   extra:
     # Rather then enforcing particular conventions we require that all build
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 task:
   workerType: emulator-ics-debug
   scopes:
-    - 'docker-worker:cache:build-emulator-ics-debug'
+    - 'docker-worker:cache:workspace-emulator-ics-debug'
   metadata:
     name: '[TC] B2G Emulator ICS Debug'
   extra:
@@ -16,7 +16,7 @@
 
   payload:
     cache:
-      build-emulator-ics-debug: /home/worker/object-folder
+      workspace-emulator-ics-debug: /home/worker/workspace
     env:
       TARGET: 'emulator'
       B2G_DEBUG: 1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 task:
   workerType: emulator-ics
   scopes:
-    - 'docker-worker:cache:build-emulator-ics-opt'
+    - 'docker-worker:cache:workspace-emulator-ics-opt'
   metadata:
     name: '[TC] B2G Emulator ICS Opt'
 
@@ -14,7 +14,7 @@
 
   payload:
     cache:
-      build-emulator-ics-opt: /home/worker/object-folder/
+      workspace-emulator-ics-opt: /home/worker/workspace
 
     env:
       TARGET: 'emulator'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 task:
   workerType: emulator-jb-debug
   scopes:
-    - 'docker-worker:cache:build-emulator-jb-debug'
+    - 'docker-worker:cache:workspace-emulator-jb-debug'
   metadata:
     name: '[TC] B2G Emulator JB Debug'
 
@@ -16,7 +16,7 @@
 
   payload:
     cache:
-      build-emulator-jb-debug: /home/worker/object-folder
+      workspace-emulator-jb-debug: /home/worker/workspace
     env:
       TARGET: 'emulator-jb'
       B2G_DEBUG: 1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 task:
   workerType: emulator-jb
   scopes:
-    - 'docker-worker:cache:build-emulator-jb-opt'
+    - 'docker-worker:cache:workspace-emulator-jb-opt'
   metadata:
     name: '[TC] B2G JB Emulator Opt'
 
@@ -14,6 +14,6 @@
 
   payload:
     cache:
-      build-emulator-jb-opt: /home/worker/object-folder
+      workspace-emulator-jb-opt: /home/worker/workspace
     env:
       TARGET: 'emulator-jb'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 task:
   workerType: emulator-kk-debug
   scopes:
-    - 'docker-worker:cache:build-emulator-kk-debug'
+    - 'docker-worker:cache:workspace-emulator-kk-debug'
   metadata:
     name: '[TC] B2G Emulator KK Debug'
 
@@ -16,7 +16,7 @@
 
   payload:
     cache:
-      build-emulator-jb-debug: /home/worker/object-folder
+      workspace-emulator-kk-debug: /home/worker/workspace
     env:
       TARGET: 'emulator-kk'
       B2G_DEBUG: 1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml	2015-02-28 15:03:02.000000000 +0000
@@ -3,7 +3,7 @@
 task:
   workerType: emulator-kk
   scopes:
-    - 'docker-worker:cache:build-emulator-kk-opt'
+    - 'docker-worker:cache:workspace-emulator-kk-opt'
   metadata:
     name: '[TC] B2G KK Emulator Opt'
 
@@ -14,7 +14,7 @@
 
   payload:
     cache:
-      build-emulator-kk-opt: /home/worker/object-folder
+      workspace-emulator-kk-opt: /home/worker/workspace
     env:
       TARGET: 'emulator-kk'
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_phone_base.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_phone_base.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/b2g_phone_base.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/b2g_phone_base.yml	2015-02-28 15:03:02.000000000 +0000
@@ -13,6 +13,7 @@
     maxRunTime: 14400
 
     command:
+      - with_workspace
       - build-phone.sh
 
   extra:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/mulet_linux.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/mulet_linux.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/builds/mulet_linux.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/builds/mulet_linux.yml	2015-02-28 15:03:02.000000000 +0000
@@ -7,14 +7,12 @@
 
   workerType: b2gbuild-desktop
   scopes:
-    - 'docker-worker:cache:sources-gecko'
-    - 'docker-worker:cache:build-mulet-linux-objects'
+    - 'docker-worker:cache:build-mulet-linux-workspace'
     - 'docker-worker:cache:tooltool-cache'
 
   payload:
     cache:
-      sources-gecko: '/home/worker/gecko'
-      build-mulet-linux-objects: '/home/worker/object-folder'
+      build-mulet-linux-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tools/tooltool-cache'
 
     env:
@@ -23,7 +21,12 @@
     maxRunTime: 3600
 
     command:
-      - bin/build-mulet-linux.sh
+      - /bin/bash
+      - -c
+      - >
+        checkout-gecko workspace &&
+        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
+        buildbot_step 'Build' ./build-mulet-linux.sh $HOME/workspace
 
   extra:
     treeherder:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/decision/try.yml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/decision/try.yml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tasks/decision/try.yml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tasks/decision/try.yml	2015-02-28 15:03:02.000000000 +0000
@@ -52,11 +52,12 @@
           # The taskcluster-vcs tooling stores the large clone caches in this
           # directory and will reuse them for new requests this saves about 20s~ and
           # is the most generic cache possible.
-          tc-vcs-public-sources: '/home/worker/.tc-vcs/'
+          tc-vcs-public-sources: /home/worker/.tc-vcs/
+          gecko-decision: /home/worker/workspace
 
         # Note: This task is built server side without the context or tooling that
         # exist in tree so we must hard code the version
-        image: 'quay.io/mozilla/decision:0.0.3'
+        image: 'quay.io/mozilla/builder:0.5.0'
 
         # Virtually no network or other potentially risky operations happen as part
         # of the task timeout aside from the initial clone. We intentionally have
@@ -68,7 +69,8 @@
           - /bin/bash
           - -cx
           - >
-            source $(which entrypoint) &&
+            checkout-gecko workspace &&
+            cd workspace/gecko &&
             ./mach taskcluster-graph
             --project='{{project}}'
             --message='{{comment}}'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tests/test_commit_parser.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tests/test_commit_parser.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/taskcluster/tests/test_commit_parser.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/taskcluster/tests/test_commit_parser.py	2015-02-28 15:03:02.000000000 +0000
@@ -80,6 +80,44 @@
         result = parse_commit(commit, jobs)
         self.assertEqual(expected, result)
 
+    def test_try_flag_in_middle_of_commit(self):
+        '''
+        The try command prefix may appear anywhere this test ensures that it
+        works in some common cases.
+        '''
+        commit = 'Bug XXX - I like cheese try: -b o -p all -u none wootbar'
+        jobs = {
+            'flags': {
+                'builds': ['linux', 'linux64'],
+                'tests': ['web-platform-tests'],
+            },
+            'builds': {
+                'linux': {
+                    'types': {
+                        'opt': {
+                            'task': 'task/linux',
+                         },
+                        'debug': {
+                            'task': 'task/linux-debug'
+                        }
+                    }
+                },
+            },
+            'tests': {}
+        }
+
+        expected = [
+            {
+                'task': 'task/linux',
+                'dependents': [],
+                'additional-parameters': {}
+            }
+        ]
+
+        result = parse_commit(commit, jobs)
+        self.assertEqual(expected, result)
+
+
     def test_commit_all_builds_no_tests(self):
         '''
         This test covers the case of all builds but no tests passed -u none
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/testsuite-targets.mk thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/testsuite-targets.mk
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/testsuite-targets.mk	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/testsuite-targets.mk	2015-02-28 15:03:02.000000000 +0000
@@ -536,8 +536,10 @@
 stage-marionette: make-stage-dir
 	$(NSINSTALL) -D $(MARIONETTE_DIR)/tests
 	$(NSINSTALL) -D $(MARIONETTE_DIR)/transport
+	$(NSINSTALL) -D $(MARIONETTE_DIR)/driver
 	@(cd $(topsrcdir)/testing/marionette/client && tar --exclude marionette/tests $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/ && tar -xf -)
 	@(cd $(topsrcdir)/testing/marionette/transport && tar $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/transport && tar -xf -)
+	@(cd $(topsrcdir)/testing/marionette/driver && tar $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/driver && tar -xf -)
 	$(PYTHON) $(topsrcdir)/testing/marionette/client/marionette/tests/print-manifest-dirs.py \
           $(topsrcdir) \
           $(topsrcdir)/testing/marionette/client/marionette/tests/unit-tests.ini \
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/harness/wptrunner/executors/executormarionette.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/harness/wptrunner/executors/executormarionette.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/harness/wptrunner/executors/executormarionette.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/harness/wptrunner/executors/executormarionette.py	2015-02-28 15:03:02.000000000 +0000
@@ -30,10 +30,12 @@
 
 def do_delayed_imports():
     global marionette
+    global errors
     try:
         import marionette
+        from marionette import errors
     except ImportError:
-        import marionette_driver.marionette as marionette
+        from marionette_driver import marionette, errors
 
 
 class MarionetteTestExecutor(TestExecutor):
@@ -153,13 +155,13 @@
 
         try:
             self.marionette.set_script_timeout((timeout + extra_timeout) * 1000)
-        except IOError, marionette.errors.InvalidResponseException:
+        except IOError, errors.InvalidResponseException:
             self.logger.error("Lost marionette connection before starting test")
             return Stop
 
         try:
             result = self.convert_result(test, self.do_test(test, timeout))
-        except marionette.errors.ScriptTimeoutException:
+        except errors.ScriptTimeoutException:
             with result_lock:
                 if not result_flag.is_set():
                     result_flag.set()
@@ -179,7 +181,7 @@
             #     else:
             #         break
             # Now need to check if the browser is still responsive and restart it if not
-        except (socket.timeout, marionette.errors.InvalidResponseException, IOError):
+        except (socket.timeout, errors.InvalidResponseException, IOError):
             # This can happen on a crash
             # Also, should check after the test if the firefox process is still running
             # and otherwise ignore any other result and set it to crash
@@ -250,7 +252,7 @@
                 full_url = urlparse.urljoin(self.http_server_url, url)
                 try:
                     self.marionette.navigate(full_url)
-                except marionette.errors.MarionetteException:
+                except errors.MarionetteException:
                     return {"status": "ERROR",
                             "message": "Failed to load url %s" % (full_url,)}
                 if url_type == "test":
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/harness/wptrunner/update/tree.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/harness/wptrunner/update/tree.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/harness/wptrunner/update/tree.py	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/harness/wptrunner/update/tree.py	2015-02-28 15:03:02.000000000 +0000
@@ -124,6 +124,13 @@
     def commit_patch(self):
         self.hg("qfinish")
 
+    def contains_commit(self, commit):
+        try:
+            self.hg("identify", "-r", commit.sha1)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
 
 class GitTree(object):
     name = "git"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/battery-status/battery-interface.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/battery-status/battery-interface.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/battery-status/battery-interface.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/battery-status/battery-interface.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -1,5 +1,6 @@
 [battery-interface.html]
   type: testharness
+  expected: ERROR
   [onchargingchange: treat object as null]
     expected: FAIL
 
@@ -48,3 +49,6 @@
   [onlevelchange: treat non-callable host object as null]
     expected: FAIL
 
+  [getBattery is present on navigator]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/battery-status/battery-interface-idlharness.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/battery-status/battery-interface-idlharness.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/battery-status/battery-interface-idlharness.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/battery-status/battery-interface-idlharness.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,56 @@
+[battery-interface-idlharness.html]
+  type: testharness
+  [Navigator interface: operation getBattery()]
+    expected: FAIL
+
+  [Navigator interface: navigator must inherit property "getBattery" with the proper type (0)]
+    expected: FAIL
+
+  [BatteryManager must be primary interface of navigator.getBattery()]
+    expected: FAIL
+
+  [Stringification of navigator.getBattery()]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "charging" with the proper type (0)]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "chargingTime" with the proper type (1)]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "dischargingTime" with the proper type (2)]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "level" with the proper type (3)]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "onchargingchange" with the proper type (4)]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "onchargingtimechange" with the proper type (5)]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "ondischargingtimechange" with the proper type (6)]
+    expected: FAIL
+
+  [BatteryManager interface: navigator.getBattery() must inherit property "onlevelchange" with the proper type (7)]
+    expected: FAIL
+
+  [EventTarget interface: navigator.getBattery() must inherit property "addEventListener" with the proper type (0)]
+    expected: FAIL
+
+  [EventTarget interface: calling addEventListener(DOMString,EventListener,boolean) on navigator.getBattery() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [EventTarget interface: navigator.getBattery() must inherit property "removeEventListener" with the proper type (1)]
+    expected: FAIL
+
+  [EventTarget interface: calling removeEventListener(DOMString,EventListener,boolean) on navigator.getBattery() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [EventTarget interface: navigator.getBattery() must inherit property "dispatchEvent" with the proper type (2)]
+    expected: FAIL
+
+  [EventTarget interface: calling dispatchEvent(Event) on navigator.getBattery() with too few arguments must throw TypeError]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3_2.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3_2.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3_2.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/content-security-policy/media-src/media-src-7_3_2.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -4,9 +4,6 @@
     if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): TIMEOUT
   [Disallowed track element]
     expected:
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): NOTRUN
-      if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+      FAIL
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/custom-elements/instantiating-custom-elements/custom-element-type-local-name-and-is-attribute.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -9,6 +9,4 @@
   [Test custom element type after changing IS attribute value. Element is HTML5 element with IS attribute referring to custom element type]
     expected: FAIL
 
-  [Custom element type must be taken from the local name of the element even if IS attribute provided. There\'s no definition for the value of IS attribute at first]
-    expected: FAIL
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,5 @@
+[PopStateEvent.html]
+  type: testharness
+  [document.createEvent]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/003.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/003.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/003.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/browsers/history/the-history-interface/003.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-[003.html]
-  type: testharness
-  [document.createEvent should create a PopStateEvent]
-    expected: FAIL
-
-  [initPopStateEvent should initialise the event]
-    expected: FAIL
-
-  [initPopStateEvent properties should hold the requested values]
-    expected: FAIL
-
-  [state data should be retained correctly when dispatching the event]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/dom/interfaces.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -759,12 +759,6 @@
   [HTMLPreElement interface: document.createElement("xmp") must inherit property "width" with the proper type (0)]
     expected: FAIL
 
-  [HTMLAnchorElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [Stringification of document.createElement("a")]
-    expected: FAIL
-
   [HTMLAnchorElement interface: document.createElement("a") must inherit property "ping" with the proper type (2)]
     expected: FAIL
 
@@ -1386,18 +1380,12 @@
   [HTMLMapElement interface: document.createElement("map") must inherit property "images" with the proper type (2)]
     expected: FAIL
 
-  [HTMLAreaElement interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [HTMLAreaElement interface: attribute hreflang]
     expected: FAIL
 
   [HTMLAreaElement interface: attribute type]
     expected: FAIL
 
-  [Stringification of document.createElement("area")]
-    expected: FAIL
-
   [HTMLAreaElement interface: document.createElement("area") must inherit property "ping" with the proper type (5)]
     expected: FAIL
 
@@ -2694,9 +2682,6 @@
   [Location interface: operation reload()]
     expected: FAIL
 
-  [Stringification of window.location]
-    expected: FAIL
-
   [Location interface: window.location must inherit property "assign" with the proper type (0)]
     expected: FAIL
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[size.attributes.parse.whitespace.html]
-  type: testharness
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/relevant-mutations.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -56,3 +56,4 @@
 
   [picture is inserted]
     expected: FAIL
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/srcset/select-an-image-source.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -2,3 +2,4 @@
   type: testharness
   ["data:,a foo, data:,b bar"]
     expected: FAIL
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/update-the-source-set.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -44,3 +44,4 @@
 
   [<picture><span><source srcset="data:,b"><img data-expect=""></span></picture>]
     expected: FAIL
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/infrastructure/failing-test.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/infrastructure/failing-test.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/infrastructure/failing-test.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/infrastructure/failing-test.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1,5 @@
+[failing-test.html]
+  type: testharness
+  [Failing test]
+    expected: FAIL
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/js/builtins/WeakMap.prototype-properties.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/js/builtins/WeakMap.prototype-properties.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/js/builtins/WeakMap.prototype-properties.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/js/builtins/WeakMap.prototype-properties.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -1,8 +1,6 @@
 [WeakMap.prototype-properties.html]
   type: testharness
-  [WeakMap.prototype.get.length]
-    expected: FAIL
 
-  [WeakMap.prototype.get: return undefined]
+  [WeakMap.prototype.get.length]
     expected: FAIL
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/MANIFEST.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/MANIFEST.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/MANIFEST.json	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/MANIFEST.json	2015-02-28 15:03:02.000000000 +0000
@@ -1031,9 +1031,6 @@
         "url": "/battery-status/battery-interface.js"
       },
       {
-        "url": "/battery-status/countdown.js"
-      },
-      {
         "url": "/battery-status/prime.js"
       },
       {
@@ -4444,10 +4441,10 @@
         "url": "/battery-status/battery-full-manual.html"
       },
       {
-        "url": "/battery-status/battery-plugged-in-manual.html"
+        "url": "/battery-status/battery-plugging-in-manual.html"
       },
       {
-        "url": "/battery-status/battery-unplugged-manual.html"
+        "url": "/battery-status/battery-unplugging-manual.html"
       },
       {
         "url": "/gamepad/events-manual.html"
@@ -4543,6 +4540,24 @@
         "url": "/html-longdesc/reflected-changing-longdesc-manual.html"
       },
       {
+        "url": "/html-media-capture/capture_audio-manual.html"
+      },
+      {
+        "url": "/html-media-capture/capture_audio_cancel-manual.html"
+      },
+      {
+        "url": "/html-media-capture/capture_image-manual.html"
+      },
+      {
+        "url": "/html-media-capture/capture_image_cancel-manual.html"
+      },
+      {
+        "url": "/html-media-capture/capture_video-manual.html"
+      },
+      {
+        "url": "/html-media-capture/capture_video_cancel-manual.html"
+      },
+      {
         "url": "/html/browsers/offline/application-cache-api/api_status_checking-manual.html"
       },
       {
@@ -11942,6 +11957,9 @@
         "url": "/html-media-capture/idlharness.html"
       },
       {
+        "url": "/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html"
+      },
+      {
         "url": "/html/browsers/browsing-the-web/read-media/pageload-image.html"
       },
       {
@@ -11972,9 +11990,6 @@
         "url": "/html/browsers/history/the-history-interface/002.html"
       },
       {
-        "url": "/html/browsers/history/the-history-interface/003.html"
-      },
-      {
         "url": "/html/browsers/history/the-history-interface/004.html"
       },
       {
@@ -13946,6 +13961,9 @@
         "url": "/html/semantics/forms/the-input-element/email.html"
       },
       {
+        "url": "/html/semantics/forms/the-input-element/files.html"
+      },
+      {
         "url": "/html/semantics/forms/the-input-element/hidden.html"
       },
       {
@@ -14444,6 +14462,9 @@
         "url": "/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html"
       },
       {
+        "url": "/html/syntax/parsing/the-end.html"
+      },
+      {
         "url": "/html/syntax/serializing-html-fragments/outerHTML.html"
       },
       {
@@ -14600,6 +14621,9 @@
         "url": "/http/content_length.html"
       },
       {
+        "url": "/infrastructure/failing-test.html"
+      },
+      {
         "url": "/js/builtins/Array.DefineOwnProperty.html"
       },
       {
@@ -14894,6 +14918,9 @@
         "url": "/notifications/event-onshow.html"
       },
       {
+        "url": "/notifications/instance.html"
+      },
+      {
         "url": "/notifications/interfaces.html"
       },
       {
@@ -18139,6 +18166,6 @@
     "deleted": [],
     "items": {}
   },
-  "rev": "63dafe11d04d035a69351c43297cc1ade8171a6b",
+  "rev": "06dfcf88301bcc02ed25830f0d87c75f041dad4e",
   "url_base": "/"
 }
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/media-source/mediasource-config-change-mp4-a-bitrate.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/media-source/mediasource-config-change-mp4-a-bitrate.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/media-source/mediasource-config-change-mp4-a-bitrate.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/media-source/mediasource-config-change-mp4-a-bitrate.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -1,4 +1,3 @@
 [mediasource-config-change-mp4-a-bitrate.html]
   type: testharness
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1130973
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/media-source/mediasource-remove.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -12,12 +12,6 @@
   [Test removing the end of appended data.]
     expected: FAIL
 
-  [Test remove with a NEGATIVE_INFINITY end.]
-    expected: FAIL
-
-  [Test remove with a NaN end.]
-    expected: FAIL
-
   [Test remove with a start at the duration.]
     expected:
       if (os == "win") and (version != "5.1.2600"): FAIL
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/mozilla-sync thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/mozilla-sync
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/mozilla-sync	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/mozilla-sync	2015-02-28 15:03:02.000000000 +0000
@@ -0,0 +1 @@
+18bc3819258cf7605db1e5f70676ff09407af49a
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/resource-timing/test_resource_timing.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-[test_resource_timing.html]
-  type: testharness
-  [PerformanceEntry has correct name, initiatorType, startTime, and duration (link)]
-    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1079837
-
-  [PerformanceEntry has correct order of timing attributes (iframe)]
-    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1079837
-
-  [PerformanceEntry has correct order of timing attributes (link)]
-    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1079837
-
-  [PerformanceEntry has correct order of timing attributes (script)]
-    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1079837
-
-  [PerformanceEntry has correct order of timing attributes (xmlhttprequest)]
-    disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1079837
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/XMLHttpRequest/interfaces.html.ini	2015-02-28 15:03:02.000000000 +0000
@@ -27,75 +27,39 @@
   [FormData interface: operation set(DOMString,DOMString)]
     expected: FAIL
 
-  [FormData interface: new FormData() must inherit property "delete" with the proper type (2)]
-    expected: FAIL
-
   [FormData interface: calling delete(DOMString) on new FormData() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData() must inherit property "get" with the proper type (3)]
-    expected: FAIL
-
   [FormData interface: calling get(DOMString) on new FormData() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData() must inherit property "getAll" with the proper type (4)]
-    expected: FAIL
-
   [FormData interface: calling getAll(DOMString) on new FormData() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData() must inherit property "has" with the proper type (5)]
-    expected: FAIL
-
   [FormData interface: calling has(DOMString) on new FormData() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData() must inherit property "set" with the proper type (6)]
-    expected: FAIL
-
   [FormData interface: calling set(DOMString,Blob,DOMString) on new FormData() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData() must inherit property "set" with the proper type (7)]
-    expected: FAIL
-
   [FormData interface: calling set(DOMString,DOMString) on new FormData() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData(form) must inherit property "delete" with the proper type (2)]
-    expected: FAIL
-
   [FormData interface: calling delete(DOMString) on new FormData(form) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData(form) must inherit property "get" with the proper type (3)]
-    expected: FAIL
-
   [FormData interface: calling get(DOMString) on new FormData(form) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData(form) must inherit property "getAll" with the proper type (4)]
-    expected: FAIL
-
   [FormData interface: calling getAll(DOMString) on new FormData(form) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData(form) must inherit property "has" with the proper type (5)]
-    expected: FAIL
-
   [FormData interface: calling has(DOMString) on new FormData(form) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData(form) must inherit property "set" with the proper type (6)]
-    expected: FAIL
-
   [FormData interface: calling set(DOMString,Blob,DOMString) on new FormData(form) with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: new FormData(form) must inherit property "set" with the proper type (7)]
-    expected: FAIL
-
   [FormData interface: calling set(DOMString,DOMString) on new FormData(form) with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -105,57 +69,3 @@
   [XMLHttpRequest interface: calling open(ByteString,USVString,boolean,USVString,USVString) on new XMLHttpRequest() with too few arguments must throw TypeError]
     expected: FAIL
 
-  [FormData interface: operation delete(USVString)]
-    expected: FAIL
-
-  [FormData interface: operation get(USVString)]
-    expected: FAIL
-
-  [FormData interface: operation getAll(USVString)]
-    expected: FAIL
-
-  [FormData interface: operation has(USVString)]
-    expected: FAIL
-
-  [FormData interface: operation set(USVString,Blob,USVString)]
-    expected: FAIL
-
-  [FormData interface: operation set(USVString,USVString)]
-    expected: FAIL
-
-  [FormData interface: calling delete(USVString) on new FormData() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling get(USVString) on new FormData() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling getAll(USVString) on new FormData() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling has(USVString) on new FormData() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling set(USVString,Blob,USVString) on new FormData() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling set(USVString,USVString) on new FormData() with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling delete(USVString) on new FormData(form) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling get(USVString) on new FormData(form) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling getAll(USVString) on new FormData(form) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling has(USVString) on new FormData(form) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling set(USVString,Blob,USVString) on new FormData(form) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FormData interface: calling set(USVString,USVString) on new FormData(form) with too few arguments must throw TypeError]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.html.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.html.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.html.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[XMLHttpRequest-withCredentials.html]
-  type: testharness
-  [setting withCredentials when not in UNSENT, OPENED state]
-    expected: FAIL
-
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/meta/XMLHttpRequest/XMLHttpRequest-withCredentials.worker.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[XMLHttpRequest-withCredentials.worker]
-  type: testharness
-  [setting withCredentials when not in UNSENT, OPENED state]
-    expected: FAIL
-
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.basic.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.rtl.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.basic.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.alpha.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colouralpha.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colour.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.colour.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.multiple.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.overlap.png differ
Binary files /tmp/UNACYVRNpS/thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png and /tmp/R_dyVEtecB/thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/fill-and-stroke-styles/2d.gradient.interpolate.vertical.png differ
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/tools/tests.yaml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/tools/tests.yaml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/2dcontext/tools/tests.yaml	2015-02-19 00:42:08.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/2dcontext/tools/tests.yaml	2015-02-28 15:03:03.000000000 +0000
@@ -198,7 +198,7 @@
         ("empty", "", None),
         ("onlyspace", "  ", None),
         ("space", "  100", 100),
-        ("whitespace", "\r\n\t\f100", 100),
+        ("whitespace", "\n\t\f100", 100),
         ("plus", "+100", 100),
         ("minus", "-100", None),
         ("octal", "0100", 100),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-charging-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-charging-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-charging-manual.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-charging-manual.html	2015-02-28 15:03:04.000000000 +0000
@@ -1,49 +1,53 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Battery Status Test: BatteryManager - charging</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/TR/battery-status/">
+<title>Battery Test: battery neither empty or full, charger plugged in</title>
 <meta name="flags" content="interact">
-<meta name="assert" content="All of the navigator.battery attributes exist and are set to their correct values when battery is charging">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <h2>Preconditions</h2>
-  <ol>
-    <li>
-      The device is plugged in to the charger before this test is run.
-    </li>
-    <li>
-      The battery must neither be empty or full, nor reach empty or full capacity during the test.
-    </li>
-  </ol>
-</body>
+
+<h2>Description</h2>
+<p>
+  This test validates that all of the navigator.battery attributes exist and are set to their correct values when battery is charging.
+</p>
+
+<h2>Preconditions</h2>
+<ol>
+  <li>
+    The device is plugged in to the charger before this test is run.
+  </li>
+  <li>
+    The battery must neither be empty or full, nor reach empty or full capacity during the test.
+  </li>
+  <li>
+    Waiting for battery level change to fire levelchange event, maybe need a long time
+  </li>
+</ol>
+
 <script>
 
 setup({ explicit_timeout: true });
 
 async_test(function (t) {
   navigator.getBattery().then(function (battery) {
-      t.step(function () {
-        assert_true(battery.charging, 'The BatteryManager.charging must be set to true');
-        assert_less_than(battery.chargingTime, Infinity, 'The BatteryManager.chargingTime');
-        assert_equals(battery.dischargingTime, Infinity, 'The BatteryManager.dischargingTime');
-        assert_greater_than(battery.level, 0, 'The BatteryManager.level');
-        assert_less_than(battery.level, 1.0, 'The BatteryManager.level');
-
-        var battery_level = battery.level;
-        battery.onlevelchange = t.step_func(function (e) {
-          assert_greater_than(e.level, battery_level, 'The value of the level attribute must increase');
-          t.done();
-        });
-      });
-    }, function (error) {
-      t.step(function () {
-        assert_unreached(error.message);
+    t.step(function () {
+      assert_true(battery.charging, 'charging must be set to true');
+      assert_less_than(battery.chargingTime, Infinity, 'chargingTime must be less than Infinity');
+      assert_equals(battery.dischargingTime, Infinity, 'dischargingTime must be set to Infinity');
+      assert_greater_than(battery.level, 0, 'level must be greater than 0');
+      assert_less_than(battery.level, 1.0, 'level must be less than 1.0');
+
+      var battery_level = battery.level;
+      battery.onlevelchange = t.step_func(function () {
+        assert_greater_than(battery.level, battery_level, 'The value of the level attribute must increase');
+        t.done();
       });
-      t.done();
-    }
-  )
+    });
+  }, function (error) {
+    t.step(function () {
+      assert_unreached(error.message);
+    });
+    t.done();
+  });
 }, document.title);
 
 </script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-created-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-created-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-created-manual.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-created-manual.html	2015-02-28 15:03:04.000000000 +0000
@@ -1,46 +1,54 @@
 <!DOCTYPE html>
-<html>
-  <head>
-    <title>Battery Status API Test Suite</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <h1>Description</h1>
-    <p>
-      <strong>
-        This test is only useful on devices that expose the BatteryManager interface,
-        but lack a backend implementation.
-      </strong>
-    </p>
-    <p>
-      This test validates that all of the navigator.battery attributes exist and are set to their default values.
-    </p>
-    <h2>Preconditions</h2>
-    <ol>
-      <li>
-        The implementation is unable to report the battery's charging state,
-        charging time, level or remaining time respectively.
-      </li>
-      <li>
-        The device is unplugged from the charger before this test case is run.
-      </li>
-    </ol>
-    <div id="log"></div>
-    <script>
-    (function() {
-      test(function() {
-        var b = navigator.battery;
-        assert_true(b.charging === true, 'charging must be set to true');
-        assert_true(b.chargingTime === 0, 'chargingTime must be set to 0');
-        assert_true(b.level === 1.0, 'level must be set to 1.0');
-        assert_true(b.dischargingTime === Infinity, 'dischargingTime must be set to Infinity');
-
-      }, 'When a BatteryManager object is created, charging must be set to true, ' +
-      'chargingTime to 0, level to 1.0 and dischargingTime to the value positive ' +
-      'Infinity, if the implementation is unable to report the battery\'s charging ' +
-      'state, charging time, level or remaining time respectively.');
-      })();
-    </script>
-  </body>
-</html>
+<meta charset="utf-8">
+<title>Battery Test: no backend implementation, charger unplugged in</title>
+<meta name="flags" content="interact">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<h2>Description</h2>
+<p>
+  <strong>
+    This test is only useful on devices that expose the BatteryManager interface,
+    but lack a backend implementation.
+  </strong>
+</p>
+<p>
+  This test validates that all of the navigator.battery attributes exist and are set to their default values.
+</p>
+
+<h2>Preconditions</h2>
+<ol>
+  <li>
+    The implementation is unable to report the battery's charging state,
+    charging time, level or remaining time respectively.
+  </li>
+  <li>
+    The device is unplugged from the charger before this test case is run.
+  </li>
+</ol>
+
+<div id="log"></div>
+
+<script>
+
+async_test(function (t) {
+  navigator.getBattery().then(function (battery) {
+    t.step(function () {
+      assert_true(battery.charging, 'charging must be set to true');
+      assert_equals(battery.chargingTime, 0, 'chargingTime must be set to 0');
+      assert_equals(battery.dischargingTime, Infinity, 'dischargingTime must be set to Infinity');
+      assert_equals(battery.level, 1.0, 'level must be set to 1.0');
+    });
+    t.done();
+  }, function (error) {
+    t.step(function () {
+      assert_unreached(error.message);
+    });
+    t.done();
+  });
+}, 'When a BatteryManager object is created, charging must be set to true, ' +
+   'chargingTime to 0, level to 1.0 and dischargingTime to the value positive ' +
+   'Infinity, if the implementation is unable to report the battery\'s charging ' +
+   'state, charging time, level or remaining time respectively.');
+
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-discharging-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-discharging-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-discharging-manual.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-discharging-manual.html	2015-02-28 15:03:04.000000000 +0000
@@ -1,49 +1,53 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Battery Status Test: BatteryManager - discharging</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/TR/battery-status/">
+<title>Battery Test: battery neither empty or full, charger unplugged in</title>
 <meta name="flags" content="interact">
-<meta name="assert" content="All of the navigator.battery attributes exist and are set to their correct values when battery is discharging">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <h2>Preconditions</h2>
-  <ol>
-    <li>
-      The device is unplugged from the charger before this test is run.
-    </li>
-    <li>
-      The battery must neither be empty or full, nor reach empty or full capacity during the test.
-    </li>
-  </ol>
-</body>
+
+<h2>Description</h2>
+<p>
+  This test validates that all of the navigator.battery attributes exist and are set to their correct values when battery is discharging.
+</p>
+
+<h2>Preconditions</h2>
+<ol>
+  <li>
+    The device is unplugged from the charger before this test is run.
+  </li>
+  <li>
+    The battery must neither be empty or full, nor reach empty or full capacity during the test.
+  </li>
+  <li>
+    Waiting for battery level change to fire levelchange event, maybe need a long time
+  </li>
+</ol>
+
 <script>
 
 setup({ explicit_timeout: true });
 
 async_test(function (t) {
   navigator.getBattery().then(function (battery) {
-      t.step(function () {
-        assert_false(battery.charging, 'The BatteryManager.charging must be set to false');
-        assert_equals(battery.chargingTime, Infinity, 'The BatteryManager.chargingTime');
-        assert_less_than(battery.dischargingTime, Infinity, 'The BatteryManager.dischargingTime');
-        assert_greater_than(battery.level, 0, 'The BatteryManager.level');
-        assert_less_than(battery.level, 1.0, 'The BatteryManager.level');
-
-        var battery_level = battery.level;
-        battery.onlevelchange = t.step_func(function (e) {
-          assert_less_than(e.level, battery_level, 'The value of the level attribute must decrease');
-          t.done();
-        });
-      });
-    }, function (error) {
-      t.step(function () {
-        assert_unreached(error.message);
+    t.step(function () {
+      assert_false(battery.charging, 'charging must be set to false');
+      assert_equals(battery.chargingTime, Infinity, 'chargingTime must be set to Infinity');
+      assert_less_than(battery.dischargingTime, Infinity, 'dischargingTime must be less than Infinity');
+      assert_greater_than(battery.level, 0, 'level must be greater than 0');
+      assert_less_than(battery.level, 1.0, 'level must be less than 1.0');
+
+      var battery_level = battery.level;
+      battery.onlevelchange = t.step_func(function () {
+        assert_less_than(battery.level, battery_level, 'The value of the level attribute must decrease');
+        t.done();
       });
-      t.done();
-    }
-  )
+    });
+  }, function (error) {
+    t.step(function () {
+      assert_unreached(error.message);
+    });
+    t.done();
+  });
 }, document.title);
 
 </script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-full-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-full-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-full-manual.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-full-manual.html	2015-02-28 15:03:04.000000000 +0000
@@ -1,41 +1,42 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Battery Status Test: BatteryManager - full</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="http://www.w3.org/TR/battery-status/">
+<title>Battery Test: battery full, charger plugged in</title>
 <meta name="flags" content="interact">
-<meta name="assert" content="All of the navigator.battery attributes exist and are set to their correct values when battery is full">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<body>
-  <h2>Preconditions</h2>
-  <ol>
-    <li>
-      The device is plugged in to the charger before this test is run.
-    </li>
-    <li>
-      The battery is full.
-    </li>
-  </ol>
-</body>
+
+<h2>Description</h2>
+<p>
+  This test validates that all of the navigator.battery attributes exist and are set to their correct values when battery is full.
+</p>
+
+<h2>Preconditions</h2>
+<ol>
+  <li>
+    The device is plugged in to the charger before this test is run.
+  </li>
+  <li>
+    The battery is full.
+  </li>
+</ol>
+
 <script>
 
 async_test(function (t) {
   navigator.getBattery().then(function (battery) {
-      t.step(function () {
-        assert_true(battery.charging, 'The BatteryManager.charging must be set to true');
-        assert_equals(battery.chargingTime, 0, 'The BatteryManager.chargingTime');
-        assert_equals(battery.dischargingTime, Infinity, 'The BatteryManager.dischargingTime');
-        assert_equals(battery.level, 1.0, 'The BatteryManager.level');
-      });
-      t.done();
-    }, function (error) {
-      t.step(function () {
-        assert_unreached(error.message);
-      });
-      t.done();
-    }
-  )
+    t.step(function () {
+      assert_true(battery.charging, 'charging must be set to true');
+      assert_equals(battery.chargingTime, 0, 'chargingTime must be set to 0');
+      assert_equals(battery.dischargingTime, Infinity, 'dischargingTime must be set to Infinity');
+      assert_equals(battery.level, 1.0, 'level must be set to 1.0');
+    });
+    t.done();
+  }, function (error) {
+    t.step(function () {
+      assert_unreached(error.message);
+    });
+    t.done();
+  });
 }, document.title);
 
 </script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-interface.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-interface.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-interface.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-interface.html	2015-02-28 15:03:04.000000000 +0000
@@ -1,28 +1,13 @@
 <!DOCTYPE html>
-<html>
-  <head>
-    <title>Battery Status API Test Suite</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="battery-interface.js"></script>
-  </head>
-  <body>
-    <h1>Description</h1>
-    <p>
-      This test validates the BatteryManager interface IDL.
-    </p>
+<meta charset="utf-8">
+<title>Battery Test: Interface API</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="battery-interface.js"></script>
 
-    <div id="log"></div>
-    <p>
-      <small>
-        Distributed under both the
-        <a href="http://www.w3.org/Consortium/Legal/2008/04-testsuite-license">
-        W3C Test Suite License</a> and the
-        <a href="http://www.w3.org/Consortium/Legal/2008/03-bsd-license">
-        W3C 3-clause BSD License</a>. To contribute to a W3C Test Suite, see the
-        <a href="http://www.w3.org/2004/10/27-testcases">policies and contribution
-        forms</a>.
-      </small>
-    </p>
-  </body>
-</html>
\ No newline at end of file
+<h2>Description</h2>
+<p>
+  This test validates the BatteryManager interface IDL.
+</p>
+
+<div id="log"></div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-interface-idlharness.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-interface-idlharness.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-interface-idlharness.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-interface-idlharness.html	2015-02-28 15:03:04.000000000 +0000
@@ -1,77 +1,61 @@
 <!DOCTYPE html>
-<html>
-  <head>
-    <title>Battery Status API Test Suite</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/resources/WebIDLParser.js"></script>
-    <script src="/resources/idlharness.js"></script>
-    <script type="text/plain" class="untested">
-    interface Navigator { };
-    
-    interface EventTarget {
-      void addEventListener(DOMString type, EventListener? callback, optional boolean capture);
-      void removeEventListener(DOMString type, EventListener? callback, optional boolean capture);
-      boolean dispatchEvent(Event event);
-    };
-    
-    [Callback]
-    interface EventListener {
-      void handleEvent(Event event);
-    };
-    </script>
-    <script type="text/plain">
-    partial interface Navigator {
-        readonly attribute BatteryManager battery;
-    };
-    
-    interface BatteryManager : EventTarget {
-        readonly attribute boolean             charging;
-        readonly attribute unrestricted double chargingTime;
-        readonly attribute unrestricted double dischargingTime;
-        readonly attribute double              level;
-                 attribute EventHandler        onchargingchange;
-                 attribute EventHandler        onchargingtimechange;
-                 attribute EventHandler        ondischargingtimechange;
-                 attribute EventHandler        onlevelchange;
-    };
-    </script>
-    <script>
-    "use strict";
-    var idl_array = new IdlArray();
-    var idls;
-    [].forEach.call(document.querySelectorAll('script[type=text\\/plain]'), function(node) {
-      // replace 'EventHandler' and 'unrestricted double' unrecognized by idlharness.js
-      idls = node.textContent.replace('EventHandler', 'Function?', 'g').replace('unrestricted double', 'double', 'g');
-      idl_array[(node.className === 'untested') ? 'add_untested_idls' : 'add_idls'](idls);
-    });
-    idl_array.add_objects({Navigator: ['navigator'], BatteryManager: ['navigator.battery']});
-    idl_array.test();
-    </script>
-  </head>
-  <body>
-    <h1>Description</h1>
-    <p>
-      This test validates the BatteryManager interface IDL.
-    </p>
-    <p>
-      This test uses <a href="/resources/idlharness.js">idlharness.js</a>, and
-      is complementary to the <a href="battery-interface.html">battery-interface.html</a>
-      test.
-    </p>
-    <div id="log"></div>
-    <p>
-      <small>
-        Distributed under both the
-        <a href="http://www.w3.org/Consortium/Legal/2008/04-testsuite-license">
-        W3C Test Suite License</a> and the
-        <a href="http://www.w3.org/Consortium/Legal/2008/03-bsd-license">
-        W3C 3-clause BSD License</a>. To contribute to a W3C Test Suite, see the
-        <a href="http://www.w3.org/2004/10/27-testcases">policies and contribution
-        forms</a>.
-      </small>
-    </p>
-  </body>
-</html>
+<meta charset="utf-8">
+<title>Battery test: IDL</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script src="/resources/idlharness.js"></script>
+<script type="text/plain" class="untested">
+interface Navigator { };
 
+interface EventTarget {
+  void addEventListener(DOMString type, EventListener? callback, optional boolean capture);
+  void removeEventListener(DOMString type, EventListener? callback, optional boolean capture);
+  boolean dispatchEvent(Event event);
+};
 
+[Callback]
+interface EventListener {
+  void handleEvent(Event event);
+};
+</script>
+<script type="text/plain">
+partial interface Navigator {
+    Promise<BatteryManager> getBattery ();
+};
+
+interface BatteryManager : EventTarget {
+    readonly attribute boolean             charging;
+    readonly attribute unrestricted double chargingTime;
+    readonly attribute unrestricted double dischargingTime;
+    readonly attribute double              level;
+             attribute EventHandler        onchargingchange;
+             attribute EventHandler        onchargingtimechange;
+             attribute EventHandler        ondischargingtimechange;
+             attribute EventHandler        onlevelchange;
+};
+</script>
+<script>
+"use strict";
+var idl_array = new IdlArray();
+var idls;
+[].forEach.call(document.querySelectorAll('script[type=text\\/plain]'), function(node) {
+  // replace 'EventHandler' and 'unrestricted double' unrecognized by idlharness.js
+  idls = node.textContent.replace('EventHandler', 'Function?', 'g').replace('unrestricted double', 'double', 'g');
+  idl_array[(node.className === 'untested') ? 'add_untested_idls' : 'add_idls'](idls);
+});
+idl_array.add_objects({Navigator: ['navigator'], BatteryManager: ['navigator.getBattery()']});
+idl_array.test();
+</script>
+
+<h2>Description</h2>
+<p>
+  This test validates the BatteryManager interface IDL.
+</p>
+<p>
+  This test uses <a href="/resources/idlharness.js">idlharness.js</a>, and
+  is complementary to the <a href="battery-interface.html">battery-interface.html</a>
+  test.
+</p>
+
+<div id="log"></div>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-interface.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-interface.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-interface.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-interface.js	2015-02-28 15:03:04.000000000 +0000
@@ -1,393 +1,368 @@
-/**
-* W3C 3-clause BSD License
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are
-* met:
-* o Redistributions of works must retain the original copyright notice,
-*     this list of conditions and the following disclaimer.
-*
-* o Redistributions in binary form must reproduce the original copyright
-*     notice, this list of conditions and the following disclaimer in the
-*     documentation and/or other materials provided with the distribution.
-*
-* o Neither the name of the W3C nor the names of its contributors may be
-*     used to endorse or promote products derived from this work without
-*     specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-**/
-
 (function() {
-  
+
+  setup("", {explicit_done: true});
+
   /**
   *
   * partial interface Navigator {
-  *     readonly attribute BatteryManager battery;
+  *     Promise<BatteryManager> getBattery ();
   * };
   *
   */
-  
-  test(function() {
-    assert_idl_attribute(navigator, 'battery', 'navigator must have battery attribute');
-  }, 'battery is present on navigator');
-    
+
   test(function() {
-    assert_readonly(navigator, 'battery', 'battery must be readonly');
-  }, 'battery is readonly');
-  
-  /**
-  *
-  * interface BatteryManager : EventTarget {
-  *     readonly attribute boolean             charging;
-  *     readonly attribute unrestricted double chargingTime;
-  *     readonly attribute unrestricted double dischargingTime;
-  *     readonly attribute double              level;
-  *              attribute EventHandler        onchargingchange;
-  *              attribute EventHandler        onchargingtimechange;
-  *              attribute EventHandler        ondischargingtimechange;
-  *              attribute EventHandler        onlevelchange;
-  * };
-  *
-  */
+    assert_idl_attribute(navigator, 'getBattery', 'navigator must have getBattery attribute');
+  }, 'getBattery is present on navigator');
 
-  // interface BatteryManager : EventTarget {
+  navigator.getBattery().then(function (battery) {
 
-  test(function() {
+    /**
+    *
+    * interface BatteryManager : EventTarget {
+    *     readonly attribute boolean             charging;
+    *     readonly attribute unrestricted double chargingTime;
+    *     readonly attribute unrestricted double dischargingTime;
+    *     readonly attribute double              level;
+    *              attribute EventHandler        onchargingchange;
+    *              attribute EventHandler        onchargingtimechange;
+    *              attribute EventHandler        ondischargingtimechange;
+    *              attribute EventHandler        onlevelchange;
+    * };
+    *
+    */
+
+    // interface BatteryManager : EventTarget {
+
+    test(function() {
       assert_own_property(window, 'BatteryManager');
-  }, 'window has an own property BatteryManager');
-  
-  test(function() {
-      assert_true(navigator.battery instanceof EventTarget);
-  }, 'battery inherits from EventTarget');
-  
-  // readonly attribute boolean charging;
-  
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'charging', 'battery must have charging attribute');
-  }, 'charging attribute exists');
-  
-  test(function() {
-    assert_readonly(navigator.battery, 'charging', 'charging must be readonly')
-  }, 'charging attribute is readonly');
+    }, 'window has an own property BatteryManager');
 
-  // readonly attribute unrestricted double chargingTime;
+    test(function() {
+      assert_true(battery instanceof EventTarget);
+    }, 'battery inherits from EventTarget');
 
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'chargingTime', 'battery must have chargingTime attribute');
-  }, 'chargingTime attribute exists');
+    // readonly attribute boolean charging;
 
-  test(function() {
-    assert_readonly(navigator.battery, 'chargingTime', 'chargingTime must be readonly')
-  }, 'chargingTime attribute is readonly');
+    test(function() {
+      assert_idl_attribute(battery, 'charging', 'battery must have charging attribute');
+    }, 'charging attribute exists');
 
-  // readonly attribute unrestricted double dischargingTime;
+    test(function() {
+      assert_readonly(battery, 'charging', 'charging must be readonly')
+    }, 'charging attribute is readonly');
 
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'dischargingTime', 'battery must have dischargingTime attribute');
-  }, 'dischargingTime attribute exists');
+    // readonly attribute unrestricted double chargingTime;
 
-  test(function() {
-    assert_readonly(navigator.battery, 'dischargingTime', 'dischargingTime must be readonly')
-  }, 'dischargingTime attribute is readonly');
-  
-  // readonly attribute double level;
-  
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'level', 'battery must have level attribute');
-  }, 'level attribute exists');
+    test(function() {
+      assert_idl_attribute(battery, 'chargingTime', 'battery must have chargingTime attribute');
+    }, 'chargingTime attribute exists');
 
-  test(function() {
-    assert_readonly(navigator.battery, 'level', 'level must be readonly')
-  }, 'level attribute is readonly');
-  
-  // attribute EventHandler onchargingchange;
-  
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'onchargingchange', 'battery must have onchargingchange attribute');
-  }, 'onchargingchange attribute exists');
-  
-  test(function() {
-    assert_equals(navigator.battery.onchargingchange, null, 'onchargingchange must be null')
-  }, 'onchargingchange is null');
-  
-  test(function() {
+    test(function() {
+      assert_readonly(battery, 'chargingTime', 'chargingTime must be readonly')
+    }, 'chargingTime attribute is readonly');
+
+    // readonly attribute unrestricted double dischargingTime;
+
+    test(function() {
+      assert_idl_attribute(battery, 'dischargingTime', 'battery must have dischargingTime attribute');
+    }, 'dischargingTime attribute exists');
+
+    test(function() {
+      assert_readonly(battery, 'dischargingTime', 'dischargingTime must be readonly')
+    }, 'dischargingTime attribute is readonly');
+
+    // readonly attribute double level;
+
+    test(function() {
+      assert_idl_attribute(battery, 'level', 'battery must have level attribute');
+    }, 'level attribute exists');
+
+    test(function() {
+      assert_readonly(battery, 'level', 'level must be readonly')
+    }, 'level attribute is readonly');
+
+    // attribute EventHandler onchargingchange;
+
+    test(function() {
+      assert_idl_attribute(battery, 'onchargingchange', 'battery must have onchargingchange attribute');
+    }, 'onchargingchange attribute exists');
+
+    test(function() {
+      assert_equals(battery.onchargingchange, null, 'onchargingchange must be null')
+    }, 'onchargingchange is null');
+
+    test(function() {
       var desc = 'onchargingchange did not accept callable object',
           func = function() {},
           desc = 'Expected to find onchargingchange attribute on battery object';
-      assert_idl_attribute(navigator.battery, 'onchargingchange', desc);
+      assert_idl_attribute(battery, 'onchargingchange', desc);
       window.onchargingchange = func;
       assert_equals(window.onchargingchange, func, desc);
-  }, 'onchargingchange is set to function');
-  
-  test(function() {
+    }, 'onchargingchange is set to function');
+
+    test(function() {
       var desc = 'onchargingchange did not treat noncallable as null';
-      navigator.battery.onchargingchange = function() {};
-      navigator.battery.onchargingchange = {};
-      assert_equals(navigator.battery.onchargingchange, null, desc);
-  }, 'onchargingchange: treat object as null');
-  
-  test(function() {
+      battery.onchargingchange = function() {};
+      battery.onchargingchange = {};
+      assert_equals(battery.onchargingchange, null, desc);
+    }, 'onchargingchange: treat object as null');
+
+    test(function() {
       var desc = 'onchargingchange did not treat noncallable as null';
-      navigator.battery.onchargingchange = function() {};
-      navigator.battery.onchargingchange = {
+      battery.onchargingchange = function() {};
+      battery.onchargingchange = {
           call: 'test'
       };
-      assert_equals(navigator.battery.onchargingchange, null, desc);
-  }, 'onchargingchange: treat object with non-callable call property as null');
-  
-  test(function() {
+      assert_equals(battery.onchargingchange, null, desc);
+    }, 'onchargingchange: treat object with non-callable call property as null');
+
+    test(function() {
       var desc = 'onchargingchange did not treat noncallable (string) as null';
-      navigator.battery.onchargingchange = function() {};
-      navigator.battery.onchargingchange = 'string';
-      assert_equals(navigator.battery.onchargingchange, null, desc);
-  }, 'onchargingchange: treat string as null');
+      battery.onchargingchange = function() {};
+      battery.onchargingchange = 'string';
+      assert_equals(battery.onchargingchange, null, desc);
+    }, 'onchargingchange: treat string as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingchange did not treat noncallable (number) as null';
-      navigator.battery.onchargingchange = function() {};
-      navigator.battery.onchargingchange = 123;
-      assert_equals(navigator.battery.onchargingchange, null, desc);
-  }, 'onchargingchange: treat number as null');
+      battery.onchargingchange = function() {};
+      battery.onchargingchange = 123;
+      assert_equals(battery.onchargingchange, null, desc);
+    }, 'onchargingchange: treat number as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingchange did not treat noncallable (undefined) as null';
-      navigator.battery.onchargingchange = function() {};
-      navigator.battery.onchargingchange = undefined;
-      assert_equals(navigator.battery.onchargingchange, null, desc);
-  }, 'onchargingchange: treat undefined as null');
+      battery.onchargingchange = function() {};
+      battery.onchargingchange = undefined;
+      assert_equals(battery.onchargingchange, null, desc);
+    }, 'onchargingchange: treat undefined as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingchange did not treat noncallable (array) as null';
-      navigator.battery.onchargingchange = function() {};
-      navigator.battery.onchargingchange = [];
-      assert_equals(navigator.battery.onchargingchange, null, desc);
-  }, 'onchargingchange: treat array as null');
+      battery.onchargingchange = function() {};
+      battery.onchargingchange = [];
+      assert_equals(battery.onchargingchange, null, desc);
+    }, 'onchargingchange: treat array as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingchange did not treat noncallable host object as null';
-      navigator.battery.onchargingchange = function() {};
-      navigator.battery.onchargingchange = Node;
-      assert_equals(navigator.battery.onchargingchange, null, desc);
-  }, 'onchargingchange: treat non-callable host object as null');
-  
-  // attribute EventHandler onchargingtimechange;
-  
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'onchargingtimechange', 'battery must have onchargingtimechange attribute');
-  }, 'onchargingtimechange attribute exists');
-  
-  test(function() {
-    assert_equals(navigator.battery.onchargingtimechange, null, 'onchargingtimechange must be null')
-  }, 'onchargingtimechange is null');
+      battery.onchargingchange = function() {};
+      battery.onchargingchange = Node;
+      assert_equals(battery.onchargingchange, null, desc);
+    }, 'onchargingchange: treat non-callable host object as null');
+
+    // attribute EventHandler onchargingtimechange;
+
+    test(function() {
+      assert_idl_attribute(battery, 'onchargingtimechange', 'battery must have onchargingtimechange attribute');
+    }, 'onchargingtimechange attribute exists');
+
+    test(function() {
+      assert_equals(battery.onchargingtimechange, null, 'onchargingtimechange must be null')
+    }, 'onchargingtimechange is null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not accept callable object',
           func = function() {},
           desc = 'Expected to find onchargingtimechange attribute on battery object';
-      assert_idl_attribute(navigator.battery, 'onchargingtimechange', desc);
+      assert_idl_attribute(battery, 'onchargingtimechange', desc);
       window.onchargingtimechange = func;
       assert_equals(window.onchargingtimechange, func, desc);
-  }, 'onchargingtimechange is set to function');
+    }, 'onchargingtimechange is set to function');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not treat noncallable as null';
-      navigator.battery.onchargingtimechange = function() {};
-      navigator.battery.onchargingtimechange = {};
-      assert_equals(navigator.battery.onchargingtimechange, null, desc);
-  }, 'onchargingtimechange: treat object as null');
+      battery.onchargingtimechange = function() {};
+      battery.onchargingtimechange = {};
+      assert_equals(battery.onchargingtimechange, null, desc);
+    }, 'onchargingtimechange: treat object as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not treat noncallable as null';
-      navigator.battery.onchargingtimechange = function() {};
-      navigator.battery.onchargingtimechange = {
+      battery.onchargingtimechange = function() {};
+      battery.onchargingtimechange = {
           call: 'test'
       };
-      assert_equals(navigator.battery.onchargingtimechange, null, desc);
-  }, 'onchargingtimechange: treat object with non-callable call property as null');
+      assert_equals(battery.onchargingtimechange, null, desc);
+    }, 'onchargingtimechange: treat object with non-callable call property as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not treat noncallable (string) as null';
-      navigator.battery.onchargingtimechange = function() {};
-      navigator.battery.onchargingtimechange = 'string';
-      assert_equals(navigator.battery.onchargingtimechange, null, desc);
-  }, 'onchargingtimechange: treat string as null');
+      battery.onchargingtimechange = function() {};
+      battery.onchargingtimechange = 'string';
+      assert_equals(battery.onchargingtimechange, null, desc);
+    }, 'onchargingtimechange: treat string as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not treat noncallable (number) as null';
-      navigator.battery.onchargingtimechange = function() {};
-      navigator.battery.onchargingtimechange = 123;
-      assert_equals(navigator.battery.onchargingtimechange, null, desc);
-  }, 'onchargingtimechange: treat number as null');
+      battery.onchargingtimechange = function() {};
+      battery.onchargingtimechange = 123;
+      assert_equals(battery.onchargingtimechange, null, desc);
+    }, 'onchargingtimechange: treat number as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not treat noncallable (undefined) as null';
-      navigator.battery.onchargingtimechange = function() {};
-      navigator.battery.onchargingtimechange = undefined;
-      assert_equals(navigator.battery.onchargingtimechange, null, desc);
-  }, 'onchargingtimechange: treat undefined as null');
+      battery.onchargingtimechange = function() {};
+      battery.onchargingtimechange = undefined;
+      assert_equals(battery.onchargingtimechange, null, desc);
+    }, 'onchargingtimechange: treat undefined as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not treat noncallable (array) as null';
-      navigator.battery.onchargingtimechange = function() {};
-      navigator.battery.onchargingtimechange = [];
-      assert_equals(navigator.battery.onchargingtimechange, null, desc);
-  }, 'onchargingtimechange: treat array as null');
+      battery.onchargingtimechange = function() {};
+      battery.onchargingtimechange = [];
+      assert_equals(battery.onchargingtimechange, null, desc);
+    }, 'onchargingtimechange: treat array as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onchargingtimechange did not treat noncallable host object as null';
-      navigator.battery.onchargingtimechange = function() {};
-      navigator.battery.onchargingtimechange = Node;
-      assert_equals(navigator.battery.onchargingtimechange, null, desc);
-  }, 'onchargingtimechange: treat non-callable host object as null');
-    
-  // attribute EventHandler ondischargingtimechange;
-  
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'ondischargingtimechange', 'battery must have ondischargingtimechange attribute');
-  }, 'ondischargingtimechange attribute exists');
+      battery.onchargingtimechange = function() {};
+      battery.onchargingtimechange = Node;
+      assert_equals(battery.onchargingtimechange, null, desc);
+    }, 'onchargingtimechange: treat non-callable host object as null');
+
+    // attribute EventHandler ondischargingtimechange;
+
+    test(function() {
+      assert_idl_attribute(battery, 'ondischargingtimechange', 'battery must have ondischargingtimechange attribute');
+    }, 'ondischargingtimechange attribute exists');
+
+    test(function() {
+      assert_equals(battery.ondischargingtimechange, null, 'ondischargingtimechange must be null')
+    }, 'ondischargingtimechange is null');
 
-  test(function() {
-    assert_equals(navigator.battery.ondischargingtimechange, null, 'ondischargingtimechange must be null')
-  }, 'ondischargingtimechange is null');
-  
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not accept callable object',
           func = function() {},
           desc = 'Expected to find ondischargingtimechange attribute on battery object';
-      assert_idl_attribute(navigator.battery, 'ondischargingtimechange', desc);
+      assert_idl_attribute(battery, 'ondischargingtimechange', desc);
       window.ondischargingtimechange = func;
       assert_equals(window.ondischargingtimechange, func, desc);
-  }, 'ondischargingtimechange is set to function');
+    }, 'ondischargingtimechange is set to function');
 
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not treat noncallable as null';
-      navigator.battery.ondischargingtimechange = function() {};
-      navigator.battery.ondischargingtimechange = {};
-      assert_equals(navigator.battery.ondischargingtimechange, null, desc);
-  }, 'ondischargingtimechange: treat object as null');
+      battery.ondischargingtimechange = function() {};
+      battery.ondischargingtimechange = {};
+      assert_equals(battery.ondischargingtimechange, null, desc);
+    }, 'ondischargingtimechange: treat object as null');
 
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not treat noncallable as null';
-      navigator.battery.ondischargingtimechange = function() {};
-      navigator.battery.ondischargingtimechange = {
+      battery.ondischargingtimechange = function() {};
+      battery.ondischargingtimechange = {
           call: 'test'
       };
-      assert_equals(navigator.battery.ondischargingtimechange, null, desc);
-  }, 'ondischargingtimechange: treat object with non-callable call property as null');
+      assert_equals(battery.ondischargingtimechange, null, desc);
+    }, 'ondischargingtimechange: treat object with non-callable call property as null');
 
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not treat noncallable (string) as null';
-      navigator.battery.ondischargingtimechange = function() {};
-      navigator.battery.ondischargingtimechange = 'string';
-      assert_equals(navigator.battery.ondischargingtimechange, null, desc);
-  }, 'ondischargingtimechange: treat string as null');
+      battery.ondischargingtimechange = function() {};
+      battery.ondischargingtimechange = 'string';
+      assert_equals(battery.ondischargingtimechange, null, desc);
+    }, 'ondischargingtimechange: treat string as null');
 
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not treat noncallable (number) as null';
-      navigator.battery.ondischargingtimechange = function() {};
-      navigator.battery.ondischargingtimechange = 123;
-      assert_equals(navigator.battery.ondischargingtimechange, null, desc);
-  }, 'ondischargingtimechange: treat number as null');
+      battery.ondischargingtimechange = function() {};
+      battery.ondischargingtimechange = 123;
+      assert_equals(battery.ondischargingtimechange, null, desc);
+    }, 'ondischargingtimechange: treat number as null');
 
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not treat noncallable (undefined) as null';
-      navigator.battery.ondischargingtimechange = function() {};
-      navigator.battery.ondischargingtimechange = undefined;
-      assert_equals(navigator.battery.ondischargingtimechange, null, desc);
-  }, 'ondischargingtimechange: treat undefined as null');
+      battery.ondischargingtimechange = function() {};
+      battery.ondischargingtimechange = undefined;
+      assert_equals(battery.ondischargingtimechange, null, desc);
+    }, 'ondischargingtimechange: treat undefined as null');
 
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not treat noncallable (array) as null';
-      navigator.battery.ondischargingtimechange = function() {};
-      navigator.battery.ondischargingtimechange = [];
-      assert_equals(navigator.battery.ondischargingtimechange, null, desc);
-  }, 'ondischargingtimechange: treat array as null');
+      battery.ondischargingtimechange = function() {};
+      battery.ondischargingtimechange = [];
+      assert_equals(battery.ondischargingtimechange, null, desc);
+    }, 'ondischargingtimechange: treat array as null');
 
-  test(function() {
+    test(function() {
       var desc = 'ondischargingtimechange did not treat noncallable host object as null';
-      navigator.battery.ondischargingtimechange = function() {};
-      navigator.battery.ondischargingtimechange = Node;
-      assert_equals(navigator.battery.ondischargingtimechange, null, desc);
-  }, 'ondischargingtimechange: treat non-callable host object as null');
+      battery.ondischargingtimechange = function() {};
+      battery.ondischargingtimechange = Node;
+      assert_equals(battery.ondischargingtimechange, null, desc);
+    }, 'ondischargingtimechange: treat non-callable host object as null');
+
+    // attribute EventHandler onlevelchange;
+
+    test(function() {
+      assert_idl_attribute(battery, 'onlevelchange', 'battery must have onlevelchange attribute');
+    }, 'onlevelchange attribute exists');
+
+    test(function() {
+      assert_equals(battery.onlevelchange, null, 'onlevelchange must be null')
+    }, 'onlevelchange is null');
 
-  // attribute EventHandler onlevelchange;
-
-  test(function() {
-    assert_idl_attribute(navigator.battery, 'onlevelchange', 'battery must have onlevelchange attribute');
-  }, 'onlevelchange attribute exists');
-  
-  test(function() {
-    assert_equals(navigator.battery.onlevelchange, null, 'onlevelchange must be null')
-  }, 'onlevelchange is null');
-  
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not accept callable object',
           func = function() {},
           desc = 'Expected to find onlevelchange attribute on battery object';
-      assert_idl_attribute(navigator.battery, 'onlevelchange', desc);
+      assert_idl_attribute(battery, 'onlevelchange', desc);
       window.onlevelchange = func;
       assert_equals(window.onlevelchange, func, desc);
-  }, 'onlevelchange is set to function');
+    }, 'onlevelchange is set to function');
 
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not treat noncallable as null';
-      navigator.battery.onlevelchange = function() {};
-      navigator.battery.onlevelchange = {};
-      assert_equals(navigator.battery.onlevelchange, null, desc);
-  }, 'onlevelchange: treat object as null');
+      battery.onlevelchange = function() {};
+      battery.onlevelchange = {};
+      assert_equals(battery.onlevelchange, null, desc);
+    }, 'onlevelchange: treat object as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not treat noncallable as null';
-      navigator.battery.onlevelchange = function() {};
-      navigator.battery.onlevelchange = {
+      battery.onlevelchange = function() {};
+      battery.onlevelchange = {
           call: 'test'
       };
-      assert_equals(navigator.battery.onlevelchange, null, desc);
-  }, 'onlevelchange: treat object with non-callable call property as null');
+      assert_equals(battery.onlevelchange, null, desc);
+    }, 'onlevelchange: treat object with non-callable call property as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not treat noncallable (string) as null';
-      navigator.battery.onlevelchange = function() {};
-      navigator.battery.onlevelchange = 'string';
-      assert_equals(navigator.battery.onlevelchange, null, desc);
-  }, 'onlevelchange: treat string as null');
+      battery.onlevelchange = function() {};
+      battery.onlevelchange = 'string';
+      assert_equals(battery.onlevelchange, null, desc);
+    }, 'onlevelchange: treat string as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not treat noncallable (number) as null';
-      navigator.battery.onlevelchange = function() {};
-      navigator.battery.onlevelchange = 123;
-      assert_equals(navigator.battery.onlevelchange, null, desc);
-  }, 'onlevelchange: treat number as null');
+      battery.onlevelchange = function() {};
+      battery.onlevelchange = 123;
+      assert_equals(battery.onlevelchange, null, desc);
+    }, 'onlevelchange: treat number as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not treat noncallable (undefined) as null';
-      navigator.battery.onlevelchange = function() {};
-      navigator.battery.onlevelchange = undefined;
-      assert_equals(navigator.battery.onlevelchange, null, desc);
-  }, 'onlevelchange: treat undefined as null');
+      battery.onlevelchange = function() {};
+      battery.onlevelchange = undefined;
+      assert_equals(battery.onlevelchange, null, desc);
+    }, 'onlevelchange: treat undefined as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not treat noncallable (array) as null';
-      navigator.battery.onlevelchange = function() {};
-      navigator.battery.onlevelchange = [];
-      assert_equals(navigator.battery.onlevelchange, null, desc);
-  }, 'onlevelchange: treat array as null');
+      battery.onlevelchange = function() {};
+      battery.onlevelchange = [];
+      assert_equals(battery.onlevelchange, null, desc);
+    }, 'onlevelchange: treat array as null');
 
-  test(function() {
+    test(function() {
       var desc = 'onlevelchange did not treat noncallable host object as null';
-      navigator.battery.onlevelchange = function() {};
-      navigator.battery.onlevelchange = Node;
-      assert_equals(navigator.battery.onlevelchange, null, desc);
-  }, 'onlevelchange: treat non-callable host object as null');
-  
-})();
\ No newline at end of file
+      battery.onlevelchange = function() {};
+      battery.onlevelchange = Node;
+      assert_equals(battery.onlevelchange, null, desc);
+    }, 'onlevelchange: treat non-callable host object as null');
+
+    done();
+
+  }, function () {});
+
+})();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-plugged-in-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-plugged-in-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-plugged-in-manual.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-plugged-in-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Battery Status API Test Suite</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="countdown.js"></script>
-    <link rel="stylesheet" href="/resources/testharness.css" media="all"/>
-    <style>
-      #note { background-color: #fef1b5; border: solid 1px #cdab2d; padding: 5px; margin: 15px; display: none; }
-    </style>
-    <meta name="flags" content="interact">
-  </head>
-  <body>
-    <h1>Description</h1>
-    <p>
-      This test validates that all of the navigator.battery attributes exist and are set to correct values, with corresponding events fired, when the charger is plugged in.
-    </p>
-    <h2>Preconditions</h2>
-    <ol>
-      <li>
-        The device is unplugged from the charger before this test is run.
-      </li>
-      <li>
-        The battery must not be full or reach full capacity during the time the test is run.
-      </li>
-    </ol>
-    <div id="note">
-      Plug in the charger and wait for all the tests to complete.
-    </div>
-    <div id="log"></div>
-    <script>
-    (function() {
-
-      setup({ explicit_timeout: true });
-      
-      var onchargingchange_test = async_test('When the device is plugged in and its charging state is updated, must set the charging attribute\'s value to true and fire a chargingchange event.');
-      navigator.battery.onchargingchange = onchargingchange_test.step_func(function (e) {
-        assert_true(navigator.battery.charging, 'The charging attribute must be set to true.')
-        onchargingchange_test.done();
-      });
-      
-      var onchargingtimechange_test = async_test('When the device is plugged in and its charging time is updated, must set the chargingTime attribute\'s value and fire a chargingtimechange event. If the reported charging time ' + navigator.battery.chargingTime + ' seconds or ' + Math.round(navigator.battery.chargingTime/60) + ' minutes is not correct, please indicate that the test has failed.');
-      var battery_chargingtime = navigator.battery.chargingTime;
-      navigator.battery.onchargingtimechange = onchargingtimechange_test.step_func(function (e) {
-        assert_true(navigator.battery.chargingTime < battery_chargingtime, 'The value of the chargingTime attribute must decrease.');
-        onchargingtimechange_test.done();
-      });
-      
-      var ondischargingtimechange_test = async_test('When the device is plugged in and its discharging time is updated, must set the dischargingTime attribute\'s value to Infinity and fire a dischargingtimechange event.');
-      var battery_dischargingtime = navigator.battery.dischargingTime;
-      navigator.battery.ondischargingtimechange = ondischargingtimechange_test.step_func(function (e) {
-        assert_true(navigator.battery.dischargingTime === Infinity, 'The value of the dischargingTime attribute must be set to Infinity.');
-        ondischargingtimechange_test.done();
-      });
-      
-      var onlevelchange_test = async_test('When the device is plugged in and the battery level is updated, must set the level attribute\'s value and fire a levelchange event.');
-      var battery_level = navigator.battery.level;
-      navigator.battery.onlevelchange = onlevelchange_test.step_func(function (e) {
-        assert_true(navigator.battery.level > 0 && navigator.battery.level < 1.0, 'The level attribute must be set to the current battery level scaled from 0 to 1.0. If the reported battery level ' + navigator.battery.level + ' is not correct, please indicate that the test has failed.');
-        onlevelchange_test.done();
-      });
-      
-      setTimeout(function() {
-        var note = document.querySelector('#note');
-        note.style.display = 'block';
-        navigator.battery.onchargingchange = function (e) {
-          if (navigator.battery.charging) {
-            note.style.display = 'none';
-          }
-        };
-      }, 4000);
-      
-      })();
-    </script>
-  </body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-plugging-in-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-plugging-in-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-plugging-in-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-plugging-in-manual.html	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Battery Test: battery not full, charger plugging in</title>
+<meta name="flags" content="interact">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #note {
+    background-color: #fef1b5;
+    border: solid 1px #cdab2d;
+    padding: 5px;
+    margin: 15px;
+    display: block;
+  }
+</style>
+
+<h2>Description</h2>
+<p>
+  This test validates that all of the navigator.battery attributes exist and are set to correct values, with corresponding events fired, when the charger is plugged in.
+</p>
+
+<h2>Preconditions</h2>
+<ol>
+  <li>
+    The device is unplugged from the charger before this test is run.
+  </li>
+  <li>
+    The battery must not be full or reach full capacity during the time the test is run.
+  </li>
+</ol>
+
+<div id="note">
+  Plug in the charger and wait for all the tests to complete.
+</div>
+
+<div id="log"></div>
+
+<script>
+
+(function() {
+
+  setup({ explicit_timeout: true });
+
+  var onchargingchange_test = async_test('When the device is plugged in and its charging state is updated, must set the charging attribute\'s value to true and fire a chargingchange event.');
+  var onchargingtimechange_test = async_test('When the device is plugged in and its charging time is updated, must set the chargingTime attribute\'s value and fire a chargingtimechange event.');
+  var ondischargingtimechange_test = async_test('When the device is plugged in and its discharging time is updated, must set the dischargingTime attribute\'s value to Infinity and fire a dischargingtimechange event.');
+  var onlevelchange_test = async_test('When the device is plugged in and the battery level is updated, must set the level attribute\'s value and fire a levelchange event.');
+
+  var batterySuccess = function (battery) {
+    battery.onchargingchange = onchargingchange_test.step_func(function () {
+      assert_true(battery.charging, 'The charging attribute must be set to true.');
+      onchargingchange_test.done();
+    });
+
+    var battery_chargingtime = battery.chargingTime;
+    battery.onchargingtimechange = onchargingtimechange_test.step_func(function () {
+      assert_less_than(battery.chargingTime, battery_chargingtime, 'The value of the chargingTime attribute must decrease.');
+      onchargingtimechange_test.done();
+    });
+
+    battery.ondischargingtimechange = ondischargingtimechange_test.step_func(function () {
+      assert_equals(battery.dischargingTime, Infinity, 'The value of the dischargingTime attribute must be set to Infinity.');
+      ondischargingtimechange_test.done();
+    });
+
+    battery.onlevelchange = onlevelchange_test.step_func(function () {
+      assert_greater_than(battery.level, 0);
+      assert_less_than(battery.level, 1.0);
+      onlevelchange_test.done();
+    });
+  };
+
+  var batteryFailure = function (error) {
+    onchargingchange_test.step(function () {
+      assert_unreached(error.message);
+    });
+    onchargingchange_test.done();
+
+    onchargingtimechange_test.step(function () {
+      assert_unreached(error.message);
+    });
+    onchargingtimechange_test.done();
+
+    ondischargingtimechange_test.step(function () {
+      assert_unreached(error.message);
+    });
+    ondischargingtimechange_test.done();
+
+    onlevelchange_test.step(function () {
+      assert_unreached(error.message);
+     });
+    onlevelchange_test.done();
+  };
+
+  navigator.getBattery().then(batterySuccess, batteryFailure);
+
+})();
+
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-unplugged-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-unplugged-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-unplugged-manual.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-unplugged-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Battery Status API Test Suite</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="countdown.js"></script>
-    <link rel="stylesheet" href="/resources/testharness.css" media="all"/>
-    <style>
-      #note { background-color: #fef1b5; border: solid 1px #cdab2d; padding: 5px; margin: 15px; display: none; }
-    </style>
-    <meta name="flags" content="interact">
-  </head>
-  <body>
-    <h1>Description</h1>
-    <p>
-      This test validates that all of the navigator.battery attributes exist and are set to correct values, with corresponding events fired, when the charger is unplugged.
-    </p>
-    <h2>Preconditions</h2>
-    <ol>
-      <li>
-        The device is plugged in to the charger before this test is run.
-      </li>
-      <li>
-        The battery must not be full or reach full capacity during the time the test is run.
-      </li>
-    </ol>
-    <p>
-      The highest prime number discovered so far is:  <output id="prime"></output>
-    </p>
-    <div id="note">
-      Unplug the charger and wait for all the tests to complete.
-    </div>
-    <div id="log"></div>
-    <script>
-    (function() {
-
-      setup({ explicit_timeout: true });
-      
-      var onchargingchange_test = async_test('When the device is unplugged in and its charging state is updated, must set the charging attribute\'s value to false and fire a chargingchange event.');
-      navigator.battery.onchargingchange = onchargingchange_test.step_func(function (e) {
-        assert_false(navigator.battery.charging, 'The charging attribute must be set to false.')
-        onchargingchange_test.done();
-      });
-      
-      var onchargingtimechange_test = async_test('When the device is unplugged in and its charging time is updated, must set the chargingTime attribute\'s value to Infinity and fire a chargingtimechange event.');
-      var battery_chargingtime = navigator.battery.chargingTime;
-      navigator.battery.onchargingtimechange = onchargingtimechange_test.step_func(function (e) {
-        assert_true(navigator.battery.chargingTime === Infinity, 'The value of the chargingTime attribute must be set to Infinity.');
-        onchargingtimechange_test.done();
-      });
-      
-      var ondischargingtimechange_test = async_test('When the device is unplugged in and its discharging time is updated, must set the dischargingTime attribute\'s value and fire a dischargingtimechange event.  If the reported discharging time ' + navigator.battery.dischargingTime + ' seconds or ' + Math.round(navigator.battery.dischargingTime/60) + ' minutes is not correct, please indicate that the test has failed.');
-      var battery_dischargingtime = navigator.battery.dischargingTime;
-      navigator.battery.ondischargingtimechange = ondischargingtimechange_test.step_func(function (e) {
-        assert_true(navigator.battery.dischargingTime < Infinity, 'The value of the dischargingTime attribute must be set to the remaining discharging time.');
-        ondischargingtimechange_test.done();
-      });
-      
-      var onlevelchange_test = async_test('When the device is plugged in and the battery level is updated, must set the level attribute\'s value and fire a levelchange event.');
-      var battery_level = navigator.battery.level;
-      
-      // compute primes to deplete the battery faster
-      var w = new Worker('prime.js');
-      w.postMessage('compute');
-      w.onmessage = function (e) {
-        document.querySelector('#prime').textContent = e.data;
-      };
-      
-      navigator.battery.onlevelchange = onlevelchange_test.step_func(function (e) {
-        assert_true(navigator.battery.level > 0 && navigator.battery.level < 1.0, 'The level attribute must be set to the current battery level scaled from 0 to 1.0.');
-        onlevelchange_test.done();
-        w.terminate();
-      });
-
-      add_completion_callback(function () {
-        w.terminate();
-      });
-
-      setTimeout(function() {
-        var note = document.querySelector('#note');
-        note.style.display = 'block';
-        navigator.battery.onchargingchange = function (e) {
-          if (!navigator.battery.charging) {
-            note.style.display = 'none';
-          }
-        };
-      }, 4000);
-      
-      })();
-    </script>
-  </body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-unplugging-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-unplugging-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/battery-unplugging-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/battery-unplugging-manual.html	2015-02-28 15:03:04.000000000 +0000
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Battery Test: battery not full, charger unplugging</title>
+<meta name="flags" content="interact">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #note {
+    background-color: #fef1b5;
+    border: solid 1px #cdab2d;
+    padding: 5px;
+    margin: 15px;
+    display: block;
+  }
+</style>
+
+<h2>Description</h2>
+<p>
+  This test validates that all of the navigator.battery attributes exist and are set to correct values, with corresponding events fired, when the charger is unplugged.
+</p>
+
+<h2>Preconditions</h2>
+<ol>
+  <li>
+    The device is plugged in to the charger before this test is run.
+  </li>
+  <li>
+    The battery must not be full or reach full capacity during the time the test is run.
+  </li>
+</ol>
+<p>
+  The highest prime number discovered so far is:  <output id="prime"></output>
+</p>
+
+<div id="note">
+  Unplug the charger and wait for all the tests to complete.
+</div>
+
+<div id="log"></div>
+
+<script>
+
+(function() {
+
+  setup({ explicit_timeout: true });
+
+  var onchargingchange_test = async_test('When the device is unplugged in and its charging state is updated, must set the charging attribute\'s value to false and fire a chargingchange event.');
+  var onchargingtimechange_test = async_test('When the device is unplugged in and its charging time is updated, must set the chargingTime attribute\'s value to Infinity and fire a chargingtimechange event.');
+  var ondischargingtimechange_test = async_test('When the device is unplugged in and its discharging time is updated, must set the dischargingTime attribute\'s value and fire a dischargingtimechange event.');
+  var onlevelchange_test = async_test('When the device is plugged in and the battery level is updated, must set the level attribute\'s value and fire a levelchange event.');
+
+  var batterySuccess = function (battery) {
+    battery.onchargingchange = onchargingchange_test.step_func(function () {
+      assert_false(battery.charging, 'The charging attribute must be set to false.');
+      onchargingchange_test.done();
+    });
+
+    battery.onchargingtimechange = onchargingtimechange_test.step_func(function () {
+      assert_equals(battery.chargingTime, Infinity, 'The value of the chargingTime attribute must be set to Infinity.');
+      onchargingtimechange_test.done();
+    });
+
+    battery.ondischargingtimechange = ondischargingtimechange_test.step_func(function () {
+      assert_less_than(battery.dischargingTime, Infinity, 'The value of the dischargingTime attribute must be set to the remaining discharging time.');
+      ondischargingtimechange_test.done();
+    });
+
+    battery.onlevelchange = onlevelchange_test.step_func(function () {
+      assert_greater_than(battery.level, 0);
+      assert_less_than(battery.level, 1.0);
+      onlevelchange_test.done();
+      w.terminate();
+    });
+  };
+
+  var batteryFailure = function (error) {
+    onchargingchange_test.step(function () {
+      assert_unreached(error.message);
+     });
+    onchargingchange_test.done();
+
+    onchargingtimechange_test.step(function () {
+      assert_unreached(error.message);
+    });
+    onchargingtimechange_test.done();
+
+    ondischargingtimechange_test.step(function () {
+      assert_unreached(error.message);
+    });
+    ondischargingtimechange_test.done();
+
+    onlevelchange_test.step(function () {
+      assert_unreached(error.message);
+    });
+    onlevelchange_test.done();
+  };
+
+  // compute primes to deplete the battery faster
+  var w = new Worker('prime.js');
+  w.postMessage('compute');
+  w.onmessage = function (e) {
+    document.querySelector('#prime').textContent = e.data;
+  };
+
+  add_completion_callback(function () {
+    w.terminate();
+  });
+
+  navigator.getBattery().then(batterySuccess, batteryFailure);
+
+})();
+
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/countdown.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/countdown.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/battery-status/countdown.js	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/battery-status/countdown.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-function countdown(prop) {
-  var seconds = !isNaN(parseInt(prop.timeout, 10)) ? (prop.timeout / 1000) : 0,
-      body = document.getElementsByTagName('body')[0],
-      div = document.createElement('div'),
-      timer, remaining_time, min, sec;
-
-  add_completion_callback(function () {
-    clearInterval(timer);
-    body.removeChild(div);
-  });
-  
-  div.innerHTML = 'This test will timeout in <span id="remaining_time">...</span>';
-  body.appendChild(div);
-    
-  remaining_time = document.querySelector('#remaining_time');
-  
-  timer = setInterval(function() {
-    function zeroPad(n) {
-      return (n < 10) ? '0' + n : n;
-    }
-  
-    if (seconds / 60 >= 1) {
-      min = Math.floor(seconds / 60);
-      sec = seconds % 60;
-    } else {
-      min = 0;
-      sec = seconds;
-    }
-    
-    if (seconds === 0) {
-      div.innerHTML = 'Timeout exceeded. Increase the timeout and re-run.';
-      clearInterval(timer);
-    }
-    
-    remaining_time.textContent = zeroPad(min) + ':' + zeroPad(sec);
-    seconds--;
-  }, 1000);
-}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/common/failing-test.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/common/failing-test.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/common/failing-test.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/common/failing-test.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Failing test</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-test(function() {
-  assert_unreached("Expected failure");
-});
-</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-high-novalid.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-high-novalid.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-high-novalid.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-high-novalid.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head><meta charset="UTF-8">
-<title>accesskey attribute</title>
-</head>
-<body>
-<a href="url" accesskey="���b">this link has an accesskey attribute with an invalid surrogate pair (a high surrogate followed by a 'b')</a>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-low-novalid.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-low-novalid.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-low-novalid.html	2015-02-19 00:42:09.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/conformance-checkers/html/attributes/accesskey/surrogate-pair-low-novalid.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head><meta charset="UTF-8">
-<title>accesskey attribute</title>
-</head>
-<body>
-<a href="url" accesskey="a���">this link has an accesskey attribute with an invalid surrogate pair (an 'a' followed by a low surrogate)</a>
-</body>
-</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/conformance-checkers/messages.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/conformance-checkers/messages.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/conformance-checkers/messages.json	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/conformance-checkers/messages.json	2015-02-28 15:03:04.000000000 +0000
@@ -37,8 +37,6 @@
     "html-rdfalite/0319-novalid.html": "Attribute \u201cxmlns:xpr\u201d not allowed here.",
     "html/attributes/accesskey/duplicate-key-labels-novalid.html": "Bad value \u201ca b \u306c c \u306c\u201d for attribute \u201caccesskey\u201d on element \u201ca\u201d: Bad key label list: Duplicate key label. Each key label must be unique.",
     "html/attributes/accesskey/multi-character-key-label-novalid.html": "Bad value \u201ca b \u307b\u3052\u201d for attribute \u201caccesskey\u201d on element \u201ca\u201d: Bad key label list: Key label has multiple characters. Each key label must be a single character.",
-    "html/attributes/accesskey/surrogate-pair-high-novalid.html": "Bad value \u201c?b\u201d for attribute \u201caccesskey\u201d on element \u201ca\u201d: Bad key label list: Key label has multiple characters. Each key label must be a single character.",
-    "html/attributes/accesskey/surrogate-pair-low-novalid.html": "Bad value \u201ca?\u201d for attribute \u201caccesskey\u201d on element \u201ca\u201d: Bad key label list: Key label has multiple characters. Each key label must be a single character.",
     "html/attributes/data/no-characters-after-hyphen-novalid.html": "Attribute \u201cdata-\u201d not allowed on element \u201cp\u201d in this context.",
     "html/attributes/data/not-xml-serializable-novalid.html": "\u201cdata-*\u201d attribute names must be XML 1.0 4th ed. plus Namespaces NCNames.",
     "html/attributes/lang/deprecated-tag-haswarn.html": "Bad value \u201cmo\u201d for attribute \u201clang\u201d on element \u201cbody\u201d: Bad language tag: The language subtag \u201cmo\u201d is deprecated. Use \u201cro\u201d instead.",
@@ -1568,8 +1566,9 @@
     "html/elements/picture/img-no-src-with-source-novalid.html": "Element \u201cimg\u201d is missing required attribute \u201csrc\u201d.",
     "html/elements/picture/img-no-src-with-srcset-and-picture-novalid.html": "Element \u201cimg\u201d is missing required attribute \u201csrc\u201d.",
     "html/elements/picture/img-no-src-with-srcset-novalid.html": "Element \u201cimg\u201d is missing required attribute \u201csrc\u201d.",
-    "html/elements/picture/img-srcset-no-descriptor-with-sizes-novalid.html": "Bad value \u201cx\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: No width specified for image \u201cx\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must  specify a width.)",
-    "html/elements/picture/img-srcset-w-and-x-width-sizes-novalid.html": "Bad value \u201cx 100w, y 2x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected width descriptor but found \u201c2x\u201d at \u201cx 100w, y 2x\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must  specify a width.)",
+    "html/elements/picture/img-srcset-no-descriptor-with-sizes-novalid.html": "Bad value \u201cx\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: No width specified for image \u201cx\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
+    "html/elements/picture/img-srcset-w-and-x-width-sizes-novalid.html": "Bad value \u201cx 100w, y 2x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected width descriptor but found \u201c2x\u201d at \u201cx 100w, y 2x\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
+    "html/elements/picture/img-srcset-w-no-sizes-novalid.html": "When the \u201csrcset\u201d attribute has any image candidate string with a width descriptor, the \u201csizes\u201d attribute must also be present.",
     "html/elements/picture/img-type-novalid.html": "Attribute \u201ctype\u201d not allowed on element \u201cimg\u201d in this context.",
     "html/elements/picture/img-type-with-picture-novalid.html": "Attribute \u201ctype\u201d not allowed on element \u201cimg\u201d in this context.",
     "html/elements/picture/img-with-sizes-no-srcset-novalid.html": "The \u201csizes\u201d attribute may be specified only if the \u201csrcset\u201d attribute is also present.",
@@ -1692,9 +1691,11 @@
     "html/elements/picture/source-no-srcset-with-type-novalid.html": "Element \u201csource\u201d is missing required attribute \u201csrcset\u201d.",
     "html/elements/picture/source-src-novalid.html": "Attribute \u201csrc\u201d not allowed on element \u201csource\u201d in this context.",
     "html/elements/picture/source-src-srcset-novalid.html": "Attribute \u201csrc\u201d not allowed on element \u201csource\u201d in this context.",
-    "html/elements/picture/source-srcset-h-with-sizes-novalid.html": "Bad value \u201cx 100h, y 200h\u201d for attribute \u201csrcset\u201d on element \u201csource\u201d: Expected width descriptor but found \u201c100h\u201d at \u201cx 100h,\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must  specify a width.)",
-    "html/elements/picture/source-srcset-w-and-x-with-sizes-novalid.html": "Bad value \u201cx 100w, y 2x\u201d for attribute \u201csrcset\u201d on element \u201csource\u201d: Expected width descriptor but found \u201c2x\u201d at \u201cx 100w, y 2x\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must  specify a width.)",
-    "html/elements/picture/source-srcset-x-with-sizes-novalid.html": "Bad value \u201cx 1x, y 2x\u201d for attribute \u201csrcset\u201d on element \u201csource\u201d: Expected width descriptor but found \u201c1x\u201d at \u201cx 1x,\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must  specify a width.)",
+    "html/elements/picture/source-srcset-h-with-sizes-novalid.html": "Bad value \u201cx 100h, y 200h\u201d for attribute \u201csrcset\u201d on element \u201csource\u201d: Expected width descriptor but found \u201c100h\u201d at \u201cx 100h,\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
+    "html/elements/picture/source-srcset-w-and-x-with-sizes-novalid.html": "Bad value \u201cx 100w, y 2x\u201d for attribute \u201csrcset\u201d on element \u201csource\u201d: Expected width descriptor but found \u201c2x\u201d at \u201cx 100w, y 2x\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
+    "html/elements/picture/source-srcset-w-no-sizes-novalid.html": "When the \u201csrcset\u201d attribute has any image candidate string with a width descriptor, the \u201csizes\u201d attribute must also be present.",
+    "html/elements/picture/source-srcset-x-with-sizes-novalid.html": "Bad value \u201cx 1x, y 2x\u201d for attribute \u201csrcset\u201d on element \u201csource\u201d: Expected width descriptor but found \u201c1x\u201d at \u201cx 1x,\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
+    "html/elements/picture/source-type-srcset-w-novalid.html": "When the \u201csrcset\u201d attribute has any image candidate string with a width descriptor, the \u201csizes\u201d attribute must also be present.",
     "html/elements/picture/source-usemap-novalid.html": "Attribute \u201cusemap\u201d not allowed on element \u201csource\u201d in this context.",
     "html/elements/picture/source-vspace-novalid.html": "Attribute \u201cvspace\u201d not allowed on element \u201csource\u201d in this context.",
     "html/elements/picture/source-width-novalid.html": "Attribute \u201cwidth\u201d not allowed on element \u201csource\u201d in this context.",
@@ -1704,7 +1705,7 @@
     "html/elements/picture/srcset-microsyntax-curly-bracket-junk-novalid.html": "Bad value \u201cx {, y 1x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected number followed by \u201cw\u201d or \u201cx\u201d but found \u201c{\u201d at \u201cx {,\u201d.",
     "html/elements/picture/srcset-microsyntax-empty-novalid.html": "Bad value \u201c\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Must contain one or more image candidate strings.",
     "html/elements/picture/srcset-microsyntax-function-novalid.html": "Bad value \u201cx foobar(baz quux, lol), y 1x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected number followed by \u201cw\u201d or \u201cx\u201d but found \u201cfoobar(baz quux, lol))\u201d at \u201c\u2026baz quux, lol),\u201d.",
-    "html/elements/picture/srcset-microsyntax-h-novalid.html": "Bad value \u201cx 1h\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected number followed by \u201cw\u201d or \u201cx\u201d but found \u201c1h\u201d at \u201cx 1h\u201d.",
+    "html/elements/picture/srcset-microsyntax-h-novalid.html": "Bad value \u201cx 1h\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected width descriptor but found \u201c1h\u201d at \u201cx 1h\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
     "html/elements/picture/srcset-microsyntax-infinity-x-novalid.html": "Bad value \u201cx Infinityx\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Bad positive floating point number: Expected a digit but saw \u201cI\u201d instead at \u201cx Infinityx\u201d.",
     "html/elements/picture/srcset-microsyntax-leading-comma-multiple-novalid.html": "Bad value \u201c,,,x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Starts with empty image-candidate string.",
     "html/elements/picture/srcset-microsyntax-leading-comma-novalid.html": "Bad value \u201c,x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Starts with empty image-candidate string.",
@@ -1727,11 +1728,11 @@
     "html/elements/picture/srcset-microsyntax-unique-descriptors-2x-novalid.html": "Bad value \u201cx 2x, y 2x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Density for image \u201cy\u201d is identical to density for image \u201cx\u201d.",
     "html/elements/picture/srcset-microsyntax-unique-descriptors-integer-and-decimals-x-novalid.html": "Bad value \u201cx 1x, y 1.0x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Density for image \u201cy\u201d is identical to density for image \u201cx\u201d.",
     "html/elements/picture/srcset-microsyntax-unique-descriptors-w-novalid.html": "Bad value \u201cx 1w, y 1w\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Width for image \u201cy\u201d is identical to width for image \u201cx\u201d.",
-    "html/elements/picture/srcset-microsyntax-uppercase-w-novalid.html": "Bad value \u201cx 1W\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected number followed by \u201cw\u201d or \u201cx\u201d but found \u201c1W\u201d at \u201cx 1W\u201d.",
+    "html/elements/picture/srcset-microsyntax-uppercase-w-novalid.html": "Bad value \u201cx 1W\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected width descriptor but found \u201c1W\u201d at \u201cx 1W\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
     "html/elements/picture/srcset-microsyntax-w-and-h-novalid.html": "Bad value \u201cx 1w 1h\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected single descriptor but found extraneous descriptor \u201c1h\u201d at \u201cx 1w 1h\u201d.",
-    "html/elements/picture/srcset-microsyntax-w-and-no-descriptor-novalid.html": "Bad value \u201cx 1w, y\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: No width specified for image \u201cy\u201d. (Because one or more image candidate strings specify a width (e.g., the string for image \u201cx\u201d), all image candidate strings must  specify a width.)",
-    "html/elements/picture/srcset-microsyntax-x-and-h-novalid.html": "Bad value \u201cx 1x 1h\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected single descriptor but found extraneous descriptor \u201c1h\u201d at \u201cx 1x 1h\u201d.",
-    "html/elements/picture/srcset-microsyntax-x-and-w-novalid.html": "Bad value \u201cx 1x 1w\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected single descriptor but found extraneous descriptor \u201c1w\u201d at \u201cx 1x 1w\u201d.",
+    "html/elements/picture/srcset-microsyntax-w-and-no-descriptor-novalid.html": "Bad value \u201cx 1w, y\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: No width specified for image \u201cy\u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
+    "html/elements/picture/srcset-microsyntax-x-and-h-novalid.html": "Bad value \u201cx 1x 1h\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected width descriptor but found \u201c1x\u201d at \u201cx 1x \u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
+    "html/elements/picture/srcset-microsyntax-x-and-w-novalid.html": "Bad value \u201cx 1x 1w\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected width descriptor but found \u201c1x\u201d at \u201cx 1x \u201d. (When the \u201csizes\u201d attribute is present, all image candidate strings must specify a width.)",
     "html/elements/picture/srcset-microsyntax-zero-w-novalid.html": "Bad value \u201cx 0w\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Expected number greater than zero but found \u201c0\u201d at \u201cx 0w\u201d.",
     "html/elements/picture/srcset-microsyntax-zero-x-novalid.html": "Bad value \u201cx 0x\u201d for attribute \u201csrcset\u201d on element \u201cimg\u201d: Bad positive floating point number: Zero is not a valid positive floating point number at \u201cx 0x\u201d.",
     "html/elements/picture/svg-image-srcset-novalid.html": "Attribute \u201csrcset\u201d not allowed on element \u201cimage\u201d in this context.",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,31 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Synthetic popstate events</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function () {
+  assert_throws('NotSupportedError', function() {
+    document.createEvent('PopStateEvent');
+  }, 'document.createEvent("PopStateEvent") should not be supported');
+}, 'document.createEvent');
+
+test(function () {
+  assert_false('initPopStateEvent' in PopStateEvent.prototype,
+               'There should be no PopStateEvent#initPopStateEvent');
+}, 'initPopStateEvent');
+
+test(function () {
+  var state = history.state;
+  var data;
+  window.addEventListener('popstate', function (e) {
+    data = e.state;
+  });
+  window.dispatchEvent(new PopStateEvent('popstate', {
+    'state': {testdata:true}
+  }));
+  assert_true(data.testdata,'state data was corrupted');
+  assert_equals(history.state, state, "history.state was NOT set by dispatching the event");
+}, 'Dispatching a synthetic PopStateEvent');
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/browsers/history/the-history-interface/003.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/browsers/history/the-history-interface/003.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/browsers/history/the-history-interface/003.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/browsers/history/the-history-interface/003.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<!doctype html>
-<html>
-	<head>
-		<title>Synthetic popstate events</title>
-		<script type="text/javascript" src="/resources/testharness.js"></script>
-		<script type="text/javascript" src="/resources/testharnessreport.js"></script>
-		<script type="text/javascript">
-var PSEvent, globaldata;
-test(function () {
-	assert_true( !!window.PopStateEvent );
-}, 'PopStateEvent should be exposed for prototyping');
-test(function () {
-	PSEvent = document.createEvent('PopStateEvent');
-	assert_true( !!PSEvent.initPopStateEvent, 'browser created a generic event instead of a PopStateEvent' );
-}, 'document.createEvent should create a PopStateEvent');
-test(function () {
-	PSEvent.initPopStateEvent('popstate',false,true,{testdata:true});
-}, 'initPopStateEvent should initialise the event');
-test(function () {
-	assert_false(PSEvent.bubbles);
-	assert_true(PSEvent.cancelable);
-	assert_equals(PSEvent.type,'popstate');
-	assert_true( PSEvent.state && PSEvent.state.testdata );
-}, 'initPopStateEvent properties should hold the requested values');
-test(function () {
-	assert_true(PSEvent instanceof window.PopStateEvent);
-}, 'the resulting object should be instanceof PopStateEvent');
-test(function () {
-	assert_true(PSEvent instanceof Event);
-}, 'the resulting object should be instanceof Event');
-window.addEventListener('popstate',function (e) { globaldata = e.state; },false);
-test(function () {
-	window.dispatchEvent(PSEvent);
-}, 'initPopStateEvent should be dispatchable on the window object');
-test(function () {
-	assert_true(!!globaldata,'state data was lost');
-	assert_true(globaldata.testdata,'state data was corrupted');
-}, 'state data should be retained correctly when dispatching the event');
-		</script>
-	</head>
-	<body>
-
-		<noscript><p>Enable JavaScript and reload</p></noscript>
-		<div id="log"></div>
-
-	</body>
-</html>
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/dom/interfaces.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/dom/interfaces.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/dom/interfaces.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/dom/interfaces.html	2015-02-28 15:03:05.000000000 +0000
@@ -13,8 +13,12 @@
 
 <!-- URLUtils* stubs -->
 <script type=text/plain class=untested>
-interface URLUtils {};
-interface URLUtilsReadOnly {};
+interface URLUtils {
+  stringifier;
+};
+interface URLUtilsReadOnly {
+  stringifier;
+};
 </script>
 <!-- DOM IDLs -->
 <script type=text/plain class=untested>
@@ -3338,7 +3342,7 @@
 		BarProp: [],
 		History: ['window.history'],
 		Location: ['window.location'],
-		PopStateEvent: [],
+		PopStateEvent: ['new PopStateEvent("popstate", { data: {} })'],
 		HashChangeEvent: [],
 		PageTransitionEvent: [],
 		BeforeUnloadEvent: [],
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html	2015-02-28 15:03:05.000000000 +0000
@@ -31,3 +31,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html	2015-02-28 15:03:05.000000000 +0000
@@ -33,3 +33,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html	2015-02-28 15:03:05.000000000 +0000
@@ -32,3 +32,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.arguments.missing.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.casesensitive.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.emptystring.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badname.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.badsuffix.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.nullsuffix.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/context.unrecognised.unicode.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.basic.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.multiple.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/fallback.nested.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.colour.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html	2015-02-28 15:03:05.000000000 +0000
@@ -100,3 +100,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.clip.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.different.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.gradient.html	2015-02-28 15:03:05.000000000 +0000
@@ -33,3 +33,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.path.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.pattern.html	2015-02-28 15:03:05.000000000 +0000
@@ -33,3 +33,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.same.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.transform.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.dataURI.html	2015-02-28 15:03:05.000000000 +0000
@@ -37,3 +37,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.canvas.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -32,3 +32,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.drawImage.image.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.fillStyle.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -34,3 +34,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.strokeStyle.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -34,3 +34,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.canvas.timing.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -37,3 +37,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.create.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 });
 </script>
 <img src="http://{{domains[www]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.cross.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -35,3 +35,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.fillStyle.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.pattern.image.strokeStyle.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.reset.sub.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.reset.sub.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.reset.sub.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/security.reset.sub.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 });
 </script>
 <img src="http://{{domains[www2]}}:{{ports[http][0]}}/images/yellow.png" id="yellow.png" class="resource">
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.default.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.html	2015-02-28 15:03:05.000000000 +0000
@@ -47,3 +47,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.idl.set.zero.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html	2015-02-28 15:03:05.000000000 +0000
@@ -27,3 +27,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html	2015-02-19 00:42:10.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html	2015-02-28 15:03:05.000000000 +0000
@@ -12,8 +12,8 @@
 
 
 <p class="output">Actual output:</p>
-<canvas id="c" class="output" width="
-	100" height="
+<canvas id="c" class="output" width="
+	100" height="
 	100"><p class="fallback">FAIL (fallback content)</p></canvas>
 <p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.whitespace.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
@@ -24,8 +24,8 @@
 _assertSame(canvas.width, 100, "canvas.width", "100");
 _assertSame(canvas.height, 100, "canvas.height", "100");
 _assertSame(window.getComputedStyle(canvas, null).getPropertyValue("width"), "100px", "window.getComputedStyle(canvas, null).getPropertyValue(\"width\")", "\"100px\"");
-_assertSame(canvas.getAttribute('width'), '\r\n\t\x0c100', "canvas.getAttribute('width')", "'\\r\\n\\t\\x0c100'");
-_assertSame(canvas.getAttribute('height'), '\r\n\t\x0c100', "canvas.getAttribute('height')", "'\\r\\n\\t\\x0c100'");
+_assertSame(canvas.getAttribute('width'), '\n\t\x0c100', "canvas.getAttribute('width')", "'\\n\\t\\x0c100'");
+_assertSame(canvas.getAttribute('height'), '\n\t\x0c100', "canvas.getAttribute('height')", "'\\n\\t\\x0c100'");
 
 
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html	2015-02-28 15:03:05.000000000 +0000
@@ -28,3 +28,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setcontent.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidl.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.reflect.setidlzero.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.removed.html	2015-02-28 15:03:05.000000000 +0000
@@ -26,3 +26,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html	2015-02-28 15:03:05.000000000 +0000
@@ -30,3 +30,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.1.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.2.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.arguments.3.html	2015-02-28 15:03:05.000000000 +0000
@@ -26,3 +26,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.bogustype.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.default.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.alpha.html	2015-02-28 15:03:05.000000000 +0000
@@ -42,3 +42,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.primarycolours.html	2015-02-28 15:03:05.000000000 +0000
@@ -45,3 +45,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.basic.html	2015-02-28 15:03:05.000000000 +0000
@@ -53,3 +53,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.notnumber.html	2015-02-28 15:03:05.000000000 +0000
@@ -39,3 +39,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.jpeg.quality.outsiderange.html	2015-02-28 15:03:05.000000000 +0000
@@ -40,3 +40,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.ascii.html	2015-02-28 15:03:05.000000000 +0000
@@ -32,3 +32,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.lowercase.unicode.html	2015-02-28 15:03:05.000000000 +0000
@@ -29,3 +29,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.nocontext.html	2015-02-28 15:03:05.000000000 +0000
@@ -26,3 +26,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.complexcolours.html	2015-02-28 15:03:05.000000000 +0000
@@ -45,3 +45,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.png.primarycolours.html	2015-02-28 15:03:05.000000000 +0000
@@ -45,3 +45,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.unrecognised.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zeroheight.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerosize.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/toDataURL.zerowidth.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.delete.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.delete.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.delete.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.delete.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.exists.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.exists.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.exists.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.exists.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.extend.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.extend.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.extend.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.extend.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.name.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.name.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.name.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.name.html	2015-02-28 15:03:05.000000000 +0000
@@ -24,3 +24,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.prototype.html	2015-02-28 15:03:05.000000000 +0000
@@ -33,3 +33,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.replace.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.replace.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.replace.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/embedded-content/the-canvas-element/type.replace.html	2015-02-28 15:03:05.000000000 +0000
@@ -25,3 +25,4 @@
 
 });
 </script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/files.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/files.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/files.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/forms/the-input-element/files.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,49 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>HTMLInputElement#files</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+var types = [
+  "hidden",
+  "text",
+  "search",
+  "tel",
+  "url",
+  "email",
+  "password",
+  "datetime",
+  "date",
+  "month",
+  "week",
+  "time",
+  "datetime-local",
+  "number",
+  "range",
+  "color",
+  "checkbox",
+  "radio",
+  "submit",
+  "image",
+  "reset",
+  "button",
+];
+
+types.forEach(function(type) {
+  test(function() {
+    var input = document.createElement("input");
+    input.type = type;
+    assert_equals(input.files, null, "files should be null");
+  }, "files for input type=" + type);
+});
+
+test(function() {
+  var input = document.createElement("input");
+  input.type = "file";
+  assert_not_equals(input.files, null);
+  assert_true(input.files instanceof FileList, "files should be a FileList");
+  var files = input.files;
+  assert_equals(input.files, files, "files should return the same object");
+}, "files for input type=file");
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.html	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/script-for-event.html	2015-02-28 15:03:05.000000000 +0000
@@ -5,37 +5,49 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <script>
-var run = [true, true, true, true, true, true, true, true];
+var run = [false, false, false, false, false, false, false, false, false, false, false, false];
 </script>
 <script for="w&#x130;ndow" event="onload">
-run[0] = false;
+run[0] = true;
 </script>
 <script for="window" event="onload x">
-run[1] = false;
+run[1] = true;
 </script>
 <script for="window" event="onload(x">
-run[2] = false;
+run[2] = true;
 </script>
 <script for="window" event="onload(x)">
-run[3] = false;
+run[3] = true;
 </script>
 <script for="window" event="onclick">
-run[4] = false;
+run[4] = true;
 </script>
 <script for="" event="onload">
-run[5] = false;
+run[5] = true;
 </script>
 <script for="window" event="">
-run[6] = false;
+run[6] = true;
 </script>
 <script for="" event="">
-run[7] = false;
+run[7] = true;
+</script>
+<script for="&#xa0;window" event="onload">
+run[8] = true;
+</script>
+<script for="window&#xa0;" event="onload">
+run[9] = true;
+</script>
+<script for="window" event="&#xa0;onload">
+run[10] = true;
+</script>
+<script for="window" event="onload&#xa0;">
+run[11] = true;
 </script>
 <script>
 test(function() {
   for (var i = 0; i < run.length; ++i) {
     test(function() {
-      assert_true(run[i]);
+      assert_false(run[i]);
     }, "Script " + i);
   }
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/syntax/parsing/the-end.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/syntax/parsing/the-end.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html/syntax/parsing/the-end.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html/syntax/parsing/the-end.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,40 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>The end</title>
+<link rel=help href="https://html.spec.whatwg.org/multipage/#the-end">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+async_test(function() {
+  document.addEventListener("DOMContentLoaded", this.step_func_done(function(e) {
+    assert_equals(e.type, "DOMContentLoaded");
+    assert_true(e.bubbles, "bubbles should be true");
+    assert_false(e.cancelable, "cancelable should be false");
+    assert_equals(e.target, document, "target should be document");
+    assert_true(e.isTrusted, "isTrusted should be true");
+    assert_class_string(e, "Event");
+  }));
+}, "DOMContentLoaded");
+
+async_test(function() {
+  window.addEventListener("load", this.step_func_done(function(e) {
+    assert_equals(e.type, "load");
+    assert_false(e.bubbles, "bubbles should be false");
+    assert_false(e.cancelable, "cancelable should be false");
+    assert_equals(e.target, document, "target should be document");
+    assert_true(e.isTrusted, "isTrusted should be true");
+    assert_class_string(e, "Event");
+  }));
+}, "load");
+
+async_test(function() {
+  var seen = false;
+  document.addEventListener("DOMContentLoaded", this.step_func(function() {
+    seen = true;
+  }));
+  window.addEventListener("load", this.step_func_done(function() {
+    assert_true(seen, "DOMContentLoaded should be fired before load");
+  }));
+}, "order");
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_audio_cancel-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_audio_cancel-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_audio_cancel-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_audio_cancel-manual.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>HTML Media Capture Test: user denial of captured audio leading to no capture</title>
+<link rel='author' title='Intel' href='http://www.intel.com'>
+<link rel='help' href='http://dev.w3.org/2009/dap/camera/#attributes'>
+<link rel='help' href='http://www.w3.org/TR/html5/forms.html#attr-input-accept'>
+<meta name='flags' content='interact'>
+
+<p>Clear all microphone permissions before running this test. If prompted for permission, please allow.</p>
+
+<p>After hitting the button below</p>
+
+<ul>
+
+  <li>capture an audio and then cancel the capturing;</li>
+
+  <li>capture an audio and then confirm the capturing.</li>
+
+</ul>
+
+<p>Test passes if there is no captured audio saved to the system's data storage.</p>
+
+<input type='file' accept='audio/*' capture>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_audio-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_audio-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_audio-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_audio-manual.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>HTML Media Capture Test: capture audio to produce one audio file</title>
+<link rel='author' title='Intel' href='http://www.intel.com'>
+<link rel='help' href='http://dev.w3.org/2009/dap/camera/#attributes'>
+<link rel='help' href='http://www.w3.org/TR/html5/forms.html#attr-input-accept'>
+<meta name='flags' content='interact'>
+<meta name="timeout" content="long">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+
+<p>Clear all microphone permissions before running this test. If prompted for permission, please allow.</p>
+
+<p>After hitting the button below, capture an audio and then confirm the capturing.</p>
+
+<p>Note: All the actions need to be done in 60 seconds, otherwise it will get TIMEOUT.</p>
+
+<input type='file' accept='audio/*' capture>
+
+<div id='log'></div>
+
+<script>
+  var input;
+
+  setup(function() {
+    input = document.querySelector('input[type=file]');
+  }, {explicit_done: true});
+
+  async_test(function(t) {
+    input.onchange = t.step_func_done(function() {
+      assert_equals(input.files.length, 1, 'Should capture one file');
+      assert_regexp_match(input.files[0].type, /^audio\//, 'The captured file should be type of audio');
+    });
+    done();
+  });
+</script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_image_cancel-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_image_cancel-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_image_cancel-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_image_cancel-manual.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>HTML Media Capture Test: user denial of captured image leading to no capture</title>
+<link rel='author' title='Intel' href='http://www.intel.com'>
+<link rel='help' href='http://dev.w3.org/2009/dap/camera/#attributes'>
+<link rel='help' href='http://www.w3.org/TR/html5/forms.html#attr-input-accept'>
+<meta name='flags' content='interact'>
+
+<p>Clear all camera permissions before running this test. If prompted for permission, please allow.</p>
+
+<p>After hitting the button below</p>
+
+<ul>
+
+  <li>capture an image and then cancel the capturing;</li>
+
+  <li>capture an image and then confirm the capturing.</li>
+
+</ul>
+
+<p>Test passes if there is no captured image saved to the system's data storage.</p>
+
+<input type='file' accept='image/*' capture>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_image-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_image-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_image-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_image-manual.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>HTML Media Capture Test: capture image to produce one image file</title>
+<link rel='author' title='Intel' href='http://www.intel.com'>
+<link rel='help' href='http://dev.w3.org/2009/dap/camera/#attributes'>
+<link rel='help' href='http://www.w3.org/TR/html5/forms.html#attr-input-accept'>
+<meta name='flags' content='interact'>
+<meta name="timeout" content="long">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+
+<p>Clear all camera permissions before running this test. If prompted for permission, please allow.</p>
+
+<p>After hitting the button below, capture an image and then confirm the capturing.</p>
+
+<p>Note: All the actions need to be done in 60 seconds, otherwise it will get TIMEOUT.</p>
+
+<input type='file' accept='image/*' capture>
+
+<div id='log'></div>
+
+<script>
+  var input;
+
+  setup(function() {
+    input = document.querySelector('input[type=file]');
+  }, {explicit_done: true});
+
+  async_test(function(t) {
+    input.onchange = t.step_func_done(function() {
+      assert_equals(input.files.length, 1, 'Should capture one file');
+      assert_regexp_match(input.files[0].type, /^image\//, 'The captured file should be type of image');
+    });
+    done();
+  });
+</script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_video_cancel-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_video_cancel-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_video_cancel-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_video_cancel-manual.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>HTML Media Capture Test: user denial of captured video leading to no capture</title>
+<link rel='author' title='Intel' href='http://www.intel.com'>
+<link rel='help' href='http://dev.w3.org/2009/dap/camera/#attributes'>
+<link rel='help' href='http://www.w3.org/TR/html5/forms.html#attr-input-accept'>
+<meta name='flags' content='interact'>
+
+<p>Clear all camera/microphone permissions before running this test. If prompted for permission, please allow.</p>
+
+<p>After hitting the button below</p>
+
+<ul>
+
+  <li>capture an video and then cancel the capturing;</li>
+
+  <li>capture an video and then confirm the capturing.</li>
+
+</ul>
+
+<p>Test passes if there is no captured video saved to the system's data storage.</p>
+
+<input type='file' accept='video/*' capture>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_video-manual.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_video-manual.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/html-media-capture/capture_video-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/html-media-capture/capture_video-manual.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>HTML Media Capture Test: capture video to produce one video file</title>
+<link rel='author' title='Intel' href='http://www.intel.com'>
+<link rel='help' href='http://dev.w3.org/2009/dap/camera/#attributes'>
+<link rel='help' href='http://www.w3.org/TR/html5/forms.html#attr-input-accept'>
+<meta name='flags' content='interact'>
+<meta name="timeout" content="long">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+
+<p>Clear all camera/microphone permissions before running this test. If prompted for permission, please allow.</p>
+
+<p>After hitting the button below, capture an video and then confirm the capturing.</p>
+
+<p>Note: All the actions need to be done in 60 seconds, otherwise it will get TIMEOUT.</p>
+
+<input type='file' accept='video/*' capture>
+
+<div id='log'></div>
+
+<script>
+  var input;
+
+  setup(function() {
+    input = document.querySelector('input[type=file]');
+  }, {explicit_done: true});
+
+  async_test(function(t) {
+    input.onchange = t.step_func_done(function() {
+      assert_equals(input.files.length, 1, 'Should capture one file');
+      assert_regexp_match(input.files[0].type, /^video\//, 'The captured file should be type of video');
+    });
+    done();
+  });
+</script>
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/infrastructure/failing-test.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/infrastructure/failing-test.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/infrastructure/failing-test.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/infrastructure/failing-test.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Failing test</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  assert_unreached("Expected failure");
+});
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/notifications/instance.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/notifications/instance.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/notifications/instance.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/notifications/instance.html	2015-02-28 15:03:05.000000000 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Basic Notification instance tests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  var n = new Notification("Radio check",
+    {
+        dir: "ltr",
+       lang: "aa",
+       body: "This is a radio check.",
+        tag: "radio_check999",
+       icon: "http://example.com/icon.png",
+    }
+  );
+  test(function() {
+    assert_true(n instanceof Notification);
+    },"Notification instance exists.");
+  test(function() {
+    assert_true("close" in n);
+    },"Attribute exists: close");
+  test(function() {
+    assert_true("onclick" in n);
+    },"Attribute exists: onclick");
+  test(function() {
+    assert_true("onshow" in n);
+    },"Attribute exists: onshow");
+  test(function() {
+    assert_true("onerror" in n);
+    },"Attribute exists: onerror");
+  test(function() {
+    assert_true("onclose" in n);
+    },"Attribute exists: onclose");
+  test(function() {
+    assert_equals("Radio check", n.title);
+    },"Attribute exists with expected value: title");
+  test(function() {
+    assert_equals("ltr", n.dir);
+    },"Attribute exists with expected value: dir");
+  test(function() {
+    assert_equals("aa", n.lang);
+    },"Attribute exists with expected value: lang");
+  test(function() {
+    assert_equals("This is a radio check.", n.body);
+    },"Attribute exists with expected value: body");
+  test(function() {
+    assert_equals("radio_check999", n.tag);
+    },"Attribute exists with expected value: tag");
+  test(function() {
+    assert_equals("http://example.com/icon.png", n.icon);
+    },"Attribute exists with expected value: icon");
+</script>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/old-tests/submission/Microsoft/history/history_000.htm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/old-tests/submission/Microsoft/history/history_000.htm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/old-tests/submission/Microsoft/history/history_000.htm	2015-02-19 00:42:11.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/old-tests/submission/Microsoft/history/history_000.htm	2015-02-28 15:03:05.000000000 +0000
@@ -212,105 +212,6 @@
                 },
                 
                 function() {
-                    test(function() {
-                        var thrown = null;
-                        var pe;
-                        assert_own_property(window, "PopStateEvent", "window inherits PopStateEvent");
-                        try {
-                            pe = document.createEvent("PopStateEvent");
-                        } catch(e) {
-                            thrown = e;
-                        }
-                        assert_equals(thrown, null, "Creating a 'PopStateEvent' via 'document.createEvent' does not throw an exception");
-                        assert_not_equals(null, pe, "Able to create a 'PopStateEvent' via 'document.createEvent'");
-                        assert_equals(pe.constructor, window.PopStateEvent, "The created event should have the window.PopStateEvent constructor");
-                    }, "DOM Level 3 PopStateEvent is implemented");
-                 },
-                 function() {
-                    test(function() {
-                        var thrown = null;
-                        var pe;
-                        try {
-                            pe = document.createEvent("PopStateEvent");
-                            pe.initPopStateEvent('popstate', false, false, "dl3-statedata");
-                        }catch (e) {
-                            thrown = e;
-                        }
-                        assert_equals(thrown, null, "Able to initPopStateEvent");
-                        assert_equals(pe.state, "dl3-statedata", "The created PopStateEvent has correct .state data");
-                    }, "DOM Level 3 PopStateEvent can be initialized");
-                },
-                
-                function() {
-                    var t = async_test("DOM Level3 PopStateEvent fires once dispatched");
-                    t.step(function() {
-                        var thrown = null;
-                        var pe;
-                        try {
-                            pe = document.createEvent("PopStateEvent");
-                            pe.initPopStateEvent('popstate', false, false, "dl3-dispatch-statedata");
-                        }catch (e) {
-                            thrown = e;
-                        }
-                        assert_equals(thrown, null, "Able to initPopStateEvent");
-                        
-                        //event has been initialized properly
-                        //now set up the onpopstate event to successfully finish the test
-                        onpopstate = t.step_func(function(e) {
-                                t.done();
-                            });
-                            window.dispatchEvent(pe);
-                        });
-                },
-                 function() {
-                    var t = async_test("Once dispatched, DOM Level3 PopStateEvent has correct state data");
-                    t.step(function() {
-                        var thrown = null;
-                        var pe;
-                        try {
-                            pe = document.createEvent("PopStateEvent");
-                            pe.initPopStateEvent('popstate', false, false, "dl3-correct-statedata");
-                        }catch (e) {
-                            thrown = e;
-                        }
-                        assert_equals(thrown, null, "Able to initPopStateEvent");
-                    
-                        //event has been initialized properly
-                        //now set up the onpopstate event to successfully finish the test by checking the state data
-                        onpopstate = t.step_func(function(e) {
-                                assert_equals(e.state, "dl3-correct-statedata", "The state data is correctly passed to the PopStateEvent once dispatched");
-                                t.done();
-                            });
-                            window.dispatchEvent(pe);
-                        });
-                },
-                function() {
-                    var t = async_test("Dispatching DOM Level3 PopStateEvent does not alter history.state");
-                    t.step(function() {
-                        var thrown = null;
-                        var pe;
-                        //save the current history.state value for validation later on
-                        var previousState = history.state;
-                        
-                        try {
-                            pe = document.createEvent("PopStateEvent");
-                            pe.initPopStateEvent('popstate', false, false, null);
-                        }catch (e) {
-                            thrown = e;
-                        }
-                        assert_equals(thrown, null, "Able to initPopStateEvent");
-                        
-                        //event has been initialized properly
-                        //now set up the onpopstate event to successfully finish the test by validating history.state
-                        onpopstate = t.step_func(function(e) {
-                                assert_equals(history.state, previousState, "history.state was NOT set by dispatching the event");
-                                t.done();
-                            });
-                            window.dispatchEvent(pe);
-                        });
-                },
-                
-                function() {
                     var t = async_test("PopStateEvent fires on Back navigation");
                     t.step(function() {
                         history.pushState(null, null);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/workers/semantics/multiple-workers/004.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/workers/semantics/multiple-workers/004.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/web-platform/tests/workers/semantics/multiple-workers/004.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/web-platform/tests/workers/semantics/multiple-workers/004.html	2015-02-28 15:03:07.000000000 +0000
@@ -5,22 +5,30 @@
 <div id=log></div>
 <script>
 var i = 0;
-var t = async_test(function() {
-  var w1 = new SharedWorker('004-2.js', 'x');
-  w1.port.onmessage = function(e) {
-    i++;
-  };
-});
 var load_count = 0;
+
+var w1 = new SharedWorker('004-2.js', 'x');
+w1.port.onmessage = function(e) {
+  i++;
+  check_result();
+};
+
+
 function iframe_loaded() {
   load_count++;
-  if (load_count == 2) {
-    setTimeout(this.step_func(function() {
+  check_result();
+}
+
+function check_result() {
+  //timeout to allow for extra, unexpected, messages to arrive
+  if (i == 3 && load_count == 2) {
+    setTimeout(function() {
+      assert_equals(load_count, 2);
       assert_equals(i, 3);
-      this.done();
-    }), 300);
+      done();
+    }, 500);
   }
 }
 </script>
-<iframe src=004-1.html onload="t.step(iframe_loaded);"></iframe>
-<iframe src=004-1.html onload="t.step(iframe_loaded);"></iframe>
+<iframe src=004-1.html onload="iframe_loaded()"></iframe>
+<iframe src=004-1.html onload="iframe_loaded()"></iframe>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/head.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/head.js	2015-02-28 15:03:07.000000000 +0000
@@ -1417,5 +1417,6 @@
       .getService(Components.interfaces.nsIPrefBranch);
 
     prefs.setCharPref("media.gmp-manager.url.override", "http://%(server)s/dummy-gmp-manager.xml");
+    prefs.setCharPref("browser.selfsupport.url", "https://%(server)s/selfsupport-dummy/");
   }
 } catch (e) { }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/moz-http2/moz-http2.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/moz-http2/moz-http2.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/moz-http2/moz-http2.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/moz-http2/moz-http2.js	2015-02-28 15:03:07.000000000 +0000
@@ -382,7 +382,7 @@
       return;
    }
    // test the alt svc frame for use with altsvc2
-   res.altsvc("localhost", serverPort, "h2-16", 3600, req.headers['x-redirect-origin']);
+   res.altsvc("localhost", serverPort, "h2", 3600, req.headers['x-redirect-origin']);
   }
 
   else if (u.pathname === "/altsvc2") {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/example/server.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/example/server.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/example/server.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/example/server.js	2015-02-28 15:03:07.000000000 +0000
@@ -12,6 +12,13 @@
 
   // Serving server.js from cache. Useful for microbenchmarks.
   if (request.url === cachedUrl) {
+    if (response.push) {
+      // Also push down the client js, since it's possible if the requester wants
+      // one, they want both.
+      var push = response.push('/client.js');
+      push.writeHead(200);
+      fs.createReadStream(path.join(__dirname, '/client.js')).pipe(push);
+    }
     response.end(cachedFile);
   }
 
@@ -19,13 +26,6 @@
   else if ((filename.indexOf(__dirname) === 0) && fs.existsSync(filename) && fs.statSync(filename).isFile()) {
     response.writeHead('200');
 
-    // If they download the certificate, push the private key too, they might need it.
-    if (response.push && request.url === '/localhost.crt') {
-      var push = response.push('/localhost.key');
-      push.writeHead(200);
-      fs.createReadStream(path.join(__dirname, '/localhost.key')).pipe(push);
-    }
-
     fs.createReadStream(filename).pipe(response);
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/HISTORY.md thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/HISTORY.md
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/HISTORY.md	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/HISTORY.md	2015-02-28 15:03:07.000000000 +0000
@@ -1,6 +1,17 @@
 Version history
 ===============
 
+### 3.2.0 (2015-02-19) ###
+
+* Update ALPN token to final RFC version (h2).
+* Update altsvc implementation to draft 06: [draft-ietf-httpbis-alt-svc-06]
+
+[draft-ietf-httpbis-altsvc-06]: http://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-06
+
+### 3.1.2 (2015-02-17) ###
+
+* Update the example server to have a safe push example.
+
 ### 3.1.1 (2015-01-29) ###
 
 * Bugfix release.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/lib/protocol/framer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/lib/protocol/framer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/lib/protocol/framer.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/lib/protocol/framer.js	2015-02-28 15:03:07.000000000 +0000
@@ -800,39 +800,218 @@
 //     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
 //    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 //    |         Origin-Len (16)       | Origin? (*)                 ...
-//    +-------------------------------+-------------------------------+
+//    +-------------------------------+----------------+--------------+
 //    |                   Alt-Svc-Field-Value (*)                   ...
 //    +---------------------------------------------------------------+
 //
 // The ALTSVC frame contains the following fields:
 //
-// Origin-Len: An unsinged 16 bit integer indicating the length of the origin
-//    field. Must be empty for non zero stream id
+// Origin-Len: An unsigned, 16-bit integer indicating the length, in
+//    octets, of the Origin field.
 //
-// Origin: origin this directive applies to. If empty it applies to the
-//    same origin as the stream with the same id
+// Origin: An OPTIONAL sequence of characters containing ASCII
+//    serialisation of an origin ([RFC6454](http://tools.ietf.org/html/rfc6454),
+//    Section 6.2) that the alternate service is applicable to.
 //
-// Alt-Svc-Field-Value: an ascaii string corresponding to the HTTP response
-//    header field value for Alt-Svc
+// Alt-Svc-Field-Value: A sequence of octets (length determined by
+//    subtracting the length of all preceding fields from the frame
+//    length) containing a value identical to the Alt-Svc field value
+//    defined in (Section 3)[http://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-06#section-3]
+//    (ABNF production "Alt-Svc").
 
 typeSpecificAttributes.ALTSVC = ['maxAge', 'port', 'protocolID', 'host',
                                  'origin'];
 
-Serializer.ALTSVC = function writeAltSvc(frame, buffers) {
-  var hdr = frame.protocolID + "=\"" + frame.host + ":" + frame.port + "\"";
-  if (frame.maxAge) {
-   hdr += "; ma=" + frame.maxAge;
+function istchar(c) {
+  return ('!#$&\'*+-.^_`|~1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.indexOf(c) > -1);
+}
+
+function hexencode(s) {
+  var t = '';
+  for (var i = 0; i < s.length; i++) {
+    if (!istchar(s[i])) {
+      t += '%';
+      t += new Buffer(s[i]).toString('hex');
+    } else {
+      t += s[i];
+    }
   }
-  
-  buffer = new Buffer(2);
+  return t;
+}
+
+Serializer.ALTSVC = function writeAltSvc(frame, buffers) {
+  var buffer = new Buffer(2);
   buffer.writeUInt16BE(frame.origin.length, 0);
   buffers.push(buffer);
   buffers.push(new Buffer(frame.origin, 'ascii'));
-  buffers.push(new Buffer(hdr, 'ascii'));
+
+  var fieldValue = hexencode(frame.protocolID) + '="' + frame.host + ':' + frame.port + '"';
+  if (frame.maxAge !== 86400) { // 86400 is the default
+    fieldValue += "; ma=" + frame.maxAge;
+  }
+
+  buffers.push(new Buffer(fieldValue, 'ascii'));
 };
 
+function stripquotes(s) {
+  var start = 0;
+  var end = s.length;
+  while ((start < end) && (s[start] === '"')) {
+    start++;
+  }
+  while ((end > start) && (s[end - 1] === '"')) {
+    end--;
+  }
+  if (start >= end) {
+    return "";
+  }
+  return s.substring(start, end);
+}
+
+function splitNameValue(nvpair) {
+  var eq = -1;
+  var inQuotes = false;
+
+  for (var i = 0; i < nvpair.length; i++) {
+    if (nvpair[i] === '"') {
+      inQuotes = !inQuotes;
+      continue;
+    }
+    if (inQuotes) {
+      continue;
+    }
+    if (nvpair[i] === '=') {
+      eq = i;
+      break;
+    }
+  }
+
+  if (eq === -1) {
+    return {'name': nvpair, 'value': null};
+  }
+
+  var name = stripquotes(nvpair.substring(0, eq).trim());
+  var value = stripquotes(nvpair.substring(eq + 1).trim());
+  return {'name': name, 'value': value};
+}
+
+function splitHeaderParameters(hv) {
+  return parseHeaderValue(hv, ';', splitNameValue);
+}
+
+function parseHeaderValue(hv, separator, callback) {
+  var start = 0;
+  var inQuotes = false;
+  var values = [];
+
+  for (var i = 0; i < hv.length; i++) {
+    if (hv[i] === '"') {
+      inQuotes = !inQuotes;
+      continue;
+    }
+    if (inQuotes) {
+      // Just skip this
+      continue;
+    }
+    if (hv[i] === separator) {
+      var newValue = hv.substring(start, i).trim();
+      if (newValue.length > 0) {
+        newValue = callback(newValue);
+        values.push(newValue);
+      }
+      start = i + 1;
+    }
+  }
+
+  var newValue = hv.substring(start).trim();
+  if (newValue.length > 0) {
+    newValue = callback(newValue);
+    values.push(newValue);
+  }
+
+  return values;
+}
+
+function rsplit(s, delim, count) {
+  var nsplits = 0;
+  var end = s.length;
+  var rval = [];
+  for (var i = s.length - 1; i >= 0; i--) {
+    if (s[i] === delim) {
+      var t = s.substring(i + 1, end);
+      end = i;
+      rval.unshift(t);
+      nsplits++;
+      if (nsplits === count) {
+        break;
+      }
+    }
+  }
+  if (end !== 0) {
+    rval.unshift(s.substring(0, end));
+  }
+  return rval;
+}
+
+function ishex(c) {
+  return ('0123456789ABCDEFabcdef'.indexOf(c) > -1);
+}
+
+function unescape(s) {
+  var i = 0;
+  var t = '';
+  while (i < s.length) {
+    if (s[i] != '%' || !ishex(s[i + 1]) || !ishex(s[i + 2])) {
+      t += s[i];
+    } else {
+      ++i;
+      var hexvalue = '';
+      if (i < s.length) {
+        hexvalue += s[i];
+        ++i;
+      }
+      if (i < s.length) {
+        hexvalue += s[i];
+      }
+      if (hexvalue.length > 0) {
+        t += new Buffer(hexvalue, 'hex').toString();
+      } else {
+        t += '%';
+      }
+    }
+
+    ++i;
+  }
+  return t;
+}
+
 Deserializer.ALTSVC = function readAltSvc(buffer, frame) {
-  // todo
+  var originLength = buffer.readUInt16BE(0);
+  frame.origin = buffer.toString('ascii', 2, 2 + originLength);
+  var fieldValue = buffer.toString('ascii', 2 + originLength);
+  var values = parseHeaderValue(fieldValue, ',', splitHeaderParameters);
+  if (values.length > 1) {
+    // TODO - warn that we only use one here
+  }
+  if (values.length === 0) {
+    // Well that's a malformed frame. Just ignore it.
+    return;
+  }
+
+  var chosenAltSvc = values[0];
+  frame.maxAge = 86400; // Default
+  for (var i = 0; i < chosenAltSvc.length; i++) {
+    if (i === 0) {
+      // This corresponds to the protocolID="<host>:<port>" item
+      frame.protocolID = unescape(chosenAltSvc[i].name);
+      var hostport = rsplit(chosenAltSvc[i].value, ':', 1);
+      frame.host = hostport[0];
+      frame.port = parseInt(hostport[1], 10);
+    } else if (chosenAltSvc[i].name == 'ma') {
+      frame.maxAge = parseInt(chosenAltSvc[i].value, 10);
+    }
+    // Otherwise, we just ignore this
+  }
 };
 
 // BLOCKED
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/lib/protocol/index.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/lib/protocol/index.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/lib/protocol/index.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/lib/protocol/index.js	2015-02-28 15:03:07.000000000 +0000
@@ -37,7 +37,7 @@
 // [node-https]:          http://nodejs.org/api/https.html
 // [node-http]:           http://nodejs.org/api/http.html
 
-exports.VERSION = 'h2-16';
+exports.VERSION = 'h2';
 
 exports.Endpoint = require('./endpoint').Endpoint;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/package.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/package.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/package.json	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/package.json	2015-02-28 15:03:07.000000000 +0000
@@ -1,6 +1,6 @@
 {
   "name": "http2",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "An HTTP/2 client and server implementation",
   "main": "lib/index.js",
   "engines" : {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/test/framer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/test/framer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/testing/xpcshell/node-http2/test/framer.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/testing/xpcshell/node-http2/test/framer.js	2015-02-28 15:03:07.000000000 +0000
@@ -15,7 +15,8 @@
   PING:          ['data'],
   GOAWAY:        ['last_stream', 'error'],
   WINDOW_UPDATE: ['window_size'],
-  CONTINUATION:  ['data']
+  CONTINUATION:  ['data'],
+  ALTSVC:        ['protocolID', 'host', 'port', 'origin', 'maxAge']
 };
 
 var test_frames = [{
@@ -176,37 +177,34 @@
   },
   // length + type + flags + stream +   content
   buffer: new Buffer('000004' + '09' + '04' + '0000000A' +   '12345678', 'hex')
-}, 
-// need to be updated for -06
-//{
-//  frame: {
-//    type: 'ALTSVC',
-//    flags: { },
-//    stream: 0,
-
-//    maxAge: 31536000,
-//    port: 4443,
-//    protocolID: "h2",
-//    host: "altsvc.example.com",
-//    origin: ""
-//  },
-//  buffer: new Buffer('00001D' + '0A' + '00' + '00000000' + '01E13380' + '115B' + '00' + '02' + '6832' + '12' + '616C747376632E6578616D706C652E636F6D', 'hex')
-//}, {
-//  frame: {
-//    type: 'ALTSVC',
-//    flags: { },
-//    stream: 0,
-//
-//    maxAge: 31536000,
-//    port: 4443,
-//    protocolID: "h2",
-//    host: "altsvc.example.com",
-//    origin: "https://onlyme.example.com"
-//  },
-//  buffer: new Buffer('000037' + '0A' + '00' + '00000000' + '01E13380' + '115B' + '00' + '02' + '6832' + '12' + '616C747376632E6578616D706C652E636F6D' + '68747470733A2F2F6F6E6C796D652E6578616D706C652E636F6D', 'hex')
-//
-//},
- {
+}, {
+  frame: {
+    type: 'ALTSVC',
+    flags: { },
+    stream: 0,
+
+    maxAge: 31536000,
+    port: 4443,
+    protocolID: "h2",
+    host: "altsvc.example.com",
+    origin: ""
+  },
+  buffer: new Buffer(new Buffer('00002B' + '0A' + '00' + '00000000' + '0000', 'hex') + new Buffer('h2="altsvc.example.com:4443"; ma=31536000', 'ascii'))
+}, {
+  frame: {
+    type: 'ALTSVC',
+    flags: { },
+    stream: 0,
+
+    maxAge: 31536000,
+    port: 4443,
+    protocolID: "h2",
+    host: "altsvc.example.com",
+    origin: "https://onlyme.example.com"
+  },
+  buffer: new Buffer(new Buffer('000045' + '0A' + '00' + '00000000' + '001A', 'hex') + new Buffer('https://onlyme.example.comh2="altsvc.example.com:4443"; ma=31536000', 'ascii'))
+
+}, {
   frame: {
     type: 'BLOCKED',
     flags: { },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/aboutcompartments/content/aboutCompartments.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/aboutcompartments/content/aboutCompartments.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/aboutcompartments/content/aboutCompartments.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/aboutcompartments/content/aboutCompartments.js	2015-02-28 15:03:07.000000000 +0000
@@ -59,7 +59,7 @@
             name.className = "addon";
             time.className = "time";
             cpow.className = "cpow";
-            name.textContent = comp.label;
+            name.textContent = comp.compartmentName;
             time.textContent = comp.time +"μs";
             cpow.textContent = comp.CPOWTime +"μs";
             c.appendChild(time);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/aboutmemory/tests/test_memoryReporters.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/aboutmemory/tests/test_memoryReporters.xul	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/aboutmemory/tests/test_memoryReporters.xul	2015-02-28 15:03:07.000000000 +0000
@@ -45,10 +45,12 @@
 
   let vsizeAmounts = [];
   let residentAmounts = [];
-  let jsGcHeapAmounts = [];
   let heapAllocatedAmounts = [];
   let storageSqliteAmounts = [];
 
+  let jsGcHeapUsedGcThingsTotal = 0;
+  let jsGcHeapUsedGcThings = {};
+
   let present = {}
 
   // Generate a long, random string.  We'll check that this string is
@@ -79,8 +81,9 @@
       vsizeAmounts.push(aAmount);
     } else if (aPath === "resident") {
       residentAmounts.push(aAmount);
-    } else if (aPath === "js-main-runtime-gc-heap-committed/used/gc-things") {
-      jsGcHeapAmounts.push(aAmount); 
+    } else if (aPath.search(/^js-main-runtime-gc-heap-committed\/used\/gc-things\//) >= 0) {
+      jsGcHeapUsedGcThingsTotal += aAmount;
+      jsGcHeapUsedGcThings[aPath] = (jsGcHeapUsedGcThings[aPath] | 0) + 1;
     } else if (aPath === "heap-allocated") {
       heapAllocatedAmounts.push(aAmount);
     } else if (aPath === "storage-sqlite") {
@@ -201,13 +204,20 @@
   mgr.getReportsForThisProcess(handleReportAnonymized, null,
                                /* anonymize = */ true);
 
+  function checkSizeReasonable(aName, aAmount)
+  {
+    // Check the size is reasonable -- i.e. not ridiculously large or small.
+    ok(100 * 1000 <= aAmount && aAmount <= 10 * 1000 * 1000 * 1000,
+       aName + "'s size is reasonable");
+  }
+
   function checkSpecialReport(aName, aAmounts, aCanBeUnreasonable)
   {
     ok(aAmounts.length == 1, aName + " has " + aAmounts.length + " report");
     let n = aAmounts[0];
-    // Check the size is reasonable -- i.e. not ridiculously large or small.
-    ok((100 * 1000 <= n && n <= 10 * 1000 * 1000 * 1000) || aCanBeUnreasonable,
-       aName + "'s size is reasonable");
+    if (!aCanBeUnreasonable) {
+      checkSizeReasonable(aName, n);
+    }
   }
 
   // If mgr.explicit failed, we won't have "heap-allocated" either.
@@ -217,7 +227,12 @@
   // vsize may be unreasonable if ASAN is enabled
   checkSpecialReport("vsize",          vsizeAmounts, /*canBeUnreasonable*/true);
   checkSpecialReport("resident",       residentAmounts);
-  checkSpecialReport("js-main-runtime-gc-heap-committed/used/gc-things", jsGcHeapAmounts);
+
+  for (var reporter in jsGcHeapUsedGcThings) {
+    ok(jsGcHeapUsedGcThings[reporter] == 1);
+  }
+  checkSizeReasonable("js-main-runtime-gc-heap-committed/used/gc-things",
+                      jsGcHeapUsedGcThingsTotal);
 
   ok(present.jsNonWindowCompartments,     "js-non-window compartments are present");
   ok(present.windowObjectsJsCompartments, "window-objects/.../js compartments are present");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/autocomplete/nsAutoCompleteController.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/autocomplete/nsAutoCompleteController.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/autocomplete/nsAutoCompleteController.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/autocomplete/nsAutoCompleteController.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -491,6 +491,21 @@
     uint32_t minResultsForPopup;
     input->GetMinResultsForPopup(&minResultsForPopup);
     if (isOpen || (mRowCount > 0 && mRowCount < minResultsForPopup)) {
+      // For completeSelectedIndex autocomplete fields, if the popup shouldn't
+      // close when the caret is moved, don't adjust the text value or caret
+      // position.
+      if (isOpen) {
+        bool noRollup;
+        input->GetNoRollupOnCaretMove(&noRollup);
+        if (noRollup) {
+          bool completeSelection;
+          input->GetCompleteSelectedIndex(&completeSelection);
+          if (completeSelection) {
+            return NS_OK;
+          }
+        }
+      }
+
       int32_t selectedIndex;
       popup->GetSelectedIndex(&selectedIndex);
       bool shouldComplete;
@@ -530,13 +545,9 @@
         }
       }
 
-      bool noRollup;
-      input->GetNoRollupOnCaretMove(&noRollup);
-      if (!noRollup) {
-        // Close the pop-up even if nothing was selected
-        ClearSearchTimer();
-        ClosePopup();
-      }
+      // Close the pop-up even if nothing was selected
+      ClearSearchTimer();
+      ClosePopup();
     }
     // Update last-searched string to the current input, since the input may
     // have changed.  Without this, subsequent backspaces look like text
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/contentprefs/ContentPrefService2.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/contentprefs/ContentPrefService2.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/contentprefs/ContentPrefService2.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/contentprefs/ContentPrefService2.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -56,7 +56,7 @@
     // browsing.
     let pbPrefs = new ContentPrefStore();
     if (context && context.usePrivateBrowsing) {
-      for (let [sgroup, sname, val] in this._pbStore) {
+      for (let [sgroup, sname, val] of this._pbStore) {
         if (sname == name) {
           pbPrefs.set(sgroup, sname, val);
         }
@@ -90,7 +90,7 @@
       },
       onDone: function onDone(reason, ok, gotRow) {
         if (ok) {
-          for (let [pbGroup, pbName, pbVal] in pbPrefs) {
+          for (let [pbGroup, pbName, pbVal] of pbPrefs) {
             cbHandleResult(callback, new ContentPref(pbGroup, pbName, pbVal));
           }
         }
@@ -129,7 +129,7 @@
     // browsing.
     let pbPrefs = new ContentPrefStore();
     if (context && context.usePrivateBrowsing) {
-      for (let [sgroup, val] in
+      for (let [sgroup, val] of
              this._pbStore.match(group, name, includeSubdomains)) {
         pbPrefs.set(sgroup, name, val);
       }
@@ -147,7 +147,7 @@
         if (ok) {
           if (!gotRow)
             this._cache.set(group, name, undefined);
-          for (let [pbGroup, pbName, pbVal] in pbPrefs) {
+          for (let [pbGroup, pbName, pbVal] of pbPrefs) {
             cbHandleResult(callback, new ContentPref(pbGroup, pbName, pbVal));
           }
         }
@@ -223,13 +223,13 @@
 
     let outStore = new ContentPrefStore();
     storesToCheck.forEach(function (store) {
-      for (let [sgroup, val] in store.match(group, name, includeSubdomains)) {
+      for (let [sgroup, val] of store.match(group, name, includeSubdomains)) {
         outStore.set(sgroup, name, val);
       }
     });
 
     let prefs = [];
-    for (let [sgroup, sname, val] in outStore) {
+    for (let [sgroup, sname, val] of outStore) {
       prefs.push(new ContentPref(sgroup, sname, val));
     }
     return prefs;
@@ -361,7 +361,7 @@
 
     // Invalidate the cached values so consumers accessing the cache between now
     // and when the operation finishes don't get old data.
-    for (let sgroup in this._cache.matchGroups(group, includeSubdomains)) {
+    for (let sgroup of this._cache.matchGroups(group, includeSubdomains)) {
       this._cache.remove(sgroup, name);
     }
 
@@ -396,7 +396,7 @@
         if (ok) {
           this._cache.set(group, name, undefined);
           if (context && context.usePrivateBrowsing) {
-            for (let [sgroup, ] in
+            for (let [sgroup, ] of
                    this._pbStore.match(group, name, includeSubdomains)) {
               prefs.set(sgroup, name, undefined);
               this._pbStore.remove(sgroup, name);
@@ -405,7 +405,7 @@
         }
         cbHandleCompletion(callback, reason);
         if (ok) {
-          for (let [sgroup, , ] in prefs) {
+          for (let [sgroup, , ] of prefs) {
             this._cps._notifyPrefRemoved(sgroup, name);
           }
         }
@@ -454,7 +454,7 @@
 
     // Invalidate the cached values so consumers accessing the cache between now
     // and when the operation finishes don't get old data.
-    for (let sgroup in this._cache.matchGroups(group, includeSubdomains)) {
+    for (let sgroup of this._cache.matchGroups(group, includeSubdomains)) {
       this._cache.removeGroup(sgroup);
     }
 
@@ -507,14 +507,14 @@
       },
       onDone: function onDone(reason, ok) {
         if (ok && context && context.usePrivateBrowsing) {
-          for (let [sgroup, sname, ] in this._pbStore) {
+          for (let [sgroup, sname, ] of this._pbStore) {
             prefs.set(sgroup, sname, undefined);
             this._pbStore.remove(sgroup, sname);
           }
         }
         cbHandleCompletion(callback, reason);
         if (ok) {
-          for (let [sgroup, sname, ] in prefs) {
+          for (let [sgroup, sname, ] of prefs) {
             this._cps._notifyPrefRemoved(sgroup, sname);
           }
         }
@@ -570,14 +570,14 @@
         // This nukes all the groups in _pbStore since we don't have their timestamp
         // information.
         if (ok && context && context.usePrivateBrowsing) {
-          for (let [sgroup, sname, ] in this._pbStore) {
+          for (let [sgroup, sname, ] of this._pbStore) {
             prefs.set(sgroup, sname, undefined);
           }
           this._pbStore.removeAllGroups();
         }
         cbHandleCompletion(callback, reason);
         if (ok) {
-          for (let [sgroup, sname, ] in prefs) {
+          for (let [sgroup, sname, ] of prefs) {
             this._cps._notifyPrefRemoved(sgroup, sname);
           }
         }
@@ -602,7 +602,7 @@
 
     // Invalidate the cached values so consumers accessing the cache between now
     // and when the operation finishes don't get old data.
-    for (let [group, sname, ] in this._cache) {
+    for (let [group, sname, ] of this._cache) {
       if (sname == name)
         this._cache.remove(group, name);
     }
@@ -656,7 +656,7 @@
       },
       onDone: function onDone(reason, ok) {
         if (ok && context && context.usePrivateBrowsing) {
-          for (let [sgroup, sname, ] in this._pbStore) {
+          for (let [sgroup, sname, ] of this._pbStore) {
             if (sname === name) {
               prefs.set(sgroup, name, undefined);
               this._pbStore.remove(sgroup, name);
@@ -665,7 +665,7 @@
         }
         cbHandleCompletion(callback, reason);
         if (ok) {
-          for (let [sgroup, , ] in prefs) {
+          for (let [sgroup, , ] of prefs) {
             this._cps._notifyPrefRemoved(sgroup, name);
           }
         }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/contentprefs/ContentPrefStore.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/contentprefs/ContentPrefStore.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/contentprefs/ContentPrefStore.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/contentprefs/ContentPrefStore.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -7,20 +7,20 @@
 ];
 
 function ContentPrefStore() {
-  this._groups = {};
-  this._globalNames = {};
+  this._groups = new Map();
+  this._globalNames = new Map();
 }
 
 ContentPrefStore.prototype = {
 
   set: function CPS_set(group, name, val) {
     if (group) {
-      if (!this._groups.hasOwnProperty(group))
-        this._groups[group] = {};
-      this._groups[group][name] = val;
+      if (!this._groups.has(group))
+        this._groups.set(group, new Map());
+      this._groups.get(group).set(name, val);
     }
     else {
-      this._globalNames[name] = val;
+      this._globalNames.set(name, val);
     }
   },
 
@@ -33,78 +33,72 @@
   },
 
   has: function CPS_has(group, name) {
-    return (group &&
-            this._groups.hasOwnProperty(group) &&
-            this._groups[group].hasOwnProperty(name)) ||
-           (!group &&
-            this._globalNames.hasOwnProperty(name));
+    if (group) {
+      return this._groups.has(group) &&
+             this._groups.get(group).has(name);
+    }
+    return this._globalNames.has(name);
   },
 
   get: function CPS_get(group, name) {
-    if (group) {
-      if (this._groups.hasOwnProperty(group) &&
-          this._groups[group].hasOwnProperty(name))
-        return this._groups[group][name];
-    }
-    else if (this._globalNames.hasOwnProperty(name)) {
-      return this._globalNames[name];
-    }
-    return undefined;
+    if (group && this._groups.has(group))
+      return this._groups.get(group).get(name);
+    return this._globalNames.get(name);
   },
 
   remove: function CPS_remove(group, name) {
     if (group) {
-      if (this._groups.hasOwnProperty(group)) {
-        delete this._groups[group][name];
-        if (!Object.keys(this._groups[group]).length)
-          delete this._groups[group];
+      if (this._groups.has(group)) {
+        this._groups.get(group).delete(name);
+        if (this._groups.get(group).size == 0)
+          this._groups.delete(group);
       }
     }
     else {
-      delete this._globalNames[name];
+      this._globalNames.delete(name);
     }
   },
 
   removeGroup: function CPS_removeGroup(group) {
     if (group) {
-      delete this._groups[group];
+      this._groups.delete(group);
     }
     else {
-      this._globalNames = {};
+      this._globalNames.clear();
     }
   },
 
   removeAllGroups: function CPS_removeAllGroups() {
-    this._groups = {};
+    this._groups.clear();
   },
 
   removeAll: function CPS_removeAll() {
     this.removeAllGroups();
-    this._globalNames = {};
+    this._globalNames.clear();
   },
 
-  __iterator__: function CPS___iterator__() {
-    for (let [group, names] in Iterator(this._groups)) {
-      for (let [name, val] in Iterator(names)) {
+  * [Symbol.iterator]() {
+    for (let [group, names] of this._groups) {
+      for (let [name, val] of names) {
         yield [group, name, val];
       }
     }
-    for (let [name, val] in Iterator(this._globalNames)) {
+    for (let [name, val] of this._globalNames) {
       yield [null, name, val];
     }
   },
 
-  match: function CPS_match(group, name, includeSubdomains) {
-    for (let sgroup in this.matchGroups(group, includeSubdomains)) {
+  * match(group, name, includeSubdomains) {
+    for (let sgroup of this.matchGroups(group, includeSubdomains)) {
       if (this.has(sgroup, name))
         yield [sgroup, this.get(sgroup, name)];
     }
   },
 
-  matchGroups: function CPS_matchGroups(group, includeSubdomains) {
+  * matchGroups(group, includeSubdomains) {
     if (group) {
       if (includeSubdomains) {
-        for (let [sgroup, , ] in this) {
+        for (let [sgroup, , ] of this) {
           if (sgroup) {
             let idx = sgroup.indexOf(group);
             if (idx == sgroup.length - group.length &&
@@ -113,11 +107,11 @@
           }
         }
       }
-      else if (this._groups.hasOwnProperty(group)) {
+      else if (this._groups.has(group)) {
         yield group;
       }
     }
-    else if (Object.keys(this._globalNames).length) {
+    else if (this._globalNames.size) {
       yield null;
     }
   },
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/contentprefs/nsContentPrefService.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/contentprefs/nsContentPrefService.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/contentprefs/nsContentPrefService.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/contentprefs/nsContentPrefService.js	2015-02-28 15:03:07.000000000 +0000
@@ -34,10 +34,10 @@
 const cache = new ContentPrefStore();
 cache.set = function CPS_cache_set(group, name, val) {
   Object.getPrototypeOf(this).set.apply(this, arguments);
-  let groupCount = Object.keys(this._groups).length;
+  let groupCount = this._groups.size;
   if (groupCount >= CACHE_MAX_GROUP_ENTRIES) {
     // Clean half of the entries
-    for (let [group, name, ] in this) {
+    for (let [group, name, ] of this) {
       this.remove(group, name);
       groupCount--;
       if (groupCount < CACHE_MAX_GROUP_ENTRIES / 2)
@@ -371,7 +371,7 @@
                                  Cr.NS_ERROR_ILLEGAL_VALUE);
 
     if (aContext && aContext.usePrivateBrowsing) {
-      for (let [group, name, ] in this._privModeStorage) {
+      for (let [group, name, ] of this._privModeStorage) {
         if (name === aName) {
           this._privModeStorage.remove(group, aName);
           this._notifyPrefRemoved(group, aName);
@@ -428,7 +428,7 @@
     if (aContext && aContext.usePrivateBrowsing) {
         let prefs = Cc["@mozilla.org/hash-property-bag;1"].
                     createInstance(Ci.nsIWritablePropertyBag);
-        for (let [sgroup, sname, sval] in this._privModeStorage) {
+        for (let [sgroup, sname, sval] of this._privModeStorage) {
           if (sgroup === group)
             prefs.setProperty(sname, sval);
         }
@@ -450,7 +450,7 @@
     if (aContext && aContext.usePrivateBrowsing) {
       let prefs = Cc["@mozilla.org/hash-property-bag;1"].
                   createInstance(Ci.nsIWritablePropertyBag);
-      for (let [sgroup, sname, sval] in this._privModeStorage) {
+      for (let [sgroup, sname, sval] of this._privModeStorage) {
         if (sname === aName)
           prefs.setProperty(sgroup, sval);
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/osfile/modules/osfile_async_front.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -146,7 +146,10 @@
   return obj;
 }
 
-let Scheduler = {
+// In order to expose Scheduler to the unfiltered Cu.import return value variant
+// on B2G we need to save it to `this`.  This does not make it public;
+// EXPORTED_SYMBOLS still controls that in all cases.
+let Scheduler = this.Scheduler = {
 
   /**
    * |true| once we have sent at least one message to the worker.
@@ -268,36 +271,39 @@
     // Grab the kill queue to make sure that we
     // cannot be interrupted by another call to `kill`.
     let killQueue = this._killQueue;
+
+    // Deactivate the queue, to ensure that no message is sent
+    // to an obsolete worker (we reactivate it in the `finally`).
+    // This needs to be done right now so that we maintain relative
+    // ordering with calls to post(), etc.
+    let deferred = Promise.defer();
+    let savedQueue = this.queue;
+    this.queue = deferred.promise;
+
     return this._killQueue = Task.spawn(function*() {
 
       yield killQueue;
       // From this point, and until the end of the Task, we are the
       // only call to `kill`, regardless of any `yield`.
 
-      yield this.queue;
-
-      // Enter critical section: no yield in this block
-      // (we want to make sure that we remain the only
-      // request in the queue).
-
-      if (!this.launched || this.shutdown || !this._worker) {
-        // Nothing to kill
-        this.shutdown = this.shutdown || shutdown;
-        this._worker = null;
-        return null;
-      }
-
-      // Deactivate the queue, to ensure that no message is sent
-      // to an obsolete worker (we reactivate it in the |finally|).
-      let deferred = Promise.defer();
-      this.queue = deferred.promise;
+      yield savedQueue;
 
+      try {
+        // Enter critical section: no yield in this block
+        // (we want to make sure that we remain the only
+        // request in the queue).
+
+        if (!this.launched || this.shutdown || !this._worker) {
+          // Nothing to kill
+          this.shutdown = this.shutdown || shutdown;
+          this._worker = null;
+          return null;
+        }
 
-      // Exit critical section
+        // Exit critical section
 
-      let message = ["Meta_shutdown", [reset]];
+        let message = ["Meta_shutdown", [reset]];
 
-      try {
         Scheduler.latestReceived = [];
         Scheduler.latestSent = [Date.now(), ...message];
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_kill.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_kill.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_kill.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/osfile/tests/xpcshell/test_osfile_kill.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,100 @@
+"use strict";
+
+Components.utils.import("resource://gre/modules/osfile.jsm");
+
+// We want the actual global to get at the internals since Scheduler is not
+// exported.
+var AsyncFrontGlobal = Components.utils.import(
+                         "resource://gre/modules/osfile/osfile_async_front.jsm",
+                          null);
+var Scheduler = AsyncFrontGlobal.Scheduler;
+
+/**
+ * Verify that Scheduler.kill() interacts with other OS.File requests correctly,
+ * and that no requests are lost.  This is relevant because on B2G we
+ * auto-kill the worker periodically, making it very possible for valid requests
+ * to be interleaved with the automatic kill().
+ *
+ * This test is being created with the fix for Bug 1125989 where `kill` queue
+ * management was found to be buggy.  It is a glass-box test that explicitly
+ * re-creates the observed failure situation; it is not guaranteed to prevent
+ * all future regressions.  The following is a detailed explanation of the test
+ * for your benefit if this test ever breaks or you are wondering what was the
+ * point of all this.  You might want to skim the code below first.
+ *
+ * OS.File maintains a `queue` of operations to be performed.  This queue is
+ * nominally implemented as a chain of promises.  Every time a new job is
+ * OS.File.push()ed, it effectively becomes the new `queue` promise.  (An
+ * extra promise is interposed with a rejection handler to avoid the rejection
+ * cascading, but that does not matter for our purposes.)
+ *
+ * The flaw in `kill` was that it would wait for the `queue` to complete before
+ * replacing `queue`.  As a result, another OS.File operation could use `push`
+ * (by way of OS.File.post()) to also use .then() on the same `queue` promise.
+ * Accordingly, assuming that promise was not yet resolved (due to a pending
+ * OS.File request), when it was resolved, both the task scheduled in `kill`
+ * and in `post` would be triggered.  Both of those tasks would run until
+ * encountering a call to worker.post().
+ *
+ * Re-creating this race is not entirely trivial because of the large number of
+ * promises used by the code causing control flow to repeatedly be deferred.  In
+ * a slightly simpler world we could run the follwing in the same turn of the
+ * event loop and trigger the problem.
+ * - any OS.File request
+ * - Scheduler.kill()
+ * - any OS.File request
+ *
+ * However, we need the Scheduler.kill task to reach the point where it is
+ * waiting on the same `queue` that another task has been scheduled against.
+ * Since the `kill` task yields on the `killQueue` promise prior to yielding
+ * on `queue`, however, some turns of the event loop are required.  Happily,
+ * for us, as discussed above, the problem triggers when we have two promises
+ * scheduled on the `queue`, so we can just wait to schedule the second OS.File
+ * request on the queue.  (Note that because of the additional then() added to
+ * eat rejections, there is an important difference between the value of
+ * `queue` and the value returned by the first OS.File request.)
+ */
+add_task(function* test_kill_race() {
+  // Ensure the worker has been created and that SET_DEBUG has taken effect.
+  // We have chosen OS.File.exists for our tests because it does not trigger
+  // a rejection and we absolutely do not care what the operation is other
+  // than it does not invoke a native fast-path.
+  yield OS.File.exists('foo.foo');
+
+  do_print('issuing first request');
+  let firstRequest = OS.File.exists('foo.bar');
+  let secondRequest;
+  let secondResolved = false;
+
+  // As noted in our big block comment, we want to wait to schedule the
+  // second request so that it races `kill`'s call to `worker.post`.  Having
+  // ourselves wait on the same promise, `queue`, and registering ourselves
+  // before we issue the kill request means we will get run before the `kill`
+  // task resumes and allow us to precisely create the desired race.
+  Scheduler.queue.then(function() {
+    do_print('issuing second request');
+    secondRequest = OS.File.exists('foo.baz');
+    secondRequest.then(function() {
+      secondResolved = true;
+    });
+  });
+
+  do_print('issuing kill request');
+  let killRequest = Scheduler.kill({ reset: true, shutdown: false });
+
+  // Wait on the killRequest so that we can schedule a new OS.File request
+  // after it completes...
+  yield killRequest;
+  // ...because our ordering guarantee ensures that there is at most one
+  // worker (and this usage here should not be vulnerable even with the
+  // bug present), so when this completes the secondRequest has either been
+  // resolved or lost.
+  yield OS.File.exists('foo.goz');
+
+  ok(secondResolved,
+     'The second request was resolved so we avoided the bug. Victory!');
+});
+
+function run_test() {
+  run_next_test();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/osfile/tests/xpcshell/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/osfile/tests/xpcshell/xpcshell.ini	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/osfile/tests/xpcshell/xpcshell.ini	2015-02-28 15:03:07.000000000 +0000
@@ -39,6 +39,7 @@
 [test_queue.js]
 [test_loader.js]
 [test_constants.js]
+[test_osfile_kill.js]
 
 # Unimplemented on Windows (bug 1022816).
 # Spurious failure on Android test farm due to non-POSIX behavior of
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/LoginHelper.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/LoginHelper.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/LoginHelper.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/LoginHelper.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -48,7 +48,7 @@
         aHostname.indexOf("\r") != -1 ||
         aHostname.indexOf("\n") != -1 ||
         aHostname.indexOf("\0") != -1) {
-      throw "Invalid hostname";
+      throw new Error("Invalid hostname");
     }
   },
 
@@ -73,7 +73,7 @@
     // Nulls are invalid, as they don't round-trip well.
     // Mostly not a formatting problem, although ".\0" can be quirky.
     if (badCharacterPresent(aLogin, "\0")) {
-      throw "login values can't contain nulls";
+      throw new Error("login values can't contain nulls");
     }
 
     // In theory these nulls should just be rolled up into the encrypted
@@ -82,26 +82,26 @@
     // unexpected round-trip surprises.
     if (aLogin.username.indexOf("\0") != -1 ||
         aLogin.password.indexOf("\0") != -1) {
-      throw "login values can't contain nulls";
+      throw new Error("login values can't contain nulls");
     }
 
     // Newlines are invalid for any field stored as plaintext.
     if (badCharacterPresent(aLogin, "\r") ||
         badCharacterPresent(aLogin, "\n")) {
-      throw "login values can't contain newlines";
+      throw new Error("login values can't contain newlines");
     }
 
     // A line with just a "." can have special meaning.
     if (aLogin.usernameField == "." ||
         aLogin.formSubmitURL == ".") {
-      throw "login values can't be periods";
+      throw new Error("login values can't be periods");
     }
 
     // A hostname with "\ \(" won't roundtrip.
     // eg host="foo (", realm="bar" --> "foo ( (bar)"
     // vs host="foo", realm=" (bar" --> "foo ( (bar)"
     if (aLogin.hostname.indexOf(" (") != -1) {
-      throw "bad parens in hostname";
+      throw new Error("bad parens in hostname");
     }
   },
 
@@ -189,40 +189,40 @@
 
           // Fail if caller requests setting an unknown property.
           default:
-            throw "Unexpected propertybag item: " + prop.name;
+            throw new Error("Unexpected propertybag item: " + prop.name);
         }
       }
     } else {
-      throw "newLoginData needs an expected interface!";
+      throw new Error("newLoginData needs an expected interface!");
     }
 
     // Sanity check the login
     if (newLogin.hostname == null || newLogin.hostname.length == 0) {
-      throw "Can't add a login with a null or empty hostname.";
+      throw new Error("Can't add a login with a null or empty hostname.");
     }
 
     // For logins w/o a username, set to "", not null.
     if (newLogin.username == null) {
-      throw "Can't add a login with a null username.";
+      throw new Error("Can't add a login with a null username.");
     }
 
     if (newLogin.password == null || newLogin.password.length == 0) {
-      throw "Can't add a login with a null or empty password.";
+      throw new Error("Can't add a login with a null or empty password.");
     }
 
     if (newLogin.formSubmitURL || newLogin.formSubmitURL == "") {
       // We have a form submit URL. Can't have a HTTP realm.
       if (newLogin.httpRealm != null) {
-        throw "Can't add a login with both a httpRealm and formSubmitURL.";
+        throw new Error("Can't add a login with both a httpRealm and formSubmitURL.");
       }
     } else if (newLogin.httpRealm) {
       // We have a HTTP realm. Can't have a form submit URL.
       if (newLogin.formSubmitURL != null) {
-        throw "Can't add a login with both a httpRealm and formSubmitURL.";
+        throw new Error("Can't add a login with both a httpRealm and formSubmitURL.");
       }
     } else {
       // Need one or the other!
-      throw "Can't add a login without a httpRealm or formSubmitURL.";
+      throw new Error("Can't add a login without a httpRealm or formSubmitURL.");
     }
 
     // Throws if there are bogus values.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/LoginManagerContent.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/LoginManagerContent.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/LoginManagerContent.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/LoginManagerContent.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -557,20 +557,49 @@
   /*
    * _fillform
    *
-   * Fill the form with login information if we can find it. This will find
-   * an array of logins if not given any, otherwise it will use the logins
-   * passed in. The logins are returned so they can be reused for
+   * Fill the form with the provided login information.
+   * The logins are returned so they can be reused for
    * optimization. Success of action is also returned in format
    * [success, foundLogins].
    *
    * - autofillForm denotes if we should fill the form in automatically
    * - userTriggered is an indication of whether this filling was triggered by
    *     the user
-   * - foundLogins is an array of nsILoginInfo for optimization
+   * - foundLogins is an array of nsILoginInfo
    */
   _fillForm : function (form, autofillForm, clobberPassword,
                         userTriggered, foundLogins) {
     let ignoreAutocomplete = true;
+    const AUTOFILL_RESULT = {
+      FILLED: 0,
+      NO_PASSWORD_FIELD: 1,
+      PASSWORD_DISABLED_READONLY: 2,
+      NO_LOGINS_FIT: 3,
+      NO_SAVED_LOGINS: 4,
+      EXISTING_PASSWORD: 5,
+      EXISTING_USERNAME: 6,
+      MULTIPLE_LOGINS: 7,
+      NO_AUTOFILL_FORMS: 8,
+      AUTOCOMPLETE_OFF: 9,
+      UNKNOWN_FAILURE: 10,
+    };
+
+    function recordAutofillResult(result) {
+      if (userTriggered) {
+        // Ignore fills as a result of user action.
+        return;
+      }
+      const autofillResultHist = Services.telemetry.getHistogramById("PWMGR_FORM_AUTOFILL_RESULT");
+      autofillResultHist.add(result);
+    }
+
+    // Nothing to do if we have no matching logins available.
+    if (foundLogins.length == 0) {
+      // We don't log() here since this is a very common case.
+      recordAutofillResult(AUTOFILL_RESULT.NO_SAVED_LOGINS);
+      return [false, foundLogins];
+    }
+
     // Heuristically determine what the user/pass fields are
     // We do this before checking to see if logins are stored,
     // so that the user isn't prompted for a master password
@@ -579,12 +608,16 @@
         this._getFormFields(form, false);
 
     // Need a valid password field to do anything.
-    if (passwordField == null)
+    if (passwordField == null) {
+      log("not filling form, no password field found");
+      recordAutofillResult(AUTOFILL_RESULT.NO_PASSWORD_FIELD);
       return [false, foundLogins];
+    }
 
     // If the password field is disabled or read-only, there's nothing to do.
     if (passwordField.disabled || passwordField.readOnly) {
       log("not filling form, password field disabled or read-only");
+      recordAutofillResult(AUTOFILL_RESULT.PASSWORD_DISABLED_READONLY);
       return [false, foundLogins];
     }
 
@@ -619,11 +652,11 @@
       return fit;
     }, this);
 
-
-    // Nothing to do if we have no matching logins available.
-    if (logins.length == 0)
+    if (logins.length == 0) {
+      log("form not filled, none of the logins fit in the field");
+      recordAutofillResult(AUTOFILL_RESULT.NO_LOGINS_FIT);
       return [false, foundLogins];
-
+    }
 
     // The reason we didn't end up filling the form, if any.  We include
     // this in the formInfo object we send with the passwordmgr-found-logins
@@ -641,6 +674,8 @@
       didntFillReason = "existingPassword";
       this._notifyFoundLogins(didntFillReason, usernameField,
                               passwordField, foundLogins, null);
+      log("form not filled, the password field was already filled");
+      recordAutofillResult(AUTOFILL_RESULT.EXISTING_PASSWORD);
       return [false, foundLogins];
     }
 
@@ -744,6 +779,28 @@
     this._notifyFoundLogins(didntFillReason, usernameField, passwordField,
                             foundLogins, selectedLogin);
 
+    if (didFillForm) {
+      recordAutofillResult(AUTOFILL_RESULT.FILLED);
+    } else {
+      let autofillResult = AUTOFILL_RESULT.UNKNOWN_FAILURE;
+      switch (didntFillReason) {
+        // existingPassword is already handled above
+        case "existingUsername":
+          autofillResult = AUTOFILL_RESULT.EXISTING_USERNAME;
+          break;
+        case "multipleLogins":
+          autofillResult = AUTOFILL_RESULT.MULTIPLE_LOGINS;
+          break;
+        case "noAutofillForms":
+          autofillResult = AUTOFILL_RESULT.NO_AUTOFILL_FORMS;
+          break;
+        case "autocompleteOff":
+          autofillResult = AUTOFILL_RESULT.AUTOCOMPLETE_OFF;
+          break;
+      }
+      recordAutofillResult(autofillResult);
+    }
+
     return [didFillForm, foundLogins];
   },
 
@@ -898,7 +955,7 @@
 
   getValueAt : function (index) {
     if (index < 0 || index >= this.logins.length)
-      throw "Index out of range.";
+      throw new Error("Index out of range.");
 
     return this.logins[index].username;
   },
@@ -925,7 +982,7 @@
 
   removeValueAt : function (index, removeFromDB) {
     if (index < 0 || index >= this.logins.length)
-        throw "Index out of range.";
+        throw new Error("Index out of range.");
 
     var [removedLogin] = this.logins.splice(index, 1);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/LoginManagerParent.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -107,8 +107,9 @@
       return;
     }
 
+    let allLoginsCount = Services.logins.countLogins(formOrigin, "", null);
     // If there are no logins for this site, bail out now.
-    if (!Services.logins.countLogins(formOrigin, "", null)) {
+    if (!allLoginsCount) {
       target.sendAsyncMessage("RemoteLogins:loginsFound",
                               { requestId: requestId, logins: [] });
       return;
@@ -152,6 +153,16 @@
     var logins = Services.logins.findLogins({}, formOrigin, actionOrigin, null);
     target.sendAsyncMessage("RemoteLogins:loginsFound",
                             { requestId: requestId, logins: logins });
+
+    const PWMGR_FORM_ACTION_EFFECT =  Services.telemetry.getHistogramById("PWMGR_FORM_ACTION_EFFECT");
+    if (logins.length == 0) {
+      PWMGR_FORM_ACTION_EFFECT.add(2);
+    } else if (logins.length == allLoginsCount) {
+      PWMGR_FORM_ACTION_EFFECT.add(0);
+    } else {
+      // logins.length < allLoginsCount
+      PWMGR_FORM_ACTION_EFFECT.add(1);
+    }
   },
 
   doAutocompleteSearch: function({ formOrigin, actionOrigin,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/nsLoginManager.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/nsLoginManager.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/nsLoginManager.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/nsLoginManager.js	2015-02-28 15:03:07.000000000 +0000
@@ -3,9 +3,7 @@
  * 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 { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -74,7 +72,7 @@
       return this;
     }
 
-    throw Cr.NS_ERROR_NO_INTERFACE;
+    throw new Components.Exception("Interface not available", Cr.NS_ERROR_NO_INTERFACE);
   },
 
 
@@ -301,26 +299,26 @@
   addLogin : function (login) {
     // Sanity check the login
     if (login.hostname == null || login.hostname.length == 0)
-      throw "Can't add a login with a null or empty hostname.";
+      throw new Error("Can't add a login with a null or empty hostname.");
 
     // For logins w/o a username, set to "", not null.
     if (login.username == null)
-      throw "Can't add a login with a null username.";
+      throw new Error("Can't add a login with a null username.");
 
     if (login.password == null || login.password.length == 0)
-      throw "Can't add a login with a null or empty password.";
+      throw new Error("Can't add a login with a null or empty password.");
 
     if (login.formSubmitURL || login.formSubmitURL == "") {
       // We have a form submit URL. Can't have a HTTP realm.
       if (login.httpRealm != null)
-        throw "Can't add a login with both a httpRealm and formSubmitURL.";
+        throw new Error("Can't add a login with both a httpRealm and formSubmitURL.");
     } else if (login.httpRealm) {
       // We have a HTTP realm. Can't have a form submit URL.
       if (login.formSubmitURL != null)
-        throw "Can't add a login with both a httpRealm and formSubmitURL.";
+        throw new Error("Can't add a login with both a httpRealm and formSubmitURL.");
     } else {
       // Need one or the other!
-      throw "Can't add a login without a httpRealm or formSubmitURL.";
+      throw new Error("Can't add a login without a httpRealm or formSubmitURL.");
     }
 
 
@@ -329,7 +327,7 @@
                                  login.httpRealm);
 
     if (logins.some(function(l) login.matches(l, true)))
-      throw "This login already exists.";
+      throw new Error("This login already exists.");
 
     log("Adding login");
     return this._storage.addLogin(login);
@@ -480,7 +478,7 @@
   setLoginSavingEnabled : function (hostname, enabled) {
     // Nulls won't round-trip with getAllDisabledHosts().
     if (hostname.indexOf("\0") != -1)
-      throw "Invalid hostname";
+      throw new Error("Invalid hostname");
 
     log("Login saving for", hostname, "now enabled?", enabled);
     return this._storage.setLoginSavingEnabled(hostname, enabled);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/nsLoginManagerPrompter.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/nsLoginManagerPrompter.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/nsLoginManagerPrompter.js	2015-02-28 15:03:07.000000000 +0000
@@ -3,15 +3,12 @@
  * License, v. 2.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 { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
-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");
-Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-Components.utils.import("resource://gre/modules/SharedPromptUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+Cu.import("resource://gre/modules/SharedPromptUtils.jsm");
 
 /*
  * LoginManagerPromptFactory
@@ -126,7 +123,7 @@
         }
         self._doAsyncPrompt();
       }
-    }
+    };
 
     Services.tm.mainThread.dispatch(runnable, Ci.nsIThread.DISPATCH_NORMAL);
     this.log("_doAsyncPrompt:run dispatched");
@@ -231,7 +228,7 @@
       this.__strBundle = bunService.createBundle(
                   "chrome://passwordmgr/locale/passwordmgr.properties");
       if (!this.__strBundle)
-        throw "String bundle for Login Manager not present!";
+        throw new Error("String bundle for Login Manager not present!");
     }
 
     return this.__strBundle;
@@ -294,7 +291,8 @@
   prompt : function (aDialogTitle, aText, aPasswordRealm,
                      aSavePassword, aDefaultText, aResult) {
     if (aSavePassword != Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER)
-      throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+      throw new Components.Exception("prompt only supports SAVE_PASSWORD_NEVER",
+                                     Cr.NS_ERROR_NOT_IMPLEMENTED);
 
     this.log("===== prompt() called =====");
 
@@ -318,7 +316,8 @@
     this.log("===== promptUsernameAndPassword() called =====");
 
     if (aSavePassword == Ci.nsIAuthPrompt.SAVE_PASSWORD_FOR_SESSION)
-        throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+      throw new Components.Exception("promptUsernameAndPassword doesn't support SAVE_PASSWORD_FOR_SESSION",
+                                     Cr.NS_ERROR_NOT_IMPLEMENTED);
 
     var selectedLogin = null;
     var checkBox = { value : false };
@@ -420,7 +419,8 @@
     this.log("===== promptPassword called() =====");
 
     if (aSavePassword == Ci.nsIAuthPrompt.SAVE_PASSWORD_FOR_SESSION)
-        throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+      throw new Components.Exception("promptPassword doesn't support SAVE_PASSWORD_FOR_SESSION",
+                                     Cr.NS_ERROR_NOT_IMPLEMENTED);
 
     var checkBox = { value : false };
     var checkBoxLabel = null;
@@ -679,7 +679,7 @@
         level: aLevel,
         inProgress : false,
         prompter: this
-      }
+      };
 
       this._factory._asyncPrompts[hashKey] = asyncPrompt;
       this._factory._doAsyncPrompt();
@@ -1433,11 +1433,11 @@
     if (aAuthInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY) {
       this.log("getAuthTarget is for proxy auth");
       if (!(aChannel instanceof Ci.nsIProxiedChannel))
-        throw "proxy auth needs nsIProxiedChannel";
+        throw new Error("proxy auth needs nsIProxiedChannel");
 
       var info = aChannel.proxyInfo;
       if (!info)
-        throw "proxy auth needs nsIProxyInfo";
+        throw new Error("proxy auth needs nsIProxyInfo");
 
       // Proxies don't have a scheme, but we'll use "moz-proxy://"
       // so that it's more obvious what the login is for.
@@ -1520,7 +1520,7 @@
         this.callback = null;
         this.context = null;
       }
-    }
+    };
   }
 
 }; // end of LoginManagerPrompter implementation
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/storage-json.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/storage-json.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/storage-json.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/storage-json.js	2015-02-28 15:03:07.000000000 +0000
@@ -115,7 +115,7 @@
       }.bind(this)).catch(Cu.reportError);
     } catch (e) {
       this.log("Initialization failed: " + e);
-      throw "Initialization failed";
+      throw new Error("Initialization failed");
     }
   },
 
@@ -151,7 +151,7 @@
     loginClone.QueryInterface(Ci.nsILoginMetaInfo);
     if (loginClone.guid) {
       if (!this._isGuidUnique(loginClone.guid))
-        throw "specified GUID already exists";
+        throw new Error("specified GUID already exists");
     } else {
       loginClone.guid = gUUIDGenerator.generateUUID().toString();
     }
@@ -199,7 +199,7 @@
 
     let [idToDelete, storedLogin] = this._getIdForLogin(login);
     if (!idToDelete)
-      throw "No matching logins";
+      throw new Error("No matching logins");
 
     let foundIndex = this._store.data.logins.findIndex(l => l.id == idToDelete);
     if (foundIndex != -1) {
@@ -220,7 +220,7 @@
 
     let [idToModify, oldStoredLogin] = this._getIdForLogin(oldLogin);
     if (!idToModify)
-      throw "No matching logins";
+      throw new Error("No matching logins");
 
     let newLogin = LoginHelper.buildModifiedLogin(oldStoredLogin, newLoginData);
 
@@ -228,7 +228,7 @@
     if (newLogin.guid != oldStoredLogin.guid &&
         !this._isGuidUnique(newLogin.guid))
     {
-      throw "specified GUID already exists";
+      throw new Error("specified GUID already exists");
     }
 
     // Look for an existing entry in case key properties changed.
@@ -238,7 +238,7 @@
                                    newLogin.httpRealm);
 
       if (logins.some(login => newLogin.matches(login, true)))
-        throw "This login already exists.";
+        throw new Error("This login already exists.");
     }
 
     // Get the encrypted value of the username and password.
@@ -362,7 +362,7 @@
             break;
           // Fail if caller requests an unknown property.
           default:
-            throw "Unexpected field: " + field;
+            throw new Error("Unexpected field: " + field);
         }
       }
       return true;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/storage-mozStorage.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/storage-mozStorage.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/storage-mozStorage.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/storage-mozStorage.js	2015-02-28 15:03:07.000000000 +0000
@@ -66,7 +66,7 @@
       return this._dbConnection;
     }
 
-    throw Cr.NS_ERROR_NO_INTERFACE;
+    throw new Components.Exception("Interface not available", Cr.NS_ERROR_NO_INTERFACE);
   },
 
   __crypto : null,  // nsILoginManagerCrypto service
@@ -220,7 +220,7 @@
       // If the import fails on first run, we want to delete the db
       if (isFirstRun && e == "Import failed")
         this._dbCleanup(false);
-      throw "Initialization failed";
+      throw new Error("Initialization failed");
     }
   },
 
@@ -253,7 +253,7 @@
     loginClone.QueryInterface(Ci.nsILoginMetaInfo);
     if (loginClone.guid) {
       if (!this._isGuidUnique(loginClone.guid))
-        throw "specified GUID already exists";
+        throw new Error("specified GUID already exists");
     } else {
       loginClone.guid = this._uuidService.generateUUID().toString();
     }
@@ -302,7 +302,7 @@
       stmt.execute();
     } catch (e) {
       this.log("addLogin failed: " + e.name + " : " + e.message);
-      throw "Couldn't write to database, login not added.";
+      throw new Error("Couldn't write to database, login not added.");
     } finally {
       if (stmt) {
         stmt.reset();
@@ -321,7 +321,7 @@
   removeLogin : function (login) {
     let [idToDelete, storedLogin] = this._getIdForLogin(login);
     if (!idToDelete)
-      throw "No matching logins";
+      throw new Error("No matching logins");
 
     // Execute the statement & remove from DB
     let query  = "DELETE FROM moz_logins WHERE id = :id";
@@ -335,7 +335,7 @@
       transaction.commit();
     } catch (e) {
       this.log("_removeLogin failed: " + e.name + " : " + e.message);
-      throw "Couldn't write to database, login not removed.";
+      throw new Error("Couldn't write to database, login not removed.");
       transaction.rollback();
     } finally {
       if (stmt) {
@@ -353,7 +353,7 @@
   modifyLogin : function (oldLogin, newLoginData) {
     let [idToModify, oldStoredLogin] = this._getIdForLogin(oldLogin);
     if (!idToModify)
-      throw "No matching logins";
+      throw new Error("No matching logins");
 
     let newLogin = LoginHelper.buildModifiedLogin(oldStoredLogin, newLoginData);
 
@@ -361,7 +361,7 @@
     if (newLogin.guid != oldStoredLogin.guid &&
         !this._isGuidUnique(newLogin.guid))
     {
-      throw "specified GUID already exists";
+      throw new Error("specified GUID already exists");
     }
 
     // Look for an existing entry in case key properties changed.
@@ -371,7 +371,7 @@
                                    newLogin.httpRealm);
 
       if (logins.some(login => newLogin.matches(login, true)))
-        throw "This login already exists.";
+        throw new Error("This login already exists.");
     }
 
     // Get the encrypted value of the username and password.
@@ -417,7 +417,7 @@
       stmt.execute();
     } catch (e) {
       this.log("modifyLogin failed: " + e.name + " : " + e.message);
-      throw "Couldn't write to database, login not modified.";
+      throw new Error("Couldn't write to database, login not modified.");
     } finally {
       if (stmt) {
         stmt.reset();
@@ -519,7 +519,7 @@
           break;
         // Fail if caller requests an unknown property.
         default:
-          throw "Unexpected field: " + field;
+          throw new Error("Unexpected field: " + field);
       }
     }
 
@@ -610,7 +610,7 @@
     } catch (e) {
       this.log("_removeAllLogins failed: " + e.name + " : " + e.message);
       transaction.rollback();
-      throw "Couldn't write to database";
+      throw new Error("Couldn't write to database");
     } finally {
       if (stmt) {
         stmt.reset();
@@ -669,7 +669,7 @@
       stmt.execute();
     } catch (e) {
       this.log("setLoginSavingEnabled failed: " + e.name + " : " + e.message);
-      throw "Couldn't write to database"
+      throw new Error("Couldn't write to database");
     } finally {
       if (stmt) {
         stmt.reset();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/auth2/authenticate.sjs thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/auth2/authenticate.sjs
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/auth2/authenticate.sjs	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/auth2/authenticate.sjs	2015-02-28 15:03:07.000000000 +0000
@@ -86,12 +86,12 @@
     authHeader = request.getHeader("Authorization");
     match = /Basic (.+)/.exec(authHeader);
     if (match.length != 2)
-        throw "Couldn't parse auth header: " + authHeader;
+        throw new Error("Couldn't parse auth header: " + authHeader);
 
     var userpass = base64ToString(match[1]); // no atob() :-(
     match = /(.*):(.*)/.exec(userpass);
     if (match.length != 3)
-        throw "Couldn't decode auth header: " + userpass;
+        throw new Error("Couldn't decode auth header: " + userpass);
     actual_user = match[1];
     actual_pass = match[2];
   } 
@@ -101,12 +101,12 @@
     authHeader = request.getHeader("Proxy-Authorization");
     match = /Basic (.+)/.exec(authHeader);
     if (match.length != 2)
-        throw "Couldn't parse auth header: " + authHeader;
+        throw new Error("Couldn't parse auth header: " + authHeader);
 
     var userpass = base64ToString(match[1]); // no atob() :-(
     match = /(.*):(.*)/.exec(userpass);
     if (match.length != 3)
-        throw "Couldn't decode auth header: " + userpass;
+        throw new Error("Couldn't decode auth header: " + userpass);
     proxy_actual_user = match[1];
     proxy_actual_pass = match[2];
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/authenticate.sjs thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/authenticate.sjs
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/authenticate.sjs	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/authenticate.sjs	2015-02-28 15:03:07.000000000 +0000
@@ -91,12 +91,12 @@
     authHeader = request.getHeader("Authorization");
     match = /Basic (.+)/.exec(authHeader);
     if (match.length != 2)
-        throw "Couldn't parse auth header: " + authHeader;
+        throw new Error("Couldn't parse auth header: " + authHeader);
 
     var userpass = base64ToString(match[1]); // no atob() :-(
     match = /(.*):(.*)/.exec(userpass);
     if (match.length != 3)
-        throw "Couldn't decode auth header: " + userpass;
+        throw new Error("Couldn't decode auth header: " + userpass);
     actual_user = match[1];
     actual_pass = match[2];
   } 
@@ -106,12 +106,12 @@
     authHeader = request.getHeader("Proxy-Authorization");
     match = /Basic (.+)/.exec(authHeader);
     if (match.length != 2)
-        throw "Couldn't parse auth header: " + authHeader;
+        throw new Error("Couldn't parse auth header: " + authHeader);
 
     var userpass = base64ToString(match[1]); // no atob() :-(
     match = /(.*):(.*)/.exec(userpass);
     if (match.length != 3)
-        throw "Couldn't decode auth header: " + userpass;
+        throw new Error("Couldn't decode auth header: " + userpass);
     proxy_actual_user = match[1];
     proxy_actual_pass = match[2];
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/browser/authenticate.sjs thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/browser/authenticate.sjs
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/browser/authenticate.sjs	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/browser/authenticate.sjs	2015-02-28 15:03:07.000000000 +0000
@@ -24,12 +24,12 @@
     authHeader = request.getHeader("Authorization");
     match = /Basic (.+)/.exec(authHeader);
     if (match.length != 2)
-        throw "Couldn't parse auth header: " + authHeader;
+        throw new Error("Couldn't parse auth header: " + authHeader);
 
     var userpass = base64ToString(match[1]); // no atob() :-(
     match = /(.*):(.*)/.exec(userpass);
     if (match.length != 3)
-        throw "Couldn't decode auth header: " + userpass;
+        throw new Error("Couldn't decode auth header: " + userpass);
     actual_user = match[1];
     actual_pass = match[2];
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/test_basic_form_2.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/test_basic_form_2.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/test_basic_form_2.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/test_basic_form_2.html	2015-02-28 15:03:07.000000000 +0000
@@ -14,8 +14,6 @@
 
 var pwmgr = SpecialPowers.Cc["@mozilla.org/login-manager;1"]
                          .getService(SpecialPowers.Ci.nsILoginManager);
-// Assume that the pref starts out true, so set to false
-SpecialPowers.setBoolPref("signon.autofillForms", false);
 </script>
 
 <p id="display"></p>
@@ -52,14 +50,14 @@
          is($_(1, "uname").value, "testuser", "Checking for filled username");
          is($_(1, "pword").value, "testpass", "Checking for filled password");
 
-         // Reset pref (since we assumed it was true to start)
-         SpecialPowers.setBoolPref("signon.autofillForms", true);
-
          SimpleTest.finish();
        });
 }
-window.addEventListener("runTests", startTest);
-
+// Assume that the pref starts out true, so set to false
+SpecialPowers.pushPrefEnv({"set":[["signon.autofillForms", false]]}, setup);
+function setup() {
+ window.addEventListener("runTests", startTest);
+}
 </script>
 </pre>
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/test_basic_form_observer_autofillForms.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/test_basic_form_observer_autofillForms.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/test_basic_form_observer_autofillForms.html	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/test_basic_form_observer_autofillForms.html	2015-02-28 15:03:07.000000000 +0000
@@ -14,11 +14,10 @@
 
 const Cc = SpecialPowers.Cc;
 const Ci = SpecialPowers.Ci;
-
+var TestObserver;
 // Assume that the pref starts out true, so set to false
-SpecialPowers.setBoolPref("signon.autofillForms", false);
-
-var TestObserver = {
+SpecialPowers.pushPrefEnv({"set":[["signon.autofillForms", false]]}, function() {
+  TestObserver = {
   receivedNotificationFoundForm : false,
   receivedNotificationFoundLogins : false,
   dataFoundForm : "",
@@ -50,6 +49,7 @@
 // Add the observer
 SpecialPowers.addObserver(TestObserver, "passwordmgr-found-form", false);
 SpecialPowers.addObserver(TestObserver, "passwordmgr-found-logins", false);
+});
 </script>
 
 <p id="display"></p>
@@ -90,10 +90,6 @@
   ok(TestObserver.dataFoundLogins.get("selectedLogin").QueryInterface(Ci.nsILoginInfo), "Checking selectedLogin is nsILoginInfo");
   ok(TestObserver.dataFoundLogins.get("selectedLogin").equals(TestObserver.dataFoundLogins.get("foundLogins")[0]),
      "Checking selectedLogin is found login");
-
-  // Reset pref (since we assumed it was true to start)
-  SpecialPowers.setBoolPref("signon.autofillForms", true);
-
   // Remove the observer
   SpecialPowers.removeObserver(TestObserver, "passwordmgr-found-form");
   SpecialPowers.removeObserver(TestObserver, "passwordmgr-found-logins");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/unit/test_notifications.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/unit/test_notifications.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/unit/test_notifications.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/unit/test_notifications.js	2015-02-28 15:03:07.000000000 +0000
@@ -166,7 +166,7 @@
 LoginTest.clearData();
 
 } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + testdesc + ": " + e;
+    throw new Error("FAILED in test #" + testnum + " -- " + testdesc + ": " + e);
 }
 
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/passwordmgr/test/unit/test_storage_mozStorage.js	2015-02-28 15:03:07.000000000 +0000
@@ -423,7 +423,7 @@
 LoginTest.deleteFile(OS.Constants.Path.profileDir, filename);
 
 } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + testdesc + ": " + e;
+    throw new Error("FAILED in test #" + testnum + " -- " + testdesc + ": " + e);
 }
 
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/places/nsAnnoProtocolHandler.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/places/nsAnnoProtocolHandler.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/places/nsAnnoProtocolHandler.cpp	2015-02-19 00:42:12.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/places/nsAnnoProtocolHandler.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -343,26 +343,12 @@
   // Create our channel.  We'll call SetContentType with the right type when
   // we know what it actually is.
   nsCOMPtr<nsIChannel> channel;
-  // Bug 1087720 (and Bug 1099296):
-  // Once all callsites have been updated to call NewChannel2() instead of NewChannel()
-  // we should have a non-null loadInfo consistently. Until then we have to brach on the
-  // loadInfo and provide default arguments to create a NewInputStreamChannel.
-  if (aLoadInfo) {
-    rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
-                                          aURI,
-                                          inputStream,
-                                          EmptyCString(), // aContentType
-                                          EmptyCString(), // aContentCharset
-                                          aLoadInfo);
-  }
-  else {
-    rv = NS_NewInputStreamChannel(getter_AddRefs(channel),
-                                  aURI,
-                                  inputStream,
-                                  nsContentUtils::GetSystemPrincipal(),
-                                  nsILoadInfo::SEC_NORMAL,
-                                  nsIContentPolicy::TYPE_IMAGE);
-  }
+  rv = NS_NewInputStreamChannelInternal(getter_AddRefs(channel),
+                                        aURI,
+                                        inputStream,
+                                        EmptyCString(), // aContentType
+                                        EmptyCString(), // aContentCharset
+                                        aLoadInfo);
   NS_ENSURE_SUCCESS(rv, GetDefaultIcon(_channel));
 
   // Now we go ahead and get our data asynchronously for the favicon.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/printing/content/printUtils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/printing/content/printUtils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/printing/content/printUtils.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/printing/content/printUtils.js	2015-02-28 15:03:07.000000000 +0000
@@ -169,6 +169,29 @@
     let printSettings = this.getPrintSettings();
 
     let mm = aBrowser.messageManager;
+
+    mm.addMessageListener("Printing:Print:Done", function onPrintingDone(msg) {
+      mm.removeMessageListener("Printing:Print:Done", onPrintingDone);
+      let rv = msg.data.rv;
+      let printSettings = msg.objects.printSettings;
+      if (rv != Components.results.NS_OK &&
+          rv != Components.results.NS_ERROR_ABORT) {
+        Cu.reportError(`In Printing:Print:Done handler, got unexpected rv
+                        ${rv}.`);
+      }
+
+      if (gPrintSettingsAreGlobal && gSavePrintSettings) {
+        let PSSVC =
+          Components.classes["@mozilla.org/gfx/printsettings-service;1"]
+                    .getService(Components.interfaces.nsIPrintSettingsService);
+
+        PSSVC.savePrintSettingsToPrefs(printSettings, true,
+                                       printSettings.kInitSaveAll);
+        PSSVC.savePrintSettingsToPrefs(printSettings, false,
+                                       printSettings.kInitSavePrinterName);
+      }
+    });
+
     mm.sendAsyncMessage("Printing:Print", null, {
       printSettings: printSettings,
       contentWindow: aWindow,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/reader/AboutReader.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/reader/AboutReader.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/reader/AboutReader.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/reader/AboutReader.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -56,9 +56,10 @@
   doc.addEventListener("visibilitychange", this, false);
 
   this._setupStyleDropdown();
-  this._setupButton("close-button", this._onReaderClose.bind(this));
-  this._setupButton("toggle-button", this._onReaderToggle.bind(this));
-  this._setupButton("share-button", this._onShare.bind(this));
+  this._setupButton("close-button", this._onReaderClose.bind(this), "aboutReader.toolbar.close");
+  this._setupButton("toggle-button", this._onReaderToggle.bind(this), "aboutReader.toolbar.addToReadingList");
+  this._setupButton("share-button", this._onShare.bind(this), "aboutReader.toolbar.share");
+  this._setupButton("list-button", this._onList.bind(this), "aboutReader.toolbar.openReadingList");
 
   let colorSchemeValues = JSON.parse(Services.prefs.getCharPref("reader.color_scheme.values"));
   let colorSchemeOptions = colorSchemeValues.map((value) => {
@@ -72,40 +73,23 @@
   this._setColorSchemePref(colorScheme);
 
   let fontTypeSample = gStrings.GetStringFromName("aboutReader.fontTypeSample");
-  let fontTypeValues = JSON.parse(Services.prefs.getCharPref("reader.font_type.values"));
-  let fontTypeOptions = fontTypeValues.map((value) => {
-    return { name: fontTypeSample,
-             description: gStrings.GetStringFromName("aboutReader.fontType." + value),
-             value: value,
-             linkClass: value };
-  });
+  let fontTypeOptions = [
+    { name: fontTypeSample,
+      description: gStrings.GetStringFromName("aboutReader.fontType.sans-serif"),
+      value: "sans-serif",
+      linkClass: "sans-serif"
+    },
+    { name: fontTypeSample,
+      description: gStrings.GetStringFromName("aboutReader.fontType.serif"),
+      value: "serif",
+      linkClass: "serif" },
+  ];
 
   let fontType = Services.prefs.getCharPref("reader.font_type");
   this._setupSegmentedButton("font-type-buttons", fontTypeOptions, fontType, this._setFontType.bind(this));
   this._setFontType(fontType);
 
-  let fontSizeSample = gStrings.GetStringFromName("aboutReader.fontSizeSample");
-  let fontSizeOptions = [
-    { name: fontSizeSample,
-      value: 1,
-      linkClass: "font-size1-sample" },
-    { name: fontSizeSample,
-      value: 2,
-      linkClass: "font-size2-sample" },
-    { name: fontSizeSample,
-      value: 3,
-      linkClass: "font-size3-sample" },
-    { name: fontSizeSample,
-      value: 4,
-      linkClass: "font-size4-sample" },
-    { name: fontSizeSample,
-      value: 5,
-      linkClass: "font-size5-sample" }
-  ];
-
-  let fontSize = Services.prefs.getIntPref("reader.font_size");
-  this._setupSegmentedButton("font-size-buttons", fontSizeOptions, fontSize, this._setFontSize.bind(this));
-  this._setFontSize(fontSize);
+  this._setupFontSizeButtons();
 
   // Track status of reader toolbar add/remove toggle button
   this._isReadingListItem = -1;
@@ -221,12 +205,14 @@
   },
 
   _updateToggleButton: function Reader_updateToggleButton() {
-    let classes = this._doc.getElementById("toggle-button").classList;
+    let button = this._doc.getElementById("toggle-button");
 
     if (this._isReadingListItem == 1) {
-      classes.add("on");
+      button.classList.add("on");
+      button.setAttribute("title", gStrings.GetStringFromName("aboutReader.toolbar.removeFromReadingList"));
     } else {
-      classes.remove("on");
+      button.classList.remove("on");
+      button.setAttribute("title", gStrings.GetStringFromName("aboutReader.toolbar.addToReadingList"));
     }
   },
 
@@ -281,6 +267,10 @@
     UITelemetry.addEvent("share.1", "list", null);
   },
 
+  _onList: function() {
+    // To be implemented (bug 1132665)
+  },
+
   _setFontSize: function Reader_setFontSize(newFontSize) {
     let htmlClasses = this._doc.documentElement.classList;
 
@@ -290,7 +280,67 @@
     this._fontSize = newFontSize;
     htmlClasses.add("font-size" + this._fontSize);
 
-    Services.prefs.setIntPref("reader.font_size", this._fontSize);
+    this._mm.sendAsyncMessage("Reader:SetIntPref", {
+      name: "reader.font_size",
+      value: this._fontSize
+    });
+  },
+
+  _setupFontSizeButtons: function() {
+    const FONT_SIZE_MIN = 1;
+    const FONT_SIZE_MAX = 9;
+
+    let currentSize = Services.prefs.getIntPref("reader.font_size");
+    currentSize = Math.max(FONT_SIZE_MIN, Math.min(FONT_SIZE_MAX, currentSize));
+
+    let plusButton = this._doc.getElementById("font-size-plus");
+    let minusButton = this._doc.getElementById("font-size-minus");
+
+    function updateControls() {
+      if (currentSize === FONT_SIZE_MIN) {
+        minusButton.setAttribute("disabled", true);
+      } else {
+        minusButton.removeAttribute("disabled");
+      }
+      if (currentSize === FONT_SIZE_MAX) {
+        plusButton.setAttribute("disabled", true);
+      } else {
+        plusButton.removeAttribute("disabled");
+      }
+    }
+
+    updateControls();
+    this._setFontSize(currentSize);
+
+    plusButton.addEventListener("click", (event) => {
+      if (!event.isTrusted) {
+        return;
+      }
+      event.stopPropagation();
+
+      if (currentSize >= FONT_SIZE_MAX) {
+        return;
+      }
+
+      currentSize++;
+      updateControls();
+      this._setFontSize(currentSize);
+    }, true);
+
+    minusButton.addEventListener("click", (event) => {
+      if (!event.isTrusted) {
+        return;
+      }
+      event.stopPropagation();
+
+      if (currentSize <= FONT_SIZE_MIN) {
+        return;
+      }
+
+      currentSize--;
+      updateControls();
+      this._setFontSize(currentSize);
+    }, true);
   },
 
   _handleDeviceLight: function Reader_handleDeviceLight(newLux) {
@@ -381,7 +431,10 @@
     this._enableAmbientLighting(colorSchemePref === "auto");
     this._setColorScheme(colorSchemePref);
 
-    Services.prefs.setCharPref("reader.color_scheme", colorSchemePref);
+    this._mm.sendAsyncMessage("Reader:SetCharPref", {
+      name: "reader.color_scheme",
+      value: colorSchemePref
+    });
   },
 
   _setFontType: function Reader_setFontType(newFontType) {
@@ -396,7 +449,10 @@
     this._fontType = newFontType;
     bodyClasses.add(this._fontType);
 
-    Services.prefs.setCharPref("reader.font_type", this._fontType);
+    this._mm.sendAsyncMessage("Reader:SetCharPref", {
+      name: "reader.font_type",
+      value: this._fontType
+    });
   },
 
   _getToolbarVisibility: function Reader_getToolbarVisibility() {
@@ -420,13 +476,8 @@
     this._toolbarElement.classList.toggle("toolbar-hidden");
     this._setSystemUIVisibility(visible);
 
-    if (!visible && !this._hasUsedToolbar) {
-      this._hasUsedToolbar = Services.prefs.getBoolPref("reader.has_used_toolbar");
-      if (!this._hasUsedToolbar) {
-        this._mm.sendAsyncMessage("Reader:ShowToast", { toast: gStrings.GetStringFromName("aboutReader.toolbarTip") });
-        Services.prefs.setBoolPref("reader.has_used_toolbar", true);
-        this._hasUsedToolbar = true;
-      }
+    if (!visible) {
+      this._mm.sendAsyncMessage("Reader:ToolbarHidden");
     }
   },
 
@@ -434,10 +485,6 @@
     this._setToolbarVisibility(!this._getToolbarVisibility());
   },
 
-  _setBrowserToolbarVisiblity: function Reader_setBrowserToolbarVisiblity(visible) {
-    this._mm.sendAsyncMessage("Reader:ToolbarVisibility", { visible: visible });
-  },
-
   _setSystemUIVisibility: function Reader_setSystemUIVisibility(visible) {
     this._mm.sendAsyncMessage("Reader:SystemUIVisibility", { visible: visible });
   },
@@ -686,8 +733,9 @@
     }
   },
 
-  _setupButton: function Reader_setupButton(id, callback) {
+  _setupButton: function Reader_setupButton(id, callback, titleEntity) {
     let button = this._doc.getElementById(id);
+    button.setAttribute("title", gStrings.GetStringFromName(titleEntity));
 
     button.addEventListener("click", function(aEvent) {
       if (!aEvent.isTrusted)
@@ -737,6 +785,7 @@
       win.setTimeout(updatePopupPosition, 0);
     }, true);
 
+    dropdownToggle.setAttribute("title", gStrings.GetStringFromName("aboutReader.toolbar.typeControls"));
     dropdownToggle.addEventListener("click", event => {
       if (!event.isTrusted)
         return;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/reader/content/aboutReader.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/reader/content/aboutReader.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/reader/content/aboutReader.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/reader/content/aboutReader.html	2015-02-28 15:03:07.000000000 +0000
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <meta content="text/html; charset=UTF-8" http-equiv="content-type">
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
   <meta name="viewport" content="width=device-width; user-scalable=0" />
 
   <link rel="stylesheet" href="chrome://global/skin/aboutReader.css" type="text/css"/>
@@ -25,21 +25,24 @@
   </div>
 
   <ul id="reader-toolbar" class="toolbar toolbar-hidden">
-    <li><a id="close-button" class="button close-button" href="#"></a></li>
-    <li><a id="share-button" class="button share-button" href="#"></a></li>
+    <li><button id="close-button" class="button close-button"/></li>
+    <li><button id="share-button" class="button share-button"/></li>
     <ul id="style-dropdown" class="dropdown">
-      <li><a class="dropdown-toggle button style-button" href="#"></a></li>
+      <li><button class="dropdown-toggle button style-button"/></li>
       <li class="dropdown-popup">
         <ul id="font-type-buttons"></ul>
         <hr></hr>
-        <ul id="font-size-buttons" class="segmented-button"></ul>
+        <div id="font-size-buttons">
+          <button id="font-size-minus" class="minus-button"/>
+          <button id="font-size-plus" class="plus-button"/>
+        </div>
         <hr></hr>
         <ul id="color-scheme-buttons" class="segmented-button"></ul>
         <div class="dropdown-arrow"/>
       </li>
     </ul>
-    <li><a id="toggle-button" class="button toggle-button" href="#"></a></li>
-    <li><a id="list-button" class="button list-button" href="#"></a></li>
+    <li><button id="toggle-button" class="button toggle-button"/></li>
+    <li><button id="list-button" class="button list-button"/></li>
   </ul>
 
 </body>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/reader/content/Readability.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/reader/content/Readability.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/reader/content/Readability.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/reader/content/Readability.js	2015-02-28 15:03:07.000000000 +0000
@@ -1,4 +1,11 @@
 /*
+ * DO NOT MODIFY THIS FILE DIRECTLY!
+ *
+ * This is a shared library that is maintained in an external repo:
+ * https://github.com/mozilla/readability
+ */
+
+/*
  * Copyright (c) 2010 Arc90 Inc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -94,7 +101,7 @@
    * @return void
   **/
   _postProcessContent: function(articleContent) {
-    // Readability cannot open relative uris so we convert them to absolute uris. 
+    // Readability cannot open relative uris so we convert them to absolute uris.
     this._fixRelativeUris(articleContent);
   },
 
@@ -105,9 +112,9 @@
    * @return void
    */
   _fixRelativeUris: function(articleContent) {
-    let scheme = this._uri.scheme;
-    let prePath = this._uri.prePath;
-    let pathBase = this._uri.pathBase;
+    var scheme = this._uri.scheme;
+    var prePath = this._uri.prePath;
+    var pathBase = this._uri.pathBase;
 
     function toAbsoluteURI(uri) {
       // If this is already an absolute URI, return it.
@@ -128,10 +135,10 @@
     }
 
     function convertRelativeURIs(tagName, propName) {
-      let elems = articleContent.getElementsByTagName(tagName);
-      for (let i = elems.length; --i >= 0;) {
-        let elem = elems[i];
-        let relativeURI = elem.getAttribute(propName);
+      var elems = articleContent.getElementsByTagName(tagName);
+      for (var i = elems.length; --i >= 0;) {
+        var elem = elems[i];
+        var relativeURI = elem.getAttribute(propName);
         if (relativeURI != null)
           elems[i].setAttribute(propName, toAbsoluteURI(relativeURI));
       }
@@ -150,9 +157,9 @@
    * @return void
    **/
   _getArticleTitle: function() {
-    let doc = this._doc;
-    let curTitle = "";
-    let origTitle = "";
+    var doc = this._doc;
+    var curTitle = "";
+    var origTitle = "";
 
     try {
       curTitle = origTitle = doc.title;
@@ -173,7 +180,7 @@
       if (curTitle.split(' ').length < 3)
         curTitle = origTitle.replace(/[^:]*[:](.*)/gi,'$1');
     } else if (curTitle.length > 150 || curTitle.length < 15) {
-      let hOnes = doc.getElementsByTagName('h1');
+      var hOnes = doc.getElementsByTagName('h1');
 
       if (hOnes.length === 1)
         curTitle = this._getInnerText(hOnes[0]);
@@ -194,13 +201,13 @@
    * @return void
    **/
   _prepDocument: function() {
-    let doc = this._doc;
+    var doc = this._doc;
 
     // In some cases a body element can't be found (if the HTML is
     // totally hosed for example) so we create a new body node and
     // append it to the document.
     if (!doc.body) {
-      let body = doc.createElement("body");
+      var body = doc.createElement("body");
 
       try {
         doc.body = body;
@@ -211,15 +218,15 @@
     }
 
     // Remove all style tags in head
-    let styleTags = doc.getElementsByTagName("style");
-    for (let st = 0; st < styleTags.length; st += 1) {
+    var styleTags = doc.getElementsByTagName("style");
+    for (var st = 0; st < styleTags.length; st += 1) {
       styleTags[st].textContent = "";
     }
 
     this._replaceBrs(doc.body);
 
-    let fonts = doc.getElementsByTagName("FONT");
-    for (let i = fonts.length; --i >=0;) {
+    var fonts = doc.getElementsByTagName("FONT");
+    for (var i = fonts.length; --i >=0;) {
       this._setNodeTag(fonts[i], "SPAN");
     }
   },
@@ -230,7 +237,7 @@
    * returned.
    */
   _nextElement: function (node) {
-    let next = node;
+    var next = node;
     while (next
         && (next.nodeType != Node.ELEMENT_NODE)
         && this.REGEXPS.whitespace.test(next.textContent)) {
@@ -247,21 +254,21 @@
    *   <div>foo<br>bar<p>abc</p></div>
    */
   _replaceBrs: function (elem) {
-    let brs = elem.getElementsByTagName("br");
-    for (let i = 0; i < brs.length; i++) {
-      let br = brs[i];
-      let next = br.nextSibling;
+    var brs = elem.getElementsByTagName("br");
+    for (var i = 0; i < brs.length; i++) {
+      var br = brs[i];
+      var next = br.nextSibling;
 
       // Whether 2 or more <br> elements have been found and replaced with a
       // <p> block.
-      let replaced = false;
+      var replaced = false;
 
       // If we find a <br> chain, remove the <br>s until we hit another element
       // or non-whitespace. This leaves behind the first <br> in the chain
       // (which will be replaced with a <p> later).
       while ((next = this._nextElement(next)) && (next.tagName == "BR")) {
         replaced = true;
-        let sibling = next.nextSibling;
+        var sibling = next.nextSibling;
         next.parentNode.removeChild(next);
         next = sibling;
       }
@@ -270,20 +277,20 @@
       // all sibling nodes as children of the <p> until we hit another <br>
       // chain.
       if (replaced) {
-        let p = this._doc.createElement("p");
+        var p = this._doc.createElement("p");
         br.parentNode.replaceChild(p, br);
 
         next = p.nextSibling;
         while (next) {
           // If we've hit another <br><br>, we're done adding children to this <p>.
           if (next.tagName == "BR") {
-            let nextElem = this._nextElement(next);
+            var nextElem = this._nextElement(next);
             if (nextElem && nextElem.tagName == "BR")
               break;
           }
-          
+
           // Otherwise, make this node a child of the new <p>.
-          let sibling = next.nextSibling;
+          var sibling = next.nextSibling;
           p.appendChild(next);
           next = sibling;
         }
@@ -326,11 +333,11 @@
     this._cleanConditionally(articleContent, "div");
 
     // Remove extra paragraphs
-    let articleParagraphs = articleContent.getElementsByTagName('p');
-    for (let i = articleParagraphs.length - 1; i >= 0; i -= 1) {
-      let imgCount = articleParagraphs[i].getElementsByTagName('img').length;
-      let embedCount = articleParagraphs[i].getElementsByTagName('embed').length;
-      let objectCount = articleParagraphs[i].getElementsByTagName('object').length;
+    var articleParagraphs = articleContent.getElementsByTagName('p');
+    for (var i = articleParagraphs.length - 1; i >= 0; i -= 1) {
+      var imgCount = articleParagraphs[i].getElementsByTagName('img').length;
+      var embedCount = articleParagraphs[i].getElementsByTagName('embed').length;
+      var objectCount = articleParagraphs[i].getElementsByTagName('object').length;
 
       if (imgCount === 0 &&
         embedCount === 0 &&
@@ -339,10 +346,10 @@
         articleParagraphs[i].parentNode.removeChild(articleParagraphs[i]);
     }
 
-    let brs = articleContent.getElementsByTagName("BR");
-    for (let i = brs.length; --i >= 0;) {
-      let br = brs[i];
-      let next = this._nextElement(br.nextSibling);
+    var brs = articleContent.getElementsByTagName("BR");
+    for (var i = brs.length; --i >= 0;) {
+      var br = brs[i];
+      var next = this._nextElement(br.nextSibling);
       if (next && next.tagName == "P")
         br.parentNode.removeChild(br);
     }
@@ -402,20 +409,25 @@
    * @return Element
   **/
   _grabArticle: function (page) {
-    let doc = this._doc;
-    let isPaging = (page !== null ? true: false);
+    var doc = this._doc;
+    var isPaging = (page !== null ? true: false);
     page = page ? page : this._doc.body;
-    let pageCacheHtml = page.innerHTML;
+    var pageCacheHtml = page.innerHTML;
 
-    // Check if any "dir" is set on the toplevel BODY or HTML.
-    this._articleDir = page.getAttribute("dir");
-    if (!this._articleDir) {
-      this._articleDir = doc.documentElement.getAttribute("dir");
-    }
+    // Check if any "dir" is set on the toplevel document element
+    this._articleDir = doc.documentElement.getAttribute("dir");
 
+    //helper function used below in the 'while' loop:
+    function purgeNode(node, allElements) {
+      for (var i = node.childNodes.length; --i >= 0;) {
+        purgeNode(node.childNodes[i], allElements);
+      }
+      if (node._index !== undefined && allElements[node._index] == node)
+        delete allElements[node._index];
+    }
     while (true) {
-      let stripUnlikelyCandidates = this._flagIsActive(this.FLAG_STRIP_UNLIKELYS);
-      let allElements = page.getElementsByTagName('*');
+      var stripUnlikelyCandidates = this._flagIsActive(this.FLAG_STRIP_UNLIKELYS);
+      var allElements = page.getElementsByTagName('*');
 
       // First, node prepping. Trash nodes that look cruddy (like ones with the
       // class name "comment", etc), and turn divs into P tags where they have been
@@ -423,11 +435,11 @@
       //
       // Note: Assignment from index for performance. See http://www.peachpit.com/articles/article.aspx?p=31567&seqNum=5
       // TODO: Shouldn't this be a reverse traversal?
-      let node = null;
-      let nodesToScore = [];
+      var node = null;
+      var nodesToScore = [];
 
-      // Let each node know its index in the allElements array.
-      for (let i = allElements.length; --i >= 0;) {
+      // var each node know its index in the allElements array.
+      for (var i = allElements.length; --i >= 0;) {
         allElements[i]._index = i;
       }
 
@@ -436,24 +448,16 @@
        * an element from the document, we need to manually remove it - and all
        * of its children - from the allElements array.
        */
-      function purgeNode(node) {
-        for (let i = node.childNodes.length; --i >= 0;) {
-          purgeNode(node.childNodes[i]);
-        }
-        if (node._index !== undefined && allElements[node._index] == node)
-          delete allElements[node._index];
-      }
-
-      for (let nodeIndex = 0; nodeIndex < allElements.length; nodeIndex++) {
+      for (var nodeIndex = 0; nodeIndex < allElements.length; nodeIndex++) {
         if (!(node = allElements[nodeIndex]))
           continue;
 
-        let matchString = node.className + node.id;
+        var matchString = node.className + node.id;
         if (matchString.search(this.REGEXPS.byline) !== -1 && !this._articleByline) {
           if (this._isValidByline(node.textContent)) {
             this._articleByline = node.textContent.trim();
             node.parentNode.removeChild(node);
-            purgeNode(node);
+            purgeNode(node, allElements);
             continue;
           }
         }
@@ -465,7 +469,7 @@
             node.tagName !== "BODY") {
             this.log("Removing unlikely candidate - " + matchString);
             node.parentNode.removeChild(node);
-            purgeNode(node);
+            purgeNode(node, allElements);
             continue;
           }
         }
@@ -479,26 +483,26 @@
           // element. DIVs with only a P element inside and no text content can be
           // safely converted into plain P elements to avoid confusing the scoring
           // algorithm with DIVs with are, in practice, paragraphs.
-          let pIndex = this._getSinglePIndexInsideDiv(node);
+          var pIndex = this._getSinglePIndexInsideDiv(node);
 
           if (pIndex >= 0 || !this._hasChildBlockElement(node)) {
             if (pIndex >= 0) {
-              let newNode = node.childNodes[pIndex];
+              var newNode = node.childNodes[pIndex];
               node.parentNode.replaceChild(newNode, node);
-              purgeNode(node);
+              purgeNode(node, allElements);
             } else {
               this._setNodeTag(node, "P");
               nodesToScore[nodesToScore.length] = node;
             }
           } else {
             // EXPERIMENTAL
-            for (let i = 0, il = node.childNodes.length; i < il; i += 1) {
-              let childNode = node.childNodes[i];
+            for (var i = 0, il = node.childNodes.length; i < il; i += 1) {
+              var childNode = node.childNodes[i];
               if (!childNode)
                 continue;
 
               if (childNode.nodeType === 3) { // Node.TEXT_NODE
-                let p = doc.createElement('p');
+                var p = doc.createElement('p');
                 p.textContent = childNode.textContent;
                 p.style.display = 'inline';
                 p.className = 'readability-styled';
@@ -515,11 +519,11 @@
        *
        * A score is determined by things like number of commas, class names, etc. Maybe eventually link density.
       **/
-      let candidates = [];
-      for (let pt = 0; pt < nodesToScore.length; pt += 1) {
-        let parentNode = nodesToScore[pt].parentNode;
-        let grandParentNode = parentNode ? parentNode.parentNode : null;
-        let innerText = this._getInnerText(nodesToScore[pt]);
+      var candidates = [];
+      for (var pt = 0; pt < nodesToScore.length; pt += 1) {
+        var parentNode = nodesToScore[pt].parentNode;
+        var grandParentNode = parentNode ? parentNode.parentNode : null;
+        var innerText = this._getInnerText(nodesToScore[pt]);
 
         if (!parentNode || typeof(parentNode.tagName) === 'undefined')
           continue;
@@ -542,7 +546,7 @@
           candidates.push(grandParentNode);
         }
 
-        let contentScore = 0;
+        var contentScore = 0;
 
         // Add a point for the paragraph itself as a base.
         contentScore += 1;
@@ -562,21 +566,21 @@
 
       // After we've calculated scores, loop through all of the possible
       // candidate nodes we found and find the one with the highest score.
-      let topCandidates = [];
-      for (let c = 0, cl = candidates.length; c < cl; c += 1) {
-        let candidate = candidates[c];
+      var topCandidates = [];
+      for (var c = 0, cl = candidates.length; c < cl; c += 1) {
+        var candidate = candidates[c];
 
         // Scale the final candidates score based on link density. Good content
         // should have a relatively small link density (5% or less) and be mostly
         // unaffected by this operation.
-        let candidateScore = candidate.readability.contentScore * (1 - this._getLinkDensity(candidate));
+        var candidateScore = candidate.readability.contentScore * (1 - this._getLinkDensity(candidate));
         candidate.readability.contentScore = candidateScore;
 
         this.log('Candidate: ' + candidate + " (" + candidate.className + ":" +
           candidate.id + ") with score " + candidateScore);
 
-        for (let t = 0; t < this.N_TOP_CANDIDATES; t++) {
-          let aTopCandidate = topCandidates[t];
+        for (var t = 0; t < this.N_TOP_CANDIDATES; t++) {
+          var aTopCandidate = topCandidates[t];
 
           if (!aTopCandidate || candidateScore > aTopCandidate.readability.contentScore) {
             topCandidates.splice(t, 0, candidate);
@@ -587,15 +591,15 @@
         }
       }
 
-      let topCandidate = topCandidates[0] || null;
+      var topCandidate = topCandidates[0] || null;
 
       // If we still have no top candidate, just use the body as a last resort.
       // We also have to copy the body node so it is something we can modify.
       if (topCandidate === null || topCandidate.tagName === "BODY") {
         // Move all of the page's children into topCandidate
         topCandidate = doc.createElement("DIV");
-        let children = page.childNodes;
-        for (let i = 0; i < children.length; ++i) {
+        var children = page.childNodes;
+        for (var i = 0; i < children.length; ++i) {
           topCandidate.appendChild(children[i]);
         }
 
@@ -607,16 +611,16 @@
       // Now that we have the top candidate, look through its siblings for content
       // that might also be related. Things like preambles, content split by ads
       // that we removed, etc.
-      let articleContent = doc.createElement("DIV");
+      var articleContent = doc.createElement("DIV");
       if (isPaging)
         articleContent.id = "readability-content";
 
-      let siblingScoreThreshold = Math.max(10, topCandidate.readability.contentScore * 0.2);
-      let siblingNodes = topCandidate.parentNode.childNodes;
+      var siblingScoreThreshold = Math.max(10, topCandidate.readability.contentScore * 0.2);
+      var siblingNodes = topCandidate.parentNode.childNodes;
 
-      for (let s = 0, sl = siblingNodes.length; s < sl; s += 1) {
-        let siblingNode = siblingNodes[s];
-        let append = false;
+      for (var s = 0, sl = siblingNodes.length; s < sl; s += 1) {
+        var siblingNode = siblingNodes[s];
+        var append = false;
 
         this.log("Looking at sibling node: " + siblingNode + " (" + siblingNode.className + ":" + siblingNode.id + ")" + ((typeof siblingNode.readability !== 'undefined') ? (" with score " + siblingNode.readability.contentScore) : ''));
         this.log("Sibling has score " + (siblingNode.readability ? siblingNode.readability.contentScore : 'Unknown'));
@@ -624,7 +628,7 @@
         if (siblingNode === topCandidate)
           append = true;
 
-        let contentBonus = 0;
+        var contentBonus = 0;
 
         // Give a bonus if sibling nodes and top candidates have the example same classname
         if (siblingNode.className === topCandidate.className && topCandidate.className !== "")
@@ -635,9 +639,9 @@
           append = true;
 
         if (siblingNode.nodeName === "P") {
-          let linkDensity = this._getLinkDensity(siblingNode);
-          let nodeContent = this._getInnerText(siblingNode);
-          let nodeLength = nodeContent.length;
+          var linkDensity = this._getLinkDensity(siblingNode);
+          var nodeContent = this._getInnerText(siblingNode);
+          var nodeLength = nodeContent.length;
 
           if (nodeLength > 80 && linkDensity < 0.25) {
             append = true;
@@ -678,11 +682,11 @@
       this._prepArticle(articleContent);
 
       if (this._curPageNum === 1) {
-        let div = doc.createElement("DIV");
+        var div = doc.createElement("DIV");
         div.id = "readability-page-1";
         div.className = "page";
-        let children = articleContent.childNodes;
-        for (let i = 0; i < children.length; ++i) {
+        var children = articleContent.childNodes;
+        for (var i = 0; i < children.length; ++i) {
           div.appendChild(children[i]);
         }
         articleContent.appendChild(div);
@@ -741,23 +745,23 @@
    * @return String - excerpt of the article
   **/
   _getExcerpt: function(articleContent) {
-    let values = {};
-    let metaElements = this._doc.getElementsByTagName("meta");
+    var values = {};
+    var metaElements = this._doc.getElementsByTagName("meta");
 
     // Match "description", or Twitter's "twitter:description" (Cards)
     // in name attribute.
-    let namePattern = /^\s*((twitter)\s*:\s*)?description\s*$/gi;
+    var namePattern = /^\s*((twitter)\s*:\s*)?description\s*$/gi;
 
     // Match Facebook's og:description (Open Graph) in property attribute.
-    let propertyPattern = /^\s*og\s*:\s*description\s*$/gi;
+    var propertyPattern = /^\s*og\s*:\s*description\s*$/gi;
 
     // Find description tags.
-    for (let i = 0; i < metaElements.length; i++) {
-      let element = metaElements[i];
-      let elementName = element.getAttribute("name");
-      let elementProperty = element.getAttribute("property");
+    for (var i = 0; i < metaElements.length; i++) {
+      var element = metaElements[i];
+      var elementName = element.getAttribute("name");
+      var elementProperty = element.getAttribute("property");
 
-      let name;
+      var name;
       if (namePattern.test(elementName)) {
         name = elementName;
       } else if (propertyPattern.test(elementProperty)) {
@@ -765,7 +769,7 @@
       }
 
       if (name) {
-        let content = element.getAttribute("content");
+        var content = element.getAttribute("content");
         if (content) {
           // Convert to lowercase and remove any whitespace
           // so we can match below.
@@ -790,7 +794,7 @@
     }
 
     // No description meta tags, use the article's first paragraph.
-    let paragraphs = articleContent.getElementsByTagName("p");
+    var paragraphs = articleContent.getElementsByTagName("p");
     if (paragraphs.length > 0) {
       return paragraphs[0].textContent;
     }
@@ -804,8 +808,8 @@
    * @param Element
   **/
   _removeScripts: function(doc) {
-    let scripts = doc.getElementsByTagName('script');
-    for (let i = scripts.length - 1; i >= 0; i -= 1) {
+    var scripts = doc.getElementsByTagName('script');
+    for (var i = scripts.length - 1; i >= 0; i -= 1) {
       scripts[i].nodeValue="";
       scripts[i].removeAttribute('src');
 
@@ -822,11 +826,11 @@
    * @param Element
   **/
   _getSinglePIndexInsideDiv: function(e) {
-    let childNodes = e.childNodes;
-    let pIndex = -1;
+    var childNodes = e.childNodes;
+    var pIndex = -1;
 
-    for (let i = childNodes.length; --i >= 0;) {
-      let node = childNodes[i];
+    for (var i = childNodes.length; --i >= 0;) {
+      var node = childNodes[i];
 
       if (node.nodeType === Node.ELEMENT_NODE) {
         if (node.tagName !== "P")
@@ -846,13 +850,13 @@
 
   /**
    * Determine whether element has any children block level elements.
-   * 
+   *
    * @param Element
    */
   _hasChildBlockElement: function (e) {
-    let length = e.childNodes.length;
-    for (let i = 0; i < length; i++) {
-      let child = e.childNodes[i];
+    var length = e.childNodes.length;
+    for (var i = 0; i < length; i++) {
+      var child = e.childNodes[i];
       if (child.nodeType != 1)
         continue;
 
@@ -870,7 +874,7 @@
    * @return string
   **/
   _getInnerText: function(e, normalizeSpaces) {
-    let textContent = e.textContent.replace(this.REGEXPS.trim, "");
+    var textContent = e.textContent.replace(this.REGEXPS.trim, "");
     normalizeSpaces = (typeof normalizeSpaces === 'undefined') ? true : normalizeSpaces;
 
     if (normalizeSpaces) {
@@ -901,23 +905,22 @@
   **/
   _cleanStyles: function(e) {
     e = e || this._doc;
-    let cur = e.firstChild;
+    var cur = e.firstChild;
 
     if (!e)
       return;
 
     // Remove any root styles, if we're able.
-    if (typeof e.removeAttribute === 'function' && e.className !== 'readability-styled') {
-      this._stripNonDirectionStyles(e);
-    }
+    if (typeof e.removeAttribute === 'function' && e.className !== 'readability-styled')
+      e.removeAttribute('style');
 
     // Go until there are no more child nodes
     while (cur !== null) {
       if (cur.nodeType === 1) {
         // Remove style attribute(s) :
-        if (cur.className !== "readability-styled") {
-          this._stripNonDirectionStyles(e);
-        }
+        if (cur.className !== "readability-styled")
+          cur.removeAttribute("style");
+
         this._cleanStyles(cur);
       }
 
@@ -926,20 +929,6 @@
   },
 
   /**
-   * Remove all style atrributes, preserving RTL/LTR text direction styles.
-   *
-   * @param Element
-   * @return void.
-   */
-  _stripNonDirectionStyles: function(e) {
-    let dir = e.style.direction;
-    e.removeAttribute("style");
-    if (dir) {
-      e.style.direction = dir;
-    }
-  },
-
-  /**
    * Get the density of links as a percentage of the content
    * This is the amount of text that is inside a link divided by the total text in the node.
    *
@@ -947,11 +936,11 @@
    * @return number (float)
   **/
   _getLinkDensity: function(e) {
-    let links = e.getElementsByTagName("a");
-    let textLength = this._getInnerText(e).length;
-    let linkLength = 0;
+    var links = e.getElementsByTagName("a");
+    var textLength = this._getInnerText(e).length;
+    var linkLength = 0;
 
-    for (let i = 0, il = links.length; i < il; i += 1) {
+    for (var i = 0, il = links.length; i < il; i += 1) {
       linkLength += this._getInnerText(links[i]).length;
     }
 
@@ -965,14 +954,14 @@
    * @return string the base url
   **/
   _findBaseUrl: function() {
-    let uri = this._uri;
-    let noUrlParams = uri.path.split("?")[0];
-    let urlSlashes = noUrlParams.split("/").reverse();
-    let cleanedSegments = [];
-    let possibleType = "";
+    var uri = this._uri;
+    var noUrlParams = uri.path.split("?")[0];
+    var urlSlashes = noUrlParams.split("/").reverse();
+    var cleanedSegments = [];
+    var possibleType = "";
 
-    for (let i = 0, slashLen = urlSlashes.length; i < slashLen; i += 1) {
-      let segment = urlSlashes[i];
+    for (var i = 0, slashLen = urlSlashes.length; i < slashLen; i += 1) {
+      var segment = urlSlashes[i];
 
       // Split off and save anything that looks like a file type.
       if (segment.indexOf(".") !== -1) {
@@ -992,7 +981,7 @@
       if (segment.match(/((_|-)?p[a-z]*|(_|-))[0-9]{1,2}$/i) && ((i === 1) || (i === 0)))
         segment = segment.replace(/((_|-)?p[a-z]*|(_|-))[0-9]{1,2}$/i, "");
 
-      let del = false;
+      var del = false;
 
       // If this is purely a number, and it's the first or second segment,
       // it's probably a page number. Remove it.
@@ -1024,10 +1013,10 @@
    * @return object (array)
   **/
   _findNextPageLink: function(elem) {
-    let uri = this._uri;
-    let possiblePages = {};
-    let allLinks = elem.getElementsByTagName('a');
-    let articleBaseUrl = this._findBaseUrl();
+    var uri = this._uri;
+    var possiblePages = {};
+    var allLinks = elem.getElementsByTagName('a');
+    var articleBaseUrl = this._findBaseUrl();
 
     // Loop through all links, looking for hints that they may be next-page links.
     // Things like having "page" in their textContent, className or id, or being a child
@@ -1036,9 +1025,9 @@
     // Also possible: levenshtein distance? longest common subsequence?
     //
     // After we do that, assign each page a score, and
-    for (let i = 0, il = allLinks.length; i < il; i += 1) {
-      let link = allLinks[i];
-      let linkHref = allLinks[i].href.replace(/#.*$/, '').replace(/\/$/, '');
+    for (var i = 0, il = allLinks.length; i < il; i += 1) {
+      var link = allLinks[i];
+      var linkHref = allLinks[i].href.replace(/#.*$/, '').replace(/\/$/, '');
 
       // If we've already seen this page, ignore it.
       if (linkHref === "" ||
@@ -1052,7 +1041,7 @@
       if (uri.host !== linkHref.split(/\/+/g)[1])
         continue;
 
-      let linkText = this._getInnerText(link);
+      var linkText = this._getInnerText(link);
 
       // If the linkText looks like it's not the next page, skip it.
       if (linkText.match(this.REGEXPS.extraneous) || linkText.length > 25)
@@ -1060,7 +1049,7 @@
 
       // If the leftovers of the URL after removing the base URL don't contain
       // any digits, it's certainly not a next page link.
-      let linkHrefLeftover = linkHref.replace(articleBaseUrl, '');
+      var linkHrefLeftover = linkHref.replace(articleBaseUrl, '');
       if (!linkHrefLeftover.match(/\d/))
         continue;
 
@@ -1070,7 +1059,7 @@
         possiblePages[linkHref].linkText += ' | ' + linkText;
       }
 
-      let linkObj = possiblePages[linkHref];
+      var linkObj = possiblePages[linkHref];
 
       // If the articleBaseUrl isn't part of this URL, penalize this link. It could
       // still be the link, but the odds are lower.
@@ -1078,7 +1067,7 @@
       if (linkHref.indexOf(articleBaseUrl) !== 0)
         linkObj.score -= 25;
 
-      let linkData = linkText + ' ' + link.className + ' ' + link.id;
+      var linkData = linkText + ' ' + link.className + ' ' + link.id;
       if (linkData.match(this.REGEXPS.nextLink))
         linkObj.score += 50;
 
@@ -1100,12 +1089,12 @@
         linkObj.score -= 200;
 
       // If a parentNode contains page or paging or paginat
-      let parentNode = link.parentNode;
-      let positiveNodeMatch = false;
-      let negativeNodeMatch = false;
+      var parentNode = link.parentNode;
+      var positiveNodeMatch = false;
+      var negativeNodeMatch = false;
 
       while (parentNode) {
-        let parentNodeClassAndId = parentNode.className + ' ' + parentNode.id;
+        var parentNodeClassAndId = parentNode.className + ' ' + parentNode.id;
 
         if (!positiveNodeMatch && parentNodeClassAndId && parentNodeClassAndId.match(/pag(e|ing|inat)/i)) {
           positiveNodeMatch = true;
@@ -1145,7 +1134,7 @@
       // If the link text can be parsed as a number, give it a minor bonus, with a slight
       // bias towards lower numbered pages. This is so that pages that might not have 'next'
       // in their text can still get scored, and sorted properly by score.
-      let linkTextAsNumber = parseInt(linkText, 10);
+      var linkTextAsNumber = parseInt(linkText, 10);
       if (linkTextAsNumber) {
         // Punish 1 since we're either already there, or it's probably
         // before what we want anyways.
@@ -1160,8 +1149,8 @@
     // Loop thrugh all of our possible pages from above and find our top
     // candidate for the next page URL. Require at least a score of 50, which
     // is a relatively high confidence that this page is the next link.
-    let topPage = null;
-    for (let page in possiblePages) {
+    var topPage = null;
+    for (var page in possiblePages) {
       if (possiblePages.hasOwnProperty(page)) {
         if (possiblePages[page].score >= 50 &&
           (!topPage || topPage.score < possiblePages[page].score))
@@ -1170,7 +1159,7 @@
     }
 
     if (topPage) {
-      let nextHref = topPage.href.replace(/\/$/,'');
+      var nextHref = topPage.href.replace(/\/$/,'');
 
       this.log('NEXT PAGE IS ' + nextHref);
       this._parsedPages[nextHref] = true;
@@ -1187,7 +1176,7 @@
   },
 
   _ajax: function(url, options) {
-    let request = new XMLHttpRequest();
+    var request = new XMLHttpRequest();
 
     function respondToReadyState(readyState) {
       if (request.readyState === 4) {
@@ -1220,10 +1209,10 @@
   },
 
   _appendNextPage: function(nextPageLink) {
-    let doc = this._doc;
+    var doc = this._doc;
     this._curPageNum += 1;
 
-    let articlePage = doc.createElement("DIV");
+    var articlePage = doc.createElement("DIV");
     articlePage.id = 'readability-page-' + this._curPageNum;
     articlePage.className = 'page';
     articlePage.innerHTML = '<p class="page-separator" title="Page ' + this._curPageNum + '">&sect;</p>';
@@ -1231,7 +1220,7 @@
     doc.getElementById("readability-content").appendChild(articlePage);
 
     if (this._curPageNum > this.MAX_PAGES) {
-      let nextPageMarkup = "<div style='text-align: center'><a href='" + nextPageLink + "'>View Next Page</a></div>";
+      var nextPageMarkup = "<div style='text-align: center'><a href='" + nextPageLink + "'>View Next Page</a></div>";
       articlePage.innerHTML = articlePage.innerHTML + nextPageMarkup;
       return;
     }
@@ -1243,7 +1232,7 @@
         success: function(r) {
 
           // First, check to see if we have a matching ETag in headers - if we do, this is a duplicate page.
-          let eTag = r.getResponseHeader('ETag');
+          var eTag = r.getResponseHeader('ETag');
           if (eTag) {
             if (eTag in this._pageETags) {
               this.log("Exact duplicate page found via ETag. Aborting.");
@@ -1255,7 +1244,7 @@
           }
 
           // TODO: this ends up doubling up page numbers on NYTimes articles. Need to generically parse those away.
-          let page = doc.createElement("DIV");
+          var page = doc.createElement("DIV");
 
           // Do some preprocessing to our HTML to make it ready for appending.
           // - Remove any script tags. Swap and reswap newlines with a unicode
@@ -1265,7 +1254,7 @@
           // - Turn all double br's into p's - was handled by prepDocument in the original view.
           //   Maybe in the future abstract out prepDocument to work for both the original document
           //   and AJAX-added pages.
-          let responseHtml = r.responseText.replace(/\n/g,'\uffff').replace(/<script.*?>.*?<\/script>/gi, '');
+          var responseHtml = r.responseText.replace(/\n/g,'\uffff').replace(/<script.*?>.*?<\/script>/gi, '');
           responseHtml = responseHtml.replace(/\n/g,'\uffff').replace(/<script.*?>.*?<\/script>/gi, '');
           responseHtml = responseHtml.replace(/\uffff/g,'\n').replace(/<(\/?)noscript/gi, '<$1div');
           responseHtml = responseHtml.replace(this.REGEXPS.replaceFonts, '<$1span>');
@@ -1277,11 +1266,11 @@
           // disable as necessary at the end of grabArticle.
           this._flags = 0x1 | 0x2 | 0x4;
 
-          let nextPageLink = this._findNextPageLink(page);
-          
+          var nextPageLink = this._findNextPageLink(page);
+
           // NOTE: if we end up supporting _appendNextPage(), we'll need to
           // change this call to be async
-          let content = this._grabArticle(page);
+          var content = this._grabArticle(page);
 
           if (!content) {
             this.log("No content found in page to append. Aborting.");
@@ -1291,10 +1280,10 @@
           // Anti-duplicate mechanism. Essentially, get the first paragraph of our new page.
           // Compare it against all of the the previous document's we've gotten. If the previous
           // document contains exactly the innerHTML of this first paragraph, it's probably a duplicate.
-          let firstP = content.getElementsByTagName("P").length ? content.getElementsByTagName("P")[0] : null;
+          var firstP = content.getElementsByTagName("P").length ? content.getElementsByTagName("P")[0] : null;
           if (firstP && firstP.innerHTML.length > 100) {
-            for (let i = 1; i <= this._curPageNum; i += 1) {
-              let rPage = doc.getElementById('readability-page-' + i);
+            for (var i = 1; i <= this._curPageNum; i += 1) {
+              var rPage = doc.getElementById('readability-page-' + i);
               if (rPage && rPage.innerHTML.indexOf(firstP.innerHTML) !== -1) {
                 this.log('Duplicate of page ' + i + ' - skipping.');
                 articlePage.style.display = 'none';
@@ -1324,7 +1313,7 @@
   },
 
   /**
-   * Get an elements class/id weight. Uses regular expressions to tell if this 
+   * Get an elements class/id weight. Uses regular expressions to tell if this
    * element looks good or bad.
    *
    * @param Element
@@ -1334,7 +1323,7 @@
     if (!this._flagIsActive(this.FLAG_WEIGHT_CLASSES))
       return 0;
 
-    let weight = 0;
+    var weight = 0;
 
     // Look for a special classname
     if (typeof(e.className) === 'string' && e.className !== '') {
@@ -1366,14 +1355,14 @@
    * @return void
    **/
   _clean: function(e, tag) {
-    let targetList = e.getElementsByTagName(tag);
-    let isEmbed = (tag === 'object' || tag === 'embed');
+    var targetList = e.getElementsByTagName(tag);
+    var isEmbed = (tag === 'object' || tag === 'embed');
 
-    for (let y = targetList.length - 1; y >= 0; y -= 1) {
+    for (var y = targetList.length - 1; y >= 0; y -= 1) {
       // Allow youtube and vimeo videos through as people usually want to see those.
       if (isEmbed) {
-        let attributeValues = "";
-        for (let i = 0, il = targetList[y].attributes.length; i < il; i += 1) {
+        var attributeValues = "";
+        for (var i = 0, il = targetList[y].attributes.length; i < il; i += 1) {
           attributeValues += targetList[y].attributes[i].value + '|';
         }
 
@@ -1400,17 +1389,17 @@
     if (!this._flagIsActive(this.FLAG_CLEAN_CONDITIONALLY))
       return;
 
-    let tagsList = e.getElementsByTagName(tag);
-    let curTagsLength = tagsList.length;
+    var tagsList = e.getElementsByTagName(tag);
+    var curTagsLength = tagsList.length;
 
     // Gather counts for other typical elements embedded within.
     // Traverse backwards so we can remove nodes at the same time
     // without effecting the traversal.
     //
     // TODO: Consider taking into account original contentScore here.
-    for (let i = curTagsLength-1; i >= 0; i -= 1) {
-      let weight = this._getClassWeight(tagsList[i]);
-      let contentScore = 0;
+    for (var i = curTagsLength-1; i >= 0; i -= 1) {
+      var weight = this._getClassWeight(tagsList[i]);
+      var contentScore = 0;
 
       this.log("Cleaning Conditionally " + tagsList[i] + " (" + tagsList[i].className + ":" + tagsList[i].id + ")");
 
@@ -1420,21 +1409,21 @@
         // If there are not very many commas, and the number of
         // non-paragraph elements is more than paragraphs or other
         // ominous signs, remove the element.
-        let p = tagsList[i].getElementsByTagName("p").length;
-        let img = tagsList[i].getElementsByTagName("img").length;
-        let li = tagsList[i].getElementsByTagName("li").length-100;
-        let input = tagsList[i].getElementsByTagName("input").length;
-
-        let embedCount = 0;
-        let embeds = tagsList[i].getElementsByTagName("embed");
-        for (let ei = 0, il = embeds.length; ei < il; ei += 1) {
+        var p = tagsList[i].getElementsByTagName("p").length;
+        var img = tagsList[i].getElementsByTagName("img").length;
+        var li = tagsList[i].getElementsByTagName("li").length-100;
+        var input = tagsList[i].getElementsByTagName("input").length;
+
+        var embedCount = 0;
+        var embeds = tagsList[i].getElementsByTagName("embed");
+        for (var ei = 0, il = embeds.length; ei < il; ei += 1) {
           if (embeds[ei].src.search(this.REGEXPS.videos) === -1)
             embedCount += 1;
         }
 
-        let linkDensity = this._getLinkDensity(tagsList[i]);
-        let contentLength = this._getInnerText(tagsList[i]).length;
-        let toRemove = false;
+        var linkDensity = this._getLinkDensity(tagsList[i]);
+        var contentLength = this._getInnerText(tagsList[i]).length;
+        var toRemove = false;
 
         if (img > p) {
           toRemove = true;
@@ -1465,9 +1454,9 @@
    * @return void
   **/
   _cleanHeaders: function(e) {
-    for (let headerIndex = 1; headerIndex < 3; headerIndex += 1) {
-      let headers = e.getElementsByTagName('h' + headerIndex);
-      for (let i = headers.length - 1; i >= 0; i -= 1) {
+    for (var headerIndex = 1; headerIndex < 3; headerIndex += 1) {
+      var headers = e.getElementsByTagName('h' + headerIndex);
+      for (var i = headers.length - 1; i >= 0; i -= 1) {
         if (this._getClassWeight(headers[i]) < 0 || this._getLinkDensity(headers[i]) > 0.33)
           headers[i].parentNode.removeChild(headers[i]);
       }
@@ -1510,12 +1499,12 @@
     // this._parsedPages[uri.spec.replace(/\/$/, '')] = true;
 
     // Pull out any possible next page link first.
-    // let nextPageLink = this._findNextPageLink(doc.body);
+    // var nextPageLink = this._findNextPageLink(doc.body);
 
     this._prepDocument();
 
-    let articleTitle = this._getArticleTitle();
-    let articleContent = this._grabArticle();
+    var articleTitle = this._getArticleTitle();
+    var articleContent = this._grabArticle();
     if (!articleContent)
       return null;
 
@@ -1529,9 +1518,10 @@
     //   }).bind(this), 500);
     // }
 
-    let excerpt = this._getExcerpt(articleContent);
+    var excerpt = this._getExcerpt(articleContent);
 
-    return { title: articleTitle,
+    return { uri: this._uri,
+             title: articleTitle,
              byline: this._articleByline,
              dir: this._articleDir,
              content: articleContent.innerHTML,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/social/SocialService.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/social/SocialService.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/social/SocialService.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/social/SocialService.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -160,9 +160,9 @@
 
   let directories = Services.prefs.getCharPref("social.directories").split(',');
   if (directories.indexOf(origin) >= 0)
-    return 'directory';
+    return "directory";
 
-  return 'foreign';
+  return "foreign";
 }
 
 let ActiveProviders = {
@@ -549,9 +549,13 @@
     let brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
     let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
-    // internal activation does not have a host, use the manifest origin in that case
-    let requestingURI =  Services.io.newURI(data.installType == "internal" ?
-                                            data.manifest.origin : data.url, null, null);
+    // internal/directory activations need to use the manifest origin, any other
+    // use the domain activation is occurring on
+    let url = data.url;
+    if (data.installType == "internal" || data.installType == "directory") {
+      url = data.manifest.origin;
+    }
+    let requestingURI =  Services.io.newURI(url, null, null);
     let productName = brandBundle.GetStringFromName("brandShortName");
 
     let message = browserBundle.formatStringFromName("service.install.description",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/common-ping.rst thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/common-ping.rst
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/common-ping.rst	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/common-ping.rst	2015-02-28 15:03:07.000000000 +0000
@@ -17,10 +17,10 @@
 Structure::
 
     {
-      type: <string>, // "main", "activation", "deletion", ...
+      type: <string>, // "main", "activation", "deletion", "saved-session", ...
       id: <UUID>, // a UUID that identifies this ping
       creationDate: <ISO date>, // the date the ping was generated
-      version: <number>, // the version of the ping format, currently 2
+      version: <number>, // the version of the ping format, currently 4
 
       application: {
         architecture: <string>, // build architecture, e.g. x86
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/environment.rst thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/environment.rst
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/environment.rst	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/environment.rst	2015-02-28 15:03:07.000000000 +0000
@@ -14,6 +14,7 @@
     {
       build: {
         applicationId: <string>, // nsIXULAppInfo.ID
+        applicationName: <string>, // "Firefox"
         architecture: <string>, // e.g. "x86", build architecture for the active build
         architecturesInBinary: <string>, // e.g. "i386-x86_64", from nsIMacUtils.architecturesInBinary, only present for mac universal builds
         buildId: <string>, // e.g. "20141126041045"
@@ -24,22 +25,22 @@
         hotfixVersion: <string>, // e.g. "20141211.01"
       },
       settings: {
-        blocklistEnabled: <bool>, // false on failure
-        isDefaultBrowser: <bool>, // null on failure
+        blocklistEnabled: <bool>, // true on failure
+        isDefaultBrowser: <bool>, // null on failure, not available on Android
         e10sEnabled: <bool>, // false on failure
         telemetryEnabled: <bool>, // false on failure
         locale: <string>, // e.g. "it", null on failure
         update: {
           channel: <string>, // e.g. "release", null on failure
-          enabled: <bool>, // false on failure
-          autoDownload: <bool>, // false on failure
+          enabled: <bool>, // true on failure
+          autoDownload: <bool>, // true on failure
         },
         userPrefs: {
           // Two possible behaviours: values of the whitelisted prefs, or for some prefs we
           // only record they are present with value being set to null.
         },
       },
-      profile: {
+      profile: { // This section is not available on Android.
         creationDate: <integer>, // integer days since UNIX epoch, e.g. 16446
         resetDate: <integer>, // integer days since UNIX epoch, e.g. 16446 - optional
       },
@@ -86,16 +87,16 @@
         },
         hdd: {
           profile: { // hdd where the profile folder is located
-              model: <string>, // null on failure
-              revision: <string>, // null on failure
+              model: <string>, // windows only or null on failure
+              revision: <string>, // windows only or null on failure
           },
           binary:  { // hdd where the application binary is located
-              model: <string>, // null on failure
-              revision: <string>, // null on failure
+              model: <string>, // windows only or null on failure
+              revision: <string>, // windows only or null on failure
           },
           system:  { // hdd where the system files are located
-              model: <string>, // null on failure
-              revision: <string>, // null on failure
+              model: <string>, // windows only or null on failure
+              revision: <string>, // windows only or null on failure
           },
         },
         gfx: {
@@ -122,7 +123,7 @@
         activeAddons: { // the currently enabled addons
           <addon id>: {
             blocklisted: <bool>,
-            description: <string>,
+            description: <string>, // null if not available
             name: <string>,
             userDisabled: <bool>,
             appDisabled: <bool>,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/main-ping.rst thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/main-ping.rst
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/main-ping.rst	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/main-ping.rst	2015-02-28 15:03:07.000000000 +0000
@@ -23,7 +23,7 @@
         reason: <string>, // what triggered this ping: "saved-session", "environment-change", "shutdown", ...
         revision: <string>, // the Histograms.json revision
         timezoneOffset: <number>, // time-zone offset from UTC, in minutes, for the current locale
-        previousBuildId: <string>,
+        previousBuildId: <string>, // null if this is the first run, or the previous build ID is unknown
 
         sessionId: <uuid>,  // random session id, shared by subsessions
         subsessionId: <uuid>,  // random subsession id
@@ -34,7 +34,7 @@
         profileSubsessionCounter: <number>, // the running no. of all subsessions for the whole profile life time
 
         sessionStartDate: <ISO date>, // daily precision
-        subsessionStartDate: <ISO date>, // daily precision
+        subsessionStartDate: <ISO date>, // daily precision, ISO date in local time
         subsessionLength: <number>, // the subsession length in seconds
       },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/pings.rst thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/pings.rst
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/docs/pings.rst	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/docs/pings.rst	2015-02-28 15:03:07.000000000 +0000
@@ -23,6 +23,7 @@
 ==========
 
 * :doc:`main <main-ping>` - contains the information collected by Telemetry (Histograms, hang stacks, ...)
+* :doc:`saved-session <main-ping>` - contains the *"classic"* Telemetry payload with measurements covering the whole browser session. Used to make storage of saved-session easier server-side.
 * ``activation`` - *planned* - sent right after installation or profile creation
 * ``upgrade`` - *planned* - sent right after an upgrade
 * ``deletion`` - *planned* - on opt-out we may have to tell the server to delete user data
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/Histograms.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/Histograms.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/Histograms.json	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/Histograms.json	2015-02-28 15:03:07.000000000 +0000
@@ -210,6 +210,12 @@
     "n_buckets": 50,
     "description": "Time spent on one asynchronous SnowWhite freeing (ms)"
   },
+  "DEVICE_RESET_REASON": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values": 10,
+    "description": "GPU Device Reset Reason (ok, hung, removed, reset, internal error, invalid call)"
+  },
   "FORGET_SKIPPABLE_MAX": {
     "expires_in_version": "never",
     "kind": "exponential",
@@ -4532,15 +4538,6 @@
     "description": "The way the GeckoApp was launched. (Normal, URL, Prefetch, Redirector)",
     "cpp_guard": "ANDROID"
   },
-  "FENNEC_STARTUP_TIME_ABOUTHOME": {
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "low": 100,
-    "high": "10000",
-    "n_buckets": 20,
-    "description": "Time for the about:home page to be displayed (ms)",
-    "cpp_guard": "ANDROID"
-  },
   "FENNEC_STARTUP_TIME_GECKOREADY": {
     "expires_in_version": "never",
     "kind": "exponential",
@@ -6592,6 +6589,61 @@
     "n_values": "7",
     "description": "Final status of the CacheFileInputStream (0=ok, 1=other error, 2=out of memory, 3=disk full, 4=file corrupted, 5=file not found, 6=binding aborted)"
   },
+  "NETWORK_CACHE_FS_TYPE": {
+    "expires_in_version": "42",
+    "kind": "enumerated",
+    "n_values": "5",
+    "description": "Type of FS that the cache is stored on (0=NTFS (Win), 1=FAT32 (Win), 2=FAT (Win), 3=other FS (Win), 4=other OS)"
+  },
+  "NETWORK_CACHE_SIZE_FULL_FAT": {
+    "expires_in_version": "42",
+    "kind": "linear",
+    "high": "500",
+    "n_buckets": 50,
+    "description": "Size (in MB) of a cache that reached a file count limit"
+  },
+  "NETWORK_CACHE_HIT_MISS_STAT_PER_CACHE_SIZE": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values": 40,
+    "description": "Hit/Miss count split by cache size in file count (0=Hit 0-5000, 1=Miss 0-5000, 2=Hit 5001-10000, ...)"
+  },
+  "NETWORK_CACHE_HIT_RATE_PER_CACHE_SIZE": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values": 400,
+    "description": "Hit rate for a specific cache size in file count. The hit rate is split into 20 buckets, the lower limit of the range in percents is 5*n/20. The cache size is divided into 20 ranges of length 5000, the lower limit of the range is 5000*(n%20)"
+  },
+  "NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": 50,
+    "extended_statistics_ok": true,
+    "description": "Time spent to read the first part of the metadata from the cache entry file."
+  },
+  "NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS": {
+    "expires_in_version": "never",
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": 50,
+    "extended_statistics_ok": true,
+    "description": "Time spent to read the missing part of the metadata from the cache entry file."
+  },
+  "NETWORK_CACHE_METADATA_FIRST_READ_SIZE": {
+    "expires_in_version": "never",
+    "kind": "linear",
+    "high": "5119",
+    "n_buckets": 256,
+    "description": "Guessed size of the metadata that we read from the cache file as the first part."
+  },
+  "NETWORK_CACHE_METADATA_SIZE": {
+    "expires_in_version": "never",
+    "kind": "linear",
+    "high": "5119",
+    "n_buckets": 256,
+    "description": "Actual size of the metadata parsed from the disk."
+  },
   "DATABASE_LOCKED_EXCEPTION": {
     "expires_in_version": "42",
     "kind": "enumerated",
@@ -6888,6 +6940,12 @@
     "n_values": 512,
     "description": "Certificate pinning test results by host for Mozilla operational sites"
   },
+  "CERT_CHAIN_KEY_SIZE_STATUS": {
+    "expires_in_version": "default",
+    "kind": "enumerated",
+    "n_values": 4,
+    "description": "Does enforcing a larger minimum RSA key size cause verification failures? 1 = no, 2 = yes, 3 = another error prevented finding a verified chain"
+  },
   "WEAVE_CONFIGURED": {
     "expires_in_version": "default",
     "kind": "boolean",
@@ -7256,6 +7314,12 @@
     "n_buckets": 16,
     "description": "The number of entries in persistent DataStorage (HSTS and HPKP data, basically)"
   },
+  "VIDEO_MSE_UNLOAD_STATE": {
+    "expires_in_version": "45",
+    "kind": "enumerated",
+    "n_values": 5,
+    "description": "MSE video state when unloading. ended = 0, paused = 1, stalled = 2, seeking = 3, other = 4"
+  },
   "FX_SANITIZE_TOTAL": {
     "alert_emails": ["firefox-dev@mozilla.org", "gavin@mozilla.com"],
     "expires_in_version": "40",
@@ -7363,6 +7427,18 @@
     "extended_statistics_ok": true,
     "description": "The number of sites for which the user has explicitly rejected saving logins"
   },
+  "PWMGR_FORM_ACTION_EFFECT": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values" : 5,
+    "description": "The effect of the form action on signon autofill. (0=No effect, 1=Fewer logins after considering the form action, 2=No logins match form origin and action."
+  },
+  "PWMGR_FORM_AUTOFILL_RESULT": {
+    "expires_in_version": "never",
+    "kind": "enumerated",
+    "n_values" : 20,
+    "description": "The result of auto-filling a login form. See http://mzl.la/1Mbs6jL for bucket descriptions."
+  },
   "PWMGR_NUM_PASSWORDS_PER_HOSTNAME": {
     "expires_in_version": "never",
     "kind": "linear",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/Makefile.in	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/Makefile.in	2015-02-28 15:03:07.000000000 +0000
@@ -42,3 +42,14 @@
 	$(PYTHON) $(srcdir)/gen-histogram-data.py $< > $@
 
 GARBAGE += $(histogram_enum_file)
+
+# This is so hacky. Waiting on bug 988938.
+addondir = $(srcdir)/tests/addons
+testdir = $(abspath $(DEPTH)/_tests/xpcshell/toolkit/components/telemetry/tests/unit)
+
+misc:: $(call mkdir_deps,$(testdir))
+	$(EXIT_ON_ERROR) \
+	for dir in $(addondir)/*; do \
+	  base=`basename $$dir`; \
+	  (cd $$dir && zip -qr $(testdir)/$$base.xpi *); \
+	done
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/moz.build	2015-02-28 15:03:07.000000000 +0000
@@ -4,6 +4,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/.
 
+HAS_MISC_RULE = True
+
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
@@ -36,6 +38,7 @@
 ]
 
 EXTRA_PP_JS_MODULES += [
+    'TelemetryEnvironment.jsm',
     'TelemetryPing.jsm',
     'TelemetrySession.jsm',
 ]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/nsITelemetry.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/nsITelemetry.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/nsITelemetry.idl	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/nsITelemetry.idl	2015-02-28 15:03:07.000000000 +0000
@@ -12,7 +12,7 @@
   void complete();
 };
 
-[scriptable, uuid(c782cf96-7f44-45ac-8d76-e0d1b174e562)]
+[scriptable, uuid(1cd31579-2a81-4b99-900b-e89eea2e461c)]
 interface nsITelemetry : nsISupports
 {
   /**
@@ -39,7 +39,7 @@
   const unsigned long DATASET_RELEASE_CHANNEL_OPTIN = 1;
 
 
-  /*
+  /**
    * An object containing a snapshot from all of the currently registered histograms.
    * { name1: {data1}, name2:{data2}...}
    * where data is consists of the following properties:
@@ -56,6 +56,14 @@
   readonly attribute jsval histogramSnapshots;
 
   /**
+   * Get a snapshot of the internally duplicated subsession histograms.
+   * @param clear Whether to clear out the subsession histograms after snapshotting.
+   * @return An object as histogramSnapshots, except this contains the internally duplicated histograms for subsession telemetry.
+   */
+  [implicit_jscontext]
+  jsval snapshotSubsessionHistograms([optional] in boolean clear);
+
+  /**
    * The amount of time, in milliseconds, that the last session took
    * to shutdown.  Reads as 0 to indicate failure.
    */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/Telemetry.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/Telemetry.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/Telemetry.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/Telemetry.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -73,11 +73,20 @@
 
 namespace {
 
-using namespace base;
 using namespace mozilla;
 using namespace mozilla::HangMonitor;
 
+using base::BooleanHistogram;
+using base::CountHistogram;
+using base::FlagHistogram;
+using base::Histogram;
+using base::LinearHistogram;
+using base::StatisticsRecorder;
+
 const char KEYED_HISTOGRAM_NAME_SEPARATOR[] = "#";
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+const char SUBSESSION_HISTOGRAM_PREFIX[] = "sub#";
+#endif
 
 enum reflectStatus {
   REFLECT_OK,
@@ -693,6 +702,10 @@
   nsresult GetHistogramByName(const nsACString &name, Histogram **ret);
   bool ShouldReflectHistogram(Histogram *h);
   void IdentifyCorruptHistograms(StatisticsRecorder::Histograms &hs);
+  nsresult CreateHistogramSnapshots(JSContext *cx,
+                                    JS::MutableHandle<JS::Value> ret,
+                                    bool subsession,
+                                    bool clearSubsession);
   typedef StatisticsRecorder::Histograms::iterator HistogramIterator;
 
   struct AddonHistogramInfo {
@@ -768,18 +781,24 @@
   KeyedHistogram(const nsACString &name, const nsACString &expiration,
                  uint32_t histogramType, uint32_t min, uint32_t max,
                  uint32_t bucketCount);
-  nsresult GetHistogram(const nsCString& name, Histogram** histogram);
-  Histogram* GetHistogram(const nsCString& name);
+  nsresult GetHistogram(const nsCString& name, Histogram** histogram, bool subsession);
+  Histogram* GetHistogram(const nsCString& name, bool subsession);
   uint32_t GetHistogramType() const { return mHistogramType; }
   nsresult GetDataset(uint32_t* dataset) const;
   nsresult GetJSKeys(JSContext* cx, JS::CallArgs& args);
-  nsresult GetJSSnapshot(JSContext* cx, JS::Handle<JSObject*> obj);
-  void Clear();
+  nsresult GetJSSnapshot(JSContext* cx, JS::Handle<JSObject*> obj,
+                         bool subsession, bool clearSubsession);
+
+  nsresult Add(const nsCString& key, uint32_t aSample);
+  void Clear(bool subsession);
 
 private:
   typedef nsBaseHashtableET<nsCStringHashKey, Histogram*> KeyedHistogramEntry;
   typedef AutoHashtable<KeyedHistogramEntry> KeyedHistogramMapType;
   KeyedHistogramMapType mHistogramMap;
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  KeyedHistogramMapType mSubsessionMap;
+#endif
 
   struct ReflectKeysArgs {
     JSContext* jsContext;
@@ -985,6 +1004,93 @@
   return NS_OK;
 }
 
+/**
+ * This clones a histogram |existing| with the id |existingId| to a
+ * new histogram with the name |newName|.
+ * For simplicity this is limited to registered histograms.
+ */
+Histogram*
+CloneHistogram(const nsACString& newName, Telemetry::ID existingId,
+               Histogram& existing)
+{
+  const TelemetryHistogram &info = gHistograms[existingId];
+  Histogram *clone = nullptr;
+  nsresult rv;
+
+  rv = HistogramGet(PromiseFlatCString(newName).get(), info.expiration(),
+                    info.histogramType, existing.declared_min(),
+                    existing.declared_max(), existing.bucket_count(),
+                    true, &clone);
+  if (NS_FAILED(rv)) {
+    return nullptr;
+  }
+
+  Histogram::SampleSet ss;
+  existing.SnapshotSample(&ss);
+  clone->AddSampleSet(ss);
+
+  return clone;
+}
+
+/**
+ * This clones a histogram with the id |existingId| to a new histogram
+ * with the name |newName|.
+ * For simplicity this is limited to registered histograms.
+ */
+Histogram*
+CloneHistogram(const nsACString& newName, Telemetry::ID existingId)
+{
+  Histogram *existing = nullptr;
+  nsresult rv = GetHistogramByEnumId(existingId, &existing);
+  if (NS_FAILED(rv)) {
+    return nullptr;
+  }
+
+  return CloneHistogram(newName, existingId, *existing);
+}
+
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+Histogram*
+GetSubsessionHistogram(Histogram& existing)
+{
+  Telemetry::ID id;
+  nsresult rv = TelemetryImpl::GetHistogramEnumId(existing.histogram_name().c_str(), &id);
+  if (NS_FAILED(rv) || gHistograms[id].keyed) {
+    return nullptr;
+  }
+
+  static Histogram* subsession[Telemetry::HistogramCount] = {};
+  if (subsession[id]) {
+    return subsession[id];
+  }
+
+  NS_NAMED_LITERAL_CSTRING(prefix, SUBSESSION_HISTOGRAM_PREFIX);
+  nsDependentCString existingName(gHistograms[id].id());
+  if (StringBeginsWith(existingName, prefix)) {
+    return nullptr;
+  }
+
+  nsCString subsessionName(prefix);
+  subsessionName.Append(existingName);
+
+  subsession[id] = CloneHistogram(subsessionName, id, existing);
+  return subsession[id];
+}
+#endif
+
+nsresult
+HistogramAdd(Histogram& histogram, int32_t value)
+{
+  histogram.Add(value);
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  if (Histogram* subsession = GetSubsessionHistogram(histogram)) {
+    subsession->Add(value);
+  }
+#endif
+
+  return NS_OK;
+}
+
 bool
 FillRanges(JSContext *cx, JS::Handle<JSObject*> array, Histogram *h)
 {
@@ -1083,6 +1189,7 @@
   }
 
   Histogram *h = static_cast<Histogram*>(JS_GetPrivate(obj));
+  MOZ_ASSERT(h);
   Histogram::ClassType type = h->histogram_type();
 
   int32_t value = 1;
@@ -1104,7 +1211,7 @@
   }
 
   if (TelemetryImpl::CanRecord()) {
-    h->Add(value);
+    HistogramAdd(*h, value);
   }
 
   return true;
@@ -1146,8 +1253,32 @@
     return false;
   }
 
+  bool onlySubsession = false;
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+
+  if (args.length() >= 1) {
+    if (!args[0].isBoolean()) {
+      JS_ReportError(cx, "Not a boolean");
+      return false;
+    }
+
+    onlySubsession = JS::ToBoolean(args[0]);
+  }
+#endif
+
   Histogram *h = static_cast<Histogram*>(JS_GetPrivate(obj));
-  h->Clear();
+  MOZ_ASSERT(h);
+  if(!onlySubsession) {
+    h->Clear();
+  }
+
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  if (Histogram* subsession = GetSubsessionHistogram(*h)) {
+    subsession->Clear();
+  }
+#endif
+
   return true;
 }
 
@@ -1237,17 +1368,7 @@
     }
   }
 
-  Histogram* h = nullptr;
-  nsresult rv = keyed->GetHistogram(NS_ConvertUTF16toUTF8(key), &h);
-  if (NS_FAILED(rv)) {
-    JS_ReportError(cx, "Failed to get histogram");
-    return false;
-  }
-
-  if (TelemetryImpl::CanRecord()) {
-    h->Add(value);
-  }
-
+  keyed->Add(NS_ConvertUTF16toUTF8(key), value);
   return true;
 }
 
@@ -1269,7 +1390,8 @@
 }
 
 bool
-JSKeyedHistogram_Snapshot(JSContext *cx, unsigned argc, JS::Value *vp)
+KeyedHistogram_SnapshotImpl(JSContext *cx, unsigned argc, JS::Value *vp,
+                            bool subsession, bool clearSubsession)
 {
   JSObject *obj = JS_THIS_OBJECT(cx, vp);
   if (!obj) {
@@ -1290,7 +1412,7 @@
       return false;
     }
 
-    if (!NS_SUCCEEDED(keyed->GetJSSnapshot(cx, snapshot))) {
+    if (!NS_SUCCEEDED(keyed->GetJSSnapshot(cx, snapshot, subsession, clearSubsession))) {
       JS_ReportError(cx, "Failed to reflect keyed histograms");
       return false;
     }
@@ -1306,7 +1428,7 @@
   }
 
   Histogram* h = nullptr;
-  nsresult rv = keyed->GetHistogram(NS_ConvertUTF16toUTF8(key), &h);
+  nsresult rv = keyed->GetHistogram(NS_ConvertUTF16toUTF8(key), &h, subsession);
   if (NS_FAILED(rv)) {
     JS_ReportError(cx, "Failed to get histogram");
     return false;
@@ -1332,6 +1454,33 @@
 }
 
 bool
+JSKeyedHistogram_Snapshot(JSContext *cx, unsigned argc, JS::Value *vp)
+{
+  return KeyedHistogram_SnapshotImpl(cx, argc, vp, false, false);
+}
+
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+bool
+JSKeyedHistogram_SubsessionSnapshot(JSContext *cx, unsigned argc, JS::Value *vp)
+{
+  return KeyedHistogram_SnapshotImpl(cx, argc, vp, true, false);
+}
+#endif
+
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+bool
+JSKeyedHistogram_SnapshotSubsessionAndClear(JSContext *cx, unsigned argc, JS::Value *vp)
+{
+  JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+  if (args.length() != 0) {
+    JS_ReportError(cx, "No key arguments supported for snapshotSubsessionAndClear");
+  }
+
+  return KeyedHistogram_SnapshotImpl(cx, argc, vp, true, true);
+}
+#endif
+
+bool
 JSKeyedHistogram_Clear(JSContext *cx, unsigned argc, JS::Value *vp)
 {
   JSObject *obj = JS_THIS_OBJECT(cx, vp);
@@ -1344,7 +1493,23 @@
     return false;
   }
 
-  keyed->Clear();
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  bool onlySubsession = false;
+  JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+
+  if (args.length() >= 1) {
+    if (!(args[0].isNumber() || args[0].isBoolean())) {
+      JS_ReportError(cx, "Not a boolean");
+      return false;
+    }
+
+    onlySubsession = JS::ToBoolean(args[0]);
+  }
+
+  keyed->Clear(onlySubsession);
+#else
+  keyed->Clear(false);
+#endif
   return true;
 }
 
@@ -1385,6 +1550,10 @@
     return NS_ERROR_FAILURE;
   if (!(JS_DefineFunction(cx, obj, "add", JSKeyedHistogram_Add, 2, 0)
         && JS_DefineFunction(cx, obj, "snapshot", JSKeyedHistogram_Snapshot, 1, 0)
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+        && JS_DefineFunction(cx, obj, "subsessionSnapshot", JSKeyedHistogram_SubsessionSnapshot, 1, 0)
+        && JS_DefineFunction(cx, obj, "snapshotSubsessionAndClear", JSKeyedHistogram_SnapshotSubsessionAndClear, 0, 0)
+#endif
         && JS_DefineFunction(cx, obj, "keys", JSKeyedHistogram_Keys, 0, 0)
         && JS_DefineFunction(cx, obj, "clear", JSKeyedHistogram_Clear, 0, 0)
         && JS_DefineFunction(cx, obj, "dataset", JSKeyedHistogram_Dataset, 0, 0))) {
@@ -1661,6 +1830,18 @@
   mTrackedDBs.MarkImmutable();
 #endif
 
+  // Populate the static histogram name->id cache.
+  // Note that the histogram names are statically allocated.
+  for (uint32_t i = 0; i < Telemetry::HistogramCount; i++) {
+    CharPtrEntryType *entry = mHistogramMap.PutEntry(gHistograms[i].id());
+    entry->mData = (Telemetry::ID) i;
+  }
+
+#ifdef DEBUG
+  mHistogramMap.MarkImmutable();
+#endif
+
+  // Create registered keyed histograms
   for (size_t i = 0; i < ArrayLength(gHistograms); ++i) {
     const TelemetryHistogram& h = gHistograms[i];
     if (!h.keyed) {
@@ -1790,21 +1971,8 @@
     return NS_ERROR_FAILURE;
   }
 
-  // Cache names
-  // Note the histogram names are statically allocated
-  TelemetryImpl::HistogramMapType *map = &sTelemetry->mHistogramMap;
-  if (!map->Count()) {
-    for (uint32_t i = 0; i < Telemetry::HistogramCount; i++) {
-      CharPtrEntryType *entry = map->PutEntry(gHistograms[i].id());
-      if (MOZ_UNLIKELY(!entry)) {
-        map->Clear();
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-      entry->mData = (Telemetry::ID) i;
-    }
-  }
-
-  CharPtrEntryType *entry = map->GetEntry(name);
+  const TelemetryImpl::HistogramMapType& map = sTelemetry->mHistogramMap;
+  CharPtrEntryType *entry = map.GetEntry(name);
   if (!entry) {
     return NS_ERROR_INVALID_ARG;
   }
@@ -1837,25 +2005,12 @@
   if (NS_FAILED(rv)) {
     return rv;
   }
-  const TelemetryHistogram &p = gHistograms[id];
 
-  Histogram *existing;
-  rv = GetHistogramByEnumId(id, &existing);
-  if (NS_FAILED(rv)) {
-    return rv;
+  Histogram* clone = CloneHistogram(name, id);
+  if (!clone) {
+    return NS_ERROR_FAILURE;
   }
 
-  Histogram *clone;
-  rv = HistogramGet(PromiseFlatCString(name).get(), p.expiration(),
-                    p.histogramType, existing->declared_min(),
-                    existing->declared_max(), existing->bucket_count(),
-                    true, &clone);
-  if (NS_FAILED(rv))
-    return rv;
-
-  Histogram::SampleSet ss;
-  existing->SnapshotSample(&ss);
-  clone->AddSampleSet(ss);
   return WrapAndReturnHistogram(clone, cx, ret);
 }
 
@@ -2038,8 +2193,11 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-TelemetryImpl::GetHistogramSnapshots(JSContext *cx, JS::MutableHandle<JS::Value> ret)
+nsresult
+TelemetryImpl::CreateHistogramSnapshots(JSContext *cx,
+                                        JS::MutableHandle<JS::Value> ret,
+                                        bool subsession,
+                                        bool clearSubsession)
 {
   JS::Rooted<JSObject*> root_obj(cx, JS_NewPlainObject(cx));
   if (!root_obj)
@@ -2080,6 +2238,16 @@
       continue;
     }
 
+    Histogram* original = h;
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+    if (subsession) {
+      h = GetSubsessionHistogram(*h);
+      if (!h) {
+        continue;
+      }
+    }
+#endif
+
     hobj = JS_NewPlainObject(cx);
     if (!hobj) {
       return NS_ERROR_FAILURE;
@@ -2093,15 +2261,39 @@
     case REFLECT_FAILURE:
       return NS_ERROR_FAILURE;
     case REFLECT_OK:
-      if (!JS_DefineProperty(cx, root_obj, h->histogram_name().c_str(), hobj,
-                             JSPROP_ENUMERATE)) {
+      if (!JS_DefineProperty(cx, root_obj, original->histogram_name().c_str(),
+                             hobj, JSPROP_ENUMERATE)) {
         return NS_ERROR_FAILURE;
       }
     }
+
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+    if (subsession && clearSubsession) {
+      h->Clear();
+    }
+#endif
   }
   return NS_OK;
 }
 
+NS_IMETHODIMP
+TelemetryImpl::GetHistogramSnapshots(JSContext *cx, JS::MutableHandle<JS::Value> ret)
+{
+  return CreateHistogramSnapshots(cx, ret, false, false);
+}
+
+NS_IMETHODIMP
+TelemetryImpl::SnapshotSubsessionHistograms(bool clearSubsession,
+                                            JSContext *cx,
+                                            JS::MutableHandle<JS::Value> ret)
+{
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  return CreateHistogramSnapshots(cx, ret, true, clearSubsession);
+#else
+  return NS_OK;
+#endif
+}
+
 bool
 TelemetryImpl::CreateHistogramForAddon(const nsACString &name,
                                        AddonHistogramInfo &info)
@@ -2207,7 +2399,7 @@
     return PL_DHASH_STOP;
   }
 
-  if (!NS_SUCCEEDED(entry->GetJSSnapshot(cx, snapshot))) {
+  if (!NS_SUCCEEDED(entry->GetJSSnapshot(cx, snapshot, false, false))) {
     return PL_DHASH_STOP;
   }
 
@@ -3332,7 +3524,7 @@
   Histogram *h;
   nsresult rv = GetHistogramByEnumId(aHistogram, &h);
   if (NS_SUCCEEDED(rv))
-    h->Add(aSample);
+    HistogramAdd(*h, aSample);
 }
 
 void
@@ -3345,11 +3537,7 @@
   const TelemetryHistogram& th = gHistograms[aID];
   KeyedHistogram* keyed = TelemetryImpl::GetKeyedHistogramById(nsDependentCString(th.id()));
   MOZ_ASSERT(keyed);
-
-  Histogram* histogram = keyed->GetHistogram(aKey);
-  if (histogram) {
-    histogram->Add(aSample);
-  }
+  keyed->Add(aKey, aSample);
 }
 
 void
@@ -3367,7 +3555,7 @@
   Histogram *h;
   rv = GetHistogramByEnumId(id, &h);
   if (NS_SUCCEEDED(rv)) {
-    h->Add(sample);
+    HistogramAdd(*h, sample);
   }
 }
 
@@ -3770,6 +3958,9 @@
                                uint32_t histogramType, uint32_t min, uint32_t max,
                                uint32_t bucketCount)
   : mHistogramMap()
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  , mSubsessionMap()
+#endif
   , mName(name)
   , mExpiration(expiration)
   , mHistogramType(histogramType)
@@ -3780,15 +3971,27 @@
 }
 
 nsresult
-KeyedHistogram::GetHistogram(const nsCString& key, Histogram** histogram)
+KeyedHistogram::GetHistogram(const nsCString& key, Histogram** histogram,
+                             bool subsession)
 {
-  KeyedHistogramEntry* entry = mHistogramMap.GetEntry(key);
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  KeyedHistogramMapType& map = subsession ? mSubsessionMap : mHistogramMap;
+#else
+  KeyedHistogramMapType& map = mHistogramMap;
+#endif
+  KeyedHistogramEntry* entry = map.GetEntry(key);
   if (entry) {
     *histogram = entry->mData;
     return NS_OK;
   }
 
-  nsCString histogramName = mName;
+  nsCString histogramName;
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  if (subsession) {
+    histogramName.Append(SUBSESSION_HISTOGRAM_PREFIX);
+  }
+#endif
+  histogramName.Append(mName);
   histogramName.Append(KEYED_HISTOGRAM_NAME_SEPARATOR);
   histogramName.Append(key);
 
@@ -3804,7 +4007,7 @@
   h->SetFlags(Histogram::kExtendedStatisticsFlag);
   *histogram = h;
 
-  entry = mHistogramMap.PutEntry(key);
+  entry = map.PutEntry(key);
   if (MOZ_UNLIKELY(!entry)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -3814,10 +4017,10 @@
 }
 
 Histogram*
-KeyedHistogram::GetHistogram(const nsCString& key)
+KeyedHistogram::GetHistogram(const nsCString& key, bool subsession)
 {
   Histogram* h = nullptr;
-  if (NS_FAILED(GetHistogram(key, &h))) {
+  if (NS_FAILED(GetHistogram(key, &h, subsession))) {
     return nullptr;
   }
   return h;
@@ -3846,9 +4049,44 @@
   return PL_DHASH_NEXT;
 }
 
+nsresult
+KeyedHistogram::Add(const nsCString& key, uint32_t sample)
+{
+  if (!TelemetryImpl::CanRecord()) {
+    return NS_OK;
+  }
+
+  Histogram* histogram = GetHistogram(key, false);
+  MOZ_ASSERT(histogram);
+  if (!histogram) {
+    return NS_ERROR_FAILURE;
+  }
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  Histogram* subsession = GetHistogram(key, true);
+  MOZ_ASSERT(subsession);
+  if (!subsession) {
+    return NS_ERROR_FAILURE;
+  }
+#endif
+
+  histogram->Add(sample);
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  subsession->Add(sample);
+#endif
+  return NS_OK;
+}
+
 void
-KeyedHistogram::Clear()
+KeyedHistogram::Clear(bool onlySubsession)
 {
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  mSubsessionMap.EnumerateEntries(&KeyedHistogram::ClearHistogramEnumerator, nullptr);
+  mSubsessionMap.Clear();
+  if (onlySubsession) {
+    return;
+  }
+#endif
+
   mHistogramMap.EnumerateEntries(&KeyedHistogram::ClearHistogramEnumerator, nullptr);
   mHistogramMap.Clear();
 }
@@ -3914,11 +4152,23 @@
 }
 
 nsresult
-KeyedHistogram::GetJSSnapshot(JSContext* cx, JS::Handle<JSObject*> obj)
+KeyedHistogram::GetJSSnapshot(JSContext* cx, JS::Handle<JSObject*> obj,
+                              bool subsession, bool clearSubsession)
 {
-  if (!mHistogramMap.ReflectIntoJS(&KeyedHistogram::ReflectKeyedHistogram, cx, obj)) {
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  KeyedHistogramMapType& map = subsession ? mSubsessionMap : mHistogramMap;
+#else
+  KeyedHistogramMapType& map = mHistogramMap;
+#endif
+  if (!map.ReflectIntoJS(&KeyedHistogram::ReflectKeyedHistogram, cx, obj)) {
     return NS_ERROR_FAILURE;
   }
 
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+  if (subsession && clearSubsession) {
+    Clear(true);
+  }
+#endif
+
   return NS_OK;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetryEnvironment.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetryEnvironment.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetryEnvironment.jsm	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetryEnvironment.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,1069 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 = [
+  "TelemetryEnvironment",
+];
+
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/AddonManager.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/Log.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/PromiseUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "ctypes",
+                                  "resource://gre/modules/ctypes.jsm");
+#ifndef MOZ_WIDGET_GONK
+XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
+                                  "resource://gre/modules/LightweightThemeManager.jsm");
+#endif
+XPCOMUtils.defineLazyModuleGetter(this, "ProfileTimesAccessor",
+                                  "resource://gre/modules/services/healthreport/profile.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
+                                  "resource://gre/modules/UpdateChannel.jsm");
+
+const LOGGER_NAME = "Toolkit.Telemetry";
+
+const PREF_BLOCKLIST_ENABLED = "extensions.blocklist.enabled";
+const PREF_DISTRIBUTION_ID = "distribution.id";
+const PREF_DISTRIBUTION_VERSION = "distribution.version";
+const PREF_DISTRIBUTOR = "app.distributor";
+const PREF_DISTRIBUTOR_CHANNEL = "app.distributor.channel";
+const PREF_E10S_ENABLED = "browser.tabs.remote.autostart";
+const PREF_HOTFIX_LASTVERSION = "extensions.hotfix.lastVersion";
+const PREF_APP_PARTNER_BRANCH = "app.partner.";
+const PREF_PARTNER_ID = "mozilla.partner.id";
+const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
+const PREF_UPDATE_ENABLED = "app.update.enabled";
+const PREF_UPDATE_AUTODOWNLOAD = "app.update.auto";
+
+const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
+
+const EXPERIMENTS_CHANGED_TOPIC = "experiments-changed";
+
+/**
+ * Turn a millisecond timestamp into a day timestamp.
+ *
+ * @param aMsec a number of milliseconds since epoch.
+ * @return the number of whole days denoted by the input.
+ */
+function truncateToDays(aMsec) {
+  return Math.floor(aMsec / MILLISECONDS_PER_DAY);
+}
+
+/**
+ * Get the current browser.
+ * @return a string with the locale or null on failure.
+ */
+function getBrowserLocale() {
+  try {
+    return Cc["@mozilla.org/chrome/chrome-registry;1"].
+             getService(Ci.nsIXULChromeRegistry).
+             getSelectedLocale('global');
+  } catch (e) {
+    return null;
+  }
+}
+
+/**
+ * Get the current OS locale.
+ * @return a string with the OS locale or null on failure.
+ */
+function getSystemLocale() {
+  try {
+    return Services.locale.getLocaleComponentForUserAgent();
+  } catch (e) {
+    return null;
+  }
+}
+
+/**
+ * Asynchronously get a list of addons of the specified type from the AddonManager.
+ * @param aTypes An array containing the types of addons to request.
+ * @return Promise<Array> resolved when AddonManager has finished, returning an
+ *         array of addons.
+ */
+function promiseGetAddonsByTypes(aTypes) {
+  return new Promise((resolve) =>
+                     AddonManager.getAddonsByTypes(aTypes, (addons) => resolve(addons)));
+}
+
+/**
+ * Safely get a sysinfo property and return its value. If the property is not
+ * available, return aDefault.
+ *
+ * @param aPropertyName the property name to get.
+ * @param aDefault the value to return if aPropertyName is not available.
+ * @return The property value, if available, or aDefault.
+ */
+function getSysinfoProperty(aPropertyName, aDefault) {
+  try {
+    // |getProperty| may throw if |aPropertyName| does not exist.
+    return Services.sysinfo.getProperty(aPropertyName);
+  } catch (e) {}
+
+  return aDefault;
+}
+
+/**
+ * Safely get a gfxInfo field and return its value. If the field is not available, return
+ * aDefault.
+ *
+ * @param aPropertyName the property name to get.
+ * @param aDefault the value to return if aPropertyName is not available.
+ * @return The property value, if available, or aDefault.
+ */
+function getGfxField(aPropertyName, aDefault) {
+  let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
+
+  try {
+    // Accessing the field may throw if |aPropertyName| does not exist.
+    let gfxProp = gfxInfo[aPropertyName];
+    if (gfxProp !== "") {
+      return gfxProp;
+    }
+  } catch (e) {}
+
+  return aDefault;
+}
+
+/**
+ * Get the information about a graphic adapter.
+ *
+ * @param aSuffix A suffix to add to the properties names.
+ * @return An object containing the adapter properties.
+ */
+function getGfxAdapter(aSuffix = "") {
+  let memoryMB = getGfxField("adapterRAM" + aSuffix, null);
+  if (memoryMB) {
+    memoryMB = parseInt(memoryMB, 10);
+  }
+
+  return {
+    description: getGfxField("adapterDescription" + aSuffix, null),
+    vendorID: getGfxField("adapterVendorID" + aSuffix, null),
+    deviceID: getGfxField("adapterDeviceID" + aSuffix, null),
+    subsysID: getGfxField("adapterSubsysID" + aSuffix, null),
+    RAM: memoryMB,
+    driver: getGfxField("adapterDriver" + aSuffix, null),
+    driverVersion: getGfxField("adapterDriverVersion" + aSuffix, null),
+    driverDate: getGfxField("adapterDriverDate" + aSuffix, null),
+  };
+}
+
+#ifdef XP_WIN
+/**
+ * Gets the service pack information on Windows platforms. This was copied from
+ * nsUpdateService.js.
+ *
+ * @return An object containing the service pack major and minor versions.
+ */
+function getServicePack() {
+  const BYTE = ctypes.uint8_t;
+  const WORD = ctypes.uint16_t;
+  const DWORD = ctypes.uint32_t;
+  const WCHAR = ctypes.char16_t;
+  const BOOL = ctypes.int;
+
+  // This structure is described at:
+  // http://msdn.microsoft.com/en-us/library/ms724833%28v=vs.85%29.aspx
+  const SZCSDVERSIONLENGTH = 128;
+  const OSVERSIONINFOEXW = new ctypes.StructType('OSVERSIONINFOEXW',
+      [
+      {dwOSVersionInfoSize: DWORD},
+      {dwMajorVersion: DWORD},
+      {dwMinorVersion: DWORD},
+      {dwBuildNumber: DWORD},
+      {dwPlatformId: DWORD},
+      {szCSDVersion: ctypes.ArrayType(WCHAR, SZCSDVERSIONLENGTH)},
+      {wServicePackMajor: WORD},
+      {wServicePackMinor: WORD},
+      {wSuiteMask: WORD},
+      {wProductType: BYTE},
+      {wReserved: BYTE}
+      ]);
+
+  let kernel32 = ctypes.open("kernel32");
+  try {
+    let GetVersionEx = kernel32.declare("GetVersionExW",
+                                        ctypes.default_abi,
+                                        BOOL,
+                                        OSVERSIONINFOEXW.ptr);
+    let winVer = OSVERSIONINFOEXW();
+    winVer.dwOSVersionInfoSize = OSVERSIONINFOEXW.size;
+
+    if(0 === GetVersionEx(winVer.address())) {
+      throw("Failure in GetVersionEx (returned 0)");
+    }
+
+    return {
+      major: winVer.wServicePackMajor,
+      minor: winVer.wServicePackMinor,
+    };
+  } catch (e) {
+    return {
+      major: null,
+      minor: null,
+    };
+  } finally {
+    kernel32.close();
+  }
+}
+#endif
+
+this.TelemetryEnvironment = {
+  _shutdown: true,
+
+  // A map of (sync) listeners that will be called on environment changes.
+  _changeListeners: new Map(),
+  // Async task for collecting the environment data.
+  _collectTask: null,
+
+  // Policy to use when saving preferences. Exported for using them in tests.
+  RECORD_PREF_STATE: 1, // Don't record the preference value
+  RECORD_PREF_VALUE: 2, // We only record user-set prefs.
+  RECORD_PREF_NOTIFY_ONLY: 3, // Record nothing, just notify of changes.
+
+  // A map of watched preferences which trigger an Environment change when modified.
+  // Every entry contains a recording policy (RECORD_PREF_*).
+  _watchedPrefs: null,
+
+  // The Addons change listener, init by |_startWatchingAddons| .
+  _addonsListener: null,
+
+  // AddonManager may shut down before us, in which case we cache the addons here.
+  // It is always null if the AM didn't shut down before us.
+  // If cached, it is an object containing the addon information, suitable for use
+  // in the environment data.
+  _cachedAddons: null,
+
+  /**
+   * Initialize TelemetryEnvironment.
+   */
+  init: function () {
+    if (!this._shutdown) {
+      this._log.error("init - Already initialized");
+      return;
+    }
+
+    this._configureLog();
+    this._log.trace("init");
+    this._shutdown = false;
+    this._startWatchingPrefs();
+    this._startWatchingAddons();
+
+    AddonManager.shutdown.addBlocker("TelemetryEnvironment: caching addons",
+                                      () => this._blockAddonManagerShutdown(),
+                                      () => this._getState());
+  },
+
+  /**
+   * Shutdown TelemetryEnvironment.
+   * @return Promise<> that is resolved when shutdown is finished.
+   */
+  shutdown: Task.async(function* () {
+    if (this._shutdown) {
+      if (this._log) {
+        this._log.error("shutdown - Already shut down");
+      } else {
+        Cu.reportError("TelemetryEnvironment.shutdown - Already shut down");
+      }
+      return;
+    }
+
+    this._log.trace("shutdown");
+    this._shutdown = true;
+    this._stopWatchingPrefs();
+    this._stopWatchingAddons();
+    this._changeListeners.clear();
+    yield this._collectTask;
+
+    this._cachedAddons = null;
+  }),
+
+  _configureLog: function () {
+    if (this._log) {
+      return;
+    }
+    this._log = Log.repository.getLoggerWithMessagePrefix(
+                                 LOGGER_NAME, "TelemetryEnvironment::");
+  },
+
+  /**
+   * Register a listener for environment changes.
+   * It's fine to call this on an unitialized TelemetryEnvironment.
+   * @param name The name of the listener - good for debugging purposes.
+   * @param listener A JS callback function.
+   */
+  registerChangeListener: function (name, listener) {
+    this._configureLog();
+    this._log.trace("registerChangeListener for " + name);
+    if (this._shutdown) {
+      this._log.warn("registerChangeListener - already shutdown")
+      return;
+    }
+    this._changeListeners.set(name, listener);
+  },
+
+  /**
+   * Unregister from listening to environment changes.
+   * It's fine to call this on an unitialized TelemetryEnvironment.
+   * @param name The name of the listener to remove.
+   */
+  unregisterChangeListener: function (name) {
+    this._configureLog();
+    this._log.trace("unregisterChangeListener for " + name);
+    if (this._shutdown) {
+      this._log.warn("registerChangeListener - already shutdown")
+      return;
+    }
+    this._changeListeners.delete(name);
+  },
+
+  /**
+   * Only used in tests, set the preferences to watch.
+   * @param aPreferences A map of preferences names and their recording policy.
+   */
+  _watchPreferences: function (aPreferences) {
+    if (this._watchedPrefs) {
+      this._stopWatchingPrefs();
+    }
+
+    this._watchedPrefs = aPreferences;
+    this._startWatchingPrefs();
+  },
+
+  /**
+   * Get an object containing the values for the watched preferences. Depending on the
+   * policy, the value for a preference or whether it was changed by user is reported.
+   *
+   * @return An object containing the preferences values.
+   */
+  _getPrefData: function () {
+    if (!this._watchedPrefs) {
+      return {};
+    }
+
+    let prefData = {};
+    for (let pref in this._watchedPrefs) {
+      // Only record preferences if they are non-default and policy allows recording.
+      if (!Preferences.isSet(pref) ||
+          this._watchedPrefs[pref] == this.RECORD_PREF_NOTIFY_ONLY) {
+        continue;
+      }
+
+      // Check the policy for the preference and decide if we need to store its value
+      // or whether it changed from the default value.
+      let prefValue = undefined;
+      if (this._watchedPrefs[pref] == this.RECORD_PREF_STATE) {
+        prefValue = null;
+      } else {
+        prefValue = Preferences.get(pref, null);
+      }
+      prefData[pref] = prefValue;
+    }
+    return prefData;
+  },
+
+  /**
+   * Start watching the preferences.
+   */
+  _startWatchingPrefs: function () {
+    this._log.trace("_startWatchingPrefs - " + this._watchedPrefs);
+
+    if (!this._watchedPrefs) {
+      return;
+    }
+
+    for (let pref in this._watchedPrefs) {
+      Preferences.observe(pref, this._onPrefChanged, this);
+    }
+  },
+
+  /**
+   * Do not receive any more change notifications for the preferences.
+   */
+  _stopWatchingPrefs: function () {
+    this._log.trace("_stopWatchingPrefs");
+
+    if (!this._watchedPrefs) {
+      return;
+    }
+
+    for (let pref in this._watchedPrefs) {
+      Preferences.ignore(pref, this._onPrefChanged, this);
+    }
+
+    this._watchedPrefs = null;
+  },
+
+  _onPrefChanged: function () {
+    this._log.trace("_onPrefChanged");
+    this._onEnvironmentChange("pref-changed");
+  },
+
+  /**
+   * Get the build data in object form.
+   * @return Object containing the build data.
+   */
+  _getBuild: function () {
+    let buildData = {
+      applicationId: Services.appinfo.ID,
+      applicationName: Services.appinfo.name,
+      architecture: Services.sysinfo.get("arch"),
+      buildId: Services.appinfo.appBuildID,
+      version: Services.appinfo.version,
+      vendor: Services.appinfo.vendor,
+      platformVersion: Services.appinfo.platformVersion,
+      xpcomAbi: Services.appinfo.XPCOMABI,
+      hotfixVersion: Preferences.get(PREF_HOTFIX_LASTVERSION, null),
+    };
+
+    // Add |architecturesInBinary| only for Mac Universal builds.
+    if ("@mozilla.org/xpcom/mac-utils;1" in Cc) {
+      let macUtils = Cc["@mozilla.org/xpcom/mac-utils;1"].getService(Ci.nsIMacUtils);
+      if (macUtils && macUtils.isUniversalBinary) {
+        buildData.architecturesInBinary = macUtils.architecturesInBinary;
+      }
+    }
+
+    return buildData;
+  },
+
+  /**
+   * Determine if Firefox is the default browser.
+   * @returns null on error, true if we are the default browser, or false otherwise.
+   */
+  _isDefaultBrowser: function () {
+    if (!("@mozilla.org/browser/shell-service;1" in Cc)) {
+      this._log.error("_isDefaultBrowser - Could not obtain shell service");
+      return null;
+    }
+
+    let shellService;
+    try {
+      shellService = Cc["@mozilla.org/browser/shell-service;1"]
+                       .getService(Ci.nsIShellService);
+    } catch (ex) {
+      this._log.error("_isDefaultBrowser - Could not obtain shell service", ex);
+      return null;
+    }
+
+    if (shellService) {
+      try {
+        // This uses the same set of flags used by the pref pane.
+        return shellService.isDefaultBrowser(false, true) ? true : false;
+      } catch (ex) {
+        this._log.error("_isDefaultBrowser - Could not determine if default browser", ex);
+        return null;
+      }
+    }
+
+    return null;
+  },
+
+  /**
+   * Get the settings data in object form.
+   * @return Object containing the settings.
+   */
+  _getSettings: function () {
+    let updateChannel = null;
+    try {
+      updateChannel = UpdateChannel.get();
+    } catch (e) {}
+
+    return {
+      blocklistEnabled: Preferences.get(PREF_BLOCKLIST_ENABLED, true),
+#ifndef MOZ_WIDGET_ANDROID
+      isDefaultBrowser: this._isDefaultBrowser(),
+#endif
+      e10sEnabled: Preferences.get(PREF_E10S_ENABLED, false),
+      telemetryEnabled: Preferences.get(PREF_TELEMETRY_ENABLED, false),
+      locale: getBrowserLocale(),
+      update: {
+        channel: updateChannel,
+        enabled: Preferences.get(PREF_UPDATE_ENABLED, true),
+        autoDownload: Preferences.get(PREF_UPDATE_AUTODOWNLOAD, true),
+      },
+      userPrefs: this._getPrefData(),
+    };
+  },
+
+  /**
+   * Get the profile data in object form.
+   * @return Object containing the profile data.
+   */
+  _getProfile: Task.async(function* () {
+    let profileAccessor = new ProfileTimesAccessor(null, this._log);
+
+    let creationDate = yield profileAccessor.created;
+    let resetDate = yield profileAccessor.reset;
+
+    let profileData = {
+      creationDate: truncateToDays(creationDate),
+    };
+
+    if (resetDate) {
+      profileData.resetDate = truncateToDays(resetDate);
+    }
+    return profileData;
+  }),
+
+  /**
+   * Get the partner data in object form.
+   * @return Object containing the partner data.
+   */
+  _getPartner: function () {
+    let partnerData = {
+      distributionId: Preferences.get(PREF_DISTRIBUTION_ID, null),
+      distributionVersion: Preferences.get(PREF_DISTRIBUTION_VERSION, null),
+      partnerId: Preferences.get(PREF_PARTNER_ID, null),
+      distributor: Preferences.get(PREF_DISTRIBUTOR, null),
+      distributorChannel: Preferences.get(PREF_DISTRIBUTOR_CHANNEL, null),
+    };
+
+    // Get the PREF_APP_PARTNER_BRANCH branch and append its children to partner data.
+    let partnerBranch = Services.prefs.getBranch(PREF_APP_PARTNER_BRANCH);
+    partnerData.partnerNames = partnerBranch.getChildList("")
+
+    return partnerData;
+  },
+
+  /**
+   * Get the CPU information.
+   * @return Object containing the CPU information data.
+   */
+  _getCpuData: function () {
+    let cpuData = {
+      count: getSysinfoProperty("cpucount", null),
+      vendor: null, // TODO: bug 1128472
+      family: null, // TODO: bug 1128472
+      model: null, // TODO: bug 1128472
+      stepping: null, // TODO: bug 1128472
+    };
+
+    const CPU_EXTENSIONS = ["hasMMX", "hasSSE", "hasSSE2", "hasSSE3", "hasSSSE3",
+                            "hasSSE4A", "hasSSE4_1", "hasSSE4_2", "hasEDSP", "hasARMv6",
+                            "hasARMv7", "hasNEON"];
+
+    // Enumerate the available CPU extensions.
+    let availableExts = [];
+    for (let ext of CPU_EXTENSIONS) {
+      try {
+        Services.sysinfo.getProperty(ext);
+        // If it doesn't throw, add it to the list.
+        availableExts.push(ext);
+      } catch (e) {}
+    }
+
+    cpuData.extensions = availableExts;
+
+    return cpuData;
+  },
+
+#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+  /**
+   * Get the device information, if we are on a portable device.
+   * @return Object containing the device information data.
+   */
+  _getDeviceData: function () {
+    return {
+      model: getSysinfoProperty("device", null),
+      manufacturer: getSysinfoProperty("manufacturer", null),
+      hardware: getSysinfoProperty("hardware", null),
+      isTablet: getSysinfoProperty("tablet", null),
+    };
+  },
+#endif
+
+  /**
+   * Get the OS information.
+   * @return Object containing the OS data.
+   */
+  _getOSData: function () {
+#ifdef XP_WIN
+    // Try to get service pack information.
+    let servicePack = getServicePack();
+#endif
+
+    return {
+      name: getSysinfoProperty("name", null),
+      version: getSysinfoProperty("version", null),
+#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+      kernelVersion: getSysinfoProperty("kernel_version", null),
+#elif defined(XP_WIN)
+      servicePackMajor: servicePack.major,
+      servicePackMinor: servicePack.minor,
+#endif
+      locale: getSystemLocale(),
+    };
+  },
+
+  /**
+   * Get the HDD information.
+   * @return Object containing the HDD data.
+   */
+  _getHDDData: function () {
+    return {
+      profile: { // hdd where the profile folder is located
+        model: getSysinfoProperty("profileHDDModel", null),
+        revision: getSysinfoProperty("profileHDDRevision", null),
+      },
+      binary:  { // hdd where the application binary is located
+        model: getSysinfoProperty("binHDDModel", null),
+        revision: getSysinfoProperty("binHDDRevision", null),
+      },
+      system:  { // hdd where the system files are located
+        model: getSysinfoProperty("winHDDModel", null),
+        revision: getSysinfoProperty("winHDDRevision", null),
+      },
+    };
+  },
+
+  /**
+   * Get the GFX information.
+   * @return Object containing the GFX data.
+   */
+  _getGFXData: function () {
+    let gfxData = {
+      D2DEnabled: getGfxField("D2DEnabled", null),
+      DWriteEnabled: getGfxField("DWriteEnabled", null),
+      DWriteVersion: getGfxField("DWriteVersion", null),
+      adapters: [],
+    };
+
+    // GfxInfo does not yet expose a way to iterate through all the adapters.
+    gfxData.adapters.push(getGfxAdapter(""));
+    gfxData.adapters[0].GPUActive = true;
+
+    // If we have a second adapter add it to the gfxData.adapters section.
+    let hasGPU2 = getGfxField("adapterDeviceID2", null) !== null;
+    if (!hasGPU2) {
+      this._log.trace("_getGFXData - Only one display adapter detected.");
+      return gfxData;
+    }
+
+    this._log.trace("_getGFXData - Two display adapters detected.");
+
+    gfxData.adapters.push(getGfxAdapter("2"));
+    gfxData.adapters[1].GPUActive = getGfxField("isGPU2Active ", null);
+
+    return gfxData;
+  },
+
+  /**
+   * Get the system data in object form.
+   * @return Object containing the system data.
+   */
+  _getSystem: function () {
+    let memoryMB = getSysinfoProperty("memsize", null);
+    if (memoryMB) {
+      // Send RAM size in megabytes. Rounding because sysinfo doesn't
+      // always provide RAM in multiples of 1024.
+      memoryMB = Math.round(memoryMB / 1024 / 1024);
+    }
+
+    return {
+      memoryMB: memoryMB,
+#ifdef XP_WIN
+      isWow64: getSysinfoProperty("isWow64", null),
+#endif
+      cpu: this._getCpuData(),
+#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+      device: this._getDeviceData(),
+#endif
+      os: this._getOSData(),
+      hdd: this._getHDDData(),
+      gfx: this._getGFXData(),
+    };
+  },
+
+  /**
+   * Get the addon data in object form.
+   * @return Object containing the addon data.
+   *
+   * This should only be called from the environment collection task
+   * or _blockAddonManagerShutdown, otherwise we risk running this
+   * during addon manager shutdown.
+   */
+  _getActiveAddons: Task.async(function* () {
+
+    // Request addons, asynchronously.
+    let allAddons = yield promiseGetAddonsByTypes(["extension", "service"]);
+
+    let activeAddons = {};
+    for (let addon of allAddons) {
+      // Skip addons which are not active.
+      if (!addon.isActive) {
+        continue;
+      }
+
+      activeAddons[addon.id] = {
+        blocklisted: (addon.blocklistState !== Ci.nsIBlocklistService.STATE_NOT_BLOCKED),
+        description: addon.description,
+        name: addon.name,
+        userDisabled: addon.userDisabled,
+        appDisabled: addon.appDisabled,
+        version: addon.version,
+        scope: addon.scope,
+        type: addon.type,
+        foreignInstall: addon.foreignInstall,
+        hasBinaryComponents: addon.hasBinaryComponents,
+        installDay: truncateToDays(addon.installDate.getTime()),
+        updateDay: truncateToDays(addon.updateDate.getTime()),
+      };
+    }
+
+    return activeAddons;
+  }),
+
+  /**
+   * Get the currently active theme data in object form.
+   * @return Object containing the active theme data.
+   *
+   * This should only be called from the environment collection task
+   * or _blockAddonManagerShutdown, otherwise we risk running this
+   * during addon manager shutdown.
+   */
+  _getActiveTheme: Task.async(function* () {
+    // Request themes, asynchronously.
+    let themes = yield promiseGetAddonsByTypes(["theme"]);
+
+    let activeTheme = {};
+    // We only store information about the active theme.
+    let theme = themes.find(theme => theme.isActive);
+    if (theme) {
+      activeTheme = {
+        id: theme.id,
+        blocklisted: (theme.blocklistState !== Ci.nsIBlocklistService.STATE_NOT_BLOCKED),
+        description: theme.description,
+        name: theme.name,
+        userDisabled: theme.userDisabled,
+        appDisabled: theme.appDisabled,
+        version: theme.version,
+        scope: theme.scope,
+        foreignInstall: theme.foreignInstall,
+        hasBinaryComponents: theme.hasBinaryComponents,
+        installDay: truncateToDays(theme.installDate.getTime()),
+        updateDay: truncateToDays(theme.updateDate.getTime()),
+      };
+    }
+
+    return activeTheme;
+  }),
+
+  /**
+   * Get the plugins data in object form.
+   * @return Object containing the plugins data.
+   */
+  _getActivePlugins: function () {
+    let pluginTags =
+      Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost).getPluginTags({});
+
+    let activePlugins = [];
+    for (let tag of pluginTags) {
+      // Skip plugins which are not active.
+      if (tag.disabled) {
+        continue;
+      }
+
+      // Make sure to have a valid date.
+      let updateDate = new Date(Math.max(0, tag.lastModifiedTime));
+
+      activePlugins.push({
+        name: tag.name,
+        version: tag.version,
+        description: tag.description,
+        blocklisted: tag.blocklisted,
+        disabled: tag.disabled,
+        clicktoplay: tag.clicktoplay,
+        mimeTypes: tag.getMimeTypes({}),
+        updateDay: truncateToDays(updateDate.getTime()),
+      });
+    }
+
+    return activePlugins;
+  },
+
+  /**
+   * Get the GMPlugins data in object form.
+   * @return Object containing the GMPlugins data.
+   *
+   * This should only be called from the environment collection task
+   * or _blockAddonManagerShutdown, otherwise we risk running this
+   * during addon manager shutdown.
+   */
+  _getActiveGMPlugins: Task.async(function* () {
+    // Request plugins, asynchronously.
+    let allPlugins = yield promiseGetAddonsByTypes(["plugin"]);
+
+    let activeGMPlugins = {};
+    for (let plugin of allPlugins) {
+      // Only get GM Plugin info.
+      if (!plugin.isGMPlugin) {
+        continue;
+      }
+
+      activeGMPlugins[plugin.id] = {
+        version: plugin.version,
+        userDisabled: plugin.userDisabled,
+        applyBackgroundUpdates: plugin.applyBackgroundUpdates,
+      };
+    }
+
+    return activeGMPlugins;
+  }),
+
+  /**
+   * Get the active experiment data in object form.
+   * @return Object containing the active experiment data.
+   */
+  _getActiveExperiment: function () {
+    let experimentInfo = {};
+    try {
+      let scope = {};
+      Cu.import("resource:///modules/experiments/Experiments.jsm", scope);
+      let experiments = scope.Experiments.instance()
+      let activeExperiment = experiments.getActiveExperimentID();
+      if (activeExperiment) {
+        experimentInfo.id = activeExperiment;
+        experimentInfo.branch = experiments.getActiveExperimentBranch();
+      }
+    } catch(e) {
+      // If this is not Firefox, the import will fail.
+      return experimentInfo;
+    }
+
+    return experimentInfo;
+  },
+
+  /**
+   * Get the addon data in object form.
+   * @return Object containing the addon data.
+   *
+   * This should only be called from the environment collection task
+   * or _blockAddonManagerShutdown, otherwise we risk running this
+   * during addon manager shutdown.
+   */
+  _getAddons: Task.async(function* () {
+    // AddonManager may have shutdown already, in which case we should have cached addon data.
+    // It can't shutdown during the collection here because we have a blocker on the AMs
+    // shutdown barrier that waits for the collect task.
+    let addons = this._cachedAddons || {};
+    if (!this._cachedAddons) {
+      addons.activeAddons = yield this._getActiveAddons();
+      addons.activeTheme = yield this._getActiveTheme();
+      addons.activeGMPlugins = yield this._getActiveGMPlugins();
+    }
+
+    let personaId = null;
+#ifndef MOZ_WIDGET_GONK
+    let theme = LightweightThemeManager.currentTheme;
+    if (theme) {
+      personaId = theme.id;
+    }
+#endif
+
+    let addonData = {
+      activeAddons: addons.activeAddons,
+      theme: addons.activeTheme,
+      activePlugins: this._getActivePlugins(),
+      activeGMPlugins: addons.activeGMPlugins,
+      activeExperiment: this._getActiveExperiment(),
+      persona: personaId,
+    };
+
+    return addonData;
+  }),
+
+  /**
+   * Start watching the addons for changes.
+   */
+  _startWatchingAddons: function () {
+    // Define a listener to catch addons changes from the AddonManager. This part is
+    // tricky, as we only want to detect when the set of active addons changes without
+    // getting double notifications.
+    //
+    // We identified the following cases:
+    //
+    // * onEnabled:   Gets called when a restartless addon is enabled. Doesn't get called
+    //                if the restartless addon is installed and directly enabled.
+    // * onDisabled:  Gets called when disabling a restartless addon or can get called when
+    //                uninstalling a restartless addon from the UI (see bug 612168).
+    // * onInstalled: Gets called for all addon installs.
+    // * onUninstalling: Called the moment before addon uninstall happens.
+
+    this._addonsListener = {
+      onEnabled: addon => {
+        this._log.trace("_addonsListener - onEnabled " + addon.id);
+        this._onActiveAddonsChanged(addon)
+      },
+      onDisabled: addon => {
+        this._log.trace("_addonsListener - onDisabled " + addon.id);
+        this._onActiveAddonsChanged(addon);
+      },
+      onInstalled: addon => {
+        this._log.trace("_addonsListener - onInstalled " + addon.id +
+                        ", isActive: " + addon.isActive);
+        if (addon.isActive) {
+          this._onActiveAddonsChanged(addon);
+        }
+      },
+      onUninstalling: (addon, requiresRestart) => {
+        this._log.trace("_addonsListener - onUninstalling " + addon.id +
+                        ", isActive: " + addon.isActive +
+                        ", requiresRestart: " + requiresRestart);
+        if (!addon.isActive || requiresRestart) {
+          return;
+        }
+        this._onActiveAddonsChanged(addon);
+      },
+    };
+
+    AddonManager.addAddonListener(this._addonsListener);
+
+    // Watch for experiment changes as well.
+    Services.obs.addObserver(this, EXPERIMENTS_CHANGED_TOPIC, false);
+  },
+
+  /**
+   * Stop watching addons for changes.
+   */
+  _stopWatchingAddons: function () {
+    if (this._addonsListener) {
+      AddonManager.removeAddonListener(this._addonsListener);
+      Services.obs.removeObserver(this, EXPERIMENTS_CHANGED_TOPIC);
+    }
+    this._addonsListener = null;
+  },
+
+  /**
+   * Triggered when an addon changes its state.
+   * @param aAddon The addon which triggered the change.
+   */
+  _onActiveAddonsChanged: function (aAddon) {
+    const INTERESTING_ADDONS = [ "extension", "plugin", "service", "theme" ];
+
+    this._log.trace("_onActiveAddonsChanged - id " + aAddon.id + ", type " + aAddon.type);
+
+    if (INTERESTING_ADDONS.find(addon => addon == aAddon.type)) {
+      this._onEnvironmentChange("addons-changed");
+    }
+  },
+
+  /**
+   * Handle experiment change notifications.
+   */
+  observe: function (aSubject, aTopic, aData) {
+    this._log.trace("observe - Topic " + aTopic);
+
+    if (aTopic == EXPERIMENTS_CHANGED_TOPIC) {
+      this._onEnvironmentChange("experiment-changed");
+    }
+  },
+
+  /**
+   * Get the environment data in object form.
+   * @return Promise<Object> Resolved with the data on success, otherwise rejected.
+   */
+  getEnvironmentData: function() {
+    if (this._shutdown) {
+      this._log.error("getEnvironmentData - Already shut down");
+      return Promise.reject("Already shutdown");
+    }
+
+    this._log.trace("getEnvironmentData");
+    if (this._collectTask) {
+      return this._collectTask;
+    }
+
+    this._collectTask = this._doGetEnvironmentData();
+    let clear = () => this._collectTask = null;
+    this._collectTask.then(clear, clear);
+    return this._collectTask;
+  },
+
+  _doGetEnvironmentData: Task.async(function* () {
+    this._log.trace("getEnvironmentData");
+
+    // Define the data collection function for each section.
+    let sections = {
+      "build" : () => this._getBuild(),
+      "settings": () => this._getSettings(),
+#ifndef MOZ_WIDGET_ANDROID
+      "profile": () => this._getProfile(),
+#endif
+      "partner": () => this._getPartner(),
+      "system": () => this._getSystem(),
+      "addons": () => this._getAddons(),
+    };
+
+    let data = {};
+    // Recover from exceptions in the collection functions and populate the data
+    // object. We want to recover so that, in the worst-case, we only lose some data
+    // sections instead of all.
+    for (let s in sections) {
+      try {
+        data[s] = yield sections[s]();
+      } catch (e) {
+        this._log.error("_doGetEnvironmentData - There was an exception collecting " + s, e);
+      }
+    }
+
+    return data;
+  }),
+
+  _onEnvironmentChange: function (what) {
+    this._log.trace("_onEnvironmentChange for " + what);
+    if (this._shutdown) {
+      this._log.trace("_onEnvironmentChange - Already shut down.");
+      return;
+    }
+
+    for (let [name, listener] of this._changeListeners) {
+      try {
+        this._log.debug("_onEnvironmentChange - calling " + name);
+        listener();
+      } catch (e) {
+        this._log.warning("_onEnvironmentChange - listener " + name + " caught error", e);
+      }
+    }
+  },
+
+  /**
+   * This blocks the AddonManager shutdown barrier, it caches addons we might need later.
+   * It also lets an active collect task finish first as it may still access the AM.
+   */
+  _blockAddonManagerShutdown: Task.async(function*() {
+    this._log.trace("_blockAddonManagerShutdown");
+
+    this._stopWatchingAddons();
+
+    this._cachedAddons = {
+      activeAddons: yield this._getActiveAddons(),
+      activeTheme: yield this._getActiveTheme(),
+      activeGMPlugins: yield this._getActiveGMPlugins(),
+    };
+
+    yield this._collectTask;
+  }),
+
+  /**
+   * Get an object describing the current state of this module for AsyncShutdown diagnostics.
+   */
+  _getState: function() {
+    return {
+      shutdown: this._shutdown,
+      hasCollectTask: !!this._collectTask,
+      hasAddonsListener: !!this._addonsListener,
+      hasCachedAddons: !!this._cachedAddons,
+    };
+  },
+};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetryFile.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetryFile.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetryFile.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetryFile.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -244,13 +244,9 @@
    *
    * @return {iterator}
    */
-  popPendingPings: function*(reason) {
+  popPendingPings: function*() {
     while (pendingPings.length > 0) {
       let data = pendingPings.pop();
-      // Send persisted pings to the test URL too.
-      if (reason == "test-ping") {
-        data.reason = reason;
-      }
       yield data;
     }
   },
@@ -263,7 +259,9 @@
 
 ///// Utility functions
 function pingFilePath(ping) {
-  return OS.Path.join(TelemetryFile.pingDirectoryPath, ping.slug);
+  // 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() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetryPing.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetryPing.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetryPing.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetryPing.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -30,10 +30,14 @@
 const PREF_CACHED_CLIENTID = PREF_BRANCH + "cachedClientID"
 const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
 
+const PING_FORMAT_VERSION = 4;
+
 // Delay before intializing telemetry (ms)
 const TELEMETRY_DELAY = 60000;
 // Delay before initializing telemetry if we're testing (ms)
 const TELEMETRY_TEST_DELAY = 100;
+// The number of days to keep pings serialised on the disk in case of failures.
+const DEFAULT_RETENTION_DAYS = 14;
 
 XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
                                    "@mozilla.org/base/telemetry;1",
@@ -46,6 +50,10 @@
                                   "resource://gre/modules/TelemetryLog.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ThirdPartyCookieProbe",
                                   "resource://gre/modules/ThirdPartyCookieProbe.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryEnvironment",
+                                  "resource://gre/modules/TelemetryEnvironment.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
+                                  "resource://gre/modules/UpdateChannel.jsm");
 
 /**
  * Setup Telemetry logging. This function also gets called when loggin related
@@ -86,6 +94,14 @@
   return str.substring(1, str.length - 1);
 }
 
+/**
+ * Determine if the ping has new ping format or a legacy one.
+ */
+function isNewPingFormat(aPing) {
+  return ("id" in aPing) && ("application" in aPing) &&
+         ("version" in aPing) && (aPing.version >= 2);
+}
+
 this.EXPORTED_SYMBOLS = ["TelemetryPing"];
 
 this.TelemetryPing = Object.freeze({
@@ -131,9 +147,105 @@
 
   /**
    * Send payloads to the server.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} [aOptions] Options object.
+   * @param {Number} [aOptions.retentionDays=14] The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} [aOptions.addClientId=false] true if the ping should contain the client
+   *                  id, false otherwise.
+   * @param {Boolean} [aOptions.addEnvironment=false] true if the ping should contain the
+   *                  environment data.
+   * @returns {Promise} A promise that resolves when the ping is sent.
+   */
+  send: function(aType, aPayload, aOptions = {}) {
+    let options = aOptions;
+    options.retentionDays = aOptions.retentionDays || DEFAULT_RETENTION_DAYS;
+    options.addClientId = aOptions.addClientId || false;
+    options.addEnvironment = aOptions.addEnvironment || false;
+
+    return Impl.send(aType, aPayload, options);
+  },
+
+  /**
+   * Add the ping to the pending ping list and save all pending pings.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} [aOptions] Options object.
+   * @param {Number} [aOptions.retentionDays=14] The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} [aOptions.addClientId=false] true if the ping should contain the client
+   *                  id, false otherwise.
+   * @param {Boolean} [aOptions.addEnvironment=false] true if the ping should contain the
+   *                  environment data.
+   * @returns {Promise} A promise that resolves when the pings are saved.
+   */
+  savePendingPings: function(aType, aPayload, aOptions = {}) {
+    let options = aOptions;
+    options.retentionDays = aOptions.retentionDays || DEFAULT_RETENTION_DAYS;
+    options.addClientId = aOptions.addClientId || false;
+    options.addEnvironment = aOptions.addEnvironment || false;
+
+    return Impl.savePendingPings(aType, aPayload, options);
+  },
+
+  /**
+   * Save a ping to disk.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} [aOptions] Options object.
+   * @param {Number} [aOptions.retentionDays=14] The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} [aOptions.addClientId=false] true if the ping should contain the client
+   *                  id, false otherwise.
+   * @param {Boolean} [aOptions.addEnvironment=false] true if the ping should contain the
+   *                  environment data.
+   * @param {Boolean} [aOptions.overwrite=false] true overwrites a ping with the same name,
+   *                  if found.
+   *
+   * @returns {Promise} A promise that resolves when the ping is saved to disk.
    */
-  send: function(aReason, aPingPayload) {
-    return Impl.send(aReason, aPingPayload);
+  savePing: function(aType, aPayload, aOptions = {}) {
+    let options = aOptions;
+    options.retentionDays = aOptions.retentionDays || DEFAULT_RETENTION_DAYS;
+    options.addClientId = aOptions.addClientId || false;
+    options.addEnvironment = aOptions.addEnvironment || false;
+    options.overwrite = aOptions.overwrite || false;
+
+    return Impl.savePing(aType, aPayload, options);
+  },
+
+  /**
+   * Only used for testing. Saves a ping to disk and return the ping id once done.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} [aOptions] Options object.
+   * @param {Number} [aOptions.retentionDays=14] The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} [aOptions.addClientId=false] true if the ping should contain the client
+   *                  id, false otherwise.
+   * @param {Boolean} [aOptions.addEnvironment=false] true if the ping should contain the
+   *                  environment data.
+   * @param {Boolean} [aOptions.overwrite=false] true overwrites a ping with the same name,
+   *                  if found.
+   * @param {String} [aOptions.filePath] The path to save the ping to. Will save to default
+   *                 ping location if not provided.
+   *
+   * @returns {Promise<Integer>} A promise that resolves with the ping id when the ping is
+   *                             saved to disk.
+   */
+  testSavePingToFile: function(aType, aPayload, aOptions = {}) {
+    let options = aOptions;
+    options.retentionDays = aOptions.retentionDays || DEFAULT_RETENTION_DAYS;
+    options.addClientId = aOptions.addClientId || false;
+    options.addEnvironment = aOptions.addEnvironment || false;
+    options.overwrite = aOptions.overwrite || false;
+
+    return Impl.testSavePingToFile(aType, aPayload, options);
   },
 
   /**
@@ -144,23 +256,111 @@
    get clientID() {
     return Impl.clientID;
    },
+
+   /**
+    * The AsyncShutdown.Barrier to synchronize with TelemetryPing shutdown.
+    */
+   get shutdown() {
+    return Impl._shutdownBarrier.client;
+   },
 });
 
 let Impl = {
   _initialized: false,
+  _initStarted: false, // Whether we started setting up TelemetryPing.
   _log: null,
   _prevValues: {},
   // The previous build ID, if this is the first run with a new build.
   // Undefined if this is not the first run, or the previous build ID is unknown.
   _previousBuildID: undefined,
   _clientID: null,
+  // A task performing delayed initialization
+  _delayedInitTask: null,
+  // The deferred promise resolved when the initialization task completes.
+  _delayedInitTaskDeferred: null,
+
+  _shutdownBarrier: new AsyncShutdown.Barrier("TelemetryPing: Waiting for clients."),
+
+  /**
+   * Get the data for the "application" section of the ping.
+   */
+  _getApplicationSection: function() {
+    // Querying architecture and update channel can throw. Make sure to recover and null
+    // those fields.
+    let arch = null;
+    try {
+      arch = Services.sysinfo.get("arch");
+    } catch (e) {
+      this._log.trace("assemblePing - Unable to get system architecture.", e);
+    }
+
+    let updateChannel = null;
+    try {
+      updateChannel = UpdateChannel.get();
+    } catch (e) {
+      this._log.trace("assemblePing - Unable to get update channel.", e);
+    }
+
+    return {
+      architecture: arch,
+      buildId: Services.appinfo.appBuildID,
+      name: Services.appinfo.name,
+      version: Services.appinfo.version,
+      vendor: Services.appinfo.vendor,
+      platformVersion: Services.appinfo.platformVersion,
+      xpcomAbi: Services.appinfo.XPCOMABI,
+      channel: updateChannel,
+    };
+  },
+
+  /**
+   * Assemble a complete ping following the common ping format specification.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} aOptions Options object.
+   * @param {Boolean} aOptions.addClientId true if the ping should contain the client
+   *                  id, false otherwise.
+   * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
+   *                  environment data.
+   *
+   * @returns Promise<Object> A promise that resolves when the ping is completely assembled.
+   */
+  assemblePing: function assemblePing(aType, aPayload, aOptions = {}) {
+    this._log.trace("assemblePing - Type " + aType + ", Server " + this._server +
+                    ", aOptions " + JSON.stringify(aOptions));
+
+    // Fill the common ping fields.
+    let pingData = {
+      type: aType,
+      id: generateUUID(),
+      creationDate: (new Date()).toISOString(),
+      version: PING_FORMAT_VERSION,
+      application: this._getApplicationSection(),
+      payload: aPayload,
+    };
+
+    if (aOptions.addClientId) {
+      pingData.clientId = this._clientID;
+    }
+
+    if (aOptions.addEnvironment) {
+      return TelemetryEnvironment.getEnvironmentData().then(environment => {
+        pingData.environment = environment;
+        return pingData;
+      },
+      error => {
+        this._log.error("assemblePing - Rejection", error);
+      });
+    }
 
-  popPayloads: function popPayloads(reason, externalPayload) {
+    return Promise.resolve(pingData);
+  },
+
+  popPayloads: function popPayloads() {
+    this._log.trace("popPayloads");
     function payloadIter() {
-      if (externalPayload && reason != "overdue-flush") {
-        yield externalPayload;
-      }
-      let iterator = TelemetryFile.popPendingPings(reason);
+      let iterator = TelemetryFile.popPendingPings();
       for (let data of iterator) {
         yield data;
       }
@@ -178,29 +378,142 @@
   },
 
   /**
-   * Send data to the server. Record success/send-time in histograms
+   * Build a complete ping and send data to the server. Record success/send-time in
+   * histograms.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} aOptions Options object.
+   * @param {Number} aOptions.retentionDays The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} aOptions.addClientId true if the ping should contain the client id,
+   *                  false otherwise.
+   * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
+   *                  environment data.
+   *
+   * @returns {Promise} A promise that resolves when the ping is sent.
    */
-  send: function send(reason, aPayload) {
-    this._log.trace("send - Reason " + reason + ", Server " + this._server);
-    return this.sendPingsFromIterator(this._server, reason,
-                                      Iterator(this.popPayloads(reason, aPayload)));
+  send: function send(aType, aPayload, aOptions) {
+    this._log.trace("send - Type " + aType + ", Server " + this._server +
+                    ", aOptions " + JSON.stringify(aOptions));
+
+    return this.assemblePing(aType, aPayload, aOptions)
+        .then(pingData => {
+          // Once ping is assembled, send it along with the persisted ping in the backlog.
+          let p = [
+            // Persist the ping if sending it fails.
+            this.doPing(pingData, false)
+                .catch(() => TelemetryFile.savePing(pingData, true)),
+            this.sendPersistedPings(),
+          ];
+          return Promise.all(p);
+        },
+        error => this._log.error("send - Rejection", error));
   },
 
-  sendPingsFromIterator: function sendPingsFromIterator(server, reason, i) {
-    let p = [data for (data in i)].map((data) =>
-      this.doPing(server, data).then(null, () => TelemetryFile.savePing(data, true)));
-
+  /**
+   * Send the persisted pings to the server.
+   */
+  sendPersistedPings: function sendPersistedPings() {
+    this._log.trace("sendPersistedPings");
+    let pingsIterator = Iterator(this.popPayloads());
+    let p = [data for (data in pingsIterator)].map(data => this.doPing(data, true));
     return Promise.all(p);
   },
 
-  finishPingRequest: function finishPingRequest(success, startTime, ping) {
+  /**
+   * Saves all the pending pings, plus the passed one, to disk.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} aOptions Options object.
+   * @param {Number} aOptions.retentionDays The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} aOptions.addClientId true if the ping should contain the client id,
+   *                  false otherwise.
+   * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
+   *                  environment data.
+   *
+   * @returns {Promise} A promise that resolves when all the pings are saved to disk.
+   */
+  savePendingPings: function savePendingPings(aType, aPayload, aOptions) {
+    this._log.trace("savePendingPings - Type " + aType + ", Server " + this._server +
+                    ", aOptions " + JSON.stringify(aOptions));
+
+    return this.assemblePing(aType, aPayload, aOptions)
+        .then(pingData => TelemetryFile.savePendingPings(pingData),
+              error => this._log.error("savePendingPings - Rejection", error));
+  },
+
+  /**
+   * Save a ping to disk.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} aOptions Options object.
+   * @param {Number} aOptions.retentionDays The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} aOptions.addClientId true if the ping should contain the client id,
+   *                  false otherwise.
+   * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
+   *                  environment data.
+   * @param {Boolean} aOptions.overwrite true overwrites a ping with the same name, if found.
+   *
+   * @returns {Promise} A promise that resolves when the ping is saved to disk.
+   */
+  savePing: function savePing(aType, aPayload, aOptions) {
+    this._log.trace("savePing - Type " + aType + ", Server " + this._server +
+                    ", aOptions " + JSON.stringify(aOptions));
+
+    return this.assemblePing(aType, aPayload, aOptions)
+        .then(pingData => TelemetryFile.savePing(pingData, aOptions.overwrite),
+              error => this._log.error("savePing - Rejection", error));
+  },
+
+  /**
+   * Save a ping to disk and return the ping id when done.
+   *
+   * @param {String} aType The type of the ping.
+   * @param {Object} aPayload The actual data payload for the ping.
+   * @param {Object} aOptions Options object.
+   * @param {Number} aOptions.retentionDays The number of days to keep the ping on disk
+   *                 if sending fails.
+   * @param {Boolean} aOptions.addClientId true if the ping should contain the client id,
+   *                  false otherwise.
+   * @param {Boolean} aOptions.addEnvironment true if the ping should contain the
+   *                  environment data.
+   * @param {Boolean} aOptions.overwrite true overwrites a ping with the same name, if found.
+   * @param {String} [aOptions.filePath] The path to save the ping to. Will save to default
+   *                 ping location if not provided.
+   *
+   * @returns {Promise} A promise that resolves with the ping id when the ping is saved to
+   *                    disk.
+   */
+  testSavePingToFile: function testSavePingToFile(aType, aPayload, aOptions) {
+    this._log.trace("testSavePingToFile - Type " + aType + ", Server " + this._server +
+                    ", aOptions " + JSON.stringify(aOptions));
+    return this.assemblePing(aType, aPayload, aOptions)
+        .then(pingData => {
+            if (aOptions.filePath) {
+              return TelemetryFile.savePingToFile(pingData, aOptions.filePath, aOptions.overwrite)
+                                  .then(() => { return pingData.id; });
+            } else {
+              return TelemetryFile.savePing(pingData, aOptions.overwrite)
+                                  .then(() => { return pingData.id; });
+            }
+        }, error => this._log.error("testSavePing - Rejection", error));
+  },
+
+  finishPingRequest: function finishPingRequest(success, startTime, ping, isPersisted) {
+    this._log.trace("finishPingRequest - Success " + success + ", Persisted " + isPersisted);
+
     let hping = Telemetry.getHistogramById("TELEMETRY_PING");
     let hsuccess = Telemetry.getHistogramById("TELEMETRY_SUCCESS");
 
     hsuccess.add(success);
     hping.add(new Date() - startTime);
 
-    if (success) {
+    if (success && isPersisted) {
       return TelemetryFile.cleanupPingFile(ping);
     } else {
       return Promise.resolve();
@@ -208,23 +521,44 @@
   },
 
   submissionPath: function submissionPath(ping) {
-    let slug;
-    if (!ping) {
-      slug = this._uuid;
+    // The new ping format contains an "application" section, the old one doesn't.
+    let pathComponents;
+    if (isNewPingFormat(ping)) {
+      // We insert the Ping id in the URL to simplify server handling of duplicated
+      // pings.
+      let app = ping.application;
+      pathComponents = [
+        ping.id, ping.type, app.name, app.version, app.channel, app.buildId
+      ];
     } else {
-      let info = ping.payload.info;
-      let pathComponents = [ping.slug, info.reason, info.appName,
-                            info.appVersion, info.appUpdateChannel,
-                            info.appBuildID];
-      slug = pathComponents.join("/");
+      // 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.
+        ping.slug = generateUUID();
+      }
+
+      // Do we have enough info to build a submission URL?
+      let payload = ("payload" in ping) ? ping.payload : null;
+      if (payload && ("info" in payload)) {
+        let info = ping.payload.info;
+        pathComponents = [ ping.slug, info.reason, info.appName, info.appVersion,
+                           info.appUpdateChannel, info.appBuildID ];
+      } else {
+        // Only use the UUID as the slug.
+        pathComponents = [ ping.slug ];
+      }
     }
+
+    let slug = pathComponents.join("/");
     return "/submit/telemetry/" + slug;
   },
 
-  doPing: function doPing(server, ping) {
-    this._log.trace("doPing - Server " + server);
+  doPing: function doPing(ping, isPersisted) {
+    this._log.trace("doPing - Server " + this._server + ", Persisted " + isPersisted);
     let deferred = Promise.defer();
-    let url = server + this.submissionPath(ping);
+    let isNewPing = isNewPingFormat(ping);
+    let version = isNewPing ? PING_FORMAT_VERSION : 1;
+    let url = this._server + this.submissionPath(ping) + "?v=" + version;
     let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
                   .createInstance(Ci.nsIXMLHttpRequest);
     request.mozBackgroundRequest = true;
@@ -235,24 +569,34 @@
     let startTime = new Date();
 
     function handler(success) {
+      let handleCompletion = event => {
+        if (success) {
+          deferred.resolve();
+        } else {
+          deferred.reject(event);
+        }
+      };
+
       return function(event) {
-        this.finishPingRequest(success, startTime, ping).then(() => {
-          if (success) {
-            deferred.resolve();
-          } else {
-            deferred.reject(event);
-          }
-        });
+        this.finishPingRequest(success, startTime, ping, isPersisted)
+          .then(() => handleCompletion(event),
+                error => {
+                  this._log.error("doPing - Request Success " + success + ", Error " +
+                                  error);
+                  handleCompletion(event);
+                });
       };
     }
     request.addEventListener("error", handler(false).bind(this), false);
     request.addEventListener("load", handler(true).bind(this), false);
 
+    // If that's a legacy ping format, just send its payload.
+    let networkPayload = isNewPing ? ping : ping.payload;
     request.setRequestHeader("Content-Encoding", "gzip");
     let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
                     .createInstance(Ci.nsIScriptableUnicodeConverter);
     converter.charset = "UTF-8";
-    let utf8Payload = converter.ConvertFromUnicode(JSON.stringify(ping.payload));
+    let utf8Payload = converter.ConvertFromUnicode(JSON.stringify(networkPayload));
     utf8Payload += converter.Finish();
     let payloadStream = Cc["@mozilla.org/io/string-input-stream;1"]
                         .createInstance(Ci.nsIStringInputStream);
@@ -316,14 +660,32 @@
 
   /**
    * Initializes telemetry within a timer. If there is no PREF_SERVER set, don't turn on telemetry.
+   *
+   * This delayed initialization means TelemetryPing init can be in the following states:
+   * 1) setupTelemetry was never called
+   * or it was called and
+   *   2) _delayedInitTask was scheduled, but didn't run yet.
+   *   3) _delayedInitTask is currently running.
+   *   4) _delayedInitTask finished running and is nulled out.
    */
   setupTelemetry: function setupTelemetry(testing) {
+    this._initStarted = true;
     if (testing && !this._log) {
       this._log = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
     }
 
     this._log.trace("setupTelemetry");
 
+    if (this._delayedInitTask) {
+      this._log.error("setupTelemetry - init task already running");
+      return this._delayedInitTaskDeferred.promise;
+    }
+
+    if (this._initialized && !testing) {
+      this._log.error("setupTelemetry - already initialized");
+      return Promise.resolve();
+    }
+
     // Initialize some probes that are kept in their own modules
     this._thirdPartyCookies = new ThirdPartyCookieProbe();
     this._thirdPartyCookies.init();
@@ -342,41 +704,91 @@
     // Delay full telemetry initialization to give the browser time to
     // run various late initializers. Otherwise our gathered memory
     // footprint and other numbers would be too optimistic.
-    let deferred = Promise.defer();
-    let delayedTask = new DeferredTask(function* () {
-      this._initialized = true;
-
-      yield TelemetryFile.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 +
-                        " 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
-        // the reason is check to make sure it's not a test-ping.
-        yield this.send("overdue-flush");
+    this._delayedInitTaskDeferred = Promise.defer();
+    this._delayedInitTask = new DeferredTask(function* () {
+      try {
+        this._initialized = true;
+
+        yield TelemetryEnvironment.init();
+
+        yield TelemetryFile.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 +
+                          " 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
+          // the reason is check to make sure it's not a test-ping.
+          yield this.sendPersistedPings();
+        }
+
+        if ("@mozilla.org/datareporting/service;1" in Cc) {
+          let drs = Cc["@mozilla.org/datareporting/service;1"]
+                      .getService(Ci.nsISupports)
+                      .wrappedJSObject;
+          this._clientID = yield drs.getClientID();
+          // Update cached client id.
+          Preferences.set(PREF_CACHED_CLIENTID, this._clientID);
+        } else {
+          // Nuke potentially cached client id.
+          Preferences.reset(PREF_CACHED_CLIENTID);
+        }
+
+        Telemetry.asyncFetchTelemetryData(function () {});
+        this._delayedInitTaskDeferred.resolve();
+      } catch (e) {
+        this._delayedInitTaskDeferred.reject(e);
+      } finally {
+        this._delayedInitTask = null;
+        this._delayedInitTaskDeferred = null;
       }
+    }.bind(this), testing ? TELEMETRY_TEST_DELAY : TELEMETRY_DELAY);
 
-      if ("@mozilla.org/datareporting/service;1" in Cc) {
-        let drs = Cc["@mozilla.org/datareporting/service;1"]
-                    .getService(Ci.nsISupports)
-                    .wrappedJSObject;
-        this._clientID = yield drs.getClientID();
-        // Update cached client id.
-        Preferences.set(PREF_CACHED_CLIENTID, this._clientID);
-      } else {
-        // Nuke potentially cached client id.
-        Preferences.reset(PREF_CACHED_CLIENTID);
+    AsyncShutdown.sendTelemetry.addBlocker("TelemetryPing: shutting down",
+                                           () => this.shutdown(),
+                                           () => this._getState());
+
+    this._delayedInitTask.arm();
+    return this._delayedInitTaskDeferred.promise;
+  },
+
+  shutdown: function() {
+    this._log.trace("shutdown");
+
+    let cleanup = () => {
+      if (!this._initialized) {
+        return;
       }
+      let reset = () => {
+        this._initialized = false;
+        this._initStarted = false;
+      };
+      return this._shutdownBarrier.wait().then(
+               () => TelemetryEnvironment.shutdown().then(reset, reset));
+    };
 
-      Telemetry.asyncFetchTelemetryData(function () {});
-      deferred.resolve();
+    // We can be in one the following states here:
+    // 1) setupTelemetry was never called
+    // or it was called and
+    //   2) _delayedInitTask was scheduled, but didn't run yet.
+    //   3) _delayedInitTask is running now.
+    //   4) _delayedInitTask finished running already.
 
-    }.bind(this), testing ? TELEMETRY_TEST_DELAY : TELEMETRY_DELAY);
+    // This handles 1).
+    if (!this._initStarted) {
+      return Promise.resolve();
+    }
 
-    delayedTask.arm();
-    return deferred.promise;
+    // This handles 4).
+    if (!this._delayedInitTask) {
+      // We already ran the delayed initialization.
+      return cleanup();
+    }
+
+    // This handles 2) and 3).
+    this._delayedInitTask.disarm();
+    return this._delayedInitTask.finalize().then(cleanup);
   },
 
   /**
@@ -412,4 +824,15 @@
   get clientID() {
     return this._clientID;
   },
+
+  /**
+   * Get an object describing the current state of this module for AsyncShutdown diagnostics.
+   */
+  _getState: function() {
+    return {
+      initialized: this._initialized,
+      initStarted: this._initStarted,
+      haveDelayedInitTask: !!this._delayedInitTask,
+    };
+  },
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetrySession.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetrySession.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/TelemetrySession.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/TelemetrySession.jsm	2015-02-28 15:03:07.000000000 +0000
@@ -12,11 +12,14 @@
 
 Cu.import("resource://gre/modules/debug.js", this);
 Cu.import("resource://gre/modules/Log.jsm");
+Cu.import("resource://gre/modules/osfile.jsm", this);
 Cu.import("resource://gre/modules/Services.jsm", this);
 Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/Promise.jsm", this);
 Cu.import("resource://gre/modules/DeferredTask.jsm", this);
 Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/Timer.jsm");
 
 const IS_CONTENT_PROCESS = (function() {
   // We cannot use Services.appinfo here because in telemetry xpcshell tests,
@@ -26,7 +29,24 @@
 })();
 
 // When modifying the payload in incompatible ways, please bump this version number
-const PAYLOAD_VERSION = 1;
+const PAYLOAD_VERSION = 4;
+const PING_TYPE_MAIN = "main";
+const PING_TYPE_SAVED_SESSION = "saved-session";
+const RETENTION_DAYS = 14;
+
+const REASON_DAILY = "daily";
+const REASON_SAVED_SESSION = "saved-session";
+const REASON_IDLE_DAILY = "idle-daily";
+const REASON_GATHER_PAYLOAD = "gather-payload";
+const REASON_TEST_PING = "test-ping";
+const REASON_ENVIRONMENT_CHANGE = "environment-change";
+
+const ENVIRONMENT_CHANGE_LISTENER = "TelemetrySession::onEnvironmentChange";
+
+const SEC_IN_ONE_DAY  = 24 * 60 * 60;
+const MS_IN_ONE_DAY   = SEC_IN_ONE_DAY * 1000;
+
+const MIN_SUBSESSION_LENGTH_MS = 10 * 60 * 1000;
 
 // This is the HG changeset of the Histogram.json file, used to associate
 // submitted ping data with its histogram definition (bug 832007)
@@ -45,6 +65,8 @@
 
 const MESSAGE_TELEMETRY_PAYLOAD = "Telemetry:Payload";
 
+const SESSION_STATE_FILE_NAME = "session-state.json";
+
 // Do not gather data more than once a minute
 const TELEMETRY_INTERVAL = 60000;
 // Delay before intializing telemetry (ms)
@@ -84,10 +106,6 @@
                                   "resource://gre/modules/AddonManager.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "AsyncShutdown",
                                   "resource://gre/modules/AsyncShutdown.jsm");
-#ifndef MOZ_WIDGET_GONK
-XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
-                                  "resource://gre/modules/LightweightThemeManager.jsm");
-#endif
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryPing",
                                   "resource://gre/modules/TelemetryPing.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryFile",
@@ -100,6 +118,10 @@
                                   "resource://gre/modules/UITelemetry.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel",
                                   "resource://gre/modules/UpdateChannel.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryEnvironment",
+                                  "resource://gre/modules/TelemetryEnvironment.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "CommonUtils",
+                                  "resource://services-common/utils.js");
 
 function generateUUID() {
   let str = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator).generateUUID().toString();
@@ -108,6 +130,70 @@
 }
 
 /**
+ * This is a policy object used to override behavior for testing.
+ */
+let Policy = {
+  now: () => new Date(),
+  generateSessionUUID: () => generateUUID(),
+  generateSubsessionUUID: () => generateUUID(),
+  setDailyTimeout: (callback, delayMs) => setTimeout(callback, delayMs),
+  clearDailyTimeout: (id) => clearTimeout(id),
+};
+
+/**
+ * Takes a date and returns it trunctated to a date with daily precision.
+ */
+function truncateToDays(date) {
+  return new Date(date.getFullYear(),
+                  date.getMonth(),
+                  date.getDate(),
+                  0, 0, 0, 0);
+}
+
+/**
+ * Get the ping type based on the payload.
+ * @param {Object} aPayload The ping payload.
+ * @return {String} A string representing the ping type.
+ */
+function getPingType(aPayload) {
+  // To remain consistent with server-side ping handling, set "saved-session" as the ping
+  // type for "saved-session" payload reasons.
+  if (aPayload.info.reason == REASON_SAVED_SESSION) {
+    return PING_TYPE_SAVED_SESSION;
+  }
+
+  return PING_TYPE_MAIN;
+}
+
+/**
+ * Date.toISOString() gives us UTC times, this gives us local times in the ISO date format.
+ * http://www.w3.org/TR/NOTE-datetime
+ */
+function toLocalTimeISOString(date) {
+  function padNumber(number, places) {
+    number = number.toString();
+    while (number.length < places) {
+      number = "0" + number;
+    }
+    return number;
+  }
+
+  let sign = (n) => n >= 0 ? "+" : "-";
+  let tzOffset = date.getTimezoneOffset();
+
+  // YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
+  return    padNumber(date.getFullYear(), 4)
+    + "-" + padNumber(date.getMonth() + 1, 2)
+    + "-" + padNumber(date.getDate(), 2)
+    + "T" + padNumber(date.getHours(), 2)
+    + ":" + padNumber(date.getMinutes(), 2)
+    + ":" + padNumber(date.getSeconds(), 2);
+    + "." + date.getMilliseconds()
+    + sign(tzOffset) + Math.abs(Math.floor(tzOffset / 60))
+    + ":" + Math.abs(tzOffset % 60);
+}
+
+/**
  * Read current process I/O counters.
  */
 let processInfo = {
@@ -154,6 +240,95 @@
   }
 };
 
+/**
+ * This object allows the serialisation of asynchronous tasks. This is particularly
+ * useful to serialise write access to the disk in order to prevent race conditions
+ * to corrupt the data being written.
+ * We are using this to synchronize saving to the file that TelemetrySession persists
+ * its state in.
+ */
+let gStateSaveSerializer = {
+  _queuedOperations: [],
+  _queuedInProgress: false,
+  _log: Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX),
+
+  /**
+   * Enqueues an operation to a list to serialise their execution in order to prevent race
+   * conditions. Useful to serialise access to disk.
+   *
+   * @param {Function} aFunction The task function to enqueue. It must return a promise.
+   * @return {Promise} A promise resolved when the enqueued task completes.
+   */
+  enqueueTask: function (aFunction) {
+    let promise = new Promise((resolve, reject) =>
+      this._queuedOperations.push([aFunction, resolve, reject]));
+
+    if (this._queuedOperations.length == 1) {
+      this._popAndPerformQueuedOperation();
+    }
+    return promise;
+  },
+
+  /**
+   * Make sure to flush all the pending operations.
+   * @return {Promise} A promise resolved when all the pending operations have completed.
+   */
+  flushTasks: function () {
+    let dummyTask = () => new Promise(resolve => resolve());
+    return this.enqueueTask(dummyTask);
+  },
+
+  /**
+   * Pop a task from the queue, executes it and continue to the next one.
+   * This function recursively pops all the tasks.
+   */
+  _popAndPerformQueuedOperation: function () {
+    if (!this._queuedOperations.length || this._queuedInProgress) {
+      return;
+    }
+
+    this._log.trace("_popAndPerformQueuedOperation - Performing queued operation.");
+    let [func, resolve, reject] = this._queuedOperations.shift();
+    let promise;
+
+    try {
+      this._queuedInProgress = true;
+      promise = func();
+    } catch (ex) {
+      this._log.warn("_popAndPerformQueuedOperation - Queued operation threw during execution. ",
+                     ex);
+      this._queuedInProgress = false;
+      reject(ex);
+      this._popAndPerformQueuedOperation();
+      return;
+    }
+
+    if (!promise || typeof(promise.then) != "function") {
+      let msg = "Queued operation did not return a promise: " + func;
+      this._log.warn("_popAndPerformQueuedOperation - " + msg);
+
+      this._queuedInProgress = false;
+      reject(new Error(msg));
+      this._popAndPerformQueuedOperation();
+      return;
+    }
+
+    promise.then(result => {
+        this._log.trace("_popAndPerformQueuedOperation - Queued operation completed.");
+        this._queuedInProgress = false;
+        resolve(result);
+        this._popAndPerformQueuedOperation();
+      },
+      error => {
+        this._log.warn("_popAndPerformQueuedOperation - Failure when performing queued operation.",
+                       error);
+        this._queuedInProgress = false;
+        reject(error);
+        this._popAndPerformQueuedOperation();
+      });
+  },
+};
+
 this.EXPORTED_SYMBOLS = ["TelemetrySession"];
 
 this.TelemetrySession = Object.freeze({
@@ -170,10 +345,12 @@
   },
   /**
    * Returns the current telemetry payload.
+   * @param reason Optional, the reason to trigger the payload.
+   * @param clearSubsession Optional, whether to clear subsession specific data.
    * @returns Object
    */
-  getPayload: function() {
-    return Impl.getPayload();
+  getPayload: function(reason, clearSubsession = false) {
+    return Impl.getPayload(reason, clearSubsession);
   },
   /**
    * Save histograms to a file.
@@ -199,15 +376,6 @@
     return Impl.setAddOns(aAddOns);
   },
   /**
-   * Load histograms from a file.
-   * Used only for testing purposes.
-   *
-   * @param aFile - File to load from.
-   */
-  testLoadHistograms: function(aFile) {
-    return Impl.testLoadHistograms(aFile);
-  },
-  /**
    * Descriptive metadata
    *
    * @param  reason
@@ -222,14 +390,21 @@
    * Used only for testing purposes.
    */
   reset: function() {
+    Impl._sessionId = null;
+    Impl._subsessionId = null;
+    Impl._previousSubsessionId = null;
+    Impl._subsessionCounter = 0;
+    Impl._profileSubsessionCounter = 0;
     this.uninstall();
     return this.setup();
   },
   /**
    * Used only for testing purposes.
+   * @param {Boolean} [aForceSavePending=true] If true, always saves the ping whether Telemetry
+   *        can send pings or not, which is used for testing.
    */
-  shutdown: function() {
-    return Impl.shutdown(true);
+  shutdown: function(aForceSavePending = true) {
+    return Impl.shutdownChromeProcess(aForceSavePending);
   },
   /**
    * Used only for testing purposes.
@@ -268,25 +443,41 @@
   _initialized: false,
   _log: null,
   _prevValues: {},
-  // Generate a unique id once per session so the server can cope with
-  // duplicate submissions.
-  _uuid: generateUUID(),
   // Regex that matches histograms we care about during startup.
   // Keep this in sync with gen-histogram-bucket-ranges.py.
   _startupHistogramRegex: /SQLITE|HTTP|SPDY|CACHE|DNS/,
   _slowSQLStartup: {},
-  _prevSession: null,
   _hasWindowRestoredObserver: false,
   _hasXulWindowVisibleObserver: false,
   _startupIO : {},
   // The previous build ID, if this is the first run with a new build.
-  // Undefined if this is not the first run, or the previous build ID is unknown.
-  _previousBuildID: undefined,
+  // Null if this is the first run, or the previous build ID is unknown.
+  _previousBuildId: null,
   // Telemetry payloads sent by child processes.
   // Each element is in the format {source: <weak-ref>, payload: <object>},
   // where source is a weak reference to the child process,
   // and payload is the telemetry payload from that child process.
   _childTelemetry: [],
+  // Unique id that identifies this session so the server can cope with duplicate
+  // submissions, orphaning and other oddities. The id is shared across subsessions.
+  _sessionId: null,
+  // Random subsession id.
+  _subsessionId: null,
+  // Subsession id of the previous subsession (even if it was in a different session),
+  // null on first run.
+  _previousSubsessionId: null,
+  // The running no. of subsessions since the start of the browser session
+  _subsessionCounter: 0,
+  // The running no. of all subsessions for the whole profile life time
+  _profileSubsessionCounter: 0,
+  // Date of the last session split
+  _subsessionStartDate: null,
+  // The timer used for daily collections.
+  _dailyTimerId: null,
+  // A task performing delayed initialization of the chrome process
+  _delayedInitTask: null,
+  // The deferred promise resolved when the initialization task completes.
+  _delayedInitTaskDeferred: null,
 
   /**
    * Gets a series of simple measurements (counters). At the moment, this
@@ -458,11 +649,13 @@
     return retgram;
   },
 
-  getHistograms: function getHistograms(hls) {
-    this._log.trace("getHistograms");
+  getHistograms: function getHistograms(subsession, clearSubsession) {
+    this._log.trace("getHistograms - subsession: " + subsession + ", clearSubsession: " + clearSubsession);
 
     let registered =
       Telemetry.registeredHistograms(Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, []);
+    let hls = subsession ? Telemetry.snapshotSubsessionHistograms(clearSubsession)
+                         : Telemetry.histogramSnapshots;
     let ret = {};
 
     for (let name of registered) {
@@ -495,8 +688,8 @@
     return ret;
   },
 
-  getKeyedHistograms: function() {
-    this._log.trace("getKeyedHistograms");
+  getKeyedHistograms: function(subsession, clearSubsession) {
+    this._log.trace("getKeyedHistograms - subsession: " + subsession + ", clearSubsession: " + clearSubsession);
 
     let registered =
       Telemetry.registeredKeyedHistograms(Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, []);
@@ -505,7 +698,13 @@
     for (let id of registered) {
       ret[id] = {};
       let keyed = Telemetry.getKeyedHistogramById(id);
-      let snapshot = keyed.snapshot();
+      let snapshot = null;
+      if (subsession) {
+        snapshot = clearSubsession ? keyed.snapshotSubsessionAndClear()
+                                   : keyed.subsessionSnapshot();
+      } else {
+        snapshot = keyed.snapshot();
+      }
       for (let key of Object.keys(snapshot)) {
         ret[id][key] = this.packHistogram(snapshot[key]);
       }
@@ -537,111 +736,43 @@
   getMetadata: function getMetadata(reason) {
     this._log.trace("getMetadata - Reason " + reason);
 
-    let ai = Services.appinfo;
+    let sessionStartDate = toLocalTimeISOString(truncateToDays(this._sessionStartDate));
+    let subsessionStartDate = toLocalTimeISOString(truncateToDays(this._subsessionStartDate));
+    // Compute the subsession length in milliseconds, then convert to seconds.
+    let subsessionLength =
+      Math.floor((Policy.now() - this._subsessionStartDate.getTime()) / 1000);
+
     let ret = {
       reason: reason,
-      OS: ai.OS,
-      appID: ai.ID,
-      appVersion: ai.version,
-      appName: ai.name,
-      appBuildID: ai.appBuildID,
-      appUpdateChannel: UpdateChannel.get(),
-      platformBuildID: ai.platformBuildID,
       revision: HISTOGRAMS_FILE_VERSION,
-      locale: getLocale(),
-      asyncPluginInit: Preferences.get(PREF_ASYNC_PLUGIN_INIT, false)
-    };
+      asyncPluginInit: Preferences.get(PREF_ASYNC_PLUGIN_INIT, false),
 
-    // In order to share profile data, the appName used for Metro Firefox is "Firefox",
-    // (the same as desktop Firefox). We set it to "MetroFirefox" here in order to
-    // differentiate telemetry pings sent by desktop vs. metro Firefox.
-    if(Services.metro && Services.metro.immersive) {
-      ret.appName = "MetroFirefox";
-    }
-
-    if (this._previousBuildID) {
-      ret.previousBuildID = this._previousBuildID;
-    }
-
-    // sysinfo fields are not always available, get what we can.
-    let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
-    let fields = ["cpucount", "memsize", "arch", "version", "kernel_version",
-                  "device", "manufacturer", "hardware", "tablet",
-                  "hasMMX", "hasSSE", "hasSSE2", "hasSSE3",
-                  "hasSSSE3", "hasSSE4A", "hasSSE4_1", "hasSSE4_2",
-                  "hasEDSP", "hasARMv6", "hasARMv7", "hasNEON", "isWow64",
-                  "profileHDDModel", "profileHDDRevision", "binHDDModel",
-                  "binHDDRevision", "winHDDModel", "winHDDRevision"];
-    for each (let field in fields) {
-      let value;
-      try {
-        value = sysInfo.getProperty(field);
-      } catch (e) {
-        continue;
-      }
-      if (field == "memsize") {
-        // Send RAM size in megabytes. Rounding because sysinfo doesn't
-        // always provide RAM in multiples of 1024.
-        value = Math.round(value / 1024 / 1024);
-      }
-      ret[field] = value;
-    }
-
-    // gfxInfo fields are not always available, get what we can.
-    let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
-    let gfxfields = ["adapterDescription", "adapterVendorID", "adapterDeviceID",
-                     "adapterSubsysID", "adapterRAM", "adapterDriver",
-                     "adapterDriverVersion", "adapterDriverDate",
-                     "adapterDescription2", "adapterVendorID2",
-                     "adapterDeviceID2", "adapterSubsysID2", "adapterRAM2",
-                     "adapterDriver2", "adapterDriverVersion2",
-                     "adapterDriverDate2", "isGPU2Active", "D2DEnabled",
-                     "DWriteEnabled", "DWriteVersion"
-                    ];
-
-    if (gfxInfo) {
-      for each (let field in gfxfields) {
-        try {
-          let value = gfxInfo[field];
-          // bug 940806: We need to do a strict equality comparison here,
-          // otherwise a type conversion will occur and boolean false values
-          // will get filtered out
-          if (value !== "") {
-            ret[field] = value;
-          }
-        } catch (e) {
-          continue
-        }
-      }
-    }
-
-#ifndef MOZ_WIDGET_GONK
-    let theme = LightweightThemeManager.currentTheme;
-    if (theme) {
-      ret.persona = theme.id;
-    }
-#endif
+      // Date.getTimezoneOffset() unintuitively returns negative values if we are ahead of
+      // UTC and vice versa (e.g. -60 for UTC+1). We invert the sign here.
+      timezoneOffset: -this._subsessionStartDate.getTimezoneOffset(),
+      previousBuildId: this._previousBuildId,
+
+      sessionId: this._sessionId,
+      subsessionId: this._subsessionId,
+      previousSubsessionId: this._previousSubsessionId,
+
+      subsessionCounter: this._subsessionCounter,
+      profileSubsessionCounter: this._profileSubsessionCounter,
+
+      sessionStartDate: sessionStartDate,
+      subsessionStartDate: subsessionStartDate,
+      subsessionLength: subsessionLength,
+    };
 
+    // TODO: Remove this when bug 1124128 lands.
     if (this._addons)
       ret.addons = this._addons;
 
+    // TODO: Remove this when bug 1124128 lands.
     let flashVersion = this.getFlashVersion();
     if (flashVersion)
       ret.flashVersion = flashVersion;
 
-    try {
-      let scope = {};
-      Cu.import("resource:///modules/experiments/Experiments.jsm", scope);
-      let experiments = scope.Experiments.instance()
-      let activeExperiment = experiments.getActiveExperimentID();
-      if (activeExperiment) {
-        ret.activeExperiment = activeExperiment;
-	ret.activeExperimentBranch = experiments.getActiveExperimentBranch();
-      }
-    } catch(e) {
-      // If this is not Firefox, the import will fail.
-    }
-
     return ret;
   },
 
@@ -792,15 +923,22 @@
    * to |this.getSimpleMeasurements| and |this.getMetadata|,
    * respectively.
    */
-  assemblePayloadWithMeasurements: function assemblePayloadWithMeasurements(simpleMeasurements, info) {
-    this._log.trace("assemblePayloadWithMeasurements");
+  assemblePayloadWithMeasurements: function(simpleMeasurements, info, reason, clearSubsession) {
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+    const isSubsession = !this._isClassicReason(reason);
+#else
+    const isSubsession = false;
+    clearSubsession = false;
+#endif
+    this._log.trace("assemblePayloadWithMeasurements - reason: " + reason +
+                    ", submitting subsession data: " + isSubsession);
 
     // Payload common to chrome and content processes.
     let payloadObj = {
       ver: PAYLOAD_VERSION,
       simpleMeasurements: simpleMeasurements,
-      histograms: this.getHistograms(Telemetry.histogramSnapshots),
-      keyedHistograms: this.getKeyedHistograms(),
+      histograms: this.getHistograms(isSubsession, clearSubsession),
+      keyedHistograms: this.getKeyedHistograms(isSubsession, clearSubsession),
       chromeHangs: Telemetry.chromeHangs,
       threadHangStats: this.getThreadHangStats(Telemetry.threadHangStats),
       log: TelemetryLog.entries(),
@@ -825,32 +963,43 @@
       payloadObj.slowSQLStartup = this._slowSQLStartup;
     }
 
-    let clientID = TelemetryPing.clientID;
-    if (clientID && Preferences.get(PREF_FHR_UPLOAD_ENABLED, false)) {
-      payloadObj.clientID = clientID;
-    }
-
     if (this._childTelemetry.length) {
       payloadObj.childPayloads = this.getChildPayloads();
     }
+
     return payloadObj;
   },
 
-  getSessionPayload: function getSessionPayload(reason) {
-    this._log.trace("getSessionPayload - Reason " + reason);
-    let measurements = this.getSimpleMeasurements(reason == "saved-session");
-    let info = !IS_CONTENT_PROCESS ? this.getMetadata(reason) : null;
-    return this.assemblePayloadWithMeasurements(measurements, info);
+  /**
+   * Start a new subsession.
+   */
+  startNewSubsession: function () {
+    this._subsessionStartDate = Policy.now();
+    this._previousSubsessionId = this._subsessionId;
+    this._subsessionId = Policy.generateSubsessionUUID();
+    this._subsessionCounter++;
+    this._profileSubsessionCounter++;
   },
 
-  assemblePing: function assemblePing(payloadObj, reason) {
-    let slug = this._uuid;
-    return { slug: slug, reason: reason, payload: payloadObj };
-  },
+  getSessionPayload: function getSessionPayload(reason, clearSubsession) {
+    this._log.trace("getSessionPayload - reason: " + reason + ", clearSubsession: " + clearSubsession);
+#if defined(MOZ_WIDGET_GONK) || defined(MOZ_WIDGET_ANDROID)
+    clearSubsession = false;
+#endif
+
+    let measurements = this.getSimpleMeasurements(reason == REASON_SAVED_SESSION);
+    let info = !IS_CONTENT_PROCESS ? this.getMetadata(reason) : null;
+    let payload = this.assemblePayloadWithMeasurements(measurements, info, reason, clearSubsession);
+
+    if (!IS_CONTENT_PROCESS && clearSubsession) {
+      this.startNewSubsession();
+      // Persist session data to disk (don't wait until it completes).
+      let sessionData = this._getSessionDataObject();
+      gStateSaveSerializer.enqueueTask(() => this._saveSessionData(sessionData));
+      this._rescheduleDailyTimer();
+    }
 
-  getSessionPayloadAndSlug: function getSessionPayloadAndSlug(reason) {
-    this._log.trace("getSessionPayloadAndSlug - Reason " + reason);
-    return this.assemblePing(this.getSessionPayload(reason), reason);
+    return payload;
   },
 
   /**
@@ -860,21 +1009,15 @@
     this._log.trace("send - Reason " + reason);
     // populate histograms one last time
     this.gatherMemory();
-    return TelemetryPing.send(reason, this.getSessionPayloadAndSlug(reason));
-  },
 
-  submissionPath: function submissionPath(ping) {
-    let slug;
-    if (!ping) {
-      slug = this._uuid;
-    } else {
-      let info = ping.payload.info;
-      let pathComponents = [ping.slug, info.reason, info.appName,
-                            info.appVersion, info.appUpdateChannel,
-                            info.appBuildID];
-      slug = pathComponents.join("/");
-    }
-    return "/submit/telemetry/" + slug;
+    const isSubsession = !this._isClassicReason(reason);
+    let payload = this.getSessionPayload(reason, isSubsession);
+    let options = {
+      retentionDays: RETENTION_DAYS,
+      addClientId: true,
+      addEnvironment: true,
+    };
+    return TelemetryPing.send(getPingType(payload), payload, options);
   },
 
   attachObservers: function attachObservers() {
@@ -928,24 +1071,42 @@
    * Initializes telemetry within a timer. If there is no PREF_SERVER set, don't turn on telemetry.
    */
   setupChromeProcess: function setupChromeProcess(testing) {
+    this._initStarted = true;
     if (testing && !this._log) {
       this._log = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
     }
 
     this._log.trace("setupChromeProcess");
 
+    if (this._delayedInitTask) {
+      this._log.error("setupChromeProcess - init task already running");
+      return this._delayedInitTaskDeferred.promise;
+    }
+
+    if (this._initialized && !testing) {
+      this._log.error("setupChromeProcess - already initialized");
+      return Promise.resolve();
+    }
+
+    // Generate a unique id once per session so the server can cope with duplicate
+    // submissions, orphaning and other oddities. The id is shared across subsessions.
+    this._sessionId = Policy.generateSessionUUID();
+    this.startNewSubsession();
+    // startNewSubsession sets |_subsessionStartDate| to the current date/time. Use
+    // the very same value for |_sessionStartDate|.
+    this._sessionStartDate = this._subsessionStartDate;
+
     // Initialize some probes that are kept in their own modules
     this._thirdPartyCookies = new ThirdPartyCookieProbe();
     this._thirdPartyCookies.init();
 
     // Record old value and update build ID preference if this is the first
     // run with a new build ID.
-    let previousBuildID = Preferences.get(PREF_PREVIOUS_BUILDID, undefined);
+    let previousBuildId = Preferences.get(PREF_PREVIOUS_BUILDID, null);
     let thisBuildID = Services.appinfo.appBuildID;
-    // If there is no previousBuildID preference, this._previousBuildID remains
-    // undefined so no value is sent in the telemetry metadata.
-    if (previousBuildID != thisBuildID) {
-      this._previousBuildID = previousBuildID;
+    // If there is no previousBuildId preference, we send null to the server.
+    if (previousBuildId != thisBuildID) {
+      this._previousBuildId = previousBuildId;
       Preferences.set(PREF_PREVIOUS_BUILDID, thisBuildID);
     }
 
@@ -954,14 +1115,9 @@
       return Promise.resolve();
     }
 
-    AsyncShutdown.sendTelemetry.addBlocker(
-      "Telemetry: shutting down",
-      function condition(){
-        this.uninstall();
-        if (Telemetry.canSend) {
-          return this.savePendingPings();
-        }
-      }.bind(this));
+    TelemetryPing.shutdown.addBlocker("TelemetrySession: shutting down",
+                                      () => this.shutdownChromeProcess(),
+                                      () => this._getState());
 
     Services.obs.addObserver(this, "sessionstore-windows-restored", false);
 #ifdef MOZ_WIDGET_ANDROID
@@ -976,20 +1132,39 @@
     // Delay full telemetry initialization to give the browser time to
     // run various late initializers. Otherwise our gathered memory
     // footprint and other numbers would be too optimistic.
-    let deferred = Promise.defer();
-    let delayedTask = new DeferredTask(function* () {
-      this._initialized = true;
+    this._delayedInitTaskDeferred = Promise.defer();
+    this._delayedInitTask = new DeferredTask(function* () {
+      try {
+        this._initialized = true;
 
-      this.attachObservers();
-      this.gatherMemory();
+        let hasLoaded = yield this._loadSessionData();
+        if (!hasLoaded) {
+          // We could not load a valid session data file. Create one.
+          yield this._saveSessionData(this._getSessionDataObject()).catch(() =>
+            this._log.error("setupChromeProcess - Could not write session data to disk."));
+        }
+        this.attachObservers();
+        this.gatherMemory();
+
+        Telemetry.asyncFetchTelemetryData(function () {});
 
-      Telemetry.asyncFetchTelemetryData(function () {});
-      deferred.resolve();
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+        this._rescheduleDailyTimer();
+        TelemetryEnvironment.registerChangeListener(ENVIRONMENT_CHANGE_LISTENER,
+                                                    () => this._onEnvironmentChange());
+#endif
 
+        this._delayedInitTaskDeferred.resolve();
+      } catch (e) {
+        this._delayedInitTaskDeferred.reject();
+      } finally {
+        this._delayedInitTask = null;
+        this._delayedInitTaskDeferred = null;
+      }
     }.bind(this), testing ? TELEMETRY_TEST_DELAY : TELEMETRY_DELAY);
 
-    delayedTask.arm();
-    return deferred.promise;
+    this._delayedInitTask.arm();
+    return this._delayedInitTaskDeferred.promise;
   },
 
   /**
@@ -1016,10 +1191,6 @@
     delayedTask.arm();
   },
 
-  testLoadHistograms: function testLoadHistograms(file) {
-    return TelemetryFile.testLoadHistograms(file);
-  },
-
   getFlashVersion: function getFlashVersion() {
     this._log.trace("getFlashVersion");
     let host = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
@@ -1060,19 +1231,33 @@
 
   sendContentProcessPing: function sendContentProcessPing(reason) {
     this._log.trace("sendContentProcessPing - Reason " + reason);
-    let payload = this.getSessionPayload(reason);
+    const isSubsession = !this._isClassicReason(reason);
+    let payload = this.getSessionPayload(reason, isSubsession);
     cpmm.sendAsyncMessage(MESSAGE_TELEMETRY_PAYLOAD, payload);
   },
 
   savePendingPings: function savePendingPings() {
     this._log.trace("savePendingPings");
-    let sessionPing = this.getSessionPayloadAndSlug("saved-session");
-    return TelemetryFile.savePendingPings(sessionPing);
+    let payload = this.getSessionPayload(REASON_SAVED_SESSION, false);
+    let options = {
+      retentionDays: RETENTION_DAYS,
+      addClientId: true,
+      addEnvironment: true,
+    };
+    return TelemetryPing.savePendingPings(getPingType(payload), payload, options);
   },
 
   testSaveHistograms: function testSaveHistograms(file) {
-    return TelemetryFile.savePingToFile(this.getSessionPayloadAndSlug("saved-session"),
-      file.path, true);
+    this._log.trace("testSaveHistograms - Path: " + file.path);
+    let payload = this.getSessionPayload(REASON_SAVED_SESSION, false);
+    let options = {
+      retentionDays: RETENTION_DAYS,
+      addClientId: true,
+      addEnvironment: true,
+      overwrite: true,
+      filePath: file.path,
+    };
+    return TelemetryPing.testSavePingToFile(getPingType(payload), payload, options);
   },
 
   /**
@@ -1093,8 +1278,9 @@
 #endif
   },
 
-  getPayload: function getPayload() {
-    this._log.trace("getPayload");
+  getPayload: function getPayload(reason, clearSubsession) {
+    this._log.trace("getPayload - clearSubsession: " + clearSubsession);
+    reason = reason || REASON_GATHER_PAYLOAD;
     // This function returns the current Telemetry payload to the caller.
     // We only gather startup info once.
     if (Object.keys(this._slowSQLStartup).length == 0) {
@@ -1102,7 +1288,7 @@
       this._slowSQLStartup = Telemetry.slowSQL;
     }
     this.gatherMemory();
-    return this.getSessionPayload("gather-payload");
+    return this.getSessionPayload(reason, clearSubsession);
   },
 
   gatherStartup: function gatherStartup() {
@@ -1127,9 +1313,9 @@
       this._isIdleObserver = false;
     }
     if (aTest) {
-      return this.send("test-ping");
+      return this.send(REASON_TEST_PING);
     } else if (Telemetry.canSend) {
-      return this.send("idle-daily");
+      return this.send(REASON_IDLE_DAILY);
     }
   },
 
@@ -1160,7 +1346,7 @@
       this.uninstall();
 
       if (Telemetry.canSend) {
-        this.sendContentProcessPing("saved-session");
+        this.sendContentProcessPing(REASON_SAVED_SESSION);
       }
       break;
     case "cycle-collector-begin":
@@ -1188,7 +1374,7 @@
       gWasDebuggerAttached = debugService.isDebuggerAttached;
       this.gatherStartup();
       break;
-    case "idle-daily":
+    case REASON_IDLE_DAILY:
       // Enqueue to main-thread, otherwise components may be inited by the
       // idle-daily category and miss the gather-telemetry notification.
       Services.tm.mainThread.dispatch((function() {
@@ -1221,8 +1407,14 @@
     //    it on the next backgrounding). Not deleting it is faster, so that's what we do.
     case "application-background":
       if (Telemetry.canSend) {
-        let ping = this.getSessionPayloadAndSlug("saved-session");
-        TelemetryFile.savePing(ping, true);
+        let payload = this.getSessionPayload(REASON_SAVED_SESSION, false);
+        let options = {
+          retentionDays: RETENTION_DAYS,
+          addClientId: true,
+          addEnvironment: true,
+          overwrite: true,
+        };
+        TelemetryPing.savePing(getPingType(payload), payload, options);
       }
       break;
 #endif
@@ -1230,14 +1422,190 @@
   },
 
   /**
-   * This tells TelemetryPing to uninitialize and save any pending pings.
+   * This tells TelemetrySession to uninitialize and save any pending pings.
    * @param testing Optional. If true, always saves the ping whether Telemetry
    *                can send pings or not, which is used for testing.
    */
-  shutdown: function(testing = false) {
-    this.uninstall();
-    if (Telemetry.canSend || testing) {
-      return this.savePendingPings();
+  shutdownChromeProcess: function(testing = false) {
+    this._log.trace("shutdownChromeProcess - testing: " + testing);
+
+    let cleanup = () => {
+#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
+      TelemetryEnvironment.unregisterChangeListener(ENVIRONMENT_CHANGE_LISTENER);
+#endif
+      if (this._dailyTimerId) {
+        Policy.clearDailyTimeout(this._dailyTimerId);
+        this._dailyTimerId = null;
+      }
+      this.uninstall();
+
+      let reset = () => {
+        this._initStarted = false;
+        this._initialized = false;
+      };
+
+      if (Telemetry.canSend || testing) {
+        return this.savePendingPings()
+                .then(() => gStateSaveSerializer.flushTasks())
+                .then(reset);
+      }
+
+      reset();
+      return Promise.resolve();
+    };
+
+    // We can be in one the following states here:
+    // 1) setupChromeProcess was never called
+    // or it was called and
+    //   2) _delayedInitTask was scheduled, but didn't run yet.
+    //   3) _delayedInitTask is running now.
+    //   4) _delayedInitTask finished running already.
+
+    // This handles 1).
+    if (!this._initStarted) {
+      return Promise.resolve();
+     }
+
+    // This handles 4).
+    if (!this._delayedInitTask) {
+      // We already ran the delayed initialization.
+      return cleanup();
+     }
+
+    // This handles 2) and 3).
+    this._delayedInitTask.disarm();
+    return this._delayedInitTask.finalize().then(cleanup);
+   },
+
+  _rescheduleDailyTimer: function() {
+    if (this._dailyTimerId) {
+      this._log.trace("_rescheduleDailyTimer - clearing existing timeout");
+      Policy.clearDailyTimeout(this._dailyTimerId);
+    }
+
+    let now = Policy.now();
+    let midnight = truncateToDays(now).getTime() + MS_IN_ONE_DAY;
+    let msUntilCollection = midnight - now.getTime();
+    if (msUntilCollection < MIN_SUBSESSION_LENGTH_MS) {
+      msUntilCollection += MS_IN_ONE_DAY;
+    }
+
+    this._log.trace("_rescheduleDailyTimer - now: " + now
+                    + ", scheduled: " + new Date(now.getTime() + msUntilCollection));
+    this._dailyTimerId = Policy.setDailyTimeout(() => this._onDailyTimer(), msUntilCollection);
+  },
+
+  _onDailyTimer: function() {
+    if (!this._initStarted) {
+      if (this._log) {
+        this._log.warn("_onDailyTimer - not initialized");
+      } else {
+        Cu.reportError("TelemetrySession._onDailyTimer - not initialized");
+      }
+      return;
     }
+
+    this._log.trace("_onDailyTimer");
+    let payload = this.getSessionPayload(REASON_DAILY, true);
+
+    let options = {
+      retentionDays: RETENTION_DAYS,
+      addClientId: true,
+      addEnvironment: true,
+    };
+    let promise = TelemetryPing.send(getPingType(payload), payload, options);
+
+    this._rescheduleDailyTimer();
+    // Return the promise so tests can wait on the ping submission.
+    return promise;
+  },
+
+  /**
+   * Loads session data from the session data file.
+   * @return {Promise<boolean>} A promise which is resolved with a true argument when
+   *                            loading has completed, with false otherwise.
+   */
+  _loadSessionData: Task.async(function* () {
+    let dataFile = OS.Path.join(OS.Constants.Path.profileDir, "datareporting",
+                                SESSION_STATE_FILE_NAME);
+
+    // Try to load the "profileSubsessionCounter" from the state file.
+    try {
+      let data = yield CommonUtils.readJSON(dataFile);
+      if (data &&
+          "profileSubsessionCounter" in data &&
+          typeof(data.profileSubsessionCounter) == "number" &&
+          "previousSubsessionId" in data) {
+        this._previousSubsessionId = data.previousSubsessionId;
+        // Add |_subsessionCounter| to the |_profileSubsessionCounter| to account for
+        // new subsession while loading still takes place. This will always be exactly
+        // 1 - the current subsessions.
+        this._profileSubsessionCounter = data.profileSubsessionCounter +
+                                         this._subsessionCounter;
+        return true;
+      }
+    } catch (e) {
+      this._log.info("_loadSessionData - Cannot load session data file " + dataFile, e);
+    }
+    return false;
+  }),
+
+  /**
+   * Get the session data object to serialise to disk.
+   */
+  _getSessionDataObject: function() {
+    return {
+      previousSubsessionId: this._previousSubsessionId,
+      profileSubsessionCounter: this._profileSubsessionCounter,
+    };
+  },
+
+  /**
+   * Saves session data to disk.
+   */
+  _saveSessionData: Task.async(function* (sessionData) {
+    let dataDir = OS.Path.join(OS.Constants.Path.profileDir, "datareporting");
+    yield OS.File.makeDir(dataDir);
+
+    let filePath = OS.Path.join(dataDir, SESSION_STATE_FILE_NAME);
+    try {
+      yield CommonUtils.writeJSON(sessionData, filePath);
+    } catch(e) {
+      this._log.error("_saveSessionData - Failed to write session data to " + filePath, e);
+    }
+  }),
+
+  _onEnvironmentChange: function() {
+    this._log.trace("_onEnvironmentChange");
+    let payload = this.getSessionPayload(REASON_ENVIRONMENT_CHANGE, true);
+
+    let options = {
+      retentionDays: RETENTION_DAYS,
+      addClientId: true,
+      addEnvironment: true,
+    };
+    let promise = TelemetryPing.send(getPingType(payload), payload, options);
+  },
+
+  _isClassicReason: function(reason) {
+    const classicReasons = [
+      REASON_SAVED_SESSION,
+      REASON_IDLE_DAILY,
+      REASON_GATHER_PAYLOAD,
+      REASON_TEST_PING,
+    ];
+    return classicReasons.indexOf(reason) != -1;
+  },
+
+  /**
+   * Get an object describing the current state of this module for AsyncShutdown diagnostics.
+   */
+  _getState: function() {
+    return {
+      initialized: this._initialized,
+      initStarted: this._initStarted,
+      haveDelayedInitTask: !!this._delayedInitTask,
+      dailyTimerScheduled: !!this._dailyTimerId,
+    };
   },
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/dictionary/install.rdf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/dictionary/install.rdf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/dictionary/install.rdf	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/dictionary/install.rdf	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>telemetry-dictionary@tests.mozilla.org</em:id>
+    <em:version>1</em:version>
+    <em:type>64</em:type>
+
+    <em:targetApplication>
+      <Description>
+        <em:id>toolkit@mozilla.org</em:id>
+        <em:minVersion>0</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>Telemetry test dictionary</em:name>
+    <em:description>A nice dictionary to prevent all typos for Telemetry.</em:description>
+    <em:bootstrap>true</em:bootstrap>
+
+  </Description>
+</RDF>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/experiment/install.rdf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/experiment/install.rdf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/experiment/install.rdf	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/experiment/install.rdf	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>telemetry-experiment-1@tests.mozilla.org</em:id>
+    <em:version>1</em:version>
+    <em:type>128</em:type>
+
+    <!-- Front End MetaData -->
+    <em:name>Telemetry test experiment</em:name>
+    <em:description>Yet another experiment that experiments experimentally.</em:description>
+
+  </Description>
+</RDF>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/extension/install.rdf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/extension/install.rdf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/extension/install.rdf	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/extension/install.rdf	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>telemetry-ext-1@tests.mozilla.org</em:id>
+    <em:version>1</em:version>
+    <em:type>2</em:type>
+
+    <!-- Front End MetaData -->
+    <em:name>Telemetry test extension</em:name>
+    <em:description>Yet another extension that extends.</em:description>
+
+  </Description>
+</RDF>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/extension-2/install.rdf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/extension-2/install.rdf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/extension-2/install.rdf	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/extension-2/install.rdf	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>telemetry-ext-2@tests.mozilla.org</em:id>
+    <em:version>2</em:version>
+    <em:type>2</em:type>
+
+    <!-- Front End MetaData -->
+    <em:name>Telemetry test extension 2</em:name>
+    <em:description>Yet another extension that extends twice.</em:description>
+
+  </Description>
+</RDF>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/restartless/install.rdf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/restartless/install.rdf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/restartless/install.rdf	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/restartless/install.rdf	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>tel-restartless-xpi@tests.mozilla.org</em:id>
+    <em:version>1.0</em:version>
+
+    <em:targetApplication>
+      <Description>
+        <em:id>toolkit@mozilla.org</em:id>
+        <em:minVersion>0</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>XPI Telemetry Restartless Test</em:name>
+    <em:description>A restartless addon which gets enabled without a reboot.</em:description>
+    <em:bootstrap>true</em:bootstrap>
+
+  </Description>
+</RDF>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/theme/install.rdf thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/theme/install.rdf
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/addons/theme/install.rdf	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/addons/theme/install.rdf	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>telemetry-theme@tests.mozilla.org</em:id>
+    <em:version>1</em:version>
+    <em:type>4</em:type>
+
+    <!-- Front End MetaData -->
+    <em:name>Telemetry test theme</em:name>
+    <em:description>A good looking test theme for Telemetry.</em:description>
+
+  </Description>
+</RDF>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/head.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/head.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/head.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/head.js	2015-02-28 15:03:07.000000000 +0000
@@ -4,14 +4,34 @@
 Components.utils.import("resource://gre/modules/TelemetryPing.jsm", this);
 Components.utils.import("resource://gre/modules/Services.jsm", this);
 
-// copied from toolkit/mozapps/extensions/test/xpcshell/head_addons.js
-const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
-const XULAPPINFO_CID = Components.ID("{c763b610-9d49-455a-bbd2-ede71682a1ac}");
-let gAppInfo;
-let gOldAppInfo = Components.classes[XULAPPINFO_CONTRACTID]
-                            .getService(Components.interfaces.nsIXULRuntime);
+const gIsWindows = ("@mozilla.org/windows-registry-key;1" in Components.classes);
+const gIsMac = ("@mozilla.org/xpcom/mac-utils;1" in Components.classes);
+const gIsAndroid =  ("@mozilla.org/android/bridge;1" in Components.classes);
+const gIsGonk = ("@mozilla.org/cellbroadcast/gonkservice;1" in Components.classes);
+
+let gOldAppInfo = null;
+let gGlobalScope = this;
+
+function loadAddonManager(id, name, version, platformVersion) {
+  let ns = {};
+  Cu.import("resource://gre/modules/Services.jsm", ns);
+  let head = "../../../../mozapps/extensions/test/xpcshell/head_addons.js";
+  let file = do_get_file(head);
+  let uri = ns.Services.io.newFileURI(file);
+  ns.Services.scriptloader.loadSubScript(uri.spec, gGlobalScope);
+  createAppInfo(id, name, version, platformVersion);
+  startupManager();
+}
 
 function createAppInfo(id, name, version, platformVersion) {
+  const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
+  const XULAPPINFO_CID = Components.ID("{c763b610-9d49-455a-bbd2-ede71682a1ac}");
+  let gAppInfo;
+  if (!gOldAppInfo) {
+    gOldAppInfo = Components.classes[XULAPPINFO_CONTRACTID]
+                            .getService(Components.interfaces.nsIXULRuntime);
+  }
+
   gAppInfo = {
     // nsIXULAppInfo
     vendor: "Mozilla",
@@ -58,7 +78,17 @@
                             XULAPPINFO_CONTRACTID, XULAppInfoFactory);
 }
 
+// Fake setTimeout and clearTimeout for the daily timer in tests for controllable behavior.
+function fakeDailyTimers(set, clear) {
+  let session = Components.utils.import("resource://gre/modules/TelemetrySession.jsm");
+  session.Policy.setDailyTimeout = set;
+  session.Policy.clearDailyTimeout = clear;
+}
+
 // Set logging preferences for all the tests.
 Services.prefs.setCharPref("toolkit.telemetry.log.level", "Trace");
 Services.prefs.setBoolPref("toolkit.telemetry.log.dump", true);
 TelemetryPing.initLogging();
+
+// Avoid timers interrupting test behavior.
+fakeDailyTimers(() => {}, () => {});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js	2015-02-28 15:03:07.000000000 +0000
@@ -391,7 +391,7 @@
 function test_keyed_boolean_histogram()
 {
   const KEYED_ID = "test::keyed::boolean";
-  KEYS = ["key"+(i+1) for (i of numberRange(0, 2))];
+  let KEYS = ["key"+(i+1) for (i of numberRange(0, 2))];
   KEYS.push("漢語");
   let histogramBase = {
     "min": 1,
@@ -605,6 +605,144 @@
   Assert.ok(registered.has("TELEMETRY_TEST_KEYED_RELEASE_OPTOUT"));
 }
 
+function test_subsession() {
+  if (gIsAndroid) {
+    // We don't support subsessions yet on Android.
+    return;
+  }
+
+  const ID = "TELEMETRY_TEST_COUNT";
+  const FLAG = "TELEMETRY_TEST_FLAG";
+  let h = Telemetry.getHistogramById(ID);
+  let flag = Telemetry.getHistogramById(FLAG);
+
+  // Both original and duplicate should start out the same.
+  h.clear();
+  let snapshot = Telemetry.histogramSnapshots;
+  let subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.ok(!(ID in snapshot));
+  Assert.ok(!(ID in subsession));
+
+  // They should instantiate and pick-up the count.
+  h.add(1);
+  snapshot = Telemetry.histogramSnapshots;
+  subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.ok(ID in snapshot);
+  Assert.ok(ID in subsession);
+  Assert.equal(snapshot[ID].sum, 1);
+  Assert.equal(subsession[ID].sum, 1);
+
+  // They should still reset properly.
+  h.clear();
+  snapshot = Telemetry.histogramSnapshots;
+  subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.ok(!(ID in snapshot));
+  Assert.ok(!(ID in subsession));
+
+  // Both should instantiate and pick-up the count.
+  h.add(1);
+  snapshot = Telemetry.histogramSnapshots;
+  subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.equal(snapshot[ID].sum, 1);
+  Assert.equal(subsession[ID].sum, 1);
+
+  // Check that we are able to only reset the duplicate histogram.
+  h.clear(true);
+  snapshot = Telemetry.histogramSnapshots;
+  subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.ok(ID in snapshot);
+  Assert.ok(ID in subsession);
+  Assert.equal(snapshot[ID].sum, 1);
+  Assert.equal(subsession[ID].sum, 0);
+
+  // Both should register the next count.
+  h.add(1);
+  snapshot = Telemetry.histogramSnapshots;
+  subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.equal(snapshot[ID].sum, 2);
+  Assert.equal(subsession[ID].sum, 1);
+
+  // Retrieve a subsession snapshot and pass the flag to
+  // clear subsession histograms too.
+  h.clear();
+  flag.clear();
+  h.add(1);
+  flag.add(1);
+  snapshot = Telemetry.histogramSnapshots;
+  subsession = Telemetry.snapshotSubsessionHistograms(true);
+  Assert.ok(ID in snapshot);
+  Assert.ok(ID in subsession);
+  Assert.ok(FLAG in snapshot);
+  Assert.ok(FLAG in subsession);
+  Assert.equal(snapshot[ID].sum, 1);
+  Assert.equal(subsession[ID].sum, 1);
+  Assert.equal(snapshot[FLAG].sum, 1);
+  Assert.equal(subsession[FLAG].sum, 1);
+
+  // The next subsesssion snapshot should show the histograms
+  // got reset.
+  snapshot = Telemetry.histogramSnapshots;
+  subsession = Telemetry.snapshotSubsessionHistograms();
+  Assert.ok(ID in snapshot);
+  Assert.ok(ID in subsession);
+  Assert.ok(FLAG in snapshot);
+  Assert.ok(FLAG in subsession);
+  Assert.equal(snapshot[ID].sum, 1);
+  Assert.equal(subsession[ID].sum, 0);
+  Assert.equal(snapshot[FLAG].sum, 1);
+  Assert.equal(subsession[FLAG].sum, 0);
+}
+
+function test_keyed_subsession() {
+  if (gIsAndroid) {
+    // We don't support subsessions yet on Android.
+    return;
+  }
+
+  let h = Telemetry.getKeyedHistogramById("TELEMETRY_TEST_KEYED_FLAG");
+  const KEY = "foo";
+
+  // Both original and subsession should start out the same.
+  h.clear();
+  Assert.ok(!(KEY in h.snapshot()));
+  Assert.ok(!(KEY in h.subsessionSnapshot()));
+  Assert.equal(h.snapshot(KEY).sum, 0);
+  Assert.equal(h.subsessionSnapshot(KEY).sum, 0);
+
+  // Both should register the flag.
+  h.add(KEY, 1);
+  Assert.ok(KEY in h.snapshot());
+  Assert.ok(KEY in h.subsessionSnapshot());
+  Assert.equal(h.snapshot(KEY).sum, 1);
+  Assert.equal(h.subsessionSnapshot(KEY).sum, 1);
+
+  // Check that we are able to only reset the subsession histogram.
+  h.clear(true);
+  Assert.ok(KEY in h.snapshot());
+  Assert.ok(!(KEY in h.subsessionSnapshot()));
+  Assert.equal(h.snapshot(KEY).sum, 1);
+  Assert.equal(h.subsessionSnapshot(KEY).sum, 0);
+
+  // Setting the flag again should make both match again.
+  h.add(KEY, 1);
+  Assert.ok(KEY in h.snapshot());
+  Assert.ok(KEY in h.subsessionSnapshot());
+  Assert.equal(h.snapshot(KEY).sum, 1);
+  Assert.equal(h.subsessionSnapshot(KEY).sum, 1);
+
+  // Check that "snapshot and clear" works properly.
+  let snapshot = h.snapshot();
+  let subsession = h.snapshotSubsessionAndClear();
+  Assert.ok(KEY in snapshot);
+  Assert.ok(KEY in subsession);
+  Assert.equal(snapshot[KEY].sum, 1);
+  Assert.equal(subsession[KEY].sum, 1);
+
+  subsession = h.subsessionSnapshot();
+  Assert.ok(!(KEY in subsession));
+  Assert.equal(h.subsessionSnapshot(KEY).sum, 0);
+}
+
 function generateUUID() {
   let str = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator).generateUUID().toString();
   // strip {}
@@ -640,4 +778,6 @@
   test_expired_histogram();
   test_keyed_histogram();
   test_datasets();
+  test_subsession();
+  test_keyed_subsession();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,940 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/AddonManager.jsm");
+Cu.import("resource://gre/modules/TelemetryEnvironment.jsm", this);
+Cu.import("resource://gre/modules/Preferences.jsm", this);
+Cu.import("resource://gre/modules/PromiseUtils.jsm", this);
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
+Cu.import("resource://testing-common/AddonManagerTesting.jsm");
+Cu.import("resource://testing-common/httpd.js");
+
+// Lazy load |LightweightThemeManager|, we won't be using it on Gonk.
+XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
+                                  "resource://gre/modules/LightweightThemeManager.jsm");
+
+// Lazy load |ProfileTimesAccessor| as it is not available on Android.
+XPCOMUtils.defineLazyModuleGetter(this, "ProfileTimesAccessor",
+                                  "resource://gre/modules/services/healthreport/profile.jsm");
+
+// The webserver hosting the addons.
+let gHttpServer = null;
+// The URL of the webserver root.
+let gHttpRoot = null;
+// The URL of the data directory, on the webserver.
+let gDataRoot = null;
+
+const PLATFORM_VERSION = "1.9.2";
+const APP_VERSION = "1";
+const APP_ID = "xpcshell@tests.mozilla.org";
+const APP_NAME = "XPCShell";
+const APP_HOTFIX_VERSION = "2.3.4a";
+
+const DISTRIBUTION_ID = "distributor-id";
+const DISTRIBUTION_VERSION = "4.5.6b";
+const DISTRIBUTOR_NAME = "Some Distributor";
+const DISTRIBUTOR_CHANNEL = "A Channel";
+const PARTNER_NAME = "test";
+const PARTNER_ID = "NicePartner-ID-3785";
+
+const GFX_VENDOR_ID = "0xabcd";
+const GFX_DEVICE_ID = "0x1234";
+
+const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
+// The profile reset date, in milliseconds (Today)
+const PROFILE_RESET_DATE_MS = Date.now();
+// The profile creation date, in milliseconds (Yesterday).
+const PROFILE_CREATION_DATE_MS = PROFILE_RESET_DATE_MS - MILLISECONDS_PER_DAY;
+
+const FLASH_PLUGIN_NAME = "Shockwave Flash";
+const FLASH_PLUGIN_DESC = "A mock flash plugin";
+const FLASH_PLUGIN_VERSION = "\u201c1.1.1.1\u201d";
+const PLUGIN_MIME_TYPE1 = "application/x-shockwave-flash";
+const PLUGIN_MIME_TYPE2 = "text/plain";
+
+const PLUGIN2_NAME = "Quicktime";
+const PLUGIN2_DESC = "A mock Quicktime plugin";
+const PLUGIN2_VERSION = "2.3";
+
+const PLUGINHOST_CONTRACTID = "@mozilla.org/plugin/host;1";
+const PLUGINHOST_CID = Components.ID("{2329e6ea-1f15-4cbe-9ded-6e98e842de0e}");
+
+const PERSONA_ID = "3785";
+// Defined by LightweightThemeManager, it is appended to the PERSONA_ID.
+const PERSONA_ID_SUFFIX = "@personas.mozilla.org";
+const PERSONA_NAME = "Test Theme";
+const PERSONA_DESCRIPTION = "A nice theme/persona description.";
+
+const PLUGIN_UPDATED_TOPIC     = "plugins-list-updated";
+
+/**
+ * Used to mock plugin tags in our fake plugin host.
+ */
+function PluginTag(aName, aDescription, aVersion, aEnabled) {
+  this.name = aName;
+  this.description = aDescription;
+  this.version = aVersion;
+  this.disabled = !aEnabled;
+}
+
+PluginTag.prototype = {
+  name: null,
+  description: null,
+  version: null,
+  filename: null,
+  fullpath: null,
+  disabled: false,
+  blocklisted: false,
+  clicktoplay: true,
+
+  mimeTypes: [ PLUGIN_MIME_TYPE1, PLUGIN_MIME_TYPE2 ],
+
+  getMimeTypes: function(count) {
+    count.value = this.mimeTypes.length;
+    return this.mimeTypes;
+  }
+};
+
+// A container for the plugins handled by the fake plugin host.
+let gInstalledPlugins = [
+  new PluginTag("Java", "A mock Java plugin", "1.0", false /* Disabled */),
+  new PluginTag(FLASH_PLUGIN_NAME, FLASH_PLUGIN_DESC, FLASH_PLUGIN_VERSION, true),
+];
+
+// A fake plugin host for testing plugin telemetry environment.
+let PluginHost = {
+  getPluginTags: function(countRef) {
+    countRef.value = gInstalledPlugins.length;
+    return gInstalledPlugins;
+  },
+
+  QueryInterface: function(iid) {
+    if (iid.equals(Ci.nsIPluginHost)
+     || iid.equals(Ci.nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  }
+}
+
+let PluginHostFactory = {
+  createInstance: function (outer, iid) {
+    if (outer != null)
+      throw Components.results.NS_ERROR_NO_AGGREGATION;
+    return PluginHost.QueryInterface(iid);
+  }
+};
+
+function registerFakePluginHost() {
+  let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+  registrar.registerFactory(PLUGINHOST_CID, "Fake Plugin Host",
+                            PLUGINHOST_CONTRACTID, PluginHostFactory);
+}
+
+/**
+ * Used to spoof the Persona Id.
+ */
+function spoofTheme(aId, aName, aDesc) {
+  return {
+    id: aId,
+    name: aName,
+    description: aDesc,
+    headerURL: "http://lwttest.invalid/a.png",
+    footerURL: "http://lwttest.invalid/b.png",
+    textcolor: Math.random().toString(),
+    accentcolor: Math.random().toString()
+  };
+}
+
+function spoofGfxAdapter() {
+  try {
+    let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfoDebug);
+    gfxInfo.spoofVendorID(GFX_VENDOR_ID);
+    gfxInfo.spoofDeviceID(GFX_DEVICE_ID);
+  } catch (x) {
+    // If we can't test gfxInfo, that's fine, we'll note it later.
+  }
+}
+
+function spoofProfileReset() {
+  if (gIsAndroid) {
+    // ProfileTimesAccessor is not available on Android.
+    return true;
+  }
+
+  let profileAccessor = new ProfileTimesAccessor();
+
+  return profileAccessor.writeTimes({
+    created: PROFILE_CREATION_DATE_MS,
+    reset: PROFILE_RESET_DATE_MS
+  });
+}
+
+function spoofPartnerInfo() {
+  let prefsToSpoof = {};
+  prefsToSpoof["distribution.id"] = DISTRIBUTION_ID;
+  prefsToSpoof["distribution.version"] = DISTRIBUTION_VERSION;
+  prefsToSpoof["app.distributor"] = DISTRIBUTOR_NAME;
+  prefsToSpoof["app.distributor.channel"] = DISTRIBUTOR_CHANNEL;
+  prefsToSpoof["app.partner.test"] = PARTNER_NAME;
+  prefsToSpoof["mozilla.partner.id"] = PARTNER_ID;
+
+  // Spoof the preferences.
+  for (let pref in prefsToSpoof) {
+    Preferences.set(pref, prefsToSpoof[pref]);
+  }
+}
+
+function truncateToDays(aMsec) {
+  return Math.floor(aMsec / MILLISECONDS_PER_DAY);
+}
+
+/**
+ * Check that a value is a string and not empty.
+ *
+ * @param aValue The variable to check.
+ * @return True if |aValue| has type "string" and is not empty, False otherwise.
+ */
+function checkString(aValue) {
+  return (typeof aValue == "string") && (aValue != "");
+}
+
+/**
+ * If value is non-null, check if it's a valid string.
+ *
+ * @param aValue The variable to check.
+ * @return True if it's null or a valid string, false if it's non-null and an invalid
+ *         string.
+ */
+function checkNullOrString(aValue) {
+  if (aValue) {
+    return checkString(aValue);
+  } else if (aValue === null) {
+    return true;
+  }
+
+  return false;
+}
+
+/**
+ * If value is non-null, check if it's a boolean.
+ *
+ * @param aValue The variable to check.
+ * @return True if it's null or a valid boolean, false if it's non-null and an invalid
+ *         boolean.
+ */
+function checkNullOrBool(aValue) {
+  if (aValue) {
+    return (typeof aValue == "boolean");
+  } else if (aValue === null) {
+    return true;
+  }
+
+  return false;
+}
+
+function checkBuildSection(data) {
+  const expectedInfo = {
+    applicationId: APP_ID,
+    applicationName: APP_NAME,
+    buildId: "2007010101",
+    version: APP_VERSION,
+    vendor: "Mozilla",
+    platformVersion: PLATFORM_VERSION,
+    xpcomAbi: "noarch-spidermonkey",
+  };
+
+  Assert.ok("build" in data, "There must be a build section in Environment.");
+
+  for (let f in expectedInfo) {
+    Assert.ok(checkString(data.build[f]), f + " must be a valid string.");
+    Assert.equal(data.build[f], expectedInfo[f], f + " must have the correct value.");
+  }
+
+  // Make sure architecture and hotfixVersion are in the environment.
+  Assert.ok(checkString(data.build.architecture));
+  Assert.ok(checkString(data.build.hotfixVersion));
+  Assert.equal(data.build.hotfixVersion, APP_HOTFIX_VERSION);
+
+  if (gIsMac) {
+    let macUtils = Cc["@mozilla.org/xpcom/mac-utils;1"].getService(Ci.nsIMacUtils);
+    if (macUtils && macUtils.isUniversalBinary) {
+      Assert.ok(checkString(data.build.architecturesInBinary));
+    }
+  }
+}
+
+function checkSettingsSection(data) {
+  const EXPECTED_FIELDS_TYPES = {
+    blocklistEnabled: "boolean",
+    e10sEnabled: "boolean",
+    telemetryEnabled: "boolean",
+    locale: "string",
+    update: "object",
+    userPrefs: "object",
+  };
+
+  Assert.ok("settings" in data, "There must be a settings section in Environment.");
+
+  for (let f in EXPECTED_FIELDS_TYPES) {
+    Assert.equal(typeof data.settings[f], EXPECTED_FIELDS_TYPES[f],
+                 f + " must have the correct type.");
+  }
+
+  // Check "isDefaultBrowser" separately, as it is not available on Android an can either be
+  // null or boolean on other platforms.
+  if (gIsAndroid) {
+    Assert.ok(!("isDefaultBrowser" in data.settings), "Must not be available on Android.");
+  } else {
+    Assert.ok(checkNullOrBool(data.settings.isDefaultBrowser));
+  }
+
+  // Check "channel" separately, as it can either be null or string.
+  let update = data.settings.update;
+  Assert.ok(checkNullOrString(update.channel));
+  Assert.equal(typeof update.enabled, "boolean");
+  Assert.equal(typeof update.autoDownload, "boolean");
+}
+
+function checkProfileSection(data) {
+  if (gIsAndroid) {
+    Assert.ok(!("profile" in data),
+              "There must be no profile section in Environment on Android.");
+    return;
+  }
+
+  Assert.ok("profile" in data, "There must be a profile section in Environment.");
+  Assert.equal(data.profile.creationDate, truncateToDays(PROFILE_CREATION_DATE_MS));
+  Assert.equal(data.profile.resetDate, truncateToDays(PROFILE_RESET_DATE_MS));
+}
+
+function checkPartnerSection(data) {
+  const EXPECTED_FIELDS = {
+    distributionId: DISTRIBUTION_ID,
+    distributionVersion: DISTRIBUTION_VERSION,
+    partnerId: PARTNER_ID,
+    distributor: DISTRIBUTOR_NAME,
+    distributorChannel: DISTRIBUTOR_CHANNEL,
+  };
+
+  Assert.ok("partner" in data, "There must be a partner section in Environment.");
+
+  for (let f in EXPECTED_FIELDS) {
+    Assert.equal(data.partner[f], EXPECTED_FIELDS[f], f + " must have the correct value.");
+  }
+
+  // Check that "partnerNames" exists and contains the correct element.
+  Assert.ok(Array.isArray(data.partner.partnerNames));
+  Assert.ok(data.partner.partnerNames.indexOf(PARTNER_NAME) >= 0);
+}
+
+function checkGfxAdapter(data) {
+  const EXPECTED_ADAPTER_FIELDS_TYPES = {
+    description: "string",
+    vendorID: "string",
+    deviceID: "string",
+    subsysID: "string",
+    RAM: "number",
+    driver: "string",
+    driverVersion: "string",
+    driverDate: "string",
+    GPUActive: "boolean",
+  };
+
+  for (let f in EXPECTED_ADAPTER_FIELDS_TYPES) {
+    Assert.ok(f in data, f + " must be available.");
+
+    if (data[f]) {
+      // Since we have a non-null value, check if it has the correct type.
+      Assert.equal(typeof data[f], EXPECTED_ADAPTER_FIELDS_TYPES[f],
+                   f + " must have the correct type.");
+    }
+  }
+}
+
+function checkSystemSection(data) {
+  const EXPECTED_FIELDS = [ "memoryMB", "cpu", "os", "hdd", "gfx" ];
+  const EXPECTED_HDD_FIELDS = [ "profile", "binary", "system" ];
+
+  Assert.ok("system" in data, "There must be a system section in Environment.");
+
+  // Make sure we have all the top level sections and fields.
+  for (let f of EXPECTED_FIELDS) {
+    Assert.ok(f in data.system, f + " must be available.");
+  }
+
+  Assert.ok(Number.isFinite(data.system.memoryMB), "MemoryMB must be a number.");
+  if (gIsWindows) {
+    Assert.equal(typeof data.system.isWow64, "boolean",
+              "isWow64 must be available on Windows and have the correct type.");
+  }
+
+  let cpuData = data.system.cpu;
+  Assert.ok(Number.isFinite(cpuData.count), "CPU count must be a number.");
+  Assert.ok(Array.isArray(cpuData.extensions), "CPU extensions must be available.");
+
+  // Device data is only available on Android or Gonk.
+  if (gIsAndroid || gIsGonk) {
+    let deviceData = data.system.device;
+    Assert.ok(checkNullOrString(deviceData.model));
+    Assert.ok(checkNullOrString(deviceData.manufacturer));
+    Assert.ok(checkNullOrString(deviceData.hardware));
+    Assert.ok(checkNullOrBool(deviceData.isTablet));
+  }
+
+  let osData = data.system.os;
+  Assert.ok(checkNullOrString(osData.name));
+  Assert.ok(checkNullOrString(osData.version));
+  Assert.ok(checkNullOrString(osData.locale));
+
+  // Service pack is only available on Windows.
+  if (gIsWindows) {
+    Assert.ok(Number.isFinite(osData["servicePackMajor"]),
+              "ServicePackMajor must be a number.");
+    Assert.ok(Number.isFinite(osData["servicePackMinor"]),
+              "ServicePackMinor must be a number.");
+  } else if (gIsAndroid || gIsGonk) {
+    Assert.ok(checkNullOrString(osData.kernelVersion));
+  }
+
+  let check = gIsWindows ? checkString : checkNullOrString;
+  for (let disk of EXPECTED_HDD_FIELDS) {
+    Assert.ok(check(data.system.hdd[disk].model));
+    Assert.ok(check(data.system.hdd[disk].revision));
+  }
+
+  let gfxData = data.system.gfx;
+  Assert.ok("D2DEnabled" in gfxData);
+  Assert.ok("DWriteEnabled" in gfxData);
+  Assert.ok("DWriteVersion" in gfxData);
+  if (gIsWindows) {
+    Assert.equal(typeof gfxData.D2DEnabled, "boolean");
+    Assert.equal(typeof gfxData.DWriteEnabled, "boolean");
+    Assert.ok(checkString(gfxData.DWriteVersion));
+  }
+
+  Assert.ok("adapters" in gfxData);
+  Assert.ok(gfxData.adapters.length > 0, "There must be at least one GFX adapter.");
+  for (let adapter of gfxData.adapters) {
+    checkGfxAdapter(adapter);
+  }
+  Assert.equal(typeof gfxData.adapters[0].GPUActive, "boolean");
+  Assert.ok(gfxData.adapters[0].GPUActive, "The first GFX adapter must be active.");
+
+  try {
+    // If we've not got nsIGfxInfoDebug, then this will throw and stop us doing
+    // this test.
+    let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfoDebug);
+
+    if (gIsWindows || gIsMac) {
+      Assert.equal(GFX_VENDOR_ID, gfxData.adapters[0].vendorID);
+      Assert.equal(GFX_DEVICE_ID, gfxData.adapters[0].deviceID);
+    }
+  }
+  catch (e) {}
+}
+
+function checkActiveAddon(data){
+  const EXPECTED_ADDON_FIELDS_TYPES = {
+    blocklisted: "boolean",
+    name: "string",
+    userDisabled: "boolean",
+    appDisabled: "boolean",
+    version: "string",
+    scope: "number",
+    type: "string",
+    foreignInstall: "boolean",
+    hasBinaryComponents: "boolean",
+    installDay: "number",
+    updateDay: "number",
+  };
+
+  for (let f in EXPECTED_ADDON_FIELDS_TYPES) {
+    Assert.ok(f in data, f + " must be available.");
+    Assert.equal(typeof data[f], EXPECTED_ADDON_FIELDS_TYPES[f],
+                 f + " must have the correct type.");
+  }
+
+  // We check "description" separately, as it can be null.
+  Assert.ok(checkNullOrString(data.description));
+}
+
+function checkPlugin(data) {
+  const EXPECTED_PLUGIN_FIELDS_TYPES = {
+    name: "string",
+    version: "string",
+    description: "string",
+    blocklisted: "boolean",
+    disabled: "boolean",
+    clicktoplay: "boolean",
+    updateDay: "number",
+  };
+
+  for (let f in EXPECTED_PLUGIN_FIELDS_TYPES) {
+    Assert.ok(f in data, f + " must be available.");
+    Assert.equal(typeof data[f], EXPECTED_PLUGIN_FIELDS_TYPES[f],
+                 f + " must have the correct type.");
+  }
+
+  Assert.ok(Array.isArray(data.mimeTypes));
+  for (let type of data.mimeTypes) {
+    Assert.ok(checkString(type));
+  }
+}
+
+function checkTheme(data) {
+  // "hasBinaryComponents" is not available when testing.
+  const EXPECTED_THEME_FIELDS_TYPES = {
+    id: "string",
+    blocklisted: "boolean",
+    name: "string",
+    userDisabled: "boolean",
+    appDisabled: "boolean",
+    version: "string",
+    scope: "number",
+    foreignInstall: "boolean",
+    installDay: "number",
+    updateDay: "number",
+  };
+
+  for (let f in EXPECTED_THEME_FIELDS_TYPES) {
+    Assert.ok(f in data, f + " must be available.");
+    Assert.equal(typeof data[f], EXPECTED_THEME_FIELDS_TYPES[f],
+                 f + " must have the correct type.");
+  }
+
+  // We check "description" separately, as it can be null.
+  Assert.ok(checkNullOrString(data.description));
+}
+
+function checkActiveGMPlugin(data) {
+  Assert.equal(typeof data.version, "string");
+  Assert.equal(typeof data.userDisabled, "boolean");
+  Assert.equal(typeof data.applyBackgroundUpdates, "boolean");
+}
+
+function checkAddonsSection(data) {
+  const EXPECTED_FIELDS = [
+    "activeAddons", "theme", "activePlugins", "activeGMPlugins", "activeExperiment",
+    "persona",
+  ];
+
+  Assert.ok("addons" in data, "There must be an addons section in Environment.");
+  for (let f of EXPECTED_FIELDS) {
+    Assert.ok(f in data.addons, f + " must be available.");
+  }
+
+  // Check the active addons, if available.
+  let activeAddons = data.addons.activeAddons;
+  for (let addon in activeAddons) {
+    checkActiveAddon(activeAddons[addon]);
+  }
+
+  // Check "theme" structure.
+  if (Object.keys(data.addons.theme).length !== 0) {
+    checkTheme(data.addons.theme);
+  }
+
+  // Check the active plugins.
+  Assert.ok(Array.isArray(data.addons.activePlugins));
+  for (let plugin of data.addons.activePlugins) {
+    checkPlugin(plugin);
+  }
+
+  // Check active GMPlugins
+  let activeGMPlugins = data.addons.activeGMPlugins;
+  if (!gIsAndroid) {
+    // We don't check for data validity on Android here since XPCSHELL tests on Android
+    // report one valid (plugin.isValid == true) GMPlugin with a "null" version field.
+    for (let gmPlugin in activeGMPlugins) {
+      checkActiveGMPlugin(activeGMPlugins[gmPlugin]);
+    }
+  }
+
+  // Check the active Experiment
+  let experiment = data.addons.activeExperiment;
+  if (Object.keys(experiment).length !== 0) {
+    Assert.ok(checkString(experiment.id));
+    Assert.ok(checkString(experiment.branch));
+  }
+
+  // Check persona
+  Assert.ok(checkNullOrString(data.addons.persona));
+}
+
+function checkEnvironmentData(data) {
+  checkBuildSection(data);
+  checkSettingsSection(data);
+  checkProfileSection(data);
+  checkPartnerSection(data);
+  checkSystemSection(data);
+  checkAddonsSection(data);
+}
+
+function run_test() {
+  do_test_pending();
+  spoofGfxAdapter();
+  do_get_profile();
+  loadAddonManager(APP_ID, APP_NAME, APP_VERSION, PLATFORM_VERSION);
+
+  // Spoof the persona ID, but not on Gonk.
+  if (!gIsGonk) {
+    LightweightThemeManager.currentTheme =
+      spoofTheme(PERSONA_ID, PERSONA_NAME, PERSONA_DESCRIPTION);
+  }
+  // Register a fake plugin host for consistent flash version data.
+  registerFakePluginHost();
+
+  // Setup a webserver to serve Addons, Plugins, etc.
+  gHttpServer = new HttpServer();
+  gHttpServer.start(-1);
+  let port = gHttpServer.identity.primaryPort;
+  gHttpRoot = "http://localhost:" + port + "/";
+  gDataRoot = gHttpRoot + "data/";
+  gHttpServer.registerDirectory("/data/", do_get_cwd());
+  do_register_cleanup(() => gHttpServer.stop(() => {}));
+
+  spoofPartnerInfo();
+  // Spoof the the hotfixVersion
+  Preferences.set("extensions.hotfix.lastVersion", APP_HOTFIX_VERSION);
+
+  run_next_test();
+}
+
+function isRejected(promise) {
+  return new Promise((resolve, reject) => {
+    promise.then(() => resolve(false), () => resolve(true));
+  });
+}
+
+add_task(function* asyncSetup() {
+  yield spoofProfileReset();
+});
+
+add_task(function* test_initAndShutdown() {
+  // Check that init and shutdown work properly.
+  TelemetryEnvironment.init();
+  yield TelemetryEnvironment.shutdown();
+  TelemetryEnvironment.init();
+  yield TelemetryEnvironment.shutdown();
+
+  // A double init should be silently handled.
+  TelemetryEnvironment.init();
+  TelemetryEnvironment.init();
+
+  // getEnvironmentData should return a sane result.
+  let data = yield TelemetryEnvironment.getEnvironmentData();
+  Assert.ok(!!data);
+
+  // The change listener registration should silently fail after shutdown.
+  yield TelemetryEnvironment.shutdown();
+  TelemetryEnvironment.registerChangeListener("foo", () => {});
+  TelemetryEnvironment.unregisterChangeListener("foo");
+
+  // Shutting down again should be ignored.
+  yield TelemetryEnvironment.shutdown();
+
+  // Getting the environment data should reject after shutdown.
+  Assert.ok(yield isRejected(TelemetryEnvironment.getEnvironmentData()));
+});
+
+add_task(function* test_changeNotify() {
+  TelemetryEnvironment.init();
+
+  // Register some listeners
+  let results = new Array(4).fill(false);
+  for (let i=0; i<results.length; ++i) {
+    let k = i;
+    TelemetryEnvironment.registerChangeListener("test"+k, () => results[k] = true);
+  }
+  // Trigger environment change notifications.
+  // TODO: test with proper environment changes, not directly.
+  TelemetryEnvironment._onEnvironmentChange("foo");
+  Assert.ok(results.every(val => val), "All change listeners should have been notified.");
+  results.fill(false);
+  TelemetryEnvironment._onEnvironmentChange("bar");
+  Assert.ok(results.every(val => val), "All change listeners should have been notified.");
+
+  // Unregister listeners
+  for (let i=0; i<4; ++i) {
+    TelemetryEnvironment.unregisterChangeListener("test"+i);
+  }
+});
+
+add_task(function* test_checkEnvironment() {
+  yield TelemetryEnvironment.init();
+  let environmentData = yield TelemetryEnvironment.getEnvironmentData();
+
+  checkEnvironmentData(environmentData);
+
+  yield TelemetryEnvironment.shutdown();
+});
+
+add_task(function* test_prefWatchPolicies() {
+  const PREF_TEST_1 = "toolkit.telemetry.test.pref_new";
+  const PREF_TEST_2 = "toolkit.telemetry.test.pref1";
+  const PREF_TEST_3 = "toolkit.telemetry.test.pref2";
+
+  const expectedValue = "some-test-value";
+
+  let prefsToWatch = {};
+  prefsToWatch[PREF_TEST_1] = TelemetryEnvironment.RECORD_PREF_VALUE;
+  prefsToWatch[PREF_TEST_2] = TelemetryEnvironment.RECORD_PREF_STATE;
+  prefsToWatch[PREF_TEST_3] = TelemetryEnvironment.RECORD_PREF_STATE;
+
+  yield TelemetryEnvironment.init();
+
+  // Set the Environment preferences to watch.
+  TelemetryEnvironment._watchPreferences(prefsToWatch);
+  let deferred = PromiseUtils.defer();
+  TelemetryEnvironment.registerChangeListener("testWatchPrefs", deferred.resolve);
+
+  // Trigger a change in the watched preferences.
+  Preferences.set(PREF_TEST_1, expectedValue);
+  Preferences.set(PREF_TEST_2, false);
+  yield deferred.promise;
+
+  // Unregister the listener.
+  TelemetryEnvironment.unregisterChangeListener("testWatchPrefs");
+
+  // Check environment contains the correct data.
+  let environmentData = yield TelemetryEnvironment.getEnvironmentData();
+
+  let userPrefs = environmentData.settings.userPrefs;
+
+  Assert.equal(userPrefs[PREF_TEST_1], expectedValue,
+               "Environment contains the correct preference value.");
+  Assert.equal(userPrefs[PREF_TEST_2], null,
+               "Report that the pref was user set and has no value.");
+  Assert.ok(!(PREF_TEST_3 in userPrefs),
+            "Do not report if preference not user set.");
+
+  yield TelemetryEnvironment.shutdown();
+});
+
+add_task(function* test_prefWatch_prefReset() {
+  const PREF_TEST = "toolkit.telemetry.test.pref1";
+
+  let prefsToWatch = {};
+  prefsToWatch[PREF_TEST] = TelemetryEnvironment.RECORD_PREF_STATE;
+  // Set the preference to a non-default value.
+  Preferences.set(PREF_TEST, false);
+
+  yield TelemetryEnvironment.init();
+
+  // Set the Environment preferences to watch.
+  TelemetryEnvironment._watchPreferences(prefsToWatch);
+  let deferred = PromiseUtils.defer();
+  TelemetryEnvironment.registerChangeListener("testWatchPrefs_reset", deferred.resolve);
+
+  // Trigger a change in the watched preferences.
+  Preferences.reset(PREF_TEST);
+  yield deferred.promise;
+
+  // Unregister the listener.
+  TelemetryEnvironment.unregisterChangeListener("testWatchPrefs_reset");
+  yield TelemetryEnvironment.shutdown();
+});
+
+add_task(function* test_addonsWatch_InterestingChange() {
+  const ADDON_INSTALL_URL = gDataRoot + "restartless.xpi";
+  const ADDON_ID = "tel-restartless-xpi@tests.mozilla.org";
+  // We only expect a single notification for each install, uninstall, enable, disable.
+  const EXPECTED_NOTIFICATIONS = 4;
+
+  yield TelemetryEnvironment.init();
+  let deferred = PromiseUtils.defer();
+  let receivedNotifications = 0;
+
+  let registerCheckpointPromise = (aExpected) => {
+    return new Promise(resolve => TelemetryEnvironment.registerChangeListener(
+      "testWatchAddons_Changes" + aExpected, () => {
+        receivedNotifications++;
+        resolve();
+      }));
+  };
+
+  let assertCheckpoint = (aExpected) => {
+    Assert.equal(receivedNotifications, aExpected);
+    TelemetryEnvironment.unregisterChangeListener("testWatchAddons_Changes" + aExpected);
+  };
+
+  // Test for receiving one notification after each change.
+  let checkpointPromise = registerCheckpointPromise(1);
+  yield AddonTestUtils.installXPIFromURL(ADDON_INSTALL_URL);
+  yield checkpointPromise;
+  assertCheckpoint(1);
+  
+  checkpointPromise = registerCheckpointPromise(2);
+  let addon = yield AddonTestUtils.getAddonById(ADDON_ID);
+  addon.userDisabled = true;
+  yield checkpointPromise;
+  assertCheckpoint(2);
+
+  checkpointPromise = registerCheckpointPromise(3);
+  addon.userDisabled = false;
+  yield checkpointPromise;
+  assertCheckpoint(3);
+
+  checkpointPromise = registerCheckpointPromise(4);
+  yield AddonTestUtils.uninstallAddonByID(ADDON_ID);
+  yield checkpointPromise;
+  assertCheckpoint(4);
+
+  yield TelemetryEnvironment.shutdown();
+
+  Assert.equal(receivedNotifications, EXPECTED_NOTIFICATIONS,
+               "We must only receive the notifications we expect.");
+});
+
+add_task(function* test_pluginsWatch_Add() {
+  if (gIsAndroid) {
+    Assert.ok(true, "Skipping: there is no Plugin Manager on Android.");
+    return;
+  }
+
+  yield TelemetryEnvironment.init();
+
+  let newPlugin = new PluginTag(PLUGIN2_NAME, PLUGIN2_DESC, PLUGIN2_VERSION, true);
+  gInstalledPlugins.push(newPlugin);
+
+  let deferred = PromiseUtils.defer();
+  let receivedNotifications = 0;
+  let callback = () => {
+    receivedNotifications++;
+    deferred.resolve();
+  };
+  TelemetryEnvironment.registerChangeListener("testWatchPlugins_Add", callback);
+
+  Services.obs.notifyObservers(null, PLUGIN_UPDATED_TOPIC, null);
+  yield deferred.promise;
+
+  TelemetryEnvironment.unregisterChangeListener("testWatchPlugins_Add");
+  yield TelemetryEnvironment.shutdown();
+
+  Assert.equal(receivedNotifications, 1, "We must only receive one notification.");
+});
+
+add_task(function* test_pluginsWatch_Remove() {
+  if (gIsAndroid) {
+    Assert.ok(true, "Skipping: there is no Plugin Manager on Android.");
+    return;
+  }
+
+  yield TelemetryEnvironment.init();
+
+  // Find the test plugin.
+  let plugin = gInstalledPlugins.find(plugin => (plugin.name == PLUGIN2_NAME));
+  Assert.ok(plugin, "The test plugin must exist.");
+
+  // Remove it from the PluginHost.
+  gInstalledPlugins = gInstalledPlugins.filter(p => p != plugin);
+
+  let deferred = PromiseUtils.defer();
+  let receivedNotifications = 0;
+  let callback = () => {
+    receivedNotifications++;
+    deferred.resolve();
+  };
+  TelemetryEnvironment.registerChangeListener("testWatchPlugins_Remove", callback);
+
+  Services.obs.notifyObservers(null, PLUGIN_UPDATED_TOPIC, null);
+  yield deferred.promise;
+
+  TelemetryEnvironment.unregisterChangeListener("testWatchPlugins_Remove");
+  yield TelemetryEnvironment.shutdown();
+
+  Assert.equal(receivedNotifications, 1, "We must only receive one notification.");
+});
+
+add_task(function* test_addonsWatch_NotInterestingChange() {
+  // We are not interested to dictionary addons changes.
+  const DICTIONARY_ADDON_INSTALL_URL = gDataRoot + "dictionary.xpi";
+  const INTERESTING_ADDON_INSTALL_URL = gDataRoot + "restartless.xpi";
+  yield TelemetryEnvironment.init();
+
+  let receivedNotifications = 0;
+  TelemetryEnvironment.registerChangeListener("testNotInteresting",
+                                              () => receivedNotifications++);
+
+  yield AddonTestUtils.installXPIFromURL(DICTIONARY_ADDON_INSTALL_URL);
+  yield AddonTestUtils.installXPIFromURL(INTERESTING_ADDON_INSTALL_URL);
+
+  Assert.equal(receivedNotifications, 1, "We must receive only one notification.");
+
+  TelemetryEnvironment.unregisterChangeListener("testNotInteresting");
+  yield TelemetryEnvironment.shutdown();
+});
+
+add_task(function* test_addonsAndPlugins() {
+  const ADDON_INSTALL_URL = gDataRoot + "restartless.xpi";
+  const ADDON_ID = "tel-restartless-xpi@tests.mozilla.org";
+  const ADDON_INSTALL_DATE = truncateToDays(Date.now());
+  const EXPECTED_ADDON_DATA = {
+    blocklisted: false,
+    description: "A restartless addon which gets enabled without a reboot.",
+    name: "XPI Telemetry Restartless Test",
+    userDisabled: false,
+    appDisabled: false,
+    version: "1.0",
+    scope: 1,
+    type: "extension",
+    foreignInstall: false,
+    hasBinaryComponents: false,
+    installDay: ADDON_INSTALL_DATE,
+    updateDay: ADDON_INSTALL_DATE,
+  };
+
+  const EXPECTED_PLUGIN_DATA = {
+    name: FLASH_PLUGIN_NAME,
+    version: FLASH_PLUGIN_VERSION,
+    description: FLASH_PLUGIN_DESC,
+    blocklisted: false,
+    disabled: false,
+    clicktoplay: true,
+  };
+
+  yield TelemetryEnvironment.init();
+
+  // Install an addon so we have some data.
+  yield AddonTestUtils.installXPIFromURL(ADDON_INSTALL_URL);
+
+  let data = yield TelemetryEnvironment.getEnvironmentData();
+  checkEnvironmentData(data);
+
+  // Check addon data.
+  Assert.ok(ADDON_ID in data.addons.activeAddons, "We must have one active addon.");
+  let targetAddon = data.addons.activeAddons[ADDON_ID];
+  for (let f in EXPECTED_ADDON_DATA) {
+    Assert.equal(targetAddon[f], EXPECTED_ADDON_DATA[f], f + " must have the correct value.");
+  }
+
+  // Check theme data.
+  let theme = data.addons.theme;
+  Assert.equal(theme.id, (PERSONA_ID + PERSONA_ID_SUFFIX));
+  Assert.equal(theme.name, PERSONA_NAME);
+  Assert.equal(theme.description, PERSONA_DESCRIPTION);
+
+  // Check plugin data.
+  Assert.equal(data.addons.activePlugins.length, 1, "We must have only one active plugin.");
+  let targetPlugin = data.addons.activePlugins[0];
+  for (let f in EXPECTED_PLUGIN_DATA) {
+    Assert.equal(targetPlugin[f], EXPECTED_PLUGIN_DATA[f], f + " must have the correct value.");
+  }
+
+  // Check plugin mime types.
+  Assert.ok(targetPlugin.mimeTypes.find(m => m == PLUGIN_MIME_TYPE1));
+  Assert.ok(targetPlugin.mimeTypes.find(m => m == PLUGIN_MIME_TYPE2));
+  Assert.ok(!targetPlugin.mimeTypes.find(m => m == "Not There."));
+
+  let personaId = (gIsGonk) ? null : PERSONA_ID;
+  Assert.equal(data.addons.persona, personaId, "The correct Persona Id must be reported.");
+
+  yield TelemetryEnvironment.shutdown();
+});
+
+add_task(function*() {
+  do_test_finished();
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPingBuildID.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPingBuildID.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPingBuildID.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPingBuildID.js	2015-02-28 15:03:07.000000000 +0000
@@ -62,7 +62,7 @@
   info.appBuildID = NEW_BUILD_ID;
   yield TelemetrySession.reset();
   let metadata = TelemetrySession.getMetadata();
-  do_check_eq(metadata.previousBuildID, oldBuildID);
+  do_check_eq(metadata.previousBuildId, oldBuildID);
   let buildIDPref = Services.prefs.getCharPref(TelemetrySession.Constants.PREF_PREVIOUS_BUILDID);
   do_check_eq(NEW_BUILD_ID, buildIDPref);
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js	2015-02-28 15:03:07.000000000 +0000
@@ -15,34 +15,20 @@
 
 Cu.import("resource://testing-common/httpd.js", this);
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/LightweightThemeManager.jsm", this);
 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/Task.jsm", this);
 Cu.import("resource://gre/modules/Promise.jsm", this);
 Cu.import("resource://gre/modules/Preferences.jsm");
-Cu.import("resource://gre/modules/osfile.jsm", this);
 
-const IGNORE_HISTOGRAM = "test::ignore_me";
-const IGNORE_HISTOGRAM_TO_CLONE = "MEMORY_HEAP_ALLOCATED";
-const IGNORE_CLONED_HISTOGRAM = "test::ignore_me_also";
-const ADDON_NAME = "Telemetry test addon";
-const ADDON_HISTOGRAM = "addon-histogram";
-// Add some unicode characters here to ensure that sending them works correctly.
-const FLASH_VERSION = "\u201c1.1.1.1\u201d";
-const SHUTDOWN_TIME = 10000;
-const FAILED_PROFILE_LOCK_ATTEMPTS = 2;
-
-// Constants from prio.h for nsIFileOutputStream.init
-const PR_WRONLY = 0x2;
-const PR_CREATE_FILE = 0x8;
-const PR_TRUNCATE = 0x20;
-const RW_OWNER = 0600;
-
-const NUMBER_OF_THREADS_TO_LAUNCH = 30;
-let gNumberOfThreadsLaunched = 0;
+const PING_FORMAT_VERSION = 4;
+const TEST_PING_TYPE = "test-ping-type";
+const TEST_PING_RETENTION = 180;
+
+const PLATFORM_VERSION = "1.9.2";
+const APP_VERSION = "1";
+const APP_NAME = "XPCShell";
 
 const PREF_BRANCH = "toolkit.telemetry.";
 const PREF_ENABLED = PREF_BRANCH + "enabled";
@@ -50,8 +36,6 @@
 const PREF_FHR_SERVICE_ENABLED = "datareporting.healthreport.service.enabled";
 
 const HAS_DATAREPORTINGSERVICE = "@mozilla.org/datareporting/service;1" in Cc;
-const SESSION_RECORDER_EXPECTED = HAS_DATAREPORTINGSERVICE &&
-                                  Preferences.get(PREF_FHR_SERVICE_ENABLED, true);
 
 const Telemetry = Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
 
@@ -65,15 +49,19 @@
           .getService(Ci.nsISupports)
           .wrappedJSObject);
 
-function sendPing () {
-  TelemetrySession.gatherStartup();
+function sendPing(aSendClientId, aSendEnvironment) {
   if (gServerStarted) {
     TelemetryPing.setServer("http://localhost:" + gHttpServer.identity.primaryPort);
-    return TelemetrySession.testPing();
   } else {
     TelemetryPing.setServer("http://doesnotexist");
-    return TelemetrySession.testPing();
   }
+
+  let options = {
+    addClientId: aSendClientId,
+    addEnvironment: aSendEnvironment,
+    retentionDays: TEST_PING_RETENTION,
+  };
+  return TelemetryPing.send(TEST_PING_TYPE, {}, options);
 }
 
 function wrapWithExceptionHandler(f) {
@@ -94,40 +82,6 @@
 				   wrapWithExceptionHandler(handler));
 }
 
-function setupTestData() {
-  Telemetry.newHistogram(IGNORE_HISTOGRAM, "never", Telemetry.HISTOGRAM_BOOLEAN);
-  Telemetry.histogramFrom(IGNORE_CLONED_HISTOGRAM, IGNORE_HISTOGRAM_TO_CLONE);
-  Services.startup.interrupted = true;
-  Telemetry.registerAddonHistogram(ADDON_NAME, ADDON_HISTOGRAM,
-                                   Telemetry.HISTOGRAM_LINEAR,
-                                   1, 5, 6);
-  let h1 = Telemetry.getAddonHistogram(ADDON_NAME, ADDON_HISTOGRAM);
-  h1.add(1);
-  let h2 = Telemetry.getHistogramById("TELEMETRY_TEST_COUNT");
-  h2.add();
-
-  let k1 = Telemetry.getKeyedHistogramById("TELEMETRY_TEST_KEYED_COUNT");
-  k1.add("a");
-  k1.add("a");
-  k1.add("b");
-}
-
-function getSavedHistogramsFile(basename) {
-  let tmpDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
-  let histogramsFile = tmpDir.clone();
-  histogramsFile.append(basename);
-  if (histogramsFile.exists()) {
-    histogramsFile.remove(true);
-  }
-  do_register_cleanup(function () {
-    try {
-      histogramsFile.remove(true);
-    } catch (e) {
-    }
-  });
-  return histogramsFile;
-}
-
 function decodeRequestPayload(request) {
   let s = request.bodyInputStream;
   let payload = null;
@@ -164,288 +118,61 @@
   return payload;
 }
 
-function checkPayloadInfo(payload, reason) {
-  // get rid of the non-deterministic field
-  const expected_info = {
-    OS: "XPCShell", 
-    appID: "xpcshell@tests.mozilla.org", 
-    appVersion: "1", 
-    appName: "XPCShell", 
-    appBuildID: "2007010101",
-    platformBuildID: "2007010101",
-    flashVersion: FLASH_VERSION
+function checkPingFormat(aPing, aType, aHasClientId, aHasEnvironment) {
+  const MANDATORY_PING_FIELDS = [
+    "type", "id", "creationDate", "version", "application", "payload"
+  ];
+
+  const APPLICATION_TEST_DATA = {
+    buildId: "2007010101",
+    name: APP_NAME,
+    version: APP_VERSION,
+    vendor: "Mozilla",
+    platformVersion: PLATFORM_VERSION,
+    xpcomAbi: "noarch-spidermonkey",
   };
 
-  for (let f in expected_info) {
-    do_check_eq(payload.info[f], expected_info[f]);
+  // Check that the ping contains all the mandatory fields.
+  for (let f of MANDATORY_PING_FIELDS) {
+    Assert.ok(f in aPing, f + " must be available.");
   }
 
-  do_check_eq(payload.info.reason, reason);
-  do_check_true("appUpdateChannel" in payload.info);
-  do_check_true("locale" in payload.info);
-  do_check_true("revision" in payload.info);
-  if (Services.appinfo.isOfficial) {
-    do_check_true(payload.info.revision.startsWith("http"));
-  }
+  Assert.equal(aPing.type, aType, "The ping must have the correct type.");
+  Assert.equal(aPing.version, PING_FORMAT_VERSION, "The ping must have the correct version.");
 
-  if ("@mozilla.org/datareporting/service;1" in Cc &&
-      Services.prefs.getBoolPref(PREF_FHR_UPLOAD_ENABLED)) {
-    do_check_true("clientID" in payload);
-    do_check_neq(payload.clientID, null);
-    do_check_eq(payload.clientID, gDataReportingClientID);
-  }
-
-  try {
-    // If we've not got nsIGfxInfoDebug, then this will throw and stop us doing
-    // this test.
-    let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfoDebug);
-    let isWindows = ("@mozilla.org/windows-registry-key;1" in Components.classes);
-    let isOSX = ("nsILocalFileMac" in Components.interfaces);
-
-    if (isWindows || isOSX) {
-      do_check_true("adapterVendorID" in payload.info);
-      do_check_true("adapterDeviceID" in payload.info);
-      if (isWindows) {
-        do_check_true("adapterSubsysID" in payload.info);
-      }
-    }
-  }
-  catch (x) {
-  }
-}
-
-function checkPayload(request, payload, reason, successfulPings) {
-  // Take off ["","submit","telemetry"].
-  let pathComponents = request.path.split("/").slice(3);
-
-  checkPayloadInfo(payload, reason);
-  do_check_eq(reason, pathComponents[1]);
-  do_check_eq(request.getHeader("content-type"), "application/json; charset=UTF-8");
-  do_check_true(payload.simpleMeasurements.uptime >= 0);
-  do_check_true(payload.simpleMeasurements.startupInterrupted === 1);
-  do_check_eq(payload.simpleMeasurements.shutdownDuration, SHUTDOWN_TIME);
-  do_check_eq(payload.simpleMeasurements.savedPings, 1);
-  do_check_true("maximalNumberOfConcurrentThreads" in payload.simpleMeasurements);
-  do_check_true(payload.simpleMeasurements.maximalNumberOfConcurrentThreads >= gNumberOfThreadsLaunched);
-
-  let activeTicks = payload.simpleMeasurements.activeTicks;
-  do_check_true(SESSION_RECORDER_EXPECTED ? activeTicks >= 0 : activeTicks == -1);
-
-  do_check_eq(payload.simpleMeasurements.failedProfileLockCount,
-              FAILED_PROFILE_LOCK_ATTEMPTS);
-  let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);
-  let failedProfileLocksFile = profileDirectory.clone();
-  failedProfileLocksFile.append("Telemetry.FailedProfileLocks.txt");
-  do_check_true(!failedProfileLocksFile.exists());
-
-
-  let isWindows = ("@mozilla.org/windows-registry-key;1" in Components.classes);
-  if (isWindows) {
-    do_check_true(payload.simpleMeasurements.startupSessionRestoreReadBytes > 0);
-    do_check_true(payload.simpleMeasurements.startupSessionRestoreWriteBytes > 0);
-  }
-
-  const TELEMETRY_PING = "TELEMETRY_PING";
-  const TELEMETRY_SUCCESS = "TELEMETRY_SUCCESS";
-  const TELEMETRY_TEST_FLAG = "TELEMETRY_TEST_FLAG";
-  const TELEMETRY_TEST_COUNT = "TELEMETRY_TEST_COUNT";
-  const TELEMETRY_TEST_KEYED_FLAG = "TELEMETRY_TEST_KEYED_FLAG";
-  const TELEMETRY_TEST_KEYED_COUNT = "TELEMETRY_TEST_KEYED_COUNT";
-  const READ_SAVED_PING_SUCCESS = "READ_SAVED_PING_SUCCESS";
-
-  do_check_true(TELEMETRY_PING in payload.histograms);
-  do_check_true(READ_SAVED_PING_SUCCESS in payload.histograms);
-  do_check_true(TELEMETRY_TEST_FLAG in payload.histograms);
-  do_check_true(TELEMETRY_TEST_COUNT in payload.histograms);
-
-  let rh = Telemetry.registeredHistograms(Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, []);
-  for (let name of rh) {
-    if (/SQLITE/.test(name) && name in payload.histograms) {
-      do_check_true(("STARTUP_" + name) in payload.histograms); 
-    }
+  // Test the application section.
+  for (let f in APPLICATION_TEST_DATA) {
+    Assert.equal(aPing.application[f], APPLICATION_TEST_DATA[f],
+                 f + " must have the correct value.");
   }
-  do_check_false(IGNORE_HISTOGRAM in payload.histograms);
-  do_check_false(IGNORE_CLONED_HISTOGRAM in payload.histograms);
 
-  // Flag histograms should automagically spring to life.
-  const expected_flag = {
-    range: [1, 2],
-    bucket_count: 3,
-    histogram_type: 3,
-    values: {0:1, 1:0},
-    sum: 0,
-    sum_squares_lo: 0,
-    sum_squares_hi: 0
-  };
-  let flag = payload.histograms[TELEMETRY_TEST_FLAG];
-  do_check_eq(uneval(flag), uneval(expected_flag));
-
-  // We should have a test count.
-  const expected_count = {
-    range: [1, 2],
-    bucket_count: 3,
-    histogram_type: 4,
-    values: {0:1, 1:0},
-    sum: 1,
-    sum_squares_lo: 1,
-    sum_squares_hi: 0,
-  };
-  let count = payload.histograms[TELEMETRY_TEST_COUNT];
-  do_check_eq(uneval(count), uneval(expected_count));
-
-  // There should be one successful report from the previous telemetry ping.
-  const expected_tc = {
-    range: [1, 2],
-    bucket_count: 3,
-    histogram_type: 2,
-    values: {0:1, 1:successfulPings, 2:0},
-    sum: successfulPings,
-    sum_squares_lo: successfulPings,
-    sum_squares_hi: 0
-  };
-  let tc = payload.histograms[TELEMETRY_SUCCESS];
-  do_check_eq(uneval(tc), uneval(expected_tc));
-
-  let h = payload.histograms[READ_SAVED_PING_SUCCESS];
-  do_check_eq(h.values[0], 1);
-
-  // The ping should include data from memory reporters.  We can't check that
-  // this data is correct, because we can't control the values returned by the
-  // memory reporters.  But we can at least check that the data is there.
-  //
-  // It's important to check for the presence of reporters with a mix of units,
-  // because TelemetryPing has separate logic for each one.  But we can't
-  // currently check UNITS_COUNT_CUMULATIVE or UNITS_PERCENTAGE because
-  // Telemetry doesn't touch a memory reporter with these units that's
-  // available on all platforms.
-
-  do_check_true('MEMORY_JS_GC_HEAP' in payload.histograms); // UNITS_BYTES
-  do_check_true('MEMORY_JS_COMPARTMENTS_SYSTEM' in payload.histograms); // UNITS_COUNT
-
-  // We should have included addon histograms.
-  do_check_true("addonHistograms" in payload);
-  do_check_true(ADDON_NAME in payload.addonHistograms);
-  do_check_true(ADDON_HISTOGRAM in payload.addonHistograms[ADDON_NAME]);
-
-  do_check_true(("mainThread" in payload.slowSQL) &&
-                ("otherThreads" in payload.slowSQL));
-
-  // Check keyed histogram payload.
-
-  do_check_true("keyedHistograms" in payload);
-  let keyedHistograms = payload.keyedHistograms;
-  do_check_true(TELEMETRY_TEST_KEYED_FLAG in keyedHistograms);
-  do_check_true(TELEMETRY_TEST_KEYED_COUNT in keyedHistograms);
-
-  Assert.deepEqual({}, keyedHistograms[TELEMETRY_TEST_KEYED_FLAG]);
-
-  const expected_keyed_count = {
-    "a": {
-      range: [1, 2],
-      bucket_count: 3,
-      histogram_type: 4,
-      values: {0:2, 1:0},
-      sum: 2,
-      sum_squares_lo: 2,
-      sum_squares_hi: 0,
-    },
-    "b": {
-      range: [1, 2],
-      bucket_count: 3,
-      histogram_type: 4,
-      values: {0:1, 1:0},
-      sum: 1,
-      sum_squares_lo: 1,
-      sum_squares_hi: 0,
-    },
-  };
-  Assert.deepEqual(expected_keyed_count, keyedHistograms[TELEMETRY_TEST_KEYED_COUNT]);
-}
-
-function dummyTheme(id) {
-  return {
-    id: id,
-    name: Math.random().toString(),
-    headerURL: "http://lwttest.invalid/a.png",
-    footerURL: "http://lwttest.invalid/b.png",
-    textcolor: Math.random().toString(),
-    accentcolor: Math.random().toString()
-  };
-}
-
-// A fake plugin host for testing flash version telemetry
-let PluginHost = {
-  getPluginTags: function(countRef) {
-    let plugins = [{name: "Shockwave Flash", version: FLASH_VERSION}];
-    countRef.value = plugins.length;
-    return plugins;
-  },
-
-  QueryInterface: function(iid) {
-    if (iid.equals(Ci.nsIPluginHost)
-     || iid.equals(Ci.nsISupports))
-      return this;
-  
-    throw Components.results.NS_ERROR_NO_INTERFACE;
-  }
-}
-
-let PluginHostFactory = {
-  createInstance: function (outer, iid) {
-    if (outer != null)
-      throw Components.results.NS_ERROR_NO_AGGREGATION;
-    return PluginHost.QueryInterface(iid);
-  }
-};
-
-const PLUGINHOST_CONTRACTID = "@mozilla.org/plugin/host;1";
-const PLUGINHOST_CID = Components.ID("{2329e6ea-1f15-4cbe-9ded-6e98e842de0e}");
-
-function registerFakePluginHost() {
-  let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
-  registrar.registerFactory(PLUGINHOST_CID, "Fake Plugin Host",
-                            PLUGINHOST_CONTRACTID, PluginHostFactory);
-}
-
-function writeStringToFile(file, contents) {
-  let ostream = Cc["@mozilla.org/network/safe-file-output-stream;1"]
-                .createInstance(Ci.nsIFileOutputStream);
-  ostream.init(file, PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
-	       RW_OWNER, ostream.DEFER_OPEN);
-  ostream.write(contents, contents.length);
-  ostream.QueryInterface(Ci.nsISafeOutputStream).finish();
-  ostream.close();
-}
+  // We can't check the values for channel and architecture. Just make
+  // sure they are in.
+  Assert.ok("architecture" in aPing.application,
+            "The application section must have an architecture field.");
+  Assert.ok("channel" in aPing.application,
+            "The application section must have a channel field.");
 
-function write_fake_shutdown_file() {
-  let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);
-  let file = profileDirectory.clone();
-  file.append("Telemetry.ShutdownTime.txt");
-  let contents = "" + SHUTDOWN_TIME;
-  writeStringToFile(file, contents);
+  // Check the clientId and environment fields, as needed.
+  Assert.equal("clientId" in aPing, aHasClientId);
+  Assert.equal("environment" in aPing, aHasEnvironment);
 }
 
-function write_fake_failedprofilelocks_file() {
-  let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);
-  let file = profileDirectory.clone();
-  file.append("Telemetry.FailedProfileLocks.txt");
-  let contents = "" + FAILED_PROFILE_LOCK_ATTEMPTS;
-  writeStringToFile(file, contents);
+/**
+ * Start the webserver used in the tests.
+ */
+function startWebserver() {
+  gHttpServer.start(-1);
+  gServerStarted = true;
+  gRequestIterator = Iterator(new Request());
 }
 
 function run_test() {
   do_test_pending();
-  try {
-    let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfoDebug);
-    gfxInfo.spoofVendorID("0xabcd");
-    gfxInfo.spoofDeviceID("0x1234");
-  } catch (x) {
-    // If we can't test gfxInfo, that's fine, we'll note it later.
-  }
 
   // Addon manager needs a profile directory
   do_get_profile();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+  loadAddonManager("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
 
   Services.prefs.setBoolPref(PREF_ENABLED, true);
   Services.prefs.setBoolPref(PREF_FHR_UPLOAD_ENABLED, true);
@@ -457,68 +184,13 @@
     gDatareportingService.observe(null, "profile-after-change", null);
   }
 
-  // Make it look like we've previously failed to lock a profile a couple times.
-  write_fake_failedprofilelocks_file();
-
-  // Make it look like we've shutdown before.
-  write_fake_shutdown_file();
-
-  let currentMaxNumberOfThreads = Telemetry.maximalNumberOfConcurrentThreads;
-  do_check_true(currentMaxNumberOfThreads > 0);
-
-  // Try to augment the maximal number of threads currently launched
-  let threads = [];
-  try {
-    for (let i = 0; i < currentMaxNumberOfThreads + 10; ++i) {
-      threads.push(Services.tm.newThread(0));
-    }
-  } catch (ex) {
-    // If memory is too low, it is possible that not all threads will be launched.
-  }
-  gNumberOfThreadsLaunched = threads.length;
-
-  do_check_true(Telemetry.maximalNumberOfConcurrentThreads >= gNumberOfThreadsLaunched);
-
-  do_register_cleanup(function() {
-    threads.forEach(function(thread) {
-      thread.shutdown();
-    });
-  });
-
-  Telemetry.asyncFetchTelemetryData(wrapWithExceptionHandler(actualTest));
-}
-
-function actualTest() {
-  // try to make LightweightThemeManager do stuff
-  let gInternalManager = Cc["@mozilla.org/addons/integration;1"]
-                         .getService(Ci.nsIObserver)
-                         .QueryInterface(Ci.nsITimerCallback);
-
-  gInternalManager.observe(null, "addons-startup", null);
-  LightweightThemeManager.currentTheme = dummyTheme("1234");
-
-  // fake plugin host for consistent flash version data
-  registerFakePluginHost();
-
-  run_next_test();
+  Telemetry.asyncFetchTelemetryData(wrapWithExceptionHandler(run_next_test));
 }
 
 add_task(function* asyncSetup() {
-  yield TelemetrySession.setup();
   yield TelemetryPing.setup();
 
   if (HAS_DATAREPORTINGSERVICE) {
-    // force getSessionRecorder()==undefined to check the payload's activeTicks
-    gDatareportingService.simulateNoSessionRecorder();
-  }
-
-  // When no DRS or no DRS.getSessionRecorder(), activeTicks should be -1.
-  do_check_eq(TelemetrySession.getPayload().simpleMeasurements.activeTicks, -1);
-
-  if (HAS_DATAREPORTINGSERVICE) {
-    // Restore normal behavior for getSessionRecorder()
-    gDatareportingService.simulateRestoreSessionRecorder();
-
     gDataReportingClientID = yield gDatareportingService.getClientID();
 
     // We should have cached the client id now. Lets confirm that by
@@ -531,106 +203,76 @@
 
 // Ensure that not overwriting an existing file fails silently
 add_task(function* test_overwritePing() {
-  let ping = {slug: "foo"}
+  let ping = {id: "foo"}
   yield TelemetryFile.savePing(ping, true);
   yield TelemetryFile.savePing(ping, false);
   yield TelemetryFile.cleanupPingFile(ping);
 });
 
-// Ensures that expired histograms are not part of the payload.
-add_task(function* test_expiredHistogram() {
-  let histogram_id = "FOOBAR";
-  let dummy = Telemetry.newHistogram(histogram_id, "30", Telemetry.HISTOGRAM_EXPONENTIAL, 1, 2, 3);
-
-  dummy.add(1);
-
-  do_check_eq(TelemetrySession.getPayload()["histograms"][histogram_id], undefined);
-  do_check_eq(TelemetrySession.getPayload()["histograms"]["TELEMETRY_TEST_EXPIRED"], undefined);
-});
-
-// Checks that an invalid histogram file is deleted if TelemetryFile fails to parse it.
-add_task(function* test_runInvalidJSON() {
-  let histogramsFile = getSavedHistogramsFile("invalid-histograms.dat");
-
-  writeStringToFile(histogramsFile, "this.is.invalid.JSON");
-  do_check_true(histogramsFile.exists());
-
-  yield TelemetrySession.testLoadHistograms(histogramsFile);
-  do_check_false(histogramsFile.exists());
-});
-
 // Sends a ping to a non existing server.
 add_task(function* test_noServerPing() {
-  yield sendPing();
+  yield sendPing(false, false);
 });
 
 // Checks that a sent ping is correctly received by a dummy http server.
 add_task(function* test_simplePing() {
-  gHttpServer.start(-1);
-  gServerStarted = true;
-  gRequestIterator = Iterator(new Request());
+  startWebserver();
 
-  yield sendPing();
+  yield sendPing(false, false);
   let request = yield gRequestIterator.next();
-  let payload = decodeRequestPayload(request);
 
-  checkPayloadInfo(payload, "test-ping");
+  // Check that we have a version query parameter in the URL.
+  Assert.notEqual(request.queryString, "");
+
+  // Make sure the version in the query string matches the new ping format version.
+  let params = request.queryString.split("&");
+  Assert.ok(params.find(p => p == ("v=" + PING_FORMAT_VERSION)));
+
+  let ping = decodeRequestPayload(request);
+  checkPingFormat(ping, TEST_PING_TYPE, false, false);
 });
 
-// Saves the current session histograms, reloads them, perfoms a ping
-// and checks that the dummy http server received both the previously
-// saved histograms and the new ones.
-add_task(function* test_saveLoadPing() {
-  let histogramsFile = getSavedHistogramsFile("saved-histograms.dat");
-
-  setupTestData();
-  yield TelemetrySession.testSaveHistograms(histogramsFile);
-  yield TelemetrySession.testLoadHistograms(histogramsFile);
-  yield sendPing();
-
-  // Get requests received by dummy server.
-  let request1 = yield gRequestIterator.next();
-  let request2 = yield gRequestIterator.next();
-
-  // We decode both requests to check for the |reason|.
-  let payload1 = decodeRequestPayload(request1);
-  let payload2 = decodeRequestPayload(request2);
-
-  // Check we have the correct two requests. Ordering is not guaranteed.
-  if (payload1.info.reason === "test-ping") {
-    checkPayload(request1, payload1, "test-ping", 1);
-    checkPayload(request2, payload2, "saved-session", 1);
-  } else {
-    checkPayload(request1, payload1, "saved-session", 1);
-    checkPayload(request2, payload2, "test-ping", 1);
+add_task(function* test_pingHasClientId() {
+  // Send a ping with a clientId.
+  yield sendPing(true, false);
+
+  let request = yield gRequestIterator.next();
+  let ping = decodeRequestPayload(request);
+  checkPingFormat(ping, TEST_PING_TYPE, true, false);
+
+  if (HAS_DATAREPORTINGSERVICE &&
+      Services.prefs.getBoolPref(PREF_FHR_UPLOAD_ENABLED)) {
+    Assert.equal(ping.clientId, gDataReportingClientID,
+                 "The correct clientId must be reported.");
   }
 });
 
-// Checks that an expired histogram file is deleted when loaded.
-add_task(function* test_runOldPingFile() {
-  let histogramsFile = getSavedHistogramsFile("old-histograms.dat");
-
-  yield TelemetrySession.testSaveHistograms(histogramsFile);
-  do_check_true(histogramsFile.exists());
-  let mtime = histogramsFile.lastModifiedTime;
-  histogramsFile.lastModifiedTime = mtime - (14 * 24 * 60 * 60 * 1000 + 60000); // 14 days, 1m
+add_task(function* test_pingHasEnvironment() {
+  // Send a ping with the environment data.
+  yield sendPing(false, true);
+  let request = yield gRequestIterator.next();
+  let ping = decodeRequestPayload(request);
+  checkPingFormat(ping, TEST_PING_TYPE, false, true);
 
-  yield TelemetrySession.testLoadHistograms(histogramsFile);
-  do_check_false(histogramsFile.exists());
+  // Test a field in the environment build section.
+  Assert.equal(ping.application.buildId, ping.environment.build.buildId);
 });
 
-add_task(function* test_savedSessionClientID() {
-  // 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;
-  yield OS.File.removeDir(dir, {ignoreAbsent: true});
-  yield OS.File.makeDir(dir);
-  yield TelemetrySession.shutdown();
-
-  yield TelemetryFile.loadSavedPings();
-  Assert.equal(TelemetryFile.pingsLoaded, 1);
-  let ping = TelemetryFile.popPendingPings().next();
-  Assert.equal(ping.value.payload.clientID, gDataReportingClientID);
+add_task(function* test_pingHasEnvironmentAndClientId() {
+  // Send a ping with the environment data and client id.
+  yield sendPing(true, true);
+  let request = yield gRequestIterator.next();
+  let ping = decodeRequestPayload(request);
+  checkPingFormat(ping, TEST_PING_TYPE, true, true);
+
+  // Test a field in the environment build section.
+  Assert.equal(ping.application.buildId, ping.environment.build.buildId);
+  // Test that we have the correct clientId.
+  if (HAS_DATAREPORTINGSERVICE &&
+      Services.prefs.getBoolPref(PREF_FHR_UPLOAD_ENABLED)) {
+    Assert.equal(ping.clientId, gDataReportingClientID,
+                 "The correct clientId must be reported.");
+  }
 });
 
 add_task(function* stopServer(){
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js	2015-02-28 15:03:07.000000000 +0000
@@ -17,12 +17,12 @@
 const Cr = Components.results;
 const Cu = Components.utils;
 
+Cu.import("resource://gre/modules/osfile.jsm", this);
 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/TelemetryPing.jsm", this);
-Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
 Cu.import("resource://gre/modules/Task.jsm", this);
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 let {OS: {File, Path, Constants}} = Cu.import("resource://gre/modules/osfile.jsm", {});
@@ -43,80 +43,77 @@
 const PING_TIMEOUT_LENGTH = 5000;
 const EXPIRED_PINGS = 5;
 const OVERDUE_PINGS = 6;
+const OLD_FORMAT_PINGS = 4;
 const RECENT_PINGS = 4;
 const LRU_PINGS = TelemetryFile.MAX_LRU_PINGS;
 
-const TOTAL_EXPECTED_PINGS = OVERDUE_PINGS + RECENT_PINGS;
+const TOTAL_EXPECTED_PINGS = OVERDUE_PINGS + RECENT_PINGS + OLD_FORMAT_PINGS;
 
 let gHttpServer = new HttpServer();
 let gCreatedPings = 0;
 let gSeenPings = 0;
 
 /**
- * Creates some TelemetrySession pings for the current session and
- * saves them to disk. Each ping gets a unique ID slug based on
- * an incrementor.
+ * Creates some Telemetry pings for the and saves them to disk. Each ping gets a
+ * unique ID based on an incrementor.
  *
- * @param aNum the number of pings to create.
- * @param aAge the age in milliseconds to offset from now. A value
- *             of 10 would make the ping 10ms older than now, for
- *             example.
+ * @param {Array} aPingInfos An array of ping type objects. Each entry must be an
+ *                object containing a "num" field for the number of pings to create and
+ *                an "age" field. The latter representing the age in milliseconds to offset
+ *                from now. A value of 10 would make the ping 10ms older than now, for
+ *                example.
  * @returns Promise
- * @resolve an Array with the created pings.
+ * @resolve an Array with the created pings ids.
  */
-function createSavedPings(aNum, aAge) {
-  return Task.spawn(function*(){
-    let pings = [];
-    let age = Date.now() - aAge;
-
-    for (let i = 0; i < aNum; ++i) {
-      let payload = TelemetrySession.getPayload();
-      let ping = { slug: "test-ping-" + gCreatedPings, reason: "test", payload: payload };
-
-      yield TelemetryFile.savePing(ping);
-
-      if (aAge) {
+let createSavedPings = Task.async(function* (aPingInfos) {
+  let pingIds = [];
+  let now = Date.now();
+
+  for (let type in aPingInfos) {
+    let num = aPingInfos[type].num;
+    let age = now - aPingInfos[type].age;
+    for (let i = 0; i < num; ++i) {
+      let pingId = yield TelemetryPing.testSavePingToFile("test-ping", {}, { overwrite: true });
+      if (aPingInfos[type].age) {
         // savePing writes to the file synchronously, so we're good to
         // modify the lastModifedTime now.
-        let file = getSavePathForPing(ping);
-        yield File.setDates(file, null, age);
+        let filePath = getSavePathForPingId(pingId);
+        yield File.setDates(filePath, null, age);
       }
       gCreatedPings++;
-      pings.push(ping);
+      pingIds.push(pingId);
     }
-    return pings;
-  });
-}
+  }
+
+  return pingIds;
+});
 
 /**
- * Deletes locally saved pings in aPings if they
- * exist.
+ * Deletes locally saved pings if they exist.
  *
- * @param aPings an Array of pings to delete.
+ * @param aPingIds an Array of ping ids to delete.
  * @returns Promise
  */
-function clearPings(aPings) {
-  return Task.spawn(function*() {
-    for (let ping of aPings) {
-      let path = getSavePathForPing(ping);
-      yield File.remove(path);
-    }
-  });
-}
+let clearPings = Task.async(function* (aPingIds) {
+  for (let pingId of aPingIds) {
+    let filePath = getSavePathForPingId(pingId);
+    yield File.remove(filePath);
+  }
+});
 
 /**
- * Returns a handle for the file that aPing should be
+ * Returns a handle for the file that a ping should be
  * stored in locally.
  *
  * @returns path
  */
-function getSavePathForPing(aPing) {
-  return Path.join(Constants.Path.profileDir, PING_SAVE_FOLDER, aPing.slug);
+function getSavePathForPingId(aPingId) {
+  return Path.join(Constants.Path.profileDir, PING_SAVE_FOLDER, aPingId);
 }
 
 /**
- * Check if the number of TelemetrySession pings received by the
- * HttpServer is not equal to aExpectedNum.
+ * Check if the number of Telemetry pings received by the HttpServer is not equal
+ * to aExpectedNum.
  *
  * @param aExpectedNum the number of pings we expect to receive.
  */
@@ -125,30 +122,28 @@
 }
 
 /**
- * Throws if any pings in aPings is saved locally.
+ * Throws if any pings with the id in aPingIds is saved locally.
  *
- * @param aPings an Array of pings to check.
+ * @param aPingIds an Array of pings ids to check.
  * @returns Promise
  */
-function assertNotSaved(aPings) {
-  return Task.spawn(function*() {
-    let saved = 0;
-    for (let ping of aPings) {
-      let file = getSavePathForPing(ping);
-      if (yield File.exists()) {
-        saved++;
-      }
-    }
-    if (saved > 0) {
-      do_throw("Found " + saved + " unexpected saved pings.");
+let assertNotSaved = Task.async(function* (aPingIds) {
+  let saved = 0;
+  for (let id of aPingIds) {
+    let filePath = getSavePathForPingId(id);
+    if (yield File.exists(filePath)) {
+      saved++;
     }
-  });
-}
+  }
+  if (saved > 0) {
+    do_throw("Found " + saved + " unexpected saved pings.");
+  }
+});
 
 /**
  * Our handler function for the HttpServer that simply
  * increments the gSeenPings global when it successfully
- * receives and decodes a TelemetrySession payload.
+ * receives and decodes a Telemetry payload.
  *
  * @param aRequest the HTTP request sent from HttpServer.
  */
@@ -174,7 +169,6 @@
  * Reset Telemetry state.
  */
 function resetTelemetry() {
-  TelemetrySession.uninstall();
   // Quick and dirty way to clear TelemetryFile's pendingPings
   // collection, and put it back in its initial state.
   let gen = TelemetryFile.popPendingPings();
@@ -189,14 +183,11 @@
   return TelemetryPing.setup();
 }
 
-function startTelemetrySession() {
-  return TelemetrySession.setup();
-}
-
 function run_test() {
   gHttpServer.registerPrefixHandler("/submit/telemetry/", pingHandler);
   gHttpServer.start(-1);
   do_get_profile();
+  loadAddonManager("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
 
   // Send the needed startup notifications to the datareporting service
   // to ensure that it has been initialized.
@@ -210,12 +201,25 @@
 }
 
 /**
+ * Setup the tests by making sure the ping storage directory is available, otherwise
+ * |TelemetryPing.testSaveDirectoryToFile| could fail.
+ */
+add_task(function* setupEnvironment() {
+  yield TelemetryPing.setup();
+
+  let directory = TelemetryFile.pingDirectoryPath;
+  yield File.makeDir(directory, { ignoreExisting: true, unixMode: OS.Constants.S_IRWXU });
+
+  yield resetTelemetry();
+});
+
+/**
  * Test that pings that are considered too old are just chucked out
  * immediately and never sent.
  */
 add_task(function* test_expired_pings_are_deleted() {
-  yield startTelemetrySession();
-  let expiredPings = yield createSavedPings(EXPIRED_PINGS, EXPIRED_PING_FILE_AGE);
+  let pingTypes = [{ num: EXPIRED_PINGS, age: EXPIRED_PING_FILE_AGE }];
+  let expiredPings = yield createSavedPings(pingTypes);
   yield startTelemetry();
   assertReceivedPings(0);
   yield assertNotSaved(expiredPings);
@@ -226,8 +230,8 @@
  * Test that really recent pings are not sent on Telemetry initialization.
  */
 add_task(function* test_recent_pings_not_sent() {
-  yield startTelemetrySession();
-  let recentPings = yield createSavedPings(RECENT_PINGS);
+  let pingTypes = [{ num: RECENT_PINGS }];
+  let recentPings = yield createSavedPings(pingTypes);
   yield startTelemetry();
   assertReceivedPings(0);
   yield resetTelemetry();
@@ -238,17 +242,20 @@
  * Test that only the most recent LRU_PINGS pings are kept at startup.
  */
 add_task(function* test_most_recent_pings_kept() {
-  yield startTelemetrySession();
-  let head = yield createSavedPings(LRU_PINGS);
-  let tail = yield createSavedPings(3, ONE_MINUTE_MS);
-  let pings = head.concat(tail);
+  let pingTypes = [
+    { num: LRU_PINGS },
+    { num: 3, age: ONE_MINUTE_MS },
+  ];
+  let pings = yield createSavedPings(pingTypes);
+  let head = pings.slice(0, LRU_PINGS);
+  let tail = pings.slice(-3);
 
   yield startTelemetry();
   let gen = TelemetryFile.popPendingPings();
 
   for (let item of gen) {
-    for (let p of tail) {
-      do_check_neq(p.slug, item.slug);
+    for (let id of tail) {
+      do_check_neq(id, item.id);
     }
   }
 
@@ -258,15 +265,88 @@
 });
 
 /**
+ * Create an overdue ping in the old format and try to send it.
+ */
+add_task(function* test_overdue_old_format() {
+  // A test ping in the old, standard format.
+  const PING_OLD_FORMAT = {
+    slug: "1234567abcd",
+    reason: "test-ping",
+    payload: {
+      info: {
+        reason: "test-ping",
+        OS: "XPCShell",
+        appID: "SomeId",
+        appVersion: "1.0",
+        appName: "XPCShell",
+        appBuildID: "123456789",
+        appUpdateChannel: "Test",
+        platformBuildID: "987654321",
+      },
+    },
+  };
+
+  // A ping with no info section, but with a slug.
+  const PING_NO_INFO = {
+    slug: "1234-no-info-ping",
+    reason: "test-ping",
+    payload: {}
+  };
+
+  // A ping with no payload.
+  const PING_NO_PAYLOAD = {
+    slug: "5678-no-payload",
+    reason: "test-ping",
+  };
+
+  // A ping with no info and no slug.
+  const PING_NO_SLUG = {
+    reason: "test-ping",
+    payload: {}
+  };
+
+  const PING_FILES_PATHS = [
+    Path.join(Constants.Path.profileDir, PING_SAVE_FOLDER, PING_OLD_FORMAT.slug),
+    Path.join(Constants.Path.profileDir, PING_SAVE_FOLDER, PING_NO_INFO.slug),
+    Path.join(Constants.Path.profileDir, PING_SAVE_FOLDER, PING_NO_PAYLOAD.slug),
+    Path.join(Constants.Path.profileDir, PING_SAVE_FOLDER, "no-slug-file"),
+  ];
+
+  // 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);
+
+  for (let f in PING_FILES_PATHS) {
+    yield File.setDates(PING_FILES_PATHS[f], null, Date.now() - OVERDUE_PING_FILE_AGE);
+  }
+
+  yield startTelemetry();
+  assertReceivedPings(OLD_FORMAT_PINGS);
+
+  // |TelemetryFile.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]);
+
+  yield resetTelemetry();
+});
+
+/**
  * Create some recent, expired and overdue pings. The overdue pings should
  * trigger a send of all recent and overdue pings, but the expired pings
  * should just be deleted.
  */
 add_task(function* test_overdue_pings_trigger_send() {
-  yield startTelemetrySession();
-  let recentPings = yield createSavedPings(RECENT_PINGS);
-  let expiredPings = yield createSavedPings(EXPIRED_PINGS, EXPIRED_PING_FILE_AGE);
-  let overduePings = yield createSavedPings(OVERDUE_PINGS, OVERDUE_PING_FILE_AGE);
+  let pingTypes = [
+    { num: RECENT_PINGS },
+    { num: EXPIRED_PINGS, age: EXPIRED_PING_FILE_AGE },
+    { num: OVERDUE_PINGS, age: OVERDUE_PING_FILE_AGE },
+  ];
+  let pings = yield createSavedPings(pingTypes);
+  let recentPings = pings.slice(0, RECENT_PINGS);
+  let expiredPings = pings.slice(RECENT_PINGS, RECENT_PINGS + EXPIRED_PINGS);
+  let overduePings = pings.slice(-OVERDUE_PINGS);
 
   yield startTelemetry();
   assertReceivedPings(TOTAL_EXPECTED_PINGS);
@@ -277,6 +357,55 @@
   yield resetTelemetry();
 });
 
+/**
+ * Create a ping in the old format, send it, and make sure the request URL contains
+ * the correct version query parameter.
+ */
+add_task(function* test_overdue_old_format() {
+  // A test ping in the old, standard format.
+  const PING_OLD_FORMAT = {
+    slug: "1234567abcd",
+    reason: "test-ping",
+    payload: {
+      info: {
+        reason: "test-ping",
+        OS: "XPCShell",
+        appID: "SomeId",
+        appVersion: "1.0",
+        appName: "XPCShell",
+        appBuildID: "123456789",
+        appUpdateChannel: "Test",
+        platformBuildID: "987654321",
+      },
+    },
+  };
+
+  const filePath =
+    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 File.setDates(filePath, null, Date.now() - OVERDUE_PING_FILE_AGE);
+
+  let receivedPings = 0;
+  // Register a new prefix handler to validate the URL.
+  gHttpServer.registerPrefixHandler("/submit/telemetry/", request => {
+    // Check that we have a version query parameter in the URL.
+    Assert.notEqual(request.queryString, "");
+
+    // Make sure the version in the query string matches the old ping format version.
+    let params = request.queryString.split("&");
+    Assert.ok(params.find(p => p == "v=1"));
+
+    receivedPings++;
+  });
+
+  yield startTelemetry();
+  Assert.equal(receivedPings, 1, "We must receive a ping in the old format.");
+
+  yield resetTelemetry();
+});
+
 add_task(function* teardown() {
   yield stopHttpServer();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2015-02-28 15:03:07.000000000 +0000
@@ -0,0 +1,1139 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/
+*/
+/* This testcase triggers two telemetry pings.
+ *
+ * Telemetry code keeps histograms of past telemetry pings. The first
+ * ping populates these histograms. One of those histograms is then
+ * checked in the second request.
+ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+const Cr = Components.results;
+
+Cu.import("resource://testing-common/httpd.js", this);
+Cu.import("resource://services-common/utils.js");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/LightweightThemeManager.jsm", this);
+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/TelemetryEnvironment.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");
+Cu.import("resource://gre/modules/osfile.jsm", this);
+
+const PING_FORMAT_VERSION = 4;
+const PING_TYPE_MAIN = "main";
+const PING_TYPE_SAVED_SESSION = "saved-session";
+
+const REASON_SAVED_SESSION = "saved-session";
+const REASON_TEST_PING = "test-ping";
+const REASON_DAILY = "daily";
+const REASON_ENVIRONMENT_CHANGE = "environment-change";
+
+const PLATFORM_VERSION = "1.9.2";
+const APP_VERSION = "1";
+const APP_ID = "xpcshell@tests.mozilla.org";
+const APP_NAME = "XPCShell";
+
+const IGNORE_HISTOGRAM = "test::ignore_me";
+const IGNORE_HISTOGRAM_TO_CLONE = "MEMORY_HEAP_ALLOCATED";
+const IGNORE_CLONED_HISTOGRAM = "test::ignore_me_also";
+const ADDON_NAME = "Telemetry test addon";
+const ADDON_HISTOGRAM = "addon-histogram";
+// Add some unicode characters here to ensure that sending them works correctly.
+const SHUTDOWN_TIME = 10000;
+const FAILED_PROFILE_LOCK_ATTEMPTS = 2;
+
+// Constants from prio.h for nsIFileOutputStream.init
+const PR_WRONLY = 0x2;
+const PR_CREATE_FILE = 0x8;
+const PR_TRUNCATE = 0x20;
+const RW_OWNER = parseInt("0600", 8);
+
+const NUMBER_OF_THREADS_TO_LAUNCH = 30;
+let gNumberOfThreadsLaunched = 0;
+
+const SEC_IN_ONE_DAY  = 24 * 60 * 60;
+const MS_IN_ONE_DAY   = SEC_IN_ONE_DAY * 1000;
+
+const PREF_BRANCH = "toolkit.telemetry.";
+const PREF_ENABLED = PREF_BRANCH + "enabled";
+const PREF_FHR_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
+const PREF_FHR_SERVICE_ENABLED = "datareporting.healthreport.service.enabled";
+
+const HAS_DATAREPORTINGSERVICE = "@mozilla.org/datareporting/service;1" in Cc;
+const SESSION_RECORDER_EXPECTED = HAS_DATAREPORTINGSERVICE &&
+                                  Preferences.get(PREF_FHR_SERVICE_ENABLED, true);
+
+const Telemetry = Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
+
+let gHttpServer = new HttpServer();
+let gServerStarted = false;
+let gRequestIterator = null;
+let gDataReportingClientID = null;
+
+XPCOMUtils.defineLazyGetter(this, "gDatareportingService",
+  () => Cc["@mozilla.org/datareporting/service;1"]
+          .getService(Ci.nsISupports)
+          .wrappedJSObject);
+
+function generateUUID() {
+  let str = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator).generateUUID().toString();
+  // strip {}
+  return str.substring(1, str.length - 1);
+}
+
+function sendPing() {
+  TelemetrySession.gatherStartup();
+  if (gServerStarted) {
+    TelemetryPing.setServer("http://localhost:" + gHttpServer.identity.primaryPort);
+    return TelemetrySession.testPing();
+  } else {
+    TelemetryPing.setServer("http://doesnotexist");
+    return TelemetrySession.testPing();
+  }
+}
+
+function wrapWithExceptionHandler(f) {
+  function wrapper(...args) {
+    try {
+      f(...args);
+    } catch (ex if typeof(ex) == 'object') {
+      dump("Caught exception: " + ex.message + "\n");
+      dump(ex.stack);
+      do_test_finished();
+    }
+  }
+  return wrapper;
+}
+
+function futureDate(date, offset) {
+  return new Date(date.getTime() + offset);
+}
+
+function fakeNow(date) {
+  let session = Cu.import("resource://gre/modules/TelemetrySession.jsm");
+  session.Policy.now = () => date;
+}
+
+function fakeGenerateUUID(sessionFunc, subsessionFunc) {
+  let session = Cu.import("resource://gre/modules/TelemetrySession.jsm");
+  session.Policy.generateSessionUUID = sessionFunc;
+  session.Policy.generateSubsessionUUID = subsessionFunc;
+}
+
+function registerPingHandler(handler) {
+  gHttpServer.registerPrefixHandler("/submit/telemetry/",
+				   wrapWithExceptionHandler(handler));
+}
+
+function setupTestData() {
+  Telemetry.newHistogram(IGNORE_HISTOGRAM, "never", Telemetry.HISTOGRAM_BOOLEAN);
+  Telemetry.histogramFrom(IGNORE_CLONED_HISTOGRAM, IGNORE_HISTOGRAM_TO_CLONE);
+  Services.startup.interrupted = true;
+  Telemetry.registerAddonHistogram(ADDON_NAME, ADDON_HISTOGRAM,
+                                   Telemetry.HISTOGRAM_LINEAR,
+                                   1, 5, 6);
+  let h1 = Telemetry.getAddonHistogram(ADDON_NAME, ADDON_HISTOGRAM);
+  h1.add(1);
+  let h2 = Telemetry.getHistogramById("TELEMETRY_TEST_COUNT");
+  h2.add();
+
+  let k1 = Telemetry.getKeyedHistogramById("TELEMETRY_TEST_KEYED_COUNT");
+  k1.add("a");
+  k1.add("a");
+  k1.add("b");
+}
+
+function getSavedPingFile(basename) {
+  let tmpDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+  let pingFile = tmpDir.clone();
+  pingFile.append(basename);
+  if (pingFile.exists()) {
+    pingFile.remove(true);
+  }
+  do_register_cleanup(function () {
+    try {
+      pingFile.remove(true);
+    } catch (e) {
+    }
+  });
+  return pingFile;
+}
+
+function decodeRequestPayload(request) {
+  let s = request.bodyInputStream;
+  let payload = null;
+  let decoder = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON)
+
+  if (request.getHeader("content-encoding") == "gzip") {
+    let observer = {
+      buffer: "",
+      onStreamComplete: function(loader, context, status, length, result) {
+        this.buffer = String.fromCharCode.apply(this, result);
+      }
+    };
+
+    let scs = Cc["@mozilla.org/streamConverters;1"]
+              .getService(Ci.nsIStreamConverterService);
+    let listener = Cc["@mozilla.org/network/stream-loader;1"]
+                  .createInstance(Ci.nsIStreamLoader);
+    listener.init(observer);
+    let converter = scs.asyncConvertData("gzip", "uncompressed",
+                                         listener, null);
+    converter.onStartRequest(null, null);
+    converter.onDataAvailable(null, null, s, 0, s.available());
+    converter.onStopRequest(null, null, null);
+    let unicodeConverter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                    .createInstance(Ci.nsIScriptableUnicodeConverter);
+    unicodeConverter.charset = "UTF-8";
+    let utf8string = unicodeConverter.ConvertToUnicode(observer.buffer);
+    utf8string += unicodeConverter.Finish();
+    payload = decoder.decode(utf8string);
+  } else {
+    payload = decoder.decodeFromStream(s, s.available());
+  }
+
+  return payload;
+}
+
+function checkPingFormat(aPing, aType, aHasClientId, aHasEnvironment) {
+  const MANDATORY_PING_FIELDS = [
+    "type", "id", "creationDate", "version", "application", "payload"
+  ];
+
+  const APPLICATION_TEST_DATA = {
+    buildId: "2007010101",
+    name: APP_NAME,
+    version: APP_VERSION,
+    vendor: "Mozilla",
+    platformVersion: PLATFORM_VERSION,
+    xpcomAbi: "noarch-spidermonkey",
+  };
+
+  // Check that the ping contains all the mandatory fields.
+  for (let f of MANDATORY_PING_FIELDS) {
+    Assert.ok(f in aPing, f + "must be available.");
+  }
+
+  Assert.equal(aPing.type, aType, "The ping must have the correct type.");
+  Assert.equal(aPing.version, PING_FORMAT_VERSION, "The ping must have the correct version.");
+
+  // Test the application section.
+  for (let f in APPLICATION_TEST_DATA) {
+    Assert.equal(aPing.application[f], APPLICATION_TEST_DATA[f],
+                 f + " must have the correct value.");
+  }
+
+  // We can't check the values for channel and architecture. Just make
+  // sure they are in.
+  Assert.ok("architecture" in aPing.application,
+            "The application section must have an architecture field.");
+  Assert.ok("channel" in aPing.application,
+            "The application section must have a channel field.");
+
+  // Check the clientId and environment fields, as needed.
+  Assert.equal("clientId" in aPing, aHasClientId);
+  Assert.equal("environment" in aPing, aHasEnvironment);
+}
+
+function checkPayloadInfo(data) {
+  const ALLOWED_REASONS = [
+    "environment-change", "shutdown", "daily", "saved-session", "test-ping"
+  ];
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  let numberCheck = arg => { return (typeof arg == "number"); };
+  let positiveNumberCheck = arg => { return numberCheck(arg) && (arg >= 0); };
+  let stringCheck = arg => { return (typeof arg == "string") && (arg != ""); };
+  let isoDateCheck = arg => { return stringCheck(arg) && !Number.isNaN(Date.parse(arg)); }
+  let revisionCheck = arg => {
+    return (Services.appinfo.isOfficial) ? stringCheck(arg) : (typeof arg == "string");
+  };
+  let uuidCheck = arg => uuidRegex.test(arg);
+
+  const EXPECTED_INFO_FIELDS_TYPES = {
+    reason: stringCheck,
+    revision: revisionCheck,
+    timezoneOffset: numberCheck,
+    sessionId: uuidCheck,
+    subsessionId: uuidCheck,
+    // Special case: previousSubsessionId is null on first run.
+    previousSubsessionId: (arg) => { return (arg) ? uuidCheck(arg) : true; },
+    subsessionCounter: positiveNumberCheck,
+    profileSubsessionCounter: positiveNumberCheck,
+    sessionStartDate: isoDateCheck,
+    subsessionStartDate: isoDateCheck,
+    subsessionLength: positiveNumberCheck,
+  };
+
+  for (let f in EXPECTED_INFO_FIELDS_TYPES) {
+    Assert.ok(f in data, f + " must be available.");
+
+    let checkFunc = EXPECTED_INFO_FIELDS_TYPES[f];
+    Assert.ok(checkFunc(data[f]),
+              f + " must have the correct type and valid data " + data[f]);
+  }
+
+  // Previous buildId is not mandatory.
+  if (data.previousBuildId) {
+    Assert.ok(stringCheck(data.previousBuildId));
+  }
+
+  Assert.ok(ALLOWED_REASONS.find(r => r == data.reason),
+            "Payload must contain an allowed reason.");
+
+  Assert.ok(Date.parse(data.subsessionStartDate) >= Date.parse(data.sessionStartDate));
+  Assert.ok(data.profileSubsessionCounter >= data.subsessionCounter);
+  Assert.ok(data.timezoneOffset >= -12*60, "The timezone must be in a valid range.");
+  Assert.ok(data.timezoneOffset <= 12*60, "The timezone must be in a valid range.");
+}
+
+function checkPayload(payload, reason, successfulPings) {
+  Assert.ok("info" in payload, "Payload must contain an info section.");
+  checkPayloadInfo(payload.info);
+
+  Assert.ok(payload.simpleMeasurements.uptime >= 0);
+  Assert.equal(payload.simpleMeasurements.startupInterrupted, 1);
+  Assert.equal(payload.simpleMeasurements.shutdownDuration, SHUTDOWN_TIME);
+  Assert.equal(payload.simpleMeasurements.savedPings, 1);
+  Assert.ok("maximalNumberOfConcurrentThreads" in payload.simpleMeasurements);
+  Assert.ok(payload.simpleMeasurements.maximalNumberOfConcurrentThreads >= gNumberOfThreadsLaunched);
+
+  let activeTicks = payload.simpleMeasurements.activeTicks;
+  Assert.ok(SESSION_RECORDER_EXPECTED ? activeTicks >= 0 : activeTicks == -1);
+
+  Assert.equal(payload.simpleMeasurements.failedProfileLockCount,
+              FAILED_PROFILE_LOCK_ATTEMPTS);
+  let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);
+  let failedProfileLocksFile = profileDirectory.clone();
+  failedProfileLocksFile.append("Telemetry.FailedProfileLocks.txt");
+  Assert.ok(!failedProfileLocksFile.exists());
+
+
+  let isWindows = ("@mozilla.org/windows-registry-key;1" in Components.classes);
+  if (isWindows) {
+    Assert.ok(payload.simpleMeasurements.startupSessionRestoreReadBytes > 0);
+    Assert.ok(payload.simpleMeasurements.startupSessionRestoreWriteBytes > 0);
+  }
+
+  const TELEMETRY_PING = "TELEMETRY_PING";
+  const TELEMETRY_SUCCESS = "TELEMETRY_SUCCESS";
+  const TELEMETRY_TEST_FLAG = "TELEMETRY_TEST_FLAG";
+  const TELEMETRY_TEST_COUNT = "TELEMETRY_TEST_COUNT";
+  const TELEMETRY_TEST_KEYED_FLAG = "TELEMETRY_TEST_KEYED_FLAG";
+  const TELEMETRY_TEST_KEYED_COUNT = "TELEMETRY_TEST_KEYED_COUNT";
+  const READ_SAVED_PING_SUCCESS = "READ_SAVED_PING_SUCCESS";
+
+  Assert.ok(TELEMETRY_PING in payload.histograms);
+  Assert.ok(READ_SAVED_PING_SUCCESS in payload.histograms);
+  Assert.ok(TELEMETRY_TEST_FLAG in payload.histograms);
+  Assert.ok(TELEMETRY_TEST_COUNT in payload.histograms);
+
+  let rh = Telemetry.registeredHistograms(Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, []);
+  for (let name of rh) {
+    if (/SQLITE/.test(name) && name in payload.histograms) {
+      let histogramName = ("STARTUP_" + name);
+      Assert.ok(histogramName in payload.histograms, histogramName + " must be available.");
+    }
+  }
+  Assert.ok(!(IGNORE_HISTOGRAM in payload.histograms));
+  Assert.ok(!(IGNORE_CLONED_HISTOGRAM in payload.histograms));
+
+  // Flag histograms should automagically spring to life.
+  const expected_flag = {
+    range: [1, 2],
+    bucket_count: 3,
+    histogram_type: 3,
+    values: {0:1, 1:0},
+    sum: 0,
+    sum_squares_lo: 0,
+    sum_squares_hi: 0
+  };
+  let flag = payload.histograms[TELEMETRY_TEST_FLAG];
+  Assert.equal(uneval(flag), uneval(expected_flag));
+
+  // We should have a test count.
+  const expected_count = {
+    range: [1, 2],
+    bucket_count: 3,
+    histogram_type: 4,
+    values: {0:1, 1:0},
+    sum: 1,
+    sum_squares_lo: 1,
+    sum_squares_hi: 0,
+  };
+  let count = payload.histograms[TELEMETRY_TEST_COUNT];
+  Assert.equal(uneval(count), uneval(expected_count));
+
+  // There should be one successful report from the previous telemetry ping.
+  const expected_tc = {
+    range: [1, 2],
+    bucket_count: 3,
+    histogram_type: 2,
+    values: {0:2, 1:successfulPings, 2:0},
+    sum: successfulPings,
+    sum_squares_lo: successfulPings,
+    sum_squares_hi: 0
+  };
+  let tc = payload.histograms[TELEMETRY_SUCCESS];
+  Assert.equal(uneval(tc), uneval(expected_tc));
+
+  let h = payload.histograms[READ_SAVED_PING_SUCCESS];
+  Assert.equal(h.values[0], 1);
+
+  // The ping should include data from memory reporters.  We can't check that
+  // this data is correct, because we can't control the values returned by the
+  // memory reporters.  But we can at least check that the data is there.
+  //
+  // It's important to check for the presence of reporters with a mix of units,
+  // because TelemetryPing has separate logic for each one.  But we can't
+  // currently check UNITS_COUNT_CUMULATIVE or UNITS_PERCENTAGE because
+  // Telemetry doesn't touch a memory reporter with these units that's
+  // available on all platforms.
+
+  Assert.ok('MEMORY_JS_GC_HEAP' in payload.histograms); // UNITS_BYTES
+  Assert.ok('MEMORY_JS_COMPARTMENTS_SYSTEM' in payload.histograms); // UNITS_COUNT
+
+  // We should have included addon histograms.
+  Assert.ok("addonHistograms" in payload);
+  Assert.ok(ADDON_NAME in payload.addonHistograms);
+  Assert.ok(ADDON_HISTOGRAM in payload.addonHistograms[ADDON_NAME]);
+
+  Assert.ok(("mainThread" in payload.slowSQL) &&
+                ("otherThreads" in payload.slowSQL));
+
+  // Check keyed histogram payload.
+
+  Assert.ok("keyedHistograms" in payload);
+  let keyedHistograms = payload.keyedHistograms;
+  Assert.ok(TELEMETRY_TEST_KEYED_FLAG in keyedHistograms);
+  Assert.ok(TELEMETRY_TEST_KEYED_COUNT in keyedHistograms);
+
+  Assert.deepEqual({}, keyedHistograms[TELEMETRY_TEST_KEYED_FLAG]);
+
+  const expected_keyed_count = {
+    "a": {
+      range: [1, 2],
+      bucket_count: 3,
+      histogram_type: 4,
+      values: {0:2, 1:0},
+      sum: 2,
+      sum_squares_lo: 2,
+      sum_squares_hi: 0,
+    },
+    "b": {
+      range: [1, 2],
+      bucket_count: 3,
+      histogram_type: 4,
+      values: {0:1, 1:0},
+      sum: 1,
+      sum_squares_lo: 1,
+      sum_squares_hi: 0,
+    },
+  };
+  Assert.deepEqual(expected_keyed_count, keyedHistograms[TELEMETRY_TEST_KEYED_COUNT]);
+}
+
+function writeStringToFile(file, contents) {
+  let ostream = Cc["@mozilla.org/network/safe-file-output-stream;1"]
+                .createInstance(Ci.nsIFileOutputStream);
+  ostream.init(file, PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
+	       RW_OWNER, ostream.DEFER_OPEN);
+  ostream.write(contents, contents.length);
+  ostream.QueryInterface(Ci.nsISafeOutputStream).finish();
+  ostream.close();
+}
+
+function write_fake_shutdown_file() {
+  let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);
+  let file = profileDirectory.clone();
+  file.append("Telemetry.ShutdownTime.txt");
+  let contents = "" + SHUTDOWN_TIME;
+  writeStringToFile(file, contents);
+}
+
+function write_fake_failedprofilelocks_file() {
+  let profileDirectory = Services.dirsvc.get("ProfD", Ci.nsIFile);
+  let file = profileDirectory.clone();
+  file.append("Telemetry.FailedProfileLocks.txt");
+  let contents = "" + FAILED_PROFILE_LOCK_ATTEMPTS;
+  writeStringToFile(file, contents);
+}
+
+function run_test() {
+  do_test_pending();
+
+  // Addon manager needs a profile directory
+  do_get_profile();
+  loadAddonManager(APP_ID, APP_NAME, APP_VERSION, PLATFORM_VERSION);
+
+  Services.prefs.setBoolPref(PREF_ENABLED, true);
+  Services.prefs.setBoolPref(PREF_FHR_UPLOAD_ENABLED, true);
+
+  // Send the needed startup notifications to the datareporting service
+  // to ensure that it has been initialized.
+  if (HAS_DATAREPORTINGSERVICE) {
+    gDatareportingService.observe(null, "app-startup", null);
+    gDatareportingService.observe(null, "profile-after-change", null);
+  }
+
+  // Make it look like we've previously failed to lock a profile a couple times.
+  write_fake_failedprofilelocks_file();
+
+  // Make it look like we've shutdown before.
+  write_fake_shutdown_file();
+
+  let currentMaxNumberOfThreads = Telemetry.maximalNumberOfConcurrentThreads;
+  do_check_true(currentMaxNumberOfThreads > 0);
+
+  // Try to augment the maximal number of threads currently launched
+  let threads = [];
+  try {
+    for (let i = 0; i < currentMaxNumberOfThreads + 10; ++i) {
+      threads.push(Services.tm.newThread(0));
+    }
+  } catch (ex) {
+    // If memory is too low, it is possible that not all threads will be launched.
+  }
+  gNumberOfThreadsLaunched = threads.length;
+
+  do_check_true(Telemetry.maximalNumberOfConcurrentThreads >= gNumberOfThreadsLaunched);
+
+  do_register_cleanup(function() {
+    threads.forEach(function(thread) {
+      thread.shutdown();
+    });
+  });
+
+  Telemetry.asyncFetchTelemetryData(wrapWithExceptionHandler(run_next_test));
+}
+
+add_task(function* asyncSetup() {
+  yield TelemetrySession.setup();
+  yield TelemetryPing.setup();
+
+  if (HAS_DATAREPORTINGSERVICE) {
+    // force getSessionRecorder()==undefined to check the payload's activeTicks
+    gDatareportingService.simulateNoSessionRecorder();
+  }
+
+  // When no DRS or no DRS.getSessionRecorder(), activeTicks should be -1.
+  do_check_eq(TelemetrySession.getPayload().simpleMeasurements.activeTicks, -1);
+
+  if (HAS_DATAREPORTINGSERVICE) {
+    // Restore normal behavior for getSessionRecorder()
+    gDatareportingService.simulateRestoreSessionRecorder();
+
+    gDataReportingClientID = yield gDatareportingService.getClientID();
+
+    // We should have cached the client id now. Lets confirm that by
+    // checking the client id before the async ping setup is finished.
+    let promisePingSetup = TelemetryPing.reset();
+    do_check_eq(TelemetryPing.clientID, gDataReportingClientID);
+    yield promisePingSetup;
+  }
+});
+
+// Ensures that expired histograms are not part of the payload.
+add_task(function* test_expiredHistogram() {
+  let histogram_id = "FOOBAR";
+  let dummy = Telemetry.newHistogram(histogram_id, "30", Telemetry.HISTOGRAM_EXPONENTIAL, 1, 2, 3);
+
+  dummy.add(1);
+
+  do_check_eq(TelemetrySession.getPayload()["histograms"][histogram_id], undefined);
+  do_check_eq(TelemetrySession.getPayload()["histograms"]["TELEMETRY_TEST_EXPIRED"], undefined);
+});
+
+// Checks that an invalid histogram file is deleted if TelemetryFile 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);
+  do_check_false(pingFile.exists());
+});
+
+// Sends a ping to a non existing server. If we remove this test, we won't get
+// all the histograms we need in the main ping.
+add_task(function* test_noServerPing() {
+  yield sendPing();
+  // We need two pings in order to make sure STARTUP_MEMORY_STORAGE_SQLIE histograms
+  // are initialised. See bug 1131585.
+  yield sendPing();
+});
+
+// Checks that a sent ping is correctly received by a dummy http server.
+add_task(function* test_simplePing() {
+  gHttpServer.start(-1);
+  gServerStarted = true;
+  gRequestIterator = Iterator(new Request());
+
+  let now = new Date(2020, 1, 1, 12, 0, 0);
+  let expectedDate = new Date(2020, 1, 1, 0, 0, 0);
+  fakeNow(now);
+
+  const expectedSessionUUID = "bd314d15-95bf-4356-b682-b6c4a8942202";
+  const expectedSubsessionUUID = "3e2e5f6c-74ba-4e4d-a93f-a48af238a8c7";
+  fakeGenerateUUID(() => expectedSessionUUID, () => expectedSubsessionUUID);
+  yield TelemetrySession.reset();
+
+  // Session and subsession start dates are faked during TelemetrySession setup. We can
+  // now fake the session duration.
+  const SESSION_DURATION_IN_MINUTES = 15;
+  fakeNow(new Date(2020, 1, 1, 12, SESSION_DURATION_IN_MINUTES, 0));
+
+  yield sendPing();
+  let request = yield gRequestIterator.next();
+  let ping = decodeRequestPayload(request);
+
+  checkPingFormat(ping, PING_TYPE_MAIN, true, true);
+
+  // Check that we get the data we expect.
+  let payload = ping.payload;
+  Assert.equal(payload.info.sessionId, expectedSessionUUID);
+  Assert.equal(payload.info.subsessionId, expectedSubsessionUUID);
+  let sessionStartDate = new Date(payload.info.sessionStartDate);
+  Assert.equal(sessionStartDate.toISOString(), expectedDate.toISOString());
+  let subsessionStartDate = new Date(payload.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), expectedDate.toISOString());
+  Assert.equal(payload.info.subsessionLength, SESSION_DURATION_IN_MINUTES * 60);
+
+  // Restore the UUID generator so we don't mess with other tests.
+  fakeGenerateUUID(generateUUID, generateUUID);
+});
+
+// Saves the current session histograms, reloads them, performs a ping
+// and checks that the dummy http server received both the previously
+// saved histograms and the new ones.
+add_task(function* test_saveLoadPing() {
+  let histogramsFile = getSavedPingFile("saved-histograms.dat");
+
+  setupTestData();
+  yield TelemetrySession.testSaveHistograms(histogramsFile);
+  yield TelemetryFile.testLoadHistograms(histogramsFile);
+  yield sendPing();
+
+  // Get requests received by dummy server.
+  let request1 = yield gRequestIterator.next();
+  let request2 = yield gRequestIterator.next();
+
+  Assert.equal(request1.getHeader("content-type"), "application/json; charset=UTF-8",
+               "The request must have the correct content-type.");
+  Assert.equal(request2.getHeader("content-type"), "application/json; charset=UTF-8",
+               "The request must have the correct content-type.");
+
+  // We decode both requests to check for the |reason|.
+  let ping1 = decodeRequestPayload(request1);
+  let ping2 = decodeRequestPayload(request2);
+
+  // Check we have the correct two requests. Ordering is not guaranteed. The ping type
+  // is encoded in the URL.
+  let requestTypeComponent = request1.path.split("/")[4];
+  if (requestTypeComponent === PING_TYPE_MAIN) {
+    checkPingFormat(ping1, PING_TYPE_MAIN, true, true);
+    checkPayload(ping1.payload, REASON_TEST_PING, 1);
+    checkPingFormat(ping2, PING_TYPE_SAVED_SESSION, true, true);
+    checkPayload(ping2.payload, REASON_SAVED_SESSION, 1);
+  } else {
+    checkPingFormat(ping1, PING_TYPE_SAVED_SESSION, true, true);
+    checkPayload(ping1.payload, REASON_SAVED_SESSION, 1);
+    checkPingFormat(ping2, PING_TYPE_MAIN, true, true);
+    checkPayload(ping2.payload, REASON_TEST_PING, 1);
+  }
+});
+
+add_task(function* test_checkSubsession() {
+  if (gIsAndroid) {
+    // We don't support subsessions yet on Android.
+    return;
+  }
+
+  let now = new Date(2020, 1, 1, 12, 0, 0);
+  let expectedDate = new Date(2020, 1, 1, 0, 0, 0);
+  fakeNow(now);
+  yield TelemetrySession.setup();
+
+  const COUNT_ID = "TELEMETRY_TEST_COUNT";
+  const KEYED_ID = "TELEMETRY_TEST_KEYED_COUNT";
+  const count = Telemetry.getHistogramById(COUNT_ID);
+  const keyed = Telemetry.getKeyedHistogramById(KEYED_ID);
+  const registeredIds =
+    new Set(Telemetry.registeredHistograms(Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, []));
+
+  const stableHistograms = new Set([
+    "TELEMETRY_TEST_FLAG",
+    "TELEMETRY_TEST_COUNT",
+    "TELEMETRY_TEST_RELEASE_OPTOUT",
+    "TELEMETRY_TEST_RELEASE_OPTIN",
+    "STARTUP_CRASH_DETECTED",
+  ]);
+
+  const stableKeyedHistograms = new Set([
+    "TELEMETRY_TEST_KEYED_FLAG",
+    "TELEMETRY_TEST_KEYED_COUNT",
+    "TELEMETRY_TEST_KEYED_RELEASE_OPTIN",
+    "TELEMETRY_TEST_KEYED_RELEASE_OPTOUT",
+  ]);
+
+  // Compare the two sets of histograms.
+  // The "subsession" histograms should match the registered
+  // "classic" histograms. However, histograms can change
+  // between us collecting the different payloads, so we only
+  // check for deep equality on known stable histograms.
+  checkHistograms = (classic, subsession) => {
+    for (let id of Object.keys(classic)) {
+      if (!registeredIds.has(id)) {
+        continue;
+      }
+
+      Assert.ok(id in subsession);
+      if (stableHistograms.has(id)) {
+        Assert.deepEqual(classic[id],
+                         subsession[id]);
+      } else {
+        Assert.equal(classic[id].histogram_type,
+                     subsession[id].histogram_type);
+      }
+    }
+  };
+
+  // Same as above, except for keyed histograms.
+  checkKeyedHistograms = (classic, subsession) => {
+    for (let id of Object.keys(classic)) {
+      if (!registeredIds.has(id)) {
+        continue;
+      }
+
+      Assert.ok(id in subsession);
+      if (stableKeyedHistograms.has(id)) {
+        Assert.deepEqual(classic[id],
+                         subsession[id]);
+      }
+    }
+  };
+
+  // Both classic and subsession payload histograms should start the same.
+  // The payloads should be identical for now except for the reason.
+  count.clear();
+  keyed.clear();
+  let classic = TelemetrySession.getPayload();
+  let subsession = TelemetrySession.getPayload("environment-change");
+
+  Assert.equal(classic.info.reason, "gather-payload");
+  Assert.equal(subsession.info.reason, "environment-change");
+  Assert.ok(!(COUNT_ID in classic.histograms));
+  Assert.ok(!(COUNT_ID in subsession.histograms));
+  Assert.ok(KEYED_ID in classic.keyedHistograms);
+  Assert.ok(KEYED_ID in subsession.keyedHistograms);
+  Assert.deepEqual(classic.keyedHistograms[KEYED_ID], {});
+  Assert.deepEqual(subsession.keyedHistograms[KEYED_ID], {});
+
+  checkHistograms(classic.histograms, subsession.histograms);
+  checkKeyedHistograms(classic.keyedHistograms, subsession.keyedHistograms);
+
+  // Adding values should get picked up in both.
+  count.add(1);
+  keyed.add("a", 1);
+  keyed.add("b", 1);
+  classic = TelemetrySession.getPayload();
+  subsession = TelemetrySession.getPayload("environment-change");
+
+  Assert.ok(COUNT_ID in classic.histograms);
+  Assert.ok(COUNT_ID in subsession.histograms);
+  Assert.ok(KEYED_ID in classic.keyedHistograms);
+  Assert.ok(KEYED_ID in subsession.keyedHistograms);
+  Assert.equal(classic.histograms[COUNT_ID].sum, 1);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["a"].sum, 1);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["b"].sum, 1);
+
+  checkHistograms(classic.histograms, subsession.histograms);
+  checkKeyedHistograms(classic.keyedHistograms, subsession.keyedHistograms);
+
+  // Values should still reset properly.
+  count.clear();
+  keyed.clear();
+  classic = TelemetrySession.getPayload();
+  subsession = TelemetrySession.getPayload("environment-change");
+
+  Assert.ok(!(COUNT_ID in classic.histograms));
+  Assert.ok(!(COUNT_ID in subsession.histograms));
+  Assert.ok(KEYED_ID in classic.keyedHistograms);
+  Assert.ok(KEYED_ID in subsession.keyedHistograms);
+  Assert.deepEqual(classic.keyedHistograms[KEYED_ID], {});
+
+  checkHistograms(classic.histograms, subsession.histograms);
+  checkKeyedHistograms(classic.keyedHistograms, subsession.keyedHistograms);
+
+  // Adding values should get picked up in both.
+  count.add(1);
+  keyed.add("a", 1);
+  keyed.add("b", 1);
+  classic = TelemetrySession.getPayload();
+  subsession = TelemetrySession.getPayload("environment-change");
+
+  Assert.ok(COUNT_ID in classic.histograms);
+  Assert.ok(COUNT_ID in subsession.histograms);
+  Assert.ok(KEYED_ID in classic.keyedHistograms);
+  Assert.ok(KEYED_ID in subsession.keyedHistograms);
+  Assert.equal(classic.histograms[COUNT_ID].sum, 1);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["a"].sum, 1);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["b"].sum, 1);
+
+  checkHistograms(classic.histograms, subsession.histograms);
+  checkKeyedHistograms(classic.keyedHistograms, subsession.keyedHistograms);
+
+  // We should be able to reset only the subsession histograms.
+  // First check that "snapshot and clear" still returns the old state...
+  classic = TelemetrySession.getPayload();
+  subsession = TelemetrySession.getPayload("environment-change", true);
+
+  let subsessionStartDate = new Date(classic.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), expectedDate.toISOString());
+  subsessionStartDate = new Date(subsession.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), expectedDate.toISOString());
+  checkHistograms(classic.histograms, subsession.histograms);
+  checkKeyedHistograms(classic.keyedHistograms, subsession.keyedHistograms);
+
+  // ... then check that the next snapshot shows the subsession
+  // histograms got reset.
+  classic = TelemetrySession.getPayload();
+  subsession = TelemetrySession.getPayload("environment-change");
+
+  Assert.ok(COUNT_ID in classic.histograms);
+  Assert.ok(COUNT_ID in subsession.histograms);
+  Assert.equal(classic.histograms[COUNT_ID].sum, 1);
+  Assert.equal(subsession.histograms[COUNT_ID].sum, 0);
+
+  Assert.ok(KEYED_ID in classic.keyedHistograms);
+  Assert.ok(KEYED_ID in subsession.keyedHistograms);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["a"].sum, 1);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["b"].sum, 1);
+  Assert.deepEqual(subsession.keyedHistograms[KEYED_ID], {});
+
+  // Adding values should get picked up in both again.
+  count.add(1);
+  keyed.add("a", 1);
+  keyed.add("b", 1);
+  classic = TelemetrySession.getPayload();
+  subsession = TelemetrySession.getPayload("environment-change");
+
+  Assert.ok(COUNT_ID in classic.histograms);
+  Assert.ok(COUNT_ID in subsession.histograms);
+  Assert.equal(classic.histograms[COUNT_ID].sum, 2);
+  Assert.equal(subsession.histograms[COUNT_ID].sum, 1);
+
+  Assert.ok(KEYED_ID in classic.keyedHistograms);
+  Assert.ok(KEYED_ID in subsession.keyedHistograms);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["a"].sum, 2);
+  Assert.equal(classic.keyedHistograms[KEYED_ID]["b"].sum, 2);
+  Assert.equal(subsession.keyedHistograms[KEYED_ID]["a"].sum, 1);
+  Assert.equal(subsession.keyedHistograms[KEYED_ID]["b"].sum, 1);
+});
+
+add_task(function* test_dailyCollection() {
+  if (gIsAndroid) {
+    // We don't do daily collections yet on Android.
+    return;
+  }
+
+  let now = new Date(2030, 1, 1, 12, 0, 0);
+  let nowDay = new Date(2030, 1, 1, 0, 0, 0);
+  let timerCallback = null;
+  let timerDelay = null;
+
+  gRequestIterator = Iterator(new Request());
+
+  fakeNow(now);
+  fakeDailyTimers((callback, timeout) => {
+    dump("fake setDailyTimeout(" + callback + ", " + timeout + ")\n");
+    timerCallback = callback;
+    timerDelay = timeout;
+    return 1;
+  }, () => {});
+
+  // Init and check timer.
+  yield TelemetrySession.setup();
+  TelemetryPing.setServer("http://localhost:" + gHttpServer.identity.primaryPort);
+
+  Assert.ok(!!timerCallback);
+  Assert.ok(Number.isFinite(timerDelay));
+  let timerDate = futureDate(now, timerDelay);
+  let expectedDate = futureDate(nowDay, MS_IN_ONE_DAY);
+  Assert.equal(timerDate.toISOString(), expectedDate.toISOString());
+
+  // Set histograms to expected state.
+  const COUNT_ID = "TELEMETRY_TEST_COUNT";
+  const KEYED_ID = "TELEMETRY_TEST_KEYED_COUNT";
+  const count = Telemetry.getHistogramById(COUNT_ID);
+  const keyed = Telemetry.getKeyedHistogramById(KEYED_ID);
+
+  count.clear();
+  keyed.clear();
+  count.add(1);
+  keyed.add("a", 1);
+  keyed.add("b", 1);
+  keyed.add("b", 1);
+
+  // Trigger and collect daily ping.
+  yield timerCallback();
+  let request = yield gRequestIterator.next();
+  Assert.ok(!!request);
+  let ping = decodeRequestPayload(request);
+
+  Assert.equal(ping.type, PING_TYPE_MAIN);
+  Assert.equal(ping.payload.info.reason, REASON_DAILY);
+  let subsessionStartDate = new Date(ping.payload.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), nowDay.toISOString());
+
+  Assert.equal(ping.payload.histograms[COUNT_ID].sum, 1);
+  Assert.equal(ping.payload.keyedHistograms[KEYED_ID]["a"].sum, 1);
+  Assert.equal(ping.payload.keyedHistograms[KEYED_ID]["b"].sum, 2);
+
+  // Trigger and collect another ping. The histograms should be reset.
+  yield timerCallback();
+  request = yield gRequestIterator.next();
+  Assert.ok(!!request);
+  ping = decodeRequestPayload(request);
+
+  Assert.equal(ping.type, PING_TYPE_MAIN);
+  Assert.equal(ping.payload.info.reason, REASON_DAILY);
+  subsessionStartDate = new Date(ping.payload.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), nowDay.toISOString());
+
+  Assert.equal(ping.payload.histograms[COUNT_ID].sum, 0);
+  Assert.deepEqual(ping.payload.keyedHistograms[KEYED_ID], {});
+
+  // Trigger and collect another daily ping, with the histograms being set again.
+  count.add(1);
+  keyed.add("a", 1);
+  keyed.add("b", 1);
+
+  yield timerCallback();
+  request = yield gRequestIterator.next();
+  Assert.ok(!!request);
+  ping = decodeRequestPayload(request);
+
+  Assert.equal(ping.type, PING_TYPE_MAIN);
+  Assert.equal(ping.payload.info.reason, REASON_DAILY);
+  subsessionStartDate = new Date(ping.payload.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), nowDay.toISOString());
+
+  Assert.equal(ping.payload.histograms[COUNT_ID].sum, 1);
+  Assert.equal(ping.payload.keyedHistograms[KEYED_ID]["a"].sum, 1);
+  Assert.equal(ping.payload.keyedHistograms[KEYED_ID]["b"].sum, 1);
+});
+
+add_task(function* test_environmentChange() {
+  if (gIsAndroid) {
+    // We don't split subsessions on environment changes yet on Android.
+    return;
+  }
+
+  let now = new Date(2040, 1, 1, 12, 0, 0);
+  let nowDay = new Date(2040, 1, 1, 0, 0, 0);
+  let timerCallback = null;
+  let timerDelay = null;
+
+  gRequestIterator = Iterator(new Request());
+
+  fakeNow(now);
+  fakeDailyTimers(() => {}, () => {});
+
+  const PREF_TEST = "toolkit.telemetry.test.pref1";
+  Preferences.reset(PREF_TEST);
+  let prefsToWatch = {};
+  prefsToWatch[PREF_TEST] = TelemetryEnvironment.RECORD_PREF_VALUE;
+
+  // Setup.
+  yield TelemetrySession.setup();
+  TelemetryPing.setServer("http://localhost:" + gHttpServer.identity.primaryPort);
+  TelemetryEnvironment._watchPreferences(prefsToWatch);
+
+  // Set histograms to expected state.
+  const COUNT_ID = "TELEMETRY_TEST_COUNT";
+  const KEYED_ID = "TELEMETRY_TEST_KEYED_COUNT";
+  const count = Telemetry.getHistogramById(COUNT_ID);
+  const keyed = Telemetry.getKeyedHistogramById(KEYED_ID);
+
+  count.clear();
+  keyed.clear();
+  count.add(1);
+  keyed.add("a", 1);
+  keyed.add("b", 1);
+
+  // Trigger and collect environment-change ping.
+  Preferences.set(PREF_TEST, 1);
+  let request = yield gRequestIterator.next();
+  Assert.ok(!!request);
+  let ping = decodeRequestPayload(request);
+
+  Assert.equal(ping.type, PING_TYPE_MAIN);
+  Assert.equal(ping.environment.settings.userPrefs[PREF_TEST], 1);
+  Assert.equal(ping.payload.info.reason, REASON_ENVIRONMENT_CHANGE);
+  let subsessionStartDate = new Date(ping.payload.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), nowDay.toISOString());
+
+  Assert.equal(ping.payload.histograms[COUNT_ID].sum, 1);
+  Assert.equal(ping.payload.keyedHistograms[KEYED_ID]["a"].sum, 1);
+
+  // Trigger and collect another ping. The histograms should be reset.
+  Preferences.set(PREF_TEST, 2);
+  request = yield gRequestIterator.next();
+  Assert.ok(!!request);
+  ping = decodeRequestPayload(request);
+
+  Assert.equal(ping.type, PING_TYPE_MAIN);
+  Assert.equal(ping.environment.settings.userPrefs[PREF_TEST], 2);
+  Assert.equal(ping.payload.info.reason, REASON_ENVIRONMENT_CHANGE);
+  subsessionStartDate = new Date(ping.payload.info.subsessionStartDate);
+  Assert.equal(subsessionStartDate.toISOString(), nowDay.toISOString());
+
+  Assert.equal(ping.payload.histograms[COUNT_ID].sum, 0);
+  Assert.deepEqual(ping.payload.keyedHistograms[KEYED_ID], {});
+});
+
+// Checks that an expired histogram file is deleted when loaded.
+add_task(function* test_runOldPingFile() {
+  let histogramsFile = getSavedPingFile("old-histograms.dat");
+
+  yield TelemetrySession.testSaveHistograms(histogramsFile);
+  do_check_true(histogramsFile.exists());
+  let mtime = histogramsFile.lastModifiedTime;
+  histogramsFile.lastModifiedTime = mtime - (14 * 24 * 60 * 60 * 1000 + 60000); // 14 days, 1m
+
+  yield TelemetryFile.testLoadHistograms(histogramsFile);
+  do_check_false(histogramsFile.exists());
+});
+
+add_task(function* test_savedSessionClientID() {
+  // 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;
+  yield OS.File.removeDir(dir, {ignoreAbsent: true});
+  yield OS.File.makeDir(dir);
+  yield TelemetrySession.shutdown();
+
+  yield TelemetryFile.loadSavedPings();
+  Assert.equal(TelemetryFile.pingsLoaded, 1);
+  let ping = TelemetryFile.popPendingPings().next();
+  Assert.equal(ping.value.clientId, gDataReportingClientID);
+});
+
+add_task(function* test_savedSessionData() {
+  // Create the directory which will contain the data file, if it doesn't already
+  // exist.
+  const dataDir  = OS.Path.join(OS.Constants.Path.profileDir, "datareporting");
+  yield OS.File.makeDir(dataDir);
+
+  // Write test data to the session data file.
+  const dataFilePath = OS.Path.join(dataDir, "session-state.json");
+  const sessionState = {
+    previousSubsessionId: null,
+    profileSubsessionCounter: 3785,
+  };
+  yield CommonUtils.writeJSON(sessionState, dataFilePath);
+
+  const PREF_TEST = "toolkit.telemetry.test.pref1";
+  Preferences.reset(PREF_TEST);
+  let prefsToWatch = {};
+  prefsToWatch[PREF_TEST] = TelemetryEnvironment.RECORD_PREF_VALUE;
+
+  // We expect one new subsession when starting TelemetrySession and one after triggering
+  // an environment change.
+  const expectedSubsessions = sessionState.profileSubsessionCounter + 2;
+  const expectedUUID = "009fd1ad-b85e-4817-b3e5-000000003785";
+  fakeGenerateUUID(generateUUID, () => expectedUUID);
+
+  if (gIsAndroid) {
+    // We don't support subsessions yet on Android, so skip the next checks.
+    return;
+  }
+
+  // Start TelemetrySession so that it loads the session data file.
+  yield TelemetrySession.reset();
+  // Watch a test preference, trigger and environment change and wait for it to propagate.
+  TelemetryEnvironment._watchPreferences(prefsToWatch);
+  let changePromise = new Promise(resolve =>
+    TelemetryEnvironment.registerChangeListener("test_fake_change", resolve));
+  Preferences.set(PREF_TEST, 1);
+  yield changePromise;
+  TelemetryEnvironment.unregisterChangeListener("test_fake_change");
+
+  let payload = TelemetrySession.getPayload();
+  Assert.equal(payload.info.profileSubsessionCounter, expectedSubsessions);
+  yield TelemetrySession.shutdown();
+
+  // Load back the serialised session data.
+  let data = yield CommonUtils.readJSON(dataFilePath);
+  Assert.equal(data.profileSubsessionCounter, expectedSubsessions);
+  Assert.equal(data.previousSubsessionId, expectedUUID);
+});
+
+add_task(function* test_invalidSessionData() {
+  // Create the directory which will contain the data file, if it doesn't already
+  // exist.
+  const dataDir  = OS.Path.join(OS.Constants.Path.profileDir, "datareporting");
+  yield OS.File.makeDir(dataDir);
+
+  // Write test data to the session data file.
+  const dataFilePath = OS.Path.join(dataDir, "session-state.json");
+  const sessionState = {
+    profileSubsessionCounter: "not-a-number?",
+    someOtherField: 12,
+  };
+  yield CommonUtils.writeJSON(sessionState, dataFilePath);
+
+  // The session data file should not load. Only expect the current subsession.
+  const expectedSubsessions = 1;
+  const expectedUUID = "009fd1ad-b85e-4817-b3e5-000000003785";
+  fakeGenerateUUID(() => expectedUUID, () => expectedUUID);
+  // Start TelemetrySession so that it loads the session data file.
+  yield TelemetrySession.reset();
+  let payload = TelemetrySession.getPayload();
+  Assert.equal(payload.info.profileSubsessionCounter, expectedSubsessions);
+  yield TelemetrySession.shutdown();
+
+  // Load back the serialised session data.
+  let data = yield CommonUtils.readJSON(dataFilePath);
+  Assert.equal(data.profileSubsessionCounter, expectedSubsessions);
+  Assert.equal(data.previousSubsessionId, null);
+});
+
+add_task(function* stopServer(){
+  gHttpServer.stop(do_test_finished);
+});
+
+// An iterable sequence of http requests
+function Request() {
+  let defers = [];
+  let current = 0;
+
+  function RequestIterator() {}
+
+  // Returns a promise that resolves to the next http request
+  RequestIterator.prototype.next = function() {
+    let deferred = defers[current++];
+    return deferred.promise;
+  }
+
+  this.__iterator__ = function(){
+    return new RequestIterator();
+  }
+
+  registerPingHandler((request, response) => {
+    let deferred = defers[defers.length - 1];
+    defers.push(Promise.defer());
+    deferred.resolve(request);
+  });
+
+  defers.push(Promise.defer());
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini	2015-02-28 15:03:07.000000000 +0000
@@ -2,8 +2,25 @@
 head = head.js
 tail = 
 skip-if = toolkit == 'gonk'
+# The *.xpi files are only needed for test_TelemetryEnvironment.js, but
+# xpcshell fails to install tests if we move them under the test entry.
+support-files =
+  dictionary.xpi
+  experiment.xpi
+  extension.xpi
+  extension-2.xpi
+  restartless.xpi
+  theme.xpi
+generated-files =
+  dictionary.xpi
+  experiment.xpi
+  extension.xpi
+  extension-2.xpi
+  restartless.xpi
+  theme.xpi
 
 [test_nsITelemetry.js]
+[test_TelemetryEnvironment.js]
 [test_TelemetryFlagClear.js]
 [test_TelemetryLateWrites.js]
 [test_TelemetryLockCount.js]
@@ -17,5 +34,6 @@
 [test_ThirdPartyCookieProbe.js]
 [test_TelemetrySendOldPings.js]
 skip-if = debug == true || os == "android" # Disabled due to intermittent orange on Android
+[test_TelemetrySession.js]
 [test_ThreadHangStats.js]
 run-sequentially = Bug 1046307, test can fail intermittently when CPU load is high
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/ChunkSet.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/ChunkSet.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/ChunkSet.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/ChunkSet.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -41,19 +41,13 @@
 {
   size_t idx = mChunks.BinaryIndexOf(aChunk);
   if (idx == nsTArray<uint32_t>::NoIndex) {
-    mChunks.InsertElementSorted(aChunk);
+    if (!mChunks.InsertElementSorted(aChunk)) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
   }
   return NS_OK;
 }
 
-nsresult
-ChunkSet::Unset(uint32_t aChunk)
-{
-  mChunks.RemoveElementSorted(aChunk);
-
-  return NS_OK;
-}
-
 bool
 ChunkSet::Has(uint32_t aChunk) const
 {
@@ -87,7 +81,9 @@
     }
   }
 
-  mChunks.SetLength(addIter - mChunks.Elements());
+  if (!mChunks.SetLength(addIter - mChunks.Elements())) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
 
   return NS_OK;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/ChunkSet.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/ChunkSet.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/ChunkSet.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/ChunkSet.h	2015-02-28 15:03:07.000000000 +0000
@@ -6,7 +6,6 @@
 #ifndef ChunkSet_h__
 #define ChunkSet_h__
 
-
 #include "Entries.h"
 #include "nsString.h"
 #include "nsTArray.h"
@@ -27,28 +26,21 @@
 
   nsresult Serialize(nsACString& aStr);
   nsresult Set(uint32_t aChunk);
-  nsresult Unset(uint32_t aChunk);
-  void Clear();
-  nsresult Merge(const ChunkSet& aOther);
-  nsresult Remove(const ChunkSet& aOther);
-
   bool Has(uint32_t chunk) const;
-
+  nsresult Merge(const ChunkSet& aOther);
   uint32_t Length() const { return mChunks.Length(); }
+  nsresult Remove(const ChunkSet& aOther);
+  void Clear();
 
   nsresult Write(nsIOutputStream* aOut) {
     return WriteTArray(aOut, mChunks);
   }
-
   nsresult Read(nsIInputStream* aIn, uint32_t aNumElements) {
     return ReadTArray(aIn, &mChunks, aNumElements);
   }
 
-  uint32_t *Begin() { return mChunks.Elements(); }
-  uint32_t *End() { return mChunks.Elements() + mChunks.Length(); }
-
 private:
-  nsTArray<uint32_t> mChunks;
+  FallibleTArray<uint32_t> mChunks;
 };
 
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/HashStore.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/HashStore.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/HashStore.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/HashStore.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -123,41 +123,48 @@
 const uint32_t STORE_MAGIC = 0x1231af3b;
 const uint32_t CURRENT_VERSION = 3;
 
-void
+nsresult
 TableUpdate::NewAddPrefix(uint32_t aAddChunk, const Prefix& aHash)
 {
   AddPrefix *add = mAddPrefixes.AppendElement();
+  if (!add) return NS_ERROR_OUT_OF_MEMORY;
   add->addChunk = aAddChunk;
   add->prefix = aHash;
+  return NS_OK;
 }
 
-void
+nsresult
 TableUpdate::NewSubPrefix(uint32_t aAddChunk, const Prefix& aHash, uint32_t aSubChunk)
 {
   SubPrefix *sub = mSubPrefixes.AppendElement();
+  if (!sub) return NS_ERROR_OUT_OF_MEMORY;
   sub->addChunk = aAddChunk;
   sub->prefix = aHash;
   sub->subChunk = aSubChunk;
+  return NS_OK;
 }
 
-void
+nsresult
 TableUpdate::NewAddComplete(uint32_t aAddChunk, const Completion& aHash)
 {
   AddComplete *add = mAddCompletes.AppendElement();
+  if (!add) return NS_ERROR_OUT_OF_MEMORY;
   add->addChunk = aAddChunk;
   add->complete = aHash;
+  return NS_OK;
 }
 
-void
+nsresult
 TableUpdate::NewSubComplete(uint32_t aAddChunk, const Completion& aHash, uint32_t aSubChunk)
 {
   SubComplete *sub = mSubCompletes.AppendElement();
+  if (!sub) return NS_ERROR_OUT_OF_MEMORY;
   sub->addChunk = aAddChunk;
   sub->complete = aHash;
   sub->subChunk = aSubChunk;
+  return NS_OK;
 }
 
-
 HashStore::HashStore(const nsACString& aTableName, nsIFile* aStoreDir)
   : mTableName(aTableName)
   , mStoreDirectory(aStoreDir)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/HashStore.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/HashStore.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/HashStore.h	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/HashStore.h	2015-02-28 15:03:07.000000000 +0000
@@ -39,18 +39,28 @@
 
   // Throughout, uint32_t aChunk refers only to the chunk number. Chunk data is
   // stored in the Prefix structures.
-  void NewAddChunk(uint32_t aChunk) { mAddChunks.Set(aChunk); }
-  void NewSubChunk(uint32_t aChunk) { mSubChunks.Set(aChunk); }
-
-  void NewAddExpiration(uint32_t aChunk) { mAddExpirations.Set(aChunk); }
-  void NewSubExpiration(uint32_t aChunk) { mSubExpirations.Set(aChunk); }
-
-  void NewAddPrefix(uint32_t aAddChunk, const Prefix& aPrefix);
-  void NewSubPrefix(uint32_t aAddChunk, const Prefix& aPrefix, uint32_t aSubChunk);
-
-  void NewAddComplete(uint32_t aChunk, const Completion& aCompletion);
-  void NewSubComplete(uint32_t aAddChunk, const Completion& aCompletion,
-                      uint32_t aSubChunk);
+  NS_WARN_UNUSED_RESULT nsresult NewAddChunk(uint32_t aChunk) {
+    return mAddChunks.Set(aChunk);
+  };
+  NS_WARN_UNUSED_RESULT nsresult NewSubChunk(uint32_t aChunk) {
+    return mSubChunks.Set(aChunk);
+  };
+  NS_WARN_UNUSED_RESULT nsresult NewAddExpiration(uint32_t aChunk) {
+    return mAddExpirations.Set(aChunk);
+  };
+  NS_WARN_UNUSED_RESULT nsresult NewSubExpiration(uint32_t aChunk) {
+    return mSubExpirations.Set(aChunk);
+  };
+  NS_WARN_UNUSED_RESULT nsresult NewAddPrefix(uint32_t aAddChunk,
+                        const Prefix& aPrefix);
+  NS_WARN_UNUSED_RESULT nsresult NewSubPrefix(uint32_t aAddChunk,
+                                               const Prefix& aPrefix,
+                                               uint32_t aSubChunk);
+  NS_WARN_UNUSED_RESULT nsresult NewAddComplete(uint32_t aChunk,
+                                                const Completion& aCompletion);
+  NS_WARN_UNUSED_RESULT nsresult NewSubComplete(uint32_t aAddChunk,
+                                                const Completion& aCompletion,
+                                                uint32_t aSubChunk);
   void SetLocalUpdate(void) { mLocalUpdate = true; }
   bool IsLocalUpdate(void) { return mLocalUpdate; }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -669,9 +669,17 @@
       TableUpdate * tu = pParse->GetTableUpdate(resultsPtr->ElementAt(i).table);
       LOG(("CacheCompletion Addchunk %d hash %X", resultsPtr->ElementAt(i).entry.addChunk,
            resultsPtr->ElementAt(i).entry.ToUint32()));
-      tu->NewAddComplete(resultsPtr->ElementAt(i).entry.addChunk,
-                         resultsPtr->ElementAt(i).entry.complete);
-      tu->NewAddChunk(resultsPtr->ElementAt(i).entry.addChunk);
+      rv = tu->NewAddComplete(resultsPtr->ElementAt(i).entry.addChunk,
+                              resultsPtr->ElementAt(i).entry.complete);
+      if (NS_FAILED(rv)) {
+        // We can bail without leaking here because ForgetTableUpdates
+        // hasn't been called yet.
+        return rv;
+      }
+      rv = tu->NewAddChunk(resultsPtr->ElementAt(i).entry.addChunk);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
       tu->SetLocalUpdate();
       updates.AppendElement(tu);
       pParse->ForgetTableUpdates();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/ProtocolParser.cpp	2015-02-28 15:03:07.000000000 +0000
@@ -27,6 +27,8 @@
 
 // Updates will fail if fed chunks larger than this
 const uint32_t MAX_CHUNK_SIZE = (1024 * 1024);
+// Updates will fail if the total number of tocuhed chunks is larger than this
+const uint32_t MAX_CHUNK_RANGE = 1000000;
 
 const uint32_t DOMAIN_SIZE = 4;
 
@@ -171,11 +173,20 @@
   while (begin != end) {
     uint32_t first, last;
     if (ParseChunkRange(begin, end, &first, &last)) {
+      if (last < first) return NS_ERROR_FAILURE;
+      if (last - first > MAX_CHUNK_RANGE) return NS_ERROR_FAILURE;
       for (uint32_t num = first; num <= last; num++) {
-        if (aLine[0] == 'a')
-          mTableUpdate->NewAddExpiration(num);
-        else
-          mTableUpdate->NewSubExpiration(num);
+        if (aLine[0] == 'a') {
+          nsresult rv = mTableUpdate->NewAddExpiration(num);
+          if (NS_FAILED(rv)) {
+            return rv;
+          }
+        } else {
+          nsresult rv = mTableUpdate->NewSubExpiration(num);
+          if (NS_FAILED(rv)) {
+            return rv;
+          }
+        }
       }
     } else {
       return NS_ERROR_FAILURE;
@@ -226,18 +237,31 @@
     LOG(("Processing digest256 data"));
     mChunkState.type = (command == 'a') ? CHUNK_ADD_DIGEST : CHUNK_SUB_DIGEST;
   }
+  nsresult rv;
   switch (mChunkState.type) {
     case CHUNK_ADD:
-      mTableUpdate->NewAddChunk(mChunkState.num);
+      rv = mTableUpdate->NewAddChunk(mChunkState.num);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
       break;
     case CHUNK_SUB:
-      mTableUpdate->NewSubChunk(mChunkState.num);
+      rv = mTableUpdate->NewSubChunk(mChunkState.num);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
       break;
     case CHUNK_ADD_DIGEST:
-      mTableUpdate->NewAddChunk(mChunkState.num);
+      rv = mTableUpdate->NewAddChunk(mChunkState.num);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
       break;
     case CHUNK_SUB_DIGEST:
-      mTableUpdate->NewSubChunk(mChunkState.num);
+      rv = mTableUpdate->NewSubChunk(mChunkState.num);
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
       break;
   }
 
@@ -323,12 +347,18 @@
       if (mChunkState.hashSize == COMPLETE_SIZE) {
         Completion hash;
         hash.FromPlaintext(line, mCryptoHash);
-        mTableUpdate->NewAddComplete(mChunkState.num, hash);
+        nsresult rv = mTableUpdate->NewAddComplete(mChunkState.num, hash);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
       } else {
         NS_ASSERTION(mChunkState.hashSize == 4, "Only 32- or 4-byte hashes can be used for add chunks.");
         Prefix hash;
         hash.FromPlaintext(line, mCryptoHash);
-        mTableUpdate->NewAddPrefix(mChunkState.num, hash);
+        nsresult rv = mTableUpdate->NewAddPrefix(mChunkState.num, hash);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
       }
     } else {
       nsCString::const_iterator begin, iter, end;
@@ -346,12 +376,18 @@
       if (mChunkState.hashSize == COMPLETE_SIZE) {
         Completion hash;
         hash.FromPlaintext(Substring(iter, end), mCryptoHash);
-        mTableUpdate->NewSubComplete(addChunk, hash, mChunkState.num);
+        nsresult rv = mTableUpdate->NewSubComplete(addChunk, hash, mChunkState.num);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
       } else {
         NS_ASSERTION(mChunkState.hashSize == 4, "Only 32- or 4-byte hashes can be used for add chunks.");
         Prefix hash;
         hash.FromPlaintext(Substring(iter, end), mCryptoHash);
-        mTableUpdate->NewSubPrefix(addChunk, hash, mChunkState.num);
+        nsresult rv = mTableUpdate->NewSubPrefix(addChunk, hash, mChunkState.num);
+        if (NS_FAILED(rv)) {
+          return rv;
+        }
       }
     }
   }
@@ -418,7 +454,10 @@
     Completion hash;
     hash.Assign(Substring(aChunk, start, COMPLETE_SIZE));
     start += COMPLETE_SIZE;
-    mTableUpdate->NewAddComplete(mChunkState.num, hash);
+    nsresult rv = mTableUpdate->NewAddComplete(mChunkState.num, hash);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
   }
   return NS_OK;
 }
@@ -445,7 +484,10 @@
     hash.Assign(Substring(aChunk, start, COMPLETE_SIZE));
     start += COMPLETE_SIZE;
 
-    mTableUpdate->NewSubComplete(addChunk, hash, mChunkState.num);
+    nsresult rv = mTableUpdate->NewSubComplete(addChunk, hash, mChunkState.num);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
   }
   return NS_OK;
 }
@@ -458,7 +500,10 @@
                "ProcessHostAdd should only be called for prefix hashes.");
 
   if (aNumEntries == 0) {
-    mTableUpdate->NewAddPrefix(mChunkState.num, aDomain);
+    nsresult rv = mTableUpdate->NewAddPrefix(mChunkState.num, aDomain);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
     return NS_OK;
   }
 
@@ -470,7 +515,10 @@
   for (uint8_t i = 0; i < aNumEntries; i++) {
     Prefix hash;
     hash.Assign(Substring(aChunk, *aStart, PREFIX_SIZE));
-    mTableUpdate->NewAddPrefix(mChunkState.num, hash);
+    nsresult rv = mTableUpdate->NewAddPrefix(mChunkState.num, hash);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
     *aStart += PREFIX_SIZE;
   }
 
@@ -497,7 +545,10 @@
     memcpy(&addChunk, addChunkStr.BeginReading(), 4);
     addChunk = PR_ntohl(addChunk);
 
-    mTableUpdate->NewSubPrefix(addChunk, aDomain, mChunkState.num);
+    nsresult rv = mTableUpdate->NewSubPrefix(addChunk, aDomain, mChunkState.num);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
     return NS_OK;
   }
 
@@ -518,7 +569,10 @@
     prefix.Assign(Substring(aChunk, *aStart, PREFIX_SIZE));
     *aStart += PREFIX_SIZE;
 
-    mTableUpdate->NewSubPrefix(addChunk, prefix, mChunkState.num);
+    nsresult rv = mTableUpdate->NewSubPrefix(addChunk, prefix, mChunkState.num);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
   }
 
   return NS_OK;
@@ -546,7 +600,10 @@
   for (uint8_t i = 0; i < aNumEntries; i++) {
     Completion hash;
     hash.Assign(Substring(aChunk, *aStart, COMPLETE_SIZE));
-    mTableUpdate->NewAddComplete(mChunkState.num, hash);
+    nsresult rv = mTableUpdate->NewAddComplete(mChunkState.num, hash);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
     *aStart += COMPLETE_SIZE;
   }
 
@@ -583,7 +640,10 @@
     memcpy(&addChunk, addChunkStr.BeginReading(), 4);
     addChunk = PR_ntohl(addChunk);
 
-    mTableUpdate->NewSubComplete(addChunk, hash, mChunkState.num);
+    nsresult rv = mTableUpdate->NewSubComplete(addChunk, hash, mChunkState.num);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
   }
 
   return NS_OK;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/tests/mochitest/test_allowlisted_annotations.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/tests/mochitest/test_allowlisted_annotations.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/url-classifier/tests/mochitest/test_allowlisted_annotations.html	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/url-classifier/tests/mochitest/test_allowlisted_annotations.html	2015-02-28 15:03:08.000000000 +0000
@@ -21,8 +21,6 @@
 SpecialPowers.addPermission("trackingprotection",
                             Ci.nsIPermissionManager.ALLOW_ACTION,
                             { url: "https://allowlisted.example.com" });
-// Enable synthetic allowlist URL in nsChannelClassifier
-SpecialPowers.setBoolPref("channelclassifier.allowlist_example", true);
 
 // Add some URLs to the tracking database
 var testData = "tracking.example.com/";
@@ -40,8 +38,6 @@
   ok(!SpecialPowers.testPermission("trackingprotection",
                                    Ci.nsIPermissionManager.ALLOW_ACTION,
                                    { url: "https://allowlisted.example.com" }));
-  SpecialPowers.clearUserPref("privacy.trackingprotection.enabled");
-  SpecialPowers.clearUserPref("channelclassifier.allowlist_example");
 }
 
 function doUpdate(update) {
@@ -62,7 +58,6 @@
       SimpleTest.finish();
     },
     updateSuccess: function(requestedTimeout) {
-      SpecialPowers.setBoolPref("privacy.trackingprotection.enabled", true);
       document.getElementById("testFrame").src = "allowlistAnnotatedFrame.html";
     }
   };
@@ -75,7 +70,9 @@
 }
 
 SpecialPowers.pushPrefEnv(
-  {"set" : [["urlclassifier.trackingTable", "test-track-simple"]]},
+  {"set" : [["urlclassifier.trackingTable", "test-track-simple"],
+            ["privacy.trackingprotection.enabled", true],
+            ["channelclassifier.allowlist_example", true]]},
   function() { doUpdate(testUpdate); });
 
 // Expected finish() call is in "allowlistedAnnotatedFrame.html".
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/viewconfig/content/config.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/viewconfig/content/config.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/components/viewconfig/content/config.xul	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/components/viewconfig/content/config.xul	2015-02-28 15:03:08.000000000 +0000
@@ -60,7 +60,7 @@
       <vbox class="description" flex="1">
         <label id="warningText">&aboutWarningText.label;</label>
         <checkbox id="showWarningNextTime" label="&aboutWarningCheckbox.label;" checked="true"/>
-        <hbox pack="center">
+        <hbox class="button-container">
           <button id="warningButton" class="primary" oncommand="ShowPrefs();" label="&aboutWarningButton.label;"/>
         </hbox>
       </vbox>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/aboutSupport.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/aboutSupport.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/aboutSupport.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/aboutSupport.js	2015-02-28 15:03:08.000000000 +0000
@@ -21,7 +21,7 @@
     for (let prop in snapshotFormatters)
       snapshotFormatters[prop](snapshot[prop]);
   });
-  populateResetBox();
+  populateActionBox();
   setupEventListeners();
   } catch (e) {
     Cu.reportError("stack of load error for about:support: " + e + ": " + e.stack);
@@ -684,11 +684,27 @@
 /**
  * Profile reset is only supported for the default profile if the appropriate migrator exists.
  */
-function populateResetBox() {
-  if (ResetProfile.resetSupported())
-    $("reset-box").style.visibility = "visible";
+function populateActionBox() {
+  if (ResetProfile.resetSupported()) {
+    $("reset-box").style.display = "block";
+    $("action-box").style.display = "block";
+  }
+  if (!Services.appinfo.inSafeMode) {
+    $("safe-mode-box").style.display = "block";
+    $("action-box").style.display = "block";
+  }
 }
 
+// Prompt user to restart the browser in safe mode
+function safeModeRestart() {
+  let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
+                     .createInstance(Ci.nsISupportsPRBool);
+  Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
+
+  if (!cancelQuit.data) {
+    Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit);
+  }
+}
 /**
  * Set up event listeners for buttons.
  */
@@ -709,4 +725,12 @@
   $("profile-dir-button").addEventListener("click", function (event){
     openProfileDirectory();
   });
+  $("restart-in-safe-mode-button").addEventListener("click", function (event) {
+    if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) {
+      Services.obs.notifyObservers(null, "restart-in-safe-mode", "");
+    }
+    else {
+      safeModeRestart();
+    }
+  });
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/aboutSupport.xhtml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/aboutSupport.xhtml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/aboutSupport.xhtml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/aboutSupport.xhtml	2015-02-28 15:03:08.000000000 +0000
@@ -29,13 +29,21 @@
 
   <body dir="&locale.dir;">
 
-    <div id="reset-box">
-      <h3>&refreshProfile.title;</h3>
-      <button id="reset-box-button">
-        &refreshProfile.button.label;
-      </button>
-    </div>
+    <div id="action-box">
+      <div id="reset-box">
+        <h3>&refreshProfile.title;</h3>
+        <button id="reset-box-button">
+          &refreshProfile.button.label;
+        </button>
+      </div>
+      <div id="safe-mode-box">
+        <h3>&aboutSupport.safeModeTitle;</h3>
+        <button id="restart-in-safe-mode-button">
+          &aboutSupport.restartInSafeMode.label;
+        </button>
+      </div>
 
+    </div>
     <h1>
       &aboutSupport.pageTitle;
     </h1>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/browser-child.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/browser-child.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/browser-child.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/browser-child.js	2015-02-28 15:03:08.000000000 +0000
@@ -67,7 +67,8 @@
       aWebProgress = {
         isTopLevel: aWebProgress.isTopLevel,
         isLoadingDocument: aWebProgress.isLoadingDocument,
-        loadType: aWebProgress.loadType
+        loadType: aWebProgress.loadType,
+        DOMWindowID: aWebProgress.DOMWindowID,
       };
     }
 
@@ -540,6 +541,10 @@
                   getService(Components.interfaces.nsIAutoCompleteController);
       controller.handleEnter(message.data.isPopupSelection);
     });
+
+    addEventListener("unload", function() {
+      AutoCompletePopup.destroy();
+    });
   },
 
   destroy: function() {
@@ -588,14 +593,13 @@
 
 // We may not get any responses to Browser:Init if the browser element
 // is torn down too quickly.
-let initData = sendSyncMessage("Browser:Init");
+let outerWindowID = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                           .getInterface(Ci.nsIDOMWindowUtils)
+                           .outerWindowID;
+let initData = sendSyncMessage("Browser:Init", {outerWindowID: outerWindowID});
 if (initData.length) {
   docShell.useGlobalHistory = initData[0].useGlobalHistory;
   if (initData[0].initPopup) {
     setTimeout(() => AutoCompletePopup.init(), 0);
   }
 }
-
-addEventListener("unload", function() {
-  AutoCompletePopup.destroy();
-});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/browser-content.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/browser-content.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/browser-content.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/browser-content.js	2015-02-28 15:03:08.000000000 +0000
@@ -458,9 +458,17 @@
       printSettings = null;
     }
 
-    let print = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                             .getInterface(Ci.nsIWebBrowserPrint);
-    print.print(printSettings, null);
+    let rv = Cr.NS_OK;
+    try {
+      let print = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                               .getInterface(Ci.nsIWebBrowserPrint);
+      print.print(printSettings, null);
+    } catch(e) {
+      // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
+      // causing an exception to be thrown which we catch here.
+      rv = e.result;
+    }
+    sendAsyncMessage("Printing:Print:Done", { rv }, { printSettings });
   },
 
   updatePageCount() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/contentAreaUtils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/contentAreaUtils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/contentAreaUtils.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/contentAreaUtils.js	2015-02-28 15:03:08.000000000 +0000
@@ -1190,8 +1190,8 @@
                                                  null,      // aLoadingNode
                                                  Services.scriptSecurityManager.getSystemPrincipal(),
                                                  null,      // aTriggeringPrincipal
-                                                 Ci.nsILoadInfo.SEC_NORMAL,
-                                                 Ci.nsIContentPolicy.TYPE_OTHER);
+                                                 Components.interfaces.nsILoadInfo.SEC_NORMAL,
+                                                 Components.interfaces.nsIContentPolicy.TYPE_OTHER);
     var uriLoader = Components.classes["@mozilla.org/uriloader;1"]
                               .getService(Components.interfaces.nsIURILoader);
     uriLoader.openURI(channel,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/Makefile.in	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/Makefile.in	2015-02-28 15:03:08.000000000 +0000
@@ -16,7 +16,7 @@
 DEFINES += -DSOURCE_CHANGESET='$(MOZ_SOURCE_STAMP)'
 endif
 
-ifdef MOZILLA_OFFICIAL
+ifdef MOZ_INCLUDE_SOURCE_INFO
 source_repo ?= $(call getSourceRepo)
 ifneq (,$(filter http%,$(source_repo)))
   DEFINES += -DSOURCE_REPO='$(source_repo)'
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/file_autocomplete_with_composition.js	2015-02-28 15:03:08.000000000 +0000
@@ -86,7 +86,6 @@
     { description: "compositionstart shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "M",
@@ -95,7 +94,9 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "M", code: "KeyM", keyCode: KeyboardEvent.DOM_VK_M,
+                     shiftKey: true },
           }, aWindow);
       }, popup: false, value: "M", searchString: ""
     },
@@ -110,15 +111,16 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "o", code: "KeyO", keyCode: KeyboardEvent.DOM_VK_O },
           }, aWindow);
       }, popup: false, value: "Mo", searchString: ""
     },
     { description: "compositionend should open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
-        synthesizeKey("VK_RETURN", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis",
+          key: { key: "KEY_Enter", code: "Enter" } }, aWindow);
       }, popup: true, value: "Mo", searchString: "Mo"
     },
     // If composition starts when popup is shown, the compositionstart event
@@ -126,7 +128,6 @@
     { description: "compositionstart should close the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeKey("z", { type: "keydown" }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "z",
@@ -135,7 +136,8 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "z", code: "KeyZ", keyCode: KeyboardEvent.DOM_VK_Z },
           }, aWindow);
       }, popup: false, value: "Moz", searchString: "Mo"
     },
@@ -150,22 +152,22 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "i", code: "KeyI", keyCode: KeyboardEvent.DOM_VK_I },
           }, aWindow);
       }, popup: false, value: "Mozi", searchString: "Mo"
     },
     { description: "compositionend should research the result and open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
-        synthesizeKey("VK_RETURN", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis",
+          key: { key: "KEY_Enter", code: "Enter" } }, aWindow);
       }, popup: true, value: "Mozi", searchString: "Mozi"
     },
     // If composition is cancelled, the value shouldn't be changed.
     { description: "compositionstart should reclose the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeKey("l", { type: "keydown" }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "l",
@@ -174,7 +176,8 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "l", code: "KeyL", keyCode: KeyboardEvent.DOM_VK_L },
           }, aWindow);
       }, popup: false, value: "Mozil", searchString: "Mozi"
     },
@@ -189,7 +192,8 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "l", code: "KeyL", keyCode: KeyboardEvent.DOM_VK_L },
           }, aWindow);
       }, popup: false, value: "Mozill", searchString: "Mozi"
     },
@@ -211,8 +215,8 @@
     { description: "cancled compositionend should reopen the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommit", data: "" }, aWindow);
-        synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommit", data: "",
+          key: { key: "KEY_Escape", code: "Escape" } }, aWindow);
       }, popup: true, value: "Mozi", searchString: "Mozi"
     },
     // But if composition replaces some characters and canceled, the search
@@ -222,7 +226,6 @@
       execute: function (aWindow) {
         synthesizeKey("VK_LEFT", { shiftKey: true }, aWindow);
         synthesizeKey("VK_LEFT", { shiftKey: true }, aWindow);
-        synthesizeKey("z", { type: "keydown" }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "z",
@@ -231,7 +234,8 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "z", code: "KeyZ", keyCode: KeyboardEvent.DOM_VK_Z },
           }, aWindow);
       }, popup: false, value: "Moz", searchString: "Mozi"
     },
@@ -246,7 +250,8 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "i", code: "KeyI", keyCode: KeyboardEvent.DOM_VK_I },
           }, aWindow);
       }, popup: false, value: "Mozi", searchString: "Mozi"
     },
@@ -268,8 +273,8 @@
     { description: "canceled compositionend should seach the result with the latest value",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
-        synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis",
+          key: { key: "KEY_Escape", code: "Escape" } }, aWindow);
       }, popup: true, value: "Mo", searchString: "Mo"
     },
     //If all characters are removed, the popup should be closed.
@@ -284,7 +289,6 @@
     { description: "compositionstart shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "M",
@@ -293,7 +297,9 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "m", code: "KeyM", keyCode: KeyboardEvent.DOM_VK_M,
+                     shiftKey: true },
           }, aWindow);
       }, popup: false, value: "M", searchString: ""
     },
@@ -308,7 +314,8 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "o", code: "KeyO", keyCode: KeyboardEvent.DOM_VK_O },
           }, aWindow);
       }, popup: false, value: "Mo", searchString: ""
     },
@@ -330,8 +337,8 @@
     { description: "canceled compositionend shouldn't open the popup if it was closed",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
-        synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis",
+          key: { key: "KEY_Escape", code: "Escape" } }, aWindow);
       }, popup: false, value: "", searchString: ""
     },
     // Down key should open the popup even if the editor is empty.
@@ -346,7 +353,6 @@
     { description: "compositionstart shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "M",
@@ -355,7 +361,9 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "M", code: "KeyM", keyCode: KeyboardEvent.DOM_VK_M,
+                     shiftKey: true },
           }, aWindow);
       }, popup: false, value: "M", searchString: ""
     },
@@ -370,7 +378,8 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "o", code: "KeyO", keyCode: KeyboardEvent.DOM_VK_O },
           }, aWindow);
       }, popup: false, value: "Mo", searchString: ""
     },
@@ -392,8 +401,8 @@
     { description: "canceled compositionend should open the popup if it was opened",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
-        synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis",
+          key: { key: "KEY_Escape", code: "Escape" } }, aWindow);
       }, popup: true, value: "", searchString: ""
     },
     // Type normally, and hit escape, the popup should be closed.
@@ -411,7 +420,6 @@
     { description: "compositionstart shouldn't open the popup",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeKey("z", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "z",
@@ -420,7 +428,8 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "z", code: "KeyZ", keyCode: KeyboardEvent.DOM_VK_Z },
           }, aWindow);
       }, popup: false, value: "Moz", searchString: "Mo"
     },
@@ -435,7 +444,8 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "i", code: "KeyI", keyCode: KeyboardEvent.DOM_VK_I },
           }, aWindow);
       }, popup: false, value: "Mozi", searchString: "Mo"
     },
@@ -457,8 +467,8 @@
     { description: "canceled compositionend shouldn't open the popup if the popup was closed",
       completeDefaultIndex: false,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
-        synthesizeKey("VK_ESCAPE", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis",
+          key: { key: "KEY_Escape", code: "Escape" } }, aWindow);
       }, popup: true, value: "Mo", searchString: "Mo"
     },
     // House keeping...
@@ -473,7 +483,6 @@
     { description: "compositionstart shouldn't open the popup (completeDefaultIndex is true)",
       completeDefaultIndex: true,
       execute: function (aWindow) {
-        synthesizeKey("m", { type: "keydown", shiftKey: true }, aWindow);
         synthesizeCompositionChange(
           { "composition":
             { "string": "M",
@@ -482,7 +491,9 @@
                 { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 1, "length": 0 }
+            "caret": { "start": 1, "length": 0 },
+            "key": { key: "M", code: "KeyM", keyCode: KeyboardEvent.DOM_VK_M,
+                     shiftKey: true },
           }, aWindow);
       }, popup: false, value: "M", searchString: ""
     },
@@ -497,15 +508,16 @@
                 { "length": 2, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
               ]
             },
-            "caret": { "start": 2, "length": 0 }
+            "caret": { "start": 2, "length": 0 },
+            "key": { key: "o", code: "KeyO", keyCode: KeyboardEvent.DOM_VK_O },
           }, aWindow);
       }, popup: false, value: "Mo", searchString: ""
     },
     { description: "compositionend should open the popup (completeDefaultIndex is true)",
       completeDefaultIndex: true,
       execute: function (aWindow) {
-        synthesizeComposition({ type: "compositioncommitasis" }, aWindow);
-        synthesizeKey("VK_RETURN", { type: "keyup" }, aWindow);
+        synthesizeComposition({ type: "compositioncommitasis",
+          key: { key: "KEY_Enter", code: "Enter" } }, aWindow);
       }, popup: true, value: "Mozilla", searchString: "Mo"
     },
     // House keeping...
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/test_menulist_keynav.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/test_menulist_keynav.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/test_menulist_keynav.xul	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/test_menulist_keynav.xul	2015-02-28 15:03:08.000000000 +0000
@@ -55,7 +55,9 @@
   is(list.selectedItem, $("i1"), "letter pressed not found selectedItem");
 
   keyCheck(list, "T", 2, "letter pressed");
+  SpecialPowers.setIntPref("ui.menu.incremental_search.timeout", 0); // prevent to timeout
   keyCheck(list, "T", 2, "letter pressed");
+  SpecialPowers.clearUserPref("ui.menu.incremental_search.timeout");
   setTimeout(pressedAgain, 1200); 
 }
 
@@ -63,7 +65,9 @@
 {
   var list = $("list");
   keyCheck(list, "T", iswin ? "2b" : 3, "letter pressed again");
+  SpecialPowers.setIntPref("ui.menu.incremental_search.timeout", 0); // prevent to timeout
   keyCheck(list, "W", 2, "second letter pressed");
+  SpecialPowers.clearUserPref("ui.menu.incremental_search.timeout");
   setTimeout(differentPressed, 1200); 
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/test_preferences_beforeaccept.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/test_preferences_beforeaccept.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/test_preferences_beforeaccept.xul	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/test_preferences_beforeaccept.xul	2015-02-28 15:03:08.000000000 +0000
@@ -13,18 +13,11 @@
   <script type="application/javascript">
   <![CDATA[
     SimpleTest.waitForExplicitFinish();
+    SpecialPowers.pushPrefEnv({"set":[["browser.preferences.instantApply", false]]}, function() {
 
     // No instant-apply for this test
-    SpecialPowers.setBoolPref("browser.preferences.instantApply", false);
-
     var prefWindow = openDialog("window_preferences_beforeaccept.xul", "", "", windowOnload);
 
-    SimpleTest.registerCleanupFunction(() => {
-      SpecialPowers.clearUserPref("browser.preferences.instantApply");
-      SpecialPowers.clearUserPref("tests.beforeaccept.dialogShown");
-      SpecialPowers.clearUserPref("tests.beforeaccept.called");
-    });
-
     function windowOnload() {
       var dialogShown = prefWindow.document.getElementById("tests.beforeaccept.dialogShown");
       var called = prefWindow.document.getElementById("tests.beforeaccept.called");
@@ -49,6 +42,7 @@
 
       SimpleTest.finish();
     }
+});
   ]]>
   </script>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/test_richlist_direction.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/test_richlist_direction.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/chrome/test_richlist_direction.xul	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/chrome/test_richlist_direction.xul	2015-02-28 15:03:08.000000000 +0000
@@ -69,7 +69,7 @@
   ok(richListBox.currentIndex > currentIndex, "Selection should move upwards");
   richListBox.selectedItem = richListBox.lastChild;
   richListBox.focus();
-  synthesizeKey("VK_DOWN", {shiftKey: true, type: "keypress"}, window);
+  synthesizeKey("KEY_ArrowDown", { shiftKey: true, code: "ArrowDown" }, window);
   let items = [richListBox.selectedItems[0],
                richListBox.selectedItems[1]];
   is(items[0], richListBox.lastChild, "The last element should still be selected");
@@ -115,7 +115,7 @@
   ok(richListBox.currentIndex < currentIndex, "Selection should move upwards");
   richListBox.selectedItem = richListBox.firstChild;
   richListBox.focus();
-  synthesizeKey("VK_DOWN", {shiftKey: true, type: "keypress"}, window);
+  synthesizeKey("KEY_ArrowDown", { shiftKey: true, code: "ArrowDown" }, window);
   items = [richListBox.selectedItems[0],
            richListBox.selectedItems[1]];
   is(items[0], richListBox.firstChild, "The last element should still be selected");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/widgets/window_menubar.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/widgets/window_menubar.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/tests/widgets/window_menubar.xul	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/tests/widgets/window_menubar.xul	2015-02-28 15:03:08.000000000 +0000
@@ -784,9 +784,6 @@
       }, false);
       newWindow.close();
       thisWindow.focus();
-      // Note that our window dispatches a hacky key event if IMM is installed
-      // on the system during focus change only if Alt key is pressed.
-      synthesizeKey("`", { type: "keypress" }, thisWindow);
     }, false);
   }
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/autocomplete.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/autocomplete.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/autocomplete.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/autocomplete.xml	2015-02-28 15:03:08.000000000 +0000
@@ -130,7 +130,7 @@
       <property name="timeout"
                 onset="this.setAttribute('timeout', val); return val;">
         <getter><![CDATA[
-          // For security reasons delay searches on pasted values. 
+          // For security reasons delay searches on pasted values.
           if (this._valueIsPasted) {
             let t = parseInt(this.getAttribute('pastetimeout'));
             return isNaN(t) ? 1000 : t;
@@ -478,7 +478,7 @@
                   kind: "key"
                 };
               }
-              cancel = this.mController.handleEnter(false);
+              cancel = this.handleEnter();
               break;
             case KeyEvent.DOM_VK_DELETE:
 #ifdef XP_MACOSX
@@ -508,6 +508,12 @@
         ]]></body>
       </method>
 
+      <method name="handleEnter">
+        <body><![CDATA[
+          return this.mController.handleEnter(false);
+        ]]></body>
+      </method>
+
       <!-- ::::::::::::: miscellaneous ::::::::::::: -->
 
       <method name="initSearchNames">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/browser.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/browser.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/browser.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/browser.xml	2015-02-28 15:03:08.000000000 +0000
@@ -392,6 +392,15 @@
                 onget="return this._permanentKey;"
                 onset="this._permanentKey = val;"/>
 
+      <property name="outerWindowID" readonly="true">
+        <getter><![CDATA[
+          return this.contentWindow
+                     .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                     .getInterface(Components.interfaces.nsIDOMWindowUtils)
+                     .outerWindowID;
+        ]]></getter>
+      </property>
+
       <field name="_lastSearchString">null</field>
       <field name="_lastSearchHighlight">false</field>
 
@@ -1073,6 +1082,9 @@
         <parameter name="aOtherBrowser"/>
         <body>
         <![CDATA[
+          if (this.isRemoteBrowser != aOtherBrowser.isRemoteBrowser)
+            throw new Error("Can only swap docshells between browsers in the same process.");
+
           // We need to swap fields that are tied to our docshell or related to
           // the loaded page
           // Fields which are built as a result of notifactions (pageshow/hide,
@@ -1087,6 +1099,26 @@
             "_permanentKey"
           ];
 
+          if (this.isRemoteBrowser) {
+            fieldsToSwap.push(...[
+              "_remoteWebNavigation",
+              "_remoteWebProgressManager",
+              "_remoteWebProgress",
+              "_remoteFinder",
+              "_securityUI",
+              "_documentURI",
+              "_documentContentType",
+              "_contentTitle",
+              "_characterSet",
+              "_contentPrincipal",
+              "_syncHandler",
+              "_imageDocument",
+              "_fullZoom",
+              "_textZoom",
+              "_isSyntheticDocument",
+            ]);
+          }
+
           var ourFieldValues = {};
           var otherFieldValues = {};
           for each (var field in fieldsToSwap) {
@@ -1102,8 +1134,10 @@
 
           // Before we swap the actual docShell property we need to detach the
           // form fill controller from those docShells.
-          this.detachFormFill();
-          aOtherBrowser.detachFormFill();
+          if (!this.isRemoteBrowser) {
+            this.detachFormFill();
+            aOtherBrowser.detachFormFill();
+          }
 
           for each (var field in fieldsToSwap) {
             this[field] = otherFieldValues[field];
@@ -1113,15 +1147,26 @@
           // Re-attach the docShells to the form fill controller.
           if (!this.isRemoteBrowser) {
             this.attachFormFill();
-          }
-          if (!aOtherBrowser.isRemoteBrowser) {
             aOtherBrowser.attachFormFill();
-          }
 
-          // Null the current nsITypeAheadFind instances so that they're
-          // lazily re-created on access. We need to do this because they
-          // might have attached the wrong docShell.
-          this._fastFind = aOtherBrowser._fastFind = null;
+            // Null the current nsITypeAheadFind instances so that they're
+            // lazily re-created on access. We need to do this because they
+            // might have attached the wrong docShell.
+            this._fastFind = aOtherBrowser._fastFind = null;
+          }
+          else {
+            // Rewire the remote listeners
+            this._remoteWebNavigation.swapBrowser(this);
+            aOtherBrowser._remoteWebNavigation.swapBrowser(aOtherBrowser);
+
+            this._remoteWebProgressManager.swapBrowser(this);
+            aOtherBrowser._remoteWebProgressManager.swapBrowser(aOtherBrowser);
+
+            if (this._remoteFinder)
+              this._remoteFinder.swapBrowser(this);
+            if (aOtherBrowser._remoteFinder)
+              aOtherBrowser._remoteFinder.swapBrowser(aOtherBrowser);
+          }
         ]]>
         </body>
       </method>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/notification.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/notification.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/notification.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/notification.xml	2015-02-28 15:03:08.000000000 +0000
@@ -101,7 +101,11 @@
 
             const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
             var newitem = document.createElementNS(XULNS, "notification");
-            newitem.setAttribute("label", aLabel);
+            // Can't use instanceof in case this was created from a different document:
+            let labelIsDocFragment = aLabel && typeof aLabel == "object" && aLabel.nodeType &&
+                                     aLabel.nodeType == aLabel.DOCUMENT_FRAGMENT_NODE;
+            if (!labelIsDocFragment)
+              newitem.setAttribute("label", aLabel);
             newitem.setAttribute("value", aValue);
             if (aImage)
               newitem.setAttribute("image", aImage);
@@ -148,6 +152,13 @@
               newitem.style.opacity = "0";
             }
             this.insertBefore(newitem, insertPos);
+            // Can only insert the document fragment after the item has been created because
+            // otherwise the XBL structure isn't there yet:
+            if (labelIsDocFragment) {
+              document.getAnonymousElementByAttribute(newitem, "anonid", "messageText")
+                .appendChild(aLabel);
+            }
+
             if (!insertPos)
               this._showNotification(newitem, true);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/remote-browser.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/remote-browser.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/content/widgets/remote-browser.xml	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/content/widgets/remote-browser.xml	2015-02-28 15:03:08.000000000 +0000
@@ -79,7 +79,7 @@
       <property name="finder" readonly="true">
         <getter><![CDATA[
           if (!this._remoteFinder) {
-            // Don't attempt to create the remote web progress if the
+            // Don't attempt to create the remote finder if the
             // messageManager has already gone away
             if (!this.messageManager)
               return null;
@@ -204,6 +204,11 @@
         ]]></getter>
       </property>
 
+      <field name="_outerWindowID">null</field>
+      <property name="outerWindowID"
+                onget="return this._outerWindowID"
+                readonly="true"/>
+
       <property name="autoCompletePopup"
                 onget="return document.getElementById(this.getAttribute('autocompletepopup'))"
                 readonly="true"/>
@@ -289,6 +294,7 @@
           let data = aMessage.data;
           switch (aMessage.name) {
             case "Browser:Init":
+              this._outerWindowID = data.outerWindowID;
               let result = {};
               result.useGlobalHistory = !this.hasAttribute("disableglobalhistory");
               result.initPopup = this.autoCompletePopup != null;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/crashreporter/tools/upload_symbols.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/crashreporter/tools/upload_symbols.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/crashreporter/tools/upload_symbols.py	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/crashreporter/tools/upload_symbols.py	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/env 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/.
+#
+# This script uploads a symbol zip file passed on the commandline
+# to the Socorro symbol upload API hosted on crash-stats.mozilla.org.
+#
+# Using this script requires you to have generated an authentication
+# token in the crash-stats web interface. You must put the token in a file
+# and set SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE to the path to the file in
+# the mozconfig you're using.
+
+from __future__ import print_function
+
+import os
+import requests
+import sys
+
+from buildconfig import substs
+
+# This is the staging server
+url = 'https://crash-stats.allizom.org/symbols/upload'
+# This is the production server, we'll switch this
+# once we're comfortable this works.
+#url = 'https://crash-stats.mozilla.com/symbols/upload'
+
+def main():
+    if len(sys.argv) != 2:
+        print('Usage: uploadsymbols.py <zip file>', file=sys.stderr)
+        return 1
+
+    if not os.path.isfile(sys.argv[1]):
+        print('Error: zip file "{0}" does not exist!'.format(sys.argv[1]),
+              file=sys.stderr)
+        return 1
+    symbols_zip = sys.argv[1]
+
+    if 'SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE' not in substs:
+        print('Error: you must set SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE in your mozconfig!', file=sys.stderr)
+        return 1
+    token_file = substs['SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE']
+
+    if not os.path.isfile(token_file):
+        print('Error: SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE "{0}" does not exist!'.format(token_file), file=sys.stderr)
+        return 1
+    auth_token = open(token_file, 'r').read().strip()
+
+    print('Uploading symbol file "{0}" to "{1}"...'.format(sys.argv[1], url))
+
+    try:
+        r = requests.post(
+            url,
+            files={'symbols.zip': open(sys.argv[1], 'rb')},
+            headers={'Auth-Token': auth_token},
+            allow_redirects=False,
+            timeout=60,
+        )
+    except requests.exceptions.RequestException as e:
+        print('Error: {0}'.format(e))
+        return 1
+
+    if r.status_code >= 200 and r.status_code < 300:
+        print('Uploaded successfully!')
+    elif r.status_code < 400:
+        print('Error: bad auth token? ({0})'.format(r.status_code),
+              file=sys.stderr)
+        return 1
+    else:
+        print('Error: got HTTP response {0}'.format(r.status_code),
+              file=sys.stderr)
+        return 1
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main())
+
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/client/dbg-client.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/client/dbg-client.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/client/dbg-client.jsm	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/client/dbg-client.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -1070,6 +1070,27 @@
    */
   onClosed: function (aStatus) {
     this.emit("closed");
+
+    // The |_pools| array on the client-side currently is used only by
+    // protocol.js to store active fronts, mirroring the actor pools found in
+    // the server.  So, read all usages of "pool" as "protocol.js front".
+    //
+    // In the normal case where we shutdown cleanly, the toolbox tells each tool
+    // to close, and they each call |destroy| on any fronts they were using.
+    // When |destroy| or |cleanup| is called on a protocol.js front, it also
+    // removes itself from the |_pools| array.  Once the toolbox has shutdown,
+    // the connection is closed, and we reach here.  All fronts (should have
+    // been) |destroy|ed, so |_pools| should empty.
+    //
+    // If the connection instead aborts unexpectedly, we may end up here with
+    // all fronts used during the life of the connection.  So, we call |cleanup|
+    // on them clear their state, reject pending requests, and remove themselves
+    // from |_pools|.  This saves the toolbox from hanging indefinitely, in case
+    // it waits for some server response before shutdown that will now never
+    // arrive.
+    for (let pool of this._pools) {
+      pool.cleanup();
+    }
   },
 
   registerClient: function (client) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -16,6 +16,7 @@
     'security',
     'server',
     'sourcemap',
+    'shared',
     'styleinspector',
     'tern',
     'transport',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/call-watcher.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/call-watcher.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/call-watcher.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/call-watcher.js	2015-02-28 15:03:08.000000000 +0000
@@ -7,7 +7,7 @@
 const events = require("sdk/event/core");
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 const protocol = require("devtools/server/protocol");
-const {ContentObserver} = require("devtools/content-observer");
+const {serializeStack, parseStack} = require("toolkit/loader");
 
 const {on, once, off, emit} = events;
 const {method, Arg, Option, RetVal} = protocol;
@@ -417,7 +417,12 @@
       let originalFunc = Cu.unwaiveXrays(target[name]);
 
       Cu.exportFunction(function(...args) {
-        let result = Cu.waiveXrays(originalFunc.apply(this, args));
+        let result;
+        try {
+          result = Cu.waiveXrays(originalFunc.apply(this, args));
+        } catch (e) {
+          throw createContentError(e, unwrappedWindow);
+        }
 
         if (self._recording) {
           let stack = getStack(name);
@@ -693,3 +698,45 @@
   // Cache the combined bitmask value
   return table[arg] = flags.join(" | ") || arg;
 }
+
+/**
+ * Creates a new error from an error that originated from content but was called
+ * from a wrapped overridden method. This is so we can make our own error
+ * that does not look like it originated from the call watcher.
+ *
+ * We use toolkit/loader's parseStack and serializeStack rather than the
+ * parsing done in the local `getStack` function, because it does not expose
+ * column number, would have to change the protocol models `call-stack-items` and `call-details`
+ * which hurts backwards compatibility, and the local `getStack` is an optimized, hot function.
+ */
+function createContentError (e, win) {
+  let { message, name, stack } = e;
+  let parsedStack = parseStack(stack);
+  let { fileName, lineNumber, columnNumber } = parsedStack[parsedStack.length - 1];
+  let error;
+
+  let isDOMException = e instanceof Ci.nsIDOMDOMException;
+  let constructor = isDOMException ? win.DOMException : (win[e.name] || win.Error);
+
+  if (isDOMException) {
+    error = new constructor(message, name);
+    Object.defineProperties(error, {
+      code: { value: e.code },
+      columnNumber: { value: 0 }, // columnNumber is always 0 for DOMExceptions?
+      filename: { value: fileName }, // note the lowercase `filename`
+      lineNumber: { value: lineNumber },
+      result: { value: e.result },
+      stack: { value: serializeStack(parsedStack) }
+    });
+  }
+  else {
+    // Constructing an error here retains all the stack information,
+    // and we can add message, fileName and lineNumber via constructor, though
+    // need to manually add columnNumber.
+    error = new constructor(message, fileName, lineNumber);
+    Object.defineProperty(error, "columnNumber", {
+      value: columnNumber
+    });
+  }
+  return error;
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/canvas.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/canvas.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/canvas.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/canvas.js	2015-02-28 15:03:08.000000000 +0000
@@ -23,6 +23,10 @@
   "mozRequestAnimationFrame"
 ];
 
+const LOOP_GENERATORS = [
+  "setTimeout"
+];
+
 const DRAW_CALLS = [
   // 2D canvas
   "fill",
@@ -208,7 +212,8 @@
    * was already generated and retrieved once.
    */
   generateScreenshotFor: custom(function(functionCall) {
-    if (CanvasFront.ANIMATION_GENERATORS.has(functionCall.name)) {
+    if (CanvasFront.ANIMATION_GENERATORS.has(functionCall.name) ||
+        CanvasFront.LOOP_GENERATORS.has(functionCall.name)) {
       return promise.resolve(this._animationFrameEndScreenshot);
     }
     let cachedScreenshot = this._cachedScreenshots.get(functionCall);
@@ -229,6 +234,10 @@
  * made when drawing frame inside an animation loop.
  */
 let CanvasActor = exports.CanvasActor = protocol.ActorClass({
+  // Reset for each recording, boolean indicating whether or not
+  // any draw calls were called for a recording.
+  _animationContainsDrawCall: false,
+
   typeName: "canvas",
   initialize: function(conn, tabActor) {
     protocol.Actor.prototype.initialize.call(this, conn);
@@ -253,7 +262,7 @@
     this._callWatcher.onCall = this._onContentFunctionCall;
     this._callWatcher.setup({
       tracedGlobals: CANVAS_CONTEXTS,
-      tracedFunctions: ANIMATION_GENERATORS,
+      tracedFunctions: [...ANIMATION_GENERATORS, ...LOOP_GENERATORS],
       performReload: reload,
       storeCalls: true
     });
@@ -287,26 +296,49 @@
   }),
 
   /**
+   * Returns whether or not the CanvasActor is recording an animation.
+   * Used in tests.
+   */
+  isRecording: method(function() {
+    return !!this._callWatcher.isRecording();
+  }, {
+    response: { recording: RetVal("boolean") }
+  }),
+
+  /**
    * Records a snapshot of all the calls made during the next animation frame.
    * The animation should be implemented via the de-facto requestAnimationFrame
-   * utility, not inside a `setInterval` or recursive `setTimeout`.
-   *
-   * XXX: Currently only supporting requestAnimationFrame. When this isn't used,
-   * it'd be a good idea to display a huge red flashing banner telling people to
-   * STOP USING `setInterval` OR `setTimeout` FOR ANIMATION. Bug 978948.
+   * utility, or inside recursive `setTimeout`s. `setInterval` at this time are not supported.
    */
   recordAnimationFrame: method(function() {
     if (this._callWatcher.isRecording()) {
       return this._currentAnimationFrameSnapshot.promise;
     }
 
+    this._recordingContainsDrawCall = false;
     this._callWatcher.eraseRecording();
     this._callWatcher.resumeRecording();
 
     let deferred = this._currentAnimationFrameSnapshot = promise.defer();
     return deferred.promise;
   }, {
-    response: { snapshot: RetVal("frame-snapshot") }
+    response: { snapshot: RetVal("nullable:frame-snapshot") }
+  }),
+
+  /**
+   * Cease attempts to record an animation frame.
+   */
+  stopRecordingAnimationFrame: method(function() {
+   if (!this._callWatcher.isRecording()) {
+      return;
+    }
+    this._animationStarted = false;
+    this._callWatcher.pauseRecording();
+    this._callWatcher.eraseRecording();
+    this._currentAnimationFrameSnapshot.resolve(null);
+    this._currentAnimationFrameSnapshot = null;
+  }, {
+    oneway: true
   }),
 
   /**
@@ -324,10 +356,18 @@
     // They need to be cloned.
     inplaceShallowCloneArrays(args, window);
 
+    // Handle animations generated using requestAnimationFrame
     if (CanvasFront.ANIMATION_GENERATORS.has(name)) {
       this._handleAnimationFrame(functionCall);
       return;
     }
+    // Handle animations generated using setTimeout. While using
+    // those timers is considered extremely poor practice, they're still widely
+    // used on the web, especially for old demos; it's nice to support them as well.
+    if (CanvasFront.LOOP_GENERATORS.has(name)) {
+      this._handleAnimationFrame(functionCall);
+      return;
+    }
     if (CanvasFront.DRAW_CALLS.has(name) && this._animationStarted) {
       this._handleDrawCall(functionCall);
       return;
@@ -340,7 +380,11 @@
   _handleAnimationFrame: function(functionCall) {
     if (!this._animationStarted) {
       this._handleAnimationFrameBegin();
-    } else {
+    }
+    // Check to see if draw calls occurred yet, as it could be future frames,
+    // like in the scenario where requestAnimationFrame is called to trigger an animation,
+    // and rAF is at the beginning of the animate loop.
+    else if (this._animationContainsDrawCall) {
       this._handleAnimationFrameEnd(functionCall);
     }
   },
@@ -362,6 +406,7 @@
     // previously recorded calls.
     let functionCalls = this._callWatcher.pauseRecording();
     this._callWatcher.eraseRecording();
+    this._animationContainsDrawCall = false;
 
     // Since the animation frame finished, get a hold of the (already retrieved)
     // canvas pixels to conveniently create a screenshot of the final rendering.
@@ -410,6 +455,8 @@
     let dimensions = CanvasFront.THUMBNAIL_SIZE;
     let thumbnail;
 
+    this._animationContainsDrawCall = true;
+
     // Create a thumbnail on every draw call on the canvas context, to augment
     // the respective function call actor with this additional data.
     if (global == CallWatcherFront.CANVAS_WEBGL_CONTEXT) {
@@ -790,6 +837,7 @@
  */
 CanvasFront.CANVAS_CONTEXTS = new Set(CANVAS_CONTEXTS);
 CanvasFront.ANIMATION_GENERATORS = new Set(ANIMATION_GENERATORS);
+CanvasFront.LOOP_GENERATORS = new Set(LOOP_GENERATORS);
 CanvasFront.DRAW_CALLS = new Set(DRAW_CALLS);
 CanvasFront.INTERESTING_CALLS = new Set(INTERESTING_CALLS);
 CanvasFront.THUMBNAIL_SIZE = 50; // px
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/common.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/common.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/common.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/common.js	2015-02-28 15:03:08.000000000 +0000
@@ -295,6 +295,133 @@
 
 exports.ActorPool = ActorPool;
 
+/**
+ * An OriginalLocation represents a location in an original source.
+ *
+ * @param SourceActor actor
+ *        A SourceActor representing an original source.
+ * @param Number line
+ *        A line within the given source.
+ * @param Number column
+ *        A column within the given line.
+ * @param String name
+ *        The name of the symbol corresponding to this OriginalLocation.
+ */
+function OriginalLocation(actor, line, column, name) {
+  this._connection = actor ? actor.conn : null;
+  this._actorID = actor ? actor.actorID : undefined;
+  this._line = line;
+  this._column = column;
+  this._name = name;
+}
+
+OriginalLocation.fromGeneratedLocation = function (generatedLocation) {
+  return new OriginalLocation(
+    generatedLocation.generatedSourceActor,
+    generatedLocation.generatedLine,
+    generatedLocation.generatedColumn
+  );
+};
+
+OriginalLocation.prototype = {
+  get originalSourceActor() {
+    return this._connection ? this._connection.getActor(this._actorID) : null;
+  },
+
+  get originalUrl() {
+    let actor = this.originalSourceActor;
+    let source = actor.source;
+    return source ? source.url : actor._originalUrl;
+  },
+
+  get originalLine() {
+    return this._line;
+  },
+
+  get originalColumn() {
+    return this._column;
+  },
+
+  get originalName() {
+    return this._name;
+  },
+
+  get generatedSourceActor() {
+    throw new Error("Shouldn't  access generatedSourceActor from an OriginalLocation");
+  },
+
+  get generatedLine() {
+    throw new Error("Shouldn't access generatedLine from an OriginalLocation");
+  },
+
+  get generatedColumn() {
+    throw new Error("Shouldn't access generatedColumn from an Originallocation");
+  }
+};
+
+exports.OriginalLocation = OriginalLocation;
+
+/**
+ * A GeneratedLocation represents a location in an original source.
+ *
+ * @param SourceActor actor
+ *        A SourceActor representing a generated source.
+ * @param Number line
+ *        A line within the given source.
+ * @param Number column
+ *        A column within the given line.
+ */
+function GeneratedLocation(actor, line, column) {
+  this._connection = actor ? actor.conn : null;
+  this._actorID = actor ? actor.actorID : undefined;
+  this._line = line;
+  this._column = column;
+}
+
+GeneratedLocation.fromOriginalLocation = function (originalLocation) {
+  return new GeneratedLocation(
+    originalLocation.originalSourceActor,
+    originalLocation.originalLine,
+    originalLocation.originalColumn
+  );
+};
+
+GeneratedLocation.prototype = {
+  get originalSourceActor() {
+    throw new Error();
+  },
+
+  get originalUrl() {
+    throw new Error("Shouldn't access originalUrl from a GeneratedLocation");
+  },
+
+  get originalLine() {
+    throw new Error("Shouldn't access originalLine from a GeneratedLocation");
+  },
+
+  get originalColumn() {
+    throw new Error("Shouldn't access originalColumn from a GeneratedLocation");
+  },
+
+  get originalName() {
+    throw new Error("Shouldn't access originalName from a GeneratedLocation");
+  },
+
+  get generatedSourceActor() {
+    return this._connection ? this._connection.getActor(this._actorID) : null;
+  },
+
+  get generatedLine() {
+    return this._line;
+  },
+
+  get generatedColumn() {
+    return this._column;
+  }
+};
+
+exports.GeneratedLocation = GeneratedLocation;
+
 // TODO bug 863089: use Debugger.Script.prototype.getOffsetColumn when it is
 // implemented.
 exports.getOffsetColumn = function getOffsetColumn(aOffset, aScript) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/highlighter.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/highlighter.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/highlighter.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/highlighter.js	2015-02-28 15:03:08.000000000 +0000
@@ -1319,7 +1319,7 @@
     }
 
     let rect = this.currentQuads.border.bounds;
-    let dim = Math.ceil(rect.width) + " \u00D7 " + Math.ceil(rect.height);
+    let dim = parseFloat(rect.width.toPrecision(6)) + " \u00D7 " + parseFloat(rect.height.toPrecision(6));
 
     let elementId = this.ID_CLASS_PREFIX + "nodeinfobar-";
     this.markup.setTextContentForElement(elementId + "tagname", tagName);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/inspector.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/inspector.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/inspector.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/inspector.js	2015-02-28 15:03:08.000000000 +0000
@@ -1195,19 +1195,23 @@
   },
 
   destroy: function() {
-    this._destroyed = true;
+    try {
+      this._destroyed = true;
 
-    this.clearPseudoClassLocks();
-    this._activePseudoClassLocks = null;
+      this.clearPseudoClassLocks();
+      this._activePseudoClassLocks = null;
 
-    this._hoveredNode = null;
-    this.rootDoc = null;
+      this._hoveredNode = null;
+      this.rootDoc = null;
 
-    this.reflowObserver.off("reflows", this._onReflows);
-    this.reflowObserver = null;
-    releaseLayoutChangesObserver(this.tabActor);
-
-    events.emit(this, "destroyed");
+      this.reflowObserver.off("reflows", this._onReflows);
+      this.reflowObserver = null;
+      releaseLayoutChangesObserver(this.tabActor);
+
+      events.emit(this, "destroyed");
+    } catch(e) {
+      console.error(e);
+    }
     protocol.Actor.prototype.destroy.call(this);
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/memory.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/memory.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/memory.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/memory.js	2015-02-28 15:03:08.000000000 +0000
@@ -43,7 +43,12 @@
   // The probability we sample any given allocation when recording
   // allocations. Must be between 0.0 and 1.0. Defaults to 1.0, or sampling
   // every allocation.
-  probability: "number"
+  probability: "number",
+
+  // The maximum number of of allocation events to keep in the allocations
+  // log. If new allocations arrive, when we are already at capacity, the oldest
+  // allocation event is lost. This number must fit in a 32 bit signed integer.
+  maxLogLength: "number"
 });
 
 /**
@@ -164,6 +169,9 @@
     this.dbg.memory.allocationSamplingProbability = options.probability != null
       ? options.probability
       : 1.0;
+    if (options.maxLogLength != null) {
+      this.dbg.memory.maxAllocationsLogLength = options.maxLogLength;
+    }
     this.dbg.memory.trackingAllocationSites = true;
 
     return Date.now();
@@ -253,6 +261,15 @@
    *          profiling and done only when necessary.
    */
   getAllocations: method(expectState("attached", function() {
+    if (this.dbg.memory.allocationsLogOverflowed) {
+      // Since the last time we drained the allocations log, there have been
+      // more allocations than the log's capacity, and we lost some data. There
+      // isn't anything actionable we can do about this, but put a message in
+      // the browser console so we at least know that it occurred.
+      reportException("MemoryActor.prototype.getAllocations",
+                      "Warning: allocations log overflowed and lost some data.");
+    }
+
     const allocations = this.dbg.memory.drainAllocationsLog()
     const packet = {
       allocations: [],
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/script.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/script.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/script.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/script.js	2015-02-28 15:03:08.000000000 +0000
@@ -8,7 +8,7 @@
 
 const Services = require("Services");
 const { Cc, Ci, Cu, components, ChromeWorker } = require("chrome");
-const { ActorPool, getOffsetColumn } = require("devtools/server/actors/common");
+const { ActorPool, OriginalLocation, GeneratedLocation, getOffsetColumn } = require("devtools/server/actors/common");
 const { DebuggerServer } = require("devtools/server/main");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const { dbg_assert, dumpn, update, fetch } = DevToolsUtils;
@@ -75,28 +75,23 @@
 
 BreakpointActorMap.prototype = {
   /**
-   * Return the number of instances of BreakpointActor in this instance of
-   * BreakpointActorMap.
+   * Return the number of BreakpointActors in this BreakpointActorMap.
    *
    * @returns Number
-   *          The number of instances of BreakpointACtor in this instance of
-   *          BreakpointActorMap.
+   *          The number of BreakpointActor in this BreakpointActorMap.
    */
   get size() {
     return this._size;
   },
 
   /**
-   * Generate all instances of BreakpointActor that match the given query in
-   * this instance of BreakpointActorMap.
+   * Generate all BreakpointActors that match the given location in
+   * this BreakpointActorMap.
    *
-   * @param Object query
-   *        An optional object with the following properties:
-   *        - source (optional)
-   *        - line (optional, requires source)
-   *        - column (optional, requires line)
+   * @param OriginalLocation location
+   *        The location for which matching BreakpointActors should be generated.
    */
-  findActors: function* (query = {}) {
+  findActors: function* (location = new OriginalLocation()) {
     function* findKeys(object, key) {
       if (key !== undefined) {
         if (key in object) {
@@ -110,9 +105,21 @@
       }
     }
 
-    query.sourceActorID = query.sourceActor ? query.sourceActor.actorID : undefined;
-    query.beginColumn = query.column ? query.column : undefined;
-    query.endColumn = query.column ? query.column + 1 : undefined;
+    let query = {
+      sourceActorID: location.originalSourceActor ? location.originalSourceActor.actorID : undefined,
+      line: location.originalLine,
+    };
+
+    // If location contains a line, assume we are searching for a whole line
+    // breakpoint, and set begin/endColumn accordingly. Otherwise, we are
+    // searching for all breakpoints, so begin/endColumn should be left unset.
+    if (location.originalLine) {
+      query.beginColumn = location.originalColumn ? location.originalColumn : 0;
+      query.endColumn = location.originalColumn ? location.originalColumn + 1 : Infinity;
+    } else {
+      query.beginColumn = location.originalColumn ? query.originalColumn : undefined;
+      query.endColumn = location.originalColumn ? query.originalColumn + 1 : undefined;
+    }
 
     for (let sourceActorID of findKeys(this._actors, query.sourceActorID))
     for (let line of findKeys(this._actors[sourceActorID], query.line))
@@ -123,20 +130,17 @@
   },
 
   /**
-   * Return the instance of BreakpointActor at the given location in this
-   * instance of BreakpointActorMap.
+   * Return the BreakpointActor at the given location in this
+   * BreakpointActorMap.
    *
-   * @param Object location
-   *        An object with the following properties:
-   *        - source
-   *        - line
-   *        - column (optional)
+   * @param OriginalLocation location
+   *        The location for which the BreakpointActor should be returned.
    *
    * @returns BreakpointActor actor
-   *          The instance of BreakpointActor at the given location.
+   *          The BreakpointActor at the given location.
    */
-  getActor: function (location) {
-    for (let actor of this.findActors(location)) {
+  getActor: function (originalLocation) {
+    for (let actor of this.findActors(originalLocation)) {
       return actor;
     }
 
@@ -144,24 +148,22 @@
   },
 
   /**
-   * Set the given instance of BreakpointActor to the given location in this
-   * instance of BreakpointActorMap.
+   * Set the given BreakpointActor to the given location in this
+   * BreakpointActorMap.
    *
-   * @param Object location
-   *        An object with the following properties:
-   *        - source
-   *        - line
-   *        - column (optional)
+   * @param OriginalLocation location
+   *        The location to which the given BreakpointActor should be set.
    *
    * @param BreakpointActor actor
-   *        The instance of BreakpointActor to be set to the given location.
+   *        The BreakpointActor to be set to the given location.
    */
   setActor: function (location, actor) {
-    let { sourceActor, line, column } = location;
+    let { originalSourceActor, originalLine, originalColumn } = location;
 
-    let sourceActorID = sourceActor.actorID;
-    let beginColumn = column ? column : 0;
-    let endColumn = column ? column + 1 : Infinity;
+    let sourceActorID = originalSourceActor.actorID;
+    let line = originalLine;
+    let beginColumn = originalColumn ? originalColumn : 0;
+    let endColumn = originalColumn ? originalColumn + 1 : Infinity;
 
     if (!this._actors[sourceActorID]) {
       this._actors[sourceActorID] = [];
@@ -179,21 +181,19 @@
   },
 
   /**
-   * Delete the instance of BreakpointActor from the given location in this
-   * instance of BreakpointActorMap.
+   * Delete the BreakpointActor from the given location in this
+   * BreakpointActorMap.
    *
-   * @param Object location
-   *        An object with the following properties:
-   *        - source
-   *        - line
-   *        - column (optional)
+   * @param OriginalLocation location
+   *        The location from which the BreakpointActor should be deleted.
    */
   deleteActor: function (location) {
-    let { sourceActor, line, column } = location;
+    let { originalSourceActor, originalLine, originalColumn } = location;
 
-    let sourceActorID = sourceActor.actorID;
-    let beginColumn = column ? column : 0;
-    let endColumn = column ? column + 1 : Infinity;
+    let sourceActorID = originalSourceActor.actorID;
+    let line = originalLine;
+    let beginColumn = originalColumn ? originalColumn : 0;
+    let endColumn = originalColumn ? originalColumn + 1 : Infinity;
 
     if (this._actors[sourceActorID]) {
       if (this._actors[sourceActorID][line]) {
@@ -742,9 +742,10 @@
       }
       packet.why = aReason;
 
-      let loc = this.sources.getFrameLocation(aFrame);
-      this.sources.getOriginalLocation(loc).then(aOrigPosition => {
-        if (!aOrigPosition.sourceActor) {
+      let generatedLocation = this.sources.getFrameLocation(aFrame);
+      this.sources.getOriginalLocation(generatedLocation)
+                  .then((originalLocation) => {
+        if (!originalLocation.originalSourceActor) {
           // The only time the source actor will be null is if there
           // was a sourcemap and it tried to look up the original
           // location but there was no original URL. This is a strange
@@ -759,9 +760,9 @@
         }
 
         packet.frame.where = {
-          source: aOrigPosition.sourceActor.form(),
-          line: aOrigPosition.line,
-          column: aOrigPosition.column
+          source: originalLocation.originalSourceActor.form(),
+          line: originalLocation.originalLine,
+          column: originalLocation.originalColumn
         };
         resolve(onPacket(packet))
           .then(null, error => {
@@ -806,9 +807,9 @@
   _makeOnEnterFrame: function ({ pauseAndRespond }) {
     return aFrame => {
       const generatedLocation = this.sources.getFrameLocation(aFrame);
-      let { sourceActor } = this.synchronize(this.sources.getOriginalLocation(
+      let { originalSourceActor } = this.synchronize(this.sources.getOriginalLocation(
         generatedLocation));
-      let url = sourceActor.url;
+      let url = originalSourceActor.url;
 
       return this.sources.isBlackBoxed(url)
         ? undefined
@@ -821,9 +822,9 @@
       // onPop is called with 'this' set to the current frame.
 
       const generatedLocation = thread.sources.getFrameLocation(this);
-      const { sourceActor } = thread.synchronize(thread.sources.getOriginalLocation(
+      const { originalSourceActor } = thread.synchronize(thread.sources.getOriginalLocation(
         generatedLocation));
-      const url = sourceActor.url;
+      const url = originalSourceActor.url;
 
       if (thread.sources.isBlackBoxed(url)) {
         return undefined;
@@ -882,15 +883,15 @@
       // 2.2. The source we are in is black boxed.
 
       // Cases 2.1 and 2.2
-      if (newLocation.url == null
-          || thread.sources.isBlackBoxed(newLocation.url)) {
+      if (newLocation.originalUrl == null
+          || thread.sources.isBlackBoxed(newLocation.originalUrl)) {
         return undefined;
       }
 
       // Cases 1.1, 1.2 and 1.3
       if (this !== startFrame
-          || startLocation.url !== newLocation.url
-          || startLocation.line !== newLocation.line) {
+          || startLocation.originalUrl !== newLocation.originalUrl
+          || startLocation.originalLine !== newLocation.originalLine) {
         return pauseAndRespond(this);
       }
 
@@ -1288,16 +1289,16 @@
       form.depth = i;
       frames.push(form);
 
-      let promise = this.sources.getOriginalLocation({
-        sourceActor: this.sources.createNonSourceMappedActor(frame.script.source),
-        line: form.where.line,
-        column: form.where.column
-      }).then((aOrigLocation) => {
-        let sourceForm = aOrigLocation.sourceActor.form();
+      let promise = this.sources.getOriginalLocation(new GeneratedLocation(
+        this.sources.createNonSourceMappedActor(frame.script.source),
+        form.where.line,
+        form.where.column
+      )).then((originalLocation) => {
+        let sourceForm = originalLocation.originalSourceActor.form();
         form.where = {
           source: sourceForm,
-          line: aOrigLocation.line,
-          column: aOrigLocation.column
+          line: originalLocation.originalLine,
+          column: originalLocation.originalColumn
         };
         form.source = sourceForm;
       });
@@ -1903,9 +1904,9 @@
     // Don't pause if we are currently stepping (in or over) or the frame is
     // black-boxed.
     const generatedLocation = this.sources.getFrameLocation(aFrame);
-    const { sourceActor } = this.synchronize(this.sources.getOriginalLocation(
+    const { originalSourceActor } = this.synchronize(this.sources.getOriginalLocation(
       generatedLocation));
-    const url = sourceActor ? sourceActor.url : null;
+    const url = originalSourceActor ? originalSourceActor.url : null;
 
     return this.sources.isBlackBoxed(url) || aFrame.onStep
       ? undefined
@@ -2035,14 +2036,23 @@
     }
 
     // Set any stored breakpoints.
+    let promises = [];
+    let sourceActor = this.sources.createNonSourceMappedActor(aScript.source);
     let endLine = aScript.startLine + aScript.lineCount - 1;
-    let source = this.sources.createNonSourceMappedActor(aScript.source);
-    for (let bpActor of this.breakpointActorMap.findActors({ sourceActor: source })) {
-      // Limit the search to the line numbers contained in the new script.
-      if (bpActor.generatedLocation.line >= aScript.startLine
-          && bpActor.generatedLocation.line <= endLine) {
-        source.setBreakpointForActor(bpActor);
-      }
+    for (let actor of this.breakpointActorMap.findActors()) {
+      promises.push(this.sources.getGeneratedLocation(actor.originalLocation)
+                                .then((generatedLocation) => {
+        // Limit the search to the line numbers contained in the new script.
+        if (generatedLocation.generatedSourceActor.actorID === sourceActor.actorID &&
+            generatedLocation.generatedLine >= aScript.startLine &&
+            generatedLocation.generatedLine <= endLine) {
+          sourceActor.setBreakpointForActor(actor, generatedLocation);
+        }
+      }));
+    }
+
+    if (promises.length > 0) {
+      this.synchronize(Promise.all(promises));
     }
 
     // Go ahead and establish the source actors for this script, which
@@ -2717,21 +2727,21 @@
    * NB: This will override a pre-existing BreakpointActor's condition with
    * the given the location's condition.
    *
-   * @param Object originalLocation
+   * @param OriginalLocation originalLocation
    *        The original location of the breakpoint.
-   * @param Object generatedLocation
+   * @param GeneratedLocation generatedLocation
    *        The generated location of the breakpoint.
    * @returns BreakpointActor
    */
   _getOrCreateBreakpointActor: function (originalLocation, generatedLocation,
                                          condition)
   {
-    let actor = this.breakpointActorMap.getActor(generatedLocation);
+    let actor = this.breakpointActorMap.getActor(originalLocation);
     if (!actor) {
       actor = new BreakpointActor(this.threadActor, originalLocation,
                                   generatedLocation, condition);
       this.threadActor.threadLifetimePool.addActor(actor);
-      this.breakpointActorMap.setActor(generatedLocation, actor);
+      this.breakpointActorMap.setActor(originalLocation, actor);
       return actor;
     }
 
@@ -2751,12 +2761,14 @@
    * @returns Object
    *          The RDP response.
    */
-  _setBreakpointAtColumn: function (scripts, location, actor) {
+  _setBreakpointAtColumn: function (scripts, generatedLocation, actor) {
     // Debugger.Script -> array of offset mappings
     const scriptsAndOffsetMappings = new Map();
 
     for (let script of scripts) {
-      this._findClosestOffsetMappings(location, script, scriptsAndOffsetMappings);
+      this._findClosestOffsetMappings(generatedLocation,
+                                      script,
+                                      scriptsAndOffsetMappings);
     }
 
     for (let [script, mappings] of scriptsAndOffsetMappings) {
@@ -2832,38 +2844,31 @@
    *        A condition for the breakpoint.
    */
   setBreakpoint: function (originalLine, originalColumn, condition) {
-    let originalLocation = {
-      sourceActor: this,
-      line: originalLine,
-      column: originalColumn
-    };
-
+    let originalLocation = new OriginalLocation(this, originalLine, originalColumn);
     return this.threadActor.sources.getGeneratedLocation(originalLocation)
                                    .then(generatedLocation => {
       let actor = this._getOrCreateBreakpointActor(originalLocation,
                                                    generatedLocation,
                                                    condition);
-      return generatedLocation.sourceActor.setBreakpointForActor(actor);
+      return generatedLocation.generatedSourceActor
+                              .setBreakpointForActor(actor, generatedLocation);
     });
   },
 
   /*
-   * Set the given BreakpointActor as breakpoint handler on all scripts that
-   * match the given location for which the BreakpointActor is not already a
-   * breakpoint handler.
+   * Ensure the given BreakpointActor is set as breakpoint handler on all
+   * scripts that match the given generated location.
    *
    * @param BreakpointActor actor
-   *        The BreakpointActor to set as breakpoint handler.
+   *        The BreakpointActor to be set as breakpoint handler for the given
+   *        generated location.
+   * @param GeneratedLocation generatedLocation
+   *        The generated location for which the BreakpointActor should be set
+   *        as breakpoint handler.
    */
-  setBreakpointForActor: function (actor) {
+  setBreakpointForActor: function (actor, generatedLocation) {
     let originalLocation = actor.originalLocation;
-    let generatedLocation = {
-      sourceActor: this,
-      line: actor.generatedLocation.line,
-      column: actor.generatedLocation.column
-    };
-
-    let { line: generatedLine, column: generatedColumn } = generatedLocation;
+    let { generatedLine, generatedColumn } = generatedLocation;
 
     // Find all scripts matching the given location. We will almost always have
     // a `source` object to query, but multiple inline HTML scripts are all
@@ -2889,13 +2894,13 @@
     // handler.
     scripts = scripts.filter((script) => !actor.hasScript(script));
 
-    let actualLocation;
+    let actualGeneratedLocation;
 
     // If generatedColumn is something other than 0, assume this is a column
     // breakpoint and do not perform breakpoint sliding.
     if (generatedColumn) {
       this._setBreakpointAtColumn(scripts, generatedLocation, actor);
-      actualLocation = generatedLocation;
+      actualGeneratedLocation = generatedLocation;
     } else {
       let result;
       if (actor.scripts.size === 0) {
@@ -2925,53 +2930,49 @@
       }
 
       if (result.line !== generatedLine) {
-        actualLocation = {
-          sourceActor: generatedLocation.sourceActor,
-          line: result.line,
-          column: generatedLocation.column
-        };
+        actualGeneratedLocation = new GeneratedLocation(
+          generatedLocation.generatedSourceActor,
+          result.line,
+          generatedLocation.generatedColumn
+        );
+      } else {
+        actualGeneratedLocation = generatedLocation;
+      }
+
+      setBreakpointOnEntryPoints(this.threadActor, actor, result.entryPoints);
+    }
 
+    return Promise.resolve().then(() => {
+      if (actualGeneratedLocation.generatedSourceActor.source) {
+        return this.threadActor.sources.getOriginalLocation(actualGeneratedLocation);
+      } else {
+        return OriginalLocation.fromGeneratedLocation(actualGeneratedLocation);
+      }
+    }).then((actualOriginalLocation) => {
+      let response = { actor: actor.actorID };
+      if (actualOriginalLocation.originalSourceActor.url !== originalLocation.originalSourceActor.url ||
+          actualOriginalLocation.originalLine !== originalLocation.originalLine)
+      {
         // Check whether we already have a breakpoint actor for the actual
         // location. If we do have an existing actor, then the actor we created
         // above is redundant and must be destroyed. If we do not have an existing
         // actor, we need to update the breakpoint store with the new location.
 
-        let existingActor = this.breakpointActorMap.getActor(actualLocation);
+        let existingActor = this.breakpointActorMap.getActor(actualOriginalLocation);
         if (existingActor) {
           actor.onDelete();
-          this.breakpointActorMap.deleteActor(generatedLocation);
-          actor = existingActor;
+          this.breakpointActorMap.deleteActor(originalLocation);
+          response.actor = existingActor.actorID;
         } else {
-          actor.generatedLocation = actualLocation;
-          this.breakpointActorMap.deleteActor(generatedLocation);
-          this.breakpointActorMap.setActor(actualLocation, actor);
-          setBreakpointOnEntryPoints(this.threadActor, actor, result.entryPoints);
+          actor.generatedLocation = actualGeneratedLocation;
+          this.breakpointActorMap.deleteActor(originalLocation);
+          this.breakpointActorMap.setActor(actualOriginalLocation, actor);
         }
-      } else {
-        setBreakpointOnEntryPoints(this.threadActor, actor, result.entryPoints);
-        actualLocation = generatedLocation;
-      }
-    }
 
-    return Promise.resolve().then(() => {
-      if (actualLocation.sourceActor.source) {
-        return this.threadActor.sources.getOriginalLocation({
-          sourceActor: actualLocation.sourceActor,
-          line: actualLocation.line,
-          column: actualLocation.column
-        });
-      } else {
-        return actualLocation;
-      }
-    }).then((actualLocation) => {
-      let response = { actor: actor.actorID };
-      if (actualLocation.sourceActor.url !== originalLocation.sourceActor.url ||
-          actualLocation.line !== originalLocation.line)
-      {
         response.actualLocation = {
-          source: actualLocation.sourceActor.form(),
-          line: actualLocation.line,
-          column: actualLocation.column
+          source: actualOriginalLocation.originalSourceActor.form(),
+          line: actualOriginalLocation.originalLine,
+          column: actualOriginalLocation.originalColumn
         };
       }
       return response;
@@ -3019,7 +3020,7 @@
                                 aScript,
                                 aScriptsAndOffsetMappings) {
     let offsetMappings = aScript.getAllColumnOffsets()
-      .filter(({ lineNumber }) => lineNumber === aTargetLocation.line);
+      .filter(({ lineNumber }) => lineNumber === aTargetLocation.generatedLine);
 
     // Attempt to find the current closest offset distance from the target
     // location by grabbing any offset mapping in the map by doing one iteration
@@ -3028,13 +3029,13 @@
     let closestDistance = Infinity;
     if (aScriptsAndOffsetMappings.size) {
       for (let mappings of aScriptsAndOffsetMappings.values()) {
-        closestDistance = Math.abs(aTargetLocation.column - mappings[0].columnNumber);
+        closestDistance = Math.abs(aTargetLocation.generatedColumn - mappings[0].columnNumber);
         break;
       }
     }
 
     for (let mapping of offsetMappings) {
-      let currentDistance = Math.abs(aTargetLocation.column - mapping.columnNumber);
+      let currentDistance = Math.abs(aTargetLocation.generatedColumn - mapping.columnNumber);
 
       if (currentDistance > closestDistance) {
         continue;
@@ -3329,23 +3330,17 @@
       };
     }
 
-    const generatedLocation = {
-      sourceActor: this.threadActor.sources.createNonSourceMappedActor(this.obj.script.source),
-      line: this.obj.script.startLine,
-      // TODO bug 901138: use Debugger.Script.prototype.startColumn.
-      column: 0
-    };
-
-    return this.threadActor.sources.getOriginalLocation(generatedLocation)
-      .then(({ sourceActor, line, column }) => {
-
-        return {
-          from: this.actorID,
-          source: sourceActor.form(),
-          line: line,
-          column: column
-        };
-      });
+    return this.threadActor.sources.getOriginalLocation(new GeneratedLocation(
+      this.threadActor.sources.createNonSourceMappedActor(this.obj.script.source),
+      this.obj.script.startLine,
+      0 // TODO bug 901138: use Debugger.Script.prototype.startColumn
+    )).then((originalLocation) => {
+      return {
+        source: originalLocation.originalSourceActor.form(),
+        line: originalLocation.originalLine,
+        column: originalLocation.originalColumn
+      };
+    });
   },
 
   /**
@@ -4330,6 +4325,43 @@
     return true;
   },
 
+  function PseudoArray({obj, threadActor}, aGrip, aRawObj) {
+    let length = 0;
+
+    // Making sure all keys are numbers from 0 to length-1
+    let keys = obj.getOwnPropertyNames();
+    if (keys.length == 0) {
+      return false;
+    }
+    for (let key of keys) {
+      if (isNaN(key) || key != length++) {
+        return false;
+      }
+    }
+
+    aGrip.preview = {
+      kind: "ArrayLike",
+      length: length,
+    };
+
+    // Avoid recursive object grips.
+    if (threadActor._gripDepth > 1) {
+      return true;
+    }
+
+    let items = aGrip.preview.items = [];
+
+    let i = 0;
+    for (let key of keys) {
+      if (aRawObj.hasOwnProperty(key) && i++ < OBJECT_PREVIEW_MAX_ITEMS) {
+        let value = makeDebuggeeValueIfNeeded(obj, aRawObj[key]);
+        items.push(threadActor.createValueGrip(value));
+      }
+    }
+
+    return true;
+  }, // PseudoArray
+
   function GenericObject(aObjectActor, aGrip) {
     let {obj, threadActor} = aObjectActor;
     if (aGrip.preview || aGrip.displayString || threadActor._gripDepth > 1) {
@@ -4573,11 +4605,11 @@
     form.this = threadActor.createValueGrip(this.frame.this);
     form.arguments = this._args();
     if (this.frame.script) {
-      var loc = this.threadActor.sources.getFrameLocation(this.frame);
+      var generatedLocation = this.threadActor.sources.getFrameLocation(this.frame);
       form.where = {
-        source: loc.sourceActor.form(),
-        line: loc.line,
-        column: loc.column
+        source: generatedLocation.generatedSourceActor.form(),
+        line: generatedLocation.generatedLine,
+        column: generatedLocation.generatedColumn
       };
     }
 
@@ -4633,16 +4665,10 @@
  *
  * @param ThreadActor aThreadActor
  *        The parent thread actor that contains this breakpoint.
- * @param object aOriginalLocation
- *        An object with the following properties:
- *        - sourceActor: A SourceActor that represents the source
- *        - line: the specified line
- *        - column: the specified column
- * @param object aGeneratedLocation
- *        An object with the following properties:
- *        - sourceActor: A SourceActor that represents the source
- *        - line: the specified line
- *        - column: the specified column
+ * @param OriginalLocation originalLocation
+ *        The original location of the breakpoint.
+ * @param GeneratedLocation generatedLocation
+ *        The generated location of the breakpoint.
  * @param string aCondition
  *        Optional. A condition which, when false, will cause the breakpoint to
  *        be skipped.
@@ -4714,10 +4740,10 @@
   hit: function (aFrame) {
     // Don't pause if we are currently stepping (in or over) or the frame is
     // black-boxed.
-    let loc = this.threadActor.sources.getFrameLocation(aFrame);
-    let { sourceActor } = this.threadActor.synchronize(
-      this.threadActor.sources.getOriginalLocation(loc));
-    let url = sourceActor.url;
+    let generatedLocation = this.threadActor.sources.getFrameLocation(aFrame);
+    let { originalSourceActor } = this.threadActor.synchronize(
+      this.threadActor.sources.getOriginalLocation(generatedLocation));
+    let url = originalSourceActor.url;
 
     if (this.threadActor.sources.isBlackBoxed(url)
         || aFrame.onStep
@@ -4744,8 +4770,8 @@
    */
   onDelete: function (aRequest) {
     // Remove from the breakpoint store.
-    if (this.generatedLocation) {
-      this.threadActor.breakpointActorMap.deleteActor(this.generatedLocation);
+    if (this.originalLocation) {
+      this.threadActor.breakpointActorMap.deleteActor(this.originalLocation);
     }
     this.threadActor.threadLifetimePool.removeActor(this);
     // Remove the actual breakpoint from the associated scripts.
@@ -5319,6 +5345,12 @@
         }
       } catch(ex) {
         // Not a valid URI.
+
+        // bug 1124536: fix getSourceText on scripts associated "javascript:SOURCE" urls
+        // (e.g. 'evaluate(sandbox, sourcecode, "javascript:"+sourcecode)' )
+        if (url.indexOf("javascript:") === 0) {
+          spec.contentType = "text/javascript";
+        } 
       }
     }
     else {
@@ -5552,13 +5584,13 @@
    */
   getFrameLocation: function (aFrame) {
     if (!aFrame || !aFrame.script) {
-      return { sourceActor: null, line: null, column: null };
-    }
-    return {
-      sourceActor: this.createNonSourceMappedActor(aFrame.script.source),
-      line: aFrame.script.getOffsetLine(aFrame.offset),
-      column: getOffsetColumn(aFrame.offset, aFrame.script)
+      return new GeneratedLocation();
     }
+    return new GeneratedLocation(
+      this.createNonSourceMappedActor(aFrame.script.source),
+      aFrame.script.getOffsetLine(aFrame.offset),
+      getOffsetColumn(aFrame.offset, aFrame.script)
+    );
   },
 
   /**
@@ -5568,53 +5600,52 @@
    * sure to that it works properly, reusing source maps if already
    * fetched. Use this from any actor that needs sourcemapping.
    */
-  getOriginalLocation: function ({ sourceActor, line, column }) {
-    let source = sourceActor.source;
-    let url = source ? source.url : sourceActor._originalUrl;
+  getOriginalLocation: function (generatedLocation) {
+    let {
+      generatedSourceActor,
+      generatedLine,
+      generatedColumn
+    } = generatedLocation;
+    let source = generatedSourceActor.source;
+    let url = source ? source.url : generatedSourceActor._originalUrl;
 
     // In certain scenarios the source map may have not been fetched
     // yet (or at least tied to this Debugger.Source instance), so use
     // `fetchSourceMap` instead of `getSourceMap`. This allows this
     // function to be called from anywere (across debuggers) and it
     // should just automatically work.
-    return this.fetchSourceMap(source).then(sm => {
-      if (sm) {
+    return this.fetchSourceMap(source).then(map => {
+      if (map) {
         let {
-          source: sourceUrl,
-          line: sourceLine,
-          column: sourceCol,
-          name: sourceName
-        } = sm.originalPositionFor({
-          line: line,
-          column: column == null ? Infinity : column
+          source: originalUrl,
+          line: originalLine,
+          column: originalColumn,
+          name: originalName
+        } = map.originalPositionFor({
+          line: generatedLine,
+          column: generatedColumn == null ? Infinity : generatedColumn
         });
 
-        return {
-          // Since the `Debugger.Source` instance may come from a
-          // different `Debugger` instance (any actor can call this
-          // method), we can't rely on any of the source discovery
-          // setup (`_discoverSources`, etc) to have been run yet. So
-          // we have to assume that the actor may not already exist,
-          // and we might need to create it, so use `source` and give
-          // it the required parameters for a sourcemapped source.
-          sourceActor: (!sourceUrl) ? null : this.source({
-            originalUrl: sourceUrl,
+        // Since the `Debugger.Source` instance may come from a
+        // different `Debugger` instance (any actor can call this
+        // method), we can't rely on any of the source discovery
+        // setup (`_discoverSources`, etc) to have been run yet. So
+        // we have to assume that the actor may not already exist,
+        // and we might need to create it, so use `source` and give
+        // it the required parameters for a sourcemapped source.
+        return new OriginalLocation(
+          originalUrl ? this.source({
+            originalUrl: originalUrl,
             generatedSource: source
-          }),
-          url: sourceUrl,
-          line: sourceLine,
-          column: sourceCol,
-          name: sourceName
-        };
+          }) : null,
+          originalLine,
+          originalColumn,
+          originalName
+        );
       }
 
       // No source map
-      return resolve({
-        sourceActor: sourceActor,
-        url: url,
-        line: line,
-        column: column
-      });
+      return OriginalLocation.fromGeneratedLocation(generatedLocation);
     });
   },
 
@@ -5627,34 +5658,40 @@
    * the tables this function uses; thus, it won't know that S's original
    * source URLs map to S until P is resolved.
    */
-  getGeneratedLocation: function ({ sourceActor, line, column }) {
+  getGeneratedLocation: function (originalLocation) {
+    let { originalSourceActor } = originalLocation;
+
     // Both original sources and normal sources could have sourcemaps,
     // because normal sources can be pretty-printed which generates a
     // sourcemap for itself. Check both of the source properties to make it work
     // for both kinds of sources.
-    let source = sourceActor.generatedSource || sourceActor.source;
+    let source = originalSourceActor.source || originalSourceActor.generatedSource;
 
     // See comment about `fetchSourceMap` in `getOriginalLocation`.
-    return this.fetchSourceMap(source).then(sm => {
-      if (sm) {
-        let { line: genLine, column: genColumn } = sm.generatedPositionFor({
-          source: sourceActor.url,
-          line: line,
-          column: column == null ? Infinity : column
+    return this.fetchSourceMap(source).then((map) => {
+      if (map) {
+        let {
+          originalLine,
+          originalColumn
+        } = originalLocation;
+
+        let {
+          line: generatedLine,
+          column: generatedColumn
+        } = map.generatedPositionFor({
+          source: originalSourceActor.url,
+          line: originalLine,
+          column: originalColumn == null ? Infinity : originalColumn
         });
 
-        return {
-          sourceActor: this.createNonSourceMappedActor(source),
-          line: genLine,
-          column: genColumn
-        };
+        return new GeneratedLocation(
+          this.createNonSourceMappedActor(source),
+          generatedLine,
+          generatedColumn
+        );
       }
 
-      return resolve({
-        sourceActor: sourceActor,
-        line: line,
-        column: column
-      });
+      return GeneratedLocation.fromOriginalLocation(originalLocation);
     });
   },
 
@@ -5813,7 +5850,7 @@
                 getInterface(Ci.nsIDOMWindowUtils).currentInnerWindowID;
 };
 
-const symbolProtoToString = typeof Symbol === "function" ? Symbol.prototype.toString : null;
+const symbolProtoToString = Symbol.prototype.toString;
 
 function getSymbolName(symbol) {
   const name = symbolProtoToString.call(symbol).slice("Symbol(".length, -1);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/stylesheets.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/stylesheets.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/stylesheets.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/stylesheets.js	2015-02-28 15:03:08.000000000 +0000
@@ -104,11 +104,11 @@
       let actors = [];
 
       for (let doc of documents) {
-        let sheets = yield this._addStyleSheets(doc.styleSheets);
+        let sheets = yield this._addStyleSheets(doc);
         actors = actors.concat(sheets);
 
         // Recursively handle style sheets of the documents in iframes.
-        for (let iframe of doc.getElementsByTagName("iframe")) {
+        for (let iframe of doc.querySelectorAll("iframe, browser, frame")) {
           if (iframe.contentDocument) {
             // Sometimes, iframes don't have any document, like the
             // one that are over deeply nested (bug 285395)
@@ -121,25 +121,54 @@
   },
 
   /**
-   * Add all the stylesheets to the map and create an actor for each one
-   * if not already created.
+   * Check if we should be showing this stylesheet.
    *
-   * @param {[DOMStyleSheet]} styleSheets
-   *        Stylesheets to add
+   * @param {Document} doc
+   *        Document for which we're checking
+   * @param {DOMCSSStyleSheet} sheet
+   *        Stylesheet we're interested in
+   *
+   * @return boolean
+   *         Whether the stylesheet should be listed.
+   */
+  _shouldListSheet: function(doc, sheet) {
+    // Special case about:PreferenceStyleSheet, as it is generated on the
+    // fly and the URI is not registered with the about: handler.
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=935803#c37
+    if (sheet.href && sheet.href.toLowerCase() == "about:preferencestylesheet") {
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Add all the stylesheets for this document to the map and create an actor
+   * for each one if not already created.
+   *
+   * @param {Document} doc
+   *        Document for which to add stylesheets
    *
    * @return {Promise}
    *         Promise that resolves to an array of StyleSheetActors
    */
-  _addStyleSheets: function(styleSheets)
+  _addStyleSheets: function(doc)
   {
     return Task.spawn(function*() {
+      let isChrome = Services.scriptSecurityManager.isSystemPrincipal(doc.nodePrincipal);
+      let styleSheets = isChrome ? DOMUtils.getAllStyleSheets(doc) : doc.styleSheets;
       let actors = [];
       for (let i = 0; i < styleSheets.length; i++) {
-        let actor = this.parentActor.createStyleSheetActor(styleSheets[i]);
+        let sheet = styleSheets[i];
+        if (!this._shouldListSheet(doc, sheet)) {
+          continue;
+        }
+
+        let actor = this.parentActor.createStyleSheetActor(sheet);
         actors.push(actor);
 
         // Get all sheets, including imported ones
-        let imports = yield this._getImported(actor);
+        let imports = yield this._getImported(doc, actor);
         actors = actors.concat(imports);
       }
       return actors;
@@ -149,12 +178,14 @@
   /**
    * Get all the stylesheets @imported from a stylesheet.
    *
+   * @param  {Document} doc
+   *         The document including the stylesheet
    * @param  {DOMStyleSheet} styleSheet
    *         Style sheet to search
    * @return {Promise}
    *         A promise that resolves with an array of StyleSheetActors
    */
-  _getImported: function(styleSheet) {
+  _getImported: function(doc, styleSheet) {
     return Task.spawn(function*() {
       let rules = yield styleSheet.getCSSRules();
       let imported = [];
@@ -164,14 +195,14 @@
         if (rule.type == Ci.nsIDOMCSSRule.IMPORT_RULE) {
           // Associated styleSheet may be null if it has already been seen due
           // to duplicate @imports for the same URL.
-          if (!rule.styleSheet) {
+          if (!rule.styleSheet || !this._shouldListSheet(doc, rule.styleSheet)) {
             continue;
           }
           let actor = this.parentActor.createStyleSheetActor(rule.styleSheet);
           imported.push(actor);
 
           // recurse imports in this stylesheet as well
-          let children = yield this._getImported(actor);
+          let children = yield this._getImported(doc, actor);
           imported = imported.concat(children);
         }
         else if (rule.type != Ci.nsIDOMCSSRule.CHARSET_RULE) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/styles.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/styles.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/styles.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/styles.js	2015-02-28 15:03:08.000000000 +0000
@@ -747,8 +747,8 @@
     // the size of the element.
 
     let clientRect = node.rawNode.getBoundingClientRect();
-    layout.width = Math.ceil(clientRect.width);
-    layout.height = Math.ceil(clientRect.height);
+    layout.width = parseFloat(clientRect.width.toPrecision(6));
+    layout.height = parseFloat(clientRect.height.toPrecision(6));
 
     // We compute and update the values of margins & co.
     let style = CssLogic.getComputedStyle(node.rawNode);
@@ -776,7 +776,7 @@
 
     for (let i in this.map) {
       let property = this.map[i].property;
-      this.map[i].value = parseInt(style.getPropertyValue(property));
+      this.map[i].value = parseFloat(style.getPropertyValue(property));
     }
 
 
@@ -1068,7 +1068,7 @@
       document = this.getDocument(parentStyleSheet);
     }
 
-    let tempElement = document.createElement("div");
+    let tempElement = document.createElementNS(XHTML_NS, "div");
 
     for (let mod of modifications) {
       if (mod.type === "set") {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/tracer.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/tracer.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/tracer.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/tracer.js	2015-02-28 15:03:08.000000000 +0000
@@ -8,7 +8,7 @@
 const { DebuggerServer } = require("devtools/server/main");
 const { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
 const Debugger = require("Debugger");
-const { getOffsetColumn } = require("devtools/server/actors/common");
+const { GeneratedLocation, getOffsetColumn } = require("devtools/server/actors/common");
 const promise = require("promise");
 
 Cu.import("resource://gre/modules/Task.jsm");
@@ -339,25 +339,25 @@
         if (aFrame.script) {
           let sources = this._parent.threadActor.sources;
 
-          sourceMappedLocation = yield sources.getOriginalLocation({
-            sourceActor: sources.createNonSourceMappedActor(aFrame.script.source),
-            url: aFrame.script.source.url,
-            line: aFrame.script.startLine,
+          sourceMappedLocation = yield sources.getOriginalLocation(new GeneratedLocation(
+            sources.createNonSourceMappedActor(aFrame.script.source),
+            aFrame.script.startLine,
             // We should return the location of the start of the script, but
             // Debugger.Script does not provide complete start locations (bug
             // 901138). Instead, return the current offset (the location of the
             // first statement in the function).
-            column: getOffsetColumn(aFrame.offset, aFrame.script)
-          });
+            getOffsetColumn(aFrame.offset, aFrame.script)
+          ));
         }
       }
 
       if (this._requestsForTraceType.name) {
-        if (sourceMappedLocation && sourceMappedLocation.name) {
-          packet.name = sourceMappedLocation.name;
+        if (sourceMappedLocation && sourceMappedLocation.originalName) {
+          packet.name = sourceMappedLocation.originalName;
         } else {
           packet.name = name;
         }
+        packet.name = name;
       }
 
       if (this._requestsForTraceType.location) {
@@ -365,10 +365,9 @@
           // Don't copy sourceMappedLocation directly because it
           // contains a reference to the source actor
           packet.location = {
-            url: sourceMappedLocation.url,
-            line: sourceMappedLocation.line,
-            column: sourceMappedLocation.column,
-            name: sourceMappedLocation.name
+            url: sourceMappedLocation.originalUrl,
+            line: sourceMappedLocation.originalLine,
+            column: sourceMappedLocation.originalColumn
           };
         }
       }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/utils/audionodes.json thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/utils/audionodes.json
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/utils/audionodes.json	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/utils/audionodes.json	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,107 @@
+{
+  "OscillatorNode": {
+    "properties": {
+      "type": {},
+      "frequency": {
+        "param": true
+      },
+      "detune": {
+        "param": true
+      }
+    }
+  },
+  "GainNode": {
+    "properties": { "gain": { "param": true }}
+  },
+  "DelayNode": {
+    "properties": { "delayTime": { "param": true }}
+  },
+  "AudioBufferSourceNode": {
+    "properties": {
+      "buffer": { "Buffer": true },
+      "playbackRate": {
+        "param": true
+      },
+      "loop": {},
+      "loopStart": {},
+      "loopEnd": {}
+    }
+  },
+  "ScriptProcessorNode": {
+    "properties": { "bufferSize": { "readonly": true }}
+  },
+  "PannerNode": {
+    "properties": {
+      "panningModel": {},
+      "distanceModel": {},
+      "refDistance": {},
+      "maxDistance": {},
+      "rolloffFactor": {},
+      "coneInnerAngle": {},
+      "coneOuterAngle": {},
+      "coneOuterGain": {}
+    }
+  },
+  "ConvolverNode": {
+    "properties": {
+      "buffer": { "Buffer": true },
+      "normalize": {}
+    }
+  },
+  "DynamicsCompressorNode": {
+    "properties": {
+      "threshold": { "param": true },
+      "knee": { "param": true },
+      "ratio": { "param": true },
+      "reduction": {},
+      "attack": { "param": true },
+      "release": { "param": true }
+    }
+  },
+  "BiquadFilterNode": {
+    "properties": {
+      "type": {},
+      "frequency": { "param": true },
+      "Q": { "param": true },
+      "detune": { "param": true },
+      "gain": { "param": true }
+    }
+  },
+  "WaveShaperNode": {
+    "properties": {
+      "curve": { "Float32Array": true },
+      "oversample": {}
+    }
+  },
+  "AnalyserNode": {
+    "properties": {
+      "fftSize": {},
+      "minDecibels": {},
+      "maxDecibels": {},
+      "smoothingTimeConstant": {},
+      "frequencyBinCount": { "readonly": true }
+    }
+  },
+  "AudioDestinationNode": {
+    "unbypassable": true
+  },
+  "ChannelSplitterNode": {
+    "unbypassable": true
+  },
+  "ChannelMergerNode": {
+    "unbypassable": true
+  },
+  "MediaElementAudioSourceNode": {},
+  "MediaStreamAudioSourceNode": {},
+  "MediaStreamAudioDestinationNode": {
+    "unbypassable": true,
+    "properties": {
+      "stream": { "MediaStream": true }
+    }
+  },
+  "StereoPannerNode": {
+    "properties": {
+      "pan": {}
+    }
+  }
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/webaudio.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/webaudio.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/actors/webaudio.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/actors/webaudio.js	2015-02-28 15:03:08.000000000 +0000
@@ -14,10 +14,10 @@
 const { CallWatcherActor, CallWatcherFront } = require("devtools/server/actors/call-watcher");
 const { ThreadActor } = require("devtools/server/actors/script");
 const AutomationTimeline = require("./utils/automation-timeline");
-
 const { on, once, off, emit } = events;
 const { types, method, Arg, Option, RetVal } = protocol;
-
+const AUDIO_NODE_DEFINITION = require("devtools/server/actors/utils/audionodes.json");
+const ENABLE_AUTOMATION = false;
 const AUTOMATION_GRANULARITY = 2000;
 const AUTOMATION_GRANULARITY_MAX = 6000;
 
@@ -42,118 +42,6 @@
   "connect", "disconnect"
 ];
 
-const NODE_PROPERTIES = {
-  "OscillatorNode": {
-    "properties": {
-      "type": {},
-      "frequency": {
-        "param": true
-      },
-      "detune": {
-        "param": true
-      }
-    }
-  },
-  "GainNode": {
-    "properties": { "gain": { "param": true }}
-  },
-  "DelayNode": {
-    "properties": { "delayTime": { "param": true }}
-  },
-  // TODO deal with figuring out adding `detune` AudioParam
-  // for AudioBufferSourceNode, which is in the spec
-  // but not yet added in implementation
-  // bug 1116852
-  "AudioBufferSourceNode": {
-    "properties": {
-      "buffer": { "Buffer": true },
-      "playbackRate": {
-        "param": true
-      },
-      "loop": {},
-      "loopStart": {},
-      "loopEnd": {}
-    }
-  },
-  "ScriptProcessorNode": {
-    "properties": { "bufferSize": { "readonly": true }}
-  },
-  "PannerNode": {
-    "properties": {
-      "panningModel": {},
-      "distanceModel": {},
-      "refDistance": {},
-      "maxDistance": {},
-      "rolloffFactor": {},
-      "coneInnerAngle": {},
-      "coneOuterAngle": {},
-      "coneOuterGain": {}
-    }
-  },
-  "ConvolverNode": {
-    "properties": {
-      "buffer": { "Buffer": true },
-      "normalize": {},
-    }
-  },
-  "DynamicsCompressorNode": {
-    "properties": {
-      "threshold": { "param": true },
-      "knee": { "param": true },
-      "ratio": { "param": true },
-      "reduction": {},
-      "attack": { "param": true },
-      "release": { "param": true }
-    }
-  },
-  "BiquadFilterNode": {
-    "properties": {
-      "type": {},
-      "frequency": { "param": true },
-      "Q": { "param": true },
-      "detune": { "param": true },
-      "gain": { "param": true }
-    }
-  },
-  "WaveShaperNode": {
-    "properties": {
-      "curve": { "Float32Array": true },
-      "oversample": {}
-    }
-  },
-  "AnalyserNode": {
-    "properties": {
-      "fftSize": {},
-      "minDecibels": {},
-      "maxDecibels": {},
-      "smoothingTimeConstant": {},
-      "frequencyBinCount": { "readonly": true },
-    }
-  },
-  "AudioDestinationNode": {
-    "unbypassable": true
-  },
-  "ChannelSplitterNode": {
-    "unbypassable": true
-  },
-  "ChannelMergerNode": {
-    "unbypassable": true
-  },
-  "MediaElementAudioSourceNode": {},
-  "MediaStreamAudioSourceNode": {},
-  "MediaStreamAudioDestinationNode": {
-    "unbypassable": true,
-    "properties": {
-      "stream": { "MediaStream": true }
-    }
-  },
-  "StereoPannerNode": {
-    "properties": {
-      "pan": {}
-    }
-  }
-};
-
 /**
  * An Audio Node actor allowing communication to a specific audio node in the
  * Audio Context graph.
@@ -189,7 +77,7 @@
     }
 
     // Create automation timelines for all AudioParams
-    Object.keys(NODE_PROPERTIES[this.type].properties || {})
+    Object.keys(AUDIO_NODE_DEFINITION[this.type].properties || {})
       .filter(isAudioParam.bind(null, node))
       .forEach(paramName => {
         this.automation[paramName] = new AutomationTimeline(node[paramName].defaultValue);
@@ -252,7 +140,7 @@
       return;
     }
 
-    let bypassable = !NODE_PROPERTIES[this.type].unbypassable;
+    let bypassable = !AUDIO_NODE_DEFINITION[this.type].unbypassable;
     if (bypassable) {
       node.passThrough = enable;
     }
@@ -345,7 +233,7 @@
    *        Name of the AudioParam whose flags are desired.
    */
   getParamFlags: method(function (param) {
-    return ((NODE_PROPERTIES[this.type] || {}).properties || {})[param];
+    return ((AUDIO_NODE_DEFINITION[this.type] || {}).properties || {})[param];
   }, {
     request: { param: Arg(0, "string") },
     response: { flags: RetVal("nullable:primitive") }
@@ -356,7 +244,7 @@
    * corresponding to a property name and current value of the audio node.
    */
   getParams: method(function (param) {
-    let props = Object.keys(NODE_PROPERTIES[this.type].properties || {});
+    let props = Object.keys(AUDIO_NODE_DEFINITION[this.type].properties || {});
     return props.map(prop =>
       ({ param: prop, value: this.getParam(prop), flags: this.getParamFlags(prop) }));
   }, {
@@ -618,7 +506,7 @@
    * flags.
    */
   getDefinition: method(function () {
-    return NODE_PROPERTIES;
+    return AUDIO_NODE_DEFINITION;
   }, {
     response: { definition: RetVal("json") }
   }),
@@ -680,7 +568,7 @@
     else if (WebAudioFront.NODE_CREATION_METHODS.has(name)) {
       this._handleCreationCall(functionCall);
     }
-    else if (WebAudioFront.AUTOMATION_METHODS.has(name)) {
+    else if (ENABLE_AUTOMATION && WebAudioFront.AUTOMATION_METHODS.has(name)) {
       this._handleAutomationCall(functionCall);
     }
   },
@@ -833,7 +721,7 @@
    */
   _instrumentParams: function (node) {
     let type = getConstructorName(node);
-    Object.keys(NODE_PROPERTIES[type].properties || {})
+    Object.keys(AUDIO_NODE_DEFINITION[type].properties || {})
       .filter(isAudioParam.bind(null, node))
       .forEach(paramName => {
         let param = node[paramName];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/moz.build	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -74,6 +74,7 @@
 
 EXTRA_JS_MODULES.devtools.server.actors.utils += [
     'actors/utils/actor-registry-utils.js',
+    'actors/utils/audionodes.json',
     'actors/utils/automation-timeline.js',
     'actors/utils/make-debugger.js',
     'actors/utils/map-uri-to-addon-id.js',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/protocol.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/protocol.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/protocol.js	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/protocol.js	2015-02-28 15:03:08.000000000 +0000
@@ -1111,8 +1111,9 @@
     // Reject all outstanding requests, they won't make sense after
     // the front is destroyed.
     while (this._requests && this._requests.length > 0) {
-      let deferred = this._requests.shift();
-      deferred.reject(new Error("Connection closed"));
+      let { deferred, to, type } = this._requests.shift();
+      deferred.reject(new Error("Connection closed, pending request to " + to +
+                                ", type " + type + " failed"));
     }
     Pool.prototype.destroy.call(this);
     this.actorID = null;
@@ -1159,7 +1160,13 @@
    */
   request: function(packet) {
     let deferred = promise.defer();
-    this._requests.push(deferred);
+    // Save packet basics for debugging
+    let { to, type } = packet;
+    this._requests.push({
+      deferred,
+      to: to || this.actorID,
+      type
+    });
     this.send(packet);
     return deferred.promise;
   },
@@ -1195,7 +1202,7 @@
       throw err;
     }
 
-    let deferred = this._requests.shift();
+    let { deferred } = this._requests.shift();
     if (packet.error) {
       // "Protocol error" is here to avoid TBPL heuristics. See also
       // https://mxr.mozilla.org/webtools-central/source/tbpl/php/inc/GeneralErrorFilter.php
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/mochitest/chrome.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/mochitest/chrome.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/mochitest/chrome.ini	2015-02-19 00:42:13.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/mochitest/chrome.ini	2015-02-28 15:03:08.000000000 +0000
@@ -67,6 +67,7 @@
 [test_memory_allocations_03.html]
 [test_memory_allocations_04.html]
 [test_memory_allocations_05.html]
+[test_memory_allocations_06.html]
 [test_memory_attach_01.html]
 [test_memory_attach_02.html]
 [test_memory_census.html]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/mochitest/test_memory_allocations_06.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/mochitest/test_memory_allocations_06.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/mochitest/test_memory_allocations_06.html	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/mochitest/test_memory_allocations_06.html	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+Bug 1132764 - Test controlling the maximum allocations log length over the RDP.
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Memory monitoring actor test</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">
+</head>
+<body>
+<pre id="test">
+<script src="memory-helpers.js" type="application/javascript;version=1.8"></script>
+<script>
+window.onload = function() {
+  SimpleTest.waitForExplicitFinish();
+
+  Task.spawn(function* () {
+    var { memory, client } = yield startServerAndGetSelectedTabMemory();
+    yield memory.attach();
+
+    var allocs = [];
+    function allocator() {
+      allocs.push(new Object);
+    }
+
+    yield memory.startRecordingAllocations({
+      maxLogLength: 1
+    });
+
+    allocator();
+    allocator();
+    allocator();
+
+    var response = yield memory.getAllocations();
+    yield memory.stopRecordingAllocations();
+
+    is(response.allocations.length, 1,
+       "There should only be one entry in the allocations log.");
+
+    yield memory.detach();
+    destroyServerAndFinish(client);
+  });
+};
+</script>
+</pre>
+</body>
+</html>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_breakpoint-actor-map.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_breakpoint-actor-map.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_breakpoint-actor-map.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_breakpoint-actor-map.js	2015-02-28 15:03:08.000000000 +0000
@@ -21,13 +21,13 @@
 function test_get_actor() {
   let bpStore = new BreakpointActorMap();
   let location = {
-    sourceActor: { actor: 'actor1' },
-    line: 3
+    originalSourceActor: { actor: 'actor1' },
+    originalLine: 3
   };
   let columnLocation = {
-    sourceActor: { actor: 'actor2' },
-    line: 5,
-    column: 15
+    originalSourceActor: { actor: 'actor2' },
+    originalLine: 5,
+    originalColumn: 15
   };
 
   // Shouldn't have breakpoint
@@ -59,9 +59,9 @@
   // Breakpoint with column
   let bpStore = new BreakpointActorMap();
   let location = {
-    sourceActor: { actor: 'actor1' },
-    line: 10,
-    column: 9
+    originalSourceActor: { actor: 'actor1' },
+    originalLine: 10,
+    originalColumn: 9
   };
   bpStore.setActor(location, {});
   do_check_true(!!bpStore.getActor(location),
@@ -69,8 +69,8 @@
 
   // Breakpoint without column (whole line breakpoint)
   location = {
-    sourceActor: { actor: 'actor2' },
-    line: 103
+    originalSourceActor: { actor: 'actor2' },
+    originalLine: 103
   };
   bpStore.setActor(location, {});
   do_check_true(!!bpStore.getActor(location),
@@ -81,9 +81,9 @@
   // Breakpoint with column
   let bpStore = new BreakpointActorMap();
   let location = {
-    sourceActor: { actor: 'actor1' },
-    line: 10,
-    column: 9
+    originalSourceActor: { actor: 'actor1' },
+    originalLine: 10,
+    originalColumn: 9
   };
   bpStore.setActor(location, {});
   bpStore.deleteActor(location);
@@ -92,8 +92,8 @@
 
   // Breakpoint without column (whole line breakpoint)
   location = {
-    sourceActor: { actor: 'actor2' },
-    line: 103
+    originalSourceActor: { actor: 'actor2' },
+    originalLine: 103
   };
   bpStore.setActor(location, {});
   bpStore.deleteActor(location);
@@ -103,14 +103,14 @@
 
 function test_find_actors() {
   let bps = [
-    { sourceActor: { actor: "actor1" }, line: 10 },
-    { sourceActor: { actor: "actor1" }, line: 10, column: 3 },
-    { sourceActor: { actor: "actor1" }, line: 10, column: 10 },
-    { sourceActor: { actor: "actor1" }, line: 23, column: 89 },
-    { sourceActor: { actor: "actor2" }, line: 10, column: 1 },
-    { sourceActor: { actor: "actor2" }, line: 20, column: 5 },
-    { sourceActor: { actor: "actor2" }, line: 30, column: 34 },
-    { sourceActor: { actor: "actor2" }, line: 40, column: 56 }
+    { originalSourceActor: { actor: "actor1" }, originalLine: 10 },
+    { originalSourceActor: { actor: "actor1" }, originalLine: 10, originalColumn: 3 },
+    { originalSourceActor: { actor: "actor1" }, originalLine: 10, originalColumn: 10 },
+    { originalSourceActor: { actor: "actor1" }, originalLine: 23, originalColumn: 89 },
+    { originalSourceActor: { actor: "actor2" }, originalLine: 10, originalColumn: 1 },
+    { originalSourceActor: { actor: "actor2" }, originalLine: 20, originalColumn: 5 },
+    { originalSourceActor: { actor: "actor2" }, originalLine: 30, originalColumn: 34 },
+    { originalSourceActor: { actor: "actor2" }, originalLine: 40, originalColumn: 56 }
   ];
 
   let bpStore = new BreakpointActorMap();
@@ -130,8 +130,8 @@
 
   // Breakpoints by URL
 
-  bpSet = new Set(bps.filter(bp => { return bp.sourceActor.actorID === "actor1" }));
-  for (let bp of bpStore.findActors({ sourceActor: { actorID: "actor1" } })) {
+  bpSet = new Set(bps.filter(bp => { return bp.originalSourceActor.actorID === "actor1" }));
+  for (let bp of bpStore.findActors({ originalSourceActor: { actorID: "actor1" } })) {
     bpSet.delete(bp);
   }
   do_check_eq(bpSet.size, 0,
@@ -139,15 +139,15 @@
 
   // Breakpoints by URL and line
 
-  bpSet = new Set(bps.filter(bp => { return bp.sourceActor.actorID === "actor1" && bp.line === 10; }));
+  bpSet = new Set(bps.filter(bp => { return bp.originalSourceActor.actorID === "actor1" && bp.originalLine === 10; }));
   let first = true;
-  for (let bp of bpStore.findActors({ sourceActor: { actorID: "actor1" }, line: 10 })) {
+  for (let bp of bpStore.findActors({ originalSourceActor: { actorID: "actor1" }, originalLine: 10 })) {
     if (first) {
-      do_check_eq(bp.column, undefined,
+      do_check_eq(bp.originalColumn, undefined,
                   "Should always get the whole line breakpoint first");
       first = false;
     } else {
-      do_check_neq(bp.column, undefined,
+      do_check_neq(bp.originalColumn, undefined,
                    "Should not get the whole line breakpoint any time other than first.");
     }
     bpSet.delete(bp);
@@ -161,9 +161,9 @@
 
   // Breakpoint with column
   let location = {
-    sourceActor: { actorID: "foo-actor" },
-    line: 10,
-    column: 9
+    originalSourceActor: { actorID: "foo-actor" },
+    originalLine: 10,
+    originalColumn: 9
   };
   bpStore.setActor(location, {});
   bpStore.setActor(location, {});
@@ -172,8 +172,8 @@
 
   // Breakpoint without column (whole line breakpoint)
   location = {
-    sourceActor: { actorID: "foo-actor" },
-    line: 15
+    originalSourceActor: { actorID: "foo-actor" },
+    originalLine: 15
   };
   bpStore.setActor(location, {});
   bpStore.setActor(location, {});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_protocol_abort.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_protocol_abort.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_protocol_abort.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_protocol_abort.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,72 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Outstanding requests should be rejected when the connection aborts
+ * unexpectedly.
+ */
+
+let protocol = devtools.require("devtools/server/protocol");
+let {method, Arg, Option, RetVal} = protocol;
+let events = devtools.require("sdk/event/core");
+
+function simpleHello() {
+  return {
+    from: "root",
+    applicationType: "xpcshell-tests",
+    traits: [],
+  }
+}
+
+let RootActor = protocol.ActorClass({
+  typeName: "root",
+  initialize: function(conn) {
+    protocol.Actor.prototype.initialize.call(this, conn);
+    // Root actor owns itself.
+    this.manage(this);
+    this.actorID = "root";
+    this.sequence = 0;
+  },
+
+  sayHello: simpleHello,
+
+  simpleReturn: method(function() {
+    return this.sequence++;
+  }, {
+    response: { value: RetVal() },
+  })
+});
+
+let RootFront = protocol.FrontClass(RootActor, {
+  initialize: function(client) {
+    this.actorID = "root";
+    protocol.Front.prototype.initialize.call(this, client);
+    // Root owns itself.
+    this.manage(this);
+  }
+});
+
+function run_test() {
+  DebuggerServer.createRootActor = RootActor;
+  DebuggerServer.init();
+
+  let trace = connectPipeTracing();
+  let client = new DebuggerClient(trace);
+  let rootClient;
+
+  client.connect((applicationType, traits) => {
+    rootClient = RootFront(client);
+
+    rootClient.simpleReturn().then(() => {
+      ok(false, "Connection was aborted, request shouldn't resolve");
+      do_test_finished();
+    }, () => {
+      ok(true, "Connection was aborted, request rejected correctly");
+      do_test_finished();
+    });
+
+    trace.close();
+  });
+
+  do_test_pending();
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_symbols-01.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_symbols-01.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_symbols-01.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_symbols-01.js	2015-02-28 15:03:08.000000000 +0000
@@ -23,12 +23,6 @@
 }
 
 function* testSymbols(client, debuggee) {
-  // Symbol is conditionally defined. If it isn't defined in this build, just pass.
-  if (typeof Symbol === "undefined") {
-    finishClient(client);
-    return;
-  }
-
   const evalCode = () => {
     Components.utils.evalInSandbox(
       "(" + function () {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_symbols-02.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_symbols-02.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/test_symbols-02.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/test_symbols-02.js	2015-02-28 15:03:08.000000000 +0000
@@ -23,12 +23,6 @@
 }
 
 function* testSymbols(client, debuggee) {
-  // Symbol is conditionally defined. If it isn't defined in this build, just pass.
-  if (typeof Symbol === "undefined") {
-    finishClient(client);
-    return;
-  }
-
   const evalCode = () => {
     Components.utils.evalInSandbox(
       "(" + function () {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/server/tests/unit/xpcshell.ini	2015-02-28 15:03:08.000000000 +0000
@@ -64,6 +64,7 @@
 [test_eval-03.js]
 [test_eval-04.js]
 [test_eval-05.js]
+[test_protocol_abort.js]
 [test_protocol_async.js]
 [test_protocol_children.js]
 [test_protocol_formtype.js]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/async-storage.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/async-storage.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/async-storage.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/async-storage.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,193 @@
+/**
+ *
+ * Adapted from https://github.com/mozilla-b2g/gaia/blob/f09993563fb5fec4393eb71816ce76cb00463190/shared/js/async_storage.js
+ * (converted to use Promises instead of callbacks).
+ *
+ * This file defines an asynchronous version of the localStorage API, backed by
+ * an IndexedDB database.  It creates a global asyncStorage object that has
+ * methods like the localStorage object.
+ *
+ * To store a value use setItem:
+ *
+ *   asyncStorage.setItem("key", "value");
+ *
+ * This returns a promise in case you want confirmation that the value has been stored.
+ *
+ *  asyncStorage.setItem("key", "newvalue").then(function() {
+ *    console.log("new value stored");
+ *  });
+ *
+ * To read a value, call getItem(), but note that you must wait for a promise
+ * resolution for the value to be retrieved.
+ *
+ *  asyncStorage.getItem("key").then(function(value) {
+ *    console.log("The value of key is:", value);
+ *  });
+ *
+ * Note that unlike localStorage, asyncStorage does not allow you to store and
+ * retrieve values by setting and querying properties directly. You cannot just
+ * write asyncStorage.key; you have to explicitly call setItem() or getItem().
+ *
+ * removeItem(), clear(), length(), and key() are like the same-named methods of
+ * localStorage, and all return a promise.
+ *
+ * The asynchronous nature of getItem() makes it tricky to retrieve multiple
+ * values. But unlike localStorage, asyncStorage does not require the values you
+ * store to be strings.  So if you need to save multiple values and want to
+ * retrieve them together, in a single asynchronous operation, just group the
+ * values into a single object. The properties of this object may not include
+ * DOM elements, but they may include things like Blobs and typed arrays.
+ *
+ */
+const {Cc, Ci, Cu, Cr} = require("chrome");
+const {indexedDB} = require("sdk/indexed-db");
+const {Promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+
+module.exports = (function() {
+  "use strict";
+
+  var DBNAME = "devtools-async-storage";
+  var DBVERSION = 1;
+  var STORENAME = "keyvaluepairs";
+  var db = null;
+
+  function withStore(type, onsuccess, onerror) {
+    if (db) {
+      var transaction = db.transaction(STORENAME, type);
+      var store = transaction.objectStore(STORENAME);
+      onsuccess(store);
+    } else {
+      var openreq = indexedDB.open(DBNAME, DBVERSION);
+      openreq.onerror = function withStoreOnError() {
+        onerror();
+      };
+      openreq.onupgradeneeded = function withStoreOnUpgradeNeeded() {
+        // First time setup: create an empty object store
+        openreq.result.createObjectStore(STORENAME);
+      };
+      openreq.onsuccess = function withStoreOnSuccess() {
+        db = openreq.result;
+        var transaction = db.transaction(STORENAME, type);
+        var store = transaction.objectStore(STORENAME);
+        onsuccess(store);
+      };
+    }
+  }
+
+  function getItem(key) {
+    return new Promise((resolve, reject) => {
+      var req;
+      withStore("readonly", (store) => {
+        store.transaction.oncomplete = function onComplete() {
+          var value = req.result;
+          if (value === undefined) {
+            value = null;
+          }
+          resolve(value);
+        };
+        req = store.get(key);
+        req.onerror = function getItemOnError() {
+          reject("Error in asyncStorage.getItem(): ", req.error.name);
+        };
+      }, reject);
+    });
+  }
+
+  function setItem(key, value) {
+    return new Promise((resolve, reject) => {
+      withStore("readwrite", (store) => {
+        store.transaction.oncomplete = resolve;
+        var req = store.put(value, key);
+        req.onerror = function setItemOnError() {
+          reject("Error in asyncStorage.setItem(): ", req.error.name);
+        };
+      }, reject);
+    });
+  }
+
+  function removeItem(key) {
+    return new Promise((resolve, reject) => {
+      withStore("readwrite", (store) => {
+        store.transaction.oncomplete = resolve;
+        var req = store.delete(key);
+        req.onerror = function removeItemOnError() {
+          reject("Error in asyncStorage.removeItem(): ", req.error.name);
+        };
+      }, reject);
+    });
+  }
+
+  function clear() {
+    return new Promise((resolve, reject) => {
+      withStore("readwrite", (store) => {
+        store.transaction.oncomplete = resolve;
+        var req = store.clear();
+        req.onerror = function clearOnError() {
+          reject("Error in asyncStorage.clear(): ", req.error.name);
+        };
+      }, reject);
+    });
+  }
+
+  function length() {
+    return new Promise((resolve, reject) => {
+      var req;
+      withStore("readonly", (store) => {
+        store.transaction.oncomplete = function onComplete() {
+          resolve(req.result);
+        }
+        req = store.count();
+        req.onerror = function lengthOnError() {
+          reject("Error in asyncStorage.length(): ", req.error.name);
+        };
+      }, reject);
+    });
+  }
+
+  function key(n) {
+    return new Promise((resolve, reject) => {
+      if (n < 0) {
+        resolve(null);
+        return;
+      }
+
+      var req;
+      withStore("readonly", (store) => {
+        store.transaction.oncomplete = function onComplete() {
+          var cursor = req.result;
+          resolve(cursor ? cursor.key : null);
+        };
+        var advanced = false;
+        req = store.openCursor();
+        req.onsuccess = function keyOnSuccess() {
+          var cursor = req.result;
+          if (!cursor) {
+            // this means there weren"t enough keys
+            return;
+          }
+          if (n === 0 || advanced) {
+            // Either 1) we have the first key, return it if that's what they
+            // wanted, or 2) we"ve got the nth key.
+            return;
+          }
+
+          // Otherwise, ask the cursor to skip ahead n records
+          advanced = true;
+          cursor.advance(n);
+        };
+        req.onerror = function keyOnError() {
+          reject("Error in asyncStorage.key(): ", req.error.name);
+        };
+      }, reject);
+    });
+  }
+
+  return {
+    getItem: getItem,
+    setItem: setItem,
+    removeItem: removeItem,
+    clear: clear,
+    length: length,
+    key: key
+  };
+}());
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/moz.build thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/moz.build
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/moz.build	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,11 @@
+# -*- 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/.
+
+BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+
+EXTRA_JS_MODULES.devtools.shared += [
+  'async-storage.js'
+]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/tests/browser/browser_async_storage.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/tests/browser/browser_async_storage.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/tests/browser/browser_async_storage.js	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/tests/browser/browser_async_storage.js	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,77 @@
+/* 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";
+
+// Test the basic functionality of async-storage.
+// Adapted from https://github.com/mozilla-b2g/gaia/blob/f09993563fb5fec4393eb71816ce76cb00463190/apps/sharedtest/test/unit/async_storage_test.js.
+
+const asyncStorage = require("devtools/toolkit/shared/async-storage");
+add_task(function*() {
+  is(typeof asyncStorage.length, 'function', "API exists.");
+  is(typeof asyncStorage.key, 'function', "API exists.");
+  is(typeof asyncStorage.getItem, 'function', "API exists.");
+  is(typeof asyncStorage.setItem, 'function', "API exists.");
+  is(typeof asyncStorage.removeItem, 'function', "API exists.");
+  is(typeof asyncStorage.clear, 'function', "API exists.");
+});
+
+add_task(function*() {
+  yield asyncStorage.setItem('foo', 'bar');
+  let value = yield asyncStorage.getItem('foo');
+  is(value, 'bar', 'value is correct');
+  yield asyncStorage.setItem('foo', 'overwritten');
+  value = yield asyncStorage.getItem('foo');
+  is(value, 'overwritten', 'value is correct');
+  yield asyncStorage.removeItem('foo');
+  value = yield asyncStorage.getItem('foo');
+  is(value, null, 'value is correct');
+});
+
+add_task(function*() {
+  var object = {
+    x: 1,
+    y: 'foo',
+    z: true
+  };
+
+  yield asyncStorage.setItem('myobj', object);
+  let value = yield asyncStorage.getItem('myobj');
+  is(object.x, value.x, 'value is correct');
+  is(object.y, value.y, 'value is correct');
+  is(object.z, value.z, 'value is correct');
+  yield asyncStorage.removeItem('myobj');
+  value = yield asyncStorage.getItem('myobj');
+  is(value, null, 'value is correct');
+});
+
+add_task(function*() {
+  yield asyncStorage.clear();
+  let len = yield asyncStorage.length();
+  is(len, 0, 'length is correct');
+  yield asyncStorage.setItem('key1', 'value1');
+  len = yield asyncStorage.length();
+  is(len, 1, 'length is correct');
+  yield asyncStorage.setItem('key2', 'value2');
+  len = yield asyncStorage.length();
+  is(len, 2, 'length is correct');
+  yield asyncStorage.setItem('key3', 'value3');
+  len = yield asyncStorage.length();
+  is(len, 3, 'length is correct');
+
+  let key = yield asyncStorage.key(0);
+  is(key, 'key1', 'key is correct');
+  key = yield asyncStorage.key(1);
+  is(key, 'key2', 'key is correct');
+  key = yield asyncStorage.key(2);
+  is(key, 'key3', 'key is correct');
+  key = yield asyncStorage.key(3);
+  is(key, null, 'key is correct');
+  yield asyncStorage.clear();
+  key = yield asyncStorage.key(0);
+  is(key, null, 'key is correct');
+
+  len = yield asyncStorage.length();
+  is(len, 0, 'length is correct');
+});
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/tests/browser/browser.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/tests/browser/browser.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/shared/tests/browser/browser.ini	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/shared/tests/browser/browser.ini	2015-02-28 15:03:08.000000000 +0000
@@ -0,0 +1,6 @@
+[DEFAULT]
+subsuite = devtools
+support-files =
+  ../../../server/tests/browser/head.js
+
+[browser_async_storage.js]
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/webconsole/client.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/webconsole/client.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/devtools/webconsole/client.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/devtools/webconsole/client.js	2015-02-28 15:03:08.000000000 +0000
@@ -154,7 +154,11 @@
     };
 
     this._client.request(packet, response => {
-      this.pendingEvaluationResults.set(response.resultID, aOnResponse);
+      // Null check this in case the client has been detached while waiting
+      // for a response.
+      if (this.pendingEvaluationResults) {
+        this.pendingEvaluationResults.set(response.resultID, aOnResponse);
+      }
     });
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/global/aboutReader.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/global/aboutReader.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/global/aboutReader.properties	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/global/aboutReader.properties	2015-02-28 15:03:08.000000000 +0000
@@ -11,20 +11,19 @@
 aboutReader.colorScheme.auto=Auto
 
 # LOCALIZATION NOTE (aboutReader.fontType.serif, aboutReader.fontType.sans-serif):
-# These are the styles of typeface that are used on desktop.
+# These are the styles of typeface that are options in the reader view controls.
 aboutReader.fontType.serif=Serif
 aboutReader.fontType.sans-serif=Sans-serif
 
-# LOCALIZATION NOTE (aboutReader.fontType.charis-sil, aboutReader.fontType.clear-sans):
-# These are the names of the fonts that are used on Android
-aboutReader.fontType.charis-sil=Charis SIL Compact
-aboutReader.fontType.clear-sans=Clear Sans
-
 # 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=Close Reader View
+aboutReader.toolbar.typeControls=Type controls
+aboutReader.toolbar.addToReadingList=Add to Reading List
+aboutReader.toolbar.removeFromReadingList=Remove from Reading List
+aboutReader.toolbar.openReadingList=Open Reading List
+aboutReader.toolbar.closeReadingList=Close Reading List
+aboutReader.toolbar.share=Share
 
-aboutReader.toolbarTip=Tap the screen to show reader options
+aboutReader.footer.deleteThisArticle=Delete this article
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.dtd	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/global/aboutSupport.dtd	2015-02-28 15:03:08.000000000 +0000
@@ -97,3 +97,6 @@
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copy raw data to clipboard">
 
 <!ENTITY aboutSupport.sandboxTitle "Sandbox">
+
+<!ENTITY aboutSupport.safeModeTitle "Try Safe Mode">
+<!ENTITY aboutSupport.restartInSafeMode.label "Restart with Add-ons Disabled…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/global/fallbackMenubar.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/global/fallbackMenubar.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/global/fallbackMenubar.properties	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/global/fallbackMenubar.properties	2015-02-28 15:03:08.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/.
+
+# OSX only. Default menu label when there is no xul menubar.
+
+quitMenuitem.label=Quit
+quitMenuitem.key=q
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd	2015-02-28 15:03:08.000000000 +0000
@@ -229,3 +229,5 @@
 <!ENTITY experiment.info.learnmore.accesskey "L">
 <!ENTITY experiment.info.changetelemetry "Telemetry Settings">
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
+
+<!ENTITY setting.learnmore "Learn More…">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd	2015-02-28 15:03:08.000000000 +0000
@@ -39,3 +39,4 @@
 
 <!ENTITY plugin.file                                         "File">
 <!ENTITY plugin.mimeTypes                                    "MIME Types">
+<!ENTITY plugin.flashProtectedMode.label                     "Enable Adobe Flash protected mode">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/locales/jar.mn	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/locales/jar.mn	2015-02-28 15:03:08.000000000 +0000
@@ -38,6 +38,7 @@
   locale/@AB_CD@/global/devtools/styleinspector.properties (%chrome/global/devtools/styleinspector.properties)
   locale/@AB_CD@/global/dialogOverlay.dtd               (%chrome/global/dialogOverlay.dtd)
   locale/@AB_CD@/global/editMenuOverlay.dtd             (%chrome/global/editMenuOverlay.dtd)
+  locale/@AB_CD@/global/fallbackMenubar.properties      (%chrome/global/fallbackMenubar.properties)
   locale/@AB_CD@/global/filefield.properties            (%chrome/global/filefield.properties)
   locale/@AB_CD@/global/filepicker.dtd                  (%chrome/global/filepicker.dtd)
   locale/@AB_CD@/global/filepicker.properties           (%chrome/global/filepicker.properties)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/AddonWatcher.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/AddonWatcher.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/AddonWatcher.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/AddonWatcher.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -29,6 +29,11 @@
       return;
     }
 
+    this._interval = Preferences.get("browser.addon-watch.interval", 15000);
+    if (this._interval == -1) {
+      return;
+    }
+
     this._callback = callback;
     try {
       this._ignoreList = new Set(JSON.parse(Preferences.get("browser.addon-watch.ignore", null)));
@@ -36,9 +41,14 @@
       // probably some malformed JSON, ignore and carry on
       this._ignoreList = new Set();
     }
-    this._interval = Preferences.get("browser.addon-watch.interval", 15000);
     this._timer.initWithCallback(this._checkAddons.bind(this), this._interval, Ci.nsITimer.TYPE_REPEATING_SLACK);
   },
+  uninit: function() {
+    if (this._timer) {
+      this._timer.cancel();
+      this._timer = null;
+    }
+  },
   _checkAddons: function() {
     let compartmentInfo = Cc["@mozilla.org/compartment-info;1"]
       .getService(Ci.nsICompartmentInfo);
@@ -58,7 +68,10 @@
     let limit = this._interval * Preferences.get("browser.addon-watch.percentage-limit", 75) * 10;
     for (let addonId in addons) {
       if (!this._ignoreList.has(addonId)) {
-        if (this._lastAddonTime[addonId] && (addons[addonId] - this._lastAddonTime[addonId]) > limit) {
+        if (!this._lastAddonTime[addonId]) {
+          this._lastAddonTime[addonId] = 0;
+        }
+        if ((addons[addonId] - this._lastAddonTime[addonId]) > limit) {
           this._callback(addonId);
         }
         this._lastAddonTime[addonId] = addons[addonId];
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/BrowserUtils.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/BrowserUtils.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/BrowserUtils.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/BrowserUtils.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -217,8 +217,11 @@
    * @return a boolean indicating if linkNode has a rel="noreferrer" attribute.
    */
   linkHasNoReferrer: function (linkNode) {
+    // A null linkNode typically means that we're checking a link that wasn't
+    // provided via an <a> link, like a text-selected URL.  Don't leak
+    // referrer information in this case.
     if (!linkNode)
-      return false;
+      return true;
 
     let rel = linkNode.getAttribute("rel");
     if (!rel)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/RemoteFinder.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/RemoteFinder.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/RemoteFinder.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/RemoteFinder.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -17,18 +17,34 @@
 );
 
 function RemoteFinder(browser) {
-  this._browser = browser;
   this._listeners = new Set();
   this._searchString = null;
 
-  let mm = this._browser.messageManager;
-  mm.addMessageListener("Finder:Result", this);
-  mm.addMessageListener("Finder:MatchesResult", this);
-  mm.addMessageListener("Finder:CurrentSelectionResult",this);
-  mm.sendAsyncMessage("Finder:Initialize");
+  this.swapBrowser(browser);
 }
 
 RemoteFinder.prototype = {
+  swapBrowser: function(aBrowser) {
+    if (this._messageManager) {
+      this._messageManager.removeMessageListener("Finder:Result", this);
+      this._messageManager.removeMessageListener("Finder:MatchesResult", this);
+      this._messageManager.removeMessageListener("Finder:CurrentSelectionResult",this);
+    }
+    else {
+      aBrowser.messageManager.sendAsyncMessage("Finder:Initialize");
+    }
+
+    this._browser = aBrowser;
+    this._messageManager = this._browser.messageManager;
+    this._messageManager.addMessageListener("Finder:Result", this);
+    this._messageManager.addMessageListener("Finder:MatchesResult", this);
+    this._messageManager.addMessageListener("Finder:CurrentSelectionResult", this);
+
+    // Ideally listeners would have removed themselves but that doesn't happen
+    // right now
+    this._listeners.clear();
+  },
+
   addResultListener: function (aListener) {
     this._listeners.add(aListener);
   },
@@ -58,7 +74,13 @@
     }
 
     for (let l of this._listeners) {
-      l[callback].apply(l, params);
+      // Don't let one callback throwing stop us calling the rest
+      try {
+        l[callback].apply(l, params);
+      }
+      catch (e) {
+        Cu.reportError(e);
+      }
     }
   },
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/RemoteWebNavigation.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/RemoteWebNavigation.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/RemoteWebNavigation.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/RemoteWebNavigation.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -18,13 +18,22 @@
 
 function RemoteWebNavigation(browser)
 {
-  this._browser = browser;
-  this._browser.messageManager.addMessageListener("WebNavigation:setHistory", this);
+  this.swapBrowser(browser);
 }
 
 RemoteWebNavigation.prototype = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebNavigation, Ci.nsISupports]),
 
+  swapBrowser: function(aBrowser) {
+    if (this._messageManager) {
+      this._messageManager.removeMessageListener("WebNavigation:setHistory", this);
+    }
+
+    this._browser = aBrowser;
+    this._messageManager = aBrowser.messageManager;
+    this._messageManager.addMessageListener("WebNavigation:setHistory", this);
+  },
+
   LOAD_FLAGS_MASK: 65535,
   LOAD_FLAGS_NONE: 0,
   LOAD_FLAGS_IS_REFRESH: 16,
@@ -61,7 +70,6 @@
     if (aPostData || aHeaders)
       throw Components.Exception("RemoteWebNavigation doesn't accept postdata or headers.", Cr.NS_ERROR_INVALID_ARGS);
 
-    this._browser._contentTitle = "";
     this._sendMessage("WebNavigation:LoadURI", {
       uri: aURI,
       flags: aLoadFlags,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/RemoteWebProgress.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/RemoteWebProgress.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/RemoteWebProgress.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/RemoteWebProgress.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -35,6 +35,7 @@
 
   this._isLoadingDocument = false;
   this._DOMWindow = null;
+  this._DOMWindowID = 0;
   this._isTopLevel = aIsTopLevel;
   this._loadType = 0;
 }
@@ -54,7 +55,7 @@
 
   get isLoadingDocument() { return this._isLoadingDocument },
   get DOMWindow() { return this._DOMWindow; },
-  get DOMWindowID() { return 0; },
+  get DOMWindowID() { return this._DOMWindowID; },
   get isTopLevel() { return this._isTopLevel },
   get loadType() { return this._loadType; },
 
@@ -68,18 +69,31 @@
 };
 
 function RemoteWebProgressManager (aBrowser) {
-  this._browser = aBrowser;
   this._topLevelWebProgress = new RemoteWebProgress(this, true);
   this._progressListeners = [];
 
-  this._browser.messageManager.addMessageListener("Content:StateChange", this);
-  this._browser.messageManager.addMessageListener("Content:LocationChange", this);
-  this._browser.messageManager.addMessageListener("Content:SecurityChange", this);
-  this._browser.messageManager.addMessageListener("Content:StatusChange", this);
-  this._browser.messageManager.addMessageListener("Content:ProgressChange", this);
+  this.swapBrowser(aBrowser);
 }
 
 RemoteWebProgressManager.prototype = {
+  swapBrowser: function(aBrowser) {
+    if (this._messageManager) {
+      this._messageManager.removeMessageListener("Content:StateChange", this);
+      this._messageManager.removeMessageListener("Content:LocationChange", this);
+      this._messageManager.removeMessageListener("Content:SecurityChange", this);
+      this._messageManager.removeMessageListener("Content:StatusChange", this);
+      this._messageManager.removeMessageListener("Content:ProgressChange", this);
+    }
+
+    this._browser = aBrowser;
+    this._messageManager = aBrowser.messageManager;
+    this._messageManager.addMessageListener("Content:StateChange", this);
+    this._messageManager.addMessageListener("Content:LocationChange", this);
+    this._messageManager.addMessageListener("Content:SecurityChange", this);
+    this._messageManager.addMessageListener("Content:StatusChange", this);
+    this._messageManager.addMessageListener("Content:ProgressChange", this);
+  },
+
   get topLevelWebProgress() {
     return this._topLevelWebProgress;
   },
@@ -147,6 +161,7 @@
       // Update the actual WebProgress fields.
       webProgress._isLoadingDocument = json.webProgress.isLoadingDocument;
       webProgress._DOMWindow = objects.DOMWindow;
+      webProgress._DOMWindowID = json.webProgress.DOMWindowID;
       webProgress._loadType = json.webProgress.loadType;
     }
 
@@ -179,6 +194,7 @@
         this._browser.webNavigation._currentURI = location;
         this._browser._characterSet = json.charset;
         this._browser._documentURI = newURI(json.documentURI);
+        this._browser._contentTitle = "";
         this._browser._imageDocument = null;
         this._browser._mayEnableCharacterEncodingMenu = json.mayEnableCharacterEncodingMenu;
         this._browser._contentPrincipal = json.principal;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/tests/xpcshell/test_TelemetryTimestamps.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/tests/xpcshell/test_TelemetryTimestamps.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/tests/xpcshell/test_TelemetryTimestamps.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/tests/xpcshell/test_TelemetryTimestamps.js	2015-02-28 15:03:08.000000000 +0000
@@ -5,7 +5,14 @@
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/TelemetryPing.jsm", this);
 Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
+Cu.import('resource://gre/modules/XPCOMUtils.jsm');
+
+XPCOMUtils.defineLazyGetter(this, "gDatareportingService",
+  () => Cc["@mozilla.org/datareporting/service;1"]
+          .getService(Ci.nsISupports)
+          .wrappedJSObject);
 
 // The @mozilla/xre/app-info;1 XPCOM object provided by the xpcshell test harness doesn't
 // implement the nsIAppInfo interface, which is needed by Services.jsm and
@@ -13,11 +20,36 @@
 Cu.import("resource://testing-common/AppInfo.jsm");
 updateAppInfo();
 
+let gGlobalScope = this;
+function loadAddonManager() {
+  let ns = {};
+  Cu.import("resource://gre/modules/Services.jsm", ns);
+  let head = "../../../mozapps/extensions/test/xpcshell/head_addons.js";
+  let file = do_get_file(head);
+  let uri = ns.Services.io.newFileURI(file);
+  ns.Services.scriptloader.loadSubScript(uri.spec, gGlobalScope);
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+  startupManager();
+}
+
 function getSimpleMeasurementsFromTelemetryPing() {
   return TelemetrySession.getPayload().simpleMeasurements;
 }
 
+function initialiseTelemetry() {
+  // Send the needed startup notifications to the datareporting service
+  // to ensure that it has been initialized.
+  if ("@mozilla.org/datareporting/service;1" in Cc) {
+    gDatareportingService.observe(null, "app-startup", null);
+    gDatareportingService.observe(null, "profile-after-change", null);
+  }
+
+  return TelemetryPing.setup().then(TelemetrySession.setup);
+}
+
 function run_test() {
+  // Telemetry needs the AddonManager.
+  loadAddonManager();
   // Make profile available for |TelemetrySession.shutdown()|.
   do_get_profile();
 
@@ -27,7 +59,7 @@
 }
 
 add_task(function* actualTest() {
-  yield TelemetrySession.setup();
+  yield initialiseTelemetry();
 
   // Test the module logic
   let tmp = {};
@@ -65,7 +97,7 @@
   do_check_true(simpleMeasurements.bar > 1); // bar was included
   do_check_eq(undefined, simpleMeasurements.baz); // baz wasn't included since it wasn't added
 
-  yield TelemetrySession.shutdown();
+  yield TelemetrySession.shutdown(false);
 
   do_test_finished();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/Troubleshoot.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/Troubleshoot.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/modules/Troubleshoot.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/modules/Troubleshoot.jsm	2015-02-28 15:03:08.000000000 +0000
@@ -28,6 +28,7 @@
 // under the "accessibility.*" branch.
 const PREFS_WHITELIST = [
   "accessibility.",
+  "apz.",
   "browser.cache.",
   "browser.display.",
   "browser.download.folderList",
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/content/extensions.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/content/extensions.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/content/extensions.css	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/content/extensions.css	2015-02-28 15:03:09.000000000 +0000
@@ -74,6 +74,10 @@
   -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-localized-bool");
 }
 
+setting[type="bool"]:not([learnmore]) .preferences-learnmore {
+  visibility: collapse;
+}
+
 setting[type="boolint"] {
   display: -moz-grid-line;
   -moz-binding: url("chrome://mozapps/content/extensions/setting.xml#setting-boolint");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/content/pluginPrefs.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/content/pluginPrefs.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/content/pluginPrefs.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/content/pluginPrefs.xul	2015-02-28 15:03:09.000000000 +0000
@@ -13,4 +13,8 @@
   <setting type="control" title="&plugin.mimeTypes;">
     <label class="text-list" id="pluginMimeTypes"/>
   </setting>
+  <setting type="bool" pref="dom.ipc.plugins.flash.disable-protected-mode"
+           inverted="true" title="&plugin.flashProtectedMode.label;"
+           id="pluginEnableProtectedMode"
+           learnmore="https://support.mozilla.org/kb/flash-protected-mode-settings" />
 </vbox>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/content/setting.xml thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/content/setting.xml
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/content/setting.xml	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/content/setting.xml	2015-02-28 15:03:09.000000000 +0000
@@ -144,6 +144,8 @@
           <xul:label class="preferences-title" flex="1" xbl:inherits="xbl:text=title"/>
         </xul:hbox>
         <xul:description class="preferences-description" flex="1" xbl:inherits="xbl:text=desc"/>
+        <xul:label class="preferences-learnmore text-link"
+                   onclick="document.getBindingParent(this).openLearnMore()">&setting.learnmore;</xul:label>
       </xul:vbox>
       <xul:hbox class="preferences-alignment">
         <xul:checkbox anonid="input" xbl:inherits="disabled,onlabel,offlabel,label=checkboxlabel" oncommand="inputChanged();"/>
@@ -171,6 +173,14 @@
 
       <property name="value" onget="return this.input.checked;" onset="return this.input.setChecked(val);"/>
       <property name="inverted" readonly="true" onget="return this.getAttribute('inverted');"/>
+
+      <method name="openLearnMore">
+        <body>
+        <![CDATA[
+          window.open(this.getAttribute("learnmore"), "_blank");
+        ]]>
+        </body>
+      </method>
     </implementation>
   </binding>
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2015-02-28 15:03:09.000000000 +0000
@@ -26,7 +26,7 @@
 
 const SEC_IN_A_DAY           = 24 * 60 * 60;
 
-const NS_GRE_BIN_DIR         = "GreD";
+const NS_GRE_DIR             = "GreD";
 const CLEARKEY_PLUGIN_ID     = "gmp-clearkey";
 const CLEARKEY_VERSION       = "0.1";
 
@@ -45,15 +45,17 @@
 const KEY_PLUGIN_AUTOUPDATE  = "media.{0}.autoupdate";
 const KEY_PLUGIN_HIDDEN      = "media.{0}.hidden";
 
-// Note regarding the value of |fullDescription| below: This is part of an awful
-// hack to include the licenses for GMP plugins without having bug 624602 fixed
-// yet, and intentionally ignores localisation.
+const GMP_LICENSE_INFO       = "gmp_license_info";
+
 const GMP_PLUGINS = [
   {
     id:              "gmp-gmpopenh264",
     name:            "openH264_name",
     description:     "openH264_description",
-    fullDescription: "<xhtml:a href=\"chrome://mozapps/content/extensions/OpenH264-license.txt\" target=\"_blank\">License information</xhtml:a>.",
+    // The following licenseURL is part of an awful hack to include the OpenH264
+    // license without having bug 624602 fixed yet, and intentionally ignores
+    // localisation.
+    licenseURL:      "chrome://mozapps/content/extensions/OpenH264-license.txt",
     homepageURL:     "http://www.openh264.org/",
     optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul"
   },
@@ -61,7 +63,7 @@
     id:              "gmp-eme-adobe",
     name:            "eme-adobe_name",
     description:     "eme-adobe_description",
-    fullDescription: "<xhtml:a href=\"\" target=\"_blank\">License information</xhtml:a>.",
+    licenseURL:      null,
     homepageURL:     "https://www.adobe.com/",
     optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul",
     isEME:           true
@@ -467,9 +469,9 @@
 
     if (Preferences.get(KEY_EME_ENABLED, false)) {
       try {
-        let greBinDir = Services.dirsvc.get(NS_GRE_BIN_DIR,
-                                            Ci.nsILocalFile);
-        let clearkeyPath = OS.Path.join(greBinDir.path,
+        let greDir = Services.dirsvc.get(NS_GRE_DIR,
+                                         Ci.nsILocalFile);
+        let clearkeyPath = OS.Path.join(greDir.path,
                                         CLEARKEY_PLUGIN_ID,
                                         CLEARKEY_VERSION);
         this._log.info("startup - adding clearkey CDM directory " +
@@ -538,7 +540,14 @@
     return GMPPrefs.get(KEY_PROVIDER_ENABLED, false);
   },
 
+  generateFullDescription: function(aLicenseURL, aLicenseInfo) {
+    return "<xhtml:a href=\"" + aLicenseURL + "\" target=\"_blank\">" +
+           aLicenseInfo + "</xhtml:a>."
+  },
+
   buildPluginList: function() {
+    let licenseInfo = pluginsBundle.GetStringFromName(GMP_LICENSE_INFO);
+
     let map = new Map();
     GMP_PLUGINS.forEach(aPlugin => {
       // Only show GMPs in addon manager that aren't hidden.
@@ -547,16 +556,19 @@
           id: aPlugin.id,
           name: pluginsBundle.GetStringFromName(aPlugin.name),
           description: pluginsBundle.GetStringFromName(aPlugin.description),
-          fullDescription: aPlugin.fullDescription,
           homepageURL: aPlugin.homepageURL,
           optionsURL: aPlugin.optionsURL,
           wrapper: null,
           isEME: aPlugin.isEME
         };
+        if (aPlugin.licenseURL) {
+          plugin.fullDescription =
+            this.generateFullDescription(aPlugin.licenseURL, licenseInfo);
+        }
         plugin.wrapper = new GMPWrapper(plugin);
         map.set(plugin.id, plugin);
       }
-    });
+    }, this);
     this._plugins = map;
   },
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/internal/PluginProvider.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/internal/PluginProvider.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/internal/PluginProvider.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/internal/PluginProvider.jsm	2015-02-28 15:03:09.000000000 +0000
@@ -16,6 +16,7 @@
 const URI_EXTENSION_STRINGS  = "chrome://mozapps/locale/extensions/extensions.properties";
 const STRING_TYPE_NAME       = "type.%ID%.name";
 const LIST_UPDATED_TOPIC     = "plugins-list-updated";
+const FLASH_MIME_TYPE        = "application/x-shockwave-flash";
 
 Cu.import("resource://gre/modules/Log.jsm");
 const LOGGER_ID = "addons.plugins";
@@ -85,6 +86,9 @@
           types.push(type.type + (extras ? " (" + extras + ")" : ""));
         }
         typeLabel.textContent = types.join(",\n");
+        let showProtectedModePref = canDisableFlashProtectedMode(plugin);
+        aSubject.getElementById("pluginEnableProtectedMode")
+          .setAttribute("collapsed", showProtectedModePref ? "" : "true");
       });
       break;
     case LIST_UPDATED_TOPIC:
@@ -276,6 +280,19 @@
   }
 };
 
+function isFlashPlugin(aPlugin) {
+  for (let type of aPlugin.pluginMimeTypes) {
+    if (type.type == FLASH_MIME_TYPE) {
+      return true;
+    }
+  }
+  return false;
+}
+// Protected mode is win32-only, not win64
+function canDisableFlashProtectedMode(aPlugin) {
+  return isFlashPlugin(aPlugin) && Services.appinfo.XPCOMABI == "x86-msvc";
+}
+
 /**
  * The PluginWrapper wraps a set of nsIPluginTags to provide the data visible to
  * public callers through the API.
@@ -488,10 +505,16 @@
     }
     return permissions;
   });
+
+  this.__defineGetter__("optionsType", function() {
+    if (canDisableFlashProtectedMode(this)) {
+      return AddonManager.OPTIONS_TYPE_INLINE;
+    }
+    return AddonManager.OPTIONS_TYPE_INLINE_INFO;
+  });
 }
 
 PluginWrapper.prototype = {
-  optionsType: AddonManager.OPTIONS_TYPE_INLINE_INFO,
   optionsURL: "chrome://mozapps/content/extensions/pluginPrefs.xul",
 
   get updateDate() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/nsBlocklistService.js	2015-02-28 15:03:09.000000000 +0000
@@ -83,9 +83,20 @@
          QueryInterface(Ci.nsIPrefBranch);
 });
 
+// From appinfo in Services.jsm. It is not possible to use the one in
+// Services.jsm since it will not successfully QueryInterface nsIXULAppInfo in
+// xpcshell tests due to other code calling Services.appinfo before the
+// nsIXULAppInfo is created by the tests.
 XPCOMUtils.defineLazyGetter(this, "gApp", function bls_gApp() {
-  return Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).
-         QueryInterface(Ci.nsIXULRuntime);
+  let appinfo = Cc["@mozilla.org/xre/app-info;1"]
+                  .getService(Ci.nsIXULRuntime);
+  try {
+    appinfo.QueryInterface(Ci.nsIXULAppInfo);
+  } catch (ex if ex instanceof Components.Exception &&
+                 ex.result == Cr.NS_NOINTERFACE) {
+    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
+  }
+  return appinfo;
 });
 
 XPCOMUtils.defineLazyGetter(this, "gABI", function bls_gABI() {
@@ -396,6 +407,10 @@
     if (!gBlocklistEnabled)
       return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
 
+    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
+    if (!appVersion && !gApp.version)
+      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
+
     if (!appVersion)
       appVersion = gApp.version;
     if (!toolkitVersion)
@@ -529,9 +544,13 @@
       pingCountTotal = 1;
 
     dsURI = dsURI.replace(/%APP_ID%/g, gApp.ID);
-    dsURI = dsURI.replace(/%APP_VERSION%/g, gApp.version);
+    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
+    if (gApp.version)
+      dsURI = dsURI.replace(/%APP_VERSION%/g, gApp.version);
     dsURI = dsURI.replace(/%PRODUCT%/g, gApp.name);
-    dsURI = dsURI.replace(/%VERSION%/g, gApp.version);
+    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
+    if (gApp.version)
+      dsURI = dsURI.replace(/%VERSION%/g, gApp.version);
     dsURI = dsURI.replace(/%BUILD_ID%/g, gApp.appBuildID);
     dsURI = dsURI.replace(/%BUILD_TARGET%/g, gApp.OS + "_" + gABI);
     dsURI = dsURI.replace(/%OS_VERSION%/g, gOSVersion);
@@ -1048,6 +1067,10 @@
     if (!gBlocklistEnabled)
       return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
 
+    // Not all applications implement nsIXULAppInfo (e.g. xpcshell doesn't).
+    if (!appVersion && !gApp.version)
+      return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
+
     if (!appVersion)
       appVersion = gApp.version;
     if (!toolkitVersion)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/AddonManagerTesting.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/AddonManagerTesting.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/AddonManagerTesting.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/AddonManagerTesting.jsm	2015-02-28 15:03:09.000000000 +0000
@@ -21,6 +21,16 @@
 
 this.AddonTestUtils = {
   /**
+   * Get the add-on that is specified by its ID.
+   *
+   * @return {Promise<Object>} A promise that resolves returning the found addon or null
+   *         if it is not found.
+   */
+  getAddonById: function (id) {
+    return new Promise(resolve => AddonManager.getAddonByID(id, addon => resolve(addon)));
+  },
+
+  /**
    * Uninstall an add-on that is specified by its ID.
    *
    * The returned promise resolves on successful uninstall and rejects
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug557956.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug557956.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug557956.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/browser/browser_bug557956.js	2015-02-28 15:03:09.000000000 +0000
@@ -514,5 +514,5 @@
 });
 
 add_test(function test_shutdown() {
-  TelemetrySession.shutdown().then(run_next_test);
+  TelemetrySession.shutdown(false).then(run_next_test);
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js	2015-02-28 15:03:09.000000000 +0000
@@ -117,6 +117,7 @@
 
   // Start out with plugins not being installed, disabled and automatic updates
   // disabled.
+  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
   for (let addon of gMockAddons) {
     gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), false);
     gPrefs.setIntPref(getKey(GMPScope.KEY_PLUGIN_LAST_UPDATE, addon.id), 0);
@@ -257,7 +258,7 @@
     let neverActivate = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "never-activate-menuitem");
     is(menu.selectedItem, neverActivate, "Plugin state should be never-activate.");
   }
-  gPrefs.clearUserPref(GMPScope.KEY_EME_ENABLED);
+  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
 });
 
 add_task(function* testInstalledGlobalEmeDisabledDetails() {
@@ -289,7 +290,7 @@
     is_element_hidden(menuSep, "Menu separator is hidden.");
     contextMenu.hidePopup();
   }
-  gPrefs.clearUserPref(GMPScope.KEY_EME_ENABLED);
+  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
 });
 
 add_task(function* testPreferencesButton() {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/browser/cancelCompatCheck.sjs	2015-02-28 15:03:09.000000000 +0000
@@ -30,14 +30,13 @@
           createInstance(Components.interfaces.nsITimer);
   timer.init(function sendFile() {
     dump("cancelCompatCheck: starting to send file\n");
-    let (str = {}) {
-      let read = 0;
-      do {
-        // read as much as we can and put it in str.value
-        read = cstream.readString(0xffffffff, str);
-        resp.write(str.value);
-      } while (read != 0);
-    }
+    let str = {};
+    let read = 0;
+    do {
+      // read as much as we can and put it in str.value
+      read = cstream.readString(0xffffffff, str);
+      resp.write(str.value);
+    } while (read != 0);
     cstream.close();
     resp.finish();
   }, delay, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/xpcshell/head_addons.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/xpcshell/head_addons.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/xpcshell/head_addons.js	2015-02-28 15:03:09.000000000 +0000
@@ -28,8 +28,6 @@
 Components.utils.import("resource://gre/modules/osfile.jsm");
 Components.utils.import("resource://gre/modules/AsyncShutdown.jsm");
 
-Services.prefs.setBoolPref("toolkit.osfile.log", true);
-
 // We need some internal bits of AddonManager
 let AMscope = Components.utils.import("resource://gre/modules/AddonManager.jsm");
 let AddonManager = AMscope.AddonManager;
@@ -1575,14 +1573,13 @@
     fstream.init(file, -1, 0, 0);
     cstream.init(fstream, "UTF-8", 0, 0);
 
-    let (str = {}) {
-      let read = 0;
-      do {
-        // read as much as we can and put it in str.value
-        read = cstream.readString(0xffffffff, str);
-        data += str.value;
-      } while (read != 0);
-    }
+    let str = {};
+    let read = 0;
+    do {
+      // read as much as we can and put it in str.value
+      read = cstream.readString(0xffffffff, str);
+      data += str.value;
+    } while (read != 0);
     data = data.replace(/%PORT%/g, gPort);
 
     response.write(data);
@@ -1654,13 +1651,12 @@
           createInstance(Components.interfaces.nsIConverterInputStream);
   fstream.init(aFile, -1, 0, 0);
   cstream.init(fstream, "UTF-8", 0, 0);
-  let (str = {}) {
-    let read = 0;
-    do {
-      read = cstream.readString(0xffffffff, str); // read as much as we can and put it in str.value
-      data += str.value;
-    } while (read != 0);
-  }
+  let str = {};
+  let read = 0;
+  do {
+    read = cstream.readString(0xffffffff, str); // read as much as we can and put it in str.value
+    data += str.value;
+  } while (read != 0);
   cstream.close();
   return data;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js	2015-02-28 15:03:09.000000000 +0000
@@ -49,6 +49,7 @@
 
   gPrefs.setBoolPref(GMPScope.KEY_LOGGING_DUMP, true);
   gPrefs.setIntPref(GMPScope.KEY_LOGGING_LEVEL, 0);
+  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
   for (let addon of gMockAddons.values()) {
     gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_HIDDEN, addon.id), false);
   }
@@ -190,7 +191,7 @@
     Assert.equal(addon.permissions, AddonManager.PERM_CAN_UPGRADE |
                                     AddonManager.PERM_CAN_ENABLE);
   }
-  gPrefs.clearUserPref(GMPScope.KEY_EME_ENABLED);
+  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
   GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
 });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/make-eme.mk thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/make-eme.mk
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/make-eme.mk	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/make-eme.mk	2015-02-28 15:03:09.000000000 +0000
@@ -6,8 +6,11 @@
 
 ifdef MOZ_SIGN_CMD
   ifeq ($(OS_ARCH),WINNT)
-    # Note: CWD is DIST
-    MAKE_SIGN_EME_VOUCHER := $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(STAGEPATH)$(MOZ_PKG_DIR)/plugin-container.exe -output $(STAGEPATH)$(MOZ_PKG_DIR)/voucher.bin && \
-      $(MOZ_SIGN_CMD) -f emevoucher "$(STAGEPATH)$(MOZ_PKG_DIR)/voucher.bin"
+    ifneq ($(TARGET_CPU),x86_64)
+      # The argument to this macro is the directory where plugin-container.exe
+      # exists, and where voucher.bin will be generated.
+      MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/plugin-container.exe -output $(1)/voucher.bin && \
+        $(MOZ_SIGN_CMD) -f emevoucher "$(1)/voucher.bin"
+    endif
   endif
 endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/package-name.mk thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/package-name.mk
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/package-name.mk	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/package-name.mk	2015-02-28 15:03:09.000000000 +0000
@@ -148,7 +148,7 @@
 # bug: 746277 - preserve existing functionality.
 # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists
 ###########################################################################
-ifdef MOZILLA_OFFICIAL
+ifdef MOZ_INCLUDE_SOURCE_INFO
 MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
 endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/packager.mk thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/packager.mk
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/packager.mk	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/packager.mk	2015-02-28 15:03:09.000000000 +0000
@@ -22,11 +22,12 @@
 	@echo 'Staging installer files...'
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/core
 	@cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core
-	@(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD))
 ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
 # The && true is necessary to make sure Pymake spins a shell
 	$(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage && true
 endif
+	$(call MAKE_SIGN_EME_VOUCHER,$(DEPTH)/installer-stage/core)
+	@(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD))
 
 # Override the value of OMNIJAR_NAME from config.status with the value
 # set earlier in this file.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/packager.py thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/packager.py
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/packager.py	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/packager.py	2015-02-28 15:03:09.000000000 +0000
@@ -27,7 +27,6 @@
 import mozpack.path
 import buildconfig
 from argparse import ArgumentParser
-from createprecomplete import generate_precomplete
 import os
 from StringIO import StringIO
 import subprocess
@@ -394,8 +393,6 @@
                                  args.source, gre_path, base)
 
     copier.copy(args.destination)
-    generate_precomplete(os.path.normpath(os.path.join(args.destination,
-                                                       respath)))
 
 
 if __name__ == '__main__':
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/upload-files.mk thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/upload-files.mk
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/installer/upload-files.mk	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/installer/upload-files.mk	2015-02-28 15:03:09.000000000 +0000
@@ -37,6 +37,8 @@
 ifndef _BINPATH
 _BINPATH = /$(_APPNAME)/Contents/MacOS
 endif # _BINPATH
+# Resource path for the precomplete file
+_RESPATH = /$(_APPNAME)/Contents/Resources
 ifdef UNIVERSAL_BINARY
 STAGEPATH = universal/
 endif
@@ -360,6 +362,31 @@
 INNER_MAKE_GECKOVIEW_EXAMPLE=echo 'GeckoView example packaging is only enabled on Nightly'
 endif
 
+# Create geckolibs Android ARchive and metadata for download by local
+# developers using Gradle.
+ifdef MOZ_ANDROID_GECKOLIBS_AAR
+geckolibs-revision := $(BUILDID)
+
+UPLOAD_EXTRA_FILES += \
+  geckolibs-$(geckolibs-revision).aar \
+  geckolibs-$(geckolibs-revision).aar.sha1 \
+  geckolibs-$(geckolibs-revision).pom \
+  geckolibs-$(geckolibs-revision).pom.sha1 \
+  ivy-geckolibs-$(geckolibs-revision).xml \
+  ivy-geckolibs-$(geckolibs-revision).xml.sha1 \
+  $(NULL)
+
+INNER_MAKE_GECKOLIBS_AAR= \
+  $(PYTHON) -m mozbuild.action.package_geckolibs_aar \
+    --verbose \
+    --revision $(geckolibs-revision) \
+    --topsrcdir '$(topsrcdir)' \
+    --distdir '$(_ABS_DIST)' \
+    '$(_ABS_DIST)'
+else
+INNER_MAKE_GECKOLIBS_AAR=echo 'Android geckolibs.aar packaging is disabled'
+endif
+
 ifdef MOZ_OMX_PLUGIN
 DIST_FILES += libomxplugin.so libomxplugingb.so libomxplugingb235.so \
               libomxpluginhc.so libomxpluginkk.so
@@ -436,6 +463,7 @@
   $(RELEASE_JARSIGNER) $(_ABS_DIST)/gecko.apk && \
   $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE) && \
   $(INNER_ROBOCOP_PACKAGE) && \
+  $(INNER_MAKE_GECKOLIBS_AAR) && \
   $(INNER_MAKE_GECKOVIEW_LIBRARY) && \
   $(INNER_MAKE_GECKOVIEW_EXAMPLE)
 
@@ -524,15 +552,17 @@
 ifeq (Darwin, $(OS_ARCH))
 MAKE_PACKAGE    = cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) \
                   && cd $(PACKAGE_BASE_DIR) \
+                  && (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \
                   && $(INNER_MAKE_PACKAGE)
 else
 MAKE_PACKAGE    = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \
-                  && $(or $(MAKE_SIGN_EME_VOUCHER),true) \
+                  && $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \
+                  && (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \
                   && $(INNER_MAKE_PACKAGE)
 endif #Darwin
 
 else
-MAKE_PACKAGE    = $(INNER_MAKE_PACKAGE)
+MAKE_PACKAGE    = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE)
 endif
 
 ifdef MOZ_SIGN_PACKAGE_CMD
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/content/updates.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/content/updates.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/content/updates.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/content/updates.js	2015-02-28 15:03:09.000000000 +0000
@@ -3,6 +3,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/. */
 
+'use strict';
+
 Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
@@ -344,7 +346,7 @@
   onLoad: function() {
     this.wiz = document.documentElement;
 
-    gLogEnabled = getPref("getBoolPref", PREF_APP_UPDATE_LOG, false)
+    gLogEnabled = getPref("getBoolPref", PREF_APP_UPDATE_LOG, false);
 
     this.strings = document.getElementById("updateStrings");
     var brandStrings = document.getElementById("brandStrings");
@@ -427,13 +429,8 @@
 
         var p = this.update.selectedPatch;
         if (p) {
-          var state = p.state;
-          var patchFailed;
-          try {
-            patchFailed = this.update.getProperty("patchingFailed");
-          }
-          catch (e) {
-          }
+          let state = p.state;
+          let patchFailed = this.update.getProperty("patchingFailed");
           if (patchFailed) {
             if (patchFailed == "partial" && this.update.patchCount == 2) {
               // If the system failed to apply the partial patch, show the
@@ -453,24 +450,24 @@
           // Now select the best page to start with, given the current state of
           // the Update.
           switch (state) {
-          case STATE_PENDING:
-          case STATE_PENDING_SVC:
-          case STATE_APPLIED:
-          case STATE_APPLIED_SVC:
-            this.sourceEvent = SRCEVT_BACKGROUND;
-            aCallback("finishedBackground");
-            return;
-          case STATE_DOWNLOADING:
-            aCallback("downloading");
-            return;
-          case STATE_FAILED:
-            window.getAttention();
-            aCallback("errorpatching");
-            return;
-          case STATE_DOWNLOAD_FAILED:
-          case STATE_APPLYING:
-            aCallback("errors");
-            return;
+            case STATE_PENDING:
+            case STATE_PENDING_SVC:
+            case STATE_APPLIED:
+            case STATE_APPLIED_SVC:
+              this.sourceEvent = SRCEVT_BACKGROUND;
+              aCallback("finishedBackground");
+              return;
+            case STATE_DOWNLOADING:
+              aCallback("downloading");
+              return;
+            case STATE_FAILED:
+              window.getAttention();
+              aCallback("errorpatching");
+              return;
+            case STATE_DOWNLOAD_FAILED:
+            case STATE_APPLYING:
+              aCallback("errors");
+              return;
           }
         }
         if (this.update.licenseURL)
@@ -1615,48 +1612,48 @@
 
     var u = gUpdates.update;
     switch (status) {
-    case CoR.NS_ERROR_CORRUPTED_CONTENT:
-    case CoR.NS_ERROR_UNEXPECTED:
-      if (u.selectedPatch.state == STATE_DOWNLOAD_FAILED &&
-          (u.isCompleteUpdate || u.patchCount != 2)) {
-        // Verification error of complete patch, informational text is held in
-        // the update object.
+      case CoR.NS_ERROR_CORRUPTED_CONTENT:
+      case CoR.NS_ERROR_UNEXPECTED:
+        if (u.selectedPatch.state == STATE_DOWNLOAD_FAILED &&
+            (u.isCompleteUpdate || u.patchCount != 2)) {
+          // Verification error of complete patch, informational text is held in
+          // the update object.
+          this.cleanUp();
+          gUpdates.wiz.goTo("errors");
+          break;
+        }
+        // Verification failed for a partial patch, complete patch is now
+        // downloading so return early and do NOT remove the download listener!
+
+        // Reset the progress meter to "undertermined" mode so that we don't
+        // show old progress for the new download of the "complete" patch.
+        this._downloadProgress.mode = "undetermined";
+        this._pauseButton.disabled = true;
+        document.getElementById("verificationFailed").hidden = false;
+        break;
+      case CoR.NS_BINDING_ABORTED:
+        LOG("gDownloadingPage", "onStopRequest - pausing download");
+        // Do not remove UI listener since the user may resume downloading again.
+        break;
+      case CoR.NS_OK:
+        LOG("gDownloadingPage", "onStopRequest - patch verification succeeded");
+        // If the background update pref is set, we should wait until the update
+        // is actually staged in the background.
+        let aus = CoC["@mozilla.org/updates/update-service;1"].
+                  getService(CoI.nsIApplicationUpdateService);
+        if (aus.canStageUpdates) {
+          this._setUpdateApplying();
+        } else {
+          this.cleanUp();
+          gUpdates.wiz.goTo("finished");
+        }
+        break;
+      default:
+        LOG("gDownloadingPage", "onStopRequest - transfer failed");
+        // Some kind of transfer error, die.
         this.cleanUp();
         gUpdates.wiz.goTo("errors");
         break;
-      }
-      // Verification failed for a partial patch, complete patch is now
-      // downloading so return early and do NOT remove the download listener!
-
-      // Reset the progress meter to "undertermined" mode so that we don't
-      // show old progress for the new download of the "complete" patch.
-      this._downloadProgress.mode = "undetermined";
-      this._pauseButton.disabled = true;
-      document.getElementById("verificationFailed").hidden = false;
-      break;
-    case CoR.NS_BINDING_ABORTED:
-      LOG("gDownloadingPage", "onStopRequest - pausing download");
-      // Do not remove UI listener since the user may resume downloading again.
-      break;
-    case CoR.NS_OK:
-      LOG("gDownloadingPage", "onStopRequest - patch verification succeeded");
-      // If the background update pref is set, we should wait until the update
-      // is actually staged in the background.
-      var aus = CoC["@mozilla.org/updates/update-service;1"].
-                getService(CoI.nsIApplicationUpdateService);
-      if (aus.canStageUpdates) {
-        this._setUpdateApplying();
-      } else {
-        this.cleanUp();
-        gUpdates.wiz.goTo("finished");
-      }
-      break;
-    default:
-      LOG("gDownloadingPage", "onStopRequest - transfer failed");
-      // Some kind of transfer error, die.
-      this.cleanUp();
-      gUpdates.wiz.goTo("errors");
-      break;
     }
   },
 
@@ -1775,16 +1772,16 @@
 
   onWizardNext: function() {
     switch (gUpdates.update.selectedPatch.state) {
-    case STATE_PENDING:
-    case STATE_PENDING_SVC: 
-      gUpdates.wiz.goTo("finished");
-      break;
-    case STATE_DOWNLOADING:
-      gUpdates.wiz.goTo("downloading");
-      break;
-    case STATE_DOWNLOAD_FAILED:
-      gUpdates.wiz.goTo("errors");
-      break;
+      case STATE_PENDING:
+      case STATE_PENDING_SVC: 
+        gUpdates.wiz.goTo("finished");
+        break;
+      case STATE_DOWNLOADING:
+        gUpdates.wiz.goTo("downloading");
+        break;
+      case STATE_DOWNLOAD_FAILED:
+        gUpdates.wiz.goTo("errors");
+        break;
     }
   }
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/nsUpdateService.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/nsUpdateService.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/nsUpdateService.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/nsUpdateService.js	2015-02-28 15:03:09.000000000 +0000
@@ -1446,8 +1446,9 @@
   sis.init(inputStream);
   var text = sis.read(sis.available());
   sis.close();
-  if (text[text.length - 1] == "\n")
+  if (text && text[text.length - 1] == "\n") {
     text = text.slice(0, -1);
+  }
   return text;
 }
 
@@ -1598,19 +1599,19 @@
     var attr = patch.attributes.item(i);
     attr.QueryInterface(Ci.nsIDOMAttr);
     switch (attr.name) {
-    case "selected":
-      this.selected = attr.value == "true";
-      break;
-    case "size":
-      if (0 == parseInt(attr.value)) {
-        LOG("UpdatePatch:init - 0-sized patch!");
-        throw Cr.NS_ERROR_ILLEGAL_VALUE;
-      }
-      // fall through
-    default:
-      this[attr.name] = attr.value;
-      break;
-    };
+      case "selected":
+        this.selected = attr.value == "true";
+        break;
+      case "size":
+        if (0 == parseInt(attr.value)) {
+          LOG("UpdatePatch:init - 0-sized patch!");
+          throw Cr.NS_ERROR_ILLEGAL_VALUE;
+        }
+        // fall through
+      default:
+        this[attr.name] = attr.value;
+        break;
+    }
   }
 }
 UpdatePatch.prototype = {
@@ -1622,17 +1623,21 @@
     patch.setAttribute("type", this.type);
     patch.setAttribute("URL", this.URL);
     // finalURL is not available until after the download has started
-    if (this.finalURL)
+    if (this.finalURL) {
       patch.setAttribute("finalURL", this.finalURL);
+    }
     patch.setAttribute("hashFunction", this.hashFunction);
     patch.setAttribute("hashValue", this.hashValue);
     patch.setAttribute("size", this.size);
-    patch.setAttribute("selected", this.selected);
+    if (this.selected) {
+      patch.setAttribute("selected", this.selected);
+    }
     patch.setAttribute("state", this.state);
 
     for (var p in this._properties) {
-      if (this._properties[p].present)
+      if (this._properties[p].present) {
         patch.setAttribute(p, this._properties[p].data);
+      }
     }
 
     return patch;
@@ -1672,12 +1677,15 @@
 
   /**
    * See nsIPropertyBag.idl
+   * Note: returns null instead of throwing when the property doesn't exist to
+   *       simplify code and to silence warnings in debug builds.
    */
   getProperty: function UpdatePatch_getProperty(name) {
     if (name in this._properties &&
-        this._properties[name].present)
+        this._properties[name].present) {
       return this._properties[name].data;
-    throw Cr.NS_ERROR_FAILURE;
+    }
+    return null;
   },
 
   /**
@@ -1728,15 +1736,17 @@
 
   // Null <update>, assume this is a message container and do no
   // further initialization
-  if (!update)
+  if (!update) {
     return;
+  }
 
   const ELEMENT_NODE = Ci.nsIDOMNode.ELEMENT_NODE;
   for (var i = 0; i < update.childNodes.length; ++i) {
     var patchElement = update.childNodes.item(i);
     if (patchElement.nodeType != ELEMENT_NODE ||
-        patchElement.localName != "patch")
+        patchElement.localName != "patch") {
       continue;
+    }
 
     patchElement.QueryInterface(Ci.nsIDOMElement);
     try {
@@ -1747,8 +1757,9 @@
     this._patches.push(patch);
   }
 
-  if (this._patches.length == 0 && !update.hasAttribute("unsupported"))
+  if (this._patches.length == 0 && !update.hasAttribute("unsupported")) {
     throw Cr.NS_ERROR_ILLEGAL_VALUE;
+  }
 
   // Fallback to the behavior prior to bug 530872 if the update does not have an
   // appVersion attribute.
@@ -1762,82 +1773,84 @@
     }
   }
 
+  // Set the installDate value with the current time. If the update has an
+  // installDate attribute this will be replaced with that value if it doesn't
+  // equal 0.
+  this.installDate = (new Date()).getTime();
+
   for (var i = 0; i < update.attributes.length; ++i) {
     var attr = update.attributes.item(i);
     attr.QueryInterface(Ci.nsIDOMAttr);
-    if (attr.value == "undefined")
+    if (attr.value == "undefined") {
       continue;
-    else if (attr.name == "detailsURL")
+    } else if (attr.name == "detailsURL") {
       this._detailsURL = attr.value;
-    else if (attr.name == "extensionVersion") {
+    } else if (attr.name == "extensionVersion") {
       // Prevent extensionVersion from replacing appVersion if appVersion is
       // present in the update xml.
-      if (!this.appVersion)
+      if (!this.appVersion) {
         this.appVersion = attr.value;
-    }
-    else if (attr.name == "installDate" && attr.value)
-      this.installDate = parseInt(attr.value);
-    else if (attr.name == "isCompleteUpdate")
+      }
+    } else if (attr.name == "installDate" && attr.value) {
+      let val = parseInt(attr.value);
+      if (val) {
+        this.installDate = val;
+      }
+    } else if (attr.name == "isCompleteUpdate") {
       this.isCompleteUpdate = attr.value == "true";
-    else if (attr.name == "isSecurityUpdate")
+    } else if (attr.name == "isSecurityUpdate") {
       this.isSecurityUpdate = attr.value == "true";
-    else if (attr.name == "isOSUpdate")
+    } else if (attr.name == "isOSUpdate") {
       this.isOSUpdate = attr.value == "true";
-    else if (attr.name == "showNeverForVersion")
+    } else if (attr.name == "showNeverForVersion") {
       this.showNeverForVersion = attr.value == "true";
-    else if (attr.name == "showPrompt")
+    } else if (attr.name == "showPrompt") {
       this.showPrompt = attr.value == "true";
-    else if (attr.name == "promptWaitTime")
-    {
-      if(!isNaN(attr.value))
+    } else if (attr.name == "promptWaitTime") {
+      if(!isNaN(attr.value)) {
         this.promptWaitTime = parseInt(attr.value);
-    }
-    else if (attr.name == "unsupported")
+      }
+    } else if (attr.name == "unsupported") {
       this.unsupported = attr.value == "true";
-    else if (attr.name == "version") {
+    } else if (attr.name == "version") {
       // Prevent version from replacing displayVersion if displayVersion is
       // present in the update xml.
-      if (!this.displayVersion)
+      if (!this.displayVersion) {
         this.displayVersion = attr.value;
-    }
-    else {
+      }
+    } else {
       this[attr.name] = attr.value;
 
       switch (attr.name) {
-      case "appVersion":
-      case "billboardURL":
-      case "buildID":
-      case "channel":
-      case "displayVersion":
-      case "licenseURL":
-      case "name":
-      case "platformVersion":
-      case "previousAppVersion":
-      case "serviceURL":
-      case "statusText":
-      case "type":
-        break;
-      default:
-        // Save custom attributes when serializing to the local xml file but
-        // don't use this method for the expected attributes which are already
-        // handled in serialize.
-        this.setProperty(attr.name, attr.value);
-        break;
-      };
+        case "appVersion":
+        case "billboardURL":
+        case "buildID":
+        case "channel":
+        case "displayVersion":
+        case "licenseURL":
+        case "name":
+        case "platformVersion":
+        case "previousAppVersion":
+        case "serviceURL":
+        case "statusText":
+        case "type":
+          break;
+        default:
+          // Save custom attributes when serializing to the local xml file but
+          // don't use this method for the expected attributes which are already
+          // handled in serialize.
+          this.setProperty(attr.name, attr.value);
+          break;
+      }
     }
   }
 
-  // Set the initial value with the current time when it doesn't already have a
-  // value or the value is already set to 0 (bug 316328).
-  if (!this.installDate && this.installDate != 0)
-    this.installDate = (new Date()).getTime();
-
   // The Update Name is either the string provided by the <update> element, or
   // the string: "<App Name> <Update App Version>"
   var name = "";
-  if (update.hasAttribute("name"))
+  if (update.hasAttribute("name")) {
     name = update.getAttribute("name");
-  else {
+  } else {
     var brandBundle = Services.strings.createBundle(URI_BRAND_PROPERTIES);
     var appName = brandBundle.GetStringFromName("brandShortName");
     name = gUpdateBundle.formatStringFromName("updateName",
@@ -1917,6 +1930,12 @@
    * See nsIUpdateService.idl
    */
   serialize: function Update_serialize(updates) {
+    // If appVersion isn't defined just return null. This happens when a
+    // temporary nsIUpdate is passed to the UI when the
+    // app.update.showInstalledUI prefence is set to true.
+    if (!this.appVersion) {
+      return null;
+    }
     var update = updates.createElementNS(URI_UPDATE_NS, "update");
     update.setAttribute("appVersion", this.appVersion);
     update.setAttribute("buildID", this.buildID);
@@ -1937,29 +1956,38 @@
     update.setAttribute("version", this.displayVersion);
 
     // Optional attributes
-    if (this.billboardURL)
+    if (this.billboardURL) {
       update.setAttribute("billboardURL", this.billboardURL);
-    if (this.detailsURL)
+    }
+    if (this.detailsURL) {
       update.setAttribute("detailsURL", this.detailsURL);
-    if (this.licenseURL)
+    }
+    if (this.licenseURL) {
       update.setAttribute("licenseURL", this.licenseURL);
-    if (this.platformVersion)
+    }
+    if (this.platformVersion) {
       update.setAttribute("platformVersion", this.platformVersion);
-    if (this.previousAppVersion)
+    }
+    if (this.previousAppVersion) {
       update.setAttribute("previousAppVersion", this.previousAppVersion);
-    if (this.statusText)
+    }
+    if (this.statusText) {
       update.setAttribute("statusText", this.statusText);
-    if (this.unsupported)
+    }
+    if (this.unsupported) {
       update.setAttribute("unsupported", this.unsupported);
+    }
     updates.documentElement.appendChild(update);
 
     for (var p in this._properties) {
-      if (this._properties[p].present)
+      if (this._properties[p].present) {
         update.setAttribute(p, this._properties[p].data);
+      }
     }
 
-    for (var i = 0; i < this.patchCount; ++i)
+    for (let i = 0; i < this.patchCount; ++i) {
       update.appendChild(this.getPatchAt(i).serialize(updates));
+    }
 
     return update;
   },
@@ -1998,11 +2026,14 @@
 
   /**
    * See nsIPropertyBag.idl
+   * Note: returns null instead of throwing when the property doesn't exist to
+   *       simplify code and to silence warnings in debug builds.
    */
   getProperty: function Update_getProperty(name) {
-    if (name in this._properties && this._properties[name].present)
+    if (name in this._properties && this._properties[name].present) {
       return this._properties[name].data;
-    throw Cr.NS_ERROR_FAILURE;
+    }
+    return null;
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIUpdate,
@@ -2081,41 +2112,41 @@
    */
   observe: function AUS_observe(subject, topic, data) {
     switch (topic) {
-    case "post-update-processing":
-      // Clean up any extant updates
-      this._postUpdateProcessing();
-      break;
-    case "network:offline-status-changed":
-      this._offlineStatusChanged(data);
-      break;
-    case "nsPref:changed":
-      if (data == PREF_APP_UPDATE_LOG) {
-        gLogEnabled = getPref("getBoolPref", PREF_APP_UPDATE_LOG, false);
-      }
-      break;
+      case "post-update-processing":
+        // Clean up any extant updates
+        this._postUpdateProcessing();
+        break;
+      case "network:offline-status-changed":
+        this._offlineStatusChanged(data);
+        break;
+      case "nsPref:changed":
+        if (data == PREF_APP_UPDATE_LOG) {
+          gLogEnabled = getPref("getBoolPref", PREF_APP_UPDATE_LOG, false);
+        }
+        break;
 #ifdef MOZ_WIDGET_GONK
-    case "profile-change-net-teardown": // fall thru
+      case "profile-change-net-teardown": // fall thru
 #endif
-    case "xpcom-shutdown":
-      Services.obs.removeObserver(this, topic);
-      Services.prefs.removeObserver(PREF_APP_UPDATE_LOG, this);
+      case "xpcom-shutdown":
+        Services.obs.removeObserver(this, topic);
+        Services.prefs.removeObserver(PREF_APP_UPDATE_LOG, this);
 
 #ifdef XP_WIN
-      // If we hold the update mutex, let it go!
-      // The OS would clean this up sometime after shutdown,
-      // but that would have no guarantee on timing.
-      if (gUpdateMutexHandle) {
-        closeHandle(gUpdateMutexHandle);
-      }
+        // If we hold the update mutex, let it go!
+        // The OS would clean this up sometime after shutdown,
+        // but that would have no guarantee on timing.
+        if (gUpdateMutexHandle) {
+          closeHandle(gUpdateMutexHandle);
+        }
 #endif
-      if (this._retryTimer) {
-        this._retryTimer.cancel();
-      }
+        if (this._retryTimer) {
+          this._retryTimer.cancel();
+        }
 
-      this.pauseDownload();
-      // Prevent leaking the downloader (bug 454964)
-      this._downloader = null;
-      break;
+        this.pauseDownload();
+        // Prevent leaking the downloader (bug 454964)
+        this._downloader = null;
+        break;
     }
   },
 
@@ -3217,11 +3248,8 @@
       throw Cr.NS_ERROR_FAILURE;
     }
 
-    let osApplyToDir;
-    try {
-      aUpdate.QueryInterface(Ci.nsIWritablePropertyBag);
-      osApplyToDir = aUpdate.getProperty("osApplyToDir");
-    } catch (e) {}
+    aUpdate.QueryInterface(Ci.nsIWritablePropertyBag);
+    let osApplyToDir = aUpdate.getProperty("osApplyToDir");
 
     if (!osApplyToDir) {
       LOG("UpdateService:applyOsUpdate - Error: osApplyToDir is not defined" +
@@ -3478,8 +3506,9 @@
               createInstance(Ci.nsIFileOutputStream);
     var modeFlags = FileUtils.MODE_WRONLY | FileUtils.MODE_CREATE |
                     FileUtils.MODE_TRUNCATE;
-    if (!file.exists())
+    if (!file.exists()) {
       file.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+    }
     fos.init(file, modeFlags, FileUtils.PERMS_FILE, 0);
 
     try {
@@ -3489,15 +3518,18 @@
       var doc = parser.parseFromString(EMPTY_UPDATES_DOCUMENT, "text/xml");
 
       for (var i = 0; i < updates.length; ++i) {
-        if (updates[i])
+        // If appVersion isn't defined don't add the update. This happens when a
+        // temporary nsIUpdate is passed to the UI when the
+        // app.update.showInstalledUI prefence is set to true.
+        if (updates[i] && updates[i].appVersion) {
           doc.documentElement.appendChild(updates[i].serialize(doc));
+        }
       }
 
       var serializer = Cc["@mozilla.org/xmlextras/xmlserializer;1"].
                        createInstance(Ci.nsIDOMSerializer);
       serializer.serializeToStream(doc.documentElement, fos, null);
-    }
-    catch (e) {
+    } catch (e) {
     }
 
     FileUtils.closeSafeFileOutputStream(fos);
@@ -3530,7 +3562,11 @@
     }
   },
 
-  refreshUpdateStatus: function UM_refreshUpdateStatus(update) {
+  /**
+   * See nsIUpdateService.idl
+   */
+  refreshUpdateStatus: function UM_refreshUpdateStatus(aUpdate) {
+    var update = this._activeUpdate ? this._activeUpdate : aUpdate;
     var updateSucceeded = true;
     var status = readStatusFile(getUpdatesDir());
     var ary = status.split(":");
@@ -3825,7 +3861,7 @@
       if (this._isHttpStatusCode(status)) {
         update.errorCode = HTTP_ERROR_OFFSET + status;
       }
-      if (e.result == Cr.NS_ERROR_ILLEGAL_VALUE) {
+      if (e.result && e.result == Cr.NS_ERROR_ILLEGAL_VALUE) {
         update.errorCode = updates[0] ? CERT_ATTR_CHECK_FAILED_HAS_UPDATE
                                       : CERT_ATTR_CHECK_FAILED_NO_UPDATE;
       }
@@ -3892,13 +3928,13 @@
       this._request.abort();
 
     switch (duration) {
-    case Ci.nsIUpdateChecker.CURRENT_SESSION:
-      this._enabled = false;
-      break;
-    case Ci.nsIUpdateChecker.ANY_CHECKS:
-      this._enabled = false;
-      Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, this._enabled);
-      break;
+      case Ci.nsIUpdateChecker.CURRENT_SESSION:
+        this._enabled = false;
+        break;
+      case Ci.nsIUpdateChecker.ANY_CHECKS:
+        this._enabled = false;
+        Services.prefs.setBoolPref(PREF_APP_UPDATE_ENABLED, this._enabled);
+        break;
     }
 
     this._callback = null;
@@ -3977,10 +4013,11 @@
    */
   _verifyDownload: function Downloader__verifyDownload() {
     LOG("Downloader:_verifyDownload called");
-    if (!this._request)
+    if (!this._request) {
       return false;
+    }
 
-    var destination = this._request.destination;
+    let destination = this._request.destination;
 
     // Ensure that the file size matches the expected file size.
     if (destination.fileSize != this._patch.size) {
@@ -3989,16 +4026,18 @@
     }
 
     LOG("Downloader:_verifyDownload downloaded size == expected size.");
-    var fileStream = Cc["@mozilla.org/network/file-input-stream;1"].
+    let fileStream = Cc["@mozilla.org/network/file-input-stream;1"].
                      createInstance(Ci.nsIFileInputStream);
     fileStream.init(destination, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0);
 
+    let digest;
     try {
-      var hash = Cc["@mozilla.org/security/hash;1"].
+      let hash = Cc["@mozilla.org/security/hash;1"].
                  createInstance(Ci.nsICryptoHash);
       var hashFunction = Ci.nsICryptoHash[this._patch.hashFunction.toUpperCase()];
-      if (hashFunction == undefined)
+      if (hashFunction == undefined) {
         throw Cr.NS_ERROR_UNEXPECTED;
+      }
       hash.init(hashFunction);
       hash.updateFromStream(fileStream, -1);
       // NOTE: For now, we assume that the format of _patch.hashValue is hex
@@ -4065,35 +4104,35 @@
       LOG("Downloader:_selectPatch - found existing patch with state: " +
           state);
       switch (state) {
-      case STATE_DOWNLOADING:
-        LOG("Downloader:_selectPatch - resuming download");
-        return selectedPatch;
+        case STATE_DOWNLOADING:
+          LOG("Downloader:_selectPatch - resuming download");
+          return selectedPatch;
 #ifdef MOZ_WIDGET_GONK
-      case STATE_PENDING:
-      case STATE_APPLYING:
-        LOG("Downloader:_selectPatch - resuming interrupted apply");
-        return selectedPatch;
-      case STATE_APPLIED:
-        LOG("Downloader:_selectPatch - already downloaded and staged");
-        return null;
+        case STATE_PENDING:
+        case STATE_APPLYING:
+          LOG("Downloader:_selectPatch - resuming interrupted apply");
+          return selectedPatch;
+        case STATE_APPLIED:
+          LOG("Downloader:_selectPatch - already downloaded and staged");
+          return null;
 #else
-      case STATE_PENDING_SVC:
-      case STATE_PENDING:
-        LOG("Downloader:_selectPatch - already downloaded and staged");
-        return null;
-#endif
-      default:
-        // Something went wrong when we tried to apply the previous patch.
-        // Try the complete patch next time.
-        if (update && selectedPatch.type == "partial") {
-          useComplete = true;
-        } else {
-          // This is a pretty fatal error.  Just bail.
-          LOG("Downloader:_selectPatch - failed to apply complete patch!");
-          writeStatusFile(updateDir, STATE_NONE);
-          writeVersionFile(getUpdatesDir(), null);
+        case STATE_PENDING_SVC:
+        case STATE_PENDING:
+          LOG("Downloader:_selectPatch - already downloaded and staged");
           return null;
-        }
+#endif
+        default:
+          // Something went wrong when we tried to apply the previous patch.
+          // Try the complete patch next time.
+          if (update && selectedPatch.type == "partial") {
+            useComplete = true;
+          } else {
+            // This is a pretty fatal error.  Just bail.
+            LOG("Downloader:_selectPatch - failed to apply complete patch!");
+            writeStatusFile(updateDir, STATE_NONE);
+            writeVersionFile(getUpdatesDir(), null);
+            return null;
+          }
       }
 
       selectedPatch = null;
@@ -4567,14 +4606,8 @@
         // notify the user about the error. If the update was a background
         // update there is no notification since the user won't be expecting it.
         if (!Services.wm.getMostRecentWindow(UPDATE_WINDOW_NAME)) {
-          try {
-            this._update.QueryInterface(Ci.nsIWritablePropertyBag);
-            var fgdl = this._update.getProperty("foregroundDownload");
-          }
-          catch (e) {
-          }
-
-          if (fgdl == "true") {
+          this._update.QueryInterface(Ci.nsIWritablePropertyBag);
+          if (this._update.getProperty("foregroundDownload") == "true") {
             var prompter = Cc["@mozilla.org/updates/update-prompt;1"].
                            createInstance(Ci.nsIUpdatePrompt);
             prompter.showUpdateError(this._update);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/chrome/test_9999_cleanup.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/chrome/test_9999_cleanup.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/chrome/test_9999_cleanup.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/chrome/test_9999_cleanup.xul	2015-02-28 15:03:09.000000000 +0000
@@ -77,9 +77,8 @@
     removeDirRecursive(addonPrepDir);
   }
   catch (e) {
-    dump("Unable to remove directory\n" +
-         "path: " + addonPrepDir.path + "\n" +
-         "Exception: " + e + "\n");
+    logTestInfo("Unable to remove directory. Path: " + addonPrepDir.path +
+                ", Exception: " + e);
   }
 
   resetAddons(finishTest);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/chrome/utils.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/chrome/utils.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/chrome/utils.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/chrome/utils.js	2015-02-28 15:03:09.000000000 +0000
@@ -114,6 +114,8 @@
  *   install completes.
  */
 
+'use strict';
+
 Components.utils.import("resource://gre/modules/AddonManager.jsm");
 
 // The tests have to use the pageid instead of the pageIndex due to the
@@ -150,11 +152,14 @@
 
 const ADDON_ID_SUFFIX = "@appupdatetest.mozilla.org";
 const ADDON_PREP_DIR = "appupdateprep";
+
+const PREF_APP_UPDATE_INTERVAL = "app.update.interval";
+const PREF_APP_UPDATE_LASTUPDATETIME = "app.update.lastUpdateTime.background-update-timer";
+
 // Preference for storing add-ons that are disabled by the tests to prevent them
 // from interefering with the tests.
 const PREF_DISABLEDADDONS = "app.update.test.disabledAddons";
 const PREF_EM_HOTFIX_ID = "extensions.hotfix.id";
-const PREF_EM_SILENT = "app.update.silent";
 const TEST_ADDONS = [ "appdisabled_1", "appdisabled_2",
                       "compatible_1", "compatible_2",
                       "noupdate_1", "noupdate_2",
@@ -162,6 +167,8 @@
                       "updateversion_1", "updateversion_2",
                       "userdisabled_1", "userdisabled_2", "hotfix" ];
 
+const LOG_FUNCTION = info;
+
 var gURLData = URL_HOST + "/" + REL_PATH_DATA + "/";
 
 var gTestTimeout = 240000; // 4 minutes
@@ -655,10 +662,11 @@
   // expected or isn't the event's originalTarget.
   if (gRemoteContentState != gTest.expectedRemoteContentState ||
       aEvent.originalTarget != gRemoteContent) {
-    debugDump("returning early\n" +
-              "gRemoteContentState: " + gRemoteContentState + "\n" +
+    debugDump("returning early. " +
+              "gRemoteContentState: " +
+              gRemoteContentState + ", " +
               "expectedRemoteContentState: " +
-              gTest.expectedRemoteContentState + "\n" +
+              gTest.expectedRemoteContentState + ", " +
               "aEvent.originalTarget.nodeName: " +
               aEvent.originalTarget.nodeName);
     return true;
@@ -877,6 +885,14 @@
     Services.prefs.setBoolPref(PREF_APP_UPDATE_LOG, true);
   }
 
+  // Prevent nsIUpdateTimerManager from notifying nsIApplicationUpdateService
+  // to check for updates by setting the app update last update time to the
+  // current time minus one minute in seconds and the interval time to 12 hours
+  // in seconds.
+  let now = Math.round(Date.now() / 1000) - 60;
+  Services.prefs.setIntPref(PREF_APP_UPDATE_LASTUPDATETIME, now);
+  Services.prefs.setIntPref(PREF_APP_UPDATE_INTERVAL, 43200);
+
   if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_URL_OVERRIDE)) {
     gAppUpdateURL = Services.prefs.getCharPref(PREF_APP_UPDATE_URL_OVERRIDE);
   }
@@ -910,9 +926,9 @@
 
   Services.prefs.setIntPref(PREF_APP_UPDATE_IDLETIME, 0);
   Services.prefs.setIntPref(PREF_APP_UPDATE_PROMPTWAITTIME, 0);
+  Services.prefs.setBoolPref(PREF_APP_UPDATE_SILENT, false);
   Services.prefs.setBoolPref(PREF_EXTENSIONS_STRICT_COMPAT, true);
   Services.prefs.setCharPref(PREF_EM_HOTFIX_ID, "hotfix" + ADDON_ID_SUFFIX);
-  Services.prefs.setBoolPref(PREF_EM_SILENT, false);
 }
 
 /**
@@ -942,9 +958,8 @@
       removeDirRecursive(updatedDir);
     }
     catch (e) {
-      dump("Unable to remove directory\n" +
-           "path: " + updatedDir.path + "\n" +
-           "Exception: " + e + "\n");
+      logTestInfo("Unable to remove directory. Path: " + updatedDir.path +
+                  ", Exception: " + e);
     }
   }
 }
@@ -1066,6 +1081,10 @@
   catch(e) {
   }
 
+  if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_SILENT)) {
+    Services.prefs.clearUserPref(PREF_APP_UPDATE_SILENT);
+  }
+
   if (Services.prefs.prefHasUserValue(PREF_EXTENSIONS_STRICT_COMPAT)) {
 		Services.prefs.clearUserPref(PREF_EXTENSIONS_STRICT_COMPAT);
   }
@@ -1073,10 +1092,6 @@
   if (Services.prefs.prefHasUserValue(PREF_EM_HOTFIX_ID)) {
     Services.prefs.clearUserPref(PREF_EM_HOTFIX_ID);
   }
-
-  if (Services.prefs.prefHasUserValue(PREF_EM_SILENT)) {
-    Services.prefs.clearUserPref(PREF_EM_SILENT);
-  }
 }
 
 function setupTimer(aTestTimeout) {
@@ -1175,7 +1190,7 @@
 
         if (--xpiCount == 0) {
           let installCount = installs.length;
-          function installCompleted(aInstall) {
+          let installCompleted = function(aInstall) {
             aInstall.removeListener(listener);
 
             if (getAddonTestType(aInstall.addon.name) == "userdisabled") {
@@ -1184,7 +1199,7 @@
             if (--installCount == 0) {
               setNoUpdateAddonsDisabledState();
             }
-          }
+          };
 
           let listener = {
             onDownloadFailed: installCompleted,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/shared.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/shared.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/shared.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/shared.js	2015-02-28 15:03:09.000000000 +0000
@@ -430,8 +430,8 @@
     if (file.exists())
       file.remove(false);
   } catch (e) {
-    dump("Unable to remove file\nPath: " + file.path +
-         "\nException: " + e + "\n");
+    logTestInfo("Unable to remove file. Path: " + file.path +
+                ", Exception: " + e);
   }
 
   file = getUpdatesXMLFile(false);
@@ -439,8 +439,8 @@
     if (file.exists())
       file.remove(false);
   } catch (e) {
-    dump("Unable to remove file\nPath: " + file.path +
-         "\nException: " + e + "\n");
+    logTestInfo("Unable to remove file. Path: " + file.path +
+                ", Exception: " + e);
   }
 
   // This fails sporadically on Mac OS X so wrap it in a try catch
@@ -448,8 +448,8 @@
   try {
     cleanUpdatesDir(updatesDir);
   } catch (e) {
-    dump("Unable to remove files / directories from directory\nPath: " +
-         updatesDir.path + "\nException: " + e + "\n");
+    logTestInfo("Unable to remove files / directories from directory. Path: " +
+                updatesDir.path + ", Exception: " + e);
   }
 }
 
@@ -483,8 +483,8 @@
         try {
           entry.remove(true);
         } catch (e) {
-          dump("cleanUpdatesDir: unable to remove directory\nPath: " +
-               entry.path + "\nException: " + e + "\n");
+          logTestInfo("cleanUpdatesDir: unable to remove directory. Path: " +
+                      entry.path + ", Exception: " + e);
           throw(e);
         }
       }
@@ -493,8 +493,8 @@
       try {
         entry.remove(false);
       } catch (e) {
-        dump("cleanUpdatesDir: unable to remove file\nPath: " + entry.path +
-             "\nException: " + e + "\n");
+       logTestInfo("cleanUpdatesDir: unable to remove file. Path: " +
+                   entry.path + ", Exception: " + e);
         throw(e);
       }
     }
@@ -614,8 +614,9 @@
              (mm < 10 ? "0" + mm : mm) + ":" +
              (ss < 10 ? "0" + ss : ss) + ":" +
              (ms < 10 ? "00" + ms : ms < 100 ? "0" + ms : ms);
-  dump(time + " | TEST-INFO | " + caller.filename + " | [" + caller.name +
-       " : " + caller.lineNumber + "] " + aText + "\n");
+  let msg = time + " | TEST-INFO | " + caller.filename + " | [" + caller.name +
+            " : " + caller.lineNumber + "] " + aText;
+  LOG_FUNCTION(msg);
 }
 
 /**
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/canCheckForAndCanApplyUpdates.js	2015-02-28 15:03:09.000000000 +0000
@@ -61,74 +61,84 @@
   doTestFinish();
 }
 
-if (IS_WIN) {
-  /**
-   * Determines a unique mutex name for the installation.
-   *
-   * @return Global mutex path.
-   */
-  function getPerInstallationMutexName() {
-    let hasher = AUS_Cc["@mozilla.org/security/hash;1"].
-                 createInstance(AUS_Ci.nsICryptoHash);
-    hasher.init(hasher.SHA1);
-
-    let exeFile = Services.dirsvc.get(XRE_EXECUTABLE_FILE, AUS_Ci.nsILocalFile);
-
-    let converter = AUS_Cc["@mozilla.org/intl/scriptableunicodeconverter"].
-                    createInstance(AUS_Ci.nsIScriptableUnicodeConverter);
-    converter.charset = "UTF-8";
-    let data = converter.convertToByteArray(exeFile.path.toLowerCase());
+/**
+ * Determines a unique mutex name for the installation.
+ *
+ * @return Global mutex path.
+ */
+function getPerInstallationMutexName() {
+  if (!IS_WIN) {
+    do_throw("Windows only function called by a different platform!");
+  }
+
+  let hasher = AUS_Cc["@mozilla.org/security/hash;1"].
+               createInstance(AUS_Ci.nsICryptoHash);
+  hasher.init(hasher.SHA1);
+
+  let exeFile = Services.dirsvc.get(XRE_EXECUTABLE_FILE, AUS_Ci.nsILocalFile);
+
+  let converter = AUS_Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+                  createInstance(AUS_Ci.nsIScriptableUnicodeConverter);
+  converter.charset = "UTF-8";
+  let data = converter.convertToByteArray(exeFile.path.toLowerCase());
+
+  hasher.update(data, data.length);
+  return "Global\\MozillaUpdateMutex-" + hasher.finish(true);
+}
 
-    hasher.update(data, data.length);
-    return "Global\\MozillaUpdateMutex-" + hasher.finish(true);
+/**
+ * Closes a Win32 handle.
+ *
+ * @param  aHandle
+ *         The handle to close.
+ */
+function closeHandle(aHandle) {
+  if (!IS_WIN) {
+    do_throw("Windows only function called by a different platform!");
   }
 
-  /**
-   * Closes a Win32 handle.
-   *
-   * @param  aHandle
-   *         The handle to close.
-   */
-  function closeHandle(aHandle) {
-    let lib = ctypes.open("kernel32.dll");
-    let CloseHandle = lib.declare("CloseHandle",
-                                  ctypes.winapi_abi,
-                                  ctypes.int32_t, /* success */
-                                  ctypes.void_t.ptr); /* handle */
-    CloseHandle(aHandle);
-    lib.close();
+  let lib = ctypes.open("kernel32.dll");
+  let CloseHandle = lib.declare("CloseHandle",
+                                ctypes.winapi_abi,
+                                ctypes.int32_t, /* success */
+                                ctypes.void_t.ptr); /* handle */
+  CloseHandle(aHandle);
+  lib.close();
+}
+
+/**
+ * Creates a mutex.
+ *
+ * @param  aName
+ *         The name for the mutex.
+ * @return The Win32 handle to the mutex.
+ */
+function createMutex(aName) {
+  if (!IS_WIN) {
+    do_throw("Windows only function called by a different platform!");
   }
 
-  /**
-   * Creates a mutex.
-   *
-   * @param  aName
-   *         The name for the mutex.
-   * @return The Win32 handle to the mutex.
-   */
-  function createMutex(aName) {
-    const INITIAL_OWN = 1;
-    const ERROR_ALREADY_EXISTS = 0xB7;
-    let lib = ctypes.open("kernel32.dll");
-    let CreateMutexW = lib.declare("CreateMutexW",
-                                   ctypes.winapi_abi,
-                                   ctypes.void_t.ptr, /* return handle */
-                                   ctypes.void_t.ptr, /* security attributes */
-                                   ctypes.int32_t, /* initial owner */
-                                   ctypes.char16_t.ptr); /* name */
-
-    let handle = CreateMutexW(null, INITIAL_OWN, aName);
-    lib.close();
-    let alreadyExists = ctypes.winLastError == ERROR_ALREADY_EXISTS;
-    if (handle && !handle.isNull() && alreadyExists) {
-      closeHandle(handle);
-      handle = null;
-    }
-
-    if (handle && handle.isNull()) {
-      handle = null;
-    }
+  const INITIAL_OWN = 1;
+  const ERROR_ALREADY_EXISTS = 0xB7;
+  let lib = ctypes.open("kernel32.dll");
+  let CreateMutexW = lib.declare("CreateMutexW",
+                                 ctypes.winapi_abi,
+                                 ctypes.void_t.ptr, /* return handle */
+                                 ctypes.void_t.ptr, /* security attributes */
+                                 ctypes.int32_t, /* initial owner */
+                                 ctypes.char16_t.ptr); /* name */
+
+  let handle = CreateMutexW(null, INITIAL_OWN, aName);
+  lib.close();
+  let alreadyExists = ctypes.winLastError == ERROR_ALREADY_EXISTS;
+  if (handle && !handle.isNull() && alreadyExists) {
+    closeHandle(handle);
+    handle = null;
+  }
 
-    return handle;
+  if (handle && handle.isNull()) {
+    handle = null;
   }
+
+  return handle;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForDifferentChannel.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForDifferentChannel.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForDifferentChannel.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/cleanupDownloadingForDifferentChannel.js	2015-02-28 15:03:09.000000000 +0000
@@ -36,7 +36,7 @@
   do_check_eq(gUpdateManager.activeUpdate, null);
   // Verify that the active-update.xml file has had the update from the old
   // channel removed.
-  file = getUpdatesXMLFile(true);
+  let file = getUpdatesXMLFile(true);
   logTestInfo("verifying contents of " + FILE_UPDATE_ACTIVE);
   do_check_eq(readFile(file), getLocalUpdatesXMLString(""));
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadFileTooBig_gonk.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadFileTooBig_gonk.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadFileTooBig_gonk.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadFileTooBig_gonk.js	2015-02-28 15:03:09.000000000 +0000
@@ -5,7 +5,10 @@
 
 const KEY_UPDATE_ARCHIVE_DIR = "UpdArchD"
 
-let gActiveUpdate = null;
+let gActiveUpdate;
+let gDirService;
+let gDirProvider;
+let gOldProviders;
 
 function FakeDirProvider() {}
 FakeDirProvider.prototype = {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedRecovery.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedRecovery.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedRecovery.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/downloadInterruptedRecovery.js	2015-02-28 15:03:09.000000000 +0000
@@ -152,7 +152,7 @@
     tm.mainThread.dispatch(function() {
         this._observer = observer.QueryInterface(AUS_Ci.nsIRequestObserver);
         this._ctxt = ctxt;
-        this._observer.onStartRequest(this, this.ctxt);
+        this._observer.onStartRequest(this, this._ctxt);
         let mar = getTestDirFile(FILE_SIMPLE_MAR);
         mar.copyTo(this._destination.parent, this._destination.leafName);
         var status = AUS_Cr.NS_OK
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/head_update.js	2015-02-28 15:03:09.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/. */
 
+'use strict';
+
 const INSTALL_LOCALE = "@AB_CD@";
 const MOZ_APP_NAME = "@MOZ_APP_NAME@";
 const BIN_SUFFIX = "@BIN_SUFFIX@";
@@ -140,6 +142,8 @@
 const PIPE_TO_NULL = "> /dev/null 2>&1";
 #endif
 
+const LOG_FUNCTION = do_print;
+
 // This default value will be overridden when using the http server.
 var gURLData = URL_HOST + "/";
 
@@ -1417,41 +1421,46 @@
 }
 #endif
 
-if (IS_WIN) {
-  const kLockFileName = "updated.update_in_progress.lock";
-  /**
-   * Helper function for locking a directory on Windows.
-   *
-   * @param   aDir
-   *          The nsIFile for the directory to lock.
-   */
-  function lockDirectory(aDir) {
-    var file = aDir.clone();
-    file.append(kLockFileName);
-    file.create(file.NORMAL_FILE_TYPE, 0o444);
-    file.QueryInterface(AUS_Ci.nsILocalFileWin);
-    file.fileAttributesWin |= file.WFA_READONLY;
-    file.fileAttributesWin &= ~file.WFA_READWRITE;
-    logTestInfo("testing the successful creation of the lock file");
-    do_check_true(file.exists());
-    do_check_false(file.isWritable());
-  }
-  /**
-   * Helper function for unlocking a directory on Windows.
-   *
-   * @param   aDir
-   *          The nsIFile for the directory to unlock.
-   */
-  function unlockDirectory(aDir) {
-    var file = aDir.clone();
-    file.append(kLockFileName);
-    file.QueryInterface(AUS_Ci.nsILocalFileWin);
-    file.fileAttributesWin |= file.WFA_READWRITE;
-    file.fileAttributesWin &= ~file.WFA_READONLY;
-    logTestInfo("removing and testing the successful removal of the lock file");
-    file.remove(false);
-    do_check_false(file.exists());
+const kLockFileName = "updated.update_in_progress.lock";
+/**
+ * Helper function for locking a directory on Windows.
+ *
+ * @param   aDir
+ *          The nsIFile for the directory to lock.
+ */
+function lockDirectory(aDir) {
+  if (!IS_WIN) {
+    do_throw("Windows only function called by a different platform!");
   }
+
+  let file = aDir.clone();
+  file.append(kLockFileName);
+  file.create(file.NORMAL_FILE_TYPE, 0o444);
+  file.QueryInterface(AUS_Ci.nsILocalFileWin);
+  file.fileAttributesWin |= file.WFA_READONLY;
+  file.fileAttributesWin &= ~file.WFA_READWRITE;
+  logTestInfo("testing the successful creation of the lock file");
+  do_check_true(file.exists());
+  do_check_false(file.isWritable());
+}
+/**
+ * Helper function for unlocking a directory on Windows.
+ *
+ * @param   aDir
+ *          The nsIFile for the directory to unlock.
+ */
+function unlockDirectory(aDir) {
+  if (!IS_WIN) {
+    do_throw("Windows only function called by a different platform!");
+  }
+  let file = aDir.clone();
+  file.append(kLockFileName);
+  file.QueryInterface(AUS_Ci.nsILocalFileWin);
+  file.fileAttributesWin |= file.WFA_READWRITE;
+  file.fileAttributesWin &= ~file.WFA_READONLY;
+  logTestInfo("removing and testing the successful removal of the lock file");
+  file.remove(false);
+  do_check_false(file.exists());
 }
 
 /**
@@ -3229,7 +3238,7 @@
 
   if (!dir.isDirectory()) {
     do_throw("A file instead of a directory was specified for HttpServer " +
-             "registerDirectory! Path: " + dir.path + "\n");
+             "registerDirectory! Path: " + dir.path);
   }
 
   AUS_Cu.import("resource://testing-common/httpd.js");
@@ -3639,7 +3648,7 @@
   env.set("XPCOM_DEBUG_BREAK", "warn");
 
   if (gStageUpdate) {
-    logTestInfo("setting the MOZ_UPDATE_STAGING environment variable to 1\n");
+    logTestInfo("setting the MOZ_UPDATE_STAGING environment variable to 1");
     env.set("MOZ_UPDATE_STAGING", "1");
   }
 
@@ -3705,7 +3714,7 @@
   }
 
   if (gStageUpdate) {
-    logTestInfo("removing the MOZ_UPDATE_STAGING environment variable\n");
+    logTestInfo("removing the MOZ_UPDATE_STAGING environment variable");
     env.set("MOZ_UPDATE_STAGING", "");
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/uiUnsupportedAlreadyNotified.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/uiUnsupportedAlreadyNotified.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_aus_update/uiUnsupportedAlreadyNotified.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_aus_update/uiUnsupportedAlreadyNotified.js	2015-02-28 15:03:09.000000000 +0000
@@ -14,8 +14,6 @@
   // The mock XMLHttpRequest is MUCH faster
   overrideXHR(callHandleEvent);
   standardInit();
-  // The HTTP server is only used for the mar file downloads which is slow
-  start_httpserver();
 
   let registrar = Components.manager.QueryInterface(AUS_Ci.nsIComponentRegistrar);
   registrar.registerFactory(Components.ID("{1dfeb90a-2193-45d5-9cb8-864928b2af55}"),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_timermanager/consumerNotifications.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_timermanager/consumerNotifications.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/mozapps/update/tests/unit_timermanager/consumerNotifications.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/mozapps/update/tests/unit_timermanager/consumerNotifications.js	2015-02-28 15:03:09.000000000 +0000
@@ -5,6 +5,8 @@
 
 /* General Update Timer Manager Tests */
 
+'use strict';
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cm = Components.manager;
@@ -103,8 +105,8 @@
   lastUpdateTime  : 0
 } ];
 
-var gUTM;
-var gNextFunc;
+let gUTM;
+let gNextFunc;
 
 XPCOMUtils.defineLazyServiceGetter(this, "gPref",
                                    "@mozilla.org/preferences-service;1",
@@ -127,7 +129,7 @@
   gPref.setBoolPref(PREF_APP_UPDATE_LOG_ALL, true);
 
   // Remove existing update timers to prevent them from being notified
-  var entries = gCatMan.enumerateCategory(CATEGORY_UPDATE_TIMER);
+  let entries = gCatMan.enumerateCategory(CATEGORY_UPDATE_TIMER);
   while (entries.hasMoreElements()) {
     let entry = entries.getNext().QueryInterface(Ci.nsISupportsCString).data;
     gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, entry, false);
@@ -165,7 +167,7 @@
                             TESTS[1].defaultInterval].join(","), false, true);
 
   // has a last update time of now - 43200 which is half of its interval
-  var lastUpdateTime = Math.round(Date.now() / 1000) - 43200;
+  let lastUpdateTime = Math.round(Date.now() / 1000) - 43200;
   gPref.setIntPref(PREF_BRANCH_LAST_UPDATE_TIME + TESTS[2].timerID, lastUpdateTime);
   gCompReg.registerFactory(TESTS[2].classID, TESTS[2].desc,
                            TESTS[2].contractID, gTest3Factory);
@@ -201,7 +203,7 @@
                             TESTS[5].defaultInterval].join(","), false, true);
 
   // has a next update time 24 hours from now
-  var nextUpdateTime = Math.round(Date.now() / 1000) + 86400;
+  let nextUpdateTime = Math.round(Date.now() / 1000) + 86400;
   gPref.setIntPref(PREF_BRANCH_LAST_UPDATE_TIME + TESTS[6].timerID, nextUpdateTime);
   gCompReg.registerFactory(TESTS[6].classID, TESTS[6].desc,
                            TESTS[6].contractID, gTest7Factory);
@@ -212,40 +214,41 @@
 }
 
 function finished_test1thru7() {
-  if (TESTS[4].notified && TESTS[5].notified && TESTS[6].notified)
+  if (TESTS[4].notified && TESTS[5].notified && TESTS[6].notified) {
     do_timeout(0, gNextFunc);
+  }
 }
 
 function check_test1thru7() {
-  dump("Testing: a category registered timer didn't fire due to an invalid " +
-       "default interval\n");
+  do_print("Testing: a category registered timer didn't fire due to an " +
+           "invalid default interval");
   do_check_false(TESTS[0].notified);
 
-  dump("Testing: a category registered timer didn't fire due to not " +
-       "implementing nsITimerCallback\n");
+  do_print("Testing: a category registered timer didn't fire due to not " +
+           "implementing nsITimerCallback");
   do_check_false(TESTS[1].notified);
 
-  dump("Testing: a category registered timer didn't fire due to the next " +
-       "update time being in the future\n");
+  do_print("Testing: a category registered timer didn't fire due to the next " +
+           "update time being in the future");
   do_check_false(TESTS[2].notified);
 
-  dump("Testing: a category registered timer didn't fire due to not " +
-       "having a notify method\n");
+  do_print("Testing: a category registered timer didn't fire due to not " +
+           "having a notify method");
   do_check_false(TESTS[3].notified);
 
-  dump("Testing: a category registered timer has fired\n");
+  do_print("Testing: a category registered timer has fired");
   do_check_true(TESTS[4].notified);
 
-  dump("Testing: a category registered timer fired that has an interval " +
-       "preference that overrides a default that wouldn't have fired yet\n");
+  do_print("Testing: a category registered timer fired that has an interval " +
+           "preference that overrides a default that wouldn't have fired yet");
   do_check_true(TESTS[5].notified);
 
-  dump("Testing: a category registered timer has fired due to the next " +
-       "update time being reset due to a future last update time\n");
+  do_print("Testing: a category registered timer has fired due to the next " +
+           "update time being reset due to a future last update time");
   do_check_true(TESTS[6].notified);
 
-  dump("Testing: two category registered timers last update time has " +
-       "user values\n");
+  do_print("Testing: two category registered timers last update time has " +
+           "user values");
   do_check_true(gPref.prefHasUserValue(PREF_BRANCH_LAST_UPDATE_TIME +
                 TESTS[4].timerID));
   do_check_true(gPref.prefHasUserValue(PREF_BRANCH_LAST_UPDATE_TIME +
@@ -256,23 +259,22 @@
   gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[1].desc, true);
   gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[2].desc, true);
   gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[3].desc, true);
-  var count = 0;
-  var entries = gCatMan.enumerateCategory(CATEGORY_UPDATE_TIMER);
+  let count = 0;
+  let entries = gCatMan.enumerateCategory(CATEGORY_UPDATE_TIMER);
   while (entries.hasMoreElements()) {
     let entry = entries.getNext().QueryInterface(Ci.nsISupportsCString).data;
     gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, entry, false);
     count++;
   }
-  dump("Testing: no " + CATEGORY_UPDATE_TIMER + " categories are still " +
-       "registered\n");
+  do_print("Testing: no " + CATEGORY_UPDATE_TIMER + " categories are still " +
+           "registered");
   do_check_eq(count, 0);
 
   do_timeout(0, run_test8);
 }
 
 function run_test8() {
-  gNextFunc = check_test8;
-  for (var i = 0; i < 2; i++) {
+  for (let i = 0; i < 2; i++) {
     gPref.setIntPref(PREF_BRANCH_LAST_UPDATE_TIME + TESTS[7 + i].timerID, 1);
     gCompReg.registerFactory(TESTS[7 + i].classID, TESTS[7 + i].desc,
                              TESTS[7 + i].contractID, eval("gTest" + (8 + i) + "Factory"));
@@ -281,15 +283,16 @@
   }
 }
 
-function check_test8() {
-  var self = arguments.callee;
-  self.timesCalled = (self.timesCalled || 0) + 1;
-  if (self.timesCalled < 2)
+function check_test8(aTestTimerCallback) {
+  aTestTimerCallback.timesCalled = (aTestTimerCallback.timesCalled || 0) + 1;
+  if (aTestTimerCallback.timesCalled < 2) {
     return;
+  }
 
-  dump("Testing: two registerTimer registered timers have fired\n");
-  for (var i = 0; i < 2; i++)
+  do_print("Testing: two registerTimer registered timers have fired");
+  for (let i = 0; i < 2; i++) {
     do_check_true(TESTS[7 + i].notified);
+  }
 
   // Check that 'staggering' has happened: even though the two events wanted to fire at
   // the same time, we waited a full MAIN_TIMER_INTERVAL between them.
@@ -297,71 +300,76 @@
   do_check_true(Math.abs(TESTS[7].notifyTime - TESTS[8].notifyTime) >=
                 MAIN_TIMER_INTERVAL * 0.5);
 
-  dump("Testing: two registerTimer registered timers last update time have " +
-       "been updated\n");
-  for (var i = 0; i < 2; i++)
+  do_print("Testing: two registerTimer registered timers last update time have " +
+           "been updated");
+  for (let i = 0; i < 2; i++) {
     do_check_neq(gPref.getIntPref(PREF_BRANCH_LAST_UPDATE_TIME + TESTS[7 + i].timerID), 1);
+  }
   end_test();
 }
 
-var gTest1TimerCallback = {
+const gTest1TimerCallback = {
   notify: function T1CB_notify(aTimer) {
     do_throw("gTest1TimerCallback notify method should not have been called");
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest1Factory = {
+const gTest1Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest1TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest2TimerCallback = {
+const gTest2TimerCallback = {
   notify: function T2CB_notify(aTimer) {
     do_throw("gTest2TimerCallback notify method should not have been called");
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimer])
 };
 
-var gTest2Factory = {
+const gTest2Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest2TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest3TimerCallback = {
+const gTest3TimerCallback = {
   notify: function T3CB_notify(aTimer) {
     do_throw("gTest3TimerCallback notify method should not have been called");
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest3Factory = {
+const gTest3Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest3TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest4TimerCallback = {
+const gTest4TimerCallback = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest4Factory = {
+const gTest4Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest4TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest5TimerCallback = {
+const gTest5TimerCallback = {
   notify: function T5CB_notify(aTimer) {
     gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[4].desc, true);
     TESTS[4].notified = true;
@@ -370,15 +378,16 @@
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest5Factory = {
+const gTest5Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest5TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest6TimerCallback = {
+const gTest6TimerCallback = {
   notify: function T6CB_notify(aTimer) {
     gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[5].desc, true);
     TESTS[5].notified = true;
@@ -387,15 +396,16 @@
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest6Factory = {
+const gTest6Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest6TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest7TimerCallback = {
+const gTest7TimerCallback = {
   notify: function T7CB_notify(aTimer) {
     gCatMan.deleteCategoryEntry(CATEGORY_UPDATE_TIMER, TESTS[6].desc, true);
     TESTS[6].notified = true;
@@ -404,44 +414,51 @@
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest7Factory = {
+const gTest7Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest7TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest8TimerCallback = {
+const gTest8TimerCallback = {
   notify: function T8CB_notify(aTimer) {
     TESTS[7].notified = true;
     TESTS[7].notifyTime = Date.now();
-    do_timeout(0, check_test8);
+    do_timeout(0, function() {
+      check_test8(gTest8TimerCallback);
+    });
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest8Factory = {
+const gTest8Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest8TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
 
-var gTest9TimerCallback = {
+const gTest9TimerCallback = {
   notify: function T9CB_notify(aTimer) {
     TESTS[8].notified = true;
     TESTS[8].notifyTime = Date.now();
-    do_timeout(0, check_test8);
+    do_timeout(0, function() {
+      check_test8(gTest9TimerCallback);
+    });
   },
   QueryInterface: XPCOMUtils.generateQI([Ci.nsITimerCallback])
 };
 
-var gTest9Factory = {
+const gTest9Factory = {
   createInstance: function (outer, iid) {
-    if (outer == null)
+    if (outer == null) {
       return gTest9TimerCallback.QueryInterface(iid);
+    }
     throw Cr.NS_ERROR_NO_AGGREGATION;
   }
 };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/obsolete/content/dialogOverlay.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/obsolete/content/dialogOverlay.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/obsolete/content/dialogOverlay.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/obsolete/content/dialogOverlay.js	2015-02-28 15:03:09.000000000 +0000
@@ -71,12 +71,17 @@
         sizeToContent();
     }
 
-	var xOffset = (opener.outerWidth - window.outerWidth) / 2;
-	var yOffset = opener.outerHeight / 5;
-	
-	var newX = opener.screenX + xOffset;
-	var newY = opener.screenY + yOffset;
-	
+    if (opener) {
+        var xOffset = (opener.outerWidth - window.outerWidth) / 2;
+        var yOffset = opener.outerHeight / 5;
+
+        var newX = opener.screenX + xOffset;
+        var newY = opener.screenY + yOffset;
+    } else {
+        newX = (screen.availWidth - window.outerWidth) / 2;
+        newY = (screen.availHeight - window.outerHeight) / 2;
+    }
+
 	// ensure the window is fully onscreen (if smaller than the screen)
 	if (newX < screen.availLeft)
 		newX = screen.availLeft + 20;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/osx/global/in-content/common.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/osx/global/in-content/common.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/osx/global/in-content/common.css	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/osx/global/in-content/common.css	2015-02-28 15:03:09.000000000 +0000
@@ -82,3 +82,17 @@
   color: #ff9500;
   text-decoration: underline;
 }
+
+xul|button:-moz-focusring,
+xul|menulist:-moz-focusring,
+xul|checkbox:-moz-focusring > .checkbox-check,
+xul|radio[focused="true"] > .radio-check,
+xul|tab:-moz-focusring > .tab-middle > .tab-text {
+	outline: 2px solid rgba(0,149,221,0.5);
+	outline-offset: 1px;
+	-moz-outline-radius: 2px;
+}
+
+xul|radio[focused="true"] > .radio-check {
+	-moz-outline-radius: 100%;
+}
\ No newline at end of file
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/osx/global/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/osx/global/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/osx/global/jar.mn	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/osx/global/jar.mn	2015-02-28 15:03:09.000000000 +0000
@@ -200,6 +200,8 @@
   skin/classic/global/reader/RM-Close-24x24.svg                      (../../shared/reader/RM-Close-24x24.svg)
   skin/classic/global/reader/RM-Close-hover-24x24.svg                (../../shared/reader/RM-Close-hover-24x24.svg)
   skin/classic/global/reader/RM-Delete-24x24.svg                     (../../shared/reader/RM-Delete-24x24.svg)
+  skin/classic/global/reader/RM-Minus-24x24.svg                      (../../shared/reader/RM-Minus-24x24.svg)
+  skin/classic/global/reader/RM-Plus-24x24.svg                       (../../shared/reader/RM-Plus-24x24.svg)
   skin/classic/global/reader/RM-Reading-List-24x24.svg               (../../shared/reader/RM-Reading-List-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-24x24.svg              (../../shared/reader/RM-Type-Controls-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-Arrow.svg              (../../shared/reader/RM-Type-Controls-Arrow.svg)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/in-content/common.inc.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/in-content/common.inc.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/in-content/common.inc.css	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/in-content/common.inc.css	2015-02-28 15:03:09.000000000 +0000
@@ -40,6 +40,7 @@
   margin: 0;
 }
 
+xul|caption > xul|checkbox,
 xul|caption > xul|label {
   font-size: 1.3rem;
   font-weight: bold;
@@ -547,6 +548,7 @@
   padding-bottom: 2px;
   -moz-padding-start: 9px;
   margin: 0;
+  -moz-user-select: none;
 }
 
 *|*.category-icon {
@@ -568,6 +570,7 @@
   font-weight: normal;
   line-height: 40px;
   margin: 0;
+  -moz-user-select: none;
 }
 
 /* File fields */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/in-content/info-pages.inc.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/in-content/info-pages.inc.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/in-content/info-pages.inc.css	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/in-content/info-pages.inc.css	2015-02-28 15:03:09.000000000 +0000
@@ -77,6 +77,10 @@
   min-width: 150px;
 }
 
+.button-container > button:first-child {
+  -moz-margin-start: 0;
+}
+
 /* Trees */
 tree {
   min-height: 12em;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/reader/RM-Minus-24x24.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/reader/RM-Minus-24x24.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/reader/RM-Minus-24x24.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/reader/RM-Minus-24x24.svg	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M0,13.5v-3h24v3H0z"/>
+<g enable-background="new    ">
+    <g>
+        <defs>
+            <rect id="SVGID_2_" x="-269.917" y="-1054" width="22" height="34"/>
+        </defs>
+        <clipPath id="SVGID_1_">
+            <use xlink:href="#SVGID_2_"  overflow="visible"/>
+        </clipPath>
+        <g clip-path="url(#SVGID_1_)">
+            <defs>
+                <rect id="SVGID_6_" x="-365.917" y="-1459" width="1080" height="2896"/>
+            </defs>
+            <clipPath id="SVGID_3_">
+                <use xlink:href="#SVGID_6_"  overflow="visible"/>
+            </clipPath>
+        </g>
+        <g clip-path="url(#SVGID_1_)">
+            <defs>
+                <rect id="SVGID_10_" x="-365.917" y="-1459" width="1080" height="2896"/>
+            </defs>
+            <clipPath id="SVGID_5_">
+                <use xlink:href="#SVGID_10_"  overflow="visible"/>
+            </clipPath>
+        </g>
+        <g clip-path="url(#SVGID_1_)">
+            <defs>
+                <rect id="SVGID_16_" x="-365.917" y="-1459" width="1080" height="2896"/>
+            </defs>
+            <clipPath id="SVGID_7_">
+                <use xlink:href="#SVGID_16_"  overflow="visible"/>
+            </clipPath>
+        </g>
+    </g>
+</g>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/reader/RM-Plus-24x24.svg thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/reader/RM-Plus-24x24.svg
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/shared/reader/RM-Plus-24x24.svg	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/shared/reader/RM-Plus-24x24.svg	2015-02-28 15:03:09.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#808080" d="M24,13.5H13.5V24h-3V13.5H0v-3h10.5V0h3v10.5H24V13.5z"/>
+<g enable-background="new    ">
+    <g>
+        <defs>
+            <rect id="SVGID_2_" x="-233.667" y="-1054" width="22" height="34"/>
+        </defs>
+        <clipPath id="SVGID_1_">
+            <use xlink:href="#SVGID_2_"  overflow="visible"/>
+        </clipPath>
+        <g clip-path="url(#SVGID_1_)">
+            <defs>
+                <rect id="SVGID_6_" x="-329.667" y="-1459" width="1080" height="2896"/>
+            </defs>
+            <clipPath id="SVGID_3_">
+                <use xlink:href="#SVGID_6_"  overflow="visible"/>
+            </clipPath>
+        </g>
+        <g clip-path="url(#SVGID_1_)">
+            <defs>
+                <rect id="SVGID_10_" x="-329.667" y="-1459" width="1080" height="2896"/>
+            </defs>
+            <clipPath id="SVGID_5_">
+                <use xlink:href="#SVGID_10_"  overflow="visible"/>
+            </clipPath>
+        </g>
+        <g clip-path="url(#SVGID_1_)">
+            <defs>
+                <rect id="SVGID_16_" x="-329.667" y="-1459" width="1080" height="2896"/>
+            </defs>
+            <clipPath id="SVGID_7_">
+                <use xlink:href="#SVGID_16_"  overflow="visible"/>
+            </clipPath>
+        </g>
+    </g>
+</g>
+</svg>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/aboutReader.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/aboutReader.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/aboutReader.css	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/aboutReader.css	2015-02-28 15:03:09.000000000 +0000
@@ -35,31 +35,42 @@
   font-family: serif;
 }
 
-.font-size1,
-.font-size1-sample {
+.font-size1 {
+  font-size: 10px;
+}
+
+.font-size2 {
+  font-size: 12px;
+}
+
+.font-size3 {
   font-size: 14px;
 }
 
-.font-size2,
-.font-size2-sample {
+.font-size4  {
   font-size: 16px;
 }
 
-.font-size3,
-.font-size3-sample {
+.font-size5 {
   font-size: 18px;
 }
 
-.font-size4,
-.font-size4-sample {
+.font-size6 {
   font-size: 20px;
 }
 
-.font-size5,
-.font-size5-sample {
+.font-size7 {
   font-size: 22px;
 }
 
+.font-size8 {
+  font-size: 24px;
+}
+
+.font-size9 {
+  font-size: 26px;
+}
+
 
 /* Loading/error message */
 
@@ -239,9 +250,12 @@
   background-position: center;
   background-size: 24px 24px;
   background-repeat: no-repeat;
-  padding: 4px;
-  height: 32px;
-  width: 32px;
+  background-color: transparent;
+  height: 40px;
+  width: 40px;
+  border-top: 0;
+  border-left: 0;
+  border-right: 0;
   border-bottom: 1px solid #c1c1c1;
 }
 
@@ -265,7 +279,6 @@
   background-color: #FBFBFB;
   font-size: 14px;
   visibility: hidden;
-  cursor: pointer;
   border-radius: 4px;
   border: 1px solid #B5B5B5;
   box-shadow: 0px 1px 12px #666;
@@ -295,6 +308,7 @@
 }
 
 #font-type-buttons,
+#font-size-buttons,
 .segmented-button {
   display: flex;
   flex-direction: row;
@@ -304,6 +318,7 @@
 }
 
 #font-type-buttons > li,
+#font-size-buttons > button,
 .segmented-button > li {
   flex: 1 0 auto;
   text-align: center;
@@ -311,8 +326,9 @@
   padding: 10px;
 }
 
-#font-type-buttons > li {
-  width: 50px; /* combined with flex, this acts as a minimum width */
+#font-type-buttons > li,
+#font-size-buttons > button {
+  width: 100px; /* combined with flex, this acts as a minimum width */
 }
 
 .segmented-button > li {
@@ -321,6 +337,7 @@
 }
 
 #font-type-buttons > li:first-child,
+#font-size-buttons > button:first-child,
 .segmented-button > li:first-child {
   border-left: 0px;
 }
@@ -369,6 +386,16 @@
   font-size: 12px;
 }
 
+.minus-button,
+.plus-button {
+  background-color: transparent;
+  border: 0;
+  height: 50px;
+  background-size: 18px 18px;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
 /* Android-only controls */
 .share-button {
   display: none;
@@ -376,7 +403,7 @@
 
 .close-button {
   background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg");
-  height: 60px;
+  height: 68px;
   background-position: center 8px;
 }
 
@@ -401,3 +428,11 @@
 .list-button {
   background-image: url("chrome://global/skin/reader/RM-Reading-List-24x24.svg");
 }
+
+.minus-button {
+  background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
+}
+
+.plus-button {
+  background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
+}
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/aboutSupport.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/aboutSupport.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/aboutSupport.css	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/aboutSupport.css	2015-02-28 15:03:09.000000000 +0000
@@ -78,7 +78,7 @@
   overflow: hidden;
 }
 
-#reset-box {
+#action-box {
   background-color: -moz-Dialog;
   border: 1px solid ThreeDShadow;
   color: -moz-DialogText;
@@ -89,10 +89,15 @@
   -moz-margin-end: 0;
   padding: 16px;
   width: 30%;
-  visibility: hidden;
 }
 
-#reset-box:-moz-dir(rtl) {
+#action-box,
+#reset-box,
+#safe-mode-box {
+  display: none;
+}
+
+#action-box:-moz-dir(rtl) {
   float: left;
 }
 
@@ -100,7 +105,7 @@
   margin-top: 0;
 }
 
-#reset-box > button {
+#action-box button {
   display: block;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/jar.mn thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/jar.mn
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/jar.mn	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/jar.mn	2015-02-28 15:03:09.000000000 +0000
@@ -191,6 +191,8 @@
         skin/classic/global/reader/RM-Close-24x24.svg            (../../shared/reader/RM-Close-24x24.svg)
         skin/classic/global/reader/RM-Close-hover-24x24.svg      (../../shared/reader/RM-Close-hover-24x24.svg)
         skin/classic/global/reader/RM-Delete-24x24.svg           (../../shared/reader/RM-Delete-24x24.svg)
+        skin/classic/global/reader/RM-Minus-24x24.svg            (../../shared/reader/RM-Minus-24x24.svg)
+        skin/classic/global/reader/RM-Plus-24x24.svg             (../../shared/reader/RM-Plus-24x24.svg)
         skin/classic/global/reader/RM-Reading-List-24x24.svg     (../../shared/reader/RM-Reading-List-24x24.svg)
         skin/classic/global/reader/RM-Type-Controls-24x24.svg    (../../shared/reader/RM-Type-Controls-24x24.svg)
         skin/classic/global/reader/RM-Type-Controls-Arrow.svg    (../../shared/reader/RM-Type-Controls-Arrow.svg)
@@ -395,6 +397,8 @@
         skin/classic/aero/global/reader/RM-Close-24x24.svg               (../../shared/reader/RM-Close-24x24.svg)
         skin/classic/aero/global/reader/RM-Close-hover-24x24.svg         (../../shared/reader/RM-Close-hover-24x24.svg)
         skin/classic/aero/global/reader/RM-Delete-24x24.svg              (../../shared/reader/RM-Delete-24x24.svg)
+        skin/classic/aero/global/reader/RM-Minus-24x24.svg               (../../shared/reader/RM-Minus-24x24.svg)
+        skin/classic/aero/global/reader/RM-Plus-24x24.svg                (../../shared/reader/RM-Plus-24x24.svg)
         skin/classic/aero/global/reader/RM-Reading-List-24x24.svg        (../../shared/reader/RM-Reading-List-24x24.svg)
         skin/classic/aero/global/reader/RM-Type-Controls-24x24.svg       (../../shared/reader/RM-Type-Controls-24x24.svg)
         skin/classic/aero/global/reader/RM-Type-Controls-Arrow.svg       (../../shared/reader/RM-Type-Controls-Arrow.svg)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/notification.css thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/notification.css
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/themes/windows/global/notification.css	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/themes/windows/global/notification.css	2015-02-28 15:03:09.000000000 +0000
@@ -94,9 +94,7 @@
     -moz-appearance: none;
     border-radius: 3px;
     padding: 0;
-%ifndef WINDOWS_AERO
-    background-color: rgba(250,250,250,.3);
-%endif    
+    background-color: rgba(250,250,250,.3)
   }
 
   .popup-notification-menubutton:hover:active {
@@ -109,17 +107,25 @@
     -moz-appearance: none;
     margin: 0;
     border: 1px solid rgba(0,0,0,.35);
-%ifdef WINDOWS_AERO
-    background-image: linear-gradient(rgba(250,250,250,.6), rgba(175,175,175,.25) 49%, rgba(0,0,0,.12) 51%, rgba(0,0,0,.09) 60%, rgba(0,0,0,.05));
-    box-shadow: 0 0 1px 1px rgba(255,255,255,.75) inset;
-%else
+
     box-shadow: 0 1px 0 rgba(255,255,255,.5) inset,
                 0 2px 2px rgba(255,255,255,.35) inset,
                 0 -1px 2px rgba(0,0,0,.1) inset,
                 0 1px 0 rgba(255,255,255,.35);
-%endif
+
   }
 
+%ifdef WINDOWS_AERO
+  @media (-moz-windows-glass) {
+    .popup-notification-menubutton:not([type="menu-button"]),
+    .popup-notification-menubutton > .button-menubutton-button,
+    .popup-notification-menubutton > .button-menubutton-dropmarker {
+      background-color: transparent;
+      background-image: linear-gradient(rgba(250,250,250,.6), rgba(175,175,175,.25) 49%, rgba(0,0,0,.12) 51%, rgba(0,0,0,.09) 60%, rgba(0,0,0,.05));
+      box-shadow: 0 0 1px 1px rgba(255,255,255,.75) inset;
+    }
+  }
+%endif
   .popup-notification-menubutton > .button-menubutton-button {
     background-color: transparent;
     padding: 1px;
@@ -145,40 +151,51 @@
   }
 
 %ifdef WINDOWS_AERO
-  .popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(ltr),
-  .popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(rtl) {
-    border-radius: 2px 0 0 2px;
-  }
-
-  .popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(rtl),
-  .popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(ltr) {
-    border-radius: 0 2px 2px 0;
+  @media (-moz-windows-glass) {
+    .popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(ltr),
+    .popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(rtl) {
+      border-radius: 2px 0 0 2px;
+    }
+
+    .popup-notification-menubutton > .button-menubutton-button:-moz-locale-dir(rtl),
+    .popup-notification-menubutton > .button-menubutton-dropmarker:-moz-locale-dir(ltr) {
+      border-radius: 0 2px 2px 0;
+    }
   }
 %endif
 
   .popup-notification-menubutton:not([type="menu-button"]):hover,
   .popup-notification-menubutton > .button-menubutton-button:hover,
   .popup-notification-menubutton > .button-menubutton-dropmarker:hover {
+    background-color: rgba(250,250,250,.6);
+  }
+
+  .popup-notification-menubutton:not([type="menu-button"]):hover:active,
+  .popup-notification-menubutton > .button-menubutton-button:hover:active,
+  .popup-notification-menubutton > .button-menubutton-dropmarker:hover:active,
+  .popup-notification-menubutton[open="true"] > .button-menubutton-dropmarker {
+    background-color: rgba(0,0,0,.05);
+    box-shadow: 0 0 2px rgba(0,0,0,.65) inset;
+  }
 %ifdef WINDOWS_AERO
+@media (-moz-windows-glass) {
+  .popup-notification-menubutton:not([type="menu-button"]):hover,
+  .popup-notification-menubutton > .button-menubutton-button:hover,
+  .popup-notification-menubutton > .button-menubutton-dropmarker:hover {
+    background-color: transparent;
     background-image: linear-gradient(rgba(250,250,250,.9), rgba(200,200,200,.6) 49%, rgba(0,0,0,.23) 51%, rgba(0,0,0,.17) 60%, rgba(0,0,0,.05));
     box-shadow: 0 0 0 1px white inset,
                 0 0 2px 1px rgba(255,255,255,.75) inset;
-%else
-    background-color: rgba(250,250,250,.6);
-%endif
   }
-
   .popup-notification-menubutton:not([type="menu-button"]):hover:active,
   .popup-notification-menubutton > .button-menubutton-button:hover:active,
   .popup-notification-menubutton > .button-menubutton-dropmarker:hover:active,
   .popup-notification-menubutton[open="true"] > .button-menubutton-dropmarker {
-%ifdef WINDOWS_AERO
+    background-color: transparent;
     background-image: linear-gradient(rgba(250,250,250,.9), rgba(200,200,200,.6) 49%, rgba(0,0,0,.23) 51%, rgba(0,0,0,.17) 60%, rgba(0,0,0,.05));
-%else
-    background-color: rgba(0,0,0,.05);
-%endif
-    box-shadow: 0 0 2px rgba(0,0,0,.65) inset;
   }
+}
+%endif
 /*}*/
 %endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/NativeApp.jsm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/NativeApp.jsm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/NativeApp.jsm	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/NativeApp.jsm	2015-02-28 15:03:09.000000000 +0000
@@ -446,7 +446,24 @@
     });
 #endif
 
-    let channel = NetUtil.newChannel(aIconURI);
+    // If not fetching an icon from chrome:// then we should create a
+    // NoAppCodeBasePrincipal. Note, that we are still in the process of
+    // installing the app, hence app.origin is not available yet and
+    // therefore we can not call getAppCodebasePrincipal.
+    let principal =
+      aIconURI.schemeIs("chrome") ? Services.scriptSecurityManager
+                                            .getSystemPrincipal()
+                                  : Services.scriptSecurityManager
+                                            .getNoAppCodebasePrincipal(aIconURI);
+
+    let channel = NetUtil.newChannel2(aIconURI,
+                                      null,
+                                      null,
+                                      null,      // aLoadingNode
+                                      principal,
+                                      null,      // aTriggeringPrincipal
+                                      Ci.nsILoadInfo.SEC_NORMAL,
+                                      Ci.nsIContentPolicy.TYPE_IMAGE);
     let { BadCertHandler } = Cu.import("resource://gre/modules/CertUtils.jsm", {});
     // Pass true to avoid optional redirect-cert-checking behavior.
     channel.notificationCallbacks = new BadCertHandler(true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_custom_origin_uninstall_install.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_custom_origin_uninstall_install.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_custom_origin_uninstall_install.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_custom_origin_uninstall_install.xul	2015-02-28 15:03:09.000000000 +0000
@@ -80,8 +80,10 @@
 
   confirmNextPopup();
 
-  let (request = navigator.mozApps.installPackage(app.manifestURL)) {
-    let (deferred = Promise.defer()) {
+  {
+    let request = navigator.mozApps.installPackage(app.manifestURL);
+    {
+      let deferred = Promise.defer();
       request.onerror = function() {
         deferred.reject(this.error.name);
       };
@@ -92,14 +94,15 @@
     let appObject = request.result;
     ok(appObject, "app is non-null");
 
-    let (deferred = Promise.defer()) {
+    {
+      let deferred = Promise.defer();
       appObject.ondownloaderror = function() {
         deferred.reject(appObject.downloadError.name);
       };
       appObject.ondownloadapplied = deferred.resolve;
       yield deferred.promise;
-    };
-  };
+    }
+  }
 
   while (!WebappOSUtils.isLaunchable(app)) {
     yield wait(1000);
@@ -112,8 +115,10 @@
 
   confirmNextPopup();
 
-  let (request = navigator.mozApps.installPackage(app.manifestURL)) {
-    let (deferred = Promise.defer()) {
+  {
+    let request = navigator.mozApps.installPackage(app.manifestURL);
+    {
+      let deferred = Promise.defer();
       request.onerror = function() {
         deferred.reject(this.error.name);
       };
@@ -124,14 +129,15 @@
     let appObject = request.result;
     ok(appObject, "app is non-null");
 
-    let (deferred = Promise.defer()) {
+    {
+      let deferred = Promise.defer();
       appObject.ondownloaderror = function() {
         deferred.reject(appObject.downloadError.name);
       };
       appObject.ondownloadapplied = deferred.resolve;
       yield deferred.promise;
-    };
-  };
+    }
+  }
 
   while (!WebappOSUtils.isLaunchable(app)) {
     yield wait(1000);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_custom_origin.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_custom_origin.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_custom_origin.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_custom_origin.xul	2015-02-28 15:03:09.000000000 +0000
@@ -82,7 +82,8 @@
 
   let request = navigator.mozApps.installPackage(app.manifestURL);
 
-  let (deferred = Promise.defer()) {
+  {
+    let deferred = Promise.defer();
     request.onerror = function() {
       deferred.reject(this.error.name);
     };
@@ -93,13 +94,14 @@
   let appObject = request.result;
   ok(appObject, "app is non-null");
 
-  let (deferred = Promise.defer()) {
+  {
+    let deferred = Promise.defer();
     appObject.ondownloaderror = function() {
       deferred.reject(appObject.downloadError.name);
     };
     appObject.ondownloadapplied = deferred.resolve;
     yield deferred.promise;
-  };
+  }
 
   while (!WebappOSUtils.isLaunchable(app)) {
     yield wait(1000);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_hosted_checkforupdates_from_webapp_runtime.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_hosted_checkforupdates_from_webapp_runtime.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_hosted_checkforupdates_from_webapp_runtime.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_hosted_checkforupdates_from_webapp_runtime.xul	2015-02-28 15:03:09.000000000 +0000
@@ -62,7 +62,8 @@
 
   let request = navigator.mozApps.install(app.manifestURL);
 
-  let (deferred = Promise.defer()) {
+  {
+    let deferred = Promise.defer();
     request.onerror = function() {
       deferred.reject(this.error.name);
     };
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_install_appcache.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_install_appcache.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_install_appcache.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_install_appcache.xul	2015-02-28 15:03:09.000000000 +0000
@@ -60,7 +60,8 @@
 
   let request = navigator.mozApps.install(app.manifestURL);
 
-  let (deferred = Promise.defer()) {
+  {
+    let deferred = Promise.defer();
     request.onerror = function() {
       deferred.reject(this.error.name);
     };
@@ -76,7 +77,8 @@
   }
   ok(true, "App launchable");
 
-  let (size = 0) {
+  {
+    let size = 0;
     do {
       try {
         size = yield dirSize(OS.Path.join(testAppInfo.profileDir.path, "OfflineCache"));
@@ -99,7 +101,8 @@
   }
   ok(!appClosed, "App was launched and is still running");
 
-  let (size = 0) {
+  {
+    let size = 0;
     do {
       try {
         size = yield dirSize(OS.Path.join(testAppInfo.cacheDir.path, "OfflineCache"));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_packaged_checkforupdates_from_webapp_runtime.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_packaged_checkforupdates_from_webapp_runtime.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/webapps/tests/test_packaged_checkforupdates_from_webapp_runtime.xul	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/webapps/tests/test_packaged_checkforupdates_from_webapp_runtime.xul	2015-02-28 15:03:09.000000000 +0000
@@ -62,7 +62,8 @@
 
   let request = navigator.mozApps.installPackage(app.manifestURL);
 
-  let (deferred = Promise.defer()) {
+  {
+    let deferred = Promise.defer();
     request.onerror = function() {
       deferred.reject(this.error.name);
     };
@@ -73,13 +74,14 @@
   let appObject = request.result;
   ok(appObject, "app is non-null");
 
-  let (deferred = Promise.defer()) {
+  {
+    let deferred = Promise.defer();
     appObject.ondownloaderror = function() {
       deferred.reject(appObject.downloadError.name);
     };
     appObject.ondownloadapplied = deferred.resolve;
     yield deferred.promise;
-  };
+  }
 
   while (!WebappOSUtils.isLaunchable(app)) {
     yield wait(1000);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/Makefile.in	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/Makefile.in	2015-02-28 15:03:09.000000000 +0000
@@ -24,7 +24,7 @@
 
   INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)
 
-  ifdef MOZILLA_OFFICIAL
+  ifdef MOZ_INCLUDE_SOURCE_INFO
     source_repo := $(call getSourceRepo)
 
     # extra sanity check for old versions of hg, no showconfig support
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/nsEmbedFunctions.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/nsEmbedFunctions.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/nsEmbedFunctions.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/nsEmbedFunctions.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -69,6 +69,7 @@
 
 #include "mozilla/ipc/TestShellParent.h"
 #include "mozilla/ipc/XPCShellEnvironment.h"
+#include "mozilla/WindowsDllBlocklist.h"
 
 #include "GMPProcessChild.h"
 #include "GMPLoader.h"
@@ -300,6 +301,10 @@
   NS_ENSURE_ARG_POINTER(aArgv);
   NS_ENSURE_ARG_POINTER(aArgv[0]);
 
+#ifdef HAS_DLL_BLOCKLIST
+  DllBlocklist_Initialize();
+#endif
+
 #if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
   // On non-Fennec Gecko, the GMPLoader code resides in plugin-container,
   // and we must forward it through to the GMP code here.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/nsUpdateDriver.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/nsUpdateDriver.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/nsUpdateDriver.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/nsUpdateDriver.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -1170,8 +1170,6 @@
   }
 #endif
 
-  mUpdate = aUpdate;
-
   MOZ_ASSERT(NS_IsMainThread(), "not main thread");
   return NS_NewThread(getter_AddRefs(mProcessWatcher),
                       NS_NewRunnableMethod(this, &nsUpdateProcessor::StartStagedUpdate));
@@ -1215,7 +1213,6 @@
   MOZ_ASSERT(NS_IsMainThread(), "not main thread");
   mProcessWatcher->Shutdown();
   mProcessWatcher = nullptr;
-  mUpdate = nullptr;
 }
 
 void
@@ -1233,8 +1230,12 @@
 
   nsCOMPtr<nsIUpdateManager> um =
     do_GetService("@mozilla.org/updates/update-manager;1");
-  if (um && mUpdate) {
-    um->RefreshUpdateStatus(mUpdate);
+  if (um) {
+    nsCOMPtr<nsIUpdate> update;
+    um->GetActiveUpdate(getter_AddRefs(update));
+    if (update) {
+      um->RefreshUpdateStatus(update);
+    }
   }
 
   ShutdownWatcherThread();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/nsUpdateDriver.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/nsUpdateDriver.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/toolkit/xre/nsUpdateDriver.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/toolkit/xre/nsUpdateDriver.h	2015-02-28 15:03:09.000000000 +0000
@@ -105,7 +105,6 @@
 private:
   ProcessType mUpdaterPID;
   nsCOMPtr<nsIThread> mProcessWatcher;
-  nsCOMPtr<nsIUpdate> mUpdate;
   StagedUpdateInfo mInfo;
 };
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/ProfileEntry.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/ProfileEntry.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/ProfileEntry.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/ProfileEntry.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -89,55 +89,6 @@
   return mTagPtr;
 }
 
-void ProfileEntry::log()
-{
-  // There is no compiler enforced mapping between tag chars
-  // and union variant fields, so the following was derived
-  // by looking through all the use points of TableTicker.cpp.
-  //   mTagMarker (ProfilerMarker*) m
-  //   mTagData   (const char*)  c,s
-  //   mTagPtr    (void*)        d,l,L,B (immediate backtrace), S(start-of-stack),
-  //                             J (JIT code addr)
-  //   mTagInt    (int)          n,f,y, T (thread id)
-  //   mTagChar   (char)         h
-  //   mTagFloat  (double)       r,t,p,R (resident memory), U (unshared memory)
-  switch (mTagName) {
-    case 'm':
-      LOGF("%c \"%s\"", mTagName, mTagMarker->GetMarkerName()); break;
-    case 'c': case 's':
-      LOGF("%c \"%s\"", mTagName, mTagData); break;
-    case 'd': case 'l': case 'L': case 'J': case 'B': case 'S':
-      LOGF("%c %p", mTagName, mTagPtr); break;
-    case 'n': case 'f': case 'y': case 'T':
-      LOGF("%c %d", mTagName, mTagInt); break;
-    case 'h':
-      LOGF("%c \'%c\'", mTagName, mTagChar); break;
-    case 'r': case 't': case 'p': case 'R': case 'U':
-      LOGF("%c %f", mTagName, mTagFloat); break;
-    default:
-      LOGF("'%c' unknown_tag", mTagName); break;
-  }
-}
-
-std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry)
-{
-  if (entry.mTagName == 'r' || entry.mTagName == 't') {
-    stream << entry.mTagName << "-" << std::fixed << entry.mTagFloat << "\n";
-  } else if (entry.mTagName == 'l' || entry.mTagName == 'L') {
-    // Bug 739800 - Force l-tag addresses to have a "0x" prefix on all platforms
-    // Additionally, stringstream seemed to be ignoring formatter flags.
-    char tagBuff[1024];
-    unsigned long long pc = (unsigned long long)(uintptr_t)entry.mTagPtr;
-    snprintf(tagBuff, 1024, "%c-%#llx\n", entry.mTagName, pc);
-    stream << tagBuff;
-  } else if (entry.mTagName == 'd') {
-    // TODO implement 'd' tag for text profile
-  } else {
-    stream << entry.mTagName << "-" << entry.mTagData << "\n";
-  }
-  return stream;
-}
-
 // END ProfileEntry
 ////////////////////////////////////////////////////////////////////////
 
@@ -271,9 +222,13 @@
 
     mWriter.BeginObject();
       mWriter.NameValue("keyedBy", keyedBy);
-      mWriter.NameValue("name", name);
+      if (name) {
+        mWriter.NameValue("name", name);
+      }
       if (location) {
         mWriter.NameValue("location", location);
+      }
+      if (lineno != UINT32_MAX) {
         mWriter.NameValue("line", lineno);
       }
     mWriter.EndObject();
@@ -445,13 +400,17 @@
                         // TODOshu: cannot stream tracked optimization info if
                         // the JS engine has already shut down when streaming.
                         if (rt) {
+                          JSScript *optsScript;
+                          jsbytecode *optsPC;
                           b.Name("opts");
                           b.BeginArray();
                             StreamOptimizationTypeInfoOp typeInfoOp(b);
                             JS::ForEachTrackedOptimizationTypeInfo(rt, pc, typeInfoOp);
                             StreamOptimizationAttemptsOp attemptOp(b);
-                            JS::ForEachTrackedOptimizationAttempt(rt, pc, attemptOp);
+                            JS::ForEachTrackedOptimizationAttempt(rt, pc, attemptOp,
+                                                                  &optsScript, &optsPC);
                           b.EndArray();
+                          b.NameValue("optsLine", JS_PCToLineNumber(optsScript, optsPC));
                         }
                       }
                     b.EndObject();
@@ -539,23 +498,6 @@
   }
 }
 
-std::ostream&
-ProfileBuffer::StreamToOStream(std::ostream& stream, int aThreadId) const
-{
-  int readPos = mReadPos;
-  int currentThreadID = -1;
-  while (readPos != mWritePos) {
-    ProfileEntry entry = mEntries[readPos];
-    if (entry.mTagName == 'T') {
-      currentThreadID = entry.mTagInt;
-    } else if (currentThreadID == aThreadId) {
-      stream << mEntries[readPos];
-    }
-    readPos = (readPos + 1) % mEntrySize;
-  }
-  return stream;
-}
-
 // END ProfileBuffer
 ////////////////////////////////////////////////////////////////////////
 
@@ -676,10 +618,5 @@
   mBuffer->DuplicateLastSample(mThreadId);
 }
 
-std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile)
-{
-  return profile.mBuffer->StreamToOStream(stream, profile.mThreadId);
-}
-
 // END ThreadProfile
 ////////////////////////////////////////////////////////////////////////
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/ProfileEntry.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/ProfileEntry.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/ProfileEntry.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/ProfileEntry.h	2015-02-28 15:03:09.000000000 +0000
@@ -35,12 +35,10 @@
   ProfileEntry(char aTagName, Address aTagAddress);
   ProfileEntry(char aTagName, int aTagLine);
   ProfileEntry(char aTagName, char aTagChar);
-  friend std::ostream& operator<<(std::ostream& stream, const ProfileEntry& entry);
   bool is_ent_hint(char hintChar);
   bool is_ent_hint();
   bool is_ent(char tagName);
   void* get_tagPtr();
-  void log();
   const ProfilerMarker* getMarker() {
     MOZ_ASSERT(mTagName == 'm');
     return mTagMarker;
@@ -88,8 +86,6 @@
   void addStoredMarker(ProfilerMarker* aStoredMarker);
   void deleteExpiredStoredMarkers();
 
-  std::ostream& StreamToOStream(std::ostream& stream, int aThreadId) const;
-
 protected:
   char* processDynamicTag(int readPos, int* tagsConsumed, char* tagBuff);
   int FindLastSampleOfThread(int aThreadId);
@@ -132,8 +128,6 @@
   void addStoredMarker(ProfilerMarker *aStoredMarker);
 
   void IterateTags(IterateTagsCallback aCallback);
-  friend std::ostream& operator<<(std::ostream& stream,
-                                  const ThreadProfile& profile);
   void ToStreamAsJSON(std::ostream& stream);
   JSObject *ToJSObject(JSContext *aCx);
   PseudoStack* GetPseudoStack();
@@ -158,6 +152,12 @@
     mPseudoStack = nullptr;
     mPlatformData = nullptr;
   }
+
+  uint32_t bufferGeneration() const {
+    MOZ_ASSERT(mBuffer->mGeneration >= 0);
+    return mBuffer->mGeneration;
+  }
+
 private:
   FRIEND_TEST(ThreadProfile, InsertOneTag);
   FRIEND_TEST(ThreadProfile, InsertOneTagWithTinyBuffer);
@@ -188,6 +188,4 @@
   void StreamTrackedOptimizations(JSStreamWriter& b, void* addr, uint8_t index);
 };
 
-std::ostream& operator<<(std::ostream& stream, const ThreadProfile& profile);
-
 #endif /* ndef MOZ_PROFILE_ENTRY_H */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/TableTicker.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/TableTicker.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/TableTicker.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/TableTicker.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -486,6 +486,7 @@
   // like the native stack, the JS stack is iterated youngest-to-oldest and we
   // need to iterate oldest-to-youngest when adding entries to aProfile.
 
+  uint32_t startBufferGen = aProfile.bufferGeneration();
   uint32_t jsCount = 0;
   JS::ProfilingFrameIterator::Frame jsFrames[1000];
   {
@@ -500,7 +501,9 @@
       registerState.lr = aSample->lr;
 #endif
 
-      JS::ProfilingFrameIterator jsIter(pseudoStack->mRuntime, registerState);
+      JS::ProfilingFrameIterator jsIter(pseudoStack->mRuntime,
+                                        registerState,
+                                        startBufferGen);
       for (; jsCount < maxFrames && !jsIter.done(); ++jsIter) {
         uint32_t extracted = jsIter.extractStack(jsFrames, jsCount, maxFrames);
         MOZ_ASSERT(extracted <= (maxFrames - jsCount));
@@ -601,6 +604,16 @@
     aProfile.addTag(ProfileEntry('l', (void*)aNativeStack.pc_array[nativeIndex]));
     nativeIndex--;
   }
+
+  MOZ_ASSERT(aProfile.bufferGeneration() >= startBufferGen);
+  uint32_t lapCount = aProfile.bufferGeneration() - startBufferGen;
+
+  // Update the JS runtime with the current profile sample buffer generation.
+  if (pseudoStack->mRuntime) {
+    JS::UpdateJSRuntimeProfilerSampleBufferGen(pseudoStack->mRuntime,
+                                               aProfile.bufferGeneration(),
+                                               lapCount);
+  }
 }
 
 #ifdef USE_NS_STACKWALK
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/TableTicker.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/TableTicker.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/tools/profiler/TableTicker.h	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/tools/profiler/TableTicker.h	2015-02-28 15:03:09.000000000 +0000
@@ -77,6 +77,7 @@
     mTaskTracer = hasFeature(aFeatures, aFeatureCount, "tasktracer");
     mLayersDump = hasFeature(aFeatures, aFeatureCount, "layersdump");
     mDisplayListDump = hasFeature(aFeatures, aFeatureCount, "displaylistdump");
+    mProfileRestyle = hasFeature(aFeatures, aFeatureCount, "restyle");
 
 #if defined(XP_WIN)
     if (mProfilePower) {
@@ -210,6 +211,7 @@
   bool TaskTracer() const { return mTaskTracer; }
   bool LayersDump() const { return mLayersDump; }
   bool DisplayListDump() const { return mDisplayListDump; }
+  bool ProfileRestyle() const { return mProfileRestyle; }
 
 protected:
   // Called within a signal. This function must be reentrant
@@ -237,6 +239,7 @@
   bool mProfilePower;
   bool mLayersDump;
   bool mDisplayListDump;
+  bool mProfileRestyle;
 
   // Keep the thread filter to check against new thread that
   // are started while profiling
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/base/nsIURIContentListener.idl thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/base/nsIURIContentListener.idl
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/base/nsIURIContentListener.idl	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/base/nsIURIContentListener.idl	2015-02-28 15:03:09.000000000 +0000
@@ -16,7 +16,7 @@
  * a nsIURIContentListener for each of its content windows with the uri
  * dispatcher service. 
  */
-[scriptable, uuid(94928AB3-8B63-11d3-989D-001083010E9B)]
+[scriptable, uuid(10a28f38-32e8-4c63-8aa1-12eaaebc369a)]
 interface nsIURIContentListener : nsISupports
 {
  /**
@@ -52,7 +52,7 @@
   *                             continue handling the load and call the
   *                             returned streamlistener's methods. 
   */
-  boolean doContent(in string aContentType,
+  boolean doContent(in ACString aContentType,
                     in boolean aIsContentPreferred,
                     in nsIRequest aRequest,
                     out nsIStreamListener aContentHandler);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/base/nsURILoader.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/base/nsURILoader.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/base/nsURILoader.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/base/nsURILoader.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -723,7 +723,7 @@
   
   bool abort = false;
   bool isPreferred = (mFlags & nsIURILoader::IS_CONTENT_PREFERRED) != 0;
-  nsresult rv = aListener->DoContent(mContentType.get(),
+  nsresult rv = aListener->DoContent(mContentType,
                                      isPreferred,
                                      aChannel,
                                      getter_AddRefs(m_targetStreamListener),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp	2015-02-28 15:03:09.000000000 +0000
@@ -2702,18 +2702,13 @@
   if (found)
     return NS_OK;
 
-  const nsCString& flatExt = PromiseFlatCString(aFileExt);
   // Try the plugins
-  const char* mimeType;
-  nsCOMPtr<nsIPluginHost> pluginHostCOM(do_GetService(MOZ_PLUGIN_HOST_CONTRACTID, &rv));
-  nsPluginHost* pluginHost = static_cast<nsPluginHost*>(pluginHostCOM.get());
-  if (NS_SUCCEEDED(rv)) {
-    if (NS_SUCCEEDED(pluginHost->IsPluginEnabledForExtension(flatExt.get(), mimeType))) {
-      aContentType = mimeType;
-      return NS_OK;
-    }
+  nsRefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
+  if (pluginHost &&
+      pluginHost->HavePluginForExtension(aFileExt, aContentType)) {
+    return NS_OK;
   }
-  
+
   rv = NS_OK;
   // Let's see if an extension added something
   nsCOMPtr<nsICategoryManager> catMan(do_GetService("@mozilla.org/categorymanager;1"));
@@ -2730,7 +2725,7 @@
   else {
     rv = NS_ERROR_NOT_AVAILABLE;
   }
-  
+
   return rv;
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/tests/unit/test_handlerService.js thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/tests/unit/test_handlerService.js
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/tests/unit/test_handlerService.js	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/tests/unit/test_handlerService.js	2015-02-28 15:03:10.000000000 +0000
@@ -44,6 +44,20 @@
     regSvc.close();
   }
 
+  let isLinux = ("@mozilla.org/gio-service;1" in Components.classes);
+  if (isLinux) {
+    // Check mailto handler from GIO
+    // If there isn't one, then we have no mailto handler
+    let gIOSvc = Cc["@mozilla.org/gio-service;1"].
+                 createInstance(Ci.nsIGIOService);
+    try {
+      gIOSvc.getAppForURIScheme("mailto");
+      noMailto = false;
+    } catch (ex) {
+      noMailto = true;
+    }
+  }
+
   //**************************************************************************//
   // Sample Data
 
@@ -157,7 +171,7 @@
   else
     do_check_eq(0, protoInfo.possibleApplicationHandlers.length);
 
-  // Win7+ might not have a default mailto: handler
+  // Win7+ or Linux's GIO might not have a default mailto: handler
   if (noMailto)
     do_check_true(protoInfo.alwaysAskBeforeHandling);
   else
@@ -168,7 +182,7 @@
   protoInfo = protoSvc.getProtocolHandlerInfo("mailto");
   if (haveDefaultHandlersVersion) {
     do_check_eq(2, protoInfo.possibleApplicationHandlers.length);
-    // Win7+ might not have a default mailto: handler, but on other platforms
+    // Win7+ or Linux's GIO may have no default mailto: handler. Otherwise
     // alwaysAskBeforeHandling is expected to be false here, because although
     // the pref is true, the value in RDF is false. The injected mailto handler
     // carried over the default pref value, and so when we set the pref above
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -6,97 +6,50 @@
 #include "nsGNOMERegistry.h"
 #include "nsString.h"
 #include "nsIComponentManager.h"
-#include "nsIFile.h"
 #include "nsMIMEInfoUnix.h"
 #include "nsAutoPtr.h"
-#include "nsIGConfService.h"
-#include "nsIGnomeVFSService.h"
 #include "nsIGIOService.h"
 
-#ifdef MOZ_WIDGET_GTK
-#include <glib.h>
-#include <glib-object.h>
-#endif
-
 /* static */ bool
 nsGNOMERegistry::HandlerExists(const char *aProtocolScheme)
 {
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (giovfs) {
-    nsCOMPtr<nsIGIOMimeApp> app;
-    if (NS_FAILED(giovfs->GetAppForURIScheme(nsDependentCString(aProtocolScheme),
-                                             getter_AddRefs(app))))
-      return false;
-    else
-      return true;
-  } else if (gconf) {
-    bool isEnabled;
-    nsAutoCString handler;
-    if (NS_FAILED(gconf->GetAppForProtocol(nsDependentCString(aProtocolScheme), &isEnabled, handler)))
-      return false;
-
-    return isEnabled;
+  if (!giovfs) {
+    return false;
   }
 
-  return false;
+  nsCOMPtr<nsIGIOMimeApp> app;
+  return NS_SUCCEEDED(giovfs->GetAppForURIScheme(nsDependentCString(aProtocolScheme),
+                                                 getter_AddRefs(app)));
 }
 
 // XXX Check HandlerExists() before calling LoadURL.
-//
-// If there is not a registered handler for the protocol, gnome_url_show()
-// falls back to using gnomevfs modules.  See bug 389632.  We don't want
-// this fallback to happen as we are not sure of the safety of all gnomevfs
-// modules and MIME-default applications.  (gnomevfs should be handled in
-// nsGnomeVFSProtocolHandler.)
 
 /* static */ nsresult
 nsGNOMERegistry::LoadURL(nsIURI *aURL)
 {
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  if (giovfs)
-    return giovfs->ShowURI(aURL);
-
-  nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-  if (gnomevfs)
-    return gnomevfs->ShowURI(aURL);
+  if (!giovfs) {
+    return NS_ERROR_FAILURE;
+  }
 
-  return NS_ERROR_FAILURE;
+  return giovfs->ShowURI(aURL);
 }
 
 /* static */ void
 nsGNOMERegistry::GetAppDescForScheme(const nsACString& aScheme,
                                      nsAString& aDesc)
 {
-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  if (!gconf && !giovfs)
+  if (!giovfs)
     return;
 
   nsAutoCString name;
-  if (giovfs) {
-    nsCOMPtr<nsIGIOMimeApp> app;
-    if (NS_FAILED(giovfs->GetAppForURIScheme(aScheme, getter_AddRefs(app))))
-      return;
-
-    app->GetName(name);
-  } else {
-    bool isEnabled;
-    if (NS_FAILED(gconf->GetAppForProtocol(aScheme, &isEnabled, name)))
-      return;
-
-    if (!name.IsEmpty()) {
-      // Try to only provide the executable name, as it is much simpler than with the path and arguments
-      int32_t firstSpace = name.FindChar(' ');
-      if (firstSpace != kNotFound) {
-        name.Truncate(firstSpace);
-        int32_t lastSlash = name.RFindChar('/');
-        if (lastSlash != kNotFound) {
-          name.Cut(0, lastSlash + 1);
-        }
-      }
-    }
-  }
+  nsCOMPtr<nsIGIOMimeApp> app;
+  if (NS_FAILED(giovfs->GetAppForURIScheme(aScheme, getter_AddRefs(app))))
+    return;
+
+  app->GetName(name);
 
   CopyUTF8toUTF16(name, aDesc);
 }
@@ -107,23 +60,15 @@
 {
   nsAutoCString mimeType;
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+  if (!giovfs) {
+    return nullptr;
+  }
 
-  if (giovfs) {
-    // Get the MIME type from the extension, then call GetFromType to
-    // fill in the MIMEInfo.
-    if (NS_FAILED(giovfs->GetMimeTypeFromExtension(aFileExt, mimeType)) ||
-        mimeType.EqualsLiteral("application/octet-stream")) {
-      return nullptr;
-    }
-  } else {
-    /* Fallback to GnomeVFS */
-    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-    if (!gnomevfs)
-      return nullptr;
-
-    if (NS_FAILED(gnomevfs->GetMimeTypeFromExtension(aFileExt, mimeType)) ||
-        mimeType.EqualsLiteral("application/octet-stream"))
-      return nullptr;
+  // Get the MIME type from the extension, then call GetFromType to
+  // fill in the MIMEInfo.
+  if (NS_FAILED(giovfs->GetMimeTypeFromExtension(aFileExt, mimeType)) ||
+      mimeType.EqualsLiteral("application/octet-stream")) {
+    return nullptr;
   }
 
   nsRefPtr<nsMIMEInfoBase> mi = GetFromType(mimeType);
@@ -144,28 +89,17 @@
   nsAutoCString description;
 
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  if (giovfs) {
-    nsCOMPtr<nsIGIOMimeApp> gioHandlerApp;
-    if (NS_FAILED(giovfs->GetAppForMimeType(aMIMEType, getter_AddRefs(gioHandlerApp))) ||
-        !gioHandlerApp) {
-      return nullptr;
-    }
-    gioHandlerApp->GetName(name);
-    giovfs->GetDescriptionForMimeType(aMIMEType, description);
-  } else {
-    /* Fallback to GnomeVFS*/
-    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-    if (!gnomevfs)
-      return nullptr;
-
-    nsCOMPtr<nsIGnomeVFSMimeApp> gnomeHandlerApp;
-    if (NS_FAILED(gnomevfs->GetAppForMimeType(aMIMEType, getter_AddRefs(gnomeHandlerApp))) ||
-        !gnomeHandlerApp) {
-      return nullptr;
-    }
-    gnomeHandlerApp->GetName(name);
-    gnomevfs->GetDescriptionForMimeType(aMIMEType, description);
+  if (!giovfs) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIGIOMimeApp> gioHandlerApp;
+  if (NS_FAILED(giovfs->GetAppForMimeType(aMIMEType, getter_AddRefs(gioHandlerApp))) ||
+      !gioHandlerApp) {
+    return nullptr;
   }
+  gioHandlerApp->GetName(name);
+  giovfs->GetDescriptionForMimeType(aMIMEType, description);
 
   mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(name));
   mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsIGIOService.h"
 #include "nsNetCID.h"
 #include "nsIIOService.h"
-#include "nsIGnomeVFSService.h"
 #include "nsAutoPtr.h"
 #ifdef MOZ_ENABLE_DBUS
 #include "nsDBusHandlerApp.h"
@@ -50,7 +49,7 @@
 
   *_retval = false;
 
-  if (mClass ==  eProtocolInfo) {
+  if (mClass == eProtocolInfo) {
     *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
   } else {
     nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
@@ -104,51 +103,26 @@
 #endif
 
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  nsAutoCString uriSpec;
-  if (giovfs) {
-    // nsGIOMimeApp->Launch wants a URI string instead of local file
-    nsresult rv;
-    nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsCOMPtr<nsIURI> uri;
-    rv = ioservice->NewFileURI(aFile, getter_AddRefs(uri));
-    NS_ENSURE_SUCCESS(rv, rv);
-    uri->GetSpec(uriSpec);
-  }
-
-  nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-  if (giovfs) {
-    nsCOMPtr<nsIGIOMimeApp> app;
-    if (NS_SUCCEEDED(giovfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
-      return app->Launch(uriSpec);
-  } else if (gnomevfs) {
-    /* Fallback to GnomeVFS */
-    nsCOMPtr<nsIGnomeVFSMimeApp> app;
-    if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
-      return app->Launch(nativePath);
-  }
-
-  // If we haven't got an app we try to get a valid one by searching for the
-  // extension mapped type
-  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
-  if (mimeInfo) {
-    nsAutoCString type;
-    mimeInfo->GetType(type);
-    if (giovfs) {
-      nsCOMPtr<nsIGIOMimeApp> app;
-      if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
-        return app->Launch(uriSpec);
-    } else if (gnomevfs) {
-      nsCOMPtr<nsIGnomeVFSMimeApp> app;
-      if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
-        return app->Launch(nativePath);
-    }
+  if (!giovfs) {
+    return NS_ERROR_FAILURE;
   }
 
-  if (!mDefaultApplication)
+  // nsGIOMimeApp->Launch wants a URI string instead of local file
+  nsresult rv;
+  nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsIURI> uri;
+  rv = ioservice->NewFileURI(aFile, getter_AddRefs(uri));
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsAutoCString uriSpec;
+  uri->GetSpec(uriSpec);
+
+  nsCOMPtr<nsIGIOMimeApp> app;
+  if (NS_FAILED(giovfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) || !app) {
     return NS_ERROR_FILE_NOT_FOUND;
+  }
 
-  return LaunchWithIProcess(mDefaultApplication, nativePath);
+  return app->Launch(uriSpec);
 }
 
 #if defined(MOZ_ENABLE_CONTENTACTION)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2015-02-19 00:42:14.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -1150,7 +1150,7 @@
 #endif
 
 #ifdef MOZ_WIDGET_GTK
-  // Check the GConf registry for a protocol handler
+  // Check the GNOME registry for a protocol handler
   *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 #endif
 
@@ -1369,22 +1369,6 @@
           NS_LossyConvertUTF16toASCII(handler).get(),
           NS_LossyConvertUTF16toASCII(mailcap_description).get()));
 
-#ifdef MOZ_WIDGET_GTK
-  nsRefPtr<nsMIMEInfoBase> gnomeInfo;
-  if (handler.IsEmpty()) {
-    // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
-    // GNOME versions no longer have type-to-extension mappings, so we might
-    // get back a MIMEInfo without any extensions set.  In that case we'll have
-    // to look in our mime.types files for the extensions.
-    LOG(("Looking in GNOME registry\n"));
-    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
-    if (gnomeInfo && gnomeInfo->HasExtensions()) {
-      LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
-      return gnomeInfo.forget();
-    }
-  }
-#endif
-
   // Now look up our extensions
   nsAutoString extensions, mime_types_description;
   LookUpExtensionsAndDescription(majorType,
@@ -1393,13 +1377,16 @@
                                  mime_types_description);
 
 #ifdef MOZ_WIDGET_GTK
-  if (gnomeInfo) {
-    LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
-         "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
-
-    NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
-    gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
-    return gnomeInfo.forget();
+  if (handler.IsEmpty()) {
+    nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
+    if (gnomeInfo) {
+      LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
+           "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
+
+      NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
+      gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
+      return gnomeInfo.forget();
+    }
   }
 #endif
 
@@ -1526,9 +1513,6 @@
 {
   NS_ASSERTION(!aScheme.IsEmpty(), "No scheme was specified!");
 
-  // We must check that a registered handler exists so that gnome_url_show
-  // doesn't fallback to gnomevfs.
-  // See nsGNOMERegistry::LoadURL and bug 389632.
   nsresult rv = OSProtocolHandlerExists(nsPromiseFlatCString(aScheme).get(),
                                         found);
   if (NS_FAILED(rv))
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/prefetch/nsPrefetchService.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/prefetch/nsPrefetchService.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/uriloader/prefetch/nsPrefetchService.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/uriloader/prefetch/nsPrefetchService.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -9,7 +9,7 @@
 #include "nsIObserverService.h"
 #include "nsIWebProgress.h"
 #include "nsCURILoader.h"
-#include "nsICachingChannel.h"
+#include "nsICacheInfoChannel.h"
 #include "nsIHttpChannel.h"
 #include "nsIURL.h"
 #include "nsISimpleEnumerator.h"
@@ -246,13 +246,13 @@
 {
     nsresult rv;
 
-    nsCOMPtr<nsICachingChannel> cachingChannel =
+    nsCOMPtr<nsICacheInfoChannel> cacheInfoChannel =
         do_QueryInterface(aRequest, &rv);
     if (NS_FAILED(rv)) return rv;
-
+ 
     // no need to prefetch a document that is already in the cache
     bool fromCache;
-    if (NS_SUCCEEDED(cachingChannel->IsFromCache(&fromCache)) &&
+    if (NS_SUCCEEDED(cacheInfoChannel->IsFromCache(&fromCache)) &&
         fromCache) {
         LOG(("document is already in the cache; canceling prefetch\n"));
         return NS_BINDING_ABORTED;
@@ -262,17 +262,8 @@
     // no need to prefetch a document that must be requested fresh each
     // and every time.
     //
-    nsCOMPtr<nsISupports> cacheToken;
-    cachingChannel->GetCacheToken(getter_AddRefs(cacheToken));
-    if (!cacheToken)
-        return NS_ERROR_ABORT; // bail, no cache entry
-
-    nsCOMPtr<nsICacheEntry> entryInfo =
-        do_QueryInterface(cacheToken, &rv);
-    if (NS_FAILED(rv)) return rv;
-
     uint32_t expTime;
-    if (NS_SUCCEEDED(entryInfo->GetExpirationTime(&expTime))) {
+    if (NS_SUCCEEDED(cacheInfoChannel->GetCacheTokenExpirationTime(&expTime))) {
         if (NowInSeconds() >= expTime) {
             LOG(("document cannot be reused from cache; "
                  "canceling prefetch\n"));
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/webapprt/locales/en-US/webapprt/overrides/appstrings.properties	2015-02-28 15:03:10.000000000 +0000
@@ -33,3 +33,4 @@
 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.
 remoteXUL=This application tried to use an unsupported technology that is no longer available.
+sslv3Used=This application cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/AndroidBridge.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/AndroidBridge.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/AndroidBridge.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/AndroidBridge.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -50,7 +50,7 @@
 using namespace mozilla::jni;
 using namespace mozilla::widget;
 
-AndroidBridge* AndroidBridge::sBridge;
+AndroidBridge* AndroidBridge::sBridge = nullptr;
 pthread_t AndroidBridge::sJavaUiThread = -1;
 static unsigned sJavaEnvThreadIndex = 0;
 static jobject sGlobalContext = nullptr;
@@ -161,14 +161,12 @@
 
     PR_NewThreadPrivateIndex(&sJavaEnvThreadIndex, JavaThreadDetachFunc);
 
-    AndroidBridge *bridge = new AndroidBridge();
-    if (!bridge->Init(jEnv, clsLoader)) {
-        delete bridge;
-    }
-    sBridge = bridge;
+    MOZ_ASSERT(!sBridge);
+    sBridge = new AndroidBridge;
+    sBridge->Init(jEnv, clsLoader); // Success or crash
 }
 
-bool
+void
 AndroidBridge::Init(JNIEnv *jEnv, Object::Param clsLoader)
 {
     ALOG_BRIDGE("AndroidBridge::Init");
@@ -244,8 +242,6 @@
     // jEnv should NOT be cached here by anything -- the jEnv here
     // is not valid for the real gecko main thread, which is set
     // at SetMainThread time.
-
-    return true;
 }
 
 bool
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/AndroidBridge.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/AndroidBridge.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/AndroidBridge.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/AndroidBridge.h	2015-02-28 15:03:10.000000000 +0000
@@ -364,7 +364,7 @@
     ~AndroidBridge();
 
     void InitStubs(JNIEnv *jEnv);
-    bool Init(JNIEnv *jEnv, jni::Object::Param clsLoader);
+    void Init(JNIEnv *jEnv, jni::Object::Param clsLoader);
 
     bool mOpenedGraphicsLibraries;
     void OpenGraphicsLibraries();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/AndroidJavaWrappers.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/AndroidJavaWrappers.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/AndroidJavaWrappers.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/AndroidJavaWrappers.h	2015-02-28 15:03:10.000000000 +0000
@@ -36,15 +36,6 @@
 
 void InitAndroidJavaWrappers(JNIEnv *jEnv);
 
-/*
- * Note: do not store global refs to any WrappedJavaObject;
- * these are live only during a particular JNI method, as
- * NewGlobalRef is -not- called on the jobject.
- *
- * If this is needed, WrappedJavaObject can be extended to
- * handle it.
- */
-
 class RefCountedJavaObject {
 public:
     RefCountedJavaObject(JNIEnv* env, jobject obj) : mRefCnt(0), mObject(env->NewGlobalRef(obj)) {}
@@ -66,6 +57,14 @@
     jobject mObject;
 };
 
+/*
+ * Note: do not store global refs to any WrappedJavaObject;
+ * these are live only during a particular JNI method, as
+ * NewGlobalRef is -not- called on the jobject.
+ *
+ * If this is needed, WrappedJavaObject can be extended to
+ * handle it.
+ */
 class WrappedJavaObject {
 public:
     WrappedJavaObject() :
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/GfxInfo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/GfxInfo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/GfxInfo.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/GfxInfo.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -41,8 +41,9 @@
     return mVendor;
   }
 
+  // This spoofed value wins, even if the environment variable
+  // MOZ_GFX_SPOOF_GL_VENDOR was set.
   void SpoofVendor(const nsCString& s) {
-    EnsureInitialized();
     mVendor = s;
   }
 
@@ -51,8 +52,9 @@
     return mRenderer;
   }
 
+  // This spoofed value wins, even if the environment variable
+  // MOZ_GFX_SPOOF_GL_RENDERER was set.
   void SpoofRenderer(const nsCString& s) {
-    EnsureInitialized();
     mRenderer = s;
   }
 
@@ -61,8 +63,9 @@
     return mVersion;
   }
 
+  // This spoofed value wins, even if the environment variable
+  // MOZ_GFX_SPOOF_GL_VERSION was set.
   void SpoofVersion(const nsCString& s) {
-    EnsureInitialized();
     mVersion = s;
   }
 
@@ -85,21 +88,32 @@
 
     gl->MakeCurrent();
 
-    const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR");
-    if (spoofedVendor)
+    if (mVendor.IsEmpty()) {
+      const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR");
+      if (spoofedVendor) {
         mVendor.Assign(spoofedVendor);
-    else
+      } else {
         mVendor.Assign((const char*)gl->fGetString(LOCAL_GL_VENDOR));
-    const char *spoofedRenderer = PR_GetEnv("MOZ_GFX_SPOOF_GL_RENDERER");
-    if (spoofedRenderer)
+      }
+    }
+
+    if (mRenderer.IsEmpty()) {
+      const char *spoofedRenderer = PR_GetEnv("MOZ_GFX_SPOOF_GL_RENDERER");
+      if (spoofedRenderer) {
         mRenderer.Assign(spoofedRenderer);
-    else
+      } else {
         mRenderer.Assign((const char*)gl->fGetString(LOCAL_GL_RENDERER));
-    const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION");
-    if (spoofedVersion)
+      }
+    }
+
+    if (mVersion.IsEmpty()) {
+      const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION");
+      if (spoofedVersion) {
         mVersion.Assign(spoofedVersion);
-    else
+      } else {
         mVersion.Assign((const char*)gl->fGetString(LOCAL_GL_VERSION));
+      }
+    }
 
     mReady = true;
   }
@@ -153,9 +167,10 @@
   if (mInitialized)
     return;
 
-  mGLStrings->EnsureInitialized();
-
-  MOZ_ASSERT(mozilla::AndroidBridge::Bridge());
+  if (!mozilla::AndroidBridge::Bridge()) {
+    gfxWarning() << "AndroidBridge missing during initialization";
+    return;
+  }
 
   if (mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build", "MODEL", mModel)) {
     mAdapterDescription.AppendPrintf("Model: %s",  NS_LossyConvertUTF16toASCII(mModel).get());
@@ -601,7 +616,6 @@
 /* void spoofVendorID (in DOMString aVendorID); */
 NS_IMETHODIMP GfxInfo::SpoofVendorID(const nsAString & aVendorID)
 {
-  EnsureInitialized();
   mGLStrings->SpoofVendor(NS_LossyConvertUTF16toASCII(aVendorID));
   return NS_OK;
 }
@@ -609,7 +623,6 @@
 /* void spoofDeviceID (in unsigned long aDeviceID); */
 NS_IMETHODIMP GfxInfo::SpoofDeviceID(const nsAString & aDeviceID)
 {
-  EnsureInitialized();
   mGLStrings->SpoofRenderer(NS_LossyConvertUTF16toASCII(aDeviceID));
   return NS_OK;
 }
@@ -617,7 +630,6 @@
 /* void spoofDriverVersion (in DOMString aDriverVersion); */
 NS_IMETHODIMP GfxInfo::SpoofDriverVersion(const nsAString & aDriverVersion)
 {
-  EnsureInitialized();
   mGLStrings->SpoofVersion(NS_LossyConvertUTF16toASCII(aDriverVersion));
   return NS_OK;
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/nsWidgetFactory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/nsWidgetFactory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/nsWidgetFactory.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/nsWidgetFactory.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/WidgetUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsWidgetsCID.h"
@@ -109,6 +110,9 @@
 static void
 nsWidgetAndroidModuleDtor()
 {
+    // Shutdown all XP level widget classes.
+    mozilla::widget::WidgetUtils::Shutdown();
+
     nsLookAndFeel::Shutdown();
     nsAppShellShutdown();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/nsWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/nsWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/android/nsWindow.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/android/nsWindow.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -1375,7 +1375,6 @@
         case AKEYCODE_ENDCALL:
         case AKEYCODE_NUM:                // XXX Not sure
         case AKEYCODE_HEADSETHOOK:
-        case AKEYCODE_FOCUS:
         case AKEYCODE_NOTIFICATION:       // XXX Not sure
         case AKEYCODE_PICTSYMBOLS:
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/BasicEvents.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/BasicEvents.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/BasicEvents.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/BasicEvents.h	2015-02-28 15:03:10.000000000 +0000
@@ -937,12 +937,14 @@
   MODIFIER_CAPSLOCK   = 0x0004,
   MODIFIER_CONTROL    = 0x0008,
   MODIFIER_FN         = 0x0010,
-  MODIFIER_META       = 0x0020,
-  MODIFIER_NUMLOCK    = 0x0040,
-  MODIFIER_SCROLLLOCK = 0x0080,
-  MODIFIER_SHIFT      = 0x0100,
-  MODIFIER_SYMBOLLOCK = 0x0200,
-  MODIFIER_OS         = 0x0400
+  MODIFIER_FNLOCK     = 0x0020,
+  MODIFIER_META       = 0x0040,
+  MODIFIER_NUMLOCK    = 0x0080,
+  MODIFIER_SCROLLLOCK = 0x0100,
+  MODIFIER_SHIFT      = 0x0200,
+  MODIFIER_SYMBOL     = 0x0400,
+  MODIFIER_SYMBOLLOCK = 0x0800,
+  MODIFIER_OS         = 0x1000
 };
 
 /******************************************************************************
@@ -954,10 +956,12 @@
 #define NS_DOM_KEYNAME_CAPSLOCK   "CapsLock"
 #define NS_DOM_KEYNAME_CONTROL    "Control"
 #define NS_DOM_KEYNAME_FN         "Fn"
+#define NS_DOM_KEYNAME_FNLOCK     "FnLock"
 #define NS_DOM_KEYNAME_META       "Meta"
 #define NS_DOM_KEYNAME_NUMLOCK    "NumLock"
 #define NS_DOM_KEYNAME_SCROLLLOCK "ScrollLock"
 #define NS_DOM_KEYNAME_SHIFT      "Shift"
+#define NS_DOM_KEYNAME_SYMBOL     "Symbol"
 #define NS_DOM_KEYNAME_SYMBOLLOCK "SymbolLock"
 #define NS_DOM_KEYNAME_OS         "OS"
 
@@ -1012,6 +1016,11 @@
    */
   static Modifier AccelModifier();
 
+  /**
+   * GetModifier() returns a modifier flag which is activated by aDOMKeyName.
+   */
+  static Modifier GetModifier(const nsAString& aDOMKeyName);
+
   // true indicates the accel key on the environment is down
   bool IsAccel() const
   {
@@ -1051,29 +1060,42 @@
   {
     return ((modifiers & MODIFIER_ALTGRAPH) != 0);
   }
-  // true indeicates the CapLock LED is turn on.
+  // true indicates the CapLock LED is turn on.
   bool IsCapsLocked() const
   {
     return ((modifiers & MODIFIER_CAPSLOCK) != 0);
   }
-  // true indeicates the NumLock LED is turn on.
+  // true indicates the NumLock LED is turn on.
   bool IsNumLocked() const
   {
     return ((modifiers & MODIFIER_NUMLOCK) != 0);
   }
-  // true indeicates the ScrollLock LED is turn on.
+  // true indicates the ScrollLock LED is turn on.
   bool IsScrollLocked() const
   {
     return ((modifiers & MODIFIER_SCROLLLOCK) != 0);
   }
 
-  // true indeicates the Fn key is down, but this is not supported by native
+  // true indicates the Fn key is down, but this is not supported by native
   // key event on any platform.
   bool IsFn() const
   {
     return ((modifiers & MODIFIER_FN) != 0);
   }
-  // true indeicates the ScrollLock LED is turn on.
+  // true indicates the FnLock LED is turn on, but we don't know such
+  // keyboards nor platforms.
+  bool IsFnLocked() const
+  {
+    return ((modifiers & MODIFIER_FNLOCK) != 0);
+  }
+  // true indicates the Symbol is down, but this is not supported by native
+  // key event on any platforms.
+  bool IsSymbol() const
+  {
+    return ((modifiers & MODIFIER_SYMBOL) != 0);
+  }
+  // true indicates the SymbolLock LED is turn on, but we don't know such
+  // keyboards nor platforms.
   bool IsSymbolLocked() const
   {
     return ((modifiers & MODIFIER_SYMBOLLOCK) != 0);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/ComplexTextInputPanel.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/ComplexTextInputPanel.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/ComplexTextInputPanel.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/ComplexTextInputPanel.h	2015-02-28 15:03:10.000000000 +0000
@@ -36,8 +36,10 @@
 public:
   static ComplexTextInputPanel* GetSharedComplexTextInputPanel();
   virtual void PlacePanel(int32_t x, int32_t y) = 0; // Bottom left coordinate of plugin in screen coords
-  virtual void InterpretKeyEvent(NPCocoaEvent* aEvent, nsAString& aOutText) = 0;
+  virtual void InterpretKeyEvent(void* aEvent, nsAString& aOutText) = 0;
   virtual bool IsInComposition() = 0;
+  virtual void* GetInputContext() = 0;
+  virtual void CancelComposition() = 0;
 
 protected:
   virtual ~ComplexTextInputPanel() {};
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/ComplexTextInputPanel.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/ComplexTextInputPanel.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/ComplexTextInputPanel.mm	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/ComplexTextInputPanel.mm	2015-02-28 15:03:10.000000000 +0000
@@ -132,23 +132,8 @@
 {
   *string = nil;
 
-  if (!nsCocoaFeatures::OnMountainLionOrLater()) {
-    // This "works" on OS X 10.7 and below, but at the cost of breaking plugin
-    // IME, even in non-e10s mode: In an IME like Kotoeri Hiragana, every key
-    // gets sent to the plugin individually.
-    if (![[mInputTextView inputContext] handleEvent:event]) {
-      return;
-    }
-  } else {
-    // On OS X 10.8 and above we can't use -[NSTextInputContext handleEvent:]
-    // -- it doesn't work with a synthesized event. We need to activate the
-    // input context and call TSMProcessRawKeyEvent instead. This also allows
-    // plugin IME to work properly in non-e10s mode.
-    [[mInputTextView inputContext] activate];
-    OSErr err = TSMProcessRawKeyEvent((EventRef)[event eventRef]);
-    if (err != noErr) {
-      return;
-    }
+  if (![[mInputTextView inputContext] handleEvent:event]) {
+    return;
   }
 
   if ([mInputTextView hasMarkedText]) {
@@ -222,9 +207,12 @@
 public:
   ComplexTextInputPanelPrivate();
 
-  virtual void InterpretKeyEvent(NPCocoaEvent* aEvent, nsAString& aOutText);
+  virtual void InterpretKeyEvent(void* aEvent, nsAString& aOutText);
   virtual bool IsInComposition();
   virtual void PlacePanel(int32_t x, int32_t y);
+  virtual void* GetInputContext() { return [mPanel inputContext]; }
+  virtual void CancelComposition() { [mPanel cancelComposition]; }
+
 private:
   ~ComplexTextInputPanelPrivate();
   ComplexTextInputPanelImpl* mPanel;
@@ -251,21 +239,10 @@
 }
 
 void
-ComplexTextInputPanelPrivate::InterpretKeyEvent(NPCocoaEvent* aEvent, nsAString& aOutText)
+ComplexTextInputPanelPrivate::InterpretKeyEvent(void* aEvent, nsAString& aOutText)
 {
-  NSEvent* nativeEvent = [NSEvent keyEventWithType:NSKeyDown
-                                          location:NSMakePoint(0,0)
-                                     modifierFlags:aEvent->data.key.modifierFlags
-                                         timestamp:0
-                                      windowNumber:[mPanel windowNumber]
-                                           context:[mPanel graphicsContext]
-                                        characters:(NSString*)aEvent->data.key.characters
-                       charactersIgnoringModifiers:(NSString*)aEvent->data.key.charactersIgnoringModifiers
-                                         isARepeat:aEvent->data.key.isARepeat
-                                           keyCode:aEvent->data.key.keyCode];
-
   NSString* textString = nil;
-  [mPanel interpretKeyEvent:nativeEvent string:&textString];
+  [mPanel interpretKeyEvent:(NSEvent*)aEvent string:&textString];
 
   if (textString) {
     nsCocoaUtils::GetStringForNSString(textString, aOutText);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsChildView.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsChildView.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsChildView.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsChildView.h	2015-02-28 15:03:10.000000000 +0000
@@ -183,6 +183,9 @@
   // when mouseDown: is called, we store its event here (strong)
   NSEvent* mLastMouseDownEvent;
 
+  // Needed for IME support in e10s mode.  Strong.
+  NSEvent* mLastKeyDownEvent;
+
   // Whether the last mouse down event was blocked from Gecko.
   BOOL mBlockedLastMouseDown;
 
@@ -312,6 +315,8 @@
 #endif
 
 - (void)setUsingOMTCompositor:(BOOL)aUseOMTC;
+
+- (NSEvent*)lastKeyDownEvent;
 @end
 
 class ChildViewMouseTracker {
@@ -527,6 +532,14 @@
 
   APZCTreeManager* APZCTM() { return mAPZC ; }
 
+  NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
+                            int32_t aPanelX, int32_t aPanelY,
+                            nsString& aCommitted) MOZ_OVERRIDE;
+
+  NS_IMETHOD SetPluginFocused(bool& aFocused);
+
+  bool IsPluginFocused() { return mPluginFocused; }
+
 protected:
   virtual ~nsChildView();
 
@@ -627,6 +640,8 @@
   bool                  mDrawing;
   bool                  mIsDispatchPaint; // Is a paint event being dispatched
 
+  bool mPluginFocused;
+
   // Used in OMTC BasicLayers mode. Presents the BasicCompositor result
   // surface to the screen using an OpenGL context.
   nsAutoPtr<GLPresenter> mGLPresenter;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsChildView.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsChildView.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsChildView.mm	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsChildView.mm	2015-02-28 15:03:10.000000000 +0000
@@ -44,6 +44,7 @@
 #include "nsMenuUtilsX.h"
 #include "nsMenuBarX.h"
 #include "NativeKeyBindings.h"
+#include "ComplexTextInputPanel.h"
 
 #include "gfxContext.h"
 #include "gfxQuartzSurface.h"
@@ -543,6 +544,8 @@
   NS_ASSERTION(!mTextInputHandler, "mTextInputHandler has already existed");
   mTextInputHandler = new TextInputHandler(this, mView);
 
+  mPluginFocused = false;
+
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -1617,6 +1620,48 @@
   }
 }
 
+NS_IMETHODIMP
+nsChildView::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
+                            int32_t aPanelX, int32_t aPanelY,
+                            nsString& aCommitted)
+{
+  NS_ENSURE_TRUE(mView, NS_ERROR_NOT_AVAILABLE);
+
+  ComplexTextInputPanel* ctiPanel =
+    ComplexTextInputPanel::GetSharedComplexTextInputPanel();
+
+  ctiPanel->PlacePanel(aPanelX, aPanelY);
+  // We deliberately don't use TextInputHandler::GetCurrentKeyEvent() to
+  // obtain the NSEvent* we pass to InterpretKeyEvent().  This works fine in
+  // non-e10s mode.  But in e10s mode TextInputHandler::HandleKeyDownEvent()
+  // has already returned, so the relevant KeyEventState* (and its NSEvent*)
+  // is already out of scope.  Furthermore we don't *need* to use it.
+  // StartPluginIME() is only ever called to start a new IME session when none
+  // currently exists.  So nested IME should never reach here, and so it should
+  // be fine to use the last key-down event received by -[ChildView keyDown:]
+  // (as we currently do).
+  ctiPanel->InterpretKeyEvent([mView lastKeyDownEvent], aCommitted);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsChildView::SetPluginFocused(bool& aFocused)
+{
+  if (aFocused == mPluginFocused) {
+    return NS_OK;
+  }
+  if (!aFocused) {
+    ComplexTextInputPanel* ctiPanel =
+      ComplexTextInputPanel::GetSharedComplexTextInputPanel();
+    if (ctiPanel) {
+      ctiPanel->CancelComposition();
+    }
+  }
+  mPluginFocused = aFocused;
+  return NS_OK;
+}
+
 NS_IMETHODIMP_(void)
 nsChildView::SetInputContext(const InputContext& aContext,
                              const InputContextAction& aAction)
@@ -2901,6 +2946,7 @@
     mExpectingWheelStop = NO;
 
     mLastMouseDownEvent = nil;
+    mLastKeyDownEvent = nil;
     mClickThroughMouseDownEvent = nil;
     mDragService = nullptr;
 
@@ -2955,6 +3001,26 @@
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
+// ComplexTextInputPanel's interpretKeyEvent hack won't work without this.
+// It makes calls to +[NSTextInputContext currentContext], deep in system
+// code, return the appropriate context.
+- (NSTextInputContext *)inputContext
+{
+  NSTextInputContext* pluginContext = NULL;
+  if (mGeckoChild && mGeckoChild->IsPluginFocused()) {
+    ComplexTextInputPanel* ctiPanel =
+      ComplexTextInputPanel::GetSharedComplexTextInputPanel();
+    if (ctiPanel) {
+      pluginContext = (NSTextInputContext*) ctiPanel->GetInputContext();
+    }
+  }
+  if (pluginContext) {
+    return pluginContext;
+  } else {
+    return [super inputContext];
+  }
+}
+
 - (void)installTextInputHandler:(TextInputHandler*)aHandler
 {
   mTextInputHandler = aHandler;
@@ -3032,6 +3098,7 @@
   [mGLContext release];
   [mPendingDirtyRects release];
   [mLastMouseDownEvent release];
+  [mLastKeyDownEvent release];
   [mClickThroughMouseDownEvent release];
   CGImageRelease(mTopLeftCornerMask);
   ChildViewMouseTracker::OnDestroyView(self);
@@ -5281,10 +5348,18 @@
   return YES;
 }
 
+- (NSEvent*)lastKeyDownEvent
+{
+  return mLastKeyDownEvent;
+}
+
 - (void)keyDown:(NSEvent*)theEvent
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
+  [mLastKeyDownEvent release];
+  mLastKeyDownEvent = [theEvent retain];
+
   // Weird things can happen on keyboard input if the key window isn't in the
   // current space.  For example see bug 1056251.  To get around this, always
   // make sure that, if our window is key, it's also made frontmost.  Doing
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsMenuBarX.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsMenuBarX.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsMenuBarX.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsMenuBarX.h	2015-02-28 15:03:10.000000000 +0000
@@ -130,6 +130,7 @@
 
 protected:
   void              ConstructNativeMenus();
+  void              ConstructFallbackNativeMenus();
   nsresult          InsertMenuAtIndex(nsMenuX* aMenu, uint32_t aIndex);
   void              RemoveMenuAtIndex(uint32_t aIndex);
   void              HideItem(nsIDOMDocument* inDoc, const nsAString & inID, nsIContent** outHiddenNode);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsMenuBarX.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsMenuBarX.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsMenuBarX.mm	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsMenuBarX.mm	2015-02-28 15:03:10.000000000 +0000
@@ -25,6 +25,9 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
+#include "nsIAppStartup.h"
+#include "nsIStringBundle.h"
+#include "nsToolkitCompsCID.h"
 
 NativeMenuItemTarget* nsMenuBarX::sNativeEventTarget = nil;
 nsMenuBarX* nsMenuBarX::sLastGeckoMenuBarPainted = nullptr; // Weak
@@ -80,7 +83,9 @@
     sPrefItemContent = nullptr;
 
   // make sure we unregister ourselves as a content observer
-  UnregisterForContentChanges(mContent);
+  if (mContent) {
+    UnregisterForContentChanges(mContent);
+  }
 
   // We have to manually clear the array here because clearing causes menu items
   // to call back into the menu bar to unregister themselves. We don't want to
@@ -96,21 +101,24 @@
 
 nsresult nsMenuBarX::Create(nsIWidget* aParent, nsIContent* aContent)
 {
-  if (!aParent || !aContent)
+  if (!aParent)
     return NS_ERROR_INVALID_ARG;
 
   mParentWindow = aParent;
   mContent = aContent;
 
-  AquifyMenuBar();
-
-  nsresult rv = nsMenuGroupOwnerX::Create(aContent);
-  if (NS_FAILED(rv))
-    return rv;
-
-  RegisterForContentChanges(aContent, this);
+  if (mContent) {
+    AquifyMenuBar();
 
-  ConstructNativeMenus();
+    nsresult rv = nsMenuGroupOwnerX::Create(mContent);
+    if (NS_FAILED(rv))
+      return rv;
+
+    RegisterForContentChanges(mContent, this);
+    ConstructNativeMenus();
+  } else {
+    ConstructFallbackNativeMenus();
+  }
 
   // Give this to the parent window. The parent takes ownership.
   static_cast<nsCocoaWindow*>(mParentWindow)->SetMenuBar(this);
@@ -138,6 +146,49 @@
   }  
 }
 
+void nsMenuBarX::ConstructFallbackNativeMenus()
+{
+  if (sApplicationMenu) {
+    // Menu has already been built.
+    return;
+  }
+
+  nsCOMPtr<nsIStringBundle> stringBundle;
+
+  nsCOMPtr<nsIStringBundleService> bundleSvc = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
+  bundleSvc->CreateBundle("chrome://global/locale/fallbackMenubar.properties", getter_AddRefs(stringBundle));
+
+  if (!stringBundle) {
+    return;
+  }
+
+  nsXPIDLString labelUTF16;
+  nsXPIDLString keyUTF16;
+
+  const char16_t* labelProp = MOZ_UTF16("quitMenuitem.label");
+  const char16_t* keyProp = MOZ_UTF16("quitMenuitem.key");
+
+  stringBundle->GetStringFromName(labelProp, getter_Copies(labelUTF16));
+  stringBundle->GetStringFromName(keyProp, getter_Copies(keyUTF16));
+
+  NSString* labelStr = [NSString stringWithUTF8String:
+                        NS_ConvertUTF16toUTF8(labelUTF16).get()];
+  NSString* keyStr= [NSString stringWithUTF8String:
+                     NS_ConvertUTF16toUTF8(keyUTF16).get()];
+
+  if (!nsMenuBarX::sNativeEventTarget) {
+    nsMenuBarX::sNativeEventTarget = [[NativeMenuItemTarget alloc] init];
+  }
+
+  sApplicationMenu = [[[[NSApp mainMenu] itemAtIndex:0] submenu] retain];
+  NSMenuItem* quitMenuItem = [[[NSMenuItem alloc] initWithTitle:labelStr
+                                                  action:@selector(menuItemHit:)
+                                                  keyEquivalent:keyStr] autorelease];
+  [quitMenuItem setTarget:nsMenuBarX::sNativeEventTarget];
+  [quitMenuItem setTag:eCommand_ID_Quit];
+  [sApplicationMenu addItem:quitMenuItem];
+}
+
 uint32_t nsMenuBarX::GetMenuCount()
 {
   return mMenuArray.Length();
@@ -878,23 +929,25 @@
     return;
   }
 
+  int tag = [sender tag];
+
   if (!gMenuItemsExecuteCommands) {
     return;
   }
 
-  int tag = [sender tag];
-
+  nsMenuGroupOwnerX* menuGroupOwner = nullptr;
+  nsMenuBarX* menuBar = nullptr;
   MenuItemInfo* info = [sender representedObject];
-  if (!info)
-    return;
 
-  nsMenuGroupOwnerX* menuGroupOwner = [info menuGroupOwner];
-  if (!menuGroupOwner)
-    return;
-
-  nsMenuBarX* menuBar = nullptr;
-  if (menuGroupOwner->MenuObjectType() == eMenuBarObjectType)
-    menuBar = static_cast<nsMenuBarX*>(menuGroupOwner);
+  if (info) {
+    menuGroupOwner = [info menuGroupOwner];
+    if (!menuGroupOwner) {
+      return;
+    }
+    if (menuGroupOwner->MenuObjectType() == eMenuBarObjectType) {
+      menuBar = static_cast<nsMenuBarX*>(menuGroupOwner);
+    }
+  }
 
   // Do special processing if this is for an app-global command.
   if (tag == eCommand_ID_About) {
@@ -934,7 +987,10 @@
       nsMenuUtilsX::DispatchCommandTo(mostSpecificContent);
     }
     else {
-      [NSApp terminate:nil];
+      nsCOMPtr<nsIAppStartup> appStartup = do_GetService(NS_APPSTARTUP_CONTRACTID);
+      if (appStartup) {
+        appStartup->Quit(nsIAppStartup::eAttemptQuit);
+      }
     }
     return;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsNativeThemeCocoa.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsNativeThemeCocoa.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsNativeThemeCocoa.mm	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsNativeThemeCocoa.mm	2015-02-28 15:03:10.000000000 +0000
@@ -3494,6 +3494,8 @@
     case NS_THEME_PROGRESSBAR_VERTICAL:
     case NS_THEME_METERBAR:
     case NS_THEME_METERBAR_CHUNK:
+    case NS_THEME_MAC_VIBRANCY_LIGHT:
+    case NS_THEME_MAC_VIBRANCY_DARK:
       *aShouldRepaint = false;
       return NS_OK;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsWidgetFactory.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsWidgetFactory.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/nsWidgetFactory.mm	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/nsWidgetFactory.mm	2015-02-28 15:03:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsISupports.h"
 #include "nsIComponentManager.h"
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/WidgetUtils.h"
 
 #include "nsWidgetsCID.h"
 
@@ -38,8 +39,6 @@
 #include "nsPrintSession.h"
 #include "nsToolkitCompsCID.h"
 
-#include "mozilla/Module.h"
-
 using namespace mozilla;
 using namespace mozilla::widget;
 
@@ -195,6 +194,9 @@
 static void
 nsWidgetCocoaModuleDtor()
 {
+  // Shutdown all XP level widget classes.
+  WidgetUtils::Shutdown();
+
   NativeKeyBindings::Shutdown();
   nsLookAndFeel::Shutdown();
   nsToolkit::Shutdown();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/TextInputHandler.mm thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/TextInputHandler.mm
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/cocoa/TextInputHandler.mm	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/cocoa/TextInputHandler.mm	2015-02-28 15:03:10.000000000 +0000
@@ -1523,7 +1523,20 @@
   KeyEventState* currentKeyEvent = PushKeyEvent(aNativeEvent);
   AutoKeyEventStateCleaner remover(this);
 
-  if (!IsIMEComposing()) {
+  ComplexTextInputPanel* ctiPanel = ComplexTextInputPanel::GetSharedComplexTextInputPanel();
+  if (ctiPanel && ctiPanel->IsInComposition()) {
+    nsAutoString committed;
+    ctiPanel->InterpretKeyEvent(aNativeEvent, committed);
+    if (!committed.IsEmpty()) {
+      WidgetKeyboardEvent imeEvent(true, NS_KEY_DOWN, mWidget);
+      InitKeyEvent(aNativeEvent, imeEvent);
+      imeEvent.mPluginTextEventString.Assign(committed);
+      DispatchEvent(imeEvent);
+    }
+    return true;
+  }
+
+  if (mWidget->IsPluginFocused() || !IsIMEComposing()) {
     NSResponder* firstResponder = [[mView window] firstResponder];
 
     WidgetKeyboardEvent keydownEvent(true, NS_KEY_DOWN, mWidget);
@@ -1555,6 +1568,14 @@
     }
   }
 
+  // None of what follows is needed for plugin keyboard input.  In fact it
+  // may cause trouble -- for example the call to [mView interpretKeyEvents:]
+  // can, in e10s mode, cause each key typed to appear twice in an IME
+  // composition.
+  if (mWidget->IsPluginFocused()) {
+    return true;
+  }
+
   // Let Cocoa interpret the key events, caching IsIMEComposing first.
   bool wasComposing = IsIMEComposing();
   bool interpretKeyEventsCalled = false;
@@ -3554,7 +3575,7 @@
   NS_ENSURE_TRUE(!Destroyed(), false);
   NSWindow* window = [mView window];
   NS_ENSURE_TRUE(window, false);
-  return [window firstResponder] == mView;
+  return [window firstResponder] == mView && ![window attachedSheet];
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(false);
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/GeckoTouchDispatcher.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/GeckoTouchDispatcher.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/GeckoTouchDispatcher.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/GeckoTouchDispatcher.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -51,6 +51,16 @@
 
 static StaticRefPtr<GeckoTouchDispatcher> sTouchDispatcher;
 
+/* static */ GeckoTouchDispatcher*
+GeckoTouchDispatcher::GetInstance()
+{
+  if (!sTouchDispatcher) {
+    sTouchDispatcher = new GeckoTouchDispatcher();
+    ClearOnShutdown(&sTouchDispatcher);
+  }
+  return sTouchDispatcher;
+}
+
 GeckoTouchDispatcher::GeckoTouchDispatcher()
   : mTouchQueueLock("GeckoTouchDispatcher::mTouchQueueLock")
   , mTouchEventsFiltered(false)
@@ -70,40 +80,32 @@
   mMaxPredict = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleMaxPredict());
   mOldTouchThreshold = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleOldTouchThreshold());
   mDelayedVsyncThreshold = TimeDuration::FromMilliseconds(gfxPrefs::TouchResampleVsyncDelayThreshold());
-  sTouchDispatcher = this;
-  ClearOnShutdown(&sTouchDispatcher);
 }
 
-/* static */ void
+void
 GeckoTouchDispatcher::SetCompositorVsyncObserver(mozilla::layers::CompositorVsyncObserver *aObserver)
 {
-  MOZ_ASSERT(sTouchDispatcher != nullptr);
   MOZ_ASSERT(NS_IsMainThread());
   // We assume on b2g that there is only 1 CompositorParent
-  MOZ_ASSERT(sTouchDispatcher->mCompositorVsyncObserver == nullptr);
-  if (sTouchDispatcher->mResamplingEnabled) {
-    sTouchDispatcher->mCompositorVsyncObserver = aObserver;
+  MOZ_ASSERT(mCompositorVsyncObserver == nullptr);
+  if (mResamplingEnabled) {
+    mCompositorVsyncObserver = aObserver;
   }
 }
 
-// Timestamp is in nanoseconds
-/* static */ bool
+bool
 GeckoTouchDispatcher::NotifyVsync(TimeStamp aVsyncTimestamp)
 {
-  if (sTouchDispatcher == nullptr) {
-    return false;
-  }
-
-  MOZ_ASSERT(sTouchDispatcher->mResamplingEnabled);
+  MOZ_ASSERT(mResamplingEnabled);
   bool haveTouchData = false;
   {
-    MutexAutoLock lock(sTouchDispatcher->mTouchQueueLock);
-    haveTouchData = !sTouchDispatcher->mTouchMoveEvents.empty();
+    MutexAutoLock lock(mTouchQueueLock);
+    haveTouchData = !mTouchMoveEvents.empty();
   }
 
   if (haveTouchData) {
     layers::APZThreadUtils::AssertOnControllerThread();
-    sTouchDispatcher->DispatchTouchMoveEvents(aVsyncTimestamp);
+    DispatchTouchMoveEvents(aVsyncTimestamp);
   }
 
   return haveTouchData;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/GeckoTouchDispatcher.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/GeckoTouchDispatcher.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/GeckoTouchDispatcher.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/GeckoTouchDispatcher.h	2015-02-28 15:03:10.000000000 +0000
@@ -46,14 +46,15 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GeckoTouchDispatcher)
 
 public:
-  GeckoTouchDispatcher();
+  static GeckoTouchDispatcher* GetInstance();
   void NotifyTouch(MultiTouchInput& aTouch, TimeStamp aEventTime);
   void DispatchTouchEvent(MultiTouchInput aMultiTouch);
   void DispatchTouchMoveEvents(TimeStamp aVsyncTime);
-  static bool NotifyVsync(TimeStamp aVsyncTimestamp);
-  static void SetCompositorVsyncObserver(layers::CompositorVsyncObserver* aObserver);
+  bool NotifyVsync(TimeStamp aVsyncTimestamp);
+  void SetCompositorVsyncObserver(layers::CompositorVsyncObserver* aObserver);
 
 private:
+  GeckoTouchDispatcher();
   void ResampleTouchMoves(MultiTouchInput& aOutTouch, TimeStamp vsyncTime);
   void SendTouchEvent(MultiTouchInput& aData);
   void DispatchMouseEvent(MultiTouchInput& aMultiTouch,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsAppShell.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsAppShell.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsAppShell.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsAppShell.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -506,7 +506,7 @@
         , mKeyEventsFiltered(false)
         , mPowerWakelock(false)
     {
-        mTouchDispatcher = new GeckoTouchDispatcher();
+        mTouchDispatcher = GeckoTouchDispatcher::GetInstance();
     }
 
     virtual void dump(String8& dump);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsWidgetFactory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsWidgetFactory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsWidgetFactory.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsWidgetFactory.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -17,6 +17,7 @@
 #include "base/basictypes.h"
 
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/WidgetUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsWidgetsCID.h"
@@ -107,6 +108,9 @@
 static void
 nsWidgetGonkModuleDtor()
 {
+    // Shutdown all XP level widget classes.
+    WidgetUtils::Shutdown();
+
     nsLookAndFeel::Shutdown();
     nsAppShellShutdown();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsWindow.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsWindow.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -129,7 +129,7 @@
 
 } // anonymous namespace
 
-NS_IMPL_ISUPPORTS_INHERITED(nsWindow, nsBaseWidget, nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
 
 nsWindow::nsWindow()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsWindow.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsWindow.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gonk/nsWindow.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gonk/nsWindow.h	2015-02-28 15:03:11.000000000 +0000
@@ -19,7 +19,6 @@
 #include "InputData.h"
 #include "nsBaseWidget.h"
 #include "nsRegion.h"
-#include "nsWeakReference.h"
 #include "nsIIdleServiceInternal.h"
 #include "Units.h"
 
@@ -45,7 +44,7 @@
 struct InputContextAction;
 }
 
-class nsWindow : public nsBaseWidget, public nsSupportsWeakReference
+class nsWindow : public nsBaseWidget
 {
 public:
     nsWindow();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gtk/nsWidgetFactory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gtk/nsWidgetFactory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gtk/nsWidgetFactory.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gtk/nsWidgetFactory.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/WidgetUtils.h"
 #include "NativeKeyBindings.h"
 #include "nsWidgetsCID.h"
 #include "nsAppShell.h"
@@ -268,6 +269,9 @@
 static void
 nsWidgetGtk2ModuleDtor()
 {
+  // Shutdown all XP level widget classes.
+  WidgetUtils::Shutdown();
+
   NativeKeyBindings::Shutdown();
   nsLookAndFeel::Shutdown();
   nsFilePicker::Shutdown();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gtk/nsWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gtk/nsWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gtk/nsWindow.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gtk/nsWindow.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -345,6 +345,8 @@
     sLastUserInputTime = timestamp;
 }
 
+NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
+
 nsWindow::nsWindow()
 {
     mIsTopLevel       = false;
@@ -423,9 +425,6 @@
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED(nsWindow, nsBaseWidget,
-                            nsISupportsWeakReference)
-
 void
 nsWindow::CommonCreate(nsIWidget *aParent, bool aListenForResizes)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gtk/nsWindow.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gtk/nsWindow.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/gtk/nsWindow.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/gtk/nsWindow.h	2015-02-28 15:03:11.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsAutoPtr.h"
 
 #include "mozcontainer.h"
-#include "nsWeakReference.h"
 
 #include "nsIDragService.h"
 #include "nsITimer.h"
@@ -68,7 +67,7 @@
 class nsShmImage;
 #endif
 
-class nsWindow : public nsBaseWidget, public nsSupportsWeakReference
+class nsWindow : public nsBaseWidget
 {
 public:
     nsWindow();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/NativeKeyToDOMKeyName.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/NativeKeyToDOMKeyName.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/NativeKeyToDOMKeyName.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/NativeKeyToDOMKeyName.h	2015-02-28 15:03:10.000000000 +0000
@@ -1301,6 +1301,10 @@
 // HomeScreen
 KEY_MAP_ANDROID (HomeScreen, AKEYCODE_HOME)
 
+// Focus
+KEY_MAP_QT      (CameraFocusAdjust, Qt::Key_CameraFocus)
+KEY_MAP_ANDROID (CameraFocusAdjust, AKEYCODE_FOCUS)
+
 #undef KEY_MAP_WIN
 #undef KEY_MAP_WIN_JPN
 #undef KEY_MAP_WIN_KOR
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsBaseWidget.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsBaseWidget.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsBaseWidget.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsBaseWidget.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -94,10 +94,6 @@
 #define TOUCH_INJECT_LONG_TAP_DEFAULT_MSEC 1500
 int32_t nsIWidget::sPointerIdCounter = 0;
 
-// nsBaseWidget
-NS_IMPL_ISUPPORTS(nsBaseWidget, nsIWidget)
-
-
 nsAutoRollup::nsAutoRollup()
 {
   // remember if mLastRollup was null, and only clear it upon destruction
@@ -113,6 +109,8 @@
   }
 }
 
+NS_IMPL_ISUPPORTS(nsBaseWidget, nsIWidget, nsISupportsWeakReference)
+
 //-------------------------------------------------------------------------
 //
 // nsBaseWidget constructor
@@ -183,21 +181,24 @@
   mShutdownObserver = nullptr;
 }
 
-static void DeferredDestroyCompositor(CompositorParent* aCompositorParent,
-                              CompositorChild* aCompositorChild)
+static void DeferredDestroyCompositor(nsRefPtr<CompositorParent> aCompositorParent,
+                                      nsRefPtr<CompositorChild> aCompositorChild)
 {
     // Bug 848949 needs to be fixed before
     // we can close the channel properly
     //aCompositorChild->Close();
-    aCompositorParent->Release();
-    aCompositorChild->Release();
 }
 
 void nsBaseWidget::DestroyCompositor()
 {
   if (mCompositorChild) {
-    mCompositorChild->SendWillStop();
-    mCompositorChild->Destroy();
+    nsRefPtr<CompositorChild> compositorChild = mCompositorChild.forget();
+    nsRefPtr<CompositorParent> compositorParent = mCompositorParent.forget();
+
+    compositorChild->SendWillStop();
+    // New LayerManager, CompositorParent and CompositorChild might be created
+    // as a result of internal GetLayerManager() call.
+    compositorChild->Destroy();
 
     // The call just made to SendWillStop can result in IPC from the
     // CompositorParent to the CompositorChild (e.g. caused by the destruction
@@ -206,13 +207,12 @@
     // events already in the MessageLoop get processed before the
     // CompositorChild is destroyed, so we add a task to the MessageLoop to
     // handle compositor desctruction.
+
+    // The DefferedDestroyCompositor task takes ownership of compositorParent and
+    // will release them when it runs.
     MessageLoop::current()->PostTask(FROM_HERE,
-               NewRunnableFunction(DeferredDestroyCompositor, mCompositorParent,
-                                   mCompositorChild));
-    // The DestroyCompositor task we just added to the MessageLoop will handle
-    // releasing mCompositorParent and mCompositorChild.
-    unused << mCompositorParent.forget();
-    unused << mCompositorChild.forget();
+               NewRunnableFunction(DeferredDestroyCompositor, compositorParent,
+                                   compositorChild));
   }
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsBaseWidget.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsBaseWidget.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsBaseWidget.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsBaseWidget.h	2015-02-28 15:03:11.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsIObserver.h"
 #include "nsIWidgetListener.h"
 #include "nsPIDOMWindow.h"
+#include "nsWeakReference.h"
 #include <algorithm>
 class nsIContent;
 class nsAutoRollup;
@@ -79,7 +80,7 @@
  * class, but it gives them a head start.)
  */
 
-class nsBaseWidget : public nsIWidget
+class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
 {
   friend class nsAutoRollup;
 
@@ -199,6 +200,12 @@
   virtual nsresult        ActivateNativeMenuItemAt(const nsAString& indexString) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
   virtual nsresult        ForceUpdateNativeMenuAt(const nsAString& indexString) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
   NS_IMETHOD              NotifyIME(const IMENotification& aIMENotification) MOZ_OVERRIDE MOZ_FINAL;
+  NS_IMETHOD              StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
+                                         int32_t aPanelX, int32_t aPanelY,
+                                         nsString& aCommitted) MOZ_OVERRIDE
+                          { return NS_ERROR_NOT_IMPLEMENTED; }
+  NS_IMETHOD              SetPluginFocused(bool& aFocused) MOZ_OVERRIDE
+                          { return NS_ERROR_NOT_IMPLEMENTED; }
   NS_IMETHOD              AttachNativeKeyEvent(mozilla::WidgetKeyboardEvent& aEvent) MOZ_OVERRIDE { return NS_ERROR_NOT_IMPLEMENTED; }
   NS_IMETHOD_(bool)       ExecuteNativeKeyBinding(
                             NativeKeyBindingsType aType,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsGUIEventIPC.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsGUIEventIPC.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsGUIEventIPC.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsGUIEventIPC.h	2015-02-28 15:03:11.000000000 +0000
@@ -335,6 +335,7 @@
     WriteParam(aMsg, aParam.mNativeModifierFlags);
     WriteParam(aMsg, aParam.mNativeCharacters);
     WriteParam(aMsg, aParam.mNativeCharactersIgnoringModifiers);
+    WriteParam(aMsg, aParam.mPluginTextEventString);
 #endif
     // An OS-specific native event might be attached in |mNativeKeyEvent|,  but
     // that cannot be copied across process boundaries.
@@ -361,6 +362,7 @@
         && ReadParam(aMsg, aIter, &aResult->mNativeModifierFlags)
         && ReadParam(aMsg, aIter, &aResult->mNativeCharacters)
         && ReadParam(aMsg, aIter, &aResult->mNativeCharactersIgnoringModifiers)
+        && ReadParam(aMsg, aIter, &aResult->mPluginTextEventString)
 #endif
         )
     {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsIWidget.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsIWidget.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsIWidget.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsIWidget.h	2015-02-28 15:03:11.000000000 +0000
@@ -113,8 +113,8 @@
 #define NS_NATIVE_PLUGIN_ID            105
 
 #define NS_IWIDGET_IID \
-{ 0xa7db3e01, 0xb8fe, 0x4122, \
-  { 0xbe, 0xa6, 0x45, 0x6c, 0xdd, 0x85, 0x30, 0x64 } };
+{ 0x316E4600, 0x15DB, 0x47AE, \
+  { 0xBF, 0xE4, 0x5B, 0xCD, 0xFF, 0x80, 0x80, 0x83 } };
 
 /*
  * Window shadow styles
@@ -2008,6 +2008,28 @@
      */
     NS_IMETHOD NotifyIME(const IMENotification& aIMENotification) = 0;
 
+    /**
+     * Start plugin IME.  If this results in a string getting committed, the
+     * result is in aCommitted (otherwise aCommitted is empty).
+     *
+     * aKeyboardEvent     The event with which plugin IME is to be started
+     * panelX and panelY  Location in screen coordinates of the IME input panel
+     *                    (should be just under the plugin)
+     * aCommitted         The string committed during IME -- otherwise empty
+     */
+    NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
+                              int32_t aPanelX, int32_t aPanelY,
+                              nsString& aCommitted) = 0;
+
+    /**
+     * Tells the widget whether or not a plugin (inside the widget) has the
+     * keyboard focus.  Should be sent when the keyboard focus changes too or
+     * from a plugin.
+     *
+     * aFocused  Whether or not a plugin is focused
+     */
+    NS_IMETHOD SetPluginFocused(bool& aFocused) = 0;
+
     /*
      * Notifies the input context changes.
      */
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsTransferable.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsTransferable.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsTransferable.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsTransferable.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -56,10 +56,11 @@
 
 //-------------------------------------------------------------------------
 void
-DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen )
+DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivateData )
 {
   // Now, check to see if we consider the data to be "too large"
-  if (aDataLen > kLargeDatasetSize) {
+  // as well as ensuring that private browsing mode is disabled
+  if (aDataLen > kLargeDatasetSize && !aIsPrivateData) {
     // if so, cache it to disk instead of memory
     if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) )
       return;
@@ -399,7 +400,7 @@
   for (size_t i = 0; i < mDataArray.Length(); ++i) {
     DataStruct& data = mDataArray.ElementAt(i);
     if ( data.GetFlavor().Equals(aFlavor) ) {
-      data.SetData ( aData, aDataLen );
+      data.SetData ( aData, aDataLen, mPrivateData );
       return NS_OK;
     }
   }
@@ -415,7 +416,7 @@
         nsCOMPtr<nsISupports> ConvertedData;
         uint32_t ConvertedLen;
         mFormatConv->Convert(aFlavor, aData, aDataLen, data.GetFlavor().get(), getter_AddRefs(ConvertedData), &ConvertedLen);
-        data.SetData(ConvertedData, ConvertedLen);
+        data.SetData(ConvertedData, ConvertedLen, mPrivateData);
         return NS_OK;
       }
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsTransferable.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsTransferable.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/nsTransferable.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/nsTransferable.h	2015-02-28 15:03:11.000000000 +0000
@@ -28,7 +28,7 @@
   ~DataStruct();
   
   const nsCString& GetFlavor() const { return mFlavor; }
-  void SetData( nsISupports* inData, uint32_t inDataLen );
+  void SetData( nsISupports* inData, uint32_t inDataLen, bool aIsPrivateData );
   void GetData( nsISupports** outData, uint32_t *outDataLen );
   already_AddRefed<nsIFile> GetFileSpec(const char* aFileName);
   bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/PluginWidgetProxy.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/PluginWidgetProxy.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/PluginWidgetProxy.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/PluginWidgetProxy.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -38,7 +38,7 @@
   mActor(aActor)
 {
   // See ChannelDestroyed() in the header
-  mActor->mWidget = this;
+  mActor->SetWidget(this);
 }
 
 PluginWidgetProxy::~PluginWidgetProxy()
@@ -99,22 +99,9 @@
   PWLOG("PluginWidgetProxy::Destroy()\n");
 
   if (mActor) {
-   /**
-    * We need to communicate that the sub protocol is going to be torn down
-    * before the sub protocol dies. Otherwise we can end up with async events
-    * in transit from chrome to content, which on arrival will trigger an abort
-    * in the content process, crashing all tabs.
-    *
-    * Note, this is one of two ways PluginWidget tear down initiates. Here we
-    * are a plugin in content and content has just unloaded us for some reason,
-    * usually due to swap out for flash ads or the user simply loaded a
-    * different page. The other involves a full tear down of the tab (PBrowser)
-    * which happens prior to widgets getting collected by ref counting in
-    * layout. We still get this Destroy call, but in all likelyhood mActor is
-    * already null via a call on ChannelDestroyed from PluginWidgetChild.
-    */
-    mActor->SendDestroy();
-    mActor->mWidget = nullptr;
+    // Communicate that the layout widget has been torn down before the sub
+    // protocol.
+    mActor->ProxyShutdown();
     mActor = nullptr;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/PuppetWidget.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/PuppetWidget.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/PuppetWidget.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/PuppetWidget.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -67,12 +67,10 @@
 #endif
 }
 
-
 // Arbitrary, fungible.
 const size_t PuppetWidget::kMaxDimension = 4000;
 
-NS_IMPL_ISUPPORTS_INHERITED(PuppetWidget, nsBaseWidget,
-                            nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS_INHERITED0(PuppetWidget, nsBaseWidget)
 
 PuppetWidget::PuppetWidget(TabChild* aTabChild)
   : mTabChild(aTabChild)
@@ -441,6 +439,28 @@
   }
 }
 
+NS_IMETHODIMP
+PuppetWidget::StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
+                             int32_t aPanelX, int32_t aPanelY,
+                             nsString& aCommitted)
+{
+  if (!mTabChild ||
+      !mTabChild->SendStartPluginIME(aKeyboardEvent, aPanelX,
+                                     aPanelY, &aCommitted)) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+PuppetWidget::SetPluginFocused(bool& aFocused)
+{
+  if (!mTabChild || !mTabChild->SendSetPluginFocused(aFocused)) {
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
 NS_IMETHODIMP_(void)
 PuppetWidget::SetInputContext(const InputContext& aContext,
                               const InputContextAction& aAction)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/PuppetWidget.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/PuppetWidget.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/PuppetWidget.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/PuppetWidget.h	2015-02-28 15:03:10.000000000 +0000
@@ -21,7 +21,6 @@
 #include "nsBaseWidget.h"
 #include "nsIScreenManager.h"
 #include "nsThreadUtils.h"
-#include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 
@@ -37,8 +36,7 @@
 
 struct AutoCacheNativeKeyCommands;
 
-class PuppetWidget : public nsBaseWidget,
-                     public nsSupportsWeakReference
+class PuppetWidget : public nsBaseWidget
 {
   typedef mozilla::dom::TabChild TabChild;
   typedef mozilla::gfx::DrawTarget DrawTarget;
@@ -198,6 +196,12 @@
   // Get the screen position of the application window.
   nsIntPoint GetWindowPosition();
 
+  NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
+                            int32_t aPanelX, int32_t aPanelY,
+                            nsString& aCommitted) MOZ_OVERRIDE;
+
+  NS_IMETHOD SetPluginFocused(bool& aFocused) MOZ_OVERRIDE;
+
 protected:
   bool mEnabled;
   bool mVisible;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/qt/nsWidgetFactory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/qt/nsWidgetFactory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/qt/nsWidgetFactory.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/qt/nsWidgetFactory.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -17,6 +17,7 @@
 #include "base/basictypes.h"
 
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/WidgetUtils.h"
 
 #include "nsCOMPtr.h"
 #include "nsWidgetsCID.h"
@@ -147,6 +148,9 @@
 static void
 nsWidgetQtModuleDtor()
 {
+    // Shutdown all XP level widget classes.
+    WidgetUtils::Shutdown();
+
     nsLookAndFeel::Shutdown();
     nsAppShellShutdown();
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/qt/nsWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/qt/nsWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/qt/nsWindow.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/qt/nsWindow.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -89,6 +89,8 @@
 static void find_first_visible_parent(QWindow* aItem, QWindow*& aVisibleItem);
 static bool is_mouse_in_window (MozQWidget* aWindow, double aMouseX, double aMouseY);
 
+NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
+
 nsWindow::nsWindow()
 {
     LOG(("%s [%p]\n", __PRETTY_FUNCTION__, (void *)this));
@@ -1377,10 +1379,6 @@
 
 ///////////////////////////////////// OLD GECKO ECENTS need to Sort ///////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED(nsWindow, nsBaseWidget, nsISupportsWeakReference)
-
-
-
 void
 nsWindow::ClearCachedResources()
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/qt/nsWindow.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/qt/nsWindow.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/qt/nsWindow.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/qt/nsWindow.h	2015-02-28 15:03:11.000000000 +0000
@@ -14,8 +14,6 @@
 #include "nsBaseWidget.h"
 #include "mozilla/EventForwards.h"
 
-#include "nsWeakReference.h"
-
 #include "nsGkAtoms.h"
 #include "nsIIdleServiceInternal.h"
 #include "nsIRunnable.h"
@@ -77,8 +75,7 @@
 namespace mozilla {
 namespace widget {
 class MozQWidget;
-class nsWindow : public nsBaseWidget,
-                 public nsSupportsWeakReference
+class nsWindow : public nsBaseWidget
 {
 public:
     nsWindow();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/SharedWidgetUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/SharedWidgetUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/SharedWidgetUtils.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/SharedWidgetUtils.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -16,7 +16,14 @@
 namespace mozilla {
 namespace widget {
 
-//static
+// static
+void
+WidgetUtils::Shutdown()
+{
+  WidgetKeyboardEvent::Shutdown();
+}
+
+// static
 already_AddRefed<nsIWidget>
 WidgetUtils::DOMWindowToWidget(nsIDOMWindow *aDOMWindow)
 {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/chrome.ini thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/chrome.ini
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/chrome.ini	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/chrome.ini	2015-02-28 15:03:11.000000000 +0000
@@ -36,7 +36,7 @@
 skip-if = toolkit != "cocoa"
 support-files = native_menus_window.xul
 [test_native_mouse_mac.xul]
-skip-if = toolkit != "cocoa"
+skip-if = toolkit != "cocoa" || os_version == '10.10' # 10.10: bug 1137575
 support-files = native_mouse_mac_window.xul
 [test_bug413277.html]
 skip-if = toolkit != "cocoa"
@@ -83,3 +83,6 @@
 [test_mouse_scroll.xul]
 skip-if = toolkit != "windows"
 support-files = window_mouse_scroll_win.html
+
+# Privacy relevant
+[test_bug1123480.xul]
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_assign_event_data.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_assign_event_data.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_assign_event_data.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_assign_event_data.html	2015-02-28 15:03:11.000000000 +0000
@@ -172,9 +172,9 @@
   { description: "WidgetKeyboardEvent (keyup during composition)",
     targetID: "input-text", eventType: "keyup",
     dispatchEvent: function () {
+      SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", true);
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
-      synthesizeKey("a", { type: "keydown" });
       synthesizeCompositionChange({ "composition":
         { "string": "\u306D",
           "clauses":
@@ -182,10 +182,11 @@
             { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
           ]
         },
-        "caret": { "start": 1, "length": 0 }
+        "caret": { "start": 1, "length": 0 },
+        "key": { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A },
       });
-      synthesizeKey("a", { type: "keyup" });
       synthesizeComposition({ type: "compositioncommitasis" });
+      SpecialPowers.clearUserPref("dom.keyboardevent.dispatch_during_composition");
     },
     canRun: function () {
       return true;
@@ -195,6 +196,7 @@
   { description: "WidgetKeyboardEvent (keydown during composition)",
     targetID: "input-text", eventType: "keydown",
     dispatchEvent: function () {
+      SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", true);
       document.getElementById(this.targetID).value = "";
       document.getElementById(this.targetID).focus();
       synthesizeCompositionChange({ "composition":
@@ -206,9 +208,9 @@
         },
         "caret": { "start": 1, "length": 0 }
       });
-      synthesizeKey("VK_RETURN", { type: "keydown" });
-      synthesizeComposition({ type: "compositioncommitasis" });
-      synthesizeKey("VK_RETURN", { type: "keyup" });
+      synthesizeComposition({ type: "compositioncommitasis",
+        key: { key: "KEY_Enter", code: "Enter" } });
+      SpecialPowers.clearUserPref("dom.keyboardevent.dispatch_during_composition");
     },
     canRun: function () {
       return true;
@@ -632,39 +634,23 @@
 
 function init()
 {
-  SpecialPowers.setBoolPref("middlemouse.contentLoadURL", false);
-  SpecialPowers.setBoolPref("middlemouse.paste", false);
-  SpecialPowers.setBoolPref("general.autoScroll", false);
-  SpecialPowers.setIntPref("mousewheel.default.action", 0);
-  SpecialPowers.setIntPref("mousewheel.default.action.override_x", -1);
-  SpecialPowers.setIntPref("mousewheel.with_shift.action", 0);
-  SpecialPowers.setIntPref("mousewheel.with_shift.action.override_x", -1);
-  SpecialPowers.setIntPref("mousewheel.with_control.action", 0);
-  SpecialPowers.setIntPref("mousewheel.with_control.action.override_x", -1);
-  SpecialPowers.setIntPref("mousewheel.with_alt.action", 0);
-  SpecialPowers.setIntPref("mousewheel.with_alt.action.override_x", -1);
-  SpecialPowers.setIntPref("mousewheel.with_meta.action", 0);
-  SpecialPowers.setIntPref("mousewheel.with_meta.action.override_x", -1);
-
-  runNextTest();
+  SpecialPowers.pushPrefEnv({"set":[["middlemouse.contentLoadURL", false],
+  			            ["middlemouse.paste", false],
+                                    ["general.autoScroll", false],
+                                    ["mousewheel.default.action", 0],
+                                    ["mousewheel.default.action.override_x", -1],
+                                    ["mousewheel.with_shift.action", 0],
+                                    ["mousewheel.with_shift.action.override_x", -1],
+                                    ["mousewheel.with_control.action", 0],
+                                    ["mousewheel.with_control.action.override_x", -1],
+                                    ["mousewheel.with_alt.action", 0],
+                                    ["mousewheel.with_alt.action.override_x", -1],
+                                    ["mousewheel.with_meta.action", 0],
+                                    ["mousewheel.with_meta.action.override_x", -1]]}, runNextTest);
 }
 
 function finish()
 {
-  SpecialPowers.clearUserPref("middlemouse.contentLoadURL");
-  SpecialPowers.clearUserPref("middlemouse.paste");
-  SpecialPowers.clearUserPref("general.autoScroll");
-  SpecialPowers.clearUserPref("mousewheel.default.action");
-  SpecialPowers.clearUserPref("mousewheel.default.action.override_x");
-  SpecialPowers.clearUserPref("mousewheel.with_shift.action");
-  SpecialPowers.clearUserPref("mousewheel.with_shift.action.override_x");
-  SpecialPowers.clearUserPref("mousewheel.with_control.action");
-  SpecialPowers.clearUserPref("mousewheel.with_control.action.override_x");
-  SpecialPowers.clearUserPref("mousewheel.with_alt.action");
-  SpecialPowers.clearUserPref("mousewheel.with_alt.action.override_x");
-  SpecialPowers.clearUserPref("mousewheel.with_meta.action");
-  SpecialPowers.clearUserPref("mousewheel.with_meta.action.override_x");
-
   SimpleTest.finish();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_bug1123480.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_bug1123480.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_bug1123480.xul	1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_bug1123480.xul	2015-02-28 15:03:11.000000000 +0000
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1123480
+-->
+<window title="Mozilla Bug 1123480"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="RunTest();">
+  <title>nsTransferable PBM Overflow Selection Test</title>
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <script type="application/javascript">
+  <![CDATA[
+  // Boilerplate constructs
+  var SmallDataset = 100000; // Hundred thousand bytes
+
+  // Create 1 Mo of sample garbage text
+  var Ipsum = ""; // Select text from this
+  for (var Iter = 0; Iter < SmallDataset; Iter++) {
+      Ipsum += Math.random().toString(36) + ' ';
+  }
+
+  function RunTest() {
+    // Construct a nsIFile object for access to file methods
+    Components.utils.import("resource://gre/modules/FileUtils.jsm");
+    var clipboardFile = FileUtils.getFile("TmpD", ["clipboardcache"]);
+
+    // Sanitize environment
+    if (clipboardFile.exists()) {
+        clipboardFile.remove(false);
+    }
+    ok(!clipboardFile.exists(), "failed to presanitize the environment");
+
+    // Overflow a nsTransferable region by using the clipboard helper
+    const gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"].getService(Components.interfaces.nsIClipboardHelper);
+    gClipboardHelper.copyString(Ipsum);
+
+    // Disabled private browsing mode should cache large selections to disk
+    ok(clipboardFile.exists(), "correctly saved memory by caching to disk");
+
+    // Sanitize environment again
+    if (clipboardFile.exists()) {
+        clipboardFile.remove(false);
+    }
+    ok(!clipboardFile.exists(), "failed to postsanitize the environment");
+
+    // Repeat procedure of plain text selection with private browsing enabled
+    Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
+    var Winpriv = window.open("about:blank", "_blank", "chrome, width=500, height=200, private");
+    ok(Winpriv, "failed to open private window");
+    ok(PrivateBrowsingUtils.isContentWindowPrivate(Winpriv), "correctly used a private window context");
+
+    // Select plaintext in private channel
+    Components.utils.import('resource://gre/modules/Services.jsm');
+    const nsTransferable = Components.Constructor("@mozilla.org/widget/transferable;1", "nsITransferable");
+    const nsSupportsString = Components.Constructor("@mozilla.org/supports-string;1", "nsISupportsString");
+    var Loadctx = PrivateBrowsingUtils.privacyContextFromWindow(Winpriv);
+    var Transfer = nsTransferable();
+    var Suppstr = nsSupportsString();
+    Suppstr.data = Ipsum;
+    Transfer.init(Loadctx);
+    Transfer.addDataFlavor("text/plain");
+    Transfer.setTransferData("text/plain", Suppstr, Ipsum.length);
+    Services.clipboard.setData(Transfer, null, Services.clipboard.kGlobalClipboard);
+
+    // Enabled private browsing mode should not cache any selection to disk
+    ok(!clipboardFile.exists(), "did not violate private browsing mode");
+  }
+  ]]>
+  </script>
+
+  <!-- test results are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1123480"
+     target="_blank">Mozilla Bug 1123480</a>
+  </body>
+</window>
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_imestate.html thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_imestate.html
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_imestate.html	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_imestate.html	2015-02-28 15:03:11.000000000 +0000
@@ -1428,8 +1428,7 @@
   if (!kIMEEnabledSupported && !kIMEOpenSupported)
     return;
 
-  SpecialPowers.setBoolPref("test.IME", true);
-
+  SpecialPowers.pushPrefEnv({"set":[["test.IME", true]]}, function() {
   // test for normal contents.
   runBasicTest(false, false, "Testing of normal contents");
 
@@ -1479,11 +1478,11 @@
     // This will call onFinish(), so, this test must be the last.
     runEditableSubframeTests();
   });
+ });
 }
 
 function onFinish()
 {
-  SpecialPowers.clearUserPref("test.IME");
   SimpleTest.finish();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_input_events_on_deactive_window.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_input_events_on_deactive_window.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_input_events_on_deactive_window.xul	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_input_events_on_deactive_window.xul	2015-02-28 15:03:11.000000000 +0000
@@ -139,10 +139,7 @@
 
     clear();
     synthesizeKey("a", { type: "keydown" });
-    checkKeyEvents(true, false, false, false, "a keydown");
-    clear();
-    synthesizeKey("a", { type: "keypress" });
-    checkKeyEvents(false, true, false, true, "a keypress");
+    checkKeyEvents(true, true, false, true, "a keydown and a keypress");
     is(textarea.value, "a", "textarea value isn't 'a'");
     clear();
     synthesizeKey("a", { type: "keyup" });
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_platform_colors.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_platform_colors.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/test_platform_colors.xul	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/test_platform_colors.xul	2015-02-28 15:03:11.000000000 +0000
@@ -55,7 +55,7 @@
   "-moz-buttondefault": ["rgb(220, 220, 220)"],
   "-moz-buttonhoverface": ["rgb(240, 240, 240)"],
   "-moz-buttonhovertext": ["rgb(0, 0, 0)"],
-  "-moz-cellhighlight": ["rgb(212, 212, 212)"],
+  "-moz-cellhighlight": ["rgb(212, 212, 212)", "rgb(220, 220, 220)"],
   "-moz-cellhighlighttext": ["rgb(0, 0, 0)"],
   "-moz-eventreerow": ["rgb(255, 255, 255)"],
   "-moz-field": ["rgb(255, 255, 255)"],
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/window_composition_text_querycontent.xul thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/window_composition_text_querycontent.xul
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/tests/window_composition_text_querycontent.xul	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/tests/window_composition_text_querycontent.xul	2015-02-28 15:03:11.000000000 +0000
@@ -2938,10 +2938,10 @@
 
   // XXX These cases shouldn't occur in actual native key events because we
   //     don't dispatch key events while composition (bug 354358).
+  SpecialPowers.setBoolPref("dom.keyboardevent.dispatch_during_composition", true);
   description = "events before dispatching compositionstart";
   synthesizeKey("VK_LEFT", {});
 
-  synthesizeKey("a", { type: "keydown" });
   description = "events after dispatching compositionchange";
   synthesizeCompositionChange(
     { "composition":
@@ -2951,23 +2951,25 @@
           { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
         ]
       },
-      "caret": { "start": 1, "length": 0 }
+      "caret": { "start": 1, "length": 0 },
+      "key": { key: "a", code: "KeyA", keyCode: KeyboardEvent.DOM_VK_A },
     });
-  synthesizeKey("a", { type: "keyup" });
 
   // Although, firing keypress event during composition is a bug.
   synthesizeKey("VK_INSERT", {});
 
   description = "events for committing composition string";
-  synthesizeKey("VK_RETURN", { type: "keydown" });
 
-  synthesizeComposition({ type: "compositioncommitasis" });
+  synthesizeComposition({ type: "compositioncommitasis",
+                          key: { key: "KEY_Enter", code: "Enter", type: "keydown" } });
 
   // input event will be fired by synthesizing compositionend event.
   // Then, its isComposing should be false.
   description = "events after dispatching compositioncommitasis";
   synthesizeKey("VK_RETURN", { type: "keyup" });
 
+  SpecialPowers.clearUserPref("dom.keyboardevent.dispatch_during_composition");
+
   textarea.removeEventListener("keydown", eventHandler, true);
   textarea.removeEventListener("keypress", eventHandler, true);
   textarea.removeEventListener("keyup", eventHandler, true);
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/TextEventDispatcher.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/TextEventDispatcher.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/TextEventDispatcher.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/TextEventDispatcher.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -3,6 +3,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/Preferences.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/TextEventDispatcher.h"
 #include "nsIDocShell.h"
@@ -19,12 +20,24 @@
  * TextEventDispatcher
  *****************************************************************************/
 
+bool TextEventDispatcher::sDispatchKeyEventsDuringComposition = false;
+
 TextEventDispatcher::TextEventDispatcher(nsIWidget* aWidget)
   : mWidget(aWidget)
+  , mDispatchingEvent(0)
   , mForTests(false)
   , mIsComposing(false)
 {
   MOZ_RELEASE_ASSERT(mWidget, "aWidget must not be nullptr");
+
+  static bool sInitialized = false;
+  if (!sInitialized) {
+    Preferences::AddBoolVarCache(
+      &sDispatchKeyEventsDuringComposition,
+      "dom.keyboardevent.dispatch_during_composition",
+      false);
+    sInitialized = true;
+  }
 }
 
 nsresult
@@ -54,8 +67,11 @@
     if (listener == aListener && mForTests == aForTests) {
       return NS_OK;
     }
-    // If this has composition, any other listener can steal ownership.
-    if (IsComposing()) {
+    // If this has composition or is dispatching an event, any other listener
+    // can steal ownership.  Especially, if the latter case is allowed,
+    // nobody cannot begin input transaction with this if a modal dialog is
+    // opened during dispatching an event.
+    if (IsComposing() || IsDispatchingEvent()) {
       return NS_ERROR_ALREADY_INITIALIZED;
     }
   }
@@ -93,13 +109,27 @@
 }
 
 void
-TextEventDispatcher::InitEvent(WidgetCompositionEvent& aEvent) const
+TextEventDispatcher::InitEvent(WidgetGUIEvent& aEvent) const
 {
   aEvent.time = PR_IntervalNow();
+  aEvent.refPoint = LayoutDeviceIntPoint(0, 0);
   aEvent.mFlags.mIsSynthesizedForTests = mForTests;
 }
 
 nsresult
+TextEventDispatcher::DispatchEvent(nsIWidget* aWidget,
+                                   WidgetGUIEvent& aEvent,
+                                   nsEventStatus& aStatus)
+{
+  nsRefPtr<TextEventDispatcher> kungFuDeathGrip(this);
+  nsCOMPtr<nsIWidget> widget(aWidget);
+  mDispatchingEvent++;
+  nsresult rv = widget->DispatchEvent(&aEvent, aStatus);
+  mDispatchingEvent--;
+  return rv;
+}
+
+nsresult
 TextEventDispatcher::StartComposition(nsEventStatus& aStatus)
 {
   aStatus = nsEventStatus_eIgnore;
@@ -114,11 +144,10 @@
   }
 
   mIsComposing = true;
-  nsCOMPtr<nsIWidget> widget(mWidget);
   WidgetCompositionEvent compositionStartEvent(true, NS_COMPOSITION_START,
-                                               widget);
+                                               mWidget);
   InitEvent(compositionStartEvent);
-  rv = widget->DispatchEvent(&compositionStartEvent, aStatus);
+  rv = DispatchEvent(mWidget, compositionStartEvent, aStatus);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -199,7 +228,7 @@
   if (message == NS_COMPOSITION_COMMIT) {
     compositionCommitEvent.mData = *aCommitString;
   }
-  rv = widget->DispatchEvent(&compositionCommitEvent, aStatus);
+  rv = DispatchEvent(widget, compositionCommitEvent, aStatus);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -224,6 +253,143 @@
   return rv;
 }
 
+bool
+TextEventDispatcher::DispatchKeyboardEvent(
+                       uint32_t aMessage,
+                       const WidgetKeyboardEvent& aKeyboardEvent,
+                       nsEventStatus& aStatus)
+{
+  return DispatchKeyboardEventInternal(aMessage, aKeyboardEvent, aStatus);
+}
+
+bool
+TextEventDispatcher::DispatchKeyboardEventInternal(
+                       uint32_t aMessage,
+                       const WidgetKeyboardEvent& aKeyboardEvent,
+                       nsEventStatus& aStatus,
+                       uint32_t aIndexOfKeypress)
+{
+  MOZ_ASSERT(aMessage == NS_KEY_DOWN || aMessage == NS_KEY_UP ||
+             aMessage == NS_KEY_PRESS, "Invalid aMessage value");
+  nsresult rv = GetState();
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return false;
+  }
+
+  // If the key shouldn't cause keypress events, don't this patch them.
+  if (aMessage == NS_KEY_PRESS && !aKeyboardEvent.ShouldCauseKeypressEvents()) {
+    return false;
+  }
+
+  // Basically, key events shouldn't be dispatched during composition.
+  if (IsComposing()) {
+    // However, if we need to behave like other browsers, we need the keydown
+    // and keyup events.  Note that this behavior is also allowed by D3E spec.
+    // FYI: keypress events must not be fired during composition.
+    if (!sDispatchKeyEventsDuringComposition || aMessage == NS_KEY_PRESS) {
+      return false;
+    }
+    // XXX If there was mOnlyContentDispatch for this case, it might be useful
+    //     because our chrome doesn't assume that key events are fired during
+    //     composition.
+  }
+
+  WidgetKeyboardEvent keyEvent(true, aMessage, mWidget);
+  InitEvent(keyEvent);
+  keyEvent.AssignKeyEventData(aKeyboardEvent, false);
+
+  if (aStatus == nsEventStatus_eConsumeNoDefault) {
+    // If the key event should be dispatched as consumed event, marking it here.
+    // This is useful to prevent double action.  E.g., when the key was already
+    // handled by system, our chrome shouldn't handle it.
+    keyEvent.mFlags.mDefaultPrevented = true;
+  }
+
+  // Corrects each member for the specific key event type.
+  if (aMessage == NS_KEY_DOWN || aMessage == NS_KEY_UP) {
+    MOZ_ASSERT(!aIndexOfKeypress,
+      "aIndexOfKeypress must be 0 for either NS_KEY_DOWN or NS_KEY_UP");
+    // charCode of keydown and keyup should be 0.
+    keyEvent.charCode = 0;
+  } else if (keyEvent.mKeyNameIndex != KEY_NAME_INDEX_USE_STRING) {
+    MOZ_ASSERT(!aIndexOfKeypress,
+      "aIndexOfKeypress must be 0 for NS_KEY_PRESS of non-printable key");
+    // If keypress event isn't caused by printable key, its charCode should
+    // be 0.
+    keyEvent.charCode = 0;
+  } else {
+    MOZ_RELEASE_ASSERT(
+      !aIndexOfKeypress || aIndexOfKeypress < keyEvent.mKeyValue.Length(),
+      "aIndexOfKeypress must be 0 - mKeyValue.Length() - 1");
+    keyEvent.keyCode = 0;
+    wchar_t ch =
+      keyEvent.mKeyValue.IsEmpty() ? 0 : keyEvent.mKeyValue[aIndexOfKeypress];
+    keyEvent.charCode = static_cast<uint32_t>(ch);
+    if (ch) {
+      keyEvent.mKeyValue.Assign(ch);
+    } else {
+      keyEvent.mKeyValue.Truncate();
+    }
+  }
+  if (aMessage == NS_KEY_UP) {
+    // mIsRepeat of keyup event must be false.
+    keyEvent.mIsRepeat = false;
+  }
+  // mIsComposing should be initialized later.
+  keyEvent.mIsComposing = false;
+  // XXX Currently, we don't support to dispatch key event with native key
+  //     event information.
+  keyEvent.mNativeKeyEvent = nullptr;
+  // XXX Currently, we don't support to dispatch key events with data for
+  // plugins.
+  keyEvent.mPluginEvent.Clear();
+  // TODO: Manage mUniqueId here.
+
+  DispatchEvent(mWidget, keyEvent, aStatus);
+  return true;
+}
+
+bool
+TextEventDispatcher::MaybeDispatchKeypressEvents(
+                       const WidgetKeyboardEvent& aKeyboardEvent,
+                       nsEventStatus& aStatus)
+{
+  // If the key event was consumed, keypress event shouldn't be fired.
+  if (aStatus == nsEventStatus_eConsumeNoDefault) {
+    return false;
+  }
+
+  // If the key isn't a printable key or just inputting one character or
+  // no character, we should dispatch only one keypress.  Otherwise, i.e.,
+  // if the key is a printable key and inputs multiple characters, keypress
+  // event should be dispatched the count of inputting characters times.
+  size_t keypressCount =
+    aKeyboardEvent.mKeyNameIndex != KEY_NAME_INDEX_USE_STRING ?
+      1 : std::max(static_cast<nsAString::size_type>(1),
+                   aKeyboardEvent.mKeyValue.Length());
+  bool isDispatched = false;
+  bool consumed = false;
+  for (size_t i = 0; i < keypressCount; i++) {
+    aStatus = nsEventStatus_eIgnore;
+    if (!DispatchKeyboardEventInternal(NS_KEY_PRESS, aKeyboardEvent,
+                                       aStatus, i)) {
+      // The widget must have been gone.
+      break;
+    }
+    isDispatched = true;
+    if (!consumed) {
+      consumed = (aStatus == nsEventStatus_eConsumeNoDefault);
+    }
+  }
+
+  // If one of the keypress event was consumed, return ConsumeNoDefault.
+  if (consumed) {
+    aStatus = nsEventStatus_eConsumeNoDefault;
+  }
+
+  return isDispatched;
+}
+
 /******************************************************************************
  * TextEventDispatcher::PendingComposition
  *****************************************************************************/
@@ -322,6 +488,7 @@
     mClauses->AppendElement(mCaret);
   }
 
+  nsRefPtr<TextEventDispatcher> kungFuDeathGrip(aDispatcher);
   nsCOMPtr<nsIWidget> widget(aDispatcher->mWidget);
   WidgetCompositionEvent compChangeEvent(true, NS_COMPOSITION_CHANGE, widget);
   aDispatcher->InitEvent(compChangeEvent);
@@ -344,7 +511,7 @@
   if (aStatus == nsEventStatus_eConsumeNoDefault) {
     return NS_OK;
   }
-  rv = widget->DispatchEvent(&compChangeEvent, aStatus);
+  rv = aDispatcher->DispatchEvent(widget, compChangeEvent, aStatus);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/TextEventDispatcher.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/TextEventDispatcher.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/TextEventDispatcher.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/TextEventDispatcher.h	2015-02-28 15:03:10.000000000 +0000
@@ -23,8 +23,8 @@
 /**
  * TextEventDispatcher is a helper class for dispatching widget events defined
  * in TextEvents.h.  Currently, this is a helper for dispatching
- * WidgetCompositionEvent.  However, WidgetKeyboardEvent and/or
- * WidgetQueryContentEvent may be supported by this class in the future.
+ * WidgetCompositionEvent and WidgetKeyboardEvent.  This manages the behavior
+ * of them for conforming to DOM Level 3 Events.
  * An instance of this class is created by nsIWidget instance and owned by it.
  * This is typically created only by the top level widgets because only they
  * handle IME.
@@ -83,6 +83,11 @@
   bool IsComposing() const { return mIsComposing; }
 
   /**
+   * IsDispatchingEvent() returns true while this instance dispatching an event.
+   */
+  bool IsDispatchingEvent() const { return mDispatchingEvent > 0; }
+
+  /**
    * StartComposition() starts composition explicitly.
    */
   nsresult StartComposition(nsEventStatus& aStatus);
@@ -155,10 +160,54 @@
   }
 
   /**
+   * ClearPendingComposition() makes this instance forget pending composition.
+   */
+  void ClearPendingComposition()
+  {
+    mPendingComposition.Clear();
+  }
+
+  /**
    * @see nsIWidget::NotifyIME()
    */
   nsresult NotifyIME(const IMENotification& aIMENotification);
 
+  /**
+   * DispatchKeyboardEvent() maybe dispatches aKeyboardEvent.
+   *
+   * @param aMessage        Must be NS_KEY_DOWN or NS_KEY_UP.
+   *                        Use MaybeDispatchKeypressEvents() for dispatching
+   *                        NS_KEY_PRESS.
+   * @param aKeyboardEvent  A keyboard event.
+   * @param aStatus         If dispatching event should be marked as consumed,
+   *                        set nsEventStatus_eConsumeNoDefault.  Otherwise,
+   *                        set nsEventStatus_eIgnore.  After dispatching
+   *                        a event and it's consumed this returns
+   *                        nsEventStatus_eConsumeNoDefault.
+   * @return                true if an event is dispatched.  Otherwise, false.
+   */
+  bool DispatchKeyboardEvent(uint32_t aMessage,
+                             const WidgetKeyboardEvent& aKeyboardEvent,
+                             nsEventStatus& aStatus);
+
+  /**
+   * MaybeDispatchKeypressEvents() maybe dispatches a keypress event which is
+   * generated from aKeydownEvent.
+   *
+   * @param aKeyboardEvent  A keyboard event.
+   * @param aStatus         Sets the result when the caller dispatches
+   *                        aKeyboardEvent.  Note that if the value is
+   *                        nsEventStatus_eConsumeNoDefault, this does NOT
+   *                        dispatch keypress events.
+   *                        When this method dispatches one or more keypress
+   *                        events and one of them is consumed, this returns
+   *                        nsEventStatus_eConsumeNoDefault.
+   * @return                true if one or more events are dispatched.
+   *                        Otherwise, false.
+   */
+  bool MaybeDispatchKeypressEvents(const WidgetKeyboardEvent& aKeyboardEvent,
+                                   nsEventStatus& aStatus);
+
 private:
   // mWidget is owner of the instance.  When this is created, this is set.
   // And when mWidget is released, this is cleared by OnDestroyWidget().
@@ -195,10 +244,17 @@
   };
   PendingComposition mPendingComposition;
 
+  // While dispatching an event, this is incremented.
+  uint16_t mDispatchingEvent;
+
   bool mForTests;
   // See IsComposing().
   bool mIsComposing;
 
+  // If this is true, keydown and keyup events are dispatched even when there
+  // is a composition.
+  static bool sDispatchKeyEventsDuringComposition;
+
   nsresult BeginInputTransactionInternal(
              TextEventDispatcherListener* aListener,
              bool aForTests);
@@ -207,7 +263,14 @@
    * InitEvent() initializes aEvent.  This must be called before dispatching
    * the event.
    */
-  void InitEvent(WidgetCompositionEvent& aEvent) const;
+  void InitEvent(WidgetGUIEvent& aEvent) const;
+
+  /**
+   * DispatchEvent() dispatches aEvent on aWidget.
+   */
+  nsresult DispatchEvent(nsIWidget* aWidget,
+                         WidgetGUIEvent& aEvent,
+                         nsEventStatus& aStatus);
 
   /**
    * StartCompositionAutomaticallyIfNecessary() starts composition if it hasn't
@@ -224,6 +287,32 @@
    *                        is nsEventStatus_eConsumeNoDefault.
    */
   nsresult StartCompositionAutomaticallyIfNecessary(nsEventStatus& aStatus);
+
+  /**
+   * DispatchKeyboardEventInternal() maybe dispatches aKeyboardEvent.
+   *
+   * @param aMessage        Must be NS_KEY_DOWN, NS_KEY_UP or NS_KEY_PRESS.
+   * @param aKeyboardEvent  A keyboard event.  If aMessage is NS_KEY_PRESS and
+   *                        the event is for second or later character, its
+   *                        mKeyValue should be empty string.
+   * @param aStatus         If dispatching event should be marked as consumed,
+   *                        set nsEventStatus_eConsumeNoDefault.  Otherwise,
+   *                        set nsEventStatus_eIgnore.  After dispatching
+   *                        a event and it's consumed this returns
+   *                        nsEventStatus_eConsumeNoDefault.
+   * @param aIndexOfKeypress    This must be 0 if aMessage isn't NS_KEY_PRESS or
+   *                            aKeyboard.mKeyNameIndex isn't
+   *                            KEY_NAME_INDEX_USE_STRING.  Otherwise, i.e.,
+   *                            when an NS_KEY_PRESS event causes inputting
+   *                            text, this must be between 0 and
+   *                            mKeyValue.Length() - 1 since keypress events
+   *                            sending only one character per event.
+   * @return                true if an event is dispatched.  Otherwise, false.
+   */
+  bool DispatchKeyboardEventInternal(uint32_t aMessage,
+                                     const WidgetKeyboardEvent& aKeyboardEvent,
+                                     nsEventStatus& aStatus,
+                                     uint32_t aIndexOfKeypress = 0);
 };
 
 } // namespace widget
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/TextEvents.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/TextEvents.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/TextEvents.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/TextEvents.h	2015-02-28 15:03:10.000000000 +0000
@@ -21,6 +21,9 @@
 #include "nsTArray.h"
 #include "WritingModes.h"
 
+class nsStringHashKey;
+template<class, class> class nsDataHashtable;
+
 /******************************************************************************
  * virtual keycode values
  ******************************************************************************/
@@ -162,8 +165,15 @@
   uint32_t mNativeModifierFlags;
   nsString mNativeCharacters;
   nsString mNativeCharactersIgnoringModifiers;
+  // If this is non-empty, create a text event for plugins instead of a
+  // keyboard event.
+  nsString mPluginTextEventString;
 #endif
 
+  // If the key should cause keypress events, this returns true.
+  // Otherwise, false.
+  bool ShouldCauseKeypressEvents() const;
+
   void GetDOMKeyName(nsAString& aKeyName)
   {
     if (mKeyNameIndex == KEY_NAME_INDEX_USE_STRING) {
@@ -181,13 +191,48 @@
     GetDOMCodeName(mCodeNameIndex, aCodeName);
   }
 
+  bool IsModifierKeyEvent() const
+  {
+    return GetModifierForKeyName(mKeyNameIndex) != MODIFIER_NONE;
+  }
+
+  static void Shutdown();
+
+  /**
+   * ComputeLocationFromCodeValue() returns one of .location value
+   * (nsIDOMKeyEvent::DOM_KEY_LOCATION_*) which is the most preferred value
+   * for the specified specified code value.
+   */
   static uint32_t ComputeLocationFromCodeValue(CodeNameIndex aCodeNameIndex);
 
+  /**
+   * ComputeKeyCodeFromKeyNameIndex() return a .keyCode value which can be
+   * mapped from the specified key value.  Note that this returns 0 if the
+   * key name index is KEY_NAME_INDEX_Unidentified or KEY_NAME_INDEX_USE_STRING.
+   * This means that this method is useful only for non-printable keys.
+   */
+  static uint32_t ComputeKeyCodeFromKeyNameIndex(KeyNameIndex aKeyNameIndex);
+
+  /**
+   * GetModifierForKeyName() returns a value of Modifier which is activated
+   * by the aKeyNameIndex.
+   */
+  static Modifier GetModifierForKeyName(KeyNameIndex aKeyNameIndex);
+
+  /**
+   * IsLockableModifier() returns true if aKeyNameIndex is a lockable modifier
+   * key such as CapsLock and NumLock.
+   */
+  static bool IsLockableModifier(KeyNameIndex aKeyNameIndex);
+
   static void GetDOMKeyName(KeyNameIndex aKeyNameIndex,
                             nsAString& aKeyName);
   static void GetDOMCodeName(CodeNameIndex aCodeNameIndex,
                              nsAString& aCodeName);
 
+  static KeyNameIndex GetKeyNameIndex(const nsAString& aKeyValue);
+  static CodeNameIndex GetCodeNameIndex(const nsAString& aCodeValue);
+
   static const char* GetCommandStr(Command aCommand);
 
   void AssignKeyEventData(const WidgetKeyboardEvent& aEvent, bool aCopyTargets)
@@ -209,7 +254,25 @@
     // is destroyed.
     mNativeKeyEvent = nullptr;
     mUniqueId = aEvent.mUniqueId;
+#ifdef XP_MACOSX
+    mNativeKeyCode = aEvent.mNativeKeyCode;
+    mNativeModifierFlags = aEvent.mNativeModifierFlags;
+    mNativeCharacters.Assign(aEvent.mNativeCharacters);
+    mNativeCharactersIgnoringModifiers.
+      Assign(aEvent.mNativeCharactersIgnoringModifiers);
+    mPluginTextEventString.Assign(aEvent.mPluginTextEventString);
+#endif
   }
+
+private:
+  static const char16_t* kKeyNames[];
+  static const char16_t* kCodeNames[];
+  typedef nsDataHashtable<nsStringHashKey,
+                          KeyNameIndex> KeyNameIndexHashtable;
+  typedef nsDataHashtable<nsStringHashKey,
+                          CodeNameIndex> CodeNameIndexHashtable;
+  static KeyNameIndexHashtable* sKeyNameIndexHashtable;
+  static CodeNameIndexHashtable* sCodeNameIndexHashtable;
 };
 
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/WidgetEventImpl.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/WidgetEventImpl.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/WidgetEventImpl.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/WidgetEventImpl.cpp	2015-02-28 15:03:10.000000000 +0000
@@ -256,6 +256,17 @@
 
 /* static */
 Modifier
+WidgetInputEvent::GetModifier(const nsAString& aDOMKeyName)
+{
+  if (aDOMKeyName.EqualsLiteral("Accel")) {
+    return AccelModifier();
+  }
+  KeyNameIndex keyNameIndex = WidgetKeyboardEvent::GetKeyNameIndex(aDOMKeyName);
+  return WidgetKeyboardEvent::GetModifierForKeyName(keyNameIndex);
+}
+
+/* static */
+Modifier
 WidgetInputEvent::AccelModifier()
 {
   static Modifier sAccelModifier = MODIFIER_NONE;
@@ -289,73 +300,75 @@
  * mozilla::WidgetKeyboardEvent (TextEvents.h)
  ******************************************************************************/
 
-/*static*/ void
-WidgetKeyboardEvent::GetDOMKeyName(KeyNameIndex aKeyNameIndex,
-                                   nsAString& aKeyName)
-{
-  // The expected way to implement this function would be to use a
-  // switch statement.  By using a table-based implementation, below, we
-  // ensure that this function executes in constant time in cases where
-  // compilers wouldn't be able to convert the switch statement to a
-  // jump table.  This table-based implementation also minimizes the
-  // space required by the code and data.
-#define KEY_STR_NUM_INTERNAL(line) key##line
-#define KEY_STR_NUM(line) KEY_STR_NUM_INTERNAL(line)
-
-  // Catch non-ASCII DOM key names in our key name list.
-#define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName)                      \
-  static_assert(sizeof(aDOMKeyName) == MOZ_ARRAY_LENGTH(aDOMKeyName), \
-                "Invalid DOM key name");
+#define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName) MOZ_UTF16(aDOMKeyName),
+const char16_t* WidgetKeyboardEvent::kKeyNames[] = {
 #include "mozilla/KeyNameList.h"
+};
 #undef NS_DEFINE_KEYNAME
 
-  struct KeyNameTable
-  {
-#define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName)          \
-    char16_t KEY_STR_NUM(__LINE__)[sizeof(aDOMKeyName)];
-#include "mozilla/KeyNameList.h"
-#undef NS_DEFINE_KEYNAME
-  };
+#define NS_DEFINE_PHYSICAL_KEY_CODE_NAME(aCPPName, aDOMCodeName) \
+    MOZ_UTF16(aDOMCodeName),
+const char16_t* WidgetKeyboardEvent::kCodeNames[] = {
+#include "mozilla/PhysicalKeyCodeNameList.h"
+};
+#undef NS_DEFINE_PHYSICAL_KEY_CODE_NAME
 
-  static const KeyNameTable kKeyNameTable = {
-#define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName) MOZ_UTF16(aDOMKeyName),
-#include "mozilla/KeyNameList.h"
-#undef NS_DEFINE_KEYNAME
-  };
+WidgetKeyboardEvent::KeyNameIndexHashtable*
+  WidgetKeyboardEvent::sKeyNameIndexHashtable = nullptr;
+WidgetKeyboardEvent::CodeNameIndexHashtable*
+  WidgetKeyboardEvent::sCodeNameIndexHashtable = nullptr;
 
-  static const uint16_t kKeyNameOffsets[] = {
-#define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName)          \
-    offsetof(struct KeyNameTable, KEY_STR_NUM(__LINE__)) / sizeof(char16_t),
-#include "mozilla/KeyNameList.h"
-#undef NS_DEFINE_KEYNAME
-    // Include this entry so we can compute lengths easily.
-    sizeof(kKeyNameTable)
-  };
+bool
+WidgetKeyboardEvent::ShouldCauseKeypressEvents() const
+{
+  // Currently, we don't dispatch keypress events of modifier keys.
+  switch (mKeyNameIndex) {
+    case KEY_NAME_INDEX_Alt:
+    case KEY_NAME_INDEX_AltGraph:
+    case KEY_NAME_INDEX_CapsLock:
+    case KEY_NAME_INDEX_Control:
+    case KEY_NAME_INDEX_Fn:
+    case KEY_NAME_INDEX_FnLock:
+    // case KEY_NAME_INDEX_Hyper:
+    case KEY_NAME_INDEX_Meta:
+    case KEY_NAME_INDEX_NumLock:
+    case KEY_NAME_INDEX_OS:
+    case KEY_NAME_INDEX_ScrollLock:
+    case KEY_NAME_INDEX_Shift:
+    // case KEY_NAME_INDEX_Super:
+    case KEY_NAME_INDEX_Symbol:
+    case KEY_NAME_INDEX_SymbolLock:
+      return false;
+    default:
+      return true;
+  }
+}
 
-  // Use the sizeof trick rather than MOZ_ARRAY_LENGTH to avoid problems
-  // with constexpr functions called inside static_assert with some
-  // compilers.
-  static_assert(KEY_NAME_INDEX_USE_STRING ==
-                (sizeof(kKeyNameOffsets)/sizeof(kKeyNameOffsets[0])) - 1,
-                "Invalid enumeration values!");
+/* static */ void
+WidgetKeyboardEvent::Shutdown()
+{
+  delete sKeyNameIndexHashtable;
+  sKeyNameIndexHashtable = nullptr;
+  delete sCodeNameIndexHashtable;
+  sCodeNameIndexHashtable = nullptr;
+}
 
+/* static */ void
+WidgetKeyboardEvent::GetDOMKeyName(KeyNameIndex aKeyNameIndex,
+                                   nsAString& aKeyName)
+{
   if (aKeyNameIndex >= KEY_NAME_INDEX_USE_STRING) {
     aKeyName.Truncate();
     return;
   }
 
-  uint16_t offset = kKeyNameOffsets[aKeyNameIndex];
-  uint16_t nextOffset = kKeyNameOffsets[aKeyNameIndex + 1];
-  const char16_t* table = reinterpret_cast<const char16_t*>(&kKeyNameTable);
-
-  // Subtract off 1 for the null terminator.
-  aKeyName.Assign(table + offset, nextOffset - offset - 1);
-
-#undef KEY_STR_NUM
-#undef KEY_STR_NUM_INTERNAL
+  MOZ_RELEASE_ASSERT(static_cast<size_t>(aKeyNameIndex) <
+                       ArrayLength(kKeyNames),
+                     "Illegal key enumeration value");
+  aKeyName = kKeyNames[aKeyNameIndex];
 }
 
-/*static*/ void
+/* static */ void
 WidgetKeyboardEvent::GetDOMCodeName(CodeNameIndex aCodeNameIndex,
                                     nsAString& aCodeName)
 {
@@ -364,20 +377,44 @@
     return;
   }
 
-#define NS_DEFINE_PHYSICAL_KEY_CODE_NAME(aCPPName, aDOMCodeName) \
-    MOZ_UTF16(aDOMCodeName),
-  static const char16_t* kCodeNames[] = {
-#include "mozilla/PhysicalKeyCodeNameList.h"
-    MOZ_UTF16("")
-  };
-#undef NS_DEFINE_PHYSICAL_KEY_CODE_NAME
-
   MOZ_RELEASE_ASSERT(static_cast<size_t>(aCodeNameIndex) <
                        ArrayLength(kCodeNames),
                      "Illegal physical code enumeration value");
   aCodeName = kCodeNames[aCodeNameIndex];
 }
 
+/* static */ KeyNameIndex
+WidgetKeyboardEvent::GetKeyNameIndex(const nsAString& aKeyValue)
+{
+  if (!sKeyNameIndexHashtable) {
+    sKeyNameIndexHashtable =
+      new KeyNameIndexHashtable(ArrayLength(kKeyNames));
+    for (size_t i = 0; i < ArrayLength(kKeyNames); i++) {
+      sKeyNameIndexHashtable->Put(nsDependentString(kKeyNames[i]),
+                                  static_cast<KeyNameIndex>(i));
+    }
+  }
+  KeyNameIndex result = KEY_NAME_INDEX_USE_STRING;
+  sKeyNameIndexHashtable->Get(aKeyValue, &result);
+  return result;
+}
+
+/* static */ CodeNameIndex
+WidgetKeyboardEvent::GetCodeNameIndex(const nsAString& aCodeValue)
+{
+  if (!sCodeNameIndexHashtable) {
+    sCodeNameIndexHashtable =
+      new CodeNameIndexHashtable(ArrayLength(kCodeNames));
+    for (size_t i = 0; i < ArrayLength(kCodeNames); i++) {
+      sCodeNameIndexHashtable->Put(nsDependentString(kCodeNames[i]),
+                                   static_cast<CodeNameIndex>(i));
+    }
+  }
+  CodeNameIndex result = CODE_NAME_INDEX_USE_STRING;
+  sCodeNameIndexHashtable->Get(aCodeValue, &result);
+  return result;
+}
+
 /* static */ const char*
 WidgetKeyboardEvent::GetCommandStr(Command aCommand)
 {
@@ -422,21 +459,21 @@
     case CODE_NAME_INDEX_Numpad9:
     case CODE_NAME_INDEX_NumpadAdd:
     case CODE_NAME_INDEX_NumpadBackspace:
-    // case CODE_NAME_INDEX_NumpadClear:
-    // case CODE_NAME_INDEX_NumpadClearEntry:
+    case CODE_NAME_INDEX_NumpadClear:
+    case CODE_NAME_INDEX_NumpadClearEntry:
     case CODE_NAME_INDEX_NumpadComma:
     case CODE_NAME_INDEX_NumpadDecimal:
     case CODE_NAME_INDEX_NumpadDivide:
     case CODE_NAME_INDEX_NumpadEnter:
     case CODE_NAME_INDEX_NumpadEqual:
-    // case CODE_NAME_INDEX_NumpadMemoryAdd:
-    // case CODE_NAME_INDEX_NumpadMemoryClear:
-    // case CODE_NAME_INDEX_NumpadMemoryRecall:
-    // case CODE_NAME_INDEX_NumpadMemoryStore:
+    case CODE_NAME_INDEX_NumpadMemoryAdd:
+    case CODE_NAME_INDEX_NumpadMemoryClear:
+    case CODE_NAME_INDEX_NumpadMemoryRecall:
+    case CODE_NAME_INDEX_NumpadMemoryStore:
     case CODE_NAME_INDEX_NumpadMemorySubtract:
     case CODE_NAME_INDEX_NumpadMultiply:
-    // case CODE_NAME_INDEX_NumpadParenLeft:
-    // case CODE_NAME_INDEX_NumpadParenRight:
+    case CODE_NAME_INDEX_NumpadParenLeft:
+    case CODE_NAME_INDEX_NumpadParenRight:
     case CODE_NAME_INDEX_NumpadSubtract:
       return nsIDOMKeyEvent::DOM_KEY_LOCATION_NUMPAD;
     default:
@@ -444,4 +481,226 @@
   }
 }
 
+/* static */ uint32_t
+WidgetKeyboardEvent::ComputeKeyCodeFromKeyNameIndex(KeyNameIndex aKeyNameIndex)
+{
+  switch (aKeyNameIndex) {
+    case KEY_NAME_INDEX_Cancel:
+      return nsIDOMKeyEvent::DOM_VK_CANCEL;
+    case KEY_NAME_INDEX_Help:
+      return nsIDOMKeyEvent::DOM_VK_HELP;
+    case KEY_NAME_INDEX_Backspace:
+      return nsIDOMKeyEvent::DOM_VK_BACK_SPACE;
+    case KEY_NAME_INDEX_Tab:
+      return nsIDOMKeyEvent::DOM_VK_TAB;
+    case KEY_NAME_INDEX_Clear:
+      return nsIDOMKeyEvent::DOM_VK_CLEAR;
+    case KEY_NAME_INDEX_Enter:
+      return nsIDOMKeyEvent::DOM_VK_RETURN;
+    case KEY_NAME_INDEX_Shift:
+      return nsIDOMKeyEvent::DOM_VK_SHIFT;
+    case KEY_NAME_INDEX_Control:
+      return nsIDOMKeyEvent::DOM_VK_CONTROL;
+    case KEY_NAME_INDEX_Alt:
+      return nsIDOMKeyEvent::DOM_VK_ALT;
+    case KEY_NAME_INDEX_Pause:
+      return nsIDOMKeyEvent::DOM_VK_PAUSE;
+    case KEY_NAME_INDEX_CapsLock:
+      return nsIDOMKeyEvent::DOM_VK_CAPS_LOCK;
+    case KEY_NAME_INDEX_Hiragana:
+    case KEY_NAME_INDEX_Katakana:
+    case KEY_NAME_INDEX_HiraganaKatakana:
+    case KEY_NAME_INDEX_KanaMode:
+      return nsIDOMKeyEvent::DOM_VK_KANA;
+    case KEY_NAME_INDEX_HangulMode:
+      return nsIDOMKeyEvent::DOM_VK_HANGUL;
+    case KEY_NAME_INDEX_Eisu:
+      return nsIDOMKeyEvent::DOM_VK_EISU;
+    case KEY_NAME_INDEX_JunjaMode:
+      return nsIDOMKeyEvent::DOM_VK_JUNJA;
+    case KEY_NAME_INDEX_FinalMode:
+      return nsIDOMKeyEvent::DOM_VK_FINAL;
+    case KEY_NAME_INDEX_HanjaMode:
+      return nsIDOMKeyEvent::DOM_VK_HANJA;
+    case KEY_NAME_INDEX_KanjiMode:
+      return nsIDOMKeyEvent::DOM_VK_KANJI;
+    case KEY_NAME_INDEX_Escape:
+      return nsIDOMKeyEvent::DOM_VK_ESCAPE;
+    case KEY_NAME_INDEX_Convert:
+      return nsIDOMKeyEvent::DOM_VK_CONVERT;
+    case KEY_NAME_INDEX_NonConvert:
+      return nsIDOMKeyEvent::DOM_VK_NONCONVERT;
+    case KEY_NAME_INDEX_Accept:
+      return nsIDOMKeyEvent::DOM_VK_ACCEPT;
+    case KEY_NAME_INDEX_ModeChange:
+      return nsIDOMKeyEvent::DOM_VK_MODECHANGE;
+    case KEY_NAME_INDEX_PageUp:
+      return nsIDOMKeyEvent::DOM_VK_PAGE_UP;
+    case KEY_NAME_INDEX_PageDown:
+      return nsIDOMKeyEvent::DOM_VK_PAGE_DOWN;
+    case KEY_NAME_INDEX_End:
+      return nsIDOMKeyEvent::DOM_VK_END;
+    case KEY_NAME_INDEX_Home:
+      return nsIDOMKeyEvent::DOM_VK_HOME;
+    case KEY_NAME_INDEX_ArrowLeft:
+      return nsIDOMKeyEvent::DOM_VK_LEFT;
+    case KEY_NAME_INDEX_ArrowUp:
+      return nsIDOMKeyEvent::DOM_VK_UP;
+    case KEY_NAME_INDEX_ArrowRight:
+      return nsIDOMKeyEvent::DOM_VK_RIGHT;
+    case KEY_NAME_INDEX_ArrowDown:
+      return nsIDOMKeyEvent::DOM_VK_DOWN;
+    case KEY_NAME_INDEX_Select:
+      return nsIDOMKeyEvent::DOM_VK_SELECT;
+    case KEY_NAME_INDEX_Print:
+      return nsIDOMKeyEvent::DOM_VK_PRINT;
+    case KEY_NAME_INDEX_Execute:
+      return nsIDOMKeyEvent::DOM_VK_EXECUTE;
+    case KEY_NAME_INDEX_PrintScreen:
+      return nsIDOMKeyEvent::DOM_VK_PRINTSCREEN;
+    case KEY_NAME_INDEX_Insert:
+      return nsIDOMKeyEvent::DOM_VK_INSERT;
+    case KEY_NAME_INDEX_Delete:
+      return nsIDOMKeyEvent::DOM_VK_DELETE;
+    case KEY_NAME_INDEX_OS:
+    // case KEY_NAME_INDEX_Super:
+    // case KEY_NAME_INDEX_Hyper:
+      return nsIDOMKeyEvent::DOM_VK_WIN;
+    case KEY_NAME_INDEX_ContextMenu:
+      return nsIDOMKeyEvent::DOM_VK_CONTEXT_MENU;
+    case KEY_NAME_INDEX_Standby:
+      return nsIDOMKeyEvent::DOM_VK_SLEEP;
+    case KEY_NAME_INDEX_F1:
+      return nsIDOMKeyEvent::DOM_VK_F1;
+    case KEY_NAME_INDEX_F2:
+      return nsIDOMKeyEvent::DOM_VK_F2;
+    case KEY_NAME_INDEX_F3:
+      return nsIDOMKeyEvent::DOM_VK_F3;
+    case KEY_NAME_INDEX_F4:
+      return nsIDOMKeyEvent::DOM_VK_F4;
+    case KEY_NAME_INDEX_F5:
+      return nsIDOMKeyEvent::DOM_VK_F5;
+    case KEY_NAME_INDEX_F6:
+      return nsIDOMKeyEvent::DOM_VK_F6;
+    case KEY_NAME_INDEX_F7:
+      return nsIDOMKeyEvent::DOM_VK_F7;
+    case KEY_NAME_INDEX_F8:
+      return nsIDOMKeyEvent::DOM_VK_F8;
+    case KEY_NAME_INDEX_F9:
+      return nsIDOMKeyEvent::DOM_VK_F9;
+    case KEY_NAME_INDEX_F10:
+      return nsIDOMKeyEvent::DOM_VK_F10;
+    case KEY_NAME_INDEX_F11:
+      return nsIDOMKeyEvent::DOM_VK_F11;
+    case KEY_NAME_INDEX_F12:
+      return nsIDOMKeyEvent::DOM_VK_F12;
+    case KEY_NAME_INDEX_F13:
+      return nsIDOMKeyEvent::DOM_VK_F13;
+    case KEY_NAME_INDEX_F14:
+      return nsIDOMKeyEvent::DOM_VK_F14;
+    case KEY_NAME_INDEX_F15:
+      return nsIDOMKeyEvent::DOM_VK_F15;
+    case KEY_NAME_INDEX_F16:
+      return nsIDOMKeyEvent::DOM_VK_F16;
+    case KEY_NAME_INDEX_F17:
+      return nsIDOMKeyEvent::DOM_VK_F17;
+    case KEY_NAME_INDEX_F18:
+      return nsIDOMKeyEvent::DOM_VK_F18;
+    case KEY_NAME_INDEX_F19:
+      return nsIDOMKeyEvent::DOM_VK_F19;
+    case KEY_NAME_INDEX_F20:
+      return nsIDOMKeyEvent::DOM_VK_F20;
+    case KEY_NAME_INDEX_F21:
+      return nsIDOMKeyEvent::DOM_VK_F21;
+    case KEY_NAME_INDEX_F22:
+      return nsIDOMKeyEvent::DOM_VK_F22;
+    case KEY_NAME_INDEX_F23:
+      return nsIDOMKeyEvent::DOM_VK_F23;
+    case KEY_NAME_INDEX_F24:
+      return nsIDOMKeyEvent::DOM_VK_F24;
+    case KEY_NAME_INDEX_NumLock:
+      return nsIDOMKeyEvent::DOM_VK_NUM_LOCK;
+    case KEY_NAME_INDEX_ScrollLock:
+      return nsIDOMKeyEvent::DOM_VK_SCROLL_LOCK;
+    case KEY_NAME_INDEX_VolumeMute:
+      return nsIDOMKeyEvent::DOM_VK_VOLUME_MUTE;
+    case KEY_NAME_INDEX_VolumeDown:
+      return nsIDOMKeyEvent::DOM_VK_VOLUME_DOWN;
+    case KEY_NAME_INDEX_VolumeUp:
+      return nsIDOMKeyEvent::DOM_VK_VOLUME_UP;
+    case KEY_NAME_INDEX_Meta:
+      return nsIDOMKeyEvent::DOM_VK_META;
+    case KEY_NAME_INDEX_AltGraph:
+      return nsIDOMKeyEvent::DOM_VK_ALTGR;
+    case KEY_NAME_INDEX_Attn:
+      return nsIDOMKeyEvent::DOM_VK_ATTN;
+    case KEY_NAME_INDEX_CrSel:
+      return nsIDOMKeyEvent::DOM_VK_CRSEL;
+    case KEY_NAME_INDEX_ExSel:
+      return nsIDOMKeyEvent::DOM_VK_EXSEL;
+    case KEY_NAME_INDEX_EraseEof:
+      return nsIDOMKeyEvent::DOM_VK_EREOF;
+    case KEY_NAME_INDEX_Play:
+      return nsIDOMKeyEvent::DOM_VK_PLAY;
+    case KEY_NAME_INDEX_ZoomToggle:
+    case KEY_NAME_INDEX_ZoomIn:
+    case KEY_NAME_INDEX_ZoomOut:
+      return nsIDOMKeyEvent::DOM_VK_ZOOM;
+    default:
+      return 0;
+  }
+}
+
+/* static */ Modifier
+WidgetKeyboardEvent::GetModifierForKeyName(KeyNameIndex aKeyNameIndex)
+{
+  switch (aKeyNameIndex) {
+    case KEY_NAME_INDEX_Alt:
+      return MODIFIER_ALT;
+    case KEY_NAME_INDEX_AltGraph:
+      return MODIFIER_ALTGRAPH;
+    case KEY_NAME_INDEX_CapsLock:
+      return MODIFIER_CAPSLOCK;
+    case KEY_NAME_INDEX_Control:
+      return MODIFIER_CONTROL;
+    case KEY_NAME_INDEX_Fn:
+      return MODIFIER_FN;
+    case KEY_NAME_INDEX_FnLock:
+      return MODIFIER_FNLOCK;
+    // case KEY_NAME_INDEX_Hyper:
+    case KEY_NAME_INDEX_Meta:
+      return MODIFIER_META;
+    case KEY_NAME_INDEX_NumLock:
+      return MODIFIER_NUMLOCK;
+    case KEY_NAME_INDEX_OS:
+      return MODIFIER_OS;
+    case KEY_NAME_INDEX_ScrollLock:
+      return MODIFIER_SCROLLLOCK;
+    case KEY_NAME_INDEX_Shift:
+      return MODIFIER_SHIFT;
+    // case KEY_NAME_INDEX_Super:
+    case KEY_NAME_INDEX_Symbol:
+      return MODIFIER_SYMBOL;
+    case KEY_NAME_INDEX_SymbolLock:
+      return MODIFIER_SYMBOLLOCK;
+    default:
+      return MODIFIER_NONE;
+  }
+}
+
+/* static */ bool
+WidgetKeyboardEvent::IsLockableModifier(KeyNameIndex aKeyNameIndex)
+{
+  switch (aKeyNameIndex) {
+    case KEY_NAME_INDEX_CapsLock:
+    case KEY_NAME_INDEX_FnLock:
+    case KEY_NAME_INDEX_NumLock:
+    case KEY_NAME_INDEX_ScrollLock:
+    case KEY_NAME_INDEX_SymbolLock:
+      return true;
+    default:
+      return false;
+  }
+}
+
 } // namespace mozilla
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/WidgetUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/WidgetUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/WidgetUtils.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/WidgetUtils.h	2015-02-28 15:03:10.000000000 +0000
@@ -43,6 +43,12 @@
 class WidgetUtils
 {
 public:
+  /**
+   * Shutdown() is called when "xpcom-will-shutdown" is notified.  This is
+   * useful when you need to observe the notification in XP level code under
+   * widget.
+   */
+  static void Shutdown();
 
   /**
    * Starting at the docshell item for the passed in DOM window this looks up
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/GfxInfo.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/GfxInfo.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/GfxInfo.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/GfxInfo.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -234,10 +234,14 @@
 
   if (winVersion == UNINITIALIZED_VALUE) {
     vinfo.dwOSVersionInfoSize = sizeof (vinfo);
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4996)
+#endif
     if (!GetVersionEx(&vinfo)) {
+#ifdef _MSC_VER
 #pragma warning(pop)
+#endif
       winVersion = kWindowsUnknown;
     } else {
       winVersion = int32_t(vinfo.dwMajorVersion << 16) + vinfo.dwMinorVersion;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/JumpListBuilder.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/JumpListBuilder.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/JumpListBuilder.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/JumpListBuilder.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -237,7 +237,6 @@
     if (NS_FAILED(currFile->GetPath(path)))
       continue;
 
-    int32_t len = path.Length();
     if (StringTail(path, 4).LowerCaseEqualsASCII(".ico")) {
       // Check if the cached ICO file exists
       bool exists;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/KeyboardLayout.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/KeyboardLayout.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/KeyboardLayout.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/KeyboardLayout.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -1625,7 +1625,6 @@
   // Bug 50255 and Bug 351310: Keep the characters unshifted for shortcuts and
   // accesskeys and make sure that numbers are always passed as such.
   if (uniChar && (mModKeyState.IsControl() || mModKeyState.IsAlt())) {
-    KeyboardLayout* keyboardLayout = KeyboardLayout::GetInstance();
     char16_t unshiftedCharCode =
       (mVirtualKeyCode >= '0' && mVirtualKeyCode <= '9') ?
         mVirtualKeyCode :  mModKeyState.IsShift() ?
@@ -2126,7 +2125,6 @@
   uint32_t skipUniChars = longestLength - inputtingChars.mLength;
   uint32_t skipShiftedChars = longestLength - shiftedChars.mLength;
   uint32_t skipUnshiftedChars = longestLength - unshiftedChars.mLength;
-  UINT keyCode = !inputtingChars.mLength ? mDOMKeyCode : 0;
   bool defaultPrevented = false;
   for (uint32_t cnt = 0; cnt < longestLength; cnt++) {
     uint16_t uniChar, shiftedChar, unshiftedChar;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsAppShell.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsAppShell.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsAppShell.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsAppShell.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -29,7 +29,7 @@
 // A wake lock listener that disables screen saver when requested by
 // Gecko. For example when we're playing video in a foreground tab we
 // don't want the screen saver to turn on.
-class WinWakeLockListener : public nsIDOMMozWakeLockListener {
+class WinWakeLockListener MOZ_FINAL : public nsIDOMMozWakeLockListener {
 public:
   NS_DECL_ISUPPORTS;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsDataObjCollection.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsDataObjCollection.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsDataObjCollection.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsDataObjCollection.h	2015-02-28 15:03:11.000000000 +0000
@@ -51,6 +51,10 @@
     virtual HRESULT GetFileContents(LPFORMATETC pFE, LPSTGMEDIUM pSTM);
     virtual HRESULT GetFirstSupporting(LPFORMATETC pFE, LPSTGMEDIUM pSTM);
 
+    using nsDataObj::GetFile;
+    using nsDataObj::GetFileContents;
+    using nsDataObj::GetText;
+
     // support for clipboard
     void AddDataFlavor(const char * aDataFlavor, LPFORMATETC aFE);
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsLookAndFeel.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsLookAndFeel.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsLookAndFeel.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsLookAndFeel.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -573,6 +573,8 @@
     case LookAndFeel::eFont_Tooltips:
       ptrLogFont = &ncm.lfStatusFont;
       break;
+    default:
+      MOZ_CRASH();
     }
     break;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsNativeThemeWin.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsNativeThemeWin.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsNativeThemeWin.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsNativeThemeWin.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -1025,7 +1025,6 @@
     case NS_THEME_PROGRESSBAR_CHUNK:
     case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL: {
       nsIFrame* parentFrame = aFrame->GetParent();
-      EventStates eventStates = GetContentState(parentFrame, aWidgetType);
       if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK_VERTICAL ||
           IsVerticalProgress(parentFrame)) {
         aPart = IsVistaOrLater() ?
@@ -1463,12 +1462,8 @@
     case NS_THEME_MENUCHECKBOX:
     case NS_THEME_MENURADIO:
       {
-        bool isChecked;
         EventStates eventState = GetContentState(aFrame, aWidgetType);
 
-        // NOTE: we can probably use NS_EVENT_STATE_CHECKED
-        isChecked = CheckBooleanAttr(aFrame, nsGkAtoms::checked);
-
         aPart = MENU_POPUPCHECK;
         aState = MC_CHECKMARKNORMAL;
 
@@ -3178,7 +3173,6 @@
     case NS_THEME_RADIOMENUITEM: {
       bool isTopLevel = false;
       bool isOpen = false;
-      bool isContainer = false;
       nsMenuFrame *menuFrame = do_QueryFrame(aFrame);
       EventStates eventState = GetContentState(aFrame, aWidgetType);
 
@@ -3194,7 +3188,6 @@
         // rendering.
         isTopLevel = menuFrame->IsOnMenuBar();
         isOpen = menuFrame->IsOpen();
-        isContainer = menuFrame->IsMenu();
       }
 
       if (IsDisabled(aFrame, eventState))
@@ -3477,6 +3470,8 @@
       ::SetRect(&lightRect, R.left, R.bottom-3, R.left+2, R.bottom-1);
       ::SetRect(&shadeRect, R.right-2, R.bottom-3, R.right, R.bottom-1);
       break;
+    default:
+      MOZ_CRASH();
   }
 
   // Background
@@ -3812,7 +3807,6 @@
       bool indeterminate = IsIndeterminateProgress(stateFrame, eventStates);
       bool vertical = IsVerticalProgress(stateFrame) ||
                       aWidgetType == NS_THEME_PROGRESSBAR_CHUNK_VERTICAL;
-      int32_t overlayPart = GetProgressOverlayStyle(vertical);
 
       nsIContent* content = aFrame->GetContent();
       if (!indeterminate || !content) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsTextStore.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsTextStore.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsTextStore.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsTextStore.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -597,6 +597,10 @@
     ADD_SEPARATOR_IF_NECESSARY(names);
     names += NS_DOM_KEYNAME_FN;
   }
+  if (aModifiers & MODIFIER_FNLOCK) {
+    ADD_SEPARATOR_IF_NECESSARY(names);
+    names += NS_DOM_KEYNAME_FNLOCK;
+  }
   if (aModifiers & MODIFIER_META) {
     ADD_SEPARATOR_IF_NECESSARY(names);
     names += NS_DOM_KEYNAME_META;
@@ -613,6 +617,10 @@
     ADD_SEPARATOR_IF_NECESSARY(names);
     names += NS_DOM_KEYNAME_SHIFT;
   }
+  if (aModifiers & MODIFIER_SYMBOL) {
+    ADD_SEPARATOR_IF_NECESSARY(names);
+    names += NS_DOM_KEYNAME_SYMBOL;
+  }
   if (aModifiers & MODIFIER_SYMBOLLOCK) {
     ADD_SEPARATOR_IF_NECESSARY(names);
     names += NS_DOM_KEYNAME_SYMBOLLOCK;
@@ -1165,11 +1173,11 @@
 #define TEXTSTORE_DEFAULT_VIEW (1)
 
 nsTextStore::nsTextStore()
-  : mLockedContent(mComposition, mSelection)
-  , mEditCookie(0)
+  : mEditCookie(0)
   , mSinkMask(0)
   , mLock(0)
   , mLockQueued(0)
+  , mLockedContent(mComposition, mSelection)
   , mRequestedAttrValues(false)
   , mIsRecordingActionsWithoutLock(false)
   , mPendingOnSelectionChange(false)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWidgetFactory.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWidgetFactory.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWidgetFactory.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWidgetFactory.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsAppShell.h"
 #include "nsAppShellSingleton.h"
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/WidgetUtils.h"
 #include "nsIServiceManager.h"
 #include "nsIdleServiceWin.h"
 #include "nsLookAndFeel.h"
@@ -56,8 +57,6 @@
 #include "nsPrintSession.h"
 #endif
 
-#include "mozilla/Module.h"
-
 using namespace mozilla;
 using namespace mozilla::widget;
 
@@ -289,6 +288,9 @@
 static void
 nsWidgetWindowsModuleDtor()
 {
+  // Shutdown all XP level widget classes.
+  WidgetUtils::Shutdown();
+
   KeyboardLayout::Shutdown();
   MouseScrollHandler::Shutdown();
   nsLookAndFeel::Shutdown();
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindow.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindow.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -1701,8 +1701,6 @@
   int32_t logWidth = std::max<int32_t>(NSToIntRound(mBounds.width / dpiScale), 1);
   int32_t logHeight = std::max<int32_t>(NSToIntRound(mBounds.height / dpiScale), 1);
 
-  bool doConstrain = false; // whether we have enough info to do anything
-
   /* get our playing field. use the current screen, or failing that
     for any reason, use device caps for the default screen. */
   RECT screenRect;
@@ -1726,7 +1724,6 @@
       screenRect.right = left + width;
       screenRect.top = top;
       screenRect.bottom = top + height;
-      doConstrain = true;
     }
   } else {
     if (mWnd) {
@@ -1740,7 +1737,6 @@
             screenRect.right = GetSystemMetrics(SM_CXFULLSCREEN);
             screenRect.bottom = GetSystemMetrics(SM_CYFULLSCREEN);
           }
-          doConstrain = true;
         }
         ::ReleaseDC(mWnd, dc);
       }
@@ -2701,6 +2697,8 @@
   case eTransparencyGlass:
     policy = DWMNCRP_ENABLED;
     break;
+  default:
+    break;
   }
 
   PR_LOG(gWindowsLog, PR_LOG_ALWAYS,
@@ -4332,9 +4330,9 @@
 
   // Hold the window for the life of this method, in case it gets
   // destroyed during processing, unless we're in the dtor already.
-  nsCOMPtr<nsISupports> kungFuDeathGrip;
+  nsCOMPtr<nsIWidget> kungFuDeathGrip;
   if (!targetWindow->mInDtor)
-    kungFuDeathGrip = do_QueryInterface((nsBaseWidget*)targetWindow);
+    kungFuDeathGrip = targetWindow;
 
   targetWindow->IPCWindowProcHandler(msg, wParam, lParam);
 
@@ -5179,7 +5177,7 @@
       *aRetValue = 0;
       // Do explicit casting to make it working on 64bit systems (see bug 649236
       // for details).
-      DWORD objId = static_cast<DWORD>(lParam);
+      int32_t objId = static_cast<DWORD>(lParam);
       if (objId == OBJID_CLIENT) { // oleacc.dll will be loaded dynamically
         a11y::Accessible* rootAccessible = GetAccessible(); // Held by a11y cache
         if (rootAccessible) {
@@ -6540,6 +6538,15 @@
   return false;
 }
 
+void
+nsWindow::ClearCompositor(nsWindow* aWindow)
+{
+  if (aWindow->mLayerManager) {
+    aWindow->mLayerManager = nullptr;
+    aWindow->DestroyCompositor();
+  }
+}
+
 bool
 nsWindow::ShouldUseOffMainThreadCompositing()
 {
@@ -6568,8 +6575,6 @@
       aHints.AppendElement(LayersBackend::LAYERS_OPENGL);
     }
 
-    ID3D11Device* device = gfxWindowsPlatform::GetPlatform()->GetD3D11Device();
-
     if (!prefs.mPreferD3D9) {
       aHints.AppendElement(LayersBackend::LAYERS_D3D11);
     }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindowDbg.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindowDbg.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindowDbg.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindowDbg.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -34,7 +34,7 @@
 void PrintEvent(UINT msg, bool aShowAllEvents, bool aShowMouseMoves)
 {
   int inx = 0;
-  while (gAllEvents[inx].mId != (long)msg && gAllEvents[inx].mStr != nullptr) {
+  while (gAllEvents[inx].mId != msg && gAllEvents[inx].mStr != nullptr) {
     inx++;
   }
   if (aShowAllEvents || (!aShowAllEvents && gLastEventMsg != (long)msg)) {
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindowGfx.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindowGfx.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindowGfx.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindowGfx.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -193,8 +193,7 @@
 
   if (gfxWindowsPlatform::GetPlatform()->DidRenderingDeviceReset()) {
     gfxWindowsPlatform::GetPlatform()->UpdateRenderMode();
-    mLayerManager = nullptr;
-    DestroyCompositor();
+    EnumAllWindows(ClearCompositor);
     return false;
   }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindow.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindow.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/nsWindow.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/nsWindow.h	2015-02-28 15:03:11.000000000 +0000
@@ -90,6 +90,8 @@
   virtual nsWindowBase* GetParentWindowBase(bool aIncludeOwner) MOZ_OVERRIDE;
   virtual bool IsTopLevelWidget() MOZ_OVERRIDE { return mIsTopWidgetWindow; }
 
+  using nsWindowBase::DispatchPluginEvent;
+
   // nsIWidget interface
   NS_IMETHOD              Create(nsIWidget *aParent,
                                  nsNativeWidget aNativeParent,
@@ -236,6 +238,8 @@
    */
   virtual bool            AutoErase(HDC dc);
 
+  static void             ClearCompositor(nsWindow* aWindow);
+
   /**
    * AssociateDefaultIMC() associates or disassociates the default IMC for
    * the window.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/TaskbarPreview.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/TaskbarPreview.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/TaskbarPreview.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/TaskbarPreview.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -184,7 +184,7 @@
 NS_IMETHODIMP
 TaskbarPreview::Invalidate() {
   if (!mVisible)
-    return NS_ERROR_FAILURE;
+    return NS_OK;
 
   // DWM Composition is required for previews
   if (!nsUXThemeData::CheckForCompositor())
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/WinMouseScrollHandler.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/WinMouseScrollHandler.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/WinMouseScrollHandler.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/WinMouseScrollHandler.h	2015-02-28 15:03:11.000000000 +0000
@@ -289,8 +289,8 @@
     bool IsPageScroll(bool aForVertical) const
     {
       MOZ_ASSERT(mInitialized, "SystemSettings must be initialized");
-      return aForVertical ? (mScrollLines == WHEEL_PAGESCROLL) :
-                            (mScrollChars == WHEEL_PAGESCROLL);
+      return aForVertical ? (uint32_t(mScrollLines) == WHEEL_PAGESCROLL) :
+                            (uint32_t(mScrollChars) == WHEEL_PAGESCROLL);
     }
 
   private:
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/WinUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/WinUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/widget/windows/WinUtils.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/widget/windows/WinUtils.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -481,12 +481,11 @@
   OutputDebugStringW(buffer);
   OutputDebugStringW(L"\n");
 
-  int len = wcslen(buffer);
+  int len = WideCharToMultiByte(CP_ACP, 0, buffer, -1, nullptr, 0, nullptr, nullptr);
   if (len) {
-    char* utf8 = new char[len+1];
-    memset(utf8, 0, sizeof(utf8));
+    char* utf8 = new char[len];
     if (WideCharToMultiByte(CP_ACP, 0, buffer,
-                            -1, utf8, len+1, nullptr,
+                            -1, utf8, len, nullptr,
                             nullptr) > 0) {
       // desktop console
       printf("%s\n", utf8);
@@ -1077,11 +1076,11 @@
 }
 
 #ifdef MOZ_PLACES
-/************************************************************************/
-/* Constructs as AsyncFaviconDataReady Object
-/* @param aIOThread : the thread which performs the action
-/* @param aURLShortcut : Differentiates between (false)Jumplistcache and (true)Shortcutcache
-/************************************************************************/
+/************************************************************************
+ * Constructs as AsyncFaviconDataReady Object
+ * @param aIOThread : the thread which performs the action
+ * @param aURLShortcut : Differentiates between (false)Jumplistcache and (true)Shortcutcache
+ ************************************************************************/
 
 AsyncFaviconDataReady::AsyncFaviconDataReady(nsIURI *aNewURI, 
                                              nsCOMPtr<nsIThread> &aIOThread, 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/ClearOnShutdown.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/ClearOnShutdown.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/ClearOnShutdown.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/ClearOnShutdown.h	2015-02-28 15:03:11.000000000 +0000
@@ -56,7 +56,7 @@
   {
   }
 
-  virtual void Shutdown()
+  virtual void Shutdown() MOZ_OVERRIDE
   {
     if (mPtr) {
       *mPtr = nullptr;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/ErrorList.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/ErrorList.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/ErrorList.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/ErrorList.h	2015-02-28 15:03:11.000000000 +0000
@@ -519,6 +519,9 @@
   ERROR(NS_ERROR_DOM_QUOTA_REACHED,                FAILURE(1014)),
   ERROR(NS_ERROR_DOM_JS_EXCEPTION,                 FAILURE(1015)),
 
+  /* A way to represent uncatchable exceptions */
+  ERROR(NS_ERROR_UNCATCHABLE_EXCEPTION,            FAILURE(1016)),
+
   /* May be used to indicate when e.g. setting a property value didn't
    * actually change the value, like for obj.foo = "bar"; obj.foo = "bar";
    * the second assignment throws NS_SUCCESS_DOM_NO_OPERATION.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/nsCycleCollector.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/nsCycleCollector.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/nsCycleCollector.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/nsCycleCollector.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -914,7 +914,7 @@
 static nsISupports*
 CanonicalizeXPCOMParticipant(nsISupports* aIn)
 {
-  nsISupports* out;
+  nsISupports* out = nullptr;
   aIn->QueryInterface(NS_GET_IID(nsCycleCollectionISupports),
                       reinterpret_cast<void**>(&out));
   return out;
@@ -1409,6 +1409,7 @@
   // nsXPCOMCycleCollectionParticipant, which is a per-class singleton helper
   // object that implements traversal and unlinking logic for the nsISupports
   // in question.
+  *aCp = nullptr;
   CallQueryInterface(aPtr, aCp);
 }
 
@@ -3928,7 +3929,7 @@
 void
 HoldJSObjectsImpl(nsISupports* aHolder)
 {
-  nsXPCOMCycleCollectionParticipant* participant;
+  nsXPCOMCycleCollectionParticipant* participant = nullptr;
   CallQueryInterface(aHolder, &participant);
   MOZ_ASSERT(participant, "Failed to QI to nsXPCOMCycleCollectionParticipant!");
   MOZ_ASSERT(participant->CheckForRightISupports(aHolder),
@@ -3955,7 +3956,7 @@
 DropJSObjectsImpl(nsISupports* aHolder)
 {
 #ifdef DEBUG
-  nsXPCOMCycleCollectionParticipant* participant;
+  nsXPCOMCycleCollectionParticipant* participant = nullptr;
   CallQueryInterface(aHolder, &participant);
   MOZ_ASSERT(participant, "Failed to QI to nsXPCOMCycleCollectionParticipant!");
   MOZ_ASSERT(participant->CheckForRightISupports(aHolder),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/nsMemoryReporterManager.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/nsMemoryReporterManager.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/nsMemoryReporterManager.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/nsMemoryReporterManager.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -544,6 +544,157 @@
   *aN = pmcex.PrivateUsage;
   return NS_OK;
 }
+
+class WindowsAddressSpaceReporter MOZ_FINAL : public nsIMemoryReporter
+{
+  ~WindowsAddressSpaceReporter() {}
+
+public:
+  NS_DECL_ISUPPORTS
+
+  NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport,
+                           nsISupports* aData, bool aAnonymize) MOZ_OVERRIDE
+  {
+    MEMORY_BASIC_INFORMATION info = { 0 };
+    bool isPrevSegStackGuard = false;
+    for (size_t currentAddress = 0; ; ) {
+      if (!VirtualQuery((LPCVOID)currentAddress, &info, sizeof(info))) {
+        // Something went wrong, just return whatever we've got already.
+        break;
+      }
+
+      size_t size = info.RegionSize;
+
+      // For each range of pages, we consider one or more of its State, Type
+      // and Protect values. These are documented at
+      // https://msdn.microsoft.com/en-us/library/windows/desktop/aa366775%28v=vs.85%29.aspx
+      // (for State and Type) and
+      // https://msdn.microsoft.com/en-us/library/windows/desktop/aa366786%28v=vs.85%29.aspx
+      // (for Protect).
+      //
+      // Not all State values have accompanying Type and Protection values.
+      bool doType = false;
+      bool doProtect = false;
+
+      nsCString path("address-space");
+
+      switch (info.State) {
+        case MEM_FREE:
+          path.AppendLiteral("/free");
+          break;
+
+        case MEM_RESERVE:
+          path.AppendLiteral("/reserved");
+          doType = true;
+          break;
+
+        case MEM_COMMIT:
+          path.AppendLiteral("/commit");
+          doType = true;
+          doProtect = true;
+          break;
+
+        default:
+          // Should be impossible, but handle it just in case.
+          path.AppendLiteral("/???");
+          break;
+      }
+
+      if (doType) {
+        switch (info.Type) {
+          case MEM_IMAGE:
+            path.AppendLiteral("/image");
+            break;
+
+          case MEM_MAPPED:
+            path.AppendLiteral("/mapped");
+            break;
+
+          case MEM_PRIVATE:
+            path.AppendLiteral("/private");
+            break;
+
+          default:
+            // Should be impossible, but handle it just in case.
+            path.AppendLiteral("/???");
+            break;
+        }
+      }
+
+      if (doProtect) {
+        // Basic attributes. Exactly one of these should be set.
+        if (info.Protect & PAGE_EXECUTE) {
+          path.AppendLiteral("/execute");
+        }
+        if (info.Protect & PAGE_EXECUTE_READ) {
+          path.AppendLiteral("/execute-read");
+        }
+        if (info.Protect & PAGE_EXECUTE_READWRITE) {
+          path.AppendLiteral("/execute-readwrite");
+        }
+        if (info.Protect & PAGE_EXECUTE_WRITECOPY) {
+          path.AppendLiteral("/execute-writecopy");
+        }
+        if (info.Protect & PAGE_NOACCESS) {
+          path.AppendLiteral("/noaccess");
+        }
+        if (info.Protect & PAGE_READONLY) {
+          path.AppendLiteral("/readonly");
+        }
+        if (info.Protect & PAGE_READWRITE) {
+          path.AppendLiteral("/readwrite");
+        }
+        if (info.Protect & PAGE_WRITECOPY) {
+          path.AppendLiteral("/writecopy");
+        }
+
+        // Modifiers. At most one of these should be set.
+        if (info.Protect & PAGE_GUARD) {
+          path.AppendLiteral("+guard");
+        }
+        if (info.Protect & PAGE_NOCACHE) {
+          path.AppendLiteral("+nocache");
+        }
+        if (info.Protect & PAGE_WRITECOMBINE) {
+          path.AppendLiteral("+writecombine");
+        }
+
+        // Annotate likely stack segments, too.
+        if (isPrevSegStackGuard &&
+            info.State == MEM_COMMIT &&
+            doType && info.Type == MEM_PRIVATE &&
+            doProtect && info.Protect == PAGE_READWRITE) {
+          path.AppendLiteral(" (stack)");
+        }
+      }
+
+      isPrevSegStackGuard =
+        info.State == MEM_COMMIT &&
+        doType && info.Type == MEM_PRIVATE &&
+        doProtect && info.Protect == (PAGE_READWRITE|PAGE_GUARD);
+
+      nsresult rv;
+      rv = aHandleReport->Callback(
+        EmptyCString(), path, KIND_OTHER, UNITS_BYTES, size,
+        NS_LITERAL_CSTRING("From MEMORY_BASIC_INFORMATION."), aData);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return rv;
+      }
+
+      size_t lastAddress = currentAddress;
+      currentAddress += size;
+
+      // If we overflow, we've examined all of the address space.
+      if (currentAddress < lastAddress) {
+        break;
+      }
+    }
+
+    return NS_OK;
+  }
+};
+NS_IMPL_ISUPPORTS(WindowsAddressSpaceReporter, nsIMemoryReporter)
+
 #endif  // XP_<PLATFORM>
 
 #ifdef HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER
@@ -1026,6 +1177,10 @@
   RegisterStrongReporter(new mozilla::dmd::DMDReporter());
 #endif
 
+#ifdef XP_WIN
+  RegisterStrongReporter(new WindowsAddressSpaceReporter());
+#endif
+
 #ifdef XP_UNIX
   nsMemoryInfoDumper::Initialize();
 #endif
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/nsTraceRefcnt.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/nsTraceRefcnt.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/base/nsTraceRefcnt.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/base/nsTraceRefcnt.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -131,8 +131,7 @@
 static void
 AssertActivityIsLegal()
 {
-  if (gActivityTLS == BAD_TLS_INDEX ||
-      NS_PTR_TO_INT32(PR_GetThreadPrivate(gActivityTLS)) != 0) {
+  if (gActivityTLS == BAD_TLS_INDEX || PR_GetThreadPrivate(gActivityTLS)) {
     if (PR_GetEnv("MOZ_FATAL_STATIC_XPCOM_CTORS_DTORS")) {
       NS_RUNTIMEABORT(kStaticCtorDtorWarning);
     } else {
@@ -646,11 +645,17 @@
   return he != nullptr;
 }
 
+static PLHashNumber
+HashNumber(const void* aKey)
+{
+  return PLHashNumber(NS_PTR_TO_INT32(aKey));
+}
+
 static intptr_t
 GetSerialNumber(void* aPtr, bool aCreate)
 {
   PLHashEntry** hep = PL_HashTableRawLookup(gSerialNumbers,
-                                            PLHashNumber(NS_PTR_TO_INT32(aPtr)),
+                                            HashNumber(aPtr),
                                             aPtr);
   if (hep && *hep) {
     return reinterpret_cast<serialNumberRecord*>((*hep)->value)->serialNumber;
@@ -659,7 +664,7 @@
     record->serialNumber = ++gNextSerialNumber;
     record->refCount = 0;
     record->COMPtrCount = 0;
-    PL_HashTableRawAdd(gSerialNumbers, hep, PLHashNumber(NS_PTR_TO_INT32(aPtr)),
+    PL_HashTableRawAdd(gSerialNumbers, hep, HashNumber(aPtr),
                        aPtr, reinterpret_cast<void*>(record));
     return gNextSerialNumber;
   }
@@ -670,7 +675,7 @@
 GetRefCount(void* aPtr)
 {
   PLHashEntry** hep = PL_HashTableRawLookup(gSerialNumbers,
-                                            PLHashNumber(NS_PTR_TO_INT32(aPtr)),
+                                            HashNumber(aPtr),
                                             aPtr);
   if (hep && *hep) {
     return &((reinterpret_cast<serialNumberRecord*>((*hep)->value))->refCount);
@@ -684,7 +689,7 @@
 GetCOMPtrCount(void* aPtr)
 {
   PLHashEntry** hep = PL_HashTableRawLookup(gSerialNumbers,
-                                            PLHashNumber(NS_PTR_TO_INT32(aPtr)),
+                                            HashNumber(aPtr),
                                             aPtr);
   if (hep && *hep) {
     return &((reinterpret_cast<serialNumberRecord*>((*hep)->value))->COMPtrCount);
@@ -760,12 +765,6 @@
 }
 
 
-static PLHashNumber
-HashNumber(const void* aKey)
-{
-  return PLHashNumber(NS_PTR_TO_INT32(aKey));
-}
-
 static void
 maybeUnregisterAndCloseFile(FILE*& aFile)
 {
@@ -1104,16 +1103,14 @@
 
     bool loggingThisObject = (!gObjectsToLog || LogThisObj(serialno));
     if (aRefcnt == 1 && gAllocLog && loggingThisType && loggingThisObject) {
-      fprintf(gAllocLog, "\n<%s> 0x%08X %" PRIdPTR " Create\n",
-              aClass, NS_PTR_TO_INT32(aPtr), serialno);
+      fprintf(gAllocLog, "\n<%s> %p %" PRIdPTR " Create\n", aClass, aPtr, serialno);
       nsTraceRefcnt::WalkTheStackCached(gAllocLog);
     }
 
     if (gRefcntsLog && loggingThisType && loggingThisObject) {
       // Can't use PR_LOG(), b/c it truncates the line
-      fprintf(gRefcntsLog,
-              "\n<%s> 0x%08X %" PRIuPTR " AddRef %" PRIuPTR "\n",
-              aClass, NS_PTR_TO_INT32(aPtr), serialno, aRefcnt);
+      fprintf(gRefcntsLog, "\n<%s> %p %" PRIuPTR " AddRef %" PRIuPTR "\n",
+              aClass, aPtr, serialno, aRefcnt);
       nsTraceRefcnt::WalkTheStackCached(gRefcntsLog);
       fflush(gRefcntsLog);
     }
@@ -1158,8 +1155,8 @@
     if (gRefcntsLog && loggingThisType && loggingThisObject) {
       // Can't use PR_LOG(), b/c it truncates the line
       fprintf(gRefcntsLog,
-              "\n<%s> 0x%08X %" PRIuPTR " Release %" PRIuPTR "\n", aClass,
-              NS_PTR_TO_INT32(aPtr), serialno, aRefcnt);
+              "\n<%s> %p %" PRIuPTR " Release %" PRIuPTR "\n",
+              aClass, aPtr, serialno, aRefcnt);
       nsTraceRefcnt::WalkTheStackCached(gRefcntsLog);
       fflush(gRefcntsLog);
     }
@@ -1168,9 +1165,7 @@
     // yet we still want to see deletion information:
 
     if (aRefcnt == 0 && gAllocLog && loggingThisType && loggingThisObject) {
-      fprintf(gAllocLog,
-              "\n<%s> 0x%08X %" PRIdPTR " Destroy\n",
-              aClass, NS_PTR_TO_INT32(aPtr), serialno);
+      fprintf(gAllocLog, "\n<%s> %p %" PRIdPTR " Destroy\n", aClass, aPtr, serialno);
       nsTraceRefcnt::WalkTheStackCached(gAllocLog);
     }
 
@@ -1210,8 +1205,8 @@
 
     bool loggingThisObject = (!gObjectsToLog || LogThisObj(serialno));
     if (gAllocLog && loggingThisType && loggingThisObject) {
-      fprintf(gAllocLog, "\n<%s> 0x%08X %" PRIdPTR " Ctor (%d)\n",
-              aType, NS_PTR_TO_INT32(aPtr), serialno, aInstanceSize);
+      fprintf(gAllocLog, "\n<%s> %p %" PRIdPTR " Ctor (%d)\n",
+              aType, aPtr, serialno, aInstanceSize);
       nsTraceRefcnt::WalkTheStackCached(gAllocLog);
     }
 
@@ -1252,8 +1247,8 @@
     // (If we're on a losing architecture, don't do this because we'll be
     // using LogDeleteXPCOM instead to get file and line numbers.)
     if (gAllocLog && loggingThisType && loggingThisObject) {
-      fprintf(gAllocLog, "\n<%s> 0x%08X %" PRIdPTR " Dtor (%d)\n",
-              aType, NS_PTR_TO_INT32(aPtr), serialno, aInstanceSize);
+      fprintf(gAllocLog, "\n<%s> %p %" PRIdPTR " Dtor (%d)\n",
+              aType, aPtr, serialno, aInstanceSize);
       nsTraceRefcnt::WalkTheStackCached(gAllocLog);
     }
 
@@ -1295,9 +1290,8 @@
     bool loggingThisObject = (!gObjectsToLog || LogThisObj(serialno));
 
     if (gCOMPtrLog && loggingThisObject) {
-      fprintf(gCOMPtrLog, "\n<?> 0x%08X %" PRIdPTR " nsCOMPtrAddRef %d 0x%08X\n",
-              NS_PTR_TO_INT32(object), serialno, count ? (*count) : -1,
-              NS_PTR_TO_INT32(aCOMPtr));
+      fprintf(gCOMPtrLog, "\n<?> %p %" PRIdPTR " nsCOMPtrAddRef %d %p\n",
+              object, serialno, count ? (*count) : -1, aCOMPtr);
       nsTraceRefcnt::WalkTheStackCached(gCOMPtrLog);
     }
 
@@ -1339,9 +1333,8 @@
     bool loggingThisObject = (!gObjectsToLog || LogThisObj(serialno));
 
     if (gCOMPtrLog && loggingThisObject) {
-      fprintf(gCOMPtrLog, "\n<?> 0x%08X %" PRIdPTR " nsCOMPtrRelease %d 0x%08X\n",
-              NS_PTR_TO_INT32(object), serialno, count ? (*count) : -1,
-              NS_PTR_TO_INT32(aCOMPtr));
+      fprintf(gCOMPtrLog, "\n<?> %p %" PRIdPTR " nsCOMPtrRelease %d %p\n",
+              object, serialno, count ? (*count) : -1, aCOMPtr);
       nsTraceRefcnt::WalkTheStackCached(gCOMPtrLog);
     }
 
@@ -1388,6 +1381,6 @@
     PR_NewThreadPrivateIndex(&gActivityTLS, nullptr);
   }
 
-  PR_SetThreadPrivate(gActivityTLS, NS_INT32_TO_PTR(!aLegal));
+  PR_SetThreadPrivate(gActivityTLS, reinterpret_cast<void*>(!aLegal));
 #endif
 }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/components/Module.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/components/Module.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/components/Module.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/components/Module.h	2015-02-28 15:03:11.000000000 +0000
@@ -21,7 +21,7 @@
  */
 struct Module
 {
-  static const unsigned int kVersion = 38;
+  static const unsigned int kVersion = 39;
 
   struct CIDEntry;
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/nsDebug.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/nsDebug.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/nsDebug.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/nsDebug.h	2015-02-28 15:03:11.000000000 +0000
@@ -50,33 +50,6 @@
 #endif
 
 /**
- * Abort the execution of the program if the expression evaluates to
- * false.
- *
- * There is no status value returned from the macro.
- *
- * Note that the non-debug version of this macro does <b>not</b>
- * evaluate the expression argument. Hence side effect statements
- * as arguments to the macro will yield improper execution in a
- * non-debug build. For example:
- *
- *      NS_ABORT_IF_FALSE(0 == foo++, "yikes foo should be zero");
- *
- * Note also that the non-debug version of this macro does <b>not</b>
- * evaluate the message argument.
- */
-#ifdef DEBUG
-#define NS_ABORT_IF_FALSE(_expr, _msg)                        \
-  do {                                                        \
-    if (!(_expr)) {                                           \
-      NS_DebugBreak(NS_DEBUG_ABORT, _msg, #_expr, __FILE__, __LINE__); \
-    }                                                         \
-  } while(0)
-#else
-#define NS_ABORT_IF_FALSE(_expr, _msg) do { /* nothing */ } while(0)
-#endif
-
-/**
  * Warn if a given condition is false.
  *
  * Program execution continues past the usage of this macro.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h	2015-02-28 15:03:11.000000000 +0000
@@ -31,7 +31,8 @@
   {
   }
 
-  virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const;
+  virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const
+    MOZ_OVERRIDE;
 
 private:
   nsISupports* MOZ_NON_OWNING_REF mSource;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/pldhash.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/pldhash.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/pldhash.cpp	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/pldhash.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -171,13 +171,9 @@
 PL_NewDHashTable(const PLDHashTableOps* aOps, uint32_t aEntrySize,
                  uint32_t aLength)
 {
-  PLDHashTable* table = (PLDHashTable*)malloc(sizeof(*table));
-
-  if (!table) {
-    return nullptr;
-  }
+  PLDHashTable* table = new PLDHashTable();
   if (!PL_DHashTableInit(table, aOps, aEntrySize, fallible, aLength)) {
-    free(table);
+    delete table;
     return nullptr;
   }
   return table;
@@ -187,7 +183,7 @@
 PL_DHashTableDestroy(PLDHashTable* aTable)
 {
   PL_DHashTableFinish(aTable);
-  free(aTable);
+  delete aTable;
 }
 
 /*
@@ -223,6 +219,13 @@
 PLDHashTable::Init(const PLDHashTableOps* aOps,
                    uint32_t aEntrySize, const fallible_t&, uint32_t aLength)
 {
+  MOZ_ASSERT(!IsInitialized());
+
+  // Check that the important fields have been set by the constructor.
+  MOZ_ASSERT(mOps == nullptr);
+  MOZ_ASSERT(mRecursionLevel == 0);
+  MOZ_ASSERT(mEntryStore == nullptr);
+
   if (aLength > PL_DHASH_MAX_INITIAL_LENGTH) {
     return false;
   }
@@ -247,11 +250,8 @@
     return false;  // overflowed
   }
 
-  mEntryStore = (char*)malloc(nbytes);
-  if (!mEntryStore) {
-    return false;
-  }
-  memset(mEntryStore, 0, nbytes);
+  mEntryStore = nullptr;
+
   METER(memset(&mStats, 0, sizeof(mStats)));
 
   // Set this only once we reach a point where we know we can't fail.
@@ -327,6 +327,8 @@
 MOZ_ALWAYS_INLINE void
 PLDHashTable::Finish()
 {
+  MOZ_ASSERT(IsInitialized());
+
   INCREMENT_RECURSION_LEVEL(this);
 
   /* Clear any remaining live entries. */
@@ -348,6 +350,7 @@
 
   /* Free entry storage last. */
   free(mEntryStore);
+  mEntryStore = nullptr;
 }
 
 void
@@ -365,6 +368,7 @@
 PLDHashEntryHdr* PL_DHASH_FASTCALL
 PLDHashTable::SearchTable(const void* aKey, PLDHashNumber aKeyHash)
 {
+  MOZ_ASSERT(mEntryStore);
   METER(mStats.mSearches++);
   NS_ASSERTION(!(aKeyHash & COLLISION_FLAG),
                "!(aKeyHash & COLLISION_FLAG)");
@@ -445,6 +449,7 @@
 PLDHashTable::FindFreeEntry(PLDHashNumber aKeyHash)
 {
   METER(mStats.mSearches++);
+  MOZ_ASSERT(mEntryStore);
   NS_ASSERTION(!(aKeyHash & COLLISION_FLAG),
                "!(aKeyHash & COLLISION_FLAG)");
 
@@ -486,6 +491,8 @@
 bool
 PLDHashTable::ChangeTable(int aDeltaLog2)
 {
+  MOZ_ASSERT(mEntryStore);
+
   /* Look, but don't touch, until we succeed in getting new entry store. */
   int oldLog2 = PL_DHASH_BITS - mHashShift;
   int newLog2 = oldLog2 + aDeltaLog2;
@@ -544,6 +551,8 @@
 MOZ_ALWAYS_INLINE PLDHashNumber
 PLDHashTable::ComputeKeyHash(const void* aKey)
 {
+  MOZ_ASSERT(mEntryStore);
+
   PLDHashNumber keyHash = mOps->hashKey(this, aKey);
   keyHash *= PL_DHASH_GOLDEN_RATIO;
 
@@ -557,12 +566,15 @@
 MOZ_ALWAYS_INLINE PLDHashEntryHdr*
 PLDHashTable::Search(const void* aKey)
 {
+  MOZ_ASSERT(IsInitialized());
+
   INCREMENT_RECURSION_LEVEL(this);
 
   METER(mStats.mSearches++);
 
-  PLDHashNumber keyHash = ComputeKeyHash(aKey);
-  PLDHashEntryHdr* entry = SearchTable<ForSearchOrRemove>(aKey, keyHash);
+  PLDHashEntryHdr* entry =
+    mEntryStore ? SearchTable<ForSearchOrRemove>(aKey, ComputeKeyHash(aKey))
+                : nullptr;
 
   DECREMENT_RECURSION_LEVEL(this);
 
@@ -572,18 +584,36 @@
 MOZ_ALWAYS_INLINE PLDHashEntryHdr*
 PLDHashTable::Add(const void* aKey, const mozilla::fallible_t&)
 {
+  MOZ_ASSERT(IsInitialized());
+
   PLDHashNumber keyHash;
   PLDHashEntryHdr* entry;
+  uint32_t capacity;
 
   MOZ_ASSERT(mRecursionLevel == 0);
   INCREMENT_RECURSION_LEVEL(this);
 
+  // Allocate the entry storage if it hasn't already been allocated.
+  if (!mEntryStore) {
+    uint32_t nbytes;
+    // We already checked this in Init(), so it must still be true.
+    MOZ_RELEASE_ASSERT(SizeOfEntryStore(CapacityFromHashShift(), mEntrySize,
+                                        &nbytes));
+    mEntryStore = (char*)malloc(nbytes);
+    if (!mEntryStore) {
+      METER(mStats.mAddFailures++);
+      entry = nullptr;
+      goto exit;
+    }
+    memset(mEntryStore, 0, nbytes);
+  }
+
   /*
    * If alpha is >= .75, grow or compress the table.  If aKey is already
    * in the table, we may grow once more than necessary, but only if we
    * are on the edge of being overloaded.
    */
-  uint32_t capacity = Capacity();
+  capacity = Capacity();
   if (mEntryCount + mRemovedCount >= MaxLoad(capacity)) {
     /* Compress if a quarter or more of all entries are removed. */
     int deltaLog2;
@@ -637,14 +667,38 @@
   return entry;
 }
 
+MOZ_ALWAYS_INLINE PLDHashEntryHdr*
+PLDHashTable::Add(const void* aKey)
+{
+  PLDHashEntryHdr* entry = Add(aKey, fallible);
+  if (!entry) {
+    if (!mEntryStore) {
+      // We OOM'd while allocating the initial entry storage.
+      uint32_t nbytes;
+      (void) SizeOfEntryStore(CapacityFromHashShift(), mEntrySize, &nbytes);
+      NS_ABORT_OOM(nbytes);
+    } else {
+      // We failed to resize the existing entry storage, either due to OOM or
+      // because we exceeded the maximum table capacity or size; report it as
+      // an OOM. The multiplication by 2 gets us the size we tried to allocate,
+      // which is double the current size.
+      NS_ABORT_OOM(2 * EntrySize() * EntryCount());
+    }
+  }
+  return entry;
+}
+
 MOZ_ALWAYS_INLINE void
 PLDHashTable::Remove(const void* aKey)
 {
+  MOZ_ASSERT(IsInitialized());
+
   MOZ_ASSERT(mRecursionLevel == 0);
   INCREMENT_RECURSION_LEVEL(this);
 
-  PLDHashNumber keyHash = ComputeKeyHash(aKey);
-  PLDHashEntryHdr* entry = SearchTable<ForSearchOrRemove>(aKey, keyHash);
+  PLDHashEntryHdr* entry =
+    mEntryStore ? SearchTable<ForSearchOrRemove>(aKey, ComputeKeyHash(aKey))
+                : nullptr;
   if (entry) {
     /* Clear this entry and mark it as "removed". */
     METER(mStats.mRemoveHits++);
@@ -681,12 +735,7 @@
 PLDHashEntryHdr* PL_DHASH_FASTCALL
 PL_DHashTableAdd(PLDHashTable* aTable, const void* aKey)
 {
-  PLDHashEntryHdr* entry = PL_DHashTableAdd(aTable, aKey, fallible);
-  if (!entry) {
-    // Entry storage reallocation failed.
-    NS_ABORT_OOM(aTable->EntrySize() * aTable->EntryCount());
-  }
-  return entry;
+  return aTable->Add(aKey);
 }
 
 void PL_DHASH_FASTCALL
@@ -698,6 +747,9 @@
 MOZ_ALWAYS_INLINE void
 PLDHashTable::RawRemove(PLDHashEntryHdr* aEntry)
 {
+  MOZ_ASSERT(IsInitialized());
+  MOZ_ASSERT(mEntryStore);
+
   MOZ_ASSERT(mRecursionLevel != IMMUTABLE_RECURSION_LEVEL);
 
   NS_ASSERTION(ENTRY_IS_LIVE(aEntry), "ENTRY_IS_LIVE(aEntry)");
@@ -724,6 +776,12 @@
 MOZ_ALWAYS_INLINE uint32_t
 PLDHashTable::Enumerate(PLDHashEnumerator aEtor, void* aArg)
 {
+  MOZ_ASSERT(IsInitialized());
+
+  if (!mEntryStore) {
+    return 0;
+  }
+
   INCREMENT_RECURSION_LEVEL(this);
 
   // Please keep this method in sync with the PLDHashTable::Iterator constructor
@@ -824,6 +882,12 @@
     PLDHashSizeOfEntryExcludingThisFun aSizeOfEntryExcludingThis,
     MallocSizeOf aMallocSizeOf, void* aArg /* = nullptr */) const
 {
+  MOZ_ASSERT(IsInitialized());
+
+  if (!mEntryStore) {
+    return 0;
+  }
+
   size_t n = 0;
   n += aMallocSizeOf(mEntryStore);
   if (aSizeOfEntryExcludingThis) {
@@ -842,6 +906,8 @@
     PLDHashSizeOfEntryExcludingThisFun aSizeOfEntryExcludingThis,
     MallocSizeOf aMallocSizeOf, void* aArg /* = nullptr */) const
 {
+  MOZ_ASSERT(IsInitialized());
+
   return aMallocSizeOf(this) +
          SizeOfExcludingThis(aSizeOfEntryExcludingThis, aMallocSizeOf, aArg);
 }
@@ -871,6 +937,8 @@
   mEntryAddr(mTable->mEntryStore),
   mEntryOffset(0)
 {
+  MOZ_ASSERT(mTable->IsInitialized());
+
   // Make sure that modifications can't simultaneously happen while the iterator
   // is active.
   INCREMENT_RECURSION_LEVEL(mTable);
@@ -899,6 +967,8 @@
   mEntryAddr(aIterator.mEntryAddr),
   mEntryOffset(aIterator.mEntryOffset)
 {
+  MOZ_ASSERT(mTable->IsInitialized());
+
   // We need the copy constructor only so that we can keep the recursion level
   // consistent.
   INCREMENT_RECURSION_LEVEL(mTable);
@@ -906,11 +976,15 @@
 
 PLDHashTable::Iterator::~Iterator()
 {
+  MOZ_ASSERT(mTable->IsInitialized());
+
   DECREMENT_RECURSION_LEVEL(mTable);
 }
 
 bool PLDHashTable::Iterator::HasMoreEntries() const
 {
+  MOZ_ASSERT(mTable->IsInitialized());
+
   // Check the number of live entries seen, not the total number of entries
   // seen. To see why, consider what happens if the last entry is not live: we
   // would have to iterate after returning an entry to see if more live entries
@@ -936,6 +1010,7 @@
   // checks pass, then this method will only iterate through the full capacity
   // once. If they fail, then this loop may end up returning the early entries
   // more than once.
+  MOZ_ASSERT_IF(capacity > 0, mTable->mEntryStore);
   for (uint32_t e = 0; e < capacity; ++e) {
     PLDHashEntryHdr* entry = (PLDHashEntryHdr*)mEntryAddr;
 
@@ -961,6 +1036,8 @@
 MOZ_ALWAYS_INLINE void
 PLDHashTable::MarkImmutable()
 {
+  MOZ_ASSERT(IsInitialized());
+
   mRecursionLevel = IMMUTABLE_RECURSION_LEVEL;
 }
 
@@ -977,6 +1054,8 @@
 void
 PLDHashTable::DumpMeter(PLDHashEnumerator aDump, FILE* aFp)
 {
+  MOZ_ASSERT(IsInitialized());
+
   PLDHashNumber hash1, hash2, maxChainHash1, maxChainHash2;
   double sqsum, mean, variance, sigma;
   PLDHashEntryHdr* entry;
@@ -989,6 +1068,7 @@
   hash2 = 0;
   sqsum = 0;
 
+  MOZ_ASSERT_IF(capacity > 0, mEntryStore);
   for (uint32_t i = 0; i < capacity; i++) {
     entry = (PLDHashEntryHdr*)entryAddr;
     entryAddr += mEntrySize;
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/pldhash.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/pldhash.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/glue/pldhash.h	2015-02-19 00:42:15.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/glue/pldhash.h	2015-02-28 15:03:11.000000000 +0000
@@ -147,6 +147,9 @@
  * on most architectures, and may be allocated on the stack or within another
  * structure or class (see below for the Init and Finish functions to use).
  *
+ * No entry storage is allocated until the first element is added. This means
+ * that empty hash tables are cheap, which is good because they are common.
+ *
  * There used to be a long, math-heavy comment here about the merits of
  * double hashing vs. chaining; it was removed in bug 1058335. In short, double
  * hashing is more space-efficient unless the element size gets large (in which
@@ -175,8 +178,7 @@
   uint32_t            mEntryCount;    /* number of entries in table */
   uint32_t            mRemovedCount;  /* removed entry sentinels in table */
   uint32_t            mGeneration;    /* entry storage generation number */
-  char*               mEntryStore;    /* entry storage */
-
+  char*               mEntryStore;    /* entry storage; allocated lazily */
 #ifdef PL_DHASHMETER
   struct PLDHashStats
   {
@@ -226,12 +228,12 @@
 
   /*
    * Size in entries (gross, not net of free and removed sentinels) for table.
-   * We store mHashShift rather than sizeLog2 to optimize the collision-free
-   * case in SearchTable.
+   * This can be zero if no elements have been added yet, in which case the
+   * entry storage will not have yet been allocated.
    */
   uint32_t Capacity() const
   {
-    return ((uint32_t)1 << (PL_DHASH_BITS - mHashShift));
+    return mEntryStore ? CapacityFromHashShift() : 0;
   }
 
   uint32_t EntrySize()  const { return mEntrySize; }
@@ -245,6 +247,7 @@
 
   PLDHashEntryHdr* Search(const void* aKey);
   PLDHashEntryHdr* Add(const void* aKey, const mozilla::fallible_t&);
+  PLDHashEntryHdr* Add(const void* aKey);
   void Remove(const void* aKey);
 
   void RawRemove(PLDHashEntryHdr* aEntry);
@@ -297,6 +300,13 @@
 private:
   static bool EntryIsFree(PLDHashEntryHdr* aEntry);
 
+  // We store mHashShift rather than sizeLog2 to optimize the collision-free
+  // case in SearchTable.
+  uint32_t CapacityFromHashShift() const
+  {
+    return ((uint32_t)1 << (PL_DHASH_BITS - mHashShift));
+  }
+
   PLDHashNumber ComputeKeyHash(const void* aKey);
 
   enum SearchReason { ForSearchOrRemove, ForAdd };
@@ -439,12 +449,14 @@
 void PL_DHashTableDestroy(PLDHashTable* aTable);
 
 /*
- * Initialize aTable with aOps, aEntrySize, and aCapacity. The table's initial
- * capacity will be chosen such that |aLength| elements can be inserted without
- * rehashing. If |aLength| is a power-of-two, this capacity will be |2*length|.
+ * Initialize aTable with aOps and aEntrySize. The table's initial capacity
+ * will be chosen such that |aLength| elements can be inserted without
+ * rehashing; if |aLength| is a power-of-two, this capacity will be |2*length|.
+ * However, because entry storage is allocated lazily, this initial capacity
+ * won't be relevant until the first element is added; prior to that the
+ * capacity will be zero.
  *
- * This function will crash if it can't allocate enough memory, or if
- * |aEntrySize| and/or |aLength| are too large.
+ * This function will crash if |aEntrySize| and/or |aLength| are too large.
  */
 void PL_DHashTableInit(
   PLDHashTable* aTable, const PLDHashTableOps* aOps,
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/io/nsLocalFileUnix.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/io/nsLocalFileUnix.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/io/nsLocalFileUnix.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/io/nsLocalFileUnix.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -49,7 +49,6 @@
 
 #ifdef MOZ_WIDGET_GTK
 #include "nsIGIOService.h"
-#include "nsIGnomeVFSService.h"
 #endif
 
 #ifdef MOZ_WIDGET_COCOA
@@ -1971,9 +1970,7 @@
 {
 #ifdef MOZ_WIDGET_GTK
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  nsCOMPtr<nsIGnomeVFSService> gnomevfs =
-    do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-  if (!giovfs && !gnomevfs) {
+  if (!giovfs) {
     return NS_ERROR_FAILURE;
   }
 
@@ -1983,15 +1980,8 @@
   }
 
   if (isDirectory) {
-    if (giovfs) {
-      return giovfs->ShowURIForInput(mPath);
-    } else
-      /* Fallback to GnomeVFS */
-    {
-      return gnomevfs->ShowURIForInput(mPath);
-    }
-  } else if (giovfs &&
-             NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
+    return giovfs->ShowURIForInput(mPath);
+  } else if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
     return NS_OK;
   } else {
     nsCOMPtr<nsIFile> parentDir;
@@ -2003,11 +1993,7 @@
       return NS_ERROR_FAILURE;
     }
 
-    if (giovfs) {
-      return giovfs->ShowURIForInput(dirPath);
-    } else {
-      return gnomevfs->ShowURIForInput(dirPath);
-    }
+    return giovfs->ShowURIForInput(dirPath);
   }
 #elif defined(MOZ_WIDGET_COCOA)
   CFURLRef url;
@@ -2027,16 +2013,11 @@
 {
 #ifdef MOZ_WIDGET_GTK
   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-  nsCOMPtr<nsIGnomeVFSService> gnomevfs =
-    do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-  if (giovfs) {
-    return giovfs->ShowURIForInput(mPath);
-  } else if (gnomevfs) {
-    /* GnomeVFS fallback */
-    return gnomevfs->ShowURIForInput(mPath);
+  if (!giovfs) {
+    return NS_ERROR_FAILURE;
   }
 
-  return NS_ERROR_FAILURE;
+  return giovfs->ShowURIForInput(mPath);
 #elif defined(MOZ_ENABLE_CONTENTACTION)
   QUrl uri = QUrl::fromLocalFile(QString::fromUtf8(mPath.get()));
   ContentAction::Action action =
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/io/nsStreamUtils.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/io/nsStreamUtils.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/io/nsStreamUtils.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/io/nsStreamUtils.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIPipe.h"
+#include "nsICloneableInputStream.h"
 #include "nsIEventTarget.h"
 #include "nsIRunnable.h"
 #include "nsISafeOutputStream.h"
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/string/nsTDependentString.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/string/nsTDependentString.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/string/nsTDependentString.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/string/nsTDependentString.h	2015-02-28 15:03:11.000000000 +0000
@@ -32,13 +32,13 @@
     : string_type(const_cast<char_type*>(aStart),
                   uint32_t(aEnd - aStart), F_TERMINATED)
   {
-    AssertValidDepedentString();
+    AssertValidDependentString();
   }
 
   nsTDependentString_CharT(const char_type* aData, uint32_t aLength)
     : string_type(const_cast<char_type*>(aData), aLength, F_TERMINATED)
   {
-    AssertValidDepedentString();
+    AssertValidDependentString();
   }
 
 #if defined(CharT_is_PRUnichar) && defined(MOZ_USE_CHAR16_WRAPPER)
@@ -53,7 +53,7 @@
     : string_type(const_cast<char_type*>(aData),
                   uint32_t(char_traits::length(aData)), F_TERMINATED)
   {
-    AssertValidDepedentString();
+    AssertValidDependentString();
   }
 
 #if defined(CharT_is_PRUnichar) && defined(MOZ_USE_CHAR16_WRAPPER)
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/string/nsTString.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/string/nsTString.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/string/nsTString.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/string/nsTString.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -42,6 +42,6 @@
   mData = const_cast<char_type*>(data);
   mLength = length;
   SetDataFlags(F_TERMINATED);
-  AssertValidDepedentString();
+  AssertValidDependentString();
 }
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/string/nsTString.h thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/string/nsTString.h
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/string/nsTString.h	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/string/nsTString.h	2015-02-28 15:03:11.000000000 +0000
@@ -446,7 +446,7 @@
   /**
    * verify restrictions for dependent strings
    */
-  void AssertValidDepedentString()
+  void AssertValidDependentString()
   {
     NS_ASSERTION(mData, "nsTDependentString must wrap a non-NULL buffer");
     NS_ASSERTION(mLength != size_type(-1), "nsTDependentString has bogus length");
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/tests/TestPLDHash.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/tests/TestPLDHash.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpcom/tests/TestPLDHash.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpcom/tests/TestPLDHash.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -7,10 +7,8 @@
 #include <stdio.h>
 #include "pldhash.h"
 
-// pldhash is very widely used and so any basic bugs in it are likely to be
-// exposed through normal usage.  Therefore, this test currently focusses on
-// extreme cases relating to maximum table capacity and potential overflows,
-// which are unlikely to be hit during normal execution.
+// This test mostly focuses on edge cases. But more coverage of normal
+// operations wouldn't be a bad thing.
 
 namespace TestPLDHash {
 
@@ -106,6 +104,67 @@
   return true;
 }
 
+static bool test_pldhash_lazy_storage()
+{
+  PLDHashTable t;
+  PL_DHashTableInit(&t, PL_DHashGetStubOps(), sizeof(PLDHashEntryStub));
+
+  // PLDHashTable allocates entry storage lazily. Check that all the non-add
+  // operations work appropriately when the table is empty and the storage
+  // hasn't yet been allocated.
+
+  if (!t.IsInitialized()) {
+    return false;
+  }
+
+  if (t.Capacity() != 0) {
+    return false;
+  }
+
+  if (t.EntrySize() != sizeof(PLDHashEntryStub)) {
+    return false;
+  }
+
+  if (t.EntryCount() != 0) {
+    return false;
+  }
+
+  if (t.Generation() != 0) {
+    return false;
+  }
+
+  if (PL_DHashTableSearch(&t, (const void*)1)) {
+    return false;   // search succeeded?
+  }
+
+  // No result to check here, but call it to make sure it doesn't crash.
+  PL_DHashTableRemove(&t, (const void*)2);
+
+  // Using a null |enumerator| should be fine because it shouldn't be called
+  // for an empty table.
+  PLDHashEnumerator enumerator = nullptr;
+  if (PL_DHashTableEnumerate(&t, enumerator, nullptr) != 0) {
+    return false;   // enumeration count is non-zero?
+  }
+
+  for (PLDHashTable::Iterator iter = t.Iterate();
+       iter.HasMoreEntries();
+       iter.NextEntry()) {
+    return false; // shouldn't hit this on an empty table
+  }
+
+  // Using a null |mallocSizeOf| should be fine because it shouldn't be called
+  // for an empty table.
+  mozilla::MallocSizeOf mallocSizeOf = nullptr;
+  if (PL_DHashTableSizeOfExcludingThis(&t, nullptr, mallocSizeOf) != 0) {
+    return false;   // size is non-zero?
+  }
+
+  PL_DHashTableFinish(&t);
+
+  return true;
+}
+
 // See bug 931062, we skip this test on Android due to OOM.
 #ifndef MOZ_WIDGET_ANDROID
 // We insert the integers 0.., so this is has function is (a) as simple as
@@ -168,6 +227,7 @@
   DECL_TEST(test_pldhash_Init_capacity_ok),
   DECL_TEST(test_pldhash_Init_capacity_too_large),
   DECL_TEST(test_pldhash_Init_overflow),
+  DECL_TEST(test_pldhash_lazy_storage),
 // See bug 931062, we skip this test on Android due to OOM.
 #ifndef MOZ_WIDGET_ANDROID
   DECL_TEST(test_pldhash_grow_to_max_capacity),
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpfe/appshell/nsWebShellWindow.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpfe/appshell/nsWebShellWindow.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpfe/appshell/nsWebShellWindow.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -418,6 +418,11 @@
 #ifdef USE_NATIVE_MENUS
 static void LoadNativeMenus(nsIDOMDocument *aDOMDoc, nsIWidget *aParentWindow)
 {
+  nsCOMPtr<nsINativeMenuService> nms = do_GetService("@mozilla.org/widget/nativemenuservice;1");
+  if (!nms) {
+    return;
+  }
+
   // Find the menubar tag (if there is more than one, we ignore all but
   // the first).
   nsCOMPtr<nsIDOMNodeList> menubarElements;
@@ -428,13 +433,13 @@
   nsCOMPtr<nsIDOMNode> menubarNode;
   if (menubarElements)
     menubarElements->Item(0, getter_AddRefs(menubarNode));
-  if (!menubarNode)
-    return;
 
-  nsCOMPtr<nsINativeMenuService> nms = do_GetService("@mozilla.org/widget/nativemenuservice;1");
-  nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));
-  if (nms && menubarContent)
+  if (menubarNode) {
+    nsCOMPtr<nsIContent> menubarContent(do_QueryInterface(menubarNode));
     nms->CreateNativeMenuBar(aParentWindow, menubarContent);
+  } else {
+    nms->CreateNativeMenuBar(aParentWindow, nullptr);
+  }
 }
 #endif
 
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp	2015-02-19 00:42:16.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp	2015-02-28 15:03:11.000000000 +0000
@@ -1263,7 +1263,7 @@
 nsDirectoryViewerFactory::CreateInstance(const char *aCommand,
                                          nsIChannel* aChannel,
                                          nsILoadGroup* aLoadGroup,
-                                         const char* aContentType, 
+                                         const nsACString& aContentType, 
                                          nsIDocShell* aContainer,
                                          nsISupports* aExtraInfo,
                                          nsIStreamListener** aDocListenerResult,
@@ -1271,7 +1271,8 @@
 {
   nsresult rv;
 
-  bool viewSource = aContentType && strstr(aContentType, "view-source");
+  bool viewSource = FindInReadable(NS_LITERAL_CSTRING("view-source"),
+                                   aContentType);
 
   if (!viewSource &&
       Preferences::GetInt("network.dir.format", FORMAT_XUL) == FORMAT_XUL) {
@@ -1309,7 +1310,8 @@
     if (NS_FAILED(rv)) return rv;
     
     nsCOMPtr<nsIStreamListener> listener;
-    rv = factory->CreateInstance(aCommand, channel, aLoadGroup, "application/vnd.mozilla.xul+xml",
+    rv = factory->CreateInstance(aCommand, channel, aLoadGroup,
+                                 NS_LITERAL_CSTRING("application/vnd.mozilla.xul+xml"),
                                  aContainer, aExtraInfo, getter_AddRefs(listener),
                                  aDocViewerResult);
     if (NS_FAILED(rv)) return rv;
@@ -1357,11 +1359,13 @@
   nsCOMPtr<nsIStreamListener> listener;
 
   if (viewSource) {
-    rv = factory->CreateInstance("view-source", aChannel, aLoadGroup, "text/html; x-view-type=view-source",
+    rv = factory->CreateInstance("view-source", aChannel, aLoadGroup,
+                                 NS_LITERAL_CSTRING("text/html; x-view-type=view-source"),
                                  aContainer, aExtraInfo, getter_AddRefs(listener),
                                  aDocViewerResult);
   } else {
-    rv = factory->CreateInstance("view", aChannel, aLoadGroup, "text/html",
+    rv = factory->CreateInstance("view", aChannel, aLoadGroup,
+                                 NS_LITERAL_CSTRING("text/html"),
                                  aContainer, aExtraInfo, getter_AddRefs(listener),
                                  aDocViewerResult);
   }
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/app.mozbuild thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/app.mozbuild
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/app.mozbuild	2015-02-19 00:41:45.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/app.mozbuild	2015-02-28 15:02:42.000000000 +0000
@@ -17,7 +17,10 @@
 DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 if CONFIG['MOZ_CALENDAR']:
-    DIRS += ['/calendar/lightning']
+    DIRS += [
+        '/calendar/lightning',
+        '/calendar/timezones'
+    ]
 
 DIRS += [
     '/xpfe/components/autocomplete',
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/config/version.txt thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/config/version.txt
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/config/version.txt	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/config/version.txt	2015-02-28 15:02:41.000000000 +0000
@@ -1 +1 @@
-2.35a1
+2.36a1
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties	2015-02-28 15:02:41.000000000 +0000
@@ -9,173 +9,110 @@
 ## %S will be replaced with the name of file that could not be opened
 unableToOpenFile=Unable to open the file %S.
 unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary Directory' setting.
+unableToSaveTemplate=Unable to save your message as a template.
+unableToSaveDraft=Unable to save your message as a draft.
+couldntOpenFccFolder=Couldn't open the Sent mail folder. Please verify that your Mail preferences are correct.
+noSender=No sender was specified. Please add your email address in the Mail & Newsgroups account settings.
+noRecipients=No recipients were specified. Please enter a recipient or newsgroup in the addressing area.
+errorWritingFile=Error writing temporary file.
+
+## LOCALIZATION NOTE (errorSendingFromCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingFromCommand=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
+
+## LOCALIZATION NOTE (errorSendingDataCommand): argument %s is the Outgoing server (SMTP) response
+errorSendingDataCommand=An Outgoing server (SMTP) error occurred while sending mail. The server responded:  %s.
+
+## LOCALIZATION NOTE (errorSendingMessage): argument %s is the Outgoing server (SMTP) response
+errorSendingMessage=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
+postFailed=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again.
+errorQueuedDeliveryFailed=An error occurred while delivering unsent messages.
+sendFailed=Sending of the message failed.
+
+## LOCALIZATION NOTE (smtpServerError): argument %s is the Outgoing server (SMTP) response
+smtpServerError=An error occurred while sending mail: Outgoing server (SMTP) error. The server responded:  %s\n.
+unableToSendLater=Sorry, we were unable to save your message for sending later.
+
+## LOCALIZATION NOTE (communicationsError): argument %d is the error code
+communicationsError=A communications error occurred: %d.  Please try again.
+dontShowAlert=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+
+## LOCALIZATION NOTE (tcpReadError): argument %s is the network error
+tcpReadError=A network error occurred while receiving data.  (Network Error: %s)  Try connecting again.
+couldNotGetUsersMailAddress=An error occurred while sending mail:  the return mail address was invalid.  Please verify that your email address is correct in your Mail preferences and try again.
+mimeMpartAttachmentError=Attachment error.
+failedCopyOperation=The message was sent successfully, but could not be copied to your Sent folder.
+nntpNoCrossPosting=You can only send a message to one news server at a time.
+msgCancelling=Cancelling…
+sendFailedButNntpOk=Your message has been posted to the newsgroup but has not been sent to the other recipient.
+errorReadingFile=Error reading file.
+followupToSenderMessage=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
 
-## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
-12502=Unable to save your message as template.
-
-## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
-12503=Unable to save your message as draft.
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Couldn't open Sent mail folder. Please verify that your Mail preferences are correct.
-
-## @name NS_MSG_NO_SENDER
-12510=No sender was specified. Please fill in your email address in the Mail & Newsgroups account settings.
-
-## @name NS_MSG_NO_RECIPIENTS
-12511=No recipients were specified. Please enter a recipient or newsgroup in the addressing area.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Error writing temporary file.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-## LOCALIZATION NOTE (12514): argument %s is SMTP server response
-12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
+## LOCALIZATION NOTE (errorAttachingFile): argument %S is the file name/URI of object to be attached
+errorAttachingFile=There was an error attaching %S. Please check that you have access to the file.
 
-## @name NS_ERROR_SENDING_DATA_COMMAND
-## LOCALIZATION NOTE (12516): argument %s is SMTP server response
-12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
+## LOCALIZATION NOTE (incorrectSmtpGreeting): argument %s is the Outgoing server (SMTP) greeting
+incorrectSmtpGreeting=An error occurred while sending mail: The mail server sent an incorrect greeting:  %s.
 
-## @name NS_ERROR_SENDING_MESSAGE
-## LOCALIZATION NOTE (12517): argument %s is SMTP server response
-12517=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
+## LOCALIZATION NOTE (errorSendingRcptCommand): argument %1$S is the Outgoing server (SMTP) response, argument %2$S is the intended message recipient.
+errorSendingRcptCommand=An error occurred while sending mail. The mail server responded:  \n%1$S.\n Please check the message recipient "%2$S" and try again.
 
-## @name NS_ERROR_POST_FAILED
-12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again, or else contact your network administrator.
+## LOCALIZATION NOTE (startTlsFailed): argument %S is the Outgoing server (SMTP)
+startTlsFailed=An error occurred while sending mail: Unable to establish a secure link with Outgoing server (SMTP) %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for this server or contact your service provider.
 
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=An error occurred delivering unsent messages.
+## LOCALIZATION NOTE (smtpPasswordUndefined): argument %S is the Outgoing server (SMTP) account
+smtpPasswordUndefined=An error occurred while sending mail: Could not get password for %S. The message was not sent.
 
-## @name NS_ERROR_SEND_FAILED
-12520=Sending of message failed.
+## LOCALIZATION NOTE (smtpTempSizeExceeded): argument %s is the Outgoing server (SMTP) response
+smtpTempSizeExceeded=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
 
-## @name NS_ERROR_SMTP_SERVER_ERROR
-## LOCALIZATION NOTE (12524): argument %s is SMTP server response
-12524=An error occurred sending mail: SMTP server error. The server responded:  %s\n Contact your mail administrator for assistance.
+## LOCALIZATION NOTE (smtpPermSizeExceeded1): argument %d is the Outgoing server (SMTP) size limit
+smtpPermSizeExceeded1=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
 
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Unable to save your message in order to send it later.
+## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the server's response
+smtpPermSizeExceeded2=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
 
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-## LOCALIZATION NOTE (12526): argument %d is error code
-12526=A communications error occurred: %d.  Please try again.
+## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownServer=An error occurred while sending mail: Outgoing server (SMTP) %S is unknown. The server may be incorrectly configured. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRefused=The message could not be sent because connecting to Outgoing server (SMTP) %S failed. The server may be unavailable or is refusing Outgoing server (SMTP) connections. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
-## @name NS_ERROR_TCP_READ_ERROR
-12528=A network error occurred while receiving data.  (Network Error: %s)  Try connecting again.
+## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
+smtpSendInterrupted=The message could not be sent because the connection to Outgoing server (SMTP) %S was lost in the middle of the transaction. Try again.
 
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=An error occurred sending mail:  the return mail address was invalid.  Please verify that your email address is correct in your Mail preferences and try again.
+## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
+smtpSendTimeout=The message could not be sent because the connection to Outgoing server (SMTP) %S timed out. Try again.
 
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Attachment error.
+## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
+smtpSendFailedUnknownReason=The message could not be sent using Outgoing server (SMTP) %S for an unknown reason. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=The message was sent successfully, but could not be copied to your Sent folder.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainNoSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainNoSsl=The Outgoing server (SMTP) %S does not seem to support encrypted passwords. If you just set up the account, please try changing the 'Authentication method' in 'Account Settings | Server settings' to 'Password, transmitted insecurely'. If it used to work but now doesn't, you may be susceptible to getting your password stolen.
 
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=You can only send a message to one news server at a time.
+# LOCALIZATION NOTE (smtpAuthChangeEncryptToPlainSsl): %S is the server hostname
+smtpAuthChangeEncryptToPlainSsl=The Outgoing server (SMTP) %S does not seem to support encrypted passwords. If you just set up the account, please try changing the 'Authentication method' in 'Account Settings | Server settings' to 'Normal password'.
 
-## @name NS_MSG_CANCELLING
-12555=Cancelling…
+# LOCALIZATION NOTE (smtpAuthChangePlainToEncrypt): %S is the server hostname
+smtpAuthChangePlainToEncrypt=The Outgoing server (SMTP) %S does not allow plaintext passwords. Please try changing the 'Authentication method' in 'Account Settings | Server settings' to 'Encrypted password'.
 
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Your message has been posted to the newsgroup but has not been sent to other recipient.
+# LOCALIZATION NOTE (smtpAuthFailure): %S is the server hostname
+smtpAuthFailure=Unable to authenticate to Outgoing server (SMTP) %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
 
-## @name NS_MSG_ERROR_READING_FILE
-12563=Error reading file.
+# LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
+smtpAuthGssapi=The Kerberos/GSSAPI ticket was not accepted by the Outgoing server (SMTP) %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
 
-followupToSenderMessage=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
+# LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
+smtpAuthMechNotSupported=The Outgoing server (SMTP) %S does not support the selected authentication method. Please change the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
 
-## @name NS_MSG_ERROR_ATTACHING_FILE
-## LOCALIZATION NOTE (12570): argument %S is file name/URI of object to be attached
-12570=There was an error attaching %S. Please check if you have access to the file.
-
-## @name NS_ERROR_SMTP_GREETING
-## LOCALIZATION NOTE (12572): argument %s is SMTP server greeting
-12572=An error occurred sending mail: The mail server sent an incorrect greeting:  %s.
-
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-## LOCALIZATION NOTE (12575): argument %1$s is SMTP server response, argument %2$s is intended message recipient.
-12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
-
-## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
-## LOCALIZATION NOTE (12582): argument %s is SMTP server
-12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
-
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-## LOCALIZATION NOTE (12584): argument %S is SMTP account
-12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
-
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-## LOCALIZATION NOTE (12586): argument %s is SMTP server response
-12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
-
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-## LOCALIZATION NOTE (12587): argument %d is SMTP server size limit
-12587=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
-
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-## LOCALIZATION NOTE (12588): argument %s is SMTP server response
-12588=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
-## LOCALIZATION NOTE (12589): argument %S is SMTP server
-12589=An error occurred sending mail: SMTP server %S is unknown. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
-## LOCALIZATION NOTE (12590): argument %S is SMTP server
-12590=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server settings are correct and try again, or contact the server administrator.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
-## LOCALIZATION NOTE (12591): argument %S is SMTP server
-12591=The message could not be sent because the connection to SMTP server %S was lost in the middle of the transaction. Try again or contact your network administrator.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
-## LOCALIZATION NOTE (12592): argument %S is SMTP server
-12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
-
-## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
-## LOCALIZATION NOTE (12593): argument %S is SMTP server
-12593=The message could not be sent using SMTP server %S for an unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
-
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-# LOCALIZATION NOTE (12594): $S is server hostname
-12594=The SMTP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
-
-## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-# LOCALIZATION NOTE (12595): $S is server hostname
-12595=The SMTP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
-
-## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-# LOCALIZATION NOTE (12596): $S is server hostname
-12596=The SMTP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
-
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-# LOCALIZATION NOTE (12597): $S is server hostname
-12597=Unable to authenticate to SMTP server %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-# LOCALIZATION NOTE (12598): $S is server hostname
-12598=The Kerberos/GSSAPI ticket was not accepted by the SMTP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
-
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12599): $S is server hostname
-12599=The SMTP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Outgoing Server (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-# LOCALIZATION NOTE (12600): $S is server hostname
-12600=Unable to authenticate to SMTP server %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in the 'Account Settings | Outgoing Server (SMTP)' or contact your email service provider for instructions.
+# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
+smtpAuthNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (Outgoing server (SMTP)-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in 'Account Settings | Outgoing server (SMTP)' or contact your email service provider for instructions.
 
-## @name NS_ERROR_ILLEGAL_LOCALPART
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=There are non-ASCII characters in the local part of the recipient address %s. This is not yet supported. Please change this address and try again.
 
-## Strings use for the save message dialog shown when the user close a message compose window
+## Strings used for the save message dialog shown when the user closes a message compose window
 saveDlogTitle=Save Message
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
+## LOCALIZATION NOTE (SaveDlogMessages): %1$S is the folder name
 saveDlogMessages=Message has not been sent. Do you want to save the message in your drafts folder (%1$S)?
 
 ## generics string
@@ -185,98 +122,98 @@
 ##
 windowTitlePrefix=Compose:
 
-## String used by the dialog that ask the user to enter a subject
+## String used by the dialog that asks the user to enter a subject
 sendMsgTitle=Send Message
 subjectDlogMessage=You did not specify a subject for this message. If you would like to provide one, please type it now.
 
 ## String used by the dialog that informs the user about the newsgroup recipient
 recipientDlogMessage=This account only supports email recipients. Continuing will ignore newsgroups.
 
-#String used by the alert that tells the user an e-mail address is invalid
-## LOCALIZATION NOTE (addressInvalid): $S is email address
+## String used by the alert that tells the user an e-mail address is invalid
+## LOCALIZATION NOTE (addressInvalid): %1$S is the email address
 addressInvalid=%1$S is not a valid e-mail address because it is not of the form user@host. You must correct it before sending the e-mail.
-
 genericFailureExplanation=Please verify that your Mail & Newsgroups account settings are correct and try again.
 
 ## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
 undisclosedRecipients=undisclosed-recipients
 
-## String used for attachment pretty name, when attachment is a message
+## String used for attachment pretty name, when the attachment is a message
 messageAttachmentSafeName=Attached Message
-## String used for attachment pretty name, when attachment is message part
+## String used for attachment pretty name, when the attachment is a message part
 partAttachmentSafeName=Attached Message Part
 
 ## String used by the Initialization Error dialog
 initErrorDlogTitle=Message Compose
 initErrorDlgMessage=An error occurred while creating a message compose window. Please try again.
 
-## String used if a file to attach does not exist when passed as
+## String used if the file to attach does not exist when passed as
 ## a command line argument
 errorFileAttachTitle=File Attach
+
 ## LOCALIZATION NOTE (errorFileAttachMessage): %1$S will be replaced by the non-existent file name. Do not translate
 errorFileAttachMessage=The file %1$S does not exist so could not be attached to the message.
 
-## Strings used by Save as Draft/Template dialog
+## Strings used by the Save as Draft/Template dialog
 SaveDialogTitle=Save Message
-## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
+
+## LOCALIZATION NOTE (SaveDialogMsg): %1$S is the folder name, %2$S is the host name
 SaveDialogMsg=Your message has been saved to the folder %1$S under %2$S.
 CheckMsg=Do not show me this dialog box again.
 
-## Strings used by prompt when Quitting while in progress
+## Strings used by the prompt when Quitting while in progress
 quitComposeWindowTitle=Sending Message
+
 ## LOCALIZATION NOTE (quitComposeWindowMessage): don't translate \n
 quitComposeWindowMessage2=%1$S is currently in the process of sending a message.\nWould you like to wait until the message has been sent before quitting or quit now?
 quitComposeWindowQuitButtonLabel2=&Quit
 quitComposeWindowWaitButtonLabel2=&Wait
 
-## Strings used by prompt for Ctrl-Enter check before sending message
+## Strings used by the prompt for Ctrl-Enter check before sending message
 sendMessageCheckWindowTitle=Send Message
 sendMessageCheckLabel=Are you sure you are ready to send this message?
 sendMessageCheckSendButtonLabel=Send
-
 assemblingMessageDone=Assembling message…Done
 assemblingMessage=Assembling message…
-
 smtpDeliveringMail=Delivering mail…
 smtpMailSent=Mail sent successfully
-
 assemblingMailInformation=Assembling mail information…
-## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
+
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is the file name/URI of attachment
 gatheringAttachment=Attaching %S…
 creatingMailMessage=Creating mail message…
 
-## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
+## LOCALIZATION NOTE (copyMessageStart): argument %S is the folder name
 copyMessageStart=Copying message to %S folder…
 copyMessageComplete=Copy complete.
 copyMessageFailed=Copy failed.
-
 filterMessageComplete=Filter complete.
 filterMessageFailed=Filter failed.
 
 ## LOCALIZATION NOTE (largeMessageSendWarning):
 ## %S is the message size in user-friendly notation. Do not translate.
 largeMessageSendWarning=Warning! You are about to send a message of size %S which may exceed the allowed limit on the mail server. Are you sure that you want to do this?
-
 sendingMessage=Sending message…
 sendMessageErrorTitle=Send Message Error
 postingMessage=Posting message…
-
 sendLaterErrorTitle=Send Later Error
 saveDraftErrorTitle=Save Draft Error
 saveTemplateErrorTitle=Save Template Error
 
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSaving=There was a problem including the file %.200S in the message. Would you like to continue saving the message without this file?
-## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is the file name/URI of object to be embedded
 failureOnObjectEmbeddingWhileSending=There was a problem including the file %.200S in the message. Would you like to continue sending the message without this file?
 returnToComposeWindowQuestion=Would you like to return to the compose window?
 
 ## reply header in composeMsg
-## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is the author (name of person replying to)
 mailnews.reply_header_authorwrotesingle=#1 wrote:
-## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_ondateauthorwrote=On #2 #3, #1 wrote:
-## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is the author, #2 is the date, #3 is the time
 mailnews.reply_header_authorwroteondate=#1 wrote on #2 #3:
 
 ## reply header in composeMsg
@@ -292,16 +229,16 @@
 renameAttachmentMessage=New attachment name:
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
-## word $S. Place the word $S where the host name should appear.
+## word %S. Place the word %S where the host name should appear.
 smtpEnterPasswordPrompt=Enter your password for %S:
+
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
-smtpEnterPasswordPromptTitle=SMTP Server Password Required
+smtpEnterPasswordPromptTitle=Outgoing server (SMTP) Server Password Required
 
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg=There was an error saving the message to %S. Retry?
-
 errorFilteringMsg=Your message has been sent and saved, but there was an error while running message filters on it.
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/en-US/chrome/mailnews/messenger.properties thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/en-US/chrome/mailnews/messenger.properties
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/en-US/chrome/mailnews/messenger.properties	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/en-US/chrome/mailnews/messenger.properties	2015-02-28 15:02:41.000000000 +0000
@@ -124,9 +124,16 @@
 authKerberos=Kerberos / GSSAPI
 authExternal=TLS Certificate
 authNTLM=NTLM
+authOAuth2=OAuth2
 authAnySecure=Any secure method (deprecated)
 authAny=Any method (insecure)
 
+# OAuth2 window title
+# LOCALIZATION NOTE(oauth2WindowTitle):
+# %1$S is the username (or full email address) used for authentication.
+# %2$S is the hostname of the account being authenticated.
+oauth2WindowTitle=Enter credentials for %1$S on %2$S
+
 # LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
 serverType-nntp=News Server (NNTP)
 # LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/en-US/chrome/mailnews/pref/am-server-top.dtd thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/en-US/chrome/mailnews/pref/am-server-top.dtd
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/en-US/chrome/mailnews/pref/am-server-top.dtd	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/en-US/chrome/mailnews/pref/am-server-top.dtd	2015-02-28 15:02:41.000000000 +0000
@@ -84,3 +84,7 @@
 
 <!ENTITY accountTitle.label "Account Settings">
 <!ENTITY accountSettingsDesc.label "The following is a special account. There are no identities associated with it.">
+<!ENTITY storeType.label "Message Store Type:">
+<!ENTITY storeType.accesskey "T">
+<!ENTITY mboxStore.label "One large file (mbox)">
+<!ENTITY maildirStore.label "File per message (maildir)">
diff -Nru thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/Makefile.in thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/Makefile.in
--- thunderbird-trunk-38.0~a1~hg20150218r17506.229588/suite/locales/Makefile.in	2015-02-19 00:41:44.000000000 +0000
+++ thunderbird-trunk-39.0~a1~hg20150226r17577.231190/suite/locales/Makefile.in	2015-02-28 15:02:41.000000000 +0000
@@ -65,6 +65,13 @@
 	defaults/profile/chrome/userContent-example.css \
 	$(NULL)
 
+SEARCH_PLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
+SEARCH_PLUGINS_PATH := $(FINAL_TARGET)/searchplugins
+.PHONY: searchplugins
+SEARCH_PLUGINS_TARGET := libs searchplugins
+SEARCH_PLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCH_PLUGINS_NAMES)),$(or $(wildcard $(call MERGE_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
+PP_TARGETS += SEARCH_PLUGINS
+
 include $(topsrcdir)/config/rules.mk
 
 include $(topsrcdir)/mozilla/toolkit/locales/l10n.mk
@@ -119,11 +126,6 @@
 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
-SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,searchplugins/list.txt))
-
-libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
-
 # Extend l10n.mk clobber-% target for our localised extensions
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi